diff --git a/.appveyor.yml b/.appveyor.yml
index 627755ba2a..26e41f796f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -11,18 +11,15 @@ skip_commits:
 # Add [av skip] to commit messages
   message: /\[av skip\]/
 
-cache:
-  - '%APPVEYOR_BUILD_FOLDER%\build'
-
 environment:
   global:
-    CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
+    CONDA_INSTALL_LOCN: C:\\Miniconda37-x64
+    CTEST_OUTPUT_ON_FAILURE: 1
 
 install:
   - call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
-  - conda config --set auto_update_conda false
-  - conda config --add channels conda-forge --force
-  - conda install --yes --quiet flang jom
+#  - conda config --set auto_update_conda false
+  - conda install -c conda-forge --yes --quiet flang=11.0.1 jom
   - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
   - set "LIB=%CONDA_INSTALL_LOCN%\Library\lib;%LIB%"
   - set "CPATH=%CONDA_INSTALL_LOCN%\Library\include;%CPATH%"
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
new file mode 100644
index 0000000000..b5b57624a7
--- /dev/null
+++ b/.github/SECURITY.md
@@ -0,0 +1,13 @@
+# Security Policy
+
+## Supported Versions
+
+Security updates are applied only to the latest release.
+
+## Reporting a Vulnerability
+
+If you have discovered a security vulnerability in this project, please report it privately. **Do not disclose it as a public issue.** This gives us time to work with you to fix the issue before public exposure, reducing the chance that the exploit will be used before a patch is released.
+
+Please disclose it at [security advisory](https://github.com/Reference-LAPACK/lapack/security/advisories/new).
+
+This project is maintained by a team of volunteers on a reasonable-effort basis. As such, please give us at least 90 days to work on a fix before public exposure.
diff --git a/.github/julia/build_tarballs.jl b/.github/julia/build_tarballs.jl
new file mode 100644
index 0000000000..1a003ce345
--- /dev/null
+++ b/.github/julia/build_tarballs.jl
@@ -0,0 +1,65 @@
+using BinaryBuilder, Pkg
+
+haskey(ENV, "BLAS_LAPACK_RELEASE") || error("The environment variable BLAS_LAPACK_RELEASE is not defined.")
+haskey(ENV, "BLAS_LAPACK_COMMIT") || error("The environment variable BLAS_LAPACK_COMMIT is not defined.")
+haskey(ENV, "BLAS_LAPACK_URL") || error("The environment variable BLAS_LAPACK_URL is not defined.")
+
+name = "blas_lapack"
+version = VersionNumber(ENV["BLAS_LAPACK_RELEASE"])
+
+# Collection of sources required to complete build
+sources = [
+    GitSource(ENV["BLAS_LAPACK_URL"], ENV["BLAS_LAPACK_COMMIT"])
+]
+
+# Bash recipe for building across all platforms
+script = raw"""
+cd ${WORKSPACE}/srcdir/lapack
+
+# FortranCInterface_VERIFY fails on macOS, but it's not actually needed for the current build
+sed -i 's/FortranCInterface_VERIFY/# FortranCInterface_VERIFY/g' ./CBLAS/CMakeLists.txt
+sed -i 's/FortranCInterface_VERIFY/# FortranCInterface_VERIFY/g' ./LAPACKE/include/CMakeLists.txt
+
+mkdir build && cd build
+cmake .. \
+   -DCBLAS=ON \
+   -DLAPACKE=ON \
+   -DCMAKE_INSTALL_PREFIX="$prefix" \
+   -DCMAKE_FIND_ROOT_PATH="$prefix" \
+   -DCMAKE_TOOLCHAIN_FILE="${CMAKE_TARGET_TOOLCHAIN}" \
+   -DCMAKE_BUILD_TYPE=Release \
+   -DBUILD_SHARED_LIBS=OFF \
+   -DBUILD_INDEX64_EXT_API=OFF \
+   -DTEST_FORTRAN_COMPILER=OFF \
+   -DLAPACKE_WITH_TMG=OFF
+
+make -j${nproc}
+make install
+
+install_license $WORKSPACE/srcdir/lapack/LICENSE
+"""
+
+# These are the platforms we will build for by default, unless further
+# platforms are passed in on the command line
+platforms = supported_platforms()
+platforms = expand_gfortran_versions(platforms)
+
+# The products that we will ensure are always built
+products = [
+    FileProduct("lib/libblas.a", :libblas_a),
+    FileProduct("lib/libcblas.a", :libcblas_a),
+    FileProduct("lib/liblapack.a", :liblapack_a),
+    FileProduct("lib/liblapacke.a", :liblapacke_a),
+    # LibraryProduct("libblas", :libblas),
+    # LibraryProduct("libcblas", :libcblas),
+    # LibraryProduct("liblapack", :liblapack),
+    # LibraryProduct("liblapacke", :liblapacke),
+]
+
+# Dependencies that must be installed before this package can be built
+dependencies = [
+    Dependency(PackageSpec(name="CompilerSupportLibraries_jll", uuid="e66e0078-7015-5450-92f7-15fbd957f2ae")),
+]
+
+# Build the tarballs, and possibly a `build.jl` as well.
+build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6")
diff --git a/.github/julia/generate_binaries.jl b/.github/julia/generate_binaries.jl
new file mode 100644
index 0000000000..4ecb643a3a
--- /dev/null
+++ b/.github/julia/generate_binaries.jl
@@ -0,0 +1,90 @@
+# Version
+haskey(ENV, "BLAS_LAPACK_RELEASE") || error("The environment variable BLAS_LAPACK_RELEASE is not defined.")
+version = VersionNumber(ENV["BLAS_LAPACK_RELEASE"])
+version2 = ENV["BLAS_LAPACK_RELEASE"]
+package = "blas_lapack"
+
+platforms = [
+   ("aarch64-apple-darwin-libgfortran5"  , "lib", "dylib"),
+#  ("aarch64-linux-gnu-libgfortran3"     , "lib", "so"   ),
+#  ("aarch64-linux-gnu-libgfortran4"     , "lib", "so"   ),
+   ("aarch64-linux-gnu-libgfortran5"     , "lib", "so"   ),
+#  ("aarch64-linux-musl-libgfortran3"    , "lib", "so"   ),
+#  ("aarch64-linux-musl-libgfortran4"    , "lib", "so"   ),
+#  ("aarch64-linux-musl-libgfortran5"    , "lib", "so"   ),
+#  ("powerpc64le-linux-gnu-libgfortran3" , "lib", "so"   ),
+#  ("powerpc64le-linux-gnu-libgfortran4" , "lib", "so"   ),
+#  ("powerpc64le-linux-gnu-libgfortran5" , "lib", "so"   ),
+#  ("x86_64-apple-darwin-libgfortran3"   , "lib", "dylib"),
+#  ("x86_64-apple-darwin-libgfortran4"   , "lib", "dylib"),
+   ("x86_64-apple-darwin-libgfortran5"   , "lib", "dylib"),
+#  ("x86_64-linux-gnu-libgfortran3"      , "lib", "so"   ),
+#  ("x86_64-linux-gnu-libgfortran4"      , "lib", "so"   ),
+   ("x86_64-linux-gnu-libgfortran5"      , "lib", "so"   ),
+#  ("x86_64-linux-musl-libgfortran3"     , "lib", "so"   ),
+#  ("x86_64-linux-musl-libgfortran4"     , "lib", "so"   ),
+#  ("x86_64-linux-musl-libgfortran5"     , "lib", "so"   ),
+#  ("x86_64-unknown-freebsd-libgfortran3", "lib", "so"   ),
+#  ("x86_64-unknown-freebsd-libgfortran4", "lib", "so"   ),
+#  ("x86_64-unknown-freebsd-libgfortran5", "lib", "so"   ),
+#  ("x86_64-w64-mingw32-libgfortran3"    , "bin", "dll"  ),
+#  ("x86_64-w64-mingw32-libgfortran4"    , "bin", "dll"  ),
+   ("x86_64-w64-mingw32-libgfortran5"    , "bin", "dll"  ),
+]
+
+
+for (platform, libdir, ext) in platforms
+
+  tarball_name = "$package.v$version.$platform.tar.gz"
+
+  if isfile("products/$(tarball_name)")
+    # Unzip the tarball generated by BinaryBuilder.jl
+    isdir("products/$platform") && rm("products/$platform", recursive=true)
+    mkdir("products/$platform")
+    run(`tar -xzf products/$(tarball_name) -C products/$platform`)
+
+    if isfile("products/$platform/deps.tar.gz")
+      # Unzip the tarball of the dependencies
+      run(`tar -xzf products/$platform/deps.tar.gz -C products/$platform`)
+
+      # Copy the license of each dependency
+      for folder in readdir("products/$platform/deps/licenses")
+        cp("products/$platform/deps/licenses/$folder", "products/$platform/share/licenses/$folder")
+      end
+      rm("products/$platform/deps/licenses", recursive=true)
+
+      # Copy the shared library of each dependency
+      for file in readdir("products/$platform/deps")
+        cp("products/$platform/deps/$file", "products/$platform/$libdir/$file")
+      end
+
+      # Remove the folder used to unzip the tarball of the dependencies
+      rm("products/$platform/deps", recursive=true)
+      rm("products/$platform/deps.tar.gz", recursive=true)
+    end
+
+    # Create the archives *_binaries
+    isfile("$(package)_binaries.$version2.$platform.tar.gz") && rm("$(package)_binaries.$version2.$platform.tar.gz")
+    isfile("$(package)_binaries.$version2.$platform.zip") && rm("$(package)_binaries.$version2.$platform.zip")
+    cd("products/$platform")
+
+    # Create a folder with the version number of the package
+    mkdir("$(package)_binaries.$version2")
+    for folder in ("include", "share", "lib")
+      cp(folder, "$(package)_binaries.$version2/$folder")
+    end
+
+    cd("$(package)_binaries.$version2")
+    if ext == "dll"
+      run(`zip -r --symlinks ../../../$(package)_binaries.$version2.$platform.zip include share lib`)
+    else
+      run(`tar -czf ../../../$(package)_binaries.$version2.$platform.tar.gz include share lib`)
+    end
+    cd("../../..")
+
+    # Remove the folder used to unzip the tarball generated by BinaryBuilder.jl
+    rm("products/$platform", recursive=true)
+  else
+    @warn("The tarball for the platform $platform was not generated!")
+  end
+end
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 0a2d05fa60..087ed262d4 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
     - master
-    - try-github-actions
+    - try-github-actions-for-windows
     paths:
     - .github/workflows/cmake.yml
     - '**CMakeLists.txt'
@@ -33,6 +33,9 @@ on:
     - '!**Makefile'
     - '!**md'
 
+permissions:
+  contents: read
+
 env:
   CFLAGS: "-Wall -pedantic"
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -59,35 +62,38 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ macos-latest, ubuntu-latest ]
+        os: [ macos-latest, ubuntu-latest, windows-latest ]
         fflags: [
-          "-fimplicit-none -frecursive -fcheck=all",
-          "-fimplicit-none -frecursive -fcheck=all -fopenmp" ]
+          "-Wall -Wno-unused-dummy-argument -Wno-unused-variable -Wno-unused-label -Werror=conversion -fimplicit-none -frecursive -fcheck=all",
+          "-Wall -Wno-unused-dummy-argument -Wno-unused-variable -Wno-unused-label -Werror=conversion -fimplicit-none -frecursive -fcheck=all -fopenmp" ]
     
     steps:
     
     - name: Checkout LAPACK
-      uses: actions/checkout@v2
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+
+    - name: Install ninja-build tool
+      uses: seanmiddleditch/gha-setup-ninja@16b940825621068d98711680b6c3ff92201f8fc0 # v3
 
-    - name: Use GCC-11 on MacOS
+    - name: Use GCC-14 on MacOS
       if: ${{ matrix.os == 'macos-latest' }}
       run: >
-        cmake -B build
-        -D CMAKE_C_COMPILER="gcc-11"
-        -D CMAKE_Fortran_COMPILER="gfortran-11"
+        cmake -B build -G Ninja
+        -D CMAKE_C_COMPILER="gcc-14"
+        -D CMAKE_Fortran_COMPILER="gfortran-14"
+        -D USE_FLAT_NAMESPACE:BOOL=ON
 
-    # - name: Use Unix Makefiles on Windows
-    #   if: ${{ matrix.os == 'windows-latest' }}
-    #   run: >
-    #     cmake -B build
-    #     -G "Unix Makefiles"
-    #     -D CMAKE_C_FLAGS="${{env.CFLAGS}} -Wl,--stack=1000000000"
+    - name: Special flags for Windows
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: >
+        cmake -B build -G Ninja
+        -D CMAKE_EXE_LINKER_FLAGS="-Wl,--stack=2097152"
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
       run: >
-        cmake -B build
+        cmake -B build -G Ninja
         -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
         -D CMAKE_INSTALL_PREFIX=${{github.workspace}}/lapack_install
         -D CBLAS:BOOL=ON
@@ -96,16 +102,20 @@ jobs:
         -D LAPACKE_WITH_TMG:BOOL=ON
         -D BUILD_SHARED_LIBS:BOOL=ON
 
-    - name: CTest
-      working-directory: ${{github.workspace}}/build
+    - name: Build
       # Execute tests defined by the CMake configuration.  
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: |
-        ctest -D ExperimentalStart
-        ctest -D ExperimentalConfigure
-        ctest -D ExperimentalBuild -j2
-        ctest -D ExperimentalTest --schedule-random -j2 --output-on-failure --timeout 100
-        ctest -D ExperimentalSubmit
+      run: cmake --build build --config ${{env.BUILD_TYPE}}
+
+    - name: Test with OpenMP
+      working-directory: ${{github.workspace}}/build
+      if: ${{ contains( matrix.fflags, 'openmp' ) && (matrix.os != 'windows-latest') }}
+      run: ctest -C ${{env.BUILD_TYPE}} --schedule-random -j1 --output-on-failure --timeout 100
+
+    - name: Test
+      working-directory: ${{github.workspace}}/build
+      if: ${{ !contains( matrix.fflags, 'openmp' ) && (matrix.os != 'windows-latest') }}
+      run: ctest -C ${{env.BUILD_TYPE}} --schedule-random -j2 --output-on-failure --timeout 100
 
     - name: Install
       run: cmake --build build --target install -j2
@@ -118,13 +128,16 @@ jobs:
     steps:     
     
     - name: Checkout LAPACK
-      uses: actions/checkout@v2
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+
+    - name: Install ninja-build tool
+      uses: seanmiddleditch/gha-setup-ninja@16b940825621068d98711680b6c3ff92201f8fc0 # v3
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
       run: >
-        cmake -B build
+        cmake -B build -G Ninja
         -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
         -D CMAKE_INSTALL_PREFIX=${{github.workspace}}/lapack_install
         -D CBLAS:BOOL=ON
@@ -141,3 +154,87 @@ jobs:
         echo "Coverage"
         cmake --build build --target coverage
         bash <(curl -s https://codecov.io/bash) -X gcov
+
+  test-install-cblas-lapacke-without-fortran-compiler:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout LAPACK
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+
+    - name: Install ninja-build tool
+      uses: seanmiddleditch/gha-setup-ninja@16b940825621068d98711680b6c3ff92201f8fc0 # v3
+
+    - name: Install basics
+      run: |
+        sudo apt update
+        sudo apt install -y cmake liblapack-dev libblas-dev
+        sudo apt purge gfortran
+
+    - name: Configure CMake
+      run: >
+        cmake -B build -G Ninja
+        -D CMAKE_BUILD_TYPE=Release
+        -D CMAKE_INSTALL_PREFIX=${{github.workspace}}/lapack_install
+        -D CBLAS:BOOL=ON
+        -D LAPACKE:BOOL=ON
+        -D USE_OPTIMIZED_BLAS:BOOL=ON
+        -D USE_OPTIMIZED_LAPACK:BOOL=ON
+        -D BUILD_TESTING:BOOL=OFF
+        -D LAPACKE_WITH_TMG:BOOL=OFF
+        -D BUILD_SHARED_LIBS:BOOL=ON
+
+    - name: Install
+      run: cmake --build build --target install -j2
+
+  memory-check:
+    runs-on: ubuntu-latest
+    env:
+      BUILD_TYPE: Debug
+
+    steps:
+
+    - name: Checkout LAPACK
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+
+    - name: Install ninja-build tool
+      uses: seanmiddleditch/gha-setup-ninja@16b940825621068d98711680b6c3ff92201f8fc0 # v3
+    
+    - name: Install APT packages
+      run: |
+        sudo apt update
+        sudo apt install -y cmake valgrind gfortran
+
+    - name: Configure CMake
+      run: >
+        cmake -B build -G Ninja
+        -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+        -D CBLAS:BOOL=ON
+        -D LAPACKE:BOOL=ON
+        -D BUILD_TESTING:BOOL=ON
+        -D LAPACKE_WITH_TMG:BOOL=ON
+        -D BUILD_SHARED_LIBS:BOOL=ON
+        -D LAPACK_TESTING_USE_PYTHON:BOOL=OFF
+
+    - name: Build
+      run: cmake --build build --config ${{env.BUILD_TYPE}}
+
+    - name: Test
+      working-directory: ${{github.workspace}}/build
+      run: |
+        ctest -C ${{env.BUILD_TYPE}} --schedule-random -j2 -T memcheck > memcheck.out
+        cat memcheck.out
+        if tail -n 1 memcheck.out | grep -q "Memory checking results:"; then
+          exit 0
+        else
+          for f in Testing/Temporary/MemoryChecker.*.log; do
+            if tail -n 1 $f | grep -q "ERROR SUMMARY: 0 errors"; then
+              tail -n 1 $f
+              continue
+            else
+              echo "Memory check failed in $f"
+              cat $f
+              exit 1
+            fi
+          done
+          exit 0
+        fi
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
index 567295783d..eb6720dbaa 100644
--- a/.github/workflows/makefile.yml
+++ b/.github/workflows/makefile.yml
@@ -31,9 +31,19 @@ on:
     - '!**CMakeLists.txt'
     - '!**md'
 
+permissions:
+  contents: read
+
 env:
-  CFLAGS: "-Wall -pedantic"
-  FFLAGS: "-fimplicit-none -frecursive -fopenmp -fcheck=all"
+  CC: "gcc"
+  FC: "gfortran"
+  CFLAGS: "-O3 -flto -Wall -pedantic-errors"
+  FFLAGS: "-O2 -flto -Wall -Werror=conversion -pedantic -fimplicit-none -frecursive -fopenmp -fcheck=all"
+  FFLAGS_NOOPT: "-O0 -flto -Wall -fimplicit-none -frecursive -fopenmp -fcheck=all"
+  LDFLAGS: ""
+  AR: "ar"
+  ARFLAGS: "cr"
+  RANLIB: "ranlib"
 
 defaults:
   run:
@@ -45,10 +55,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout LAPACK
-      uses: actions/checkout@v2
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+    - name: Set configurations
+      run: |
+        echo "SHELL = /bin/sh" >> make.inc
+        echo "FFLAGS_DRV = ${{env.FFLAGS}}" >> make.inc
+        echo "TIMER = INT_ETIME" >> make.inc
+        echo "BLASLIB = ${{github.workspace}}/librefblas.a" >> make.inc
+        echo "CBLASLIB = ${{github.workspace}}/libcblas.a" >> make.inc
+        echo "LAPACKLIB = ${{github.workspace}}/liblapack.a" >> make.inc
+        echo "TMGLIB = ${{github.workspace}}/libtmglib.a" >> make.inc
+        echo "LAPACKELIB = ${{github.workspace}}/liblapacke.a" >> make.inc
+        echo "DOCSDIR = ${{github.workspace}}/DOCS" >> make.inc
     - name: Install
       run: |
-        cp make.inc.example make.inc
         make -s -j2 all
         make -j2 lapack_install
 
@@ -56,13 +76,23 @@ jobs:
     runs-on: macos-latest
     steps:
     - name: Checkout LAPACK
-      uses: actions/checkout@v2
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+    - name: Set configurations
+      run: |
+        echo "SHELL = /bin/sh" >> make.inc
+        echo "FFLAGS_DRV = ${{env.FFLAGS}}" >> make.inc
+        echo "TIMER = INT_ETIME" >> make.inc
+        echo "BLASLIB = ${{github.workspace}}/librefblas.a" >> make.inc
+        echo "CBLASLIB = ${{github.workspace}}/libcblas.a" >> make.inc
+        echo "LAPACKLIB = ${{github.workspace}}/liblapack.a" >> make.inc
+        echo "TMGLIB = ${{github.workspace}}/libtmglib.a" >> make.inc
+        echo "LAPACKELIB = ${{github.workspace}}/liblapacke.a" >> make.inc
+        echo "DOCSDIR = ${{github.workspace}}/DOCS" >> make.inc
     - name: Alias for GCC compilers
       run: |
-        sudo ln -s $(which gcc-11) /usr/local/bin/gcc
-        sudo ln -s $(which gfortran-11) /usr/local/bin/gfortran
+        sudo ln -s $(which gcc-14) /usr/local/bin/gcc
+        sudo ln -s $(which gfortran-14) /usr/local/bin/gfortran
     - name: Install
       run: |
-        cp make.inc.example make.inc
         make -s -j2 all
         make -j2 lapack_install
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000000..4900d2e194
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,239 @@
+name: Release
+
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - 'v*' # Push events to matching v*, i.e. v1.0, v2023.11.15
+
+jobs:
+  build-linux-x64:
+    name: blas / lapack -- Linux (x86_64) -- Release ${{ github.ref_name }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout lapack
+        uses: actions/checkout@v4
+
+      - name: Install Julia
+        uses: julia-actions/setup-julia@v2
+        with:
+          version: "1.7"
+          arch: x64
+
+      - name: Set the environment variables BINARYBUILDER_AUTOMATIC_APPLE, BLAS_LAPACK_RELEASE, BLAS_LAPACK_COMMIT
+        shell: bash
+        run: |
+          echo "BINARYBUILDER_AUTOMATIC_APPLE=true" >> $GITHUB_ENV
+          echo "BLAS_LAPACK_RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
+          echo "BLAS_LAPACK_COMMIT=${{ github.sha }}" >> $GITHUB_ENV
+          echo "BLAS_LAPACK_URL=https://github.com/${{ github.repository }}.git" >> $GITHUB_ENV
+
+      - name: Cross-compilation of blas / lapack -- x86_64-linux-gnu-libgfortran5
+        run: |
+          julia --color=no -e 'using Pkg; Pkg.add("BinaryBuilder")'
+          julia --color=no .github/julia/build_tarballs.jl x86_64-linux-gnu-libgfortran5 --verbose
+
+      - name: Archive artifact
+        run: julia --color=no .github/julia/generate_binaries.jl
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: blas_lapack_binaries.${{ github.ref_name }}.x86_64-linux-gnu-libgfortran5.tar.gz
+          path: ./blas_lapack_binaries.${{ github.ref_name }}.x86_64-linux-gnu-libgfortran5.tar.gz
+
+  build-linux-aarch64:
+    name: blas / lapack -- Linux (aarch64) -- Release ${{ github.ref_name }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout lapack
+        uses: actions/checkout@v4
+
+      - name: Install Julia
+        uses: julia-actions/setup-julia@v2
+        with:
+          version: "1.7"
+          arch: x64
+
+      - name: Set the environment variables BINARYBUILDER_AUTOMATIC_APPLE, BLAS_LAPACK_RELEASE, BLAS_LAPACK_COMMIT
+        shell: bash
+        run: |
+          echo "BINARYBUILDER_AUTOMATIC_APPLE=true" >> $GITHUB_ENV
+          echo "BLAS_LAPACK_RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
+          echo "BLAS_LAPACK_COMMIT=${{ github.sha }}" >> $GITHUB_ENV
+          echo "BLAS_LAPACK_URL=https://github.com/${{ github.repository }}.git" >> $GITHUB_ENV
+
+      - name: Cross-compilation of blas / lapack -- aarch64-linux-gnu-libgfortran5
+        run: |
+          julia --color=no -e 'using Pkg; Pkg.add("BinaryBuilder")'
+          julia --color=no .github/julia/build_tarballs.jl aarch64-linux-gnu-libgfortran5 --verbose
+
+      - name: Archive artifact
+        run: julia --color=no .github/julia/generate_binaries.jl
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: blas_lapack_binaries.${{ github.ref_name }}.aarch64-linux-gnu-libgfortran5.tar.gz
+          path: ./blas_lapack_binaries.${{ github.ref_name }}.aarch64-linux-gnu-libgfortran5.tar.gz
+
+  build-windows-x64:
+    name: blas / lapack -- Windows (x86_64) -- Release ${{ github.ref_name }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout lapack
+        uses: actions/checkout@v4
+
+      - name: Install Julia
+        uses: julia-actions/setup-julia@v2
+        with:
+          version: "1.7"
+          arch: x64
+
+      - name: Set the environment variables BINARYBUILDER_AUTOMATIC_APPLE, BLAS_LAPACK_RELEASE, BLAS_LAPACK_COMMIT
+        shell: bash
+        run: |
+          echo "BINARYBUILDER_AUTOMATIC_APPLE=true" >> $GITHUB_ENV
+          echo "BLAS_LAPACK_RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
+          echo "BLAS_LAPACK_COMMIT=${{ github.sha }}" >> $GITHUB_ENV
+          echo "BLAS_LAPACK_URL=https://github.com/${{ github.repository }}.git" >> $GITHUB_ENV
+
+      - name: Cross-compilation of blas / lapack -- x86_64-w64-mingw32-libgfortran5
+        run: |
+          julia --color=no -e 'using Pkg; Pkg.add("BinaryBuilder")'
+          julia --color=no .github/julia/build_tarballs.jl x86_64-w64-mingw32-libgfortran5 --verbose
+      - name: Archive artifact
+        run: julia --color=no .github/julia/generate_binaries.jl
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: blas_lapack_binaries.${{ github.ref_name }}.x86_64-w64-mingw32-libgfortran5.zip
+          path: ./blas_lapack_binaries.${{ github.ref_name }}.x86_64-w64-mingw32-libgfortran5.zip
+
+  build-mac-x64:
+    name: blas / lapack -- macOS (x86_64) -- Release ${{ github.ref_name }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout lapack
+        uses: actions/checkout@v4
+
+      - name: Install Julia
+        uses: julia-actions/setup-julia@v2
+        with:
+          version: "1.7"
+          arch: x64
+
+      - name: Set the environment variables BINARYBUILDER_AUTOMATIC_APPLE, BLAS_LAPACK_RELEASE, BLAS_LAPACK_COMMIT
+        shell: bash
+        run: |
+          echo "BINARYBUILDER_AUTOMATIC_APPLE=true" >> $GITHUB_ENV
+          echo "BLAS_LAPACK_RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
+          echo "BLAS_LAPACK_COMMIT=${{ github.sha }}" >> $GITHUB_ENV
+          echo "BLAS_LAPACK_URL=https://github.com/${{ github.repository }}.git" >> $GITHUB_ENV
+
+      - name: Cross-compilation of blas / lapack -- x86_64-apple-darwin-libgfortran5
+        run: |
+          julia --color=no -e 'using Pkg; Pkg.add("BinaryBuilder")'
+          julia --color=no .github/julia/build_tarballs.jl x86_64-apple-darwin-libgfortran5 --verbose
+
+      - name: Archive artifact
+        run: julia --color=no .github/julia/generate_binaries.jl
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: blas_lapack_binaries.${{ github.ref_name }}.x86_64-apple-darwin-libgfortran5.tar.gz
+          path: ./blas_lapack_binaries.${{ github.ref_name }}.x86_64-apple-darwin-libgfortran5.tar.gz
+
+  build-mac-aarch64:
+    name: blas / lapack -- macOS (aarch64) -- Release ${{ github.ref_name }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout lapack
+        uses: actions/checkout@v4
+
+      - name: Install Julia
+        uses: julia-actions/setup-julia@v2
+        with:
+          version: "1.7"
+          arch: x64
+
+      - name: Set the environment variables BINARYBUILDER_AUTOMATIC_APPLE, BLAS_LAPACK_RELEASE, BLAS_LAPACK_COMMIT
+        shell: bash
+        run: |
+          echo "BINARYBUILDER_AUTOMATIC_APPLE=true" >> $GITHUB_ENV
+          echo "BLAS_LAPACK_RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
+          echo "BLAS_LAPACK_COMMIT=${{ github.sha }}" >> $GITHUB_ENV
+          echo "BLAS_LAPACK_URL=https://github.com/${{ github.repository }}.git" >> $GITHUB_ENV
+
+      - name: Cross-compilation of blas / lapack -- aarch64-apple-darwin-libgfortran5
+        run: |
+          julia --color=no -e 'using Pkg; Pkg.add("BinaryBuilder")'
+          julia --color=no .github/julia/build_tarballs.jl aarch64-apple-darwin-libgfortran5 --verbose
+
+      - name: Archive artifact
+        run: julia --color=no .github/julia/generate_binaries.jl
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: blas_lapack_binaries.${{ github.ref_name }}.aarch64-apple-darwin-libgfortran5.tar.gz
+          path: ./blas_lapack_binaries.${{ github.ref_name }}.aarch64-apple-darwin-libgfortran5.tar.gz
+
+  release:
+    name: Create Release and Upload Binaries
+    needs: [build-windows-x64, build-linux-x64, build-linux-aarch64, build-mac-x64, build-mac-aarch64]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout lapack
+        uses: actions/checkout@v4
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: .
+
+      - name: Create GitHub Release
+        run: |
+          gh release create ${{ github.ref_name }} \
+            --title "${{ github.ref_name }}" \
+            --notes "" \
+            --verify-tag
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload Linux (x86_64) artifact
+        run: |
+          gh release upload ${{ github.ref_name }} \
+            blas_lapack_binaries.${{ github.ref_name }}.x86_64-linux-gnu-libgfortran5.tar.gz/blas_lapack_binaries.${{ github.ref_name }}.x86_64-linux-gnu-libgfortran5.tar.gz#blas_lapack.${{ github.ref_name }}.linux.x86_64.tar.gz
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload Linux (aarch64) artifact
+        run: |
+          gh release upload ${{ github.ref_name }} \
+            blas_lapack_binaries.${{ github.ref_name }}.aarch64-linux-gnu-libgfortran5.tar.gz/blas_lapack_binaries.${{ github.ref_name }}.aarch64-linux-gnu-libgfortran5.tar.gz#blas_lapack.${{ github.ref_name }}.linux.aarch64.tar.gz
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload Mac (x86_64) artifact
+        run: |
+          gh release upload ${{ github.ref_name }} \
+            blas_lapack_binaries.${{ github.ref_name }}.x86_64-apple-darwin-libgfortran5.tar.gz/blas_lapack_binaries.${{ github.ref_name }}.x86_64-apple-darwin-libgfortran5.tar.gz#blas_lapack.${{ github.ref_name }}.mac.x86_64.tar.gz
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload Mac (aarch64) artifact
+        run: |
+          gh release upload ${{ github.ref_name }} \
+            blas_lapack_binaries.${{ github.ref_name }}.aarch64-apple-darwin-libgfortran5.tar.gz/blas_lapack_binaries.${{ github.ref_name }}.aarch64-apple-darwin-libgfortran5.tar.gz#blas_lapack.${{ github.ref_name }}.mac.aarch64.tar.gz
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload Windows (x86_64) artifact
+        run: |
+          gh release upload ${{ github.ref_name }} \
+            blas_lapack_binaries.${{ github.ref_name }}.x86_64-w64-mingw32-libgfortran5.zip/blas_lapack_binaries.${{ github.ref_name }}.x86_64-w64-mingw32-libgfortran5.zip#blas_lapack.${{ github.ref_name }}.windows.x86_64.zip
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
new file mode 100644
index 0000000000..99ab75d5ad
--- /dev/null
+++ b/.github/workflows/scorecard.yml
@@ -0,0 +1,72 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '40 17 * * 2'
+  push:
+    branches: [ "master" ]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      # Uncomment the permissions below if installing in a private repository.
+      # contents: read
+      # actions: read
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # tag=v4.2.0
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecard on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
+          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories:
+          #   - `publish_results` will always be set to `false`, regardless
+          #     of the value entered here.
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
+        with:
+          sarif_file: results.sarif
diff --git a/.gitignore b/.gitignore
index 015f09d779..cd6f0ad023 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,8 +25,10 @@ CBLAS/examples/cblas_ex2
 # LAPACK testing
 TESTING/LIN/xlintst*
 TESTING/EIG/xeigtst*
+TESTING/EIG/xdmd*
 TESTING/*.out
 TESTING/*.txt
+!TESTING/CMakeLists.txt
 TESTING/x*
 
 # LAPACKE example
@@ -41,3 +43,7 @@ build*
 DOCS/man
 DOCS/explore-html
 output_err
+
+# Mod files from compilation in SRC
+SRC/la_constants.mod
+SRC/la_xisnan.mod
diff --git a/BLAS/CMakeLists.txt b/BLAS/CMakeLists.txt
index 45cec39c22..a33f38f253 100644
--- a/BLAS/CMakeLists.txt
+++ b/BLAS/CMakeLists.txt
@@ -1,3 +1,9 @@
+enable_language(Fortran)
+
+# Check for any necessary platform specific compiler flags
+include(CheckLAPACKCompilerFlags)
+CheckLAPACKCompilerFlags()
+
 add_subdirectory(SRC)
 if(BUILD_TESTING)
   add_subdirectory(TESTING)
diff --git a/BLAS/SRC/CMakeLists.txt b/BLAS/SRC/CMakeLists.txt
index d585729e6b..300948a975 100644
--- a/BLAS/SRC/CMakeLists.txt
+++ b/BLAS/SRC/CMakeLists.txt
@@ -29,21 +29,31 @@
 #  Level 1 BLAS
 #---------------------------------------------------------
 
-set(SBLAS1 isamax.f sasum.f saxpy.f scopy.f sdot.f snrm2.f90
+set(SBLAS1 isamax.f sasum.f saxpy.f saxpby.f scopy.f sdot.f snrm2.f90
 	srot.f srotg.f90 sscal.f sswap.f sdsdot.f srotmg.f srotm.f)
 
-set(CBLAS1 scabs1.f scasum.f scnrm2.f90 icamax.f caxpy.f ccopy.f
+set(CBLAS1 scabs1.f scasum.f scnrm2.f90 icamax.f90 caxpy.f caxpby.f ccopy.f
 	cdotc.f cdotu.f csscal.f crotg.f90 cscal.f cswap.f csrot.f)
 
-set(DBLAS1 idamax.f dasum.f daxpy.f dcopy.f ddot.f dnrm2.f90
+set(DBLAS1 idamax.f dasum.f daxpy.f daxpby.f dcopy.f ddot.f dnrm2.f90
 	drot.f drotg.f90 dscal.f dsdot.f dswap.f drotmg.f drotm.f)
 
-set(ZBLAS1 dcabs1.f dzasum.f dznrm2.f90 izamax.f zaxpy.f zcopy.f
+set(DB1AUX sscal.f isamax.f)
+
+set(ZBLAS1 dcabs1.f dzasum.f dznrm2.f90 izamax.f90 zaxpy.f zaxpby.f zcopy.f
 	zdotc.f zdotu.f zdscal.f zrotg.f90 zscal.f zswap.f zdrot.f)
 
-set(CB1AUX isamax.f sasum.f saxpy.f scopy.f snrm2.f90 sscal.f)
+set(CB1AUX
+    isamax.f idamax.f
+    sasum.f saxpy.f scopy.f sdot.f sgemm.f sgemv.f snrm2.f90 srot.f sscal.f
+    sswap.f)
 
-set(ZB1AUX idamax.f dasum.f daxpy.f dcopy.f dnrm2.f90 dscal.f)
+set(ZB1AUX
+    icamax.f90 idamax.f
+    cgemm.f cherk.f cscal.f ctrsm.f
+    dasum.f daxpy.f dcopy.f ddot.f dgemm.f dgemv.f dnrm2.f90 drot.f dscal.f
+    dswap.f
+    scabs1.f)
 
 #---------------------------------------------------------------------
 #  Auxiliary routines needed by both the Level 2 and Level 3 BLAS
@@ -72,15 +82,15 @@ set(ZBLAS2 zgemv.f zgbmv.f zhemv.f zhbmv.f zhpmv.f
 #---------------------------------------------------------
 #  Level 3 BLAS
 #---------------------------------------------------------
-set(SBLAS3 sgemm.f ssymm.f ssyrk.f ssyr2k.f strmm.f strsm.f)
+set(SBLAS3 sgemm.f ssymm.f ssyrk.f ssyr2k.f strmm.f strsm.f sgemmtr.f)
 
 set(CBLAS3 cgemm.f csymm.f csyrk.f csyr2k.f ctrmm.f ctrsm.f
-	chemm.f cherk.f cher2k.f)
+	chemm.f cherk.f cher2k.f cgemmtr.f)
 
-set(DBLAS3 dgemm.f dsymm.f dsyrk.f dsyr2k.f dtrmm.f dtrsm.f)
+set(DBLAS3 dgemm.f dsymm.f dsyrk.f dsyr2k.f dtrmm.f dtrsm.f dgemmtr.f)
 
 set(ZBLAS3 zgemm.f zsymm.f zsyrk.f zsyr2k.f ztrmm.f ztrsm.f
-	zhemm.f zherk.f zher2k.f)
+	zhemm.f zherk.f zher2k.f zgemmtr.f)
 
 
 set(SOURCES)
@@ -88,7 +98,8 @@ if(BUILD_SINGLE)
   list(APPEND SOURCES ${SBLAS1} ${ALLBLAS} ${SBLAS2} ${SBLAS3})
 endif()
 if(BUILD_DOUBLE)
-  list(APPEND SOURCES ${DBLAS1} ${ALLBLAS} ${DBLAS2} ${DBLAS3})
+  list(APPEND SOURCES
+       ${DBLAS1} ${DB1AUX} ${ALLBLAS} ${DBLAS2} ${DBLAS3} ${SBLAS3})
 endif()
 if(BUILD_COMPLEX)
   list(APPEND SOURCES ${CBLAS1} ${CB1AUX} ${ALLBLAS} ${CBLAS2} ${CBLAS3})
@@ -98,10 +109,53 @@ if(BUILD_COMPLEX16)
 endif()
 list(REMOVE_DUPLICATES SOURCES)
 
-add_library(${BLASLIB} ${SOURCES})
+add_library(${BLASLIB}_obj OBJECT ${SOURCES})
+set_target_properties(${BLASLIB}_obj PROPERTIES POSITION_INDEPENDENT_CODE ON)
+
+if(BUILD_INDEX64_EXT_API)
+  set(SOURCES_64_F)
+  # Copy files so we can set source property specific to /${BLASLIB}_64_obj target
+  file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLASLIB}_64_obj)
+  file(COPY ${SOURCES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${BLASLIB}_64_obj)
+  file(GLOB SOURCES_64_F ${CMAKE_CURRENT_BINARY_DIR}/${BLASLIB}_64_obj/*.f*)
+  add_library(${BLASLIB}_64_obj OBJECT ${SOURCES_64_F})
+  target_compile_options(${BLASLIB}_64_obj PRIVATE ${FOPT_ILP64})
+  set_target_properties(${BLASLIB}_64_obj PROPERTIES POSITION_INDEPENDENT_CODE ON)
+  #Add _64 suffix to all Fortran functions via macros
+  foreach(F IN LISTS SOURCES_64_F)
+    if(CMAKE_Fortran_COMPILER_ID STREQUAL "NAG")
+      set_source_files_properties(${F} PROPERTIES COMPILE_FLAGS "-fpp")
+    else()
+      set_source_files_properties(${F} PROPERTIES COMPILE_FLAGS "-cpp")
+    endif()
+    file(STRINGS ${F} ${F}.lst)
+    list(FILTER ${F}.lst INCLUDE REGEX "subroutine|SUBROUTINE|external|EXTERNAL|function|FUNCTION")
+    list(FILTER ${F}.lst EXCLUDE REGEX "^!.*")
+    list(FILTER ${F}.lst EXCLUDE REGEX "^[*].*")
+    list(FILTER ${F}.lst EXCLUDE REGEX "end|END")
+    foreach(FUNC IN LISTS ${F}.lst)
+      string(REGEX REPLACE "^[a-zA-Z0-9_ *]*(subroutine|SUBROUTINE|external|EXTERNAL|function|FUNCTION)[ ]*[*]?" "" FUNC ${FUNC})
+      string(REGEX REPLACE "[(][a-zA-Z0-9_, )]*$" "" FUNC ${FUNC})
+      string(STRIP ${FUNC} FUNC)
+      list(APPEND COPT_64_F "${FUNC}=${FUNC}_64")
+    endforeach()
+    list(REMOVE_DUPLICATES COPT_64_F)
+    set_source_files_properties(${F} PROPERTIES COMPILE_DEFINITIONS "${COPT_64_F}")
+  endforeach()
+endif()
+
+add_library(${BLASLIB}
+        $<TARGET_OBJECTS:${BLASLIB}_obj>
+        $<$<BOOL:${BUILD_INDEX64_EXT_API}>: $<TARGET_OBJECTS:${BLASLIB}_64_obj>>)
+
 set_target_properties(
   ${BLASLIB} PROPERTIES
   VERSION ${LAPACK_VERSION}
   SOVERSION ${LAPACK_MAJOR_VERSION}
+  POSITION_INDEPENDENT_CODE ON
   )
 lapack_install_library(${BLASLIB})
+
+if( TEST_FORTRAN_COMPILER )
+  add_dependencies( ${BLASLIB} run_test_zcomplexabs run_test_zcomplexdiv run_test_zcomplexmult run_test_zminMax )
+endif()
diff --git a/BLAS/SRC/icamax.f b/BLAS/SRC/DEPRECATED/icamax.f
similarity index 99%
rename from BLAS/SRC/icamax.f
rename to BLAS/SRC/DEPRECATED/icamax.f
index c103cc800e..b65cbf8cf3 100644
--- a/BLAS/SRC/icamax.f
+++ b/BLAS/SRC/DEPRECATED/icamax.f
@@ -54,7 +54,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup aux_blas
+*> \ingroup iamax
 *
 *> \par Further Details:
 *  =====================
diff --git a/BLAS/SRC/izamax.f b/BLAS/SRC/DEPRECATED/izamax.f
similarity index 99%
rename from BLAS/SRC/izamax.f
rename to BLAS/SRC/DEPRECATED/izamax.f
index e4779a1ff2..0fe4125070 100644
--- a/BLAS/SRC/izamax.f
+++ b/BLAS/SRC/DEPRECATED/izamax.f
@@ -54,7 +54,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup aux_blas
+*> \ingroup iamax
 *
 *> \par Further Details:
 *  =====================
diff --git a/BLAS/SRC/Makefile b/BLAS/SRC/Makefile
index 70534c8358..e49ff4d08a 100644
--- a/BLAS/SRC/Makefile
+++ b/BLAS/SRC/Makefile
@@ -69,19 +69,19 @@ all: $(BLASLIB)
 #  Comment out the next 6 definitions if you already have
 #  the Level 1 BLAS.
 #---------------------------------------------------------
-SBLAS1 = isamax.o sasum.o saxpy.o scopy.o sdot.o snrm2.o \
+SBLAS1 = isamax.o sasum.o saxpy.o saxpby.o scopy.o sdot.o snrm2.o \
 	srot.o srotg.o sscal.o sswap.o sdsdot.o srotmg.o srotm.o
 $(SBLAS1): $(FRC)
 
-CBLAS1 = scabs1.o scasum.o scnrm2.o icamax.o caxpy.o ccopy.o \
+CBLAS1 = scabs1.o scasum.o scnrm2.o icamax.o caxpy.o caxpby.o ccopy.o \
 	cdotc.o cdotu.o csscal.o crotg.o cscal.o cswap.o csrot.o
 $(CBLAS1): $(FRC)
 
-DBLAS1 = idamax.o dasum.o daxpy.o dcopy.o ddot.o dnrm2.o \
+DBLAS1 = idamax.o dasum.o daxpy.o daxpby.o dcopy.o ddot.o dnrm2.o \
 	drot.o drotg.o dscal.o dsdot.o dswap.o drotmg.o drotm.o
 $(DBLAS1): $(FRC)
 
-ZBLAS1 = dcabs1.o dzasum.o dznrm2.o izamax.o zaxpy.o zcopy.o \
+ZBLAS1 = dcabs1.o dzasum.o dznrm2.o izamax.o zaxpy.o zaxpby.o zcopy.o \
 	zdotc.o zdotu.o zdscal.o zrotg.o zscal.o zswap.o zdrot.o
 $(ZBLAS1): $(FRC)
 
@@ -127,18 +127,18 @@ $(ZBLAS2): $(FRC)
 #  Comment out the next 4 definitions if you already have
 #  the Level 3 BLAS.
 #---------------------------------------------------------
-SBLAS3 = sgemm.o ssymm.o ssyrk.o ssyr2k.o strmm.o strsm.o
+SBLAS3 = sgemm.o ssymm.o ssyrk.o ssyr2k.o strmm.o strsm.o sgemmtr.o
 $(SBLAS3): $(FRC)
 
 CBLAS3 = cgemm.o csymm.o csyrk.o csyr2k.o ctrmm.o ctrsm.o \
-	chemm.o cherk.o cher2k.o
+	chemm.o cherk.o cher2k.o cgemmtr.o
 $(CBLAS3): $(FRC)
 
-DBLAS3 = dgemm.o dsymm.o dsyrk.o dsyr2k.o dtrmm.o dtrsm.o
+DBLAS3 = dgemm.o dsymm.o dsyrk.o dsyr2k.o dtrmm.o dtrsm.o dgemmtr.o
 $(DBLAS3): $(FRC)
 
 ZBLAS3 = zgemm.o zsymm.o zsyrk.o zsyr2k.o ztrmm.o ztrsm.o \
-	zhemm.o zherk.o zher2k.o
+	zhemm.o zherk.o zher2k.o zgemmtr.o
 $(ZBLAS3): $(FRC)
 
 ALLOBJ = $(SBLAS1) $(SBLAS2) $(SBLAS3) $(DBLAS1) $(DBLAS2) $(DBLAS3) \
diff --git a/BLAS/SRC/caxpby.f b/BLAS/SRC/caxpby.f
new file mode 100644
index 0000000000..3ae8486a95
--- /dev/null
+++ b/BLAS/SRC/caxpby.f
@@ -0,0 +1,144 @@
+*> \brief \b CAXPBY
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE CAXPBY(N,CA,CX,INCX,CB,CY,INCY)
+*
+*       .. Scalar Arguments ..
+*       COMPLEX CA,CB
+*       INTEGER INCX,INCY,N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX CX(*),CY(*)
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*>    CAXPBY constant times a vector plus constant times a vector.
+*>
+*>    Y = ALPHA * X + BETA * Y
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          number of elements in input vector(s)
+*> \endverbatim
+*>
+*> \param[in] CA
+*> \verbatim
+*>          CA is COMPLEX
+*>          On entry, CA specifies the scalar alpha.
+*> \endverbatim
+*>
+*> \param[in] CX
+*> \verbatim
+*>          CX is COMPLEX array, dimension ( 1 + ( N - 1 )*abs( INCX ) )
+*> \endverbatim
+*>
+*> \param[in] INCX
+*> \verbatim
+*>          INCX is INTEGER
+*>          storage spacing between elements of CX
+*> \endverbatim
+*>
+*> \param[in] CB
+*> \verbatim
+*>          CB is COMPLEX
+*>          On entry, CB specifies the scalar beta.
+*> \endverbatim
+*>
+*> \param[in,out] CY
+*> \verbatim
+*>          CY is COMPLEX array, dimension ( 1 + ( N - 1 )*abs( INCY ) )
+*> \endverbatim
+*>
+*> \param[in] INCY
+*> \verbatim
+*>          INCY is INTEGER
+*>          storage spacing between elements of CY
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*> \author Martin Koehler, MPI Magdeburg
+*
+*> \ingroup axpby
+*
+*  =====================================================================
+      SUBROUTINE CAXPBY(N,CA,CX,INCX,CB,CY,INCY)
+      IMPLICIT NONE
+*
+*  -- Reference BLAS level1 routine --
+*  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      COMPLEX CA, CB
+      INTEGER INCX,INCY,N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX CX(*),CY(*)
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL CSCAL
+*
+*  =====================================================================
+*
+*     .. Local Scalars ..
+      INTEGER I,IX,IY
+*     ..
+      IF (N.LE.0) RETURN
+
+      IF (CA .EQ. (0.0,0.0) .AND. CB.NE.(0.0,0.0)) THEN
+         CALL CSCAL(N,CB, CY, INCY)
+         RETURN
+      END IF
+
+      IF (INCX.EQ.1 .AND. INCY.EQ.1) THEN
+*
+*        code for both increments equal to 1
+*
+         DO I = 1,N
+            CY(I) = CB*CY(I) + CA*CX(I)
+         END DO
+      ELSE
+*
+*        code for unequal increments or equal increments
+*          not equal to 1
+*
+         IX = 1
+         IY = 1
+         IF (INCX.LT.0) IX = (-N+1)*INCX + 1
+         IF (INCY.LT.0) IY = (-N+1)*INCY + 1
+         DO I = 1,N
+            CY(IY) = CB*CY(IY) + CA*CX(IX)
+            IX = IX + INCX
+            IY = IY + INCY
+         END DO
+      END IF
+*
+      RETURN
+*
+*     End of CAXBPY
+*
+      END
diff --git a/BLAS/SRC/caxpy.f b/BLAS/SRC/caxpy.f
index 8dfdba9c0a..6503a80c11 100644
--- a/BLAS/SRC/caxpy.f
+++ b/BLAS/SRC/caxpy.f
@@ -72,7 +72,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level1
+*> \ingroup axpy
 *
 *> \par Further Details:
 *  =====================
@@ -85,6 +85,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CAXPY(N,CA,CX,INCX,CY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/ccopy.f b/BLAS/SRC/ccopy.f
index 1b4999bae6..7d8c04dc16 100644
--- a/BLAS/SRC/ccopy.f
+++ b/BLAS/SRC/ccopy.f
@@ -65,7 +65,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level1
+*> \ingroup copy
 *
 *> \par Further Details:
 *  =====================
@@ -78,6 +78,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CCOPY(N,CX,INCX,CY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/cdotc.f b/BLAS/SRC/cdotc.f
index da29fdf896..bc38c7af46 100644
--- a/BLAS/SRC/cdotc.f
+++ b/BLAS/SRC/cdotc.f
@@ -67,7 +67,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level1
+*> \ingroup dot
 *
 *> \par Further Details:
 *  =====================
@@ -80,6 +80,7 @@
 *>
 *  =====================================================================
       COMPLEX FUNCTION CDOTC(N,CX,INCX,CY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/cdotu.f b/BLAS/SRC/cdotu.f
index d8c21d10c1..aa57e32031 100644
--- a/BLAS/SRC/cdotu.f
+++ b/BLAS/SRC/cdotu.f
@@ -67,7 +67,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level1
+*> \ingroup dot
 *
 *> \par Further Details:
 *  =====================
@@ -80,6 +80,7 @@
 *>
 *  =====================================================================
       COMPLEX FUNCTION CDOTU(N,CX,INCX,CY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/cgbmv.f b/BLAS/SRC/cgbmv.f
index 42a1da0335..238bf87e2d 100644
--- a/BLAS/SRC/cgbmv.f
+++ b/BLAS/SRC/cgbmv.f
@@ -148,6 +148,8 @@
 *>           ( 1 + ( n - 1 )*abs( INCY ) ) otherwise.
 *>           Before entry, the incremented array Y must contain the
 *>           vector y. On exit, Y is overwritten by the updated vector y.
+*>           If either m or n is zero, then Y not referenced and the function
+*>           performs a quick return.
 *> \endverbatim
 *>
 *> \param[in] INCY
@@ -165,7 +167,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level2
+*> \ingroup gbmv
 *
 *> \par Further Details:
 *  =====================
@@ -183,7 +185,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CGBMV(TRANS,M,N,KL,KU,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
+      SUBROUTINE CGBMV(TRANS,M,N,KL,KU,ALPHA,A,LDA,X,INCX,
+     +         BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/cgemm.f b/BLAS/SRC/cgemm.f
index baefe21e8b..7d62b66f69 100644
--- a/BLAS/SRC/cgemm.f
+++ b/BLAS/SRC/cgemm.f
@@ -35,6 +35,16 @@
 *>
 *> alpha and beta are scalars, and A, B and C are matrices, with op( A )
 *> an m by k matrix,  op( B )  a  k by n matrix and  C an m by n matrix.
+*>
+*> Note: if alpha and/or beta is zero, some parts of the matrix-matrix
+*>  operations are not performed. This results in the following NaN/Inf
+*>  propagation quirks:
+*>
+*>  1. If alpha is zero, NaNs or Infs in A or B do not affect the result.
+*>  2. If both alpha and beta are zero, then a zero matrix is returned in C,
+*>   irrespective of any NaNs or Infs in A, B or C.
+*>  3. If only beta is zero, alpha*op( A )*op( B ) is returned, irrespective
+*>   of any NaNs or Infs in C.
 *> \endverbatim
 *
 *  Arguments:
@@ -92,7 +102,9 @@
 *> \param[in] ALPHA
 *> \verbatim
 *>          ALPHA is COMPLEX
-*>           On entry, ALPHA specifies the scalar alpha.
+*>           On entry, ALPHA specifies the scalar alpha. If ALPHA is zero the
+*>           values in A and B do not affect the result. This also means that
+*>           NaN/Inf propagation from A and B is inhibited if ALPHA is zero.
 *> \endverbatim
 *>
 *> \param[in] A
@@ -102,7 +114,10 @@
 *>           Before entry with  TRANSA = 'N' or 'n',  the leading  m by k
 *>           part of the array  A  must contain the matrix  A,  otherwise
 *>           the leading  k by m  part of the array  A  must contain  the
-*>           matrix A.
+*>           matrix A, except if ALPHA is zero.
+*>           If ALPHA is zero, none of the values in A affect the result, even
+*>           if they are NaN/Inf. This also implies that if ALPHA is zero,
+*>           the matrix elements of A need not be initialized by the caller.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -121,7 +136,10 @@
 *>           Before entry with  TRANSB = 'N' or 'n',  the leading  k by n
 *>           part of the array  B  must contain the matrix  B,  otherwise
 *>           the leading  n by k  part of the array  B  must contain  the
-*>           matrix B.
+*>           matrix B, except if ALPHA is zero.
+*>           If ALPHA is zero, none of the values in B affect the result, even
+*>           if they are NaN/Inf. This also implies that if ALPHA is zero,
+*>           the matrix elements of B need not be initialized by the caller.
 *> \endverbatim
 *>
 *> \param[in] LDB
@@ -136,16 +154,19 @@
 *> \param[in] BETA
 *> \verbatim
 *>          BETA is COMPLEX
-*>           On entry,  BETA  specifies the scalar  beta.  When  BETA  is
-*>           supplied as zero then C need not be set on input.
+*>           On entry,  BETA  specifies the scalar  beta. If BETA is zero the
+*>           values in C do not affect the result. This also means that
+*>           NaN/Inf propagation from C is inhibited if BETA is zero.
 *> \endverbatim
 *>
 *> \param[in,out] C
 *> \verbatim
 *>          C is COMPLEX array, dimension ( LDC, N )
 *>           Before entry, the leading  m by n  part of the array  C must
-*>           contain the matrix  C,  except when  beta  is zero, in which
-*>           case C need not be set on entry.
+*>           contain the matrix  C, except if beta is zero.
+*>           If beta is zero, none of the values in C affect the result, even
+*>           if they are NaN/Inf. This also implies that if beta is zero,
+*>           the matrix elements of C need not be initialized by the caller.
 *>           On exit, the array  C  is overwritten by the  m by n  matrix
 *>           ( alpha*op( A )*op( B ) + beta*C ).
 *> \endverbatim
@@ -166,7 +187,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level3
+*> \ingroup gemm
 *
 *> \par Further Details:
 *  =====================
@@ -183,7 +204,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
+      SUBROUTINE CGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,
+     +         BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/cgemmtr.f b/BLAS/SRC/cgemmtr.f
new file mode 100644
index 0000000000..a5f552960d
--- /dev/null
+++ b/BLAS/SRC/cgemmtr.f
@@ -0,0 +1,569 @@
+*> \brief \b CGEMMTR
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE CGEMMTR(UPLO,TRANSA,TRANSB,N,K,ALPHA,A,LDA,B,LDB,BETA,
+*                         C,LDC)
+*
+*       .. Scalar Arguments ..
+*       COMPLEX ALPHA,BETA
+*       INTEGER K,LDA,LDB,LDC,N
+*       CHARACTER TRANSA,TRANSB, UPLO
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX A(LDA,*),B(LDB,*),C(LDC,*)
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> CGEMMTR  performs one of the matrix-matrix operations
+*>
+*>    C := alpha*op( A )*op( B ) + beta*C,
+*>
+*> where  op( X ) is one of
+*>
+*>    op( X ) = X   or   op( X ) = X**T,
+*>
+*> alpha and beta are scalars, and A, B and C are matrices, with op( A )
+*> an n by k matrix,  op( B )  a  k by n matrix and  C an n by n matrix.
+*> Thereby, the routine only accesses and updates the upper or lower
+*> triangular part of the result matrix C. This behaviour can be used if
+*> the resulting matrix C is known to be Hermitian or symmetric.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>           On entry, UPLO specifies whether the lower or the upper
+*>           triangular part of C is access and updated.
+*>
+*>              UPLO = 'L' or 'l', the lower triangular part of C is used.
+*>
+*>              UPLO = 'U' or 'u', the upper triangular part of C is used.
+*> \endverbatim
+*
+*> \param[in] TRANSA
+*> \verbatim
+*>          TRANSA is CHARACTER*1
+*>           On entry, TRANSA specifies the form of op( A ) to be used in
+*>           the matrix multiplication as follows:
+*>
+*>              TRANSA = 'N' or 'n',  op( A ) = A.
+*>
+*>              TRANSA = 'T' or 't',  op( A ) = A**T.
+*>
+*>              TRANSA = 'C' or 'c',  op( A ) = A**H.
+*> \endverbatim
+*>
+*> \param[in] TRANSB
+*> \verbatim
+*>          TRANSB is CHARACTER*1
+*>           On entry, TRANSB specifies the form of op( B ) to be used in
+*>           the matrix multiplication as follows:
+*>
+*>              TRANSB = 'N' or 'n',  op( B ) = B.
+*>
+*>              TRANSB = 'T' or 't',  op( B ) = B**T.
+*>
+*>              TRANSB = 'C' or 'c',  op( B ) = B**H.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>           On entry,  N specifies the number of rows and columns of
+*>           the matrix C, the number of columns of op(B) and the number
+*>           of rows of op(A).  N must be at least zero.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>           On entry,  K  specifies  the number of columns of the matrix
+*>           op( A ) and the number of rows of the matrix op( B ). K must
+*>           be at least  zero.
+*> \endverbatim
+*>
+*> \param[in] ALPHA
+*> \verbatim
+*>          ALPHA is COMPLEX.
+*>           On entry, ALPHA specifies the scalar alpha.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX array, dimension ( LDA, ka ), where ka is
+*>           k  when  TRANSA = 'N' or 'n',  and is  n  otherwise.
+*>           Before entry with  TRANSA = 'N' or 'n',  the leading  n by k
+*>           part of the array  A  must contain the matrix  A,  otherwise
+*>           the leading  k by m  part of the array  A  must contain  the
+*>           matrix A.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>           On entry, LDA specifies the first dimension of A as declared
+*>           in the calling (sub) program. When  TRANSA = 'N' or 'n' then
+*>           LDA must be at least  max( 1, n ), otherwise  LDA must be at
+*>           least  max( 1, k ).
+*> \endverbatim
+*>
+*> \param[in] B
+*> \verbatim
+*>          B is COMPLEX array, dimension ( LDB, kb ), where kb is
+*>           n  when  TRANSB = 'N' or 'n',  and is  k  otherwise.
+*>           Before entry with  TRANSB = 'N' or 'n',  the leading  k by n
+*>           part of the array  B  must contain the matrix  B,  otherwise
+*>           the leading  n by k  part of the array  B  must contain  the
+*>           matrix B.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>           On entry, LDB specifies the first dimension of B as declared
+*>           in the calling (sub) program. When  TRANSB = 'N' or 'n' then
+*>           LDB must be at least  max( 1, k ), otherwise  LDB must be at
+*>           least  max( 1, n ).
+*> \endverbatim
+*>
+*> \param[in] BETA
+*> \verbatim
+*>          BETA is COMPLEX.
+*>           On entry,  BETA  specifies the scalar  beta.  When  BETA  is
+*>           supplied as zero then C need not be set on input.
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is COMPLEX array, dimension ( LDC, N )
+*>           Before entry, the leading  n by n  part of the array  C must
+*>           contain the matrix  C,  except when  beta  is zero, in which
+*>           case C need not be set on entry.
+*>           On exit, the upper or lower triangular part of the matrix
+*>           C  is overwritten by the n by n matrix
+*>           ( alpha*op( A )*op( B ) + beta*C ).
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>           On entry, LDC specifies the first dimension of C as declared
+*>           in  the  calling  (sub)  program.   LDC  must  be  at  least
+*>           max( 1, n ).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Martin Koehler
+*
+*> \ingroup gemmtr
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  Level 3 Blas routine.
+*>
+*>  -- Written on 19-July-2023.
+*>     Martin Koehler, MPI Magdeburg
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE CGEMMTR(UPLO,TRANSA,TRANSB,N,K,ALPHA,A,LDA,B,LDB,
+     +         BETA,C,LDC)
+      IMPLICIT NONE
+*
+*  -- Reference BLAS level3 routine --
+*  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      COMPLEX ALPHA,BETA
+      INTEGER K,LDA,LDB,LDC,N
+      CHARACTER TRANSA,TRANSB,UPLO
+*     ..
+*     .. Array Arguments ..
+      COMPLEX A(LDA,*),B(LDB,*),C(LDC,*)
+*     ..
+*
+*  =====================================================================
+*
+*     .. External Functions ..
+      LOGICAL LSAME
+      EXTERNAL LSAME
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC CONJG,MAX
+*     ..
+*     .. Local Scalars ..
+      COMPLEX TEMP
+      INTEGER I,INFO,J,L,NROWA,NROWB,ISTART, ISTOP
+      LOGICAL CONJA,CONJB,NOTA,NOTB,UPPER
+*     ..
+*     .. Parameters ..
+      COMPLEX ONE
+      PARAMETER (ONE= (1.0E+0,0.0E+0))
+      COMPLEX ZERO
+      PARAMETER (ZERO= (0.0E+0,0.0E+0))
+*     ..
+*
+*     Set  NOTA  and  NOTB  as  true if  A  and  B  respectively are not
+*     conjugated or transposed, set  CONJA and CONJB  as true if  A  and
+*     B  respectively are to be  transposed but  not conjugated  and set
+*     NROWA and  NROWB  as the number of rows of  A  and  B  respectively.
+*
+      NOTA = LSAME(TRANSA,'N')
+      NOTB = LSAME(TRANSB,'N')
+      CONJA = LSAME(TRANSA,'C')
+      CONJB = LSAME(TRANSB,'C')
+      IF (NOTA) THEN
+          NROWA = N
+      ELSE
+          NROWA = K
+      END IF
+      IF (NOTB) THEN
+          NROWB = K
+      ELSE
+          NROWB = N
+      END IF
+      UPPER = LSAME(UPLO, 'U')
+
+*
+*     Test the input parameters.
+*
+      INFO = 0
+      IF ((.NOT. UPPER) .AND. (.NOT. LSAME(UPLO, 'L'))) THEN
+          INFO = 1
+      ELSE IF ((.NOT.NOTA) .AND. (.NOT.CONJA) .AND.
+     +    (.NOT.LSAME(TRANSA,'T'))) THEN
+          INFO = 2
+      ELSE IF ((.NOT.NOTB) .AND. (.NOT.CONJB) .AND.
+     +         (.NOT.LSAME(TRANSB,'T'))) THEN
+          INFO = 3
+      ELSE IF (N.LT.0) THEN
+          INFO = 4
+      ELSE IF (K.LT.0) THEN
+          INFO = 5
+      ELSE IF (LDA.LT.MAX(1,NROWA)) THEN
+          INFO = 8
+      ELSE IF (LDB.LT.MAX(1,NROWB)) THEN
+          INFO = 10
+      ELSE IF (LDC.LT.MAX(1,N)) THEN
+          INFO = 13
+      END IF
+      IF (INFO.NE.0) THEN
+          CALL XERBLA('CGEMMTR',INFO)
+          RETURN
+      END IF
+*
+*     Quick return if possible.
+*
+      IF (N.EQ.0) RETURN
+*
+*     And when  alpha.eq.zero.
+*
+      IF (ALPHA.EQ.ZERO) THEN
+          IF (BETA.EQ.ZERO) THEN
+              DO 20 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 10 I = ISTART, ISTOP
+                      C(I,J) = ZERO
+   10             CONTINUE
+   20         CONTINUE
+          ELSE
+              DO 40 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+                  DO 30 I = ISTART, ISTOP
+                      C(I,J) = BETA*C(I,J)
+   30             CONTINUE
+   40         CONTINUE
+          END IF
+          RETURN
+      END IF
+*
+*     Start the operations.
+*
+      IF (NOTB) THEN
+          IF (NOTA) THEN
+*
+*           Form  C := alpha*A*B + beta*C.
+*
+              DO 90 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+                  IF (BETA.EQ.ZERO) THEN
+                      DO 50 I = ISTART, ISTOP
+                          C(I,J) = ZERO
+   50                 CONTINUE
+                  ELSE IF (BETA.NE.ONE) THEN
+                      DO 60 I = ISTART, ISTOP
+                          C(I,J) = BETA*C(I,J)
+   60                 CONTINUE
+                  END IF
+                  DO 80 L = 1,K
+                      TEMP = ALPHA*B(L,J)
+                      DO 70 I = ISTART, ISTOP
+                          C(I,J) = C(I,J) + TEMP*A(I,L)
+   70                 CONTINUE
+   80             CONTINUE
+   90         CONTINUE
+          ELSE IF (CONJA) THEN
+*
+*           Form  C := alpha*A**H*B + beta*C.
+*
+              DO 120 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 110 I = ISTART, ISTOP
+                      TEMP = ZERO
+                      DO 100 L = 1,K
+                          TEMP = TEMP + CONJG(A(L,I))*B(L,J)
+  100                 CONTINUE
+                      IF (BETA.EQ.ZERO) THEN
+                          C(I,J) = ALPHA*TEMP
+                      ELSE
+                          C(I,J) = ALPHA*TEMP + BETA*C(I,J)
+                      END IF
+  110             CONTINUE
+  120         CONTINUE
+          ELSE
+*
+*           Form  C := alpha*A**T*B + beta*C
+*
+              DO 150 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 140 I = ISTART, ISTOP
+                      TEMP = ZERO
+                      DO 130 L = 1,K
+                          TEMP = TEMP + A(L,I)*B(L,J)
+  130                 CONTINUE
+                      IF (BETA.EQ.ZERO) THEN
+                          C(I,J) = ALPHA*TEMP
+                      ELSE
+                          C(I,J) = ALPHA*TEMP + BETA*C(I,J)
+                      END IF
+  140             CONTINUE
+  150         CONTINUE
+          END IF
+      ELSE IF (NOTA) THEN
+          IF (CONJB) THEN
+*
+*           Form  C := alpha*A*B**H + beta*C.
+*
+              DO 200 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  IF (BETA.EQ.ZERO) THEN
+                      DO 160 I = ISTART,ISTOP
+                          C(I,J) = ZERO
+  160                 CONTINUE
+                  ELSE IF (BETA.NE.ONE) THEN
+                      DO 170 I = ISTART, ISTOP
+                          C(I,J) = BETA*C(I,J)
+  170                 CONTINUE
+                  END IF
+                  DO 190 L = 1,K
+                      TEMP = ALPHA*CONJG(B(J,L))
+                      DO 180 I = ISTART, ISTOP
+                          C(I,J) = C(I,J) + TEMP*A(I,L)
+  180                 CONTINUE
+  190             CONTINUE
+  200         CONTINUE
+          ELSE
+*
+*           Form  C := alpha*A*B**T + beta*C
+*
+              DO 250 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  IF (BETA.EQ.ZERO) THEN
+                      DO 210 I = ISTART, ISTOP
+                          C(I,J) = ZERO
+  210                 CONTINUE
+                  ELSE IF (BETA.NE.ONE) THEN
+                      DO 220 I = ISTART, ISTOP
+                          C(I,J) = BETA*C(I,J)
+  220                 CONTINUE
+                  END IF
+                  DO 240 L = 1,K
+                      TEMP = ALPHA*B(J,L)
+                      DO 230 I = ISTART, ISTOP
+                          C(I,J) = C(I,J) + TEMP*A(I,L)
+  230                 CONTINUE
+  240             CONTINUE
+  250         CONTINUE
+          END IF
+      ELSE IF (CONJA) THEN
+          IF (CONJB) THEN
+*
+*           Form  C := alpha*A**H*B**H + beta*C.
+*
+              DO 280 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 270 I = ISTART, ISTOP
+                      TEMP = ZERO
+                      DO 260 L = 1,K
+                          TEMP = TEMP + CONJG(A(L,I))*CONJG(B(J,L))
+  260                 CONTINUE
+                      IF (BETA.EQ.ZERO) THEN
+                          C(I,J) = ALPHA*TEMP
+                      ELSE
+                          C(I,J) = ALPHA*TEMP + BETA*C(I,J)
+                      END IF
+  270             CONTINUE
+  280         CONTINUE
+          ELSE
+*
+*           Form  C := alpha*A**H*B**T + beta*C
+*
+              DO 310 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 300 I = ISTART, ISTOP
+                      TEMP = ZERO
+                      DO 290 L = 1,K
+                          TEMP = TEMP + CONJG(A(L,I))*B(J,L)
+  290                 CONTINUE
+                      IF (BETA.EQ.ZERO) THEN
+                          C(I,J) = ALPHA*TEMP
+                      ELSE
+                          C(I,J) = ALPHA*TEMP + BETA*C(I,J)
+                      END IF
+  300             CONTINUE
+  310         CONTINUE
+          END IF
+      ELSE
+          IF (CONJB) THEN
+*
+*           Form  C := alpha*A**T*B**H + beta*C
+*
+              DO 340 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 330 I = ISTART, ISTOP
+                      TEMP = ZERO
+                      DO 320 L = 1,K
+                          TEMP = TEMP + A(L,I)*CONJG(B(J,L))
+  320                 CONTINUE
+                      IF (BETA.EQ.ZERO) THEN
+                          C(I,J) = ALPHA*TEMP
+                      ELSE
+                          C(I,J) = ALPHA*TEMP + BETA*C(I,J)
+                      END IF
+  330             CONTINUE
+  340         CONTINUE
+          ELSE
+*
+*           Form  C := alpha*A**T*B**T + beta*C
+*
+              DO 370 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 360 I = ISTART, ISTOP
+                      TEMP = ZERO
+                      DO 350 L = 1,K
+                          TEMP = TEMP + A(L,I)*B(J,L)
+  350                 CONTINUE
+                      IF (BETA.EQ.ZERO) THEN
+                          C(I,J) = ALPHA*TEMP
+                      ELSE
+                          C(I,J) = ALPHA*TEMP + BETA*C(I,J)
+                      END IF
+  360             CONTINUE
+  370         CONTINUE
+          END IF
+      END IF
+*
+      RETURN
+*
+*     End of CGEMMTR
+*
+      END
diff --git a/BLAS/SRC/cgemv.f b/BLAS/SRC/cgemv.f
index 574be07602..cb1232bc4d 100644
--- a/BLAS/SRC/cgemv.f
+++ b/BLAS/SRC/cgemv.f
@@ -119,6 +119,8 @@
 *>           Before entry with BETA non-zero, the incremented array Y
 *>           must contain the vector y. On exit, Y is overwritten by the
 *>           updated vector y.
+*>           If either m or n is zero, then Y not referenced and the function
+*>           performs a quick return.
 *> \endverbatim
 *>
 *> \param[in] INCY
@@ -136,7 +138,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level2
+*> \ingroup gemv
 *
 *> \par Further Details:
 *  =====================
@@ -155,6 +157,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGEMV(TRANS,M,N,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/cgerc.f b/BLAS/SRC/cgerc.f
index 716628d8ad..3df05a5c5e 100644
--- a/BLAS/SRC/cgerc.f
+++ b/BLAS/SRC/cgerc.f
@@ -109,7 +109,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level2
+*> \ingroup ger
 *
 *> \par Further Details:
 *  =====================
@@ -127,6 +127,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGERC(M,N,ALPHA,X,INCX,Y,INCY,A,LDA)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/cgeru.f b/BLAS/SRC/cgeru.f
index 5ff8f9405d..065397831a 100644
--- a/BLAS/SRC/cgeru.f
+++ b/BLAS/SRC/cgeru.f
@@ -109,7 +109,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level2
+*> \ingroup ger
 *
 *> \par Further Details:
 *  =====================
@@ -127,6 +127,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGERU(M,N,ALPHA,X,INCX,Y,INCY,A,LDA)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/chbmv.f b/BLAS/SRC/chbmv.f
index bddab93259..25113ecb2b 100644
--- a/BLAS/SRC/chbmv.f
+++ b/BLAS/SRC/chbmv.f
@@ -165,7 +165,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level2
+*> \ingroup hbmv
 *
 *> \par Further Details:
 *  =====================
@@ -184,6 +184,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CHBMV(UPLO,N,K,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/chemm.f b/BLAS/SRC/chemm.f
index 5d66dda3d5..bc65e5323b 100644
--- a/BLAS/SRC/chemm.f
+++ b/BLAS/SRC/chemm.f
@@ -170,7 +170,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level3
+*> \ingroup hemm
 *
 *> \par Further Details:
 *  =====================
@@ -188,6 +188,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CHEMM(SIDE,UPLO,M,N,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -238,9 +239,11 @@ SUBROUTINE CHEMM(SIDE,UPLO,M,N,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
 *     Test the input parameters.
 *
       INFO = 0
-      IF ((.NOT.LSAME(SIDE,'L')) .AND. (.NOT.LSAME(SIDE,'R'))) THEN
+      IF ((.NOT.LSAME(SIDE,'L')) .AND.
+     +    (.NOT.LSAME(SIDE,'R'))) THEN
           INFO = 1
-      ELSE IF ((.NOT.UPPER) .AND. (.NOT.LSAME(UPLO,'L'))) THEN
+      ELSE IF ((.NOT.UPPER) .AND.
+     +         (.NOT.LSAME(UPLO,'L'))) THEN
           INFO = 2
       ELSE IF (M.LT.0) THEN
           INFO = 3
diff --git a/BLAS/SRC/chemv.f b/BLAS/SRC/chemv.f
index 288ab1436f..fbc4eca8f8 100644
--- a/BLAS/SRC/chemv.f
+++ b/BLAS/SRC/chemv.f
@@ -132,7 +132,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level2
+*> \ingroup hemv
 *
 *> \par Further Details:
 *  =====================
@@ -151,6 +151,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CHEMV(UPLO,N,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/cher.f b/BLAS/SRC/cher.f
index 2695a7eb1b..63b630e7bd 100644
--- a/BLAS/SRC/cher.f
+++ b/BLAS/SRC/cher.f
@@ -114,7 +114,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level2
+*> \ingroup her
 *
 *> \par Further Details:
 *  =====================
@@ -132,6 +132,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CHER(UPLO,N,ALPHA,X,INCX,A,LDA)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/cher2.f b/BLAS/SRC/cher2.f
index 68976b46ee..d6770a295e 100644
--- a/BLAS/SRC/cher2.f
+++ b/BLAS/SRC/cher2.f
@@ -129,7 +129,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level2
+*> \ingroup her2
 *
 *> \par Further Details:
 *  =====================
@@ -147,6 +147,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CHER2(UPLO,N,ALPHA,X,INCX,Y,INCY,A,LDA)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/cher2k.f b/BLAS/SRC/cher2k.f
index a77908738a..8cffc18211 100644
--- a/BLAS/SRC/cher2k.f
+++ b/BLAS/SRC/cher2k.f
@@ -173,7 +173,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level3
+*> \ingroup her2k
 *
 *> \par Further Details:
 *  =====================
@@ -194,6 +194,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CHER2K(UPLO,TRANS,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/cherk.f b/BLAS/SRC/cherk.f
index 7aa8b33cd3..aad09b7dab 100644
--- a/BLAS/SRC/cherk.f
+++ b/BLAS/SRC/cherk.f
@@ -149,7 +149,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level3
+*> \ingroup herk
 *
 *> \par Further Details:
 *  =====================
@@ -170,6 +170,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CHERK(UPLO,TRANS,N,K,ALPHA,A,LDA,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -352,7 +353,7 @@ SUBROUTINE CHERK(UPLO,TRANS,N,K,ALPHA,A,LDA,BETA,C,LDC)
   200             CONTINUE
                   RTEMP = ZERO
                   DO 210 L = 1,K
-                      RTEMP = RTEMP + CONJG(A(L,J))*A(L,J)
+                      RTEMP = RTEMP + REAL(CONJG(A(L,J))*A(L,J))
   210             CONTINUE
                   IF (BETA.EQ.ZERO) THEN
                       C(J,J) = ALPHA*RTEMP
@@ -364,7 +365,7 @@ SUBROUTINE CHERK(UPLO,TRANS,N,K,ALPHA,A,LDA,BETA,C,LDC)
               DO 260 J = 1,N
                   RTEMP = ZERO
                   DO 230 L = 1,K
-                      RTEMP = RTEMP + CONJG(A(L,J))*A(L,J)
+                      RTEMP = RTEMP + REAL(CONJG(A(L,J))*A(L,J))
   230             CONTINUE
                   IF (BETA.EQ.ZERO) THEN
                       C(J,J) = ALPHA*RTEMP
diff --git a/BLAS/SRC/chpmv.f b/BLAS/SRC/chpmv.f
index 459a9ba3ed..241906a8d8 100644
--- a/BLAS/SRC/chpmv.f
+++ b/BLAS/SRC/chpmv.f
@@ -127,7 +127,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level2
+*> \ingroup hpmv
 *
 *> \par Further Details:
 *  =====================
@@ -146,6 +146,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CHPMV(UPLO,N,ALPHA,AP,X,INCX,BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/chpr.f b/BLAS/SRC/chpr.f
index 62a946f242..3d197f5142 100644
--- a/BLAS/SRC/chpr.f
+++ b/BLAS/SRC/chpr.f
@@ -109,7 +109,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level2
+*> \ingroup hpr
 *
 *> \par Further Details:
 *  =====================
@@ -127,6 +127,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CHPR(UPLO,N,ALPHA,X,INCX,AP)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/chpr2.f b/BLAS/SRC/chpr2.f
index cb07168b0e..13e9d51848 100644
--- a/BLAS/SRC/chpr2.f
+++ b/BLAS/SRC/chpr2.f
@@ -124,7 +124,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level2
+*> \ingroup hpr2
 *
 *> \par Further Details:
 *  =====================
@@ -142,6 +142,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CHPR2(UPLO,N,ALPHA,X,INCX,Y,INCY,AP)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/crotg.f90 b/BLAS/SRC/crotg.f90
index 7806140668..08f6cb1bf7 100644
--- a/BLAS/SRC/crotg.f90
+++ b/BLAS/SRC/crotg.f90
@@ -1,38 +1,37 @@
-!> \brief \b CROTG
+!> \brief \b CROTG  generates a Givens rotation with real cosine and complex sine.
 !
 !  =========== DOCUMENTATION ===========
 !
 ! Online html documentation available at
 !            http://www.netlib.org/lapack/explore-html/
 !
-!  Definition:
-!  ===========
-!
-!  CROTG constructs a plane rotation
-!     [  c         s ] [ a ] = [ r ]
-!     [ -conjg(s)  c ] [ b ]   [ 0 ]
-!  where c is real, s ic complex, and c**2 + conjg(s)*s = 1.
-!
 !> \par Purpose:
 !  =============
 !>
 !> \verbatim
 !>
+!> CROTG constructs a plane rotation
+!>    [  c         s ] [ a ] = [ r ]
+!>    [ -conjg(s)  c ] [ b ]   [ 0 ]
+!> where c is real, s is complex, and c**2 + conjg(s)*s = 1.
+!>
 !> The computation uses the formulas
 !>    |x| = sqrt( Re(x)**2 + Im(x)**2 )
 !>    sgn(x) = x / |x|  if x /= 0
 !>           = 1        if x  = 0
 !>    c = |a| / sqrt(|a|**2 + |b|**2)
 !>    s = sgn(a) * conjg(b) / sqrt(|a|**2 + |b|**2)
-!> When a and b are real and r /= 0, the formulas simplify to
 !>    r = sgn(a)*sqrt(|a|**2 + |b|**2)
+!> When a and b are real and r /= 0, the formulas simplify to
 !>    c = a / r
 !>    s = b / r
-!> the same as in CROTG when |a| > |b|.  When |b| >= |a|, the
-!> sign of c and s will be different from those computed by CROTG
+!> the same as in SROTG when |a| > |b|.  When |b| >= |a|, the
+!> sign of c and s will be different from those computed by SROTG
 !> if the signs of a and b are not the same.
 !>
 !> \endverbatim
+!>
+!> @see lartg, @see lartgp
 !
 !  Arguments:
 !  ==========
@@ -65,20 +64,19 @@
 !  Authors:
 !  ========
 !
-!> \author Edward Anderson, Lockheed Martin
+!> \author Weslley Pereira, University of Colorado Denver, USA
 !
-!> \par Contributors:
-!  ==================
-!>
-!> Weslley Pereira, University of Colorado Denver, USA
+!> \date December 2021
 !
-!> \ingroup single_blas_level1
+!> \ingroup rotg
 !
 !> \par Further Details:
 !  =====================
 !>
 !> \verbatim
 !>
+!> Based on the algorithm from
+!>
 !>  Anderson E. (2017)
 !>  Algorithm 978: Safe Scaling in the Level 1 BLAS
 !>  ACM Trans Math Softw 44:1--28
@@ -88,6 +86,7 @@
 !
 !  =====================================================================
 subroutine CROTG( a, b, c, s )
+   implicit none
    integer, parameter :: wp = kind(1.e0)
 !
 !  -- Reference BLAS level1 routine --
@@ -108,21 +107,14 @@ subroutine CROTG( a, b, c, s )
       1-minexponent(0._wp), &
       maxexponent(0._wp)-1 &
    )
-   real(wp), parameter :: rtmin = sqrt( real(radix(0._wp),wp)**max( &
-      minexponent(0._wp)-1, &
-      1-maxexponent(0._wp) &
-   ) / epsilon(0._wp) )
-   real(wp), parameter :: rtmax = sqrt( real(radix(0._wp),wp)**max( &
-      1-minexponent(0._wp), &
-      maxexponent(0._wp)-1 &
-   ) * epsilon(0._wp) )
+   real(wp), parameter :: rtmin = sqrt( safmin )
 !  ..
 !  .. Scalar Arguments ..
    real(wp) :: c
    complex(wp) :: a, b, s
 !  ..
 !  .. Local Scalars ..
-   real(wp) :: d, f1, f2, g1, g2, h2, p, u, uu, v, vv, w
+   real(wp) :: d, f1, f2, g1, g2, h2, u, v, w, rtmax
    complex(wp) :: f, fs, g, gs, r, t
 !  ..
 !  .. Intrinsic Functions ..
@@ -144,30 +136,43 @@ subroutine CROTG( a, b, c, s )
       r = f
    else if( f == czero ) then
       c = zero
-      g1 = max( abs(real(g)), abs(aimag(g)) )
-      if( g1 > rtmin .and. g1 < rtmax ) then
+      if( real(g) == zero ) then
+         r = abs(aimag(g))
+         s = conjg( g ) / r
+      elseif( aimag(g) == zero ) then
+         r = abs(real(g))
+         s = conjg( g ) / r
+      else
+         g1 = max( abs(real(g)), abs(aimag(g)) )
+         rtmax = sqrt( safmax/2 )
+         if( g1 > rtmin .and. g1 < rtmax ) then
 !
 !        Use unscaled algorithm
 !
-         g2 = ABSSQ( g )
-         d = sqrt( g2 )
-         s = conjg( g ) / d
-         r = d
-      else
+!           The following two lines can be replaced by `d = abs( g )`.
+!           This algorithm do not use the intrinsic complex abs.
+            g2 = ABSSQ( g )
+            d = sqrt( g2 )
+            s = conjg( g ) / d
+            r = d
+         else
 !
 !        Use scaled algorithm
 !
-         u = min( safmax, max( safmin, g1 ) )
-         uu = one / u
-         gs = g*uu
-         g2 = ABSSQ( gs )
-         d = sqrt( g2 )
-         s = conjg( gs ) / d
-         r = d*u
+            u = min( safmax, max( safmin, g1 ) )
+            gs = g / u
+!           The following two lines can be replaced by `d = abs( gs )`.
+!           This algorithm do not use the intrinsic complex abs.
+            g2 = ABSSQ( gs )
+            d = sqrt( g2 )
+            s = conjg( gs ) / d
+            r = d*u
+         end if
       end if
    else
       f1 = max( abs(real(f)), abs(aimag(f)) )
       g1 = max( abs(real(g)), abs(aimag(g)) )
+      rtmax = sqrt( safmax/4 )
       if( f1 > rtmin .and. f1 < rtmax .and. &
           g1 > rtmin .and. g1 < rtmax ) then
 !
@@ -176,32 +181,51 @@ subroutine CROTG( a, b, c, s )
          f2 = ABSSQ( f )
          g2 = ABSSQ( g )
          h2 = f2 + g2
-         if( f2 > rtmin .and. h2 < rtmax ) then
-            d = sqrt( f2*h2 )
+         ! safmin <= f2 <= h2 <= safmax
+         if( f2 >= h2 * safmin ) then
+            ! safmin <= f2/h2 <= 1, and h2/f2 is finite
+            c = sqrt( f2 / h2 )
+            r = f / c
+            rtmax = rtmax * 2
+            if( f2 > rtmin .and. h2 < rtmax ) then
+               ! safmin <= sqrt( f2*h2 ) <= safmax
+               s = conjg( g ) * ( f / sqrt( f2*h2 ) )
+            else
+               s = conjg( g ) * ( r / h2 )
+            end if
          else
-            d = sqrt( f2 )*sqrt( h2 )
+            ! f2/h2 <= safmin may be subnormal, and h2/f2 may overflow.
+            ! Moreover,
+            !  safmin <= f2*f2 * safmax < f2 * h2 < h2*h2 * safmin <= safmax,
+            !  sqrt(safmin) <= sqrt(f2 * h2) <= sqrt(safmax).
+            ! Also,
+            !  g2 >> f2, which means that h2 = g2.
+            d = sqrt( f2 * h2 )
+            c = f2 / d
+            if( c >= safmin ) then
+               r = f / c
+            else
+               ! f2 / sqrt(f2 * h2) < safmin, then
+               !  sqrt(safmin) <= f2 * sqrt(safmax) <= h2 / sqrt(f2 * h2) <= h2 * (safmin / f2) <= h2 <= safmax
+               r = f * ( h2 / d )
+            end if
+            s = conjg( g ) * ( f / d )
          end if
-         p = 1 / d
-         c = f2*p
-         s = conjg( g )*( f*p )
-         r = f*( h2*p )
       else
 !
 !        Use scaled algorithm
 !
          u = min( safmax, max( safmin, f1, g1 ) )
-         uu = one / u
-         gs = g*uu
+         gs = g / u
          g2 = ABSSQ( gs )
-         if( f1*uu < rtmin ) then
+         if( f1 / u < rtmin ) then
 !
 !           f is not well-scaled when scaled by g1.
 !           Use a different scaling for f.
 !
             v = min( safmax, max( safmin, f1 ) )
-            vv = one / v
-            w = v * uu
-            fs = f*vv
+            w = v / u
+            fs = f / v
             f2 = ABSSQ( fs )
             h2 = f2*w**2 + g2
          else
@@ -209,19 +233,43 @@ subroutine CROTG( a, b, c, s )
 !           Otherwise use the same scaling for f and g.
 !
             w = one
-            fs = f*uu
+            fs = f / u
             f2 = ABSSQ( fs )
             h2 = f2 + g2
          end if
-         if( f2 > rtmin .and. h2 < rtmax ) then
-            d = sqrt( f2*h2 )
+         ! safmin <= f2 <= h2 <= safmax
+         if( f2 >= h2 * safmin ) then
+            ! safmin <= f2/h2 <= 1, and h2/f2 is finite
+            c = sqrt( f2 / h2 )
+            r = fs / c
+            rtmax = rtmax * 2
+            if( f2 > rtmin .and. h2 < rtmax ) then
+               ! safmin <= sqrt( f2*h2 ) <= safmax
+               s = conjg( gs ) * ( fs / sqrt( f2*h2 ) )
+            else
+               s = conjg( gs ) * ( r / h2 )
+            end if
          else
-            d = sqrt( f2 )*sqrt( h2 )
+            ! f2/h2 <= safmin may be subnormal, and h2/f2 may overflow.
+            ! Moreover,
+            !  safmin <= f2*f2 * safmax < f2 * h2 < h2*h2 * safmin <= safmax,
+            !  sqrt(safmin) <= sqrt(f2 * h2) <= sqrt(safmax).
+            ! Also,
+            !  g2 >> f2, which means that h2 = g2.
+            d = sqrt( f2 * h2 )
+            c = f2 / d
+            if( c >= safmin ) then
+               r = fs / c
+            else
+               ! f2 / sqrt(f2 * h2) < safmin, then
+               !  sqrt(safmin) <= f2 * sqrt(safmax) <= h2 / sqrt(f2 * h2) <= h2 * (safmin / f2) <= h2 <= safmax
+               r = fs * ( h2 / d )
+            end if
+            s = conjg( gs ) * ( fs / d )
          end if
-         p = 1 / d
-         c = ( f2*p )*w
-         s = conjg( gs )*( fs*p )
-         r = ( fs*( h2*p ) )*u
+         ! Rescale c and r
+         c = c * w
+         r = r * u
       end if
    end if
    a = r
diff --git a/BLAS/SRC/cscal.f b/BLAS/SRC/cscal.f
index b72c08e74c..9f61933a85 100644
--- a/BLAS/SRC/cscal.f
+++ b/BLAS/SRC/cscal.f
@@ -61,7 +61,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level1
+*> \ingroup scal
 *
 *> \par Further Details:
 *  =====================
@@ -75,6 +75,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CSCAL(N,CA,CX,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -93,7 +94,11 @@ SUBROUTINE CSCAL(N,CA,CX,INCX)
 *     .. Local Scalars ..
       INTEGER I,NINCX
 *     ..
-      IF (N.LE.0 .OR. INCX.LE.0) RETURN
+*     .. Parameters ..
+      COMPLEX ONE
+      PARAMETER (ONE= (1.0E+0,0.0E+0))
+*     ..
+      IF (N.LE.0 .OR. INCX.LE.0 .OR. CA.EQ.ONE) RETURN
       IF (INCX.EQ.1) THEN
 *
 *        code for increment equal to 1
diff --git a/BLAS/SRC/csrot.f b/BLAS/SRC/csrot.f
index 2b4b92b722..795448e6b0 100644
--- a/BLAS/SRC/csrot.f
+++ b/BLAS/SRC/csrot.f
@@ -91,10 +91,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level1
+*> \ingroup rot
 *
 *  =====================================================================
       SUBROUTINE CSROT( N, CX, INCX, CY, INCY, C, S )
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/csscal.f b/BLAS/SRC/csscal.f
index 5c4da6d8db..b78c0acfa5 100644
--- a/BLAS/SRC/csscal.f
+++ b/BLAS/SRC/csscal.f
@@ -61,7 +61,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level1
+*> \ingroup scal
 *
 *> \par Further Details:
 *  =====================
@@ -75,6 +75,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CSSCAL(N,SA,CX,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -93,10 +94,14 @@ SUBROUTINE CSSCAL(N,SA,CX,INCX)
 *     .. Local Scalars ..
       INTEGER I,NINCX
 *     ..
+*     .. Parameters ..
+      REAL ONE
+      PARAMETER (ONE=1.0E+0)
+*     ..
 *     .. Intrinsic Functions ..
       INTRINSIC AIMAG,CMPLX,REAL
 *     ..
-      IF (N.LE.0 .OR. INCX.LE.0) RETURN
+      IF (N.LE.0 .OR. INCX.LE.0 .OR. SA.EQ.ONE) RETURN
       IF (INCX.EQ.1) THEN
 *
 *        code for increment equal to 1
diff --git a/BLAS/SRC/cswap.f b/BLAS/SRC/cswap.f
index 310bf18178..fcd3e60658 100644
--- a/BLAS/SRC/cswap.f
+++ b/BLAS/SRC/cswap.f
@@ -65,7 +65,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level1
+*> \ingroup swap
 *
 *> \par Further Details:
 *  =====================
@@ -78,6 +78,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CSWAP(N,CX,INCX,CY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/csymm.f b/BLAS/SRC/csymm.f
index ff6a6bf05b..96251885db 100644
--- a/BLAS/SRC/csymm.f
+++ b/BLAS/SRC/csymm.f
@@ -168,7 +168,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level3
+*> \ingroup hemm
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +186,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CSYMM(SIDE,UPLO,M,N,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -236,9 +237,11 @@ SUBROUTINE CSYMM(SIDE,UPLO,M,N,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
 *     Test the input parameters.
 *
       INFO = 0
-      IF ((.NOT.LSAME(SIDE,'L')) .AND. (.NOT.LSAME(SIDE,'R'))) THEN
+      IF ((.NOT.LSAME(SIDE,'L')) .AND.
+     +    (.NOT.LSAME(SIDE,'R'))) THEN
           INFO = 1
-      ELSE IF ((.NOT.UPPER) .AND. (.NOT.LSAME(UPLO,'L'))) THEN
+      ELSE IF ((.NOT.UPPER) .AND.
+     +         (.NOT.LSAME(UPLO,'L'))) THEN
           INFO = 2
       ELSE IF (M.LT.0) THEN
           INFO = 3
diff --git a/BLAS/SRC/csyr2k.f b/BLAS/SRC/csyr2k.f
index 09751895d2..c688b8d361 100644
--- a/BLAS/SRC/csyr2k.f
+++ b/BLAS/SRC/csyr2k.f
@@ -167,7 +167,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level3
+*> \ingroup her2k
 *
 *> \par Further Details:
 *  =====================
@@ -185,6 +185,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CSYR2K(UPLO,TRANS,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/csyrk.f b/BLAS/SRC/csyrk.f
index 97bde056cd..ec6ced98ae 100644
--- a/BLAS/SRC/csyrk.f
+++ b/BLAS/SRC/csyrk.f
@@ -146,7 +146,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level3
+*> \ingroup herk
 *
 *> \par Further Details:
 *  =====================
@@ -164,6 +164,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CSYRK(UPLO,TRANS,N,K,ALPHA,A,LDA,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/ctbmv.f b/BLAS/SRC/ctbmv.f
index c0be8f4ea5..adf9ca6ab7 100644
--- a/BLAS/SRC/ctbmv.f
+++ b/BLAS/SRC/ctbmv.f
@@ -164,7 +164,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level2
+*> \ingroup tbmv
 *
 *> \par Further Details:
 *  =====================
@@ -183,6 +183,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CTBMV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -223,10 +224,12 @@ SUBROUTINE CTBMV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/ctbsv.f b/BLAS/SRC/ctbsv.f
index b3600e4636..c997997b89 100644
--- a/BLAS/SRC/ctbsv.f
+++ b/BLAS/SRC/ctbsv.f
@@ -168,7 +168,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level2
+*> \ingroup tbsv
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +186,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CTBSV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -226,10 +227,12 @@ SUBROUTINE CTBSV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/ctpmv.f b/BLAS/SRC/ctpmv.f
index b4651a2a39..efb5dd9255 100644
--- a/BLAS/SRC/ctpmv.f
+++ b/BLAS/SRC/ctpmv.f
@@ -120,7 +120,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level2
+*> \ingroup tpmv
 *
 *> \par Further Details:
 *  =====================
@@ -139,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CTPMV(UPLO,TRANS,DIAG,N,AP,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -179,10 +180,12 @@ SUBROUTINE CTPMV(UPLO,TRANS,DIAG,N,AP,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/ctpsv.f b/BLAS/SRC/ctpsv.f
index d306cc2380..0ee6cf8db5 100644
--- a/BLAS/SRC/ctpsv.f
+++ b/BLAS/SRC/ctpsv.f
@@ -123,7 +123,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level2
+*> \ingroup tpsv
 *
 *> \par Further Details:
 *  =====================
@@ -141,6 +141,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CTPSV(UPLO,TRANS,DIAG,N,AP,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -181,10 +182,12 @@ SUBROUTINE CTPSV(UPLO,TRANS,DIAG,N,AP,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/ctrmm.f b/BLAS/SRC/ctrmm.f
index 2597372136..01ada82975 100644
--- a/BLAS/SRC/ctrmm.f
+++ b/BLAS/SRC/ctrmm.f
@@ -156,7 +156,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level3
+*> \ingroup trmm
 *
 *> \par Further Details:
 *  =====================
@@ -174,6 +174,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CTRMM(SIDE,UPLO,TRANSA,DIAG,M,N,ALPHA,A,LDA,B,LDB)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -233,7 +234,8 @@ SUBROUTINE CTRMM(SIDE,UPLO,TRANSA,DIAG,M,N,ALPHA,A,LDA,B,LDB)
      +         (.NOT.LSAME(TRANSA,'T')) .AND.
      +         (.NOT.LSAME(TRANSA,'C'))) THEN
           INFO = 3
-      ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND. (.NOT.LSAME(DIAG,'N'))) THEN
+      ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND.
+     +         (.NOT.LSAME(DIAG,'N'))) THEN
           INFO = 4
       ELSE IF (M.LT.0) THEN
           INFO = 5
diff --git a/BLAS/SRC/ctrmv.f b/BLAS/SRC/ctrmv.f
index 2404b3deb1..63a6c2a9b9 100644
--- a/BLAS/SRC/ctrmv.f
+++ b/BLAS/SRC/ctrmv.f
@@ -125,7 +125,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level2
+*> \ingroup trmv
 *
 *> \par Further Details:
 *  =====================
@@ -144,6 +144,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CTRMV(UPLO,TRANS,DIAG,N,A,LDA,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -184,10 +185,12 @@ SUBROUTINE CTRMV(UPLO,TRANS,DIAG,N,A,LDA,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/ctrsm.f b/BLAS/SRC/ctrsm.f
index 7da6cfe59a..6275d4a59b 100644
--- a/BLAS/SRC/ctrsm.f
+++ b/BLAS/SRC/ctrsm.f
@@ -159,7 +159,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level3
+*> \ingroup trsm
 *
 *> \par Further Details:
 *  =====================
@@ -177,6 +177,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CTRSM(SIDE,UPLO,TRANSA,DIAG,M,N,ALPHA,A,LDA,B,LDB)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -236,7 +237,8 @@ SUBROUTINE CTRSM(SIDE,UPLO,TRANSA,DIAG,M,N,ALPHA,A,LDA,B,LDB)
      +         (.NOT.LSAME(TRANSA,'T')) .AND.
      +         (.NOT.LSAME(TRANSA,'C'))) THEN
           INFO = 3
-      ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND. (.NOT.LSAME(DIAG,'N'))) THEN
+      ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND.
+     +         (.NOT.LSAME(DIAG,'N'))) THEN
           INFO = 4
       ELSE IF (M.LT.0) THEN
           INFO = 5
diff --git a/BLAS/SRC/ctrsv.f b/BLAS/SRC/ctrsv.f
index de0640e4bd..8340bd12e9 100644
--- a/BLAS/SRC/ctrsv.f
+++ b/BLAS/SRC/ctrsv.f
@@ -128,7 +128,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex_blas_level2
+*> \ingroup trsv
 *
 *> \par Further Details:
 *  =====================
@@ -146,6 +146,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CTRSV(UPLO,TRANS,DIAG,N,A,LDA,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -186,10 +187,12 @@ SUBROUTINE CTRSV(UPLO,TRANS,DIAG,N,A,LDA,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/dasum.f b/BLAS/SRC/dasum.f
index 9a360b5acd..3a1c399a1f 100644
--- a/BLAS/SRC/dasum.f
+++ b/BLAS/SRC/dasum.f
@@ -54,7 +54,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level1
+*> \ingroup asum
 *
 *> \par Further Details:
 *  =====================
@@ -68,6 +68,7 @@
 *>
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DASUM(N,DX,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/daxpby.f b/BLAS/SRC/daxpby.f
new file mode 100644
index 0000000000..e42bece7b7
--- /dev/null
+++ b/BLAS/SRC/daxpby.f
@@ -0,0 +1,149 @@
+*> \brief \b DAXPBY
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DAXPBY(N,DA,DX,INCX,DB,DY,INCY)
+*
+*       .. Scalar Arguments ..
+*       DOUBLE PRECISION DA,DB
+*       INTEGER INCX,INCY,N
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION DX(*),DY(*)
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*>    DAXPBY constant times a vector plus constant times a vector.
+*>
+*>    Y = ALPHA * X + BETA * Y
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          number of elements in input vector(s)
+*> \endverbatim
+*>
+*> \param[in] DA
+*> \verbatim
+*>           DA is DOUBLE PRECISION
+*>           On entry, DA specifies the scalar alpha.
+*> \endverbatim
+*>
+*> \param[in] DX
+*> \verbatim
+*>          DX is DOUBLE PRECISION array, dimension ( 1 + ( N - 1 )*abs( INCX ) )
+*> \endverbatim
+*>
+*> \param[in] INCX
+*> \verbatim
+*>          INCX is INTEGER
+*>          storage spacing between elements of DX
+*> \endverbatim
+*>
+*> \param[in] DB
+*> \verbatim
+*>           DB is DOUBLE PRECISION
+*>           On entry, DB specifies the scalar beta.
+*> \endverbatim
+*>
+*> \param[in,out] DY
+*> \verbatim
+*>          DY is DOUBLE PRECISION array, dimension ( 1 + ( N - 1 )*abs( INCY ) )
+*> \endverbatim
+*>
+*> \param[in] INCY
+*> \verbatim
+*>          INCY is INTEGER
+*>          storage spacing between elements of DY
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*> \author Martin Koehler, MPI Magdeburg
+*
+*> \ingroup axpby
+*
+*  =====================================================================
+      SUBROUTINE DAXPBY(N,DA,DX,INCX,DB,DY,INCY)
+      IMPLICIT NONE
+*
+*  -- Reference BLAS level1 routine --
+*  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      DOUBLE PRECISION DA,DB
+      INTEGER INCX,INCY,N
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION DX(*),DY(*)
+*     ..
+*     .. External Subroutines
+      EXTERNAL DSCAL
+*
+*  =====================================================================
+*
+*     .. Local Scalars ..
+      INTEGER I,IX,IY,M,MP1
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC MOD
+*     ..
+      IF (N.LE.0) RETURN
+
+*     Scale if DA.EQ.0
+      IF (DA.EQ.0.0D0 .AND. DB.NE.0.0D0) THEN
+          CALL DSCAL(N, DB, DY, INCY)
+          RETURN
+      END IF
+
+      IF (INCX.EQ.1 .AND. INCY.EQ.1) THEN
+*
+*        code for both increments equal to 1
+*
+*
+*
+         DO I = 1,N
+            DY(I) = DB*DY(I) + DA*DX(I)
+         END DO
+      ELSE
+*
+*        code for unequal increments or equal increments
+*          not equal to 1
+*
+         IX = 1
+         IY = 1
+         IF (INCX.LT.0) IX = (-N+1)*INCX + 1
+         IF (INCY.LT.0) IY = (-N+1)*INCY + 1
+         DO I = 1,N
+          DY(IY) = DB*DY(IY) + DA*DX(IX)
+          IX = IX + INCX
+          IY = IY + INCY
+         END DO
+      END IF
+      RETURN
+*
+*     End of DAXPBY
+*
+      END
diff --git a/BLAS/SRC/daxpy.f b/BLAS/SRC/daxpy.f
index 421f7c630b..3385e30b6a 100644
--- a/BLAS/SRC/daxpy.f
+++ b/BLAS/SRC/daxpy.f
@@ -73,7 +73,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level1
+*> \ingroup axpy
 *
 *> \par Further Details:
 *  =====================
@@ -86,6 +86,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DAXPY(N,DA,DX,INCX,DY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dcabs1.f b/BLAS/SRC/dcabs1.f
index f6212a8595..9014cd6bfe 100644
--- a/BLAS/SRC/dcabs1.f
+++ b/BLAS/SRC/dcabs1.f
@@ -40,10 +40,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level1
+*> \ingroup abs1
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DCABS1(Z)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dcopy.f b/BLAS/SRC/dcopy.f
index ded46c5ecf..284caac1bc 100644
--- a/BLAS/SRC/dcopy.f
+++ b/BLAS/SRC/dcopy.f
@@ -66,7 +66,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level1
+*> \ingroup copy
 *
 *> \par Further Details:
 *  =====================
@@ -79,6 +79,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DCOPY(N,DX,INCX,DY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/ddot.f b/BLAS/SRC/ddot.f
index 683a04bd46..467123fa30 100644
--- a/BLAS/SRC/ddot.f
+++ b/BLAS/SRC/ddot.f
@@ -66,7 +66,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level1
+*> \ingroup dot
 *
 *> \par Further Details:
 *  =====================
@@ -79,6 +79,7 @@
 *>
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DDOT(N,DX,INCX,DY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dgbmv.f b/BLAS/SRC/dgbmv.f
index 4c8f088b00..c54d5bde1f 100644
--- a/BLAS/SRC/dgbmv.f
+++ b/BLAS/SRC/dgbmv.f
@@ -146,6 +146,8 @@
 *>           ( 1 + ( n - 1 )*abs( INCY ) ) otherwise.
 *>           Before entry, the incremented array Y must contain the
 *>           vector y. On exit, Y is overwritten by the updated vector y.
+*>           If either m or n is zero, then Y not referenced and the function
+*>           performs a quick return.
 *> \endverbatim
 *>
 *> \param[in] INCY
@@ -163,7 +165,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level2
+*> \ingroup gbmv
 *
 *> \par Further Details:
 *  =====================
@@ -181,7 +183,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DGBMV(TRANS,M,N,KL,KU,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
+      SUBROUTINE DGBMV(TRANS,M,N,KL,KU,ALPHA,A,LDA,X,INCX,
+     +         BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dgemm.f b/BLAS/SRC/dgemm.f
index 8c1b4f2066..e8b15794d7 100644
--- a/BLAS/SRC/dgemm.f
+++ b/BLAS/SRC/dgemm.f
@@ -35,6 +35,16 @@
 *>
 *> alpha and beta are scalars, and A, B and C are matrices, with op( A )
 *> an m by k matrix,  op( B )  a  k by n matrix and  C an m by n matrix.
+*>
+*> Note: if alpha and/or beta is zero, some parts of the matrix-matrix
+*>  operations are not performed. This results in the following NaN/Inf
+*>  propagation quirks:
+*>
+*>  1. If alpha is zero, NaNs or Infs in A or B do not affect the result.
+*>  2. If both alpha and beta are zero, then a zero matrix is returned in C,
+*>   irrespective of any NaNs or Infs in A, B or C.
+*>  3. If only beta is zero, alpha*op( A )*op( B ) is returned, irrespective
+*>   of any NaNs or Infs in C.
 *> \endverbatim
 *
 *  Arguments:
@@ -51,6 +61,9 @@
 *>              TRANSA = 'T' or 't',  op( A ) = A**T.
 *>
 *>              TRANSA = 'C' or 'c',  op( A ) = A**T.
+*>
+*>           Note: TRANSA = 'C' is supported for the sake of API consistency
+*>           between all ?GEMM variants.
 *> \endverbatim
 *>
 *> \param[in] TRANSB
@@ -64,6 +77,9 @@
 *>              TRANSB = 'T' or 't',  op( B ) = B**T.
 *>
 *>              TRANSB = 'C' or 'c',  op( B ) = B**T.
+*>
+*>           Note: TRANSB = 'C' is supported for the sake of API consistency
+*>           between all ?GEMM variants.
 *> \endverbatim
 *>
 *> \param[in] M
@@ -92,7 +108,9 @@
 *> \param[in] ALPHA
 *> \verbatim
 *>          ALPHA is DOUBLE PRECISION.
-*>           On entry, ALPHA specifies the scalar alpha.
+*>           On entry, ALPHA specifies the scalar alpha. If ALPHA is zero the
+*>           values in A and B do not affect the result. This also means that
+*>           NaN/Inf propagation from A and B is inhibited if ALPHA is zero.
 *> \endverbatim
 *>
 *> \param[in] A
@@ -102,7 +120,10 @@
 *>           Before entry with  TRANSA = 'N' or 'n',  the leading  m by k
 *>           part of the array  A  must contain the matrix  A,  otherwise
 *>           the leading  k by m  part of the array  A  must contain  the
-*>           matrix A.
+*>           matrix A, except if ALPHA is zero.
+*>           If ALPHA is zero, none of the values in A affect the result, even
+*>           if they are NaN/Inf. This also implies that if ALPHA is zero,
+*>           the matrix elements of A need not be initialized by the caller.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -121,7 +142,10 @@
 *>           Before entry with  TRANSB = 'N' or 'n',  the leading  k by n
 *>           part of the array  B  must contain the matrix  B,  otherwise
 *>           the leading  n by k  part of the array  B  must contain  the
-*>           matrix B.
+*>           matrix B, except if ALPHA is zero.
+*>           If ALPHA is zero, none of the values in B affect the result, even
+*>           if they are NaN/Inf. This also implies that if ALPHA is zero,
+*>           the matrix elements of B need not be initialized by the caller.
 *> \endverbatim
 *>
 *> \param[in] LDB
@@ -136,16 +160,19 @@
 *> \param[in] BETA
 *> \verbatim
 *>          BETA is DOUBLE PRECISION.
-*>           On entry,  BETA  specifies the scalar  beta.  When  BETA  is
-*>           supplied as zero then C need not be set on input.
+*>           On entry,  BETA  specifies the scalar  beta.  If BETA is zero the
+*>           values in C do not affect the result. This also means that
+*>           NaN/Inf propagation from C is inhibited if BETA is zero.
 *> \endverbatim
 *>
 *> \param[in,out] C
 *> \verbatim
 *>          C is DOUBLE PRECISION array, dimension ( LDC, N )
 *>           Before entry, the leading  m by n  part of the array  C must
-*>           contain the matrix  C,  except when  beta  is zero, in which
-*>           case C need not be set on entry.
+*>           contain the matrix  C, except if beta is zero.
+*>           If beta is zero, none of the values in C affect the result, even
+*>           if they are NaN/Inf. This also implies that if beta is zero,
+*>           the matrix elements of C need not be initialized by the caller.
 *>           On exit, the array  C  is overwritten by the  m by n  matrix
 *>           ( alpha*op( A )*op( B ) + beta*C ).
 *> \endverbatim
@@ -166,7 +193,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level3
+*> \ingroup gemm
 *
 *> \par Further Details:
 *  =====================
@@ -183,7 +210,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
+      SUBROUTINE DGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,
+     +         BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dgemmtr.f b/BLAS/SRC/dgemmtr.f
new file mode 100644
index 0000000000..cab5b71fc8
--- /dev/null
+++ b/BLAS/SRC/dgemmtr.f
@@ -0,0 +1,431 @@
+*> \brief \b DGEMMTR
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DGEMMTR(UPLO,TRANSA,TRANSB,N,K,ALPHA,A,LDA,B,LDB,BETA,
+*                         C,LDC)
+*
+*       .. Scalar Arguments ..
+*       DOUBLE PRECISION ALPHA,BETA
+*       INTEGER K,LDA,LDB,LDC,N
+*       CHARACTER TRANSA,TRANSB, UPLO
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION A(LDA,*),B(LDB,*),C(LDC,*)
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> DGEMMTR  performs one of the matrix-matrix operations
+*>
+*>    C := alpha*op( A )*op( B ) + beta*C,
+*>
+*> where  op( X ) is one of
+*>
+*>    op( X ) = X   or   op( X ) = X**T,
+*>
+*> alpha and beta are scalars, and A, B and C are matrices, with op( A )
+*> an n by k matrix,  op( B )  a  k by n matrix and  C an n by n matrix.
+*> Thereby, the routine only accesses and updates the upper or lower
+*> triangular part of the result matrix C. This behaviour can be used if
+*> the resulting matrix C is known to be symmetric.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>           On entry, UPLO specifies whether the lower or the upper
+*>           triangular part of C is access and updated.
+*>
+*>              UPLO = 'L' or 'l', the lower triangular part of C is used.
+*>
+*>              UPLO = 'U' or 'u', the upper triangular part of C is used.
+*> \endverbatim
+*
+*> \param[in] TRANSA
+*> \verbatim
+*>          TRANSA is CHARACTER*1
+*>           On entry, TRANSA specifies the form of op( A ) to be used in
+*>           the matrix multiplication as follows:
+*>
+*>              TRANSA = 'N' or 'n',  op( A ) = A.
+*>
+*>              TRANSA = 'T' or 't',  op( A ) = A**T.
+*>
+*>              TRANSA = 'C' or 'c',  op( A ) = A**T.
+*> \endverbatim
+*>
+*> \param[in] TRANSB
+*> \verbatim
+*>          TRANSB is CHARACTER*1
+*>           On entry, TRANSB specifies the form of op( B ) to be used in
+*>           the matrix multiplication as follows:
+*>
+*>              TRANSB = 'N' or 'n',  op( B ) = B.
+*>
+*>              TRANSB = 'T' or 't',  op( B ) = B**T.
+*>
+*>              TRANSB = 'C' or 'c',  op( B ) = B**T.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>           On entry,  N specifies the number of rows and columns of
+*>           the matrix C, the number of columns of op(B) and the number
+*>           of rows of op(A).  N must be at least zero.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>           On entry,  K  specifies  the number of columns of the matrix
+*>           op( A ) and the number of rows of the matrix op( B ). K must
+*>           be at least  zero.
+*> \endverbatim
+*>
+*> \param[in] ALPHA
+*> \verbatim
+*>          ALPHA is DOUBLE PRECISION.
+*>           On entry, ALPHA specifies the scalar alpha.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension ( LDA, ka ), where ka is
+*>           k  when  TRANSA = 'N' or 'n',  and is  n  otherwise.
+*>           Before entry with  TRANSA = 'N' or 'n',  the leading  n by k
+*>           part of the array  A  must contain the matrix  A,  otherwise
+*>           the leading  k by m  part of the array  A  must contain  the
+*>           matrix A.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>           On entry, LDA specifies the first dimension of A as declared
+*>           in the calling (sub) program. When  TRANSA = 'N' or 'n' then
+*>           LDA must be at least  max( 1, n ), otherwise  LDA must be at
+*>           least  max( 1, k ).
+*> \endverbatim
+*>
+*> \param[in] B
+*> \verbatim
+*>          B is DOUBLE PRECISION array, dimension ( LDB, kb ), where kb is
+*>           n  when  TRANSB = 'N' or 'n',  and is  k  otherwise.
+*>           Before entry with  TRANSB = 'N' or 'n',  the leading  k by n
+*>           part of the array  B  must contain the matrix  B,  otherwise
+*>           the leading  n by k  part of the array  B  must contain  the
+*>           matrix B.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>           On entry, LDB specifies the first dimension of B as declared
+*>           in the calling (sub) program. When  TRANSB = 'N' or 'n' then
+*>           LDB must be at least  max( 1, k ), otherwise  LDB must be at
+*>           least  max( 1, n ).
+*> \endverbatim
+*>
+*> \param[in] BETA
+*> \verbatim
+*>          BETA is DOUBLE PRECISION.
+*>           On entry,  BETA  specifies the scalar  beta.  When  BETA  is
+*>           supplied as zero then C need not be set on input.
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is DOUBLE PRECISION array, dimension ( LDC, N )
+*>           Before entry, the leading  n by n  part of the array  C must
+*>           contain the matrix  C,  except when  beta  is zero, in which
+*>           case C need not be set on entry.
+*>           On exit, the upper or lower triangular part of the matrix
+*>           C  is overwritten by the n by n matrix
+*>           ( alpha*op( A )*op( B ) + beta*C ).
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>           On entry, LDC specifies the first dimension of C as declared
+*>           in  the  calling  (sub)  program.   LDC  must  be  at  least
+*>           max( 1, n ).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Martin Koehler
+*
+*> \ingroup gemmtr
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  Level 3 Blas routine.
+*>
+*>  -- Written on 19-July-2023.
+*>     Martin Koehler, MPI Magdeburg
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE DGEMMTR(UPLO,TRANSA,TRANSB,N,K,ALPHA,A,LDA,B,LDB,
+     +         BETA,C,LDC)
+      IMPLICIT NONE
+*
+*  -- Reference BLAS level3 routine --
+*  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      DOUBLE PRECISION ALPHA,BETA
+      INTEGER K,LDA,LDB,LDC,N
+      CHARACTER TRANSA,TRANSB,UPLO
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION A(LDA,*),B(LDB,*),C(LDC,*)
+*     ..
+*
+*  =====================================================================
+*
+*     .. External Functions ..
+      LOGICAL LSAME
+      EXTERNAL LSAME
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC MAX
+*     ..
+*     .. Local Scalars ..
+      DOUBLE PRECISION TEMP
+      INTEGER I,INFO,J,L,NROWA,NROWB, ISTART, ISTOP
+      LOGICAL NOTA,NOTB, UPPER
+*     ..
+*     .. Parameters ..
+      DOUBLE PRECISION ONE,ZERO
+      PARAMETER (ONE=1.0D+0,ZERO=0.0D+0)
+*     ..
+*
+*     Set  NOTA  and  NOTB  as  true if  A  and  B  respectively are not
+*     transposed and set  NROWA and NROWB  as the number of rows of  A
+*     and  B  respectively.
+*
+      NOTA = LSAME(TRANSA,'N')
+      NOTB = LSAME(TRANSB,'N')
+      IF (NOTA) THEN
+          NROWA = N
+      ELSE
+          NROWA = K
+      END IF
+      IF (NOTB) THEN
+          NROWB = K
+      ELSE
+          NROWB = N
+      END IF
+      UPPER = LSAME(UPLO, 'U')
+*
+*     Test the input parameters.
+*
+      INFO = 0
+      IF ((.NOT. UPPER) .AND. (.NOT. LSAME(UPLO, 'L'))) THEN
+          INFO = 1
+      ELSE IF ((.NOT.NOTA) .AND. (.NOT.LSAME(TRANSA,'C')) .AND.
+     +    (.NOT.LSAME(TRANSA,'T'))) THEN
+          INFO = 2
+      ELSE IF ((.NOT.NOTB) .AND. (.NOT.LSAME(TRANSB,'C')) .AND.
+     +         (.NOT.LSAME(TRANSB,'T'))) THEN
+          INFO = 3
+      ELSE IF (N.LT.0) THEN
+          INFO = 4
+      ELSE IF (K.LT.0) THEN
+          INFO = 5
+      ELSE IF (LDA.LT.MAX(1,NROWA)) THEN
+          INFO = 8
+      ELSE IF (LDB.LT.MAX(1,NROWB)) THEN
+          INFO = 10
+      ELSE IF (LDC.LT.MAX(1,N)) THEN
+          INFO = 13
+      END IF
+      IF (INFO.NE.0) THEN
+          CALL XERBLA('DGEMMTR',INFO)
+          RETURN
+      END IF
+*
+*     Quick return if possible.
+*
+      IF (N.EQ.0) RETURN
+*
+*     And if  alpha.eq.zero.
+*
+      IF (ALPHA.EQ.ZERO) THEN
+          IF (BETA.EQ.ZERO) THEN
+              DO 20 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 10 I = ISTART, ISTOP
+                      C(I,J) = ZERO
+   10             CONTINUE
+   20         CONTINUE
+          ELSE
+              DO 40 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 30 I = ISTART, ISTOP
+                      C(I,J) = BETA*C(I,J)
+   30             CONTINUE
+   40         CONTINUE
+          END IF
+          RETURN
+      END IF
+*
+*     Start the operations.
+*
+      IF (NOTB) THEN
+          IF (NOTA) THEN
+*
+*           Form  C := alpha*A*B + beta*C.
+*
+              DO 90 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+                  IF (BETA.EQ.ZERO) THEN
+                      DO 50 I = ISTART, ISTOP
+                          C(I,J) = ZERO
+   50                 CONTINUE
+                  ELSE IF (BETA.NE.ONE) THEN
+                      DO 60 I = ISTART, ISTOP
+                          C(I,J) = BETA*C(I,J)
+   60                 CONTINUE
+                  END IF
+                  DO 80 L = 1,K
+                      TEMP = ALPHA*B(L,J)
+                      DO 70 I = ISTART, ISTOP
+                          C(I,J) = C(I,J) + TEMP*A(I,L)
+   70                 CONTINUE
+   80             CONTINUE
+   90         CONTINUE
+          ELSE
+*
+*           Form  C := alpha*A**T*B + beta*C
+*
+              DO 120 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 110 I = ISTART, ISTOP
+                      TEMP = ZERO
+                      DO 100 L = 1,K
+                          TEMP = TEMP + A(L,I)*B(L,J)
+  100                 CONTINUE
+                      IF (BETA.EQ.ZERO) THEN
+                          C(I,J) = ALPHA*TEMP
+                      ELSE
+                          C(I,J) = ALPHA*TEMP + BETA*C(I,J)
+                      END IF
+  110             CONTINUE
+  120         CONTINUE
+          END IF
+      ELSE
+          IF (NOTA) THEN
+*
+*           Form  C := alpha*A*B**T + beta*C
+*
+              DO 170 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  IF (BETA.EQ.ZERO) THEN
+                      DO 130 I = ISTART,ISTOP
+                          C(I,J) = ZERO
+  130                 CONTINUE
+                  ELSE IF (BETA.NE.ONE) THEN
+                      DO 140 I = ISTART,ISTOP
+                          C(I,J) = BETA*C(I,J)
+  140                 CONTINUE
+                  END IF
+                  DO 160 L = 1,K
+                      TEMP = ALPHA*B(J,L)
+                      DO 150 I = ISTART,ISTOP
+                          C(I,J) = C(I,J) + TEMP*A(I,L)
+  150                 CONTINUE
+  160             CONTINUE
+  170         CONTINUE
+          ELSE
+*
+*           Form  C := alpha*A**T*B**T + beta*C
+*
+              DO 200 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 190 I = ISTART, ISTOP
+                      TEMP = ZERO
+                      DO 180 L = 1,K
+                          TEMP = TEMP + A(L,I)*B(J,L)
+  180                 CONTINUE
+                      IF (BETA.EQ.ZERO) THEN
+                          C(I,J) = ALPHA*TEMP
+                      ELSE
+                          C(I,J) = ALPHA*TEMP + BETA*C(I,J)
+                      END IF
+  190             CONTINUE
+  200         CONTINUE
+          END IF
+      END IF
+*
+      RETURN
+*
+*     End of SGEMM
+*
+      END
diff --git a/BLAS/SRC/dgemv.f b/BLAS/SRC/dgemv.f
index 6625509b3a..f6defb8c29 100644
--- a/BLAS/SRC/dgemv.f
+++ b/BLAS/SRC/dgemv.f
@@ -117,6 +117,8 @@
 *>           Before entry with BETA non-zero, the incremented array Y
 *>           must contain the vector y. On exit, Y is overwritten by the
 *>           updated vector y.
+*>           If either m or n is zero, then Y not referenced and the function
+*>           performs a quick return.
 *> \endverbatim
 *>
 *> \param[in] INCY
@@ -134,7 +136,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level2
+*> \ingroup gemv
 *
 *> \par Further Details:
 *  =====================
@@ -153,6 +155,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGEMV(TRANS,M,N,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dger.f b/BLAS/SRC/dger.f
index 8c19cb4e41..24a6d86bb2 100644
--- a/BLAS/SRC/dger.f
+++ b/BLAS/SRC/dger.f
@@ -109,7 +109,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level2
+*> \ingroup ger
 *
 *> \par Further Details:
 *  =====================
@@ -127,6 +127,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGER(M,N,ALPHA,X,INCX,Y,INCY,A,LDA)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dnrm2.f90 b/BLAS/SRC/dnrm2.f90
index 5649d41af4..638687c81b 100644
--- a/BLAS/SRC/dnrm2.f90
+++ b/BLAS/SRC/dnrm2.f90
@@ -60,7 +60,7 @@
 !
 !> \date August 2016
 !
-!> \ingroup single_blas_level1
+!> \ingroup nrm2
 !
 !> \par Contributors:
 !  ==================
@@ -85,11 +85,12 @@
 !> \endverbatim
 !>
 !  =====================================================================
-function DNRM2( n, x, incx ) 
+function DNRM2( n, x, incx )
+   implicit none
    integer, parameter :: wp = kind(1.d0)
    real(wp) :: DNRM2
 !
-!  -- Reference BLAS level1 routine (version 3.9.1) --
+!  -- Reference BLAS level1 routine --
 !  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
 !  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 !     March 2021
@@ -99,15 +100,15 @@ function DNRM2( n, x, incx )
    real(wp), parameter :: one  = 1.0_wp
    real(wp), parameter :: maxN = huge(0.0_wp)
 !  ..
-!  .. Blue's ccaling constants ..
+!  .. Blue's scaling constants ..
    real(wp), parameter :: tsml = real(radix(0._wp), wp)**ceiling( &
        (minexponent(0._wp) - 1) * 0.5_wp)
    real(wp), parameter :: tbig = real(radix(0._wp), wp)**floor( &
        (maxexponent(0._wp) - digits(0._wp) + 1) * 0.5_wp)
    real(wp), parameter :: ssml = real(radix(0._wp), wp)**( - floor( &
-       (minexponent(0._wp) - 1) * 0.5_wp))
+       (minexponent(0._wp) - digits(0._wp)) * 0.5_wp))
    real(wp), parameter :: sbig = real(radix(0._wp), wp)**( - ceiling( &
-       (maxexponent(0._wp) - digits(0._wp) + 1) * 0.5_wp))
+       (maxexponent(0._wp) + digits(0._wp) - 1) * 0.5_wp))
 !  ..
 !  .. Scalar Arguments ..
    integer :: incx, n
diff --git a/BLAS/SRC/drot.f b/BLAS/SRC/drot.f
index 0386626c8f..973a0c759b 100644
--- a/BLAS/SRC/drot.f
+++ b/BLAS/SRC/drot.f
@@ -76,7 +76,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level1
+*> \ingroup rot
 *
 *> \par Further Details:
 *  =====================
@@ -89,6 +89,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DROT(N,DX,INCX,DY,INCY,C,S)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/drotg.f90 b/BLAS/SRC/drotg.f90
index a344cd4856..b1abba914b 100644
--- a/BLAS/SRC/drotg.f90
+++ b/BLAS/SRC/drotg.f90
@@ -5,19 +5,16 @@
 ! Online html documentation available at
 !            http://www.netlib.org/lapack/explore-html/
 !
-!  Definition:
-!  ===========
-!
-!  DROTG constructs a plane rotation
-!     [  c  s ] [ a ] = [ r ]
-!     [ -s  c ] [ b ]   [ 0 ]
-!  satisfying c**2 + s**2 = 1.
-!
 !> \par Purpose:
 !  =============
 !>
 !> \verbatim
 !>
+!> DROTG constructs a plane rotation
+!>    [  c  s ] [ a ] = [ r ]
+!>    [ -s  c ] [ b ]   [ 0 ]
+!> satisfying c**2 + s**2 = 1.
+!>
 !> The computation uses the formulas
 !>    sigma = sgn(a)    if |a| >  |b|
 !>          = sgn(b)    if |b| >= |a|
@@ -34,6 +31,8 @@
 !>    If |z| > 1, set c = 1/z and s = sqrt( 1 - c**2).
 !>
 !> \endverbatim
+!>
+!> @see lartg, @see lartgp
 !
 !  Arguments:
 !  ==========
@@ -74,7 +73,7 @@
 !>
 !> Weslley Pereira, University of Colorado Denver, USA
 !
-!> \ingroup single_blas_level1
+!> \ingroup rotg
 !
 !> \par Further Details:
 !  =====================
@@ -90,6 +89,7 @@
 !
 !  =====================================================================
 subroutine DROTG( a, b, c, s )
+   implicit none
    integer, parameter :: wp = kind(1.d0)
 !
 !  -- Reference BLAS level1 routine --
diff --git a/BLAS/SRC/drotm.f b/BLAS/SRC/drotm.f
index 0363ddd888..1eb7d89509 100644
--- a/BLAS/SRC/drotm.f
+++ b/BLAS/SRC/drotm.f
@@ -38,6 +38,10 @@
 *>    H=(          )    (          )    (          )    (          )
 *>      (DH21  DH22),   (DH21  1.D0),   (-1.D0 DH22),   (0.D0  1.D0).
 *>    SEE DROTMG FOR A DESCRIPTION OF DATA STORAGE IN DPARAM.
+*>
+*>    IF DFLAG IS NOT ONE OF THE LISTED ABOVE, THE BEHAVIOR IS UNDEFINED.
+*>    NANS IN DFLAG MAY NOT PROPAGATE TO THE OUTPUT.
+*>
 *> \endverbatim
 *
 *  Arguments:
@@ -89,10 +93,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level1
+*> \ingroup rotm
 *
 *  =====================================================================
       SUBROUTINE DROTM(N,DX,INCX,DY,INCY,DPARAM)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/drotmg.f b/BLAS/SRC/drotmg.f
index be59f314a6..61007239bb 100644
--- a/BLAS/SRC/drotmg.f
+++ b/BLAS/SRC/drotmg.f
@@ -83,10 +83,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level1
+*> \ingroup rotmg
 *
 *  =====================================================================
       SUBROUTINE DROTMG(DD1,DD2,DX1,DY1,DPARAM)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dsbmv.f b/BLAS/SRC/dsbmv.f
index ad9e418a1e..9b3f76faa6 100644
--- a/BLAS/SRC/dsbmv.f
+++ b/BLAS/SRC/dsbmv.f
@@ -162,7 +162,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level2
+*> \ingroup hbmv
 *
 *> \par Further Details:
 *  =====================
@@ -181,6 +181,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DSBMV(UPLO,N,K,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dscal.f b/BLAS/SRC/dscal.f
index 3713427334..24437f5d14 100644
--- a/BLAS/SRC/dscal.f
+++ b/BLAS/SRC/dscal.f
@@ -62,7 +62,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level1
+*> \ingroup scal
 *
 *> \par Further Details:
 *  =====================
@@ -76,6 +76,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DSCAL(N,DA,DX,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -93,11 +94,14 @@ SUBROUTINE DSCAL(N,DA,DX,INCX)
 *
 *     .. Local Scalars ..
       INTEGER I,M,MP1,NINCX
+*     .. Parameters ..
+      DOUBLE PRECISION ONE
+      PARAMETER (ONE=1.0D+0)
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC MOD
 *     ..
-      IF (N.LE.0 .OR. INCX.LE.0) RETURN
+      IF (N.LE.0 .OR. INCX.LE.0 .OR. DA.EQ.ONE) RETURN
       IF (INCX.EQ.1) THEN
 *
 *        code for increment equal to 1
diff --git a/BLAS/SRC/dsdot.f b/BLAS/SRC/dsdot.f
index ae254a6e50..78983b2929 100644
--- a/BLAS/SRC/dsdot.f
+++ b/BLAS/SRC/dsdot.f
@@ -84,7 +84,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level1
+*> \ingroup dot
 *
 *> \par Further Details:
 *  =====================
@@ -116,6 +116,7 @@
 *>
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DSDOT(N,SX,INCX,SY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dspmv.f b/BLAS/SRC/dspmv.f
index a79c74da7b..42331e9f9a 100644
--- a/BLAS/SRC/dspmv.f
+++ b/BLAS/SRC/dspmv.f
@@ -125,7 +125,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level2
+*> \ingroup hpmv
 *
 *> \par Further Details:
 *  =====================
@@ -144,6 +144,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DSPMV(UPLO,N,ALPHA,AP,X,INCX,BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dspr.f b/BLAS/SRC/dspr.f
index 67227a2d58..50a164697d 100644
--- a/BLAS/SRC/dspr.f
+++ b/BLAS/SRC/dspr.f
@@ -106,7 +106,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level2
+*> \ingroup hpr
 *
 *> \par Further Details:
 *  =====================
@@ -124,6 +124,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DSPR(UPLO,N,ALPHA,X,INCX,AP)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dspr2.f b/BLAS/SRC/dspr2.f
index 0756c2bbd6..a946802504 100644
--- a/BLAS/SRC/dspr2.f
+++ b/BLAS/SRC/dspr2.f
@@ -121,7 +121,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level2
+*> \ingroup hpr2
 *
 *> \par Further Details:
 *  =====================
@@ -139,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DSPR2(UPLO,N,ALPHA,X,INCX,Y,INCY,AP)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dswap.f b/BLAS/SRC/dswap.f
index b7600aa2d4..720f944a25 100644
--- a/BLAS/SRC/dswap.f
+++ b/BLAS/SRC/dswap.f
@@ -66,7 +66,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level1
+*> \ingroup swap
 *
 *> \par Further Details:
 *  =====================
@@ -79,6 +79,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DSWAP(N,DX,INCX,DY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dsymm.f b/BLAS/SRC/dsymm.f
index 683e79f6ad..7bb289c868 100644
--- a/BLAS/SRC/dsymm.f
+++ b/BLAS/SRC/dsymm.f
@@ -168,7 +168,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level3
+*> \ingroup hemm
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +186,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DSYMM(SIDE,UPLO,M,N,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -234,7 +235,8 @@ SUBROUTINE DSYMM(SIDE,UPLO,M,N,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
 *     Test the input parameters.
 *
       INFO = 0
-      IF ((.NOT.LSAME(SIDE,'L')) .AND. (.NOT.LSAME(SIDE,'R'))) THEN
+      IF ((.NOT.LSAME(SIDE,'L')) .AND.
+     +    (.NOT.LSAME(SIDE,'R'))) THEN
           INFO = 1
       ELSE IF ((.NOT.UPPER) .AND. (.NOT.LSAME(UPLO,'L'))) THEN
           INFO = 2
diff --git a/BLAS/SRC/dsymv.f b/BLAS/SRC/dsymv.f
index 17310d7c62..bfead2aedb 100644
--- a/BLAS/SRC/dsymv.f
+++ b/BLAS/SRC/dsymv.f
@@ -130,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level2
+*> \ingroup hemv
 *
 *> \par Further Details:
 *  =====================
@@ -149,6 +149,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DSYMV(UPLO,N,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dsyr.f b/BLAS/SRC/dsyr.f
index ab452dd950..9d89db9643 100644
--- a/BLAS/SRC/dsyr.f
+++ b/BLAS/SRC/dsyr.f
@@ -111,7 +111,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level2
+*> \ingroup her
 *
 *> \par Further Details:
 *  =====================
@@ -129,6 +129,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DSYR(UPLO,N,ALPHA,X,INCX,A,LDA)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dsyr2.f b/BLAS/SRC/dsyr2.f
index 4bad19b96b..3eab4fd6a1 100644
--- a/BLAS/SRC/dsyr2.f
+++ b/BLAS/SRC/dsyr2.f
@@ -126,7 +126,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level2
+*> \ingroup her2
 *
 *> \par Further Details:
 *  =====================
@@ -144,6 +144,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DSYR2(UPLO,N,ALPHA,X,INCX,Y,INCY,A,LDA)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dsyr2k.f b/BLAS/SRC/dsyr2k.f
index f5d16e0854..2e1a48984a 100644
--- a/BLAS/SRC/dsyr2k.f
+++ b/BLAS/SRC/dsyr2k.f
@@ -170,7 +170,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level3
+*> \ingroup her2k
 *
 *> \par Further Details:
 *  =====================
@@ -189,6 +189,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DSYR2K(UPLO,TRANS,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dsyrk.f b/BLAS/SRC/dsyrk.f
index 0548c0ce2f..c6ca791e14 100644
--- a/BLAS/SRC/dsyrk.f
+++ b/BLAS/SRC/dsyrk.f
@@ -148,7 +148,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level3
+*> \ingroup herk
 *
 *> \par Further Details:
 *  =====================
@@ -166,6 +166,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DSYRK(UPLO,TRANS,N,K,ALPHA,A,LDA,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dtbmv.f b/BLAS/SRC/dtbmv.f
index 646fb9bf55..25b1664c18 100644
--- a/BLAS/SRC/dtbmv.f
+++ b/BLAS/SRC/dtbmv.f
@@ -164,7 +164,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level2
+*> \ingroup tbmv
 *
 *> \par Further Details:
 *  =====================
@@ -183,6 +183,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DTBMV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -223,10 +224,12 @@ SUBROUTINE DTBMV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/dtbsv.f b/BLAS/SRC/dtbsv.f
index d4ab7c65ac..a18c235825 100644
--- a/BLAS/SRC/dtbsv.f
+++ b/BLAS/SRC/dtbsv.f
@@ -168,7 +168,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level2
+*> \ingroup tbsv
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +186,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DTBSV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -226,10 +227,12 @@ SUBROUTINE DTBSV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/dtpmv.f b/BLAS/SRC/dtpmv.f
index 32ab147f77..08bd667ff4 100644
--- a/BLAS/SRC/dtpmv.f
+++ b/BLAS/SRC/dtpmv.f
@@ -120,7 +120,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level2
+*> \ingroup tpmv
 *
 *> \par Further Details:
 *  =====================
@@ -139,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DTPMV(UPLO,TRANS,DIAG,N,AP,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -176,10 +177,12 @@ SUBROUTINE DTPMV(UPLO,TRANS,DIAG,N,AP,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/dtpsv.f b/BLAS/SRC/dtpsv.f
index 853d0dab0c..7e297ef6b3 100644
--- a/BLAS/SRC/dtpsv.f
+++ b/BLAS/SRC/dtpsv.f
@@ -123,7 +123,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level2
+*> \ingroup tpsv
 *
 *> \par Further Details:
 *  =====================
@@ -141,6 +141,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DTPSV(UPLO,TRANS,DIAG,N,AP,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -178,10 +179,12 @@ SUBROUTINE DTPSV(UPLO,TRANS,DIAG,N,AP,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/dtrmm.f b/BLAS/SRC/dtrmm.f
index b2cc0a1fa8..541d180748 100644
--- a/BLAS/SRC/dtrmm.f
+++ b/BLAS/SRC/dtrmm.f
@@ -156,7 +156,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level3
+*> \ingroup trmm
 *
 *> \par Further Details:
 *  =====================
@@ -174,6 +174,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DTRMM(SIDE,UPLO,TRANSA,DIAG,M,N,ALPHA,A,LDA,B,LDB)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -230,7 +231,8 @@ SUBROUTINE DTRMM(SIDE,UPLO,TRANSA,DIAG,M,N,ALPHA,A,LDA,B,LDB)
      +         (.NOT.LSAME(TRANSA,'T')) .AND.
      +         (.NOT.LSAME(TRANSA,'C'))) THEN
           INFO = 3
-      ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND. (.NOT.LSAME(DIAG,'N'))) THEN
+      ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND.
+     +         (.NOT.LSAME(DIAG,'N'))) THEN
           INFO = 4
       ELSE IF (M.LT.0) THEN
           INFO = 5
diff --git a/BLAS/SRC/dtrmv.f b/BLAS/SRC/dtrmv.f
index e8af8e6136..332ac7d56f 100644
--- a/BLAS/SRC/dtrmv.f
+++ b/BLAS/SRC/dtrmv.f
@@ -125,7 +125,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level2
+*> \ingroup trmv
 *
 *> \par Further Details:
 *  =====================
@@ -144,6 +144,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DTRMV(UPLO,TRANS,DIAG,N,A,LDA,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -184,10 +185,12 @@ SUBROUTINE DTRMV(UPLO,TRANS,DIAG,N,A,LDA,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/dtrsm.f b/BLAS/SRC/dtrsm.f
index fa8080bc92..0cd4a91a25 100644
--- a/BLAS/SRC/dtrsm.f
+++ b/BLAS/SRC/dtrsm.f
@@ -159,7 +159,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level3
+*> \ingroup trsm
 *
 *> \par Further Details:
 *  =====================
@@ -178,6 +178,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DTRSM(SIDE,UPLO,TRANSA,DIAG,M,N,ALPHA,A,LDA,B,LDB)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -234,7 +235,8 @@ SUBROUTINE DTRSM(SIDE,UPLO,TRANSA,DIAG,M,N,ALPHA,A,LDA,B,LDB)
      +         (.NOT.LSAME(TRANSA,'T')) .AND.
      +         (.NOT.LSAME(TRANSA,'C'))) THEN
           INFO = 3
-      ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND. (.NOT.LSAME(DIAG,'N'))) THEN
+      ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND.
+     +         (.NOT.LSAME(DIAG,'N'))) THEN
           INFO = 4
       ELSE IF (M.LT.0) THEN
           INFO = 5
diff --git a/BLAS/SRC/dtrsv.f b/BLAS/SRC/dtrsv.f
index d8ea9fa898..4c1f40ae16 100644
--- a/BLAS/SRC/dtrsv.f
+++ b/BLAS/SRC/dtrsv.f
@@ -136,12 +136,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level1
+*> \ingroup trsv
 *
 *  =====================================================================
       SUBROUTINE DTRSV(UPLO,TRANS,DIAG,N,A,LDA,X,INCX)
+      IMPLICIT NONE
 *
-*  -- Reference BLAS level1 routine --
+*  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
@@ -180,10 +181,12 @@ SUBROUTINE DTRSV(UPLO,TRANS,DIAG,N,A,LDA,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/dzasum.f b/BLAS/SRC/dzasum.f
index 7cc6ec506a..9cf841c197 100644
--- a/BLAS/SRC/dzasum.f
+++ b/BLAS/SRC/dzasum.f
@@ -55,7 +55,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup double_blas_level1
+*> \ingroup asum
 *
 *> \par Further Details:
 *  =====================
@@ -69,6 +69,7 @@
 *>
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DZASUM(N,ZX,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/dznrm2.f90 b/BLAS/SRC/dznrm2.f90
index ff158e58c0..68aa6d496f 100644
--- a/BLAS/SRC/dznrm2.f90
+++ b/BLAS/SRC/dznrm2.f90
@@ -61,7 +61,7 @@
 !
 !> \date August 2016
 !
-!> \ingroup single_blas_level1
+!> \ingroup nrm2
 !
 !> \par Contributors:
 !  ==================
@@ -86,11 +86,12 @@
 !> \endverbatim
 !>
 !  =====================================================================
-function DZNRM2( n, x, incx ) 
+function DZNRM2( n, x, incx )
+   implicit none
    integer, parameter :: wp = kind(1.d0)
    real(wp) :: DZNRM2
 !
-!  -- Reference BLAS level1 routine (version 3.9.1) --
+!  -- Reference BLAS level1 routine --
 !  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
 !  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 !     March 2021
@@ -100,15 +101,15 @@ function DZNRM2( n, x, incx )
    real(wp), parameter :: one  = 1.0_wp
    real(wp), parameter :: maxN = huge(0.0_wp)
 !  ..
-!  .. Blue's ccaling constants ..
+!  .. Blue's scaling constants ..
    real(wp), parameter :: tsml = real(radix(0._wp), wp)**ceiling( &
        (minexponent(0._wp) - 1) * 0.5_wp)
    real(wp), parameter :: tbig = real(radix(0._wp), wp)**floor( &
        (maxexponent(0._wp) - digits(0._wp) + 1) * 0.5_wp)
    real(wp), parameter :: ssml = real(radix(0._wp), wp)**( - floor( &
-       (minexponent(0._wp) - 1) * 0.5_wp))
+       (minexponent(0._wp) - digits(0._wp)) * 0.5_wp))
    real(wp), parameter :: sbig = real(radix(0._wp), wp)**( - ceiling( &
-       (maxexponent(0._wp) - digits(0._wp) + 1) * 0.5_wp))
+       (maxexponent(0._wp) + digits(0._wp) - 1) * 0.5_wp))
 !  ..
 !  .. Scalar Arguments ..
    integer :: incx, n
diff --git a/BLAS/SRC/icamax.f90 b/BLAS/SRC/icamax.f90
new file mode 100644
index 0000000000..9be0d9fdaa
--- /dev/null
+++ b/BLAS/SRC/icamax.f90
@@ -0,0 +1,193 @@
+!> \brief \b ICAMAX
+!
+!  =========== DOCUMENTATION ===========
+!
+! Online html documentation available at
+!            http://www.netlib.org/lapack/explore-html/
+!
+!  Definition:
+!  ===========
+!
+!       INTEGER FUNCTION ICAMAX(N,X,INCX)
+!
+!       .. Scalar Arguments ..
+!       INTEGER INCX,N
+!       ..
+!       .. Array Arguments ..
+!       COMPLEX X(*)
+!       ..
+!
+!
+!> \par Purpose:
+!  =============
+!>
+!> \verbatim
+!>
+!>  ICAMAX finds the index of the first element having maximum |Re(.)| + |Im(.)|
+!> \endverbatim
+!
+!  Arguments:
+!  ==========
+!
+!> \param[in] N
+!> \verbatim
+!>          N is INTEGER
+!>         number of elements in input vector(s)
+!> \endverbatim
+!>
+!> \param[in] X
+!> \verbatim
+!>          X is COMPLEX array, dimension ( 1 + ( N - 1 )*abs( INCX ) )
+!> \endverbatim
+!>
+!> \param[in] INCX
+!> \verbatim
+!>          INCX is INTEGER
+!>         storage spacing between elements of X
+!> \endverbatim
+!
+!  Authors:
+!  ========
+!
+!> James Demmel, University of California Berkeley, USA
+!> Weslley Pereira, National Renewable Energy Laboratory, USA
+!
+!> \ingroup iamax
+!
+!> \par Further Details:
+!  =====================
+!>
+!> \verbatim
+!>
+!> James Demmel et al. Proposed Consistent Exception Handling for the BLAS and
+!> LAPACK, 2022 (https://arxiv.org/abs/2207.09281).
+!>
+!> \endverbatim
+!>
+!  =====================================================================
+integer function icamax(n, x, incx)
+   implicit none
+   integer, parameter :: wp = kind(1.e0)
+!
+!  -- Reference BLAS level1 routine --
+!  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
+!  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+!
+!  .. Constants ..
+   real(wp), parameter :: hugeval = huge(0.0_wp)
+!
+!  .. Scalar Arguments ..
+   integer :: n, incx
+!
+!  .. Array Arguments ..
+   complex(wp) :: x(*)
+!  ..
+!  .. Local Scalars ..
+   integer :: i, j, ix, jx
+   real(wp) :: val, smax
+   logical :: scaledsmax
+!  ..
+!  .. Intrinsic Functions ..
+   intrinsic :: abs, aimag, huge, real
+!
+!  Quick return if possible
+!
+   icamax = 0
+   if (n < 1 .or. incx < 1) return
+!
+   icamax = 1
+   if (n == 1) return
+!
+   icamax = 0
+   scaledsmax = .false.
+   smax = -1
+!
+!  scaledsmax = .true. indicates that x(icamax) is finite but
+!  abs(real(x(icamax))) + abs(aimag(x(icamax))) overflows
+!
+   if (incx == 1) then
+      ! code for increment equal to 1
+      do i = 1, n
+         if (x(i) /= x(i)) then
+            ! return when first NaN found
+            icamax = i
+            return
+         elseif (abs(real(x(i))) > hugeval .or. abs(aimag(x(i))) > hugeval) then
+            ! keep looking for first NaN
+            do j = i+1, n
+               if (x(j) /= x(j)) then
+                  ! return when first NaN found
+                  icamax = j
+                  return
+               endif
+            enddo
+            ! record location of first Inf
+            icamax = i
+            return
+         else ! still no Inf found yet
+            if (.not. scaledsmax) then
+               ! no abs(real(x(i))) + abs(aimag(x(i))) = Inf yet
+               val = abs(real(x(i))) + abs(aimag(x(i)))
+               if (val > hugeval) then
+                  scaledsmax = .true.
+                  smax = 0.25*abs(real(x(i))) + 0.25*abs(aimag(x(i)))
+                  icamax = i
+               elseif (val > smax) then ! everything finite so far
+                  smax = val
+                  icamax = i
+               endif
+            else ! scaledsmax
+               val = 0.25*abs(real(x(i))) + 0.25*abs(aimag(x(i)))
+               if (val > smax) then
+                  smax = val
+                  icamax = i
+               endif
+            endif
+         endif
+      end do
+   else
+      ! code for increment not equal to 1
+      ix = 1
+      do i = 1, n
+         if (x(ix) /= x(ix)) then
+            ! return when first NaN found
+            icamax = i
+            return
+         elseif (abs(real(x(ix))) > hugeval .or. abs(aimag(x(ix))) > hugeval) then
+            ! keep looking for first NaN
+            jx = ix + incx
+            do j = i+1, n
+               if (x(jx) /= x(jx)) then
+                  ! return when first NaN found
+                  icamax = j
+                  return
+               endif
+               jx = jx + incx
+            enddo
+            ! record location of first Inf
+            icamax = i
+            return
+         else ! still no Inf found yet
+            if (.not. scaledsmax) then
+               ! no abs(real(x(ix))) + abs(aimag(x(ix))) = Inf yet
+               val = abs(real(x(ix))) + abs(aimag(x(ix)))
+               if (val > hugeval) then
+                  scaledsmax = .true.
+                  smax = 0.25*abs(real(x(ix))) + 0.25*abs(aimag(x(ix)))
+                  icamax = i
+               elseif (val > smax) then ! everything finite so far
+                  smax = val
+                  icamax = i
+               endif
+            else ! scaledsmax
+               val = 0.25*abs(real(x(ix))) + 0.25*abs(aimag(x(ix)))
+               if (val > smax) then
+                  smax = val
+                  icamax = i
+               endif
+            endif
+         endif
+         ix = ix + incx
+      end do
+   endif
+end
diff --git a/BLAS/SRC/idamax.f b/BLAS/SRC/idamax.f
index 1be301ea3e..35042300d7 100644
--- a/BLAS/SRC/idamax.f
+++ b/BLAS/SRC/idamax.f
@@ -54,7 +54,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup aux_blas
+*> \ingroup iamax
 *
 *> \par Further Details:
 *  =====================
@@ -68,6 +68,7 @@
 *>
 *  =====================================================================
       INTEGER FUNCTION IDAMAX(N,DX,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/isamax.f b/BLAS/SRC/isamax.f
index 8ad44ad419..6104adbf50 100644
--- a/BLAS/SRC/isamax.f
+++ b/BLAS/SRC/isamax.f
@@ -54,7 +54,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup aux_blas
+*> \ingroup iamax
 *
 *> \par Further Details:
 *  =====================
@@ -68,6 +68,7 @@
 *>
 *  =====================================================================
       INTEGER FUNCTION ISAMAX(N,SX,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/izamax.f90 b/BLAS/SRC/izamax.f90
new file mode 100644
index 0000000000..35b81d741c
--- /dev/null
+++ b/BLAS/SRC/izamax.f90
@@ -0,0 +1,193 @@
+!> \brief \b IZAMAX
+!
+!  =========== DOCUMENTATION ===========
+!
+! Online html documentation available at
+!            http://www.netlib.org/lapack/explore-html/
+!
+!  Definition:
+!  ===========
+!
+!       INTEGER FUNCTION IZAMAX(N,X,INCX)
+!
+!       .. Scalar Arguments ..
+!       INTEGER INCX,N
+!       ..
+!       .. Array Arguments ..
+!       DOUBLE COMPLEX X(*)
+!       ..
+!
+!
+!> \par Purpose:
+!  =============
+!>
+!> \verbatim
+!>
+!>  IZAMAX finds the index of the first element having maximum |Re(.)| + |Im(.)|
+!> \endverbatim
+!
+!  Arguments:
+!  ==========
+!
+!> \param[in] N
+!> \verbatim
+!>          N is INTEGER
+!>         number of elements in input vector(s)
+!> \endverbatim
+!>
+!> \param[in] X
+!> \verbatim
+!>          X is DOUBLE COMPLEX array, dimension ( 1 + ( N - 1 )*abs( INCX ) )
+!> \endverbatim
+!>
+!> \param[in] INCX
+!> \verbatim
+!>          INCX is INTEGER
+!>         storage spacing between elements of X
+!> \endverbatim
+!
+!  Authors:
+!  ========
+!
+!> James Demmel, University of California Berkeley, USA
+!> Weslley Pereira, National Renewable Energy Laboratory, USA
+!
+!> \ingroup iamax
+!
+!> \par Further Details:
+!  =====================
+!>
+!> \verbatim
+!>
+!> James Demmel et al. Proposed Consistent Exception Handling for the BLAS and
+!> LAPACK, 2022 (https://arxiv.org/abs/2207.09281).
+!>
+!> \endverbatim
+!>
+!  =====================================================================
+integer function izamax(n, x, incx)
+   implicit none
+   integer, parameter :: wp = kind(1.d0)
+!
+!  -- Reference BLAS level1 routine --
+!  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
+!  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+!
+!  .. Constants ..
+   real(wp), parameter :: hugeval = huge(0.0_wp)
+!
+!  .. Scalar Arguments ..
+   integer :: n, incx
+!
+!  .. Array Arguments ..
+   complex(wp) :: x(*)
+!  ..
+!  .. Local Scalars ..
+   integer :: i, j, ix, jx
+   real(wp) :: val, smax
+   logical :: scaledsmax
+!  ..
+!  .. Intrinsic Functions ..
+   intrinsic :: abs, dimag, huge, real
+!
+!  Quick return if possible
+!
+   izamax = 0
+   if (n < 1 .or. incx < 1) return
+!
+   izamax = 1
+   if (n == 1) return
+!
+   izamax = 0
+   scaledsmax = .false.
+   smax = -1
+!
+!  scaledsmax = .true. indicates that x(izamax) is finite but
+!  abs(real(x(izamax))) + abs(dimag(x(izamax))) overflows
+!
+   if (incx == 1) then
+      ! code for increment equal to 1
+      do i = 1, n
+         if (x(i) /= x(i)) then
+            ! return when first NaN found
+            izamax = i
+            return
+         elseif (abs(real(x(i))) > hugeval .or. abs(dimag(x(i))) > hugeval) then
+            ! keep looking for first NaN
+            do j = i+1, n
+               if (x(j) /= x(j)) then
+                  ! return when first NaN found
+                  izamax = j
+                  return
+               endif
+            enddo
+            ! record location of first Inf
+            izamax = i
+            return
+         else ! still no Inf found yet
+            if (.not. scaledsmax) then
+               ! no abs(real(x(i))) + abs(dimag(x(i))) = Inf yet
+               val = abs(real(x(i))) + abs(dimag(x(i)))
+               if (val > hugeval) then
+                  scaledsmax = .true.
+                  smax = 0.25*abs(real(x(i))) + 0.25*abs(dimag(x(i)))
+                  izamax = i
+               elseif (val > smax) then ! everything finite so far
+                  smax = val
+                  izamax = i
+               endif
+            else ! scaledsmax
+               val = 0.25*abs(real(x(i))) + 0.25*abs(dimag(x(i)))
+               if (val > smax) then
+                  smax = val
+                  izamax = i
+               endif
+            endif
+         endif
+      end do
+   else
+      ! code for increment not equal to 1
+      ix = 1
+      do i = 1, n
+         if (x(ix) /= x(ix)) then
+            ! return when first NaN found
+            izamax = i
+            return
+         elseif (abs(real(x(ix))) > hugeval .or. abs(dimag(x(ix))) > hugeval) then
+            ! keep looking for first NaN
+            jx = ix + incx
+            do j = i+1, n
+               if (x(jx) /= x(jx)) then
+                  ! return when first NaN found
+                  izamax = j
+                  return
+               endif
+               jx = jx + incx
+            enddo
+            ! record location of first Inf
+            izamax = i
+            return
+         else ! still no Inf found yet
+            if (.not. scaledsmax) then
+               ! no abs(real(x(ix))) + abs(dimag(x(ix))) = Inf yet
+               val = abs(real(x(ix))) + abs(dimag(x(ix)))
+               if (val > hugeval) then
+                  scaledsmax = .true.
+                  smax = 0.25*abs(real(x(ix))) + 0.25*abs(dimag(x(ix)))
+                  izamax = i
+               elseif (val > smax) then ! everything finite so far
+                  smax = val
+                  izamax = i
+               endif
+            else ! scaledsmax
+               val = 0.25*abs(real(x(ix))) + 0.25*abs(dimag(x(ix)))
+               if (val > smax) then
+                  smax = val
+                  izamax = i
+               endif
+            endif
+         endif
+         ix = ix + incx
+      end do
+   endif
+end
diff --git a/BLAS/SRC/lsame.f b/BLAS/SRC/lsame.f
index 6aa4007065..10246991e4 100644
--- a/BLAS/SRC/lsame.f
+++ b/BLAS/SRC/lsame.f
@@ -46,10 +46,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup aux_blas
+*> \ingroup lsame
 *
 *  =====================================================================
       LOGICAL FUNCTION LSAME(CA,CB)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/sasum.f b/BLAS/SRC/sasum.f
index 6c2e0c9bc8..8b3136898a 100644
--- a/BLAS/SRC/sasum.f
+++ b/BLAS/SRC/sasum.f
@@ -55,7 +55,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level1
+*> \ingroup asum
 *
 *> \par Further Details:
 *  =====================
@@ -69,6 +69,7 @@
 *>
 *  =====================================================================
       REAL FUNCTION SASUM(N,SX,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/saxpby.f b/BLAS/SRC/saxpby.f
new file mode 100644
index 0000000000..d1da056f43
--- /dev/null
+++ b/BLAS/SRC/saxpby.f
@@ -0,0 +1,148 @@
+*> \brief \b SAXPBY
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE SAXPBY(N,SA,SX,INCX,SB,SY,INCY)
+*
+*       .. Scalar Arguments ..
+*       REAL SA,SB
+*       INTEGER INCX,INCY,N
+*       ..
+*       .. Array Arguments ..
+*       REAL SX(*),SY(*)
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*>    SAXPBY constant times a vector plus constant times a vector.
+*>
+*>    Y = ALPHA * X + BETA * Y
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          number of elements in input vector(s)
+*> \endverbatim
+*>
+*> \param[in] SA
+*> \verbatim
+*>           SA is REAL
+*>           On entry, SA specifies the scalar alpha.
+*> \endverbatim
+*>
+*> \param[in] SX
+*> \verbatim
+*>          SX is REAL array, dimension ( 1 + ( N - 1 )*abs( INCX ) )
+*> \endverbatim
+*>
+*> \param[in] INCX
+*> \verbatim
+*>          INCX is INTEGER
+*>          storage spacing between elements of SX
+*> \endverbatim
+*>
+*> \param[in] SB
+*> \verbatim
+*>           SB is REAL
+*>           On entry, SB specifies the scalar beta.
+*> \endverbatim
+*>
+*> \param[in,out] SY
+*> \verbatim
+*>          SY is REAL array, dimension ( 1 + ( N - 1 )*abs( INCY ) )
+*> \endverbatim
+*>
+*> \param[in] INCY
+*> \verbatim
+*>          INCY is INTEGER
+*>         storage spacing between elements of SY
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*> \author Martin Koehler, MPI Magdeburg
+*
+*> \ingroup axpby
+*
+*  =====================================================================
+      SUBROUTINE SAXPBY(N,SA,SX,INCX,SB,SY,INCY)
+      IMPLICIT NONE
+*
+*  -- Reference BLAS level1 routine --
+*  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      REAL SA,SB
+      INTEGER INCX,INCY,N
+*     ..
+*     .. Array Arguments ..
+      REAL SX(*),SY(*)
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL SSCAL
+*
+*  =====================================================================
+*
+*     .. Local Scalars ..
+      INTEGER I,IX,IY,M,MP1
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC MOD
+*     ..
+      IF (N.LE.0) RETURN
+
+*     Scale if SA.EQ.0
+      IF (SA.EQ.0.0E0 .AND. SB.NE.0.0E0) THEN
+          CALL SSCAL(N, SB, SY, INCY)
+          RETURN
+      END IF
+
+
+      IF (INCX.EQ.1 .AND. INCY.EQ.1) THEN
+*
+*        code for both increments equal to 1
+*
+         DO I = 1,N
+            SY(I) = SB*SY(I) + SA*SX(I)
+         END DO
+      ELSE
+*
+*        code for unequal increments or equal increments
+*          not equal to 1
+*
+         IX = 1
+         IY = 1
+         IF (INCX.LT.0) IX = (-N+1)*INCX + 1
+         IF (INCY.LT.0) IY = (-N+1)*INCY + 1
+         DO I = 1,N
+          SY(IY) = SB*SY(IY) + SA*SX(IX)
+          IX = IX + INCX
+          IY = IY + INCY
+         END DO
+      END IF
+      RETURN
+*
+*     End of SAXPBY
+*
+      END
diff --git a/BLAS/SRC/saxpy.f b/BLAS/SRC/saxpy.f
index ded238a9f9..52296e5b37 100644
--- a/BLAS/SRC/saxpy.f
+++ b/BLAS/SRC/saxpy.f
@@ -73,7 +73,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level1
+*> \ingroup axpy
 *
 *> \par Further Details:
 *  =====================
@@ -86,6 +86,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SAXPY(N,SA,SX,INCX,SY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/scabs1.f b/BLAS/SRC/scabs1.f
index 9bacf09db6..f6e6cbb7cc 100644
--- a/BLAS/SRC/scabs1.f
+++ b/BLAS/SRC/scabs1.f
@@ -39,10 +39,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level1
+*> \ingroup abs1
 *
 *  =====================================================================
       REAL FUNCTION SCABS1(Z)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/scasum.f b/BLAS/SRC/scasum.f
index 8fd67e9b29..054859ff37 100644
--- a/BLAS/SRC/scasum.f
+++ b/BLAS/SRC/scasum.f
@@ -55,7 +55,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level1
+*> \ingroup asum
 *
 *> \par Further Details:
 *  =====================
@@ -69,6 +69,7 @@
 *>
 *  =====================================================================
       REAL FUNCTION SCASUM(N,CX,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/scnrm2.f90 b/BLAS/SRC/scnrm2.f90
index 2b282d40a1..1885d7bf71 100644
--- a/BLAS/SRC/scnrm2.f90
+++ b/BLAS/SRC/scnrm2.f90
@@ -61,7 +61,7 @@
 !
 !> \date August 2016
 !
-!> \ingroup single_blas_level1
+!> \ingroup nrm2
 !
 !> \par Contributors:
 !  ==================
@@ -86,11 +86,12 @@
 !> \endverbatim
 !>
 !  =====================================================================
-function SCNRM2( n, x, incx ) 
+function SCNRM2( n, x, incx )
+   implicit none
    integer, parameter :: wp = kind(1.e0)
    real(wp) :: SCNRM2
 !
-!  -- Reference BLAS level1 routine (version 3.9.1) --
+!  -- Reference BLAS level1 routine --
 !  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
 !  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 !     March 2021
@@ -100,15 +101,15 @@ function SCNRM2( n, x, incx )
    real(wp), parameter :: one  = 1.0_wp
    real(wp), parameter :: maxN = huge(0.0_wp)
 !  ..
-!  .. Blue's ccaling constants ..
+!  .. Blue's scaling constants ..
    real(wp), parameter :: tsml = real(radix(0._wp), wp)**ceiling( &
        (minexponent(0._wp) - 1) * 0.5_wp)
    real(wp), parameter :: tbig = real(radix(0._wp), wp)**floor( &
        (maxexponent(0._wp) - digits(0._wp) + 1) * 0.5_wp)
    real(wp), parameter :: ssml = real(radix(0._wp), wp)**( - floor( &
-       (minexponent(0._wp) - 1) * 0.5_wp))
+       (minexponent(0._wp) - digits(0._wp)) * 0.5_wp))
    real(wp), parameter :: sbig = real(radix(0._wp), wp)**( - ceiling( &
-       (maxexponent(0._wp) - digits(0._wp) + 1) * 0.5_wp))
+       (maxexponent(0._wp) + digits(0._wp) - 1) * 0.5_wp))
 !  ..
 !  .. Scalar Arguments ..
    integer :: incx, n
diff --git a/BLAS/SRC/scopy.f b/BLAS/SRC/scopy.f
index 961025ca44..76503a20f3 100644
--- a/BLAS/SRC/scopy.f
+++ b/BLAS/SRC/scopy.f
@@ -66,7 +66,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level1
+*> \ingroup copy
 *
 *> \par Further Details:
 *  =====================
@@ -79,6 +79,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SCOPY(N,SX,INCX,SY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/sdot.f b/BLAS/SRC/sdot.f
index ed7213e4a9..2271ff03b1 100644
--- a/BLAS/SRC/sdot.f
+++ b/BLAS/SRC/sdot.f
@@ -66,7 +66,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level1
+*> \ingroup dot
 *
 *> \par Further Details:
 *  =====================
@@ -79,6 +79,7 @@
 *>
 *  =====================================================================
       REAL FUNCTION SDOT(N,SX,INCX,SY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/sdsdot.f b/BLAS/SRC/sdsdot.f
index 62e2bdd11f..4271c2be98 100644
--- a/BLAS/SRC/sdsdot.f
+++ b/BLAS/SRC/sdsdot.f
@@ -82,7 +82,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level1
+*> \ingroup dot
 *
 *> \par Further Details:
 *  =====================
@@ -110,6 +110,7 @@
 *>
 *  =====================================================================
       REAL FUNCTION SDSDOT(N,SB,SX,INCX,SY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -130,7 +131,7 @@ REAL FUNCTION SDSDOT(N,SB,SX,INCX,SY,INCY)
 *     ..
       DSDOT = SB
       IF (N.LE.0) THEN
-         SDSDOT = DSDOT
+         SDSDOT = REAL(DSDOT)
          RETURN
       END IF
       IF (INCX.EQ.INCY .AND. INCX.GT.0) THEN
@@ -155,7 +156,7 @@ REAL FUNCTION SDSDOT(N,SB,SX,INCX,SY,INCY)
             KY = KY + INCY
          END DO
       END IF
-      SDSDOT = DSDOT
+      SDSDOT = REAL(DSDOT)
       RETURN
 *
 *     End of SDSDOT
diff --git a/BLAS/SRC/sgbmv.f b/BLAS/SRC/sgbmv.f
index b5211eec99..942cd29a7d 100644
--- a/BLAS/SRC/sgbmv.f
+++ b/BLAS/SRC/sgbmv.f
@@ -146,6 +146,8 @@
 *>           ( 1 + ( n - 1 )*abs( INCY ) ) otherwise.
 *>           Before entry, the incremented array Y must contain the
 *>           vector y. On exit, Y is overwritten by the updated vector y.
+*>           If either m or n is zero, then Y not referenced and the function
+*>           performs a quick return.
 *> \endverbatim
 *>
 *> \param[in] INCY
@@ -163,7 +165,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level2
+*> \ingroup gbmv
 *
 *> \par Further Details:
 *  =====================
@@ -181,7 +183,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SGBMV(TRANS,M,N,KL,KU,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
+      SUBROUTINE SGBMV(TRANS,M,N,KL,KU,ALPHA,A,LDA,X,INCX,
+     +        BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/sgemm.f b/BLAS/SRC/sgemm.f
index d25a152116..c88cae7d46 100644
--- a/BLAS/SRC/sgemm.f
+++ b/BLAS/SRC/sgemm.f
@@ -35,6 +35,16 @@
 *>
 *> alpha and beta are scalars, and A, B and C are matrices, with op( A )
 *> an m by k matrix,  op( B )  a  k by n matrix and  C an m by n matrix.
+*>
+*> Note: if alpha and/or beta is zero, some parts of the matrix-matrix
+*>  operations are not performed. This results in the following NaN/Inf
+*>  propagation quirks:
+*>
+*>  1. If alpha is zero, NaNs or Infs in A or B do not affect the result.
+*>  2. If both alpha and beta are zero, then a zero matrix is returned in C,
+*>   irrespective of any NaNs or Infs in A, B or C.
+*>  3. If only beta is zero, alpha*op( A )*op( B ) is returned, irrespective
+*>   of any NaNs or Infs in C.
 *> \endverbatim
 *
 *  Arguments:
@@ -51,6 +61,9 @@
 *>              TRANSA = 'T' or 't',  op( A ) = A**T.
 *>
 *>              TRANSA = 'C' or 'c',  op( A ) = A**T.
+*>
+*>           Note: TRANSA = 'C' is supported for the sake of API consistency
+*>           between all ?GEMM variants.
 *> \endverbatim
 *>
 *> \param[in] TRANSB
@@ -64,6 +77,9 @@
 *>              TRANSB = 'T' or 't',  op( B ) = B**T.
 *>
 *>              TRANSB = 'C' or 'c',  op( B ) = B**T.
+*>
+*>           Note: TRANSB = 'C' is supported for the sake of API consistency
+*>           between all ?GEMM variants.
 *> \endverbatim
 *>
 *> \param[in] M
@@ -92,7 +108,9 @@
 *> \param[in] ALPHA
 *> \verbatim
 *>          ALPHA is REAL
-*>           On entry, ALPHA specifies the scalar alpha.
+*>           On entry, ALPHA specifies the scalar alpha. If ALPHA is zero the
+*>           values in A and B do not affect the result. This also means that
+*>           NaN/Inf propagation from A and B is inhibited if ALPHA is zero.
 *> \endverbatim
 *>
 *> \param[in] A
@@ -102,7 +120,10 @@
 *>           Before entry with  TRANSA = 'N' or 'n',  the leading  m by k
 *>           part of the array  A  must contain the matrix  A,  otherwise
 *>           the leading  k by m  part of the array  A  must contain  the
-*>           matrix A.
+*>           matrix A, except if ALPHA is zero.
+*>           If ALPHA is zero, none of the values in A affect the result, even
+*>           if they are NaN/Inf. This also implies that if ALPHA is zero,
+*>           the matrix elements of A need not be initialized by the caller.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -121,7 +142,10 @@
 *>           Before entry with  TRANSB = 'N' or 'n',  the leading  k by n
 *>           part of the array  B  must contain the matrix  B,  otherwise
 *>           the leading  n by k  part of the array  B  must contain  the
-*>           matrix B.
+*>           matrix B, except if ALPHA is zero.
+*>           If ALPHA is zero, none of the values in B affect the result, even
+*>           if they are NaN/Inf. This also implies that if ALPHA is zero,
+*>           the matrix elements of B need not be initialized by the caller.
 *> \endverbatim
 *>
 *> \param[in] LDB
@@ -136,16 +160,19 @@
 *> \param[in] BETA
 *> \verbatim
 *>          BETA is REAL
-*>           On entry,  BETA  specifies the scalar  beta.  When  BETA  is
-*>           supplied as zero then C need not be set on input.
+*>           On entry,  BETA  specifies the scalar  beta.  If BETA is zero the
+*>           values in C do not affect the result. This also means that
+*>           NaN/Inf propagation from C is inhibited if BETA is zero.
 *> \endverbatim
 *>
 *> \param[in,out] C
 *> \verbatim
 *>          C is REAL array, dimension ( LDC, N )
 *>           Before entry, the leading  m by n  part of the array  C must
-*>           contain the matrix  C,  except when  beta  is zero, in which
-*>           case C need not be set on entry.
+*>           contain the matrix  C, except if beta is zero.
+*>           If beta is zero, none of the values in C affect the result, even
+*>           if they are NaN/Inf. This also implies that if beta is zero,
+*>           the matrix elements of C need not be initialized by the caller.
 *>           On exit, the array  C  is overwritten by the  m by n  matrix
 *>           ( alpha*op( A )*op( B ) + beta*C ).
 *> \endverbatim
@@ -166,7 +193,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level3
+*> \ingroup gemm
 *
 *> \par Further Details:
 *  =====================
@@ -183,7 +210,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
+      SUBROUTINE SGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,
+     +         BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/sgemmtr.f b/BLAS/SRC/sgemmtr.f
new file mode 100644
index 0000000000..257ff8bde2
--- /dev/null
+++ b/BLAS/SRC/sgemmtr.f
@@ -0,0 +1,431 @@
+*> \brief \b SGEMMTR
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE SGEMMTR(UPLO,TRANSA,TRANSB,N,K,ALPHA,A,LDA,B,LDB,BETA,
+*                         C,LDC)
+*
+*       .. Scalar Arguments ..
+*       REAL ALPHA,BETA
+*       INTEGER K,LDA,LDB,LDC,N
+*       CHARACTER TRANSA,TRANSB, UPLO
+*       ..
+*       .. Array Arguments ..
+*       REAL A(LDA,*),B(LDB,*),C(LDC,*)
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> SGEMMTR  performs one of the matrix-matrix operations
+*>
+*>    C := alpha*op( A )*op( B ) + beta*C,
+*>
+*> where  op( X ) is one of
+*>
+*>    op( X ) = X   or   op( X ) = X**T,
+*>
+*> alpha and beta are scalars, and A, B and C are matrices, with op( A )
+*> an n by k matrix,  op( B )  a  k by n matrix and  C an n by n matrix.
+*> Thereby, the routine only accesses and updates the upper or lower
+*> triangular part of the result matrix C. This behaviour can be used if
+*> the resulting matrix C is known to be symmetric.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>           On entry, UPLO specifies whether the lower or the upper
+*>           triangular part of C is access and updated.
+*>
+*>              UPLO = 'L' or 'l', the lower triangular part of C is used.
+*>
+*>              UPLO = 'U' or 'u', the upper triangular part of C is used.
+*> \endverbatim
+*
+*> \param[in] TRANSA
+*> \verbatim
+*>          TRANSA is CHARACTER*1
+*>           On entry, TRANSA specifies the form of op( A ) to be used in
+*>           the matrix multiplication as follows:
+*>
+*>              TRANSA = 'N' or 'n',  op( A ) = A.
+*>
+*>              TRANSA = 'T' or 't',  op( A ) = A**T.
+*>
+*>              TRANSA = 'C' or 'c',  op( A ) = A**T.
+*> \endverbatim
+*>
+*> \param[in] TRANSB
+*> \verbatim
+*>          TRANSB is CHARACTER*1
+*>           On entry, TRANSB specifies the form of op( B ) to be used in
+*>           the matrix multiplication as follows:
+*>
+*>              TRANSB = 'N' or 'n',  op( B ) = B.
+*>
+*>              TRANSB = 'T' or 't',  op( B ) = B**T.
+*>
+*>              TRANSB = 'C' or 'c',  op( B ) = B**T.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>           On entry,  N specifies the number of rows and columns of
+*>           the matrix C, the number of columns of op(B) and the number
+*>           of rows of op(A).  N must be at least zero.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>           On entry,  K  specifies  the number of columns of the matrix
+*>           op( A ) and the number of rows of the matrix op( B ). K must
+*>           be at least  zero.
+*> \endverbatim
+*>
+*> \param[in] ALPHA
+*> \verbatim
+*>          ALPHA is REAL.
+*>           On entry, ALPHA specifies the scalar alpha.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is REAL array, dimension ( LDA, ka ), where ka is
+*>           k  when  TRANSA = 'N' or 'n',  and is  n  otherwise.
+*>           Before entry with  TRANSA = 'N' or 'n',  the leading  n by k
+*>           part of the array  A  must contain the matrix  A,  otherwise
+*>           the leading  k by m  part of the array  A  must contain  the
+*>           matrix A.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>           On entry, LDA specifies the first dimension of A as declared
+*>           in the calling (sub) program. When  TRANSA = 'N' or 'n' then
+*>           LDA must be at least  max( 1, n ), otherwise  LDA must be at
+*>           least  max( 1, k ).
+*> \endverbatim
+*>
+*> \param[in] B
+*> \verbatim
+*>          B is REAL array, dimension ( LDB, kb ), where kb is
+*>           n  when  TRANSB = 'N' or 'n',  and is  k  otherwise.
+*>           Before entry with  TRANSB = 'N' or 'n',  the leading  k by n
+*>           part of the array  B  must contain the matrix  B,  otherwise
+*>           the leading  n by k  part of the array  B  must contain  the
+*>           matrix B.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>           On entry, LDB specifies the first dimension of B as declared
+*>           in the calling (sub) program. When  TRANSB = 'N' or 'n' then
+*>           LDB must be at least  max( 1, k ), otherwise  LDB must be at
+*>           least  max( 1, n ).
+*> \endverbatim
+*>
+*> \param[in] BETA
+*> \verbatim
+*>          BETA is REAL.
+*>           On entry,  BETA  specifies the scalar  beta.  When  BETA  is
+*>           supplied as zero then C need not be set on input.
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is REAL array, dimension ( LDC, N )
+*>           Before entry, the leading  n by n  part of the array  C must
+*>           contain the matrix  C,  except when  beta  is zero, in which
+*>           case C need not be set on entry.
+*>           On exit, the upper or lower triangular part of the matrix
+*>           C  is overwritten by the n by n matrix
+*>           ( alpha*op( A )*op( B ) + beta*C ).
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>           On entry, LDC specifies the first dimension of C as declared
+*>           in  the  calling  (sub)  program.   LDC  must  be  at  least
+*>           max( 1, n ).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Martin Koehler
+*
+*> \ingroup gemmtr
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  Level 3 Blas routine.
+*>
+*>  -- Written on 19-July-2023.
+*>     Martin Koehler, MPI Magdeburg
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE SGEMMTR(UPLO,TRANSA,TRANSB,N,K,ALPHA,A,LDA,B,LDB,
+     +         BETA,C,LDC)
+      IMPLICIT NONE
+*
+*  -- Reference BLAS level3 routine --
+*  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      REAL ALPHA,BETA
+      INTEGER K,LDA,LDB,LDC,N
+      CHARACTER TRANSA,TRANSB,UPLO
+*     ..
+*     .. Array Arguments ..
+      REAL A(LDA,*),B(LDB,*),C(LDC,*)
+*     ..
+*
+*  =====================================================================
+*
+*     .. External Functions ..
+      LOGICAL LSAME
+      EXTERNAL LSAME
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC MAX
+*     ..
+*     .. Local Scalars ..
+      REAL TEMP
+      INTEGER I,INFO,J,L,NROWA,NROWB, ISTART, ISTOP
+      LOGICAL NOTA,NOTB, UPPER
+*     ..
+*     .. Parameters ..
+      REAL ONE,ZERO
+      PARAMETER (ONE=1.0D+0,ZERO=0.0D+0)
+*     ..
+*
+*     Set  NOTA  and  NOTB  as  true if  A  and  B  respectively are not
+*     transposed and set  NROWA and NROWB  as the number of rows of  A
+*     and  B  respectively.
+*
+      NOTA = LSAME(TRANSA,'N')
+      NOTB = LSAME(TRANSB,'N')
+      IF (NOTA) THEN
+          NROWA = N
+      ELSE
+          NROWA = K
+      END IF
+      IF (NOTB) THEN
+          NROWB = K
+      ELSE
+          NROWB = N
+      END IF
+      UPPER = LSAME(UPLO, 'U')
+*
+*     Test the input parameters.
+*
+      INFO = 0
+      IF ((.NOT. UPPER) .AND. (.NOT. LSAME(UPLO, 'L'))) THEN
+          INFO = 1
+      ELSE IF ((.NOT.NOTA) .AND. (.NOT.LSAME(TRANSA,'C')) .AND.
+     +    (.NOT.LSAME(TRANSA,'T'))) THEN
+          INFO = 2
+      ELSE IF ((.NOT.NOTB) .AND. (.NOT.LSAME(TRANSB,'C')) .AND.
+     +         (.NOT.LSAME(TRANSB,'T'))) THEN
+          INFO = 3
+      ELSE IF (N.LT.0) THEN
+          INFO = 4
+      ELSE IF (K.LT.0) THEN
+          INFO = 5
+      ELSE IF (LDA.LT.MAX(1,NROWA)) THEN
+          INFO = 8
+      ELSE IF (LDB.LT.MAX(1,NROWB)) THEN
+          INFO = 10
+      ELSE IF (LDC.LT.MAX(1,N)) THEN
+          INFO = 13
+      END IF
+      IF (INFO.NE.0) THEN
+          CALL XERBLA('SGEMMTR',INFO)
+          RETURN
+      END IF
+*
+*     Quick return if possible.
+*
+      IF (N.EQ.0) RETURN
+*
+*     And if  alpha.eq.zero.
+*
+      IF (ALPHA.EQ.ZERO) THEN
+          IF (BETA.EQ.ZERO) THEN
+              DO 20 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 10 I = ISTART, ISTOP
+                      C(I,J) = ZERO
+   10             CONTINUE
+   20         CONTINUE
+          ELSE
+              DO 40 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 30 I = ISTART, ISTOP
+                      C(I,J) = BETA*C(I,J)
+   30             CONTINUE
+   40         CONTINUE
+          END IF
+          RETURN
+      END IF
+*
+*     Start the operations.
+*
+      IF (NOTB) THEN
+          IF (NOTA) THEN
+*
+*           Form  C := alpha*A*B + beta*C.
+*
+              DO 90 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+                  IF (BETA.EQ.ZERO) THEN
+                      DO 50 I = ISTART, ISTOP
+                          C(I,J) = ZERO
+   50                 CONTINUE
+                  ELSE IF (BETA.NE.ONE) THEN
+                      DO 60 I = ISTART, ISTOP
+                          C(I,J) = BETA*C(I,J)
+   60                 CONTINUE
+                  END IF
+                  DO 80 L = 1,K
+                      TEMP = ALPHA*B(L,J)
+                      DO 70 I = ISTART, ISTOP
+                          C(I,J) = C(I,J) + TEMP*A(I,L)
+   70                 CONTINUE
+   80             CONTINUE
+   90         CONTINUE
+          ELSE
+*
+*           Form  C := alpha*A**T*B + beta*C
+*
+              DO 120 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 110 I = ISTART, ISTOP
+                      TEMP = ZERO
+                      DO 100 L = 1,K
+                          TEMP = TEMP + A(L,I)*B(L,J)
+  100                 CONTINUE
+                      IF (BETA.EQ.ZERO) THEN
+                          C(I,J) = ALPHA*TEMP
+                      ELSE
+                          C(I,J) = ALPHA*TEMP + BETA*C(I,J)
+                      END IF
+  110             CONTINUE
+  120         CONTINUE
+          END IF
+      ELSE
+          IF (NOTA) THEN
+*
+*           Form  C := alpha*A*B**T + beta*C
+*
+              DO 170 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  IF (BETA.EQ.ZERO) THEN
+                      DO 130 I = ISTART,ISTOP
+                          C(I,J) = ZERO
+  130                 CONTINUE
+                  ELSE IF (BETA.NE.ONE) THEN
+                      DO 140 I = ISTART,ISTOP
+                          C(I,J) = BETA*C(I,J)
+  140                 CONTINUE
+                  END IF
+                  DO 160 L = 1,K
+                      TEMP = ALPHA*B(J,L)
+                      DO 150 I = ISTART,ISTOP
+                          C(I,J) = C(I,J) + TEMP*A(I,L)
+  150                 CONTINUE
+  160             CONTINUE
+  170         CONTINUE
+          ELSE
+*
+*           Form  C := alpha*A**T*B**T + beta*C
+*
+              DO 200 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 190 I = ISTART, ISTOP
+                      TEMP = ZERO
+                      DO 180 L = 1,K
+                          TEMP = TEMP + A(L,I)*B(J,L)
+  180                 CONTINUE
+                      IF (BETA.EQ.ZERO) THEN
+                          C(I,J) = ALPHA*TEMP
+                      ELSE
+                          C(I,J) = ALPHA*TEMP + BETA*C(I,J)
+                      END IF
+  190             CONTINUE
+  200         CONTINUE
+          END IF
+      END IF
+*
+      RETURN
+*
+*     End of SGEMMTR
+*
+      END
diff --git a/BLAS/SRC/sgemv.f b/BLAS/SRC/sgemv.f
index 0517b124c5..07efa04307 100644
--- a/BLAS/SRC/sgemv.f
+++ b/BLAS/SRC/sgemv.f
@@ -117,6 +117,8 @@
 *>           Before entry with BETA non-zero, the incremented array Y
 *>           must contain the vector y. On exit, Y is overwritten by the
 *>           updated vector y.
+*>           If either m or n is zero, then Y not referenced and the function
+*>           performs a quick return.
 *> \endverbatim
 *>
 *> \param[in] INCY
@@ -134,7 +136,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level2
+*> \ingroup gemv
 *
 *> \par Further Details:
 *  =====================
@@ -153,6 +155,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGEMV(TRANS,M,N,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/sger.f b/BLAS/SRC/sger.f
index 9dfe4a2826..befc1e3390 100644
--- a/BLAS/SRC/sger.f
+++ b/BLAS/SRC/sger.f
@@ -109,7 +109,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level2
+*> \ingroup ger
 *
 *> \par Further Details:
 *  =====================
@@ -127,6 +127,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGER(M,N,ALPHA,X,INCX,Y,INCY,A,LDA)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/snrm2.f90 b/BLAS/SRC/snrm2.f90
index 2404ff0914..1e849f19b6 100644
--- a/BLAS/SRC/snrm2.f90
+++ b/BLAS/SRC/snrm2.f90
@@ -60,7 +60,7 @@
 !
 !> \date August 2016
 !
-!> \ingroup single_blas_level1
+!> \ingroup nrm2
 !
 !> \par Contributors:
 !  ==================
@@ -85,11 +85,12 @@
 !> \endverbatim
 !>
 !  =====================================================================
-function SNRM2( n, x, incx ) 
+function SNRM2( n, x, incx )
+   implicit none
    integer, parameter :: wp = kind(1.e0)
    real(wp) :: SNRM2
 !
-!  -- Reference BLAS level1 routine (version 3.9.1) --
+!  -- Reference BLAS level1 routine --
 !  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
 !  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 !     March 2021
@@ -99,15 +100,15 @@ function SNRM2( n, x, incx )
    real(wp), parameter :: one  = 1.0_wp
    real(wp), parameter :: maxN = huge(0.0_wp)
 !  ..
-!  .. Blue's ccaling constants ..
+!  .. Blue's scaling constants ..
    real(wp), parameter :: tsml = real(radix(0._wp), wp)**ceiling( &
        (minexponent(0._wp) - 1) * 0.5_wp)
    real(wp), parameter :: tbig = real(radix(0._wp), wp)**floor( &
        (maxexponent(0._wp) - digits(0._wp) + 1) * 0.5_wp)
    real(wp), parameter :: ssml = real(radix(0._wp), wp)**( - floor( &
-       (minexponent(0._wp) - 1) * 0.5_wp))
+       (minexponent(0._wp) - digits(0._wp)) * 0.5_wp))
    real(wp), parameter :: sbig = real(radix(0._wp), wp)**( - ceiling( &
-       (maxexponent(0._wp) - digits(0._wp) + 1) * 0.5_wp))
+       (maxexponent(0._wp) + digits(0._wp) - 1) * 0.5_wp))
 !  ..
 !  .. Scalar Arguments ..
    integer :: incx, n
diff --git a/BLAS/SRC/srot.f b/BLAS/SRC/srot.f
index 1441e0d939..2a778906f1 100644
--- a/BLAS/SRC/srot.f
+++ b/BLAS/SRC/srot.f
@@ -76,7 +76,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level1
+*> \ingroup rot
 *
 *> \par Further Details:
 *  =====================
@@ -89,6 +89,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SROT(N,SX,INCX,SY,INCY,C,S)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/srotg.f90 b/BLAS/SRC/srotg.f90
index af1beceeef..93b2e2b54e 100644
--- a/BLAS/SRC/srotg.f90
+++ b/BLAS/SRC/srotg.f90
@@ -5,19 +5,16 @@
 ! Online html documentation available at
 !            http://www.netlib.org/lapack/explore-html/
 !
-!  Definition:
-!  ===========
-!
-!  SROTG constructs a plane rotation
-!     [  c  s ] [ a ] = [ r ]
-!     [ -s  c ] [ b ]   [ 0 ]
-!  satisfying c**2 + s**2 = 1.
-!
 !> \par Purpose:
 !  =============
 !>
 !> \verbatim
 !>
+!> SROTG constructs a plane rotation
+!>    [  c  s ] [ a ] = [ r ]
+!>    [ -s  c ] [ b ]   [ 0 ]
+!> satisfying c**2 + s**2 = 1.
+!>
 !> The computation uses the formulas
 !>    sigma = sgn(a)    if |a| >  |b|
 !>          = sgn(b)    if |b| >= |a|
@@ -34,6 +31,8 @@
 !>    If |z| > 1, set c = 1/z and s = sqrt( 1 - c**2).
 !>
 !> \endverbatim
+!>
+!> @see lartg, @see lartgp
 !
 !  Arguments:
 !  ==========
@@ -74,7 +73,7 @@
 !>
 !> Weslley Pereira, University of Colorado Denver, USA
 !
-!> \ingroup single_blas_level1
+!> \ingroup rotg
 !
 !> \par Further Details:
 !  =====================
@@ -90,6 +89,7 @@
 !
 !  =====================================================================
 subroutine SROTG( a, b, c, s )
+   implicit none
    integer, parameter :: wp = kind(1.e0)
 !
 !  -- Reference BLAS level1 routine --
diff --git a/BLAS/SRC/srotm.f b/BLAS/SRC/srotm.f
index a20cfd9649..f5c2e3c9cd 100644
--- a/BLAS/SRC/srotm.f
+++ b/BLAS/SRC/srotm.f
@@ -39,6 +39,9 @@
 *>      (SH21  SH22),   (SH21  1.E0),   (-1.E0 SH22),   (0.E0  1.E0).
 *>    SEE  SROTMG FOR A DESCRIPTION OF DATA STORAGE IN SPARAM.
 *>
+*>    IF SFLAG IS NOT ONE OF THE LISTED ABOVE, THE BEHAVIOR IS UNDEFINED.
+*>    NANS IN SFLAG MAY NOT PROPAGATE TO THE OUTPUT.
+*>
 *> \endverbatim
 *
 *  Arguments:
@@ -90,10 +93,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level1
+*> \ingroup rotm
 *
 *  =====================================================================
       SUBROUTINE SROTM(N,SX,INCX,SY,INCY,SPARAM)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/srotmg.f b/BLAS/SRC/srotmg.f
index 63d55dde03..bd1bb57624 100644
--- a/BLAS/SRC/srotmg.f
+++ b/BLAS/SRC/srotmg.f
@@ -83,10 +83,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level1
+*> \ingroup rotmg
 *
 *  =====================================================================
       SUBROUTINE SROTMG(SD1,SD2,SX1,SY1,SPARAM)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/ssbmv.f b/BLAS/SRC/ssbmv.f
index c458131709..487a610626 100644
--- a/BLAS/SRC/ssbmv.f
+++ b/BLAS/SRC/ssbmv.f
@@ -162,7 +162,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level2
+*> \ingroup hbmv
 *
 *> \par Further Details:
 *  =====================
@@ -181,6 +181,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SSBMV(UPLO,N,K,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/sscal.f b/BLAS/SRC/sscal.f
index 7d52c4253f..1079418637 100644
--- a/BLAS/SRC/sscal.f
+++ b/BLAS/SRC/sscal.f
@@ -62,7 +62,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level1
+*> \ingroup scal
 *
 *> \par Further Details:
 *  =====================
@@ -76,6 +76,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SSCAL(N,SA,SX,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -94,10 +95,14 @@ SUBROUTINE SSCAL(N,SA,SX,INCX)
 *     .. Local Scalars ..
       INTEGER I,M,MP1,NINCX
 *     ..
+*     .. Parameters ..
+      REAL ONE
+      PARAMETER (ONE=1.0E+0)
+*     ..
 *     .. Intrinsic Functions ..
       INTRINSIC MOD
 *     ..
-      IF (N.LE.0 .OR. INCX.LE.0) RETURN
+      IF (N.LE.0 .OR. INCX.LE.0 .OR. SA.EQ.ONE) RETURN
       IF (INCX.EQ.1) THEN
 *
 *        code for increment equal to 1
diff --git a/BLAS/SRC/sspmv.f b/BLAS/SRC/sspmv.f
index 840fd5c79a..22a9ce25cf 100644
--- a/BLAS/SRC/sspmv.f
+++ b/BLAS/SRC/sspmv.f
@@ -125,7 +125,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level2
+*> \ingroup hpmv
 *
 *> \par Further Details:
 *  =====================
@@ -144,6 +144,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SSPMV(UPLO,N,ALPHA,AP,X,INCX,BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/sspr.f b/BLAS/SRC/sspr.f
index ab24d3f1dc..9c6d961ea3 100644
--- a/BLAS/SRC/sspr.f
+++ b/BLAS/SRC/sspr.f
@@ -106,7 +106,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level2
+*> \ingroup hpr
 *
 *> \par Further Details:
 *  =====================
@@ -124,6 +124,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SSPR(UPLO,N,ALPHA,X,INCX,AP)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/sspr2.f b/BLAS/SRC/sspr2.f
index 1107a8c655..31adc3e817 100644
--- a/BLAS/SRC/sspr2.f
+++ b/BLAS/SRC/sspr2.f
@@ -121,7 +121,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level2
+*> \ingroup hpr2
 *
 *> \par Further Details:
 *  =====================
@@ -139,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SSPR2(UPLO,N,ALPHA,X,INCX,Y,INCY,AP)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/sswap.f b/BLAS/SRC/sswap.f
index 1a0fd9a025..29136e5492 100644
--- a/BLAS/SRC/sswap.f
+++ b/BLAS/SRC/sswap.f
@@ -66,7 +66,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level1
+*> \ingroup swap
 *
 *> \par Further Details:
 *  =====================
@@ -79,6 +79,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SSWAP(N,SX,INCX,SY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/ssymm.f b/BLAS/SRC/ssymm.f
index 3147bd619e..4a26cf42ba 100644
--- a/BLAS/SRC/ssymm.f
+++ b/BLAS/SRC/ssymm.f
@@ -168,7 +168,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level3
+*> \ingroup hemm
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +186,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SSYMM(SIDE,UPLO,M,N,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -234,9 +235,11 @@ SUBROUTINE SSYMM(SIDE,UPLO,M,N,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
 *     Test the input parameters.
 *
       INFO = 0
-      IF ((.NOT.LSAME(SIDE,'L')) .AND. (.NOT.LSAME(SIDE,'R'))) THEN
+      IF ((.NOT.LSAME(SIDE,'L')) .AND.
+     +    (.NOT.LSAME(SIDE,'R'))) THEN
           INFO = 1
-      ELSE IF ((.NOT.UPPER) .AND. (.NOT.LSAME(UPLO,'L'))) THEN
+      ELSE IF ((.NOT.UPPER) .AND.
+     +         (.NOT.LSAME(UPLO,'L'))) THEN
           INFO = 2
       ELSE IF (M.LT.0) THEN
           INFO = 3
diff --git a/BLAS/SRC/ssymv.f b/BLAS/SRC/ssymv.f
index 91117989bf..23020d8374 100644
--- a/BLAS/SRC/ssymv.f
+++ b/BLAS/SRC/ssymv.f
@@ -130,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level2
+*> \ingroup hemv
 *
 *> \par Further Details:
 *  =====================
@@ -149,6 +149,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SSYMV(UPLO,N,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/ssyr.f b/BLAS/SRC/ssyr.f
index 51164c5c41..0f4edfcdbd 100644
--- a/BLAS/SRC/ssyr.f
+++ b/BLAS/SRC/ssyr.f
@@ -111,7 +111,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level2
+*> \ingroup her
 *
 *> \par Further Details:
 *  =====================
@@ -129,6 +129,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SSYR(UPLO,N,ALPHA,X,INCX,A,LDA)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/ssyr2.f b/BLAS/SRC/ssyr2.f
index 1dc73eee96..b184d79dcc 100644
--- a/BLAS/SRC/ssyr2.f
+++ b/BLAS/SRC/ssyr2.f
@@ -126,7 +126,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level2
+*> \ingroup her2
 *
 *> \par Further Details:
 *  =====================
@@ -144,6 +144,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SSYR2(UPLO,N,ALPHA,X,INCX,Y,INCY,A,LDA)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/ssyr2k.f b/BLAS/SRC/ssyr2k.f
index 1bb5aa4caf..859f56d81e 100644
--- a/BLAS/SRC/ssyr2k.f
+++ b/BLAS/SRC/ssyr2k.f
@@ -170,7 +170,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level3
+*> \ingroup her2k
 *
 *> \par Further Details:
 *  =====================
@@ -189,6 +189,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SSYR2K(UPLO,TRANS,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/ssyrk.f b/BLAS/SRC/ssyrk.f
index faca01b894..9bb69668a3 100644
--- a/BLAS/SRC/ssyrk.f
+++ b/BLAS/SRC/ssyrk.f
@@ -148,7 +148,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level3
+*> \ingroup herk
 *
 *> \par Further Details:
 *  =====================
@@ -166,6 +166,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SSYRK(UPLO,TRANS,N,K,ALPHA,A,LDA,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/stbmv.f b/BLAS/SRC/stbmv.f
index 09273a1b1b..f111b30495 100644
--- a/BLAS/SRC/stbmv.f
+++ b/BLAS/SRC/stbmv.f
@@ -164,7 +164,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level2
+*> \ingroup tbmv
 *
 *> \par Further Details:
 *  =====================
@@ -183,6 +183,7 @@
 *>
 *  =====================================================================
       SUBROUTINE STBMV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -223,10 +224,12 @@ SUBROUTINE STBMV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/stbsv.f b/BLAS/SRC/stbsv.f
index 5f37cf7195..ee12cd0b26 100644
--- a/BLAS/SRC/stbsv.f
+++ b/BLAS/SRC/stbsv.f
@@ -168,7 +168,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level2
+*> \ingroup tbsv
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +186,7 @@
 *>
 *  =====================================================================
       SUBROUTINE STBSV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -226,10 +227,12 @@ SUBROUTINE STBSV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/stpmv.f b/BLAS/SRC/stpmv.f
index 9e77c1e70d..4cfee1448f 100644
--- a/BLAS/SRC/stpmv.f
+++ b/BLAS/SRC/stpmv.f
@@ -120,7 +120,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level2
+*> \ingroup tpmv
 *
 *> \par Further Details:
 *  =====================
@@ -139,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE STPMV(UPLO,TRANS,DIAG,N,AP,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -176,10 +177,12 @@ SUBROUTINE STPMV(UPLO,TRANS,DIAG,N,AP,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/stpsv.f b/BLAS/SRC/stpsv.f
index 40b1ffb2c7..fbeac84974 100644
--- a/BLAS/SRC/stpsv.f
+++ b/BLAS/SRC/stpsv.f
@@ -123,7 +123,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level2
+*> \ingroup tpsv
 *
 *> \par Further Details:
 *  =====================
@@ -141,6 +141,7 @@
 *>
 *  =====================================================================
       SUBROUTINE STPSV(UPLO,TRANS,DIAG,N,AP,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -178,10 +179,12 @@ SUBROUTINE STPSV(UPLO,TRANS,DIAG,N,AP,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/strmm.f b/BLAS/SRC/strmm.f
index 9aa2ac260c..bdef18c401 100644
--- a/BLAS/SRC/strmm.f
+++ b/BLAS/SRC/strmm.f
@@ -156,7 +156,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level3
+*> \ingroup trmm
 *
 *> \par Further Details:
 *  =====================
@@ -174,6 +174,7 @@
 *>
 *  =====================================================================
       SUBROUTINE STRMM(SIDE,UPLO,TRANSA,DIAG,M,N,ALPHA,A,LDA,B,LDB)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -230,7 +231,8 @@ SUBROUTINE STRMM(SIDE,UPLO,TRANSA,DIAG,M,N,ALPHA,A,LDA,B,LDB)
      +         (.NOT.LSAME(TRANSA,'T')) .AND.
      +         (.NOT.LSAME(TRANSA,'C'))) THEN
           INFO = 3
-      ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND. (.NOT.LSAME(DIAG,'N'))) THEN
+      ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND.
+     +         (.NOT.LSAME(DIAG,'N'))) THEN
           INFO = 4
       ELSE IF (M.LT.0) THEN
           INFO = 5
diff --git a/BLAS/SRC/strmv.f b/BLAS/SRC/strmv.f
index 6f5a3e8fd4..4a303b9d6b 100644
--- a/BLAS/SRC/strmv.f
+++ b/BLAS/SRC/strmv.f
@@ -125,7 +125,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level2
+*> \ingroup trmv
 *
 *> \par Further Details:
 *  =====================
@@ -144,6 +144,7 @@
 *>
 *  =====================================================================
       SUBROUTINE STRMV(UPLO,TRANS,DIAG,N,A,LDA,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -184,10 +185,12 @@ SUBROUTINE STRMV(UPLO,TRANS,DIAG,N,A,LDA,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/strsm.f b/BLAS/SRC/strsm.f
index 6e97c52d86..45fbb315b2 100644
--- a/BLAS/SRC/strsm.f
+++ b/BLAS/SRC/strsm.f
@@ -159,7 +159,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level3
+*> \ingroup trsm
 *
 *> \par Further Details:
 *  =====================
@@ -178,6 +178,7 @@
 *>
 *  =====================================================================
       SUBROUTINE STRSM(SIDE,UPLO,TRANSA,DIAG,M,N,ALPHA,A,LDA,B,LDB)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -234,7 +235,8 @@ SUBROUTINE STRSM(SIDE,UPLO,TRANSA,DIAG,M,N,ALPHA,A,LDA,B,LDB)
      +         (.NOT.LSAME(TRANSA,'T')) .AND.
      +         (.NOT.LSAME(TRANSA,'C'))) THEN
           INFO = 3
-      ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND. (.NOT.LSAME(DIAG,'N'))) THEN
+      ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND.
+     +         (.NOT.LSAME(DIAG,'N'))) THEN
           INFO = 4
       ELSE IF (M.LT.0) THEN
           INFO = 5
diff --git a/BLAS/SRC/strsv.f b/BLAS/SRC/strsv.f
index e228ea90c1..1d6adbd461 100644
--- a/BLAS/SRC/strsv.f
+++ b/BLAS/SRC/strsv.f
@@ -128,7 +128,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup single_blas_level2
+*> \ingroup trsv
 *
 *> \par Further Details:
 *  =====================
@@ -146,6 +146,7 @@
 *>
 *  =====================================================================
       SUBROUTINE STRSV(UPLO,TRANS,DIAG,N,A,LDA,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -186,10 +187,12 @@ SUBROUTINE STRSV(UPLO,TRANS,DIAG,N,A,LDA,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/xerbla.f b/BLAS/SRC/xerbla.f
index 0d73705fad..622f91959b 100644
--- a/BLAS/SRC/xerbla.f
+++ b/BLAS/SRC/xerbla.f
@@ -53,10 +53,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup aux_blas
+*> \ingroup xerbla
 *
 *  =====================================================================
       SUBROUTINE XERBLA( SRNAME, INFO )
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/xerbla_array.f b/BLAS/SRC/xerbla_array.f
index 8a3c87840b..3faee74f24 100644
--- a/BLAS/SRC/xerbla_array.f
+++ b/BLAS/SRC/xerbla_array.f
@@ -73,10 +73,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup aux_blas
+*> \ingroup xerbla_array
 *
 *  =====================================================================
       SUBROUTINE XERBLA_ARRAY(SRNAME_ARRAY, SRNAME_LEN, INFO)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -105,7 +106,7 @@ SUBROUTINE XERBLA_ARRAY(SRNAME_ARRAY, SRNAME_LEN, INFO)
       EXTERNAL XERBLA
 *     ..
 *     .. Executable Statements ..
-      SRNAME = ''
+      SRNAME = ' '
       DO I = 1, MIN( SRNAME_LEN, LEN( SRNAME ) )
          SRNAME( I:I ) = SRNAME_ARRAY( I )
       END DO
diff --git a/BLAS/SRC/zaxpby.f b/BLAS/SRC/zaxpby.f
new file mode 100644
index 0000000000..c0d166256f
--- /dev/null
+++ b/BLAS/SRC/zaxpby.f
@@ -0,0 +1,145 @@
+*> \brief \b ZAXPBY
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZAXPBY(N,ZA,ZX,INCX,ZB,ZY,INCY)
+*
+*       .. Scalar Arguments ..
+*       COMPLEX*16 ZA,ZB
+*       INTEGER INCX,INCY,N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16 ZX(*),ZY(*)
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*>    ZAXPBY constant times a vector plus constant times a vector.
+*>
+*>    Y = ALPHA * X + BETA * Y
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          number of elements in input vector(s)
+*> \endverbatim
+*>
+*> \param[in] ZA
+*> \verbatim
+*>          ZA is COMPLEX*16
+*>          On entry, ZA specifies the scalar alpha.
+*> \endverbatim
+*>
+*> \param[in] ZX
+*> \verbatim
+*>          ZX is COMPLEX*16 array, dimension ( 1 + ( N - 1 )*abs( INCX ) )
+*> \endverbatim
+*>
+*> \param[in] INCX
+*> \verbatim
+*>          INCX is INTEGER
+*>          storage spacing between elements of ZX
+*> \endverbatim
+*>
+*> \param[in] ZB
+*> \verbatim
+*>          ZB is COMPLEX*16
+*>          On entry, ZB specifies the scalar beta.
+*> \endverbatim
+*>
+*> \param[in,out] ZY
+*> \verbatim
+*>          ZY is COMPLEX*16 array, dimension ( 1 + ( N - 1 )*abs( INCY ) )
+*> \endverbatim
+*>
+*> \param[in] INCY
+*> \verbatim
+*>          INCY is INTEGER
+*>          storage spacing between elements of ZY
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*> \author Martin Koehler, MPI Magdeburg
+*
+*> \ingroup axpby
+*
+*  =====================================================================
+      SUBROUTINE ZAXPBY(N,ZA,ZX,INCX,ZB,ZY,INCY)
+      IMPLICIT NONE
+*
+*  -- Reference BLAS level1 routine --
+*  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      COMPLEX*16 ZA,ZB
+      INTEGER INCX,INCY,N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16 ZX(*),ZY(*)
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL ZSCAL
+*
+*  =====================================================================
+*
+*     .. Local Scalars ..
+      INTEGER I,IX,IY
+*     ..
+      IF (N.LE.0) RETURN
+
+*     Scale if ZA .EQ. 0
+      IF ( ZA.EQ.(0.0D0,0.0D0) .AND. ZB.NE.(0.0D0,0.0D0)) THEN
+        CALL ZSCAL(N, ZB, ZY, INCY)
+        RETURN
+      END IF
+
+      IF (INCX.EQ.1 .AND. INCY.EQ.1) THEN
+*
+*        code for both increments equal to 1
+*
+         DO I = 1,N
+            ZY(I) = ZB*ZY(I) + ZA*ZX(I)
+         END DO
+      ELSE
+*
+*        code for unequal increments or equal increments
+*          not equal to 1
+*
+         IX = 1
+         IY = 1
+         IF (INCX.LT.0) IX = (-N+1)*INCX + 1
+         IF (INCY.LT.0) IY = (-N+1)*INCY + 1
+         DO I = 1,N
+            ZY(IY) = ZB*ZY(IY) + ZA*ZX(IX)
+            IX = IX + INCX
+            IY = IY + INCY
+         END DO
+      END IF
+*
+      RETURN
+*
+*     End of ZAXBPY
+*
+      END
diff --git a/BLAS/SRC/zaxpy.f b/BLAS/SRC/zaxpy.f
index 35c0e4b892..f9081e957a 100644
--- a/BLAS/SRC/zaxpy.f
+++ b/BLAS/SRC/zaxpy.f
@@ -72,7 +72,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level1
+*> \ingroup axpy
 *
 *> \par Further Details:
 *  =====================
@@ -85,6 +85,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZAXPY(N,ZA,ZX,INCX,ZY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zcopy.f b/BLAS/SRC/zcopy.f
index 1efcdb6b0f..736bb9f680 100644
--- a/BLAS/SRC/zcopy.f
+++ b/BLAS/SRC/zcopy.f
@@ -65,7 +65,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level1
+*> \ingroup copy
 *
 *> \par Further Details:
 *  =====================
@@ -78,6 +78,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZCOPY(N,ZX,INCX,ZY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zdotc.f b/BLAS/SRC/zdotc.f
index bcc29e2dad..bdb6e8c6f8 100644
--- a/BLAS/SRC/zdotc.f
+++ b/BLAS/SRC/zdotc.f
@@ -67,7 +67,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level1
+*> \ingroup dot
 *
 *> \par Further Details:
 *  =====================
@@ -80,6 +80,7 @@
 *>
 *  =====================================================================
       COMPLEX*16 FUNCTION ZDOTC(N,ZX,INCX,ZY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zdotu.f b/BLAS/SRC/zdotu.f
index 11c18da230..aeed01201d 100644
--- a/BLAS/SRC/zdotu.f
+++ b/BLAS/SRC/zdotu.f
@@ -67,7 +67,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level1
+*> \ingroup dot
 *
 *> \par Further Details:
 *  =====================
@@ -80,6 +80,7 @@
 *>
 *  =====================================================================
       COMPLEX*16 FUNCTION ZDOTU(N,ZX,INCX,ZY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zdrot.f b/BLAS/SRC/zdrot.f
index 3145561d67..6c4c2f6fe6 100644
--- a/BLAS/SRC/zdrot.f
+++ b/BLAS/SRC/zdrot.f
@@ -91,10 +91,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level1
+*> \ingroup rot
 *
 *  =====================================================================
       SUBROUTINE ZDROT( N, ZX, INCX, ZY, INCY, C, S )
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zdscal.f b/BLAS/SRC/zdscal.f
index b3546ba206..14a6e98c40 100644
--- a/BLAS/SRC/zdscal.f
+++ b/BLAS/SRC/zdscal.f
@@ -61,7 +61,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level1
+*> \ingroup scal
 *
 *> \par Further Details:
 *  =====================
@@ -75,6 +75,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZDSCAL(N,DA,ZX,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -92,17 +93,20 @@ SUBROUTINE ZDSCAL(N,DA,ZX,INCX)
 *
 *     .. Local Scalars ..
       INTEGER I,NINCX
+*     .. Parameters ..
+      DOUBLE PRECISION ONE
+      PARAMETER (ONE=1.0D+0)
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC DCMPLX
+      INTRINSIC DBLE, DCMPLX, DIMAG
 *     ..
-      IF (N.LE.0 .OR. INCX.LE.0) RETURN
+      IF (N.LE.0 .OR. INCX.LE.0 .OR. DA.EQ.ONE) RETURN
       IF (INCX.EQ.1) THEN
 *
 *        code for increment equal to 1
 *
          DO I = 1,N
-            ZX(I) = DCMPLX(DA,0.0d0)*ZX(I)
+            ZX(I) = DCMPLX(DA*DBLE(ZX(I)),DA*DIMAG(ZX(I)))
          END DO
       ELSE
 *
@@ -110,7 +114,7 @@ SUBROUTINE ZDSCAL(N,DA,ZX,INCX)
 *
          NINCX = N*INCX
          DO I = 1,NINCX,INCX
-            ZX(I) = DCMPLX(DA,0.0d0)*ZX(I)
+            ZX(I) = DCMPLX(DA*DBLE(ZX(I)),DA*DIMAG(ZX(I)))
          END DO
       END IF
       RETURN
diff --git a/BLAS/SRC/zgbmv.f b/BLAS/SRC/zgbmv.f
index 0bca54eb9e..bb162da970 100644
--- a/BLAS/SRC/zgbmv.f
+++ b/BLAS/SRC/zgbmv.f
@@ -148,6 +148,8 @@
 *>           ( 1 + ( n - 1 )*abs( INCY ) ) otherwise.
 *>           Before entry, the incremented array Y must contain the
 *>           vector y. On exit, Y is overwritten by the updated vector y.
+*>           If either m or n is zero, then Y not referenced and the function
+*>           performs a quick return.
 *> \endverbatim
 *>
 *> \param[in] INCY
@@ -165,7 +167,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level2
+*> \ingroup gbmv
 *
 *> \par Further Details:
 *  =====================
@@ -183,7 +185,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZGBMV(TRANS,M,N,KL,KU,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
+      SUBROUTINE ZGBMV(TRANS,M,N,KL,KU,ALPHA,A,LDA,X,INCX,
+     +         BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zgemm.f b/BLAS/SRC/zgemm.f
index 0b712f1b73..de8b2f2c4d 100644
--- a/BLAS/SRC/zgemm.f
+++ b/BLAS/SRC/zgemm.f
@@ -35,6 +35,16 @@
 *>
 *> alpha and beta are scalars, and A, B and C are matrices, with op( A )
 *> an m by k matrix,  op( B )  a  k by n matrix and  C an m by n matrix.
+*>
+*> Note: if alpha and/or beta is zero, some parts of the matrix-matrix
+*>  operations are not performed. This results in the following NaN/Inf
+*>  propagation quirks:
+*>
+*>  1. If alpha is zero, NaNs or Infs in A or B do not affect the result.
+*>  2. If both alpha and beta are zero, then a zero matrix is returned in C,
+*>   irrespective of any NaNs or Infs in A, B or C.
+*>  3. If only beta is zero, alpha*op( A )*op( B ) is returned, irrespective
+*>   of any NaNs or Infs in C.
 *> \endverbatim
 *
 *  Arguments:
@@ -92,7 +102,9 @@
 *> \param[in] ALPHA
 *> \verbatim
 *>          ALPHA is COMPLEX*16
-*>           On entry, ALPHA specifies the scalar alpha.
+*>           On entry, ALPHA specifies the scalar alpha. If ALPHA is zero the
+*>           values in A and B do not affect the result. This also means that
+*>           NaN/Inf propagation from A and B is inhibited if ALPHA is zero.
 *> \endverbatim
 *>
 *> \param[in] A
@@ -102,7 +114,10 @@
 *>           Before entry with  TRANSA = 'N' or 'n',  the leading  m by k
 *>           part of the array  A  must contain the matrix  A,  otherwise
 *>           the leading  k by m  part of the array  A  must contain  the
-*>           matrix A.
+*>           matrix A, except if ALPHA is zero.
+*>           If ALPHA is zero, none of the values in A affect the result, even
+*>           if they are NaN/Inf. This also implies that if ALPHA is zero,
+*>           the matrix elements of A need not be initialized by the caller.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -121,7 +136,10 @@
 *>           Before entry with  TRANSB = 'N' or 'n',  the leading  k by n
 *>           part of the array  B  must contain the matrix  B,  otherwise
 *>           the leading  n by k  part of the array  B  must contain  the
-*>           matrix B.
+*>           matrix B, except if ALPHA is zero.
+*>           If ALPHA is zero, none of the values in B affect the result, even
+*>           if they are NaN/Inf. This also implies that if ALPHA is zero,
+*>           the matrix elements of B need not be initialized by the caller.
 *> \endverbatim
 *>
 *> \param[in] LDB
@@ -136,16 +154,19 @@
 *> \param[in] BETA
 *> \verbatim
 *>          BETA is COMPLEX*16
-*>           On entry,  BETA  specifies the scalar  beta.  When  BETA  is
-*>           supplied as zero then C need not be set on input.
+*>           On entry,  BETA  specifies the scalar  beta. If BETA is zero the
+*>           values in C do not affect the result. This also means that
+*>           NaN/Inf propagation from C is inhibited if BETA is zero.
 *> \endverbatim
 *>
 *> \param[in,out] C
 *> \verbatim
 *>          C is COMPLEX*16 array, dimension ( LDC, N )
 *>           Before entry, the leading  m by n  part of the array  C must
-*>           contain the matrix  C,  except when  beta  is zero, in which
-*>           case C need not be set on entry.
+*>           contain the matrix  C,, except if beta is zero.
+*>           If beta is zero, none of the values in C affect the result, even
+*>           if they are NaN/Inf. This also implies that if beta is zero,
+*>           the matrix elements of C need not be initialized by the caller.
 *>           On exit, the array  C  is overwritten by the  m by n  matrix
 *>           ( alpha*op( A )*op( B ) + beta*C ).
 *> \endverbatim
@@ -166,7 +187,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level3
+*> \ingroup gemm
 *
 *> \par Further Details:
 *  =====================
@@ -183,7 +204,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
+      SUBROUTINE ZGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,
+     +         BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zgemmtr.f b/BLAS/SRC/zgemmtr.f
new file mode 100644
index 0000000000..01dd91c387
--- /dev/null
+++ b/BLAS/SRC/zgemmtr.f
@@ -0,0 +1,569 @@
+*> \brief \b ZGEMMTR
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZGEMMTR(UPLO,TRANSA,TRANSB,N,K,ALPHA,A,LDA,B,LDB,BETA,
+*                         C,LDC)
+*
+*       .. Scalar Arguments ..
+*       COMPLEX*16 ALPHA,BETA
+*       INTEGER K,LDA,LDB,LDC,N
+*       CHARACTER TRANSA,TRANSB, UPLO
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16 A(LDA,*),B(LDB,*),C(LDC,*)
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZGEMMTR  performs one of the matrix-matrix operations
+*>
+*>    C := alpha*op( A )*op( B ) + beta*C,
+*>
+*> where  op( X ) is one of
+*>
+*>    op( X ) = X   or   op( X ) = X**T,
+*>
+*> alpha and beta are scalars, and A, B and C are matrices, with op( A )
+*> an n by k matrix,  op( B )  a  k by n matrix and  C an n by n matrix.
+*> Thereby, the routine only accesses and updates the upper or lower
+*> triangular part of the result matrix C. This behaviour can be used if
+*> the resulting matrix C is known to be Hermitian or symmetric.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>           On entry, UPLO specifies whether the lower or the upper
+*>           triangular part of C is access and updated.
+*>
+*>              UPLO = 'L' or 'l', the lower triangular part of C is used.
+*>
+*>              UPLO = 'U' or 'u', the upper triangular part of C is used.
+*> \endverbatim
+*
+*> \param[in] TRANSA
+*> \verbatim
+*>          TRANSA is CHARACTER*1
+*>           On entry, TRANSA specifies the form of op( A ) to be used in
+*>           the matrix multiplication as follows:
+*>
+*>              TRANSA = 'N' or 'n',  op( A ) = A.
+*>
+*>              TRANSA = 'T' or 't',  op( A ) = A**T.
+*>
+*>              TRANSA = 'C' or 'c',  op( A ) = A**H.
+*> \endverbatim
+*>
+*> \param[in] TRANSB
+*> \verbatim
+*>          TRANSB is CHARACTER*1
+*>           On entry, TRANSB specifies the form of op( B ) to be used in
+*>           the matrix multiplication as follows:
+*>
+*>              TRANSB = 'N' or 'n',  op( B ) = B.
+*>
+*>              TRANSB = 'T' or 't',  op( B ) = B**T.
+*>
+*>              TRANSB = 'C' or 'c',  op( B ) = B**H.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>           On entry,  N specifies the number of rows and columns of
+*>           the matrix C, the number of columns of op(B) and the number
+*>           of rows of op(A).  N must be at least zero.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>           On entry,  K  specifies  the number of columns of the matrix
+*>           op( A ) and the number of rows of the matrix op( B ). K must
+*>           be at least  zero.
+*> \endverbatim
+*>
+*> \param[in] ALPHA
+*> \verbatim
+*>          ALPHA is COMPLEX*16.
+*>           On entry, ALPHA specifies the scalar alpha.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension ( LDA, ka ), where ka is
+*>           k  when  TRANSA = 'N' or 'n',  and is  n  otherwise.
+*>           Before entry with  TRANSA = 'N' or 'n',  the leading  n by k
+*>           part of the array  A  must contain the matrix  A,  otherwise
+*>           the leading  k by m  part of the array  A  must contain  the
+*>           matrix A.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>           On entry, LDA specifies the first dimension of A as declared
+*>           in the calling (sub) program. When  TRANSA = 'N' or 'n' then
+*>           LDA must be at least  max( 1, n ), otherwise  LDA must be at
+*>           least  max( 1, k ).
+*> \endverbatim
+*>
+*> \param[in] B
+*> \verbatim
+*>          B is COMPLEX*16 array, dimension ( LDB, kb ), where kb is
+*>           n  when  TRANSB = 'N' or 'n',  and is  k  otherwise.
+*>           Before entry with  TRANSB = 'N' or 'n',  the leading  k by n
+*>           part of the array  B  must contain the matrix  B,  otherwise
+*>           the leading  n by k  part of the array  B  must contain  the
+*>           matrix B.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>           On entry, LDB specifies the first dimension of B as declared
+*>           in the calling (sub) program. When  TRANSB = 'N' or 'n' then
+*>           LDB must be at least  max( 1, k ), otherwise  LDB must be at
+*>           least  max( 1, n ).
+*> \endverbatim
+*>
+*> \param[in] BETA
+*> \verbatim
+*>          BETA is COMPLEX*16.
+*>           On entry,  BETA  specifies the scalar  beta.  When  BETA  is
+*>           supplied as zero then C need not be set on input.
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is COMPLEX*16 array, dimension ( LDC, N )
+*>           Before entry, the leading  n by n  part of the array  C must
+*>           contain the matrix  C,  except when  beta  is zero, in which
+*>           case C need not be set on entry.
+*>           On exit, the upper or lower triangular part of the matrix
+*>           C  is overwritten by the n by n matrix
+*>           ( alpha*op( A )*op( B ) + beta*C ).
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>           On entry, LDC specifies the first dimension of C as declared
+*>           in  the  calling  (sub)  program.   LDC  must  be  at  least
+*>           max( 1, n ).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Martin Koehler
+*
+*> \ingroup gemmtr
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  Level 3 Blas routine.
+*>
+*>  -- Written on 19-July-2023.
+*>     Martin Koehler, MPI Magdeburg
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE ZGEMMTR(UPLO,TRANSA,TRANSB,N,K,ALPHA,A,LDA,B,LDB,
+     +         BETA,C,LDC)
+      IMPLICIT NONE
+*
+*  -- Reference BLAS level3 routine --
+*  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      COMPLEX*16 ALPHA,BETA
+      INTEGER K,LDA,LDB,LDC,N
+      CHARACTER TRANSA,TRANSB,UPLO
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16 A(LDA,*),B(LDB,*),C(LDC,*)
+*     ..
+*
+*  =====================================================================
+*
+*     .. External Functions ..
+      LOGICAL LSAME
+      EXTERNAL LSAME
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC CONJG,MAX
+*     ..
+*     .. Local Scalars ..
+      COMPLEX*16 TEMP
+      INTEGER I,INFO,J,L,NROWA,NROWB,ISTART, ISTOP
+      LOGICAL CONJA,CONJB,NOTA,NOTB,UPPER
+*     ..
+*     .. Parameters ..
+      COMPLEX*16 ONE
+      PARAMETER (ONE= (1.0D+0,0.0D+0))
+      COMPLEX*16 ZERO
+      PARAMETER (ZERO= (0.0D+0,0.0D+0))
+*     ..
+*
+*     Set  NOTA  and  NOTB  as  true if  A  and  B  respectively are not
+*     conjugated or transposed, set  CONJA and CONJB  as true if  A  and
+*     B  respectively are to be  transposed but  not conjugated  and set
+*     NROWA and  NROWB  as the number of rows of  A  and  B  respectively.
+*
+      NOTA = LSAME(TRANSA,'N')
+      NOTB = LSAME(TRANSB,'N')
+      CONJA = LSAME(TRANSA,'C')
+      CONJB = LSAME(TRANSB,'C')
+      IF (NOTA) THEN
+          NROWA = N
+      ELSE
+          NROWA = K
+      END IF
+      IF (NOTB) THEN
+          NROWB = K
+      ELSE
+          NROWB = N
+      END IF
+      UPPER = LSAME(UPLO, 'U')
+
+*
+*     Test the input parameters.
+*
+      INFO = 0
+      IF ((.NOT. UPPER) .AND. (.NOT. LSAME(UPLO, 'L'))) THEN
+          INFO = 1
+      ELSE IF ((.NOT.NOTA) .AND. (.NOT.CONJA) .AND.
+     +    (.NOT.LSAME(TRANSA,'T'))) THEN
+          INFO = 2
+      ELSE IF ((.NOT.NOTB) .AND. (.NOT.CONJB) .AND.
+     +         (.NOT.LSAME(TRANSB,'T'))) THEN
+          INFO = 3
+      ELSE IF (N.LT.0) THEN
+          INFO = 4
+      ELSE IF (K.LT.0) THEN
+          INFO = 5
+      ELSE IF (LDA.LT.MAX(1,NROWA)) THEN
+          INFO = 8
+      ELSE IF (LDB.LT.MAX(1,NROWB)) THEN
+          INFO = 10
+      ELSE IF (LDC.LT.MAX(1,N)) THEN
+          INFO = 13
+      END IF
+      IF (INFO.NE.0) THEN
+          CALL XERBLA('ZGEMMTR',INFO)
+          RETURN
+      END IF
+*
+*     Quick return if possible.
+*
+      IF (N.EQ.0) RETURN
+*
+*     And when  alpha.eq.zero.
+*
+      IF (ALPHA.EQ.ZERO) THEN
+          IF (BETA.EQ.ZERO) THEN
+              DO 20 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 10 I = ISTART, ISTOP
+                      C(I,J) = ZERO
+   10             CONTINUE
+   20         CONTINUE
+          ELSE
+              DO 40 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+                  DO 30 I = ISTART, ISTOP
+                      C(I,J) = BETA*C(I,J)
+   30             CONTINUE
+   40         CONTINUE
+          END IF
+          RETURN
+      END IF
+*
+*     Start the operations.
+*
+      IF (NOTB) THEN
+          IF (NOTA) THEN
+*
+*           Form  C := alpha*A*B + beta*C.
+*
+              DO 90 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+                  IF (BETA.EQ.ZERO) THEN
+                      DO 50 I = ISTART, ISTOP
+                          C(I,J) = ZERO
+   50                 CONTINUE
+                  ELSE IF (BETA.NE.ONE) THEN
+                      DO 60 I = ISTART, ISTOP
+                          C(I,J) = BETA*C(I,J)
+   60                 CONTINUE
+                  END IF
+                  DO 80 L = 1,K
+                      TEMP = ALPHA*B(L,J)
+                      DO 70 I = ISTART, ISTOP
+                          C(I,J) = C(I,J) + TEMP*A(I,L)
+   70                 CONTINUE
+   80             CONTINUE
+   90         CONTINUE
+          ELSE IF (CONJA) THEN
+*
+*           Form  C := alpha*A**H*B + beta*C.
+*
+              DO 120 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 110 I = ISTART, ISTOP
+                      TEMP = ZERO
+                      DO 100 L = 1,K
+                          TEMP = TEMP + CONJG(A(L,I))*B(L,J)
+  100                 CONTINUE
+                      IF (BETA.EQ.ZERO) THEN
+                          C(I,J) = ALPHA*TEMP
+                      ELSE
+                          C(I,J) = ALPHA*TEMP + BETA*C(I,J)
+                      END IF
+  110             CONTINUE
+  120         CONTINUE
+          ELSE
+*
+*           Form  C := alpha*A**T*B + beta*C
+*
+              DO 150 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 140 I = ISTART, ISTOP
+                      TEMP = ZERO
+                      DO 130 L = 1,K
+                          TEMP = TEMP + A(L,I)*B(L,J)
+  130                 CONTINUE
+                      IF (BETA.EQ.ZERO) THEN
+                          C(I,J) = ALPHA*TEMP
+                      ELSE
+                          C(I,J) = ALPHA*TEMP + BETA*C(I,J)
+                      END IF
+  140             CONTINUE
+  150         CONTINUE
+          END IF
+      ELSE IF (NOTA) THEN
+          IF (CONJB) THEN
+*
+*           Form  C := alpha*A*B**H + beta*C.
+*
+              DO 200 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  IF (BETA.EQ.ZERO) THEN
+                      DO 160 I = ISTART,ISTOP
+                          C(I,J) = ZERO
+  160                 CONTINUE
+                  ELSE IF (BETA.NE.ONE) THEN
+                      DO 170 I = ISTART, ISTOP
+                          C(I,J) = BETA*C(I,J)
+  170                 CONTINUE
+                  END IF
+                  DO 190 L = 1,K
+                      TEMP = ALPHA*CONJG(B(J,L))
+                      DO 180 I = ISTART, ISTOP
+                          C(I,J) = C(I,J) + TEMP*A(I,L)
+  180                 CONTINUE
+  190             CONTINUE
+  200         CONTINUE
+          ELSE
+*
+*           Form  C := alpha*A*B**T + beta*C
+*
+              DO 250 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  IF (BETA.EQ.ZERO) THEN
+                      DO 210 I = ISTART, ISTOP
+                          C(I,J) = ZERO
+  210                 CONTINUE
+                  ELSE IF (BETA.NE.ONE) THEN
+                      DO 220 I = ISTART, ISTOP
+                          C(I,J) = BETA*C(I,J)
+  220                 CONTINUE
+                  END IF
+                  DO 240 L = 1,K
+                      TEMP = ALPHA*B(J,L)
+                      DO 230 I = ISTART, ISTOP
+                          C(I,J) = C(I,J) + TEMP*A(I,L)
+  230                 CONTINUE
+  240             CONTINUE
+  250         CONTINUE
+          END IF
+      ELSE IF (CONJA) THEN
+          IF (CONJB) THEN
+*
+*           Form  C := alpha*A**H*B**H + beta*C.
+*
+              DO 280 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 270 I = ISTART, ISTOP
+                      TEMP = ZERO
+                      DO 260 L = 1,K
+                          TEMP = TEMP + CONJG(A(L,I))*CONJG(B(J,L))
+  260                 CONTINUE
+                      IF (BETA.EQ.ZERO) THEN
+                          C(I,J) = ALPHA*TEMP
+                      ELSE
+                          C(I,J) = ALPHA*TEMP + BETA*C(I,J)
+                      END IF
+  270             CONTINUE
+  280         CONTINUE
+          ELSE
+*
+*           Form  C := alpha*A**H*B**T + beta*C
+*
+              DO 310 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 300 I = ISTART, ISTOP
+                      TEMP = ZERO
+                      DO 290 L = 1,K
+                          TEMP = TEMP + CONJG(A(L,I))*B(J,L)
+  290                 CONTINUE
+                      IF (BETA.EQ.ZERO) THEN
+                          C(I,J) = ALPHA*TEMP
+                      ELSE
+                          C(I,J) = ALPHA*TEMP + BETA*C(I,J)
+                      END IF
+  300             CONTINUE
+  310         CONTINUE
+          END IF
+      ELSE
+          IF (CONJB) THEN
+*
+*           Form  C := alpha*A**T*B**H + beta*C
+*
+              DO 340 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 330 I = ISTART, ISTOP
+                      TEMP = ZERO
+                      DO 320 L = 1,K
+                          TEMP = TEMP + A(L,I)*CONJG(B(J,L))
+  320                 CONTINUE
+                      IF (BETA.EQ.ZERO) THEN
+                          C(I,J) = ALPHA*TEMP
+                      ELSE
+                          C(I,J) = ALPHA*TEMP + BETA*C(I,J)
+                      END IF
+  330             CONTINUE
+  340         CONTINUE
+          ELSE
+*
+*           Form  C := alpha*A**T*B**T + beta*C
+*
+              DO 370 J = 1,N
+                  IF (UPPER) THEN
+                      ISTART = 1
+                      ISTOP  = J
+                  ELSE
+                      ISTART = J
+                      ISTOP  = N
+                  END IF
+
+                  DO 360 I = ISTART, ISTOP
+                      TEMP = ZERO
+                      DO 350 L = 1,K
+                          TEMP = TEMP + A(L,I)*B(J,L)
+  350                 CONTINUE
+                      IF (BETA.EQ.ZERO) THEN
+                          C(I,J) = ALPHA*TEMP
+                      ELSE
+                          C(I,J) = ALPHA*TEMP + BETA*C(I,J)
+                      END IF
+  360             CONTINUE
+  370         CONTINUE
+          END IF
+      END IF
+*
+      RETURN
+*
+*     End of ZGEMMTR
+*
+      END
diff --git a/BLAS/SRC/zgemv.f b/BLAS/SRC/zgemv.f
index 2664454b94..4d41239193 100644
--- a/BLAS/SRC/zgemv.f
+++ b/BLAS/SRC/zgemv.f
@@ -119,6 +119,8 @@
 *>           Before entry with BETA non-zero, the incremented array Y
 *>           must contain the vector y. On exit, Y is overwritten by the
 *>           updated vector y.
+*>           If either m or n is zero, then Y not referenced and the function
+*>           performs a quick return.
 *> \endverbatim
 *>
 *> \param[in] INCY
@@ -136,7 +138,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level2
+*> \ingroup gemv
 *
 *> \par Further Details:
 *  =====================
@@ -155,6 +157,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGEMV(TRANS,M,N,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zgerc.f b/BLAS/SRC/zgerc.f
index 2eb4349367..a5f1cfd280 100644
--- a/BLAS/SRC/zgerc.f
+++ b/BLAS/SRC/zgerc.f
@@ -109,7 +109,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level2
+*> \ingroup ger
 *
 *> \par Further Details:
 *  =====================
@@ -127,6 +127,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGERC(M,N,ALPHA,X,INCX,Y,INCY,A,LDA)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zgeru.f b/BLAS/SRC/zgeru.f
index e1cd2dcd19..601eee645a 100644
--- a/BLAS/SRC/zgeru.f
+++ b/BLAS/SRC/zgeru.f
@@ -109,7 +109,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level2
+*> \ingroup ger
 *
 *> \par Further Details:
 *  =====================
@@ -127,6 +127,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGERU(M,N,ALPHA,X,INCX,Y,INCY,A,LDA)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zhbmv.f b/BLAS/SRC/zhbmv.f
index 6f8026c693..c760e35abd 100644
--- a/BLAS/SRC/zhbmv.f
+++ b/BLAS/SRC/zhbmv.f
@@ -165,7 +165,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level2
+*> \ingroup hbmv
 *
 *> \par Further Details:
 *  =====================
@@ -184,6 +184,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZHBMV(UPLO,N,K,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zhemm.f b/BLAS/SRC/zhemm.f
index 9ebbab2c77..abc36e5d56 100644
--- a/BLAS/SRC/zhemm.f
+++ b/BLAS/SRC/zhemm.f
@@ -170,7 +170,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level3
+*> \ingroup hemm
 *
 *> \par Further Details:
 *  =====================
@@ -188,6 +188,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZHEMM(SIDE,UPLO,M,N,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -238,9 +239,11 @@ SUBROUTINE ZHEMM(SIDE,UPLO,M,N,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
 *     Test the input parameters.
 *
       INFO = 0
-      IF ((.NOT.LSAME(SIDE,'L')) .AND. (.NOT.LSAME(SIDE,'R'))) THEN
+      IF ((.NOT.LSAME(SIDE,'L')) .AND.
+     +    (.NOT.LSAME(SIDE,'R'))) THEN
           INFO = 1
-      ELSE IF ((.NOT.UPPER) .AND. (.NOT.LSAME(UPLO,'L'))) THEN
+      ELSE IF ((.NOT.UPPER) .AND.
+     +         (.NOT.LSAME(UPLO,'L'))) THEN
           INFO = 2
       ELSE IF (M.LT.0) THEN
           INFO = 3
diff --git a/BLAS/SRC/zhemv.f b/BLAS/SRC/zhemv.f
index dad68bf25b..390d002056 100644
--- a/BLAS/SRC/zhemv.f
+++ b/BLAS/SRC/zhemv.f
@@ -132,7 +132,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level2
+*> \ingroup hemv
 *
 *> \par Further Details:
 *  =====================
@@ -151,6 +151,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZHEMV(UPLO,N,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zher.f b/BLAS/SRC/zher.f
index 59227305f8..c572daa8b1 100644
--- a/BLAS/SRC/zher.f
+++ b/BLAS/SRC/zher.f
@@ -114,7 +114,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level2
+*> \ingroup her
 *
 *> \par Further Details:
 *  =====================
@@ -132,6 +132,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZHER(UPLO,N,ALPHA,X,INCX,A,LDA)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zher2.f b/BLAS/SRC/zher2.f
index d1f2b57ec4..6d59b00bef 100644
--- a/BLAS/SRC/zher2.f
+++ b/BLAS/SRC/zher2.f
@@ -129,7 +129,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level2
+*> \ingroup her2
 *
 *> \par Further Details:
 *  =====================
@@ -147,6 +147,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZHER2(UPLO,N,ALPHA,X,INCX,Y,INCY,A,LDA)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zher2k.f b/BLAS/SRC/zher2k.f
index 5c75083cd5..6000487f8d 100644
--- a/BLAS/SRC/zher2k.f
+++ b/BLAS/SRC/zher2k.f
@@ -174,7 +174,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level3
+*> \ingroup her2k
 *
 *> \par Further Details:
 *  =====================
@@ -195,6 +195,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZHER2K(UPLO,TRANS,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zherk.f b/BLAS/SRC/zherk.f
index e39a3fce36..1ee4bd61f3 100644
--- a/BLAS/SRC/zherk.f
+++ b/BLAS/SRC/zherk.f
@@ -149,7 +149,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level3
+*> \ingroup herk
 *
 *> \par Further Details:
 *  =====================
@@ -170,6 +170,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZHERK(UPLO,TRANS,N,K,ALPHA,A,LDA,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -352,7 +353,7 @@ SUBROUTINE ZHERK(UPLO,TRANS,N,K,ALPHA,A,LDA,BETA,C,LDC)
   200             CONTINUE
                   RTEMP = ZERO
                   DO 210 L = 1,K
-                      RTEMP = RTEMP + DCONJG(A(L,J))*A(L,J)
+                      RTEMP = RTEMP + DBLE(DCONJG(A(L,J))*A(L,J))
   210             CONTINUE
                   IF (BETA.EQ.ZERO) THEN
                       C(J,J) = ALPHA*RTEMP
@@ -364,7 +365,7 @@ SUBROUTINE ZHERK(UPLO,TRANS,N,K,ALPHA,A,LDA,BETA,C,LDC)
               DO 260 J = 1,N
                   RTEMP = ZERO
                   DO 230 L = 1,K
-                      RTEMP = RTEMP + DCONJG(A(L,J))*A(L,J)
+                      RTEMP = RTEMP + DBLE(DCONJG(A(L,J))*A(L,J))
   230             CONTINUE
                   IF (BETA.EQ.ZERO) THEN
                       C(J,J) = ALPHA*RTEMP
diff --git a/BLAS/SRC/zhpmv.f b/BLAS/SRC/zhpmv.f
index c1a2fa006c..9e4d455b2f 100644
--- a/BLAS/SRC/zhpmv.f
+++ b/BLAS/SRC/zhpmv.f
@@ -127,7 +127,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level2
+*> \ingroup hpmv
 *
 *> \par Further Details:
 *  =====================
@@ -146,6 +146,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZHPMV(UPLO,N,ALPHA,AP,X,INCX,BETA,Y,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zhpr.f b/BLAS/SRC/zhpr.f
index 2ba5774a21..2a8a9249b8 100644
--- a/BLAS/SRC/zhpr.f
+++ b/BLAS/SRC/zhpr.f
@@ -109,7 +109,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level2
+*> \ingroup hpr
 *
 *> \par Further Details:
 *  =====================
@@ -127,6 +127,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZHPR(UPLO,N,ALPHA,X,INCX,AP)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zhpr2.f b/BLAS/SRC/zhpr2.f
index 55cfe77e30..3ab26ac690 100644
--- a/BLAS/SRC/zhpr2.f
+++ b/BLAS/SRC/zhpr2.f
@@ -124,7 +124,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level2
+*> \ingroup hpr2
 *
 *> \par Further Details:
 *  =====================
@@ -142,6 +142,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZHPR2(UPLO,N,ALPHA,X,INCX,Y,INCY,AP)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zrotg.f90 b/BLAS/SRC/zrotg.f90
index 288e5c7ef5..0dae53b837 100644
--- a/BLAS/SRC/zrotg.f90
+++ b/BLAS/SRC/zrotg.f90
@@ -1,38 +1,37 @@
-!> \brief \b ZROTG
+!> \brief \b ZROTG  generates a Givens rotation with real cosine and complex sine.
 !
 !  =========== DOCUMENTATION ===========
 !
 ! Online html documentation available at
 !            http://www.netlib.org/lapack/explore-html/
 !
-!  Definition:
-!  ===========
-!
-!  ZROTG constructs a plane rotation
-!     [  c         s ] [ a ] = [ r ]
-!     [ -conjg(s)  c ] [ b ]   [ 0 ]
-!  where c is real, s ic complex, and c**2 + conjg(s)*s = 1.
-!
 !> \par Purpose:
 !  =============
 !>
 !> \verbatim
 !>
+!> ZROTG constructs a plane rotation
+!>    [  c         s ] [ a ] = [ r ]
+!>    [ -conjg(s)  c ] [ b ]   [ 0 ]
+!> where c is real, s is complex, and c**2 + conjg(s)*s = 1.
+!>
 !> The computation uses the formulas
 !>    |x| = sqrt( Re(x)**2 + Im(x)**2 )
 !>    sgn(x) = x / |x|  if x /= 0
 !>           = 1        if x  = 0
 !>    c = |a| / sqrt(|a|**2 + |b|**2)
 !>    s = sgn(a) * conjg(b) / sqrt(|a|**2 + |b|**2)
-!> When a and b are real and r /= 0, the formulas simplify to
 !>    r = sgn(a)*sqrt(|a|**2 + |b|**2)
+!> When a and b are real and r /= 0, the formulas simplify to
 !>    c = a / r
 !>    s = b / r
-!> the same as in ZROTG when |a| > |b|.  When |b| >= |a|, the
-!> sign of c and s will be different from those computed by ZROTG
+!> the same as in DROTG when |a| > |b|.  When |b| >= |a|, the
+!> sign of c and s will be different from those computed by DROTG
 !> if the signs of a and b are not the same.
 !>
 !> \endverbatim
+!>
+!> @see lartg, @see lartgp
 !
 !  Arguments:
 !  ==========
@@ -65,20 +64,19 @@
 !  Authors:
 !  ========
 !
-!> \author Edward Anderson, Lockheed Martin
+!> \author Weslley Pereira, University of Colorado Denver, USA
 !
-!> \par Contributors:
-!  ==================
-!>
-!> Weslley Pereira, University of Colorado Denver, USA
+!> \date December 2021
 !
-!> \ingroup single_blas_level1
+!> \ingroup rotg
 !
 !> \par Further Details:
 !  =====================
 !>
 !> \verbatim
 !>
+!> Based on the algorithm from
+!>
 !>  Anderson E. (2017)
 !>  Algorithm 978: Safe Scaling in the Level 1 BLAS
 !>  ACM Trans Math Softw 44:1--28
@@ -88,6 +86,7 @@
 !
 !  =====================================================================
 subroutine ZROTG( a, b, c, s )
+   implicit none
    integer, parameter :: wp = kind(1.d0)
 !
 !  -- Reference BLAS level1 routine --
@@ -108,21 +107,14 @@ subroutine ZROTG( a, b, c, s )
       1-minexponent(0._wp), &
       maxexponent(0._wp)-1 &
    )
-   real(wp), parameter :: rtmin = sqrt( real(radix(0._wp),wp)**max( &
-      minexponent(0._wp)-1, &
-      1-maxexponent(0._wp) &
-   ) / epsilon(0._wp) )
-   real(wp), parameter :: rtmax = sqrt( real(radix(0._wp),wp)**max( &
-      1-minexponent(0._wp), &
-      maxexponent(0._wp)-1 &
-   ) * epsilon(0._wp) )
+   real(wp), parameter :: rtmin = sqrt( safmin )
 !  ..
 !  .. Scalar Arguments ..
    real(wp) :: c
    complex(wp) :: a, b, s
 !  ..
 !  .. Local Scalars ..
-   real(wp) :: d, f1, f2, g1, g2, h2, p, u, uu, v, vv, w
+   real(wp) :: d, f1, f2, g1, g2, h2, u, v, w, rtmax
    complex(wp) :: f, fs, g, gs, r, t
 !  ..
 !  .. Intrinsic Functions ..
@@ -144,30 +136,43 @@ subroutine ZROTG( a, b, c, s )
       r = f
    else if( f == czero ) then
       c = zero
-      g1 = max( abs(real(g)), abs(aimag(g)) )
-      if( g1 > rtmin .and. g1 < rtmax ) then
+      if( real(g) == zero ) then
+         r = abs(aimag(g))
+         s = conjg( g ) / r
+      elseif( aimag(g) == zero ) then
+         r = abs(real(g))
+         s = conjg( g ) / r
+      else
+         g1 = max( abs(real(g)), abs(aimag(g)) )
+         rtmax = sqrt( safmax/2 )
+         if( g1 > rtmin .and. g1 < rtmax ) then
 !
 !        Use unscaled algorithm
 !
-         g2 = ABSSQ( g )
-         d = sqrt( g2 )
-         s = conjg( g ) / d
-         r = d
-      else
+!           The following two lines can be replaced by `d = abs( g )`.
+!           This algorithm do not use the intrinsic complex abs.
+            g2 = ABSSQ( g )
+            d = sqrt( g2 )
+            s = conjg( g ) / d
+            r = d
+         else
 !
 !        Use scaled algorithm
 !
-         u = min( safmax, max( safmin, g1 ) )
-         uu = one / u
-         gs = g*uu
-         g2 = ABSSQ( gs )
-         d = sqrt( g2 )
-         s = conjg( gs ) / d
-         r = d*u
+            u = min( safmax, max( safmin, g1 ) )
+            gs = g / u
+!           The following two lines can be replaced by `d = abs( gs )`.
+!           This algorithm do not use the intrinsic complex abs.
+            g2 = ABSSQ( gs )
+            d = sqrt( g2 )
+            s = conjg( gs ) / d
+            r = d*u
+         end if
       end if
    else
       f1 = max( abs(real(f)), abs(aimag(f)) )
       g1 = max( abs(real(g)), abs(aimag(g)) )
+      rtmax = sqrt( safmax/4 )
       if( f1 > rtmin .and. f1 < rtmax .and. &
           g1 > rtmin .and. g1 < rtmax ) then
 !
@@ -176,32 +181,51 @@ subroutine ZROTG( a, b, c, s )
          f2 = ABSSQ( f )
          g2 = ABSSQ( g )
          h2 = f2 + g2
-         if( f2 > rtmin .and. h2 < rtmax ) then
-            d = sqrt( f2*h2 )
+         ! safmin <= f2 <= h2 <= safmax
+         if( f2 >= h2 * safmin ) then
+            ! safmin <= f2/h2 <= 1, and h2/f2 is finite
+            c = sqrt( f2 / h2 )
+            r = f / c
+            rtmax = rtmax * 2
+            if( f2 > rtmin .and. h2 < rtmax ) then
+               ! safmin <= sqrt( f2*h2 ) <= safmax
+               s = conjg( g ) * ( f / sqrt( f2*h2 ) )
+            else
+               s = conjg( g ) * ( r / h2 )
+            end if
          else
-            d = sqrt( f2 )*sqrt( h2 )
+            ! f2/h2 <= safmin may be subnormal, and h2/f2 may overflow.
+            ! Moreover,
+            !  safmin <= f2*f2 * safmax < f2 * h2 < h2*h2 * safmin <= safmax,
+            !  sqrt(safmin) <= sqrt(f2 * h2) <= sqrt(safmax).
+            ! Also,
+            !  g2 >> f2, which means that h2 = g2.
+            d = sqrt( f2 * h2 )
+            c = f2 / d
+            if( c >= safmin ) then
+               r = f / c
+            else
+               ! f2 / sqrt(f2 * h2) < safmin, then
+               !  sqrt(safmin) <= f2 * sqrt(safmax) <= h2 / sqrt(f2 * h2) <= h2 * (safmin / f2) <= h2 <= safmax
+               r = f * ( h2 / d )
+            end if
+            s = conjg( g ) * ( f / d )
          end if
-         p = 1 / d
-         c = f2*p
-         s = conjg( g )*( f*p )
-         r = f*( h2*p )
       else
 !
 !        Use scaled algorithm
 !
          u = min( safmax, max( safmin, f1, g1 ) )
-         uu = one / u
-         gs = g*uu
+         gs = g / u
          g2 = ABSSQ( gs )
-         if( f1*uu < rtmin ) then
+         if( f1 / u < rtmin ) then
 !
 !           f is not well-scaled when scaled by g1.
 !           Use a different scaling for f.
 !
             v = min( safmax, max( safmin, f1 ) )
-            vv = one / v
-            w = v * uu
-            fs = f*vv
+            w = v / u
+            fs = f / v
             f2 = ABSSQ( fs )
             h2 = f2*w**2 + g2
          else
@@ -209,19 +233,43 @@ subroutine ZROTG( a, b, c, s )
 !           Otherwise use the same scaling for f and g.
 !
             w = one
-            fs = f*uu
+            fs = f / u
             f2 = ABSSQ( fs )
             h2 = f2 + g2
          end if
-         if( f2 > rtmin .and. h2 < rtmax ) then
-            d = sqrt( f2*h2 )
+         ! safmin <= f2 <= h2 <= safmax
+         if( f2 >= h2 * safmin ) then
+            ! safmin <= f2/h2 <= 1, and h2/f2 is finite
+            c = sqrt( f2 / h2 )
+            r = fs / c
+            rtmax = rtmax * 2
+            if( f2 > rtmin .and. h2 < rtmax ) then
+               ! safmin <= sqrt( f2*h2 ) <= safmax
+               s = conjg( gs ) * ( fs / sqrt( f2*h2 ) )
+            else
+               s = conjg( gs ) * ( r / h2 )
+            end if
          else
-            d = sqrt( f2 )*sqrt( h2 )
+            ! f2/h2 <= safmin may be subnormal, and h2/f2 may overflow.
+            ! Moreover,
+            !  safmin <= f2*f2 * safmax < f2 * h2 < h2*h2 * safmin <= safmax,
+            !  sqrt(safmin) <= sqrt(f2 * h2) <= sqrt(safmax).
+            ! Also,
+            !  g2 >> f2, which means that h2 = g2.
+            d = sqrt( f2 * h2 )
+            c = f2 / d
+            if( c >= safmin ) then
+               r = fs / c
+            else
+               ! f2 / sqrt(f2 * h2) < safmin, then
+               !  sqrt(safmin) <= f2 * sqrt(safmax) <= h2 / sqrt(f2 * h2) <= h2 * (safmin / f2) <= h2 <= safmax
+               r = fs * ( h2 / d )
+            end if
+            s = conjg( gs ) * ( fs / d )
          end if
-         p = 1 / d
-         c = ( f2*p )*w
-         s = conjg( gs )*( fs*p )
-         r = ( fs*( h2*p ) )*u
+         ! Rescale c and r
+         c = c * w
+         r = r * u
       end if
    end if
    a = r
diff --git a/BLAS/SRC/zscal.f b/BLAS/SRC/zscal.f
index 8085f5a399..29db3b1f92 100644
--- a/BLAS/SRC/zscal.f
+++ b/BLAS/SRC/zscal.f
@@ -61,7 +61,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level1
+*> \ingroup scal
 *
 *> \par Further Details:
 *  =====================
@@ -75,6 +75,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZSCAL(N,ZA,ZX,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -93,7 +94,11 @@ SUBROUTINE ZSCAL(N,ZA,ZX,INCX)
 *     .. Local Scalars ..
       INTEGER I,NINCX
 *     ..
-      IF (N.LE.0 .OR. INCX.LE.0) RETURN
+*     .. Parameters ..
+      COMPLEX*16 ONE
+      PARAMETER (ONE= (1.0D+0,0.0D+0))
+*     ..
+      IF (N.LE.0 .OR. INCX.LE.0 .OR. ZA.EQ.ONE) RETURN
       IF (INCX.EQ.1) THEN
 *
 *        code for increment equal to 1
diff --git a/BLAS/SRC/zswap.f b/BLAS/SRC/zswap.f
index 93f8fc52d0..a13bfffc80 100644
--- a/BLAS/SRC/zswap.f
+++ b/BLAS/SRC/zswap.f
@@ -65,7 +65,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level1
+*> \ingroup swap
 *
 *> \par Further Details:
 *  =====================
@@ -78,6 +78,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZSWAP(N,ZX,INCX,ZY,INCY)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level1 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zsymm.f b/BLAS/SRC/zsymm.f
index 3ec8a8db7a..6990fed816 100644
--- a/BLAS/SRC/zsymm.f
+++ b/BLAS/SRC/zsymm.f
@@ -168,7 +168,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level3
+*> \ingroup hemm
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +186,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZSYMM(SIDE,UPLO,M,N,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -236,9 +237,11 @@ SUBROUTINE ZSYMM(SIDE,UPLO,M,N,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
 *     Test the input parameters.
 *
       INFO = 0
-      IF ((.NOT.LSAME(SIDE,'L')) .AND. (.NOT.LSAME(SIDE,'R'))) THEN
+      IF ((.NOT.LSAME(SIDE,'L')) .AND.
+     +    (.NOT.LSAME(SIDE,'R'))) THEN
           INFO = 1
-      ELSE IF ((.NOT.UPPER) .AND. (.NOT.LSAME(UPLO,'L'))) THEN
+      ELSE IF ((.NOT.UPPER) .AND.
+     +         (.NOT.LSAME(UPLO,'L'))) THEN
           INFO = 2
       ELSE IF (M.LT.0) THEN
           INFO = 3
diff --git a/BLAS/SRC/zsyr2k.f b/BLAS/SRC/zsyr2k.f
index e0f89bb584..3c0aab1432 100644
--- a/BLAS/SRC/zsyr2k.f
+++ b/BLAS/SRC/zsyr2k.f
@@ -167,7 +167,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level3
+*> \ingroup her2k
 *
 *> \par Further Details:
 *  =====================
@@ -185,6 +185,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZSYR2K(UPLO,TRANS,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/zsyrk.f b/BLAS/SRC/zsyrk.f
index 143a5e235a..7589727406 100644
--- a/BLAS/SRC/zsyrk.f
+++ b/BLAS/SRC/zsyrk.f
@@ -146,7 +146,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level3
+*> \ingroup herk
 *
 *> \par Further Details:
 *  =====================
@@ -164,6 +164,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZSYRK(UPLO,TRANS,N,K,ALPHA,A,LDA,BETA,C,LDC)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
diff --git a/BLAS/SRC/ztbmv.f b/BLAS/SRC/ztbmv.f
index 6be39d04e1..eb4e1a7c17 100644
--- a/BLAS/SRC/ztbmv.f
+++ b/BLAS/SRC/ztbmv.f
@@ -164,7 +164,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level2
+*> \ingroup tbmv
 *
 *> \par Further Details:
 *  =====================
@@ -183,6 +183,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZTBMV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -223,10 +224,12 @@ SUBROUTINE ZTBMV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/ztbsv.f b/BLAS/SRC/ztbsv.f
index 41b540774a..7275df32b5 100644
--- a/BLAS/SRC/ztbsv.f
+++ b/BLAS/SRC/ztbsv.f
@@ -168,7 +168,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level2
+*> \ingroup tbsv
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +186,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZTBSV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -226,10 +227,12 @@ SUBROUTINE ZTBSV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/ztpmv.f b/BLAS/SRC/ztpmv.f
index 363fd5a2ac..433ee5ebae 100644
--- a/BLAS/SRC/ztpmv.f
+++ b/BLAS/SRC/ztpmv.f
@@ -120,7 +120,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level2
+*> \ingroup tpmv
 *
 *> \par Further Details:
 *  =====================
@@ -139,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZTPMV(UPLO,TRANS,DIAG,N,AP,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -179,10 +180,12 @@ SUBROUTINE ZTPMV(UPLO,TRANS,DIAG,N,AP,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/ztpsv.f b/BLAS/SRC/ztpsv.f
index c6f24d0b27..de9ce14d55 100644
--- a/BLAS/SRC/ztpsv.f
+++ b/BLAS/SRC/ztpsv.f
@@ -123,7 +123,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level2
+*> \ingroup tpsv
 *
 *> \par Further Details:
 *  =====================
@@ -141,6 +141,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZTPSV(UPLO,TRANS,DIAG,N,AP,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -181,10 +182,12 @@ SUBROUTINE ZTPSV(UPLO,TRANS,DIAG,N,AP,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/ztrmm.f b/BLAS/SRC/ztrmm.f
index c59c367cee..b158403211 100644
--- a/BLAS/SRC/ztrmm.f
+++ b/BLAS/SRC/ztrmm.f
@@ -156,7 +156,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level3
+*> \ingroup trmm
 *
 *> \par Further Details:
 *  =====================
@@ -174,6 +174,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZTRMM(SIDE,UPLO,TRANSA,DIAG,M,N,ALPHA,A,LDA,B,LDB)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -233,7 +234,8 @@ SUBROUTINE ZTRMM(SIDE,UPLO,TRANSA,DIAG,M,N,ALPHA,A,LDA,B,LDB)
      +         (.NOT.LSAME(TRANSA,'T')) .AND.
      +         (.NOT.LSAME(TRANSA,'C'))) THEN
           INFO = 3
-      ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND. (.NOT.LSAME(DIAG,'N'))) THEN
+      ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND.
+     +         (.NOT.LSAME(DIAG,'N'))) THEN
           INFO = 4
       ELSE IF (M.LT.0) THEN
           INFO = 5
diff --git a/BLAS/SRC/ztrmv.f b/BLAS/SRC/ztrmv.f
index e8314facb7..5c1962ba47 100644
--- a/BLAS/SRC/ztrmv.f
+++ b/BLAS/SRC/ztrmv.f
@@ -125,7 +125,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level2
+*> \ingroup trmv
 *
 *> \par Further Details:
 *  =====================
@@ -144,6 +144,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZTRMV(UPLO,TRANS,DIAG,N,A,LDA,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -184,10 +185,12 @@ SUBROUTINE ZTRMV(UPLO,TRANS,DIAG,N,A,LDA,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/SRC/ztrsm.f b/BLAS/SRC/ztrsm.f
index 7f7eb52f3e..192190f6ce 100644
--- a/BLAS/SRC/ztrsm.f
+++ b/BLAS/SRC/ztrsm.f
@@ -159,7 +159,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level3
+*> \ingroup trsm
 *
 *> \par Further Details:
 *  =====================
@@ -177,6 +177,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZTRSM(SIDE,UPLO,TRANSA,DIAG,M,N,ALPHA,A,LDA,B,LDB)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level3 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -236,7 +237,8 @@ SUBROUTINE ZTRSM(SIDE,UPLO,TRANSA,DIAG,M,N,ALPHA,A,LDA,B,LDB)
      +         (.NOT.LSAME(TRANSA,'T')) .AND.
      +         (.NOT.LSAME(TRANSA,'C'))) THEN
           INFO = 3
-      ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND. (.NOT.LSAME(DIAG,'N'))) THEN
+      ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND.
+     +         (.NOT.LSAME(DIAG,'N'))) THEN
           INFO = 4
       ELSE IF (M.LT.0) THEN
           INFO = 5
diff --git a/BLAS/SRC/ztrsv.f b/BLAS/SRC/ztrsv.f
index 0bb9cbe745..9b96211d25 100644
--- a/BLAS/SRC/ztrsv.f
+++ b/BLAS/SRC/ztrsv.f
@@ -128,7 +128,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16_blas_level2
+*> \ingroup trsv
 *
 *> \par Further Details:
 *  =====================
@@ -146,6 +146,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZTRSV(UPLO,TRANS,DIAG,N,A,LDA,X,INCX)
+      IMPLICIT NONE
 *
 *  -- Reference BLAS level2 routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -186,10 +187,12 @@ SUBROUTINE ZTRSV(UPLO,TRANS,DIAG,N,A,LDA,X,INCX)
       INFO = 0
       IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
           INFO = 1
-      ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
+      ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
+     +         .NOT.LSAME(TRANS,'T') .AND.
      +         .NOT.LSAME(TRANS,'C')) THEN
           INFO = 2
-      ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
+      ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
+     +         .NOT.LSAME(DIAG,'N')) THEN
           INFO = 3
       ELSE IF (N.LT.0) THEN
           INFO = 4
diff --git a/BLAS/TESTING/CMakeLists.txt b/BLAS/TESTING/CMakeLists.txt
index ae82cf937f..597e81738b 100644
--- a/BLAS/TESTING/CMakeLists.txt
+++ b/BLAS/TESTING/CMakeLists.txt
@@ -15,6 +15,12 @@ macro(add_blas_test name src)
       -DINTDIR=${CMAKE_CFG_INTDIR}
       -P "${LAPACK_SOURCE_DIR}/TESTING/runtest.cmake")
   endif()
+
+  # Disable constant propagation for NAG compiler to avoid issues with
+  # special values (Inf, NaN) returned by SXVALS and DXVALS.
+  if(CMAKE_Fortran_COMPILER_ID STREQUAL "NAG")
+    target_compile_options(${name} PRIVATE "-Onopropagate")
+  endif()
 endmacro()
 
 if(BUILD_SINGLE)
diff --git a/BLAS/TESTING/cblat1.f b/BLAS/TESTING/cblat1.f
index c6dc453b45..f2f9b21267 100644
--- a/BLAS/TESTING/cblat1.f
+++ b/BLAS/TESTING/cblat1.f
@@ -34,6 +34,7 @@
 *
 *  =====================================================================
       PROGRAM CBLAT1
+      IMPLICIT NONE
 *
 *  -- Reference BLAS test routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -58,7 +59,7 @@ PROGRAM CBLAT1
       DATA             SFAC/9.765625E-4/
 *     .. Executable Statements ..
       WRITE (NOUT,99999)
-      DO 20 IC = 1, 10
+      DO 20 IC = 1, 11
          ICASE = IC
          CALL HEADER
 *
@@ -71,7 +72,7 @@ PROGRAM CBLAT1
          INCX = 9999
          INCY = 9999
          MODE = 9999
-         IF (ICASE.LE.5) THEN
+         IF (ICASE.LE.5 .OR. ICASE.EQ.11) THEN
             CALL CHECK2(SFAC)
          ELSE IF (ICASE.GE.6) THEN
             CALL CHECK1(SFAC)
@@ -88,6 +89,7 @@ PROGRAM CBLAT1
 *
       END
       SUBROUTINE HEADER
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER          NOUT
       PARAMETER        (NOUT=6)
@@ -95,7 +97,7 @@ SUBROUTINE HEADER
       INTEGER          ICASE, INCX, INCY, MODE, N
       LOGICAL          PASS
 *     .. Local Arrays ..
-      CHARACTER*6      L(10)
+      CHARACTER*6      L(11)
 *     .. Common blocks ..
       COMMON           /COMBLA/ICASE, N, INCX, INCY, MODE, PASS
 *     .. Data statements ..
@@ -109,6 +111,8 @@ SUBROUTINE HEADER
       DATA             L(8)/'CSCAL '/
       DATA             L(9)/'CSSCAL'/
       DATA             L(10)/'ICAMAX'/
+      DATA             L(11)/'CAXPBY'/
+
 *     .. Executable Statements ..
       WRITE (NOUT,99999) ICASE, L(ICASE)
       RETURN
@@ -119,9 +123,11 @@ SUBROUTINE HEADER
 *
       END
       SUBROUTINE CHECK1(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
-      PARAMETER         (NOUT=6)
+      REAL              THRESH
+      PARAMETER         (NOUT=6, THRESH=10.0E0)
 *     .. Scalar Arguments ..
       REAL              SFAC
 *     .. Scalars in Common ..
@@ -141,7 +147,7 @@ SUBROUTINE CHECK1(SFAC)
       INTEGER           ICAMAX
       EXTERNAL          SCASUM, SCNRM2, ICAMAX
 *     .. External Subroutines ..
-      EXTERNAL          CSCAL, CSSCAL, CTEST, ITEST1, STEST1
+      EXTERNAL          CB1NRM2, CSCAL, CSSCAL, CTEST, ITEST1, STEST1
 *     .. Intrinsic Functions ..
       INTRINSIC         MAX
 *     .. Common blocks ..
@@ -256,6 +262,10 @@ SUBROUTINE CHECK1(SFAC)
    20       CONTINUE
             IF (ICASE.EQ.6) THEN
 *              .. SCNRM2 ..
+*              Test scaling when some entries are tiny or huge
+               CALL CB1NRM2(N,(INCX-2)*2,THRESH)
+               CALL CB1NRM2(N,INCX,THRESH)
+*              Test with hardcoded mid range entries
                CALL STEST1(SCNRM2(N,CX,INCX),STRUE2(NP1),STRUE2(NP1),
      +                     SFAC)
             ELSE IF (ICASE.EQ.7) THEN
@@ -340,6 +350,7 @@ SUBROUTINE CHECK1(SFAC)
 *
       END
       SUBROUTINE CHECK2(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
       PARAMETER         (NOUT=6)
@@ -349,26 +360,27 @@ SUBROUTINE CHECK2(SFAC)
       INTEGER           ICASE, INCX, INCY, MODE, N
       LOGICAL           PASS
 *     .. Local Scalars ..
-      COMPLEX           CA
+      COMPLEX           CA, CB
       INTEGER           I, J, KI, KN, KSIZE, LENX, LENY, LINCX, LINCY,
      +                  MX, MY
 *     .. Local Arrays ..
       COMPLEX           CDOT(1), CSIZE1(4), CSIZE2(7,2), CSIZE3(14),
      +                  CT10X(7,4,4), CT10Y(7,4,4), CT6(4,4), CT7(4,4),
      +                  CT8(7,4,4), CTY0(1), CX(7), CX0(1), CX1(7),
-     +                  CY(7), CY0(1), CY1(7)
+     +                  CY(7), CY0(1), CY1(7), CT11(7,4,4)
       INTEGER           INCXS(4), INCYS(4), LENS(4,2), NS(4)
 *     .. External Functions ..
       COMPLEX           CDOTC, CDOTU
       EXTERNAL          CDOTC, CDOTU
 *     .. External Subroutines ..
-      EXTERNAL          CAXPY, CCOPY, CSWAP, CTEST
+      EXTERNAL          CAXPY, CAXPBY, CCOPY, CSWAP, CTEST
 *     .. Intrinsic Functions ..
       INTRINSIC         ABS, MIN
 *     .. Common blocks ..
       COMMON            /COMBLA/ICASE, N, INCX, INCY, MODE, PASS
 *     .. Data statements ..
       DATA              CA/(0.4E0,-0.7E0)/
+      DATA              CB/(0.7E0,-0.4E0)/
       DATA              INCXS/1, 2, -2, -1/
       DATA              INCYS/1, -2, 1, -2/
       DATA              LENS/1, 1, 2, 4, 1, 1, 3, 7/
@@ -538,6 +550,53 @@ SUBROUTINE CHECK2(SFAC)
      +                  (1.54E0,1.54E0), (1.54E0,1.54E0),
      +                  (1.54E0,1.54E0), (1.54E0,1.54E0),
      +                  (1.54E0,1.54E0), (1.54E0,1.54E0)/
+
+      DATA              ((CT11(I,J,1),I=1,7),J=1,4)/(0.6E0,-0.6E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (-0.1E0,-1.47E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (-0.1E0,-1.47E0),
+     +                  (-1.08E0,0.71E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (-0.1E0,-1.47E0), (-1.08E0,0.71E0),
+     +                  (-0.42E0,-0.99E0), (-0.61E0,-0.85E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0)/
+      DATA              ((CT11(I,J,2),I=1,7),J=1,4)/(0.6E0,-0.6E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (-0.1E0,-1.47E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (-0.49E0,-0.95E0),
+     +                  (-0.9E0,0.5E0),(-0.03E0,-1.51E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.36E0,0.00E0), (-0.9E0,0.5E0),
+     +                  (-0.39E0,-0.23E0), (0.1E0,-0.5E0),
+     +                  (-0.82E0,-0.39E0), (-0.5E0,-0.3E0),
+     +                  (0.0E0,-1.62E0)/
+      DATA              ((CT11(I,J,3),I=1,7),J=1,4)/(0.6E0,-0.6E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (-0.1E0,-1.47E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (-0.49E0,-0.95E0),
+     +                  (-0.71E0,-0.1E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.36E0,0.00E0), (-1.07E0,1.18E0),
+     +                  (-0.42E0,-0.99E0), (-0.41E0,-1.2E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0)/
+      DATA              ((CT11(I,J,4),I=1,7),J=1,4)/(0.6E0,-0.6E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (-0.1E0,-1.47E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (-0.1E0,-1.47E0), (-0.9E0,0.5E0),
+     +                  (-0.4E0,-0.7E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (-0.1E0,-1.47E0),
+     +                  (-0.9E0,0.5E0),(-0.4E0,-0.7E0), (0.1E0,-0.5E0),
+     +                  (-0.82E0,-0.39E0), (-0.5E0,-0.3E0),
+     +                  (-0.2E0,-1.27E0)/
+
 *     .. Executable Statements ..
       DO 60 KI = 1, 4
          INCX = INCXS(KI)
@@ -593,6 +652,10 @@ SUBROUTINE CHECK2(SFAC)
                CALL CSWAP(N,CX,INCX,CY,INCY)
                CALL CTEST(LENX,CX,CT10X(1,KN,KI),CSIZE3,1.0E0)
                CALL CTEST(LENY,CY,CT10Y(1,KN,KI),CSIZE3,1.0E0)
+            ELSE IF (ICASE.EQ.11) THEN
+*              .. CAXBPY ..
+               CALL CAXPBY(N,CA,CX,INCX,CB,CY,INCY)
+               CALL CTEST(LENY,CY,CT11(1,KN,KI),CSIZE2(1,KSIZE),SFAC)
             ELSE
                WRITE (NOUT,*) ' Shouldn''t be here in CHECK2'
                STOP
@@ -606,6 +669,7 @@ SUBROUTINE CHECK2(SFAC)
 *
       END
       SUBROUTINE STEST(LEN,SCOMP,STRUE,SSIZE,SFAC)
+      IMPLICIT NONE
 *     ********************************* STEST **************************
 *
 *     THIS SUBR COMPARES ARRAYS  SCOMP() AND STRUE() OF LENGTH LEN TO
@@ -665,6 +729,7 @@ SUBROUTINE STEST(LEN,SCOMP,STRUE,SSIZE,SFAC)
 *
       END
       SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
+      IMPLICIT NONE
 *     ************************* STEST1 *****************************
 *
 *     THIS IS AN INTERFACE SUBROUTINE TO ACCOMMODATE THE FORTRAN
@@ -693,6 +758,7 @@ SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
 *
       END
       REAL             FUNCTION SDIFF(SA,SB)
+      IMPLICIT NONE
 *     ********************************* SDIFF **************************
 *     COMPUTES DIFFERENCE OF TWO NUMBERS.  C. L. LAWSON, JPL 1974 FEB 15
 *
@@ -706,6 +772,7 @@ REAL             FUNCTION SDIFF(SA,SB)
 *
       END
       SUBROUTINE CTEST(LEN,CCOMP,CTRUE,CSIZE,SFAC)
+      IMPLICIT NONE
 *     **************************** CTEST *****************************
 *
 *     C.L. LAWSON, JPL, 1978 DEC 6
@@ -740,6 +807,7 @@ SUBROUTINE CTEST(LEN,CCOMP,CTRUE,CSIZE,SFAC)
 *
       END
       SUBROUTINE ITEST1(ICOMP,ITRUE)
+      IMPLICIT NONE
 *     ********************************* ITEST1 *************************
 *
 *     THIS SUBROUTINE COMPARES THE VARIABLES ICOMP AND ITRUE FOR
@@ -782,3 +850,234 @@ SUBROUTINE ITEST1(ICOMP,ITRUE)
 *     End of ITEST1
 *
       END
+      SUBROUTINE CB1NRM2(N,INCX,THRESH)
+      IMPLICIT NONE
+*     Compare NRM2 with a reference computation using combinations
+*     of the following values:
+*
+*     0, very small, small, ulp, 1, 1/ulp, big, very big, infinity, NaN
+*
+*     one of these values is used to initialize x(1) and x(2:N) is
+*     filled with random values from [-1,1] scaled by another of
+*     these values.
+*
+*     This routine is adapted from the test suite provided by
+*     Anderson E. (2017)
+*     Algorithm 978: Safe Scaling in the Level 1 BLAS
+*     ACM Trans Math Softw 44:1--28
+*     https://doi.org/10.1145/3061665
+*
+*     .. Scalar Arguments ..
+      INTEGER           INCX, N
+      REAL              THRESH
+*
+*  =====================================================================
+*     .. Parameters ..
+      INTEGER           NMAX, NOUT, NV
+      PARAMETER         (NMAX=20, NOUT=6, NV=10)
+      REAL              HALF, ONE, THREE, TWO, ZERO
+      PARAMETER         (HALF=0.5E+0, ONE=1.0E+0, TWO= 2.0E+0,
+     &                  THREE=3.0E+0, ZERO=0.0E+0)
+*     .. External Functions ..
+      REAL              SCNRM2
+      EXTERNAL          SCNRM2
+*     .. Intrinsic Functions ..
+      INTRINSIC         AIMAG, ABS, CMPLX, MAX, MIN, REAL, SQRT
+*     .. Model parameters ..
+      REAL              BIGNUM, SAFMAX, SAFMIN, SMLNUM, ULP
+      PARAMETER         (BIGNUM=0.1014120480E+32,
+     &                  SAFMAX=0.8507059173E+38,
+     &                  SAFMIN=0.1175494351E-37,
+     &                  SMLNUM=0.9860761315E-31,
+     &                  ULP=0.1192092896E-06)
+*     .. Local Scalars ..
+      COMPLEX           ROGUE
+      REAL              SNRM, TRAT, V0, V1, WORKSSQ, Y1, Y2,
+     &                  YMAX, YMIN, YNRM, ZNRM
+      INTEGER           I, IV, IW, IX, KS
+      LOGICAL           FIRST
+*     .. Local Arrays ..
+      COMPLEX           X(NMAX), Z(NMAX)
+      REAL              VALUES(NV), WORK(NMAX)
+*     .. Executable Statements ..
+      VALUES(1) = ZERO
+      VALUES(2) = TWO*SAFMIN
+      VALUES(3) = SMLNUM
+      VALUES(4) = ULP
+      VALUES(5) = ONE
+      VALUES(6) = ONE / ULP
+      VALUES(7) = BIGNUM
+      VALUES(8) = SAFMAX
+      VALUES(9) = SXVALS(V0,2)
+      VALUES(10) = SXVALS(V0,3)
+      ROGUE = CMPLX(1234.5678E+0,-1234.5678E+0)
+      FIRST = .TRUE.
+*
+*     Check that the arrays are large enough
+*
+      IF (N*ABS(INCX).GT.NMAX) THEN
+         WRITE (NOUT,99) "SCNRM2", NMAX, INCX, N, N*ABS(INCX)
+         RETURN
+      END IF
+*
+*     Zero-sized inputs are tested in STEST1.
+      IF (N.LE.0) THEN
+         RETURN
+      END IF
+*
+*     Generate 2*(N-1) values in (-1,1).
+*
+      KS = 2*(N-1)
+      DO I = 1, KS
+         CALL RANDOM_NUMBER(WORK(I))
+         WORK(I) = ONE - TWO*WORK(I)
+      END DO
+*
+*     Compute the sum of squares of the random values
+*     by an unscaled algorithm.
+*
+      WORKSSQ = ZERO
+      DO I = 1, KS
+         WORKSSQ = WORKSSQ + WORK(I)*WORK(I)
+      END DO
+*
+*     Construct the test vector with one known value
+*     and the rest from the random work array multiplied
+*     by a scaling factor.
+*
+      DO IV = 1, NV
+         V0 = VALUES(IV)
+         IF (ABS(V0).GT.ONE) THEN
+            V0 = V0*HALF*HALF
+         END IF
+         Z(1) = CMPLX(V0,-THREE*V0)
+         DO IW = 1, NV
+            V1 = VALUES(IW)
+            IF (ABS(V1).GT.ONE) THEN
+               V1 = (V1*HALF) / SQRT(REAL(KS+1))
+            END IF
+            DO I = 1, N-1
+               Z(I+1) = CMPLX(V1*WORK(2*I-1),V1*WORK(2*I))
+            END DO
+*
+*           Compute the expected value of the 2-norm
+*
+            Y1 = ABS(V0) * SQRT(10.0E0)
+            IF (N.GT.1) THEN
+               Y2 = ABS(V1)*SQRT(WORKSSQ)
+            ELSE
+               Y2 = ZERO
+            END IF
+            YMIN = MIN(Y1, Y2)
+            YMAX = MAX(Y1, Y2)
+*
+*           Expected value is NaN if either is NaN. The test
+*           for YMIN == YMAX avoids further computation if both
+*           are infinity.
+*
+            IF ((Y1.NE.Y1).OR.(Y2.NE.Y2)) THEN
+*              add to propagate NaN
+               YNRM = Y1 + Y2
+            ELSE IF (YMIN == YMAX) THEN
+               YNRM = SQRT(TWO)*YMAX
+            ELSE IF (YMAX == ZERO) THEN
+               YNRM = ZERO
+            ELSE
+               YNRM = YMAX*SQRT(ONE + (YMIN / YMAX)**2)
+            END IF
+*
+*           Fill the input array to SCNRM2 with steps of incx
+*
+            DO I = 1, N
+               X(I) = ROGUE
+            END DO
+            IX = 1
+            IF (INCX.LT.0) IX = 1 - (N-1)*INCX
+            DO I = 1, N
+               X(IX) = Z(I)
+               IX = IX + INCX
+            END DO
+*
+*           Call SCNRM2 to compute the 2-norm
+*
+            SNRM = SCNRM2(N,X,INCX)
+*
+*           Compare SNRM and ZNRM.  Roundoff error grows like O(n)
+*           in this implementation so we scale the test ratio accordingly.
+*
+            IF (INCX.EQ.0) THEN
+               Y1 = ABS(REAL(X(1)))
+               Y2 = ABS(AIMAG(X(1)))
+               YMIN = MIN(Y1, Y2)
+               YMAX = MAX(Y1, Y2)
+               IF ((Y1.NE.Y1).OR.(Y2.NE.Y2)) THEN
+*                 add to propagate NaN
+                  ZNRM = Y1 + Y2
+               ELSE IF (YMIN == YMAX) THEN
+                  ZNRM = SQRT(TWO)*YMAX
+               ELSE IF (YMAX == ZERO) THEN
+                  ZNRM = ZERO
+               ELSE
+                  ZNRM = YMAX * SQRT(ONE + (YMIN / YMAX)**2)
+               END IF
+               ZNRM = SQRT(REAL(n)) * ZNRM
+            ELSE
+               ZNRM = YNRM
+            END IF
+*
+*           The tests for NaN rely on the compiler not being overly
+*           aggressive and removing the statements altogether.
+            IF ((SNRM.NE.SNRM).OR.(ZNRM.NE.ZNRM)) THEN
+               IF ((SNRM.NE.SNRM).NEQV.(ZNRM.NE.ZNRM)) THEN
+                  TRAT = ONE / ULP
+               ELSE
+                  TRAT = ZERO
+               END IF
+            ELSE IF (ZNRM == ZERO) THEN
+               TRAT = SNRM / ULP
+            ELSE
+               TRAT = (ABS(SNRM-ZNRM) / ZNRM) / (TWO*REAL(N)*ULP)
+            END IF
+            IF ((TRAT.NE.TRAT).OR.(TRAT.GE.THRESH)) THEN
+               IF (FIRST) THEN
+                  FIRST = .FALSE.
+                  WRITE(NOUT,99999)
+               END IF
+               WRITE (NOUT,98) "SCNRM2", N, INCX, IV, IW, TRAT
+            END IF
+         END DO
+      END DO
+99999 FORMAT ('                                       FAIL')
+   99 FORMAT ( ' Not enough space to test ', A6, ': NMAX = ',I6,
+     + ', INCX = ',I6,/,'   N = ',I6,', must be at least ',I6 )
+   98 FORMAT( 1X, A6, ': N=', I6,', INCX=', I4, ', IV=', I2, ', IW=',
+     +  I2, ', test=', E15.8 )
+      RETURN
+      CONTAINS
+      REAL FUNCTION SXVALS(XX,K)
+      IMPLICIT NONE
+*     .. Scalar Arguments ..
+      REAL              XX
+      INTEGER           K
+*     .. Parameters ..
+      REAL              ZERO
+      PARAMETER         (ZERO=0.0E+0)
+*     .. Local Scalars ..
+      REAL              X, Y, Z
+*     .. Intrinsic Functions ..
+      INTRINSIC         HUGE
+*     .. Executable Statements ..
+      X = ZERO
+      Y = HUGE(XX)
+      Z = Y*Y
+      IF (K.EQ.1) THEN
+         X = -Z
+      ELSE IF (K.EQ.2) THEN
+         X = Z
+      ELSE IF (K.EQ.3) THEN
+         X = Z / Z
+      END IF
+      SXVALS = X
+      RETURN
+      END
+      END
diff --git a/BLAS/TESTING/cblat2.f b/BLAS/TESTING/cblat2.f
index cad4405033..a29c1a63ad 100644
--- a/BLAS/TESTING/cblat2.f
+++ b/BLAS/TESTING/cblat2.f
@@ -100,6 +100,7 @@
 *
 *  =====================================================================
       PROGRAM CBLAT2
+      IMPLICIT NONE
 *
 *  -- Reference BLAS test routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -435,6 +436,7 @@ SUBROUTINE CCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NALF, ALF, NBET,
      $                  BET, NINC, INC, NMAX, INCMAX, A, AA, AS, X, XX,
      $                  XS, Y, YY, YS, YT, G )
+      IMPLICIT NONE
 *
 *  Tests CGEMV and CGBMV.
 *
@@ -479,7 +481,7 @@ SUBROUTINE CCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       LOGICAL            LCE, LCERES
       EXTERNAL           LCE, LCERES
 *     .. External Subroutines ..
-      EXTERNAL           CGBMV, CGEMV, CMAKE, CMVCH
+      EXTERNAL           CGBMV, CGEMV, CMAKE, CMVCH, CREGR1
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN
 *     .. Scalars in Common ..
@@ -734,6 +736,34 @@ SUBROUTINE CCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *
   120 CONTINUE
 *
+*     Regression test to verify preservation of y when m zero, n nonzero.
+*
+      CALL CREGR1( TRANS, M, N, LY, KL, KU, ALPHA, AA, LDA, XX, INCX,
+     $   BETA, YY, INCY, YS )
+      IF( FULL )THEN
+         IF( TRACE )
+     $      WRITE( NTRA, FMT = 9994 )NC, SNAME, TRANS, M, N, ALPHA, LDA,
+     $      INCX, BETA, INCY
+         IF( REWI )
+     $      REWIND NTRA
+         CALL CGEMV( TRANS, M, N, ALPHA, AA, LDA, XX, INCX, BETA, YY,
+     $      INCY )
+      ELSE IF( BANDED )THEN
+         IF( TRACE )
+     $      WRITE( NTRA, FMT = 9995 )NC, SNAME, TRANS, M, N, KL, KU,
+     $      ALPHA, LDA, INCX, BETA, INCY
+         IF( REWI )
+     $      REWIND NTRA
+         CALL CGBMV( TRANS, M, N, KL, KU, ALPHA, AA, LDA, XX, INCX,
+     $      BETA, YY, INCY )
+      END IF
+      NC = NC + 1
+      IF( .NOT.LCE( YS, YY, LY ) )THEN
+         WRITE( NOUT, FMT = 9998 )NARGS - 1
+         FATAL = .TRUE.
+         GO TO 130
+      END IF
+*
 *     Report result.
 *
       IF( ERRMAX.LT.THRESH )THEN
@@ -780,6 +810,7 @@ SUBROUTINE CCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NALF, ALF, NBET,
      $                  BET, NINC, INC, NMAX, INCMAX, A, AA, AS, X, XX,
      $                  XS, Y, YY, YS, YT, G )
+      IMPLICIT NONE
 *
 *  Tests CHEMV, CHBMV and CHPMV.
 *
@@ -1127,6 +1158,7 @@ SUBROUTINE CCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       SUBROUTINE CCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, XT, G, Z )
+      IMPLICIT NONE
 *
 *  Tests CTRMV, CTBMV, CTPMV, CTRSV, CTBSV and CTPSV.
 *
@@ -1489,6 +1521,7 @@ SUBROUTINE CCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z )
+      IMPLICIT NONE
 *
 *  Tests CGERC and CGERU.
 *
@@ -1766,6 +1799,7 @@ SUBROUTINE CCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z )
+      IMPLICIT NONE
 *
 *  Tests CHER and CHPR.
 *
@@ -2050,6 +2084,7 @@ SUBROUTINE CCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z )
+      IMPLICIT NONE
 *
 *  Tests CHER2 and CHPR2.
 *
@@ -2369,6 +2404,7 @@ SUBROUTINE CCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *
       END
       SUBROUTINE CCHKE( ISNUM, SRNAMT, NOUT )
+      IMPLICIT NONE
 *
 *  Tests the error exits from the Level 2 Blas.
 *  Requires a special version of the error-handling routine XERBLA.
@@ -2713,6 +2749,7 @@ SUBROUTINE CCHKE( ISNUM, SRNAMT, NOUT )
       END
       SUBROUTINE CMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, KL,
      $                  KU, RESET, TRANSL )
+      IMPLICIT NONE
 *
 *  Generates values for an M by N matrix A within the bandwidth
 *  defined by KL and KU.
@@ -2905,6 +2942,7 @@ SUBROUTINE CMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, KL,
       END
       SUBROUTINE CMVCH( TRANS, M, N, ALPHA, A, NMAX, X, INCX, BETA, Y,
      $                  INCY, YT, G, YY, EPS, ERR, FATAL, NOUT, MV )
+      IMPLICIT NONE
 *
 *  Checks the results of the computational tests.
 *
@@ -3036,6 +3074,7 @@ SUBROUTINE CMVCH( TRANS, M, N, ALPHA, A, NMAX, X, INCX, BETA, Y,
 *
       END
       LOGICAL FUNCTION LCE( RI, RJ, LR )
+      IMPLICIT NONE
 *
 *  Tests if two arrays are identical.
 *
@@ -3066,6 +3105,7 @@ LOGICAL FUNCTION LCE( RI, RJ, LR )
 *
       END
       LOGICAL FUNCTION LCERES( TYPE, UPLO, M, N, AA, AS, LDA )
+      IMPLICIT NONE
 *
 *  Tests if selected elements in two arrays are equal.
 *
@@ -3125,6 +3165,7 @@ LOGICAL FUNCTION LCERES( TYPE, UPLO, M, N, AA, AS, LDA )
 *
       END
       COMPLEX FUNCTION CBEG( RESET )
+      IMPLICIT NONE
 *
 *  Generates complex numbers as pairs of random numbers uniformly
 *  distributed between -0.5 and 0.5.
@@ -3177,6 +3218,7 @@ COMPLEX FUNCTION CBEG( RESET )
 *
       END
       REAL FUNCTION SDIFF( X, Y )
+      IMPLICIT NONE
 *
 *  Auxiliary routine for test program for Level 2 Blas.
 *
@@ -3193,6 +3235,7 @@ REAL FUNCTION SDIFF( X, Y )
 *
       END
       SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      IMPLICIT NONE
 *
 *  Tests whether XERBLA has detected an error when it should.
 *
@@ -3219,8 +3262,43 @@ SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
 *
 *     End of CHKXER
 *
+      END
+      SUBROUTINE CREGR1( TRANS, M, N, LY, KL, KU, ALPHA, A, LDA, X,
+     $   INCX, BETA, Y, INCY, YS )
+      IMPLICIT NONE
+*
+*  Input initialization for regression test.
+*
+*     .. Scalar Arguments ..
+      CHARACTER*1        TRANS
+      INTEGER            LY, M, N, KL, KU, LDA, INCX, INCY
+      COMPLEX            ALPHA, BETA
+*     .. Array Arguments ..
+      COMPLEX            A(LDA,*), X(*), Y(*), YS(*)
+*     .. Local Scalars ..
+      INTEGER            I
+*     .. Intrinsic Functions ..
+      INTRINSIC          CMPLX, REAL
+*     .. Executable Statements ..
+      TRANS = 'T'
+      M = 0
+      N = 5
+      KL = 0
+      KU = 0
+      ALPHA = CMPLX( 1.0 )
+      LDA = MAX( 1, M )
+      INCX = 1
+      BETA = CMPLX( -0.7, -0.8 )
+      INCY = 1
+      LY = ABS( INCY )*N
+      DO 10 I = 1, LY
+         Y( I ) = CMPLX( 42.0, REAL( I ) )
+         YS( I ) = Y( I )
+  10  CONTINUE
+      RETURN
       END
       SUBROUTINE XERBLA( SRNAME, INFO )
+      IMPLICIT NONE
 *
 *  This is a special version of XERBLA to be used only as part of
 *  the test program for testing error exits from the Level 2 BLAS
diff --git a/BLAS/TESTING/cblat3.f b/BLAS/TESTING/cblat3.f
index 18adeba6d5..06d8b2b78f 100644
--- a/BLAS/TESTING/cblat3.f
+++ b/BLAS/TESTING/cblat3.f
@@ -19,8 +19,8 @@
 *> Test program for the COMPLEX          Level 3 Blas.
 *>
 *> The program must be driven by a short data file. The first 14 records
-*> of the file are read using list-directed input, the last 9 records
-*> are read using the format ( A6, L2 ). An annotated example of a data
+*> of the file are read using list-directed input, the last 10 records
+*> are read using the format ( A7, L2 ). An annotated example of a data
 *> file can be obtained by deleting the first 3 characters from the
 *> following 23 lines:
 *> 'cblat3.out'      NAME OF SUMMARY OUTPUT FILE
@@ -46,6 +46,7 @@
 *> CSYRK  T PUT F FOR NO TEST. SAME COLUMNS.
 *> CHER2K T PUT F FOR NO TEST. SAME COLUMNS.
 *> CSYR2K T PUT F FOR NO TEST. SAME COLUMNS.
+*> CGEMMTR T PUT F FOR NO TEST. SAME COLUMNS.
 *>
 *> Further Details
 *> ===============
@@ -82,6 +83,7 @@
 *
 *  =====================================================================
       PROGRAM CBLAT3
+      IMPLICIT NONE
 *
 *  -- Reference BLAS test routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -93,7 +95,7 @@ PROGRAM CBLAT3
       INTEGER            NIN
       PARAMETER          ( NIN = 5 )
       INTEGER            NSUBS
-      PARAMETER          ( NSUBS = 9 )
+      PARAMETER          ( NSUBS = 10 )
       COMPLEX            ZERO, ONE
       PARAMETER          ( ZERO = ( 0.0, 0.0 ), ONE = ( 1.0, 0.0 ) )
       REAL               RZERO
@@ -108,7 +110,7 @@ PROGRAM CBLAT3
       LOGICAL            FATAL, LTESTT, REWI, SAME, SFATAL, TRACE,
      $                   TSTERR
       CHARACTER*1        TRANSA, TRANSB
-      CHARACTER*6        SNAMET
+      CHARACTER*7        SNAMET
       CHARACTER*32       SNAPS, SUMMRY
 *     .. Local Arrays ..
       COMPLEX            AA( NMAX*NMAX ), AB( NMAX, 2*NMAX ),
@@ -120,26 +122,27 @@ PROGRAM CBLAT3
       REAL               G( NMAX )
       INTEGER            IDIM( NIDMAX )
       LOGICAL            LTEST( NSUBS )
-      CHARACTER*6        SNAMES( NSUBS )
+      CHARACTER*7        SNAMES( NSUBS )
 *     .. External Functions ..
       REAL               SDIFF
       LOGICAL            LCE
       EXTERNAL           SDIFF, LCE
 *     .. External Subroutines ..
       EXTERNAL           CCHK1, CCHK2, CCHK3, CCHK4, CCHK5, CCHKE, CMMCH
+      EXTERNAL           CCHK6
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
       LOGICAL            LERR, OK
-      CHARACTER*6        SRNAMT
+      CHARACTER*7        SRNAMT
 *     .. Common blocks ..
       COMMON             /INFOC/INFOT, NOUTC, OK, LERR
       COMMON             /SRNAMC/SRNAMT
 *     .. Data statements ..
       DATA               SNAMES/'CGEMM ', 'CHEMM ', 'CSYMM ', 'CTRMM ',
      $                   'CTRSM ', 'CHERK ', 'CSYRK ', 'CHER2K',
-     $                   'CSYR2K'/
+     $                   'CSYR2K', 'CGEMMTR'/
 *     .. Executable Statements ..
 *
 *     Read name and unit number for summary output file and open file.
@@ -317,7 +320,7 @@ PROGRAM CBLAT3
             OK = .TRUE.
             FATAL = .FALSE.
             GO TO ( 140, 150, 150, 160, 160, 170, 170,
-     $              180, 180 )ISNUM
+     $              180, 180, 185 )ISNUM
 *           Test CGEMM, 01.
   140       CALL CCHK1( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
@@ -346,6 +349,11 @@ PROGRAM CBLAT3
      $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
      $                  NMAX, AB, AA, AS, BB, BS, C, CC, CS, CT, G, W )
             GO TO 190
+  185       CALL CCHK6( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
+     $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
+     $                  NMAX, AB, AA, AS, AB( 1, NMAX + 1 ), BB, BS, C,
+     $                  CC, CS, CT, G )
+
 *
   190       IF( FATAL.AND.SFATAL )
      $         GO TO 210
@@ -382,7 +390,7 @@ PROGRAM CBLAT3
      $      7( '(', F4.1, ',', F4.1, ')  ', : ) )
  9991 FORMAT( ' AMEND DATA FILE OR INCREASE ARRAY SIZES IN PROGRAM',
      $      /' ******* TESTS ABANDONED *******' )
- 9990 FORMAT( ' SUBPROGRAM NAME ', A6, ' NOT RECOGNIZED', /' ******* T',
+ 9990 FORMAT( ' SUBPROGRAM NAME ', A7, ' NOT RECOGNIZED', /' ******* T',
      $      'ESTS ABANDONED *******' )
  9989 FORMAT( ' ERROR IN CMMCH -  IN-LINE DOT PRODUCTS ARE BEING EVALU',
      $      'ATED WRONGLY.', /' CMMCH WAS CALLED WITH TRANSA = ', A1,
@@ -390,8 +398,8 @@ PROGRAM CBLAT3
      $      'ERR = ', F12.3, '.', /' THIS MAY BE DUE TO FAULTS IN THE ',
      $      'ARITHMETIC OR THE COMPILER.', /' ******* TESTS ABANDONED ',
      $      '*******' )
- 9988 FORMAT( A6, L2 )
- 9987 FORMAT( 1X, A6, ' WAS NOT TESTED' )
+ 9988 FORMAT( A7, L2 )
+ 9987 FORMAT( 1X, A7, ' WAS NOT TESTED' )
  9986 FORMAT( /' END OF TESTS' )
  9985 FORMAT( /' ******* FATAL ERROR - TESTS ABANDONED *******' )
  9984 FORMAT( ' ERROR-EXITS WILL NOT BE TESTED' )
@@ -422,7 +430,7 @@ SUBROUTINE CCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       COMPLEX            A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -667,15 +675,15 @@ SUBROUTINE CCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   130 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A6, '(''', A1, ''',''', A1, ''',',
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A7, '(''', A1, ''',''', A1, ''',',
      $      3( I3, ',' ), '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3,
      $      ',(', F4.1, ',', F4.1, '), C,', I3, ').' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -707,7 +715,7 @@ SUBROUTINE CCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       COMPLEX            A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -946,15 +954,15 @@ SUBROUTINE CCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   120 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',(', F4.1,
      $      ',', F4.1, '), C,', I3, ')    .' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -986,7 +994,7 @@ SUBROUTINE CCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       COMPLEX            A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1256,15 +1264,15 @@ SUBROUTINE CCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   160 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A6, '(', 4( '''', A1, ''',' ), 2( I3, ',' ),
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A7, '(', 4( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ')         ',
      $      '      .' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1296,7 +1304,7 @@ SUBROUTINE CCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       COMPLEX            A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1584,19 +1592,19 @@ SUBROUTINE CCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   130 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
  9995 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
- 9994 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9994 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ',', F4.1, ', C,', I3, ')               ',
      $      '          .' )
- 9993 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9993 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, ') , A,', I3, ',(', F4.1, ',', F4.1,
      $      '), C,', I3, ')          .' )
  9992 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1628,7 +1636,7 @@ SUBROUTINE CCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       COMPLEX            AA( NMAX*NMAX ), AB( 2*NMAX*NMAX ),
      $                   ALF( NALF ), AS( NMAX*NMAX ), BB( NMAX*NMAX ),
@@ -1957,19 +1965,19 @@ SUBROUTINE CCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   160 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
  9995 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
- 9994 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9994 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',', F4.1,
      $      ', C,', I3, ')           .' )
- 9993 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9993 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',(', F4.1,
      $      ',', F4.1, '), C,', I3, ')    .' )
  9992 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1998,7 +2006,7 @@ SUBROUTINE CCHKE( ISNUM, SRNAMT, NOUT )
 *
 *     .. Scalar Arguments ..
       INTEGER            ISNUM, NOUT
-      CHARACTER*6        SRNAMT
+      CHARACTER*7        SRNAMT
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
       LOGICAL            LERR, OK
@@ -2012,7 +2020,7 @@ SUBROUTINE CCHKE( ISNUM, SRNAMT, NOUT )
       COMPLEX            A( 2, 1 ), B( 2, 1 ), C( 2, 1 )
 *     .. External Subroutines ..
       EXTERNAL           CGEMM, CHEMM, CHER2K, CHERK, CHKXER, CSYMM,
-     $                   CSYR2K, CSYRK, CTRMM, CTRSM
+     $                   CSYR2K, CSYRK, CTRMM, CTRSM, CGEMMTR
 *     .. Common blocks ..
       COMMON             /INFOC/INFOT, NOUTC, OK, LERR
 *     .. Executable Statements ..
@@ -2031,7 +2039,7 @@ SUBROUTINE CCHKE( ISNUM, SRNAMT, NOUT )
       RBETA = TWO
 *
       GO TO ( 10, 20, 30, 40, 50, 60, 70, 80,
-     $        90 )ISNUM
+     $        90, 100 )ISNUM
    10 INFOT = 1
       CALL CGEMM( '/', 'N', 0, 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2212,7 +2220,7 @@ SUBROUTINE CCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 13
       CALL CGEMM( 'T', 'T', 2, 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 100
+      GO TO 110
    20 INFOT = 1
       CALL CHEMM( '/', 'U', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2279,7 +2287,7 @@ SUBROUTINE CCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 12
       CALL CHEMM( 'R', 'L', 2, 0, ALPHA, A, 1, B, 2, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 100
+      GO TO 110
    30 INFOT = 1
       CALL CSYMM( '/', 'U', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2346,7 +2354,7 @@ SUBROUTINE CCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 12
       CALL CSYMM( 'R', 'L', 2, 0, ALPHA, A, 1, B, 2, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 100
+      GO TO 110
    40 INFOT = 1
       CALL CTRMM( '/', 'U', 'N', 'N', 0, 0, ALPHA, A, 1, B, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2503,7 +2511,7 @@ SUBROUTINE CCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 11
       CALL CTRMM( 'R', 'L', 'T', 'N', 2, 0, ALPHA, A, 1, B, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 100
+      GO TO 110
    50 INFOT = 1
       CALL CTRSM( '/', 'U', 'N', 'N', 0, 0, ALPHA, A, 1, B, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2660,7 +2668,7 @@ SUBROUTINE CCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 11
       CALL CTRSM( 'R', 'L', 'T', 'N', 2, 0, ALPHA, A, 1, B, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 100
+      GO TO 110
    60 INFOT = 1
       CALL CHERK( '/', 'N', 0, 0, RALPHA, A, 1, RBETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2715,7 +2723,7 @@ SUBROUTINE CCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 10
       CALL CHERK( 'L', 'C', 2, 0, RALPHA, A, 1, RBETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 100
+      GO TO 110
    70 INFOT = 1
       CALL CSYRK( '/', 'N', 0, 0, ALPHA, A, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2770,7 +2778,7 @@ SUBROUTINE CCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 10
       CALL CSYRK( 'L', 'T', 2, 0, ALPHA, A, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 100
+      GO TO 110
    80 INFOT = 1
       CALL CHER2K( '/', 'N', 0, 0, ALPHA, A, 1, B, 1, RBETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2837,7 +2845,7 @@ SUBROUTINE CCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 12
       CALL CHER2K( 'L', 'C', 2, 0, ALPHA, A, 1, B, 1, RBETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 100
+      GO TO 110
    90 INFOT = 1
       CALL CSYR2K( '/', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2904,16 +2912,212 @@ SUBROUTINE CCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 12
       CALL CSYR2K( 'L', 'T', 2, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      GO TO 110
+  100 INFOT = 1
+      CALL CGEMMTR( '/', 'N', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 1
+      CALL CGEMMTR( '/', 'N', 'T', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 1
+      CALL CGEMMTR( '/', 'N', 'C', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 1
+      CALL CGEMMTR( '/', 'T', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 1
+      CALL CGEMMTR( '/', 'T', 'T', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 1
+      CALL CGEMMTR( '/', 'T', 'C', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 1
+      CALL CGEMMTR( '/', 'C', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 1
+      CALL CGEMMTR( '/', 'C', 'T', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 1
+      CALL CGEMMTR( '/', 'C', 'C', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+
+      INFOT = 2
+      CALL CGEMMTR( 'U', '/', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL CGEMMTR( 'U', '/', 'C', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL CGEMMTR( 'U', '/', 'T', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL CGEMMTR( 'L', '/', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL CGEMMTR( 'L', '/', 'C', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL CGEMMTR( 'L', '/', 'T', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+
+      INFOT = 3
+      CALL CGEMMTR( 'U', 'N', '/', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL CGEMMTR( 'U', 'C', '/', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL CGEMMTR( 'U', 'T', '/', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL CGEMMTR( 'U', 'N', 'N', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL CGEMMTR( 'U', 'N', 'C', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL CGEMMTR( 'U', 'N', 'T', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL CGEMMTR( 'U', 'C', 'N', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL CGEMMTR( 'U', 'C', 'C', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL CGEMMTR( 'U', 'C', 'T', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL CGEMMTR( 'U', 'T', 'N', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL CGEMMTR( 'U', 'T', 'C', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL CGEMMTR( 'U', 'T', 'T', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL CGEMMTR( 'U', 'N', 'N', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL CGEMMTR( 'U', 'N', 'C', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL CGEMMTR( 'U', 'N', 'T', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL CGEMMTR( 'U', 'C', 'N', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL CGEMMTR( 'U', 'C', 'C', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL CGEMMTR( 'U', 'C', 'T', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL CGEMMTR( 'U', 'T', 'N', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL CGEMMTR( 'U', 'T', 'C', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL CGEMMTR( 'U', 'T', 'T', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+
+      INFOT = 8
+      CALL CGEMMTR( 'U', 'N', 'N', 2, 0, ALPHA, A, 1, B, 1, BETA, C, 2 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL CGEMMTR( 'U', 'N', 'C', 2, 0, ALPHA, A, 1, B, 1, BETA, C, 2 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL CGEMMTR( 'U', 'N', 'T', 2, 0, ALPHA, A, 1, B, 1, BETA, C, 2 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL CGEMMTR( 'U', 'C', 'N', 0, 2, ALPHA, A, 1, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL CGEMMTR( 'U', 'C', 'C', 0, 2, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL CGEMMTR( 'U', 'C', 'T', 0, 2, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL CGEMMTR( 'U', 'T', 'N', 0, 2, ALPHA, A, 1, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL CGEMMTR( 'U', 'T', 'C', 0, 2, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL CGEMMTR( 'U', 'T', 'T', 0, 2, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+
+      INFOT = 10
+      CALL CGEMMTR( 'U', 'N', 'N', 0, 2, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL CGEMMTR( 'U', 'C', 'N', 0, 2, ALPHA, A, 2, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL CGEMMTR( 'U', 'T', 'N', 0, 2, ALPHA, A, 2, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL CGEMMTR( 'U', 'N', 'N', 2, 0, ALPHA, A, 2, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL CGEMMTR( 'U', 'N', 'C', 2, 0, ALPHA, A, 2, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL CGEMMTR( 'U', 'N', 'T', 2, 0, ALPHA, A, 2, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL CGEMMTR( 'U', 'C', 'N', 2, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL CGEMMTR( 'U', 'C', 'C', 2, 0, ALPHA, A, 1, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL CGEMMTR( 'U', 'C', 'T', 2, 0, ALPHA, A, 1, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL CGEMMTR( 'U', 'T', 'N', 2, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL CGEMMTR( 'U', 'T', 'C', 2, 0, ALPHA, A, 1, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL CGEMMTR( 'U', 'T', 'T', 2, 0, ALPHA, A, 1, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      GO TO 110
+
 *
-  100 IF( OK )THEN
+  110 IF( OK )THEN
          WRITE( NOUT, FMT = 9999 )SRNAMT
       ELSE
          WRITE( NOUT, FMT = 9998 )SRNAMT
       END IF
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE TESTS OF ERROR-EXITS' )
- 9998 FORMAT( ' ******* ', A6, ' FAILED THE TESTS OF ERROR-EXITS *****',
+ 9999 FORMAT( ' ', A7, ' PASSED THE TESTS OF ERROR-EXITS' )
+ 9998 FORMAT( ' ******* ', A7, ' FAILED THE TESTS OF ERROR-EXITS *****',
      $      '**' )
 *
 *     End of CCHKE
@@ -3416,7 +3620,7 @@ SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
 *     .. Scalar Arguments ..
       INTEGER            INFOT, NOUT
       LOGICAL            LERR, OK
-      CHARACTER*6        SRNAMT
+      CHARACTER*7        SRNAMT
 *     .. Executable Statements ..
       IF( .NOT.LERR )THEN
          WRITE( NOUT, FMT = 9999 )INFOT, SRNAMT
@@ -3426,7 +3630,7 @@ SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
       RETURN
 *
  9999 FORMAT( ' ***** ILLEGAL VALUE OF PARAMETER NUMBER ', I2, ' NOT D',
-     $      'ETECTED BY ', A6, ' *****' )
+     $      'ETECTED BY ', A7, ' *****' )
 *
 *     End of CHKXER
 *
@@ -3452,14 +3656,16 @@ SUBROUTINE XERBLA( SRNAME, INFO )
 *
 *     .. Scalar Arguments ..
       INTEGER            INFO
-      CHARACTER*6        SRNAME
+      CHARACTER*(*)      SRNAME
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUT
       LOGICAL            LERR, OK
-      CHARACTER*6        SRNAMT
+      CHARACTER*7        SRNAMT
 *     .. Common blocks ..
       COMMON             /INFOC/INFOT, NOUT, OK, LERR
       COMMON             /SRNAMC/SRNAMT
+*     .. Locals ..
+      INTEGER            SRLEN
 *     .. Executable Statements ..
       LERR = .TRUE.
       IF( INFO.NE.INFOT )THEN
@@ -3470,7 +3676,8 @@ SUBROUTINE XERBLA( SRNAME, INFO )
          END IF
          OK = .FALSE.
       END IF
-      IF( SRNAME.NE.SRNAMT )THEN
+      SRLEN = MIN(LEN_TRIM(SRNAME), LEN_TRIM(SRNAMT))
+      IF( SRNAME(1:SRLEN).NE.SRNAMT(1:SRLEN) )THEN
          WRITE( NOUT, FMT = 9998 )SRNAME, SRNAMT
          OK = .FALSE.
       END IF
@@ -3478,11 +3685,504 @@ SUBROUTINE XERBLA( SRNAME, INFO )
 *
  9999 FORMAT( ' ******* XERBLA WAS CALLED WITH INFO = ', I6, ' INSTEAD',
      $      ' OF ', I2, ' *******' )
- 9998 FORMAT( ' ******* XERBLA WAS CALLED WITH SRNAME = ', A6, ' INSTE',
-     $      'AD OF ', A6, ' *******' )
+ 9998 FORMAT( ' ******* XERBLA WAS CALLED WITH SRNAME = ', A7, ' INSTE',
+     $      'AD OF ', A7, ' *******' )
  9997 FORMAT( ' ******* XERBLA WAS CALLED WITH INFO = ', I6,
      $      ' *******' )
 *
 *     End of XERBLA
 *
       END
+
+      SUBROUTINE CCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
+     $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
+     $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G )
+*
+*  Tests CGEMMTR.
+*
+*  Auxiliary routine for test program for Level 3 Blas.
+*
+*  -- Written on 8-February-1989.
+*     Jack Dongarra, Argonne National Laboratory.
+*     Iain Duff, AERE Harwell.
+*     Jeremy Du Croz, Numerical Algorithms Group Ltd.
+*     Sven Hammarling, Numerical Algorithms Group Ltd.
+*
+*     .. Parameters ..
+      COMPLEX            ZERO
+      PARAMETER          ( ZERO = ( 0.0, 0.0 ) )
+      REAL               RZERO
+      PARAMETER          ( RZERO = 0.0 )
+*     .. Scalar Arguments ..
+      REAL               EPS, THRESH
+      INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
+      LOGICAL            FATAL, REWI, TRACE
+      CHARACTER*7        SNAME
+*     .. Array Arguments ..
+      COMPLEX            A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
+     $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
+     $                   BB( NMAX*NMAX ), BET( NBET ), BS( NMAX*NMAX ),
+     $                   C( NMAX, NMAX ), CC( NMAX*NMAX ),
+     $                   CS( NMAX*NMAX ), CT( NMAX )
+      REAL               G( NMAX )
+      INTEGER            IDIM( NIDIM )
+*     .. Local Scalars ..
+      COMPLEX            ALPHA, ALS, BETA, BLS
+      REAL               ERR, ERRMAX
+      INTEGER            I, IA, IB, ICA, ICB, IK, IN, K, KS, LAA,
+     $                   LBB, LCC, LDA, LDAS, LDB, LDBS, LDC, LDCS,
+     $                   MA, MB,  N, NA, NARGS, NB, NC, NS, IS
+      LOGICAL            NULL, RESET, SAME, TRANA, TRANB
+      CHARACTER*1        TRANAS, TRANBS, TRANSA, TRANSB, UPLO, UPLOS
+      CHARACTER*3        ICH
+      CHARACTER*2        ISHAPE
+*     .. Local Arrays ..
+      LOGICAL            ISAME( 13 )
+*     .. External Functions ..
+      LOGICAL            LCE, LCERES
+      EXTERNAL           LCE, LCERES
+*     .. External Subroutines ..
+      EXTERNAL           CGEMMTR, CMAKE, CMMTCH
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX
+*     .. Scalars in Common ..
+      INTEGER            INFOT, NOUTC
+      LOGICAL            LERR, OK
+*     .. Common blocks ..
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
+*     .. Data statements ..
+      DATA               ICH/'NTC'/
+      DATA               ISHAPE/'UL'/
+
+*     .. Executable Statements ..
+*
+      NARGS = 13
+      NC = 0
+      RESET = .TRUE.
+      ERRMAX = RZERO
+*
+      DO 100 IN = 1, NIDIM
+         N = IDIM( IN )
+*        Set LDC to 1 more than minimum value if room.
+         LDC = N
+         IF( LDC.LT.NMAX )
+     $      LDC = LDC + 1
+*        Skip tests if not enough room.
+         IF( LDC.GT.NMAX )
+     $      GO TO 100
+         LCC = LDC*N
+         NULL = N.LE.0
+*
+         DO 90 IK = 1, NIDIM
+            K = IDIM( IK )
+*
+            DO 80 ICA = 1, 3
+               TRANSA = ICH( ICA: ICA )
+               TRANA = TRANSA.EQ.'T'.OR.TRANSA.EQ.'C'
+*
+               IF( TRANA )THEN
+                  MA = K
+                  NA = N
+               ELSE
+                  MA = N
+                  NA = K
+               END IF
+*              Set LDA to 1 more than minimum value if room.
+               LDA = MA
+               IF( LDA.LT.NMAX )
+     $            LDA = LDA + 1
+*              Skip tests if not enough room.
+               IF( LDA.GT.NMAX )
+     $            GO TO 80
+               LAA = LDA*NA
+*
+*              Generate the matrix A.
+*
+               CALL CMAKE( 'GE', ' ', ' ', MA, NA, A, NMAX, AA, LDA,
+     $                     RESET, ZERO )
+*
+               DO 70 ICB = 1, 3
+                  TRANSB = ICH( ICB: ICB )
+                  TRANB = TRANSB.EQ.'T'.OR.TRANSB.EQ.'C'
+*
+                  IF( TRANB )THEN
+                     MB = N
+                     NB = K
+                  ELSE
+                     MB = K
+                     NB = N
+                  END IF
+*                 Set LDB to 1 more than minimum value if room.
+                  LDB = MB
+                  IF( LDB.LT.NMAX )
+     $               LDB = LDB + 1
+*                 Skip tests if not enough room.
+                  IF( LDB.GT.NMAX )
+     $               GO TO 70
+                  LBB = LDB*NB
+*
+*                 Generate the matrix B.
+*
+                  CALL CMAKE( 'GE', ' ', ' ', MB, NB, B, NMAX, BB,
+     $                        LDB, RESET, ZERO )
+*
+                  DO 60 IA = 1, NALF
+                     ALPHA = ALF( IA )
+*
+                     DO 50 IB = 1, NBET
+                        BETA = BET( IB )
+                        DO 45 IS = 1, 2
+                           UPLO = ISHAPE( IS: IS )
+
+*
+*                          Generate the matrix C.
+*
+                           CALL CMAKE( 'GE', UPLO, ' ', N, N, C, NMAX,
+     $                                 CC, LDC, RESET, ZERO )
+*
+                           NC = NC + 1
+*
+*                          Save every datum before calling the
+*                          subroutine.
+*
+                           UPLOS = UPLO
+                           TRANAS = TRANSA
+                           TRANBS = TRANSB
+                           NS = N
+                           KS = K
+                           ALS = ALPHA
+                           DO 10 I = 1, LAA
+                              AS( I ) = AA( I )
+   10                      CONTINUE
+                           LDAS = LDA
+                           DO 20 I = 1, LBB
+                              BS( I ) = BB( I )
+   20                      CONTINUE
+                           LDBS = LDB
+                           BLS = BETA
+                           DO 30 I = 1, LCC
+                              CS( I ) = CC( I )
+   30                      CONTINUE
+                           LDCS = LDC
+*
+*                          Call the subroutine.
+*
+                           IF( TRACE )
+     $                        WRITE( NTRA, FMT = 9995 )NC, SNAME, UPLO,
+     $                        TRANSA, TRANSB, N, K, ALPHA, LDA, LDB,
+     $                        BETA, LDC
+                           IF( REWI )
+     $                        REWIND NTRA
+                           CALL CGEMMTR( UPLO, TRANSA, TRANSB, N, K,
+     $                                 ALPHA, AA, LDA, BB, LDB, BETA,
+     $                                 CC, LDC )
+*
+*                          Check if error-exit was taken incorrectly.
+*
+                           IF( .NOT.OK )THEN
+                              WRITE( NOUT, FMT = 9994 )
+                              FATAL = .TRUE.
+                              GO TO 120
+                           END IF
+*
+*                          See what data changed inside subroutines.
+*
+                           ISAME( 1 ) = UPLOS.EQ.UPLO
+                           ISAME( 2 ) = TRANSA.EQ.TRANAS
+                           ISAME( 3 ) = TRANSB.EQ.TRANBS
+                           ISAME( 4 ) = NS.EQ.N
+                           ISAME( 5 ) = KS.EQ.K
+                           ISAME( 6 ) = ALS.EQ.ALPHA
+                           ISAME( 7 ) = LCE( AS, AA, LAA )
+                           ISAME( 8 ) = LDAS.EQ.LDA
+                           ISAME( 9 ) = LCE( BS, BB, LBB )
+                           ISAME( 10 ) = LDBS.EQ.LDB
+                           ISAME( 11 ) = BLS.EQ.BETA
+                           IF( NULL )THEN
+                              ISAME( 12 ) = LCE( CS, CC, LCC )
+                           ELSE
+                              ISAME( 12 ) = LCERES( 'GE', ' ', N, N, CS,
+     $                                      CC, LDC )
+                           END IF
+                           ISAME( 13 ) = LDCS.EQ.LDC
+*
+*                          If data was incorrectly changed, report
+*                          and return.
+*
+                           SAME = .TRUE.
+                           DO 40 I = 1, NARGS
+                              SAME = SAME.AND.ISAME( I )
+                              IF( .NOT.ISAME( I ) )
+     $                           WRITE( NOUT, FMT = 9998 )I
+   40                      CONTINUE
+                           IF( .NOT.SAME )THEN
+                              FATAL = .TRUE.
+                              GO TO 120
+                           END IF
+*
+                           IF( .NOT.NULL )THEN
+*
+*                             Check the result.
+*
+                              CALL CMMTCH( UPLO, TRANSA, TRANSB, N,
+     $                                    K, ALPHA, A, NMAX, B, NMAX,
+     $                                    BETA, C, NMAX, CT, G, CC, LDC,
+     $                                    EPS, ERR, FATAL, NOUT, .TRUE.)
+                              ERRMAX = MAX( ERRMAX, ERR )
+*                             If got really bad answer, report and
+*                             return.
+                              IF( FATAL )
+     $                           GO TO 120
+                           END IF
+   45                   CONTINUE
+*
+   50                CONTINUE
+*
+   60             CONTINUE
+*
+   70          CONTINUE
+*
+   80       CONTINUE
+*
+   90    CONTINUE
+*
+  100 CONTINUE
+*
+*
+*     Report result.
+*
+      IF( ERRMAX.LT.THRESH )THEN
+         WRITE( NOUT, FMT = 9999 )SNAME, NC
+      ELSE
+         WRITE( NOUT, FMT = 9997 )SNAME, NC, ERRMAX
+      END IF
+      GO TO 130
+*
+  120 CONTINUE
+      WRITE( NOUT, FMT = 9996 )SNAME
+      WRITE( NOUT, FMT = 9995 )NC, SNAME, UPLO, TRANSA, TRANSB, N, K,
+     $   ALPHA, LDA, LDB, BETA, LDC
+*
+  130 CONTINUE
+      RETURN
+*
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+     $      'S)' )
+ 9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
+     $      'ANGED INCORRECTLY *******' )
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+     $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
+     $      ' - SUSPECT *******' )
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A7, '(''',A1, ''',''',A1, ''',''', A1,''',',
+     $      2( I3, ',' ), '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3,
+     $      ',(', F4.1, ',', F4.1, '), C,', I3, ').' )
+ 9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
+     $      '******' )
+*
+*     End of CCHK6
+*
+      END
+
+      SUBROUTINE CMMTCH( UPLO, TRANSA, TRANSB, N, KK, ALPHA, A, LDA,
+     $                  B, LDB, BETA, C, LDC, CT, G, CC, LDCC, EPS, ERR,
+     $                  FATAL, NOUT, MV )
+      IMPLICIT NONE
+*
+*  Checks the results of the computational tests.
+*
+*  Auxiliary routine for test program for Level 3 Blas.
+*
+*  -- Written on 8-February-1989.
+*     Jack Dongarra, Argonne National Laboratory.
+*     Iain Duff, AERE Harwell.
+*     Jeremy Du Croz, Numerical Algorithms Group Ltd.
+*     Sven Hammarling, Numerical Algorithms Group Ltd.
+*
+*     .. Parameters ..
+      COMPLEX            ZERO
+      PARAMETER          ( ZERO = ( 0.0, 0.0 ) )
+      REAL               RZERO, RONE
+      PARAMETER          ( RZERO = 0.0, RONE = 1.0 )
+*     .. Scalar Arguments ..
+      COMPLEX            ALPHA, BETA
+      REAL               EPS, ERR
+      INTEGER            KK, LDA, LDB, LDC, LDCC, N, NOUT
+      LOGICAL            FATAL, MV
+      CHARACTER*1        TRANSA, TRANSB, UPLO
+*     .. Array Arguments ..
+      COMPLEX            A( LDA, * ), B( LDB, * ), C( LDC, * ),
+     $                   CC( LDCC, * ), CT( * )
+      REAL               G( * )
+*     .. Local Scalars ..
+      COMPLEX            CL
+      REAL               ERRI
+      INTEGER            I, J, K, ISTART, ISTOP
+      LOGICAL            CTRANA, CTRANB, TRANA, TRANB, UPPER
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, AIMAG, CONJG, MAX, REAL, SQRT
+*     .. Statement Functions ..
+      REAL               ABS1
+*     .. Statement Function definitions ..
+      ABS1( CL ) = ABS( REAL( CL ) ) + ABS( AIMAG( CL ) )
+*     .. Executable Statements ..
+      UPPER = UPLO.EQ.'U'
+      TRANA = TRANSA.EQ.'T'.OR.TRANSA.EQ.'C'
+      TRANB = TRANSB.EQ.'T'.OR.TRANSB.EQ.'C'
+      CTRANA = TRANSA.EQ.'C'
+      CTRANB = TRANSB.EQ.'C'
+*
+*     Compute expected result, one column at a time, in CT using data
+*     in A, B and C.
+*     Compute gauges in G.
+*
+      ISTART = 1
+      ISTOP  = 1
+
+      DO 220 J = 1, N
+*
+         IF ( UPPER ) THEN
+             ISTART = 1
+             ISTOP = J
+         ELSE
+             ISTART = J
+             ISTOP = N
+         END IF
+
+         DO 10 I = ISTART, ISTOP
+            CT( I ) = ZERO
+            G( I ) = RZERO
+   10    CONTINUE
+         IF( .NOT.TRANA.AND..NOT.TRANB )THEN
+            DO 30 K = 1, KK
+               DO 20 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( I, K )*B( K, J )
+                  G( I ) = G( I ) + ABS1( A( I, K ) )*ABS1( B( K, J ) )
+   20          CONTINUE
+   30       CONTINUE
+         ELSE IF( TRANA.AND..NOT.TRANB )THEN
+            IF( CTRANA )THEN
+               DO 50 K = 1, KK
+                  DO 40 I = ISTART, ISTOP
+                     CT( I ) = CT( I ) + CONJG( A( K, I ) )*B( K, J )
+                     G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                        ABS1( B( K, J ) )
+   40             CONTINUE
+   50          CONTINUE
+            ELSE
+               DO 70 K = 1, KK
+                  DO 60 I = ISTART, ISTOP
+                     CT( I ) = CT( I ) + A( K, I )*B( K, J )
+                     G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                        ABS1( B( K, J ) )
+   60             CONTINUE
+   70          CONTINUE
+            END IF
+         ELSE IF( .NOT.TRANA.AND.TRANB )THEN
+            IF( CTRANB )THEN
+               DO 90 K = 1, KK
+                  DO 80 I = ISTART, ISTOP
+                     CT( I ) = CT( I ) + A( I, K )*CONJG( B( J, K ) )
+                     G( I ) = G( I ) + ABS1( A( I, K ) )*
+     $                        ABS1( B( J, K ) )
+   80             CONTINUE
+   90          CONTINUE
+            ELSE
+               DO 110 K = 1, KK
+                  DO 100 I = ISTART, ISTOP
+                     CT( I ) = CT( I ) + A( I, K )*B( J, K )
+                     G( I ) = G( I ) + ABS1( A( I, K ) )*
+     $                        ABS1( B( J, K ) )
+  100             CONTINUE
+  110          CONTINUE
+            END IF
+         ELSE IF( TRANA.AND.TRANB )THEN
+            IF( CTRANA )THEN
+               IF( CTRANB )THEN
+                  DO 130 K = 1, KK
+                     DO 120 I = ISTART, ISTOP
+                        CT( I ) = CT( I ) + CONJG( A( K, I ) )*
+     $                            CONJG( B( J, K ) )
+                        G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                           ABS1( B( J, K ) )
+  120                CONTINUE
+  130             CONTINUE
+               ELSE
+                  DO 150 K = 1, KK
+                     DO 140 I = ISTART, ISTOP
+                        CT( I ) = CT( I ) + CONJG( A( K, I ) )*B( J, K )
+                        G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                           ABS1( B( J, K ) )
+  140                CONTINUE
+  150             CONTINUE
+               END IF
+            ELSE
+               IF( CTRANB )THEN
+                  DO 170 K = 1, KK
+                     DO 160 I = ISTART, ISTOP
+                        CT( I ) = CT( I ) + A( K, I )*CONJG( B( J, K ) )
+                        G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                           ABS1( B( J, K ) )
+  160                CONTINUE
+  170             CONTINUE
+               ELSE
+                  DO 190 K = 1, KK
+                     DO 180 I = ISTART, ISTOP
+                        CT( I ) = CT( I ) + A( K, I )*B( J, K )
+                        G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                           ABS1( B( J, K ) )
+  180                CONTINUE
+  190             CONTINUE
+               END IF
+            END IF
+         END IF
+         DO 200 I = ISTART, ISTOP
+            CT( I ) = ALPHA*CT( I ) + BETA*C( I, J )
+            G( I ) = ABS1( ALPHA )*G( I ) +
+     $               ABS1( BETA )*ABS1( C( I, J ) )
+  200    CONTINUE
+*
+*        Compute the error ratio for this result.
+*
+         ERR = ZERO
+         DO 210 I = ISTART, ISTOP
+            ERRI = ABS1( CT( I ) - CC( I, J ) )/EPS
+            IF( G( I ).NE.RZERO )
+     $         ERRI = ERRI/G( I )
+            ERR = MAX( ERR, ERRI )
+            IF( ERR*SQRT( EPS ).GE.RONE )
+     $         GO TO 230
+  210    CONTINUE
+*
+  220 CONTINUE
+*
+*     If the loop completes, all results are at least half accurate.
+      GO TO 250
+*
+*     Report fatal error.
+*
+  230 FATAL = .TRUE.
+      WRITE( NOUT, FMT = 9999 )
+      DO 240 I = ISTART, ISTOP
+         IF( MV )THEN
+            WRITE( NOUT, FMT = 9998 )I, CT( I ), CC( I, J )
+         ELSE
+            WRITE( NOUT, FMT = 9998 )I, CC( I, J ), CT( I )
+         END IF
+  240 CONTINUE
+      IF( N.GT.1 )
+     $   WRITE( NOUT, FMT = 9997 )J
+*
+  250 CONTINUE
+      RETURN
+*
+ 9999 FORMAT( ' ******* FATAL ERROR - COMPUTED RESULT IS LESS THAN HAL',
+     $      'F ACCURATE *******', /'                       EXPECTED RE',
+     $      'SULT                    COMPUTED RESULT' )
+ 9998 FORMAT( 1X, I7, 2( '  (', G15.6, ',', G15.6, ')' ) )
+ 9997 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
+*
+*     End of CMMTCH
+*
+      END
+
diff --git a/BLAS/TESTING/cblat3.in b/BLAS/TESTING/cblat3.in
index f1480557a1..701180f550 100644
--- a/BLAS/TESTING/cblat3.in
+++ b/BLAS/TESTING/cblat3.in
@@ -12,12 +12,13 @@ T        LOGICAL FLAG, T TO TEST ERROR EXITS.
 (0.0,0.0) (1.0,0.0) (0.7,-0.9)       VALUES OF ALPHA
 3                 NUMBER OF VALUES OF BETA
 (0.0,0.0) (1.0,0.0) (1.3,-1.1)       VALUES OF BETA
-CGEMM  T PUT F FOR NO TEST. SAME COLUMNS.
-CHEMM  T PUT F FOR NO TEST. SAME COLUMNS.
-CSYMM  T PUT F FOR NO TEST. SAME COLUMNS.
-CTRMM  T PUT F FOR NO TEST. SAME COLUMNS.
-CTRSM  T PUT F FOR NO TEST. SAME COLUMNS.
-CHERK  T PUT F FOR NO TEST. SAME COLUMNS.
-CSYRK  T PUT F FOR NO TEST. SAME COLUMNS.
-CHER2K T PUT F FOR NO TEST. SAME COLUMNS.
-CSYR2K T PUT F FOR NO TEST. SAME COLUMNS.
+CGEMM   T PUT F FOR NO TEST. SAME COLUMNS.
+CHEMM   T PUT F FOR NO TEST. SAME COLUMNS.
+CSYMM   T PUT F FOR NO TEST. SAME COLUMNS.
+CTRMM   T PUT F FOR NO TEST. SAME COLUMNS.
+CTRSM   T PUT F FOR NO TEST. SAME COLUMNS.
+CHERK   T PUT F FOR NO TEST. SAME COLUMNS.
+CSYRK   T PUT F FOR NO TEST. SAME COLUMNS.
+CHER2K  T PUT F FOR NO TEST. SAME COLUMNS.
+CSYR2K  T PUT F FOR NO TEST. SAME COLUMNS.
+CGEMMTR T PUT F FOR NO TEST. SAME COLUMNS.
diff --git a/BLAS/TESTING/dblat1.f b/BLAS/TESTING/dblat1.f
index 9a27a249b2..cb46217766 100644
--- a/BLAS/TESTING/dblat1.f
+++ b/BLAS/TESTING/dblat1.f
@@ -34,6 +34,7 @@
 *
 *  =====================================================================
       PROGRAM DBLAT1
+      IMPLICIT NONE
 *
 *  -- Reference BLAS test routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -58,7 +59,7 @@ PROGRAM DBLAT1
       DATA             SFAC/9.765625D-4/
 *     .. Executable Statements ..
       WRITE (NOUT,99999)
-      DO 20 IC = 1, 13
+      DO 20 IC = 1, 14
          ICASE = IC
          CALL HEADER
 *
@@ -76,7 +77,8 @@ PROGRAM DBLAT1
      +            ICASE.EQ.10) THEN
             CALL CHECK1(SFAC)
          ELSE IF (ICASE.EQ.1 .OR. ICASE.EQ.2 .OR. ICASE.EQ.5 .OR.
-     +            ICASE.EQ.6 .OR. ICASE.EQ.12 .OR. ICASE.EQ.13) THEN
+     +            ICASE.EQ.6 .OR. ICASE.EQ.12 .OR. ICASE.EQ.13 .OR.
+     +            ICASE.EQ.14 ) THEN
             CALL CHECK2(SFAC)
          ELSE IF (ICASE.EQ.4) THEN
             CALL CHECK3(SFAC)
@@ -100,7 +102,7 @@ SUBROUTINE HEADER
       INTEGER          ICASE, INCX, INCY, N
       LOGICAL          PASS
 *     .. Local Arrays ..
-      CHARACTER*6      L(13)
+      CHARACTER*6      L(14)
 *     .. Common blocks ..
       COMMON           /COMBLA/ICASE, N, INCX, INCY, PASS
 *     .. Data statements ..
@@ -117,6 +119,8 @@ SUBROUTINE HEADER
       DATA             L(11)/'DROTMG'/
       DATA             L(12)/'DROTM '/
       DATA             L(13)/'DSDOT '/
+      DATA             L(14)/'DAXPBY'/
+
 *     .. Executable Statements ..
       WRITE (NOUT,99999) ICASE, L(ICASE)
       RETURN
@@ -127,6 +131,7 @@ SUBROUTINE HEADER
 *
       END
       SUBROUTINE CHECK0(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
       PARAMETER         (NOUT=6)
@@ -246,9 +251,11 @@ SUBROUTINE CHECK0(SFAC)
 *
       END
       SUBROUTINE CHECK1(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
+      DOUBLE PRECISION  THRESH
       INTEGER           NOUT
-      PARAMETER         (NOUT=6)
+      PARAMETER         (NOUT=6, THRESH=10.0D0)
 *     .. Scalar Arguments ..
       DOUBLE PRECISION  SFAC
 *     .. Scalars in Common ..
@@ -266,7 +273,7 @@ SUBROUTINE CHECK1(SFAC)
       INTEGER           IDAMAX
       EXTERNAL          DASUM, DNRM2, IDAMAX
 *     .. External Subroutines ..
-      EXTERNAL          ITEST1, DSCAL, STEST, STEST1
+      EXTERNAL          ITEST1, DB1NRM2, DSCAL, STEST, STEST1
 *     .. Intrinsic Functions ..
       INTRINSIC         MAX
 *     .. Common blocks ..
@@ -319,6 +326,10 @@ SUBROUTINE CHECK1(SFAC)
 *
             IF (ICASE.EQ.7) THEN
 *              .. DNRM2 ..
+*              Test scaling when some entries are tiny or huge
+               CALL DB1NRM2(N,(INCX-2)*2,THRESH)
+               CALL DB1NRM2(N,INCX,THRESH)
+*              Test with hardcoded mid range entries
                STEMP(1) = DTRUE1(NP1)
                CALL STEST1(DNRM2(N,SX,INCX),STEMP(1),STEMP,SFAC)
             ELSE IF (ICASE.EQ.8) THEN
@@ -360,6 +371,7 @@ SUBROUTINE CHECK1(SFAC)
 *
       END
       SUBROUTINE CHECK2(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
       PARAMETER         (NOUT=6)
@@ -369,7 +381,7 @@ SUBROUTINE CHECK2(SFAC)
       INTEGER           ICASE, INCX, INCY, N
       LOGICAL           PASS
 *     .. Local Scalars ..
-      DOUBLE PRECISION  SA
+      DOUBLE PRECISION  SA, SB
       INTEGER           I, J, KI, KN, KNI, KPAR, KSIZE, LENX, LENY,
      $                  LINCX, LINCY, MX, MY
 *     .. Local Arrays ..
@@ -381,14 +393,14 @@ SUBROUTINE CHECK2(SFAC)
      $                  DT19XB(7,4,4), DT19XC(7,4,4),DT19XD(7,4,4),
      $                  DT19Y(7,4,16), DT19YA(7,4,4),DT19YB(7,4,4),
      $                  DT19YC(7,4,4), DT19YD(7,4,4), DTEMP(5),
-     $                  STY0(1), SX0(1), SY0(1)
+     $                  STY0(1), SX0(1), SY0(1), DT20(7,4,4)
       INTEGER           INCXS(4), INCYS(4), LENS(4,2), NS(4)
 *     .. External Functions ..
       DOUBLE PRECISION  DDOT, DSDOT
       EXTERNAL          DDOT, DSDOT
 *     .. External Subroutines ..
-      EXTERNAL          DAXPY, DCOPY, DROTM, DSWAP, STEST, STEST1,
-     $                  TESTDSDOT
+      EXTERNAL          DAXPY, DAXPBY, DCOPY, DROTM, DSWAP, STEST,
+     $                  STEST1, TESTDSDOT
 *     .. Intrinsic Functions ..
       INTRINSIC         ABS, MIN
 *     .. Common blocks ..
@@ -402,6 +414,7 @@ SUBROUTINE CHECK2(SFAC)
      B   (DT19Y(1,1,13),DT19YD(1,1,1))
 
       DATA              SA/0.3D0/
+      DATA              SB/0.5D0/
       DATA              INCXS/1, 2, -2, -1/
       DATA              INCYS/1, -2, 1, -2/
       DATA              LENS/1, 1, 2, 4, 1, 1, 3, 7/
@@ -617,6 +630,27 @@ SUBROUTINE CHECK2(SFAC)
      M            .7D0,  -.9D0,  1.2D0,   .7D0, -1.5D0,   .2D0,  1.6D0,
      N           1.7D0,  -.9D0,   .5D0,   .7D0, -1.6D0,   .2D0,  2.4D0,
      O          -2.6D0,  -.9D0, -1.3D0,   .7D0,  2.9D0,   .2D0, -4.0D0 /
+      DATA              DT20/0.5D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0,
+     +                  0.0D0, 0.43D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0,
+     +                  0.0D0, 0.0D0, 0.43D0, -0.42D0, 0.0D0, 0.0D0,
+     +                  0.0D0, 0.0D0, 0.0D0, 0.43D0, -0.42D0, 0.0D0,
+     +                  0.59D0, 0.0D0, 0.0D0, 0.0D0, 0.5D0, 0.0D0,
+     +                  0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.43D0,
+     +                  0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0,
+     +                  0.1D0, -0.9D0, 0.33D0, 0.0D0, 0.0D0, 0.0D0,
+     +                  0.0D0, 0.13D0, -0.9D0, 0.42D0, 0.7D0, -0.45D0,
+     +                  0.2D0, 0.58D0, 0.5D0, 0.0D0, 0.0D0, 0.0D0,
+     +                  0.0D0, 0.0D0, 0.0D0, 0.43D0, 0.0D0, 0.0D0,
+     +                  0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.1D0, -0.27D0,
+     +                  0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.13D0,
+     +                  -0.18D0, 0.00D0, 0.53D0, 0.0D0, 0.0D0, 0.0D0,
+     +                  0.5D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0,
+     +                  0.43D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0,
+     +                  0.0D0, 0.43D0, -0.9D0, 0.18D0, 0.0D0, 0.0D0,
+     +                  0.0D0, 0.0D0, 0.43D0, -0.9D0, 0.18D0, 0.7D0,
+     +                  -0.45D0, 0.2D0, 0.64D0/
+
+
 *
 *     .. Executable Statements ..
 *
@@ -648,6 +682,14 @@ SUBROUTINE CHECK2(SFAC)
                   STY(J) = DT8(J,KN,KI)
    40          CONTINUE
                CALL STEST(LENY,SY,STY,SSIZE2(1,KSIZE),SFAC)
+            ELSE IF (ICASE.EQ.14) THEN
+*              .. DAXPBY ..
+               CALL DAXPBY(N,SA,SX,INCX,SB,SY,INCY)
+               DO 50 J = 1, LENY
+                  STY(J) = DT20(J,KN,KI)
+   50          CONTINUE
+               CALL STEST(LENY,SY,STY,SSIZE2(1,KSIZE),SFAC)
+
             ELSE IF (ICASE.EQ.5) THEN
 *              .. DCOPY ..
                DO 60 I = 1, 7
@@ -726,6 +768,7 @@ SUBROUTINE CHECK2(SFAC)
 *
       END
       SUBROUTINE CHECK3(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
       PARAMETER         (NOUT=6)
@@ -935,6 +978,7 @@ SUBROUTINE CHECK3(SFAC)
 *
       END
       SUBROUTINE STEST(LEN,SCOMP,STRUE,SSIZE,SFAC)
+      IMPLICIT NONE
 *     ********************************* STEST **************************
 *
 *     THIS SUBR COMPARES ARRAYS  SCOMP() AND STRUE() OF LENGTH LEN TO
@@ -994,6 +1038,7 @@ SUBROUTINE STEST(LEN,SCOMP,STRUE,SSIZE,SFAC)
 *
       END
       SUBROUTINE TESTDSDOT(SCOMP,STRUE,SSIZE,SFAC)
+      IMPLICIT NONE
 *     ********************************* STEST **************************
 *
 *     THIS SUBR COMPARES ARRAYS  SCOMP() AND STRUE() OF LENGTH LEN TO
@@ -1045,6 +1090,7 @@ SUBROUTINE TESTDSDOT(SCOMP,STRUE,SSIZE,SFAC)
 *
       END
       SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
+      IMPLICIT NONE
 *     ************************* STEST1 *****************************
 *
 *     THIS IS AN INTERFACE SUBROUTINE TO ACCOMMODATE THE FORTRAN
@@ -1073,6 +1119,7 @@ SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
 *
       END
       DOUBLE PRECISION FUNCTION SDIFF(SA,SB)
+      IMPLICIT NONE
 *     ********************************* SDIFF **************************
 *     COMPUTES DIFFERENCE OF TWO NUMBERS.  C. L. LAWSON, JPL 1974 FEB 15
 *
@@ -1086,6 +1133,7 @@ DOUBLE PRECISION FUNCTION SDIFF(SA,SB)
 *
       END
       SUBROUTINE ITEST1(ICOMP,ITRUE)
+      IMPLICIT NONE
 *     ********************************* ITEST1 *************************
 *
 *     THIS SUBROUTINE COMPARES THE VARIABLES ICOMP AND ITRUE FOR
@@ -1129,3 +1177,219 @@ SUBROUTINE ITEST1(ICOMP,ITRUE)
 *     End of ITEST1
 *
       END
+      SUBROUTINE DB1NRM2(N,INCX,THRESH)
+      IMPLICIT NONE
+*     Compare NRM2 with a reference computation using combinations
+*     of the following values:
+*
+*     0, very small, small, ulp, 1, 1/ulp, big, very big, infinity, NaN
+*
+*     one of these values is used to initialize x(1) and x(2:N) is
+*     filled with random values from [-1,1] scaled by another of
+*     these values.
+*
+*     This routine is adapted from the test suite provided by
+*     Anderson E. (2017)
+*     Algorithm 978: Safe Scaling in the Level 1 BLAS
+*     ACM Trans Math Softw 44:1--28
+*     https://doi.org/10.1145/3061665
+*
+*     .. Scalar Arguments ..
+      INTEGER           INCX, N
+      DOUBLE PRECISION  THRESH
+*
+*  =====================================================================
+*     .. Parameters ..
+      INTEGER           NMAX, NOUT, NV
+      PARAMETER         (NMAX=20, NOUT=6, NV=10)
+      DOUBLE PRECISION  HALF, ONE, TWO, ZERO
+      PARAMETER         (HALF=0.5D+0, ONE=1.0D+0, TWO= 2.0D+0,
+     &                  ZERO=0.0D+0)
+*     .. External Functions ..
+      DOUBLE PRECISION  DNRM2
+      EXTERNAL          DNRM2
+*     .. Intrinsic Functions ..
+      INTRINSIC         ABS, DBLE, MAX, MIN, SQRT
+*     .. Model parameters ..
+      DOUBLE PRECISION  BIGNUM, SAFMAX, SAFMIN, SMLNUM, ULP
+      PARAMETER         (BIGNUM=0.99792015476735990583D+292,
+     &                  SAFMAX=0.44942328371557897693D+308,
+     &                  SAFMIN=0.22250738585072013831D-307,
+     &                  SMLNUM=0.10020841800044863890D-291,
+     &                  ULP=0.22204460492503130808D-015)
+*     .. Local Scalars ..
+      DOUBLE PRECISION  ROGUE, SNRM, TRAT, V0, V1, WORKSSQ, Y1, Y2,
+     &                  YMAX, YMIN, YNRM, ZNRM
+      INTEGER           I, IV, IW, IX
+      LOGICAL           FIRST
+*     .. Local Arrays ..
+      DOUBLE PRECISION  VALUES(NV), WORK(NMAX), X(NMAX), Z(NMAX)
+*     .. Executable Statements ..
+      VALUES(1) = ZERO
+      VALUES(2) = TWO*SAFMIN
+      VALUES(3) = SMLNUM
+      VALUES(4) = ULP
+      VALUES(5) = ONE
+      VALUES(6) = ONE / ULP
+      VALUES(7) = BIGNUM
+      VALUES(8) = SAFMAX
+      VALUES(9) = DXVALS(V0,2)
+      VALUES(10) = DXVALS(V0,3)
+      ROGUE = -1234.5678D+0
+      FIRST = .TRUE.
+*
+*     Check that the arrays are large enough
+*
+      IF (N*ABS(INCX).GT.NMAX) THEN
+         WRITE (NOUT,99) "DNRM2", NMAX, INCX, N, N*ABS(INCX)
+         RETURN
+      END IF
+*
+*     Zero-sized inputs are tested in STEST1.
+      IF (N.LE.0) THEN
+         RETURN
+      END IF
+*
+*     Generate (N-1) values in (-1,1).
+*
+      DO I = 2, N
+         CALL RANDOM_NUMBER(WORK(I))
+         WORK(I) = ONE - TWO*WORK(I)
+      END DO
+*
+*     Compute the sum of squares of the random values
+*     by an unscaled algorithm.
+*
+      WORKSSQ = ZERO
+      DO I = 2, N
+         WORKSSQ = WORKSSQ + WORK(I)*WORK(I)
+      END DO
+*
+*     Construct the test vector with one known value
+*     and the rest from the random work array multiplied
+*     by a scaling factor.
+*
+      DO IV = 1, NV
+         V0 = VALUES(IV)
+         IF (ABS(V0).GT.ONE) THEN
+            V0 = V0*HALF
+         END IF
+         Z(1) = V0
+         DO IW = 1, NV
+            V1 = VALUES(IW)
+            IF (ABS(V1).GT.ONE) THEN
+               V1 = (V1*HALF) / SQRT(DBLE(N))
+            END IF
+            DO I = 2, N
+               Z(I) = V1*WORK(I)
+            END DO
+*
+*           Compute the expected value of the 2-norm
+*
+            Y1 = ABS(V0)
+            IF (N.GT.1) THEN
+               Y2 = ABS(V1)*SQRT(WORKSSQ)
+            ELSE
+               Y2 = ZERO
+            END IF
+            YMIN = MIN(Y1, Y2)
+            YMAX = MAX(Y1, Y2)
+*
+*           Expected value is NaN if either is NaN. The test
+*           for YMIN == YMAX avoids further computation if both
+*           are infinity.
+*
+            IF ((Y1.NE.Y1).OR.(Y2.NE.Y2)) THEN
+*              Add to propagate NaN
+               YNRM = Y1 + Y2
+            ELSE IF (YMAX == ZERO) THEN
+               YNRM = ZERO
+            ELSE IF (YMIN == YMAX) THEN
+               YNRM = SQRT(TWO)*YMAX
+            ELSE
+               YNRM = YMAX*SQRT(ONE + (YMIN / YMAX)**2)
+            END IF
+*
+*           Fill the input array to DNRM2 with steps of incx
+*
+            DO I = 1, N
+               X(I) = ROGUE
+            END DO
+            IX = 1
+            IF (INCX.LT.0) IX = 1 - (N-1)*INCX
+            DO I = 1, N
+               X(IX) = Z(I)
+               IX = IX + INCX
+            END DO
+*
+*           Call DNRM2 to compute the 2-norm
+*
+            SNRM = DNRM2(N,X,INCX)
+*
+*           Compare SNRM and ZNRM.  Roundoff error grows like O(n)
+*           in this implementation so we scale the test ratio accordingly.
+*
+            IF (INCX.EQ.0) THEN
+               ZNRM = SQRT(DBLE(N))*ABS(X(1))
+            ELSE
+               ZNRM = YNRM
+            END IF
+*
+*           The tests for NaN rely on the compiler not being overly
+*           aggressive and removing the statements altogether.
+            IF ((SNRM.NE.SNRM).OR.(ZNRM.NE.ZNRM)) THEN
+               IF ((SNRM.NE.SNRM).NEQV.(ZNRM.NE.ZNRM)) THEN
+                  TRAT = ONE / ULP
+               ELSE
+                  TRAT = ZERO
+               END IF
+            ELSE IF (SNRM == ZNRM) THEN
+               TRAT = ZERO
+            ELSE IF (ZNRM == ZERO) THEN
+               TRAT = SNRM / ULP
+            ELSE
+               TRAT = (ABS(SNRM-ZNRM) / ZNRM) / (DBLE(N)*ULP)
+            END IF
+            IF ((TRAT.NE.TRAT).OR.(TRAT.GE.THRESH)) THEN
+               IF (FIRST) THEN
+                  FIRST = .FALSE.
+                  WRITE(NOUT,99999)
+               END IF
+               WRITE (NOUT,98) "DNRM2", N, INCX, IV, IW, TRAT
+            END IF
+         END DO
+      END DO
+99999 FORMAT ('                                       FAIL')
+   99 FORMAT ( ' Not enough space to test ', A6, ': NMAX = ',I6,
+     + ', INCX = ',I6,/,'   N = ',I6,', must be at least ',I6 )
+   98 FORMAT( 1X, A6, ': N=', I6,', INCX=', I4, ', IV=', I2, ', IW=',
+     +  I2, ', test=', E15.8 )
+      RETURN
+      CONTAINS
+      DOUBLE PRECISION FUNCTION DXVALS(XX,K)
+      IMPLICIT NONE
+*     .. Scalar Arguments ..
+      DOUBLE PRECISION  XX
+      INTEGER           K
+*     .. Parameters ..
+      DOUBLE PRECISION  ZERO
+      PARAMETER         (ZERO=0.0D+0)
+*     .. Local Scalars ..
+      DOUBLE PRECISION  X, Y, Z
+*     .. Intrinsic Functions ..
+      INTRINSIC         HUGE
+*     .. Executable Statements ..
+      X = ZERO
+      Y = HUGE(XX)
+      Z = Y*Y
+      IF (K.EQ.1) THEN
+         X = -Z
+      ELSE IF (K.EQ.2) THEN
+         X = Z
+      ELSE IF (K.EQ.3) THEN
+         X = Z / Z
+      END IF
+      DXVALS = X
+      RETURN
+      END
+      END
diff --git a/BLAS/TESTING/dblat2.f b/BLAS/TESTING/dblat2.f
index b3e7f0df9f..ae1c8e8dcb 100644
--- a/BLAS/TESTING/dblat2.f
+++ b/BLAS/TESTING/dblat2.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       PROGRAM DBLAT2
+      IMPLICIT NONE
 *
 *  -- Reference BLAS test routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -428,6 +429,7 @@ SUBROUTINE DCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NALF, ALF, NBET,
      $                  BET, NINC, INC, NMAX, INCMAX, A, AA, AS, X, XX,
      $                  XS, Y, YY, YS, YT, G )
+      IMPLICIT NONE
 *
 *  Tests DGEMV and DGBMV.
 *
@@ -469,7 +471,7 @@ SUBROUTINE DCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       LOGICAL            LDE, LDERES
       EXTERNAL           LDE, LDERES
 *     .. External Subroutines ..
-      EXTERNAL           DGBMV, DGEMV, DMAKE, DMVCH
+      EXTERNAL           DGBMV, DGEMV, DMAKE, DMVCH, DREGR1
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN
 *     .. Scalars in Common ..
@@ -724,6 +726,34 @@ SUBROUTINE DCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *
   120 CONTINUE
 *
+*     Regression test to verify preservation of y when m zero, n nonzero.
+*
+      CALL DREGR1( TRANS, M, N, LY, KL, KU, ALPHA, AA, LDA, XX, INCX,
+     $   BETA, YY, INCY, YS )
+      IF( FULL )THEN
+         IF( TRACE )
+     $      WRITE( NTRA, FMT = 9994 )NC, SNAME, TRANS, M, N, ALPHA, LDA,
+     $      INCX, BETA, INCY
+         IF( REWI )
+     $      REWIND NTRA
+         CALL DGEMV( TRANS, M, N, ALPHA, AA, LDA, XX, INCX, BETA, YY,
+     $      INCY )
+      ELSE IF( BANDED )THEN
+         IF( TRACE )
+     $      WRITE( NTRA, FMT = 9995 )NC, SNAME, TRANS, M, N, KL, KU,
+     $      ALPHA, LDA, INCX, BETA, INCY
+         IF( REWI )
+     $      REWIND NTRA
+         CALL DGBMV( TRANS, M, N, KL, KU, ALPHA, AA, LDA, XX, INCX,
+     $      BETA, YY, INCY )
+      END IF
+      NC = NC + 1
+      IF( .NOT.LDE( YS, YY, LY ) )THEN
+         WRITE( NOUT, FMT = 9998 )NARGS - 1
+         FATAL = .TRUE.
+         GO TO 130
+      END IF
+*
 *     Report result.
 *
       IF( ERRMAX.LT.THRESH )THEN
@@ -769,6 +799,7 @@ SUBROUTINE DCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NALF, ALF, NBET,
      $                  BET, NINC, INC, NMAX, INCMAX, A, AA, AS, X, XX,
      $                  XS, Y, YY, YS, YT, G )
+      IMPLICIT NONE
 *
 *  Tests DSYMV, DSBMV and DSPMV.
 *
@@ -1111,6 +1142,7 @@ SUBROUTINE DCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       SUBROUTINE DCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, XT, G, Z )
+      IMPLICIT NONE
 *
 *  Tests DTRMV, DTBMV, DTPMV, DTRSV, DTBSV and DTPSV.
 *
@@ -1469,6 +1501,7 @@ SUBROUTINE DCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z )
+      IMPLICIT NONE
 *
 *  Tests DGER.
 *
@@ -1730,6 +1763,7 @@ SUBROUTINE DCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z )
+      IMPLICIT NONE
 *
 *  Tests DSYR and DSPR.
 *
@@ -2008,6 +2042,7 @@ SUBROUTINE DCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z )
+      IMPLICIT NONE
 *
 *  Tests DSYR2 and DSPR2.
 *
@@ -2320,6 +2355,7 @@ SUBROUTINE DCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *
       END
       SUBROUTINE DCHKE( ISNUM, SRNAMT, NOUT )
+      IMPLICIT NONE
 *
 *  Tests the error exits from the Level 2 Blas.
 *  Requires a special version of the error-handling routine XERBLA.
@@ -2647,6 +2683,7 @@ SUBROUTINE DCHKE( ISNUM, SRNAMT, NOUT )
       END
       SUBROUTINE DMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, KL,
      $                  KU, RESET, TRANSL )
+      IMPLICIT NONE
 *
 *  Generates values for an M by N matrix A within the bandwidth
 *  defined by KL and KU.
@@ -2823,6 +2860,7 @@ SUBROUTINE DMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, KL,
       END
       SUBROUTINE DMVCH( TRANS, M, N, ALPHA, A, NMAX, X, INCX, BETA, Y,
      $                  INCY, YT, G, YY, EPS, ERR, FATAL, NOUT, MV )
+      IMPLICIT NONE
 *
 *  Checks the results of the computational tests.
 *
@@ -2939,6 +2977,7 @@ SUBROUTINE DMVCH( TRANS, M, N, ALPHA, A, NMAX, X, INCX, BETA, Y,
 *
       END
       LOGICAL FUNCTION LDE( RI, RJ, LR )
+      IMPLICIT NONE
 *
 *  Tests if two arrays are identical.
 *
@@ -2969,6 +3008,7 @@ LOGICAL FUNCTION LDE( RI, RJ, LR )
 *
       END
       LOGICAL FUNCTION LDERES( TYPE, UPLO, M, N, AA, AS, LDA )
+      IMPLICIT NONE
 *
 *  Tests if selected elements in two arrays are equal.
 *
@@ -3028,6 +3068,7 @@ LOGICAL FUNCTION LDERES( TYPE, UPLO, M, N, AA, AS, LDA )
 *
       END
       DOUBLE PRECISION FUNCTION DBEG( RESET )
+      IMPLICIT NONE
 *
 *  Generates random numbers uniformly distributed between -0.5 and 0.5.
 *
@@ -3074,6 +3115,7 @@ DOUBLE PRECISION FUNCTION DBEG( RESET )
 *
       END
       DOUBLE PRECISION FUNCTION DDIFF( X, Y )
+      IMPLICIT NONE
 *
 *  Auxiliary routine for test program for Level 2 Blas.
 *
@@ -3090,6 +3132,7 @@ DOUBLE PRECISION FUNCTION DDIFF( X, Y )
 *
       END
       SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      IMPLICIT NONE
 *
 *  Tests whether XERBLA has detected an error when it should.
 *
@@ -3116,8 +3159,43 @@ SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
 *
 *     End of CHKXER
 *
+      END
+      SUBROUTINE DREGR1( TRANS, M, N, LY, KL, KU, ALPHA, A, LDA, X,
+     $   INCX, BETA, Y, INCY, YS )
+      IMPLICIT NONE
+*
+*  Input initialization for regression test.
+*
+*     .. Scalar Arguments ..
+      CHARACTER*1        TRANS
+      INTEGER            LY, M, N, KL, KU, LDA, INCX, INCY
+      DOUBLE PRECISION   ALPHA, BETA
+*     .. Array Arguments ..
+      DOUBLE PRECISION   A(LDA,*), X(*), Y(*), YS(*)
+*     .. Local Scalars ..
+      INTEGER            I
+*     .. Intrinsic Functions ..
+      INTRINSIC          DBLE
+*     .. Executable Statements ..
+      TRANS = 'T'
+      M = 0
+      N = 5
+      KL = 0
+      KU = 0
+      ALPHA = 1.0D0
+      LDA = MAX( 1, M )
+      INCX = 1
+      BETA = -0.7D0
+      INCY = 1
+      LY = ABS( INCY )*N
+      DO 10 I = 1, LY
+         Y( I ) = 42.0D0 + DBLE( I )
+         YS( I ) = Y( I )
+  10  CONTINUE
+      RETURN
       END
       SUBROUTINE XERBLA( SRNAME, INFO )
+      IMPLICIT NONE
 *
 *  This is a special version of XERBLA to be used only as part of
 *  the test program for testing error exits from the Level 2 BLAS
diff --git a/BLAS/TESTING/dblat3.f b/BLAS/TESTING/dblat3.f
index 89087d539c..281c428f47 100644
--- a/BLAS/TESTING/dblat3.f
+++ b/BLAS/TESTING/dblat3.f
@@ -19,10 +19,10 @@
 *> Test program for the DOUBLE PRECISION Level 3 Blas.
 *>
 *> The program must be driven by a short data file. The first 14 records
-*> of the file are read using list-directed input, the last 6 records
-*> are read using the format ( A6, L2 ). An annotated example of a data
+*> of the file are read using list-directed input, the last 7 records
+*> are read using the format ( A7, L2 ). An annotated example of a data
 *> file can be obtained by deleting the first 3 characters from the
-*> following 20 lines:
+*> following 21 lines:
 *> 'dblat3.out'      NAME OF SUMMARY OUTPUT FILE
 *> 6                 UNIT NUMBER OF SUMMARY FILE
 *> 'DBLAT3.SNAP'     NAME OF SNAPSHOT OUTPUT FILE
@@ -37,12 +37,13 @@
 *> 0.0 1.0 0.7       VALUES OF ALPHA
 *> 3                 NUMBER OF VALUES OF BETA
 *> 0.0 1.0 1.3       VALUES OF BETA
-*> DGEMM  T PUT F FOR NO TEST. SAME COLUMNS.
-*> DSYMM  T PUT F FOR NO TEST. SAME COLUMNS.
-*> DTRMM  T PUT F FOR NO TEST. SAME COLUMNS.
-*> DTRSM  T PUT F FOR NO TEST. SAME COLUMNS.
-*> DSYRK  T PUT F FOR NO TEST. SAME COLUMNS.
-*> DSYR2K T PUT F FOR NO TEST. SAME COLUMNS.
+*> DGEMM   T PUT F FOR NO TEST. SAME COLUMNS.
+*> DSYMM   T PUT F FOR NO TEST. SAME COLUMNS.
+*> DTRMM   T PUT F FOR NO TEST. SAME COLUMNS.
+*> DTRSM   T PUT F FOR NO TEST. SAME COLUMNS.
+*> DSYRK   T PUT F FOR NO TEST. SAME COLUMNS.
+*> DSYR2K  T PUT F FOR NO TEST. SAME COLUMNS.
+*> DGEMMTR T PUT F FOR NO TEST. SAME COLUMNS.
 *>
 *> Further Details
 *> ===============
@@ -79,6 +80,7 @@
 *
 *  =====================================================================
       PROGRAM DBLAT3
+      IMPLICIT NONE
 *
 *  -- Reference BLAS test routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -90,7 +92,7 @@ PROGRAM DBLAT3
       INTEGER            NIN
       PARAMETER          ( NIN = 5 )
       INTEGER            NSUBS
-      PARAMETER          ( NSUBS = 6 )
+      PARAMETER          ( NSUBS = 7 )
       DOUBLE PRECISION   ZERO, ONE
       PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
       INTEGER            NMAX
@@ -103,7 +105,7 @@ PROGRAM DBLAT3
       LOGICAL            FATAL, LTESTT, REWI, SAME, SFATAL, TRACE,
      $                   TSTERR
       CHARACTER*1        TRANSA, TRANSB
-      CHARACTER*6        SNAMET
+      CHARACTER*7        SNAMET
       CHARACTER*32       SNAPS, SUMMRY
 *     .. Local Arrays ..
       DOUBLE PRECISION   AA( NMAX*NMAX ), AB( NMAX, 2*NMAX ),
@@ -114,25 +116,26 @@ PROGRAM DBLAT3
      $                   G( NMAX ), W( 2*NMAX )
       INTEGER            IDIM( NIDMAX )
       LOGICAL            LTEST( NSUBS )
-      CHARACTER*6        SNAMES( NSUBS )
+      CHARACTER*7        SNAMES( NSUBS )
 *     .. External Functions ..
       DOUBLE PRECISION   DDIFF
       LOGICAL            LDE
       EXTERNAL           DDIFF, LDE
 *     .. External Subroutines ..
       EXTERNAL           DCHK1, DCHK2, DCHK3, DCHK4, DCHK5, DCHKE, DMMCH
+      EXTERNAL           DCHK6
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
       LOGICAL            LERR, OK
-      CHARACTER*6        SRNAMT
+      CHARACTER*7        SRNAMT
 *     .. Common blocks ..
       COMMON             /INFOC/INFOT, NOUTC, OK, LERR
       COMMON             /SRNAMC/SRNAMT
 *     .. Data statements ..
       DATA               SNAMES/'DGEMM ', 'DSYMM ', 'DTRMM ', 'DTRSM ',
-     $                   'DSYRK ', 'DSYR2K'/
+     $                   'DSYRK ', 'DSYR2K', 'DGEMMTR'/
 *     .. Executable Statements ..
 *
 *     Read name and unit number for summary output file and open file.
@@ -309,7 +312,7 @@ PROGRAM DBLAT3
             INFOT = 0
             OK = .TRUE.
             FATAL = .FALSE.
-            GO TO ( 140, 150, 160, 160, 170, 180 )ISNUM
+            GO TO ( 140, 150, 160, 160, 170, 180, 185 )ISNUM
 *           Test DGEMM, 01.
   140       CALL DCHK1( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
@@ -338,6 +341,12 @@ PROGRAM DBLAT3
      $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
      $                  NMAX, AB, AA, AS, BB, BS, C, CC, CS, CT, G, W )
             GO TO 190
+*           Test DGEMMTR, 07.
+  185       CALL DCHK6( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
+     $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
+     $                  NMAX, AB, AA, AS, AB( 1, NMAX + 1 ), BB, BS, C,
+     $                  CC, CS, CT, G )
+
 *
   190       IF( FATAL.AND.SFATAL )
      $         GO TO 210
@@ -372,7 +381,7 @@ PROGRAM DBLAT3
  9992 FORMAT( '   FOR BETA           ', 7F6.1 )
  9991 FORMAT( ' AMEND DATA FILE OR INCREASE ARRAY SIZES IN PROGRAM',
      $      /' ******* TESTS ABANDONED *******' )
- 9990 FORMAT( ' SUBPROGRAM NAME ', A6, ' NOT RECOGNIZED', /' ******* T',
+ 9990 FORMAT( ' SUBPROGRAM NAME ', A7, ' NOT RECOGNIZED', /' ******* T',
      $      'ESTS ABANDONED *******' )
  9989 FORMAT( ' ERROR IN DMMCH -  IN-LINE DOT PRODUCTS ARE BEING EVALU',
      $      'ATED WRONGLY.', /' DMMCH WAS CALLED WITH TRANSA = ', A1,
@@ -380,8 +389,8 @@ PROGRAM DBLAT3
      $      'ERR = ', F12.3, '.', /' THIS MAY BE DUE TO FAULTS IN THE ',
      $      'ARITHMETIC OR THE COMPILER.', /' ******* TESTS ABANDONED ',
      $      '*******' )
- 9988 FORMAT( A6, L2 )
- 9987 FORMAT( 1X, A6, ' WAS NOT TESTED' )
+ 9988 FORMAT( A7, L2 )
+ 9987 FORMAT( 1X, A7, ' WAS NOT TESTED' )
  9986 FORMAT( /' END OF TESTS' )
  9985 FORMAT( /' ******* FATAL ERROR - TESTS ABANDONED *******' )
  9984 FORMAT( ' ERROR-EXITS WILL NOT BE TESTED' )
@@ -392,6 +401,7 @@ PROGRAM DBLAT3
       SUBROUTINE DCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G )
+      IMPLICIT NONE
 *
 *  Tests DGEMM.
 *
@@ -410,7 +420,7 @@ SUBROUTINE DCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       DOUBLE PRECISION   A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -653,15 +663,15 @@ SUBROUTINE DCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   130 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A6, '(''', A1, ''',''', A1, ''',',
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A7, '(''', A1, ''',''', A1, ''',',
      $      3( I3, ',' ), F4.1, ', A,', I3, ', B,', I3, ',', F4.1, ', ',
      $      'C,', I3, ').' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -673,6 +683,7 @@ SUBROUTINE DCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       SUBROUTINE DCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G )
+      IMPLICIT NONE
 *
 *  Tests DSYMM.
 *
@@ -691,7 +702,7 @@ SUBROUTINE DCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       DOUBLE PRECISION   A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -923,15 +934,15 @@ SUBROUTINE DCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   120 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ', B,', I3, ',', F4.1, ', C,', I3, ')   ',
      $      ' .' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -943,6 +954,7 @@ SUBROUTINE DCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       SUBROUTINE DCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NMAX, A, AA, AS,
      $                  B, BB, BS, CT, G, C )
+      IMPLICIT NONE
 *
 *  Tests DTRMM and DTRSM.
 *
@@ -961,7 +973,7 @@ SUBROUTINE DCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       DOUBLE PRECISION   A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1229,15 +1241,15 @@ SUBROUTINE DCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   160 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A6, '(', 4( '''', A1, ''',' ), 2( I3, ',' ),
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A7, '(', 4( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ', B,', I3, ')        .' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
      $      '******' )
@@ -1248,6 +1260,7 @@ SUBROUTINE DCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       SUBROUTINE DCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G )
+      IMPLICIT NONE
 *
 *  Tests DSYRK.
 *
@@ -1266,7 +1279,7 @@ SUBROUTINE DCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       DOUBLE PRECISION   A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1503,16 +1516,16 @@ SUBROUTINE DCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   130 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
  9995 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
- 9994 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9994 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ',', F4.1, ', C,', I3, ')           .' )
  9993 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
      $      '******' )
@@ -1523,6 +1536,7 @@ SUBROUTINE DCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       SUBROUTINE DCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  AB, AA, AS, BB, BS, C, CC, CS, CT, G, W )
+      IMPLICIT NONE
 *
 *  Tests DSYR2K.
 *
@@ -1541,7 +1555,7 @@ SUBROUTINE DCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       DOUBLE PRECISION   AA( NMAX*NMAX ), AB( 2*NMAX*NMAX ),
      $                   ALF( NALF ), AS( NMAX*NMAX ), BB( NMAX*NMAX ),
@@ -1816,16 +1830,16 @@ SUBROUTINE DCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   160 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
  9995 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
- 9994 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9994 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ', B,', I3, ',', F4.1, ', C,', I3, ')   ',
      $      ' .' )
  9993 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1835,6 +1849,7 @@ SUBROUTINE DCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *
       END
       SUBROUTINE DCHKE( ISNUM, SRNAMT, NOUT )
+      IMPLICIT NONE
 *
 *  Tests the error exits from the Level 3 Blas.
 *  Requires a special version of the error-handling routine XERBLA.
@@ -1853,7 +1868,7 @@ SUBROUTINE DCHKE( ISNUM, SRNAMT, NOUT )
 *
 *     .. Scalar Arguments ..
       INTEGER            ISNUM, NOUT
-      CHARACTER*6        SRNAMT
+      CHARACTER*7        SRNAMT
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
       LOGICAL            LERR, OK
@@ -1866,7 +1881,7 @@ SUBROUTINE DCHKE( ISNUM, SRNAMT, NOUT )
       DOUBLE PRECISION   A( 2, 1 ), B( 2, 1 ), C( 2, 1 )
 *     .. External Subroutines ..
       EXTERNAL           CHKXER, DGEMM, DSYMM, DSYR2K, DSYRK, DTRMM,
-     $                   DTRSM
+     $                   DTRSM, DGEMMTR
 *     .. Common blocks ..
       COMMON             /INFOC/INFOT, NOUTC, OK, LERR
 *     .. Executable Statements ..
@@ -1882,7 +1897,7 @@ SUBROUTINE DCHKE( ISNUM, SRNAMT, NOUT )
       ALPHA = ONE
       BETA = TWO
 *
-      GO TO ( 10, 20, 30, 40, 50, 60 )ISNUM
+      GO TO ( 10, 20, 30, 40, 50, 60, 70 )ISNUM
    10 INFOT = 1
       CALL DGEMM( '/', 'N', 0, 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -1967,7 +1982,7 @@ SUBROUTINE DCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 13
       CALL DGEMM( 'T', 'T', 2, 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 70
+      GO TO 80
    20 INFOT = 1
       CALL DSYMM( '/', 'U', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2034,7 +2049,7 @@ SUBROUTINE DCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 12
       CALL DSYMM( 'R', 'L', 2, 0, ALPHA, A, 1, B, 2, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 70
+      GO TO 80
    30 INFOT = 1
       CALL DTRMM( '/', 'U', 'N', 'N', 0, 0, ALPHA, A, 1, B, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2143,7 +2158,7 @@ SUBROUTINE DCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 11
       CALL DTRMM( 'R', 'L', 'T', 'N', 2, 0, ALPHA, A, 1, B, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 70
+      GO TO 80
    40 INFOT = 1
       CALL DTRSM( '/', 'U', 'N', 'N', 0, 0, ALPHA, A, 1, B, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2252,7 +2267,7 @@ SUBROUTINE DCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 11
       CALL DTRSM( 'R', 'L', 'T', 'N', 2, 0, ALPHA, A, 1, B, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 70
+      GO TO 80
    50 INFOT = 1
       CALL DSYRK( '/', 'N', 0, 0, ALPHA, A, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2307,7 +2322,7 @@ SUBROUTINE DCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 10
       CALL DSYRK( 'L', 'T', 2, 0, ALPHA, A, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 70
+      GO TO 80
    60 INFOT = 1
       CALL DSYR2K( '/', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2374,16 +2389,95 @@ SUBROUTINE DCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 12
       CALL DSYR2K( 'L', 'T', 2, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      GO TO 80
+   70 INFOT = 1
+      CALL DGEMMTR( '/', 'N', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL DGEMMTR( 'U', '/', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL DGEMMTR( 'U', '/', 'T', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL DGEMMTR( 'U', 'N', '/', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL DGEMMTR( 'U', 'T', '/', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL DGEMMTR( 'U', 'N', 'N', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL DGEMMTR( 'U', 'N', 'T', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL DGEMMTR( 'U', 'T', 'N', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL DGEMMTR( 'U', 'T', 'T', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL DGEMMTR( 'U', 'N', 'N', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL DGEMMTR( 'U', 'N', 'T', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL DGEMMTR( 'U', 'T', 'N', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL DGEMMTR( 'U', 'T', 'T', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL DGEMMTR( 'U', 'N', 'N', 2, 0,  ALPHA, A, 1, B, 2, BETA, C,
+     $              2 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL DGEMMTR( 'U', 'N', 'T', 2, 0, ALPHA, A, 1, B, 2, BETA, C, 2 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL DGEMMTR( 'U', 'N', 'N', 0, 2, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL DGEMMTR( 'U', 'T', 'N', 0, 2, ALPHA, A, 2, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL DGEMMTR( 'U', 'N', 'T', 2, 0, ALPHA, A, 2, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL DGEMMTR( 'U', 'T', 'T', 2, 0, ALPHA, A, 2, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL DGEMMTR( 'U', 'N', 'N', 2, 0, ALPHA, A, 2, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL DGEMMTR( 'U', 'N', 'T', 2, 0, ALPHA, A, 2, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL DGEMMTR( 'U', 'T', 'N', 2, 0, ALPHA, A, 2, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL DGEMMTR( 'U', 'T', 'T', 2, 0, ALPHA, A, 2, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
 *
-   70 IF( OK )THEN
+   80 IF( OK )THEN
          WRITE( NOUT, FMT = 9999 )SRNAMT
       ELSE
          WRITE( NOUT, FMT = 9998 )SRNAMT
       END IF
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE TESTS OF ERROR-EXITS' )
- 9998 FORMAT( ' ******* ', A6, ' FAILED THE TESTS OF ERROR-EXITS *****',
+ 9999 FORMAT( ' ', A7, ' PASSED THE TESTS OF ERROR-EXITS' )
+ 9998 FORMAT( ' ******* ', A7, ' FAILED THE TESTS OF ERROR-EXITS *****',
      $      '**' )
 *
 *     End of DCHKE
@@ -2391,6 +2485,7 @@ SUBROUTINE DCHKE( ISNUM, SRNAMT, NOUT )
       END
       SUBROUTINE DMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, RESET,
      $                  TRANSL )
+      IMPLICIT NONE
 *
 *  Generates values for an M by N matrix A.
 *  Stores the values in the array AA in the data structure required
@@ -2505,6 +2600,7 @@ SUBROUTINE DMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, RESET,
       SUBROUTINE DMMCH( TRANSA, TRANSB, M, N, KK, ALPHA, A, LDA, B, LDB,
      $                  BETA, C, LDC, CT, G, CC, LDCC, EPS, ERR, FATAL,
      $                  NOUT, MV )
+      IMPLICIT NONE
 *
 *  Checks the results of the computational tests.
 *
@@ -2625,6 +2721,7 @@ SUBROUTINE DMMCH( TRANSA, TRANSB, M, N, KK, ALPHA, A, LDA, B, LDB,
 *
       END
       LOGICAL FUNCTION LDE( RI, RJ, LR )
+      IMPLICIT NONE
 *
 *  Tests if two arrays are identical.
 *
@@ -2657,6 +2754,7 @@ LOGICAL FUNCTION LDE( RI, RJ, LR )
 *
       END
       LOGICAL FUNCTION LDERES( TYPE, UPLO, M, N, AA, AS, LDA )
+      IMPLICIT NONE
 *
 *  Tests if selected elements in two arrays are equal.
 *
@@ -2718,6 +2816,7 @@ LOGICAL FUNCTION LDERES( TYPE, UPLO, M, N, AA, AS, LDA )
 *
       END
       DOUBLE PRECISION FUNCTION DBEG( RESET )
+      IMPLICIT NONE
 *
 *  Generates random numbers uniformly distributed between -0.5 and 0.5.
 *
@@ -2764,6 +2863,7 @@ DOUBLE PRECISION FUNCTION DBEG( RESET )
 *
       END
       DOUBLE PRECISION FUNCTION DDIFF( X, Y )
+      IMPLICIT NONE
 *
 *  Auxiliary routine for test program for Level 3 Blas.
 *
@@ -2783,6 +2883,7 @@ DOUBLE PRECISION FUNCTION DDIFF( X, Y )
 *
       END
       SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      IMPLICIT NONE
 *
 *  Tests whether XERBLA has detected an error when it should.
 *
@@ -2797,7 +2898,7 @@ SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
 *     .. Scalar Arguments ..
       INTEGER            INFOT, NOUT
       LOGICAL            LERR, OK
-      CHARACTER*6        SRNAMT
+      CHARACTER*7        SRNAMT
 *     .. Executable Statements ..
       IF( .NOT.LERR )THEN
          WRITE( NOUT, FMT = 9999 )INFOT, SRNAMT
@@ -2807,12 +2908,13 @@ SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
       RETURN
 *
  9999 FORMAT( ' ***** ILLEGAL VALUE OF PARAMETER NUMBER ', I2, ' NOT D',
-     $      'ETECTED BY ', A6, ' *****' )
+     $      'ETECTED BY ', A7, ' *****' )
 *
 *     End of CHKXER
 *
       END
       SUBROUTINE XERBLA( SRNAME, INFO )
+      IMPLICIT NONE
 *
 *  This is a special version of XERBLA to be used only as part of
 *  the test program for testing error exits from the Level 3 BLAS
@@ -2833,14 +2935,16 @@ SUBROUTINE XERBLA( SRNAME, INFO )
 *
 *     .. Scalar Arguments ..
       INTEGER            INFO
-      CHARACTER*6        SRNAME
+      CHARACTER*(*)      SRNAME
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUT
       LOGICAL            LERR, OK
-      CHARACTER*6        SRNAMT
+      CHARACTER*7        SRNAMT
 *     .. Common blocks ..
       COMMON             /INFOC/INFOT, NOUT, OK, LERR
       COMMON             /SRNAMC/SRNAMT
+*     .. Locals ..
+      INTEGER            SRLEN
 *     .. Executable Statements ..
       LERR = .TRUE.
       IF( INFO.NE.INFOT )THEN
@@ -2851,7 +2955,8 @@ SUBROUTINE XERBLA( SRNAME, INFO )
          END IF
          OK = .FALSE.
       END IF
-      IF( SRNAME.NE.SRNAMT )THEN
+      SRLEN = MIN(LEN_TRIM(SRNAME), LEN_TRIM(SRNAMT))
+      IF( SRNAME(1:SRLEN).NE.SRNAMT(1:SRLEN) )THEN
          WRITE( NOUT, FMT = 9998 )SRNAME, SRNAMT
          OK = .FALSE.
       END IF
@@ -2859,11 +2964,430 @@ SUBROUTINE XERBLA( SRNAME, INFO )
 *
  9999 FORMAT( ' ******* XERBLA WAS CALLED WITH INFO = ', I6, ' INSTEAD',
      $      ' OF ', I2, ' *******' )
- 9998 FORMAT( ' ******* XERBLA WAS CALLED WITH SRNAME = ', A6, ' INSTE',
-     $      'AD OF ', A6, ' *******' )
+ 9998 FORMAT( ' ******* XERBLA WAS CALLED WITH SRNAME = ', A7, ' INSTE',
+     $      'AD OF ', A7, ' *******' )
  9997 FORMAT( ' ******* XERBLA WAS CALLED WITH INFO = ', I6,
      $      ' *******' )
 *
 *     End of XERBLA
 *
       END
+
+      SUBROUTINE DCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
+     $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
+     $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G )
+      IMPLICIT NONE
+*
+*  Tests DGEMMTR.
+*
+*  Auxiliary routine for test program for Level 3 Blas.
+*
+*  -- Written on 19-July-2023.
+*     Martin Koehler, MPI Magdeburg
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO
+      PARAMETER          ( ZERO = 0.0D0 )
+*     .. Scalar Arguments ..
+      DOUBLE PRECISION   EPS, THRESH
+      INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
+      LOGICAL            FATAL, REWI, TRACE
+      CHARACTER*7        SNAME
+*     .. Array Arguments ..
+      DOUBLE PRECISION   A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
+     $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
+     $                   BB( NMAX*NMAX ), BET( NBET ), BS( NMAX*NMAX ),
+     $                   C( NMAX, NMAX ), CC( NMAX*NMAX ),
+     $                   CS( NMAX*NMAX ), CT( NMAX ), G( NMAX )
+      INTEGER            IDIM( NIDIM )
+*     .. Local Scalars ..
+      DOUBLE PRECISION   ALPHA, ALS, BETA, BLS, ERR, ERRMAX
+      INTEGER            I, IA, IB, ICA, ICB, IK, IN, K, KS, LAA,
+     $                   LBB, LCC, LDA, LDAS, LDB, LDBS, LDC, LDCS,
+     $                   MA, MB, N, NA, NARGS, NB, NC, NS, IS
+      LOGICAL            NULL, RESET, SAME, TRANA, TRANB
+      CHARACTER*1        TRANAS, TRANBS, TRANSA, TRANSB, UPLO, UPLOS
+      CHARACTER*3        ICH
+      CHARACTER*2        ISHAPE
+*     .. Local Arrays ..
+      LOGICAL            ISAME( 13 )
+*     .. External Functions ..
+      LOGICAL            LDE, LDERES
+      EXTERNAL           LDE, LDERES
+*     .. External Subroutines ..
+      EXTERNAL           DGEMMTR, DMAKE, DMMTCH
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX
+*     .. Scalars in Common ..
+      INTEGER            INFOT, NOUTC
+      LOGICAL            LERR, OK
+*     .. Common blocks ..
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
+*     .. Data statements ..
+      DATA               ICH/'NTC'/
+      DATA               ISHAPE/'UL'/
+*     .. Executable Statements ..
+*
+      NARGS = 13
+      NC = 0
+      RESET = .TRUE.
+      ERRMAX = ZERO
+*
+      DO 100 IN = 1, NIDIM
+         N = IDIM( IN )
+*        Set LDC to 1 more than minimum value if room.
+         LDC = N
+         IF( LDC.LT.NMAX )
+     $      LDC = LDC + 1
+*        Skip tests if not enough room.
+         IF( LDC.GT.NMAX )
+     $      GO TO 100
+         LCC = LDC*N
+         NULL = N.LE.0
+*
+         DO 90 IK = 1, NIDIM
+            K = IDIM( IK )
+*
+            DO 80 ICA = 1, 3
+               TRANSA = ICH( ICA: ICA )
+               TRANA = TRANSA.EQ.'T'.OR.TRANSA.EQ.'C'
+*
+               IF( TRANA )THEN
+                  MA = K
+                  NA = N
+               ELSE
+                  MA = N
+                  NA = K
+               END IF
+*              Set LDA to 1 more than minimum value if room.
+               LDA = MA
+               IF( LDA.LT.NMAX )
+     $            LDA = LDA + 1
+*              Skip tests if not enough room.
+               IF( LDA.GT.NMAX )
+     $            GO TO 80
+               LAA = LDA*NA
+*
+*              Generate the matrix A.
+*
+               CALL DMAKE( 'GE', ' ', ' ', MA, NA, A, NMAX, AA, LDA,
+     $                     RESET, ZERO )
+*
+               DO 70 ICB = 1, 3
+                  TRANSB = ICH( ICB: ICB )
+                  TRANB = TRANSB.EQ.'T'.OR.TRANSB.EQ.'C'
+*
+                  IF( TRANB )THEN
+                     MB = N
+                     NB = K
+                  ELSE
+                     MB = K
+                     NB = N
+                  END IF
+*                 Set LDB to 1 more than minimum value if room.
+                  LDB = MB
+                  IF( LDB.LT.NMAX )
+     $               LDB = LDB + 1
+*                 Skip tests if not enough room.
+                  IF( LDB.GT.NMAX )
+     $               GO TO 70
+                  LBB = LDB*NB
+*
+*                 Generate the matrix B.
+*
+                  CALL DMAKE( 'GE', ' ', ' ', MB, NB, B, NMAX, BB,
+     $                        LDB, RESET, ZERO )
+*
+                  DO 60 IA = 1, NALF
+                     ALPHA = ALF( IA )
+*
+                     DO 50 IB = 1, NBET
+                        BETA = BET( IB )
+
+                        DO 45 IS = 1, 2
+                           UPLO = ISHAPE( IS: IS )
+
+*
+*                          Generate the matrix C.
+*
+                           CALL DMAKE( 'GE', UPLO, ' ', N, N, C,
+     $                                 NMAX, CC, LDC, RESET, ZERO )
+*
+                           NC = NC + 1
+*
+*                          Save every datum before calling the
+*                          subroutine.
+*
+                           UPLOS = UPLO
+                           TRANAS = TRANSA
+                           TRANBS = TRANSB
+                           NS = N
+                           KS = K
+                           ALS = ALPHA
+                           DO 10 I = 1, LAA
+                              AS( I ) = AA( I )
+   10                      CONTINUE
+                           LDAS = LDA
+                           DO 20 I = 1, LBB
+                              BS( I ) = BB( I )
+   20                      CONTINUE
+                           LDBS = LDB
+                           BLS = BETA
+                           DO 30 I = 1, LCC
+                              CS( I ) = CC( I )
+   30                      CONTINUE
+                           LDCS = LDC
+*
+*                          Call the subroutine.
+*
+                           IF( TRACE )
+     $                        WRITE( NTRA, FMT = 9995 )NC, SNAME,
+     $                        UPLO, TRANSA, TRANSB, N, K, ALPHA, LDA,
+     $                        LDB, BETA, LDC
+                           IF( REWI )
+     $                        REWIND NTRA
+                           CALL DGEMMTR( UPLO, TRANSA, TRANSB, N,
+     $                                  K, ALPHA, AA, LDA, BB, LDB,
+     $                                  BETA, CC, LDC )
+*
+*                          Check if error-exit was taken incorrectly.
+*
+                           IF( .NOT.OK )THEN
+                              WRITE( NOUT, FMT = 9994 )
+                              FATAL = .TRUE.
+                              GO TO 120
+                           END IF
+*
+*                          See what data changed inside subroutines.
+*
+                           ISAME( 1 ) = UPLO.EQ.UPLOS
+                           ISAME( 2 ) = TRANSA.EQ.TRANAS
+                           ISAME( 3 ) = TRANSB.EQ.TRANBS
+                           ISAME( 4 ) = NS.EQ.N
+                           ISAME( 5 ) = KS.EQ.K
+                           ISAME( 6 ) = ALS.EQ.ALPHA
+                           ISAME( 7 ) = LDE( AS, AA, LAA )
+                           ISAME( 8 ) = LDAS.EQ.LDA
+                           ISAME( 9 ) = LDE( BS, BB, LBB )
+                           ISAME( 10 ) = LDBS.EQ.LDB
+                           ISAME( 11 ) = BLS.EQ.BETA
+                           IF( NULL )THEN
+                              ISAME( 12 ) = LDE( CS, CC, LCC )
+                           ELSE
+                              ISAME( 12 ) = LDERES( 'GE', ' ', N, N,
+     $                                          CS, CC, LDC )
+                           END IF
+                           ISAME( 13 ) = LDCS.EQ.LDC
+*
+*                          If data was incorrectly changed, report
+*                          and return.
+*
+                           SAME = .TRUE.
+                           DO 40 I = 1, NARGS
+                              SAME = SAME.AND.ISAME( I )
+                              IF( .NOT.ISAME( I ) )
+     $                           WRITE( NOUT, FMT = 9998 )I
+   40                      CONTINUE
+                           IF( .NOT.SAME )THEN
+                              FATAL = .TRUE.
+                              GO TO 120
+                           END IF
+*
+                           IF( .NOT.NULL )THEN
+*
+*                             Check the result.
+*
+                              CALL DMMTCH( UPLO, TRANSA, TRANSB,
+     $                                 N, K,
+     $                                 ALPHA, A, NMAX, B, NMAX, BETA,
+     $                                 C, NMAX, CT, G, CC, LDC, EPS,
+     $                                 ERR, FATAL, NOUT, .TRUE. )
+                              ERRMAX = MAX( ERRMAX, ERR )
+*                             If got really bad answer, report and
+*                             return.
+                              IF( FATAL )
+     $                           GO TO 120
+                           END IF
+*
+   45                   CONTINUE
+*
+   50                CONTINUE
+*
+   60             CONTINUE
+*
+   70          CONTINUE
+*
+   80       CONTINUE
+*
+   90    CONTINUE
+*
+  100 CONTINUE
+*
+*
+*     Report result.
+*
+      IF( ERRMAX.LT.THRESH )THEN
+         WRITE( NOUT, FMT = 9999 )SNAME, NC
+      ELSE
+         WRITE( NOUT, FMT = 9997 )SNAME, NC, ERRMAX
+      END IF
+      GO TO 130
+*
+  120 CONTINUE
+      WRITE( NOUT, FMT = 9996 )SNAME
+      WRITE( NOUT, FMT = 9995 )NC, SNAME, UPLO, TRANSA, TRANSB, N, K,
+     $   ALPHA, LDA, LDB, BETA, LDC
+*
+  130 CONTINUE
+      RETURN
+*
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+     $      'S)' )
+ 9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
+     $      'ANGED INCORRECTLY *******' )
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+     $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
+     $      ' - SUSPECT *******' )
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A7, '(''',A1, ''',''',A1, ''',''', A1,''',',
+     $      2( I3, ',' ), F4.1, ', A,', I3, ', B,', I3, ',', F4.1, ', ',
+     $      'C,', I3, ').' )
+ 9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
+     $      '******' )
+*
+*     End of DCHK6
+*
+      END
+
+      SUBROUTINE DMMTCH( UPLO, TRANSA, TRANSB, N, KK, ALPHA, A, LDA,
+     $                  B, LDB, BETA, C, LDC, CT, G, CC, LDCC, EPS, ERR,
+     $                  FATAL, NOUT, MV )
+      IMPLICIT NONE
+*
+*  Checks the results of the computational tests.
+*
+*  Auxiliary routine for test program for Level 3 Blas. (DGEMMTR)
+*
+*  -- Written on 19-July-2023.
+*     Martin Koehler, MPI Magdeburg
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+*     .. Scalar Arguments ..
+      DOUBLE PRECISION   ALPHA, BETA, EPS, ERR
+      INTEGER            KK, LDA, LDB, LDC, LDCC, N, NOUT
+      LOGICAL            FATAL, MV
+      CHARACTER*1        UPLO, TRANSA, TRANSB
+*     .. Array Arguments ..
+      DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), C( LDC, * ),
+     $                   CC( LDCC, * ), CT( * ), G( * )
+*     .. Local Scalars ..
+      DOUBLE PRECISION   ERRI
+      INTEGER            I, J, K, ISTART, ISTOP
+      LOGICAL            TRANA, TRANB, UPPER
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, SQRT
+*     .. Executable Statements ..
+      UPPER = UPLO.EQ.'U'
+      TRANA = TRANSA.EQ.'T'.OR.TRANSA.EQ.'C'
+      TRANB = TRANSB.EQ.'T'.OR.TRANSB.EQ.'C'
+*
+*     Compute expected result, one column at a time, in CT using data
+*     in A, B and C.
+*     Compute gauges in G.
+*
+      ISTART = 1
+      ISTOP  = N
+
+      DO 120 J = 1, N
+*
+         IF ( UPPER ) THEN
+             ISTART = 1
+             ISTOP = J
+         ELSE
+             ISTART = J
+             ISTOP = N
+         END IF
+         DO 10 I = ISTART, ISTOP
+            CT( I ) = ZERO
+            G( I ) = ZERO
+   10    CONTINUE
+         IF( .NOT.TRANA.AND..NOT.TRANB )THEN
+            DO 30 K = 1, KK
+               DO 20 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( I, K )*B( K, J )
+                  G( I ) = G( I ) + ABS( A( I, K ) )*ABS( B( K, J ) )
+   20          CONTINUE
+   30       CONTINUE
+         ELSE IF( TRANA.AND..NOT.TRANB )THEN
+            DO 50 K = 1, KK
+               DO 40 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( K, I )*B( K, J )
+                  G( I ) = G( I ) + ABS( A( K, I ) )*ABS( B( K, J ) )
+   40          CONTINUE
+   50       CONTINUE
+         ELSE IF( .NOT.TRANA.AND.TRANB )THEN
+            DO 70 K = 1, KK
+               DO 60 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( I, K )*B( J, K )
+                  G( I ) = G( I ) + ABS( A( I, K ) )*ABS( B( J, K ) )
+   60          CONTINUE
+   70       CONTINUE
+         ELSE IF( TRANA.AND.TRANB )THEN
+            DO 90 K = 1, KK
+               DO 80 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( K, I )*B( J, K )
+                  G( I ) = G( I ) + ABS( A( K, I ) )*ABS( B( J, K ) )
+   80          CONTINUE
+   90       CONTINUE
+         END IF
+         DO 100 I = ISTART, ISTOP
+            CT( I ) = ALPHA*CT( I ) + BETA*C( I, J )
+            G( I ) = ABS( ALPHA )*G( I ) + ABS( BETA )*ABS( C( I, J ) )
+  100    CONTINUE
+*
+*        Compute the error ratio for this result.
+*
+         ERR = ZERO
+         DO 110 I = ISTART, ISTOP
+            ERRI = ABS( CT( I ) - CC( I, J ) )/EPS
+            IF( G( I ).NE.ZERO )
+     $         ERRI = ERRI/G( I )
+            ERR = MAX( ERR, ERRI )
+            IF( ERR*SQRT( EPS ).GE.ONE )
+     $         GO TO 130
+  110    CONTINUE
+*
+  120 CONTINUE
+*
+*     If the loop completes, all results are at least half accurate.
+      GO TO 150
+*
+*     Report fatal error.
+*
+  130 FATAL = .TRUE.
+      WRITE( NOUT, FMT = 9999 )
+      DO 140 I = ISTART, ISTOP
+         IF( MV )THEN
+            WRITE( NOUT, FMT = 9998 )I, CT( I ), CC( I, J )
+         ELSE
+            WRITE( NOUT, FMT = 9998 )I, CC( I, J ), CT( I )
+         END IF
+  140 CONTINUE
+      IF( N.GT.1 )
+     $   WRITE( NOUT, FMT = 9997 )J
+*
+  150 CONTINUE
+      RETURN
+*
+ 9999 FORMAT( ' ******* FATAL ERROR - COMPUTED RESULT IS LESS THAN HAL',
+     $      'F ACCURATE *******', /'           EXPECTED RESULT   COMPU',
+     $      'TED RESULT' )
+ 9998 FORMAT( 1X, I7, 2G18.6 )
+ 9997 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
+*
+*     End of DMMTCH
+*
+      END
+
diff --git a/BLAS/TESTING/dblat3.in b/BLAS/TESTING/dblat3.in
index 0098f3e521..30b74c6e40 100644
--- a/BLAS/TESTING/dblat3.in
+++ b/BLAS/TESTING/dblat3.in
@@ -12,9 +12,10 @@ T        LOGICAL FLAG, T TO TEST ERROR EXITS.
 0.0 1.0 0.7       VALUES OF ALPHA
 3                 NUMBER OF VALUES OF BETA
 0.0 1.0 1.3       VALUES OF BETA
-DGEMM  T PUT F FOR NO TEST. SAME COLUMNS.
-DSYMM  T PUT F FOR NO TEST. SAME COLUMNS.
-DTRMM  T PUT F FOR NO TEST. SAME COLUMNS.
-DTRSM  T PUT F FOR NO TEST. SAME COLUMNS.
-DSYRK  T PUT F FOR NO TEST. SAME COLUMNS.
-DSYR2K T PUT F FOR NO TEST. SAME COLUMNS.
+DGEMM   T PUT F FOR NO TEST. SAME COLUMNS.
+DSYMM   T PUT F FOR NO TEST. SAME COLUMNS.
+DTRMM   T PUT F FOR NO TEST. SAME COLUMNS.
+DTRSM   T PUT F FOR NO TEST. SAME COLUMNS.
+DSYRK   T PUT F FOR NO TEST. SAME COLUMNS.
+DSYR2K  T PUT F FOR NO TEST. SAME COLUMNS.
+DGEMMTR T PUT F FOR NO TEST. SAME COLUMNS.
diff --git a/BLAS/TESTING/sblat1.f b/BLAS/TESTING/sblat1.f
index d81496b6a3..78008e4779 100644
--- a/BLAS/TESTING/sblat1.f
+++ b/BLAS/TESTING/sblat1.f
@@ -34,6 +34,7 @@
 *
 *  =====================================================================
       PROGRAM SBLAT1
+      IMPLICIT NONE
 *
 *  -- Reference BLAS test routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -58,7 +59,7 @@ PROGRAM SBLAT1
       DATA             SFAC/9.765625E-4/
 *     .. Executable Statements ..
       WRITE (NOUT,99999)
-      DO 20 IC = 1, 13
+      DO 20 IC = 1, 14
          ICASE = IC
          CALL HEADER
 *
@@ -76,7 +77,8 @@ PROGRAM SBLAT1
      +            ICASE.EQ.10) THEN
             CALL CHECK1(SFAC)
          ELSE IF (ICASE.EQ.1 .OR. ICASE.EQ.2 .OR. ICASE.EQ.5 .OR.
-     +            ICASE.EQ.6 .OR. ICASE.EQ.12 .OR. ICASE.EQ.13) THEN
+     +            ICASE.EQ.6 .OR. ICASE.EQ.12 .OR. ICASE.EQ.13 .OR.
+     +            ICASE.EQ.14 ) THEN
             CALL CHECK2(SFAC)
          ELSE IF (ICASE.EQ.4) THEN
             CALL CHECK3(SFAC)
@@ -100,7 +102,7 @@ SUBROUTINE HEADER
       INTEGER          ICASE, INCX, INCY, N
       LOGICAL          PASS
 *     .. Local Arrays ..
-      CHARACTER*6      L(13)
+      CHARACTER*6      L(14)
 *     .. Common blocks ..
       COMMON           /COMBLA/ICASE, N, INCX, INCY, PASS
 *     .. Data statements ..
@@ -117,6 +119,8 @@ SUBROUTINE HEADER
       DATA             L(11)/'SROTMG'/
       DATA             L(12)/'SROTM '/
       DATA             L(13)/'SDSDOT'/
+      DATA             L(14)/'SAXPBY'/
+
 *     .. Executable Statements ..
       WRITE (NOUT,99999) ICASE, L(ICASE)
       RETURN
@@ -248,7 +252,8 @@ SUBROUTINE CHECK0(SFAC)
       SUBROUTINE CHECK1(SFAC)
 *     .. Parameters ..
       INTEGER           NOUT
-      PARAMETER         (NOUT=6)
+      REAL              THRESH
+      PARAMETER         (NOUT=6, THRESH=10.0E0)
 *     .. Scalar Arguments ..
       REAL              SFAC
 *     .. Scalars in Common ..
@@ -266,7 +271,7 @@ SUBROUTINE CHECK1(SFAC)
       INTEGER           ISAMAX
       EXTERNAL          SASUM, SNRM2, ISAMAX
 *     .. External Subroutines ..
-      EXTERNAL          ITEST1, SSCAL, STEST, STEST1
+      EXTERNAL          ITEST1, SB1NRM2, SSCAL, STEST, STEST1
 *     .. Intrinsic Functions ..
       INTRINSIC         MAX
 *     .. Common blocks ..
@@ -319,6 +324,10 @@ SUBROUTINE CHECK1(SFAC)
 *
             IF (ICASE.EQ.7) THEN
 *              .. SNRM2 ..
+*              Test scaling when some entries are tiny or huge
+               CALL SB1NRM2(N,(INCX-2)*2,THRESH)
+               CALL SB1NRM2(N,INCX,THRESH)
+*              Test with hardcoded mid range entries
                STEMP(1) = DTRUE1(NP1)
                CALL STEST1(SNRM2(N,SX,INCX),STEMP(1),STEMP,SFAC)
             ELSE IF (ICASE.EQ.8) THEN
@@ -369,7 +378,7 @@ SUBROUTINE CHECK2(SFAC)
       INTEGER           ICASE, INCX, INCY, N
       LOGICAL           PASS
 *     .. Local Scalars ..
-      REAL              SA
+      REAL              SA,SB
       INTEGER           I, J, KI, KN, KNI, KPAR, KSIZE, LENX, LENY,
      $                  LINCX, LINCY, MX, MY
 *     .. Local Arrays ..
@@ -381,13 +390,13 @@ SUBROUTINE CHECK2(SFAC)
      $                  DT19XB(7,4,4), DT19XC(7,4,4),DT19XD(7,4,4),
      $                  DT19Y(7,4,16), DT19YA(7,4,4),DT19YB(7,4,4),
      $                  DT19YC(7,4,4), DT19YD(7,4,4), DTEMP(5),
-     $                  ST7B(4,4), STY0(1), SX0(1), SY0(1)
+     $                  ST7B(4,4), STY0(1), SX0(1), SY0(1), DT20(7,4,4)
       INTEGER           INCXS(4), INCYS(4), LENS(4,2), NS(4)
 *     .. External Functions ..
       REAL              SDOT, SDSDOT
       EXTERNAL          SDOT, SDSDOT
 *     .. External Subroutines ..
-      EXTERNAL          SAXPY, SCOPY, SROTM, SSWAP, STEST, STEST1
+      EXTERNAL          SAXPY, SAXPBY,SCOPY, SROTM, SSWAP, STEST, STEST1
 *     .. Intrinsic Functions ..
       INTRINSIC         ABS, MIN
 *     .. Common blocks ..
@@ -401,6 +410,7 @@ SUBROUTINE CHECK2(SFAC)
      B   (DT19Y(1,1,13),DT19YD(1,1,1))
 
       DATA              SA/0.3E0/
+      DATA              SB/0.5E0/
       DATA              INCXS/1, 2, -2, -1/
       DATA              INCYS/1, -2, 1, -2/
       DATA              LENS/1, 1, 2, 4, 1, 1, 3, 7/
@@ -619,6 +629,27 @@ SUBROUTINE CHECK2(SFAC)
      M            .7E0,  -.9E0,  1.2E0,   .7E0, -1.5E0,   .2E0,  1.6E0,
      N           1.7E0,  -.9E0,   .5E0,   .7E0, -1.6E0,   .2E0,  2.4E0,
      O          -2.6E0,  -.9E0, -1.3E0,   .7E0,  2.9E0,   .2E0, -4.0E0 /
+      DATA              DT20/0.5E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0,
+     +                  0.0E0, 0.43E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0,
+     +                  0.0E0, 0.0E0, 0.43E0, -0.42E0, 0.0E0, 0.0E0,
+     +                  0.0E0, 0.0E0, 0.0E0, 0.43E0, -0.42E0, 0.0E0,
+     +                  0.59E0, 0.0E0, 0.0E0, 0.0E0, 0.5E0, 0.0E0,
+     +                  0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.43E0,
+     +                  0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0,
+     +                  0.1E0, -0.9E0, 0.33E0, 0.0E0, 0.0E0, 0.0E0,
+     +                  0.0E0, 0.13E0, -0.9E0, 0.42E0, 0.7E0, -0.45E0,
+     +                  0.2E0, 0.58E0, 0.5E0, 0.0E0, 0.0E0, 0.0E0,
+     +                  0.0E0, 0.0E0, 0.0E0, 0.43E0, 0.0E0, 0.0E0,
+     +                  0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.1E0, -0.27E0,
+     +                  0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.13E0,
+     +                  -0.18E0, 0.00E0, 0.53E0, 0.0E0, 0.0E0, 0.0E0,
+     +                  0.5E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0,
+     +                  0.43E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0,
+     +                  0.0E0, 0.43E0, -0.9E0, 0.18E0, 0.0E0, 0.0E0,
+     +                  0.0E0, 0.0E0, 0.43E0, -0.9E0, 0.18E0, 0.7E0,
+     +                  -0.45E0, 0.2E0, 0.64E0/
+
+
 *
 *     .. Executable Statements ..
 *
@@ -650,6 +681,14 @@ SUBROUTINE CHECK2(SFAC)
                   STY(J) = DT8(J,KN,KI)
    40          CONTINUE
                CALL STEST(LENY,SY,STY,SSIZE2(1,KSIZE),SFAC)
+            ELSE IF (ICASE.EQ.14) THEN
+*              .. SAXPBY ..
+               CALL SAXPBY(N,SA,SX,INCX,SB,SY,INCY)
+               DO 50 J = 1, LENY
+                  STY(J) = DT20(J,KN,KI)
+   50          CONTINUE
+               CALL STEST(LENY,SY,STY,SSIZE2(1,KSIZE),SFAC)
+
             ELSE IF (ICASE.EQ.5) THEN
 *              .. SCOPY ..
                DO 60 I = 1, 7
@@ -1080,3 +1119,218 @@ SUBROUTINE ITEST1(ICOMP,ITRUE)
 *     End of ITEST1
 *
       END
+      SUBROUTINE SB1NRM2(N,INCX,THRESH)
+*     Compare NRM2 with a reference computation using combinations
+*     of the following values:
+*
+*     0, very small, small, ulp, 1, 1/ulp, big, very big, infinity, NaN
+*
+*     one of these values is used to initialize x(1) and x(2:N) is
+*     filled with random values from [-1,1] scaled by another of
+*     these values.
+*
+*     This routine is adapted from the test suite provided by
+*     Anderson E. (2017)
+*     Algorithm 978: Safe Scaling in the Level 1 BLAS
+*     ACM Trans Math Softw 44:1--28
+*     https://doi.org/10.1145/3061665
+*
+      IMPLICIT NONE
+*     .. Scalar Arguments ..
+      INTEGER           INCX, N
+      REAL              THRESH
+*
+*  =====================================================================
+*     .. Parameters ..
+      INTEGER           NMAX, NOUT, NV
+      PARAMETER         (NMAX=20, NOUT=6, NV=10)
+      REAL              HALF, ONE, TWO, ZERO
+      PARAMETER         (HALF=0.5E+0, ONE=1.0E+0, TWO= 2.0E+0,
+     &                  ZERO=0.0E+0)
+*     .. External Functions ..
+      REAL              SNRM2
+      EXTERNAL          SNRM2
+*     .. Intrinsic Functions ..
+      INTRINSIC         ABS, MAX, MIN, REAL, SQRT
+*     .. Model parameters ..
+      REAL              BIGNUM, SAFMAX, SAFMIN, SMLNUM, ULP
+      PARAMETER         (BIGNUM=0.1014120480E+32,
+     &                  SAFMAX=0.8507059173E+38,
+     &                  SAFMIN=0.1175494351E-37,
+     &                  SMLNUM=0.9860761315E-31,
+     &                  ULP=0.1192092896E-06)
+*     .. Local Scalars ..
+      REAL              ROGUE, SNRM, TRAT, V0, V1, WORKSSQ, Y1, Y2,
+     &                  YMAX, YMIN, YNRM, ZNRM
+      INTEGER           I, IV, IW, IX
+      LOGICAL           FIRST
+*     .. Local Arrays ..
+      REAL              VALUES(NV), WORK(NMAX), X(NMAX), Z(NMAX)
+*     .. Executable Statements ..
+      VALUES(1) = ZERO
+      VALUES(2) = TWO*SAFMIN
+      VALUES(3) = SMLNUM
+      VALUES(4) = ULP
+      VALUES(5) = ONE
+      VALUES(6) = ONE / ULP
+      VALUES(7) = BIGNUM
+      VALUES(8) = SAFMAX
+      VALUES(9) = SXVALS(V0,2)
+      VALUES(10) = SXVALS(V0,3)
+      ROGUE = -1234.5678E+0
+      FIRST = .TRUE.
+*
+*     Check that the arrays are large enough
+*
+      IF (N*ABS(INCX).GT.NMAX) THEN
+         WRITE (NOUT,99) "SNRM2", NMAX, INCX, N, N*ABS(INCX)
+         RETURN
+      END IF
+*
+*     Zero-sized inputs are tested in STEST1.
+      IF (N.LE.0) THEN
+         RETURN
+      END IF
+*
+*     Generate (N-1) values in (-1,1).
+*
+      DO I = 2, N
+         CALL RANDOM_NUMBER(WORK(I))
+         WORK(I) = ONE - TWO*WORK(I)
+      END DO
+*
+*     Compute the sum of squares of the random values
+*     by an unscaled algorithm.
+*
+      WORKSSQ = ZERO
+      DO I = 2, N
+         WORKSSQ = WORKSSQ + WORK(I)*WORK(I)
+      END DO
+*
+*     Construct the test vector with one known value
+*     and the rest from the random work array multiplied
+*     by a scaling factor.
+*
+      DO IV = 1, NV
+         V0 = VALUES(IV)
+         IF (ABS(V0).GT.ONE) THEN
+         V0 = V0*HALF
+         END IF
+         Z(1) = V0
+         DO IW = 1, NV
+            V1 = VALUES(IW)
+            IF (ABS(V1).GT.ONE) THEN
+               V1 = (V1*HALF) / SQRT(REAL(N))
+            END IF
+            DO I = 2, N
+               Z(I) = V1*WORK(I)
+            END DO
+*
+*           Compute the expected value of the 2-norm
+*
+            Y1 = ABS(V0)
+            IF (N.GT.1) THEN
+               Y2 = ABS(V1)*SQRT(WORKSSQ)
+            ELSE
+               Y2 = ZERO
+            END IF
+            YMIN = MIN(Y1, Y2)
+            YMAX = MAX(Y1, Y2)
+*
+*           Expected value is NaN if either is NaN. The test
+*           for YMIN == YMAX avoids further computation if both
+*           are infinity.
+*
+            IF ((Y1.NE.Y1).OR.(Y2.NE.Y2)) THEN
+*              add to propagate NaN
+               YNRM = Y1 + Y2
+            ELSE IF (YMIN == YMAX) THEN
+               YNRM = SQRT(TWO)*YMAX
+            ELSE IF (YMAX == ZERO) THEN
+               YNRM = ZERO
+            ELSE
+               YNRM = YMAX*SQRT(ONE + (YMIN / YMAX)**2)
+            END IF
+*
+*           Fill the input array to SNRM2 with steps of incx
+*
+            DO I = 1, N
+               X(I) = ROGUE
+            END DO
+            IX = 1
+            IF (INCX.LT.0) IX = 1 - (N-1)*INCX
+            DO I = 1, N
+               X(IX) = Z(I)
+               IX = IX + INCX
+            END DO
+*
+*           Call SNRM2 to compute the 2-norm
+*
+            SNRM = SNRM2(N,X,INCX)
+*
+*           Compare SNRM and ZNRM.  Roundoff error grows like O(n)
+*           in this implementation so we scale the test ratio accordingly.
+*
+            IF (INCX.EQ.0) THEN
+               ZNRM = SQRT(REAL(N))*ABS(X(1))
+            ELSE
+               ZNRM = YNRM
+            END IF
+*
+*           The tests for NaN rely on the compiler not being overly
+*           aggressive and removing the statements altogether.
+            IF ((SNRM.NE.SNRM).OR.(ZNRM.NE.ZNRM)) THEN
+               IF ((SNRM.NE.SNRM).NEQV.(ZNRM.NE.ZNRM)) THEN
+                  TRAT = ONE / ULP
+               ELSE
+                  TRAT = ZERO
+               END IF
+            ELSE IF (SNRM == ZNRM) THEN
+               TRAT = ZERO
+            ELSE IF (ZNRM == ZERO) THEN
+               TRAT = SNRM / ULP
+            ELSE
+               TRAT = (ABS(SNRM-ZNRM) / ZNRM) / (REAL(N)*ULP)
+            END IF
+            IF ((TRAT.NE.TRAT).OR.(TRAT.GE.THRESH)) THEN
+               IF (FIRST) THEN
+                  FIRST = .FALSE.
+                  WRITE(NOUT,99999)
+               END IF
+               WRITE (NOUT,98) "SNRM2", N, INCX, IV, IW, TRAT
+            END IF
+         END DO
+      END DO
+99999 FORMAT ('                                       FAIL')
+   99 FORMAT ( ' Not enough space to test ', A6, ': NMAX = ',I6,
+     + ', INCX = ',I6,/,'   N = ',I6,', must be at least ',I6 )
+   98 FORMAT( 1X, A6, ': N=', I6,', INCX=', I4, ', IV=', I2, ', IW=',
+     +  I2, ', test=', E15.8 )
+      RETURN
+      CONTAINS
+      REAL FUNCTION SXVALS(XX,K)
+*     .. Scalar Arguments ..
+      REAL              XX
+      INTEGER           K
+*     .. Parameters ..
+      REAL              ZERO
+      PARAMETER         (ZERO=0.0E+0)
+*     .. Local Scalars ..
+      REAL              X, Y, Z
+*     .. Intrinsic Functions ..
+      INTRINSIC         HUGE
+*     .. Executable Statements ..
+      X = ZERO
+      Y = HUGE(XX)
+      Z = Y*Y
+      IF (K.EQ.1) THEN
+         X = -Z
+      ELSE IF (K.EQ.2) THEN
+         X = Z
+      ELSE IF (K.EQ.3) THEN
+         X = Z / Z
+      END IF
+      SXVALS = X
+      RETURN
+      END
+      END
diff --git a/BLAS/TESTING/sblat2.f b/BLAS/TESTING/sblat2.f
index 17962a99cd..ff5acffa83 100644
--- a/BLAS/TESTING/sblat2.f
+++ b/BLAS/TESTING/sblat2.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       PROGRAM SBLAT2
+      IMPLICIT NONE
 *
 *  -- Reference BLAS test routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -428,6 +429,7 @@ SUBROUTINE SCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NALF, ALF, NBET,
      $                  BET, NINC, INC, NMAX, INCMAX, A, AA, AS, X, XX,
      $                  XS, Y, YY, YS, YT, G )
+      IMPLICIT NONE
 *
 *  Tests SGEMV and SGBMV.
 *
@@ -469,7 +471,7 @@ SUBROUTINE SCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       LOGICAL            LSE, LSERES
       EXTERNAL           LSE, LSERES
 *     .. External Subroutines ..
-      EXTERNAL           SGBMV, SGEMV, SMAKE, SMVCH
+      EXTERNAL           SGBMV, SGEMV, SMAKE, SMVCH, SREGR1
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN
 *     .. Scalars in Common ..
@@ -724,6 +726,34 @@ SUBROUTINE SCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *
   120 CONTINUE
 *
+*     Regression test to verify preservation of y when m zero, n nonzero.
+*
+      CALL SREGR1( TRANS, M, N, LY, KL, KU, ALPHA, AA, LDA, XX, INCX,
+     $   BETA, YY, INCY, YS )
+      IF( FULL )THEN
+         IF( TRACE )
+     $      WRITE( NTRA, FMT = 9994 )NC, SNAME, TRANS, M, N, ALPHA, LDA,
+     $      INCX, BETA, INCY
+         IF( REWI )
+     $      REWIND NTRA
+         CALL SGEMV( TRANS, M, N, ALPHA, AA, LDA, XX, INCX, BETA, YY,
+     $      INCY )
+      ELSE IF( BANDED )THEN
+         IF( TRACE )
+     $      WRITE( NTRA, FMT = 9995 )NC, SNAME, TRANS, M, N, KL, KU,
+     $      ALPHA, LDA, INCX, BETA, INCY
+         IF( REWI )
+     $      REWIND NTRA
+         CALL SGBMV( TRANS, M, N, KL, KU, ALPHA, AA, LDA, XX, INCX,
+     $      BETA, YY, INCY )
+      END IF
+      NC = NC + 1
+      IF( .NOT.LSE( YS, YY, LY ) )THEN
+         WRITE( NOUT, FMT = 9998 )NARGS - 1
+         FATAL = .TRUE.
+         GO TO 130
+      END IF
+*
 *     Report result.
 *
       IF( ERRMAX.LT.THRESH )THEN
@@ -769,6 +799,7 @@ SUBROUTINE SCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NALF, ALF, NBET,
      $                  BET, NINC, INC, NMAX, INCMAX, A, AA, AS, X, XX,
      $                  XS, Y, YY, YS, YT, G )
+      IMPLICIT NONE
 *
 *  Tests SSYMV, SSBMV and SSPMV.
 *
@@ -1111,6 +1142,7 @@ SUBROUTINE SCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       SUBROUTINE SCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, XT, G, Z )
+      IMPLICIT NONE
 *
 *  Tests STRMV, STBMV, STPMV, STRSV, STBSV and STPSV.
 *
@@ -1469,6 +1501,7 @@ SUBROUTINE SCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z )
+      IMPLICIT NONE
 *
 *  Tests SGER.
 *
@@ -1730,6 +1763,7 @@ SUBROUTINE SCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z )
+      IMPLICIT NONE
 *
 *  Tests SSYR and SSPR.
 *
@@ -2008,6 +2042,7 @@ SUBROUTINE SCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z )
+      IMPLICIT NONE
 *
 *  Tests SSYR2 and SSPR2.
 *
@@ -2320,6 +2355,7 @@ SUBROUTINE SCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *
       END
       SUBROUTINE SCHKE( ISNUM, SRNAMT, NOUT )
+      IMPLICIT NONE
 *
 *  Tests the error exits from the Level 2 Blas.
 *  Requires a special version of the error-handling routine XERBLA.
@@ -2647,6 +2683,7 @@ SUBROUTINE SCHKE( ISNUM, SRNAMT, NOUT )
       END
       SUBROUTINE SMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, KL,
      $                  KU, RESET, TRANSL )
+      IMPLICIT NONE
 *
 *  Generates values for an M by N matrix A within the bandwidth
 *  defined by KL and KU.
@@ -2823,6 +2860,7 @@ SUBROUTINE SMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, KL,
       END
       SUBROUTINE SMVCH( TRANS, M, N, ALPHA, A, NMAX, X, INCX, BETA, Y,
      $                  INCY, YT, G, YY, EPS, ERR, FATAL, NOUT, MV )
+      IMPLICIT NONE
 *
 *  Checks the results of the computational tests.
 *
@@ -2939,6 +2977,7 @@ SUBROUTINE SMVCH( TRANS, M, N, ALPHA, A, NMAX, X, INCX, BETA, Y,
 *
       END
       LOGICAL FUNCTION LSE( RI, RJ, LR )
+      IMPLICIT NONE
 *
 *  Tests if two arrays are identical.
 *
@@ -2969,6 +3008,7 @@ LOGICAL FUNCTION LSE( RI, RJ, LR )
 *
       END
       LOGICAL FUNCTION LSERES( TYPE, UPLO, M, N, AA, AS, LDA )
+      IMPLICIT NONE
 *
 *  Tests if selected elements in two arrays are equal.
 *
@@ -3028,6 +3068,7 @@ LOGICAL FUNCTION LSERES( TYPE, UPLO, M, N, AA, AS, LDA )
 *
       END
       REAL FUNCTION SBEG( RESET )
+      IMPLICIT NONE
 *
 *  Generates random numbers uniformly distributed between -0.5 and 0.5.
 *
@@ -3074,6 +3115,7 @@ REAL FUNCTION SBEG( RESET )
 *
       END
       REAL FUNCTION SDIFF( X, Y )
+      IMPLICIT NONE
 *
 *  Auxiliary routine for test program for Level 2 Blas.
 *
@@ -3090,6 +3132,7 @@ REAL FUNCTION SDIFF( X, Y )
 *
       END
       SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      IMPLICIT NONE
 *
 *  Tests whether XERBLA has detected an error when it should.
 *
@@ -3116,8 +3159,43 @@ SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
 *
 *     End of CHKXER
 *
+      END
+      SUBROUTINE SREGR1( TRANS, M, N, LY, KL, KU, ALPHA, A, LDA, X,
+     $   INCX, BETA, Y, INCY, YS )
+      IMPLICIT NONE
+*
+*  Input initialization for regression test.
+*
+*     .. Scalar Arguments ..
+      CHARACTER*1        TRANS
+      INTEGER            LY, M, N, KL, KU, LDA, INCX, INCY
+      REAL               ALPHA, BETA
+*     .. Array Arguments ..
+      REAL               A(LDA,*), X(*), Y(*), YS(*)
+*     .. Local Scalars ..
+      INTEGER            I
+*     .. Intrinsic Functions ..
+      INTRINSIC          REAL
+*     .. Executable Statements ..
+      TRANS = 'T'
+      M = 0
+      N = 5
+      KL = 0
+      KU = 0
+      ALPHA = 1.0
+      LDA = MAX( 1, M )
+      INCX = 1
+      BETA = -0.7
+      INCY = 1
+      LY = ABS( INCY )*N
+      DO 10 I = 1, LY
+         Y( I ) = 42.0 + REAL( I )
+         YS( I ) = Y( I )
+  10  CONTINUE
+      RETURN
       END
       SUBROUTINE XERBLA( SRNAME, INFO )
+      IMPLICIT NONE
 *
 *  This is a special version of XERBLA to be used only as part of
 *  the test program for testing error exits from the Level 2 BLAS
diff --git a/BLAS/TESTING/sblat3.f b/BLAS/TESTING/sblat3.f
index c4c1fccee8..d8f2ed85cb 100644
--- a/BLAS/TESTING/sblat3.f
+++ b/BLAS/TESTING/sblat3.f
@@ -19,8 +19,8 @@
 *> Test program for the REAL             Level 3 Blas.
 *>
 *> The program must be driven by a short data file. The first 14 records
-*> of the file are read using list-directed input, the last 6 records
-*> are read using the format ( A6, L2 ). An annotated example of a data
+*> of the file are read using list-directed input, the last 7 records
+*> are read using the format ( A7, L2 ). An annotated example of a data
 *> file can be obtained by deleting the first 3 characters from the
 *> following 20 lines:
 *> 'sblat3.out'      NAME OF SUMMARY OUTPUT FILE
@@ -43,6 +43,7 @@
 *> STRSM  T PUT F FOR NO TEST. SAME COLUMNS.
 *> SSYRK  T PUT F FOR NO TEST. SAME COLUMNS.
 *> SSYR2K T PUT F FOR NO TEST. SAME COLUMNS.
+*> SGEMMTR T PUT F FOR NO TEST. SAME COLUMNS.
 *>
 *> Further Details
 *> ===============
@@ -79,6 +80,7 @@
 *
 *  =====================================================================
       PROGRAM SBLAT3
+      IMPLICIT NONE
 *
 *  -- Reference BLAS test routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -90,7 +92,7 @@ PROGRAM SBLAT3
       INTEGER            NIN
       PARAMETER          ( NIN = 5 )
       INTEGER            NSUBS
-      PARAMETER          ( NSUBS = 6 )
+      PARAMETER          ( NSUBS = 7 )
       REAL               ZERO, ONE
       PARAMETER          ( ZERO = 0.0, ONE = 1.0 )
       INTEGER            NMAX
@@ -103,7 +105,7 @@ PROGRAM SBLAT3
       LOGICAL            FATAL, LTESTT, REWI, SAME, SFATAL, TRACE,
      $                   TSTERR
       CHARACTER*1        TRANSA, TRANSB
-      CHARACTER*6        SNAMET
+      CHARACTER*7        SNAMET
       CHARACTER*32       SNAPS, SUMMRY
 *     .. Local Arrays ..
       REAL               AA( NMAX*NMAX ), AB( NMAX, 2*NMAX ),
@@ -114,25 +116,26 @@ PROGRAM SBLAT3
      $                   G( NMAX ), W( 2*NMAX )
       INTEGER            IDIM( NIDMAX )
       LOGICAL            LTEST( NSUBS )
-      CHARACTER*6        SNAMES( NSUBS )
+      CHARACTER*7        SNAMES( NSUBS )
 *     .. External Functions ..
       REAL               SDIFF
       LOGICAL            LSE
       EXTERNAL           SDIFF, LSE
 *     .. External Subroutines ..
       EXTERNAL           SCHK1, SCHK2, SCHK3, SCHK4, SCHK5, SCHKE, SMMCH
+      EXTERNAL           SCHK6
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
       LOGICAL            LERR, OK
-      CHARACTER*6        SRNAMT
+      CHARACTER*7        SRNAMT
 *     .. Common blocks ..
       COMMON             /INFOC/INFOT, NOUTC, OK, LERR
       COMMON             /SRNAMC/SRNAMT
 *     .. Data statements ..
-      DATA               SNAMES/'SGEMM ', 'SSYMM ', 'STRMM ', 'STRSM ',
-     $                   'SSYRK ', 'SSYR2K'/
+      DATA               SNAMES/'SGEMM', 'SSYMM  ', 'STRMM  ',
+     $                   'STRSM  ', 'SSYRK  ', 'SSYR2K ', 'SGEMMTR'/
 *     .. Executable Statements ..
 *
 *     Read name and unit number for summary output file and open file.
@@ -309,7 +312,7 @@ PROGRAM SBLAT3
             INFOT = 0
             OK = .TRUE.
             FATAL = .FALSE.
-            GO TO ( 140, 150, 160, 160, 170, 180 )ISNUM
+            GO TO ( 140, 150, 160, 160, 170, 180, 185 )ISNUM
 *           Test SGEMM, 01.
   140       CALL SCHK1( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
@@ -338,6 +341,12 @@ PROGRAM SBLAT3
      $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
      $                  NMAX, AB, AA, AS, BB, BS, C, CC, CS, CT, G, W )
             GO TO 190
+*           Test SGEMMTR, 07.
+  185       CALL SCHK6( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
+     $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
+     $                  NMAX, AB, AA, AS, AB( 1, NMAX + 1 ), BB, BS, C,
+     $                  CC, CS, CT, G )
+            GO TO 190
 *
   190       IF( FATAL.AND.SFATAL )
      $         GO TO 210
@@ -372,7 +381,7 @@ PROGRAM SBLAT3
  9992 FORMAT( '   FOR BETA           ', 7F6.1 )
  9991 FORMAT( ' AMEND DATA FILE OR INCREASE ARRAY SIZES IN PROGRAM',
      $      /' ******* TESTS ABANDONED *******' )
- 9990 FORMAT( ' SUBPROGRAM NAME ', A6, ' NOT RECOGNIZED', /' ******* T',
+ 9990 FORMAT( ' SUBPROGRAM NAME ', A7, ' NOT RECOGNIZED', /' ******* T',
      $      'ESTS ABANDONED *******' )
  9989 FORMAT( ' ERROR IN SMMCH -  IN-LINE DOT PRODUCTS ARE BEING EVALU',
      $      'ATED WRONGLY.', /' SMMCH WAS CALLED WITH TRANSA = ', A1,
@@ -380,8 +389,8 @@ PROGRAM SBLAT3
      $      'ERR = ', F12.3, '.', /' THIS MAY BE DUE TO FAULTS IN THE ',
      $      'ARITHMETIC OR THE COMPILER.', /' ******* TESTS ABANDONED ',
      $      '*******' )
- 9988 FORMAT( A6, L2 )
- 9987 FORMAT( 1X, A6, ' WAS NOT TESTED' )
+ 9988 FORMAT( A7, L2 )
+ 9987 FORMAT( 1X, A7, ' WAS NOT TESTED' )
  9986 FORMAT( /' END OF TESTS' )
  9985 FORMAT( /' ******* FATAL ERROR - TESTS ABANDONED *******' )
  9984 FORMAT( ' ERROR-EXITS WILL NOT BE TESTED' )
@@ -392,6 +401,7 @@ PROGRAM SBLAT3
       SUBROUTINE SCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G )
+      IMPLICIT NONE
 *
 *  Tests SGEMM.
 *
@@ -410,7 +420,7 @@ SUBROUTINE SCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       REAL               A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -653,15 +663,15 @@ SUBROUTINE SCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   130 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A6, '(''', A1, ''',''', A1, ''',',
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A7, '(''', A1, ''',''', A1, ''',',
      $      3( I3, ',' ), F4.1, ', A,', I3, ', B,', I3, ',', F4.1, ', ',
      $      'C,', I3, ').' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -673,6 +683,7 @@ SUBROUTINE SCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       SUBROUTINE SCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G )
+      IMPLICIT NONE
 *
 *  Tests SSYMM.
 *
@@ -691,7 +702,7 @@ SUBROUTINE SCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       REAL               A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -923,15 +934,15 @@ SUBROUTINE SCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   120 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ', B,', I3, ',', F4.1, ', C,', I3, ')   ',
      $      ' .' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -943,6 +954,7 @@ SUBROUTINE SCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       SUBROUTINE SCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NMAX, A, AA, AS,
      $                  B, BB, BS, CT, G, C )
+      IMPLICIT NONE
 *
 *  Tests STRMM and STRSM.
 *
@@ -961,7 +973,7 @@ SUBROUTINE SCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       REAL               A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1229,15 +1241,15 @@ SUBROUTINE SCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   160 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A6, '(', 4( '''', A1, ''',' ), 2( I3, ',' ),
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A7, '(', 4( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ', B,', I3, ')        .' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
      $      '******' )
@@ -1248,6 +1260,7 @@ SUBROUTINE SCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       SUBROUTINE SCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G )
+      IMPLICIT NONE
 *
 *  Tests SSYRK.
 *
@@ -1266,7 +1279,7 @@ SUBROUTINE SCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       REAL               A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1503,16 +1516,16 @@ SUBROUTINE SCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   130 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
  9995 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
- 9994 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9994 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ',', F4.1, ', C,', I3, ')           .' )
  9993 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
      $      '******' )
@@ -1523,6 +1536,7 @@ SUBROUTINE SCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       SUBROUTINE SCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  AB, AA, AS, BB, BS, C, CC, CS, CT, G, W )
+      IMPLICIT NONE
 *
 *  Tests SSYR2K.
 *
@@ -1541,7 +1555,7 @@ SUBROUTINE SCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       REAL               AA( NMAX*NMAX ), AB( 2*NMAX*NMAX ),
      $                   ALF( NALF ), AS( NMAX*NMAX ), BB( NMAX*NMAX ),
@@ -1816,16 +1830,16 @@ SUBROUTINE SCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   160 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
  9995 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
- 9994 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9994 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ', B,', I3, ',', F4.1, ', C,', I3, ')   ',
      $      ' .' )
  9993 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1835,6 +1849,7 @@ SUBROUTINE SCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *
       END
       SUBROUTINE SCHKE( ISNUM, SRNAMT, NOUT )
+      IMPLICIT NONE
 *
 *  Tests the error exits from the Level 3 Blas.
 *  Requires a special version of the error-handling routine XERBLA.
@@ -1853,7 +1868,7 @@ SUBROUTINE SCHKE( ISNUM, SRNAMT, NOUT )
 *
 *     .. Scalar Arguments ..
       INTEGER            ISNUM, NOUT
-      CHARACTER*6        SRNAMT
+      CHARACTER*7        SRNAMT
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
       LOGICAL            LERR, OK
@@ -1866,7 +1881,7 @@ SUBROUTINE SCHKE( ISNUM, SRNAMT, NOUT )
       REAL               A( 2, 1 ), B( 2, 1 ), C( 2, 1 )
 *     .. External Subroutines ..
       EXTERNAL           CHKXER, SGEMM, SSYMM, SSYR2K, SSYRK, STRMM,
-     $                   STRSM
+     $                   STRSM, SGEMMTR
 *     .. Common blocks ..
       COMMON             /INFOC/INFOT, NOUTC, OK, LERR
 *     .. Executable Statements ..
@@ -1882,7 +1897,7 @@ SUBROUTINE SCHKE( ISNUM, SRNAMT, NOUT )
       ALPHA = ONE
       BETA = TWO
 *
-      GO TO ( 10, 20, 30, 40, 50, 60 )ISNUM
+      GO TO ( 10, 20, 30, 40, 50, 60, 70 )ISNUM
    10 INFOT = 1
       CALL SGEMM( '/', 'N', 0, 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -1967,7 +1982,7 @@ SUBROUTINE SCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 13
       CALL SGEMM( 'T', 'T', 2, 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 70
+      GO TO 80
    20 INFOT = 1
       CALL SSYMM( '/', 'U', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2034,7 +2049,7 @@ SUBROUTINE SCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 12
       CALL SSYMM( 'R', 'L', 2, 0, ALPHA, A, 1, B, 2, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 70
+      GO TO 80
    30 INFOT = 1
       CALL STRMM( '/', 'U', 'N', 'N', 0, 0, ALPHA, A, 1, B, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2143,7 +2158,7 @@ SUBROUTINE SCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 11
       CALL STRMM( 'R', 'L', 'T', 'N', 2, 0, ALPHA, A, 1, B, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 70
+      GO TO 80
    40 INFOT = 1
       CALL STRSM( '/', 'U', 'N', 'N', 0, 0, ALPHA, A, 1, B, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2252,7 +2267,7 @@ SUBROUTINE SCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 11
       CALL STRSM( 'R', 'L', 'T', 'N', 2, 0, ALPHA, A, 1, B, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 70
+      GO TO 80
    50 INFOT = 1
       CALL SSYRK( '/', 'N', 0, 0, ALPHA, A, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2307,7 +2322,7 @@ SUBROUTINE SCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 10
       CALL SSYRK( 'L', 'T', 2, 0, ALPHA, A, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 70
+      GO TO 80
    60 INFOT = 1
       CALL SSYR2K( '/', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2374,16 +2389,95 @@ SUBROUTINE SCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 12
       CALL SSYR2K( 'L', 'T', 2, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      GO TO 80
+   70 INFOT = 1
+      CALL SGEMMTR( '/', 'N', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL SGEMMTR( 'U', '/', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL SGEMMTR( 'U', '/', 'T', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL SGEMMTR( 'U', 'N', '/', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL SGEMMTR( 'U', 'T', '/', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL SGEMMTR( 'U', 'N', 'N', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL SGEMMTR( 'U', 'N', 'T', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL SGEMMTR( 'U', 'T', 'N', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL SGEMMTR( 'U', 'T', 'T', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL SGEMMTR( 'U', 'N', 'N', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL SGEMMTR( 'U', 'N', 'T', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL SGEMMTR( 'U', 'T', 'N', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL SGEMMTR( 'U', 'T', 'T', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL SGEMMTR( 'U', 'N', 'N', 2, 0,  ALPHA, A, 1, B, 2, BETA, C,
+     $              2 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL SGEMMTR( 'U', 'N', 'T', 2, 0, ALPHA, A, 1, B, 2, BETA, C, 2 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL SGEMMTR( 'U', 'N', 'N', 0, 2, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL SGEMMTR( 'U', 'T', 'N', 0, 2, ALPHA, A, 2, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL SGEMMTR( 'U', 'N', 'T', 2, 0, ALPHA, A, 2, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL SGEMMTR( 'U', 'T', 'T', 2, 0, ALPHA, A, 2, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL SGEMMTR( 'U', 'N', 'N', 2, 0, ALPHA, A, 2, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL SGEMMTR( 'U', 'N', 'T', 2, 0, ALPHA, A, 2, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL SGEMMTR( 'U', 'T', 'N', 2, 0, ALPHA, A, 2, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL SGEMMTR( 'U', 'T', 'T', 2, 0, ALPHA, A, 2, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
 *
-   70 IF( OK )THEN
+   80 IF( OK )THEN
          WRITE( NOUT, FMT = 9999 )SRNAMT
       ELSE
          WRITE( NOUT, FMT = 9998 )SRNAMT
       END IF
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE TESTS OF ERROR-EXITS' )
- 9998 FORMAT( ' ******* ', A6, ' FAILED THE TESTS OF ERROR-EXITS *****',
+ 9999 FORMAT( ' ', A7, ' PASSED THE TESTS OF ERROR-EXITS' )
+ 9998 FORMAT( ' ******* ', A7, ' FAILED THE TESTS OF ERROR-EXITS *****',
      $      '**' )
 *
 *     End of SCHKE
@@ -2391,6 +2485,7 @@ SUBROUTINE SCHKE( ISNUM, SRNAMT, NOUT )
       END
       SUBROUTINE SMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, RESET,
      $                  TRANSL )
+      IMPLICIT NONE
 *
 *  Generates values for an M by N matrix A.
 *  Stores the values in the array AA in the data structure required
@@ -2505,6 +2600,7 @@ SUBROUTINE SMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, RESET,
       SUBROUTINE SMMCH( TRANSA, TRANSB, M, N, KK, ALPHA, A, LDA, B, LDB,
      $                  BETA, C, LDC, CT, G, CC, LDCC, EPS, ERR, FATAL,
      $                  NOUT, MV )
+      IMPLICIT NONE
 *
 *  Checks the results of the computational tests.
 *
@@ -2625,6 +2721,7 @@ SUBROUTINE SMMCH( TRANSA, TRANSB, M, N, KK, ALPHA, A, LDA, B, LDB,
 *
       END
       LOGICAL FUNCTION LSE( RI, RJ, LR )
+      IMPLICIT NONE
 *
 *  Tests if two arrays are identical.
 *
@@ -2657,6 +2754,7 @@ LOGICAL FUNCTION LSE( RI, RJ, LR )
 *
       END
       LOGICAL FUNCTION LSERES( TYPE, UPLO, M, N, AA, AS, LDA )
+      IMPLICIT NONE
 *
 *  Tests if selected elements in two arrays are equal.
 *
@@ -2718,6 +2816,7 @@ LOGICAL FUNCTION LSERES( TYPE, UPLO, M, N, AA, AS, LDA )
 *
       END
       REAL FUNCTION SBEG( RESET )
+      IMPLICIT NONE
 *
 *  Generates random numbers uniformly distributed between -0.5 and 0.5.
 *
@@ -2764,6 +2863,7 @@ REAL FUNCTION SBEG( RESET )
 *
       END
       REAL FUNCTION SDIFF( X, Y )
+      IMPLICIT NONE
 *
 *  Auxiliary routine for test program for Level 3 Blas.
 *
@@ -2783,6 +2883,7 @@ REAL FUNCTION SDIFF( X, Y )
 *
       END
       SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      IMPLICIT NONE
 *
 *  Tests whether XERBLA has detected an error when it should.
 *
@@ -2797,7 +2898,7 @@ SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
 *     .. Scalar Arguments ..
       INTEGER            INFOT, NOUT
       LOGICAL            LERR, OK
-      CHARACTER*6        SRNAMT
+      CHARACTER*7        SRNAMT
 *     .. Executable Statements ..
       IF( .NOT.LERR )THEN
          WRITE( NOUT, FMT = 9999 )INFOT, SRNAMT
@@ -2807,12 +2908,13 @@ SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
       RETURN
 *
  9999 FORMAT( ' ***** ILLEGAL VALUE OF PARAMETER NUMBER ', I2, ' NOT D',
-     $      'ETECTED BY ', A6, ' *****' )
+     $      'ETECTED BY ', A7, ' *****' )
 *
 *     End of CHKXER
 *
       END
       SUBROUTINE XERBLA( SRNAME, INFO )
+      IMPLICIT NONE
 *
 *  This is a special version of XERBLA to be used only as part of
 *  the test program for testing error exits from the Level 3 BLAS
@@ -2833,14 +2935,16 @@ SUBROUTINE XERBLA( SRNAME, INFO )
 *
 *     .. Scalar Arguments ..
       INTEGER            INFO
-      CHARACTER*6        SRNAME
+      CHARACTER*(*)      SRNAME
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUT
       LOGICAL            LERR, OK
-      CHARACTER*6        SRNAMT
+      CHARACTER*7        SRNAMT
 *     .. Common blocks ..
       COMMON             /INFOC/INFOT, NOUT, OK, LERR
       COMMON             /SRNAMC/SRNAMT
+*     .. Locals ..
+      INTEGER            SRLEN
 *     .. Executable Statements ..
       LERR = .TRUE.
       IF( INFO.NE.INFOT )THEN
@@ -2851,7 +2955,8 @@ SUBROUTINE XERBLA( SRNAME, INFO )
          END IF
          OK = .FALSE.
       END IF
-      IF( SRNAME.NE.SRNAMT )THEN
+      SRLEN = MIN(LEN_TRIM(SRNAME), LEN_TRIM(SRNAMT))
+      IF( SRNAME(1:SRLEN).NE.SRNAMT(1:SRLEN) )THEN
          WRITE( NOUT, FMT = 9998 )SRNAME, SRNAMT
          OK = .FALSE.
       END IF
@@ -2859,11 +2964,430 @@ SUBROUTINE XERBLA( SRNAME, INFO )
 *
  9999 FORMAT( ' ******* XERBLA WAS CALLED WITH INFO = ', I6, ' INSTEAD',
      $      ' OF ', I2, ' *******' )
- 9998 FORMAT( ' ******* XERBLA WAS CALLED WITH SRNAME = ', A6, ' INSTE',
-     $      'AD OF ', A6, ' *******' )
+ 9998 FORMAT( ' ******* XERBLA WAS CALLED WITH SRNAME = ', A7, ' INSTE',
+     $      'AD OF ', A7, ' *******' )
  9997 FORMAT( ' ******* XERBLA WAS CALLED WITH INFO = ', I6,
      $      ' *******' )
 *
 *     End of XERBLA
+*
+      END
+
+
+      SUBROUTINE SCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
+     $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
+     $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G )
+      IMPLICIT NONE
+*
+*  Tests SGEMMTR.
+*
+*  Auxiliary routine for test program for Level 3 Blas.
+*
+*  -- Written on 19-July-2023.
+*     Martin Koehler, MPI Magdeburg
+*
+*     .. Parameters ..
+      REAL               ZERO
+      PARAMETER          ( ZERO = 0.0D0 )
+*     .. Scalar Arguments ..
+      REAL               EPS, THRESH
+      INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
+      LOGICAL            FATAL, REWI, TRACE
+      CHARACTER*7        SNAME
+*     .. Array Arguments ..
+      REAL               A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
+     $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
+     $                   BB( NMAX*NMAX ), BET( NBET ), BS( NMAX*NMAX ),
+     $                   C( NMAX, NMAX ), CC( NMAX*NMAX ),
+     $                   CS( NMAX*NMAX ), CT( NMAX ), G( NMAX )
+      INTEGER            IDIM( NIDIM )
+*     .. Local Scalars ..
+      REAL               ALPHA, ALS, BETA, BLS, ERR, ERRMAX
+      INTEGER            I, IA, IB, ICA, ICB, IK, IN, K, KS, LAA,
+     $                   LBB, LCC, LDA, LDAS, LDB, LDBS, LDC, LDCS,
+     $                   MA, MB, N, NA, NARGS, NB, NC, NS, IS
+      LOGICAL            NULL, RESET, SAME, TRANA, TRANB
+      CHARACTER*1        TRANAS, TRANBS, TRANSA, TRANSB, UPLO, UPLOS
+      CHARACTER*3        ICH
+      CHARACTER*2        ISHAPE
+*     .. Local Arrays ..
+      LOGICAL            ISAME( 13 )
+*     .. External Functions ..
+      LOGICAL            LSE, LSERES
+      EXTERNAL           LSE, LSERES
+*     .. External Subroutines ..
+      EXTERNAL           SGEMMTR, SMAKE, SMMTCH
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX
+*     .. Scalars in Common ..
+      INTEGER            INFOT, NOUTC
+      LOGICAL            LERR, OK
+*     .. Common blocks ..
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
+*     .. Data statements ..
+      DATA               ICH/'NTC'/
+      DATA               ISHAPE/'UL'/
+*     .. Executable Statements ..
+*
+      NARGS = 13
+      NC = 0
+      RESET = .TRUE.
+      ERRMAX = ZERO
+*
+      DO 100 IN = 1, NIDIM
+         N = IDIM( IN )
+*        Set LDC to 1 more than minimum value if room.
+         LDC = N
+         IF( LDC.LT.NMAX )
+     $      LDC = LDC + 1
+*        Skip tests if not enough room.
+         IF( LDC.GT.NMAX )
+     $      GO TO 100
+         LCC = LDC*N
+         NULL = N.LE.0
+*
+         DO 90 IK = 1, NIDIM
+            K = IDIM( IK )
+*
+            DO 80 ICA = 1, 3
+               TRANSA = ICH( ICA: ICA )
+               TRANA = TRANSA.EQ.'T'.OR.TRANSA.EQ.'C'
+*
+               IF( TRANA )THEN
+                  MA = K
+                  NA = N
+               ELSE
+                  MA = N
+                  NA = K
+               END IF
+*              Set LDA to 1 more than minimum value if room.
+               LDA = MA
+               IF( LDA.LT.NMAX )
+     $            LDA = LDA + 1
+*              Skip tests if not enough room.
+               IF( LDA.GT.NMAX )
+     $            GO TO 80
+               LAA = LDA*NA
+*
+*              Generate the matrix A.
+*
+               CALL SMAKE( 'GE', ' ', ' ', MA, NA, A, NMAX, AA, LDA,
+     $                     RESET, ZERO )
+*
+               DO 70 ICB = 1, 3
+                  TRANSB = ICH( ICB: ICB )
+                  TRANB = TRANSB.EQ.'T'.OR.TRANSB.EQ.'C'
+*
+                  IF( TRANB )THEN
+                     MB = N
+                     NB = K
+                  ELSE
+                     MB = K
+                     NB = N
+                  END IF
+*                 Set LDB to 1 more than minimum value if room.
+                  LDB = MB
+                  IF( LDB.LT.NMAX )
+     $               LDB = LDB + 1
+*                 Skip tests if not enough room.
+                  IF( LDB.GT.NMAX )
+     $               GO TO 70
+                  LBB = LDB*NB
+*
+*                 Generate the matrix B.
+*
+                  CALL SMAKE( 'GE', ' ', ' ', MB, NB, B, NMAX, BB,
+     $                        LDB, RESET, ZERO )
+*
+                  DO 60 IA = 1, NALF
+                     ALPHA = ALF( IA )
+*
+                     DO 50 IB = 1, NBET
+                        BETA = BET( IB )
+
+                        DO 45 IS = 1, 2
+                           UPLO = ISHAPE( IS: IS )
+
+*
+*                          Generate the matrix C.
+*
+                           CALL SMAKE( 'GE', UPLO, ' ', N, N, C,
+     $                                 NMAX, CC, LDC, RESET, ZERO )
+*
+                           NC = NC + 1
+*
+*                          Save every datum before calling the
+*                          subroutine.
+*
+                           UPLOS = UPLO
+                           TRANAS = TRANSA
+                           TRANBS = TRANSB
+                           NS = N
+                           KS = K
+                           ALS = ALPHA
+                           DO 10 I = 1, LAA
+                              AS( I ) = AA( I )
+   10                      CONTINUE
+                           LDAS = LDA
+                           DO 20 I = 1, LBB
+                              BS( I ) = BB( I )
+   20                      CONTINUE
+                           LDBS = LDB
+                           BLS = BETA
+                           DO 30 I = 1, LCC
+                              CS( I ) = CC( I )
+   30                      CONTINUE
+                           LDCS = LDC
+*
+*                          Call the subroutine.
+*
+                           IF( TRACE )
+     $                        WRITE( NTRA, FMT = 9995 )NC, SNAME,
+     $                        UPLO, TRANSA, TRANSB, N, K, ALPHA, LDA,
+     $                        LDB, BETA, LDC
+                           IF( REWI )
+     $                        REWIND NTRA
+                           CALL SGEMMTR( UPLO, TRANSA, TRANSB, N,
+     $                                  K, ALPHA, AA, LDA, BB, LDB,
+     $                                  BETA, CC, LDC )
+*
+*                          Check if error-exit was taken incorrectly.
+*
+                           IF( .NOT.OK )THEN
+                              WRITE( NOUT, FMT = 9994 )
+                              FATAL = .TRUE.
+                              GO TO 120
+                           END IF
+*
+*                          See what data changed inside subroutines.
+*
+                           ISAME( 1 ) = UPLO.EQ.UPLOS
+                           ISAME( 2 ) = TRANSA.EQ.TRANAS
+                           ISAME( 3 ) = TRANSB.EQ.TRANBS
+                           ISAME( 4 ) = NS.EQ.N
+                           ISAME( 5 ) = KS.EQ.K
+                           ISAME( 6 ) = ALS.EQ.ALPHA
+                           ISAME( 7 ) = LSE( AS, AA, LAA )
+                           ISAME( 8 ) = LDAS.EQ.LDA
+                           ISAME( 9 ) = LSE( BS, BB, LBB )
+                           ISAME( 10 ) = LDBS.EQ.LDB
+                           ISAME( 11 ) = BLS.EQ.BETA
+                           IF( NULL )THEN
+                              ISAME( 12 ) = LSE( CS, CC, LCC )
+                           ELSE
+                              ISAME( 12 ) = LSERES( 'GE', ' ', N, N,
+     $                                          CS, CC, LDC )
+                           END IF
+                           ISAME( 13 ) = LDCS.EQ.LDC
+*
+*                          If data was incorrectly changed, report
+*                          and return.
+*
+                           SAME = .TRUE.
+                           DO 40 I = 1, NARGS
+                              SAME = SAME.AND.ISAME( I )
+                              IF( .NOT.ISAME( I ) )
+     $                           WRITE( NOUT, FMT = 9998 )I
+   40                      CONTINUE
+                           IF( .NOT.SAME )THEN
+                              FATAL = .TRUE.
+                              GO TO 120
+                           END IF
+*
+                           IF( .NOT.NULL )THEN
+*
+*                             Check the result.
+*
+                              CALL SMMTCH( UPLO, TRANSA, TRANSB,
+     $                                 N, K,
+     $                                 ALPHA, A, NMAX, B, NMAX, BETA,
+     $                                 C, NMAX, CT, G, CC, LDC, EPS,
+     $                                 ERR, FATAL, NOUT, .TRUE. )
+                              ERRMAX = MAX( ERRMAX, ERR )
+*                             If got really bad answer, report and
+*                             return.
+                              IF( FATAL )
+     $                           GO TO 120
+                           END IF
+*
+   45                   CONTINUE
+*
+   50                CONTINUE
+*
+   60             CONTINUE
+*
+   70          CONTINUE
+*
+   80       CONTINUE
+*
+   90    CONTINUE
+*
+  100 CONTINUE
+*
+*
+*     Report result.
+*
+      IF( ERRMAX.LT.THRESH )THEN
+         WRITE( NOUT, FMT = 9999 )SNAME, NC
+      ELSE
+         WRITE( NOUT, FMT = 9997 )SNAME, NC, ERRMAX
+      END IF
+      GO TO 130
+*
+  120 CONTINUE
+      WRITE( NOUT, FMT = 9996 )SNAME
+      WRITE( NOUT, FMT = 9995 )NC, SNAME, UPLO, TRANSA, TRANSB, N, K,
+     $   ALPHA, LDA, LDB, BETA, LDC
+*
+  130 CONTINUE
+      RETURN
+*
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+     $      'S)' )
+ 9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
+     $      'ANGED INCORRECTLY *******' )
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+     $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
+     $      ' - SUSPECT *******' )
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A7, '(''',A1, ''',''',A1, ''',''', A1,''',',
+     $      2( I3, ',' ), F4.1, ', A,', I3, ', B,', I3, ',', F4.1, ', ',
+     $      'C,', I3, ').' )
+ 9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
+     $      '******' )
+*
+*     End of DCHK6
+*
+      END
+
+      SUBROUTINE SMMTCH( UPLO, TRANSA, TRANSB, N, KK, ALPHA, A, LDA,
+     $                  B, LDB, BETA, C, LDC, CT, G, CC, LDCC, EPS, ERR,
+     $                  FATAL, NOUT, MV )
+      IMPLICIT NONE
+*
+*  Checks the results of the computational tests.
+*
+*  Auxiliary routine for test program for Level 3 Blas. (SGEMMTR)
+*
+*  -- Written on 19-July-2023.
+*     Martin Koehler, MPI Magdeburg
+*
+*     .. Parameters ..
+      REAL               ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+*     .. Scalar Arguments ..
+      REAL               ALPHA, BETA, EPS, ERR
+      INTEGER            KK, LDA, LDB, LDC, LDCC, N, NOUT
+      LOGICAL            FATAL, MV
+      CHARACTER*1        UPLO, TRANSA, TRANSB
+*     .. Array Arguments ..
+      REAL               A( LDA, * ), B( LDB, * ), C( LDC, * ),
+     $                   CC( LDCC, * ), CT( * ), G( * )
+*     .. Local Scalars ..
+      REAL               ERRI
+      INTEGER            I, J, K, ISTART, ISTOP
+      LOGICAL            TRANA, TRANB, UPPER
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, SQRT
+*     .. Executable Statements ..
+      UPPER = UPLO.EQ.'U'
+      TRANA = TRANSA.EQ.'T'.OR.TRANSA.EQ.'C'
+      TRANB = TRANSB.EQ.'T'.OR.TRANSB.EQ.'C'
+*
+*     Compute expected result, one column at a time, in CT using data
+*     in A, B and C.
+*     Compute gauges in G.
+*
+      ISTART = 1
+      ISTOP  = N
+
+      DO 120 J = 1, N
+*
+         IF ( UPPER ) THEN
+             ISTART = 1
+             ISTOP = J
+         ELSE
+             ISTART = J
+             ISTOP = N
+         END IF
+         DO 10 I = ISTART, ISTOP
+            CT( I ) = ZERO
+            G( I ) = ZERO
+   10    CONTINUE
+         IF( .NOT.TRANA.AND..NOT.TRANB )THEN
+            DO 30 K = 1, KK
+               DO 20 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( I, K )*B( K, J )
+                  G( I ) = G( I ) + ABS( A( I, K ) )*ABS( B( K, J ) )
+   20          CONTINUE
+   30       CONTINUE
+         ELSE IF( TRANA.AND..NOT.TRANB )THEN
+            DO 50 K = 1, KK
+               DO 40 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( K, I )*B( K, J )
+                  G( I ) = G( I ) + ABS( A( K, I ) )*ABS( B( K, J ) )
+   40          CONTINUE
+   50       CONTINUE
+         ELSE IF( .NOT.TRANA.AND.TRANB )THEN
+            DO 70 K = 1, KK
+               DO 60 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( I, K )*B( J, K )
+                  G( I ) = G( I ) + ABS( A( I, K ) )*ABS( B( J, K ) )
+   60          CONTINUE
+   70       CONTINUE
+         ELSE IF( TRANA.AND.TRANB )THEN
+            DO 90 K = 1, KK
+               DO 80 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( K, I )*B( J, K )
+                  G( I ) = G( I ) + ABS( A( K, I ) )*ABS( B( J, K ) )
+   80          CONTINUE
+   90       CONTINUE
+         END IF
+         DO 100 I = ISTART, ISTOP
+            CT( I ) = ALPHA*CT( I ) + BETA*C( I, J )
+            G( I ) = ABS( ALPHA )*G( I ) + ABS( BETA )*ABS( C( I, J ) )
+  100    CONTINUE
+*
+*        Compute the error ratio for this result.
+*
+         ERR = ZERO
+         DO 110 I = ISTART, ISTOP
+            ERRI = ABS( CT( I ) - CC( I, J ) )/EPS
+            IF( G( I ).NE.ZERO )
+     $         ERRI = ERRI/G( I )
+            ERR = MAX( ERR, ERRI )
+            IF( ERR*SQRT( EPS ).GE.ONE )
+     $         GO TO 130
+  110    CONTINUE
+*
+  120 CONTINUE
+*
+*     If the loop completes, all results are at least half accurate.
+      GO TO 150
+*
+*     Report fatal error.
+*
+  130 FATAL = .TRUE.
+      WRITE( NOUT, FMT = 9999 )
+      DO 140 I = ISTART, ISTOP
+         IF( MV )THEN
+            WRITE( NOUT, FMT = 9998 )I, CT( I ), CC( I, J )
+         ELSE
+            WRITE( NOUT, FMT = 9998 )I, CC( I, J ), CT( I )
+         END IF
+  140 CONTINUE
+      IF( N.GT.1 )
+     $   WRITE( NOUT, FMT = 9997 )J
+*
+  150 CONTINUE
+      RETURN
+*
+ 9999 FORMAT( ' ******* FATAL ERROR - COMPUTED RESULT IS LESS THAN HAL',
+     $      'F ACCURATE *******', /'           EXPECTED RESULT   COMPU',
+     $      'TED RESULT' )
+ 9998 FORMAT( 1X, I7, 2G18.6 )
+ 9997 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
+*
+*     End of DMMTCH
 *
       END
diff --git a/BLAS/TESTING/sblat3.in b/BLAS/TESTING/sblat3.in
index 5c4e3b83e1..ea1a305875 100644
--- a/BLAS/TESTING/sblat3.in
+++ b/BLAS/TESTING/sblat3.in
@@ -12,9 +12,10 @@ T        LOGICAL FLAG, T TO TEST ERROR EXITS.
 0.0 1.0 0.7       VALUES OF ALPHA
 3                 NUMBER OF VALUES OF BETA
 0.0 1.0 1.3       VALUES OF BETA
-SGEMM  T PUT F FOR NO TEST. SAME COLUMNS.
-SSYMM  T PUT F FOR NO TEST. SAME COLUMNS.
-STRMM  T PUT F FOR NO TEST. SAME COLUMNS.
-STRSM  T PUT F FOR NO TEST. SAME COLUMNS.
-SSYRK  T PUT F FOR NO TEST. SAME COLUMNS.
-SSYR2K T PUT F FOR NO TEST. SAME COLUMNS.
+SGEMM   T PUT F FOR NO TEST. SAME COLUMNS.
+SSYMM   T PUT F FOR NO TEST. SAME COLUMNS.
+STRMM   T PUT F FOR NO TEST. SAME COLUMNS.
+STRSM   T PUT F FOR NO TEST. SAME COLUMNS.
+SSYRK   T PUT F FOR NO TEST. SAME COLUMNS.
+SSYR2K  T PUT F FOR NO TEST. SAME COLUMNS.
+SGEMMTR T PUT F FOR NO TEST. SAME COLUMNS.
diff --git a/BLAS/TESTING/zblat1.f b/BLAS/TESTING/zblat1.f
index 118212d098..71438c420d 100644
--- a/BLAS/TESTING/zblat1.f
+++ b/BLAS/TESTING/zblat1.f
@@ -34,6 +34,7 @@
 *
 *  =====================================================================
       PROGRAM ZBLAT1
+      IMPLICIT NONE
 *
 *  -- Reference BLAS test routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -58,7 +59,7 @@ PROGRAM ZBLAT1
       DATA             SFAC/9.765625D-4/
 *     .. Executable Statements ..
       WRITE (NOUT,99999)
-      DO 20 IC = 1, 10
+      DO 20 IC = 1, 11
          ICASE = IC
          CALL HEADER
 *
@@ -71,7 +72,7 @@ PROGRAM ZBLAT1
          INCX = 9999
          INCY = 9999
          MODE = 9999
-         IF (ICASE.LE.5) THEN
+         IF (ICASE.LE.5 .OR. ICASE.EQ.11) THEN
             CALL CHECK2(SFAC)
          ELSE IF (ICASE.GE.6) THEN
             CALL CHECK1(SFAC)
@@ -95,7 +96,7 @@ SUBROUTINE HEADER
       INTEGER          ICASE, INCX, INCY, MODE, N
       LOGICAL          PASS
 *     .. Local Arrays ..
-      CHARACTER*6      L(10)
+      CHARACTER*6      L(11)
 *     .. Common blocks ..
       COMMON           /COMBLA/ICASE, N, INCX, INCY, MODE, PASS
 *     .. Data statements ..
@@ -109,6 +110,8 @@ SUBROUTINE HEADER
       DATA             L(8)/'ZSCAL '/
       DATA             L(9)/'ZDSCAL'/
       DATA             L(10)/'IZAMAX'/
+      DATA             L(11)/'ZAXPBY'/
+
 *     .. Executable Statements ..
       WRITE (NOUT,99999) ICASE, L(ICASE)
       RETURN
@@ -119,9 +122,11 @@ SUBROUTINE HEADER
 *
       END
       SUBROUTINE CHECK1(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
-      PARAMETER         (NOUT=6)
+      DOUBLE PRECISION  THRESH
+      PARAMETER         (NOUT=6, THRESH=10.0D0)
 *     .. Scalar Arguments ..
       DOUBLE PRECISION  SFAC
 *     .. Scalars in Common ..
@@ -141,7 +146,7 @@ SUBROUTINE CHECK1(SFAC)
       INTEGER           IZAMAX
       EXTERNAL          DZASUM, DZNRM2, IZAMAX
 *     .. External Subroutines ..
-      EXTERNAL          ZSCAL, ZDSCAL, CTEST, ITEST1, STEST1
+      EXTERNAL          ZB1NRM2, ZSCAL, ZDSCAL, CTEST, ITEST1, STEST1
 *     .. Intrinsic Functions ..
       INTRINSIC         MAX
 *     .. Common blocks ..
@@ -256,6 +261,10 @@ SUBROUTINE CHECK1(SFAC)
    20       CONTINUE
             IF (ICASE.EQ.6) THEN
 *              .. DZNRM2 ..
+*              Test scaling when some entries are tiny or huge
+               CALL ZB1NRM2(N,(INCX-2)*2,THRESH)
+               CALL ZB1NRM2(N,INCX,THRESH)
+*              Test with hardcoded mid range entries
                CALL STEST1(DZNRM2(N,CX,INCX),STRUE2(NP1),STRUE2(NP1),
      +                     SFAC)
             ELSE IF (ICASE.EQ.7) THEN
@@ -340,6 +349,7 @@ SUBROUTINE CHECK1(SFAC)
 *
       END
       SUBROUTINE CHECK2(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
       PARAMETER         (NOUT=6)
@@ -349,26 +359,27 @@ SUBROUTINE CHECK2(SFAC)
       INTEGER           ICASE, INCX, INCY, MODE, N
       LOGICAL           PASS
 *     .. Local Scalars ..
-      COMPLEX*16        CA
+      COMPLEX*16        CA, CB
       INTEGER           I, J, KI, KN, KSIZE, LENX, LENY, LINCX, LINCY,
      +                  MX, MY
 *     .. Local Arrays ..
       COMPLEX*16        CDOT(1), CSIZE1(4), CSIZE2(7,2), CSIZE3(14),
      +                  CT10X(7,4,4), CT10Y(7,4,4), CT6(4,4), CT7(4,4),
      +                  CT8(7,4,4), CTY0(1), CX(7), CX0(1), CX1(7),
-     +                  CY(7), CY0(1), CY1(7)
+     +                  CY(7), CY0(1), CY1(7), CT11(7,4,4)
       INTEGER           INCXS(4), INCYS(4), LENS(4,2), NS(4)
 *     .. External Functions ..
       COMPLEX*16        ZDOTC, ZDOTU
       EXTERNAL          ZDOTC, ZDOTU
 *     .. External Subroutines ..
-      EXTERNAL          ZAXPY, ZCOPY, ZSWAP, CTEST
+      EXTERNAL          ZAXPY, ZAXPBY, ZCOPY, ZSWAP, CTEST
 *     .. Intrinsic Functions ..
       INTRINSIC         ABS, MIN
 *     .. Common blocks ..
       COMMON            /COMBLA/ICASE, N, INCX, INCY, MODE, PASS
 *     .. Data statements ..
       DATA              CA/(0.4D0,-0.7D0)/
+      DATA              CB/(0.7D0,-0.4D0)/
       DATA              INCXS/1, 2, -2, -1/
       DATA              INCYS/1, -2, 1, -2/
       DATA              LENS/1, 1, 2, 4, 1, 1, 3, 7/
@@ -538,6 +549,54 @@ SUBROUTINE CHECK2(SFAC)
      +                  (1.54D0,1.54D0), (1.54D0,1.54D0),
      +                  (1.54D0,1.54D0), (1.54D0,1.54D0),
      +                  (1.54D0,1.54D0), (1.54D0,1.54D0)/
+
+      DATA              ((CT11(I,J,1),I=1,7),J=1,4)/(0.6D0,-0.6D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (-0.1D0,-1.47D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (-0.1D0,-1.47D0),
+     +                  (-1.08D0,0.71D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (-0.1D0,-1.47D0), (-1.08D0,0.71D0),
+     +                  (-0.42D0,-0.99D0), (-0.61D0,-0.85D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0)/
+      DATA              ((CT11(I,J,2),I=1,7),J=1,4)/(0.6D0,-0.6D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (-0.1D0,-1.47D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (-0.49D0,-0.95D0),
+     +                  (-0.9D0,0.5D0),(-0.03D0,-1.51D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.36D0,0.00D0), (-0.9D0,0.5D0),
+     +                  (-0.39D0,-0.23D0), (0.1D0,-0.5D0),
+     +                  (-0.82D0,-0.39D0), (-0.5D0,-0.3D0),
+     +                  (0.0D0,-1.62D0)/
+      DATA              ((CT11(I,J,3),I=1,7),J=1,4)/(0.6D0,-0.6D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (-0.1D0,-1.47D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (-0.49D0,-0.95D0),
+     +                  (-0.71D0,-0.1D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.36D0,0.00D0), (-1.07D0,1.18D0),
+     +                  (-0.42D0,-0.99D0), (-0.41D0,-1.2D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0)/
+      DATA              ((CT11(I,J,4),I=1,7),J=1,4)/(0.6D0,-0.6D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (-0.1D0,-1.47D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (-0.1D0,-1.47D0), (-0.9D0,0.5D0),
+     +                  (-0.4D0,-0.7D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (-0.1D0,-1.47D0),
+     +                  (-0.9D0,0.5D0),(-0.4D0,-0.7D0), (0.1D0,-0.5D0),
+     +                  (-0.82D0,-0.39D0), (-0.5D0,-0.3D0),
+     +                  (-0.2D0,-1.27D0)/
+
+
 *     .. Executable Statements ..
       DO 60 KI = 1, 4
          INCX = INCXS(KI)
@@ -593,6 +652,10 @@ SUBROUTINE CHECK2(SFAC)
                CALL ZSWAP(N,CX,INCX,CY,INCY)
                CALL CTEST(LENX,CX,CT10X(1,KN,KI),CSIZE3,1.0D0)
                CALL CTEST(LENY,CY,CT10Y(1,KN,KI),CSIZE3,1.0D0)
+            ELSE IF (ICASE.EQ.11) THEN
+*              .. ZAXPY ..
+               CALL ZAXPBY(N,CA,CX,INCX,CB, CY,INCY)
+               CALL CTEST(LENY,CY,CT11(1,KN,KI),CSIZE2(1,KSIZE),SFAC)
             ELSE
                WRITE (NOUT,*) ' Shouldn''t be here in CHECK2'
                STOP
@@ -606,6 +669,7 @@ SUBROUTINE CHECK2(SFAC)
 *
       END
       SUBROUTINE STEST(LEN,SCOMP,STRUE,SSIZE,SFAC)
+      IMPLICIT NONE
 *     ********************************* STEST **************************
 *
 *     THIS SUBR COMPARES ARRAYS  SCOMP() AND STRUE() OF LENGTH LEN TO
@@ -665,6 +729,7 @@ SUBROUTINE STEST(LEN,SCOMP,STRUE,SSIZE,SFAC)
 *
       END
       SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
+      IMPLICIT NONE
 *     ************************* STEST1 *****************************
 *
 *     THIS IS AN INTERFACE SUBROUTINE TO ACCOMMODATE THE FORTRAN
@@ -693,6 +758,7 @@ SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
 *
       END
       DOUBLE PRECISION FUNCTION SDIFF(SA,SB)
+      IMPLICIT NONE
 *     ********************************* SDIFF **************************
 *     COMPUTES DIFFERENCE OF TWO NUMBERS.  C. L. LAWSON, JPL 1974 FEB 15
 *
@@ -706,6 +772,7 @@ DOUBLE PRECISION FUNCTION SDIFF(SA,SB)
 *
       END
       SUBROUTINE CTEST(LEN,CCOMP,CTRUE,CSIZE,SFAC)
+      IMPLICIT NONE
 *     **************************** CTEST *****************************
 *
 *     C.L. LAWSON, JPL, 1978 DEC 6
@@ -740,6 +807,7 @@ SUBROUTINE CTEST(LEN,CCOMP,CTRUE,CSIZE,SFAC)
 *
       END
       SUBROUTINE ITEST1(ICOMP,ITRUE)
+      IMPLICIT NONE
 *     ********************************* ITEST1 *************************
 *
 *     THIS SUBROUTINE COMPARES THE VARIABLES ICOMP AND ITRUE FOR
@@ -782,3 +850,234 @@ SUBROUTINE ITEST1(ICOMP,ITRUE)
 *     End of ITEST1
 *
       END
+      SUBROUTINE ZB1NRM2(N,INCX,THRESH)
+      IMPLICIT NONE
+*     Compare NRM2 with a reference computation using combinations
+*     of the following values:
+*
+*     0, very small, small, ulp, 1, 1/ulp, big, very big, infinity, NaN
+*
+*     one of these values is used to initialize x(1) and x(2:N) is
+*     filled with random values from [-1,1] scaled by another of
+*     these values.
+*
+*     This routine is adapted from the test suite provided by
+*     Anderson E. (2017)
+*     Algorithm 978: Safe Scaling in the Level 1 BLAS
+*     ACM Trans Math Softw 44:1--28
+*     https://doi.org/10.1145/3061665
+*
+*     .. Scalar Arguments ..
+      INTEGER           INCX, N
+      DOUBLE PRECISION  THRESH
+*
+*  =====================================================================
+*     .. Parameters ..
+      INTEGER           NMAX, NOUT, NV
+      PARAMETER         (NMAX=20, NOUT=6, NV=10)
+      DOUBLE PRECISION  HALF, ONE, THREE, TWO, ZERO
+      PARAMETER         (HALF=0.5D+0, ONE=1.0D+0, TWO= 2.0D+0,
+     &                  THREE=3.0D+0, ZERO=0.0D+0)
+*     .. External Functions ..
+      DOUBLE PRECISION  DZNRM2
+      EXTERNAL          DZNRM2
+*     .. Intrinsic Functions ..
+      INTRINSIC         AIMAG, ABS, DCMPLX, DBLE, MAX, MIN, SQRT
+*     .. Model parameters ..
+      DOUBLE PRECISION  BIGNUM, SAFMAX, SAFMIN, SMLNUM, ULP
+      PARAMETER         (BIGNUM=0.99792015476735990583D+292,
+     &                  SAFMAX=0.44942328371557897693D+308,
+     &                  SAFMIN=0.22250738585072013831D-307,
+     &                  SMLNUM=0.10020841800044863890D-291,
+     &                  ULP=0.22204460492503130808D-015)
+*     .. Local Scalars ..
+      COMPLEX*16        ROGUE
+      DOUBLE PRECISION  SNRM, TRAT, V0, V1, WORKSSQ, Y1, Y2,
+     &                  YMAX, YMIN, YNRM, ZNRM
+      INTEGER           I, IV, IW, IX, KS
+      LOGICAL           FIRST
+*     .. Local Arrays ..
+      COMPLEX*16        X(NMAX), Z(NMAX)
+      DOUBLE PRECISION  VALUES(NV), WORK(NMAX)
+*     .. Executable Statements ..
+      VALUES(1) = ZERO
+      VALUES(2) = TWO*SAFMIN
+      VALUES(3) = SMLNUM
+      VALUES(4) = ULP
+      VALUES(5) = ONE
+      VALUES(6) = ONE / ULP
+      VALUES(7) = BIGNUM
+      VALUES(8) = SAFMAX
+      VALUES(9) = DXVALS(V0,2)
+      VALUES(10) = DXVALS(V0,3)
+      ROGUE = DCMPLX(1234.5678D+0,-1234.5678D+0)
+      FIRST = .TRUE.
+*
+*     Check that the arrays are large enough
+*
+      IF (N*ABS(INCX).GT.NMAX) THEN
+         WRITE (NOUT,99) "DZNRM2", NMAX, INCX, N, N*ABS(INCX)
+         RETURN
+      END IF
+*
+*     Zero-sized inputs are tested in STEST1.
+      IF (N.LE.0) THEN
+         RETURN
+      END IF
+*
+*     Generate 2*(N-1) values in (-1,1).
+*
+      KS = 2*(N-1)
+      DO I = 1, KS
+         CALL RANDOM_NUMBER(WORK(I))
+         WORK(I) = ONE - TWO*WORK(I)
+      END DO
+*
+*     Compute the sum of squares of the random values
+*     by an unscaled algorithm.
+*
+      WORKSSQ = ZERO
+      DO I = 1, KS
+         WORKSSQ = WORKSSQ + WORK(I)*WORK(I)
+      END DO
+*
+*     Construct the test vector with one known value
+*     and the rest from the random work array multiplied
+*     by a scaling factor.
+*
+      DO IV = 1, NV
+         V0 = VALUES(IV)
+         IF (ABS(V0).GT.ONE) THEN
+            V0 = V0*HALF*HALF
+         END IF
+         Z(1) = DCMPLX(V0,-THREE*V0)
+         DO IW = 1, NV
+            V1 = VALUES(IW)
+            IF (ABS(V1).GT.ONE) THEN
+               V1 = (V1*HALF) / SQRT(DBLE(KS+1))
+            END IF
+            DO I = 1, N-1
+               Z(I+1) = DCMPLX(V1*WORK(2*I-1),V1*WORK(2*I))
+            END DO
+*
+*           Compute the expected value of the 2-norm
+*
+            Y1 = ABS(V0) * SQRT(10.0D0)
+            IF (N.GT.1) THEN
+               Y2 = ABS(V1)*SQRT(WORKSSQ)
+            ELSE
+               Y2 = ZERO
+            END IF
+            YMIN = MIN(Y1, Y2)
+            YMAX = MAX(Y1, Y2)
+*
+*           Expected value is NaN if either is NaN. The test
+*           for YMIN == YMAX avoids further computation if both
+*           are infinity.
+*
+            IF ((Y1.NE.Y1).OR.(Y2.NE.Y2)) THEN
+*              add to propagate NaN
+               YNRM = Y1 + Y2
+            ELSE IF (YMIN == YMAX) THEN
+               YNRM = SQRT(TWO)*YMAX
+            ELSE IF (YMAX == ZERO) THEN
+               YNRM = ZERO
+            ELSE
+               YNRM = YMAX*SQRT(ONE + (YMIN / YMAX)**2)
+            END IF
+*
+*           Fill the input array to DZNRM2 with steps of incx
+*
+            DO I = 1, N
+               X(I) = ROGUE
+            END DO
+            IX = 1
+            IF (INCX.LT.0) IX = 1 - (N-1)*INCX
+            DO I = 1, N
+               X(IX) = Z(I)
+               IX = IX + INCX
+            END DO
+*
+*           Call DZNRM2 to compute the 2-norm
+*
+            SNRM = DZNRM2(N,X,INCX)
+*
+*           Compare SNRM and ZNRM.  Roundoff error grows like O(n)
+*           in this implementation so we scale the test ratio accordingly.
+*
+            IF (INCX.EQ.0) THEN
+               Y1 = ABS(DBLE(X(1)))
+               Y2 = ABS(AIMAG(X(1)))
+               YMIN = MIN(Y1, Y2)
+               YMAX = MAX(Y1, Y2)
+               IF ((Y1.NE.Y1).OR.(Y2.NE.Y2)) THEN
+*                 add to propagate NaN
+                  ZNRM = Y1 + Y2
+               ELSE IF (YMIN == YMAX) THEN
+                  ZNRM = SQRT(TWO)*YMAX
+               ELSE IF (YMAX == ZERO) THEN
+                  ZNRM = ZERO
+               ELSE
+                  ZNRM = YMAX * SQRT(ONE + (YMIN / YMAX)**2)
+               END IF
+               ZNRM = SQRT(DBLE(n)) * ZNRM
+            ELSE
+               ZNRM = YNRM
+            END IF
+*
+*           The tests for NaN rely on the compiler not being overly
+*           aggressive and removing the statements altogether.
+            IF ((SNRM.NE.SNRM).OR.(ZNRM.NE.ZNRM)) THEN
+               IF ((SNRM.NE.SNRM).NEQV.(ZNRM.NE.ZNRM)) THEN
+                  TRAT = ONE / ULP
+               ELSE
+                  TRAT = ZERO
+               END IF
+            ELSE IF (ZNRM == ZERO) THEN
+               TRAT = SNRM / ULP
+            ELSE
+               TRAT = (ABS(SNRM-ZNRM) / ZNRM) / (TWO*DBLE(N)*ULP)
+            END IF
+            IF ((TRAT.NE.TRAT).OR.(TRAT.GE.THRESH)) THEN
+               IF (FIRST) THEN
+                  FIRST = .FALSE.
+                  WRITE(NOUT,99999)
+               END IF
+               WRITE (NOUT,98) "DZNRM2", N, INCX, IV, IW, TRAT
+            END IF
+         END DO
+      END DO
+99999 FORMAT ('                                       FAIL')
+   99 FORMAT ( ' Not enough space to test ', A6, ': NMAX = ',I6,
+     + ', INCX = ',I6,/,'   N = ',I6,', must be at least ',I6 )
+   98 FORMAT( 1X, A6, ': N=', I6,', INCX=', I4, ', IV=', I2, ', IW=',
+     +  I2, ', test=', E15.8 )
+      RETURN
+      CONTAINS
+      DOUBLE PRECISION FUNCTION DXVALS(XX,K)
+      IMPLICIT NONE
+*     .. Scalar Arguments ..
+      DOUBLE PRECISION  XX
+      INTEGER           K
+*     .. Parameters ..
+      DOUBLE PRECISION  ZERO
+      PARAMETER         (ZERO=0.0D+0)
+*     .. Local Scalars ..
+      DOUBLE PRECISION  X, Y, Z
+*     .. Intrinsic Functions ..
+      INTRINSIC         HUGE
+*     .. Executable Statements ..
+      X = ZERO
+      Y = HUGE(XX)
+      Z = Y*Y
+      IF (K.EQ.1) THEN
+         X = -Z
+      ELSE IF (K.EQ.2) THEN
+         X = Z
+      ELSE IF (K.EQ.3) THEN
+         X = Z / Z
+      END IF
+      DXVALS = X
+      RETURN
+      END
+      END
diff --git a/BLAS/TESTING/zblat2.f b/BLAS/TESTING/zblat2.f
index 662ef683b2..b7f4a3c716 100644
--- a/BLAS/TESTING/zblat2.f
+++ b/BLAS/TESTING/zblat2.f
@@ -100,6 +100,7 @@
 *
 *  =====================================================================
       PROGRAM ZBLAT2
+      IMPLICIT NONE
 *
 *  -- Reference BLAS test routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -436,6 +437,7 @@ SUBROUTINE ZCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NALF, ALF, NBET,
      $                  BET, NINC, INC, NMAX, INCMAX, A, AA, AS, X, XX,
      $                  XS, Y, YY, YS, YT, G )
+      IMPLICIT NONE
 *
 *  Tests ZGEMV and ZGBMV.
 *
@@ -481,7 +483,7 @@ SUBROUTINE ZCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       LOGICAL            LZE, LZERES
       EXTERNAL           LZE, LZERES
 *     .. External Subroutines ..
-      EXTERNAL           ZGBMV, ZGEMV, ZMAKE, ZMVCH
+      EXTERNAL           ZGBMV, ZGEMV, ZMAKE, ZMVCH, ZREGR1
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN
 *     .. Scalars in Common ..
@@ -736,6 +738,34 @@ SUBROUTINE ZCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *
   120 CONTINUE
 *
+*     Regression test to verify preservation of y when m zero, n nonzero.
+*
+      CALL ZREGR1( TRANS, M, N, LY, KL, KU, ALPHA, AA, LDA, XX, INCX,
+     $   BETA, YY, INCY, YS )
+      IF( FULL )THEN
+         IF( TRACE )
+     $      WRITE( NTRA, FMT = 9994 )NC, SNAME, TRANS, M, N, ALPHA, LDA,
+     $      INCX, BETA, INCY
+         IF( REWI )
+     $      REWIND NTRA
+         CALL ZGEMV( TRANS, M, N, ALPHA, AA, LDA, XX, INCX, BETA, YY,
+     $      INCY )
+      ELSE IF( BANDED )THEN
+         IF( TRACE )
+     $      WRITE( NTRA, FMT = 9995 )NC, SNAME, TRANS, M, N, KL, KU,
+     $      ALPHA, LDA, INCX, BETA, INCY
+         IF( REWI )
+     $      REWIND NTRA
+         CALL ZGBMV( TRANS, M, N, KL, KU, ALPHA, AA, LDA, XX, INCX,
+     $      BETA, YY, INCY )
+      END IF
+      NC = NC + 1
+      IF( .NOT.LZE( YS, YY, LY ) )THEN
+         WRITE( NOUT, FMT = 9998 )NARGS - 1
+         FATAL = .TRUE.
+         GO TO 130
+      END IF
+*
 *     Report result.
 *
       IF( ERRMAX.LT.THRESH )THEN
@@ -782,6 +812,7 @@ SUBROUTINE ZCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NALF, ALF, NBET,
      $                  BET, NINC, INC, NMAX, INCMAX, A, AA, AS, X, XX,
      $                  XS, Y, YY, YS, YT, G )
+      IMPLICIT NONE
 *
 *  Tests ZHEMV, ZHBMV and ZHPMV.
 *
@@ -1130,6 +1161,7 @@ SUBROUTINE ZCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       SUBROUTINE ZCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, XT, G, Z )
+      IMPLICIT NONE
 *
 *  Tests ZTRMV, ZTBMV, ZTPMV, ZTRSV, ZTBSV and ZTPSV.
 *
@@ -1493,6 +1525,7 @@ SUBROUTINE ZCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z )
+      IMPLICIT NONE
 *
 *  Tests ZGERC and ZGERU.
 *
@@ -1771,6 +1804,7 @@ SUBROUTINE ZCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z )
+      IMPLICIT NONE
 *
 *  Tests ZHER and ZHPR.
 *
@@ -2056,6 +2090,7 @@ SUBROUTINE ZCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z )
+      IMPLICIT NONE
 *
 *  Tests ZHER2 and ZHPR2.
 *
@@ -2376,6 +2411,7 @@ SUBROUTINE ZCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *
       END
       SUBROUTINE ZCHKE( ISNUM, SRNAMT, NOUT )
+      IMPLICIT NONE
 *
 *  Tests the error exits from the Level 2 Blas.
 *  Requires a special version of the error-handling routine XERBLA.
@@ -2720,6 +2756,7 @@ SUBROUTINE ZCHKE( ISNUM, SRNAMT, NOUT )
       END
       SUBROUTINE ZMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, KL,
      $                  KU, RESET, TRANSL )
+      IMPLICIT NONE
 *
 *  Generates values for an M by N matrix A within the bandwidth
 *  defined by KL and KU.
@@ -2913,6 +2950,7 @@ SUBROUTINE ZMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, KL,
       END
       SUBROUTINE ZMVCH( TRANS, M, N, ALPHA, A, NMAX, X, INCX, BETA, Y,
      $                  INCY, YT, G, YY, EPS, ERR, FATAL, NOUT, MV )
+      IMPLICIT NONE
 *
 *  Checks the results of the computational tests.
 *
@@ -3044,6 +3082,7 @@ SUBROUTINE ZMVCH( TRANS, M, N, ALPHA, A, NMAX, X, INCX, BETA, Y,
 *
       END
       LOGICAL FUNCTION LZE( RI, RJ, LR )
+      IMPLICIT NONE
 *
 *  Tests if two arrays are identical.
 *
@@ -3074,6 +3113,7 @@ LOGICAL FUNCTION LZE( RI, RJ, LR )
 *
       END
       LOGICAL FUNCTION LZERES( TYPE, UPLO, M, N, AA, AS, LDA )
+      IMPLICIT NONE
 *
 *  Tests if selected elements in two arrays are equal.
 *
@@ -3133,6 +3173,7 @@ LOGICAL FUNCTION LZERES( TYPE, UPLO, M, N, AA, AS, LDA )
 *
       END
       COMPLEX*16 FUNCTION ZBEG( RESET )
+      IMPLICIT NONE
 *
 *  Generates complex numbers as pairs of random numbers uniformly
 *  distributed between -0.5 and 0.5.
@@ -3185,6 +3226,7 @@ COMPLEX*16 FUNCTION ZBEG( RESET )
 *
       END
       DOUBLE PRECISION FUNCTION DDIFF( X, Y )
+      IMPLICIT NONE
 *
 *  Auxiliary routine for test program for Level 2 Blas.
 *
@@ -3201,6 +3243,7 @@ DOUBLE PRECISION FUNCTION DDIFF( X, Y )
 *
       END
       SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      IMPLICIT NONE
 *
 *  Tests whether XERBLA has detected an error when it should.
 *
@@ -3227,8 +3270,43 @@ SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
 *
 *     End of CHKXER
 *
+      END
+      SUBROUTINE ZREGR1( TRANS, M, N, LY, KL, KU, ALPHA, A, LDA, X,
+     $   INCX, BETA, Y, INCY, YS )
+      IMPLICIT NONE
+*
+*  Input initialization for regression test.
+*
+*     .. Scalar Arguments ..
+      CHARACTER*1        TRANS
+      INTEGER            LY, M, N, KL, KU, LDA, INCX, INCY
+      COMPLEX*16         ALPHA, BETA
+*     .. Array Arguments ..
+      COMPLEX*16         A(LDA,*), X(*), Y(*), YS(*)
+*     .. Local Scalars ..
+      INTEGER            I
+*     .. Intrinsic Functions ..
+      INTRINSIC          DBLE, DCMPLX
+*     .. Executable Statements ..
+      TRANS = 'T'
+      M = 0
+      N = 5
+      KL = 0
+      KU = 0
+      ALPHA = DCMPLX( 1.0D0 )
+      LDA = MAX( 1, M )
+      INCX = 1
+      BETA = DCMPLX( -0.7D0, -0.8D0 )
+      INCY = 1
+      LY = ABS( INCY )*N
+      DO 10 I = 1, LY
+         Y( I ) = DCMPLX( 42.0D0, DBLE( I ) )
+         YS( I ) = Y( I )
+  10  CONTINUE
+      RETURN
       END
       SUBROUTINE XERBLA( SRNAME, INFO )
+      IMPLICIT NONE
 *
 *  This is a special version of XERBLA to be used only as part of
 *  the test program for testing error exits from the Level 2 BLAS
diff --git a/BLAS/TESTING/zblat3.f b/BLAS/TESTING/zblat3.f
index fb4d8019e9..ccb492a657 100644
--- a/BLAS/TESTING/zblat3.f
+++ b/BLAS/TESTING/zblat3.f
@@ -19,8 +19,8 @@
 *> Test program for the COMPLEX*16       Level 3 Blas.
 *>
 *> The program must be driven by a short data file. The first 14 records
-*> of the file are read using list-directed input, the last 9 records
-*> are read using the format ( A6, L2 ). An annotated example of a data
+*> of the file are read using list-directed input, the last 10 records
+*> are read using the format ( A7, L2 ). An annotated example of a data
 *> file can be obtained by deleting the first 3 characters from the
 *> following 23 lines:
 *> 'zblat3.out'      NAME OF SUMMARY OUTPUT FILE
@@ -46,6 +46,7 @@
 *> ZSYRK  T PUT F FOR NO TEST. SAME COLUMNS.
 *> ZHER2K T PUT F FOR NO TEST. SAME COLUMNS.
 *> ZSYR2K T PUT F FOR NO TEST. SAME COLUMNS.
+*> ZGEMMTR T PUT F FOR NO TEST. SAME COLUMNS.
 *>
 *>
 *> Further Details
@@ -83,6 +84,7 @@
 *
 *  =====================================================================
       PROGRAM ZBLAT3
+      IMPLICIT NONE
 *
 *  -- Reference BLAS test routine --
 *  -- Reference BLAS is a software package provided by Univ. of Tennessee,    --
@@ -94,7 +96,7 @@ PROGRAM ZBLAT3
       INTEGER            NIN
       PARAMETER          ( NIN = 5 )
       INTEGER            NSUBS
-      PARAMETER          ( NSUBS = 9 )
+      PARAMETER          ( NSUBS = 10 )
       COMPLEX*16         ZERO, ONE
       PARAMETER          ( ZERO = ( 0.0D0, 0.0D0 ),
      $                   ONE = ( 1.0D0, 0.0D0 ) )
@@ -110,7 +112,7 @@ PROGRAM ZBLAT3
       LOGICAL            FATAL, LTESTT, REWI, SAME, SFATAL, TRACE,
      $                   TSTERR
       CHARACTER*1        TRANSA, TRANSB
-      CHARACTER*6        SNAMET
+      CHARACTER*7        SNAMET
       CHARACTER*32       SNAPS, SUMMRY
 *     .. Local Arrays ..
       COMPLEX*16         AA( NMAX*NMAX ), AB( NMAX, 2*NMAX ),
@@ -122,26 +124,27 @@ PROGRAM ZBLAT3
       DOUBLE PRECISION   G( NMAX )
       INTEGER            IDIM( NIDMAX )
       LOGICAL            LTEST( NSUBS )
-      CHARACTER*6        SNAMES( NSUBS )
+      CHARACTER*7        SNAMES( NSUBS )
 *     .. External Functions ..
       DOUBLE PRECISION   DDIFF
       LOGICAL            LZE
       EXTERNAL           DDIFF, LZE
 *     .. External Subroutines ..
-      EXTERNAL           ZCHK1, ZCHK2, ZCHK3, ZCHK4, ZCHK5, ZCHKE, ZMMCH
+      EXTERNAL           ZCHK1, ZCHK2, ZCHK3, ZCHK4, ZCHK5, ZCHK6
+      EXTERNAL           ZCHKE, ZMMCH
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
       LOGICAL            LERR, OK
-      CHARACTER*6        SRNAMT
+      CHARACTER*7        SRNAMT
 *     .. Common blocks ..
       COMMON             /INFOC/INFOT, NOUTC, OK, LERR
       COMMON             /SRNAMC/SRNAMT
 *     .. Data statements ..
       DATA               SNAMES/'ZGEMM ', 'ZHEMM ', 'ZSYMM ', 'ZTRMM ',
      $                   'ZTRSM ', 'ZHERK ', 'ZSYRK ', 'ZHER2K',
-     $                   'ZSYR2K'/
+     $                   'ZSYR2K', 'ZGEMMTR'/
 *     .. Executable Statements ..
 *
 *     Read name and unit number for summary output file and open file.
@@ -319,7 +322,7 @@ PROGRAM ZBLAT3
             OK = .TRUE.
             FATAL = .FALSE.
             GO TO ( 140, 150, 150, 160, 160, 170, 170,
-     $              180, 180 )ISNUM
+     $              180, 180, 185 )ISNUM
 *           Test ZGEMM, 01.
   140       CALL ZCHK1( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
@@ -348,6 +351,13 @@ PROGRAM ZBLAT3
      $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
      $                  NMAX, AB, AA, AS, BB, BS, C, CC, CS, CT, G, W )
             GO TO 190
+*           Test ZGEMMTR, 01.
+  185       CALL ZCHK6( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
+     $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
+     $                  NMAX, AB, AA, AS, AB( 1, NMAX + 1 ), BB, BS, C,
+     $                  CC, CS, CT, G )
+            GO TO 190
+
 *
   190       IF( FATAL.AND.SFATAL )
      $         GO TO 210
@@ -384,7 +394,7 @@ PROGRAM ZBLAT3
      $      7( '(', F4.1, ',', F4.1, ')  ', : ) )
  9991 FORMAT( ' AMEND DATA FILE OR INCREASE ARRAY SIZES IN PROGRAM',
      $      /' ******* TESTS ABANDONED *******' )
- 9990 FORMAT( ' SUBPROGRAM NAME ', A6, ' NOT RECOGNIZED', /' ******* T',
+ 9990 FORMAT( ' SUBPROGRAM NAME ', A7, ' NOT RECOGNIZED', /' ******* T',
      $      'ESTS ABANDONED *******' )
  9989 FORMAT( ' ERROR IN ZMMCH -  IN-LINE DOT PRODUCTS ARE BEING EVALU',
      $      'ATED WRONGLY.', /' ZMMCH WAS CALLED WITH TRANSA = ', A1,
@@ -392,8 +402,8 @@ PROGRAM ZBLAT3
      $      'ERR = ', F12.3, '.', /' THIS MAY BE DUE TO FAULTS IN THE ',
      $      'ARITHMETIC OR THE COMPILER.', /' ******* TESTS ABANDONED ',
      $      '*******' )
- 9988 FORMAT( A6, L2 )
- 9987 FORMAT( 1X, A6, ' WAS NOT TESTED' )
+ 9988 FORMAT( A7, L2 )
+ 9987 FORMAT( 1X, A7, ' WAS NOT TESTED' )
  9986 FORMAT( /' END OF TESTS' )
  9985 FORMAT( /' ******* FATAL ERROR - TESTS ABANDONED *******' )
  9984 FORMAT( ' ERROR-EXITS WILL NOT BE TESTED' )
@@ -424,7 +434,7 @@ SUBROUTINE ZCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       COMPLEX*16         A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -669,15 +679,15 @@ SUBROUTINE ZCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   130 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A6, '(''', A1, ''',''', A1, ''',',
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A7, '(''', A1, ''',''', A1, ''',',
      $      3( I3, ',' ), '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3,
      $      ',(', F4.1, ',', F4.1, '), C,', I3, ').' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -709,7 +719,7 @@ SUBROUTINE ZCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       COMPLEX*16         A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -948,15 +958,15 @@ SUBROUTINE ZCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   120 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',(', F4.1,
      $      ',', F4.1, '), C,', I3, ')    .' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -989,7 +999,7 @@ SUBROUTINE ZCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       COMPLEX*16         A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1259,15 +1269,15 @@ SUBROUTINE ZCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   160 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A6, '(', 4( '''', A1, ''',' ), 2( I3, ',' ),
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A7, '(', 4( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ')         ',
      $      '      .' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1299,7 +1309,7 @@ SUBROUTINE ZCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       COMPLEX*16         A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1587,19 +1597,19 @@ SUBROUTINE ZCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   130 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
  9995 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
- 9994 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9994 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ',', F4.1, ', C,', I3, ')               ',
      $      '          .' )
- 9993 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9993 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, ') , A,', I3, ',(', F4.1, ',', F4.1,
      $      '), C,', I3, ')          .' )
  9992 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1632,7 +1642,7 @@ SUBROUTINE ZCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*6        SNAME
+      CHARACTER*7        SNAME
 *     .. Array Arguments ..
       COMPLEX*16         AA( NMAX*NMAX ), AB( 2*NMAX*NMAX ),
      $                   ALF( NALF ), AS( NMAX*NMAX ), BB( NMAX*NMAX ),
@@ -1961,19 +1971,19 @@ SUBROUTINE ZCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   160 CONTINUE
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
      $      'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
      $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
      $      ' - SUSPECT *******' )
- 9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
  9995 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
- 9994 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9994 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',', F4.1,
      $      ', C,', I3, ')           .' )
- 9993 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9993 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',(', F4.1,
      $      ',', F4.1, '), C,', I3, ')    .' )
  9992 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -2003,12 +2013,12 @@ SUBROUTINE ZCHKE( ISNUM, SRNAMT, NOUT )
 *
 *     .. Scalar Arguments ..
       INTEGER            ISNUM, NOUT
-      CHARACTER*6        SRNAMT
+      CHARACTER*7        SRNAMT
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
       LOGICAL            LERR, OK
 *     .. Parameters ..
-      REAL               ONE, TWO
+      DOUBLE PRECISION   ONE, TWO
       PARAMETER          ( ONE = 1.0D0, TWO = 2.0D0 )
 *     .. Local Scalars ..
       COMPLEX*16         ALPHA, BETA
@@ -2017,7 +2027,7 @@ SUBROUTINE ZCHKE( ISNUM, SRNAMT, NOUT )
       COMPLEX*16         A( 2, 1 ), B( 2, 1 ), C( 2, 1 )
 *     .. External Subroutines ..
       EXTERNAL           ZGEMM, ZHEMM, ZHER2K, ZHERK, CHKXER, ZSYMM,
-     $                   ZSYR2K, ZSYRK, ZTRMM, ZTRSM
+     $                   ZSYR2K, ZSYRK, ZTRMM, ZTRSM, ZGEMMTR
 *     .. Intrinsic Functions ..
       INTRINSIC          DCMPLX
 *     .. Common blocks ..
@@ -2038,7 +2048,7 @@ SUBROUTINE ZCHKE( ISNUM, SRNAMT, NOUT )
       RBETA = TWO
 *
       GO TO ( 10, 20, 30, 40, 50, 60, 70, 80,
-     $        90 )ISNUM
+     $        90, 100 )ISNUM
    10 INFOT = 1
       CALL ZGEMM( '/', 'N', 0, 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2219,7 +2229,7 @@ SUBROUTINE ZCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 13
       CALL ZGEMM( 'T', 'T', 2, 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 100
+      GO TO 110
    20 INFOT = 1
       CALL ZHEMM( '/', 'U', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2286,7 +2296,7 @@ SUBROUTINE ZCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 12
       CALL ZHEMM( 'R', 'L', 2, 0, ALPHA, A, 1, B, 2, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 100
+      GO TO 110
    30 INFOT = 1
       CALL ZSYMM( '/', 'U', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2353,7 +2363,7 @@ SUBROUTINE ZCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 12
       CALL ZSYMM( 'R', 'L', 2, 0, ALPHA, A, 1, B, 2, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 100
+      GO TO 110
    40 INFOT = 1
       CALL ZTRMM( '/', 'U', 'N', 'N', 0, 0, ALPHA, A, 1, B, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2510,7 +2520,7 @@ SUBROUTINE ZCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 11
       CALL ZTRMM( 'R', 'L', 'T', 'N', 2, 0, ALPHA, A, 1, B, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 100
+      GO TO 110
    50 INFOT = 1
       CALL ZTRSM( '/', 'U', 'N', 'N', 0, 0, ALPHA, A, 1, B, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2667,7 +2677,7 @@ SUBROUTINE ZCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 11
       CALL ZTRSM( 'R', 'L', 'T', 'N', 2, 0, ALPHA, A, 1, B, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 100
+      GO TO 110
    60 INFOT = 1
       CALL ZHERK( '/', 'N', 0, 0, RALPHA, A, 1, RBETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2722,7 +2732,7 @@ SUBROUTINE ZCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 10
       CALL ZHERK( 'L', 'C', 2, 0, RALPHA, A, 1, RBETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 100
+      GO TO 110
    70 INFOT = 1
       CALL ZSYRK( '/', 'N', 0, 0, ALPHA, A, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2777,7 +2787,7 @@ SUBROUTINE ZCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 10
       CALL ZSYRK( 'L', 'T', 2, 0, ALPHA, A, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 100
+      GO TO 110
    80 INFOT = 1
       CALL ZHER2K( '/', 'N', 0, 0, ALPHA, A, 1, B, 1, RBETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2844,7 +2854,7 @@ SUBROUTINE ZCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 12
       CALL ZHER2K( 'L', 'C', 2, 0, ALPHA, A, 1, B, 1, RBETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
-      GO TO 100
+      GO TO 110
    90 INFOT = 1
       CALL ZSYR2K( '/', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
@@ -2911,16 +2921,212 @@ SUBROUTINE ZCHKE( ISNUM, SRNAMT, NOUT )
       INFOT = 12
       CALL ZSYR2K( 'L', 'T', 2, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
       CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      GO TO 110
+  100 INFOT = 1
+      CALL ZGEMMTR( '/', 'N', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 1
+      CALL ZGEMMTR( '/', 'N', 'T', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 1
+      CALL ZGEMMTR( '/', 'N', 'C', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 1
+      CALL ZGEMMTR( '/', 'T', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 1
+      CALL ZGEMMTR( '/', 'T', 'T', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 1
+      CALL ZGEMMTR( '/', 'T', 'C', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 1
+      CALL ZGEMMTR( '/', 'C', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 1
+      CALL ZGEMMTR( '/', 'C', 'T', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 1
+      CALL ZGEMMTR( '/', 'C', 'C', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+
+      INFOT = 2
+      CALL ZGEMMTR( 'U', '/', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL ZGEMMTR( 'U', '/', 'C', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL ZGEMMTR( 'U', '/', 'T', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL ZGEMMTR( 'L', '/', 'N', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL ZGEMMTR( 'L', '/', 'C', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL ZGEMMTR( 'L', '/', 'T', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+
+      INFOT = 3
+      CALL ZGEMMTR( 'U', 'N', '/', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL ZGEMMTR( 'U', 'C', '/', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL ZGEMMTR( 'U', 'T', '/', 0, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL ZGEMMTR( 'U', 'N', 'N', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL ZGEMMTR( 'U', 'N', 'C', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL ZGEMMTR( 'U', 'N', 'T', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL ZGEMMTR( 'U', 'C', 'N', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL ZGEMMTR( 'U', 'C', 'C', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL ZGEMMTR( 'U', 'C', 'T', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL ZGEMMTR( 'U', 'T', 'N', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL ZGEMMTR( 'U', 'T', 'C', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL ZGEMMTR( 'U', 'T', 'T', -1, 0, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL ZGEMMTR( 'U', 'N', 'N', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL ZGEMMTR( 'U', 'N', 'C', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL ZGEMMTR( 'U', 'N', 'T', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL ZGEMMTR( 'U', 'C', 'N', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL ZGEMMTR( 'U', 'C', 'C', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL ZGEMMTR( 'U', 'C', 'T', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL ZGEMMTR( 'U', 'T', 'N', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL ZGEMMTR( 'U', 'T', 'C', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL ZGEMMTR( 'U', 'T', 'T', 0, -1, ALPHA, A, 1, B, 1, BETA, C,
+     $              1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+
+      INFOT = 8
+      CALL ZGEMMTR( 'U', 'N', 'N', 2, 0, ALPHA, A, 1, B, 1, BETA, C, 2 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL ZGEMMTR( 'U', 'N', 'C', 2, 0, ALPHA, A, 1, B, 1, BETA, C, 2 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL ZGEMMTR( 'U', 'N', 'T', 2, 0, ALPHA, A, 1, B, 1, BETA, C, 2 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL ZGEMMTR( 'U', 'C', 'N', 0, 2, ALPHA, A, 1, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL ZGEMMTR( 'U', 'C', 'C', 0, 2, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL ZGEMMTR( 'U', 'C', 'T', 0, 2, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL ZGEMMTR( 'U', 'T', 'N', 0, 2, ALPHA, A, 1, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL ZGEMMTR( 'U', 'T', 'C', 0, 2, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL ZGEMMTR( 'U', 'T', 'T', 0, 2, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+
+      INFOT = 10
+      CALL ZGEMMTR( 'U', 'N', 'N', 0, 2, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL ZGEMMTR( 'U', 'C', 'N', 0, 2, ALPHA, A, 2, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL ZGEMMTR( 'U', 'T', 'N', 0, 2, ALPHA, A, 2, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL ZGEMMTR( 'U', 'N', 'N', 2, 0, ALPHA, A, 2, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL ZGEMMTR( 'U', 'N', 'C', 2, 0, ALPHA, A, 2, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL ZGEMMTR( 'U', 'N', 'T', 2, 0, ALPHA, A, 2, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL ZGEMMTR( 'U', 'C', 'N', 2, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL ZGEMMTR( 'U', 'C', 'C', 2, 0, ALPHA, A, 1, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL ZGEMMTR( 'U', 'C', 'T', 2, 0, ALPHA, A, 1, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL ZGEMMTR( 'U', 'T', 'N', 2, 0, ALPHA, A, 1, B, 1, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL ZGEMMTR( 'U', 'T', 'C', 2, 0, ALPHA, A, 1, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      INFOT = 13
+      CALL ZGEMMTR( 'U', 'T', 'T', 2, 0, ALPHA, A, 1, B, 2, BETA, C, 1 )
+      CALL CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      GO TO 110
+
 *
-  100 IF( OK )THEN
+  110 IF( OK )THEN
          WRITE( NOUT, FMT = 9999 )SRNAMT
       ELSE
          WRITE( NOUT, FMT = 9998 )SRNAMT
       END IF
       RETURN
 *
- 9999 FORMAT( ' ', A6, ' PASSED THE TESTS OF ERROR-EXITS' )
- 9998 FORMAT( ' ******* ', A6, ' FAILED THE TESTS OF ERROR-EXITS *****',
+ 9999 FORMAT( ' ', A7, ' PASSED THE TESTS OF ERROR-EXITS' )
+ 9998 FORMAT( ' ******* ', A7, ' FAILED THE TESTS OF ERROR-EXITS *****',
      $      '**' )
 *
 *     End of ZCHKE
@@ -3426,7 +3632,7 @@ SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
 *     .. Scalar Arguments ..
       INTEGER            INFOT, NOUT
       LOGICAL            LERR, OK
-      CHARACTER*6        SRNAMT
+      CHARACTER*7        SRNAMT
 *     .. Executable Statements ..
       IF( .NOT.LERR )THEN
          WRITE( NOUT, FMT = 9999 )INFOT, SRNAMT
@@ -3436,7 +3642,7 @@ SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
       RETURN
 *
  9999 FORMAT( ' ***** ILLEGAL VALUE OF PARAMETER NUMBER ', I2, ' NOT D',
-     $      'ETECTED BY ', A6, ' *****' )
+     $      'ETECTED BY ', A7, ' *****' )
 *
 *     End of CHKXER
 *
@@ -3462,14 +3668,16 @@ SUBROUTINE XERBLA( SRNAME, INFO )
 *
 *     .. Scalar Arguments ..
       INTEGER            INFO
-      CHARACTER*6        SRNAME
+      CHARACTER*(*)      SRNAME
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUT
       LOGICAL            LERR, OK
-      CHARACTER*6        SRNAMT
+      CHARACTER*7        SRNAMT
 *     .. Common blocks ..
       COMMON             /INFOC/INFOT, NOUT, OK, LERR
       COMMON             /SRNAMC/SRNAMT
+*     .. Locals ..
+      INTEGER            SRLEN
 *     .. Executable Statements ..
       LERR = .TRUE.
       IF( INFO.NE.INFOT )THEN
@@ -3480,7 +3688,8 @@ SUBROUTINE XERBLA( SRNAME, INFO )
          END IF
          OK = .FALSE.
       END IF
-      IF( SRNAME.NE.SRNAMT )THEN
+      SRLEN = MIN(LEN_TRIM(SRNAME), LEN_TRIM(SRNAMT))
+      IF( SRNAME(1:SRLEN).NE.SRNAMT(1:SRLEN) )THEN
          WRITE( NOUT, FMT = 9998 )SRNAME, SRNAMT
          OK = .FALSE.
       END IF
@@ -3488,11 +3697,506 @@ SUBROUTINE XERBLA( SRNAME, INFO )
 *
  9999 FORMAT( ' ******* XERBLA WAS CALLED WITH INFO = ', I6, ' INSTEAD',
      $      ' OF ', I2, ' *******' )
- 9998 FORMAT( ' ******* XERBLA WAS CALLED WITH SRNAME = ', A6, ' INSTE',
-     $      'AD OF ', A6, ' *******' )
+ 9998 FORMAT( ' ******* XERBLA WAS CALLED WITH SRNAME = ', A7, ' INSTE',
+     $      'AD OF ', A7, ' *******' )
  9997 FORMAT( ' ******* XERBLA WAS CALLED WITH INFO = ', I6,
      $      ' *******' )
 *
 *     End of XERBLA
 *
       END
+
+
+
+      SUBROUTINE ZCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
+     $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
+     $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G )
+*
+*  Tests ZGEMMTR.
+*
+*  Auxiliary routine for test program for Level 3 Blas.
+*
+*  -- Written on 8-February-1989.
+*     Jack Dongarra, Argonne National Laboratory.
+*     Iain Duff, AERE Harwell.
+*     Jeremy Du Croz, Numerical Algorithms Group Ltd.
+*     Sven Hammarling, Numerical Algorithms Group Ltd.
+*
+*     .. Parameters ..
+      COMPLEX*16            ZERO
+      PARAMETER          ( ZERO = ( 0.0, 0.0 ) )
+      DOUBLE PRECISION   RZERO
+      PARAMETER          ( RZERO = 0.0D0 )
+*     .. Scalar Arguments ..
+      DOUBLE PRECISION   EPS, THRESH
+      INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA
+      LOGICAL            FATAL, REWI, TRACE
+      CHARACTER*7        SNAME
+*     .. Array Arguments ..
+      COMPLEX*16         A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
+     $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
+     $                   BB( NMAX*NMAX ), BET( NBET ), BS( NMAX*NMAX ),
+     $                   C( NMAX, NMAX ), CC( NMAX*NMAX ),
+     $                   CS( NMAX*NMAX ), CT( NMAX )
+      DOUBLE PRECISION   G( NMAX )
+      INTEGER            IDIM( NIDIM )
+*     .. Local Scalars ..
+      COMPLEX*16            ALPHA, ALS, BETA, BLS
+      DOUBLE PRECISION   ERR, ERRMAX
+      INTEGER            I, IA, IB, ICA, ICB, IK, IN, K, KS, LAA,
+     $                   LBB, LCC, LDA, LDAS, LDB, LDBS, LDC, LDCS,
+     $                   MA, MB,  N, NA, NARGS, NB, NC, NS, IS
+      LOGICAL            NULL, RESET, SAME, TRANA, TRANB
+      CHARACTER*1        TRANAS, TRANBS, TRANSA, TRANSB, UPLO, UPLOS
+      CHARACTER*3        ICH
+      CHARACTER*2        ISHAPE
+*     .. Local Arrays ..
+      LOGICAL            ISAME( 13 )
+*     .. External Functions ..
+      LOGICAL            LZE, LZERES
+      EXTERNAL           LZE, LZERES
+*     .. External Subroutines ..
+      EXTERNAL           ZGEMMTR, ZMAKE, ZMMTCH
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX
+*     .. Scalars in Common ..
+      INTEGER            INFOT, NOUTC
+      LOGICAL            LERR, OK
+*     .. Common blocks ..
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
+*     .. Data statements ..
+      DATA               ICH/'NTC'/
+      DATA               ISHAPE/'UL'/
+
+*     .. Executable Statements ..
+*
+      NARGS = 13
+      NC = 0
+      RESET = .TRUE.
+      ERRMAX = RZERO
+*
+      DO 100 IN = 1, NIDIM
+         N = IDIM( IN )
+*        Set LDC to 1 more than minimum value if room.
+         LDC = N
+         IF( LDC.LT.NMAX )
+     $      LDC = LDC + 1
+*        Skip tests if not enough room.
+         IF( LDC.GT.NMAX )
+     $      GO TO 100
+         LCC = LDC*N
+         NULL = N.LE.0
+*
+         DO 90 IK = 1, NIDIM
+            K = IDIM( IK )
+*
+            DO 80 ICA = 1, 3
+               TRANSA = ICH( ICA: ICA )
+               TRANA = TRANSA.EQ.'T'.OR.TRANSA.EQ.'C'
+*
+               IF( TRANA )THEN
+                  MA = K
+                  NA = N
+               ELSE
+                  MA = N
+                  NA = K
+               END IF
+*              Set LDA to 1 more than minimum value if room.
+               LDA = MA
+               IF( LDA.LT.NMAX )
+     $            LDA = LDA + 1
+*              Skip tests if not enough room.
+               IF( LDA.GT.NMAX )
+     $            GO TO 80
+               LAA = LDA*NA
+*
+*              Generate the matrix A.
+*
+               CALL ZMAKE( 'GE', ' ', ' ', MA, NA, A, NMAX, AA, LDA,
+     $                     RESET, ZERO )
+*
+               DO 70 ICB = 1, 3
+                  TRANSB = ICH( ICB: ICB )
+                  TRANB = TRANSB.EQ.'T'.OR.TRANSB.EQ.'C'
+*
+                  IF( TRANB )THEN
+                     MB = N
+                     NB = K
+                  ELSE
+                     MB = K
+                     NB = N
+                  END IF
+*                 Set LDB to 1 more than minimum value if room.
+                  LDB = MB
+                  IF( LDB.LT.NMAX )
+     $               LDB = LDB + 1
+*                 Skip tests if not enough room.
+                  IF( LDB.GT.NMAX )
+     $               GO TO 70
+                  LBB = LDB*NB
+*
+*                 Generate the matrix B.
+*
+                  CALL ZMAKE( 'GE', ' ', ' ', MB, NB, B, NMAX, BB,
+     $                        LDB, RESET, ZERO )
+*
+                  DO 60 IA = 1, NALF
+                     ALPHA = ALF( IA )
+*
+                     DO 50 IB = 1, NBET
+                        BETA = BET( IB )
+                        DO 45 IS = 1, 2
+                           UPLO = ISHAPE( IS: IS )
+
+*
+*                          Generate the matrix C.
+*
+                           CALL ZMAKE( 'GE', UPLO, ' ', N, N, C, NMAX,
+     $                                 CC, LDC, RESET, ZERO )
+*
+                           NC = NC + 1
+*
+*                          Save every datum before calling the
+*                          subroutine.
+*
+                           UPLOS = UPLO
+                           TRANAS = TRANSA
+                           TRANBS = TRANSB
+                           NS = N
+                           KS = K
+                           ALS = ALPHA
+                           DO 10 I = 1, LAA
+                              AS( I ) = AA( I )
+   10                      CONTINUE
+                           LDAS = LDA
+                           DO 20 I = 1, LBB
+                              BS( I ) = BB( I )
+   20                      CONTINUE
+                           LDBS = LDB
+                           BLS = BETA
+                           DO 30 I = 1, LCC
+                              CS( I ) = CC( I )
+   30                      CONTINUE
+                           LDCS = LDC
+*
+*                          Call the subroutine.
+*
+                           IF( TRACE )
+     $                        WRITE( NTRA, FMT = 9995 )NC, SNAME, UPLO,
+     $                        TRANSA, TRANSB, N, K, ALPHA, LDA, LDB,
+     $                        BETA, LDC
+                           IF( REWI )
+     $                        REWIND NTRA
+                           CALL ZGEMMTR( UPLO, TRANSA, TRANSB, N, K,
+     $                                 ALPHA, AA, LDA, BB, LDB, BETA,
+     $                                 CC, LDC )
+*
+*                          Check if error-exit was taken incorrectly.
+*
+                           IF( .NOT.OK )THEN
+                              WRITE( NOUT, FMT = 9994 )
+                              FATAL = .TRUE.
+                              GO TO 120
+                           END IF
+*
+*                          See what data changed inside subroutines.
+*
+                           ISAME( 1 ) = UPLOS.EQ.UPLO
+                           ISAME( 2 ) = TRANSA.EQ.TRANAS
+                           ISAME( 3 ) = TRANSB.EQ.TRANBS
+                           ISAME( 4 ) = NS.EQ.N
+                           ISAME( 5 ) = KS.EQ.K
+                           ISAME( 6 ) = ALS.EQ.ALPHA
+                           ISAME( 7 ) = LZE( AS, AA, LAA )
+                           ISAME( 8 ) = LDAS.EQ.LDA
+                           ISAME( 9 ) = LZE( BS, BB, LBB )
+                           ISAME( 10 ) = LDBS.EQ.LDB
+                           ISAME( 11 ) = BLS.EQ.BETA
+                           IF( NULL )THEN
+                              ISAME( 12 ) = LZE( CS, CC, LCC )
+                           ELSE
+                              ISAME( 12 ) = LZERES( 'GE', ' ', N, N, CS,
+     $                                      CC, LDC )
+                           END IF
+                           ISAME( 13 ) = LDCS.EQ.LDC
+*
+*                          If data was incorrectly changed, report
+*                          and return.
+*
+                           SAME = .TRUE.
+                           DO 40 I = 1, NARGS
+                              SAME = SAME.AND.ISAME( I )
+                              IF( .NOT.ISAME( I ) )
+     $                           WRITE( NOUT, FMT = 9998 )I
+   40                      CONTINUE
+                           IF( .NOT.SAME )THEN
+                              FATAL = .TRUE.
+                              GO TO 120
+                           END IF
+*
+                           IF( .NOT.NULL )THEN
+*
+*                             Check the result.
+*
+                              CALL ZMMTCH( UPLO, TRANSA, TRANSB, N,
+     $                                    K, ALPHA, A, NMAX, B, NMAX,
+     $                                    BETA, C, NMAX, CT, G, CC, LDC,
+     $                                    EPS, ERR, FATAL, NOUT, .TRUE.)
+                              ERRMAX = MAX( ERRMAX, ERR )
+*                             If got really bad answer, report and
+*                             return.
+                              IF( FATAL )
+     $                           GO TO 120
+                           END IF
+   45                   CONTINUE
+*
+   50                CONTINUE
+*
+   60             CONTINUE
+*
+   70          CONTINUE
+*
+   80       CONTINUE
+*
+   90    CONTINUE
+*
+  100 CONTINUE
+*
+*
+*     Report result.
+*
+      IF( ERRMAX.LT.THRESH )THEN
+         WRITE( NOUT, FMT = 9999 )SNAME, NC
+      ELSE
+         WRITE( NOUT, FMT = 9997 )SNAME, NC, ERRMAX
+      END IF
+      GO TO 130
+*
+  120 CONTINUE
+      WRITE( NOUT, FMT = 9996 )SNAME
+      WRITE( NOUT, FMT = 9995 )NC, UPLO, SNAME, TRANSA, TRANSB, N, K,
+     $   ALPHA, LDA, LDB, BETA, LDC
+*
+  130 CONTINUE
+      RETURN
+*
+ 9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
+     $      'S)' )
+ 9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
+     $      'ANGED INCORRECTLY *******' )
+ 9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
+     $      'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
+     $      ' - SUSPECT *******' )
+ 9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A7, '(''',A1, ''',''',A1, ''',''', A1,''',',
+     $      2( I3, ',' ), '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3,
+     $      ',(', F4.1, ',', F4.1, '), C,', I3, ').' )
+ 9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
+     $      '******' )
+*
+*     End of ZCHK6
+*
+      END
+
+      SUBROUTINE ZMMTCH( UPLO, TRANSA, TRANSB, N, KK, ALPHA, A, LDA,
+     $                  B, LDB, BETA, C, LDC, CT, G, CC, LDCC, EPS, ERR,
+     $                  FATAL, NOUT, MV )
+      IMPLICIT NONE
+*
+*  Checks the results of the computational tests.
+*
+*  Auxiliary routine for test program for Level 3 Blas.
+*
+*  -- Written on 8-February-1989.
+*     Jack Dongarra, Argonne National Laboratory.
+*     Iain Duff, AERE Harwell.
+*     Jeremy Du Croz, Numerical Algorithms Group Ltd.
+*     Sven Hammarling, Numerical Algorithms Group Ltd.
+*
+*     .. Parameters ..
+      COMPLEX*16            ZERO
+      PARAMETER          ( ZERO = ( 0.0, 0.0 ) )
+      DOUBLE PRECISION   RZERO, RONE
+      PARAMETER          ( RZERO = 0.0D0, RONE = 1.0D0 )
+*     .. Scalar Arguments ..
+      COMPLEX*16         ALPHA, BETA
+      DOUBLE PRECISION   EPS, ERR
+      INTEGER            KK, LDA, LDB, LDC, LDCC, N, NOUT
+      LOGICAL            FATAL, MV
+      CHARACTER*1        TRANSA, TRANSB, UPLO
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), B( LDB, * ), C( LDC, * ),
+     $                   CC( LDCC, * ), CT( * )
+      DOUBLE PRECISION   G( * )
+*     .. Local Scalars ..
+      COMPLEX*16         CL
+      DOUBLE PRECISION   ERRI
+      INTEGER            I, J, K, ISTART, ISTOP
+      LOGICAL            CTRANA, CTRANB, TRANA, TRANB, UPPER
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, AIMAG, CONJG, MAX, REAL, SQRT
+*     .. Statement Functions ..
+      DOUBLE PRECISION   ABS1
+*     .. Statement Function definitions ..
+      ABS1( CL ) = ABS( DBLE( CL ) ) + ABS( DIMAG( CL ) )
+*     .. Executable Statements ..
+      UPPER = UPLO.EQ.'U'
+      TRANA = TRANSA.EQ.'T'.OR.TRANSA.EQ.'C'
+      TRANB = TRANSB.EQ.'T'.OR.TRANSB.EQ.'C'
+      CTRANA = TRANSA.EQ.'C'
+      CTRANB = TRANSB.EQ.'C'
+*
+*     Compute expected result, one column at a time, in CT using data
+*     in A, B and C.
+*     Compute gauges in G.
+*
+      ISTART = 1
+      ISTOP  = 1
+
+      DO 220 J = 1, N
+*
+         IF ( UPPER ) THEN
+             ISTART = 1
+             ISTOP = J
+         ELSE
+             ISTART = J
+             ISTOP = N
+         END IF
+
+         DO 10 I = ISTART, ISTOP
+            CT( I ) = ZERO
+            G( I ) = RZERO
+   10    CONTINUE
+         IF( .NOT.TRANA.AND..NOT.TRANB )THEN
+            DO 30 K = 1, KK
+               DO 20 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( I, K )*B( K, J )
+                  G( I ) = G( I ) + ABS1( A( I, K ) )*ABS1( B( K, J ) )
+   20          CONTINUE
+   30       CONTINUE
+         ELSE IF( TRANA.AND..NOT.TRANB )THEN
+            IF( CTRANA )THEN
+               DO 50 K = 1, KK
+                  DO 40 I = ISTART, ISTOP
+                     CT( I ) = CT( I ) + CONJG( A( K, I ) )*B( K, J )
+                     G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                        ABS1( B( K, J ) )
+   40             CONTINUE
+   50          CONTINUE
+            ELSE
+               DO 70 K = 1, KK
+                  DO 60 I = ISTART, ISTOP
+                     CT( I ) = CT( I ) + A( K, I )*B( K, J )
+                     G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                        ABS1( B( K, J ) )
+   60             CONTINUE
+   70          CONTINUE
+            END IF
+         ELSE IF( .NOT.TRANA.AND.TRANB )THEN
+            IF( CTRANB )THEN
+               DO 90 K = 1, KK
+                  DO 80 I = ISTART, ISTOP
+                     CT( I ) = CT( I ) + A( I, K )*CONJG( B( J, K ) )
+                     G( I ) = G( I ) + ABS1( A( I, K ) )*
+     $                        ABS1( B( J, K ) )
+   80             CONTINUE
+   90          CONTINUE
+            ELSE
+               DO 110 K = 1, KK
+                  DO 100 I = ISTART, ISTOP
+                     CT( I ) = CT( I ) + A( I, K )*B( J, K )
+                     G( I ) = G( I ) + ABS1( A( I, K ) )*
+     $                        ABS1( B( J, K ) )
+  100             CONTINUE
+  110          CONTINUE
+            END IF
+         ELSE IF( TRANA.AND.TRANB )THEN
+            IF( CTRANA )THEN
+               IF( CTRANB )THEN
+                  DO 130 K = 1, KK
+                     DO 120 I = ISTART, ISTOP
+                        CT( I ) = CT( I ) + CONJG( A( K, I ) )*
+     $                            CONJG( B( J, K ) )
+                        G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                           ABS1( B( J, K ) )
+  120                CONTINUE
+  130             CONTINUE
+               ELSE
+                  DO 150 K = 1, KK
+                     DO 140 I = ISTART, ISTOP
+                        CT( I ) = CT( I ) + CONJG( A( K, I ) )*B( J, K )
+                        G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                           ABS1( B( J, K ) )
+  140                CONTINUE
+  150             CONTINUE
+               END IF
+            ELSE
+               IF( CTRANB )THEN
+                  DO 170 K = 1, KK
+                     DO 160 I = ISTART, ISTOP
+                        CT( I ) = CT( I ) + A( K, I )*CONJG( B( J, K ) )
+                        G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                           ABS1( B( J, K ) )
+  160                CONTINUE
+  170             CONTINUE
+               ELSE
+                  DO 190 K = 1, KK
+                     DO 180 I = ISTART, ISTOP
+                        CT( I ) = CT( I ) + A( K, I )*B( J, K )
+                        G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                           ABS1( B( J, K ) )
+  180                CONTINUE
+  190             CONTINUE
+               END IF
+            END IF
+         END IF
+         DO 200 I = ISTART, ISTOP
+            CT( I ) = ALPHA*CT( I ) + BETA*C( I, J )
+            G( I ) = ABS1( ALPHA )*G( I ) +
+     $               ABS1( BETA )*ABS1( C( I, J ) )
+  200    CONTINUE
+*
+*        Compute the error ratio for this result.
+*
+         ERR = ZERO
+         DO 210 I = ISTART, ISTOP
+            ERRI = ABS1( CT( I ) - CC( I, J ) )/EPS
+            IF( G( I ).NE.RZERO )
+     $         ERRI = ERRI/G( I )
+            ERR = MAX( ERR, ERRI )
+            IF( ERR*SQRT( EPS ).GE.RONE )
+     $         GO TO 230
+  210    CONTINUE
+*
+  220 CONTINUE
+*
+*     If the loop completes, all results are at least half accurate.
+      GO TO 250
+*
+*     Report fatal error.
+*
+  230 FATAL = .TRUE.
+      WRITE( NOUT, FMT = 9999 )
+      DO 240 I = ISTART, ISTOP
+         IF( MV )THEN
+            WRITE( NOUT, FMT = 9998 )I, CT( I ), CC( I, J )
+         ELSE
+            WRITE( NOUT, FMT = 9998 )I, CC( I, J ), CT( I )
+         END IF
+  240 CONTINUE
+      IF( N.GT.1 )
+     $   WRITE( NOUT, FMT = 9997 )J
+*
+  250 CONTINUE
+      RETURN
+*
+ 9999 FORMAT( ' ******* FATAL ERROR - COMPUTED RESULT IS LESS THAN HAL',
+     $      'F ACCURATE *******', /'                       EXPECTED RE',
+     $      'SULT                    COMPUTED RESULT' )
+ 9998 FORMAT( 1X, I7, 2( '  (', G15.6, ',', G15.6, ')' ) )
+ 9997 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
+*
+*     End of ZMMTCH
+*
+      END
+
diff --git a/BLAS/TESTING/zblat3.in b/BLAS/TESTING/zblat3.in
index a3618b0f6d..7768859c11 100644
--- a/BLAS/TESTING/zblat3.in
+++ b/BLAS/TESTING/zblat3.in
@@ -12,12 +12,13 @@ T        LOGICAL FLAG, T TO TEST ERROR EXITS.
 (0.0,0.0) (1.0,0.0) (0.7,-0.9)       VALUES OF ALPHA
 3                 NUMBER OF VALUES OF BETA
 (0.0,0.0) (1.0,0.0) (1.3,-1.1)       VALUES OF BETA
-ZGEMM  T PUT F FOR NO TEST. SAME COLUMNS.
-ZHEMM  T PUT F FOR NO TEST. SAME COLUMNS.
-ZSYMM  T PUT F FOR NO TEST. SAME COLUMNS.
-ZTRMM  T PUT F FOR NO TEST. SAME COLUMNS.
-ZTRSM  T PUT F FOR NO TEST. SAME COLUMNS.
-ZHERK  T PUT F FOR NO TEST. SAME COLUMNS.
-ZSYRK  T PUT F FOR NO TEST. SAME COLUMNS.
-ZHER2K T PUT F FOR NO TEST. SAME COLUMNS.
-ZSYR2K T PUT F FOR NO TEST. SAME COLUMNS.
+ZGEMM   T PUT F FOR NO TEST. SAME COLUMNS.
+ZHEMM   T PUT F FOR NO TEST. SAME COLUMNS.
+ZSYMM   T PUT F FOR NO TEST. SAME COLUMNS.
+ZTRMM   T PUT F FOR NO TEST. SAME COLUMNS.
+ZTRSM   T PUT F FOR NO TEST. SAME COLUMNS.
+ZHERK   T PUT F FOR NO TEST. SAME COLUMNS.
+ZSYRK   T PUT F FOR NO TEST. SAME COLUMNS.
+ZHER2K  T PUT F FOR NO TEST. SAME COLUMNS.
+ZSYR2K  T PUT F FOR NO TEST. SAME COLUMNS.
+ZGEMMTR T PUT F FOR NO TEST. SAME COLUMNS.
diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
index a64ab0cef4..b01d795af9 100644
--- a/CBLAS/CMakeLists.txt
+++ b/CBLAS/CMakeLists.txt
@@ -1,25 +1,32 @@
-message(STATUS "CBLAS enable")
+message(STATUS "CBLAS enabled")
 enable_language(C)
 
 set(LAPACK_INSTALL_EXPORT_NAME ${CBLASLIB}-targets)
 
 # Create a header file cblas.h for the routines called in my C programs
-include(FortranCInterface)
-## Ensure that the fortran compiler and c compiler specified are compatible
-FortranCInterface_VERIFY()
-FortranCInterface_HEADER(${LAPACK_BINARY_DIR}/include/cblas_mangling.h
-                         MACRO_NAMESPACE "F77_"
-                         SYMBOL_NAMESPACE "F77_")
+include(CheckLanguage)
+check_language(Fortran)
+if(CMAKE_Fortran_COMPILER)
+  enable_language(Fortran)
+  include(FortranCInterface)
+  ## Ensure that the fortran compiler and c compiler specified are compatible
+  FortranCInterface_VERIFY()
+  FortranCInterface_HEADER(${LAPACK_BINARY_DIR}/include/cblas_mangling.h
+                          MACRO_NAMESPACE "F77_"
+                          SYMBOL_NAMESPACE "F77_")
+
+  # Check for any necessary platform specific compiler flags
+  include(CheckLAPACKCompilerFlags)
+  CheckLAPACKCompilerFlags()
+endif()
 if(NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND)
-  message(WARNING "Reverting to pre-defined include/lapacke_mangling.h")
-    configure_file(include/lapacke_mangling_with_flags.h.in
-                  ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h)
+  message(WARNING "Reverting to pre-defined include/cblas_mangling.h")
     configure_file(include/cblas_mangling_with_flags.h.in
                  ${LAPACK_BINARY_DIR}/include/cblas_mangling.h)
 endif()
 
 include(CheckCSourceCompiles)
-check_c_source_compiles("void __attribute__((weak)) main() {};"
+check_c_source_compiles("int __attribute__((weak)) main() {};"
                         HAS_ATTRIBUTE_WEAK_SUPPORT)
 
 include_directories(include ${LAPACK_BINARY_DIR}/include)
diff --git a/CBLAS/cmake/cblas-config-install.cmake.in b/CBLAS/cmake/cblas-config-install.cmake.in
index 44046a283b..95b1f71941 100644
--- a/CBLAS/cmake/cblas-config-install.cmake.in
+++ b/CBLAS/cmake/cblas-config-install.cmake.in
@@ -1,11 +1,8 @@
 # Compute locations from <prefix>/@{LIBRARY_DIR@/cmake/lapacke-<v>/<self>.cmake
 get_filename_component(_CBLAS_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(_CBLAS_PREFIX "${_CBLAS_SELF_DIR}" PATH)
-get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH)
-get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH)
 
 # Load the LAPACK package with which we were built.
-set(LAPACK_DIR "${_CBLAS_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACKLIB@-@LAPACK_VERSION@")
+set(LAPACK_DIR "@CMAKE_INSTALL_FULL_LIBDIR@/cmake/@LAPACKLIB@-@LAPACK_VERSION@")
 find_package(LAPACK NO_MODULE)
 
 # Load lapacke targets from the install tree.
@@ -14,10 +11,9 @@ if(NOT TARGET @CBLASLIB@)
 endif()
 
 # Report lapacke header search locations.
-set(CBLAS_INCLUDE_DIRS ${_CBLAS_PREFIX}/include)
+set(CBLAS_INCLUDE_DIRS @CMAKE_INSTALL_FULL_INCLUDEDIR@)
 
 # Report lapacke libraries.
 set(CBLAS_LIBRARIES @CBLASLIB@)
 
-unset(_CBLAS_PREFIX)
 unset(_CBLAS_SELF_DIR)
diff --git a/CBLAS/examples/CMakeLists.txt b/CBLAS/examples/CMakeLists.txt
index 74f7d8bb83..61042430ee 100644
--- a/CBLAS/examples/CMakeLists.txt
+++ b/CBLAS/examples/CMakeLists.txt
@@ -6,3 +6,14 @@ target_link_libraries(xexample2_CBLAS ${CBLASLIB} ${BLAS_LIBRARIES})
 
 add_test(example1_CBLAS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample1_CBLAS)
 add_test(example2_CBLAS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample2_CBLAS)
+
+if(BUILD_INDEX64_EXT_API)
+  add_executable(xexample1_64_CBLAS cblas_example1_64.c)
+  add_executable(xexample2_64_CBLAS cblas_example2_64.c)
+
+  target_link_libraries(xexample1_64_CBLAS ${CBLASLIB})
+  target_link_libraries(xexample2_64_CBLAS ${CBLASLIB} ${BLAS_LIBRARIES})
+
+  add_test(example1_64_CBLAS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample1_64_CBLAS)
+  add_test(example2_64_CBLAS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample2_64_CBLAS)
+endif()
diff --git a/CBLAS/examples/cblas_example1.c b/CBLAS/examples/cblas_example1.c
index 65731ba15c..0571770ba5 100644
--- a/CBLAS/examples/cblas_example1.c
+++ b/CBLAS/examples/cblas_example1.c
@@ -61,7 +61,7 @@ int main ( )
                 y, incy );
    /* Print y */
    for( i = 0; i < n; i++ )
-      printf(" y%d = %f\n", i, y[i]);
+      printf(" y%" CBLAS_IFMT " = %f\n", i, y[i]);
    free(a);
    free(x);
    free(y);
diff --git a/CBLAS/examples/cblas_example1_64.c b/CBLAS/examples/cblas_example1_64.c
new file mode 100644
index 0000000000..2dfcb73094
--- /dev/null
+++ b/CBLAS/examples/cblas_example1_64.c
@@ -0,0 +1,69 @@
+/* cblas_example.c */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "cblas_64.h"
+
+int main ( )
+{
+   CBLAS_LAYOUT Layout;
+   CBLAS_TRANSPOSE transa;
+
+   double *a, *x, *y;
+   double alpha, beta;
+   int64_t m, n, lda, incx, incy, i;
+
+   Layout = CblasColMajor;
+   transa = CblasNoTrans;
+
+   m = 4; /* Size of Column ( the number of rows ) */
+   n = 4; /* Size of Row ( the number of columns ) */
+   lda = 4; /* Leading dimension of 5 * 4 matrix is 5 */
+   incx = 1;
+   incy = 1;
+   alpha = 1;
+   beta = 0;
+
+   a = (double *)malloc(sizeof(double)*m*n);
+   x = (double *)malloc(sizeof(double)*n);
+   y = (double *)malloc(sizeof(double)*n);
+   /* The elements of the first column */
+   a[0] = 1;
+   a[1] = 2;
+   a[2] = 3;
+   a[3] = 4;
+   /* The elements of the second column */
+   a[m] = 1;
+   a[m+1] = 1;
+   a[m+2] = 1;
+   a[m+3] = 1;
+   /* The elements of the third column */
+   a[m*2] = 3;
+   a[m*2+1] = 4;
+   a[m*2+2] = 5;
+   a[m*2+3] = 6;
+   /* The elements of the fourth column */
+   a[m*3] = 5;
+   a[m*3+1] = 6;
+   a[m*3+2] = 7;
+   a[m*3+3] = 8;
+   /* The elements of x and y */
+   x[0] = 1;
+   x[1] = 2;
+   x[2] = 1;
+   x[3] = 1;
+   y[0] = 0;
+   y[1] = 0;
+   y[2] = 0;
+   y[3] = 0;
+
+   cblas_dgemv_64( Layout, transa, m, n, alpha, a, lda, x, incx, beta,
+                y, incy );
+   /* Print y */
+   for( i = 0; i < n; i++ )
+      printf(" y%d = %f\n", (int) i, y[i]);
+   free(a);
+   free(x);
+   free(y);
+   return 0;
+}
diff --git a/CBLAS/examples/cblas_example2_64.c b/CBLAS/examples/cblas_example2_64.c
new file mode 100644
index 0000000000..1682e6d208
--- /dev/null
+++ b/CBLAS/examples/cblas_example2_64.c
@@ -0,0 +1,75 @@
+/* cblas_example2.c */
+
+#define CBLAS_API64
+#define F77_INT int64_t
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "cblas_64.h"
+#include "cblas_f77.h"
+
+#define INVALID -1
+
+int main (int argc, char **argv )
+{
+   int64_t rout=-1,info=0,m,n,k,lda,ldb,ldc;
+   double A[2] = {0.0,0.0},
+          B[2] = {0.0,0.0},
+          C[2] = {0.0,0.0},
+          ALPHA=0.0, BETA=0.0;
+
+   if (argc > 2){
+      rout = atoi(argv[1]);
+      info = atoi(argv[2]);
+   }
+
+   if (rout == 1) {
+      if (info==0) {
+         printf("Checking if cblas_dgemm fails on parameter 4\n");
+         cblas_dgemm_64( CblasRowMajor,  CblasTrans, CblasNoTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      }
+      if (info==1) {
+         printf("Checking if cblas_dgemm fails on parameter 5\n");
+         cblas_dgemm_64( CblasRowMajor,  CblasNoTrans, CblasTrans, 0, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      }
+      if (info==2) {
+         printf("Checking if cblas_dgemm fails on parameter 9\n");
+         cblas_dgemm_64( CblasRowMajor,  CblasNoTrans, CblasNoTrans, 0, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      }
+      if (info==3) {
+         printf("Checking if cblas_dgemm fails on parameter 11\n");
+         cblas_dgemm_64( CblasRowMajor,  CblasNoTrans, CblasNoTrans, 0, 2, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      }
+   } else {
+      if (info==0) {
+         printf("Checking if F77_dgemm fails on parameter 3\n");
+         m=INVALID; n=0; k=0; lda=1; ldb=1; ldc=1;
+         F77_dgemm( "T", "N", &m, &n, &k,
+                   &ALPHA, A, &lda, B, &ldb, &BETA, C, &ldc );
+      }
+      if (info==1) {
+         m=0; n=INVALID; k=0; lda=1; ldb=1; ldc=1;
+         printf("Checking if F77_dgemm fails on parameter 4\n");
+         F77_dgemm( "N", "T", &m, &n, &k,
+                   &ALPHA, A, &lda, B, &ldb, &BETA, C, &ldc );
+      }
+      if (info==2) {
+         printf("Checking if F77_dgemm fails on parameter 8\n");
+         m=2; n=0; k=0; lda=1; ldb=1; ldc=2;
+         F77_dgemm( "N", "N" , &m, &n, &k,
+                   &ALPHA, A, &lda, B, &ldb, &BETA, C, &ldc );
+      }
+      if (info==3) {
+         printf("Checking if F77_dgemm fails on parameter 10\n");
+         m=0; n=0; k=2; lda=1; ldb=1; ldc=1;
+         F77_dgemm( "N", "N" , &m, &n, &k,
+                   &ALPHA, A, &lda, B, &ldb, &BETA, C, &ldc );
+      }
+   }
+
+   return 0;
+}
diff --git a/CBLAS/include/CMakeLists.txt b/CBLAS/include/CMakeLists.txt
index 059bca0096..0fd5e586ed 100644
--- a/CBLAS/include/CMakeLists.txt
+++ b/CBLAS/include/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(CBLAS_INCLUDE cblas.h cblas_f77.h)
+set(CBLAS_INCLUDE cblas.h cblas_f77.h cblas_64.h)
 
 file(COPY ${CBLAS_INCLUDE} DESTINATION ${LAPACK_BINARY_DIR}/include)
 
diff --git a/CBLAS/include/cblas.h b/CBLAS/include/cblas.h
index 8b1cd2a1c4..af86cc6886 100644
--- a/CBLAS/include/cblas.h
+++ b/CBLAS/include/cblas.h
@@ -1,6 +1,8 @@
 #ifndef CBLAS_H
 #define CBLAS_H
 #include <stddef.h>
+#include <stdint.h>
+#include <inttypes.h>
 
 
 #ifdef __cplusplus
@@ -15,10 +17,23 @@ extern "C" {            /* Assume C declarations for C++ */
 /*
  * Integer type
  */
+#ifndef CBLAS_INT
 #ifdef WeirdNEC
-   #define CBLAS_INT long
+   #define CBLAS_INT int64_t
 #else
-   #define CBLAS_INT int
+   #define CBLAS_INT int32_t
+#endif
+#endif
+
+/*
+ * Integer format string
+ */
+#ifndef CBLAS_IFMT
+#ifdef WeirdNEC
+   #define CBLAS_IFMT PRId64
+#else
+   #define CBLAS_IFMT PRId32
+#endif
 #endif
 
 typedef enum CBLAS_LAYOUT {CblasRowMajor=101, CblasColMajor=102} CBLAS_LAYOUT;
@@ -31,6 +46,19 @@ typedef enum CBLAS_SIDE {CblasLeft=141, CblasRight=142} CBLAS_SIDE;
 
 #include "cblas_mangling.h"
 
+/*
+ * Integer specific API
+ */
+#ifndef API_SUFFIX
+#ifdef CBLAS_API64
+#define API_SUFFIX(a) a##_64
+#include "cblas_64.h"
+#else
+#define API_SUFFIX(a) a
+#endif
+#endif
+
+
 /*
  * ===========================================================================
  * Prototypes for level 1 BLAS functions (complex are recast as routines)
@@ -102,6 +130,8 @@ void cblas_scopy(const CBLAS_INT N, const float *X, const CBLAS_INT incX,
                  float *Y, const CBLAS_INT incY);
 void cblas_saxpy(const CBLAS_INT N, const float alpha, const float *X,
                  const CBLAS_INT incX, float *Y, const CBLAS_INT incY);
+void cblas_saxpby(const CBLAS_INT N, const float alpha, const float *X,
+                 const CBLAS_INT incX, const float beta, float *Y, const CBLAS_INT incY);
 
 void cblas_dswap(const CBLAS_INT N, double *X, const CBLAS_INT incX,
                  double *Y, const CBLAS_INT incY);
@@ -109,6 +139,8 @@ void cblas_dcopy(const CBLAS_INT N, const double *X, const CBLAS_INT incX,
                  double *Y, const CBLAS_INT incY);
 void cblas_daxpy(const CBLAS_INT N, const double alpha, const double *X,
                  const CBLAS_INT incX, double *Y, const CBLAS_INT incY);
+void cblas_daxpby(const CBLAS_INT N, const double alpha, const double *X,
+                 const CBLAS_INT incX, const double beta, double *Y, const CBLAS_INT incY);
 
 void cblas_cswap(const CBLAS_INT N, void *X, const CBLAS_INT incX,
                  void *Y, const CBLAS_INT incY);
@@ -116,6 +148,8 @@ void cblas_ccopy(const CBLAS_INT N, const void *X, const CBLAS_INT incX,
                  void *Y, const CBLAS_INT incY);
 void cblas_caxpy(const CBLAS_INT N, const void *alpha, const void *X,
                  const CBLAS_INT incX, void *Y, const CBLAS_INT incY);
+void cblas_caxpby(const CBLAS_INT N, const void *alpha, const void *X,
+                 const CBLAS_INT incX, const void *beta, void *Y, const CBLAS_INT incY);
 
 void cblas_zswap(const CBLAS_INT N, void *X, const CBLAS_INT incX,
                  void *Y, const CBLAS_INT incY);
@@ -123,24 +157,20 @@ void cblas_zcopy(const CBLAS_INT N, const void *X, const CBLAS_INT incX,
                  void *Y, const CBLAS_INT incY);
 void cblas_zaxpy(const CBLAS_INT N, const void *alpha, const void *X,
                  const CBLAS_INT incX, void *Y, const CBLAS_INT incY);
+void cblas_zaxpby(const CBLAS_INT N, const void *alpha, const void *X,
+                 const CBLAS_INT incX, const void *beta, void *Y, const CBLAS_INT incY);
 
 
 /*
  * Routines with S and D prefix only
  */
-void cblas_srotg(float *a, float *b, float *c, float *s);
 void cblas_srotmg(float *d1, float *d2, float *b1, const float b2, float *P);
-void cblas_srot(const CBLAS_INT N, float *X, const CBLAS_INT incX,
-                float *Y, const CBLAS_INT incY, const float c, const float s);
 void cblas_srotm(const CBLAS_INT N, float *X, const CBLAS_INT incX,
-                float *Y, const CBLAS_INT incY, const float *P);
-
-void cblas_drotg(double *a, double *b, double *c, double *s);
+                 float *Y, const CBLAS_INT incY, const float *P);
 void cblas_drotmg(double *d1, double *d2, double *b1, const double b2, double *P);
-void cblas_drot(const CBLAS_INT N, double *X, const CBLAS_INT incX,
-                double *Y, const CBLAS_INT incY, const double c, const double  s);
 void cblas_drotm(const CBLAS_INT N, double *X, const CBLAS_INT incX,
-                double *Y, const CBLAS_INT incY, const double *P);
+                 double *Y, const CBLAS_INT incY, const double *P);
+
 
 
 /*
@@ -153,6 +183,20 @@ void cblas_zscal(const CBLAS_INT N, const void *alpha, void *X, const CBLAS_INT
 void cblas_csscal(const CBLAS_INT N, const float alpha, void *X, const CBLAS_INT incX);
 void cblas_zdscal(const CBLAS_INT N, const double alpha, void *X, const CBLAS_INT incX);
 
+void cblas_srotg(float *a, float *b, float *c, float *s);
+void cblas_drotg(double *a, double *b, double *c, double *s);
+void cblas_crotg(void *a, void *b, float *c, void *s);
+void cblas_zrotg(void *a, void *b, double *c, void *s);
+
+void cblas_srot(const CBLAS_INT N, float *X, const CBLAS_INT incX,
+                float *Y, const CBLAS_INT incY, const float c, const float s);
+void cblas_drot(const CBLAS_INT N, double *X, const CBLAS_INT incX,
+                double *Y, const CBLAS_INT incY, const double c, const double  s);
+void cblas_csrot(const CBLAS_INT N, void *X, const CBLAS_INT incX,
+                 void *Y, const CBLAS_INT incY, const float c, const float s);
+void cblas_zdrot(const CBLAS_INT N, void *X, const CBLAS_INT incX,
+                 void *Y, const CBLAS_INT incY, const double c, const double s);
+
 /*
  * ===========================================================================
  * Prototypes for level 2 BLAS
@@ -436,6 +480,12 @@ void cblas_sgemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE TransA,
                  const CBLAS_INT K, const float alpha, const float *A,
                  const CBLAS_INT lda, const float *B, const CBLAS_INT ldb,
                  const float beta, float *C, const CBLAS_INT ldc);
+void cblas_sgemmtr(CBLAS_LAYOUT layout,CBLAS_UPLO Uplo, CBLAS_TRANSPOSE TransA,
+                 CBLAS_TRANSPOSE TransB, const CBLAS_INT N,
+                 const CBLAS_INT K, const float alpha, const float *A,
+                 const CBLAS_INT lda, const float *B, const CBLAS_INT ldb,
+                 const float beta, float *C, const CBLAS_INT ldc);
+
 void cblas_ssymm(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
                  CBLAS_UPLO Uplo, const CBLAS_INT M, const CBLAS_INT N,
                  const float alpha, const float *A, const CBLAS_INT lda,
@@ -466,6 +516,11 @@ void cblas_dgemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE TransA,
                  const CBLAS_INT K, const double alpha, const double *A,
                  const CBLAS_INT lda, const double *B, const CBLAS_INT ldb,
                  const double beta, double *C, const CBLAS_INT ldc);
+void cblas_dgemmtr(CBLAS_LAYOUT layout,CBLAS_UPLO Uplo, CBLAS_TRANSPOSE TransA,
+                 CBLAS_TRANSPOSE TransB, const CBLAS_INT N,
+                 const CBLAS_INT K, const double alpha, const double *A,
+                 const CBLAS_INT lda, const double *B, const CBLAS_INT ldb,
+                 const double beta, double *C, const CBLAS_INT ldc);
 void cblas_dsymm(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
                  CBLAS_UPLO Uplo, const CBLAS_INT M, const CBLAS_INT N,
                  const double alpha, const double *A, const CBLAS_INT lda,
@@ -496,6 +551,11 @@ void cblas_cgemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE TransA,
                  const CBLAS_INT K, const void *alpha, const void *A,
                  const CBLAS_INT lda, const void *B, const CBLAS_INT ldb,
                  const void *beta, void *C, const CBLAS_INT ldc);
+void cblas_cgemmtr(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo, CBLAS_TRANSPOSE TransA,
+                 CBLAS_TRANSPOSE TransB, const CBLAS_INT N,
+                 const CBLAS_INT K, const void *alpha, const void *A,
+                 const CBLAS_INT lda, const void *B, const CBLAS_INT ldb,
+                 const void *beta, void *C, const CBLAS_INT ldc);
 void cblas_csymm(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
                  CBLAS_UPLO Uplo, const CBLAS_INT M, const CBLAS_INT N,
                  const void *alpha, const void *A, const CBLAS_INT lda,
@@ -526,6 +586,11 @@ void cblas_zgemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE TransA,
                  const CBLAS_INT K, const void *alpha, const void *A,
                  const CBLAS_INT lda, const void *B, const CBLAS_INT ldb,
                  const void *beta, void *C, const CBLAS_INT ldc);
+void cblas_zgemmtr(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo, CBLAS_TRANSPOSE TransA,
+                 CBLAS_TRANSPOSE TransB, const CBLAS_INT N,
+                 const CBLAS_INT K, const void *alpha, const void *A,
+                 const CBLAS_INT lda, const void *B, const CBLAS_INT ldb,
+                 const void *beta, void *C, const CBLAS_INT ldc);
 void cblas_zsymm(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
                  CBLAS_UPLO Uplo, const CBLAS_INT M, const CBLAS_INT N,
                  const void *alpha, const void *A, const CBLAS_INT lda,
@@ -585,7 +650,11 @@ void cblas_zher2k(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
                   const void *B, const CBLAS_INT ldb, const double beta,
                   void *C, const CBLAS_INT ldc);
 
-void cblas_xerbla(CBLAS_INT p, const char *rout, const char *form, ...);
+void
+#ifdef HAS_ATTRIBUTE_WEAK_SUPPORT
+__attribute__((weak))
+#endif
+cblas_xerbla(CBLAS_INT p, const char *rout, const char *form, ...);
 
 #ifdef __cplusplus
 }
diff --git a/CBLAS/include/cblas_64.h b/CBLAS/include/cblas_64.h
new file mode 100644
index 0000000000..ddcd8f7aa6
--- /dev/null
+++ b/CBLAS/include/cblas_64.h
@@ -0,0 +1,615 @@
+#ifndef CBLAS_64_H
+#define CBLAS_64_H
+#include <stddef.h>
+#include <stdint.h>
+#include <inttypes.h>
+
+#include "cblas.h"
+
+#ifdef __cplusplus
+extern "C" {            /* Assume C declarations for C++ */
+#endif /* __cplusplus */
+
+/*
+ * ===========================================================================
+ * Prototypes for level 1 BLAS functions (complex are recast as routines)
+ * ===========================================================================
+ */
+
+double cblas_dcabs1_64(const void  *z);
+float  cblas_scabs1_64(const void  *c);
+
+float  cblas_sdsdot_64(const int64_t N, const float alpha, const float *X,
+                    const int64_t incX, const float *Y, const int64_t incY);
+double cblas_dsdot_64(const int64_t N, const float *X, const int64_t incX, const float *Y,
+                   const int64_t incY);
+float  cblas_sdot_64(const int64_t N, const float  *X, const int64_t incX,
+                  const float  *Y, const int64_t incY);
+double cblas_ddot_64(const int64_t N, const double *X, const int64_t incX,
+                  const double *Y, const int64_t incY);
+
+/*
+ * Functions having prefixes Z and C only
+ */
+void   cblas_cdotu_sub_64(const int64_t N, const void *X, const int64_t incX,
+                       const void *Y, const int64_t incY, void *dotu);
+void   cblas_cdotc_sub_64(const int64_t N, const void *X, const int64_t incX,
+                       const void *Y, const int64_t incY, void *dotc);
+
+void   cblas_zdotu_sub_64(const int64_t N, const void *X, const int64_t incX,
+                       const void *Y, const int64_t incY, void *dotu);
+void   cblas_zdotc_sub_64(const int64_t N, const void *X, const int64_t incX,
+                       const void *Y, const int64_t incY, void *dotc);
+
+
+/*
+ * Functions having prefixes S D SC DZ
+ */
+float  cblas_snrm2_64(const int64_t N, const float *X, const int64_t incX);
+float  cblas_sasum_64(const int64_t N, const float *X, const int64_t incX);
+
+double cblas_dnrm2_64(const int64_t N, const double *X, const int64_t incX);
+double cblas_dasum_64(const int64_t N, const double *X, const int64_t incX);
+
+float  cblas_scnrm2_64(const int64_t N, const void *X, const int64_t incX);
+float  cblas_scasum_64(const int64_t N, const void *X, const int64_t incX);
+
+double cblas_dznrm2_64(const int64_t N, const void *X, const int64_t incX);
+double cblas_dzasum_64(const int64_t N, const void *X, const int64_t incX);
+
+
+/*
+ * Functions having standard 4 prefixes (S D C Z)
+ */
+CBLAS_INDEX cblas_isamax_64(const int64_t N, const float  *X, const int64_t incX);
+CBLAS_INDEX cblas_idamax_64(const int64_t N, const double *X, const int64_t incX);
+CBLAS_INDEX cblas_icamax_64(const int64_t N, const void   *X, const int64_t incX);
+CBLAS_INDEX cblas_izamax_64(const int64_t N, const void   *X, const int64_t incX);
+
+/*
+ * ===========================================================================
+ * Prototypes for level 1 BLAS routines
+ * ===========================================================================
+ */
+
+/*
+ * Routines with standard 4 prefixes (s, d, c, z)
+ */
+void cblas_sswap_64(const int64_t N, float *X, const int64_t incX,
+                 float *Y, const int64_t incY);
+void cblas_scopy_64(const int64_t N, const float *X, const int64_t incX,
+                 float *Y, const int64_t incY);
+void cblas_saxpy_64(const int64_t N, const float alpha, const float *X,
+                 const int64_t incX, float *Y, const int64_t incY);
+void cblas_saxpby_64(const int64_t N, const float alpha, const float *X,
+                 const int64_t incX, const float beta, float *Y, const int64_t incY);
+
+
+void cblas_dswap_64(const int64_t N, double *X, const int64_t incX,
+                 double *Y, const int64_t incY);
+void cblas_dcopy_64(const int64_t N, const double *X, const int64_t incX,
+                 double *Y, const int64_t incY);
+void cblas_daxpy_64(const int64_t N, const double alpha, const double *X,
+                 const int64_t incX, double *Y, const int64_t incY);
+void cblas_daxpby_64(const int64_t N, const double alpha, const double *X,
+                 const int64_t incX, const double beta, double *Y, const int64_t incY);
+
+void cblas_cswap_64(const int64_t N, void *X, const int64_t incX,
+                 void *Y, const int64_t incY);
+void cblas_ccopy_64(const int64_t N, const void *X, const int64_t incX,
+                 void *Y, const int64_t incY);
+void cblas_caxpy_64(const int64_t N, const void *alpha, const void *X,
+                 const int64_t incX, void *Y, const int64_t incY);
+void cblas_caxpby_64(const int64_t N, const void *alpha, const void *X,
+                 const int64_t incX, const void *beta, void *Y, const int64_t incY);
+
+void cblas_zswap_64(const int64_t N, void *X, const int64_t incX,
+                 void *Y, const int64_t incY);
+void cblas_zcopy_64(const int64_t N, const void *X, const int64_t incX,
+                 void *Y, const int64_t incY);
+void cblas_zaxpy_64(const int64_t N, const void *alpha, const void *X,
+                 const int64_t incX, void *Y, const int64_t incY);
+void cblas_zaxbpy_64(const int64_t N, const void *alpha, const void *X,
+                 const int64_t incX, const void *beta, void *Y, const int64_t incY);
+
+
+/*
+ * Routines with S and D prefix only
+ */
+void cblas_srotmg_64(float *d1, float *d2, float *b1, const float b2, float *P);
+void cblas_srotm_64(const int64_t N, float *X, const int64_t incX,
+                 float *Y, const int64_t incY, const float *P);
+void cblas_drotmg_64(double *d1, double *d2, double *b1, const double b2, double *P);
+void cblas_drotm_64(const int64_t N, double *X, const int64_t incX,
+                 double *Y, const int64_t incY, const double *P);
+
+
+
+/*
+ * Routines with S D C Z CS and ZD prefixes
+ */
+void cblas_sscal_64(const int64_t N, const float alpha, float *X, const int64_t incX);
+void cblas_dscal_64(const int64_t N, const double alpha, double *X, const int64_t incX);
+void cblas_cscal_64(const int64_t N, const void *alpha, void *X, const int64_t incX);
+void cblas_zscal_64(const int64_t N, const void *alpha, void *X, const int64_t incX);
+void cblas_csscal_64(const int64_t N, const float alpha, void *X, const int64_t incX);
+void cblas_zdscal_64(const int64_t N, const double alpha, void *X, const int64_t incX);
+
+void cblas_srotg_64(float *a, float *b, float *c, float *s);
+void cblas_drotg_64(double *a, double *b, double *c, double *s);
+void cblas_crotg_64(void *a, void *b, float *c, void *s);
+void cblas_zrotg_64(void *a, void *b, double *c, void *s);
+
+void cblas_srot_64(const int64_t N, float *X, const int64_t incX,
+                float *Y, const int64_t incY, const float c, const float s);
+void cblas_drot_64(const int64_t N, double *X, const int64_t incX,
+                double *Y, const int64_t incY, const double c, const double  s);
+void cblas_csrot_64(const int64_t N, void *X, const int64_t incX,
+                 void *Y, const int64_t incY, const float c, const float s);
+void cblas_zdrot_64(const int64_t N, void *X, const int64_t incX,
+                 void *Y, const int64_t incY, const double c, const double s);
+
+/*
+ * ===========================================================================
+ * Prototypes for level 2 BLAS
+ * ===========================================================================
+ */
+
+/*
+ * Routines with standard 4 prefixes (S, D, C, Z)
+ */
+void cblas_sgemv_64(const CBLAS_LAYOUT layout,
+                 const CBLAS_TRANSPOSE TransA, const int64_t M, const int64_t N,
+                 const float alpha, const float *A, const int64_t lda,
+                 const float *X, const int64_t incX, const float beta,
+                 float *Y, const int64_t incY);
+void cblas_sgbmv_64(CBLAS_LAYOUT layout,
+                 CBLAS_TRANSPOSE TransA, const int64_t M, const int64_t N,
+                 const int64_t KL, const int64_t KU, const float alpha,
+                 const float *A, const int64_t lda, const float *X,
+                 const int64_t incX, const float beta, float *Y, const int64_t incY);
+void cblas_strmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const float *A, const int64_t lda,
+                 float *X, const int64_t incX);
+void cblas_stbmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const int64_t K, const float *A, const int64_t lda,
+                 float *X, const int64_t incX);
+void cblas_stpmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const float *Ap, float *X, const int64_t incX);
+void cblas_strsv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const float *A, const int64_t lda, float *X,
+                 const int64_t incX);
+void cblas_stbsv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const int64_t K, const float *A, const int64_t lda,
+                 float *X, const int64_t incX);
+void cblas_stpsv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const float *Ap, float *X, const int64_t incX);
+
+void cblas_dgemv_64(CBLAS_LAYOUT layout,
+                 CBLAS_TRANSPOSE TransA, const int64_t M, const int64_t N,
+                 const double alpha, const double *A, const int64_t lda,
+                 const double *X, const int64_t incX, const double beta,
+                 double *Y, const int64_t incY);
+void cblas_dgbmv_64(CBLAS_LAYOUT layout,
+                 CBLAS_TRANSPOSE TransA, const int64_t M, const int64_t N,
+                 const int64_t KL, const int64_t KU, const double alpha,
+                 const double *A, const int64_t lda, const double *X,
+                 const int64_t incX, const double beta, double *Y, const int64_t incY);
+void cblas_dtrmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const double *A, const int64_t lda,
+                 double *X, const int64_t incX);
+void cblas_dtbmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const int64_t K, const double *A, const int64_t lda,
+                 double *X, const int64_t incX);
+void cblas_dtpmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const double *Ap, double *X, const int64_t incX);
+void cblas_dtrsv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const double *A, const int64_t lda, double *X,
+                 const int64_t incX);
+void cblas_dtbsv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const int64_t K, const double *A, const int64_t lda,
+                 double *X, const int64_t incX);
+void cblas_dtpsv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const double *Ap, double *X, const int64_t incX);
+
+void cblas_cgemv_64(CBLAS_LAYOUT layout,
+                 CBLAS_TRANSPOSE TransA, const int64_t M, const int64_t N,
+                 const void *alpha, const void *A, const int64_t lda,
+                 const void *X, const int64_t incX, const void *beta,
+                 void *Y, const int64_t incY);
+void cblas_cgbmv_64(CBLAS_LAYOUT layout,
+                 CBLAS_TRANSPOSE TransA, const int64_t M, const int64_t N,
+                 const int64_t KL, const int64_t KU, const void *alpha,
+                 const void *A, const int64_t lda, const void *X,
+                 const int64_t incX, const void *beta, void *Y, const int64_t incY);
+void cblas_ctrmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const void *A, const int64_t lda,
+                 void *X, const int64_t incX);
+void cblas_ctbmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const int64_t K, const void *A, const int64_t lda,
+                 void *X, const int64_t incX);
+void cblas_ctpmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const void *Ap, void *X, const int64_t incX);
+void cblas_ctrsv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const void *A, const int64_t lda, void *X,
+                 const int64_t incX);
+void cblas_ctbsv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const int64_t K, const void *A, const int64_t lda,
+                 void *X, const int64_t incX);
+void cblas_ctpsv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const void *Ap, void *X, const int64_t incX);
+
+void cblas_zgemv_64(CBLAS_LAYOUT layout,
+                 CBLAS_TRANSPOSE TransA, const int64_t M, const int64_t N,
+                 const void *alpha, const void *A, const int64_t lda,
+                 const void *X, const int64_t incX, const void *beta,
+                 void *Y, const int64_t incY);
+void cblas_zgbmv_64(CBLAS_LAYOUT layout,
+                 CBLAS_TRANSPOSE TransA, const int64_t M, const int64_t N,
+                 const int64_t KL, const int64_t KU, const void *alpha,
+                 const void *A, const int64_t lda, const void *X,
+                 const int64_t incX, const void *beta, void *Y, const int64_t incY);
+void cblas_ztrmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const void *A, const int64_t lda,
+                 void *X, const int64_t incX);
+void cblas_ztbmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const int64_t K, const void *A, const int64_t lda,
+                 void *X, const int64_t incX);
+void cblas_ztpmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const void *Ap, void *X, const int64_t incX);
+void cblas_ztrsv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const void *A, const int64_t lda, void *X,
+                 const int64_t incX);
+void cblas_ztbsv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const int64_t K, const void *A, const int64_t lda,
+                 void *X, const int64_t incX);
+void cblas_ztpsv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE TransA, CBLAS_DIAG Diag,
+                 const int64_t N, const void *Ap, void *X, const int64_t incX);
+
+
+/*
+ * Routines with S and D prefixes only
+ */
+void cblas_ssymv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 const int64_t N, const float alpha, const float *A,
+                 const int64_t lda, const float *X, const int64_t incX,
+                 const float beta, float *Y, const int64_t incY);
+void cblas_ssbmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 const int64_t N, const int64_t K, const float alpha, const float *A,
+                 const int64_t lda, const float *X, const int64_t incX,
+                 const float beta, float *Y, const int64_t incY);
+void cblas_sspmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 const int64_t N, const float alpha, const float *Ap,
+                 const float *X, const int64_t incX,
+                 const float beta, float *Y, const int64_t incY);
+void cblas_sger_64(CBLAS_LAYOUT layout, const int64_t M, const int64_t N,
+                const float alpha, const float *X, const int64_t incX,
+                const float *Y, const int64_t incY, float *A, const int64_t lda);
+void cblas_ssyr_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                const int64_t N, const float alpha, const float *X,
+                const int64_t incX, float *A, const int64_t lda);
+void cblas_sspr_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                const int64_t N, const float alpha, const float *X,
+                const int64_t incX, float *Ap);
+void cblas_ssyr2_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                const int64_t N, const float alpha, const float *X,
+                const int64_t incX, const float *Y, const int64_t incY, float *A,
+                const int64_t lda);
+void cblas_sspr2_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                const int64_t N, const float alpha, const float *X,
+                const int64_t incX, const float *Y, const int64_t incY, float *A);
+
+void cblas_dsymv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 const int64_t N, const double alpha, const double *A,
+                 const int64_t lda, const double *X, const int64_t incX,
+                 const double beta, double *Y, const int64_t incY);
+void cblas_dsbmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 const int64_t N, const int64_t K, const double alpha, const double *A,
+                 const int64_t lda, const double *X, const int64_t incX,
+                 const double beta, double *Y, const int64_t incY);
+void cblas_dspmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 const int64_t N, const double alpha, const double *Ap,
+                 const double *X, const int64_t incX,
+                 const double beta, double *Y, const int64_t incY);
+void cblas_dger_64(CBLAS_LAYOUT layout, const int64_t M, const int64_t N,
+                const double alpha, const double *X, const int64_t incX,
+                const double *Y, const int64_t incY, double *A, const int64_t lda);
+void cblas_dsyr_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                const int64_t N, const double alpha, const double *X,
+                const int64_t incX, double *A, const int64_t lda);
+void cblas_dspr_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                const int64_t N, const double alpha, const double *X,
+                const int64_t incX, double *Ap);
+void cblas_dsyr2_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                const int64_t N, const double alpha, const double *X,
+                const int64_t incX, const double *Y, const int64_t incY, double *A,
+                const int64_t lda);
+void cblas_dspr2_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                const int64_t N, const double alpha, const double *X,
+                const int64_t incX, const double *Y, const int64_t incY, double *A);
+
+
+/*
+ * Routines with C and Z prefixes only
+ */
+void cblas_chemv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 const int64_t N, const void *alpha, const void *A,
+                 const int64_t lda, const void *X, const int64_t incX,
+                 const void *beta, void *Y, const int64_t incY);
+void cblas_chbmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 const int64_t N, const int64_t K, const void *alpha, const void *A,
+                 const int64_t lda, const void *X, const int64_t incX,
+                 const void *beta, void *Y, const int64_t incY);
+void cblas_chpmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 const int64_t N, const void *alpha, const void *Ap,
+                 const void *X, const int64_t incX,
+                 const void *beta, void *Y, const int64_t incY);
+void cblas_cgeru_64(CBLAS_LAYOUT layout, const int64_t M, const int64_t N,
+                 const void *alpha, const void *X, const int64_t incX,
+                 const void *Y, const int64_t incY, void *A, const int64_t lda);
+void cblas_cgerc_64(CBLAS_LAYOUT layout, const int64_t M, const int64_t N,
+                 const void *alpha, const void *X, const int64_t incX,
+                 const void *Y, const int64_t incY, void *A, const int64_t lda);
+void cblas_cher_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                const int64_t N, const float alpha, const void *X, const int64_t incX,
+                void *A, const int64_t lda);
+void cblas_chpr_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                const int64_t N, const float alpha, const void *X,
+                const int64_t incX, void *A);
+void cblas_cher2_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo, const int64_t N,
+                const void *alpha, const void *X, const int64_t incX,
+                const void *Y, const int64_t incY, void *A, const int64_t lda);
+void cblas_chpr2_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo, const int64_t N,
+                const void *alpha, const void *X, const int64_t incX,
+                const void *Y, const int64_t incY, void *Ap);
+
+void cblas_zhemv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 const int64_t N, const void *alpha, const void *A,
+                 const int64_t lda, const void *X, const int64_t incX,
+                 const void *beta, void *Y, const int64_t incY);
+void cblas_zhbmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 const int64_t N, const int64_t K, const void *alpha, const void *A,
+                 const int64_t lda, const void *X, const int64_t incX,
+                 const void *beta, void *Y, const int64_t incY);
+void cblas_zhpmv_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 const int64_t N, const void *alpha, const void *Ap,
+                 const void *X, const int64_t incX,
+                 const void *beta, void *Y, const int64_t incY);
+void cblas_zgeru_64(CBLAS_LAYOUT layout, const int64_t M, const int64_t N,
+                 const void *alpha, const void *X, const int64_t incX,
+                 const void *Y, const int64_t incY, void *A, const int64_t lda);
+void cblas_zgerc_64(CBLAS_LAYOUT layout, const int64_t M, const int64_t N,
+                 const void *alpha, const void *X, const int64_t incX,
+                 const void *Y, const int64_t incY, void *A, const int64_t lda);
+void cblas_zher_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                const int64_t N, const double alpha, const void *X, const int64_t incX,
+                void *A, const int64_t lda);
+void cblas_zhpr_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                const int64_t N, const double alpha, const void *X,
+                const int64_t incX, void *A);
+void cblas_zher2_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo, const int64_t N,
+                const void *alpha, const void *X, const int64_t incX,
+                const void *Y, const int64_t incY, void *A, const int64_t lda);
+void cblas_zhpr2_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo, const int64_t N,
+                const void *alpha, const void *X, const int64_t incX,
+                const void *Y, const int64_t incY, void *Ap);
+
+/*
+ * ===========================================================================
+ * Prototypes for level 3 BLAS
+ * ===========================================================================
+ */
+
+/*
+ * Routines with standard 4 prefixes (S, D, C, Z)
+ */
+void cblas_sgemm_64(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE TransA,
+                 CBLAS_TRANSPOSE TransB, const int64_t M, const int64_t N,
+                 const int64_t K, const float alpha, const float *A,
+                 const int64_t lda, const float *B, const int64_t ldb,
+                 const float beta, float *C, const int64_t ldc);
+void cblas_sgemmtr_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo, CBLAS_TRANSPOSE TransA,
+                 CBLAS_TRANSPOSE TransB, const int64_t N,
+                 const int64_t K, const float alpha, const float *A,
+                 const int64_t lda, const float *B, const int64_t ldb,
+                 const float beta, float *C, const int64_t ldc);
+
+void cblas_ssymm_64(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
+                 CBLAS_UPLO Uplo, const int64_t M, const int64_t N,
+                 const float alpha, const float *A, const int64_t lda,
+                 const float *B, const int64_t ldb, const float beta,
+                 float *C, const int64_t ldc);
+void cblas_ssyrk_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE Trans, const int64_t N, const int64_t K,
+                 const float alpha, const float *A, const int64_t lda,
+                 const float beta, float *C, const int64_t ldc);
+void cblas_ssyr2k_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                  CBLAS_TRANSPOSE Trans, const int64_t N, const int64_t K,
+                  const float alpha, const float *A, const int64_t lda,
+                  const float *B, const int64_t ldb, const float beta,
+                  float *C, const int64_t ldc);
+void cblas_strmm_64(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
+                 CBLAS_UPLO Uplo, CBLAS_TRANSPOSE TransA,
+                 CBLAS_DIAG Diag, const int64_t M, const int64_t N,
+                 const float alpha, const float *A, const int64_t lda,
+                 float *B, const int64_t ldb);
+void cblas_strsm_64(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
+                 CBLAS_UPLO Uplo, CBLAS_TRANSPOSE TransA,
+                 CBLAS_DIAG Diag, const int64_t M, const int64_t N,
+                 const float alpha, const float *A, const int64_t lda,
+                 float *B, const int64_t ldb);
+
+void cblas_dgemm_64(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE TransA,
+                 CBLAS_TRANSPOSE TransB, const int64_t M, const int64_t N,
+                 const int64_t K, const double alpha, const double *A,
+                 const int64_t lda, const double *B, const int64_t ldb,
+                 const double beta, double *C, const int64_t ldc);
+void cblas_dgemmtr_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo, CBLAS_TRANSPOSE TransA,
+                 CBLAS_TRANSPOSE TransB, const int64_t N,
+                 const int64_t K, const double alpha, const double *A,
+                 const int64_t lda, const double *B, const int64_t ldb,
+                 const double beta, double *C, const int64_t ldc);
+void cblas_dsymm_64(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
+                 CBLAS_UPLO Uplo, const int64_t M, const int64_t N,
+                 const double alpha, const double *A, const int64_t lda,
+                 const double *B, const int64_t ldb, const double beta,
+                 double *C, const int64_t ldc);
+void cblas_dsyrk_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE Trans, const int64_t N, const int64_t K,
+                 const double alpha, const double *A, const int64_t lda,
+                 const double beta, double *C, const int64_t ldc);
+void cblas_dsyr2k_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                  CBLAS_TRANSPOSE Trans, const int64_t N, const int64_t K,
+                  const double alpha, const double *A, const int64_t lda,
+                  const double *B, const int64_t ldb, const double beta,
+                  double *C, const int64_t ldc);
+void cblas_dtrmm_64(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
+                 CBLAS_UPLO Uplo, CBLAS_TRANSPOSE TransA,
+                 CBLAS_DIAG Diag, const int64_t M, const int64_t N,
+                 const double alpha, const double *A, const int64_t lda,
+                 double *B, const int64_t ldb);
+void cblas_dtrsm_64(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
+                 CBLAS_UPLO Uplo, CBLAS_TRANSPOSE TransA,
+                 CBLAS_DIAG Diag, const int64_t M, const int64_t N,
+                 const double alpha, const double *A, const int64_t lda,
+                 double *B, const int64_t ldb);
+
+void cblas_cgemm_64(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE TransA,
+                 CBLAS_TRANSPOSE TransB, const int64_t M, const int64_t N,
+                 const int64_t K, const void *alpha, const void *A,
+                 const int64_t lda, const void *B, const int64_t ldb,
+                 const void *beta, void *C, const int64_t ldc);
+void cblas_cgemmtr_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo, CBLAS_TRANSPOSE TransA,
+                 CBLAS_TRANSPOSE TransB, const int64_t N,
+                 const int64_t K, const void *alpha, const void *A,
+                 const int64_t lda, const void *B, const int64_t ldb,
+                 const void *beta, void *C, const int64_t ldc);
+
+void cblas_csymm_64(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
+                 CBLAS_UPLO Uplo, const int64_t M, const int64_t N,
+                 const void *alpha, const void *A, const int64_t lda,
+                 const void *B, const int64_t ldb, const void *beta,
+                 void *C, const int64_t ldc);
+void cblas_csyrk_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE Trans, const int64_t N, const int64_t K,
+                 const void *alpha, const void *A, const int64_t lda,
+                 const void *beta, void *C, const int64_t ldc);
+void cblas_csyr2k_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                  CBLAS_TRANSPOSE Trans, const int64_t N, const int64_t K,
+                  const void *alpha, const void *A, const int64_t lda,
+                  const void *B, const int64_t ldb, const void *beta,
+                  void *C, const int64_t ldc);
+void cblas_ctrmm_64(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
+                 CBLAS_UPLO Uplo, CBLAS_TRANSPOSE TransA,
+                 CBLAS_DIAG Diag, const int64_t M, const int64_t N,
+                 const void *alpha, const void *A, const int64_t lda,
+                 void *B, const int64_t ldb);
+void cblas_ctrsm_64(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
+                 CBLAS_UPLO Uplo, CBLAS_TRANSPOSE TransA,
+                 CBLAS_DIAG Diag, const int64_t M, const int64_t N,
+                 const void *alpha, const void *A, const int64_t lda,
+                 void *B, const int64_t ldb);
+
+void cblas_zgemm_64(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE TransA,
+                 CBLAS_TRANSPOSE TransB, const int64_t M, const int64_t N,
+                 const int64_t K, const void *alpha, const void *A,
+                 const int64_t lda, const void *B, const int64_t ldb,
+                 const void *beta, void *C, const int64_t ldc);
+void cblas_zgemmtr_64(CBLAS_LAYOUT layout,CBLAS_UPLO Uplo, CBLAS_TRANSPOSE TransA,
+                 CBLAS_TRANSPOSE TransB, const int64_t N,
+                 const int64_t K, const void *alpha, const void *A,
+                 const int64_t lda, const void *B, const int64_t ldb,
+                 const void *beta, void *C, const int64_t ldc);
+void cblas_zsymm_64(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
+                 CBLAS_UPLO Uplo, const int64_t M, const int64_t N,
+                 const void *alpha, const void *A, const int64_t lda,
+                 const void *B, const int64_t ldb, const void *beta,
+                 void *C, const int64_t ldc);
+void cblas_zsyrk_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE Trans, const int64_t N, const int64_t K,
+                 const void *alpha, const void *A, const int64_t lda,
+                 const void *beta, void *C, const int64_t ldc);
+void cblas_zsyr2k_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                  CBLAS_TRANSPOSE Trans, const int64_t N, const int64_t K,
+                  const void *alpha, const void *A, const int64_t lda,
+                  const void *B, const int64_t ldb, const void *beta,
+                  void *C, const int64_t ldc);
+void cblas_ztrmm_64(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
+                 CBLAS_UPLO Uplo, CBLAS_TRANSPOSE TransA,
+                 CBLAS_DIAG Diag, const int64_t M, const int64_t N,
+                 const void *alpha, const void *A, const int64_t lda,
+                 void *B, const int64_t ldb);
+void cblas_ztrsm_64(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
+                 CBLAS_UPLO Uplo, CBLAS_TRANSPOSE TransA,
+                 CBLAS_DIAG Diag, const int64_t M, const int64_t N,
+                 const void *alpha, const void *A, const int64_t lda,
+                 void *B, const int64_t ldb);
+
+
+/*
+ * Routines with prefixes C and Z only
+ */
+void cblas_chemm_64(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
+                 CBLAS_UPLO Uplo, const int64_t M, const int64_t N,
+                 const void *alpha, const void *A, const int64_t lda,
+                 const void *B, const int64_t ldb, const void *beta,
+                 void *C, const int64_t ldc);
+void cblas_cherk_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE Trans, const int64_t N, const int64_t K,
+                 const float alpha, const void *A, const int64_t lda,
+                 const float beta, void *C, const int64_t ldc);
+void cblas_cher2k_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                  CBLAS_TRANSPOSE Trans, const int64_t N, const int64_t K,
+                  const void *alpha, const void *A, const int64_t lda,
+                  const void *B, const int64_t ldb, const float beta,
+                  void *C, const int64_t ldc);
+
+void cblas_zhemm_64(CBLAS_LAYOUT layout, CBLAS_SIDE Side,
+                 CBLAS_UPLO Uplo, const int64_t M, const int64_t N,
+                 const void *alpha, const void *A, const int64_t lda,
+                 const void *B, const int64_t ldb, const void *beta,
+                 void *C, const int64_t ldc);
+void cblas_zherk_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                 CBLAS_TRANSPOSE Trans, const int64_t N, const int64_t K,
+                 const double alpha, const void *A, const int64_t lda,
+                 const double beta, void *C, const int64_t ldc);
+void cblas_zher2k_64(CBLAS_LAYOUT layout, CBLAS_UPLO Uplo,
+                  CBLAS_TRANSPOSE Trans, const int64_t N, const int64_t K,
+                  const void *alpha, const void *A, const int64_t lda,
+                  const void *B, const int64_t ldb, const double beta,
+                  void *C, const int64_t ldc);
+
+void
+#ifdef HAS_ATTRIBUTE_WEAK_SUPPORT
+__attribute__((weak))
+#endif
+cblas_xerbla_64(int64_t p, const char *rout, const char *form, ...);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/CBLAS/include/cblas_f77.h b/CBLAS/include/cblas_f77.h
index 9c87428ace..a251f3079d 100644
--- a/CBLAS/include/cblas_f77.h
+++ b/CBLAS/include/cblas_f77.h
@@ -10,12 +10,17 @@
 #define CBLAS_F77_H
 
 #include <stdarg.h>
+#include <stdint.h>
 
 /* It seems all current Fortran compilers put strlen at end.
 *  Some historical compilers put strlen after the str argument
 *  or make the str argument into a struct. */
 #define BLAS_FORTRAN_STRLEN_END
 
+#ifndef FORTRAN_STRLEN
+  #define FORTRAN_STRLEN size_t
+#endif
+
 #ifdef CRAY
    #include <fortran.h>
    #define F77_CHAR _fcd
@@ -24,10 +29,12 @@
    #define F77_STRLEN(a) (_fcdlen)
 #endif
 
+#ifndef F77_INT
 #ifdef WeirdNEC
-   #define F77_INT long
+   #define F77_INT int64_t
 #else
-   #define F77_INT int
+   #define F77_INT int32_t
+#endif
 #endif
 
 #ifdef  F77_CHAR
@@ -39,235 +46,275 @@
 #define FINT const F77_INT *
 #define FINT2 F77_INT *
 
+/*
+ * Integer specific API
+ */
+#ifndef API_SUFFIX
+#ifdef CBLAS_API64
+#define API_SUFFIX(a) a##_64
+#else
+#define API_SUFFIX(a) a
+#endif
+#endif
+
+#define F77_GLOBAL_SUFFIX(a,b) F77_GLOBAL_SUFFIX_(API_SUFFIX(a),API_SUFFIX(b))
+#define F77_GLOBAL_SUFFIX_(a,b) F77_GLOBAL(a,b)
+
 /*
  * Level 1 BLAS
  */
 
-#define F77_xerbla_base 		F77_GLOBAL(xerbla,XERBLA)
-#define F77_srotg_base 		F77_GLOBAL(srotg,SROTG)
-#define F77_srotmg_base 		F77_GLOBAL(srotmg,SROTMG)
-#define F77_srot_base 		F77_GLOBAL(srot,SROT)
-#define F77_srotm_base 		F77_GLOBAL(srotm,SROTM)
-#define F77_drotg_base 		F77_GLOBAL(drotg,DROTG)
-#define F77_drotmg_base 		F77_GLOBAL(drotmg,DROTMG)
-#define F77_drot_base 		F77_GLOBAL(drot,DROT)
-#define F77_drotm_base 		F77_GLOBAL(drotm,DROTM)
-#define F77_sswap_base 		F77_GLOBAL(sswap,SSWAP)
-#define F77_scopy_base 		F77_GLOBAL(scopy,SCOPY)
-#define F77_saxpy_base 		F77_GLOBAL(saxpy,SAXPY)
-#define F77_isamax_sub_base 	F77_GLOBAL(isamaxsub,ISAMAXSUB)
-#define F77_dswap_base 		F77_GLOBAL(dswap,DSWAP)
-#define F77_dcopy_base 		F77_GLOBAL(dcopy,DCOPY)
-#define F77_daxpy_base 		F77_GLOBAL(daxpy,DAXPY)
-#define F77_idamax_sub_base 	F77_GLOBAL(idamaxsub,IDAMAXSUB)
-#define F77_cswap_base 		F77_GLOBAL(cswap,CSWAP)
-#define F77_ccopy_base 		F77_GLOBAL(ccopy,CCOPY)
-#define F77_caxpy_base 		F77_GLOBAL(caxpy,CAXPY)
-#define F77_icamax_sub_base 	F77_GLOBAL(icamaxsub,ICAMAXSUB)
-#define F77_zswap_base 		F77_GLOBAL(zswap,ZSWAP)
-#define F77_zcopy_base 		F77_GLOBAL(zcopy,ZCOPY)
-#define F77_zaxpy_base 		F77_GLOBAL(zaxpy,ZAXPY)
-#define F77_izamax_sub_base 	F77_GLOBAL(izamaxsub,IZAMAXSUB)
-#define F77_sdot_sub_base 	F77_GLOBAL(sdotsub,SDOTSUB)
-#define F77_ddot_sub_base 	F77_GLOBAL(ddotsub,DDOTSUB)
-#define F77_dsdot_sub_base 	F77_GLOBAL(dsdotsub,DSDOTSUB)
-#define F77_sscal_base 		F77_GLOBAL(sscal,SSCAL)
-#define F77_dscal_base 		F77_GLOBAL(dscal,DSCAL)
-#define F77_cscal_base 		F77_GLOBAL(cscal,CSCAL)
-#define F77_zscal_base 		F77_GLOBAL(zscal,ZSCAL)
-#define F77_csscal_base 		F77_GLOBAL(csscal,CSSCAL)
-#define F77_zdscal_base 		F77_GLOBAL(zdscal,ZDSCAL)
-#define F77_cdotu_sub_base 	F77_GLOBAL(cdotusub,CDOTUSUB)
-#define F77_cdotc_sub_base 	F77_GLOBAL(cdotcsub,CDOTCSUB)
-#define F77_zdotu_sub_base 	F77_GLOBAL(zdotusub,ZDOTUSUB)
-#define F77_zdotc_sub_base 	F77_GLOBAL(zdotcsub,ZDOTCSUB)
-#define F77_snrm2_sub_base 	F77_GLOBAL(snrm2sub,SNRM2SUB)
-#define F77_sasum_sub_base 	F77_GLOBAL(sasumsub,SASUMSUB)
-#define F77_dnrm2_sub_base 	F77_GLOBAL(dnrm2sub,DNRM2SUB)
-#define F77_dasum_sub_base 	F77_GLOBAL(dasumsub,DASUMSUB)
-#define F77_scnrm2_sub_base 	F77_GLOBAL(scnrm2sub,SCNRM2SUB)
-#define F77_scasum_sub_base 	F77_GLOBAL(scasumsub,SCASUMSUB)
-#define F77_dznrm2_sub_base 	F77_GLOBAL(dznrm2sub,DZNRM2SUB)
-#define F77_dzasum_sub_base 	F77_GLOBAL(dzasumsub,DZASUMSUB)
-#define F77_sdsdot_sub_base 	F77_GLOBAL(sdsdotsub,SDSDOTSUB)
+#define F77_xerbla_base       F77_GLOBAL_SUFFIX(xerbla,XERBLA)
+#define F77_srotg_base        F77_GLOBAL_SUFFIX(srotg,SROTG)
+#define F77_srotmg_base       F77_GLOBAL_SUFFIX(srotmg,SROTMG)
+#define F77_srot_base         F77_GLOBAL_SUFFIX(srot,SROT)
+#define F77_srotm_base        F77_GLOBAL_SUFFIX(srotm,SROTM)
+#define F77_drotg_base        F77_GLOBAL_SUFFIX(drotg,DROTG)
+#define F77_drotmg_base       F77_GLOBAL_SUFFIX(drotmg,DROTMG)
+#define F77_drot_base         F77_GLOBAL_SUFFIX(drot,DROT)
+#define F77_drotm_base        F77_GLOBAL_SUFFIX(drotm,DROTM)
+#define F77_sswap_base        F77_GLOBAL_SUFFIX(sswap,SSWAP)
+#define F77_scopy_base        F77_GLOBAL_SUFFIX(scopy,SCOPY)
+#define F77_saxpy_base        F77_GLOBAL_SUFFIX(saxpy,SAXPY)
+#define F77_saxpby_base       F77_GLOBAL_SUFFIX(saxpby,SAXPBY)
+#define F77_isamax_sub_base   F77_GLOBAL_SUFFIX(isamaxsub,ISAMAXSUB)
+#define F77_dswap_base        F77_GLOBAL_SUFFIX(dswap,DSWAP)
+#define F77_dcopy_base        F77_GLOBAL_SUFFIX(dcopy,DCOPY)
+#define F77_daxpy_base        F77_GLOBAL_SUFFIX(daxpy,DAXPY)
+#define F77_daxpby_base       F77_GLOBAL_SUFFIX(daxpby,DAXPBY)
+#define F77_idamax_sub_base   F77_GLOBAL_SUFFIX(idamaxsub,IDAMAXSUB)
+#define F77_cswap_base        F77_GLOBAL_SUFFIX(cswap,CSWAP)
+#define F77_ccopy_base        F77_GLOBAL_SUFFIX(ccopy,CCOPY)
+#define F77_caxpy_base        F77_GLOBAL_SUFFIX(caxpy,CAXPY)
+#define F77_caxpby_base       F77_GLOBAL_SUFFIX(caxpby,CAXPBY)
+#define F77_icamax_sub_base   F77_GLOBAL_SUFFIX(icamaxsub,ICAMAXSUB)
+#define F77_zswap_base        F77_GLOBAL_SUFFIX(zswap,ZSWAP)
+#define F77_zcopy_base        F77_GLOBAL_SUFFIX(zcopy,ZCOPY)
+#define F77_zaxpy_base        F77_GLOBAL_SUFFIX(zaxpy,ZAXPY)
+#define F77_zaxpby_base       F77_GLOBAL_SUFFIX(zaxpby,ZAXPBY)
+#define F77_izamax_sub_base   F77_GLOBAL_SUFFIX(izamaxsub,IZAMAXSUB)
+#define F77_sdot_sub_base     F77_GLOBAL_SUFFIX(sdotsub,SDOTSUB)
+#define F77_ddot_sub_base     F77_GLOBAL_SUFFIX(ddotsub,DDOTSUB)
+#define F77_dsdot_sub_base    F77_GLOBAL_SUFFIX(dsdotsub,DSDOTSUB)
+#define F77_sscal_base        F77_GLOBAL_SUFFIX(sscal,SSCAL)
+#define F77_dscal_base        F77_GLOBAL_SUFFIX(dscal,DSCAL)
+#define F77_cscal_base        F77_GLOBAL_SUFFIX(cscal,CSCAL)
+#define F77_zscal_base        F77_GLOBAL_SUFFIX(zscal,ZSCAL)
+#define F77_csscal_base       F77_GLOBAL_SUFFIX(csscal,CSSCAL)
+#define F77_zdscal_base       F77_GLOBAL_SUFFIX(zdscal,ZDSCAL)
+#define F77_cdotu_sub_base    F77_GLOBAL_SUFFIX(cdotusub,CDOTUSUB)
+#define F77_cdotc_sub_base    F77_GLOBAL_SUFFIX(cdotcsub,CDOTCSUB)
+#define F77_zdotu_sub_base    F77_GLOBAL_SUFFIX(zdotusub,ZDOTUSUB)
+#define F77_zdotc_sub_base    F77_GLOBAL_SUFFIX(zdotcsub,ZDOTCSUB)
+#define F77_snrm2_sub_base    F77_GLOBAL_SUFFIX(snrm2sub,SNRM2SUB)
+#define F77_sasum_sub_base    F77_GLOBAL_SUFFIX(sasumsub,SASUMSUB)
+#define F77_dnrm2_sub_base    F77_GLOBAL_SUFFIX(dnrm2sub,DNRM2SUB)
+#define F77_dasum_sub_base    F77_GLOBAL_SUFFIX(dasumsub,DASUMSUB)
+#define F77_scnrm2_sub_base   F77_GLOBAL_SUFFIX(scnrm2sub,SCNRM2SUB)
+#define F77_scasum_sub_base   F77_GLOBAL_SUFFIX(scasumsub,SCASUMSUB)
+#define F77_dznrm2_sub_base   F77_GLOBAL_SUFFIX(dznrm2sub,DZNRM2SUB)
+#define F77_dzasum_sub_base   F77_GLOBAL_SUFFIX(dzasumsub,DZASUMSUB)
+#define F77_sdsdot_sub_base   F77_GLOBAL_SUFFIX(sdsdotsub,SDSDOTSUB)
+#define F77_crotg_base        F77_GLOBAL_SUFFIX(crotg, CROTG)
+#define F77_csrot_base        F77_GLOBAL_SUFFIX(csrot, CSROT)
+#define F77_zrotg_base        F77_GLOBAL_SUFFIX(zrotg, ZROTG)
+#define F77_zdrot_base        F77_GLOBAL_SUFFIX(zdrot, ZDROT)
+#define F77_scabs1_sub_base   F77_GLOBAL_SUFFIX(scabs1sub, SCABS1SUB)
+#define F77_dcabs1_sub_base   F77_GLOBAL_SUFFIX(dcabs1sub, DCABS1SUB)
+
 /*
  * Level 2 BLAS
  */
-#define F77_ssymv_base 		F77_GLOBAL(ssymv,SSYMV)
-#define F77_ssbmv_base 		F77_GLOBAL(ssbmv,SSBMV)
-#define F77_sspmv_base 		F77_GLOBAL(sspmv,SSPMV)
-#define F77_sger_base 		F77_GLOBAL(sger,SGER)
-#define F77_ssyr_base 		F77_GLOBAL(ssyr,SSYR)
-#define F77_sspr_base 		F77_GLOBAL(sspr,SSPR)
-#define F77_ssyr2_base 		F77_GLOBAL(ssyr2,SSYR2)
-#define F77_sspr2_base 		F77_GLOBAL(sspr2,SSPR2)
-#define F77_dsymv_base 		F77_GLOBAL(dsymv,DSYMV)
-#define F77_dsbmv_base 		F77_GLOBAL(dsbmv,DSBMV)
-#define F77_dspmv_base 		F77_GLOBAL(dspmv,DSPMV)
-#define F77_dger_base 		F77_GLOBAL(dger,DGER)
-#define F77_dsyr_base 		F77_GLOBAL(dsyr,DSYR)
-#define F77_dspr_base 		F77_GLOBAL(dspr,DSPR)
-#define F77_dsyr2_base 		F77_GLOBAL(dsyr2,DSYR2)
-#define F77_dspr2_base 		F77_GLOBAL(dspr2,DSPR2)
-#define F77_chemv_base 		F77_GLOBAL(chemv,CHEMV)
-#define F77_chbmv_base 		F77_GLOBAL(chbmv,CHBMV)
-#define F77_chpmv_base 		F77_GLOBAL(chpmv,CHPMV)
-#define F77_cgeru_base 		F77_GLOBAL(cgeru,CGERU)
-#define F77_cgerc_base 		F77_GLOBAL(cgerc,CGERC)
-#define F77_cher_base 		F77_GLOBAL(cher,CHER)
-#define F77_chpr_base 		F77_GLOBAL(chpr,CHPR)
-#define F77_cher2_base 		F77_GLOBAL(cher2,CHER2)
-#define F77_chpr2_base 		F77_GLOBAL(chpr2,CHPR2)
-#define F77_zhemv_base 		F77_GLOBAL(zhemv,ZHEMV)
-#define F77_zhbmv_base 		F77_GLOBAL(zhbmv,ZHBMV)
-#define F77_zhpmv_base 		F77_GLOBAL(zhpmv,ZHPMV)
-#define F77_zgeru_base 		F77_GLOBAL(zgeru,ZGERU)
-#define F77_zgerc_base 		F77_GLOBAL(zgerc,ZGERC)
-#define F77_zher_base 		F77_GLOBAL(zher,ZHER)
-#define F77_zhpr_base 		F77_GLOBAL(zhpr,ZHPR)
-#define F77_zher2_base 		F77_GLOBAL(zher2,ZHER2)
-#define F77_zhpr2_base 		F77_GLOBAL(zhpr2,ZHPR2)
-#define F77_sgemv_base 		F77_GLOBAL(sgemv,SGEMV)
-#define F77_sgbmv_base 		F77_GLOBAL(sgbmv,SGBMV)
-#define F77_strmv_base 		F77_GLOBAL(strmv,STRMV)
-#define F77_stbmv_base 		F77_GLOBAL(stbmv,STBMV)
-#define F77_stpmv_base 		F77_GLOBAL(stpmv,STPMV)
-#define F77_strsv_base 		F77_GLOBAL(strsv,STRSV)
-#define F77_stbsv_base 		F77_GLOBAL(stbsv,STBSV)
-#define F77_stpsv_base 		F77_GLOBAL(stpsv,STPSV)
-#define F77_dgemv_base 		F77_GLOBAL(dgemv,DGEMV)
-#define F77_dgbmv_base 		F77_GLOBAL(dgbmv,DGBMV)
-#define F77_dtrmv_base 		F77_GLOBAL(dtrmv,DTRMV)
-#define F77_dtbmv_base 		F77_GLOBAL(dtbmv,DTBMV)
-#define F77_dtpmv_base 		F77_GLOBAL(dtpmv,DTPMV)
-#define F77_dtrsv_base 		F77_GLOBAL(dtrsv,DTRSV)
-#define F77_dtbsv_base 		F77_GLOBAL(dtbsv,DTBSV)
-#define F77_dtpsv_base 		F77_GLOBAL(dtpsv,DTPSV)
-#define F77_cgemv_base 		F77_GLOBAL(cgemv,CGEMV)
-#define F77_cgbmv_base 		F77_GLOBAL(cgbmv,CGBMV)
-#define F77_ctrmv_base 		F77_GLOBAL(ctrmv,CTRMV)
-#define F77_ctbmv_base 		F77_GLOBAL(ctbmv,CTBMV)
-#define F77_ctpmv_base 		F77_GLOBAL(ctpmv,CTPMV)
-#define F77_ctrsv_base 		F77_GLOBAL(ctrsv,CTRSV)
-#define F77_ctbsv_base 		F77_GLOBAL(ctbsv,CTBSV)
-#define F77_ctpsv_base 		F77_GLOBAL(ctpsv,CTPSV)
-#define F77_zgemv_base 		F77_GLOBAL(zgemv,ZGEMV)
-#define F77_zgbmv_base 		F77_GLOBAL(zgbmv,ZGBMV)
-#define F77_ztrmv_base 		F77_GLOBAL(ztrmv,ZTRMV)
-#define F77_ztbmv_base 		F77_GLOBAL(ztbmv,ZTBMV)
-#define F77_ztpmv_base 		F77_GLOBAL(ztpmv,ZTPMV)
-#define F77_ztrsv_base 		F77_GLOBAL(ztrsv,ZTRSV)
-#define F77_ztbsv_base 		F77_GLOBAL(ztbsv,ZTBSV)
-#define F77_ztpsv_base 		F77_GLOBAL(ztpsv,ZTPSV)
+#define F77_ssymv_base        F77_GLOBAL_SUFFIX(ssymv,SSYMV)
+#define F77_ssbmv_base        F77_GLOBAL_SUFFIX(ssbmv,SSBMV)
+#define F77_sspmv_base        F77_GLOBAL_SUFFIX(sspmv,SSPMV)
+#define F77_sger_base         F77_GLOBAL_SUFFIX(sger,SGER)
+#define F77_ssyr_base         F77_GLOBAL_SUFFIX(ssyr,SSYR)
+#define F77_sspr_base         F77_GLOBAL_SUFFIX(sspr,SSPR)
+#define F77_ssyr2_base        F77_GLOBAL_SUFFIX(ssyr2,SSYR2)
+#define F77_sspr2_base        F77_GLOBAL_SUFFIX(sspr2,SSPR2)
+#define F77_dsymv_base        F77_GLOBAL_SUFFIX(dsymv,DSYMV)
+#define F77_dsbmv_base        F77_GLOBAL_SUFFIX(dsbmv,DSBMV)
+#define F77_dspmv_base        F77_GLOBAL_SUFFIX(dspmv,DSPMV)
+#define F77_dger_base         F77_GLOBAL_SUFFIX(dger,DGER)
+#define F77_dsyr_base         F77_GLOBAL_SUFFIX(dsyr,DSYR)
+#define F77_dspr_base         F77_GLOBAL_SUFFIX(dspr,DSPR)
+#define F77_dsyr2_base        F77_GLOBAL_SUFFIX(dsyr2,DSYR2)
+#define F77_dspr2_base        F77_GLOBAL_SUFFIX(dspr2,DSPR2)
+#define F77_chemv_base        F77_GLOBAL_SUFFIX(chemv,CHEMV)
+#define F77_chbmv_base        F77_GLOBAL_SUFFIX(chbmv,CHBMV)
+#define F77_chpmv_base        F77_GLOBAL_SUFFIX(chpmv,CHPMV)
+#define F77_cgeru_base        F77_GLOBAL_SUFFIX(cgeru,CGERU)
+#define F77_cgerc_base        F77_GLOBAL_SUFFIX(cgerc,CGERC)
+#define F77_cher_base         F77_GLOBAL_SUFFIX(cher,CHER)
+#define F77_chpr_base         F77_GLOBAL_SUFFIX(chpr,CHPR)
+#define F77_cher2_base        F77_GLOBAL_SUFFIX(cher2,CHER2)
+#define F77_chpr2_base        F77_GLOBAL_SUFFIX(chpr2,CHPR2)
+#define F77_zhemv_base        F77_GLOBAL_SUFFIX(zhemv,ZHEMV)
+#define F77_zhbmv_base        F77_GLOBAL_SUFFIX(zhbmv,ZHBMV)
+#define F77_zhpmv_base        F77_GLOBAL_SUFFIX(zhpmv,ZHPMV)
+#define F77_zgeru_base        F77_GLOBAL_SUFFIX(zgeru,ZGERU)
+#define F77_zgerc_base        F77_GLOBAL_SUFFIX(zgerc,ZGERC)
+#define F77_zher_base         F77_GLOBAL_SUFFIX(zher,ZHER)
+#define F77_zhpr_base         F77_GLOBAL_SUFFIX(zhpr,ZHPR)
+#define F77_zher2_base        F77_GLOBAL_SUFFIX(zher2,ZHER2)
+#define F77_zhpr2_base        F77_GLOBAL_SUFFIX(zhpr2,ZHPR2)
+#define F77_sgemv_base        F77_GLOBAL_SUFFIX(sgemv,SGEMV)
+#define F77_sgbmv_base        F77_GLOBAL_SUFFIX(sgbmv,SGBMV)
+#define F77_strmv_base        F77_GLOBAL_SUFFIX(strmv,STRMV)
+#define F77_stbmv_base        F77_GLOBAL_SUFFIX(stbmv,STBMV)
+#define F77_stpmv_base        F77_GLOBAL_SUFFIX(stpmv,STPMV)
+#define F77_strsv_base        F77_GLOBAL_SUFFIX(strsv,STRSV)
+#define F77_stbsv_base        F77_GLOBAL_SUFFIX(stbsv,STBSV)
+#define F77_stpsv_base        F77_GLOBAL_SUFFIX(stpsv,STPSV)
+#define F77_dgemv_base        F77_GLOBAL_SUFFIX(dgemv,DGEMV)
+#define F77_dgbmv_base        F77_GLOBAL_SUFFIX(dgbmv,DGBMV)
+#define F77_dtrmv_base        F77_GLOBAL_SUFFIX(dtrmv,DTRMV)
+#define F77_dtbmv_base        F77_GLOBAL_SUFFIX(dtbmv,DTBMV)
+#define F77_dtpmv_base        F77_GLOBAL_SUFFIX(dtpmv,DTPMV)
+#define F77_dtrsv_base        F77_GLOBAL_SUFFIX(dtrsv,DTRSV)
+#define F77_dtbsv_base        F77_GLOBAL_SUFFIX(dtbsv,DTBSV)
+#define F77_dtpsv_base        F77_GLOBAL_SUFFIX(dtpsv,DTPSV)
+#define F77_cgemv_base        F77_GLOBAL_SUFFIX(cgemv,CGEMV)
+#define F77_cgbmv_base        F77_GLOBAL_SUFFIX(cgbmv,CGBMV)
+#define F77_ctrmv_base        F77_GLOBAL_SUFFIX(ctrmv,CTRMV)
+#define F77_ctbmv_base        F77_GLOBAL_SUFFIX(ctbmv,CTBMV)
+#define F77_ctpmv_base        F77_GLOBAL_SUFFIX(ctpmv,CTPMV)
+#define F77_ctrsv_base        F77_GLOBAL_SUFFIX(ctrsv,CTRSV)
+#define F77_ctbsv_base        F77_GLOBAL_SUFFIX(ctbsv,CTBSV)
+#define F77_ctpsv_base        F77_GLOBAL_SUFFIX(ctpsv,CTPSV)
+#define F77_zgemv_base        F77_GLOBAL_SUFFIX(zgemv,ZGEMV)
+#define F77_zgbmv_base        F77_GLOBAL_SUFFIX(zgbmv,ZGBMV)
+#define F77_ztrmv_base        F77_GLOBAL_SUFFIX(ztrmv,ZTRMV)
+#define F77_ztbmv_base        F77_GLOBAL_SUFFIX(ztbmv,ZTBMV)
+#define F77_ztpmv_base        F77_GLOBAL_SUFFIX(ztpmv,ZTPMV)
+#define F77_ztrsv_base        F77_GLOBAL_SUFFIX(ztrsv,ZTRSV)
+#define F77_ztbsv_base        F77_GLOBAL_SUFFIX(ztbsv,ZTBSV)
+#define F77_ztpsv_base        F77_GLOBAL_SUFFIX(ztpsv,ZTPSV)
 /*
  * Level 3 BLAS
  */
-#define F77_chemm_base 		F77_GLOBAL(chemm,CHEMM)
-#define F77_cherk_base 		F77_GLOBAL(cherk,CHERK)
-#define F77_cher2k_base 		F77_GLOBAL(cher2k,CHER2K)
-#define F77_zhemm_base 		F77_GLOBAL(zhemm,ZHEMM)
-#define F77_zherk_base 		F77_GLOBAL(zherk,ZHERK)
-#define F77_zher2k_base 		F77_GLOBAL(zher2k,ZHER2K)
-#define F77_sgemm_base 		F77_GLOBAL(sgemm,SGEMM)
-#define F77_ssymm_base 		F77_GLOBAL(ssymm,SSYMM)
-#define F77_ssyrk_base 		F77_GLOBAL(ssyrk,SSYRK)
-#define F77_ssyr2k_base 		F77_GLOBAL(ssyr2k,SSYR2K)
-#define F77_strmm_base 		F77_GLOBAL(strmm,STRMM)
-#define F77_strsm_base 		F77_GLOBAL(strsm,STRSM)
-#define F77_dgemm_base 		F77_GLOBAL(dgemm,DGEMM)
-#define F77_dsymm_base 		F77_GLOBAL(dsymm,DSYMM)
-#define F77_dsyrk_base 		F77_GLOBAL(dsyrk,DSYRK)
-#define F77_dsyr2k_base 		F77_GLOBAL(dsyr2k,DSYR2K)
-#define F77_dtrmm_base 		F77_GLOBAL(dtrmm,DTRMM)
-#define F77_dtrsm_base 		F77_GLOBAL(dtrsm,DTRSM)
-#define F77_cgemm_base 		F77_GLOBAL(cgemm,CGEMM)
-#define F77_csymm_base 		F77_GLOBAL(csymm,CSYMM)
-#define F77_csyrk_base 		F77_GLOBAL(csyrk,CSYRK)
-#define F77_csyr2k_base 		F77_GLOBAL(csyr2k,CSYR2K)
-#define F77_ctrmm_base 		F77_GLOBAL(ctrmm,CTRMM)
-#define F77_ctrsm_base 		F77_GLOBAL(ctrsm,CTRSM)
-#define F77_zgemm_base 		F77_GLOBAL(zgemm,ZGEMM)
-#define F77_zsymm_base 		F77_GLOBAL(zsymm,ZSYMM)
-#define F77_zsyrk_base 		F77_GLOBAL(zsyrk,ZSYRK)
-#define F77_zsyr2k_base 		F77_GLOBAL(zsyr2k,ZSYR2K)
-#define F77_ztrmm_base 		F77_GLOBAL(ztrmm,ZTRMM)
-#define F77_ztrsm_base 		F77_GLOBAL(ztrsm,ZTRSM)
+#define F77_chemm_base        F77_GLOBAL_SUFFIX(chemm,CHEMM)
+#define F77_cherk_base        F77_GLOBAL_SUFFIX(cherk,CHERK)
+#define F77_cher2k_base       F77_GLOBAL_SUFFIX(cher2k,CHER2K)
+#define F77_zhemm_base        F77_GLOBAL_SUFFIX(zhemm,ZHEMM)
+#define F77_zherk_base        F77_GLOBAL_SUFFIX(zherk,ZHERK)
+#define F77_zher2k_base       F77_GLOBAL_SUFFIX(zher2k,ZHER2K)
+#define F77_sgemm_base        F77_GLOBAL_SUFFIX(sgemm,SGEMM)
+#define F77_sgemmtr_base        F77_GLOBAL_SUFFIX(sgemmtr,SGEMMTR)
+#define F77_ssymm_base        F77_GLOBAL_SUFFIX(ssymm,SSYMM)
+#define F77_ssyrk_base        F77_GLOBAL_SUFFIX(ssyrk,SSYRK)
+#define F77_ssyr2k_base       F77_GLOBAL_SUFFIX(ssyr2k,SSYR2K)
+#define F77_strmm_base        F77_GLOBAL_SUFFIX(strmm,STRMM)
+#define F77_strsm_base        F77_GLOBAL_SUFFIX(strsm,STRSM)
+#define F77_dgemm_base        F77_GLOBAL_SUFFIX(dgemm,DGEMM)
+#define F77_dgemmtr_base        F77_GLOBAL_SUFFIX(dgemmtr,DGEMMTR)
+#define F77_dsymm_base        F77_GLOBAL_SUFFIX(dsymm,DSYMM)
+#define F77_dsyrk_base        F77_GLOBAL_SUFFIX(dsyrk,DSYRK)
+#define F77_dsyr2k_base       F77_GLOBAL_SUFFIX(dsyr2k,DSYR2K)
+#define F77_dtrmm_base        F77_GLOBAL_SUFFIX(dtrmm,DTRMM)
+#define F77_dtrsm_base        F77_GLOBAL_SUFFIX(dtrsm,DTRSM)
+#define F77_cgemm_base        F77_GLOBAL_SUFFIX(cgemm,CGEMM)
+#define F77_cgemmtr_base        F77_GLOBAL_SUFFIX(cgemmtr,CGEMMTR)
+#define F77_csymm_base        F77_GLOBAL_SUFFIX(csymm,CSYMM)
+#define F77_csyrk_base        F77_GLOBAL_SUFFIX(csyrk,CSYRK)
+#define F77_csyr2k_base       F77_GLOBAL_SUFFIX(csyr2k,CSYR2K)
+#define F77_ctrmm_base        F77_GLOBAL_SUFFIX(ctrmm,CTRMM)
+#define F77_ctrsm_base        F77_GLOBAL_SUFFIX(ctrsm,CTRSM)
+#define F77_zgemm_base        F77_GLOBAL_SUFFIX(zgemm,ZGEMM)
+#define F77_zgemmtr_base        F77_GLOBAL_SUFFIX(zgemmtr,ZGEMMTR)
+#define F77_zsymm_base        F77_GLOBAL_SUFFIX(zsymm,ZSYMM)
+#define F77_zsyrk_base        F77_GLOBAL_SUFFIX(zsyrk,ZSYRK)
+#define F77_zsyr2k_base       F77_GLOBAL_SUFFIX(zsyr2k,ZSYR2K)
+#define F77_ztrmm_base        F77_GLOBAL_SUFFIX(ztrmm,ZTRMM)
+#define F77_ztrsm_base        F77_GLOBAL_SUFFIX(ztrsm,ZTRSM)
 
 /*
  * Level 1 Fortran variadic definitions
  */
 
+
 /* Single Precision */
 
-   #define F77_srot(...) F77_srot_base(__VA_ARGS__)
-   #define F77_srotg(...) F77_srotg_base(__VA_ARGS__)
-   #define F77_srotm(...) F77_srotm_base(__VA_ARGS__)
-   #define F77_srotmg(...) F77_srotmg_base(__VA_ARGS__)
-   #define F77_sswap(...) F77_sswap_base(__VA_ARGS__)
-   #define F77_scopy(...) F77_scopy_base(__VA_ARGS__)
-   #define F77_saxpy(...) F77_saxpy_base(__VA_ARGS__)
-   #define F77_sdot_sub(...) F77_sdot_sub_base(__VA_ARGS__)
-   #define F77_sdsdot_sub(...) F77_sdsdot_sub_base(__VA_ARGS__)
-   #define F77_sscal(...) F77_sscal_base(__VA_ARGS__)
-   #define F77_snrm2_sub(...) F77_snrm2_sub_base(__VA_ARGS__)
-   #define F77_sasum_sub(...) F77_sasum_sub_base(__VA_ARGS__)
-   #define F77_isamax_sub(...) F77_isamax_sub_base(__VA_ARGS__)
+#define F77_srot(...)         F77_srot_base(__VA_ARGS__)
+#define F77_srotg(...)        F77_srotg_base(__VA_ARGS__)
+#define F77_srotm(...)        F77_srotm_base(__VA_ARGS__)
+#define F77_srotmg(...)       F77_srotmg_base(__VA_ARGS__)
+#define F77_sswap(...)        F77_sswap_base(__VA_ARGS__)
+#define F77_scopy(...)        F77_scopy_base(__VA_ARGS__)
+#define F77_saxpy(...)        F77_saxpy_base(__VA_ARGS__)
+#define F77_saxpby(...)       F77_saxpby_base(__VA_ARGS__)
+#define F77_sdot_sub(...)     F77_sdot_sub_base(__VA_ARGS__)
+#define F77_sdsdot_sub(...)   F77_sdsdot_sub_base(__VA_ARGS__)
+#define F77_sscal(...)        F77_sscal_base(__VA_ARGS__)
+#define F77_snrm2_sub(...)    F77_snrm2_sub_base(__VA_ARGS__)
+#define F77_sasum_sub(...)    F77_sasum_sub_base(__VA_ARGS__)
+#define F77_isamax_sub(...)   F77_isamax_sub_base(__VA_ARGS__)
+#define F77_scabs1_sub(...)   F77_scabs1_sub_base(__VA_ARGS__)
 
 /* Double Precision */
 
-   #define F77_drot(...) F77_drot_base(__VA_ARGS__)
-   #define F77_drotg(...) F77_drotg_base(__VA_ARGS__)
-   #define F77_drotm(...) F77_drotm_base(__VA_ARGS__)
-   #define F77_drotmg(...) F77_drotmg_base(__VA_ARGS__)
-   #define F77_dswap(...) F77_dswap_base(__VA_ARGS__)
-   #define F77_dcopy(...) F77_dcopy_base(__VA_ARGS__)
-   #define F77_daxpy(...) F77_daxpy_base(__VA_ARGS__)
-   #define F77_dswap(...) F77_dswap_base(__VA_ARGS__)
-   #define F77_dsdot_sub(...) F77_dsdot_sub_base(__VA_ARGS__)
-   #define F77_ddot_sub(...) F77_ddot_sub_base(__VA_ARGS__)
-   #define F77_dscal(...) F77_dscal_base(__VA_ARGS__)
-   #define F77_dnrm2_sub(...) F77_dnrm2_sub_base(__VA_ARGS__)
-   #define F77_dasum_sub(...) F77_dasum_sub_base(__VA_ARGS__)
-   #define F77_idamax_sub(...) F77_idamax_sub_base(__VA_ARGS__)
+#define F77_drot(...)         F77_drot_base(__VA_ARGS__)
+#define F77_drotg(...)        F77_drotg_base(__VA_ARGS__)
+#define F77_drotm(...)        F77_drotm_base(__VA_ARGS__)
+#define F77_drotmg(...)       F77_drotmg_base(__VA_ARGS__)
+#define F77_dswap(...)        F77_dswap_base(__VA_ARGS__)
+#define F77_dcopy(...)        F77_dcopy_base(__VA_ARGS__)
+#define F77_daxpy(...)        F77_daxpy_base(__VA_ARGS__)
+#define F77_daxpby(...)       F77_daxpby_base(__VA_ARGS__)
+#define F77_dswap(...)        F77_dswap_base(__VA_ARGS__)
+#define F77_dsdot_sub(...)    F77_dsdot_sub_base(__VA_ARGS__)
+#define F77_ddot_sub(...)     F77_ddot_sub_base(__VA_ARGS__)
+#define F77_dscal(...)        F77_dscal_base(__VA_ARGS__)
+#define F77_dnrm2_sub(...)    F77_dnrm2_sub_base(__VA_ARGS__)
+#define F77_dasum_sub(...)    F77_dasum_sub_base(__VA_ARGS__)
+#define F77_idamax_sub(...)   F77_idamax_sub_base(__VA_ARGS__)
+#define F77_dcabs1_sub(...)   F77_dcabs1_sub_base(__VA_ARGS__)
 
 /* Single Complex Precision */
 
-   #define F77_cswap(...) F77_cswap_base(__VA_ARGS__)
-   #define F77_ccopy(...) F77_ccopy_base(__VA_ARGS__)
-   #define F77_caxpy(...) F77_caxpy_base(__VA_ARGS__)
-   #define F77_cswap(...) F77_cswap_base(__VA_ARGS__)
-   #define F77_cdotc_sub(...) F77_cdotc_sub_base(__VA_ARGS__)
-   #define F77_cdotu_sub(...) F77_cdotu_sub_base(__VA_ARGS__)
-   #define F77_cscal(...) F77_cscal_base(__VA_ARGS__)
-   #define F77_icamax_sub(...) F77_icamax_sub_base(__VA_ARGS__)
-   #define F77_csscal(...) F77_csscal_base(__VA_ARGS__)
-   #define F77_scnrm2_sub(...) F77_scnrm2_sub_base(__VA_ARGS__)
-   #define F77_scasum_sub(...) F77_scasum_sub_base(__VA_ARGS__)
+#define F77_crotg(...)        F77_crotg_base(__VA_ARGS__)
+#define F77_csrot(...)        F77_csrot_base(__VA_ARGS__)
+#define F77_cswap(...)        F77_cswap_base(__VA_ARGS__)
+#define F77_ccopy(...)        F77_ccopy_base(__VA_ARGS__)
+#define F77_caxpy(...)        F77_caxpy_base(__VA_ARGS__)
+#define F77_caxpby(...)       F77_caxpby_base(__VA_ARGS__)
+#define F77_cswap(...)        F77_cswap_base(__VA_ARGS__)
+#define F77_cdotc_sub(...)    F77_cdotc_sub_base(__VA_ARGS__)
+#define F77_cdotu_sub(...)    F77_cdotu_sub_base(__VA_ARGS__)
+#define F77_cscal(...)        F77_cscal_base(__VA_ARGS__)
+#define F77_icamax_sub(...)   F77_icamax_sub_base(__VA_ARGS__)
+#define F77_csscal(...)       F77_csscal_base(__VA_ARGS__)
+#define F77_scnrm2_sub(...)   F77_scnrm2_sub_base(__VA_ARGS__)
+#define F77_scasum_sub(...)   F77_scasum_sub_base(__VA_ARGS__)
 
 /* Double Complex Precision */
 
-   #define F77_zswap(...) F77_zswap_base(__VA_ARGS__)
-   #define F77_zcopy(...) F77_zcopy_base(__VA_ARGS__)
-   #define F77_zaxpy(...) F77_zaxpy_base(__VA_ARGS__)
-   #define F77_zswap(...) F77_zswap_base(__VA_ARGS__)
-   #define F77_zdotc_sub(...) F77_zdotc_sub_base(__VA_ARGS__)
-   #define F77_zdotu_sub(...) F77_zdotu_sub_base(__VA_ARGS__)
-   #define F77_zdscal(...) F77_zdscal_base(__VA_ARGS__)
-   #define F77_zscal(...) F77_zscal_base(__VA_ARGS__)
-   #define F77_dznrm2_sub(...) F77_dznrm2_sub_base(__VA_ARGS__)
-   #define F77_dzasum_sub(...) F77_dzasum_sub_base(__VA_ARGS__)
-   #define F77_izamax_sub(...) F77_izamax_sub_base(__VA_ARGS__)
+#define F77_zrotg(...)        F77_zrotg_base(__VA_ARGS__)
+#define F77_zdrot(...)        F77_zdrot_base(__VA_ARGS__)
+#define F77_zswap(...)        F77_zswap_base(__VA_ARGS__)
+#define F77_zcopy(...)        F77_zcopy_base(__VA_ARGS__)
+#define F77_zaxpy(...)        F77_zaxpy_base(__VA_ARGS__)
+#define F77_zaxpby(...)       F77_zaxpby_base(__VA_ARGS__)
+#define F77_zswap(...)        F77_zswap_base(__VA_ARGS__)
+#define F77_zdotc_sub(...)    F77_zdotc_sub_base(__VA_ARGS__)
+#define F77_zdotu_sub(...)    F77_zdotu_sub_base(__VA_ARGS__)
+#define F77_zdscal(...)       F77_zdscal_base(__VA_ARGS__)
+#define F77_zscal(...)        F77_zscal_base(__VA_ARGS__)
+#define F77_dznrm2_sub(...)   F77_dznrm2_sub_base(__VA_ARGS__)
+#define F77_dzasum_sub(...)   F77_dzasum_sub_base(__VA_ARGS__)
+#define F77_izamax_sub(...)   F77_izamax_sub_base(__VA_ARGS__)
 
 /*
  * Level 2 Fortran variadic definitions without FCHAR
  */
 
-   #define F77_sger(...) F77_sger_base(__VA_ARGS__)
-   #define F77_dger(...) F77_dger_base(__VA_ARGS__)
-   #define F77_cgerc(...) F77_cgerc_base(__VA_ARGS__)
-   #define F77_cgeru(...) F77_cgeru_base(__VA_ARGS__)
-   #define F77_zgerc(...) F77_zgerc_base(__VA_ARGS__)
-   #define F77_zgeru(...) F77_zgeru_base(__VA_ARGS__)
+#define F77_sger(...)         F77_sger_base(__VA_ARGS__)
+#define F77_dger(...)         F77_dger_base(__VA_ARGS__)
+#define F77_cgerc(...)        F77_cgerc_base(__VA_ARGS__)
+#define F77_cgeru(...)        F77_cgeru_base(__VA_ARGS__)
+#define F77_zgerc(...)        F77_zgerc_base(__VA_ARGS__)
+#define F77_zgeru(...)        F77_zgeru_base(__VA_ARGS__)
 
 #ifdef BLAS_FORTRAN_STRLEN_END
 
@@ -277,75 +324,75 @@
 
    /* Single Precision */
 
-   #define F77_sgemv(...) F77_sgemv_base(__VA_ARGS__, 1)
-   #define F77_sgbmv(...) F77_sgbmv_base(__VA_ARGS__, 1)
-   #define F77_ssymv(...) F77_ssymv_base(__VA_ARGS__, 1)
-   #define F77_ssbmv(...) F77_ssbmv_base(__VA_ARGS__, 1)
-   #define F77_sspmv(...) F77_sspmv_base(__VA_ARGS__, 1)
-   #define F77_strmv(...) F77_strmv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_stbmv(...) F77_stbmv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_strsv(...) F77_strsv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_stbsv(...) F77_stbsv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_stpmv(...) F77_stpmv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_stpsv(...) F77_stpsv_base(__VA_ARGS__, 1, 1, 1)
-      #define F77_ssyr(...) F77_ssyr_base(__VA_ARGS__, 1)
-   #define F77_sspr(...) F77_sspr_base(__VA_ARGS__, 1)
-   #define F77_sspr2(...) F77_sspr2_base(__VA_ARGS__, 1)
-   #define F77_ssyr2(...) F77_ssyr2_base(__VA_ARGS__, 1)
+   #define F77_sgemv(...)     F77_sgemv_base(__VA_ARGS__, 1)
+   #define F77_sgbmv(...)     F77_sgbmv_base(__VA_ARGS__, 1)
+   #define F77_ssymv(...)     F77_ssymv_base(__VA_ARGS__, 1)
+   #define F77_ssbmv(...)     F77_ssbmv_base(__VA_ARGS__, 1)
+   #define F77_sspmv(...)     F77_sspmv_base(__VA_ARGS__, 1)
+   #define F77_strmv(...)     F77_strmv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_stbmv(...)     F77_stbmv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_strsv(...)     F77_strsv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_stbsv(...)     F77_stbsv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_stpmv(...)     F77_stpmv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_stpsv(...)     F77_stpsv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_ssyr(...)      F77_ssyr_base(__VA_ARGS__, 1)
+   #define F77_sspr(...)      F77_sspr_base(__VA_ARGS__, 1)
+   #define F77_sspr2(...)     F77_sspr2_base(__VA_ARGS__, 1)
+   #define F77_ssyr2(...)     F77_ssyr2_base(__VA_ARGS__, 1)
 
    /* Double Precision */
 
-   #define F77_dgemv(...) F77_dgemv_base(__VA_ARGS__, 1)
-   #define F77_dgbmv(...) F77_dgbmv_base(__VA_ARGS__, 1)
-   #define F77_dsymv(...) F77_dsymv_base(__VA_ARGS__, 1)
-   #define F77_dsbmv(...) F77_dsbmv_base(__VA_ARGS__, 1)
-   #define F77_dspmv(...) F77_dspmv_base(__VA_ARGS__, 1)
-   #define F77_dtrmv(...) F77_dtrmv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_dtbmv(...) F77_dtbmv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_dtrsv(...) F77_dtrsv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_dtbsv(...) F77_dtbsv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_dtpmv(...) F77_dtpmv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_dtpsv(...) F77_dtpsv_base(__VA_ARGS__, 1, 1, 1)
-      #define F77_dsyr(...) F77_dsyr_base(__VA_ARGS__, 1)
-   #define F77_dspr(...) F77_dspr_base(__VA_ARGS__, 1)
-   #define F77_dspr2(...) F77_dspr2_base(__VA_ARGS__, 1)
-   #define F77_dsyr2(...) F77_dsyr2_base(__VA_ARGS__, 1)
+   #define F77_dgemv(...)     F77_dgemv_base(__VA_ARGS__, 1)
+   #define F77_dgbmv(...)     F77_dgbmv_base(__VA_ARGS__, 1)
+   #define F77_dsymv(...)     F77_dsymv_base(__VA_ARGS__, 1)
+   #define F77_dsbmv(...)     F77_dsbmv_base(__VA_ARGS__, 1)
+   #define F77_dspmv(...)     F77_dspmv_base(__VA_ARGS__, 1)
+   #define F77_dtrmv(...)     F77_dtrmv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_dtbmv(...)     F77_dtbmv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_dtrsv(...)     F77_dtrsv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_dtbsv(...)     F77_dtbsv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_dtpmv(...)     F77_dtpmv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_dtpsv(...)     F77_dtpsv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_dsyr(...)      F77_dsyr_base(__VA_ARGS__, 1)
+   #define F77_dspr(...)      F77_dspr_base(__VA_ARGS__, 1)
+   #define F77_dspr2(...)     F77_dspr2_base(__VA_ARGS__, 1)
+   #define F77_dsyr2(...)     F77_dsyr2_base(__VA_ARGS__, 1)
 
       /* Single Complex Precision */
 
-   #define F77_cgemv(...) F77_cgemv_base(__VA_ARGS__, 1)
-   #define F77_cgbmv(...) F77_cgbmv_base(__VA_ARGS__, 1)
-   #define F77_chemv(...) F77_chemv_base(__VA_ARGS__, 1)
-   #define F77_chbmv(...) F77_chbmv_base(__VA_ARGS__, 1)
-   #define F77_chpmv(...) F77_chpmv_base(__VA_ARGS__, 1)
-   #define F77_ctrmv(...) F77_ctrmv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_ctbmv(...) F77_ctbmv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_ctpmv(...) F77_ctpmv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_ctrsv(...) F77_ctrsv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_ctbsv(...) F77_ctbsv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_ctpsv(...) F77_ctpsv_base(__VA_ARGS__, 1, 1, 1)
-         #define F77_cher(...) F77_cher_base(__VA_ARGS__, 1)
-   #define F77_cher2(...) F77_cher2_base(__VA_ARGS__, 1)
-   #define F77_chpr(...) F77_chpr_base(__VA_ARGS__, 1)
-   #define F77_chpr2(...) F77_chpr2_base(__VA_ARGS__, 1)
+   #define F77_cgemv(...)     F77_cgemv_base(__VA_ARGS__, 1)
+   #define F77_cgbmv(...)     F77_cgbmv_base(__VA_ARGS__, 1)
+   #define F77_chemv(...)     F77_chemv_base(__VA_ARGS__, 1)
+   #define F77_chbmv(...)     F77_chbmv_base(__VA_ARGS__, 1)
+   #define F77_chpmv(...)     F77_chpmv_base(__VA_ARGS__, 1)
+   #define F77_ctrmv(...)     F77_ctrmv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_ctbmv(...)     F77_ctbmv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_ctpmv(...)     F77_ctpmv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_ctrsv(...)     F77_ctrsv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_ctbsv(...)     F77_ctbsv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_ctpsv(...)     F77_ctpsv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_cher(...)      F77_cher_base(__VA_ARGS__, 1)
+   #define F77_cher2(...)     F77_cher2_base(__VA_ARGS__, 1)
+   #define F77_chpr(...)      F77_chpr_base(__VA_ARGS__, 1)
+   #define F77_chpr2(...)     F77_chpr2_base(__VA_ARGS__, 1)
 
    /* Double Complex Precision */
 
-   #define F77_zgemv(...) F77_zgemv_base(__VA_ARGS__, 1)
-   #define F77_zgbmv(...) F77_zgbmv_base(__VA_ARGS__, 1)
-   #define F77_zhemv(...) F77_zhemv_base(__VA_ARGS__, 1)
-   #define F77_zhbmv(...) F77_zhbmv_base(__VA_ARGS__, 1)
-   #define F77_zhpmv(...) F77_zhpmv_base(__VA_ARGS__, 1)
-   #define F77_ztrmv(...) F77_ztrmv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_ztbmv(...) F77_ztbmv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_ztpmv(...) F77_ztpmv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_ztrsv(...) F77_ztrsv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_ztbsv(...) F77_ztbsv_base(__VA_ARGS__, 1, 1, 1)
-   #define F77_ztpsv(...) F77_ztpsv_base(__VA_ARGS__, 1, 1, 1)
-         #define F77_zher(...) F77_zher_base(__VA_ARGS__, 1)
-   #define F77_zher2(...) F77_zher2_base(__VA_ARGS__, 1)
-   #define F77_zhpr(...) F77_zhpr_base(__VA_ARGS__, 1)
-   #define F77_zhpr2(...) F77_zhpr2_base(__VA_ARGS__, 1)
+   #define F77_zgemv(...)     F77_zgemv_base(__VA_ARGS__, 1)
+   #define F77_zgbmv(...)     F77_zgbmv_base(__VA_ARGS__, 1)
+   #define F77_zhemv(...)     F77_zhemv_base(__VA_ARGS__, 1)
+   #define F77_zhbmv(...)     F77_zhbmv_base(__VA_ARGS__, 1)
+   #define F77_zhpmv(...)     F77_zhpmv_base(__VA_ARGS__, 1)
+   #define F77_ztrmv(...)     F77_ztrmv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_ztbmv(...)     F77_ztbmv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_ztpmv(...)     F77_ztpmv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_ztrsv(...)     F77_ztrsv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_ztbsv(...)     F77_ztbsv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_ztpsv(...)     F77_ztpsv_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_zher(...)      F77_zher_base(__VA_ARGS__, 1)
+   #define F77_zher2(...)     F77_zher2_base(__VA_ARGS__, 1)
+   #define F77_zhpr(...)      F77_zhpr_base(__VA_ARGS__, 1)
+   #define F77_zhpr2(...)     F77_zhpr2_base(__VA_ARGS__, 1)
 
    /*
    * Level 3 Fortran variadic definitions with BLAS_FORTRAN_STRLEN_END
@@ -353,123 +400,127 @@
 
    /* Single Precision */
 
-   #define F77_sgemm(...) F77_sgemm_base(__VA_ARGS__, 1, 1)
-   #define F77_ssymm(...) F77_ssymm_base(__VA_ARGS__, 1, 1)
-   #define F77_ssyrk(...) F77_ssyrk_base(__VA_ARGS__, 1, 1)
-   #define F77_ssyr2k(...) F77_ssyr2k_base(__VA_ARGS__, 1, 1)
-   #define F77_strmm(...) F77_strmm_base(__VA_ARGS__, 1, 1, 1, 1)
-   #define F77_strsm(...) F77_strsm_base(__VA_ARGS__, 1, 1, 1, 1)
+   #define F77_sgemm(...)     F77_sgemm_base(__VA_ARGS__, 1, 1)
+   #define F77_sgemmtr(...)    F77_sgemmtr_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_ssymm(...)     F77_ssymm_base(__VA_ARGS__, 1, 1)
+   #define F77_ssyrk(...)     F77_ssyrk_base(__VA_ARGS__, 1, 1)
+   #define F77_ssyr2k(...)    F77_ssyr2k_base(__VA_ARGS__, 1, 1)
+   #define F77_strmm(...)     F77_strmm_base(__VA_ARGS__, 1, 1, 1, 1)
+   #define F77_strsm(...)     F77_strsm_base(__VA_ARGS__, 1, 1, 1, 1)
 
    /* Double Precision */
 
-   #define F77_dgemm(...) F77_dgemm_base(__VA_ARGS__, 1, 1)
-   #define F77_dsymm(...) F77_dsymm_base(__VA_ARGS__, 1, 1)
-   #define F77_dsyrk(...) F77_dsyrk_base(__VA_ARGS__, 1, 1)
-   #define F77_dsyr2k(...) F77_dsyr2k_base(__VA_ARGS__, 1, 1)
-   #define F77_dtrmm(...) F77_dtrmm_base(__VA_ARGS__, 1, 1, 1, 1)
-   #define F77_dtrsm(...) F77_dtrsm_base(__VA_ARGS__, 1, 1, 1, 1)
+   #define F77_dgemm(...)     F77_dgemm_base(__VA_ARGS__, 1, 1)
+   #define F77_dgemmtr(...)    F77_dgemmtr_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_dsymm(...)     F77_dsymm_base(__VA_ARGS__, 1, 1)
+   #define F77_dsyrk(...)     F77_dsyrk_base(__VA_ARGS__, 1, 1)
+   #define F77_dsyr2k(...)    F77_dsyr2k_base(__VA_ARGS__, 1, 1)
+   #define F77_dtrmm(...)     F77_dtrmm_base(__VA_ARGS__, 1, 1, 1, 1)
+   #define F77_dtrsm(...)     F77_dtrsm_base(__VA_ARGS__, 1, 1, 1, 1)
 
    /* Single Complex Precision */
 
-   #define F77_cgemm(...) F77_cgemm_base(__VA_ARGS__, 1, 1)
-   #define F77_csymm(...) F77_csymm_base(__VA_ARGS__, 1, 1)
-   #define F77_chemm(...) F77_chemm_base(__VA_ARGS__, 1, 1)
-   #define F77_csyrk(...) F77_csyrk_base(__VA_ARGS__, 1, 1)
-   #define F77_cherk(...) F77_cherk_base(__VA_ARGS__, 1, 1)
-   #define F77_csyr2k(...) F77_csyr2k_base(__VA_ARGS__, 1, 1)
-   #define F77_cher2k(...) F77_cher2k_base(__VA_ARGS__, 1, 1)
-   #define F77_ctrmm(...) F77_ctrmm_base(__VA_ARGS__, 1, 1, 1, 1)
-   #define F77_ctrsm(...) F77_ctrsm_base(__VA_ARGS__, 1, 1, 1, 1)
+   #define F77_cgemm(...)     F77_cgemm_base(__VA_ARGS__, 1, 1)
+   #define F77_cgemmtr(...)    F77_cgemmtr_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_csymm(...)     F77_csymm_base(__VA_ARGS__, 1, 1)
+   #define F77_chemm(...)     F77_chemm_base(__VA_ARGS__, 1, 1)
+   #define F77_csyrk(...)     F77_csyrk_base(__VA_ARGS__, 1, 1)
+   #define F77_cherk(...)     F77_cherk_base(__VA_ARGS__, 1, 1)
+   #define F77_csyr2k(...)    F77_csyr2k_base(__VA_ARGS__, 1, 1)
+   #define F77_cher2k(...)    F77_cher2k_base(__VA_ARGS__, 1, 1)
+   #define F77_ctrmm(...)     F77_ctrmm_base(__VA_ARGS__, 1, 1, 1, 1)
+   #define F77_ctrsm(...)     F77_ctrsm_base(__VA_ARGS__, 1, 1, 1, 1)
 
    /* Double Complex Precision */
 
-   #define F77_zgemm(...) F77_zgemm_base(__VA_ARGS__, 1, 1)
-   #define F77_zsymm(...) F77_zsymm_base(__VA_ARGS__, 1, 1)
-   #define F77_zhemm(...) F77_zhemm_base(__VA_ARGS__, 1, 1)
-   #define F77_zsyrk(...) F77_zsyrk_base(__VA_ARGS__, 1, 1)
-   #define F77_zherk(...) F77_zherk_base(__VA_ARGS__, 1, 1)
-   #define F77_zsyr2k(...) F77_zsyr2k_base(__VA_ARGS__, 1, 1)
-   #define F77_zher2k(...) F77_zher2k_base(__VA_ARGS__, 1, 1)
-   #define F77_ztrmm(...) F77_ztrmm_base(__VA_ARGS__, 1, 1, 1, 1)
-   #define F77_ztrsm(...) F77_ztrsm_base(__VA_ARGS__, 1, 1, 1, 1)
+   #define F77_zgemm(...)     F77_zgemm_base(__VA_ARGS__, 1, 1)
+   #define F77_zgemmtr(...)    F77_zgemmtr_base(__VA_ARGS__, 1, 1, 1)
+   #define F77_zsymm(...)     F77_zsymm_base(__VA_ARGS__, 1, 1)
+   #define F77_zhemm(...)     F77_zhemm_base(__VA_ARGS__, 1, 1)
+   #define F77_zsyrk(...)     F77_zsyrk_base(__VA_ARGS__, 1, 1)
+   #define F77_zherk(...)     F77_zherk_base(__VA_ARGS__, 1, 1)
+   #define F77_zsyr2k(...)    F77_zsyr2k_base(__VA_ARGS__, 1, 1)
+   #define F77_zher2k(...)    F77_zher2k_base(__VA_ARGS__, 1, 1)
+   #define F77_ztrmm(...)     F77_ztrmm_base(__VA_ARGS__, 1, 1, 1, 1)
+   #define F77_ztrsm(...)     F77_ztrsm_base(__VA_ARGS__, 1, 1, 1, 1)
 
 #else
-                              
+
    /*
    * Level 2 Fortran variadic definitions without BLAS_FORTRAN_STRLEN_END
    */
 
    /* Single Precision */
 
-   #define F77_sgemv(...) F77_sgemv_base(__VA_ARGS__)
-   #define F77_sgbmv(...) F77_sgbmv_base(__VA_ARGS__)
-   #define F77_ssymv(...) F77_ssymv_base(__VA_ARGS__)
-   #define F77_ssbmv(...) F77_ssbmv_base(__VA_ARGS__)
-   #define F77_sspmv(...) F77_sspmv_base(__VA_ARGS__)
-   #define F77_strmv(...) F77_strmv_base(__VA_ARGS__)
-   #define F77_stbmv(...) F77_stbmv_base(__VA_ARGS__)
-   #define F77_strsv(...) F77_strsv_base(__VA_ARGS__)
-   #define F77_stbsv(...) F77_stbsv_base(__VA_ARGS__)
-   #define F77_stpmv(...) F77_stpmv_base(__VA_ARGS__)
-   #define F77_stpsv(...) F77_stpsv_base(__VA_ARGS__)
-      #define F77_ssyr(...) F77_ssyr_base(__VA_ARGS__)
-   #define F77_sspr(...) F77_sspr_base(__VA_ARGS__)
-   #define F77_sspr2(...) F77_sspr2_base(__VA_ARGS__)
-   #define F77_ssyr2(...) F77_ssyr2_base(__VA_ARGS__)
+   #define F77_sgemv(...)     F77_sgemv_base(__VA_ARGS__)
+   #define F77_sgbmv(...)     F77_sgbmv_base(__VA_ARGS__)
+   #define F77_ssymv(...)     F77_ssymv_base(__VA_ARGS__)
+   #define F77_ssbmv(...)     F77_ssbmv_base(__VA_ARGS__)
+   #define F77_sspmv(...)     F77_sspmv_base(__VA_ARGS__)
+   #define F77_strmv(...)     F77_strmv_base(__VA_ARGS__)
+   #define F77_stbmv(...)     F77_stbmv_base(__VA_ARGS__)
+   #define F77_strsv(...)     F77_strsv_base(__VA_ARGS__)
+   #define F77_stbsv(...)     F77_stbsv_base(__VA_ARGS__)
+   #define F77_stpmv(...)     F77_stpmv_base(__VA_ARGS__)
+   #define F77_stpsv(...)     F77_stpsv_base(__VA_ARGS__)
+   #define F77_ssyr(...)      F77_ssyr_base(__VA_ARGS__)
+   #define F77_sspr(...)      F77_sspr_base(__VA_ARGS__)
+   #define F77_sspr2(...)     F77_sspr2_base(__VA_ARGS__)
+   #define F77_ssyr2(...)     F77_ssyr2_base(__VA_ARGS__)
 
    /* Double Precision */
 
-   #define F77_dgemv(...) F77_dgemv_base(__VA_ARGS__)
-   #define F77_dgbmv(...) F77_dgbmv_base(__VA_ARGS__)
-   #define F77_dsymv(...) F77_dsymv_base(__VA_ARGS__)
-   #define F77_dsbmv(...) F77_dsbmv_base(__VA_ARGS__)
-   #define F77_dspmv(...) F77_dspmv_base(__VA_ARGS__)
-   #define F77_dtrmv(...) F77_dtrmv_base(__VA_ARGS__)
-   #define F77_dtbmv(...) F77_dtbmv_base(__VA_ARGS__)
-   #define F77_dtrsv(...) F77_dtrsv_base(__VA_ARGS__)
-   #define F77_dtbsv(...) F77_dtbsv_base(__VA_ARGS__)
-   #define F77_dtpmv(...) F77_dtpmv_base(__VA_ARGS__)
-   #define F77_dtpsv(...) F77_dtpsv_base(__VA_ARGS__)
-      #define F77_dsyr(...) F77_dsyr_base(__VA_ARGS__)
-   #define F77_dspr(...) F77_dspr_base(__VA_ARGS__)
-   #define F77_dspr2(...) F77_dspr2_base(__VA_ARGS__)
-   #define F77_dsyr2(...) F77_dsyr2_base(__VA_ARGS__)
+   #define F77_dgemv(...)     F77_dgemv_base(__VA_ARGS__)
+   #define F77_dgbmv(...)     F77_dgbmv_base(__VA_ARGS__)
+   #define F77_dsymv(...)     F77_dsymv_base(__VA_ARGS__)
+   #define F77_dsbmv(...)     F77_dsbmv_base(__VA_ARGS__)
+   #define F77_dspmv(...)     F77_dspmv_base(__VA_ARGS__)
+   #define F77_dtrmv(...)     F77_dtrmv_base(__VA_ARGS__)
+   #define F77_dtbmv(...)     F77_dtbmv_base(__VA_ARGS__)
+   #define F77_dtrsv(...)     F77_dtrsv_base(__VA_ARGS__)
+   #define F77_dtbsv(...)     F77_dtbsv_base(__VA_ARGS__)
+   #define F77_dtpmv(...)     F77_dtpmv_base(__VA_ARGS__)
+   #define F77_dtpsv(...)     F77_dtpsv_base(__VA_ARGS__)
+   #define F77_dsyr(...)      F77_dsyr_base(__VA_ARGS__)
+   #define F77_dspr(...)      F77_dspr_base(__VA_ARGS__)
+   #define F77_dspr2(...)     F77_dspr2_base(__VA_ARGS__)
+   #define F77_dsyr2(...)     F77_dsyr2_base(__VA_ARGS__)
 
    /* Single Complex Precision */
 
-   #define F77_cgemv(...) F77_cgemv_base(__VA_ARGS__)
-   #define F77_cgbmv(...) F77_cgbmv_base(__VA_ARGS__)
-   #define F77_chemv(...) F77_chemv_base(__VA_ARGS__)
-   #define F77_chbmv(...) F77_chbmv_base(__VA_ARGS__)
-   #define F77_chpmv(...) F77_chpmv_base(__VA_ARGS__)
-   #define F77_ctrmv(...) F77_ctrmv_base(__VA_ARGS__)
-   #define F77_ctbmv(...) F77_ctbmv_base(__VA_ARGS__)
-   #define F77_ctpmv(...) F77_ctpmv_base(__VA_ARGS__)
-   #define F77_ctrsv(...) F77_ctrsv_base(__VA_ARGS__)
-   #define F77_ctbsv(...) F77_ctbsv_base(__VA_ARGS__)
-   #define F77_ctpsv(...) F77_ctpsv_base(__VA_ARGS__)
-         #define F77_cher(...) F77_cher_base(__VA_ARGS__)
-   #define F77_cher2(...) F77_cher2_base(__VA_ARGS__)
-   #define F77_chpr(...) F77_chpr_base(__VA_ARGS__)
-   #define F77_chpr2(...) F77_chpr2_base(__VA_ARGS__)
+   #define F77_cgemv(...)     F77_cgemv_base(__VA_ARGS__)
+   #define F77_cgbmv(...)     F77_cgbmv_base(__VA_ARGS__)
+   #define F77_chemv(...)     F77_chemv_base(__VA_ARGS__)
+   #define F77_chbmv(...)     F77_chbmv_base(__VA_ARGS__)
+   #define F77_chpmv(...)     F77_chpmv_base(__VA_ARGS__)
+   #define F77_ctrmv(...)     F77_ctrmv_base(__VA_ARGS__)
+   #define F77_ctbmv(...)     F77_ctbmv_base(__VA_ARGS__)
+   #define F77_ctpmv(...)     F77_ctpmv_base(__VA_ARGS__)
+   #define F77_ctrsv(...)     F77_ctrsv_base(__VA_ARGS__)
+   #define F77_ctbsv(...)     F77_ctbsv_base(__VA_ARGS__)
+   #define F77_ctpsv(...)     F77_ctpsv_base(__VA_ARGS__)
+   #define F77_cher(...)      F77_cher_base(__VA_ARGS__)
+   #define F77_cher2(...)     F77_cher2_base(__VA_ARGS__)
+   #define F77_chpr(...)      F77_chpr_base(__VA_ARGS__)
+   #define F77_chpr2(...)     F77_chpr2_base(__VA_ARGS__)
 
    /* Double Complex Precision */
 
-   #define F77_zgemv(...) F77_zgemv_base(__VA_ARGS__)
-   #define F77_zgbmv(...) F77_zgbmv_base(__VA_ARGS__)
-   #define F77_zhemv(...) F77_zhemv_base(__VA_ARGS__)
-   #define F77_zhbmv(...) F77_zhbmv_base(__VA_ARGS__)
-   #define F77_zhpmv(...) F77_zhpmv_base(__VA_ARGS__)
-   #define F77_ztrmv(...) F77_ztrmv_base(__VA_ARGS__)
-   #define F77_ztbmv(...) F77_ztbmv_base(__VA_ARGS__)
-   #define F77_ztpmv(...) F77_ztpmv_base(__VA_ARGS__)
-   #define F77_ztrsv(...) F77_ztrsv_base(__VA_ARGS__)
-   #define F77_ztbsv(...) F77_ztbsv_base(__VA_ARGS__)
-   #define F77_ztpsv(...) F77_ztpsv_base(__VA_ARGS__)
-         #define F77_zher(...) F77_zher_base(__VA_ARGS__)
-   #define F77_zher2(...) F77_zher2_base(__VA_ARGS__)
-   #define F77_zhpr(...) F77_zhpr_base(__VA_ARGS__)
-   #define F77_zhpr2(...) F77_zhpr2_base(__VA_ARGS__)
+   #define F77_zgemv(...)     F77_zgemv_base(__VA_ARGS__)
+   #define F77_zgbmv(...)     F77_zgbmv_base(__VA_ARGS__)
+   #define F77_zhemv(...)     F77_zhemv_base(__VA_ARGS__)
+   #define F77_zhbmv(...)     F77_zhbmv_base(__VA_ARGS__)
+   #define F77_zhpmv(...)     F77_zhpmv_base(__VA_ARGS__)
+   #define F77_ztrmv(...)     F77_ztrmv_base(__VA_ARGS__)
+   #define F77_ztbmv(...)     F77_ztbmv_base(__VA_ARGS__)
+   #define F77_ztpmv(...)     F77_ztpmv_base(__VA_ARGS__)
+   #define F77_ztrsv(...)     F77_ztrsv_base(__VA_ARGS__)
+   #define F77_ztbsv(...)     F77_ztbsv_base(__VA_ARGS__)
+   #define F77_ztpsv(...)     F77_ztpsv_base(__VA_ARGS__)
+   #define F77_zher(...)      F77_zher_base(__VA_ARGS__)
+   #define F77_zher2(...)     F77_zher2_base(__VA_ARGS__)
+   #define F77_zhpr(...)      F77_zhpr_base(__VA_ARGS__)
+   #define F77_zhpr2(...)     F77_zhpr2_base(__VA_ARGS__)
 
    /*
    * Level 3 Fortran variadic definitions without BLAS_FORTRAN_STRLEN_END
@@ -477,45 +528,49 @@
 
    /* Single Precision */
 
-   #define F77_sgemm(...) F77_sgemm_base(__VA_ARGS__)
-   #define F77_ssymm(...) F77_ssymm_base(__VA_ARGS__)
-   #define F77_ssyrk(...) F77_ssyrk_base(__VA_ARGS__)
-   #define F77_ssyr2k(...) F77_ssyr2k_base(__VA_ARGS__)
-   #define F77_strmm(...) F77_strmm_base(__VA_ARGS__)
-   #define F77_strsm(...) F77_strsm_base(__VA_ARGS__)
+   #define F77_sgemm(...)     F77_sgemm_base(__VA_ARGS__)
+   #define F77_sgemmtr(...)    F77_sgemmtr_base(__VA_ARGS__)
+   #define F77_ssymm(...)     F77_ssymm_base(__VA_ARGS__)
+   #define F77_ssyrk(...)     F77_ssyrk_base(__VA_ARGS__)
+   #define F77_ssyr2k(...)    F77_ssyr2k_base(__VA_ARGS__)
+   #define F77_strmm(...)     F77_strmm_base(__VA_ARGS__)
+   #define F77_strsm(...)     F77_strsm_base(__VA_ARGS__)
 
    /* Double Precision */
 
-   #define F77_dgemm(...) F77_dgemm_base(__VA_ARGS__)
-   #define F77_dsymm(...) F77_dsymm_base(__VA_ARGS__)
-   #define F77_dsyrk(...) F77_dsyrk_base(__VA_ARGS__)
-   #define F77_dsyr2k(...) F77_dsyr2k_base(__VA_ARGS__)
-   #define F77_dtrmm(...) F77_dtrmm_base(__VA_ARGS__)
-   #define F77_dtrsm(...) F77_dtrsm_base(__VA_ARGS__)
+   #define F77_dgemm(...)     F77_dgemm_base(__VA_ARGS__)
+   #define F77_dgemmtr(...)    F77_dgemmtr_base(__VA_ARGS__)
+   #define F77_dsymm(...)     F77_dsymm_base(__VA_ARGS__)
+   #define F77_dsyrk(...)     F77_dsyrk_base(__VA_ARGS__)
+   #define F77_dsyr2k(...)    F77_dsyr2k_base(__VA_ARGS__)
+   #define F77_dtrmm(...)     F77_dtrmm_base(__VA_ARGS__)
+   #define F77_dtrsm(...)     F77_dtrsm_base(__VA_ARGS__)
 
    /* Single Complex Precision */
 
-   #define F77_cgemm(...) F77_cgemm_base(__VA_ARGS__)
-   #define F77_csymm(...) F77_csymm_base(__VA_ARGS__)
-   #define F77_chemm(...) F77_chemm_base(__VA_ARGS__)
-   #define F77_csyrk(...) F77_csyrk_base(__VA_ARGS__)
-   #define F77_cherk(...) F77_cherk_base(__VA_ARGS__)
-   #define F77_csyr2k(...) F77_csyr2k_base(__VA_ARGS__)
-   #define F77_cher2k(...) F77_cher2k_base(__VA_ARGS__)
-   #define F77_ctrmm(...) F77_ctrmm_base(__VA_ARGS__)
-   #define F77_ctrsm(...) F77_ctrsm_base(__VA_ARGS__)
+   #define F77_cgemm(...)     F77_cgemm_base(__VA_ARGS__)
+   #define F77_cgemmtr(...)    F77_cgemmtr_base(__VA_ARGS__)
+   #define F77_csymm(...)     F77_csymm_base(__VA_ARGS__)
+   #define F77_chemm(...)     F77_chemm_base(__VA_ARGS__)
+   #define F77_csyrk(...)     F77_csyrk_base(__VA_ARGS__)
+   #define F77_cherk(...)     F77_cherk_base(__VA_ARGS__)
+   #define F77_csyr2k(...)    F77_csyr2k_base(__VA_ARGS__)
+   #define F77_cher2k(...)    F77_cher2k_base(__VA_ARGS__)
+   #define F77_ctrmm(...)     F77_ctrmm_base(__VA_ARGS__)
+   #define F77_ctrsm(...)     F77_ctrsm_base(__VA_ARGS__)
 
    /* Double Complex Precision */
 
-   #define F77_zgemm(...) F77_zgemm_base(__VA_ARGS__)
-   #define F77_zsymm(...) F77_zsymm_base(__VA_ARGS__)
-   #define F77_zhemm(...) F77_zhemm_base(__VA_ARGS__)
-   #define F77_zsyrk(...) F77_zsyrk_base(__VA_ARGS__)
-   #define F77_zherk(...) F77_zherk_base(__VA_ARGS__)
-   #define F77_zsyr2k(...) F77_zsyr2k_base(__VA_ARGS__)
-   #define F77_zher2k(...) F77_zher2k_base(__VA_ARGS__)
-   #define F77_ztrmm(...) F77_ztrmm_base(__VA_ARGS__)
-   #define F77_ztrsm(...) F77_ztrsm_base(__VA_ARGS__)
+   #define F77_zgemm(...)     F77_zgemm_base(__VA_ARGS__)
+   #define F77_zgemmtr(...)    F77_zgemmtr_base(__VA_ARGS__)
+   #define F77_zsymm(...)     F77_zsymm_base(__VA_ARGS__)
+   #define F77_zhemm(...)     F77_zhemm_base(__VA_ARGS__)
+   #define F77_zsyrk(...)     F77_zsyrk_base(__VA_ARGS__)
+   #define F77_zherk(...)     F77_zherk_base(__VA_ARGS__)
+   #define F77_zsyr2k(...)    F77_zsyr2k_base(__VA_ARGS__)
+   #define F77_zher2k(...)    F77_zher2k_base(__VA_ARGS__)
+   #define F77_ztrmm(...)     F77_ztrmm_base(__VA_ARGS__)
+   #define F77_ztrsm(...)     F77_ztrsm_base(__VA_ARGS__)
 
 #endif
 
@@ -527,76 +582,95 @@
 extern "C" {
 #endif
 
-void F77_xerbla(FCHAR, void *);
-void F77_xerbla_base(FCHAR, void *
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
+#ifdef BLAS_FORTRAN_STRLEN_END
+   #define F77_xerbla(...) F77_xerbla_base(__VA_ARGS__, 1)
+#else
+   #define F77_xerbla(...) F77_xerbla_base(__VA_ARGS__)
+#endif
+void
+#ifdef HAS_ATTRIBUTE_WEAK_SUPPORT
+__attribute__((weak))
+#endif
+F77_xerbla_base(FCHAR, void *
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+
 /*
  * Level 1 Fortran Prototypes
  */
 
 /* Single Precision */
 
-   void F77_srot_base(FINT, float *, FINT, float *, FINT, const float *, const float *);
-   void F77_srotg_base(float *,float *,float *,float *);
-   void F77_srotm_base( FINT, float *, FINT, float *, FINT, const float *);
-   void F77_srotmg_base(float *,float *,float *,const float *, float *);
-   void F77_sswap_base( FINT, float *, FINT, float *, FINT);
-   void F77_scopy_base( FINT, const float *, FINT, float *, FINT);
-   void F77_saxpy_base( FINT, const float *, const float *, FINT, float *, FINT);
-   void F77_sdot_sub_base(FINT, const float *, FINT, const float *, FINT, float *);
-   void F77_sdsdot_sub_base( FINT, const float *, const float *, FINT, const float *, FINT, float *);
-   void F77_sscal_base( FINT, const float *, float *, FINT);
-   void F77_snrm2_sub_base( FINT, const float *, FINT, float *);
-   void F77_sasum_sub_base( FINT, const float *, FINT, float *);
-   void F77_isamax_sub_base( FINT, const float * , FINT, FINT2);
+void F77_srot_base(FINT, float *, FINT, float *, FINT, const float *, const float *);
+void F77_srotg_base(float *,float *,float *,float *);
+void F77_srotm_base(FINT, float *, FINT, float *, FINT, const float *);
+void F77_srotmg_base(float *,float *,float *,const float *, float *);
+void F77_sswap_base(FINT, float *, FINT, float *, FINT);
+void F77_scopy_base(FINT, const float *, FINT, float *, FINT);
+void F77_saxpy_base(FINT, const float *, const float *, FINT, float *, FINT);
+void F77_saxpby_base(FINT, const float *, const float *, FINT, const float *, float *, FINT);
+void F77_sdot_sub_base(FINT, const float *, FINT, const float *, FINT, float *);
+void F77_sdsdot_sub_base(FINT, const float *, const float *, FINT, const float *, FINT, float *);
+void F77_sscal_base(FINT, const float *, float *, FINT);
+void F77_snrm2_sub_base(FINT, const float *, FINT, float *);
+void F77_sasum_sub_base(FINT, const float *, FINT, float *);
+void F77_isamax_sub_base(FINT, const float * , FINT, FINT2);
 
 /* Double Precision */
 
-   void F77_drot_base(FINT, double *, FINT, double *, FINT, const double *, const double *);
-   void F77_drotg_base(double *,double *,double *,double *);
-   void F77_drotm_base( FINT, double *, FINT, double *, FINT, const double *);
-   void F77_drotmg_base(double *,double *,double *,const double *, double *);
-   void F77_dswap_base( FINT, double *, FINT, double *, FINT);
-   void F77_dcopy_base( FINT, const double *, FINT, double *, FINT);
-   void F77_daxpy_base( FINT, const double *, const double *, FINT, double *, FINT);
-   void F77_dswap_base( FINT, double *, FINT, double *, FINT);
-   void F77_dsdot_sub_base(FINT, const float *, FINT, const float *, FINT, double *);
-   void F77_ddot_sub_base( FINT, const double *, FINT, const double *, FINT, double *);
-   void F77_dscal_base( FINT, const double *, double *, FINT);
-   void F77_dnrm2_sub_base( FINT, const double *, FINT, double *);
-   void F77_dasum_sub_base( FINT, const double *, FINT, double *);
-   void F77_idamax_sub_base( FINT, const double * , FINT, FINT2);
+void F77_drot_base(FINT, double *, FINT, double *, FINT, const double *, const double *);
+void F77_drotg_base(double *,double *,double *,double *);
+void F77_drotm_base(FINT, double *, FINT, double *, FINT, const double *);
+void F77_drotmg_base(double *,double *,double *,const double *, double *);
+void F77_dswap_base(FINT, double *, FINT, double *, FINT);
+void F77_dcopy_base(FINT, const double *, FINT, double *, FINT);
+void F77_daxpy_base(FINT, const double *, const double *, FINT, double *, FINT);
+void F77_daxpby_base(FINT, const double *, const double *, FINT, const double *, double *, FINT);
+void F77_dswap_base(FINT, double *, FINT, double *, FINT);
+void F77_dsdot_sub_base(FINT, const float *, FINT, const float *, FINT, double *);
+void F77_ddot_sub_base(FINT, const double *, FINT, const double *, FINT, double *);
+void F77_dscal_base(FINT, const double *, double *, FINT);
+void F77_dnrm2_sub_base(FINT, const double *, FINT, double *);
+void F77_dasum_sub_base(FINT, const double *, FINT, double *);
+void F77_idamax_sub_base(FINT, const double * , FINT, FINT2);
 
 /* Single Complex Precision */
 
-   void F77_cswap_base( FINT, void *, FINT, void *, FINT);
-   void F77_ccopy_base( FINT, const void *, FINT, void *, FINT);
-   void F77_caxpy_base( FINT, const void *, const void *, FINT, void *, FINT);
-   void F77_cswap_base( FINT, void *, FINT, void *, FINT);
-   void F77_cdotc_sub_base( FINT, const void *, FINT, const void *, FINT, void *);
-   void F77_cdotu_sub_base( FINT, const void *, FINT, const void *, FINT, void *);
-   void F77_cscal_base( FINT, const void *, void *, FINT);
-   void F77_icamax_sub_base( FINT, const void *, FINT, FINT2);
-   void F77_csscal_base( FINT, const float *, void *, FINT);
-   void F77_scnrm2_sub_base( FINT, const void *, FINT, float *);
-   void F77_scasum_sub_base( FINT, const void *, FINT, float *);
+void F77_crotg_base(void *, void *, float *, void *);
+void F77_csrot_base(FINT, void *X, FINT, void *, FINT, const float *, const float *);
+void F77_cswap_base(FINT, void *, FINT, void *, FINT);
+void F77_ccopy_base(FINT, const void *, FINT, void *, FINT);
+void F77_caxpy_base(FINT, const void *, const void *, FINT, void *, FINT);
+void F77_caxpby_base(FINT, const void *, const void *, FINT, const void *, void *, FINT);
+void F77_cswap_base(FINT, void *, FINT, void *, FINT);
+void F77_cdotc_sub_base(FINT, const void *, FINT, const void *, FINT, void *);
+void F77_cdotu_sub_base(FINT, const void *, FINT, const void *, FINT, void *);
+void F77_cscal_base(FINT, const void *, void *, FINT);
+void F77_icamax_sub_base(FINT, const void *, FINT, FINT2);
+void F77_csscal_base(FINT, const float *, void *, FINT);
+void F77_scnrm2_sub_base(FINT, const void *, FINT, float *);
+void F77_scasum_sub_base(FINT, const void *, FINT, float *);
+void F77_scabs1_sub_base(const void *, float *);
 
 /* Double Complex Precision */
 
-   void F77_zswap_base( FINT, void *, FINT, void *, FINT);
-   void F77_zcopy_base( FINT, const void *, FINT, void *, FINT);
-   void F77_zaxpy_base( FINT, const void *, const void *, FINT, void *, FINT);
-   void F77_zswap_base( FINT, void *, FINT, void *, FINT);
-   void F77_zdotc_sub_base( FINT, const void *, FINT, const void *, FINT, void *);
-   void F77_zdotu_sub_base( FINT, const void *, FINT, const void *, FINT, void *);
-   void F77_zdscal_base( FINT, const double *, void *, FINT);
-   void F77_zscal_base( FINT, const void *, void *, FINT);
-   void F77_dznrm2_sub_base( FINT, const void *, FINT, double *);
-   void F77_dzasum_sub_base( FINT, const void *, FINT, double *);
-   void F77_izamax_sub_base( FINT, const void *, FINT, FINT2);
+void F77_zrotg_base(void *, void *, double *, void *);
+void F77_zdrot_base(FINT, void *X, FINT, void *, FINT, const double *, const double *);
+void F77_zswap_base(FINT, void *, FINT, void *, FINT);
+void F77_zcopy_base(FINT, const void *, FINT, void *, FINT);
+void F77_zaxpy_base(FINT, const void *, const void *, FINT, void *, FINT);
+void F77_zaxpby_base(FINT, const void *, const void *, FINT, const void*, void *, FINT);
+void F77_zswap_base(FINT, void *, FINT, void *, FINT);
+void F77_zdotc_sub_base(FINT, const void *, FINT, const void *, FINT, void *);
+void F77_zdotu_sub_base(FINT, const void *, FINT, const void *, FINT, void *);
+void F77_zdscal_base(FINT, const double *, void *, FINT);
+void F77_zscal_base(FINT, const void *, void *, FINT);
+void F77_dznrm2_sub_base(FINT, const void *, FINT, double *);
+void F77_dzasum_sub_base(FINT, const void *, FINT, double *);
+void F77_izamax_sub_base(FINT, const void *, FINT, FINT2);
+void F77_dcabs1_sub_base(const void *, double *);
 
 /*
  * Level 2 Fortran Prototypes
@@ -604,321 +678,321 @@ void F77_xerbla_base(FCHAR, void *
 
 /* Single Precision */
 
-   void F77_sgemv_base(FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_sgbmv_base(FCHAR, FINT, FINT, FINT, FINT, const float *,  const float *, FINT, const float *, FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_ssymv_base(FCHAR, FINT, const float *, const float *, FINT, const float *,  FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_ssbmv_base(FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_sspmv_base(FCHAR, FINT, const float *, const float *, const float *, FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_strmv_base(FCHAR, FCHAR, FCHAR, FINT, const float *, FINT, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_stbmv_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, FINT, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_strsv_base(FCHAR, FCHAR, FCHAR, FINT, const float *, FINT, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_stbsv_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, FINT, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_stpmv_base(FCHAR, FCHAR, FCHAR, FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_stpsv_base(FCHAR, FCHAR, FCHAR, FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_sger_base( FINT, FINT, const float *, const float *, FINT, const float *, FINT, float *, FINT);
-   void F77_ssyr_base(FCHAR, FINT, const float *, const float *, FINT, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_sspr_base(FCHAR, FINT, const float *, const float *, FINT, float *
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_sspr2_base(FCHAR, FINT, const float *, const float *, FINT, const float *, FINT,  float *
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_ssyr2_base(FCHAR, FINT, const float *, const float *, FINT, const float *, FINT,  float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
+void F77_sgemv_base(FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_sgbmv_base(FCHAR, FINT, FINT, FINT, FINT, const float *,  const float *, FINT, const float *, FINT, const float *, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_ssymv_base(FCHAR, FINT, const float *, const float *, FINT, const float *,  FINT, const float *, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_ssbmv_base(FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_sspmv_base(FCHAR, FINT, const float *, const float *, const float *, FINT, const float *, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_strmv_base(FCHAR, FCHAR, FCHAR, FINT, const float *, FINT, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_stbmv_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, FINT, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_strsv_base(FCHAR, FCHAR, FCHAR, FINT, const float *, FINT, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_stbsv_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, FINT, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_stpmv_base(FCHAR, FCHAR, FCHAR, FINT, const float *, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_stpsv_base(FCHAR, FCHAR, FCHAR, FINT, const float *, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_sger_base(FINT, FINT, const float *, const float *, FINT, const float *, FINT, float *, FINT);
+void F77_ssyr_base(FCHAR, FINT, const float *, const float *, FINT, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_sspr_base(FCHAR, FINT, const float *, const float *, FINT, float *
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_sspr2_base(FCHAR, FINT, const float *, const float *, FINT, const float *, FINT,  float *
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_ssyr2_base(FCHAR, FINT, const float *, const float *, FINT, const float *, FINT,  float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
 
 /* Double Precision */
 
-   void F77_dgemv_base(FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_dgbmv_base(FCHAR, FINT, FINT, FINT, FINT, const double *,  const double *, FINT, const double *, FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_dsymv_base(FCHAR, FINT, const double *, const double *, FINT, const double *,  FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_dsbmv_base(FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_dspmv_base(FCHAR, FINT, const double *, const double *, const double *, FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_dtrmv_base(FCHAR, FCHAR, FCHAR, FINT, const double *, FINT, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_dtbmv_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, FINT, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_dtrsv_base(FCHAR, FCHAR, FCHAR, FINT, const double *, FINT, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_dtbsv_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, FINT, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_dtpmv_base(FCHAR, FCHAR, FCHAR, FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_dtpsv_base(FCHAR, FCHAR, FCHAR, FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_dger_base( FINT, FINT, const double *, const double *, FINT, const double *, FINT, double *, FINT);
-   void F77_dsyr_base(FCHAR, FINT, const double *, const double *, FINT, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_dspr_base(FCHAR, FINT, const double *, const double *, FINT, double *
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_dspr2_base(FCHAR, FINT, const double *, const double *, FINT, const double *, FINT,  double *
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_dsyr2_base(FCHAR, FINT, const double *, const double *, FINT, const double *, FINT,  double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
+void F77_dgemv_base(FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_dgbmv_base(FCHAR, FINT, FINT, FINT, FINT, const double *,  const double *, FINT, const double *, FINT, const double *, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_dsymv_base(FCHAR, FINT, const double *, const double *, FINT, const double *,  FINT, const double *, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_dsbmv_base(FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_dspmv_base(FCHAR, FINT, const double *, const double *, const double *, FINT, const double *, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_dtrmv_base(FCHAR, FCHAR, FCHAR, FINT, const double *, FINT, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_dtbmv_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, FINT, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_dtrsv_base(FCHAR, FCHAR, FCHAR, FINT, const double *, FINT, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_dtbsv_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, FINT, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_dtpmv_base(FCHAR, FCHAR, FCHAR, FINT, const double *, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_dtpsv_base(FCHAR, FCHAR, FCHAR, FINT, const double *, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_dger_base(FINT, FINT, const double *, const double *, FINT, const double *, FINT, double *, FINT);
+void F77_dsyr_base(FCHAR, FINT, const double *, const double *, FINT, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_dspr_base(FCHAR, FINT, const double *, const double *, FINT, double *
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_dspr2_base(FCHAR, FINT, const double *, const double *, FINT, const double *, FINT,  double *
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_dsyr2_base(FCHAR, FINT, const double *, const double *, FINT, const double *, FINT,  double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
 
 /* Single Complex Precision */
 
-   void F77_cgemv_base(FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_cgbmv_base(FCHAR, FINT, FINT, FINT, FINT, const void *,  const void *, FINT, const void *, FINT, const void *, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_chemv_base(FCHAR, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_chbmv_base(FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_chpmv_base(FCHAR, FINT, const void *, const void *, const void *, FINT, const void *, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_ctrmv_base(FCHAR, FCHAR, FCHAR, FINT, const void *, FINT, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_ctbmv_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, FINT, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_ctpmv_base(FCHAR, FCHAR, FCHAR, FINT, const void *, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_ctrsv_base(FCHAR, FCHAR, FCHAR, FINT, const void *, FINT, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_ctbsv_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, FINT, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_ctpsv_base(FCHAR, FCHAR, FCHAR, FINT, const void *, void *,FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_cgerc_base( FINT, FINT, const void *, const void *, FINT, const void *, FINT, void *, FINT);
-   void F77_cgeru_base( FINT, FINT, const void *, const void *, FINT, const void *, FINT, void *,  FINT);
-   void F77_cher_base(FCHAR, FINT, const float *, const void *, FINT, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_cher2_base(FCHAR, FINT, const void *, const void *, FINT, const void *, FINT, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_chpr_base(FCHAR, FINT, const float *, const void *, FINT, void *
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_chpr2_base(FCHAR, FINT, const float *, const void *, FINT, const void *, FINT, void *
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
+void F77_cgemv_base(FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_cgbmv_base(FCHAR, FINT, FINT, FINT, FINT, const void *,  const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_chemv_base(FCHAR, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_chbmv_base(FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_chpmv_base(FCHAR, FINT, const void *, const void *, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_ctrmv_base(FCHAR, FCHAR, FCHAR, FINT, const void *, FINT, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_ctbmv_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, FINT, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_ctpmv_base(FCHAR, FCHAR, FCHAR, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_ctrsv_base(FCHAR, FCHAR, FCHAR, FINT, const void *, FINT, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_ctbsv_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, FINT, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_ctpsv_base(FCHAR, FCHAR, FCHAR, FINT, const void *, void *,FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_cgerc_base(FINT, FINT, const void *, const void *, FINT, const void *, FINT, void *, FINT);
+void F77_cgeru_base(FINT, FINT, const void *, const void *, FINT, const void *, FINT, void *,  FINT);
+void F77_cher_base(FCHAR, FINT, const float *, const void *, FINT, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_cher2_base(FCHAR, FINT, const void *, const void *, FINT, const void *, FINT, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_chpr_base(FCHAR, FINT, const float *, const void *, FINT, void *
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_chpr2_base(FCHAR, FINT, const void *, const void *, FINT, const void *, FINT, void *
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
 
 /* Double Complex Precision */
 
-   void F77_zgemv_base(FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_zgbmv_base(FCHAR, FINT, FINT, FINT, FINT, const void *,  const void *, FINT, const void *, FINT, const void *, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_zhemv_base(FCHAR, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_zhbmv_base(FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_zhpmv_base(FCHAR, FINT, const void *, const void *, const void *, FINT, const void *, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_ztrmv_base(FCHAR, FCHAR, FCHAR, FINT, const void *, FINT, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_ztbmv_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, FINT, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_ztpmv_base(FCHAR, FCHAR, FCHAR, FINT, const void *, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_ztrsv_base(FCHAR, FCHAR, FCHAR, FINT, const void *, FINT, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_ztbsv_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, FINT, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_ztpsv_base(FCHAR, FCHAR, FCHAR, FINT, const void *, void *,FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t
-   #endif
-   );
-   void F77_zgerc_base( FINT, FINT, const void *, const void *, FINT, const void *, FINT, void *, FINT);
-   void F77_zgeru_base( FINT, FINT, const void *, const void *, FINT, const void *, FINT, void *,  FINT);
-   void F77_zher_base(FCHAR, FINT, const double *, const void *, FINT, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_zher2_base(FCHAR, FINT, const void *, const void *, FINT, const void *, FINT, void *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_zhpr_base(FCHAR, FINT, const double *, const void *, FINT, void *
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
-   void F77_zhpr2_base(FCHAR, FINT, const double *, const void *, FINT, const void *, FINT, void *
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t
-   #endif
-   );
+void F77_zgemv_base(FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_zgbmv_base(FCHAR, FINT, FINT, FINT, FINT, const void *,  const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_zhemv_base(FCHAR, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_zhbmv_base(FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_zhpmv_base(FCHAR, FINT, const void *, const void *, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_ztrmv_base(FCHAR, FCHAR, FCHAR, FINT, const void *, FINT, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_ztbmv_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, FINT, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_ztpmv_base(FCHAR, FCHAR, FCHAR, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_ztrsv_base(FCHAR, FCHAR, FCHAR, FINT, const void *, FINT, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_ztbsv_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, FINT, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_ztpsv_base(FCHAR, FCHAR, FCHAR, FINT, const void *, void *,FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_zgerc_base(FINT, FINT, const void *, const void *, FINT, const void *, FINT, void *, FINT);
+void F77_zgeru_base(FINT, FINT, const void *, const void *, FINT, const void *, FINT, void *,  FINT);
+void F77_zher_base(FCHAR, FINT, const double *, const void *, FINT, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_zher2_base(FCHAR, FINT, const void *, const void *, FINT, const void *, FINT, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_zhpr_base(FCHAR, FINT, const double *, const void *, FINT, void *
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
+void F77_zhpr2_base(FCHAR, FINT, const void *, const void *, FINT, const void *, FINT, void *
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN
+#endif
+);
 
 /*
  * Level 3 Fortran Prototypes
@@ -926,165 +1000,191 @@ void F77_xerbla_base(FCHAR, void *
 
 /* Single Precision */
 
-   void F77_sgemm_base(FCHAR, FCHAR, FINT, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_ssymm_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_ssyrk_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_ssyr2k_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_strmm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t, size_t
-   #endif
-   );
-   void F77_strsm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t, size_t
-   #endif
-   );
+void F77_sgemm_base(FCHAR, FCHAR, FINT, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_sgemmtr_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , size_t, size_t, size_t
+#endif
+);
+
+void F77_ssymm_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_ssyrk_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_ssyr2k_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_strmm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_strsm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, float *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
 
 /* Double Precision */
 
-   void F77_dgemm_base(FCHAR, FCHAR, FINT, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_dsymm_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_dsyrk_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_dsyr2k_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_dtrmm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t, size_t
-   #endif
-   );
-   void F77_dtrsm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t, size_t
-   #endif
-   );
+void F77_dgemm_base(FCHAR, FCHAR, FINT, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_dgemmtr_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , size_t, size_t, size_t
+#endif
+);
+
+void F77_dsymm_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_dsyrk_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_dsyr2k_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_dtrmm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_dtrsm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, double *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
 
 /* Single Complex Precision */
 
-   void F77_cgemm_base(FCHAR, FCHAR, FINT, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_csymm_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_chemm_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_csyrk_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_cherk_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_csyr2k_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_cher2k_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_ctrmm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t, size_t
-   #endif
-   );
-   void F77_ctrsm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, float *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t, size_t
-   #endif
-   );
+void F77_cgemm_base(FCHAR, FCHAR, FINT, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+
+void F77_cgemmtr_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+
+void F77_csymm_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_chemm_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_csyrk_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_cherk_base(FCHAR, FCHAR, FINT, FINT, const float *, const void *, FINT, const float *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_csyr2k_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_cher2k_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const float *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_ctrmm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_ctrsm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
 
 /* Double Complex Precision */
 
-   void F77_zgemm_base(FCHAR, FCHAR, FINT, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_zsymm_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_zhemm_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_zsyrk_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_zherk_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_zsyr2k_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_zher2k_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t
-   #endif
-   );
-   void F77_ztrmm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t, size_t
-   #endif
-   );
-   void F77_ztrsm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, double *, FINT
-   #ifdef BLAS_FORTRAN_STRLEN_END
-      , size_t, size_t, size_t, size_t
-   #endif
-   );
+void F77_zgemm_base(FCHAR, FCHAR, FINT, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+
+void F77_zgemmtr_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+
+void F77_zsymm_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_zhemm_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_zsyrk_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_zherk_base(FCHAR, FCHAR, FINT, FINT, const double *, const void *, FINT, const double *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_zsyr2k_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_zher2k_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const double *, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_ztrmm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+void F77_ztrsm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, void *, FINT
+#ifdef BLAS_FORTRAN_STRLEN_END
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
 
 #ifdef __cplusplus
 }
diff --git a/CBLAS/include/cblas_test.h b/CBLAS/include/cblas_test.h
index f8174ba43c..32f9394801 100644
--- a/CBLAS/include/cblas_test.h
+++ b/CBLAS/include/cblas_test.h
@@ -7,6 +7,15 @@
 #include "cblas.h"
 #include "cblas_mangling.h"
 
+/* It seems all current Fortran compilers put strlen at end.
+*  Some historical compilers put strlen after the str argument
+*  or make the str argument into a struct. */
+#define BLAS_FORTRAN_STRLEN_END
+
+#ifndef FORTRAN_STRLEN
+  #define FORTRAN_STRLEN size_t
+#endif
+
 #define  TRUE           1
 #define  PASSED         1
 #define  TEST_ROW_MJR	1
@@ -36,18 +45,22 @@ typedef struct { double real; double imag; } CBLAS_TEST_ZOMPLEX;
 #define F77_sswap 		F77_GLOBAL(sswaptest,SSWAPTEST)
 #define F77_scopy 		F77_GLOBAL(scopytest,SCOPYTEST)
 #define F77_saxpy 		F77_GLOBAL(saxpytest,SAXPYTEST)
+#define F77_saxpby 		F77_GLOBAL(saxpbytest,SAXPBYTEST)
 #define F77_isamax 		F77_GLOBAL(isamaxtest,ISAMAXTEST)
 #define F77_dswap 		F77_GLOBAL(dswaptest,DSWAPTEST)
 #define F77_dcopy 		F77_GLOBAL(dcopytest,DCOPYTEST)
 #define F77_daxpy 		F77_GLOBAL(daxpytest,DAXPYTEST)
+#define F77_daxpby 		F77_GLOBAL(daxpbytest,DAXPBYTEST)
 #define F77_idamax 		F77_GLOBAL(idamaxtest,IDAMAXTEST)
 #define F77_cswap 		F77_GLOBAL(cswaptest,CSWAPTEST)
 #define F77_ccopy 		F77_GLOBAL(ccopytest,CCOPYTEST)
 #define F77_caxpy 		F77_GLOBAL(caxpytest,CAXPYTEST)
+#define F77_caxpby 		F77_GLOBAL(caxpbytest,CAXPBYTEST)
 #define F77_icamax 		F77_GLOBAL(icamaxtest,ICAMAXTEST)
 #define F77_zswap 		F77_GLOBAL(zswaptest,ZSWAPTEST)
 #define F77_zcopy 		F77_GLOBAL(zcopytest,ZCOPYTEST)
 #define F77_zaxpy 		F77_GLOBAL(zaxpytest,ZAXPYTEST)
+#define F77_zaxpby 		F77_GLOBAL(zaxpbytest,ZAXPBYTEST)
 #define F77_izamax 		F77_GLOBAL(izamaxtest,IZAMAXTEST)
 #define F77_sdot 		F77_GLOBAL(sdottest,SDOTTEST)
 #define F77_ddot 		F77_GLOBAL(ddottest,DDOTTEST)
@@ -158,24 +171,28 @@ typedef struct { double real; double imag; } CBLAS_TEST_ZOMPLEX;
 #define F77_zherk 		F77_GLOBAL(czherk,CZHERK)
 #define F77_zher2k 		F77_GLOBAL(czher2k,CZHER2K)
 #define F77_sgemm 		F77_GLOBAL(csgemm,CSGEMM)
+#define F77_sgemmtr 		F77_GLOBAL(csgemmtr,CSGEMMTR)
 #define F77_ssymm 		F77_GLOBAL(cssymm,CSSYMM)
 #define F77_ssyrk 		F77_GLOBAL(cssyrk,CSSYRK)
 #define F77_ssyr2k 		F77_GLOBAL(cssyr2k,CSSYR2K)
 #define F77_strmm 		F77_GLOBAL(cstrmm,CSTRMM)
 #define F77_strsm 		F77_GLOBAL(cstrsm,CSTRSM)
 #define F77_dgemm 		F77_GLOBAL(cdgemm,CDGEMM)
+#define F77_dgemmtr 		F77_GLOBAL(cdgemmtr,CDGEMMTR)
 #define F77_dsymm 		F77_GLOBAL(cdsymm,CDSYMM)
 #define F77_dsyrk 		F77_GLOBAL(cdsyrk,CDSYRK)
 #define F77_dsyr2k 		F77_GLOBAL(cdsyr2k,CDSYR2K)
 #define F77_dtrmm 		F77_GLOBAL(cdtrmm,CDTRMM)
 #define F77_dtrsm 		F77_GLOBAL(cdtrsm,CDTRSM)
 #define F77_cgemm 		F77_GLOBAL(ccgemm,CCGEMM)
+#define F77_cgemmtr 		F77_GLOBAL(ccgemmtr,CCGEMMTR)
 #define F77_csymm 		F77_GLOBAL(ccsymm,CCSYMM)
 #define F77_csyrk 		F77_GLOBAL(ccsyrk,CCSYRK)
 #define F77_csyr2k 		F77_GLOBAL(ccsyr2k,CCSYR2K)
 #define F77_ctrmm 		F77_GLOBAL(cctrmm,CCTRMM)
 #define F77_ctrsm 		F77_GLOBAL(cctrsm,CCTRSM)
 #define F77_zgemm 		F77_GLOBAL(czgemm,CZGEMM)
+#define F77_zgemmtr 		F77_GLOBAL(czgemmtr,CZGEMMTR)
 #define F77_zsymm 		F77_GLOBAL(czsymm,CZSYMM)
 #define F77_zsyrk 		F77_GLOBAL(czsyrk,CZSYRK)
 #define F77_zsyr2k 		F77_GLOBAL(czsyr2k,CZSYR2K)
diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt
index 266b1794e5..87bc076867 100644
--- a/CBLAS/src/CMakeLists.txt
+++ b/CBLAS/src/CMakeLists.txt
@@ -16,25 +16,29 @@ set(SLEV1 cblas_srotg.c cblas_srotmg.c cblas_srot.c cblas_srotm.c
          cblas_sswap.c cblas_sscal.c  cblas_scopy.c cblas_saxpy.c
          cblas_sdot.c  cblas_sdsdot.c cblas_snrm2.c cblas_sasum.c
          cblas_isamax.c sdotsub.f sdsdotsub.f snrm2sub.f sasumsub.f
-         isamaxsub.f)
+         isamaxsub.f cblas_saxpby.c)
 
 # Files for level 1 double precision real
 set(DLEV1 cblas_drotg.c cblas_drotmg.c cblas_drot.c cblas_drotm.c
          cblas_dswap.c cblas_dscal.c  cblas_dcopy.c cblas_daxpy.c
          cblas_ddot.c  cblas_dsdot.c cblas_dnrm2.c cblas_dasum.c
          cblas_idamax.c ddotsub.f dsdotsub.f dnrm2sub.f
-         dasumsub.f idamaxsub.f)
+         dasumsub.f idamaxsub.f cblas_daxpby.c)
 
 # Files for level 1 single precision complex
-set(CLEV1 cblas_cswap.c cblas_cscal.c cblas_csscal.c cblas_ccopy.c
+set(CLEV1 cblas_crotg.c cblas_csrot.c
+         cblas_cswap.c cblas_cscal.c cblas_csscal.c cblas_ccopy.c
          cblas_caxpy.c cblas_cdotu_sub.c cblas_cdotc_sub.c
-         cblas_icamax.c cdotcsub.f cdotusub.f icamaxsub.f)
+         cblas_icamax.c cdotcsub.f cdotusub.f icamaxsub.f
+         cblas_scabs1.c scabs1sub.f cblas_caxpby.c)
 
 # Files for level 1 double precision complex
-set(ZLEV1 cblas_zswap.c cblas_zscal.c cblas_zdscal.c cblas_zcopy.c
+set(ZLEV1 cblas_zrotg.c cblas_zdrot.c
+         cblas_zswap.c cblas_zscal.c cblas_zdscal.c cblas_zcopy.c
          cblas_zaxpy.c cblas_zdotu_sub.c cblas_zdotc_sub.c cblas_dznrm2.c
          cblas_dzasum.c cblas_izamax.c zdotcsub.f zdotusub.f
-         dzasumsub.f dznrm2sub.f izamaxsub.f)
+         dzasumsub.f dznrm2sub.f izamaxsub.f
+         cblas_dcabs1.c dcabs1sub.f cblas_zaxpby.c)
 
 # Common files for level 1 single precision
 set(SCLEV1 cblas_scasum.c scasumsub.f cblas_scnrm2.c scnrm2sub.f)
@@ -81,21 +85,21 @@ set(ZLEV2 cblas_zgemv.c cblas_zgbmv.c cblas_zhemv.c cblas_zhbmv.c cblas_zhpmv.c
 
 # Files for level 3 single precision real
 set(SLEV3 cblas_sgemm.c cblas_ssymm.c cblas_ssyrk.c cblas_ssyr2k.c cblas_strmm.c
-        cblas_strsm.c)
+        cblas_strsm.c cblas_sgemmtr.c)
 
 # Files for level 3 double precision real
 set(DLEV3 cblas_dgemm.c cblas_dsymm.c cblas_dsyrk.c cblas_dsyr2k.c cblas_dtrmm.c
-        cblas_dtrsm.c)
+        cblas_dtrsm.c cblas_dgemmtr.c)
 
 # Files for level 3 single precision complex
 set(CLEV3 cblas_cgemm.c cblas_csymm.c cblas_chemm.c cblas_cherk.c
         cblas_cher2k.c cblas_ctrmm.c cblas_ctrsm.c cblas_csyrk.c
-        cblas_csyr2k.c)
+        cblas_csyr2k.c cblas_cgemmtr.c)
 
 # Files for level 3 double precision complex
 set(ZLEV3 cblas_zgemm.c cblas_zsymm.c cblas_zhemm.c cblas_zherk.c
         cblas_zher2k.c cblas_ztrmm.c cblas_ztrsm.c cblas_zsyrk.c
-        cblas_zsyr2k.c)
+        cblas_zsyr2k.c cblas_zgemmtr.c)
 
 
 set(SOURCES)
@@ -113,19 +117,67 @@ if(BUILD_COMPLEX16)
 endif()
 list(REMOVE_DUPLICATES SOURCES)
 
-add_library(${CBLASLIB} ${SOURCES})
+add_library(${CBLASLIB}_obj OBJECT ${SOURCES})
+set_target_properties(${CBLASLIB}_obj PROPERTIES POSITION_INDEPENDENT_CODE ON)
+if(HAS_ATTRIBUTE_WEAK_SUPPORT)
+  target_compile_definitions(${CBLASLIB}_obj PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+endif()
+
+if(BUILD_INDEX64_EXT_API)
+  # 64bit Integer Interface
+  # Define list of C files
+  set(SOURCES_64_C)
+  list(APPEND SOURCES_64_C ${SOURCES})
+  list(FILTER SOURCES_64_C  EXCLUDE REGEX "\.f$")
+  list(REMOVE_ITEM SOURCES_64_C cblas_globals.c)
+  # Define list of Fortran files
+  set(SOURCES_64_F)
+  list(APPEND SOURCES_64_F ${SOURCES})
+  list(FILTER SOURCES_64_F  INCLUDE REGEX "\.f$")
+  # Copy files so we can set source property specific to /${CBLASLIB}_64_obj target
+  file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}_64_fobj)
+  file(COPY ${SOURCES_64_F} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}_64_fobj)
+  file(GLOB SOURCES_64_F ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}_64_fobj/*)
+  add_library(${CBLASLIB}_64_cobj OBJECT ${SOURCES_64_C})
+  add_library(${CBLASLIB}_64_fobj OBJECT ${SOURCES_64_F})
+  set_target_properties(${CBLASLIB}_64_cobj ${CBLASLIB}_64_fobj PROPERTIES
+          POSITION_INDEPENDENT_CODE ON
+          Fortran_PREPROCESS ON
+          LINKER_LANGUAGE C)
+  target_compile_options(${CBLASLIB}_64_cobj PRIVATE -DWeirdNEC -DCBLAS_API64)
+  target_compile_options(${CBLASLIB}_64_fobj PRIVATE ${FOPT_ILP64})
+  if(HAS_ATTRIBUTE_WEAK_SUPPORT)
+    target_compile_definitions(${CBLASLIB}_64_cobj PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+  endif()
+  #Add suffix to all Fortran functions via macros
+  foreach(F IN LISTS SOURCES_64_F)
+      set(COPT_64_F)
+      file(STRINGS ${F} ${F}.lst)
+      list(FILTER ${F}.lst INCLUDE REGEX "subroutine|external")
+      foreach(FUNC IN LISTS ${F}.lst)
+        string(REGEX REPLACE "[ ]*(subroutine|external)[ ]*" "" FUNC ${FUNC})
+        string(REGEX REPLACE "[(][a-zA-Z0-9, ]*[)]" "" FUNC ${FUNC})
+        list(APPEND COPT_64_F "-D${FUNC}=${FUNC}_64")
+      endforeach()
+      set_source_files_properties(${F} PROPERTIES COMPILE_OPTIONS "${COPT_64_F}")
+  endforeach()
+endif()
+
+add_library(${CBLASLIB}
+        $<TARGET_OBJECTS:${CBLASLIB}_obj>
+        $<$<BOOL:${BUILD_INDEX64_EXT_API}>: $<TARGET_OBJECTS:${CBLASLIB}_64_cobj>>
+        $<$<BOOL:${BUILD_INDEX64_EXT_API}>: $<TARGET_OBJECTS:${CBLASLIB}_64_fobj>>)
+
 set_target_properties(
   ${CBLASLIB} PROPERTIES
   LINKER_LANGUAGE C
   VERSION ${LAPACK_VERSION}
   SOVERSION ${LAPACK_MAJOR_VERSION}
+  POSITION_INDEPENDENT_CODE ON
   )
-if(HAS_ATTRIBUTE_WEAK_SUPPORT)
-  target_compile_definitions(${CBLASLIB} PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
-endif()
+
 target_include_directories(${CBLASLIB} PUBLIC
-  $<BUILD_INTERFACE:${LAPACK_BINARY_DIR}/../include>
   $<INSTALL_INTERFACE:include>
 )
-target_link_libraries(${CBLASLIB} PRIVATE ${BLAS_LIBRARIES})
+target_link_libraries(${CBLASLIB} PUBLIC ${BLAS_LIBRARIES})
 lapack_install_library(${CBLASLIB})
diff --git a/CBLAS/src/Makefile b/CBLAS/src/Makefile
index 7100568e4e..9583a08447 100644
--- a/CBLAS/src/Makefile
+++ b/CBLAS/src/Makefile
@@ -26,25 +26,29 @@ slev1 = cblas_srotg.o cblas_srotmg.o cblas_srot.o  cblas_srotm.o \
         cblas_sswap.o cblas_sscal.o  cblas_scopy.o cblas_saxpy.o \
         cblas_sdot.o  cblas_sdsdot.o cblas_snrm2.o cblas_sasum.o \
         cblas_isamax.o sdotsub.o sdsdotsub.o snrm2sub.o sasumsub.o \
-        isamaxsub.o
+        isamaxsub.o cblas_saxpby.o
 
 # Files for level 1 double precision real
 dlev1 = cblas_drotg.o cblas_drotmg.o cblas_drot.o  cblas_drotm.o \
         cblas_dswap.o cblas_dscal.o  cblas_dcopy.o cblas_daxpy.o \
         cblas_ddot.o  cblas_dsdot.o  cblas_dnrm2.o cblas_dasum.o \
         cblas_idamax.o ddotsub.o dsdotsub.o dnrm2sub.o \
-        dasumsub.o idamaxsub.o
+        dasumsub.o idamaxsub.o cblas_daxpby.o
 
 # Files for level 1 single precision complex
-clev1 = cblas_cswap.o cblas_cscal.o cblas_csscal.o cblas_ccopy.o \
+clev1 = cblas_crotg.o cblas_csrot.o \
+        cblas_cswap.o cblas_cscal.o cblas_csscal.o cblas_ccopy.o \
         cblas_caxpy.o cblas_cdotu_sub.o cblas_cdotc_sub.o \
-        cblas_icamax.o cdotcsub.o cdotusub.o icamaxsub.o
+        cblas_icamax.o cdotcsub.o cdotusub.o icamaxsub.o \
+        cblas_scabs1.o scabs1sub.o cblas_caxpby.o
 
 # Files for level 1 double precision complex
-zlev1 = cblas_zswap.o cblas_zscal.o cblas_zdscal.o cblas_zcopy.o \
+zlev1 = cblas_zrotg.o cblas_zdrot.o \
+        cblas_zswap.o cblas_zscal.o cblas_zdscal.o cblas_zcopy.o \
         cblas_zaxpy.o cblas_zdotu_sub.o cblas_zdotc_sub.o cblas_dznrm2.o \
         cblas_dzasum.o cblas_izamax.o zdotcsub.o zdotusub.o \
-        dzasumsub.o dznrm2sub.o izamaxsub.o
+        dzasumsub.o dznrm2sub.o izamaxsub.o \
+        cblas_dcabs1.o dcabs1sub.o cblas_zaxpby.o
 
 # Common files for level 1 single precision
 sclev1 = cblas_scasum.o scasumsub.o cblas_scnrm2.o scnrm2sub.o
@@ -133,21 +137,21 @@ zlib2: $(zlev2) $(errhand)
 
 # Files for level 3 single precision real
 slev3 = cblas_sgemm.o cblas_ssymm.o cblas_ssyrk.o cblas_ssyr2k.o cblas_strmm.o \
-        cblas_strsm.o
+        cblas_strsm.o cblas_sgemmtr.o
 
 # Files for level 3 double precision real
 dlev3 = cblas_dgemm.o cblas_dsymm.o cblas_dsyrk.o cblas_dsyr2k.o cblas_dtrmm.o \
-        cblas_dtrsm.o
+        cblas_dtrsm.o cblas_dgemmtr.o
 
 # Files for level 3 single precision complex
 clev3 = cblas_cgemm.o cblas_csymm.o cblas_chemm.o cblas_cherk.o \
         cblas_cher2k.o cblas_ctrmm.o cblas_ctrsm.o cblas_csyrk.o \
-        cblas_csyr2k.o
+        cblas_csyr2k.o cblas_cgemmtr.o
 
 # Files for level 3 double precision complex
 zlev3 = cblas_zgemm.o cblas_zsymm.o cblas_zhemm.o cblas_zherk.o \
         cblas_zher2k.o cblas_ztrmm.o cblas_ztrsm.o cblas_zsyrk.o \
-        cblas_zsyr2k.o
+        cblas_zsyr2k.o cblas_zgemmtr.o
 
 .PHONY: slib3 dlib3 clib3 zlib3
 # Single precision real
diff --git a/CBLAS/src/cblas_caxpby.c b/CBLAS/src/cblas_caxpby.c
new file mode 100644
index 0000000000..997ba3c952
--- /dev/null
+++ b/CBLAS/src/cblas_caxpby.c
@@ -0,0 +1,22 @@
+/*
+ * cblas_caxpby.c
+ *
+ * The program is a C interface to caxpby.
+ *
+ * Written by Martin Koehler.  08/26/2024
+ *
+ */
+#include "cblas.h"
+#include "cblas_f77.h"
+void API_SUFFIX(cblas_caxpby)( const CBLAS_INT N, const void *alpha, const void *X,
+                       const CBLAS_INT incX, const void *beta, void *Y, const CBLAS_INT incY)
+{
+#ifdef F77_INT
+   F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;
+#else
+   #define F77_N N
+   #define F77_incX incX
+   #define F77_incY incY
+#endif
+   F77_caxpby( &F77_N, alpha, X, &F77_incX, beta, Y, &F77_incY);
+}
diff --git a/CBLAS/src/cblas_caxpy.c b/CBLAS/src/cblas_caxpy.c
index d4288f7423..f38ee4cb62 100644
--- a/CBLAS/src/cblas_caxpy.c
+++ b/CBLAS/src/cblas_caxpy.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_caxpy( const CBLAS_INT N, const void *alpha, const void *X,
+void API_SUFFIX(cblas_caxpy)( const CBLAS_INT N, const void *alpha, const void *X,
                        const CBLAS_INT incX, void *Y, const CBLAS_INT incY)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_ccopy.c b/CBLAS/src/cblas_ccopy.c
index cae561ae3d..04ee03f860 100644
--- a/CBLAS/src/cblas_ccopy.c
+++ b/CBLAS/src/cblas_ccopy.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ccopy( const CBLAS_INT N, const void *X,
+void API_SUFFIX(cblas_ccopy)( const CBLAS_INT N, const void *X,
                       const CBLAS_INT incX, void *Y, const CBLAS_INT incY)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_cdotc_sub.c b/CBLAS/src/cblas_cdotc_sub.c
index 81520ebd18..cd7958bda0 100644
--- a/CBLAS/src/cblas_cdotc_sub.c
+++ b/CBLAS/src/cblas_cdotc_sub.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_cdotc_sub( const CBLAS_INT N, const void *X, const CBLAS_INT incX,
+void API_SUFFIX(cblas_cdotc_sub)( const CBLAS_INT N, const void *X, const CBLAS_INT incX,
                       const void *Y, const CBLAS_INT incY, void *dotc)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_cdotu_sub.c b/CBLAS/src/cblas_cdotu_sub.c
index 0f7ded90b9..e513fed057 100644
--- a/CBLAS/src/cblas_cdotu_sub.c
+++ b/CBLAS/src/cblas_cdotu_sub.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_cdotu_sub( const CBLAS_INT N, const void *X, const CBLAS_INT incX,
+void API_SUFFIX(cblas_cdotu_sub)( const CBLAS_INT N, const void *X, const CBLAS_INT incX,
 		      const void *Y, const CBLAS_INT incY, void *dotu)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_cgbmv.c b/CBLAS/src/cblas_cgbmv.c
index c2d9b212f7..776fcbc7eb 100644
--- a/CBLAS/src/cblas_cgbmv.c
+++ b/CBLAS/src/cblas_cgbmv.c
@@ -7,9 +7,11 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_cgbmv(const CBLAS_LAYOUT layout,
+void API_SUFFIX(cblas_cgbmv)(const CBLAS_LAYOUT layout,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_INT M, const CBLAS_INT N,
                  const CBLAS_INT KL, const CBLAS_INT KU,
                  const void *alpha, const void  *A, const CBLAS_INT lda,
@@ -26,6 +28,7 @@ void cblas_cgbmv(const CBLAS_LAYOUT layout,
    F77_INT F77_M=M, F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY;
    F77_INT F77_KL=KL,F77_KU=KU;
 #else
+   CBLAS_INT incx=incX;
    #define F77_M M
    #define F77_N N
    #define F77_lda lda
@@ -34,15 +37,19 @@ void cblas_cgbmv(const CBLAS_LAYOUT layout,
    #define F77_incX incx
    #define F77_incY incY
 #endif
-   CBLAS_INT n=0, i=0, incx=incX;
-   const float *xx= (float *)X, *alp= (float *)alpha, *bet = (float *)beta;
+   CBLAS_INT n=0, i=0;
+   const float *xx= (const float *)X, *alp= (const float *)alpha, *bet = (const float *)beta;
    float ALPHA[2],BETA[2];
    CBLAS_INT tincY, tincx;
-   float *x=(float *)X, *y=(float *)Y, *st=0, *tx=0;
+   float *x, *y, *st=0, *tx=0;
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+    memcpy(&x, &X, sizeof(float*));
+    memcpy(&y, &Y, sizeof(float*));
+
+
    CBLAS_CallFromC = 1;
    if (layout == CblasColMajor)
    {
@@ -51,7 +58,7 @@ void cblas_cgbmv(const CBLAS_LAYOUT layout,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(2, "cblas_cgbmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_cgbmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -125,13 +132,13 @@ void cblas_cgbmv(const CBLAS_LAYOUT layout,
                y -= n;
             }
          }
-         else x = (float *) X;
+         else memcpy(&x, &X, sizeof(float*));
 
 
       }
       else
       {
-         cblas_xerbla(2, "cblas_cgbmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_cgbmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -159,7 +166,7 @@ void cblas_cgbmv(const CBLAS_LAYOUT layout,
          }
       }
    }
-   else cblas_xerbla(1, "cblas_cgbmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_cgbmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
 }
diff --git a/CBLAS/src/cblas_cgemm.c b/CBLAS/src/cblas_cgemm.c
index 0ad99267d2..fe4b599a19 100644
--- a/CBLAS/src/cblas_cgemm.c
+++ b/CBLAS/src/cblas_cgemm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_cgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
+void API_SUFFIX(cblas_cgemm)(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
                  const CBLAS_TRANSPOSE TransB, const CBLAS_INT M, const CBLAS_INT N,
                  const CBLAS_INT K, const void *alpha, const void  *A,
                  const CBLAS_INT lda, const void  *B, const CBLAS_INT ldb,
@@ -47,7 +47,7 @@ void cblas_cgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(2, "cblas_cgemm", "Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_cgemm", "Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -58,7 +58,7 @@ void cblas_cgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       else if ( TransB == CblasNoTrans )   TB='N';
       else
       {
-         cblas_xerbla(3, "cblas_cgemm", "Illegal TransB setting, %d\n", TransB);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_cgemm", "Illegal TransB setting, %d\n", TransB);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -79,7 +79,7 @@ void cblas_cgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       else if ( TransA == CblasNoTrans )   TB='N';
       else
       {
-         cblas_xerbla(2, "cblas_cgemm", "Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_cgemm", "Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -89,7 +89,7 @@ void cblas_cgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       else if ( TransB == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(2, "cblas_cgemm", "Illegal TransB setting, %d\n", TransB);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_cgemm", "Illegal TransB setting, %d\n", TransB);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -102,7 +102,7 @@ void cblas_cgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       F77_cgemm(F77_TA, F77_TB, &F77_N, &F77_M, &F77_K, alpha, B,
                   &F77_ldb, A, &F77_lda, beta, C, &F77_ldc);
    }
-   else cblas_xerbla(1, "cblas_cgemm", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_cgemm", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_cgemmtr.c b/CBLAS/src/cblas_cgemmtr.c
new file mode 100644
index 0000000000..5717dc4097
--- /dev/null
+++ b/CBLAS/src/cblas_cgemmtr.c
@@ -0,0 +1,134 @@
+/*
+ *
+ * cblas_cgemmtr.c
+ * This program is a C interface to cgemmtr.
+ * Written by Martin Koehler, MPI Magdeburg
+ * 06/24/2024
+ *
+ */
+
+#include "cblas.h"
+#include "cblas_f77.h"
+void API_SUFFIX(cblas_cgemmtr)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo, const CBLAS_TRANSPOSE TransA,
+        const CBLAS_TRANSPOSE TransB, const CBLAS_INT N,
+        const CBLAS_INT K, const void *alpha, const void  *A,
+        const CBLAS_INT lda, const void  *B, const CBLAS_INT ldb,
+        const void *beta, void  *C, const CBLAS_INT ldc)
+{
+    char TA, TB;
+    char UL;
+#ifdef F77_CHAR
+    F77_CHAR F77_TA, F77_TB, F77_UL;
+#else
+#define F77_TA &TA
+#define F77_TB &TB
+#define F77_UL &UL
+#endif
+
+#ifdef F77_INT
+    F77_INT F77_N=N, F77_K=K, F77_lda=lda, F77_ldb=ldb;
+    F77_INT F77_ldc=ldc;
+#else
+#define F77_N N
+#define F77_K K
+#define F77_lda lda
+#define F77_ldb ldb
+#define F77_ldc ldc
+#endif
+
+    extern int CBLAS_CallFromC;
+    extern int RowMajorStrg;
+    RowMajorStrg = 0;
+    CBLAS_CallFromC = 1;
+
+
+    if( layout == CblasColMajor )
+    {
+        if ( Uplo == CblasUpper ) UL = 'U';
+        else if (Uplo == CblasLower) UL= 'L';
+        else {
+            API_SUFFIX(cblas_xerbla)(2, "cblas_cgemmtr", "Illegal Uplo setting, %d\n", Uplo);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+
+        if(TransA == CblasTrans) TA='T';
+        else if ( TransA == CblasConjTrans ) TA='C';
+        else if ( TransA == CblasNoTrans )   TA='N';
+        else
+        {
+            API_SUFFIX(cblas_xerbla)(3, "cblas_cgemmtr", "Illegal TransA setting, %d\n", TransA);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+
+        if(TransB == CblasTrans) TB='T';
+        else if ( TransB == CblasConjTrans ) TB='C';
+        else if ( TransB == CblasNoTrans )   TB='N';
+        else
+        {
+            API_SUFFIX(cblas_xerbla)(4, "cblas_cgemmtr", "Illegal TransB setting, %d\n", TransB);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+
+#ifdef F77_CHAR
+        F77_TA = C2F_CHAR(&TA);
+        F77_TB = C2F_CHAR(&TB);
+        F77_UL = C2F_CHAR(&UL);
+#endif
+
+        F77_cgemmtr(F77_UL, F77_TA, F77_TB, &F77_N, &F77_K, alpha, A,
+                &F77_lda, B, &F77_ldb, beta, C, &F77_ldc);
+    }
+    else if (layout == CblasRowMajor)
+    {
+        RowMajorStrg = 1;
+
+        if ( Uplo == CblasUpper ) UL = 'L';
+        else if (Uplo == CblasLower) UL= 'U';
+        else {
+            API_SUFFIX(cblas_xerbla)(2, "cblas_cgemmtr", "Illegal Uplo setting, %d\n", Uplo);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+
+        if(TransA == CblasTrans) TB='T';
+        else if ( TransA == CblasConjTrans ) TB='C';
+        else if ( TransA == CblasNoTrans )   TB='N';
+        else
+        {
+            API_SUFFIX(cblas_xerbla)(3, "cblas_cgemmtr", "Illegal TransA setting, %d\n", TransA);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+        if(TransB == CblasTrans) TA='T';
+        else if ( TransB == CblasConjTrans ) TA='C';
+        else if ( TransB == CblasNoTrans )   TA='N';
+        else
+        {
+            API_SUFFIX(cblas_xerbla)(4, "cblas_cgemmtr", "Illegal TransB setting, %d\n", TransB);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+#ifdef F77_CHAR
+        F77_TA = C2F_CHAR(&TA);
+        F77_TB = C2F_CHAR(&TB);
+        F77_UL = C2F_CHAR(&UL);
+
+#endif
+
+        F77_cgemmtr(F77_UL, F77_TA, F77_TB, &F77_N, &F77_K, alpha, B,
+                &F77_ldb, A, &F77_lda, beta, C, &F77_ldc);
+    }
+    else API_SUFFIX(cblas_xerbla)(1, "cblas_cgemmtr", "Illegal layout setting, %d\n", layout);
+    CBLAS_CallFromC = 0;
+    RowMajorStrg = 0;
+    return;
+}
diff --git a/CBLAS/src/cblas_cgemv.c b/CBLAS/src/cblas_cgemv.c
index 1147242707..a9a27f4562 100644
--- a/CBLAS/src/cblas_cgemv.c
+++ b/CBLAS/src/cblas_cgemv.c
@@ -7,9 +7,10 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_cgemv(const CBLAS_LAYOUT layout,
+void API_SUFFIX(cblas_cgemv)(const CBLAS_LAYOUT layout,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_INT M, const CBLAS_INT N,
                  const void *alpha, const void  *A, const CBLAS_INT lda,
                  const void  *X, const CBLAS_INT incX, const void *beta,
@@ -31,18 +32,22 @@ void cblas_cgemv(const CBLAS_LAYOUT layout,
    #define F77_incY incY
 #endif
 
-   CBLAS_INT n=0, i=0, incx=incX;
+   CBLAS_INT n=0, i=0;
    const float *xx= (const float *)X;
    float ALPHA[2],BETA[2];
    CBLAS_INT tincY, tincx;
-   float *x=(float *)X, *y=(float *)Y, *st=0, *tx=0;
-   const float *stx = x;
+   float *x, *y, *st=0, *tx=0;
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
    CBLAS_CallFromC = 1;
 
+   memcpy(&x, &X, sizeof(float *));
+   memcpy(&y, &Y, sizeof(float *));
+
+   const float *stx = x;
+
    if (layout == CblasColMajor)
    {
       if (TransA == CblasNoTrans) TA = 'N';
@@ -50,7 +55,7 @@ void cblas_cgemv(const CBLAS_LAYOUT layout,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(2, "cblas_cgemv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_cgemv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -126,7 +131,7 @@ void cblas_cgemv(const CBLAS_LAYOUT layout,
       }
       else
       {
-         cblas_xerbla(2, "cblas_cgemv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_cgemv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -155,7 +160,7 @@ void cblas_cgemv(const CBLAS_LAYOUT layout,
          }
       }
    }
-   else cblas_xerbla(1, "cblas_cgemv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_cgemv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_cgerc.c b/CBLAS/src/cblas_cgerc.c
index a558417e64..f9e4af33cc 100644
--- a/CBLAS/src/cblas_cgerc.c
+++ b/CBLAS/src/cblas_cgerc.c
@@ -7,15 +7,18 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_cgerc(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N,
+void API_SUFFIX(cblas_cgerc)(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N,
                  const void *alpha, const void *X, const CBLAS_INT incX,
                  const void *Y, const CBLAS_INT incY, void *A, const CBLAS_INT lda)
 {
 #ifdef F77_INT
    F77_INT F77_M=M, F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY;
 #else
+   CBLAS_INT incy = incY;
    #define F77_M M
    #define F77_N N
    #define F77_incX incX
@@ -23,8 +26,10 @@ void cblas_cgerc(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N
    #define F77_lda lda
 #endif
 
-   CBLAS_INT n, i, tincy, incy=incY;
-   float *y=(float *)Y, *yy=(float *)Y, *ty, *st;
+   CBLAS_INT n, i, tincy;
+   float *y, *yy, *ty, *st;
+   memcpy(&y,&Y,sizeof(float*));
+   memcpy(&yy,&Y,sizeof(float*));
 
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
@@ -70,14 +75,15 @@ void cblas_cgerc(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N
             incy = 1;
          #endif
       }
-      else y = (float *) Y;
+      else
+        memcpy(&y,&Y,sizeof(float*));
 
       F77_cgeru( &F77_N, &F77_M, alpha, y, &F77_incY, X, &F77_incX, A,
                       &F77_lda);
       if(Y!=y)
          free(y);
 
-   } else cblas_xerbla(1, "cblas_cgerc", "Illegal layout setting, %d\n", layout);
+   } else API_SUFFIX(cblas_xerbla)(1, "cblas_cgerc", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_cgeru.c b/CBLAS/src/cblas_cgeru.c
index 6cca83e6fc..ea5b74bc4a 100644
--- a/CBLAS/src/cblas_cgeru.c
+++ b/CBLAS/src/cblas_cgeru.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_cgeru(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N,
+void API_SUFFIX(cblas_cgeru)(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N,
                  const void *alpha, const void *X, const CBLAS_INT incX,
                  const void *Y, const CBLAS_INT incY, void *A, const CBLAS_INT lda)
 {
@@ -38,7 +38,7 @@ void cblas_cgeru(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N
       F77_cgeru( &F77_N, &F77_M, alpha, Y, &F77_incY, X, &F77_incX, A,
                       &F77_lda);
    }
-   else cblas_xerbla(1, "cblas_cgeru","Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_cgeru","Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_chbmv.c b/CBLAS/src/cblas_chbmv.c
index 13e3920ee7..5fab2022cd 100644
--- a/CBLAS/src/cblas_chbmv.c
+++ b/CBLAS/src/cblas_chbmv.c
@@ -9,7 +9,8 @@
 #include "cblas_f77.h"
 #include <stdio.h>
 #include <stdlib.h>
-void cblas_chbmv(const CBLAS_LAYOUT layout,
+#include <string.h>
+void API_SUFFIX(cblas_chbmv)(const CBLAS_LAYOUT layout,
                  const CBLAS_UPLO Uplo,const CBLAS_INT N,const CBLAS_INT K,
                  const void *alpha, const void  *A, const CBLAS_INT lda,
                  const void  *X, const CBLAS_INT incX, const void *beta,
@@ -24,21 +25,25 @@ void cblas_chbmv(const CBLAS_LAYOUT layout,
 #ifdef F77_INT
    F77_INT F77_N=N, F77_K=K, F77_lda=lda, F77_incX=incX, F77_incY=incY;
 #else
+   CBLAS_INT incx = incX;
    #define F77_N N
    #define F77_K K
    #define F77_lda lda
    #define F77_incX incx
    #define F77_incY incY
 #endif
-   CBLAS_INT n, i=0, incx=incX;
-   const float *xx= (float *)X, *alp= (float *)alpha, *bet = (float *)beta;
+   CBLAS_INT n, i=0;
+   const float *xx= (const float *)X, *alp= (const float *)alpha, *bet = (const float *)beta;
    float ALPHA[2],BETA[2];
    CBLAS_INT tincY, tincx;
-   float *x=(float *)X, *y=(float *)Y, *st=0, *tx;
+   float *x, *y, *st=0, *tx;
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+   memcpy(&x, &X, sizeof(float*));
+   memcpy(&y, &Y, sizeof(float*));
+
    CBLAS_CallFromC = 1;
    if (layout == CblasColMajor)
    {
@@ -46,7 +51,7 @@ void cblas_chbmv(const CBLAS_LAYOUT layout,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_chbmv","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_chbmv","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -114,13 +119,13 @@ void cblas_chbmv(const CBLAS_LAYOUT layout,
          } while(y != st);
          y -= n;
       }  else
-         x = (float *) X;
+         memcpy(&x, &X, sizeof(float*));
 
       if (Uplo == CblasUpper) UL = 'L';
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_chbmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_chbmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -133,7 +138,7 @@ void cblas_chbmv(const CBLAS_LAYOUT layout,
    }
    else
    {
-      cblas_xerbla(1, "cblas_chbmv","Illegal layout setting, %d\n", layout);
+      API_SUFFIX(cblas_xerbla)(1, "cblas_chbmv","Illegal layout setting, %d\n", layout);
       CBLAS_CallFromC = 0;
       RowMajorStrg = 0;
       return;
diff --git a/CBLAS/src/cblas_chemm.c b/CBLAS/src/cblas_chemm.c
index 9ccb18a3af..4dd7b5c1ad 100644
--- a/CBLAS/src/cblas_chemm.c
+++ b/CBLAS/src/cblas_chemm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_chemm(const CBLAS_LAYOUT layout, const  CBLAS_SIDE Side,
+void API_SUFFIX(cblas_chemm)(const CBLAS_LAYOUT layout, const  CBLAS_SIDE Side,
                  const CBLAS_UPLO Uplo, const CBLAS_INT M, const CBLAS_INT N,
                  const void *alpha, const void *A, const CBLAS_INT lda,
                  const void *B, const CBLAS_INT ldb, const void *beta,
@@ -45,7 +45,7 @@ void cblas_chemm(const CBLAS_LAYOUT layout, const  CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='L';
       else
       {
-         cblas_xerbla(2, "cblas_chemm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_chemm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -55,7 +55,7 @@ void cblas_chemm(const CBLAS_LAYOUT layout, const  CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(3, "cblas_chemm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_chemm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -75,7 +75,7 @@ void cblas_chemm(const CBLAS_LAYOUT layout, const  CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='R';
       else
       {
-         cblas_xerbla(2, "cblas_chemm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_chemm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -85,7 +85,7 @@ void cblas_chemm(const CBLAS_LAYOUT layout, const  CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_chemm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_chemm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -99,7 +99,7 @@ void cblas_chemm(const CBLAS_LAYOUT layout, const  CBLAS_SIDE Side,
       F77_chemm(F77_SD, F77_UL, &F77_N, &F77_M, alpha, A,
                  &F77_lda, B, &F77_ldb, beta, C, &F77_ldc);
    }
-   else  cblas_xerbla(1, "cblas_chemm", "Illegal layout setting, %d\n", layout);
+   else  API_SUFFIX(cblas_xerbla)(1, "cblas_chemm", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_chemv.c b/CBLAS/src/cblas_chemv.c
index 8c4eadf101..fd092be66c 100644
--- a/CBLAS/src/cblas_chemv.c
+++ b/CBLAS/src/cblas_chemv.c
@@ -7,9 +7,11 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_chemv(const CBLAS_LAYOUT layout,
+void API_SUFFIX(cblas_chemv)(const CBLAS_LAYOUT layout,
                  const CBLAS_UPLO Uplo, const CBLAS_INT N,
                  const void *alpha, const void *A, const CBLAS_INT lda,
                  const void *X, const CBLAS_INT incX, const void *beta,
@@ -24,20 +26,24 @@ void cblas_chemv(const CBLAS_LAYOUT layout,
 #ifdef F77_INT
    F77_INT F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY;
 #else
+   CBLAS_INT incx = incX;
    #define F77_N N
    #define F77_lda lda
    #define F77_incX incx
    #define F77_incY incY
 #endif
-   CBLAS_INT n=0, i=0, incx=incX;
-   const float *xx= (float *)X, *alp= (float *)alpha, *bet = (float *)beta;
+   CBLAS_INT n=0, i=0;
+   const float *xx= (const float *)X, *alp= (const float *)alpha, *bet = (const float *)beta;
    float ALPHA[2],BETA[2];
    CBLAS_INT tincY, tincx;
-   float *x=(float *)X, *y=(float *)Y, *st=0, *tx;
+   float *x, *y, *st=0, *tx;
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+   memcpy(&x, &X, sizeof(float*));
+   memcpy(&y, &Y, sizeof(float*));
+
 
    CBLAS_CallFromC = 1;
    if (layout == CblasColMajor)
@@ -46,7 +52,7 @@ void cblas_chemv(const CBLAS_LAYOUT layout,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_chemv","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_chemv","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -114,14 +120,14 @@ void cblas_chemv(const CBLAS_LAYOUT layout,
          } while(y != st);
          y -= n;
       }  else
-         x = (float *) X;
+         memcpy(&x, &X, sizeof(float*));
 
 
       if (Uplo == CblasUpper) UL = 'L';
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_chemv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_chemv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -134,7 +140,7 @@ void cblas_chemv(const CBLAS_LAYOUT layout,
    }
    else
    {
-      cblas_xerbla(1, "cblas_chemv","Illegal layout setting, %d\n", layout);
+      API_SUFFIX(cblas_xerbla)(1, "cblas_chemv","Illegal layout setting, %d\n", layout);
       CBLAS_CallFromC = 0;
       RowMajorStrg = 0;
       return;
diff --git a/CBLAS/src/cblas_cher.c b/CBLAS/src/cblas_cher.c
index d1cb2068b7..a5da13ba05 100644
--- a/CBLAS/src/cblas_cher.c
+++ b/CBLAS/src/cblas_cher.c
@@ -7,9 +7,10 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_cher(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_cher)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                 const CBLAS_INT N, const float alpha, const void *X, const CBLAS_INT incX
                 ,void *A, const CBLAS_INT lda)
 {
@@ -23,17 +24,22 @@ void cblas_cher(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
 #ifdef F77_INT
    F77_INT F77_N=N, F77_lda=lda, F77_incX=incX;
 #else
+   CBLAS_INT incx;
    #define F77_N N
    #define F77_lda lda
    #define F77_incX incx
 #endif
-   CBLAS_INT n, i, tincx, incx=incX;
-   float *x=(float *)X, *xx=(float *)X, *tx, *st;
+   CBLAS_INT n, i, tincx;
+   float *x, *xx, *tx, *st;
 
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+   memcpy(&x,&X,sizeof(float*));
+   memcpy(&xx,&X,sizeof(float*));
+
+
    CBLAS_CallFromC = 1;
    if (layout == CblasColMajor)
    {
@@ -41,7 +47,7 @@ void cblas_cher(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_cher","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_cher","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -59,7 +65,7 @@ void cblas_cher(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_cher","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_cher","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -98,11 +104,13 @@ void cblas_cher(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
            incx = 1;
          #endif
       }
-      else x = (float *) X;
+      else
+        memcpy(&x,&X,sizeof(float*));
+
       F77_cher(F77_UL, &F77_N, &alpha, x, &F77_incX, A, &F77_lda);
    } else
    {
-      cblas_xerbla(1, "cblas_cher","Illegal layout setting, %d\n", layout);
+      API_SUFFIX(cblas_xerbla)(1, "cblas_cher","Illegal layout setting, %d\n", layout);
       CBLAS_CallFromC = 0;
       RowMajorStrg = 0;
       return;
diff --git a/CBLAS/src/cblas_cher2.c b/CBLAS/src/cblas_cher2.c
index ff03216d74..f66c93e3d1 100644
--- a/CBLAS/src/cblas_cher2.c
+++ b/CBLAS/src/cblas_cher2.c
@@ -7,9 +7,10 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_cher2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_cher2)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_INT N, const void *alpha, const void *X, const CBLAS_INT incX,
                  const void *Y, const CBLAS_INT incY, void *A, const CBLAS_INT lda)
 {
@@ -23,19 +24,25 @@ void cblas_cher2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
 #ifdef F77_INT
    F77_INT F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY;
 #else
+   CBLAS_INT incx = incX, incy = incY;
    #define F77_N N
    #define F77_lda lda
    #define F77_incX incx
    #define F77_incY incy
 #endif
-   CBLAS_INT n, i, j, tincx, tincy, incx=incX, incy=incY;
-   float *x=(float *)X, *xx=(float *)X, *y=(float *)Y,
-         *yy=(float *)Y, *tx, *ty, *stx, *sty;
+   CBLAS_INT n, i, j, tincx, tincy;
+   float *x, *xx, *y,
+         *yy, *tx, *ty, *stx, *sty;
 
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+   memcpy(&x,&X,sizeof(float*));
+   memcpy(&xx,&X,sizeof(float*));
+   memcpy(&y,&Y,sizeof(float*));
+   memcpy(&yy,&Y,sizeof(float*));
+
    CBLAS_CallFromC = 1;
    if (layout == CblasColMajor)
    {
@@ -43,7 +50,7 @@ void cblas_cher2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_cher2","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_cher2","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -62,7 +69,7 @@ void cblas_cher2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_cher2","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_cher2","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -129,14 +136,14 @@ void cblas_cher2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          #endif
       }  else
       {
-         x = (float *) X;
-         y = (float *) Y;
+         memcpy(&x,&X,sizeof(float*));
+         memcpy(&y,&Y,sizeof(float*));
       }
       F77_cher2(F77_UL, &F77_N, alpha, y, &F77_incY, x,
                                       &F77_incX, A, &F77_lda);
    } else
    {
-      cblas_xerbla(1, "cblas_cher2","Illegal layout setting, %d\n", layout);
+      API_SUFFIX(cblas_xerbla)(1, "cblas_cher2","Illegal layout setting, %d\n", layout);
       CBLAS_CallFromC = 0;
       RowMajorStrg = 0;
       return;
diff --git a/CBLAS/src/cblas_cher2k.c b/CBLAS/src/cblas_cher2k.c
index a1452a9efe..a4e24abfa1 100644
--- a/CBLAS/src/cblas_cher2k.c
+++ b/CBLAS/src/cblas_cher2k.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_cher2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_cher2k)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                   const CBLAS_TRANSPOSE Trans, const CBLAS_INT N, const CBLAS_INT K,
                   const void *alpha, const void *A, const CBLAS_INT lda,
                   const void *B, const CBLAS_INT ldb, const float beta,
@@ -37,7 +37,7 @@ void cblas_cher2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    float ALPHA[2];
-   const float *alp=(float *)alpha;
+   const float *alp=(const float *)alpha;
 
    CBLAS_CallFromC = 1;
    RowMajorStrg = 0;
@@ -49,7 +49,7 @@ void cblas_cher2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(2, "cblas_cher2k", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_cher2k", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -60,7 +60,7 @@ void cblas_cher2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='N';
       else
       {
-         cblas_xerbla(3, "cblas_cher2k", "Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_cher2k", "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -80,7 +80,7 @@ void cblas_cher2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(2, "cblas_cher2k", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_cher2k", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -90,7 +90,7 @@ void cblas_cher2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='C';
       else
       {
-         cblas_xerbla(3, "cblas_cher2k", "Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_cher2k", "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -104,7 +104,7 @@ void cblas_cher2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       ALPHA[1]= -alp[1];
       F77_cher2k(F77_UL,F77_TR, &F77_N, &F77_K, ALPHA, A, &F77_lda, B, &F77_ldb, &beta, C, &F77_ldc);
    }
-   else  cblas_xerbla(1, "cblas_cher2k", "Illegal layout setting, %d\n", layout);
+   else  API_SUFFIX(cblas_xerbla)(1, "cblas_cher2k", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_cherk.c b/CBLAS/src/cblas_cherk.c
index 0395408dc8..4ac61bab26 100644
--- a/CBLAS/src/cblas_cherk.c
+++ b/CBLAS/src/cblas_cherk.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_cherk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_cherk)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE Trans, const CBLAS_INT N, const CBLAS_INT K,
                  const float alpha, const void *A, const CBLAS_INT lda,
                  const float beta, void *C, const CBLAS_INT ldc)
@@ -43,7 +43,7 @@ void cblas_cherk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(2, "cblas_cherk", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_cherk", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -54,7 +54,7 @@ void cblas_cherk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='N';
       else
       {
-         cblas_xerbla(3, "cblas_cherk", "Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_cherk", "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -74,7 +74,7 @@ void cblas_cherk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_cherk", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_cherk", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -84,7 +84,7 @@ void cblas_cherk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='C';
       else
       {
-         cblas_xerbla(3, "cblas_cherk", "Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_cherk", "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -98,7 +98,7 @@ void cblas_cherk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       F77_cherk(F77_UL, F77_TR, &F77_N, &F77_K, &alpha, A, &F77_lda,
                 &beta, C, &F77_ldc);
    }
-   else  cblas_xerbla(1, "cblas_cherk", "Illegal layout setting, %d\n", layout);
+   else  API_SUFFIX(cblas_xerbla)(1, "cblas_cherk", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_chpmv.c b/CBLAS/src/cblas_chpmv.c
index f30dafc1bf..6c8e829dea 100644
--- a/CBLAS/src/cblas_chpmv.c
+++ b/CBLAS/src/cblas_chpmv.c
@@ -7,9 +7,11 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_chpmv(const CBLAS_LAYOUT layout,
+void API_SUFFIX(cblas_chpmv)(const CBLAS_LAYOUT layout,
                  const CBLAS_UPLO Uplo,const CBLAS_INT N,
                  const void *alpha, const void  *AP,
                  const void  *X, const CBLAS_INT incX, const void *beta,
@@ -24,19 +26,24 @@ void cblas_chpmv(const CBLAS_LAYOUT layout,
 #ifdef F77_INT
    F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;
 #else
+   CBLAS_INT incx = incX;
    #define F77_N N
    #define F77_incX incx
    #define F77_incY incY
 #endif
-   CBLAS_INT n, i=0, incx=incX;
-   const float *xx= (float *)X, *alp= (float *)alpha, *bet = (float *)beta;
+   CBLAS_INT n, i=0;
+   const float *xx= (const float *)X, *alp= (const float *)alpha, *bet = (const float *)beta;
    float ALPHA[2],BETA[2];
    CBLAS_INT tincY, tincx;
-   float *x=(float *)X, *y=(float *)Y, *st=0, *tx;
+   float *x, *y, *st=0, *tx;
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+   memcpy(&x,&X,sizeof(float*));
+   memcpy(&y,&Y,sizeof(float*));
+
+
    CBLAS_CallFromC = 1;
    if (layout == CblasColMajor)
    {
@@ -44,7 +51,7 @@ void cblas_chpmv(const CBLAS_LAYOUT layout,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_chpmv","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_chpmv","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -112,14 +119,13 @@ void cblas_chpmv(const CBLAS_LAYOUT layout,
          } while(y != st);
          y -= n;
       }  else
-         x = (float *) X;
-
+         memcpy(&x,&X,sizeof(float*));
 
       if (Uplo == CblasUpper) UL = 'L';
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_chpmv","Illegal Uplo setting, %d\n", Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_chpmv","Illegal Uplo setting, %d\n", Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -133,7 +139,7 @@ void cblas_chpmv(const CBLAS_LAYOUT layout,
    }
    else
    {
-      cblas_xerbla(1, "cblas_chpmv","Illegal layout setting, %d\n", layout);
+      API_SUFFIX(cblas_xerbla)(1, "cblas_chpmv","Illegal layout setting, %d\n", layout);
       CBLAS_CallFromC = 0;
       RowMajorStrg = 0;
       return;
diff --git a/CBLAS/src/cblas_chpr.c b/CBLAS/src/cblas_chpr.c
index f2a410270a..ff4220690d 100644
--- a/CBLAS/src/cblas_chpr.c
+++ b/CBLAS/src/cblas_chpr.c
@@ -7,9 +7,11 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_chpr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_chpr)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                 const CBLAS_INT N, const float alpha, const void *X,
                 const CBLAS_INT incX, void *A)
 {
@@ -23,16 +25,20 @@ void cblas_chpr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
 #ifdef F77_INT
    F77_INT F77_N=N, F77_incX=incX;
 #else
+   CBLAS_INT incx = incX;
    #define F77_N N
    #define F77_incX incx
 #endif
-   CBLAS_INT n, i, tincx, incx=incX;
-   float *x=(float *)X, *xx=(float *)X, *tx, *st;
+   CBLAS_INT n, i, tincx;
+   float *x, *xx, *tx, *st;
 
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+   memcpy(&x,&X,sizeof(float*));
+   memcpy(&xx,&X,sizeof(float*));
+
    CBLAS_CallFromC = 1;
    if (layout == CblasColMajor)
    {
@@ -40,7 +46,7 @@ void cblas_chpr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_chpr","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_chpr","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -58,7 +64,7 @@ void cblas_chpr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_chpr","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_chpr","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -96,13 +102,14 @@ void cblas_chpr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
             incx = 1;
          #endif
       }
-      else x = (float *) X;
+      else
+          memcpy(&x,&X,sizeof(float*));
 
       F77_chpr(F77_UL, &F77_N, &alpha, x, &F77_incX, A);
 
    } else
    {
-      cblas_xerbla(1, "cblas_chpr","Illegal layout setting, %d\n", layout);
+      API_SUFFIX(cblas_xerbla)(1, "cblas_chpr","Illegal layout setting, %d\n", layout);
       CBLAS_CallFromC = 0;
       RowMajorStrg = 0;
       return;
diff --git a/CBLAS/src/cblas_chpr2.c b/CBLAS/src/cblas_chpr2.c
index 4ed87677f4..435738a1c3 100644
--- a/CBLAS/src/cblas_chpr2.c
+++ b/CBLAS/src/cblas_chpr2.c
@@ -7,9 +7,10 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_chpr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_chpr2)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                       const CBLAS_INT N,const void *alpha, const void *X,
                       const CBLAS_INT incX,const void *Y, const CBLAS_INT incY, void *Ap)
 
@@ -24,18 +25,25 @@ void cblas_chpr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
 #ifdef F77_INT
    F77_INT F77_N=N,  F77_incX=incX, F77_incY=incY;
 #else
+   CBLAS_INT incx = incX;
+   CBLAS_INT incy = incY;
    #define F77_N N
    #define F77_incX incx
    #define F77_incY incy
 #endif
-   CBLAS_INT n, i, j, tincx, tincy, incx=incX, incy=incY;
-   float *x=(float *)X, *xx=(float *)X, *y=(float *)Y,
-         *yy=(float *)Y, *tx, *ty, *stx, *sty;
+   CBLAS_INT n, i, j, tincx, tincy;
+   float *x, *xx, *y,
+         *yy, *tx, *ty, *stx, *sty;
 
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+   memcpy(&x,&X,sizeof(float*));
+   memcpy(&xx,&X,sizeof(float*));
+   memcpy(&y,&Y,sizeof(float*));
+   memcpy(&yy,&Y,sizeof(float*));
+
    CBLAS_CallFromC = 1;
    if (layout == CblasColMajor)
    {
@@ -43,7 +51,7 @@ void cblas_chpr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_chpr2","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_chpr2","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -61,7 +69,7 @@ void cblas_chpr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_chpr2","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_chpr2","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -128,13 +136,13 @@ void cblas_chpr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
 
       }  else
       {
-         x = (float *) X;
-         y = (void  *) Y;
+         memcpy(&x,&X,sizeof(float*));
+         memcpy(&y,&Y,sizeof(float*));
       }
       F77_chpr2(F77_UL, &F77_N, alpha, y, &F77_incY, x, &F77_incX, Ap);
    } else
    {
-      cblas_xerbla(1, "cblas_chpr2","Illegal layout setting, %d\n", layout);
+      API_SUFFIX(cblas_xerbla)(1, "cblas_chpr2","Illegal layout setting, %d\n", layout);
       CBLAS_CallFromC = 0;
       RowMajorStrg = 0;
       return;
diff --git a/CBLAS/src/cblas_crotg.c b/CBLAS/src/cblas_crotg.c
new file mode 100644
index 0000000000..7f489ccdce
--- /dev/null
+++ b/CBLAS/src/cblas_crotg.c
@@ -0,0 +1,13 @@
+/*
+ * cblas_crotg.c
+ *
+ * The program is a C interface to crotg.
+ *
+ */
+#include "cblas.h"
+#include "cblas_f77.h"
+void API_SUFFIX(cblas_crotg)(void *a, void *b, float *c, void *s)
+{
+   F77_crotg(a,b,c,s);
+}
+
diff --git a/CBLAS/src/cblas_cscal.c b/CBLAS/src/cblas_cscal.c
index 63574ac97b..6e35d5885a 100644
--- a/CBLAS/src/cblas_cscal.c
+++ b/CBLAS/src/cblas_cscal.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_cscal( const CBLAS_INT N, const void *alpha, void *X,
+void API_SUFFIX(cblas_cscal)( const CBLAS_INT N, const void *alpha, void *X,
                        const CBLAS_INT incX)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_csrot.c b/CBLAS/src/cblas_csrot.c
new file mode 100644
index 0000000000..4f6164029a
--- /dev/null
+++ b/CBLAS/src/cblas_csrot.c
@@ -0,0 +1,21 @@
+/*
+ * cblas_csrot.c
+ *
+ * The program is a C interface to csrot.
+ *
+ */
+#include "cblas.h"
+#include "cblas_f77.h"
+void API_SUFFIX(cblas_csrot)(const CBLAS_INT N, void *X, const CBLAS_INT incX,
+   void *Y, const CBLAS_INT incY, const float c, const float s)
+{
+#ifdef F77_INT
+   F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;
+#else
+   #define F77_N N
+   #define F77_incX incX
+   #define F77_incY incY
+#endif
+   F77_csrot(&F77_N, X, &F77_incX, Y, &F77_incY, &c, &s);
+   return;
+}
diff --git a/CBLAS/src/cblas_csscal.c b/CBLAS/src/cblas_csscal.c
index 19ba383fea..df6952d070 100644
--- a/CBLAS/src/cblas_csscal.c
+++ b/CBLAS/src/cblas_csscal.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_csscal( const CBLAS_INT N, const float alpha, void *X,
+void API_SUFFIX(cblas_csscal)( const CBLAS_INT N, const float alpha, void *X,
                        const CBLAS_INT incX)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_cswap.c b/CBLAS/src/cblas_cswap.c
index 7f45e54b53..8a2bfe5c0f 100644
--- a/CBLAS/src/cblas_cswap.c
+++ b/CBLAS/src/cblas_cswap.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_cswap( const CBLAS_INT N, void *X, const CBLAS_INT incX, void *Y,
+void API_SUFFIX(cblas_cswap)( const CBLAS_INT N, void *X, const CBLAS_INT incX, void *Y,
                        const CBLAS_INT incY)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_csymm.c b/CBLAS/src/cblas_csymm.c
index c277e38f4c..15827e7fca 100644
--- a/CBLAS/src/cblas_csymm.c
+++ b/CBLAS/src/cblas_csymm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_csymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
+void API_SUFFIX(cblas_csymm)(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
                  const CBLAS_UPLO Uplo, const CBLAS_INT M, const CBLAS_INT N,
                  const void *alpha, const void  *A, const CBLAS_INT lda,
                  const void  *B, const CBLAS_INT ldb, const void *beta,
@@ -45,7 +45,7 @@ void cblas_csymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='L';
       else
       {
-         cblas_xerbla(2, "cblas_csymm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_csymm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -55,7 +55,7 @@ void cblas_csymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(3, "cblas_csymm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_csymm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -75,7 +75,7 @@ void cblas_csymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='R';
       else
       {
-         cblas_xerbla(2, "cblas_csymm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_csymm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -85,7 +85,7 @@ void cblas_csymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_csymm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_csymm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -99,7 +99,7 @@ void cblas_csymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       F77_csymm(F77_SD, F77_UL, &F77_N, &F77_M, alpha, A, &F77_lda,
                      B, &F77_ldb, beta, C, &F77_ldc);
    }
-   else cblas_xerbla(1, "cblas_csymm", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_csymm", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_csyr2k.c b/CBLAS/src/cblas_csyr2k.c
index ba960ea414..e564a9043a 100644
--- a/CBLAS/src/cblas_csyr2k.c
+++ b/CBLAS/src/cblas_csyr2k.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_csyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_csyr2k)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                   const CBLAS_TRANSPOSE Trans, const CBLAS_INT N, const CBLAS_INT K,
                   const void *alpha, const void  *A, const CBLAS_INT lda,
                   const void  *B, const CBLAS_INT ldb, const void *beta,
@@ -46,7 +46,7 @@ void cblas_csyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(2, "cblas_csyr2k", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_csyr2k", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -57,7 +57,7 @@ void cblas_csyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='N';
       else
       {
-         cblas_xerbla(3, "cblas_csyr2k", "Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_csyr2k", "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -78,7 +78,7 @@ void cblas_csyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_csyr2k", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_csyr2k", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -88,7 +88,7 @@ void cblas_csyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='T';
       else
       {
-         cblas_xerbla(3, "cblas_csyr2k", "Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_csyr2k", "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -101,7 +101,7 @@ void cblas_csyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
 
       F77_csyr2k(F77_UL, F77_TR, &F77_N, &F77_K, alpha, A, &F77_lda, B, &F77_ldb, beta, C, &F77_ldc);
    }
-   else  cblas_xerbla(1, "cblas_csyr2k", "Illegal layout setting, %d\n", layout);
+   else  API_SUFFIX(cblas_xerbla)(1, "cblas_csyr2k", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_csyrk.c b/CBLAS/src/cblas_csyrk.c
index 1e720f0827..21c32d0c3c 100644
--- a/CBLAS/src/cblas_csyrk.c
+++ b/CBLAS/src/cblas_csyrk.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_csyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_csyrk)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE Trans, const CBLAS_INT N, const CBLAS_INT K,
                  const void *alpha, const void  *A, const CBLAS_INT lda,
                  const void *beta, void  *C, const CBLAS_INT ldc)
@@ -44,7 +44,7 @@ void cblas_csyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(2, "cblas_csyrk", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_csyrk", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -55,7 +55,7 @@ void cblas_csyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='N';
       else
       {
-         cblas_xerbla(3, "cblas_csyrk", "Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_csyrk", "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -76,7 +76,7 @@ void cblas_csyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_csyrk", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_csyrk", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -86,7 +86,7 @@ void cblas_csyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='T';
       else
       {
-         cblas_xerbla(3, "cblas_csyrk", "Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_csyrk", "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -100,7 +100,7 @@ void cblas_csyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       F77_csyrk(F77_UL, F77_TR, &F77_N, &F77_K, alpha, A, &F77_lda,
                      beta, C, &F77_ldc);
    }
-   else cblas_xerbla(1, "cblas_csyrk", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_csyrk", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ctbmv.c b/CBLAS/src/cblas_ctbmv.c
index 5a0571b9bd..d86697b100 100644
--- a/CBLAS/src/cblas_ctbmv.c
+++ b/CBLAS/src/cblas_ctbmv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ctbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_ctbmv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const CBLAS_INT K, const void  *A, const CBLAS_INT lda,
                  void  *X, const CBLAS_INT incX)
@@ -43,7 +43,7 @@ void cblas_ctbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_ctbmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ctbmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -53,7 +53,7 @@ void cblas_ctbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_ctbmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ctbmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -62,7 +62,7 @@ void cblas_ctbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ctbmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ctbmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -82,7 +82,7 @@ void cblas_ctbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_ctbmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ctbmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -114,7 +114,7 @@ void cblas_ctbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       }
       else
       {
-         cblas_xerbla(3, "cblas_ctbmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ctbmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -124,7 +124,7 @@ void cblas_ctbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ctbmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ctbmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -151,7 +151,7 @@ void cblas_ctbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          }
       }
    }
-   else cblas_xerbla(1, "cblas_ctbmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_ctbmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ctbsv.c b/CBLAS/src/cblas_ctbsv.c
index 8faef87850..5aaaabdf25 100644
--- a/CBLAS/src/cblas_ctbsv.c
+++ b/CBLAS/src/cblas_ctbsv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ctbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_ctbsv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const CBLAS_INT K, const void  *A, const CBLAS_INT lda,
                  void  *X, const CBLAS_INT incX)
@@ -43,7 +43,7 @@ void cblas_ctbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_ctbsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ctbsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -53,7 +53,7 @@ void cblas_ctbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_ctbsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ctbsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -62,7 +62,7 @@ void cblas_ctbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ctbsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ctbsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -82,7 +82,7 @@ void cblas_ctbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_ctbsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ctbsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -118,7 +118,7 @@ void cblas_ctbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       }
       else
       {
-         cblas_xerbla(3, "cblas_ctbsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ctbsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -128,7 +128,7 @@ void cblas_ctbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ctbsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ctbsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -155,7 +155,7 @@ void cblas_ctbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          }
       }
    }
-   else cblas_xerbla(1, "cblas_ctbsv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_ctbsv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ctpmv.c b/CBLAS/src/cblas_ctpmv.c
index 6e8d7cc8e7..97a45d383b 100644
--- a/CBLAS/src/cblas_ctpmv.c
+++ b/CBLAS/src/cblas_ctpmv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ctpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_ctpmv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const void  *Ap, void  *X, const CBLAS_INT incX)
 {
@@ -40,7 +40,7 @@ void cblas_ctpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_ctpmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ctpmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -50,7 +50,7 @@ void cblas_ctpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_ctpmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ctpmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -59,7 +59,7 @@ void cblas_ctpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ctpmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ctpmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -78,7 +78,7 @@ void cblas_ctpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_ctpmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ctpmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -110,7 +110,7 @@ void cblas_ctpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       }
       else
       {
-         cblas_xerbla(3, "cblas_ctpmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ctpmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -120,7 +120,7 @@ void cblas_ctpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ctpmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ctpmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -145,7 +145,7 @@ void cblas_ctpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          }
       }
    }
-   else cblas_xerbla(1, "cblas_ctpmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_ctpmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ctpsv.c b/CBLAS/src/cblas_ctpsv.c
index 08091d255a..4b9be145af 100644
--- a/CBLAS/src/cblas_ctpsv.c
+++ b/CBLAS/src/cblas_ctpsv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ctpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_ctpsv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const void  *Ap, void  *X, const CBLAS_INT incX)
 {
@@ -40,7 +40,7 @@ void cblas_ctpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_ctpsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ctpsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -50,7 +50,7 @@ void cblas_ctpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_ctpsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ctpsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -59,7 +59,7 @@ void cblas_ctpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ctpsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ctpsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -78,7 +78,7 @@ void cblas_ctpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_ctpsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ctpsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -114,7 +114,7 @@ void cblas_ctpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       }
       else
       {
-         cblas_xerbla(3, "cblas_ctpsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ctpsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -124,7 +124,7 @@ void cblas_ctpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ctpsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ctpsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -150,7 +150,7 @@ void cblas_ctpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          }
       }
    }
-   else cblas_xerbla(1, "cblas_ctpsv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_ctpsv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ctrmm.c b/CBLAS/src/cblas_ctrmm.c
index 46a98bb845..75dee5b864 100644
--- a/CBLAS/src/cblas_ctrmm.c
+++ b/CBLAS/src/cblas_ctrmm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ctrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
+void API_SUFFIX(cblas_ctrmm)(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
                  const CBLAS_UPLO Uplo, const  CBLAS_TRANSPOSE TransA,
                  const CBLAS_DIAG Diag, const CBLAS_INT M, const CBLAS_INT N,
                  const void *alpha, const void  *A, const CBLAS_INT lda,
@@ -45,7 +45,7 @@ void cblas_ctrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='L';
       else
       {
-         cblas_xerbla(2, "cblas_ctrmm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ctrmm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -54,7 +54,7 @@ void cblas_ctrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(3, "cblas_ctrmm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ctrmm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -65,7 +65,7 @@ void cblas_ctrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(4, "cblas_ctrmm", "Illegal Trans setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ctrmm", "Illegal Trans setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -73,7 +73,7 @@ void cblas_ctrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
 
       if( Diag == CblasUnit ) DI='U';
       else if ( Diag == CblasNonUnit ) DI='N';
-      else cblas_xerbla(5, "cblas_ctrmm",
+      else API_SUFFIX(cblas_xerbla)(5, "cblas_ctrmm",
                        "Illegal Diag setting, %d\n", Diag);
 
       #ifdef F77_CHAR
@@ -91,7 +91,7 @@ void cblas_ctrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='R';
       else
       {
-         cblas_xerbla(2, "cblas_ctrmm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ctrmm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -101,7 +101,7 @@ void cblas_ctrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_ctrmm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ctrmm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -112,7 +112,7 @@ void cblas_ctrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(4, "cblas_ctrmm", "Illegal Trans setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ctrmm", "Illegal Trans setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -122,7 +122,7 @@ void cblas_ctrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Diag == CblasNonUnit ) DI='N';
       else
       {
-         cblas_xerbla(5, "cblas_ctrmm", "Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(5, "cblas_ctrmm", "Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -137,7 +137,7 @@ void cblas_ctrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
 
       F77_ctrmm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_N, &F77_M, alpha, A, &F77_lda, B, &F77_ldb);
    }
-   else  cblas_xerbla(1, "cblas_ctrmm", "Illegal layout setting, %d\n", layout);
+   else  API_SUFFIX(cblas_xerbla)(1, "cblas_ctrmm", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ctrmv.c b/CBLAS/src/cblas_ctrmv.c
index 8fcb79a3f1..32dabd786e 100644
--- a/CBLAS/src/cblas_ctrmv.c
+++ b/CBLAS/src/cblas_ctrmv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ctrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_ctrmv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const void  *A, const CBLAS_INT lda,
                  void  *X, const CBLAS_INT incX)
@@ -43,7 +43,7 @@ void cblas_ctrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_ctrmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ctrmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -53,7 +53,7 @@ void cblas_ctrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_ctrmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ctrmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -62,7 +62,7 @@ void cblas_ctrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ctrmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ctrmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -82,7 +82,7 @@ void cblas_ctrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_ctrmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ctrmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -113,7 +113,7 @@ void cblas_ctrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       }
       else
       {
-         cblas_xerbla(3, "cblas_ctrmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ctrmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -123,7 +123,7 @@ void cblas_ctrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ctrmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ctrmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -148,7 +148,7 @@ void cblas_ctrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          }
       }
    }
-   else cblas_xerbla(1, "cblas_ctrmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_ctrmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ctrsm.c b/CBLAS/src/cblas_ctrsm.c
index 9e42f9aa00..7d492f2ab4 100644
--- a/CBLAS/src/cblas_ctrsm.c
+++ b/CBLAS/src/cblas_ctrsm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ctrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
+void API_SUFFIX(cblas_ctrsm)(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
                  const CBLAS_UPLO Uplo, const CBLAS_TRANSPOSE TransA,
                  const CBLAS_DIAG Diag, const CBLAS_INT M, const CBLAS_INT N,
                  const void *alpha, const void  *A, const CBLAS_INT lda,
@@ -46,7 +46,7 @@ void cblas_ctrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='L';
       else
       {
-         cblas_xerbla(2, "cblas_ctrsm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ctrsm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -56,7 +56,7 @@ void cblas_ctrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(3, "cblas_ctrsm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ctrsm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -67,7 +67,7 @@ void cblas_ctrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(4, "cblas_ctrsm", "Illegal Trans setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ctrsm", "Illegal Trans setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -77,7 +77,7 @@ void cblas_ctrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Diag == CblasNonUnit ) DI='N';
       else
       {
-         cblas_xerbla(5, "cblas_ctrsm", "Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(5, "cblas_ctrsm", "Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -100,7 +100,7 @@ void cblas_ctrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='R';
       else
       {
-         cblas_xerbla(2, "cblas_ctrsm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ctrsm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -110,7 +110,7 @@ void cblas_ctrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_ctrsm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ctrsm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -121,7 +121,7 @@ void cblas_ctrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(4, "cblas_ctrsm", "Illegal Trans setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ctrsm", "Illegal Trans setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -131,7 +131,7 @@ void cblas_ctrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Diag == CblasNonUnit ) DI='N';
       else
       {
-         cblas_xerbla(5, "cblas_ctrsm", "Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(5, "cblas_ctrsm", "Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -148,7 +148,7 @@ void cblas_ctrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       F77_ctrsm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_N, &F77_M, alpha, A,
                 &F77_lda, B, &F77_ldb);
    }
-   else cblas_xerbla(1, "cblas_ctrsm", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_ctrsm", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ctrsv.c b/CBLAS/src/cblas_ctrsv.c
index e0447d3009..41a9440472 100644
--- a/CBLAS/src/cblas_ctrsv.c
+++ b/CBLAS/src/cblas_ctrsv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ctrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_ctrsv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const void  *A, const CBLAS_INT lda, void  *X,
                  const CBLAS_INT incX)
@@ -42,7 +42,7 @@ void cblas_ctrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_ctrsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ctrsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -52,7 +52,7 @@ void cblas_ctrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_ctrsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ctrsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -61,7 +61,7 @@ void cblas_ctrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ctrsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ctrsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -81,7 +81,7 @@ void cblas_ctrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_ctrsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ctrsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -114,7 +114,7 @@ void cblas_ctrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       }
       else
       {
-         cblas_xerbla(3, "cblas_ctrsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ctrsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -124,7 +124,7 @@ void cblas_ctrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ctrsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ctrsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -149,7 +149,7 @@ void cblas_ctrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          }
       }
    }
-   else cblas_xerbla(1, "cblas_ctrsv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_ctrsv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dasum.c b/CBLAS/src/cblas_dasum.c
index 67e257a7f2..3b7abd06a6 100644
--- a/CBLAS/src/cblas_dasum.c
+++ b/CBLAS/src/cblas_dasum.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-double cblas_dasum( const CBLAS_INT N, const double *X, const CBLAS_INT incX)
+double API_SUFFIX(cblas_dasum)( const CBLAS_INT N, const double *X, const CBLAS_INT incX)
 {
    double asum;
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_daxpby.c b/CBLAS/src/cblas_daxpby.c
new file mode 100644
index 0000000000..a4df635247
--- /dev/null
+++ b/CBLAS/src/cblas_daxpby.c
@@ -0,0 +1,22 @@
+/*
+ * cblas_daxpby.c
+ *
+ * The program is a C interface to daxpby.
+ *
+ * Written by Martin Koehler.  08/26/2024
+ *
+ */
+#include "cblas.h"
+#include "cblas_f77.h"
+void API_SUFFIX(cblas_daxpby)( const CBLAS_INT N, const double alpha, const double *X,
+                       const CBLAS_INT incX, const double beta, double *Y, const CBLAS_INT incY)
+{
+#ifdef F77_INT
+   F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;
+#else
+   #define F77_N N
+   #define F77_incX incX
+   #define F77_incY incY
+#endif
+   F77_daxpby( &F77_N, &alpha, X, &F77_incX, &beta, Y, &F77_incY);
+}
diff --git a/CBLAS/src/cblas_daxpy.c b/CBLAS/src/cblas_daxpy.c
index 1b38e0a936..9ab57c79d3 100644
--- a/CBLAS/src/cblas_daxpy.c
+++ b/CBLAS/src/cblas_daxpy.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_daxpy( const CBLAS_INT N, const double alpha, const double *X,
+void API_SUFFIX(cblas_daxpy)( const CBLAS_INT N, const double alpha, const double *X,
                        const CBLAS_INT incX, double *Y, const CBLAS_INT incY)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_dcabs1.c b/CBLAS/src/cblas_dcabs1.c
new file mode 100644
index 0000000000..35e127ddf1
--- /dev/null
+++ b/CBLAS/src/cblas_dcabs1.c
@@ -0,0 +1,15 @@
+/*
+ * cblas_scabs1.c
+ *
+ * The program is a C interface to scabs1.
+ *
+ */
+#include "cblas.h"
+#include "cblas_f77.h"
+double API_SUFFIX(cblas_dcabs1)(const void *c)
+{
+   double cabs1 = 0.0;
+   F77_dcabs1_sub(c, &cabs1);
+   return cabs1; 
+}
+
diff --git a/CBLAS/src/cblas_dcopy.c b/CBLAS/src/cblas_dcopy.c
index 6eaed67ab1..0eec047bea 100644
--- a/CBLAS/src/cblas_dcopy.c
+++ b/CBLAS/src/cblas_dcopy.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dcopy( const CBLAS_INT N, const double *X,
+void API_SUFFIX(cblas_dcopy)( const CBLAS_INT N, const double *X,
                       const CBLAS_INT incX, double *Y, const CBLAS_INT incY)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_ddot.c b/CBLAS/src/cblas_ddot.c
index c2035a0a7c..54afaadc25 100644
--- a/CBLAS/src/cblas_ddot.c
+++ b/CBLAS/src/cblas_ddot.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-double cblas_ddot( const CBLAS_INT N, const double *X,
+double API_SUFFIX(cblas_ddot)( const CBLAS_INT N, const double *X,
                       const CBLAS_INT incX, const double *Y, const CBLAS_INT incY)
 {
    double dot;
diff --git a/CBLAS/src/cblas_dgbmv.c b/CBLAS/src/cblas_dgbmv.c
index ef2eeff18c..a0fc8d7aa1 100644
--- a/CBLAS/src/cblas_dgbmv.c
+++ b/CBLAS/src/cblas_dgbmv.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dgbmv(const CBLAS_LAYOUT layout,
+void API_SUFFIX(cblas_dgbmv)(const CBLAS_LAYOUT layout,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_INT M, const CBLAS_INT N,
                  const CBLAS_INT KL, const CBLAS_INT KU,
                  const double alpha, const double  *A, const CBLAS_INT lda,
@@ -45,7 +45,7 @@ void cblas_dgbmv(const CBLAS_LAYOUT layout,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(2, "cblas_dgbmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dgbmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -64,7 +64,7 @@ void cblas_dgbmv(const CBLAS_LAYOUT layout,
       else if (TransA == CblasConjTrans) TA = 'N';
       else
       {
-         cblas_xerbla(2, "cblas_dgbmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dgbmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -75,7 +75,7 @@ void cblas_dgbmv(const CBLAS_LAYOUT layout,
       F77_dgbmv(F77_TA, &F77_N, &F77_M, &F77_KU, &F77_KL, &alpha,
                      A ,&F77_lda, X,&F77_incX, &beta, Y, &F77_incY);
    }
-   else cblas_xerbla(1, "cblas_dgbmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_dgbmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
 }
diff --git a/CBLAS/src/cblas_dgemm.c b/CBLAS/src/cblas_dgemm.c
index 1dce9cf3e8..c4ae0275c2 100644
--- a/CBLAS/src/cblas_dgemm.c
+++ b/CBLAS/src/cblas_dgemm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
+void API_SUFFIX(cblas_dgemm)(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
                  const CBLAS_TRANSPOSE TransB, const CBLAS_INT M, const CBLAS_INT N,
                  const CBLAS_INT K, const double alpha, const double  *A,
                  const CBLAS_INT lda, const double  *B, const CBLAS_INT ldb,
@@ -47,7 +47,7 @@ void cblas_dgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(2, "cblas_dgemm","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dgemm","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -58,7 +58,7 @@ void cblas_dgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       else if ( TransB == CblasNoTrans )   TB='N';
       else
       {
-         cblas_xerbla(3, "cblas_dgemm","Illegal TransB setting, %d\n", TransB);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dgemm","Illegal TransB setting, %d\n", TransB);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -79,7 +79,7 @@ void cblas_dgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       else if ( TransA == CblasNoTrans )   TB='N';
       else
       {
-         cblas_xerbla(2, "cblas_dgemm","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dgemm","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -89,7 +89,7 @@ void cblas_dgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       else if ( TransB == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(2, "cblas_dgemm","Illegal TransB setting, %d\n", TransB);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dgemm","Illegal TransB setting, %d\n", TransB);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -102,7 +102,7 @@ void cblas_dgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       F77_dgemm(F77_TA, F77_TB, &F77_N, &F77_M, &F77_K, &alpha, B,
                   &F77_ldb, A, &F77_lda, &beta, C, &F77_ldc);
    }
-   else  cblas_xerbla(1, "cblas_dgemm", "Illegal layout setting, %d\n", layout);
+   else  API_SUFFIX(cblas_xerbla)(1, "cblas_dgemm", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dgemmtr.c b/CBLAS/src/cblas_dgemmtr.c
new file mode 100644
index 0000000000..d64c664ba2
--- /dev/null
+++ b/CBLAS/src/cblas_dgemmtr.c
@@ -0,0 +1,134 @@
+/*
+ *
+ * cblas_dgemmtr.c
+ * This program is a C interface to dgemmtr.
+ * Written by Martin Koehler, MPI Magdeburg
+ * 06/24/2024
+ *
+ */
+
+#include "cblas.h"
+#include "cblas_f77.h"
+void API_SUFFIX(cblas_dgemmtr)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo, const CBLAS_TRANSPOSE TransA,
+        const CBLAS_TRANSPOSE TransB, const CBLAS_INT N,
+        const CBLAS_INT K, const double alpha, const double  *A,
+        const CBLAS_INT lda, const double  *B, const CBLAS_INT ldb,
+        const double beta, double  *C, const CBLAS_INT ldc)
+{
+    char TA, TB, UL;
+#ifdef F77_CHAR
+    F77_CHAR F77_TA, F77_TB. F77_UL;
+#else
+#define F77_TA &TA
+#define F77_TB &TB
+#define F77_UL &UL
+#endif
+
+#ifdef F77_INT
+    F77_INT F77_N=N, F77_K=K, F77_lda=lda, F77_ldb=ldb;
+    F77_INT F77_ldc=ldc;
+#else
+#define F77_N N
+#define F77_K K
+#define F77_lda lda
+#define F77_ldb ldb
+#define F77_ldc ldc
+#endif
+
+    extern int CBLAS_CallFromC;
+    extern int RowMajorStrg;
+    RowMajorStrg = 0;
+    CBLAS_CallFromC = 1;
+
+
+    if( layout == CblasColMajor )
+    {
+        if ( Uplo == CblasUpper ) UL = 'U';
+        else if (Uplo == CblasLower) UL= 'L';
+        else {
+            API_SUFFIX(cblas_xerbla)(2, "cblas_dgemmtr", "Illegal Uplo setting, %d\n", Uplo);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+
+
+
+        if(TransA == CblasTrans) TA='T';
+        else if ( TransA == CblasConjTrans ) TA='C';
+        else if ( TransA == CblasNoTrans )   TA='N';
+        else
+        {
+            API_SUFFIX(cblas_xerbla)(3, "cblas_dgemmtr","Illegal TransA setting, %d\n", TransA);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+
+        if(TransB == CblasTrans) TB='T';
+        else if ( TransB == CblasConjTrans ) TB='C';
+        else if ( TransB == CblasNoTrans )   TB='N';
+        else
+        {
+            API_SUFFIX(cblas_xerbla)(4, "cblas_dgemmtr","Illegal TransB setting, %d\n", TransB);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+
+#ifdef F77_CHAR
+        F77_TA = C2F_CHAR(&TA);
+        F77_TB = C2F_CHAR(&TB);
+        F77_UL = C2F_CHAR(&UL);
+#endif
+
+        F77_dgemmtr(F77_UL, F77_TA, F77_TB, &F77_N, &F77_K, &alpha, A,
+                &F77_lda, B, &F77_ldb, &beta, C, &F77_ldc);
+    }
+    else if (layout == CblasRowMajor)
+    {
+        if ( Uplo == CblasUpper ) UL = 'L';
+        else if (Uplo == CblasLower) UL= 'U';
+        else {
+            API_SUFFIX(cblas_xerbla)(2, "cblas_dgemmtr", "Illegal Uplo setting, %d\n", Uplo);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+
+
+        RowMajorStrg = 1;
+        if(TransA == CblasTrans) TB='T';
+        else if ( TransA == CblasConjTrans ) TB='C';
+        else if ( TransA == CblasNoTrans )   TB='N';
+        else
+        {
+            API_SUFFIX(cblas_xerbla)(3, "cblas_dgemmtr","Illegal TransA setting, %d\n", TransA);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+        if(TransB == CblasTrans) TA='T';
+        else if ( TransB == CblasConjTrans ) TA='C';
+        else if ( TransB == CblasNoTrans )   TA='N';
+        else
+        {
+            API_SUFFIX(cblas_xerbla)(4, "cblas_dgemmtr","Illegal TransB setting, %d\n", TransB);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+#ifdef F77_CHAR
+        F77_TA = C2F_CHAR(&TA);
+        F77_TB = C2F_CHAR(&TB);
+        F77_UL = C2F_CHAR(&UL);
+#endif
+
+        F77_dgemmtr( F77_UL, F77_TA, F77_TB, &F77_N, &F77_K, &alpha, B,
+                &F77_ldb, A, &F77_lda, &beta, C, &F77_ldc);
+    }
+    else  API_SUFFIX(cblas_xerbla)(1, "cblas_dgemmtr", "Illegal layout setting, %d\n", layout);
+    CBLAS_CallFromC = 0;
+    RowMajorStrg = 0;
+    return;
+}
diff --git a/CBLAS/src/cblas_dgemv.c b/CBLAS/src/cblas_dgemv.c
index c5d10b791e..80edd756b0 100644
--- a/CBLAS/src/cblas_dgemv.c
+++ b/CBLAS/src/cblas_dgemv.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dgemv(const CBLAS_LAYOUT layout,
+void API_SUFFIX(cblas_dgemv)(const CBLAS_LAYOUT layout,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_INT M, const CBLAS_INT N,
                  const double alpha, const double  *A, const CBLAS_INT lda,
                  const double  *X, const CBLAS_INT incX, const double beta,
@@ -41,7 +41,7 @@ void cblas_dgemv(const CBLAS_LAYOUT layout,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(2, "cblas_dgemv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dgemv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -60,7 +60,7 @@ void cblas_dgemv(const CBLAS_LAYOUT layout,
       else if (TransA == CblasConjTrans) TA = 'N';
       else
       {
-         cblas_xerbla(2, "cblas_dgemv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dgemv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -71,7 +71,7 @@ void cblas_dgemv(const CBLAS_LAYOUT layout,
       F77_dgemv(F77_TA, &F77_N, &F77_M, &alpha, A, &F77_lda, X,
                 &F77_incX, &beta, Y, &F77_incY);
    }
-   else cblas_xerbla(1, "cblas_dgemv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_dgemv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dger.c b/CBLAS/src/cblas_dger.c
index fa69dcbb20..8e5d687791 100644
--- a/CBLAS/src/cblas_dger.c
+++ b/CBLAS/src/cblas_dger.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dger(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N,
+void API_SUFFIX(cblas_dger)(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N,
                 const double alpha, const double  *X, const CBLAS_INT incX,
                 const double  *Y, const CBLAS_INT incY, double  *A, const CBLAS_INT lda)
 {
@@ -40,7 +40,7 @@ void cblas_dger(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N,
                       &F77_lda);
 
    }
-   else cblas_xerbla(1, "cblas_dger", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_dger", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dnrm2.c b/CBLAS/src/cblas_dnrm2.c
index 48bb1657dd..3fafa48e5c 100644
--- a/CBLAS/src/cblas_dnrm2.c
+++ b/CBLAS/src/cblas_dnrm2.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-double cblas_dnrm2( const CBLAS_INT N, const double *X, const CBLAS_INT incX)
+double API_SUFFIX(cblas_dnrm2)( const CBLAS_INT N, const double *X, const CBLAS_INT incX)
 {
    double nrm2;
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_drot.c b/CBLAS/src/cblas_drot.c
index 0ecdcb316c..410aece4d6 100644
--- a/CBLAS/src/cblas_drot.c
+++ b/CBLAS/src/cblas_drot.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_drot(const CBLAS_INT N, double *X, const CBLAS_INT incX,
+void API_SUFFIX(cblas_drot)(const CBLAS_INT N, double *X, const CBLAS_INT incX,
    double *Y, const CBLAS_INT incY, const double c, const double s)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_drotg.c b/CBLAS/src/cblas_drotg.c
index a433f4844f..01e5c202ac 100644
--- a/CBLAS/src/cblas_drotg.c
+++ b/CBLAS/src/cblas_drotg.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_drotg(  double *a, double *b, double *c, double *s)
+void API_SUFFIX(cblas_drotg)(  double *a, double *b, double *c, double *s)
 {
    F77_drotg(a,b,c,s);
 }
diff --git a/CBLAS/src/cblas_drotm.c b/CBLAS/src/cblas_drotm.c
index 70ac6c1cd9..a9646d775f 100644
--- a/CBLAS/src/cblas_drotm.c
+++ b/CBLAS/src/cblas_drotm.c
@@ -1,6 +1,6 @@
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_drotm( const CBLAS_INT N, double *X, const CBLAS_INT incX, double *Y,
+void API_SUFFIX(cblas_drotm)( const CBLAS_INT N, double *X, const CBLAS_INT incX, double *Y,
                        const CBLAS_INT incY, const double *P)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_drotmg.c b/CBLAS/src/cblas_drotmg.c
index ad33ba4fd2..f04042ee9b 100644
--- a/CBLAS/src/cblas_drotmg.c
+++ b/CBLAS/src/cblas_drotmg.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_drotmg( double *d1, double *d2, double *b1,
+void API_SUFFIX(cblas_drotmg)( double *d1, double *d2, double *b1,
                         const double b2, double *p)
 {
    F77_drotmg(d1,d2,b1,&b2,p);
diff --git a/CBLAS/src/cblas_dsbmv.c b/CBLAS/src/cblas_dsbmv.c
index 1502142c11..7bccfae362 100644
--- a/CBLAS/src/cblas_dsbmv.c
+++ b/CBLAS/src/cblas_dsbmv.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dsbmv(const CBLAS_LAYOUT layout,
+void API_SUFFIX(cblas_dsbmv)(const CBLAS_LAYOUT layout,
                  const CBLAS_UPLO Uplo, const CBLAS_INT N, const CBLAS_INT K,
                  const double alpha, const double  *A, const CBLAS_INT lda,
                  const double  *X, const CBLAS_INT incX, const double beta,
@@ -41,7 +41,7 @@ void cblas_dsbmv(const CBLAS_LAYOUT layout,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_dsbmv","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dsbmv","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -59,7 +59,7 @@ void cblas_dsbmv(const CBLAS_LAYOUT layout,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_dsbmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dsbmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -70,7 +70,7 @@ void cblas_dsbmv(const CBLAS_LAYOUT layout,
       F77_dsbmv(F77_UL, &F77_N, &F77_K, &alpha,
                      A ,&F77_lda, X,&F77_incX, &beta, Y, &F77_incY);
    }
-   else cblas_xerbla(1, "cblas_dsbmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_dsbmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dscal.c b/CBLAS/src/cblas_dscal.c
index b0ecfd4c2c..b5b0d44dfc 100644
--- a/CBLAS/src/cblas_dscal.c
+++ b/CBLAS/src/cblas_dscal.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dscal( const CBLAS_INT N, const double alpha, double *X,
+void API_SUFFIX(cblas_dscal)( const CBLAS_INT N, const double alpha, double *X,
                        const CBLAS_INT incX)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_dsdot.c b/CBLAS/src/cblas_dsdot.c
index 7141c6f729..f3ce05d244 100644
--- a/CBLAS/src/cblas_dsdot.c
+++ b/CBLAS/src/cblas_dsdot.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-double  cblas_dsdot( const CBLAS_INT N, const float *X,
+double  API_SUFFIX(cblas_dsdot)( const CBLAS_INT N, const float *X,
                       const CBLAS_INT incX, const float *Y, const CBLAS_INT incY)
 {
    double dot;
diff --git a/CBLAS/src/cblas_dspmv.c b/CBLAS/src/cblas_dspmv.c
index 864a8883df..14a9a8d31a 100644
--- a/CBLAS/src/cblas_dspmv.c
+++ b/CBLAS/src/cblas_dspmv.c
@@ -10,7 +10,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dspmv(const CBLAS_LAYOUT layout,
+void API_SUFFIX(cblas_dspmv)(const CBLAS_LAYOUT layout,
                  const CBLAS_UPLO Uplo, const CBLAS_INT N,
                  const double alpha, const double  *AP,
                  const double  *X, const CBLAS_INT incX, const double beta,
@@ -40,7 +40,7 @@ void cblas_dspmv(const CBLAS_LAYOUT layout,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_dspmv","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dspmv","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -58,7 +58,7 @@ void cblas_dspmv(const CBLAS_LAYOUT layout,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_dspmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dspmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -69,7 +69,7 @@ void cblas_dspmv(const CBLAS_LAYOUT layout,
       F77_dspmv(F77_UL, &F77_N, &alpha,
                      AP, X,&F77_incX, &beta, Y, &F77_incY);
    }
-   else cblas_xerbla(1, "cblas_dspmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_dspmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dspr.c b/CBLAS/src/cblas_dspr.c
index 5140bc0771..ef33968519 100644
--- a/CBLAS/src/cblas_dspr.c
+++ b/CBLAS/src/cblas_dspr.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dspr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_dspr)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                 const CBLAS_INT N, const double alpha, const double *X,
                 const CBLAS_INT incX, double *Ap)
 {
@@ -36,7 +36,7 @@ void cblas_dspr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_dspr","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dspr","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -54,7 +54,7 @@ void cblas_dspr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_dspr","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dspr","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -63,7 +63,7 @@ void cblas_dspr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          F77_UL = C2F_CHAR(&UL);
       #endif
       F77_dspr(F77_UL, &F77_N, &alpha, X, &F77_incX, Ap);
-   } else cblas_xerbla(1, "cblas_dspr", "Illegal layout setting, %d\n", layout);
+   } else API_SUFFIX(cblas_xerbla)(1, "cblas_dspr", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dspr2.c b/CBLAS/src/cblas_dspr2.c
index 07cde29cfe..e18c6672f1 100644
--- a/CBLAS/src/cblas_dspr2.c
+++ b/CBLAS/src/cblas_dspr2.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dspr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_dspr2)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                 const CBLAS_INT N, const double  alpha, const double  *X,
                 const CBLAS_INT incX, const double  *Y, const CBLAS_INT incY, double  *A)
 {
@@ -36,7 +36,7 @@ void cblas_dspr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_dspr2","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dspr2","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -54,7 +54,7 @@ void cblas_dspr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_dspr2","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dspr2","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -63,7 +63,7 @@ void cblas_dspr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          F77_UL = C2F_CHAR(&UL);
       #endif
       F77_dspr2(F77_UL, &F77_N, &alpha, X, &F77_incX, Y, &F77_incY,  A);
-   } else cblas_xerbla(1, "cblas_dspr2", "Illegal layout setting, %d\n", layout);
+   } else API_SUFFIX(cblas_xerbla)(1, "cblas_dspr2", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dswap.c b/CBLAS/src/cblas_dswap.c
index 7a586f2f67..e78fd2face 100644
--- a/CBLAS/src/cblas_dswap.c
+++ b/CBLAS/src/cblas_dswap.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dswap( const CBLAS_INT N, double *X, const CBLAS_INT incX, double *Y,
+void API_SUFFIX(cblas_dswap)( const CBLAS_INT N, double *X, const CBLAS_INT incX, double *Y,
                        const CBLAS_INT incY)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_dsymm.c b/CBLAS/src/cblas_dsymm.c
index 54a549867a..3bab6f659e 100644
--- a/CBLAS/src/cblas_dsymm.c
+++ b/CBLAS/src/cblas_dsymm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dsymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
+void API_SUFFIX(cblas_dsymm)(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
                  const CBLAS_UPLO Uplo, const CBLAS_INT M, const CBLAS_INT N,
                  const double alpha, const double  *A, const CBLAS_INT lda,
                  const double  *B, const CBLAS_INT ldb, const double beta,
@@ -45,7 +45,7 @@ void cblas_dsymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='L';
       else
       {
-         cblas_xerbla(2, "cblas_dsymm","Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dsymm","Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -55,7 +55,7 @@ void cblas_dsymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(3, "cblas_dsymm","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dsymm","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -75,7 +75,7 @@ void cblas_dsymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='R';
       else
       {
-         cblas_xerbla(2, "cblas_dsymm","Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dsymm","Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -85,7 +85,7 @@ void cblas_dsymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_dsymm","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dsymm","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -99,7 +99,7 @@ void cblas_dsymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       F77_dsymm(F77_SD, F77_UL, &F77_N, &F77_M, &alpha, A, &F77_lda, B,
                  &F77_ldb, &beta, C, &F77_ldc);
    }
-   else cblas_xerbla(1, "cblas_dsymm","Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_dsymm","Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dsymv.c b/CBLAS/src/cblas_dsymv.c
index 327a02e6f8..18607d3637 100644
--- a/CBLAS/src/cblas_dsymv.c
+++ b/CBLAS/src/cblas_dsymv.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dsymv(const CBLAS_LAYOUT layout,
+void API_SUFFIX(cblas_dsymv)(const CBLAS_LAYOUT layout,
                  const CBLAS_UPLO Uplo, const CBLAS_INT N,
                  const double alpha, const double  *A, const CBLAS_INT lda,
                  const double  *X, const CBLAS_INT incX, const double beta,
@@ -40,7 +40,7 @@ void cblas_dsymv(const CBLAS_LAYOUT layout,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_dsymv","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dsymv","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -58,7 +58,7 @@ void cblas_dsymv(const CBLAS_LAYOUT layout,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_dsymv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dsymv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -69,7 +69,7 @@ void cblas_dsymv(const CBLAS_LAYOUT layout,
       F77_dsymv(F77_UL, &F77_N, &alpha,
                      A ,&F77_lda, X,&F77_incX, &beta, Y, &F77_incY);
    }
-   else cblas_xerbla(1, "cblas_dsymv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_dsymv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dsyr.c b/CBLAS/src/cblas_dsyr.c
index d58c301735..383d41419c 100644
--- a/CBLAS/src/cblas_dsyr.c
+++ b/CBLAS/src/cblas_dsyr.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dsyr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_dsyr)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                 const CBLAS_INT N, const double  alpha, const double  *X,
                 const CBLAS_INT incX, double  *A, const CBLAS_INT lda)
 {
@@ -37,7 +37,7 @@ void cblas_dsyr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_dsyr","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dsyr","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -55,7 +55,7 @@ void cblas_dsyr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_dsyr","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dsyr","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -64,7 +64,7 @@ void cblas_dsyr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          F77_UL = C2F_CHAR(&UL);
       #endif
       F77_dsyr(F77_UL, &F77_N, &alpha, X, &F77_incX, A, &F77_lda);
-   } else cblas_xerbla(1, "cblas_dsyr", "Illegal layout setting, %d\n", layout);
+   } else API_SUFFIX(cblas_xerbla)(1, "cblas_dsyr", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dsyr2.c b/CBLAS/src/cblas_dsyr2.c
index 96ae1f80f0..db85bf5216 100644
--- a/CBLAS/src/cblas_dsyr2.c
+++ b/CBLAS/src/cblas_dsyr2.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dsyr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_dsyr2)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                 const CBLAS_INT N, const double  alpha, const double  *X,
                 const CBLAS_INT incX, const double  *Y, const CBLAS_INT incY, double  *A,
                 const CBLAS_INT lda)
@@ -40,7 +40,7 @@ void cblas_dsyr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_dsyr2","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dsyr2","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -59,7 +59,7 @@ void cblas_dsyr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_dsyr2","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dsyr2","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -69,7 +69,7 @@ void cblas_dsyr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       #endif
       F77_dsyr2(F77_UL, &F77_N, &alpha, X, &F77_incX, Y, &F77_incY,  A,
                     &F77_lda);
-   } else cblas_xerbla(1, "cblas_dsyr2", "Illegal layout setting, %d\n", layout);
+   } else API_SUFFIX(cblas_xerbla)(1, "cblas_dsyr2", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dsyr2k.c b/CBLAS/src/cblas_dsyr2k.c
index 3de741dd8e..85e01b2714 100644
--- a/CBLAS/src/cblas_dsyr2k.c
+++ b/CBLAS/src/cblas_dsyr2k.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dsyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_dsyr2k)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                   const CBLAS_TRANSPOSE Trans, const CBLAS_INT N, const CBLAS_INT K,
                   const double alpha, const double  *A, const CBLAS_INT lda,
                   const double  *B, const CBLAS_INT ldb, const double beta,
@@ -46,7 +46,7 @@ void cblas_dsyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(2, "cblas_dsyr2k","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dsyr2k","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -57,7 +57,7 @@ void cblas_dsyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='N';
       else
       {
-         cblas_xerbla(3, "cblas_dsyr2k","Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dsyr2k","Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -78,7 +78,7 @@ void cblas_dsyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_dsyr2k","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dsyr2k","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -88,7 +88,7 @@ void cblas_dsyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='T';
       else
       {
-         cblas_xerbla(3, "cblas_dsyr2k","Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dsyr2k","Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -102,7 +102,7 @@ void cblas_dsyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       F77_dsyr2k(F77_UL, F77_TR, &F77_N, &F77_K, &alpha, A, &F77_lda, B,
                 &F77_ldb, &beta, C, &F77_ldc);
    }
-   else cblas_xerbla(1, "cblas_dsyr2k","Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_dsyr2k","Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dsyrk.c b/CBLAS/src/cblas_dsyrk.c
index 835b9eedb7..dfca582148 100644
--- a/CBLAS/src/cblas_dsyrk.c
+++ b/CBLAS/src/cblas_dsyrk.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dsyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_dsyrk)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE Trans, const CBLAS_INT N, const CBLAS_INT K,
                  const double alpha, const double  *A, const CBLAS_INT lda,
                  const double beta, double  *C, const CBLAS_INT ldc)
@@ -44,7 +44,7 @@ void cblas_dsyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(2, "cblas_dsyrk","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dsyrk","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -55,7 +55,7 @@ void cblas_dsyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='N';
       else
       {
-         cblas_xerbla(3, "cblas_dsyrk","Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dsyrk","Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -76,7 +76,7 @@ void cblas_dsyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_dsyrk","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dsyrk","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -86,7 +86,7 @@ void cblas_dsyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='T';
       else
       {
-         cblas_xerbla(3, "cblas_dsyrk","Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dsyrk","Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -100,7 +100,7 @@ void cblas_dsyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       F77_dsyrk(F77_UL, F77_TR, &F77_N, &F77_K, &alpha, A, &F77_lda,
                      &beta, C, &F77_ldc);
    }
-   else cblas_xerbla(1, "cblas_dsyrk","Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_dsyrk","Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dtbmv.c b/CBLAS/src/cblas_dtbmv.c
index badcc20189..dea9165d96 100644
--- a/CBLAS/src/cblas_dtbmv.c
+++ b/CBLAS/src/cblas_dtbmv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dtbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_dtbmv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const CBLAS_INT K, const double  *A, const CBLAS_INT lda,
                  double  *X, const CBLAS_INT incX)
@@ -41,7 +41,7 @@ void cblas_dtbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_dtbmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dtbmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -51,7 +51,7 @@ void cblas_dtbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_dtbmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dtbmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -60,7 +60,7 @@ void cblas_dtbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_dtbmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_dtbmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -80,7 +80,7 @@ void cblas_dtbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_dtbmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dtbmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -91,7 +91,7 @@ void cblas_dtbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'N';
       else
       {
-         cblas_xerbla(3, "cblas_dtbmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dtbmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -101,7 +101,7 @@ void cblas_dtbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_dtbmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_dtbmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -116,7 +116,7 @@ void cblas_dtbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                       &F77_incX);
 
    }
-   else cblas_xerbla(1, "cblas_dtbmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_dtbmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
 }
diff --git a/CBLAS/src/cblas_dtbsv.c b/CBLAS/src/cblas_dtbsv.c
index afead06808..fefca5bd43 100644
--- a/CBLAS/src/cblas_dtbsv.c
+++ b/CBLAS/src/cblas_dtbsv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dtbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_dtbsv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const CBLAS_INT K, const double  *A, const CBLAS_INT lda,
                  double  *X, const CBLAS_INT incX)
@@ -41,7 +41,7 @@ void cblas_dtbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_dtbsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dtbsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -51,7 +51,7 @@ void cblas_dtbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_dtbsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dtbsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -60,7 +60,7 @@ void cblas_dtbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_dtbsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_dtbsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -80,7 +80,7 @@ void cblas_dtbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_dtbsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dtbsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -91,7 +91,7 @@ void cblas_dtbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'N';
       else
       {
-         cblas_xerbla(3, "cblas_dtbsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dtbsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -101,7 +101,7 @@ void cblas_dtbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_dtbsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_dtbsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -115,7 +115,7 @@ void cblas_dtbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       F77_dtbsv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, A, &F77_lda, X,
                       &F77_incX);
    }
-   else cblas_xerbla(1, "cblas_dtbsv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_dtbsv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dtpmv.c b/CBLAS/src/cblas_dtpmv.c
index 94381aff4f..bd502fea96 100644
--- a/CBLAS/src/cblas_dtpmv.c
+++ b/CBLAS/src/cblas_dtpmv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dtpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_dtpmv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const double  *Ap, double  *X, const CBLAS_INT incX)
 {
@@ -38,7 +38,7 @@ void cblas_dtpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_dtpmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dtpmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -48,7 +48,7 @@ void cblas_dtpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_dtpmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dtpmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -57,7 +57,7 @@ void cblas_dtpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_dtpmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_dtpmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -76,7 +76,7 @@ void cblas_dtpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_dtpmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dtpmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -87,7 +87,7 @@ void cblas_dtpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'N';
       else
       {
-         cblas_xerbla(3, "cblas_dtpmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dtpmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -97,7 +97,7 @@ void cblas_dtpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_dtpmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_dtpmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -110,7 +110,7 @@ void cblas_dtpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
 
       F77_dtpmv( F77_UL, F77_TA, F77_DI, &F77_N, Ap, X,&F77_incX);
    }
-   else cblas_xerbla(1, "cblas_dtpmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_dtpmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dtpsv.c b/CBLAS/src/cblas_dtpsv.c
index 53181b253f..c7894ca744 100644
--- a/CBLAS/src/cblas_dtpsv.c
+++ b/CBLAS/src/cblas_dtpsv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dtpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_dtpsv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const double  *Ap, double  *X, const CBLAS_INT incX)
 {
@@ -38,7 +38,7 @@ void cblas_dtpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_dtpsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dtpsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -48,7 +48,7 @@ void cblas_dtpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_dtpsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dtpsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -57,7 +57,7 @@ void cblas_dtpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_dtpsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_dtpsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -76,7 +76,7 @@ void cblas_dtpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_dtpsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dtpsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -87,7 +87,7 @@ void cblas_dtpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'N';
       else
       {
-         cblas_xerbla(3, "cblas_dtpsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dtpsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -97,7 +97,7 @@ void cblas_dtpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_dtpsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_dtpsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -111,7 +111,7 @@ void cblas_dtpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       F77_dtpsv( F77_UL, F77_TA, F77_DI, &F77_N, Ap, X,&F77_incX);
 
    }
-   else cblas_xerbla(1, "cblas_dtpsv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_dtpsv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dtrmm.c b/CBLAS/src/cblas_dtrmm.c
index c2ea08a5ba..1421d5d158 100644
--- a/CBLAS/src/cblas_dtrmm.c
+++ b/CBLAS/src/cblas_dtrmm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dtrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
+void API_SUFFIX(cblas_dtrmm)(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
                  const CBLAS_UPLO Uplo, const  CBLAS_TRANSPOSE TransA,
                  const CBLAS_DIAG Diag, const CBLAS_INT M, const CBLAS_INT N,
                  const double alpha, const double  *A, const CBLAS_INT lda,
@@ -45,7 +45,7 @@ void cblas_dtrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='L';
       else
       {
-         cblas_xerbla(2, "cblas_dtrmm","Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dtrmm","Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -54,7 +54,7 @@ void cblas_dtrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(3, "cblas_dtrmm","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dtrmm","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -65,7 +65,7 @@ void cblas_dtrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(4, "cblas_dtrmm","Illegal Trans setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_dtrmm","Illegal Trans setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -75,7 +75,7 @@ void cblas_dtrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Diag == CblasNonUnit ) DI='N';
       else
       {
-         cblas_xerbla(5, "cblas_dtrmm","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(5, "cblas_dtrmm","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -96,7 +96,7 @@ void cblas_dtrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='R';
       else
       {
-         cblas_xerbla(2, "cblas_dtrmm","Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dtrmm","Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -106,7 +106,7 @@ void cblas_dtrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_dtrmm","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dtrmm","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -117,7 +117,7 @@ void cblas_dtrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(4, "cblas_dtrmm","Illegal Trans setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_dtrmm","Illegal Trans setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -127,7 +127,7 @@ void cblas_dtrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Diag == CblasNonUnit ) DI='N';
       else
       {
-         cblas_xerbla(5, "cblas_dtrmm","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(5, "cblas_dtrmm","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -141,7 +141,7 @@ void cblas_dtrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       #endif
       F77_dtrmm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_N, &F77_M, &alpha, A, &F77_lda, B, &F77_ldb);
    }
-   else cblas_xerbla(1, "cblas_dtrmm", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_dtrmm", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dtrmv.c b/CBLAS/src/cblas_dtrmv.c
index f2ec535b75..6ee99a5d81 100644
--- a/CBLAS/src/cblas_dtrmv.c
+++ b/CBLAS/src/cblas_dtrmv.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dtrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_dtrmv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const double  *A, const CBLAS_INT lda,
                  double  *X, const CBLAS_INT incX)
@@ -43,7 +43,7 @@ void cblas_dtrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_dtrmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dtrmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -53,7 +53,7 @@ void cblas_dtrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_dtrmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dtrmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -62,7 +62,7 @@ void cblas_dtrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_dtrmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_dtrmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -82,7 +82,7 @@ void cblas_dtrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_dtrmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dtrmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -93,7 +93,7 @@ void cblas_dtrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'N';
       else
       {
-         cblas_xerbla(3, "cblas_dtrmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dtrmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -103,7 +103,7 @@ void cblas_dtrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_dtrmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_dtrmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -115,7 +115,7 @@ void cblas_dtrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       #endif
       F77_dtrmv( F77_UL, F77_TA, F77_DI, &F77_N, A, &F77_lda, X,
                       &F77_incX);
-   } else cblas_xerbla(1, "cblas_dtrmv", "Illegal layout setting, %d\n", layout);
+   } else API_SUFFIX(cblas_xerbla)(1, "cblas_dtrmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dtrsm.c b/CBLAS/src/cblas_dtrsm.c
index 5fe185d251..a53a8a0609 100644
--- a/CBLAS/src/cblas_dtrsm.c
+++ b/CBLAS/src/cblas_dtrsm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dtrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
+void API_SUFFIX(cblas_dtrsm)(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
                  const CBLAS_UPLO Uplo, const CBLAS_TRANSPOSE TransA,
                  const CBLAS_DIAG Diag, const CBLAS_INT M, const CBLAS_INT N,
                  const double alpha, const double  *A, const CBLAS_INT lda,
@@ -46,7 +46,7 @@ void cblas_dtrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='L';
       else
       {
-         cblas_xerbla(2, "cblas_dtrsm","Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dtrsm","Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -55,7 +55,7 @@ void cblas_dtrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower) UL='L';
       else
       {
-         cblas_xerbla(3, "cblas_dtrsm","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dtrsm","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -66,7 +66,7 @@ void cblas_dtrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( TransA == CblasNoTrans  ) TA='N';
       else
       {
-         cblas_xerbla(4, "cblas_dtrsm","Illegal Trans setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_dtrsm","Illegal Trans setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -76,7 +76,7 @@ void cblas_dtrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Diag == CblasNonUnit) DI='N';
       else
       {
-         cblas_xerbla(5, "cblas_dtrsm","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(5, "cblas_dtrsm","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -99,7 +99,7 @@ void cblas_dtrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='R';
       else
       {
-         cblas_xerbla(2, "cblas_dtrsm","Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dtrsm","Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -109,7 +109,7 @@ void cblas_dtrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_dtrsm","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dtrsm","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -120,7 +120,7 @@ void cblas_dtrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( TransA == CblasNoTrans  ) TA='N';
       else
       {
-         cblas_xerbla(4, "cblas_dtrsm","Illegal Trans setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_dtrsm","Illegal Trans setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -130,7 +130,7 @@ void cblas_dtrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Diag == CblasNonUnit) DI='N';
       else
       {
-         cblas_xerbla(5, "cblas_dtrsm","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(5, "cblas_dtrsm","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -146,7 +146,7 @@ void cblas_dtrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       F77_dtrsm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_N, &F77_M, &alpha, A,
                &F77_lda, B, &F77_ldb);
    }
-   else cblas_xerbla(1, "cblas_dtrsm","Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_dtrsm","Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dtrsv.c b/CBLAS/src/cblas_dtrsv.c
index 51b49da14d..527d3c255d 100644
--- a/CBLAS/src/cblas_dtrsv.c
+++ b/CBLAS/src/cblas_dtrsv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_dtrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_dtrsv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const double  *A, const CBLAS_INT lda, double  *X,
                  const CBLAS_INT incX)
@@ -41,7 +41,7 @@ void cblas_dtrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_dtrsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dtrsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -51,7 +51,7 @@ void cblas_dtrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_dtrsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dtrsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -60,7 +60,7 @@ void cblas_dtrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_dtrsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_dtrsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -80,7 +80,7 @@ void cblas_dtrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_dtrsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_dtrsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -91,7 +91,7 @@ void cblas_dtrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'N';
       else
       {
-         cblas_xerbla(3, "cblas_dtrsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_dtrsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -101,7 +101,7 @@ void cblas_dtrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_dtrsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_dtrsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -114,7 +114,7 @@ void cblas_dtrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       F77_dtrsv( F77_UL, F77_TA, F77_DI, &F77_N, A, &F77_lda, X,
                       &F77_incX);
    }
-   else cblas_xerbla(1, "cblas_dtrsv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_dtrsv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_dzasum.c b/CBLAS/src/cblas_dzasum.c
index b68879860b..d306ac6dce 100644
--- a/CBLAS/src/cblas_dzasum.c
+++ b/CBLAS/src/cblas_dzasum.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-double cblas_dzasum( const CBLAS_INT N, const void *X, const CBLAS_INT incX)
+double API_SUFFIX(cblas_dzasum)( const CBLAS_INT N, const void *X, const CBLAS_INT incX)
 {
    double asum;
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_dznrm2.c b/CBLAS/src/cblas_dznrm2.c
index f815e15327..92ba052418 100644
--- a/CBLAS/src/cblas_dznrm2.c
+++ b/CBLAS/src/cblas_dznrm2.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-double cblas_dznrm2( const CBLAS_INT N, const void *X, const CBLAS_INT incX)
+double API_SUFFIX(cblas_dznrm2)( const CBLAS_INT N, const void *X, const CBLAS_INT incX)
 {
    double nrm2;
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_icamax.c b/CBLAS/src/cblas_icamax.c
index 66a12cdab8..8fc0c592b2 100644
--- a/CBLAS/src/cblas_icamax.c
+++ b/CBLAS/src/cblas_icamax.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-CBLAS_INDEX cblas_icamax( const CBLAS_INT N, const void *X, const CBLAS_INT incX)
+CBLAS_INDEX API_SUFFIX(cblas_icamax)( const CBLAS_INT N, const void *X, const CBLAS_INT incX)
 {
 #ifdef F77_INT
    F77_INT F77_N=N, F77_incX=incX, F77_iamax;
diff --git a/CBLAS/src/cblas_idamax.c b/CBLAS/src/cblas_idamax.c
index db016c7cf7..4d7599f9c5 100644
--- a/CBLAS/src/cblas_idamax.c
+++ b/CBLAS/src/cblas_idamax.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-CBLAS_INDEX cblas_idamax( const CBLAS_INT N, const double *X, const CBLAS_INT incX)
+CBLAS_INDEX API_SUFFIX(cblas_idamax)( const CBLAS_INT N, const double *X, const CBLAS_INT incX)
 {
 #ifdef F77_INT
    F77_INT F77_N=N, F77_incX=incX, F77_iamax;
diff --git a/CBLAS/src/cblas_isamax.c b/CBLAS/src/cblas_isamax.c
index 0898a82701..8b0f29a3bd 100644
--- a/CBLAS/src/cblas_isamax.c
+++ b/CBLAS/src/cblas_isamax.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-CBLAS_INDEX cblas_isamax( const CBLAS_INT N, const float *X, const CBLAS_INT incX)
+CBLAS_INDEX API_SUFFIX(cblas_isamax)( const CBLAS_INT N, const float *X, const CBLAS_INT incX)
 {
 #ifdef F77_INT
    F77_INT F77_N=N, F77_incX=incX, F77_iamax;
diff --git a/CBLAS/src/cblas_izamax.c b/CBLAS/src/cblas_izamax.c
index c173e9d44e..20ca0cdb7b 100644
--- a/CBLAS/src/cblas_izamax.c
+++ b/CBLAS/src/cblas_izamax.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-CBLAS_INDEX cblas_izamax( const CBLAS_INT N, const void *X, const CBLAS_INT incX)
+CBLAS_INDEX API_SUFFIX(cblas_izamax)( const CBLAS_INT N, const void *X, const CBLAS_INT incX)
 {
 #ifdef F77_INT
    F77_INT F77_N=N, F77_incX=incX, F77_iamax;
diff --git a/CBLAS/src/cblas_sasum.c b/CBLAS/src/cblas_sasum.c
index 091561ed5e..fcdfbc01b2 100644
--- a/CBLAS/src/cblas_sasum.c
+++ b/CBLAS/src/cblas_sasum.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-float cblas_sasum( const CBLAS_INT N, const float *X, const CBLAS_INT incX)
+float API_SUFFIX(cblas_sasum)( const CBLAS_INT N, const float *X, const CBLAS_INT incX)
 {
    float asum;
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_saxpby.c b/CBLAS/src/cblas_saxpby.c
new file mode 100644
index 0000000000..b8e025d766
--- /dev/null
+++ b/CBLAS/src/cblas_saxpby.c
@@ -0,0 +1,23 @@
+/*
+ * cblas_saxpby.c
+ *
+ * The program is a C interface to saxpby.
+ * It calls the fortran wrapper before calling saxpby.
+ *
+ * Written by Martin Koehler, 08/24/2024
+ *
+ */
+#include "cblas.h"
+#include "cblas_f77.h"
+void API_SUFFIX(cblas_saxpby)( const CBLAS_INT N, const float alpha, const float *X,
+                       const CBLAS_INT incX, const float beta, float *Y, const CBLAS_INT incY)
+{
+#ifdef F77_INT
+   F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;
+#else
+   #define F77_N N
+   #define F77_incX incX
+   #define F77_incY incY
+#endif
+   F77_saxpby( &F77_N, &alpha, X, &F77_incX, &beta, Y, &F77_incY);
+}
diff --git a/CBLAS/src/cblas_saxpy.c b/CBLAS/src/cblas_saxpy.c
index 2c56f499d6..8d1541d8a2 100644
--- a/CBLAS/src/cblas_saxpy.c
+++ b/CBLAS/src/cblas_saxpy.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_saxpy( const CBLAS_INT N, const float alpha, const float *X,
+void API_SUFFIX(cblas_saxpy)( const CBLAS_INT N, const float alpha, const float *X,
                        const CBLAS_INT incX, float *Y, const CBLAS_INT incY)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_scabs1.c b/CBLAS/src/cblas_scabs1.c
new file mode 100644
index 0000000000..5899603d9a
--- /dev/null
+++ b/CBLAS/src/cblas_scabs1.c
@@ -0,0 +1,15 @@
+/*
+ * cblas_scabs1.c
+ *
+ * The program is a C interface to scabs1.
+ *
+ */
+#include "cblas.h"
+#include "cblas_f77.h"
+float API_SUFFIX(cblas_scabs1)(const void *c)
+{
+   float cabs1 = 0.0;
+   F77_scabs1_sub(c, &cabs1);
+   return cabs1; 
+}
+
diff --git a/CBLAS/src/cblas_scasum.c b/CBLAS/src/cblas_scasum.c
index 1f84efefd0..feda02d751 100644
--- a/CBLAS/src/cblas_scasum.c
+++ b/CBLAS/src/cblas_scasum.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-float cblas_scasum( const CBLAS_INT N, const void *X, const CBLAS_INT incX)
+float API_SUFFIX(cblas_scasum)( const CBLAS_INT N, const void *X, const CBLAS_INT incX)
 {
    float asum;
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_scnrm2.c b/CBLAS/src/cblas_scnrm2.c
index fd66915371..a1825816c0 100644
--- a/CBLAS/src/cblas_scnrm2.c
+++ b/CBLAS/src/cblas_scnrm2.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-float cblas_scnrm2( const CBLAS_INT N, const void *X, const CBLAS_INT incX)
+float API_SUFFIX(cblas_scnrm2)( const CBLAS_INT N, const void *X, const CBLAS_INT incX)
 {
    float nrm2;
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_scopy.c b/CBLAS/src/cblas_scopy.c
index 24d3bf5860..7f3dcdcc9f 100644
--- a/CBLAS/src/cblas_scopy.c
+++ b/CBLAS/src/cblas_scopy.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_scopy( const CBLAS_INT N, const float *X,
+void API_SUFFIX(cblas_scopy)( const CBLAS_INT N, const float *X,
                       const CBLAS_INT incX, float *Y, const CBLAS_INT incY)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_sdot.c b/CBLAS/src/cblas_sdot.c
index a263ae3c42..76e56353a0 100644
--- a/CBLAS/src/cblas_sdot.c
+++ b/CBLAS/src/cblas_sdot.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-float cblas_sdot( const CBLAS_INT N, const float *X,
+float API_SUFFIX(cblas_sdot)( const CBLAS_INT N, const float *X,
                       const CBLAS_INT incX, const float *Y, const CBLAS_INT incY)
 {
    float dot;
diff --git a/CBLAS/src/cblas_sdsdot.c b/CBLAS/src/cblas_sdsdot.c
index 48694f921e..113dd57b65 100644
--- a/CBLAS/src/cblas_sdsdot.c
+++ b/CBLAS/src/cblas_sdsdot.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-float cblas_sdsdot( const CBLAS_INT N, const float alpha, const float *X,
+float API_SUFFIX(cblas_sdsdot)( const CBLAS_INT N, const float alpha, const float *X,
                       const CBLAS_INT incX, const float *Y, const CBLAS_INT incY)
 {
    float dot;
diff --git a/CBLAS/src/cblas_sgbmv.c b/CBLAS/src/cblas_sgbmv.c
index 3889e5f6d6..e530260e67 100644
--- a/CBLAS/src/cblas_sgbmv.c
+++ b/CBLAS/src/cblas_sgbmv.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_sgbmv(const CBLAS_LAYOUT layout,
+void API_SUFFIX(cblas_sgbmv)(const CBLAS_LAYOUT layout,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_INT M, const CBLAS_INT N,
                  const CBLAS_INT KL, const CBLAS_INT KU,
                  const float alpha, const float *A, const CBLAS_INT lda,
@@ -46,7 +46,7 @@ void cblas_sgbmv(const CBLAS_LAYOUT layout,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(2, "cblas_sgbmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_sgbmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -65,7 +65,7 @@ void cblas_sgbmv(const CBLAS_LAYOUT layout,
       else if (TransA == CblasConjTrans) TA = 'N';
       else
       {
-         cblas_xerbla(2, "cblas_sgbmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_sgbmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -76,7 +76,7 @@ void cblas_sgbmv(const CBLAS_LAYOUT layout,
       F77_sgbmv(F77_TA, &F77_N, &F77_M, &F77_KU, &F77_KL, &alpha,
                      A ,&F77_lda, X, &F77_incX, &beta, Y, &F77_incY);
    }
-   else cblas_xerbla(1, "cblas_sgbmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_sgbmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_sgemm.c b/CBLAS/src/cblas_sgemm.c
index 99708a7d7f..26be2a8f0a 100644
--- a/CBLAS/src/cblas_sgemm.c
+++ b/CBLAS/src/cblas_sgemm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_sgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
+void API_SUFFIX(cblas_sgemm)(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
                  const CBLAS_TRANSPOSE TransB, const CBLAS_INT M, const CBLAS_INT N,
                  const CBLAS_INT K, const float alpha, const float  *A,
                  const CBLAS_INT lda, const float  *B, const CBLAS_INT ldb,
@@ -46,7 +46,7 @@ void cblas_sgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(2, "cblas_sgemm",
+         API_SUFFIX(cblas_xerbla)(2, "cblas_sgemm",
                        "Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
@@ -58,7 +58,7 @@ void cblas_sgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       else if ( TransB == CblasNoTrans )   TB='N';
       else
       {
-         cblas_xerbla(3, "cblas_sgemm",
+         API_SUFFIX(cblas_xerbla)(3, "cblas_sgemm",
                        "Illegal TransB setting, %d\n", TransB);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
@@ -79,7 +79,7 @@ void cblas_sgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       else if ( TransA == CblasNoTrans )   TB='N';
       else
       {
-         cblas_xerbla(2, "cblas_sgemm",
+         API_SUFFIX(cblas_xerbla)(2, "cblas_sgemm",
                        "Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
@@ -90,7 +90,7 @@ void cblas_sgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       else if ( TransB == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(2, "cblas_sgemm",
+         API_SUFFIX(cblas_xerbla)(3, "cblas_sgemm",
                        "Illegal TransB setting, %d\n", TransB);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
@@ -103,7 +103,7 @@ void cblas_sgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
 
       F77_sgemm(F77_TA, F77_TB, &F77_N, &F77_M, &F77_K, &alpha, B, &F77_ldb, A, &F77_lda, &beta, C, &F77_ldc);
    } else
-     cblas_xerbla(1, "cblas_sgemm",
+     API_SUFFIX(cblas_xerbla)(1, "cblas_sgemm",
                      "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
diff --git a/CBLAS/src/cblas_sgemmtr.c b/CBLAS/src/cblas_sgemmtr.c
new file mode 100644
index 0000000000..065a031bec
--- /dev/null
+++ b/CBLAS/src/cblas_sgemmtr.c
@@ -0,0 +1,136 @@
+
+/*
+ *
+ * cblas_sgemmtr.c
+ * This program is a C interface to sgemmtr.
+ * Written by Martin Koehler, MPI Magdeburg
+ * 06/24/2024
+ *
+ */
+
+#include "cblas.h"
+#include "cblas_f77.h"
+void API_SUFFIX(cblas_sgemmtr)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo, const CBLAS_TRANSPOSE TransA,
+        const CBLAS_TRANSPOSE TransB, const CBLAS_INT N,
+        const CBLAS_INT K, const float alpha, const float  *A,
+        const CBLAS_INT lda, const float  *B, const CBLAS_INT ldb,
+        const float beta, float  *C, const CBLAS_INT ldc)
+{
+    char TA, TB, UL;
+#ifdef F77_CHAR
+    F77_CHAR F77_TA, F77_TB, F77_UL;
+#else
+#define F77_TA &TA
+#define F77_TB &TB
+#define F77_UL &UL
+#endif
+
+#ifdef F77_INT
+    F77_INT F77_N=N, F77_K=K, F77_lda=lda, F77_ldb=ldb;
+    F77_INT F77_ldc=ldc;
+#else
+#define F77_N N
+#define F77_K K
+#define F77_lda lda
+#define F77_ldb ldb
+#define F77_ldc ldc
+#endif
+
+    extern int CBLAS_CallFromC;
+    extern int RowMajorStrg;
+    RowMajorStrg = 0;
+    CBLAS_CallFromC = 1;
+
+
+    if( layout == CblasColMajor )
+    {
+        if ( Uplo == CblasUpper ) UL = 'U';
+        else if (Uplo == CblasLower) UL= 'L';
+        else {
+            API_SUFFIX(cblas_xerbla)(2, "cblas_sgemmtr", "Illegal Uplo setting, %d\n", Uplo);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+
+
+        if(TransA == CblasTrans) TA='T';
+        else if ( TransA == CblasConjTrans ) TA='C';
+        else if ( TransA == CblasNoTrans )   TA='N';
+        else
+        {
+            API_SUFFIX(cblas_xerbla)(3, "cblas_sgemmtr",
+                    "Illegal TransA setting, %d\n", TransA);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+
+        if(TransB == CblasTrans) TB='T';
+        else if ( TransB == CblasConjTrans ) TB='C';
+        else if ( TransB == CblasNoTrans )   TB='N';
+        else
+        {
+            API_SUFFIX(cblas_xerbla)(4, "cblas_sgemmtr",
+                    "Illegal TransB setting, %d\n", TransB);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+
+#ifdef F77_CHAR
+        F77_TA = C2F_CHAR(&TA);
+        F77_TB = C2F_CHAR(&TB);
+        F77_UL = C2F_CHAR(&UL);
+#endif
+
+        F77_sgemmtr(F77_UL, F77_TA, F77_TB, &F77_N, &F77_K, &alpha, A, &F77_lda, B, &F77_ldb, &beta, C, &F77_ldc);
+    }
+    else if (layout == CblasRowMajor)
+    {
+        if ( Uplo == CblasUpper ) UL = 'L';
+        else if (Uplo == CblasLower) UL= 'U';
+        else {
+            API_SUFFIX(cblas_xerbla)(2, "cblas_sgemmtr", "Illegal Uplo setting, %d\n", Uplo);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+
+
+        RowMajorStrg = 1;
+        if(TransA == CblasTrans) TB='T';
+        else if ( TransA == CblasConjTrans ) TB='C';
+        else if ( TransA == CblasNoTrans )   TB='N';
+        else
+        {
+            API_SUFFIX(cblas_xerbla)(3, "cblas_sgemmtr",
+                    "Illegal TransA setting, %d\n", TransA);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+        if(TransB == CblasTrans) TA='T';
+        else if ( TransB == CblasConjTrans ) TA='C';
+        else if ( TransB == CblasNoTrans )   TA='N';
+        else
+        {
+            API_SUFFIX(cblas_xerbla)(4, "cblas_sgemmtr",
+                    "Illegal TransB setting, %d\n", TransB);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+#ifdef F77_CHAR
+        F77_TA = C2F_CHAR(&TA);
+        F77_TB = C2F_CHAR(&TB);
+        F77_UL = C2F_CHAR(&UL);
+#endif
+
+        F77_sgemmtr(F77_UL, F77_TA, F77_TB, &F77_N, &F77_K, &alpha, B, &F77_ldb, A, &F77_lda, &beta, C, &F77_ldc);
+    } else
+        API_SUFFIX(cblas_xerbla)(1, "cblas_sgemmtr",
+                "Illegal layout setting, %d\n", layout);
+    CBLAS_CallFromC = 0;
+    RowMajorStrg = 0;
+}
diff --git a/CBLAS/src/cblas_sgemv.c b/CBLAS/src/cblas_sgemv.c
index 14beeb3414..5c95151f9e 100644
--- a/CBLAS/src/cblas_sgemv.c
+++ b/CBLAS/src/cblas_sgemv.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_sgemv(const CBLAS_LAYOUT layout,
+void API_SUFFIX(cblas_sgemv)(const CBLAS_LAYOUT layout,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_INT M, const CBLAS_INT N,
                  const float alpha, const float  *A, const CBLAS_INT lda,
                  const float  *X, const CBLAS_INT incX, const float beta,
@@ -42,7 +42,7 @@ void cblas_sgemv(const CBLAS_LAYOUT layout,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(2, "cblas_sgemv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_sgemv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
       }
@@ -60,7 +60,7 @@ void cblas_sgemv(const CBLAS_LAYOUT layout,
       else if (TransA == CblasConjTrans) TA = 'N';
       else
       {
-         cblas_xerbla(2, "cblas_sgemv", "Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_sgemv", "Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -71,7 +71,7 @@ void cblas_sgemv(const CBLAS_LAYOUT layout,
       F77_sgemv(F77_TA, &F77_N, &F77_M, &alpha, A, &F77_lda, X,
                 &F77_incX, &beta, Y, &F77_incY);
    }
-   else cblas_xerbla(1, "cblas_sgemv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_sgemv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_sger.c b/CBLAS/src/cblas_sger.c
index ddcdb1d670..b456a31ad1 100644
--- a/CBLAS/src/cblas_sger.c
+++ b/CBLAS/src/cblas_sger.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_sger(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N,
+void API_SUFFIX(cblas_sger)(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N,
                 const float  alpha, const float  *X, const CBLAS_INT incX,
                 const float  *Y, const CBLAS_INT incY, float  *A, const CBLAS_INT lda)
 {
@@ -39,7 +39,7 @@ void cblas_sger(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N,
       F77_sger( &F77_N, &F77_M, &alpha, Y, &F77_incY, X, &F77_incX, A,
         &F77_lda);
    }
-   else cblas_xerbla(1, "cblas_sger", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_sger", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_snrm2.c b/CBLAS/src/cblas_snrm2.c
index a2c482bf13..d1c70be8fd 100644
--- a/CBLAS/src/cblas_snrm2.c
+++ b/CBLAS/src/cblas_snrm2.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-float cblas_snrm2( const CBLAS_INT N, const float *X, const CBLAS_INT incX)
+float API_SUFFIX(cblas_snrm2)( const CBLAS_INT N, const float *X, const CBLAS_INT incX)
 {
    float nrm2;
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_srot.c b/CBLAS/src/cblas_srot.c
index 57fd38bbf7..61c4c75042 100644
--- a/CBLAS/src/cblas_srot.c
+++ b/CBLAS/src/cblas_srot.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_srot( const CBLAS_INT N, float *X, const CBLAS_INT incX, float *Y,
+void API_SUFFIX(cblas_srot)( const CBLAS_INT N, float *X, const CBLAS_INT incX, float *Y,
                       const CBLAS_INT incY, const float  c, const float  s)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_srotg.c b/CBLAS/src/cblas_srotg.c
index 4584a29c9a..b96ed1c5c4 100644
--- a/CBLAS/src/cblas_srotg.c
+++ b/CBLAS/src/cblas_srotg.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_srotg(  float *a, float *b, float *c, float *s)
+void API_SUFFIX(cblas_srotg)(  float *a, float *b, float *c, float *s)
 {
    F77_srotg(a,b,c,s);
 }
diff --git a/CBLAS/src/cblas_srotm.c b/CBLAS/src/cblas_srotm.c
index 7de0970ce0..04e3c6438b 100644
--- a/CBLAS/src/cblas_srotm.c
+++ b/CBLAS/src/cblas_srotm.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_srotm( const CBLAS_INT N, float *X, const CBLAS_INT incX, float *Y,
+void API_SUFFIX(cblas_srotm)( const CBLAS_INT N, float *X, const CBLAS_INT incX, float *Y,
                        const CBLAS_INT incY, const float *P)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_srotmg.c b/CBLAS/src/cblas_srotmg.c
index 1d84054a02..6290a6207d 100644
--- a/CBLAS/src/cblas_srotmg.c
+++ b/CBLAS/src/cblas_srotmg.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_srotmg( float *d1, float *d2, float *b1,
+void API_SUFFIX(cblas_srotmg)( float *d1, float *d2, float *b1,
                         const float b2, float *p)
 {
    F77_srotmg(d1,d2,b1,&b2,p);
diff --git a/CBLAS/src/cblas_ssbmv.c b/CBLAS/src/cblas_ssbmv.c
index eab4f7bcd7..1c85cff6ae 100644
--- a/CBLAS/src/cblas_ssbmv.c
+++ b/CBLAS/src/cblas_ssbmv.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ssbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_ssbmv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
            const CBLAS_INT N, const CBLAS_INT K, const float alpha, const float *A,
            const CBLAS_INT lda, const float *X, const CBLAS_INT incX,
            const float beta, float *Y, const CBLAS_INT incY)
@@ -41,7 +41,7 @@ void cblas_ssbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_ssbmv","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ssbmv","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -58,7 +58,7 @@ void cblas_ssbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_ssbmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ssbmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -69,7 +69,7 @@ void cblas_ssbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       F77_ssbmv(F77_UL, &F77_N, &F77_K, &alpha, A, &F77_lda, X,
       &F77_incX, &beta, Y, &F77_incY);
    }
-   else cblas_xerbla(1, "cblas_ssbmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_ssbmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_sscal.c b/CBLAS/src/cblas_sscal.c
index ad5af245ef..98aecd7133 100644
--- a/CBLAS/src/cblas_sscal.c
+++ b/CBLAS/src/cblas_sscal.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_sscal( const CBLAS_INT N, const float alpha, float *X,
+void API_SUFFIX(cblas_sscal)( const CBLAS_INT N, const float alpha, float *X,
                        const CBLAS_INT incX)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_sspmv.c b/CBLAS/src/cblas_sspmv.c
index bd9de77e23..05e37e8f52 100644
--- a/CBLAS/src/cblas_sspmv.c
+++ b/CBLAS/src/cblas_sspmv.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_sspmv(const CBLAS_LAYOUT layout,
+void API_SUFFIX(cblas_sspmv)(const CBLAS_LAYOUT layout,
                  const CBLAS_UPLO Uplo, const CBLAS_INT N,
                  const float alpha, const float  *AP,
                  const float  *X, const CBLAS_INT incX, const float beta,
@@ -38,7 +38,7 @@ void cblas_sspmv(const CBLAS_LAYOUT layout,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_sspmv","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_sspmv","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -56,7 +56,7 @@ void cblas_sspmv(const CBLAS_LAYOUT layout,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_sspmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_sspmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -67,7 +67,7 @@ void cblas_sspmv(const CBLAS_LAYOUT layout,
       F77_sspmv(F77_UL, &F77_N, &alpha,
                      AP, X,&F77_incX, &beta, Y, &F77_incY);
    }
-   else cblas_xerbla(1, "cblas_sspmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_sspmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
 }
diff --git a/CBLAS/src/cblas_sspr.c b/CBLAS/src/cblas_sspr.c
index c24501ed99..de4750f167 100644
--- a/CBLAS/src/cblas_sspr.c
+++ b/CBLAS/src/cblas_sspr.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_sspr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_sspr)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                 const CBLAS_INT N, const  float alpha, const float *X,
                 const CBLAS_INT incX, float *Ap)
 {
@@ -38,7 +38,7 @@ void cblas_sspr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_sspr","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_sspr","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -56,7 +56,7 @@ void cblas_sspr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_sspr","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_sspr","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -65,7 +65,7 @@ void cblas_sspr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          F77_UL = C2F_CHAR(&UL);
       #endif
       F77_sspr(F77_UL, &F77_N, &alpha, X, &F77_incX, Ap);
-   } else cblas_xerbla(1, "cblas_sspr", "Illegal layout setting, %d\n", layout);
+   } else API_SUFFIX(cblas_xerbla)(1, "cblas_sspr", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_sspr2.c b/CBLAS/src/cblas_sspr2.c
index 88b3bbc705..1a0e4f5205 100644
--- a/CBLAS/src/cblas_sspr2.c
+++ b/CBLAS/src/cblas_sspr2.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_sspr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_sspr2)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                 const CBLAS_INT N, const float  alpha, const float  *X,
                 const CBLAS_INT incX, const float  *Y, const CBLAS_INT incY, float  *A)
 {
@@ -38,7 +38,7 @@ void cblas_sspr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_sspr2","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_sspr2","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -56,7 +56,7 @@ void cblas_sspr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_sspr2","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_sspr2","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -65,7 +65,7 @@ void cblas_sspr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          F77_UL = C2F_CHAR(&UL);
       #endif
       F77_sspr2(F77_UL, &F77_N, &alpha, X, &F77_incX, Y, &F77_incY,  A);
-   } else cblas_xerbla(1, "cblas_sspr2", "Illegal layout setting, %d\n", layout);
+   } else API_SUFFIX(cblas_xerbla)(1, "cblas_sspr2", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
 }
diff --git a/CBLAS/src/cblas_sswap.c b/CBLAS/src/cblas_sswap.c
index 222993786d..cc5a633b09 100644
--- a/CBLAS/src/cblas_sswap.c
+++ b/CBLAS/src/cblas_sswap.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_sswap( const CBLAS_INT N, float *X, const CBLAS_INT incX, float *Y,
+void API_SUFFIX(cblas_sswap)( const CBLAS_INT N, float *X, const CBLAS_INT incX, float *Y,
                        const CBLAS_INT incY)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_ssymm.c b/CBLAS/src/cblas_ssymm.c
index b70c09c46b..6d347f5333 100644
--- a/CBLAS/src/cblas_ssymm.c
+++ b/CBLAS/src/cblas_ssymm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ssymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
+void API_SUFFIX(cblas_ssymm)(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
                  const CBLAS_UPLO Uplo, const CBLAS_INT M, const CBLAS_INT N,
                  const float alpha, const float  *A, const CBLAS_INT lda,
                  const float  *B, const CBLAS_INT ldb, const float beta,
@@ -45,7 +45,7 @@ void cblas_ssymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='L';
       else
       {
-         cblas_xerbla(2, "cblas_ssymm",
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ssymm",
                        "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
@@ -56,7 +56,7 @@ void cblas_ssymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(3, "cblas_ssymm",
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ssymm",
                        "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
@@ -76,7 +76,7 @@ void cblas_ssymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='R';
       else
       {
-         cblas_xerbla(2, "cblas_ssymm",
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ssymm",
                        "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
@@ -87,7 +87,7 @@ void cblas_ssymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_ssymm",
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ssymm",
                        "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
@@ -100,7 +100,7 @@ void cblas_ssymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       #endif
 
       F77_ssymm(F77_SD, F77_UL, &F77_N, &F77_M, &alpha, A, &F77_lda, B, &F77_ldb, &beta, C, &F77_ldc);
-   } else  cblas_xerbla(1, "cblas_ssymm",
+   } else  API_SUFFIX(cblas_xerbla)(1, "cblas_ssymm",
                      "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
diff --git a/CBLAS/src/cblas_ssymv.c b/CBLAS/src/cblas_ssymv.c
index 6a005c5487..ecd72a12fb 100644
--- a/CBLAS/src/cblas_ssymv.c
+++ b/CBLAS/src/cblas_ssymv.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ssymv(const CBLAS_LAYOUT layout,
+void API_SUFFIX(cblas_ssymv)(const CBLAS_LAYOUT layout,
                  const CBLAS_UPLO Uplo, const CBLAS_INT N,
                  const float alpha, const float  *A, const CBLAS_INT lda,
                  const float  *X, const CBLAS_INT incX, const float beta,
@@ -40,7 +40,7 @@ void cblas_ssymv(const CBLAS_LAYOUT layout,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_ssymv","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ssymv","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -58,7 +58,7 @@ void cblas_ssymv(const CBLAS_LAYOUT layout,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_ssymv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ssymv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -69,7 +69,7 @@ void cblas_ssymv(const CBLAS_LAYOUT layout,
       F77_ssymv(F77_UL, &F77_N, &alpha,
                      A ,&F77_lda, X,&F77_incX, &beta, Y, &F77_incY);
    }
-   else cblas_xerbla(1, "cblas_ssymv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_ssymv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ssyr.c b/CBLAS/src/cblas_ssyr.c
index 8b960fa99f..2311a47094 100644
--- a/CBLAS/src/cblas_ssyr.c
+++ b/CBLAS/src/cblas_ssyr.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ssyr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_ssyr)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                 const CBLAS_INT N, const float  alpha, const float  *X,
                 const CBLAS_INT incX, float  *A, const CBLAS_INT lda)
 {
@@ -36,7 +36,7 @@ void cblas_ssyr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_ssyr","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ssyr","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -54,7 +54,7 @@ void cblas_ssyr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_ssyr","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ssyr","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -63,7 +63,7 @@ void cblas_ssyr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          F77_UL = C2F_CHAR(&UL);
       #endif
       F77_ssyr(F77_UL, &F77_N, &alpha, X, &F77_incX, A, &F77_lda);
-   } else cblas_xerbla(1, "cblas_ssyr", "Illegal layout setting, %d\n", layout);
+   } else API_SUFFIX(cblas_xerbla)(1, "cblas_ssyr", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ssyr2.c b/CBLAS/src/cblas_ssyr2.c
index 09512808ae..facf1bed87 100644
--- a/CBLAS/src/cblas_ssyr2.c
+++ b/CBLAS/src/cblas_ssyr2.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ssyr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_ssyr2)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                 const CBLAS_INT N, const float  alpha, const float  *X,
                 const CBLAS_INT incX, const float  *Y, const CBLAS_INT incY, float  *A,
                 const CBLAS_INT lda)
@@ -40,7 +40,7 @@ void cblas_ssyr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_ssyr2","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ssyr2","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -59,7 +59,7 @@ void cblas_ssyr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_ssyr2","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ssyr2","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -69,7 +69,7 @@ void cblas_ssyr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       #endif
       F77_ssyr2(F77_UL, &F77_N, &alpha, X, &F77_incX, Y, &F77_incY,  A,
                     &F77_lda);
-   } else cblas_xerbla(1, "cblas_ssyr2", "Illegal layout setting, %d\n", layout);
+   } else API_SUFFIX(cblas_xerbla)(1, "cblas_ssyr2", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ssyr2k.c b/CBLAS/src/cblas_ssyr2k.c
index 1a375e5df3..ca471b8fac 100644
--- a/CBLAS/src/cblas_ssyr2k.c
+++ b/CBLAS/src/cblas_ssyr2k.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ssyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_ssyr2k)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                   const CBLAS_TRANSPOSE Trans, const CBLAS_INT N, const CBLAS_INT K,
                   const float alpha, const float  *A, const CBLAS_INT lda,
                   const float  *B, const CBLAS_INT ldb, const float beta,
@@ -46,7 +46,7 @@ void cblas_ssyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(2, "cblas_ssyr2k",
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ssyr2k",
                        "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
@@ -58,7 +58,7 @@ void cblas_ssyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='N';
       else
       {
-         cblas_xerbla(3, "cblas_ssyr2k",
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ssyr2k",
                        "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
@@ -79,7 +79,7 @@ void cblas_ssyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_ssyr2k",
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ssyr2k",
                        "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
@@ -90,7 +90,7 @@ void cblas_ssyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='T';
       else
       {
-         cblas_xerbla(3, "cblas_ssyr2k",
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ssyr2k",
                        "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
@@ -103,7 +103,7 @@ void cblas_ssyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       #endif
 
       F77_ssyr2k(F77_UL, F77_TR, &F77_N, &F77_K, &alpha, A, &F77_lda, B, &F77_ldb, &beta, C, &F77_ldc);
-   } else  cblas_xerbla(1, "cblas_ssyr2k",
+   } else  API_SUFFIX(cblas_xerbla)(1, "cblas_ssyr2k",
                      "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
diff --git a/CBLAS/src/cblas_ssyrk.c b/CBLAS/src/cblas_ssyrk.c
index 3a2373dd6a..bf9b985087 100644
--- a/CBLAS/src/cblas_ssyrk.c
+++ b/CBLAS/src/cblas_ssyrk.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ssyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_ssyrk)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE Trans, const CBLAS_INT N, const CBLAS_INT K,
                  const float alpha, const float  *A, const CBLAS_INT lda,
                  const float beta, float  *C, const CBLAS_INT ldc)
@@ -44,7 +44,7 @@ void cblas_ssyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(2, "cblas_ssyrk",
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ssyrk",
                        "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
@@ -56,7 +56,7 @@ void cblas_ssyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='N';
       else
       {
-         cblas_xerbla(3, "cblas_ssyrk",
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ssyrk",
                        "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
@@ -77,7 +77,7 @@ void cblas_ssyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_ssyrk",
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ssyrk",
                        "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
@@ -88,7 +88,7 @@ void cblas_ssyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='T';
       else
       {
-         cblas_xerbla(3, "cblas_ssyrk",
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ssyrk",
                        "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
@@ -101,7 +101,7 @@ void cblas_ssyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       #endif
 
       F77_ssyrk(F77_UL, F77_TR, &F77_N, &F77_K, &alpha, A, &F77_lda, &beta, C, &F77_ldc);
-   } else  cblas_xerbla(1, "cblas_ssyrk",
+   } else  API_SUFFIX(cblas_xerbla)(1, "cblas_ssyrk",
                      "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
diff --git a/CBLAS/src/cblas_stbmv.c b/CBLAS/src/cblas_stbmv.c
index d89dbdd43c..9005e747d6 100644
--- a/CBLAS/src/cblas_stbmv.c
+++ b/CBLAS/src/cblas_stbmv.c
@@ -7,7 +7,7 @@
 #include "cblas.h"
 #include "cblas_f77.h"
 
-void cblas_stbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_stbmv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const CBLAS_INT K, const float  *A, const CBLAS_INT lda,
                  float  *X, const CBLAS_INT incX)
@@ -41,7 +41,7 @@ void cblas_stbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_stbmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_stbmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -51,7 +51,7 @@ void cblas_stbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_stbmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_stbmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -60,7 +60,7 @@ void cblas_stbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_stbmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_stbmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -80,7 +80,7 @@ void cblas_stbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_stbmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_stbmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -91,7 +91,7 @@ void cblas_stbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'N';
       else
       {
-         cblas_xerbla(3, "cblas_stbmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_stbmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -101,7 +101,7 @@ void cblas_stbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_stbmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_stbmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -115,7 +115,7 @@ void cblas_stbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       F77_stbmv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, A, &F77_lda, X,
                       &F77_incX);
    }
-   else cblas_xerbla(1, "cblas_stbmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_stbmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_stbsv.c b/CBLAS/src/cblas_stbsv.c
index 296db6f953..c6ef05f8e5 100644
--- a/CBLAS/src/cblas_stbsv.c
+++ b/CBLAS/src/cblas_stbsv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_stbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_stbsv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const CBLAS_INT K, const float  *A, const CBLAS_INT lda,
                  float  *X, const CBLAS_INT incX)
@@ -41,7 +41,7 @@ void cblas_stbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_stbsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_stbsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -51,7 +51,7 @@ void cblas_stbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_stbsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_stbsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -60,7 +60,7 @@ void cblas_stbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_stbsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_stbsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -80,7 +80,7 @@ void cblas_stbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_stbsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_stbsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -91,7 +91,7 @@ void cblas_stbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'N';
       else
       {
-         cblas_xerbla(3, "cblas_stbsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_stbsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -101,7 +101,7 @@ void cblas_stbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_stbsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_stbsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -115,7 +115,7 @@ void cblas_stbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       F77_stbsv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, A, &F77_lda, X,
                       &F77_incX);
    }
-   else cblas_xerbla(1, "cblas_stbsv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_stbsv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_stpmv.c b/CBLAS/src/cblas_stpmv.c
index 22f9f6b6fd..bcc5f215d4 100644
--- a/CBLAS/src/cblas_stpmv.c
+++ b/CBLAS/src/cblas_stpmv.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_stpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_stpmv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const float  *Ap, float  *X, const CBLAS_INT incX)
 {
@@ -39,7 +39,7 @@ void cblas_stpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_stpmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_stpmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -49,7 +49,7 @@ void cblas_stpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_stpmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_stpmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -58,7 +58,7 @@ void cblas_stpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_stpmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_stpmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -77,7 +77,7 @@ void cblas_stpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_stpmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_stpmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -88,7 +88,7 @@ void cblas_stpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'N';
       else
       {
-         cblas_xerbla(3, "cblas_stpmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_stpmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -98,7 +98,7 @@ void cblas_stpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_stpmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_stpmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -111,7 +111,7 @@ void cblas_stpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
 
       F77_stpmv( F77_UL, F77_TA, F77_DI, &F77_N, Ap, X,&F77_incX);
    }
-   else cblas_xerbla(1, "cblas_stpmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_stpmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_stpsv.c b/CBLAS/src/cblas_stpsv.c
index aa3cec9a3b..c729fdbb2f 100644
--- a/CBLAS/src/cblas_stpsv.c
+++ b/CBLAS/src/cblas_stpsv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_stpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_stpsv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const float  *Ap, float  *X, const CBLAS_INT incX)
 {
@@ -38,7 +38,7 @@ void cblas_stpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_stpsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_stpsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -48,7 +48,7 @@ void cblas_stpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_stpsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_stpsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -57,7 +57,7 @@ void cblas_stpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_stpsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_stpsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -76,7 +76,7 @@ void cblas_stpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_stpsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_stpsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -87,7 +87,7 @@ void cblas_stpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'N';
       else
       {
-         cblas_xerbla(3, "cblas_stpsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_stpsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -97,7 +97,7 @@ void cblas_stpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_stpsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_stpsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -111,7 +111,7 @@ void cblas_stpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       F77_stpsv( F77_UL, F77_TA, F77_DI, &F77_N, Ap, X,&F77_incX);
 
    }
-   else cblas_xerbla(1, "cblas_stpsv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_stpsv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_strmm.c b/CBLAS/src/cblas_strmm.c
index 658e46f42f..49133e5c4e 100644
--- a/CBLAS/src/cblas_strmm.c
+++ b/CBLAS/src/cblas_strmm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_strmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
+void API_SUFFIX(cblas_strmm)(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
                  const CBLAS_UPLO Uplo, const  CBLAS_TRANSPOSE TransA,
                  const CBLAS_DIAG Diag, const CBLAS_INT M, const CBLAS_INT N,
                  const float alpha, const float *A, const CBLAS_INT lda,
@@ -45,7 +45,7 @@ void cblas_strmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='L';
       else
       {
-         cblas_xerbla(2, "cblas_strmm","Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_strmm","Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -54,7 +54,7 @@ void cblas_strmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(3, "cblas_strmm","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_strmm","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -65,7 +65,7 @@ void cblas_strmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(4, "cblas_strmm","Illegal Trans setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_strmm","Illegal Trans setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -75,7 +75,7 @@ void cblas_strmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Diag == CblasNonUnit ) DI='N';
       else
       {
-         cblas_xerbla(5, "cblas_strmm", "Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(5, "cblas_strmm", "Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -96,7 +96,7 @@ void cblas_strmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='R';
       else
       {
-         cblas_xerbla(2, "cblas_strmm","Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_strmm","Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -106,7 +106,7 @@ void cblas_strmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_strmm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_strmm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -117,7 +117,7 @@ void cblas_strmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(4, "cblas_strmm", "Illegal Trans setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_strmm", "Illegal Trans setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -127,7 +127,7 @@ void cblas_strmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Diag == CblasNonUnit ) DI='N';
       else
       {
-         cblas_xerbla(5, "cblas_strmm","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(5, "cblas_strmm","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -141,7 +141,7 @@ void cblas_strmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       F77_strmm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_N, &F77_M, &alpha, A,
       &F77_lda, B, &F77_ldb);
    }
-   else  cblas_xerbla(1, "cblas_strmm", "Illegal layout setting, %d\n", layout);
+   else  API_SUFFIX(cblas_xerbla)(1, "cblas_strmm", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_strmv.c b/CBLAS/src/cblas_strmv.c
index 57f1841b89..bd7c14d3ad 100644
--- a/CBLAS/src/cblas_strmv.c
+++ b/CBLAS/src/cblas_strmv.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_strmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_strmv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const float  *A, const CBLAS_INT lda,
                  float  *X, const CBLAS_INT incX)
@@ -42,7 +42,7 @@ void cblas_strmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_strmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_strmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -52,7 +52,7 @@ void cblas_strmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_strmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_strmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -61,7 +61,7 @@ void cblas_strmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_strmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_strmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -81,7 +81,7 @@ void cblas_strmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_strmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_strmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -92,7 +92,7 @@ void cblas_strmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'N';
       else
       {
-         cblas_xerbla(3, "cblas_strmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_strmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -102,7 +102,7 @@ void cblas_strmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_strmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_strmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -115,7 +115,7 @@ void cblas_strmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       F77_strmv( F77_UL, F77_TA, F77_DI, &F77_N, A, &F77_lda, X,
                       &F77_incX);
    }
-   else cblas_xerbla(1, "cblas_strmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_strmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_strsm.c b/CBLAS/src/cblas_strsm.c
index b5811758c8..e883be1dfb 100644
--- a/CBLAS/src/cblas_strsm.c
+++ b/CBLAS/src/cblas_strsm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_strsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
+void API_SUFFIX(cblas_strsm)(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
                  const CBLAS_UPLO Uplo, const CBLAS_TRANSPOSE TransA,
                  const CBLAS_DIAG Diag, const CBLAS_INT M, const CBLAS_INT N,
                  const float alpha, const float  *A, const CBLAS_INT lda,
@@ -46,7 +46,7 @@ void cblas_strsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='L';
       else
       {
-         cblas_xerbla(2, "cblas_strsm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_strsm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -55,7 +55,7 @@ void cblas_strsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(3, "cblas_strsm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_strsm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -65,7 +65,7 @@ void cblas_strsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(4, "cblas_strsm", "Illegal Trans setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_strsm", "Illegal Trans setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -74,7 +74,7 @@ void cblas_strsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Diag == CblasNonUnit ) DI='N';
       else
       {
-         cblas_xerbla(5, "cblas_strsm", "Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(5, "cblas_strsm", "Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -94,7 +94,7 @@ void cblas_strsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='R';
       else
       {
-         cblas_xerbla(2, "cblas_strsm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_strsm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -103,7 +103,7 @@ void cblas_strsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_strsm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_strsm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -113,7 +113,7 @@ void cblas_strsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(4, "cblas_strsm", "Illegal Trans setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_strsm", "Illegal Trans setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -122,7 +122,7 @@ void cblas_strsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Diag == CblasNonUnit ) DI='N';
       else
       {
-         cblas_xerbla(5, "cblas_strsm", "Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(5, "cblas_strsm", "Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -136,7 +136,7 @@ void cblas_strsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
 
       F77_strsm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_N, &F77_M, &alpha, A, &F77_lda, B, &F77_ldb);
    }
-   else  cblas_xerbla(1, "cblas_strsm", "Illegal layout setting, %d\n", layout);
+   else  API_SUFFIX(cblas_xerbla)(1, "cblas_strsm", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_strsv.c b/CBLAS/src/cblas_strsv.c
index cb1b7cbf7c..a98c692dfd 100644
--- a/CBLAS/src/cblas_strsv.c
+++ b/CBLAS/src/cblas_strsv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_strsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_strsv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const float  *A, const CBLAS_INT lda, float  *X,
                  const CBLAS_INT incX)
@@ -41,7 +41,7 @@ void cblas_strsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_strsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_strsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -51,7 +51,7 @@ void cblas_strsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_strsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_strsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -60,7 +60,7 @@ void cblas_strsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_strsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_strsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -80,7 +80,7 @@ void cblas_strsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_strsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_strsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -91,7 +91,7 @@ void cblas_strsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'N';
       else
       {
-         cblas_xerbla(3, "cblas_strsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_strsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -101,7 +101,7 @@ void cblas_strsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_strsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_strsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -114,7 +114,7 @@ void cblas_strsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       F77_strsv( F77_UL, F77_TA, F77_DI, &F77_N, A, &F77_lda, X,
                       &F77_incX);
    }
-   else cblas_xerbla(1, "cblas_strsv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_strsv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_xerbla.c b/CBLAS/src/cblas_xerbla.c
index 6a24d2f77b..f353153a42 100644
--- a/CBLAS/src/cblas_xerbla.c
+++ b/CBLAS/src/cblas_xerbla.c
@@ -9,7 +9,7 @@ void
 #ifdef HAS_ATTRIBUTE_WEAK_SUPPORT
 __attribute__((weak))
 #endif
-cblas_xerbla(CBLAS_INT info, const char *rout, const char *form, ...)
+API_SUFFIX(cblas_xerbla)(CBLAS_INT info, const char *rout, const char *form, ...)
 {
    extern int RowMajorStrg;
    char empty[1] = "";
@@ -63,7 +63,7 @@ cblas_xerbla(CBLAS_INT info, const char *rout, const char *form, ...)
       }
    }
    if (info)
-      fprintf(stderr, "Parameter %d to routine %s was incorrect\n", info, rout);
+      fprintf(stderr, "Parameter %" CBLAS_IFMT " to routine %s was incorrect\n", info, rout);
    vfprintf(stderr, form, argptr);
    va_end(argptr);
    if (info && !info)
diff --git a/CBLAS/src/cblas_zaxpby.c b/CBLAS/src/cblas_zaxpby.c
new file mode 100644
index 0000000000..3aebecac8b
--- /dev/null
+++ b/CBLAS/src/cblas_zaxpby.c
@@ -0,0 +1,22 @@
+/*
+ * cblas_zaxpby.c
+ *
+ * The program is a C interface to zaxpby.
+ *
+ * Written by Martin Koehler, 08/26/2024
+ *
+ */
+#include "cblas.h"
+#include "cblas_f77.h"
+void API_SUFFIX(cblas_zaxpby)( const CBLAS_INT N, const void *alpha, const void *X,
+                       const CBLAS_INT incX, const void *beta, void *Y, const CBLAS_INT incY)
+{
+#ifdef F77_INT
+   F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;
+#else
+   #define F77_N N
+   #define F77_incX incX
+   #define F77_incY incY
+#endif
+   F77_zaxpby( &F77_N, alpha, X, &F77_incX, beta, Y, &F77_incY);
+}
diff --git a/CBLAS/src/cblas_zaxpy.c b/CBLAS/src/cblas_zaxpy.c
index 5ea07904c7..0612cb3fbc 100644
--- a/CBLAS/src/cblas_zaxpy.c
+++ b/CBLAS/src/cblas_zaxpy.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zaxpy( const CBLAS_INT N, const void *alpha, const void *X,
+void API_SUFFIX(cblas_zaxpy)( const CBLAS_INT N, const void *alpha, const void *X,
                        const CBLAS_INT incX, void *Y, const CBLAS_INT incY)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_zcopy.c b/CBLAS/src/cblas_zcopy.c
index 8524cbed8a..b02d509802 100644
--- a/CBLAS/src/cblas_zcopy.c
+++ b/CBLAS/src/cblas_zcopy.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zcopy( const CBLAS_INT N, const void *X,
+void API_SUFFIX(cblas_zcopy)( const CBLAS_INT N, const void *X,
                       const CBLAS_INT incX, void *Y, const CBLAS_INT incY)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_zdotc_sub.c b/CBLAS/src/cblas_zdotc_sub.c
index 0e9f35dec4..45d87bbf64 100644
--- a/CBLAS/src/cblas_zdotc_sub.c
+++ b/CBLAS/src/cblas_zdotc_sub.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zdotc_sub( const CBLAS_INT N, const void *X, const CBLAS_INT incX,
+void API_SUFFIX(cblas_zdotc_sub)( const CBLAS_INT N, const void *X, const CBLAS_INT incX,
                       const void *Y, const CBLAS_INT incY, void *dotc)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_zdotu_sub.c b/CBLAS/src/cblas_zdotu_sub.c
index cf575bcd7c..d6766e64bd 100644
--- a/CBLAS/src/cblas_zdotu_sub.c
+++ b/CBLAS/src/cblas_zdotu_sub.c
@@ -9,7 +9,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zdotu_sub( const CBLAS_INT N, const void *X, const CBLAS_INT incX,
+void API_SUFFIX(cblas_zdotu_sub)( const CBLAS_INT N, const void *X, const CBLAS_INT incX,
                       const void *Y, const CBLAS_INT incY, void *dotu)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_zdrot.c b/CBLAS/src/cblas_zdrot.c
new file mode 100644
index 0000000000..d208a3034e
--- /dev/null
+++ b/CBLAS/src/cblas_zdrot.c
@@ -0,0 +1,21 @@
+/*
+ * cblas_zdrot.c
+ *
+ * The program is a C interface to zdrot.
+ *
+ */
+#include "cblas.h"
+#include "cblas_f77.h"
+void API_SUFFIX(cblas_zdrot)(const CBLAS_INT N, void *X, const CBLAS_INT incX,
+   void *Y, const CBLAS_INT incY, const double c, const double s)
+{
+#ifdef F77_INT
+   F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;
+#else
+   #define F77_N N
+   #define F77_incX incX
+   #define F77_incY incY
+#endif
+   F77_zdrot(&F77_N, X, &F77_incX, Y, &F77_incY, &c, &s);
+   return;
+}
diff --git a/CBLAS/src/cblas_zdscal.c b/CBLAS/src/cblas_zdscal.c
index a365b02af0..0bebcdfd9e 100644
--- a/CBLAS/src/cblas_zdscal.c
+++ b/CBLAS/src/cblas_zdscal.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zdscal( const CBLAS_INT N, const double alpha, void  *X,
+void API_SUFFIX(cblas_zdscal)( const CBLAS_INT N, const double alpha, void  *X,
                        const CBLAS_INT incX)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_zgbmv.c b/CBLAS/src/cblas_zgbmv.c
index 0d0b3427f0..6efd9be78c 100644
--- a/CBLAS/src/cblas_zgbmv.c
+++ b/CBLAS/src/cblas_zgbmv.c
@@ -7,9 +7,10 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zgbmv(const CBLAS_LAYOUT layout,
+void API_SUFFIX(cblas_zgbmv)(const CBLAS_LAYOUT layout,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_INT M, const CBLAS_INT N,
                  const CBLAS_INT KL, const CBLAS_INT KU,
                  const void *alpha, const void  *A, const CBLAS_INT lda,
@@ -26,6 +27,7 @@ void cblas_zgbmv(const CBLAS_LAYOUT layout,
    F77_INT F77_M=M, F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY;
    F77_INT F77_KL=KL,F77_KU=KU;
 #else
+   CBLAS_INT incx = incX;
    #define F77_M M
    #define F77_N N
    #define F77_lda lda
@@ -34,15 +36,18 @@ void cblas_zgbmv(const CBLAS_LAYOUT layout,
    #define F77_incX incx
    #define F77_incY incY
 #endif
-   CBLAS_INT n, i=0, incx=incX;
-   const double *xx= (double *)X, *alp= (double *)alpha, *bet = (double *)beta;
+   CBLAS_INT n, i=0;
+   const double *xx= (const double *)X, *alp= (const double *)alpha, *bet = (const double *)beta;
    double ALPHA[2],BETA[2];
    CBLAS_INT tincY, tincx;
-   double *x=(double *)X, *y=(double *)Y, *st=0, *tx;
+   double *x, *y, *st=0, *tx;
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+   memcpy(&x,&X,sizeof(double*));
+   memcpy(&y,&Y,sizeof(double*));
+
    CBLAS_CallFromC = 1;
    if (layout == CblasColMajor)
    {
@@ -51,7 +56,7 @@ void cblas_zgbmv(const CBLAS_LAYOUT layout,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(2, "cblas_zgbmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zgbmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -125,13 +130,14 @@ void cblas_zgbmv(const CBLAS_LAYOUT layout,
                y -= n;
             }
          }
-         else x = (double *) X;
+         else
+            memcpy(&x,&X,sizeof(double*));
 
 
       }
       else
       {
-         cblas_xerbla(2, "cblas_zgbmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zgbmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -159,7 +165,7 @@ void cblas_zgbmv(const CBLAS_LAYOUT layout,
          }
       }
    }
-   else cblas_xerbla(1, "cblas_zgbmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_zgbmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_zgemm.c b/CBLAS/src/cblas_zgemm.c
index 38c9cfb60f..9b3b66e568 100644
--- a/CBLAS/src/cblas_zgemm.c
+++ b/CBLAS/src/cblas_zgemm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
+void API_SUFFIX(cblas_zgemm)(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
                  const CBLAS_TRANSPOSE TransB, const CBLAS_INT M, const CBLAS_INT N,
                  const CBLAS_INT K, const void *alpha, const void  *A,
                  const CBLAS_INT lda, const void  *B, const CBLAS_INT ldb,
@@ -47,7 +47,7 @@ void cblas_zgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(2, "cblas_zgemm","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zgemm","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -58,7 +58,7 @@ void cblas_zgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       else if ( TransB == CblasNoTrans )   TB='N';
       else
       {
-         cblas_xerbla(3, "cblas_zgemm","Illegal TransB setting, %d\n", TransB);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_zgemm","Illegal TransB setting, %d\n", TransB);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -79,7 +79,7 @@ void cblas_zgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       else if ( TransA == CblasNoTrans )   TB='N';
       else
       {
-         cblas_xerbla(2, "cblas_zgemm","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zgemm","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -89,7 +89,7 @@ void cblas_zgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       else if ( TransB == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(2, "cblas_zgemm","Illegal TransB setting, %d\n", TransB);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_zgemm","Illegal TransB setting, %d\n", TransB);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -102,7 +102,7 @@ void cblas_zgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
       F77_zgemm(F77_TA, F77_TB, &F77_N, &F77_M, &F77_K, alpha, B,
                   &F77_ldb, A, &F77_lda, beta, C, &F77_ldc);
    }
-   else  cblas_xerbla(1, "cblas_zgemm", "Illegal layout setting, %d\n", layout);
+   else  API_SUFFIX(cblas_xerbla)(1, "cblas_zgemm", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_zgemmtr.c b/CBLAS/src/cblas_zgemmtr.c
new file mode 100644
index 0000000000..4d884d944a
--- /dev/null
+++ b/CBLAS/src/cblas_zgemmtr.c
@@ -0,0 +1,135 @@
+/*
+ *
+ * cblas_zgemmtr.c
+ * This program is a C interface to zgemmtr.
+ * Written by Martin Koehler, MPI Magdeburg
+ * 06/24/2024
+ *
+ */
+
+#include "cblas.h"
+#include "cblas_f77.h"
+void API_SUFFIX(cblas_zgemmtr)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo, const CBLAS_TRANSPOSE TransA,
+        const CBLAS_TRANSPOSE TransB, const CBLAS_INT N,
+        const CBLAS_INT K, const void *alpha, const void  *A,
+        const CBLAS_INT lda, const void  *B, const CBLAS_INT ldb,
+        const void *beta, void  *C, const CBLAS_INT ldc)
+{
+    char TA, TB, UL;
+#ifdef F77_CHAR
+    F77_CHAR F77_TA, F77_TB, F77_UL;
+#else
+#define F77_TA &TA
+#define F77_TB &TB
+#define F77_UL &UL
+#endif
+
+#ifdef F77_INT
+    F77_INT F77_N=N, F77_K=K, F77_lda=lda, F77_ldb=ldb;
+    F77_INT F77_ldc=ldc;
+#else
+#define F77_N N
+#define F77_K K
+#define F77_lda lda
+#define F77_ldb ldb
+#define F77_ldc ldc
+#endif
+
+    extern int CBLAS_CallFromC;
+    extern int RowMajorStrg;
+    RowMajorStrg = 0;
+    CBLAS_CallFromC = 1;
+
+
+    if( layout == CblasColMajor )
+    {
+        if ( Uplo == CblasUpper ) UL = 'U';
+        else if (Uplo == CblasLower) UL= 'L';
+        else {
+            API_SUFFIX(cblas_xerbla)(2, "cblas_zgemmtr", "Illegal Uplo setting, %d\n", Uplo);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+
+
+        if(TransA == CblasTrans) TA='T';
+        else if ( TransA == CblasConjTrans ) TA='C';
+        else if ( TransA == CblasNoTrans )   TA='N';
+        else
+        {
+            API_SUFFIX(cblas_xerbla)(3, "cblas_zgemmtr","Illegal TransA setting, %d\n", TransA);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+
+        if(TransB == CblasTrans) TB='T';
+        else if ( TransB == CblasConjTrans ) TB='C';
+        else if ( TransB == CblasNoTrans )   TB='N';
+        else
+        {
+            API_SUFFIX(cblas_xerbla)(4, "cblas_zgemmtr","Illegal TransB setting, %d\n", TransB);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+
+#ifdef F77_CHAR
+        F77_TA = C2F_CHAR(&TA);
+        F77_TB = C2F_CHAR(&TB);
+        F77_UL = C2F_CHAR(&UL);
+#endif
+
+        F77_zgemmtr(F77_UL, F77_TA, F77_TB, &F77_N, &F77_K, alpha, A,
+                &F77_lda, B, &F77_ldb, beta, C, &F77_ldc);
+    }
+    else if (layout == CblasRowMajor)
+    {
+        RowMajorStrg = 1;
+
+        if ( Uplo == CblasUpper ) UL = 'L';
+        else if (Uplo == CblasLower) UL= 'U';
+        else {
+            API_SUFFIX(cblas_xerbla)(2, "cblas_cgemmtr", "Illegal Uplo setting, %d\n", Uplo);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+
+        if(TransA == CblasTrans) TB='T';
+        else if ( TransA == CblasConjTrans ) TB='C';
+        else if ( TransA == CblasNoTrans )   TB='N';
+        else
+        {
+            API_SUFFIX(cblas_xerbla)(3, "zblas_cgemmtr", "Illegal TransA setting, %d\n", TransA);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+        if(TransB == CblasTrans) TA='T';
+        else if ( TransB == CblasConjTrans ) TA='C';
+        else if ( TransB == CblasNoTrans )   TA='N';
+        else
+        {
+            API_SUFFIX(cblas_xerbla)(4, "zblas_cgemmtr", "Illegal TransB setting, %d\n", TransB);
+            CBLAS_CallFromC = 0;
+            RowMajorStrg = 0;
+            return;
+        }
+#ifdef F77_CHAR
+        F77_TA = C2F_CHAR(&TA);
+        F77_TB = C2F_CHAR(&TB);
+        F77_UL = C2F_CHAR(&UL);
+
+#endif
+
+        F77_zgemmtr(F77_UL, F77_TA, F77_TB, &F77_N, &F77_K, alpha, B,
+                &F77_ldb, A, &F77_lda, beta, C, &F77_ldc);
+    }
+
+    else  API_SUFFIX(cblas_xerbla)(1, "cblas_zgemmtr", "Illegal layout setting, %d\n", layout);
+    CBLAS_CallFromC = 0;
+    RowMajorStrg = 0;
+    return;
+}
diff --git a/CBLAS/src/cblas_zgemv.c b/CBLAS/src/cblas_zgemv.c
index c3d8a9f5d0..930f4f9cb4 100644
--- a/CBLAS/src/cblas_zgemv.c
+++ b/CBLAS/src/cblas_zgemv.c
@@ -7,9 +7,10 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zgemv(const CBLAS_LAYOUT layout,
+void API_SUFFIX(cblas_zgemv)(const CBLAS_LAYOUT layout,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_INT M, const CBLAS_INT N,
                  const void *alpha, const void  *A, const CBLAS_INT lda,
                  const void  *X, const CBLAS_INT incX, const void *beta,
@@ -24,6 +25,7 @@ void cblas_zgemv(const CBLAS_LAYOUT layout,
 #ifdef F77_INT
    F77_INT F77_M=M, F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY;
 #else
+   CBLAS_INT incx = incX;
    #define F77_M M
    #define F77_N N
    #define F77_lda lda
@@ -31,15 +33,18 @@ void cblas_zgemv(const CBLAS_LAYOUT layout,
    #define F77_incY incY
 #endif
 
-   CBLAS_INT n, i=0, incx=incX;
-   const double *xx= (double *)X, *alp= (double *)alpha, *bet = (double *)beta;
+   CBLAS_INT n, i=0;
+   const double *xx= (const double *)X, *alp= (const double *)alpha, *bet = (const double *)beta;
    double ALPHA[2],BETA[2];
    CBLAS_INT tincY, tincx;
-   double *x=(double *)X, *y=(double *)Y, *st=0, *tx;
+   double *x, *y, *st=0, *tx;
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+   memcpy(&x,&X,sizeof(double*));
+   memcpy(&y,&Y,sizeof(double*));
+
    CBLAS_CallFromC = 1;
 
    if (layout == CblasColMajor)
@@ -49,7 +54,7 @@ void cblas_zgemv(const CBLAS_LAYOUT layout,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(2, "cblas_zgemv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zgemv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -124,11 +129,12 @@ void cblas_zgemv(const CBLAS_LAYOUT layout,
                y -= n;
             }
          }
-         else x = (double *) X;
+         else
+            memcpy(&x,&X,sizeof(double*));
       }
       else
       {
-         cblas_xerbla(2, "cblas_zgemv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zgemv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -145,7 +151,7 @@ void cblas_zgemv(const CBLAS_LAYOUT layout,
 
       if (TransA == CblasConjTrans)
       {
-         if (x != (double *)X) free(x);
+         if (x != X) free(x);
          if (N > 0)
          {
             do
@@ -157,7 +163,7 @@ void cblas_zgemv(const CBLAS_LAYOUT layout,
          }
       }
    }
-   else cblas_xerbla(1, "cblas_zgemv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_zgemv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_zgerc.c b/CBLAS/src/cblas_zgerc.c
index 0e3f8afcb5..e0f801e2e3 100644
--- a/CBLAS/src/cblas_zgerc.c
+++ b/CBLAS/src/cblas_zgerc.c
@@ -7,15 +7,18 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zgerc(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N,
+void API_SUFFIX(cblas_zgerc)(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N,
                  const void *alpha, const void *X, const CBLAS_INT incX,
                  const void *Y, const CBLAS_INT incY, void *A, const CBLAS_INT lda)
 {
 #ifdef F77_INT
    F77_INT F77_M=M, F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY;
 #else
+   CBLAS_INT incy = incY;
    #define F77_M M
    #define F77_N N
    #define F77_incX incX
@@ -23,13 +26,16 @@ void cblas_zgerc(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N
    #define F77_lda lda
 #endif
 
-   CBLAS_INT n, i, tincy, incy=incY;
-   double *y=(double *)Y, *yy=(double *)Y, *ty, *st;
+   CBLAS_INT n, i, tincy;
+   double *y,  *yy, *ty, *st;
 
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+   memcpy(&y,&Y,sizeof(double*));
+   memcpy(&yy,&Y,sizeof(double*));
+
    CBLAS_CallFromC = 1;
    if (layout == CblasColMajor)
    {
@@ -56,7 +62,7 @@ void cblas_zgerc(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N
          }
          do
          {
-            *y = *yy;
+            *y = (double) *yy;
             y[1] = -yy[1];
             y += tincy ;
             yy += i;
@@ -70,14 +76,15 @@ void cblas_zgerc(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N
             incy = 1;
          #endif
       }
-      else y = (double *) Y;
+      else
+          memcpy(&y,&Y,sizeof(double*));
 
       F77_zgeru( &F77_N, &F77_M, alpha, y, &F77_incY, X, &F77_incX, A,
                       &F77_lda);
       if(Y!=y)
          free(y);
 
-   } else cblas_xerbla(1, "cblas_zgerc", "Illegal layout setting, %d\n", layout);
+   } else API_SUFFIX(cblas_xerbla)(1, "cblas_zgerc", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_zgeru.c b/CBLAS/src/cblas_zgeru.c
index 424f1f3e70..d1a128ca2f 100644
--- a/CBLAS/src/cblas_zgeru.c
+++ b/CBLAS/src/cblas_zgeru.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zgeru(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N,
+void API_SUFFIX(cblas_zgeru)(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N,
                  const void *alpha, const void *X, const CBLAS_INT incX,
                  const void *Y, const CBLAS_INT incY, void *A, const CBLAS_INT lda)
 {
@@ -37,7 +37,7 @@ void cblas_zgeru(const CBLAS_LAYOUT layout, const CBLAS_INT M, const CBLAS_INT N
       F77_zgeru( &F77_N, &F77_M, alpha, Y, &F77_incY, X, &F77_incX, A,
                       &F77_lda);
    }
-   else cblas_xerbla(1, "cblas_zgeru", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_zgeru", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_zhbmv.c b/CBLAS/src/cblas_zhbmv.c
index c97ae7cddd..0808f57946 100644
--- a/CBLAS/src/cblas_zhbmv.c
+++ b/CBLAS/src/cblas_zhbmv.c
@@ -9,7 +9,9 @@
 #include "cblas_f77.h"
 #include <stdio.h>
 #include <stdlib.h>
-void cblas_zhbmv(const CBLAS_LAYOUT layout,
+#include <string.h>
+
+void API_SUFFIX(cblas_zhbmv)(const CBLAS_LAYOUT layout,
                  const CBLAS_UPLO Uplo,const CBLAS_INT N,const CBLAS_INT K,
                  const void *alpha, const void  *A, const CBLAS_INT lda,
                  const void  *X, const CBLAS_INT incX, const void *beta,
@@ -24,21 +26,25 @@ void cblas_zhbmv(const CBLAS_LAYOUT layout,
 #ifdef F77_INT
    F77_INT F77_N=N, F77_K=K, F77_lda=lda, F77_incX=incX, F77_incY=incY;
 #else
+   CBLAS_INT incx = incX;
    #define F77_N N
    #define F77_K K
    #define F77_lda lda
    #define F77_incX incx
    #define F77_incY incY
 #endif
-   CBLAS_INT n, i=0, incx=incX;
-   const double *xx= (double *)X, *alp= (double *)alpha, *bet = (double *)beta;
+   CBLAS_INT n, i=0;
+   const double *xx= (const double *)X, *alp= (const double *)alpha, *bet = (const double *)beta;
    double ALPHA[2],BETA[2];
    CBLAS_INT tincY, tincx;
-   double *x=(double *)X, *y=(double *)Y, *st=0, *tx;
+   double *x, *y, *st=0, *tx;
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+   memcpy(&x,&X,sizeof(double*));
+   memcpy(&y,&Y,sizeof(double*));
+
    CBLAS_CallFromC = 1;
    if (layout == CblasColMajor)
    {
@@ -46,7 +52,7 @@ void cblas_zhbmv(const CBLAS_LAYOUT layout,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_zhbmv","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zhbmv","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -114,13 +120,13 @@ void cblas_zhbmv(const CBLAS_LAYOUT layout,
          } while(y != st);
          y -= n;
       }  else
-         x = (double *) X;
+        memcpy(&x,&X,sizeof(double*));
 
       if (Uplo == CblasUpper) UL = 'L';
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_zhbmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zhbmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -133,7 +139,7 @@ void cblas_zhbmv(const CBLAS_LAYOUT layout,
    }
    else
    {
-      cblas_xerbla(1, "cblas_zhbmv","Illegal layout setting, %d\n", layout);
+      API_SUFFIX(cblas_xerbla)(1, "cblas_zhbmv","Illegal layout setting, %d\n", layout);
       CBLAS_CallFromC = 0;
       RowMajorStrg = 0;
       return;
diff --git a/CBLAS/src/cblas_zhemm.c b/CBLAS/src/cblas_zhemm.c
index be41d471af..98fb7084db 100644
--- a/CBLAS/src/cblas_zhemm.c
+++ b/CBLAS/src/cblas_zhemm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zhemm(const CBLAS_LAYOUT layout, const  CBLAS_SIDE Side,
+void API_SUFFIX(cblas_zhemm)(const CBLAS_LAYOUT layout, const  CBLAS_SIDE Side,
                  const CBLAS_UPLO Uplo, const CBLAS_INT M, const CBLAS_INT N,
                  const void *alpha, const void *A, const CBLAS_INT lda,
                  const void *B, const CBLAS_INT ldb, const void *beta,
@@ -45,7 +45,7 @@ void cblas_zhemm(const CBLAS_LAYOUT layout, const  CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='L';
       else
       {
-         cblas_xerbla(2, "cblas_zhemm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zhemm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -55,7 +55,7 @@ void cblas_zhemm(const CBLAS_LAYOUT layout, const  CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(3, "cblas_zhemm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_zhemm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -75,7 +75,7 @@ void cblas_zhemm(const CBLAS_LAYOUT layout, const  CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='R';
       else
       {
-         cblas_xerbla(2, "cblas_zhemm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zhemm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -85,7 +85,7 @@ void cblas_zhemm(const CBLAS_LAYOUT layout, const  CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_zhemm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_zhemm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -99,7 +99,7 @@ void cblas_zhemm(const CBLAS_LAYOUT layout, const  CBLAS_SIDE Side,
       F77_zhemm(F77_SD, F77_UL, &F77_N, &F77_M, alpha, A,
                  &F77_lda, B, &F77_ldb, beta, C, &F77_ldc);
    }
-   else  cblas_xerbla(1, "cblas_zhemm", "Illegal layout setting, %d\n", layout);
+   else  API_SUFFIX(cblas_xerbla)(1, "cblas_zhemm", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_zhemv.c b/CBLAS/src/cblas_zhemv.c
index c123ba25f3..28a0a7da5f 100644
--- a/CBLAS/src/cblas_zhemv.c
+++ b/CBLAS/src/cblas_zhemv.c
@@ -7,9 +7,10 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zhemv(const CBLAS_LAYOUT layout,
+void API_SUFFIX(cblas_zhemv)(const CBLAS_LAYOUT layout,
                  const CBLAS_UPLO Uplo, const CBLAS_INT N,
                  const void *alpha, const void *A, const CBLAS_INT lda,
                  const void *X, const CBLAS_INT incX, const void *beta,
@@ -24,20 +25,23 @@ void cblas_zhemv(const CBLAS_LAYOUT layout,
 #ifdef F77_INT
    F77_INT F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY;
 #else
+   CBLAS_INT incx = incX;
    #define F77_N N
    #define F77_lda lda
    #define F77_incX incx
    #define F77_incY incY
 #endif
-   CBLAS_INT n, i=0, incx=incX;
-   const double *xx= (double *)X, *alp= (double *)alpha, *bet = (double *)beta;
+   CBLAS_INT n, i=0;
+   const double *xx= (const double *)X, *alp= (const double *)alpha, *bet = (const double *)beta;
    double ALPHA[2],BETA[2];
    CBLAS_INT tincY, tincx;
-   double *x=(double *)X, *y=(double *)Y, *st=0, *tx;
+   double *x, *y, *st=0, *tx;
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+   memcpy(&x,&X,sizeof(double*));
+   memcpy(&y,&Y,sizeof(double*));
 
    CBLAS_CallFromC = 1;
    if (layout == CblasColMajor)
@@ -46,7 +50,7 @@ void cblas_zhemv(const CBLAS_LAYOUT layout,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_zhemv","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zhemv","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -114,14 +118,15 @@ void cblas_zhemv(const CBLAS_LAYOUT layout,
          } while(y != st);
          y -= n;
       }  else
-         x = (double *) X;
+         memcpy(&x,&X,sizeof(double*));
+
 
 
       if (Uplo == CblasUpper) UL = 'L';
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_zhemv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zhemv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -134,7 +139,7 @@ void cblas_zhemv(const CBLAS_LAYOUT layout,
    }
    else
    {
-      cblas_xerbla(1, "cblas_zhemv","Illegal layout setting, %d\n", layout);
+      API_SUFFIX(cblas_xerbla)(1, "cblas_zhemv","Illegal layout setting, %d\n", layout);
       CBLAS_CallFromC = 0;
       RowMajorStrg = 0;
       return;
diff --git a/CBLAS/src/cblas_zher.c b/CBLAS/src/cblas_zher.c
index 196d735fd5..5af15f6b40 100644
--- a/CBLAS/src/cblas_zher.c
+++ b/CBLAS/src/cblas_zher.c
@@ -7,9 +7,10 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zher(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_zher)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                 const CBLAS_INT N, const double alpha, const void *X, const CBLAS_INT incX
                 ,void *A, const CBLAS_INT lda)
 {
@@ -23,17 +24,22 @@ void cblas_zher(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
 #ifdef F77_INT
    F77_INT F77_N=N, F77_lda=lda, F77_incX=incX;
 #else
+   CBLAS_INT incx = incX;
    #define F77_N N
    #define F77_lda lda
    #define F77_incX incx
 #endif
-   CBLAS_INT n, i, tincx, incx=incX;
-   double *x=(double *)X, *xx=(double *)X, *tx, *st;
+   CBLAS_INT n, i, tincx;
+   double *x, *xx, *tx, *st;
 
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+
+   memcpy(&x,&X,sizeof(double*));
+   memcpy(&xx,&X,sizeof(double*));
+
    CBLAS_CallFromC = 1;
    if (layout == CblasColMajor)
    {
@@ -41,7 +47,7 @@ void cblas_zher(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_zher","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zher","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -59,7 +65,7 @@ void cblas_zher(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_zher","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zher","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -98,9 +104,10 @@ void cblas_zher(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
            incx = 1;
          #endif
       }
-      else x = (double *) X;
+      else
+          memcpy(&x,&X,sizeof(double*));
       F77_zher(F77_UL, &F77_N, &alpha, x, &F77_incX, A, &F77_lda);
-   } else cblas_xerbla(1, "cblas_zher", "Illegal layout setting, %d\n", layout);
+   } else API_SUFFIX(cblas_xerbla)(1, "cblas_zher", "Illegal layout setting, %d\n", layout);
    if(X!=x)
       free(x);
 
diff --git a/CBLAS/src/cblas_zher2.c b/CBLAS/src/cblas_zher2.c
index 6cf2f7d776..1b685a98ea 100644
--- a/CBLAS/src/cblas_zher2.c
+++ b/CBLAS/src/cblas_zher2.c
@@ -7,9 +7,10 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zher2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_zher2)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_INT N, const void *alpha, const void *X, const CBLAS_INT incX,
                  const void *Y, const CBLAS_INT incY, void *A, const CBLAS_INT lda)
 {
@@ -23,19 +24,27 @@ void cblas_zher2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
 #ifdef F77_INT
    F77_INT F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY;
 #else
+   CBLAS_INT incx = incX, incy = incY;
    #define F77_N N
    #define F77_lda lda
    #define F77_incX incx
    #define F77_incY incy
 #endif
-   CBLAS_INT n, i, j, tincx, tincy, incx=incX, incy=incY;
-   double *x=(double *)X, *xx=(double *)X, *y=(double *)Y,
-         *yy=(double *)Y, *tx, *ty, *stx, *sty;
+   CBLAS_INT n, i, j, tincx, tincy;
+   double *x, *xx, *y,
+         *yy, *tx, *ty, *stx, *sty;
 
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+
+   memcpy(&x,&X,sizeof(double*));
+   memcpy(&xx,&X,sizeof(double*));
+   memcpy(&y,&Y,sizeof(double*));
+   memcpy(&yy,&Y,sizeof(double*));
+
+
    CBLAS_CallFromC = 1;
    if (layout == CblasColMajor)
    {
@@ -43,7 +52,7 @@ void cblas_zher2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_zher2", "Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zher2", "Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -62,7 +71,7 @@ void cblas_zher2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_zher2", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zher2", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -129,15 +138,16 @@ void cblas_zher2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          #endif
       }  else
       {
-         x = (double *) X;
-         y = (double *) Y;
+
+        memcpy(&x,&X,sizeof(double*));
+        memcpy(&y,&Y,sizeof(double*));
       }
       F77_zher2(F77_UL, &F77_N, alpha, y, &F77_incY, x,
                                       &F77_incX, A, &F77_lda);
    }
    else
    {
-      cblas_xerbla(1, "cblas_zher2", "Illegal layout setting, %d\n", layout);
+      API_SUFFIX(cblas_xerbla)(1, "cblas_zher2", "Illegal layout setting, %d\n", layout);
       CBLAS_CallFromC = 0;
       RowMajorStrg = 0;
       return;
diff --git a/CBLAS/src/cblas_zher2k.c b/CBLAS/src/cblas_zher2k.c
index 2c741ae07c..31a82974cb 100644
--- a/CBLAS/src/cblas_zher2k.c
+++ b/CBLAS/src/cblas_zher2k.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zher2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_zher2k)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                   const CBLAS_TRANSPOSE Trans, const CBLAS_INT N, const CBLAS_INT K,
                   const void *alpha, const void *A, const CBLAS_INT lda,
                   const void *B, const CBLAS_INT ldb, const double beta,
@@ -37,7 +37,7 @@ void cblas_zher2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    double ALPHA[2];
-   const double *alp=(double *)alpha;
+   const double *alp=(const double *)alpha;
 
    CBLAS_CallFromC = 1;
    RowMajorStrg = 0;
@@ -49,7 +49,7 @@ void cblas_zher2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(2, "cblas_zher2k", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zher2k", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -60,7 +60,7 @@ void cblas_zher2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='N';
       else
       {
-         cblas_xerbla(3, "cblas_zher2k", "Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_zher2k", "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -80,7 +80,7 @@ void cblas_zher2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(2, "cblas_zher2k", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zher2k", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -90,7 +90,7 @@ void cblas_zher2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='C';
       else
       {
-         cblas_xerbla(3, "cblas_zher2k", "Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_zher2k", "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -103,7 +103,7 @@ void cblas_zher2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       ALPHA[0]= *alp;
       ALPHA[1]= -alp[1];
       F77_zher2k(F77_UL,F77_TR, &F77_N, &F77_K, ALPHA, A, &F77_lda, B, &F77_ldb, &beta, C, &F77_ldc);
-   } else  cblas_xerbla(1, "cblas_zher2k", "Illegal layout setting, %d\n", layout);
+   } else  API_SUFFIX(cblas_xerbla)(1, "cblas_zher2k", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_zherk.c b/CBLAS/src/cblas_zherk.c
index 52a7bc222f..8d9ab9e3c2 100644
--- a/CBLAS/src/cblas_zherk.c
+++ b/CBLAS/src/cblas_zherk.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zherk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_zherk)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE Trans, const CBLAS_INT N, const CBLAS_INT K,
                  const double alpha, const void *A, const CBLAS_INT lda,
                  const double beta, void *C, const CBLAS_INT ldc)
@@ -43,7 +43,7 @@ void cblas_zherk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(2, "cblas_zherk", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zherk", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -54,7 +54,7 @@ void cblas_zherk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='N';
       else
       {
-         cblas_xerbla(3, "cblas_zherk", "Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_zherk", "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -74,7 +74,7 @@ void cblas_zherk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_zherk", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_zherk", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -84,7 +84,7 @@ void cblas_zherk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='C';
       else
       {
-         cblas_xerbla(3, "cblas_zherk", "Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_zherk", "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -98,7 +98,7 @@ void cblas_zherk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       F77_zherk(F77_UL, F77_TR, &F77_N, &F77_K, &alpha, A, &F77_lda,
                 &beta, C, &F77_ldc);
    }
-   else  cblas_xerbla(1, "cblas_zherk", "Illegal layout setting, %d\n", layout);
+   else  API_SUFFIX(cblas_xerbla)(1, "cblas_zherk", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_zhpmv.c b/CBLAS/src/cblas_zhpmv.c
index 325e9fc8ad..7f6cd045b5 100644
--- a/CBLAS/src/cblas_zhpmv.c
+++ b/CBLAS/src/cblas_zhpmv.c
@@ -7,9 +7,11 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zhpmv(const CBLAS_LAYOUT layout,
+void API_SUFFIX(cblas_zhpmv)(const CBLAS_LAYOUT layout,
                  const CBLAS_UPLO Uplo,const CBLAS_INT N,
                  const void *alpha, const void  *AP,
                  const void  *X, const CBLAS_INT incX, const void *beta,
@@ -24,19 +26,23 @@ void cblas_zhpmv(const CBLAS_LAYOUT layout,
 #ifdef F77_INT
    F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;
 #else
+   CBLAS_INT incx = incX;
    #define F77_N N
    #define F77_incX incx
    #define F77_incY incY
 #endif
-   CBLAS_INT n, i=0, incx=incX;
-   const double *xx= (double *)X, *alp= (double *)alpha, *bet = (double *)beta;
+   CBLAS_INT n, i=0;
+   const double *xx= (const double *)X, *alp= (const double *)alpha, *bet = (const double *)beta;
    double ALPHA[2],BETA[2];
    CBLAS_INT tincY, tincx;
-   double *x=(double *)X, *y=(double *)Y, *st=0, *tx;
+   double *x, *y, *st=0, *tx;
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+   memcpy(&x,&X,sizeof(double*));
+   memcpy(&y,&Y,sizeof(double*));
+
    CBLAS_CallFromC = 1;
    if (layout == CblasColMajor)
    {
@@ -44,7 +50,7 @@ void cblas_zhpmv(const CBLAS_LAYOUT layout,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_zhpmv","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zhpmv","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -112,14 +118,13 @@ void cblas_zhpmv(const CBLAS_LAYOUT layout,
          } while(y != st);
          y -= n;
       }  else
-         x = (double *) X;
-
+        memcpy(&x,&X,sizeof(double*));
 
       if (Uplo == CblasUpper) UL = 'L';
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_zhpmv","Illegal Uplo setting, %d\n", Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zhpmv","Illegal Uplo setting, %d\n", Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -133,7 +138,7 @@ void cblas_zhpmv(const CBLAS_LAYOUT layout,
    }
    else
    {
-      cblas_xerbla(1, "cblas_zhpmv","Illegal layout setting, %d\n", layout);
+      API_SUFFIX(cblas_xerbla)(1, "cblas_zhpmv","Illegal layout setting, %d\n", layout);
       CBLAS_CallFromC = 0;
       RowMajorStrg = 0;
       return;
diff --git a/CBLAS/src/cblas_zhpr.c b/CBLAS/src/cblas_zhpr.c
index a938df595d..9578c82f19 100644
--- a/CBLAS/src/cblas_zhpr.c
+++ b/CBLAS/src/cblas_zhpr.c
@@ -7,9 +7,10 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zhpr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_zhpr)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                 const CBLAS_INT N, const double alpha, const void *X,
                 const CBLAS_INT incX, void *A)
 {
@@ -23,16 +24,20 @@ void cblas_zhpr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
 #ifdef F77_INT
    F77_INT F77_N=N, F77_incX=incX;
 #else
+   CBLAS_INT incx = incX;
    #define F77_N N
    #define F77_incX incx
 #endif
-   CBLAS_INT n, i, tincx, incx=incX;
-   double *x=(double *)X, *xx=(double *)X, *tx, *st;
+   CBLAS_INT n, i, tincx;
+   double *x, *xx, *tx, *st;
 
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+   memcpy(&x,&X,sizeof(double*));
+   memcpy(&xx,&X,sizeof(double*));
+
    CBLAS_CallFromC = 1;
    if (layout == CblasColMajor)
    {
@@ -40,7 +45,7 @@ void cblas_zhpr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_zhpr","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zhpr","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -58,7 +63,7 @@ void cblas_zhpr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_zhpr","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zhpr","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -96,13 +101,14 @@ void cblas_zhpr(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
             incx = 1;
          #endif
       }
-      else x = (double *) X;
+      else
+          memcpy(&x,&X,sizeof(double*));
 
       F77_zhpr(F77_UL, &F77_N, &alpha, x, &F77_incX, A);
 
    } else
    {
-      cblas_xerbla(1, "cblas_zhpr","Illegal layout setting, %d\n", layout);
+      API_SUFFIX(cblas_xerbla)(1, "cblas_zhpr","Illegal layout setting, %d\n", layout);
       CBLAS_CallFromC = 0;
       RowMajorStrg = 0;
       return;
diff --git a/CBLAS/src/cblas_zhpr2.c b/CBLAS/src/cblas_zhpr2.c
index c26d7d9253..58ba7d39a7 100644
--- a/CBLAS/src/cblas_zhpr2.c
+++ b/CBLAS/src/cblas_zhpr2.c
@@ -7,9 +7,10 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zhpr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_zhpr2)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                       const CBLAS_INT N,const void *alpha, const void *X,
                       const CBLAS_INT incX,const void *Y, const CBLAS_INT incY, void *Ap)
 
@@ -24,18 +25,24 @@ void cblas_zhpr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
 #ifdef F77_INT
    F77_INT F77_N=N,  F77_incX=incX, F77_incY=incY;
 #else
+   CBLAS_INT incx = incX, incy = incY;
    #define F77_N N
    #define F77_incX incx
    #define F77_incY incy
 #endif
-   CBLAS_INT n, i, j, incx=incX, incy=incY;
-   double *x=(double *)X, *xx=(double *)X, *y=(double *)Y,
-         *yy=(double *)Y, *stx, *sty;
+   CBLAS_INT n, i, j;
+   double *x, *xx, *y,
+         *yy, *stx, *sty;
 
    extern int CBLAS_CallFromC;
    extern int RowMajorStrg;
    RowMajorStrg = 0;
 
+   memcpy(&x,&X,sizeof(double*));
+   memcpy(&xx,&X,sizeof(double*));
+   memcpy(&y,&Y,sizeof(double*));
+   memcpy(&yy,&Y,sizeof(double*));
+
    CBLAS_CallFromC = 1;
    if (layout == CblasColMajor)
    {
@@ -43,7 +50,7 @@ void cblas_zhpr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasUpper) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_zhpr2","Illegal Uplo setting, %d\n",Uplo );
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zhpr2","Illegal Uplo setting, %d\n",Uplo );
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -61,7 +68,7 @@ void cblas_zhpr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_zhpr2","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zhpr2","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -128,14 +135,15 @@ void cblas_zhpr2(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
 
       }  else
       {
-         x = (double *) X;
-         y = (void  *) Y;
+
+        memcpy(&x,&X,sizeof(double*));
+        memcpy(&y,&Y,sizeof(double*));
       }
       F77_zhpr2(F77_UL, &F77_N, alpha, y, &F77_incY, x, &F77_incX, Ap);
    }
    else
    {
-      cblas_xerbla(1, "cblas_zhpr2","Illegal layout setting, %d\n", layout);
+      API_SUFFIX(cblas_xerbla)(1, "cblas_zhpr2","Illegal layout setting, %d\n", layout);
       CBLAS_CallFromC = 0;
       RowMajorStrg = 0;
       return;
diff --git a/CBLAS/src/cblas_zrotg.c b/CBLAS/src/cblas_zrotg.c
new file mode 100644
index 0000000000..07d9af0deb
--- /dev/null
+++ b/CBLAS/src/cblas_zrotg.c
@@ -0,0 +1,13 @@
+/*
+ * cblas_zrotg.c
+ *
+ * The program is a C interface to zrotg.
+ *
+ */
+#include "cblas.h"
+#include "cblas_f77.h"
+void API_SUFFIX(cblas_zrotg)(void *a, void *b, double *c, void *s)
+{
+   F77_zrotg(a,b,c,s);
+}
+
diff --git a/CBLAS/src/cblas_zscal.c b/CBLAS/src/cblas_zscal.c
index b93886fcdf..1c146dfd8a 100644
--- a/CBLAS/src/cblas_zscal.c
+++ b/CBLAS/src/cblas_zscal.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zscal( const CBLAS_INT N, const void *alpha, void *X,
+void API_SUFFIX(cblas_zscal)( const CBLAS_INT N, const void *alpha, void *X,
                        const CBLAS_INT incX)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_zswap.c b/CBLAS/src/cblas_zswap.c
index 9cf8691482..d1aa9fa5ef 100644
--- a/CBLAS/src/cblas_zswap.c
+++ b/CBLAS/src/cblas_zswap.c
@@ -8,7 +8,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zswap( const CBLAS_INT N, void  *X, const CBLAS_INT incX, void  *Y,
+void API_SUFFIX(cblas_zswap)( const CBLAS_INT N, void  *X, const CBLAS_INT incX, void  *Y,
                        const CBLAS_INT incY)
 {
 #ifdef F77_INT
diff --git a/CBLAS/src/cblas_zsymm.c b/CBLAS/src/cblas_zsymm.c
index f66e2470e4..a2550d3878 100644
--- a/CBLAS/src/cblas_zsymm.c
+++ b/CBLAS/src/cblas_zsymm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zsymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
+void API_SUFFIX(cblas_zsymm)(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
                  const CBLAS_UPLO Uplo, const CBLAS_INT M, const CBLAS_INT N,
                  const void *alpha, const void  *A, const CBLAS_INT lda,
                  const void  *B, const CBLAS_INT ldb, const void *beta,
@@ -45,7 +45,7 @@ void cblas_zsymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='L';
       else
       {
-         cblas_xerbla(2, "cblas_zsymm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zsymm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -55,7 +55,7 @@ void cblas_zsymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(3, "cblas_zsymm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_zsymm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -75,7 +75,7 @@ void cblas_zsymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='R';
       else
       {
-         cblas_xerbla(2, "cblas_zsymm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zsymm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -85,7 +85,7 @@ void cblas_zsymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_zsymm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_zsymm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -99,7 +99,7 @@ void cblas_zsymm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       F77_zsymm(F77_SD, F77_UL, &F77_N, &F77_M, alpha, A, &F77_lda,
                      B, &F77_ldb, beta, C, &F77_ldc);
    }
-   else  cblas_xerbla(1, "cblas_zsymm", "Illegal layout setting, %d\n", layout);
+   else  API_SUFFIX(cblas_xerbla)(1, "cblas_zsymm", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_zsyr2k.c b/CBLAS/src/cblas_zsyr2k.c
index 3c490268d3..3223229d71 100644
--- a/CBLAS/src/cblas_zsyr2k.c
+++ b/CBLAS/src/cblas_zsyr2k.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zsyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_zsyr2k)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                   const CBLAS_TRANSPOSE Trans, const CBLAS_INT N, const CBLAS_INT K,
                   const void *alpha, const void  *A, const CBLAS_INT lda,
                   const void  *B, const CBLAS_INT ldb, const void *beta,
@@ -46,7 +46,7 @@ void cblas_zsyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(2, "cblas_zsyr2k", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zsyr2k", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -57,7 +57,7 @@ void cblas_zsyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='N';
       else
       {
-         cblas_xerbla(3, "cblas_zsyr2k", "Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_zsyr2k", "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -78,7 +78,7 @@ void cblas_zsyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_zsyr2k", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_zsyr2k", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -88,7 +88,7 @@ void cblas_zsyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='T';
       else
       {
-         cblas_xerbla(3, "cblas_zsyr2k", "Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_zsyr2k", "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -101,7 +101,7 @@ void cblas_zsyr2k(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
 
       F77_zsyr2k(F77_UL, F77_TR, &F77_N, &F77_K, alpha, A, &F77_lda, B, &F77_ldb, beta, C, &F77_ldc);
    }
-   else  cblas_xerbla(1, "cblas_zsyr2k", "Illegal layout setting, %d\n", layout);
+   else  API_SUFFIX(cblas_xerbla)(1, "cblas_zsyr2k", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_zsyrk.c b/CBLAS/src/cblas_zsyrk.c
index 2d5f3394bf..4f5b6b325c 100644
--- a/CBLAS/src/cblas_zsyrk.c
+++ b/CBLAS/src/cblas_zsyrk.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_zsyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_zsyrk)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE Trans, const CBLAS_INT N, const CBLAS_INT K,
                  const void *alpha, const void  *A, const CBLAS_INT lda,
                  const void *beta, void  *C, const CBLAS_INT ldc)
@@ -44,7 +44,7 @@ void cblas_zsyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(2, "cblas_zsyrk", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_zsyrk", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -55,7 +55,7 @@ void cblas_zsyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='N';
       else
       {
-         cblas_xerbla(3, "cblas_zsyrk", "Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_zsyrk", "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -76,7 +76,7 @@ void cblas_zsyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_zsyrk", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_zsyrk", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -86,7 +86,7 @@ void cblas_zsyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if ( Trans == CblasNoTrans )   TR='T';
       else
       {
-         cblas_xerbla(3, "cblas_zsyrk", "Illegal Trans setting, %d\n", Trans);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_zsyrk", "Illegal Trans setting, %d\n", Trans);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -100,7 +100,7 @@ void cblas_zsyrk(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       F77_zsyrk(F77_UL, F77_TR, &F77_N, &F77_K, alpha, A, &F77_lda,
                      beta, C, &F77_ldc);
    }
-   else  cblas_xerbla(1, "cblas_zsyrk", "Illegal layout setting, %d\n", layout);
+   else  API_SUFFIX(cblas_xerbla)(1, "cblas_zsyrk", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ztbmv.c b/CBLAS/src/cblas_ztbmv.c
index 437f40c882..3b6f17e236 100644
--- a/CBLAS/src/cblas_ztbmv.c
+++ b/CBLAS/src/cblas_ztbmv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ztbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_ztbmv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const CBLAS_INT K, const void  *A, const CBLAS_INT lda,
                  void  *X, const CBLAS_INT incX)
@@ -43,7 +43,7 @@ void cblas_ztbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_ztbmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ztbmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -53,7 +53,7 @@ void cblas_ztbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_ztbmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ztbmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -62,7 +62,7 @@ void cblas_ztbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ztbmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ztbmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -82,7 +82,7 @@ void cblas_ztbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_ztbmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ztbmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -114,7 +114,7 @@ void cblas_ztbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       }
       else
       {
-         cblas_xerbla(3, "cblas_ztbmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ztbmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -124,7 +124,7 @@ void cblas_ztbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ztbmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ztbmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -151,7 +151,7 @@ void cblas_ztbmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          }
       }
    }
-   else cblas_xerbla(1, "cblas_ztbmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_ztbmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ztbsv.c b/CBLAS/src/cblas_ztbsv.c
index 1e286bf90d..ea6b4d3b08 100644
--- a/CBLAS/src/cblas_ztbsv.c
+++ b/CBLAS/src/cblas_ztbsv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ztbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_ztbsv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const CBLAS_INT K, const void  *A, const CBLAS_INT lda,
                  void  *X, const CBLAS_INT incX)
@@ -43,7 +43,7 @@ void cblas_ztbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_ztbsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ztbsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -53,7 +53,7 @@ void cblas_ztbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_ztbsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ztbsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -62,7 +62,7 @@ void cblas_ztbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ztbsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ztbsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -82,7 +82,7 @@ void cblas_ztbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_ztbsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ztbsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -118,7 +118,7 @@ void cblas_ztbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       }
       else
       {
-         cblas_xerbla(3, "cblas_ztbsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ztbsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -128,7 +128,7 @@ void cblas_ztbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ztbsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ztbsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -155,7 +155,7 @@ void cblas_ztbsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          }
       }
    }
-   else cblas_xerbla(1, "cblas_ztbsv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_ztbsv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ztpmv.c b/CBLAS/src/cblas_ztpmv.c
index 7b65e3cd2f..119b6bcdd3 100644
--- a/CBLAS/src/cblas_ztpmv.c
+++ b/CBLAS/src/cblas_ztpmv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ztpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_ztpmv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const void  *Ap, void  *X, const CBLAS_INT incX)
 {
@@ -40,7 +40,7 @@ void cblas_ztpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_ztpmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ztpmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -50,7 +50,7 @@ void cblas_ztpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_ztpmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ztpmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -59,7 +59,7 @@ void cblas_ztpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ztpmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ztpmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -78,7 +78,7 @@ void cblas_ztpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_ztpmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ztpmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -110,7 +110,7 @@ void cblas_ztpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       }
       else
       {
-         cblas_xerbla(3, "cblas_ztpmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ztpmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -120,7 +120,7 @@ void cblas_ztpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ztpmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ztpmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -145,7 +145,7 @@ void cblas_ztpmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          }
       }
    }
-   else cblas_xerbla(1, "cblas_ztpmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_ztpmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ztpsv.c b/CBLAS/src/cblas_ztpsv.c
index 142f971a53..d907d2f706 100644
--- a/CBLAS/src/cblas_ztpsv.c
+++ b/CBLAS/src/cblas_ztpsv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ztpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_ztpsv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const void  *Ap, void  *X, const CBLAS_INT incX)
 {
@@ -40,7 +40,7 @@ void cblas_ztpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_ztpsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ztpsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -50,7 +50,7 @@ void cblas_ztpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_ztpsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ztpsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -59,7 +59,7 @@ void cblas_ztpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ztpsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ztpsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -78,7 +78,7 @@ void cblas_ztpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_ztpsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ztpsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -114,7 +114,7 @@ void cblas_ztpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       }
       else
       {
-         cblas_xerbla(3, "cblas_ztpsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ztpsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -124,7 +124,7 @@ void cblas_ztpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ztpsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ztpsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -150,7 +150,7 @@ void cblas_ztpsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          }
       }
    }
-   else cblas_xerbla(1, "cblas_ztpsv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_ztpsv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ztrmm.c b/CBLAS/src/cblas_ztrmm.c
index a34e710675..4b93f8e3a6 100644
--- a/CBLAS/src/cblas_ztrmm.c
+++ b/CBLAS/src/cblas_ztrmm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ztrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
+void API_SUFFIX(cblas_ztrmm)(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
                  const CBLAS_UPLO Uplo, const  CBLAS_TRANSPOSE TransA,
                  const CBLAS_DIAG Diag, const CBLAS_INT M, const CBLAS_INT N,
                  const void *alpha, const void  *A, const CBLAS_INT lda,
@@ -45,7 +45,7 @@ void cblas_ztrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='L';
       else
       {
-         cblas_xerbla(2, "cblas_ztrmm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ztrmm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -54,7 +54,7 @@ void cblas_ztrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(3, "cblas_ztrmm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ztrmm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -65,7 +65,7 @@ void cblas_ztrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(4, "cblas_ztrmm", "Illegal Trans setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ztrmm", "Illegal Trans setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -75,7 +75,7 @@ void cblas_ztrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Diag == CblasNonUnit ) DI='N';
       else
       {
-         cblas_xerbla(5, "cblas_ztrmm", "Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(5, "cblas_ztrmm", "Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -96,7 +96,7 @@ void cblas_ztrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='R';
       else
       {
-         cblas_xerbla(2, "cblas_ztrmm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ztrmm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -106,7 +106,7 @@ void cblas_ztrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_ztrmm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ztrmm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -117,7 +117,7 @@ void cblas_ztrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(4, "cblas_ztrmm", "Illegal Trans setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ztrmm", "Illegal Trans setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -127,7 +127,7 @@ void cblas_ztrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Diag == CblasNonUnit ) DI='N';
       else
       {
-         cblas_xerbla(5, "cblas_ztrmm", "Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(5, "cblas_ztrmm", "Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -142,7 +142,7 @@ void cblas_ztrmm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
 
       F77_ztrmm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_N, &F77_M, alpha, A, &F77_lda, B, &F77_ldb);
    }
-   else  cblas_xerbla(1, "cblas_ztrmm", "Illegal layout setting, %d\n", layout);
+   else  API_SUFFIX(cblas_xerbla)(1, "cblas_ztrmm", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ztrmv.c b/CBLAS/src/cblas_ztrmv.c
index fff888005e..f28fb19db4 100644
--- a/CBLAS/src/cblas_ztrmv.c
+++ b/CBLAS/src/cblas_ztrmv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ztrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_ztrmv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const void  *A, const CBLAS_INT lda,
                  void  *X, const CBLAS_INT incX)
@@ -43,7 +43,7 @@ void cblas_ztrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_ztrmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ztrmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -53,7 +53,7 @@ void cblas_ztrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_ztrmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ztrmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -62,7 +62,7 @@ void cblas_ztrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ztrmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ztrmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -82,7 +82,7 @@ void cblas_ztrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_ztrmv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ztrmv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -114,7 +114,7 @@ void cblas_ztrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       }
       else
       {
-         cblas_xerbla(3, "cblas_ztrmv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ztrmv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -124,7 +124,7 @@ void cblas_ztrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ztrmv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ztrmv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -149,7 +149,7 @@ void cblas_ztrmv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          }
       }
    }
-   else cblas_xerbla(1, "cblas_ztrmv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_ztrmv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ztrsm.c b/CBLAS/src/cblas_ztrsm.c
index f34b5631b6..f6d777e2ff 100644
--- a/CBLAS/src/cblas_ztrsm.c
+++ b/CBLAS/src/cblas_ztrsm.c
@@ -9,7 +9,7 @@
 
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ztrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
+void API_SUFFIX(cblas_ztrsm)(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
                  const CBLAS_UPLO Uplo, const CBLAS_TRANSPOSE TransA,
                  const CBLAS_DIAG Diag, const CBLAS_INT M, const CBLAS_INT N,
                  const void *alpha, const void  *A, const CBLAS_INT lda,
@@ -46,7 +46,7 @@ void cblas_ztrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='L';
       else
       {
-         cblas_xerbla(2, "cblas_ztrsm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ztrsm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -56,7 +56,7 @@ void cblas_ztrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='L';
       else
       {
-         cblas_xerbla(3, "cblas_ztrsm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ztrsm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -67,7 +67,7 @@ void cblas_ztrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(4, "cblas_ztrsm", "Illegal Trans setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ztrsm", "Illegal Trans setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -77,7 +77,7 @@ void cblas_ztrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Diag == CblasNonUnit ) DI='N';
       else
       {
-         cblas_xerbla(5, "cblas_ztrsm", "Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(5, "cblas_ztrsm", "Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -100,7 +100,7 @@ void cblas_ztrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Side == CblasLeft ) SD='R';
       else
       {
-         cblas_xerbla(2, "cblas_ztrsm", "Illegal Side setting, %d\n", Side);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ztrsm", "Illegal Side setting, %d\n", Side);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -110,7 +110,7 @@ void cblas_ztrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Uplo == CblasLower ) UL='U';
       else
       {
-         cblas_xerbla(3, "cblas_ztrsm", "Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ztrsm", "Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -121,7 +121,7 @@ void cblas_ztrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( TransA == CblasNoTrans )   TA='N';
       else
       {
-         cblas_xerbla(4, "cblas_ztrsm", "Illegal Trans setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ztrsm", "Illegal Trans setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -131,7 +131,7 @@ void cblas_ztrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       else if ( Diag == CblasNonUnit ) DI='N';
       else
       {
-         cblas_xerbla(5, "cblas_ztrsm", "Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(5, "cblas_ztrsm", "Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -148,7 +148,7 @@ void cblas_ztrsm(const CBLAS_LAYOUT layout, const CBLAS_SIDE Side,
       F77_ztrsm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_N, &F77_M, alpha, A,
                 &F77_lda, B, &F77_ldb);
    }
-   else  cblas_xerbla(1, "cblas_ztrsm", "Illegal layout setting, %d\n", layout);
+   else  API_SUFFIX(cblas_xerbla)(1, "cblas_ztrsm", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cblas_ztrsv.c b/CBLAS/src/cblas_ztrsv.c
index 1822bc8053..bbdbd8ff1a 100644
--- a/CBLAS/src/cblas_ztrsv.c
+++ b/CBLAS/src/cblas_ztrsv.c
@@ -7,7 +7,7 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ztrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
+void API_SUFFIX(cblas_ztrsv)(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
                  const CBLAS_TRANSPOSE TransA, const CBLAS_DIAG Diag,
                  const CBLAS_INT N, const void  *A, const CBLAS_INT lda, void  *X,
                  const CBLAS_INT incX)
@@ -42,7 +42,7 @@ void cblas_ztrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'L';
       else
       {
-         cblas_xerbla(2, "cblas_ztrsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ztrsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -52,7 +52,7 @@ void cblas_ztrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (TransA == CblasConjTrans) TA = 'C';
       else
       {
-         cblas_xerbla(3, "cblas_ztrsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ztrsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -61,7 +61,7 @@ void cblas_ztrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ztrsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ztrsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -81,7 +81,7 @@ void cblas_ztrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Uplo == CblasLower) UL = 'U';
       else
       {
-         cblas_xerbla(2, "cblas_ztrsv","Illegal Uplo setting, %d\n", Uplo);
+         API_SUFFIX(cblas_xerbla)(2, "cblas_ztrsv","Illegal Uplo setting, %d\n", Uplo);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -114,7 +114,7 @@ void cblas_ztrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       }
       else
       {
-         cblas_xerbla(3, "cblas_ztrsv","Illegal TransA setting, %d\n", TransA);
+         API_SUFFIX(cblas_xerbla)(3, "cblas_ztrsv","Illegal TransA setting, %d\n", TransA);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -124,7 +124,7 @@ void cblas_ztrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
       else if (Diag == CblasNonUnit) DI = 'N';
       else
       {
-         cblas_xerbla(4, "cblas_ztrsv","Illegal Diag setting, %d\n", Diag);
+         API_SUFFIX(cblas_xerbla)(4, "cblas_ztrsv","Illegal Diag setting, %d\n", Diag);
          CBLAS_CallFromC = 0;
          RowMajorStrg = 0;
          return;
@@ -149,7 +149,7 @@ void cblas_ztrsv(const CBLAS_LAYOUT layout, const CBLAS_UPLO Uplo,
          }
       }
    }
-   else cblas_xerbla(1, "cblas_ztrsv", "Illegal layout setting, %d\n", layout);
+   else API_SUFFIX(cblas_xerbla)(1, "cblas_ztrsv", "Illegal layout setting, %d\n", layout);
    CBLAS_CallFromC = 0;
    RowMajorStrg = 0;
    return;
diff --git a/CBLAS/src/cdotcsub.f b/CBLAS/src/cdotcsub.f
index f97d7159ee..1141e9582e 100644
--- a/CBLAS/src/cdotcsub.f
+++ b/CBLAS/src/cdotcsub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine cdotcsub(n,x,incx,y,incy,dotc)
+      implicit none
 c
       external cdotc
       complex cdotc,dotc
diff --git a/CBLAS/src/cdotusub.f b/CBLAS/src/cdotusub.f
index 5107c0402b..f7168c22d9 100644
--- a/CBLAS/src/cdotusub.f
+++ b/CBLAS/src/cdotusub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine cdotusub(n,x,incx,y,incy,dotu)
+      implicit none
 c
       external cdotu
       complex cdotu,dotu
diff --git a/CBLAS/src/dasumsub.f b/CBLAS/src/dasumsub.f
index 3d64d17e67..9a8f3648a6 100644
--- a/CBLAS/src/dasumsub.f
+++ b/CBLAS/src/dasumsub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine dasumsub(n,x,incx,asum)
+      implicit none
 c
       external dasum
       double precision dasum,asum
diff --git a/CBLAS/src/dcabs1sub.f b/CBLAS/src/dcabs1sub.f
new file mode 100644
index 0000000000..5b71052dc6
--- /dev/null
+++ b/CBLAS/src/dcabs1sub.f
@@ -0,0 +1,14 @@
+c     dcabs1.f
+c
+c     The program is a fortran wrapper for dcabs1.
+c
+      subroutine dcabs1sub(z, cabs1)
+      implicit none
+c
+      external dcabs1
+      double complex z
+      double precision dcabs1, cabs1
+c
+      cabs1=dcabs1(z)
+      return
+      end
diff --git a/CBLAS/src/ddotsub.f b/CBLAS/src/ddotsub.f
index 205f3b46f0..911a49e6d3 100644
--- a/CBLAS/src/ddotsub.f
+++ b/CBLAS/src/ddotsub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine ddotsub(n,x,incx,y,incy,dot)
+      implicit none
 c
       external ddot
       double precision ddot
diff --git a/CBLAS/src/dnrm2sub.f b/CBLAS/src/dnrm2sub.f
index 88f17db8bc..40beababa0 100644
--- a/CBLAS/src/dnrm2sub.f
+++ b/CBLAS/src/dnrm2sub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine dnrm2sub(n,x,incx,nrm2)
+      implicit none
 c
       external dnrm2
       double precision dnrm2,nrm2
diff --git a/CBLAS/src/dsdotsub.f b/CBLAS/src/dsdotsub.f
index ef53b881a2..0a5936a8de 100644
--- a/CBLAS/src/dsdotsub.f
+++ b/CBLAS/src/dsdotsub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine dsdotsub(n,x,incx,y,incy,dot)
+      implicit none
 c
       external dsdot
       double precision dsdot,dot
diff --git a/CBLAS/src/dzasumsub.f b/CBLAS/src/dzasumsub.f
index 9aaf163872..486b54dd25 100644
--- a/CBLAS/src/dzasumsub.f
+++ b/CBLAS/src/dzasumsub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine dzasumsub(n,x,incx,asum)
+      implicit none
 c
       external dzasum
       double precision dzasum,asum
diff --git a/CBLAS/src/dznrm2sub.f b/CBLAS/src/dznrm2sub.f
index 45dc599f81..c2b8128180 100644
--- a/CBLAS/src/dznrm2sub.f
+++ b/CBLAS/src/dznrm2sub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine dznrm2sub(n,x,incx,nrm2)
+      implicit none
 c
       external dznrm2
       double precision dznrm2,nrm2
diff --git a/CBLAS/src/icamaxsub.f b/CBLAS/src/icamaxsub.f
index 3f47071eb5..107f50d265 100644
--- a/CBLAS/src/icamaxsub.f
+++ b/CBLAS/src/icamaxsub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine icamaxsub(n,x,incx,iamax)
+      implicit none
 c
       external icamax
       integer  icamax,iamax
diff --git a/CBLAS/src/idamaxsub.f b/CBLAS/src/idamaxsub.f
index 3c1ee5c325..39738e1a5e 100644
--- a/CBLAS/src/idamaxsub.f
+++ b/CBLAS/src/idamaxsub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/22/1998
 c
       subroutine idamaxsub(n,x,incx,iamax)
+      implicit none
 c
       external idamax
       integer  idamax,iamax
diff --git a/CBLAS/src/isamaxsub.f b/CBLAS/src/isamaxsub.f
index 0faf42fde1..345fb77431 100644
--- a/CBLAS/src/isamaxsub.f
+++ b/CBLAS/src/isamaxsub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine isamaxsub(n,x,incx,iamax)
+      implicit none
 c
       external isamax
       integer  isamax,iamax
diff --git a/CBLAS/src/izamaxsub.f b/CBLAS/src/izamaxsub.f
index 5b15855a7f..a96fa57af9 100644
--- a/CBLAS/src/izamaxsub.f
+++ b/CBLAS/src/izamaxsub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine izamaxsub(n,x,incx,iamax)
+      implicit none
 c
       external izamax
       integer  izamax,iamax
diff --git a/CBLAS/src/sasumsub.f b/CBLAS/src/sasumsub.f
index 955f11e8dc..f8ffdc5c8a 100644
--- a/CBLAS/src/sasumsub.f
+++ b/CBLAS/src/sasumsub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine sasumsub(n,x,incx,asum)
+      implicit none
 c
       external sasum
       real sasum,asum
diff --git a/CBLAS/src/scabs1sub.f b/CBLAS/src/scabs1sub.f
new file mode 100644
index 0000000000..07c91d0b5c
--- /dev/null
+++ b/CBLAS/src/scabs1sub.f
@@ -0,0 +1,14 @@
+c     scabs1.f
+c
+c     The program is a fortran wrapper for scabs1.
+c
+      subroutine scabs1sub(z, cabs1)
+      implicit none
+c
+      external scabs1
+      complex z
+      real scabs1, cabs1
+c
+      cabs1=scabs1(z)
+      return
+      end
diff --git a/CBLAS/src/scasumsub.f b/CBLAS/src/scasumsub.f
index 077ace6703..c7de3bc19a 100644
--- a/CBLAS/src/scasumsub.f
+++ b/CBLAS/src/scasumsub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine scasumsub(n,x,incx,asum)
+      implicit none
 c
       external scasum
       real scasum,asum
diff --git a/CBLAS/src/scnrm2sub.f b/CBLAS/src/scnrm2sub.f
index 7242c9742d..59999ecd23 100644
--- a/CBLAS/src/scnrm2sub.f
+++ b/CBLAS/src/scnrm2sub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine scnrm2sub(n,x,incx,nrm2)
+      implicit none
 c
       external scnrm2
       real scnrm2,nrm2
diff --git a/CBLAS/src/sdotsub.f b/CBLAS/src/sdotsub.f
index 33fa89a9f1..c17d140699 100644
--- a/CBLAS/src/sdotsub.f
+++ b/CBLAS/src/sdotsub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine sdotsub(n,x,incx,y,incy,dot)
+      implicit none
 c
       external sdot
       real sdot
diff --git a/CBLAS/src/sdsdotsub.f b/CBLAS/src/sdsdotsub.f
index c6b8bb2e5a..9384609c69 100644
--- a/CBLAS/src/sdsdotsub.f
+++ b/CBLAS/src/sdsdotsub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine sdsdotsub(n,sb,x,incx,y,incy,dot)
+      implicit none
 c
       external sdsdot
       real sb,sdsdot,dot
diff --git a/CBLAS/src/snrm2sub.f b/CBLAS/src/snrm2sub.f
index 871a6e49f4..7fa737c338 100644
--- a/CBLAS/src/snrm2sub.f
+++ b/CBLAS/src/snrm2sub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine snrm2sub(n,x,incx,nrm2)
+      implicit none
 c
       external snrm2
       real snrm2,nrm2
diff --git a/CBLAS/src/xerbla.c b/CBLAS/src/xerbla.c
index 1857e92e84..a7ca7869a7 100644
--- a/CBLAS/src/xerbla.c
+++ b/CBLAS/src/xerbla.c
@@ -10,13 +10,16 @@ void
 #ifdef HAS_ATTRIBUTE_WEAK_SUPPORT
 __attribute__((weak))
 #endif
-F77_xerbla
+F77_xerbla_base
 #ifdef F77_CHAR
-(F77_CHAR F77_srname, void *vinfo)
+(F77_CHAR F77_srname, void *vinfo
 #else
-(char *srname, void *vinfo)
+(char *srname, void *vinfo
 #endif
-
+#ifdef BLAS_FORTRAN_STRLEN_END
+, FORTRAN_STRLEN len
+#endif
+)
 {
 #ifdef F77_CHAR
    char *srname;
@@ -37,7 +40,7 @@ F77_xerbla
    {
       for(i=0; i != XerblaStrLen; i++) rout[i+6] = tolower(srname[i]);
       rout[XerblaStrLen+6] = '\0';
-      cblas_xerbla(*info+1,rout,"");
+      API_SUFFIX(cblas_xerbla)(*info+1,rout,"");
    }
    else
    {
diff --git a/CBLAS/src/zdotcsub.f b/CBLAS/src/zdotcsub.f
index 8d483c895b..0298654ea5 100644
--- a/CBLAS/src/zdotcsub.f
+++ b/CBLAS/src/zdotcsub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine zdotcsub(n,x,incx,y,incy,dotc)
+      implicit none
 c
       external zdotc
       double complex zdotc,dotc
diff --git a/CBLAS/src/zdotusub.f b/CBLAS/src/zdotusub.f
index 23f32dec3f..8482905ac4 100644
--- a/CBLAS/src/zdotusub.f
+++ b/CBLAS/src/zdotusub.f
@@ -4,6 +4,7 @@
 c     Witten by Keita Teranishi.  2/11/1998
 c
       subroutine zdotusub(n,x,incx,y,incy,dotu)
+      implicit none
 c
       external zdotu
       double complex zdotu,dotu
diff --git a/CBLAS/testing/CMakeLists.txt b/CBLAS/testing/CMakeLists.txt
index 9b8cfaeb17..db53c30fe7 100644
--- a/CBLAS/testing/CMakeLists.txt
+++ b/CBLAS/testing/CMakeLists.txt
@@ -4,11 +4,13 @@
 #######################################################################
 
 macro(add_cblas_test output input target)
-  set(TEST_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/${input}")
+  if(NOT "${input}" STREQUAL "")
+    set(TEST_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/${input}")
+  endif()
   set(TEST_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${output}")
   set(testName "${target}")
 
-  if(EXISTS "${TEST_INPUT}")
+  if(DEFINED TEST_INPUT AND EXISTS "${TEST_INPUT}")
     add_test(NAME CBLAS-${testName} COMMAND "${CMAKE_COMMAND}"
       -DTEST=$<TARGET_FILE:${target}>
       -DINPUT=${TEST_INPUT}
@@ -52,6 +54,12 @@ if(BUILD_SINGLE)
   add_executable(xscblat2 c_sblat2.f ${STESTL2O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
   add_executable(xscblat3 c_sblat3.f ${STESTL3O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
 
+  if(HAS_ATTRIBUTE_WEAK_SUPPORT)
+    target_compile_definitions(xscblat1 PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+    target_compile_definitions(xscblat2 PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+    target_compile_definitions(xscblat3 PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+  endif()
+
   target_link_libraries(xscblat1 ${CBLASLIB})
   target_link_libraries(xscblat2 ${CBLASLIB})
   target_link_libraries(xscblat3 ${CBLASLIB})
@@ -66,6 +74,12 @@ if(BUILD_DOUBLE)
   add_executable(xdcblat2 c_dblat2.f ${DTESTL2O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
   add_executable(xdcblat3 c_dblat3.f ${DTESTL3O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
 
+  if(HAS_ATTRIBUTE_WEAK_SUPPORT)
+    target_compile_definitions(xdcblat1 PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+    target_compile_definitions(xdcblat2 PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+    target_compile_definitions(xdcblat3 PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+  endif()
+
   target_link_libraries(xdcblat1 ${CBLASLIB})
   target_link_libraries(xdcblat2 ${CBLASLIB})
   target_link_libraries(xdcblat3 ${CBLASLIB})
@@ -80,6 +94,12 @@ if(BUILD_COMPLEX)
   add_executable(xccblat2 c_cblat2.f ${CTESTL2O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
   add_executable(xccblat3 c_cblat3.f ${CTESTL3O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
 
+  if(HAS_ATTRIBUTE_WEAK_SUPPORT)
+    target_compile_definitions(xccblat1 PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+    target_compile_definitions(xccblat2 PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+    target_compile_definitions(xccblat3 PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+  endif()
+
   target_link_libraries(xccblat1 ${CBLASLIB} ${BLAS_LIBRARIES})
   target_link_libraries(xccblat2 ${CBLASLIB})
   target_link_libraries(xccblat3 ${CBLASLIB})
@@ -94,6 +114,12 @@ if(BUILD_COMPLEX16)
   add_executable(xzcblat2 c_zblat2.f ${ZTESTL2O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
   add_executable(xzcblat3 c_zblat3.f ${ZTESTL3O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
 
+  if(HAS_ATTRIBUTE_WEAK_SUPPORT)
+    target_compile_definitions(xzcblat1 PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+    target_compile_definitions(xzcblat2 PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+    target_compile_definitions(xzcblat3 PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+  endif()
+
   target_link_libraries(xzcblat1 ${CBLASLIB})
   target_link_libraries(xzcblat2 ${CBLASLIB})
   target_link_libraries(xzcblat3 ${CBLASLIB})
diff --git a/CBLAS/testing/c_c2chke.c b/CBLAS/testing/c_c2chke.c
index 33a0261f51..09be46e4e5 100644
--- a/CBLAS/testing/c_c2chke.c
+++ b/CBLAS/testing/c_c2chke.c
@@ -3,28 +3,36 @@
 #include "cblas.h"
 #include "cblas_test.h"
 
-int cblas_ok, cblas_lerr, cblas_info;
-int link_xerbla=TRUE;
+CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
+CBLAS_INT link_xerbla=TRUE;
 char *cblas_rout;
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo);
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
-void F77_xerbla(char *srname, void *vinfo);
+void F77_xerbla(char *srname, void *vinfo
 #endif
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN srname_len
+#endif
+);
 
 void chkxer(void) {
-   extern int cblas_ok, cblas_lerr, cblas_info;
-   extern int link_xerbla;
+   extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
+   extern CBLAS_INT link_xerbla;
    extern char *cblas_rout;
    if (cblas_lerr == 1 ) {
-      printf("***** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s *****\n", cblas_info, cblas_rout);
+      printf("***** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s *****\n", (int) cblas_info, cblas_rout);
       cblas_ok = 0 ;
    }
    cblas_lerr = 1 ;
 }
 
-void F77_c2chke(char *rout) {
+void F77_c2chke(char *rout
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rout_len
+#endif
+) {
    char *sf = ( rout ) ;
    float  A[2] = {0.0,0.0},
           X[2] = {0.0,0.0},
@@ -32,7 +40,7 @@ void F77_c2chke(char *rout) {
           ALPHA[2] = {0.0,0.0},
           BETA[2]  = {0.0,0.0},
           RALPHA = 0.0;
-   extern int cblas_info, cblas_lerr, cblas_ok;
+   extern CBLAS_INT cblas_info, cblas_lerr, cblas_ok;
    extern int RowMajorStrg;
    extern char *cblas_rout;
 
@@ -40,10 +48,10 @@ void F77_c2chke(char *rout) {
    if (link_xerbla) /* call these first to link */
    {
       cblas_xerbla(cblas_info,cblas_rout,"");
-      F77_xerbla(cblas_rout,&cblas_info);
+      F77_xerbla(cblas_rout,&cblas_info, 1);
    }
 #endif
-
+   link_xerbla = 0;
    cblas_ok = TRUE ;
    cblas_lerr = PASSED ;
 
diff --git a/CBLAS/testing/c_c3chke.c b/CBLAS/testing/c_c3chke.c
index 7057c7a2c4..05109d4e0a 100644
--- a/CBLAS/testing/c_c3chke.c
+++ b/CBLAS/testing/c_c3chke.c
@@ -3,28 +3,36 @@
 #include "cblas.h"
 #include "cblas_test.h"
 
-int cblas_ok, cblas_lerr, cblas_info;
-int link_xerbla=TRUE;
+CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
+CBLAS_INT link_xerbla=TRUE;
 char *cblas_rout;
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo);
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
-void F77_xerbla(char *srname, void *vinfo);
+void F77_xerbla(char *srname, void *vinfo
 #endif
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN srname_len
+#endif
+);
 
 void chkxer(void) {
-   extern int cblas_ok, cblas_lerr, cblas_info;
-   extern int link_xerbla;
+   extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
+   extern CBLAS_INT link_xerbla;
    extern char *cblas_rout;
    if (cblas_lerr == 1 ) {
-      printf("***** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s *****\n", cblas_info, cblas_rout);
+      printf("***** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s *****\n", (int) cblas_info, cblas_rout);
       cblas_ok = 0 ;
    }
    cblas_lerr = 1 ;
 }
 
-void  F77_c3chke(char *  rout) {
+void  F77_c3chke(char *  rout
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rout_len
+#endif
+) {
    char *sf = ( rout ) ;
    float   A[4]     = {0.0,0.0,0.0,0.0},
            B[4]     = {0.0,0.0,0.0,0.0},
@@ -32,7 +40,7 @@ void  F77_c3chke(char *  rout) {
            ALPHA[2] = {0.0,0.0},
            BETA[2]  = {0.0,0.0},
            RALPHA   = 0.0, RBETA = 0.0;
-   extern int cblas_info, cblas_lerr, cblas_ok;
+   extern CBLAS_INT cblas_info, cblas_lerr, cblas_ok;
    extern int RowMajorStrg;
    extern char *cblas_rout;
 
@@ -43,11 +51,242 @@ void  F77_c3chke(char *  rout) {
    if (link_xerbla) /* call these first to link */
    {
       cblas_xerbla(cblas_info,cblas_rout,"");
-      F77_xerbla(cblas_rout,&cblas_info);
+      F77_xerbla(cblas_rout,&cblas_info, 1);
    }
 #endif
 
-   if (strncmp( sf,"cblas_cgemm"   ,11)==0) {
+   link_xerbla = 0;
+   if (strncmp( sf,"cblas_cgemmtr"   ,13)==0) {
+      cblas_rout = "cblas_cgemmtr"   ;
+
+      cblas_info = 1;
+      cblas_cgemmtr( INVALID, CblasUpper, CblasNoTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_cgemmtr( INVALID, CblasUpper, CblasNoTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_cgemmtr( INVALID, CblasUpper,CblasTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_cgemmtr( INVALID, CblasUpper, CblasTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 1;
+      cblas_cgemmtr( INVALID, CblasLower, CblasNoTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_cgemmtr( INVALID, CblasLower, CblasNoTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_cgemmtr( INVALID, CblasLower,CblasTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_cgemmtr( INVALID, CblasLower, CblasTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 2; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  INVALID, CblasNoTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 2; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  INVALID, CblasNoTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 3; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, INVALID, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 3; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, INVALID, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 4; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor, CblasUpper,  CblasNoTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor, CblasUpper, CblasTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 1, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+
+      /* Row Major */
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasNoTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 9;  RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasTrans, 0, 2,
+                   ALPHA, A, 1, B, 2, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 1, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_cgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+
+   } else if (strncmp( sf,"cblas_cgemm"   ,11)==0) {
       cblas_rout = "cblas_cgemm"   ;
 
       cblas_info = 1;
@@ -274,7 +513,6 @@ void  F77_c3chke(char *  rout) {
       cblas_cgemm( CblasRowMajor,  CblasTrans, CblasTrans, 0, 2, 0,
                    ALPHA, A, 1, B, 1, BETA, C, 1 );
       chkxer();
-
    } else if (strncmp( sf,"cblas_chemm"   ,11)==0) {
             cblas_rout = "cblas_chemm"   ;
 
@@ -1702,7 +1940,7 @@ void  F77_c3chke(char *  rout) {
    }
 
    if (cblas_ok == 1 )
-       printf(" %-12s PASSED THE TESTS OF ERROR-EXITS\n", cblas_rout);
+       printf(" %-13s PASSED THE TESTS OF ERROR-EXITS\n", cblas_rout);
    else
        printf("***** %s FAILED THE TESTS OF ERROR-EXITS *******\n",cblas_rout);
 }
diff --git a/CBLAS/testing/c_cblas1.c b/CBLAS/testing/c_cblas1.c
index 81a5b843b5..ddfd84490a 100644
--- a/CBLAS/testing/c_cblas1.c
+++ b/CBLAS/testing/c_cblas1.c
@@ -8,67 +8,75 @@
  */
 #include "cblas_test.h"
 #include "cblas.h"
-void F77_caxpy(const int *N, const void *alpha, void *X,
-                    const int *incX, void *Y, const int *incY)
+void F77_caxpy(const CBLAS_INT *N, const void *alpha, void *X,
+                    const CBLAS_INT *incX, void *Y, const CBLAS_INT *incY)
 {
    cblas_caxpy(*N, alpha, X, *incX, Y, *incY);
    return;
 }
 
-void F77_ccopy(const int *N, void *X, const int *incX,
-                    void *Y, const int *incY)
+void F77_caxpby(const CBLAS_INT *N, const void *alpha, void *X,
+                    const CBLAS_INT *incX, const void *beta, void *Y, const CBLAS_INT *incY)
+{
+   cblas_caxpby(*N, alpha, X, *incX, beta, Y, *incY);
+   return;
+}
+
+
+void F77_ccopy(const CBLAS_INT *N, void *X, const CBLAS_INT *incX,
+                    void *Y, const CBLAS_INT *incY)
 {
    cblas_ccopy(*N, X, *incX, Y, *incY);
    return;
 }
 
-void F77_cdotc(const int *N, void *X, const int *incX,
-                        void *Y, const int *incY, void *dotc)
+void F77_cdotc(const CBLAS_INT *N, void *X, const CBLAS_INT *incX,
+                        void *Y, const CBLAS_INT *incY, void *dotc)
 {
    cblas_cdotc_sub(*N, X, *incX, Y, *incY, dotc);
    return;
 }
 
-void F77_cdotu(const int *N, void *X, const int *incX,
-                        void *Y, const int *incY,void *dotu)
+void F77_cdotu(const CBLAS_INT *N, void *X, const CBLAS_INT *incX,
+                        void *Y, const CBLAS_INT *incY,void *dotu)
 {
    cblas_cdotu_sub(*N, X, *incX, Y, *incY, dotu);
    return;
 }
 
-void F77_cscal(const int *N, const void * *alpha, void *X,
-                         const int *incX)
+void F77_cscal(const CBLAS_INT *N, const void * *alpha, void *X,
+                         const CBLAS_INT *incX)
 {
    cblas_cscal(*N, alpha, X, *incX);
    return;
 }
 
-void F77_csscal(const int *N, const float *alpha, void *X,
-                         const int *incX)
+void F77_csscal(const CBLAS_INT *N, const float *alpha, void *X,
+                         const CBLAS_INT *incX)
 {
    cblas_csscal(*N, *alpha, X, *incX);
    return;
 }
 
-void F77_cswap( const int *N, void *X, const int *incX,
-                          void *Y, const int *incY)
+void F77_cswap( const CBLAS_INT *N, void *X, const CBLAS_INT *incX,
+                          void *Y, const CBLAS_INT *incY)
 {
    cblas_cswap(*N,X,*incX,Y,*incY);
    return;
 }
 
-int F77_icamax(const int *N, const void *X, const int *incX)
+CBLAS_INT F77_icamax(const CBLAS_INT *N, const void *X, const CBLAS_INT *incX)
 {
    if (*N < 1 || *incX < 1) return(0);
    return (cblas_icamax(*N, X, *incX)+1);
 }
 
-float F77_scnrm2(const int *N, const void *X, const int *incX)
+float F77_scnrm2(const CBLAS_INT *N, const void *X, const CBLAS_INT *incX)
 {
    return cblas_scnrm2(*N, X, *incX);
 }
 
-float F77_scasum(const int *N, void *X, const int *incX)
+float F77_scasum(const CBLAS_INT *N, void *X, const CBLAS_INT *incX)
 {
    return cblas_scasum(*N, X, *incX);
 }
diff --git a/CBLAS/testing/c_cblas2.c b/CBLAS/testing/c_cblas2.c
index bb7e644854..38a089f0e2 100644
--- a/CBLAS/testing/c_cblas2.c
+++ b/CBLAS/testing/c_cblas2.c
@@ -8,13 +8,17 @@
 #include "cblas.h"
 #include "cblas_test.h"
 
-void F77_cgemv(int *layout, char *transp, int *m, int *n,
+void F77_cgemv(CBLAS_INT *layout, char *transp, CBLAS_INT *m, CBLAS_INT *n,
           const void *alpha,
-          CBLAS_TEST_COMPLEX *a, int *lda, const void *x, int *incx,
-          const void *beta, void *y, int *incy) {
+          CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda, const void *x, CBLAS_INT *incx,
+          const void *beta, void *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN transp_len
+#endif
+) {
 
   CBLAS_TEST_COMPLEX *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_TRANSPOSE trans;
 
   get_transpose_type(transp, &trans);
@@ -38,13 +42,17 @@ void F77_cgemv(int *layout, char *transp, int *m, int *n,
                   *m, *n, alpha, a, *lda, x, *incx, beta, y, *incy );
 }
 
-void F77_cgbmv(int *layout, char *transp, int *m, int *n, int *kl, int *ku,
-	      CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-	      CBLAS_TEST_COMPLEX *x, int *incx,
-	      CBLAS_TEST_COMPLEX *beta, CBLAS_TEST_COMPLEX *y, int *incy) {
+void F77_cgbmv(CBLAS_INT *layout, char *transp, CBLAS_INT *m, CBLAS_INT *n, CBLAS_INT *kl, CBLAS_INT *ku,
+	      CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda,
+	      CBLAS_TEST_COMPLEX *x, CBLAS_INT *incx,
+	      CBLAS_TEST_COMPLEX *beta, CBLAS_TEST_COMPLEX *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN transp_len
+#endif
+) {
 
   CBLAS_TEST_COMPLEX *A;
-  int i,j,irow,jcol,LDA;
+  CBLAS_INT i,j,irow,jcol,LDA;
   CBLAS_TRANSPOSE trans;
 
   get_transpose_type(transp, &trans);
@@ -85,12 +93,12 @@ void F77_cgbmv(int *layout, char *transp, int *m, int *n, int *kl, int *ku,
 		  *incx, beta, y, *incy );
 }
 
-void F77_cgeru(int *layout, int *m, int *n, CBLAS_TEST_COMPLEX *alpha,
-	 CBLAS_TEST_COMPLEX *x, int *incx, CBLAS_TEST_COMPLEX *y, int *incy,
-         CBLAS_TEST_COMPLEX *a, int *lda){
+void F77_cgeru(CBLAS_INT *layout, CBLAS_INT *m, CBLAS_INT *n, CBLAS_TEST_COMPLEX *alpha,
+	 CBLAS_TEST_COMPLEX *x, CBLAS_INT *incx, CBLAS_TEST_COMPLEX *y, CBLAS_INT *incy,
+         CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda){
 
   CBLAS_TEST_COMPLEX *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
 
   if (*layout == TEST_ROW_MJR) {
      LDA = *n+1;
@@ -114,11 +122,11 @@ void F77_cgeru(int *layout, int *m, int *n, CBLAS_TEST_COMPLEX *alpha,
      cblas_cgeru( UNDEFINED, *m, *n, alpha, x, *incx, y, *incy, a, *lda );
 }
 
-void F77_cgerc(int *layout, int *m, int *n, CBLAS_TEST_COMPLEX *alpha,
-	 CBLAS_TEST_COMPLEX *x, int *incx, CBLAS_TEST_COMPLEX *y, int *incy,
-         CBLAS_TEST_COMPLEX *a, int *lda) {
+void F77_cgerc(CBLAS_INT *layout, CBLAS_INT *m, CBLAS_INT *n, CBLAS_TEST_COMPLEX *alpha,
+	 CBLAS_TEST_COMPLEX *x, CBLAS_INT *incx, CBLAS_TEST_COMPLEX *y, CBLAS_INT *incy,
+         CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda) {
   CBLAS_TEST_COMPLEX *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
 
   if (*layout == TEST_ROW_MJR) {
      LDA = *n+1;
@@ -142,12 +150,16 @@ void F77_cgerc(int *layout, int *m, int *n, CBLAS_TEST_COMPLEX *alpha,
      cblas_cgerc( UNDEFINED, *m, *n, alpha, x, *incx, y, *incy, a, *lda );
 }
 
-void F77_chemv(int *layout, char *uplow, int *n, CBLAS_TEST_COMPLEX *alpha,
-      CBLAS_TEST_COMPLEX *a, int *lda, CBLAS_TEST_COMPLEX *x,
-      int *incx, CBLAS_TEST_COMPLEX *beta, CBLAS_TEST_COMPLEX *y, int *incy){
+void F77_chemv(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, CBLAS_TEST_COMPLEX *alpha,
+      CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda, CBLAS_TEST_COMPLEX *x,
+      CBLAS_INT *incx, CBLAS_TEST_COMPLEX *beta, CBLAS_TEST_COMPLEX *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+){
 
   CBLAS_TEST_COMPLEX *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -172,13 +184,17 @@ void F77_chemv(int *layout, char *uplow, int *n, CBLAS_TEST_COMPLEX *alpha,
 	   beta, y, *incy );
 }
 
-void F77_chbmv(int *layout, char *uplow, int *n, int *k,
-     CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-     CBLAS_TEST_COMPLEX *x, int *incx, CBLAS_TEST_COMPLEX *beta,
-     CBLAS_TEST_COMPLEX *y, int *incy){
+void F77_chbmv(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, CBLAS_INT *k,
+     CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda,
+     CBLAS_TEST_COMPLEX *x, CBLAS_INT *incx, CBLAS_TEST_COMPLEX *beta,
+     CBLAS_TEST_COMPLEX *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+){
 
 CBLAS_TEST_COMPLEX *A;
-int i,irow,j,jcol,LDA;
+CBLAS_INT i,irow,j,jcol,LDA;
 
   CBLAS_UPLO uplo;
 
@@ -236,12 +252,16 @@ int i,irow,j,jcol,LDA;
                  beta, y, *incy );
 }
 
-void F77_chpmv(int *layout, char *uplow, int *n, CBLAS_TEST_COMPLEX *alpha,
-     CBLAS_TEST_COMPLEX *ap, CBLAS_TEST_COMPLEX *x, int *incx,
-     CBLAS_TEST_COMPLEX *beta, CBLAS_TEST_COMPLEX *y, int *incy){
+void F77_chpmv(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, CBLAS_TEST_COMPLEX *alpha,
+     CBLAS_TEST_COMPLEX *ap, CBLAS_TEST_COMPLEX *x, CBLAS_INT *incx,
+     CBLAS_TEST_COMPLEX *beta, CBLAS_TEST_COMPLEX *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+){
 
   CBLAS_TEST_COMPLEX *A, *AP;
-  int i,j,k,LDA;
+  CBLAS_INT i,j,k,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -292,11 +312,15 @@ void F77_chpmv(int *layout, char *uplow, int *n, CBLAS_TEST_COMPLEX *alpha,
                   *incy );
 }
 
-void F77_ctbmv(int *layout, char *uplow, char *transp, char *diagn,
-     int *n, int *k, CBLAS_TEST_COMPLEX *a, int *lda, CBLAS_TEST_COMPLEX *x,
-     int *incx) {
+void F77_ctbmv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+     CBLAS_INT *n, CBLAS_INT *k, CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda, CBLAS_TEST_COMPLEX *x,
+     CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   CBLAS_TEST_COMPLEX *A;
-  int irow, jcol, i, j, LDA;
+  CBLAS_INT irow, jcol, i, j, LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -355,12 +379,16 @@ void F77_ctbmv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_ctbmv(UNDEFINED, uplo, trans, diag, *n, *k, a, *lda, x, *incx);
 }
 
-void F77_ctbsv(int *layout, char *uplow, char *transp, char *diagn,
-      int *n, int *k, CBLAS_TEST_COMPLEX *a, int *lda, CBLAS_TEST_COMPLEX *x,
-      int *incx) {
+void F77_ctbsv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+      CBLAS_INT *n, CBLAS_INT *k, CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda, CBLAS_TEST_COMPLEX *x,
+      CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
 
   CBLAS_TEST_COMPLEX *A;
-  int irow, jcol, i, j, LDA;
+  CBLAS_INT irow, jcol, i, j, LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -419,10 +447,14 @@ void F77_ctbsv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_ctbsv(UNDEFINED, uplo, trans, diag, *n, *k, a, *lda, x, *incx);
 }
 
-void F77_ctpmv(int *layout, char *uplow, char *transp, char *diagn,
-      int *n, CBLAS_TEST_COMPLEX *ap, CBLAS_TEST_COMPLEX *x, int *incx) {
+void F77_ctpmv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+      CBLAS_INT *n, CBLAS_TEST_COMPLEX *ap, CBLAS_TEST_COMPLEX *x, CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len , FORTRAN_STRLEN diagn_len
+#endif
+) {
   CBLAS_TEST_COMPLEX *A, *AP;
-  int i, j, k, LDA;
+  CBLAS_INT i, j, k, LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -474,10 +506,14 @@ void F77_ctpmv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_ctpmv( UNDEFINED, uplo, trans, diag, *n, ap, x, *incx );
 }
 
-void F77_ctpsv(int *layout, char *uplow, char *transp, char *diagn,
-     int *n, CBLAS_TEST_COMPLEX *ap, CBLAS_TEST_COMPLEX *x, int *incx) {
+void F77_ctpsv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+     CBLAS_INT *n, CBLAS_TEST_COMPLEX *ap, CBLAS_TEST_COMPLEX *x, CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   CBLAS_TEST_COMPLEX *A, *AP;
-  int i, j, k, LDA;
+  CBLAS_INT i, j, k, LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -529,11 +565,15 @@ void F77_ctpsv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_ctpsv( UNDEFINED, uplo, trans, diag, *n, ap, x, *incx );
 }
 
-void F77_ctrmv(int *layout, char *uplow, char *transp, char *diagn,
-     int *n, CBLAS_TEST_COMPLEX *a, int *lda, CBLAS_TEST_COMPLEX *x,
-      int *incx) {
+void F77_ctrmv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+     CBLAS_INT *n, CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda, CBLAS_TEST_COMPLEX *x,
+      CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   CBLAS_TEST_COMPLEX *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -558,11 +598,15 @@ void F77_ctrmv(int *layout, char *uplow, char *transp, char *diagn,
   else
      cblas_ctrmv(UNDEFINED, uplo, trans, diag, *n, a, *lda, x, *incx);
 }
-void F77_ctrsv(int *layout, char *uplow, char *transp, char *diagn,
-       int *n, CBLAS_TEST_COMPLEX *a, int *lda, CBLAS_TEST_COMPLEX *x,
-              int *incx) {
+void F77_ctrsv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+       CBLAS_INT *n, CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda, CBLAS_TEST_COMPLEX *x,
+              CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   CBLAS_TEST_COMPLEX *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -588,10 +632,14 @@ void F77_ctrsv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_ctrsv(UNDEFINED, uplo, trans, diag, *n, a, *lda, x, *incx );
 }
 
-void F77_chpr(int *layout, char *uplow, int *n, float *alpha,
-	     CBLAS_TEST_COMPLEX *x, int *incx, CBLAS_TEST_COMPLEX *ap) {
+void F77_chpr(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, float *alpha,
+	     CBLAS_TEST_COMPLEX *x, CBLAS_INT *incx, CBLAS_TEST_COMPLEX *ap
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
   CBLAS_TEST_COMPLEX *A, *AP;
-  int i,j,k,LDA;
+  CBLAS_INT i,j,k,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -663,11 +711,15 @@ void F77_chpr(int *layout, char *uplow, int *n, float *alpha,
      cblas_chpr(UNDEFINED, uplo, *n, *alpha, x, *incx, ap );
 }
 
-void F77_chpr2(int *layout, char *uplow, int *n, CBLAS_TEST_COMPLEX *alpha,
-       CBLAS_TEST_COMPLEX *x, int *incx, CBLAS_TEST_COMPLEX *y, int *incy,
-       CBLAS_TEST_COMPLEX *ap) {
+void F77_chpr2(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, CBLAS_TEST_COMPLEX *alpha,
+       CBLAS_TEST_COMPLEX *x, CBLAS_INT *incx, CBLAS_TEST_COMPLEX *y, CBLAS_INT *incy,
+       CBLAS_TEST_COMPLEX *ap
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
   CBLAS_TEST_COMPLEX *A, *AP;
-  int i,j,k,LDA;
+  CBLAS_INT i,j,k,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -740,10 +792,14 @@ void F77_chpr2(int *layout, char *uplow, int *n, CBLAS_TEST_COMPLEX *alpha,
      cblas_chpr2( UNDEFINED, uplo, *n, alpha, x, *incx, y, *incy, ap );
 }
 
-void F77_cher(int *layout, char *uplow, int *n, float *alpha,
-  CBLAS_TEST_COMPLEX *x, int *incx, CBLAS_TEST_COMPLEX *a, int *lda) {
+void F77_cher(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, float *alpha,
+  CBLAS_TEST_COMPLEX *x, CBLAS_INT *incx, CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
   CBLAS_TEST_COMPLEX *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -772,12 +828,16 @@ void F77_cher(int *layout, char *uplow, int *n, float *alpha,
      cblas_cher( UNDEFINED, uplo, *n, *alpha, x, *incx, a, *lda );
 }
 
-void F77_cher2(int *layout, char *uplow, int *n, CBLAS_TEST_COMPLEX *alpha,
-          CBLAS_TEST_COMPLEX *x, int *incx, CBLAS_TEST_COMPLEX *y, int *incy,
-	  CBLAS_TEST_COMPLEX *a, int *lda) {
+void F77_cher2(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, CBLAS_TEST_COMPLEX *alpha,
+          CBLAS_TEST_COMPLEX *x, CBLAS_INT *incx, CBLAS_TEST_COMPLEX *y, CBLAS_INT *incy,
+	  CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
 
   CBLAS_TEST_COMPLEX *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
diff --git a/CBLAS/testing/c_cblas3.c b/CBLAS/testing/c_cblas3.c
index e0e41230f4..4d396fe678 100644
--- a/CBLAS/testing/c_cblas3.c
+++ b/CBLAS/testing/c_cblas3.c
@@ -11,13 +11,17 @@
 #define  TEST_ROW_MJR	1
 #define  UNDEFINED     -1
 
-void F77_cgemm(int *layout, char *transpa, char *transpb, int *m, int *n,
-     int *k, CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-     CBLAS_TEST_COMPLEX *b, int *ldb, CBLAS_TEST_COMPLEX *beta,
-     CBLAS_TEST_COMPLEX *c, int *ldc ) {
+void F77_cgemm(CBLAS_INT *layout, char *transpa, char *transpb, CBLAS_INT *m, CBLAS_INT *n,
+     CBLAS_INT *k, CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda,
+     CBLAS_TEST_COMPLEX *b, CBLAS_INT *ldb, CBLAS_TEST_COMPLEX *beta,
+     CBLAS_TEST_COMPLEX *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN transpa_len, FORTRAN_STRLEN transpb_len
+#endif
+) {
 
   CBLAS_TEST_COMPLEX *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
+  CBLAS_INT i,j,LDA, LDB, LDC;
   CBLAS_TRANSPOSE transa, transb;
 
   get_transpose_type(transpa, &transa);
@@ -87,13 +91,98 @@ void F77_cgemm(int *layout, char *transpa, char *transpb, int *m, int *n,
      cblas_cgemm( UNDEFINED, transa, transb, *m, *n, *k, alpha, a, *lda,
                   b, *ldb, beta, c, *ldc );
 }
-void F77_chemm(int *layout, char *rtlf, char *uplow, int *m, int *n,
-        CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-	CBLAS_TEST_COMPLEX *b, int *ldb, CBLAS_TEST_COMPLEX *beta,
-        CBLAS_TEST_COMPLEX *c, int *ldc ) {
+
+void F77_cgemmtr(CBLAS_INT *layout, char *uplop, char *transpa, char *transpb, CBLAS_INT *n,
+     CBLAS_INT *k, CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda,
+     CBLAS_TEST_COMPLEX *b, CBLAS_INT *ldb, CBLAS_TEST_COMPLEX *beta,
+     CBLAS_TEST_COMPLEX *c, CBLAS_INT *ldc ) {
+
+  CBLAS_TEST_COMPLEX *A, *B, *C;
+  CBLAS_INT i,j,LDA, LDB, LDC;
+  CBLAS_TRANSPOSE transa, transb;
+  CBLAS_UPLO uplo;
+
+  get_transpose_type(transpa, &transa);
+  get_transpose_type(transpb, &transb);
+  get_uplo_type(uplop, &uplo);
+
+  if (*layout == TEST_ROW_MJR) {
+     if (transa == CblasNoTrans) {
+        LDA = *k+1;
+        A=(CBLAS_TEST_COMPLEX*)malloc((*n)*LDA*sizeof(CBLAS_TEST_COMPLEX));
+        for( i=0; i<*n; i++ )
+           for( j=0; j<*k; j++ ) {
+              A[i*LDA+j].real=a[j*(*lda)+i].real;
+              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
+           }
+     }
+     else {
+        LDA = *n+1;
+        A=(CBLAS_TEST_COMPLEX* )malloc(LDA*(*k)*sizeof(CBLAS_TEST_COMPLEX));
+        for( i=0; i<*k; i++ )
+           for( j=0; j<*n; j++ ) {
+              A[i*LDA+j].real=a[j*(*lda)+i].real;
+              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
+           }
+     }
+
+     if (transb == CblasNoTrans) {
+        LDB = *n+1;
+        B=(CBLAS_TEST_COMPLEX* )malloc((*k)*LDB*sizeof(CBLAS_TEST_COMPLEX) );
+        for( i=0; i<*k; i++ )
+           for( j=0; j<*n; j++ ) {
+              B[i*LDB+j].real=b[j*(*ldb)+i].real;
+              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
+           }
+     }
+     else {
+        LDB = *k+1;
+        B=(CBLAS_TEST_COMPLEX* )malloc(LDB*(*n)*sizeof(CBLAS_TEST_COMPLEX));
+        for( i=0; i<*n; i++ )
+           for( j=0; j<*k; j++ ) {
+              B[i*LDB+j].real=b[j*(*ldb)+i].real;
+              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
+           }
+     }
+
+     LDC = *n+1;
+     C=(CBLAS_TEST_COMPLEX* )malloc((*n)*LDC*sizeof(CBLAS_TEST_COMPLEX));
+     for( j=0; j<*n; j++ )
+        for( i=0; i<*n; i++ ) {
+           C[i*LDC+j].real=c[j*(*ldc)+i].real;
+           C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
+        }
+     cblas_cgemmtr( CblasRowMajor, uplo, transa, transb, *n, *k, alpha, A, LDA,
+                  B, LDB, beta, C, LDC );
+     for( j=0; j<*n; j++ )
+        for( i=0; i<*n; i++ ) {
+           c[j*(*ldc)+i].real=C[i*LDC+j].real;
+           c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
+        }
+     free(A);
+     free(B);
+     free(C);
+  }
+  else if (*layout == TEST_COL_MJR)
+     cblas_cgemmtr( CblasColMajor, uplo, transa, transb, *n, *k, alpha, a, *lda,
+                  b, *ldb, beta, c, *ldc );
+  else
+     cblas_cgemmtr( UNDEFINED, uplo, transa, transb, *n, *k, alpha, a, *lda,
+                  b, *ldb, beta, c, *ldc );
+}
+
+
+void F77_chemm(CBLAS_INT *layout, char *rtlf, char *uplow, CBLAS_INT *m, CBLAS_INT *n,
+        CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda,
+	      CBLAS_TEST_COMPLEX *b, CBLAS_INT *ldb, CBLAS_TEST_COMPLEX *beta,
+        CBLAS_TEST_COMPLEX *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rtlf_len, FORTRAN_STRLEN uplow_len
+#endif
+) {
 
   CBLAS_TEST_COMPLEX *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
+  CBLAS_INT i,j,LDA, LDB, LDC;
   CBLAS_UPLO uplo;
   CBLAS_SIDE side;
 
@@ -151,13 +240,17 @@ void F77_chemm(int *layout, char *rtlf, char *uplow, int *m, int *n,
      cblas_chemm( UNDEFINED, side, uplo, *m, *n, alpha, a, *lda, b, *ldb,
                   beta, c, *ldc );
 }
-void F77_csymm(int *layout, char *rtlf, char *uplow, int *m, int *n,
-          CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-	  CBLAS_TEST_COMPLEX *b, int *ldb, CBLAS_TEST_COMPLEX *beta,
-          CBLAS_TEST_COMPLEX *c, int *ldc ) {
+void F77_csymm(CBLAS_INT *layout, char *rtlf, char *uplow, CBLAS_INT *m, CBLAS_INT *n,
+          CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda,
+	        CBLAS_TEST_COMPLEX *b, CBLAS_INT *ldb, CBLAS_TEST_COMPLEX *beta,
+          CBLAS_TEST_COMPLEX *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rtlf_len, FORTRAN_STRLEN uplow_len
+#endif
+) {
 
   CBLAS_TEST_COMPLEX *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
+  CBLAS_INT i,j,LDA, LDB, LDC;
   CBLAS_UPLO uplo;
   CBLAS_SIDE side;
 
@@ -206,11 +299,15 @@ void F77_csymm(int *layout, char *rtlf, char *uplow, int *m, int *n,
                   beta, c, *ldc );
 }
 
-void F77_cherk(int *layout, char *uplow, char *transp, int *n, int *k,
-     float *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-     float *beta, CBLAS_TEST_COMPLEX *c, int *ldc ) {
+void F77_cherk(CBLAS_INT *layout, char *uplow, char *transp, CBLAS_INT *n, CBLAS_INT *k,
+     float *alpha, CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda,
+     float *beta, CBLAS_TEST_COMPLEX *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len
+#endif
+) {
 
-  int i,j,LDA,LDC;
+  CBLAS_INT i,j,LDA,LDC;
   CBLAS_TEST_COMPLEX *A, *C;
   CBLAS_UPLO uplo;
   CBLAS_TRANSPOSE trans;
@@ -262,11 +359,15 @@ void F77_cherk(int *layout, char *uplow, char *transp, int *n, int *k,
 	         c, *ldc );
 }
 
-void F77_csyrk(int *layout, char *uplow, char *transp, int *n, int *k,
-     CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-     CBLAS_TEST_COMPLEX *beta, CBLAS_TEST_COMPLEX *c, int *ldc ) {
+void F77_csyrk(CBLAS_INT *layout, char *uplow, char *transp, CBLAS_INT *n, CBLAS_INT *k,
+     CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda,
+     CBLAS_TEST_COMPLEX *beta, CBLAS_TEST_COMPLEX *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len
+#endif
+) {
 
-  int i,j,LDA,LDC;
+  CBLAS_INT i,j,LDA,LDC;
   CBLAS_TEST_COMPLEX *A, *C;
   CBLAS_UPLO uplo;
   CBLAS_TRANSPOSE trans;
@@ -317,11 +418,15 @@ void F77_csyrk(int *layout, char *uplow, char *transp, int *n, int *k,
      cblas_csyrk(UNDEFINED, uplo, trans, *n, *k, alpha, a, *lda, beta,
 	         c, *ldc );
 }
-void F77_cher2k(int *layout, char *uplow, char *transp, int *n, int *k,
-        CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-	CBLAS_TEST_COMPLEX *b, int *ldb, float *beta,
-        CBLAS_TEST_COMPLEX *c, int *ldc ) {
-  int i,j,LDA,LDB,LDC;
+void F77_cher2k(CBLAS_INT *layout, char *uplow, char *transp, CBLAS_INT *n, CBLAS_INT *k,
+        CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda,
+	CBLAS_TEST_COMPLEX *b, CBLAS_INT *ldb, float *beta,
+        CBLAS_TEST_COMPLEX *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len
+#endif
+) {
+  CBLAS_INT i,j,LDA,LDB,LDC;
   CBLAS_TEST_COMPLEX *A, *B, *C;
   CBLAS_UPLO uplo;
   CBLAS_TRANSPOSE trans;
@@ -381,11 +486,15 @@ void F77_cher2k(int *layout, char *uplow, char *transp, int *n, int *k,
      cblas_cher2k(UNDEFINED, uplo, trans, *n, *k, alpha, a, *lda,
 		   b, *ldb, *beta, c, *ldc );
 }
-void F77_csyr2k(int *layout, char *uplow, char *transp, int *n, int *k,
-         CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-	 CBLAS_TEST_COMPLEX *b, int *ldb, CBLAS_TEST_COMPLEX *beta,
-         CBLAS_TEST_COMPLEX *c, int *ldc ) {
-  int i,j,LDA,LDB,LDC;
+void F77_csyr2k(CBLAS_INT *layout, char *uplow, char *transp, CBLAS_INT *n, CBLAS_INT *k,
+         CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, CBLAS_INT *lda,
+	 CBLAS_TEST_COMPLEX *b, CBLAS_INT *ldb, CBLAS_TEST_COMPLEX *beta,
+         CBLAS_TEST_COMPLEX *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len
+#endif
+) {
+  CBLAS_INT i,j,LDA,LDB,LDC;
   CBLAS_TEST_COMPLEX *A, *B, *C;
   CBLAS_UPLO uplo;
   CBLAS_TRANSPOSE trans;
@@ -445,10 +554,14 @@ void F77_csyr2k(int *layout, char *uplow, char *transp, int *n, int *k,
      cblas_csyr2k(UNDEFINED, uplo, trans, *n, *k, alpha, a, *lda,
 		   b, *ldb, beta, c, *ldc );
 }
-void F77_ctrmm(int *layout, char *rtlf, char *uplow, char *transp, char *diagn,
-       int *m, int *n, CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a,
-       int *lda, CBLAS_TEST_COMPLEX *b, int *ldb) {
-  int i,j,LDA,LDB;
+void F77_ctrmm(CBLAS_INT *layout, char *rtlf, char *uplow, char *transp, char *diagn,
+       CBLAS_INT *m, CBLAS_INT *n, CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a,
+       CBLAS_INT *lda, CBLAS_TEST_COMPLEX *b, CBLAS_INT *ldb
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rtlf_len, FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
+  CBLAS_INT i,j,LDA,LDB;
   CBLAS_TEST_COMPLEX *A, *B;
   CBLAS_SIDE side;
   CBLAS_DIAG diag;
@@ -504,10 +617,14 @@ void F77_ctrmm(int *layout, char *rtlf, char *uplow, char *transp, char *diagn,
 		   a, *lda, b, *ldb);
 }
 
-void F77_ctrsm(int *layout, char *rtlf, char *uplow, char *transp, char *diagn,
-         int *m, int *n, CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a,
-         int *lda, CBLAS_TEST_COMPLEX *b, int *ldb) {
-  int i,j,LDA,LDB;
+void F77_ctrsm(CBLAS_INT *layout, char *rtlf, char *uplow, char *transp, char *diagn,
+         CBLAS_INT *m, CBLAS_INT *n, CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a,
+         CBLAS_INT *lda, CBLAS_TEST_COMPLEX *b, CBLAS_INT *ldb
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rtlf_len, FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
+  CBLAS_INT i,j,LDA,LDB;
   CBLAS_TEST_COMPLEX *A, *B;
   CBLAS_SIDE side;
   CBLAS_DIAG diag;
diff --git a/CBLAS/testing/c_cblat1.f b/CBLAS/testing/c_cblat1.f
index 1a123d74dc..ec1bae514b 100644
--- a/CBLAS/testing/c_cblat1.f
+++ b/CBLAS/testing/c_cblat1.f
@@ -1,4 +1,6 @@
+*  =====================================================================
       PROGRAM CCBLAT1
+      IMPLICIT NONE
 *     Test program for the COMPLEX    Level 1 CBLAS.
 *     Based upon the original CBLAS test routine together with:
 *     F06GAF Example Program Text
@@ -19,7 +21,7 @@ PROGRAM CCBLAT1
       DATA             SFAC/9.765625E-4/
 *     .. Executable Statements ..
       WRITE (NOUT,99999)
-      DO 20 IC = 1, 10
+      DO 20 IC = 1, 11
          ICASE = IC
          CALL HEADER
 *
@@ -32,7 +34,7 @@ PROGRAM CCBLAT1
          INCX = 9999
          INCY = 9999
          MODE = 9999
-         IF (ICASE.LE.5) THEN
+         IF (ICASE.LE.5 .OR. ICASE.EQ.11) THEN
             CALL CHECK2(SFAC)
          ELSE IF (ICASE.GE.6) THEN
             CALL CHECK1(SFAC)
@@ -45,7 +47,10 @@ PROGRAM CCBLAT1
 99999 FORMAT (' Complex CBLAS Test Program Results',/1X)
 99998 FORMAT ('                                    ----- PASS -----')
       END
+
+*  =====================================================================
       SUBROUTINE HEADER
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER          NOUT
       PARAMETER        (NOUT=6)
@@ -53,7 +58,7 @@ SUBROUTINE HEADER
       INTEGER          ICASE, INCX, INCY, MODE, N
       LOGICAL          PASS
 *     .. Local Arrays ..
-      CHARACTER*15      L(10)
+      CHARACTER*15      L(11)
 *     .. Common blocks ..
       COMMON           /COMBLA/ICASE, N, INCX, INCY, MODE, PASS
 *     .. Data statements ..
@@ -67,13 +72,18 @@ SUBROUTINE HEADER
       DATA             L(8)/'CBLAS_CSCAL'/
       DATA             L(9)/'CBLAS_CSSCAL'/
       DATA             L(10)/'CBLAS_ICAMAX'/
+      DATA             L(11)/'CBLAS_CAXPBY'/
+
 *     .. Executable Statements ..
       WRITE (NOUT,99999) ICASE, L(ICASE)
       RETURN
 *
 99999 FORMAT (/' Test of subprogram number',I3,9X,A15)
       END
+
+*  =====================================================================
       SUBROUTINE CHECK1(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
       PARAMETER         (NOUT=6)
@@ -274,7 +284,10 @@ SUBROUTINE CHECK1(SFAC)
       END IF
       RETURN
       END
+
+*  =====================================================================
       SUBROUTINE CHECK2(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
       PARAMETER         (NOUT=6)
@@ -284,23 +297,26 @@ SUBROUTINE CHECK2(SFAC)
       INTEGER           ICASE, INCX, INCY, MODE, N
       LOGICAL           PASS
 *     .. Local Scalars ..
-      COMPLEX           CA,CTEMP
+      COMPLEX           CA,CB,CTEMP
       INTEGER           I, J, KI, KN, KSIZE, LENX, LENY, MX, MY
 *     .. Local Arrays ..
       COMPLEX           CDOT(1), CSIZE1(4), CSIZE2(7,2), CSIZE3(14),
      +                  CT10X(7,4,4), CT10Y(7,4,4), CT6(4,4), CT7(4,4),
-     +                  CT8(7,4,4), CX(7), CX1(7), CY(7), CY1(7)
+     +                  CT8(7,4,4), CX(7), CX1(7), CY(7), CY1(7),
+     +                  CT11(7,4,4)
       INTEGER           INCXS(4), INCYS(4), LENS(4,2), NS(4)
 *     .. External Functions ..
       EXTERNAL          CDOTCTEST, CDOTUTEST
 *     .. External Subroutines ..
-      EXTERNAL          CAXPYTEST, CCOPYTEST, CSWAPTEST, CTEST
+      EXTERNAL          CAXPYTEST, CCOPYTEST, CSWAPTEST, CTEST,
+     +                  CAXPBYTEST
 *     .. Intrinsic Functions ..
       INTRINSIC         ABS, MIN
 *     .. Common blocks ..
       COMMON            /COMBLA/ICASE, N, INCX, INCY, MODE, PASS
 *     .. Data statements ..
       DATA              CA/(0.4E0,-0.7E0)/
+      DATA              CB/(0.7E0,-0.4E0)/
       DATA              INCXS/1, 2, -2, -1/
       DATA              INCYS/1, -2, 1, -2/
       DATA              LENS/1, 1, 2, 4, 1, 1, 3, 7/
@@ -470,6 +486,54 @@ SUBROUTINE CHECK2(SFAC)
      +                  (1.54E0,1.54E0), (1.54E0,1.54E0),
      +                  (1.54E0,1.54E0), (1.54E0,1.54E0),
      +                  (1.54E0,1.54E0), (1.54E0,1.54E0)/
+
+      DATA              ((CT11(I,J,1),I=1,7),J=1,4)/(0.6E0,-0.6E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (-0.1E0,-1.47E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (-0.1E0,-1.47E0),
+     +                  (-1.08E0,0.71E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (-0.1E0,-1.47E0), (-1.08E0,0.71E0),
+     +                  (-0.42E0,-0.99E0), (-0.61E0,-0.85E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0)/
+      DATA              ((CT11(I,J,2),I=1,7),J=1,4)/(0.6E0,-0.6E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (-0.1E0,-1.47E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (-0.49E0,-0.95E0),
+     +                  (-0.9E0,0.5E0),(-0.03E0,-1.51E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.36E0,0.00E0), (-0.9E0,0.5E0),
+     +                  (-0.39E0,-0.23E0), (0.1E0,-0.5E0),
+     +                  (-0.82E0,-0.39E0), (-0.5E0,-0.3E0),
+     +                  (0.0E0,-1.62E0)/
+      DATA              ((CT11(I,J,3),I=1,7),J=1,4)/(0.6E0,-0.6E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (-0.1E0,-1.47E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (-0.49E0,-0.95E0),
+     +                  (-0.71E0,-0.1E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.36E0,0.00E0), (-1.07E0,1.18E0),
+     +                  (-0.42E0,-0.99E0), (-0.41E0,-1.2E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0)/
+      DATA              ((CT11(I,J,4),I=1,7),J=1,4)/(0.6E0,-0.6E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (-0.1E0,-1.47E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (-0.1E0,-1.47E0), (-0.9E0,0.5E0),
+     +                  (-0.4E0,-0.7E0), (0.0E0,0.0E0), (0.0E0,0.0E0),
+     +                  (0.0E0,0.0E0), (0.0E0,0.0E0), (-0.1E0,-1.47E0),
+     +                  (-0.9E0,0.5E0),(-0.4E0,-0.7E0), (0.1E0,-0.5E0),
+     +                  (-0.82E0,-0.39E0), (-0.5E0,-0.3E0),
+     +                  (-0.2E0,-1.27E0)/
+
+
 *     .. Executable Statements ..
       DO 60 KI = 1, 4
          INCX = INCXS(KI)
@@ -510,6 +574,10 @@ SUBROUTINE CHECK2(SFAC)
                CALL CSWAPTEST(N,CX,INCX,CY,INCY)
                CALL CTEST(LENX,CX,CT10X(1,KN,KI),CSIZE3,1.0E0)
                CALL CTEST(LENY,CY,CT10Y(1,KN,KI),CSIZE3,1.0E0)
+            ELSE IF (ICASE.EQ.11) THEN
+*              .. CAXPBYTEST ..
+               CALL CAXPBYTEST(N,CA,CX,INCX,CB,CY,INCY)
+               CALL CTEST(LENY,CY,CT11(1,KN,KI),CSIZE2(1,KSIZE),SFAC)
             ELSE
                WRITE (NOUT,*) ' Shouldn''t be here in CHECK2'
                STOP
@@ -519,7 +587,10 @@ SUBROUTINE CHECK2(SFAC)
    60 CONTINUE
       RETURN
       END
+
+*  =====================================================================
       SUBROUTINE STEST(LEN,SCOMP,STRUE,SSIZE,SFAC)
+      IMPLICIT NONE
 *     ********************************* STEST **************************
 *
 *     THIS SUBR COMPARES ARRAYS  SCOMP() AND STRUE() OF LENGTH LEN TO
@@ -574,7 +645,10 @@ SUBROUTINE STEST(LEN,SCOMP,STRUE,SSIZE,SFAC)
      +       '     SIZE(I)',/1X)
 99997 FORMAT (1X,I4,I3,3I5,I3,2E36.8,2E12.4)
       END
+
+*  =====================================================================
       SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
+      IMPLICIT NONE
 *     ************************* STEST1 *****************************
 *
 *     THIS IS AN INTERFACE SUBROUTINE TO ACCOMMODATE THE FORTRAN
@@ -599,7 +673,10 @@ SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
 *
       RETURN
       END
+
+*  =====================================================================
       REAL             FUNCTION SDIFF(SA,SB)
+      IMPLICIT NONE
 *     ********************************* SDIFF **************************
 *     COMPUTES DIFFERENCE OF TWO NUMBERS.  C. L. LAWSON, JPL 1974 FEB 15
 *
@@ -609,7 +686,10 @@ REAL             FUNCTION SDIFF(SA,SB)
       SDIFF = SA - SB
       RETURN
       END
+
+*  =====================================================================
       SUBROUTINE CTEST(LEN,CCOMP,CTRUE,CSIZE,SFAC)
+      IMPLICIT NONE
 *     **************************** CTEST *****************************
 *
 *     C.L. LAWSON, JPL, 1978 DEC 6
@@ -640,7 +720,10 @@ SUBROUTINE CTEST(LEN,CCOMP,CTRUE,CSIZE,SFAC)
       CALL STEST(2*LEN,SCOMP,STRUE,SSIZE,SFAC)
       RETURN
       END
+
+*  =====================================================================
       SUBROUTINE ITEST1(ICOMP,ITRUE)
+      IMPLICIT NONE
 *     ********************************* ITEST1 *************************
 *
 *     THIS SUBROUTINE COMPARES THE VARIABLES ICOMP AND ITRUE FOR
diff --git a/CBLAS/testing/c_cblat2.f b/CBLAS/testing/c_cblat2.f
index d934ebb49d..3aa7908c33 100644
--- a/CBLAS/testing/c_cblat2.f
+++ b/CBLAS/testing/c_cblat2.f
@@ -1,4 +1,6 @@
+*  =====================================================================
       PROGRAM CBLAT2
+      IMPLICIT NONE
 *
 *  Test program for the COMPLEX          Level 2 Blas.
 *
@@ -349,13 +351,13 @@ PROGRAM CBLAT2
            CALL CCHK3( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                  REWI, FATAL, NIDIM, IDIM, NKB, KB, NINC, INC,
      $                  NMAX, INCMAX, A, AA, AS, Y, YY, YS, YT, G, Z,
-     $			0 )
+     $          0 )
            END IF
            IF (RORDER) THEN
            CALL CCHK3( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                  REWI, FATAL, NIDIM, IDIM, NKB, KB, NINC, INC,
      $                  NMAX, INCMAX, A, AA, AS, Y, YY, YS, YT, G, Z,
-     $			1 )
+     $          1 )
            END IF
             GO TO 200
 *           Test CGERC, 12, CGERU, 13.
@@ -459,10 +461,13 @@ PROGRAM CBLAT2
 *     End of CBLAT2.
 *
       END
+
+*  =====================================================================
       SUBROUTINE CCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NALF, ALF, NBET,
      $                  BET, NINC, INC, NMAX, INCMAX, A, AA, AS, X, XX,
      $                  XS, Y, YY, YS, YT, G, IORDER )
+      IMPLICIT NONE
 *
 *  Tests CGEMV and CGBMV.
 *
@@ -814,10 +819,13 @@ SUBROUTINE CCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of CCHK1.
 *
       END
+
+*  =====================================================================
       SUBROUTINE CCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NALF, ALF, NBET,
      $                  BET, NINC, INC, NMAX, INCMAX, A, AA, AS, X, XX,
      $                  XS, Y, YY, YS, YT, G, IORDER )
+      IMPLICIT NONE
 *
 *  Tests CHEMV, CHBMV and CHPMV.
 *
@@ -1170,9 +1178,12 @@ SUBROUTINE CCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of CCHK2.
 *
       END
+
+*  =====================================================================
       SUBROUTINE CCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NINC, INC, NMAX,
      $                 INCMAX, A, AA, AS, X, XX, XS, XT, G, Z, IORDER )
+      IMPLICIT NONE
 *
 *  Tests CTRMV, CTBMV, CTPMV, CTRSV, CTBSV and CTPSV.
 *
@@ -1551,10 +1562,13 @@ SUBROUTINE CCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of CCHK3.
 *
       END
+
+*  =====================================================================
       SUBROUTINE CCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z, IORDER )
+      IMPLICIT NONE
 *
 *  Tests CGERC and CGERU.
 *
@@ -1828,10 +1842,13 @@ SUBROUTINE CCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of CCHK4.
 *
       END
+
+*  =====================================================================
       SUBROUTINE CCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z, IORDER )
+      IMPLICIT NONE
 *
 *  Tests CHER and CHPR.
 *
@@ -2121,10 +2138,13 @@ SUBROUTINE CCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of CCHK5.
 *
       END
+
+*  =====================================================================
       SUBROUTINE CCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z, IORDER )
+      IMPLICIT NONE
 *
 *  Tests CHER2 and CHPR2.
 *
@@ -2448,8 +2468,11 @@ SUBROUTINE CCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of CCHK6.
 *
       END
+
+*  =====================================================================
       SUBROUTINE CMVCH( TRANS, M, N, ALPHA, A, NMAX, X, INCX, BETA, Y,
      $                  INCY, YT, G, YY, EPS, ERR, FATAL, NOUT, MV )
+      IMPLICIT NONE
 *
 *  Checks the results of the computational tests.
 *
@@ -2580,7 +2603,10 @@ SUBROUTINE CMVCH( TRANS, M, N, ALPHA, A, NMAX, X, INCX, BETA, Y,
 *     End of CMVCH.
 *
       END
+
+*  =====================================================================
       LOGICAL FUNCTION LCE( RI, RJ, LR )
+      IMPLICIT NONE
 *
 *  Tests if two arrays are identical.
 *
@@ -2610,7 +2636,10 @@ LOGICAL FUNCTION LCE( RI, RJ, LR )
 *     End of LCE.
 *
       END
+
+*  =====================================================================
       LOGICAL FUNCTION LCERES( TYPE, UPLO, M, N, AA, AS, LDA )
+      IMPLICIT NONE
 *
 *  Tests if selected elements in two arrays are equal.
 *
@@ -2670,7 +2699,10 @@ LOGICAL FUNCTION LCERES( TYPE, UPLO, M, N, AA, AS, LDA )
 *     End of LCERES.
 *
       END
+
+*  =====================================================================
       COMPLEX FUNCTION CBEG( RESET )
+      IMPLICIT NONE
 *
 *  Generates complex numbers as pairs of random numbers uniformly
 *  distributed between -0.5 and 0.5.
@@ -2722,7 +2754,10 @@ COMPLEX FUNCTION CBEG( RESET )
 *     End of CBEG.
 *
       END
+
+*  =====================================================================
       REAL FUNCTION SDIFF( X, Y )
+      IMPLICIT NONE
 *
 *  Auxiliary routine for test program for Level 2 Blas.
 *
@@ -2738,8 +2773,11 @@ REAL FUNCTION SDIFF( X, Y )
 *     End of SDIFF.
 *
       END
+
+*  =====================================================================
       SUBROUTINE CMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, KL,
      $                  KU, RESET, TRANSL )
+      IMPLICIT NONE
 *
 *  Generates values for an M by N matrix A within the bandwidth
 *  defined by KL and KU.
diff --git a/CBLAS/testing/c_cblat3.f b/CBLAS/testing/c_cblat3.f
index 94144b8750..44aa1425c5 100644
--- a/CBLAS/testing/c_cblat3.f
+++ b/CBLAS/testing/c_cblat3.f
@@ -1,12 +1,14 @@
+*  =====================================================================
       PROGRAM CBLAT3
+      IMPLICIT NONE
 *
 *  Test program for the COMPLEX          Level 3 Blas.
 *
 *  The program must be driven by a short data file. The first 13 records
-*  of the file are read using list-directed input, the last 9 records
-*  are read using the format ( A12, L2 ). An annotated example of a data
+*  of the file are read using list-directed input, the last 10 records
+*  are read using the format ( A13, L2 ). An annotated example of a data
 *  file can be obtained by deleting the first 3 characters from the
-*  following 22 lines:
+*  following 23 lines:
 *  'CBLAT3.SNAP'     NAME OF SNAPSHOT OUTPUT FILE
 *  -1                UNIT NUMBER OF SNAPSHOT FILE (NOT USED IF .LT. 0)
 *  F        LOGICAL FLAG, T TO REWIND SNAPSHOT FILE AFTER EACH RECORD.
@@ -20,15 +22,16 @@ PROGRAM CBLAT3
 *  (0.0,0.0) (1.0,0.0) (0.7,-0.9)       VALUES OF ALPHA
 *  3                 NUMBER OF VALUES OF BETA
 *  (0.0,0.0) (1.0,0.0) (1.3,-1.1)       VALUES OF BETA
-*  cblas_cgemm  T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_chemm  T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_csymm  T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_ctrmm  T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_ctrsm  T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_cherk  T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_csyrk  T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_cher2k T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_csyr2k T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_cgemm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_chemm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_csymm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_ctrmm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_ctrsm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_cherk   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_csyrk   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_cher2k  T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_csyr2k  T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_cgemmtr T PUT F FOR NO TEST. SAME COLUMNS.
 *
 *  See:
 *
@@ -49,7 +52,7 @@ PROGRAM CBLAT3
       INTEGER            NIN, NOUT
       PARAMETER          ( NIN = 5, NOUT = 6 )
       INTEGER            NSUBS
-      PARAMETER          ( NSUBS = 9 )
+      PARAMETER          ( NSUBS = 10 )
       COMPLEX            ZERO, ONE
       PARAMETER          ( ZERO = ( 0.0, 0.0 ), ONE = ( 1.0, 0.0 ) )
       REAL               RZERO, RHALF, RONE
@@ -65,7 +68,7 @@ PROGRAM CBLAT3
       LOGICAL            FATAL, LTESTT, REWI, SAME, SFATAL, TRACE,
      $                   TSTERR, CORDER, RORDER
       CHARACTER*1        TRANSA, TRANSB
-      CHARACTER*12       SNAMET
+      CHARACTER*13       SNAMET
       CHARACTER*32       SNAPS
 *     .. Local Arrays ..
       COMPLEX            AA( NMAX*NMAX ), AB( NMAX, 2*NMAX ),
@@ -77,19 +80,19 @@ PROGRAM CBLAT3
       REAL               G( NMAX )
       INTEGER            IDIM( NIDMAX )
       LOGICAL            LTEST( NSUBS )
-      CHARACTER*12       SNAMES( NSUBS )
+      CHARACTER*13       SNAMES( NSUBS )
 *     .. External Functions ..
       REAL               SDIFF
       LOGICAL            LCE
       EXTERNAL           SDIFF, LCE
 *     .. External Subroutines ..
-      EXTERNAL         CCHK1, CCHK2, CCHK3, CCHK4, CCHK5, CMMCH
+      EXTERNAL         CCHK1, CCHK2, CCHK3, CCHK4, CCHK5, CCHK6, CMMCH
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
       LOGICAL            LERR, OK
-      CHARACTER*12       SRNAMT
+      CHARACTER*13       SRNAMT
 *     .. Common blocks ..
       COMMON             /INFOC/INFOT, NOUTC, OK, LERR
       COMMON             /SRNAMC/SRNAMT
@@ -97,7 +100,7 @@ PROGRAM CBLAT3
       DATA               SNAMES/'cblas_cgemm ', 'cblas_chemm ',
      $                   'cblas_csymm ', 'cblas_ctrmm ', 'cblas_ctrsm ',
      $                   'cblas_cherk ', 'cblas_csyrk ', 'cblas_cher2k',
-     $                   'cblas_csyr2k'/
+     $                   'cblas_csyr2k', 'cblas_cgemmtr' /
 *     .. Executable Statements ..
 *
       NOUTC = NOUT
@@ -295,7 +298,7 @@ PROGRAM CBLAT3
             OK = .TRUE.
             FATAL = .FALSE.
             GO TO ( 140, 150, 150, 160, 160, 170, 170,
-     $              180, 180 )ISNUM
+     $              180, 180, 185 )ISNUM
 *           Test CGEMM, 01.
   140       IF (CORDER) THEN
             CALL CCHK1(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
@@ -329,13 +332,13 @@ PROGRAM CBLAT3
             CALL CCHK3(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                 REWI, FATAL, NIDIM, IDIM, NALF, ALF, NMAX, AB,
      $                 AA, AS, AB( 1, NMAX + 1 ), BB, BS, CT, G, C,
-     $		0 )
+     $      0 )
             END IF
             IF (RORDER) THEN
             CALL CCHK3(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                 REWI, FATAL, NIDIM, IDIM, NALF, ALF, NMAX, AB,
      $                 AA, AS, AB( 1, NMAX + 1 ), BB, BS, CT, G, C,
-     $		1 )
+     $      1 )
             END IF
             GO TO 190
 *           Test CHERK, 06, CSYRK, 07.
@@ -357,15 +360,30 @@ PROGRAM CBLAT3
             CALL CCHK5(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                 REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
      $                 NMAX, AB, AA, AS, BB, BS, C, CC, CS, CT, G, W,
-     $		0 )
+     $      0 )
             END IF
             IF (RORDER) THEN
             CALL CCHK5(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                 REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
      $                 NMAX, AB, AA, AS, BB, BS, C, CC, CS, CT, G, W,
-     $		1 )
+     $      1 )
             END IF
             GO TO 190
+*           Test CGEMMTR, 10.
+  185       IF (CORDER) THEN
+            CALL CCHK6(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
+     $                 REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
+     $                 NMAX, AB, AA, AS, AB( 1, NMAX + 1 ), BB, BS, C,
+     $                 CC, CS, CT, G, 0 )
+            END IF
+            IF (RORDER) THEN
+            CALL CCHK6(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
+     $                 REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
+     $                 NMAX, AB, AA, AS, AB( 1, NMAX + 1 ), BB, BS, C,
+     $                 CC, CS, CT, G, 1 )
+            END IF
+            GO TO 190
+
 *
   190       IF( FATAL.AND.SFATAL )
      $         GO TO 210
@@ -405,7 +423,7 @@ PROGRAM CBLAT3
      $      7( '(', F4.1, ',', F4.1, ')  ', : ) )
  9991 FORMAT( ' AMEND DATA FILE OR INCREASE ARRAY SIZES IN PROGRAM',
      $      /' ******* TESTS ABANDONED *******' )
- 9990 FORMAT(' SUBPROGRAM NAME ', A12,' NOT RECOGNIZED', /' ******* T',
+ 9990 FORMAT(' SUBPROGRAM NAME ', A13,' NOT RECOGNIZED', /' ******* T',
      $      'ESTS ABANDONED *******' )
  9989 FORMAT(' ERROR IN CMMCH -  IN-LINE DOT PRODUCTS ARE BEING EVALU',
      $      'ATED WRONGLY.', /' CMMCH WAS CALLED WITH TRANSA = ', A1,
@@ -413,8 +431,8 @@ PROGRAM CBLAT3
      $    ' ERR = ', F12.3, '.', /' THIS MAY BE DUE TO FAULTS IN THE ',
      $     'ARITHMETIC OR THE COMPILER.', /' ******* TESTS ABANDONED ',
      $      '*******' )
- 9988 FORMAT( A12,L2 )
- 9987 FORMAT( 1X, A12,' WAS NOT TESTED' )
+ 9988 FORMAT( A13,L2 )
+ 9987 FORMAT( 1X, A13,' WAS NOT TESTED' )
  9986 FORMAT( /' END OF TESTS' )
  9985 FORMAT( /' ******* FATAL ERROR - TESTS ABANDONED *******' )
  9984 FORMAT( ' ERROR-EXITS WILL NOT BE TESTED' )
@@ -422,10 +440,13 @@ PROGRAM CBLAT3
 *     End of CBLAT3.
 *
       END
+
+*  =====================================================================
       SUBROUTINE CCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G,
      $                  IORDER )
+      IMPLICIT NONE
 *
 *  Tests CGEMM.
 *
@@ -446,7 +467,7 @@ SUBROUTINE CCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12       SNAME
+      CHARACTER*13       SNAME
 *     .. Array Arguments ..
       COMPLEX            A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -694,20 +715,20 @@ SUBROUTINE CCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   130 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT(' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A12,'(''', A1, ''',''', A1, ''',',
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(''', A1, ''',''', A1, ''',',
      $     3( I3, ',' ), '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3,
      $     ',(', F4.1, ',', F4.1, '), C,', I3, ').' )
  9994 FORMAT(' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -716,13 +737,16 @@ SUBROUTINE CCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of CCHK1.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE CPRCN1(NOUT, NC, SNAME, IORDER, TRANSA, TRANSB, M, N,
      $                 K, ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, M, N, K, LDA, LDB, LDC
       COMPLEX          ALPHA, BETA
       CHARACTER*1      TRANSA, TRANSB
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CTA,CTB
 
       IF (TRANSA.EQ.'N')THEN
@@ -747,15 +771,17 @@ SUBROUTINE CPRCN1(NOUT, NC, SNAME, IORDER, TRANSA, TRANSB, M, N,
       WRITE(NOUT, FMT = 9995)NC,SNAME,CRC, CTA,CTB
       WRITE(NOUT, FMT = 9994)M, N, K, ALPHA, LDA, LDB, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', A14, ',', A14, ',', A14, ',')
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', A14, ',', A14, ',', A14, ',')
  9994 FORMAT( 10X, 3( I3, ',' ) ,' (', F4.1,',',F4.1,') , A,',
      $ I3, ', B,', I3, ', (', F4.1,',',F4.1,') , C,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE CCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G,
      $                  IORDER )
+      IMPLICIT NONE
 *
 *  Tests CHEMM and CSYMM.
 *
@@ -776,7 +802,7 @@ SUBROUTINE CCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12       SNAME
+      CHARACTER*13       SNAME
 *     .. Array Arguments ..
       COMPLEX            A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1020,20 +1046,20 @@ SUBROUTINE CCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   120 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT(' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
- 9995 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT(1X, I6, ': ', A13,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',(', F4.1,
      $      ',', F4.1, '), C,', I3, ')    .' )
  9994 FORMAT(' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1042,13 +1068,16 @@ SUBROUTINE CCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of CCHK2.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE CPRCN2(NOUT, NC, SNAME, IORDER, SIDE, UPLO, M, N,
      $                 ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, M, N, LDA, LDB, LDC
       COMPLEX          ALPHA, BETA
       CHARACTER*1      SIDE, UPLO
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CS,CU
 
       IF (SIDE.EQ.'L')THEN
@@ -1069,14 +1098,16 @@ SUBROUTINE CPRCN2(NOUT, NC, SNAME, IORDER, SIDE, UPLO, M, N,
       WRITE(NOUT, FMT = 9995)NC,SNAME,CRC, CS,CU
       WRITE(NOUT, FMT = 9994)M, N, ALPHA, LDA, LDB, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', A14, ',', A14, ',', A14, ',')
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', A14, ',', A14, ',', A14, ',')
  9994 FORMAT( 10X, 2( I3, ',' ),' (',F4.1,',',F4.1, '), A,', I3,
      $ ', B,', I3, ', (',F4.1,',',F4.1, '), ', 'C,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE CCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NMAX, A, AA, AS,
      $                  B, BB, BS, CT, G, C, IORDER )
+      IMPLICIT NONE
 *
 *  Tests CTRMM and CTRSM.
 *
@@ -1097,7 +1128,7 @@ SUBROUTINE CCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12       SNAME
+      CHARACTER*13       SNAME
 *     .. Array Arguments ..
       COMPLEX            A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1372,20 +1403,20 @@ SUBROUTINE CCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   160 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT(' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT(' ******* ', A12,' FAILED ON CALL NUMBER:' )
- 9995 FORMAT(1X, I6, ': ', A12,'(', 4( '''', A1, ''',' ), 2( I3, ',' ),
+ 9996 FORMAT(' ******* ', A13,' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT(1X, I6, ': ', A13,'(', 4( '''', A1, ''',' ), 2( I3, ',' ),
      $     '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ')         ',
      $      '      .' )
  9994 FORMAT(' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1394,13 +1425,16 @@ SUBROUTINE CCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of CCHK3.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE CPRCN3(NOUT, NC, SNAME, IORDER, SIDE, UPLO, TRANSA,
      $                 DIAG, M, N, ALPHA, LDA, LDB)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, M, N, LDA, LDB
       COMPLEX          ALPHA
       CHARACTER*1      SIDE, UPLO, TRANSA, DIAG
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CS, CU, CA, CD
 
       IF (SIDE.EQ.'L')THEN
@@ -1433,15 +1467,17 @@ SUBROUTINE CPRCN3(NOUT, NC, SNAME, IORDER, SIDE, UPLO, TRANSA,
       WRITE(NOUT, FMT = 9995)NC,SNAME,CRC, CS,CU
       WRITE(NOUT, FMT = 9994)CA, CD, M, N, ALPHA, LDA, LDB
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', A14, ',', A14, ',', A14, ',')
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', A14, ',', A14, ',', A14, ',')
  9994 FORMAT( 10X, 2( A14, ',') , 2( I3, ',' ), ' (', F4.1, ',',
      $    F4.1, '), A,', I3, ', B,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE CCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G,
      $                  IORDER )
+      IMPLICIT NONE
 *
 *  Tests CHERK and CSYRK.
 *
@@ -1462,7 +1498,7 @@ SUBROUTINE CCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12       SNAME
+      CHARACTER*13       SNAME
 *     .. Array Arguments ..
       COMPLEX            A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1754,24 +1790,24 @@ SUBROUTINE CCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   130 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT(' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
  9995 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
- 9994 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9994 FORMAT(1X, I6, ': ', A13,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $     F4.1, ', A,', I3, ',', F4.1, ', C,', I3, ')               ',
      $      '          .' )
- 9993 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9993 FORMAT(1X, I6, ': ', A13,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, ') , A,', I3, ',(', F4.1, ',', F4.1,
      $      '), C,', I3, ')          .' )
  9992 FORMAT(' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1780,13 +1816,16 @@ SUBROUTINE CCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of CCHK4.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE CPRCN4(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
      $                 N, K, ALPHA, LDA, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, N, K, LDA, LDC
       COMPLEX          ALPHA, BETA
       CHARACTER*1      UPLO, TRANSA
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CU, CA
 
       IF (UPLO.EQ.'U')THEN
@@ -1809,18 +1848,20 @@ SUBROUTINE CPRCN4(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
       WRITE(NOUT, FMT = 9995)NC, SNAME, CRC, CU, CA
       WRITE(NOUT, FMT = 9994)N, K, ALPHA, LDA, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', 3( A14, ',') )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', 3( A14, ',') )
  9994 FORMAT( 10X, 2( I3, ',' ), ' (', F4.1, ',', F4.1 ,'), A,',
      $        I3, ', (', F4.1,',', F4.1, '), C,', I3, ').' )
       END
-*
-*
+
+*  =====================================================================
       SUBROUTINE CPRCN6(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
      $                 N, K, ALPHA, LDA, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, N, K, LDA, LDC
       REAL             ALPHA, BETA
       CHARACTER*1      UPLO, TRANSA
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CU, CA
 
       IF (UPLO.EQ.'U')THEN
@@ -1843,15 +1884,17 @@ SUBROUTINE CPRCN6(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
       WRITE(NOUT, FMT = 9995)NC, SNAME, CRC, CU, CA
       WRITE(NOUT, FMT = 9994)N, K, ALPHA, LDA, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', 3( A14, ',') )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', 3( A14, ',') )
  9994 FORMAT( 10X, 2( I3, ',' ),
      $      F4.1, ', A,', I3, ',', F4.1, ', C,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE CCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  AB, AA, AS, BB, BS, C, CC, CS, CT, G, W,
      $                  IORDER )
+      IMPLICIT NONE
 *
 *  Tests CHER2K and CSYR2K.
 *
@@ -1872,7 +1915,7 @@ SUBROUTINE CCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12       SNAME
+      CHARACTER*13       SNAME
 *     .. Array Arguments ..
       COMPLEX            AA( NMAX*NMAX ), AB( 2*NMAX*NMAX ),
      $                   ALF( NALF ), AS( NMAX*NMAX ), BB( NMAX*NMAX ),
@@ -2207,24 +2250,24 @@ SUBROUTINE CCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   160 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT(' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
  9995 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
- 9994 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9994 FORMAT(1X, I6, ': ', A13,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',', F4.1,
      $      ', C,', I3, ')           .' )
- 9993 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9993 FORMAT(1X, I6, ': ', A13,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',(', F4.1,
      $      ',', F4.1, '), C,', I3, ')    .' )
  9992 FORMAT(' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -2233,13 +2276,16 @@ SUBROUTINE CCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of CCHK5.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE CPRCN5(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
      $                 N, K, ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, N, K, LDA, LDB, LDC
       COMPLEX          ALPHA, BETA
       CHARACTER*1      UPLO, TRANSA
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CU, CA
 
       IF (UPLO.EQ.'U')THEN
@@ -2262,19 +2308,21 @@ SUBROUTINE CPRCN5(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
       WRITE(NOUT, FMT = 9995)NC, SNAME, CRC, CU, CA
       WRITE(NOUT, FMT = 9994)N, K, ALPHA, LDA, LDB, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', 3( A14, ',') )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', 3( A14, ',') )
  9994 FORMAT( 10X, 2( I3, ',' ), ' (', F4.1, ',', F4.1, '), A,',
      $  I3, ', B', I3, ', (', F4.1, ',', F4.1, '), C,', I3, ').' )
       END
-*
-*
+
+*  =====================================================================
       SUBROUTINE CPRCN7(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
      $                 N, K, ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, N, K, LDA, LDB, LDC
       COMPLEX          ALPHA
       REAL             BETA
       CHARACTER*1      UPLO, TRANSA
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CU, CA
 
       IF (UPLO.EQ.'U')THEN
@@ -2297,13 +2345,15 @@ SUBROUTINE CPRCN7(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
       WRITE(NOUT, FMT = 9995)NC, SNAME, CRC, CU, CA
       WRITE(NOUT, FMT = 9994)N, K, ALPHA, LDA, LDB, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', 3( A14, ',') )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', 3( A14, ',') )
  9994 FORMAT( 10X, 2( I3, ',' ), ' (', F4.1, ',', F4.1, '), A,',
      $      I3, ', B', I3, ',', F4.1, ', C,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE CMAKE(TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, RESET,
      $                  TRANSL )
+      IMPLICIT NONE
 *
 *  Generates values for an M by N matrix A.
 *  Stores the values in the array AA in the data structure required
@@ -2430,9 +2480,12 @@ SUBROUTINE CMAKE(TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, RESET,
 *     End of CMAKE.
 *
       END
+
+*  =====================================================================
       SUBROUTINE CMMCH(TRANSA, TRANSB, M, N, KK, ALPHA, A, LDA, B, LDB,
      $                  BETA, C, LDC, CT, G, CC, LDCC, EPS, ERR, FATAL,
      $                  NOUT, MV )
+      IMPLICIT NONE
 *
 *  Checks the results of the computational tests.
 *
@@ -2618,7 +2671,10 @@ SUBROUTINE CMMCH(TRANSA, TRANSB, M, N, KK, ALPHA, A, LDA, B, LDB,
 *     End of CMMCH.
 *
       END
+
+*  =====================================================================
       LOGICAL FUNCTION LCE( RI, RJ, LR )
+      IMPLICIT NONE
 *
 *  Tests if two arrays are identical.
 *
@@ -2650,7 +2706,10 @@ LOGICAL FUNCTION LCE( RI, RJ, LR )
 *     End of LCE.
 *
       END
+
+*  =====================================================================
       LOGICAL FUNCTION LCERES( TYPE, UPLO, M, N, AA, AS, LDA )
+      IMPLICIT NONE
 *
 *  Tests if selected elements in two arrays are equal.
 *
@@ -2712,7 +2771,10 @@ LOGICAL FUNCTION LCERES( TYPE, UPLO, M, N, AA, AS, LDA )
 *     End of LCERES.
 *
       END
+
+*  =====================================================================
       COMPLEX FUNCTION CBEG( RESET )
+      IMPLICIT NONE
 *
 *  Generates complex numbers as pairs of random numbers uniformly
 *  distributed between -0.5 and 0.5.
@@ -2766,7 +2828,10 @@ COMPLEX FUNCTION CBEG( RESET )
 *     End of CBEG.
 *
       END
+
+*  =====================================================================
       REAL FUNCTION SDIFF( X, Y )
+      IMPLICIT NONE
 *
 *  Auxiliary routine for test program for Level 3 Blas.
 *
@@ -2785,3 +2850,546 @@ REAL FUNCTION SDIFF( X, Y )
 *     End of SDIFF.
 *
       END
+
+*  =====================================================================
+      SUBROUTINE CCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
+     $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
+     $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G,
+     $                  IORDER )
+      IMPLICIT NONE
+*
+*  Tests CGEMMTR.
+*
+*  Auxiliary routine for test program for Level 3 Blas.
+*
+*  -- Written on 24-June-2024.
+*     Martin Koehler, Max Planck Institute Magdeburg
+*
+*     .. Parameters ..
+      COMPLEX            ZERO
+      PARAMETER          ( ZERO = ( 0.0, 0.0 ) )
+      REAL               RZERO
+      PARAMETER          ( RZERO = 0.0 )
+*     .. Scalar Arguments ..
+      REAL               EPS, THRESH
+      INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
+      LOGICAL            FATAL, REWI, TRACE
+      CHARACTER*13       SNAME
+*     .. Array Arguments ..
+      COMPLEX            A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
+     $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
+     $                   BB( NMAX*NMAX ), BET( NBET ), BS( NMAX*NMAX ),
+     $                   C( NMAX, NMAX ), CC( NMAX*NMAX ),
+     $                   CS( NMAX*NMAX ), CT( NMAX )
+      REAL               G( NMAX )
+      INTEGER            IDIM( NIDIM )
+*     .. Local Scalars ..
+      COMPLEX            ALPHA, ALS, BETA, BLS
+      REAL               ERR, ERRMAX
+      INTEGER            I, IA, IB, ICA, ICB, IK, IM, IN, K, KS, LAA,
+     $                   LBB, LCC, LDA, LDAS, LDB, LDBS, LDC, LDCS,
+     $                   MA, MB, N, NA, NARGS, NB, NC, NS, IS
+      LOGICAL            NULL, RESET, SAME, TRANA, TRANB
+      CHARACTER*1        TRANAS, TRANBS, TRANSA, TRANSB, UPLO, UPLOS
+      CHARACTER*3        ICH
+      CHARACTER*2        ISHAPE
+*     .. Local Arrays ..
+      LOGICAL            ISAME( 13 )
+*     .. External Functions ..
+      LOGICAL            LCE, LCERES
+      EXTERNAL           LCE, LCERES
+*     .. External Subroutines ..
+      EXTERNAL           CCGEMMTR, CMAKE, CMMTCH, CPRCN8
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX
+*     .. Scalars in Common ..
+      INTEGER            INFOT, NOUTC
+      LOGICAL            LERR, OK
+*     .. Common blocks ..
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
+*     .. Data statements ..
+      DATA               ICH/'NTC'/
+      DATA               ISHAPE/'UL'/
+*     .. Executable Statements ..
+*
+      NARGS = 13
+      NC = 0
+      RESET = .TRUE.
+      ERRMAX = RZERO
+*
+      DO 100 IN = 1, NIDIM
+         N = IDIM( IN )
+*        Set LDC to 1 more than minimum value if room.
+         LDC = N
+         IF( LDC.LT.NMAX )
+     $      LDC = LDC + 1
+*        Skip tests if not enough room.
+         IF( LDC.GT.NMAX )
+     $      GO TO 100
+         LCC = LDC*N
+         NULL = N.LE.0.
+*
+         DO 90 IK = 1, NIDIM
+            K = IDIM( IK )
+*
+            DO 80 ICA = 1, 3
+               TRANSA = ICH( ICA: ICA )
+               TRANA = TRANSA.EQ.'T'.OR.TRANSA.EQ.'C'
+*
+               IF( TRANA )THEN
+                  MA = K
+                  NA = N
+               ELSE
+                  MA = N
+                  NA = K
+               END IF
+*              Set LDA to 1 more than minimum value if room.
+               LDA = MA
+               IF( LDA.LT.NMAX )
+     $            LDA = LDA + 1
+*              Skip tests if not enough room.
+               IF( LDA.GT.NMAX )
+     $            GO TO 80
+               LAA = LDA*NA
+*
+*              Generate the matrix A.
+*
+               CALL CMAKE( 'ge', ' ', ' ', MA, NA, A, NMAX, AA, LDA,
+     $                     RESET, ZERO )
+*
+               DO 70 ICB = 1, 3
+                  TRANSB = ICH( ICB: ICB )
+                  TRANB = TRANSB.EQ.'T'.OR.TRANSB.EQ.'C'
+*
+                  IF( TRANB )THEN
+                     MB = N
+                     NB = K
+                  ELSE
+                     MB = K
+                     NB = N
+                  END IF
+*                 Set LDB to 1 more than minimum value if room.
+                  LDB = MB
+                  IF( LDB.LT.NMAX )
+     $               LDB = LDB + 1
+*                 Skip tests if not enough room.
+                  IF( LDB.GT.NMAX )
+     $               GO TO 70
+                  LBB = LDB*NB
+*
+*                 Generate the matrix B.
+*
+                  CALL CMAKE( 'ge', ' ', ' ', MB, NB, B, NMAX, BB,
+     $                        LDB, RESET, ZERO )
+*
+                  DO 60 IA = 1, NALF
+                     ALPHA = ALF( IA )
+*
+                     DO 50 IB = 1, NBET
+                        BETA = BET( IB )
+                        DO 45 IS = 1, 2
+                           UPLO = ISHAPE(IS:IS)
+*
+*                          Generate the matrix C.
+*
+                           CALL CMAKE( 'ge', UPLO, ' ', N, N, C, NMAX,
+     $                                 CC, LDC, RESET, ZERO )
+*
+                           NC = NC + 1
+*
+*                          Save every datum before calling the
+*                          subroutine.
+*
+                           UPLOS = UPLO
+                           TRANAS = TRANSA
+                           TRANBS = TRANSB
+                           NS = N
+                           KS = K
+                           ALS = ALPHA
+                           DO 10 I = 1, LAA
+                              AS( I ) = AA( I )
+   10                      CONTINUE
+                           LDAS = LDA
+                           DO 20 I = 1, LBB
+                              BS( I ) = BB( I )
+   20                      CONTINUE
+                           LDBS = LDB
+                           BLS = BETA
+                           DO 30 I = 1, LCC
+                              CS( I ) = CC( I )
+   30                      CONTINUE
+                           LDCS = LDC
+*
+*                          Call the subroutine.
+*
+                           IF( TRACE )
+     $                        CALL CPRCN8(NTRA, NC, SNAME, IORDER, UPLO,
+     $                        TRANSA, TRANSB, N, K, ALPHA, LDA,
+     $                        LDB, BETA, LDC)
+                           IF( REWI )
+     $                        REWIND NTRA
+                           CALL CCGEMMTR(IORDER, UPLO, TRANSA, TRANSB,
+     $                                 N, K, ALPHA, AA, LDA, BB, LDB,
+     $                                 BETA, CC, LDC )
+*
+*                          Check if error-exit was taken incorrectly.
+*
+                           IF( .NOT.OK )THEN
+                              WRITE( NOUT, FMT = 9994 )
+                              FATAL = .TRUE.
+                              GO TO 120
+                           END IF
+*
+*                          See what data changed inside subroutines.
+*
+                           ISAME( 1 ) = UPLO .EQ. UPLOS
+                           ISAME( 2 ) = TRANSA.EQ.TRANAS
+                           ISAME( 3 ) = TRANSB.EQ.TRANBS
+                           ISAME( 4 ) = NS.EQ.N
+                           ISAME( 5 ) = KS.EQ.K
+                           ISAME( 6 ) = ALS.EQ.ALPHA
+                           ISAME( 7 ) = LCE( AS, AA, LAA )
+                           ISAME( 8 ) = LDAS.EQ.LDA
+                           ISAME( 9 ) = LCE( BS, BB, LBB )
+                           ISAME( 10 ) = LDBS.EQ.LDB
+                           ISAME( 11 ) = BLS.EQ.BETA
+                           IF( NULL )THEN
+                              ISAME( 12 ) = LCE( CS, CC, LCC )
+                           ELSE
+                             ISAME( 12 ) = LCERES( 'ge', ' ', N, N, CS,
+     $                                      CC, LDC )
+                           END IF
+                           ISAME( 13 ) = LDCS.EQ.LDC
+*
+*                          If data was incorrectly changed, report
+*                          and return.
+*
+                           SAME = .TRUE.
+                           DO 40 I = 1, NARGS
+                              SAME = SAME.AND.ISAME( I )
+                              IF( .NOT.ISAME( I ) )
+     $                           WRITE( NOUT, FMT = 9998 )I
+   40                      CONTINUE
+                           IF( .NOT.SAME )THEN
+                              FATAL = .TRUE.
+                              GO TO 120
+                           END IF
+*
+                           IF( .NOT.NULL )THEN
+*
+*                             Check the result.
+*
+                              CALL CMMTCH( UPLO, TRANSA, TRANSB, N, K,
+     $                                   ALPHA, A, NMAX, B, NMAX, BETA,
+     $                                   C, NMAX, CT, G, CC, LDC, EPS,
+     $                                   ERR, FATAL, NOUT, .TRUE. )
+                              ERRMAX = MAX( ERRMAX, ERR )
+*                             If got really bad answer, report and
+*                             return.
+                              IF( FATAL )
+     $                           GO TO 120
+                           END IF
+*
+   45                   CONTINUE
+*
+   50                CONTINUE
+*
+   60             CONTINUE
+*
+   70          CONTINUE
+*
+   80       CONTINUE
+*
+   90    CONTINUE
+*
+  100 CONTINUE
+*
+*
+*     Report result.
+*
+      IF( ERRMAX.LT.THRESH )THEN
+         IF ( IORDER.EQ.0) WRITE( NOUT, FMT = 10000 )SNAME, NC
+         IF ( IORDER.EQ.1) WRITE( NOUT, FMT = 10001 )SNAME, NC
+      ELSE
+         IF ( IORDER.EQ.0) WRITE( NOUT, FMT = 10002 )SNAME, NC, ERRMAX
+         IF ( IORDER.EQ.1) WRITE( NOUT, FMT = 10003 )SNAME, NC, ERRMAX
+      END IF
+      GO TO 130
+*
+  120 CONTINUE
+      WRITE( NOUT, FMT = 9996 )SNAME
+      CALL CPRCN8(NOUT, NC, SNAME, IORDER, UPLO, TRANSA, TRANSB,
+     $           N, K, ALPHA, LDA, LDB, BETA, LDC)
+*
+  130 CONTINUE
+      RETURN
+*
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+     $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
+     $ 'RATIO ', F8.2, ' - SUSPECT *******' )
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+     $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
+     $ 'RATIO ', F8.2, ' - SUSPECT *******' )
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+     $ ' (', I6, ' CALL', 'S)' )
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+     $ ' (', I6, ' CALL', 'S)' )
+ 9998 FORMAT(' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
+     $      'ANGED INCORRECTLY *******' )
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(''', A1, ''',''', A1, ''',',
+     $     3( I3, ',' ), '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3,
+     $     ',(', F4.1, ',', F4.1, '), C,', I3, ').' )
+ 9994 FORMAT(' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
+     $      '******' )
+*
+*     End of CCHK6.
+*
+      END
+
+*  =====================================================================
+      SUBROUTINE CPRCN8(NOUT, NC, SNAME, IORDER, UPLO,
+     $                 TRANSA, TRANSB, N,
+     $                 K, ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
+
+      INTEGER          NOUT, NC, IORDER, N, K, LDA, LDB, LDC
+      COMPLEX          ALPHA, BETA
+      CHARACTER*1      TRANSA, TRANSB, UPLO
+      CHARACTER*13     SNAME
+      CHARACTER*14     CRC, CTA,CTB,CUPLO
+
+      IF (UPLO.EQ.'U') THEN
+          CUPLO = 'CblasUpper'
+      ELSE
+          CUPLO = 'CblasLower'
+      END IF
+      IF (TRANSA.EQ.'N')THEN
+         CTA = '  CblasNoTrans'
+      ELSE IF (TRANSA.EQ.'T')THEN
+         CTA = '    CblasTrans'
+      ELSE
+         CTA = 'CblasConjTrans'
+      END IF
+      IF (TRANSB.EQ.'N')THEN
+         CTB = '  CblasNoTrans'
+      ELSE IF (TRANSB.EQ.'T')THEN
+         CTB = '    CblasTrans'
+      ELSE
+         CTB = 'CblasConjTrans'
+      END IF
+      IF (IORDER.EQ.1)THEN
+         CRC = ' CblasRowMajor'
+      ELSE
+         CRC = ' CblasColMajor'
+      END IF
+      WRITE(NOUT, FMT = 9995)NC,SNAME,CRC, CUPLO, CTA,CTB
+      WRITE(NOUT, FMT = 9994)N, K, ALPHA, LDA, LDB, BETA, LDC
+
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', A14, ',', A14, ',', A14, ',',
+     $        A14, ',')
+ 9994 FORMAT( 10X, 2( I3, ',' ) ,' (', F4.1,',',F4.1,') , A,',
+     $ I3, ', B,', I3, ', (', F4.1,',',F4.1,') , C,', I3, ').' )
+      END
+
+*  =====================================================================
+      SUBROUTINE CMMTCH(UPLO, TRANSA, TRANSB, N, KK, ALPHA, A, LDA,
+     $                  B, LDB,
+     $                  BETA, C, LDC, CT, G, CC, LDCC, EPS, ERR, FATAL,
+     $                  NOUT, MV )
+      IMPLICIT NONE
+*
+*  Checks the results of the computational tests for GEMMTR.
+*
+*  Auxiliary routine for test program for Level 3 Blas.
+*
+*  -- Written on 24-June-2024.
+*     Martin Koehler, Max Planck Institute, Magdeburg
+*
+*     .. Parameters ..
+      COMPLEX            ZERO
+      PARAMETER          ( ZERO = ( 0.0, 0.0 ) )
+      REAL               RZERO, RONE
+      PARAMETER          ( RZERO = 0.0, RONE = 1.0 )
+*     .. Scalar Arguments ..
+      COMPLEX            ALPHA, BETA
+      REAL               EPS, ERR
+      INTEGER            KK, LDA, LDB, LDC, LDCC, N, NOUT
+      LOGICAL            FATAL, MV
+      CHARACTER*1        TRANSA, TRANSB, UPLO
+*     .. Array Arguments ..
+      COMPLEX            A( LDA, * ), B( LDB, * ), C( LDC, * ),
+     $                   CC( LDCC, * ), CT( * )
+      REAL               G( * )
+*     .. Local Scalars ..
+      COMPLEX            CL
+      REAL               ERRI
+      INTEGER            I, J, K, ISTART, ISTOP
+      LOGICAL            CTRANA, CTRANB, TRANA, TRANB, UPPER
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, AIMAG, CONJG, MAX, REAL, SQRT
+*     .. Statement Functions ..
+      REAL               ABS1
+*     .. Statement Function definitions ..
+      ABS1( CL ) = ABS( REAL( CL ) ) + ABS( AIMAG( CL ) )
+*     .. Executable Statements ..
+
+      UPPER = UPLO.EQ.'U'
+      TRANA = TRANSA.EQ.'T'.OR.TRANSA.EQ.'C'
+      TRANB = TRANSB.EQ.'T'.OR.TRANSB.EQ.'C'
+      CTRANA = TRANSA.EQ.'C'
+      CTRANB = TRANSB.EQ.'C'
+
+      ISTART = 1
+      ISTOP = N
+*
+*     Compute expected result, one column at a time, in CT using data
+*     in A, B and C.
+*     Compute gauges in G.
+*
+      DO 220 J = 1, N
+*
+         IF (UPPER) THEN
+             ISTART = 1
+             ISTOP =  J
+         ELSE
+             ISTART = J
+             ISTOP  = N
+         END IF
+         DO 10 I = ISTART, ISTOP
+            CT( I ) = ZERO
+            G( I ) = RZERO
+   10    CONTINUE
+         IF( .NOT.TRANA.AND..NOT.TRANB )THEN
+            DO 30 K = 1, KK
+               DO 20 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( I, K )*B( K, J )
+                  G( I ) = G( I ) + ABS1( A( I, K ) )*ABS1( B( K, J ) )
+   20          CONTINUE
+   30       CONTINUE
+         ELSE IF( TRANA.AND..NOT.TRANB )THEN
+            IF( CTRANA )THEN
+               DO 50 K = 1, KK
+                  DO 40 I =  ISTART, ISTOP
+                     CT( I ) = CT( I ) + CONJG( A( K, I ) )*B( K, J )
+                     G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                        ABS1( B( K, J ) )
+   40             CONTINUE
+   50          CONTINUE
+            ELSE
+               DO 70 K = 1, KK
+                  DO 60 I = ISTART, ISTOP
+                     CT( I ) = CT( I ) + A( K, I )*B( K, J )
+                     G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                        ABS1( B( K, J ) )
+   60             CONTINUE
+   70          CONTINUE
+            END IF
+         ELSE IF( .NOT.TRANA.AND.TRANB )THEN
+            IF( CTRANB )THEN
+               DO 90 K = 1, KK
+                  DO 80 I =  ISTART, ISTOP
+                     CT( I ) = CT( I ) + A( I, K )*CONJG( B( J, K ) )
+                     G( I ) = G( I ) + ABS1( A( I, K ) )*
+     $                        ABS1( B( J, K ) )
+   80             CONTINUE
+   90          CONTINUE
+            ELSE
+               DO 110 K = 1, KK
+                  DO 100 I = ISTART, ISTOP
+                     CT( I ) = CT( I ) + A( I, K )*B( J, K )
+                     G( I ) = G( I ) + ABS1( A( I, K ) )*
+     $                        ABS1( B( J, K ) )
+  100             CONTINUE
+  110          CONTINUE
+            END IF
+         ELSE IF( TRANA.AND.TRANB )THEN
+            IF( CTRANA )THEN
+               IF( CTRANB )THEN
+                  DO 130 K = 1, KK
+                     DO 120 I = ISTART, ISTOP
+                        CT( I ) = CT( I ) + CONJG( A( K, I ) )*
+     $                            CONJG( B( J, K ) )
+                        G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                           ABS1( B( J, K ) )
+  120                CONTINUE
+  130             CONTINUE
+               ELSE
+                  DO 150 K = 1, KK
+                     DO 140 I =  ISTART, ISTOP
+                       CT( I ) = CT( I ) + CONJG( A( K, I ) )*B( J, K )
+                       G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                           ABS1( B( J, K ) )
+  140                CONTINUE
+  150             CONTINUE
+               END IF
+            ELSE
+               IF( CTRANB )THEN
+                  DO 170 K = 1, KK
+                     DO 160 I =  ISTART, ISTOP
+                       CT( I ) = CT( I ) + A( K, I )*CONJG( B( J, K ) )
+                       G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                           ABS1( B( J, K ) )
+  160                CONTINUE
+  170             CONTINUE
+               ELSE
+                  DO 190 K = 1, KK
+                     DO 180 I =  ISTART, ISTOP
+                        CT( I ) = CT( I ) + A( K, I )*B( J, K )
+                        G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                           ABS1( B( J, K ) )
+  180                CONTINUE
+  190             CONTINUE
+               END IF
+            END IF
+         END IF
+         DO 200 I =  ISTART, ISTOP
+            CT( I ) = ALPHA*CT( I ) + BETA*C( I, J )
+            G( I ) = ABS1( ALPHA )*G( I ) +
+     $               ABS1( BETA )*ABS1( C( I, J ) )
+  200    CONTINUE
+*
+*        Compute the error ratio for this result.
+*
+         ERR = ZERO
+         DO 210 I =  ISTART, ISTOP
+            ERRI = ABS1( CT( I ) - CC( I, J ) )/EPS
+            IF( G( I ).NE.RZERO )
+     $         ERRI = ERRI/G( I )
+            ERR = MAX( ERR, ERRI )
+            IF( ERR*SQRT( EPS ).GE.RONE )
+     $         GO TO 230
+  210    CONTINUE
+*
+  220 CONTINUE
+*
+*     If the loop completes, all results are at least half accurate.
+      GO TO 250
+*
+*     Report fatal error.
+*
+  230 FATAL = .TRUE.
+      WRITE( NOUT, FMT = 9999 )
+      DO 240 I =  ISTART, ISTOP
+         IF( MV )THEN
+            WRITE( NOUT, FMT = 9998 )I, CT( I ), CC( I, J )
+         ELSE
+            WRITE( NOUT, FMT = 9998 )I, CC( I, J ), CT( I )
+         END IF
+  240 CONTINUE
+      IF( N.GT.1 )
+     $   WRITE( NOUT, FMT = 9997 )J
+*
+  250 CONTINUE
+      RETURN
+*
+ 9999 FORMAT(' ******* FATAL ERROR - COMPUTED RESULT IS LESS THAN HAL',
+     $     'F ACCURATE *******', /'                       EXPECTED RE',
+     $     'SULT                    COMPUTED RESULT' )
+ 9998 FORMAT( 1X, I7, 2( '  (', G15.6, ',', G15.6, ')' ) )
+ 9997 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
+*
+*     End of CMMTCH.
+*
+      END
+
diff --git a/CBLAS/testing/c_d2chke.c b/CBLAS/testing/c_d2chke.c
index 73e8aceec5..9e9d981107 100644
--- a/CBLAS/testing/c_d2chke.c
+++ b/CBLAS/testing/c_d2chke.c
@@ -3,34 +3,42 @@
 #include "cblas.h"
 #include "cblas_test.h"
 
-int cblas_ok, cblas_lerr, cblas_info;
-int link_xerbla=TRUE;
+CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
+CBLAS_INT link_xerbla=TRUE;
 char *cblas_rout;
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo);
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
-void F77_xerbla(char *srname, void *vinfo);
+void F77_xerbla(char *srname, void *vinfo
 #endif
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN srname_len
+#endif
+);
 
 void chkxer(void) {
-   extern int cblas_ok, cblas_lerr, cblas_info;
-   extern int link_xerbla;
+   extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
+   extern CBLAS_INT link_xerbla;
    extern char *cblas_rout;
    if (cblas_lerr == 1 ) {
-      printf("***** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s *****\n", cblas_info, cblas_rout);
+      printf("***** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s *****\n", (int) cblas_info, cblas_rout);
       cblas_ok = 0 ;
    }
    cblas_lerr = 1 ;
 }
 
-void F77_d2chke(char *rout) {
+void F77_d2chke(char *rout
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rout_len
+#endif
+) {
    char *sf = ( rout ) ;
    double A[2] = {0.0,0.0},
           X[2] = {0.0,0.0},
           Y[2] = {0.0,0.0},
           ALPHA=0.0, BETA=0.0;
-   extern int cblas_info, cblas_lerr, cblas_ok;
+   extern CBLAS_INT cblas_info, cblas_lerr, cblas_ok;
    extern int RowMajorStrg;
    extern char *cblas_rout;
 
@@ -38,10 +46,11 @@ void F77_d2chke(char *rout) {
    if (link_xerbla) /* call these first to link */
    {
       cblas_xerbla(cblas_info,cblas_rout,"");
-      F77_xerbla(cblas_rout,&cblas_info);
+      F77_xerbla(cblas_rout,&cblas_info, 1);
    }
 #endif
 
+   link_xerbla = 0;
    cblas_ok = TRUE ;
    cblas_lerr = PASSED ;
 
diff --git a/CBLAS/testing/c_d3chke.c b/CBLAS/testing/c_d3chke.c
index 9a1ba3cc59..fa611f0f20 100644
--- a/CBLAS/testing/c_d3chke.c
+++ b/CBLAS/testing/c_d3chke.c
@@ -3,34 +3,42 @@
 #include "cblas.h"
 #include "cblas_test.h"
 
-int cblas_ok, cblas_lerr, cblas_info;
-int link_xerbla=TRUE;
+CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
+CBLAS_INT link_xerbla=TRUE;
 char *cblas_rout;
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo);
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
-void F77_xerbla(char *srname, void *vinfo);
+void F77_xerbla(char *srname, void *vinfo
 #endif
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN srname_len
+#endif
+);
 
 void chkxer(void) {
-   extern int cblas_ok, cblas_lerr, cblas_info;
-   extern int link_xerbla;
+   extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
+   extern CBLAS_INT link_xerbla;
    extern char *cblas_rout;
    if (cblas_lerr == 1 ) {
-      printf("***** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s *****\n", cblas_info, cblas_rout);
+      printf("***** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s *****\n", (int) cblas_info, cblas_rout);
       cblas_ok = 0 ;
    }
    cblas_lerr = 1 ;
 }
 
-void F77_d3chke(char *rout) {
+void F77_d3chke(char *rout
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rout_len
+#endif
+) {
    char *sf = ( rout ) ;
    double A[2] = {0.0,0.0},
           B[2] = {0.0,0.0},
           C[2] = {0.0,0.0},
           ALPHA=0.0, BETA=0.0;
-   extern int cblas_info, cblas_lerr, cblas_ok;
+   extern CBLAS_INT cblas_info, cblas_lerr, cblas_ok;
    extern int RowMajorStrg;
    extern char *cblas_rout;
 
@@ -38,14 +46,245 @@ void F77_d3chke(char *rout) {
    if (link_xerbla) /* call these first to link */
    {
       cblas_xerbla(cblas_info,cblas_rout,"");
-      F77_xerbla(cblas_rout,&cblas_info);
+      F77_xerbla(cblas_rout,&cblas_info, 1);
    }
 #endif
 
+   link_xerbla = 0;
    cblas_ok = TRUE ;
    cblas_lerr = PASSED ;
 
-   if (strncmp( sf,"cblas_dgemm"   ,11)==0) {
+   if (strncmp( sf,"cblas_dgemmtr"   ,13)==0) {
+      cblas_rout = "cblas_dgemmtr"   ;
+
+      cblas_info = 1;
+      cblas_dgemmtr( INVALID, CblasUpper, CblasNoTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_dgemmtr( INVALID, CblasUpper, CblasNoTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_dgemmtr( INVALID, CblasUpper,CblasTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_dgemmtr( INVALID, CblasUpper, CblasTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 1;
+      cblas_dgemmtr( INVALID, CblasLower, CblasNoTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_dgemmtr( INVALID, CblasLower, CblasNoTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_dgemmtr( INVALID, CblasLower,CblasTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_dgemmtr( INVALID, CblasLower, CblasTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 2; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  INVALID, CblasNoTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 2; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  INVALID, CblasNoTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 3; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, INVALID, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 3; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, INVALID, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 4; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor, CblasUpper,  CblasNoTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor, CblasUpper, CblasTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 1, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+
+      /* Row Major */
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasNoTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 9;  RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasTrans, 0, 2,
+                   ALPHA, A, 1, B, 2, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 1, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_dgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+
+   } else  if (strncmp( sf,"cblas_dgemm"   ,11)==0) {
       cblas_rout = "cblas_dgemm"   ;
 
       cblas_info = 1;
@@ -1267,7 +1506,7 @@ void F77_d3chke(char *rout) {
       chkxer();
    }
    if (cblas_ok == TRUE )
-       printf(" %-12s PASSED THE TESTS OF ERROR-EXITS\n", cblas_rout);
+       printf(" %-13s PASSED THE TESTS OF ERROR-EXITS\n", cblas_rout);
    else
        printf("***** %s FAILED THE TESTS OF ERROR-EXITS *******\n",cblas_rout);
 }
diff --git a/CBLAS/testing/c_dblas1.c b/CBLAS/testing/c_dblas1.c
index deb7851257..ee120af594 100644
--- a/CBLAS/testing/c_dblas1.c
+++ b/CBLAS/testing/c_dblas1.c
@@ -8,32 +8,40 @@
  */
 #include "cblas_test.h"
 #include "cblas.h"
-double F77_dasum(const int *N, double *X, const int *incX)
+double F77_dasum(const CBLAS_INT *N, double *X, const CBLAS_INT *incX)
 {
    return cblas_dasum(*N, X, *incX);
 }
 
-void F77_daxpy(const int *N, const double *alpha, const double *X,
-                    const int *incX, double *Y, const int *incY)
+void F77_daxpy(const CBLAS_INT *N, const double *alpha, const double *X,
+                    const CBLAS_INT *incX, double *Y, const CBLAS_INT *incY)
 {
    cblas_daxpy(*N, *alpha, X, *incX, Y, *incY);
    return;
 }
 
-void F77_dcopy(const int *N, double *X, const int *incX,
-                    double *Y, const int *incY)
+void F77_daxpby(const CBLAS_INT *N, const double *alpha, const double *X,
+                    const CBLAS_INT *incX, const double *beta, double *Y, const CBLAS_INT *incY)
+{
+   cblas_daxpby(*N, *alpha, X, *incX, *beta, Y, *incY);
+   return;
+}
+
+
+void F77_dcopy(const CBLAS_INT *N, double *X, const CBLAS_INT *incX,
+                    double *Y, const CBLAS_INT *incY)
 {
    cblas_dcopy(*N, X, *incX, Y, *incY);
    return;
 }
 
-double F77_ddot(const int *N, const double *X, const int *incX,
-                const double *Y, const int *incY)
+double F77_ddot(const CBLAS_INT *N, const double *X, const CBLAS_INT *incX,
+                const double *Y, const CBLAS_INT *incY)
 {
    return cblas_ddot(*N, X, *incX, Y, *incY);
 }
 
-double F77_dnrm2(const int *N, const double *X, const int *incX)
+double F77_dnrm2(const CBLAS_INT *N, const double *X, const CBLAS_INT *incX)
 {
    return cblas_dnrm2(*N, X, *incX);
 }
@@ -44,39 +52,39 @@ void F77_drotg( double *a, double *b, double *c, double *s)
    return;
 }
 
-void F77_drot( const int *N, double *X, const int *incX, double *Y,
-       const int *incY, const double *c, const double *s)
+void F77_drot( const CBLAS_INT *N, double *X, const CBLAS_INT *incX, double *Y,
+       const CBLAS_INT *incY, const double *c, const double *s)
 {
 
    cblas_drot(*N,X,*incX,Y,*incY,*c,*s);
    return;
 }
 
-void F77_dscal(const int *N, const double *alpha, double *X,
-                         const int *incX)
+void F77_dscal(const CBLAS_INT *N, const double *alpha, double *X,
+                         const CBLAS_INT *incX)
 {
    cblas_dscal(*N, *alpha, X, *incX);
    return;
 }
 
-void F77_dswap( const int *N, double *X, const int *incX,
-                          double *Y, const int *incY)
+void F77_dswap( const CBLAS_INT *N, double *X, const CBLAS_INT *incX,
+                          double *Y, const CBLAS_INT *incY)
 {
    cblas_dswap(*N,X,*incX,Y,*incY);
    return;
 }
 
-double F77_dzasum(const int *N, void *X, const int *incX)
+double F77_dzasum(const CBLAS_INT *N, void *X, const CBLAS_INT *incX)
 {
    return cblas_dzasum(*N, X, *incX);
 }
 
-double F77_dznrm2(const int *N, const void *X, const int *incX)
+double F77_dznrm2(const CBLAS_INT *N, const void *X, const CBLAS_INT *incX)
 {
    return cblas_dznrm2(*N, X, *incX);
 }
 
-int F77_idamax(const int *N, const double *X, const int *incX)
+CBLAS_INT F77_idamax(const CBLAS_INT *N, const double *X, const CBLAS_INT *incX)
 {
    if (*N < 1 || *incX < 1) return(0);
    return (cblas_idamax(*N, X, *incX)+1);
diff --git a/CBLAS/testing/c_dblas2.c b/CBLAS/testing/c_dblas2.c
index 835ba19f34..e8cc2bd23d 100644
--- a/CBLAS/testing/c_dblas2.c
+++ b/CBLAS/testing/c_dblas2.c
@@ -8,12 +8,16 @@
 #include "cblas.h"
 #include "cblas_test.h"
 
-void F77_dgemv(int *layout, char *transp, int *m, int *n, double *alpha,
-	       double *a, int *lda, double *x, int *incx, double *beta,
-	       double *y, int *incy ) {
+void F77_dgemv(CBLAS_INT *layout, char *transp, CBLAS_INT *m, CBLAS_INT *n, double *alpha,
+	       double *a, CBLAS_INT *lda, double *x, CBLAS_INT *incx, double *beta,
+	       double *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN transp_len
+#endif
+) {
 
   double *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_TRANSPOSE trans;
 
   get_transpose_type(transp, &trans);
@@ -35,11 +39,11 @@ void F77_dgemv(int *layout, char *transp, int *m, int *n, double *alpha,
 		  *m, *n, *alpha, a, *lda, x, *incx, *beta, y, *incy );
 }
 
-void F77_dger(int *layout, int *m, int *n, double *alpha, double *x, int *incx,
-	     double *y, int *incy, double *a, int *lda ) {
+void F77_dger(CBLAS_INT *layout, CBLAS_INT *m, CBLAS_INT *n, double *alpha, double *x, CBLAS_INT *incx,
+	     double *y, CBLAS_INT *incy, double *a, CBLAS_INT *lda ) {
 
   double *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
 
   if (*layout == TEST_ROW_MJR) {
      LDA = *n+1;
@@ -60,10 +64,14 @@ void F77_dger(int *layout, int *m, int *n, double *alpha, double *x, int *incx,
      cblas_dger( CblasColMajor, *m, *n, *alpha, x, *incx, y, *incy, a, *lda );
 }
 
-void F77_dtrmv(int *layout, char *uplow, char *transp, char *diagn,
-	      int *n, double *a, int *lda, double *x, int *incx) {
+void F77_dtrmv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+	      CBLAS_INT *n, double *a, CBLAS_INT *lda, double *x, CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   double *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -88,10 +96,14 @@ void F77_dtrmv(int *layout, char *uplow, char *transp, char *diagn,
   }
 }
 
-void F77_dtrsv(int *layout, char *uplow, char *transp, char *diagn,
-	       int *n, double *a, int *lda, double *x, int *incx ) {
+void F77_dtrsv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+	       CBLAS_INT *n, double *a, CBLAS_INT *lda, double *x, CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   double *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -112,11 +124,15 @@ void F77_dtrsv(int *layout, char *uplow, char *transp, char *diagn,
    else
      cblas_dtrsv(CblasColMajor, uplo, trans, diag, *n, a, *lda, x, *incx );
 }
-void F77_dsymv(int *layout, char *uplow, int *n, double *alpha, double *a,
-	      int *lda, double *x, int *incx, double *beta, double *y,
-	      int *incy) {
+void F77_dsymv(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, double *alpha, double *a,
+	      CBLAS_INT *lda, double *x, CBLAS_INT *incx, double *beta, double *y,
+	      CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
   double *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -136,10 +152,14 @@ void F77_dsymv(int *layout, char *uplow, int *n, double *alpha, double *a,
 		 *beta, y, *incy );
 }
 
-void F77_dsyr(int *layout, char *uplow, int *n, double *alpha, double *x,
-	     int *incx, double *a, int *lda) {
+void F77_dsyr(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, double *alpha, double *x,
+	     CBLAS_INT *incx, double *a, CBLAS_INT *lda
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
   double *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -160,10 +180,14 @@ void F77_dsyr(int *layout, char *uplow, int *n, double *alpha, double *x,
      cblas_dsyr(CblasColMajor, uplo, *n, *alpha, x, *incx, a, *lda);
 }
 
-void F77_dsyr2(int *layout, char *uplow, int *n, double *alpha, double *x,
-	     int *incx, double *y, int *incy, double *a, int *lda) {
+void F77_dsyr2(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, double *alpha, double *x,
+	     CBLAS_INT *incx, double *y, CBLAS_INT *incy, double *a, CBLAS_INT *lda
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
   double *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -184,12 +208,16 @@ void F77_dsyr2(int *layout, char *uplow, int *n, double *alpha, double *x,
      cblas_dsyr2(CblasColMajor, uplo, *n, *alpha, x, *incx, y, *incy, a, *lda);
 }
 
-void F77_dgbmv(int *layout, char *transp, int *m, int *n, int *kl, int *ku,
-	       double *alpha, double *a, int *lda, double *x, int *incx,
-	       double *beta, double *y, int *incy ) {
+void F77_dgbmv(CBLAS_INT *layout, char *transp, CBLAS_INT *m, CBLAS_INT *n, CBLAS_INT *kl, CBLAS_INT *ku,
+	       double *alpha, double *a, CBLAS_INT *lda, double *x, CBLAS_INT *incx,
+	       double *beta, double *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN transp_len
+#endif
+) {
 
   double *A;
-  int i,irow,j,jcol,LDA;
+  CBLAS_INT i,irow,j,jcol,LDA;
   CBLAS_TRANSPOSE trans;
 
   get_transpose_type(transp, &trans);
@@ -222,10 +250,14 @@ void F77_dgbmv(int *layout, char *transp, int *m, int *n, int *kl, int *ku,
 		  a, *lda, x, *incx, *beta, y, *incy );
 }
 
-void F77_dtbmv(int *layout, char *uplow, char *transp, char *diagn,
-	      int *n, int *k, double *a, int *lda, double *x, int *incx) {
+void F77_dtbmv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+	      CBLAS_INT *n, CBLAS_INT *k, double *a, CBLAS_INT *lda, double *x, CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   double *A;
-  int irow, jcol, i, j, LDA;
+  CBLAS_INT irow, jcol, i, j, LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -268,10 +300,14 @@ void F77_dtbmv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_dtbmv(CblasColMajor, uplo, trans, diag, *n, *k, a, *lda, x, *incx);
 }
 
-void F77_dtbsv(int *layout, char *uplow, char *transp, char *diagn,
-	      int *n, int *k, double *a, int *lda, double *x, int *incx) {
+void F77_dtbsv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+	      CBLAS_INT *n, CBLAS_INT *k, double *a, CBLAS_INT *lda, double *x, CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   double *A;
-  int irow, jcol, i, j, LDA;
+  CBLAS_INT irow, jcol, i, j, LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -314,11 +350,15 @@ void F77_dtbsv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_dtbsv(CblasColMajor, uplo, trans, diag, *n, *k, a, *lda, x, *incx);
 }
 
-void F77_dsbmv(int *layout, char *uplow, int *n, int *k, double *alpha,
-	      double *a, int *lda, double *x, int *incx, double *beta,
-	      double *y, int *incy) {
+void F77_dsbmv(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, CBLAS_INT *k, double *alpha,
+	      double *a, CBLAS_INT *lda, double *x, CBLAS_INT *incx, double *beta,
+	      double *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
   double *A;
-  int i,j,irow,jcol,LDA;
+  CBLAS_INT i,j,irow,jcol,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -359,10 +399,14 @@ void F77_dsbmv(int *layout, char *uplow, int *n, int *k, double *alpha,
 		 *beta, y, *incy );
 }
 
-void F77_dspmv(int *layout, char *uplow, int *n, double *alpha, double *ap,
-	      double *x, int *incx, double *beta, double *y, int *incy) {
+void F77_dspmv(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, double *alpha, double *ap,
+	      double *x, CBLAS_INT *incx, double *beta, double *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
   double *A,*AP;
-  int i,j,k,LDA;
+  CBLAS_INT i,j,k,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -397,10 +441,14 @@ void F77_dspmv(int *layout, char *uplow, int *n, double *alpha, double *ap,
 		  *incy );
 }
 
-void F77_dtpmv(int *layout, char *uplow, char *transp, char *diagn,
-	      int *n, double *ap, double *x, int *incx) {
+void F77_dtpmv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+	      CBLAS_INT *n, double *ap, double *x, CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   double *A, *AP;
-  int i, j, k, LDA;
+  CBLAS_INT i, j, k, LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -437,10 +485,14 @@ void F77_dtpmv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_dtpmv( CblasColMajor, uplo, trans, diag, *n, ap, x, *incx );
 }
 
-void F77_dtpsv(int *layout, char *uplow, char *transp, char *diagn,
-	      int *n, double *ap, double *x, int *incx) {
+void F77_dtpsv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+	      CBLAS_INT *n, double *ap, double *x, CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   double *A, *AP;
-  int i, j, k, LDA;
+  CBLAS_INT i, j, k, LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -478,10 +530,14 @@ void F77_dtpsv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_dtpsv( CblasColMajor, uplo, trans, diag, *n, ap, x, *incx );
 }
 
-void F77_dspr(int *layout, char *uplow, int *n, double *alpha, double *x,
-	     int *incx, double *ap ){
+void F77_dspr(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, double *alpha, double *x,
+	     CBLAS_INT *incx, double *ap
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+){
   double *A, *AP;
-  int i,j,k,LDA;
+  CBLAS_INT i,j,k,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -530,10 +586,14 @@ void F77_dspr(int *layout, char *uplow, int *n, double *alpha, double *x,
      cblas_dspr( CblasColMajor, uplo, *n, *alpha, x, *incx, ap );
 }
 
-void F77_dspr2(int *layout, char *uplow, int *n, double *alpha, double *x,
-	     int *incx, double *y, int *incy, double *ap ){
+void F77_dspr2(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, double *alpha, double *x,
+	     CBLAS_INT *incx, double *y, CBLAS_INT *incy, double *ap
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+){
   double *A, *AP;
-  int i,j,k,LDA;
+  CBLAS_INT i,j,k,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
diff --git a/CBLAS/testing/c_dblas3.c b/CBLAS/testing/c_dblas3.c
index 8a2c37688d..675f0ebfc0 100644
--- a/CBLAS/testing/c_dblas3.c
+++ b/CBLAS/testing/c_dblas3.c
@@ -11,12 +11,16 @@
 #define  TEST_ROW_MJR	1
 #define  UNDEFINED     -1
 
-void F77_dgemm(int *layout, char *transpa, char *transpb, int *m, int *n,
-              int *k, double *alpha, double *a, int *lda, double *b, int *ldb,
-              double *beta, double *c, int *ldc ) {
+void F77_dgemm(CBLAS_INT *layout, char *transpa, char *transpb, CBLAS_INT *m, CBLAS_INT *n,
+              CBLAS_INT *k, double *alpha, double *a, CBLAS_INT *lda, double *b, CBLAS_INT *ldb,
+              double *beta, double *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN transpa_len, FORTRAN_STRLEN transpb_len
+#endif
+) {
 
   double *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
+  CBLAS_INT i,j,LDA, LDB, LDC;
   CBLAS_TRANSPOSE transa, transb;
 
   get_transpose_type(transpa, &transa);
@@ -73,12 +77,95 @@ void F77_dgemm(int *layout, char *transpa, char *transpb, int *m, int *n,
      cblas_dgemm( UNDEFINED, transa, transb, *m, *n, *k, *alpha, a, *lda,
                   b, *ldb, *beta, c, *ldc );
 }
-void F77_dsymm(int *layout, char *rtlf, char *uplow, int *m, int *n,
-              double *alpha, double *a, int *lda, double *b, int *ldb,
-              double *beta, double *c, int *ldc ) {
+
+void F77_dgemmtr(CBLAS_INT *layout, char *uplop, char *transpa, char *transpb, CBLAS_INT *n,
+     CBLAS_INT *k, double *alpha, double *a, CBLAS_INT *lda,
+     double *b, CBLAS_INT *ldb, double *beta,
+     double *c, CBLAS_INT *ldc ) {
+
+  double *A, *B, *C;
+  CBLAS_INT i,j,LDA, LDB, LDC;
+  CBLAS_TRANSPOSE transa, transb;
+  CBLAS_UPLO uplo;
+
+  get_transpose_type(transpa, &transa);
+  get_transpose_type(transpb, &transb);
+  get_uplo_type(uplop, &uplo);
+
+  if (*layout == TEST_ROW_MJR) {
+     if (transa == CblasNoTrans) {
+        LDA = *k+1;
+        A=(double*)malloc((*n)*LDA*sizeof(double));
+        for( i=0; i<*n; i++ )
+           for( j=0; j<*k; j++ ) {
+              A[i*LDA+j]=a[j*(*lda)+i];
+           }
+     }
+     else {
+        LDA = *n+1;
+        A=(double* )malloc(LDA*(*k)*sizeof(double));
+        for( i=0; i<*k; i++ )
+           for( j=0; j<*n; j++ ) {
+              A[i*LDA+j]=a[j*(*lda)+i];
+           }
+     }
+
+     if (transb == CblasNoTrans) {
+        LDB = *n+1;
+        B=(double* )malloc((*k)*LDB*sizeof(double) );
+        for( i=0; i<*k; i++ )
+           for( j=0; j<*n; j++ ) {
+              B[i*LDB+j]=b[j*(*ldb)+i];
+           }
+     }
+     else {
+        LDB = *k+1;
+        B=(double* )malloc(LDB*(*n)*sizeof(double));
+        for( i=0; i<*n; i++ )
+           for( j=0; j<*k; j++ ) {
+              B[i*LDB+j]=b[j*(*ldb)+i];
+           }
+     }
+
+     LDC = *n+1;
+     C=(double* )malloc((*n)*LDC*sizeof(double));
+     for( j=0; j<*n; j++ )
+        for( i=0; i<*n; i++ ) {
+           C[i*LDC+j]=c[j*(*ldc)+i];
+        }
+     cblas_dgemmtr( CblasRowMajor, uplo, transa, transb, *n, *k, *alpha, A, LDA,
+                  B, LDB, *beta, C, LDC );
+     for( j=0; j<*n; j++ )
+        for( i=0; i<*n; i++ ) {
+           c[j*(*ldc)+i]=C[i*LDC+j];
+        }
+     free(A);
+     free(B);
+     free(C);
+  }
+  else if (*layout == TEST_COL_MJR){
+     cblas_dgemmtr( CblasColMajor, uplo, transa, transb, *n, *k, *alpha, a, *lda,
+                  b, *ldb, *beta, c, *ldc );
+  }
+  else
+     cblas_dgemmtr( UNDEFINED, uplo, transa, transb, *n, *k, *alpha, a, *lda,
+                  b, *ldb, *beta, c, *ldc );
+}
+
+
+
+
+
+void F77_dsymm(CBLAS_INT *layout, char *rtlf, char *uplow, CBLAS_INT *m, CBLAS_INT *n,
+              double *alpha, double *a, CBLAS_INT *lda, double *b, CBLAS_INT *ldb,
+              double *beta, double *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rtlf_len, FORTRAN_STRLEN uplow_len
+#endif
+) {
 
   double *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
+  CBLAS_INT i,j,LDA, LDB, LDC;
   CBLAS_UPLO uplo;
   CBLAS_SIDE side;
 
@@ -127,11 +214,15 @@ void F77_dsymm(int *layout, char *rtlf, char *uplow, int *m, int *n,
                   *beta, c, *ldc );
 }
 
-void F77_dsyrk(int *layout, char *uplow, char *transp, int *n, int *k,
-              double *alpha, double *a, int *lda,
-              double *beta, double *c, int *ldc ) {
+void F77_dsyrk(CBLAS_INT *layout, char *uplow, char *transp, CBLAS_INT *n, CBLAS_INT *k,
+              double *alpha, double *a, CBLAS_INT *lda,
+              double *beta, double *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len
+#endif
+) {
 
-  int i,j,LDA,LDC;
+  CBLAS_INT i,j,LDA,LDC;
   double *A, *C;
   CBLAS_UPLO uplo;
   CBLAS_TRANSPOSE trans;
@@ -175,10 +266,14 @@ void F77_dsyrk(int *layout, char *uplow, char *transp, int *n, int *k,
 	         c, *ldc );
 }
 
-void F77_dsyr2k(int *layout, char *uplow, char *transp, int *n, int *k,
-               double *alpha, double *a, int *lda, double *b, int *ldb,
-               double *beta, double *c, int *ldc ) {
-  int i,j,LDA,LDB,LDC;
+void F77_dsyr2k(CBLAS_INT *layout, char *uplow, char *transp, CBLAS_INT *n, CBLAS_INT *k,
+               double *alpha, double *a, CBLAS_INT *lda, double *b, CBLAS_INT *ldb,
+               double *beta, double *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len
+#endif
+) {
+  CBLAS_INT i,j,LDA,LDB,LDC;
   double *A, *B, *C;
   CBLAS_UPLO uplo;
   CBLAS_TRANSPOSE trans;
@@ -230,10 +325,14 @@ void F77_dsyr2k(int *layout, char *uplow, char *transp, int *n, int *k,
      cblas_dsyr2k(UNDEFINED, uplo, trans, *n, *k, *alpha, a, *lda,
 		   b, *ldb, *beta, c, *ldc );
 }
-void F77_dtrmm(int *layout, char *rtlf, char *uplow, char *transp, char *diagn,
-              int *m, int *n, double *alpha, double *a, int *lda, double *b,
-              int *ldb) {
-  int i,j,LDA,LDB;
+void F77_dtrmm(CBLAS_INT *layout, char *rtlf, char *uplow, char *transp, char *diagn,
+              CBLAS_INT *m, CBLAS_INT *n, double *alpha, double *a, CBLAS_INT *lda, double *b,
+              CBLAS_INT *ldb
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rtlf_len, FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diag_len
+#endif
+) {
+  CBLAS_INT i,j,LDA,LDB;
   double *A, *B;
   CBLAS_SIDE side;
   CBLAS_DIAG diag;
@@ -281,10 +380,14 @@ void F77_dtrmm(int *layout, char *rtlf, char *uplow, char *transp, char *diagn,
 		   a, *lda, b, *ldb);
 }
 
-void F77_dtrsm(int *layout, char *rtlf, char *uplow, char *transp, char *diagn,
-              int *m, int *n, double *alpha, double *a, int *lda, double *b,
-              int *ldb) {
-  int i,j,LDA,LDB;
+void F77_dtrsm(CBLAS_INT *layout, char *rtlf, char *uplow, char *transp, char *diagn,
+              CBLAS_INT *m, CBLAS_INT *n, double *alpha, double *a, CBLAS_INT *lda, double *b,
+              CBLAS_INT *ldb
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rtlf_len, FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
+  CBLAS_INT i,j,LDA,LDB;
   double *A, *B;
   CBLAS_SIDE side;
   CBLAS_DIAG diag;
diff --git a/CBLAS/testing/c_dblat1.f b/CBLAS/testing/c_dblat1.f
index 4a71b4dcf7..c272939206 100644
--- a/CBLAS/testing/c_dblat1.f
+++ b/CBLAS/testing/c_dblat1.f
@@ -1,4 +1,6 @@
+*  =====================================================================
       PROGRAM DCBLAT1
+      IMPLICIT NONE
 *     Test program for the DOUBLE PRECISION Level 1 CBLAS.
 *     Based upon the original CBLAS test routine together with:
 *     F06EAF Example Program Text
@@ -19,7 +21,7 @@ PROGRAM DCBLAT1
       DATA             SFAC/9.765625D-4/
 *     .. Executable Statements ..
       WRITE (NOUT,99999)
-      DO 20 IC = 1, 10
+      DO 20 IC = 1, 11
          ICASE = IC
          CALL HEADER
 *
@@ -38,7 +40,7 @@ PROGRAM DCBLAT1
      +            ICASE.EQ.10) THEN
             CALL CHECK1(SFAC)
          ELSE IF (ICASE.EQ.1 .OR. ICASE.EQ.2 .OR. ICASE.EQ.5 .OR.
-     +            ICASE.EQ.6) THEN
+     +            ICASE.EQ.6 .OR. ICASE.EQ.11 ) THEN
             CALL CHECK2(SFAC)
          ELSE IF (ICASE.EQ.4) THEN
             CALL CHECK3(SFAC)
@@ -51,7 +53,11 @@ PROGRAM DCBLAT1
 99999 FORMAT (' Real CBLAS Test Program Results',/1X)
 99998 FORMAT ('                                    ----- PASS -----')
       END
+
+*  =====================================================================
       SUBROUTINE HEADER
+      IMPLICIT NONE
+
 *     .. Parameters ..
       INTEGER          NOUT
       PARAMETER        (NOUT=6)
@@ -59,7 +65,7 @@ SUBROUTINE HEADER
       INTEGER          ICASE, INCX, INCY, MODE, N
       LOGICAL          PASS
 *     .. Local Arrays ..
-      CHARACTER*15      L(10)
+      CHARACTER*15      L(11)
 *     .. Common blocks ..
       COMMON           /COMBLA/ICASE, N, INCX, INCY, MODE, PASS
 *     .. Data statements ..
@@ -73,13 +79,18 @@ SUBROUTINE HEADER
       DATA             L(8)/'CBLAS_DASUM '/
       DATA             L(9)/'CBLAS_DSCAL '/
       DATA             L(10)/'CBLAS_IDAMAX'/
+      DATA             L(11)/'CBLAS_DAXPBY'/
+
 *     .. Executable Statements ..
       WRITE (NOUT,99999) ICASE, L(ICASE)
       RETURN
 *
 99999 FORMAT (/' Test of subprogram number',I3,9X,A15)
       END
+
+*  =====================================================================
       SUBROUTINE CHECK0(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
       PARAMETER         (NOUT=6)
@@ -140,7 +151,10 @@ SUBROUTINE CHECK0(SFAC)
    20 CONTINUE
    40 RETURN
       END
+
+*  =====================================================================
       SUBROUTINE CHECK1(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
       PARAMETER         (NOUT=6)
@@ -234,7 +248,10 @@ SUBROUTINE CHECK1(SFAC)
    80 CONTINUE
       RETURN
       END
+
+*  =====================================================================
       SUBROUTINE CHECK2(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
       PARAMETER         (NOUT=6)
@@ -244,25 +261,27 @@ SUBROUTINE CHECK2(SFAC)
       INTEGER           ICASE, INCX, INCY, MODE, N
       LOGICAL           PASS
 *     .. Local Scalars ..
-      DOUBLE PRECISION  SA
+      DOUBLE PRECISION  SA, SB
       INTEGER           I, J, KI, KN, KSIZE, LENX, LENY, MX, MY
 *     .. Local Arrays ..
       DOUBLE PRECISION  DT10X(7,4,4), DT10Y(7,4,4), DT7(4,4),
      +                  DT8(7,4,4), DX1(7),
      +                  DY1(7), SSIZE1(4), SSIZE2(14,2), STX(7), STY(7),
-     +                  SX(7), SY(7)
+     +                  SX(7), SY(7), DT20(7,4,4)
       INTEGER           INCXS(4), INCYS(4), LENS(4,2), NS(4)
 *     .. External Functions ..
       EXTERNAL          DDOTTEST
       DOUBLE PRECISION  DDOTTEST
 *     .. External Subroutines ..
       EXTERNAL          DAXPYTEST, DCOPYTEST, DSWAPTEST, STEST, STEST1
+     +                  DAXPBYTEST
 *     .. Intrinsic Functions ..
       INTRINSIC         ABS, MIN
 *     .. Common blocks ..
       COMMON            /COMBLA/ICASE, N, INCX, INCY, MODE, PASS
 *     .. Data statements ..
       DATA              SA/0.3D0/
+      DATA              SB/0.5D0/
       DATA              INCXS/1, 2, -2, -1/
       DATA              INCYS/1, -2, 1, -2/
       DATA              LENS/1, 1, 2, 4, 1, 1, 3, 7/
@@ -335,6 +354,27 @@ SUBROUTINE CHECK2(SFAC)
      +                  0.0D0, 1.17D0, 1.17D0, 1.17D0, 1.17D0, 1.17D0,
      +                  1.17D0, 1.17D0, 1.17D0, 1.17D0, 1.17D0, 1.17D0,
      +                  1.17D0, 1.17D0, 1.17D0/
+      DATA              DT20/0.5D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0,
+     +                  0.0D0, 0.43D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0,
+     +                  0.0D0, 0.0D0, 0.43D0, -0.42D0, 0.0D0, 0.0D0,
+     +                  0.0D0, 0.0D0, 0.0D0, 0.43D0, -0.42D0, 0.0D0,
+     +                  0.59D0, 0.0D0, 0.0D0, 0.0D0, 0.5D0, 0.0D0,
+     +                  0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.43D0,
+     +                  0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0,
+     +                  0.1D0, -0.9D0, 0.33D0, 0.0D0, 0.0D0, 0.0D0,
+     +                  0.0D0, 0.13D0, -0.9D0, 0.42D0, 0.7D0, -0.45D0,
+     +                  0.2D0, 0.58D0, 0.5D0, 0.0D0, 0.0D0, 0.0D0,
+     +                  0.0D0, 0.0D0, 0.0D0, 0.43D0, 0.0D0, 0.0D0,
+     +                  0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.1D0, -0.27D0,
+     +                  0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.13D0,
+     +                  -0.18D0, 0.00D0, 0.53D0, 0.0D0, 0.0D0, 0.0D0,
+     +                  0.5D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0,
+     +                  0.43D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0,
+     +                  0.0D0, 0.43D0, -0.9D0, 0.18D0, 0.0D0, 0.0D0,
+     +                  0.0D0, 0.0D0, 0.43D0, -0.9D0, 0.18D0, 0.7D0,
+     +                  -0.45D0, 0.2D0, 0.64D0/
+
+
 *     .. Executable Statements ..
 *
       DO 120 KI = 1, 4
@@ -365,6 +405,14 @@ SUBROUTINE CHECK2(SFAC)
                   STY(J) = DT8(J,KN,KI)
    40          CONTINUE
                CALL STEST(LENY,SY,STY,SSIZE2(1,KSIZE),SFAC)
+            ELSE IF (ICASE.EQ.11) THEN
+*              .. DAXPBYTEST ..
+               CALL DAXPBYTEST(N,SA,SX,INCX,SB,SY,INCY)
+               DO 50 J = 1, LENY
+                  STY(J) = DT20(J,KN,KI)
+   50          CONTINUE
+               CALL STEST(LENY,SY,STY,SSIZE2(1,KSIZE),SFAC)
+
             ELSE IF (ICASE.EQ.5) THEN
 *              .. DCOPYTEST ..
                DO 60 I = 1, 7
@@ -389,7 +437,10 @@ SUBROUTINE CHECK2(SFAC)
   120 CONTINUE
       RETURN
       END
+
+*  =====================================================================
       SUBROUTINE CHECK3(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
       PARAMETER         (NOUT=6)
@@ -595,7 +646,10 @@ SUBROUTINE CHECK3(SFAC)
   200 CONTINUE
       RETURN
       END
+
+*  =====================================================================
       SUBROUTINE STEST(LEN,SCOMP,STRUE,SSIZE,SFAC)
+      IMPLICIT NONE
 *     ********************************* STEST **************************
 *
 *     THIS SUBR COMPARES ARRAYS  SCOMP() AND STRUE() OF LENGTH LEN TO
@@ -650,7 +704,10 @@ SUBROUTINE STEST(LEN,SCOMP,STRUE,SSIZE,SFAC)
      +       '     SIZE(I)',/1X)
 99997 FORMAT (1X,I4,I3,3I5,I3,2D36.8,2D12.4)
       END
+
+*  =====================================================================
       SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
+      IMPLICIT NONE
 *     ************************* STEST1 *****************************
 *
 *     THIS IS AN INTERFACE SUBROUTINE TO ACCOMMODATE THE FORTRAN
@@ -675,7 +732,10 @@ SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
 *
       RETURN
       END
+
+*  =====================================================================
       DOUBLE PRECISION FUNCTION SDIFF(SA,SB)
+      IMPLICIT NONE
 *     ********************************* SDIFF **************************
 *     COMPUTES DIFFERENCE OF TWO NUMBERS.  C. L. LAWSON, JPL 1974 FEB 15
 *
@@ -685,7 +745,10 @@ DOUBLE PRECISION FUNCTION SDIFF(SA,SB)
       SDIFF = SA - SB
       RETURN
       END
+
+*  =====================================================================
       SUBROUTINE ITEST1(ICOMP,ITRUE)
+      IMPLICIT NONE
 *     ********************************* ITEST1 *************************
 *
 *     THIS SUBROUTINE COMPARES THE VARIABLES ICOMP AND ITRUE FOR
diff --git a/CBLAS/testing/c_dblat2.f b/CBLAS/testing/c_dblat2.f
index 27ceda622f..8e92df5627 100644
--- a/CBLAS/testing/c_dblat2.f
+++ b/CBLAS/testing/c_dblat2.f
@@ -1,4 +1,6 @@
+*  =====================================================================
       PROGRAM DBLAT2
+      IMPLICIT NONE
 *
 *  Test program for the DOUBLE PRECISION Level 2 Blas.
 *
@@ -453,10 +455,13 @@ PROGRAM DBLAT2
 *     End of DBLAT2.
 *
       END
+
+*  =====================================================================
       SUBROUTINE DCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NALF, ALF, NBET,
      $                  BET, NINC, INC, NMAX, INCMAX, A, AA, AS, X, XX,
      $                  XS, Y, YY, YS, YT, G, IORDER )
+      IMPLICIT NONE
 *
 *  Tests DGEMV and DGBMV.
 *
@@ -813,10 +818,13 @@ SUBROUTINE DCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of DCHK1.
 *
       END
+
+*  =====================================================================
       SUBROUTINE DCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NALF, ALF, NBET,
      $                  BET, NINC, INC, NMAX, INCMAX, A, AA, AS, X, XX,
      $                  XS, Y, YY, YS, YT, G, IORDER )
+      IMPLICIT NONE
 *
 *  Tests DSYMV, DSBMV and DSPMV.
 *
@@ -1173,9 +1181,12 @@ SUBROUTINE DCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of DCHK2.
 *
       END
+
+*  =====================================================================
       SUBROUTINE DCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, XT, G, Z, IORDER )
+      IMPLICIT NONE
 *
 *  Tests DTRMV, DTBMV, DTPMV, DTRSV, DTBSV and DTPSV.
 *
@@ -1560,10 +1571,13 @@ SUBROUTINE DCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of DCHK3.
 *
       END
+
+*  =====================================================================
       SUBROUTINE DCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z, IORDER )
+      IMPLICIT NONE
 *
 *  Tests DGER.
 *
@@ -1832,10 +1846,13 @@ SUBROUTINE DCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of DCHK4.
 *
       END
+
+*  =====================================================================
       SUBROUTINE DCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z, IORDER )
+      IMPLICIT NONE
 *
 *  Tests DSYR and DSPR.
 *
@@ -2128,10 +2145,13 @@ SUBROUTINE DCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of DCHK5.
 *
       END
+
+*  =====================================================================
       SUBROUTINE DCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z, IORDER )
+      IMPLICIT NONE
 *
 *  Tests DSYR2 and DSPR2.
 *
@@ -2460,8 +2480,11 @@ SUBROUTINE DCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of DCHK6.
 *
       END
+
+*  =====================================================================
       SUBROUTINE DMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, KL,
      $                  KU, RESET, TRANSL )
+      IMPLICIT NONE
 *
 *  Generates values for an M by N matrix A within the bandwidth
 *  defined by KL and KU.
@@ -2636,8 +2659,11 @@ SUBROUTINE DMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, KL,
 *     End of DMAKE.
 *
       END
+
+*  =====================================================================
       SUBROUTINE DMVCH( TRANS, M, N, ALPHA, A, NMAX, X, INCX, BETA, Y,
      $                  INCY, YT, G, YY, EPS, ERR, FATAL, NOUT, MV )
+      IMPLICIT NONE
 *
 *  Checks the results of the computational tests.
 *
@@ -2753,7 +2779,10 @@ SUBROUTINE DMVCH( TRANS, M, N, ALPHA, A, NMAX, X, INCX, BETA, Y,
 *     End of DMVCH.
 *
       END
+
+*  =====================================================================
       LOGICAL FUNCTION LDE( RI, RJ, LR )
+      IMPLICIT NONE
 *
 *  Tests if two arrays are identical.
 *
@@ -2783,7 +2812,10 @@ LOGICAL FUNCTION LDE( RI, RJ, LR )
 *     End of LDE.
 *
       END
+
+*  =====================================================================
       LOGICAL FUNCTION LDERES( TYPE, UPLO, M, N, AA, AS, LDA )
+      IMPLICIT NONE
 *
 *  Tests if selected elements in two arrays are equal.
 *
@@ -2843,7 +2875,10 @@ LOGICAL FUNCTION LDERES( TYPE, UPLO, M, N, AA, AS, LDA )
 *     End of LDERES.
 *
       END
+
+*  =====================================================================
       DOUBLE PRECISION FUNCTION DBEG( RESET )
+      IMPLICIT NONE
 *
 *  Generates random numbers uniformly distributed between -0.5 and 0.5.
 *
@@ -2889,7 +2924,10 @@ DOUBLE PRECISION FUNCTION DBEG( RESET )
 *     End of DBEG.
 *
       END
+
+*  =====================================================================
       DOUBLE PRECISION FUNCTION DDIFF( X, Y )
+      IMPLICIT NONE
 *
 *  Auxiliary routine for test program for Level 2 Blas.
 *
diff --git a/CBLAS/testing/c_dblat3.f b/CBLAS/testing/c_dblat3.f
index 72ad80c925..9d8f0bb819 100644
--- a/CBLAS/testing/c_dblat3.f
+++ b/CBLAS/testing/c_dblat3.f
@@ -1,10 +1,12 @@
+*  =====================================================================
       PROGRAM DBLAT3
+      IMPLICIT NONE
 *
 *  Test program for the DOUBLE PRECISION Level 3 Blas.
 *
 *  The program must be driven by a short data file. The first 13 records
 *  of the file are read using list-directed input, the last 6 records
-*  are read using the format ( A12, L2 ). An annotated example of a data
+*  are read using the format ( A13, L2 ). An annotated example of a data
 *  file can be obtained by deleting the first 3 characters from the
 *  following 19 lines:
 *  'DBLAT3.SNAP'     NAME OF SNAPSHOT OUTPUT FILE
@@ -20,12 +22,13 @@ PROGRAM DBLAT3
 *  0.0 1.0 0.7       VALUES OF ALPHA
 *  3                 NUMBER OF VALUES OF BETA
 *  0.0 1.0 1.3       VALUES OF BETA
-*  cblas_dgemm  T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_dsymm  T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_dtrmm  T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_dtrsm  T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_dsyrk  T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_dsyr2k T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_dgemm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_dsymm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_dtrmm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_dtrsm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_dsyrk   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_dsyr2k  T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_dgemmtr T PUT F FOR NO TEST. SAME COLUMNS.
 *
 *  See:
 *
@@ -46,7 +49,7 @@ PROGRAM DBLAT3
       INTEGER            NIN, NOUT
       PARAMETER          ( NIN = 5, NOUT = 6 )
       INTEGER            NSUBS
-      PARAMETER          ( NSUBS = 6 )
+      PARAMETER          ( NSUBS = 7 )
       DOUBLE PRECISION   ZERO, HALF, ONE
       PARAMETER          ( ZERO = 0.0D0, HALF = 0.5D0, ONE = 1.0D0 )
       INTEGER            NMAX
@@ -56,11 +59,11 @@ PROGRAM DBLAT3
 *     .. Local Scalars ..
       DOUBLE PRECISION   EPS, ERR, THRESH
       INTEGER            I, ISNUM, J, N, NALF, NBET, NIDIM, NTRA,
-     $			          LAYOUT
+     $                    LAYOUT
       LOGICAL            FATAL, LTESTT, REWI, SAME, SFATAL, TRACE,
      $                   TSTERR, CORDER, RORDER
       CHARACTER*1        TRANSA, TRANSB
-      CHARACTER*12       SNAMET
+      CHARACTER*13       SNAMET
       CHARACTER*32       SNAPS
 *     .. Local Arrays ..
       DOUBLE PRECISION   AA( NMAX*NMAX ), AB( NMAX, 2*NMAX ),
@@ -71,27 +74,27 @@ PROGRAM DBLAT3
      $                   G( NMAX ), W( 2*NMAX )
       INTEGER            IDIM( NIDMAX )
       LOGICAL            LTEST( NSUBS )
-      CHARACTER*12       SNAMES( NSUBS )
+      CHARACTER*13       SNAMES( NSUBS )
 *     .. External Functions ..
       DOUBLE PRECISION   DDIFF
       LOGICAL            LDE
       EXTERNAL           DDIFF, LDE
 *     .. External Subroutines ..
       EXTERNAL           DCHK1, DCHK2, DCHK3, DCHK4, DCHK5, CD3CHKE,
-     $			 DMMCH
+     $           DMMCH
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
-      LOGICAL             OK
-      CHARACTER*12       SRNAMT
+      LOGICAL            LERR,  OK
+      CHARACTER*13       SRNAMT
 *     .. Common blocks ..
-      COMMON             /INFOC/INFOT, NOUTC, OK
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
       COMMON             /SRNAMC/SRNAMT
 *     .. Data statements ..
       DATA               SNAMES/'cblas_dgemm ', 'cblas_dsymm ',
      $                   'cblas_dtrmm ', 'cblas_dtrsm ','cblas_dsyrk ',
-     $                   'cblas_dsyr2k'/
+     $                   'cblas_dsyr2k', 'cblas_dgemmtr'/
 *     .. Executable Statements ..
 *
 *     Read name and unit number for summary output file and open file.
@@ -289,7 +292,7 @@ PROGRAM DBLAT3
             INFOT = 0
             OK = .TRUE.
             FATAL = .FALSE.
-            GO TO ( 140, 150, 160, 160, 170, 180 )ISNUM
+            GO TO ( 140, 150, 160, 160, 170, 180, 185 )ISNUM
 *           Test DGEMM, 01.
   140       IF (CORDER) THEN
             CALL DCHK1( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
@@ -323,13 +326,13 @@ PROGRAM DBLAT3
             CALL DCHK3( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NMAX, AB,
      $                  AA, AS, AB( 1, NMAX + 1 ), BB, BS, CT, G, C,
-     $			0 )
+     $          0 )
             END IF
             IF (RORDER) THEN
             CALL DCHK3( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NMAX, AB,
      $                  AA, AS, AB( 1, NMAX + 1 ), BB, BS, CT, G, C,
-     $			1 )
+     $          1 )
             END IF
             GO TO 190
 *           Test DSYRK, 05.
@@ -351,15 +354,30 @@ PROGRAM DBLAT3
             CALL DCHK5( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
      $                  NMAX, AB, AA, AS, BB, BS, C, CC, CS, CT, G, W,
-     $			0 )
+     $          0 )
             END IF
             IF (RORDER) THEN
             CALL DCHK5( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
      $                  NMAX, AB, AA, AS, BB, BS, C, CC, CS, CT, G, W,
-     $			1 )
+     $          1 )
             END IF
             GO TO 190
+*           Test DGEMMTR, 07.
+  185       IF (CORDER) THEN
+            CALL DCHK6( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
+     $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
+     $                  NMAX, AB, AA, AS, AB( 1, NMAX + 1 ), BB, BS, C,
+     $                  CC, CS, CT, G, 0 )
+            END IF
+            IF (RORDER) THEN
+            CALL DCHK6( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
+     $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
+     $                  NMAX, AB, AA, AS, AB( 1, NMAX + 1 ), BB, BS, C,
+     $                  CC, CS, CT, G, 1 )
+            END IF
+            GO TO 190
+
 *
   190       IF( FATAL.AND.SFATAL )
      $         GO TO 210
@@ -397,7 +415,7 @@ PROGRAM DBLAT3
  9992 FORMAT( '   FOR BETA           ', 7F6.1 )
  9991 FORMAT( ' AMEND DATA FILE OR INCREASE ARRAY SIZES IN PROGRAM',
      $      /' ******* TESTS ABANDONED *******' )
- 9990 FORMAT( ' SUBPROGRAM NAME ', A12,' NOT RECOGNIZED', /' ******* T',
+ 9990 FORMAT( ' SUBPROGRAM NAME ', A13,' NOT RECOGNIZED', /' ******* T',
      $      'ESTS ABANDONED *******' )
  9989 FORMAT( ' ERROR IN DMMCH -  IN-LINE DOT PRODUCTS ARE BEING EVALU',
      $      'ATED WRONGLY.', /' DMMCH WAS CALLED WITH TRANSA = ', A1,
@@ -405,8 +423,8 @@ PROGRAM DBLAT3
      $      'ERR = ', F12.3, '.', /' THIS MAY BE DUE TO FAULTS IN THE ',
      $      'ARITHMETIC OR THE COMPILER.', /' ******* TESTS ABANDONED ',
      $      '*******' )
- 9988 FORMAT( A12,L2 )
- 9987 FORMAT( 1X, A12,' WAS NOT TESTED' )
+ 9988 FORMAT( A13,L2 )
+ 9987 FORMAT( 1X, A13,' WAS NOT TESTED' )
  9986 FORMAT( /' END OF TESTS' )
  9985 FORMAT( /' ******* FATAL ERROR - TESTS ABANDONED *******' )
  9984 FORMAT( ' ERROR-EXITS WILL NOT BE TESTED' )
@@ -414,9 +432,12 @@ PROGRAM DBLAT3
 *     End of DBLAT3.
 *
       END
+
+*  =====================================================================
       SUBROUTINE DCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G, IORDER)
+      IMPLICIT NONE
 *
 *  Tests DGEMM.
 *
@@ -435,7 +456,7 @@ SUBROUTINE DCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12       SNAME
+      CHARACTER*13       SNAME
 *     .. Array Arguments ..
       DOUBLE PRECISION   A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -462,9 +483,9 @@ SUBROUTINE DCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       INTRINSIC          MAX
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
-      LOGICAL             OK
+      LOGICAL            LERR, OK
 *     .. Common blocks ..
-      COMMON             /INFOC/INFOT, NOUTC, OK
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
 *     .. Data statements ..
       DATA               ICH/'NTC'/
 *     .. Executable Statements ..
@@ -588,7 +609,7 @@ SUBROUTINE DCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                        REWIND NTRA
                            CALL CDGEMM( IORDER, TRANSA, TRANSB, M, N,
      $                                   K, ALPHA, AA, LDA, BB, LDB,
-     $					 BETA, CC, LDC )
+     $                   BETA, CC, LDC )
 *
 *                          Check if error-exit was taken incorrectly.
 *
@@ -681,20 +702,20 @@ SUBROUTINE DCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   130 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A12,'(''', A1, ''',''', A1, ''',',
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(''', A1, ''',''', A1, ''',',
      $      3( I3, ',' ), F4.1, ', A,', I3, ', B,', I3, ',', F4.1, ', ',
      $      'C,', I3, ').' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -703,12 +724,16 @@ SUBROUTINE DCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of DCHK1.
 *
       END
+
+*  =====================================================================
       SUBROUTINE DPRCN1(NOUT, NC, SNAME, IORDER, TRANSA, TRANSB, M, N,
      $                 K, ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, M, N, K, LDA, LDB, LDC
       DOUBLE PRECISION ALPHA, BETA
       CHARACTER*1      TRANSA, TRANSB
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CTA,CTB
 
       IF (TRANSA.EQ.'N')THEN
@@ -733,14 +758,16 @@ SUBROUTINE DPRCN1(NOUT, NC, SNAME, IORDER, TRANSA, TRANSB, M, N,
       WRITE(NOUT, FMT = 9995)NC,SNAME,CRC, CTA,CTB
       WRITE(NOUT, FMT = 9994)M, N, K, ALPHA, LDA, LDB, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', A14, ',', A14, ',', A14, ',')
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', A14, ',', A14, ',', A14, ',')
  9994 FORMAT( 20X, 3( I3, ',' ), F4.1, ', A,', I3, ', B,', I3, ',',
      $ F4.1, ', ', 'C,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE DCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G, IORDER)
+      IMPLICIT NONE
 *
 *  Tests DSYMM.
 *
@@ -759,7 +786,7 @@ SUBROUTINE DCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12       SNAME
+      CHARACTER*13       SNAME
 *     .. Array Arguments ..
       DOUBLE PRECISION   A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -786,9 +813,9 @@ SUBROUTINE DCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       INTRINSIC          MAX
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
-      LOGICAL             OK
+      LOGICAL            LERR, OK
 *     .. Common blocks ..
-      COMMON             /INFOC/INFOT, NOUTC, OK
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
 *     .. Data statements ..
       DATA               ICHS/'LR'/, ICHU/'UL'/
 *     .. Executable Statements ..
@@ -994,20 +1021,20 @@ SUBROUTINE DCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   120 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ', B,', I3, ',', F4.1, ', C,', I3, ')   ',
      $      ' .' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1016,13 +1043,16 @@ SUBROUTINE DCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of DCHK2.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE DPRCN2(NOUT, NC, SNAME, IORDER, SIDE, UPLO, M, N,
      $                 ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, M, N, LDA, LDB, LDC
       DOUBLE PRECISION ALPHA, BETA
       CHARACTER*1      SIDE, UPLO
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CS,CU
 
       IF (SIDE.EQ.'L')THEN
@@ -1043,14 +1073,16 @@ SUBROUTINE DPRCN2(NOUT, NC, SNAME, IORDER, SIDE, UPLO, M, N,
       WRITE(NOUT, FMT = 9995)NC,SNAME,CRC, CS,CU
       WRITE(NOUT, FMT = 9994)M, N, ALPHA, LDA, LDB, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', A14, ',', A14, ',', A14, ',')
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', A14, ',', A14, ',', A14, ',')
  9994 FORMAT( 20X, 2( I3, ',' ), F4.1, ', A,', I3, ', B,', I3, ',',
      $ F4.1, ', ', 'C,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE DCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NMAX, A, AA, AS,
      $                  B, BB, BS, CT, G, C, IORDER )
+      IMPLICIT NONE
 *
 *  Tests DTRMM and DTRSM.
 *
@@ -1069,7 +1101,7 @@ SUBROUTINE DCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12       SNAME
+      CHARACTER*13       SNAME
 *     .. Array Arguments ..
       DOUBLE PRECISION   A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1097,9 +1129,9 @@ SUBROUTINE DCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       INTRINSIC          MAX
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
-      LOGICAL             OK
+      LOGICAL            LERR, OK
 *     .. Common blocks ..
-      COMMON             /INFOC/INFOT, NOUTC, OK
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
 *     .. Data statements ..
       DATA               ICHU/'UL'/, ICHT/'NTC'/, ICHD/'UN'/, ICHS/'LR'/
 *     .. Executable Statements ..
@@ -1201,7 +1233,7 @@ SUBROUTINE DCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                           REWIND NTRA
                               CALL CDTRMM( IORDER, SIDE, UPLO, TRANSA,
      $                                    DIAG, M, N, ALPHA, AA, LDA,
-     $					  BB, LDB )
+     $                    BB, LDB )
                            ELSE IF( SNAME( 10: 11 ).EQ.'sm' )THEN
                               IF( TRACE )
      $                           CALL DPRCN3( NTRA, NC, SNAME, IORDER,
@@ -1211,7 +1243,7 @@ SUBROUTINE DCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                           REWIND NTRA
                               CALL CDTRSM( IORDER, SIDE, UPLO, TRANSA,
      $                                    DIAG, M, N, ALPHA, AA, LDA,
-     $					  BB, LDB )
+     $                    BB, LDB )
                            END IF
 *
 *                          Check if error-exit was taken incorrectly.
@@ -1342,20 +1374,20 @@ SUBROUTINE DCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   160 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A12,'(', 4( '''', A1, ''',' ), 2( I3, ',' ),
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', 4( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ', B,', I3, ')        .' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
      $      '******' )
@@ -1363,13 +1395,16 @@ SUBROUTINE DCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of DCHK3.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE DPRCN3(NOUT, NC, SNAME, IORDER, SIDE, UPLO, TRANSA,
      $                 DIAG, M, N, ALPHA, LDA, LDB)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, M, N, LDA, LDB
       DOUBLE PRECISION ALPHA
       CHARACTER*1      SIDE, UPLO, TRANSA, DIAG
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CS, CU, CA, CD
 
       IF (SIDE.EQ.'L')THEN
@@ -1402,14 +1437,16 @@ SUBROUTINE DPRCN3(NOUT, NC, SNAME, IORDER, SIDE, UPLO, TRANSA,
       WRITE(NOUT, FMT = 9995)NC,SNAME,CRC, CS,CU
       WRITE(NOUT, FMT = 9994)CA, CD, M, N, ALPHA, LDA, LDB
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', A14, ',', A14, ',', A14, ',')
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', A14, ',', A14, ',', A14, ',')
  9994 FORMAT( 22X, 2( A14, ',') , 2( I3, ',' ),
      $      F4.1, ', A,', I3, ', B,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE DCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G, IORDER)
+      IMPLICIT NONE
 *
 *  Tests DSYRK.
 *
@@ -1428,7 +1465,7 @@ SUBROUTINE DCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12       SNAME
+      CHARACTER*13       SNAME
 *     .. Array Arguments ..
       DOUBLE PRECISION   A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1456,9 +1493,9 @@ SUBROUTINE DCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       INTRINSIC          MAX
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
-      LOGICAL             OK
+      LOGICAL            LERR, OK
 *     .. Common blocks ..
-      COMMON             /INFOC/INFOT, NOUTC, OK
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
 *     .. Data statements ..
       DATA               ICHT/'NTC'/, ICHU/'UL'/
 *     .. Executable Statements ..
@@ -1667,21 +1704,21 @@ SUBROUTINE DCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   130 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
  9995 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
- 9994 FORMAT( 1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9994 FORMAT( 1X, I6, ': ', A13,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ',', F4.1, ', C,', I3, ')           .' )
  9993 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
      $      '******' )
@@ -1689,13 +1726,16 @@ SUBROUTINE DCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of DCHK4.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE DPRCN4(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
      $                 N, K, ALPHA, LDA, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, N, K, LDA, LDC
       DOUBLE PRECISION ALPHA, BETA
       CHARACTER*1      UPLO, TRANSA
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CU, CA
 
       IF (UPLO.EQ.'U')THEN
@@ -1718,15 +1758,17 @@ SUBROUTINE DPRCN4(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
       WRITE(NOUT, FMT = 9995)NC, SNAME, CRC, CU, CA
       WRITE(NOUT, FMT = 9994)N, K, ALPHA, LDA, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', 3( A14, ',') )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', 3( A14, ',') )
  9994 FORMAT( 20X, 2( I3, ',' ),
      $      F4.1, ', A,', I3, ',', F4.1, ', C,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE DCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  AB, AA, AS, BB, BS, C, CC, CS, CT, G, W,
-     $			IORDER )
+     $          IORDER )
+      IMPLICIT NONE
 *
 *  Tests DSYR2K.
 *
@@ -1745,7 +1787,7 @@ SUBROUTINE DCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12       SNAME
+      CHARACTER*13       SNAME
 *     .. Array Arguments ..
       DOUBLE PRECISION   AA( NMAX*NMAX ), AB( 2*NMAX*NMAX ),
      $                   ALF( NALF ), AS( NMAX*NMAX ), BB( NMAX*NMAX ),
@@ -1773,9 +1815,9 @@ SUBROUTINE DCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       INTRINSIC          MAX
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
-      LOGICAL             OK
+      LOGICAL            LERR, OK
 *     .. Common blocks ..
-      COMMON             /INFOC/INFOT, NOUTC, OK
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
 *     .. Data statements ..
       DATA               ICHT/'NTC'/, ICHU/'UL'/
 *     .. Executable Statements ..
@@ -1888,7 +1930,7 @@ SUBROUTINE DCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                     REWIND NTRA
                         CALL CDSYR2K( IORDER, UPLO, TRANS, N, K,
      $                               ALPHA, AA, LDA, BB, LDB, BETA,
-     $				     CC, LDC )
+     $                   CC, LDC )
 *
 *                       Check if error-exit was taken incorrectly.
 *
@@ -2023,21 +2065,21 @@ SUBROUTINE DCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   160 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
  9995 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
- 9994 FORMAT( 1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9994 FORMAT( 1X, I6, ': ', A13,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ', B,', I3, ',', F4.1, ', C,', I3, ')   ',
      $      ' .' )
  9993 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -2046,13 +2088,16 @@ SUBROUTINE DCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of DCHK5.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE DPRCN5(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
      $                 N, K, ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, N, K, LDA, LDB, LDC
       DOUBLE PRECISION ALPHA, BETA
       CHARACTER*1      UPLO, TRANSA
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CU, CA
 
       IF (UPLO.EQ.'U')THEN
@@ -2075,13 +2120,15 @@ SUBROUTINE DPRCN5(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
       WRITE(NOUT, FMT = 9995)NC, SNAME, CRC, CU, CA
       WRITE(NOUT, FMT = 9994)N, K, ALPHA, LDA, LDB, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', 3( A14, ',') )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', 3( A14, ',') )
  9994 FORMAT( 20X, 2( I3, ',' ),
      $      F4.1, ', A,', I3, ', B', I3, ',', F4.1, ', C,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE DMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, RESET,
      $                  TRANSL )
+      IMPLICIT NONE
 *
 *  Generates values for an M by N matrix A.
 *  Stores the values in the array AA in the data structure required
@@ -2193,9 +2240,12 @@ SUBROUTINE DMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, RESET,
 *     End of DMAKE.
 *
       END
+
+*  =====================================================================
       SUBROUTINE DMMCH( TRANSA, TRANSB, M, N, KK, ALPHA, A, LDA, B, LDB,
      $                  BETA, C, LDC, CT, G, CC, LDCC, EPS, ERR, FATAL,
      $                  NOUT, MV )
+      IMPLICIT NONE
 *
 *  Checks the results of the computational tests.
 *
@@ -2315,7 +2365,10 @@ SUBROUTINE DMMCH( TRANSA, TRANSB, M, N, KK, ALPHA, A, LDA, B, LDB,
 *     End of DMMCH.
 *
       END
+
+*  =====================================================================
       LOGICAL FUNCTION LDE( RI, RJ, LR )
+      IMPLICIT NONE
 *
 *  Tests if two arrays are identical.
 *
@@ -2347,7 +2400,10 @@ LOGICAL FUNCTION LDE( RI, RJ, LR )
 *     End of LDE.
 *
       END
+
+*  =====================================================================
       LOGICAL FUNCTION LDERES( TYPE, UPLO, M, N, AA, AS, LDA )
+      IMPLICIT NONE
 *
 *  Tests if selected elements in two arrays are equal.
 *
@@ -2409,7 +2465,10 @@ LOGICAL FUNCTION LDERES( TYPE, UPLO, M, N, AA, AS, LDA )
 *     End of LDERES.
 *
       END
+
+*  =====================================================================
       DOUBLE PRECISION FUNCTION DBEG( RESET )
+      IMPLICIT NONE
 *
 *  Generates random numbers uniformly distributed between -0.5 and 0.5.
 *
@@ -2455,7 +2514,10 @@ DOUBLE PRECISION FUNCTION DBEG( RESET )
 *     End of DBEG.
 *
       END
+
+*  =====================================================================
       DOUBLE PRECISION FUNCTION DDIFF( X, Y )
+      IMPLICIT NONE
 *
 *  Auxiliary routine for test program for Level 3 Blas.
 *
@@ -2474,3 +2536,482 @@ DOUBLE PRECISION FUNCTION DDIFF( X, Y )
 *     End of DDIFF.
 *
       END
+
+*  =====================================================================
+      SUBROUTINE DCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
+     $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
+     $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G,
+     $                  IORDER)
+      IMPLICIT NONE
+*
+*  Tests DGEMMTR.
+*
+*  Auxiliary routine for test program for Level 3 Blas.
+*
+*  -- Written on 19-July-2023.
+*     Martin Koehler, MPI Magdeburg
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO
+      PARAMETER          ( ZERO = 0.0D0 )
+*     .. Scalar Arguments ..
+      DOUBLE PRECISION   EPS, THRESH
+      INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
+      LOGICAL            FATAL, REWI, TRACE
+      CHARACTER*13        SNAME
+*     .. Array Arguments ..
+      DOUBLE PRECISION   A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
+     $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
+     $                   BB( NMAX*NMAX ), BET( NBET ), BS( NMAX*NMAX ),
+     $                   C( NMAX, NMAX ), CC( NMAX*NMAX ),
+     $                   CS( NMAX*NMAX ), CT( NMAX ), G( NMAX )
+      INTEGER            IDIM( NIDIM )
+*     .. Local Scalars ..
+      DOUBLE PRECISION   ALPHA, ALS, BETA, BLS, ERR, ERRMAX
+      INTEGER            I, IA, IB, ICA, ICB, IK, IN, K, KS, LAA,
+     $                   LBB, LCC, LDA, LDAS, LDB, LDBS, LDC, LDCS,
+     $                   MA, MB, N, NA, NARGS, NB, NC, NS, IS
+      LOGICAL            NULL, RESET, SAME, TRANA, TRANB
+      CHARACTER*1        TRANAS, TRANBS, TRANSA, TRANSB, UPLO, UPLOS
+      CHARACTER*3        ICH
+      CHARACTER*2        ISHAPE
+*     .. Local Arrays ..
+      LOGICAL            ISAME( 13 )
+*     .. External Functions ..
+      LOGICAL            LDE, LDERES
+      EXTERNAL           LDE, LDERES
+*     .. External Subroutines ..
+      EXTERNAL           CDGEMMTR, DMAKE, DMMTCH
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX
+*     .. Scalars in Common ..
+      INTEGER            INFOT, NOUTC
+      LOGICAL            LERR, OK
+*     .. Common blocks ..
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
+*     .. Data statements ..
+      DATA               ICH/'NTC'/
+      DATA               ISHAPE/'UL'/
+*     .. Executable Statements ..
+*
+      NARGS = 13
+      NC = 0
+      RESET = .TRUE.
+      ERRMAX = ZERO
+*
+      DO 100 IN = 1, NIDIM
+         N = IDIM( IN )
+*        Set LDC to 1 more than minimum value if room.
+         LDC = N
+         IF( LDC.LT.NMAX )
+     $      LDC = LDC + 1
+*        Skip tests if not enough room.
+         IF( LDC.GT.NMAX )
+     $      GO TO 100
+         LCC = LDC*N
+         NULL = N.LE.0
+*
+         DO 90 IK = 1, NIDIM
+            K = IDIM( IK )
+*
+            DO 80 ICA = 1, 3
+               TRANSA = ICH( ICA: ICA )
+               TRANA = TRANSA.EQ.'T'.OR.TRANSA.EQ.'C'
+*
+               IF( TRANA )THEN
+                  MA = K
+                  NA = N
+               ELSE
+                  MA = N
+                  NA = K
+               END IF
+*              Set LDA to 1 more than minimum value if room.
+               LDA = MA
+               IF( LDA.LT.NMAX )
+     $            LDA = LDA + 1
+*              Skip tests if not enough room.
+               IF( LDA.GT.NMAX )
+     $            GO TO 80
+               LAA = LDA*NA
+*
+*              Generate the matrix A.
+*
+               CALL DMAKE( 'GE', ' ', ' ', MA, NA, A, NMAX, AA, LDA,
+     $                     RESET, ZERO )
+*
+               DO 70 ICB = 1, 3
+                  TRANSB = ICH( ICB: ICB )
+                  TRANB = TRANSB.EQ.'T'.OR.TRANSB.EQ.'C'
+*
+                  IF( TRANB )THEN
+                     MB = N
+                     NB = K
+                  ELSE
+                     MB = K
+                     NB = N
+                  END IF
+*                 Set LDB to 1 more than minimum value if room.
+                  LDB = MB
+                  IF( LDB.LT.NMAX )
+     $               LDB = LDB + 1
+*                 Skip tests if not enough room.
+                  IF( LDB.GT.NMAX )
+     $               GO TO 70
+                  LBB = LDB*NB
+*
+*                 Generate the matrix B.
+*
+                  CALL DMAKE( 'GE', ' ', ' ', MB, NB, B, NMAX, BB,
+     $                        LDB, RESET, ZERO )
+*
+                  DO 60 IA = 1, NALF
+                     ALPHA = ALF( IA )
+*
+                     DO 50 IB = 1, NBET
+                        BETA = BET( IB )
+
+                        DO 45 IS = 1, 2
+                           UPLO = ISHAPE( IS: IS )
+
+*
+*                          Generate the matrix C.
+*
+                           CALL DMAKE( 'GE', UPLO, ' ', N, N, C,
+     $                                 NMAX, CC, LDC, RESET, ZERO )
+*
+                           NC = NC + 1
+*
+*                          Save every datum before calling the
+*                          subroutine.
+*
+                           UPLOS = UPLO
+                           TRANAS = TRANSA
+                           TRANBS = TRANSB
+                           NS = N
+                           KS = K
+                           ALS = ALPHA
+                           DO 10 I = 1, LAA
+                              AS( I ) = AA( I )
+   10                      CONTINUE
+                           LDAS = LDA
+                           DO 20 I = 1, LBB
+                              BS( I ) = BB( I )
+   20                      CONTINUE
+                           LDBS = LDB
+                           BLS = BETA
+                           DO 30 I = 1, LCC
+                              CS( I ) = CC( I )
+   30                      CONTINUE
+                           LDCS = LDC
+*
+*                          Call the subroutine.
+*
+                           IF( TRACE )
+     $                        CALL DPRCN8(NTRA, NC, SNAME, IORDER, UPLO,
+     $                        TRANSA, TRANSB, N, K, ALPHA, LDA,
+     $                        LDB, BETA, LDC)
+                           IF( REWI )
+     $                        REWIND NTRA
+                           CALL CDGEMMTR( IORDER, UPLO, TRANSA, TRANSB,
+     $                                  N, K, ALPHA, AA, LDA, BB, LDB,
+     $                                  BETA, CC, LDC )
+*
+*                          Check if error-exit was taken incorrectly.
+*
+                           IF( .NOT.OK )THEN
+                              WRITE( NOUT, FMT = 9994 )
+                              FATAL = .TRUE.
+                              GO TO 120
+                           END IF
+*
+*                          See what data changed inside subroutines.
+*
+                           ISAME( 1 ) = UPLO.EQ.UPLOS
+                           ISAME( 2 ) = TRANSA.EQ.TRANAS
+                           ISAME( 3 ) = TRANSB.EQ.TRANBS
+                           ISAME( 4 ) = NS.EQ.N
+                           ISAME( 5 ) = KS.EQ.K
+                           ISAME( 6 ) = ALS.EQ.ALPHA
+                           ISAME( 7 ) = LDE( AS, AA, LAA )
+                           ISAME( 8 ) = LDAS.EQ.LDA
+                           ISAME( 9 ) = LDE( BS, BB, LBB )
+                           ISAME( 10 ) = LDBS.EQ.LDB
+                           ISAME( 11 ) = BLS.EQ.BETA
+                           IF( NULL )THEN
+                              ISAME( 12 ) = LDE( CS, CC, LCC )
+                           ELSE
+                              ISAME( 12 ) = LDERES( 'GE', ' ', N, N,
+     $                                          CS, CC, LDC )
+                           END IF
+                           ISAME( 13 ) = LDCS.EQ.LDC
+*
+*                          If data was incorrectly changed, report
+*                          and return.
+*
+                           SAME = .TRUE.
+                           DO 40 I = 1, NARGS
+                              SAME = SAME.AND.ISAME( I )
+                              IF( .NOT.ISAME( I ) )
+     $                           WRITE( NOUT, FMT = 9998 )I
+   40                      CONTINUE
+                           IF( .NOT.SAME )THEN
+                              FATAL = .TRUE.
+                              GO TO 120
+                           END IF
+*
+                           IF( .NOT.NULL )THEN
+*
+*                             Check the result.
+*
+                              CALL DMMTCH( UPLO, TRANSA, TRANSB,
+     $                                 N, K,
+     $                                 ALPHA, A, NMAX, B, NMAX, BETA,
+     $                                 C, NMAX, CT, G, CC, LDC, EPS,
+     $                                 ERR, FATAL, NOUT, .TRUE. )
+                              ERRMAX = MAX( ERRMAX, ERR )
+*                             If got really bad answer, report and
+*                             return.
+                              IF( FATAL )
+     $                           GO TO 120
+                           END IF
+*
+   45                   CONTINUE
+*
+   50                CONTINUE
+*
+   60             CONTINUE
+*
+   70          CONTINUE
+*
+   80       CONTINUE
+*
+   90    CONTINUE
+*
+  100 CONTINUE
+*
+*
+*     Report result.
+*
+      IF( ERRMAX.LT.THRESH )THEN
+         IF ( IORDER.EQ.0) WRITE( NOUT, FMT = 10000 )SNAME, NC
+         IF ( IORDER.EQ.1) WRITE( NOUT, FMT = 10001 )SNAME, NC
+      ELSE
+         IF ( IORDER.EQ.0) WRITE( NOUT, FMT = 10002 )SNAME, NC, ERRMAX
+         IF ( IORDER.EQ.1) WRITE( NOUT, FMT = 10003 )SNAME, NC, ERRMAX
+      END IF
+      GO TO 130
+*
+  120 CONTINUE
+      WRITE( NOUT, FMT = 9996 )SNAME
+      CALL DPRCN8(NOUT, NC, SNAME, IORDER, UPLO, TRANSA, TRANSB,
+     $           N, K, ALPHA, LDA, LDB, BETA, LDC)
+*
+  130 CONTINUE
+      RETURN
+*
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+     $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
+     $ 'RATIO ', F8.2, ' - SUSPECT *******' )
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+     $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
+     $ 'RATIO ', F8.2, ' - SUSPECT *******' )
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+     $ ' (', I6, ' CALL', 'S)' )
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+     $ ' (', I6, ' CALL', 'S)' )
+ 9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
+     $      'ANGED INCORRECTLY *******' )
+ 9997 FORMAT( ' ', A13, ' COMPLETED THE COMPUTATIONAL TESTS (', I6,
+     $      ' C', 'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO',
+     $      F8.2, ' - SUSPECT *******' )
+ 9996 FORMAT( ' ******* ', A13, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A13, '(''',A1, ''',''',A1, ''',''', A1,
+     $      ''',', 2( I3, ',' ), F4.1, ', A,', I3, ', B,', I3, ',',
+     $      F4.1, ', ', 'C,', I3, ').' )
+ 9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
+     $      '******' )
+*
+*     End of DCHK6
+*
+      END
+
+
+*  =====================================================================
+      SUBROUTINE DPRCN8(NOUT, NC, SNAME, IORDER, UPLO,
+     $                 TRANSA, TRANSB, N,
+     $                 K, ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
+
+      INTEGER          NOUT, NC, IORDER, N, K, LDA, LDB, LDC
+      DOUBLE PRECISION ALPHA, BETA
+      CHARACTER*1      TRANSA, TRANSB, UPLO
+      CHARACTER*13     SNAME
+      CHARACTER*14     CRC, CTA,CTB,CUPLO
+
+      IF (UPLO.EQ.'U') THEN
+          CUPLO = 'CblasUpper'
+      ELSE
+          CUPLO = 'CblasLower'
+      END IF
+      IF (TRANSA.EQ.'N')THEN
+         CTA = '  CblasNoTrans'
+      ELSE IF (TRANSA.EQ.'T')THEN
+         CTA = '    CblasTrans'
+      ELSE
+         CTA = 'CblasConjTrans'
+      END IF
+      IF (TRANSB.EQ.'N')THEN
+         CTB = '  CblasNoTrans'
+      ELSE IF (TRANSB.EQ.'T')THEN
+         CTB = '    CblasTrans'
+      ELSE
+         CTB = 'CblasConjTrans'
+      END IF
+      IF (IORDER.EQ.1)THEN
+         CRC = ' CblasRowMajor'
+      ELSE
+         CRC = ' CblasColMajor'
+      END IF
+      WRITE(NOUT, FMT = 9995)NC,SNAME,CRC, CUPLO, CTA,CTB
+      WRITE(NOUT, FMT = 9994)N, K, ALPHA, LDA, LDB, BETA, LDC
+
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', A14, ',', A14, ',', A14, ',',
+     $        A14, ',')
+ 9994 FORMAT( 10X, 2( I3, ',' ) ,' ', F4.1,' , A,',
+     $ I3, ', B,', I3, ', ', F4.1,' , C,', I3, ').' )
+      END
+
+*  =====================================================================
+      SUBROUTINE DMMTCH( UPLO, TRANSA, TRANSB, N, KK, ALPHA, A, LDA,
+     $                  B, LDB, BETA, C, LDC, CT, G, CC, LDCC, EPS, ERR,
+     $                  FATAL, NOUT, MV )
+      IMPLICIT NONE
+*
+*  Checks the results of the computational tests.
+*
+*  Auxiliary routine for test program for Level 3 Blas. (DGEMMTR)
+*
+*  -- Written on 19-July-2023.
+*     Martin Koehler, MPI Magdeburg
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+*     .. Scalar Arguments ..
+      DOUBLE PRECISION   ALPHA, BETA, EPS, ERR
+      INTEGER            KK, LDA, LDB, LDC, LDCC, N, NOUT
+      LOGICAL            FATAL, MV
+      CHARACTER*1        UPLO, TRANSA, TRANSB
+*     .. Array Arguments ..
+      DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), C( LDC, * ),
+     $                   CC( LDCC, * ), CT( * ), G( * )
+*     .. Local Scalars ..
+      DOUBLE PRECISION   ERRI
+      INTEGER            I, J, K, ISTART, ISTOP
+      LOGICAL            TRANA, TRANB, UPPER
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, SQRT
+*     .. Executable Statements ..
+      UPPER = UPLO.EQ.'U'
+      TRANA = TRANSA.EQ.'T'.OR.TRANSA.EQ.'C'
+      TRANB = TRANSB.EQ.'T'.OR.TRANSB.EQ.'C'
+*
+*     Compute expected result, one column at a time, in CT using data
+*     in A, B and C.
+*     Compute gauges in G.
+*
+      ISTART = 1
+      ISTOP  = N
+
+      DO 120 J = 1, N
+*
+         IF ( UPPER ) THEN
+             ISTART = 1
+             ISTOP = J
+         ELSE
+             ISTART = J
+             ISTOP = N
+         END IF
+         DO 10 I = ISTART, ISTOP
+            CT( I ) = ZERO
+            G( I ) = ZERO
+   10    CONTINUE
+         IF( .NOT.TRANA.AND..NOT.TRANB )THEN
+            DO 30 K = 1, KK
+               DO 20 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( I, K )*B( K, J )
+                  G( I ) = G( I ) + ABS( A( I, K ) )*ABS( B( K, J ) )
+   20          CONTINUE
+   30       CONTINUE
+         ELSE IF( TRANA.AND..NOT.TRANB )THEN
+            DO 50 K = 1, KK
+               DO 40 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( K, I )*B( K, J )
+                  G( I ) = G( I ) + ABS( A( K, I ) )*ABS( B( K, J ) )
+   40          CONTINUE
+   50       CONTINUE
+         ELSE IF( .NOT.TRANA.AND.TRANB )THEN
+            DO 70 K = 1, KK
+               DO 60 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( I, K )*B( J, K )
+                  G( I ) = G( I ) + ABS( A( I, K ) )*ABS( B( J, K ) )
+   60          CONTINUE
+   70       CONTINUE
+         ELSE IF( TRANA.AND.TRANB )THEN
+            DO 90 K = 1, KK
+               DO 80 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( K, I )*B( J, K )
+                  G( I ) = G( I ) + ABS( A( K, I ) )*ABS( B( J, K ) )
+   80          CONTINUE
+   90       CONTINUE
+         END IF
+         DO 100 I = ISTART, ISTOP
+            CT( I ) = ALPHA*CT( I ) + BETA*C( I, J )
+            G( I ) = ABS( ALPHA )*G( I ) + ABS( BETA )*ABS( C( I, J ) )
+  100    CONTINUE
+*
+*        Compute the error ratio for this result.
+*
+         ERR = ZERO
+         DO 110 I = ISTART, ISTOP
+            ERRI = ABS( CT( I ) - CC( I, J ) )/EPS
+            IF( G( I ).NE.ZERO )
+     $         ERRI = ERRI/G( I )
+            ERR = MAX( ERR, ERRI )
+            IF( ERR*SQRT( EPS ).GE.ONE )
+     $         GO TO 130
+  110    CONTINUE
+*
+  120 CONTINUE
+*
+*     If the loop completes, all results are at least half accurate.
+      GO TO 150
+*
+*     Report fatal error.
+*
+  130 FATAL = .TRUE.
+      WRITE( NOUT, FMT = 9999 )
+      DO 140 I = ISTART, ISTOP
+         IF( MV )THEN
+            WRITE( NOUT, FMT = 9998 )I, CT( I ), CC( I, J )
+         ELSE
+            WRITE( NOUT, FMT = 9998 )I, CC( I, J ), CT( I )
+         END IF
+  140 CONTINUE
+      IF( N.GT.1 )
+     $   WRITE( NOUT, FMT = 9997 )J
+*
+  150 CONTINUE
+      RETURN
+*
+ 9999 FORMAT( ' ******* FATAL ERROR - COMPUTED RESULT IS LESS THAN HAL',
+     $      'F ACCURATE *******', /'           EXPECTED RESULT   COMPU',
+     $      'TED RESULT' )
+ 9998 FORMAT( 1X, I7, 2G18.6 )
+ 9997 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
+*
+*     End of DMMTCH
+*
+      END
+
+
diff --git a/CBLAS/testing/c_s2chke.c b/CBLAS/testing/c_s2chke.c
index a781bd505f..81d4c2104e 100644
--- a/CBLAS/testing/c_s2chke.c
+++ b/CBLAS/testing/c_s2chke.c
@@ -3,34 +3,42 @@
 #include "cblas.h"
 #include "cblas_test.h"
 
-int cblas_ok, cblas_lerr, cblas_info;
-int link_xerbla=TRUE;
+CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
+CBLAS_INT link_xerbla=TRUE;
 char *cblas_rout;
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo);
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
-void F77_xerbla(char *srname, void *vinfo);
+void F77_xerbla(char *srname, void *vinfo
 #endif
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN
+#endif
+);
 
 void chkxer(void) {
-   extern int cblas_ok, cblas_lerr, cblas_info;
-   extern int link_xerbla;
+   extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
+   extern CBLAS_INT link_xerbla;
    extern char *cblas_rout;
    if (cblas_lerr == 1 ) {
-      printf("***** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s *****\n", cblas_info, cblas_rout);
+      printf("***** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s *****\n", (int) cblas_info, cblas_rout);
       cblas_ok = 0 ;
    }
    cblas_lerr = 1 ;
 }
 
-void F77_s2chke(char *rout) {
+void F77_s2chke(char *rout
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rout_len
+#endif
+) {
    char *sf = ( rout ) ;
    float  A[2] = {0.0,0.0},
           X[2] = {0.0,0.0},
           Y[2] = {0.0,0.0},
           ALPHA=0.0, BETA=0.0;
-   extern int cblas_info, cblas_lerr, cblas_ok;
+   extern CBLAS_INT cblas_info, cblas_lerr, cblas_ok;
    extern int RowMajorStrg;
    extern char *cblas_rout;
 
@@ -38,10 +46,11 @@ void F77_s2chke(char *rout) {
    if (link_xerbla) /* call these first to link */
    {
       cblas_xerbla(cblas_info,cblas_rout,"");
-      F77_xerbla(cblas_rout,&cblas_info);
+      F77_xerbla(cblas_rout,&cblas_info, 1);
    }
 #endif
 
+   link_xerbla = 0;
    cblas_ok = TRUE ;
    cblas_lerr = PASSED ;
 
diff --git a/CBLAS/testing/c_s3chke.c b/CBLAS/testing/c_s3chke.c
index 425d6a7023..38b2bc1a3c 100644
--- a/CBLAS/testing/c_s3chke.c
+++ b/CBLAS/testing/c_s3chke.c
@@ -3,34 +3,43 @@
 #include "cblas.h"
 #include "cblas_test.h"
 
-int cblas_ok, cblas_lerr, cblas_info;
-int link_xerbla=TRUE;
+CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
+CBLAS_INT link_xerbla=TRUE;
 char *cblas_rout;
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo);
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
-void F77_xerbla(char *srname, void *vinfo);
+void F77_xerbla(char *srname, void *vinfo
 #endif
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN srname_len
+#endif
+);
 
 void chkxer(void) {
-   extern int cblas_ok, cblas_lerr, cblas_info;
-   extern int link_xerbla;
+   extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
+   extern CBLAS_INT link_xerbla;
    extern char *cblas_rout;
    if (cblas_lerr == 1 ) {
-      printf("***** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s *****\n", cblas_info, cblas_rout);
+      printf("***** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s *****\n", (int) cblas_info, cblas_rout);
       cblas_ok = 0 ;
    }
    cblas_lerr = 1 ;
+
 }
 
-void F77_s3chke(char *rout) {
+void F77_s3chke(char *rout
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rout_len
+#endif
+) {
    char *sf = ( rout ) ;
    float  A[2] = {0.0,0.0},
           B[2] = {0.0,0.0},
           C[2] = {0.0,0.0},
           ALPHA=0.0, BETA=0.0;
-   extern int cblas_info, cblas_lerr, cblas_ok;
+   extern CBLAS_INT cblas_info, cblas_lerr, cblas_ok;
    extern int RowMajorStrg;
    extern char *cblas_rout;
 
@@ -38,14 +47,245 @@ void F77_s3chke(char *rout) {
    if (link_xerbla) /* call these first to link */
    {
       cblas_xerbla(cblas_info,cblas_rout,"");
-      F77_xerbla(cblas_rout,&cblas_info);
+      F77_xerbla(cblas_rout,&cblas_info, 1);
    }
 #endif
 
+   link_xerbla = 0;
    cblas_ok = TRUE ;
    cblas_lerr = PASSED ;
 
-   if (strncmp( sf,"cblas_sgemm"   ,11)==0) {
+   if (strncmp( sf,"cblas_sgemmtr"   ,13)==0) {
+      cblas_rout = "cblas_sgemmtr"   ;
+
+      cblas_info = 1;
+      cblas_sgemmtr( INVALID, CblasUpper, CblasNoTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_sgemmtr( INVALID, CblasUpper, CblasNoTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_sgemmtr( INVALID, CblasUpper,CblasTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_sgemmtr( INVALID, CblasUpper, CblasTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 1;
+      cblas_sgemmtr( INVALID, CblasLower, CblasNoTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_sgemmtr( INVALID, CblasLower, CblasNoTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_sgemmtr( INVALID, CblasLower,CblasTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_sgemmtr( INVALID, CblasLower, CblasTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 2; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  INVALID, CblasNoTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 2; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  INVALID, CblasNoTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 3; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, INVALID, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 3; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, INVALID, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 4; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor, CblasUpper,  CblasNoTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor, CblasUpper, CblasTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 1, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+
+      /* Row Major */
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasNoTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 9;  RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasTrans, 0, 2,
+                   ALPHA, A, 1, B, 2, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 1, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_sgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+
+   } else if (strncmp( sf,"cblas_sgemm"   ,11)==0) {
       cblas_rout = "cblas_sgemm"   ;
       cblas_info = 1;
       cblas_sgemm( INVALID,  CblasNoTrans, CblasNoTrans, 0, 0, 0,
@@ -1269,7 +1509,7 @@ void F77_s3chke(char *rout) {
       chkxer();
    }
    if (cblas_ok == TRUE )
-       printf(" %-12s PASSED THE TESTS OF ERROR-EXITS\n", cblas_rout);
+       printf(" %-13s PASSED THE TESTS OF ERROR-EXITS\n", cblas_rout);
    else
        printf("***** %s FAILED THE TESTS OF ERROR-EXITS *******\n",cblas_rout);
 }
diff --git a/CBLAS/testing/c_sblas1.c b/CBLAS/testing/c_sblas1.c
index 2e63d98148..133944afbc 100644
--- a/CBLAS/testing/c_sblas1.c
+++ b/CBLAS/testing/c_sblas1.c
@@ -8,42 +8,50 @@
  */
 #include "cblas_test.h"
 #include "cblas.h"
-float F77_sasum(const int *N, float *X, const int *incX)
+float F77_sasum(const CBLAS_INT *N, float *X, const CBLAS_INT *incX)
 {
    return cblas_sasum(*N, X, *incX);
 }
 
-void F77_saxpy(const int *N, const float *alpha, const float *X,
-                    const int *incX, float *Y, const int *incY)
+void F77_saxpy(const CBLAS_INT *N, const float *alpha, const float *X,
+                    const CBLAS_INT *incX, float *Y, const CBLAS_INT *incY)
 {
    cblas_saxpy(*N, *alpha, X, *incX, Y, *incY);
    return;
 }
 
-float F77_scasum(const int *N, void *X, const int *incX)
+void F77_saxpby(const CBLAS_INT *N, const float *alpha, const float *X,
+                    const CBLAS_INT *incX, const float *beta, float *Y, const CBLAS_INT *incY)
+{
+   cblas_saxpby(*N, *alpha, X, *incX, *beta, Y, *incY);
+   return;
+}
+
+
+float F77_scasum(const CBLAS_INT *N, void *X, const CBLAS_INT *incX)
 {
    return cblas_scasum(*N, X, *incX);
 }
 
-float F77_scnrm2(const int *N, const void *X, const int *incX)
+float F77_scnrm2(const CBLAS_INT *N, const void *X, const CBLAS_INT *incX)
 {
    return cblas_scnrm2(*N, X, *incX);
 }
 
-void F77_scopy(const int *N, const float *X, const int *incX,
-                    float *Y, const int *incY)
+void F77_scopy(const CBLAS_INT *N, const float *X, const CBLAS_INT *incX,
+                    float *Y, const CBLAS_INT *incY)
 {
    cblas_scopy(*N, X, *incX, Y, *incY);
    return;
 }
 
-float F77_sdot(const int *N, const float *X, const int *incX,
-                        const float *Y, const int *incY)
+float F77_sdot(const CBLAS_INT *N, const float *X, const CBLAS_INT *incX,
+                        const float *Y, const CBLAS_INT *incY)
 {
    return cblas_sdot(*N, X, *incX, Y, *incY);
 }
 
-float F77_snrm2(const int *N, const float *X, const int *incX)
+float F77_snrm2(const CBLAS_INT *N, const float *X, const CBLAS_INT *incX)
 {
    return cblas_snrm2(*N, X, *incX);
 }
@@ -54,28 +62,28 @@ void F77_srotg( float *a, float *b, float *c, float *s)
    return;
 }
 
-void F77_srot( const int *N, float *X, const int *incX, float *Y,
-              const int *incY, const float  *c, const float  *s)
+void F77_srot( const CBLAS_INT *N, float *X, const CBLAS_INT *incX, float *Y,
+              const CBLAS_INT *incY, const float  *c, const float  *s)
 {
    cblas_srot(*N,X,*incX,Y,*incY,*c,*s);
    return;
 }
 
-void F77_sscal(const int *N, const float *alpha, float *X,
-                         const int *incX)
+void F77_sscal(const CBLAS_INT *N, const float *alpha, float *X,
+                         const CBLAS_INT *incX)
 {
    cblas_sscal(*N, *alpha, X, *incX);
    return;
 }
 
-void F77_sswap( const int *N, float *X, const int *incX,
-                          float *Y, const int *incY)
+void F77_sswap( const CBLAS_INT *N, float *X, const CBLAS_INT *incX,
+                          float *Y, const CBLAS_INT *incY)
 {
    cblas_sswap(*N,X,*incX,Y,*incY);
    return;
 }
 
-int F77_isamax(const int *N, const float *X, const int *incX)
+CBLAS_INT F77_isamax(const CBLAS_INT *N, const float *X, const CBLAS_INT *incX)
 {
    if (*N < 1 || *incX < 1) return(0);
    return (cblas_isamax(*N, X, *incX)+1);
diff --git a/CBLAS/testing/c_sblas2.c b/CBLAS/testing/c_sblas2.c
index f119504872..dd1a949ef9 100644
--- a/CBLAS/testing/c_sblas2.c
+++ b/CBLAS/testing/c_sblas2.c
@@ -8,12 +8,16 @@
 #include "cblas.h"
 #include "cblas_test.h"
 
-void F77_sgemv(int *layout, char *transp, int *m, int *n, float *alpha,
-	       float *a, int *lda, float *x, int *incx, float *beta,
-	       float *y, int *incy ) {
+void F77_sgemv(CBLAS_INT *layout, char *transp, CBLAS_INT *m, CBLAS_INT *n, float *alpha,
+	       float *a, CBLAS_INT *lda, float *x, CBLAS_INT *incx, float *beta,
+	       float *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN transp_len
+#endif
+) {
 
   float *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_TRANSPOSE trans;
 
   get_transpose_type(transp, &trans);
@@ -35,11 +39,11 @@ void F77_sgemv(int *layout, char *transp, int *m, int *n, float *alpha,
 		  *m, *n, *alpha, a, *lda, x, *incx, *beta, y, *incy );
 }
 
-void F77_sger(int *layout, int *m, int *n, float *alpha, float *x, int *incx,
-	     float *y, int *incy, float *a, int *lda ) {
+void F77_sger(CBLAS_INT *layout, CBLAS_INT *m, CBLAS_INT *n, float *alpha, float *x, CBLAS_INT *incx,
+	     float *y, CBLAS_INT *incy, float *a, CBLAS_INT *lda ) {
 
   float *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
 
   if (*layout == TEST_ROW_MJR) {
      LDA = *n+1;
@@ -60,10 +64,14 @@ void F77_sger(int *layout, int *m, int *n, float *alpha, float *x, int *incx,
      cblas_sger( CblasColMajor, *m, *n, *alpha, x, *incx, y, *incy, a, *lda );
 }
 
-void F77_strmv(int *layout, char *uplow, char *transp, char *diagn,
-	      int *n, float *a, int *lda, float *x, int *incx) {
+void F77_strmv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+	      CBLAS_INT *n, float *a, CBLAS_INT *lda, float *x, CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   float *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -88,10 +96,14 @@ void F77_strmv(int *layout, char *uplow, char *transp, char *diagn,
   }
 }
 
-void F77_strsv(int *layout, char *uplow, char *transp, char *diagn,
-	       int *n, float *a, int *lda, float *x, int *incx ) {
+void F77_strsv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+	       CBLAS_INT *n, float *a, CBLAS_INT *lda, float *x, CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   float *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -112,11 +124,15 @@ void F77_strsv(int *layout, char *uplow, char *transp, char *diagn,
    else
      cblas_strsv(CblasColMajor, uplo, trans, diag, *n, a, *lda, x, *incx );
 }
-void F77_ssymv(int *layout, char *uplow, int *n, float *alpha, float *a,
-	      int *lda, float *x, int *incx, float *beta, float *y,
-	      int *incy) {
+void F77_ssymv(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, float *alpha, float *a,
+	      CBLAS_INT *lda, float *x, CBLAS_INT *incx, float *beta, float *y,
+	      CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
   float *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -136,10 +152,14 @@ void F77_ssymv(int *layout, char *uplow, int *n, float *alpha, float *a,
 		 *beta, y, *incy );
 }
 
-void F77_ssyr(int *layout, char *uplow, int *n, float *alpha, float *x,
-	     int *incx, float *a, int *lda) {
+void F77_ssyr(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, float *alpha, float *x,
+	     CBLAS_INT *incx, float *a, CBLAS_INT *lda
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
   float *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -160,10 +180,14 @@ void F77_ssyr(int *layout, char *uplow, int *n, float *alpha, float *x,
      cblas_ssyr(CblasColMajor, uplo, *n, *alpha, x, *incx, a, *lda);
 }
 
-void F77_ssyr2(int *layout, char *uplow, int *n, float *alpha, float *x,
-	     int *incx, float *y, int *incy, float *a, int *lda) {
+void F77_ssyr2(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, float *alpha, float *x,
+	     CBLAS_INT *incx, float *y, CBLAS_INT *incy, float *a, CBLAS_INT *lda
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
   float *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -184,12 +208,16 @@ void F77_ssyr2(int *layout, char *uplow, int *n, float *alpha, float *x,
      cblas_ssyr2(CblasColMajor, uplo, *n, *alpha, x, *incx, y, *incy, a, *lda);
 }
 
-void F77_sgbmv(int *layout, char *transp, int *m, int *n, int *kl, int *ku,
-	       float *alpha, float *a, int *lda, float *x, int *incx,
-	       float *beta, float *y, int *incy ) {
+void F77_sgbmv(CBLAS_INT *layout, char *transp, CBLAS_INT *m, CBLAS_INT *n, CBLAS_INT *kl, CBLAS_INT *ku,
+	       float *alpha, float *a, CBLAS_INT *lda, float *x, CBLAS_INT *incx,
+	       float *beta, float *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN transp_len
+#endif
+) {
 
   float *A;
-  int i,irow,j,jcol,LDA;
+  CBLAS_INT i,irow,j,jcol,LDA;
   CBLAS_TRANSPOSE trans;
 
   get_transpose_type(transp, &trans);
@@ -222,10 +250,14 @@ void F77_sgbmv(int *layout, char *transp, int *m, int *n, int *kl, int *ku,
 		  a, *lda, x, *incx, *beta, y, *incy );
 }
 
-void F77_stbmv(int *layout, char *uplow, char *transp, char *diagn,
-	      int *n, int *k, float *a, int *lda, float *x, int *incx) {
+void F77_stbmv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+	      CBLAS_INT *n, CBLAS_INT *k, float *a, CBLAS_INT *lda, float *x, CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   float *A;
-  int irow, jcol, i, j, LDA;
+  CBLAS_INT irow, jcol, i, j, LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -268,10 +300,14 @@ void F77_stbmv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_stbmv(CblasColMajor, uplo, trans, diag, *n, *k, a, *lda, x, *incx);
 }
 
-void F77_stbsv(int *layout, char *uplow, char *transp, char *diagn,
-	      int *n, int *k, float *a, int *lda, float *x, int *incx) {
+void F77_stbsv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+	      CBLAS_INT *n, CBLAS_INT *k, float *a, CBLAS_INT *lda, float *x, CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   float *A;
-  int irow, jcol, i, j, LDA;
+  CBLAS_INT irow, jcol, i, j, LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -314,11 +350,15 @@ void F77_stbsv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_stbsv(CblasColMajor, uplo, trans, diag, *n, *k, a, *lda, x, *incx);
 }
 
-void F77_ssbmv(int *layout, char *uplow, int *n, int *k, float *alpha,
-	      float *a, int *lda, float *x, int *incx, float *beta,
-	      float *y, int *incy) {
+void F77_ssbmv(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, CBLAS_INT *k, float *alpha,
+	      float *a, CBLAS_INT *lda, float *x, CBLAS_INT *incx, float *beta,
+	      float *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
   float *A;
-  int i,j,irow,jcol,LDA;
+  CBLAS_INT i,j,irow,jcol,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -359,10 +399,14 @@ void F77_ssbmv(int *layout, char *uplow, int *n, int *k, float *alpha,
 		 *beta, y, *incy );
 }
 
-void F77_sspmv(int *layout, char *uplow, int *n, float *alpha, float *ap,
-	      float *x, int *incx, float *beta, float *y, int *incy) {
+void F77_sspmv(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, float *alpha, float *ap,
+	      float *x, CBLAS_INT *incx, float *beta, float *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
   float *A,*AP;
-  int i,j,k,LDA;
+  CBLAS_INT i,j,k,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -396,10 +440,14 @@ void F77_sspmv(int *layout, char *uplow, int *n, float *alpha, float *ap,
 		  *incy );
 }
 
-void F77_stpmv(int *layout, char *uplow, char *transp, char *diagn,
-	      int *n, float *ap, float *x, int *incx) {
+void F77_stpmv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+	      CBLAS_INT *n, float *ap, float *x, CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   float *A, *AP;
-  int i, j, k, LDA;
+  CBLAS_INT i, j, k, LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -435,10 +483,14 @@ void F77_stpmv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_stpmv( CblasColMajor, uplo, trans, diag, *n, ap, x, *incx );
 }
 
-void F77_stpsv(int *layout, char *uplow, char *transp, char *diagn,
-	      int *n, float *ap, float *x, int *incx) {
+void F77_stpsv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+	      CBLAS_INT *n, float *ap, float *x, CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   float *A, *AP;
-  int i, j, k, LDA;
+  CBLAS_INT i, j, k, LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -475,10 +527,14 @@ void F77_stpsv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_stpsv( CblasColMajor, uplo, trans, diag, *n, ap, x, *incx );
 }
 
-void F77_sspr(int *layout, char *uplow, int *n, float *alpha, float *x,
-	     int *incx, float *ap ){
+void F77_sspr(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, float *alpha, float *x,
+	     CBLAS_INT *incx, float *ap
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+){
   float *A, *AP;
-  int i,j,k,LDA;
+  CBLAS_INT i,j,k,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -526,10 +582,14 @@ void F77_sspr(int *layout, char *uplow, int *n, float *alpha, float *x,
      cblas_sspr( CblasColMajor, uplo, *n, *alpha, x, *incx, ap );
 }
 
-void F77_sspr2(int *layout, char *uplow, int *n, float *alpha, float *x,
-	     int *incx, float *y, int *incy, float *ap ){
+void F77_sspr2(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, float *alpha, float *x,
+	     CBLAS_INT *incx, float *y, CBLAS_INT *incy, float *ap
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+){
   float *A, *AP;
-  int i,j,k,LDA;
+  CBLAS_INT i,j,k,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
diff --git a/CBLAS/testing/c_sblas3.c b/CBLAS/testing/c_sblas3.c
index 024fc474fd..0aaa57d2d8 100644
--- a/CBLAS/testing/c_sblas3.c
+++ b/CBLAS/testing/c_sblas3.c
@@ -9,12 +9,16 @@
 #include "cblas.h"
 #include "cblas_test.h"
 
-void F77_sgemm(int *layout, char *transpa, char *transpb, int *m, int *n,
-              int *k, float *alpha, float *a, int *lda, float *b, int *ldb,
-              float *beta, float *c, int *ldc ) {
+void F77_sgemm(CBLAS_INT *layout, char *transpa, char *transpb, CBLAS_INT *m, CBLAS_INT *n,
+              CBLAS_INT *k, float *alpha, float *a, CBLAS_INT *lda, float *b, CBLAS_INT *ldb,
+              float *beta, float *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN transpa_len, FORTRAN_STRLEN transpb_len
+#endif
+) {
 
   float *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
+  CBLAS_INT i,j,LDA, LDB, LDC;
   CBLAS_TRANSPOSE transa, transb;
 
   get_transpose_type(transpa, &transa);
@@ -70,12 +74,92 @@ void F77_sgemm(int *layout, char *transpa, char *transpb, int *m, int *n,
      cblas_sgemm( UNDEFINED, transa, transb, *m, *n, *k, *alpha, a, *lda,
                   b, *ldb, *beta, c, *ldc );
 }
-void F77_ssymm(int *layout, char *rtlf, char *uplow, int *m, int *n,
-              float *alpha, float *a, int *lda, float *b, int *ldb,
-              float *beta, float *c, int *ldc ) {
+
+void F77_sgemmtr(CBLAS_INT *layout, char *uplop, char *transpa, char *transpb, CBLAS_INT *n,
+     CBLAS_INT *k, float *alpha, float *a, CBLAS_INT *lda,
+     float *b, CBLAS_INT *ldb, float *beta,
+     float *c, CBLAS_INT *ldc ) {
+
+  float *A, *B, *C;
+  CBLAS_INT i,j,LDA, LDB, LDC;
+  CBLAS_TRANSPOSE transa, transb;
+  CBLAS_UPLO uplo;
+
+  get_transpose_type(transpa, &transa);
+  get_transpose_type(transpb, &transb);
+  get_uplo_type(uplop, &uplo);
+
+  if (*layout == TEST_ROW_MJR) {
+     if (transa == CblasNoTrans) {
+        LDA = *k+1;
+        A=(float*)malloc((*n)*LDA*sizeof(float));
+        for( i=0; i<*n; i++ )
+           for( j=0; j<*k; j++ ) {
+              A[i*LDA+j]=a[j*(*lda)+i];
+           }
+     }
+     else {
+        LDA = *n+1;
+        A=(float* )malloc(LDA*(*k)*sizeof(float));
+        for( i=0; i<*k; i++ )
+           for( j=0; j<*n; j++ ) {
+              A[i*LDA+j]=a[j*(*lda)+i];
+           }
+     }
+
+     if (transb == CblasNoTrans) {
+        LDB = *n+1;
+        B=(float* )malloc((*k)*LDB*sizeof(float) );
+        for( i=0; i<*k; i++ )
+           for( j=0; j<*n; j++ ) {
+              B[i*LDB+j]=b[j*(*ldb)+i];
+           }
+     }
+     else {
+        LDB = *k+1;
+        B=(float* )malloc(LDB*(*n)*sizeof(float));
+        for( i=0; i<*n; i++ )
+           for( j=0; j<*k; j++ ) {
+              B[i*LDB+j]=b[j*(*ldb)+i];
+           }
+     }
+
+     LDC = *n+1;
+     C=(float* )malloc((*n)*LDC*sizeof(float));
+     for( j=0; j<*n; j++ )
+        for( i=0; i<*n; i++ ) {
+           C[i*LDC+j]=c[j*(*ldc)+i];
+        }
+     cblas_sgemmtr( CblasRowMajor, uplo, transa, transb, *n, *k, *alpha, A, LDA,
+                  B, LDB, *beta, C, LDC );
+     for( j=0; j<*n; j++ )
+        for( i=0; i<*n; i++ ) {
+           c[j*(*ldc)+i]=C[i*LDC+j];
+        }
+     free(A);
+     free(B);
+     free(C);
+  }
+  else if (*layout == TEST_COL_MJR)
+     cblas_sgemmtr( CblasColMajor, uplo, transa, transb, *n, *k, *alpha, a, *lda,
+                  b, *ldb, *beta, c, *ldc );
+  else
+     cblas_sgemmtr( UNDEFINED, uplo, transa, transb, *n, *k, *alpha, a, *lda,
+                  b, *ldb, *beta, c, *ldc );
+}
+
+
+
+void F77_ssymm(CBLAS_INT *layout, char *rtlf, char *uplow, CBLAS_INT *m, CBLAS_INT *n,
+              float *alpha, float *a, CBLAS_INT *lda, float *b, CBLAS_INT *ldb,
+              float *beta, float *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rtlf_len, FORTRAN_STRLEN uplow_len
+#endif
+) {
 
   float *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
+  CBLAS_INT i,j,LDA, LDB, LDC;
   CBLAS_UPLO uplo;
   CBLAS_SIDE side;
 
@@ -124,11 +208,15 @@ void F77_ssymm(int *layout, char *rtlf, char *uplow, int *m, int *n,
                   *beta, c, *ldc );
 }
 
-void F77_ssyrk(int *layout, char *uplow, char *transp, int *n, int *k,
-              float *alpha, float *a, int *lda,
-              float *beta, float *c, int *ldc ) {
+void F77_ssyrk(CBLAS_INT *layout, char *uplow, char *transp, CBLAS_INT *n, CBLAS_INT *k,
+              float *alpha, float *a, CBLAS_INT *lda,
+              float *beta, float *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len
+#endif
+) {
 
-  int i,j,LDA,LDC;
+  CBLAS_INT i,j,LDA,LDC;
   float *A, *C;
   CBLAS_UPLO uplo;
   CBLAS_TRANSPOSE trans;
@@ -172,10 +260,14 @@ void F77_ssyrk(int *layout, char *uplow, char *transp, int *n, int *k,
 	         c, *ldc );
 }
 
-void F77_ssyr2k(int *layout, char *uplow, char *transp, int *n, int *k,
-               float *alpha, float *a, int *lda, float *b, int *ldb,
-               float *beta, float *c, int *ldc ) {
-  int i,j,LDA,LDB,LDC;
+void F77_ssyr2k(CBLAS_INT *layout, char *uplow, char *transp, CBLAS_INT *n, CBLAS_INT *k,
+               float *alpha, float *a, CBLAS_INT *lda, float *b, CBLAS_INT *ldb,
+               float *beta, float *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len
+#endif
+) {
+  CBLAS_INT i,j,LDA,LDB,LDC;
   float *A, *B, *C;
   CBLAS_UPLO uplo;
   CBLAS_TRANSPOSE trans;
@@ -227,10 +319,14 @@ void F77_ssyr2k(int *layout, char *uplow, char *transp, int *n, int *k,
      cblas_ssyr2k(UNDEFINED, uplo, trans, *n, *k, *alpha, a, *lda,
 		   b, *ldb, *beta, c, *ldc );
 }
-void F77_strmm(int *layout, char *rtlf, char *uplow, char *transp, char *diagn,
-              int *m, int *n, float *alpha, float *a, int *lda, float *b,
-              int *ldb) {
-  int i,j,LDA,LDB;
+void F77_strmm(CBLAS_INT *layout, char *rtlf, char *uplow, char *transp, char *diagn,
+              CBLAS_INT *m, CBLAS_INT *n, float *alpha, float *a, CBLAS_INT *lda, float *b,
+              CBLAS_INT *ldb
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rtlf_len, FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
+  CBLAS_INT i,j,LDA,LDB;
   float *A, *B;
   CBLAS_SIDE side;
   CBLAS_DIAG diag;
@@ -278,10 +374,14 @@ void F77_strmm(int *layout, char *rtlf, char *uplow, char *transp, char *diagn,
 		   a, *lda, b, *ldb);
 }
 
-void F77_strsm(int *layout, char *rtlf, char *uplow, char *transp, char *diagn,
-              int *m, int *n, float *alpha, float *a, int *lda, float *b,
-              int *ldb) {
-  int i,j,LDA,LDB;
+void F77_strsm(CBLAS_INT *layout, char *rtlf, char *uplow, char *transp, char *diagn,
+              CBLAS_INT *m, CBLAS_INT *n, float *alpha, float *a, CBLAS_INT *lda, float *b,
+              CBLAS_INT *ldb
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rtlf_len, FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
+  CBLAS_INT i,j,LDA,LDB;
   float *A, *B;
   CBLAS_SIDE side;
   CBLAS_DIAG diag;
diff --git a/CBLAS/testing/c_sblat1.f b/CBLAS/testing/c_sblat1.f
index 89902f12d9..44e24e5d0b 100644
--- a/CBLAS/testing/c_sblat1.f
+++ b/CBLAS/testing/c_sblat1.f
@@ -1,4 +1,6 @@
+*  =====================================================================
       PROGRAM SCBLAT1
+      IMPLICIT NONE
 *     Test program for the REAL             Level 1 CBLAS.
 *     Based upon the original CBLAS test routine together with:
 *     F06EAF Example Program Text
@@ -19,7 +21,7 @@ PROGRAM SCBLAT1
       DATA             SFAC/9.765625E-4/
 *     .. Executable Statements ..
       WRITE (NOUT,99999)
-      DO 20 IC = 1, 10
+      DO 20 IC = 1, 11
          ICASE = IC
          CALL HEADER
 *
@@ -38,7 +40,7 @@ PROGRAM SCBLAT1
      +            ICASE.EQ.10) THEN
             CALL CHECK1(SFAC)
          ELSE IF (ICASE.EQ.1 .OR. ICASE.EQ.2 .OR. ICASE.EQ.5 .OR.
-     +            ICASE.EQ.6) THEN
+     +            ICASE.EQ.6 .OR. ICASE.EQ.11) THEN
             CALL CHECK2(SFAC)
          ELSE IF (ICASE.EQ.4) THEN
             CALL CHECK3(SFAC)
@@ -51,7 +53,10 @@ PROGRAM SCBLAT1
 99999 FORMAT (' Real CBLAS Test Program Results',/1X)
 99998 FORMAT ('                                    ----- PASS -----')
       END
+
+*  =====================================================================
       SUBROUTINE HEADER
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER          NOUT
       PARAMETER        (NOUT=6)
@@ -59,7 +64,7 @@ SUBROUTINE HEADER
       INTEGER          ICASE, INCX, INCY, MODE, N
       LOGICAL          PASS
 *     .. Local Arrays ..
-      CHARACTER*15      L(10)
+      CHARACTER*15      L(11)
 *     .. Common blocks ..
       COMMON           /COMBLA/ICASE, N, INCX, INCY, MODE, PASS
 *     .. Data statements ..
@@ -73,13 +78,18 @@ SUBROUTINE HEADER
       DATA             L(8)/'CBLAS_SASUM '/
       DATA             L(9)/'CBLAS_SSCAL '/
       DATA             L(10)/'CBLAS_ISAMAX'/
+      DATA             L(11)/'CBLAS_SAXPBY'/
+
 *     .. Executable Statements ..
       WRITE (NOUT,99999) ICASE, L(ICASE)
       RETURN
 *
 99999 FORMAT (/' Test of subprogram number',I3,9X,A15)
       END
+
+*  =====================================================================
       SUBROUTINE CHECK0(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
       PARAMETER         (NOUT=6)
@@ -140,7 +150,10 @@ SUBROUTINE CHECK0(SFAC)
    20 CONTINUE
    40 RETURN
       END
+
+*  =====================================================================
       SUBROUTINE CHECK1(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
       PARAMETER         (NOUT=6)
@@ -234,7 +247,10 @@ SUBROUTINE CHECK1(SFAC)
    80 CONTINUE
       RETURN
       END
+
+*  =====================================================================
       SUBROUTINE CHECK2(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
       PARAMETER         (NOUT=6)
@@ -244,25 +260,27 @@ SUBROUTINE CHECK2(SFAC)
       INTEGER           ICASE, INCX, INCY, MODE, N
       LOGICAL           PASS
 *     .. Local Scalars ..
-      REAL              SA
+      REAL              SA, SB
       INTEGER           I, J, KI, KN, KSIZE, LENX, LENY, MX, MY
 *     .. Local Arrays ..
       REAL              DT10X(7,4,4), DT10Y(7,4,4), DT7(4,4),
      +                  DT8(7,4,4), DX1(7),
      +                  DY1(7), SSIZE1(4), SSIZE2(14,2), STX(7), STY(7),
-     +                  SX(7), SY(7)
+     +                  SX(7), SY(7), DT20(7,4,4)
       INTEGER           INCXS(4), INCYS(4), LENS(4,2), NS(4)
 *     .. External Functions ..
       REAL              SDOTTEST
       EXTERNAL          SDOTTEST
 *     .. External Subroutines ..
       EXTERNAL          SAXPYTEST, SCOPYTEST, SSWAPTEST, STEST, STEST1
+     +                  SAXPBYTEST
 *     .. Intrinsic Functions ..
       INTRINSIC         ABS, MIN
 *     .. Common blocks ..
       COMMON            /COMBLA/ICASE, N, INCX, INCY, MODE, PASS
 *     .. Data statements ..
       DATA              SA/0.3E0/
+      DATA              SB/0.5E0/
       DATA              INCXS/1, 2, -2, -1/
       DATA              INCYS/1, -2, 1, -2/
       DATA              LENS/1, 1, 2, 4, 1, 1, 3, 7/
@@ -335,6 +353,26 @@ SUBROUTINE CHECK2(SFAC)
      +                  0.0E0, 1.17E0, 1.17E0, 1.17E0, 1.17E0, 1.17E0,
      +                  1.17E0, 1.17E0, 1.17E0, 1.17E0, 1.17E0, 1.17E0,
      +                  1.17E0, 1.17E0, 1.17E0/
+      DATA              DT20/0.5E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0,
+     +                  0.0E0, 0.43E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0,
+     +                  0.0E0, 0.0E0, 0.43E0, -0.42E0, 0.0E0, 0.0E0,
+     +                  0.0E0, 0.0E0, 0.0E0, 0.43E0, -0.42E0, 0.0E0,
+     +                  0.59E0, 0.0E0, 0.0E0, 0.0E0, 0.5E0, 0.0E0,
+     +                  0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.43E0,
+     +                  0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0,
+     +                  0.1E0, -0.9E0, 0.33E0, 0.0E0, 0.0E0, 0.0E0,
+     +                  0.0E0, 0.13E0, -0.9E0, 0.42E0, 0.7E0, -0.45E0,
+     +                  0.2E0, 0.58E0, 0.5E0, 0.0E0, 0.0E0, 0.0E0,
+     +                  0.0E0, 0.0E0, 0.0E0, 0.43E0, 0.0E0, 0.0E0,
+     +                  0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.1E0, -0.27E0,
+     +                  0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.13E0,
+     +                  -0.18E0, 0.00E0, 0.53E0, 0.0E0, 0.0E0, 0.0E0,
+     +                  0.5E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0,
+     +                  0.43E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0, 0.0E0,
+     +                  0.0E0, 0.43E0, -0.9E0, 0.18E0, 0.0E0, 0.0E0,
+     +                  0.0E0, 0.0E0, 0.43E0, -0.9E0, 0.18E0, 0.7E0,
+     +                  -0.45E0, 0.2E0, 0.64E0/
+
 *     .. Executable Statements ..
 *
       DO 120 KI = 1, 4
@@ -365,6 +403,13 @@ SUBROUTINE CHECK2(SFAC)
                   STY(J) = DT8(J,KN,KI)
    40          CONTINUE
                CALL STEST(LENY,SY,STY,SSIZE2(1,KSIZE),SFAC)
+            ELSE IF (ICASE.EQ.11) THEN
+*              .. SAXPBYTEST ..
+               CALL SAXPBYTEST(N,SA,SX,INCX,SB,SY,INCY)
+               DO 50 J = 1, LENY
+                  STY(J) = DT20(J,KN,KI)
+   50          CONTINUE
+               CALL STEST(LENY,SY,STY,SSIZE2(1,KSIZE),SFAC)
             ELSE IF (ICASE.EQ.5) THEN
 *              .. SCOPYTEST ..
                DO 60 I = 1, 7
@@ -389,7 +434,10 @@ SUBROUTINE CHECK2(SFAC)
   120 CONTINUE
       RETURN
       END
+
+*  =====================================================================
       SUBROUTINE CHECK3(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
       PARAMETER         (NOUT=6)
@@ -595,7 +643,10 @@ SUBROUTINE CHECK3(SFAC)
   200 CONTINUE
       RETURN
       END
+
+*  =====================================================================
       SUBROUTINE STEST(LEN,SCOMP,STRUE,SSIZE,SFAC)
+      IMPLICIT NONE
 *     ********************************* STEST **************************
 *
 *     THIS SUBR COMPARES ARRAYS  SCOMP() AND STRUE() OF LENGTH LEN TO
@@ -650,7 +701,10 @@ SUBROUTINE STEST(LEN,SCOMP,STRUE,SSIZE,SFAC)
      +       '     SIZE(I)',/1X)
 99997 FORMAT (1X,I4,I3,3I5,I3,2E36.8,2E12.4)
       END
+
+*  =====================================================================
       SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
+      IMPLICIT NONE
 *     ************************* STEST1 *****************************
 *
 *     THIS IS AN INTERFACE SUBROUTINE TO ACCOMMODATE THE FORTRAN
@@ -675,7 +729,10 @@ SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
 *
       RETURN
       END
+
+*  =====================================================================
       REAL             FUNCTION SDIFF(SA,SB)
+      IMPLICIT NONE
 *     ********************************* SDIFF **************************
 *     COMPUTES DIFFERENCE OF TWO NUMBERS.  C. L. LAWSON, JPL 1974 FEB 15
 *
@@ -685,7 +742,10 @@ REAL             FUNCTION SDIFF(SA,SB)
       SDIFF = SA - SB
       RETURN
       END
+
+*  =====================================================================
       SUBROUTINE ITEST1(ICOMP,ITRUE)
+      IMPLICIT NONE
 *     ********************************* ITEST1 *************************
 *
 *     THIS SUBROUTINE COMPARES THE VARIABLES ICOMP AND ITRUE FOR
diff --git a/CBLAS/testing/c_sblat2.f b/CBLAS/testing/c_sblat2.f
index 8bd23c3e9d..7219a30e11 100644
--- a/CBLAS/testing/c_sblat2.f
+++ b/CBLAS/testing/c_sblat2.f
@@ -1,4 +1,6 @@
+*  =====================================================================
       PROGRAM SBLAT2
+      IMPLICIT NONE
 *
 *  Test program for the REAL             Level 2 Blas.
 *
@@ -453,10 +455,13 @@ PROGRAM SBLAT2
 *     End of SBLAT2.
 *
       END
+
+*  =====================================================================
       SUBROUTINE SCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NALF, ALF, NBET,
      $                  BET, NINC, INC, NMAX, INCMAX, A, AA, AS, X, XX,
      $                  XS, Y, YY, YS, YT, G, IORDER )
+      IMPLICIT NONE
 *
 *  Tests SGEMV and SGBMV.
 *
@@ -813,10 +818,13 @@ SUBROUTINE SCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of SCHK1.
 *
       END
+
+*  =====================================================================
       SUBROUTINE SCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NALF, ALF, NBET,
      $                  BET, NINC, INC, NMAX, INCMAX, A, AA, AS, X, XX,
      $                  XS, Y, YY, YS, YT, G, IORDER )
+      IMPLICIT NONE
 *
 *  Tests SSYMV, SSBMV and SSPMV.
 *
@@ -1173,9 +1181,12 @@ SUBROUTINE SCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of SCHK2.
 *
       END
+
+*  =====================================================================
       SUBROUTINE SCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, XT, G, Z, IORDER )
+      IMPLICIT NONE
 *
 *  Tests STRMV, STBMV, STPMV, STRSV, STBSV and STPSV.
 *
@@ -1560,10 +1571,13 @@ SUBROUTINE SCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of SCHK3.
 *
       END
+
+*  =====================================================================
       SUBROUTINE SCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z, IORDER )
+      IMPLICIT NONE
 *
 *  Tests SGER.
 *
@@ -1832,10 +1846,13 @@ SUBROUTINE SCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of SCHK4.
 *
       END
+
+*  =====================================================================
       SUBROUTINE SCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z, IORDER )
+      IMPLICIT NONE
 *
 *  Tests SSYR and SSPR.
 *
@@ -2128,10 +2145,13 @@ SUBROUTINE SCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of SCHK5.
 *
       END
+
+*  =====================================================================
       SUBROUTINE SCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z, IORDER )
+      IMPLICIT NONE
 *
 *  Tests SSYR2 and SSPR2.
 *
@@ -2460,8 +2480,11 @@ SUBROUTINE SCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of SCHK6.
 *
       END
+
+*  =====================================================================
       SUBROUTINE SMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, KL,
      $                  KU, RESET, TRANSL )
+      IMPLICIT NONE
 *
 *  Generates values for an M by N matrix A within the bandwidth
 *  defined by KL and KU.
@@ -2636,8 +2659,11 @@ SUBROUTINE SMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, KL,
 *     End of SMAKE.
 *
       END
+
+*  =====================================================================
       SUBROUTINE SMVCH( TRANS, M, N, ALPHA, A, NMAX, X, INCX, BETA, Y,
      $                  INCY, YT, G, YY, EPS, ERR, FATAL, NOUT, MV )
+      IMPLICIT NONE
 *
 *  Checks the results of the computational tests.
 *
@@ -2753,7 +2779,10 @@ SUBROUTINE SMVCH( TRANS, M, N, ALPHA, A, NMAX, X, INCX, BETA, Y,
 *     End of SMVCH.
 *
       END
+
+*  =====================================================================
       LOGICAL FUNCTION LSE( RI, RJ, LR )
+      IMPLICIT NONE
 *
 *  Tests if two arrays are identical.
 *
@@ -2783,7 +2812,10 @@ LOGICAL FUNCTION LSE( RI, RJ, LR )
 *     End of LSE.
 *
       END
+
+*  =====================================================================
       LOGICAL FUNCTION LSERES( TYPE, UPLO, M, N, AA, AS, LDA )
+      IMPLICIT NONE
 *
 *  Tests if selected elements in two arrays are equal.
 *
@@ -2843,7 +2875,10 @@ LOGICAL FUNCTION LSERES( TYPE, UPLO, M, N, AA, AS, LDA )
 *     End of LSERES.
 *
       END
+
+*  =====================================================================
       REAL FUNCTION SBEG( RESET )
+      IMPLICIT NONE
 *
 *  Generates random numbers uniformly distributed between -0.5 and 0.5.
 *
@@ -2889,7 +2924,10 @@ REAL FUNCTION SBEG( RESET )
 *     End of SBEG.
 *
       END
+
+*  =====================================================================
       REAL FUNCTION SDIFF( X, Y )
+      IMPLICIT NONE
 *
 *  Auxiliary routine for test program for Level 2 Blas.
 *
diff --git a/CBLAS/testing/c_sblat3.f b/CBLAS/testing/c_sblat3.f
index 31babd9a12..f9277655ac 100644
--- a/CBLAS/testing/c_sblat3.f
+++ b/CBLAS/testing/c_sblat3.f
@@ -1,10 +1,11 @@
       PROGRAM SBLAT3
+      IMPLICIT NONE
 *
 *  Test program for the REAL             Level 3 Blas.
 *
 *  The program must be driven by a short data file. The first 13 records
 *  of the file are read using list-directed input, the last 6 records
-*  are read using the format ( A12, L2 ). An annotated example of a data
+*  are read using the format ( A13, L2 ). An annotated example of a data
 *  file can be obtained by deleting the first 3 characters from the
 *  following 19 lines:
 *  'SBLAT3.SNAP'     NAME OF SNAPSHOT OUTPUT FILE
@@ -20,12 +21,14 @@ PROGRAM SBLAT3
 *  0.0 1.0 0.7       VALUES OF ALPHA
 *  3                 NUMBER OF VALUES OF BETA
 *  0.0 1.0 1.3       VALUES OF BETA
-*  cblas_sgemm  T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_ssymm  T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_strmm  T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_strsm  T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_ssyrk  T PUT F FOR NO TEST. SAME COLUMNS.
-*  cblas_ssyr2k T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_sgemm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_ssymm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_strmm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_strsm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_ssyrk   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_ssyr2k  T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_sgemmtr T PUT F FOR NO TEST. SAME COLUMNS.
+
 *
 *  See:
 *
@@ -46,7 +49,7 @@ PROGRAM SBLAT3
       INTEGER            NIN, NOUT
       PARAMETER          ( NIN = 5, NOUT = 6 )
       INTEGER            NSUBS
-      PARAMETER          ( NSUBS = 6 )
+      PARAMETER          ( NSUBS = 7 )
       REAL               ZERO, HALF, ONE
       PARAMETER          ( ZERO = 0.0, HALF = 0.5, ONE = 1.0 )
       INTEGER            NMAX
@@ -60,7 +63,7 @@ PROGRAM SBLAT3
       LOGICAL            FATAL, LTESTT, REWI, SAME, SFATAL, TRACE,
      $                   TSTERR, CORDER, RORDER
       CHARACTER*1        TRANSA, TRANSB
-      CHARACTER*12       SNAMET
+      CHARACTER*13       SNAMET
       CHARACTER*32       SNAPS
 *     .. Local Arrays ..
       REAL               AA( NMAX*NMAX ), AB( NMAX, 2*NMAX ),
@@ -71,27 +74,27 @@ PROGRAM SBLAT3
      $                   G( NMAX ), W( 2*NMAX )
       INTEGER            IDIM( NIDMAX )
       LOGICAL            LTEST( NSUBS )
-      CHARACTER*12       SNAMES( NSUBS )
+      CHARACTER*13       SNAMES( NSUBS )
 *     .. External Functions ..
       REAL               SDIFF
       LOGICAL            LSE
       EXTERNAL           SDIFF, LSE
 *     .. External Subroutines ..
       EXTERNAL           SCHK1, SCHK2, SCHK3, SCHK4, SCHK5, CS3CHKE,
-     $                   SMMCH
+     $                   SMMCH, SCHK6
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
-      LOGICAL            OK
-      CHARACTER*12        SRNAMT
+      LOGICAL            LERR, OK
+      CHARACTER*13        SRNAMT
 *     .. Common blocks ..
-      COMMON             /INFOC/INFOT, NOUTC, OK
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
       COMMON             /SRNAMC/SRNAMT
 *     .. Data statements ..
       DATA               SNAMES/'cblas_sgemm ', 'cblas_ssymm ',
      $                   'cblas_strmm ', 'cblas_strsm ','cblas_ssyrk ',
-     $                   'cblas_ssyr2k'/
+     $                   'cblas_ssyr2k', 'cblas_sgemmtr'/
 *     .. Executable Statements ..
 *
       NOUTC = NOUT
@@ -288,7 +291,7 @@ PROGRAM SBLAT3
             INFOT = 0
             OK = .TRUE.
             FATAL = .FALSE.
-            GO TO ( 140, 150, 160, 160, 170, 180 )ISNUM
+            GO TO ( 140, 150, 160, 160, 170, 180, 185 )ISNUM
 *           Test SGEMM, 01.
   140       IF (CORDER) THEN
             CALL SCHK1( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
@@ -359,8 +362,23 @@ PROGRAM SBLAT3
      $                  1 )
             END IF
             GO TO 190
+*           Test SGEMMTR, 07.
+  185       IF (CORDER) THEN
+            CALL SCHK6( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
+     $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
+     $                  NMAX, AB, AA, AS, AB( 1, NMAX + 1 ), BB, BS, C,
+     $                  CC, CS, CT, G, 0 )
+            END IF
+            IF (RORDER) THEN
+            CALL SCHK6( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
+     $                  REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
+     $                  NMAX, AB, AA, AS, AB( 1, NMAX + 1 ), BB, BS, C,
+     $                  CC, CS, CT, G, 1 )
+            END IF
+            GO TO 190
 *
-  190       IF( FATAL.AND.SFATAL )
+
+  190 IF( FATAL.AND.SFATAL )
      $         GO TO 210
          END IF
   200 CONTINUE
@@ -396,7 +414,7 @@ PROGRAM SBLAT3
  9992 FORMAT( '   FOR BETA           ', 7F6.1 )
  9991 FORMAT( ' AMEND DATA FILE OR INCREASE ARRAY SIZES IN PROGRAM',
      $      /' ******* TESTS ABANDONED *******' )
- 9990 FORMAT( ' SUBPROGRAM NAME ', A12,' NOT RECOGNIZED', /' ******* ',
+ 9990 FORMAT( ' SUBPROGRAM NAME ', A13,' NOT RECOGNIZED', /' ******* ',
      $      'TESTS ABANDONED *******' )
  9989 FORMAT( ' ERROR IN SMMCH -  IN-LINE DOT PRODUCTS ARE BEING EVALU',
      $      'ATED WRONGLY.', /' SMMCH WAS CALLED WITH TRANSA = ', A1,
@@ -404,8 +422,8 @@ PROGRAM SBLAT3
      $      'ERR = ', F12.3, '.', /' THIS MAY BE DUE TO FAULTS IN THE ',
      $      'ARITHMETIC OR THE COMPILER.', /' ******* TESTS ABANDONED ',
      $      '*******' )
- 9988 FORMAT( A12,L2 )
- 9987 FORMAT( 1X, A12,' WAS NOT TESTED' )
+ 9988 FORMAT( A13,L2 )
+ 9987 FORMAT( 1X, A13,' WAS NOT TESTED' )
  9986 FORMAT( /' END OF TESTS' )
  9985 FORMAT( /' ******* FATAL ERROR - TESTS ABANDONED *******' )
  9984 FORMAT( ' ERROR-EXITS WILL NOT BE TESTED' )
@@ -413,10 +431,13 @@ PROGRAM SBLAT3
 *     End of SBLAT3.
 *
       END
+
+*  =====================================================================
       SUBROUTINE SCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G,
      $                  IORDER )
+      IMPLICIT NONE
 *
 *  Tests SGEMM.
 *
@@ -435,7 +456,7 @@ SUBROUTINE SCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12        SNAME
+      CHARACTER*13        SNAME
 *     .. Array Arguments ..
       REAL               A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -462,9 +483,9 @@ SUBROUTINE SCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       INTRINSIC          MAX
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
-      LOGICAL            OK
+      LOGICAL            LERR, OK
 *     .. Common blocks ..
-      COMMON             /INFOC/INFOT, NOUTC, OK
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
 *     .. Data statements ..
       DATA               ICH/'NTC'/
 *     .. Executable Statements ..
@@ -681,20 +702,20 @@ SUBROUTINE SCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   130 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A12,'(''', A1, ''',''', A1, ''',',
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(''', A1, ''',''', A1, ''',',
      $      3( I3, ',' ), F4.1, ', A,', I3, ', B,', I3, ',', F4.1, ', ',
      $      'C,', I3, ').' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -703,15 +724,16 @@ SUBROUTINE SCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of SCHK1.
 *
       END
-*
-*
-*
+
+*  =====================================================================
       SUBROUTINE SPRCN1(NOUT, NC, SNAME, IORDER, TRANSA, TRANSB, M, N,
      $                 K, ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, M, N, K, LDA, LDB, LDC
       REAL             ALPHA, BETA
       CHARACTER*1      TRANSA, TRANSB
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CTA,CTB
 
       IF (TRANSA.EQ.'N')THEN
@@ -736,15 +758,17 @@ SUBROUTINE SPRCN1(NOUT, NC, SNAME, IORDER, TRANSA, TRANSB, M, N,
       WRITE(NOUT, FMT = 9995)NC,SNAME,CRC, CTA,CTB
       WRITE(NOUT, FMT = 9994)M, N, K, ALPHA, LDA, LDB, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', A14, ',', A14, ',', A14, ',')
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', A14, ',', A14, ',', A14, ',')
  9994 FORMAT( 20X, 3( I3, ',' ), F4.1, ', A,', I3, ', B,', I3, ',',
      $ F4.1, ', ', 'C,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE SCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G,
      $                  IORDER )
+      IMPLICIT NONE
 *
 *  Tests SSYMM.
 *
@@ -763,7 +787,7 @@ SUBROUTINE SCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12        SNAME
+      CHARACTER*13        SNAME
 *     .. Array Arguments ..
       REAL               A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -790,9 +814,9 @@ SUBROUTINE SCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       INTRINSIC          MAX
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
-      LOGICAL            OK
+      LOGICAL            LERR, OK
 *     .. Common blocks ..
-      COMMON             /INFOC/INFOT, NOUTC, OK
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
 *     .. Data statements ..
       DATA               ICHS/'LR'/, ICHU/'UL'/
 *     .. Executable Statements ..
@@ -998,20 +1022,20 @@ SUBROUTINE SCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   120 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ', B,', I3, ',', F4.1, ', C,', I3, ')   ',
      $      ' .' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1020,13 +1044,16 @@ SUBROUTINE SCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of SCHK2.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE SPRCN2(NOUT, NC, SNAME, IORDER, SIDE, UPLO, M, N,
      $                 ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, M, N, LDA, LDB, LDC
       REAL             ALPHA, BETA
       CHARACTER*1      SIDE, UPLO
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CS,CU
 
       IF (SIDE.EQ.'L')THEN
@@ -1047,14 +1074,16 @@ SUBROUTINE SPRCN2(NOUT, NC, SNAME, IORDER, SIDE, UPLO, M, N,
       WRITE(NOUT, FMT = 9995)NC,SNAME,CRC, CS,CU
       WRITE(NOUT, FMT = 9994)M, N, ALPHA, LDA, LDB, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', A14, ',', A14, ',', A14, ',')
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', A14, ',', A14, ',', A14, ',')
  9994 FORMAT( 20X, 2( I3, ',' ), F4.1, ', A,', I3, ', B,', I3, ',',
      $ F4.1, ', ', 'C,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE SCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NMAX, A, AA, AS,
      $                  B, BB, BS, CT, G, C, IORDER )
+      IMPLICIT NONE
 *
 *  Tests STRMM and STRSM.
 *
@@ -1073,7 +1102,7 @@ SUBROUTINE SCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12        SNAME
+      CHARACTER*13        SNAME
 *     .. Array Arguments ..
       REAL               A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1101,9 +1130,9 @@ SUBROUTINE SCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       INTRINSIC          MAX
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
-      LOGICAL            OK
+      LOGICAL            LERR, OK
 *     .. Common blocks ..
-      COMMON             /INFOC/INFOT, NOUTC, OK
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
 *     .. Data statements ..
       DATA               ICHU/'UL'/, ICHT/'NTC'/, ICHD/'UN'/, ICHS/'LR'/
 *     .. Executable Statements ..
@@ -1346,20 +1375,20 @@ SUBROUTINE SCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   160 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A12,'(', 4( '''', A1, ''',' ), 2( I3, ',' ),
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', 4( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ', B,', I3, ')        .' )
  9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
      $      '******' )
@@ -1367,13 +1396,16 @@ SUBROUTINE SCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of SCHK3.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE SPRCN3(NOUT, NC, SNAME, IORDER, SIDE, UPLO, TRANSA,
      $                 DIAG, M, N, ALPHA, LDA, LDB)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, M, N, LDA, LDB
       REAL             ALPHA
       CHARACTER*1      SIDE, UPLO, TRANSA, DIAG
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CS, CU, CA, CD
 
       IF (SIDE.EQ.'L')THEN
@@ -1406,15 +1438,17 @@ SUBROUTINE SPRCN3(NOUT, NC, SNAME, IORDER, SIDE, UPLO, TRANSA,
       WRITE(NOUT, FMT = 9995)NC,SNAME,CRC, CS,CU
       WRITE(NOUT, FMT = 9994)CA, CD, M, N, ALPHA, LDA, LDB
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', A14, ',', A14, ',', A14, ',')
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', A14, ',', A14, ',', A14, ',')
  9994 FORMAT( 22X, 2( A14, ',') , 2( I3, ',' ),
      $      F4.1, ', A,', I3, ', B,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE SCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G,
      $                  IORDER )
+      IMPLICIT NONE
 *
 *  Tests SSYRK.
 *
@@ -1433,7 +1467,7 @@ SUBROUTINE SCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12        SNAME
+      CHARACTER*13        SNAME
 *     .. Array Arguments ..
       REAL               A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1461,9 +1495,9 @@ SUBROUTINE SCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       INTRINSIC          MAX
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
-      LOGICAL            OK
+      LOGICAL            LERR, OK
 *     .. Common blocks ..
-      COMMON             /INFOC/INFOT, NOUTC, OK
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
 *     .. Data statements ..
       DATA               ICHT/'NTC'/, ICHU/'UL'/
 *     .. Executable Statements ..
@@ -1672,21 +1706,21 @@ SUBROUTINE SCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   130 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
  9995 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
- 9994 FORMAT( 1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9994 FORMAT( 1X, I6, ': ', A13,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ',', F4.1, ', C,', I3, ')           .' )
  9993 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
      $      '******' )
@@ -1694,13 +1728,16 @@ SUBROUTINE SCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of SCHK4.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE SPRCN4(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
      $                 N, K, ALPHA, LDA, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, N, K, LDA, LDC
       REAL             ALPHA, BETA
       CHARACTER*1      UPLO, TRANSA
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CU, CA
 
       IF (UPLO.EQ.'U')THEN
@@ -1723,15 +1760,17 @@ SUBROUTINE SPRCN4(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
       WRITE(NOUT, FMT = 9995)NC, SNAME, CRC, CU, CA
       WRITE(NOUT, FMT = 9994)N, K, ALPHA, LDA, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', 3( A14, ',') )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', 3( A14, ',') )
  9994 FORMAT( 20X, 2( I3, ',' ),
      $      F4.1, ', A,', I3, ',', F4.1, ', C,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE SCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  AB, AA, AS, BB, BS, C, CC, CS, CT, G, W,
      $                  IORDER )
+      IMPLICIT NONE
 *
 *  Tests SSYR2K.
 *
@@ -1750,7 +1789,7 @@ SUBROUTINE SCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       REAL               EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12        SNAME
+      CHARACTER*13        SNAME
 *     .. Array Arguments ..
       REAL               AA( NMAX*NMAX ), AB( 2*NMAX*NMAX ),
      $                   ALF( NALF ), AS( NMAX*NMAX ), BB( NMAX*NMAX ),
@@ -1778,9 +1817,9 @@ SUBROUTINE SCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       INTRINSIC          MAX
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
-      LOGICAL            OK
+      LOGICAL            LERR, OK
 *     .. Common blocks ..
-      COMMON             /INFOC/INFOT, NOUTC, OK
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
 *     .. Data statements ..
       DATA               ICHT/'NTC'/, ICHU/'UL'/
 *     .. Executable Statements ..
@@ -2027,21 +2066,21 @@ SUBROUTINE SCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   160 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
  9995 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
- 9994 FORMAT( 1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9994 FORMAT( 1X, I6, ': ', A13,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      F4.1, ', A,', I3, ', B,', I3, ',', F4.1, ', C,', I3, ')   ',
      $      ' .' )
  9993 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -2050,13 +2089,16 @@ SUBROUTINE SCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of SCHK5.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE SPRCN5(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
      $                 N, K, ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, N, K, LDA, LDB, LDC
       REAL             ALPHA, BETA
       CHARACTER*1      UPLO, TRANSA
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CU, CA
 
       IF (UPLO.EQ.'U')THEN
@@ -2079,13 +2121,15 @@ SUBROUTINE SPRCN5(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
       WRITE(NOUT, FMT = 9995)NC, SNAME, CRC, CU, CA
       WRITE(NOUT, FMT = 9994)N, K, ALPHA, LDA, LDB, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', 3( A14, ',') )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', 3( A14, ',') )
  9994 FORMAT( 20X, 2( I3, ',' ),
      $      F4.1, ', A,', I3, ', B', I3, ',', F4.1, ', C,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE SMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, RESET,
      $                  TRANSL )
+      IMPLICIT NONE
 *
 *  Generates values for an M by N matrix A.
 *  Stores the values in the array AA in the data structure required
@@ -2197,9 +2241,12 @@ SUBROUTINE SMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, RESET,
 *     End of SMAKE.
 *
       END
+
+*  =====================================================================
       SUBROUTINE SMMCH( TRANSA, TRANSB, M, N, KK, ALPHA, A, LDA, B, LDB,
      $                  BETA, C, LDC, CT, G, CC, LDCC, EPS, ERR, FATAL,
      $                  NOUT, MV )
+      IMPLICIT NONE
 *
 *  Checks the results of the computational tests.
 *
@@ -2319,7 +2366,10 @@ SUBROUTINE SMMCH( TRANSA, TRANSB, M, N, KK, ALPHA, A, LDA, B, LDB,
 *     End of SMMCH.
 *
       END
+
+*  =====================================================================
       LOGICAL FUNCTION LSE( RI, RJ, LR )
+      IMPLICIT NONE
 *
 *  Tests if two arrays are identical.
 *
@@ -2351,7 +2401,10 @@ LOGICAL FUNCTION LSE( RI, RJ, LR )
 *     End of LSE.
 *
       END
+
+*  =====================================================================
       LOGICAL FUNCTION LSERES( TYPE, UPLO, M, N, AA, AS, LDA )
+      IMPLICIT NONE
 *
 *  Tests if selected elements in two arrays are equal.
 *
@@ -2413,7 +2466,10 @@ LOGICAL FUNCTION LSERES( TYPE, UPLO, M, N, AA, AS, LDA )
 *     End of LSERES.
 *
       END
+
+*  =====================================================================
       REAL FUNCTION SBEG( RESET )
+      IMPLICIT NONE
 *
 *  Generates random numbers uniformly distributed between -0.5 and 0.5.
 *
@@ -2459,7 +2515,10 @@ REAL FUNCTION SBEG( RESET )
 *     End of SBEG.
 *
       END
+
+*  =====================================================================
       REAL FUNCTION SDIFF( X, Y )
+      IMPLICIT NONE
 *
 *  Auxiliary routine for test program for Level 3 Blas.
 *
@@ -2478,3 +2537,481 @@ REAL FUNCTION SDIFF( X, Y )
 *     End of SDIFF.
 *
       END
+
+*  =====================================================================
+      SUBROUTINE SCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
+     $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
+     $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G,
+     $                  IORDER)
+      IMPLICIT NONE
+*
+*  Tests SGEMMTR.
+*
+*  Auxiliary routine for test program for Level 3 Blas.
+*
+*  -- Written on 19-July-2023.
+*     Martin Koehler, MPI Magdeburg
+*
+*     .. Parameters ..
+      REAL   ZERO
+      PARAMETER          ( ZERO = 0.0 )
+*     .. Scalar Arguments ..
+      REAL               EPS, THRESH
+      INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
+      LOGICAL            FATAL, REWI, TRACE
+      CHARACTER*13       SNAME
+*     .. Array Arguments ..
+      REAL               A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
+     $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
+     $                   BB( NMAX*NMAX ), BET( NBET ), BS( NMAX*NMAX ),
+     $                   C( NMAX, NMAX ), CC( NMAX*NMAX ),
+     $                   CS( NMAX*NMAX ), CT( NMAX ), G( NMAX )
+      INTEGER            IDIM( NIDIM )
+*     .. Local Scalars ..
+      REAL               ALPHA, ALS, BETA, BLS, ERR, ERRMAX
+      INTEGER            I, IA, IB, ICA, ICB, IK, IN, K, KS, LAA,
+     $                   LBB, LCC, LDA, LDAS, LDB, LDBS, LDC, LDCS,
+     $                   MA, MB, N, NA, NARGS, NB, NC, NS, IS
+      LOGICAL            NULL, RESET, SAME, TRANA, TRANB
+      CHARACTER*1        TRANAS, TRANBS, TRANSA, TRANSB, UPLO, UPLOS
+      CHARACTER*3        ICH
+      CHARACTER*2        ISHAPE
+*     .. Local Arrays ..
+      LOGICAL            ISAME( 13 )
+*     .. External Functions ..
+      LOGICAL            LSE, LSERES
+      EXTERNAL           LSE, LSERES
+*     .. External Subroutines ..
+      EXTERNAL           CSGEMMTR, SMAKE, SMMTCH, SPRCN8
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX
+*     .. Scalars in Common ..
+      INTEGER            INFOT, NOUTC
+      LOGICAL            LERR, OK
+*     .. Common blocks ..
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
+*     .. Data statements ..
+      DATA               ICH/'NTC'/
+      DATA               ISHAPE/'UL'/
+*     .. Executable Statements ..
+*
+      NARGS = 13
+      NC = 0
+      RESET = .TRUE.
+      ERRMAX = ZERO
+*
+      DO 100 IN = 1, NIDIM
+         N = IDIM( IN )
+*        Set LDC to 1 more than minimum value if room.
+         LDC = N
+         IF( LDC.LT.NMAX )
+     $      LDC = LDC + 1
+*        Skip tests if not enough room.
+         IF( LDC.GT.NMAX )
+     $      GO TO 100
+         LCC = LDC*N
+         NULL = N.LE.0
+*
+         DO 90 IK = 1, NIDIM
+            K = IDIM( IK )
+*
+            DO 80 ICA = 1, 3
+               TRANSA = ICH( ICA: ICA )
+               TRANA = TRANSA.EQ.'T'.OR.TRANSA.EQ.'C'
+*
+               IF( TRANA )THEN
+                  MA = K
+                  NA = N
+               ELSE
+                  MA = N
+                  NA = K
+               END IF
+*              Set LDA to 1 more than minimum value if room.
+               LDA = MA
+               IF( LDA.LT.NMAX )
+     $            LDA = LDA + 1
+*              Skip tests if not enough room.
+               IF( LDA.GT.NMAX )
+     $            GO TO 80
+               LAA = LDA*NA
+*
+*              Generate the matrix A.
+*
+               CALL SMAKE( 'GE', ' ', ' ', MA, NA, A, NMAX, AA, LDA,
+     $                     RESET, ZERO )
+*
+               DO 70 ICB = 1, 3
+                  TRANSB = ICH( ICB: ICB )
+                  TRANB = TRANSB.EQ.'T'.OR.TRANSB.EQ.'C'
+*
+                  IF( TRANB )THEN
+                     MB = N
+                     NB = K
+                  ELSE
+                     MB = K
+                     NB = N
+                  END IF
+*                 Set LDB to 1 more than minimum value if room.
+                  LDB = MB
+                  IF( LDB.LT.NMAX )
+     $               LDB = LDB + 1
+*                 Skip tests if not enough room.
+                  IF( LDB.GT.NMAX )
+     $               GO TO 70
+                  LBB = LDB*NB
+*
+*                 Generate the matrix B.
+*
+                  CALL SMAKE( 'GE', ' ', ' ', MB, NB, B, NMAX, BB,
+     $                        LDB, RESET, ZERO )
+*
+                  DO 60 IA = 1, NALF
+                     ALPHA = ALF( IA )
+*
+                     DO 50 IB = 1, NBET
+                        BETA = BET( IB )
+
+                        DO 45 IS = 1, 2
+                           UPLO = ISHAPE( IS: IS )
+
+*
+*                          Generate the matrix C.
+*
+                           CALL SMAKE( 'GE', UPLO, ' ', N, N, C,
+     $                                 NMAX, CC, LDC, RESET, ZERO )
+*
+                           NC = NC + 1
+*
+*                          Save every datum before calling the
+*                          subroutine.
+*
+                           UPLOS = UPLO
+                           TRANAS = TRANSA
+                           TRANBS = TRANSB
+                           NS = N
+                           KS = K
+                           ALS = ALPHA
+                           DO 10 I = 1, LAA
+                              AS( I ) = AA( I )
+   10                      CONTINUE
+                           LDAS = LDA
+                           DO 20 I = 1, LBB
+                              BS( I ) = BB( I )
+   20                      CONTINUE
+                           LDBS = LDB
+                           BLS = BETA
+                           DO 30 I = 1, LCC
+                              CS( I ) = CC( I )
+   30                      CONTINUE
+                           LDCS = LDC
+*
+*                          Call the subroutine.
+*
+                           IF( TRACE )
+     $                        CALL SPRCN8(NTRA, NC, SNAME, IORDER, UPLO,
+     $                        TRANSA, TRANSB, N, K, ALPHA, LDA,
+     $                        LDB, BETA, LDC)
+                           IF( REWI )
+     $                        REWIND NTRA
+                           CALL CSGEMMTR( IORDER, UPLO, TRANSA, TRANSB,
+     $                                  N, K, ALPHA, AA, LDA, BB, LDB,
+     $                                  BETA, CC, LDC )
+*
+*                          Check if error-exit was taken incorrectly.
+*
+                           IF( .NOT.OK )THEN
+                              WRITE( NOUT, FMT = 9994 )
+                              FATAL = .TRUE.
+                              GO TO 120
+                           END IF
+*
+*                          See what data changed inside subroutines.
+*
+                           ISAME( 1 ) = UPLO.EQ.UPLOS
+                           ISAME( 2 ) = TRANSA.EQ.TRANAS
+                           ISAME( 3 ) = TRANSB.EQ.TRANBS
+                           ISAME( 4 ) = NS.EQ.N
+                           ISAME( 5 ) = KS.EQ.K
+                           ISAME( 6 ) = ALS.EQ.ALPHA
+                           ISAME( 7 ) = LSE( AS, AA, LAA )
+                           ISAME( 8 ) = LDAS.EQ.LDA
+                           ISAME( 9 ) = LSE( BS, BB, LBB )
+                           ISAME( 10 ) = LDBS.EQ.LDB
+                           ISAME( 11 ) = BLS.EQ.BETA
+                           IF( NULL )THEN
+                              ISAME( 12 ) = LSE( CS, CC, LCC )
+                           ELSE
+                              ISAME( 12 ) = LSERES( 'GE', ' ', N, N,
+     $                                          CS, CC, LDC )
+                           END IF
+                           ISAME( 13 ) = LDCS.EQ.LDC
+*
+*                          If data was incorrectly changed, report
+*                          and return.
+*
+                           SAME = .TRUE.
+                           DO 40 I = 1, NARGS
+                              SAME = SAME.AND.ISAME( I )
+                              IF( .NOT.ISAME( I ) )
+     $                           WRITE( NOUT, FMT = 9998 )I
+   40                      CONTINUE
+                           IF( .NOT.SAME )THEN
+                              FATAL = .TRUE.
+                              GO TO 120
+                           END IF
+*
+                           IF( .NOT.NULL )THEN
+*
+*                             Check the result.
+*
+                              CALL SMMTCH( UPLO, TRANSA, TRANSB,
+     $                                 N, K,
+     $                                 ALPHA, A, NMAX, B, NMAX, BETA,
+     $                                 C, NMAX, CT, G, CC, LDC, EPS,
+     $                                 ERR, FATAL, NOUT, .TRUE. )
+                              ERRMAX = MAX( ERRMAX, ERR )
+*                             If got really bad answer, report and
+*                             return.
+                              IF( FATAL )
+     $                           GO TO 120
+                           END IF
+*
+   45                   CONTINUE
+*
+   50                CONTINUE
+*
+   60             CONTINUE
+*
+   70          CONTINUE
+*
+   80       CONTINUE
+*
+   90    CONTINUE
+*
+  100 CONTINUE
+*
+*
+*     Report result.
+*
+      IF( ERRMAX.LT.THRESH )THEN
+         IF ( IORDER.EQ.0) WRITE( NOUT, FMT = 10000 )SNAME, NC
+         IF ( IORDER.EQ.1) WRITE( NOUT, FMT = 10001 )SNAME, NC
+      ELSE
+         IF ( IORDER.EQ.0) WRITE( NOUT, FMT = 10002 )SNAME, NC, ERRMAX
+         IF ( IORDER.EQ.1) WRITE( NOUT, FMT = 10003 )SNAME, NC, ERRMAX
+      END IF
+      GO TO 130
+*
+  120 CONTINUE
+      WRITE( NOUT, FMT = 9996 )SNAME
+      CALL SPRCN8(NOUT, NC, SNAME, IORDER, UPLO, TRANSA, TRANSB,
+     $           N, K, ALPHA, LDA, LDB, BETA, LDC)
+*
+  130 CONTINUE
+      RETURN
+*
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+     $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
+     $ 'RATIO ', F8.2, ' - SUSPECT *******' )
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+     $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
+     $ 'RATIO ', F8.2, ' - SUSPECT *******' )
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+     $ ' (', I6, ' CALL', 'S)' )
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+     $ ' (', I6, ' CALL', 'S)' )
+ 9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
+     $      'ANGED INCORRECTLY *******' )
+ 9997 FORMAT( ' ', A13, ' COMPLETED THE COMPUTATIONAL TESTS (', I6,
+     $      ' C', 'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO',
+     $      F8.2, ' - SUSPECT *******' )
+ 9996 FORMAT( ' ******* ', A13, ' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A13, '(''',A1, ''',''',A1, ''',''', A1,
+     $      ''',', 2( I3, ',' ), F4.1, ', A,', I3, ', B,', I3, ',',
+     $      F4.1, ', ', 'C,', I3, ').' )
+ 9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
+     $      '******' )
+*
+*     End of SCHK6
+*
+      END
+
+*  =====================================================================
+      SUBROUTINE SPRCN8(NOUT, NC, SNAME, IORDER, UPLO,
+     $                 TRANSA, TRANSB, N,
+     $                 K, ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
+
+      INTEGER          NOUT, NC, IORDER, N, K, LDA, LDB, LDC
+      REAL             ALPHA, BETA
+      CHARACTER*1      TRANSA, TRANSB, UPLO
+      CHARACTER*13     SNAME
+      CHARACTER*14     CRC, CTA,CTB,CUPLO
+
+      IF (UPLO.EQ.'U') THEN
+          CUPLO = 'CblasUpper'
+      ELSE
+          CUPLO = 'CblasLower'
+      END IF
+      IF (TRANSA.EQ.'N')THEN
+         CTA = '  CblasNoTrans'
+      ELSE IF (TRANSA.EQ.'T')THEN
+         CTA = '    CblasTrans'
+      ELSE
+         CTA = 'CblasConjTrans'
+      END IF
+      IF (TRANSB.EQ.'N')THEN
+         CTB = '  CblasNoTrans'
+      ELSE IF (TRANSB.EQ.'T')THEN
+         CTB = '    CblasTrans'
+      ELSE
+         CTB = 'CblasConjTrans'
+      END IF
+      IF (IORDER.EQ.1)THEN
+         CRC = ' CblasRowMajor'
+      ELSE
+         CRC = ' CblasColMajor'
+      END IF
+      WRITE(NOUT, FMT = 9995)NC,SNAME,CRC, CUPLO, CTA,CTB
+      WRITE(NOUT, FMT = 9994)N, K, ALPHA, LDA, LDB, BETA, LDC
+
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', A14, ',', A14, ',', A14, ',',
+     $        A14, ',')
+ 9994 FORMAT( 10X, 2( I3, ',' ) ,' ', F4.1,' , A,',
+     $ I3, ', B,', I3, ', ', F4.1,' , C,', I3, ').' )
+      END
+
+*  =====================================================================
+      SUBROUTINE SMMTCH( UPLO, TRANSA, TRANSB, N, KK, ALPHA, A, LDA,
+     $                  B, LDB, BETA, C, LDC, CT, G, CC, LDCC, EPS, ERR,
+     $                  FATAL, NOUT, MV )
+      IMPLICIT NONE
+*
+*  Checks the results of the computational tests.
+*
+*  Auxiliary routine for test program for Level 3 Blas. (DGEMMTR)
+*
+*  -- Written on 19-July-2023.
+*     Martin Koehler, MPI Magdeburg
+*
+*     .. Parameters ..
+      REAL               ZERO, ONE
+      PARAMETER          ( ZERO = 0.0, ONE = 1.0 )
+*     .. Scalar Arguments ..
+      REAL   ALPHA, BETA, EPS, ERR
+      INTEGER            KK, LDA, LDB, LDC, LDCC, N, NOUT
+      LOGICAL            FATAL, MV
+      CHARACTER*1        UPLO, TRANSA, TRANSB
+*     .. Array Arguments ..
+      REAL               A( LDA, * ), B( LDB, * ), C( LDC, * ),
+     $                   CC( LDCC, * ), CT( * ), G( * )
+*     .. Local Scalars ..
+      REAL   ERRI
+      INTEGER            I, J, K, ISTART, ISTOP
+      LOGICAL            TRANA, TRANB, UPPER
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, SQRT
+*     .. Executable Statements ..
+      UPPER = UPLO.EQ.'U'
+      TRANA = TRANSA.EQ.'T'.OR.TRANSA.EQ.'C'
+      TRANB = TRANSB.EQ.'T'.OR.TRANSB.EQ.'C'
+*
+*     Compute expected result, one column at a time, in CT using data
+*     in A, B and C.
+*     Compute gauges in G.
+*
+      ISTART = 1
+      ISTOP  = N
+
+      DO 120 J = 1, N
+*
+         IF ( UPPER ) THEN
+             ISTART = 1
+             ISTOP = J
+         ELSE
+             ISTART = J
+             ISTOP = N
+         END IF
+         DO 10 I = ISTART, ISTOP
+            CT( I ) = ZERO
+            G( I ) = ZERO
+   10    CONTINUE
+         IF( .NOT.TRANA.AND..NOT.TRANB )THEN
+            DO 30 K = 1, KK
+               DO 20 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( I, K )*B( K, J )
+                  G( I ) = G( I ) + ABS( A( I, K ) )*ABS( B( K, J ) )
+   20          CONTINUE
+   30       CONTINUE
+         ELSE IF( TRANA.AND..NOT.TRANB )THEN
+            DO 50 K = 1, KK
+               DO 40 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( K, I )*B( K, J )
+                  G( I ) = G( I ) + ABS( A( K, I ) )*ABS( B( K, J ) )
+   40          CONTINUE
+   50       CONTINUE
+         ELSE IF( .NOT.TRANA.AND.TRANB )THEN
+            DO 70 K = 1, KK
+               DO 60 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( I, K )*B( J, K )
+                  G( I ) = G( I ) + ABS( A( I, K ) )*ABS( B( J, K ) )
+   60          CONTINUE
+   70       CONTINUE
+         ELSE IF( TRANA.AND.TRANB )THEN
+            DO 90 K = 1, KK
+               DO 80 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( K, I )*B( J, K )
+                  G( I ) = G( I ) + ABS( A( K, I ) )*ABS( B( J, K ) )
+   80          CONTINUE
+   90       CONTINUE
+         END IF
+         DO 100 I = ISTART, ISTOP
+            CT( I ) = ALPHA*CT( I ) + BETA*C( I, J )
+            G( I ) = ABS( ALPHA )*G( I ) + ABS( BETA )*ABS( C( I, J ) )
+  100    CONTINUE
+*
+*        Compute the error ratio for this result.
+*
+         ERR = ZERO
+         DO 110 I = ISTART, ISTOP
+            ERRI = ABS( CT( I ) - CC( I, J ) )/EPS
+            IF( G( I ).NE.ZERO )
+     $         ERRI = ERRI/G( I )
+            ERR = MAX( ERR, ERRI )
+            IF( ERR*SQRT( EPS ).GE.ONE )
+     $         GO TO 130
+  110    CONTINUE
+*
+  120 CONTINUE
+*
+*     If the loop completes, all results are at least half accurate.
+      GO TO 150
+*
+*     Report fatal error.
+*
+  130 FATAL = .TRUE.
+      WRITE( NOUT, FMT = 9999 )
+      DO 140 I = ISTART, ISTOP
+         IF( MV )THEN
+            WRITE( NOUT, FMT = 9998 )I, CT( I ), CC( I, J )
+         ELSE
+            WRITE( NOUT, FMT = 9998 )I, CC( I, J ), CT( I )
+         END IF
+  140 CONTINUE
+      IF( N.GT.1 )
+     $   WRITE( NOUT, FMT = 9997 )J
+*
+  150 CONTINUE
+      RETURN
+*
+ 9999 FORMAT( ' ******* FATAL ERROR - COMPUTED RESULT IS LESS THAN HAL',
+     $      'F ACCURATE *******', /'           EXPECTED RESULT   COMPU',
+     $      'TED RESULT' )
+ 9998 FORMAT( 1X, I7, 2G18.6 )
+ 9997 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
+*
+*     End of SMMTCH
+*
+      END
+
+
diff --git a/CBLAS/testing/c_xerbla.c b/CBLAS/testing/c_xerbla.c
index 8c6674e11b..2b88a39d67 100644
--- a/CBLAS/testing/c_xerbla.c
+++ b/CBLAS/testing/c_xerbla.c
@@ -7,8 +7,8 @@
 
 void cblas_xerbla(CBLAS_INT info, const char *rout, const char *form, ...)
 {
-   extern int cblas_lerr, cblas_info, cblas_ok;
-   extern int link_xerbla;
+   extern CBLAS_INT cblas_lerr, cblas_info, cblas_ok;
+   extern CBLAS_INT link_xerbla;
    extern int RowMajorStrg;
    extern char *cblas_rout;
 
@@ -33,13 +33,18 @@ void cblas_xerbla(CBLAS_INT info, const char *rout, const char *form, ...)
        * for A and B, lda is in position 11 instead of 9, and ldb is in
        * position 9 instead of 11.
        */
-      if (strstr(rout,"gemm") != 0)
+      if (strstr(rout,"gemm") != 0 && strstr(rout, "gemmtr") == 0)
       {
          if      (info == 5 ) info =  4;
          else if (info == 4 ) info =  5;
          else if (info == 11) info =  9;
          else if (info == 9 ) info = 11;
+      } else if (strstr(rout, "gemmtr") != 0)
+      {
+         if (info == 11) info =  9;
+         else if (info == 9 ) info = 11;
       }
+
       else if (strstr(rout,"symm") != 0 || strstr(rout,"hemm") != 0)
       {
          if      (info == 5 ) info =  4;
@@ -78,32 +83,36 @@ void cblas_xerbla(CBLAS_INT info, const char *rout, const char *form, ...)
    }
 
    if (info != cblas_info){
-      printf("***** XERBLA WAS CALLED WITH INFO = %d INSTEAD OF %d in %s *******\n",info, cblas_info, rout);
+      printf("***** XERBLA WAS CALLED WITH INFO = %" CBLAS_IFMT " INSTEAD OF %d in %s *******\n",info, (int) cblas_info, rout);
       cblas_lerr = PASSED;
       cblas_ok = FALSE;
    } else cblas_lerr = FAILED;
 }
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo)
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
-void F77_xerbla(char *srname, void *vinfo)
+void F77_xerbla(char *srname, void *vinfo
 #endif
+#ifdef BLAS_FORTRAN_STRLEN_END
+, FORTRAN_STRLEN srname_len
+#endif
+)
 {
 #ifdef F77_Char
    char *srname;
 #endif
 
-   char rout[] = {'c','b','l','a','s','_','\0','\0','\0','\0','\0','\0','\0'};
+   char rout[] = {'c','b','l','a','s','_','\0','\0','\0','\0','\0','\0','\0', '\0', '\0'};
 
 #ifdef F77_Integer
    F77_Integer *info=vinfo;
    F77_Integer i;
    extern F77_Integer link_xerbla;
 #else
-   int *info=vinfo;
-   int i;
-   extern int link_xerbla;
+   CBLAS_INT *info=vinfo;
+   CBLAS_INT i;
+   extern CBLAS_INT link_xerbla;
 #endif
 #ifdef F77_Char
    srname = F2C_STR(F77_srname, XerblaStrLen);
@@ -115,8 +124,12 @@ void F77_xerbla(char *srname, void *vinfo)
       link_xerbla = 0;
       return;
    }
-   for(i=0;  i  < 6; i++) rout[i+6] = tolower(srname[i]);
-   for(i=11; i >= 9; i--) if (rout[i] == ' ') rout[i] = '\0';
+#ifndef BLAS_FORTRAN_STRLEN_END
+   const int srname_len = 6;
+#endif
+
+   for(i=0;  i  < srname_len; i++) rout[i+6] = tolower(srname[i]);
+   for(i=13; i >= 9; i--) if (rout[i] == ' ') rout[i] = '\0';
 
    /* We increment *info by 1 since the CBLAS interface adds one more
     * argument to all level 2 and 3 routines.
diff --git a/CBLAS/testing/c_z2chke.c b/CBLAS/testing/c_z2chke.c
index 65e552da3e..f86c483c2a 100644
--- a/CBLAS/testing/c_z2chke.c
+++ b/CBLAS/testing/c_z2chke.c
@@ -3,28 +3,36 @@
 #include "cblas.h"
 #include "cblas_test.h"
 
-int cblas_ok, cblas_lerr, cblas_info;
-int link_xerbla=TRUE;
+CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
+CBLAS_INT link_xerbla=TRUE;
 char *cblas_rout;
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo);
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
-void F77_xerbla(char *srname, void *vinfo);
+void F77_xerbla(char *srname, void *vinfo
 #endif
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN srname_len
+#endif
+);
 
 void chkxer(void) {
-   extern int cblas_ok, cblas_lerr, cblas_info;
-   extern int link_xerbla;
+   extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
+   extern CBLAS_INT link_xerbla;
    extern char *cblas_rout;
    if (cblas_lerr == 1 ) {
-      printf("***** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s *****\n", cblas_info, cblas_rout);
+      printf("***** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s *****\n", (int) cblas_info, cblas_rout);
       cblas_ok = 0 ;
    }
    cblas_lerr = 1 ;
 }
 
-void F77_z2chke(char *rout) {
+void F77_z2chke(char *rout
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rout_len
+#endif
+) {
    char *sf = ( rout ) ;
    double  A[2] = {0.0,0.0},
           X[2] = {0.0,0.0},
@@ -32,7 +40,7 @@ void F77_z2chke(char *rout) {
           ALPHA[2] = {0.0,0.0},
           BETA[2]  = {0.0,0.0},
           RALPHA = 0.0;
-   extern int cblas_info, cblas_lerr, cblas_ok;
+   extern CBLAS_INT cblas_info, cblas_lerr, cblas_ok;
    extern int RowMajorStrg;
    extern char *cblas_rout;
 
@@ -40,10 +48,11 @@ void F77_z2chke(char *rout) {
    if (link_xerbla) /* call these first to link */
    {
       cblas_xerbla(cblas_info,cblas_rout,"");
-      F77_xerbla(cblas_rout,&cblas_info);
+      F77_xerbla(cblas_rout,&cblas_info, 1);
    }
 #endif
 
+   link_xerbla = 0;
    cblas_ok = TRUE ;
    cblas_lerr = PASSED ;
 
diff --git a/CBLAS/testing/c_z3chke.c b/CBLAS/testing/c_z3chke.c
index 30840489af..44febcaff8 100644
--- a/CBLAS/testing/c_z3chke.c
+++ b/CBLAS/testing/c_z3chke.c
@@ -3,28 +3,36 @@
 #include "cblas.h"
 #include "cblas_test.h"
 
-int cblas_ok, cblas_lerr, cblas_info;
-int link_xerbla=TRUE;
+CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
+CBLAS_INT link_xerbla=TRUE;
 char *cblas_rout;
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo);
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
-void F77_xerbla(char *srname, void *vinfo);
+void F77_xerbla(char *srname, void *vinfo
 #endif
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN srname_len
+#endif
+);
 
 void chkxer(void) {
-   extern int cblas_ok, cblas_lerr, cblas_info;
-   extern int link_xerbla;
+   extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
+   extern CBLAS_INT link_xerbla;
    extern char *cblas_rout;
    if (cblas_lerr == 1 ) {
-      printf("***** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s *****\n", cblas_info, cblas_rout);
+      printf("***** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s *****\n", (int) cblas_info, cblas_rout);
       cblas_ok = 0 ;
    }
    cblas_lerr = 1 ;
 }
 
-void  F77_z3chke(char *  rout) {
+void F77_z3chke(char *rout
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rout_len
+#endif
+) {
    char *sf = ( rout ) ;
    double  A[4]     = {0.0,0.0,0.0,0.0},
            B[4]     = {0.0,0.0,0.0,0.0},
@@ -32,7 +40,7 @@ void  F77_z3chke(char *  rout) {
            ALPHA[2] = {0.0,0.0},
            BETA[2]  = {0.0,0.0},
            RALPHA   = 0.0, RBETA = 0.0;
-   extern int cblas_info, cblas_lerr, cblas_ok;
+   extern CBLAS_INT cblas_info, cblas_lerr, cblas_ok;
    extern int RowMajorStrg;
    extern char *cblas_rout;
 
@@ -43,11 +51,242 @@ void  F77_z3chke(char *  rout) {
    if (link_xerbla) /* call these first to link */
    {
       cblas_xerbla(cblas_info,cblas_rout,"");
-      F77_xerbla(cblas_rout,&cblas_info);
+      F77_xerbla(cblas_rout,&cblas_info, 1);
    }
 #endif
 
-   if (strncmp( sf,"cblas_zgemm"   ,11)==0) {
+   link_xerbla = 0;
+   if (strncmp( sf,"cblas_zgemmtr"   ,13)==0) {
+      cblas_rout = "cblas_zgemmtr"   ;
+
+      cblas_info = 1;
+      cblas_zgemmtr( INVALID, CblasUpper, CblasNoTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_zgemmtr( INVALID, CblasUpper, CblasNoTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_zgemmtr( INVALID, CblasUpper,CblasTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_zgemmtr( INVALID, CblasUpper, CblasTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 1;
+      cblas_zgemmtr( INVALID, CblasLower, CblasNoTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_zgemmtr( INVALID, CblasLower, CblasNoTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_zgemmtr( INVALID, CblasLower,CblasTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_zgemmtr( INVALID, CblasLower, CblasTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 2; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  INVALID, CblasNoTrans, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 2; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  INVALID, CblasNoTrans, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 3; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, INVALID, CblasNoTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 3; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, INVALID, CblasTrans, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 4; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor, CblasUpper,  CblasNoTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor, CblasUpper, CblasTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 1, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+
+      /* Row Major */
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasNoTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasTrans, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasTrans, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 9;  RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasTrans, 0, 2,
+                   ALPHA, A, 1, B, 2, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 1, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasNoTrans, 0, 2,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasColMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasRowMajor,  CblasUpper, CblasNoTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasNoTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_zgemmtr( CblasRowMajor,  CblasUpper, CblasTrans, CblasTrans, 2, 0,
+                   ALPHA, A, 2, B, 2, BETA, C, 1 );
+      chkxer();
+
+   } else if (strncmp( sf,"cblas_zgemm"   ,11)==0) {
       cblas_rout = "cblas_zgemm"   ;
 
       cblas_info = 1;
@@ -1702,7 +1941,7 @@ void  F77_z3chke(char *  rout) {
    }
 
    if (cblas_ok == 1 )
-       printf(" %-12s PASSED THE TESTS OF ERROR-EXITS\n", cblas_rout);
+       printf(" %-13s PASSED THE TESTS OF ERROR-EXITS\n", cblas_rout);
    else
        printf("***** %s FAILED THE TESTS OF ERROR-EXITS *******\n",cblas_rout);
 }
diff --git a/CBLAS/testing/c_zblas1.c b/CBLAS/testing/c_zblas1.c
index 2b21d8f187..48d7eaf61f 100644
--- a/CBLAS/testing/c_zblas1.c
+++ b/CBLAS/testing/c_zblas1.c
@@ -8,67 +8,75 @@
  */
 #include "cblas_test.h"
 #include "cblas.h"
-void F77_zaxpy(const int *N, const void *alpha, void *X,
-                    const int *incX, void *Y, const int *incY)
+void F77_zaxpy(const CBLAS_INT *N, const void *alpha, void *X,
+                    const CBLAS_INT *incX, void *Y, const CBLAS_INT *incY)
 {
    cblas_zaxpy(*N, alpha, X, *incX, Y, *incY);
    return;
 }
 
-void F77_zcopy(const int *N, void *X, const int *incX,
-                    void *Y, const int *incY)
+
+void F77_zaxpby(const CBLAS_INT *N, const void *alpha, void *X,
+                    const CBLAS_INT *incX, const void *beta, void *Y, const CBLAS_INT *incY)
+{
+   cblas_zaxpby(*N, alpha, X, *incX, beta, Y, *incY);
+   return;
+}
+
+void F77_zcopy(const CBLAS_INT *N, void *X, const CBLAS_INT *incX,
+                    void *Y, const CBLAS_INT *incY)
 {
    cblas_zcopy(*N, X, *incX, Y, *incY);
    return;
 }
 
-void F77_zdotc(const int *N, const void *X, const int *incX,
-                     const void *Y, const int *incY,void *dotc)
+void F77_zdotc(const CBLAS_INT *N, const void *X, const CBLAS_INT *incX,
+                     const void *Y, const CBLAS_INT *incY,void *dotc)
 {
    cblas_zdotc_sub(*N, X, *incX, Y, *incY, dotc);
    return;
 }
 
-void F77_zdotu(const int *N, void *X, const int *incX,
-                        void *Y, const int *incY,void *dotu)
+void F77_zdotu(const CBLAS_INT *N, void *X, const CBLAS_INT *incX,
+                        void *Y, const CBLAS_INT *incY,void *dotu)
 {
    cblas_zdotu_sub(*N, X, *incX, Y, *incY, dotu);
    return;
 }
 
-void F77_zdscal(const int *N, const double *alpha, void *X,
-                         const int *incX)
+void F77_zdscal(const CBLAS_INT *N, const double *alpha, void *X,
+                         const CBLAS_INT *incX)
 {
    cblas_zdscal(*N, *alpha, X, *incX);
    return;
 }
 
-void F77_zscal(const int *N, const void * *alpha, void *X,
-                         const int *incX)
+void F77_zscal(const CBLAS_INT *N, const void * *alpha, void *X,
+                         const CBLAS_INT *incX)
 {
    cblas_zscal(*N, alpha, X, *incX);
    return;
 }
 
-void F77_zswap( const int *N, void *X, const int *incX,
-                          void *Y, const int *incY)
+void F77_zswap( const CBLAS_INT *N, void *X, const CBLAS_INT *incX,
+                          void *Y, const CBLAS_INT *incY)
 {
    cblas_zswap(*N,X,*incX,Y,*incY);
    return;
 }
 
-int F77_izamax(const int *N, const void *X, const int *incX)
+CBLAS_INT F77_izamax(const CBLAS_INT *N, const void *X, const CBLAS_INT *incX)
 {
    if (*N < 1 || *incX < 1) return(0);
    return(cblas_izamax(*N, X, *incX)+1);
 }
 
-double F77_dznrm2(const int *N, const void *X, const int *incX)
+double F77_dznrm2(const CBLAS_INT *N, const void *X, const CBLAS_INT *incX)
 {
    return cblas_dznrm2(*N, X, *incX);
 }
 
-double F77_dzasum(const int *N, void *X, const int *incX)
+double F77_dzasum(const CBLAS_INT *N, void *X, const CBLAS_INT *incX)
 {
    return cblas_dzasum(*N, X, *incX);
 }
diff --git a/CBLAS/testing/c_zblas2.c b/CBLAS/testing/c_zblas2.c
index b6fbdd628d..0de71d2497 100644
--- a/CBLAS/testing/c_zblas2.c
+++ b/CBLAS/testing/c_zblas2.c
@@ -8,13 +8,17 @@
 #include "cblas.h"
 #include "cblas_test.h"
 
-void F77_zgemv(int *layout, char *transp, int *m, int *n,
+void F77_zgemv(CBLAS_INT *layout, char *transp, CBLAS_INT *m, CBLAS_INT *n,
           const void *alpha,
-          CBLAS_TEST_ZOMPLEX *a, int *lda, const void *x, int *incx,
-          const void *beta, void *y, int *incy) {
+          CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda, const void *x, CBLAS_INT *incx,
+          const void *beta, void *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN transp_len
+#endif
+) {
 
   CBLAS_TEST_ZOMPLEX *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_TRANSPOSE trans;
 
   get_transpose_type(transp, &trans);
@@ -38,13 +42,17 @@ void F77_zgemv(int *layout, char *transp, int *m, int *n,
                   *m, *n, alpha, a, *lda, x, *incx, beta, y, *incy );
 }
 
-void F77_zgbmv(int *layout, char *transp, int *m, int *n, int *kl, int *ku,
-	      CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-	      CBLAS_TEST_ZOMPLEX *x, int *incx,
-	      CBLAS_TEST_ZOMPLEX *beta, CBLAS_TEST_ZOMPLEX *y, int *incy) {
+void F77_zgbmv(CBLAS_INT *layout, char *transp, CBLAS_INT *m, CBLAS_INT *n, CBLAS_INT *kl, CBLAS_INT *ku,
+	      CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda,
+	      CBLAS_TEST_ZOMPLEX *x, CBLAS_INT *incx,
+	      CBLAS_TEST_ZOMPLEX *beta, CBLAS_TEST_ZOMPLEX *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN transp_len
+#endif
+) {
 
   CBLAS_TEST_ZOMPLEX *A;
-  int i,j,irow,jcol,LDA;
+  CBLAS_INT i,j,irow,jcol,LDA;
   CBLAS_TRANSPOSE trans;
 
   get_transpose_type(transp, &trans);
@@ -85,12 +93,12 @@ void F77_zgbmv(int *layout, char *transp, int *m, int *n, int *kl, int *ku,
 		  *incx, beta, y, *incy );
 }
 
-void F77_zgeru(int *layout, int *m, int *n, CBLAS_TEST_ZOMPLEX *alpha,
-	 CBLAS_TEST_ZOMPLEX *x, int *incx, CBLAS_TEST_ZOMPLEX *y, int *incy,
-         CBLAS_TEST_ZOMPLEX *a, int *lda){
+void F77_zgeru(CBLAS_INT *layout, CBLAS_INT *m, CBLAS_INT *n, CBLAS_TEST_ZOMPLEX *alpha,
+	 CBLAS_TEST_ZOMPLEX *x, CBLAS_INT *incx, CBLAS_TEST_ZOMPLEX *y, CBLAS_INT *incy,
+         CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda){
 
   CBLAS_TEST_ZOMPLEX *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
 
   if (*layout == TEST_ROW_MJR) {
      LDA = *n+1;
@@ -114,11 +122,11 @@ void F77_zgeru(int *layout, int *m, int *n, CBLAS_TEST_ZOMPLEX *alpha,
      cblas_zgeru( UNDEFINED, *m, *n, alpha, x, *incx, y, *incy, a, *lda );
 }
 
-void F77_zgerc(int *layout, int *m, int *n, CBLAS_TEST_ZOMPLEX *alpha,
-	 CBLAS_TEST_ZOMPLEX *x, int *incx, CBLAS_TEST_ZOMPLEX *y, int *incy,
-         CBLAS_TEST_ZOMPLEX *a, int *lda) {
+void F77_zgerc(CBLAS_INT *layout, CBLAS_INT *m, CBLAS_INT *n, CBLAS_TEST_ZOMPLEX *alpha,
+	 CBLAS_TEST_ZOMPLEX *x, CBLAS_INT *incx, CBLAS_TEST_ZOMPLEX *y, CBLAS_INT *incy,
+         CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda) {
   CBLAS_TEST_ZOMPLEX *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
 
   if (*layout == TEST_ROW_MJR) {
      LDA = *n+1;
@@ -142,12 +150,16 @@ void F77_zgerc(int *layout, int *m, int *n, CBLAS_TEST_ZOMPLEX *alpha,
      cblas_zgerc( UNDEFINED, *m, *n, alpha, x, *incx, y, *incy, a, *lda );
 }
 
-void F77_zhemv(int *layout, char *uplow, int *n, CBLAS_TEST_ZOMPLEX *alpha,
-      CBLAS_TEST_ZOMPLEX *a, int *lda, CBLAS_TEST_ZOMPLEX *x,
-      int *incx, CBLAS_TEST_ZOMPLEX *beta, CBLAS_TEST_ZOMPLEX *y, int *incy){
+void F77_zhemv(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, CBLAS_TEST_ZOMPLEX *alpha,
+      CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda, CBLAS_TEST_ZOMPLEX *x,
+      CBLAS_INT *incx, CBLAS_TEST_ZOMPLEX *beta, CBLAS_TEST_ZOMPLEX *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+){
 
   CBLAS_TEST_ZOMPLEX *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -172,13 +184,17 @@ void F77_zhemv(int *layout, char *uplow, int *n, CBLAS_TEST_ZOMPLEX *alpha,
 	   beta, y, *incy );
 }
 
-void F77_zhbmv(int *layout, char *uplow, int *n, int *k,
-     CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-     CBLAS_TEST_ZOMPLEX *x, int *incx, CBLAS_TEST_ZOMPLEX *beta,
-     CBLAS_TEST_ZOMPLEX *y, int *incy){
+void F77_zhbmv(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, CBLAS_INT *k,
+     CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda,
+     CBLAS_TEST_ZOMPLEX *x, CBLAS_INT *incx, CBLAS_TEST_ZOMPLEX *beta,
+     CBLAS_TEST_ZOMPLEX *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+){
 
 CBLAS_TEST_ZOMPLEX *A;
-int i,irow,j,jcol,LDA;
+CBLAS_INT i,irow,j,jcol,LDA;
 
   CBLAS_UPLO uplo;
 
@@ -236,12 +252,16 @@ int i,irow,j,jcol,LDA;
                  beta, y, *incy );
 }
 
-void F77_zhpmv(int *layout, char *uplow, int *n, CBLAS_TEST_ZOMPLEX *alpha,
-     CBLAS_TEST_ZOMPLEX *ap, CBLAS_TEST_ZOMPLEX *x, int *incx,
-     CBLAS_TEST_ZOMPLEX *beta, CBLAS_TEST_ZOMPLEX *y, int *incy){
+void F77_zhpmv(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, CBLAS_TEST_ZOMPLEX *alpha,
+     CBLAS_TEST_ZOMPLEX *ap, CBLAS_TEST_ZOMPLEX *x, CBLAS_INT *incx,
+     CBLAS_TEST_ZOMPLEX *beta, CBLAS_TEST_ZOMPLEX *y, CBLAS_INT *incy
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+){
 
   CBLAS_TEST_ZOMPLEX *A, *AP;
-  int i,j,k,LDA;
+  CBLAS_INT i,j,k,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -292,11 +312,15 @@ void F77_zhpmv(int *layout, char *uplow, int *n, CBLAS_TEST_ZOMPLEX *alpha,
                   *incy );
 }
 
-void F77_ztbmv(int *layout, char *uplow, char *transp, char *diagn,
-     int *n, int *k, CBLAS_TEST_ZOMPLEX *a, int *lda, CBLAS_TEST_ZOMPLEX *x,
-     int *incx) {
+void F77_ztbmv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+     CBLAS_INT *n, CBLAS_INT *k, CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda, CBLAS_TEST_ZOMPLEX *x,
+     CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   CBLAS_TEST_ZOMPLEX *A;
-  int irow, jcol, i, j, LDA;
+  CBLAS_INT irow, jcol, i, j, LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -355,12 +379,16 @@ void F77_ztbmv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_ztbmv(UNDEFINED, uplo, trans, diag, *n, *k, a, *lda, x, *incx);
 }
 
-void F77_ztbsv(int *layout, char *uplow, char *transp, char *diagn,
-      int *n, int *k, CBLAS_TEST_ZOMPLEX *a, int *lda, CBLAS_TEST_ZOMPLEX *x,
-      int *incx) {
+void F77_ztbsv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+      CBLAS_INT *n, CBLAS_INT *k, CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda, CBLAS_TEST_ZOMPLEX *x,
+      CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
 
   CBLAS_TEST_ZOMPLEX *A;
-  int irow, jcol, i, j, LDA;
+  CBLAS_INT irow, jcol, i, j, LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -419,10 +447,14 @@ void F77_ztbsv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_ztbsv(UNDEFINED, uplo, trans, diag, *n, *k, a, *lda, x, *incx);
 }
 
-void F77_ztpmv(int *layout, char *uplow, char *transp, char *diagn,
-      int *n, CBLAS_TEST_ZOMPLEX *ap, CBLAS_TEST_ZOMPLEX *x, int *incx) {
+void F77_ztpmv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+      CBLAS_INT *n, CBLAS_TEST_ZOMPLEX *ap, CBLAS_TEST_ZOMPLEX *x, CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   CBLAS_TEST_ZOMPLEX *A, *AP;
-  int i, j, k, LDA;
+  CBLAS_INT i, j, k, LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -474,10 +506,14 @@ void F77_ztpmv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_ztpmv( UNDEFINED, uplo, trans, diag, *n, ap, x, *incx );
 }
 
-void F77_ztpsv(int *layout, char *uplow, char *transp, char *diagn,
-     int *n, CBLAS_TEST_ZOMPLEX *ap, CBLAS_TEST_ZOMPLEX *x, int *incx) {
+void F77_ztpsv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+     CBLAS_INT *n, CBLAS_TEST_ZOMPLEX *ap, CBLAS_TEST_ZOMPLEX *x, CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   CBLAS_TEST_ZOMPLEX *A, *AP;
-  int i, j, k, LDA;
+  CBLAS_INT i, j, k, LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -529,11 +565,15 @@ void F77_ztpsv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_ztpsv( UNDEFINED, uplo, trans, diag, *n, ap, x, *incx );
 }
 
-void F77_ztrmv(int *layout, char *uplow, char *transp, char *diagn,
-     int *n, CBLAS_TEST_ZOMPLEX *a, int *lda, CBLAS_TEST_ZOMPLEX *x,
-      int *incx) {
+void F77_ztrmv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+     CBLAS_INT *n, CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda, CBLAS_TEST_ZOMPLEX *x,
+      CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   CBLAS_TEST_ZOMPLEX *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -558,11 +598,15 @@ void F77_ztrmv(int *layout, char *uplow, char *transp, char *diagn,
   else
      cblas_ztrmv(UNDEFINED, uplo, trans, diag, *n, a, *lda, x, *incx);
 }
-void F77_ztrsv(int *layout, char *uplow, char *transp, char *diagn,
-       int *n, CBLAS_TEST_ZOMPLEX *a, int *lda, CBLAS_TEST_ZOMPLEX *x,
-              int *incx) {
+void F77_ztrsv(CBLAS_INT *layout, char *uplow, char *transp, char *diagn,
+       CBLAS_INT *n, CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda, CBLAS_TEST_ZOMPLEX *x,
+              CBLAS_INT *incx
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
   CBLAS_TEST_ZOMPLEX *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_TRANSPOSE trans;
   CBLAS_UPLO uplo;
   CBLAS_DIAG diag;
@@ -588,10 +632,14 @@ void F77_ztrsv(int *layout, char *uplow, char *transp, char *diagn,
      cblas_ztrsv(UNDEFINED, uplo, trans, diag, *n, a, *lda, x, *incx );
 }
 
-void F77_zhpr(int *layout, char *uplow, int *n, double *alpha,
-	     CBLAS_TEST_ZOMPLEX *x, int *incx, CBLAS_TEST_ZOMPLEX *ap) {
+void F77_zhpr(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, double *alpha,
+	     CBLAS_TEST_ZOMPLEX *x, CBLAS_INT *incx, CBLAS_TEST_ZOMPLEX *ap
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
   CBLAS_TEST_ZOMPLEX *A, *AP;
-  int i,j,k,LDA;
+  CBLAS_INT i,j,k,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -663,11 +711,15 @@ void F77_zhpr(int *layout, char *uplow, int *n, double *alpha,
      cblas_zhpr(UNDEFINED, uplo, *n, *alpha, x, *incx, ap );
 }
 
-void F77_zhpr2(int *layout, char *uplow, int *n, CBLAS_TEST_ZOMPLEX *alpha,
-       CBLAS_TEST_ZOMPLEX *x, int *incx, CBLAS_TEST_ZOMPLEX *y, int *incy,
-       CBLAS_TEST_ZOMPLEX *ap) {
+void F77_zhpr2(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, CBLAS_TEST_ZOMPLEX *alpha,
+       CBLAS_TEST_ZOMPLEX *x, CBLAS_INT *incx, CBLAS_TEST_ZOMPLEX *y, CBLAS_INT *incy,
+       CBLAS_TEST_ZOMPLEX *ap
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
   CBLAS_TEST_ZOMPLEX *A, *AP;
-  int i,j,k,LDA;
+  CBLAS_INT i,j,k,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -740,10 +792,14 @@ void F77_zhpr2(int *layout, char *uplow, int *n, CBLAS_TEST_ZOMPLEX *alpha,
      cblas_zhpr2( UNDEFINED, uplo, *n, alpha, x, *incx, y, *incy, ap );
 }
 
-void F77_zher(int *layout, char *uplow, int *n, double *alpha,
-  CBLAS_TEST_ZOMPLEX *x, int *incx, CBLAS_TEST_ZOMPLEX *a, int *lda) {
+void F77_zher(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, double *alpha,
+  CBLAS_TEST_ZOMPLEX *x, CBLAS_INT *incx, CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
   CBLAS_TEST_ZOMPLEX *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
@@ -772,12 +828,16 @@ void F77_zher(int *layout, char *uplow, int *n, double *alpha,
      cblas_zher( UNDEFINED, uplo, *n, *alpha, x, *incx, a, *lda );
 }
 
-void F77_zher2(int *layout, char *uplow, int *n, CBLAS_TEST_ZOMPLEX *alpha,
-          CBLAS_TEST_ZOMPLEX *x, int *incx, CBLAS_TEST_ZOMPLEX *y, int *incy,
-	  CBLAS_TEST_ZOMPLEX *a, int *lda) {
+void F77_zher2(CBLAS_INT *layout, char *uplow, CBLAS_INT *n, CBLAS_TEST_ZOMPLEX *alpha,
+          CBLAS_TEST_ZOMPLEX *x, CBLAS_INT *incx, CBLAS_TEST_ZOMPLEX *y, CBLAS_INT *incy,
+	  CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len
+#endif
+) {
 
   CBLAS_TEST_ZOMPLEX *A;
-  int i,j,LDA;
+  CBLAS_INT i,j,LDA;
   CBLAS_UPLO uplo;
 
   get_uplo_type(uplow,&uplo);
diff --git a/CBLAS/testing/c_zblas3.c b/CBLAS/testing/c_zblas3.c
index 65a821359c..43dd335df7 100644
--- a/CBLAS/testing/c_zblas3.c
+++ b/CBLAS/testing/c_zblas3.c
@@ -5,19 +5,24 @@
  *     Modified by T. H. Do, 4/15/98, SGI/CRAY Research.
  */
 #include <stdlib.h>
+#include <stdio.h>
 #include "cblas.h"
 #include "cblas_test.h"
 #define  TEST_COL_MJR	0
 #define  TEST_ROW_MJR	1
 #define  UNDEFINED     -1
 
-void F77_zgemm(int *layout, char *transpa, char *transpb, int *m, int *n,
-     int *k, CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-     CBLAS_TEST_ZOMPLEX *b, int *ldb, CBLAS_TEST_ZOMPLEX *beta,
-     CBLAS_TEST_ZOMPLEX *c, int *ldc ) {
+void F77_zgemm(CBLAS_INT *layout, char *transpa, char *transpb, CBLAS_INT *m, CBLAS_INT *n,
+     CBLAS_INT *k, CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda,
+     CBLAS_TEST_ZOMPLEX *b, CBLAS_INT *ldb, CBLAS_TEST_ZOMPLEX *beta,
+     CBLAS_TEST_ZOMPLEX *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN transpa_len, FORTRAN_STRLEN transpb_len
+#endif
+) {
 
   CBLAS_TEST_ZOMPLEX *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
+  CBLAS_INT i,j,LDA, LDB, LDC;
   CBLAS_TRANSPOSE transa, transb;
 
   get_transpose_type(transpa, &transa);
@@ -87,13 +92,99 @@ void F77_zgemm(int *layout, char *transpa, char *transpb, int *m, int *n,
      cblas_zgemm( UNDEFINED, transa, transb, *m, *n, *k, alpha, a, *lda,
                   b, *ldb, beta, c, *ldc );
 }
-void F77_zhemm(int *layout, char *rtlf, char *uplow, int *m, int *n,
-        CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-	CBLAS_TEST_ZOMPLEX *b, int *ldb, CBLAS_TEST_ZOMPLEX *beta,
-        CBLAS_TEST_ZOMPLEX *c, int *ldc ) {
+
+
+void F77_zgemmtr(CBLAS_INT *layout, char *uplop, char *transpa, char *transpb, CBLAS_INT *n,
+     CBLAS_INT *k, CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda,
+     CBLAS_TEST_ZOMPLEX *b, CBLAS_INT *ldb, CBLAS_TEST_ZOMPLEX *beta,
+     CBLAS_TEST_ZOMPLEX *c, CBLAS_INT *ldc ) {
+
+  CBLAS_TEST_ZOMPLEX *A, *B, *C;
+  CBLAS_INT i,j,LDA, LDB, LDC;
+  CBLAS_TRANSPOSE transa, transb;
+  CBLAS_UPLO uplo;
+
+  get_transpose_type(transpa, &transa);
+  get_transpose_type(transpb, &transb);
+  get_uplo_type(uplop, &uplo);
+
+  if (*layout == TEST_ROW_MJR) {
+      if (transa == CblasNoTrans) {
+          LDA = *k+1;
+          A=(CBLAS_TEST_ZOMPLEX*)malloc((*n)*LDA*sizeof(CBLAS_TEST_ZOMPLEX));
+          for( i=0; i<*n; i++ )
+              for( j=0; j<*k; j++ ) {
+                  A[i*LDA+j].real=a[j*(*lda)+i].real;
+                  A[i*LDA+j].imag=a[j*(*lda)+i].imag;
+              }
+      }
+      else {
+          LDA = *n+1;
+          A=(CBLAS_TEST_ZOMPLEX* )malloc(LDA*(*k)*sizeof(CBLAS_TEST_ZOMPLEX));
+          for( i=0; i<*k; i++ )
+              for( j=0; j<*n; j++ ) {
+                  A[i*LDA+j].real=a[j*(*lda)+i].real;
+                  A[i*LDA+j].imag=a[j*(*lda)+i].imag;
+              }
+      }
+
+      if (transb == CblasNoTrans) {
+          LDB = *n+1;
+          B=(CBLAS_TEST_ZOMPLEX* )malloc((*k)*LDB*sizeof(CBLAS_TEST_ZOMPLEX) );
+          for( i=0; i<*k; i++ )
+              for( j=0; j<*n; j++ ) {
+                  B[i*LDB+j].real=b[j*(*ldb)+i].real;
+                  B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
+              }
+      }
+      else {
+          LDB = *k+1;
+          B=(CBLAS_TEST_ZOMPLEX* )malloc(LDB*(*n)*sizeof(CBLAS_TEST_ZOMPLEX));
+          for( i=0; i<*n; i++ )
+              for( j=0; j<*k; j++ ) {
+                  B[i*LDB+j].real=b[j*(*ldb)+i].real;
+                  B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
+              }
+      }
+
+      LDC = *n+1;
+      C=(CBLAS_TEST_ZOMPLEX* )malloc((*n)*LDC*sizeof(CBLAS_TEST_ZOMPLEX));
+      for( j=0; j<*n; j++ )
+          for( i=0; i<*n; i++ ) {
+              C[i*LDC+j].real=c[j*(*ldc)+i].real;
+              C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
+          }
+      cblas_zgemmtr( CblasRowMajor, uplo, transa, transb, *n, *k, alpha, A, LDA,
+              B, LDB, beta, C, LDC );
+      for( j=0; j<*n; j++ )
+          for( i=0; i<*n; i++ ) {
+              c[j*(*ldc)+i].real=C[i*LDC+j].real;
+              c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
+          }
+      free(A);
+      free(B);
+      free(C);
+  }
+  else if (*layout == TEST_COL_MJR)
+      cblas_zgemmtr( CblasColMajor, uplo, transa, transb, *n, *k, alpha, a, *lda,
+              b, *ldb, beta, c, *ldc );
+  else
+      cblas_zgemmtr( UNDEFINED, uplo, transa, transb, *n, *k, alpha, a, *lda,
+              b, *ldb, beta, c, *ldc );
+}
+
+
+void F77_zhemm(CBLAS_INT *layout, char *rtlf, char *uplow, CBLAS_INT *m, CBLAS_INT *n,
+        CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda,
+	CBLAS_TEST_ZOMPLEX *b, CBLAS_INT *ldb, CBLAS_TEST_ZOMPLEX *beta,
+        CBLAS_TEST_ZOMPLEX *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rtlf_len, FORTRAN_STRLEN uplow_len
+#endif
+) {
 
   CBLAS_TEST_ZOMPLEX *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
+  CBLAS_INT i,j,LDA, LDB, LDC;
   CBLAS_UPLO uplo;
   CBLAS_SIDE side;
 
@@ -151,13 +242,17 @@ void F77_zhemm(int *layout, char *rtlf, char *uplow, int *m, int *n,
      cblas_zhemm( UNDEFINED, side, uplo, *m, *n, alpha, a, *lda, b, *ldb,
                   beta, c, *ldc );
 }
-void F77_zsymm(int *layout, char *rtlf, char *uplow, int *m, int *n,
-          CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-	  CBLAS_TEST_ZOMPLEX *b, int *ldb, CBLAS_TEST_ZOMPLEX *beta,
-          CBLAS_TEST_ZOMPLEX *c, int *ldc ) {
+void F77_zsymm(CBLAS_INT *layout, char *rtlf, char *uplow, CBLAS_INT *m, CBLAS_INT *n,
+          CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda,
+	  CBLAS_TEST_ZOMPLEX *b, CBLAS_INT *ldb, CBLAS_TEST_ZOMPLEX *beta,
+          CBLAS_TEST_ZOMPLEX *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rtlf_len, FORTRAN_STRLEN uplow_len
+#endif
+) {
 
   CBLAS_TEST_ZOMPLEX *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
+  CBLAS_INT i,j,LDA, LDB, LDC;
   CBLAS_UPLO uplo;
   CBLAS_SIDE side;
 
@@ -206,11 +301,15 @@ void F77_zsymm(int *layout, char *rtlf, char *uplow, int *m, int *n,
                   beta, c, *ldc );
 }
 
-void F77_zherk(int *layout, char *uplow, char *transp, int *n, int *k,
-     double *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-     double *beta, CBLAS_TEST_ZOMPLEX *c, int *ldc ) {
+void F77_zherk(CBLAS_INT *layout, char *uplow, char *transp, CBLAS_INT *n, CBLAS_INT *k,
+     double *alpha, CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda,
+     double *beta, CBLAS_TEST_ZOMPLEX *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len
+#endif
+) {
 
-  int i,j,LDA,LDC;
+  CBLAS_INT i,j,LDA,LDC;
   CBLAS_TEST_ZOMPLEX *A, *C;
   CBLAS_UPLO uplo;
   CBLAS_TRANSPOSE trans;
@@ -262,11 +361,15 @@ void F77_zherk(int *layout, char *uplow, char *transp, int *n, int *k,
 	         c, *ldc );
 }
 
-void F77_zsyrk(int *layout, char *uplow, char *transp, int *n, int *k,
-     CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-     CBLAS_TEST_ZOMPLEX *beta, CBLAS_TEST_ZOMPLEX *c, int *ldc ) {
+void F77_zsyrk(CBLAS_INT *layout, char *uplow, char *transp, CBLAS_INT *n, CBLAS_INT *k,
+     CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda,
+     CBLAS_TEST_ZOMPLEX *beta, CBLAS_TEST_ZOMPLEX *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len
+#endif
+) {
 
-  int i,j,LDA,LDC;
+  CBLAS_INT i,j,LDA,LDC;
   CBLAS_TEST_ZOMPLEX *A, *C;
   CBLAS_UPLO uplo;
   CBLAS_TRANSPOSE trans;
@@ -317,11 +420,15 @@ void F77_zsyrk(int *layout, char *uplow, char *transp, int *n, int *k,
      cblas_zsyrk(UNDEFINED, uplo, trans, *n, *k, alpha, a, *lda, beta,
 	         c, *ldc );
 }
-void F77_zher2k(int *layout, char *uplow, char *transp, int *n, int *k,
-        CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-	CBLAS_TEST_ZOMPLEX *b, int *ldb, double *beta,
-        CBLAS_TEST_ZOMPLEX *c, int *ldc ) {
-  int i,j,LDA,LDB,LDC;
+void F77_zher2k(CBLAS_INT *layout, char *uplow, char *transp, CBLAS_INT *n, CBLAS_INT *k,
+        CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda,
+	CBLAS_TEST_ZOMPLEX *b, CBLAS_INT *ldb, double *beta,
+        CBLAS_TEST_ZOMPLEX *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len
+#endif
+) {
+  CBLAS_INT i,j,LDA,LDB,LDC;
   CBLAS_TEST_ZOMPLEX *A, *B, *C;
   CBLAS_UPLO uplo;
   CBLAS_TRANSPOSE trans;
@@ -381,11 +488,15 @@ void F77_zher2k(int *layout, char *uplow, char *transp, int *n, int *k,
      cblas_zher2k(UNDEFINED, uplo, trans, *n, *k, alpha, a, *lda,
 		   b, *ldb, *beta, c, *ldc );
 }
-void F77_zsyr2k(int *layout, char *uplow, char *transp, int *n, int *k,
-         CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-	 CBLAS_TEST_ZOMPLEX *b, int *ldb, CBLAS_TEST_ZOMPLEX *beta,
-         CBLAS_TEST_ZOMPLEX *c, int *ldc ) {
-  int i,j,LDA,LDB,LDC;
+void F77_zsyr2k(CBLAS_INT *layout, char *uplow, char *transp, CBLAS_INT *n, CBLAS_INT *k,
+         CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, CBLAS_INT *lda,
+	 CBLAS_TEST_ZOMPLEX *b, CBLAS_INT *ldb, CBLAS_TEST_ZOMPLEX *beta,
+         CBLAS_TEST_ZOMPLEX *c, CBLAS_INT *ldc
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len
+#endif
+) {
+  CBLAS_INT i,j,LDA,LDB,LDC;
   CBLAS_TEST_ZOMPLEX *A, *B, *C;
   CBLAS_UPLO uplo;
   CBLAS_TRANSPOSE trans;
@@ -445,10 +556,14 @@ void F77_zsyr2k(int *layout, char *uplow, char *transp, int *n, int *k,
      cblas_zsyr2k(UNDEFINED, uplo, trans, *n, *k, alpha, a, *lda,
 		   b, *ldb, beta, c, *ldc );
 }
-void F77_ztrmm(int *layout, char *rtlf, char *uplow, char *transp, char *diagn,
-       int *m, int *n, CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a,
-       int *lda, CBLAS_TEST_ZOMPLEX *b, int *ldb) {
-  int i,j,LDA,LDB;
+void F77_ztrmm(CBLAS_INT *layout, char *rtlf, char *uplow, char *transp, char *diagn,
+       CBLAS_INT *m, CBLAS_INT *n, CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a,
+       CBLAS_INT *lda, CBLAS_TEST_ZOMPLEX *b, CBLAS_INT *ldb
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rtlf_len, FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
+  CBLAS_INT i,j,LDA,LDB;
   CBLAS_TEST_ZOMPLEX *A, *B;
   CBLAS_SIDE side;
   CBLAS_DIAG diag;
@@ -504,10 +619,14 @@ void F77_ztrmm(int *layout, char *rtlf, char *uplow, char *transp, char *diagn,
 		   a, *lda, b, *ldb);
 }
 
-void F77_ztrsm(int *layout, char *rtlf, char *uplow, char *transp, char *diagn,
-         int *m, int *n, CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a,
-         int *lda, CBLAS_TEST_ZOMPLEX *b, int *ldb) {
-  int i,j,LDA,LDB;
+void F77_ztrsm(CBLAS_INT *layout, char *rtlf, char *uplow, char *transp, char *diagn,
+         CBLAS_INT *m, CBLAS_INT *n, CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a,
+         CBLAS_INT *lda, CBLAS_TEST_ZOMPLEX *b, CBLAS_INT *ldb
+#ifdef BLAS_FORTRAN_STRLEN_END
+  , FORTRAN_STRLEN rtlf_len, FORTRAN_STRLEN uplow_len, FORTRAN_STRLEN transp_len, FORTRAN_STRLEN diagn_len
+#endif
+) {
+  CBLAS_INT i,j,LDA,LDB;
   CBLAS_TEST_ZOMPLEX *A, *B;
   CBLAS_SIDE side;
   CBLAS_DIAG diag;
diff --git a/CBLAS/testing/c_zblat1.f b/CBLAS/testing/c_zblat1.f
index cd0c8541df..6454dba172 100644
--- a/CBLAS/testing/c_zblat1.f
+++ b/CBLAS/testing/c_zblat1.f
@@ -1,4 +1,6 @@
+*  =====================================================================
       PROGRAM ZCBLAT1
+      IMPLICIT NONE
 *     Test program for the COMPLEX*16 Level 1 CBLAS.
 *     Based upon the original CBLAS test routine together with:
 *     F06GAF Example Program Text
@@ -19,7 +21,7 @@ PROGRAM ZCBLAT1
       DATA             SFAC/9.765625D-4/
 *     .. Executable Statements ..
       WRITE (NOUT,99999)
-      DO 20 IC = 1, 10
+      DO 20 IC = 1, 11
          ICASE = IC
          CALL HEADER
 *
@@ -32,7 +34,7 @@ PROGRAM ZCBLAT1
          INCX = 9999
          INCY = 9999
          MODE = 9999
-         IF (ICASE.LE.5) THEN
+         IF (ICASE.LE.5 .OR. ICASE .EQ. 11) THEN
             CALL CHECK2(SFAC)
          ELSE IF (ICASE.GE.6) THEN
             CALL CHECK1(SFAC)
@@ -45,7 +47,10 @@ PROGRAM ZCBLAT1
 99999 FORMAT (' Complex CBLAS Test Program Results',/1X)
 99998 FORMAT ('                                    ----- PASS -----')
       END
+
+*  =====================================================================
       SUBROUTINE HEADER
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER          NOUT
       PARAMETER        (NOUT=6)
@@ -53,7 +58,7 @@ SUBROUTINE HEADER
       INTEGER          ICASE, INCX, INCY, MODE, N
       LOGICAL          PASS
 *     .. Local Arrays ..
-      CHARACTER*15      L(10)
+      CHARACTER*15      L(11)
 *     .. Common blocks ..
       COMMON           /COMBLA/ICASE, N, INCX, INCY, MODE, PASS
 *     .. Data statements ..
@@ -67,13 +72,18 @@ SUBROUTINE HEADER
       DATA             L(8)/'CBLAS_ZSCAL'/
       DATA             L(9)/'CBLAS_ZDSCAL'/
       DATA             L(10)/'CBLAS_IZAMAX'/
+      DATA             L(11)/'CBLAS_ZAXPBY'/
+
 *     .. Executable Statements ..
       WRITE (NOUT,99999) ICASE, L(ICASE)
       RETURN
 *
 99999 FORMAT (/' Test of subprogram number',I3,9X,A15)
       END
+
+*  =====================================================================
       SUBROUTINE CHECK1(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
       PARAMETER         (NOUT=6)
@@ -274,7 +284,10 @@ SUBROUTINE CHECK1(SFAC)
       END IF
       RETURN
       END
+
+*  =====================================================================
       SUBROUTINE CHECK2(SFAC)
+      IMPLICIT NONE
 *     .. Parameters ..
       INTEGER           NOUT
       PARAMETER         (NOUT=6)
@@ -284,23 +297,26 @@ SUBROUTINE CHECK2(SFAC)
       INTEGER           ICASE, INCX, INCY, MODE, N
       LOGICAL           PASS
 *     .. Local Scalars ..
-      COMPLEX*16        CA,ZTEMP
+      COMPLEX*16        CA,CB,ZTEMP
       INTEGER           I, J, KI, KN, KSIZE, LENX, LENY, MX, MY
 *     .. Local Arrays ..
       COMPLEX*16        CDOT(1), CSIZE1(4), CSIZE2(7,2), CSIZE3(14),
      +                  CT10X(7,4,4), CT10Y(7,4,4), CT6(4,4), CT7(4,4),
-     +                  CT8(7,4,4), CX(7), CX1(7), CY(7), CY1(7)
+     +                  CT8(7,4,4), CX(7), CX1(7), CY(7), CY1(7),
+     +                  CT11(7,4,4)
       INTEGER           INCXS(4), INCYS(4), LENS(4,2), NS(4)
 *     .. External Functions ..
       EXTERNAL          ZDOTCTEST, ZDOTUTEST
 *     .. External Subroutines ..
       EXTERNAL          ZAXPYTEST, ZCOPYTEST, ZSWAPTEST, CTEST
+     +                  ZAXPBYTEST
 *     .. Intrinsic Functions ..
       INTRINSIC         ABS, MIN
 *     .. Common blocks ..
       COMMON            /COMBLA/ICASE, N, INCX, INCY, MODE, PASS
 *     .. Data statements ..
       DATA              CA/(0.4D0,-0.7D0)/
+      DATA              CB/(0.7D0,-0.4D0)/
       DATA              INCXS/1, 2, -2, -1/
       DATA              INCYS/1, -2, 1, -2/
       DATA              LENS/1, 1, 2, 4, 1, 1, 3, 7/
@@ -470,6 +486,53 @@ SUBROUTINE CHECK2(SFAC)
      +                  (1.54D0,1.54D0), (1.54D0,1.54D0),
      +                  (1.54D0,1.54D0), (1.54D0,1.54D0),
      +                  (1.54D0,1.54D0), (1.54D0,1.54D0)/
+      DATA              ((CT11(I,J,1),I=1,7),J=1,4)/(0.6D0,-0.6D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (-0.1D0,-1.47D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (-0.1D0,-1.47D0),
+     +                  (-1.08D0,0.71D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (-0.1D0,-1.47D0), (-1.08D0,0.71D0),
+     +                  (-0.42D0,-0.99D0), (-0.61D0,-0.85D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0)/
+      DATA              ((CT11(I,J,2),I=1,7),J=1,4)/(0.6D0,-0.6D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (-0.1D0,-1.47D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (-0.49D0,-0.95D0),
+     +                  (-0.9D0,0.5D0),(-0.03D0,-1.51D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.36D0,0.00D0), (-0.9D0,0.5D0),
+     +                  (-0.39D0,-0.23D0), (0.1D0,-0.5D0),
+     +                  (-0.82D0,-0.39D0), (-0.5D0,-0.3D0),
+     +                  (0.0D0,-1.62D0)/
+      DATA              ((CT11(I,J,3),I=1,7),J=1,4)/(0.6D0,-0.6D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (-0.1D0,-1.47D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (-0.49D0,-0.95D0),
+     +                  (-0.71D0,-0.1D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.36D0,0.00D0), (-1.07D0,1.18D0),
+     +                  (-0.42D0,-0.99D0), (-0.41D0,-1.2D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0)/
+      DATA              ((CT11(I,J,4),I=1,7),J=1,4)/(0.6D0,-0.6D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (-0.1D0,-1.47D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (-0.1D0,-1.47D0), (-0.9D0,0.5D0),
+     +                  (-0.4D0,-0.7D0), (0.0D0,0.0D0), (0.0D0,0.0D0),
+     +                  (0.0D0,0.0D0), (0.0D0,0.0D0), (-0.1D0,-1.47D0),
+     +                  (-0.9D0,0.5D0),(-0.4D0,-0.7D0), (0.1D0,-0.5D0),
+     +                  (-0.82D0,-0.39D0), (-0.5D0,-0.3D0),
+     +                  (-0.2D0,-1.27D0)/
+
+
 *     .. Executable Statements ..
       DO 60 KI = 1, 4
          INCX = INCXS(KI)
@@ -501,6 +564,10 @@ SUBROUTINE CHECK2(SFAC)
 *              .. ZAXPYTEST ..
                CALL ZAXPYTEST(N,CA,CX,INCX,CY,INCY)
                CALL CTEST(LENY,CY,CT8(1,KN,KI),CSIZE2(1,KSIZE),SFAC)
+            ELSE IF (ICASE.EQ.11) THEN
+*              .. ZAXPBYTEST ..
+               CALL ZAXPBYTEST(N,CA,CX,INCX,CB,CY,INCY)
+               CALL CTEST(LENY,CY,CT11(1,KN,KI),CSIZE2(1,KSIZE),SFAC)
             ELSE IF (ICASE.EQ.4) THEN
 *              .. ZCOPYTEST ..
                CALL ZCOPYTEST(N,CX,INCX,CY,INCY)
@@ -519,7 +586,10 @@ SUBROUTINE CHECK2(SFAC)
    60 CONTINUE
       RETURN
       END
+
+*  =====================================================================
       SUBROUTINE STEST(LEN,SCOMP,STRUE,SSIZE,SFAC)
+      IMPLICIT NONE
 *     ********************************* STEST **************************
 *
 *     THIS SUBR COMPARES ARRAYS  SCOMP() AND STRUE() OF LENGTH LEN TO
@@ -574,7 +644,10 @@ SUBROUTINE STEST(LEN,SCOMP,STRUE,SSIZE,SFAC)
      +       '     SIZE(I)',/1X)
 99997 FORMAT (1X,I4,I3,3I5,I3,2D36.8,2D12.4)
       END
+
+*  =====================================================================
       SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
+      IMPLICIT NONE
 *     ************************* STEST1 *****************************
 *
 *     THIS IS AN INTERFACE SUBROUTINE TO ACCOMMODATE THE FORTRAN
@@ -599,7 +672,10 @@ SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
 *
       RETURN
       END
+
+*  =====================================================================
       DOUBLE PRECISION FUNCTION SDIFF(SA,SB)
+      IMPLICIT NONE
 *     ********************************* SDIFF **************************
 *     COMPUTES DIFFERENCE OF TWO NUMBERS.  C. L. LAWSON, JPL 1974 FEB 15
 *
@@ -609,7 +685,10 @@ DOUBLE PRECISION FUNCTION SDIFF(SA,SB)
       SDIFF = SA - SB
       RETURN
       END
+
+*  =====================================================================
       SUBROUTINE CTEST(LEN,CCOMP,CTRUE,CSIZE,SFAC)
+      IMPLICIT NONE
 *     **************************** CTEST *****************************
 *
 *     C.L. LAWSON, JPL, 1978 DEC 6
@@ -640,7 +719,10 @@ SUBROUTINE CTEST(LEN,CCOMP,CTRUE,CSIZE,SFAC)
       CALL STEST(2*LEN,SCOMP,STRUE,SSIZE,SFAC)
       RETURN
       END
+
+*  =====================================================================
       SUBROUTINE ITEST1(ICOMP,ITRUE)
+      IMPLICIT NONE
 *     ********************************* ITEST1 *************************
 *
 *     THIS SUBROUTINE COMPARES THE VARIABLES ICOMP AND ITRUE FOR
diff --git a/CBLAS/testing/c_zblat2.f b/CBLAS/testing/c_zblat2.f
index 4392602302..21424468c8 100644
--- a/CBLAS/testing/c_zblat2.f
+++ b/CBLAS/testing/c_zblat2.f
@@ -1,4 +1,6 @@
+*  =====================================================================
       PROGRAM ZBLAT2
+      IMPLICIT NONE
 *
 *  Test program for the COMPLEX*16          Level 2 Blas.
 *
@@ -349,13 +351,13 @@ PROGRAM ZBLAT2
            CALL ZCHK3( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                  REWI, FATAL, NIDIM, IDIM, NKB, KB, NINC, INC,
      $                  NMAX, INCMAX, A, AA, AS, Y, YY, YS, YT, G, Z,
-     $			0 )
+     $          0 )
            END IF
            IF (RORDER) THEN
            CALL ZCHK3( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                  REWI, FATAL, NIDIM, IDIM, NKB, KB, NINC, INC,
      $                  NMAX, INCMAX, A, AA, AS, Y, YY, YS, YT, G, Z,
-     $			1 )
+     $          1 )
            END IF
             GO TO 200
 *           Test ZGERC, 12, ZGERU, 13.
@@ -459,10 +461,13 @@ PROGRAM ZBLAT2
 *     End of ZBLAT2.
 *
       END
+
+*  =====================================================================
       SUBROUTINE ZCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NALF, ALF, NBET,
      $                  BET, NINC, INC, NMAX, INCMAX, A, AA, AS, X, XX,
      $                  XS, Y, YY, YS, YT, G, IORDER )
+      IMPLICIT NONE
 *
 *  Tests CGEMV and CGBMV.
 *
@@ -815,10 +820,13 @@ SUBROUTINE ZCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of ZCHK1.
 *
       END
+
+*  =====================================================================
       SUBROUTINE ZCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NALF, ALF, NBET,
      $                  BET, NINC, INC, NMAX, INCMAX, A, AA, AS, X, XX,
      $                  XS, Y, YY, YS, YT, G, IORDER )
+      IMPLICIT NONE
 *
 *  Tests CHEMV, CHBMV and CHPMV.
 *
@@ -1172,9 +1180,12 @@ SUBROUTINE ZCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of CZHK2.
 *
       END
+
+*  =====================================================================
       SUBROUTINE ZCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NKB, KB, NINC, INC, NMAX,
      $                 INCMAX, A, AA, AS, X, XX, XS, XT, G, Z, IORDER )
+      IMPLICIT NONE
 *
 *  Tests ZTRMV, ZTBMV, ZTPMV, ZTRSV, ZTBSV and ZTPSV.
 *
@@ -1554,10 +1565,13 @@ SUBROUTINE ZCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of ZCHK3.
 *
       END
+
+*  =====================================================================
       SUBROUTINE ZCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z, IORDER )
+      IMPLICIT NONE
 *
 *  Tests ZGERC and ZGERU.
 *
@@ -1832,10 +1846,13 @@ SUBROUTINE ZCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of ZCHK4.
 *
       END
+
+*  =====================================================================
       SUBROUTINE ZCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z, IORDER )
+      IMPLICIT NONE
 *
 *  Tests ZHER and ZHPR.
 *
@@ -2126,10 +2143,13 @@ SUBROUTINE ZCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of CZHK5.
 *
       END
+
+*  =====================================================================
       SUBROUTINE ZCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NINC, INC, NMAX,
      $                  INCMAX, A, AA, AS, X, XX, XS, Y, YY, YS, YT, G,
      $                  Z, IORDER )
+      IMPLICIT NONE
 *
 *  Tests ZHER2 and ZHPR2.
 *
@@ -2454,8 +2474,11 @@ SUBROUTINE ZCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of ZCHK6.
 *
       END
+
+*  =====================================================================
       SUBROUTINE ZMVCH( TRANS, M, N, ALPHA, A, NMAX, X, INCX, BETA, Y,
      $                  INCY, YT, G, YY, EPS, ERR, FATAL, NOUT, MV )
+      IMPLICIT NONE
 *
 *  Checks the results of the computational tests.
 *
@@ -2586,7 +2609,10 @@ SUBROUTINE ZMVCH( TRANS, M, N, ALPHA, A, NMAX, X, INCX, BETA, Y,
 *     End of ZMVCH.
 *
       END
+
+*  =====================================================================
       LOGICAL FUNCTION LZE( RI, RJ, LR )
+      IMPLICIT NONE
 *
 *  Tests if two arrays are identical.
 *
@@ -2616,7 +2642,10 @@ LOGICAL FUNCTION LZE( RI, RJ, LR )
 *     End of LZE.
 *
       END
+
+*  =====================================================================
       LOGICAL FUNCTION LZERES( TYPE, UPLO, M, N, AA, AS, LDA )
+      IMPLICIT NONE
 *
 *  Tests if selected elements in two arrays are equal.
 *
@@ -2676,7 +2705,10 @@ LOGICAL FUNCTION LZERES( TYPE, UPLO, M, N, AA, AS, LDA )
 *     End of LZERES.
 *
       END
+
+*  =====================================================================
       COMPLEX*16 FUNCTION ZBEG( RESET )
+      IMPLICIT NONE
 *
 *  Generates complex numbers as pairs of random numbers uniformly
 *  distributed between -0.5 and 0.5.
@@ -2728,7 +2760,10 @@ COMPLEX*16 FUNCTION ZBEG( RESET )
 *     End of ZBEG.
 *
       END
+
+*  =====================================================================
       DOUBLE PRECISION FUNCTION DDIFF( X, Y )
+      IMPLICIT NONE
 *
 *  Auxiliary routine for test program for Level 2 Blas.
 *
@@ -2744,8 +2779,11 @@ DOUBLE PRECISION FUNCTION DDIFF( X, Y )
 *     End of DDIFF.
 *
       END
+
+*  =====================================================================
       SUBROUTINE ZMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, KL,
      $                  KU, RESET, TRANSL )
+      IMPLICIT NONE
 *
 *  Generates values for an M by N matrix A within the bandwidth
 *  defined by KL and KU.
diff --git a/CBLAS/testing/c_zblat3.f b/CBLAS/testing/c_zblat3.f
index 21e743d171..a68a64a14e 100644
--- a/CBLAS/testing/c_zblat3.f
+++ b/CBLAS/testing/c_zblat3.f
@@ -1,10 +1,12 @@
+*  =====================================================================
       PROGRAM ZBLAT3
+      IMPLICIT NONE
 *
 *  Test program for the COMPLEX*16          Level 3 Blas.
 *
 *  The program must be driven by a short data file. The first 13 records
 *  of the file are read using list-directed input, the last 9 records
-*  are read using the format ( A12,L2 ). An annotated example of a data
+*  are read using the format ( A13,L2 ). An annotated example of a data
 *  file can be obtained by deleting the first 3 characters from the
 *  following 22 lines:
 *  'CBLAT3.SNAP'     NAME OF SNAPSHOT OUTPUT FILE
@@ -20,16 +22,17 @@ PROGRAM ZBLAT3
 *  (0.0,0.0) (1.0,0.0) (0.7,-0.9)       VALUES OF ALPHA
 *  3                 NUMBER OF VALUES OF BETA
 *  (0.0,0.0) (1.0,0.0) (1.3,-1.1)       VALUES OF BETA
-*  ZGEMM  T PUT F FOR NO TEST. SAME COLUMNS.
-*  ZHEMM  T PUT F FOR NO TEST. SAME COLUMNS.
-*  ZSYMM  T PUT F FOR NO TEST. SAME COLUMNS.
-*  ZTRMM  T PUT F FOR NO TEST. SAME COLUMNS.
-*  ZTRSM  T PUT F FOR NO TEST. SAME COLUMNS.
-*  ZHERK  T PUT F FOR NO TEST. SAME COLUMNS.
-*  ZSYRK  T PUT F FOR NO TEST. SAME COLUMNS.
-*  ZHER2K T PUT F FOR NO TEST. SAME COLUMNS.
-*  ZSYR2K T PUT F FOR NO TEST. SAME COLUMNS.
-*
+*  cblas_zgemm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_zhemm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_zsymm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_ztrmm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_ztrsm   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_zherk   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_zsyrk   T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_zher2k  T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_zsyr2k  T PUT F FOR NO TEST. SAME COLUMNS.
+*  cblas_zgemmtr T PUT F FOR NO TEST. SAME COLUMNS.
+
 *  See:
 *
 *     Dongarra J. J., Du Croz J. J., Duff I. S. and Hammarling S.
@@ -49,7 +52,7 @@ PROGRAM ZBLAT3
       INTEGER            NIN, NOUT
       PARAMETER          ( NIN = 5, NOUT = 6 )
       INTEGER            NSUBS
-      PARAMETER          ( NSUBS = 9 )
+      PARAMETER          ( NSUBS = 10 )
       COMPLEX*16         ZERO, ONE
       PARAMETER          ( ZERO = ( 0.0D0, 0.0D0 ),
      $                   ONE = ( 1.0D0, 0.0D0 ) )
@@ -66,7 +69,7 @@ PROGRAM ZBLAT3
       LOGICAL            FATAL, LTESTT, REWI, SAME, SFATAL, TRACE,
      $                   TSTERR, CORDER, RORDER
       CHARACTER*1        TRANSA, TRANSB
-      CHARACTER*12       SNAMET
+      CHARACTER*13       SNAMET
       CHARACTER*32       SNAPS
 *     .. Local Arrays ..
       COMPLEX*16         AA( NMAX*NMAX ), AB( NMAX, 2*NMAX ),
@@ -78,19 +81,19 @@ PROGRAM ZBLAT3
       DOUBLE PRECISION   G( NMAX )
       INTEGER            IDIM( NIDMAX )
       LOGICAL            LTEST( NSUBS )
-      CHARACTER*12       SNAMES( NSUBS )
+      CHARACTER*13       SNAMES( NSUBS )
 *     .. External Functions ..
       DOUBLE PRECISION   DDIFF
       LOGICAL            LZE
       EXTERNAL           DDIFF, LZE
 *     .. External Subroutines ..
-      EXTERNAL           ZCHK1, ZCHK2, ZCHK3, ZCHK4, ZCHK5,ZMMCH
+      EXTERNAL           ZCHK1, ZCHK2, ZCHK3, ZCHK4, ZCHK5, ZCHK6, ZMMCH
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
 *     .. Scalars in Common ..
       INTEGER            INFOT, NOUTC
       LOGICAL            LERR, OK
-      CHARACTER*12       SRNAMT
+      CHARACTER*13       SRNAMT
 *     .. Common blocks ..
       COMMON             /INFOC/INFOT, NOUTC, OK, LERR
       COMMON             /SRNAMC/SRNAMT
@@ -98,7 +101,7 @@ PROGRAM ZBLAT3
       DATA               SNAMES/'cblas_zgemm ', 'cblas_zhemm ',
      $                   'cblas_zsymm ', 'cblas_ztrmm ', 'cblas_ztrsm ',
      $                   'cblas_zherk ', 'cblas_zsyrk ', 'cblas_zher2k',
-     $                   'cblas_zsyr2k'/
+     $                   'cblas_zsyr2k', 'cblas_zgemmtr'/
 *     .. Executable Statements ..
 *
       NOUTC = NOUT
@@ -296,7 +299,7 @@ PROGRAM ZBLAT3
             OK = .TRUE.
             FATAL = .FALSE.
             GO TO ( 140, 150, 150, 160, 160, 170, 170,
-     $              180, 180 )ISNUM
+     $              180, 180, 185) ISNUM
 *           Test ZGEMM, 01.
   140       IF (CORDER) THEN
             CALL ZCHK1(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
@@ -330,13 +333,13 @@ PROGRAM ZBLAT3
             CALL ZCHK3(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                 REWI, FATAL, NIDIM, IDIM, NALF, ALF, NMAX, AB,
      $                 AA, AS, AB( 1, NMAX + 1 ), BB, BS, CT, G, C,
-     $		       0 )
+     $             0 )
             END IF
             IF (RORDER) THEN
             CALL ZCHK3(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                 REWI, FATAL, NIDIM, IDIM, NALF, ALF, NMAX, AB,
      $                 AA, AS, AB( 1, NMAX + 1 ), BB, BS, CT, G, C,
-     $		       1 )
+     $             1 )
             END IF
             GO TO 190
 *           Test ZHERK, 06, ZSYRK, 07.
@@ -358,13 +361,27 @@ PROGRAM ZBLAT3
             CALL ZCHK5(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                 REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
      $                 NMAX, AB, AA, AS, BB, BS, C, CC, CS, CT, G, W,
-     $		       0 )
+     $             0 )
             END IF
             IF (RORDER) THEN
             CALL ZCHK5(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
      $                 REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
      $                 NMAX, AB, AA, AS, BB, BS, C, CC, CS, CT, G, W,
-     $		       1 )
+     $             1 )
+            END IF
+            GO TO 190
+*           Test ZGEMMTR, 10
+  185       IF (CORDER) THEN
+            CALL ZCHK6(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
+     $                 REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
+     $                 NMAX, AB, AA, AS, AB( 1, NMAX + 1 ), BB, BS, C,
+     $                 CC, CS, CT, G, 0 )
+            END IF
+            IF (RORDER) THEN
+            CALL ZCHK6(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
+     $                 REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
+     $                 NMAX, AB, AA, AS, AB( 1, NMAX + 1 ), BB, BS, C,
+     $                 CC, CS, CT, G, 1 )
             END IF
             GO TO 190
 *
@@ -406,7 +423,7 @@ PROGRAM ZBLAT3
      $      7( '(', F4.1, ',', F4.1, ')  ', : ) )
  9991 FORMAT( ' AMEND DATA FILE OR INCREASE ARRAY SIZES IN PROGRAM',
      $      /' ******* TESTS ABANDONED *******' )
- 9990 FORMAT(' SUBPROGRAM NAME ', A12,' NOT RECOGNIZED', /' ******* T',
+ 9990 FORMAT(' SUBPROGRAM NAME ', A13,' NOT RECOGNIZED', /' ******* T',
      $      'ESTS ABANDONED *******' )
  9989 FORMAT(' ERROR IN ZMMCH -  IN-LINE DOT PRODUCTS ARE BEING EVALU',
      $      'ATED WRONGLY.', /' ZMMCH WAS CALLED WITH TRANSA = ', A1,
@@ -414,8 +431,8 @@ PROGRAM ZBLAT3
      $    ' ERR = ', F12.3, '.', /' THIS MAY BE DUE TO FAULTS IN THE ',
      $     'ARITHMETIC OR THE COMPILER.', /' ******* TESTS ABANDONED ',
      $      '*******' )
- 9988 FORMAT( A12,L2 )
- 9987 FORMAT( 1X, A12,' WAS NOT TESTED' )
+ 9988 FORMAT( A13,L2 )
+ 9987 FORMAT( 1X, A13,' WAS NOT TESTED' )
  9986 FORMAT( /' END OF TESTS' )
  9985 FORMAT( /' ******* FATAL ERROR - TESTS ABANDONED *******' )
  9984 FORMAT( ' ERROR-EXITS WILL NOT BE TESTED' )
@@ -423,10 +440,13 @@ PROGRAM ZBLAT3
 *     End of ZBLAT3.
 *
       END
+
+*  =====================================================================
       SUBROUTINE ZCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G,
      $                  IORDER )
+      IMPLICIT NONE
 *
 *  Tests ZGEMM.
 *
@@ -447,7 +467,7 @@ SUBROUTINE ZCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12       SNAME
+      CHARACTER*13       SNAME
 *     .. Array Arguments ..
       COMPLEX*16         A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -695,20 +715,20 @@ SUBROUTINE ZCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   130 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT(' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
- 9995 FORMAT( 1X, I6, ': ', A12,'(''', A1, ''',''', A1, ''',',
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(''', A1, ''',''', A1, ''',',
      $     3( I3, ',' ), '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3,
      $     ',(', F4.1, ',', F4.1, '), C,', I3, ').' )
  9994 FORMAT(' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -717,13 +737,15 @@ SUBROUTINE ZCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of ZCHK1.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE ZPRCN1(NOUT, NC, SNAME, IORDER, TRANSA, TRANSB, M, N,
      $                 K, ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
       INTEGER          NOUT, NC, IORDER, M, N, K, LDA, LDB, LDC
       DOUBLE COMPLEX   ALPHA, BETA
       CHARACTER*1      TRANSA, TRANSB
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CTA,CTB
 
       IF (TRANSA.EQ.'N')THEN
@@ -748,15 +770,17 @@ SUBROUTINE ZPRCN1(NOUT, NC, SNAME, IORDER, TRANSA, TRANSB, M, N,
       WRITE(NOUT, FMT = 9995)NC,SNAME,CRC, CTA,CTB
       WRITE(NOUT, FMT = 9994)M, N, K, ALPHA, LDA, LDB, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', A14, ',', A14, ',', A14, ',')
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', A14, ',', A14, ',', A14, ',')
  9994 FORMAT( 10X, 3( I3, ',' ) ,' (', F4.1,',',F4.1,') , A,',
      $ I3, ', B,', I3, ', (', F4.1,',',F4.1,') , C,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE ZCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G,
      $                  IORDER )
+      IMPLICIT NONE
 *
 *  Tests ZHEMM and ZSYMM.
 *
@@ -777,7 +801,7 @@ SUBROUTINE ZCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12       SNAME
+      CHARACTER*13       SNAME
 *     .. Array Arguments ..
       COMPLEX*16         A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1021,20 +1045,20 @@ SUBROUTINE ZCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   120 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT(' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
- 9995 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT(1X, I6, ': ', A13,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',(', F4.1,
      $      ',', F4.1, '), C,', I3, ')    .' )
  9994 FORMAT(' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1043,13 +1067,16 @@ SUBROUTINE ZCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of ZCHK2.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE ZPRCN2(NOUT, NC, SNAME, IORDER, SIDE, UPLO, M, N,
      $                 ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, M, N, LDA, LDB, LDC
       DOUBLE COMPLEX   ALPHA, BETA
       CHARACTER*1      SIDE, UPLO
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CS,CU
 
       IF (SIDE.EQ.'L')THEN
@@ -1070,14 +1097,16 @@ SUBROUTINE ZPRCN2(NOUT, NC, SNAME, IORDER, SIDE, UPLO, M, N,
       WRITE(NOUT, FMT = 9995)NC,SNAME,CRC, CS,CU
       WRITE(NOUT, FMT = 9994)M, N, ALPHA, LDA, LDB, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', A14, ',', A14, ',', A14, ',')
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', A14, ',', A14, ',', A14, ',')
  9994 FORMAT( 10X, 2( I3, ',' ),' (',F4.1,',',F4.1, '), A,', I3,
      $ ', B,', I3, ', (',F4.1,',',F4.1, '), ', 'C,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE ZCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NMAX, A, AA, AS,
      $                  B, BB, BS, CT, G, C, IORDER )
+      IMPLICIT NONE
 *
 *  Tests ZTRMM and ZTRSM.
 *
@@ -1098,7 +1127,7 @@ SUBROUTINE ZCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12       SNAME
+      CHARACTER*13       SNAME
 *     .. Array Arguments ..
       COMPLEX*16         A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1373,20 +1402,20 @@ SUBROUTINE ZCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   160 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT(' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT(' ******* ', A12,' FAILED ON CALL NUMBER:' )
- 9995 FORMAT(1X, I6, ': ', A12,'(', 4( '''', A1, ''',' ), 2( I3, ',' ),
+ 9996 FORMAT(' ******* ', A13,' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT(1X, I6, ': ', A13,'(', 4( '''', A1, ''',' ), 2( I3, ',' ),
      $     '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ')         ',
      $      '      .' )
  9994 FORMAT(' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1395,13 +1424,16 @@ SUBROUTINE ZCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of ZCHK3.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE ZPRCN3(NOUT, NC, SNAME, IORDER, SIDE, UPLO, TRANSA,
      $                 DIAG, M, N, ALPHA, LDA, LDB)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, M, N, LDA, LDB
       DOUBLE COMPLEX   ALPHA
       CHARACTER*1      SIDE, UPLO, TRANSA, DIAG
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CS, CU, CA, CD
 
       IF (SIDE.EQ.'L')THEN
@@ -1434,15 +1466,17 @@ SUBROUTINE ZPRCN3(NOUT, NC, SNAME, IORDER, SIDE, UPLO, TRANSA,
       WRITE(NOUT, FMT = 9995)NC,SNAME,CRC, CS,CU
       WRITE(NOUT, FMT = 9994)CA, CD, M, N, ALPHA, LDA, LDB
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', A14, ',', A14, ',', A14, ',')
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', A14, ',', A14, ',', A14, ',')
  9994 FORMAT( 10X, 2( A14, ',') , 2( I3, ',' ), ' (', F4.1, ',',
      $    F4.1, '), A,', I3, ', B,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE ZCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G,
      $                  IORDER )
+      IMPLICIT NONE
 *
 *  Tests ZHERK and ZSYRK.
 *
@@ -1463,7 +1497,7 @@ SUBROUTINE ZCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION   EPS, THRESH
       INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL            FATAL, REWI, TRACE
-      CHARACTER*12       SNAME
+      CHARACTER*13       SNAME
 *     .. Array Arguments ..
       COMPLEX*16         A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
      $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
@@ -1755,24 +1789,24 @@ SUBROUTINE ZCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   130 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT(' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
  9995 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
- 9994 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9994 FORMAT(1X, I6, ': ', A13,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $     F4.1, ', A,', I3, ',', F4.1, ', C,', I3, ')               ',
      $      '          .' )
- 9993 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9993 FORMAT(1X, I6, ': ', A13,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, ') , A,', I3, ',(', F4.1, ',', F4.1,
      $      '), C,', I3, ')          .' )
  9992 FORMAT(' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1781,13 +1815,15 @@ SUBROUTINE ZCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of CCHK4.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE ZPRCN4(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
      $                 N, K, ALPHA, LDA, BETA, LDC)
+      IMPLICIT NONE
       INTEGER          NOUT, NC, IORDER, N, K, LDA, LDC
       DOUBLE COMPLEX   ALPHA, BETA
       CHARACTER*1      UPLO, TRANSA
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CU, CA
 
       IF (UPLO.EQ.'U')THEN
@@ -1810,18 +1846,20 @@ SUBROUTINE ZPRCN4(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
       WRITE(NOUT, FMT = 9995)NC, SNAME, CRC, CU, CA
       WRITE(NOUT, FMT = 9994)N, K, ALPHA, LDA, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', 3( A14, ',') )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', 3( A14, ',') )
  9994 FORMAT( 10X, 2( I3, ',' ), ' (', F4.1, ',', F4.1 ,'), A,',
      $        I3, ', (', F4.1,',', F4.1, '), C,', I3, ').' )
       END
-*
-*
+
+*  =====================================================================
       SUBROUTINE ZPRCN6(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
      $                 N, K, ALPHA, LDA, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, N, K, LDA, LDC
       DOUBLE PRECISION ALPHA, BETA
       CHARACTER*1      UPLO, TRANSA
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CU, CA
 
       IF (UPLO.EQ.'U')THEN
@@ -1844,15 +1882,17 @@ SUBROUTINE ZPRCN6(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
       WRITE(NOUT, FMT = 9995)NC, SNAME, CRC, CU, CA
       WRITE(NOUT, FMT = 9994)N, K, ALPHA, LDA, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', 3( A14, ',') )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', 3( A14, ',') )
  9994 FORMAT( 10X, 2( I3, ',' ),
      $      F4.1, ', A,', I3, ',', F4.1, ', C,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE ZCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  AB, AA, AS, BB, BS, C, CC, CS, CT, G, W,
      $                  IORDER )
+      IMPLICIT NONE
 *
 *  Tests ZHER2K and ZSYR2K.
 *
@@ -1873,7 +1913,7 @@ SUBROUTINE ZCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
       DOUBLE PRECISION  EPS, THRESH
       INTEGER           NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
       LOGICAL           FATAL, REWI, TRACE
-      CHARACTER*12      SNAME
+      CHARACTER*13      SNAME
 *     .. Array Arguments ..
       COMPLEX*16         AA( NMAX*NMAX ), AB( 2*NMAX*NMAX ),
      $                   ALF( NALF ), AS( NMAX*NMAX ), BB( NMAX*NMAX ),
@@ -2208,24 +2248,24 @@ SUBROUTINE ZCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
   160 CONTINUE
       RETURN
 *
-10003 FORMAT( ' ', A12,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10002 FORMAT( ' ', A12,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
      $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
      $ 'RATIO ', F8.2, ' - SUSPECT *******' )
-10001 FORMAT( ' ', A12,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
-10000 FORMAT( ' ', A12,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
      $ ' (', I6, ' CALL', 'S)' )
  9998 FORMAT(' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
      $      'ANGED INCORRECTLY *******' )
- 9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
  9995 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
- 9994 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9994 FORMAT(1X, I6, ': ', A13,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',', F4.1,
      $      ', C,', I3, ')           .' )
- 9993 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
+ 9993 FORMAT(1X, I6, ': ', A13,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
      $      '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',(', F4.1,
      $      ',', F4.1, '), C,', I3, ')    .' )
  9992 FORMAT(' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -2234,13 +2274,16 @@ SUBROUTINE ZCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     End of ZCHK5.
 *
       END
-*
+
+*  =====================================================================
       SUBROUTINE ZPRCN5(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
      $                 N, K, ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, N, K, LDA, LDB, LDC
       DOUBLE COMPLEX   ALPHA, BETA
       CHARACTER*1      UPLO, TRANSA
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CU, CA
 
       IF (UPLO.EQ.'U')THEN
@@ -2263,19 +2306,21 @@ SUBROUTINE ZPRCN5(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
       WRITE(NOUT, FMT = 9995)NC, SNAME, CRC, CU, CA
       WRITE(NOUT, FMT = 9994)N, K, ALPHA, LDA, LDB, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', 3( A14, ',') )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', 3( A14, ',') )
  9994 FORMAT( 10X, 2( I3, ',' ), ' (', F4.1, ',', F4.1, '), A,',
      $  I3, ', B', I3, ', (', F4.1, ',', F4.1, '), C,', I3, ').' )
       END
-*
-*
+
+*  =====================================================================
       SUBROUTINE ZPRCN7(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
      $                 N, K, ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
+
       INTEGER          NOUT, NC, IORDER, N, K, LDA, LDB, LDC
       DOUBLE COMPLEX   ALPHA
       DOUBLE PRECISION BETA
       CHARACTER*1      UPLO, TRANSA
-      CHARACTER*12     SNAME
+      CHARACTER*13     SNAME
       CHARACTER*14     CRC, CU, CA
 
       IF (UPLO.EQ.'U')THEN
@@ -2298,13 +2343,15 @@ SUBROUTINE ZPRCN7(NOUT, NC, SNAME, IORDER, UPLO, TRANSA,
       WRITE(NOUT, FMT = 9995)NC, SNAME, CRC, CU, CA
       WRITE(NOUT, FMT = 9994)N, K, ALPHA, LDA, LDB, BETA, LDC
 
- 9995 FORMAT( 1X, I6, ': ', A12,'(', 3( A14, ',') )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', 3( A14, ',') )
  9994 FORMAT( 10X, 2( I3, ',' ), ' (', F4.1, ',', F4.1, '), A,',
      $      I3, ', B', I3, ',', F4.1, ', C,', I3, ').' )
       END
-*
+
+*  =====================================================================
       SUBROUTINE ZMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, RESET,
      $                  TRANSL )
+      IMPLICIT NONE
 *
 *  Generates values for an M by N matrix A.
 *  Stores the values in the array AA in the data structure required
@@ -2432,9 +2479,12 @@ SUBROUTINE ZMAKE( TYPE, UPLO, DIAG, M, N, A, NMAX, AA, LDA, RESET,
 *     End of ZMAKE.
 *
       END
+
+*  =====================================================================
       SUBROUTINE ZMMCH( TRANSA, TRANSB, M, N, KK, ALPHA, A, LDA, B, LDB,
      $                  BETA, C, LDC, CT, G, CC, LDCC, EPS, ERR, FATAL,
      $                  NOUT, MV )
+      IMPLICIT NONE
 *
 *  Checks the results of the computational tests.
 *
@@ -2622,7 +2672,10 @@ SUBROUTINE ZMMCH( TRANSA, TRANSB, M, N, KK, ALPHA, A, LDA, B, LDB,
 *     End of ZMMCH.
 *
       END
+
+*  =====================================================================
       LOGICAL FUNCTION LZE( RI, RJ, LR )
+      IMPLICIT NONE
 *
 *  Tests if two arrays are identical.
 *
@@ -2654,7 +2707,10 @@ LOGICAL FUNCTION LZE( RI, RJ, LR )
 *     End of LZE.
 *
       END
+
+*  =====================================================================
       LOGICAL FUNCTION LZERES( TYPE, UPLO, M, N, AA, AS, LDA )
+      IMPLICIT NONE
 *
 *  Tests if selected elements in two arrays are equal.
 *
@@ -2716,7 +2772,10 @@ LOGICAL FUNCTION LZERES( TYPE, UPLO, M, N, AA, AS, LDA )
 *     End of LZERES.
 *
       END
+
+*  =====================================================================
       COMPLEX*16     FUNCTION ZBEG( RESET )
+      IMPLICIT NONE
 *
 *  Generates complex numbers as pairs of random numbers uniformly
 *  distributed between -0.5 and 0.5.
@@ -2770,7 +2829,10 @@ COMPLEX*16     FUNCTION ZBEG( RESET )
 *     End of ZBEG.
 *
       END
+
+*  =====================================================================
       DOUBLE PRECISION FUNCTION DDIFF( X, Y )
+      IMPLICIT NONE
 *
 *  Auxiliary routine for test program for Level 3 Blas.
 *
@@ -2790,3 +2852,545 @@ DOUBLE PRECISION FUNCTION DDIFF( X, Y )
 *
       END
 
+*  =====================================================================
+      SUBROUTINE ZCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
+     $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
+     $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G,
+     $                  IORDER )
+      IMPLICIT NONE
+*
+*  Tests CGEMMTR.
+*
+*  Auxiliary routine for test program for Level 3 Blas.
+*
+*  -- Written on 24-June-2024.
+*     Martin Koehler, Max Planck Institute Magdeburg
+*
+*     .. Parameters ..
+      COMPLEX*16         ZERO
+      PARAMETER          ( ZERO = ( 0.0, 0.0 ) )
+      DOUBLE PRECISION   RZERO
+      PARAMETER          ( RZERO = 0.0 )
+*     .. Scalar Arguments ..
+      DOUBLE PRECISION   EPS, THRESH
+      INTEGER            NALF, NBET, NIDIM, NMAX, NOUT, NTRA, IORDER
+      LOGICAL            FATAL, REWI, TRACE
+      CHARACTER*13       SNAME
+*     .. Array Arguments ..
+      COMPLEX*16         A( NMAX, NMAX ), AA( NMAX*NMAX ), ALF( NALF ),
+     $                   AS( NMAX*NMAX ), B( NMAX, NMAX ),
+     $                   BB( NMAX*NMAX ), BET( NBET ), BS( NMAX*NMAX ),
+     $                   C( NMAX, NMAX ), CC( NMAX*NMAX ),
+     $                   CS( NMAX*NMAX ), CT( NMAX )
+      DOUBLE PRECISION   G( NMAX )
+      INTEGER            IDIM( NIDIM )
+*     .. Local Scalars ..
+      COMPLEX*16         ALPHA, ALS, BETA, BLS
+      DOUBLE PRECISION   ERR, ERRMAX
+      INTEGER            I, IA, IB, ICA, ICB, IK, IM, IN, K, KS, LAA,
+     $                   LBB, LCC, LDA, LDAS, LDB, LDBS, LDC, LDCS,
+     $                   MA, MB, N, NA, NARGS, NB, NC, NS, IS
+      LOGICAL            NULL, RESET, SAME, TRANA, TRANB
+      CHARACTER*1        TRANAS, TRANBS, TRANSA, TRANSB, UPLO, UPLOS
+      CHARACTER*3        ICH
+      CHARACTER*2        ISHAPE
+*     .. Local Arrays ..
+      LOGICAL            ISAME( 13 )
+*     .. External Functions ..
+      LOGICAL            LZE, LZERES
+      EXTERNAL           LZE, LZERES
+*     .. External Subroutines ..
+      EXTERNAL           CZGEMMTR, ZMAKE, ZMMTCH, ZPRCN8
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX
+*     .. Scalars in Common ..
+      INTEGER            INFOT, NOUTC
+      LOGICAL            LERR, OK
+*     .. Common blocks ..
+      COMMON             /INFOC/INFOT, NOUTC, OK, LERR
+*     .. Data statements ..
+      DATA               ICH/'NTC'/
+      DATA               ISHAPE/'UL'/
+*     .. Executable Statements ..
+*
+      NARGS = 13
+      NC = 0
+      RESET = .TRUE.
+      ERRMAX = RZERO
+*
+      DO 100 IN = 1, NIDIM
+         N = IDIM( IN )
+*        Set LDC to 1 more than minimum value if room.
+         LDC = N
+         IF( LDC.LT.NMAX )
+     $      LDC = LDC + 1
+*        Skip tests if not enough room.
+         IF( LDC.GT.NMAX )
+     $      GO TO 100
+         LCC = LDC*N
+         NULL = N.LE.0.
+*
+         DO 90 IK = 1, NIDIM
+            K = IDIM( IK )
+*
+            DO 80 ICA = 1, 3
+               TRANSA = ICH( ICA: ICA )
+               TRANA = TRANSA.EQ.'T'.OR.TRANSA.EQ.'C'
+*
+               IF( TRANA )THEN
+                  MA = K
+                  NA = N
+               ELSE
+                  MA = N
+                  NA = K
+               END IF
+*              Set LDA to 1 more than minimum value if room.
+               LDA = MA
+               IF( LDA.LT.NMAX )
+     $            LDA = LDA + 1
+*              Skip tests if not enough room.
+               IF( LDA.GT.NMAX )
+     $            GO TO 80
+               LAA = LDA*NA
+*
+*              Generate the matrix A.
+*
+               CALL ZMAKE( 'ge', ' ', ' ', MA, NA, A, NMAX, AA, LDA,
+     $                     RESET, ZERO )
+*
+               DO 70 ICB = 1, 3
+                  TRANSB = ICH( ICB: ICB )
+                  TRANB = TRANSB.EQ.'T'.OR.TRANSB.EQ.'C'
+*
+                  IF( TRANB )THEN
+                     MB = N
+                     NB = K
+                  ELSE
+                     MB = K
+                     NB = N
+                  END IF
+*                 Set LDB to 1 more than minimum value if room.
+                  LDB = MB
+                  IF( LDB.LT.NMAX )
+     $               LDB = LDB + 1
+*                 Skip tests if not enough room.
+                  IF( LDB.GT.NMAX )
+     $               GO TO 70
+                  LBB = LDB*NB
+*
+*                 Generate the matrix B.
+*
+                  CALL ZMAKE( 'ge', ' ', ' ', MB, NB, B, NMAX, BB,
+     $                        LDB, RESET, ZERO )
+*
+                  DO 60 IA = 1, NALF
+                     ALPHA = ALF( IA )
+*
+                     DO 50 IB = 1, NBET
+                        BETA = BET( IB )
+                        DO 45 IS = 1, 2
+                           UPLO = ISHAPE(IS:IS)
+*
+*                          Generate the matrix C.
+*
+                           CALL ZMAKE( 'ge', UPLO, ' ', N, N, C, NMAX,
+     $                                 CC, LDC, RESET, ZERO )
+*
+                           NC = NC + 1
+*
+*                          Save every datum before calling the
+*                          subroutine.
+*
+                           UPLOS = UPLO
+                           TRANAS = TRANSA
+                           TRANBS = TRANSB
+                           NS = N
+                           KS = K
+                           ALS = ALPHA
+                           DO 10 I = 1, LAA
+                              AS( I ) = AA( I )
+   10                      CONTINUE
+                           LDAS = LDA
+                           DO 20 I = 1, LBB
+                              BS( I ) = BB( I )
+   20                      CONTINUE
+                           LDBS = LDB
+                           BLS = BETA
+                           DO 30 I = 1, LCC
+                              CS( I ) = CC( I )
+   30                      CONTINUE
+                           LDCS = LDC
+*
+*                          Call the subroutine.
+*
+                           IF( TRACE )
+     $                        CALL ZPRCN8(NTRA, NC, SNAME, IORDER, UPLO,
+     $                        TRANSA, TRANSB, N, K, ALPHA, LDA,
+     $                        LDB, BETA, LDC)
+                           IF( REWI )
+     $                        REWIND NTRA
+                           CALL CZGEMMTR(IORDER, UPLO, TRANSA, TRANSB,
+     $                                 N, K, ALPHA, AA, LDA, BB, LDB,
+     $                                 BETA, CC, LDC )
+*
+*                          Check if error-exit was taken incorrectly.
+*
+                           IF( .NOT.OK )THEN
+                              WRITE( NOUT, FMT = 9994 )
+                              FATAL = .TRUE.
+                              GO TO 120
+                           END IF
+*
+*                          See what data changed inside subroutines.
+*
+                           ISAME( 1 ) = UPLO .EQ. UPLOS
+                           ISAME( 2 ) = TRANSA.EQ.TRANAS
+                           ISAME( 3 ) = TRANSB.EQ.TRANBS
+                           ISAME( 4 ) = NS.EQ.N
+                           ISAME( 5 ) = KS.EQ.K
+                           ISAME( 6 ) = ALS.EQ.ALPHA
+                           ISAME( 7 ) = LZE( AS, AA, LAA )
+                           ISAME( 8 ) = LDAS.EQ.LDA
+                           ISAME( 9 ) = LZE( BS, BB, LBB )
+                           ISAME( 10 ) = LDBS.EQ.LDB
+                           ISAME( 11 ) = BLS.EQ.BETA
+                           IF( NULL )THEN
+                              ISAME( 12 ) = LZE( CS, CC, LCC )
+                           ELSE
+                             ISAME( 12 ) = LZERES( 'ge', ' ', N, N, CS,
+     $                                      CC, LDC )
+                           END IF
+                           ISAME( 13 ) = LDCS.EQ.LDC
+*
+*                          If data was incorrectly changed, report
+*                          and return.
+*
+                           SAME = .TRUE.
+                           DO 40 I = 1, NARGS
+                              SAME = SAME.AND.ISAME( I )
+                              IF( .NOT.ISAME( I ) )
+     $                           WRITE( NOUT, FMT = 9998 )I
+   40                      CONTINUE
+                           IF( .NOT.SAME )THEN
+                              FATAL = .TRUE.
+                              GO TO 120
+                           END IF
+*
+                           IF( .NOT.NULL )THEN
+*
+*                             Check the result.
+*
+                              CALL ZMMTCH( UPLO, TRANSA, TRANSB, N, K,
+     $                                   ALPHA, A, NMAX, B, NMAX, BETA,
+     $                                   C, NMAX, CT, G, CC, LDC, EPS,
+     $                                   ERR, FATAL, NOUT, .TRUE. )
+                              ERRMAX = MAX( ERRMAX, ERR )
+*                             If got really bad answer, report and
+*                             return.
+                              IF( FATAL )
+     $                           GO TO 120
+                           END IF
+*
+   45                   CONTINUE
+*
+   50                CONTINUE
+*
+   60             CONTINUE
+*
+   70          CONTINUE
+*
+   80       CONTINUE
+*
+   90    CONTINUE
+*
+  100 CONTINUE
+*
+*
+*     Report result.
+*
+      IF( ERRMAX.LT.THRESH )THEN
+         IF ( IORDER.EQ.0) WRITE( NOUT, FMT = 10000 )SNAME, NC
+         IF ( IORDER.EQ.1) WRITE( NOUT, FMT = 10001 )SNAME, NC
+      ELSE
+         IF ( IORDER.EQ.0) WRITE( NOUT, FMT = 10002 )SNAME, NC, ERRMAX
+         IF ( IORDER.EQ.1) WRITE( NOUT, FMT = 10003 )SNAME, NC, ERRMAX
+      END IF
+      GO TO 130
+*
+  120 CONTINUE
+      WRITE( NOUT, FMT = 9996 )SNAME
+      CALL ZPRCN8(NOUT, NC, SNAME, IORDER, UPLO, TRANSA, TRANSB,
+     $           N, K, ALPHA, LDA, LDB, BETA, LDC)
+*
+  130 CONTINUE
+      RETURN
+*
+10003 FORMAT( ' ', A13,' COMPLETED THE ROW-MAJOR    COMPUTATIONAL ',
+     $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
+     $ 'RATIO ', F8.2, ' - SUSPECT *******' )
+10002 FORMAT( ' ', A13,' COMPLETED THE COLUMN-MAJOR COMPUTATIONAL ',
+     $ 'TESTS (', I6, ' CALLS)', /' ******* BUT WITH MAXIMUM TEST ',
+     $ 'RATIO ', F8.2, ' - SUSPECT *******' )
+10001 FORMAT( ' ', A13,' PASSED THE ROW-MAJOR    COMPUTATIONAL TESTS',
+     $ ' (', I6, ' CALL', 'S)' )
+10000 FORMAT( ' ', A13,' PASSED THE COLUMN-MAJOR COMPUTATIONAL TESTS',
+     $ ' (', I6, ' CALL', 'S)' )
+ 9998 FORMAT(' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
+     $      'ANGED INCORRECTLY *******' )
+ 9996 FORMAT( ' ******* ', A13,' FAILED ON CALL NUMBER:' )
+ 9995 FORMAT( 1X, I6, ': ', A13,'(''', A1, ''',''', A1, ''',',
+     $     3( I3, ',' ), '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3,
+     $     ',(', F4.1, ',', F4.1, '), C,', I3, ').' )
+ 9994 FORMAT(' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
+     $      '******' )
+*
+*     End of ZCHK6.
+*
+      END
+
+*  =====================================================================
+      SUBROUTINE ZPRCN8(NOUT, NC, SNAME, IORDER, UPLO,
+     $                 TRANSA, TRANSB, N,
+     $                 K, ALPHA, LDA, LDB, BETA, LDC)
+      IMPLICIT NONE
+
+      INTEGER          NOUT, NC, IORDER, N, K, LDA, LDB, LDC
+      COMPLEX*16       ALPHA, BETA
+      CHARACTER*1      TRANSA, TRANSB, UPLO
+      CHARACTER*13     SNAME
+      CHARACTER*14     CRC, CTA,CTB,CUPLO
+
+      IF (UPLO.EQ.'U') THEN
+          CUPLO = 'CblasUpper'
+      ELSE
+          CUPLO = 'CblasLower'
+      END IF
+      IF (TRANSA.EQ.'N')THEN
+         CTA = '  CblasNoTrans'
+      ELSE IF (TRANSA.EQ.'T')THEN
+         CTA = '    CblasTrans'
+      ELSE
+         CTA = 'CblasConjTrans'
+      END IF
+      IF (TRANSB.EQ.'N')THEN
+         CTB = '  CblasNoTrans'
+      ELSE IF (TRANSB.EQ.'T')THEN
+         CTB = '    CblasTrans'
+      ELSE
+         CTB = 'CblasConjTrans'
+      END IF
+      IF (IORDER.EQ.1)THEN
+         CRC = ' CblasRowMajor'
+      ELSE
+         CRC = ' CblasColMajor'
+      END IF
+      WRITE(NOUT, FMT = 9995)NC,SNAME,CRC, CUPLO, CTA,CTB
+      WRITE(NOUT, FMT = 9994)N, K, ALPHA, LDA, LDB, BETA, LDC
+
+ 9995 FORMAT( 1X, I6, ': ', A13,'(', A14, ',', A14, ',', A14, ',',
+     $        A14, ',')
+ 9994 FORMAT( 10X, 2( I3, ',' ) ,' (', F4.1,',',F4.1,') , A,',
+     $ I3, ', B,', I3, ', (', F4.1,',',F4.1,') , C,', I3, ').' )
+      END
+
+*  =====================================================================
+      SUBROUTINE ZMMTCH(UPLO, TRANSA, TRANSB, N, KK, ALPHA, A, LDA,
+     $                  B, LDB,
+     $                  BETA, C, LDC, CT, G, CC, LDCC, EPS, ERR, FATAL,
+     $                  NOUT, MV )
+      IMPLICIT NONE
+*
+*  Checks the results of the computational tests for GEMMTR.
+*
+*  Auxiliary routine for test program for Level 3 Blas.
+*
+*  -- Written on 24-June-2024.
+*     Martin Koehler, Max Planck Institute, Magdeburg
+*
+*     .. Parameters ..
+      COMPLEX*16         ZERO
+      PARAMETER          ( ZERO = ( 0.0, 0.0 ) )
+      DOUBLE PRECISION   RZERO, RONE
+      PARAMETER          ( RZERO = 0.0, RONE = 1.0 )
+*     .. Scalar Arguments ..
+      COMPLEX*16         ALPHA, BETA
+      DOUBLE PRECISION   EPS, ERR
+      INTEGER            KK, LDA, LDB, LDC, LDCC, N, NOUT
+      LOGICAL            FATAL, MV
+      CHARACTER*1        TRANSA, TRANSB, UPLO
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), B( LDB, * ), C( LDC, * ),
+     $                   CC( LDCC, * ), CT( * )
+      DOUBLE PRECISION   G( * )
+*     .. Local Scalars ..
+      COMPLEX*16         CL
+      DOUBLE PRECISION   ERRI
+      INTEGER            I, J, K, ISTART, ISTOP
+      LOGICAL            CTRANA, CTRANB, TRANA, TRANB, UPPER
+*     .. Intrinsic Functions ..
+      INTRINSIC          DABS, DIMAG, DCONJG, MAX, DBLE, DSQRT
+*     .. Statement Functions ..
+      DOUBLE PRECISION   ABS1
+*     .. Statement Function definitions ..
+      ABS1( CL ) = DABS( DBLE( CL ) ) + DABS( DIMAG( CL ) )
+*     .. Executable Statements ..
+
+      UPPER = UPLO.EQ.'U'
+      TRANA = TRANSA.EQ.'T'.OR.TRANSA.EQ.'C'
+      TRANB = TRANSB.EQ.'T'.OR.TRANSB.EQ.'C'
+      CTRANA = TRANSA.EQ.'C'
+      CTRANB = TRANSB.EQ.'C'
+
+      ISTART = 1
+      ISTOP = N
+*
+*     Compute expected result, one column at a time, in CT using data
+*     in A, B and C.
+*     Compute gauges in G.
+*
+      DO 220 J = 1, N
+*
+         IF (UPPER) THEN
+             ISTART = 1
+             ISTOP =  J
+         ELSE
+             ISTART = J
+             ISTOP  = N
+         END IF
+         DO 10 I = ISTART, ISTOP
+            CT( I ) = ZERO
+            G( I ) = RZERO
+   10    CONTINUE
+         IF( .NOT.TRANA.AND..NOT.TRANB )THEN
+            DO 30 K = 1, KK
+               DO 20 I = ISTART, ISTOP
+                  CT( I ) = CT( I ) + A( I, K )*B( K, J )
+                  G( I ) = G( I ) + ABS1( A( I, K ) )*ABS1( B( K, J ) )
+   20          CONTINUE
+   30       CONTINUE
+         ELSE IF( TRANA.AND..NOT.TRANB )THEN
+            IF( CTRANA )THEN
+               DO 50 K = 1, KK
+                  DO 40 I =  ISTART, ISTOP
+                     CT( I ) = CT( I ) + DCONJG( A( K, I ) )*B( K, J )
+                     G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                        ABS1( B( K, J ) )
+   40             CONTINUE
+   50          CONTINUE
+            ELSE
+               DO 70 K = 1, KK
+                  DO 60 I = ISTART, ISTOP
+                     CT( I ) = CT( I ) + A( K, I )*B( K, J )
+                     G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                        ABS1( B( K, J ) )
+   60             CONTINUE
+   70          CONTINUE
+            END IF
+         ELSE IF( .NOT.TRANA.AND.TRANB )THEN
+            IF( CTRANB )THEN
+               DO 90 K = 1, KK
+                  DO 80 I =  ISTART, ISTOP
+                     CT( I ) = CT( I ) + A( I, K )*DCONJG( B( J, K ) )
+                     G( I ) = G( I ) + ABS1( A( I, K ) )*
+     $                        ABS1( B( J, K ) )
+   80             CONTINUE
+   90          CONTINUE
+            ELSE
+               DO 110 K = 1, KK
+                  DO 100 I = ISTART, ISTOP
+                     CT( I ) = CT( I ) + A( I, K )*B( J, K )
+                     G( I ) = G( I ) + ABS1( A( I, K ) )*
+     $                        ABS1( B( J, K ) )
+  100             CONTINUE
+  110          CONTINUE
+            END IF
+         ELSE IF( TRANA.AND.TRANB )THEN
+            IF( CTRANA )THEN
+               IF( CTRANB )THEN
+                  DO 130 K = 1, KK
+                     DO 120 I = ISTART, ISTOP
+                        CT( I ) = CT( I ) + DCONJG( A( K, I ) )*
+     $                            DCONJG( B( J, K ) )
+                        G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                           ABS1( B( J, K ) )
+  120                CONTINUE
+  130             CONTINUE
+               ELSE
+                  DO 150 K = 1, KK
+                     DO 140 I =  ISTART, ISTOP
+                       CT( I ) = CT( I ) + DCONJG( A( K, I ) )*B( J, K )
+                       G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                           ABS1( B( J, K ) )
+  140                CONTINUE
+  150             CONTINUE
+               END IF
+            ELSE
+               IF( CTRANB )THEN
+                  DO 170 K = 1, KK
+                     DO 160 I =  ISTART, ISTOP
+                       CT( I ) = CT( I ) + A( K, I )*DCONJG( B( J, K ) )
+                       G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                           ABS1( B( J, K ) )
+  160                CONTINUE
+  170             CONTINUE
+               ELSE
+                  DO 190 K = 1, KK
+                     DO 180 I =  ISTART, ISTOP
+                        CT( I ) = CT( I ) + A( K, I )*B( J, K )
+                        G( I ) = G( I ) + ABS1( A( K, I ) )*
+     $                           ABS1( B( J, K ) )
+  180                CONTINUE
+  190             CONTINUE
+               END IF
+            END IF
+         END IF
+         DO 200 I =  ISTART, ISTOP
+            CT( I ) = ALPHA*CT( I ) + BETA*C( I, J )
+            G( I ) = ABS1( ALPHA )*G( I ) +
+     $               ABS1( BETA )*ABS1( C( I, J ) )
+  200    CONTINUE
+*
+*        Compute the error ratio for this result.
+*
+         ERR = ZERO
+         DO 210 I =  ISTART, ISTOP
+            ERRI = ABS1( CT( I ) - CC( I, J ) )/EPS
+            IF( G( I ).NE.RZERO )
+     $         ERRI = ERRI/G( I )
+            ERR = MAX( ERR, ERRI )
+            IF( ERR*DSQRT( EPS ).GE.RONE )
+     $         GO TO 230
+  210    CONTINUE
+*
+  220 CONTINUE
+*
+*     If the loop completes, all results are at least half accurate.
+      GO TO 250
+*
+*     Report fatal error.
+*
+  230 FATAL = .TRUE.
+      WRITE( NOUT, FMT = 9999 )
+      DO 240 I =  ISTART, ISTOP
+         IF( MV )THEN
+            WRITE( NOUT, FMT = 9998 )I, CT( I ), CC( I, J )
+         ELSE
+            WRITE( NOUT, FMT = 9998 )I, CC( I, J ), CT( I )
+         END IF
+  240 CONTINUE
+      IF( N.GT.1 )
+     $   WRITE( NOUT, FMT = 9997 )J
+*
+  250 CONTINUE
+      RETURN
+*
+ 9999 FORMAT(' ******* FATAL ERROR - COMPUTED RESULT IS LESS THAN HAL',
+     $     'F ACCURATE *******', /'                       EXPECTED RE',
+     $     'SULT                    COMPUTED RESULT' )
+ 9998 FORMAT( 1X, I7, 2( '  (', G15.6, ',', G15.6, ')' ) )
+ 9997 FORMAT( '      THESE ARE THE RESULTS FOR COLUMN ', I3 )
+*
+*     End of ZMMTCH.
+*
+      END
+
diff --git a/CBLAS/testing/cin3 b/CBLAS/testing/cin3
index 7b34f267bb..093bf8e26a 100644
--- a/CBLAS/testing/cin3
+++ b/CBLAS/testing/cin3
@@ -20,3 +20,4 @@ cblas_cherk  T PUT F FOR NO TEST. SAME COLUMNS.
 cblas_csyrk  T PUT F FOR NO TEST. SAME COLUMNS.
 cblas_cher2k T PUT F FOR NO TEST. SAME COLUMNS.
 cblas_csyr2k T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_cgemmtr T PUT F FOR NO TEST. SAME COLUMNS.
diff --git a/CBLAS/testing/din3 b/CBLAS/testing/din3
index 1f777156f0..350544d66f 100644
--- a/CBLAS/testing/din3
+++ b/CBLAS/testing/din3
@@ -11,9 +11,10 @@ T        LOGICAL FLAG, T TO TEST ERROR EXITS.
 0.0 1.0 0.7       VALUES OF ALPHA
 3                 NUMBER OF VALUES OF BETA
 0.0 1.0 1.3       VALUES OF BETA
-cblas_dgemm  T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_dsymm  T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_dtrmm  T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_dtrsm  T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_dsyrk  T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_dsyr2k T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_dgemm   T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_dsymm   T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_dtrmm   T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_dtrsm   T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_dsyrk   T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_dsyr2k  T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_dgemmtr T PUT F FOR NO TEST. SAME COLUMNS.
diff --git a/CBLAS/testing/sin3 b/CBLAS/testing/sin3
index aa18530cb4..f332c8a9e0 100644
--- a/CBLAS/testing/sin3
+++ b/CBLAS/testing/sin3
@@ -11,9 +11,10 @@ T        LOGICAL FLAG, T TO TEST ERROR EXITS.
 0.0 1.0 0.7       VALUES OF ALPHA
 3                 NUMBER OF VALUES OF BETA
 0.0 1.0 1.3       VALUES OF BETA
-cblas_sgemm  T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_ssymm  T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_strmm  T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_strsm  T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_ssyrk  T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_ssyr2k T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_sgemm   T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_ssymm   T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_strmm   T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_strsm   T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_ssyrk   T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_ssyr2k  T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_sgemmtr T PUT F FOR NO TEST. SAME COLUMNS.
diff --git a/CBLAS/testing/zin3 b/CBLAS/testing/zin3
index 90a657592c..7e00e13ced 100644
--- a/CBLAS/testing/zin3
+++ b/CBLAS/testing/zin3
@@ -11,12 +11,13 @@ T        LOGICAL FLAG, T TO TEST ERROR EXITS.
 (0.0,0.0) (1.0,0.0) (0.7,-0.9)       VALUES OF ALPHA
 3                 NUMBER OF VALUES OF BETA
 (0.0,0.0) (1.0,0.0) (1.3,-1.1)       VALUES OF BETA
-cblas_zgemm  T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_zhemm  T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_zsymm  T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_ztrmm  T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_ztrsm  T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_zherk  T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_zsyrk  T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_zher2k T PUT F FOR NO TEST. SAME COLUMNS.
-cblas_zsyr2k T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_zgemm   T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_zhemm   T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_zsymm   T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_ztrmm   T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_ztrsm   T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_zherk   T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_zsyrk   T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_zher2k  T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_zsyr2k  T PUT F FOR NO TEST. SAME COLUMNS.
+cblas_zgemmtr T PUT F FOR NO TEST. SAME COLUMNS.
diff --git a/CMAKE/CheckFortranTypeSizes.cmake b/CMAKE/CheckFortranTypeSizes.cmake
index 585ca26e72..17c0df80e8 100644
--- a/CMAKE/CheckFortranTypeSizes.cmake
+++ b/CMAKE/CheckFortranTypeSizes.cmake
@@ -1,4 +1,4 @@
-# This module perdorms several try-compiles to determine the default integer
+# This module performs several try-compiles to determine the default integer
 # size being used by the fortran compiler
 #
 # After execution, the following variables are set.  If they are un set then
diff --git a/CMAKE/CheckLAPACKCompilerFlags.cmake b/CMAKE/CheckLAPACKCompilerFlags.cmake
index d727a15923..2aa2a0aba3 100644
--- a/CMAKE/CheckLAPACKCompilerFlags.cmake
+++ b/CMAKE/CheckLAPACKCompilerFlags.cmake
@@ -10,75 +10,216 @@
 # Copyright 2011
 #=============================================================================
 
-macro( CheckLAPACKCompilerFlags )
+macro(CheckLAPACKCompilerFlags)
 
-set( FPE_EXIT FALSE )
-
-# GNU Fortran
-if( CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" )
-  if( "${CMAKE_Fortran_FLAGS}" MATCHES "-ffpe-trap=[izoupd]")
-    set( FPE_EXIT TRUE )
+  # FORTRAN ILP default
+  set(FOPT_ILP64)
+  if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
+    if(WIN32)
+      set(FOPT_ILP64 /integer-size:64)
+    else()
+      set(FOPT_ILP64 "SHELL:-integer-size 64")
+    endif()
+  elseif((CMAKE_Fortran_COMPILER_ID STREQUAL "VisualAge") OR  # CMake 2.6
+         (CMAKE_Fortran_COMPILER_ID STREQUAL "XL"))           # CMake 2.8
+    set(FOPT_ILP64 -qintsize=8)
+  elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "NAG")
+    if(WIN32)
+      set(FOPT_ILP64 /i8)
+    else()
+      set(FOPT_ILP64 -i8)
+    endif()
+  elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC")
+    if(WIN32)
+      set(FOPT_ILP64 /i8)
+    else()
+      set(FOPT_ILP64 -i8)
+    endif()
+  else()
+    set(CPE_ENV $ENV{PE_ENV})
+    if(CPE_ENV STREQUAL "CRAY")
+      set(FOPT_ILP64 -sinteger64)
+    elseif(CPE_ENV STREQUAL "NVIDIA")
+      set(FOPT_ILP64 -i8)
+    else()
+      set(FOPT_ILP64 -fdefault-integer-8)
+    endif()
   endif()
-
-# Intel Fortran
-elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "Intel" )
-  if( "${CMAKE_Fortran_FLAGS}" MATCHES "[-/]fpe(-all=|)0" )
-    set( FPE_EXIT TRUE )
+  if(FORTRAN_ILP)
+    add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:${FOPT_ILP64}>")
   endif()
 
-# SunPro F95
-elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "SunPro" )
-  if( ("${CMAKE_Fortran_FLAGS}" MATCHES "-ftrap=") AND
-      NOT ("${CMAKE_Fortran_FLAGS}" MATCHES "-ftrap=(%|)none") )
-    set( FPE_EXIT TRUE )
-  elseif( NOT (CMAKE_Fortran_FLAGS MATCHES "-ftrap=") )
-    message( STATUS "Disabling FPE trap handlers with -ftrap=%none" )
-    set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ftrap=%none"
-         CACHE STRING "Flags for Fortran compiler." FORCE )
-  endif()
+  # GNU Fortran
+  if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+    set(FPE_EXIT_FLAG "-ffpe-trap=[izoupd]")
 
-# IBM XL Fortran
-elseif( (CMAKE_Fortran_COMPILER_ID STREQUAL "VisualAge" ) OR  # CMake 2.6
-        (CMAKE_Fortran_COMPILER_ID STREQUAL "XL" ) )          # CMake 2.8
-  if( "${CMAKE_Fortran_FLAGS}" MATCHES "-qflttrap=[a-zA-Z:]:enable" )
-    set( FPE_EXIT TRUE )
-  endif()
+    add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-frecursive>")
+
+    if(CMAKE_Fortran_COMPILER_VERSION VERSION_LESS "8")
+      add_compile_definitions("$<$<COMPILE_LANGUAGE:C>:FORTRAN_STRLEN=int>")
+    endif()
+
+    # Disabling loop vectorization for GNU Fortran versions affected by
+    # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=122408. See issue
+    # https://github.com/Reference-LAPACK/lapack/issues/1160 as well.
+    if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm|arm64|aarch64")
+      if((CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL "14.0" AND
+          CMAKE_Fortran_COMPILER_VERSION VERSION_LESS_EQUAL "14.4") OR
+         (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL "15.0" AND
+          CMAKE_Fortran_COMPILER_VERSION VERSION_LESS_EQUAL "15.2"))
+        message(WARNING
+          "Disabling loop vectorization for GNU Fortran (14.0-14.4, 15.0-15.2) on ARM "
+          "due to a compiler bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=122408). "
+          "For full performance, consider changing to a different compiler or compiler version.")
+        add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-fno-tree-loop-vectorize>")
+      endif()
+    endif()
+
+  # Intel Fortran
+  elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
+    set(FPE_EXIT_FLAG "[-/]fpe(-all=|)0")
+
+    add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-recursive>")
+    if(UNIX)
+      add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:SHELL:-fp-model strict>")
+    endif()
+
+  # SunPro F95
+  elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "SunPro")
+    set(FPE_EXIT_FLAG "-ftrap=")
+    set(FPE_DISABLE_FLAG "-ftrap=(%|)none")
+
+    message(STATUS "Disabling FPE trap handlers with -ftrap=%none")
+    add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-ftrap=%none>")
+
+    if(UNIX)
+      # Delete libmtsk in linking sequence for Sun/Oracle Fortran Compiler.
+      # This library is not present in the Sun package SolarisStudio12.3-linux-x86-bin
+      string(REPLACE \;mtsk\; \; CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES
+             "${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES}")
+    endif()
+
+  # IBM XL Fortran
+  elseif((CMAKE_Fortran_COMPILER_ID STREQUAL "VisualAge") OR  # CMake 2.6
+         (CMAKE_Fortran_COMPILER_ID STREQUAL "XL"))           # CMake 2.8
+    set(FPE_EXIT_FLAG "-qflttrap=[a-zA-Z:]:enable")
+
+    add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-qrecur>")
+    if(UNIX)
+      add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-qnosave>")
+      add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-qstrict>")
+    endif()
+
+  # HP Fortran
+  elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "HP")
+    set(FPE_EXIT_FLAG "\\+fp_exception")
 
-# HP Fortran
-elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "HP" )
-  if( "${CMAKE_Fortran_FLAGS}" MATCHES "\\+fp_exception" )
-    set( FPE_EXIT TRUE )
+    message(STATUS "Enabling strict float conversion with +fltconst_strict")
+    add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:+fltconst_strict>")
+
+    # Most versions of cmake don't have good default options for the HP compiler
+    add_compile_options("$<$<AND:$<COMPILE_LANGUAGE:Fortran>,$<CONFIG:DEBUG>>:-g>")
+    add_compile_options("$<$<AND:$<COMPILE_LANGUAGE:Fortran>,$<CONFIG:MINSIZEREL>>:+Osize>")
+    add_compile_options("$<$<AND:$<COMPILE_LANGUAGE:Fortran>,$<CONFIG:RELEASE>>:+O2>")
+    add_compile_options("$<$<AND:$<COMPILE_LANGUAGE:Fortran>,$<CONFIG:RELWITHDEBINFO>>:+O2 -g>")
+
+  # NAG Fortran
+  elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "NAG")
+    set(FPE_EXIT_FLAG "[-/]ieee=(stop|nonstd)")
+
+    add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-ieee=full>")
+    add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-dcfuns>")
+    add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-thread_safe>")
+    add_link_options("$<$<COMPILE_LANGUAGE:Fortran>:-thread_safe>")
+    add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-recursive>")
+
+    # By default NAG Fortran uses 32bit integers as hidden STRLEN arguments
+    if(UNIX)
+      if(APPLE)
+        add_compile_definitions("$<$<COMPILE_LANGUAGE:C>:FORTRAN_STRLEN=int>")
+      else()
+        # Get all flags added via `add_compile_options(...)`
+        get_directory_property(COMP_OPTIONS COMPILE_OPTIONS)
+
+        if(NOT("${CMAKE_Fortran_FLAGS};${COMP_OPTIONS}" MATCHES "-abi=64c"))
+          add_compile_definitions("$<$<COMPILE_LANGUAGE:C>:FORTRAN_STRLEN=int>")
+        endif()
+      endif()
+    endif()
+
+    # Disable warnings
+    add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-w=obs>")
+    add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-w=x77>")
+    add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-w=ques>")
+    add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-w=unused>")
+
+    # Suppress compiler banner and summary
+    include(CheckFortranCompilerFlag)
+    check_fortran_compiler_flag("-quiet" _quiet)
+    add_compile_options("$<$<AND:$<COMPILE_LANGUAGE:Fortran>,$<BOOL:${_quiet}>>:-quiet>")
+    add_link_options("$<$<AND:$<COMPILE_LANGUAGE:Fortran>,$<BOOL:${_quiet}>>:-quiet>")
+
+  # NVIDIA HPC SDK
+  elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC")
+    set(FPE_EXIT_FLAG "-Ktrap=")
+    set(FPE_DISABLE_FLAG "-Ktrap=none")
+
+    add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-Kieee>")
+    add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-Mrecursive>")
+
+  # Flang Fortran
+  elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Flang")
+    add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-Mrecursive>")
+
+  # Compaq Fortran
+  elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Compaq")
+    if(WIN32)
+      if(CMAKE_GENERATOR STREQUAL "NMake Makefiles")
+        get_filename_component(CMAKE_Fortran_COMPILER_CMDNAM ${CMAKE_Fortran_COMPILER} NAME_WE)
+        message(STATUS "Using Compaq Fortran compiler with command name ${CMAKE_Fortran_COMPILER_CMDNAM}")
+        set(cmd ${CMAKE_Fortran_COMPILER_CMDNAM})
+        string(TOLOWER "${cmd}" cmdlc)
+        if(cmdlc STREQUAL "df")
+          message(STATUS "Assume the Compaq Visual Fortran Compiler is being used")
+          set(CMAKE_Fortran_USE_RESPONSE_FILE_FOR_OBJECTS 1)
+          set(CMAKE_Fortran_USE_RESPONSE_FILE_FOR_INCLUDES 1)
+          #This is a workaround that is needed to avoid forward-slashes in the
+          #filenames listed in response files from incorrectly being interpreted as
+          #introducing compiler command options
+          if(${BUILD_SHARED_LIBS})
+            message(FATAL_ERROR "Making of shared libraries with CVF has not been tested.")
+          endif()
+          set(str "NMake version 9 or later should be used. NMake version 6.0 which is\n")
+          set(str "${str}   included with the CVF distribution fails to build Lapack because\n")
+          set(str "${str}   the number of source files exceeds the limit for NMake v6.0\n")
+          message(STATUS ${str})
+          set(CMAKE_Fortran_LINK_EXECUTABLE "LINK /out:<TARGET> <LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS>")
+        endif()
+      endif()
+    endif()
+
+  else()
+    message(WARNING "Fortran local arrays should be allocated on the stack."
+      " Please use a compiler which guarantees that feature."
+      " See https://github.com/Reference-LAPACK/lapack/pull/188 and references therein.")
   endif()
 
-  if( NOT ("${CMAKE_Fortran_FLAGS}" MATCHES "\\+fltconst_strict") )
-    message( STATUS "Enabling strict float conversion with +fltconst_strict" )
-    set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} +fltconst_strict"
-         CACHE STRING "Flags for Fortran compiler." FORCE )
+  if("${CMAKE_Fortran_FLAGS_RELEASE}" MATCHES "O[3-9]")
+    message(STATUS "Reducing RELEASE optimization level to O2")
+    string(REGEX REPLACE "O[3-9]" "O2" CMAKE_Fortran_FLAGS_RELEASE
+           "${CMAKE_Fortran_FLAGS_RELEASE}")
   endif()
 
-  # Most versions of cmake don't have good default options for the HP compiler
-  set( CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -g"
-       CACHE STRING "Flags used by the compiler during debug builds" FORCE )
-  set( CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_MINSIZEREL} +Osize"
-       CACHE STRING "Flags used by the compiler during release minsize builds" FORCE )
-  set( CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_RELEASE} +O2"
-       CACHE STRING "Flags used by the compiler during release builds" FORCE )
-  set( CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_RELWITHDEBINFO} +O2 -g"
-       CACHE STRING "Flags used by the compiler during release with debug info builds" FORCE )
-else()
-endif()
-
-if( "${CMAKE_Fortran_FLAGS_RELEASE}" MATCHES "O[3-9]" )
-  message( STATUS "Reducing RELEASE optimization level to O2" )
-  string( REGEX REPLACE "O[3-9]" "O2" CMAKE_Fortran_FLAGS_RELEASE
-          "${CMAKE_Fortran_FLAGS_RELEASE}" )
-  set( CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
-       CACHE STRING "Flags used by the compiler during release builds" FORCE )
-endif()
-
-
-if( FPE_EXIT )
-  message( FATAL_ERROR "Floating Point Exception (FPE) trap handlers are currently explicitly enabled in the compiler flags.  LAPACK is designed to check for and handle these cases internally and enabling these traps will likely cause LAPACK to crash.  Please re-configure with floating point exception trapping disabled." )
-endif()
+  # Get all flags added via `add_compile_options(...)`
+  get_directory_property(COMP_OPTIONS COMPILE_OPTIONS)
+
+  if(("${CMAKE_Fortran_FLAGS};${COMP_OPTIONS}" MATCHES "${FPE_EXIT_FLAG}") AND NOT
+     ("${CMAKE_Fortran_FLAGS};${COMP_OPTIONS}" MATCHES "${FPE_DISABLE_FLAG}"))
+    message( FATAL_ERROR "Floating Point Exception (FPE) trap handlers are"
+      " currently explicitly enabled in the compiler flags.  LAPACK is designed"
+      " to check for and handle these cases internally and enabling these traps"
+      " will likely cause LAPACK to crash.  Please re-configure with floating"
+      " point exception trapping disabled.")
+  endif()
 
 endmacro()
diff --git a/CMAKE/CheckTimeFunction.cmake b/CMAKE/CheckTimeFunction.cmake
index b57394887c..2399684fc1 100644
--- a/CMAKE/CheckTimeFunction.cmake
+++ b/CMAKE/CheckTimeFunction.cmake
@@ -7,22 +7,25 @@
 
 macro(CHECK_TIME_FUNCTION FUNCTION VARIABLE)
 
-    try_compile(RES
+  try_compile(RES
     ${PROJECT_BINARY_DIR}/INSTALL
     ${PROJECT_SOURCE_DIR}/INSTALL
     TIMING secondtst_${FUNCTION}
+    CMAKE_FLAGS
+      -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
+      -DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}
+      -DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}
+      -DCMAKE_VERBOSE_MAKEFILE=ON
     OUTPUT_VARIABLE OUTPUT)
 
-    if(RES)
-      set(${VARIABLE} ${FUNCTION} CACHE INTERNAL "Have Fortran function ${FUNCTION}")
-      message(STATUS "Looking for Fortran ${FUNCTION} - found")
-      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-        "Fortran ${FUNCTION} exists. ${OUTPUT} \n\n")
-    else()
-      message(STATUS "Looking for Fortran ${FUNCTION} - not found")
-      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-        "Fortran ${FUNCTION} does not exist. \n ${OUTPUT} \n")
-    endif()
+  if(RES)
+    set(${VARIABLE} ${FUNCTION} CACHE INTERNAL "Have Fortran function ${FUNCTION}")
+    message(STATUS "Looking for Fortran ${FUNCTION} - found")
+    file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+      "Fortran ${FUNCTION} exists. ${OUTPUT} \n\n")
+  else()
+    message(STATUS "Looking for Fortran ${FUNCTION} - not found")
+    file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+      "Fortran ${FUNCTION} does not exist. \n ${OUTPUT} \n")
+  endif()
 endmacro()
-
-
diff --git a/CMAKE/Findcodecov.cmake b/CMAKE/Findcodecov.cmake
index 3840640072..93db45130e 100644
--- a/CMAKE/Findcodecov.cmake
+++ b/CMAKE/Findcodecov.cmake
@@ -36,7 +36,7 @@ function(add_coverage TNAME)
 endfunction()
 
 
-# Find the reuired flags foreach language.
+# Find the required flags foreach language.
 set(CMAKE_REQUIRED_QUIET_SAVE ${CMAKE_REQUIRED_QUIET})
 set(CMAKE_REQUIRED_QUIET ${codecov_FIND_QUIETLY})
 
@@ -118,7 +118,7 @@ function (codecov_path_of_source FILE RETURN_VAR)
 
   # If expression was found, SOURCEFILE is a generator-expression for an
   # object library. Currently we found no way to call this function automatic
-  # for the referenced target, so it must be called in the directoryso of the
+  # for the referenced target, so it must be called in the directory of the
   # object library definition.
   if(NOT "${_source}" STREQUAL "")
     set(${RETURN_VAR} "" PARENT_SCOPE)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07df064d23..59aaed1525 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,19 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.13)
 
-project(LAPACK Fortran C)
+project(LAPACK C)
 
 set(LAPACK_MAJOR_VERSION 3)
-set(LAPACK_MINOR_VERSION 10)
-set(LAPACK_PATCH_VERSION 0)
+set(LAPACK_MINOR_VERSION 12)
+set(LAPACK_PATCH_VERSION 1)
 set(
   LAPACK_VERSION
   ${LAPACK_MAJOR_VERSION}.${LAPACK_MINOR_VERSION}.${LAPACK_PATCH_VERSION}
   )
 
+# Allow setting a prefix for the library names
+set(CMAKE_STATIC_LIBRARY_PREFIX "lib${LIBRARY_PREFIX}")
+set(CMAKE_SHARED_LIBRARY_PREFIX "lib${LIBRARY_PREFIX}")
+
 # Add the CMake directory for custom CMake modules
 set(CMAKE_MODULE_PATH "${LAPACK_SOURCE_DIR}/CMAKE" ${CMAKE_MODULE_PATH})
 
@@ -41,6 +45,48 @@ if(_is_coverage_build)
   find_package(codecov)
 endif()
 
+# Use valgrind if it is found
+option( LAPACK_TESTING_USE_PYTHON "Use Python for testing. Disable it on memory checks." ON )
+find_program( MEMORYCHECK_COMMAND valgrind )
+if( MEMORYCHECK_COMMAND )
+  message( STATUS "Found valgrind: ${MEMORYCHECK_COMMAND}" )
+  set( MEMORYCHECK_COMMAND_OPTIONS "--leak-check=full --show-leak-kinds=all --track-origins=yes" )
+endif()
+
+# By default test Fortran compiler complex abs and complex division
+option(TEST_FORTRAN_COMPILER "Test Fortran compiler complex abs and complex division" OFF)
+if( TEST_FORTRAN_COMPILER )
+
+  add_executable( test_zcomplexabs ${LAPACK_SOURCE_DIR}/INSTALL/test_zcomplexabs.f )
+  add_custom_target( run_test_zcomplexabs
+    COMMAND test_zcomplexabs 2> test_zcomplexabs.err
+    WORKING_DIRECTORY ${LAPACK_BINARY_DIR}/INSTALL
+    COMMENT "Running test_zcomplexabs in ${LAPACK_BINARY_DIR}/INSTALL with stderr: test_zcomplexabs.err"
+    SOURCES ${LAPACK_SOURCE_DIR}/INSTALL/test_zcomplexabs.f )
+
+  add_executable( test_zcomplexdiv ${LAPACK_SOURCE_DIR}/INSTALL/test_zcomplexdiv.f )
+  add_custom_target( run_test_zcomplexdiv
+    COMMAND test_zcomplexdiv 2> test_zcomplexdiv.err
+    WORKING_DIRECTORY ${LAPACK_BINARY_DIR}/INSTALL
+    COMMENT "Running test_zcomplexdiv in ${LAPACK_BINARY_DIR}/INSTALL with stderr: test_zcomplexdiv.err"
+    SOURCES ${LAPACK_SOURCE_DIR}/INSTALL/test_zcomplexdiv.f )
+
+  add_executable( test_zcomplexmult ${LAPACK_SOURCE_DIR}/INSTALL/test_zcomplexmult.f )
+  add_custom_target( run_test_zcomplexmult
+    COMMAND test_zcomplexmult 2> test_zcomplexmult.err
+    WORKING_DIRECTORY ${LAPACK_BINARY_DIR}/INSTALL
+    COMMENT "Running test_zcomplexmult in ${LAPACK_BINARY_DIR}/INSTALL with stderr: test_zcomplexmult.err"
+    SOURCES ${LAPACK_SOURCE_DIR}/INSTALL/test_zcomplexmult.f )
+
+  add_executable( test_zminMax ${LAPACK_SOURCE_DIR}/INSTALL/test_zminMax.f )
+  add_custom_target( run_test_zminMax
+    COMMAND test_zminMax 2> test_zminMax.err
+    WORKING_DIRECTORY ${LAPACK_BINARY_DIR}/INSTALL
+    COMMENT "Running test_zminMax in ${LAPACK_BINARY_DIR}/INSTALL with stderr: test_zminMax.err"
+    SOURCES ${LAPACK_SOURCE_DIR}/INSTALL/test_zminMax.f )
+
+endif()
+
 # By default static library
 option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
 
@@ -53,7 +99,7 @@ if(BUILD_INDEX64)
   set(LAPACKELIB "lapacke64")
   set(TMGLIB "tmglib64")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWeirdNEC -DLAPACK_ILP64 -DHAVE_LAPACK_CONFIG_H")
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-integer-8")
+  set(FORTRAN_ILP TRUE)
 else()
   set(BLASLIB "blas")
   set(CBLASLIB "cblas")
@@ -62,22 +108,20 @@ else()
   set(TMGLIB "tmglib")
 endif()
 
-include(GNUInstallDirs)
-
-# Updated OSX RPATH settings
-# In response to CMake 3.0 generating warnings regarding policy CMP0042,
-# the OSX RPATH settings have been updated per recommendations found
-# in the CMake Wiki:
-#  http://www.cmake.org/Wiki/CMake_RPATH_handling#Mac_OS_X_and_the_RPATH
-set(CMAKE_MACOSX_RPATH ON)
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ${CMAKE_INSTALL_FULL_LIBDIR} isSystemDir)
-if("${isSystemDir}" STREQUAL "-1")
-  set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
-  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+# By default build extended _64 API for supported compilers only. This needs
+# CMake >= 3.18! Let's disable it by default for CMake < 3.18.
+if(CMAKE_VERSION VERSION_LESS "3.18")
+  set(INDEX64_EXT_API_DEFAULT OFF)
+else()
+  set(INDEX64_EXT_API_DEFAULT ON)
 endif()
+set(INDEX64_EXT_API_COMPILERS "Intel|GNU")
+option(BUILD_INDEX64_EXT_API
+  "Build Index-64 API as extended API with _64 suffix (needs CMake >= 3.18)"
+  ${INDEX64_EXT_API_DEFAULT})
+message(STATUS "Build Index-64 API as extended API with _64 suffix: ${BUILD_INDEX64_EXT_API}")
 
+include(GNUInstallDirs)
 
 # Configure the warning and code coverage suppression file
 configure_file(
@@ -89,82 +133,38 @@ configure_file(
 include(PreventInSourceBuilds)
 include(PreventInBuildInstalls)
 
-# Check if recursive flag exists
-include(CheckFortranCompilerFlag)
-check_fortran_compiler_flag("-recursive" _recursiveFlag)
-check_fortran_compiler_flag("-frecursive" _frecursiveFlag)
-check_fortran_compiler_flag("-Mrecursive" _MrecursiveFlag)
-
-# Add recursive flag
-if(_recursiveFlag)
-  string(REGEX MATCH "-recursive" output_test <string> "${CMAKE_Fortran_FLAGS}")
-  if(NOT output_test)
-    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -recursive"
-      CACHE STRING "Recursive flag must be set" FORCE)
-  endif()
-elseif(_frecursiveFlag)
-  string(REGEX MATCH "-frecursive" output_test <string> "${CMAKE_Fortran_FLAGS}")
-  if(NOT output_test)
-    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -frecursive"
-    CACHE STRING "Recursive flag must be set" FORCE)
-  endif()
-elseif(_MrecursiveFlag)
-  string(REGEX MATCH "-Mrecursive" output_test <string> "${CMAKE_Fortran_FLAGS}")
-  if(NOT output_test)
-    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Mrecursive"
-    CACHE STRING "Recursive flag must be set" FORCE)
-  endif()
-endif()
+# Add option to enable flat namespace for symbol resolution on macOS
+if(APPLE)
+  option(USE_FLAT_NAMESPACE "Use flat namespaces for symbol resolution during build and runtime." OFF)
 
-if(UNIX)
-  if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
-    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fp-model strict")
-  endif()
-  if(CMAKE_Fortran_COMPILER_ID STREQUAL XL)
-    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qnosave -qstrict=none")
-  endif()
-# Delete libmtsk in linking sequence for Sun/Oracle Fortran Compiler.
-# This library is not present in the Sun package SolarisStudio12.3-linux-x86-bin
-  string(REPLACE \;mtsk\; \; CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES "${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES}")
-endif()
-
-if(CMAKE_Fortran_COMPILER_ID STREQUAL Compaq)
-  if(WIN32)
-    if(CMAKE_GENERATOR STREQUAL "NMake Makefiles")
-      get_filename_component(CMAKE_Fortran_COMPILER_CMDNAM ${CMAKE_Fortran_COMPILER} NAME_WE)
-      message(STATUS "Using Compaq Fortran compiler with command name ${CMAKE_Fortran_COMPILER_CMDNAM}")
-      set(cmd ${CMAKE_Fortran_COMPILER_CMDNAM})
-      string(TOLOWER "${cmd}" cmdlc)
-      if(cmdlc STREQUAL "df")
-        message(STATUS "Assume the Compaq Visual Fortran Compiler is being used")
-        set(CMAKE_Fortran_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-        set(CMAKE_Fortran_USE_RESPONSE_FILE_FOR_INCLUDES 1)
-        #This is a workaround that is needed to avoid forward-slashes in the
-        #filenames listed in response files from incorrectly being interpreted as
-        #introducing compiler command options
-        if(${BUILD_SHARED_LIBS})
-          message(FATAL_ERROR "Making of shared libraries with CVF has not been tested.")
-        endif()
-        set(str "NMake version 9 or later should be used. NMake version 6.0 which is\n")
-        set(str "${str}   included with the CVF distribution fails to build Lapack because\n")
-        set(str "${str}   the number of source files exceeds the limit for NMake v6.0\n")
-        message(STATUS ${str})
-        set(CMAKE_Fortran_LINK_EXECUTABLE "LINK /out:<TARGET> <LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS>")
-      endif()
+  if(USE_FLAT_NAMESPACE)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-flat_namespace")
+    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-flat_namespace")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-flat_namespace")
+  else()
+    if(BUILD_SHARED_LIBS AND BUILD_TESTING)
+      message(WARNING
+        "LAPACK test suite might fail with shared libraries and the default two-level namespace. "
+        "Disable shared libraries or enable flat namespace for symbol resolution via -DUSE_FLAT_NAMESPACE=ON.")
     endif()
   endif()
 endif()
 
-
 # --------------------------------------------------
 set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKLIB}-targets)
 
+set(LAPACK_BINARY_PATH_SUFFIX "" CACHE STRING "Path suffix appended to the install path of binaries")
+
+if(NOT "${LAPACK_BINARY_PATH_SUFFIX}" STREQUAL "" AND NOT "${LAPACK_BINARY_PATH_SUFFIX}" MATCHES "^/")
+  set(LAPACK_BINARY_PATH_SUFFIX "/${LAPACK_BINARY_PATH_SUFFIX}")
+endif()
+
 macro(lapack_install_library lib)
   install(TARGETS ${lib}
     EXPORT ${LAPACK_INSTALL_EXPORT_NAME}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LAPACK_BINARY_PATH_SUFFIX}" COMPONENT Development
+    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LAPACK_BINARY_PATH_SUFFIX}" COMPONENT RuntimeLibraries
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}${LAPACK_BINARY_PATH_SUFFIX}" COMPONENT RuntimeLibraries
   )
 endmacro()
 
@@ -196,26 +196,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LAPACK_BINARY_DIR}/bin)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LAPACK_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LAPACK_BINARY_DIR}/lib)
 
-# --------------------------------------------------
-# Check for any necessary platform specific compiler flags
-include(CheckLAPACKCompilerFlags)
-CheckLAPACKCompilerFlags()
-
-# --------------------------------------------------
-# Check second function
-
-include(CheckTimeFunction)
-set(NONE ${TIME_FUNC})
-CHECK_TIME_FUNCTION(NONE TIME_FUNC)
-CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC)
-CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)
-CHECK_TIME_FUNCTION(EXT_ETIME_ TIME_FUNC)
-CHECK_TIME_FUNCTION(INT_ETIME TIME_FUNC)
-message(STATUS "--> Will use second_${TIME_FUNC}.f and dsecnd_${TIME_FUNC}.f as timing function.")
-
-set(SECOND_SRC ${LAPACK_SOURCE_DIR}/INSTALL/second_${TIME_FUNC}.f)
-set(DSECOND_SRC ${LAPACK_SOURCE_DIR}/INSTALL/dsecnd_${TIME_FUNC}.f)
-
 # deprecated LAPACK and LAPACKE routines
 option(BUILD_DEPRECATED "Build deprecated routines" OFF)
 message(STATUS "Build deprecated routines: ${BUILD_DEPRECATED}")
@@ -238,12 +218,14 @@ if(NOT (BUILD_SINGLE OR BUILD_DOUBLE OR BUILD_COMPLEX OR BUILD_COMPLEX16))
   BUILD_SINGLE, BUILD_DOUBLE, BUILD_COMPLEX, BUILD_COMPLEX16.")
 endif()
 
+
 # --------------------------------------------------
 # Subdirectories that need to be processed
 option(USE_OPTIMIZED_BLAS "Whether or not to use an optimized BLAS library instead of included netlib BLAS" OFF)
 
 # Check the usage of the user provided BLAS libraries
 if(BLAS_LIBRARIES)
+  enable_language(Fortran)
   include(CheckFortranFunctionExists)
   set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})
   CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND)
@@ -268,15 +250,7 @@ if(NOT BLAS_FOUND)
   add_subdirectory(BLAS)
   set(BLAS_LIBRARIES ${BLASLIB})
 else()
-  set(CMAKE_EXE_LINKER_FLAGS
-    "${CMAKE_EXE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}"
-    CACHE STRING "Linker flags for executables" FORCE)
-  set(CMAKE_MODULE_LINKER_FLAGS
-    "${CMAKE_MODULE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}"
-    CACHE STRING "Linker flags for modules" FORCE)
-  set(CMAKE_SHARED_LINKER_FLAGS
-    "${CMAKE_SHARED_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}"
-    CACHE STRING "Linker flags for shared libs" FORCE)
+  add_link_options(${BLAS_LINKER_FLAGS})
 endif()
 
 
@@ -307,18 +281,27 @@ endif()
 
 # Check the usage of the user provided or automatically found LAPACK libraries
 if(LAPACK_LIBRARIES)
-  include(CheckFortranFunctionExists)
-  set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
-  # Check if new routine of 3.4.0 is in LAPACK_LIBRARIES
-  CHECK_FORTRAN_FUNCTION_EXISTS("dgeqrt" LATESTLAPACK_FOUND)
-  unset(CMAKE_REQUIRED_LIBRARIES)
-  if(LATESTLAPACK_FOUND)
-    message(STATUS "--> LAPACK supplied by user is WORKING, will use ${LAPACK_LIBRARIES}.")
+  include(CheckLanguage)
+  check_language(Fortran)
+  if(CMAKE_Fortran_COMPILER)
+    enable_language(Fortran)
+    include(CheckFortranFunctionExists)
+    set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
+    # Check if new routine of 3.4.0 is in LAPACK_LIBRARIES
+    CHECK_FORTRAN_FUNCTION_EXISTS("dgeqrt" LATESTLAPACK_FOUND)
+    unset(CMAKE_REQUIRED_LIBRARIES)
+    if(LATESTLAPACK_FOUND)
+      message(STATUS "--> LAPACK supplied by user is WORKING, will use ${LAPACK_LIBRARIES}.")
+    else()
+      message(ERROR "--> LAPACK supplied by user is not WORKING or is older than LAPACK 3.4.0, CANNOT USE ${LAPACK_LIBRARIES}.")
+      message(ERROR "-->     Will use REFERENCE LAPACK (by default)")
+      message(ERROR "-->     Or Correct your LAPACK_LIBRARIES entry ")
+      message(ERROR "-->     Or Consider checking USE_OPTIMIZED_LAPACK")
+    endif()
   else()
-    message(ERROR "--> LAPACK supplied by user is not WORKING or is older than LAPACK 3.4.0, CANNOT USE ${LAPACK_LIBRARIES}.")
-    message(ERROR "-->     Will use REFERENCE LAPACK (by default)")
-    message(ERROR "-->     Or Correct your LAPACK_LIBRARIES entry ")
-    message(ERROR "-->     Or Consider checking USE_OPTIMIZED_LAPACK")
+    message(STATUS "--> LAPACK supplied by user is ${LAPACK_LIBRARIES}.")
+    message(STATUS "--> CMake couldn't find a Fortran compiler, so it cannot check if the provided LAPACK library works.")
+    set(LATESTLAPACK_FOUND TRUE)
   endif()
 endif()
 
@@ -326,17 +309,30 @@ endif()
 if(NOT LATESTLAPACK_FOUND)
   message(STATUS "Using supplied NETLIB LAPACK implementation")
   set(LAPACK_LIBRARIES ${LAPACKLIB})
+
+  enable_language(Fortran)
+
+  # Check for any necessary platform specific compiler flags
+  include(CheckLAPACKCompilerFlags)
+  CheckLAPACKCompilerFlags()
+
+  # Check second function
+  include(CheckTimeFunction)
+  set(TIME_FUNC NONE)
+  CHECK_TIME_FUNCTION(NONE TIME_FUNC)
+  CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC)
+  CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)
+  CHECK_TIME_FUNCTION(EXT_ETIME_ TIME_FUNC)
+  CHECK_TIME_FUNCTION(INT_ETIME TIME_FUNC)
+
+  # Set second function
+  message(STATUS "--> Will use second_${TIME_FUNC}.f and dsecnd_${TIME_FUNC}.f as timing function.")
+  set(SECOND_SRC ${LAPACK_SOURCE_DIR}/INSTALL/second_${TIME_FUNC}.f)
+  set(DSECOND_SRC ${LAPACK_SOURCE_DIR}/INSTALL/dsecnd_${TIME_FUNC}.f)
+
   add_subdirectory(SRC)
 else()
-  set(CMAKE_EXE_LINKER_FLAGS
-    "${CMAKE_EXE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}"
-    CACHE STRING "Linker flags for executables" FORCE)
-  set(CMAKE_MODULE_LINKER_FLAGS
-    "${CMAKE_MODULE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}"
-    CACHE STRING "Linker flags for modules" FORCE)
-  set(CMAKE_SHARED_LINKER_FLAGS
-    "${CMAKE_SHARED_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}"
-    CACHE STRING "Linker flags for shared libs" FORCE)
+  add_link_options(${LAPACK_LINKER_FLAGS})
 endif()
 
 if(BUILD_TESTING)
@@ -358,9 +354,11 @@ endif()
 # Cache export target
 set(LAPACK_INSTALL_EXPORT_NAME_CACHE ${LAPACK_INSTALL_EXPORT_NAME})
 if(BUILD_TESTING OR LAPACKE_WITH_TMG)
+  enable_language(Fortran)
   if(LATESTLAPACK_FOUND AND LAPACKE_WITH_TMG)
     set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
     # Check if dlatms (part of tmg) is found
+    include(CheckFortranFunctionExists)
     CHECK_FORTRAN_FUNCTION_EXISTS("dlatms" LAPACK_WITH_TMGLIB_FOUND)
     unset(CMAKE_REQUIRED_LIBRARIES)
     if(NOT LAPACK_WITH_TMGLIB_FOUND)
@@ -375,10 +373,17 @@ endif()
 set(LAPACK_INSTALL_EXPORT_NAME ${LAPACK_INSTALL_EXPORT_NAME_CACHE})
 unset(LAPACK_INSTALL_EXPORT_NAME_CACHE)
 
+
+#-------------------------------------
+# LAPACKE
+# Include lapack.h and lapacke_mangling.h even if LAPACKE is not built
+add_subdirectory(LAPACKE/include)
+
 if(LAPACKE)
   add_subdirectory(LAPACKE)
 endif()
 
+
 #-------------------------------------
 # BLAS++ / LAPACK++
 option(BLAS++ "Build BLAS++" OFF)
@@ -399,9 +404,9 @@ if (BLAS++)
   include(ExternalProject)
   ExternalProject_Add(blaspp
 	  URL https://bitbucket.org/icl/blaspp/downloads/blaspp-2020.10.02.tar.gz
-	  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/lib ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR} -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} ${PROJECT_BINARY_DIR}/blaspp-prefix/src/blaspp
-	  BUILD_COMMAND ${CMAKE_COMMAND} -E env LIBRARY_PATH=${PROJECT_BINARY_DIR}/lib LIB_SUFFIX="" make
-	  INSTALL_COMMAND make PREFIX=${PROJECT_BINARY_DIR} LIB_SUFFIX="" install
+	  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env LIBRARY_PATH=$ENV{LIBRARY_PATH}:${CMAKE_BINARY_DIR}/lib LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${PROJECT_BINARY_DIR}/lib ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR} -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} ${PROJECT_BINARY_DIR}/blaspp-prefix/src/blaspp
+	  BUILD_COMMAND ${CMAKE_COMMAND} -E env LIBRARY_PATH=$ENV{LIBRARY_PATH}:${PROJECT_BINARY_DIR}/lib LIB_SUFFIX="" ${CMAKE_COMMAND} --build .
+	  INSTALL_COMMAND ${CMAKE_COMMAND} -E env PREFIX=${PROJECT_BINARY_DIR} LIB_SUFFIX="" ${CMAKE_COMMAND} --install .
 	  )
   ExternalProject_Add_StepDependencies(blaspp build ${BLAS_LIBRARIES})
 endif()
@@ -412,17 +417,17 @@ if (LAPACK++)
   if (BUILD_SHARED_LIBS)
   ExternalProject_Add(lapackpp
 	  URL https://bitbucket.org/icl/lapackpp/downloads/lapackpp-2020.10.02.tar.gz
-	  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/lib ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR} -DCMAKE_INSTALL_LIBDIR=lib -DLAPACK_LIBRARIES=${LAPACK_LIBRARIES} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}  ${PROJECT_BINARY_DIR}/lapackpp-prefix/src/lapackpp
-	  BUILD_COMMAND ${CMAKE_COMMAND} -E env LIBRARY_PATH=${PROJECT_BINARY_DIR}/lib LIB_SUFFIX="" make
-	  INSTALL_COMMAND make PREFIX=${PROJECT_BINARY_DIR} LIB_SUFFIX="" install
+	  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env LIBRARY_PATH=$ENV{LIBRARY_PATH}:${CMAKE_BINARY_DIR}/lib LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${PROJECT_BINARY_DIR}/lib ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR} -DCMAKE_INSTALL_LIBDIR=lib -DLAPACK_LIBRARIES=${LAPACK_LIBRARIES} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}  ${PROJECT_BINARY_DIR}/lapackpp-prefix/src/lapackpp
+	  BUILD_COMMAND ${CMAKE_COMMAND} -E env LIBRARY_PATH=$ENV{LIBRARY_PATH}:${PROJECT_BINARY_DIR}/lib LIB_SUFFIX="" ${CMAKE_COMMAND} --build .
+	  INSTALL_COMMAND ${CMAKE_COMMAND} -E env PREFIX=${PROJECT_BINARY_DIR} LIB_SUFFIX="" ${CMAKE_COMMAND} --install .
 	  )
   else ()
 # FIXME this does not really work as the libraries list gets converted to a semicolon-separated list somewhere in the lapack++ build files
   ExternalProject_Add(lapackpp
 	  URL https://bitbucket.org/icl/lapackpp/downloads/lapackpp-2020.10.02.tar.gz
-	  CONFIGURE_COMMAND env LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/lib ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR} -DCMAKE_INSTALL_LIBDIR=lib -DLAPACK_LIBRARIES="${PROJECT_BINARY_DIR}/lib/liblapack.a -lgfortran"  -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}  ${PROJECT_BINARY_DIR}/lapackpp-prefix/src/lapackpp
-	  BUILD_COMMAND env LIBRARY_PATH=${PROJECT_BINARY_DIR}/lib LIB_SUFFIX="" make
-	  INSTALL_COMMAND make PREFIX=${PROJECT_BINARY_DIR} LIB_SUFFIX="" install
+	  CONFIGURE_COMMAND env LIBRARY_PATH=$ENV{LIBRARY_PATH}:${CMAKE_BINARY_DIR}/lib LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${PROJECT_BINARY_DIR}/lib ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR} -DCMAKE_INSTALL_LIBDIR=lib -DLAPACK_LIBRARIES="${PROJECT_BINARY_DIR}/lib/liblapack.a -lgfortran"  -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}  ${PROJECT_BINARY_DIR}/lapackpp-prefix/src/lapackpp
+	  BUILD_COMMAND env LIBRARY_PATH=$ENV{LIBRARY_PATH}:${PROJECT_BINARY_DIR}/lib LIB_SUFFIX="" ${CMAKE_COMMAND} --build .
+	  INSTALL_COMMAND ${CMAKE_COMMAND} -E env PREFIX=${PROJECT_BINARY_DIR} LIB_SUFFIX="" ${CMAKE_COMMAND} --install .
   )
   endif()
   ExternalProject_Add_StepDependencies(lapackpp build blaspp ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
@@ -442,7 +447,7 @@ set(CPACK_MONOLITHIC_INSTALL ON)
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "LAPACK")
 if(WIN32 AND NOT UNIX)
   # There is a bug in NSI that does not handle full unix paths properly. Make
-  # sure there is at least one set of four (4) backlasshes.
+  # sure there is at least one set of four (4) backslashes.
   set(CPACK_NSIS_HELP_LINK "http:\\\\\\\\http://icl.cs.utk.edu/lapack-forum")
   set(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.netlib.org/lapack")
   set(CPACK_NSIS_CONTACT "lapack@eecs.utk.edu")
@@ -536,7 +541,7 @@ install(FILES
 if (LAPACK++)
   install(
   DIRECTORY "${LAPACK_BINARY_DIR}/lib/"
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}${LAPACK_BINARY_PATH_SUFFIX}"
   FILES_MATCHING REGEX "liblapackpp.(a|so)$"
   )
   install(
@@ -569,7 +574,7 @@ if (BLAS++)
   )
   install(
   DIRECTORY "${LAPACK_BINARY_DIR}/lib/"
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}${LAPACK_BINARY_PATH_SUFFIX}"
   FILES_MATCHING REGEX "libblaspp.(a|so)$"
   )
   install(
@@ -596,50 +601,81 @@ if(BUILD_HTML_DOCUMENTATION OR BUILD_MAN_DOCUMENTATION)
 
     set(DOXYGEN_PROJECT_BRIEF "LAPACK: Linear Algebra PACKage")
     set(DOXYGEN_PROJECT_NUMBER ${LAPACK_VERSION})
-    set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DOCS)
-    set(PROJECT_LOGO ${CMAKE_CURRENT_SOURCE_DIR}/DOCS/lapack.png)
+    set(DOXYGEN_OUTPUT_DIRECTORY DOCS)
+    set(DOXYGEN_PROJECT_LOGO DOCS/lapack.png)
     set(DOXYGEN_OPTIMIZE_FOR_FORTRAN YES)
     set(DOXYGEN_SOURCE_BROWSER YES)
-    set(DISTRIBUTE_GROUP_DOC YES)
     set(DOXYGEN_CREATE_SUBDIRS YES)
     set(DOXYGEN_SEPARATE_MEMBER_PAGES YES)
+    set(DOXYGEN_TAB_SIZE 8)
     set(DOXYGEN_EXTRACT_ALL YES)
-    set(DOXYGEN_FILE_PATTERNS "*.f;*.c;*.h")
+    set(DOXYGEN_FILE_PATTERNS *.f *.f90 *.c *.h )
     set(DOXYGEN_RECURSIVE YES)
     set(DOXYGEN_GENERATE_TREEVIEW YES)
+    set(DOXYGEN_DOT_IMAGE_FORMAT svg)
     set(DOXYGEN_INTERACTIVE_SVG YES)
-    set(DOXYGEN_QUIET YES)
-    set(DOXYGEN_WARNINGS NO)
-    set(DOXYGEN_GENERATE_HTML NO)
-    set(DOXYGEN_GENERATE_MAN NO)
-
+    set(DOXYGEN_WARN_NO_PARAMDOC YES)
+    set(DOXYGEN_WARN_LOGFILE doxygen_error)
+    set(DOXYGEN_LAYOUT_FILE "DOCS/DoxygenLayout.xml")
+
+    # Exclude functions that are duplicated, creating conflicts.
+    set(DOXYGEN_EXCLUDE .git
+                        .github
+                        SRC/VARIANTS
+                        BLAS/SRC/lsame.f
+                        BLAS/SRC/xerbla.f
+                        BLAS/SRC/xerbla_array.f
+                        INSTALL/slamchf77.f
+                        INSTALL/dlamchf77.f )
 
     if (BUILD_HTML_DOCUMENTATION)
         set(DOXYGEN_GENERATE_HTML YES)
-        set(DOXYGEN_HTML_OUTPUT explore-html)
+        set(DOXYGEN_GENERATE_MAN NO)
         set(DOXYGEN_INLINE_SOURCES YES)
         set(DOXYGEN_CALL_GRAPH YES)
         set(DOXYGEN_CALLER_GRAPH YES)
 
+        set(DOXYGEN_HTML_OUTPUT explore-html)
+        set(DOXYGEN_HTML_TIMESTAMP YES)
         doxygen_add_docs(
             html
-            ${PROJECT_SOURCE_DIR}
+
+            # Doxygen INPUT =
+            BLAS
+            CBLAS
+            SRC
+            INSTALL
+            TESTING
+            DOCS/groups-usr.dox
+            README.md
+
             COMMENT "Generating html LAPACK documentation (it will take some time... time to grab a coffee)"
         )
+        unset(DOXYGEN_HTML_OUTPUT)
+        unset(DOXYGEN_HTML_TIMESTAMP)
     endif()
     if (BUILD_MAN_DOCUMENTATION)
+        set(DOXYGEN_GENERATE_HTML NO)
         set(DOXYGEN_GENERATE_MAN YES)
-        set(DOXYGEN_EXCLUDE SRC/VARIANTS)
-        set(DOXYGEN_MAN_LINKS YES)
         set(DOXYGEN_INLINE_SOURCES NO)
         set(DOXYGEN_CALL_GRAPH NO)
         set(DOXYGEN_CALLER_GRAPH NO)
 
+        set(DOXYGEN_MAN_LINKS YES)
         doxygen_add_docs(
             man
-            ${PROJECT_SOURCE_DIR}
+
+            # Doxygen INPUT =
+            BLAS
+            CBLAS
+            SRC
+            INSTALL
+            TESTING
+            DOCS/groups-usr.dox
+
             COMMENT "Generating man LAPACK documentation"
         )
+        unset(DOXYGEN_MAN_LINKS)
     endif()
 
     endif()
diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index 01f15db240..ed57467072 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -48,7 +48,8 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION
 
 # Only run post test if suitable python interpreter was found
 set(PYTHON_EXECUTABLE  @PYTHON_EXECUTABLE@)
-if(PYTHON_EXECUTABLE)
+set(LAPACK_TESTING_USE_PYTHON  @LAPACK_TESTING_USE_PYTHON@)
+if(PYTHON_EXECUTABLE AND LAPACK_TESTING_USE_PYTHON)
   set(CTEST_CUSTOM_POST_TEST "${PYTHON_EXECUTABLE} ./lapack_testing.py -s -d TESTING")
 endif()
 
diff --git a/DOCS/CBLAS.md b/DOCS/CBLAS.md
new file mode 100644
index 0000000000..5ee02e779d
--- /dev/null
+++ b/DOCS/CBLAS.md
@@ -0,0 +1,143 @@
+# THE CBLAS C INTERFACE TO BLAS
+
+## Contents
+[1. Introduction](#1-introduction)
+
+[1.1 Naming Schemes](#11-naming-schemes)
+
+[1.2 Integers](#12-integers)
+
+[2. Function List](#2-function-list)
+
+[2.1 BLAS Level 1](#21-blas-level-1)
+
+[2.2 BLAS Level 2](#22-blas-level-2)
+
+[2.3 BLAS Level 3](#23-blas-level-3)
+
+[3. Examples](#3-examples)
+
+[3.1 Calling DGEMV](#31-calling-dgemv)
+
+[3.2 Calling DGEMV_64](#32-calling-dgemv_64)
+
+## 1. Introduction
+This document describes CBLAS, the C language interface to the Basic Linear Algebra Subprograms (BLAS).
+In comparison to BLAS Fortran interfaces CBLAS interfaces support both row-major and column-major matrix
+ordering with the `layout` parameter.
+The prototypes for CBLAS interfaces, associated macros and type definitions are contained in the header
+file [cblas.h](../CBLAS/include/cblas.h)
+
+### 1.1 Naming Schemes
+The naming scheme for the CBLAS interface is to take the Fortran BLAS routine name, make it lower case,
+and add the prefix `cblas_`. For example, the BLAS routine `DGEMM` becomes `cblas_dgemm`.
+
+CBLAS routines also support `_64` suffix that enables large data arrays support in the LP64 interface library
+(default build configuration). This suffix allows mixing LP64 and ILP64 programming models in one application.
+For example, `cblas_dgemm` with 32-bit integer type support can be mixed with `cblas_dgemm_64`
+that supports 64-bit integer type. 
+
+### 1.2 Integers
+Variables with the Fortran type integer are converted to `CBLAS_INT` in CBLAS. By default
+the CBLAS interface is built with 32-bit integer type, but it can be re-defined to 64-bit integer type.
+
+## 2. Function List
+This section contains the list of the currently available CBLAS interfaces.
+
+### 2.1 BLAS Level 1
+* Single Precision Real:
+  ```
+  SROTG SROTMG SROT SROTM SSWAP SSCAL
+  SCOPY SAXPY SDOT  SDSDOT SNRM2 SASUM 
+  ISAMAX
+  ```
+* Double Precision Real:
+  ```
+  DROTG DROTMG DROT DROTM DSWAP DSCAL
+  DCOPY DAXPY DDOT  DSDOT DNRM2 DASUM 
+  IDAMAX
+  ```
+* Single Precision Complex:
+  ```
+  CROTG CSROT CSWAP CSCAL CSSCAL CCOPY 
+  CAXPY CDOTU_SUB CDOTC_SUB ICAMAX SCABS1
+  ```
+* Double Precision Complex:
+  ```
+  ZROTG ZDROT ZSWAP ZSCAL ZDSCAL ZCOPY 
+  ZAXPY ZDOTU_SUB ZDOTC_SUB IZAMAX DCABS1
+  DZNRM2 DZASUM
+  ```
+### 2.2 BLAS Level 2
+* Single Precision Real:
+  ```
+  SGEMV SGBMV SGER  SSBMV SSPMV SSPR
+  SSPR2 SSYMV SSYR  SSYR2 STBMV STBSV
+  STPMV STPSV STRMV STRSV
+  ```
+* Double Precision Real:
+  ```
+  DGEMV DGBMV DGER  DSBMV DSPMV DSPR
+  DSPR2 DSYMV DSYR  DSYR2 DTBMV DTBSV
+  DTPMV DTPSV DTRMV DTRSV
+  ```
+* Single Precision Complex:
+  ```
+  CGEMV CGBMV CHEMV CHBMV CHPMV CTRMV
+  CTBMV CTPMV CTRSV CTBSV CTPSV CGERU
+  CGERC CHER  CHER2 CHPR  CHPR2
+  ```
+* Double Precision Complex:
+  ```
+  ZGEMV ZGBMV ZHEMV ZHBMV ZHPMV ZTRMV
+  ZTBMV ZTPMV ZTRSV ZTBSV ZTPSV ZGERU
+  ZGERC ZHER  ZHER2 ZHPR  ZHPR2
+  ```
+### 2.3 BLAS Level 3
+* Single Precision Real:
+  ```
+  SGEMM SSYMM SSYRK SSERK2K STRMM STRSM
+  ```
+* Double Precision Real:
+  ```
+  DGEMM DSYMM DSYRK DSERK2K DTRMM DTRSM
+  ```
+* Single Precision Complex:
+  ```
+  CGEMM CSYMM CHEMM CHERK CHER2K CTRMM
+  CTRSM CSYRK CSYR2K
+  ```
+* Double Precision Complex:
+  ```
+  ZGEMM ZSYMM ZHEMM ZHERK ZHER2K ZTRMM 
+  ZTRSM ZSYRK ZSYR2K
+  ```
+
+## 3. Examples
+This section contains examples of calling CBLAS functions from a C program.
+
+### 3.1 Calling DGEMV
+The variable declarations should be as follows:
+```
+   double *a, *x, *y;
+   double alpha, beta;
+   CBLAS_INT m, n, lda, incx, incy;
+```
+The CBLAS function call is then:
+```
+cblas_dgemv( CblasColMajor, CblasNoTrans, m, n, alpha, a, lda, x, incx, beta,
+                y, incy );
+```
+
+### 3.2 Calling DGEMV_64
+The variable declarations should be as follows:
+```
+   double *a, *x, *y;
+   double alpha, beta;
+   int64_t m, n, lda, incx, incy;
+```
+The CBLAS function call is then:
+```
+cblas_dgemv_64( CblasColMajor, CblasNoTrans, m, n, alpha, a, lda, x, incx, beta,
+                y, incy );
+```
diff --git a/DOCS/Doxyfile b/DOCS/Doxyfile
index c3c4b21375..efb4ddaf16 100644
--- a/DOCS/Doxyfile
+++ b/DOCS/Doxyfile
@@ -1,7 +1,7 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.12.0
 
 # This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
+# Doxygen (www.doxygen.org) for a project.
 #
 # All text after a double hash (##) is considered a comment and is placed in
 # front of the TAG it is preceding.
@@ -12,6 +12,16 @@
 # For lists, items can also be appended using:
 # TAG += value [value, ...]
 # Values that contain spaces should be placed between quotes (\" \").
+#
+# Note:
+#
+# Use Doxygen to compare the used configuration file with the template
+# configuration file:
+# doxygen -x [configFile]
+# Use Doxygen to compare the used configuration file with the template
+# configuration file without replacing the environment variables or CMake type
+# replacement variables:
+# doxygen -x_noenv [configFile]
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -38,7 +48,7 @@ PROJECT_NAME           = LAPACK
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.10.0
+PROJECT_NUMBER         = 3.12.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -53,24 +63,42 @@ PROJECT_BRIEF          = "LAPACK: Linear Algebra PACKage"
 
 PROJECT_LOGO           = DOCS/lapack.png
 
+# With the PROJECT_ICON tag one can specify an icon that is included in the tabs
+# when the HTML document is shown. Doxygen will copy the logo to the output
+# directory.
+
+PROJECT_ICON           =
+
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
+# entered, it will be relative to the location where Doxygen was started. If
 # left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = DOCS
 
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
+# If the CREATE_SUBDIRS tag is set to YES then Doxygen will create up to 4096
+# sub-directories (in 2 levels) under the output directory of each output format
+# and will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding Doxygen a huge amount of source files, where
 # putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
+# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
+# control the number of sub-directories.
 # The default value is: NO.
 
 CREATE_SUBDIRS         = YES
 
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# Controls the number of sub-directories that will be created when
+# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every
+# level increment doubles the number of directories, resulting in 4096
+# directories at level 8 which is the default and also the maximum value. The
+# sub-directories are organized in 2 levels, the first level always has a fixed
+# number of 16 directories.
+# Minimum value: 0, maximum value: 8, default value: 8.
+# This tag requires that the tag CREATE_SUBDIRS is set to YES.
+
+CREATE_SUBDIRS_LEVEL   = 8
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, Doxygen will allow non-ASCII
 # characters to appear in the names of generated files. If set to NO, non-ASCII
 # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
 # U+3044.
@@ -79,36 +107,28 @@ CREATE_SUBDIRS         = YES
 ALLOW_UNICODE_NAMES    = NO
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
+# documentation generated by Doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian,
+# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English
+# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek,
+# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with
+# English messages), Korean, Korean-en (Korean with English messages), Latvian,
+# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese,
+# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish,
+# Swedish, Turkish, Ukrainian and Vietnamese.
 # The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
-# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# If the BRIEF_MEMBER_DESC tag is set to YES, Doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
 # The default value is: YES.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# If the REPEAT_BRIEF tag is set to YES, Doxygen will prepend the brief
 # description of a member or function before the detailed description
 #
 # Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
@@ -126,16 +146,26 @@ REPEAT_BRIEF           = YES
 # the entity):The $name class, The $name widget, The $name file, is, provides,
 # specifies, contains, represents, a, an and the.
 
-ABBREVIATE_BRIEF       =
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
 
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
+# Doxygen will generate a detailed section even if there is only a brief
 # description.
 # The default value is: NO.
 
 ALWAYS_DETAILED_SEC    = NO
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# If the INLINE_INHERITED_MEMB tag is set to YES, Doxygen will show all
 # inherited members of a class in the documentation of that class as if those
 # members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
@@ -143,7 +173,7 @@ ALWAYS_DETAILED_SEC    = NO
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# If the FULL_PATH_NAMES tag is set to YES, Doxygen will prepend the full path
 # before files name in the file list and in the header files. If set to NO the
 # shortest path that makes the file name unique will be used
 # The default value is: YES.
@@ -153,11 +183,11 @@ FULL_PATH_NAMES        = YES
 # The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
 # Stripping is only done if one of the specified strings matches the left-hand
 # part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
+# If left blank the directory from which Doxygen is run is used as the path to
 # strip.
 #
 # Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
+# will be relative from the directory where Doxygen is started.
 # This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
 STRIP_FROM_PATH        =
@@ -171,14 +201,14 @@ STRIP_FROM_PATH        =
 
 STRIP_FROM_INC_PATH    =
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# If the SHORT_NAMES tag is set to YES, Doxygen will generate much shorter (but
 # less readable) file names. This can be useful is your file systems doesn't
 # support long names like on DOS, Mac, or CD-ROM.
 # The default value is: NO.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen will interpret the
 # first line (until the first dot) of a Javadoc-style comment as the brief
 # description. If set to NO, the Javadoc-style will behave just like regular Qt-
 # style comments (thus requiring an explicit @brief command for a brief
@@ -187,17 +217,17 @@ SHORT_NAMES            = NO
 
 JAVADOC_AUTOBRIEF      = NO
 
-# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
+# If the JAVADOC_BANNER tag is set to YES then Doxygen will interpret a line
 # such as
 # /***************
 # as being the beginning of a Javadoc-style comment "banner". If set to NO, the
 # Javadoc-style will behave just like regular comments and it will not be
-# interpreted by doxygen.
+# interpreted by Doxygen.
 # The default value is: NO.
 
 JAVADOC_BANNER         = NO
 
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will interpret the first
 # line (until the first dot) of a Qt-style comment as the brief description. If
 # set to NO, the Qt-style will behave just like regular Qt-style comments (thus
 # requiring an explicit \brief command for a brief description.)
@@ -205,7 +235,7 @@ JAVADOC_BANNER         = NO
 
 QT_AUTOBRIEF           = NO
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen treat a
 # multi-line C++ special comment block (i.e. a block of //! or /// comments) as
 # a brief description. This used to be the default behavior. The new default is
 # to treat a multi-line C++ comment block as a detailed description. Set this
@@ -217,10 +247,10 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# By default Python docstrings are displayed as preformatted text and doxygen's
+# By default Python docstrings are displayed as preformatted text and Doxygen's
 # special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
-# doxygen's special commands can be used and the contents of the docstring
-# documentation blocks is shown as doxygen documentation.
+# Doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as Doxygen documentation.
 # The default value is: YES.
 
 PYTHON_DOCSTRING       = YES
@@ -231,7 +261,7 @@ PYTHON_DOCSTRING       = YES
 
 INHERIT_DOCS           = YES
 
-# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then Doxygen will produce a new
 # page for each member. If set to NO, the documentation of a member will be part
 # of the file/class/namespace that contains it.
 # The default value is: NO.
@@ -248,16 +278,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -301,30 +331,30 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# language is one of the parsers supported by Doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files). For instance to make doxygen treat .inc files
+# default for Fortran type files). For instance to make Doxygen treat .inc files
 # as Fortran files (default is PHP), and .f files as C (default is Fortran),
 # use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen. When specifying no_extension you should add
+# the files are not read by Doxygen. When specifying no_extension you should add
 # * to the FILE_PATTERNS.
 #
 # Note see also the list of default file extension mappings.
 
 EXTENSION_MAPPING      =
 
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# If the MARKDOWN_SUPPORT tag is enabled then Doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
 # documentation. See https://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# The output of markdown processing is further processed by Doxygen, so you can
+# mix Doxygen, HTML, and XML commands with Markdown formatting. Disable only in
 # case of backward compatibilities issues.
 # The default value is: YES.
 
@@ -334,12 +364,23 @@ MARKDOWN_SUPPORT       = YES
 # to that level are automatically included in the table of contents, even if
 # they do not have an id attribute.
 # Note: This feature currently applies only to Markdown headings.
-# Minimum value: 0, maximum value: 99, default value: 5.
+# Minimum value: 0, maximum value: 99, default value: 6.
 # This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
 
 TOC_INCLUDE_HEADINGS   = 5
 
-# When enabled doxygen tries to link words that correspond to documented
+# The MARKDOWN_ID_STYLE tag can be used to specify the algorithm used to
+# generate identifiers for the Markdown headings. Note: Every identifier is
+# unique.
+# Possible values are: DOXYGEN use a fixed 'autotoc_md' string followed by a
+# sequence number starting at 0 and GITHUB use the lower case version of title
+# with any whitespace replaced by '-' and punctuation characters removed.
+# The default value is: DOXYGEN.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+MARKDOWN_ID_STYLE      = DOXYGEN
+
+# When enabled Doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
 # be prevented in individual cases by putting a % sign in front of the word or
 # globally by setting AUTOLINK_SUPPORT to NO.
@@ -349,10 +390,10 @@ AUTOLINK_SUPPORT       = YES
 
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
 # to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
+# tag to YES in order to let Doxygen match functions declarations and
 # definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
+# versus func(std::string) {}). This also makes the inheritance and
+# collaboration diagrams that involve STL classes more complete and accurate.
 # The default value is: NO.
 
 BUILTIN_STL_SUPPORT    = NO
@@ -364,16 +405,16 @@ BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 
 # Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
+# https://www.riverbankcomputing.com/software) sources only. Doxygen will parse
+# them like normal C++ but will assume all classes use public instead of private
+# inheritance when no explicit protection keyword is present.
 # The default value is: NO.
 
 SIP_SUPPORT            = NO
 
 # For Microsoft's IDL there are propget and propput attributes to indicate
 # getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
+# Doxygen to replace the get and set methods by a property in the documentation.
 # This will only work if the methods are indeed getting or setting a simple
 # type. If this is not the case, or you want to show the methods anyway, you
 # should set this option to NO.
@@ -382,12 +423,12 @@ SIP_SUPPORT            = NO
 IDL_PROPERTY_SUPPORT   = YES
 
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES then doxygen will reuse the documentation of the first
+# tag is set to YES then Doxygen will reuse the documentation of the first
 # member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
 # The default value is: NO.
 
-DISTRIBUTE_GROUP_DOC   = YES
+DISTRIBUTE_GROUP_DOC   = NO
 
 # If one adds a struct or class to a group and this option is enabled, then also
 # any nested class or struct is added to the same group. By default this option
@@ -440,34 +481,42 @@ TYPEDEF_HIDES_STRUCT   = NO
 # The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
 # cache is used to resolve symbols given their name and scope. Since this can be
 # an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
+# code, Doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# Doxygen will become slower. If the cache is too large, memory is wasted. The
 # cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
 # is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
+# symbols. At the end of a run Doxygen will report the cache usage and suggest
 # the optimal cache size from a speed point of view.
 # Minimum value: 0, maximum value: 9, default value: 0.
 
 LOOKUP_CACHE_SIZE      = 0
 
-# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
-# during processing. When set to 0 doxygen will based this on the number of
+# The NUM_PROC_THREADS specifies the number of threads Doxygen is allowed to use
+# during processing. When set to 0 Doxygen will based this on the number of
 # cores available in the system. You can set it explicitly to a value larger
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
 
 NUM_PROC_THREADS       = 1
 
+# If the TIMESTAMP tag is set different from NO then each generated page will
+# contain the date or date and time when the page was generated. Setting this to
+# NO can help when comparing the output of multiple runs.
+# Possible values are: YES, NO, DATETIME and DATE.
+# The default value is: NO.
+
+TIMESTAMP              = YES
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 
-# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# If the EXTRACT_ALL tag is set to YES, Doxygen will assume all entities in
 # documentation are documented, even if no documentation was available. Private
 # class members and static file members will be hidden unless the
 # EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
@@ -533,7 +582,7 @@ EXTRACT_ANON_NSPACES   = NO
 
 RESOLVE_UNNAMED_PARAMS = YES
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
 # undocumented members inside documented classes or files. If set to NO these
 # members will be included in the various overviews, but no documentation
 # section is generated. This option has no effect if EXTRACT_ALL is enabled.
@@ -541,22 +590,23 @@ RESOLVE_UNNAMED_PARAMS = YES
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
 # undocumented classes that are normally visible in the class hierarchy. If set
 # to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
+# will also hide undocumented C++ concepts if enabled. This option has no effect
+# if EXTRACT_ALL is enabled.
 # The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all friend
 # declarations. If set to NO, these declarations will be included in the
 # documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
 # documentation blocks found inside the body of a function. If set to NO, these
 # blocks will be appended to the function's detailed documentation block.
 # The default value is: NO.
@@ -570,37 +620,44 @@ HIDE_IN_BODY_DOCS      = NO
 
 INTERNAL_DOCS          = NO
 
-# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
+# With the correct setting of option CASE_SENSE_NAMES Doxygen will better be
 # able to match the capabilities of the underlying filesystem. In case the
 # filesystem is case sensitive (i.e. it supports files in the same directory
 # whose names only differ in casing), the option must be set to YES to properly
 # deal with such files in case they appear in the input. For filesystems that
-# are not case sensitive the option should be be set to NO to properly deal with
+# are not case sensitive the option should be set to NO to properly deal with
 # output files written for symbols that only differ in casing, such as for two
 # classes, one named CLASS and the other named Class, and to also support
 # references to files without having to specify the exact matching casing. On
-# Windows (including Cygwin) and MacOS, users should typically set this option
+# Windows (including Cygwin) and macOS, users should typically set this option
 # to NO, whereas on Linux or other Unix flavors it should typically be set to
 # YES.
-# The default value is: system dependent.
+# Possible values are: SYSTEM, NO and YES.
+# The default value is: SYSTEM.
 
 CASE_SENSE_NAMES       = NO
 
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# If the HIDE_SCOPE_NAMES tag is set to NO then Doxygen will show members with
 # their full class and namespace scopes in the documentation. If set to YES, the
 # scope will be hidden.
 # The default value is: NO.
 
 HIDE_SCOPE_NAMES       = NO
 
-# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then Doxygen will
 # append additional text to a page's title, such as Class Reference. If set to
 # YES the compound reference will be hidden.
 # The default value is: NO.
 
 HIDE_COMPOUND_REFERENCE= NO
 
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then Doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
 
@@ -613,7 +670,7 @@ SHOW_INCLUDE_FILES     = YES
 
 SHOW_GROUPED_MEMB_INC  = NO
 
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen will list include
 # files with double quotes in the documentation rather than with sharp brackets.
 # The default value is: NO.
 
@@ -625,14 +682,14 @@ FORCE_LOCAL_INCLUDES   = NO
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# If the SORT_MEMBER_DOCS tag is set to YES then Doxygen will sort the
 # (detailed) documentation of file and class members alphabetically by member
 # name. If set to NO, the members will appear in declaration order.
 # The default value is: YES.
 
 SORT_MEMBER_DOCS       = YES
 
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# If the SORT_BRIEF_DOCS tag is set to YES then Doxygen will sort the brief
 # descriptions of file, namespace and class members alphabetically by member
 # name. If set to NO, the members will appear in declaration order. Note that
 # this will also influence the order of the classes in the class list.
@@ -640,7 +697,7 @@ SORT_MEMBER_DOCS       = YES
 
 SORT_BRIEF_DOCS        = NO
 
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then Doxygen will sort the
 # (brief and detailed) documentation of class members so that constructors and
 # destructors are listed first. If set to NO the constructors will appear in the
 # respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
@@ -652,7 +709,7 @@ SORT_BRIEF_DOCS        = NO
 
 SORT_MEMBERS_CTORS_1ST = NO
 
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# If the SORT_GROUP_NAMES tag is set to YES then Doxygen will sort the hierarchy
 # of group names into alphabetical order. If set to NO the group names will
 # appear in their defined order.
 # The default value is: NO.
@@ -669,11 +726,11 @@ SORT_GROUP_NAMES       = NO
 
 SORT_BY_SCOPE_NAME     = NO
 
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# If the STRICT_PROTO_MATCHING option is enabled and Doxygen fails to do proper
 # type resolution of all parameters of a function it will reject a match between
 # the prototype and the implementation of a member function even if there is
 # only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# simple string match. By disabling STRICT_PROTO_MATCHING Doxygen will still
 # accept a match between prototype and implementation in such cases.
 # The default value is: NO.
 
@@ -743,27 +800,28 @@ SHOW_FILES             = YES
 SHOW_NAMESPACES        = YES
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
+# Doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
 # popen()) the command command input-file, where command is the value of the
 # FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
+# by Doxygen. Whatever the program writes to standard output is used as the file
 # version. For an example see the documentation.
 
 FILE_VERSION_FILTER    =
 
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
+# by Doxygen. The layout file controls the global structure of the generated
 # output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
+# that represents Doxygen's defaults, run Doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# Note that if you run Doxygen from a directory containing a file called
+# DoxygenLayout.xml, Doxygen will parse it automatically even if the LAYOUT_FILE
 # tag is left empty.
 
-LAYOUT_FILE            =
+LAYOUT_FILE            = DOCS/DoxygenLayout.xml
 
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
@@ -775,19 +833,35 @@ LAYOUT_FILE            =
 
 CITE_BIB_FILES         =
 
+# The EXTERNAL_TOOL_PATH tag can be used to extend the search path (PATH
+# environment variable) so that external tools such as latex and gs can be
+# found.
+# Note: Directories specified with EXTERNAL_TOOL_PATH are added in front of the
+# path already specified by the PATH variable, and are added in the order
+# specified.
+# Note: This option is particularly useful for macOS version 14 (Sonoma) and
+# higher, when running Doxygen from Doxywizard, because in this case any user-
+# defined changes to the PATH are ignored. A typical example on macOS is to set
+# EXTERNAL_TOOL_PATH = /Library/TeX/texbin /usr/local/bin
+# together with the standard path, the full search path used by doxygen when
+# launching external tools will then become
+# PATH=/Library/TeX/texbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
+
+EXTERNAL_TOOL_PATH     =
+
 #---------------------------------------------------------------------------
 # Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
 # The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
+# standard output by Doxygen. If QUIET is set to YES this implies that the
 # messages are off.
 # The default value is: NO.
 
-QUIET                  = YES
+QUIET                  = NO
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# generated to standard error (stderr) by Doxygen. If WARNINGS is set to YES
 # this implies that the warnings are on.
 #
 # Tip: Turn warnings on while writing the documentation.
@@ -795,54 +869,91 @@ QUIET                  = YES
 
 WARNINGS               = YES
 
-# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then Doxygen will generate
 # warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
 # will automatically be disabled.
 # The default value is: YES.
 
 WARN_IF_UNDOCUMENTED   = YES
 
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# If the WARN_IF_DOC_ERROR tag is set to YES, Doxygen will generate warnings for
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, Doxygen will warn about incomplete
+# function parameter documentation. If set to NO, Doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, Doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
-WARN_NO_PARAMDOC       = NO
+WARN_NO_PARAMDOC       = YES
 
-# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, Doxygen will warn about
+# undocumented enumeration values. If set to NO, Doxygen will accept
+# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: NO.
+
+WARN_IF_UNDOC_ENUM_VAL = NO
+
+# If the WARN_AS_ERROR tag is set to YES then Doxygen will immediately stop when
 # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
-# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
-# at the end of the doxygen process doxygen will return with a non-zero status.
-# Possible values are: NO, YES and FAIL_ON_WARNINGS.
+# then Doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
+# at the end of the Doxygen process Doxygen will return with a non-zero status.
+# If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS_PRINT then Doxygen behaves
+# like FAIL_ON_WARNINGS but in case no WARN_LOGFILE is defined Doxygen will not
+# write the warning messages in between other messages but write them at the end
+# of a run, in case a WARN_LOGFILE is defined the warning messages will be
+# besides being in the defined file also be shown at the end of a run, unless
+# the WARN_LOGFILE is defined as - i.e. standard output (stdout) in that case
+# the behavior will remain as with the setting FAIL_ON_WARNINGS.
+# Possible values are: NO, YES, FAIL_ON_WARNINGS and FAIL_ON_WARNINGS_PRINT.
 # The default value is: NO.
 
 WARN_AS_ERROR          = NO
 
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# The WARN_FORMAT tag determines the format of the warning messages that Doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
 # will be replaced by the file and line number from which the warning originated
 # and the warning text. Optionally the format may contain $version, which will
 # be replaced by the version of the file (if it could be obtained via
 # FILE_VERSION_FILTER)
+# See also: WARN_LINE_FORMAT
 # The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
+# In the $text part of the WARN_FORMAT command it is possible that a reference
+# to a more specific place is given. To make it easier to jump to this place
+# (outside of Doxygen) the user can define a custom "cut" / "paste" string.
+# Example:
+# WARN_LINE_FORMAT = "'vi $file +$line'"
+# See also: WARN_FORMAT
+# The default value is: at line $line of file $file.
+
+WARN_LINE_FORMAT       = "at line $line of file $file"
+
 # The WARN_LOGFILE tag can be used to specify a file to which warning and error
 # messages should be written. If left blank the output is written to standard
-# error (stderr).
+# error (stderr). In case the file specified cannot be opened for writing the
+# warning and error messages are written to standard error. When as file - is
+# specified the warning and error messages are written to standard output
+# (stdout).
 
-WARN_LOGFILE           = output_err
+WARN_LOGFILE           = doxygen_error
 
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
@@ -854,39 +965,55 @@ WARN_LOGFILE           = output_err
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = . \
-                         DOCS/groups-usr.dox
+INPUT                  = BLAS \
+                         CBLAS \
+                         SRC \
+                         INSTALL \
+                         TESTING \
+                         DOCS/groups-usr.dox \
+                         README.md
 
 # This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# that Doxygen parses. Internally Doxygen uses the UTF-8 encoding. Doxygen uses
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
 # documentation (see:
 # https://www.gnu.org/software/libiconv/) for the list of possible encodings.
+# See also: INPUT_FILE_ENCODING
 # The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
 
+# This tag can be used to specify the character encoding of the source files
+# that Doxygen parses The INPUT_FILE_ENCODING tag can be used to specify
+# character encoding on a per file pattern basis. Doxygen will compare the file
+# name with each pattern and apply the encoding instead of the default
+# INPUT_ENCODING) if there is a match. The character encodings are a list of the
+# form: pattern=encoding (like *.php=ISO-8859-1).
+# See also: INPUT_ENCODING for further information on supported encodings.
+
+INPUT_FILE_ENCODING    =
+
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
 # *.h) to filter out the source-files in the directories.
 #
 # Note that for custom extensions or not directly supported extensions you also
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# read by doxygen.
+# read by Doxygen.
 #
 # Note the list of default checked file patterns might differ from the list of
 # default file extension mappings.
 #
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
-
-FILE_PATTERNS          = *.c \
-                         *.f \
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cxxm,
+# *.cpp, *.cppm, *.ccm, *.c++, *.c++m, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl,
+# *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, *.h++, *.ixx, *.l, *.cs, *.d,
+# *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to
+# be provided as Doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f18, *.f, *.for, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+
+FILE_PATTERNS          = *.f \
                          *.f90 \
+                         *.c \
                          *.h
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
@@ -899,37 +1026,17 @@ RECURSIVE              = YES
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 #
-# Note that relative paths are relative to the directory from which doxygen is
+# Note that relative paths are relative to the directory from which Doxygen is
 # run.
 
-EXCLUDE                = CMAKE \
-                         DOCS \
-                         .svn \
-                         CBLAS/.svn \
-                         CBLAS/src/.svn \
-                         CBLAS/testing/.svn \
-                         CBLAS/example/.svn \
-                         CBLAS/include/.svn \
-                         BLAS/.svn \
-                         BLAS/SRC/.svn \
-                         BLAS/TESTING/.svn \
-                         SRC/.svn \
-                         SRC/VARIANTS/.svn \
-                         SRC/VARIANTS/LIB/.svn \
-                         SRC/VARIANTS/cholesky/.svn \
-                         SRC/VARIANTS/cholesky/RL/.svn \
-                         SRC/VARIANTS/cholesky/TOP/.svn \
-                         SRC/VARIANTS/lu/.svn \
-                         SRC/VARIANTS/lu/CR/.svn \
-                         SRC/VARIANTS/lu/LL/.svn \
-                         SRC/VARIANTS/lu/REC/.svn \
-                         SRC/VARIANTS/qr/.svn \
-                         SRC/VARIANTS/qr/LL/.svn \
-                         INSTALL/.svn \
-                         TESTING/.svn \
-                         TESTING/EIG/.svn \
-                         TESTING/MATGEN/.svn \
-                         TESTING/LIN/.svn
+EXCLUDE                = .git \
+                         .github \
+                         SRC/VARIANTS \
+                         BLAS/SRC/lsame.f \
+                         BLAS/SRC/xerbla.f \
+                         BLAS/SRC/xerbla_array.f \
+                         INSTALL/slamchf77.f \
+                         INSTALL/dlamchf77.f
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -945,20 +1052,13 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = *.py \
-                         *.txt \
-                         *.in \
-                         *.inc \
-                         Makefile
+EXCLUDE_PATTERNS       =
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
+# ANamespace::AClass, ANamespace::*Test
 
 EXCLUDE_SYMBOLS        =
 
@@ -973,7 +1073,7 @@ EXAMPLE_PATH           =
 # *.h) to filter out the source-files in the directories. If left blank all
 # files are included.
 
-EXAMPLE_PATTERNS       =
+EXAMPLE_PATTERNS       = *
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
 # searched for input files to be used with the \include or \dontinclude commands
@@ -988,7 +1088,7 @@ EXAMPLE_RECURSIVE      = NO
 
 IMAGE_PATH             =
 
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# The INPUT_FILTER tag can be used to specify a program that Doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
 # by executing (via popen()) the command:
 #
@@ -1003,9 +1103,14 @@ IMAGE_PATH             =
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
 #
+# Note that Doxygen will use the data processed and written to standard output
+# for further processing, therefore nothing else, like debug statements or used
+# commands (so in case of a Windows batch file always use @echo OFF), should be
+# written to standard output.
+#
 # Note that for custom extensions or not directly supported extensions you also
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
+# properly processed by Doxygen.
 
 INPUT_FILTER           =
 
@@ -1018,7 +1123,7 @@ INPUT_FILTER           =
 #
 # Note that for custom extensions or not directly supported extensions you also
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
+# properly processed by Doxygen.
 
 FILTER_PATTERNS        =
 
@@ -1040,10 +1145,19 @@ FILTER_SOURCE_PATTERNS =
 # If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
 # is part of the input, its contents will be placed on the main page
 # (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
+# and want to reuse the introduction page also for the Doxygen output.
 
 USE_MDFILE_AS_MAINPAGE =
 
+# The Fortran standard specifies that for fixed formatted Fortran code all
+# characters from position 72 are to be considered as comment. A common
+# extension is to allow longer lines before the automatic comment starts. The
+# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can
+# be processed before the automatic comment starts.
+# Minimum value: 7, maximum value: 10000, default value: 72.
+
+FORTRAN_COMMENT_AFTER  = 72
+
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
 #---------------------------------------------------------------------------
@@ -1058,12 +1172,13 @@ USE_MDFILE_AS_MAINPAGE =
 SOURCE_BROWSER         = YES
 
 # Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
+# multi-line macros, enums or list initialized variables directly into the
+# documentation.
 # The default value is: NO.
 
 INLINE_SOURCES         = YES
 
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct Doxygen to hide any
 # special comment blocks from generated source code fragments. Normal C, C++ and
 # Fortran comments will always remain visible.
 # The default value is: YES.
@@ -1101,7 +1216,7 @@ REFERENCES_LINK_SOURCE = YES
 SOURCE_TOOLTIPS        = YES
 
 # If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# point to the HTML generated by the htags(1) tool instead of Doxygen built-in
 # source browser. The htags tool is part of GNU's global source tagging system
 # (see https://www.gnu.org/software/global/global.html). You will need version
 # 4.8.6 or higher.
@@ -1115,14 +1230,14 @@ SOURCE_TOOLTIPS        = YES
 # Doxygen will invoke htags (and that will in turn invoke gtags), so these
 # tools must be available from the command line (i.e. in the search path).
 #
-# The result: instead of the source browser generated by doxygen, the links to
+# The result: instead of the source browser generated by Doxygen, the links to
 # source code will now point to the output of htags.
 # The default value is: NO.
 # This tag requires that the tag SOURCE_BROWSER is set to YES.
 
 USE_HTAGS              = NO
 
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# If the VERBATIM_HEADERS tag is set the YES then Doxygen will generate a
 # verbatim copy of the header file for each class for which an include is
 # specified. Set to NO to disable this.
 # See also: Section \class.
@@ -1130,6 +1245,46 @@ USE_HTAGS              = NO
 
 VERBATIM_HEADERS       = YES
 
+# If the CLANG_ASSISTED_PARSING tag is set to YES then Doxygen will use the
+# clang parser (see:
+# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
+# performance. This can be particularly helpful with template rich C++ code for
+# which Doxygen's built-in parser lacks the necessary type information.
+# Note: The availability of this option depends on whether or not Doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES and the CLANG_ADD_INC_PATHS
+# tag is set to YES then Doxygen will add the directory of each input to the
+# include path.
+# The default value is: YES.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_ADD_INC_PATHS    = YES
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by Doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
+# If clang assisted parsing is enabled you can provide the clang parser with the
+# path to the directory containing a file called compile_commands.json. This
+# file is the compilation database (see:
+# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
+# options used when the source files were built. This is equivalent to
+# specifying the -p option to a clang tool, such as clang-check. These options
+# will then be passed to the parser. Any options specified with CLANG_OPTIONS
+# will be added as well.
+# Note: The availability of this option depends on whether or not Doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+
+CLANG_DATABASE_PATH    =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -1141,10 +1296,11 @@ VERBATIM_HEADERS       = YES
 
 ALPHABETICAL_INDEX     = YES
 
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
+# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes)
+# that should be ignored while generating the index headers. The IGNORE_PREFIX
+# tag works for classes, function and member names. The entity will be placed in
+# the alphabetical list under the first letter of the entity name that remains
+# after removing the prefix.
 # This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 IGNORE_PREFIX          =
@@ -1153,7 +1309,7 @@ IGNORE_PREFIX          =
 # Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# If the GENERATE_HTML tag is set to YES, Doxygen will generate HTML output
 # The default value is: YES.
 
 GENERATE_HTML          = YES
@@ -1174,40 +1330,40 @@ HTML_OUTPUT            = explore-html
 HTML_FILE_EXTENSION    = .html
 
 # The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
+# each generated HTML page. If the tag is left blank Doxygen will generate a
 # standard header.
 #
 # To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
+# that Doxygen needs, which is dependent on the configuration options used (e.g.
 # the setting GENERATE_TREEVIEW). It is highly recommended to start with a
 # default header using
 # doxygen -w html new_header.html new_footer.html new_stylesheet.css
 # YourConfigFile
 # and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
+# for information on how to generate the default header that Doxygen normally
 # uses.
 # Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
+# default header when upgrading to a newer version of Doxygen. For a description
 # of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_HEADER            =
 
 # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
+# generated HTML page. If the tag is left blank Doxygen will generate a standard
 # footer. See HTML_HEADER for more information on how to generate a default
 # footer and what special commands can be used inside the footer. See also
 # section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
+# that Doxygen normally uses.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FOOTER            =
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
 # sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
+# the HTML output. If left blank Doxygen will generate a default style sheet.
 # See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
+# sheet that Doxygen normally uses.
 # Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
 # it is more robust and this tag (HTML_STYLESHEET) will in the future become
 # obsolete.
@@ -1217,13 +1373,18 @@ HTML_STYLESHEET        =
 
 # The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
 # cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
+# created by Doxygen. Using this option one can overrule certain style aspects.
 # This is preferred over using HTML_STYLESHEET since it does not replace the
 # standard style sheet and is therefore more robust against future updates.
 # Doxygen will copy the style sheet files to the output directory.
 # Note: The order of the extra style sheet files is of importance (e.g. the last
 # style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
+# list).
+# Note: Since the styling of scrollbars can currently not be overruled in
+# Webkit/Chromium, the styling will be left out of the default doxygen.css if
+# one or more extra stylesheets have been specified. So if scrollbar
+# customization is desired it has to be added explicitly. For an example see the
+# documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_EXTRA_STYLESHEET  =
@@ -1238,9 +1399,22 @@ HTML_EXTRA_STYLESHEET  =
 
 HTML_EXTRA_FILES       =
 
+# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
+# should be rendered with a dark or light theme.
+# Possible values are: LIGHT always generates light mode output, DARK always
+# generates dark mode output, AUTO_LIGHT automatically sets the mode according
+# to the user preference, uses light mode if no preference is set (the default),
+# AUTO_DARK automatically sets the mode according to the user preference, uses
+# dark mode if no preference is set and TOGGLE allows a user to switch between
+# light and dark mode via a button.
+# The default value is: AUTO_LIGHT.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE        = AUTO_LIGHT
+
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1250,7 +1424,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1268,15 +1442,6 @@ HTML_COLORSTYLE_SAT    = 100
 
 HTML_COLORSTYLE_GAMMA  = 80
 
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = YES
-
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
 # are dynamically created via JavaScript. If disabled, the navigation index will
@@ -1296,6 +1461,33 @@ HTML_DYNAMIC_MENUS     = YES
 
 HTML_DYNAMIC_SECTIONS  = NO
 
+# If the HTML_CODE_FOLDING tag is set to YES then classes and functions can be
+# dynamically folded and expanded in the generated HTML source code.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_CODE_FOLDING      = YES
+
+# If the HTML_COPY_CLIPBOARD tag is set to YES then Doxygen will show an icon in
+# the top right corner of code and text fragments that allows the user to copy
+# its content to the clipboard. Note this only works if supported by the browser
+# and the web page is served via a secure context (see:
+# https://www.w3.org/TR/secure-contexts/), i.e. using the https: or file:
+# protocol.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COPY_CLIPBOARD    = YES
+
+# Doxygen stores a couple of settings persistently in the browser (via e.g.
+# cookies). By default these settings apply to all HTML pages generated by
+# Doxygen across all projects. The HTML_PROJECT_COOKIE tag can be used to store
+# the settings under a project specific key, such that the user preferences will
+# be stored separately.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_PROJECT_COOKIE    =
+
 # With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
 # shown in the various tree structured indices initially; the user can expand
 # and collapse entries dynamically later on. Doxygen will expand the tree to
@@ -1313,7 +1505,7 @@ HTML_INDEX_NUM_ENTRIES = 100
 # generated that can be used as input for Apple's Xcode 3 integrated development
 # environment (see:
 # https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
-# create a documentation set, doxygen will generate a Makefile in the HTML
+# create a documentation set, Doxygen will generate a Makefile in the HTML
 # output directory. Running make will produce the docset in that directory and
 # running make install will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
@@ -1332,6 +1524,13 @@ GENERATE_DOCSET        = NO
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
+# This tag determines the URL of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDURL         =
+
 # This tag specifies a string that should uniquely identify the documentation
 # set bundle. This should be a reverse domain-name style string, e.g.
 # com.mycompany.MyDocSet. Doxygen will append .docset to the name.
@@ -1354,14 +1553,18 @@ DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 
 DOCSET_PUBLISHER_NAME  = Publisher
 
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# If the GENERATE_HTMLHELP tag is set to YES then Doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# generated by Doxygen into a single compiled HTML file (.chm). Compiled HTML
 # files are now used as the Windows 98 help format, and will replace the old
 # Windows help format (.hlp) on all Windows platforms in the future. Compressed
 # HTML files also contain an index, a table of contents, and you can search for
@@ -1381,7 +1584,7 @@ CHM_FILE               =
 
 # The HHC_LOCATION tag can be used to specify the location (absolute path
 # including file name) of the HTML help compiler (hhc.exe). If non-empty,
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# Doxygen will try to run the HTML help compiler on the generated index.hhp.
 # The file has to be specified with full path.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1415,6 +1618,16 @@ BINARY_TOC             = NO
 
 TOC_EXPAND             = NO
 
+# The SITEMAP_URL tag is used to specify the full URL of the place where the
+# generated documentation will be placed on the server by the user during the
+# deployment of the documentation. The generated sitemap is called sitemap.xml
+# and placed on the directory specified by HTML_OUTPUT. In case no SITEMAP_URL
+# is specified no sitemap is generated. For information about the sitemap
+# protocol see https://www.sitemaps.org
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SITEMAP_URL            =
+
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
 # QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
 # can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
@@ -1473,7 +1686,7 @@ QHP_CUST_FILTER_ATTRS  =
 QHP_SECT_FILTER_ATTRS  =
 
 # The QHG_LOCATION tag can be used to specify the location (absolute path
-# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
+# including file name) of Qt's qhelpgenerator. If non-empty Doxygen will try to
 # run qhelpgenerator on the generated .qhp file.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1517,18 +1730,30 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by Doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = YES
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATE_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
+# Doxygen will group on one line in the generated HTML documentation.
 #
 # Note that a value of 0 will completely suppress the enum values from appearing
 # in the overview section.
@@ -1537,6 +1762,12 @@ GENERATE_TREEVIEW      = YES
 
 ENUM_VALUES_PER_LINE   = 4
 
+# When the SHOW_ENUM_VALUES tag is set doxygen will show the specified
+# enumeration values besides the enumeration mnemonics.
+# The default value is: NO.
+
+SHOW_ENUM_VALUES       = NO
+
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
 # to set the initial width (in pixels) of the frame in which the tree is shown.
 # Minimum value: 0, maximum value: 1500, default value: 250.
@@ -1544,14 +1775,21 @@ ENUM_VALUES_PER_LINE   = 4
 
 TREEVIEW_WIDTH         = 250
 
-# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# If the EXT_LINKS_IN_WINDOW option is set to YES, Doxygen will open links to
 # external symbols imported via tag files in a separate window.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 EXT_LINKS_IN_WINDOW    = NO
 
-# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# If the OBFUSCATE_EMAILS tag is set to YES, Doxygen will obfuscate email
+# addresses.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+OBFUSCATE_EMAILS       = YES
+
+# If the HTML_FORMULA_FORMAT option is set to svg, Doxygen will use the pdf2svg
 # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
 # https://inkscape.org) to generate formulas as SVG images instead of PNGs for
 # the HTML output. These images will generally look nicer at scaled resolutions.
@@ -1564,24 +1802,13 @@ HTML_FORMULA_FORMAT    = png
 
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
+# Doxygen run you need to manually remove any form_*.png images from the HTML
 # output directory to force them to be regenerated.
 # Minimum value: 8, maximum value: 50, default value: 10.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
 # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
 # to create new LaTeX commands to be used in formulas as building blocks. See
 # the section "Including formulas" for details.
@@ -1599,11 +1826,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for MathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1616,20 +1861,26 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
-MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
+MATHJAX_RELPATH        = https://cdn.jsdelivr.net/npm/mathjax@2
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
 
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# The MATHJAX_CODEFILE tag can be used to specify a file with JavaScript pieces
 # of code that will be used on startup of the MathJax code. See the MathJax site
 # (see:
 # http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
@@ -1638,12 +1889,12 @@ MATHJAX_EXTENSIONS     =
 
 MATHJAX_CODEFILE       =
 
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
+# When the SEARCHENGINE tag is enabled Doxygen will generate a search box for
+# the HTML output. The underlying search engine uses JavaScript and DHTML and
 # should work on any modern browser. Note that when using HTML help
 # (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
 # there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
+# For large projects the JavaScript based search engine can be slow, then
 # enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
 # search using the keyboard; to jump to the search box use <access key> + S
 # (what the <access key> is depends on the OS and browser, but it is typically
@@ -1662,7 +1913,7 @@ SEARCHENGINE           = YES
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
+# setting. When disabled, Doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
 # and searching needs to be provided by external tools. See the section
 # "External Indexing and Searching" for details.
@@ -1671,7 +1922,7 @@ SEARCHENGINE           = YES
 
 SERVER_BASED_SEARCH    = NO
 
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# When EXTERNAL_SEARCH tag is enabled Doxygen will no longer generate the PHP
 # script for searching. Instead the search results are written to an XML file
 # which needs to be processed by an external indexer. Doxygen will invoke an
 # external search engine pointed to by the SEARCHENGINE_URL option to obtain the
@@ -1716,7 +1967,7 @@ SEARCHDATA_FILE        = searchdata.xml
 
 EXTERNAL_SEARCH_ID     =
 
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through Doxygen
 # projects other than the one defined by this configuration file, but that are
 # all added to the same external search index. Each project needs to have a
 # unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
@@ -1730,7 +1981,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# If the GENERATE_LATEX tag is set to YES, Doxygen will generate LaTeX output.
 # The default value is: YES.
 
 GENERATE_LATEX         = NO
@@ -1753,7 +2004,7 @@ LATEX_OUTPUT           = latex
 # the output language.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_CMD_NAME         = latex
+LATEX_CMD_NAME         =
 
 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
 # index for LaTeX.
@@ -1775,7 +2026,7 @@ MAKEINDEX_CMD_NAME     = makeindex
 
 LATEX_MAKEINDEX_CMD    = makeindex
 
-# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# If the COMPACT_LATEX tag is set to YES, Doxygen generates more compact LaTeX
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
 # The default value is: NO.
@@ -1804,36 +2055,38 @@ PAPER_TYPE             = a4
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank Doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that Doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of Doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank Doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that Doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
 
 # The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
 # LaTeX style sheets that are included after the standard style sheets created
-# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# by Doxygen. Using this option one can overrule certain style aspects. Doxygen
 # will copy the style sheet files to the output directory.
 # Note: The order of the extra style sheet files is of importance (e.g. the last
 # style sheet in the list overrules the setting of the previous ones in the
@@ -1859,7 +2112,7 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = YES
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# If the USE_PDFLATEX tag is set to YES, Doxygen will use the engine as
 # specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
 # files. Set this option to YES, to get a higher quality PDF documentation.
 #
@@ -1869,32 +2122,28 @@ PDF_HYPERLINKS         = YES
 
 USE_PDFLATEX           = YES
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# The LATEX_BATCHMODE tag signals the behavior of LaTeX in case of an error.
+# Possible values are: NO same as ERROR_STOP, YES same as BATCH, BATCH In batch
+# mode nothing is printed on the terminal, errors are scrolled as if <return> is
+# hit at every error; missing files that TeX tries to input or request from
+# keyboard input (\read on a not open input stream) cause the job to abort,
+# NON_STOP In nonstop mode the diagnostic message will appear on the terminal,
+# but there is no possibility of user interaction just like in batch mode,
+# SCROLL In scroll mode, TeX will stop only for missing files to input or if
+# keyboard input is necessary and ERROR_STOP In errorstop mode, TeX will stop at
+# each error, asking for user intervention.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BATCHMODE        = NO
 
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# If the LATEX_HIDE_INDICES tag is set to YES then Doxygen will not include the
 # index chapters (such as File Index, Compound Index, etc.) in the output.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1903,14 +2152,6 @@ LATEX_SOURCE_CODE      = NO
 
 LATEX_BIB_STYLE        = plain
 
-# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_TIMESTAMP        = NO
-
 # The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
 # path from which the emoji images will be read. If a relative path is entered,
 # it will be relative to the LATEX_OUTPUT directory. If left blank the
@@ -1923,7 +2164,7 @@ LATEX_EMOJI_DIRECTORY  =
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# If the GENERATE_RTF tag is set to YES, Doxygen will generate RTF output. The
 # RTF output is optimized for Word 97 and may not look too pretty with other RTF
 # readers/editors.
 # The default value is: NO.
@@ -1938,7 +2179,7 @@ GENERATE_RTF           = NO
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# If the COMPACT_RTF tag is set to YES, Doxygen generates more compact RTF
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
 # The default value is: NO.
@@ -1956,40 +2197,38 @@ COMPACT_RTF            = NO
 # The default value is: NO.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_HYPERLINKS         = YES
+RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# Load stylesheet definitions from file. Syntax is similar to Doxygen's
 # configuration file, i.e. a series of assignments. You only have to provide
 # replacements, missing definitions are set to their default value.
 #
 # See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
+# default style sheet that Doxygen normally uses.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's configuration file. A template extensions file can be
+# similar to Doxygen's configuration file. A template extensions file can be
 # generated using doxygen -e rtf extensionFile.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
+# The RTF_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the RTF_OUTPUT output directory.
+# Note that the files will be copied as-is; there are no commands or markers
+# available.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_SOURCE_CODE        = NO
+RTF_EXTRA_FILES        =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# If the GENERATE_MAN tag is set to YES, Doxygen will generate man pages for
 # classes and files.
 # The default value is: NO.
 
@@ -2020,20 +2259,20 @@ MAN_EXTENSION          = .3
 
 MAN_SUBDIR             =
 
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, then it
 # will generate one additional man file for each entity documented in the real
 # man page(s). These additional files only source the real man page, but without
 # them the man command would be unable to find the correct page.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_MAN is set to YES.
 
-MAN_LINKS              = YES
+MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
 # Configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# If the GENERATE_XML tag is set to YES, Doxygen will generate an XML file that
 # captures the structure of the code including all documentation.
 # The default value is: NO.
 
@@ -2047,7 +2286,7 @@ GENERATE_XML           = NO
 
 XML_OUTPUT             = xml
 
-# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# If the XML_PROGRAMLISTING tag is set to YES, Doxygen will dump the program
 # listings (including syntax highlighting and cross-referencing information) to
 # the XML output. Note that enabling this will significantly increase the size
 # of the XML output.
@@ -2056,7 +2295,7 @@ XML_OUTPUT             = xml
 
 XML_PROGRAMLISTING     = YES
 
-# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, Doxygen will include
 # namespace members in file scope as well, matching the HTML output.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_XML is set to YES.
@@ -2067,7 +2306,7 @@ XML_NS_MEMB_FILE_SCOPE = NO
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# If the GENERATE_DOCBOOK tag is set to YES, Doxygen will generate Docbook files
 # that can be used to generate PDF.
 # The default value is: NO.
 
@@ -2081,32 +2320,49 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, Doxygen will generate an
+# AutoGen Definitions (see https://autogen.sourceforge.net/) file that captures
 # the structure of the code including all documentation. Note that this feature
 # is still experimental and incomplete at the moment.
 # The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
 
+#---------------------------------------------------------------------------
+# Configuration options related to Sqlite3 output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_SQLITE3 tag is set to YES Doxygen will generate a Sqlite3
+# database with symbols found by Doxygen stored in tables.
+# The default value is: NO.
+
+GENERATE_SQLITE3       = NO
+
+# The SQLITE3_OUTPUT tag is used to specify where the Sqlite3 database will be
+# put. If a relative path is entered the value of OUTPUT_DIRECTORY will be put
+# in front of it.
+# The default directory is: sqlite3.
+# This tag requires that the tag GENERATE_SQLITE3 is set to YES.
+
+SQLITE3_OUTPUT         = sqlite3
+
+# The SQLITE3_RECREATE_DB tag is set to YES, the existing doxygen_sqlite3.db
+# database file will be recreated with each Doxygen run. If set to NO, Doxygen
+# will warn if a database file is already found and not modify it.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_SQLITE3 is set to YES.
+
+SQLITE3_RECREATE_DB    = YES
+
 #---------------------------------------------------------------------------
 # Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# If the GENERATE_PERLMOD tag is set to YES, Doxygen will generate a Perl module
 # file that captures the structure of the code including all documentation.
 #
 # Note that this feature is still experimental and incomplete at the moment.
@@ -2114,7 +2370,7 @@ GENERATE_AUTOGEN_DEF   = NO
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# If the PERLMOD_LATEX tag is set to YES, Doxygen will generate the necessary
 # Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
 # output from the Perl module output.
 # The default value is: NO.
@@ -2144,13 +2400,13 @@ PERLMOD_MAKEVAR_PREFIX =
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# If the ENABLE_PREPROCESSING tag is set to YES, Doxygen will evaluate all
 # C-preprocessor directives found in the sources and include files.
 # The default value is: YES.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# If the MACRO_EXPANSION tag is set to YES, Doxygen will expand all macro names
 # in the source code. If set to NO, only conditional compilation will be
 # performed. Macro expansion can be done in a controlled way by setting
 # EXPAND_ONLY_PREDEF to YES.
@@ -2176,7 +2432,8 @@ SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
 # contain include files that are not input files but should be processed by the
-# preprocessor.
+# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of
+# RECURSIVE has no effect here.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
 INCLUDE_PATH           =
@@ -2208,7 +2465,7 @@ PREDEFINED             =
 
 EXPAND_AS_DEFINED      =
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# If the SKIP_FUNCTION_MACROS tag is set to YES then Doxygen's preprocessor will
 # remove all references to function-like macros that are alone on a line, have
 # an all uppercase name, and do not end with a semicolon. Such function macros
 # are typically used for boiler-plate code, and will confuse the parser if not
@@ -2232,26 +2489,26 @@ SKIP_FUNCTION_MACROS   = YES
 # section "Linking to external documentation" for more information about the use
 # of tag files.
 # Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
+# the path). If a tag file is not located in the directory in which Doxygen is
 # run, you must also specify the path to the tagfile here.
 
 TAGFILES               =
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# When a file name is specified after GENERATE_TAGFILE, Doxygen will create a
 # tag file that is based on the input files it reads. See section "Linking to
 # external documentation" for more information about the usage of tag files.
 
 GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
+# If the ALLEXTERNALS tag is set to YES, all external classes and namespaces
+# will be listed in the class and namespace index. If set to NO, only the
+# inherited external classes will be listed.
 # The default value is: NO.
 
 ALLEXTERNALS           = NO
 
 # If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will be
+# in the topic index. If set to NO, only the current project's groups will be
 # listed.
 # The default value is: YES.
 
@@ -2265,42 +2522,26 @@ EXTERNAL_GROUPS        = YES
 EXTERNAL_PAGES         = YES
 
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# Configuration options related to diagram generator tools
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
 # If set to YES the inheritance and collaboration graphs will hide inheritance
 # and usage relations if the target is undocumented or is not a class.
 # The default value is: YES.
 
 HIDE_UNDOC_RELATIONS   = YES
 
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# If you set the HAVE_DOT tag to YES then Doxygen will assume the dot tool is
 # available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# https://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
 # Bell Labs. The other options in this section have no effect if this option is
 # set to NO
 # The default value is: NO.
 
 HAVE_DOT               = YES
 
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
+# The DOT_NUM_THREADS specifies the number of dot invocations Doxygen is allowed
+# to run in parallel. When set to 0 Doxygen will base this on the number of
 # processors available in the system. You can set it explicitly to a value
 # larger than 0 to get control over the balance between CPU load and processing
 # speed.
@@ -2309,55 +2550,83 @@ HAVE_DOT               = YES
 
 DOT_NUM_THREADS        = 0
 
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
+# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
+# subgraphs. When you want a differently looking font in the dot files that
+# Doxygen generates you can specify fontname, fontcolor and fontsize attributes.
+# For details please see <a href=https://graphviz.org/doc/info/attrs.html>Node,
+# Edge and Graph Attributes specification</a> You need to make sure dot is able
+# to find the font, which can be done by putting it in a standard location or by
+# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font. Default graphviz fontsize is 14.
+# The default value is: fontname=Helvetica,fontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTNAME           = Helvetica
+DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
 
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
+# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can
+# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. <a
+# href=https://graphviz.org/doc/info/arrows.html>Complete documentation about
+# arrows shapes.</a>
+# The default value is: labelfontname=Helvetica,labelfontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTSIZE           = 10
+DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10"
 
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
+# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
+# around nodes set 'shape=plain' or 'shape=plaintext' <a
+# href=https://www.graphviz.org/doc/info/shapes.html>Shapes specification</a>
+# The default value is: shape=box,height=0.2,width=0.4.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
+
+# You can set the path where dot can find font specified with fontname in
+# DOT_COMMON_ATTR and others dot attributes.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTPATH           =
 
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# If the CLASS_GRAPH tag is set to YES or GRAPH or BUILTIN then Doxygen will
+# generate a graph for each documented class showing the direct and indirect
+# inheritance relations. In case the CLASS_GRAPH tag is set to YES or GRAPH and
+# HAVE_DOT is enabled as well, then dot will be used to draw the graph. In case
+# the CLASS_GRAPH tag is set to YES and HAVE_DOT is disabled or if the
+# CLASS_GRAPH tag is set to BUILTIN, then the built-in generator will be used.
+# If the CLASS_GRAPH tag is set to TEXT the direct and indirect inheritance
+# relations will be shown as texts / links. Explicit enabling an inheritance
+# graph or choosing a different representation for an inheritance graph of a
+# specific class, can be accomplished by means of the command \inheritancegraph.
+# Disabling an inheritance graph can be accomplished by means of the command
+# \hideinheritancegraph.
+# Possible values are: NO, YES, TEXT, GRAPH and BUILTIN.
 # The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
 
 CLASS_GRAPH            = YES
 
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# If the COLLABORATION_GRAPH tag is set to YES then Doxygen will generate a
 # graph for each documented class showing the direct and indirect implementation
 # dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
+# class with other documented classes. Explicit enabling a collaboration graph,
+# when COLLABORATION_GRAPH is set to NO, can be accomplished by means of the
+# command \collaborationgraph. Disabling a collaboration graph can be
+# accomplished by means of the command \hidecollaborationgraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 COLLABORATION_GRAPH    = YES
 
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
+# If the GROUP_GRAPHS tag is set to YES then Doxygen will generate a graph for
+# groups, showing the direct groups dependencies. Explicit enabling a group
+# dependency graph, when GROUP_GRAPHS is set to NO, can be accomplished by means
+# of the command \groupgraph. Disabling a directory graph can be accomplished by
+# means of the command \hidegroupgraph. See also the chapter Grouping in the
+# manual.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 GROUP_GRAPHS           = YES
 
-# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# If the UML_LOOK tag is set to YES, Doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
 # The default value is: NO.
@@ -2378,10 +2647,10 @@ UML_LOOK               = NO
 
 UML_LIMIT_NUM_FIELDS   = 10
 
-# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
+# If the DOT_UML_DETAILS tag is set to NO, Doxygen will show attributes and
 # methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
-# tag is set to YES, doxygen will add type and arguments for attributes and
-# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
+# tag is set to YES, Doxygen will add type and arguments for attributes and
+# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, Doxygen
 # will not generate fields with class member information in the UML graphs. The
 # class diagrams will look similar to the default class diagrams but using UML
 # notation for the relationships.
@@ -2393,8 +2662,8 @@ DOT_UML_DETAILS        = NO
 
 # The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
 # to display on a single line. If the actual line length exceeds this threshold
-# significantly it will wrapped across multiple lines. Some heuristics are apply
-# to avoid ugly line breaks.
+# significantly it will be wrapped across multiple lines. Some heuristics are
+# applied to avoid ugly line breaks.
 # Minimum value: 0, maximum value: 1000, default value: 17.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2409,24 +2678,29 @@ DOT_WRAP_THRESHOLD     = 17
 TEMPLATE_RELATIONS     = NO
 
 # If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
+# YES then Doxygen will generate a graph for each documented file showing the
 # direct and indirect include dependencies of the file with other documented
-# files.
+# files. Explicit enabling an include graph, when INCLUDE_GRAPH is is set to NO,
+# can be accomplished by means of the command \includegraph. Disabling an
+# include graph can be accomplished by means of the command \hideincludegraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDE_GRAPH          = YES
 
 # If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
+# set to YES then Doxygen will generate a graph for each documented file showing
 # the direct and indirect include dependencies of the file with other documented
-# files.
+# files. Explicit enabling an included by graph, when INCLUDED_BY_GRAPH is set
+# to NO, can be accomplished by means of the command \includedbygraph. Disabling
+# an included by graph can be accomplished by means of the command
+# \hideincludedbygraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# If the CALL_GRAPH tag is set to YES then Doxygen will generate a call
 # dependency graph for every global function or class method.
 #
 # Note that enabling this option will significantly increase the time of a run.
@@ -2438,7 +2712,7 @@ INCLUDED_BY_GRAPH      = YES
 
 CALL_GRAPH             = YES
 
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# If the CALLER_GRAPH tag is set to YES then Doxygen will generate a caller
 # dependency graph for every global function or class method.
 #
 # Note that enabling this option will significantly increase the time of a run.
@@ -2450,26 +2724,36 @@ CALL_GRAPH             = YES
 
 CALLER_GRAPH           = YES
 
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# If the GRAPHICAL_HIERARCHY tag is set to YES then Doxygen will graphical
 # hierarchy of all classes instead of a textual one.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 GRAPHICAL_HIERARCHY    = YES
 
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# If the DIRECTORY_GRAPH tag is set to YES then Doxygen will show the
 # dependencies a directory has on other directories in a graphical way. The
 # dependency relations are determined by the #include relations between the
-# files in the directories.
+# files in the directories. Explicit enabling a directory graph, when
+# DIRECTORY_GRAPH is set to NO, can be accomplished by means of the command
+# \directorygraph. Disabling a directory graph can be accomplished by means of
+# the command \hidedirectorygraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 DIRECTORY_GRAPH        = YES
 
+# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels
+# of child directories generated in directory dependency graphs by dot.
+# Minimum value: 1, maximum value: 25, default value: 1.
+# This tag requires that the tag DIRECTORY_GRAPH is set to YES.
+
+DIR_GRAPH_MAX_DEPTH    = 1
+
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
 # generated by dot. For an explanation of the image formats see the section
 # output formats in the documentation of the dot tool (Graphviz (see:
-# http://www.graphviz.org/)).
+# https://www.graphviz.org/)).
 # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
 # to make the SVG files visible in IE 9+ (other browsers do not have this
 # requirement).
@@ -2506,11 +2790,12 @@ DOT_PATH               =
 
 DOTFILE_DIRS           =
 
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
+# You can include diagrams made with dia in Doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
 
-MSCFILE_DIRS           =
+DIA_PATH               =
 
 # The DIAFILE_DIRS tag can be used to specify one or more directories that
 # contain dia files that are included in the documentation (see the \diafile
@@ -2518,35 +2803,35 @@ MSCFILE_DIRS           =
 
 DIAFILE_DIRS           =
 
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
+# When using PlantUML, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file or to the filename of jar file
+# to be used. If left blank, it is assumed PlantUML is not used or called during
+# a preprocessing step. Doxygen will generate a warning when it encounters a
+# \startuml command in this case and will not generate output for the diagram.
 
 PLANTUML_JAR_PATH      =
 
-# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
-# configuration file for plantuml.
+# When using PlantUML, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for PlantUML.
 
 PLANTUML_CFG_FILE      =
 
-# When using plantuml, the specified paths are searched for files specified by
-# the !include statement in a plantuml block.
+# When using PlantUML, the specified paths are searched for files specified by
+# the !include statement in a PlantUML block.
 
 PLANTUML_INCLUDE_PATH  =
 
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
 # that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
+# larger than this value, Doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that if the number of direct
 # children of the root node in a graph is already larger than
 # DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
 # the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 # Minimum value: 0, maximum value: 10000, default value: 50.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_GRAPH_MAX_NODES    = 50
+DOT_GRAPH_MAX_NODES    = 200
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
 # generated by dot. A depth value of 3 means that only nodes reachable from the
@@ -2560,18 +2845,6 @@ DOT_GRAPH_MAX_NODES    = 50
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
 # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
 # makes dot run faster, but since only newer versions of dot (>1.8.10) support
@@ -2581,19 +2854,37 @@ DOT_TRANSPARENT        = NO
 
 DOT_MULTI_TARGETS      = NO
 
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# If the GENERATE_LEGEND tag is set to YES Doxygen will generate a legend page
 # explaining the meaning of the various boxes and arrows in the dot generated
 # graphs.
+# Note: This tag requires that UML_LOOK isn't set, i.e. the Doxygen internal
+# graphical representation for inheritance and collaboration diagrams is used.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
+# If the DOT_CLEANUP tag is set to YES, Doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
+
+# You can define message sequence charts within Doxygen comments using the \msc
+# command. If the MSCGEN_TOOL tag is left empty (the default), then Doxygen will
+# use a built-in version of mscgen tool to produce the charts. Alternatively,
+# the MSCGEN_TOOL tag can also specify the name an external tool. For instance,
+# specifying prog as the value, Doxygen will call the tool as prog -T
+# <outfile_format> -o <outputfile> <inputfile>. The external tool should support
+# output file formats "png", "eps", "svg", and "ismap".
+
+MSCGEN_TOOL            =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
diff --git a/DOCS/Doxyfile_man b/DOCS/Doxyfile_man
deleted file mode 100644
index 191e4aa4ee..0000000000
--- a/DOCS/Doxyfile_man
+++ /dev/null
@@ -1,2578 +0,0 @@
-# Doxyfile 1.9.1
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the configuration
-# file that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = LAPACK
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         = 3.10.0
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          = "LAPACK: Linear Algebra PACKage"
-
-# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
-# in the documentation. The maximum height of the logo should not exceed 55
-# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
-# the logo to the output directory.
-
-PROJECT_LOGO           = DOCS/lapack.png
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = DOCS
-
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
-# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = NO
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
-# such as
-# /***************
-# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
-# Javadoc-style will behave just like regular comments and it will not be
-# interpreted by doxygen.
-# The default value is: NO.
-
-JAVADOC_BANNER         = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# By default Python docstrings are displayed as preformatted text and doxygen's
-# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
-# doxygen's special commands can be used and the contents of the docstring
-# documentation blocks is shown as doxygen documentation.
-# The default value is: YES.
-
-PYTHON_DOCSTRING       = YES
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
-# page for each member. If set to NO, the documentation of a member will be part
-# of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 8
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
-
-ALIASES                =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = YES
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
-# sources only. Doxygen will then generate output that is more tailored for that
-# language. For instance, namespaces will be presented as modules, types will be
-# separated into more groups, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_SLICE  = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
-# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
-# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files). For instance to make doxygen treat .inc files
-# as Fortran files (default is PHP), and .f files as C (default is Fortran),
-# use: inc=Fortran f=C.
-#
-# Note: For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen. When specifying no_extension you should add
-# * to the FILE_PATTERNS.
-#
-# Note see also the list of default file extension mappings.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See https://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
-# to that level are automatically included in the table of contents, even if
-# they do not have an id attribute.
-# Note: This feature currently applies only to Markdown headings.
-# Minimum value: 0, maximum value: 99, default value: 5.
-# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
-
-TOC_INCLUDE_HEADINGS   = 5
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = YES
-
-# If one adds a struct or class to a group and this option is enabled, then also
-# any nested class or struct is added to the same group. By default this option
-# is disabled and one has to add nested compounds explicitly via \ingroup.
-# The default value is: NO.
-
-GROUP_NESTED_COMPOUNDS = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
-# during processing. When set to 0 doxygen will based this on the number of
-# cores available in the system. You can set it explicitly to a value larger
-# than 0 to get more control over the balance between CPU load and processing
-# speed. At this moment only the input processing can be done using multiple
-# threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
-# encounter. Generating dot graphs in parallel is controlled by the
-# DOT_NUM_THREADS setting.
-# Minimum value: 0, maximum value: 32, default value: 1.
-
-NUM_PROC_THREADS       = 1
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
-# methods of a class will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIV_VIRTUAL   = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO,
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. If set to YES, local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO, only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If this flag is set to YES, the name of an unnamed parameter in a declaration
-# will be determined by the corresponding definition. By default unnamed
-# parameters remain unnamed in the output.
-# The default value is: YES.
-
-RESOLVE_UNNAMED_PARAMS = YES
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# declarations. If set to NO, these declarations will be included in the
-# documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO, these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
-# able to match the capabilities of the underlying filesystem. In case the
-# filesystem is case sensitive (i.e. it supports files in the same directory
-# whose names only differ in casing), the option must be set to YES to properly
-# deal with such files in case they appear in the input. For filesystems that
-# are not case sensitive the option should be be set to NO to properly deal with
-# output files written for symbols that only differ in casing, such as for two
-# classes, one named CLASS and the other named Class, and to also support
-# references to files without having to specify the exact matching casing. On
-# Windows (including Cygwin) and MacOS, users should typically set this option
-# to NO, whereas on Linux or other Unix flavors it should typically be set to
-# YES.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES, the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
-# append additional text to a page's title, such as Class Reference. If set to
-# YES the compound reference will be hidden.
-# The default value is: NO.
-
-HIDE_COMPOUND_REFERENCE= NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
-# list. This list is created by putting \todo commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
-# list. This list is created by putting \test commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES, the
-# list will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. See also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = NO
-
-# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
-# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
-# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
-# at the end of the doxygen process doxygen will return with a non-zero status.
-# Possible values are: NO, YES and FAIL_ON_WARNINGS.
-# The default value is: NO.
-
-WARN_AS_ERROR          = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           = output_err
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = . \
-                         DOCS/groups-usr.dox
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see:
-# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# read by doxygen.
-#
-# Note the list of default checked file patterns might differ from the list of
-# default file extension mappings.
-#
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
-
-FILE_PATTERNS          = *.c \
-                         *.f \
-                         *.h
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                = CMAKE \
-                         DOCS \
-                         BLAS/TESTING \
-                         CBLAS \
-                         LAPACKE/mangling \
-                         INSTALL \
-                         SRC/DEPRECATED \
-                         TESTING
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       = *.py \
-                         *.txt \
-                         *.in \
-                         *.inc \
-                         Makefile
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE =
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# entity all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see https://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = YES
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = NO
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = explore-html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefore more robust against future updates.
-# Doxygen will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = YES
-
-# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
-# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via JavaScript. If disabled, the navigation index will
-# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have JavaScript,
-# like the Qt help browser.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_MENUS     = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see:
-# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
-# create a documentation set, doxygen will generate a Makefile in the HTML
-# output directory. Running make will produce the docset in that directory and
-# running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
-# genXcode/_index.html for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler (hhc.exe). If non-empty,
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the main .chm file (NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated
-# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location (absolute path
-# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
-# run qhelpgenerator on the generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = YES
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
-# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
-# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
-# the HTML output. These images will generally look nicer at scaled resolutions.
-# Possible values are: png (the default) and svg (looks nicer but requires the
-# pdf2svg or inkscape tool).
-# The default value is: png.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FORMULA_FORMAT    = png
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
-# to create new LaTeX commands to be used in formulas as building blocks. See
-# the section "Including formulas" for details.
-
-FORMULA_MACROFILE      =
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side JavaScript for the rendering
-# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using JavaScript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see:
-# https://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see:
-# https://xapian.org/). See the section "External Indexing and Searching" for
-# details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when not enabling USE_PDFLATEX the default is latex when enabling
-# USE_PDFLATEX the default is pdflatex and when in the later case latex is
-# chosen this is overwritten by pdflatex. For specific output languages the
-# default can have been set differently, this depends on the implementation of
-# the output language.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# Note: This tag is used in the Makefile / make.bat.
-# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
-# (.tex).
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
-# generate index for LaTeX. In case there is no backslash (\) as first character
-# it will be automatically added in the LaTeX code.
-# Note: This tag is used in the generated output file (.tex).
-# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
-# The default value is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_MAKEINDEX_CMD    = makeindex
-
-# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. The package can be specified just
-# by its name or with the correct syntax as to be used with the LaTeX
-# \usepackage command. To get the times font for instance you can specify :
-# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
-# To use the option intlimits with the amsmath package you can specify:
-# EXTRA_PACKAGES=[intlimits]{amsmath}
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
-# LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# LaTeX style sheets that are included after the standard style sheets created
-# by doxygen. Using this option one can overrule certain style aspects. Doxygen
-# will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_STYLESHEET =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
-# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
-# files. Set this option to YES, to get a higher quality PDF documentation.
-#
-# See also section LATEX_CMD_NAME for selecting the engine.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_TIMESTAMP        = NO
-
-# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
-# path from which the emoji images will be read. If a relative path is entered,
-# it will be relative to the LATEX_OUTPUT directory. If left blank the
-# LATEX_OUTPUT directory will be used.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EMOJI_DIRECTORY  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = YES
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# configuration file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's configuration file. A template extensions file can be
-# generated using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = YES
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
-# namespace members in file scope as well, matching the HTML output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_NS_MEMB_FILE_SCOPE = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
-# the structure of the code including all documentation. Note that this feature
-# is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO, the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
-# in the source code. If set to NO, only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES, the include files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = NO
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT               = NO
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = NO
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = NO
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = NO
-
-# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag UML_LOOK is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
-# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
-# tag is set to YES, doxygen will add type and arguments for attributes and
-# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
-# will not generate fields with class member information in the UML graphs. The
-# class diagrams will look similar to the default class diagrams but using UML
-# notation for the relationships.
-# Possible values are: NO, YES and NONE.
-# The default value is: NO.
-# This tag requires that the tag UML_LOOK is set to YES.
-
-DOT_UML_DETAILS        = NO
-
-# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
-# to display on a single line. If the actual line length exceeds this threshold
-# significantly it will wrapped across multiple lines. Some heuristics are apply
-# to avoid ugly line breaks.
-# Minimum value: 0, maximum value: 1000, default value: 17.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_WRAP_THRESHOLD     = 17
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = NO
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = NO
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command. Disabling a call graph can be
-# accomplished by means of the command \hidecallgraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command. Disabling a caller graph can be
-# accomplished by means of the command \hidecallergraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = NO
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = NO
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. For an explanation of the image formats see the section
-# output formats in the documentation of the dot tool (Graphviz (see:
-# http://www.graphviz.org/)).
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
-# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
-# png:gdiplus:gdiplus.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = svg
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
-
-PLANTUML_JAR_PATH      =
-
-# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
-# configuration file for plantuml.
-
-PLANTUML_CFG_FILE      =
-
-# When using plantuml, the specified paths are searched for files specified by
-# the !include statement in a plantuml block.
-
-PLANTUML_INCLUDE_PATH  =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = NO
-
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
-# files that are used to generate the various graphs.
-#
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
-# The default value is: YES.
-
-DOT_CLEANUP            = YES
diff --git a/DOCS/DoxygenLayout.xml b/DOCS/DoxygenLayout.xml
new file mode 100644
index 0000000000..c1f55bf50f
--- /dev/null
+++ b/DOCS/DoxygenLayout.xml
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doxygenlayout version="1.0">
+  <!-- Generated by doxygen 1.12.0 -->
+  <!-- Navigation index tabs for HTML output -->
+  <navindex>
+    <tab type="mainpage" visible="yes" title=""/>
+    <tab type="pages" visible="yes" title="" intro=""/>
+
+    <!-- LAPACK: change "Topics" to "Routines" -->
+    <tab type="topics" visible="yes" title="Routines" intro=""/>
+
+    <tab type="modules" visible="yes" title="" intro="">
+      <tab type="modulelist" visible="yes" title="" intro=""/>
+      <tab type="modulemembers" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="namespaces" visible="yes" title="">
+      <tab type="namespacelist" visible="yes" title="" intro=""/>
+      <tab type="namespacemembers" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="concepts" visible="yes" title="">
+    </tab>
+    <tab type="interfaces" visible="yes" title="">
+      <tab type="interfacelist" visible="yes" title="" intro=""/>
+      <tab type="interfaceindex" visible="$ALPHABETICAL_INDEX" title=""/>
+      <tab type="interfacehierarchy" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="classes" visible="yes" title="">
+      <tab type="classlist" visible="yes" title="" intro=""/>
+      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
+      <tab type="hierarchy" visible="yes" title="" intro=""/>
+      <tab type="classmembers" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="structs" visible="yes" title="">
+      <tab type="structlist" visible="yes" title="" intro=""/>
+      <tab type="structindex" visible="$ALPHABETICAL_INDEX" title=""/>
+    </tab>
+    <tab type="exceptions" visible="yes" title="">
+      <tab type="exceptionlist" visible="yes" title="" intro=""/>
+      <tab type="exceptionindex" visible="$ALPHABETICAL_INDEX" title=""/>
+      <tab type="exceptionhierarchy" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="files" visible="yes" title="">
+      <tab type="filelist" visible="yes" title="" intro=""/>
+      <tab type="globals" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="examples" visible="yes" title="" intro=""/>
+  </navindex>
+
+  <!-- Layout definition for a class page -->
+  <class>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_HEADERFILE"/>
+    <inheritancegraph visible="yes"/>
+    <collaborationgraph visible="yes"/>
+    <memberdecl>
+      <nestedclasses visible="yes" title=""/>
+      <publictypes title=""/>
+      <services title=""/>
+      <interfaces title=""/>
+      <publicslots title=""/>
+      <signals title=""/>
+      <publicmethods title=""/>
+      <publicstaticmethods title=""/>
+      <publicattributes title=""/>
+      <publicstaticattributes title=""/>
+      <protectedtypes title=""/>
+      <protectedslots title=""/>
+      <protectedmethods title=""/>
+      <protectedstaticmethods title=""/>
+      <protectedattributes title=""/>
+      <protectedstaticattributes title=""/>
+      <packagetypes title=""/>
+      <packagemethods title=""/>
+      <packagestaticmethods title=""/>
+      <packageattributes title=""/>
+      <packagestaticattributes title=""/>
+      <properties title=""/>
+      <events title=""/>
+      <privatetypes title=""/>
+      <privateslots title=""/>
+      <privatemethods title=""/>
+      <privatestaticmethods title=""/>
+      <privateattributes title=""/>
+      <privatestaticattributes title=""/>
+      <friends title=""/>
+      <related title="" subtitle=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <services title=""/>
+      <interfaces title=""/>
+      <constructors title=""/>
+      <functions title=""/>
+      <related title=""/>
+      <variables title=""/>
+      <properties title=""/>
+      <events title=""/>
+    </memberdef>
+    <allmemberslink visible="yes"/>
+    <usedfiles visible="$SHOW_USED_FILES"/>
+    <authorsection visible="yes"/>
+  </class>
+
+  <!-- Layout definition for a namespace page -->
+  <namespace>
+    <briefdescription visible="yes"/>
+    <memberdecl>
+      <nestednamespaces visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <interfaces visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <concepts visible="yes" title=""/>
+      <structs visible="yes" title=""/>
+      <exceptions visible="yes" title=""/>
+      <typedefs title=""/>
+      <sequences title=""/>
+      <dictionaries title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <properties title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <sequences title=""/>
+      <dictionaries title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <properties title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </namespace>
+
+  <!-- Layout definition for a concept page -->
+  <concept>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_HEADERFILE"/>
+    <definition visible="yes" title=""/>
+    <detaileddescription title=""/>
+    <authorsection visible="yes"/>
+  </concept>
+
+  <!-- Layout definition for a file page -->
+  <file>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <includegraph visible="yes"/>
+    <includedbygraph visible="yes"/>
+    <sourcelink visible="yes"/>
+    <memberdecl>
+      <interfaces visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <structs visible="yes" title=""/>
+      <exceptions visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <concepts visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <sequences title=""/>
+      <dictionaries title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <properties title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <sequences title=""/>
+      <dictionaries title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <properties title=""/>
+    </memberdef>
+    <authorsection/>
+  </file>
+
+  <!-- Layout definition for a group page -->
+  <group>
+    <briefdescription visible="yes"/>
+    <groupgraph visible="yes"/>
+    <memberdecl>
+      <nestedgroups visible="yes" title=""/>
+      <modules visible="yes" title=""/>
+      <dirs visible="yes" title=""/>
+      <files visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <concepts visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <sequences title=""/>
+      <dictionaries title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <pagedocs/>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <sequences title=""/>
+      <dictionaries title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </group>
+
+  <!-- Layout definition for a C++20 module page -->
+  <module>
+    <briefdescription visible="yes"/>
+    <exportedmodules visible="yes"/>
+    <memberdecl>
+      <concepts visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <enums title=""/>
+      <typedefs title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups title=""/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdecl>
+      <files visible="yes"/>
+    </memberdecl>
+  </module>
+
+  <!-- Layout definition for a directory page -->
+  <directory>
+    <briefdescription visible="yes"/>
+    <directorygraph visible="yes"/>
+    <memberdecl>
+      <dirs visible="yes"/>
+      <files visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+  </directory>
+</doxygenlayout>
diff --git a/DOCS/groups-usr.dox b/DOCS/groups-usr.dox
index 6c31e4cf5f..138ad41b4d 100644
--- a/DOCS/groups-usr.dox
+++ b/DOCS/groups-usr.dox
@@ -1,605 +1,976 @@
 /**
- *
- ****
- *
- * @defgroup lapack LAPACK
- *   This is the group of LAPACK routines.
- *
- * @defgroup GE  General Matrices
- *   @ingroup lapack
- *   This is the group of General Matrices routines
- * @defgroup GB  General Band Matrix
- *   @ingroup lapack
- *   This is the group of General Band routines
- * @defgroup SY  Symmetric Matrix
- *   @ingroup lapack
- *   This is the group of Symmetric Matrix routines
- * @defgroup HE  Hermitian Matrix
- *   @ingroup lapack
- *   This is the group of Hermitian Matrix routines
- * @defgroup PO  Positive Definite Matrix
- *   @ingroup lapack
- *   This is the group of Positive Definite routines
- * @defgroup GT  General tridiagonal Matrix
- *   @ingroup lapack
- *   This is the group of General tridiagonal routines
- * @defgroup PT  Positive Definite tridiagonal Matrix
- *   @ingroup lapack
- *   This is the group of Positive Definite tridiagonal routines
- * @defgroup OTHEReigen  Eigenvalue
- *   @ingroup lapack
- *   This is the group of Other Eigenvalue routines
- * @defgroup OTHERauxiliary  Other Auxiliary Routines
- *   @ingroup lapack
- *   This is the group of Other Auxiliary routines
- * @defgroup OTHERcomputational  Other Computational Routines
- *   @ingroup lapack
- *   This is the group of Other Computational routines
- * @defgroup OTHERsolve  Other Solve Routines
- *   @ingroup lapack
- *   This is the group of Other Solve routines
- *
- ****
- *
- * @defgroup solveGE  Linear Solve
- *   @ingroup GE
- *   This is the group of Linear Solve Driver routines
- * @defgroup solveGB  Linear Solve
- *   @ingroup GB
- *   This is the group of Linear Solve Driver routines
- * @defgroup solveSY  Linear Solve
- *   @ingroup SY
- *   This is the group of Linear Solve Driver routines
- * @defgroup solveHE  Linear Solve
- *   @ingroup HE
- *   This is the group of Linear Solve Driver routines
- * @defgroup solvePO  Linear Solve
- *   @ingroup PO
- *   This is the group of Linear Solve Driver routines
- * @defgroup solveGT  Linear Solve
- *   @ingroup GT
- *   This is the group of Linear Solve Driver routines
- * @defgroup solvePT  Linear Solve
- *   @ingroup PT
- *   This is the group of Linear Solve Driver routines
- * @defgroup eigenGE  Eigenvalue
- *   @ingroup GE
- *   This is the group of Eigenvalue Driver routines
- * @defgroup eigenSY  Eigenvalue
- *   @ingroup SY
- *   This is the group of Eigenvalue Driver routines
- * @defgroup eigenHE  Eigenvalue
- *   @ingroup HE
- *   This is the group of Eigenvalue Driver routines
- * @defgroup singGE  Singular Value
- *   @ingroup GE
- *   This is the group of Singular Value Driver routines
- * @defgroup computationalGE  Computational routines
- *   @ingroup GE
- *   This is the group of Computational routines
- * @defgroup variantsGEcomputational  Variants Computational routines
- *   @ingroup GE
- *   This is the group of Variants Computational routines
- * @defgroup computationalGB  Computational routines
- *   @ingroup GB
- *   This is the group of Computational routines
- * @defgroup computationalSY  Computational routines
- *   @ingroup SY
- *   This is the group of Computational routines
- * @defgroup computationalHE  Computational routines
- *   @ingroup HE
- *   This is the group of Computational routines
- * @defgroup computationalPO  Computational routines
- *   @ingroup PO
- *   This is the group of Computational routines
- * @defgroup variantsPOcomputational  Variants Computational routines
- *   @ingroup PO
- *   This is the group of Variants Computational routines
- * @defgroup computationalGT  Computational routines
- *   @ingroup GT
- *   This is the group of Computational routines
- * @defgroup computationalPT  Computational routines
- *   @ingroup PT
- *   This is the group of Computational routines
- * @defgroup variantsOTHERcomputational  Variants Computational routines
- *   @ingroup OTHERcomputational
- *   This is the group of Variants Computational routines
- * @defgroup auxiliaryGE  Auxiliary routines
- *   @ingroup GE
- *   This is the group of Auxiliary routines
- * @defgroup auxiliaryGB  Auxiliary routines
- *   @ingroup GB
- *   This is the group of Auxiliary routines
- * @defgroup auxiliarySY  Auxiliary routines
- *   @ingroup SY
- *   This is the group of Auxiliary routines
- * @defgroup auxiliaryHE  Auxiliary routines
- *   @ingroup HE
- *   This is the group of Auxiliary routines
- * @defgroup auxiliaryPO  Auxiliary routines
- *   @ingroup PO
- *   This is the group of Auxiliary routines
- * @defgroup auxiliaryGT  Auxiliary routines
- *   @ingroup GT
- *   This is the group of Auxiliary routines
- * @defgroup auxiliaryPT  Auxiliary routines
- *   @ingroup PT
- *   This is the group of Auxiliary routines
- *
- ****
- *
- * @defgroup doubleGEsolve double
- *   @ingroup solveGE
- *   This is the group of double solve driver functions for GE matrices
- * @defgroup doublePOsolve double
- *   @ingroup solvePO
- *   This is the group of double solve driver functions for PO matrices
- * @defgroup doubleSYsolve double
- *   @ingroup solveSY
- *   This is the group of double solve driver functions for SY matrices
- * @defgroup doubleGBsolve double
- *   @ingroup solveGB
- *   This is the group of double solve driver functions for GB matrices
- * @defgroup doubleGTsolve double
- *   @ingroup solveGT
- *   This is the group of double solve driver functions for GT matrices
- * @defgroup doublePTsolve double
- *   @ingroup solvePT
- *   This is the group of double solve driver functions for PT matrices
- * @defgroup doubleGEeigen double
- *   @ingroup eigenGE
- *   This is the group of double eigenvalue driver functions for GE matrices
- * @defgroup doubleSYeigen double
- *   @ingroup eigenSY
- *   This is the group of double eigenvalue driver functions for SY matrices
- * @defgroup doubleGEsing double
- *   @ingroup singGE
- *   This is the group of double singular value driver functions for GE matrices
- * @defgroup doubleGEcomputational double
- *   @ingroup computationalGE
- *   This is the group of double computational functions for GE matrices
- * @defgroup doublePOcomputational double
- *   @ingroup computationalPO
- *   This is the group of double computational functions for PO matrices
- * @defgroup doubleSYcomputational double
- *   @ingroup computationalSY
- *   This is the group of double computational functions for SY matrices
- * @defgroup doubleGBcomputational double
- *   @ingroup computationalGB
- *   This is the group of double computational functions for GB matrices
- * @defgroup doubleGTcomputational double
- *   @ingroup computationalGT
- *   This is the group of double computational functions for GT matrices
- * @defgroup doublePTcomputational double
- *   @ingroup computationalPT
- *   This is the group of double computational functions for PT matrices
- * @defgroup doubleGEauxiliary double
- *   @ingroup auxiliaryGE
- *   This is the group of double auxiliary functions for GE matrices
- * @defgroup doublePOauxiliary double
- *   @ingroup auxiliaryPO
- *   This is the group of double auxiliary functions for PO matrices
- * @defgroup doubleSYauxiliary double
- *   @ingroup auxiliarySY
- *   This is the group of double auxiliary functions for SY matrices
- * @defgroup doubleGBauxiliary double
- *   @ingroup auxiliaryGB
- *   This is the group of double auxiliary functions for GB matrices
- * @defgroup doublePTauxiliary double
- *   @ingroup auxiliaryPT
- *   This is the group of double auxiliary functions for PT matrices
- * @defgroup doubleGTauxiliary double
- *   @ingroup auxiliaryGT
- *   This is the group of double auxiliary functions for GT matrices
- * @defgroup doubleOTHERauxiliary  double
- *   @ingroup OTHERauxiliary
- *   This is the group of double other auxiliary routines
- * @defgroup doubleOTHERcomputational  double
- *   @ingroup OTHERcomputational
- *   This is the group of double other Computational routines
- * @defgroup doubleOTHERsolve  double Other Solve Routines
- *   @ingroup OTHERsolve
- *   This is the group of double Other Solve routines
- * @defgroup doubleOTHEReigen  double
- *   @ingroup OTHEReigen
- *   This is the group of double Other Eigenvalue routines
- *
- ****
- *
- * @defgroup realGEsolve real
- *   @ingroup solveGE
- *   This is the group of real solve driver functions for GE matrices
- * @defgroup realPOsolve real
- *   @ingroup solvePO
- *   This is the group of real solve driver functions for PO matrices
- * @defgroup realSYsolve real
- *   @ingroup solveSY
- *   This is the group of real solve driver functions for SY matrices
- * @defgroup realGBsolve real
- *   @ingroup solveGB
- *   This is the group of real solve driver functions for GB matrices
- * @defgroup realGTsolve real
- *   @ingroup solveGT
- *   This is the group of real solve driver functions for GT matrices
- * @defgroup realPTsolve real
- *   @ingroup solvePT
- *   This is the group of real solve driver functions for PT matrices
- * @defgroup realGEeigen real
- *   @ingroup eigenGE
- *   This is the group of real eigenvalue driver functions for GE matrices
- * @defgroup realSYeigen real
- *   @ingroup eigenSY
- *   This is the group of real eigenvalue driver functions for SY matrices
- * @defgroup realGEsing real
- *   @ingroup singGE
- *   This is the group of real singular value driver functions for GE matrices
- * @defgroup realGEcomputational real
- *   @ingroup computationalGE
- *   This is the group of real computational functions for GE matrices
- * @defgroup realPOcomputational real
- *   @ingroup computationalPO
- *   This is the group of real computational functions for PO matrices
- * @defgroup realSYcomputational real
- *   @ingroup computationalSY
- *   This is the group of real computational functions for SY matrices
- * @defgroup realGBcomputational real
- *   @ingroup computationalGB
- *   This is the group of real computational functions for GB matrices
- * @defgroup realPTcomputational real
- *   @ingroup computationalPT
- *   This is the group of real computational functions for PT matrices
- * @defgroup realGTcomputational real
- *   @ingroup computationalGT
- *   This is the group of real computational functions for GT matrices
- * @defgroup realGEauxiliary real
- *   @ingroup auxiliaryGE
- *   This is the group of real auxiliary functions for GE matrices
- * @defgroup realPOauxiliary real
- *   @ingroup auxiliaryPO
- *   This is the group of real auxiliary functions for PO matrices
- * @defgroup realSYauxiliary real
- *   @ingroup auxiliarySY
- *   This is the group of real auxiliary functions for SY matrices
- * @defgroup realGBauxiliary real
- *   @ingroup auxiliaryGB
- *   This is the group of real auxiliary functions for GB matrices
- * @defgroup realGTauxiliary real
- *   @ingroup auxiliaryGT
- *   This is the group of real auxiliary functions for GT matrices
- * @defgroup realPTauxiliary real
- *   @ingroup auxiliaryPT
- *   This is the group of real auxiliary functions for PT matrices
- * @defgroup realOTHERauxiliary  real
- *   @ingroup OTHERauxiliary
- *   This is the group of real other auxiliary routines
- * @defgroup realOTHERcomputational  real
- *   @ingroup OTHERcomputational
- *   This is the group of real other Computational routines
- * @defgroup realOTHERsolve  real Other Solve Routines
- *   @ingroup OTHERsolve
- *   This is the group of real Other Solve routines
- * @defgroup realOTHEReigen  real
- *   @ingroup OTHEReigen
- *   This is the group of real Other Eigenvalue routines
- *
- ****
- *
- * @defgroup complexGEsolve complex
- *   @ingroup solveGE
- *   This is the group of complex solve driver functions for GE matrices
- * @defgroup complexPOsolve complex
- *   @ingroup solvePO
- *   This is the group of complex solve driver functions for PO matrices
- * @defgroup complexSYsolve complex
- *   @ingroup solveSY
- *   This is the group of complex solve driver functions for SY matrices
- * @defgroup complexHEsolve complex
- *   @ingroup solveHE
- *   This is the group of complex solve driver functions for HE matrices
- * @defgroup complexGBsolve complex
- *   @ingroup solveGB
- *   This is the group of complex solve driver functions for GB matrices
- * @defgroup complexGTsolve complex
- *   @ingroup solveGT
- *   This is the group of complex solve driver functions for GT matrices
- * @defgroup complexPTsolve complex
- *   @ingroup solvePT
- *   This is the group of complex solve driver functions for PT matrices
- * @defgroup complexGEeigen complex
- *   @ingroup eigenGE
- *   This is the group of complex eigenvalue driver functions for GE matrices
- * @defgroup complexSYeigen complex
- *   @ingroup eigenSY
- *   This is the group of complex eigenvalue driver functions for SY matrices
- * @defgroup complexHEeigen complex
- *   @ingroup eigenHE
- *   This is the group of complex eigenvalue driver functions for HE matrices
- * @defgroup complexGEsing complex
- *   @ingroup singGE
- *   This is the group of complex singular value driver functions for GE matrices
- * @defgroup complexGEcomputational complex
- *   @ingroup computationalGE
- *   This is the group of complex computational functions for GE matrices
- * @defgroup complexPOcomputational complex
- *   @ingroup computationalPO
- *   This is the group of complex computational functions for PO matrices
- * @defgroup complexSYcomputational complex
- *   @ingroup computationalSY
- *   This is the group of complex computational functions for SY matrices
- * @defgroup complexHEcomputational complex
- *   @ingroup computationalHE
- *   This is the group of complex computational functions for HE matrices
- * @defgroup complexGBcomputational complex
- *   @ingroup computationalGB
- *   This is the group of complex computational functions for GB matrices
- * @defgroup complexGTcomputational complex
- *   @ingroup computationalGT
- *   This is the group of complex computational functions for GT matrices
- * @defgroup complexPTcomputational complex
- *   @ingroup computationalPT
- *   This is the group of complex computational functions for PT matrices
- * @defgroup complexGEauxiliary complex
- *   @ingroup auxiliaryGE
- *   This is the group of complex auxiliary functions for GE matrices
- * @defgroup complexPOauxiliary complex
- *   @ingroup auxiliaryPO
- *   This is the group of complex auxiliary functions for PO matrices
- * @defgroup complexSYauxiliary complex
- *   @ingroup auxiliarySY
- *   This is the group of complex auxiliary functions for SY matrices
- * @defgroup complexHEauxiliary complex
- *   @ingroup auxiliaryHE
- *   This is the group of complex auxiliary functions for HE matrices
- * @defgroup complexGBauxiliary complex
- *   @ingroup auxiliaryGB
- *   This is the group of complex auxiliary functions for GB matrices
- * @defgroup complexOTHERauxiliary  complex
- *   @ingroup OTHERauxiliary
- *   This is the group of complex other auxiliary routines
- * @defgroup complexOTHERcomputational  complex
- *   @ingroup OTHERcomputational
- *   This is the group of complex other Computational routines
- * @defgroup complexOTHERsolve  complex Other Solve Routines
- *   @ingroup OTHERsolve
- *   This is the group of complex Other Solve routines
- * @defgroup complexOTHEReigen  complex Other Eigenvalue routines
- *   @ingroup OTHEReigen
- *   This is the group of complex Other Eigenvalue routines
- *
- ****
- *
- * @defgroup complex16GEsolve complex16
- *   @ingroup solveGE
- *   This is the group of complex16 solve driver functions for GE matrices
- * @defgroup complex16POsolve complex16
- *   @ingroup solvePO
- *   This is the group of complex16 solve driver functions for PO matrices
- * @defgroup complex16SYsolve complex16
- *   @ingroup solveSY
- *   This is the group of complex16 solve driver functions for SY matrices
- * @defgroup complex16HEsolve complex16
- *   @ingroup solveHE
- *   This is the group of complex16 solve driver functions for HE matrices
- * @defgroup complex16GBsolve complex16
- *   @ingroup solveGB
- *   This is the group of complex16 solve driver functions for GB matrices
- * @defgroup complex16GTsolve complex16
- *   @ingroup solveGT
- *   This is the group of complex16 solve driver functions for GT matrices
- * @defgroup complex16PTsolve complex16
- *   @ingroup solvePT
- *   This is the group of complex16 solve driver functions for PT matrices
- * @defgroup complex16GEeigen complex16
- *   @ingroup eigenGE
- *   This is the group of complex16 eigenvalue driver functions for GE matrices
- * @defgroup complex16SYeigen complex16
- *   @ingroup eigenSY
- *   This is the group of complex16 eigenvalue driver functions for SY matrices
- * @defgroup complex16HEeigen complex16
- *   @ingroup eigenHE
- *   This is the group of complex16 eigenvalue driver functions for HE matrices
- * @defgroup complex16GEsing complex16
- *   @ingroup singGE
- *   This is the group of complex16 singular value driver functions for GE matrices
- * @defgroup complex16GEcomputational complex16
- *   @ingroup computationalGE
- *   This is the group of complex16 computational functions for GE matrices
- * @defgroup complex16POcomputational complex16
- *   @ingroup computationalPO
- *   This is the group of complex16 computational functions for PO matrices
- * @defgroup complex16SYcomputational complex16
- *   @ingroup computationalSY
- *   This is the group of complex16 computational functions for SY matrices
- * @defgroup complex16HEcomputational complex16
- *   @ingroup computationalHE
- *   This is the group of complex16 computational functions for HE matrices
- * @defgroup complex16GBcomputational complex16
- *   @ingroup computationalGB
- *   This is the group of complex16 computational functions for GB matrices
- * @defgroup complex16GTcomputational complex16
- *   @ingroup computationalGT
- *   This is the group of complex16 computational functions for GT matrices
- * @defgroup complex16PTcomputational complex16
- *   @ingroup computationalPT
- *   This is the group of complex16 computational functions for PT matrices
- * @defgroup complex16GEauxiliary complex16
- *   @ingroup auxiliaryGE
- *   This is the group of complex16 auxiliary functions for GE matrices
- * @defgroup complex16POauxiliary complex16
- *   @ingroup auxiliaryPO
- *   This is the group of complex16 auxiliary functions for PO matrices
- * @defgroup complex16SYauxiliary complex16
- *   @ingroup auxiliarySY
- *   This is the group of complex16 auxiliary functions for SY matrices
- * @defgroup complex16HEauxiliary complex16
- *   @ingroup auxiliaryHE
- *   This is the group of complex16 auxiliary functions for HE matrices
- * @defgroup complex16GBauxiliary complex16
- *   @ingroup auxiliaryGB
- *   This is the group of complex16 auxiliary functions for GB matrices
- * @defgroup complex16OTHERcomputational  complex16
- *   @ingroup OTHERcomputational
- *   This is the group of complex16 other Computational routines
- * @defgroup complex16OTHERauxiliary  complex16
- *   @ingroup OTHERauxiliary
- *   This is the group of complex16 other auxiliary routines
- * @defgroup auxOTHERcomputational  auxiliary Computational routines
- *   @ingroup OTHERcomputational
- *   This is the group of auxiliary Computational routines
- * @defgroup complex16OTHERsolve  complex16 Other Solve Routines
- *   @ingroup OTHERsolve
- *   This is the group of complex16 Other Solve routines
- * @defgroup complex16OTHEReigen  complex16 Other Eigenvalue routines
- *   @ingroup OTHEReigen
- *   This is the group of complex16 Other Eigenvalue routines
- *
- ****
- *
- * @defgroup testing LAPACK Testing
- *   This is the group of LAPACK TESTING routines.
- *
- * @defgroup matgen Matrix Generation
- *   @ingroup testing
- *   This is the group of LAPACK TESTING MATGEN routines.
- *
- * @defgroup lin Linear Solve
- *   @ingroup testing
- *   This is the group of LAPACK TESTING LIN routines.
- *
- * @defgroup eig Eigenvalue and Singular value
- *   @ingroup testing
- *   This is the group of LAPACK TESTING EIG routines.
- *
- * @defgroup real_matgen real
- *   @ingroup matgen
- *   This is the group of real LAPACK TESTING MATGEN routines.
- *
- * @defgroup double_matgen double
- *   @ingroup matgen
- *   This is the group of double LAPACK TESTING MATGEN routines.
- *
- * @defgroup complex_matgen complex
- *   @ingroup matgen
- *   This is the group of complex LAPACK TESTING MATGEN routines.
- *
- * @defgroup complex16_matgen complex16
- *   @ingroup matgen
- *   This is the group of complex16 LAPACK TESTING MATGEN routines.
- *
- * @defgroup aux_matgen aux
- *   @ingroup matgen
- *   This is the group of auxiliary LAPACK TESTING MATGEN routines.
- *
- * @defgroup single_lin real
- *   @ingroup lin
- *   This is the group of real LAPACK TESTING LIN routines.
- *
- * @defgroup double_lin double
- *   @ingroup lin
- *   This is the group of double LAPACK TESTING LIN routines.
- *
- * @defgroup complex_lin complex
- *   @ingroup lin
- *   This is the group of complex LAPACK TESTING LIN routines.
- *
- * @defgroup complex16_lin complex16
- *   @ingroup lin
- *   This is the group of complex16 LAPACK TESTING LIN routines.
- *
- * @defgroup aux_lin aux
- *   @ingroup lin
- *   This is the group of auxiliary LAPACK TESTING LIN routines.
- *
- * @defgroup single_eig real
- *   @ingroup eig
- *   This is the group of real LAPACK TESTING EIG routines.
- *
- * @defgroup double_eig double
- *   @ingroup eig
- *   This is the group of double LAPACK TESTING EIG routines.
- *
- * @defgroup complex_eig complex
- *   @ingroup eig
- *   This is the group of complex LAPACK TESTING EIG routines.
- *
- * @defgroup complex16_eig complex16
- *   @ingroup eig
- *   This is the group of complex16 LAPACK TESTING EIG routines.
- *
- * @defgroup aux_eig aux
- *   @ingroup eig
- *   This is the group of auxiliary LAPACK TESTING EIG routines.
- *
- ****
- * @defgroup blas Reference BLAS
- *   This is the group of BLAS routines.
- *
- * @defgroup level1 Level1
- *   @ingroup blas
- *   This is the group of LEVEL 1 BLAS routines.
- * @defgroup level2 Level2
- *   @ingroup blas
- *   This is the group of LEVEL 2 BLAS routines.
- * @defgroup level3 Level3
- *   @ingroup blas
- *   This is the group of LEVEL 3 BLAS routines.
-  * @defgroup aux_blas Auxiliary BLAS
- *   @ingroup blas
- *   This is the group of Auxiliary 3 BLAS routines.
-* @defgroup blastesting Testing
- *   @ingroup blas
- *   This is the group of BLAS TESTING routines.
- *
- * @defgroup single_blas_level1 real
- *   @ingroup level1
- *   This is the group of real LEVEL 1 BLAS routines.
- * @defgroup double_blas_level1 double
- *   @ingroup level1
- *   This is the group of double LEVEL 1 BLAS routines.
- * @defgroup complex_blas_level1 complex
- *   @ingroup level1
- *   This is the group of complex LEVEL 1 BLAS routines.
- * @defgroup complex16_blas_level1 complex16
- *   @ingroup level1
- *   This is the group of complex16 LEVEL 1 BLAS routines.
- *
- * @defgroup single_blas_level2 real
- *   @ingroup level2
- *   This is the group of real LEVEL 2 BLAS routines.
- * @defgroup double_blas_level2 double
- *   @ingroup level2
- *   This is the group of double LEVEL 2 BLAS routines.
- * @defgroup complex_blas_level2 complex
- *   @ingroup level2
- *   This is the group of complex LEVEL 2 BLAS routines.
- * @defgroup complex16_blas_level2 complex16
- *   @ingroup level2
- *   This is the group of complex16 LEVEL 2 BLAS routines.
- *
- * @defgroup single_blas_level3 real
- *   @ingroup level3
- *   This is the group of real LEVEL 3 BLAS routines.
- * @defgroup double_blas_level3 double
- *   @ingroup level3
- *   This is the group of double LEVEL 3 BLAS routines.
- * @defgroup complex_blas_level3 complex
- *   @ingroup level3
- *   This is the group of complex LEVEL 3 BLAS routines.
- * @defgroup complex16_blas_level3 complex16
- *   @ingroup level3
- *   This is the group of complex16 LEVEL 3 BLAS routines.
- *
- * @defgroup single_blas_testing real
- *   @ingroup blastesting
- *   This is the group of real BLAS TESTING routines.
- * @defgroup double_blas_testing double
- *   @ingroup blastesting
- *   This is the group of double BLAS TESTING routines.
- * @defgroup complex_blas_testing complex
- *   @ingroup blastesting
- *   This is the group of complex BLAS TESTING routines.
- * @defgroup complex16_blas_testing complex16
- *   @ingroup blastesting
- *   This is the group of complex16 BLAS TESTING routines.
- *
+
+@defgroup lapack_top                LAPACK
+@{
+    @defgroup solve_top             Linear solve, AX = B
+    @{
+        @defgroup gesv_driver_grp   LU: General matrix, driver
+        @{
+            @defgroup gesv_driver   --- full ---
+            @defgroup gesv          gesv:           factor and solve
+            @defgroup gesvx         gesvx:          factor and solve, expert
+            @defgroup gesvxx        gesvxx:         factor and solve, extra precise
+            @defgroup gesv_mixed    gesv:           factor and solve, mixed precision
+
+            @defgroup gbsv_driver   --- banded ---
+            @defgroup gbsv          gbsv:           factor and solve
+            @defgroup gbsvx         gbsvx:          factor and solve, expert
+            @defgroup gbsvxx        gbsvxx:         factor and solve, extra precise
+
+            @defgroup gtsv_driver   --- tridiagonal ---
+            @defgroup gtsv          gtsv:           factor and solve
+            @defgroup gtsvx         gtsvx:          factor and solve, expert
+        @}
+
+        @defgroup gesv_comp_grp     LU: computational routines (factor, cond, etc.)
+        @{
+            @defgroup gesv_comp     --- full ---
+            @defgroup gecon         gecon:          condition number estimate
+            @defgroup getrf         getrf:          triangular factor
+            @defgroup getrf2        getrf2:         triangular factor panel, recursive?
+            @defgroup getf2         getf2:          triangular factor panel, level 2
+            @defgroup getrs         getrs:          triangular solve using factor
+            @defgroup getri         getri:          triangular inverse
+            @defgroup gerfs         gerfs:          iterative refinement
+            @defgroup gerfsx        gerfsx:         iterative refinement, expert
+            @defgroup geequ         geequ:          equilibration
+            @defgroup geequb        geequb:         equilibration, power of 2
+            @defgroup laqge         laqge:          row/col scale matrix
+            @defgroup laswp         laswp:          swap permutation
+
+            @defgroup getc2         getc2:          triangular factor, with complete pivoting
+            @defgroup gesc2         gesc2:          triangular solve using factor, with complete pivoting
+            @defgroup latdf         latdf:          Dif-estimate with complete pivoting LU, step in tgsen
+
+            @defgroup la_gercond    la_gercond: Skeel condition number estimate
+            @defgroup la_gerpvgrw   la_gerpvgrw: reciprocal pivot growth
+            @defgroup la_gerfsx_extended  la_gerfsx_extended:  step in gerfsx
+
+            @defgroup gbsv_comp     --- banded ---
+            @defgroup gbcon         gbcon:          condition number estimate
+            @defgroup gbtrf         gbtrf:          triangular factor
+            @defgroup gbtf2         gbtf2:          triangular factor, level 2
+            @defgroup gbtrs         gbtrs:          triangular solve using factor
+            @defgroup gbrfs         gbrfs:          iterative refinement
+            @defgroup gbrfsx        gbrfsx:         iterative refinement, expert
+            @defgroup gbequ         gbequ:          equilibration
+            @defgroup gbequb        gbequb:         equilibration, power of 2
+            @defgroup laqgb         laqgb:          row/col scale matrix
+            @defgroup la_gbrcond    la_gbrcond:     Skeel condition number estimate
+            @defgroup la_gbrpvgrw   la_gbrpvgrw:    reciprocal pivot growth
+            @defgroup la_gbrfsx_extended  la_gbrfsx_extended:  step in gbrfsx
+
+            @defgroup gtsv_comp     --- tridiagonal ---
+            @defgroup gtcon         gtcon:          condition number estimate
+            @defgroup gttrf         gttrf:          triangular factor
+            @defgroup gttrs         gttrs:          triangular solve using factor
+            @defgroup gtts2         gtts2:          triangular solve using factor
+            @defgroup gtrfs         gtrfs:          iterative refinement
+        @}
+
+        @defgroup posv_driver_grp   Cholesky: Hermitian/symmetric positive definite matrix, driver
+        @{
+            @defgroup posv_driver   --- full ---
+            @defgroup posv          posv:           factor and solve
+            @defgroup posvx         posvx:          factor and solve, expert
+            @defgroup posvxx        posvxx:         factor and solve, extra precise
+            @defgroup posv_mixed    posv:           factor and solve, mixed precision
+
+            @defgroup ppsv_driver   --- packed ---
+            @defgroup ppsv          ppsv:           factor and solve
+            @defgroup ppsvx         ppsvx:          factor and solve, expert
+
+            @defgroup pfsv_driver   --- rectangular full packed (RFP) ---
+            @defgroup pfsv          pfsv:           factor and solve [not available]
+
+            @defgroup pbsv_driver   --- banded ---
+            @defgroup pbsv          pbsv:           factor and solve
+            @defgroup pbsvx         pbsvx:          factor and solve, expert
+
+            @defgroup ptsv_driver   --- tridiagonal ---
+            @defgroup ptsv          ptsv:           factor and solve
+            @defgroup ptsvx         ptsvx:          factor and solve, expert
+        @}
+
+        @defgroup posv_comp_grp     Cholesky: computational routines (factor, cond, etc.)
+        @{
+            @defgroup posv_comp     --- full ---
+            @defgroup pocon         pocon:          condition number estimate
+            @defgroup potrf         potrf:          triangular factor
+            @defgroup potrf2        potrf2:         triangular factor panel, recursive?
+            @defgroup potf2         potf2:          triangular factor panel, level 2
+            @defgroup pstrf         pstrf:          triangular factor, with pivoting
+            @defgroup pstf2         pstf2:          triangular factor, with pivoting panel, level 2
+            @defgroup potrs         potrs:          triangular solve using factor
+            @defgroup potri         potri:          triangular inverse
+            @defgroup porfs         porfs:          iterative refinement
+            @defgroup porfsx        porfsx:         iterative refinement, expert
+            @defgroup poequ         poequ:          equilibration
+            @defgroup poequb        poequb:         equilibration, power of 2
+            @defgroup laqhe         laqhe:          row/col scale matrix
+            @defgroup la_porcond    la_porcond:     Skeel condition number estimate
+            @defgroup la_porpvgrw   la_porpvgrw:    reciprocal pivot growth
+            @defgroup la_porfsx_extended  la_porfsx_extended:  step in porfsx
+
+            @defgroup ppsv_comp     --- packed ---
+            @defgroup ppcon         ppcon:          condition number estimate
+            @defgroup pptrf         pptrf:          triangular factor
+            @defgroup pptrs         pptrs:          triangular solve using factor
+            @defgroup pptri         pptri:          triangular inverse
+            @defgroup pprfs         pprfs:          iterative refinement
+            @defgroup ppequ         ppequ:          equilibration
+            @defgroup laqhp         laqhp:          row/col scale matrix
+
+            @defgroup pfsv_comp     --- rectangular full packed (RFP) ---
+            @defgroup pftrf         pftrf:          triangular factor
+            @defgroup pftrs         pftrs:          triangular solve using factor
+            @defgroup pftri         pftri:          triangular inverse
+
+            @defgroup pbsv_comp     --- banded ---
+            @defgroup pbcon         pbcon:          condition number estimate
+            @defgroup pbtrf         pbtrf:          triangular factor
+            @defgroup pbtf2         pbtf2:          triangular factor panel, level 2
+            @defgroup pbtrs         pbtrs:          triangular solve using factor
+            @defgroup pbrfs         pbrfs:          iterative refinement
+            @defgroup pbequ         pbequ:          equilibration
+            @defgroup laqhb         laqhb:          row/col scale matrix
+
+            @defgroup ptsv_comp     --- tridiagonal ---
+            @defgroup ptcon         ptcon:          condition number estimate
+            @defgroup pttrf         pttrf:          triangular factor
+            @defgroup pttrs         pttrs:          triangular solve using factor
+            @defgroup ptts2         ptts2:          triangular solve using factor, unblocked
+            @defgroup ptrfs         ptrfs:          iterative refinement
+        @}
+
+        @defgroup hesv_driver_grp   LDL: Hermitian/symmetric indefinite matrix, driver
+        @{
+            @defgroup hesv_driver   --- full, rook pivoting ---
+            @defgroup hesv          {he,sy}sv:      rook (v1)
+            @defgroup hesv_rook     {he,sy}sv_rook: rook (v2)
+            @defgroup hesv_rk       {he,sy}sv_rk:   rook (v3)
+            @defgroup hesvx         {he,sy}svx:     rook (v1, expert)
+            @defgroup hesvxx        {he,sy}svxx:    rook (v1, expert)
+
+            @defgroup hpsv_driver   --- packed, rook pivoting ---
+            @defgroup hpsv          {hp,sp}sv:      factor and solve
+            @defgroup hpsvx         {hp,sp}svx:     factor and solve, expert
+
+            @defgroup hesv_aa_driver  --- full, Aasen ---
+            @defgroup hesv_aa       {he,sy}sv_aa:   Aasen
+            @defgroup hesv_aa_2stage  {he,sy}sv_aa_2stage:  Aasen, blocked 2-stage
+        @}
+
+        @defgroup hesv_comp_grp     LDL: computational routines (factor, cond, etc.)
+        @{
+            @defgroup hesv_comp_v1  --- full, rook v1 ---
+            @defgroup hecon         {he,sy}con:     condition number estimate
+            @defgroup hetrf         {he,sy}trf:     triangular factor
+            @defgroup lahef         la{he,sy}f:     step in hetrf
+            @defgroup hetf2         {he,sy}tf2:     triangular factor, level 2
+            @defgroup hetrs         {he,sy}trs:     triangular solve using factor
+            @defgroup hetri         {he,sy}tri:     triangular inverse
+            @defgroup herfs         {he,sy}rfs:     iterative refinement
+            @defgroup herfsx        {he,sy}rfsx:    iterative refinement, expert
+            @defgroup heequb        {he,sy}equb:    equilibration, power of 2
+            @defgroup syconv        syconv:         convert to/from L and D from hetrf
+
+            @defgroup hecon_3       {he,sy}con_3:   condition number estimate
+            @defgroup hetri2        {he,sy}tri2:    inverse
+            @defgroup hetri2x       {he,sy}tri2x:   inverse
+            @defgroup hetri_3       {he,sy}tri_3:   inverse
+            @defgroup hetri_3x      {he,sy}tri_3x:  inverse
+            @defgroup hetrs2        {he,sy}trs2:    solve using factor
+            @defgroup hetrs_3       {he,sy}trs_3:   solve using factor
+
+            @defgroup heswapr             {he,sy}swapr:         apply 2-sided permutation
+            @defgroup la_hercond          la_hercond:           Skeel condition number estimate
+            @defgroup la_herfsx_extended  la_herfsx_extended:   step in herfsx
+            @defgroup la_herpvgrw         la_herpvgrw:          reciprocal pivot growth
+
+            @defgroup hpsv_comp     --- packed, rook v1 ---
+            @defgroup hpcon         {hp,sp}con:     condition number estimate
+            @defgroup hptrf         {hp,sp}trf:     triangular factor
+            @defgroup hptrs         {hp,sp}trs:     triangular solve using factor
+            @defgroup hptri         {hp,sp}tri:     triangular inverse
+            @defgroup hprfs         {hp,sp}rfs:     iterative refinement
+
+            @defgroup hesv_comp_v2  --- full, rook v2 ---
+            @defgroup hecon_rook    {he,sy}con_rook:  condition number estimate
+            @defgroup hetrf_rook    {he,sy}trf_rook:  triangular factor
+            @defgroup lahef_rook    la{he,sy}f_rook:  triangular factor step
+            @defgroup hetf2_rook    {he,sy}tf2_rook:  triangular factor, level 2
+            @defgroup hetrs_rook    {he,sy}trs_rook:  triangular solve using factor
+            @defgroup hetri_rook    {he,sy}tri_rook:  triangular inverse
+
+            @defgroup hesv_comp_v3  --- full, rook v3 ---
+            @defgroup hetrf_rk      {he,sy}trf_rk:  triangular factor
+            @defgroup lahef_rk      la{he,sy}f_rk:  triangular factor step
+            @defgroup hetf2_rk      {he,sy}tf2_rk:  triangular factor, level 2
+            @defgroup syconvf       syconvf:        convert to/from hetrf      to hetrf_rk format
+            @defgroup syconvf_rook  syconvf_rook:   convert to/from hetrf_rook to hetrf_rk format
+
+            @defgroup hesv_comp_aasen  --- full, Aasen ---
+            @defgroup hetrf_aa      {he,sy}trf_aa:  triangular factor
+            @defgroup lahef_aa      la{he,sy}f_aa:  triangular factor partial factor
+            @defgroup hetrs_aa      {he,sy}trs_aa:  triangular solve using factor
+
+            @defgroup hesv_comp_aasen2 --- full, Aasen, blocked 2-stage ---
+            @defgroup hetrf_aa_2stage  {he,sy}trf_aa_2stage:  triangular factor
+            @defgroup hetrs_aa_2stage  {he,sy}trs_aa_2stage:  triangular solve using factor
+        @}
+
+        @defgroup trsv_comp_grp     Triangular computational routines (solve, cond, etc.)
+        @{
+            @defgroup trsv_comp     --- full ---
+            @defgroup trcon         trcon:          condition number estimate
+            @defgroup trtrs         trtrs:          triangular solve
+            @defgroup latrs         latrs:          triangular solve with robust scaling
+            @defgroup latrs3        latrs3:         triangular solve with robust scaling, level 3
+            @defgroup trtri         trtri:          triangular inverse
+            @defgroup trti2         trti2:          triangular inverse, level 2
+            @defgroup trrfs         trrfs:          triangular iterative refinement
+            @defgroup lauum         lauum:          triangular multiply: U^H U
+            @defgroup lauu2         lauu2:          triangular multiply: U^H U, level 2
+
+            @defgroup tpsv_comp     --- packed ---
+            @defgroup tpcon         tpcon:          condition number estimate
+            @defgroup tptrs         tptrs:          triangular solve
+            @defgroup latps         latps:          triangular solve with robust scaling
+            @defgroup tptri         tptri:          triangular inverse
+            @defgroup tprfs         tprfs:          triangular iterative refinement
+
+            @defgroup tfsv_comp     --- rectangular full packed (RFP) ---
+            @defgroup tftri         tftri:          triangular inverse, RFP
+
+            @defgroup tbsv_comp     --- banded ---
+            @defgroup tbcon         tbcon:          condition number estimate
+            @defgroup tbtrs         tbtrs:          triangular solve
+            @defgroup latbs         latbs:          triangular solve with scaling
+            @defgroup tbrfs         tbrfs:          triangular iterative refinement
+        @}
+
+        @defgroup solve_aux_grp     Auxiliary routines
+        @{
+            @defgroup lacn2         lacn2:          1-norm estimate, e.g., || A^{-1} ||_1 in gecon
+            @defgroup lacon         lacon:          1-norm estimate, e.g., || A^{-1} ||_1 in gecon, old
+            @defgroup la_lin_berr   la_lin_berr:    backward error
+        @}
+    @}
+
+    @defgroup gels_top Least squares
+    @{
+        @defgroup gels_driver_grp   Standard least squares, min || Ax - b ||_2
+        @{
+            @defgroup gels          gels:           least squares using QR/LQ
+            @defgroup gelst         gelst:          least squares using QR/LQ with T matrix
+            @defgroup gelss         gelss:          least squares using SVD, QR iteration
+            @defgroup gelsd         gelsd:          least squares using SVD, divide and conquer
+            @defgroup gelsy         gelsy:          least squares using complete orthogonal factor
+            @defgroup getsls        getsls:         least squares using tall-skinny QR/LQ
+        @}
+
+        @defgroup ggls_driver_grp   Constrained least squares
+        @{
+            @defgroup gglse         gglse:          equality-constrained least squares
+            @defgroup ggglm         ggglm:          Gauss-Markov linear model
+        @}
+
+        @defgroup gels_aux_grp      Auxiliary routines
+        @{
+            @defgroup laic1         laic1:          condition estimate, step in gelsy
+            @defgroup lals0         lals0:          back multiplying factors, step in gelsd
+            @defgroup lalsa         lalsa:          SVD of coefficient matrix, step in gelsd
+            @defgroup lalsd         lalsd:          uses SVD for least squares, step in gelsd
+        @}
+    @}
+
+    @defgroup unitary_top Orthogonal/unitary factors (QR, CS, etc.)
+    @{
+        @defgroup geqr_comp_grp     QR
+        @{
+            @defgroup geqr_comp1    --- flexible ---
+            @defgroup geqr          geqr:           QR factor, flexible
+            @defgroup gemqr         gemqr:          multiply by Q from geqr
+
+            @defgroup geqr_comp2    --- classic ---
+            @defgroup geqrf         geqrf:          QR factor
+            @defgroup geqr2         geqr2:          QR factor, level 2
+            @defgroup ungqr         {un,or}gqr:     generate explicit Q from geqrf
+            @defgroup ung2r         {un,or}g2r:     generate explicit Q from geqrf, level 2
+            @defgroup unmqr         {un,or}mqr:     multiply by Q from geqrf
+            @defgroup unm2r         {un,or}m2r:     multiply by Q from geqrf, level 2
+
+            @defgroup geqr_comp3    --- with T ---
+            @defgroup geqrt         geqrt:          QR factor, with T
+            @defgroup geqrt2        geqrt2:         QR factor, with T, level 2
+            @defgroup geqrt3        geqrt3:         QR factor, with T, recursive panel
+            @defgroup gemqrt        gemqrt:         multiply by Q from geqrt
+
+            @defgroup geqr_comp4    --- positive ---
+            @defgroup geqrfp        geqrfp:         QR factor, diag( R ) ≥ 0
+            @defgroup geqr2p        geqr2p:         QR factor, diag( R ) ≥ 0, level 2
+        @}
+
+        @defgroup geqpf_comp_grp    QR with pivoting
+        @{
+            @defgroup geqp3         geqp3:          QR factor with pivoting, level 3
+            @defgroup laqp2         laqp2:          step of geqp3
+            @defgroup laqps         laqps:          step of geqp3
+        @}
+
+        @defgroup getsqr_comp_grp   QR, tall-skinny
+        @{
+            @defgroup latsqr        latsqr:         tall-skinny QR factor
+            @defgroup ungtsqr       {un,or}gtsqr:   generate Q from latsqr
+            @defgroup ungtsqr_row   {un,or}gtsqr_row:   generate Q from latsqr
+            @defgroup larfb_gett    larfb_gett:     step in ungtsqr_row
+            @defgroup lamtsqr       lamtsqr:        multiply by Q from latsqr
+            @defgroup getsqrhrt     getsqrhrt:      tall-skinny QR factor, with Householder reconstruction
+            @defgroup unhr_col      {un,or}hr_col:  Householder reconstruction
+            @defgroup launhr_col_getrfnp   la{un,or}hr_col_getrfnp:   LU factor without pivoting
+            @defgroup launhr_col_getrfnp2  la{un,or}hr_col_getrfnp2:  LU factor without pivoting, level 2
+        @}
+
+        @defgroup tpqr_comp_grp     QR, triangular-pentagonal
+        @{
+            @defgroup tpqrt         tpqrt:          QR factor
+            @defgroup tpqrt2        tpqrt2:         QR factor, level 2
+            @defgroup tpmqrt        tpmqrt:         applies Q
+            @defgroup tprfb         tprfb:          applies Q (like larfb)
+        @}
+
+        @defgroup ggqr_comp_grp     Generalized QR
+        @{
+            @defgroup ggqrf         ggqrf:          Generalized QR factor
+        @}
+
+        @defgroup gelq_comp_grp     LQ
+        @{
+            @defgroup gelq_comp1    --- flexible ---
+            @defgroup gelq          gelq:           LQ factor, flexible
+            @defgroup gemlq         gemlq:          multiply by Q from gelq
+
+            @defgroup gelq_comp2    --- classic ---
+            @defgroup gelqf         gelqf:          LQ factor
+            @defgroup gelq2         gelq2:          LQ factor, level 2
+            @defgroup unglq         {un,or}glq:     generate explicit Q from gelqf
+            @defgroup ungl2         {un,or}gl2:     generate explicit Q, level 2, step in unglq
+            @defgroup unmlq         {un,or}mlq:     multiply by Q from gelqf
+            @defgroup unml2         {un,or}ml2:     multiply by Q, level 2, step in unmlq
+
+            @defgroup gelq_comp3    --- with T ---
+            @defgroup gelqt         gelqt:          LQ factor, with T
+            @defgroup gelqt3        gelqt3:         LQ factor, with T, recursive
+            @defgroup gemlqt        gemlqt:         multiply by Q from gelqt
+        @}
+
+        @defgroup geswlq_comp_grp   LQ, short-wide
+        @{
+            @defgroup laswlq        laswlq:         short-wide LQ factor
+            @defgroup lamswlq       lamswlq:        multiply by Q from laswlq
+        @}
+
+        @defgroup tplq_comp_grp     LQ, triangular-pentagonal
+        @{
+            @defgroup tplqt         tplqt:          QR factor
+            @defgroup tplqt2        tplqt2:         QR factor, level 2
+            @defgroup tpmlqt        tpmlqt:         applies Q
+        @}
+
+        @defgroup geql_comp_grp     QL
+        @{
+            @defgroup geqlf         geqlf:          QL factor
+            @defgroup geql2         geql2:          QL factor, level 2
+            @defgroup ungql         {un,or}gql:     generate explicit Q from geqlf
+            @defgroup unmql         {un,or}mql:     multiply by Q from geqlf
+            @defgroup ung2l         {un,or}g2l:     step in ungql
+            @defgroup unm2l         {un,or}m2l:     step in unmql
+        @}
+
+        @defgroup gerq_comp_grp     RQ
+        @{
+            @defgroup gerqf         gerqf:          RQ factor
+            @defgroup gerq2         gerq2:          RQ factor, level 2
+            @defgroup ungrq         {un,or}grq:     generate explicit Q from gerqf
+            @defgroup unmrq         {un,or}mrq:     multiply by Q from gerqf
+            @defgroup unmr2         {un,or}mr2:     step in unmrq
+            @defgroup ungr2         {un,or}gr2:     step in ungrq
+        @}
+
+        @defgroup ggrq_comp_grp     Generalized RQ
+        @{
+            @defgroup ggrqf         ggrqf:          Generalized RQ factor
+        @}
+
+        @defgroup gerz_comp_grp     RZ
+        @{
+            @defgroup tzrzf         tzrzf:          RZ factor
+            @defgroup latrz         latrz:          RZ factor step
+            @defgroup unmrz         {un,or}mrz:     multiply by Z from tzrzf
+            @defgroup unmr3         {un,or}mr3:     step in unmrz
+            @defgroup larz          larz:           apply reflector
+            @defgroup larzb         larzb:          apply block reflector
+            @defgroup larzt         larzt:          generate T matrix
+        @}
+
+        @defgroup gecs_comp_grp     Cosine-Sine (CS) decomposition
+        @{
+            @defgroup bbcsd         bbcsd:          ??
+            @defgroup uncsd         {un,or}csd:     ??
+            @defgroup uncsd2by1     {un,or}csd2by1: ??
+            @defgroup unbdb         {un,or}bdb:     bidiagonalize partitioned unitary matrix, step in uncsd
+            @defgroup unbdb1        {un,or}bdb1:    step in uncsd2by1
+            @defgroup unbdb2        {un,or}bdb2:    step in uncsd2by1
+            @defgroup unbdb3        {un,or}bdb3:    step in uncsd2by1
+            @defgroup unbdb4        {un,or}bdb4:    step in uncsd2by1
+            @defgroup unbdb5        {un,or}bdb5:    step in uncsd2by1
+            @defgroup unbdb6        {un,or}bdb6:    step in uncsd2by1
+
+            @defgroup lapmr         lapmr:          permute rows
+            @defgroup lapmt         lapmt:          permute cols
+        @}
+
+        @defgroup reflector_aux_grp Householder reflectors
+        @{
+            @defgroup larf          larf:           apply Householder reflector
+            @defgroup larfx         larfx:          apply Householder reflector, unrolled
+            @defgroup larfy         larfy:          apply Householder reflector symmetrically (2-sided)
+            @defgroup larfb         larfb:          apply block Householder reflector
+            @defgroup larfg         larfg:          generate Householder reflector
+            @defgroup larfgp        larfgp:         generate Householder reflector, beta ≥ 0
+            @defgroup larft         larft:          generate T matrix
+        @}
+
+        @defgroup rot_aux_grp       Givens/Jacobi plane rotations
+        @{
+            @defgroup lartg         lartg:          generate plane rotation, more accurate than BLAS rot
+            @defgroup lartgp        lartgp:         generate plane rotation, more accurate than BLAS rot
+            @defgroup lasr          lasr:           apply series of plane rotations
+            @defgroup largv         largv:          generate vector of plane rotations
+            @defgroup lartv         lartv:          apply vector of plane rotations to vectors
+            @defgroup lar2v         lar2v:          apply vector of plane rotations to 2x2 matrices
+            @defgroup lacrt         lacrt:          apply plane rotation (unused?)
+        @}
+    @}
+
+    @defgroup geev_top              Non-symmetric eigenvalues
+    @{
+        @defgroup geev_driver_grp   Standard eig driver, AV = VΛ
+        @{
+            @defgroup geev          geev:           eig
+            @defgroup geevx         geevx:          eig, expert
+
+            @defgroup gees          gees:           Schur form
+            @defgroup geesx         geesx:          Schur form, expert
+        @}
+
+        @defgroup ggev_driver_grp   Generalized eig driver
+        @{
+            @defgroup ggev3         ggev3:          eig
+            @defgroup ggev          ggev:           eig, unblocked
+            @defgroup ggevx         ggevx:          eig, expert
+
+            @defgroup gges3         gges3:          Schur form
+            @defgroup gges          gges:           Schur form, unblocked
+            @defgroup ggesx         ggesx:          Schur form, expert
+        @}
+
+        @defgroup gedmd             DMD driver, Dynamic Mode Decomposition
+
+        @defgroup geev_comp_grp     Eig computational routines
+        @{
+            @defgroup gebal         gebal:          balance matrix
+            @defgroup gehrd         gehrd:          reduction to Hessenberg
+            @defgroup gehd2         gehd2:          reduction to Hessenberg, level 2
+            @defgroup lahr2         lahr2:          step in gehrd
+            @defgroup unghr         {un,or}ghr:     generate Q from gehrd
+            @defgroup unmhr         {un,or}mhr:     multiply by Q from gehrd
+            @defgroup gebak         gebak:          back-transform eigvec
+            @defgroup hseqr         hseqr:          Hessenberg eig, QR iteration
+            @defgroup hsein         hsein:          Hessenberg inverse iteration for eigvec
+            @defgroup trevc         trevc:          eigenvectors of triangular Schur form, old
+            @defgroup trevc3        trevc3:         eigenvectors of triangular Schur form, blocked
+            @defgroup laln2         laln2:          1x1 or 2x2 solve, step in trevc
+
+            @defgroup trsyl         trsyl:          Sylvester equation
+            @defgroup trsyl3        trsyl3:         Sylvester equation, level 3
+            @defgroup lasy2         lasy2:          Sylvester equation
+
+            @defgroup trsna         trsna:          eig condition numbers
+            @defgroup laqtr         laqtr:          quasi-triangular solve
+
+            @defgroup trexc         trexc:          reorder Schur form
+            @defgroup trsen         trsen:          reorder Schur form
+            @defgroup laexc         laexc:          reorder Schur form
+
+            @defgroup lanv2         lanv2:          2x2 Schur factor
+
+            @defgroup laqr_group    --- hseqr auxiliary ---
+            @defgroup laein         laein:          eigvec by Hessenberg inverse iteration
+            @defgroup lahqr         lahqr:          eig of Hessenberg, step in hseqr
+            @defgroup laqr0         laqr0:          eig of Hessenberg, step in hseqr
+            @defgroup laqr1         laqr1:          step in hseqr
+            @defgroup laqr2         laqr2:          step in hseqr
+            @defgroup laqr3         laqr3:          step in hseqr
+            @defgroup laqr4         laqr4:          eig of Hessenberg, step in hseqr
+            @defgroup laqr5         laqr5:          step in hseqr
+
+            @defgroup iparmq        iparmq:         set parameters for hseqr
+
+            @defgroup laqz_group    --- ggev3, gges3 auxiliary ---
+            @defgroup laqz0         laqz0:          step in ggev3, gges3
+            @defgroup laqz1         laqz1:          step in ggev3, gges3
+            @defgroup laqz2         laqz2:          step in ggev3, gges3
+            @defgroup laqz3         laqz3:          step in ggev3, gges3
+            @defgroup laqz4         laqz4:          step in ggev3, gges3
+        @}
+
+        @defgroup ggev_comp_grp     Generalized eig computational routines
+        @{
+            @defgroup ggbal         ggbal:          balance matrix
+            @defgroup gghrd         gghrd:          reduction to Hessenberg
+            @defgroup gghd3         gghd3:          reduction to Hessenberg, level 3
+            @defgroup hgeqz         hgeqz:          generalized Hessenberg eig
+            @defgroup ggbak         ggbak:          back-transform eigvec
+            @defgroup tgsen         tgsen:          reorder generalized Schur form
+            @defgroup tgsna         tgsna:          reciprocal cond est
+            @defgroup tgsyl         tgsyl:          Sylvester equation
+            @defgroup tgsy2         tgsy2:          Sylvester equation panel (?)
+            @defgroup unm22         {un,or}m22:     multiply by banded Q, step in gghd3
+            @defgroup lagv2         lagv2:          2x2 generalized Schur factor
+            @defgroup tgevc         tgevc:          eigvec of pair of matrices
+            @defgroup tgexc         tgexc:          reorder generalized Schur form
+            @defgroup tgex2         tgex2:          reorder generalized Schur form
+        @}
+    @}
+
+    @defgroup heev_top              Hermitian/symmetric eigenvalues
+    @{
+        @defgroup heev_driver_grp   Standard eig driver, AV = VΛ
+        @{
+            @defgroup heev_driver   --- full ---
+            @defgroup heev          {he,sy}ev:      eig, QR iteration
+            @defgroup heevd         {he,sy}evd:     eig, divide and conquer
+            @defgroup heevr         {he,sy}evr:     eig, MRRR
+            @defgroup heevx         {he,sy}evx:     eig, bisection
+
+            @defgroup heev_driver2  --- full, 2-stage ---
+            @defgroup heev_2stage   {he,sy}ev_2stage:   eig, QR iteration
+            @defgroup heevd_2stage  {he,sy}evd_2stage:  eig, divide and conquer
+            @defgroup heevr_2stage  {he,sy}evr_2stage:  eig, MRRR
+            @defgroup heevx_2stage  {he,sy}evx_2stage:  eig, bisection
+
+            @defgroup hpev_driver   --- packed ---
+            @defgroup hpev          {hp,sp}ev:      eig, QR iteration
+            @defgroup hpevd         {hp,sp}evd:     eig, divide and conquer
+            @defgroup hpevx         {hp,sp}evx:     eig, bisection
+
+            @defgroup hbev_driver   --- banded ---
+            @defgroup hbev          {hb,sb}ev:      eig, QR iteration
+            @defgroup hbevd         {hb,sb}evd:     eig, divide and conquer
+            @defgroup hbevx         {hb,sb}evx:     eig, bisection
+
+            @defgroup hbev_driver2  --- banded, 2nd-stage ---
+            @defgroup hbev_2stage   {hb,sb}ev_2stage:   eig, QR iteration
+            @defgroup hbevd_2stage  {hb,sb}evd_2stage:  eig, divide and conquer
+            @defgroup hbevx_2stage  {hb,sb}evx_2stage:  eig, bisection
+
+            @defgroup stev_driver   --- tridiagonal ---
+            @defgroup stev          stev:           eig, QR iteration
+            @defgroup stevd         stevd:          eig, divide and conquer
+            @defgroup stevr         stevr:          eig, MRRR
+            @defgroup stevx         stevx:          eig, bisection
+            @defgroup pteqr         pteqr:          eig, positive definite tridiagonal
+
+            @defgroup stebz         stebz:          eig, Kahan
+            @defgroup sterf         sterf:          eig, QR iteration
+            @defgroup stedc         stedc:          eig, divide and conquer
+            @defgroup stegr         stegr:          eig, bisection, see stemr
+            @defgroup stein         stein:          eig, inverse iteration
+            @defgroup stemr         stemr:          eig, relatively robust representation (RRR)
+            @defgroup steqr         steqr:          eig, QR iteration
+        @}
+
+        @defgroup hegv_driver_grp   Generalized eig driver, AV = BVΛ, etc.
+        @{
+            @defgroup hegv_driver   --- full ---
+            @defgroup hegv          {he,sy}gv:      eig, QR iteration
+            @defgroup hegv_2stage   {he,sy}gv_2stage: eig, QR iteration, 2-stage
+            @defgroup hegvd         {he,sy}gvd:     eig, divide and conquer
+            @defgroup hegvx         {he,sy}gvx:     eig, bisection
+
+            @defgroup hpgv_driver   --- packed ---
+            @defgroup hpgv          {hp,sp}gv:      eig, QR iteration
+            @defgroup hpgvd         {hp,sp}gvd:     eig, divide and conquer
+            @defgroup hpgvx         {hp,sp}gvx:     eig, bisection
+
+            @defgroup hbgv_driver   --- banded ---
+            @defgroup hbgv          {hb,sb}gv:      eig, QR iteration
+            @defgroup hbgvd         {hb,sb}gvd:     eig, divide and conquer
+            @defgroup hbgvx         {hb,sb}gvx:     eig, bisection
+        @}
+
+        @defgroup heev_comp_grp     Eig computational routines
+        @{
+            @defgroup heev_comp     --- full ---
+            @defgroup disna         disna:          eig condition numbers
+            @defgroup hetrd         {he,sy}trd:     reduction to tridiagonal
+            @defgroup hetd2         {he,sy}td2:     reduction to tridiagonal, level 2
+            @defgroup latrd         latrd:          step in hetrd
+            @defgroup ungtr         {un,or}gtr:     generate Q from hetrd
+            @defgroup unmtr         {un,or}mtr:     multiply by Q from hetrd
+
+            @defgroup hetrd_2stage  {he,sy}trd_2stage: reduction to tridiagonal, 2-stage
+            @defgroup hetrd_he2hb   {he,sy}trd_he2hb:   full to band (1st stage)
+            @defgroup hetrd_hb2st   {he,sy}trd_hb2st:   band to tridiagonal (2nd stage)
+            @defgroup hb2st_kernels {hb,sb}2st_kernels: band to tridiagonal (2nd stage)
+
+            @defgroup lae2          lae2:           2x2 eig, step in steqr, stemr
+            @defgroup laesy         laesy:          2x2 eig
+            @defgroup laev2         laev2:          2x2 eig
+            @defgroup lagtf         lagtf:          LU factor of (T - λI)
+            @defgroup lagts         lagts:          LU solve  of (T - λI) x = y
+
+            @defgroup hpev_comp     --- packed ---
+            @defgroup hptrd         {hp,sp}trd:     reduction to tridiagonal
+            @defgroup upgtr         {up,op}gtr:     generate Q from hetrd
+            @defgroup upmtr         {up,op}mtr:     multiply by Q from hptrd
+
+            @defgroup hbev_comp     --- banded ---
+            @defgroup hbtrd         {hb,sb}trd:     reduction to tridiagonal
+        @}
+
+        @defgroup hegv_comp_grp     Generalized eig computational routines
+        @{
+            @defgroup hegst         {he,sy}gst:     reduction to standard form
+            @defgroup hegs2         {he,sy}gs2:     reduction to standard form, level 2
+            @defgroup hpgst         {hp,sp}gst:     reduction to standard form, packed
+            @defgroup hbgst         {hb,sb}gst:     reduction to standard form, banded
+            @defgroup pbstf         pbstf:          split Cholesky factor, use with hbgst
+            @defgroup lag2          lag2:           2x2 eig
+        @}
+
+        @defgroup stev_comp_grp     tridiag bisection routines
+        @{
+            @defgroup laebz         laebz:          counts eigvals <= value
+            @defgroup laneg         laneg:          Sturm count
+        @}
+
+        @defgroup laed_comp_grp     tridiag divide and conquer (D&C) routines
+        @{
+            @defgroup laed0         laed0:          D&C step: top level solver
+            @defgroup laed1         laed1:          D&C step: merge subproblems
+            @defgroup laed2         laed2:          D&C step: deflation
+            @defgroup laed3         laed3:          D&C step: secular equation
+            @defgroup laed4         laed4:          D&C step: secular equation nonlinear solver
+            @defgroup laed5         laed5:          D&C step: secular equation, 2x2
+            @defgroup laed6         laed6:          D&C step: secular equation Newton step
+            @defgroup lamrg         lamrg:          permutation to merge 2 sorted lists
+
+            @defgroup laed_comp2    --- eig value only or update Q ---
+            @defgroup laed7         laed7:          D&C step: merge subproblems
+            @defgroup laed8         laed8:          D&C step: deflation
+            @defgroup laed9         laed9:          D&C step: secular equation
+            @defgroup laeda         laeda:          D&C step: z vector
+        @}
+
+        @defgroup larr_comp_grp     tridiag RRR routines
+        @{
+            @defgroup larra         larra:          step in stemr
+            @defgroup larrb         larrb:          step in stemr
+            @defgroup larrc         larrc:          step in stemr
+            @defgroup larrd         larrd:          step in stemr, tridiag eig
+            @defgroup larre         larre:          step in stemr
+            @defgroup larrf         larrf:          step in stemr, find relative robust representation (RRR)
+            @defgroup larrj         larrj:          step in stemr, refine eigval estimates
+            @defgroup larrk         larrk:          step in stemr, compute one eigval
+            @defgroup larrr         larrr:          step in stemr, test to do expensive tridiag eig algorithm
+            @defgroup larrv         larrv:          eig tridiagonal, step in stemr & stegr
+            @defgroup lar1v         lar1v:          step in larrv, hence stemr & stegr
+        @}
+    @}
+
+    @defgroup svd_top               Singular Value Decomposition (SVD)
+    @{
+        @defgroup svd_driver_grp    Standard SVD driver, A = UΣV^H
+        @{
+            @defgroup gesvd_driver  --- full ---
+            @defgroup gesvd         gesvd:          SVD, QR iteration
+            @defgroup gesvdq        gesvdq:         SVD, QR with pivoting
+            @defgroup gesdd         gesdd:          SVD, divide and conquer
+            @defgroup gesvdx        gesvdx:         SVD, bisection
+            @defgroup gejsv         gejsv:          SVD, Jacobi, high-level
+            @defgroup gesvj         gesvj:          SVD, Jacobi, low-level
+
+            @defgroup bdsvd_driver  --- bidiagonal ---
+            @defgroup bdsqr         bdsqr:          bidiagonal SVD, QR iteration (dqds)
+            @defgroup bdsdc         bdsdc:          bidiagonal SVD, divide and conquer
+            @defgroup bdsvdx        bdsvdx:         bidiagonal SVD, bisection
+        @}
+
+        @defgroup ggsvd_driver_grp  Generalized SVD driver
+        @{
+            @defgroup ggsvd3        ggsvd3:         SVD, QR iteration
+        @}
+
+        @defgroup gesvd_comp_grp    SVD computational routines
+        @{
+            @defgroup gebrd         gebrd:          reduction to bidiagonal
+            @defgroup gebd2         gebd2:          reduction to bidiagonal, level 2
+            @defgroup labrd         labrd:          step in gebrd
+            @defgroup gbbrd         gbbrd:          band to bidiagonal
+            @defgroup ungbr         {un,or}gbr:     generate Q, P from gebrd
+            @defgroup unmbr         {un,or}mbr:     multiply by Q, P from gebrd
+
+            @defgroup gesvd_aux     --- auxiliary routines ---
+            @defgroup gsvj0         gsvj0:          step in gesvj
+            @defgroup gsvj1         gsvj1:          step in gesvj
+            @defgroup las2          las2:           2x2 triangular SVD
+            @defgroup lasv2         lasv2:          2x2 triangular SVD
+            @defgroup lartgs        lartgs:         generate plane rotation for bidiag SVD
+        @}
+
+        @defgroup ggsvd_comp_grp    Generalized SVD computational routines
+        @{
+            @defgroup ggsvp3        ggsvp3:         step in ggsvd
+            @defgroup tgsja         tgsja:          generalized SVD of trapezoidal matrices, step in ggsvd3
+            @defgroup lags2         lags2:          2x2 orthogonal factor, step in tgsja
+            @defgroup lapll         lapll:          linear dependence of 2 vectors
+        @}
+
+        @defgroup lasq_comp_grp     bidiag QR iteration routines
+        @{
+            @defgroup lasq1         lasq1:          dqds step
+            @defgroup lasq2         lasq2:          dqds step
+            @defgroup lasq3         lasq3:          dqds step
+            @defgroup lasq4         lasq4:          dqds step
+            @defgroup lasq5         lasq5:          dqds step
+            @defgroup lasq6         lasq6:          dqds step
+        @}
+
+        @defgroup lasd_comp_grp     bidiag D&C routines
+        @{
+            @defgroup lasd0         lasd0:          D&C step: top level solver
+            @defgroup lasdt         lasdt:          D&C step: tree
+            @defgroup lasd1         lasd1:          D&C step: merge subproblems
+            @defgroup lasd2         lasd2:          D&C step: deflation
+            @defgroup lasd3         lasd3:          D&C step: secular equation
+            @defgroup lasd4         lasd4:          D&C step: secular equation nonlinear solver
+            @defgroup lasd5         lasd5:          D&C step: secular equation, 2x2
+            @defgroup lasdq         lasdq:          D&C step: leaf using bdsqr
+
+            @defgroup lasd_comp2    --- singular values only or factored form ---
+            @defgroup lasda         lasda:          D&C step: top level solver
+            @defgroup lasd6         lasd6:          D&C step: merge subproblems
+            @defgroup lasd7         lasd7:          D&C step: deflation
+            @defgroup lasd8         lasd8:          D&C step: secular equation
+        @}
+    @}
+
+    @defgroup blas_like_top         BLAS-like
+    @{
+        @defgroup set_grp           Initialize, copy, convert
+        @{
+            @defgroup laset         laset:          set matrix
+            @defgroup larnv         larnv:          random vector
+            @defgroup laruv         laruv:          random uniform vector
+
+            @defgroup lacpy         lacpy:          copy matrix
+
+            @defgroup lacp2         lacp2:          general matrix, convert real to complex
+            @defgroup _lag2_        _lag2_:         general matrix, convert double <=> single
+            @defgroup _lat2_        _lat2_:         triangular matrix, convert double <=> single
+
+            @defgroup tfttp         tfttp:          triangular matrix, RFP    (tf) to packed (tp)
+            @defgroup tfttr         tfttr:          triangular matrix, RFP    (tf) to full   (tr)
+            @defgroup tpttf         tpttf:          triangular matrix, packed (tp) to RFP    (tf)
+            @defgroup tpttr         tpttr:          triangular matrix, packed (tp) to full   (tr)
+            @defgroup trttf         trttf:          triangular matrix, full   (tr) to RFP    (tf)
+            @defgroup trttp         trttp:          triangular matrix, full   (tr) to packed (tp)
+        @}
+
+        @defgroup norm_grp          Matrix norm
+        @{
+            @defgroup lange         lange:          general matrix
+            @defgroup langb         langb:          general matrix, banded
+            @defgroup langt         langt:          general matrix, tridiagonal
+
+            @defgroup lanhs         lanhs:          Hessenberg
+
+            @defgroup lanhe         lan{he,sy}:     Hermitian/symmetric matrix
+            @defgroup lanhf         lan{hf,sf}:     Hermitian/symmetric matrix, RFP
+            @defgroup lanhp         lan{hp,sp}:     Hermitian/symmetric matrix, packed
+            @defgroup lanhb         lan{hb,sb}:     Hermitian/symmetric matrix, banded
+            @defgroup lanht         lan{ht,st}:     Hermitian/symmetric matrix, tridiagonal
+
+            @defgroup lantr         lantr:          triangular matrix
+            @defgroup lantp         lantp:          triangular matrix, packed
+            @defgroup lantb         lantb:          triangular matrix, banded
+        @}
+
+        @defgroup blas0_like_grp    Scalar operations
+        @{
+            @defgroup isnan         isnan:          test for NaN
+            @defgroup laisnan       laisnan:        test for NaN, unoptimized
+            @defgroup ladiv         ladiv:          complex divide
+            @defgroup lapy2         lapy2:          robust sqrt( x^2 + y^2 )
+            @defgroup lapy3         lapy3:          robust sqrt( x^2 + y^2 + z^2 )
+            @defgroup larmm         larmm:          scale factor to avoid overflow, step in latrs
+        @}
+
+        @defgroup blas1_like_grp    Level 1 BLAS-like vector ops
+        @{
+            @defgroup lacgv         lacgv:          conjugate vector
+            @defgroup lasrt         lasrt:          sort vector
+            @defgroup lassq         lassq:          sum-of-squares, avoiding over/underflow
+            @defgroup rscl          rscl:           scale vector by reciprocal
+        @}
+
+        @defgroup blas2_like_grp    Level 2 BLAS-like matrix-vector ops
+        @{
+            @defgroup ilalc         ilalc:          find non-zero col
+            @defgroup ilalr         ilalr:          find non-zero row
+            @defgroup lascl         lascl:          scale matrix
+            @defgroup la_geamv      la_geamv:       matrix-vector multiply |A| * |x|, general
+            @defgroup la_gbamv      la_gbamv:       matrix-vector multiply |A| * |x|, general banded
+            @defgroup la_heamv      la_heamv:       matrix-vector multiply |A| * |x|, Hermitian/symmetric
+            @defgroup lascl2        lascl2:         diagonal scale matrix, A = D A
+            @defgroup larscl2       larscl2:        reciprocal diagonal scale matrix, A = D^{-1} A
+            @defgroup la_wwaddw     la_wwaddw:      add to double-double or single-single vector
+        @}
+
+        @defgroup blas3_like_grp    Level 3 BLAS-like matrix-matrix ops
+        @{
+            @defgroup lagtm         lagtm:          tridiagonal matrix-matrix multiply
+            @defgroup lacrm         lacrm:          complex * real matrix-matrix multiply
+            @defgroup larcm         larcm:          real * complex matrix-matrix multiply
+            @defgroup hfrk          hfrk:           Hermitian rank-k update, RFP format
+            @defgroup tfsm          tfsm:           triangular-matrix solve, RFP format
+        @}
+    @}
+
+    @defgroup aux_top               Auxiliary routines
+    @{
+        @defgroup aux_grp           Other auxiliary routines
+        @{
+            @defgroup lsame         lsame:          string comparison
+            @defgroup lsamen        lsamen:         string comparison
+            @defgroup roundup_lwork roundup_lwork:  fix rounding integer to float
+            @defgroup second        second:         wall clock timer
+        @}
+
+        @defgroup params_grp        Parameters
+        @{
+            @defgroup lamch         lamch:          machine parameters
+            @defgroup lamc1         lamc1:          ??
+            @defgroup lamc2         lamc2:          ??
+            @defgroup lamc3         lamc3:          ??
+            @defgroup lamc4         lamc4:          ??
+            @defgroup lamc5         lamc5:          ??
+            @defgroup labad         labad:          over/underflow on obsolete pre-IEEE machines
+            @defgroup ilaver        ilaver:         LAPACK version
+            @defgroup ilaenv        ilaenv:         tuning parameters
+            @defgroup ilaenv2stage  ilaenv2stage:   tuning parameters for 2-stage eig
+            @defgroup iparam2stage  iparam2stage:   sets parameters for 2-stage eig
+            @defgroup ieeeck        ieeeck:         verify inf and NaN are safe
+            @defgroup la_constants  la_constants:   Fortran 95 module of constants
+
+            @defgroup blast_aux     --- BLAST constants ---
+            @defgroup iladiag       iladiag:        diag      string to BLAST const
+            @defgroup ilaprec       ilaprec:        precision string to BLAST const
+            @defgroup ilatrans      ilatrans:       trans     string to BLAST const
+            @defgroup ilauplo       ilauplo:        uplo      string to BLAST const
+            @defgroup la_transtype  la_transtype:   BLAST const to string
+        @}
+
+        @defgroup xerbla_grp        Error reporting
+        @{
+            @defgroup xerbla        xerbla:         error reporting
+            @defgroup xerbla_array  xerbla_array:   error reporting, callable from C
+        @}
+    @}
+@}
+
+@defgroup blas_top BLAS
+BLAS are defined by three papers:
+Basic linear algebra subprograms for {FORTRAN} usage, Lawson et al, 1979.
+An extended set of {FORTRAN} basic linear algebra subprograms, Dongarra et al, 1988.
+A set of level 3 basic linear algebra subprograms, Dongarra et al, 1990.
+Some BLAS-like routines (e.g., csymv, crot, csum1, icmax1) exist in
+LAPACK rather than the classic BLAS.
+These were extended by the Extra Precision BLAS (XBLAS, not documented here)
+https://www.netlib.org/xblas/
+
+@{
+        @defgroup scalar_grp        Scalar operations
+        @{
+            @defgroup abs1          abs1:           | real( x ) | + | imag( x ) |
+        @}
+
+        @defgroup blas1_grp         Level 1 BLAS: vector ops
+        @{
+            @defgroup asum          asum:           sum | real( x_i ) | + | imag( x_i ) |
+            @defgroup sum1          sum1:           sum | x_i | (in LAPACK)
+            @defgroup axpy          axpy:           y = ax + y
+            @defgroup axpby         axpby:          y = ax + by
+            @defgroup copy          copy:           y = x
+            @defgroup dot           dot:            x^H x and x^T x
+            @defgroup iamax         iamax:          argmax_i | real( x_i ) | + | imag( x_i ) |
+            @defgroup imax1         imax1:          argmax_i | x_i | (in LAPACK)
+            @defgroup nrm2          nrm2:           || x ||_2
+            @defgroup scal          scal:           x = alpha x
+            @defgroup swap          swap:           x <=> y
+
+            @defgroup rot_comp      --- Givens/Jacobi plane rotations ---
+            @defgroup rot           rot:            apply plane rotation ([cz]rot in LAPACK)
+            @defgroup rotg          rotg:           generate plane rotation (cf. lartg)
+            @defgroup rotm          rotm:           apply modified (fast) plane rotation
+            @defgroup rotmg         rotmg:          generate modified (fast) plane rotation
+        @}
+
+        @defgroup blas2_grp         Level 2 BLAS: matrix-vector ops
+        @{
+            @defgroup blas2_full    --- full ---
+            @defgroup gemv          gemv:           general matrix-vector multiply
+            @defgroup ger           ger:            general matrix rank-1 update
+
+            @defgroup hemv          {he,sy}mv:      Hermitian/symmetric matrix-vector multiply ([cz]symv in LAPACK)
+            @defgroup her           {he,sy}r:       Hermitian/symmetric rank-1 update
+            @defgroup her2          {he,sy}r2:      Hermitian/symmetric rank-2 update
+
+            @defgroup trmv          trmv:           triangular matrix-vector multiply
+            @defgroup trsv          trsv:           triangular matrix-vector solve
+
+            @defgroup blas2_packed  --- packed ---
+            @defgroup hpmv          {hp,sp}mv:      Hermitian/symmetric matrix-vector multiply
+            @defgroup hpr           {hp,sp}r:       Hermitian/symmetric rank-1 update
+            @defgroup hpr2          {hp,sp}r2:      Hermitian/symmetric rank-2 update
+
+            @defgroup tpmv          tpmv:           triangular matrix-vector multiply
+            @defgroup tpsv          tpsv:           triangular matrix-vector solve
+
+            @defgroup blas2_banded  --- banded ---
+            @defgroup gbmv          gbmv:           general matrix-vector multiply
+
+            @defgroup hbmv          {hb,sb}mv:      Hermitian/symmetric matrix-vector multiply
+
+            @defgroup tbmv          tbmv:           triangular matrix-vector multiply
+            @defgroup tbsv          tbsv:           triangular matrix-vector solve
+        @}
+
+        @defgroup blas3_grp         Level 3 BLAS: matrix-matrix ops
+        @{
+            @defgroup gemm          gemm:           general matrix-matrix multiply
+            @defgroup gemmtr        gemmtr:         general matrix-matrix multiply with triangular output
+
+            @defgroup hemm          {he,sy}mm:      Hermitian/symmetric matrix-matrix multiply
+            @defgroup herk          {he,sy}rk:      Hermitian/symmetric rank-k update
+            @defgroup her2k         {he,sy}r2k:     Hermitian/symmetric rank-2k update
+
+            @defgroup trmm          trmm:           triangular matrix-matrix multiply
+            @defgroup trsm          trsm:           triangular matrix-matrix solve
+        @}
+@}
+
 **/
diff --git a/DOCS/lawn81.tex b/DOCS/lawn81.tex
index 794c2a7aab..668ca8d683 100644
--- a/DOCS/lawn81.tex
+++ b/DOCS/lawn81.tex
@@ -575,7 +575,7 @@ \subsection{Test and Install the Machine-Dependent Routines.}
 package, at least three of which must be installed.  They are
 
 \begin{tabbing}
-MONOMO  \=  DOUBLE PRECYSION  \=  \kill
+MONOMO  \=  DOUBLE PRECISION  \=  \kill
 LSAME   \>  LOGICAL      \> Test if two characters are the same regardless of case \\
 SLAMCH  \>  REAL  \> Determine machine-dependent parameters \\
 DLAMCH  \>  DOUBLE PRECISION \> Determine machine-dependent parameters \\
diff --git a/INSTALL/CMakeLists.txt b/INSTALL/CMakeLists.txt
index b6f6e838a0..5d34584ff1 100644
--- a/INSTALL/CMakeLists.txt
+++ b/INSTALL/CMakeLists.txt
@@ -1,5 +1,13 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.13)
 project(TIMING Fortran)
+
+# Add the CMake directory for custom CMake modules
+set(CMAKE_MODULE_PATH "${TIMING_SOURCE_DIR}/../CMAKE" ${CMAKE_MODULE_PATH})
+
+# Check for any necessary platform specific compiler flags
+include(CheckLAPACKCompilerFlags)
+CheckLAPACKCompilerFlags()
+
 add_executable(secondtst_NONE second_NONE.f secondtst.f)
 add_executable(secondtst_EXT_ETIME second_EXT_ETIME.f secondtst.f)
 add_executable(secondtst_EXT_ETIME_ second_EXT_ETIME_.f secondtst.f)
@@ -7,3 +15,16 @@ add_executable(secondtst_INT_ETIME second_INT_ETIME.f secondtst.f)
 add_executable(secondtst_INT_CPU_TIME second_INT_CPU_TIME.f secondtst.f)
 add_executable(testieee tstiee.f)
 add_executable(testversion ilaver.f LAPACK_version.f)
+
+if( NOT TARGET test_zcomplexabs )
+  add_executable( test_zcomplexabs test_zcomplexabs.f )
+endif()
+if( NOT TARGET test_zcomplexdiv )
+  add_executable( test_zcomplexdiv test_zcomplexdiv.f )
+endif()
+if( NOT TARGET test_zcomplexmult )
+  add_executable( test_zcomplexmult test_zcomplexmult.f )
+endif()
+if( NOT TARGET test_zminMax )
+  add_executable( test_zminMax test_zminMax.f )
+endif()
diff --git a/INSTALL/LAPACK_version.f b/INSTALL/LAPACK_version.f
index 534f2464a4..8a3ae420bd 100644
--- a/INSTALL/LAPACK_version.f
+++ b/INSTALL/LAPACK_version.f
@@ -22,6 +22,7 @@
 *
 *  =====================================================================
       PROGRAM LAPACK_VERSION
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/INSTALL/Makefile b/INSTALL/Makefile
index b5bdc5d4dc..1af431b23a 100644
--- a/INSTALL/Makefile
+++ b/INSTALL/Makefile
@@ -1,8 +1,8 @@
 TOPSRCDIR = ..
 include $(TOPSRCDIR)/make.inc
 
-.PHONY: all testlsame testslamch testdlamch testsecond testdsecnd testieee testversion
-all: testlsame testslamch testdlamch testsecond testdsecnd testieee testversion
+.PHONY: all testlsame testslamch testdlamch testsecond testdsecnd testieee testversion test_zcomplexabs test_zcomplexdiv test_zcomplexmult test_zminMax
+all: testlsame testslamch testdlamch testsecond testdsecnd testieee testversion test_zcomplexabs test_zcomplexdiv test_zcomplexmult test_zminMax
 
 testlsame: lsame.o lsametst.o
 	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
@@ -27,6 +27,18 @@ testieee: tstiee.o $(TOPSRCDIR)/SRC/ieeeck.o $(TOPSRCDIR)/SRC/ilaenv.o $(TOPSRCD
 testversion: ilaver.o LAPACK_version.o
 	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
 
+test_zcomplexabs: test_zcomplexabs.o
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
+
+test_zcomplexdiv: test_zcomplexdiv.o
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
+
+test_zcomplexmult: test_zcomplexmult.o
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
+
+test_zminMax: test_zminMax.o
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
+
 .PHONY: run
 run: all
 	./testlsame
@@ -36,13 +48,17 @@ run: all
 	./testdsecnd
 	./testieee
 	./testversion
+	./test_zcomplexabs 2> test_zcomplexabs.err
+	./test_zcomplexdiv 2> test_zcomplexdiv.err
+	./test_zcomplexmult 2> test_zcomplexmult.err
+	./test_zminMax 2> test_zminMax.err
 
 .PHONY: clean cleanobj cleanexe cleantest
 clean: cleanobj cleanexe cleantest
 cleanobj:
 	rm -f *.o
 cleanexe:
-	rm -f test*
+	rm -f testlsame testslamch testdlamch testsecond testdsecnd testieee testversion test_zcomplexabs test_zcomplexdiv test_zcomplexmult test_zminMax
 cleantest:
 	rm -f core
 
diff --git a/INSTALL/dlamch.f b/INSTALL/dlamch.f
index 37801ec550..e151db4a2a 100644
--- a/INSTALL/dlamch.f
+++ b/INSTALL/dlamch.f
@@ -62,10 +62,11 @@
 *> \author NAG Ltd.
 *
 
-*> \ingroup auxOTHERauxiliary
+*> \ingroup lamch
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLAMCH( CMACH )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -144,6 +145,7 @@ DOUBLE PRECISION FUNCTION DLAMCH( CMACH )
 *     End of DLAMCH
 *
       END
+
 ************************************************************************
 *> \brief \b DLAMC3
 *> \details
@@ -164,8 +166,11 @@ DOUBLE PRECISION FUNCTION DLAMCH( CMACH )
 *>          B is a DOUBLE PRECISION
 *>          The values A and B.
 *> \endverbatim
+*>
+*> \ingroup lamc3
 *>
       DOUBLE PRECISION FUNCTION DLAMC3( A, B )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
diff --git a/INSTALL/dlamchf77.f b/INSTALL/dlamchf77.f
index 1687afc015..a8ca7e819f 100644
--- a/INSTALL/dlamchf77.f
+++ b/INSTALL/dlamchf77.f
@@ -61,10 +61,11 @@
 *> \author NAG Ltd.
 *
 
-*> \ingroup auxOTHERauxiliary
+*> \ingroup lamch
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLAMCH( CMACH )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -155,7 +156,6 @@ DOUBLE PRECISION FUNCTION DLAMCH( CMACH )
       END
 *
 ************************************************************************
-*
 *> \brief \b DLAMC1
 *> \details
 *> \b Purpose:
@@ -188,7 +188,8 @@ DOUBLE PRECISION FUNCTION DLAMCH( CMACH )
 *>          'round to nearest' style.
 *> \endverbatim
 *> \author LAPACK is a software package provided by Univ. of Tennessee, Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..
-*> \ingroup auxOTHERauxiliary
+*>
+*> \ingroup lamc1
 *>
 *> \details \b Further \b Details
 *> \verbatim
@@ -205,6 +206,7 @@ DOUBLE PRECISION FUNCTION DLAMCH( CMACH )
 *> \endverbatim
 *>
       SUBROUTINE DLAMC1( BETA, T, RND, IEEE1 )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
@@ -349,7 +351,6 @@ SUBROUTINE DLAMC1( BETA, T, RND, IEEE1 )
       END
 *
 ************************************************************************
-*
 *> \brief \b DLAMC2
 *> \details
 *> \b Purpose:
@@ -358,7 +359,8 @@ SUBROUTINE DLAMC1( BETA, T, RND, IEEE1 )
 *> list.
 *> \endverbatim
 *> \author LAPACK is a software package provided by Univ. of Tennessee, Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..
-*> \ingroup auxOTHERauxiliary
+*>
+*> \ingroup lamc2
 *>
 *> \param[out] BETA
 *> \verbatim
@@ -416,6 +418,7 @@ SUBROUTINE DLAMC1( BETA, T, RND, IEEE1 )
 *>  W. Kahan of the University of California at Berkeley.
 *> \endverbatim
       SUBROUTINE DLAMC2( BETA, T, RND, EPS, EMIN, RMIN, EMAX, RMAX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
@@ -620,7 +623,6 @@ SUBROUTINE DLAMC2( BETA, T, RND, EPS, EMIN, RMIN, EMAX, RMAX )
       END
 *
 ************************************************************************
-*
 *> \brief \b DLAMC3
 *> \details
 *> \b Purpose:
@@ -636,8 +638,11 @@ SUBROUTINE DLAMC2( BETA, T, RND, EPS, EMIN, RMIN, EMAX, RMAX )
 *> \verbatim
 *>          The values A and B.
 *> \endverbatim
-
+*>
+*> \ingroup lamc3
+*>
       DOUBLE PRECISION FUNCTION DLAMC3( A, B )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
@@ -658,7 +663,6 @@ DOUBLE PRECISION FUNCTION DLAMC3( A, B )
       END
 *
 ************************************************************************
-*
 *> \brief \b DLAMC4
 *> \details
 *> \b Purpose:
@@ -682,8 +686,11 @@ DOUBLE PRECISION FUNCTION DLAMC3( A, B )
 *> \verbatim
 *>          The base of the machine.
 *> \endverbatim
+*>
+*> \ingroup lamc4
 *>
       SUBROUTINE DLAMC4( EMIN, START, BASE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
@@ -744,7 +751,6 @@ SUBROUTINE DLAMC4( EMIN, START, BASE )
       END
 *
 ************************************************************************
-*
 *> \brief \b DLAMC5
 *> \details
 *> \b Purpose:
@@ -788,8 +794,11 @@ SUBROUTINE DLAMC4( EMIN, START, BASE )
 *> \verbatim
 *>          The largest machine floating-point number.
 *> \endverbatim
+*>
+*> \ingroup lamc5
 *>
       SUBROUTINE DLAMC5( BETA, P, EMIN, IEEE, EMAX, RMAX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
diff --git a/INSTALL/droundup_lwork.f b/INSTALL/droundup_lwork.f
index 86f84b2ad3..0f8033bdec 100644
--- a/INSTALL/droundup_lwork.f
+++ b/INSTALL/droundup_lwork.f
@@ -44,7 +44,7 @@
 *
 *> \author Weslley Pereira, University of Colorado Denver, USA
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup roundup_lwork
 *
 *> \par Further Details:
 *  =====================
@@ -56,6 +56,7 @@
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DROUNDUP_LWORK( LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -76,7 +77,8 @@ DOUBLE PRECISION FUNCTION DROUNDUP_LWORK( LWORK )
 *
       IF( INT( DROUNDUP_LWORK ) .LT. LWORK ) THEN
 *         Force round up of LWORK
-          DROUNDUP_LWORK = DROUNDUP_LWORK * ( 1.0D+0 + EPSILON(0.0D+0) )
+          DROUNDUP_LWORK = DROUNDUP_LWORK *
+     $                     ( 1.0D+0 + EPSILON(0.0D+0) )
       ENDIF
 *
       RETURN
diff --git a/INSTALL/dsecnd_EXT_ETIME.f b/INSTALL/dsecnd_EXT_ETIME.f
index b3dcc621de..b7df5173d8 100644
--- a/INSTALL/dsecnd_EXT_ETIME.f
+++ b/INSTALL/dsecnd_EXT_ETIME.f
@@ -28,10 +28,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup second
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DSECND( )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/INSTALL/dsecnd_EXT_ETIME_.f b/INSTALL/dsecnd_EXT_ETIME_.f
index 018d4d17d1..0483a33168 100644
--- a/INSTALL/dsecnd_EXT_ETIME_.f
+++ b/INSTALL/dsecnd_EXT_ETIME_.f
@@ -28,10 +28,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup second
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DSECND( )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
diff --git a/INSTALL/dsecnd_INT_CPU_TIME.f b/INSTALL/dsecnd_INT_CPU_TIME.f
index 05f82d6c73..a7913e97e3 100644
--- a/INSTALL/dsecnd_INT_CPU_TIME.f
+++ b/INSTALL/dsecnd_INT_CPU_TIME.f
@@ -28,10 +28,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup second
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DSECND( )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/INSTALL/dsecnd_INT_ETIME.f b/INSTALL/dsecnd_INT_ETIME.f
index a1914de108..ff1b309fc7 100644
--- a/INSTALL/dsecnd_INT_ETIME.f
+++ b/INSTALL/dsecnd_INT_ETIME.f
@@ -28,10 +28,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup second
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DSECND( )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/INSTALL/dsecnd_NONE.f b/INSTALL/dsecnd_NONE.f
index 99a0d9d0d5..0f2d28c78f 100644
--- a/INSTALL/dsecnd_NONE.f
+++ b/INSTALL/dsecnd_NONE.f
@@ -30,10 +30,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup second
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DSECND( )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/INSTALL/dsecndtst.f b/INSTALL/dsecndtst.f
index ed108a8258..cdf588fcae 100644
--- a/INSTALL/dsecndtst.f
+++ b/INSTALL/dsecndtst.f
@@ -18,9 +18,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup test_second
 *
-*  =====================================================================      PROGRAM DSECNDTST
+*  =====================================================================
+      PROGRAM DSECNDTST
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *
@@ -117,7 +119,10 @@
      $        ' than zero => timing in TESTING might be dubious' )
       CALL MYSUB(NMAX,X,Y)
       END
+
+*  =====================================================================
       SUBROUTINE MYSUB(N,X,Y)
+      IMPLICIT NONE
       INTEGER N
       DOUBLE PRECISION X(N), Y(N)
       RETURN
diff --git a/INSTALL/ilaver.f b/INSTALL/ilaver.f
index 7bc15fcc8e..83115480fb 100644
--- a/INSTALL/ilaver.f
+++ b/INSTALL/ilaver.f
@@ -44,10 +44,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup ilaver
 *
 *  =====================================================================
       SUBROUTINE ILAVER( VERS_MAJOR, VERS_MINOR, VERS_PATCH )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -58,8 +59,8 @@ SUBROUTINE ILAVER( VERS_MAJOR, VERS_MINOR, VERS_PATCH )
       INTEGER VERS_MAJOR, VERS_MINOR, VERS_PATCH
 *  =====================================================================
       VERS_MAJOR = 3
-      VERS_MINOR = 10
-      VERS_PATCH = 0
+      VERS_MINOR = 12
+      VERS_PATCH = 1
 *  =====================================================================
 *
       RETURN
diff --git a/INSTALL/lsame.f b/INSTALL/lsame.f
index 90e9a999d0..5ed6adb458 100644
--- a/INSTALL/lsame.f
+++ b/INSTALL/lsame.f
@@ -28,9 +28,6 @@
 *  ==========
 *
 *> \param[in] CA
-*> \verbatim
-*> \endverbatim
-*>
 *> \param[in] CB
 *> \verbatim
 *>          CA and CB specify the single characters to be compared.
@@ -44,10 +41,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup lsame
 *
 *  =====================================================================
       LOGICAL FUNCTION LSAME( CA, CB )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/INSTALL/make.inc.XLF b/INSTALL/make.inc.XLF
index 64f8b85529..dafc962429 100644
--- a/INSTALL/make.inc.XLF
+++ b/INSTALL/make.inc.XLF
@@ -14,10 +14,10 @@ CFLAGS = -O3 -qnosave
 #  the compiler options desired when NO OPTIMIZATION is selected.
 #
 FC = xlf
-FFLAGS = -O3 -qfixed -qnosave
+FFLAGS = -O3 -qfixed -qnosave -qrecur
 # For -O2, add -qstrict=none
 FFLAGS_DRV = $(FFLAGS)
-FFLAGS_NOOPT = -O0 -qfixed -qnosave
+FFLAGS_NOOPT = -O0 -qfixed -qnosave -qrecur
 
 #  Define LDFLAGS to the desired linker options for your machine.
 #
diff --git a/INSTALL/make.inc.gfortran b/INSTALL/make.inc.gfortran
index e84f1a4d37..faa3301383 100644
--- a/INSTALL/make.inc.gfortran
+++ b/INSTALL/make.inc.gfortran
@@ -79,3 +79,8 @@ CBLASLIB     = $(TOPSRCDIR)/libcblas.a
 LAPACKLIB    = $(TOPSRCDIR)/liblapack.a
 TMGLIB       = $(TOPSRCDIR)/libtmglib.a
 LAPACKELIB   = $(TOPSRCDIR)/liblapacke.a
+
+#  DOCUMENTATION DIRECTORY
+# If you generate html pages (make html), documentation will be placed in $(DOCSDIR)/explore-html
+# If you generate man pages (make man), documentation will be placed in $(DOCSDIR)/man
+DOCSDIR       = $(TOPSRCDIR)/DOCS
diff --git a/INSTALL/second_EXT_ETIME.f b/INSTALL/second_EXT_ETIME.f
index 44b5282087..d71730bbaa 100644
--- a/INSTALL/second_EXT_ETIME.f
+++ b/INSTALL/second_EXT_ETIME.f
@@ -28,10 +28,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup second
 *
 *  =====================================================================
       REAL FUNCTION SECOND( )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/INSTALL/second_EXT_ETIME_.f b/INSTALL/second_EXT_ETIME_.f
index 1a4e50f416..c3b9431c0c 100644
--- a/INSTALL/second_EXT_ETIME_.f
+++ b/INSTALL/second_EXT_ETIME_.f
@@ -28,10 +28,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup second
 *
 *  =====================================================================
       REAL FUNCTION SECOND( )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
diff --git a/INSTALL/second_INT_CPU_TIME.f b/INSTALL/second_INT_CPU_TIME.f
index 760aafe690..a9a91c9472 100644
--- a/INSTALL/second_INT_CPU_TIME.f
+++ b/INSTALL/second_INT_CPU_TIME.f
@@ -28,10 +28,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup second
 *
 *  =====================================================================
       REAL FUNCTION SECOND( )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/INSTALL/second_INT_ETIME.f b/INSTALL/second_INT_ETIME.f
index 995e4a7e68..a20199dd68 100644
--- a/INSTALL/second_INT_ETIME.f
+++ b/INSTALL/second_INT_ETIME.f
@@ -28,10 +28,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup second
 *
 *  =====================================================================
       REAL FUNCTION SECOND( )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/INSTALL/second_NONE.f b/INSTALL/second_NONE.f
index d711d6343a..fc7c6221bc 100644
--- a/INSTALL/second_NONE.f
+++ b/INSTALL/second_NONE.f
@@ -30,10 +30,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup second
 *
 *  =====================================================================
       REAL FUNCTION SECOND( )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/INSTALL/secondtst.f b/INSTALL/secondtst.f
index 784c7a41de..7d317fe021 100644
--- a/INSTALL/secondtst.f
+++ b/INSTALL/secondtst.f
@@ -14,9 +14,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup test_second
 *
-*  =====================================================================      PROGRAM SECONDTST
+*  =====================================================================
+      PROGRAM SECONDTST
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *
@@ -113,7 +115,10 @@
      $        ' than zero => timing in TESTING might be dubious' )
       CALL MYSUB(NMAX,X,Y)
       END
+
+*  =====================================================================
       SUBROUTINE MYSUB(N,X,Y)
+      IMPLICIT NONE
       INTEGER N
       REAL X(N), Y(N)
       RETURN
diff --git a/INSTALL/slamch.f b/INSTALL/slamch.f
index e2e2cba8e6..1fd9f15338 100644
--- a/INSTALL/slamch.f
+++ b/INSTALL/slamch.f
@@ -61,10 +61,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup lamch
 *
 *  =====================================================================
       REAL             FUNCTION SLAMCH( CMACH )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -143,6 +144,7 @@ REAL             FUNCTION SLAMCH( CMACH )
 *     End of SLAMCH
 *
       END
+
 ************************************************************************
 *> \brief \b SLAMC3
 *> \details
@@ -153,7 +155,8 @@ REAL             FUNCTION SLAMCH( CMACH )
 *> might hold one of these in a register.
 *> \endverbatim
 *> \author LAPACK is a software package provided by Univ. of Tennessee, Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..
-*> \ingroup auxOTHERauxiliary
+*>
+*> \ingroup lamc3
 *>
 *> \param[in] A
 *> \verbatim
@@ -166,6 +169,7 @@ REAL             FUNCTION SLAMCH( CMACH )
 *>
 *
       REAL             FUNCTION SLAMC3( A, B )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
diff --git a/INSTALL/slamchf77.f b/INSTALL/slamchf77.f
index 5141523ba3..fbc58dbd63 100644
--- a/INSTALL/slamchf77.f
+++ b/INSTALL/slamchf77.f
@@ -60,10 +60,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup lamch
 *
 *  =====================================================================
       REAL FUNCTION SLAMCH( CMACH )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -154,7 +155,6 @@ REAL FUNCTION SLAMCH( CMACH )
       END
 *
 ************************************************************************
-*
 *> \brief \b SLAMC1
 *> \details
 *> \b Purpose:
@@ -187,7 +187,8 @@ REAL FUNCTION SLAMCH( CMACH )
 *>          'round to nearest' style.
 *> \endverbatim
 *> \author LAPACK is a software package provided by Univ. of Tennessee, Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..
-*> \ingroup auxOTHERauxiliary
+*>
+*> \ingroup lamc1
 *>
 *> \details \b Further \b Details
 *> \verbatim
@@ -204,6 +205,7 @@ REAL FUNCTION SLAMCH( CMACH )
 *> \endverbatim
 *>
       SUBROUTINE SLAMC1( BETA, T, RND, IEEE1 )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
@@ -348,7 +350,6 @@ SUBROUTINE SLAMC1( BETA, T, RND, IEEE1 )
       END
 *
 ************************************************************************
-*
 *> \brief \b SLAMC2
 *> \details
 *> \b Purpose:
@@ -357,7 +358,8 @@ SUBROUTINE SLAMC1( BETA, T, RND, IEEE1 )
 *> list.
 *> \endverbatim
 *> \author LAPACK is a software package provided by Univ. of Tennessee, Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..
-*> \ingroup auxOTHERauxiliary
+*>
+*> \ingroup lamc2
 *>
 *> \param[out] BETA
 *> \verbatim
@@ -414,7 +416,9 @@ SUBROUTINE SLAMC1( BETA, T, RND, IEEE1 )
 *>  The computation of  EPS  is based on a routine PARANOIA by
 *>  W. Kahan of the University of California at Berkeley.
 *> \endverbatim
+*>
       SUBROUTINE SLAMC2( BETA, T, RND, EPS, EMIN, RMIN, EMAX, RMAX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
@@ -619,7 +623,6 @@ SUBROUTINE SLAMC2( BETA, T, RND, EPS, EMIN, RMIN, EMAX, RMAX )
       END
 *
 ************************************************************************
-*
 *> \brief \b SLAMC3
 *> \details
 *> \b Purpose:
@@ -635,8 +638,11 @@ SUBROUTINE SLAMC2( BETA, T, RND, EPS, EMIN, RMIN, EMAX, RMAX )
 *> \verbatim
 *>          The values A and B.
 *> \endverbatim
-
+*>
+*> \ingroup lamc3
+*>
       REAL FUNCTION SLAMC3( A, B )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
@@ -657,7 +663,6 @@ REAL FUNCTION SLAMC3( A, B )
       END
 *
 ************************************************************************
-*
 *> \brief \b SLAMC4
 *> \details
 *> \b Purpose:
@@ -681,8 +686,11 @@ REAL FUNCTION SLAMC3( A, B )
 *> \verbatim
 *>          The base of the machine.
 *> \endverbatim
+*>
+*> \ingroup lamc4
 *>
       SUBROUTINE SLAMC4( EMIN, START, BASE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
@@ -744,7 +752,6 @@ SUBROUTINE SLAMC4( EMIN, START, BASE )
       END
 *
 ************************************************************************
-*
 *> \brief \b SLAMC5
 *> \details
 *> \b Purpose:
@@ -788,8 +795,11 @@ SUBROUTINE SLAMC4( EMIN, START, BASE )
 *> \verbatim
 *>          The largest machine floating-point number.
 *> \endverbatim
+*>
+*> \ingroup lamc5
 *>
       SUBROUTINE SLAMC5( BETA, P, EMIN, IEEE, EMAX, RMAX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
diff --git a/INSTALL/sroundup_lwork.f b/INSTALL/sroundup_lwork.f
index 7fe8610f05..bb2f8cb3db 100644
--- a/INSTALL/sroundup_lwork.f
+++ b/INSTALL/sroundup_lwork.f
@@ -44,7 +44,7 @@
 *
 *> \author Weslley Pereira, University of Colorado Denver, USA
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup roundup_lwork
 *
 *> \par Further Details:
 *  =====================
@@ -56,6 +56,7 @@
 *
 *  =====================================================================
       REAL             FUNCTION SROUNDUP_LWORK( LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -76,7 +77,8 @@ REAL             FUNCTION SROUNDUP_LWORK( LWORK )
 *
       IF( INT( SROUNDUP_LWORK ) .LT. LWORK ) THEN
 *         Force round up of LWORK
-          SROUNDUP_LWORK = SROUNDUP_LWORK * ( 1.0E+0 + EPSILON(0.0E+0) )
+          SROUNDUP_LWORK = SROUNDUP_LWORK *
+     $                     ( 1.0E+0 + EPSILON(0.0E+0) )
       ENDIF
 *
       RETURN
diff --git a/INSTALL/test_zcomplexabs.f b/INSTALL/test_zcomplexabs.f
new file mode 100644
index 0000000000..6dceb83f66
--- /dev/null
+++ b/INSTALL/test_zcomplexabs.f
@@ -0,0 +1,327 @@
+*> \brief zabs tests the robustness and precision of the intrinsic ABS for double complex
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> \author Weslley S. Pereira, University of Colorado Denver, U.S.
+*
+*> \verbatim
+*>
+*> Real values for test:
+*> (1) x = 2**m, where m = MINEXPONENT-DIGITS, ..., MINEXPONENT-1. Stop on the first success.
+*>     Mind that not all platforms might implement subnormal numbers.
+*> (2) x = 2**m, where m = MINEXPONENT, ..., 0. Stop on the first success.
+*> (3) x = OV, where OV is the overflow threshold. OV^2 overflows but the norm is OV.
+*> (4) x = 2**m, where m = MAXEXPONENT-1, ..., 1. Stop on the first success.
+*>
+*> Tests:
+*> (a) y = x + 0 * I, |y| = x
+*> (b) y = 0 + x * I, |y| = x
+*> (c) y = (3/4)*x + x * I, |y| = (5/4)*x whenever (3/4)*x and (5/4)*x can be exactly stored
+*> (d) y = (1/2)*x + (1/2)*x * I, |y| = (1/2)*x*sqrt(2) whenever (1/2)*x can be exactly stored
+*>
+*> Special cases:
+*>
+*> (i) Inf propagation
+*>    (1) y = Inf + 0 * I, |y| is Inf.
+*>    (2) y =-Inf + 0 * I, |y| is Inf.
+*>    (3) y = 0 + Inf * I, |y| is Inf.
+*>    (4) y = 0 - Inf * I, |y| is Inf.
+*>    (5) y = Inf + Inf * I, |y| is Inf.
+*>
+*> (n) NaN propagation
+*>    (1) y = NaN + 0 * I, |y| is NaN.
+*>    (2) y = 0 + NaN * I, |y| is NaN.
+*>    (3) y = NaN + NaN * I, |y| is NaN.
+*>
+*> \endverbatim
+*
+*> \ingroup auxOTHERauxiliary
+*
+*  =====================================================================
+      program zabs
+*
+*  -- LAPACK test routine --
+*     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
+
+*     ..
+*     .. Local parameters ..
+      logical           debug
+      parameter       ( debug = .false. )
+      integer           N, nNaN, nInf
+      parameter       ( N = 4, nNaN = 3, nInf = 5 )
+      double precision  threeFourth, fiveFourth, oneHalf
+      parameter       ( threeFourth = 3.0d0 / 4,
+     $                  fiveFourth = 5.0d0 / 4,
+     $                  oneHalf = 1.0d0 / 2 )
+*     ..
+*     .. Local Variables ..
+      integer           i, min, Max, m, subnormalTreatedAs0,
+     $                  caseAFails, caseBFails, caseCFails, caseDFails,
+     $                  caseEFails, caseFFails, nFailingTests, nTests
+      double precision  X( N ), R, answerC,
+     $                  answerD, aInf, aNaN, relDiff, b,
+     $                  eps, blueMin, blueMax, Xj, stepX(N), limX(N)
+      double complex    Y, cInf( nInf ), cNaN( nNaN )
+*
+*     .. Intrinsic Functions ..
+      intrinsic         ABS, DBLE, RADIX, CEILING, TINY, DIGITS, SQRT,
+     $                  MAXEXPONENT, MINEXPONENT, FLOOR, HUGE, DCMPLX,
+     $                  EPSILON
+
+*
+*     .. Initialize error counts ..
+      subnormalTreatedAs0 = 0
+      caseAFails = 0
+      caseBFails = 0
+      caseCFails = 0
+      caseDFails = 0
+      caseEFails = 0
+      caseFFails = 0
+      nFailingTests = 0
+      nTests = 0
+*
+*     .. Initialize machine constants ..
+      min = MINEXPONENT(0.0d0)
+      Max = MAXEXPONENT(0.0d0)
+      m = DIGITS(0.0d0)
+      b = DBLE(RADIX(0.0d0))
+      eps = EPSILON(0.0d0)
+      blueMin = b**CEILING( (min - 1) * 0.5d0 )
+      blueMax = b**FLOOR( (Max - m + 1) * 0.5d0 )
+*
+*     .. Vector X ..
+      X(1) = TINY(0.0d0) * b**( DBLE(1-m) )
+      X(2) = TINY(0.0d0)
+      X(3) = HUGE(0.0d0)
+      X(4) = b**( DBLE(Max-1) )
+*
+*     .. Then modify X using the step ..
+      stepX(1) = 2.0
+      stepX(2) = 2.0
+      stepX(3) = 0.0
+      stepX(4) = 0.5
+*
+*     .. Up to the value ..
+      limX(1) = X(2)
+      limX(2) = 1.0
+      limX(3) = 0.0
+      limX(4) = 2.0
+*
+*     .. Inf entries ..
+      aInf = X(3) * 2
+      cInf(1) = DCMPLX( aInf, 0.0d0 )
+      cInf(2) = DCMPLX(-aInf, 0.0d0 )
+      cInf(3) = DCMPLX( 0.0d0, aInf )
+      cInf(4) = DCMPLX( 0.0d0,-aInf )
+      cInf(5) = DCMPLX( aInf,  aInf )
+*
+*     .. NaN entries ..
+      aNaN = aInf / aInf
+      cNaN(1) = DCMPLX( aNaN, 0.0d0 )
+      cNaN(2) = DCMPLX( 0.0d0, aNaN )
+      cNaN(3) = DCMPLX( aNaN,  aNaN )
+
+*
+*     .. Tests ..
+*
+      if( debug ) then
+        print *, '# X :=', X
+        print *, '# Blue min constant :=', blueMin
+        print *, '# Blue max constant :=', blueMax
+      endif
+*
+      Xj = X(1)
+      if( Xj .eq. 0.0d0 ) then
+        subnormalTreatedAs0 = subnormalTreatedAs0 + 1
+        if( debug .or. subnormalTreatedAs0 .eq. 1 ) then
+            print *, "!! fl( subnormal ) may be 0"
+        endif
+      else
+        do 100 i = 1, N
+            Xj = X(i)
+            if( Xj .eq. 0.0d0 ) then
+                subnormalTreatedAs0 = subnormalTreatedAs0 + 1
+                if( debug .or. subnormalTreatedAs0 .eq. 1 ) then
+                    print *, "!! fl( subnormal ) may be 0"
+                endif
+            endif
+ 100    continue
+      endif
+*
+*     Test (a) y = x + 0 * I, |y| = x
+      do 10 i = 1, N
+        Xj = X(i)
+        if( Xj .eq. 0.0d0 ) then
+            subnormalTreatedAs0 = subnormalTreatedAs0 + 1
+            if( debug .or. subnormalTreatedAs0 .eq. 1 ) then
+                print *, "!! [a] fl( subnormal ) may be 0"
+            endif
+        else
+            do while( Xj .ne. limX(i) )
+                nTests = nTests + 1
+                Y = DCMPLX( Xj, 0.0d0 )
+                R = ABS( Y )
+                if( R .ne. Xj ) then
+                    caseAFails = caseAFails + 1
+                    if( caseAFails .eq. 1 ) then
+                        print *, "!! Some ABS(x+0*I) differ from ABS(x)"
+                    endif
+                    WRITE( 0, FMT = 9999 ) 'a',i, Xj, '(1+0*I)', R, Xj
+                endif
+                Xj = Xj * stepX(i)
+            end do
+        endif
+  10  continue
+*
+*     Test (b) y = 0 + x * I, |y| = x
+      do 20 i = 1, N
+        Xj = X(i)
+        if( Xj .eq. 0.0d0 ) then
+            subnormalTreatedAs0 = subnormalTreatedAs0 + 1
+            if( debug .or. subnormalTreatedAs0 .eq. 1 ) then
+                print *, "!! [b] fl( subnormal ) may be 0"
+            endif
+        else
+            do while( Xj .ne. limX(i) )
+                nTests = nTests + 1
+                Y = DCMPLX( 0.0d0, Xj )
+                R = ABS( Y )
+                if( R .ne. Xj ) then
+                    caseBFails = caseBFails + 1
+                    if( caseBFails .eq. 1 ) then
+                        print *, "!! Some ABS(0+x*I) differ from ABS(x)"
+                    endif
+                    WRITE( 0, FMT = 9999 ) 'b',i, Xj, '(0+1*I)', R, Xj
+                endif
+                Xj = Xj * stepX(i)
+            end do
+        endif
+  20  continue
+*
+*     Test (c) y = (3/4)*x + x * I, |y| = (5/4)*x
+      do 30 i = 1, N
+        if( i .eq. 3 ) go to 30
+        if( i .eq. 1 ) then
+            Xj = 4*X(i)
+        else
+            Xj = X(i)
+        endif
+        if( Xj .eq. 0.0d0 ) then
+            subnormalTreatedAs0 = subnormalTreatedAs0 + 1
+            if( debug .or. subnormalTreatedAs0 .eq. 1 ) then
+                print *, "!! [c] fl( subnormal ) may be 0"
+            endif
+        else
+            do while( Xj .ne. limX(i) )
+                nTests = nTests + 1
+                answerC = fiveFourth * Xj
+                Y = DCMPLX( threeFourth * Xj, Xj )
+                R = ABS( Y )
+                if( R .ne. answerC ) then
+                    caseCFails = caseCFails + 1
+                    if( caseCFails .eq. 1 ) then
+                        print *, 
+     $              "!! Some ABS(x*(3/4+I)) differ from (5/4)*ABS(x)"
+                    endif
+                    WRITE( 0, FMT = 9999 ) 'c',i, Xj, '(3/4+I)', R,
+     $                                      answerC
+                endif
+                Xj = Xj * stepX(i)
+            end do
+        endif
+  30  continue
+*
+*     Test (d) y = (1/2)*x + (1/2)*x * I, |y| = (1/2)*x*sqrt(2)
+      do 40 i = 1, N
+        if( i .eq. 1 ) then
+            Xj = 2*X(i)
+        else
+            Xj = X(i)
+        endif
+        if( Xj .eq. 0.0d0 ) then
+            subnormalTreatedAs0 = subnormalTreatedAs0 + 1
+            if( debug .or. subnormalTreatedAs0 .eq. 1 ) then
+                print *, "!! [d] fl( subnormal ) may be 0"
+            endif
+        else
+            do while( Xj .ne. limX(i) )
+                answerD = (oneHalf * Xj) * SQRT(2.0d0)
+                if( answerD .eq. 0.0d0 ) then
+                    subnormalTreatedAs0 = subnormalTreatedAs0 + 1
+                    if( debug .or. subnormalTreatedAs0 .eq. 1 ) then
+                        print *, "!! [d] fl( subnormal ) may be 0"
+                    endif
+                else
+                    nTests = nTests + 1
+                    Y = DCMPLX( oneHalf * Xj, oneHalf * Xj )
+                    R = ABS( Y )
+                    relDiff = ABS(R-answerD)/answerD
+                    if( relDiff .ge. (0.5*eps) ) then
+                        caseDFails = caseDFails + 1
+                        if( caseDFails .eq. 1 ) then
+                            print *, 
+     $                "!! Some ABS(x*(1+I)) differ from sqrt(2)*ABS(x)"
+                        endif
+                        WRITE( 0, FMT = 9999 ) 'd',i, (oneHalf*Xj),
+     $                                  '(1+1*I)', R, answerD
+                    endif
+                endif
+                Xj = Xj * stepX(i)
+            end do
+        endif 
+  40  continue
+*
+*     Test (e) Infs
+      do 50 i = 1, nInf
+        nTests = nTests + 1
+        Y = cInf(i)
+        R = ABS( Y )
+        if( .not.(R .gt. HUGE(0.0d0)) ) then
+            caseEFails = caseEFails + 1
+            WRITE( *, FMT = 9997 ) 'i',i, Y, R
+        endif
+  50  continue
+*
+*     Test (f) NaNs
+      do 60 i = 1, nNaN
+        nTests = nTests + 1
+        Y = cNaN(i)
+        R = ABS( Y )
+        if( R .eq. R ) then
+            caseFFails = caseFFails + 1
+            WRITE( *, FMT = 9998 ) 'n',i, Y, R
+        endif
+  60  continue
+*
+*     If any test fails, displays a message
+      nFailingTests = caseAFails + caseBFails + caseCFails + caseDFails
+     $                + caseEFails + caseFFails
+      if( nFailingTests .gt. 0 ) then
+         print *, "# ", nTests-nFailingTests, " tests out of ", nTests,
+     $            " pass for ABS(a+b*I),", nFailingTests, " tests fail."
+      else
+         print *, "# All tests pass for ABS(a+b*I)"
+      endif
+*
+*     If anything was written to stderr, print the message
+      if( (caseAFails .gt. 0) .or. (caseBFails .gt. 0) .or.
+     $    (caseCFails .gt. 0) .or. (caseDFails .gt. 0) ) then
+         print *, "# Please check the failed ABS(a+b*I) in [stderr]"
+      endif
+*
+*     .. Formats ..
+ 9997 FORMAT( '[',A1,I1, '] ABS(', (ES8.1,SP,ES8.1,"*I"), ' ) = ',
+     $        ES8.1, ' differs from Inf' )
+*
+ 9998 FORMAT( '[',A1,I1, '] ABS(', (ES8.1,SP,ES8.1,"*I"), ' ) = ',
+     $        ES8.1, ' differs from NaN' )
+*
+ 9999 FORMAT( '[',A1,I1, '] ABS(', ES24.16E3, ' * ', A7, ' ) = ',
+     $         ES24.16E3, ' differs from ', ES24.16E3 )
+*
+*     End of zabs
+*
+      END
diff --git a/INSTALL/test_zcomplexdiv.f b/INSTALL/test_zcomplexdiv.f
new file mode 100644
index 0000000000..6a11c14f24
--- /dev/null
+++ b/INSTALL/test_zcomplexdiv.f
@@ -0,0 +1,401 @@
+*> \brief zdiv tests the robustness and precision of the double complex division
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Authors:
+*  ========
+*
+*> \author Weslley S. Pereira, University of Colorado Denver, U.S.
+*
+*> \verbatim
+*>
+*> Real values for test:
+*> (1) x = 2**m, where m = MINEXPONENT-DIGITS, ..., MINEXPONENT-1.
+*>     Mind that not all platforms might implement subnormal numbers.
+*> (2) x = 2**m, where m = MINEXPONENT, ..., 0.
+*> (3) x = OV, where OV is the overflow threshold. OV^2 overflows but the norm is OV.
+*> (4) x = 2**m, where m = MAXEXPONENT-1, ..., 1.
+*>
+*> Tests:
+*> (a) y = x + 0 * I, y/y = 1
+*> (b) y = 0 + x * I, y/y = 1
+*> (c) y = x + x * I, y/y = 1
+*> (d) y1 = 0 + x * I, y2 = x + 0 * I, y1/y2 = I
+*> (e) y1 = 0 + x * I, y2 = x + 0 * I, y2/y1 = -I
+*> (f) y = x + x * I, y/conj(y) = I
+*>
+*> Special cases:
+*>
+*> (i) Inf inputs:
+*>    (1) y = ( Inf + 0   * I)
+*>    (2) y = ( 0   + Inf * I)
+*>    (3) y = (-Inf + 0   * I)
+*>    (4) y = ( 0   - Inf * I)
+*>    (5) y = ( Inf + Inf * I)
+*> Tests:
+*>    (a) 0 / y is either 0 or NaN.
+*>    (b) 1 / y is either 0 or NaN.
+*>    (c) y / y is NaN.
+*>
+*> (n) NaN inputs:
+*>    (1) y = (NaN + 0   * I)
+*>    (2) y = (0   + NaN * I)
+*>    (3) y = (NaN + NaN * I)
+*> Tests:
+*>    (a) 0 / y is NaN.
+*>    (b) 1 / y is NaN.
+*>    (c) y / y is NaN.
+*>
+*> \endverbatim
+*
+*> \ingroup auxOTHERauxiliary
+*
+*  =====================================================================
+      program zdiv
+*
+*  -- LAPACK test routine --
+*     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
+
+*     ..
+*     .. Local parameters ..
+      logical           debug
+      parameter       ( debug = .false. )
+      integer           N, nNaN, nInf
+      parameter       ( N = 4, nNaN = 3, nInf = 5 )
+      double precision  threeFourth, fiveFourth
+      parameter       ( threeFourth = 3.0d0 / 4,
+     $                  fiveFourth = 5.0d0 / 4 )
+      double complex    czero, cone
+      parameter       ( czero = DCMPLX( 0.0d0, 0.0d0 ),
+     $                  cone  = DCMPLX( 1.0d0, 0.0d0 ) )
+*     ..
+*     .. Local Variables ..
+      integer           i, min, Max, m,
+     $                  subnormalTreatedAs0, caseAFails, caseBFails,
+     $                  caseCFails, caseDFails, caseEFails, caseFFails,
+     $                  caseInfFails, caseNaNFails, nFailingTests,
+     $                  nTests
+      double precision  X( N ), aInf, aNaN, b,
+     $                  eps, blueMin, blueMax, OV, Xj, stepX(N), limX(N)
+      double complex    Y, Y2, R, cInf( nInf ), cNaN( nNaN )
+*
+*     .. Intrinsic Functions ..
+      intrinsic         DCONJG, DBLE, RADIX, CEILING, TINY, DIGITS,
+     $                  MAXEXPONENT, MINEXPONENT, FLOOR, HUGE, DCMPLX,
+     $                  EPSILON
+
+*
+*     .. Initialize error counts ..
+      subnormalTreatedAs0 = 0
+      caseAFails = 0
+      caseBFails = 0
+      caseCFails = 0
+      caseDFails = 0
+      caseEFails = 0
+      caseFFails = 0
+      caseInfFails = 0
+      caseNaNFails = 0
+      nFailingTests = 0
+      nTests = 0
+*
+*     .. Initialize machine constants ..
+      min = MINEXPONENT(0.0d0)
+      Max = MAXEXPONENT(0.0d0)
+      m = DIGITS(0.0d0)
+      b = DBLE(RADIX(0.0d0))
+      eps = EPSILON(0.0d0)
+      blueMin = b**CEILING( (min - 1) * 0.5d0 )
+      blueMax = b**FLOOR( (Max - m + 1) * 0.5d0 )
+      OV = HUGE(0.0d0)
+*
+*     .. Vector X ..
+      X(1) = TINY(0.0d0) * b**( DBLE(1-m) )
+      X(2) = TINY(0.0d0)
+      X(3) = OV
+      X(4) = b**( DBLE(Max-1) )
+*
+*     .. Then modify X using the step ..
+      stepX(1) = 2.0
+      stepX(2) = 2.0
+      stepX(3) = 0.0
+      stepX(4) = 0.5
+*
+*     .. Up to the value ..
+      limX(1) = X(2)
+      limX(2) = 1.0
+      limX(3) = 0.0
+      limX(4) = 2.0
+*
+*     .. Inf entries ..
+      aInf = OV * 2
+      cInf(1) = DCMPLX( aInf, 0.0d0 )
+      cInf(2) = DCMPLX(-aInf, 0.0d0 )
+      cInf(3) = DCMPLX( 0.0d0, aInf )
+      cInf(4) = DCMPLX( 0.0d0,-aInf )
+      cInf(5) = DCMPLX( aInf,  aInf )
+*
+*     .. NaN entries ..
+      aNaN = aInf / aInf
+      cNaN(1) = DCMPLX( aNaN, 0.0d0 )
+      cNaN(2) = DCMPLX( 0.0d0, aNaN )
+      cNaN(3) = DCMPLX( aNaN,  aNaN )
+
+*
+*     .. Tests ..
+*
+      if( debug ) then
+        print *, '# X :=', X
+        print *, '# Blue min constant :=', blueMin
+        print *, '# Blue max constant :=', blueMax
+      endif
+*
+      Xj = X(1)
+      if( Xj .eq. 0.0d0 ) then
+        subnormalTreatedAs0 = subnormalTreatedAs0 + 1
+        if( debug .or. subnormalTreatedAs0 .eq. 1 ) then
+            print *, "!! fl( subnormal ) may be 0"
+        endif
+      else
+        do 100 i = 1, N
+            Xj = X(i)
+            if( Xj .eq. 0.0d0 ) then
+                subnormalTreatedAs0 = subnormalTreatedAs0 + 1
+                if( debug .or. subnormalTreatedAs0 .eq. 1 ) then
+                    print *, "!! fl( subnormal ) may be 0"
+                endif
+            endif
+ 100    continue
+      endif
+*
+*     Test (a) y = x + 0 * I, y/y = 1
+      do 10 i = 1, N
+        Xj = X(i)
+        if( Xj .eq. 0.0d0 ) then
+            subnormalTreatedAs0 = subnormalTreatedAs0 + 1
+            if( debug .or. subnormalTreatedAs0 .eq. 1 ) then
+                print *, "!! [a] fl( subnormal ) may be 0"
+            endif
+        else
+            do while( Xj .ne. limX(i) )
+                nTests = nTests + 1
+                Y = DCMPLX( Xj, 0.0d0 )
+                R = Y / Y
+                if( R .ne. 1.0D0 ) then
+                    caseAFails = caseAFails + 1
+                    if( caseAFails .eq. 1 ) then
+                        print *, "!! Some (x+0*I)/(x+0*I) differ from 1"
+                    endif
+                    WRITE( 0, FMT = 9999 ) 'a',i, Xj,
+     $                                     '(x+0*I)/(x+0*I)', R, 1.0D0
+                endif
+                Xj = Xj * stepX(i)
+            end do
+        endif
+  10  continue
+*
+*     Test (b) y = 0 + x * I, y/y = 1
+      do 20 i = 1, N
+        Xj = X(i)
+        if( Xj .eq. 0.0d0 ) then
+            subnormalTreatedAs0 = subnormalTreatedAs0 + 1
+            if( debug .or. subnormalTreatedAs0 .eq. 1 ) then
+                print *, "!! [b] fl( subnormal ) may be 0"
+            endif
+        else
+            do while( Xj .ne. limX(i) )
+                nTests = nTests + 1
+                Y = DCMPLX( 0.0d0, Xj )
+                R = Y / Y
+                if( R .ne. 1.0D0 ) then
+                    caseBFails = caseBFails + 1
+                    if( caseBFails .eq. 1 ) then
+                        print *, "!! Some (0+x*I)/(0+x*I) differ from 1"
+                    endif
+                    WRITE( 0, FMT = 9999 ) 'b',i, Xj,
+     $                                     '(0+x*I)/(0+x*I)', R, 1.0D0
+                endif
+                Xj = Xj * stepX(i)
+            end do
+        endif
+  20  continue
+*
+*     Test (c) y = x + x * I, y/y = 1
+      do 30 i = 1, N
+        Xj = X(i)
+        if( Xj .eq. 0.0d0 ) then
+            subnormalTreatedAs0 = subnormalTreatedAs0 + 1
+            if( debug .or. subnormalTreatedAs0 .eq. 1 ) then
+                print *, "!! [c] fl( subnormal ) may be 0"
+            endif
+        else
+            do while( Xj .ne. limX(i) )
+                nTests = nTests + 1
+                Y = DCMPLX( Xj, Xj )
+                R = Y / Y
+                if( R .ne. 1.0D0 ) then
+                    caseCFails = caseCFails + 1
+                    if( caseCFails .eq. 1 ) then
+                        print *, "!! Some (x+x*I)/(x+x*I) differ from 1"
+                    endif
+                    WRITE( 0, FMT = 9999 ) 'c',i, Xj,
+     $                                     '(x+x*I)/(x+x*I)', R, 1.0D0
+                endif
+                Xj = Xj * stepX(i)
+            end do
+        endif
+  30  continue
+*
+*     Test (d) y1 = 0 + x * I, y2 = x + 0 * I, y1/y2 = I
+      do 40 i = 1, N
+        Xj = X(i)
+        if( Xj .eq. 0.0d0 ) then
+            subnormalTreatedAs0 = subnormalTreatedAs0 + 1
+            if( debug .or. subnormalTreatedAs0 .eq. 1 ) then
+                print *, "!! [d] fl( subnormal ) may be 0"
+            endif
+        else
+            do while( Xj .ne. limX(i) )
+                nTests = nTests + 1
+                Y  = DCMPLX( 0.0d0, Xj )
+                Y2 = DCMPLX( Xj, 0.0d0 )
+                R = Y / Y2
+                if( R .ne. DCMPLX(0.0D0,1.0D0) ) then
+                    caseDFails = caseDFails + 1
+                    if( caseDFails .eq. 1 ) then
+                        print *, "!! Some (0+x*I)/(x+0*I) differ from I"
+                    endif
+                    WRITE( 0, FMT = 9999 ) 'd',i, Xj, '(0+x*I)/(x+0*I)',
+     $                                      R, DCMPLX(0.0D0,1.0D0)
+                endif
+                Xj = Xj * stepX(i)
+            end do
+        endif
+  40  continue
+*
+*     Test (e) y1 = 0 + x * I, y2 = x + 0 * I, y2/y1 = -I
+      do 50 i = 1, N
+        Xj = X(i)
+        if( Xj .eq. 0.0d0 ) then
+            subnormalTreatedAs0 = subnormalTreatedAs0 + 1
+            if( debug .or. subnormalTreatedAs0 .eq. 1 ) then
+                print *, "!! [e] fl( subnormal ) may be 0"
+            endif
+        else
+            do while( Xj .ne. limX(i) )
+                nTests = nTests + 1
+                Y  = DCMPLX( 0.0d0, Xj )
+                Y2 = DCMPLX( Xj, 0.0d0 )
+                R = Y2 / Y
+                if( R .ne. DCMPLX(0.0D0,-1.0D0) ) then
+                    caseEFails = caseEFails + 1
+                    if( caseEFails .eq. 1 ) then
+                        print *,"!! Some (x+0*I)/(0+x*I) differ from -I"
+                    endif
+                    WRITE( 0, FMT = 9999 ) 'e',i, Xj, '(x+0*I)/(0+x*I)',
+     $                                      R, DCMPLX(0.0D0,-1.0D0)
+                endif
+                Xj = Xj * stepX(i)
+            end do
+        endif
+  50  continue
+*
+*     Test (f) y = x + x * I, y/conj(y) = I
+      do 60 i = 1, N
+        Xj = X(i)
+        if( Xj .eq. 0.0d0 ) then
+            subnormalTreatedAs0 = subnormalTreatedAs0 + 1
+            if( debug .or. subnormalTreatedAs0 .eq. 1 ) then
+                print *, "!! [f] fl( subnormal ) may be 0"
+            endif
+        else
+            do while( Xj .ne. limX(i) )
+                nTests = nTests + 1
+                Y  = DCMPLX( Xj, Xj )
+                R = Y / DCONJG( Y )
+                if( R .ne. DCMPLX(0.0D0,1.0D0) ) then
+                    caseFFails = caseFFails + 1
+                    if( caseFFails .eq. 1 ) then
+                        print *, "!! Some (x+x*I)/(x-x*I) differ from I"
+                    endif
+                    WRITE( 0, FMT = 9999 ) 'f',i, Xj, '(x+x*I)/(x-x*I)',
+     $                                      R, DCMPLX(0.0D0,1.0D0)
+                endif
+                Xj = Xj * stepX(i)
+            end do
+        endif
+  60  continue
+*
+*     Test (g) Infs
+      do 70 i = 1, nInf
+          nTests = nTests + 3
+          Y = cInf(i)
+          R = czero / Y
+          if( (R .ne. czero) .and. (R .eq. R) ) then
+              caseInfFails = caseInfFails + 1
+              WRITE( *, FMT = 9998 ) 'ia',i, czero, Y, R, 'NaN and 0'
+          endif
+          R = cone / Y
+          if( (R .ne. czero) .and. (R .eq. R) ) then
+              caseInfFails = caseInfFails + 1
+              WRITE( *, FMT = 9998 ) 'ib',i, cone, Y, R, 'NaN and 0'
+          endif
+          R = Y / Y
+          if( R .eq. R ) then
+              caseInfFails = caseInfFails + 1
+              WRITE( *, FMT = 9998 ) 'ic',i, Y, Y, R, 'NaN'
+          endif
+  70  continue
+*
+*     Test (h) NaNs
+      do 80 i = 1, nNaN
+          nTests = nTests + 3
+          Y = cNaN(i)
+          R = czero / Y
+          if( R .eq. R ) then
+              caseNaNFails = caseNaNFails + 1
+              WRITE( *, FMT = 9998 ) 'na',i, czero, Y, R, 'NaN'
+          endif
+          R = cone / Y
+          if( R .eq. R ) then
+              caseNaNFails = caseNaNFails + 1
+              WRITE( *, FMT = 9998 ) 'nb',i, cone, Y, R, 'NaN'
+          endif
+          R = Y / Y
+          if( R .eq. R ) then
+              caseNaNFails = caseNaNFails + 1
+              WRITE( *, FMT = 9998 ) 'nc',i, Y, Y, R, 'NaN'
+          endif
+  80  continue
+*
+*     If any test fails, displays a message
+      nFailingTests = caseAFails + caseBFails + caseCFails + caseDFails
+     $                + caseEFails + caseFFails + caseInfFails
+     $                + caseNaNFails
+      if( nFailingTests .gt. 0 ) then
+         print *, "# ", nTests-nFailingTests, " tests out of ", nTests,
+     $            " pass for complex division,", nFailingTests," fail."
+      else
+         print *, "# All tests pass for complex division."
+      endif
+*
+*     If anything was written to stderr, print the message
+      if( (caseAFails .gt. 0) .or. (caseBFails .gt. 0) .or.
+     $    (caseCFails .gt. 0) .or. (caseDFails .gt. 0) .or.
+     $    (caseEFails .gt. 0) .or. (caseFFails .gt. 0) )
+     $      print *, "# Please check the failed divisions in [stderr]"
+*
+*     .. Formats ..
+ 9998 FORMAT( '[',A2,I1, '] ', (ES24.16E3,SP,ES24.16E3,"*I"), ' * ',
+     $         (ES24.16E3,SP,ES24.16E3,"*I"), ' = ',
+     $         (ES24.16E3,SP,ES24.16E3,"*I"), ' differs from ', A10 )
+*
+ 9999 FORMAT( '[',A2,I1, '] X = ', ES24.16E3, ' : ', A15, ' = ',
+     $         (ES24.16E3,SP,ES24.16E3,"*I"), ' differs from ',
+     $         (ES24.16E3,SP,ES24.16E3,"*I") )
+*
+*     End of zdiv
+*
+      END
\ No newline at end of file
diff --git a/INSTALL/test_zcomplexmult.f b/INSTALL/test_zcomplexmult.f
new file mode 100644
index 0000000000..4ce81cebb4
--- /dev/null
+++ b/INSTALL/test_zcomplexmult.f
@@ -0,0 +1,157 @@
+*> \brief zmul tests the robustness and precision of the double complex multiplication
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Authors:
+*  ========
+*
+*> \author Weslley S. Pereira, University of Colorado Denver, U.S.
+*
+*> \verbatim
+*>
+*> Tests:
+*>
+*> (a) Inf inputs:
+*>    (1) y = ( Inf + 0   * I)
+*>    (2) y = (-Inf + 0   * I)
+*>    (3) y = ( 0   + Inf * I)
+*>    (4) y = ( 0   - Inf * I)
+*>    (5) y = ( Inf + Inf * I)
+*> Tests:
+*>    (a) 0 * y is NaN.
+*>    (b) 1 * y is y is either y or NaN.
+*>    (c) y * y is either  Inf or NaN (cases 1 and 3),
+*>                 either -Inf or NaN (cases 2 and 4),
+*>                 NaN (case 5).
+*>
+*> (b) NaN inputs:
+*>    (1) y = (NaN + 0   * I)
+*>    (2) y = (0   + NaN * I)
+*>    (3) y = (NaN + NaN * I)
+*> Tests:
+*>    (a) 0 * y is NaN.
+*>    (b) 1 * y is NaN.
+*>    (c) y * y is NaN.
+*>
+*> \endverbatim
+*
+*> \ingroup auxOTHERauxiliary
+*
+*  =====================================================================
+      program zmul
+*
+*  -- LAPACK test routine --
+*     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
+
+*     ..
+*     .. Constants ..
+      integer           nNaN, nInf
+      parameter       ( nNaN = 3, nInf = 5 )
+      double complex    czero, cone
+      parameter       ( czero = DCMPLX( 0.0d0, 0.0d0 ),
+     $                  cone  = DCMPLX( 1.0d0, 0.0d0 ) )
+*     ..
+*     .. Local Variables ..
+      integer           i, nFailingTests, nTests
+      double precision  aInf, aNaN, OV
+      double complex    Y, R, cInf( nInf ), cNaN( nNaN )
+*
+*     .. Intrinsic Functions ..
+      intrinsic         HUGE, DCMPLX
+
+*
+*     .. Initialize error counts ..
+      nFailingTests = 0
+      nTests = 0
+*
+*     .. Inf entries ..
+      OV = HUGE(0.0d0)
+      aInf = OV * 2
+      cInf(1) = DCMPLX( aInf, 0.0d0 )
+      cInf(2) = DCMPLX(-aInf, 0.0d0 )
+      cInf(3) = DCMPLX( 0.0d0, aInf )
+      cInf(4) = DCMPLX( 0.0d0,-aInf )
+      cInf(5) = DCMPLX( aInf,  aInf )
+*
+*     .. NaN entries ..
+      aNaN = aInf / aInf
+      cNaN(1) = DCMPLX( aNaN, 0.0d0 )
+      cNaN(2) = DCMPLX( 0.0d0, aNaN )
+      cNaN(3) = DCMPLX( aNaN,  aNaN )
+
+*
+*     .. Tests ..
+*
+*     Test (a) Infs
+      do 10 i = 1, nInf
+          nTests = nTests + 3
+          Y = cInf(i)
+          R = czero * Y
+          if( R .eq. R ) then
+              nFailingTests = nFailingTests + 1
+              WRITE( *, FMT = 9998 ) 'ia',i, czero, Y, R, 'NaN'
+          endif
+          R = cone * Y
+          if( (R .ne. Y) .and. (R .eq. R) ) then
+              nFailingTests = nFailingTests + 1
+              WRITE( *, FMT = 9998 ) 'ib',i, cone, Y, R,
+     $                               'the input and NaN'
+          endif
+          R = Y * Y
+          if( (i.eq.1) .or. (i.eq.2) ) then
+              if( (R .ne. cInf(1)) .and. (R .eq. R) ) then
+                  nFailingTests = nFailingTests + 1
+                  WRITE( *, FMT = 9998 ) 'ic',i, Y, Y, R, 'Inf and NaN'
+              endif
+          else if( (i.eq.3) .or. (i.eq.4) ) then
+              if( (R .ne. cInf(2)) .and. (R .eq. R) ) then
+                  nFailingTests = nFailingTests + 1
+                  WRITE( *, FMT = 9998 ) 'ic',i, Y, Y, R, '-Inf and NaN'
+              endif
+          else 
+              if( R .eq. R ) then
+                  nFailingTests = nFailingTests + 1
+                  WRITE( *, FMT = 9998 ) 'ic',i, Y, Y, R, 'NaN'
+              endif
+          endif
+  10  continue
+*
+*     Test (b) NaNs
+      do 20 i = 1, nNaN
+          nTests = nTests + 3
+          Y = cNaN(i)
+          R = czero * Y
+          if( R .eq. R ) then
+              nFailingTests = nFailingTests + 1
+              WRITE( *, FMT = 9998 ) 'na',i, czero, Y, R, 'NaN'
+          endif
+          R = cone * Y
+          if( R .eq. R ) then
+              nFailingTests = nFailingTests + 1
+              WRITE( *, FMT = 9998 ) 'nb',i, cone, Y, R, 'NaN'
+          endif
+          R = Y * Y
+          if( R .eq. R ) then
+              nFailingTests = nFailingTests + 1
+              WRITE( *, FMT = 9998 ) 'nc',i, Y, Y, R, 'NaN'
+          endif
+  20  continue
+*
+      if( nFailingTests .gt. 0 ) then
+         print *, "# ", nTests-nFailingTests, " tests out of ", nTests,
+     $      " pass for complex multiplication,", nFailingTests," fail."
+      else
+         print *, "# All tests pass for complex multiplication."
+      endif
+*
+*     .. Formats ..
+ 9998 FORMAT( '[',A2,I1, '] (', (ES24.16E3,SP,ES24.16E3,"*I"), ') * (',
+     $         (ES24.16E3,SP,ES24.16E3,"*I"), ') = (',
+     $         (ES24.16E3,SP,ES24.16E3,"*I"), ') differs from ', A17 )
+*
+*     End of zmul
+*
+      END
\ No newline at end of file
diff --git a/INSTALL/test_zminMax.f b/INSTALL/test_zminMax.f
new file mode 100644
index 0000000000..178ab6d533
--- /dev/null
+++ b/INSTALL/test_zminMax.f
@@ -0,0 +1,120 @@
+*> \brief zminMax tests the robustness and precision of the double-valued intrinsic operators MIN and MAX
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Authors:
+*  ========
+*
+*> \author Weslley S. Pereira, University of Colorado Denver, U.S.
+*
+*> \verbatim
+*>
+*> Tests with pairs of numbers (x,y):
+*> Inf inputs where x < y:
+*>    (1) (-Inf,   0)
+*>    (2) ( 0  , Inf)
+*>    (3) (-Inf, Inf)
+*> Inf inputs where x > y:
+*>    (4) ( 0  ,-Inf)
+*>    (5) ( Inf,   0)
+*>    (6) ( Inf,-Inf)
+*> NaN inputs to test NaN propagation:
+*>    (7) ( 0  , NaN)
+*>    (8) ( NaN,   0)
+*> The program tests MIN(x,y) and MAX(x,y) for every pair
+*>
+*> \endverbatim
+*
+*> \ingroup auxOTHERauxiliary
+*
+*  =====================================================================
+      program zmul
+*
+*  -- LAPACK test routine --
+*     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
+
+*     ..
+*     .. Parameters ..
+      integer           n
+      parameter       ( n = 8 )
+      double precision  zero
+      parameter       ( zero = 0.0d0 )
+*     ..
+*     .. Local Variables ..
+      integer           i, nFailingTests, nTests
+      double precision  aInf, aNaN, OV, R, X(n), Y(n)
+*
+*     .. Intrinsic Functions ..
+      intrinsic         HUGE, MIN, MAX
+
+*
+*     .. Initialize error counts ..
+      nFailingTests = 0
+      nTests = 0
+*
+*     .. Inf and NaN entries ..
+      OV = HUGE(0.0d0)
+      aInf = OV * 2
+      aNaN = aInf / aInf
+      X = (/ -aInf, zero, -aInf,  zero, aInf,  aInf, zero, aNaN /)
+      Y = (/  zero, aInf,  aInf, -aInf, zero, -aInf, aNaN, zero /)
+
+*
+*     .. Tests ..
+*
+      do 10 i = 1, 3
+          nTests = nTests + 2
+          R = MIN( X(i), Y(i) )
+          if( R .ne. X(i) ) then
+              nFailingTests = nFailingTests + 1
+              WRITE( *, FMT = 9998 ) 'i',i, 'MIN', X(i), Y(i), R
+          endif
+          R = MAX( X(i), Y(i) )
+          if( R .ne. Y(i) ) then
+              nFailingTests = nFailingTests + 1
+              WRITE( *, FMT = 9998 ) 'i',i, 'MAX', X(i), Y(i), R
+          endif
+  10  continue
+      do 20 i = 4, 6
+          nTests = nTests + 2
+          R = MIN( X(i), Y(i) )
+          if( R .ne. Y(i) ) then
+              nFailingTests = nFailingTests + 1
+              WRITE( *, FMT = 9998 ) 'i',i, 'MIN', X(i), Y(i), R
+          endif
+          R = MAX( X(i), Y(i) )
+          if( R .ne. X(i) ) then
+              nFailingTests = nFailingTests + 1
+              WRITE( *, FMT = 9998 ) 'i',i, 'MAX', X(i), Y(i), R
+          endif
+  20  continue
+      do 30 i = 7, 8
+          nTests = nTests + 2
+          R = MIN( X(i), Y(i) )
+          if( R .eq. R ) then
+              nFailingTests = nFailingTests + 1
+              WRITE( *, FMT = 9998 ) 'i',i, 'MIN', X(i), Y(i), R
+          endif
+          R = MAX( X(i), Y(i) )
+          if( R .eq. R ) then
+              nFailingTests = nFailingTests + 1
+              WRITE( *, FMT = 9998 ) 'i',i, 'MAX', X(i), Y(i), R
+          endif
+  30  continue
+*
+      if( nFailingTests .gt. 0 ) then
+         print *, "# ", nTests-nFailingTests, " tests out of ", nTests,
+     $      " pass for intrinsic MIN and MAX,", nFailingTests," fail."
+      else
+         print *, "# All tests pass for intrinsic MIN and MAX."
+      endif
+*
+*     .. Formats ..
+ 9998 FORMAT( '[',A1,I1, '] ', A3, '(', F5.0, ',', F5.0, ') = ', F5.0 )
+*
+*     End of zmul
+*
+      END
\ No newline at end of file
diff --git a/INSTALL/tstiee.f b/INSTALL/tstiee.f
index b549399acc..9fdaa2a4d0 100644
--- a/INSTALL/tstiee.f
+++ b/INSTALL/tstiee.f
@@ -17,6 +17,7 @@
 *
 *  =====================================================================
       PROGRAM TSTIEE
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
index facc2172b6..7923f47dc2 100644
--- a/LAPACKE/CMakeLists.txt
+++ b/LAPACKE/CMakeLists.txt
@@ -1,23 +1,9 @@
-message(STATUS "LAPACKE enable")
+message(STATUS "LAPACKE enabled")
 enable_language(C)
 
 set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKELIB}-targets)
 
-# Create a header file lapacke_mangling.h for the routines called in my C programs
-include(FortranCInterface)
-## Ensure that the fortran compiler and c compiler specified are compatible
-FortranCInterface_VERIFY()
-FortranCInterface_HEADER(${LAPACK_BINARY_DIR}/include/lapacke_mangling.h
-  MACRO_NAMESPACE "LAPACK_"
-  SYMBOL_NAMESPACE "LAPACK_")
-if(NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND)
-  message(WARNING "Reverting to pre-defined include/lapacke_mangling.h")
-  configure_file(include/lapacke_mangling_with_flags.h.in
-                 ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h)
-endif()
-
 include_directories(include ${LAPACK_BINARY_DIR}/include)
-add_subdirectory(include)
 add_subdirectory(src)
 add_subdirectory(utils)
 
@@ -26,6 +12,15 @@ option(LAPACKE_BUILD_DOUBLE "Build LAPACKE double precision real" ON)
 option(LAPACKE_BUILD_COMPLEX "Build LAPACKE single precision complex" ON)
 option(LAPACKE_BUILD_COMPLEX16 "Build LAPACKE double precision complex" ON)
 
+foreach(precision SINGLE DOUBLE COMPLEX COMPLEX16)
+  if(LAPACKE_BUILD_${precision} AND NOT BUILD_${precision})
+    message(
+      SEND_ERROR
+      "LAPACKE_BUILD_${precision} requires BUILD_${precision} to be ON"
+    )
+  endif()
+endforeach()
+
 macro(append_subdir_files variable dirname)
   get_directory_property(holder DIRECTORY ${dirname} DEFINITION ${variable})
   foreach(depfile ${holder})
@@ -72,12 +67,35 @@ if(LAPACKE_WITH_TMG)
 endif()
 list(APPEND SOURCES ${UTILS})
 
-add_library(${LAPACKELIB} ${SOURCES})
+add_library(${LAPACKELIB}_obj OBJECT ${SOURCES})
+set_target_properties(${LAPACKELIB}_obj PROPERTIES POSITION_INDEPENDENT_CODE ON)
+
+if(BUILD_INDEX64_EXT_API)
+  # 64bit Integer Extended Interface
+  set(SOURCES_64_C)
+  list(APPEND SOURCES_64_C ${SOURCES})
+  list(REMOVE_ITEM SOURCES_64_C src/lapacke_nancheck.c)
+  list(REMOVE_ITEM SOURCES_64_C utils/lapacke_make_complex_float.c)
+  list(REMOVE_ITEM SOURCES_64_C utils/lapacke_make_complex_double.c)
+  add_library(${LAPACKELIB}_64_obj OBJECT ${SOURCES_64_C})
+  set_target_properties(${LAPACKELIB}_64_obj PROPERTIES
+          POSITION_INDEPENDENT_CODE ON)
+  target_compile_options(${LAPACKELIB}_64_obj PRIVATE
+          -DLAPACK_ILP64
+          -DLAPACKE_API64
+          -DWeirdNEC
+          -DCBLAS_API64)
+endif()
+
+add_library(${LAPACKELIB} $<TARGET_OBJECTS:${LAPACKELIB}_obj>
+        $<$<BOOL:${BUILD_INDEX64_EXT_API}>: $<TARGET_OBJECTS:${LAPACKELIB}_64_obj>>)
+
 set_target_properties(
   ${LAPACKELIB} PROPERTIES
   LINKER_LANGUAGE C
   VERSION ${LAPACK_VERSION}
   SOVERSION ${LAPACK_MAJOR_VERSION}
+  POSITION_INDEPENDENT_CODE ON
   )
 target_include_directories(${LAPACKELIB} PUBLIC
     $<BUILD_INTERFACE:${LAPACK_BINARY_DIR}/include>
diff --git a/LAPACKE/cmake/lapacke-config-install.cmake.in b/LAPACKE/cmake/lapacke-config-install.cmake.in
index 8e735c0f27..0eafa39785 100644
--- a/LAPACKE/cmake/lapacke-config-install.cmake.in
+++ b/LAPACKE/cmake/lapacke-config-install.cmake.in
@@ -1,11 +1,8 @@
 # Compute locations from <prefix>/@{LIBRARY_DIR@/cmake/lapacke-<v>/<self>.cmake
 get_filename_component(_LAPACKE_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_SELF_DIR}" PATH)
-get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH)
-get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH)
 
 # Load the LAPACK package with which we were built.
-set(LAPACK_DIR "${_LAPACKE_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACKLIB@-@LAPACK_VERSION@")
+set(LAPACK_DIR "@CMAKE_INSTALL_FULL_LIBDIR@/cmake/@LAPACKLIB@-@LAPACK_VERSION@")
 find_package(LAPACK NO_MODULE)
 
 # Load lapacke targets from the install tree.
@@ -17,10 +14,9 @@ endif()
 set(LAPACKE_Fortran_COMPILER_ID ${LAPACK_Fortran_COMPILER_ID})
 
 # Report lapacke header search locations.
-set(LAPACKE_INCLUDE_DIRS ${_LAPACKE_PREFIX}/include)
+set(LAPACKE_INCLUDE_DIRS @CMAKE_INSTALL_FULL_INCLUDEDIR@)
 
 # Report lapacke libraries.
 set(LAPACKE_LIBRARIES @LAPACKELIB@ ${LAPACK_LIBRARIES})
 
-unset(_LAPACKE_PREFIX)
 unset(_LAPACKE_SELF_DIR)
diff --git a/LAPACKE/example/CMakeLists.txt b/LAPACKE/example/CMakeLists.txt
index 27db8ee216..509ee4edea 100644
--- a/LAPACKE/example/CMakeLists.txt
+++ b/LAPACKE/example/CMakeLists.txt
@@ -3,12 +3,29 @@ add_executable(xexample_DGESV_colmajor example_DGESV_colmajor.c lapacke_example_
 add_executable(xexample_DGELS_rowmajor example_DGELS_rowmajor.c lapacke_example_aux.c lapacke_example_aux.h)
 add_executable(xexample_DGELS_colmajor example_DGELS_colmajor.c lapacke_example_aux.c lapacke_example_aux.h)
 
-target_link_libraries(xexample_DGESV_rowmajor ${LAPACKELIB})
-target_link_libraries(xexample_DGESV_colmajor ${LAPACKELIB})
-target_link_libraries(xexample_DGELS_rowmajor ${LAPACKELIB})
-target_link_libraries(xexample_DGELS_colmajor ${LAPACKELIB})
+target_link_libraries(xexample_DGESV_rowmajor ${LAPACKELIB} ${BLAS_LIBRARIES})
+target_link_libraries(xexample_DGESV_colmajor ${LAPACKELIB} ${BLAS_LIBRARIES})
+target_link_libraries(xexample_DGELS_rowmajor ${LAPACKELIB} ${BLAS_LIBRARIES})
+target_link_libraries(xexample_DGELS_colmajor ${LAPACKELIB} ${BLAS_LIBRARIES})
 
 add_test(example_DGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGESV_rowmajor)
 add_test(example_DGESV_colmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGESV_colmajor)
 add_test(example_DGELS_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGELS_rowmajor)
 add_test(example_DGELS_colmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGELS_colmajor)
+
+if(BUILD_INDEX64_EXT_API)
+  add_executable(xexample_DGESV_rowmajor_64 example_DGESV_rowmajor_64.c lapacke_example_aux.c lapacke_example_aux.h)
+  add_executable(xexample_DGESV_colmajor_64 example_DGESV_colmajor_64.c lapacke_example_aux.c lapacke_example_aux.h)
+  add_executable(xexample_DGELS_rowmajor_64 example_DGELS_rowmajor_64.c lapacke_example_aux.c lapacke_example_aux.h)
+  add_executable(xexample_DGELS_colmajor_64 example_DGELS_colmajor_64.c lapacke_example_aux.c lapacke_example_aux.h)
+
+  target_link_libraries(xexample_DGESV_rowmajor_64 ${LAPACKELIB} ${BLAS_LIBRARIES})
+  target_link_libraries(xexample_DGESV_colmajor_64 ${LAPACKELIB} ${BLAS_LIBRARIES})
+  target_link_libraries(xexample_DGELS_rowmajor_64 ${LAPACKELIB} ${BLAS_LIBRARIES})
+  target_link_libraries(xexample_DGELS_colmajor_64 ${LAPACKELIB} ${BLAS_LIBRARIES})
+
+  add_test(example_DGESV_rowmajor_64 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGESV_rowmajor_64)
+  add_test(example_DGESV_colmajor_64 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGESV_colmajor_64)
+  add_test(example_DGELS_rowmajor_64 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGELS_rowmajor_64)
+  add_test(example_DGELS_colmajor_64 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGELS_colmajor_64)
+endif()
diff --git a/LAPACKE/example/example_DGELS_colmajor_64.c b/LAPACKE/example/example_DGELS_colmajor_64.c
new file mode 100644
index 0000000000..2adf95fd53
--- /dev/null
+++ b/LAPACKE/example/example_DGELS_colmajor_64.c
@@ -0,0 +1,93 @@
+/*
+   LAPACKE Example : Calling DGELS using col-major layout
+   =====================================================
+
+   The program computes the solution to the system of linear
+   equations with a square matrix A and multiple
+   right-hand sides B, where A is the coefficient matrix
+   and b is the right-hand side matrix:
+
+   Description
+   ===========
+
+   In this example, we wish solve the least squares problem min_x || B - Ax ||
+   for two right-hand sides using the LAPACK routine DGELS. For input we will
+   use the 5-by-3 matrix
+
+         ( 1  1  1 )
+         ( 2  3  4 )
+     A = ( 3  5  2 )
+         ( 4  2  5 )
+         ( 5  4  3 )
+    and the 5-by-2 matrix
+
+         ( -10 -3 )
+         (  12 14 )
+     B = (  14 12 )
+         (  16 16 )
+         (  18 16 )
+    We will first store the input matrix as a static C two-dimensional array,
+    which is stored in col-major layout, and let LAPACKE handle the work space
+    array allocation. The LAPACK base name for this function is gels, and we
+    will use double precision (d), so the LAPACKE function name is LAPACKE_dgels.
+
+    lda=5 and ldb=5. The output for each right hand side is stored in b as
+    consecutive vectors of length 3. The correct answer for this problem is
+    the 3-by-2 matrix
+
+         ( 2 1 )
+         ( 1 1 )
+         ( 1 2 )
+
+    A complete C program for this example is given below. Note that when the arrays
+     are passed to the LAPACK routine, they must be dereferenced, since LAPACK is
+      expecting arrays of type double *, not double **.
+
+
+   LAPACKE Interface
+   =================
+
+   LAPACKE_dgels (col-major, high-level) Example Program Results
+
+  -- LAPACKE Example routine --
+  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*/
+/* Calling DGELS using col-major layout */
+
+/* Includes */
+#include <stdio.h>
+#include <lapacke_64.h>
+#include "lapacke_example_aux.h"
+
+/* Main program */
+int main (int argc, const char * argv[])
+{
+   /* Locals */
+   double A[5][3] = {{1,2,3},{4,5,1},{3,5,2},{4,1,4},{2,5,3}};
+   double b[5][2] = {{-10,12},{14,16},{18,-3},{14,12},{16,16}};
+   int64_t info,m,n,lda,ldb,nrhs;
+
+   /* Initialization */
+   m = 5;
+   n = 3;
+   nrhs = 2;
+   lda = 5;
+   ldb = 5;
+
+   /* Print Entry Matrix */
+   print_matrix_colmajor_64( "Entry Matrix A", m, n, *A, lda );
+   /* Print Right Rand Side */
+   print_matrix_colmajor_64( "Right Hand Side b", n, nrhs, *b, ldb );
+   printf( "\n" );
+
+   /* Executable statements */
+   printf( "LAPACKE_dgels_64 (col-major, high-level) Example Program Results\n" );
+   /* Solve least squares problem*/
+   info = LAPACKE_dgels_64(LAPACK_COL_MAJOR,'N',m,n,nrhs,*A,lda,*b,ldb);
+
+   /* Print Solution */
+   print_matrix_colmajor_64( "Solution", n, nrhs, *b, ldb );
+   printf( "\n" );
+   exit( info );
+} /* End of LAPACKE_dgels Example */
diff --git a/LAPACKE/example/example_DGELS_rowmajor.c b/LAPACKE/example/example_DGELS_rowmajor.c
index eca211d1d0..0410dfb1f8 100644
--- a/LAPACKE/example/example_DGELS_rowmajor.c
+++ b/LAPACKE/example/example_DGELS_rowmajor.c
@@ -64,8 +64,8 @@
 int main (int argc, const char * argv[])
 {
    /* Locals */
-   double A[5][3] = {1,1,1,2,3,4,3,5,2,4,2,5,5,4,3};
-   double b[5][2] = {-10,-3,12,14,14,12,16,16,18,16};
+   double A[5][3] = {{1,1,1},{2,3,4},{3,5,2},{4,2,5},{5,4,3}};
+   double b[5][2] = {{-10,-3},{12,14},{14,12},{16,16},{18,16}};
    lapack_int info,m,n,lda,ldb,nrhs;
 
    /* Initialization */
@@ -86,6 +86,9 @@ int main (int argc, const char * argv[])
    /* Solve least squares problem*/
    info = LAPACKE_dgels(LAPACK_ROW_MAJOR,'N',m,n,nrhs,*A,lda,*b,ldb);
 
+   if ( info != 0) {
+        printf("DGELS failed with %d\n", (int) info);
+   }
    /* Print Solution */
    print_matrix_rowmajor( "Solution", n, nrhs, *b, ldb );
    printf( "\n" );
diff --git a/LAPACKE/example/example_DGELS_rowmajor_64.c b/LAPACKE/example/example_DGELS_rowmajor_64.c
new file mode 100644
index 0000000000..443e06f67b
--- /dev/null
+++ b/LAPACKE/example/example_DGELS_rowmajor_64.c
@@ -0,0 +1,96 @@
+/*
+   LAPACKE Example : Calling DGELS using row-major layout
+   =====================================================
+
+   The program computes the solution to the system of linear
+   equations with a square matrix A and multiple
+   right-hand sides B, where A is the coefficient matrix
+   and b is the right-hand side matrix:
+
+   Description
+   ===========
+
+   In this example, we wish solve the least squares problem min_x || B - Ax ||
+   for two right-hand sides using the LAPACK routine DGELS. For input we will
+   use the 5-by-3 matrix
+
+         ( 1  1  1 )
+         ( 2  3  4 )
+     A = ( 3  5  2 )
+         ( 4  2  5 )
+         ( 5  4  3 )
+    and the 5-by-2 matrix
+
+         ( -10 -3 )
+         (  12 14 )
+     B = (  14 12 )
+         (  16 16 )
+         (  18 16 )
+    We will first store the input matrix as a static C two-dimensional array,
+    which is stored in row-major layout, and let LAPACKE handle the work space
+    array allocation. The LAPACK base name for this function is gels, and we
+    will use double precision (d), so the LAPACKE function name is LAPACKE_dgels.
+
+    thus lda=3 and ldb=2. The output for each right hand side is stored in b as
+    consecutive vectors of length 3. The correct answer for this problem is
+    the 3-by-2 matrix
+
+         ( 2 1 )
+         ( 1 1 )
+         ( 1 2 )
+
+    A complete C program for this example is given below. Note that when the arrays
+     are passed to the LAPACK routine, they must be dereferenced, since LAPACK is
+      expecting arrays of type double *, not double **.
+
+
+   LAPACKE Interface
+   =================
+
+   LAPACKE_dgels (row-major, high-level) Example Program Results
+
+  -- LAPACKE Example routine --
+  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*/
+/* Calling DGELS using row-major layout */
+
+/* Includes */
+#include <stdio.h>
+#include <lapacke_64.h>
+#include "lapacke_example_aux.h"
+
+/* Main program */
+int main (int argc, const char * argv[])
+{
+   /* Locals */
+   double A[5][3] = {{1,1,1},{2,3,4},{3,5,2},{4,2,5},{5,4,3}};
+   double b[5][2] = {{-10,-3},{12,14},{14,12},{16,16},{18,16}};
+   int64_t info,m,n,lda,ldb,nrhs;
+
+   /* Initialization */
+   m = 5;
+   n = 3;
+   nrhs = 2;
+   lda = 3;
+   ldb = 2;
+
+   /* Print Entry Matrix */
+   print_matrix_rowmajor_64( "Entry Matrix A", m, n, *A, lda );
+   /* Print Right Rand Side */
+   print_matrix_rowmajor_64( "Right Hand Side b", n, nrhs, *b, ldb );
+   printf( "\n" );
+
+   /* Executable statements */
+   printf( "LAPACKE_dgels_64 (row-major, high-level) Example Program Results\n" );
+   /* Solve least squares problem*/
+   info = LAPACKE_dgels_64(LAPACK_ROW_MAJOR,'N',m,n,nrhs,*A,lda,*b,ldb);
+
+   if ( info != 0 ) {
+      printf("DGELS failed with info = %d\n", (int) info);
+   }
+   /* Print Solution */
+   print_matrix_rowmajor_64( "Solution", n, nrhs, *b, ldb );
+   printf( "\n" );
+   exit( 0 );
+} /* End of LAPACKE_dgels Example */
diff --git a/LAPACKE/example/example_DGESV_colmajor.c b/LAPACKE/example/example_DGESV_colmajor.c
index 3487873798..62a467139c 100644
--- a/LAPACKE/example/example_DGESV_colmajor.c
+++ b/LAPACKE/example/example_DGESV_colmajor.c
@@ -41,41 +41,41 @@ int main(int argc, char **argv) {
 
         /* Locals */
         lapack_int n, nrhs, lda, ldb, info;
-		int i, j;
+        int i, j;
         /* Local arrays */
-		double *A, *b;
-		lapack_int *ipiv;
+        double *A, *b;
+        lapack_int *ipiv;
 
         /* Default Value */
-	    n = 5; nrhs = 1;
+        n = 5; nrhs = 1;
 
         /* Arguments */
-	    for( i = 1; i < argc; i++ ) {
-	    	if( strcmp( argv[i], "-n" ) == 0 ) {
-		    	n  = atoi(argv[i+1]);
-			    i++;
-		    }
-			if( strcmp( argv[i], "-nrhs" ) == 0 ) {
-				nrhs  = atoi(argv[i+1]);
-				i++;
-			}
-		}
+        for( i = 1; i < argc; i++ ) {
+            if( strcmp( argv[i], "-n" ) == 0 ) {
+                n  = atoi(argv[i+1]);
+                i++;
+            }
+            if( strcmp( argv[i], "-nrhs" ) == 0 ) {
+                nrhs  = atoi(argv[i+1]);
+                i++;
+            }
+        }
 
         /* Initialization */
         lda=n, ldb=n;
-		A = (double *)malloc(n*n*sizeof(double)) ;
-		if (A==NULL){ printf("error of memory allocation\n"); exit(0); }
-		b = (double *)malloc(n*nrhs*sizeof(double)) ;
-		if (b==NULL){ printf("error of memory allocation\n"); exit(0); }
-		ipiv = (lapack_int *)malloc(n*sizeof(lapack_int)) ;
-		if (ipiv==NULL){ printf("error of memory allocation\n"); exit(0); }
+        A = (double *)malloc(n*n*sizeof(double)) ;
+        if (A==NULL){ printf("error of memory allocation\n"); exit(0); }
+        b = (double *)malloc(n*nrhs*sizeof(double)) ;
+        if (b==NULL){ printf("error of memory allocation\n"); free(A); exit(0); }
+        ipiv = (lapack_int *)malloc(n*sizeof(lapack_int)) ;
+        if (ipiv==NULL){ printf("error of memory allocation\n"); free(A); free(b); exit(0); }
 
         for( i = 0; i < n; i++ ) {
                 for( j = 0; j < n; j++ ) A[i+j*lda] = ((double) rand()) / ((double) RAND_MAX) - 0.5;
-		}
+        }
 
-		for(i=0;i<n*nrhs;i++)
-			b[i] = ((double) rand()) / ((double) RAND_MAX) - 0.5;
+        for(i=0;i<n*nrhs;i++)
+            b[i] = ((double) rand()) / ((double) RAND_MAX) - 0.5;
 
         /* Print Entry Matrix */
         print_matrix_colmajor( "Entry Matrix A", n, n, A, lda );
@@ -91,18 +91,32 @@ int main(int argc, char **argv) {
 
         /* Check for the exact singularity */
         if( info > 0 ) {
-                printf( "The diagonal element of the triangular factor of A,\n" );
-                printf( "U(%i,%i) is zero, so that A is singular;\n", info, info );
-                printf( "the solution could not be computed.\n" );
-                exit( 1 );
+            printf( "The diagonal element of the triangular factor of A,\n" );
+            printf( "U(%" LAPACK_IFMT ",%" LAPACK_IFMT ") is zero, so that A is singular;\n", info, info );
+            printf( "the solution could not be computed.\n" );
+            free(A);
+            free(b);
+            free(ipiv);
+            exit( 1 );
+        }
+        if (info <0) {
+            free(A);
+            free(b);
+            free(ipiv);
+            exit( 1 );
         }
-        if (info <0) exit( 1 );
         /* Print solution */
         print_matrix_colmajor( "Solution", n, nrhs, b, ldb );
         /* Print details of LU factorization */
         print_matrix_colmajor( "Details of LU factorization", n, n, A, lda );
         /* Print pivot indices */
         print_vector( "Pivot indices", n, ipiv );
+
+        /* Free matrices and vectors */
+        free(A);
+        free(b);
+        free(ipiv);
+
         exit( 0 );
 } /* End of LAPACKE_dgesv Example */
 
diff --git a/LAPACKE/example/example_DGESV_colmajor_64.c b/LAPACKE/example/example_DGESV_colmajor_64.c
new file mode 100644
index 0000000000..6bdc8c7b1a
--- /dev/null
+++ b/LAPACKE/example/example_DGESV_colmajor_64.c
@@ -0,0 +1,119 @@
+/*
+   LAPACKE_dgesv Example
+   =====================
+
+   The program computes the solution to the system of linear
+   equations with a square matrix A and multiple
+   right-hand sides B, where A is the coefficient matrix
+   and b is the right-hand side matrix:
+
+   Description
+   ===========
+
+   The routine solves for X the system of linear equations A*X = B,
+   where A is an n-by-n matrix, the columns of matrix B are individual
+   right-hand sides, and the columns of X are the corresponding
+   solutions.
+
+   The LU decomposition with partial pivoting and row interchanges is
+   used to factor A as A = P*L*U, where P is a permutation matrix, L
+   is unit lower triangular, and U is upper triangular. The factored
+   form of A is then used to solve the system of equations A*X = B.
+
+   LAPACKE Interface
+   =================
+
+   LAPACKE_dgesv (col-major, high-level) Example Program Results
+
+  -- LAPACKE Example routine --
+  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*/
+/* Includes */
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "lapacke_64.h"
+#include "lapacke_example_aux.h"
+
+/* Main program */
+int main(int argc, char **argv) {
+
+        /* Locals */
+        int64_t n, nrhs, lda, ldb, info;
+        int i, j;
+        /* Local arrays */
+        double *A, *b;
+        int64_t *ipiv;
+
+        /* Default Value */
+        n = 5; nrhs = 1;
+
+        /* Arguments */
+        for( i = 1; i < argc; i++ ) {
+            if( strcmp( argv[i], "-n" ) == 0 ) {
+                n  = atoi(argv[i+1]);
+                i++;
+            }
+            if( strcmp( argv[i], "-nrhs" ) == 0 ) {
+                nrhs  = atoi(argv[i+1]);
+                i++;
+            }
+        }
+
+        /* Initialization */
+        lda=n, ldb=n;
+        A = (double *)malloc(n*n*sizeof(double)) ;
+        if (A==NULL){ printf("error of memory allocation\n"); exit(0); }
+        b = (double *)malloc(n*nrhs*sizeof(double)) ;
+        if (b==NULL){ printf("error of memory allocation\n"); free(A); exit(0); }
+        ipiv = (int64_t *)malloc(n*sizeof(int64_t)) ;
+        if (ipiv==NULL){ printf("error of memory allocation\n"); free(A); free(b); exit(0); }
+
+        for( i = 0; i < n; i++ ) {
+                for( j = 0; j < n; j++ ) A[i+j*lda] = ((double) rand()) / ((double) RAND_MAX) - 0.5;
+        }
+
+        for(i=0;i<n*nrhs;i++)
+            b[i] = ((double) rand()) / ((double) RAND_MAX) - 0.5;
+
+        /* Print Entry Matrix */
+        print_matrix_colmajor_64( "Entry Matrix A", n, n, A, lda );
+        /* Print Right Rand Side */
+        print_matrix_colmajor_64( "Right Rand Side b", n, nrhs, b, ldb );
+        printf( "\n" );
+
+        /* Executable statements */
+        printf( "LAPACKE_dgesv_64 (row-major, high-level) Example Program Results\n" );
+        /* Solve the equations A*X = B */
+        info = LAPACKE_dgesv_64( LAPACK_COL_MAJOR, n, nrhs, A, lda, ipiv,
+                        b, ldb );
+
+        /* Check for the exact singularity */
+        if( info > 0 ) {
+            printf( "The diagonal element of the triangular factor of A,\n" );
+            printf( "U(%d,%d) is zero, so that A is singular;\n", (int) info, (int) info );
+            printf( "the solution could not be computed.\n" );
+            free(A);
+            free(b);
+            free(ipiv);
+            exit( 1 );
+        }
+        if (info <0) {
+            free(A);
+            free(b);
+            free(ipiv);
+            exit( 1 );
+        }
+        /* Print solution */
+        print_matrix_colmajor_64( "Solution", n, nrhs, b, ldb );
+        /* Print details of LU factorization */
+        print_matrix_colmajor_64( "Details of LU factorization", n, n, A, lda );
+        /* Print pivot indices */
+        print_vector_64( "Pivot indices", n, ipiv );
+        free(A);
+        free(b);
+        free(ipiv);
+        exit( 0 );
+} /* End of LAPACKE_dgesv Example */
+
diff --git a/LAPACKE/example/example_DGESV_rowmajor.c b/LAPACKE/example/example_DGESV_rowmajor.c
index d745367001..8cce8963db 100644
--- a/LAPACKE/example/example_DGESV_rowmajor.c
+++ b/LAPACKE/example/example_DGESV_rowmajor.c
@@ -40,41 +40,41 @@ int main(int argc, char **argv) {
 
         /* Locals */
         lapack_int n, nrhs, lda, ldb, info;
-		int i, j;
+        int i, j;
         /* Local arrays */
-		double *A, *b;
-		lapack_int *ipiv;
+        double *A, *b;
+        lapack_int *ipiv;
 
         /* Default Value */
-	    n = 5; nrhs = 1;
+        n = 5; nrhs = 1;
 
         /* Arguments */
-	    for( i = 1; i < argc; i++ ) {
-	    	if( strcmp( argv[i], "-n" ) == 0 ) {
-		    	n  = atoi(argv[i+1]);
-			    i++;
-		    }
-			if( strcmp( argv[i], "-nrhs" ) == 0 ) {
-				nrhs  = atoi(argv[i+1]);
-				i++;
-			}
-		}
+        for( i = 1; i < argc; i++ ) {
+            if( strcmp( argv[i], "-n" ) == 0 ) {
+                n  = atoi(argv[i+1]);
+                i++;
+            }
+            if( strcmp( argv[i], "-nrhs" ) == 0 ) {
+                nrhs  = atoi(argv[i+1]);
+                i++;
+            }
+        }
 
         /* Initialization */
         lda=n, ldb=nrhs;
-		A = (double *)malloc(n*n*sizeof(double)) ;
-		if (A==NULL){ printf("error of memory allocation\n"); exit(0); }
-		b = (double *)malloc(n*nrhs*sizeof(double)) ;
-		if (b==NULL){ printf("error of memory allocation\n"); exit(0); }
-		ipiv = (lapack_int *)malloc(n*sizeof(lapack_int)) ;
-		if (ipiv==NULL){ printf("error of memory allocation\n"); exit(0); }
+        A = (double *)malloc(n*n*sizeof(double)) ;
+        if (A==NULL){ printf("error of memory allocation\n"); exit(0); }
+        b = (double *)malloc(n*nrhs*sizeof(double)) ;
+        if (b==NULL){ printf("error of memory allocation\n"); free(A); exit(0); }
+        ipiv = (lapack_int *)malloc(n*sizeof(lapack_int)) ;
+        if (ipiv==NULL){ printf("error of memory allocation\n"); free(A); free(b); exit(0); }
 
         for( i = 0; i < n; i++ ) {
                 for( j = 0; j < n; j++ ) A[i*lda+j] = ((double) rand()) / ((double) RAND_MAX) - 0.5;
-		}
+        }
 
-		for(i=0;i<n*nrhs;i++)
-			b[i] = ((double) rand()) / ((double) RAND_MAX) - 0.5;
+        for(i=0;i<n*nrhs;i++)
+            b[i] = ((double) rand()) / ((double) RAND_MAX) - 0.5;
 
         /* Print Entry Matrix */
         print_matrix_rowmajor( "Entry Matrix A", n, n, A, lda );
@@ -88,18 +88,31 @@ int main(int argc, char **argv) {
                         b, ldb );
         /* Check for the exact singularity */
         if( info > 0 ) {
-                printf( "The diagonal element of the triangular factor of A,\n" );
-                printf( "U(%i,%i) is zero, so that A is singular;\n", info, info );
-                printf( "the solution could not be computed.\n" );
-                exit( 1 );
+            printf( "The diagonal element of the triangular factor of A,\n" );
+            printf( "U(%" LAPACK_IFMT ",%" LAPACK_IFMT ") is zero, so that A is singular;\n", info, info );
+            printf( "the solution could not be computed.\n" );
+            free(A);
+            free(b);
+            free(ipiv);
+            exit( 1 );
+        }
+        if (info <0) {
+            free(A);
+            free(b);
+            free(ipiv);
+            exit( 1 );
         }
-        if (info <0) exit( 1 );
         /* Print solution */
         print_matrix_rowmajor( "Solution", n, nrhs, b, ldb );
         /* Print details of LU factorization */
         print_matrix_rowmajor( "Details of LU factorization", n, n, A, lda );
         /* Print pivot indices */
         print_vector( "Pivot indices", n, ipiv );
+
+        /* Free matrices and vectors */
+        free(A);
+        free(b);
+        free(ipiv);
         exit( 0 );
 } /* End of LAPACKE_dgesv Example */
 
diff --git a/LAPACKE/example/example_DGESV_rowmajor_64.c b/LAPACKE/example/example_DGESV_rowmajor_64.c
new file mode 100644
index 0000000000..f767281225
--- /dev/null
+++ b/LAPACKE/example/example_DGESV_rowmajor_64.c
@@ -0,0 +1,116 @@
+/*
+   LAPACKE_dgesv Example
+   =====================
+
+   The program computes the solution to the system of linear
+   equations with a square matrix A and multiple
+   right-hand sides B, where A is the coefficient matrix
+   and b is the right-hand side matrix:
+
+   Description
+   ===========
+
+   The routine solves for X the system of linear equations A*X = B,
+   where A is an n-by-n matrix, the columns of matrix B are individual
+   right-hand sides, and the columns of X are the corresponding
+   solutions.
+
+   The LU decomposition with partial pivoting and row interchanges is
+   used to factor A as A = P*L*U, where P is a permutation matrix, L
+   is unit lower triangular, and U is upper triangular. The factored
+   form of A is then used to solve the system of equations A*X = B.
+
+   LAPACKE Interface
+   =================
+
+   LAPACKE_dgesv (row-major, high-level) Example Program Results
+
+  -- LAPACKE Example routine --
+  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*/
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <lapacke_64.h>
+#include "lapacke_example_aux.h"
+
+/* Main program */
+int main(int argc, char **argv) {
+
+        /* Locals */
+        int64_t n, nrhs, lda, ldb, info;
+        int i, j;
+        /* Local arrays */
+        double *A, *b;
+        int64_t *ipiv;
+
+        /* Default Value */
+        n = 5; nrhs = 1;
+
+        /* Arguments */
+        for( i = 1; i < argc; i++ ) {
+            if( strcmp( argv[i], "-n" ) == 0 ) {
+                n  = atoi(argv[i+1]);
+                i++;
+            }
+            if( strcmp( argv[i], "-nrhs" ) == 0 ) {
+                nrhs  = atoi(argv[i+1]);
+                i++;
+            }
+        }
+
+        /* Initialization */
+        lda=n, ldb=nrhs;
+        A = (double *)malloc(n*n*sizeof(double)) ;
+        if (A==NULL){ printf("error of memory allocation\n"); exit(0); }
+        b = (double *)malloc(n*nrhs*sizeof(double)) ;
+        if (b==NULL){ printf("error of memory allocation\n"); free(A); exit(0); }
+        ipiv = (int64_t *)malloc(n*sizeof(int64_t)) ;
+        if (ipiv==NULL){ printf("error of memory allocation\n"); free(A); free(b); exit(0); }
+
+        for( i = 0; i < n; i++ ) {
+                for( j = 0; j < n; j++ ) A[i*lda+j] = ((double) rand()) / ((double) RAND_MAX) - 0.5;
+        }
+
+        for(i=0;i<n*nrhs;i++)
+            b[i] = ((double) rand()) / ((double) RAND_MAX) - 0.5;
+
+        /* Print Entry Matrix */
+        print_matrix_rowmajor_64( "Entry Matrix A", n, n, A, lda );
+        /* Print Right Rand Side */
+        print_matrix_rowmajor_64( "Right Rand Side b", n, nrhs, b, ldb );
+        printf( "\n" );
+        /* Executable statements */
+        printf( "LAPACKE_dgesv_64 (row-major, high-level) Example Program Results\n" );
+        /* Solve the equations A*X = B */
+        info = LAPACKE_dgesv_64( LAPACK_ROW_MAJOR, n, nrhs, A, lda, ipiv,
+                        b, ldb );
+        /* Check for the exact singularity */
+        if( info > 0 ) {
+            printf( "The diagonal element of the triangular factor of A,\n" );
+            printf( "U(%d,%d) is zero, so that A is singular;\n", (int) info, (int) info );
+            printf( "the solution could not be computed.\n" );
+            free(A);
+            free(b);
+            free(ipiv);
+            exit( 1 );
+        }
+        if (info <0) {
+            free(A);
+            free(b);
+            free(ipiv);
+            exit( 1 );
+        }
+        /* Print solution */
+        print_matrix_rowmajor_64( "Solution", n, nrhs, b, ldb );
+        /* Print details of LU factorization */
+        print_matrix_rowmajor_64( "Details of LU factorization", n, n, A, lda );
+        /* Print pivot indices */
+        print_vector_64( "Pivot indices", n, ipiv );
+        free(A);
+        free(b);
+        free(ipiv);
+        exit( 0 );
+} /* End of LAPACKE_dgesv Example */
+
diff --git a/LAPACKE/example/lapacke_example_aux.c b/LAPACKE/example/lapacke_example_aux.c
index 9b72eb6209..50fce9dd83 100644
--- a/LAPACKE/example/lapacke_example_aux.c
+++ b/LAPACKE/example/lapacke_example_aux.c
@@ -28,6 +28,38 @@ void print_matrix_colmajor( char* desc, lapack_int m, lapack_int n, double* mat,
 void print_vector( char* desc, lapack_int n, lapack_int* vec ) {
         lapack_int j;
         printf( "\n %s\n", desc );
-        for( j = 0; j < n; j++ ) printf( " %6i", vec[j] );
+        for( j = 0; j < n; j++ ) printf( " %6" LAPACK_IFMT, vec[j] );
+        printf( "\n" );
+}
+
+/* ILP64 routines */
+/* Auxiliary routine: printing a matrix */
+void print_matrix_rowmajor_64( char* desc, int64_t m, int64_t n, double* mat, int64_t ldm ) {
+        int64_t i, j;
+        printf( "\n %s\n", desc );
+
+        for( i = 0; i < m; i++ ) {
+                for( j = 0; j < n; j++ ) printf( " %6.2f", mat[i*ldm+j] );
+                printf( "\n" );
+        }
+}
+
+
+/* Auxiliary routine: printing a matrix */
+void print_matrix_colmajor_64( char* desc, int64_t m, int64_t n, double* mat, int64_t ldm ) {
+        int64_t i, j;
+        printf( "\n %s\n", desc );
+
+        for( i = 0; i < m; i++ ) {
+                for( j = 0; j < n; j++ ) printf( " %6.2f", mat[i+j*ldm] );
+                printf( "\n" );
+        }
+}
+
+/* Auxiliary routine: printing a vector of integers */
+void print_vector_64( char* desc, int64_t n, int64_t* vec ) {
+        int64_t j;
+        printf( "\n %s\n", desc );
+        for( j = 0; j < n; j++ ) printf( " %6d", (int) vec[j] );
         printf( "\n" );
 }
diff --git a/LAPACKE/example/lapacke_example_aux.h b/LAPACKE/example/lapacke_example_aux.h
index f83351152c..2b3389fa1d 100644
--- a/LAPACKE/example/lapacke_example_aux.h
+++ b/LAPACKE/example/lapacke_example_aux.h
@@ -6,4 +6,8 @@ void print_matrix_rowmajor( char* desc, lapack_int m, lapack_int n, double* mat,
 void print_matrix_colmajor( char* desc, lapack_int m, lapack_int n, double* mat, lapack_int ldm );
 void print_vector( char* desc, lapack_int n, lapack_int* vec );
 
+void print_matrix_rowmajor_64( char* desc, int64_t m, int64_t n, double* mat, int64_t ldm );
+void print_matrix_colmajor_64( char* desc, int64_t m, int64_t n, double* mat, int64_t ldm );
+void print_vector_64( char* desc, int64_t n, int64_t* vec );
+
 #endif /* _LAPACKE_EXAMPLE_AUX_*/
diff --git a/LAPACKE/include/CMakeLists.txt b/LAPACKE/include/CMakeLists.txt
index b690dc5548..034491ea0a 100644
--- a/LAPACKE/include/CMakeLists.txt
+++ b/LAPACKE/include/CMakeLists.txt
@@ -1,3 +1,26 @@
-set(LAPACKE_INCLUDE lapacke.h lapack.h lapacke_config.h lapacke_utils.h)
+set(LAPACKE_INCLUDE lapack.h)
+IF(LAPACKE)
+    list(APPEND LAPACKE_INCLUDE lapacke.h lapacke_config.h lapacke_utils.h)
+endif()
 
 file(COPY ${LAPACKE_INCLUDE} DESTINATION ${LAPACK_BINARY_DIR}/include)
+
+# Create a header file lapacke_mangling.h for the routines called in my C programs
+include(CheckLanguage)
+check_language(Fortran)
+check_language(C)
+if(CMAKE_Fortran_COMPILER AND CMAKE_C_COMPILER)
+  enable_language(Fortran)
+  enable_language(C)
+  include(FortranCInterface)
+  ## Ensure that the fortran compiler and c compiler specified are compatible
+  FortranCInterface_VERIFY()
+  FortranCInterface_HEADER(${LAPACK_BINARY_DIR}/include/lapacke_mangling.h
+    MACRO_NAMESPACE "LAPACK_"
+    SYMBOL_NAMESPACE "LAPACK_")
+endif()
+if(NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND)
+  message(WARNING "Reverting to pre-defined include/lapacke_mangling.h")
+  configure_file(lapacke_mangling_with_flags.h.in
+                 ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h)
+endif()
\ No newline at end of file
diff --git a/LAPACKE/include/lapack.h b/LAPACKE/include/lapack.h
index e4c39e1eea..a9f110fdc6 100644
--- a/LAPACKE/include/lapack.h
+++ b/LAPACKE/include/lapack.h
@@ -12,12 +12,17 @@
 
 #include <stdlib.h>
 #include <stdarg.h>
+#include <inttypes.h>
 
 /* It seems all current Fortran compilers put strlen at end.
 *  Some historical compilers put strlen after the str argument
 *  or make the str argument into a struct. */
 #define LAPACK_FORTRAN_STRLEN_END
 
+#ifndef FORTRAN_STRLEN
+  #define FORTRAN_STRLEN size_t
+#endif
+
 /* Complex types are structures equivalent to the
 * Fortran complex types COMPLEX(4) and COMPLEX(8).
 *
@@ -42,8 +47,12 @@
 #else
 #include <complex>
 #endif
+#if _MSC_VER
+#define lapack_complex_float    _Fcomplex
+#else
 #define lapack_complex_float    float _Complex
 #endif
+#endif
 
 #ifndef lapack_complex_float_real
 #define lapack_complex_float_real(z)       (creal(z))
@@ -60,8 +69,12 @@
 #else
 #include <complex>
 #endif
+#if _MSC_VER
+#define lapack_complex_double   _Dcomplex
+#else
 #define lapack_complex_double   double _Complex
 #endif
+#endif
 
 #ifndef lapack_complex_double_real
 #define lapack_complex_double_real(z)      (creal(z))
@@ -80,11 +93,26 @@ extern "C" {
 
 /*----------------------------------------------------------------------------*/
 #ifndef lapack_int
-#define lapack_int     int
+#if defined(LAPACK_ILP64)
+#define lapack_int        int64_t
+#else
+#define lapack_int        int32_t
+#endif
+#endif
+
+/*
+ * Integer format string
+ */
+#ifndef LAPACK_IFMT
+#if defined(LAPACK_ILP64)
+#define LAPACK_IFMT       PRId64
+#else
+#define LAPACK_IFMT       PRId32
+#endif
 #endif
 
 #ifndef lapack_logical
-#define lapack_logical lapack_int
+#define lapack_logical    lapack_int
 #endif
 
 /* f2c, hence clapack and MacOS Accelerate, returns double instead of float
@@ -115,10 +143,9 @@ typedef lapack_logical (*LAPACK_Z_SELECT2)
     ( const lapack_complex_double*, const lapack_complex_double* );
 
 #define LAPACK_lsame_base LAPACK_GLOBAL(lsame,LSAME)
-lapack_logical LAPACK_lsame_base( char* ca,  char* cb,
-                              lapack_int lca, lapack_int lcb
+lapack_logical LAPACK_lsame_base( const char* ca,  const char* cb
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -127,11 +154,25 @@ lapack_logical LAPACK_lsame_base( char* ca,  char* cb,
     #define LAPACK_lsame(...) LAPACK_lsame_base(__VA_ARGS__)
 #endif
 
+/*
+ * Integer specific API
+ */
+#ifdef LAPACKE_API64
+#ifndef API_SUFFIX
+#define API_SUFFIX(a) a##_64
+#endif
+#define LAPACK_GLOBAL_SUFFIX(a,b) LAPACK_GLOBAL_SUFFIX_(API_SUFFIX(a),API_SUFFIX(b))
+#define LAPACK_GLOBAL_SUFFIX_(a,b) LAPACK_GLOBAL(a,b)
+#else
+#define LAPACK_GLOBAL_SUFFIX(a,b) LAPACK_GLOBAL(a,b)
+#endif
+
+
 
 /*----------------------------------------------------------------------------*/
 /* This is in alphabetical order (ignoring leading precision). */
 
-#define LAPACK_cbbcsd_base LAPACK_GLOBAL(cbbcsd,CBBCSD)
+#define LAPACK_cbbcsd_base LAPACK_GLOBAL_SUFFIX(cbbcsd,CBBCSD)
 void LAPACK_cbbcsd_base(
     char const* jobu1, char const* jobu2, char const* jobv1t, char const* jobv2t, char const* trans,
     lapack_int const* m, lapack_int const* p, lapack_int const* q,
@@ -152,7 +193,7 @@ void LAPACK_cbbcsd_base(
     float* rwork, lapack_int const* lrwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -161,7 +202,7 @@ void LAPACK_cbbcsd_base(
     #define LAPACK_cbbcsd(...) LAPACK_cbbcsd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dbbcsd_base LAPACK_GLOBAL(dbbcsd,DBBCSD)
+#define LAPACK_dbbcsd_base LAPACK_GLOBAL_SUFFIX(dbbcsd,DBBCSD)
 void LAPACK_dbbcsd_base(
     char const* jobu1, char const* jobu2, char const* jobv1t, char const* jobv2t, char const* trans,
     lapack_int const* m, lapack_int const* p, lapack_int const* q,
@@ -182,7 +223,7 @@ void LAPACK_dbbcsd_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -191,7 +232,7 @@ void LAPACK_dbbcsd_base(
     #define LAPACK_dbbcsd(...) LAPACK_dbbcsd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sbbcsd_base LAPACK_GLOBAL(sbbcsd,SBBCSD)
+#define LAPACK_sbbcsd_base LAPACK_GLOBAL_SUFFIX(sbbcsd,SBBCSD)
 void LAPACK_sbbcsd_base(
     char const* jobu1, char const* jobu2, char const* jobv1t, char const* jobv2t, char const* trans,
     lapack_int const* m, lapack_int const* p, lapack_int const* q,
@@ -212,7 +253,7 @@ void LAPACK_sbbcsd_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -221,7 +262,7 @@ void LAPACK_sbbcsd_base(
     #define LAPACK_sbbcsd(...) LAPACK_sbbcsd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zbbcsd_base LAPACK_GLOBAL(zbbcsd,ZBBCSD)
+#define LAPACK_zbbcsd_base LAPACK_GLOBAL_SUFFIX(zbbcsd,ZBBCSD)
 void LAPACK_zbbcsd_base(
     char const* jobu1, char const* jobu2, char const* jobv1t, char const* jobv2t, char const* trans,
     lapack_int const* m, lapack_int const* p, lapack_int const* q,
@@ -242,7 +283,7 @@ void LAPACK_zbbcsd_base(
     double* rwork, lapack_int const* lrwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -251,7 +292,7 @@ void LAPACK_zbbcsd_base(
     #define LAPACK_zbbcsd(...) LAPACK_zbbcsd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dbdsdc_base LAPACK_GLOBAL(dbdsdc,DBDSDC)
+#define LAPACK_dbdsdc_base LAPACK_GLOBAL_SUFFIX(dbdsdc,DBDSDC)
 void LAPACK_dbdsdc_base(
     char const* uplo, char const* compq,
     lapack_int const* n,
@@ -264,7 +305,7 @@ void LAPACK_dbdsdc_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -273,7 +314,7 @@ void LAPACK_dbdsdc_base(
     #define LAPACK_dbdsdc(...) LAPACK_dbdsdc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sbdsdc_base LAPACK_GLOBAL(sbdsdc,SBDSDC)
+#define LAPACK_sbdsdc_base LAPACK_GLOBAL_SUFFIX(sbdsdc,SBDSDC)
 void LAPACK_sbdsdc_base(
     char const* uplo, char const* compq,
     lapack_int const* n,
@@ -286,7 +327,7 @@ void LAPACK_sbdsdc_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -295,7 +336,7 @@ void LAPACK_sbdsdc_base(
     #define LAPACK_sbdsdc(...) LAPACK_sbdsdc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cbdsqr_base LAPACK_GLOBAL(cbdsqr,CBDSQR)
+#define LAPACK_cbdsqr_base LAPACK_GLOBAL_SUFFIX(cbdsqr,CBDSQR)
 void LAPACK_cbdsqr_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* ncvt, lapack_int const* nru, lapack_int const* ncc,
@@ -307,7 +348,7 @@ void LAPACK_cbdsqr_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -316,7 +357,7 @@ void LAPACK_cbdsqr_base(
     #define LAPACK_cbdsqr(...) LAPACK_cbdsqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dbdsqr_base LAPACK_GLOBAL(dbdsqr,DBDSQR)
+#define LAPACK_dbdsqr_base LAPACK_GLOBAL_SUFFIX(dbdsqr,DBDSQR)
 void LAPACK_dbdsqr_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* ncvt, lapack_int const* nru, lapack_int const* ncc,
@@ -328,7 +369,7 @@ void LAPACK_dbdsqr_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -337,7 +378,7 @@ void LAPACK_dbdsqr_base(
     #define LAPACK_dbdsqr(...) LAPACK_dbdsqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sbdsqr_base LAPACK_GLOBAL(sbdsqr,SBDSQR)
+#define LAPACK_sbdsqr_base LAPACK_GLOBAL_SUFFIX(sbdsqr,SBDSQR)
 void LAPACK_sbdsqr_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* ncvt, lapack_int const* nru, lapack_int const* ncc,
@@ -349,7 +390,7 @@ void LAPACK_sbdsqr_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -358,7 +399,7 @@ void LAPACK_sbdsqr_base(
     #define LAPACK_sbdsqr(...) LAPACK_sbdsqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zbdsqr_base LAPACK_GLOBAL(zbdsqr,ZBDSQR)
+#define LAPACK_zbdsqr_base LAPACK_GLOBAL_SUFFIX(zbdsqr,ZBDSQR)
 void LAPACK_zbdsqr_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* ncvt, lapack_int const* nru, lapack_int const* ncc,
@@ -370,7 +411,7 @@ void LAPACK_zbdsqr_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -379,7 +420,7 @@ void LAPACK_zbdsqr_base(
     #define LAPACK_zbdsqr(...) LAPACK_zbdsqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dbdsvdx_base LAPACK_GLOBAL(dbdsvdx,DBDSVDX)
+#define LAPACK_dbdsvdx_base LAPACK_GLOBAL_SUFFIX(dbdsvdx,DBDSVDX)
 void LAPACK_dbdsvdx_base(
     char const* uplo, char const* jobz, char const* range,
     lapack_int const* n,
@@ -393,7 +434,7 @@ void LAPACK_dbdsvdx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -402,7 +443,7 @@ void LAPACK_dbdsvdx_base(
     #define LAPACK_dbdsvdx(...) LAPACK_dbdsvdx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sbdsvdx_base LAPACK_GLOBAL(sbdsvdx,SBDSVDX)
+#define LAPACK_sbdsvdx_base LAPACK_GLOBAL_SUFFIX(sbdsvdx,SBDSVDX)
 void LAPACK_sbdsvdx_base(
     char const* uplo, char const* jobz, char const* range,
     lapack_int const* n,
@@ -416,7 +457,7 @@ void LAPACK_sbdsvdx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -425,7 +466,7 @@ void LAPACK_sbdsvdx_base(
     #define LAPACK_sbdsvdx(...) LAPACK_sbdsvdx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ddisna_base LAPACK_GLOBAL(ddisna,DDISNA)
+#define LAPACK_ddisna_base LAPACK_GLOBAL_SUFFIX(ddisna,DDISNA)
 void LAPACK_ddisna_base(
     char const* job,
     lapack_int const* m, lapack_int const* n,
@@ -433,7 +474,7 @@ void LAPACK_ddisna_base(
     double* SEP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -442,7 +483,7 @@ void LAPACK_ddisna_base(
     #define LAPACK_ddisna(...) LAPACK_ddisna_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sdisna_base LAPACK_GLOBAL(sdisna,SDISNA)
+#define LAPACK_sdisna_base LAPACK_GLOBAL_SUFFIX(sdisna,SDISNA)
 void LAPACK_sdisna_base(
     char const* job,
     lapack_int const* m, lapack_int const* n,
@@ -450,7 +491,7 @@ void LAPACK_sdisna_base(
     float* SEP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -459,7 +500,7 @@ void LAPACK_sdisna_base(
     #define LAPACK_sdisna(...) LAPACK_sdisna_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgbbrd_base LAPACK_GLOBAL(cgbbrd,CGBBRD)
+#define LAPACK_cgbbrd_base LAPACK_GLOBAL_SUFFIX(cgbbrd,CGBBRD)
 void LAPACK_cgbbrd_base(
     char const* vect,
     lapack_int const* m, lapack_int const* n, lapack_int const* ncc, lapack_int const* kl, lapack_int const* ku,
@@ -473,7 +514,7 @@ void LAPACK_cgbbrd_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -482,7 +523,7 @@ void LAPACK_cgbbrd_base(
     #define LAPACK_cgbbrd(...) LAPACK_cgbbrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgbbrd_base LAPACK_GLOBAL(dgbbrd,DGBBRD)
+#define LAPACK_dgbbrd_base LAPACK_GLOBAL_SUFFIX(dgbbrd,DGBBRD)
 void LAPACK_dgbbrd_base(
     char const* vect,
     lapack_int const* m, lapack_int const* n, lapack_int const* ncc, lapack_int const* kl, lapack_int const* ku,
@@ -495,7 +536,7 @@ void LAPACK_dgbbrd_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -504,7 +545,7 @@ void LAPACK_dgbbrd_base(
     #define LAPACK_dgbbrd(...) LAPACK_dgbbrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgbbrd_base LAPACK_GLOBAL(sgbbrd,SGBBRD)
+#define LAPACK_sgbbrd_base LAPACK_GLOBAL_SUFFIX(sgbbrd,SGBBRD)
 void LAPACK_sgbbrd_base(
     char const* vect,
     lapack_int const* m, lapack_int const* n, lapack_int const* ncc, lapack_int const* kl, lapack_int const* ku,
@@ -517,7 +558,7 @@ void LAPACK_sgbbrd_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -526,7 +567,7 @@ void LAPACK_sgbbrd_base(
     #define LAPACK_sgbbrd(...) LAPACK_sgbbrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgbbrd_base LAPACK_GLOBAL(zgbbrd,ZGBBRD)
+#define LAPACK_zgbbrd_base LAPACK_GLOBAL_SUFFIX(zgbbrd,ZGBBRD)
 void LAPACK_zgbbrd_base(
     char const* vect,
     lapack_int const* m, lapack_int const* n, lapack_int const* ncc, lapack_int const* kl, lapack_int const* ku,
@@ -540,7 +581,7 @@ void LAPACK_zgbbrd_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -549,7 +590,7 @@ void LAPACK_zgbbrd_base(
     #define LAPACK_zgbbrd(...) LAPACK_zgbbrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgbcon_base LAPACK_GLOBAL(cgbcon,CGBCON)
+#define LAPACK_cgbcon_base LAPACK_GLOBAL_SUFFIX(cgbcon,CGBCON)
 void LAPACK_cgbcon_base(
     char const* norm,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
@@ -560,7 +601,7 @@ void LAPACK_cgbcon_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -569,7 +610,7 @@ void LAPACK_cgbcon_base(
     #define LAPACK_cgbcon(...) LAPACK_cgbcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgbcon_base LAPACK_GLOBAL(dgbcon,DGBCON)
+#define LAPACK_dgbcon_base LAPACK_GLOBAL_SUFFIX(dgbcon,DGBCON)
 void LAPACK_dgbcon_base(
     char const* norm,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
@@ -580,7 +621,7 @@ void LAPACK_dgbcon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -589,7 +630,7 @@ void LAPACK_dgbcon_base(
     #define LAPACK_dgbcon(...) LAPACK_dgbcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgbcon_base LAPACK_GLOBAL(sgbcon,SGBCON)
+#define LAPACK_sgbcon_base LAPACK_GLOBAL_SUFFIX(sgbcon,SGBCON)
 void LAPACK_sgbcon_base(
     char const* norm,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
@@ -600,7 +641,7 @@ void LAPACK_sgbcon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -609,7 +650,7 @@ void LAPACK_sgbcon_base(
     #define LAPACK_sgbcon(...) LAPACK_sgbcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgbcon_base LAPACK_GLOBAL(zgbcon,ZGBCON)
+#define LAPACK_zgbcon_base LAPACK_GLOBAL_SUFFIX(zgbcon,ZGBCON)
 void LAPACK_zgbcon_base(
     char const* norm,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
@@ -620,7 +661,7 @@ void LAPACK_zgbcon_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -629,7 +670,7 @@ void LAPACK_zgbcon_base(
     #define LAPACK_zgbcon(...) LAPACK_zgbcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgbequ LAPACK_GLOBAL(cgbequ,CGBEQU)
+#define LAPACK_cgbequ LAPACK_GLOBAL_SUFFIX(cgbequ,CGBEQU)
 void LAPACK_cgbequ(
     lapack_int const* m, lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     lapack_complex_float const* AB, lapack_int const* ldab,
@@ -640,7 +681,7 @@ void LAPACK_cgbequ(
     float* amax,
     lapack_int* info );
 
-#define LAPACK_dgbequ LAPACK_GLOBAL(dgbequ,DGBEQU)
+#define LAPACK_dgbequ LAPACK_GLOBAL_SUFFIX(dgbequ,DGBEQU)
 void LAPACK_dgbequ(
     lapack_int const* m, lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     double const* AB, lapack_int const* ldab,
@@ -651,7 +692,7 @@ void LAPACK_dgbequ(
     double* amax,
     lapack_int* info );
 
-#define LAPACK_sgbequ LAPACK_GLOBAL(sgbequ,SGBEQU)
+#define LAPACK_sgbequ LAPACK_GLOBAL_SUFFIX(sgbequ,SGBEQU)
 void LAPACK_sgbequ(
     lapack_int const* m, lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     float const* AB, lapack_int const* ldab,
@@ -662,7 +703,7 @@ void LAPACK_sgbequ(
     float* amax,
     lapack_int* info );
 
-#define LAPACK_zgbequ LAPACK_GLOBAL(zgbequ,ZGBEQU)
+#define LAPACK_zgbequ LAPACK_GLOBAL_SUFFIX(zgbequ,ZGBEQU)
 void LAPACK_zgbequ(
     lapack_int const* m, lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     lapack_complex_double const* AB, lapack_int const* ldab,
@@ -673,7 +714,7 @@ void LAPACK_zgbequ(
     double* amax,
     lapack_int* info );
 
-#define LAPACK_cgbequb LAPACK_GLOBAL(cgbequb,CGBEQUB)
+#define LAPACK_cgbequb LAPACK_GLOBAL_SUFFIX(cgbequb,CGBEQUB)
 void LAPACK_cgbequb(
     lapack_int const* m, lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     lapack_complex_float const* AB, lapack_int const* ldab,
@@ -684,7 +725,7 @@ void LAPACK_cgbequb(
     float* amax,
     lapack_int* info );
 
-#define LAPACK_dgbequb LAPACK_GLOBAL(dgbequb,DGBEQUB)
+#define LAPACK_dgbequb LAPACK_GLOBAL_SUFFIX(dgbequb,DGBEQUB)
 void LAPACK_dgbequb(
     lapack_int const* m, lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     double const* AB, lapack_int const* ldab,
@@ -695,7 +736,7 @@ void LAPACK_dgbequb(
     double* amax,
     lapack_int* info );
 
-#define LAPACK_sgbequb LAPACK_GLOBAL(sgbequb,SGBEQUB)
+#define LAPACK_sgbequb LAPACK_GLOBAL_SUFFIX(sgbequb,SGBEQUB)
 void LAPACK_sgbequb(
     lapack_int const* m, lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     float const* AB, lapack_int const* ldab,
@@ -706,7 +747,7 @@ void LAPACK_sgbequb(
     float* amax,
     lapack_int* info );
 
-#define LAPACK_zgbequb LAPACK_GLOBAL(zgbequb,ZGBEQUB)
+#define LAPACK_zgbequb LAPACK_GLOBAL_SUFFIX(zgbequb,ZGBEQUB)
 void LAPACK_zgbequb(
     lapack_int const* m, lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     lapack_complex_double const* AB, lapack_int const* ldab,
@@ -717,7 +758,7 @@ void LAPACK_zgbequb(
     double* amax,
     lapack_int* info );
 
-#define LAPACK_cgbrfs_base LAPACK_GLOBAL(cgbrfs,CGBRFS)
+#define LAPACK_cgbrfs_base LAPACK_GLOBAL_SUFFIX(cgbrfs,CGBRFS)
 void LAPACK_cgbrfs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -731,7 +772,7 @@ void LAPACK_cgbrfs_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -740,7 +781,7 @@ void LAPACK_cgbrfs_base(
     #define LAPACK_cgbrfs(...) LAPACK_cgbrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgbrfs_base LAPACK_GLOBAL(dgbrfs,DGBRFS)
+#define LAPACK_dgbrfs_base LAPACK_GLOBAL_SUFFIX(dgbrfs,DGBRFS)
 void LAPACK_dgbrfs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -754,7 +795,7 @@ void LAPACK_dgbrfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -763,7 +804,7 @@ void LAPACK_dgbrfs_base(
     #define LAPACK_dgbrfs(...) LAPACK_dgbrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgbrfs_base LAPACK_GLOBAL(sgbrfs,SGBRFS)
+#define LAPACK_sgbrfs_base LAPACK_GLOBAL_SUFFIX(sgbrfs,SGBRFS)
 void LAPACK_sgbrfs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -777,7 +818,7 @@ void LAPACK_sgbrfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -786,7 +827,7 @@ void LAPACK_sgbrfs_base(
     #define LAPACK_sgbrfs(...) LAPACK_sgbrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgbrfs_base LAPACK_GLOBAL(zgbrfs,ZGBRFS)
+#define LAPACK_zgbrfs_base LAPACK_GLOBAL_SUFFIX(zgbrfs,ZGBRFS)
 void LAPACK_zgbrfs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -800,7 +841,7 @@ void LAPACK_zgbrfs_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -809,7 +850,7 @@ void LAPACK_zgbrfs_base(
     #define LAPACK_zgbrfs(...) LAPACK_zgbrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgbrfsx_base LAPACK_GLOBAL(cgbrfsx,CGBRFSX)
+#define LAPACK_cgbrfsx_base LAPACK_GLOBAL_SUFFIX(cgbrfsx,CGBRFSX)
 void LAPACK_cgbrfsx_base(
     char const* trans, char const* equed,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -828,7 +869,7 @@ void LAPACK_cgbrfsx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -837,7 +878,7 @@ void LAPACK_cgbrfsx_base(
     #define LAPACK_cgbrfsx(...) LAPACK_cgbrfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgbrfsx_base LAPACK_GLOBAL(dgbrfsx,DGBRFSX)
+#define LAPACK_dgbrfsx_base LAPACK_GLOBAL_SUFFIX(dgbrfsx,DGBRFSX)
 void LAPACK_dgbrfsx_base(
     char const* trans, char const* equed,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -856,7 +897,7 @@ void LAPACK_dgbrfsx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -865,7 +906,7 @@ void LAPACK_dgbrfsx_base(
     #define LAPACK_dgbrfsx(...) LAPACK_dgbrfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgbrfsx_base LAPACK_GLOBAL(sgbrfsx,SGBRFSX)
+#define LAPACK_sgbrfsx_base LAPACK_GLOBAL_SUFFIX(sgbrfsx,SGBRFSX)
 void LAPACK_sgbrfsx_base(
     char const* trans, char const* equed,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -884,7 +925,7 @@ void LAPACK_sgbrfsx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -893,7 +934,7 @@ void LAPACK_sgbrfsx_base(
     #define LAPACK_sgbrfsx(...) LAPACK_sgbrfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgbrfsx_base LAPACK_GLOBAL(zgbrfsx,ZGBRFSX)
+#define LAPACK_zgbrfsx_base LAPACK_GLOBAL_SUFFIX(zgbrfsx,ZGBRFSX)
 void LAPACK_zgbrfsx_base(
     char const* trans, char const* equed,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -912,7 +953,7 @@ void LAPACK_zgbrfsx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -921,35 +962,35 @@ void LAPACK_zgbrfsx_base(
     #define LAPACK_zgbrfsx(...) LAPACK_zgbrfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgbsv LAPACK_GLOBAL(cgbsv,CGBSV)
+#define LAPACK_cgbsv LAPACK_GLOBAL_SUFFIX(cgbsv,CGBSV)
 void LAPACK_cgbsv(
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
     lapack_complex_float* AB, lapack_int const* ldab, lapack_int* ipiv,
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_dgbsv LAPACK_GLOBAL(dgbsv,DGBSV)
+#define LAPACK_dgbsv LAPACK_GLOBAL_SUFFIX(dgbsv,DGBSV)
 void LAPACK_dgbsv(
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
     double* AB, lapack_int const* ldab, lapack_int* ipiv,
     double* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_sgbsv LAPACK_GLOBAL(sgbsv,SGBSV)
+#define LAPACK_sgbsv LAPACK_GLOBAL_SUFFIX(sgbsv,SGBSV)
 void LAPACK_sgbsv(
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
     float* AB, lapack_int const* ldab, lapack_int* ipiv,
     float* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_zgbsv LAPACK_GLOBAL(zgbsv,ZGBSV)
+#define LAPACK_zgbsv LAPACK_GLOBAL_SUFFIX(zgbsv,ZGBSV)
 void LAPACK_zgbsv(
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
     lapack_complex_double* AB, lapack_int const* ldab, lapack_int* ipiv,
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_cgbsvx_base LAPACK_GLOBAL(cgbsvx,CGBSVX)
+#define LAPACK_cgbsvx_base LAPACK_GLOBAL_SUFFIX(cgbsvx,CGBSVX)
 void LAPACK_cgbsvx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -967,7 +1008,7 @@ void LAPACK_cgbsvx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -976,7 +1017,7 @@ void LAPACK_cgbsvx_base(
     #define LAPACK_cgbsvx(...) LAPACK_cgbsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgbsvx_base LAPACK_GLOBAL(dgbsvx,DGBSVX)
+#define LAPACK_dgbsvx_base LAPACK_GLOBAL_SUFFIX(dgbsvx,DGBSVX)
 void LAPACK_dgbsvx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -994,7 +1035,7 @@ void LAPACK_dgbsvx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1003,7 +1044,7 @@ void LAPACK_dgbsvx_base(
     #define LAPACK_dgbsvx(...) LAPACK_dgbsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgbsvx_base LAPACK_GLOBAL(sgbsvx,SGBSVX)
+#define LAPACK_sgbsvx_base LAPACK_GLOBAL_SUFFIX(sgbsvx,SGBSVX)
 void LAPACK_sgbsvx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -1021,7 +1062,7 @@ void LAPACK_sgbsvx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1030,7 +1071,7 @@ void LAPACK_sgbsvx_base(
     #define LAPACK_sgbsvx(...) LAPACK_sgbsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgbsvx_base LAPACK_GLOBAL(zgbsvx,ZGBSVX)
+#define LAPACK_zgbsvx_base LAPACK_GLOBAL_SUFFIX(zgbsvx,ZGBSVX)
 void LAPACK_zgbsvx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -1048,7 +1089,7 @@ void LAPACK_zgbsvx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1057,7 +1098,7 @@ void LAPACK_zgbsvx_base(
     #define LAPACK_zgbsvx(...) LAPACK_zgbsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgbsvxx_base LAPACK_GLOBAL(cgbsvxx,CGBSVXX)
+#define LAPACK_cgbsvxx_base LAPACK_GLOBAL_SUFFIX(cgbsvxx,CGBSVXX)
 void LAPACK_cgbsvxx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -1078,7 +1119,7 @@ void LAPACK_cgbsvxx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1087,7 +1128,7 @@ void LAPACK_cgbsvxx_base(
     #define LAPACK_cgbsvxx(...) LAPACK_cgbsvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgbsvxx_base LAPACK_GLOBAL(dgbsvxx,DGBSVXX)
+#define LAPACK_dgbsvxx_base LAPACK_GLOBAL_SUFFIX(dgbsvxx,DGBSVXX)
 void LAPACK_dgbsvxx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -1108,7 +1149,7 @@ void LAPACK_dgbsvxx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1117,7 +1158,7 @@ void LAPACK_dgbsvxx_base(
     #define LAPACK_dgbsvxx(...) LAPACK_dgbsvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgbsvxx_base LAPACK_GLOBAL(sgbsvxx,SGBSVXX)
+#define LAPACK_sgbsvxx_base LAPACK_GLOBAL_SUFFIX(sgbsvxx,SGBSVXX)
 void LAPACK_sgbsvxx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -1138,7 +1179,7 @@ void LAPACK_sgbsvxx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1147,7 +1188,7 @@ void LAPACK_sgbsvxx_base(
     #define LAPACK_sgbsvxx(...) LAPACK_sgbsvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgbsvxx_base LAPACK_GLOBAL(zgbsvxx,ZGBSVXX)
+#define LAPACK_zgbsvxx_base LAPACK_GLOBAL_SUFFIX(zgbsvxx,ZGBSVXX)
 void LAPACK_zgbsvxx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -1168,7 +1209,7 @@ void LAPACK_zgbsvxx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1177,31 +1218,31 @@ void LAPACK_zgbsvxx_base(
     #define LAPACK_zgbsvxx(...) LAPACK_zgbsvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgbtrf LAPACK_GLOBAL(cgbtrf,CGBTRF)
+#define LAPACK_cgbtrf LAPACK_GLOBAL_SUFFIX(cgbtrf,CGBTRF)
 void LAPACK_cgbtrf(
     lapack_int const* m, lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     lapack_complex_float* AB, lapack_int const* ldab, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_dgbtrf LAPACK_GLOBAL(dgbtrf,DGBTRF)
+#define LAPACK_dgbtrf LAPACK_GLOBAL_SUFFIX(dgbtrf,DGBTRF)
 void LAPACK_dgbtrf(
     lapack_int const* m, lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     double* AB, lapack_int const* ldab, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_sgbtrf LAPACK_GLOBAL(sgbtrf,SGBTRF)
+#define LAPACK_sgbtrf LAPACK_GLOBAL_SUFFIX(sgbtrf,SGBTRF)
 void LAPACK_sgbtrf(
     lapack_int const* m, lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     float* AB, lapack_int const* ldab, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_zgbtrf LAPACK_GLOBAL(zgbtrf,ZGBTRF)
+#define LAPACK_zgbtrf LAPACK_GLOBAL_SUFFIX(zgbtrf,ZGBTRF)
 void LAPACK_zgbtrf(
     lapack_int const* m, lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     lapack_complex_double* AB, lapack_int const* ldab, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_cgbtrs_base LAPACK_GLOBAL(cgbtrs,CGBTRS)
+#define LAPACK_cgbtrs_base LAPACK_GLOBAL_SUFFIX(cgbtrs,CGBTRS)
 void LAPACK_cgbtrs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -1209,7 +1250,7 @@ void LAPACK_cgbtrs_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1218,7 +1259,7 @@ void LAPACK_cgbtrs_base(
     #define LAPACK_cgbtrs(...) LAPACK_cgbtrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgbtrs_base LAPACK_GLOBAL(dgbtrs,DGBTRS)
+#define LAPACK_dgbtrs_base LAPACK_GLOBAL_SUFFIX(dgbtrs,DGBTRS)
 void LAPACK_dgbtrs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -1226,7 +1267,7 @@ void LAPACK_dgbtrs_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1235,7 +1276,7 @@ void LAPACK_dgbtrs_base(
     #define LAPACK_dgbtrs(...) LAPACK_dgbtrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgbtrs_base LAPACK_GLOBAL(sgbtrs,SGBTRS)
+#define LAPACK_sgbtrs_base LAPACK_GLOBAL_SUFFIX(sgbtrs,SGBTRS)
 void LAPACK_sgbtrs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -1243,7 +1284,7 @@ void LAPACK_sgbtrs_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1252,7 +1293,7 @@ void LAPACK_sgbtrs_base(
     #define LAPACK_sgbtrs(...) LAPACK_sgbtrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgbtrs_base LAPACK_GLOBAL(zgbtrs,ZGBTRS)
+#define LAPACK_zgbtrs_base LAPACK_GLOBAL_SUFFIX(zgbtrs,ZGBTRS)
 void LAPACK_zgbtrs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku, lapack_int const* nrhs,
@@ -1260,7 +1301,7 @@ void LAPACK_zgbtrs_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1269,7 +1310,7 @@ void LAPACK_zgbtrs_base(
     #define LAPACK_zgbtrs(...) LAPACK_zgbtrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgebak_base LAPACK_GLOBAL(cgebak,CGEBAK)
+#define LAPACK_cgebak_base LAPACK_GLOBAL_SUFFIX(cgebak,CGEBAK)
 void LAPACK_cgebak_base(
     char const* job, char const* side,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -1277,7 +1318,7 @@ void LAPACK_cgebak_base(
     lapack_complex_float* V, lapack_int const* ldv,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1286,7 +1327,7 @@ void LAPACK_cgebak_base(
     #define LAPACK_cgebak(...) LAPACK_cgebak_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgebak_base LAPACK_GLOBAL(dgebak,DGEBAK)
+#define LAPACK_dgebak_base LAPACK_GLOBAL_SUFFIX(dgebak,DGEBAK)
 void LAPACK_dgebak_base(
     char const* job, char const* side,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -1294,7 +1335,7 @@ void LAPACK_dgebak_base(
     double* V, lapack_int const* ldv,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1303,7 +1344,7 @@ void LAPACK_dgebak_base(
     #define LAPACK_dgebak(...) LAPACK_dgebak_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgebak_base LAPACK_GLOBAL(sgebak,SGEBAK)
+#define LAPACK_sgebak_base LAPACK_GLOBAL_SUFFIX(sgebak,SGEBAK)
 void LAPACK_sgebak_base(
     char const* job, char const* side,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -1311,7 +1352,7 @@ void LAPACK_sgebak_base(
     float* V, lapack_int const* ldv,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1320,7 +1361,7 @@ void LAPACK_sgebak_base(
     #define LAPACK_sgebak(...) LAPACK_sgebak_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgebak_base LAPACK_GLOBAL(zgebak,ZGEBAK)
+#define LAPACK_zgebak_base LAPACK_GLOBAL_SUFFIX(zgebak,ZGEBAK)
 void LAPACK_zgebak_base(
     char const* job, char const* side,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -1328,7 +1369,7 @@ void LAPACK_zgebak_base(
     lapack_complex_double* V, lapack_int const* ldv,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1337,7 +1378,7 @@ void LAPACK_zgebak_base(
     #define LAPACK_zgebak(...) LAPACK_zgebak_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgebal_base LAPACK_GLOBAL(cgebal,CGEBAL)
+#define LAPACK_cgebal_base LAPACK_GLOBAL_SUFFIX(cgebal,CGEBAL)
 void LAPACK_cgebal_base(
     char const* job,
     lapack_int const* n,
@@ -1345,7 +1386,7 @@ void LAPACK_cgebal_base(
     float* scale,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1354,7 +1395,7 @@ void LAPACK_cgebal_base(
     #define LAPACK_cgebal(...) LAPACK_cgebal_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgebal_base LAPACK_GLOBAL(dgebal,DGEBAL)
+#define LAPACK_dgebal_base LAPACK_GLOBAL_SUFFIX(dgebal,DGEBAL)
 void LAPACK_dgebal_base(
     char const* job,
     lapack_int const* n,
@@ -1362,7 +1403,7 @@ void LAPACK_dgebal_base(
     double* scale,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1371,7 +1412,7 @@ void LAPACK_dgebal_base(
     #define LAPACK_dgebal(...) LAPACK_dgebal_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgebal_base LAPACK_GLOBAL(sgebal,SGEBAL)
+#define LAPACK_sgebal_base LAPACK_GLOBAL_SUFFIX(sgebal,SGEBAL)
 void LAPACK_sgebal_base(
     char const* job,
     lapack_int const* n,
@@ -1379,7 +1420,7 @@ void LAPACK_sgebal_base(
     float* scale,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1388,7 +1429,7 @@ void LAPACK_sgebal_base(
     #define LAPACK_sgebal(...) LAPACK_sgebal_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgebal_base LAPACK_GLOBAL(zgebal,ZGEBAL)
+#define LAPACK_zgebal_base LAPACK_GLOBAL_SUFFIX(zgebal,ZGEBAL)
 void LAPACK_zgebal_base(
     char const* job,
     lapack_int const* n,
@@ -1396,7 +1437,7 @@ void LAPACK_zgebal_base(
     double* scale,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1405,7 +1446,7 @@ void LAPACK_zgebal_base(
     #define LAPACK_zgebal(...) LAPACK_zgebal_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgebrd LAPACK_GLOBAL(cgebrd,CGEBRD)
+#define LAPACK_cgebrd LAPACK_GLOBAL_SUFFIX(cgebrd,CGEBRD)
 void LAPACK_cgebrd(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
@@ -1416,7 +1457,7 @@ void LAPACK_cgebrd(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dgebrd LAPACK_GLOBAL(dgebrd,DGEBRD)
+#define LAPACK_dgebrd LAPACK_GLOBAL_SUFFIX(dgebrd,DGEBRD)
 void LAPACK_dgebrd(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda,
@@ -1427,7 +1468,7 @@ void LAPACK_dgebrd(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sgebrd LAPACK_GLOBAL(sgebrd,SGEBRD)
+#define LAPACK_sgebrd LAPACK_GLOBAL_SUFFIX(sgebrd,SGEBRD)
 void LAPACK_sgebrd(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda,
@@ -1438,7 +1479,7 @@ void LAPACK_sgebrd(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zgebrd LAPACK_GLOBAL(zgebrd,ZGEBRD)
+#define LAPACK_zgebrd LAPACK_GLOBAL_SUFFIX(zgebrd,ZGEBRD)
 void LAPACK_zgebrd(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
@@ -1449,7 +1490,7 @@ void LAPACK_zgebrd(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cgecon_base LAPACK_GLOBAL(cgecon,CGECON)
+#define LAPACK_cgecon_base LAPACK_GLOBAL_SUFFIX(cgecon,CGECON)
 void LAPACK_cgecon_base(
     char const* norm,
     lapack_int const* n,
@@ -1460,7 +1501,7 @@ void LAPACK_cgecon_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1469,7 +1510,7 @@ void LAPACK_cgecon_base(
     #define LAPACK_cgecon(...) LAPACK_cgecon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgecon_base LAPACK_GLOBAL(dgecon,DGECON)
+#define LAPACK_dgecon_base LAPACK_GLOBAL_SUFFIX(dgecon,DGECON)
 void LAPACK_dgecon_base(
     char const* norm,
     lapack_int const* n,
@@ -1480,7 +1521,7 @@ void LAPACK_dgecon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1489,7 +1530,7 @@ void LAPACK_dgecon_base(
     #define LAPACK_dgecon(...) LAPACK_dgecon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgecon_base LAPACK_GLOBAL(sgecon,SGECON)
+#define LAPACK_sgecon_base LAPACK_GLOBAL_SUFFIX(sgecon,SGECON)
 void LAPACK_sgecon_base(
     char const* norm,
     lapack_int const* n,
@@ -1500,7 +1541,7 @@ void LAPACK_sgecon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1509,7 +1550,7 @@ void LAPACK_sgecon_base(
     #define LAPACK_sgecon(...) LAPACK_sgecon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgecon_base LAPACK_GLOBAL(zgecon,ZGECON)
+#define LAPACK_zgecon_base LAPACK_GLOBAL_SUFFIX(zgecon,ZGECON)
 void LAPACK_zgecon_base(
     char const* norm,
     lapack_int const* n,
@@ -1520,7 +1561,7 @@ void LAPACK_zgecon_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1529,7 +1570,7 @@ void LAPACK_zgecon_base(
     #define LAPACK_zgecon(...) LAPACK_zgecon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgeequ LAPACK_GLOBAL(cgeequ,CGEEQU)
+#define LAPACK_cgeequ LAPACK_GLOBAL_SUFFIX(cgeequ,CGEEQU)
 void LAPACK_cgeequ(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float const* A, lapack_int const* lda,
@@ -1540,7 +1581,7 @@ void LAPACK_cgeequ(
     float* amax,
     lapack_int* info );
 
-#define LAPACK_dgeequ LAPACK_GLOBAL(dgeequ,DGEEQU)
+#define LAPACK_dgeequ LAPACK_GLOBAL_SUFFIX(dgeequ,DGEEQU)
 void LAPACK_dgeequ(
     lapack_int const* m, lapack_int const* n,
     double const* A, lapack_int const* lda,
@@ -1551,7 +1592,7 @@ void LAPACK_dgeequ(
     double* amax,
     lapack_int* info );
 
-#define LAPACK_sgeequ LAPACK_GLOBAL(sgeequ,SGEEQU)
+#define LAPACK_sgeequ LAPACK_GLOBAL_SUFFIX(sgeequ,SGEEQU)
 void LAPACK_sgeequ(
     lapack_int const* m, lapack_int const* n,
     float const* A, lapack_int const* lda,
@@ -1562,7 +1603,7 @@ void LAPACK_sgeequ(
     float* amax,
     lapack_int* info );
 
-#define LAPACK_zgeequ LAPACK_GLOBAL(zgeequ,ZGEEQU)
+#define LAPACK_zgeequ LAPACK_GLOBAL_SUFFIX(zgeequ,ZGEEQU)
 void LAPACK_zgeequ(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double const* A, lapack_int const* lda,
@@ -1573,7 +1614,7 @@ void LAPACK_zgeequ(
     double* amax,
     lapack_int* info );
 
-#define LAPACK_cgeequb LAPACK_GLOBAL(cgeequb,CGEEQUB)
+#define LAPACK_cgeequb LAPACK_GLOBAL_SUFFIX(cgeequb,CGEEQUB)
 void LAPACK_cgeequb(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float const* A, lapack_int const* lda,
@@ -1584,7 +1625,7 @@ void LAPACK_cgeequb(
     float* amax,
     lapack_int* info );
 
-#define LAPACK_dgeequb LAPACK_GLOBAL(dgeequb,DGEEQUB)
+#define LAPACK_dgeequb LAPACK_GLOBAL_SUFFIX(dgeequb,DGEEQUB)
 void LAPACK_dgeequb(
     lapack_int const* m, lapack_int const* n,
     double const* A, lapack_int const* lda,
@@ -1595,7 +1636,7 @@ void LAPACK_dgeequb(
     double* amax,
     lapack_int* info );
 
-#define LAPACK_sgeequb LAPACK_GLOBAL(sgeequb,SGEEQUB)
+#define LAPACK_sgeequb LAPACK_GLOBAL_SUFFIX(sgeequb,SGEEQUB)
 void LAPACK_sgeequb(
     lapack_int const* m, lapack_int const* n,
     float const* A, lapack_int const* lda,
@@ -1606,7 +1647,7 @@ void LAPACK_sgeequb(
     float* amax,
     lapack_int* info );
 
-#define LAPACK_zgeequb LAPACK_GLOBAL(zgeequb,ZGEEQUB)
+#define LAPACK_zgeequb LAPACK_GLOBAL_SUFFIX(zgeequb,ZGEEQUB)
 void LAPACK_zgeequb(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double const* A, lapack_int const* lda,
@@ -1617,7 +1658,7 @@ void LAPACK_zgeequb(
     double* amax,
     lapack_int* info );
 
-#define LAPACK_cgees_base LAPACK_GLOBAL(cgees,CGEES)
+#define LAPACK_cgees_base LAPACK_GLOBAL_SUFFIX(cgees,CGEES)
 void LAPACK_cgees_base(
     char const* jobvs, char const* sort, LAPACK_C_SELECT1 select,
     lapack_int const* n,
@@ -1628,7 +1669,7 @@ void LAPACK_cgees_base(
     float* rwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1637,7 +1678,7 @@ void LAPACK_cgees_base(
     #define LAPACK_cgees(...) LAPACK_cgees_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgees_base LAPACK_GLOBAL(dgees,DGEES)
+#define LAPACK_dgees_base LAPACK_GLOBAL_SUFFIX(dgees,DGEES)
 void LAPACK_dgees_base(
     char const* jobvs, char const* sort, LAPACK_D_SELECT2 select,
     lapack_int const* n,
@@ -1648,7 +1689,7 @@ void LAPACK_dgees_base(
     double* work, lapack_int const* lwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1657,7 +1698,7 @@ void LAPACK_dgees_base(
     #define LAPACK_dgees(...) LAPACK_dgees_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgees_base LAPACK_GLOBAL(sgees,SGEES)
+#define LAPACK_sgees_base LAPACK_GLOBAL_SUFFIX(sgees,SGEES)
 void LAPACK_sgees_base(
     char const* jobvs, char const* sort, LAPACK_S_SELECT2 select,
     lapack_int const* n,
@@ -1668,7 +1709,7 @@ void LAPACK_sgees_base(
     float* work, lapack_int const* lwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1677,7 +1718,7 @@ void LAPACK_sgees_base(
     #define LAPACK_sgees(...) LAPACK_sgees_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgees_base LAPACK_GLOBAL(zgees,ZGEES)
+#define LAPACK_zgees_base LAPACK_GLOBAL_SUFFIX(zgees,ZGEES)
 void LAPACK_zgees_base(
     char const* jobvs, char const* sort, LAPACK_Z_SELECT1 select,
     lapack_int const* n,
@@ -1688,7 +1729,7 @@ void LAPACK_zgees_base(
     double* rwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1697,7 +1738,7 @@ void LAPACK_zgees_base(
     #define LAPACK_zgees(...) LAPACK_zgees_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgeesx_base LAPACK_GLOBAL(cgeesx,CGEESX)
+#define LAPACK_cgeesx_base LAPACK_GLOBAL_SUFFIX(cgeesx,CGEESX)
 void LAPACK_cgeesx_base(
     char const* jobvs, char const* sort, LAPACK_C_SELECT1 select, char const* sense,
     lapack_int const* n,
@@ -1710,7 +1751,7 @@ void LAPACK_cgeesx_base(
     float* rwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1719,7 +1760,7 @@ void LAPACK_cgeesx_base(
     #define LAPACK_cgeesx(...) LAPACK_cgeesx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgeesx_base LAPACK_GLOBAL(dgeesx,DGEESX)
+#define LAPACK_dgeesx_base LAPACK_GLOBAL_SUFFIX(dgeesx,DGEESX)
 void LAPACK_dgeesx_base(
     char const* jobvs, char const* sort, LAPACK_D_SELECT2 select, char const* sense,
     lapack_int const* n,
@@ -1733,7 +1774,7 @@ void LAPACK_dgeesx_base(
     lapack_int* iwork, lapack_int const* liwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1742,7 +1783,7 @@ void LAPACK_dgeesx_base(
     #define LAPACK_dgeesx(...) LAPACK_dgeesx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgeesx_base LAPACK_GLOBAL(sgeesx,SGEESX)
+#define LAPACK_sgeesx_base LAPACK_GLOBAL_SUFFIX(sgeesx,SGEESX)
 void LAPACK_sgeesx_base(
     char const* jobvs, char const* sort, LAPACK_S_SELECT2 select, char const* sense,
     lapack_int const* n,
@@ -1756,7 +1797,7 @@ void LAPACK_sgeesx_base(
     lapack_int* iwork, lapack_int const* liwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1765,7 +1806,7 @@ void LAPACK_sgeesx_base(
     #define LAPACK_sgeesx(...) LAPACK_sgeesx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgeesx_base LAPACK_GLOBAL(zgeesx,ZGEESX)
+#define LAPACK_zgeesx_base LAPACK_GLOBAL_SUFFIX(zgeesx,ZGEESX)
 void LAPACK_zgeesx_base(
     char const* jobvs, char const* sort, LAPACK_Z_SELECT1 select, char const* sense,
     lapack_int const* n,
@@ -1778,7 +1819,7 @@ void LAPACK_zgeesx_base(
     double* rwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1787,7 +1828,7 @@ void LAPACK_zgeesx_base(
     #define LAPACK_zgeesx(...) LAPACK_zgeesx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgeev_base LAPACK_GLOBAL(cgeev,CGEEV)
+#define LAPACK_cgeev_base LAPACK_GLOBAL_SUFFIX(cgeev,CGEEV)
 void LAPACK_cgeev_base(
     char const* jobvl, char const* jobvr,
     lapack_int const* n,
@@ -1799,7 +1840,7 @@ void LAPACK_cgeev_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1808,7 +1849,7 @@ void LAPACK_cgeev_base(
     #define LAPACK_cgeev(...) LAPACK_cgeev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgeev_base LAPACK_GLOBAL(dgeev,DGEEV)
+#define LAPACK_dgeev_base LAPACK_GLOBAL_SUFFIX(dgeev,DGEEV)
 void LAPACK_dgeev_base(
     char const* jobvl, char const* jobvr,
     lapack_int const* n,
@@ -1820,7 +1861,7 @@ void LAPACK_dgeev_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1829,7 +1870,7 @@ void LAPACK_dgeev_base(
     #define LAPACK_dgeev(...) LAPACK_dgeev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgeev_base LAPACK_GLOBAL(sgeev,SGEEV)
+#define LAPACK_sgeev_base LAPACK_GLOBAL_SUFFIX(sgeev,SGEEV)
 void LAPACK_sgeev_base(
     char const* jobvl, char const* jobvr,
     lapack_int const* n,
@@ -1841,7 +1882,7 @@ void LAPACK_sgeev_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1850,7 +1891,7 @@ void LAPACK_sgeev_base(
     #define LAPACK_sgeev(...) LAPACK_sgeev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgeev_base LAPACK_GLOBAL(zgeev,ZGEEV)
+#define LAPACK_zgeev_base LAPACK_GLOBAL_SUFFIX(zgeev,ZGEEV)
 void LAPACK_zgeev_base(
     char const* jobvl, char const* jobvr,
     lapack_int const* n,
@@ -1862,7 +1903,7 @@ void LAPACK_zgeev_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1871,7 +1912,7 @@ void LAPACK_zgeev_base(
     #define LAPACK_zgeev(...) LAPACK_zgeev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgeevx_base LAPACK_GLOBAL(cgeevx,CGEEVX)
+#define LAPACK_cgeevx_base LAPACK_GLOBAL_SUFFIX(cgeevx,CGEEVX)
 void LAPACK_cgeevx_base(
     char const* balanc, char const* jobvl, char const* jobvr, char const* sense,
     lapack_int const* n,
@@ -1887,7 +1928,7 @@ void LAPACK_cgeevx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1896,7 +1937,7 @@ void LAPACK_cgeevx_base(
     #define LAPACK_cgeevx(...) LAPACK_cgeevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgeevx_base LAPACK_GLOBAL(dgeevx,DGEEVX)
+#define LAPACK_dgeevx_base LAPACK_GLOBAL_SUFFIX(dgeevx,DGEEVX)
 void LAPACK_dgeevx_base(
     char const* balanc, char const* jobvl, char const* jobvr, char const* sense,
     lapack_int const* n,
@@ -1913,7 +1954,7 @@ void LAPACK_dgeevx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1922,7 +1963,7 @@ void LAPACK_dgeevx_base(
     #define LAPACK_dgeevx(...) LAPACK_dgeevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgeevx_base LAPACK_GLOBAL(sgeevx,SGEEVX)
+#define LAPACK_sgeevx_base LAPACK_GLOBAL_SUFFIX(sgeevx,SGEEVX)
 void LAPACK_sgeevx_base(
     char const* balanc, char const* jobvl, char const* jobvr, char const* sense,
     lapack_int const* n,
@@ -1939,7 +1980,7 @@ void LAPACK_sgeevx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1948,7 +1989,7 @@ void LAPACK_sgeevx_base(
     #define LAPACK_sgeevx(...) LAPACK_sgeevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgeevx_base LAPACK_GLOBAL(zgeevx,ZGEEVX)
+#define LAPACK_zgeevx_base LAPACK_GLOBAL_SUFFIX(zgeevx,ZGEEVX)
 void LAPACK_zgeevx_base(
     char const* balanc, char const* jobvl, char const* jobvr, char const* sense,
     lapack_int const* n,
@@ -1964,7 +2005,7 @@ void LAPACK_zgeevx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -1973,7 +2014,7 @@ void LAPACK_zgeevx_base(
     #define LAPACK_zgeevx(...) LAPACK_zgeevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgehrd LAPACK_GLOBAL(cgehrd,CGEHRD)
+#define LAPACK_cgehrd LAPACK_GLOBAL_SUFFIX(cgehrd,CGEHRD)
 void LAPACK_cgehrd(
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
     lapack_complex_float* A, lapack_int const* lda,
@@ -1981,7 +2022,7 @@ void LAPACK_cgehrd(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dgehrd LAPACK_GLOBAL(dgehrd,DGEHRD)
+#define LAPACK_dgehrd LAPACK_GLOBAL_SUFFIX(dgehrd,DGEHRD)
 void LAPACK_dgehrd(
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
     double* A, lapack_int const* lda,
@@ -1989,7 +2030,7 @@ void LAPACK_dgehrd(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sgehrd LAPACK_GLOBAL(sgehrd,SGEHRD)
+#define LAPACK_sgehrd LAPACK_GLOBAL_SUFFIX(sgehrd,SGEHRD)
 void LAPACK_sgehrd(
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
     float* A, lapack_int const* lda,
@@ -1997,7 +2038,7 @@ void LAPACK_sgehrd(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zgehrd LAPACK_GLOBAL(zgehrd,ZGEHRD)
+#define LAPACK_zgehrd LAPACK_GLOBAL_SUFFIX(zgehrd,ZGEHRD)
 void LAPACK_zgehrd(
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
     lapack_complex_double* A, lapack_int const* lda,
@@ -2005,7 +2046,7 @@ void LAPACK_zgehrd(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cgejsv_base LAPACK_GLOBAL(cgejsv,CGEJSV)
+#define LAPACK_cgejsv_base LAPACK_GLOBAL_SUFFIX(cgejsv,CGEJSV)
 void LAPACK_cgejsv_base(
     char const* joba, char const* jobu, char const* jobv, char const* jobr, char const* jobt, char const* jobp,
     lapack_int const* m, lapack_int const* n,
@@ -2018,7 +2059,7 @@ void LAPACK_cgejsv_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2027,7 +2068,7 @@ void LAPACK_cgejsv_base(
     #define LAPACK_cgejsv(...) LAPACK_cgejsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgejsv_base LAPACK_GLOBAL(dgejsv,DGEJSV)
+#define LAPACK_dgejsv_base LAPACK_GLOBAL_SUFFIX(dgejsv,DGEJSV)
 void LAPACK_dgejsv_base(
     char const* joba, char const* jobu, char const* jobv, char const* jobr, char const* jobt, char const* jobp,
     lapack_int const* m, lapack_int const* n,
@@ -2039,7 +2080,7 @@ void LAPACK_dgejsv_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2048,7 +2089,7 @@ void LAPACK_dgejsv_base(
     #define LAPACK_dgejsv(...) LAPACK_dgejsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgejsv_base LAPACK_GLOBAL(sgejsv,SGEJSV)
+#define LAPACK_sgejsv_base LAPACK_GLOBAL_SUFFIX(sgejsv,SGEJSV)
 void LAPACK_sgejsv_base(
     char const* joba, char const* jobu, char const* jobv, char const* jobr, char const* jobt, char const* jobp,
     lapack_int const* m, lapack_int const* n,
@@ -2060,7 +2101,7 @@ void LAPACK_sgejsv_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2069,7 +2110,7 @@ void LAPACK_sgejsv_base(
     #define LAPACK_sgejsv(...) LAPACK_sgejsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgejsv_base LAPACK_GLOBAL(zgejsv,ZGEJSV)
+#define LAPACK_zgejsv_base LAPACK_GLOBAL_SUFFIX(zgejsv,ZGEJSV)
 void LAPACK_zgejsv_base(
     char const* joba, char const* jobu, char const* jobv, char const* jobr, char const* jobt, char const* jobp,
     lapack_int const* m, lapack_int const* n,
@@ -2082,7 +2123,7 @@ void LAPACK_zgejsv_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2091,7 +2132,7 @@ void LAPACK_zgejsv_base(
     #define LAPACK_zgejsv(...) LAPACK_zgejsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgelq LAPACK_GLOBAL(cgelq,CGELQ)
+#define LAPACK_cgelq LAPACK_GLOBAL_SUFFIX(cgelq,CGELQ)
 void LAPACK_cgelq(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
@@ -2099,7 +2140,7 @@ void LAPACK_cgelq(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dgelq LAPACK_GLOBAL(dgelq,DGELQ)
+#define LAPACK_dgelq LAPACK_GLOBAL_SUFFIX(dgelq,DGELQ)
 void LAPACK_dgelq(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda,
@@ -2107,7 +2148,7 @@ void LAPACK_dgelq(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sgelq LAPACK_GLOBAL(sgelq,SGELQ)
+#define LAPACK_sgelq LAPACK_GLOBAL_SUFFIX(sgelq,SGELQ)
 void LAPACK_sgelq(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda,
@@ -2115,7 +2156,7 @@ void LAPACK_sgelq(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zgelq LAPACK_GLOBAL(zgelq,ZGELQ)
+#define LAPACK_zgelq LAPACK_GLOBAL_SUFFIX(zgelq,ZGELQ)
 void LAPACK_zgelq(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
@@ -2123,7 +2164,7 @@ void LAPACK_zgelq(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cgelq2 LAPACK_GLOBAL(cgelq2,CGELQ2)
+#define LAPACK_cgelq2 LAPACK_GLOBAL_SUFFIX(cgelq2,CGELQ2)
 void LAPACK_cgelq2(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
@@ -2131,7 +2172,7 @@ void LAPACK_cgelq2(
     lapack_complex_float* work,
     lapack_int* info );
 
-#define LAPACK_dgelq2 LAPACK_GLOBAL(dgelq2,DGELQ2)
+#define LAPACK_dgelq2 LAPACK_GLOBAL_SUFFIX(dgelq2,DGELQ2)
 void LAPACK_dgelq2(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda,
@@ -2139,7 +2180,7 @@ void LAPACK_dgelq2(
     double* work,
     lapack_int* info );
 
-#define LAPACK_sgelq2 LAPACK_GLOBAL(sgelq2,SGELQ2)
+#define LAPACK_sgelq2 LAPACK_GLOBAL_SUFFIX(sgelq2,SGELQ2)
 void LAPACK_sgelq2(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda,
@@ -2147,7 +2188,7 @@ void LAPACK_sgelq2(
     float* work,
     lapack_int* info );
 
-#define LAPACK_zgelq2 LAPACK_GLOBAL(zgelq2,ZGELQ2)
+#define LAPACK_zgelq2 LAPACK_GLOBAL_SUFFIX(zgelq2,ZGELQ2)
 void LAPACK_zgelq2(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
@@ -2155,7 +2196,7 @@ void LAPACK_zgelq2(
     lapack_complex_double* work,
     lapack_int* info );
 
-#define LAPACK_cgelqf LAPACK_GLOBAL(cgelqf,CGELQF)
+#define LAPACK_cgelqf LAPACK_GLOBAL_SUFFIX(cgelqf,CGELQF)
 void LAPACK_cgelqf(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
@@ -2163,7 +2204,7 @@ void LAPACK_cgelqf(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dgelqf LAPACK_GLOBAL(dgelqf,DGELQF)
+#define LAPACK_dgelqf LAPACK_GLOBAL_SUFFIX(dgelqf,DGELQF)
 void LAPACK_dgelqf(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda,
@@ -2171,7 +2212,7 @@ void LAPACK_dgelqf(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sgelqf LAPACK_GLOBAL(sgelqf,SGELQF)
+#define LAPACK_sgelqf LAPACK_GLOBAL_SUFFIX(sgelqf,SGELQF)
 void LAPACK_sgelqf(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda,
@@ -2179,7 +2220,7 @@ void LAPACK_sgelqf(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zgelqf LAPACK_GLOBAL(zgelqf,ZGELQF)
+#define LAPACK_zgelqf LAPACK_GLOBAL_SUFFIX(zgelqf,ZGELQF)
 void LAPACK_zgelqf(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
@@ -2187,7 +2228,7 @@ void LAPACK_zgelqf(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cgels_base LAPACK_GLOBAL(cgels,CGELS)
+#define LAPACK_cgels_base LAPACK_GLOBAL_SUFFIX(cgels,CGELS)
 void LAPACK_cgels_base(
     char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
@@ -2196,7 +2237,7 @@ void LAPACK_cgels_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2205,7 +2246,7 @@ void LAPACK_cgels_base(
     #define LAPACK_cgels(...) LAPACK_cgels_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgels_base LAPACK_GLOBAL(dgels,DGELS)
+#define LAPACK_dgels_base LAPACK_GLOBAL_SUFFIX(dgels,DGELS)
 void LAPACK_dgels_base(
     char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
@@ -2214,7 +2255,7 @@ void LAPACK_dgels_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2223,7 +2264,7 @@ void LAPACK_dgels_base(
     #define LAPACK_dgels(...) LAPACK_dgels_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgels_base LAPACK_GLOBAL(sgels,SGELS)
+#define LAPACK_sgels_base LAPACK_GLOBAL_SUFFIX(sgels,SGELS)
 void LAPACK_sgels_base(
     char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
@@ -2232,7 +2273,7 @@ void LAPACK_sgels_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2241,7 +2282,7 @@ void LAPACK_sgels_base(
     #define LAPACK_sgels(...) LAPACK_sgels_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgels_base LAPACK_GLOBAL(zgels,ZGELS)
+#define LAPACK_zgels_base LAPACK_GLOBAL_SUFFIX(zgels,ZGELS)
 void LAPACK_zgels_base(
     char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
@@ -2250,7 +2291,7 @@ void LAPACK_zgels_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2259,7 +2300,7 @@ void LAPACK_zgels_base(
     #define LAPACK_zgels(...) LAPACK_zgels_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgelsd LAPACK_GLOBAL(cgelsd,CGELSD)
+#define LAPACK_cgelsd LAPACK_GLOBAL_SUFFIX(cgelsd,CGELSD)
 void LAPACK_cgelsd(
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
     lapack_complex_float* A, lapack_int const* lda,
@@ -2271,7 +2312,7 @@ void LAPACK_cgelsd(
     lapack_int* iwork,
     lapack_int* info );
 
-#define LAPACK_dgelsd LAPACK_GLOBAL(dgelsd,DGELSD)
+#define LAPACK_dgelsd LAPACK_GLOBAL_SUFFIX(dgelsd,DGELSD)
 void LAPACK_dgelsd(
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
     double* A, lapack_int const* lda,
@@ -2282,7 +2323,7 @@ void LAPACK_dgelsd(
     lapack_int* iwork,
     lapack_int* info );
 
-#define LAPACK_sgelsd LAPACK_GLOBAL(sgelsd,SGELSD)
+#define LAPACK_sgelsd LAPACK_GLOBAL_SUFFIX(sgelsd,SGELSD)
 void LAPACK_sgelsd(
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
     float* A, lapack_int const* lda,
@@ -2293,7 +2334,7 @@ void LAPACK_sgelsd(
     lapack_int* iwork,
     lapack_int* info );
 
-#define LAPACK_zgelsd LAPACK_GLOBAL(zgelsd,ZGELSD)
+#define LAPACK_zgelsd LAPACK_GLOBAL_SUFFIX(zgelsd,ZGELSD)
 void LAPACK_zgelsd(
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
     lapack_complex_double* A, lapack_int const* lda,
@@ -2305,7 +2346,7 @@ void LAPACK_zgelsd(
     lapack_int* iwork,
     lapack_int* info );
 
-#define LAPACK_cgelss LAPACK_GLOBAL(cgelss,CGELSS)
+#define LAPACK_cgelss LAPACK_GLOBAL_SUFFIX(cgelss,CGELSS)
 void LAPACK_cgelss(
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
     lapack_complex_float* A, lapack_int const* lda,
@@ -2316,7 +2357,7 @@ void LAPACK_cgelss(
     float* rwork,
     lapack_int* info );
 
-#define LAPACK_dgelss LAPACK_GLOBAL(dgelss,DGELSS)
+#define LAPACK_dgelss LAPACK_GLOBAL_SUFFIX(dgelss,DGELSS)
 void LAPACK_dgelss(
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
     double* A, lapack_int const* lda,
@@ -2326,7 +2367,7 @@ void LAPACK_dgelss(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sgelss LAPACK_GLOBAL(sgelss,SGELSS)
+#define LAPACK_sgelss LAPACK_GLOBAL_SUFFIX(sgelss,SGELSS)
 void LAPACK_sgelss(
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
     float* A, lapack_int const* lda,
@@ -2336,7 +2377,7 @@ void LAPACK_sgelss(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zgelss LAPACK_GLOBAL(zgelss,ZGELSS)
+#define LAPACK_zgelss LAPACK_GLOBAL_SUFFIX(zgelss,ZGELSS)
 void LAPACK_zgelss(
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
     lapack_complex_double* A, lapack_int const* lda,
@@ -2347,7 +2388,7 @@ void LAPACK_zgelss(
     double* rwork,
     lapack_int* info );
 
-#define LAPACK_cgelsy LAPACK_GLOBAL(cgelsy,CGELSY)
+#define LAPACK_cgelsy LAPACK_GLOBAL_SUFFIX(cgelsy,CGELSY)
 void LAPACK_cgelsy(
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
     lapack_complex_float* A, lapack_int const* lda,
@@ -2357,7 +2398,7 @@ void LAPACK_cgelsy(
     float* rwork,
     lapack_int* info );
 
-#define LAPACK_dgelsy LAPACK_GLOBAL(dgelsy,DGELSY)
+#define LAPACK_dgelsy LAPACK_GLOBAL_SUFFIX(dgelsy,DGELSY)
 void LAPACK_dgelsy(
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
     double* A, lapack_int const* lda,
@@ -2366,7 +2407,7 @@ void LAPACK_dgelsy(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sgelsy LAPACK_GLOBAL(sgelsy,SGELSY)
+#define LAPACK_sgelsy LAPACK_GLOBAL_SUFFIX(sgelsy,SGELSY)
 void LAPACK_sgelsy(
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
     float* A, lapack_int const* lda,
@@ -2375,7 +2416,7 @@ void LAPACK_sgelsy(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zgelsy LAPACK_GLOBAL(zgelsy,ZGELSY)
+#define LAPACK_zgelsy LAPACK_GLOBAL_SUFFIX(zgelsy,ZGELSY)
 void LAPACK_zgelsy(
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
     lapack_complex_double* A, lapack_int const* lda,
@@ -2385,7 +2426,7 @@ void LAPACK_zgelsy(
     double* rwork,
     lapack_int* info );
 
-#define LAPACK_cgemlq_base LAPACK_GLOBAL(cgemlq,CGEMLQ)
+#define LAPACK_cgemlq_base LAPACK_GLOBAL_SUFFIX(cgemlq,CGEMLQ)
 void LAPACK_cgemlq_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -2395,7 +2436,7 @@ void LAPACK_cgemlq_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2404,7 +2445,7 @@ void LAPACK_cgemlq_base(
     #define LAPACK_cgemlq(...) LAPACK_cgemlq_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgemlq_base LAPACK_GLOBAL(dgemlq,DGEMLQ)
+#define LAPACK_dgemlq_base LAPACK_GLOBAL_SUFFIX(dgemlq,DGEMLQ)
 void LAPACK_dgemlq_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -2414,7 +2455,7 @@ void LAPACK_dgemlq_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2423,7 +2464,7 @@ void LAPACK_dgemlq_base(
     #define LAPACK_dgemlq(...) LAPACK_dgemlq_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgemlq_base LAPACK_GLOBAL(sgemlq,SGEMLQ)
+#define LAPACK_sgemlq_base LAPACK_GLOBAL_SUFFIX(sgemlq,SGEMLQ)
 void LAPACK_sgemlq_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -2433,7 +2474,7 @@ void LAPACK_sgemlq_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2442,7 +2483,7 @@ void LAPACK_sgemlq_base(
     #define LAPACK_sgemlq(...) LAPACK_sgemlq_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgemlq_base LAPACK_GLOBAL(zgemlq,ZGEMLQ)
+#define LAPACK_zgemlq_base LAPACK_GLOBAL_SUFFIX(zgemlq,ZGEMLQ)
 void LAPACK_zgemlq_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -2452,7 +2493,7 @@ void LAPACK_zgemlq_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2461,7 +2502,7 @@ void LAPACK_zgemlq_base(
     #define LAPACK_zgemlq(...) LAPACK_zgemlq_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgemqr_base LAPACK_GLOBAL(cgemqr,CGEMQR)
+#define LAPACK_cgemqr_base LAPACK_GLOBAL_SUFFIX(cgemqr,CGEMQR)
 void LAPACK_cgemqr_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -2471,7 +2512,7 @@ void LAPACK_cgemqr_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2480,7 +2521,7 @@ void LAPACK_cgemqr_base(
     #define LAPACK_cgemqr(...) LAPACK_cgemqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgemqr_base LAPACK_GLOBAL(dgemqr,DGEMQR)
+#define LAPACK_dgemqr_base LAPACK_GLOBAL_SUFFIX(dgemqr,DGEMQR)
 void LAPACK_dgemqr_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -2490,7 +2531,7 @@ void LAPACK_dgemqr_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2499,7 +2540,7 @@ void LAPACK_dgemqr_base(
     #define LAPACK_dgemqr(...) LAPACK_dgemqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgemqr_base LAPACK_GLOBAL(sgemqr,SGEMQR)
+#define LAPACK_sgemqr_base LAPACK_GLOBAL_SUFFIX(sgemqr,SGEMQR)
 void LAPACK_sgemqr_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -2509,7 +2550,7 @@ void LAPACK_sgemqr_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2518,7 +2559,7 @@ void LAPACK_sgemqr_base(
     #define LAPACK_sgemqr(...) LAPACK_sgemqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgemqr_base LAPACK_GLOBAL(zgemqr,ZGEMQR)
+#define LAPACK_zgemqr_base LAPACK_GLOBAL_SUFFIX(zgemqr,ZGEMQR)
 void LAPACK_zgemqr_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -2528,7 +2569,7 @@ void LAPACK_zgemqr_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2537,7 +2578,7 @@ void LAPACK_zgemqr_base(
     #define LAPACK_zgemqr(...) LAPACK_zgemqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgemqrt_base LAPACK_GLOBAL(cgemqrt,CGEMQRT)
+#define LAPACK_cgemqrt_base LAPACK_GLOBAL_SUFFIX(cgemqrt,CGEMQRT)
 void LAPACK_cgemqrt_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* nb,
@@ -2547,7 +2588,7 @@ void LAPACK_cgemqrt_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2556,7 +2597,7 @@ void LAPACK_cgemqrt_base(
     #define LAPACK_cgemqrt(...) LAPACK_cgemqrt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgemqrt_base LAPACK_GLOBAL(dgemqrt,DGEMQRT)
+#define LAPACK_dgemqrt_base LAPACK_GLOBAL_SUFFIX(dgemqrt,DGEMQRT)
 void LAPACK_dgemqrt_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* nb,
@@ -2566,7 +2607,7 @@ void LAPACK_dgemqrt_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2575,7 +2616,7 @@ void LAPACK_dgemqrt_base(
     #define LAPACK_dgemqrt(...) LAPACK_dgemqrt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgemqrt_base LAPACK_GLOBAL(sgemqrt,SGEMQRT)
+#define LAPACK_sgemqrt_base LAPACK_GLOBAL_SUFFIX(sgemqrt,SGEMQRT)
 void LAPACK_sgemqrt_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* nb,
@@ -2585,7 +2626,7 @@ void LAPACK_sgemqrt_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2594,7 +2635,7 @@ void LAPACK_sgemqrt_base(
     #define LAPACK_sgemqrt(...) LAPACK_sgemqrt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgemqrt_base LAPACK_GLOBAL(zgemqrt,ZGEMQRT)
+#define LAPACK_zgemqrt_base LAPACK_GLOBAL_SUFFIX(zgemqrt,ZGEMQRT)
 void LAPACK_zgemqrt_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* nb,
@@ -2604,7 +2645,7 @@ void LAPACK_zgemqrt_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2613,7 +2654,7 @@ void LAPACK_zgemqrt_base(
     #define LAPACK_zgemqrt(...) LAPACK_zgemqrt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgeql2 LAPACK_GLOBAL(cgeql2,CGEQL2)
+#define LAPACK_cgeql2 LAPACK_GLOBAL_SUFFIX(cgeql2,CGEQL2)
 void LAPACK_cgeql2(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
@@ -2621,7 +2662,7 @@ void LAPACK_cgeql2(
     lapack_complex_float* work,
     lapack_int* info );
 
-#define LAPACK_dgeql2 LAPACK_GLOBAL(dgeql2,DGEQL2)
+#define LAPACK_dgeql2 LAPACK_GLOBAL_SUFFIX(dgeql2,DGEQL2)
 void LAPACK_dgeql2(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda,
@@ -2629,7 +2670,7 @@ void LAPACK_dgeql2(
     double* work,
     lapack_int* info );
 
-#define LAPACK_sgeql2 LAPACK_GLOBAL(sgeql2,SGEQL2)
+#define LAPACK_sgeql2 LAPACK_GLOBAL_SUFFIX(sgeql2,SGEQL2)
 void LAPACK_sgeql2(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda,
@@ -2637,7 +2678,7 @@ void LAPACK_sgeql2(
     float* work,
     lapack_int* info );
 
-#define LAPACK_zgeql2 LAPACK_GLOBAL(zgeql2,ZGEQL2)
+#define LAPACK_zgeql2 LAPACK_GLOBAL_SUFFIX(zgeql2,ZGEQL2)
 void LAPACK_zgeql2(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
@@ -2645,7 +2686,7 @@ void LAPACK_zgeql2(
     lapack_complex_double* work,
     lapack_int* info );
 
-#define LAPACK_cgeqlf LAPACK_GLOBAL(cgeqlf,CGEQLF)
+#define LAPACK_cgeqlf LAPACK_GLOBAL_SUFFIX(cgeqlf,CGEQLF)
 void LAPACK_cgeqlf(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
@@ -2653,7 +2694,7 @@ void LAPACK_cgeqlf(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dgeqlf LAPACK_GLOBAL(dgeqlf,DGEQLF)
+#define LAPACK_dgeqlf LAPACK_GLOBAL_SUFFIX(dgeqlf,DGEQLF)
 void LAPACK_dgeqlf(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda,
@@ -2661,7 +2702,7 @@ void LAPACK_dgeqlf(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sgeqlf LAPACK_GLOBAL(sgeqlf,SGEQLF)
+#define LAPACK_sgeqlf LAPACK_GLOBAL_SUFFIX(sgeqlf,SGEQLF)
 void LAPACK_sgeqlf(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda,
@@ -2669,7 +2710,7 @@ void LAPACK_sgeqlf(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zgeqlf LAPACK_GLOBAL(zgeqlf,ZGEQLF)
+#define LAPACK_zgeqlf LAPACK_GLOBAL_SUFFIX(zgeqlf,ZGEQLF)
 void LAPACK_zgeqlf(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
@@ -2677,29 +2718,29 @@ void LAPACK_zgeqlf(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sgeqpf LAPACK_GLOBAL(sgeqpf,SGEQPF)
+#define LAPACK_sgeqpf LAPACK_GLOBAL_SUFFIX(sgeqpf,SGEQPF)
 void LAPACK_sgeqpf( lapack_int* m, lapack_int* n, float* a, lapack_int* lda,
                     lapack_int* jpvt, float* tau, float* work,
                     lapack_int *info );
 
-#define LAPACK_dgeqpf LAPACK_GLOBAL(dgeqpf,DGEQPF)
+#define LAPACK_dgeqpf LAPACK_GLOBAL_SUFFIX(dgeqpf,DGEQPF)
 void LAPACK_dgeqpf( lapack_int* m, lapack_int* n, double* a, lapack_int* lda,
                     lapack_int* jpvt, double* tau, double* work,
                     lapack_int *info );
 
-#define LAPACK_cgeqpf LAPACK_GLOBAL(cgeqpf,CGEQPF)
+#define LAPACK_cgeqpf LAPACK_GLOBAL_SUFFIX(cgeqpf,CGEQPF)
 void LAPACK_cgeqpf( lapack_int* m, lapack_int* n, lapack_complex_float* a,
                     lapack_int* lda, lapack_int* jpvt,
                     lapack_complex_float* tau, lapack_complex_float* work,
                     float* rwork, lapack_int *info );
 
-#define LAPACK_zgeqpf LAPACK_GLOBAL(zgeqpf,ZGEQPF)
+#define LAPACK_zgeqpf LAPACK_GLOBAL_SUFFIX(zgeqpf,ZGEQPF)
 void LAPACK_zgeqpf( lapack_int* m, lapack_int* n, lapack_complex_double* a,
                     lapack_int* lda, lapack_int* jpvt,
                     lapack_complex_double* tau, lapack_complex_double* work,
                     double* rwork, lapack_int *info );
 
-#define LAPACK_cgeqp3 LAPACK_GLOBAL(cgeqp3,CGEQP3)
+#define LAPACK_cgeqp3 LAPACK_GLOBAL_SUFFIX(cgeqp3,CGEQP3)
 void LAPACK_cgeqp3(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda, lapack_int* JPVT,
@@ -2708,7 +2749,7 @@ void LAPACK_cgeqp3(
     float* rwork,
     lapack_int* info );
 
-#define LAPACK_dgeqp3 LAPACK_GLOBAL(dgeqp3,DGEQP3)
+#define LAPACK_dgeqp3 LAPACK_GLOBAL_SUFFIX(dgeqp3,DGEQP3)
 void LAPACK_dgeqp3(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda, lapack_int* JPVT,
@@ -2716,7 +2757,7 @@ void LAPACK_dgeqp3(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sgeqp3 LAPACK_GLOBAL(sgeqp3,SGEQP3)
+#define LAPACK_sgeqp3 LAPACK_GLOBAL_SUFFIX(sgeqp3,SGEQP3)
 void LAPACK_sgeqp3(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda, lapack_int* JPVT,
@@ -2724,7 +2765,7 @@ void LAPACK_sgeqp3(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zgeqp3 LAPACK_GLOBAL(zgeqp3,ZGEQP3)
+#define LAPACK_zgeqp3 LAPACK_GLOBAL_SUFFIX(zgeqp3,ZGEQP3)
 void LAPACK_zgeqp3(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda, lapack_int* JPVT,
@@ -2733,7 +2774,7 @@ void LAPACK_zgeqp3(
     double* rwork,
     lapack_int* info );
 
-#define LAPACK_cgeqr LAPACK_GLOBAL(cgeqr,CGEQR)
+#define LAPACK_cgeqr LAPACK_GLOBAL_SUFFIX(cgeqr,CGEQR)
 void LAPACK_cgeqr(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
@@ -2741,7 +2782,7 @@ void LAPACK_cgeqr(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dgeqr LAPACK_GLOBAL(dgeqr,DGEQR)
+#define LAPACK_dgeqr LAPACK_GLOBAL_SUFFIX(dgeqr,DGEQR)
 void LAPACK_dgeqr(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda,
@@ -2749,7 +2790,7 @@ void LAPACK_dgeqr(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sgeqr LAPACK_GLOBAL(sgeqr,SGEQR)
+#define LAPACK_sgeqr LAPACK_GLOBAL_SUFFIX(sgeqr,SGEQR)
 void LAPACK_sgeqr(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda,
@@ -2757,7 +2798,7 @@ void LAPACK_sgeqr(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zgeqr LAPACK_GLOBAL(zgeqr,ZGEQR)
+#define LAPACK_zgeqr LAPACK_GLOBAL_SUFFIX(zgeqr,ZGEQR)
 void LAPACK_zgeqr(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
@@ -2765,7 +2806,7 @@ void LAPACK_zgeqr(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cgeqr2 LAPACK_GLOBAL(cgeqr2,CGEQR2)
+#define LAPACK_cgeqr2 LAPACK_GLOBAL_SUFFIX(cgeqr2,CGEQR2)
 void LAPACK_cgeqr2(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
@@ -2773,7 +2814,7 @@ void LAPACK_cgeqr2(
     lapack_complex_float* work,
     lapack_int* info );
 
-#define LAPACK_dgeqr2 LAPACK_GLOBAL(dgeqr2,DGEQR2)
+#define LAPACK_dgeqr2 LAPACK_GLOBAL_SUFFIX(dgeqr2,DGEQR2)
 void LAPACK_dgeqr2(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda,
@@ -2781,7 +2822,7 @@ void LAPACK_dgeqr2(
     double* work,
     lapack_int* info );
 
-#define LAPACK_sgeqr2 LAPACK_GLOBAL(sgeqr2,SGEQR2)
+#define LAPACK_sgeqr2 LAPACK_GLOBAL_SUFFIX(sgeqr2,SGEQR2)
 void LAPACK_sgeqr2(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda,
@@ -2789,7 +2830,7 @@ void LAPACK_sgeqr2(
     float* work,
     lapack_int* info );
 
-#define LAPACK_zgeqr2 LAPACK_GLOBAL(zgeqr2,ZGEQR2)
+#define LAPACK_zgeqr2 LAPACK_GLOBAL_SUFFIX(zgeqr2,ZGEQR2)
 void LAPACK_zgeqr2(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
@@ -2797,7 +2838,7 @@ void LAPACK_zgeqr2(
     lapack_complex_double* work,
     lapack_int* info );
 
-#define LAPACK_cgeqrf LAPACK_GLOBAL(cgeqrf,CGEQRF)
+#define LAPACK_cgeqrf LAPACK_GLOBAL_SUFFIX(cgeqrf,CGEQRF)
 void LAPACK_cgeqrf(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
@@ -2805,7 +2846,7 @@ void LAPACK_cgeqrf(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dgeqrf LAPACK_GLOBAL(dgeqrf,DGEQRF)
+#define LAPACK_dgeqrf LAPACK_GLOBAL_SUFFIX(dgeqrf,DGEQRF)
 void LAPACK_dgeqrf(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda,
@@ -2813,7 +2854,7 @@ void LAPACK_dgeqrf(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sgeqrf LAPACK_GLOBAL(sgeqrf,SGEQRF)
+#define LAPACK_sgeqrf LAPACK_GLOBAL_SUFFIX(sgeqrf,SGEQRF)
 void LAPACK_sgeqrf(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda,
@@ -2821,7 +2862,7 @@ void LAPACK_sgeqrf(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zgeqrf LAPACK_GLOBAL(zgeqrf,ZGEQRF)
+#define LAPACK_zgeqrf LAPACK_GLOBAL_SUFFIX(zgeqrf,ZGEQRF)
 void LAPACK_zgeqrf(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
@@ -2829,7 +2870,7 @@ void LAPACK_zgeqrf(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cgeqrfp LAPACK_GLOBAL(cgeqrfp,CGEQRFP)
+#define LAPACK_cgeqrfp LAPACK_GLOBAL_SUFFIX(cgeqrfp,CGEQRFP)
 void LAPACK_cgeqrfp(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
@@ -2837,7 +2878,7 @@ void LAPACK_cgeqrfp(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dgeqrfp LAPACK_GLOBAL(dgeqrfp,DGEQRFP)
+#define LAPACK_dgeqrfp LAPACK_GLOBAL_SUFFIX(dgeqrfp,DGEQRFP)
 void LAPACK_dgeqrfp(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda,
@@ -2845,7 +2886,7 @@ void LAPACK_dgeqrfp(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sgeqrfp LAPACK_GLOBAL(sgeqrfp,SGEQRFP)
+#define LAPACK_sgeqrfp LAPACK_GLOBAL_SUFFIX(sgeqrfp,SGEQRFP)
 void LAPACK_sgeqrfp(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda,
@@ -2853,7 +2894,7 @@ void LAPACK_sgeqrfp(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zgeqrfp LAPACK_GLOBAL(zgeqrfp,ZGEQRFP)
+#define LAPACK_zgeqrfp LAPACK_GLOBAL_SUFFIX(zgeqrfp,ZGEQRFP)
 void LAPACK_zgeqrfp(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
@@ -2861,7 +2902,7 @@ void LAPACK_zgeqrfp(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cgeqrt LAPACK_GLOBAL(cgeqrt,CGEQRT)
+#define LAPACK_cgeqrt LAPACK_GLOBAL_SUFFIX(cgeqrt,CGEQRT)
 void LAPACK_cgeqrt(
     lapack_int const* m, lapack_int const* n, lapack_int const* nb,
     lapack_complex_float* A, lapack_int const* lda,
@@ -2869,7 +2910,7 @@ void LAPACK_cgeqrt(
     lapack_complex_float* work,
     lapack_int* info );
 
-#define LAPACK_dgeqrt LAPACK_GLOBAL(dgeqrt,DGEQRT)
+#define LAPACK_dgeqrt LAPACK_GLOBAL_SUFFIX(dgeqrt,DGEQRT)
 void LAPACK_dgeqrt(
     lapack_int const* m, lapack_int const* n, lapack_int const* nb,
     double* A, lapack_int const* lda,
@@ -2877,7 +2918,7 @@ void LAPACK_dgeqrt(
     double* work,
     lapack_int* info );
 
-#define LAPACK_sgeqrt LAPACK_GLOBAL(sgeqrt,SGEQRT)
+#define LAPACK_sgeqrt LAPACK_GLOBAL_SUFFIX(sgeqrt,SGEQRT)
 void LAPACK_sgeqrt(
     lapack_int const* m, lapack_int const* n, lapack_int const* nb,
     float* A, lapack_int const* lda,
@@ -2885,7 +2926,7 @@ void LAPACK_sgeqrt(
     float* work,
     lapack_int* info );
 
-#define LAPACK_zgeqrt LAPACK_GLOBAL(zgeqrt,ZGEQRT)
+#define LAPACK_zgeqrt LAPACK_GLOBAL_SUFFIX(zgeqrt,ZGEQRT)
 void LAPACK_zgeqrt(
     lapack_int const* m, lapack_int const* n, lapack_int const* nb,
     lapack_complex_double* A, lapack_int const* lda,
@@ -2893,63 +2934,63 @@ void LAPACK_zgeqrt(
     lapack_complex_double* work,
     lapack_int* info );
 
-#define LAPACK_cgeqrt2 LAPACK_GLOBAL(cgeqrt2,CGEQRT2)
+#define LAPACK_cgeqrt2 LAPACK_GLOBAL_SUFFIX(cgeqrt2,CGEQRT2)
 void LAPACK_cgeqrt2(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
     lapack_complex_float* T, lapack_int const* ldt,
     lapack_int* info );
 
-#define LAPACK_dgeqrt2 LAPACK_GLOBAL(dgeqrt2,DGEQRT2)
+#define LAPACK_dgeqrt2 LAPACK_GLOBAL_SUFFIX(dgeqrt2,DGEQRT2)
 void LAPACK_dgeqrt2(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda,
     double* T, lapack_int const* ldt,
     lapack_int* info );
 
-#define LAPACK_sgeqrt2 LAPACK_GLOBAL(sgeqrt2,SGEQRT2)
+#define LAPACK_sgeqrt2 LAPACK_GLOBAL_SUFFIX(sgeqrt2,SGEQRT2)
 void LAPACK_sgeqrt2(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda,
     float* T, lapack_int const* ldt,
     lapack_int* info );
 
-#define LAPACK_zgeqrt2 LAPACK_GLOBAL(zgeqrt2,ZGEQRT2)
+#define LAPACK_zgeqrt2 LAPACK_GLOBAL_SUFFIX(zgeqrt2,ZGEQRT2)
 void LAPACK_zgeqrt2(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
     lapack_complex_double* T, lapack_int const* ldt,
     lapack_int* info );
 
-#define LAPACK_cgeqrt3 LAPACK_GLOBAL(cgeqrt3,CGEQRT3)
+#define LAPACK_cgeqrt3 LAPACK_GLOBAL_SUFFIX(cgeqrt3,CGEQRT3)
 void LAPACK_cgeqrt3(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
     lapack_complex_float* T, lapack_int const* ldt,
     lapack_int* info );
 
-#define LAPACK_dgeqrt3 LAPACK_GLOBAL(dgeqrt3,DGEQRT3)
+#define LAPACK_dgeqrt3 LAPACK_GLOBAL_SUFFIX(dgeqrt3,DGEQRT3)
 void LAPACK_dgeqrt3(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda,
     double* T, lapack_int const* ldt,
     lapack_int* info );
 
-#define LAPACK_sgeqrt3 LAPACK_GLOBAL(sgeqrt3,SGEQRT3)
+#define LAPACK_sgeqrt3 LAPACK_GLOBAL_SUFFIX(sgeqrt3,SGEQRT3)
 void LAPACK_sgeqrt3(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda,
     float* T, lapack_int const* ldt,
     lapack_int* info );
 
-#define LAPACK_zgeqrt3 LAPACK_GLOBAL(zgeqrt3,ZGEQRT3)
+#define LAPACK_zgeqrt3 LAPACK_GLOBAL_SUFFIX(zgeqrt3,ZGEQRT3)
 void LAPACK_zgeqrt3(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
     lapack_complex_double* T, lapack_int const* ldt,
     lapack_int* info );
 
-#define LAPACK_cgerfs_base LAPACK_GLOBAL(cgerfs,CGERFS)
+#define LAPACK_cgerfs_base LAPACK_GLOBAL_SUFFIX(cgerfs,CGERFS)
 void LAPACK_cgerfs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -2963,7 +3004,7 @@ void LAPACK_cgerfs_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2972,7 +3013,7 @@ void LAPACK_cgerfs_base(
     #define LAPACK_cgerfs(...) LAPACK_cgerfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgerfs_base LAPACK_GLOBAL(dgerfs,DGERFS)
+#define LAPACK_dgerfs_base LAPACK_GLOBAL_SUFFIX(dgerfs,DGERFS)
 void LAPACK_dgerfs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -2986,7 +3027,7 @@ void LAPACK_dgerfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -2995,7 +3036,7 @@ void LAPACK_dgerfs_base(
     #define LAPACK_dgerfs(...) LAPACK_dgerfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgerfs_base LAPACK_GLOBAL(sgerfs,SGERFS)
+#define LAPACK_sgerfs_base LAPACK_GLOBAL_SUFFIX(sgerfs,SGERFS)
 void LAPACK_sgerfs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -3009,7 +3050,7 @@ void LAPACK_sgerfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3018,7 +3059,7 @@ void LAPACK_sgerfs_base(
     #define LAPACK_sgerfs(...) LAPACK_sgerfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgerfs_base LAPACK_GLOBAL(zgerfs,ZGERFS)
+#define LAPACK_zgerfs_base LAPACK_GLOBAL_SUFFIX(zgerfs,ZGERFS)
 void LAPACK_zgerfs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -3032,7 +3073,7 @@ void LAPACK_zgerfs_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3041,7 +3082,7 @@ void LAPACK_zgerfs_base(
     #define LAPACK_zgerfs(...) LAPACK_zgerfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgerfsx_base LAPACK_GLOBAL(cgerfsx,CGERFSX)
+#define LAPACK_cgerfsx_base LAPACK_GLOBAL_SUFFIX(cgerfsx,CGERFSX)
 void LAPACK_cgerfsx_base(
     char const* trans, char const* equed,
     lapack_int const* n, lapack_int const* nrhs,
@@ -3060,7 +3101,7 @@ void LAPACK_cgerfsx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3069,7 +3110,7 @@ void LAPACK_cgerfsx_base(
     #define LAPACK_cgerfsx(...) LAPACK_cgerfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgerfsx_base LAPACK_GLOBAL(dgerfsx,DGERFSX)
+#define LAPACK_dgerfsx_base LAPACK_GLOBAL_SUFFIX(dgerfsx,DGERFSX)
 void LAPACK_dgerfsx_base(
     char const* trans, char const* equed,
     lapack_int const* n, lapack_int const* nrhs,
@@ -3088,7 +3129,7 @@ void LAPACK_dgerfsx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3097,7 +3138,7 @@ void LAPACK_dgerfsx_base(
     #define LAPACK_dgerfsx(...) LAPACK_dgerfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgerfsx_base LAPACK_GLOBAL(sgerfsx,SGERFSX)
+#define LAPACK_sgerfsx_base LAPACK_GLOBAL_SUFFIX(sgerfsx,SGERFSX)
 void LAPACK_sgerfsx_base(
     char const* trans, char const* equed,
     lapack_int const* n, lapack_int const* nrhs,
@@ -3116,7 +3157,7 @@ void LAPACK_sgerfsx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3125,7 +3166,7 @@ void LAPACK_sgerfsx_base(
     #define LAPACK_sgerfsx(...) LAPACK_sgerfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgerfsx_base LAPACK_GLOBAL(zgerfsx,ZGERFSX)
+#define LAPACK_zgerfsx_base LAPACK_GLOBAL_SUFFIX(zgerfsx,ZGERFSX)
 void LAPACK_zgerfsx_base(
     char const* trans, char const* equed,
     lapack_int const* n, lapack_int const* nrhs,
@@ -3144,7 +3185,7 @@ void LAPACK_zgerfsx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3153,7 +3194,7 @@ void LAPACK_zgerfsx_base(
     #define LAPACK_zgerfsx(...) LAPACK_zgerfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgerq2 LAPACK_GLOBAL(cgerq2,CGERQ2)
+#define LAPACK_cgerq2 LAPACK_GLOBAL_SUFFIX(cgerq2,CGERQ2)
 void LAPACK_cgerq2(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
@@ -3161,7 +3202,7 @@ void LAPACK_cgerq2(
     lapack_complex_float* work,
     lapack_int* info );
 
-#define LAPACK_dgerq2 LAPACK_GLOBAL(dgerq2,DGERQ2)
+#define LAPACK_dgerq2 LAPACK_GLOBAL_SUFFIX(dgerq2,DGERQ2)
 void LAPACK_dgerq2(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda,
@@ -3169,7 +3210,7 @@ void LAPACK_dgerq2(
     double* work,
     lapack_int* info );
 
-#define LAPACK_sgerq2 LAPACK_GLOBAL(sgerq2,SGERQ2)
+#define LAPACK_sgerq2 LAPACK_GLOBAL_SUFFIX(sgerq2,SGERQ2)
 void LAPACK_sgerq2(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda,
@@ -3177,7 +3218,7 @@ void LAPACK_sgerq2(
     float* work,
     lapack_int* info );
 
-#define LAPACK_zgerq2 LAPACK_GLOBAL(zgerq2,ZGERQ2)
+#define LAPACK_zgerq2 LAPACK_GLOBAL_SUFFIX(zgerq2,ZGERQ2)
 void LAPACK_zgerq2(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
@@ -3185,7 +3226,7 @@ void LAPACK_zgerq2(
     lapack_complex_double* work,
     lapack_int* info );
 
-#define LAPACK_cgerqf LAPACK_GLOBAL(cgerqf,CGERQF)
+#define LAPACK_cgerqf LAPACK_GLOBAL_SUFFIX(cgerqf,CGERQF)
 void LAPACK_cgerqf(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
@@ -3193,7 +3234,7 @@ void LAPACK_cgerqf(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dgerqf LAPACK_GLOBAL(dgerqf,DGERQF)
+#define LAPACK_dgerqf LAPACK_GLOBAL_SUFFIX(dgerqf,DGERQF)
 void LAPACK_dgerqf(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda,
@@ -3201,7 +3242,7 @@ void LAPACK_dgerqf(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sgerqf LAPACK_GLOBAL(sgerqf,SGERQF)
+#define LAPACK_sgerqf LAPACK_GLOBAL_SUFFIX(sgerqf,SGERQF)
 void LAPACK_sgerqf(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda,
@@ -3209,7 +3250,7 @@ void LAPACK_sgerqf(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zgerqf LAPACK_GLOBAL(zgerqf,ZGERQF)
+#define LAPACK_zgerqf LAPACK_GLOBAL_SUFFIX(zgerqf,ZGERQF)
 void LAPACK_zgerqf(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
@@ -3217,7 +3258,7 @@ void LAPACK_zgerqf(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cgesdd_base LAPACK_GLOBAL(cgesdd,CGESDD)
+#define LAPACK_cgesdd_base LAPACK_GLOBAL_SUFFIX(cgesdd,CGESDD)
 void LAPACK_cgesdd_base(
     char const* jobz,
     lapack_int const* m, lapack_int const* n,
@@ -3230,7 +3271,7 @@ void LAPACK_cgesdd_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3239,7 +3280,7 @@ void LAPACK_cgesdd_base(
     #define LAPACK_cgesdd(...) LAPACK_cgesdd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgesdd_base LAPACK_GLOBAL(dgesdd,DGESDD)
+#define LAPACK_dgesdd_base LAPACK_GLOBAL_SUFFIX(dgesdd,DGESDD)
 void LAPACK_dgesdd_base(
     char const* jobz,
     lapack_int const* m, lapack_int const* n,
@@ -3251,7 +3292,7 @@ void LAPACK_dgesdd_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3260,7 +3301,7 @@ void LAPACK_dgesdd_base(
     #define LAPACK_dgesdd(...) LAPACK_dgesdd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgesdd_base LAPACK_GLOBAL(sgesdd,SGESDD)
+#define LAPACK_sgesdd_base LAPACK_GLOBAL_SUFFIX(sgesdd,SGESDD)
 void LAPACK_sgesdd_base(
     char const* jobz,
     lapack_int const* m, lapack_int const* n,
@@ -3272,7 +3313,7 @@ void LAPACK_sgesdd_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3281,7 +3322,7 @@ void LAPACK_sgesdd_base(
     #define LAPACK_sgesdd(...) LAPACK_sgesdd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgesdd_base LAPACK_GLOBAL(zgesdd,ZGESDD)
+#define LAPACK_zgesdd_base LAPACK_GLOBAL_SUFFIX(zgesdd,ZGESDD)
 void LAPACK_zgesdd_base(
     char const* jobz,
     lapack_int const* m, lapack_int const* n,
@@ -3294,7 +3335,7 @@ void LAPACK_zgesdd_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3303,35 +3344,245 @@ void LAPACK_zgesdd_base(
     #define LAPACK_zgesdd(...) LAPACK_zgesdd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgesv LAPACK_GLOBAL(cgesv,CGESV)
+#define LAPACK_cgedmd_base LAPACK_GLOBAL_SUFFIX(cgedmd,CGEDMD)
+void LAPACK_cgedmd_base(
+    char const* jobs, char const* jobz, char const* jobr, char const* jobf,
+    lapack_int const* whtsvd, lapack_int const* m, lapack_int const* n,
+    lapack_complex_float* x, lapack_int const* ldx,
+    lapack_complex_float* y, lapack_int const* ldy, lapack_int const* nrnk,
+    const float* tol, lapack_int* k, lapack_complex_float* eigs,
+    lapack_complex_float* z, lapack_int const* ldz, float* res,
+    lapack_complex_float* b, lapack_int const* ldb,
+    lapack_complex_float* w, lapack_int const* ldw,
+    lapack_complex_float* s, lapack_int const* lds,
+    lapack_complex_float* zwork, lapack_int const* lzwork,
+    float* work, lapack_int const* lwork,
+    lapack_int* iwork, lapack_int const* liwork,
+    lapack_int* info
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    #define LAPACK_cgedmd(...) LAPACK_cgedmd_base(__VA_ARGS__, 1, 1, 1, 1)
+#else
+    #define LAPACK_cgedmd(...) LAPACK_cgedmd_base(__VA_ARGS__)
+#endif
+
+
+#define LAPACK_dgedmd_base LAPACK_GLOBAL_SUFFIX(dgedmd,DGEDMD)
+void LAPACK_dgedmd_base(
+    char const* jobs, char const* jobz, char const* jobr, char const* jobf,
+    lapack_int const* whtsvd, lapack_int const* m, lapack_int const* n,
+    double* x, lapack_int const* ldx,
+    double* y, lapack_int const* ldy, lapack_int const* nrnk,
+    const double* tol, lapack_int* k, double* reig, double* imeig,
+    double* z, lapack_int const* ldz, double* res,
+    double* b, lapack_int const* ldb,
+    double* w, lapack_int const* ldw,
+    double* s, lapack_int const* lds,
+    double* work, lapack_int const* lwork,
+    lapack_int* iwork, lapack_int const* liwork,
+    lapack_int* info
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    #define LAPACK_dgedmd(...) LAPACK_dgedmd_base(__VA_ARGS__, 1, 1, 1, 1)
+#else
+    #define LAPACK_dgedmd(...) LAPACK_dgedmd_base(__VA_ARGS__)
+#endif
+
+#define LAPACK_sgedmd_base LAPACK_GLOBAL_SUFFIX(sgedmd,SGEDMD)
+void LAPACK_sgedmd_base(
+    char const* jobs, char const* jobz, char const* jobr, char const* jobf,
+    lapack_int const* whtsvd, lapack_int const* m, lapack_int const* n,
+    float* x, lapack_int const* ldx,
+    float* y, lapack_int const* ldy, lapack_int const* nrnk,
+    const float* tol, lapack_int* k, float* reig, float *imeig,
+    float* z, lapack_int const* ldz, float* res,
+    float* b, lapack_int const* ldb,
+    float* w, lapack_int const* ldw,
+    float* s, lapack_int const* lds,
+    float* work, lapack_int const* lwork,
+    lapack_int* iwork, lapack_int const* liwork,
+    lapack_int* info
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    #define LAPACK_sgedmd(...) LAPACK_sgedmd_base(__VA_ARGS__, 1, 1, 1, 1)
+#else
+    #define LAPACK_sgedmd(...) LAPACK_sgedmd_base(__VA_ARGS__)
+#endif
+
+#define LAPACK_zgedmd_base LAPACK_GLOBAL_SUFFIX(zgedmd,ZGEDMD)
+void LAPACK_zgedmd_base(
+    char const* jobs, char const* jobz, char const* jobr, char const* jobf,
+    lapack_int const* whtsvd, lapack_int const* m, lapack_int const* n,
+    lapack_complex_double* x, lapack_int const* ldx,
+    lapack_complex_double* y, lapack_int const* ldy, lapack_int const* nrnk,
+    const double* tol, lapack_int *k, lapack_complex_double* eigs,
+    lapack_complex_double* z, lapack_int const* ldz, double* res,
+    lapack_complex_double* b, lapack_int const* ldb,
+    lapack_complex_double* w, lapack_int const* ldw,
+    lapack_complex_double* s, lapack_int const* lds,
+    lapack_complex_double* zwork, lapack_int const* lzwork,
+    double* rwork, lapack_int const* lrwork,
+    lapack_int* iwork, lapack_int const* liwork,
+    lapack_int* info
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    #define LAPACK_zgedmd(...) LAPACK_zgedmd_base(__VA_ARGS__, 1, 1, 1, 1)
+#else
+    #define LAPACK_zgedmd(...) LAPACK_zgedmd_base(__VA_ARGS__)
+#endif
+
+#define LAPACK_cgedmdq_base LAPACK_GLOBAL_SUFFIX(cgedmdq,CGEDMDQ)
+void LAPACK_cgedmdq_base(
+    char const* jobs, char const* jobz, char const* jobr, char const* jobq,
+    char const* jobt, char const* jobf, lapack_int const* whtsvd,
+    lapack_int const* m, lapack_int const* n,
+    lapack_complex_float* f, lapack_int const* ldf,
+    lapack_complex_float* x, lapack_int const* ldx,
+    lapack_complex_float* y, lapack_int const* ldy, lapack_int const* nrnk,
+    float const* tol, lapack_int const* k,
+    lapack_complex_float* eigs,
+    lapack_complex_float* z, lapack_int const* ldz, float* res,
+    lapack_complex_float* b, lapack_int const* ldb,
+    lapack_complex_float* v, lapack_int const* ldv,
+    lapack_complex_float* s, lapack_int const* lds,
+    lapack_complex_float* zwork, lapack_int const* lzwork,
+    float* work, lapack_int const* lwork,
+    lapack_int* iwork, lapack_int const* liwork,
+    lapack_int* info
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    #define LAPACK_cgedmdq(...) LAPACK_cgedmdq_base(__VA_ARGS__, 1, 1, 1, 1, 1, 1)
+#else
+    #define LAPACK_cgedmdq(...) LAPACK_cgedmdq_base(__VA_ARGS__)
+#endif
+
+#define LAPACK_dgedmdq_base LAPACK_GLOBAL_SUFFIX(dgedmdq,DGEDMDQ)
+void LAPACK_dgedmdq_base(
+    char const* jobs, char const* jobz, char const* jobr, char const* jobq,
+    char const* jobt, char const* jobf, lapack_int const* whtsvd,
+    lapack_int const* m, lapack_int const* n,
+    double* f, lapack_int const* ldf,
+    double* x, lapack_int const* ldx,
+    double* y, lapack_int const* ldy, lapack_int const* nrnk,
+    double const* tol, lapack_int* k,
+    double* reig, double *imeig,
+    double* z, lapack_int const* ldz, double* res,
+    double* b, lapack_int const* ldb,
+    double* v, lapack_int const* ldv,
+    double* s, lapack_int const* lds,
+    double* work, lapack_int const* lwork,
+    lapack_int* iwork, lapack_int const* liwork,
+    lapack_int* info
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    #define LAPACK_dgedmdq(...) LAPACK_dgedmdq_base(__VA_ARGS__, 1, 1, 1, 1, 1, 1)
+#else
+    #define LAPACK_dgedmdq(...) LAPACK_dgedmdq_base(__VA_ARGS__)
+#endif
+
+#define LAPACK_sgedmdq_base LAPACK_GLOBAL_SUFFIX(sgedmdq,SGEDMDQ)
+void LAPACK_sgedmdq_base(
+    char const* jobs, char const* jobz, char const* jobr, char const* jobq,
+    char const* jobt, char const* jobf, lapack_int const* whtsvd,
+    lapack_int const* m, lapack_int const* n,
+    float* f, lapack_int const* ldf,
+    float* x, lapack_int const* ldx,
+    float* y, lapack_int const* ldy, lapack_int const* nrnk,
+    float const* tol, lapack_int const* k,
+    float* reig, float* imeig,
+    float* z, lapack_int const* ldz, float* res,
+    float* b, lapack_int const* ldb,
+    float* v, lapack_int const* ldv,
+    float* s, lapack_int const* lds,
+    float* work, lapack_int const* lwork,
+    lapack_int* iwork, lapack_int const* liwork,
+    lapack_int* info
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    #define LAPACK_sgedmdq(...) LAPACK_sgedmdq_base(__VA_ARGS__, 1, 1, 1, 1, 1, 1)
+#else
+    #define LAPACK_sgedmdq(...) LAPACK_sgedmdq_base(__VA_ARGS__)
+#endif
+
+#define LAPACK_zgedmdq_base LAPACK_GLOBAL_SUFFIX(zgedmdq,ZGEDMDQ)
+void LAPACK_zgedmdq_base(
+    char const* jobs, char const* jobz, char const* jobr, char const* jobq,
+    char const* jobt, char const* jobf, lapack_int const* whtsvd,
+    lapack_int const* m, lapack_int const* n,
+    lapack_complex_double* f, lapack_int const* ldf,
+    lapack_complex_double* x, lapack_int const* ldx,
+    lapack_complex_double* y, lapack_int const* ldy, lapack_int const* nrnk,
+    double const* tol, lapack_int const* k,
+    lapack_complex_double* eigs,
+    lapack_complex_double* z, lapack_int const* ldz, double* res,
+    lapack_complex_double* b, lapack_int const* ldb,
+    lapack_complex_double* v, lapack_int const* ldv,
+    lapack_complex_double* s, lapack_int const* lds,
+    lapack_complex_double* zwork, lapack_int const* lzwork,
+    double* work, lapack_int const* lwork,
+    lapack_int* iwork, lapack_int const* liwork,
+    lapack_int* info
+
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    #define LAPACK_zgedmdq(...) LAPACK_zgedmdq_base(__VA_ARGS__, 1, 1, 1, 1, 1, 1)
+#else
+    #define LAPACK_zgedmdq(...) LAPACK_zgedmdq_base(__VA_ARGS__)
+#endif
+
+#define LAPACK_cgesv LAPACK_GLOBAL_SUFFIX(cgesv,CGESV)
 void LAPACK_cgesv(
     lapack_int const* n, lapack_int const* nrhs,
     lapack_complex_float* A, lapack_int const* lda, lapack_int* ipiv,
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_dgesv LAPACK_GLOBAL(dgesv,DGESV)
+#define LAPACK_dgesv LAPACK_GLOBAL_SUFFIX(dgesv,DGESV)
 void LAPACK_dgesv(
     lapack_int const* n, lapack_int const* nrhs,
     double* A, lapack_int const* lda, lapack_int* ipiv,
     double* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_sgesv LAPACK_GLOBAL(sgesv,SGESV)
+#define LAPACK_sgesv LAPACK_GLOBAL_SUFFIX(sgesv,SGESV)
 void LAPACK_sgesv(
     lapack_int const* n, lapack_int const* nrhs,
     float* A, lapack_int const* lda, lapack_int* ipiv,
     float* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_zgesv LAPACK_GLOBAL(zgesv,ZGESV)
+#define LAPACK_zgesv LAPACK_GLOBAL_SUFFIX(zgesv,ZGESV)
 void LAPACK_zgesv(
     lapack_int const* n, lapack_int const* nrhs,
     lapack_complex_double* A, lapack_int const* lda, lapack_int* ipiv,
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_dsgesv LAPACK_GLOBAL(dsgesv,DSGESV)
+#define LAPACK_dsgesv LAPACK_GLOBAL_SUFFIX(dsgesv,DSGESV)
 void LAPACK_dsgesv(
     lapack_int const* n, lapack_int const* nrhs,
     double* A, lapack_int const* lda, lapack_int* ipiv,
@@ -3341,7 +3592,7 @@ void LAPACK_dsgesv(
     float* swork, lapack_int* iter,
     lapack_int* info );
 
-#define LAPACK_zcgesv LAPACK_GLOBAL(zcgesv,ZCGESV)
+#define LAPACK_zcgesv LAPACK_GLOBAL_SUFFIX(zcgesv,ZCGESV)
 void LAPACK_zcgesv(
     lapack_int const* n, lapack_int const* nrhs,
     lapack_complex_double* A, lapack_int const* lda, lapack_int* ipiv,
@@ -3352,7 +3603,7 @@ void LAPACK_zcgesv(
     double* rwork, lapack_int* iter,
     lapack_int* info );
 
-#define LAPACK_cgesvd_base LAPACK_GLOBAL(cgesvd,CGESVD)
+#define LAPACK_cgesvd_base LAPACK_GLOBAL_SUFFIX(cgesvd,CGESVD)
 void LAPACK_cgesvd_base(
     char const* jobu, char const* jobvt,
     lapack_int const* m, lapack_int const* n,
@@ -3364,7 +3615,7 @@ void LAPACK_cgesvd_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3373,7 +3624,7 @@ void LAPACK_cgesvd_base(
     #define LAPACK_cgesvd(...) LAPACK_cgesvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgesvd_base LAPACK_GLOBAL(dgesvd,DGESVD)
+#define LAPACK_dgesvd_base LAPACK_GLOBAL_SUFFIX(dgesvd,DGESVD)
 void LAPACK_dgesvd_base(
     char const* jobu, char const* jobvt,
     lapack_int const* m, lapack_int const* n,
@@ -3384,7 +3635,7 @@ void LAPACK_dgesvd_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3393,7 +3644,7 @@ void LAPACK_dgesvd_base(
     #define LAPACK_dgesvd(...) LAPACK_dgesvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgesvd_base LAPACK_GLOBAL(sgesvd,SGESVD)
+#define LAPACK_sgesvd_base LAPACK_GLOBAL_SUFFIX(sgesvd,SGESVD)
 void LAPACK_sgesvd_base(
     char const* jobu, char const* jobvt,
     lapack_int const* m, lapack_int const* n,
@@ -3404,7 +3655,7 @@ void LAPACK_sgesvd_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3413,7 +3664,7 @@ void LAPACK_sgesvd_base(
     #define LAPACK_sgesvd(...) LAPACK_sgesvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgesvd_base LAPACK_GLOBAL(zgesvd,ZGESVD)
+#define LAPACK_zgesvd_base LAPACK_GLOBAL_SUFFIX(zgesvd,ZGESVD)
 void LAPACK_zgesvd_base(
     char const* jobu, char const* jobvt,
     lapack_int const* m, lapack_int const* n,
@@ -3425,7 +3676,7 @@ void LAPACK_zgesvd_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3434,7 +3685,7 @@ void LAPACK_zgesvd_base(
     #define LAPACK_zgesvd(...) LAPACK_zgesvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgesvdq_base LAPACK_GLOBAL(cgesvdq,CGESVDQ)
+#define LAPACK_cgesvdq_base LAPACK_GLOBAL_SUFFIX(cgesvdq,CGESVDQ)
 void LAPACK_cgesvdq_base(
     char const* joba, char const* jobp, char const* jobr, char const* jobu, char const* jobv,
     lapack_int const* m, lapack_int const* n,
@@ -3447,7 +3698,7 @@ void LAPACK_cgesvdq_base(
     float* rwork, lapack_int const* lrwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3456,7 +3707,7 @@ void LAPACK_cgesvdq_base(
     #define LAPACK_cgesvdq(...) LAPACK_cgesvdq_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgesvdq_base LAPACK_GLOBAL(dgesvdq,DGESVDQ)
+#define LAPACK_dgesvdq_base LAPACK_GLOBAL_SUFFIX(dgesvdq,DGESVDQ)
 void LAPACK_dgesvdq_base(
     char const* joba, char const* jobp, char const* jobr, char const* jobu, char const* jobv,
     lapack_int const* m, lapack_int const* n,
@@ -3469,7 +3720,7 @@ void LAPACK_dgesvdq_base(
     double* rwork, lapack_int const* lrwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3478,7 +3729,7 @@ void LAPACK_dgesvdq_base(
     #define LAPACK_dgesvdq(...) LAPACK_dgesvdq_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgesvdq_base LAPACK_GLOBAL(sgesvdq,SGESVDQ)
+#define LAPACK_sgesvdq_base LAPACK_GLOBAL_SUFFIX(sgesvdq,SGESVDQ)
 void LAPACK_sgesvdq_base(
     char const* joba, char const* jobp, char const* jobr, char const* jobu, char const* jobv,
     lapack_int const* m, lapack_int const* n,
@@ -3491,7 +3742,7 @@ void LAPACK_sgesvdq_base(
     float* rwork, lapack_int const* lrwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3500,7 +3751,7 @@ void LAPACK_sgesvdq_base(
     #define LAPACK_sgesvdq(...) LAPACK_sgesvdq_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgesvdq_base LAPACK_GLOBAL(zgesvdq,ZGESVDQ)
+#define LAPACK_zgesvdq_base LAPACK_GLOBAL_SUFFIX(zgesvdq,ZGESVDQ)
 void LAPACK_zgesvdq_base(
     char const* joba, char const* jobp, char const* jobr, char const* jobu, char const* jobv,
     lapack_int const* m, lapack_int const* n,
@@ -3513,7 +3764,7 @@ void LAPACK_zgesvdq_base(
     double* rwork, lapack_int const* lrwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3522,7 +3773,7 @@ void LAPACK_zgesvdq_base(
     #define LAPACK_zgesvdq(...) LAPACK_zgesvdq_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgesvdx_base LAPACK_GLOBAL(cgesvdx,CGESVDX)
+#define LAPACK_cgesvdx_base LAPACK_GLOBAL_SUFFIX(cgesvdx,CGESVDX)
 void LAPACK_cgesvdx_base(
     char const* jobu, char const* jobvt, char const* range,
     lapack_int const* m, lapack_int const* n,
@@ -3537,7 +3788,7 @@ void LAPACK_cgesvdx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3547,7 +3798,7 @@ void LAPACK_cgesvdx_base(
 #endif
 
 
-#define LAPACK_dgesvdx_base LAPACK_GLOBAL(dgesvdx,DGESVDX)
+#define LAPACK_dgesvdx_base LAPACK_GLOBAL_SUFFIX(dgesvdx,DGESVDX)
 void LAPACK_dgesvdx_base(
     char const* jobu, char const* jobvt, char const* range,
     lapack_int const* m, lapack_int const* n,
@@ -3561,7 +3812,7 @@ void LAPACK_dgesvdx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3570,7 +3821,7 @@ void LAPACK_dgesvdx_base(
     #define LAPACK_dgesvdx(...) LAPACK_dgesvdx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgesvdx_base LAPACK_GLOBAL(sgesvdx,SGESVDX)
+#define LAPACK_sgesvdx_base LAPACK_GLOBAL_SUFFIX(sgesvdx,SGESVDX)
 void LAPACK_sgesvdx_base(
     char const* jobu, char const* jobvt, char const* range,
     lapack_int const* m, lapack_int const* n,
@@ -3584,7 +3835,7 @@ void LAPACK_sgesvdx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3593,7 +3844,7 @@ void LAPACK_sgesvdx_base(
     #define LAPACK_sgesvdx(...) LAPACK_sgesvdx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgesvdx_base LAPACK_GLOBAL(zgesvdx,ZGESVDX)
+#define LAPACK_zgesvdx_base LAPACK_GLOBAL_SUFFIX(zgesvdx,ZGESVDX)
 void LAPACK_zgesvdx_base(
     char const* jobu, char const* jobvt, char const* range,
     lapack_int const* m, lapack_int const* n,
@@ -3608,7 +3859,7 @@ void LAPACK_zgesvdx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3617,7 +3868,7 @@ void LAPACK_zgesvdx_base(
     #define LAPACK_zgesvdx(...) LAPACK_zgesvdx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgesvj_base LAPACK_GLOBAL(cgesvj,CGESVJ)
+#define LAPACK_cgesvj_base LAPACK_GLOBAL_SUFFIX(cgesvj,CGESVJ)
 void LAPACK_cgesvj_base(
     char const* joba, char const* jobu, char const* jobv,
     lapack_int const* m, lapack_int const* n,
@@ -3628,7 +3879,7 @@ void LAPACK_cgesvj_base(
     float* rwork, lapack_int const* lrwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3637,7 +3888,7 @@ void LAPACK_cgesvj_base(
     #define LAPACK_cgesvj(...) LAPACK_cgesvj_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgesvj_base LAPACK_GLOBAL(dgesvj,DGESVJ)
+#define LAPACK_dgesvj_base LAPACK_GLOBAL_SUFFIX(dgesvj,DGESVJ)
 void LAPACK_dgesvj_base(
     char const* joba, char const* jobu, char const* jobv,
     lapack_int const* m, lapack_int const* n,
@@ -3647,7 +3898,7 @@ void LAPACK_dgesvj_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3656,7 +3907,7 @@ void LAPACK_dgesvj_base(
     #define LAPACK_dgesvj(...) LAPACK_dgesvj_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgesvj_base LAPACK_GLOBAL(sgesvj,SGESVJ)
+#define LAPACK_sgesvj_base LAPACK_GLOBAL_SUFFIX(sgesvj,SGESVJ)
 void LAPACK_sgesvj_base(
     char const* joba, char const* jobu, char const* jobv,
     lapack_int const* m, lapack_int const* n,
@@ -3666,7 +3917,7 @@ void LAPACK_sgesvj_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3675,7 +3926,7 @@ void LAPACK_sgesvj_base(
     #define LAPACK_sgesvj(...) LAPACK_sgesvj_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgesvj_base LAPACK_GLOBAL(zgesvj,ZGESVJ)
+#define LAPACK_zgesvj_base LAPACK_GLOBAL_SUFFIX(zgesvj,ZGESVJ)
 void LAPACK_zgesvj_base(
     char const* joba, char const* jobu, char const* jobv,
     lapack_int const* m, lapack_int const* n,
@@ -3686,7 +3937,7 @@ void LAPACK_zgesvj_base(
     double* rwork, lapack_int const* lrwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3695,7 +3946,7 @@ void LAPACK_zgesvj_base(
     #define LAPACK_zgesvj(...) LAPACK_zgesvj_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgesvx_base LAPACK_GLOBAL(cgesvx,CGESVX)
+#define LAPACK_cgesvx_base LAPACK_GLOBAL_SUFFIX(cgesvx,CGESVX)
 void LAPACK_cgesvx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -3713,7 +3964,7 @@ void LAPACK_cgesvx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3722,7 +3973,7 @@ void LAPACK_cgesvx_base(
     #define LAPACK_cgesvx(...) LAPACK_cgesvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgesvx_base LAPACK_GLOBAL(dgesvx,DGESVX)
+#define LAPACK_dgesvx_base LAPACK_GLOBAL_SUFFIX(dgesvx,DGESVX)
 void LAPACK_dgesvx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -3740,7 +3991,7 @@ void LAPACK_dgesvx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3749,7 +4000,7 @@ void LAPACK_dgesvx_base(
     #define LAPACK_dgesvx(...) LAPACK_dgesvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgesvx_base LAPACK_GLOBAL(sgesvx,SGESVX)
+#define LAPACK_sgesvx_base LAPACK_GLOBAL_SUFFIX(sgesvx,SGESVX)
 void LAPACK_sgesvx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -3767,7 +4018,7 @@ void LAPACK_sgesvx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3776,7 +4027,7 @@ void LAPACK_sgesvx_base(
     #define LAPACK_sgesvx(...) LAPACK_sgesvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgesvx_base LAPACK_GLOBAL(zgesvx,ZGESVX)
+#define LAPACK_zgesvx_base LAPACK_GLOBAL_SUFFIX(zgesvx,ZGESVX)
 void LAPACK_zgesvx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -3794,7 +4045,7 @@ void LAPACK_zgesvx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3803,7 +4054,7 @@ void LAPACK_zgesvx_base(
     #define LAPACK_zgesvx(...) LAPACK_zgesvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgesvxx_base LAPACK_GLOBAL(cgesvxx,CGESVXX)
+#define LAPACK_cgesvxx_base LAPACK_GLOBAL_SUFFIX(cgesvxx,CGESVXX)
 void LAPACK_cgesvxx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -3824,7 +4075,7 @@ void LAPACK_cgesvxx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3833,7 +4084,7 @@ void LAPACK_cgesvxx_base(
     #define LAPACK_cgesvxx(...) LAPACK_cgesvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgesvxx_base LAPACK_GLOBAL(dgesvxx,DGESVXX)
+#define LAPACK_dgesvxx_base LAPACK_GLOBAL_SUFFIX(dgesvxx,DGESVXX)
 void LAPACK_dgesvxx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -3854,7 +4105,7 @@ void LAPACK_dgesvxx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3863,7 +4114,7 @@ void LAPACK_dgesvxx_base(
     #define LAPACK_dgesvxx(...) LAPACK_dgesvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgesvxx_base LAPACK_GLOBAL(sgesvxx,SGESVXX)
+#define LAPACK_sgesvxx_base LAPACK_GLOBAL_SUFFIX(sgesvxx,SGESVXX)
 void LAPACK_sgesvxx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -3884,7 +4135,7 @@ void LAPACK_sgesvxx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3893,7 +4144,7 @@ void LAPACK_sgesvxx_base(
     #define LAPACK_sgesvxx(...) LAPACK_sgesvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgesvxx_base LAPACK_GLOBAL(zgesvxx,ZGESVXX)
+#define LAPACK_zgesvxx_base LAPACK_GLOBAL_SUFFIX(zgesvxx,ZGESVXX)
 void LAPACK_zgesvxx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -3914,7 +4165,7 @@ void LAPACK_zgesvxx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -3923,107 +4174,107 @@ void LAPACK_zgesvxx_base(
     #define LAPACK_zgesvxx(...) LAPACK_zgesvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgetf2 LAPACK_GLOBAL(cgetf2,CGETF2)
+#define LAPACK_cgetf2 LAPACK_GLOBAL_SUFFIX(cgetf2,CGETF2)
 void LAPACK_cgetf2(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_dgetf2 LAPACK_GLOBAL(dgetf2,DGETF2)
+#define LAPACK_dgetf2 LAPACK_GLOBAL_SUFFIX(dgetf2,DGETF2)
 void LAPACK_dgetf2(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_sgetf2 LAPACK_GLOBAL(sgetf2,SGETF2)
+#define LAPACK_sgetf2 LAPACK_GLOBAL_SUFFIX(sgetf2,SGETF2)
 void LAPACK_sgetf2(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_zgetf2 LAPACK_GLOBAL(zgetf2,ZGETF2)
+#define LAPACK_zgetf2 LAPACK_GLOBAL_SUFFIX(zgetf2,ZGETF2)
 void LAPACK_zgetf2(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_cgetrf LAPACK_GLOBAL(cgetrf,CGETRF)
+#define LAPACK_cgetrf LAPACK_GLOBAL_SUFFIX(cgetrf,CGETRF)
 void LAPACK_cgetrf(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_dgetrf LAPACK_GLOBAL(dgetrf,DGETRF)
+#define LAPACK_dgetrf LAPACK_GLOBAL_SUFFIX(dgetrf,DGETRF)
 void LAPACK_dgetrf(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_sgetrf LAPACK_GLOBAL(sgetrf,SGETRF)
+#define LAPACK_sgetrf LAPACK_GLOBAL_SUFFIX(sgetrf,SGETRF)
 void LAPACK_sgetrf(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_zgetrf LAPACK_GLOBAL(zgetrf,ZGETRF)
+#define LAPACK_zgetrf LAPACK_GLOBAL_SUFFIX(zgetrf,ZGETRF)
 void LAPACK_zgetrf(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_cgetrf2 LAPACK_GLOBAL(cgetrf2,CGETRF2)
+#define LAPACK_cgetrf2 LAPACK_GLOBAL_SUFFIX(cgetrf2,CGETRF2)
 void LAPACK_cgetrf2(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_dgetrf2 LAPACK_GLOBAL(dgetrf2,DGETRF2)
+#define LAPACK_dgetrf2 LAPACK_GLOBAL_SUFFIX(dgetrf2,DGETRF2)
 void LAPACK_dgetrf2(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_sgetrf2 LAPACK_GLOBAL(sgetrf2,SGETRF2)
+#define LAPACK_sgetrf2 LAPACK_GLOBAL_SUFFIX(sgetrf2,SGETRF2)
 void LAPACK_sgetrf2(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_zgetrf2 LAPACK_GLOBAL(zgetrf2,ZGETRF2)
+#define LAPACK_zgetrf2 LAPACK_GLOBAL_SUFFIX(zgetrf2,ZGETRF2)
 void LAPACK_zgetrf2(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_cgetri LAPACK_GLOBAL(cgetri,CGETRI)
+#define LAPACK_cgetri LAPACK_GLOBAL_SUFFIX(cgetri,CGETRI)
 void LAPACK_cgetri(
     lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda, lapack_int const* ipiv,
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dgetri LAPACK_GLOBAL(dgetri,DGETRI)
+#define LAPACK_dgetri LAPACK_GLOBAL_SUFFIX(dgetri,DGETRI)
 void LAPACK_dgetri(
     lapack_int const* n,
     double* A, lapack_int const* lda, lapack_int const* ipiv,
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sgetri LAPACK_GLOBAL(sgetri,SGETRI)
+#define LAPACK_sgetri LAPACK_GLOBAL_SUFFIX(sgetri,SGETRI)
 void LAPACK_sgetri(
     lapack_int const* n,
     float* A, lapack_int const* lda, lapack_int const* ipiv,
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zgetri LAPACK_GLOBAL(zgetri,ZGETRI)
+#define LAPACK_zgetri LAPACK_GLOBAL_SUFFIX(zgetri,ZGETRI)
 void LAPACK_zgetri(
     lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda, lapack_int const* ipiv,
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cgetrs_base LAPACK_GLOBAL(cgetrs,CGETRS)
+#define LAPACK_cgetrs_base LAPACK_GLOBAL_SUFFIX(cgetrs,CGETRS)
 void LAPACK_cgetrs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -4031,7 +4282,7 @@ void LAPACK_cgetrs_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4040,7 +4291,7 @@ void LAPACK_cgetrs_base(
     #define LAPACK_cgetrs(...) LAPACK_cgetrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgetrs_base LAPACK_GLOBAL(dgetrs,DGETRS)
+#define LAPACK_dgetrs_base LAPACK_GLOBAL_SUFFIX(dgetrs,DGETRS)
 void LAPACK_dgetrs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -4048,7 +4299,7 @@ void LAPACK_dgetrs_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4057,7 +4308,7 @@ void LAPACK_dgetrs_base(
     #define LAPACK_dgetrs(...) LAPACK_dgetrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgetrs_base LAPACK_GLOBAL(sgetrs,SGETRS)
+#define LAPACK_sgetrs_base LAPACK_GLOBAL_SUFFIX(sgetrs,SGETRS)
 void LAPACK_sgetrs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -4065,7 +4316,7 @@ void LAPACK_sgetrs_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4074,7 +4325,7 @@ void LAPACK_sgetrs_base(
     #define LAPACK_sgetrs(...) LAPACK_sgetrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgetrs_base LAPACK_GLOBAL(zgetrs,ZGETRS)
+#define LAPACK_zgetrs_base LAPACK_GLOBAL_SUFFIX(zgetrs,ZGETRS)
 void LAPACK_zgetrs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -4082,7 +4333,7 @@ void LAPACK_zgetrs_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4091,7 +4342,7 @@ void LAPACK_zgetrs_base(
     #define LAPACK_zgetrs(...) LAPACK_zgetrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgetsls_base LAPACK_GLOBAL(cgetsls,CGETSLS)
+#define LAPACK_cgetsls_base LAPACK_GLOBAL_SUFFIX(cgetsls,CGETSLS)
 void LAPACK_cgetsls_base(
     char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
@@ -4100,7 +4351,7 @@ void LAPACK_cgetsls_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4109,7 +4360,7 @@ void LAPACK_cgetsls_base(
     #define LAPACK_cgetsls(...) LAPACK_cgetsls_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgetsls_base LAPACK_GLOBAL(dgetsls,DGETSLS)
+#define LAPACK_dgetsls_base LAPACK_GLOBAL_SUFFIX(dgetsls,DGETSLS)
 void LAPACK_dgetsls_base(
     char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
@@ -4118,7 +4369,7 @@ void LAPACK_dgetsls_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4127,7 +4378,7 @@ void LAPACK_dgetsls_base(
     #define LAPACK_dgetsls(...) LAPACK_dgetsls_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgetsls_base LAPACK_GLOBAL(sgetsls,SGETSLS)
+#define LAPACK_sgetsls_base LAPACK_GLOBAL_SUFFIX(sgetsls,SGETSLS)
 void LAPACK_sgetsls_base(
     char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
@@ -4136,7 +4387,7 @@ void LAPACK_sgetsls_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4145,7 +4396,7 @@ void LAPACK_sgetsls_base(
     #define LAPACK_sgetsls(...) LAPACK_sgetsls_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgetsls_base LAPACK_GLOBAL(zgetsls,ZGETSLS)
+#define LAPACK_zgetsls_base LAPACK_GLOBAL_SUFFIX(zgetsls,ZGETSLS)
 void LAPACK_zgetsls_base(
     char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* nrhs,
@@ -4154,7 +4405,7 @@ void LAPACK_zgetsls_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4163,7 +4414,7 @@ void LAPACK_zgetsls_base(
     #define LAPACK_zgetsls(...) LAPACK_zgetsls_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgetsqrhrt LAPACK_GLOBAL(cgetsqrhrt,CGETSQRHRT)
+#define LAPACK_cgetsqrhrt LAPACK_GLOBAL_SUFFIX(cgetsqrhrt,CGETSQRHRT)
 void LAPACK_cgetsqrhrt(
     lapack_int const* m, lapack_int const* n,
     lapack_int const* mb1, lapack_int const* nb1, lapack_int const* nb2,
@@ -4172,7 +4423,7 @@ void LAPACK_cgetsqrhrt(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dgetsqrhrt LAPACK_GLOBAL(dgetsqrhrt,DGETSQRHRT)
+#define LAPACK_dgetsqrhrt LAPACK_GLOBAL_SUFFIX(dgetsqrhrt,DGETSQRHRT)
 void LAPACK_dgetsqrhrt(
     lapack_int const* m, lapack_int const* n,
     lapack_int const* mb1, lapack_int const* nb1, lapack_int const* nb2,
@@ -4181,7 +4432,7 @@ void LAPACK_dgetsqrhrt(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sgetsqrhrt LAPACK_GLOBAL(sgetsqrhrt,SGETSQRHRT)
+#define LAPACK_sgetsqrhrt LAPACK_GLOBAL_SUFFIX(sgetsqrhrt,SGETSQRHRT)
 void LAPACK_sgetsqrhrt(
     lapack_int const* m, lapack_int const* n,
     lapack_int const* mb1, lapack_int const* nb1, lapack_int const* nb2,
@@ -4190,7 +4441,7 @@ void LAPACK_sgetsqrhrt(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zgetsqrhrt LAPACK_GLOBAL(zgetsqrhrt,ZGETSQRHRT)
+#define LAPACK_zgetsqrhrt LAPACK_GLOBAL_SUFFIX(zgetsqrhrt,ZGETSQRHRT)
 void LAPACK_zgetsqrhrt(
     lapack_int const* m, lapack_int const* n,
     lapack_int const* mb1, lapack_int const* nb1, lapack_int const* nb2,
@@ -4199,7 +4450,7 @@ void LAPACK_zgetsqrhrt(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cggbak_base LAPACK_GLOBAL(cggbak,CGGBAK)
+#define LAPACK_cggbak_base LAPACK_GLOBAL_SUFFIX(cggbak,CGGBAK)
 void LAPACK_cggbak_base(
     char const* job, char const* side,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -4208,7 +4459,7 @@ void LAPACK_cggbak_base(
     lapack_complex_float* V, lapack_int const* ldv,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4217,7 +4468,7 @@ void LAPACK_cggbak_base(
     #define LAPACK_cggbak(...) LAPACK_cggbak_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dggbak_base LAPACK_GLOBAL(dggbak,DGGBAK)
+#define LAPACK_dggbak_base LAPACK_GLOBAL_SUFFIX(dggbak,DGGBAK)
 void LAPACK_dggbak_base(
     char const* job, char const* side,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -4226,7 +4477,7 @@ void LAPACK_dggbak_base(
     double* V, lapack_int const* ldv,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4235,7 +4486,7 @@ void LAPACK_dggbak_base(
     #define LAPACK_dggbak(...) LAPACK_dggbak_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sggbak_base LAPACK_GLOBAL(sggbak,SGGBAK)
+#define LAPACK_sggbak_base LAPACK_GLOBAL_SUFFIX(sggbak,SGGBAK)
 void LAPACK_sggbak_base(
     char const* job, char const* side,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -4244,7 +4495,7 @@ void LAPACK_sggbak_base(
     float* V, lapack_int const* ldv,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4253,7 +4504,7 @@ void LAPACK_sggbak_base(
     #define LAPACK_sggbak(...) LAPACK_sggbak_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zggbak_base LAPACK_GLOBAL(zggbak,ZGGBAK)
+#define LAPACK_zggbak_base LAPACK_GLOBAL_SUFFIX(zggbak,ZGGBAK)
 void LAPACK_zggbak_base(
     char const* job, char const* side,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -4262,7 +4513,7 @@ void LAPACK_zggbak_base(
     lapack_complex_double* V, lapack_int const* ldv,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4271,7 +4522,7 @@ void LAPACK_zggbak_base(
     #define LAPACK_zggbak(...) LAPACK_zggbak_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cggbal_base LAPACK_GLOBAL(cggbal,CGGBAL)
+#define LAPACK_cggbal_base LAPACK_GLOBAL_SUFFIX(cggbal,CGGBAL)
 void LAPACK_cggbal_base(
     char const* job,
     lapack_int const* n,
@@ -4282,7 +4533,7 @@ void LAPACK_cggbal_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4291,7 +4542,7 @@ void LAPACK_cggbal_base(
     #define LAPACK_cggbal(...) LAPACK_cggbal_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dggbal_base LAPACK_GLOBAL(dggbal,DGGBAL)
+#define LAPACK_dggbal_base LAPACK_GLOBAL_SUFFIX(dggbal,DGGBAL)
 void LAPACK_dggbal_base(
     char const* job,
     lapack_int const* n,
@@ -4302,7 +4553,7 @@ void LAPACK_dggbal_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4311,7 +4562,7 @@ void LAPACK_dggbal_base(
     #define LAPACK_dggbal(...) LAPACK_dggbal_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sggbal_base LAPACK_GLOBAL(sggbal,SGGBAL)
+#define LAPACK_sggbal_base LAPACK_GLOBAL_SUFFIX(sggbal,SGGBAL)
 void LAPACK_sggbal_base(
     char const* job,
     lapack_int const* n,
@@ -4322,7 +4573,7 @@ void LAPACK_sggbal_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4331,7 +4582,7 @@ void LAPACK_sggbal_base(
     #define LAPACK_sggbal(...) LAPACK_sggbal_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zggbal_base LAPACK_GLOBAL(zggbal,ZGGBAL)
+#define LAPACK_zggbal_base LAPACK_GLOBAL_SUFFIX(zggbal,ZGGBAL)
 void LAPACK_zggbal_base(
     char const* job,
     lapack_int const* n,
@@ -4342,7 +4593,7 @@ void LAPACK_zggbal_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4351,7 +4602,7 @@ void LAPACK_zggbal_base(
     #define LAPACK_zggbal(...) LAPACK_zggbal_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgges_base LAPACK_GLOBAL(cgges,CGGES)
+#define LAPACK_cgges_base LAPACK_GLOBAL_SUFFIX(cgges,CGGES)
 void LAPACK_cgges_base(
     char const* jobvsl, char const* jobvsr, char const* sort, LAPACK_C_SELECT2 selctg,
     lapack_int const* n,
@@ -4365,7 +4616,7 @@ void LAPACK_cgges_base(
     float* rwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4374,7 +4625,7 @@ void LAPACK_cgges_base(
     #define LAPACK_cgges(...) LAPACK_cgges_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgges_base LAPACK_GLOBAL(dgges,DGGES)
+#define LAPACK_dgges_base LAPACK_GLOBAL_SUFFIX(dgges,DGGES)
 void LAPACK_dgges_base(
     char const* jobvsl, char const* jobvsr, char const* sort, LAPACK_D_SELECT3 selctg,
     lapack_int const* n,
@@ -4388,7 +4639,7 @@ void LAPACK_dgges_base(
     double* work, lapack_int const* lwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4397,7 +4648,7 @@ void LAPACK_dgges_base(
     #define LAPACK_dgges(...) LAPACK_dgges_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgges_base LAPACK_GLOBAL(sgges,SGGES)
+#define LAPACK_sgges_base LAPACK_GLOBAL_SUFFIX(sgges,SGGES)
 void LAPACK_sgges_base(
     char const* jobvsl, char const* jobvsr, char const* sort, LAPACK_S_SELECT3 selctg,
     lapack_int const* n,
@@ -4411,7 +4662,7 @@ void LAPACK_sgges_base(
     float* work, lapack_int const* lwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4420,7 +4671,7 @@ void LAPACK_sgges_base(
     #define LAPACK_sgges(...) LAPACK_sgges_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgges_base LAPACK_GLOBAL(zgges,ZGGES)
+#define LAPACK_zgges_base LAPACK_GLOBAL_SUFFIX(zgges,ZGGES)
 void LAPACK_zgges_base(
     char const* jobvsl, char const* jobvsr, char const* sort, LAPACK_Z_SELECT2 selctg,
     lapack_int const* n,
@@ -4434,7 +4685,7 @@ void LAPACK_zgges_base(
     double* rwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4443,7 +4694,7 @@ void LAPACK_zgges_base(
     #define LAPACK_zgges(...) LAPACK_zgges_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgges3_base LAPACK_GLOBAL(cgges3,CGGES3)
+#define LAPACK_cgges3_base LAPACK_GLOBAL_SUFFIX(cgges3,CGGES3)
 void LAPACK_cgges3_base(
     char const* jobvsl, char const* jobvsr, char const* sort, LAPACK_C_SELECT2 selctg,
     lapack_int const* n,
@@ -4457,7 +4708,7 @@ void LAPACK_cgges3_base(
     float* rwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4466,7 +4717,7 @@ void LAPACK_cgges3_base(
     #define LAPACK_cgges3(...) LAPACK_cgges3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgges3_base LAPACK_GLOBAL(dgges3,DGGES3)
+#define LAPACK_dgges3_base LAPACK_GLOBAL_SUFFIX(dgges3,DGGES3)
 void LAPACK_dgges3_base(
     char const* jobvsl, char const* jobvsr, char const* sort, LAPACK_D_SELECT3 selctg,
     lapack_int const* n,
@@ -4480,7 +4731,7 @@ void LAPACK_dgges3_base(
     double* work, lapack_int const* lwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4489,7 +4740,7 @@ void LAPACK_dgges3_base(
     #define LAPACK_dgges3(...) LAPACK_dgges3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgges3_base LAPACK_GLOBAL(sgges3,SGGES3)
+#define LAPACK_sgges3_base LAPACK_GLOBAL_SUFFIX(sgges3,SGGES3)
 void LAPACK_sgges3_base(
     char const* jobvsl, char const* jobvsr, char const* sort, LAPACK_S_SELECT3 selctg,
     lapack_int const* n,
@@ -4503,7 +4754,7 @@ void LAPACK_sgges3_base(
     float* work, lapack_int const* lwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4512,7 +4763,7 @@ void LAPACK_sgges3_base(
     #define LAPACK_sgges3(...) LAPACK_sgges3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgges3_base LAPACK_GLOBAL(zgges3,ZGGES3)
+#define LAPACK_zgges3_base LAPACK_GLOBAL_SUFFIX(zgges3,ZGGES3)
 void LAPACK_zgges3_base(
     char const* jobvsl, char const* jobvsr, char const* sort, LAPACK_Z_SELECT2 selctg,
     lapack_int const* n,
@@ -4526,7 +4777,7 @@ void LAPACK_zgges3_base(
     double* rwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4535,7 +4786,7 @@ void LAPACK_zgges3_base(
     #define LAPACK_zgges3(...) LAPACK_zgges3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cggesx_base LAPACK_GLOBAL(cggesx,CGGESX)
+#define LAPACK_cggesx_base LAPACK_GLOBAL_SUFFIX(cggesx,CGGESX)
 void LAPACK_cggesx_base(
     char const* jobvsl, char const* jobvsr, char const* sort, LAPACK_C_SELECT2 selctg, char const* sense,
     lapack_int const* n,
@@ -4552,7 +4803,7 @@ void LAPACK_cggesx_base(
     lapack_int* iwork, lapack_int const* liwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4561,7 +4812,7 @@ void LAPACK_cggesx_base(
     #define LAPACK_cggesx(...) LAPACK_cggesx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dggesx_base LAPACK_GLOBAL(dggesx,DGGESX)
+#define LAPACK_dggesx_base LAPACK_GLOBAL_SUFFIX(dggesx,DGGESX)
 void LAPACK_dggesx_base(
     char const* jobvsl, char const* jobvsr, char const* sort, LAPACK_D_SELECT3 selctg, char const* sense,
     lapack_int const* n,
@@ -4578,7 +4829,7 @@ void LAPACK_dggesx_base(
     lapack_int* iwork, lapack_int const* liwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4587,7 +4838,7 @@ void LAPACK_dggesx_base(
     #define LAPACK_dggesx(...) LAPACK_dggesx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sggesx_base LAPACK_GLOBAL(sggesx,SGGESX)
+#define LAPACK_sggesx_base LAPACK_GLOBAL_SUFFIX(sggesx,SGGESX)
 void LAPACK_sggesx_base(
     char const* jobvsl, char const* jobvsr, char const* sort, LAPACK_S_SELECT3 selctg, char const* sense,
     lapack_int const* n,
@@ -4604,7 +4855,7 @@ void LAPACK_sggesx_base(
     lapack_int* iwork, lapack_int const* liwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4613,7 +4864,7 @@ void LAPACK_sggesx_base(
     #define LAPACK_sggesx(...) LAPACK_sggesx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zggesx_base LAPACK_GLOBAL(zggesx,ZGGESX)
+#define LAPACK_zggesx_base LAPACK_GLOBAL_SUFFIX(zggesx,ZGGESX)
 void LAPACK_zggesx_base(
     char const* jobvsl, char const* jobvsr, char const* sort, LAPACK_Z_SELECT2 selctg, char const* sense,
     lapack_int const* n,
@@ -4630,7 +4881,7 @@ void LAPACK_zggesx_base(
     lapack_int* iwork, lapack_int const* liwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4639,7 +4890,7 @@ void LAPACK_zggesx_base(
     #define LAPACK_zggesx(...) LAPACK_zggesx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cggev_base LAPACK_GLOBAL(cggev,CGGEV)
+#define LAPACK_cggev_base LAPACK_GLOBAL_SUFFIX(cggev,CGGEV)
 void LAPACK_cggev_base(
     char const* jobvl, char const* jobvr,
     lapack_int const* n,
@@ -4653,7 +4904,7 @@ void LAPACK_cggev_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4662,7 +4913,7 @@ void LAPACK_cggev_base(
     #define LAPACK_cggev(...) LAPACK_cggev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dggev_base LAPACK_GLOBAL(dggev,DGGEV)
+#define LAPACK_dggev_base LAPACK_GLOBAL_SUFFIX(dggev,DGGEV)
 void LAPACK_dggev_base(
     char const* jobvl, char const* jobvr,
     lapack_int const* n,
@@ -4676,7 +4927,7 @@ void LAPACK_dggev_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4685,7 +4936,7 @@ void LAPACK_dggev_base(
     #define LAPACK_dggev(...) LAPACK_dggev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sggev_base LAPACK_GLOBAL(sggev,SGGEV)
+#define LAPACK_sggev_base LAPACK_GLOBAL_SUFFIX(sggev,SGGEV)
 void LAPACK_sggev_base(
     char const* jobvl, char const* jobvr,
     lapack_int const* n,
@@ -4699,7 +4950,7 @@ void LAPACK_sggev_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4708,7 +4959,7 @@ void LAPACK_sggev_base(
     #define LAPACK_sggev(...) LAPACK_sggev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zggev_base LAPACK_GLOBAL(zggev,ZGGEV)
+#define LAPACK_zggev_base LAPACK_GLOBAL_SUFFIX(zggev,ZGGEV)
 void LAPACK_zggev_base(
     char const* jobvl, char const* jobvr,
     lapack_int const* n,
@@ -4722,7 +4973,7 @@ void LAPACK_zggev_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4731,7 +4982,7 @@ void LAPACK_zggev_base(
     #define LAPACK_zggev(...) LAPACK_zggev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cggev3_base LAPACK_GLOBAL(cggev3,CGGEV3)
+#define LAPACK_cggev3_base LAPACK_GLOBAL_SUFFIX(cggev3,CGGEV3)
 void LAPACK_cggev3_base(
     char const* jobvl, char const* jobvr,
     lapack_int const* n,
@@ -4745,7 +4996,7 @@ void LAPACK_cggev3_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4754,7 +5005,7 @@ void LAPACK_cggev3_base(
     #define LAPACK_cggev3(...) LAPACK_cggev3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dggev3_base LAPACK_GLOBAL(dggev3,DGGEV3)
+#define LAPACK_dggev3_base LAPACK_GLOBAL_SUFFIX(dggev3,DGGEV3)
 void LAPACK_dggev3_base(
     char const* jobvl, char const* jobvr,
     lapack_int const* n,
@@ -4768,7 +5019,7 @@ void LAPACK_dggev3_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4777,7 +5028,7 @@ void LAPACK_dggev3_base(
     #define LAPACK_dggev3(...) LAPACK_dggev3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sggev3_base LAPACK_GLOBAL(sggev3,SGGEV3)
+#define LAPACK_sggev3_base LAPACK_GLOBAL_SUFFIX(sggev3,SGGEV3)
 void LAPACK_sggev3_base(
     char const* jobvl, char const* jobvr,
     lapack_int const* n,
@@ -4791,7 +5042,7 @@ void LAPACK_sggev3_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4800,7 +5051,7 @@ void LAPACK_sggev3_base(
     #define LAPACK_sggev3(...) LAPACK_sggev3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zggev3_base LAPACK_GLOBAL(zggev3,ZGGEV3)
+#define LAPACK_zggev3_base LAPACK_GLOBAL_SUFFIX(zggev3,ZGGEV3)
 void LAPACK_zggev3_base(
     char const* jobvl, char const* jobvr,
     lapack_int const* n,
@@ -4814,7 +5065,7 @@ void LAPACK_zggev3_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4823,7 +5074,7 @@ void LAPACK_zggev3_base(
     #define LAPACK_zggev3(...) LAPACK_zggev3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cggevx_base LAPACK_GLOBAL(cggevx,CGGEVX)
+#define LAPACK_cggevx_base LAPACK_GLOBAL_SUFFIX(cggevx,CGGEVX)
 void LAPACK_cggevx_base(
     char const* balanc, char const* jobvl, char const* jobvr, char const* sense,
     lapack_int const* n,
@@ -4844,7 +5095,7 @@ void LAPACK_cggevx_base(
     lapack_int* iwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4853,7 +5104,7 @@ void LAPACK_cggevx_base(
     #define LAPACK_cggevx(...) LAPACK_cggevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dggevx_base LAPACK_GLOBAL(dggevx,DGGEVX)
+#define LAPACK_dggevx_base LAPACK_GLOBAL_SUFFIX(dggevx,DGGEVX)
 void LAPACK_dggevx_base(
     char const* balanc, char const* jobvl, char const* jobvr, char const* sense,
     lapack_int const* n,
@@ -4874,7 +5125,7 @@ void LAPACK_dggevx_base(
     lapack_int* iwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4883,7 +5134,7 @@ void LAPACK_dggevx_base(
     #define LAPACK_dggevx(...) LAPACK_dggevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sggevx_base LAPACK_GLOBAL(sggevx,SGGEVX)
+#define LAPACK_sggevx_base LAPACK_GLOBAL_SUFFIX(sggevx,SGGEVX)
 void LAPACK_sggevx_base(
     char const* balanc, char const* jobvl, char const* jobvr, char const* sense,
     lapack_int const* n,
@@ -4904,7 +5155,7 @@ void LAPACK_sggevx_base(
     lapack_int* iwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4913,7 +5164,7 @@ void LAPACK_sggevx_base(
     #define LAPACK_sggevx(...) LAPACK_sggevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zggevx_base LAPACK_GLOBAL(zggevx,ZGGEVX)
+#define LAPACK_zggevx_base LAPACK_GLOBAL_SUFFIX(zggevx,ZGGEVX)
 void LAPACK_zggevx_base(
     char const* balanc, char const* jobvl, char const* jobvr, char const* sense,
     lapack_int const* n,
@@ -4934,7 +5185,7 @@ void LAPACK_zggevx_base(
     lapack_int* iwork, lapack_logical* BWORK,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -4943,7 +5194,7 @@ void LAPACK_zggevx_base(
     #define LAPACK_zggevx(...) LAPACK_zggevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cggglm LAPACK_GLOBAL(cggglm,CGGGLM)
+#define LAPACK_cggglm LAPACK_GLOBAL_SUFFIX(cggglm,CGGGLM)
 void LAPACK_cggglm(
     lapack_int const* n, lapack_int const* m, lapack_int const* p,
     lapack_complex_float* A, lapack_int const* lda,
@@ -4954,7 +5205,7 @@ void LAPACK_cggglm(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dggglm LAPACK_GLOBAL(dggglm,DGGGLM)
+#define LAPACK_dggglm LAPACK_GLOBAL_SUFFIX(dggglm,DGGGLM)
 void LAPACK_dggglm(
     lapack_int const* n, lapack_int const* m, lapack_int const* p,
     double* A, lapack_int const* lda,
@@ -4965,7 +5216,7 @@ void LAPACK_dggglm(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sggglm LAPACK_GLOBAL(sggglm,SGGGLM)
+#define LAPACK_sggglm LAPACK_GLOBAL_SUFFIX(sggglm,SGGGLM)
 void LAPACK_sggglm(
     lapack_int const* n, lapack_int const* m, lapack_int const* p,
     float* A, lapack_int const* lda,
@@ -4976,7 +5227,7 @@ void LAPACK_sggglm(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zggglm LAPACK_GLOBAL(zggglm,ZGGGLM)
+#define LAPACK_zggglm LAPACK_GLOBAL_SUFFIX(zggglm,ZGGGLM)
 void LAPACK_zggglm(
     lapack_int const* n, lapack_int const* m, lapack_int const* p,
     lapack_complex_double* A, lapack_int const* lda,
@@ -4987,7 +5238,7 @@ void LAPACK_zggglm(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cgghd3_base LAPACK_GLOBAL(cgghd3,CGGHD3)
+#define LAPACK_cgghd3_base LAPACK_GLOBAL_SUFFIX(cgghd3,CGGHD3)
 void LAPACK_cgghd3_base(
     char const* compq, char const* compz,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -4998,7 +5249,7 @@ void LAPACK_cgghd3_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5007,7 +5258,7 @@ void LAPACK_cgghd3_base(
     #define LAPACK_cgghd3(...) LAPACK_cgghd3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgghd3_base LAPACK_GLOBAL(dgghd3,DGGHD3)
+#define LAPACK_dgghd3_base LAPACK_GLOBAL_SUFFIX(dgghd3,DGGHD3)
 void LAPACK_dgghd3_base(
     char const* compq, char const* compz,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -5018,7 +5269,7 @@ void LAPACK_dgghd3_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5027,7 +5278,7 @@ void LAPACK_dgghd3_base(
     #define LAPACK_dgghd3(...) LAPACK_dgghd3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgghd3_base LAPACK_GLOBAL(sgghd3,SGGHD3)
+#define LAPACK_sgghd3_base LAPACK_GLOBAL_SUFFIX(sgghd3,SGGHD3)
 void LAPACK_sgghd3_base(
     char const* compq, char const* compz,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -5038,7 +5289,7 @@ void LAPACK_sgghd3_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5047,7 +5298,7 @@ void LAPACK_sgghd3_base(
     #define LAPACK_sgghd3(...) LAPACK_sgghd3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgghd3_base LAPACK_GLOBAL(zgghd3,ZGGHD3)
+#define LAPACK_zgghd3_base LAPACK_GLOBAL_SUFFIX(zgghd3,ZGGHD3)
 void LAPACK_zgghd3_base(
     char const* compq, char const* compz,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -5058,7 +5309,7 @@ void LAPACK_zgghd3_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5067,7 +5318,7 @@ void LAPACK_zgghd3_base(
     #define LAPACK_zgghd3(...) LAPACK_zgghd3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgghrd_base LAPACK_GLOBAL(cgghrd,CGGHRD)
+#define LAPACK_cgghrd_base LAPACK_GLOBAL_SUFFIX(cgghrd,CGGHRD)
 void LAPACK_cgghrd_base(
     char const* compq, char const* compz,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -5077,7 +5328,7 @@ void LAPACK_cgghrd_base(
     lapack_complex_float* Z, lapack_int const* ldz,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5086,7 +5337,7 @@ void LAPACK_cgghrd_base(
     #define LAPACK_cgghrd(...) LAPACK_cgghrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgghrd_base LAPACK_GLOBAL(dgghrd,DGGHRD)
+#define LAPACK_dgghrd_base LAPACK_GLOBAL_SUFFIX(dgghrd,DGGHRD)
 void LAPACK_dgghrd_base(
     char const* compq, char const* compz,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -5096,7 +5347,7 @@ void LAPACK_dgghrd_base(
     double* Z, lapack_int const* ldz,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5105,7 +5356,7 @@ void LAPACK_dgghrd_base(
     #define LAPACK_dgghrd(...) LAPACK_dgghrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgghrd_base LAPACK_GLOBAL(sgghrd,SGGHRD)
+#define LAPACK_sgghrd_base LAPACK_GLOBAL_SUFFIX(sgghrd,SGGHRD)
 void LAPACK_sgghrd_base(
     char const* compq, char const* compz,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -5115,7 +5366,7 @@ void LAPACK_sgghrd_base(
     float* Z, lapack_int const* ldz,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5124,7 +5375,7 @@ void LAPACK_sgghrd_base(
     #define LAPACK_sgghrd(...) LAPACK_sgghrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgghrd_base LAPACK_GLOBAL(zgghrd,ZGGHRD)
+#define LAPACK_zgghrd_base LAPACK_GLOBAL_SUFFIX(zgghrd,ZGGHRD)
 void LAPACK_zgghrd_base(
     char const* compq, char const* compz,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -5134,7 +5385,7 @@ void LAPACK_zgghrd_base(
     lapack_complex_double* Z, lapack_int const* ldz,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5143,7 +5394,7 @@ void LAPACK_zgghrd_base(
     #define LAPACK_zgghrd(...) LAPACK_zgghrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgglse LAPACK_GLOBAL(cgglse,CGGLSE)
+#define LAPACK_cgglse LAPACK_GLOBAL_SUFFIX(cgglse,CGGLSE)
 void LAPACK_cgglse(
     lapack_int const* m, lapack_int const* n, lapack_int const* p,
     lapack_complex_float* A, lapack_int const* lda,
@@ -5154,7 +5405,7 @@ void LAPACK_cgglse(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dgglse LAPACK_GLOBAL(dgglse,DGGLSE)
+#define LAPACK_dgglse LAPACK_GLOBAL_SUFFIX(dgglse,DGGLSE)
 void LAPACK_dgglse(
     lapack_int const* m, lapack_int const* n, lapack_int const* p,
     double* A, lapack_int const* lda,
@@ -5165,7 +5416,7 @@ void LAPACK_dgglse(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sgglse LAPACK_GLOBAL(sgglse,SGGLSE)
+#define LAPACK_sgglse LAPACK_GLOBAL_SUFFIX(sgglse,SGGLSE)
 void LAPACK_sgglse(
     lapack_int const* m, lapack_int const* n, lapack_int const* p,
     float* A, lapack_int const* lda,
@@ -5176,7 +5427,7 @@ void LAPACK_sgglse(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zgglse LAPACK_GLOBAL(zgglse,ZGGLSE)
+#define LAPACK_zgglse LAPACK_GLOBAL_SUFFIX(zgglse,ZGGLSE)
 void LAPACK_zgglse(
     lapack_int const* m, lapack_int const* n, lapack_int const* p,
     lapack_complex_double* A, lapack_int const* lda,
@@ -5187,7 +5438,7 @@ void LAPACK_zgglse(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cggqrf LAPACK_GLOBAL(cggqrf,CGGQRF)
+#define LAPACK_cggqrf LAPACK_GLOBAL_SUFFIX(cggqrf,CGGQRF)
 void LAPACK_cggqrf(
     lapack_int const* n, lapack_int const* m, lapack_int const* p,
     lapack_complex_float* A, lapack_int const* lda,
@@ -5197,7 +5448,7 @@ void LAPACK_cggqrf(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dggqrf LAPACK_GLOBAL(dggqrf,DGGQRF)
+#define LAPACK_dggqrf LAPACK_GLOBAL_SUFFIX(dggqrf,DGGQRF)
 void LAPACK_dggqrf(
     lapack_int const* n, lapack_int const* m, lapack_int const* p,
     double* A, lapack_int const* lda,
@@ -5207,7 +5458,7 @@ void LAPACK_dggqrf(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sggqrf LAPACK_GLOBAL(sggqrf,SGGQRF)
+#define LAPACK_sggqrf LAPACK_GLOBAL_SUFFIX(sggqrf,SGGQRF)
 void LAPACK_sggqrf(
     lapack_int const* n, lapack_int const* m, lapack_int const* p,
     float* A, lapack_int const* lda,
@@ -5217,7 +5468,7 @@ void LAPACK_sggqrf(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zggqrf LAPACK_GLOBAL(zggqrf,ZGGQRF)
+#define LAPACK_zggqrf LAPACK_GLOBAL_SUFFIX(zggqrf,ZGGQRF)
 void LAPACK_zggqrf(
     lapack_int const* n, lapack_int const* m, lapack_int const* p,
     lapack_complex_double* A, lapack_int const* lda,
@@ -5227,7 +5478,7 @@ void LAPACK_zggqrf(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cggrqf LAPACK_GLOBAL(cggrqf,CGGRQF)
+#define LAPACK_cggrqf LAPACK_GLOBAL_SUFFIX(cggrqf,CGGRQF)
 void LAPACK_cggrqf(
     lapack_int const* m, lapack_int const* p, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
@@ -5237,7 +5488,7 @@ void LAPACK_cggrqf(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dggrqf LAPACK_GLOBAL(dggrqf,DGGRQF)
+#define LAPACK_dggrqf LAPACK_GLOBAL_SUFFIX(dggrqf,DGGRQF)
 void LAPACK_dggrqf(
     lapack_int const* m, lapack_int const* p, lapack_int const* n,
     double* A, lapack_int const* lda,
@@ -5247,7 +5498,7 @@ void LAPACK_dggrqf(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sggrqf LAPACK_GLOBAL(sggrqf,SGGRQF)
+#define LAPACK_sggrqf LAPACK_GLOBAL_SUFFIX(sggrqf,SGGRQF)
 void LAPACK_sggrqf(
     lapack_int const* m, lapack_int const* p, lapack_int const* n,
     float* A, lapack_int const* lda,
@@ -5257,7 +5508,7 @@ void LAPACK_sggrqf(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zggrqf LAPACK_GLOBAL(zggrqf,ZGGRQF)
+#define LAPACK_zggrqf LAPACK_GLOBAL_SUFFIX(zggrqf,ZGGRQF)
 void LAPACK_zggrqf(
     lapack_int const* m, lapack_int const* p, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
@@ -5267,7 +5518,7 @@ void LAPACK_zggrqf(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cggsvd_base LAPACK_GLOBAL(cggsvd,CGGSVD)
+#define LAPACK_cggsvd_base LAPACK_GLOBAL_SUFFIX(cggsvd,CGGSVD)
 lapack_int LAPACK_cggsvd_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* n, lapack_int const* p,
@@ -5281,7 +5532,7 @@ lapack_int LAPACK_cggsvd_base(
     lapack_complex_float* work, float* rwork,
     lapack_int* iwork, lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5290,7 +5541,7 @@ lapack_int LAPACK_cggsvd_base(
     #define LAPACK_cggsvd(...) LAPACK_cggsvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sggsvd_base LAPACK_GLOBAL(sggsvd,SGGSVD)
+#define LAPACK_sggsvd_base LAPACK_GLOBAL_SUFFIX(sggsvd,SGGSVD)
 lapack_int LAPACK_sggsvd_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* n, lapack_int const* p,
@@ -5303,7 +5554,7 @@ lapack_int LAPACK_sggsvd_base(
     float* q, lapack_int const* ldq,
     float* work, lapack_int* iwork, lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5312,7 +5563,7 @@ lapack_int LAPACK_sggsvd_base(
     #define LAPACK_sggsvd(...) LAPACK_sggsvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dggsvd_base LAPACK_GLOBAL(dggsvd,DGGSVD)
+#define LAPACK_dggsvd_base LAPACK_GLOBAL_SUFFIX(dggsvd,DGGSVD)
 lapack_int LAPACK_dggsvd_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* n, lapack_int const* p,
@@ -5325,7 +5576,7 @@ lapack_int LAPACK_dggsvd_base(
     double* q, lapack_int const* ldq,
     double* work, lapack_int* iwork, lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5334,7 +5585,7 @@ lapack_int LAPACK_dggsvd_base(
     #define LAPACK_dggsvd(...) LAPACK_dggsvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zggsvd_base LAPACK_GLOBAL(zggsvd,ZGGSVD)
+#define LAPACK_zggsvd_base LAPACK_GLOBAL_SUFFIX(zggsvd,ZGGSVD)
 lapack_int LAPACK_zggsvd_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* n, lapack_int const* p,
@@ -5348,7 +5599,7 @@ lapack_int LAPACK_zggsvd_base(
     lapack_complex_double* work, double* rwork,
     lapack_int* iwork, lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5357,7 +5608,7 @@ lapack_int LAPACK_zggsvd_base(
     #define LAPACK_zggsvd(...) LAPACK_zggsvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cggsvd3_base LAPACK_GLOBAL(cggsvd3,CGGSVD3)
+#define LAPACK_cggsvd3_base LAPACK_GLOBAL_SUFFIX(cggsvd3,CGGSVD3)
 void LAPACK_cggsvd3_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* n, lapack_int const* p, lapack_int* k, lapack_int* l,
@@ -5373,7 +5624,7 @@ void LAPACK_cggsvd3_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5382,7 +5633,7 @@ void LAPACK_cggsvd3_base(
     #define LAPACK_cggsvd3(...) LAPACK_cggsvd3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dggsvd3_base LAPACK_GLOBAL(dggsvd3,DGGSVD3)
+#define LAPACK_dggsvd3_base LAPACK_GLOBAL_SUFFIX(dggsvd3,DGGSVD3)
 void LAPACK_dggsvd3_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* n, lapack_int const* p, lapack_int* k, lapack_int* l,
@@ -5397,7 +5648,7 @@ void LAPACK_dggsvd3_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5406,7 +5657,7 @@ void LAPACK_dggsvd3_base(
     #define LAPACK_dggsvd3(...) LAPACK_dggsvd3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sggsvd3_base LAPACK_GLOBAL(sggsvd3,SGGSVD3)
+#define LAPACK_sggsvd3_base LAPACK_GLOBAL_SUFFIX(sggsvd3,SGGSVD3)
 void LAPACK_sggsvd3_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* n, lapack_int const* p, lapack_int* k, lapack_int* l,
@@ -5421,7 +5672,7 @@ void LAPACK_sggsvd3_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5430,7 +5681,7 @@ void LAPACK_sggsvd3_base(
     #define LAPACK_sggsvd3(...) LAPACK_sggsvd3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zggsvd3_base LAPACK_GLOBAL(zggsvd3,ZGGSVD3)
+#define LAPACK_zggsvd3_base LAPACK_GLOBAL_SUFFIX(zggsvd3,ZGGSVD3)
 void LAPACK_zggsvd3_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* n, lapack_int const* p, lapack_int* k, lapack_int* l,
@@ -5446,7 +5697,7 @@ void LAPACK_zggsvd3_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5455,7 +5706,7 @@ void LAPACK_zggsvd3_base(
     #define LAPACK_zggsvd3(...) LAPACK_zggsvd3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sggsvp_base LAPACK_GLOBAL(sggsvp,SGGSVP)
+#define LAPACK_sggsvp_base LAPACK_GLOBAL_SUFFIX(sggsvp,SGGSVP)
 lapack_int LAPACK_sggsvp_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* p, lapack_int const* n,
@@ -5469,7 +5720,7 @@ lapack_int LAPACK_sggsvp_base(
     lapack_int* iwork, float* tau,
     float* work, lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5478,7 +5729,7 @@ lapack_int LAPACK_sggsvp_base(
     #define LAPACK_sggsvp(...) LAPACK_sggsvp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dggsvp_base LAPACK_GLOBAL(dggsvp,DGGSVP)
+#define LAPACK_dggsvp_base LAPACK_GLOBAL_SUFFIX(dggsvp,DGGSVP)
 lapack_int LAPACK_dggsvp_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* p, lapack_int const* n,
@@ -5492,7 +5743,7 @@ lapack_int LAPACK_dggsvp_base(
     lapack_int* iwork, double* tau,
     double* work, lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5501,7 +5752,7 @@ lapack_int LAPACK_dggsvp_base(
     #define LAPACK_dggsvp(...) LAPACK_dggsvp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cggsvp_base LAPACK_GLOBAL(cggsvp,CGGSVP)
+#define LAPACK_cggsvp_base LAPACK_GLOBAL_SUFFIX(cggsvp,CGGSVP)
 lapack_int LAPACK_cggsvp_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* p, lapack_int const* n,
@@ -5514,7 +5765,7 @@ lapack_int LAPACK_cggsvp_base(
     lapack_int* iwork, float* rwork, lapack_complex_float* tau,
     lapack_complex_float* work, lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5523,7 +5774,7 @@ lapack_int LAPACK_cggsvp_base(
     #define LAPACK_cggsvp(...) LAPACK_cggsvp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zggsvp_base LAPACK_GLOBAL(zggsvp,ZGGSVP)
+#define LAPACK_zggsvp_base LAPACK_GLOBAL_SUFFIX(zggsvp,ZGGSVP)
 lapack_int LAPACK_zggsvp_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* p, lapack_int const* n,
@@ -5536,7 +5787,7 @@ lapack_int LAPACK_zggsvp_base(
     lapack_int* iwork, double* rwork, lapack_complex_double* tau,
     lapack_complex_double* work, lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5545,7 +5796,7 @@ lapack_int LAPACK_zggsvp_base(
     #define LAPACK_zggsvp(...) LAPACK_zggsvp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cggsvp3_base LAPACK_GLOBAL(cggsvp3,CGGSVP3)
+#define LAPACK_cggsvp3_base LAPACK_GLOBAL_SUFFIX(cggsvp3,CGGSVP3)
 void LAPACK_cggsvp3_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* p, lapack_int const* n,
@@ -5562,7 +5813,7 @@ void LAPACK_cggsvp3_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5571,7 +5822,7 @@ void LAPACK_cggsvp3_base(
     #define LAPACK_cggsvp3(...) LAPACK_cggsvp3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dggsvp3_base LAPACK_GLOBAL(dggsvp3,DGGSVP3)
+#define LAPACK_dggsvp3_base LAPACK_GLOBAL_SUFFIX(dggsvp3,DGGSVP3)
 void LAPACK_dggsvp3_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* p, lapack_int const* n,
@@ -5587,7 +5838,7 @@ void LAPACK_dggsvp3_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5596,7 +5847,7 @@ void LAPACK_dggsvp3_base(
     #define LAPACK_dggsvp3(...) LAPACK_dggsvp3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sggsvp3_base LAPACK_GLOBAL(sggsvp3,SGGSVP3)
+#define LAPACK_sggsvp3_base LAPACK_GLOBAL_SUFFIX(sggsvp3,SGGSVP3)
 void LAPACK_sggsvp3_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* p, lapack_int const* n,
@@ -5612,7 +5863,7 @@ void LAPACK_sggsvp3_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5621,7 +5872,7 @@ void LAPACK_sggsvp3_base(
     #define LAPACK_sggsvp3(...) LAPACK_sggsvp3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zggsvp3_base LAPACK_GLOBAL(zggsvp3,ZGGSVP3)
+#define LAPACK_zggsvp3_base LAPACK_GLOBAL_SUFFIX(zggsvp3,ZGGSVP3)
 void LAPACK_zggsvp3_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* p, lapack_int const* n,
@@ -5638,7 +5889,7 @@ void LAPACK_zggsvp3_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5647,7 +5898,7 @@ void LAPACK_zggsvp3_base(
     #define LAPACK_zggsvp3(...) LAPACK_zggsvp3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgtcon_base LAPACK_GLOBAL(cgtcon,CGTCON)
+#define LAPACK_cgtcon_base LAPACK_GLOBAL_SUFFIX(cgtcon,CGTCON)
 void LAPACK_cgtcon_base(
     char const* norm,
     lapack_int const* n,
@@ -5660,7 +5911,7 @@ void LAPACK_cgtcon_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5669,7 +5920,7 @@ void LAPACK_cgtcon_base(
     #define LAPACK_cgtcon(...) LAPACK_cgtcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgtcon_base LAPACK_GLOBAL(dgtcon,DGTCON)
+#define LAPACK_dgtcon_base LAPACK_GLOBAL_SUFFIX(dgtcon,DGTCON)
 void LAPACK_dgtcon_base(
     char const* norm,
     lapack_int const* n,
@@ -5683,7 +5934,7 @@ void LAPACK_dgtcon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5692,7 +5943,7 @@ void LAPACK_dgtcon_base(
     #define LAPACK_dgtcon(...) LAPACK_dgtcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgtcon_base LAPACK_GLOBAL(sgtcon,SGTCON)
+#define LAPACK_sgtcon_base LAPACK_GLOBAL_SUFFIX(sgtcon,SGTCON)
 void LAPACK_sgtcon_base(
     char const* norm,
     lapack_int const* n,
@@ -5706,7 +5957,7 @@ void LAPACK_sgtcon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5715,7 +5966,7 @@ void LAPACK_sgtcon_base(
     #define LAPACK_sgtcon(...) LAPACK_sgtcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgtcon_base LAPACK_GLOBAL(zgtcon,ZGTCON)
+#define LAPACK_zgtcon_base LAPACK_GLOBAL_SUFFIX(zgtcon,ZGTCON)
 void LAPACK_zgtcon_base(
     char const* norm,
     lapack_int const* n,
@@ -5728,7 +5979,7 @@ void LAPACK_zgtcon_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5737,7 +5988,7 @@ void LAPACK_zgtcon_base(
     #define LAPACK_zgtcon(...) LAPACK_zgtcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgtrfs_base LAPACK_GLOBAL(cgtrfs,CGTRFS)
+#define LAPACK_cgtrfs_base LAPACK_GLOBAL_SUFFIX(cgtrfs,CGTRFS)
 void LAPACK_cgtrfs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -5756,7 +6007,7 @@ void LAPACK_cgtrfs_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5765,7 +6016,7 @@ void LAPACK_cgtrfs_base(
     #define LAPACK_cgtrfs(...) LAPACK_cgtrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgtrfs_base LAPACK_GLOBAL(dgtrfs,DGTRFS)
+#define LAPACK_dgtrfs_base LAPACK_GLOBAL_SUFFIX(dgtrfs,DGTRFS)
 void LAPACK_dgtrfs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -5784,7 +6035,7 @@ void LAPACK_dgtrfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5793,7 +6044,7 @@ void LAPACK_dgtrfs_base(
     #define LAPACK_dgtrfs(...) LAPACK_dgtrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgtrfs_base LAPACK_GLOBAL(sgtrfs,SGTRFS)
+#define LAPACK_sgtrfs_base LAPACK_GLOBAL_SUFFIX(sgtrfs,SGTRFS)
 void LAPACK_sgtrfs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -5812,7 +6063,7 @@ void LAPACK_sgtrfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5821,7 +6072,7 @@ void LAPACK_sgtrfs_base(
     #define LAPACK_sgtrfs(...) LAPACK_sgtrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgtrfs_base LAPACK_GLOBAL(zgtrfs,ZGTRFS)
+#define LAPACK_zgtrfs_base LAPACK_GLOBAL_SUFFIX(zgtrfs,ZGTRFS)
 void LAPACK_zgtrfs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -5840,7 +6091,7 @@ void LAPACK_zgtrfs_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5849,7 +6100,7 @@ void LAPACK_zgtrfs_base(
     #define LAPACK_zgtrfs(...) LAPACK_zgtrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgtsv LAPACK_GLOBAL(cgtsv,CGTSV)
+#define LAPACK_cgtsv LAPACK_GLOBAL_SUFFIX(cgtsv,CGTSV)
 void LAPACK_cgtsv(
     lapack_int const* n, lapack_int const* nrhs,
     lapack_complex_float* DL,
@@ -5858,7 +6109,7 @@ void LAPACK_cgtsv(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_dgtsv LAPACK_GLOBAL(dgtsv,DGTSV)
+#define LAPACK_dgtsv LAPACK_GLOBAL_SUFFIX(dgtsv,DGTSV)
 void LAPACK_dgtsv(
     lapack_int const* n, lapack_int const* nrhs,
     double* DL,
@@ -5867,7 +6118,7 @@ void LAPACK_dgtsv(
     double* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_sgtsv LAPACK_GLOBAL(sgtsv,SGTSV)
+#define LAPACK_sgtsv LAPACK_GLOBAL_SUFFIX(sgtsv,SGTSV)
 void LAPACK_sgtsv(
     lapack_int const* n, lapack_int const* nrhs,
     float* DL,
@@ -5876,7 +6127,7 @@ void LAPACK_sgtsv(
     float* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_zgtsv LAPACK_GLOBAL(zgtsv,ZGTSV)
+#define LAPACK_zgtsv LAPACK_GLOBAL_SUFFIX(zgtsv,ZGTSV)
 void LAPACK_zgtsv(
     lapack_int const* n, lapack_int const* nrhs,
     lapack_complex_double* DL,
@@ -5885,7 +6136,7 @@ void LAPACK_zgtsv(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_cgtsvx_base LAPACK_GLOBAL(cgtsvx,CGTSVX)
+#define LAPACK_cgtsvx_base LAPACK_GLOBAL_SUFFIX(cgtsvx,CGTSVX)
 void LAPACK_cgtsvx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -5905,7 +6156,7 @@ void LAPACK_cgtsvx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5914,7 +6165,7 @@ void LAPACK_cgtsvx_base(
     #define LAPACK_cgtsvx(...) LAPACK_cgtsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgtsvx_base LAPACK_GLOBAL(dgtsvx,DGTSVX)
+#define LAPACK_dgtsvx_base LAPACK_GLOBAL_SUFFIX(dgtsvx,DGTSVX)
 void LAPACK_dgtsvx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -5934,7 +6185,7 @@ void LAPACK_dgtsvx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5943,7 +6194,7 @@ void LAPACK_dgtsvx_base(
     #define LAPACK_dgtsvx(...) LAPACK_dgtsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgtsvx_base LAPACK_GLOBAL(sgtsvx,SGTSVX)
+#define LAPACK_sgtsvx_base LAPACK_GLOBAL_SUFFIX(sgtsvx,SGTSVX)
 void LAPACK_sgtsvx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -5963,7 +6214,7 @@ void LAPACK_sgtsvx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -5972,7 +6223,7 @@ void LAPACK_sgtsvx_base(
     #define LAPACK_sgtsvx(...) LAPACK_sgtsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgtsvx_base LAPACK_GLOBAL(zgtsvx,ZGTSVX)
+#define LAPACK_zgtsvx_base LAPACK_GLOBAL_SUFFIX(zgtsvx,ZGTSVX)
 void LAPACK_zgtsvx_base(
     char const* fact, char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -5992,7 +6243,7 @@ void LAPACK_zgtsvx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6001,7 +6252,7 @@ void LAPACK_zgtsvx_base(
     #define LAPACK_zgtsvx(...) LAPACK_zgtsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cgttrf LAPACK_GLOBAL(cgttrf,CGTTRF)
+#define LAPACK_cgttrf LAPACK_GLOBAL_SUFFIX(cgttrf,CGTTRF)
 void LAPACK_cgttrf(
     lapack_int const* n,
     lapack_complex_float* DL,
@@ -6010,7 +6261,7 @@ void LAPACK_cgttrf(
     lapack_complex_float* DU2, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_dgttrf LAPACK_GLOBAL(dgttrf,DGTTRF)
+#define LAPACK_dgttrf LAPACK_GLOBAL_SUFFIX(dgttrf,DGTTRF)
 void LAPACK_dgttrf(
     lapack_int const* n,
     double* DL,
@@ -6019,7 +6270,7 @@ void LAPACK_dgttrf(
     double* DU2, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_sgttrf LAPACK_GLOBAL(sgttrf,SGTTRF)
+#define LAPACK_sgttrf LAPACK_GLOBAL_SUFFIX(sgttrf,SGTTRF)
 void LAPACK_sgttrf(
     lapack_int const* n,
     float* DL,
@@ -6028,7 +6279,7 @@ void LAPACK_sgttrf(
     float* DU2, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_zgttrf LAPACK_GLOBAL(zgttrf,ZGTTRF)
+#define LAPACK_zgttrf LAPACK_GLOBAL_SUFFIX(zgttrf,ZGTTRF)
 void LAPACK_zgttrf(
     lapack_int const* n,
     lapack_complex_double* DL,
@@ -6037,7 +6288,7 @@ void LAPACK_zgttrf(
     lapack_complex_double* DU2, lapack_int* ipiv,
     lapack_int* info );
 
-#define LAPACK_cgttrs_base LAPACK_GLOBAL(cgttrs,CGTTRS)
+#define LAPACK_cgttrs_base LAPACK_GLOBAL_SUFFIX(cgttrs,CGTTRS)
 void LAPACK_cgttrs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -6048,7 +6299,7 @@ void LAPACK_cgttrs_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6057,7 +6308,7 @@ void LAPACK_cgttrs_base(
     #define LAPACK_cgttrs(...) LAPACK_cgttrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dgttrs_base LAPACK_GLOBAL(dgttrs,DGTTRS)
+#define LAPACK_dgttrs_base LAPACK_GLOBAL_SUFFIX(dgttrs,DGTTRS)
 void LAPACK_dgttrs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -6068,7 +6319,7 @@ void LAPACK_dgttrs_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6077,7 +6328,7 @@ void LAPACK_dgttrs_base(
     #define LAPACK_dgttrs(...) LAPACK_dgttrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sgttrs_base LAPACK_GLOBAL(sgttrs,SGTTRS)
+#define LAPACK_sgttrs_base LAPACK_GLOBAL_SUFFIX(sgttrs,SGTTRS)
 void LAPACK_sgttrs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -6088,7 +6339,7 @@ void LAPACK_sgttrs_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6097,7 +6348,7 @@ void LAPACK_sgttrs_base(
     #define LAPACK_sgttrs(...) LAPACK_sgttrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zgttrs_base LAPACK_GLOBAL(zgttrs,ZGTTRS)
+#define LAPACK_zgttrs_base LAPACK_GLOBAL_SUFFIX(zgttrs,ZGTTRS)
 void LAPACK_zgttrs_base(
     char const* trans,
     lapack_int const* n, lapack_int const* nrhs,
@@ -6108,7 +6359,7 @@ void LAPACK_zgttrs_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6117,7 +6368,7 @@ void LAPACK_zgttrs_base(
     #define LAPACK_zgttrs(...) LAPACK_zgttrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chbev_base LAPACK_GLOBAL(chbev,CHBEV)
+#define LAPACK_chbev_base LAPACK_GLOBAL_SUFFIX(chbev,CHBEV)
 void LAPACK_chbev_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -6128,7 +6379,7 @@ void LAPACK_chbev_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6137,7 +6388,7 @@ void LAPACK_chbev_base(
     #define LAPACK_chbev(...) LAPACK_chbev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhbev_base LAPACK_GLOBAL(zhbev,ZHBEV)
+#define LAPACK_zhbev_base LAPACK_GLOBAL_SUFFIX(zhbev,ZHBEV)
 void LAPACK_zhbev_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -6148,7 +6399,7 @@ void LAPACK_zhbev_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6157,7 +6408,7 @@ void LAPACK_zhbev_base(
     #define LAPACK_zhbev(...) LAPACK_zhbev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chbev_2stage_base LAPACK_GLOBAL(chbev_2stage,CHBEV_2STAGE)
+#define LAPACK_chbev_2stage_base LAPACK_GLOBAL_SUFFIX(chbev_2stage,CHBEV_2STAGE)
 void LAPACK_chbev_2stage_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -6168,7 +6419,7 @@ void LAPACK_chbev_2stage_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6177,7 +6428,7 @@ void LAPACK_chbev_2stage_base(
     #define LAPACK_chbev_2stage(...) LAPACK_chbev_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhbev_2stage_base LAPACK_GLOBAL(zhbev_2stage,ZHBEV_2STAGE)
+#define LAPACK_zhbev_2stage_base LAPACK_GLOBAL_SUFFIX(zhbev_2stage,ZHBEV_2STAGE)
 void LAPACK_zhbev_2stage_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -6188,7 +6439,7 @@ void LAPACK_zhbev_2stage_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6197,7 +6448,7 @@ void LAPACK_zhbev_2stage_base(
     #define LAPACK_zhbev_2stage(...) LAPACK_zhbev_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chbevd_base LAPACK_GLOBAL(chbevd,CHBEVD)
+#define LAPACK_chbevd_base LAPACK_GLOBAL_SUFFIX(chbevd,CHBEVD)
 void LAPACK_chbevd_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -6209,7 +6460,7 @@ void LAPACK_chbevd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6218,7 +6469,7 @@ void LAPACK_chbevd_base(
     #define LAPACK_chbevd(...) LAPACK_chbevd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhbevd_base LAPACK_GLOBAL(zhbevd,ZHBEVD)
+#define LAPACK_zhbevd_base LAPACK_GLOBAL_SUFFIX(zhbevd,ZHBEVD)
 void LAPACK_zhbevd_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -6230,7 +6481,7 @@ void LAPACK_zhbevd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6239,7 +6490,7 @@ void LAPACK_zhbevd_base(
     #define LAPACK_zhbevd(...) LAPACK_zhbevd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chbevd_2stage_base LAPACK_GLOBAL(chbevd_2stage,CHBEVD_2STAGE)
+#define LAPACK_chbevd_2stage_base LAPACK_GLOBAL_SUFFIX(chbevd_2stage,CHBEVD_2STAGE)
 void LAPACK_chbevd_2stage_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -6251,7 +6502,7 @@ void LAPACK_chbevd_2stage_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6260,7 +6511,7 @@ void LAPACK_chbevd_2stage_base(
     #define LAPACK_chbevd_2stage(...) LAPACK_chbevd_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhbevd_2stage_base LAPACK_GLOBAL(zhbevd_2stage,ZHBEVD_2STAGE)
+#define LAPACK_zhbevd_2stage_base LAPACK_GLOBAL_SUFFIX(zhbevd_2stage,ZHBEVD_2STAGE)
 void LAPACK_zhbevd_2stage_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -6272,7 +6523,7 @@ void LAPACK_zhbevd_2stage_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6281,7 +6532,7 @@ void LAPACK_zhbevd_2stage_base(
     #define LAPACK_zhbevd_2stage(...) LAPACK_zhbevd_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chbevx_base LAPACK_GLOBAL(chbevx,CHBEVX)
+#define LAPACK_chbevx_base LAPACK_GLOBAL_SUFFIX(chbevx,CHBEVX)
 void LAPACK_chbevx_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -6297,7 +6548,7 @@ void LAPACK_chbevx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6306,7 +6557,7 @@ void LAPACK_chbevx_base(
     #define LAPACK_chbevx(...) LAPACK_chbevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhbevx_base LAPACK_GLOBAL(zhbevx,ZHBEVX)
+#define LAPACK_zhbevx_base LAPACK_GLOBAL_SUFFIX(zhbevx,ZHBEVX)
 void LAPACK_zhbevx_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -6322,7 +6573,7 @@ void LAPACK_zhbevx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6331,7 +6582,7 @@ void LAPACK_zhbevx_base(
     #define LAPACK_zhbevx(...) LAPACK_zhbevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chbevx_2stage_base LAPACK_GLOBAL(chbevx_2stage,CHBEVX_2STAGE)
+#define LAPACK_chbevx_2stage_base LAPACK_GLOBAL_SUFFIX(chbevx_2stage,CHBEVX_2STAGE)
 void LAPACK_chbevx_2stage_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -6347,7 +6598,7 @@ void LAPACK_chbevx_2stage_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6356,7 +6607,7 @@ void LAPACK_chbevx_2stage_base(
     #define LAPACK_chbevx_2stage(...) LAPACK_chbevx_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhbevx_2stage_base LAPACK_GLOBAL(zhbevx_2stage,ZHBEVX_2STAGE)
+#define LAPACK_zhbevx_2stage_base LAPACK_GLOBAL_SUFFIX(zhbevx_2stage,ZHBEVX_2STAGE)
 void LAPACK_zhbevx_2stage_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -6372,7 +6623,7 @@ void LAPACK_zhbevx_2stage_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6381,7 +6632,7 @@ void LAPACK_zhbevx_2stage_base(
     #define LAPACK_zhbevx_2stage(...) LAPACK_zhbevx_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chbgst_base LAPACK_GLOBAL(chbgst,CHBGST)
+#define LAPACK_chbgst_base LAPACK_GLOBAL_SUFFIX(chbgst,CHBGST)
 void LAPACK_chbgst_base(
     char const* vect, char const* uplo,
     lapack_int const* n, lapack_int const* ka, lapack_int const* kb,
@@ -6392,7 +6643,7 @@ void LAPACK_chbgst_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6401,7 +6652,7 @@ void LAPACK_chbgst_base(
     #define LAPACK_chbgst(...) LAPACK_chbgst_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhbgst_base LAPACK_GLOBAL(zhbgst,ZHBGST)
+#define LAPACK_zhbgst_base LAPACK_GLOBAL_SUFFIX(zhbgst,ZHBGST)
 void LAPACK_zhbgst_base(
     char const* vect, char const* uplo,
     lapack_int const* n, lapack_int const* ka, lapack_int const* kb,
@@ -6412,7 +6663,7 @@ void LAPACK_zhbgst_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6421,7 +6672,7 @@ void LAPACK_zhbgst_base(
     #define LAPACK_zhbgst(...) LAPACK_zhbgst_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chbgv_base LAPACK_GLOBAL(chbgv,CHBGV)
+#define LAPACK_chbgv_base LAPACK_GLOBAL_SUFFIX(chbgv,CHBGV)
 void LAPACK_chbgv_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* ka, lapack_int const* kb,
@@ -6433,7 +6684,7 @@ void LAPACK_chbgv_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6442,7 +6693,7 @@ void LAPACK_chbgv_base(
     #define LAPACK_chbgv(...) LAPACK_chbgv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhbgv_base LAPACK_GLOBAL(zhbgv,ZHBGV)
+#define LAPACK_zhbgv_base LAPACK_GLOBAL_SUFFIX(zhbgv,ZHBGV)
 void LAPACK_zhbgv_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* ka, lapack_int const* kb,
@@ -6454,7 +6705,7 @@ void LAPACK_zhbgv_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6463,7 +6714,7 @@ void LAPACK_zhbgv_base(
     #define LAPACK_zhbgv(...) LAPACK_zhbgv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chbgvd_base LAPACK_GLOBAL(chbgvd,CHBGVD)
+#define LAPACK_chbgvd_base LAPACK_GLOBAL_SUFFIX(chbgvd,CHBGVD)
 void LAPACK_chbgvd_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* ka, lapack_int const* kb,
@@ -6476,7 +6727,7 @@ void LAPACK_chbgvd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6485,7 +6736,7 @@ void LAPACK_chbgvd_base(
     #define LAPACK_chbgvd(...) LAPACK_chbgvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhbgvd_base LAPACK_GLOBAL(zhbgvd,ZHBGVD)
+#define LAPACK_zhbgvd_base LAPACK_GLOBAL_SUFFIX(zhbgvd,ZHBGVD)
 void LAPACK_zhbgvd_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* ka, lapack_int const* kb,
@@ -6498,7 +6749,7 @@ void LAPACK_zhbgvd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6507,7 +6758,7 @@ void LAPACK_zhbgvd_base(
     #define LAPACK_zhbgvd(...) LAPACK_zhbgvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chbgvx_base LAPACK_GLOBAL(chbgvx,CHBGVX)
+#define LAPACK_chbgvx_base LAPACK_GLOBAL_SUFFIX(chbgvx,CHBGVX)
 void LAPACK_chbgvx_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n, lapack_int const* ka, lapack_int const* kb,
@@ -6524,7 +6775,7 @@ void LAPACK_chbgvx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6533,7 +6784,7 @@ void LAPACK_chbgvx_base(
     #define LAPACK_chbgvx(...) LAPACK_chbgvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhbgvx_base LAPACK_GLOBAL(zhbgvx,ZHBGVX)
+#define LAPACK_zhbgvx_base LAPACK_GLOBAL_SUFFIX(zhbgvx,ZHBGVX)
 void LAPACK_zhbgvx_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n, lapack_int const* ka, lapack_int const* kb,
@@ -6550,7 +6801,7 @@ void LAPACK_zhbgvx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6559,7 +6810,7 @@ void LAPACK_zhbgvx_base(
     #define LAPACK_zhbgvx(...) LAPACK_zhbgvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chbtrd_base LAPACK_GLOBAL(chbtrd,CHBTRD)
+#define LAPACK_chbtrd_base LAPACK_GLOBAL_SUFFIX(chbtrd,CHBTRD)
 void LAPACK_chbtrd_base(
     char const* vect, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -6570,7 +6821,7 @@ void LAPACK_chbtrd_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6579,7 +6830,7 @@ void LAPACK_chbtrd_base(
     #define LAPACK_chbtrd(...) LAPACK_chbtrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhbtrd_base LAPACK_GLOBAL(zhbtrd,ZHBTRD)
+#define LAPACK_zhbtrd_base LAPACK_GLOBAL_SUFFIX(zhbtrd,ZHBTRD)
 void LAPACK_zhbtrd_base(
     char const* vect, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -6590,7 +6841,7 @@ void LAPACK_zhbtrd_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6599,7 +6850,7 @@ void LAPACK_zhbtrd_base(
     #define LAPACK_zhbtrd(...) LAPACK_zhbtrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_checon_base LAPACK_GLOBAL(checon,CHECON)
+#define LAPACK_checon_base LAPACK_GLOBAL_SUFFIX(checon,CHECON)
 void LAPACK_checon_base(
     char const* uplo,
     lapack_int const* n,
@@ -6609,7 +6860,7 @@ void LAPACK_checon_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6618,7 +6869,7 @@ void LAPACK_checon_base(
     #define LAPACK_checon(...) LAPACK_checon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhecon_base LAPACK_GLOBAL(zhecon,ZHECON)
+#define LAPACK_zhecon_base LAPACK_GLOBAL_SUFFIX(zhecon,ZHECON)
 void LAPACK_zhecon_base(
     char const* uplo,
     lapack_int const* n,
@@ -6628,7 +6879,7 @@ void LAPACK_zhecon_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6637,7 +6888,7 @@ void LAPACK_zhecon_base(
     #define LAPACK_zhecon(...) LAPACK_zhecon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_checon_3_base LAPACK_GLOBAL(checon_3,CHECON_3)
+#define LAPACK_checon_3_base LAPACK_GLOBAL_SUFFIX(checon_3,CHECON_3)
 void LAPACK_checon_3_base(
     char const* uplo,
     lapack_int const* n,
@@ -6648,7 +6899,7 @@ void LAPACK_checon_3_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6657,7 +6908,7 @@ void LAPACK_checon_3_base(
     #define LAPACK_checon_3(...) LAPACK_checon_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhecon_3_base LAPACK_GLOBAL(zhecon_3,ZHECON_3)
+#define LAPACK_zhecon_3_base LAPACK_GLOBAL_SUFFIX(zhecon_3,ZHECON_3)
 void LAPACK_zhecon_3_base(
     char const* uplo,
     lapack_int const* n,
@@ -6668,7 +6919,7 @@ void LAPACK_zhecon_3_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6677,7 +6928,7 @@ void LAPACK_zhecon_3_base(
     #define LAPACK_zhecon_3(...) LAPACK_zhecon_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cheequb_base LAPACK_GLOBAL(cheequb,CHEEQUB)
+#define LAPACK_cheequb_base LAPACK_GLOBAL_SUFFIX(cheequb,CHEEQUB)
 void LAPACK_cheequb_base(
     char const* uplo,
     lapack_int const* n,
@@ -6688,7 +6939,7 @@ void LAPACK_cheequb_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6697,7 +6948,7 @@ void LAPACK_cheequb_base(
     #define LAPACK_cheequb(...) LAPACK_cheequb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zheequb_base LAPACK_GLOBAL(zheequb,ZHEEQUB)
+#define LAPACK_zheequb_base LAPACK_GLOBAL_SUFFIX(zheequb,ZHEEQUB)
 void LAPACK_zheequb_base(
     char const* uplo,
     lapack_int const* n,
@@ -6708,7 +6959,7 @@ void LAPACK_zheequb_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6717,7 +6968,7 @@ void LAPACK_zheequb_base(
     #define LAPACK_zheequb(...) LAPACK_zheequb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cheev_base LAPACK_GLOBAL(cheev,CHEEV)
+#define LAPACK_cheev_base LAPACK_GLOBAL_SUFFIX(cheev,CHEEV)
 void LAPACK_cheev_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -6727,7 +6978,7 @@ void LAPACK_cheev_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6736,7 +6987,7 @@ void LAPACK_cheev_base(
     #define LAPACK_cheev(...) LAPACK_cheev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zheev_base LAPACK_GLOBAL(zheev,ZHEEV)
+#define LAPACK_zheev_base LAPACK_GLOBAL_SUFFIX(zheev,ZHEEV)
 void LAPACK_zheev_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -6746,7 +6997,7 @@ void LAPACK_zheev_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6755,7 +7006,7 @@ void LAPACK_zheev_base(
     #define LAPACK_zheev(...) LAPACK_zheev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cheev_2stage_base LAPACK_GLOBAL(cheev_2stage,CHEEV_2STAGE)
+#define LAPACK_cheev_2stage_base LAPACK_GLOBAL_SUFFIX(cheev_2stage,CHEEV_2STAGE)
 void LAPACK_cheev_2stage_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -6765,7 +7016,7 @@ void LAPACK_cheev_2stage_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6774,7 +7025,7 @@ void LAPACK_cheev_2stage_base(
     #define LAPACK_cheev_2stage(...) LAPACK_cheev_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zheev_2stage_base LAPACK_GLOBAL(zheev_2stage,ZHEEV_2STAGE)
+#define LAPACK_zheev_2stage_base LAPACK_GLOBAL_SUFFIX(zheev_2stage,ZHEEV_2STAGE)
 void LAPACK_zheev_2stage_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -6784,7 +7035,7 @@ void LAPACK_zheev_2stage_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6793,7 +7044,7 @@ void LAPACK_zheev_2stage_base(
     #define LAPACK_zheev_2stage(...) LAPACK_zheev_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cheevd_base LAPACK_GLOBAL(cheevd,CHEEVD)
+#define LAPACK_cheevd_base LAPACK_GLOBAL_SUFFIX(cheevd,CHEEVD)
 void LAPACK_cheevd_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -6804,7 +7055,7 @@ void LAPACK_cheevd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6813,7 +7064,7 @@ void LAPACK_cheevd_base(
     #define LAPACK_cheevd(...) LAPACK_cheevd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zheevd_base LAPACK_GLOBAL(zheevd,ZHEEVD)
+#define LAPACK_zheevd_base LAPACK_GLOBAL_SUFFIX(zheevd,ZHEEVD)
 void LAPACK_zheevd_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -6824,7 +7075,7 @@ void LAPACK_zheevd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6833,7 +7084,7 @@ void LAPACK_zheevd_base(
     #define LAPACK_zheevd(...) LAPACK_zheevd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cheevd_2stage_base LAPACK_GLOBAL(cheevd_2stage,CHEEVD_2STAGE)
+#define LAPACK_cheevd_2stage_base LAPACK_GLOBAL_SUFFIX(cheevd_2stage,CHEEVD_2STAGE)
 void LAPACK_cheevd_2stage_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -6844,7 +7095,7 @@ void LAPACK_cheevd_2stage_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6853,7 +7104,7 @@ void LAPACK_cheevd_2stage_base(
     #define LAPACK_cheevd_2stage(...) LAPACK_cheevd_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zheevd_2stage_base LAPACK_GLOBAL(zheevd_2stage,ZHEEVD_2STAGE)
+#define LAPACK_zheevd_2stage_base LAPACK_GLOBAL_SUFFIX(zheevd_2stage,ZHEEVD_2STAGE)
 void LAPACK_zheevd_2stage_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -6864,7 +7115,7 @@ void LAPACK_zheevd_2stage_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6873,7 +7124,7 @@ void LAPACK_zheevd_2stage_base(
     #define LAPACK_zheevd_2stage(...) LAPACK_zheevd_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cheevr_base LAPACK_GLOBAL(cheevr,CHEEVR)
+#define LAPACK_cheevr_base LAPACK_GLOBAL_SUFFIX(cheevr,CHEEVR)
 void LAPACK_cheevr_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -6888,7 +7139,7 @@ void LAPACK_cheevr_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6897,7 +7148,7 @@ void LAPACK_cheevr_base(
     #define LAPACK_cheevr(...) LAPACK_cheevr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zheevr_base LAPACK_GLOBAL(zheevr,ZHEEVR)
+#define LAPACK_zheevr_base LAPACK_GLOBAL_SUFFIX(zheevr,ZHEEVR)
 void LAPACK_zheevr_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -6912,7 +7163,7 @@ void LAPACK_zheevr_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6921,7 +7172,7 @@ void LAPACK_zheevr_base(
     #define LAPACK_zheevr(...) LAPACK_zheevr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cheevr_2stage_base LAPACK_GLOBAL(cheevr_2stage,CHEEVR_2STAGE)
+#define LAPACK_cheevr_2stage_base LAPACK_GLOBAL_SUFFIX(cheevr_2stage,CHEEVR_2STAGE)
 void LAPACK_cheevr_2stage_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -6936,7 +7187,7 @@ void LAPACK_cheevr_2stage_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6945,7 +7196,7 @@ void LAPACK_cheevr_2stage_base(
     #define LAPACK_cheevr_2stage(...) LAPACK_cheevr_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zheevr_2stage_base LAPACK_GLOBAL(zheevr_2stage,ZHEEVR_2STAGE)
+#define LAPACK_zheevr_2stage_base LAPACK_GLOBAL_SUFFIX(zheevr_2stage,ZHEEVR_2STAGE)
 void LAPACK_zheevr_2stage_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -6960,7 +7211,7 @@ void LAPACK_zheevr_2stage_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6969,7 +7220,7 @@ void LAPACK_zheevr_2stage_base(
     #define LAPACK_zheevr_2stage(...) LAPACK_zheevr_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cheevx_base LAPACK_GLOBAL(cheevx,CHEEVX)
+#define LAPACK_cheevx_base LAPACK_GLOBAL_SUFFIX(cheevx,CHEEVX)
 void LAPACK_cheevx_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -6984,7 +7235,7 @@ void LAPACK_cheevx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -6993,7 +7244,7 @@ void LAPACK_cheevx_base(
     #define LAPACK_cheevx(...) LAPACK_cheevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zheevx_base LAPACK_GLOBAL(zheevx,ZHEEVX)
+#define LAPACK_zheevx_base LAPACK_GLOBAL_SUFFIX(zheevx,ZHEEVX)
 void LAPACK_zheevx_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -7008,7 +7259,7 @@ void LAPACK_zheevx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7017,7 +7268,7 @@ void LAPACK_zheevx_base(
     #define LAPACK_zheevx(...) LAPACK_zheevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cheevx_2stage_base LAPACK_GLOBAL(cheevx_2stage,CHEEVX_2STAGE)
+#define LAPACK_cheevx_2stage_base LAPACK_GLOBAL_SUFFIX(cheevx_2stage,CHEEVX_2STAGE)
 void LAPACK_cheevx_2stage_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -7032,7 +7283,7 @@ void LAPACK_cheevx_2stage_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7041,7 +7292,7 @@ void LAPACK_cheevx_2stage_base(
     #define LAPACK_cheevx_2stage(...) LAPACK_cheevx_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zheevx_2stage_base LAPACK_GLOBAL(zheevx_2stage,ZHEEVX_2STAGE)
+#define LAPACK_zheevx_2stage_base LAPACK_GLOBAL_SUFFIX(zheevx_2stage,ZHEEVX_2STAGE)
 void LAPACK_zheevx_2stage_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -7056,7 +7307,7 @@ void LAPACK_zheevx_2stage_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7065,7 +7316,7 @@ void LAPACK_zheevx_2stage_base(
     #define LAPACK_zheevx_2stage(...) LAPACK_zheevx_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chegst_base LAPACK_GLOBAL(chegst,CHEGST)
+#define LAPACK_chegst_base LAPACK_GLOBAL_SUFFIX(chegst,CHEGST)
 void LAPACK_chegst_base(
     lapack_int const* itype, char const* uplo,
     lapack_int const* n,
@@ -7073,7 +7324,7 @@ void LAPACK_chegst_base(
     const lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7082,7 +7333,7 @@ void LAPACK_chegst_base(
     #define LAPACK_chegst(...) LAPACK_chegst_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhegst_base LAPACK_GLOBAL(zhegst,ZHEGST)
+#define LAPACK_zhegst_base LAPACK_GLOBAL_SUFFIX(zhegst,ZHEGST)
 void LAPACK_zhegst_base(
     lapack_int const* itype, char const* uplo,
     lapack_int const* n,
@@ -7090,7 +7341,7 @@ void LAPACK_zhegst_base(
     const lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7099,7 +7350,7 @@ void LAPACK_zhegst_base(
     #define LAPACK_zhegst(...) LAPACK_zhegst_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chegv_base LAPACK_GLOBAL(chegv,CHEGV)
+#define LAPACK_chegv_base LAPACK_GLOBAL_SUFFIX(chegv,CHEGV)
 void LAPACK_chegv_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -7110,7 +7361,7 @@ void LAPACK_chegv_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7119,7 +7370,7 @@ void LAPACK_chegv_base(
     #define LAPACK_chegv(...) LAPACK_chegv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhegv_base LAPACK_GLOBAL(zhegv,ZHEGV)
+#define LAPACK_zhegv_base LAPACK_GLOBAL_SUFFIX(zhegv,ZHEGV)
 void LAPACK_zhegv_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -7130,7 +7381,7 @@ void LAPACK_zhegv_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7139,7 +7390,7 @@ void LAPACK_zhegv_base(
     #define LAPACK_zhegv(...) LAPACK_zhegv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chegv_2stage_base LAPACK_GLOBAL(chegv_2stage,CHEGV_2STAGE)
+#define LAPACK_chegv_2stage_base LAPACK_GLOBAL_SUFFIX(chegv_2stage,CHEGV_2STAGE)
 void LAPACK_chegv_2stage_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -7150,7 +7401,7 @@ void LAPACK_chegv_2stage_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7159,7 +7410,7 @@ void LAPACK_chegv_2stage_base(
     #define LAPACK_chegv_2stage(...) LAPACK_chegv_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhegv_2stage_base LAPACK_GLOBAL(zhegv_2stage,ZHEGV_2STAGE)
+#define LAPACK_zhegv_2stage_base LAPACK_GLOBAL_SUFFIX(zhegv_2stage,ZHEGV_2STAGE)
 void LAPACK_zhegv_2stage_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -7170,7 +7421,7 @@ void LAPACK_zhegv_2stage_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7179,7 +7430,7 @@ void LAPACK_zhegv_2stage_base(
     #define LAPACK_zhegv_2stage(...) LAPACK_zhegv_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chegvd_base LAPACK_GLOBAL(chegvd,CHEGVD)
+#define LAPACK_chegvd_base LAPACK_GLOBAL_SUFFIX(chegvd,CHEGVD)
 void LAPACK_chegvd_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -7191,7 +7442,7 @@ void LAPACK_chegvd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7200,7 +7451,7 @@ void LAPACK_chegvd_base(
     #define LAPACK_chegvd(...) LAPACK_chegvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhegvd_base LAPACK_GLOBAL(zhegvd,ZHEGVD)
+#define LAPACK_zhegvd_base LAPACK_GLOBAL_SUFFIX(zhegvd,ZHEGVD)
 void LAPACK_zhegvd_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -7212,7 +7463,7 @@ void LAPACK_zhegvd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7221,7 +7472,7 @@ void LAPACK_zhegvd_base(
     #define LAPACK_zhegvd(...) LAPACK_zhegvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chegvx_base LAPACK_GLOBAL(chegvx,CHEGVX)
+#define LAPACK_chegvx_base LAPACK_GLOBAL_SUFFIX(chegvx,CHEGVX)
 void LAPACK_chegvx_base(
     lapack_int const* itype, char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -7237,7 +7488,7 @@ void LAPACK_chegvx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7246,7 +7497,7 @@ void LAPACK_chegvx_base(
     #define LAPACK_chegvx(...) LAPACK_chegvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhegvx_base LAPACK_GLOBAL(zhegvx,ZHEGVX)
+#define LAPACK_zhegvx_base LAPACK_GLOBAL_SUFFIX(zhegvx,ZHEGVX)
 void LAPACK_zhegvx_base(
     lapack_int const* itype, char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -7262,7 +7513,7 @@ void LAPACK_zhegvx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7271,7 +7522,7 @@ void LAPACK_zhegvx_base(
     #define LAPACK_zhegvx(...) LAPACK_zhegvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cherfs_base LAPACK_GLOBAL(cherfs,CHERFS)
+#define LAPACK_cherfs_base LAPACK_GLOBAL_SUFFIX(cherfs,CHERFS)
 void LAPACK_cherfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7285,7 +7536,7 @@ void LAPACK_cherfs_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7294,7 +7545,7 @@ void LAPACK_cherfs_base(
     #define LAPACK_cherfs(...) LAPACK_cherfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zherfs_base LAPACK_GLOBAL(zherfs,ZHERFS)
+#define LAPACK_zherfs_base LAPACK_GLOBAL_SUFFIX(zherfs,ZHERFS)
 void LAPACK_zherfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7308,7 +7559,7 @@ void LAPACK_zherfs_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7317,7 +7568,7 @@ void LAPACK_zherfs_base(
     #define LAPACK_zherfs(...) LAPACK_zherfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cherfsx_base LAPACK_GLOBAL(cherfsx,CHERFSX)
+#define LAPACK_cherfsx_base LAPACK_GLOBAL_SUFFIX(cherfsx,CHERFSX)
 void LAPACK_cherfsx_base(
     char const* uplo, char const* equed,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7335,7 +7586,7 @@ void LAPACK_cherfsx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7344,7 +7595,7 @@ void LAPACK_cherfsx_base(
     #define LAPACK_cherfsx(...) LAPACK_cherfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zherfsx_base LAPACK_GLOBAL(zherfsx,ZHERFSX)
+#define LAPACK_zherfsx_base LAPACK_GLOBAL_SUFFIX(zherfsx,ZHERFSX)
 void LAPACK_zherfsx_base(
     char const* uplo, char const* equed,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7362,7 +7613,7 @@ void LAPACK_zherfsx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7371,7 +7622,7 @@ void LAPACK_zherfsx_base(
     #define LAPACK_zherfsx(...) LAPACK_zherfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chesv_base LAPACK_GLOBAL(chesv,CHESV)
+#define LAPACK_chesv_base LAPACK_GLOBAL_SUFFIX(chesv,CHESV)
 void LAPACK_chesv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7380,7 +7631,7 @@ void LAPACK_chesv_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7389,7 +7640,7 @@ void LAPACK_chesv_base(
     #define LAPACK_chesv(...) LAPACK_chesv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhesv_base LAPACK_GLOBAL(zhesv,ZHESV)
+#define LAPACK_zhesv_base LAPACK_GLOBAL_SUFFIX(zhesv,ZHESV)
 void LAPACK_zhesv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7398,7 +7649,7 @@ void LAPACK_zhesv_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7407,7 +7658,7 @@ void LAPACK_zhesv_base(
     #define LAPACK_zhesv(...) LAPACK_zhesv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chesv_aa_base LAPACK_GLOBAL(chesv_aa,CHESV_AA)
+#define LAPACK_chesv_aa_base LAPACK_GLOBAL_SUFFIX(chesv_aa,CHESV_AA)
 void LAPACK_chesv_aa_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7416,7 +7667,7 @@ void LAPACK_chesv_aa_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7425,7 +7676,7 @@ void LAPACK_chesv_aa_base(
     #define LAPACK_chesv_aa(...) LAPACK_chesv_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhesv_aa_base LAPACK_GLOBAL(zhesv_aa,ZHESV_AA)
+#define LAPACK_zhesv_aa_base LAPACK_GLOBAL_SUFFIX(zhesv_aa,ZHESV_AA)
 void LAPACK_zhesv_aa_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7434,7 +7685,7 @@ void LAPACK_zhesv_aa_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7443,7 +7694,7 @@ void LAPACK_zhesv_aa_base(
     #define LAPACK_zhesv_aa(...) LAPACK_zhesv_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chesv_aa_2stage_base LAPACK_GLOBAL(chesv_aa_2stage,CHESV_AA_2STAGE)
+#define LAPACK_chesv_aa_2stage_base LAPACK_GLOBAL_SUFFIX(chesv_aa_2stage,CHESV_AA_2STAGE)
 void LAPACK_chesv_aa_2stage_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7453,7 +7704,7 @@ void LAPACK_chesv_aa_2stage_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7462,7 +7713,7 @@ void LAPACK_chesv_aa_2stage_base(
     #define LAPACK_chesv_aa_2stage(...) LAPACK_chesv_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhesv_aa_2stage_base LAPACK_GLOBAL(zhesv_aa_2stage,ZHESV_AA_2STAGE)
+#define LAPACK_zhesv_aa_2stage_base LAPACK_GLOBAL_SUFFIX(zhesv_aa_2stage,ZHESV_AA_2STAGE)
 void LAPACK_zhesv_aa_2stage_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7472,7 +7723,7 @@ void LAPACK_zhesv_aa_2stage_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7481,7 +7732,7 @@ void LAPACK_zhesv_aa_2stage_base(
     #define LAPACK_zhesv_aa_2stage(...) LAPACK_zhesv_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chesv_rk_base LAPACK_GLOBAL(chesv_rk,CHESV_RK)
+#define LAPACK_chesv_rk_base LAPACK_GLOBAL_SUFFIX(chesv_rk,CHESV_RK)
 void LAPACK_chesv_rk_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7491,7 +7742,7 @@ void LAPACK_chesv_rk_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7500,7 +7751,7 @@ void LAPACK_chesv_rk_base(
     #define LAPACK_chesv_rk(...) LAPACK_chesv_rk_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhesv_rk_base LAPACK_GLOBAL(zhesv_rk,ZHESV_RK)
+#define LAPACK_zhesv_rk_base LAPACK_GLOBAL_SUFFIX(zhesv_rk,ZHESV_RK)
 void LAPACK_zhesv_rk_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7510,7 +7761,7 @@ void LAPACK_zhesv_rk_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7519,7 +7770,7 @@ void LAPACK_zhesv_rk_base(
     #define LAPACK_zhesv_rk(...) LAPACK_zhesv_rk_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chesv_rook_base LAPACK_GLOBAL(chesv_rook,CHESV_ROOK)
+#define LAPACK_chesv_rook_base LAPACK_GLOBAL_SUFFIX(chesv_rook,CHESV_ROOK)
 void LAPACK_chesv_rook_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7528,7 +7779,7 @@ void LAPACK_chesv_rook_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7537,7 +7788,7 @@ void LAPACK_chesv_rook_base(
     #define LAPACK_chesv_rook(...) LAPACK_chesv_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhesv_rook_base LAPACK_GLOBAL(zhesv_rook,ZHESV_ROOK)
+#define LAPACK_zhesv_rook_base LAPACK_GLOBAL_SUFFIX(zhesv_rook,ZHESV_ROOK)
 void LAPACK_zhesv_rook_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7546,7 +7797,7 @@ void LAPACK_zhesv_rook_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7555,7 +7806,7 @@ void LAPACK_zhesv_rook_base(
     #define LAPACK_zhesv_rook(...) LAPACK_zhesv_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chesvx_base LAPACK_GLOBAL(chesvx,CHESVX)
+#define LAPACK_chesvx_base LAPACK_GLOBAL_SUFFIX(chesvx,CHESVX)
 void LAPACK_chesvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7570,7 +7821,7 @@ void LAPACK_chesvx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7579,7 +7830,7 @@ void LAPACK_chesvx_base(
     #define LAPACK_chesvx(...) LAPACK_chesvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhesvx_base LAPACK_GLOBAL(zhesvx,ZHESVX)
+#define LAPACK_zhesvx_base LAPACK_GLOBAL_SUFFIX(zhesvx,ZHESVX)
 void LAPACK_zhesvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7594,7 +7845,7 @@ void LAPACK_zhesvx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7603,7 +7854,7 @@ void LAPACK_zhesvx_base(
     #define LAPACK_zhesvx(...) LAPACK_zhesvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chesvxx_base LAPACK_GLOBAL(chesvxx,CHESVXX)
+#define LAPACK_chesvxx_base LAPACK_GLOBAL_SUFFIX(chesvxx,CHESVXX)
 void LAPACK_chesvxx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7623,7 +7874,7 @@ void LAPACK_chesvxx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7632,7 +7883,7 @@ void LAPACK_chesvxx_base(
     #define LAPACK_chesvxx(...) LAPACK_chesvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhesvxx_base LAPACK_GLOBAL(zhesvxx,ZHESVXX)
+#define LAPACK_zhesvxx_base LAPACK_GLOBAL_SUFFIX(zhesvxx,ZHESVXX)
 void LAPACK_zhesvxx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -7652,7 +7903,7 @@ void LAPACK_zhesvxx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7661,13 +7912,13 @@ void LAPACK_zhesvxx_base(
     #define LAPACK_zhesvxx(...) LAPACK_zhesvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cheswapr_base LAPACK_GLOBAL(cheswapr,CHESWAPR)
+#define LAPACK_cheswapr_base LAPACK_GLOBAL_SUFFIX(cheswapr,CHESWAPR)
 void LAPACK_cheswapr_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda, lapack_int const* i1, lapack_int const* i2
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7676,13 +7927,13 @@ void LAPACK_cheswapr_base(
     #define LAPACK_cheswapr(...) LAPACK_cheswapr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zheswapr_base LAPACK_GLOBAL(zheswapr,ZHESWAPR)
+#define LAPACK_zheswapr_base LAPACK_GLOBAL_SUFFIX(zheswapr,ZHESWAPR)
 void LAPACK_zheswapr_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda, lapack_int const* i1, lapack_int const* i2
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7691,7 +7942,7 @@ void LAPACK_zheswapr_base(
     #define LAPACK_zheswapr(...) LAPACK_zheswapr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chetrd_base LAPACK_GLOBAL(chetrd,CHETRD)
+#define LAPACK_chetrd_base LAPACK_GLOBAL_SUFFIX(chetrd,CHETRD)
 void LAPACK_chetrd_base(
     char const* uplo,
     lapack_int const* n,
@@ -7702,7 +7953,7 @@ void LAPACK_chetrd_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7711,7 +7962,7 @@ void LAPACK_chetrd_base(
     #define LAPACK_chetrd(...) LAPACK_chetrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhetrd_base LAPACK_GLOBAL(zhetrd,ZHETRD)
+#define LAPACK_zhetrd_base LAPACK_GLOBAL_SUFFIX(zhetrd,ZHETRD)
 void LAPACK_zhetrd_base(
     char const* uplo,
     lapack_int const* n,
@@ -7722,7 +7973,7 @@ void LAPACK_zhetrd_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7731,7 +7982,7 @@ void LAPACK_zhetrd_base(
     #define LAPACK_zhetrd(...) LAPACK_zhetrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chetrd_2stage_base LAPACK_GLOBAL(chetrd_2stage,CHETRD_2STAGE)
+#define LAPACK_chetrd_2stage_base LAPACK_GLOBAL_SUFFIX(chetrd_2stage,CHETRD_2STAGE)
 void LAPACK_chetrd_2stage_base(
     char const* vect, char const* uplo,
     lapack_int const* n,
@@ -7743,7 +7994,7 @@ void LAPACK_chetrd_2stage_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7752,7 +8003,7 @@ void LAPACK_chetrd_2stage_base(
     #define LAPACK_chetrd_2stage(...) LAPACK_chetrd_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhetrd_2stage_base LAPACK_GLOBAL(zhetrd_2stage,ZHETRD_2STAGE)
+#define LAPACK_zhetrd_2stage_base LAPACK_GLOBAL_SUFFIX(zhetrd_2stage,ZHETRD_2STAGE)
 void LAPACK_zhetrd_2stage_base(
     char const* vect, char const* uplo,
     lapack_int const* n,
@@ -7764,7 +8015,7 @@ void LAPACK_zhetrd_2stage_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7773,7 +8024,7 @@ void LAPACK_zhetrd_2stage_base(
     #define LAPACK_zhetrd_2stage(...) LAPACK_zhetrd_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chetrf_base LAPACK_GLOBAL(chetrf,CHETRF)
+#define LAPACK_chetrf_base LAPACK_GLOBAL_SUFFIX(chetrf,CHETRF)
 void LAPACK_chetrf_base(
     char const* uplo,
     lapack_int const* n,
@@ -7781,7 +8032,7 @@ void LAPACK_chetrf_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7790,7 +8041,7 @@ void LAPACK_chetrf_base(
     #define LAPACK_chetrf(...) LAPACK_chetrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhetrf_base LAPACK_GLOBAL(zhetrf,ZHETRF)
+#define LAPACK_zhetrf_base LAPACK_GLOBAL_SUFFIX(zhetrf,ZHETRF)
 void LAPACK_zhetrf_base(
     char const* uplo,
     lapack_int const* n,
@@ -7798,7 +8049,7 @@ void LAPACK_zhetrf_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7807,7 +8058,7 @@ void LAPACK_zhetrf_base(
     #define LAPACK_zhetrf(...) LAPACK_zhetrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chetrf_aa_base LAPACK_GLOBAL(chetrf_aa,CHETRF_AA)
+#define LAPACK_chetrf_aa_base LAPACK_GLOBAL_SUFFIX(chetrf_aa,CHETRF_AA)
 void LAPACK_chetrf_aa_base(
     char const* uplo,
     lapack_int const* n,
@@ -7815,7 +8066,7 @@ void LAPACK_chetrf_aa_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7824,7 +8075,7 @@ void LAPACK_chetrf_aa_base(
     #define LAPACK_chetrf_aa(...) LAPACK_chetrf_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhetrf_aa_base LAPACK_GLOBAL(zhetrf_aa,ZHETRF_AA)
+#define LAPACK_zhetrf_aa_base LAPACK_GLOBAL_SUFFIX(zhetrf_aa,ZHETRF_AA)
 void LAPACK_zhetrf_aa_base(
     char const* uplo,
     lapack_int const* n,
@@ -7832,7 +8083,7 @@ void LAPACK_zhetrf_aa_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7841,7 +8092,7 @@ void LAPACK_zhetrf_aa_base(
     #define LAPACK_zhetrf_aa(...) LAPACK_zhetrf_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chetrf_aa_2stage_base LAPACK_GLOBAL(chetrf_aa_2stage,CHETRF_AA_2STAGE)
+#define LAPACK_chetrf_aa_2stage_base LAPACK_GLOBAL_SUFFIX(chetrf_aa_2stage,CHETRF_AA_2STAGE)
 void LAPACK_chetrf_aa_2stage_base(
     char const* uplo,
     lapack_int const* n,
@@ -7850,7 +8101,7 @@ void LAPACK_chetrf_aa_2stage_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7859,7 +8110,7 @@ void LAPACK_chetrf_aa_2stage_base(
     #define LAPACK_chetrf_aa_2stage(...) LAPACK_chetrf_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhetrf_aa_2stage_base LAPACK_GLOBAL(zhetrf_aa_2stage,ZHETRF_AA_2STAGE)
+#define LAPACK_zhetrf_aa_2stage_base LAPACK_GLOBAL_SUFFIX(zhetrf_aa_2stage,ZHETRF_AA_2STAGE)
 void LAPACK_zhetrf_aa_2stage_base(
     char const* uplo,
     lapack_int const* n,
@@ -7868,7 +8119,7 @@ void LAPACK_zhetrf_aa_2stage_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7877,7 +8128,7 @@ void LAPACK_zhetrf_aa_2stage_base(
     #define LAPACK_zhetrf_aa_2stage(...) LAPACK_zhetrf_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chetrf_rk_base LAPACK_GLOBAL(chetrf_rk,CHETRF_RK)
+#define LAPACK_chetrf_rk_base LAPACK_GLOBAL_SUFFIX(chetrf_rk,CHETRF_RK)
 void LAPACK_chetrf_rk_base(
     char const* uplo,
     lapack_int const* n,
@@ -7886,7 +8137,7 @@ void LAPACK_chetrf_rk_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7895,7 +8146,7 @@ void LAPACK_chetrf_rk_base(
     #define LAPACK_chetrf_rk(...) LAPACK_chetrf_rk_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhetrf_rk_base LAPACK_GLOBAL(zhetrf_rk,ZHETRF_RK)
+#define LAPACK_zhetrf_rk_base LAPACK_GLOBAL_SUFFIX(zhetrf_rk,ZHETRF_RK)
 void LAPACK_zhetrf_rk_base(
     char const* uplo,
     lapack_int const* n,
@@ -7904,7 +8155,7 @@ void LAPACK_zhetrf_rk_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7913,7 +8164,7 @@ void LAPACK_zhetrf_rk_base(
     #define LAPACK_zhetrf_rk(...) LAPACK_zhetrf_rk_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chetrf_rook_base LAPACK_GLOBAL(chetrf_rook,CHETRF_ROOK)
+#define LAPACK_chetrf_rook_base LAPACK_GLOBAL_SUFFIX(chetrf_rook,CHETRF_ROOK)
 void LAPACK_chetrf_rook_base(
     char const* uplo,
     lapack_int const* n,
@@ -7921,7 +8172,7 @@ void LAPACK_chetrf_rook_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7930,7 +8181,7 @@ void LAPACK_chetrf_rook_base(
     #define LAPACK_chetrf_rook(...) LAPACK_chetrf_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhetrf_rook_base LAPACK_GLOBAL(zhetrf_rook,ZHETRF_ROOK)
+#define LAPACK_zhetrf_rook_base LAPACK_GLOBAL_SUFFIX(zhetrf_rook,ZHETRF_ROOK)
 void LAPACK_zhetrf_rook_base(
     char const* uplo,
     lapack_int const* n,
@@ -7938,7 +8189,7 @@ void LAPACK_zhetrf_rook_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7947,7 +8198,7 @@ void LAPACK_zhetrf_rook_base(
     #define LAPACK_zhetrf_rook(...) LAPACK_zhetrf_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chetri_base LAPACK_GLOBAL(chetri,CHETRI)
+#define LAPACK_chetri_base LAPACK_GLOBAL_SUFFIX(chetri,CHETRI)
 void LAPACK_chetri_base(
     char const* uplo,
     lapack_int const* n,
@@ -7955,7 +8206,7 @@ void LAPACK_chetri_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7964,7 +8215,7 @@ void LAPACK_chetri_base(
     #define LAPACK_chetri(...) LAPACK_chetri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhetri_base LAPACK_GLOBAL(zhetri,ZHETRI)
+#define LAPACK_zhetri_base LAPACK_GLOBAL_SUFFIX(zhetri,ZHETRI)
 void LAPACK_zhetri_base(
     char const* uplo,
     lapack_int const* n,
@@ -7972,7 +8223,7 @@ void LAPACK_zhetri_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7981,7 +8232,7 @@ void LAPACK_zhetri_base(
     #define LAPACK_zhetri(...) LAPACK_zhetri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chetri2_base LAPACK_GLOBAL(chetri2,CHETRI2)
+#define LAPACK_chetri2_base LAPACK_GLOBAL_SUFFIX(chetri2,CHETRI2)
 void LAPACK_chetri2_base(
     char const* uplo,
     lapack_int const* n,
@@ -7989,7 +8240,7 @@ void LAPACK_chetri2_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -7998,7 +8249,7 @@ void LAPACK_chetri2_base(
     #define LAPACK_chetri2(...) LAPACK_chetri2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhetri2_base LAPACK_GLOBAL(zhetri2,ZHETRI2)
+#define LAPACK_zhetri2_base LAPACK_GLOBAL_SUFFIX(zhetri2,ZHETRI2)
 void LAPACK_zhetri2_base(
     char const* uplo,
     lapack_int const* n,
@@ -8006,7 +8257,7 @@ void LAPACK_zhetri2_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8015,7 +8266,7 @@ void LAPACK_zhetri2_base(
     #define LAPACK_zhetri2(...) LAPACK_zhetri2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chetri2x_base LAPACK_GLOBAL(chetri2x,CHETRI2X)
+#define LAPACK_chetri2x_base LAPACK_GLOBAL_SUFFIX(chetri2x,CHETRI2X)
 void LAPACK_chetri2x_base(
     char const* uplo,
     lapack_int const* n,
@@ -8023,7 +8274,7 @@ void LAPACK_chetri2x_base(
     lapack_complex_float* work, lapack_int const* nb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8032,7 +8283,7 @@ void LAPACK_chetri2x_base(
     #define LAPACK_chetri2x(...) LAPACK_chetri2x_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhetri2x_base LAPACK_GLOBAL(zhetri2x,ZHETRI2X)
+#define LAPACK_zhetri2x_base LAPACK_GLOBAL_SUFFIX(zhetri2x,ZHETRI2X)
 void LAPACK_zhetri2x_base(
     char const* uplo,
     lapack_int const* n,
@@ -8040,7 +8291,7 @@ void LAPACK_zhetri2x_base(
     lapack_complex_double* work, lapack_int const* nb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8049,7 +8300,7 @@ void LAPACK_zhetri2x_base(
     #define LAPACK_zhetri2x(...) LAPACK_zhetri2x_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chetri_3_base LAPACK_GLOBAL(chetri_3,CHETRI_3)
+#define LAPACK_chetri_3_base LAPACK_GLOBAL_SUFFIX(chetri_3,CHETRI_3)
 void LAPACK_chetri_3_base(
     char const* uplo,
     lapack_int const* n,
@@ -8058,7 +8309,7 @@ void LAPACK_chetri_3_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8067,7 +8318,7 @@ void LAPACK_chetri_3_base(
     #define LAPACK_chetri_3(...) LAPACK_chetri_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhetri_3_base LAPACK_GLOBAL(zhetri_3,ZHETRI_3)
+#define LAPACK_zhetri_3_base LAPACK_GLOBAL_SUFFIX(zhetri_3,ZHETRI_3)
 void LAPACK_zhetri_3_base(
     char const* uplo,
     lapack_int const* n,
@@ -8076,7 +8327,7 @@ void LAPACK_zhetri_3_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8085,7 +8336,7 @@ void LAPACK_zhetri_3_base(
     #define LAPACK_zhetri_3(...) LAPACK_zhetri_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chetrs_base LAPACK_GLOBAL(chetrs,CHETRS)
+#define LAPACK_chetrs_base LAPACK_GLOBAL_SUFFIX(chetrs,CHETRS)
 void LAPACK_chetrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8093,7 +8344,7 @@ void LAPACK_chetrs_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8102,7 +8353,7 @@ void LAPACK_chetrs_base(
     #define LAPACK_chetrs(...) LAPACK_chetrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhetrs_base LAPACK_GLOBAL(zhetrs,ZHETRS)
+#define LAPACK_zhetrs_base LAPACK_GLOBAL_SUFFIX(zhetrs,ZHETRS)
 void LAPACK_zhetrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8110,7 +8361,7 @@ void LAPACK_zhetrs_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8119,7 +8370,7 @@ void LAPACK_zhetrs_base(
     #define LAPACK_zhetrs(...) LAPACK_zhetrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chetrs2_base LAPACK_GLOBAL(chetrs2,CHETRS2)
+#define LAPACK_chetrs2_base LAPACK_GLOBAL_SUFFIX(chetrs2,CHETRS2)
 void LAPACK_chetrs2_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8128,7 +8379,7 @@ void LAPACK_chetrs2_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8137,7 +8388,7 @@ void LAPACK_chetrs2_base(
     #define LAPACK_chetrs2(...) LAPACK_chetrs2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhetrs2_base LAPACK_GLOBAL(zhetrs2,ZHETRS2)
+#define LAPACK_zhetrs2_base LAPACK_GLOBAL_SUFFIX(zhetrs2,ZHETRS2)
 void LAPACK_zhetrs2_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8146,7 +8397,7 @@ void LAPACK_zhetrs2_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8155,7 +8406,7 @@ void LAPACK_zhetrs2_base(
     #define LAPACK_zhetrs2(...) LAPACK_zhetrs2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chetrs_3_base LAPACK_GLOBAL(chetrs_3,CHETRS_3)
+#define LAPACK_chetrs_3_base LAPACK_GLOBAL_SUFFIX(chetrs_3,CHETRS_3)
 void LAPACK_chetrs_3_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8164,7 +8415,7 @@ void LAPACK_chetrs_3_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8173,7 +8424,7 @@ void LAPACK_chetrs_3_base(
     #define LAPACK_chetrs_3(...) LAPACK_chetrs_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhetrs_3_base LAPACK_GLOBAL(zhetrs_3,ZHETRS_3)
+#define LAPACK_zhetrs_3_base LAPACK_GLOBAL_SUFFIX(zhetrs_3,ZHETRS_3)
 void LAPACK_zhetrs_3_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8182,7 +8433,7 @@ void LAPACK_zhetrs_3_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8191,7 +8442,7 @@ void LAPACK_zhetrs_3_base(
     #define LAPACK_zhetrs_3(...) LAPACK_zhetrs_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chetrs_aa_base LAPACK_GLOBAL(chetrs_aa,CHETRS_AA)
+#define LAPACK_chetrs_aa_base LAPACK_GLOBAL_SUFFIX(chetrs_aa,CHETRS_AA)
 void LAPACK_chetrs_aa_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8200,7 +8451,7 @@ void LAPACK_chetrs_aa_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8209,7 +8460,7 @@ void LAPACK_chetrs_aa_base(
     #define LAPACK_chetrs_aa(...) LAPACK_chetrs_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhetrs_aa_base LAPACK_GLOBAL(zhetrs_aa,ZHETRS_AA)
+#define LAPACK_zhetrs_aa_base LAPACK_GLOBAL_SUFFIX(zhetrs_aa,ZHETRS_AA)
 void LAPACK_zhetrs_aa_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8218,7 +8469,7 @@ void LAPACK_zhetrs_aa_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8227,7 +8478,7 @@ void LAPACK_zhetrs_aa_base(
     #define LAPACK_zhetrs_aa(...) LAPACK_zhetrs_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chetrs_aa_2stage_base LAPACK_GLOBAL(chetrs_aa_2stage,CHETRS_AA_2STAGE)
+#define LAPACK_chetrs_aa_2stage_base LAPACK_GLOBAL_SUFFIX(chetrs_aa_2stage,CHETRS_AA_2STAGE)
 void LAPACK_chetrs_aa_2stage_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8236,7 +8487,7 @@ void LAPACK_chetrs_aa_2stage_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8245,7 +8496,7 @@ void LAPACK_chetrs_aa_2stage_base(
     #define LAPACK_chetrs_aa_2stage(...) LAPACK_chetrs_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhetrs_aa_2stage_base LAPACK_GLOBAL(zhetrs_aa_2stage,ZHETRS_AA_2STAGE)
+#define LAPACK_zhetrs_aa_2stage_base LAPACK_GLOBAL_SUFFIX(zhetrs_aa_2stage,ZHETRS_AA_2STAGE)
 void LAPACK_zhetrs_aa_2stage_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8254,7 +8505,7 @@ void LAPACK_zhetrs_aa_2stage_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8263,7 +8514,7 @@ void LAPACK_zhetrs_aa_2stage_base(
     #define LAPACK_zhetrs_aa_2stage(...) LAPACK_zhetrs_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chetrs_rook_base LAPACK_GLOBAL(chetrs_rook,CHETRS_ROOK)
+#define LAPACK_chetrs_rook_base LAPACK_GLOBAL_SUFFIX(chetrs_rook,CHETRS_ROOK)
 void LAPACK_chetrs_rook_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8271,7 +8522,7 @@ void LAPACK_chetrs_rook_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8280,7 +8531,7 @@ void LAPACK_chetrs_rook_base(
     #define LAPACK_chetrs_rook(...) LAPACK_chetrs_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhetrs_rook_base LAPACK_GLOBAL(zhetrs_rook,ZHETRS_ROOK)
+#define LAPACK_zhetrs_rook_base LAPACK_GLOBAL_SUFFIX(zhetrs_rook,ZHETRS_ROOK)
 void LAPACK_zhetrs_rook_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8288,7 +8539,7 @@ void LAPACK_zhetrs_rook_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8297,7 +8548,7 @@ void LAPACK_zhetrs_rook_base(
     #define LAPACK_zhetrs_rook(...) LAPACK_zhetrs_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chfrk_base LAPACK_GLOBAL(chfrk,CHFRK)
+#define LAPACK_chfrk_base LAPACK_GLOBAL_SUFFIX(chfrk,CHFRK)
 void LAPACK_chfrk_base(
     char const* transr, char const* uplo, char const* trans,
     lapack_int const* n, lapack_int const* k,
@@ -8306,7 +8557,7 @@ void LAPACK_chfrk_base(
     float const* beta,
     lapack_complex_float* C
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8315,7 +8566,7 @@ void LAPACK_chfrk_base(
     #define LAPACK_chfrk(...) LAPACK_chfrk_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhfrk_base LAPACK_GLOBAL(zhfrk,ZHFRK)
+#define LAPACK_zhfrk_base LAPACK_GLOBAL_SUFFIX(zhfrk,ZHFRK)
 void LAPACK_zhfrk_base(
     char const* transr, char const* uplo, char const* trans,
     lapack_int const* n, lapack_int const* k,
@@ -8324,7 +8575,7 @@ void LAPACK_zhfrk_base(
     double const* beta,
     lapack_complex_double* C
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8333,7 +8584,7 @@ void LAPACK_zhfrk_base(
     #define LAPACK_zhfrk(...) LAPACK_zhfrk_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chgeqz_base LAPACK_GLOBAL(chgeqz,CHGEQZ)
+#define LAPACK_chgeqz_base LAPACK_GLOBAL_SUFFIX(chgeqz,CHGEQZ)
 void LAPACK_chgeqz_base(
     char const* job, char const* compq, char const* compz,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -8347,7 +8598,7 @@ void LAPACK_chgeqz_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8356,7 +8607,7 @@ void LAPACK_chgeqz_base(
     #define LAPACK_chgeqz(...) LAPACK_chgeqz_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dhgeqz_base LAPACK_GLOBAL(dhgeqz,DHGEQZ)
+#define LAPACK_dhgeqz_base LAPACK_GLOBAL_SUFFIX(dhgeqz,DHGEQZ)
 void LAPACK_dhgeqz_base(
     char const* job, char const* compq, char const* compz,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -8370,7 +8621,7 @@ void LAPACK_dhgeqz_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8379,7 +8630,7 @@ void LAPACK_dhgeqz_base(
     #define LAPACK_dhgeqz(...) LAPACK_dhgeqz_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_shgeqz_base LAPACK_GLOBAL(shgeqz,SHGEQZ)
+#define LAPACK_shgeqz_base LAPACK_GLOBAL_SUFFIX(shgeqz,SHGEQZ)
 void LAPACK_shgeqz_base(
     char const* job, char const* compq, char const* compz,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -8393,7 +8644,7 @@ void LAPACK_shgeqz_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8402,7 +8653,7 @@ void LAPACK_shgeqz_base(
     #define LAPACK_shgeqz(...) LAPACK_shgeqz_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhgeqz_base LAPACK_GLOBAL(zhgeqz,ZHGEQZ)
+#define LAPACK_zhgeqz_base LAPACK_GLOBAL_SUFFIX(zhgeqz,ZHGEQZ)
 void LAPACK_zhgeqz_base(
     char const* job, char const* compq, char const* compz,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -8416,7 +8667,7 @@ void LAPACK_zhgeqz_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8425,7 +8676,7 @@ void LAPACK_zhgeqz_base(
     #define LAPACK_zhgeqz(...) LAPACK_zhgeqz_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chpcon_base LAPACK_GLOBAL(chpcon,CHPCON)
+#define LAPACK_chpcon_base LAPACK_GLOBAL_SUFFIX(chpcon,CHPCON)
 void LAPACK_chpcon_base(
     char const* uplo,
     lapack_int const* n,
@@ -8435,7 +8686,7 @@ void LAPACK_chpcon_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8444,7 +8695,7 @@ void LAPACK_chpcon_base(
     #define LAPACK_chpcon(...) LAPACK_chpcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhpcon_base LAPACK_GLOBAL(zhpcon,ZHPCON)
+#define LAPACK_zhpcon_base LAPACK_GLOBAL_SUFFIX(zhpcon,ZHPCON)
 void LAPACK_zhpcon_base(
     char const* uplo,
     lapack_int const* n,
@@ -8454,7 +8705,7 @@ void LAPACK_zhpcon_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8463,7 +8714,7 @@ void LAPACK_zhpcon_base(
     #define LAPACK_zhpcon(...) LAPACK_zhpcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chpev_base LAPACK_GLOBAL(chpev,CHPEV)
+#define LAPACK_chpev_base LAPACK_GLOBAL_SUFFIX(chpev,CHPEV)
 void LAPACK_chpev_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -8474,7 +8725,7 @@ void LAPACK_chpev_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8483,7 +8734,7 @@ void LAPACK_chpev_base(
     #define LAPACK_chpev(...) LAPACK_chpev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhpev_base LAPACK_GLOBAL(zhpev,ZHPEV)
+#define LAPACK_zhpev_base LAPACK_GLOBAL_SUFFIX(zhpev,ZHPEV)
 void LAPACK_zhpev_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -8494,7 +8745,7 @@ void LAPACK_zhpev_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8503,7 +8754,7 @@ void LAPACK_zhpev_base(
     #define LAPACK_zhpev(...) LAPACK_zhpev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chpevd_base LAPACK_GLOBAL(chpevd,CHPEVD)
+#define LAPACK_chpevd_base LAPACK_GLOBAL_SUFFIX(chpevd,CHPEVD)
 void LAPACK_chpevd_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -8515,7 +8766,7 @@ void LAPACK_chpevd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8524,7 +8775,7 @@ void LAPACK_chpevd_base(
     #define LAPACK_chpevd(...) LAPACK_chpevd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhpevd_base LAPACK_GLOBAL(zhpevd,ZHPEVD)
+#define LAPACK_zhpevd_base LAPACK_GLOBAL_SUFFIX(zhpevd,ZHPEVD)
 void LAPACK_zhpevd_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -8536,7 +8787,7 @@ void LAPACK_zhpevd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8545,7 +8796,7 @@ void LAPACK_zhpevd_base(
     #define LAPACK_zhpevd(...) LAPACK_zhpevd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chpevx_base LAPACK_GLOBAL(chpevx,CHPEVX)
+#define LAPACK_chpevx_base LAPACK_GLOBAL_SUFFIX(chpevx,CHPEVX)
 void LAPACK_chpevx_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -8560,7 +8811,7 @@ void LAPACK_chpevx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8569,7 +8820,7 @@ void LAPACK_chpevx_base(
     #define LAPACK_chpevx(...) LAPACK_chpevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhpevx_base LAPACK_GLOBAL(zhpevx,ZHPEVX)
+#define LAPACK_zhpevx_base LAPACK_GLOBAL_SUFFIX(zhpevx,ZHPEVX)
 void LAPACK_zhpevx_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -8584,7 +8835,7 @@ void LAPACK_zhpevx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8593,7 +8844,7 @@ void LAPACK_zhpevx_base(
     #define LAPACK_zhpevx(...) LAPACK_zhpevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chpgst_base LAPACK_GLOBAL(chpgst,CHPGST)
+#define LAPACK_chpgst_base LAPACK_GLOBAL_SUFFIX(chpgst,CHPGST)
 void LAPACK_chpgst_base(
     lapack_int const* itype, char const* uplo,
     lapack_int const* n,
@@ -8601,7 +8852,7 @@ void LAPACK_chpgst_base(
     lapack_complex_float const* BP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8610,7 +8861,7 @@ void LAPACK_chpgst_base(
     #define LAPACK_chpgst(...) LAPACK_chpgst_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhpgst_base LAPACK_GLOBAL(zhpgst,ZHPGST)
+#define LAPACK_zhpgst_base LAPACK_GLOBAL_SUFFIX(zhpgst,ZHPGST)
 void LAPACK_zhpgst_base(
     lapack_int const* itype, char const* uplo,
     lapack_int const* n,
@@ -8618,7 +8869,7 @@ void LAPACK_zhpgst_base(
     lapack_complex_double const* BP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8627,7 +8878,7 @@ void LAPACK_zhpgst_base(
     #define LAPACK_zhpgst(...) LAPACK_zhpgst_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chpgv_base LAPACK_GLOBAL(chpgv,CHPGV)
+#define LAPACK_chpgv_base LAPACK_GLOBAL_SUFFIX(chpgv,CHPGV)
 void LAPACK_chpgv_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -8639,7 +8890,7 @@ void LAPACK_chpgv_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8648,7 +8899,7 @@ void LAPACK_chpgv_base(
     #define LAPACK_chpgv(...) LAPACK_chpgv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhpgv_base LAPACK_GLOBAL(zhpgv,ZHPGV)
+#define LAPACK_zhpgv_base LAPACK_GLOBAL_SUFFIX(zhpgv,ZHPGV)
 void LAPACK_zhpgv_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -8660,7 +8911,7 @@ void LAPACK_zhpgv_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8669,7 +8920,7 @@ void LAPACK_zhpgv_base(
     #define LAPACK_zhpgv(...) LAPACK_zhpgv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chpgvd_base LAPACK_GLOBAL(chpgvd,CHPGVD)
+#define LAPACK_chpgvd_base LAPACK_GLOBAL_SUFFIX(chpgvd,CHPGVD)
 void LAPACK_chpgvd_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -8682,7 +8933,7 @@ void LAPACK_chpgvd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8691,7 +8942,7 @@ void LAPACK_chpgvd_base(
     #define LAPACK_chpgvd(...) LAPACK_chpgvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhpgvd_base LAPACK_GLOBAL(zhpgvd,ZHPGVD)
+#define LAPACK_zhpgvd_base LAPACK_GLOBAL_SUFFIX(zhpgvd,ZHPGVD)
 void LAPACK_zhpgvd_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -8704,7 +8955,7 @@ void LAPACK_zhpgvd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8713,7 +8964,7 @@ void LAPACK_zhpgvd_base(
     #define LAPACK_zhpgvd(...) LAPACK_zhpgvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chpgvx_base LAPACK_GLOBAL(chpgvx,CHPGVX)
+#define LAPACK_chpgvx_base LAPACK_GLOBAL_SUFFIX(chpgvx,CHPGVX)
 void LAPACK_chpgvx_base(
     lapack_int const* itype, char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -8729,7 +8980,7 @@ void LAPACK_chpgvx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8738,7 +8989,7 @@ void LAPACK_chpgvx_base(
     #define LAPACK_chpgvx(...) LAPACK_chpgvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhpgvx_base LAPACK_GLOBAL(zhpgvx,ZHPGVX)
+#define LAPACK_zhpgvx_base LAPACK_GLOBAL_SUFFIX(zhpgvx,ZHPGVX)
 void LAPACK_zhpgvx_base(
     lapack_int const* itype, char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -8754,7 +9005,7 @@ void LAPACK_zhpgvx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8763,7 +9014,7 @@ void LAPACK_zhpgvx_base(
     #define LAPACK_zhpgvx(...) LAPACK_zhpgvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chprfs_base LAPACK_GLOBAL(chprfs,CHPRFS)
+#define LAPACK_chprfs_base LAPACK_GLOBAL_SUFFIX(chprfs,CHPRFS)
 void LAPACK_chprfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8777,7 +9028,7 @@ void LAPACK_chprfs_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8786,7 +9037,7 @@ void LAPACK_chprfs_base(
     #define LAPACK_chprfs(...) LAPACK_chprfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhprfs_base LAPACK_GLOBAL(zhprfs,ZHPRFS)
+#define LAPACK_zhprfs_base LAPACK_GLOBAL_SUFFIX(zhprfs,ZHPRFS)
 void LAPACK_zhprfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8800,7 +9051,7 @@ void LAPACK_zhprfs_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8809,7 +9060,7 @@ void LAPACK_zhprfs_base(
     #define LAPACK_zhprfs(...) LAPACK_zhprfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chpsv_base LAPACK_GLOBAL(chpsv,CHPSV)
+#define LAPACK_chpsv_base LAPACK_GLOBAL_SUFFIX(chpsv,CHPSV)
 void LAPACK_chpsv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8817,7 +9068,7 @@ void LAPACK_chpsv_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8826,7 +9077,7 @@ void LAPACK_chpsv_base(
     #define LAPACK_chpsv(...) LAPACK_chpsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhpsv_base LAPACK_GLOBAL(zhpsv,ZHPSV)
+#define LAPACK_zhpsv_base LAPACK_GLOBAL_SUFFIX(zhpsv,ZHPSV)
 void LAPACK_zhpsv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8834,7 +9085,7 @@ void LAPACK_zhpsv_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8843,7 +9094,7 @@ void LAPACK_zhpsv_base(
     #define LAPACK_zhpsv(...) LAPACK_zhpsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chpsvx_base LAPACK_GLOBAL(chpsvx,CHPSVX)
+#define LAPACK_chpsvx_base LAPACK_GLOBAL_SUFFIX(chpsvx,CHPSVX)
 void LAPACK_chpsvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8858,7 +9109,7 @@ void LAPACK_chpsvx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8867,7 +9118,7 @@ void LAPACK_chpsvx_base(
     #define LAPACK_chpsvx(...) LAPACK_chpsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhpsvx_base LAPACK_GLOBAL(zhpsvx,ZHPSVX)
+#define LAPACK_zhpsvx_base LAPACK_GLOBAL_SUFFIX(zhpsvx,ZHPSVX)
 void LAPACK_zhpsvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -8882,7 +9133,7 @@ void LAPACK_zhpsvx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8891,7 +9142,7 @@ void LAPACK_zhpsvx_base(
     #define LAPACK_zhpsvx(...) LAPACK_zhpsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chptrd_base LAPACK_GLOBAL(chptrd,CHPTRD)
+#define LAPACK_chptrd_base LAPACK_GLOBAL_SUFFIX(chptrd,CHPTRD)
 void LAPACK_chptrd_base(
     char const* uplo,
     lapack_int const* n,
@@ -8901,7 +9152,7 @@ void LAPACK_chptrd_base(
     lapack_complex_float* tau,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8910,7 +9161,7 @@ void LAPACK_chptrd_base(
     #define LAPACK_chptrd(...) LAPACK_chptrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhptrd_base LAPACK_GLOBAL(zhptrd,ZHPTRD)
+#define LAPACK_zhptrd_base LAPACK_GLOBAL_SUFFIX(zhptrd,ZHPTRD)
 void LAPACK_zhptrd_base(
     char const* uplo,
     lapack_int const* n,
@@ -8920,7 +9171,7 @@ void LAPACK_zhptrd_base(
     lapack_complex_double* tau,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8929,14 +9180,14 @@ void LAPACK_zhptrd_base(
     #define LAPACK_zhptrd(...) LAPACK_zhptrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chptrf_base LAPACK_GLOBAL(chptrf,CHPTRF)
+#define LAPACK_chptrf_base LAPACK_GLOBAL_SUFFIX(chptrf,CHPTRF)
 void LAPACK_chptrf_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_float* AP, lapack_int* ipiv,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8945,14 +9196,14 @@ void LAPACK_chptrf_base(
     #define LAPACK_chptrf(...) LAPACK_chptrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhptrf_base LAPACK_GLOBAL(zhptrf,ZHPTRF)
+#define LAPACK_zhptrf_base LAPACK_GLOBAL_SUFFIX(zhptrf,ZHPTRF)
 void LAPACK_zhptrf_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_double* AP, lapack_int* ipiv,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8961,7 +9212,7 @@ void LAPACK_zhptrf_base(
     #define LAPACK_zhptrf(...) LAPACK_zhptrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chptri_base LAPACK_GLOBAL(chptri,CHPTRI)
+#define LAPACK_chptri_base LAPACK_GLOBAL_SUFFIX(chptri,CHPTRI)
 void LAPACK_chptri_base(
     char const* uplo,
     lapack_int const* n,
@@ -8969,7 +9220,7 @@ void LAPACK_chptri_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8978,7 +9229,7 @@ void LAPACK_chptri_base(
     #define LAPACK_chptri(...) LAPACK_chptri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhptri_base LAPACK_GLOBAL(zhptri,ZHPTRI)
+#define LAPACK_zhptri_base LAPACK_GLOBAL_SUFFIX(zhptri,ZHPTRI)
 void LAPACK_zhptri_base(
     char const* uplo,
     lapack_int const* n,
@@ -8986,7 +9237,7 @@ void LAPACK_zhptri_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -8995,7 +9246,7 @@ void LAPACK_zhptri_base(
     #define LAPACK_zhptri(...) LAPACK_zhptri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chptrs_base LAPACK_GLOBAL(chptrs,CHPTRS)
+#define LAPACK_chptrs_base LAPACK_GLOBAL_SUFFIX(chptrs,CHPTRS)
 void LAPACK_chptrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -9003,7 +9254,7 @@ void LAPACK_chptrs_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9012,7 +9263,7 @@ void LAPACK_chptrs_base(
     #define LAPACK_chptrs(...) LAPACK_chptrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhptrs_base LAPACK_GLOBAL(zhptrs,ZHPTRS)
+#define LAPACK_zhptrs_base LAPACK_GLOBAL_SUFFIX(zhptrs,ZHPTRS)
 void LAPACK_zhptrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -9020,7 +9271,7 @@ void LAPACK_zhptrs_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9029,7 +9280,7 @@ void LAPACK_zhptrs_base(
     #define LAPACK_zhptrs(...) LAPACK_zhptrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chsein_base LAPACK_GLOBAL(chsein,CHSEIN)
+#define LAPACK_chsein_base LAPACK_GLOBAL_SUFFIX(chsein,CHSEIN)
 void LAPACK_chsein_base(
     char const* side, char const* eigsrc, char const* initv,
     lapack_logical const* select,
@@ -9042,7 +9293,7 @@ void LAPACK_chsein_base(
     float* rwork, lapack_int* IFAILL, lapack_int* IFAILR,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9051,7 +9302,7 @@ void LAPACK_chsein_base(
     #define LAPACK_chsein(...) LAPACK_chsein_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dhsein_base LAPACK_GLOBAL(dhsein,DHSEIN)
+#define LAPACK_dhsein_base LAPACK_GLOBAL_SUFFIX(dhsein,DHSEIN)
 void LAPACK_dhsein_base(
     char const* side, char const* eigsrc, char const* initv,
     lapack_logical* select,
@@ -9064,7 +9315,7 @@ void LAPACK_dhsein_base(
     double* work, lapack_int* IFAILL, lapack_int* IFAILR,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9073,7 +9324,7 @@ void LAPACK_dhsein_base(
     #define LAPACK_dhsein(...) LAPACK_dhsein_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_shsein_base LAPACK_GLOBAL(shsein,SHSEIN)
+#define LAPACK_shsein_base LAPACK_GLOBAL_SUFFIX(shsein,SHSEIN)
 void LAPACK_shsein_base(
     char const* side, char const* eigsrc, char const* initv,
     lapack_logical* select,
@@ -9086,7 +9337,7 @@ void LAPACK_shsein_base(
     float* work, lapack_int* IFAILL, lapack_int* IFAILR,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9095,7 +9346,7 @@ void LAPACK_shsein_base(
     #define LAPACK_shsein(...) LAPACK_shsein_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhsein_base LAPACK_GLOBAL(zhsein,ZHSEIN)
+#define LAPACK_zhsein_base LAPACK_GLOBAL_SUFFIX(zhsein,ZHSEIN)
 void LAPACK_zhsein_base(
     char const* side, char const* eigsrc, char const* initv,
     lapack_logical const* select,
@@ -9108,7 +9359,7 @@ void LAPACK_zhsein_base(
     double* rwork, lapack_int* IFAILL, lapack_int* IFAILR,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9117,7 +9368,7 @@ void LAPACK_zhsein_base(
     #define LAPACK_zhsein(...) LAPACK_zhsein_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_chseqr_base LAPACK_GLOBAL(chseqr,CHSEQR)
+#define LAPACK_chseqr_base LAPACK_GLOBAL_SUFFIX(chseqr,CHSEQR)
 void LAPACK_chseqr_base(
     char const* job, char const* compz,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -9127,7 +9378,7 @@ void LAPACK_chseqr_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9136,7 +9387,7 @@ void LAPACK_chseqr_base(
     #define LAPACK_chseqr(...) LAPACK_chseqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dhseqr_base LAPACK_GLOBAL(dhseqr,DHSEQR)
+#define LAPACK_dhseqr_base LAPACK_GLOBAL_SUFFIX(dhseqr,DHSEQR)
 void LAPACK_dhseqr_base(
     char const* job, char const* compz,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -9147,7 +9398,7 @@ void LAPACK_dhseqr_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9156,7 +9407,7 @@ void LAPACK_dhseqr_base(
     #define LAPACK_dhseqr(...) LAPACK_dhseqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_shseqr_base LAPACK_GLOBAL(shseqr,SHSEQR)
+#define LAPACK_shseqr_base LAPACK_GLOBAL_SUFFIX(shseqr,SHSEQR)
 void LAPACK_shseqr_base(
     char const* job, char const* compz,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -9167,7 +9418,7 @@ void LAPACK_shseqr_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9176,7 +9427,7 @@ void LAPACK_shseqr_base(
     #define LAPACK_shseqr(...) LAPACK_shseqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zhseqr_base LAPACK_GLOBAL(zhseqr,ZHSEQR)
+#define LAPACK_zhseqr_base LAPACK_GLOBAL_SUFFIX(zhseqr,ZHSEQR)
 void LAPACK_zhseqr_base(
     char const* job, char const* compz,
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -9186,7 +9437,7 @@ void LAPACK_zhseqr_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9195,52 +9446,52 @@ void LAPACK_zhseqr_base(
     #define LAPACK_zhseqr(...) LAPACK_zhseqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clacgv LAPACK_GLOBAL(clacgv,CLACGV)
+#define LAPACK_clacgv LAPACK_GLOBAL_SUFFIX(clacgv,CLACGV)
 void LAPACK_clacgv(
     lapack_int const* n,
     lapack_complex_float* X, lapack_int const* incx );
 
-#define LAPACK_zlacgv LAPACK_GLOBAL(zlacgv,ZLACGV)
+#define LAPACK_zlacgv LAPACK_GLOBAL_SUFFIX(zlacgv,ZLACGV)
 void LAPACK_zlacgv(
     lapack_int const* n,
     lapack_complex_double* X, lapack_int const* incx );
 
-#define LAPACK_clacn2 LAPACK_GLOBAL(clacn2,CLACN2)
+#define LAPACK_clacn2 LAPACK_GLOBAL_SUFFIX(clacn2,CLACN2)
 void LAPACK_clacn2(
     lapack_int const* n,
     lapack_complex_float* V,
     lapack_complex_float* X,
     float* est, lapack_int* kase, lapack_int* ISAVE );
 
-#define LAPACK_dlacn2 LAPACK_GLOBAL(dlacn2,DLACN2)
+#define LAPACK_dlacn2 LAPACK_GLOBAL_SUFFIX(dlacn2,DLACN2)
 void LAPACK_dlacn2(
     lapack_int const* n,
     double* V,
     double* X, lapack_int* ISGN,
     double* est, lapack_int* kase, lapack_int* ISAVE );
 
-#define LAPACK_slacn2 LAPACK_GLOBAL(slacn2,SLACN2)
+#define LAPACK_slacn2 LAPACK_GLOBAL_SUFFIX(slacn2,SLACN2)
 void LAPACK_slacn2(
     lapack_int const* n,
     float* V,
     float* X, lapack_int* ISGN,
     float* est, lapack_int* kase, lapack_int* ISAVE );
 
-#define LAPACK_zlacn2 LAPACK_GLOBAL(zlacn2,ZLACN2)
+#define LAPACK_zlacn2 LAPACK_GLOBAL_SUFFIX(zlacn2,ZLACN2)
 void LAPACK_zlacn2(
     lapack_int const* n,
     lapack_complex_double* V,
     lapack_complex_double* X,
     double* est, lapack_int* kase, lapack_int* ISAVE );
 
-#define LAPACK_clacp2_base LAPACK_GLOBAL(clacp2,CLACP2)
+#define LAPACK_clacp2_base LAPACK_GLOBAL_SUFFIX(clacp2,CLACP2)
 void LAPACK_clacp2_base(
     char const* uplo,
     lapack_int const* m, lapack_int const* n,
     float const* A, lapack_int const* lda,
     lapack_complex_float* B, lapack_int const* ldb
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9249,14 +9500,14 @@ void LAPACK_clacp2_base(
     #define LAPACK_clacp2(...) LAPACK_clacp2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlacp2_base LAPACK_GLOBAL(zlacp2,ZLACP2)
+#define LAPACK_zlacp2_base LAPACK_GLOBAL_SUFFIX(zlacp2,ZLACP2)
 void LAPACK_zlacp2_base(
     char const* uplo,
     lapack_int const* m, lapack_int const* n,
     double const* A, lapack_int const* lda,
     lapack_complex_double* B, lapack_int const* ldb
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9265,14 +9516,14 @@ void LAPACK_zlacp2_base(
     #define LAPACK_zlacp2(...) LAPACK_zlacp2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clacpy_base LAPACK_GLOBAL(clacpy,CLACPY)
+#define LAPACK_clacpy_base LAPACK_GLOBAL_SUFFIX(clacpy,CLACPY)
 void LAPACK_clacpy_base(
     char const* uplo,
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float const* A, lapack_int const* lda,
     lapack_complex_float* B, lapack_int const* ldb
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9281,14 +9532,14 @@ void LAPACK_clacpy_base(
     #define LAPACK_clacpy(...) LAPACK_clacpy_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlacpy_base LAPACK_GLOBAL(dlacpy,DLACPY)
+#define LAPACK_dlacpy_base LAPACK_GLOBAL_SUFFIX(dlacpy,DLACPY)
 void LAPACK_dlacpy_base(
     char const* uplo,
     lapack_int const* m, lapack_int const* n,
     double const* A, lapack_int const* lda,
     double* B, lapack_int const* ldb
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9297,14 +9548,14 @@ void LAPACK_dlacpy_base(
     #define LAPACK_dlacpy(...) LAPACK_dlacpy_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slacpy_base LAPACK_GLOBAL(slacpy,SLACPY)
+#define LAPACK_slacpy_base LAPACK_GLOBAL_SUFFIX(slacpy,SLACPY)
 void LAPACK_slacpy_base(
     char const* uplo,
     lapack_int const* m, lapack_int const* n,
     float const* A, lapack_int const* lda,
     float* B, lapack_int const* ldb
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9313,14 +9564,14 @@ void LAPACK_slacpy_base(
     #define LAPACK_slacpy(...) LAPACK_slacpy_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlacpy_base LAPACK_GLOBAL(zlacpy,ZLACPY)
+#define LAPACK_zlacpy_base LAPACK_GLOBAL_SUFFIX(zlacpy,ZLACPY)
 void LAPACK_zlacpy_base(
     char const* uplo,
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double const* A, lapack_int const* lda,
     lapack_complex_double* B, lapack_int const* ldb
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9329,7 +9580,7 @@ void LAPACK_zlacpy_base(
     #define LAPACK_zlacpy(...) LAPACK_zlacpy_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clacrm LAPACK_GLOBAL(clacrm,CLACRM)
+#define LAPACK_clacrm LAPACK_GLOBAL_SUFFIX(clacrm,CLACRM)
 void LAPACK_clacrm(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float const* A, lapack_int const* lda,
@@ -9337,7 +9588,7 @@ void LAPACK_clacrm(
     lapack_complex_float* C, lapack_int const* ldc,
     float* rwork );
 
-#define LAPACK_zlacrm LAPACK_GLOBAL(zlacrm,ZLACRM)
+#define LAPACK_zlacrm LAPACK_GLOBAL_SUFFIX(zlacrm,ZLACRM)
 void LAPACK_zlacrm(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double const* A, lapack_int const* lda,
@@ -9345,35 +9596,35 @@ void LAPACK_zlacrm(
     lapack_complex_double* C, lapack_int const* ldc,
     double* rwork );
 
-#define LAPACK_zlag2c LAPACK_GLOBAL(zlag2c,ZLAG2C)
+#define LAPACK_zlag2c LAPACK_GLOBAL_SUFFIX(zlag2c,ZLAG2C)
 void LAPACK_zlag2c(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double const* A, lapack_int const* lda,
     lapack_complex_float* SA, lapack_int const* ldsa,
     lapack_int* info );
 
-#define LAPACK_slag2d LAPACK_GLOBAL(slag2d,SLAG2D)
+#define LAPACK_slag2d LAPACK_GLOBAL_SUFFIX(slag2d,SLAG2D)
 void LAPACK_slag2d(
     lapack_int const* m, lapack_int const* n,
     float const* SA, lapack_int const* ldsa,
     double* A, lapack_int const* lda,
     lapack_int* info );
 
-#define LAPACK_dlag2s LAPACK_GLOBAL(dlag2s,DLAG2S)
+#define LAPACK_dlag2s LAPACK_GLOBAL_SUFFIX(dlag2s,DLAG2S)
 void LAPACK_dlag2s(
     lapack_int const* m, lapack_int const* n,
     double const* A, lapack_int const* lda,
     float* SA, lapack_int const* ldsa,
     lapack_int* info );
 
-#define LAPACK_clag2z LAPACK_GLOBAL(clag2z,CLAG2Z)
+#define LAPACK_clag2z LAPACK_GLOBAL_SUFFIX(clag2z,CLAG2Z)
 void LAPACK_clag2z(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float const* SA, lapack_int const* ldsa,
     lapack_complex_double* A, lapack_int const* lda,
     lapack_int* info );
 
-#define LAPACK_clagge LAPACK_GLOBAL(clagge,CLAGGE)
+#define LAPACK_clagge LAPACK_GLOBAL_SUFFIX(clagge,CLAGGE)
 void LAPACK_clagge(
     lapack_int const* m, lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     float const* D,
@@ -9381,7 +9632,7 @@ void LAPACK_clagge(
     lapack_complex_float* work,
     lapack_int* info );
 
-#define LAPACK_dlagge LAPACK_GLOBAL(dlagge,DLAGGE)
+#define LAPACK_dlagge LAPACK_GLOBAL_SUFFIX(dlagge,DLAGGE)
 void LAPACK_dlagge(
     lapack_int const* m, lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     double const* D,
@@ -9389,7 +9640,7 @@ void LAPACK_dlagge(
     double* work,
     lapack_int* info );
 
-#define LAPACK_slagge LAPACK_GLOBAL(slagge,SLAGGE)
+#define LAPACK_slagge LAPACK_GLOBAL_SUFFIX(slagge,SLAGGE)
 void LAPACK_slagge(
     lapack_int const* m, lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     float const* D,
@@ -9397,7 +9648,7 @@ void LAPACK_slagge(
     float* work,
     lapack_int* info );
 
-#define LAPACK_zlagge LAPACK_GLOBAL(zlagge,ZLAGGE)
+#define LAPACK_zlagge LAPACK_GLOBAL_SUFFIX(zlagge,ZLAGGE)
 void LAPACK_zlagge(
     lapack_int const* m, lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     double const* D,
@@ -9405,7 +9656,7 @@ void LAPACK_zlagge(
     lapack_complex_double* work,
     lapack_int* info );
 
-#define LAPACK_claghe LAPACK_GLOBAL(claghe,CLAGHE)
+#define LAPACK_claghe LAPACK_GLOBAL_SUFFIX(claghe,CLAGHE)
 void LAPACK_claghe(
     lapack_int const* n, lapack_int const* k,
     float const* D,
@@ -9413,7 +9664,7 @@ void LAPACK_claghe(
     lapack_complex_float* work,
     lapack_int* info );
 
-#define LAPACK_zlaghe LAPACK_GLOBAL(zlaghe,ZLAGHE)
+#define LAPACK_zlaghe LAPACK_GLOBAL_SUFFIX(zlaghe,ZLAGHE)
 void LAPACK_zlaghe(
     lapack_int const* n, lapack_int const* k,
     double const* D,
@@ -9421,7 +9672,7 @@ void LAPACK_zlaghe(
     lapack_complex_double* work,
     lapack_int* info );
 
-#define LAPACK_clagsy LAPACK_GLOBAL(clagsy,CLAGSY)
+#define LAPACK_clagsy LAPACK_GLOBAL_SUFFIX(clagsy,CLAGSY)
 void LAPACK_clagsy(
     lapack_int const* n, lapack_int const* k,
     float const* D,
@@ -9429,7 +9680,7 @@ void LAPACK_clagsy(
     lapack_complex_float* work,
     lapack_int* info );
 
-#define LAPACK_dlagsy LAPACK_GLOBAL(dlagsy,DLAGSY)
+#define LAPACK_dlagsy LAPACK_GLOBAL_SUFFIX(dlagsy,DLAGSY)
 void LAPACK_dlagsy(
     lapack_int const* n, lapack_int const* k,
     double const* D,
@@ -9437,7 +9688,7 @@ void LAPACK_dlagsy(
     double* work,
     lapack_int* info );
 
-#define LAPACK_slagsy LAPACK_GLOBAL(slagsy,SLAGSY)
+#define LAPACK_slagsy LAPACK_GLOBAL_SUFFIX(slagsy,SLAGSY)
 void LAPACK_slagsy(
     lapack_int const* n, lapack_int const* k,
     float const* D,
@@ -9445,7 +9696,7 @@ void LAPACK_slagsy(
     float* work,
     lapack_int* info );
 
-#define LAPACK_zlagsy LAPACK_GLOBAL(zlagsy,ZLAGSY)
+#define LAPACK_zlagsy LAPACK_GLOBAL_SUFFIX(zlagsy,ZLAGSY)
 void LAPACK_zlagsy(
     lapack_int const* n, lapack_int const* k,
     double const* D,
@@ -9453,11 +9704,11 @@ void LAPACK_zlagsy(
     lapack_complex_double* work,
     lapack_int* info );
 
-#define LAPACK_dlamch_base LAPACK_GLOBAL(dlamch,DLAMCH)
+#define LAPACK_dlamch_base LAPACK_GLOBAL_SUFFIX(dlamch,DLAMCH)
 double LAPACK_dlamch_base(
     char const* cmach
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9466,11 +9717,11 @@ double LAPACK_dlamch_base(
     #define LAPACK_dlamch(...) LAPACK_dlamch_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slamch_base LAPACK_GLOBAL(slamch,SLAMCH)
+#define LAPACK_slamch_base LAPACK_GLOBAL_SUFFIX(slamch,SLAMCH)
 lapack_float_return LAPACK_slamch_base(
     char const* cmach
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9479,14 +9730,14 @@ lapack_float_return LAPACK_slamch_base(
     #define LAPACK_slamch(...) LAPACK_slamch_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clangb_base LAPACK_GLOBAL(clangb,CLANGB)
+#define LAPACK_clangb_base LAPACK_GLOBAL_SUFFIX(clangb,CLANGB)
 lapack_float_return LAPACK_clangb_base(
     char const* norm,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     lapack_complex_float const* AB, lapack_int const* ldab,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9495,14 +9746,14 @@ lapack_float_return LAPACK_clangb_base(
     #define LAPACK_clangb(...) LAPACK_clangb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlangb_base LAPACK_GLOBAL(dlangb,DLANGB)
+#define LAPACK_dlangb_base LAPACK_GLOBAL_SUFFIX(dlangb,DLANGB)
 double LAPACK_dlangb_base(
     char const* norm,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     double const* AB, lapack_int const* ldab,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9511,14 +9762,14 @@ double LAPACK_dlangb_base(
     #define LAPACK_dlangb(...) LAPACK_dlangb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slangb_base LAPACK_GLOBAL(slangb,SLANGB)
+#define LAPACK_slangb_base LAPACK_GLOBAL_SUFFIX(slangb,SLANGB)
 lapack_float_return LAPACK_slangb_base(
     char const* norm,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     float const* AB, lapack_int const* ldab,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9527,14 +9778,14 @@ lapack_float_return LAPACK_slangb_base(
     #define LAPACK_slangb(...) LAPACK_slangb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlangb_base LAPACK_GLOBAL(zlangb,ZLANGB)
+#define LAPACK_zlangb_base LAPACK_GLOBAL_SUFFIX(zlangb,ZLANGB)
 double LAPACK_zlangb_base(
     char const* norm,
     lapack_int const* n, lapack_int const* kl, lapack_int const* ku,
     lapack_complex_double const* AB, lapack_int const* ldab,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9543,14 +9794,14 @@ double LAPACK_zlangb_base(
     #define LAPACK_zlangb(...) LAPACK_zlangb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clange_base LAPACK_GLOBAL(clange,CLANGE)
+#define LAPACK_clange_base LAPACK_GLOBAL_SUFFIX(clange,CLANGE)
 lapack_float_return LAPACK_clange_base(
     char const* norm,
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float const* A, lapack_int const* lda,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9559,14 +9810,14 @@ lapack_float_return LAPACK_clange_base(
     #define LAPACK_clange(...) LAPACK_clange_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlange_base LAPACK_GLOBAL(dlange,DLANGE)
+#define LAPACK_dlange_base LAPACK_GLOBAL_SUFFIX(dlange,DLANGE)
 double LAPACK_dlange_base(
     char const* norm,
     lapack_int const* m, lapack_int const* n,
     double const* A, lapack_int const* lda,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9575,14 +9826,14 @@ double LAPACK_dlange_base(
     #define LAPACK_dlange(...) LAPACK_dlange_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slange_base LAPACK_GLOBAL(slange,SLANGE)
+#define LAPACK_slange_base LAPACK_GLOBAL_SUFFIX(slange,SLANGE)
 lapack_float_return LAPACK_slange_base(
     char const* norm,
     lapack_int const* m, lapack_int const* n,
     float const* A, lapack_int const* lda,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9591,14 +9842,14 @@ lapack_float_return LAPACK_slange_base(
     #define LAPACK_slange(...) LAPACK_slange_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlange_base LAPACK_GLOBAL(zlange,ZLANGE)
+#define LAPACK_zlange_base LAPACK_GLOBAL_SUFFIX(zlange,ZLANGE)
 double LAPACK_zlange_base(
     char const* norm,
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double const* A, lapack_int const* lda,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9607,7 +9858,7 @@ double LAPACK_zlange_base(
     #define LAPACK_zlange(...) LAPACK_zlange_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clangt_base LAPACK_GLOBAL(clangt,CLANGT)
+#define LAPACK_clangt_base LAPACK_GLOBAL_SUFFIX(clangt,CLANGT)
 lapack_float_return LAPACK_clangt_base(
     char const* norm,
     lapack_int const* n,
@@ -9615,7 +9866,7 @@ lapack_float_return LAPACK_clangt_base(
     lapack_complex_float const* D,
     lapack_complex_float const* DU
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9624,7 +9875,7 @@ lapack_float_return LAPACK_clangt_base(
     #define LAPACK_clangt(...) LAPACK_clangt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlangt_base LAPACK_GLOBAL(dlangt,DLANGT)
+#define LAPACK_dlangt_base LAPACK_GLOBAL_SUFFIX(dlangt,DLANGT)
 double LAPACK_dlangt_base(
     char const* norm,
     lapack_int const* n,
@@ -9632,7 +9883,7 @@ double LAPACK_dlangt_base(
     double const* D,
     double const* DU
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9641,7 +9892,7 @@ double LAPACK_dlangt_base(
     #define LAPACK_dlangt(...) LAPACK_dlangt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slangt_base LAPACK_GLOBAL(slangt,SLANGT)
+#define LAPACK_slangt_base LAPACK_GLOBAL_SUFFIX(slangt,SLANGT)
 lapack_float_return LAPACK_slangt_base(
     char const* norm,
     lapack_int const* n,
@@ -9649,7 +9900,7 @@ lapack_float_return LAPACK_slangt_base(
     float const* D,
     float const* DU
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9658,7 +9909,7 @@ lapack_float_return LAPACK_slangt_base(
     #define LAPACK_slangt(...) LAPACK_slangt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlangt_base LAPACK_GLOBAL(zlangt,ZLANGT)
+#define LAPACK_zlangt_base LAPACK_GLOBAL_SUFFIX(zlangt,ZLANGT)
 double LAPACK_zlangt_base(
     char const* norm,
     lapack_int const* n,
@@ -9666,7 +9917,7 @@ double LAPACK_zlangt_base(
     lapack_complex_double const* D,
     lapack_complex_double const* DU
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9675,14 +9926,14 @@ double LAPACK_zlangt_base(
     #define LAPACK_zlangt(...) LAPACK_zlangt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clanhb_base LAPACK_GLOBAL(clanhb,CLANHB)
+#define LAPACK_clanhb_base LAPACK_GLOBAL_SUFFIX(clanhb,CLANHB)
 lapack_float_return LAPACK_clanhb_base(
     char const* norm, char const* uplo,
     lapack_int const* n, lapack_int const* k,
     lapack_complex_float const* AB, lapack_int const* ldab,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9691,14 +9942,14 @@ lapack_float_return LAPACK_clanhb_base(
     #define LAPACK_clanhb(...) LAPACK_clanhb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlanhb_base LAPACK_GLOBAL(zlanhb,ZLANHB)
+#define LAPACK_zlanhb_base LAPACK_GLOBAL_SUFFIX(zlanhb,ZLANHB)
 double LAPACK_zlanhb_base(
     char const* norm, char const* uplo,
     lapack_int const* n, lapack_int const* k,
     lapack_complex_double const* AB, lapack_int const* ldab,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9707,14 +9958,14 @@ double LAPACK_zlanhb_base(
     #define LAPACK_zlanhb(...) LAPACK_zlanhb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clanhe_base LAPACK_GLOBAL(clanhe,CLANHE)
+#define LAPACK_clanhe_base LAPACK_GLOBAL_SUFFIX(clanhe,CLANHE)
 lapack_float_return LAPACK_clanhe_base(
     char const* norm, char const* uplo,
     lapack_int const* n,
     lapack_complex_float const* A, lapack_int const* lda,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9723,14 +9974,14 @@ lapack_float_return LAPACK_clanhe_base(
     #define LAPACK_clanhe(...) LAPACK_clanhe_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlanhe_base LAPACK_GLOBAL(zlanhe,ZLANHE)
+#define LAPACK_zlanhe_base LAPACK_GLOBAL_SUFFIX(zlanhe,ZLANHE)
 double LAPACK_zlanhe_base(
     char const* norm, char const* uplo,
     lapack_int const* n,
     lapack_complex_double const* A, lapack_int const* lda,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9739,14 +9990,14 @@ double LAPACK_zlanhe_base(
     #define LAPACK_zlanhe(...) LAPACK_zlanhe_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clanhp_base LAPACK_GLOBAL(clanhp,CLANHP)
+#define LAPACK_clanhp_base LAPACK_GLOBAL_SUFFIX(clanhp,CLANHP)
 lapack_float_return LAPACK_clanhp_base(
     char const* norm, char const* uplo,
     lapack_int const* n,
     lapack_complex_float const* AP,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9755,14 +10006,14 @@ lapack_float_return LAPACK_clanhp_base(
     #define LAPACK_clanhp(...) LAPACK_clanhp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlanhp_base LAPACK_GLOBAL(zlanhp,ZLANHP)
+#define LAPACK_zlanhp_base LAPACK_GLOBAL_SUFFIX(zlanhp,ZLANHP)
 double LAPACK_zlanhp_base(
     char const* norm, char const* uplo,
     lapack_int const* n,
     lapack_complex_double const* AP,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9771,14 +10022,14 @@ double LAPACK_zlanhp_base(
     #define LAPACK_zlanhp(...) LAPACK_zlanhp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clanhs_base LAPACK_GLOBAL(clanhs,CLANHS)
+#define LAPACK_clanhs_base LAPACK_GLOBAL_SUFFIX(clanhs,CLANHS)
 lapack_float_return LAPACK_clanhs_base(
     char const* norm,
     lapack_int const* n,
     lapack_complex_float const* A, lapack_int const* lda,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9787,14 +10038,14 @@ lapack_float_return LAPACK_clanhs_base(
     #define LAPACK_clanhs(...) LAPACK_clanhs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlanhs_base LAPACK_GLOBAL(dlanhs,DLANHS)
+#define LAPACK_dlanhs_base LAPACK_GLOBAL_SUFFIX(dlanhs,DLANHS)
 double LAPACK_dlanhs_base(
     char const* norm,
     lapack_int const* n,
     double const* A, lapack_int const* lda,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9803,14 +10054,14 @@ double LAPACK_dlanhs_base(
     #define LAPACK_dlanhs(...) LAPACK_dlanhs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slanhs_base LAPACK_GLOBAL(slanhs,SLANHS)
+#define LAPACK_slanhs_base LAPACK_GLOBAL_SUFFIX(slanhs,SLANHS)
 lapack_float_return LAPACK_slanhs_base(
     char const* norm,
     lapack_int const* n,
     float const* A, lapack_int const* lda,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9819,14 +10070,14 @@ lapack_float_return LAPACK_slanhs_base(
     #define LAPACK_slanhs(...) LAPACK_slanhs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlanhs_base LAPACK_GLOBAL(zlanhs,ZLANHS)
+#define LAPACK_zlanhs_base LAPACK_GLOBAL_SUFFIX(zlanhs,ZLANHS)
 double LAPACK_zlanhs_base(
     char const* norm,
     lapack_int const* n,
     lapack_complex_double const* A, lapack_int const* lda,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9835,14 +10086,14 @@ double LAPACK_zlanhs_base(
     #define LAPACK_zlanhs(...) LAPACK_zlanhs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clanht_base LAPACK_GLOBAL(clanht,CLANHT)
+#define LAPACK_clanht_base LAPACK_GLOBAL_SUFFIX(clanht,CLANHT)
 lapack_float_return LAPACK_clanht_base(
     char const* norm,
     lapack_int const* n,
     float const* D,
     lapack_complex_float const* E
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9851,14 +10102,14 @@ lapack_float_return LAPACK_clanht_base(
     #define LAPACK_clanht(...) LAPACK_clanht_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlanht_base LAPACK_GLOBAL(zlanht,ZLANHT)
+#define LAPACK_zlanht_base LAPACK_GLOBAL_SUFFIX(zlanht,ZLANHT)
 double LAPACK_zlanht_base(
     char const* norm,
     lapack_int const* n,
     double const* D,
     lapack_complex_double const* E
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9867,14 +10118,14 @@ double LAPACK_zlanht_base(
     #define LAPACK_zlanht(...) LAPACK_zlanht_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clansb_base LAPACK_GLOBAL(clansb,CLANSB)
+#define LAPACK_clansb_base LAPACK_GLOBAL_SUFFIX(clansb,CLANSB)
 lapack_float_return LAPACK_clansb_base(
     char const* norm, char const* uplo,
     lapack_int const* n, lapack_int const* k,
     lapack_complex_float const* AB, lapack_int const* ldab,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9883,14 +10134,14 @@ lapack_float_return LAPACK_clansb_base(
     #define LAPACK_clansb(...) LAPACK_clansb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlansb_base LAPACK_GLOBAL(dlansb,DLANSB)
+#define LAPACK_dlansb_base LAPACK_GLOBAL_SUFFIX(dlansb,DLANSB)
 double LAPACK_dlansb_base(
     char const* norm, char const* uplo,
     lapack_int const* n, lapack_int const* k,
     double const* AB, lapack_int const* ldab,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9899,14 +10150,14 @@ double LAPACK_dlansb_base(
     #define LAPACK_dlansb(...) LAPACK_dlansb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slansb_base LAPACK_GLOBAL(slansb,SLANSB)
+#define LAPACK_slansb_base LAPACK_GLOBAL_SUFFIX(slansb,SLANSB)
 lapack_float_return LAPACK_slansb_base(
     char const* norm, char const* uplo,
     lapack_int const* n, lapack_int const* k,
     float const* AB, lapack_int const* ldab,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9915,14 +10166,14 @@ lapack_float_return LAPACK_slansb_base(
     #define LAPACK_slansb(...) LAPACK_slansb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlansb_base LAPACK_GLOBAL(zlansb,ZLANSB)
+#define LAPACK_zlansb_base LAPACK_GLOBAL_SUFFIX(zlansb,ZLANSB)
 double LAPACK_zlansb_base(
     char const* norm, char const* uplo,
     lapack_int const* n, lapack_int const* k,
     lapack_complex_double const* AB, lapack_int const* ldab,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9931,14 +10182,14 @@ double LAPACK_zlansb_base(
     #define LAPACK_zlansb(...) LAPACK_zlansb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clansp_base LAPACK_GLOBAL(clansp,CLANSP)
+#define LAPACK_clansp_base LAPACK_GLOBAL_SUFFIX(clansp,CLANSP)
 lapack_float_return LAPACK_clansp_base(
     char const* norm, char const* uplo,
     lapack_int const* n,
     lapack_complex_float const* AP,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9947,14 +10198,14 @@ lapack_float_return LAPACK_clansp_base(
     #define LAPACK_clansp(...) LAPACK_clansp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlansp_base LAPACK_GLOBAL(dlansp,DLANSP)
+#define LAPACK_dlansp_base LAPACK_GLOBAL_SUFFIX(dlansp,DLANSP)
 double LAPACK_dlansp_base(
     char const* norm, char const* uplo,
     lapack_int const* n,
     double const* AP,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9963,14 +10214,14 @@ double LAPACK_dlansp_base(
     #define LAPACK_dlansp(...) LAPACK_dlansp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slansp_base LAPACK_GLOBAL(slansp,SLANSP)
+#define LAPACK_slansp_base LAPACK_GLOBAL_SUFFIX(slansp,SLANSP)
 lapack_float_return LAPACK_slansp_base(
     char const* norm, char const* uplo,
     lapack_int const* n,
     float const* AP,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9979,14 +10230,14 @@ lapack_float_return LAPACK_slansp_base(
     #define LAPACK_slansp(...) LAPACK_slansp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlansp_base LAPACK_GLOBAL(zlansp,ZLANSP)
+#define LAPACK_zlansp_base LAPACK_GLOBAL_SUFFIX(zlansp,ZLANSP)
 double LAPACK_zlansp_base(
     char const* norm, char const* uplo,
     lapack_int const* n,
     lapack_complex_double const* AP,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -9995,14 +10246,14 @@ double LAPACK_zlansp_base(
     #define LAPACK_zlansp(...) LAPACK_zlansp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlanst_base LAPACK_GLOBAL(dlanst,DLANST)
+#define LAPACK_dlanst_base LAPACK_GLOBAL_SUFFIX(dlanst,DLANST)
 double LAPACK_dlanst_base(
     char const* norm,
     lapack_int const* n,
     double const* D,
     double const* E
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10011,14 +10262,14 @@ double LAPACK_dlanst_base(
     #define LAPACK_dlanst(...) LAPACK_dlanst_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slanst_base LAPACK_GLOBAL(slanst,SLANST)
+#define LAPACK_slanst_base LAPACK_GLOBAL_SUFFIX(slanst,SLANST)
 lapack_float_return LAPACK_slanst_base(
     char const* norm,
     lapack_int const* n,
     float const* D,
     float const* E
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10027,14 +10278,14 @@ lapack_float_return LAPACK_slanst_base(
     #define LAPACK_slanst(...) LAPACK_slanst_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clansy_base LAPACK_GLOBAL(clansy,CLANSY)
+#define LAPACK_clansy_base LAPACK_GLOBAL_SUFFIX(clansy,CLANSY)
 lapack_float_return LAPACK_clansy_base(
     char const* norm, char const* uplo,
     lapack_int const* n,
     lapack_complex_float const* A, lapack_int const* lda,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10043,14 +10294,14 @@ lapack_float_return LAPACK_clansy_base(
     #define LAPACK_clansy(...) LAPACK_clansy_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlansy_base LAPACK_GLOBAL(dlansy,DLANSY)
+#define LAPACK_dlansy_base LAPACK_GLOBAL_SUFFIX(dlansy,DLANSY)
 double LAPACK_dlansy_base(
     char const* norm, char const* uplo,
     lapack_int const* n,
     double const* A, lapack_int const* lda,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10059,14 +10310,14 @@ double LAPACK_dlansy_base(
     #define LAPACK_dlansy(...) LAPACK_dlansy_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slansy_base LAPACK_GLOBAL(slansy,SLANSY)
+#define LAPACK_slansy_base LAPACK_GLOBAL_SUFFIX(slansy,SLANSY)
 lapack_float_return LAPACK_slansy_base(
     char const* norm, char const* uplo,
     lapack_int const* n,
     float const* A, lapack_int const* lda,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10075,14 +10326,14 @@ lapack_float_return LAPACK_slansy_base(
     #define LAPACK_slansy(...) LAPACK_slansy_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlansy_base LAPACK_GLOBAL(zlansy,ZLANSY)
+#define LAPACK_zlansy_base LAPACK_GLOBAL_SUFFIX(zlansy,ZLANSY)
 double LAPACK_zlansy_base(
     char const* norm, char const* uplo,
     lapack_int const* n,
     lapack_complex_double const* A, lapack_int const* lda,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10091,14 +10342,14 @@ double LAPACK_zlansy_base(
     #define LAPACK_zlansy(...) LAPACK_zlansy_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clantb_base LAPACK_GLOBAL(clantb,CLANTB)
+#define LAPACK_clantb_base LAPACK_GLOBAL_SUFFIX(clantb,CLANTB)
 lapack_float_return LAPACK_clantb_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n, lapack_int const* k,
     lapack_complex_float const* AB, lapack_int const* ldab,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10107,14 +10358,14 @@ lapack_float_return LAPACK_clantb_base(
     #define LAPACK_clantb(...) LAPACK_clantb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlantb_base LAPACK_GLOBAL(dlantb,DLANTB)
+#define LAPACK_dlantb_base LAPACK_GLOBAL_SUFFIX(dlantb,DLANTB)
 double LAPACK_dlantb_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n, lapack_int const* k,
     double const* AB, lapack_int const* ldab,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10123,14 +10374,14 @@ double LAPACK_dlantb_base(
     #define LAPACK_dlantb(...) LAPACK_dlantb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slantb_base LAPACK_GLOBAL(slantb,SLANTB)
+#define LAPACK_slantb_base LAPACK_GLOBAL_SUFFIX(slantb,SLANTB)
 lapack_float_return LAPACK_slantb_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n, lapack_int const* k,
     float const* AB, lapack_int const* ldab,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10139,14 +10390,14 @@ lapack_float_return LAPACK_slantb_base(
     #define LAPACK_slantb(...) LAPACK_slantb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlantb_base LAPACK_GLOBAL(zlantb,ZLANTB)
+#define LAPACK_zlantb_base LAPACK_GLOBAL_SUFFIX(zlantb,ZLANTB)
 double LAPACK_zlantb_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n, lapack_int const* k,
     lapack_complex_double const* AB, lapack_int const* ldab,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10155,14 +10406,14 @@ double LAPACK_zlantb_base(
     #define LAPACK_zlantb(...) LAPACK_zlantb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clantp_base LAPACK_GLOBAL(clantp,CLANTP)
+#define LAPACK_clantp_base LAPACK_GLOBAL_SUFFIX(clantp,CLANTP)
 lapack_float_return LAPACK_clantp_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n,
     lapack_complex_float const* AP,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10171,14 +10422,14 @@ lapack_float_return LAPACK_clantp_base(
     #define LAPACK_clantp(...) LAPACK_clantp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlantp_base LAPACK_GLOBAL(dlantp,DLANTP)
+#define LAPACK_dlantp_base LAPACK_GLOBAL_SUFFIX(dlantp,DLANTP)
 double LAPACK_dlantp_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n,
     double const* AP,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10187,14 +10438,14 @@ double LAPACK_dlantp_base(
     #define LAPACK_dlantp(...) LAPACK_dlantp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slantp_base LAPACK_GLOBAL(slantp,SLANTP)
+#define LAPACK_slantp_base LAPACK_GLOBAL_SUFFIX(slantp,SLANTP)
 lapack_float_return LAPACK_slantp_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n,
     float const* AP,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10203,14 +10454,14 @@ lapack_float_return LAPACK_slantp_base(
     #define LAPACK_slantp(...) LAPACK_slantp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlantp_base LAPACK_GLOBAL(zlantp,ZLANTP)
+#define LAPACK_zlantp_base LAPACK_GLOBAL_SUFFIX(zlantp,ZLANTP)
 double LAPACK_zlantp_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n,
     lapack_complex_double const* AP,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10219,14 +10470,14 @@ double LAPACK_zlantp_base(
     #define LAPACK_zlantp(...) LAPACK_zlantp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clantr_base LAPACK_GLOBAL(clantr,CLANTR)
+#define LAPACK_clantr_base LAPACK_GLOBAL_SUFFIX(clantr,CLANTR)
 lapack_float_return LAPACK_clantr_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float const* A, lapack_int const* lda,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10235,14 +10486,14 @@ lapack_float_return LAPACK_clantr_base(
     #define LAPACK_clantr(...) LAPACK_clantr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlantr_base LAPACK_GLOBAL(dlantr,DLANTR)
+#define LAPACK_dlantr_base LAPACK_GLOBAL_SUFFIX(dlantr,DLANTR)
 double LAPACK_dlantr_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* m, lapack_int const* n,
     double const* A, lapack_int const* lda,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10251,14 +10502,14 @@ double LAPACK_dlantr_base(
     #define LAPACK_dlantr(...) LAPACK_dlantr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slantr_base LAPACK_GLOBAL(slantr,SLANTR)
+#define LAPACK_slantr_base LAPACK_GLOBAL_SUFFIX(slantr,SLANTR)
 lapack_float_return LAPACK_slantr_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* m, lapack_int const* n,
     float const* A, lapack_int const* lda,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10267,14 +10518,14 @@ lapack_float_return LAPACK_slantr_base(
     #define LAPACK_slantr(...) LAPACK_slantr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlantr_base LAPACK_GLOBAL(zlantr,ZLANTR)
+#define LAPACK_zlantr_base LAPACK_GLOBAL_SUFFIX(zlantr,ZLANTR)
 double LAPACK_zlantr_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double const* A, lapack_int const* lda,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10283,69 +10534,69 @@ double LAPACK_zlantr_base(
     #define LAPACK_zlantr(...) LAPACK_zlantr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clapmr LAPACK_GLOBAL(clapmr,CLAPMR)
+#define LAPACK_clapmr LAPACK_GLOBAL_SUFFIX(clapmr,CLAPMR)
 void LAPACK_clapmr(
     lapack_logical const* forwrd, lapack_int const* m, lapack_int const* n,
     lapack_complex_float* X, lapack_int const* ldx, lapack_int* K );
 
-#define LAPACK_dlapmr LAPACK_GLOBAL(dlapmr,DLAPMR)
+#define LAPACK_dlapmr LAPACK_GLOBAL_SUFFIX(dlapmr,DLAPMR)
 void LAPACK_dlapmr(
     lapack_logical const* forwrd, lapack_int const* m, lapack_int const* n,
     double* X, lapack_int const* ldx, lapack_int* K );
 
-#define LAPACK_slapmr LAPACK_GLOBAL(slapmr,SLAPMR)
+#define LAPACK_slapmr LAPACK_GLOBAL_SUFFIX(slapmr,SLAPMR)
 void LAPACK_slapmr(
     lapack_logical const* forwrd, lapack_int const* m, lapack_int const* n,
     float* X, lapack_int const* ldx, lapack_int* K );
 
-#define LAPACK_zlapmr LAPACK_GLOBAL(zlapmr,ZLAPMR)
+#define LAPACK_zlapmr LAPACK_GLOBAL_SUFFIX(zlapmr,ZLAPMR)
 void LAPACK_zlapmr(
     lapack_logical const* forwrd, lapack_int const* m, lapack_int const* n,
     lapack_complex_double* X, lapack_int const* ldx, lapack_int* K );
 
-#define LAPACK_clapmt LAPACK_GLOBAL(clapmt,CLAPMT)
+#define LAPACK_clapmt LAPACK_GLOBAL_SUFFIX(clapmt,CLAPMT)
 void LAPACK_clapmt(
     lapack_logical const* forwrd, lapack_int const* m, lapack_int const* n,
     lapack_complex_float* X, lapack_int const* ldx, lapack_int* K );
 
-#define LAPACK_dlapmt LAPACK_GLOBAL(dlapmt,DLAPMT)
+#define LAPACK_dlapmt LAPACK_GLOBAL_SUFFIX(dlapmt,DLAPMT)
 void LAPACK_dlapmt(
     lapack_logical const* forwrd, lapack_int const* m, lapack_int const* n,
     double* X, lapack_int const* ldx, lapack_int* K );
 
-#define LAPACK_slapmt LAPACK_GLOBAL(slapmt,SLAPMT)
+#define LAPACK_slapmt LAPACK_GLOBAL_SUFFIX(slapmt,SLAPMT)
 void LAPACK_slapmt(
     lapack_logical const* forwrd, lapack_int const* m, lapack_int const* n,
     float* X, lapack_int const* ldx, lapack_int* K );
 
-#define LAPACK_zlapmt LAPACK_GLOBAL(zlapmt,ZLAPMT)
+#define LAPACK_zlapmt LAPACK_GLOBAL_SUFFIX(zlapmt,ZLAPMT)
 void LAPACK_zlapmt(
     lapack_logical const* forwrd, lapack_int const* m, lapack_int const* n,
     lapack_complex_double* X, lapack_int const* ldx, lapack_int* K );
 
-#define LAPACK_dlapy2 LAPACK_GLOBAL(dlapy2,DLAPY2)
+#define LAPACK_dlapy2 LAPACK_GLOBAL_SUFFIX(dlapy2,DLAPY2)
 double LAPACK_dlapy2(
     double const* x,
     double const* y );
 
-#define LAPACK_slapy2 LAPACK_GLOBAL(slapy2,SLAPY2)
+#define LAPACK_slapy2 LAPACK_GLOBAL_SUFFIX(slapy2,SLAPY2)
 lapack_float_return LAPACK_slapy2(
     float const* x,
     float const* y );
 
-#define LAPACK_dlapy3 LAPACK_GLOBAL(dlapy3,DLAPY3)
+#define LAPACK_dlapy3 LAPACK_GLOBAL_SUFFIX(dlapy3,DLAPY3)
 double LAPACK_dlapy3(
     double const* x,
     double const* y,
     double const* z );
 
-#define LAPACK_slapy3 LAPACK_GLOBAL(slapy3,SLAPY3)
+#define LAPACK_slapy3 LAPACK_GLOBAL_SUFFIX(slapy3,SLAPY3)
 lapack_float_return LAPACK_slapy3(
     float const* x,
     float const* y,
     float const* z );
 
-#define LAPACK_clarcm LAPACK_GLOBAL(clarcm,CLARCM)
+#define LAPACK_clarcm LAPACK_GLOBAL_SUFFIX(clarcm,CLARCM)
 void LAPACK_clarcm(
     lapack_int const* m, lapack_int const* n,
     float const* A, lapack_int const* lda,
@@ -10353,7 +10604,7 @@ void LAPACK_clarcm(
     lapack_complex_float* C, lapack_int const* ldc,
     float* rwork );
 
-#define LAPACK_zlarcm LAPACK_GLOBAL(zlarcm,ZLARCM)
+#define LAPACK_zlarcm LAPACK_GLOBAL_SUFFIX(zlarcm,ZLARCM)
 void LAPACK_zlarcm(
     lapack_int const* m, lapack_int const* n,
     double const* A, lapack_int const* lda,
@@ -10361,7 +10612,7 @@ void LAPACK_zlarcm(
     lapack_complex_double* C, lapack_int const* ldc,
     double* rwork );
 
-#define LAPACK_clarf_base LAPACK_GLOBAL(clarf,CLARF)
+#define LAPACK_clarf_base LAPACK_GLOBAL_SUFFIX(clarf,CLARF)
 void LAPACK_clarf_base(
     char const* side,
     lapack_int const* m, lapack_int const* n,
@@ -10370,7 +10621,7 @@ void LAPACK_clarf_base(
     lapack_complex_float* C, lapack_int const* ldc,
     lapack_complex_float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10379,7 +10630,7 @@ void LAPACK_clarf_base(
     #define LAPACK_clarf(...) LAPACK_clarf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlarf_base LAPACK_GLOBAL(dlarf,DLARF)
+#define LAPACK_dlarf_base LAPACK_GLOBAL_SUFFIX(dlarf,DLARF)
 void LAPACK_dlarf_base(
     char const* side,
     lapack_int const* m, lapack_int const* n,
@@ -10388,7 +10639,7 @@ void LAPACK_dlarf_base(
     double* C, lapack_int const* ldc,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10397,7 +10648,7 @@ void LAPACK_dlarf_base(
     #define LAPACK_dlarf(...) LAPACK_dlarf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slarf_base LAPACK_GLOBAL(slarf,SLARF)
+#define LAPACK_slarf_base LAPACK_GLOBAL_SUFFIX(slarf,SLARF)
 void LAPACK_slarf_base(
     char const* side,
     lapack_int const* m, lapack_int const* n,
@@ -10406,7 +10657,7 @@ void LAPACK_slarf_base(
     float* C, lapack_int const* ldc,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10415,7 +10666,7 @@ void LAPACK_slarf_base(
     #define LAPACK_slarf(...) LAPACK_slarf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlarf_base LAPACK_GLOBAL(zlarf,ZLARF)
+#define LAPACK_zlarf_base LAPACK_GLOBAL_SUFFIX(zlarf,ZLARF)
 void LAPACK_zlarf_base(
     char const* side,
     lapack_int const* m, lapack_int const* n,
@@ -10424,7 +10675,7 @@ void LAPACK_zlarf_base(
     lapack_complex_double* C, lapack_int const* ldc,
     lapack_complex_double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10433,7 +10684,7 @@ void LAPACK_zlarf_base(
     #define LAPACK_zlarf(...) LAPACK_zlarf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clarfb_base LAPACK_GLOBAL(clarfb,CLARFB)
+#define LAPACK_clarfb_base LAPACK_GLOBAL_SUFFIX(clarfb,CLARFB)
 void LAPACK_clarfb_base(
     char const* side, char const* trans, char const* direct, char const* storev,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -10442,7 +10693,7 @@ void LAPACK_clarfb_base(
     lapack_complex_float* C, lapack_int const* ldc,
     lapack_complex_float* work, lapack_int const* ldwork
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10451,7 +10702,7 @@ void LAPACK_clarfb_base(
     #define LAPACK_clarfb(...) LAPACK_clarfb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlarfb_base LAPACK_GLOBAL(dlarfb,DLARFB)
+#define LAPACK_dlarfb_base LAPACK_GLOBAL_SUFFIX(dlarfb,DLARFB)
 void LAPACK_dlarfb_base(
     char const* side, char const* trans, char const* direct, char const* storev,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -10460,7 +10711,7 @@ void LAPACK_dlarfb_base(
     double* C, lapack_int const* ldc,
     double* work, lapack_int const* ldwork
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10469,7 +10720,7 @@ void LAPACK_dlarfb_base(
     #define LAPACK_dlarfb(...) LAPACK_dlarfb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slarfb_base LAPACK_GLOBAL(slarfb,SLARFB)
+#define LAPACK_slarfb_base LAPACK_GLOBAL_SUFFIX(slarfb,SLARFB)
 void LAPACK_slarfb_base(
     char const* side, char const* trans, char const* direct, char const* storev,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -10478,7 +10729,7 @@ void LAPACK_slarfb_base(
     float* C, lapack_int const* ldc,
     float* work, lapack_int const* ldwork
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10487,7 +10738,7 @@ void LAPACK_slarfb_base(
     #define LAPACK_slarfb(...) LAPACK_slarfb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlarfb_base LAPACK_GLOBAL(zlarfb,ZLARFB)
+#define LAPACK_zlarfb_base LAPACK_GLOBAL_SUFFIX(zlarfb,ZLARFB)
 void LAPACK_zlarfb_base(
     char const* side, char const* trans, char const* direct, char const* storev,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -10496,7 +10747,7 @@ void LAPACK_zlarfb_base(
     lapack_complex_double* C, lapack_int const* ldc,
     lapack_complex_double* work, lapack_int const* ldwork
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10505,35 +10756,35 @@ void LAPACK_zlarfb_base(
     #define LAPACK_zlarfb(...) LAPACK_zlarfb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clarfg LAPACK_GLOBAL(clarfg,CLARFG)
+#define LAPACK_clarfg LAPACK_GLOBAL_SUFFIX(clarfg,CLARFG)
 void LAPACK_clarfg(
     lapack_int const* n,
     lapack_complex_float* alpha,
     lapack_complex_float* X, lapack_int const* incx,
     lapack_complex_float* tau );
 
-#define LAPACK_dlarfg LAPACK_GLOBAL(dlarfg,DLARFG)
+#define LAPACK_dlarfg LAPACK_GLOBAL_SUFFIX(dlarfg,DLARFG)
 void LAPACK_dlarfg(
     lapack_int const* n,
     double* alpha,
     double* X, lapack_int const* incx,
     double* tau );
 
-#define LAPACK_slarfg LAPACK_GLOBAL(slarfg,SLARFG)
+#define LAPACK_slarfg LAPACK_GLOBAL_SUFFIX(slarfg,SLARFG)
 void LAPACK_slarfg(
     lapack_int const* n,
     float* alpha,
     float* X, lapack_int const* incx,
     float* tau );
 
-#define LAPACK_zlarfg LAPACK_GLOBAL(zlarfg,ZLARFG)
+#define LAPACK_zlarfg LAPACK_GLOBAL_SUFFIX(zlarfg,ZLARFG)
 void LAPACK_zlarfg(
     lapack_int const* n,
     lapack_complex_double* alpha,
     lapack_complex_double* X, lapack_int const* incx,
     lapack_complex_double* tau );
 
-#define LAPACK_clarft_base LAPACK_GLOBAL(clarft,CLARFT)
+#define LAPACK_clarft_base LAPACK_GLOBAL_SUFFIX(clarft,CLARFT)
 void LAPACK_clarft_base(
     char const* direct, char const* storev,
     lapack_int const* n, lapack_int const* k,
@@ -10541,7 +10792,7 @@ void LAPACK_clarft_base(
     lapack_complex_float const* tau,
     lapack_complex_float* T, lapack_int const* ldt
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10550,7 +10801,7 @@ void LAPACK_clarft_base(
     #define LAPACK_clarft(...) LAPACK_clarft_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlarft_base LAPACK_GLOBAL(dlarft,DLARFT)
+#define LAPACK_dlarft_base LAPACK_GLOBAL_SUFFIX(dlarft,DLARFT)
 void LAPACK_dlarft_base(
     char const* direct, char const* storev,
     lapack_int const* n, lapack_int const* k,
@@ -10558,7 +10809,7 @@ void LAPACK_dlarft_base(
     double const* tau,
     double* T, lapack_int const* ldt
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10567,7 +10818,7 @@ void LAPACK_dlarft_base(
     #define LAPACK_dlarft(...) LAPACK_dlarft_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slarft_base LAPACK_GLOBAL(slarft,SLARFT)
+#define LAPACK_slarft_base LAPACK_GLOBAL_SUFFIX(slarft,SLARFT)
 void LAPACK_slarft_base(
     char const* direct, char const* storev,
     lapack_int const* n, lapack_int const* k,
@@ -10575,7 +10826,7 @@ void LAPACK_slarft_base(
     float const* tau,
     float* T, lapack_int const* ldt
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10584,7 +10835,7 @@ void LAPACK_slarft_base(
     #define LAPACK_slarft(...) LAPACK_slarft_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlarft_base LAPACK_GLOBAL(zlarft,ZLARFT)
+#define LAPACK_zlarft_base LAPACK_GLOBAL_SUFFIX(zlarft,ZLARFT)
 void LAPACK_zlarft_base(
     char const* direct, char const* storev,
     lapack_int const* n, lapack_int const* k,
@@ -10592,7 +10843,7 @@ void LAPACK_zlarft_base(
     lapack_complex_double const* tau,
     lapack_complex_double* T, lapack_int const* ldt
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10601,7 +10852,7 @@ void LAPACK_zlarft_base(
     #define LAPACK_zlarft(...) LAPACK_zlarft_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clarfx_base LAPACK_GLOBAL(clarfx,CLARFX)
+#define LAPACK_clarfx_base LAPACK_GLOBAL_SUFFIX(clarfx,CLARFX)
 void LAPACK_clarfx_base(
     char const* side,
     lapack_int const* m, lapack_int const* n,
@@ -10610,7 +10861,7 @@ void LAPACK_clarfx_base(
     lapack_complex_float* C, lapack_int const* ldc,
     lapack_complex_float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10619,7 +10870,7 @@ void LAPACK_clarfx_base(
     #define LAPACK_clarfx(...) LAPACK_clarfx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlarfx_base LAPACK_GLOBAL(dlarfx,DLARFX)
+#define LAPACK_dlarfx_base LAPACK_GLOBAL_SUFFIX(dlarfx,DLARFX)
 void LAPACK_dlarfx_base(
     char const* side,
     lapack_int const* m, lapack_int const* n,
@@ -10628,7 +10879,7 @@ void LAPACK_dlarfx_base(
     double* C, lapack_int const* ldc,
     double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10637,7 +10888,7 @@ void LAPACK_dlarfx_base(
     #define LAPACK_dlarfx(...) LAPACK_dlarfx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slarfx_base LAPACK_GLOBAL(slarfx,SLARFX)
+#define LAPACK_slarfx_base LAPACK_GLOBAL_SUFFIX(slarfx,SLARFX)
 void LAPACK_slarfx_base(
     char const* side,
     lapack_int const* m, lapack_int const* n,
@@ -10646,7 +10897,7 @@ void LAPACK_slarfx_base(
     float* C, lapack_int const* ldc,
     float* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10655,7 +10906,7 @@ void LAPACK_slarfx_base(
     #define LAPACK_slarfx(...) LAPACK_slarfx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlarfx_base LAPACK_GLOBAL(zlarfx,ZLARFX)
+#define LAPACK_zlarfx_base LAPACK_GLOBAL_SUFFIX(zlarfx,ZLARFX)
 void LAPACK_zlarfx_base(
     char const* side,
     lapack_int const* m, lapack_int const* n,
@@ -10664,7 +10915,7 @@ void LAPACK_zlarfx_base(
     lapack_complex_double* C, lapack_int const* ldc,
     lapack_complex_double* work
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10673,27 +10924,27 @@ void LAPACK_zlarfx_base(
     #define LAPACK_zlarfx(...) LAPACK_zlarfx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clarnv LAPACK_GLOBAL(clarnv,CLARNV)
+#define LAPACK_clarnv LAPACK_GLOBAL_SUFFIX(clarnv,CLARNV)
 void LAPACK_clarnv(
     lapack_int const* idist, lapack_int* iseed, lapack_int const* n,
     lapack_complex_float* X );
 
-#define LAPACK_dlarnv LAPACK_GLOBAL(dlarnv,DLARNV)
+#define LAPACK_dlarnv LAPACK_GLOBAL_SUFFIX(dlarnv,DLARNV)
 void LAPACK_dlarnv(
     lapack_int const* idist, lapack_int* iseed, lapack_int const* n,
     double* X );
 
-#define LAPACK_slarnv LAPACK_GLOBAL(slarnv,SLARNV)
+#define LAPACK_slarnv LAPACK_GLOBAL_SUFFIX(slarnv,SLARNV)
 void LAPACK_slarnv(
     lapack_int const* idist, lapack_int* iseed, lapack_int const* n,
     float* X );
 
-#define LAPACK_zlarnv LAPACK_GLOBAL(zlarnv,ZLARNV)
+#define LAPACK_zlarnv LAPACK_GLOBAL_SUFFIX(zlarnv,ZLARNV)
 void LAPACK_zlarnv(
     lapack_int const* idist, lapack_int* iseed, lapack_int const* n,
     lapack_complex_double* X );
 
-#define LAPACK_dlartgp LAPACK_GLOBAL(dlartgp,DLARTGP)
+#define LAPACK_dlartgp LAPACK_GLOBAL_SUFFIX(dlartgp,DLARTGP)
 void LAPACK_dlartgp(
     double const* f,
     double const* g,
@@ -10701,7 +10952,7 @@ void LAPACK_dlartgp(
     double* sn,
     double* r );
 
-#define LAPACK_slartgp LAPACK_GLOBAL(slartgp,SLARTGP)
+#define LAPACK_slartgp LAPACK_GLOBAL_SUFFIX(slartgp,SLARTGP)
 void LAPACK_slartgp(
     float const* f,
     float const* g,
@@ -10709,7 +10960,7 @@ void LAPACK_slartgp(
     float* sn,
     float* r );
 
-#define LAPACK_dlartgs LAPACK_GLOBAL(dlartgs,DLARTGS)
+#define LAPACK_dlartgs LAPACK_GLOBAL_SUFFIX(dlartgs,DLARTGS)
 void LAPACK_dlartgs(
     double const* x,
     double const* y,
@@ -10717,7 +10968,7 @@ void LAPACK_dlartgs(
     double* cs,
     double* sn );
 
-#define LAPACK_slartgs LAPACK_GLOBAL(slartgs,SLARTGS)
+#define LAPACK_slartgs LAPACK_GLOBAL_SUFFIX(slartgs,SLARTGS)
 void LAPACK_slartgs(
     float const* x,
     float const* y,
@@ -10725,7 +10976,7 @@ void LAPACK_slartgs(
     float* cs,
     float* sn );
 
-#define LAPACK_clascl_base LAPACK_GLOBAL(clascl,CLASCL)
+#define LAPACK_clascl_base LAPACK_GLOBAL_SUFFIX(clascl,CLASCL)
 void LAPACK_clascl_base(
     char const* type,
     lapack_int const* kl, lapack_int const* ku,
@@ -10734,7 +10985,7 @@ void LAPACK_clascl_base(
     lapack_complex_float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10743,7 +10994,7 @@ void LAPACK_clascl_base(
     #define LAPACK_clascl(...) LAPACK_clascl_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlascl_base LAPACK_GLOBAL(dlascl,DLASCL)
+#define LAPACK_dlascl_base LAPACK_GLOBAL_SUFFIX(dlascl,DLASCL)
 void LAPACK_dlascl_base(
     char const* type,
     lapack_int const* kl, lapack_int const* ku,
@@ -10752,7 +11003,7 @@ void LAPACK_dlascl_base(
     double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10761,7 +11012,7 @@ void LAPACK_dlascl_base(
     #define LAPACK_dlascl(...) LAPACK_dlascl_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slascl_base LAPACK_GLOBAL(slascl,SLASCL)
+#define LAPACK_slascl_base LAPACK_GLOBAL_SUFFIX(slascl,SLASCL)
 void LAPACK_slascl_base(
     char const* type,
     lapack_int const* kl, lapack_int const* ku,
@@ -10770,7 +11021,7 @@ void LAPACK_slascl_base(
     float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10779,7 +11030,7 @@ void LAPACK_slascl_base(
     #define LAPACK_slascl(...) LAPACK_slascl_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlascl_base LAPACK_GLOBAL(zlascl,ZLASCL)
+#define LAPACK_zlascl_base LAPACK_GLOBAL_SUFFIX(zlascl,ZLASCL)
 void LAPACK_zlascl_base(
     char const* type,
     lapack_int const* kl, lapack_int const* ku,
@@ -10788,7 +11039,7 @@ void LAPACK_zlascl_base(
     lapack_complex_double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10797,7 +11048,7 @@ void LAPACK_zlascl_base(
     #define LAPACK_zlascl(...) LAPACK_zlascl_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_claset_base LAPACK_GLOBAL(claset,CLASET)
+#define LAPACK_claset_base LAPACK_GLOBAL_SUFFIX(claset,CLASET)
 void LAPACK_claset_base(
     char const* uplo,
     lapack_int const* m, lapack_int const* n,
@@ -10805,7 +11056,7 @@ void LAPACK_claset_base(
     lapack_complex_float const* beta,
     lapack_complex_float* A, lapack_int const* lda
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10814,7 +11065,7 @@ void LAPACK_claset_base(
     #define LAPACK_claset(...) LAPACK_claset_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlaset_base LAPACK_GLOBAL(dlaset,DLASET)
+#define LAPACK_dlaset_base LAPACK_GLOBAL_SUFFIX(dlaset,DLASET)
 void LAPACK_dlaset_base(
     char const* uplo,
     lapack_int const* m, lapack_int const* n,
@@ -10822,7 +11073,7 @@ void LAPACK_dlaset_base(
     double const* beta,
     double* A, lapack_int const* lda
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10831,7 +11082,7 @@ void LAPACK_dlaset_base(
     #define LAPACK_dlaset(...) LAPACK_dlaset_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slaset_base LAPACK_GLOBAL(slaset,SLASET)
+#define LAPACK_slaset_base LAPACK_GLOBAL_SUFFIX(slaset,SLASET)
 void LAPACK_slaset_base(
     char const* uplo,
     lapack_int const* m, lapack_int const* n,
@@ -10839,7 +11090,7 @@ void LAPACK_slaset_base(
     float const* beta,
     float* A, lapack_int const* lda
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10848,7 +11099,7 @@ void LAPACK_slaset_base(
     #define LAPACK_slaset(...) LAPACK_slaset_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlaset_base LAPACK_GLOBAL(zlaset,ZLASET)
+#define LAPACK_zlaset_base LAPACK_GLOBAL_SUFFIX(zlaset,ZLASET)
 void LAPACK_zlaset_base(
     char const* uplo,
     lapack_int const* m, lapack_int const* n,
@@ -10856,7 +11107,7 @@ void LAPACK_zlaset_base(
     lapack_complex_double const* beta,
     lapack_complex_double* A, lapack_int const* lda
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10865,14 +11116,14 @@ void LAPACK_zlaset_base(
     #define LAPACK_zlaset(...) LAPACK_zlaset_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlasrt_base LAPACK_GLOBAL(dlasrt,DLASRT)
+#define LAPACK_dlasrt_base LAPACK_GLOBAL_SUFFIX(dlasrt,DLASRT)
 void LAPACK_dlasrt_base(
     char const* id,
     lapack_int const* n,
     double* D,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10881,14 +11132,14 @@ void LAPACK_dlasrt_base(
     #define LAPACK_dlasrt(...) LAPACK_dlasrt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slasrt_base LAPACK_GLOBAL(slasrt,SLASRT)
+#define LAPACK_slasrt_base LAPACK_GLOBAL_SUFFIX(slasrt,SLASRT)
 void LAPACK_slasrt_base(
     char const* id,
     lapack_int const* n,
     float* D,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10897,55 +11148,55 @@ void LAPACK_slasrt_base(
     #define LAPACK_slasrt(...) LAPACK_slasrt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_classq LAPACK_GLOBAL(classq,CLASSQ)
+#define LAPACK_classq LAPACK_GLOBAL_SUFFIX(classq,CLASSQ)
 void LAPACK_classq(
     lapack_int const* n,
     lapack_complex_float const* X, lapack_int const* incx,
     float* scale,
     float* sumsq );
 
-#define LAPACK_dlassq LAPACK_GLOBAL(dlassq,DLASSQ)
+#define LAPACK_dlassq LAPACK_GLOBAL_SUFFIX(dlassq,DLASSQ)
 void LAPACK_dlassq(
     lapack_int const* n,
     double const* X, lapack_int const* incx,
     double* scale,
     double* sumsq );
 
-#define LAPACK_slassq LAPACK_GLOBAL(slassq,SLASSQ)
+#define LAPACK_slassq LAPACK_GLOBAL_SUFFIX(slassq,SLASSQ)
 void LAPACK_slassq(
     lapack_int const* n,
     float const* X, lapack_int const* incx,
     float* scale,
     float* sumsq );
 
-#define LAPACK_zlassq LAPACK_GLOBAL(zlassq,ZLASSQ)
+#define LAPACK_zlassq LAPACK_GLOBAL_SUFFIX(zlassq,ZLASSQ)
 void LAPACK_zlassq(
     lapack_int const* n,
     lapack_complex_double const* X, lapack_int const* incx,
     double* scale,
     double* sumsq );
 
-#define LAPACK_claswp LAPACK_GLOBAL(claswp,CLASWP)
+#define LAPACK_claswp LAPACK_GLOBAL_SUFFIX(claswp,CLASWP)
 void LAPACK_claswp(
     lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda, lapack_int const* k1, lapack_int const* k2, lapack_int const* ipiv, lapack_int const* incx );
 
-#define LAPACK_dlaswp LAPACK_GLOBAL(dlaswp,DLASWP)
+#define LAPACK_dlaswp LAPACK_GLOBAL_SUFFIX(dlaswp,DLASWP)
 void LAPACK_dlaswp(
     lapack_int const* n,
     double* A, lapack_int const* lda, lapack_int const* k1, lapack_int const* k2, lapack_int const* ipiv, lapack_int const* incx );
 
-#define LAPACK_slaswp LAPACK_GLOBAL(slaswp,SLASWP)
+#define LAPACK_slaswp LAPACK_GLOBAL_SUFFIX(slaswp,SLASWP)
 void LAPACK_slaswp(
     lapack_int const* n,
     float* A, lapack_int const* lda, lapack_int const* k1, lapack_int const* k2, lapack_int const* ipiv, lapack_int const* incx );
 
-#define LAPACK_zlaswp LAPACK_GLOBAL(zlaswp,ZLASWP)
+#define LAPACK_zlaswp LAPACK_GLOBAL_SUFFIX(zlaswp,ZLASWP)
 void LAPACK_zlaswp(
     lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda, lapack_int const* k1, lapack_int const* k2, lapack_int const* ipiv, lapack_int const* incx );
 
-#define LAPACK_clatms_base LAPACK_GLOBAL(clatms,CLATMS)
+#define LAPACK_clatms_base LAPACK_GLOBAL_SUFFIX(clatms,CLATMS)
 void LAPACK_clatms_base(
     lapack_int const* m, lapack_int const* n, char const* dist,
     lapack_int* iseed, char const* sym,
@@ -10958,7 +11209,7 @@ void LAPACK_clatms_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10967,7 +11218,7 @@ void LAPACK_clatms_base(
     #define LAPACK_clatms(...) LAPACK_clatms_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlatms_base LAPACK_GLOBAL(dlatms,DLATMS)
+#define LAPACK_dlatms_base LAPACK_GLOBAL_SUFFIX(dlatms,DLATMS)
 void LAPACK_dlatms_base(
     lapack_int const* m, lapack_int const* n, char const* dist,
     lapack_int* iseed, char const* sym,
@@ -10980,7 +11231,7 @@ void LAPACK_dlatms_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -10989,7 +11240,7 @@ void LAPACK_dlatms_base(
     #define LAPACK_dlatms(...) LAPACK_dlatms_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slatms_base LAPACK_GLOBAL(slatms,SLATMS)
+#define LAPACK_slatms_base LAPACK_GLOBAL_SUFFIX(slatms,SLATMS)
 void LAPACK_slatms_base(
     lapack_int const* m, lapack_int const* n, char const* dist,
     lapack_int* iseed, char const* sym,
@@ -11002,7 +11253,7 @@ void LAPACK_slatms_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11011,7 +11262,7 @@ void LAPACK_slatms_base(
     #define LAPACK_slatms(...) LAPACK_slatms_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlatms_base LAPACK_GLOBAL(zlatms,ZLATMS)
+#define LAPACK_zlatms_base LAPACK_GLOBAL_SUFFIX(zlatms,ZLATMS)
 void LAPACK_zlatms_base(
     lapack_int const* m, lapack_int const* n, char const* dist,
     lapack_int* iseed, char const* sym,
@@ -11024,7 +11275,7 @@ void LAPACK_zlatms_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11033,14 +11284,14 @@ void LAPACK_zlatms_base(
     #define LAPACK_zlatms(...) LAPACK_zlatms_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_clauum_base LAPACK_GLOBAL(clauum,CLAUUM)
+#define LAPACK_clauum_base LAPACK_GLOBAL_SUFFIX(clauum,CLAUUM)
 void LAPACK_clauum_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11049,14 +11300,14 @@ void LAPACK_clauum_base(
     #define LAPACK_clauum(...) LAPACK_clauum_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dlauum_base LAPACK_GLOBAL(dlauum,DLAUUM)
+#define LAPACK_dlauum_base LAPACK_GLOBAL_SUFFIX(dlauum,DLAUUM)
 void LAPACK_dlauum_base(
     char const* uplo,
     lapack_int const* n,
     double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11065,14 +11316,14 @@ void LAPACK_dlauum_base(
     #define LAPACK_dlauum(...) LAPACK_dlauum_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_slauum_base LAPACK_GLOBAL(slauum,SLAUUM)
+#define LAPACK_slauum_base LAPACK_GLOBAL_SUFFIX(slauum,SLAUUM)
 void LAPACK_slauum_base(
     char const* uplo,
     lapack_int const* n,
     float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11081,14 +11332,14 @@ void LAPACK_slauum_base(
     #define LAPACK_slauum(...) LAPACK_slauum_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zlauum_base LAPACK_GLOBAL(zlauum,ZLAUUM)
+#define LAPACK_zlauum_base LAPACK_GLOBAL_SUFFIX(zlauum,ZLAUUM)
 void LAPACK_zlauum_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11097,11 +11348,11 @@ void LAPACK_zlauum_base(
     #define LAPACK_zlauum(...) LAPACK_zlauum_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ilaver LAPACK_GLOBAL(ilaver,ILAVER)
+#define LAPACK_ilaver LAPACK_GLOBAL_SUFFIX(ilaver,ILAVER)
 void LAPACK_ilaver(
     lapack_int* vers_major, lapack_int* vers_minor, lapack_int* vers_patch );
 
-#define LAPACK_dopgtr_base LAPACK_GLOBAL(dopgtr,DOPGTR)
+#define LAPACK_dopgtr_base LAPACK_GLOBAL_SUFFIX(dopgtr,DOPGTR)
 void LAPACK_dopgtr_base(
     char const* uplo,
     lapack_int const* n,
@@ -11111,7 +11362,7 @@ void LAPACK_dopgtr_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11120,7 +11371,7 @@ void LAPACK_dopgtr_base(
     #define LAPACK_dopgtr(...) LAPACK_dopgtr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sopgtr_base LAPACK_GLOBAL(sopgtr,SOPGTR)
+#define LAPACK_sopgtr_base LAPACK_GLOBAL_SUFFIX(sopgtr,SOPGTR)
 void LAPACK_sopgtr_base(
     char const* uplo,
     lapack_int const* n,
@@ -11130,7 +11381,7 @@ void LAPACK_sopgtr_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11139,7 +11390,7 @@ void LAPACK_sopgtr_base(
     #define LAPACK_sopgtr(...) LAPACK_sopgtr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dopmtr_base LAPACK_GLOBAL(dopmtr,DOPMTR)
+#define LAPACK_dopmtr_base LAPACK_GLOBAL_SUFFIX(dopmtr,DOPMTR)
 void LAPACK_dopmtr_base(
     char const* side, char const* uplo, char const* trans,
     lapack_int const* m, lapack_int const* n,
@@ -11149,7 +11400,7 @@ void LAPACK_dopmtr_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11158,7 +11409,7 @@ void LAPACK_dopmtr_base(
     #define LAPACK_dopmtr(...) LAPACK_dopmtr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sopmtr_base LAPACK_GLOBAL(sopmtr,SOPMTR)
+#define LAPACK_sopmtr_base LAPACK_GLOBAL_SUFFIX(sopmtr,SOPMTR)
 void LAPACK_sopmtr_base(
     char const* side, char const* uplo, char const* trans,
     lapack_int const* m, lapack_int const* n,
@@ -11168,7 +11419,7 @@ void LAPACK_sopmtr_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11177,7 +11428,7 @@ void LAPACK_sopmtr_base(
     #define LAPACK_sopmtr(...) LAPACK_sopmtr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dorbdb_base LAPACK_GLOBAL(dorbdb,DORBDB)
+#define LAPACK_dorbdb_base LAPACK_GLOBAL_SUFFIX(dorbdb,DORBDB)
 void LAPACK_dorbdb_base(
     char const* trans, char const* signs,
     lapack_int const* m, lapack_int const* p, lapack_int const* q,
@@ -11194,7 +11445,7 @@ void LAPACK_dorbdb_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11203,7 +11454,7 @@ void LAPACK_dorbdb_base(
     #define LAPACK_dorbdb(...) LAPACK_dorbdb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sorbdb_base LAPACK_GLOBAL(sorbdb,SORBDB)
+#define LAPACK_sorbdb_base LAPACK_GLOBAL_SUFFIX(sorbdb,SORBDB)
 void LAPACK_sorbdb_base(
     char const* trans, char const* signs,
     lapack_int const* m, lapack_int const* p, lapack_int const* q,
@@ -11220,7 +11471,7 @@ void LAPACK_sorbdb_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11229,7 +11480,7 @@ void LAPACK_sorbdb_base(
     #define LAPACK_sorbdb(...) LAPACK_sorbdb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dorcsd_base LAPACK_GLOBAL(dorcsd,DORCSD)
+#define LAPACK_dorcsd_base LAPACK_GLOBAL_SUFFIX(dorcsd,DORCSD)
 void LAPACK_dorcsd_base(
     char const* jobu1, char const* jobu2, char const* jobv1t, char const* jobv2t, char const* trans, char const* signs,
     lapack_int const* m, lapack_int const* p, lapack_int const* q,
@@ -11246,7 +11497,7 @@ void LAPACK_dorcsd_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11255,7 +11506,7 @@ void LAPACK_dorcsd_base(
     #define LAPACK_dorcsd(...) LAPACK_dorcsd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sorcsd_base LAPACK_GLOBAL(sorcsd,SORCSD)
+#define LAPACK_sorcsd_base LAPACK_GLOBAL_SUFFIX(sorcsd,SORCSD)
 void LAPACK_sorcsd_base(
     char const* jobu1, char const* jobu2, char const* jobv1t, char const* jobv2t, char const* trans, char const* signs,
     lapack_int const* m, lapack_int const* p, lapack_int const* q,
@@ -11272,7 +11523,7 @@ void LAPACK_sorcsd_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11281,7 +11532,7 @@ void LAPACK_sorcsd_base(
     #define LAPACK_sorcsd(...) LAPACK_sorcsd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dorcsd2by1_base LAPACK_GLOBAL(dorcsd2by1,DORCSD2BY1)
+#define LAPACK_dorcsd2by1_base LAPACK_GLOBAL_SUFFIX(dorcsd2by1,DORCSD2BY1)
 void LAPACK_dorcsd2by1_base(
     char const* jobu1, char const* jobu2, char const* jobv1t,
     lapack_int const* m, lapack_int const* p, lapack_int const* q,
@@ -11295,7 +11546,7 @@ void LAPACK_dorcsd2by1_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11304,7 +11555,7 @@ void LAPACK_dorcsd2by1_base(
     #define LAPACK_dorcsd2by1(...) LAPACK_dorcsd2by1_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sorcsd2by1_base LAPACK_GLOBAL(sorcsd2by1,SORCSD2BY1)
+#define LAPACK_sorcsd2by1_base LAPACK_GLOBAL_SUFFIX(sorcsd2by1,SORCSD2BY1)
 void LAPACK_sorcsd2by1_base(
     char const* jobu1, char const* jobu2, char const* jobv1t,
     lapack_int const* m, lapack_int const* p, lapack_int const* q,
@@ -11318,7 +11569,7 @@ void LAPACK_sorcsd2by1_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11327,7 +11578,7 @@ void LAPACK_sorcsd2by1_base(
     #define LAPACK_sorcsd2by1(...) LAPACK_sorcsd2by1_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dorgbr_base LAPACK_GLOBAL(dorgbr,DORGBR)
+#define LAPACK_dorgbr_base LAPACK_GLOBAL_SUFFIX(dorgbr,DORGBR)
 void LAPACK_dorgbr_base(
     char const* vect,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -11336,7 +11587,7 @@ void LAPACK_dorgbr_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11345,7 +11596,7 @@ void LAPACK_dorgbr_base(
     #define LAPACK_dorgbr(...) LAPACK_dorgbr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sorgbr_base LAPACK_GLOBAL(sorgbr,SORGBR)
+#define LAPACK_sorgbr_base LAPACK_GLOBAL_SUFFIX(sorgbr,SORGBR)
 void LAPACK_sorgbr_base(
     char const* vect,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -11354,7 +11605,7 @@ void LAPACK_sorgbr_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11363,7 +11614,7 @@ void LAPACK_sorgbr_base(
     #define LAPACK_sorgbr(...) LAPACK_sorgbr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dorghr LAPACK_GLOBAL(dorghr,DORGHR)
+#define LAPACK_dorghr LAPACK_GLOBAL_SUFFIX(dorghr,DORGHR)
 void LAPACK_dorghr(
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
     double* A, lapack_int const* lda,
@@ -11371,7 +11622,7 @@ void LAPACK_dorghr(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sorghr LAPACK_GLOBAL(sorghr,SORGHR)
+#define LAPACK_sorghr LAPACK_GLOBAL_SUFFIX(sorghr,SORGHR)
 void LAPACK_sorghr(
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
     float* A, lapack_int const* lda,
@@ -11379,7 +11630,7 @@ void LAPACK_sorghr(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dorglq LAPACK_GLOBAL(dorglq,DORGLQ)
+#define LAPACK_dorglq LAPACK_GLOBAL_SUFFIX(dorglq,DORGLQ)
 void LAPACK_dorglq(
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
     double* A, lapack_int const* lda,
@@ -11387,7 +11638,7 @@ void LAPACK_dorglq(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sorglq LAPACK_GLOBAL(sorglq,SORGLQ)
+#define LAPACK_sorglq LAPACK_GLOBAL_SUFFIX(sorglq,SORGLQ)
 void LAPACK_sorglq(
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
     float* A, lapack_int const* lda,
@@ -11395,7 +11646,7 @@ void LAPACK_sorglq(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dorgql LAPACK_GLOBAL(dorgql,DORGQL)
+#define LAPACK_dorgql LAPACK_GLOBAL_SUFFIX(dorgql,DORGQL)
 void LAPACK_dorgql(
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
     double* A, lapack_int const* lda,
@@ -11403,7 +11654,7 @@ void LAPACK_dorgql(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sorgql LAPACK_GLOBAL(sorgql,SORGQL)
+#define LAPACK_sorgql LAPACK_GLOBAL_SUFFIX(sorgql,SORGQL)
 void LAPACK_sorgql(
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
     float* A, lapack_int const* lda,
@@ -11411,7 +11662,7 @@ void LAPACK_sorgql(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dorgqr LAPACK_GLOBAL(dorgqr,DORGQR)
+#define LAPACK_dorgqr LAPACK_GLOBAL_SUFFIX(dorgqr,DORGQR)
 void LAPACK_dorgqr(
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
     double* A, lapack_int const* lda,
@@ -11419,7 +11670,7 @@ void LAPACK_dorgqr(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sorgqr LAPACK_GLOBAL(sorgqr,SORGQR)
+#define LAPACK_sorgqr LAPACK_GLOBAL_SUFFIX(sorgqr,SORGQR)
 void LAPACK_sorgqr(
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
     float* A, lapack_int const* lda,
@@ -11427,7 +11678,7 @@ void LAPACK_sorgqr(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dorgrq LAPACK_GLOBAL(dorgrq,DORGRQ)
+#define LAPACK_dorgrq LAPACK_GLOBAL_SUFFIX(dorgrq,DORGRQ)
 void LAPACK_dorgrq(
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
     double* A, lapack_int const* lda,
@@ -11435,7 +11686,7 @@ void LAPACK_dorgrq(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sorgrq LAPACK_GLOBAL(sorgrq,SORGRQ)
+#define LAPACK_sorgrq LAPACK_GLOBAL_SUFFIX(sorgrq,SORGRQ)
 void LAPACK_sorgrq(
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
     float* A, lapack_int const* lda,
@@ -11443,7 +11694,7 @@ void LAPACK_sorgrq(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dorgtr_base LAPACK_GLOBAL(dorgtr,DORGTR)
+#define LAPACK_dorgtr_base LAPACK_GLOBAL_SUFFIX(dorgtr,DORGTR)
 void LAPACK_dorgtr_base(
     char const* uplo,
     lapack_int const* n,
@@ -11452,7 +11703,7 @@ void LAPACK_dorgtr_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11461,7 +11712,7 @@ void LAPACK_dorgtr_base(
     #define LAPACK_dorgtr(...) LAPACK_dorgtr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sorgtr_base LAPACK_GLOBAL(sorgtr,SORGTR)
+#define LAPACK_sorgtr_base LAPACK_GLOBAL_SUFFIX(sorgtr,SORGTR)
 void LAPACK_sorgtr_base(
     char const* uplo,
     lapack_int const* n,
@@ -11470,7 +11721,7 @@ void LAPACK_sorgtr_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11479,7 +11730,7 @@ void LAPACK_sorgtr_base(
     #define LAPACK_sorgtr(...) LAPACK_sorgtr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dorgtsqr_row LAPACK_GLOBAL(dorgtsqr_row,DORGTSQR_ROW)
+#define LAPACK_dorgtsqr_row LAPACK_GLOBAL_SUFFIX(dorgtsqr_row,DORGTSQR_ROW)
 void LAPACK_dorgtsqr_row(
     lapack_int const* m, lapack_int const* n,
     lapack_int const* mb, lapack_int const* nb,
@@ -11488,7 +11739,7 @@ void LAPACK_dorgtsqr_row(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_sorgtsqr_row LAPACK_GLOBAL(sorgtsqr_row,SORGTSQR_ROW)
+#define LAPACK_sorgtsqr_row LAPACK_GLOBAL_SUFFIX(sorgtsqr_row,SORGTSQR_ROW)
 void LAPACK_sorgtsqr_row(
     lapack_int const* m, lapack_int const* n,
     lapack_int const* mb, lapack_int const* nb,
@@ -11497,7 +11748,23 @@ void LAPACK_sorgtsqr_row(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dormbr_base LAPACK_GLOBAL(dormbr,DORMBR)
+#define LAPACK_dorhr_col LAPACK_GLOBAL_SUFFIX(dorhr_col,DORHR_COL)
+void LAPACK_dorhr_col(
+    lapack_int const* m, lapack_int const* n,
+    lapack_int const* nb, double* A,
+    lapack_int const* lda, double* T,
+    lapack_int const* ldt, double* D,
+    lapack_int* info );
+
+#define LAPACK_sorhr_col LAPACK_GLOBAL_SUFFIX(sorhr_col,SORHR_COL)
+void LAPACK_sorhr_col(
+    lapack_int const* m, lapack_int const* n,
+    lapack_int const* nb, float* A,
+    lapack_int const* lda, float* T,
+    lapack_int const* ldt, float* D,
+    lapack_int* info );
+
+#define LAPACK_dormbr_base LAPACK_GLOBAL_SUFFIX(dormbr,DORMBR)
 void LAPACK_dormbr_base(
     char const* vect, char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -11507,7 +11774,7 @@ void LAPACK_dormbr_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11516,7 +11783,7 @@ void LAPACK_dormbr_base(
     #define LAPACK_dormbr(...) LAPACK_dormbr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sormbr_base LAPACK_GLOBAL(sormbr,SORMBR)
+#define LAPACK_sormbr_base LAPACK_GLOBAL_SUFFIX(sormbr,SORMBR)
 void LAPACK_sormbr_base(
     char const* vect, char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -11526,7 +11793,7 @@ void LAPACK_sormbr_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11535,7 +11802,7 @@ void LAPACK_sormbr_base(
     #define LAPACK_sormbr(...) LAPACK_sormbr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dormhr_base LAPACK_GLOBAL(dormhr,DORMHR)
+#define LAPACK_dormhr_base LAPACK_GLOBAL_SUFFIX(dormhr,DORMHR)
 void LAPACK_dormhr_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -11545,7 +11812,7 @@ void LAPACK_dormhr_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11554,7 +11821,7 @@ void LAPACK_dormhr_base(
     #define LAPACK_dormhr(...) LAPACK_dormhr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sormhr_base LAPACK_GLOBAL(sormhr,SORMHR)
+#define LAPACK_sormhr_base LAPACK_GLOBAL_SUFFIX(sormhr,SORMHR)
 void LAPACK_sormhr_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -11564,7 +11831,7 @@ void LAPACK_sormhr_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11573,7 +11840,7 @@ void LAPACK_sormhr_base(
     #define LAPACK_sormhr(...) LAPACK_sormhr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dormlq_base LAPACK_GLOBAL(dormlq,DORMLQ)
+#define LAPACK_dormlq_base LAPACK_GLOBAL_SUFFIX(dormlq,DORMLQ)
 void LAPACK_dormlq_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -11583,7 +11850,7 @@ void LAPACK_dormlq_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11592,7 +11859,7 @@ void LAPACK_dormlq_base(
     #define LAPACK_dormlq(...) LAPACK_dormlq_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sormlq_base LAPACK_GLOBAL(sormlq,SORMLQ)
+#define LAPACK_sormlq_base LAPACK_GLOBAL_SUFFIX(sormlq,SORMLQ)
 void LAPACK_sormlq_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -11602,7 +11869,7 @@ void LAPACK_sormlq_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11611,7 +11878,7 @@ void LAPACK_sormlq_base(
     #define LAPACK_sormlq(...) LAPACK_sormlq_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dormql_base LAPACK_GLOBAL(dormql,DORMQL)
+#define LAPACK_dormql_base LAPACK_GLOBAL_SUFFIX(dormql,DORMQL)
 void LAPACK_dormql_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -11621,7 +11888,7 @@ void LAPACK_dormql_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11630,7 +11897,7 @@ void LAPACK_dormql_base(
     #define LAPACK_dormql(...) LAPACK_dormql_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sormql_base LAPACK_GLOBAL(sormql,SORMQL)
+#define LAPACK_sormql_base LAPACK_GLOBAL_SUFFIX(sormql,SORMQL)
 void LAPACK_sormql_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -11640,7 +11907,7 @@ void LAPACK_sormql_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11649,7 +11916,7 @@ void LAPACK_sormql_base(
     #define LAPACK_sormql(...) LAPACK_sormql_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dormqr_base LAPACK_GLOBAL(dormqr,DORMQR)
+#define LAPACK_dormqr_base LAPACK_GLOBAL_SUFFIX(dormqr,DORMQR)
 void LAPACK_dormqr_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -11659,7 +11926,7 @@ void LAPACK_dormqr_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11668,7 +11935,7 @@ void LAPACK_dormqr_base(
     #define LAPACK_dormqr(...) LAPACK_dormqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sormqr_base LAPACK_GLOBAL(sormqr,SORMQR)
+#define LAPACK_sormqr_base LAPACK_GLOBAL_SUFFIX(sormqr,SORMQR)
 void LAPACK_sormqr_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -11678,7 +11945,7 @@ void LAPACK_sormqr_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11687,7 +11954,7 @@ void LAPACK_sormqr_base(
     #define LAPACK_sormqr(...) LAPACK_sormqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dormrq_base LAPACK_GLOBAL(dormrq,DORMRQ)
+#define LAPACK_dormrq_base LAPACK_GLOBAL_SUFFIX(dormrq,DORMRQ)
 void LAPACK_dormrq_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -11697,7 +11964,7 @@ void LAPACK_dormrq_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11706,7 +11973,7 @@ void LAPACK_dormrq_base(
     #define LAPACK_dormrq(...) LAPACK_dormrq_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sormrq_base LAPACK_GLOBAL(sormrq,SORMRQ)
+#define LAPACK_sormrq_base LAPACK_GLOBAL_SUFFIX(sormrq,SORMRQ)
 void LAPACK_sormrq_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -11716,7 +11983,7 @@ void LAPACK_sormrq_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11725,7 +11992,7 @@ void LAPACK_sormrq_base(
     #define LAPACK_sormrq(...) LAPACK_sormrq_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dormrz_base LAPACK_GLOBAL(dormrz,DORMRZ)
+#define LAPACK_dormrz_base LAPACK_GLOBAL_SUFFIX(dormrz,DORMRZ)
 void LAPACK_dormrz_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* l,
@@ -11735,7 +12002,7 @@ void LAPACK_dormrz_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11744,7 +12011,7 @@ void LAPACK_dormrz_base(
     #define LAPACK_dormrz(...) LAPACK_dormrz_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sormrz_base LAPACK_GLOBAL(sormrz,SORMRZ)
+#define LAPACK_sormrz_base LAPACK_GLOBAL_SUFFIX(sormrz,SORMRZ)
 void LAPACK_sormrz_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* l,
@@ -11754,7 +12021,7 @@ void LAPACK_sormrz_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11763,7 +12030,7 @@ void LAPACK_sormrz_base(
     #define LAPACK_sormrz(...) LAPACK_sormrz_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dormtr_base LAPACK_GLOBAL(dormtr,DORMTR)
+#define LAPACK_dormtr_base LAPACK_GLOBAL_SUFFIX(dormtr,DORMTR)
 void LAPACK_dormtr_base(
     char const* side, char const* uplo, char const* trans,
     lapack_int const* m, lapack_int const* n,
@@ -11773,7 +12040,7 @@ void LAPACK_dormtr_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11782,7 +12049,7 @@ void LAPACK_dormtr_base(
     #define LAPACK_dormtr(...) LAPACK_dormtr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sormtr_base LAPACK_GLOBAL(sormtr,SORMTR)
+#define LAPACK_sormtr_base LAPACK_GLOBAL_SUFFIX(sormtr,SORMTR)
 void LAPACK_sormtr_base(
     char const* side, char const* uplo, char const* trans,
     lapack_int const* m, lapack_int const* n,
@@ -11792,7 +12059,7 @@ void LAPACK_sormtr_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11801,7 +12068,7 @@ void LAPACK_sormtr_base(
     #define LAPACK_sormtr(...) LAPACK_sormtr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpbcon_base LAPACK_GLOBAL(cpbcon,CPBCON)
+#define LAPACK_cpbcon_base LAPACK_GLOBAL_SUFFIX(cpbcon,CPBCON)
 void LAPACK_cpbcon_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -11812,7 +12079,7 @@ void LAPACK_cpbcon_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11821,7 +12088,7 @@ void LAPACK_cpbcon_base(
     #define LAPACK_cpbcon(...) LAPACK_cpbcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpbcon_base LAPACK_GLOBAL(dpbcon,DPBCON)
+#define LAPACK_dpbcon_base LAPACK_GLOBAL_SUFFIX(dpbcon,DPBCON)
 void LAPACK_dpbcon_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -11832,7 +12099,7 @@ void LAPACK_dpbcon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11841,7 +12108,7 @@ void LAPACK_dpbcon_base(
     #define LAPACK_dpbcon(...) LAPACK_dpbcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spbcon_base LAPACK_GLOBAL(spbcon,SPBCON)
+#define LAPACK_spbcon_base LAPACK_GLOBAL_SUFFIX(spbcon,SPBCON)
 void LAPACK_spbcon_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -11852,7 +12119,7 @@ void LAPACK_spbcon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11861,7 +12128,7 @@ void LAPACK_spbcon_base(
     #define LAPACK_spbcon(...) LAPACK_spbcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpbcon_base LAPACK_GLOBAL(zpbcon,ZPBCON)
+#define LAPACK_zpbcon_base LAPACK_GLOBAL_SUFFIX(zpbcon,ZPBCON)
 void LAPACK_zpbcon_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -11872,7 +12139,7 @@ void LAPACK_zpbcon_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11881,7 +12148,7 @@ void LAPACK_zpbcon_base(
     #define LAPACK_zpbcon(...) LAPACK_zpbcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpbequ_base LAPACK_GLOBAL(cpbequ,CPBEQU)
+#define LAPACK_cpbequ_base LAPACK_GLOBAL_SUFFIX(cpbequ,CPBEQU)
 void LAPACK_cpbequ_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -11891,7 +12158,7 @@ void LAPACK_cpbequ_base(
     float* amax,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11900,7 +12167,7 @@ void LAPACK_cpbequ_base(
     #define LAPACK_cpbequ(...) LAPACK_cpbequ_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpbequ_base LAPACK_GLOBAL(dpbequ,DPBEQU)
+#define LAPACK_dpbequ_base LAPACK_GLOBAL_SUFFIX(dpbequ,DPBEQU)
 void LAPACK_dpbequ_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -11910,7 +12177,7 @@ void LAPACK_dpbequ_base(
     double* amax,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11919,7 +12186,7 @@ void LAPACK_dpbequ_base(
     #define LAPACK_dpbequ(...) LAPACK_dpbequ_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spbequ_base LAPACK_GLOBAL(spbequ,SPBEQU)
+#define LAPACK_spbequ_base LAPACK_GLOBAL_SUFFIX(spbequ,SPBEQU)
 void LAPACK_spbequ_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -11929,7 +12196,7 @@ void LAPACK_spbequ_base(
     float* amax,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11938,7 +12205,7 @@ void LAPACK_spbequ_base(
     #define LAPACK_spbequ(...) LAPACK_spbequ_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpbequ_base LAPACK_GLOBAL(zpbequ,ZPBEQU)
+#define LAPACK_zpbequ_base LAPACK_GLOBAL_SUFFIX(zpbequ,ZPBEQU)
 void LAPACK_zpbequ_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -11948,7 +12215,7 @@ void LAPACK_zpbequ_base(
     double* amax,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11957,7 +12224,7 @@ void LAPACK_zpbequ_base(
     #define LAPACK_zpbequ(...) LAPACK_zpbequ_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpbrfs_base LAPACK_GLOBAL(cpbrfs,CPBRFS)
+#define LAPACK_cpbrfs_base LAPACK_GLOBAL_SUFFIX(cpbrfs,CPBRFS)
 void LAPACK_cpbrfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -11971,7 +12238,7 @@ void LAPACK_cpbrfs_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -11980,7 +12247,7 @@ void LAPACK_cpbrfs_base(
     #define LAPACK_cpbrfs(...) LAPACK_cpbrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpbrfs_base LAPACK_GLOBAL(dpbrfs,DPBRFS)
+#define LAPACK_dpbrfs_base LAPACK_GLOBAL_SUFFIX(dpbrfs,DPBRFS)
 void LAPACK_dpbrfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -11994,7 +12261,7 @@ void LAPACK_dpbrfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12003,7 +12270,7 @@ void LAPACK_dpbrfs_base(
     #define LAPACK_dpbrfs(...) LAPACK_dpbrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spbrfs_base LAPACK_GLOBAL(spbrfs,SPBRFS)
+#define LAPACK_spbrfs_base LAPACK_GLOBAL_SUFFIX(spbrfs,SPBRFS)
 void LAPACK_spbrfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -12017,7 +12284,7 @@ void LAPACK_spbrfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12026,7 +12293,7 @@ void LAPACK_spbrfs_base(
     #define LAPACK_spbrfs(...) LAPACK_spbrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpbrfs_base LAPACK_GLOBAL(zpbrfs,ZPBRFS)
+#define LAPACK_zpbrfs_base LAPACK_GLOBAL_SUFFIX(zpbrfs,ZPBRFS)
 void LAPACK_zpbrfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -12040,7 +12307,7 @@ void LAPACK_zpbrfs_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12049,14 +12316,14 @@ void LAPACK_zpbrfs_base(
     #define LAPACK_zpbrfs(...) LAPACK_zpbrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpbstf_base LAPACK_GLOBAL(cpbstf,CPBSTF)
+#define LAPACK_cpbstf_base LAPACK_GLOBAL_SUFFIX(cpbstf,CPBSTF)
 void LAPACK_cpbstf_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd,
     lapack_complex_float* AB, lapack_int const* ldab,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12065,14 +12332,14 @@ void LAPACK_cpbstf_base(
     #define LAPACK_cpbstf(...) LAPACK_cpbstf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpbstf_base LAPACK_GLOBAL(dpbstf,DPBSTF)
+#define LAPACK_dpbstf_base LAPACK_GLOBAL_SUFFIX(dpbstf,DPBSTF)
 void LAPACK_dpbstf_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd,
     double* AB, lapack_int const* ldab,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12081,14 +12348,14 @@ void LAPACK_dpbstf_base(
     #define LAPACK_dpbstf(...) LAPACK_dpbstf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spbstf_base LAPACK_GLOBAL(spbstf,SPBSTF)
+#define LAPACK_spbstf_base LAPACK_GLOBAL_SUFFIX(spbstf,SPBSTF)
 void LAPACK_spbstf_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd,
     float* AB, lapack_int const* ldab,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12097,14 +12364,14 @@ void LAPACK_spbstf_base(
     #define LAPACK_spbstf(...) LAPACK_spbstf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpbstf_base LAPACK_GLOBAL(zpbstf,ZPBSTF)
+#define LAPACK_zpbstf_base LAPACK_GLOBAL_SUFFIX(zpbstf,ZPBSTF)
 void LAPACK_zpbstf_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd,
     lapack_complex_double* AB, lapack_int const* ldab,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12113,7 +12380,7 @@ void LAPACK_zpbstf_base(
     #define LAPACK_zpbstf(...) LAPACK_zpbstf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpbsv_base LAPACK_GLOBAL(cpbsv,CPBSV)
+#define LAPACK_cpbsv_base LAPACK_GLOBAL_SUFFIX(cpbsv,CPBSV)
 void LAPACK_cpbsv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -12121,7 +12388,7 @@ void LAPACK_cpbsv_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12130,7 +12397,7 @@ void LAPACK_cpbsv_base(
     #define LAPACK_cpbsv(...) LAPACK_cpbsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpbsv_base LAPACK_GLOBAL(dpbsv,DPBSV)
+#define LAPACK_dpbsv_base LAPACK_GLOBAL_SUFFIX(dpbsv,DPBSV)
 void LAPACK_dpbsv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -12138,7 +12405,7 @@ void LAPACK_dpbsv_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12147,7 +12414,7 @@ void LAPACK_dpbsv_base(
     #define LAPACK_dpbsv(...) LAPACK_dpbsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spbsv_base LAPACK_GLOBAL(spbsv,SPBSV)
+#define LAPACK_spbsv_base LAPACK_GLOBAL_SUFFIX(spbsv,SPBSV)
 void LAPACK_spbsv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -12155,7 +12422,7 @@ void LAPACK_spbsv_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12164,7 +12431,7 @@ void LAPACK_spbsv_base(
     #define LAPACK_spbsv(...) LAPACK_spbsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpbsv_base LAPACK_GLOBAL(zpbsv,ZPBSV)
+#define LAPACK_zpbsv_base LAPACK_GLOBAL_SUFFIX(zpbsv,ZPBSV)
 void LAPACK_zpbsv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -12172,7 +12439,7 @@ void LAPACK_zpbsv_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12181,7 +12448,7 @@ void LAPACK_zpbsv_base(
     #define LAPACK_zpbsv(...) LAPACK_zpbsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpbsvx_base LAPACK_GLOBAL(cpbsvx,CPBSVX)
+#define LAPACK_cpbsvx_base LAPACK_GLOBAL_SUFFIX(cpbsvx,CPBSVX)
 void LAPACK_cpbsvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -12198,7 +12465,7 @@ void LAPACK_cpbsvx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12207,7 +12474,7 @@ void LAPACK_cpbsvx_base(
     #define LAPACK_cpbsvx(...) LAPACK_cpbsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpbsvx_base LAPACK_GLOBAL(dpbsvx,DPBSVX)
+#define LAPACK_dpbsvx_base LAPACK_GLOBAL_SUFFIX(dpbsvx,DPBSVX)
 void LAPACK_dpbsvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -12224,7 +12491,7 @@ void LAPACK_dpbsvx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12233,7 +12500,7 @@ void LAPACK_dpbsvx_base(
     #define LAPACK_dpbsvx(...) LAPACK_dpbsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spbsvx_base LAPACK_GLOBAL(spbsvx,SPBSVX)
+#define LAPACK_spbsvx_base LAPACK_GLOBAL_SUFFIX(spbsvx,SPBSVX)
 void LAPACK_spbsvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -12250,7 +12517,7 @@ void LAPACK_spbsvx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12259,7 +12526,7 @@ void LAPACK_spbsvx_base(
     #define LAPACK_spbsvx(...) LAPACK_spbsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpbsvx_base LAPACK_GLOBAL(zpbsvx,ZPBSVX)
+#define LAPACK_zpbsvx_base LAPACK_GLOBAL_SUFFIX(zpbsvx,ZPBSVX)
 void LAPACK_zpbsvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -12276,7 +12543,7 @@ void LAPACK_zpbsvx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12285,14 +12552,14 @@ void LAPACK_zpbsvx_base(
     #define LAPACK_zpbsvx(...) LAPACK_zpbsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpbtrf_base LAPACK_GLOBAL(cpbtrf,CPBTRF)
+#define LAPACK_cpbtrf_base LAPACK_GLOBAL_SUFFIX(cpbtrf,CPBTRF)
 void LAPACK_cpbtrf_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd,
     lapack_complex_float* AB, lapack_int const* ldab,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12301,14 +12568,14 @@ void LAPACK_cpbtrf_base(
     #define LAPACK_cpbtrf(...) LAPACK_cpbtrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpbtrf_base LAPACK_GLOBAL(dpbtrf,DPBTRF)
+#define LAPACK_dpbtrf_base LAPACK_GLOBAL_SUFFIX(dpbtrf,DPBTRF)
 void LAPACK_dpbtrf_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd,
     double* AB, lapack_int const* ldab,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12317,14 +12584,14 @@ void LAPACK_dpbtrf_base(
     #define LAPACK_dpbtrf(...) LAPACK_dpbtrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spbtrf_base LAPACK_GLOBAL(spbtrf,SPBTRF)
+#define LAPACK_spbtrf_base LAPACK_GLOBAL_SUFFIX(spbtrf,SPBTRF)
 void LAPACK_spbtrf_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd,
     float* AB, lapack_int const* ldab,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12333,14 +12600,14 @@ void LAPACK_spbtrf_base(
     #define LAPACK_spbtrf(...) LAPACK_spbtrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpbtrf_base LAPACK_GLOBAL(zpbtrf,ZPBTRF)
+#define LAPACK_zpbtrf_base LAPACK_GLOBAL_SUFFIX(zpbtrf,ZPBTRF)
 void LAPACK_zpbtrf_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd,
     lapack_complex_double* AB, lapack_int const* ldab,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12349,7 +12616,7 @@ void LAPACK_zpbtrf_base(
     #define LAPACK_zpbtrf(...) LAPACK_zpbtrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpbtrs_base LAPACK_GLOBAL(cpbtrs,CPBTRS)
+#define LAPACK_cpbtrs_base LAPACK_GLOBAL_SUFFIX(cpbtrs,CPBTRS)
 void LAPACK_cpbtrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -12357,7 +12624,7 @@ void LAPACK_cpbtrs_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12366,7 +12633,7 @@ void LAPACK_cpbtrs_base(
     #define LAPACK_cpbtrs(...) LAPACK_cpbtrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpbtrs_base LAPACK_GLOBAL(dpbtrs,DPBTRS)
+#define LAPACK_dpbtrs_base LAPACK_GLOBAL_SUFFIX(dpbtrs,DPBTRS)
 void LAPACK_dpbtrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -12374,7 +12641,7 @@ void LAPACK_dpbtrs_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12383,7 +12650,7 @@ void LAPACK_dpbtrs_base(
     #define LAPACK_dpbtrs(...) LAPACK_dpbtrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spbtrs_base LAPACK_GLOBAL(spbtrs,SPBTRS)
+#define LAPACK_spbtrs_base LAPACK_GLOBAL_SUFFIX(spbtrs,SPBTRS)
 void LAPACK_spbtrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -12391,7 +12658,7 @@ void LAPACK_spbtrs_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12400,7 +12667,7 @@ void LAPACK_spbtrs_base(
     #define LAPACK_spbtrs(...) LAPACK_spbtrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpbtrs_base LAPACK_GLOBAL(zpbtrs,ZPBTRS)
+#define LAPACK_zpbtrs_base LAPACK_GLOBAL_SUFFIX(zpbtrs,ZPBTRS)
 void LAPACK_zpbtrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -12408,7 +12675,7 @@ void LAPACK_zpbtrs_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12417,14 +12684,14 @@ void LAPACK_zpbtrs_base(
     #define LAPACK_zpbtrs(...) LAPACK_zpbtrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpftrf_base LAPACK_GLOBAL(cpftrf,CPFTRF)
+#define LAPACK_cpftrf_base LAPACK_GLOBAL_SUFFIX(cpftrf,CPFTRF)
 void LAPACK_cpftrf_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
     lapack_complex_float* A,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12433,14 +12700,14 @@ void LAPACK_cpftrf_base(
     #define LAPACK_cpftrf(...) LAPACK_cpftrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpftrf_base LAPACK_GLOBAL(dpftrf,DPFTRF)
+#define LAPACK_dpftrf_base LAPACK_GLOBAL_SUFFIX(dpftrf,DPFTRF)
 void LAPACK_dpftrf_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
     double* A,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12449,14 +12716,14 @@ void LAPACK_dpftrf_base(
     #define LAPACK_dpftrf(...) LAPACK_dpftrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spftrf_base LAPACK_GLOBAL(spftrf,SPFTRF)
+#define LAPACK_spftrf_base LAPACK_GLOBAL_SUFFIX(spftrf,SPFTRF)
 void LAPACK_spftrf_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
     float* A,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12465,14 +12732,14 @@ void LAPACK_spftrf_base(
     #define LAPACK_spftrf(...) LAPACK_spftrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpftrf_base LAPACK_GLOBAL(zpftrf,ZPFTRF)
+#define LAPACK_zpftrf_base LAPACK_GLOBAL_SUFFIX(zpftrf,ZPFTRF)
 void LAPACK_zpftrf_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
     lapack_complex_double* A,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12481,14 +12748,14 @@ void LAPACK_zpftrf_base(
     #define LAPACK_zpftrf(...) LAPACK_zpftrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpftri_base LAPACK_GLOBAL(cpftri,CPFTRI)
+#define LAPACK_cpftri_base LAPACK_GLOBAL_SUFFIX(cpftri,CPFTRI)
 void LAPACK_cpftri_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
     lapack_complex_float* A,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12497,14 +12764,14 @@ void LAPACK_cpftri_base(
     #define LAPACK_cpftri(...) LAPACK_cpftri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpftri_base LAPACK_GLOBAL(dpftri,DPFTRI)
+#define LAPACK_dpftri_base LAPACK_GLOBAL_SUFFIX(dpftri,DPFTRI)
 void LAPACK_dpftri_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
     double* A,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12513,14 +12780,14 @@ void LAPACK_dpftri_base(
     #define LAPACK_dpftri(...) LAPACK_dpftri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spftri_base LAPACK_GLOBAL(spftri,SPFTRI)
+#define LAPACK_spftri_base LAPACK_GLOBAL_SUFFIX(spftri,SPFTRI)
 void LAPACK_spftri_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
     float* A,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12529,14 +12796,14 @@ void LAPACK_spftri_base(
     #define LAPACK_spftri(...) LAPACK_spftri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpftri_base LAPACK_GLOBAL(zpftri,ZPFTRI)
+#define LAPACK_zpftri_base LAPACK_GLOBAL_SUFFIX(zpftri,ZPFTRI)
 void LAPACK_zpftri_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
     lapack_complex_double* A,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12545,7 +12812,7 @@ void LAPACK_zpftri_base(
     #define LAPACK_zpftri(...) LAPACK_zpftri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpftrs_base LAPACK_GLOBAL(cpftrs,CPFTRS)
+#define LAPACK_cpftrs_base LAPACK_GLOBAL_SUFFIX(cpftrs,CPFTRS)
 void LAPACK_cpftrs_base(
     char const* transr, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -12553,7 +12820,7 @@ void LAPACK_cpftrs_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12562,7 +12829,7 @@ void LAPACK_cpftrs_base(
     #define LAPACK_cpftrs(...) LAPACK_cpftrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpftrs_base LAPACK_GLOBAL(dpftrs,DPFTRS)
+#define LAPACK_dpftrs_base LAPACK_GLOBAL_SUFFIX(dpftrs,DPFTRS)
 void LAPACK_dpftrs_base(
     char const* transr, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -12570,7 +12837,7 @@ void LAPACK_dpftrs_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12579,7 +12846,7 @@ void LAPACK_dpftrs_base(
     #define LAPACK_dpftrs(...) LAPACK_dpftrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spftrs_base LAPACK_GLOBAL(spftrs,SPFTRS)
+#define LAPACK_spftrs_base LAPACK_GLOBAL_SUFFIX(spftrs,SPFTRS)
 void LAPACK_spftrs_base(
     char const* transr, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -12587,7 +12854,7 @@ void LAPACK_spftrs_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12596,7 +12863,7 @@ void LAPACK_spftrs_base(
     #define LAPACK_spftrs(...) LAPACK_spftrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpftrs_base LAPACK_GLOBAL(zpftrs,ZPFTRS)
+#define LAPACK_zpftrs_base LAPACK_GLOBAL_SUFFIX(zpftrs,ZPFTRS)
 void LAPACK_zpftrs_base(
     char const* transr, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -12604,7 +12871,7 @@ void LAPACK_zpftrs_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12613,7 +12880,7 @@ void LAPACK_zpftrs_base(
     #define LAPACK_zpftrs(...) LAPACK_zpftrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpocon_base LAPACK_GLOBAL(cpocon,CPOCON)
+#define LAPACK_cpocon_base LAPACK_GLOBAL_SUFFIX(cpocon,CPOCON)
 void LAPACK_cpocon_base(
     char const* uplo,
     lapack_int const* n,
@@ -12624,7 +12891,7 @@ void LAPACK_cpocon_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12633,7 +12900,7 @@ void LAPACK_cpocon_base(
     #define LAPACK_cpocon(...) LAPACK_cpocon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpocon_base LAPACK_GLOBAL(dpocon,DPOCON)
+#define LAPACK_dpocon_base LAPACK_GLOBAL_SUFFIX(dpocon,DPOCON)
 void LAPACK_dpocon_base(
     char const* uplo,
     lapack_int const* n,
@@ -12644,7 +12911,7 @@ void LAPACK_dpocon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12653,7 +12920,7 @@ void LAPACK_dpocon_base(
     #define LAPACK_dpocon(...) LAPACK_dpocon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spocon_base LAPACK_GLOBAL(spocon,SPOCON)
+#define LAPACK_spocon_base LAPACK_GLOBAL_SUFFIX(spocon,SPOCON)
 void LAPACK_spocon_base(
     char const* uplo,
     lapack_int const* n,
@@ -12664,7 +12931,7 @@ void LAPACK_spocon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12673,7 +12940,7 @@ void LAPACK_spocon_base(
     #define LAPACK_spocon(...) LAPACK_spocon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpocon_base LAPACK_GLOBAL(zpocon,ZPOCON)
+#define LAPACK_zpocon_base LAPACK_GLOBAL_SUFFIX(zpocon,ZPOCON)
 void LAPACK_zpocon_base(
     char const* uplo,
     lapack_int const* n,
@@ -12684,7 +12951,7 @@ void LAPACK_zpocon_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12693,7 +12960,7 @@ void LAPACK_zpocon_base(
     #define LAPACK_zpocon(...) LAPACK_zpocon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpoequ LAPACK_GLOBAL(cpoequ,CPOEQU)
+#define LAPACK_cpoequ LAPACK_GLOBAL_SUFFIX(cpoequ,CPOEQU)
 void LAPACK_cpoequ(
     lapack_int const* n,
     lapack_complex_float const* A, lapack_int const* lda,
@@ -12702,7 +12969,7 @@ void LAPACK_cpoequ(
     float* amax,
     lapack_int* info );
 
-#define LAPACK_dpoequ LAPACK_GLOBAL(dpoequ,DPOEQU)
+#define LAPACK_dpoequ LAPACK_GLOBAL_SUFFIX(dpoequ,DPOEQU)
 void LAPACK_dpoequ(
     lapack_int const* n,
     double const* A, lapack_int const* lda,
@@ -12711,7 +12978,7 @@ void LAPACK_dpoequ(
     double* amax,
     lapack_int* info );
 
-#define LAPACK_spoequ LAPACK_GLOBAL(spoequ,SPOEQU)
+#define LAPACK_spoequ LAPACK_GLOBAL_SUFFIX(spoequ,SPOEQU)
 void LAPACK_spoequ(
     lapack_int const* n,
     float const* A, lapack_int const* lda,
@@ -12720,7 +12987,7 @@ void LAPACK_spoequ(
     float* amax,
     lapack_int* info );
 
-#define LAPACK_zpoequ LAPACK_GLOBAL(zpoequ,ZPOEQU)
+#define LAPACK_zpoequ LAPACK_GLOBAL_SUFFIX(zpoequ,ZPOEQU)
 void LAPACK_zpoequ(
     lapack_int const* n,
     lapack_complex_double const* A, lapack_int const* lda,
@@ -12729,7 +12996,7 @@ void LAPACK_zpoequ(
     double* amax,
     lapack_int* info );
 
-#define LAPACK_cpoequb LAPACK_GLOBAL(cpoequb,CPOEQUB)
+#define LAPACK_cpoequb LAPACK_GLOBAL_SUFFIX(cpoequb,CPOEQUB)
 void LAPACK_cpoequb(
     lapack_int const* n,
     lapack_complex_float const* A, lapack_int const* lda,
@@ -12738,7 +13005,7 @@ void LAPACK_cpoequb(
     float* amax,
     lapack_int* info );
 
-#define LAPACK_dpoequb LAPACK_GLOBAL(dpoequb,DPOEQUB)
+#define LAPACK_dpoequb LAPACK_GLOBAL_SUFFIX(dpoequb,DPOEQUB)
 void LAPACK_dpoequb(
     lapack_int const* n,
     double const* A, lapack_int const* lda,
@@ -12747,7 +13014,7 @@ void LAPACK_dpoequb(
     double* amax,
     lapack_int* info );
 
-#define LAPACK_spoequb LAPACK_GLOBAL(spoequb,SPOEQUB)
+#define LAPACK_spoequb LAPACK_GLOBAL_SUFFIX(spoequb,SPOEQUB)
 void LAPACK_spoequb(
     lapack_int const* n,
     float const* A, lapack_int const* lda,
@@ -12756,7 +13023,7 @@ void LAPACK_spoequb(
     float* amax,
     lapack_int* info );
 
-#define LAPACK_zpoequb LAPACK_GLOBAL(zpoequb,ZPOEQUB)
+#define LAPACK_zpoequb LAPACK_GLOBAL_SUFFIX(zpoequb,ZPOEQUB)
 void LAPACK_zpoequb(
     lapack_int const* n,
     lapack_complex_double const* A, lapack_int const* lda,
@@ -12765,7 +13032,7 @@ void LAPACK_zpoequb(
     double* amax,
     lapack_int* info );
 
-#define LAPACK_cporfs_base LAPACK_GLOBAL(cporfs,CPORFS)
+#define LAPACK_cporfs_base LAPACK_GLOBAL_SUFFIX(cporfs,CPORFS)
 void LAPACK_cporfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -12779,7 +13046,7 @@ void LAPACK_cporfs_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12788,7 +13055,7 @@ void LAPACK_cporfs_base(
     #define LAPACK_cporfs(...) LAPACK_cporfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dporfs_base LAPACK_GLOBAL(dporfs,DPORFS)
+#define LAPACK_dporfs_base LAPACK_GLOBAL_SUFFIX(dporfs,DPORFS)
 void LAPACK_dporfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -12802,7 +13069,7 @@ void LAPACK_dporfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12811,7 +13078,7 @@ void LAPACK_dporfs_base(
     #define LAPACK_dporfs(...) LAPACK_dporfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sporfs_base LAPACK_GLOBAL(sporfs,SPORFS)
+#define LAPACK_sporfs_base LAPACK_GLOBAL_SUFFIX(sporfs,SPORFS)
 void LAPACK_sporfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -12825,7 +13092,7 @@ void LAPACK_sporfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12834,7 +13101,7 @@ void LAPACK_sporfs_base(
     #define LAPACK_sporfs(...) LAPACK_sporfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zporfs_base LAPACK_GLOBAL(zporfs,ZPORFS)
+#define LAPACK_zporfs_base LAPACK_GLOBAL_SUFFIX(zporfs,ZPORFS)
 void LAPACK_zporfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -12848,7 +13115,7 @@ void LAPACK_zporfs_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12857,7 +13124,7 @@ void LAPACK_zporfs_base(
     #define LAPACK_zporfs(...) LAPACK_zporfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cporfsx_base LAPACK_GLOBAL(cporfsx,CPORFSX)
+#define LAPACK_cporfsx_base LAPACK_GLOBAL_SUFFIX(cporfsx,CPORFSX)
 void LAPACK_cporfsx_base(
     char const* uplo, char const* equed,
     lapack_int const* n, lapack_int const* nrhs,
@@ -12875,7 +13142,7 @@ void LAPACK_cporfsx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12884,7 +13151,7 @@ void LAPACK_cporfsx_base(
     #define LAPACK_cporfsx(...) LAPACK_cporfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dporfsx_base LAPACK_GLOBAL(dporfsx,DPORFSX)
+#define LAPACK_dporfsx_base LAPACK_GLOBAL_SUFFIX(dporfsx,DPORFSX)
 void LAPACK_dporfsx_base(
     char const* uplo, char const* equed,
     lapack_int const* n, lapack_int const* nrhs,
@@ -12902,7 +13169,7 @@ void LAPACK_dporfsx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12911,7 +13178,7 @@ void LAPACK_dporfsx_base(
     #define LAPACK_dporfsx(...) LAPACK_dporfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sporfsx_base LAPACK_GLOBAL(sporfsx,SPORFSX)
+#define LAPACK_sporfsx_base LAPACK_GLOBAL_SUFFIX(sporfsx,SPORFSX)
 void LAPACK_sporfsx_base(
     char const* uplo, char const* equed,
     lapack_int const* n, lapack_int const* nrhs,
@@ -12929,7 +13196,7 @@ void LAPACK_sporfsx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12938,7 +13205,7 @@ void LAPACK_sporfsx_base(
     #define LAPACK_sporfsx(...) LAPACK_sporfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zporfsx_base LAPACK_GLOBAL(zporfsx,ZPORFSX)
+#define LAPACK_zporfsx_base LAPACK_GLOBAL_SUFFIX(zporfsx,ZPORFSX)
 void LAPACK_zporfsx_base(
     char const* uplo, char const* equed,
     lapack_int const* n, lapack_int const* nrhs,
@@ -12956,7 +13223,7 @@ void LAPACK_zporfsx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12965,7 +13232,7 @@ void LAPACK_zporfsx_base(
     #define LAPACK_zporfsx(...) LAPACK_zporfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cposv_base LAPACK_GLOBAL(cposv,CPOSV)
+#define LAPACK_cposv_base LAPACK_GLOBAL_SUFFIX(cposv,CPOSV)
 void LAPACK_cposv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -12973,7 +13240,7 @@ void LAPACK_cposv_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12982,7 +13249,7 @@ void LAPACK_cposv_base(
     #define LAPACK_cposv(...) LAPACK_cposv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dposv_base LAPACK_GLOBAL(dposv,DPOSV)
+#define LAPACK_dposv_base LAPACK_GLOBAL_SUFFIX(dposv,DPOSV)
 void LAPACK_dposv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -12990,7 +13257,7 @@ void LAPACK_dposv_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -12999,7 +13266,7 @@ void LAPACK_dposv_base(
     #define LAPACK_dposv(...) LAPACK_dposv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sposv_base LAPACK_GLOBAL(sposv,SPOSV)
+#define LAPACK_sposv_base LAPACK_GLOBAL_SUFFIX(sposv,SPOSV)
 void LAPACK_sposv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13007,7 +13274,7 @@ void LAPACK_sposv_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13016,7 +13283,7 @@ void LAPACK_sposv_base(
     #define LAPACK_sposv(...) LAPACK_sposv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zposv_base LAPACK_GLOBAL(zposv,ZPOSV)
+#define LAPACK_zposv_base LAPACK_GLOBAL_SUFFIX(zposv,ZPOSV)
 void LAPACK_zposv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13024,7 +13291,7 @@ void LAPACK_zposv_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13033,7 +13300,7 @@ void LAPACK_zposv_base(
     #define LAPACK_zposv(...) LAPACK_zposv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsposv_base LAPACK_GLOBAL(dsposv,DSPOSV)
+#define LAPACK_dsposv_base LAPACK_GLOBAL_SUFFIX(dsposv,DSPOSV)
 void LAPACK_dsposv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13044,7 +13311,7 @@ void LAPACK_dsposv_base(
     float* swork, lapack_int* iter,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13053,7 +13320,7 @@ void LAPACK_dsposv_base(
     #define LAPACK_dsposv(...) LAPACK_dsposv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zcposv_base LAPACK_GLOBAL(zcposv,ZCPOSV)
+#define LAPACK_zcposv_base LAPACK_GLOBAL_SUFFIX(zcposv,ZCPOSV)
 void LAPACK_zcposv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13065,7 +13332,7 @@ void LAPACK_zcposv_base(
     double* rwork, lapack_int* iter,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13074,7 +13341,7 @@ void LAPACK_zcposv_base(
     #define LAPACK_zcposv(...) LAPACK_zcposv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cposvx_base LAPACK_GLOBAL(cposvx,CPOSVX)
+#define LAPACK_cposvx_base LAPACK_GLOBAL_SUFFIX(cposvx,CPOSVX)
 void LAPACK_cposvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13091,7 +13358,7 @@ void LAPACK_cposvx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13100,7 +13367,7 @@ void LAPACK_cposvx_base(
     #define LAPACK_cposvx(...) LAPACK_cposvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dposvx_base LAPACK_GLOBAL(dposvx,DPOSVX)
+#define LAPACK_dposvx_base LAPACK_GLOBAL_SUFFIX(dposvx,DPOSVX)
 void LAPACK_dposvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13117,7 +13384,7 @@ void LAPACK_dposvx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13126,7 +13393,7 @@ void LAPACK_dposvx_base(
     #define LAPACK_dposvx(...) LAPACK_dposvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sposvx_base LAPACK_GLOBAL(sposvx,SPOSVX)
+#define LAPACK_sposvx_base LAPACK_GLOBAL_SUFFIX(sposvx,SPOSVX)
 void LAPACK_sposvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13143,7 +13410,7 @@ void LAPACK_sposvx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13152,7 +13419,7 @@ void LAPACK_sposvx_base(
     #define LAPACK_sposvx(...) LAPACK_sposvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zposvx_base LAPACK_GLOBAL(zposvx,ZPOSVX)
+#define LAPACK_zposvx_base LAPACK_GLOBAL_SUFFIX(zposvx,ZPOSVX)
 void LAPACK_zposvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13169,7 +13436,7 @@ void LAPACK_zposvx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13178,7 +13445,7 @@ void LAPACK_zposvx_base(
     #define LAPACK_zposvx(...) LAPACK_zposvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cposvxx_base LAPACK_GLOBAL(cposvxx,CPOSVXX)
+#define LAPACK_cposvxx_base LAPACK_GLOBAL_SUFFIX(cposvxx,CPOSVXX)
 void LAPACK_cposvxx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13198,7 +13465,7 @@ void LAPACK_cposvxx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13207,7 +13474,7 @@ void LAPACK_cposvxx_base(
     #define LAPACK_cposvxx(...) LAPACK_cposvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dposvxx_base LAPACK_GLOBAL(dposvxx,DPOSVXX)
+#define LAPACK_dposvxx_base LAPACK_GLOBAL_SUFFIX(dposvxx,DPOSVXX)
 void LAPACK_dposvxx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13227,7 +13494,7 @@ void LAPACK_dposvxx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13236,7 +13503,7 @@ void LAPACK_dposvxx_base(
     #define LAPACK_dposvxx(...) LAPACK_dposvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sposvxx_base LAPACK_GLOBAL(sposvxx,SPOSVXX)
+#define LAPACK_sposvxx_base LAPACK_GLOBAL_SUFFIX(sposvxx,SPOSVXX)
 void LAPACK_sposvxx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13256,7 +13523,7 @@ void LAPACK_sposvxx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13265,7 +13532,7 @@ void LAPACK_sposvxx_base(
     #define LAPACK_sposvxx(...) LAPACK_sposvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zposvxx_base LAPACK_GLOBAL(zposvxx,ZPOSVXX)
+#define LAPACK_zposvxx_base LAPACK_GLOBAL_SUFFIX(zposvxx,ZPOSVXX)
 void LAPACK_zposvxx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13285,7 +13552,7 @@ void LAPACK_zposvxx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13294,14 +13561,14 @@ void LAPACK_zposvxx_base(
     #define LAPACK_zposvxx(...) LAPACK_zposvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpotf2_base LAPACK_GLOBAL(cpotf2,CPOTF2)
+#define LAPACK_cpotf2_base LAPACK_GLOBAL_SUFFIX(cpotf2,CPOTF2)
 void LAPACK_cpotf2_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13310,14 +13577,14 @@ void LAPACK_cpotf2_base(
     #define LAPACK_cpotf2(...) LAPACK_cpotf2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpotf2_base LAPACK_GLOBAL(dpotf2,DPOTF2)
+#define LAPACK_dpotf2_base LAPACK_GLOBAL_SUFFIX(dpotf2,DPOTF2)
 void LAPACK_dpotf2_base(
     char const* uplo,
     lapack_int const* n,
     double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13326,14 +13593,14 @@ void LAPACK_dpotf2_base(
     #define LAPACK_dpotf2(...) LAPACK_dpotf2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spotf2_base LAPACK_GLOBAL(spotf2,SPOTF2)
+#define LAPACK_spotf2_base LAPACK_GLOBAL_SUFFIX(spotf2,SPOTF2)
 void LAPACK_spotf2_base(
     char const* uplo,
     lapack_int const* n,
     float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13342,14 +13609,14 @@ void LAPACK_spotf2_base(
     #define LAPACK_spotf2(...) LAPACK_spotf2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpotf2_base LAPACK_GLOBAL(zpotf2,ZPOTF2)
+#define LAPACK_zpotf2_base LAPACK_GLOBAL_SUFFIX(zpotf2,ZPOTF2)
 void LAPACK_zpotf2_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13358,14 +13625,14 @@ void LAPACK_zpotf2_base(
     #define LAPACK_zpotf2(...) LAPACK_zpotf2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpotrf_base LAPACK_GLOBAL(cpotrf,CPOTRF)
+#define LAPACK_cpotrf_base LAPACK_GLOBAL_SUFFIX(cpotrf,CPOTRF)
 void LAPACK_cpotrf_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13374,14 +13641,14 @@ void LAPACK_cpotrf_base(
     #define LAPACK_cpotrf(...) LAPACK_cpotrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpotrf_base LAPACK_GLOBAL(dpotrf,DPOTRF)
+#define LAPACK_dpotrf_base LAPACK_GLOBAL_SUFFIX(dpotrf,DPOTRF)
 void LAPACK_dpotrf_base(
     char const* uplo,
     lapack_int const* n,
     double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13390,14 +13657,14 @@ void LAPACK_dpotrf_base(
     #define LAPACK_dpotrf(...) LAPACK_dpotrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spotrf_base LAPACK_GLOBAL(spotrf,SPOTRF)
+#define LAPACK_spotrf_base LAPACK_GLOBAL_SUFFIX(spotrf,SPOTRF)
 void LAPACK_spotrf_base(
     char const* uplo,
     lapack_int const* n,
     float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13406,14 +13673,14 @@ void LAPACK_spotrf_base(
     #define LAPACK_spotrf(...) LAPACK_spotrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpotrf_base LAPACK_GLOBAL(zpotrf,ZPOTRF)
+#define LAPACK_zpotrf_base LAPACK_GLOBAL_SUFFIX(zpotrf,ZPOTRF)
 void LAPACK_zpotrf_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13422,14 +13689,14 @@ void LAPACK_zpotrf_base(
     #define LAPACK_zpotrf(...) LAPACK_zpotrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpotrf2_base LAPACK_GLOBAL(cpotrf2,CPOTRF2)
+#define LAPACK_cpotrf2_base LAPACK_GLOBAL_SUFFIX(cpotrf2,CPOTRF2)
 void LAPACK_cpotrf2_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13438,14 +13705,14 @@ void LAPACK_cpotrf2_base(
     #define LAPACK_cpotrf2(...) LAPACK_cpotrf2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpotrf2_base LAPACK_GLOBAL(dpotrf2,DPOTRF2)
+#define LAPACK_dpotrf2_base LAPACK_GLOBAL_SUFFIX(dpotrf2,DPOTRF2)
 void LAPACK_dpotrf2_base(
     char const* uplo,
     lapack_int const* n,
     double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13454,14 +13721,14 @@ void LAPACK_dpotrf2_base(
     #define LAPACK_dpotrf2(...) LAPACK_dpotrf2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spotrf2_base LAPACK_GLOBAL(spotrf2,SPOTRF2)
+#define LAPACK_spotrf2_base LAPACK_GLOBAL_SUFFIX(spotrf2,SPOTRF2)
 void LAPACK_spotrf2_base(
     char const* uplo,
     lapack_int const* n,
     float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13470,14 +13737,14 @@ void LAPACK_spotrf2_base(
     #define LAPACK_spotrf2(...) LAPACK_spotrf2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpotrf2_base LAPACK_GLOBAL(zpotrf2,ZPOTRF2)
+#define LAPACK_zpotrf2_base LAPACK_GLOBAL_SUFFIX(zpotrf2,ZPOTRF2)
 void LAPACK_zpotrf2_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13486,14 +13753,14 @@ void LAPACK_zpotrf2_base(
     #define LAPACK_zpotrf2(...) LAPACK_zpotrf2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpotri_base LAPACK_GLOBAL(cpotri,CPOTRI)
+#define LAPACK_cpotri_base LAPACK_GLOBAL_SUFFIX(cpotri,CPOTRI)
 void LAPACK_cpotri_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13502,14 +13769,14 @@ void LAPACK_cpotri_base(
     #define LAPACK_cpotri(...) LAPACK_cpotri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpotri_base LAPACK_GLOBAL(dpotri,DPOTRI)
+#define LAPACK_dpotri_base LAPACK_GLOBAL_SUFFIX(dpotri,DPOTRI)
 void LAPACK_dpotri_base(
     char const* uplo,
     lapack_int const* n,
     double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13518,14 +13785,14 @@ void LAPACK_dpotri_base(
     #define LAPACK_dpotri(...) LAPACK_dpotri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spotri_base LAPACK_GLOBAL(spotri,SPOTRI)
+#define LAPACK_spotri_base LAPACK_GLOBAL_SUFFIX(spotri,SPOTRI)
 void LAPACK_spotri_base(
     char const* uplo,
     lapack_int const* n,
     float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13534,14 +13801,14 @@ void LAPACK_spotri_base(
     #define LAPACK_spotri(...) LAPACK_spotri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpotri_base LAPACK_GLOBAL(zpotri,ZPOTRI)
+#define LAPACK_zpotri_base LAPACK_GLOBAL_SUFFIX(zpotri,ZPOTRI)
 void LAPACK_zpotri_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13550,7 +13817,7 @@ void LAPACK_zpotri_base(
     #define LAPACK_zpotri(...) LAPACK_zpotri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpotrs_base LAPACK_GLOBAL(cpotrs,CPOTRS)
+#define LAPACK_cpotrs_base LAPACK_GLOBAL_SUFFIX(cpotrs,CPOTRS)
 void LAPACK_cpotrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13558,7 +13825,7 @@ void LAPACK_cpotrs_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13567,7 +13834,7 @@ void LAPACK_cpotrs_base(
     #define LAPACK_cpotrs(...) LAPACK_cpotrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpotrs_base LAPACK_GLOBAL(dpotrs,DPOTRS)
+#define LAPACK_dpotrs_base LAPACK_GLOBAL_SUFFIX(dpotrs,DPOTRS)
 void LAPACK_dpotrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13575,7 +13842,7 @@ void LAPACK_dpotrs_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13584,7 +13851,7 @@ void LAPACK_dpotrs_base(
     #define LAPACK_dpotrs(...) LAPACK_dpotrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spotrs_base LAPACK_GLOBAL(spotrs,SPOTRS)
+#define LAPACK_spotrs_base LAPACK_GLOBAL_SUFFIX(spotrs,SPOTRS)
 void LAPACK_spotrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13592,7 +13859,7 @@ void LAPACK_spotrs_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13601,7 +13868,7 @@ void LAPACK_spotrs_base(
     #define LAPACK_spotrs(...) LAPACK_spotrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpotrs_base LAPACK_GLOBAL(zpotrs,ZPOTRS)
+#define LAPACK_zpotrs_base LAPACK_GLOBAL_SUFFIX(zpotrs,ZPOTRS)
 void LAPACK_zpotrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13609,7 +13876,7 @@ void LAPACK_zpotrs_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13618,7 +13885,7 @@ void LAPACK_zpotrs_base(
     #define LAPACK_zpotrs(...) LAPACK_zpotrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cppcon_base LAPACK_GLOBAL(cppcon,CPPCON)
+#define LAPACK_cppcon_base LAPACK_GLOBAL_SUFFIX(cppcon,CPPCON)
 void LAPACK_cppcon_base(
     char const* uplo,
     lapack_int const* n,
@@ -13629,7 +13896,7 @@ void LAPACK_cppcon_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13638,7 +13905,7 @@ void LAPACK_cppcon_base(
     #define LAPACK_cppcon(...) LAPACK_cppcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dppcon_base LAPACK_GLOBAL(dppcon,DPPCON)
+#define LAPACK_dppcon_base LAPACK_GLOBAL_SUFFIX(dppcon,DPPCON)
 void LAPACK_dppcon_base(
     char const* uplo,
     lapack_int const* n,
@@ -13649,7 +13916,7 @@ void LAPACK_dppcon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13658,7 +13925,7 @@ void LAPACK_dppcon_base(
     #define LAPACK_dppcon(...) LAPACK_dppcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sppcon_base LAPACK_GLOBAL(sppcon,SPPCON)
+#define LAPACK_sppcon_base LAPACK_GLOBAL_SUFFIX(sppcon,SPPCON)
 void LAPACK_sppcon_base(
     char const* uplo,
     lapack_int const* n,
@@ -13669,7 +13936,7 @@ void LAPACK_sppcon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13678,7 +13945,7 @@ void LAPACK_sppcon_base(
     #define LAPACK_sppcon(...) LAPACK_sppcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zppcon_base LAPACK_GLOBAL(zppcon,ZPPCON)
+#define LAPACK_zppcon_base LAPACK_GLOBAL_SUFFIX(zppcon,ZPPCON)
 void LAPACK_zppcon_base(
     char const* uplo,
     lapack_int const* n,
@@ -13689,7 +13956,7 @@ void LAPACK_zppcon_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13698,7 +13965,7 @@ void LAPACK_zppcon_base(
     #define LAPACK_zppcon(...) LAPACK_zppcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cppequ_base LAPACK_GLOBAL(cppequ,CPPEQU)
+#define LAPACK_cppequ_base LAPACK_GLOBAL_SUFFIX(cppequ,CPPEQU)
 void LAPACK_cppequ_base(
     char const* uplo,
     lapack_int const* n,
@@ -13708,7 +13975,7 @@ void LAPACK_cppequ_base(
     float* amax,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13717,7 +13984,7 @@ void LAPACK_cppequ_base(
     #define LAPACK_cppequ(...) LAPACK_cppequ_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dppequ_base LAPACK_GLOBAL(dppequ,DPPEQU)
+#define LAPACK_dppequ_base LAPACK_GLOBAL_SUFFIX(dppequ,DPPEQU)
 void LAPACK_dppequ_base(
     char const* uplo,
     lapack_int const* n,
@@ -13727,7 +13994,7 @@ void LAPACK_dppequ_base(
     double* amax,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13736,7 +14003,7 @@ void LAPACK_dppequ_base(
     #define LAPACK_dppequ(...) LAPACK_dppequ_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sppequ_base LAPACK_GLOBAL(sppequ,SPPEQU)
+#define LAPACK_sppequ_base LAPACK_GLOBAL_SUFFIX(sppequ,SPPEQU)
 void LAPACK_sppequ_base(
     char const* uplo,
     lapack_int const* n,
@@ -13746,7 +14013,7 @@ void LAPACK_sppequ_base(
     float* amax,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13755,7 +14022,7 @@ void LAPACK_sppequ_base(
     #define LAPACK_sppequ(...) LAPACK_sppequ_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zppequ_base LAPACK_GLOBAL(zppequ,ZPPEQU)
+#define LAPACK_zppequ_base LAPACK_GLOBAL_SUFFIX(zppequ,ZPPEQU)
 void LAPACK_zppequ_base(
     char const* uplo,
     lapack_int const* n,
@@ -13765,7 +14032,7 @@ void LAPACK_zppequ_base(
     double* amax,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13774,7 +14041,7 @@ void LAPACK_zppequ_base(
     #define LAPACK_zppequ(...) LAPACK_zppequ_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpprfs_base LAPACK_GLOBAL(cpprfs,CPPRFS)
+#define LAPACK_cpprfs_base LAPACK_GLOBAL_SUFFIX(cpprfs,CPPRFS)
 void LAPACK_cpprfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13788,7 +14055,7 @@ void LAPACK_cpprfs_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13797,7 +14064,7 @@ void LAPACK_cpprfs_base(
     #define LAPACK_cpprfs(...) LAPACK_cpprfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpprfs_base LAPACK_GLOBAL(dpprfs,DPPRFS)
+#define LAPACK_dpprfs_base LAPACK_GLOBAL_SUFFIX(dpprfs,DPPRFS)
 void LAPACK_dpprfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13811,7 +14078,7 @@ void LAPACK_dpprfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13820,7 +14087,7 @@ void LAPACK_dpprfs_base(
     #define LAPACK_dpprfs(...) LAPACK_dpprfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spprfs_base LAPACK_GLOBAL(spprfs,SPPRFS)
+#define LAPACK_spprfs_base LAPACK_GLOBAL_SUFFIX(spprfs,SPPRFS)
 void LAPACK_spprfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13834,7 +14101,7 @@ void LAPACK_spprfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13843,7 +14110,7 @@ void LAPACK_spprfs_base(
     #define LAPACK_spprfs(...) LAPACK_spprfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpprfs_base LAPACK_GLOBAL(zpprfs,ZPPRFS)
+#define LAPACK_zpprfs_base LAPACK_GLOBAL_SUFFIX(zpprfs,ZPPRFS)
 void LAPACK_zpprfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13857,7 +14124,7 @@ void LAPACK_zpprfs_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13866,7 +14133,7 @@ void LAPACK_zpprfs_base(
     #define LAPACK_zpprfs(...) LAPACK_zpprfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cppsv_base LAPACK_GLOBAL(cppsv,CPPSV)
+#define LAPACK_cppsv_base LAPACK_GLOBAL_SUFFIX(cppsv,CPPSV)
 void LAPACK_cppsv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13874,7 +14141,7 @@ void LAPACK_cppsv_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13883,7 +14150,7 @@ void LAPACK_cppsv_base(
     #define LAPACK_cppsv(...) LAPACK_cppsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dppsv_base LAPACK_GLOBAL(dppsv,DPPSV)
+#define LAPACK_dppsv_base LAPACK_GLOBAL_SUFFIX(dppsv,DPPSV)
 void LAPACK_dppsv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13891,7 +14158,7 @@ void LAPACK_dppsv_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13900,7 +14167,7 @@ void LAPACK_dppsv_base(
     #define LAPACK_dppsv(...) LAPACK_dppsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sppsv_base LAPACK_GLOBAL(sppsv,SPPSV)
+#define LAPACK_sppsv_base LAPACK_GLOBAL_SUFFIX(sppsv,SPPSV)
 void LAPACK_sppsv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13908,7 +14175,7 @@ void LAPACK_sppsv_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13917,7 +14184,7 @@ void LAPACK_sppsv_base(
     #define LAPACK_sppsv(...) LAPACK_sppsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zppsv_base LAPACK_GLOBAL(zppsv,ZPPSV)
+#define LAPACK_zppsv_base LAPACK_GLOBAL_SUFFIX(zppsv,ZPPSV)
 void LAPACK_zppsv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13925,7 +14192,7 @@ void LAPACK_zppsv_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13934,7 +14201,7 @@ void LAPACK_zppsv_base(
     #define LAPACK_zppsv(...) LAPACK_zppsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cppsvx_base LAPACK_GLOBAL(cppsvx,CPPSVX)
+#define LAPACK_cppsvx_base LAPACK_GLOBAL_SUFFIX(cppsvx,CPPSVX)
 void LAPACK_cppsvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13951,7 +14218,7 @@ void LAPACK_cppsvx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13960,7 +14227,7 @@ void LAPACK_cppsvx_base(
     #define LAPACK_cppsvx(...) LAPACK_cppsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dppsvx_base LAPACK_GLOBAL(dppsvx,DPPSVX)
+#define LAPACK_dppsvx_base LAPACK_GLOBAL_SUFFIX(dppsvx,DPPSVX)
 void LAPACK_dppsvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -13977,7 +14244,7 @@ void LAPACK_dppsvx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -13986,7 +14253,7 @@ void LAPACK_dppsvx_base(
     #define LAPACK_dppsvx(...) LAPACK_dppsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sppsvx_base LAPACK_GLOBAL(sppsvx,SPPSVX)
+#define LAPACK_sppsvx_base LAPACK_GLOBAL_SUFFIX(sppsvx,SPPSVX)
 void LAPACK_sppsvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -14003,7 +14270,7 @@ void LAPACK_sppsvx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14012,7 +14279,7 @@ void LAPACK_sppsvx_base(
     #define LAPACK_sppsvx(...) LAPACK_sppsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zppsvx_base LAPACK_GLOBAL(zppsvx,ZPPSVX)
+#define LAPACK_zppsvx_base LAPACK_GLOBAL_SUFFIX(zppsvx,ZPPSVX)
 void LAPACK_zppsvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -14029,7 +14296,7 @@ void LAPACK_zppsvx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14038,14 +14305,14 @@ void LAPACK_zppsvx_base(
     #define LAPACK_zppsvx(...) LAPACK_zppsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpptrf_base LAPACK_GLOBAL(cpptrf,CPPTRF)
+#define LAPACK_cpptrf_base LAPACK_GLOBAL_SUFFIX(cpptrf,CPPTRF)
 void LAPACK_cpptrf_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_float* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14054,14 +14321,14 @@ void LAPACK_cpptrf_base(
     #define LAPACK_cpptrf(...) LAPACK_cpptrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpptrf_base LAPACK_GLOBAL(dpptrf,DPPTRF)
+#define LAPACK_dpptrf_base LAPACK_GLOBAL_SUFFIX(dpptrf,DPPTRF)
 void LAPACK_dpptrf_base(
     char const* uplo,
     lapack_int const* n,
     double* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14070,14 +14337,14 @@ void LAPACK_dpptrf_base(
     #define LAPACK_dpptrf(...) LAPACK_dpptrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spptrf_base LAPACK_GLOBAL(spptrf,SPPTRF)
+#define LAPACK_spptrf_base LAPACK_GLOBAL_SUFFIX(spptrf,SPPTRF)
 void LAPACK_spptrf_base(
     char const* uplo,
     lapack_int const* n,
     float* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14086,14 +14353,14 @@ void LAPACK_spptrf_base(
     #define LAPACK_spptrf(...) LAPACK_spptrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpptrf_base LAPACK_GLOBAL(zpptrf,ZPPTRF)
+#define LAPACK_zpptrf_base LAPACK_GLOBAL_SUFFIX(zpptrf,ZPPTRF)
 void LAPACK_zpptrf_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_double* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14102,14 +14369,14 @@ void LAPACK_zpptrf_base(
     #define LAPACK_zpptrf(...) LAPACK_zpptrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpptri_base LAPACK_GLOBAL(cpptri,CPPTRI)
+#define LAPACK_cpptri_base LAPACK_GLOBAL_SUFFIX(cpptri,CPPTRI)
 void LAPACK_cpptri_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_float* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14118,14 +14385,14 @@ void LAPACK_cpptri_base(
     #define LAPACK_cpptri(...) LAPACK_cpptri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpptri_base LAPACK_GLOBAL(dpptri,DPPTRI)
+#define LAPACK_dpptri_base LAPACK_GLOBAL_SUFFIX(dpptri,DPPTRI)
 void LAPACK_dpptri_base(
     char const* uplo,
     lapack_int const* n,
     double* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14134,14 +14401,14 @@ void LAPACK_dpptri_base(
     #define LAPACK_dpptri(...) LAPACK_dpptri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spptri_base LAPACK_GLOBAL(spptri,SPPTRI)
+#define LAPACK_spptri_base LAPACK_GLOBAL_SUFFIX(spptri,SPPTRI)
 void LAPACK_spptri_base(
     char const* uplo,
     lapack_int const* n,
     float* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14150,14 +14417,14 @@ void LAPACK_spptri_base(
     #define LAPACK_spptri(...) LAPACK_spptri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpptri_base LAPACK_GLOBAL(zpptri,ZPPTRI)
+#define LAPACK_zpptri_base LAPACK_GLOBAL_SUFFIX(zpptri,ZPPTRI)
 void LAPACK_zpptri_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_double* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14166,7 +14433,7 @@ void LAPACK_zpptri_base(
     #define LAPACK_zpptri(...) LAPACK_zpptri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpptrs_base LAPACK_GLOBAL(cpptrs,CPPTRS)
+#define LAPACK_cpptrs_base LAPACK_GLOBAL_SUFFIX(cpptrs,CPPTRS)
 void LAPACK_cpptrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -14174,7 +14441,7 @@ void LAPACK_cpptrs_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14183,7 +14450,7 @@ void LAPACK_cpptrs_base(
     #define LAPACK_cpptrs(...) LAPACK_cpptrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpptrs_base LAPACK_GLOBAL(dpptrs,DPPTRS)
+#define LAPACK_dpptrs_base LAPACK_GLOBAL_SUFFIX(dpptrs,DPPTRS)
 void LAPACK_dpptrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -14191,7 +14458,7 @@ void LAPACK_dpptrs_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14200,7 +14467,7 @@ void LAPACK_dpptrs_base(
     #define LAPACK_dpptrs(...) LAPACK_dpptrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spptrs_base LAPACK_GLOBAL(spptrs,SPPTRS)
+#define LAPACK_spptrs_base LAPACK_GLOBAL_SUFFIX(spptrs,SPPTRS)
 void LAPACK_spptrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -14208,7 +14475,7 @@ void LAPACK_spptrs_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14217,7 +14484,7 @@ void LAPACK_spptrs_base(
     #define LAPACK_spptrs(...) LAPACK_spptrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpptrs_base LAPACK_GLOBAL(zpptrs,ZPPTRS)
+#define LAPACK_zpptrs_base LAPACK_GLOBAL_SUFFIX(zpptrs,ZPPTRS)
 void LAPACK_zpptrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -14225,7 +14492,7 @@ void LAPACK_zpptrs_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14234,7 +14501,7 @@ void LAPACK_zpptrs_base(
     #define LAPACK_zpptrs(...) LAPACK_zpptrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpstrf_base LAPACK_GLOBAL(cpstrf,CPSTRF)
+#define LAPACK_cpstrf_base LAPACK_GLOBAL_SUFFIX(cpstrf,CPSTRF)
 void LAPACK_cpstrf_base(
     char const* uplo,
     lapack_int const* n,
@@ -14243,7 +14510,7 @@ void LAPACK_cpstrf_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14252,7 +14519,7 @@ void LAPACK_cpstrf_base(
     #define LAPACK_cpstrf(...) LAPACK_cpstrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpstrf_base LAPACK_GLOBAL(dpstrf,DPSTRF)
+#define LAPACK_dpstrf_base LAPACK_GLOBAL_SUFFIX(dpstrf,DPSTRF)
 void LAPACK_dpstrf_base(
     char const* uplo,
     lapack_int const* n,
@@ -14261,7 +14528,7 @@ void LAPACK_dpstrf_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14270,7 +14537,7 @@ void LAPACK_dpstrf_base(
     #define LAPACK_dpstrf(...) LAPACK_dpstrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spstrf_base LAPACK_GLOBAL(spstrf,SPSTRF)
+#define LAPACK_spstrf_base LAPACK_GLOBAL_SUFFIX(spstrf,SPSTRF)
 void LAPACK_spstrf_base(
     char const* uplo,
     lapack_int const* n,
@@ -14279,7 +14546,7 @@ void LAPACK_spstrf_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14288,7 +14555,7 @@ void LAPACK_spstrf_base(
     #define LAPACK_spstrf(...) LAPACK_spstrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpstrf_base LAPACK_GLOBAL(zpstrf,ZPSTRF)
+#define LAPACK_zpstrf_base LAPACK_GLOBAL_SUFFIX(zpstrf,ZPSTRF)
 void LAPACK_zpstrf_base(
     char const* uplo,
     lapack_int const* n,
@@ -14297,7 +14564,7 @@ void LAPACK_zpstrf_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14306,7 +14573,7 @@ void LAPACK_zpstrf_base(
     #define LAPACK_zpstrf(...) LAPACK_zpstrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cptcon LAPACK_GLOBAL(cptcon,CPTCON)
+#define LAPACK_cptcon LAPACK_GLOBAL_SUFFIX(cptcon,CPTCON)
 void LAPACK_cptcon(
     lapack_int const* n,
     float const* D,
@@ -14316,7 +14583,7 @@ void LAPACK_cptcon(
     float* rwork,
     lapack_int* info );
 
-#define LAPACK_dptcon LAPACK_GLOBAL(dptcon,DPTCON)
+#define LAPACK_dptcon LAPACK_GLOBAL_SUFFIX(dptcon,DPTCON)
 void LAPACK_dptcon(
     lapack_int const* n,
     double const* D,
@@ -14326,7 +14593,7 @@ void LAPACK_dptcon(
     double* work,
     lapack_int* info );
 
-#define LAPACK_sptcon LAPACK_GLOBAL(sptcon,SPTCON)
+#define LAPACK_sptcon LAPACK_GLOBAL_SUFFIX(sptcon,SPTCON)
 void LAPACK_sptcon(
     lapack_int const* n,
     float const* D,
@@ -14336,7 +14603,7 @@ void LAPACK_sptcon(
     float* work,
     lapack_int* info );
 
-#define LAPACK_zptcon LAPACK_GLOBAL(zptcon,ZPTCON)
+#define LAPACK_zptcon LAPACK_GLOBAL_SUFFIX(zptcon,ZPTCON)
 void LAPACK_zptcon(
     lapack_int const* n,
     double const* D,
@@ -14346,7 +14613,7 @@ void LAPACK_zptcon(
     double* rwork,
     lapack_int* info );
 
-#define LAPACK_cpteqr_base LAPACK_GLOBAL(cpteqr,CPTEQR)
+#define LAPACK_cpteqr_base LAPACK_GLOBAL_SUFFIX(cpteqr,CPTEQR)
 void LAPACK_cpteqr_base(
     char const* compz,
     lapack_int const* n,
@@ -14356,7 +14623,7 @@ void LAPACK_cpteqr_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14365,7 +14632,7 @@ void LAPACK_cpteqr_base(
     #define LAPACK_cpteqr(...) LAPACK_cpteqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpteqr_base LAPACK_GLOBAL(dpteqr,DPTEQR)
+#define LAPACK_dpteqr_base LAPACK_GLOBAL_SUFFIX(dpteqr,DPTEQR)
 void LAPACK_dpteqr_base(
     char const* compz,
     lapack_int const* n,
@@ -14375,7 +14642,7 @@ void LAPACK_dpteqr_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14384,7 +14651,7 @@ void LAPACK_dpteqr_base(
     #define LAPACK_dpteqr(...) LAPACK_dpteqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_spteqr_base LAPACK_GLOBAL(spteqr,SPTEQR)
+#define LAPACK_spteqr_base LAPACK_GLOBAL_SUFFIX(spteqr,SPTEQR)
 void LAPACK_spteqr_base(
     char const* compz,
     lapack_int const* n,
@@ -14394,7 +14661,7 @@ void LAPACK_spteqr_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14403,7 +14670,7 @@ void LAPACK_spteqr_base(
     #define LAPACK_spteqr(...) LAPACK_spteqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zpteqr_base LAPACK_GLOBAL(zpteqr,ZPTEQR)
+#define LAPACK_zpteqr_base LAPACK_GLOBAL_SUFFIX(zpteqr,ZPTEQR)
 void LAPACK_zpteqr_base(
     char const* compz,
     lapack_int const* n,
@@ -14413,7 +14680,7 @@ void LAPACK_zpteqr_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14422,7 +14689,7 @@ void LAPACK_zpteqr_base(
     #define LAPACK_zpteqr(...) LAPACK_zpteqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cptrfs_base LAPACK_GLOBAL(cptrfs,CPTRFS)
+#define LAPACK_cptrfs_base LAPACK_GLOBAL_SUFFIX(cptrfs,CPTRFS)
 void LAPACK_cptrfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -14438,7 +14705,7 @@ void LAPACK_cptrfs_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14447,7 +14714,7 @@ void LAPACK_cptrfs_base(
     #define LAPACK_cptrfs(...) LAPACK_cptrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dptrfs LAPACK_GLOBAL(dptrfs,DPTRFS)
+#define LAPACK_dptrfs LAPACK_GLOBAL_SUFFIX(dptrfs,DPTRFS)
 void LAPACK_dptrfs(
     lapack_int const* n, lapack_int const* nrhs,
     double const* D,
@@ -14461,7 +14728,7 @@ void LAPACK_dptrfs(
     double* work,
     lapack_int* info );
 
-#define LAPACK_sptrfs LAPACK_GLOBAL(sptrfs,SPTRFS)
+#define LAPACK_sptrfs LAPACK_GLOBAL_SUFFIX(sptrfs,SPTRFS)
 void LAPACK_sptrfs(
     lapack_int const* n, lapack_int const* nrhs,
     float const* D,
@@ -14475,7 +14742,7 @@ void LAPACK_sptrfs(
     float* work,
     lapack_int* info );
 
-#define LAPACK_zptrfs_base LAPACK_GLOBAL(zptrfs,ZPTRFS)
+#define LAPACK_zptrfs_base LAPACK_GLOBAL_SUFFIX(zptrfs,ZPTRFS)
 void LAPACK_zptrfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -14491,7 +14758,7 @@ void LAPACK_zptrfs_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14500,7 +14767,7 @@ void LAPACK_zptrfs_base(
     #define LAPACK_zptrfs(...) LAPACK_zptrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cptsv LAPACK_GLOBAL(cptsv,CPTSV)
+#define LAPACK_cptsv LAPACK_GLOBAL_SUFFIX(cptsv,CPTSV)
 void LAPACK_cptsv(
     lapack_int const* n, lapack_int const* nrhs,
     float* D,
@@ -14508,7 +14775,7 @@ void LAPACK_cptsv(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_dptsv LAPACK_GLOBAL(dptsv,DPTSV)
+#define LAPACK_dptsv LAPACK_GLOBAL_SUFFIX(dptsv,DPTSV)
 void LAPACK_dptsv(
     lapack_int const* n, lapack_int const* nrhs,
     double* D,
@@ -14516,7 +14783,7 @@ void LAPACK_dptsv(
     double* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_sptsv LAPACK_GLOBAL(sptsv,SPTSV)
+#define LAPACK_sptsv LAPACK_GLOBAL_SUFFIX(sptsv,SPTSV)
 void LAPACK_sptsv(
     lapack_int const* n, lapack_int const* nrhs,
     float* D,
@@ -14524,7 +14791,7 @@ void LAPACK_sptsv(
     float* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_zptsv LAPACK_GLOBAL(zptsv,ZPTSV)
+#define LAPACK_zptsv LAPACK_GLOBAL_SUFFIX(zptsv,ZPTSV)
 void LAPACK_zptsv(
     lapack_int const* n, lapack_int const* nrhs,
     double* D,
@@ -14532,7 +14799,7 @@ void LAPACK_zptsv(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_cptsvx_base LAPACK_GLOBAL(cptsvx,CPTSVX)
+#define LAPACK_cptsvx_base LAPACK_GLOBAL_SUFFIX(cptsvx,CPTSVX)
 void LAPACK_cptsvx_base(
     char const* fact,
     lapack_int const* n, lapack_int const* nrhs,
@@ -14549,7 +14816,7 @@ void LAPACK_cptsvx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14558,7 +14825,7 @@ void LAPACK_cptsvx_base(
     #define LAPACK_cptsvx(...) LAPACK_cptsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dptsvx_base LAPACK_GLOBAL(dptsvx,DPTSVX)
+#define LAPACK_dptsvx_base LAPACK_GLOBAL_SUFFIX(dptsvx,DPTSVX)
 void LAPACK_dptsvx_base(
     char const* fact,
     lapack_int const* n, lapack_int const* nrhs,
@@ -14574,7 +14841,7 @@ void LAPACK_dptsvx_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14583,7 +14850,7 @@ void LAPACK_dptsvx_base(
     #define LAPACK_dptsvx(...) LAPACK_dptsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sptsvx_base LAPACK_GLOBAL(sptsvx,SPTSVX)
+#define LAPACK_sptsvx_base LAPACK_GLOBAL_SUFFIX(sptsvx,SPTSVX)
 void LAPACK_sptsvx_base(
     char const* fact,
     lapack_int const* n, lapack_int const* nrhs,
@@ -14599,7 +14866,7 @@ void LAPACK_sptsvx_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14608,7 +14875,7 @@ void LAPACK_sptsvx_base(
     #define LAPACK_sptsvx(...) LAPACK_sptsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zptsvx_base LAPACK_GLOBAL(zptsvx,ZPTSVX)
+#define LAPACK_zptsvx_base LAPACK_GLOBAL_SUFFIX(zptsvx,ZPTSVX)
 void LAPACK_zptsvx_base(
     char const* fact,
     lapack_int const* n, lapack_int const* nrhs,
@@ -14625,7 +14892,7 @@ void LAPACK_zptsvx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14634,35 +14901,35 @@ void LAPACK_zptsvx_base(
     #define LAPACK_zptsvx(...) LAPACK_zptsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cpttrf LAPACK_GLOBAL(cpttrf,CPTTRF)
+#define LAPACK_cpttrf LAPACK_GLOBAL_SUFFIX(cpttrf,CPTTRF)
 void LAPACK_cpttrf(
     lapack_int const* n,
     float* D,
     lapack_complex_float* E,
     lapack_int* info );
 
-#define LAPACK_dpttrf LAPACK_GLOBAL(dpttrf,DPTTRF)
+#define LAPACK_dpttrf LAPACK_GLOBAL_SUFFIX(dpttrf,DPTTRF)
 void LAPACK_dpttrf(
     lapack_int const* n,
     double* D,
     double* E,
     lapack_int* info );
 
-#define LAPACK_spttrf LAPACK_GLOBAL(spttrf,SPTTRF)
+#define LAPACK_spttrf LAPACK_GLOBAL_SUFFIX(spttrf,SPTTRF)
 void LAPACK_spttrf(
     lapack_int const* n,
     float* D,
     float* E,
     lapack_int* info );
 
-#define LAPACK_zpttrf LAPACK_GLOBAL(zpttrf,ZPTTRF)
+#define LAPACK_zpttrf LAPACK_GLOBAL_SUFFIX(zpttrf,ZPTTRF)
 void LAPACK_zpttrf(
     lapack_int const* n,
     double* D,
     lapack_complex_double* E,
     lapack_int* info );
 
-#define LAPACK_cpttrs_base LAPACK_GLOBAL(cpttrs,CPTTRS)
+#define LAPACK_cpttrs_base LAPACK_GLOBAL_SUFFIX(cpttrs,CPTTRS)
 void LAPACK_cpttrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -14671,7 +14938,7 @@ void LAPACK_cpttrs_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14680,7 +14947,7 @@ void LAPACK_cpttrs_base(
     #define LAPACK_cpttrs(...) LAPACK_cpttrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dpttrs LAPACK_GLOBAL(dpttrs,DPTTRS)
+#define LAPACK_dpttrs LAPACK_GLOBAL_SUFFIX(dpttrs,DPTTRS)
 void LAPACK_dpttrs(
     lapack_int const* n, lapack_int const* nrhs,
     double const* D,
@@ -14688,7 +14955,7 @@ void LAPACK_dpttrs(
     double* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_spttrs LAPACK_GLOBAL(spttrs,SPTTRS)
+#define LAPACK_spttrs LAPACK_GLOBAL_SUFFIX(spttrs,SPTTRS)
 void LAPACK_spttrs(
     lapack_int const* n, lapack_int const* nrhs,
     float const* D,
@@ -14696,7 +14963,7 @@ void LAPACK_spttrs(
     float* B, lapack_int const* ldb,
     lapack_int* info );
 
-#define LAPACK_zpttrs_base LAPACK_GLOBAL(zpttrs,ZPTTRS)
+#define LAPACK_zpttrs_base LAPACK_GLOBAL_SUFFIX(zpttrs,ZPTTRS)
 void LAPACK_zpttrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -14705,7 +14972,7 @@ void LAPACK_zpttrs_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14714,7 +14981,7 @@ void LAPACK_zpttrs_base(
     #define LAPACK_zpttrs(...) LAPACK_zpttrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsbev_base LAPACK_GLOBAL(dsbev,DSBEV)
+#define LAPACK_dsbev_base LAPACK_GLOBAL_SUFFIX(dsbev,DSBEV)
 void LAPACK_dsbev_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -14724,7 +14991,7 @@ void LAPACK_dsbev_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14733,7 +15000,7 @@ void LAPACK_dsbev_base(
     #define LAPACK_dsbev(...) LAPACK_dsbev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssbev_base LAPACK_GLOBAL(ssbev,SSBEV)
+#define LAPACK_ssbev_base LAPACK_GLOBAL_SUFFIX(ssbev,SSBEV)
 void LAPACK_ssbev_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -14743,7 +15010,7 @@ void LAPACK_ssbev_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14752,7 +15019,7 @@ void LAPACK_ssbev_base(
     #define LAPACK_ssbev(...) LAPACK_ssbev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsbev_2stage_base LAPACK_GLOBAL(dsbev_2stage,DSBEV_2STAGE)
+#define LAPACK_dsbev_2stage_base LAPACK_GLOBAL_SUFFIX(dsbev_2stage,DSBEV_2STAGE)
 void LAPACK_dsbev_2stage_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -14762,7 +15029,7 @@ void LAPACK_dsbev_2stage_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14771,7 +15038,7 @@ void LAPACK_dsbev_2stage_base(
     #define LAPACK_dsbev_2stage(...) LAPACK_dsbev_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssbev_2stage_base LAPACK_GLOBAL(ssbev_2stage,SSBEV_2STAGE)
+#define LAPACK_ssbev_2stage_base LAPACK_GLOBAL_SUFFIX(ssbev_2stage,SSBEV_2STAGE)
 void LAPACK_ssbev_2stage_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -14781,7 +15048,7 @@ void LAPACK_ssbev_2stage_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14790,7 +15057,7 @@ void LAPACK_ssbev_2stage_base(
     #define LAPACK_ssbev_2stage(...) LAPACK_ssbev_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsbevd_base LAPACK_GLOBAL(dsbevd,DSBEVD)
+#define LAPACK_dsbevd_base LAPACK_GLOBAL_SUFFIX(dsbevd,DSBEVD)
 void LAPACK_dsbevd_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -14801,7 +15068,7 @@ void LAPACK_dsbevd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14810,7 +15077,7 @@ void LAPACK_dsbevd_base(
     #define LAPACK_dsbevd(...) LAPACK_dsbevd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssbevd_base LAPACK_GLOBAL(ssbevd,SSBEVD)
+#define LAPACK_ssbevd_base LAPACK_GLOBAL_SUFFIX(ssbevd,SSBEVD)
 void LAPACK_ssbevd_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -14821,7 +15088,7 @@ void LAPACK_ssbevd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14830,7 +15097,7 @@ void LAPACK_ssbevd_base(
     #define LAPACK_ssbevd(...) LAPACK_ssbevd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsbevd_2stage_base LAPACK_GLOBAL(dsbevd_2stage,DSBEVD_2STAGE)
+#define LAPACK_dsbevd_2stage_base LAPACK_GLOBAL_SUFFIX(dsbevd_2stage,DSBEVD_2STAGE)
 void LAPACK_dsbevd_2stage_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -14841,7 +15108,7 @@ void LAPACK_dsbevd_2stage_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14850,7 +15117,7 @@ void LAPACK_dsbevd_2stage_base(
     #define LAPACK_dsbevd_2stage(...) LAPACK_dsbevd_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssbevd_2stage_base LAPACK_GLOBAL(ssbevd_2stage,SSBEVD_2STAGE)
+#define LAPACK_ssbevd_2stage_base LAPACK_GLOBAL_SUFFIX(ssbevd_2stage,SSBEVD_2STAGE)
 void LAPACK_ssbevd_2stage_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -14861,7 +15128,7 @@ void LAPACK_ssbevd_2stage_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14870,7 +15137,7 @@ void LAPACK_ssbevd_2stage_base(
     #define LAPACK_ssbevd_2stage(...) LAPACK_ssbevd_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsbevx_base LAPACK_GLOBAL(dsbevx,DSBEVX)
+#define LAPACK_dsbevx_base LAPACK_GLOBAL_SUFFIX(dsbevx,DSBEVX)
 void LAPACK_dsbevx_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -14885,7 +15152,7 @@ void LAPACK_dsbevx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14894,7 +15161,7 @@ void LAPACK_dsbevx_base(
     #define LAPACK_dsbevx(...) LAPACK_dsbevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssbevx_base LAPACK_GLOBAL(ssbevx,SSBEVX)
+#define LAPACK_ssbevx_base LAPACK_GLOBAL_SUFFIX(ssbevx,SSBEVX)
 void LAPACK_ssbevx_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -14909,7 +15176,7 @@ void LAPACK_ssbevx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14918,7 +15185,7 @@ void LAPACK_ssbevx_base(
     #define LAPACK_ssbevx(...) LAPACK_ssbevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsbevx_2stage_base LAPACK_GLOBAL(dsbevx_2stage,DSBEVX_2STAGE)
+#define LAPACK_dsbevx_2stage_base LAPACK_GLOBAL_SUFFIX(dsbevx_2stage,DSBEVX_2STAGE)
 void LAPACK_dsbevx_2stage_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -14933,7 +15200,7 @@ void LAPACK_dsbevx_2stage_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14942,7 +15209,7 @@ void LAPACK_dsbevx_2stage_base(
     #define LAPACK_dsbevx_2stage(...) LAPACK_dsbevx_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssbevx_2stage_base LAPACK_GLOBAL(ssbevx_2stage,SSBEVX_2STAGE)
+#define LAPACK_ssbevx_2stage_base LAPACK_GLOBAL_SUFFIX(ssbevx_2stage,SSBEVX_2STAGE)
 void LAPACK_ssbevx_2stage_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -14957,7 +15224,7 @@ void LAPACK_ssbevx_2stage_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14966,7 +15233,7 @@ void LAPACK_ssbevx_2stage_base(
     #define LAPACK_ssbevx_2stage(...) LAPACK_ssbevx_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsbgst_base LAPACK_GLOBAL(dsbgst,DSBGST)
+#define LAPACK_dsbgst_base LAPACK_GLOBAL_SUFFIX(dsbgst,DSBGST)
 void LAPACK_dsbgst_base(
     char const* vect, char const* uplo,
     lapack_int const* n, lapack_int const* ka, lapack_int const* kb,
@@ -14976,7 +15243,7 @@ void LAPACK_dsbgst_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -14985,7 +15252,7 @@ void LAPACK_dsbgst_base(
     #define LAPACK_dsbgst(...) LAPACK_dsbgst_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssbgst_base LAPACK_GLOBAL(ssbgst,SSBGST)
+#define LAPACK_ssbgst_base LAPACK_GLOBAL_SUFFIX(ssbgst,SSBGST)
 void LAPACK_ssbgst_base(
     char const* vect, char const* uplo,
     lapack_int const* n, lapack_int const* ka, lapack_int const* kb,
@@ -14995,7 +15262,7 @@ void LAPACK_ssbgst_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15004,7 +15271,7 @@ void LAPACK_ssbgst_base(
     #define LAPACK_ssbgst(...) LAPACK_ssbgst_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsbgv_base LAPACK_GLOBAL(dsbgv,DSBGV)
+#define LAPACK_dsbgv_base LAPACK_GLOBAL_SUFFIX(dsbgv,DSBGV)
 void LAPACK_dsbgv_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* ka, lapack_int const* kb,
@@ -15015,7 +15282,7 @@ void LAPACK_dsbgv_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15024,7 +15291,7 @@ void LAPACK_dsbgv_base(
     #define LAPACK_dsbgv(...) LAPACK_dsbgv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssbgv_base LAPACK_GLOBAL(ssbgv,SSBGV)
+#define LAPACK_ssbgv_base LAPACK_GLOBAL_SUFFIX(ssbgv,SSBGV)
 void LAPACK_ssbgv_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* ka, lapack_int const* kb,
@@ -15035,7 +15302,7 @@ void LAPACK_ssbgv_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15044,7 +15311,7 @@ void LAPACK_ssbgv_base(
     #define LAPACK_ssbgv(...) LAPACK_ssbgv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsbgvd_base LAPACK_GLOBAL(dsbgvd,DSBGVD)
+#define LAPACK_dsbgvd_base LAPACK_GLOBAL_SUFFIX(dsbgvd,DSBGVD)
 void LAPACK_dsbgvd_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* ka, lapack_int const* kb,
@@ -15056,7 +15323,7 @@ void LAPACK_dsbgvd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15065,7 +15332,7 @@ void LAPACK_dsbgvd_base(
     #define LAPACK_dsbgvd(...) LAPACK_dsbgvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssbgvd_base LAPACK_GLOBAL(ssbgvd,SSBGVD)
+#define LAPACK_ssbgvd_base LAPACK_GLOBAL_SUFFIX(ssbgvd,SSBGVD)
 void LAPACK_ssbgvd_base(
     char const* jobz, char const* uplo,
     lapack_int const* n, lapack_int const* ka, lapack_int const* kb,
@@ -15077,7 +15344,7 @@ void LAPACK_ssbgvd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15086,7 +15353,7 @@ void LAPACK_ssbgvd_base(
     #define LAPACK_ssbgvd(...) LAPACK_ssbgvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsbgvx_base LAPACK_GLOBAL(dsbgvx,DSBGVX)
+#define LAPACK_dsbgvx_base LAPACK_GLOBAL_SUFFIX(dsbgvx,DSBGVX)
 void LAPACK_dsbgvx_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n, lapack_int const* ka, lapack_int const* kb,
@@ -15102,7 +15369,7 @@ void LAPACK_dsbgvx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15111,7 +15378,7 @@ void LAPACK_dsbgvx_base(
     #define LAPACK_dsbgvx(...) LAPACK_dsbgvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssbgvx_base LAPACK_GLOBAL(ssbgvx,SSBGVX)
+#define LAPACK_ssbgvx_base LAPACK_GLOBAL_SUFFIX(ssbgvx,SSBGVX)
 void LAPACK_ssbgvx_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n, lapack_int const* ka, lapack_int const* kb,
@@ -15127,7 +15394,7 @@ void LAPACK_ssbgvx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15136,7 +15403,7 @@ void LAPACK_ssbgvx_base(
     #define LAPACK_ssbgvx(...) LAPACK_ssbgvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsbtrd_base LAPACK_GLOBAL(dsbtrd,DSBTRD)
+#define LAPACK_dsbtrd_base LAPACK_GLOBAL_SUFFIX(dsbtrd,DSBTRD)
 void LAPACK_dsbtrd_base(
     char const* vect, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -15147,7 +15414,7 @@ void LAPACK_dsbtrd_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15156,7 +15423,7 @@ void LAPACK_dsbtrd_base(
     #define LAPACK_dsbtrd(...) LAPACK_dsbtrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssbtrd_base LAPACK_GLOBAL(ssbtrd,SSBTRD)
+#define LAPACK_ssbtrd_base LAPACK_GLOBAL_SUFFIX(ssbtrd,SSBTRD)
 void LAPACK_ssbtrd_base(
     char const* vect, char const* uplo,
     lapack_int const* n, lapack_int const* kd,
@@ -15167,7 +15434,7 @@ void LAPACK_ssbtrd_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15176,7 +15443,7 @@ void LAPACK_ssbtrd_base(
     #define LAPACK_ssbtrd(...) LAPACK_ssbtrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsfrk_base LAPACK_GLOBAL(dsfrk,DSFRK)
+#define LAPACK_dsfrk_base LAPACK_GLOBAL_SUFFIX(dsfrk,DSFRK)
 void LAPACK_dsfrk_base(
     char const* transr, char const* uplo, char const* trans,
     lapack_int const* n, lapack_int const* k,
@@ -15185,7 +15452,7 @@ void LAPACK_dsfrk_base(
     double const* beta,
     double* C
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15194,7 +15461,7 @@ void LAPACK_dsfrk_base(
     #define LAPACK_dsfrk(...) LAPACK_dsfrk_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssfrk_base LAPACK_GLOBAL(ssfrk,SSFRK)
+#define LAPACK_ssfrk_base LAPACK_GLOBAL_SUFFIX(ssfrk,SSFRK)
 void LAPACK_ssfrk_base(
     char const* transr, char const* uplo, char const* trans,
     lapack_int const* n, lapack_int const* k,
@@ -15203,7 +15470,7 @@ void LAPACK_ssfrk_base(
     float const* beta,
     float* C
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15212,7 +15479,7 @@ void LAPACK_ssfrk_base(
     #define LAPACK_ssfrk(...) LAPACK_ssfrk_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cspcon_base LAPACK_GLOBAL(cspcon,CSPCON)
+#define LAPACK_cspcon_base LAPACK_GLOBAL_SUFFIX(cspcon,CSPCON)
 void LAPACK_cspcon_base(
     char const* uplo,
     lapack_int const* n,
@@ -15222,7 +15489,7 @@ void LAPACK_cspcon_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15231,7 +15498,7 @@ void LAPACK_cspcon_base(
     #define LAPACK_cspcon(...) LAPACK_cspcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dspcon_base LAPACK_GLOBAL(dspcon,DSPCON)
+#define LAPACK_dspcon_base LAPACK_GLOBAL_SUFFIX(dspcon,DSPCON)
 void LAPACK_dspcon_base(
     char const* uplo,
     lapack_int const* n,
@@ -15242,7 +15509,7 @@ void LAPACK_dspcon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15251,7 +15518,7 @@ void LAPACK_dspcon_base(
     #define LAPACK_dspcon(...) LAPACK_dspcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sspcon_base LAPACK_GLOBAL(sspcon,SSPCON)
+#define LAPACK_sspcon_base LAPACK_GLOBAL_SUFFIX(sspcon,SSPCON)
 void LAPACK_sspcon_base(
     char const* uplo,
     lapack_int const* n,
@@ -15262,7 +15529,7 @@ void LAPACK_sspcon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15271,7 +15538,7 @@ void LAPACK_sspcon_base(
     #define LAPACK_sspcon(...) LAPACK_sspcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zspcon_base LAPACK_GLOBAL(zspcon,ZSPCON)
+#define LAPACK_zspcon_base LAPACK_GLOBAL_SUFFIX(zspcon,ZSPCON)
 void LAPACK_zspcon_base(
     char const* uplo,
     lapack_int const* n,
@@ -15281,7 +15548,7 @@ void LAPACK_zspcon_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15290,7 +15557,7 @@ void LAPACK_zspcon_base(
     #define LAPACK_zspcon(...) LAPACK_zspcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dspev_base LAPACK_GLOBAL(dspev,DSPEV)
+#define LAPACK_dspev_base LAPACK_GLOBAL_SUFFIX(dspev,DSPEV)
 void LAPACK_dspev_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -15300,7 +15567,7 @@ void LAPACK_dspev_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15309,7 +15576,7 @@ void LAPACK_dspev_base(
     #define LAPACK_dspev(...) LAPACK_dspev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sspev_base LAPACK_GLOBAL(sspev,SSPEV)
+#define LAPACK_sspev_base LAPACK_GLOBAL_SUFFIX(sspev,SSPEV)
 void LAPACK_sspev_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -15319,7 +15586,7 @@ void LAPACK_sspev_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15328,7 +15595,7 @@ void LAPACK_sspev_base(
     #define LAPACK_sspev(...) LAPACK_sspev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dspevd_base LAPACK_GLOBAL(dspevd,DSPEVD)
+#define LAPACK_dspevd_base LAPACK_GLOBAL_SUFFIX(dspevd,DSPEVD)
 void LAPACK_dspevd_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -15339,7 +15606,7 @@ void LAPACK_dspevd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15348,7 +15615,7 @@ void LAPACK_dspevd_base(
     #define LAPACK_dspevd(...) LAPACK_dspevd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sspevd_base LAPACK_GLOBAL(sspevd,SSPEVD)
+#define LAPACK_sspevd_base LAPACK_GLOBAL_SUFFIX(sspevd,SSPEVD)
 void LAPACK_sspevd_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -15359,7 +15626,7 @@ void LAPACK_sspevd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15368,7 +15635,7 @@ void LAPACK_sspevd_base(
     #define LAPACK_sspevd(...) LAPACK_sspevd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dspevx_base LAPACK_GLOBAL(dspevx,DSPEVX)
+#define LAPACK_dspevx_base LAPACK_GLOBAL_SUFFIX(dspevx,DSPEVX)
 void LAPACK_dspevx_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -15382,7 +15649,7 @@ void LAPACK_dspevx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15391,7 +15658,7 @@ void LAPACK_dspevx_base(
     #define LAPACK_dspevx(...) LAPACK_dspevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sspevx_base LAPACK_GLOBAL(sspevx,SSPEVX)
+#define LAPACK_sspevx_base LAPACK_GLOBAL_SUFFIX(sspevx,SSPEVX)
 void LAPACK_sspevx_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -15405,7 +15672,7 @@ void LAPACK_sspevx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15414,7 +15681,7 @@ void LAPACK_sspevx_base(
     #define LAPACK_sspevx(...) LAPACK_sspevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dspgst_base LAPACK_GLOBAL(dspgst,DSPGST)
+#define LAPACK_dspgst_base LAPACK_GLOBAL_SUFFIX(dspgst,DSPGST)
 void LAPACK_dspgst_base(
     lapack_int const* itype, char const* uplo,
     lapack_int const* n,
@@ -15422,7 +15689,7 @@ void LAPACK_dspgst_base(
     double const* BP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15431,7 +15698,7 @@ void LAPACK_dspgst_base(
     #define LAPACK_dspgst(...) LAPACK_dspgst_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sspgst_base LAPACK_GLOBAL(sspgst,SSPGST)
+#define LAPACK_sspgst_base LAPACK_GLOBAL_SUFFIX(sspgst,SSPGST)
 void LAPACK_sspgst_base(
     lapack_int const* itype, char const* uplo,
     lapack_int const* n,
@@ -15439,7 +15706,7 @@ void LAPACK_sspgst_base(
     float const* BP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15448,7 +15715,7 @@ void LAPACK_sspgst_base(
     #define LAPACK_sspgst(...) LAPACK_sspgst_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dspgv_base LAPACK_GLOBAL(dspgv,DSPGV)
+#define LAPACK_dspgv_base LAPACK_GLOBAL_SUFFIX(dspgv,DSPGV)
 void LAPACK_dspgv_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -15459,7 +15726,7 @@ void LAPACK_dspgv_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15468,7 +15735,7 @@ void LAPACK_dspgv_base(
     #define LAPACK_dspgv(...) LAPACK_dspgv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sspgv_base LAPACK_GLOBAL(sspgv,SSPGV)
+#define LAPACK_sspgv_base LAPACK_GLOBAL_SUFFIX(sspgv,SSPGV)
 void LAPACK_sspgv_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -15479,7 +15746,7 @@ void LAPACK_sspgv_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15488,7 +15755,7 @@ void LAPACK_sspgv_base(
     #define LAPACK_sspgv(...) LAPACK_sspgv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dspgvd_base LAPACK_GLOBAL(dspgvd,DSPGVD)
+#define LAPACK_dspgvd_base LAPACK_GLOBAL_SUFFIX(dspgvd,DSPGVD)
 void LAPACK_dspgvd_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -15500,7 +15767,7 @@ void LAPACK_dspgvd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15509,7 +15776,7 @@ void LAPACK_dspgvd_base(
     #define LAPACK_dspgvd(...) LAPACK_dspgvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sspgvd_base LAPACK_GLOBAL(sspgvd,SSPGVD)
+#define LAPACK_sspgvd_base LAPACK_GLOBAL_SUFFIX(sspgvd,SSPGVD)
 void LAPACK_sspgvd_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -15521,7 +15788,7 @@ void LAPACK_sspgvd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15530,7 +15797,7 @@ void LAPACK_sspgvd_base(
     #define LAPACK_sspgvd(...) LAPACK_sspgvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dspgvx_base LAPACK_GLOBAL(dspgvx,DSPGVX)
+#define LAPACK_dspgvx_base LAPACK_GLOBAL_SUFFIX(dspgvx,DSPGVX)
 void LAPACK_dspgvx_base(
     lapack_int const* itype, char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -15545,7 +15812,7 @@ void LAPACK_dspgvx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15554,7 +15821,7 @@ void LAPACK_dspgvx_base(
     #define LAPACK_dspgvx(...) LAPACK_dspgvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sspgvx_base LAPACK_GLOBAL(sspgvx,SSPGVX)
+#define LAPACK_sspgvx_base LAPACK_GLOBAL_SUFFIX(sspgvx,SSPGVX)
 void LAPACK_sspgvx_base(
     lapack_int const* itype, char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -15569,7 +15836,7 @@ void LAPACK_sspgvx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15578,7 +15845,7 @@ void LAPACK_sspgvx_base(
     #define LAPACK_sspgvx(...) LAPACK_sspgvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csprfs_base LAPACK_GLOBAL(csprfs,CSPRFS)
+#define LAPACK_csprfs_base LAPACK_GLOBAL_SUFFIX(csprfs,CSPRFS)
 void LAPACK_csprfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -15592,7 +15859,7 @@ void LAPACK_csprfs_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15601,7 +15868,7 @@ void LAPACK_csprfs_base(
     #define LAPACK_csprfs(...) LAPACK_csprfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsprfs_base LAPACK_GLOBAL(dsprfs,DSPRFS)
+#define LAPACK_dsprfs_base LAPACK_GLOBAL_SUFFIX(dsprfs,DSPRFS)
 void LAPACK_dsprfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -15615,7 +15882,7 @@ void LAPACK_dsprfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15624,7 +15891,7 @@ void LAPACK_dsprfs_base(
     #define LAPACK_dsprfs(...) LAPACK_dsprfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssprfs_base LAPACK_GLOBAL(ssprfs,SSPRFS)
+#define LAPACK_ssprfs_base LAPACK_GLOBAL_SUFFIX(ssprfs,SSPRFS)
 void LAPACK_ssprfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -15638,7 +15905,7 @@ void LAPACK_ssprfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15647,7 +15914,7 @@ void LAPACK_ssprfs_base(
     #define LAPACK_ssprfs(...) LAPACK_ssprfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsprfs_base LAPACK_GLOBAL(zsprfs,ZSPRFS)
+#define LAPACK_zsprfs_base LAPACK_GLOBAL_SUFFIX(zsprfs,ZSPRFS)
 void LAPACK_zsprfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -15661,7 +15928,7 @@ void LAPACK_zsprfs_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15670,7 +15937,7 @@ void LAPACK_zsprfs_base(
     #define LAPACK_zsprfs(...) LAPACK_zsprfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cspsv_base LAPACK_GLOBAL(cspsv,CSPSV)
+#define LAPACK_cspsv_base LAPACK_GLOBAL_SUFFIX(cspsv,CSPSV)
 void LAPACK_cspsv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -15678,7 +15945,7 @@ void LAPACK_cspsv_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15687,7 +15954,7 @@ void LAPACK_cspsv_base(
     #define LAPACK_cspsv(...) LAPACK_cspsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dspsv_base LAPACK_GLOBAL(dspsv,DSPSV)
+#define LAPACK_dspsv_base LAPACK_GLOBAL_SUFFIX(dspsv,DSPSV)
 void LAPACK_dspsv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -15695,7 +15962,7 @@ void LAPACK_dspsv_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15704,7 +15971,7 @@ void LAPACK_dspsv_base(
     #define LAPACK_dspsv(...) LAPACK_dspsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sspsv_base LAPACK_GLOBAL(sspsv,SSPSV)
+#define LAPACK_sspsv_base LAPACK_GLOBAL_SUFFIX(sspsv,SSPSV)
 void LAPACK_sspsv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -15712,7 +15979,7 @@ void LAPACK_sspsv_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15721,7 +15988,7 @@ void LAPACK_sspsv_base(
     #define LAPACK_sspsv(...) LAPACK_sspsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zspsv_base LAPACK_GLOBAL(zspsv,ZSPSV)
+#define LAPACK_zspsv_base LAPACK_GLOBAL_SUFFIX(zspsv,ZSPSV)
 void LAPACK_zspsv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -15729,7 +15996,7 @@ void LAPACK_zspsv_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15738,7 +16005,7 @@ void LAPACK_zspsv_base(
     #define LAPACK_zspsv(...) LAPACK_zspsv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cspsvx_base LAPACK_GLOBAL(cspsvx,CSPSVX)
+#define LAPACK_cspsvx_base LAPACK_GLOBAL_SUFFIX(cspsvx,CSPSVX)
 void LAPACK_cspsvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -15753,7 +16020,7 @@ void LAPACK_cspsvx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15762,7 +16029,7 @@ void LAPACK_cspsvx_base(
     #define LAPACK_cspsvx(...) LAPACK_cspsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dspsvx_base LAPACK_GLOBAL(dspsvx,DSPSVX)
+#define LAPACK_dspsvx_base LAPACK_GLOBAL_SUFFIX(dspsvx,DSPSVX)
 void LAPACK_dspsvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -15777,7 +16044,7 @@ void LAPACK_dspsvx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15786,7 +16053,7 @@ void LAPACK_dspsvx_base(
     #define LAPACK_dspsvx(...) LAPACK_dspsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sspsvx_base LAPACK_GLOBAL(sspsvx,SSPSVX)
+#define LAPACK_sspsvx_base LAPACK_GLOBAL_SUFFIX(sspsvx,SSPSVX)
 void LAPACK_sspsvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -15801,7 +16068,7 @@ void LAPACK_sspsvx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15810,7 +16077,7 @@ void LAPACK_sspsvx_base(
     #define LAPACK_sspsvx(...) LAPACK_sspsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zspsvx_base LAPACK_GLOBAL(zspsvx,ZSPSVX)
+#define LAPACK_zspsvx_base LAPACK_GLOBAL_SUFFIX(zspsvx,ZSPSVX)
 void LAPACK_zspsvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -15825,7 +16092,7 @@ void LAPACK_zspsvx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15834,7 +16101,7 @@ void LAPACK_zspsvx_base(
     #define LAPACK_zspsvx(...) LAPACK_zspsvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsptrd_base LAPACK_GLOBAL(dsptrd,DSPTRD)
+#define LAPACK_dsptrd_base LAPACK_GLOBAL_SUFFIX(dsptrd,DSPTRD)
 void LAPACK_dsptrd_base(
     char const* uplo,
     lapack_int const* n,
@@ -15844,7 +16111,7 @@ void LAPACK_dsptrd_base(
     double* tau,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15853,7 +16120,7 @@ void LAPACK_dsptrd_base(
     #define LAPACK_dsptrd(...) LAPACK_dsptrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssptrd_base LAPACK_GLOBAL(ssptrd,SSPTRD)
+#define LAPACK_ssptrd_base LAPACK_GLOBAL_SUFFIX(ssptrd,SSPTRD)
 void LAPACK_ssptrd_base(
     char const* uplo,
     lapack_int const* n,
@@ -15863,7 +16130,7 @@ void LAPACK_ssptrd_base(
     float* tau,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15872,14 +16139,14 @@ void LAPACK_ssptrd_base(
     #define LAPACK_ssptrd(...) LAPACK_ssptrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csptrf_base LAPACK_GLOBAL(csptrf,CSPTRF)
+#define LAPACK_csptrf_base LAPACK_GLOBAL_SUFFIX(csptrf,CSPTRF)
 void LAPACK_csptrf_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_float* AP, lapack_int* ipiv,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15888,14 +16155,14 @@ void LAPACK_csptrf_base(
     #define LAPACK_csptrf(...) LAPACK_csptrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsptrf_base LAPACK_GLOBAL(dsptrf,DSPTRF)
+#define LAPACK_dsptrf_base LAPACK_GLOBAL_SUFFIX(dsptrf,DSPTRF)
 void LAPACK_dsptrf_base(
     char const* uplo,
     lapack_int const* n,
     double* AP, lapack_int* ipiv,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15904,14 +16171,14 @@ void LAPACK_dsptrf_base(
     #define LAPACK_dsptrf(...) LAPACK_dsptrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssptrf_base LAPACK_GLOBAL(ssptrf,SSPTRF)
+#define LAPACK_ssptrf_base LAPACK_GLOBAL_SUFFIX(ssptrf,SSPTRF)
 void LAPACK_ssptrf_base(
     char const* uplo,
     lapack_int const* n,
     float* AP, lapack_int* ipiv,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15920,14 +16187,14 @@ void LAPACK_ssptrf_base(
     #define LAPACK_ssptrf(...) LAPACK_ssptrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsptrf_base LAPACK_GLOBAL(zsptrf,ZSPTRF)
+#define LAPACK_zsptrf_base LAPACK_GLOBAL_SUFFIX(zsptrf,ZSPTRF)
 void LAPACK_zsptrf_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_double* AP, lapack_int* ipiv,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15936,7 +16203,7 @@ void LAPACK_zsptrf_base(
     #define LAPACK_zsptrf(...) LAPACK_zsptrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csptri_base LAPACK_GLOBAL(csptri,CSPTRI)
+#define LAPACK_csptri_base LAPACK_GLOBAL_SUFFIX(csptri,CSPTRI)
 void LAPACK_csptri_base(
     char const* uplo,
     lapack_int const* n,
@@ -15944,7 +16211,7 @@ void LAPACK_csptri_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15953,7 +16220,7 @@ void LAPACK_csptri_base(
     #define LAPACK_csptri(...) LAPACK_csptri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsptri_base LAPACK_GLOBAL(dsptri,DSPTRI)
+#define LAPACK_dsptri_base LAPACK_GLOBAL_SUFFIX(dsptri,DSPTRI)
 void LAPACK_dsptri_base(
     char const* uplo,
     lapack_int const* n,
@@ -15961,7 +16228,7 @@ void LAPACK_dsptri_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15970,7 +16237,7 @@ void LAPACK_dsptri_base(
     #define LAPACK_dsptri(...) LAPACK_dsptri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssptri_base LAPACK_GLOBAL(ssptri,SSPTRI)
+#define LAPACK_ssptri_base LAPACK_GLOBAL_SUFFIX(ssptri,SSPTRI)
 void LAPACK_ssptri_base(
     char const* uplo,
     lapack_int const* n,
@@ -15978,7 +16245,7 @@ void LAPACK_ssptri_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -15987,7 +16254,7 @@ void LAPACK_ssptri_base(
     #define LAPACK_ssptri(...) LAPACK_ssptri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsptri_base LAPACK_GLOBAL(zsptri,ZSPTRI)
+#define LAPACK_zsptri_base LAPACK_GLOBAL_SUFFIX(zsptri,ZSPTRI)
 void LAPACK_zsptri_base(
     char const* uplo,
     lapack_int const* n,
@@ -15995,7 +16262,7 @@ void LAPACK_zsptri_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16004,7 +16271,7 @@ void LAPACK_zsptri_base(
     #define LAPACK_zsptri(...) LAPACK_zsptri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csptrs_base LAPACK_GLOBAL(csptrs,CSPTRS)
+#define LAPACK_csptrs_base LAPACK_GLOBAL_SUFFIX(csptrs,CSPTRS)
 void LAPACK_csptrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -16012,7 +16279,7 @@ void LAPACK_csptrs_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16021,7 +16288,7 @@ void LAPACK_csptrs_base(
     #define LAPACK_csptrs(...) LAPACK_csptrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsptrs_base LAPACK_GLOBAL(dsptrs,DSPTRS)
+#define LAPACK_dsptrs_base LAPACK_GLOBAL_SUFFIX(dsptrs,DSPTRS)
 void LAPACK_dsptrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -16029,7 +16296,7 @@ void LAPACK_dsptrs_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16038,7 +16305,7 @@ void LAPACK_dsptrs_base(
     #define LAPACK_dsptrs(...) LAPACK_dsptrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssptrs_base LAPACK_GLOBAL(ssptrs,SSPTRS)
+#define LAPACK_ssptrs_base LAPACK_GLOBAL_SUFFIX(ssptrs,SSPTRS)
 void LAPACK_ssptrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -16046,7 +16313,7 @@ void LAPACK_ssptrs_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16055,7 +16322,7 @@ void LAPACK_ssptrs_base(
     #define LAPACK_ssptrs(...) LAPACK_ssptrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsptrs_base LAPACK_GLOBAL(zsptrs,ZSPTRS)
+#define LAPACK_zsptrs_base LAPACK_GLOBAL_SUFFIX(zsptrs,ZSPTRS)
 void LAPACK_zsptrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -16063,7 +16330,7 @@ void LAPACK_zsptrs_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16072,7 +16339,7 @@ void LAPACK_zsptrs_base(
     #define LAPACK_zsptrs(...) LAPACK_zsptrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dstebz_base LAPACK_GLOBAL(dstebz,DSTEBZ)
+#define LAPACK_dstebz_base LAPACK_GLOBAL_SUFFIX(dstebz,DSTEBZ)
 void LAPACK_dstebz_base(
     char const* range, char const* order,
     lapack_int const* n,
@@ -16086,7 +16353,7 @@ void LAPACK_dstebz_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16095,7 +16362,7 @@ void LAPACK_dstebz_base(
     #define LAPACK_dstebz(...) LAPACK_dstebz_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sstebz_base LAPACK_GLOBAL(sstebz,SSTEBZ)
+#define LAPACK_sstebz_base LAPACK_GLOBAL_SUFFIX(sstebz,SSTEBZ)
 void LAPACK_sstebz_base(
     char const* range, char const* order,
     lapack_int const* n,
@@ -16109,7 +16376,7 @@ void LAPACK_sstebz_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16118,7 +16385,7 @@ void LAPACK_sstebz_base(
     #define LAPACK_sstebz(...) LAPACK_sstebz_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cstedc_base LAPACK_GLOBAL(cstedc,CSTEDC)
+#define LAPACK_cstedc_base LAPACK_GLOBAL_SUFFIX(cstedc,CSTEDC)
 void LAPACK_cstedc_base(
     char const* compz,
     lapack_int const* n,
@@ -16130,7 +16397,7 @@ void LAPACK_cstedc_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16139,7 +16406,7 @@ void LAPACK_cstedc_base(
     #define LAPACK_cstedc(...) LAPACK_cstedc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dstedc_base LAPACK_GLOBAL(dstedc,DSTEDC)
+#define LAPACK_dstedc_base LAPACK_GLOBAL_SUFFIX(dstedc,DSTEDC)
 void LAPACK_dstedc_base(
     char const* compz,
     lapack_int const* n,
@@ -16150,7 +16417,7 @@ void LAPACK_dstedc_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16159,7 +16426,7 @@ void LAPACK_dstedc_base(
     #define LAPACK_dstedc(...) LAPACK_dstedc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sstedc_base LAPACK_GLOBAL(sstedc,SSTEDC)
+#define LAPACK_sstedc_base LAPACK_GLOBAL_SUFFIX(sstedc,SSTEDC)
 void LAPACK_sstedc_base(
     char const* compz,
     lapack_int const* n,
@@ -16170,7 +16437,7 @@ void LAPACK_sstedc_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16179,7 +16446,7 @@ void LAPACK_sstedc_base(
     #define LAPACK_sstedc(...) LAPACK_sstedc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zstedc_base LAPACK_GLOBAL(zstedc,ZSTEDC)
+#define LAPACK_zstedc_base LAPACK_GLOBAL_SUFFIX(zstedc,ZSTEDC)
 void LAPACK_zstedc_base(
     char const* compz,
     lapack_int const* n,
@@ -16191,7 +16458,7 @@ void LAPACK_zstedc_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16200,7 +16467,7 @@ void LAPACK_zstedc_base(
     #define LAPACK_zstedc(...) LAPACK_zstedc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cstegr_base LAPACK_GLOBAL(cstegr,CSTEGR)
+#define LAPACK_cstegr_base LAPACK_GLOBAL_SUFFIX(cstegr,CSTEGR)
 void LAPACK_cstegr_base(
     char const* jobz, char const* range,
     lapack_int const* n,
@@ -16215,7 +16482,7 @@ void LAPACK_cstegr_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16224,7 +16491,7 @@ void LAPACK_cstegr_base(
     #define LAPACK_cstegr(...) LAPACK_cstegr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dstegr_base LAPACK_GLOBAL(dstegr,DSTEGR)
+#define LAPACK_dstegr_base LAPACK_GLOBAL_SUFFIX(dstegr,DSTEGR)
 void LAPACK_dstegr_base(
     char const* jobz, char const* range,
     lapack_int const* n,
@@ -16239,7 +16506,7 @@ void LAPACK_dstegr_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16248,7 +16515,7 @@ void LAPACK_dstegr_base(
     #define LAPACK_dstegr(...) LAPACK_dstegr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sstegr_base LAPACK_GLOBAL(sstegr,SSTEGR)
+#define LAPACK_sstegr_base LAPACK_GLOBAL_SUFFIX(sstegr,SSTEGR)
 void LAPACK_sstegr_base(
     char const* jobz, char const* range,
     lapack_int const* n,
@@ -16263,7 +16530,7 @@ void LAPACK_sstegr_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16272,7 +16539,7 @@ void LAPACK_sstegr_base(
     #define LAPACK_sstegr(...) LAPACK_sstegr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zstegr_base LAPACK_GLOBAL(zstegr,ZSTEGR)
+#define LAPACK_zstegr_base LAPACK_GLOBAL_SUFFIX(zstegr,ZSTEGR)
 void LAPACK_zstegr_base(
     char const* jobz, char const* range,
     lapack_int const* n,
@@ -16287,7 +16554,7 @@ void LAPACK_zstegr_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16296,7 +16563,7 @@ void LAPACK_zstegr_base(
     #define LAPACK_zstegr(...) LAPACK_zstegr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cstein LAPACK_GLOBAL(cstein,CSTEIN)
+#define LAPACK_cstein LAPACK_GLOBAL_SUFFIX(cstein,CSTEIN)
 void LAPACK_cstein(
     lapack_int const* n,
     float const* D,
@@ -16307,7 +16574,7 @@ void LAPACK_cstein(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info );
 
-#define LAPACK_dstein LAPACK_GLOBAL(dstein,DSTEIN)
+#define LAPACK_dstein LAPACK_GLOBAL_SUFFIX(dstein,DSTEIN)
 void LAPACK_dstein(
     lapack_int const* n,
     double const* D,
@@ -16318,7 +16585,7 @@ void LAPACK_dstein(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info );
 
-#define LAPACK_sstein LAPACK_GLOBAL(sstein,SSTEIN)
+#define LAPACK_sstein LAPACK_GLOBAL_SUFFIX(sstein,SSTEIN)
 void LAPACK_sstein(
     lapack_int const* n,
     float const* D,
@@ -16329,7 +16596,7 @@ void LAPACK_sstein(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info );
 
-#define LAPACK_zstein LAPACK_GLOBAL(zstein,ZSTEIN)
+#define LAPACK_zstein LAPACK_GLOBAL_SUFFIX(zstein,ZSTEIN)
 void LAPACK_zstein(
     lapack_int const* n,
     double const* D,
@@ -16340,7 +16607,7 @@ void LAPACK_zstein(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info );
 
-#define LAPACK_cstemr_base LAPACK_GLOBAL(cstemr,CSTEMR)
+#define LAPACK_cstemr_base LAPACK_GLOBAL_SUFFIX(cstemr,CSTEMR)
 void LAPACK_cstemr_base(
     char const* jobz, char const* range,
     lapack_int const* n,
@@ -16354,7 +16621,7 @@ void LAPACK_cstemr_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16363,7 +16630,7 @@ void LAPACK_cstemr_base(
     #define LAPACK_cstemr(...) LAPACK_cstemr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dstemr_base LAPACK_GLOBAL(dstemr,DSTEMR)
+#define LAPACK_dstemr_base LAPACK_GLOBAL_SUFFIX(dstemr,DSTEMR)
 void LAPACK_dstemr_base(
     char const* jobz, char const* range,
     lapack_int const* n,
@@ -16377,7 +16644,7 @@ void LAPACK_dstemr_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16386,7 +16653,7 @@ void LAPACK_dstemr_base(
     #define LAPACK_dstemr(...) LAPACK_dstemr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sstemr_base LAPACK_GLOBAL(sstemr,SSTEMR)
+#define LAPACK_sstemr_base LAPACK_GLOBAL_SUFFIX(sstemr,SSTEMR)
 void LAPACK_sstemr_base(
     char const* jobz, char const* range,
     lapack_int const* n,
@@ -16400,7 +16667,7 @@ void LAPACK_sstemr_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16409,7 +16676,7 @@ void LAPACK_sstemr_base(
     #define LAPACK_sstemr(...) LAPACK_sstemr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zstemr_base LAPACK_GLOBAL(zstemr,ZSTEMR)
+#define LAPACK_zstemr_base LAPACK_GLOBAL_SUFFIX(zstemr,ZSTEMR)
 void LAPACK_zstemr_base(
     char const* jobz, char const* range,
     lapack_int const* n,
@@ -16423,7 +16690,7 @@ void LAPACK_zstemr_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16432,7 +16699,7 @@ void LAPACK_zstemr_base(
     #define LAPACK_zstemr(...) LAPACK_zstemr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csteqr_base LAPACK_GLOBAL(csteqr,CSTEQR)
+#define LAPACK_csteqr_base LAPACK_GLOBAL_SUFFIX(csteqr,CSTEQR)
 void LAPACK_csteqr_base(
     char const* compz,
     lapack_int const* n,
@@ -16442,7 +16709,7 @@ void LAPACK_csteqr_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16451,7 +16718,7 @@ void LAPACK_csteqr_base(
     #define LAPACK_csteqr(...) LAPACK_csteqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsteqr_base LAPACK_GLOBAL(dsteqr,DSTEQR)
+#define LAPACK_dsteqr_base LAPACK_GLOBAL_SUFFIX(dsteqr,DSTEQR)
 void LAPACK_dsteqr_base(
     char const* compz,
     lapack_int const* n,
@@ -16461,7 +16728,7 @@ void LAPACK_dsteqr_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16470,7 +16737,7 @@ void LAPACK_dsteqr_base(
     #define LAPACK_dsteqr(...) LAPACK_dsteqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssteqr_base LAPACK_GLOBAL(ssteqr,SSTEQR)
+#define LAPACK_ssteqr_base LAPACK_GLOBAL_SUFFIX(ssteqr,SSTEQR)
 void LAPACK_ssteqr_base(
     char const* compz,
     lapack_int const* n,
@@ -16480,7 +16747,7 @@ void LAPACK_ssteqr_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16489,7 +16756,7 @@ void LAPACK_ssteqr_base(
     #define LAPACK_ssteqr(...) LAPACK_ssteqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsteqr_base LAPACK_GLOBAL(zsteqr,ZSTEQR)
+#define LAPACK_zsteqr_base LAPACK_GLOBAL_SUFFIX(zsteqr,ZSTEQR)
 void LAPACK_zsteqr_base(
     char const* compz,
     lapack_int const* n,
@@ -16499,7 +16766,7 @@ void LAPACK_zsteqr_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16508,21 +16775,21 @@ void LAPACK_zsteqr_base(
     #define LAPACK_zsteqr(...) LAPACK_zsteqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsterf LAPACK_GLOBAL(dsterf,DSTERF)
+#define LAPACK_dsterf LAPACK_GLOBAL_SUFFIX(dsterf,DSTERF)
 void LAPACK_dsterf(
     lapack_int const* n,
     double* D,
     double* E,
     lapack_int* info );
 
-#define LAPACK_ssterf LAPACK_GLOBAL(ssterf,SSTERF)
+#define LAPACK_ssterf LAPACK_GLOBAL_SUFFIX(ssterf,SSTERF)
 void LAPACK_ssterf(
     lapack_int const* n,
     float* D,
     float* E,
     lapack_int* info );
 
-#define LAPACK_dstev_base LAPACK_GLOBAL(dstev,DSTEV)
+#define LAPACK_dstev_base LAPACK_GLOBAL_SUFFIX(dstev,DSTEV)
 void LAPACK_dstev_base(
     char const* jobz,
     lapack_int const* n,
@@ -16532,7 +16799,7 @@ void LAPACK_dstev_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16541,7 +16808,7 @@ void LAPACK_dstev_base(
     #define LAPACK_dstev(...) LAPACK_dstev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sstev_base LAPACK_GLOBAL(sstev,SSTEV)
+#define LAPACK_sstev_base LAPACK_GLOBAL_SUFFIX(sstev,SSTEV)
 void LAPACK_sstev_base(
     char const* jobz,
     lapack_int const* n,
@@ -16551,7 +16818,7 @@ void LAPACK_sstev_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16560,7 +16827,7 @@ void LAPACK_sstev_base(
     #define LAPACK_sstev(...) LAPACK_sstev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dstevd_base LAPACK_GLOBAL(dstevd,DSTEVD)
+#define LAPACK_dstevd_base LAPACK_GLOBAL_SUFFIX(dstevd,DSTEVD)
 void LAPACK_dstevd_base(
     char const* jobz,
     lapack_int const* n,
@@ -16571,7 +16838,7 @@ void LAPACK_dstevd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16580,7 +16847,7 @@ void LAPACK_dstevd_base(
     #define LAPACK_dstevd(...) LAPACK_dstevd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sstevd_base LAPACK_GLOBAL(sstevd,SSTEVD)
+#define LAPACK_sstevd_base LAPACK_GLOBAL_SUFFIX(sstevd,SSTEVD)
 void LAPACK_sstevd_base(
     char const* jobz,
     lapack_int const* n,
@@ -16591,7 +16858,7 @@ void LAPACK_sstevd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16600,7 +16867,7 @@ void LAPACK_sstevd_base(
     #define LAPACK_sstevd(...) LAPACK_sstevd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dstevr_base LAPACK_GLOBAL(dstevr,DSTEVR)
+#define LAPACK_dstevr_base LAPACK_GLOBAL_SUFFIX(dstevr,DSTEVR)
 void LAPACK_dstevr_base(
     char const* jobz, char const* range,
     lapack_int const* n,
@@ -16615,7 +16882,7 @@ void LAPACK_dstevr_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16624,7 +16891,7 @@ void LAPACK_dstevr_base(
     #define LAPACK_dstevr(...) LAPACK_dstevr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sstevr_base LAPACK_GLOBAL(sstevr,SSTEVR)
+#define LAPACK_sstevr_base LAPACK_GLOBAL_SUFFIX(sstevr,SSTEVR)
 void LAPACK_sstevr_base(
     char const* jobz, char const* range,
     lapack_int const* n,
@@ -16639,7 +16906,7 @@ void LAPACK_sstevr_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16648,7 +16915,7 @@ void LAPACK_sstevr_base(
     #define LAPACK_sstevr(...) LAPACK_sstevr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dstevx_base LAPACK_GLOBAL(dstevx,DSTEVX)
+#define LAPACK_dstevx_base LAPACK_GLOBAL_SUFFIX(dstevx,DSTEVX)
 void LAPACK_dstevx_base(
     char const* jobz, char const* range,
     lapack_int const* n,
@@ -16663,7 +16930,7 @@ void LAPACK_dstevx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16672,7 +16939,7 @@ void LAPACK_dstevx_base(
     #define LAPACK_dstevx(...) LAPACK_dstevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_sstevx_base LAPACK_GLOBAL(sstevx,SSTEVX)
+#define LAPACK_sstevx_base LAPACK_GLOBAL_SUFFIX(sstevx,SSTEVX)
 void LAPACK_sstevx_base(
     char const* jobz, char const* range,
     lapack_int const* n,
@@ -16687,7 +16954,7 @@ void LAPACK_sstevx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16696,7 +16963,7 @@ void LAPACK_sstevx_base(
     #define LAPACK_sstevx(...) LAPACK_sstevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csycon_base LAPACK_GLOBAL(csycon,CSYCON)
+#define LAPACK_csycon_base LAPACK_GLOBAL_SUFFIX(csycon,CSYCON)
 void LAPACK_csycon_base(
     char const* uplo,
     lapack_int const* n,
@@ -16706,7 +16973,7 @@ void LAPACK_csycon_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16715,7 +16982,7 @@ void LAPACK_csycon_base(
     #define LAPACK_csycon(...) LAPACK_csycon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsycon_base LAPACK_GLOBAL(dsycon,DSYCON)
+#define LAPACK_dsycon_base LAPACK_GLOBAL_SUFFIX(dsycon,DSYCON)
 void LAPACK_dsycon_base(
     char const* uplo,
     lapack_int const* n,
@@ -16726,7 +16993,7 @@ void LAPACK_dsycon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16735,7 +17002,7 @@ void LAPACK_dsycon_base(
     #define LAPACK_dsycon(...) LAPACK_dsycon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssycon_base LAPACK_GLOBAL(ssycon,SSYCON)
+#define LAPACK_ssycon_base LAPACK_GLOBAL_SUFFIX(ssycon,SSYCON)
 void LAPACK_ssycon_base(
     char const* uplo,
     lapack_int const* n,
@@ -16746,7 +17013,7 @@ void LAPACK_ssycon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16755,7 +17022,7 @@ void LAPACK_ssycon_base(
     #define LAPACK_ssycon(...) LAPACK_ssycon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsycon_base LAPACK_GLOBAL(zsycon,ZSYCON)
+#define LAPACK_zsycon_base LAPACK_GLOBAL_SUFFIX(zsycon,ZSYCON)
 void LAPACK_zsycon_base(
     char const* uplo,
     lapack_int const* n,
@@ -16765,7 +17032,7 @@ void LAPACK_zsycon_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16774,7 +17041,7 @@ void LAPACK_zsycon_base(
     #define LAPACK_zsycon(...) LAPACK_zsycon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csycon_3_base LAPACK_GLOBAL(csycon_3,CSYCON_3)
+#define LAPACK_csycon_3_base LAPACK_GLOBAL_SUFFIX(csycon_3,CSYCON_3)
 void LAPACK_csycon_3_base(
     char const* uplo,
     lapack_int const* n,
@@ -16785,7 +17052,7 @@ void LAPACK_csycon_3_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16794,7 +17061,7 @@ void LAPACK_csycon_3_base(
     #define LAPACK_csycon_3(...) LAPACK_csycon_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsycon_3_base LAPACK_GLOBAL(dsycon_3,DSYCON_3)
+#define LAPACK_dsycon_3_base LAPACK_GLOBAL_SUFFIX(dsycon_3,DSYCON_3)
 void LAPACK_dsycon_3_base(
     char const* uplo,
     lapack_int const* n,
@@ -16806,7 +17073,7 @@ void LAPACK_dsycon_3_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16815,7 +17082,7 @@ void LAPACK_dsycon_3_base(
     #define LAPACK_dsycon_3(...) LAPACK_dsycon_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssycon_3_base LAPACK_GLOBAL(ssycon_3,SSYCON_3)
+#define LAPACK_ssycon_3_base LAPACK_GLOBAL_SUFFIX(ssycon_3,SSYCON_3)
 void LAPACK_ssycon_3_base(
     char const* uplo,
     lapack_int const* n,
@@ -16827,7 +17094,7 @@ void LAPACK_ssycon_3_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16836,7 +17103,7 @@ void LAPACK_ssycon_3_base(
     #define LAPACK_ssycon_3(...) LAPACK_ssycon_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsycon_3_base LAPACK_GLOBAL(zsycon_3,ZSYCON_3)
+#define LAPACK_zsycon_3_base LAPACK_GLOBAL_SUFFIX(zsycon_3,ZSYCON_3)
 void LAPACK_zsycon_3_base(
     char const* uplo,
     lapack_int const* n,
@@ -16847,7 +17114,7 @@ void LAPACK_zsycon_3_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16856,7 +17123,7 @@ void LAPACK_zsycon_3_base(
     #define LAPACK_zsycon_3(...) LAPACK_zsycon_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csyconv_base LAPACK_GLOBAL(csyconv,CSYCONV)
+#define LAPACK_csyconv_base LAPACK_GLOBAL_SUFFIX(csyconv,CSYCONV)
 void LAPACK_csyconv_base(
     char const* uplo, char const* way,
     lapack_int const* n,
@@ -16864,7 +17131,7 @@ void LAPACK_csyconv_base(
     lapack_complex_float* E,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16873,7 +17140,7 @@ void LAPACK_csyconv_base(
     #define LAPACK_csyconv(...) LAPACK_csyconv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsyconv_base LAPACK_GLOBAL(dsyconv,DSYCONV)
+#define LAPACK_dsyconv_base LAPACK_GLOBAL_SUFFIX(dsyconv,DSYCONV)
 void LAPACK_dsyconv_base(
     char const* uplo, char const* way,
     lapack_int const* n,
@@ -16881,7 +17148,7 @@ void LAPACK_dsyconv_base(
     double* E,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16890,7 +17157,7 @@ void LAPACK_dsyconv_base(
     #define LAPACK_dsyconv(...) LAPACK_dsyconv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssyconv_base LAPACK_GLOBAL(ssyconv,SSYCONV)
+#define LAPACK_ssyconv_base LAPACK_GLOBAL_SUFFIX(ssyconv,SSYCONV)
 void LAPACK_ssyconv_base(
     char const* uplo, char const* way,
     lapack_int const* n,
@@ -16898,7 +17165,7 @@ void LAPACK_ssyconv_base(
     float* E,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16907,7 +17174,7 @@ void LAPACK_ssyconv_base(
     #define LAPACK_ssyconv(...) LAPACK_ssyconv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsyconv_base LAPACK_GLOBAL(zsyconv,ZSYCONV)
+#define LAPACK_zsyconv_base LAPACK_GLOBAL_SUFFIX(zsyconv,ZSYCONV)
 void LAPACK_zsyconv_base(
     char const* uplo, char const* way,
     lapack_int const* n,
@@ -16915,7 +17182,7 @@ void LAPACK_zsyconv_base(
     lapack_complex_double* E,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16924,7 +17191,7 @@ void LAPACK_zsyconv_base(
     #define LAPACK_zsyconv(...) LAPACK_zsyconv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csyequb_base LAPACK_GLOBAL(csyequb,CSYEQUB)
+#define LAPACK_csyequb_base LAPACK_GLOBAL_SUFFIX(csyequb,CSYEQUB)
 void LAPACK_csyequb_base(
     char const* uplo,
     lapack_int const* n,
@@ -16935,7 +17202,7 @@ void LAPACK_csyequb_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16944,7 +17211,7 @@ void LAPACK_csyequb_base(
     #define LAPACK_csyequb(...) LAPACK_csyequb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsyequb_base LAPACK_GLOBAL(dsyequb,DSYEQUB)
+#define LAPACK_dsyequb_base LAPACK_GLOBAL_SUFFIX(dsyequb,DSYEQUB)
 void LAPACK_dsyequb_base(
     char const* uplo,
     lapack_int const* n,
@@ -16955,7 +17222,7 @@ void LAPACK_dsyequb_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16964,7 +17231,7 @@ void LAPACK_dsyequb_base(
     #define LAPACK_dsyequb(...) LAPACK_dsyequb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssyequb_base LAPACK_GLOBAL(ssyequb,SSYEQUB)
+#define LAPACK_ssyequb_base LAPACK_GLOBAL_SUFFIX(ssyequb,SSYEQUB)
 void LAPACK_ssyequb_base(
     char const* uplo,
     lapack_int const* n,
@@ -16975,7 +17242,7 @@ void LAPACK_ssyequb_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -16984,7 +17251,7 @@ void LAPACK_ssyequb_base(
     #define LAPACK_ssyequb(...) LAPACK_ssyequb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsyequb_base LAPACK_GLOBAL(zsyequb,ZSYEQUB)
+#define LAPACK_zsyequb_base LAPACK_GLOBAL_SUFFIX(zsyequb,ZSYEQUB)
 void LAPACK_zsyequb_base(
     char const* uplo,
     lapack_int const* n,
@@ -16995,7 +17262,7 @@ void LAPACK_zsyequb_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17004,7 +17271,7 @@ void LAPACK_zsyequb_base(
     #define LAPACK_zsyequb(...) LAPACK_zsyequb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsyev_base LAPACK_GLOBAL(dsyev,DSYEV)
+#define LAPACK_dsyev_base LAPACK_GLOBAL_SUFFIX(dsyev,DSYEV)
 void LAPACK_dsyev_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -17013,7 +17280,7 @@ void LAPACK_dsyev_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17022,7 +17289,7 @@ void LAPACK_dsyev_base(
     #define LAPACK_dsyev(...) LAPACK_dsyev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssyev_base LAPACK_GLOBAL(ssyev,SSYEV)
+#define LAPACK_ssyev_base LAPACK_GLOBAL_SUFFIX(ssyev,SSYEV)
 void LAPACK_ssyev_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -17031,7 +17298,7 @@ void LAPACK_ssyev_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17040,7 +17307,7 @@ void LAPACK_ssyev_base(
     #define LAPACK_ssyev(...) LAPACK_ssyev_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsyev_2stage_base LAPACK_GLOBAL(dsyev_2stage,DSYEV_2STAGE)
+#define LAPACK_dsyev_2stage_base LAPACK_GLOBAL_SUFFIX(dsyev_2stage,DSYEV_2STAGE)
 void LAPACK_dsyev_2stage_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -17049,7 +17316,7 @@ void LAPACK_dsyev_2stage_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17058,7 +17325,7 @@ void LAPACK_dsyev_2stage_base(
     #define LAPACK_dsyev_2stage(...) LAPACK_dsyev_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssyev_2stage_base LAPACK_GLOBAL(ssyev_2stage,SSYEV_2STAGE)
+#define LAPACK_ssyev_2stage_base LAPACK_GLOBAL_SUFFIX(ssyev_2stage,SSYEV_2STAGE)
 void LAPACK_ssyev_2stage_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -17067,7 +17334,7 @@ void LAPACK_ssyev_2stage_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17076,7 +17343,7 @@ void LAPACK_ssyev_2stage_base(
     #define LAPACK_ssyev_2stage(...) LAPACK_ssyev_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsyevd_base LAPACK_GLOBAL(dsyevd,DSYEVD)
+#define LAPACK_dsyevd_base LAPACK_GLOBAL_SUFFIX(dsyevd,DSYEVD)
 void LAPACK_dsyevd_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -17086,7 +17353,7 @@ void LAPACK_dsyevd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17095,7 +17362,7 @@ void LAPACK_dsyevd_base(
     #define LAPACK_dsyevd(...) LAPACK_dsyevd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssyevd_base LAPACK_GLOBAL(ssyevd,SSYEVD)
+#define LAPACK_ssyevd_base LAPACK_GLOBAL_SUFFIX(ssyevd,SSYEVD)
 void LAPACK_ssyevd_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -17105,7 +17372,7 @@ void LAPACK_ssyevd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17114,7 +17381,7 @@ void LAPACK_ssyevd_base(
     #define LAPACK_ssyevd(...) LAPACK_ssyevd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsyevd_2stage_base LAPACK_GLOBAL(dsyevd_2stage,DSYEVD_2STAGE)
+#define LAPACK_dsyevd_2stage_base LAPACK_GLOBAL_SUFFIX(dsyevd_2stage,DSYEVD_2STAGE)
 void LAPACK_dsyevd_2stage_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -17124,7 +17391,7 @@ void LAPACK_dsyevd_2stage_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17133,7 +17400,7 @@ void LAPACK_dsyevd_2stage_base(
     #define LAPACK_dsyevd_2stage(...) LAPACK_dsyevd_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssyevd_2stage_base LAPACK_GLOBAL(ssyevd_2stage,SSYEVD_2STAGE)
+#define LAPACK_ssyevd_2stage_base LAPACK_GLOBAL_SUFFIX(ssyevd_2stage,SSYEVD_2STAGE)
 void LAPACK_ssyevd_2stage_base(
     char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -17143,7 +17410,7 @@ void LAPACK_ssyevd_2stage_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17152,7 +17419,7 @@ void LAPACK_ssyevd_2stage_base(
     #define LAPACK_ssyevd_2stage(...) LAPACK_ssyevd_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsyevr_base LAPACK_GLOBAL(dsyevr,DSYEVR)
+#define LAPACK_dsyevr_base LAPACK_GLOBAL_SUFFIX(dsyevr,DSYEVR)
 void LAPACK_dsyevr_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -17166,7 +17433,7 @@ void LAPACK_dsyevr_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17175,7 +17442,7 @@ void LAPACK_dsyevr_base(
     #define LAPACK_dsyevr(...) LAPACK_dsyevr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssyevr_base LAPACK_GLOBAL(ssyevr,SSYEVR)
+#define LAPACK_ssyevr_base LAPACK_GLOBAL_SUFFIX(ssyevr,SSYEVR)
 void LAPACK_ssyevr_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -17189,7 +17456,7 @@ void LAPACK_ssyevr_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17198,7 +17465,7 @@ void LAPACK_ssyevr_base(
     #define LAPACK_ssyevr(...) LAPACK_ssyevr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsyevr_2stage_base LAPACK_GLOBAL(dsyevr_2stage,DSYEVR_2STAGE)
+#define LAPACK_dsyevr_2stage_base LAPACK_GLOBAL_SUFFIX(dsyevr_2stage,DSYEVR_2STAGE)
 void LAPACK_dsyevr_2stage_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -17212,7 +17479,7 @@ void LAPACK_dsyevr_2stage_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17221,7 +17488,7 @@ void LAPACK_dsyevr_2stage_base(
     #define LAPACK_dsyevr_2stage(...) LAPACK_dsyevr_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssyevr_2stage_base LAPACK_GLOBAL(ssyevr_2stage,SSYEVR_2STAGE)
+#define LAPACK_ssyevr_2stage_base LAPACK_GLOBAL_SUFFIX(ssyevr_2stage,SSYEVR_2STAGE)
 void LAPACK_ssyevr_2stage_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -17235,7 +17502,7 @@ void LAPACK_ssyevr_2stage_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17244,7 +17511,7 @@ void LAPACK_ssyevr_2stage_base(
     #define LAPACK_ssyevr_2stage(...) LAPACK_ssyevr_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsyevx_base LAPACK_GLOBAL(dsyevx,DSYEVX)
+#define LAPACK_dsyevx_base LAPACK_GLOBAL_SUFFIX(dsyevx,DSYEVX)
 void LAPACK_dsyevx_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -17258,7 +17525,7 @@ void LAPACK_dsyevx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17267,7 +17534,7 @@ void LAPACK_dsyevx_base(
     #define LAPACK_dsyevx(...) LAPACK_dsyevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssyevx_base LAPACK_GLOBAL(ssyevx,SSYEVX)
+#define LAPACK_ssyevx_base LAPACK_GLOBAL_SUFFIX(ssyevx,SSYEVX)
 void LAPACK_ssyevx_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -17281,7 +17548,7 @@ void LAPACK_ssyevx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17290,7 +17557,7 @@ void LAPACK_ssyevx_base(
     #define LAPACK_ssyevx(...) LAPACK_ssyevx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsyevx_2stage_base LAPACK_GLOBAL(dsyevx_2stage,DSYEVX_2STAGE)
+#define LAPACK_dsyevx_2stage_base LAPACK_GLOBAL_SUFFIX(dsyevx_2stage,DSYEVX_2STAGE)
 void LAPACK_dsyevx_2stage_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -17304,7 +17571,7 @@ void LAPACK_dsyevx_2stage_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17313,7 +17580,7 @@ void LAPACK_dsyevx_2stage_base(
     #define LAPACK_dsyevx_2stage(...) LAPACK_dsyevx_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssyevx_2stage_base LAPACK_GLOBAL(ssyevx_2stage,SSYEVX_2STAGE)
+#define LAPACK_ssyevx_2stage_base LAPACK_GLOBAL_SUFFIX(ssyevx_2stage,SSYEVX_2STAGE)
 void LAPACK_ssyevx_2stage_base(
     char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -17327,7 +17594,7 @@ void LAPACK_ssyevx_2stage_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17336,7 +17603,7 @@ void LAPACK_ssyevx_2stage_base(
     #define LAPACK_ssyevx_2stage(...) LAPACK_ssyevx_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsygst_base LAPACK_GLOBAL(dsygst,DSYGST)
+#define LAPACK_dsygst_base LAPACK_GLOBAL_SUFFIX(dsygst,DSYGST)
 void LAPACK_dsygst_base(
     lapack_int const* itype, char const* uplo,
     lapack_int const* n,
@@ -17344,7 +17611,7 @@ void LAPACK_dsygst_base(
     double const* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17353,7 +17620,7 @@ void LAPACK_dsygst_base(
     #define LAPACK_dsygst(...) LAPACK_dsygst_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssygst_base LAPACK_GLOBAL(ssygst,SSYGST)
+#define LAPACK_ssygst_base LAPACK_GLOBAL_SUFFIX(ssygst,SSYGST)
 void LAPACK_ssygst_base(
     lapack_int const* itype, char const* uplo,
     lapack_int const* n,
@@ -17361,7 +17628,7 @@ void LAPACK_ssygst_base(
     float const* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17370,7 +17637,7 @@ void LAPACK_ssygst_base(
     #define LAPACK_ssygst(...) LAPACK_ssygst_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsygv_base LAPACK_GLOBAL(dsygv,DSYGV)
+#define LAPACK_dsygv_base LAPACK_GLOBAL_SUFFIX(dsygv,DSYGV)
 void LAPACK_dsygv_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -17380,7 +17647,7 @@ void LAPACK_dsygv_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17389,7 +17656,7 @@ void LAPACK_dsygv_base(
     #define LAPACK_dsygv(...) LAPACK_dsygv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssygv_base LAPACK_GLOBAL(ssygv,SSYGV)
+#define LAPACK_ssygv_base LAPACK_GLOBAL_SUFFIX(ssygv,SSYGV)
 void LAPACK_ssygv_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -17399,7 +17666,7 @@ void LAPACK_ssygv_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17408,7 +17675,7 @@ void LAPACK_ssygv_base(
     #define LAPACK_ssygv(...) LAPACK_ssygv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsygv_2stage_base LAPACK_GLOBAL(dsygv_2stage,DSYGV_2STAGE)
+#define LAPACK_dsygv_2stage_base LAPACK_GLOBAL_SUFFIX(dsygv_2stage,DSYGV_2STAGE)
 void LAPACK_dsygv_2stage_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -17418,7 +17685,7 @@ void LAPACK_dsygv_2stage_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17427,7 +17694,7 @@ void LAPACK_dsygv_2stage_base(
     #define LAPACK_dsygv_2stage(...) LAPACK_dsygv_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssygv_2stage_base LAPACK_GLOBAL(ssygv_2stage,SSYGV_2STAGE)
+#define LAPACK_ssygv_2stage_base LAPACK_GLOBAL_SUFFIX(ssygv_2stage,SSYGV_2STAGE)
 void LAPACK_ssygv_2stage_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -17437,7 +17704,7 @@ void LAPACK_ssygv_2stage_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17446,7 +17713,7 @@ void LAPACK_ssygv_2stage_base(
     #define LAPACK_ssygv_2stage(...) LAPACK_ssygv_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsygvd_base LAPACK_GLOBAL(dsygvd,DSYGVD)
+#define LAPACK_dsygvd_base LAPACK_GLOBAL_SUFFIX(dsygvd,DSYGVD)
 void LAPACK_dsygvd_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -17457,7 +17724,7 @@ void LAPACK_dsygvd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17466,7 +17733,7 @@ void LAPACK_dsygvd_base(
     #define LAPACK_dsygvd(...) LAPACK_dsygvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssygvd_base LAPACK_GLOBAL(ssygvd,SSYGVD)
+#define LAPACK_ssygvd_base LAPACK_GLOBAL_SUFFIX(ssygvd,SSYGVD)
 void LAPACK_ssygvd_base(
     lapack_int const* itype, char const* jobz, char const* uplo,
     lapack_int const* n,
@@ -17477,7 +17744,7 @@ void LAPACK_ssygvd_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17486,7 +17753,7 @@ void LAPACK_ssygvd_base(
     #define LAPACK_ssygvd(...) LAPACK_ssygvd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsygvx_base LAPACK_GLOBAL(dsygvx,DSYGVX)
+#define LAPACK_dsygvx_base LAPACK_GLOBAL_SUFFIX(dsygvx,DSYGVX)
 void LAPACK_dsygvx_base(
     lapack_int const* itype, char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -17501,7 +17768,7 @@ void LAPACK_dsygvx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17510,7 +17777,7 @@ void LAPACK_dsygvx_base(
     #define LAPACK_dsygvx(...) LAPACK_dsygvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssygvx_base LAPACK_GLOBAL(ssygvx,SSYGVX)
+#define LAPACK_ssygvx_base LAPACK_GLOBAL_SUFFIX(ssygvx,SSYGVX)
 void LAPACK_ssygvx_base(
     lapack_int const* itype, char const* jobz, char const* range, char const* uplo,
     lapack_int const* n,
@@ -17525,7 +17792,7 @@ void LAPACK_ssygvx_base(
     lapack_int* iwork, lapack_int* IFAIL,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17534,7 +17801,7 @@ void LAPACK_ssygvx_base(
     #define LAPACK_ssygvx(...) LAPACK_ssygvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csyr_base LAPACK_GLOBAL(csyr,CSYR)
+#define LAPACK_csyr_base LAPACK_GLOBAL_SUFFIX(csyr,CSYR)
 void LAPACK_csyr_base(
     char const* uplo,
     lapack_int const* n,
@@ -17542,7 +17809,7 @@ void LAPACK_csyr_base(
     lapack_complex_float const* X, lapack_int const* incx,
     lapack_complex_float* A, lapack_int const* lda
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17551,7 +17818,7 @@ void LAPACK_csyr_base(
     #define LAPACK_csyr(...) LAPACK_csyr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsyr_base LAPACK_GLOBAL(zsyr,ZSYR)
+#define LAPACK_zsyr_base LAPACK_GLOBAL_SUFFIX(zsyr,ZSYR)
 void LAPACK_zsyr_base(
     char const* uplo,
     lapack_int const* n,
@@ -17559,7 +17826,7 @@ void LAPACK_zsyr_base(
     lapack_complex_double const* X, lapack_int const* incx,
     lapack_complex_double* A, lapack_int const* lda
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17568,7 +17835,7 @@ void LAPACK_zsyr_base(
     #define LAPACK_zsyr(...) LAPACK_zsyr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csyrfs_base LAPACK_GLOBAL(csyrfs,CSYRFS)
+#define LAPACK_csyrfs_base LAPACK_GLOBAL_SUFFIX(csyrfs,CSYRFS)
 void LAPACK_csyrfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17582,7 +17849,7 @@ void LAPACK_csyrfs_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17591,7 +17858,7 @@ void LAPACK_csyrfs_base(
     #define LAPACK_csyrfs(...) LAPACK_csyrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsyrfs_base LAPACK_GLOBAL(dsyrfs,DSYRFS)
+#define LAPACK_dsyrfs_base LAPACK_GLOBAL_SUFFIX(dsyrfs,DSYRFS)
 void LAPACK_dsyrfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17605,7 +17872,7 @@ void LAPACK_dsyrfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17614,7 +17881,7 @@ void LAPACK_dsyrfs_base(
     #define LAPACK_dsyrfs(...) LAPACK_dsyrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssyrfs_base LAPACK_GLOBAL(ssyrfs,SSYRFS)
+#define LAPACK_ssyrfs_base LAPACK_GLOBAL_SUFFIX(ssyrfs,SSYRFS)
 void LAPACK_ssyrfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17628,7 +17895,7 @@ void LAPACK_ssyrfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17637,7 +17904,7 @@ void LAPACK_ssyrfs_base(
     #define LAPACK_ssyrfs(...) LAPACK_ssyrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsyrfs_base LAPACK_GLOBAL(zsyrfs,ZSYRFS)
+#define LAPACK_zsyrfs_base LAPACK_GLOBAL_SUFFIX(zsyrfs,ZSYRFS)
 void LAPACK_zsyrfs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17651,7 +17918,7 @@ void LAPACK_zsyrfs_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17660,7 +17927,7 @@ void LAPACK_zsyrfs_base(
     #define LAPACK_zsyrfs(...) LAPACK_zsyrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csyrfsx_base LAPACK_GLOBAL(csyrfsx,CSYRFSX)
+#define LAPACK_csyrfsx_base LAPACK_GLOBAL_SUFFIX(csyrfsx,CSYRFSX)
 void LAPACK_csyrfsx_base(
     char const* uplo, char const* equed,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17678,7 +17945,7 @@ void LAPACK_csyrfsx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17687,7 +17954,7 @@ void LAPACK_csyrfsx_base(
     #define LAPACK_csyrfsx(...) LAPACK_csyrfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsyrfsx_base LAPACK_GLOBAL(dsyrfsx,DSYRFSX)
+#define LAPACK_dsyrfsx_base LAPACK_GLOBAL_SUFFIX(dsyrfsx,DSYRFSX)
 void LAPACK_dsyrfsx_base(
     char const* uplo, char const* equed,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17705,7 +17972,7 @@ void LAPACK_dsyrfsx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17714,7 +17981,7 @@ void LAPACK_dsyrfsx_base(
     #define LAPACK_dsyrfsx(...) LAPACK_dsyrfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssyrfsx_base LAPACK_GLOBAL(ssyrfsx,SSYRFSX)
+#define LAPACK_ssyrfsx_base LAPACK_GLOBAL_SUFFIX(ssyrfsx,SSYRFSX)
 void LAPACK_ssyrfsx_base(
     char const* uplo, char const* equed,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17732,7 +17999,7 @@ void LAPACK_ssyrfsx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17741,7 +18008,7 @@ void LAPACK_ssyrfsx_base(
     #define LAPACK_ssyrfsx(...) LAPACK_ssyrfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsyrfsx_base LAPACK_GLOBAL(zsyrfsx,ZSYRFSX)
+#define LAPACK_zsyrfsx_base LAPACK_GLOBAL_SUFFIX(zsyrfsx,ZSYRFSX)
 void LAPACK_zsyrfsx_base(
     char const* uplo, char const* equed,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17759,7 +18026,7 @@ void LAPACK_zsyrfsx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17768,7 +18035,7 @@ void LAPACK_zsyrfsx_base(
     #define LAPACK_zsyrfsx(...) LAPACK_zsyrfsx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csysv_base LAPACK_GLOBAL(csysv,CSYSV)
+#define LAPACK_csysv_base LAPACK_GLOBAL_SUFFIX(csysv,CSYSV)
 void LAPACK_csysv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17777,7 +18044,7 @@ void LAPACK_csysv_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17786,7 +18053,7 @@ void LAPACK_csysv_base(
     #define LAPACK_csysv(...) LAPACK_csysv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsysv_base LAPACK_GLOBAL(dsysv,DSYSV)
+#define LAPACK_dsysv_base LAPACK_GLOBAL_SUFFIX(dsysv,DSYSV)
 void LAPACK_dsysv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17795,7 +18062,7 @@ void LAPACK_dsysv_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17804,7 +18071,7 @@ void LAPACK_dsysv_base(
     #define LAPACK_dsysv(...) LAPACK_dsysv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssysv_base LAPACK_GLOBAL(ssysv,SSYSV)
+#define LAPACK_ssysv_base LAPACK_GLOBAL_SUFFIX(ssysv,SSYSV)
 void LAPACK_ssysv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17813,7 +18080,7 @@ void LAPACK_ssysv_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17822,7 +18089,7 @@ void LAPACK_ssysv_base(
     #define LAPACK_ssysv(...) LAPACK_ssysv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsysv_base LAPACK_GLOBAL(zsysv,ZSYSV)
+#define LAPACK_zsysv_base LAPACK_GLOBAL_SUFFIX(zsysv,ZSYSV)
 void LAPACK_zsysv_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17831,7 +18098,7 @@ void LAPACK_zsysv_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17840,7 +18107,7 @@ void LAPACK_zsysv_base(
     #define LAPACK_zsysv(...) LAPACK_zsysv_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csysv_aa_base LAPACK_GLOBAL(csysv_aa,CSYSV_AA)
+#define LAPACK_csysv_aa_base LAPACK_GLOBAL_SUFFIX(csysv_aa,CSYSV_AA)
 void LAPACK_csysv_aa_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17849,7 +18116,7 @@ void LAPACK_csysv_aa_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17858,7 +18125,7 @@ void LAPACK_csysv_aa_base(
     #define LAPACK_csysv_aa(...) LAPACK_csysv_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsysv_aa_base LAPACK_GLOBAL(dsysv_aa,DSYSV_AA)
+#define LAPACK_dsysv_aa_base LAPACK_GLOBAL_SUFFIX(dsysv_aa,DSYSV_AA)
 void LAPACK_dsysv_aa_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17867,7 +18134,7 @@ void LAPACK_dsysv_aa_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17876,7 +18143,7 @@ void LAPACK_dsysv_aa_base(
     #define LAPACK_dsysv_aa(...) LAPACK_dsysv_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssysv_aa_base LAPACK_GLOBAL(ssysv_aa,SSYSV_AA)
+#define LAPACK_ssysv_aa_base LAPACK_GLOBAL_SUFFIX(ssysv_aa,SSYSV_AA)
 void LAPACK_ssysv_aa_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17885,7 +18152,7 @@ void LAPACK_ssysv_aa_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17894,7 +18161,7 @@ void LAPACK_ssysv_aa_base(
     #define LAPACK_ssysv_aa(...) LAPACK_ssysv_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsysv_aa_base LAPACK_GLOBAL(zsysv_aa,ZSYSV_AA)
+#define LAPACK_zsysv_aa_base LAPACK_GLOBAL_SUFFIX(zsysv_aa,ZSYSV_AA)
 void LAPACK_zsysv_aa_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17903,7 +18170,7 @@ void LAPACK_zsysv_aa_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17912,7 +18179,7 @@ void LAPACK_zsysv_aa_base(
     #define LAPACK_zsysv_aa(...) LAPACK_zsysv_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csysv_aa_2stage_base LAPACK_GLOBAL(csysv_aa_2stage,CSYSV_AA_2STAGE)
+#define LAPACK_csysv_aa_2stage_base LAPACK_GLOBAL_SUFFIX(csysv_aa_2stage,CSYSV_AA_2STAGE)
 void LAPACK_csysv_aa_2stage_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17922,7 +18189,7 @@ void LAPACK_csysv_aa_2stage_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17931,7 +18198,7 @@ void LAPACK_csysv_aa_2stage_base(
     #define LAPACK_csysv_aa_2stage(...) LAPACK_csysv_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsysv_aa_2stage_base LAPACK_GLOBAL(dsysv_aa_2stage,DSYSV_AA_2STAGE)
+#define LAPACK_dsysv_aa_2stage_base LAPACK_GLOBAL_SUFFIX(dsysv_aa_2stage,DSYSV_AA_2STAGE)
 void LAPACK_dsysv_aa_2stage_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17941,7 +18208,7 @@ void LAPACK_dsysv_aa_2stage_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17950,7 +18217,7 @@ void LAPACK_dsysv_aa_2stage_base(
     #define LAPACK_dsysv_aa_2stage(...) LAPACK_dsysv_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssysv_aa_2stage_base LAPACK_GLOBAL(ssysv_aa_2stage,SSYSV_AA_2STAGE)
+#define LAPACK_ssysv_aa_2stage_base LAPACK_GLOBAL_SUFFIX(ssysv_aa_2stage,SSYSV_AA_2STAGE)
 void LAPACK_ssysv_aa_2stage_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17960,7 +18227,7 @@ void LAPACK_ssysv_aa_2stage_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17969,7 +18236,7 @@ void LAPACK_ssysv_aa_2stage_base(
     #define LAPACK_ssysv_aa_2stage(...) LAPACK_ssysv_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsysv_aa_2stage_base LAPACK_GLOBAL(zsysv_aa_2stage,ZSYSV_AA_2STAGE)
+#define LAPACK_zsysv_aa_2stage_base LAPACK_GLOBAL_SUFFIX(zsysv_aa_2stage,ZSYSV_AA_2STAGE)
 void LAPACK_zsysv_aa_2stage_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17979,7 +18246,7 @@ void LAPACK_zsysv_aa_2stage_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -17988,7 +18255,7 @@ void LAPACK_zsysv_aa_2stage_base(
     #define LAPACK_zsysv_aa_2stage(...) LAPACK_zsysv_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csysv_rk_base LAPACK_GLOBAL(csysv_rk,CSYSV_RK)
+#define LAPACK_csysv_rk_base LAPACK_GLOBAL_SUFFIX(csysv_rk,CSYSV_RK)
 void LAPACK_csysv_rk_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -17998,7 +18265,7 @@ void LAPACK_csysv_rk_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18007,7 +18274,7 @@ void LAPACK_csysv_rk_base(
     #define LAPACK_csysv_rk(...) LAPACK_csysv_rk_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsysv_rk_base LAPACK_GLOBAL(dsysv_rk,DSYSV_RK)
+#define LAPACK_dsysv_rk_base LAPACK_GLOBAL_SUFFIX(dsysv_rk,DSYSV_RK)
 void LAPACK_dsysv_rk_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -18017,7 +18284,7 @@ void LAPACK_dsysv_rk_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18026,7 +18293,7 @@ void LAPACK_dsysv_rk_base(
     #define LAPACK_dsysv_rk(...) LAPACK_dsysv_rk_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssysv_rk_base LAPACK_GLOBAL(ssysv_rk,SSYSV_RK)
+#define LAPACK_ssysv_rk_base LAPACK_GLOBAL_SUFFIX(ssysv_rk,SSYSV_RK)
 void LAPACK_ssysv_rk_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -18036,7 +18303,7 @@ void LAPACK_ssysv_rk_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18045,7 +18312,7 @@ void LAPACK_ssysv_rk_base(
     #define LAPACK_ssysv_rk(...) LAPACK_ssysv_rk_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsysv_rk_base LAPACK_GLOBAL(zsysv_rk,ZSYSV_RK)
+#define LAPACK_zsysv_rk_base LAPACK_GLOBAL_SUFFIX(zsysv_rk,ZSYSV_RK)
 void LAPACK_zsysv_rk_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -18055,7 +18322,7 @@ void LAPACK_zsysv_rk_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18064,7 +18331,7 @@ void LAPACK_zsysv_rk_base(
     #define LAPACK_zsysv_rk(...) LAPACK_zsysv_rk_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csysv_rook_base LAPACK_GLOBAL(csysv_rook,CSYSV_ROOK)
+#define LAPACK_csysv_rook_base LAPACK_GLOBAL_SUFFIX(csysv_rook,CSYSV_ROOK)
 void LAPACK_csysv_rook_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -18073,7 +18340,7 @@ void LAPACK_csysv_rook_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18082,7 +18349,7 @@ void LAPACK_csysv_rook_base(
     #define LAPACK_csysv_rook(...) LAPACK_csysv_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsysv_rook_base LAPACK_GLOBAL(dsysv_rook,DSYSV_ROOK)
+#define LAPACK_dsysv_rook_base LAPACK_GLOBAL_SUFFIX(dsysv_rook,DSYSV_ROOK)
 void LAPACK_dsysv_rook_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -18091,7 +18358,7 @@ void LAPACK_dsysv_rook_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18100,7 +18367,7 @@ void LAPACK_dsysv_rook_base(
     #define LAPACK_dsysv_rook(...) LAPACK_dsysv_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssysv_rook_base LAPACK_GLOBAL(ssysv_rook,SSYSV_ROOK)
+#define LAPACK_ssysv_rook_base LAPACK_GLOBAL_SUFFIX(ssysv_rook,SSYSV_ROOK)
 void LAPACK_ssysv_rook_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -18109,7 +18376,7 @@ void LAPACK_ssysv_rook_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18118,7 +18385,7 @@ void LAPACK_ssysv_rook_base(
     #define LAPACK_ssysv_rook(...) LAPACK_ssysv_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsysv_rook_base LAPACK_GLOBAL(zsysv_rook,ZSYSV_ROOK)
+#define LAPACK_zsysv_rook_base LAPACK_GLOBAL_SUFFIX(zsysv_rook,ZSYSV_ROOK)
 void LAPACK_zsysv_rook_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -18127,7 +18394,7 @@ void LAPACK_zsysv_rook_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18136,7 +18403,7 @@ void LAPACK_zsysv_rook_base(
     #define LAPACK_zsysv_rook(...) LAPACK_zsysv_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csysvx_base LAPACK_GLOBAL(csysvx,CSYSVX)
+#define LAPACK_csysvx_base LAPACK_GLOBAL_SUFFIX(csysvx,CSYSVX)
 void LAPACK_csysvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -18151,7 +18418,7 @@ void LAPACK_csysvx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18160,7 +18427,7 @@ void LAPACK_csysvx_base(
     #define LAPACK_csysvx(...) LAPACK_csysvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsysvx_base LAPACK_GLOBAL(dsysvx,DSYSVX)
+#define LAPACK_dsysvx_base LAPACK_GLOBAL_SUFFIX(dsysvx,DSYSVX)
 void LAPACK_dsysvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -18175,7 +18442,7 @@ void LAPACK_dsysvx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18184,7 +18451,7 @@ void LAPACK_dsysvx_base(
     #define LAPACK_dsysvx(...) LAPACK_dsysvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssysvx_base LAPACK_GLOBAL(ssysvx,SSYSVX)
+#define LAPACK_ssysvx_base LAPACK_GLOBAL_SUFFIX(ssysvx,SSYSVX)
 void LAPACK_ssysvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -18199,7 +18466,7 @@ void LAPACK_ssysvx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18208,7 +18475,7 @@ void LAPACK_ssysvx_base(
     #define LAPACK_ssysvx(...) LAPACK_ssysvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsysvx_base LAPACK_GLOBAL(zsysvx,ZSYSVX)
+#define LAPACK_zsysvx_base LAPACK_GLOBAL_SUFFIX(zsysvx,ZSYSVX)
 void LAPACK_zsysvx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -18223,7 +18490,7 @@ void LAPACK_zsysvx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18232,7 +18499,7 @@ void LAPACK_zsysvx_base(
     #define LAPACK_zsysvx(...) LAPACK_zsysvx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csysvxx_base LAPACK_GLOBAL(csysvxx,CSYSVXX)
+#define LAPACK_csysvxx_base LAPACK_GLOBAL_SUFFIX(csysvxx,CSYSVXX)
 void LAPACK_csysvxx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -18252,7 +18519,7 @@ void LAPACK_csysvxx_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18261,7 +18528,7 @@ void LAPACK_csysvxx_base(
     #define LAPACK_csysvxx(...) LAPACK_csysvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsysvxx_base LAPACK_GLOBAL(dsysvxx,DSYSVXX)
+#define LAPACK_dsysvxx_base LAPACK_GLOBAL_SUFFIX(dsysvxx,DSYSVXX)
 void LAPACK_dsysvxx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -18281,7 +18548,7 @@ void LAPACK_dsysvxx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18290,7 +18557,7 @@ void LAPACK_dsysvxx_base(
     #define LAPACK_dsysvxx(...) LAPACK_dsysvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssysvxx_base LAPACK_GLOBAL(ssysvxx,SSYSVXX)
+#define LAPACK_ssysvxx_base LAPACK_GLOBAL_SUFFIX(ssysvxx,SSYSVXX)
 void LAPACK_ssysvxx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -18310,7 +18577,7 @@ void LAPACK_ssysvxx_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18319,7 +18586,7 @@ void LAPACK_ssysvxx_base(
     #define LAPACK_ssysvxx(...) LAPACK_ssysvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsysvxx_base LAPACK_GLOBAL(zsysvxx,ZSYSVXX)
+#define LAPACK_zsysvxx_base LAPACK_GLOBAL_SUFFIX(zsysvxx,ZSYSVXX)
 void LAPACK_zsysvxx_base(
     char const* fact, char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -18339,7 +18606,7 @@ void LAPACK_zsysvxx_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18348,13 +18615,13 @@ void LAPACK_zsysvxx_base(
     #define LAPACK_zsysvxx(...) LAPACK_zsysvxx_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csyswapr_base LAPACK_GLOBAL(csyswapr,CSYSWAPR)
+#define LAPACK_csyswapr_base LAPACK_GLOBAL_SUFFIX(csyswapr,CSYSWAPR)
 void LAPACK_csyswapr_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda, lapack_int const* i1, lapack_int const* i2
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18363,13 +18630,13 @@ void LAPACK_csyswapr_base(
     #define LAPACK_csyswapr(...) LAPACK_csyswapr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsyswapr_base LAPACK_GLOBAL(dsyswapr,DSYSWAPR)
+#define LAPACK_dsyswapr_base LAPACK_GLOBAL_SUFFIX(dsyswapr,DSYSWAPR)
 void LAPACK_dsyswapr_base(
     char const* uplo,
     lapack_int const* n,
     double* A, lapack_int const* lda, lapack_int const* i1, lapack_int const* i2
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18378,13 +18645,13 @@ void LAPACK_dsyswapr_base(
     #define LAPACK_dsyswapr(...) LAPACK_dsyswapr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssyswapr_base LAPACK_GLOBAL(ssyswapr,SSYSWAPR)
+#define LAPACK_ssyswapr_base LAPACK_GLOBAL_SUFFIX(ssyswapr,SSYSWAPR)
 void LAPACK_ssyswapr_base(
     char const* uplo,
     lapack_int const* n,
     float* A, lapack_int const* lda, lapack_int const* i1, lapack_int const* i2
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18393,13 +18660,13 @@ void LAPACK_ssyswapr_base(
     #define LAPACK_ssyswapr(...) LAPACK_ssyswapr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsyswapr_base LAPACK_GLOBAL(zsyswapr,ZSYSWAPR)
+#define LAPACK_zsyswapr_base LAPACK_GLOBAL_SUFFIX(zsyswapr,ZSYSWAPR)
 void LAPACK_zsyswapr_base(
     char const* uplo,
     lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda, lapack_int const* i1, lapack_int const* i2
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18408,7 +18675,7 @@ void LAPACK_zsyswapr_base(
     #define LAPACK_zsyswapr(...) LAPACK_zsyswapr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsytrd_base LAPACK_GLOBAL(dsytrd,DSYTRD)
+#define LAPACK_dsytrd_base LAPACK_GLOBAL_SUFFIX(dsytrd,DSYTRD)
 void LAPACK_dsytrd_base(
     char const* uplo,
     lapack_int const* n,
@@ -18419,7 +18686,7 @@ void LAPACK_dsytrd_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18428,7 +18695,7 @@ void LAPACK_dsytrd_base(
     #define LAPACK_dsytrd(...) LAPACK_dsytrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssytrd_base LAPACK_GLOBAL(ssytrd,SSYTRD)
+#define LAPACK_ssytrd_base LAPACK_GLOBAL_SUFFIX(ssytrd,SSYTRD)
 void LAPACK_ssytrd_base(
     char const* uplo,
     lapack_int const* n,
@@ -18439,7 +18706,7 @@ void LAPACK_ssytrd_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18448,7 +18715,7 @@ void LAPACK_ssytrd_base(
     #define LAPACK_ssytrd(...) LAPACK_ssytrd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsytrd_2stage_base LAPACK_GLOBAL(dsytrd_2stage,DSYTRD_2STAGE)
+#define LAPACK_dsytrd_2stage_base LAPACK_GLOBAL_SUFFIX(dsytrd_2stage,DSYTRD_2STAGE)
 void LAPACK_dsytrd_2stage_base(
     char const* vect, char const* uplo,
     lapack_int const* n,
@@ -18460,7 +18727,7 @@ void LAPACK_dsytrd_2stage_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18469,7 +18736,7 @@ void LAPACK_dsytrd_2stage_base(
     #define LAPACK_dsytrd_2stage(...) LAPACK_dsytrd_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssytrd_2stage_base LAPACK_GLOBAL(ssytrd_2stage,SSYTRD_2STAGE)
+#define LAPACK_ssytrd_2stage_base LAPACK_GLOBAL_SUFFIX(ssytrd_2stage,SSYTRD_2STAGE)
 void LAPACK_ssytrd_2stage_base(
     char const* vect, char const* uplo,
     lapack_int const* n,
@@ -18481,7 +18748,7 @@ void LAPACK_ssytrd_2stage_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18490,7 +18757,7 @@ void LAPACK_ssytrd_2stage_base(
     #define LAPACK_ssytrd_2stage(...) LAPACK_ssytrd_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csytrf_base LAPACK_GLOBAL(csytrf,CSYTRF)
+#define LAPACK_csytrf_base LAPACK_GLOBAL_SUFFIX(csytrf,CSYTRF)
 void LAPACK_csytrf_base(
     char const* uplo,
     lapack_int const* n,
@@ -18498,7 +18765,7 @@ void LAPACK_csytrf_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18507,7 +18774,7 @@ void LAPACK_csytrf_base(
     #define LAPACK_csytrf(...) LAPACK_csytrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsytrf_base LAPACK_GLOBAL(dsytrf,DSYTRF)
+#define LAPACK_dsytrf_base LAPACK_GLOBAL_SUFFIX(dsytrf,DSYTRF)
 void LAPACK_dsytrf_base(
     char const* uplo,
     lapack_int const* n,
@@ -18515,7 +18782,7 @@ void LAPACK_dsytrf_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18524,7 +18791,7 @@ void LAPACK_dsytrf_base(
     #define LAPACK_dsytrf(...) LAPACK_dsytrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssytrf_base LAPACK_GLOBAL(ssytrf,SSYTRF)
+#define LAPACK_ssytrf_base LAPACK_GLOBAL_SUFFIX(ssytrf,SSYTRF)
 void LAPACK_ssytrf_base(
     char const* uplo,
     lapack_int const* n,
@@ -18532,7 +18799,7 @@ void LAPACK_ssytrf_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18541,7 +18808,7 @@ void LAPACK_ssytrf_base(
     #define LAPACK_ssytrf(...) LAPACK_ssytrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsytrf_base LAPACK_GLOBAL(zsytrf,ZSYTRF)
+#define LAPACK_zsytrf_base LAPACK_GLOBAL_SUFFIX(zsytrf,ZSYTRF)
 void LAPACK_zsytrf_base(
     char const* uplo,
     lapack_int const* n,
@@ -18549,7 +18816,7 @@ void LAPACK_zsytrf_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18558,7 +18825,7 @@ void LAPACK_zsytrf_base(
     #define LAPACK_zsytrf(...) LAPACK_zsytrf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csytrf_aa_base LAPACK_GLOBAL(csytrf_aa,CSYTRF_AA)
+#define LAPACK_csytrf_aa_base LAPACK_GLOBAL_SUFFIX(csytrf_aa,CSYTRF_AA)
 void LAPACK_csytrf_aa_base(
     char const* uplo,
     lapack_int const* n,
@@ -18566,7 +18833,7 @@ void LAPACK_csytrf_aa_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18575,7 +18842,7 @@ void LAPACK_csytrf_aa_base(
     #define LAPACK_csytrf_aa(...) LAPACK_csytrf_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsytrf_aa_base LAPACK_GLOBAL(dsytrf_aa,DSYTRF_AA)
+#define LAPACK_dsytrf_aa_base LAPACK_GLOBAL_SUFFIX(dsytrf_aa,DSYTRF_AA)
 void LAPACK_dsytrf_aa_base(
     char const* uplo,
     lapack_int const* n,
@@ -18583,7 +18850,7 @@ void LAPACK_dsytrf_aa_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18592,7 +18859,7 @@ void LAPACK_dsytrf_aa_base(
     #define LAPACK_dsytrf_aa(...) LAPACK_dsytrf_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssytrf_aa_base LAPACK_GLOBAL(ssytrf_aa,SSYTRF_AA)
+#define LAPACK_ssytrf_aa_base LAPACK_GLOBAL_SUFFIX(ssytrf_aa,SSYTRF_AA)
 void LAPACK_ssytrf_aa_base(
     char const* uplo,
     lapack_int const* n,
@@ -18600,7 +18867,7 @@ void LAPACK_ssytrf_aa_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18609,7 +18876,7 @@ void LAPACK_ssytrf_aa_base(
     #define LAPACK_ssytrf_aa(...) LAPACK_ssytrf_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsytrf_aa_base LAPACK_GLOBAL(zsytrf_aa,ZSYTRF_AA)
+#define LAPACK_zsytrf_aa_base LAPACK_GLOBAL_SUFFIX(zsytrf_aa,ZSYTRF_AA)
 void LAPACK_zsytrf_aa_base(
     char const* uplo,
     lapack_int const* n,
@@ -18617,7 +18884,7 @@ void LAPACK_zsytrf_aa_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18626,7 +18893,7 @@ void LAPACK_zsytrf_aa_base(
     #define LAPACK_zsytrf_aa(...) LAPACK_zsytrf_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csytrf_aa_2stage_base LAPACK_GLOBAL(csytrf_aa_2stage,CSYTRF_AA_2STAGE)
+#define LAPACK_csytrf_aa_2stage_base LAPACK_GLOBAL_SUFFIX(csytrf_aa_2stage,CSYTRF_AA_2STAGE)
 void LAPACK_csytrf_aa_2stage_base(
     char const* uplo,
     lapack_int const* n,
@@ -18635,7 +18902,7 @@ void LAPACK_csytrf_aa_2stage_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18644,7 +18911,7 @@ void LAPACK_csytrf_aa_2stage_base(
     #define LAPACK_csytrf_aa_2stage(...) LAPACK_csytrf_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsytrf_aa_2stage_base LAPACK_GLOBAL(dsytrf_aa_2stage,DSYTRF_AA_2STAGE)
+#define LAPACK_dsytrf_aa_2stage_base LAPACK_GLOBAL_SUFFIX(dsytrf_aa_2stage,DSYTRF_AA_2STAGE)
 void LAPACK_dsytrf_aa_2stage_base(
     char const* uplo,
     lapack_int const* n,
@@ -18653,7 +18920,7 @@ void LAPACK_dsytrf_aa_2stage_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18662,7 +18929,7 @@ void LAPACK_dsytrf_aa_2stage_base(
     #define LAPACK_dsytrf_aa_2stage(...) LAPACK_dsytrf_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssytrf_aa_2stage_base LAPACK_GLOBAL(ssytrf_aa_2stage,SSYTRF_AA_2STAGE)
+#define LAPACK_ssytrf_aa_2stage_base LAPACK_GLOBAL_SUFFIX(ssytrf_aa_2stage,SSYTRF_AA_2STAGE)
 void LAPACK_ssytrf_aa_2stage_base(
     char const* uplo,
     lapack_int const* n,
@@ -18671,7 +18938,7 @@ void LAPACK_ssytrf_aa_2stage_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18680,7 +18947,7 @@ void LAPACK_ssytrf_aa_2stage_base(
     #define LAPACK_ssytrf_aa_2stage(...) LAPACK_ssytrf_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsytrf_aa_2stage_base LAPACK_GLOBAL(zsytrf_aa_2stage,ZSYTRF_AA_2STAGE)
+#define LAPACK_zsytrf_aa_2stage_base LAPACK_GLOBAL_SUFFIX(zsytrf_aa_2stage,ZSYTRF_AA_2STAGE)
 void LAPACK_zsytrf_aa_2stage_base(
     char const* uplo,
     lapack_int const* n,
@@ -18689,7 +18956,7 @@ void LAPACK_zsytrf_aa_2stage_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18698,7 +18965,7 @@ void LAPACK_zsytrf_aa_2stage_base(
     #define LAPACK_zsytrf_aa_2stage(...) LAPACK_zsytrf_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csytrf_rk_base LAPACK_GLOBAL(csytrf_rk,CSYTRF_RK)
+#define LAPACK_csytrf_rk_base LAPACK_GLOBAL_SUFFIX(csytrf_rk,CSYTRF_RK)
 void LAPACK_csytrf_rk_base(
     char const* uplo,
     lapack_int const* n,
@@ -18707,7 +18974,7 @@ void LAPACK_csytrf_rk_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18716,7 +18983,7 @@ void LAPACK_csytrf_rk_base(
     #define LAPACK_csytrf_rk(...) LAPACK_csytrf_rk_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsytrf_rk_base LAPACK_GLOBAL(dsytrf_rk,DSYTRF_RK)
+#define LAPACK_dsytrf_rk_base LAPACK_GLOBAL_SUFFIX(dsytrf_rk,DSYTRF_RK)
 void LAPACK_dsytrf_rk_base(
     char const* uplo,
     lapack_int const* n,
@@ -18725,7 +18992,7 @@ void LAPACK_dsytrf_rk_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18734,7 +19001,7 @@ void LAPACK_dsytrf_rk_base(
     #define LAPACK_dsytrf_rk(...) LAPACK_dsytrf_rk_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssytrf_rk_base LAPACK_GLOBAL(ssytrf_rk,SSYTRF_RK)
+#define LAPACK_ssytrf_rk_base LAPACK_GLOBAL_SUFFIX(ssytrf_rk,SSYTRF_RK)
 void LAPACK_ssytrf_rk_base(
     char const* uplo,
     lapack_int const* n,
@@ -18743,7 +19010,7 @@ void LAPACK_ssytrf_rk_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18752,7 +19019,7 @@ void LAPACK_ssytrf_rk_base(
     #define LAPACK_ssytrf_rk(...) LAPACK_ssytrf_rk_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsytrf_rk_base LAPACK_GLOBAL(zsytrf_rk,ZSYTRF_RK)
+#define LAPACK_zsytrf_rk_base LAPACK_GLOBAL_SUFFIX(zsytrf_rk,ZSYTRF_RK)
 void LAPACK_zsytrf_rk_base(
     char const* uplo,
     lapack_int const* n,
@@ -18761,7 +19028,7 @@ void LAPACK_zsytrf_rk_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18770,7 +19037,7 @@ void LAPACK_zsytrf_rk_base(
     #define LAPACK_zsytrf_rk(...) LAPACK_zsytrf_rk_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csytrf_rook_base LAPACK_GLOBAL(csytrf_rook,CSYTRF_ROOK)
+#define LAPACK_csytrf_rook_base LAPACK_GLOBAL_SUFFIX(csytrf_rook,CSYTRF_ROOK)
 void LAPACK_csytrf_rook_base(
     char const* uplo,
     lapack_int const* n,
@@ -18778,7 +19045,7 @@ void LAPACK_csytrf_rook_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18787,7 +19054,7 @@ void LAPACK_csytrf_rook_base(
     #define LAPACK_csytrf_rook(...) LAPACK_csytrf_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsytrf_rook_base LAPACK_GLOBAL(dsytrf_rook,DSYTRF_ROOK)
+#define LAPACK_dsytrf_rook_base LAPACK_GLOBAL_SUFFIX(dsytrf_rook,DSYTRF_ROOK)
 void LAPACK_dsytrf_rook_base(
     char const* uplo,
     lapack_int const* n,
@@ -18795,7 +19062,7 @@ void LAPACK_dsytrf_rook_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18804,7 +19071,7 @@ void LAPACK_dsytrf_rook_base(
     #define LAPACK_dsytrf_rook(...) LAPACK_dsytrf_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssytrf_rook_base LAPACK_GLOBAL(ssytrf_rook,SSYTRF_ROOK)
+#define LAPACK_ssytrf_rook_base LAPACK_GLOBAL_SUFFIX(ssytrf_rook,SSYTRF_ROOK)
 void LAPACK_ssytrf_rook_base(
     char const* uplo,
     lapack_int const* n,
@@ -18812,7 +19079,7 @@ void LAPACK_ssytrf_rook_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18821,7 +19088,7 @@ void LAPACK_ssytrf_rook_base(
     #define LAPACK_ssytrf_rook(...) LAPACK_ssytrf_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsytrf_rook_base LAPACK_GLOBAL(zsytrf_rook,ZSYTRF_ROOK)
+#define LAPACK_zsytrf_rook_base LAPACK_GLOBAL_SUFFIX(zsytrf_rook,ZSYTRF_ROOK)
 void LAPACK_zsytrf_rook_base(
     char const* uplo,
     lapack_int const* n,
@@ -18829,7 +19096,7 @@ void LAPACK_zsytrf_rook_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18838,7 +19105,7 @@ void LAPACK_zsytrf_rook_base(
     #define LAPACK_zsytrf_rook(...) LAPACK_zsytrf_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csytri_base LAPACK_GLOBAL(csytri,CSYTRI)
+#define LAPACK_csytri_base LAPACK_GLOBAL_SUFFIX(csytri,CSYTRI)
 void LAPACK_csytri_base(
     char const* uplo,
     lapack_int const* n,
@@ -18846,7 +19113,7 @@ void LAPACK_csytri_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18855,7 +19122,7 @@ void LAPACK_csytri_base(
     #define LAPACK_csytri(...) LAPACK_csytri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsytri_base LAPACK_GLOBAL(dsytri,DSYTRI)
+#define LAPACK_dsytri_base LAPACK_GLOBAL_SUFFIX(dsytri,DSYTRI)
 void LAPACK_dsytri_base(
     char const* uplo,
     lapack_int const* n,
@@ -18863,7 +19130,7 @@ void LAPACK_dsytri_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18872,7 +19139,7 @@ void LAPACK_dsytri_base(
     #define LAPACK_dsytri(...) LAPACK_dsytri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssytri_base LAPACK_GLOBAL(ssytri,SSYTRI)
+#define LAPACK_ssytri_base LAPACK_GLOBAL_SUFFIX(ssytri,SSYTRI)
 void LAPACK_ssytri_base(
     char const* uplo,
     lapack_int const* n,
@@ -18880,7 +19147,7 @@ void LAPACK_ssytri_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18889,7 +19156,7 @@ void LAPACK_ssytri_base(
     #define LAPACK_ssytri(...) LAPACK_ssytri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsytri_base LAPACK_GLOBAL(zsytri,ZSYTRI)
+#define LAPACK_zsytri_base LAPACK_GLOBAL_SUFFIX(zsytri,ZSYTRI)
 void LAPACK_zsytri_base(
     char const* uplo,
     lapack_int const* n,
@@ -18897,7 +19164,7 @@ void LAPACK_zsytri_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18906,7 +19173,7 @@ void LAPACK_zsytri_base(
     #define LAPACK_zsytri(...) LAPACK_zsytri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csytri2_base LAPACK_GLOBAL(csytri2,CSYTRI2)
+#define LAPACK_csytri2_base LAPACK_GLOBAL_SUFFIX(csytri2,CSYTRI2)
 void LAPACK_csytri2_base(
     char const* uplo,
     lapack_int const* n,
@@ -18914,7 +19181,7 @@ void LAPACK_csytri2_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18923,7 +19190,7 @@ void LAPACK_csytri2_base(
     #define LAPACK_csytri2(...) LAPACK_csytri2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsytri2_base LAPACK_GLOBAL(dsytri2,DSYTRI2)
+#define LAPACK_dsytri2_base LAPACK_GLOBAL_SUFFIX(dsytri2,DSYTRI2)
 void LAPACK_dsytri2_base(
     char const* uplo,
     lapack_int const* n,
@@ -18931,7 +19198,7 @@ void LAPACK_dsytri2_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18940,7 +19207,7 @@ void LAPACK_dsytri2_base(
     #define LAPACK_dsytri2(...) LAPACK_dsytri2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssytri2_base LAPACK_GLOBAL(ssytri2,SSYTRI2)
+#define LAPACK_ssytri2_base LAPACK_GLOBAL_SUFFIX(ssytri2,SSYTRI2)
 void LAPACK_ssytri2_base(
     char const* uplo,
     lapack_int const* n,
@@ -18948,7 +19215,7 @@ void LAPACK_ssytri2_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18957,7 +19224,7 @@ void LAPACK_ssytri2_base(
     #define LAPACK_ssytri2(...) LAPACK_ssytri2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsytri2_base LAPACK_GLOBAL(zsytri2,ZSYTRI2)
+#define LAPACK_zsytri2_base LAPACK_GLOBAL_SUFFIX(zsytri2,ZSYTRI2)
 void LAPACK_zsytri2_base(
     char const* uplo,
     lapack_int const* n,
@@ -18965,7 +19232,7 @@ void LAPACK_zsytri2_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18974,7 +19241,7 @@ void LAPACK_zsytri2_base(
     #define LAPACK_zsytri2(...) LAPACK_zsytri2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csytri2x_base LAPACK_GLOBAL(csytri2x,CSYTRI2X)
+#define LAPACK_csytri2x_base LAPACK_GLOBAL_SUFFIX(csytri2x,CSYTRI2X)
 void LAPACK_csytri2x_base(
     char const* uplo,
     lapack_int const* n,
@@ -18982,7 +19249,7 @@ void LAPACK_csytri2x_base(
     lapack_complex_float* work, lapack_int const* nb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -18991,7 +19258,7 @@ void LAPACK_csytri2x_base(
     #define LAPACK_csytri2x(...) LAPACK_csytri2x_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsytri2x_base LAPACK_GLOBAL(dsytri2x,DSYTRI2X)
+#define LAPACK_dsytri2x_base LAPACK_GLOBAL_SUFFIX(dsytri2x,DSYTRI2X)
 void LAPACK_dsytri2x_base(
     char const* uplo,
     lapack_int const* n,
@@ -18999,7 +19266,7 @@ void LAPACK_dsytri2x_base(
     double* work, lapack_int const* nb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19008,7 +19275,7 @@ void LAPACK_dsytri2x_base(
     #define LAPACK_dsytri2x(...) LAPACK_dsytri2x_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssytri2x_base LAPACK_GLOBAL(ssytri2x,SSYTRI2X)
+#define LAPACK_ssytri2x_base LAPACK_GLOBAL_SUFFIX(ssytri2x,SSYTRI2X)
 void LAPACK_ssytri2x_base(
     char const* uplo,
     lapack_int const* n,
@@ -19016,7 +19283,7 @@ void LAPACK_ssytri2x_base(
     float* work, lapack_int const* nb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19025,7 +19292,7 @@ void LAPACK_ssytri2x_base(
     #define LAPACK_ssytri2x(...) LAPACK_ssytri2x_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsytri2x_base LAPACK_GLOBAL(zsytri2x,ZSYTRI2X)
+#define LAPACK_zsytri2x_base LAPACK_GLOBAL_SUFFIX(zsytri2x,ZSYTRI2X)
 void LAPACK_zsytri2x_base(
     char const* uplo,
     lapack_int const* n,
@@ -19033,7 +19300,7 @@ void LAPACK_zsytri2x_base(
     lapack_complex_double* work, lapack_int const* nb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19042,7 +19309,7 @@ void LAPACK_zsytri2x_base(
     #define LAPACK_zsytri2x(...) LAPACK_zsytri2x_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csytri_3_base LAPACK_GLOBAL(csytri_3,CSYTRI_3)
+#define LAPACK_csytri_3_base LAPACK_GLOBAL_SUFFIX(csytri_3,CSYTRI_3)
 void LAPACK_csytri_3_base(
     char const* uplo,
     lapack_int const* n,
@@ -19051,7 +19318,7 @@ void LAPACK_csytri_3_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19060,7 +19327,7 @@ void LAPACK_csytri_3_base(
     #define LAPACK_csytri_3(...) LAPACK_csytri_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsytri_3_base LAPACK_GLOBAL(dsytri_3,DSYTRI_3)
+#define LAPACK_dsytri_3_base LAPACK_GLOBAL_SUFFIX(dsytri_3,DSYTRI_3)
 void LAPACK_dsytri_3_base(
     char const* uplo,
     lapack_int const* n,
@@ -19069,7 +19336,7 @@ void LAPACK_dsytri_3_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19078,7 +19345,7 @@ void LAPACK_dsytri_3_base(
     #define LAPACK_dsytri_3(...) LAPACK_dsytri_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssytri_3_base LAPACK_GLOBAL(ssytri_3,SSYTRI_3)
+#define LAPACK_ssytri_3_base LAPACK_GLOBAL_SUFFIX(ssytri_3,SSYTRI_3)
 void LAPACK_ssytri_3_base(
     char const* uplo,
     lapack_int const* n,
@@ -19087,7 +19354,7 @@ void LAPACK_ssytri_3_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19096,7 +19363,7 @@ void LAPACK_ssytri_3_base(
     #define LAPACK_ssytri_3(...) LAPACK_ssytri_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsytri_3_base LAPACK_GLOBAL(zsytri_3,ZSYTRI_3)
+#define LAPACK_zsytri_3_base LAPACK_GLOBAL_SUFFIX(zsytri_3,ZSYTRI_3)
 void LAPACK_zsytri_3_base(
     char const* uplo,
     lapack_int const* n,
@@ -19105,7 +19372,7 @@ void LAPACK_zsytri_3_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19114,7 +19381,7 @@ void LAPACK_zsytri_3_base(
     #define LAPACK_zsytri_3(...) LAPACK_zsytri_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csytrs_base LAPACK_GLOBAL(csytrs,CSYTRS)
+#define LAPACK_csytrs_base LAPACK_GLOBAL_SUFFIX(csytrs,CSYTRS)
 void LAPACK_csytrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19122,7 +19389,7 @@ void LAPACK_csytrs_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19131,7 +19398,7 @@ void LAPACK_csytrs_base(
     #define LAPACK_csytrs(...) LAPACK_csytrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsytrs_base LAPACK_GLOBAL(dsytrs,DSYTRS)
+#define LAPACK_dsytrs_base LAPACK_GLOBAL_SUFFIX(dsytrs,DSYTRS)
 void LAPACK_dsytrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19139,7 +19406,7 @@ void LAPACK_dsytrs_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19148,7 +19415,7 @@ void LAPACK_dsytrs_base(
     #define LAPACK_dsytrs(...) LAPACK_dsytrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssytrs_base LAPACK_GLOBAL(ssytrs,SSYTRS)
+#define LAPACK_ssytrs_base LAPACK_GLOBAL_SUFFIX(ssytrs,SSYTRS)
 void LAPACK_ssytrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19156,7 +19423,7 @@ void LAPACK_ssytrs_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19165,7 +19432,7 @@ void LAPACK_ssytrs_base(
     #define LAPACK_ssytrs(...) LAPACK_ssytrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsytrs_base LAPACK_GLOBAL(zsytrs,ZSYTRS)
+#define LAPACK_zsytrs_base LAPACK_GLOBAL_SUFFIX(zsytrs,ZSYTRS)
 void LAPACK_zsytrs_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19173,7 +19440,7 @@ void LAPACK_zsytrs_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19182,7 +19449,7 @@ void LAPACK_zsytrs_base(
     #define LAPACK_zsytrs(...) LAPACK_zsytrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csytrs2_base LAPACK_GLOBAL(csytrs2,CSYTRS2)
+#define LAPACK_csytrs2_base LAPACK_GLOBAL_SUFFIX(csytrs2,CSYTRS2)
 void LAPACK_csytrs2_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19191,7 +19458,7 @@ void LAPACK_csytrs2_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19200,7 +19467,7 @@ void LAPACK_csytrs2_base(
     #define LAPACK_csytrs2(...) LAPACK_csytrs2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsytrs2_base LAPACK_GLOBAL(dsytrs2,DSYTRS2)
+#define LAPACK_dsytrs2_base LAPACK_GLOBAL_SUFFIX(dsytrs2,DSYTRS2)
 void LAPACK_dsytrs2_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19209,7 +19476,7 @@ void LAPACK_dsytrs2_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19218,7 +19485,7 @@ void LAPACK_dsytrs2_base(
     #define LAPACK_dsytrs2(...) LAPACK_dsytrs2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssytrs2_base LAPACK_GLOBAL(ssytrs2,SSYTRS2)
+#define LAPACK_ssytrs2_base LAPACK_GLOBAL_SUFFIX(ssytrs2,SSYTRS2)
 void LAPACK_ssytrs2_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19227,7 +19494,7 @@ void LAPACK_ssytrs2_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19236,7 +19503,7 @@ void LAPACK_ssytrs2_base(
     #define LAPACK_ssytrs2(...) LAPACK_ssytrs2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsytrs2_base LAPACK_GLOBAL(zsytrs2,ZSYTRS2)
+#define LAPACK_zsytrs2_base LAPACK_GLOBAL_SUFFIX(zsytrs2,ZSYTRS2)
 void LAPACK_zsytrs2_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19245,7 +19512,7 @@ void LAPACK_zsytrs2_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19254,7 +19521,7 @@ void LAPACK_zsytrs2_base(
     #define LAPACK_zsytrs2(...) LAPACK_zsytrs2_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csytrs_3_base LAPACK_GLOBAL(csytrs_3,CSYTRS_3)
+#define LAPACK_csytrs_3_base LAPACK_GLOBAL_SUFFIX(csytrs_3,CSYTRS_3)
 void LAPACK_csytrs_3_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19263,7 +19530,7 @@ void LAPACK_csytrs_3_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19272,7 +19539,7 @@ void LAPACK_csytrs_3_base(
     #define LAPACK_csytrs_3(...) LAPACK_csytrs_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsytrs_3_base LAPACK_GLOBAL(dsytrs_3,DSYTRS_3)
+#define LAPACK_dsytrs_3_base LAPACK_GLOBAL_SUFFIX(dsytrs_3,DSYTRS_3)
 void LAPACK_dsytrs_3_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19281,7 +19548,7 @@ void LAPACK_dsytrs_3_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19290,7 +19557,7 @@ void LAPACK_dsytrs_3_base(
     #define LAPACK_dsytrs_3(...) LAPACK_dsytrs_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssytrs_3_base LAPACK_GLOBAL(ssytrs_3,SSYTRS_3)
+#define LAPACK_ssytrs_3_base LAPACK_GLOBAL_SUFFIX(ssytrs_3,SSYTRS_3)
 void LAPACK_ssytrs_3_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19299,7 +19566,7 @@ void LAPACK_ssytrs_3_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19308,7 +19575,7 @@ void LAPACK_ssytrs_3_base(
     #define LAPACK_ssytrs_3(...) LAPACK_ssytrs_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsytrs_3_base LAPACK_GLOBAL(zsytrs_3,ZSYTRS_3)
+#define LAPACK_zsytrs_3_base LAPACK_GLOBAL_SUFFIX(zsytrs_3,ZSYTRS_3)
 void LAPACK_zsytrs_3_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19317,7 +19584,7 @@ void LAPACK_zsytrs_3_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19326,7 +19593,7 @@ void LAPACK_zsytrs_3_base(
     #define LAPACK_zsytrs_3(...) LAPACK_zsytrs_3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csytrs_aa_base LAPACK_GLOBAL(csytrs_aa,CSYTRS_AA)
+#define LAPACK_csytrs_aa_base LAPACK_GLOBAL_SUFFIX(csytrs_aa,CSYTRS_AA)
 void LAPACK_csytrs_aa_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19335,7 +19602,7 @@ void LAPACK_csytrs_aa_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19344,7 +19611,7 @@ void LAPACK_csytrs_aa_base(
     #define LAPACK_csytrs_aa(...) LAPACK_csytrs_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsytrs_aa_base LAPACK_GLOBAL(dsytrs_aa,DSYTRS_AA)
+#define LAPACK_dsytrs_aa_base LAPACK_GLOBAL_SUFFIX(dsytrs_aa,DSYTRS_AA)
 void LAPACK_dsytrs_aa_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19353,7 +19620,7 @@ void LAPACK_dsytrs_aa_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19362,7 +19629,7 @@ void LAPACK_dsytrs_aa_base(
     #define LAPACK_dsytrs_aa(...) LAPACK_dsytrs_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssytrs_aa_base LAPACK_GLOBAL(ssytrs_aa,SSYTRS_AA)
+#define LAPACK_ssytrs_aa_base LAPACK_GLOBAL_SUFFIX(ssytrs_aa,SSYTRS_AA)
 void LAPACK_ssytrs_aa_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19371,7 +19638,7 @@ void LAPACK_ssytrs_aa_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19380,7 +19647,7 @@ void LAPACK_ssytrs_aa_base(
     #define LAPACK_ssytrs_aa(...) LAPACK_ssytrs_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsytrs_aa_base LAPACK_GLOBAL(zsytrs_aa,ZSYTRS_AA)
+#define LAPACK_zsytrs_aa_base LAPACK_GLOBAL_SUFFIX(zsytrs_aa,ZSYTRS_AA)
 void LAPACK_zsytrs_aa_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19389,7 +19656,7 @@ void LAPACK_zsytrs_aa_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19398,7 +19665,7 @@ void LAPACK_zsytrs_aa_base(
     #define LAPACK_zsytrs_aa(...) LAPACK_zsytrs_aa_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csytrs_aa_2stage_base LAPACK_GLOBAL(csytrs_aa_2stage,CSYTRS_AA_2STAGE)
+#define LAPACK_csytrs_aa_2stage_base LAPACK_GLOBAL_SUFFIX(csytrs_aa_2stage,CSYTRS_AA_2STAGE)
 void LAPACK_csytrs_aa_2stage_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19407,7 +19674,7 @@ void LAPACK_csytrs_aa_2stage_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19416,7 +19683,7 @@ void LAPACK_csytrs_aa_2stage_base(
     #define LAPACK_csytrs_aa_2stage(...) LAPACK_csytrs_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsytrs_aa_2stage_base LAPACK_GLOBAL(dsytrs_aa_2stage,DSYTRS_AA_2STAGE)
+#define LAPACK_dsytrs_aa_2stage_base LAPACK_GLOBAL_SUFFIX(dsytrs_aa_2stage,DSYTRS_AA_2STAGE)
 void LAPACK_dsytrs_aa_2stage_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19425,7 +19692,7 @@ void LAPACK_dsytrs_aa_2stage_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19434,7 +19701,7 @@ void LAPACK_dsytrs_aa_2stage_base(
     #define LAPACK_dsytrs_aa_2stage(...) LAPACK_dsytrs_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssytrs_aa_2stage_base LAPACK_GLOBAL(ssytrs_aa_2stage,SSYTRS_AA_2STAGE)
+#define LAPACK_ssytrs_aa_2stage_base LAPACK_GLOBAL_SUFFIX(ssytrs_aa_2stage,SSYTRS_AA_2STAGE)
 void LAPACK_ssytrs_aa_2stage_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19443,7 +19710,7 @@ void LAPACK_ssytrs_aa_2stage_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19452,7 +19719,7 @@ void LAPACK_ssytrs_aa_2stage_base(
     #define LAPACK_ssytrs_aa_2stage(...) LAPACK_ssytrs_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsytrs_aa_2stage_base LAPACK_GLOBAL(zsytrs_aa_2stage,ZSYTRS_AA_2STAGE)
+#define LAPACK_zsytrs_aa_2stage_base LAPACK_GLOBAL_SUFFIX(zsytrs_aa_2stage,ZSYTRS_AA_2STAGE)
 void LAPACK_zsytrs_aa_2stage_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19461,7 +19728,7 @@ void LAPACK_zsytrs_aa_2stage_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19470,7 +19737,7 @@ void LAPACK_zsytrs_aa_2stage_base(
     #define LAPACK_zsytrs_aa_2stage(...) LAPACK_zsytrs_aa_2stage_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_csytrs_rook_base LAPACK_GLOBAL(csytrs_rook,CSYTRS_ROOK)
+#define LAPACK_csytrs_rook_base LAPACK_GLOBAL_SUFFIX(csytrs_rook,CSYTRS_ROOK)
 void LAPACK_csytrs_rook_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19478,7 +19745,7 @@ void LAPACK_csytrs_rook_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19487,7 +19754,7 @@ void LAPACK_csytrs_rook_base(
     #define LAPACK_csytrs_rook(...) LAPACK_csytrs_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dsytrs_rook_base LAPACK_GLOBAL(dsytrs_rook,DSYTRS_ROOK)
+#define LAPACK_dsytrs_rook_base LAPACK_GLOBAL_SUFFIX(dsytrs_rook,DSYTRS_ROOK)
 void LAPACK_dsytrs_rook_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19495,7 +19762,7 @@ void LAPACK_dsytrs_rook_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19504,7 +19771,7 @@ void LAPACK_dsytrs_rook_base(
     #define LAPACK_dsytrs_rook(...) LAPACK_dsytrs_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ssytrs_rook_base LAPACK_GLOBAL(ssytrs_rook,SSYTRS_ROOK)
+#define LAPACK_ssytrs_rook_base LAPACK_GLOBAL_SUFFIX(ssytrs_rook,SSYTRS_ROOK)
 void LAPACK_ssytrs_rook_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19512,7 +19779,7 @@ void LAPACK_ssytrs_rook_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19521,7 +19788,7 @@ void LAPACK_ssytrs_rook_base(
     #define LAPACK_ssytrs_rook(...) LAPACK_ssytrs_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zsytrs_rook_base LAPACK_GLOBAL(zsytrs_rook,ZSYTRS_ROOK)
+#define LAPACK_zsytrs_rook_base LAPACK_GLOBAL_SUFFIX(zsytrs_rook,ZSYTRS_ROOK)
 void LAPACK_zsytrs_rook_base(
     char const* uplo,
     lapack_int const* n, lapack_int const* nrhs,
@@ -19529,7 +19796,7 @@ void LAPACK_zsytrs_rook_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19538,7 +19805,7 @@ void LAPACK_zsytrs_rook_base(
     #define LAPACK_zsytrs_rook(...) LAPACK_zsytrs_rook_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctbcon_base LAPACK_GLOBAL(ctbcon,CTBCON)
+#define LAPACK_ctbcon_base LAPACK_GLOBAL_SUFFIX(ctbcon,CTBCON)
 void LAPACK_ctbcon_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n, lapack_int const* kd,
@@ -19548,7 +19815,7 @@ void LAPACK_ctbcon_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19557,7 +19824,7 @@ void LAPACK_ctbcon_base(
     #define LAPACK_ctbcon(...) LAPACK_ctbcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtbcon_base LAPACK_GLOBAL(dtbcon,DTBCON)
+#define LAPACK_dtbcon_base LAPACK_GLOBAL_SUFFIX(dtbcon,DTBCON)
 void LAPACK_dtbcon_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n, lapack_int const* kd,
@@ -19567,7 +19834,7 @@ void LAPACK_dtbcon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19576,7 +19843,7 @@ void LAPACK_dtbcon_base(
     #define LAPACK_dtbcon(...) LAPACK_dtbcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stbcon_base LAPACK_GLOBAL(stbcon,STBCON)
+#define LAPACK_stbcon_base LAPACK_GLOBAL_SUFFIX(stbcon,STBCON)
 void LAPACK_stbcon_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n, lapack_int const* kd,
@@ -19586,7 +19853,7 @@ void LAPACK_stbcon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19595,7 +19862,7 @@ void LAPACK_stbcon_base(
     #define LAPACK_stbcon(...) LAPACK_stbcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztbcon_base LAPACK_GLOBAL(ztbcon,ZTBCON)
+#define LAPACK_ztbcon_base LAPACK_GLOBAL_SUFFIX(ztbcon,ZTBCON)
 void LAPACK_ztbcon_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n, lapack_int const* kd,
@@ -19605,7 +19872,7 @@ void LAPACK_ztbcon_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19614,7 +19881,7 @@ void LAPACK_ztbcon_base(
     #define LAPACK_ztbcon(...) LAPACK_ztbcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctbrfs_base LAPACK_GLOBAL(ctbrfs,CTBRFS)
+#define LAPACK_ctbrfs_base LAPACK_GLOBAL_SUFFIX(ctbrfs,CTBRFS)
 void LAPACK_ctbrfs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -19627,7 +19894,7 @@ void LAPACK_ctbrfs_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19636,7 +19903,7 @@ void LAPACK_ctbrfs_base(
     #define LAPACK_ctbrfs(...) LAPACK_ctbrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtbrfs_base LAPACK_GLOBAL(dtbrfs,DTBRFS)
+#define LAPACK_dtbrfs_base LAPACK_GLOBAL_SUFFIX(dtbrfs,DTBRFS)
 void LAPACK_dtbrfs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -19649,7 +19916,7 @@ void LAPACK_dtbrfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19658,7 +19925,7 @@ void LAPACK_dtbrfs_base(
     #define LAPACK_dtbrfs(...) LAPACK_dtbrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stbrfs_base LAPACK_GLOBAL(stbrfs,STBRFS)
+#define LAPACK_stbrfs_base LAPACK_GLOBAL_SUFFIX(stbrfs,STBRFS)
 void LAPACK_stbrfs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -19671,7 +19938,7 @@ void LAPACK_stbrfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19680,7 +19947,7 @@ void LAPACK_stbrfs_base(
     #define LAPACK_stbrfs(...) LAPACK_stbrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztbrfs_base LAPACK_GLOBAL(ztbrfs,ZTBRFS)
+#define LAPACK_ztbrfs_base LAPACK_GLOBAL_SUFFIX(ztbrfs,ZTBRFS)
 void LAPACK_ztbrfs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -19693,7 +19960,7 @@ void LAPACK_ztbrfs_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19702,7 +19969,7 @@ void LAPACK_ztbrfs_base(
     #define LAPACK_ztbrfs(...) LAPACK_ztbrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctbtrs_base LAPACK_GLOBAL(ctbtrs,CTBTRS)
+#define LAPACK_ctbtrs_base LAPACK_GLOBAL_SUFFIX(ctbtrs,CTBTRS)
 void LAPACK_ctbtrs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -19710,7 +19977,7 @@ void LAPACK_ctbtrs_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19719,7 +19986,7 @@ void LAPACK_ctbtrs_base(
     #define LAPACK_ctbtrs(...) LAPACK_ctbtrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtbtrs_base LAPACK_GLOBAL(dtbtrs,DTBTRS)
+#define LAPACK_dtbtrs_base LAPACK_GLOBAL_SUFFIX(dtbtrs,DTBTRS)
 void LAPACK_dtbtrs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -19727,7 +19994,7 @@ void LAPACK_dtbtrs_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19736,7 +20003,7 @@ void LAPACK_dtbtrs_base(
     #define LAPACK_dtbtrs(...) LAPACK_dtbtrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stbtrs_base LAPACK_GLOBAL(stbtrs,STBTRS)
+#define LAPACK_stbtrs_base LAPACK_GLOBAL_SUFFIX(stbtrs,STBTRS)
 void LAPACK_stbtrs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -19744,7 +20011,7 @@ void LAPACK_stbtrs_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19753,7 +20020,7 @@ void LAPACK_stbtrs_base(
     #define LAPACK_stbtrs(...) LAPACK_stbtrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztbtrs_base LAPACK_GLOBAL(ztbtrs,ZTBTRS)
+#define LAPACK_ztbtrs_base LAPACK_GLOBAL_SUFFIX(ztbtrs,ZTBTRS)
 void LAPACK_ztbtrs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* kd, lapack_int const* nrhs,
@@ -19761,7 +20028,7 @@ void LAPACK_ztbtrs_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19770,7 +20037,7 @@ void LAPACK_ztbtrs_base(
     #define LAPACK_ztbtrs(...) LAPACK_ztbtrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctfsm_base LAPACK_GLOBAL(ctfsm,CTFSM)
+#define LAPACK_ctfsm_base LAPACK_GLOBAL_SUFFIX(ctfsm,CTFSM)
 void LAPACK_ctfsm_base(
     char const* transr, char const* side, char const* uplo, char const* trans, char const* diag,
     lapack_int const* m, lapack_int const* n,
@@ -19778,7 +20045,7 @@ void LAPACK_ctfsm_base(
     lapack_complex_float const* A,
     lapack_complex_float* B, lapack_int const* ldb
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19787,7 +20054,7 @@ void LAPACK_ctfsm_base(
     #define LAPACK_ctfsm(...) LAPACK_ctfsm_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtfsm_base LAPACK_GLOBAL(dtfsm,DTFSM)
+#define LAPACK_dtfsm_base LAPACK_GLOBAL_SUFFIX(dtfsm,DTFSM)
 void LAPACK_dtfsm_base(
     char const* transr, char const* side, char const* uplo, char const* trans, char const* diag,
     lapack_int const* m, lapack_int const* n,
@@ -19795,7 +20062,7 @@ void LAPACK_dtfsm_base(
     double const* A,
     double* B, lapack_int const* ldb
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19804,7 +20071,7 @@ void LAPACK_dtfsm_base(
     #define LAPACK_dtfsm(...) LAPACK_dtfsm_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stfsm_base LAPACK_GLOBAL(stfsm,STFSM)
+#define LAPACK_stfsm_base LAPACK_GLOBAL_SUFFIX(stfsm,STFSM)
 void LAPACK_stfsm_base(
     char const* transr, char const* side, char const* uplo, char const* trans, char const* diag,
     lapack_int const* m, lapack_int const* n,
@@ -19812,7 +20079,7 @@ void LAPACK_stfsm_base(
     float const* A,
     float* B, lapack_int const* ldb
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19821,7 +20088,7 @@ void LAPACK_stfsm_base(
     #define LAPACK_stfsm(...) LAPACK_stfsm_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztfsm_base LAPACK_GLOBAL(ztfsm,ZTFSM)
+#define LAPACK_ztfsm_base LAPACK_GLOBAL_SUFFIX(ztfsm,ZTFSM)
 void LAPACK_ztfsm_base(
     char const* transr, char const* side, char const* uplo, char const* trans, char const* diag,
     lapack_int const* m, lapack_int const* n,
@@ -19829,7 +20096,7 @@ void LAPACK_ztfsm_base(
     lapack_complex_double const* A,
     lapack_complex_double* B, lapack_int const* ldb
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19838,14 +20105,14 @@ void LAPACK_ztfsm_base(
     #define LAPACK_ztfsm(...) LAPACK_ztfsm_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctftri_base LAPACK_GLOBAL(ctftri,CTFTRI)
+#define LAPACK_ctftri_base LAPACK_GLOBAL_SUFFIX(ctftri,CTFTRI)
 void LAPACK_ctftri_base(
     char const* transr, char const* uplo, char const* diag,
     lapack_int const* n,
     lapack_complex_float* A,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19854,14 +20121,14 @@ void LAPACK_ctftri_base(
     #define LAPACK_ctftri(...) LAPACK_ctftri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtftri_base LAPACK_GLOBAL(dtftri,DTFTRI)
+#define LAPACK_dtftri_base LAPACK_GLOBAL_SUFFIX(dtftri,DTFTRI)
 void LAPACK_dtftri_base(
     char const* transr, char const* uplo, char const* diag,
     lapack_int const* n,
     double* A,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19870,14 +20137,14 @@ void LAPACK_dtftri_base(
     #define LAPACK_dtftri(...) LAPACK_dtftri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stftri_base LAPACK_GLOBAL(stftri,STFTRI)
+#define LAPACK_stftri_base LAPACK_GLOBAL_SUFFIX(stftri,STFTRI)
 void LAPACK_stftri_base(
     char const* transr, char const* uplo, char const* diag,
     lapack_int const* n,
     float* A,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19886,14 +20153,14 @@ void LAPACK_stftri_base(
     #define LAPACK_stftri(...) LAPACK_stftri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztftri_base LAPACK_GLOBAL(ztftri,ZTFTRI)
+#define LAPACK_ztftri_base LAPACK_GLOBAL_SUFFIX(ztftri,ZTFTRI)
 void LAPACK_ztftri_base(
     char const* transr, char const* uplo, char const* diag,
     lapack_int const* n,
     lapack_complex_double* A,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19902,7 +20169,7 @@ void LAPACK_ztftri_base(
     #define LAPACK_ztftri(...) LAPACK_ztftri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctfttp_base LAPACK_GLOBAL(ctfttp,CTFTTP)
+#define LAPACK_ctfttp_base LAPACK_GLOBAL_SUFFIX(ctfttp,CTFTTP)
 void LAPACK_ctfttp_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
@@ -19910,7 +20177,7 @@ void LAPACK_ctfttp_base(
     lapack_complex_float* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19919,7 +20186,7 @@ void LAPACK_ctfttp_base(
     #define LAPACK_ctfttp(...) LAPACK_ctfttp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtfttp_base LAPACK_GLOBAL(dtfttp,DTFTTP)
+#define LAPACK_dtfttp_base LAPACK_GLOBAL_SUFFIX(dtfttp,DTFTTP)
 void LAPACK_dtfttp_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
@@ -19927,7 +20194,7 @@ void LAPACK_dtfttp_base(
     double* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19936,7 +20203,7 @@ void LAPACK_dtfttp_base(
     #define LAPACK_dtfttp(...) LAPACK_dtfttp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stfttp_base LAPACK_GLOBAL(stfttp,STFTTP)
+#define LAPACK_stfttp_base LAPACK_GLOBAL_SUFFIX(stfttp,STFTTP)
 void LAPACK_stfttp_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
@@ -19944,7 +20211,7 @@ void LAPACK_stfttp_base(
     float* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19953,7 +20220,7 @@ void LAPACK_stfttp_base(
     #define LAPACK_stfttp(...) LAPACK_stfttp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztfttp_base LAPACK_GLOBAL(ztfttp,ZTFTTP)
+#define LAPACK_ztfttp_base LAPACK_GLOBAL_SUFFIX(ztfttp,ZTFTTP)
 void LAPACK_ztfttp_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
@@ -19961,7 +20228,7 @@ void LAPACK_ztfttp_base(
     lapack_complex_double* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19970,7 +20237,7 @@ void LAPACK_ztfttp_base(
     #define LAPACK_ztfttp(...) LAPACK_ztfttp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctfttr_base LAPACK_GLOBAL(ctfttr,CTFTTR)
+#define LAPACK_ctfttr_base LAPACK_GLOBAL_SUFFIX(ctfttr,CTFTTR)
 void LAPACK_ctfttr_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
@@ -19978,7 +20245,7 @@ void LAPACK_ctfttr_base(
     lapack_complex_float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -19987,7 +20254,7 @@ void LAPACK_ctfttr_base(
     #define LAPACK_ctfttr(...) LAPACK_ctfttr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtfttr_base LAPACK_GLOBAL(dtfttr,DTFTTR)
+#define LAPACK_dtfttr_base LAPACK_GLOBAL_SUFFIX(dtfttr,DTFTTR)
 void LAPACK_dtfttr_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
@@ -19995,7 +20262,7 @@ void LAPACK_dtfttr_base(
     double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20004,7 +20271,7 @@ void LAPACK_dtfttr_base(
     #define LAPACK_dtfttr(...) LAPACK_dtfttr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stfttr_base LAPACK_GLOBAL(stfttr,STFTTR)
+#define LAPACK_stfttr_base LAPACK_GLOBAL_SUFFIX(stfttr,STFTTR)
 void LAPACK_stfttr_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
@@ -20012,7 +20279,7 @@ void LAPACK_stfttr_base(
     float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20021,7 +20288,7 @@ void LAPACK_stfttr_base(
     #define LAPACK_stfttr(...) LAPACK_stfttr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztfttr_base LAPACK_GLOBAL(ztfttr,ZTFTTR)
+#define LAPACK_ztfttr_base LAPACK_GLOBAL_SUFFIX(ztfttr,ZTFTTR)
 void LAPACK_ztfttr_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
@@ -20029,7 +20296,7 @@ void LAPACK_ztfttr_base(
     lapack_complex_double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20038,7 +20305,7 @@ void LAPACK_ztfttr_base(
     #define LAPACK_ztfttr(...) LAPACK_ztfttr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctgevc_base LAPACK_GLOBAL(ctgevc,CTGEVC)
+#define LAPACK_ctgevc_base LAPACK_GLOBAL_SUFFIX(ctgevc,CTGEVC)
 void LAPACK_ctgevc_base(
     char const* side, char const* howmny,
     lapack_logical const* select,
@@ -20051,7 +20318,7 @@ void LAPACK_ctgevc_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20060,7 +20327,7 @@ void LAPACK_ctgevc_base(
     #define LAPACK_ctgevc(...) LAPACK_ctgevc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtgevc_base LAPACK_GLOBAL(dtgevc,DTGEVC)
+#define LAPACK_dtgevc_base LAPACK_GLOBAL_SUFFIX(dtgevc,DTGEVC)
 void LAPACK_dtgevc_base(
     char const* side, char const* howmny,
     lapack_logical const* select,
@@ -20072,7 +20339,7 @@ void LAPACK_dtgevc_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20081,7 +20348,7 @@ void LAPACK_dtgevc_base(
     #define LAPACK_dtgevc(...) LAPACK_dtgevc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stgevc_base LAPACK_GLOBAL(stgevc,STGEVC)
+#define LAPACK_stgevc_base LAPACK_GLOBAL_SUFFIX(stgevc,STGEVC)
 void LAPACK_stgevc_base(
     char const* side, char const* howmny,
     lapack_logical const* select,
@@ -20093,7 +20360,7 @@ void LAPACK_stgevc_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20102,7 +20369,7 @@ void LAPACK_stgevc_base(
     #define LAPACK_stgevc(...) LAPACK_stgevc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztgevc_base LAPACK_GLOBAL(ztgevc,ZTGEVC)
+#define LAPACK_ztgevc_base LAPACK_GLOBAL_SUFFIX(ztgevc,ZTGEVC)
 void LAPACK_ztgevc_base(
     char const* side, char const* howmny,
     lapack_logical const* select,
@@ -20115,7 +20382,7 @@ void LAPACK_ztgevc_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20124,7 +20391,7 @@ void LAPACK_ztgevc_base(
     #define LAPACK_ztgevc(...) LAPACK_ztgevc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctgexc LAPACK_GLOBAL(ctgexc,CTGEXC)
+#define LAPACK_ctgexc LAPACK_GLOBAL_SUFFIX(ctgexc,CTGEXC)
 void LAPACK_ctgexc(
     lapack_logical const* wantq, lapack_logical const* wantz, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
@@ -20133,7 +20400,7 @@ void LAPACK_ctgexc(
     lapack_complex_float* Z, lapack_int const* ldz, lapack_int const* ifst, lapack_int* ilst,
     lapack_int* info );
 
-#define LAPACK_dtgexc LAPACK_GLOBAL(dtgexc,DTGEXC)
+#define LAPACK_dtgexc LAPACK_GLOBAL_SUFFIX(dtgexc,DTGEXC)
 void LAPACK_dtgexc(
     lapack_logical const* wantq, lapack_logical const* wantz, lapack_int const* n,
     double* A, lapack_int const* lda,
@@ -20143,7 +20410,7 @@ void LAPACK_dtgexc(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_stgexc LAPACK_GLOBAL(stgexc,STGEXC)
+#define LAPACK_stgexc LAPACK_GLOBAL_SUFFIX(stgexc,STGEXC)
 void LAPACK_stgexc(
     lapack_logical const* wantq, lapack_logical const* wantz, lapack_int const* n,
     float* A, lapack_int const* lda,
@@ -20153,7 +20420,7 @@ void LAPACK_stgexc(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_ztgexc LAPACK_GLOBAL(ztgexc,ZTGEXC)
+#define LAPACK_ztgexc LAPACK_GLOBAL_SUFFIX(ztgexc,ZTGEXC)
 void LAPACK_ztgexc(
     lapack_logical const* wantq, lapack_logical const* wantz, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
@@ -20162,7 +20429,7 @@ void LAPACK_ztgexc(
     lapack_complex_double* Z, lapack_int const* ldz, lapack_int const* ifst, lapack_int* ilst,
     lapack_int* info );
 
-#define LAPACK_ctgsen LAPACK_GLOBAL(ctgsen,CTGSEN)
+#define LAPACK_ctgsen LAPACK_GLOBAL_SUFFIX(ctgsen,CTGSEN)
 void LAPACK_ctgsen(
     lapack_int const* ijob, lapack_logical const* wantq, lapack_logical const* wantz, lapack_logical const* select, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
@@ -20178,7 +20445,7 @@ void LAPACK_ctgsen(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info );
 
-#define LAPACK_dtgsen LAPACK_GLOBAL(dtgsen,DTGSEN)
+#define LAPACK_dtgsen LAPACK_GLOBAL_SUFFIX(dtgsen,DTGSEN)
 void LAPACK_dtgsen(
     lapack_int const* ijob, lapack_logical const* wantq, lapack_logical const* wantz, lapack_logical const* select, lapack_int const* n,
     double* A, lapack_int const* lda,
@@ -20195,7 +20462,7 @@ void LAPACK_dtgsen(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info );
 
-#define LAPACK_stgsen LAPACK_GLOBAL(stgsen,STGSEN)
+#define LAPACK_stgsen LAPACK_GLOBAL_SUFFIX(stgsen,STGSEN)
 void LAPACK_stgsen(
     lapack_int const* ijob, lapack_logical const* wantq, lapack_logical const* wantz, lapack_logical const* select, lapack_int const* n,
     float* A, lapack_int const* lda,
@@ -20212,7 +20479,7 @@ void LAPACK_stgsen(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info );
 
-#define LAPACK_ztgsen LAPACK_GLOBAL(ztgsen,ZTGSEN)
+#define LAPACK_ztgsen LAPACK_GLOBAL_SUFFIX(ztgsen,ZTGSEN)
 void LAPACK_ztgsen(
     lapack_int const* ijob, lapack_logical const* wantq, lapack_logical const* wantz, lapack_logical const* select, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
@@ -20228,7 +20495,7 @@ void LAPACK_ztgsen(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info );
 
-#define LAPACK_ctgsja_base LAPACK_GLOBAL(ctgsja,CTGSJA)
+#define LAPACK_ctgsja_base LAPACK_GLOBAL_SUFFIX(ctgsja,CTGSJA)
 void LAPACK_ctgsja_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* p, lapack_int const* n, lapack_int const* k, lapack_int const* l,
@@ -20244,7 +20511,7 @@ void LAPACK_ctgsja_base(
     lapack_complex_float* work, lapack_int* ncycle,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20253,7 +20520,7 @@ void LAPACK_ctgsja_base(
     #define LAPACK_ctgsja(...) LAPACK_ctgsja_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtgsja_base LAPACK_GLOBAL(dtgsja,DTGSJA)
+#define LAPACK_dtgsja_base LAPACK_GLOBAL_SUFFIX(dtgsja,DTGSJA)
 void LAPACK_dtgsja_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* p, lapack_int const* n, lapack_int const* k, lapack_int const* l,
@@ -20269,7 +20536,7 @@ void LAPACK_dtgsja_base(
     double* work, lapack_int* ncycle,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20278,7 +20545,7 @@ void LAPACK_dtgsja_base(
     #define LAPACK_dtgsja(...) LAPACK_dtgsja_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stgsja_base LAPACK_GLOBAL(stgsja,STGSJA)
+#define LAPACK_stgsja_base LAPACK_GLOBAL_SUFFIX(stgsja,STGSJA)
 void LAPACK_stgsja_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* p, lapack_int const* n, lapack_int const* k, lapack_int const* l,
@@ -20294,7 +20561,7 @@ void LAPACK_stgsja_base(
     float* work, lapack_int* ncycle,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20303,7 +20570,7 @@ void LAPACK_stgsja_base(
     #define LAPACK_stgsja(...) LAPACK_stgsja_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztgsja_base LAPACK_GLOBAL(ztgsja,ZTGSJA)
+#define LAPACK_ztgsja_base LAPACK_GLOBAL_SUFFIX(ztgsja,ZTGSJA)
 void LAPACK_ztgsja_base(
     char const* jobu, char const* jobv, char const* jobq,
     lapack_int const* m, lapack_int const* p, lapack_int const* n, lapack_int const* k, lapack_int const* l,
@@ -20319,7 +20586,7 @@ void LAPACK_ztgsja_base(
     lapack_complex_double* work, lapack_int* ncycle,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20328,7 +20595,7 @@ void LAPACK_ztgsja_base(
     #define LAPACK_ztgsja(...) LAPACK_ztgsja_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctgsna_base LAPACK_GLOBAL(ctgsna,CTGSNA)
+#define LAPACK_ctgsna_base LAPACK_GLOBAL_SUFFIX(ctgsna,CTGSNA)
 void LAPACK_ctgsna_base(
     char const* job, char const* howmny,
     lapack_logical const* select,
@@ -20343,7 +20610,7 @@ void LAPACK_ctgsna_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20352,7 +20619,7 @@ void LAPACK_ctgsna_base(
     #define LAPACK_ctgsna(...) LAPACK_ctgsna_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtgsna_base LAPACK_GLOBAL(dtgsna,DTGSNA)
+#define LAPACK_dtgsna_base LAPACK_GLOBAL_SUFFIX(dtgsna,DTGSNA)
 void LAPACK_dtgsna_base(
     char const* job, char const* howmny,
     lapack_logical const* select,
@@ -20367,7 +20634,7 @@ void LAPACK_dtgsna_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20376,7 +20643,7 @@ void LAPACK_dtgsna_base(
     #define LAPACK_dtgsna(...) LAPACK_dtgsna_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stgsna_base LAPACK_GLOBAL(stgsna,STGSNA)
+#define LAPACK_stgsna_base LAPACK_GLOBAL_SUFFIX(stgsna,STGSNA)
 void LAPACK_stgsna_base(
     char const* job, char const* howmny,
     lapack_logical const* select,
@@ -20391,7 +20658,7 @@ void LAPACK_stgsna_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20400,7 +20667,7 @@ void LAPACK_stgsna_base(
     #define LAPACK_stgsna(...) LAPACK_stgsna_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztgsna_base LAPACK_GLOBAL(ztgsna,ZTGSNA)
+#define LAPACK_ztgsna_base LAPACK_GLOBAL_SUFFIX(ztgsna,ZTGSNA)
 void LAPACK_ztgsna_base(
     char const* job, char const* howmny,
     lapack_logical const* select,
@@ -20415,7 +20682,7 @@ void LAPACK_ztgsna_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20424,7 +20691,7 @@ void LAPACK_ztgsna_base(
     #define LAPACK_ztgsna(...) LAPACK_ztgsna_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctgsyl_base LAPACK_GLOBAL(ctgsyl,CTGSYL)
+#define LAPACK_ctgsyl_base LAPACK_GLOBAL_SUFFIX(ctgsyl,CTGSYL)
 void LAPACK_ctgsyl_base(
     char const* trans,
     lapack_int const* ijob, lapack_int const* m, lapack_int const* n,
@@ -20440,7 +20707,7 @@ void LAPACK_ctgsyl_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20449,7 +20716,7 @@ void LAPACK_ctgsyl_base(
     #define LAPACK_ctgsyl(...) LAPACK_ctgsyl_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtgsyl_base LAPACK_GLOBAL(dtgsyl,DTGSYL)
+#define LAPACK_dtgsyl_base LAPACK_GLOBAL_SUFFIX(dtgsyl,DTGSYL)
 void LAPACK_dtgsyl_base(
     char const* trans,
     lapack_int const* ijob, lapack_int const* m, lapack_int const* n,
@@ -20465,7 +20732,7 @@ void LAPACK_dtgsyl_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20474,7 +20741,7 @@ void LAPACK_dtgsyl_base(
     #define LAPACK_dtgsyl(...) LAPACK_dtgsyl_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stgsyl_base LAPACK_GLOBAL(stgsyl,STGSYL)
+#define LAPACK_stgsyl_base LAPACK_GLOBAL_SUFFIX(stgsyl,STGSYL)
 void LAPACK_stgsyl_base(
     char const* trans,
     lapack_int const* ijob, lapack_int const* m, lapack_int const* n,
@@ -20490,7 +20757,7 @@ void LAPACK_stgsyl_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20499,7 +20766,7 @@ void LAPACK_stgsyl_base(
     #define LAPACK_stgsyl(...) LAPACK_stgsyl_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztgsyl_base LAPACK_GLOBAL(ztgsyl,ZTGSYL)
+#define LAPACK_ztgsyl_base LAPACK_GLOBAL_SUFFIX(ztgsyl,ZTGSYL)
 void LAPACK_ztgsyl_base(
     char const* trans,
     lapack_int const* ijob, lapack_int const* m, lapack_int const* n,
@@ -20515,7 +20782,7 @@ void LAPACK_ztgsyl_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20524,7 +20791,7 @@ void LAPACK_ztgsyl_base(
     #define LAPACK_ztgsyl(...) LAPACK_ztgsyl_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctpcon_base LAPACK_GLOBAL(ctpcon,CTPCON)
+#define LAPACK_ctpcon_base LAPACK_GLOBAL_SUFFIX(ctpcon,CTPCON)
 void LAPACK_ctpcon_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n,
@@ -20534,7 +20801,7 @@ void LAPACK_ctpcon_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20543,7 +20810,7 @@ void LAPACK_ctpcon_base(
     #define LAPACK_ctpcon(...) LAPACK_ctpcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtpcon_base LAPACK_GLOBAL(dtpcon,DTPCON)
+#define LAPACK_dtpcon_base LAPACK_GLOBAL_SUFFIX(dtpcon,DTPCON)
 void LAPACK_dtpcon_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n,
@@ -20553,7 +20820,7 @@ void LAPACK_dtpcon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20562,7 +20829,7 @@ void LAPACK_dtpcon_base(
     #define LAPACK_dtpcon(...) LAPACK_dtpcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stpcon_base LAPACK_GLOBAL(stpcon,STPCON)
+#define LAPACK_stpcon_base LAPACK_GLOBAL_SUFFIX(stpcon,STPCON)
 void LAPACK_stpcon_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n,
@@ -20572,7 +20839,7 @@ void LAPACK_stpcon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20581,7 +20848,7 @@ void LAPACK_stpcon_base(
     #define LAPACK_stpcon(...) LAPACK_stpcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztpcon_base LAPACK_GLOBAL(ztpcon,ZTPCON)
+#define LAPACK_ztpcon_base LAPACK_GLOBAL_SUFFIX(ztpcon,ZTPCON)
 void LAPACK_ztpcon_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n,
@@ -20591,7 +20858,7 @@ void LAPACK_ztpcon_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20600,7 +20867,7 @@ void LAPACK_ztpcon_base(
     #define LAPACK_ztpcon(...) LAPACK_ztpcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctplqt LAPACK_GLOBAL(ctplqt,CTPLQT)
+#define LAPACK_ctplqt LAPACK_GLOBAL_SUFFIX(ctplqt,CTPLQT)
 void LAPACK_ctplqt(
     lapack_int const* m, lapack_int const* n, lapack_int const* l, lapack_int const* mb,
     lapack_complex_float* A, lapack_int const* lda,
@@ -20609,7 +20876,7 @@ void LAPACK_ctplqt(
     lapack_complex_float* work,
     lapack_int* info );
 
-#define LAPACK_dtplqt LAPACK_GLOBAL(dtplqt,DTPLQT)
+#define LAPACK_dtplqt LAPACK_GLOBAL_SUFFIX(dtplqt,DTPLQT)
 void LAPACK_dtplqt(
     lapack_int const* m, lapack_int const* n, lapack_int const* l, lapack_int const* mb,
     double* A, lapack_int const* lda,
@@ -20618,7 +20885,7 @@ void LAPACK_dtplqt(
     double* work,
     lapack_int* info );
 
-#define LAPACK_stplqt LAPACK_GLOBAL(stplqt,STPLQT)
+#define LAPACK_stplqt LAPACK_GLOBAL_SUFFIX(stplqt,STPLQT)
 void LAPACK_stplqt(
     lapack_int const* m, lapack_int const* n, lapack_int const* l, lapack_int const* mb,
     float* A, lapack_int const* lda,
@@ -20627,7 +20894,7 @@ void LAPACK_stplqt(
     float* work,
     lapack_int* info );
 
-#define LAPACK_ztplqt LAPACK_GLOBAL(ztplqt,ZTPLQT)
+#define LAPACK_ztplqt LAPACK_GLOBAL_SUFFIX(ztplqt,ZTPLQT)
 void LAPACK_ztplqt(
     lapack_int const* m, lapack_int const* n, lapack_int const* l, lapack_int const* mb,
     lapack_complex_double* A, lapack_int const* lda,
@@ -20636,7 +20903,7 @@ void LAPACK_ztplqt(
     lapack_complex_double* work,
     lapack_int* info );
 
-#define LAPACK_ctplqt2 LAPACK_GLOBAL(ctplqt2,CTPLQT2)
+#define LAPACK_ctplqt2 LAPACK_GLOBAL_SUFFIX(ctplqt2,CTPLQT2)
 void LAPACK_ctplqt2(
     lapack_int const* m, lapack_int const* n, lapack_int const* l,
     lapack_complex_float* A, lapack_int const* lda,
@@ -20644,7 +20911,7 @@ void LAPACK_ctplqt2(
     lapack_complex_float* T, lapack_int const* ldt,
     lapack_int* info );
 
-#define LAPACK_dtplqt2 LAPACK_GLOBAL(dtplqt2,DTPLQT2)
+#define LAPACK_dtplqt2 LAPACK_GLOBAL_SUFFIX(dtplqt2,DTPLQT2)
 void LAPACK_dtplqt2(
     lapack_int const* m, lapack_int const* n, lapack_int const* l,
     double* A, lapack_int const* lda,
@@ -20652,7 +20919,7 @@ void LAPACK_dtplqt2(
     double* T, lapack_int const* ldt,
     lapack_int* info );
 
-#define LAPACK_stplqt2 LAPACK_GLOBAL(stplqt2,STPLQT2)
+#define LAPACK_stplqt2 LAPACK_GLOBAL_SUFFIX(stplqt2,STPLQT2)
 void LAPACK_stplqt2(
     lapack_int const* m, lapack_int const* n, lapack_int const* l,
     float* A, lapack_int const* lda,
@@ -20660,7 +20927,7 @@ void LAPACK_stplqt2(
     float* T, lapack_int const* ldt,
     lapack_int* info );
 
-#define LAPACK_ztplqt2 LAPACK_GLOBAL(ztplqt2,ZTPLQT2)
+#define LAPACK_ztplqt2 LAPACK_GLOBAL_SUFFIX(ztplqt2,ZTPLQT2)
 void LAPACK_ztplqt2(
     lapack_int const* m, lapack_int const* n, lapack_int const* l,
     lapack_complex_double* A, lapack_int const* lda,
@@ -20668,7 +20935,7 @@ void LAPACK_ztplqt2(
     lapack_complex_double* T, lapack_int const* ldt,
     lapack_int* info );
 
-#define LAPACK_ctpmlqt_base LAPACK_GLOBAL(ctpmlqt,CTPMLQT)
+#define LAPACK_ctpmlqt_base LAPACK_GLOBAL_SUFFIX(ctpmlqt,CTPMLQT)
 void LAPACK_ctpmlqt_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* l, lapack_int const* mb,
@@ -20679,7 +20946,7 @@ void LAPACK_ctpmlqt_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20688,7 +20955,7 @@ void LAPACK_ctpmlqt_base(
     #define LAPACK_ctpmlqt(...) LAPACK_ctpmlqt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtpmlqt_base LAPACK_GLOBAL(dtpmlqt,DTPMLQT)
+#define LAPACK_dtpmlqt_base LAPACK_GLOBAL_SUFFIX(dtpmlqt,DTPMLQT)
 void LAPACK_dtpmlqt_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* l, lapack_int const* mb,
@@ -20699,7 +20966,7 @@ void LAPACK_dtpmlqt_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20708,7 +20975,7 @@ void LAPACK_dtpmlqt_base(
     #define LAPACK_dtpmlqt(...) LAPACK_dtpmlqt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stpmlqt_base LAPACK_GLOBAL(stpmlqt,STPMLQT)
+#define LAPACK_stpmlqt_base LAPACK_GLOBAL_SUFFIX(stpmlqt,STPMLQT)
 void LAPACK_stpmlqt_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* l, lapack_int const* mb,
@@ -20719,7 +20986,7 @@ void LAPACK_stpmlqt_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20728,7 +20995,7 @@ void LAPACK_stpmlqt_base(
     #define LAPACK_stpmlqt(...) LAPACK_stpmlqt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztpmlqt_base LAPACK_GLOBAL(ztpmlqt,ZTPMLQT)
+#define LAPACK_ztpmlqt_base LAPACK_GLOBAL_SUFFIX(ztpmlqt,ZTPMLQT)
 void LAPACK_ztpmlqt_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* l, lapack_int const* mb,
@@ -20739,7 +21006,7 @@ void LAPACK_ztpmlqt_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20748,7 +21015,7 @@ void LAPACK_ztpmlqt_base(
     #define LAPACK_ztpmlqt(...) LAPACK_ztpmlqt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctpmqrt_base LAPACK_GLOBAL(ctpmqrt,CTPMQRT)
+#define LAPACK_ctpmqrt_base LAPACK_GLOBAL_SUFFIX(ctpmqrt,CTPMQRT)
 void LAPACK_ctpmqrt_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* l, lapack_int const* nb,
@@ -20759,7 +21026,7 @@ void LAPACK_ctpmqrt_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20768,7 +21035,7 @@ void LAPACK_ctpmqrt_base(
     #define LAPACK_ctpmqrt(...) LAPACK_ctpmqrt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtpmqrt_base LAPACK_GLOBAL(dtpmqrt,DTPMQRT)
+#define LAPACK_dtpmqrt_base LAPACK_GLOBAL_SUFFIX(dtpmqrt,DTPMQRT)
 void LAPACK_dtpmqrt_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* l, lapack_int const* nb,
@@ -20779,7 +21046,7 @@ void LAPACK_dtpmqrt_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20788,7 +21055,7 @@ void LAPACK_dtpmqrt_base(
     #define LAPACK_dtpmqrt(...) LAPACK_dtpmqrt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stpmqrt_base LAPACK_GLOBAL(stpmqrt,STPMQRT)
+#define LAPACK_stpmqrt_base LAPACK_GLOBAL_SUFFIX(stpmqrt,STPMQRT)
 void LAPACK_stpmqrt_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* l, lapack_int const* nb,
@@ -20799,7 +21066,7 @@ void LAPACK_stpmqrt_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20808,7 +21075,7 @@ void LAPACK_stpmqrt_base(
     #define LAPACK_stpmqrt(...) LAPACK_stpmqrt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztpmqrt_base LAPACK_GLOBAL(ztpmqrt,ZTPMQRT)
+#define LAPACK_ztpmqrt_base LAPACK_GLOBAL_SUFFIX(ztpmqrt,ZTPMQRT)
 void LAPACK_ztpmqrt_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* l, lapack_int const* nb,
@@ -20819,7 +21086,7 @@ void LAPACK_ztpmqrt_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20828,7 +21095,7 @@ void LAPACK_ztpmqrt_base(
     #define LAPACK_ztpmqrt(...) LAPACK_ztpmqrt_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctpqrt LAPACK_GLOBAL(ctpqrt,CTPQRT)
+#define LAPACK_ctpqrt LAPACK_GLOBAL_SUFFIX(ctpqrt,CTPQRT)
 void LAPACK_ctpqrt(
     lapack_int const* m, lapack_int const* n, lapack_int const* l, lapack_int const* nb,
     lapack_complex_float* A, lapack_int const* lda,
@@ -20837,7 +21104,7 @@ void LAPACK_ctpqrt(
     lapack_complex_float* work,
     lapack_int* info );
 
-#define LAPACK_dtpqrt LAPACK_GLOBAL(dtpqrt,DTPQRT)
+#define LAPACK_dtpqrt LAPACK_GLOBAL_SUFFIX(dtpqrt,DTPQRT)
 void LAPACK_dtpqrt(
     lapack_int const* m, lapack_int const* n, lapack_int const* l, lapack_int const* nb,
     double* A, lapack_int const* lda,
@@ -20846,7 +21113,7 @@ void LAPACK_dtpqrt(
     double* work,
     lapack_int* info );
 
-#define LAPACK_stpqrt LAPACK_GLOBAL(stpqrt,STPQRT)
+#define LAPACK_stpqrt LAPACK_GLOBAL_SUFFIX(stpqrt,STPQRT)
 void LAPACK_stpqrt(
     lapack_int const* m, lapack_int const* n, lapack_int const* l, lapack_int const* nb,
     float* A, lapack_int const* lda,
@@ -20855,7 +21122,7 @@ void LAPACK_stpqrt(
     float* work,
     lapack_int* info );
 
-#define LAPACK_ztpqrt LAPACK_GLOBAL(ztpqrt,ZTPQRT)
+#define LAPACK_ztpqrt LAPACK_GLOBAL_SUFFIX(ztpqrt,ZTPQRT)
 void LAPACK_ztpqrt(
     lapack_int const* m, lapack_int const* n, lapack_int const* l, lapack_int const* nb,
     lapack_complex_double* A, lapack_int const* lda,
@@ -20864,7 +21131,7 @@ void LAPACK_ztpqrt(
     lapack_complex_double* work,
     lapack_int* info );
 
-#define LAPACK_ctpqrt2 LAPACK_GLOBAL(ctpqrt2,CTPQRT2)
+#define LAPACK_ctpqrt2 LAPACK_GLOBAL_SUFFIX(ctpqrt2,CTPQRT2)
 void LAPACK_ctpqrt2(
     lapack_int const* m, lapack_int const* n, lapack_int const* l,
     lapack_complex_float* A, lapack_int const* lda,
@@ -20872,7 +21139,7 @@ void LAPACK_ctpqrt2(
     lapack_complex_float* T, lapack_int const* ldt,
     lapack_int* info );
 
-#define LAPACK_dtpqrt2 LAPACK_GLOBAL(dtpqrt2,DTPQRT2)
+#define LAPACK_dtpqrt2 LAPACK_GLOBAL_SUFFIX(dtpqrt2,DTPQRT2)
 void LAPACK_dtpqrt2(
     lapack_int const* m, lapack_int const* n, lapack_int const* l,
     double* A, lapack_int const* lda,
@@ -20880,7 +21147,7 @@ void LAPACK_dtpqrt2(
     double* T, lapack_int const* ldt,
     lapack_int* info );
 
-#define LAPACK_stpqrt2 LAPACK_GLOBAL(stpqrt2,STPQRT2)
+#define LAPACK_stpqrt2 LAPACK_GLOBAL_SUFFIX(stpqrt2,STPQRT2)
 void LAPACK_stpqrt2(
     lapack_int const* m, lapack_int const* n, lapack_int const* l,
     float* A, lapack_int const* lda,
@@ -20888,7 +21155,7 @@ void LAPACK_stpqrt2(
     float* T, lapack_int const* ldt,
     lapack_int* info );
 
-#define LAPACK_ztpqrt2 LAPACK_GLOBAL(ztpqrt2,ZTPQRT2)
+#define LAPACK_ztpqrt2 LAPACK_GLOBAL_SUFFIX(ztpqrt2,ZTPQRT2)
 void LAPACK_ztpqrt2(
     lapack_int const* m, lapack_int const* n, lapack_int const* l,
     lapack_complex_double* A, lapack_int const* lda,
@@ -20896,7 +21163,7 @@ void LAPACK_ztpqrt2(
     lapack_complex_double* T, lapack_int const* ldt,
     lapack_int* info );
 
-#define LAPACK_ctprfb_base LAPACK_GLOBAL(ctprfb,CTPRFB)
+#define LAPACK_ctprfb_base LAPACK_GLOBAL_SUFFIX(ctprfb,CTPRFB)
 void LAPACK_ctprfb_base(
     char const* side, char const* trans, char const* direct, char const* storev,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* l,
@@ -20906,7 +21173,7 @@ void LAPACK_ctprfb_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_complex_float* work, lapack_int const* ldwork
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20915,7 +21182,7 @@ void LAPACK_ctprfb_base(
     #define LAPACK_ctprfb(...) LAPACK_ctprfb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtprfb_base LAPACK_GLOBAL(dtprfb,DTPRFB)
+#define LAPACK_dtprfb_base LAPACK_GLOBAL_SUFFIX(dtprfb,DTPRFB)
 void LAPACK_dtprfb_base(
     char const* side, char const* trans, char const* direct, char const* storev,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* l,
@@ -20925,7 +21192,7 @@ void LAPACK_dtprfb_base(
     double* B, lapack_int const* ldb,
     double* work, lapack_int const* ldwork
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20934,7 +21201,7 @@ void LAPACK_dtprfb_base(
     #define LAPACK_dtprfb(...) LAPACK_dtprfb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stprfb_base LAPACK_GLOBAL(stprfb,STPRFB)
+#define LAPACK_stprfb_base LAPACK_GLOBAL_SUFFIX(stprfb,STPRFB)
 void LAPACK_stprfb_base(
     char const* side, char const* trans, char const* direct, char const* storev,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* l,
@@ -20944,7 +21211,7 @@ void LAPACK_stprfb_base(
     float* B, lapack_int const* ldb,
     float* work, lapack_int const* ldwork
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20953,7 +21220,7 @@ void LAPACK_stprfb_base(
     #define LAPACK_stprfb(...) LAPACK_stprfb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztprfb_base LAPACK_GLOBAL(ztprfb,ZTPRFB)
+#define LAPACK_ztprfb_base LAPACK_GLOBAL_SUFFIX(ztprfb,ZTPRFB)
 void LAPACK_ztprfb_base(
     char const* side, char const* trans, char const* direct, char const* storev,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* l,
@@ -20963,7 +21230,7 @@ void LAPACK_ztprfb_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_complex_double* work, lapack_int const* ldwork
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20972,7 +21239,7 @@ void LAPACK_ztprfb_base(
     #define LAPACK_ztprfb(...) LAPACK_ztprfb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctprfs_base LAPACK_GLOBAL(ctprfs,CTPRFS)
+#define LAPACK_ctprfs_base LAPACK_GLOBAL_SUFFIX(ctprfs,CTPRFS)
 void LAPACK_ctprfs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* nrhs,
@@ -20985,7 +21252,7 @@ void LAPACK_ctprfs_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -20994,7 +21261,7 @@ void LAPACK_ctprfs_base(
     #define LAPACK_ctprfs(...) LAPACK_ctprfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtprfs_base LAPACK_GLOBAL(dtprfs,DTPRFS)
+#define LAPACK_dtprfs_base LAPACK_GLOBAL_SUFFIX(dtprfs,DTPRFS)
 void LAPACK_dtprfs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* nrhs,
@@ -21007,7 +21274,7 @@ void LAPACK_dtprfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21016,7 +21283,7 @@ void LAPACK_dtprfs_base(
     #define LAPACK_dtprfs(...) LAPACK_dtprfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stprfs_base LAPACK_GLOBAL(stprfs,STPRFS)
+#define LAPACK_stprfs_base LAPACK_GLOBAL_SUFFIX(stprfs,STPRFS)
 void LAPACK_stprfs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* nrhs,
@@ -21029,7 +21296,7 @@ void LAPACK_stprfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21038,7 +21305,7 @@ void LAPACK_stprfs_base(
     #define LAPACK_stprfs(...) LAPACK_stprfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztprfs_base LAPACK_GLOBAL(ztprfs,ZTPRFS)
+#define LAPACK_ztprfs_base LAPACK_GLOBAL_SUFFIX(ztprfs,ZTPRFS)
 void LAPACK_ztprfs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* nrhs,
@@ -21051,7 +21318,7 @@ void LAPACK_ztprfs_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21060,14 +21327,14 @@ void LAPACK_ztprfs_base(
     #define LAPACK_ztprfs(...) LAPACK_ztprfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctptri_base LAPACK_GLOBAL(ctptri,CTPTRI)
+#define LAPACK_ctptri_base LAPACK_GLOBAL_SUFFIX(ctptri,CTPTRI)
 void LAPACK_ctptri_base(
     char const* uplo, char const* diag,
     lapack_int const* n,
     lapack_complex_float* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21076,14 +21343,14 @@ void LAPACK_ctptri_base(
     #define LAPACK_ctptri(...) LAPACK_ctptri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtptri_base LAPACK_GLOBAL(dtptri,DTPTRI)
+#define LAPACK_dtptri_base LAPACK_GLOBAL_SUFFIX(dtptri,DTPTRI)
 void LAPACK_dtptri_base(
     char const* uplo, char const* diag,
     lapack_int const* n,
     double* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21092,14 +21359,14 @@ void LAPACK_dtptri_base(
     #define LAPACK_dtptri(...) LAPACK_dtptri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stptri_base LAPACK_GLOBAL(stptri,STPTRI)
+#define LAPACK_stptri_base LAPACK_GLOBAL_SUFFIX(stptri,STPTRI)
 void LAPACK_stptri_base(
     char const* uplo, char const* diag,
     lapack_int const* n,
     float* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21108,14 +21375,14 @@ void LAPACK_stptri_base(
     #define LAPACK_stptri(...) LAPACK_stptri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztptri_base LAPACK_GLOBAL(ztptri,ZTPTRI)
+#define LAPACK_ztptri_base LAPACK_GLOBAL_SUFFIX(ztptri,ZTPTRI)
 void LAPACK_ztptri_base(
     char const* uplo, char const* diag,
     lapack_int const* n,
     lapack_complex_double* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21124,7 +21391,7 @@ void LAPACK_ztptri_base(
     #define LAPACK_ztptri(...) LAPACK_ztptri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctptrs_base LAPACK_GLOBAL(ctptrs,CTPTRS)
+#define LAPACK_ctptrs_base LAPACK_GLOBAL_SUFFIX(ctptrs,CTPTRS)
 void LAPACK_ctptrs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* nrhs,
@@ -21132,7 +21399,7 @@ void LAPACK_ctptrs_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21141,7 +21408,7 @@ void LAPACK_ctptrs_base(
     #define LAPACK_ctptrs(...) LAPACK_ctptrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtptrs_base LAPACK_GLOBAL(dtptrs,DTPTRS)
+#define LAPACK_dtptrs_base LAPACK_GLOBAL_SUFFIX(dtptrs,DTPTRS)
 void LAPACK_dtptrs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* nrhs,
@@ -21149,7 +21416,7 @@ void LAPACK_dtptrs_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21158,7 +21425,7 @@ void LAPACK_dtptrs_base(
     #define LAPACK_dtptrs(...) LAPACK_dtptrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stptrs_base LAPACK_GLOBAL(stptrs,STPTRS)
+#define LAPACK_stptrs_base LAPACK_GLOBAL_SUFFIX(stptrs,STPTRS)
 void LAPACK_stptrs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* nrhs,
@@ -21166,7 +21433,7 @@ void LAPACK_stptrs_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21175,7 +21442,7 @@ void LAPACK_stptrs_base(
     #define LAPACK_stptrs(...) LAPACK_stptrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztptrs_base LAPACK_GLOBAL(ztptrs,ZTPTRS)
+#define LAPACK_ztptrs_base LAPACK_GLOBAL_SUFFIX(ztptrs,ZTPTRS)
 void LAPACK_ztptrs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* nrhs,
@@ -21183,7 +21450,7 @@ void LAPACK_ztptrs_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21192,7 +21459,7 @@ void LAPACK_ztptrs_base(
     #define LAPACK_ztptrs(...) LAPACK_ztptrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctpttf_base LAPACK_GLOBAL(ctpttf,CTPTTF)
+#define LAPACK_ctpttf_base LAPACK_GLOBAL_SUFFIX(ctpttf,CTPTTF)
 void LAPACK_ctpttf_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
@@ -21200,7 +21467,7 @@ void LAPACK_ctpttf_base(
     lapack_complex_float* ARF,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21209,7 +21476,7 @@ void LAPACK_ctpttf_base(
     #define LAPACK_ctpttf(...) LAPACK_ctpttf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtpttf_base LAPACK_GLOBAL(dtpttf,DTPTTF)
+#define LAPACK_dtpttf_base LAPACK_GLOBAL_SUFFIX(dtpttf,DTPTTF)
 void LAPACK_dtpttf_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
@@ -21217,7 +21484,7 @@ void LAPACK_dtpttf_base(
     double* ARF,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21226,7 +21493,7 @@ void LAPACK_dtpttf_base(
     #define LAPACK_dtpttf(...) LAPACK_dtpttf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stpttf_base LAPACK_GLOBAL(stpttf,STPTTF)
+#define LAPACK_stpttf_base LAPACK_GLOBAL_SUFFIX(stpttf,STPTTF)
 void LAPACK_stpttf_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
@@ -21234,7 +21501,7 @@ void LAPACK_stpttf_base(
     float* ARF,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21243,7 +21510,7 @@ void LAPACK_stpttf_base(
     #define LAPACK_stpttf(...) LAPACK_stpttf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztpttf_base LAPACK_GLOBAL(ztpttf,ZTPTTF)
+#define LAPACK_ztpttf_base LAPACK_GLOBAL_SUFFIX(ztpttf,ZTPTTF)
 void LAPACK_ztpttf_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
@@ -21251,7 +21518,7 @@ void LAPACK_ztpttf_base(
     lapack_complex_double* ARF,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21260,7 +21527,7 @@ void LAPACK_ztpttf_base(
     #define LAPACK_ztpttf(...) LAPACK_ztpttf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctpttr_base LAPACK_GLOBAL(ctpttr,CTPTTR)
+#define LAPACK_ctpttr_base LAPACK_GLOBAL_SUFFIX(ctpttr,CTPTTR)
 void LAPACK_ctpttr_base(
     char const* uplo,
     lapack_int const* n,
@@ -21268,7 +21535,7 @@ void LAPACK_ctpttr_base(
     lapack_complex_float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21277,7 +21544,7 @@ void LAPACK_ctpttr_base(
     #define LAPACK_ctpttr(...) LAPACK_ctpttr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtpttr_base LAPACK_GLOBAL(dtpttr,DTPTTR)
+#define LAPACK_dtpttr_base LAPACK_GLOBAL_SUFFIX(dtpttr,DTPTTR)
 void LAPACK_dtpttr_base(
     char const* uplo,
     lapack_int const* n,
@@ -21285,7 +21552,7 @@ void LAPACK_dtpttr_base(
     double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21294,7 +21561,7 @@ void LAPACK_dtpttr_base(
     #define LAPACK_dtpttr(...) LAPACK_dtpttr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_stpttr_base LAPACK_GLOBAL(stpttr,STPTTR)
+#define LAPACK_stpttr_base LAPACK_GLOBAL_SUFFIX(stpttr,STPTTR)
 void LAPACK_stpttr_base(
     char const* uplo,
     lapack_int const* n,
@@ -21302,7 +21569,7 @@ void LAPACK_stpttr_base(
     float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21311,7 +21578,7 @@ void LAPACK_stpttr_base(
     #define LAPACK_stpttr(...) LAPACK_stpttr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztpttr_base LAPACK_GLOBAL(ztpttr,ZTPTTR)
+#define LAPACK_ztpttr_base LAPACK_GLOBAL_SUFFIX(ztpttr,ZTPTTR)
 void LAPACK_ztpttr_base(
     char const* uplo,
     lapack_int const* n,
@@ -21319,7 +21586,7 @@ void LAPACK_ztpttr_base(
     lapack_complex_double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21328,7 +21595,7 @@ void LAPACK_ztpttr_base(
     #define LAPACK_ztpttr(...) LAPACK_ztpttr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctrcon_base LAPACK_GLOBAL(ctrcon,CTRCON)
+#define LAPACK_ctrcon_base LAPACK_GLOBAL_SUFFIX(ctrcon,CTRCON)
 void LAPACK_ctrcon_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n,
@@ -21338,7 +21605,7 @@ void LAPACK_ctrcon_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21347,7 +21614,7 @@ void LAPACK_ctrcon_base(
     #define LAPACK_ctrcon(...) LAPACK_ctrcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtrcon_base LAPACK_GLOBAL(dtrcon,DTRCON)
+#define LAPACK_dtrcon_base LAPACK_GLOBAL_SUFFIX(dtrcon,DTRCON)
 void LAPACK_dtrcon_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n,
@@ -21357,7 +21624,7 @@ void LAPACK_dtrcon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21366,7 +21633,7 @@ void LAPACK_dtrcon_base(
     #define LAPACK_dtrcon(...) LAPACK_dtrcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_strcon_base LAPACK_GLOBAL(strcon,STRCON)
+#define LAPACK_strcon_base LAPACK_GLOBAL_SUFFIX(strcon,STRCON)
 void LAPACK_strcon_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n,
@@ -21376,7 +21643,7 @@ void LAPACK_strcon_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21385,7 +21652,7 @@ void LAPACK_strcon_base(
     #define LAPACK_strcon(...) LAPACK_strcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztrcon_base LAPACK_GLOBAL(ztrcon,ZTRCON)
+#define LAPACK_ztrcon_base LAPACK_GLOBAL_SUFFIX(ztrcon,ZTRCON)
 void LAPACK_ztrcon_base(
     char const* norm, char const* uplo, char const* diag,
     lapack_int const* n,
@@ -21395,7 +21662,7 @@ void LAPACK_ztrcon_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21404,7 +21671,7 @@ void LAPACK_ztrcon_base(
     #define LAPACK_ztrcon(...) LAPACK_ztrcon_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctrevc_base LAPACK_GLOBAL(ctrevc,CTREVC)
+#define LAPACK_ctrevc_base LAPACK_GLOBAL_SUFFIX(ctrevc,CTREVC)
 void LAPACK_ctrevc_base(
     char const* side, char const* howmny,
     lapack_logical const* select,
@@ -21416,7 +21683,7 @@ void LAPACK_ctrevc_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21425,7 +21692,7 @@ void LAPACK_ctrevc_base(
     #define LAPACK_ctrevc(...) LAPACK_ctrevc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtrevc_base LAPACK_GLOBAL(dtrevc,DTREVC)
+#define LAPACK_dtrevc_base LAPACK_GLOBAL_SUFFIX(dtrevc,DTREVC)
 void LAPACK_dtrevc_base(
     char const* side, char const* howmny,
     lapack_logical* select,
@@ -21436,7 +21703,7 @@ void LAPACK_dtrevc_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21445,7 +21712,7 @@ void LAPACK_dtrevc_base(
     #define LAPACK_dtrevc(...) LAPACK_dtrevc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_strevc_base LAPACK_GLOBAL(strevc,STREVC)
+#define LAPACK_strevc_base LAPACK_GLOBAL_SUFFIX(strevc,STREVC)
 void LAPACK_strevc_base(
     char const* side, char const* howmny,
     lapack_logical* select,
@@ -21456,7 +21723,7 @@ void LAPACK_strevc_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21465,7 +21732,7 @@ void LAPACK_strevc_base(
     #define LAPACK_strevc(...) LAPACK_strevc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztrevc_base LAPACK_GLOBAL(ztrevc,ZTREVC)
+#define LAPACK_ztrevc_base LAPACK_GLOBAL_SUFFIX(ztrevc,ZTREVC)
 void LAPACK_ztrevc_base(
     char const* side, char const* howmny,
     lapack_logical const* select,
@@ -21477,7 +21744,7 @@ void LAPACK_ztrevc_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21486,7 +21753,7 @@ void LAPACK_ztrevc_base(
     #define LAPACK_ztrevc(...) LAPACK_ztrevc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctrevc3_base LAPACK_GLOBAL(ctrevc3,CTREVC3)
+#define LAPACK_ctrevc3_base LAPACK_GLOBAL_SUFFIX(ctrevc3,CTREVC3)
 void LAPACK_ctrevc3_base(
     char const* side, char const* howmny,
     lapack_logical const* select,
@@ -21498,7 +21765,7 @@ void LAPACK_ctrevc3_base(
     float* rwork, lapack_int const* lrwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21507,7 +21774,7 @@ void LAPACK_ctrevc3_base(
     #define LAPACK_ctrevc3(...) LAPACK_ctrevc3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtrevc3_base LAPACK_GLOBAL(dtrevc3,DTREVC3)
+#define LAPACK_dtrevc3_base LAPACK_GLOBAL_SUFFIX(dtrevc3,DTREVC3)
 void LAPACK_dtrevc3_base(
     char const* side, char const* howmny,
     lapack_logical* select,
@@ -21518,7 +21785,7 @@ void LAPACK_dtrevc3_base(
     double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21527,7 +21794,7 @@ void LAPACK_dtrevc3_base(
     #define LAPACK_dtrevc3(...) LAPACK_dtrevc3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_strevc3_base LAPACK_GLOBAL(strevc3,STREVC3)
+#define LAPACK_strevc3_base LAPACK_GLOBAL_SUFFIX(strevc3,STREVC3)
 void LAPACK_strevc3_base(
     char const* side, char const* howmny,
     lapack_logical* select,
@@ -21538,7 +21805,7 @@ void LAPACK_strevc3_base(
     float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21547,7 +21814,7 @@ void LAPACK_strevc3_base(
     #define LAPACK_strevc3(...) LAPACK_strevc3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztrevc3_base LAPACK_GLOBAL(ztrevc3,ZTREVC3)
+#define LAPACK_ztrevc3_base LAPACK_GLOBAL_SUFFIX(ztrevc3,ZTREVC3)
 void LAPACK_ztrevc3_base(
     char const* side, char const* howmny,
     lapack_logical const* select,
@@ -21559,7 +21826,7 @@ void LAPACK_ztrevc3_base(
     double* rwork, lapack_int const* lrwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21568,7 +21835,7 @@ void LAPACK_ztrevc3_base(
     #define LAPACK_ztrevc3(...) LAPACK_ztrevc3_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctrexc_base LAPACK_GLOBAL(ctrexc,CTREXC)
+#define LAPACK_ctrexc_base LAPACK_GLOBAL_SUFFIX(ctrexc,CTREXC)
 void LAPACK_ctrexc_base(
     char const* compq,
     lapack_int const* n,
@@ -21576,7 +21843,7 @@ void LAPACK_ctrexc_base(
     lapack_complex_float* Q, lapack_int const* ldq, lapack_int const* ifst, lapack_int const* ilst,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21585,7 +21852,7 @@ void LAPACK_ctrexc_base(
     #define LAPACK_ctrexc(...) LAPACK_ctrexc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtrexc_base LAPACK_GLOBAL(dtrexc,DTREXC)
+#define LAPACK_dtrexc_base LAPACK_GLOBAL_SUFFIX(dtrexc,DTREXC)
 void LAPACK_dtrexc_base(
     char const* compq,
     lapack_int const* n,
@@ -21594,7 +21861,7 @@ void LAPACK_dtrexc_base(
     double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21603,7 +21870,7 @@ void LAPACK_dtrexc_base(
     #define LAPACK_dtrexc(...) LAPACK_dtrexc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_strexc_base LAPACK_GLOBAL(strexc,STREXC)
+#define LAPACK_strexc_base LAPACK_GLOBAL_SUFFIX(strexc,STREXC)
 void LAPACK_strexc_base(
     char const* compq,
     lapack_int const* n,
@@ -21612,7 +21879,7 @@ void LAPACK_strexc_base(
     float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21621,7 +21888,7 @@ void LAPACK_strexc_base(
     #define LAPACK_strexc(...) LAPACK_strexc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztrexc_base LAPACK_GLOBAL(ztrexc,ZTREXC)
+#define LAPACK_ztrexc_base LAPACK_GLOBAL_SUFFIX(ztrexc,ZTREXC)
 void LAPACK_ztrexc_base(
     char const* compq,
     lapack_int const* n,
@@ -21629,7 +21896,7 @@ void LAPACK_ztrexc_base(
     lapack_complex_double* Q, lapack_int const* ldq, lapack_int const* ifst, lapack_int const* ilst,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21638,7 +21905,7 @@ void LAPACK_ztrexc_base(
     #define LAPACK_ztrexc(...) LAPACK_ztrexc_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctrrfs_base LAPACK_GLOBAL(ctrrfs,CTRRFS)
+#define LAPACK_ctrrfs_base LAPACK_GLOBAL_SUFFIX(ctrrfs,CTRRFS)
 void LAPACK_ctrrfs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* nrhs,
@@ -21651,7 +21918,7 @@ void LAPACK_ctrrfs_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21660,7 +21927,7 @@ void LAPACK_ctrrfs_base(
     #define LAPACK_ctrrfs(...) LAPACK_ctrrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtrrfs_base LAPACK_GLOBAL(dtrrfs,DTRRFS)
+#define LAPACK_dtrrfs_base LAPACK_GLOBAL_SUFFIX(dtrrfs,DTRRFS)
 void LAPACK_dtrrfs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* nrhs,
@@ -21673,7 +21940,7 @@ void LAPACK_dtrrfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21682,7 +21949,7 @@ void LAPACK_dtrrfs_base(
     #define LAPACK_dtrrfs(...) LAPACK_dtrrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_strrfs_base LAPACK_GLOBAL(strrfs,STRRFS)
+#define LAPACK_strrfs_base LAPACK_GLOBAL_SUFFIX(strrfs,STRRFS)
 void LAPACK_strrfs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* nrhs,
@@ -21695,7 +21962,7 @@ void LAPACK_strrfs_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21704,7 +21971,7 @@ void LAPACK_strrfs_base(
     #define LAPACK_strrfs(...) LAPACK_strrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztrrfs_base LAPACK_GLOBAL(ztrrfs,ZTRRFS)
+#define LAPACK_ztrrfs_base LAPACK_GLOBAL_SUFFIX(ztrrfs,ZTRRFS)
 void LAPACK_ztrrfs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* nrhs,
@@ -21717,7 +21984,7 @@ void LAPACK_ztrrfs_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21726,7 +21993,7 @@ void LAPACK_ztrrfs_base(
     #define LAPACK_ztrrfs(...) LAPACK_ztrrfs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctrsen_base LAPACK_GLOBAL(ctrsen,CTRSEN)
+#define LAPACK_ctrsen_base LAPACK_GLOBAL_SUFFIX(ctrsen,CTRSEN)
 void LAPACK_ctrsen_base(
     char const* job, char const* compq,
     lapack_logical const* select,
@@ -21739,7 +22006,7 @@ void LAPACK_ctrsen_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21748,7 +22015,7 @@ void LAPACK_ctrsen_base(
     #define LAPACK_ctrsen(...) LAPACK_ctrsen_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtrsen_base LAPACK_GLOBAL(dtrsen,DTRSEN)
+#define LAPACK_dtrsen_base LAPACK_GLOBAL_SUFFIX(dtrsen,DTRSEN)
 void LAPACK_dtrsen_base(
     char const* job, char const* compq,
     lapack_logical const* select,
@@ -21763,7 +22030,7 @@ void LAPACK_dtrsen_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21772,7 +22039,7 @@ void LAPACK_dtrsen_base(
     #define LAPACK_dtrsen(...) LAPACK_dtrsen_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_strsen_base LAPACK_GLOBAL(strsen,STRSEN)
+#define LAPACK_strsen_base LAPACK_GLOBAL_SUFFIX(strsen,STRSEN)
 void LAPACK_strsen_base(
     char const* job, char const* compq,
     lapack_logical const* select,
@@ -21787,7 +22054,7 @@ void LAPACK_strsen_base(
     lapack_int* iwork, lapack_int const* liwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21796,7 +22063,7 @@ void LAPACK_strsen_base(
     #define LAPACK_strsen(...) LAPACK_strsen_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztrsen_base LAPACK_GLOBAL(ztrsen,ZTRSEN)
+#define LAPACK_ztrsen_base LAPACK_GLOBAL_SUFFIX(ztrsen,ZTRSEN)
 void LAPACK_ztrsen_base(
     char const* job, char const* compq,
     lapack_logical const* select,
@@ -21809,7 +22076,7 @@ void LAPACK_ztrsen_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21818,7 +22085,7 @@ void LAPACK_ztrsen_base(
     #define LAPACK_ztrsen(...) LAPACK_ztrsen_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctrsna_base LAPACK_GLOBAL(ctrsna,CTRSNA)
+#define LAPACK_ctrsna_base LAPACK_GLOBAL_SUFFIX(ctrsna,CTRSNA)
 void LAPACK_ctrsna_base(
     char const* job, char const* howmny,
     lapack_logical const* select,
@@ -21832,7 +22099,7 @@ void LAPACK_ctrsna_base(
     float* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21841,7 +22108,7 @@ void LAPACK_ctrsna_base(
     #define LAPACK_ctrsna(...) LAPACK_ctrsna_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtrsna_base LAPACK_GLOBAL(dtrsna,DTRSNA)
+#define LAPACK_dtrsna_base LAPACK_GLOBAL_SUFFIX(dtrsna,DTRSNA)
 void LAPACK_dtrsna_base(
     char const* job, char const* howmny,
     lapack_logical const* select,
@@ -21855,7 +22122,7 @@ void LAPACK_dtrsna_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21864,7 +22131,7 @@ void LAPACK_dtrsna_base(
     #define LAPACK_dtrsna(...) LAPACK_dtrsna_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_strsna_base LAPACK_GLOBAL(strsna,STRSNA)
+#define LAPACK_strsna_base LAPACK_GLOBAL_SUFFIX(strsna,STRSNA)
 void LAPACK_strsna_base(
     char const* job, char const* howmny,
     lapack_logical const* select,
@@ -21878,7 +22145,7 @@ void LAPACK_strsna_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21887,7 +22154,7 @@ void LAPACK_strsna_base(
     #define LAPACK_strsna(...) LAPACK_strsna_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztrsna_base LAPACK_GLOBAL(ztrsna,ZTRSNA)
+#define LAPACK_ztrsna_base LAPACK_GLOBAL_SUFFIX(ztrsna,ZTRSNA)
 void LAPACK_ztrsna_base(
     char const* job, char const* howmny,
     lapack_logical const* select,
@@ -21901,7 +22168,7 @@ void LAPACK_ztrsna_base(
     double* rwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21910,7 +22177,7 @@ void LAPACK_ztrsna_base(
     #define LAPACK_ztrsna(...) LAPACK_ztrsna_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctrsyl_base LAPACK_GLOBAL(ctrsyl,CTRSYL)
+#define LAPACK_ctrsyl_base LAPACK_GLOBAL_SUFFIX(ctrsyl,CTRSYL)
 void LAPACK_ctrsyl_base(
     char const* trana, char const* tranb,
     lapack_int const* isgn, lapack_int const* m, lapack_int const* n,
@@ -21920,7 +22187,7 @@ void LAPACK_ctrsyl_base(
     float* scale,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21929,7 +22196,7 @@ void LAPACK_ctrsyl_base(
     #define LAPACK_ctrsyl(...) LAPACK_ctrsyl_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtrsyl_base LAPACK_GLOBAL(dtrsyl,DTRSYL)
+#define LAPACK_dtrsyl_base LAPACK_GLOBAL_SUFFIX(dtrsyl,DTRSYL)
 void LAPACK_dtrsyl_base(
     char const* trana, char const* tranb,
     lapack_int const* isgn, lapack_int const* m, lapack_int const* n,
@@ -21939,7 +22206,7 @@ void LAPACK_dtrsyl_base(
     double* scale,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21948,7 +22215,7 @@ void LAPACK_dtrsyl_base(
     #define LAPACK_dtrsyl(...) LAPACK_dtrsyl_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_strsyl_base LAPACK_GLOBAL(strsyl,STRSYL)
+#define LAPACK_strsyl_base LAPACK_GLOBAL_SUFFIX(strsyl,STRSYL)
 void LAPACK_strsyl_base(
     char const* trana, char const* tranb,
     lapack_int const* isgn, lapack_int const* m, lapack_int const* n,
@@ -21958,7 +22225,7 @@ void LAPACK_strsyl_base(
     float* scale,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21967,7 +22234,7 @@ void LAPACK_strsyl_base(
     #define LAPACK_strsyl(...) LAPACK_strsyl_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztrsyl_base LAPACK_GLOBAL(ztrsyl,ZTRSYL)
+#define LAPACK_ztrsyl_base LAPACK_GLOBAL_SUFFIX(ztrsyl,ZTRSYL)
 void LAPACK_ztrsyl_base(
     char const* trana, char const* tranb,
     lapack_int const* isgn, lapack_int const* m, lapack_int const* n,
@@ -21977,7 +22244,7 @@ void LAPACK_ztrsyl_base(
     double* scale,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -21986,14 +22253,92 @@ void LAPACK_ztrsyl_base(
     #define LAPACK_ztrsyl(...) LAPACK_ztrsyl_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctrtri_base LAPACK_GLOBAL(ctrtri,CTRTRI)
+#define LAPACK_ctrsyl3_base LAPACK_GLOBAL_SUFFIX(ctrsyl3,CTRSYL3)
+void LAPACK_ctrsyl3_base(
+    char const* trana, char const* tranb,
+    lapack_int const* isgn, lapack_int const* m, lapack_int const* n,
+    lapack_complex_float const* A, lapack_int const* lda,
+    lapack_complex_float const* B, lapack_int const* ldb,
+    lapack_complex_float* C, lapack_int const* ldc, float* scale,
+    float* swork, lapack_int const *ldswork,
+    lapack_int* info
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    #define LAPACK_ctrsyl3(...) LAPACK_ctrsyl3_base(__VA_ARGS__, 1, 1)
+#else
+    #define LAPACK_ctrsyl3(...) LAPACK_ctrsyl3_base(__VA_ARGS__)
+#endif
+
+#define LAPACK_dtrsyl3_base LAPACK_GLOBAL_SUFFIX(dtrsyl3,DTRSYL3)
+void LAPACK_dtrsyl3_base(
+    char const* trana, char const* tranb,
+    lapack_int const* isgn, lapack_int const* m, lapack_int const* n,
+    double const* A, lapack_int const* lda,
+    double const* B, lapack_int const* ldb,
+    double* C, lapack_int const* ldc, double* scale,
+    lapack_int* iwork, lapack_int const* liwork,
+    double* swork, lapack_int const *ldswork,
+    lapack_int* info
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    #define LAPACK_dtrsyl3(...) LAPACK_dtrsyl3_base(__VA_ARGS__, 1, 1)
+#else
+    #define LAPACK_dtrsyl3(...) LAPACK_dtrsyl3_base(__VA_ARGS__)
+#endif
+
+#define LAPACK_strsyl3_base LAPACK_GLOBAL_SUFFIX(strsyl3,STRSYL3)
+void LAPACK_strsyl3_base(
+    char const* trana, char const* tranb,
+    lapack_int const* isgn, lapack_int const* m, lapack_int const* n,
+    float const* A, lapack_int const* lda,
+    float const* B, lapack_int const* ldb,
+    float* C, lapack_int const* ldc, float* scale,
+    lapack_int* iwork, lapack_int const* liwork,
+    float* swork, lapack_int const *ldswork,
+    lapack_int* info
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    #define LAPACK_strsyl3(...) LAPACK_strsyl3_base(__VA_ARGS__, 1, 1)
+#else
+    #define LAPACK_strsyl3(...) LAPACK_strsyl3_base(__VA_ARGS__)
+#endif
+
+#define LAPACK_ztrsyl3_base LAPACK_GLOBAL_SUFFIX(ztrsyl3,ZTRSYL3)
+void LAPACK_ztrsyl3_base(
+    char const* trana, char const* tranb,
+    lapack_int const* isgn, lapack_int const* m, lapack_int const* n,
+    lapack_complex_double const* A, lapack_int const* lda,
+    lapack_complex_double const* B, lapack_int const* ldb,
+    lapack_complex_double* C, lapack_int const* ldc, double* scale,
+    double* swork, lapack_int const *ldswork,
+    lapack_int* info
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
+#endif
+);
+#ifdef LAPACK_FORTRAN_STRLEN_END
+    #define LAPACK_ztrsyl3(...) LAPACK_ztrsyl3_base(__VA_ARGS__, 1, 1)
+#else
+    #define LAPACK_ztrsyl3(...) LAPACK_ztrsyl3_base(__VA_ARGS__)
+#endif
+
+#define LAPACK_ctrtri_base LAPACK_GLOBAL_SUFFIX(ctrtri,CTRTRI)
 void LAPACK_ctrtri_base(
     char const* uplo, char const* diag,
     lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22002,14 +22347,14 @@ void LAPACK_ctrtri_base(
     #define LAPACK_ctrtri(...) LAPACK_ctrtri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtrtri_base LAPACK_GLOBAL(dtrtri,DTRTRI)
+#define LAPACK_dtrtri_base LAPACK_GLOBAL_SUFFIX(dtrtri,DTRTRI)
 void LAPACK_dtrtri_base(
     char const* uplo, char const* diag,
     lapack_int const* n,
     double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22018,14 +22363,14 @@ void LAPACK_dtrtri_base(
     #define LAPACK_dtrtri(...) LAPACK_dtrtri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_strtri_base LAPACK_GLOBAL(strtri,STRTRI)
+#define LAPACK_strtri_base LAPACK_GLOBAL_SUFFIX(strtri,STRTRI)
 void LAPACK_strtri_base(
     char const* uplo, char const* diag,
     lapack_int const* n,
     float* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22034,14 +22379,14 @@ void LAPACK_strtri_base(
     #define LAPACK_strtri(...) LAPACK_strtri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztrtri_base LAPACK_GLOBAL(ztrtri,ZTRTRI)
+#define LAPACK_ztrtri_base LAPACK_GLOBAL_SUFFIX(ztrtri,ZTRTRI)
 void LAPACK_ztrtri_base(
     char const* uplo, char const* diag,
     lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22050,7 +22395,7 @@ void LAPACK_ztrtri_base(
     #define LAPACK_ztrtri(...) LAPACK_ztrtri_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctrtrs_base LAPACK_GLOBAL(ctrtrs,CTRTRS)
+#define LAPACK_ctrtrs_base LAPACK_GLOBAL_SUFFIX(ctrtrs,CTRTRS)
 void LAPACK_ctrtrs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* nrhs,
@@ -22058,7 +22403,7 @@ void LAPACK_ctrtrs_base(
     lapack_complex_float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22067,7 +22412,7 @@ void LAPACK_ctrtrs_base(
     #define LAPACK_ctrtrs(...) LAPACK_ctrtrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtrtrs_base LAPACK_GLOBAL(dtrtrs,DTRTRS)
+#define LAPACK_dtrtrs_base LAPACK_GLOBAL_SUFFIX(dtrtrs,DTRTRS)
 void LAPACK_dtrtrs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* nrhs,
@@ -22075,7 +22420,7 @@ void LAPACK_dtrtrs_base(
     double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22084,7 +22429,7 @@ void LAPACK_dtrtrs_base(
     #define LAPACK_dtrtrs(...) LAPACK_dtrtrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_strtrs_base LAPACK_GLOBAL(strtrs,STRTRS)
+#define LAPACK_strtrs_base LAPACK_GLOBAL_SUFFIX(strtrs,STRTRS)
 void LAPACK_strtrs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* nrhs,
@@ -22092,7 +22437,7 @@ void LAPACK_strtrs_base(
     float* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22101,7 +22446,7 @@ void LAPACK_strtrs_base(
     #define LAPACK_strtrs(...) LAPACK_strtrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztrtrs_base LAPACK_GLOBAL(ztrtrs,ZTRTRS)
+#define LAPACK_ztrtrs_base LAPACK_GLOBAL_SUFFIX(ztrtrs,ZTRTRS)
 void LAPACK_ztrtrs_base(
     char const* uplo, char const* trans, char const* diag,
     lapack_int const* n, lapack_int const* nrhs,
@@ -22109,7 +22454,7 @@ void LAPACK_ztrtrs_base(
     lapack_complex_double* B, lapack_int const* ldb,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22118,7 +22463,7 @@ void LAPACK_ztrtrs_base(
     #define LAPACK_ztrtrs(...) LAPACK_ztrtrs_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctrttf_base LAPACK_GLOBAL(ctrttf,CTRTTF)
+#define LAPACK_ctrttf_base LAPACK_GLOBAL_SUFFIX(ctrttf,CTRTTF)
 void LAPACK_ctrttf_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
@@ -22126,7 +22471,7 @@ void LAPACK_ctrttf_base(
     lapack_complex_float* ARF,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22135,7 +22480,7 @@ void LAPACK_ctrttf_base(
     #define LAPACK_ctrttf(...) LAPACK_ctrttf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtrttf_base LAPACK_GLOBAL(dtrttf,DTRTTF)
+#define LAPACK_dtrttf_base LAPACK_GLOBAL_SUFFIX(dtrttf,DTRTTF)
 void LAPACK_dtrttf_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
@@ -22143,7 +22488,7 @@ void LAPACK_dtrttf_base(
     double* ARF,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22152,7 +22497,7 @@ void LAPACK_dtrttf_base(
     #define LAPACK_dtrttf(...) LAPACK_dtrttf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_strttf_base LAPACK_GLOBAL(strttf,STRTTF)
+#define LAPACK_strttf_base LAPACK_GLOBAL_SUFFIX(strttf,STRTTF)
 void LAPACK_strttf_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
@@ -22160,7 +22505,7 @@ void LAPACK_strttf_base(
     float* ARF,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22169,7 +22514,7 @@ void LAPACK_strttf_base(
     #define LAPACK_strttf(...) LAPACK_strttf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztrttf_base LAPACK_GLOBAL(ztrttf,ZTRTTF)
+#define LAPACK_ztrttf_base LAPACK_GLOBAL_SUFFIX(ztrttf,ZTRTTF)
 void LAPACK_ztrttf_base(
     char const* transr, char const* uplo,
     lapack_int const* n,
@@ -22177,7 +22522,7 @@ void LAPACK_ztrttf_base(
     lapack_complex_double* ARF,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22186,7 +22531,7 @@ void LAPACK_ztrttf_base(
     #define LAPACK_ztrttf(...) LAPACK_ztrttf_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctrttp_base LAPACK_GLOBAL(ctrttp,CTRTTP)
+#define LAPACK_ctrttp_base LAPACK_GLOBAL_SUFFIX(ctrttp,CTRTTP)
 void LAPACK_ctrttp_base(
     char const* uplo,
     lapack_int const* n,
@@ -22194,7 +22539,7 @@ void LAPACK_ctrttp_base(
     lapack_complex_float* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22203,7 +22548,7 @@ void LAPACK_ctrttp_base(
     #define LAPACK_ctrttp(...) LAPACK_ctrttp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_dtrttp_base LAPACK_GLOBAL(dtrttp,DTRTTP)
+#define LAPACK_dtrttp_base LAPACK_GLOBAL_SUFFIX(dtrttp,DTRTTP)
 void LAPACK_dtrttp_base(
     char const* uplo,
     lapack_int const* n,
@@ -22211,7 +22556,7 @@ void LAPACK_dtrttp_base(
     double* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22220,7 +22565,7 @@ void LAPACK_dtrttp_base(
     #define LAPACK_dtrttp(...) LAPACK_dtrttp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_strttp_base LAPACK_GLOBAL(strttp,STRTTP)
+#define LAPACK_strttp_base LAPACK_GLOBAL_SUFFIX(strttp,STRTTP)
 void LAPACK_strttp_base(
     char const* uplo,
     lapack_int const* n,
@@ -22228,7 +22573,7 @@ void LAPACK_strttp_base(
     float* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22237,7 +22582,7 @@ void LAPACK_strttp_base(
     #define LAPACK_strttp(...) LAPACK_strttp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ztrttp_base LAPACK_GLOBAL(ztrttp,ZTRTTP)
+#define LAPACK_ztrttp_base LAPACK_GLOBAL_SUFFIX(ztrttp,ZTRTTP)
 void LAPACK_ztrttp_base(
     char const* uplo,
     lapack_int const* n,
@@ -22245,7 +22590,7 @@ void LAPACK_ztrttp_base(
     lapack_complex_double* AP,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22254,7 +22599,7 @@ void LAPACK_ztrttp_base(
     #define LAPACK_ztrttp(...) LAPACK_ztrttp_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_ctzrzf LAPACK_GLOBAL(ctzrzf,CTZRZF)
+#define LAPACK_ctzrzf LAPACK_GLOBAL_SUFFIX(ctzrzf,CTZRZF)
 void LAPACK_ctzrzf(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_float* A, lapack_int const* lda,
@@ -22262,7 +22607,7 @@ void LAPACK_ctzrzf(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_dtzrzf LAPACK_GLOBAL(dtzrzf,DTZRZF)
+#define LAPACK_dtzrzf LAPACK_GLOBAL_SUFFIX(dtzrzf,DTZRZF)
 void LAPACK_dtzrzf(
     lapack_int const* m, lapack_int const* n,
     double* A, lapack_int const* lda,
@@ -22270,7 +22615,7 @@ void LAPACK_dtzrzf(
     double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_stzrzf LAPACK_GLOBAL(stzrzf,STZRZF)
+#define LAPACK_stzrzf LAPACK_GLOBAL_SUFFIX(stzrzf,STZRZF)
 void LAPACK_stzrzf(
     lapack_int const* m, lapack_int const* n,
     float* A, lapack_int const* lda,
@@ -22278,7 +22623,7 @@ void LAPACK_stzrzf(
     float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_ztzrzf LAPACK_GLOBAL(ztzrzf,ZTZRZF)
+#define LAPACK_ztzrzf LAPACK_GLOBAL_SUFFIX(ztzrzf,ZTZRZF)
 void LAPACK_ztzrzf(
     lapack_int const* m, lapack_int const* n,
     lapack_complex_double* A, lapack_int const* lda,
@@ -22286,7 +22631,7 @@ void LAPACK_ztzrzf(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cunbdb_base LAPACK_GLOBAL(cunbdb,CUNBDB)
+#define LAPACK_cunbdb_base LAPACK_GLOBAL_SUFFIX(cunbdb,CUNBDB)
 void LAPACK_cunbdb_base(
     char const* trans, char const* signs,
     lapack_int const* m, lapack_int const* p, lapack_int const* q,
@@ -22303,7 +22648,7 @@ void LAPACK_cunbdb_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22312,7 +22657,7 @@ void LAPACK_cunbdb_base(
     #define LAPACK_cunbdb(...) LAPACK_cunbdb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zunbdb_base LAPACK_GLOBAL(zunbdb,ZUNBDB)
+#define LAPACK_zunbdb_base LAPACK_GLOBAL_SUFFIX(zunbdb,ZUNBDB)
 void LAPACK_zunbdb_base(
     char const* trans, char const* signs,
     lapack_int const* m, lapack_int const* p, lapack_int const* q,
@@ -22329,7 +22674,7 @@ void LAPACK_zunbdb_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22338,7 +22683,7 @@ void LAPACK_zunbdb_base(
     #define LAPACK_zunbdb(...) LAPACK_zunbdb_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cuncsd_base LAPACK_GLOBAL(cuncsd,CUNCSD)
+#define LAPACK_cuncsd_base LAPACK_GLOBAL_SUFFIX(cuncsd,CUNCSD)
 void LAPACK_cuncsd_base(
     char const* jobu1, char const* jobu2, char const* jobv1t, char const* jobv2t, char const* trans, char const* signs,
     lapack_int const* m, lapack_int const* p, lapack_int const* q,
@@ -22356,7 +22701,7 @@ void LAPACK_cuncsd_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22365,7 +22710,7 @@ void LAPACK_cuncsd_base(
     #define LAPACK_cuncsd(...) LAPACK_cuncsd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zuncsd_base LAPACK_GLOBAL(zuncsd,ZUNCSD)
+#define LAPACK_zuncsd_base LAPACK_GLOBAL_SUFFIX(zuncsd,ZUNCSD)
 void LAPACK_zuncsd_base(
     char const* jobu1, char const* jobu2, char const* jobv1t, char const* jobv2t, char const* trans, char const* signs,
     lapack_int const* m, lapack_int const* p, lapack_int const* q,
@@ -22383,7 +22728,7 @@ void LAPACK_zuncsd_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t, size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22392,7 +22737,7 @@ void LAPACK_zuncsd_base(
     #define LAPACK_zuncsd(...) LAPACK_zuncsd_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cuncsd2by1_base LAPACK_GLOBAL(cuncsd2by1,CUNCSD2BY1)
+#define LAPACK_cuncsd2by1_base LAPACK_GLOBAL_SUFFIX(cuncsd2by1,CUNCSD2BY1)
 void LAPACK_cuncsd2by1_base(
     char const* jobu1, char const* jobu2, char const* jobv1t,
     lapack_int const* m, lapack_int const* p, lapack_int const* q,
@@ -22407,7 +22752,7 @@ void LAPACK_cuncsd2by1_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22416,7 +22761,7 @@ void LAPACK_cuncsd2by1_base(
     #define LAPACK_cuncsd2by1(...) LAPACK_cuncsd2by1_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zuncsd2by1_base LAPACK_GLOBAL(zuncsd2by1,ZUNCSD2BY1)
+#define LAPACK_zuncsd2by1_base LAPACK_GLOBAL_SUFFIX(zuncsd2by1,ZUNCSD2BY1)
 void LAPACK_zuncsd2by1_base(
     char const* jobu1, char const* jobu2, char const* jobv1t,
     lapack_int const* m, lapack_int const* p, lapack_int const* q,
@@ -22431,7 +22776,7 @@ void LAPACK_zuncsd2by1_base(
     lapack_int* iwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22440,7 +22785,7 @@ void LAPACK_zuncsd2by1_base(
     #define LAPACK_zuncsd2by1(...) LAPACK_zuncsd2by1_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cungbr_base LAPACK_GLOBAL(cungbr,CUNGBR)
+#define LAPACK_cungbr_base LAPACK_GLOBAL_SUFFIX(cungbr,CUNGBR)
 void LAPACK_cungbr_base(
     char const* vect,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -22449,7 +22794,7 @@ void LAPACK_cungbr_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22458,7 +22803,7 @@ void LAPACK_cungbr_base(
     #define LAPACK_cungbr(...) LAPACK_cungbr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zungbr_base LAPACK_GLOBAL(zungbr,ZUNGBR)
+#define LAPACK_zungbr_base LAPACK_GLOBAL_SUFFIX(zungbr,ZUNGBR)
 void LAPACK_zungbr_base(
     char const* vect,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -22467,7 +22812,7 @@ void LAPACK_zungbr_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22476,7 +22821,7 @@ void LAPACK_zungbr_base(
     #define LAPACK_zungbr(...) LAPACK_zungbr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cunghr LAPACK_GLOBAL(cunghr,CUNGHR)
+#define LAPACK_cunghr LAPACK_GLOBAL_SUFFIX(cunghr,CUNGHR)
 void LAPACK_cunghr(
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
     lapack_complex_float* A, lapack_int const* lda,
@@ -22484,7 +22829,7 @@ void LAPACK_cunghr(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zunghr LAPACK_GLOBAL(zunghr,ZUNGHR)
+#define LAPACK_zunghr LAPACK_GLOBAL_SUFFIX(zunghr,ZUNGHR)
 void LAPACK_zunghr(
     lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
     lapack_complex_double* A, lapack_int const* lda,
@@ -22492,7 +22837,7 @@ void LAPACK_zunghr(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cunglq LAPACK_GLOBAL(cunglq,CUNGLQ)
+#define LAPACK_cunglq LAPACK_GLOBAL_SUFFIX(cunglq,CUNGLQ)
 void LAPACK_cunglq(
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
     lapack_complex_float* A, lapack_int const* lda,
@@ -22500,7 +22845,7 @@ void LAPACK_cunglq(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zunglq LAPACK_GLOBAL(zunglq,ZUNGLQ)
+#define LAPACK_zunglq LAPACK_GLOBAL_SUFFIX(zunglq,ZUNGLQ)
 void LAPACK_zunglq(
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
     lapack_complex_double* A, lapack_int const* lda,
@@ -22508,7 +22853,7 @@ void LAPACK_zunglq(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cungql LAPACK_GLOBAL(cungql,CUNGQL)
+#define LAPACK_cungql LAPACK_GLOBAL_SUFFIX(cungql,CUNGQL)
 void LAPACK_cungql(
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
     lapack_complex_float* A, lapack_int const* lda,
@@ -22516,7 +22861,7 @@ void LAPACK_cungql(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zungql LAPACK_GLOBAL(zungql,ZUNGQL)
+#define LAPACK_zungql LAPACK_GLOBAL_SUFFIX(zungql,ZUNGQL)
 void LAPACK_zungql(
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
     lapack_complex_double* A, lapack_int const* lda,
@@ -22524,7 +22869,7 @@ void LAPACK_zungql(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cungqr LAPACK_GLOBAL(cungqr,CUNGQR)
+#define LAPACK_cungqr LAPACK_GLOBAL_SUFFIX(cungqr,CUNGQR)
 void LAPACK_cungqr(
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
     lapack_complex_float* A, lapack_int const* lda,
@@ -22532,7 +22877,7 @@ void LAPACK_cungqr(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zungqr LAPACK_GLOBAL(zungqr,ZUNGQR)
+#define LAPACK_zungqr LAPACK_GLOBAL_SUFFIX(zungqr,ZUNGQR)
 void LAPACK_zungqr(
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
     lapack_complex_double* A, lapack_int const* lda,
@@ -22540,7 +22885,7 @@ void LAPACK_zungqr(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cungrq LAPACK_GLOBAL(cungrq,CUNGRQ)
+#define LAPACK_cungrq LAPACK_GLOBAL_SUFFIX(cungrq,CUNGRQ)
 void LAPACK_cungrq(
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
     lapack_complex_float* A, lapack_int const* lda,
@@ -22548,7 +22893,7 @@ void LAPACK_cungrq(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zungrq LAPACK_GLOBAL(zungrq,ZUNGRQ)
+#define LAPACK_zungrq LAPACK_GLOBAL_SUFFIX(zungrq,ZUNGRQ)
 void LAPACK_zungrq(
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
     lapack_complex_double* A, lapack_int const* lda,
@@ -22556,7 +22901,7 @@ void LAPACK_zungrq(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cungtr_base LAPACK_GLOBAL(cungtr,CUNGTR)
+#define LAPACK_cungtr_base LAPACK_GLOBAL_SUFFIX(cungtr,CUNGTR)
 void LAPACK_cungtr_base(
     char const* uplo,
     lapack_int const* n,
@@ -22565,7 +22910,7 @@ void LAPACK_cungtr_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22574,7 +22919,7 @@ void LAPACK_cungtr_base(
     #define LAPACK_cungtr(...) LAPACK_cungtr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zungtr_base LAPACK_GLOBAL(zungtr,ZUNGTR)
+#define LAPACK_zungtr_base LAPACK_GLOBAL_SUFFIX(zungtr,ZUNGTR)
 void LAPACK_zungtr_base(
     char const* uplo,
     lapack_int const* n,
@@ -22583,7 +22928,7 @@ void LAPACK_zungtr_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22592,7 +22937,7 @@ void LAPACK_zungtr_base(
     #define LAPACK_zungtr(...) LAPACK_zungtr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cungtsqr_row LAPACK_GLOBAL(cungtsqr_row,CUNGTSQR_ROW)
+#define LAPACK_cungtsqr_row LAPACK_GLOBAL_SUFFIX(cungtsqr_row,CUNGTSQR_ROW)
 void LAPACK_cungtsqr_row(
     lapack_int const* m, lapack_int const* n,
     lapack_int const* mb, lapack_int const* nb,
@@ -22601,7 +22946,7 @@ void LAPACK_cungtsqr_row(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_zungtsqr_row LAPACK_GLOBAL(zungtsqr_row,ZUNGTSQR_ROW)
+#define LAPACK_zungtsqr_row LAPACK_GLOBAL_SUFFIX(zungtsqr_row,ZUNGTSQR_ROW)
 void LAPACK_zungtsqr_row(
     lapack_int const* m, lapack_int const* n,
     lapack_int const* mb, lapack_int const* nb,
@@ -22610,7 +22955,23 @@ void LAPACK_zungtsqr_row(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info );
 
-#define LAPACK_cunmbr_base LAPACK_GLOBAL(cunmbr,CUNMBR)
+#define LAPACK_cunhr_col LAPACK_GLOBAL_SUFFIX(cunhr_col,CUNHR_COL)
+void LAPACK_cunhr_col(
+    lapack_int const* m, lapack_int const* n,
+    lapack_int const* nb, lapack_complex_float* A,
+    lapack_int const* lda, lapack_complex_float* T,
+    lapack_int const* ldt, lapack_complex_float* D,
+    lapack_int* info );
+
+#define LAPACK_zunhr_col LAPACK_GLOBAL_SUFFIX(zunhr_col,ZUNHR_COL)
+void LAPACK_zunhr_col(
+    lapack_int const* m, lapack_int const* n,
+    lapack_int const* nb, lapack_complex_double* A,
+    lapack_int const* lda, lapack_complex_double* T,
+    lapack_int const* ldt, lapack_complex_double* D,
+    lapack_int* info );
+
+#define LAPACK_cunmbr_base LAPACK_GLOBAL_SUFFIX(cunmbr,CUNMBR)
 void LAPACK_cunmbr_base(
     char const* vect, char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -22620,7 +22981,7 @@ void LAPACK_cunmbr_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22629,7 +22990,7 @@ void LAPACK_cunmbr_base(
     #define LAPACK_cunmbr(...) LAPACK_cunmbr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zunmbr_base LAPACK_GLOBAL(zunmbr,ZUNMBR)
+#define LAPACK_zunmbr_base LAPACK_GLOBAL_SUFFIX(zunmbr,ZUNMBR)
 void LAPACK_zunmbr_base(
     char const* vect, char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -22639,7 +23000,7 @@ void LAPACK_zunmbr_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22648,7 +23009,7 @@ void LAPACK_zunmbr_base(
     #define LAPACK_zunmbr(...) LAPACK_zunmbr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cunmhr_base LAPACK_GLOBAL(cunmhr,CUNMHR)
+#define LAPACK_cunmhr_base LAPACK_GLOBAL_SUFFIX(cunmhr,CUNMHR)
 void LAPACK_cunmhr_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -22658,7 +23019,7 @@ void LAPACK_cunmhr_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22667,7 +23028,7 @@ void LAPACK_cunmhr_base(
     #define LAPACK_cunmhr(...) LAPACK_cunmhr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zunmhr_base LAPACK_GLOBAL(zunmhr,ZUNMHR)
+#define LAPACK_zunmhr_base LAPACK_GLOBAL_SUFFIX(zunmhr,ZUNMHR)
 void LAPACK_zunmhr_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* ilo, lapack_int const* ihi,
@@ -22677,7 +23038,7 @@ void LAPACK_zunmhr_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22686,7 +23047,7 @@ void LAPACK_zunmhr_base(
     #define LAPACK_zunmhr(...) LAPACK_zunmhr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cunmlq_base LAPACK_GLOBAL(cunmlq,CUNMLQ)
+#define LAPACK_cunmlq_base LAPACK_GLOBAL_SUFFIX(cunmlq,CUNMLQ)
 void LAPACK_cunmlq_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -22696,7 +23057,7 @@ void LAPACK_cunmlq_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22705,7 +23066,7 @@ void LAPACK_cunmlq_base(
     #define LAPACK_cunmlq(...) LAPACK_cunmlq_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zunmlq_base LAPACK_GLOBAL(zunmlq,ZUNMLQ)
+#define LAPACK_zunmlq_base LAPACK_GLOBAL_SUFFIX(zunmlq,ZUNMLQ)
 void LAPACK_zunmlq_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -22715,7 +23076,7 @@ void LAPACK_zunmlq_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22724,7 +23085,7 @@ void LAPACK_zunmlq_base(
     #define LAPACK_zunmlq(...) LAPACK_zunmlq_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cunmql_base LAPACK_GLOBAL(cunmql,CUNMQL)
+#define LAPACK_cunmql_base LAPACK_GLOBAL_SUFFIX(cunmql,CUNMQL)
 void LAPACK_cunmql_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -22734,7 +23095,7 @@ void LAPACK_cunmql_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22743,7 +23104,7 @@ void LAPACK_cunmql_base(
     #define LAPACK_cunmql(...) LAPACK_cunmql_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zunmql_base LAPACK_GLOBAL(zunmql,ZUNMQL)
+#define LAPACK_zunmql_base LAPACK_GLOBAL_SUFFIX(zunmql,ZUNMQL)
 void LAPACK_zunmql_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -22753,7 +23114,7 @@ void LAPACK_zunmql_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22762,7 +23123,7 @@ void LAPACK_zunmql_base(
     #define LAPACK_zunmql(...) LAPACK_zunmql_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cunmqr_base LAPACK_GLOBAL(cunmqr,CUNMQR)
+#define LAPACK_cunmqr_base LAPACK_GLOBAL_SUFFIX(cunmqr,CUNMQR)
 void LAPACK_cunmqr_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -22772,7 +23133,7 @@ void LAPACK_cunmqr_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22781,7 +23142,7 @@ void LAPACK_cunmqr_base(
     #define LAPACK_cunmqr(...) LAPACK_cunmqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zunmqr_base LAPACK_GLOBAL(zunmqr,ZUNMQR)
+#define LAPACK_zunmqr_base LAPACK_GLOBAL_SUFFIX(zunmqr,ZUNMQR)
 void LAPACK_zunmqr_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -22791,7 +23152,7 @@ void LAPACK_zunmqr_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22800,7 +23161,7 @@ void LAPACK_zunmqr_base(
     #define LAPACK_zunmqr(...) LAPACK_zunmqr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cunmrq_base LAPACK_GLOBAL(cunmrq,CUNMRQ)
+#define LAPACK_cunmrq_base LAPACK_GLOBAL_SUFFIX(cunmrq,CUNMRQ)
 void LAPACK_cunmrq_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -22810,7 +23171,7 @@ void LAPACK_cunmrq_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22819,7 +23180,7 @@ void LAPACK_cunmrq_base(
     #define LAPACK_cunmrq(...) LAPACK_cunmrq_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zunmrq_base LAPACK_GLOBAL(zunmrq,ZUNMRQ)
+#define LAPACK_zunmrq_base LAPACK_GLOBAL_SUFFIX(zunmrq,ZUNMRQ)
 void LAPACK_zunmrq_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k,
@@ -22829,7 +23190,7 @@ void LAPACK_zunmrq_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22838,7 +23199,7 @@ void LAPACK_zunmrq_base(
     #define LAPACK_zunmrq(...) LAPACK_zunmrq_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cunmrz_base LAPACK_GLOBAL(cunmrz,CUNMRZ)
+#define LAPACK_cunmrz_base LAPACK_GLOBAL_SUFFIX(cunmrz,CUNMRZ)
 void LAPACK_cunmrz_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* l,
@@ -22848,7 +23209,7 @@ void LAPACK_cunmrz_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22857,7 +23218,7 @@ void LAPACK_cunmrz_base(
     #define LAPACK_cunmrz(...) LAPACK_cunmrz_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zunmrz_base LAPACK_GLOBAL(zunmrz,ZUNMRZ)
+#define LAPACK_zunmrz_base LAPACK_GLOBAL_SUFFIX(zunmrz,ZUNMRZ)
 void LAPACK_zunmrz_base(
     char const* side, char const* trans,
     lapack_int const* m, lapack_int const* n, lapack_int const* k, lapack_int const* l,
@@ -22867,7 +23228,7 @@ void LAPACK_zunmrz_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22876,7 +23237,7 @@ void LAPACK_zunmrz_base(
     #define LAPACK_zunmrz(...) LAPACK_zunmrz_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cunmtr_base LAPACK_GLOBAL(cunmtr,CUNMTR)
+#define LAPACK_cunmtr_base LAPACK_GLOBAL_SUFFIX(cunmtr,CUNMTR)
 void LAPACK_cunmtr_base(
     char const* side, char const* uplo, char const* trans,
     lapack_int const* m, lapack_int const* n,
@@ -22886,7 +23247,7 @@ void LAPACK_cunmtr_base(
     lapack_complex_float* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22895,7 +23256,7 @@ void LAPACK_cunmtr_base(
     #define LAPACK_cunmtr(...) LAPACK_cunmtr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zunmtr_base LAPACK_GLOBAL(zunmtr,ZUNMTR)
+#define LAPACK_zunmtr_base LAPACK_GLOBAL_SUFFIX(zunmtr,ZUNMTR)
 void LAPACK_zunmtr_base(
     char const* side, char const* uplo, char const* trans,
     lapack_int const* m, lapack_int const* n,
@@ -22905,7 +23266,7 @@ void LAPACK_zunmtr_base(
     lapack_complex_double* work, lapack_int const* lwork,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22914,7 +23275,7 @@ void LAPACK_zunmtr_base(
     #define LAPACK_zunmtr(...) LAPACK_zunmtr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cupgtr_base LAPACK_GLOBAL(cupgtr,CUPGTR)
+#define LAPACK_cupgtr_base LAPACK_GLOBAL_SUFFIX(cupgtr,CUPGTR)
 void LAPACK_cupgtr_base(
     char const* uplo,
     lapack_int const* n,
@@ -22924,7 +23285,7 @@ void LAPACK_cupgtr_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22933,7 +23294,7 @@ void LAPACK_cupgtr_base(
     #define LAPACK_cupgtr(...) LAPACK_cupgtr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zupgtr_base LAPACK_GLOBAL(zupgtr,ZUPGTR)
+#define LAPACK_zupgtr_base LAPACK_GLOBAL_SUFFIX(zupgtr,ZUPGTR)
 void LAPACK_zupgtr_base(
     char const* uplo,
     lapack_int const* n,
@@ -22943,7 +23304,7 @@ void LAPACK_zupgtr_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t
+    , FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22952,7 +23313,7 @@ void LAPACK_zupgtr_base(
     #define LAPACK_zupgtr(...) LAPACK_zupgtr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_cupmtr_base LAPACK_GLOBAL(cupmtr,CUPMTR)
+#define LAPACK_cupmtr_base LAPACK_GLOBAL_SUFFIX(cupmtr,CUPMTR)
 void LAPACK_cupmtr_base(
     char const* side, char const* uplo, char const* trans,
     lapack_int const* m, lapack_int const* n,
@@ -22962,7 +23323,7 @@ void LAPACK_cupmtr_base(
     lapack_complex_float* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
@@ -22971,7 +23332,7 @@ void LAPACK_cupmtr_base(
     #define LAPACK_cupmtr(...) LAPACK_cupmtr_base(__VA_ARGS__)
 #endif
 
-#define LAPACK_zupmtr_base LAPACK_GLOBAL(zupmtr,ZUPMTR)
+#define LAPACK_zupmtr_base LAPACK_GLOBAL_SUFFIX(zupmtr,ZUPMTR)
 void LAPACK_zupmtr_base(
     char const* side, char const* uplo, char const* trans,
     lapack_int const* m, lapack_int const* n,
@@ -22981,7 +23342,7 @@ void LAPACK_zupmtr_base(
     lapack_complex_double* work,
     lapack_int* info
 #ifdef LAPACK_FORTRAN_STRLEN_END
-    , size_t, size_t, size_t
+    , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 #ifdef LAPACK_FORTRAN_STRLEN_END
diff --git a/LAPACKE/include/lapacke.h b/LAPACKE/include/lapacke.h
index f6fbfcc33b..687c243534 100644
--- a/LAPACKE/include/lapacke.h
+++ b/LAPACKE/include/lapacke.h
@@ -58,6 +58,21 @@ extern "C" {
 lapack_complex_float lapack_make_complex_float( float re, float im );
 lapack_complex_double lapack_make_complex_double( double re, double im );
 
+/*
+ * Integer specific API
+ */
+#ifdef LAPACKE_API64
+#ifndef API_SUFFIX
+#define API_SUFFIX(a) a##_64
+#endif
+#include "lapacke_64.h"
+#else
+#ifndef API_SUFFIX
+#define API_SUFFIX(a) a
+#endif
+#endif
+
+
 /* C-LAPACK function prototypes */
 
 lapack_int LAPACKE_sbdsdc( int matrix_layout, char uplo, char compq,
@@ -91,13 +106,13 @@ lapack_int LAPACKE_zbdsqr( int matrix_layout, char uplo, lapack_int n,
                            lapack_int ldu, lapack_complex_double* c,
                            lapack_int ldc );
 lapack_int LAPACKE_sbdsvdx( int matrix_layout, char uplo, char jobz, char range,
-                           lapack_int n, float* d, float* e,
+                           lapack_int n, const float* d, const float* e,
                            float vl, float vu,
                            lapack_int il, lapack_int iu, lapack_int* ns,
                            float* s, float* z, lapack_int ldz,
                            lapack_int* superb );
 lapack_int LAPACKE_dbdsvdx( int matrix_layout, char uplo, char jobz, char range,
-                           lapack_int n, double* d, double* e,
+                           lapack_int n, const double* d, const double* e,
                            double vl, double vu,
                            lapack_int il, lapack_int iu, lapack_int* ns,
                            double* s, double* z, lapack_int ldz,
@@ -882,11 +897,11 @@ lapack_int LAPACKE_zgesv( int matrix_layout, lapack_int n, lapack_int nrhs,
                           lapack_int ldb );
 lapack_int LAPACKE_dsgesv( int matrix_layout, lapack_int n, lapack_int nrhs,
                            double* a, lapack_int lda, lapack_int* ipiv,
-                           double* b, lapack_int ldb, double* x, lapack_int ldx,
+                           const double* b, lapack_int ldb, double* x, lapack_int ldx,
                            lapack_int* iter );
 lapack_int LAPACKE_zcgesv( int matrix_layout, lapack_int n, lapack_int nrhs,
                            lapack_complex_double* a, lapack_int lda,
-                           lapack_int* ipiv, lapack_complex_double* b,
+                           lapack_int* ipiv, const lapack_complex_double* b,
                            lapack_int ldb, lapack_complex_double* x,
                            lapack_int ldx, lapack_int* iter );
 
@@ -956,7 +971,7 @@ lapack_int LAPACKE_zgesvdq( int matrix_layout, char joba, char jobp, char jobr,
                            lapack_int lda, double* s, lapack_complex_double* u,
                            lapack_int ldu, lapack_complex_double* v,
                            lapack_int ldv, lapack_int* numrank );
-                           
+
 lapack_int LAPACKE_sgesvj( int matrix_layout, char joba, char jobu, char jobv,
                            lapack_int m, lapack_int n, float* a, lapack_int lda,
                            float* sva, lapack_int mv, float* v, lapack_int ldv,
@@ -2313,6 +2328,19 @@ lapack_int LAPACKE_zlagge( int matrix_layout, lapack_int m, lapack_int n,
 float LAPACKE_slamch( char cmach );
 double LAPACKE_dlamch( char cmach );
 
+float LAPACKE_slangb( int matrix_layout, char norm, lapack_int n,
+                      lapack_int kl, lapack_int ku, const float* ab,
+                      lapack_int ldab );
+double LAPACKE_dlangb( int matrix_layout, char norm, lapack_int n,
+                       lapack_int kl, lapack_int ku, const double* ab,
+                       lapack_int ldab );
+float LAPACKE_clangb( int matrix_layout, char norm, lapack_int n,
+                      lapack_int kl, lapack_int ku,
+                      const lapack_complex_float* ab, lapack_int ldab );
+double LAPACKE_zlangb( int matrix_layout, char norm, lapack_int n,
+                       lapack_int kl, lapack_int ku,
+                       const lapack_complex_double* ab, lapack_int ldab );
+
 float LAPACKE_slange( int matrix_layout, char norm, lapack_int m,
                            lapack_int n, const float* a, lapack_int lda );
 double LAPACKE_dlange( int matrix_layout, char norm, lapack_int m,
@@ -2486,10 +2514,10 @@ lapack_int LAPACKE_zlaset( int matrix_layout, char uplo, lapack_int m,
 lapack_int LAPACKE_slasrt( char id, lapack_int n, float* d );
 lapack_int LAPACKE_dlasrt( char id, lapack_int n, double* d );
 
-lapack_int LAPACKE_slassq( lapack_int n,                 float* x, lapack_int incx,  float* scale,  float* sumsq );
-lapack_int LAPACKE_dlassq( lapack_int n,                double* x, lapack_int incx, double* scale, double* sumsq );
-lapack_int LAPACKE_classq( lapack_int n,  lapack_complex_float* x, lapack_int incx,  float* scale,  float* sumsq );
-lapack_int LAPACKE_zlassq( lapack_int n, lapack_complex_double* x, lapack_int incx, double* scale, double* sumsq );
+lapack_int LAPACKE_slassq( lapack_int n,                 const float* x, lapack_int incx,  float* scale,  float* sumsq );
+lapack_int LAPACKE_dlassq( lapack_int n,                const double* x, lapack_int incx, double* scale, double* sumsq );
+lapack_int LAPACKE_classq( lapack_int n,  const lapack_complex_float* x, lapack_int incx,  float* scale,  float* sumsq );
+lapack_int LAPACKE_zlassq( lapack_int n, const lapack_complex_double* x, lapack_int incx, double* scale, double* sumsq );
 
 lapack_int LAPACKE_slaswp( int matrix_layout, lapack_int n, float* a,
                            lapack_int lda, lapack_int k1, lapack_int k2,
@@ -2960,11 +2988,11 @@ lapack_int LAPACKE_zposv( int matrix_layout, char uplo, lapack_int n,
                           lapack_int ldb );
 lapack_int LAPACKE_dsposv( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, double* a, lapack_int lda,
-                           double* b, lapack_int ldb, double* x, lapack_int ldx,
+                           const double* b, lapack_int ldb, double* x, lapack_int ldx,
                            lapack_int* iter );
 lapack_int LAPACKE_zcposv( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, lapack_complex_double* a,
-                           lapack_int lda, lapack_complex_double* b,
+                           lapack_int lda, const lapack_complex_double* b,
                            lapack_int ldb, lapack_complex_double* x,
                            lapack_int ldx, lapack_int* iter );
 
@@ -4477,6 +4505,23 @@ lapack_int LAPACKE_ztrsyl( int matrix_layout, char trana, char tranb,
                            lapack_complex_double* c, lapack_int ldc,
                            double* scale );
 
+lapack_int LAPACKE_strsyl3( int matrix_layout, char trana, char tranb,
+                            lapack_int isgn, lapack_int m, lapack_int n,
+                            const float* a, lapack_int lda, const float* b,
+                            lapack_int ldb, float* c, lapack_int ldc,
+                            float* scale );
+lapack_int LAPACKE_dtrsyl3( int matrix_layout, char trana, char tranb,
+                            lapack_int isgn, lapack_int m, lapack_int n,
+                            const double* a, lapack_int lda, const double* b,
+                            lapack_int ldb, double* c, lapack_int ldc,
+                            double* scale );
+lapack_int LAPACKE_ztrsyl3( int matrix_layout, char trana, char tranb,
+                            lapack_int isgn, lapack_int m, lapack_int n,
+                            const lapack_complex_double* a, lapack_int lda,
+                            const lapack_complex_double* b, lapack_int ldb,
+                            lapack_complex_double* c, lapack_int ldc,
+                            double* scale );
+
 lapack_int LAPACKE_strtri( int matrix_layout, char uplo, char diag, lapack_int n,
                            float* a, lapack_int lda );
 lapack_int LAPACKE_dtrtri( int matrix_layout, char uplo, char diag, lapack_int n,
@@ -4714,13 +4759,13 @@ lapack_int LAPACKE_dbdsdc_work( int matrix_layout, char uplo, char compq,
                                 lapack_int* iwork );
 
 lapack_int LAPACKE_sbdsvdx_work( int matrix_layout, char uplo, char jobz, char range,
-                                 lapack_int n, float* d, float* e,
+                                 lapack_int n, const float* d, const float* e,
                                  float vl, float vu,
                                  lapack_int il, lapack_int iu, lapack_int* ns,
                                  float* s, float* z, lapack_int ldz,
                                  float* work, lapack_int* iwork );
 lapack_int LAPACKE_dbdsvdx_work( int matrix_layout, char uplo, char jobz, char range,
-                                 lapack_int n, double* d, double* e,
+                                 lapack_int n, const double* d, const double* e,
                                  double vl, double vu,
                                  lapack_int il, lapack_int iu, lapack_int* ns,
                                  double* s, double* z, lapack_int ldz,
@@ -5682,6 +5727,122 @@ lapack_int LAPACKE_zgesdd_work( int matrix_layout, char jobz, lapack_int m,
                                 lapack_complex_double* work, lapack_int lwork,
                                 double* rwork, lapack_int* iwork );
 
+lapack_int LAPACKE_sgedmd_work( int matrix_layout, char jobs, char jobz,
+                                char jobr, char jobf, lapack_int whtsvd,
+				lapack_int m, lapack_int n, float* x,
+				lapack_int ldx, float* y, lapack_int ldy,
+				lapack_int nrnk, float* tol, lapack_int k,
+			       	float* reig, float* imeig,
+				float* z, lapack_int ldz, float* res,
+				float* b, lapack_int ldb, float* w,
+				lapack_int ldw, float* s, lapack_int lds,
+				float* work, lapack_int lwork,
+				lapack_int* iwork, lapack_int liwork );
+
+lapack_int LAPACKE_dgedmd_work( int matrix_layout, char jobs, char jobz,
+                                char jobr, char jobf, lapack_int whtsvd,
+				lapack_int m, lapack_int n, double* x,
+				lapack_int ldx, double* y, lapack_int ldy,
+				lapack_int nrnk, double* tol, lapack_int k,
+			       	double* reig, double *imeig,
+				double* z, lapack_int ldz, double* res,
+				double* b, lapack_int ldb, double* w,
+				lapack_int ldw, double* s, lapack_int lds,
+				double* work, lapack_int lwork,
+				lapack_int* iwork, lapack_int liwork );
+
+lapack_int LAPACKE_cgedmd_work( int matrix_layout, char jobs, char jobz,
+                                char jobr, char jobf, lapack_int whtsvd,
+				lapack_int m, lapack_int n,
+				lapack_complex_float* x, lapack_int ldx,
+				lapack_complex_float* y, lapack_int ldy,
+				lapack_int nrnk, float* tol, lapack_int k,
+			       	lapack_complex_float* eigs,
+                                lapack_complex_float* z, lapack_int ldz,
+                                float* res,
+                                lapack_complex_float* b, lapack_int ldb,
+                                lapack_complex_float* w, lapack_int ldw,
+                                lapack_complex_float* s, lapack_int lds,
+                                lapack_complex_float* zwork, lapack_int lzwork,
+                                float* work, lapack_int lwork,
+                                lapack_int* iwork, lapack_int liwork );
+
+lapack_int LAPACKE_zgedmd_work( int matrix_layout, char jobs, char jobz,
+                                char jobr, char jobf, lapack_int whtsvd,
+				lapack_int m, lapack_int n,
+				lapack_complex_double* x, lapack_int ldx,
+				lapack_complex_double* y, lapack_int ldy,
+				lapack_int nrnk, double* tol, lapack_int k, 
+				lapack_complex_double* eigs,
+                                lapack_complex_double* z, lapack_int ldz,
+                                double* res,
+                                lapack_complex_double* b, lapack_int ldb,
+                                lapack_complex_double* w, lapack_int ldw,
+                                lapack_complex_double* s, lapack_int lds,
+                                lapack_complex_double* zwork, lapack_int lzwork,
+                                double* work, lapack_int lwork,
+                                lapack_int* iwork, lapack_int liwork );
+
+lapack_int LAPACKE_sgedmdq_work( int matrix_layout, char jobs, char jobz,
+                                 char jobr, char jobq, char jobt, char jobf,
+                                 lapack_int whtsvd, lapack_int m, lapack_int n,
+                                 float* f, lapack_int ldf, float* x,
+                                 lapack_int ldx, float* y, lapack_int ldy,
+                                 lapack_int nrnk, float* tol, lapack_int k,
+				 float* reig, float *imeig, float* z,
+                                 lapack_int ldz, float* res, float* b,
+                                 lapack_int ldb, float* v, lapack_int ldv,
+                                 float* s, lapack_int lds, float* work,
+                                 lapack_int lwork, lapack_int* iwork,
+                                 lapack_int liwork );
+
+lapack_int LAPACKE_dgedmdq_work( int matrix_layout, char jobs, char jobz,
+                                 char jobr, char jobq, char jobt, char jobf,
+                                 lapack_int whtsvd, lapack_int m, lapack_int n,
+                                 double* f, lapack_int ldf, double* x,
+                                 lapack_int ldx, double* y, lapack_int ldy,
+                                 lapack_int nrnk, double* tol, lapack_int k,
+				 double* reig, double* imeig, double* z,
+                                 lapack_int ldz, double* res, double* b,
+                                 lapack_int ldb, double* v, lapack_int ldv,
+                                 double* s, lapack_int lds, double* work,
+                                 lapack_int lwork, lapack_int* iwork,
+                                 lapack_int liwork );
+
+lapack_int LAPACKE_cgedmdq_work( int matrix_layout, char jobs, char jobz,
+                                 char jobr, char jobq, char jobt, char jobf,
+                                 lapack_int whtsvd, lapack_int m, lapack_int n,
+                                 lapack_complex_float* f, lapack_int ldf,
+                                 lapack_complex_float* x, lapack_int ldx,
+                                 lapack_complex_float* y, lapack_int ldy,
+                                 lapack_int nrnk, float* tol, lapack_int k,
+                                 lapack_complex_float* eigs,
+                                 lapack_complex_float* z, lapack_int ldz,
+                                 float* res,
+                                 lapack_complex_float* b, lapack_int ldb,
+                                 lapack_complex_float* v, lapack_int ldv,
+                                 lapack_complex_float* s, lapack_int lds,
+                                 lapack_complex_float* zwork, lapack_int lzwork,
+                                 float* work, lapack_int lwork,
+                                 lapack_int* iwork, lapack_int liwork);
+
+lapack_int LAPACKE_zgedmdq_work( int matrix_layout, char jobs, char jobz,
+                                 char jobr, char jobq, char jobt, char jobf,
+                                 lapack_int whtsvd, lapack_int m, lapack_int n,
+                                 lapack_complex_double* f, lapack_int ldf,
+                                 lapack_complex_double* x, lapack_int ldx,
+                                 lapack_complex_double* y, lapack_int ldy,
+                                 lapack_int nrnk, double* tol, lapack_int k,
+                                 lapack_complex_double* eigs,
+                                 lapack_complex_double* z, lapack_int ldz,
+                                 double* res,
+                                 lapack_complex_double* b, lapack_int ldb,
+                                 lapack_complex_double* v, lapack_int ldv,
+                                 lapack_complex_double* s, lapack_int lds,
+                                 lapack_complex_double* zwork, lapack_int lzwork,
+                                 double* work, lapack_int lwork,
+                                 lapack_int* iwork, lapack_int liwork);
+
 lapack_int LAPACKE_sgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
                                float* a, lapack_int lda, lapack_int* ipiv,
                                float* b, lapack_int ldb );
@@ -5698,12 +5859,12 @@ lapack_int LAPACKE_zgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
                                lapack_int ldb );
 lapack_int LAPACKE_dsgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
                                 double* a, lapack_int lda, lapack_int* ipiv,
-                                double* b, lapack_int ldb, double* x,
+                                const double* b, lapack_int ldb, double* x,
                                 lapack_int ldx, double* work, float* swork,
                                 lapack_int* iter );
 lapack_int LAPACKE_zcgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
                                 lapack_complex_double* a, lapack_int lda,
-                                lapack_int* ipiv, lapack_complex_double* b,
+                                lapack_int* ipiv, const lapack_complex_double* b,
                                 lapack_int ldb, lapack_complex_double* x,
                                 lapack_int ldx, lapack_complex_double* work,
                                 lapack_complex_float* swork, double* rwork,
@@ -5803,7 +5964,7 @@ lapack_int LAPACKE_zgesvdq_work( int matrix_layout, char joba, char jobp,
                                 lapack_int* iwork, lapack_int liwork,
                                 lapack_complex_double* cwork, lapack_int lcwork,
                                 double* rwork, lapack_int lrwork);
-                                
+
 lapack_int LAPACKE_sgesvj_work( int matrix_layout, char joba, char jobu,
                                 char jobv, lapack_int m, lapack_int n, float* a,
                                 lapack_int lda, float* sva, lapack_int mv,
@@ -7576,6 +7737,21 @@ double LAPACKE_dlapy3_work( double x, double y, double z );
 float LAPACKE_slamch_work( char cmach );
 double LAPACKE_dlamch_work( char cmach );
 
+float LAPACKE_slangb_work( int matrix_layout, char norm, lapack_int n,
+                           lapack_int kl, lapack_int ku, const float* ab,
+                           lapack_int ldab, float* work );
+double LAPACKE_dlangb_work( int matrix_layout, char norm, lapack_int n,
+                            lapack_int kl, lapack_int ku, const double* ab,
+                            lapack_int ldab, double* work );
+float LAPACKE_clangb_work( int matrix_layout, char norm, lapack_int n,
+                           lapack_int kl, lapack_int ku,
+                           const lapack_complex_float* ab, lapack_int ldab,
+                           float* work );
+double LAPACKE_zlangb_work( int matrix_layout, char norm, lapack_int n,
+                            lapack_int kl, lapack_int ku,
+                            const lapack_complex_double* ab, lapack_int ldab,
+                            double* work );
+
 float LAPACKE_slange_work( int matrix_layout, char norm, lapack_int m,
                                 lapack_int n, const float* a, lapack_int lda,
                                 float* work );
@@ -7766,10 +7942,10 @@ lapack_int LAPACKE_zlaset_work( int matrix_layout, char uplo, lapack_int m,
 lapack_int LAPACKE_slasrt_work( char id, lapack_int n, float* d );
 lapack_int LAPACKE_dlasrt_work( char id, lapack_int n, double* d );
 
-lapack_int LAPACKE_slassq_work( lapack_int n,                 float* x, lapack_int incx,  float* scale,  float* sumsq );
-lapack_int LAPACKE_dlassq_work( lapack_int n,                double* x, lapack_int incx, double* scale, double* sumsq );
-lapack_int LAPACKE_classq_work( lapack_int n,  lapack_complex_float* x, lapack_int incx,  float* scale,  float* sumsq );
-lapack_int LAPACKE_zlassq_work( lapack_int n, lapack_complex_double* x, lapack_int incx, double* scale, double* sumsq );
+lapack_int LAPACKE_slassq_work( lapack_int n,                 const float* x, lapack_int incx,  float* scale,  float* sumsq );
+lapack_int LAPACKE_dlassq_work( lapack_int n,                const double* x, lapack_int incx, double* scale, double* sumsq );
+lapack_int LAPACKE_classq_work( lapack_int n,  const lapack_complex_float* x, lapack_int incx,  float* scale,  float* sumsq );
+lapack_int LAPACKE_zlassq_work( lapack_int n, const lapack_complex_double* x, lapack_int incx, double* scale, double* sumsq );
 
 lapack_int LAPACKE_slaswp_work( int matrix_layout, lapack_int n, float* a,
                                 lapack_int lda, lapack_int k1, lapack_int k2,
@@ -8315,12 +8491,12 @@ lapack_int LAPACKE_zposv_work( int matrix_layout, char uplo, lapack_int n,
                                lapack_int ldb );
 lapack_int LAPACKE_dsposv_work( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, double* a, lapack_int lda,
-                                double* b, lapack_int ldb, double* x,
+                                const double* b, lapack_int ldb, double* x,
                                 lapack_int ldx, double* work, float* swork,
                                 lapack_int* iter );
 lapack_int LAPACKE_zcposv_work( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, lapack_complex_double* a,
-                                lapack_int lda, lapack_complex_double* b,
+                                lapack_int lda, const lapack_complex_double* b,
                                 lapack_int ldb, lapack_complex_double* x,
                                 lapack_int ldx, lapack_complex_double* work,
                                 lapack_complex_float* swork, double* rwork,
@@ -10174,6 +10350,35 @@ lapack_int LAPACKE_ztrsyl_work( int matrix_layout, char trana, char tranb,
                                 lapack_complex_double* c, lapack_int ldc,
                                 double* scale );
 
+lapack_int LAPACKE_strsyl3_work( int matrix_layout, char trana, char tranb,
+                                 lapack_int isgn, lapack_int m, lapack_int n,
+                                 const float* a, lapack_int lda,
+                                 const float* b, lapack_int ldb,
+                                 float* c, lapack_int ldc, float* scale,
+                                 lapack_int* iwork, lapack_int liwork,
+                                 float* swork, lapack_int ldswork );
+lapack_int LAPACKE_dtrsyl3_work( int matrix_layout, char trana, char tranb,
+                                 lapack_int isgn, lapack_int m, lapack_int n,
+                                 const double* a, lapack_int lda,
+                                 const double* b, lapack_int ldb,
+                                 double* c, lapack_int ldc, double* scale,
+                                 lapack_int* iwork, lapack_int liwork,
+                                 double* swork, lapack_int ldswork );
+lapack_int LAPACKE_ctrsyl3_work( int matrix_layout, char trana, char tranb,
+                                 lapack_int isgn, lapack_int m, lapack_int n,
+                                 const lapack_complex_float* a, lapack_int lda,
+                                 const lapack_complex_float* b, lapack_int ldb,
+                                 lapack_complex_float* c, lapack_int ldc,
+                                 float* scale, float* swork,
+                                 lapack_int ldswork );
+lapack_int LAPACKE_ztrsyl3_work( int matrix_layout, char trana, char tranb,
+                                 lapack_int isgn, lapack_int m, lapack_int n,
+                                 const lapack_complex_double* a, lapack_int lda,
+                                 const lapack_complex_double* b, lapack_int ldb,
+                                 lapack_complex_double* c, lapack_int ldc,
+                                 double* scale, double* swork,
+                                 lapack_int ldswork );
+
 lapack_int LAPACKE_strtri_work( int matrix_layout, char uplo, char diag,
                                 lapack_int n, float* a, lapack_int lda );
 lapack_int LAPACKE_dtrtri_work( int matrix_layout, char uplo, char diag,
@@ -12476,7 +12681,7 @@ lapack_int LAPACKE_zhegv_2stage_work( int matrix_layout, lapack_int itype, char
 //LAPACK 3.8.0
 lapack_int LAPACKE_ssysv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, float* a, lapack_int lda,
-                          float* tb, lapack_int ltb, lapack_int* ipiv, 
+                          float* tb, lapack_int ltb, lapack_int* ipiv,
                           lapack_int* ipiv2, float* b, lapack_int ldb );
 lapack_int LAPACKE_ssysv_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, float* a, lapack_int lda,
@@ -12486,7 +12691,7 @@ lapack_int LAPACKE_ssysv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
 lapack_int LAPACKE_dsysv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, double* a, lapack_int lda,
                           double* tb, lapack_int ltb,
-                          lapack_int* ipiv, lapack_int* ipiv2, 
+                          lapack_int* ipiv, lapack_int* ipiv2,
                           double* b, lapack_int ldb );
 lapack_int LAPACKE_dsysv_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, double* a, lapack_int lda,
@@ -12538,10 +12743,10 @@ lapack_int LAPACKE_zhesv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
                                lapack_int ltb, lapack_int* ipiv, lapack_int* ipiv2,
                                lapack_complex_double* b, lapack_int ldb,
                                lapack_complex_double* work, lapack_int lwork );
-                               
+
 lapack_int LAPACKE_ssytrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
                           float* a, lapack_int lda,
-                          float* tb, lapack_int ltb, lapack_int* ipiv, 
+                          float* tb, lapack_int ltb, lapack_int* ipiv,
                           lapack_int* ipiv2 );
 lapack_int LAPACKE_ssytrf_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
                                float* a, lapack_int lda,
@@ -12596,64 +12801,97 @@ lapack_int LAPACKE_zhetrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
 
 
 lapack_int LAPACKE_ssytrs_aa_2stage( int matrix_layout, char uplo, lapack_int n,
-                          lapack_int nrhs, float* a, lapack_int lda,
-                          float* tb, lapack_int ltb, lapack_int* ipiv, 
-                          lapack_int* ipiv2, float* b, lapack_int ldb );
+                          lapack_int nrhs, const float* a, lapack_int lda,
+                          float* tb, lapack_int ltb, const lapack_int* ipiv,
+                          const lapack_int* ipiv2, float* b, lapack_int ldb );
 lapack_int LAPACKE_ssytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
-                               lapack_int nrhs, float* a, lapack_int lda,
-                               float* tb, lapack_int ltb, lapack_int* ipiv,
-                               lapack_int* ipiv2, float* b, lapack_int ldb );
+                               lapack_int nrhs, const float* a, lapack_int lda,
+                               float* tb, lapack_int ltb, const lapack_int* ipiv,
+                               const lapack_int* ipiv2, float* b, lapack_int ldb );
 lapack_int LAPACKE_dsytrs_aa_2stage( int matrix_layout, char uplo, lapack_int n,
-                          lapack_int nrhs, double* a, lapack_int lda,
+                          lapack_int nrhs, const double* a, lapack_int lda,
                           double* tb, lapack_int ltb,
-                          lapack_int* ipiv, lapack_int* ipiv2, 
+                          const lapack_int* ipiv, const lapack_int* ipiv2,
                           double* b, lapack_int ldb );
 lapack_int LAPACKE_dsytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
-                               lapack_int nrhs, double* a, lapack_int lda,
+                               lapack_int nrhs, const double* a, lapack_int lda,
                                double* tb, lapack_int ltb,
-                               lapack_int* ipiv, lapack_int* ipiv2,
+                               const lapack_int* ipiv, const lapack_int* ipiv2,
                                double* b, lapack_int ldb );
 lapack_int LAPACKE_csytrs_aa_2stage( int matrix_layout, char uplo, lapack_int n,
-                          lapack_int nrhs, lapack_complex_float* a,
+                          lapack_int nrhs, const lapack_complex_float* a,
                           lapack_int lda, lapack_complex_float* tb,
-                          lapack_int ltb, lapack_int* ipiv, lapack_int* ipiv2,
+                          lapack_int ltb, const lapack_int* ipiv, const lapack_int* ipiv2,
                           lapack_complex_float* b, lapack_int ldb );
 lapack_int LAPACKE_csytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
-                               lapack_int nrhs, lapack_complex_float* a,
+                               lapack_int nrhs, const lapack_complex_float* a,
                                lapack_int lda, lapack_complex_float* tb,
-                               lapack_int ltb, lapack_int* ipiv, lapack_int* ipiv2,
+                               lapack_int ltb, const lapack_int* ipiv, const lapack_int* ipiv2,
                                lapack_complex_float* b, lapack_int ldb );
 lapack_int LAPACKE_zsytrs_aa_2stage( int matrix_layout, char uplo, lapack_int n,
-                          lapack_int nrhs, lapack_complex_double* a,
+                          lapack_int nrhs, const lapack_complex_double* a,
                           lapack_int lda, lapack_complex_double* tb,
-                          lapack_int ltb, lapack_int* ipiv, lapack_int* ipiv2,
+                          lapack_int ltb, const lapack_int* ipiv, const lapack_int* ipiv2,
                           lapack_complex_double* b, lapack_int ldb );
 lapack_int LAPACKE_zsytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
-                               lapack_int nrhs, lapack_complex_double* a,
+                               lapack_int nrhs, const lapack_complex_double* a,
                                lapack_int lda, lapack_complex_double* tb,
-                               lapack_int ltb, lapack_int* ipiv, lapack_int* ipiv2,
+                               lapack_int ltb, const lapack_int* ipiv, const lapack_int* ipiv2,
                                lapack_complex_double* b, lapack_int ldb );
 lapack_int LAPACKE_chetrs_aa_2stage( int matrix_layout, char uplo, lapack_int n,
-                          lapack_int nrhs, lapack_complex_float* a,
+                          lapack_int nrhs, const lapack_complex_float* a,
                           lapack_int lda, lapack_complex_float* tb,
-                          lapack_int ltb, lapack_int* ipiv, lapack_int* ipiv2,
+                          lapack_int ltb, const lapack_int* ipiv, const lapack_int* ipiv2,
                           lapack_complex_float* b, lapack_int ldb );
 lapack_int LAPACKE_chetrs_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
-                               lapack_int nrhs, lapack_complex_float* a,
+                               lapack_int nrhs, const lapack_complex_float* a,
                                lapack_int lda, lapack_complex_float* tb,
-                               lapack_int ltb, lapack_int* ipiv, lapack_int* ipiv2,
+                               lapack_int ltb, const lapack_int* ipiv, const lapack_int* ipiv2,
                                lapack_complex_float* b, lapack_int ldb );
 lapack_int LAPACKE_zhetrs_aa_2stage( int matrix_layout, char uplo, lapack_int n,
-                          lapack_int nrhs, lapack_complex_double* a,
+                          lapack_int nrhs, const lapack_complex_double* a,
                           lapack_int lda, lapack_complex_double* tb,
-                          lapack_int ltb, lapack_int* ipiv, lapack_int* ipiv2,
+                          lapack_int ltb, const lapack_int* ipiv, const lapack_int* ipiv2,
                           lapack_complex_double* b, lapack_int ldb );
 lapack_int LAPACKE_zhetrs_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
-                               lapack_int nrhs, lapack_complex_double* a,
+                               lapack_int nrhs, const lapack_complex_double* a,
                                lapack_int lda, lapack_complex_double* tb,
-                               lapack_int ltb, lapack_int* ipiv, lapack_int* ipiv2,
+                               lapack_int ltb, const lapack_int* ipiv, const lapack_int* ipiv2,
                                lapack_complex_double* b, lapack_int ldb );
-                   
+//LAPACK 3.10.0
+lapack_int LAPACKE_sorhr_col( int matrix_layout, lapack_int m, lapack_int n,
+                              lapack_int nb, float* a,
+                              lapack_int lda, float* t,
+                              lapack_int ldt, float* d );
+lapack_int LAPACKE_sorhr_col_work( int matrix_layout, lapack_int m, lapack_int n,
+                                   lapack_int nb, float* a,
+                                   lapack_int lda, float* t,
+                                   lapack_int ldt, float* d );
+lapack_int LAPACKE_dorhr_col( int matrix_layout, lapack_int m, lapack_int n,
+                              lapack_int nb, double* a,
+                              lapack_int lda, double* t,
+                              lapack_int ldt, double* d );
+lapack_int LAPACKE_dorhr_col_work( int matrix_layout, lapack_int m, lapack_int n,
+                                   lapack_int nb, double* a,
+                                   lapack_int lda, double* t,
+                                   lapack_int ldt, double* d );
+lapack_int LAPACKE_cunhr_col( int matrix_layout, lapack_int m, lapack_int n,
+                              lapack_int nb, lapack_complex_float* a,
+                              lapack_int lda, lapack_complex_float* t,
+                              lapack_int ldt, lapack_complex_float* d );
+lapack_int LAPACKE_cunhr_col_work( int matrix_layout, lapack_int m, lapack_int n,
+                                   lapack_int nb, lapack_complex_float* a,
+                                   lapack_int lda, lapack_complex_float* t,
+                                   lapack_int ldt, lapack_complex_float* d );
+lapack_int LAPACKE_zunhr_col( int matrix_layout, lapack_int m, lapack_int n,
+                              lapack_int nb, lapack_complex_double* a,
+                              lapack_int lda, lapack_complex_double* t,
+                              lapack_int ldt, lapack_complex_double* d );
+lapack_int LAPACKE_zunhr_col_work( int matrix_layout, lapack_int m, lapack_int n,
+                                   lapack_int nb, lapack_complex_double* a,
+                                   lapack_int lda, lapack_complex_double* t,
+                                   lapack_int ldt, lapack_complex_double* d );
+
 /* APIs for set/get nancheck flags */
 void LAPACKE_set_nancheck( int flag );
 int LAPACKE_get_nancheck( void );
diff --git a/LAPACKE/include/lapacke_64.h b/LAPACKE/include/lapacke_64.h
new file mode 100644
index 0000000000..a83dc114db
--- /dev/null
+++ b/LAPACKE/include/lapacke_64.h
@@ -0,0 +1,12866 @@
+/*****************************************************************************
+  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 C interface to LAPACK
+* Author: Intel Corporation
+*****************************************************************************/
+
+#ifndef _LAPACKE_64_H_
+#define _LAPACKE_64_H_
+
+#include "lapacke.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* C-LAPACK function prototypes */
+
+int64_t LAPACKE_sbdsdc_64( int matrix_layout, char uplo, char compq,
+                           int64_t n, float* d, float* e, float* u,
+                           int64_t ldu, float* vt, int64_t ldvt, float* q,
+                           int64_t* iq );
+int64_t LAPACKE_dbdsdc_64( int matrix_layout, char uplo, char compq,
+                           int64_t n, double* d, double* e, double* u,
+                           int64_t ldu, double* vt, int64_t ldvt,
+                           double* q, int64_t* iq );
+
+int64_t LAPACKE_sbdsqr_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t ncvt, int64_t nru, int64_t ncc,
+                           float* d, float* e, float* vt, int64_t ldvt,
+                           float* u, int64_t ldu, float* c, int64_t ldc );
+int64_t LAPACKE_dbdsqr_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t ncvt, int64_t nru, int64_t ncc,
+                           double* d, double* e, double* vt, int64_t ldvt,
+                           double* u, int64_t ldu, double* c,
+                           int64_t ldc );
+int64_t LAPACKE_cbdsqr_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t ncvt, int64_t nru, int64_t ncc,
+                           float* d, float* e, lapack_complex_float* vt,
+                           int64_t ldvt, lapack_complex_float* u,
+                           int64_t ldu, lapack_complex_float* c,
+                           int64_t ldc );
+int64_t LAPACKE_zbdsqr_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t ncvt, int64_t nru, int64_t ncc,
+                           double* d, double* e, lapack_complex_double* vt,
+                           int64_t ldvt, lapack_complex_double* u,
+                           int64_t ldu, lapack_complex_double* c,
+                           int64_t ldc );
+int64_t LAPACKE_sbdsvdx_64( int matrix_layout, char uplo, char jobz, char range,
+                           int64_t n, const float* d, const float* e,
+                           float vl, float vu,
+                           int64_t il, int64_t iu, int64_t* ns,
+                           float* s, float* z, int64_t ldz,
+                           int64_t* superb );
+int64_t LAPACKE_dbdsvdx_64( int matrix_layout, char uplo, char jobz, char range,
+                           int64_t n, const double* d, const double* e,
+                           double vl, double vu,
+                           int64_t il, int64_t iu, int64_t* ns,
+                           double* s, double* z, int64_t ldz,
+                           int64_t* superb );
+int64_t LAPACKE_sdisna_64( char job, int64_t m, int64_t n, const float* d,
+                           float* sep );
+int64_t LAPACKE_ddisna_64( char job, int64_t m, int64_t n,
+                           const double* d, double* sep );
+
+int64_t LAPACKE_sgbbrd_64( int matrix_layout, char vect, int64_t m,
+                           int64_t n, int64_t ncc, int64_t kl,
+                           int64_t ku, float* ab, int64_t ldab, float* d,
+                           float* e, float* q, int64_t ldq, float* pt,
+                           int64_t ldpt, float* c, int64_t ldc );
+int64_t LAPACKE_dgbbrd_64( int matrix_layout, char vect, int64_t m,
+                           int64_t n, int64_t ncc, int64_t kl,
+                           int64_t ku, double* ab, int64_t ldab,
+                           double* d, double* e, double* q, int64_t ldq,
+                           double* pt, int64_t ldpt, double* c,
+                           int64_t ldc );
+int64_t LAPACKE_cgbbrd_64( int matrix_layout, char vect, int64_t m,
+                           int64_t n, int64_t ncc, int64_t kl,
+                           int64_t ku, lapack_complex_float* ab,
+                           int64_t ldab, float* d, float* e,
+                           lapack_complex_float* q, int64_t ldq,
+                           lapack_complex_float* pt, int64_t ldpt,
+                           lapack_complex_float* c, int64_t ldc );
+int64_t LAPACKE_zgbbrd_64( int matrix_layout, char vect, int64_t m,
+                           int64_t n, int64_t ncc, int64_t kl,
+                           int64_t ku, lapack_complex_double* ab,
+                           int64_t ldab, double* d, double* e,
+                           lapack_complex_double* q, int64_t ldq,
+                           lapack_complex_double* pt, int64_t ldpt,
+                           lapack_complex_double* c, int64_t ldc );
+
+int64_t LAPACKE_sgbcon_64( int matrix_layout, char norm, int64_t n,
+                           int64_t kl, int64_t ku, const float* ab,
+                           int64_t ldab, const int64_t* ipiv, float anorm,
+                           float* rcond );
+int64_t LAPACKE_dgbcon_64( int matrix_layout, char norm, int64_t n,
+                           int64_t kl, int64_t ku, const double* ab,
+                           int64_t ldab, const int64_t* ipiv,
+                           double anorm, double* rcond );
+int64_t LAPACKE_cgbcon_64( int matrix_layout, char norm, int64_t n,
+                           int64_t kl, int64_t ku,
+                           const lapack_complex_float* ab, int64_t ldab,
+                           const int64_t* ipiv, float anorm, float* rcond );
+int64_t LAPACKE_zgbcon_64( int matrix_layout, char norm, int64_t n,
+                           int64_t kl, int64_t ku,
+                           const lapack_complex_double* ab, int64_t ldab,
+                           const int64_t* ipiv, double anorm,
+                           double* rcond );
+
+int64_t LAPACKE_sgbequ_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t kl, int64_t ku, const float* ab,
+                           int64_t ldab, float* r, float* c, float* rowcnd,
+                           float* colcnd, float* amax );
+int64_t LAPACKE_dgbequ_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t kl, int64_t ku, const double* ab,
+                           int64_t ldab, double* r, double* c,
+                           double* rowcnd, double* colcnd, double* amax );
+int64_t LAPACKE_cgbequ_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t kl, int64_t ku,
+                           const lapack_complex_float* ab, int64_t ldab,
+                           float* r, float* c, float* rowcnd, float* colcnd,
+                           float* amax );
+int64_t LAPACKE_zgbequ_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t kl, int64_t ku,
+                           const lapack_complex_double* ab, int64_t ldab,
+                           double* r, double* c, double* rowcnd, double* colcnd,
+                           double* amax );
+
+int64_t LAPACKE_sgbequb_64( int matrix_layout, int64_t m, int64_t n,
+                            int64_t kl, int64_t ku, const float* ab,
+                            int64_t ldab, float* r, float* c, float* rowcnd,
+                            float* colcnd, float* amax );
+int64_t LAPACKE_dgbequb_64( int matrix_layout, int64_t m, int64_t n,
+                            int64_t kl, int64_t ku, const double* ab,
+                            int64_t ldab, double* r, double* c,
+                            double* rowcnd, double* colcnd, double* amax );
+int64_t LAPACKE_cgbequb_64( int matrix_layout, int64_t m, int64_t n,
+                            int64_t kl, int64_t ku,
+                            const lapack_complex_float* ab, int64_t ldab,
+                            float* r, float* c, float* rowcnd, float* colcnd,
+                            float* amax );
+int64_t LAPACKE_zgbequb_64( int matrix_layout, int64_t m, int64_t n,
+                            int64_t kl, int64_t ku,
+                            const lapack_complex_double* ab, int64_t ldab,
+                            double* r, double* c, double* rowcnd,
+                            double* colcnd, double* amax );
+
+int64_t LAPACKE_sgbrfs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t kl, int64_t ku, int64_t nrhs,
+                           const float* ab, int64_t ldab, const float* afb,
+                           int64_t ldafb, const int64_t* ipiv,
+                           const float* b, int64_t ldb, float* x,
+                           int64_t ldx, float* ferr, float* berr );
+int64_t LAPACKE_dgbrfs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t kl, int64_t ku, int64_t nrhs,
+                           const double* ab, int64_t ldab, const double* afb,
+                           int64_t ldafb, const int64_t* ipiv,
+                           const double* b, int64_t ldb, double* x,
+                           int64_t ldx, double* ferr, double* berr );
+int64_t LAPACKE_cgbrfs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t kl, int64_t ku, int64_t nrhs,
+                           const lapack_complex_float* ab, int64_t ldab,
+                           const lapack_complex_float* afb, int64_t ldafb,
+                           const int64_t* ipiv,
+                           const lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx, float* ferr,
+                           float* berr );
+int64_t LAPACKE_zgbrfs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t kl, int64_t ku, int64_t nrhs,
+                           const lapack_complex_double* ab, int64_t ldab,
+                           const lapack_complex_double* afb, int64_t ldafb,
+                           const int64_t* ipiv,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* ferr, double* berr );
+
+int64_t LAPACKE_sgbrfsx_64( int matrix_layout, char trans, char equed,
+                            int64_t n, int64_t kl, int64_t ku,
+                            int64_t nrhs, const float* ab, int64_t ldab,
+                            const float* afb, int64_t ldafb,
+                            const int64_t* ipiv, const float* r,
+                            const float* c, const float* b, int64_t ldb,
+                            float* x, int64_t ldx, float* rcond, float* berr,
+                            int64_t n_err_bnds, float* err_bnds_norm,
+                            float* err_bnds_comp, int64_t nparams,
+                            float* params );
+int64_t LAPACKE_dgbrfsx_64( int matrix_layout, char trans, char equed,
+                            int64_t n, int64_t kl, int64_t ku,
+                            int64_t nrhs, const double* ab, int64_t ldab,
+                            const double* afb, int64_t ldafb,
+                            const int64_t* ipiv, const double* r,
+                            const double* c, const double* b, int64_t ldb,
+                            double* x, int64_t ldx, double* rcond,
+                            double* berr, int64_t n_err_bnds,
+                            double* err_bnds_norm, double* err_bnds_comp,
+                            int64_t nparams, double* params );
+int64_t LAPACKE_cgbrfsx_64( int matrix_layout, char trans, char equed,
+                            int64_t n, int64_t kl, int64_t ku,
+                            int64_t nrhs, const lapack_complex_float* ab,
+                            int64_t ldab, const lapack_complex_float* afb,
+                            int64_t ldafb, const int64_t* ipiv,
+                            const float* r, const float* c,
+                            const lapack_complex_float* b, int64_t ldb,
+                            lapack_complex_float* x, int64_t ldx,
+                            float* rcond, float* berr, int64_t n_err_bnds,
+                            float* err_bnds_norm, float* err_bnds_comp,
+                            int64_t nparams, float* params );
+int64_t LAPACKE_zgbrfsx_64( int matrix_layout, char trans, char equed,
+                            int64_t n, int64_t kl, int64_t ku,
+                            int64_t nrhs, const lapack_complex_double* ab,
+                            int64_t ldab, const lapack_complex_double* afb,
+                            int64_t ldafb, const int64_t* ipiv,
+                            const double* r, const double* c,
+                            const lapack_complex_double* b, int64_t ldb,
+                            lapack_complex_double* x, int64_t ldx,
+                            double* rcond, double* berr, int64_t n_err_bnds,
+                            double* err_bnds_norm, double* err_bnds_comp,
+                            int64_t nparams, double* params );
+
+int64_t LAPACKE_sgbsv_64( int matrix_layout, int64_t n, int64_t kl,
+                          int64_t ku, int64_t nrhs, float* ab,
+                          int64_t ldab, int64_t* ipiv, float* b,
+                          int64_t ldb );
+int64_t LAPACKE_dgbsv_64( int matrix_layout, int64_t n, int64_t kl,
+                          int64_t ku, int64_t nrhs, double* ab,
+                          int64_t ldab, int64_t* ipiv, double* b,
+                          int64_t ldb );
+int64_t LAPACKE_cgbsv_64( int matrix_layout, int64_t n, int64_t kl,
+                          int64_t ku, int64_t nrhs,
+                          lapack_complex_float* ab, int64_t ldab,
+                          int64_t* ipiv, lapack_complex_float* b,
+                          int64_t ldb );
+int64_t LAPACKE_zgbsv_64( int matrix_layout, int64_t n, int64_t kl,
+                          int64_t ku, int64_t nrhs,
+                          lapack_complex_double* ab, int64_t ldab,
+                          int64_t* ipiv, lapack_complex_double* b,
+                          int64_t ldb );
+
+int64_t LAPACKE_sgbsvx_64( int matrix_layout, char fact, char trans,
+                           int64_t n, int64_t kl, int64_t ku,
+                           int64_t nrhs, float* ab, int64_t ldab,
+                           float* afb, int64_t ldafb, int64_t* ipiv,
+                           char* equed, float* r, float* c, float* b,
+                           int64_t ldb, float* x, int64_t ldx,
+                           float* rcond, float* ferr, float* berr,
+                           float* rpivot );
+int64_t LAPACKE_dgbsvx_64( int matrix_layout, char fact, char trans,
+                           int64_t n, int64_t kl, int64_t ku,
+                           int64_t nrhs, double* ab, int64_t ldab,
+                           double* afb, int64_t ldafb, int64_t* ipiv,
+                           char* equed, double* r, double* c, double* b,
+                           int64_t ldb, double* x, int64_t ldx,
+                           double* rcond, double* ferr, double* berr,
+                           double* rpivot );
+int64_t LAPACKE_cgbsvx_64( int matrix_layout, char fact, char trans,
+                           int64_t n, int64_t kl, int64_t ku,
+                           int64_t nrhs, lapack_complex_float* ab,
+                           int64_t ldab, lapack_complex_float* afb,
+                           int64_t ldafb, int64_t* ipiv, char* equed,
+                           float* r, float* c, lapack_complex_float* b,
+                           int64_t ldb, lapack_complex_float* x,
+                           int64_t ldx, float* rcond, float* ferr,
+                           float* berr, float* rpivot );
+int64_t LAPACKE_zgbsvx_64( int matrix_layout, char fact, char trans,
+                           int64_t n, int64_t kl, int64_t ku,
+                           int64_t nrhs, lapack_complex_double* ab,
+                           int64_t ldab, lapack_complex_double* afb,
+                           int64_t ldafb, int64_t* ipiv, char* equed,
+                           double* r, double* c, lapack_complex_double* b,
+                           int64_t ldb, lapack_complex_double* x,
+                           int64_t ldx, double* rcond, double* ferr,
+                           double* berr, double* rpivot );
+
+int64_t LAPACKE_sgbsvxx_64( int matrix_layout, char fact, char trans,
+                            int64_t n, int64_t kl, int64_t ku,
+                            int64_t nrhs, float* ab, int64_t ldab,
+                            float* afb, int64_t ldafb, int64_t* ipiv,
+                            char* equed, float* r, float* c, float* b,
+                            int64_t ldb, float* x, int64_t ldx,
+                            float* rcond, float* rpvgrw, float* berr,
+                            int64_t n_err_bnds, float* err_bnds_norm,
+                            float* err_bnds_comp, int64_t nparams,
+                            float* params );
+int64_t LAPACKE_dgbsvxx_64( int matrix_layout, char fact, char trans,
+                            int64_t n, int64_t kl, int64_t ku,
+                            int64_t nrhs, double* ab, int64_t ldab,
+                            double* afb, int64_t ldafb, int64_t* ipiv,
+                            char* equed, double* r, double* c, double* b,
+                            int64_t ldb, double* x, int64_t ldx,
+                            double* rcond, double* rpvgrw, double* berr,
+                            int64_t n_err_bnds, double* err_bnds_norm,
+                            double* err_bnds_comp, int64_t nparams,
+                            double* params );
+int64_t LAPACKE_cgbsvxx_64( int matrix_layout, char fact, char trans,
+                            int64_t n, int64_t kl, int64_t ku,
+                            int64_t nrhs, lapack_complex_float* ab,
+                            int64_t ldab, lapack_complex_float* afb,
+                            int64_t ldafb, int64_t* ipiv, char* equed,
+                            float* r, float* c, lapack_complex_float* b,
+                            int64_t ldb, lapack_complex_float* x,
+                            int64_t ldx, float* rcond, float* rpvgrw,
+                            float* berr, int64_t n_err_bnds,
+                            float* err_bnds_norm, float* err_bnds_comp,
+                            int64_t nparams, float* params );
+int64_t LAPACKE_zgbsvxx_64( int matrix_layout, char fact, char trans,
+                            int64_t n, int64_t kl, int64_t ku,
+                            int64_t nrhs, lapack_complex_double* ab,
+                            int64_t ldab, lapack_complex_double* afb,
+                            int64_t ldafb, int64_t* ipiv, char* equed,
+                            double* r, double* c, lapack_complex_double* b,
+                            int64_t ldb, lapack_complex_double* x,
+                            int64_t ldx, double* rcond, double* rpvgrw,
+                            double* berr, int64_t n_err_bnds,
+                            double* err_bnds_norm, double* err_bnds_comp,
+                            int64_t nparams, double* params );
+
+int64_t LAPACKE_sgbtrf_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t kl, int64_t ku, float* ab,
+                           int64_t ldab, int64_t* ipiv );
+int64_t LAPACKE_dgbtrf_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t kl, int64_t ku, double* ab,
+                           int64_t ldab, int64_t* ipiv );
+int64_t LAPACKE_cgbtrf_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t kl, int64_t ku,
+                           lapack_complex_float* ab, int64_t ldab,
+                           int64_t* ipiv );
+int64_t LAPACKE_zgbtrf_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t kl, int64_t ku,
+                           lapack_complex_double* ab, int64_t ldab,
+                           int64_t* ipiv );
+
+int64_t LAPACKE_sgbtrs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t kl, int64_t ku, int64_t nrhs,
+                           const float* ab, int64_t ldab,
+                           const int64_t* ipiv, float* b, int64_t ldb );
+int64_t LAPACKE_dgbtrs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t kl, int64_t ku, int64_t nrhs,
+                           const double* ab, int64_t ldab,
+                           const int64_t* ipiv, double* b, int64_t ldb );
+int64_t LAPACKE_cgbtrs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t kl, int64_t ku, int64_t nrhs,
+                           const lapack_complex_float* ab, int64_t ldab,
+                           const int64_t* ipiv, lapack_complex_float* b,
+                           int64_t ldb );
+int64_t LAPACKE_zgbtrs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t kl, int64_t ku, int64_t nrhs,
+                           const lapack_complex_double* ab, int64_t ldab,
+                           const int64_t* ipiv, lapack_complex_double* b,
+                           int64_t ldb );
+
+int64_t LAPACKE_sgebak_64( int matrix_layout, char job, char side, int64_t n,
+                           int64_t ilo, int64_t ihi, const float* scale,
+                           int64_t m, float* v, int64_t ldv );
+int64_t LAPACKE_dgebak_64( int matrix_layout, char job, char side, int64_t n,
+                           int64_t ilo, int64_t ihi, const double* scale,
+                           int64_t m, double* v, int64_t ldv );
+int64_t LAPACKE_cgebak_64( int matrix_layout, char job, char side, int64_t n,
+                           int64_t ilo, int64_t ihi, const float* scale,
+                           int64_t m, lapack_complex_float* v,
+                           int64_t ldv );
+int64_t LAPACKE_zgebak_64( int matrix_layout, char job, char side, int64_t n,
+                           int64_t ilo, int64_t ihi, const double* scale,
+                           int64_t m, lapack_complex_double* v,
+                           int64_t ldv );
+
+int64_t LAPACKE_sgebal_64( int matrix_layout, char job, int64_t n, float* a,
+                           int64_t lda, int64_t* ilo, int64_t* ihi,
+                           float* scale );
+int64_t LAPACKE_dgebal_64( int matrix_layout, char job, int64_t n, double* a,
+                           int64_t lda, int64_t* ilo, int64_t* ihi,
+                           double* scale );
+int64_t LAPACKE_cgebal_64( int matrix_layout, char job, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           int64_t* ilo, int64_t* ihi, float* scale );
+int64_t LAPACKE_zgebal_64( int matrix_layout, char job, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           int64_t* ilo, int64_t* ihi, double* scale );
+
+int64_t LAPACKE_sgebrd_64( int matrix_layout, int64_t m, int64_t n,
+                           float* a, int64_t lda, float* d, float* e,
+                           float* tauq, float* taup );
+int64_t LAPACKE_dgebrd_64( int matrix_layout, int64_t m, int64_t n,
+                           double* a, int64_t lda, double* d, double* e,
+                           double* tauq, double* taup );
+int64_t LAPACKE_cgebrd_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_float* a, int64_t lda, float* d,
+                           float* e, lapack_complex_float* tauq,
+                           lapack_complex_float* taup );
+int64_t LAPACKE_zgebrd_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_double* a, int64_t lda, double* d,
+                           double* e, lapack_complex_double* tauq,
+                           lapack_complex_double* taup );
+
+int64_t LAPACKE_sgecon_64( int matrix_layout, char norm, int64_t n,
+                           const float* a, int64_t lda, float anorm,
+                           float* rcond );
+int64_t LAPACKE_dgecon_64( int matrix_layout, char norm, int64_t n,
+                           const double* a, int64_t lda, double anorm,
+                           double* rcond );
+int64_t LAPACKE_cgecon_64( int matrix_layout, char norm, int64_t n,
+                           const lapack_complex_float* a, int64_t lda,
+                           float anorm, float* rcond );
+int64_t LAPACKE_zgecon_64( int matrix_layout, char norm, int64_t n,
+                           const lapack_complex_double* a, int64_t lda,
+                           double anorm, double* rcond );
+
+int64_t LAPACKE_sgeequ_64( int matrix_layout, int64_t m, int64_t n,
+                           const float* a, int64_t lda, float* r, float* c,
+                           float* rowcnd, float* colcnd, float* amax );
+int64_t LAPACKE_dgeequ_64( int matrix_layout, int64_t m, int64_t n,
+                           const double* a, int64_t lda, double* r,
+                           double* c, double* rowcnd, double* colcnd,
+                           double* amax );
+int64_t LAPACKE_cgeequ_64( int matrix_layout, int64_t m, int64_t n,
+                           const lapack_complex_float* a, int64_t lda,
+                           float* r, float* c, float* rowcnd, float* colcnd,
+                           float* amax );
+int64_t LAPACKE_zgeequ_64( int matrix_layout, int64_t m, int64_t n,
+                           const lapack_complex_double* a, int64_t lda,
+                           double* r, double* c, double* rowcnd, double* colcnd,
+                           double* amax );
+
+int64_t LAPACKE_sgeequb_64( int matrix_layout, int64_t m, int64_t n,
+                            const float* a, int64_t lda, float* r, float* c,
+                            float* rowcnd, float* colcnd, float* amax );
+int64_t LAPACKE_dgeequb_64( int matrix_layout, int64_t m, int64_t n,
+                            const double* a, int64_t lda, double* r,
+                            double* c, double* rowcnd, double* colcnd,
+                            double* amax );
+int64_t LAPACKE_cgeequb_64( int matrix_layout, int64_t m, int64_t n,
+                            const lapack_complex_float* a, int64_t lda,
+                            float* r, float* c, float* rowcnd, float* colcnd,
+                            float* amax );
+int64_t LAPACKE_zgeequb_64( int matrix_layout, int64_t m, int64_t n,
+                            const lapack_complex_double* a, int64_t lda,
+                            double* r, double* c, double* rowcnd,
+                            double* colcnd, double* amax );
+
+int64_t LAPACKE_sgees_64( int matrix_layout, char jobvs, char sort,
+                          LAPACK_S_SELECT2 select, int64_t n, float* a,
+                          int64_t lda, int64_t* sdim, float* wr,
+                          float* wi, float* vs, int64_t ldvs );
+int64_t LAPACKE_dgees_64( int matrix_layout, char jobvs, char sort,
+                          LAPACK_D_SELECT2 select, int64_t n, double* a,
+                          int64_t lda, int64_t* sdim, double* wr,
+                          double* wi, double* vs, int64_t ldvs );
+int64_t LAPACKE_cgees_64( int matrix_layout, char jobvs, char sort,
+                          LAPACK_C_SELECT1 select, int64_t n,
+                          lapack_complex_float* a, int64_t lda,
+                          int64_t* sdim, lapack_complex_float* w,
+                          lapack_complex_float* vs, int64_t ldvs );
+int64_t LAPACKE_zgees_64( int matrix_layout, char jobvs, char sort,
+                          LAPACK_Z_SELECT1 select, int64_t n,
+                          lapack_complex_double* a, int64_t lda,
+                          int64_t* sdim, lapack_complex_double* w,
+                          lapack_complex_double* vs, int64_t ldvs );
+
+int64_t LAPACKE_sgeesx_64( int matrix_layout, char jobvs, char sort,
+                           LAPACK_S_SELECT2 select, char sense, int64_t n,
+                           float* a, int64_t lda, int64_t* sdim,
+                           float* wr, float* wi, float* vs, int64_t ldvs,
+                           float* rconde, float* rcondv );
+int64_t LAPACKE_dgeesx_64( int matrix_layout, char jobvs, char sort,
+                           LAPACK_D_SELECT2 select, char sense, int64_t n,
+                           double* a, int64_t lda, int64_t* sdim,
+                           double* wr, double* wi, double* vs, int64_t ldvs,
+                           double* rconde, double* rcondv );
+int64_t LAPACKE_cgeesx_64( int matrix_layout, char jobvs, char sort,
+                           LAPACK_C_SELECT1 select, char sense, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           int64_t* sdim, lapack_complex_float* w,
+                           lapack_complex_float* vs, int64_t ldvs,
+                           float* rconde, float* rcondv );
+int64_t LAPACKE_zgeesx_64( int matrix_layout, char jobvs, char sort,
+                           LAPACK_Z_SELECT1 select, char sense, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           int64_t* sdim, lapack_complex_double* w,
+                           lapack_complex_double* vs, int64_t ldvs,
+                           double* rconde, double* rcondv );
+
+int64_t LAPACKE_sgeev_64( int matrix_layout, char jobvl, char jobvr,
+                          int64_t n, float* a, int64_t lda, float* wr,
+                          float* wi, float* vl, int64_t ldvl, float* vr,
+                          int64_t ldvr );
+int64_t LAPACKE_dgeev_64( int matrix_layout, char jobvl, char jobvr,
+                          int64_t n, double* a, int64_t lda, double* wr,
+                          double* wi, double* vl, int64_t ldvl, double* vr,
+                          int64_t ldvr );
+int64_t LAPACKE_cgeev_64( int matrix_layout, char jobvl, char jobvr,
+                          int64_t n, lapack_complex_float* a, int64_t lda,
+                          lapack_complex_float* w, lapack_complex_float* vl,
+                          int64_t ldvl, lapack_complex_float* vr,
+                          int64_t ldvr );
+int64_t LAPACKE_zgeev_64( int matrix_layout, char jobvl, char jobvr,
+                          int64_t n, lapack_complex_double* a,
+                          int64_t lda, lapack_complex_double* w,
+                          lapack_complex_double* vl, int64_t ldvl,
+                          lapack_complex_double* vr, int64_t ldvr );
+
+int64_t LAPACKE_sgeevx_64( int matrix_layout, char balanc, char jobvl,
+                           char jobvr, char sense, int64_t n, float* a,
+                           int64_t lda, float* wr, float* wi, float* vl,
+                           int64_t ldvl, float* vr, int64_t ldvr,
+                           int64_t* ilo, int64_t* ihi, float* scale,
+                           float* abnrm, float* rconde, float* rcondv );
+int64_t LAPACKE_dgeevx_64( int matrix_layout, char balanc, char jobvl,
+                           char jobvr, char sense, int64_t n, double* a,
+                           int64_t lda, double* wr, double* wi, double* vl,
+                           int64_t ldvl, double* vr, int64_t ldvr,
+                           int64_t* ilo, int64_t* ihi, double* scale,
+                           double* abnrm, double* rconde, double* rcondv );
+int64_t LAPACKE_cgeevx_64( int matrix_layout, char balanc, char jobvl,
+                           char jobvr, char sense, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* w, lapack_complex_float* vl,
+                           int64_t ldvl, lapack_complex_float* vr,
+                           int64_t ldvr, int64_t* ilo, int64_t* ihi,
+                           float* scale, float* abnrm, float* rconde,
+                           float* rcondv );
+int64_t LAPACKE_zgeevx_64( int matrix_layout, char balanc, char jobvl,
+                           char jobvr, char sense, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* w, lapack_complex_double* vl,
+                           int64_t ldvl, lapack_complex_double* vr,
+                           int64_t ldvr, int64_t* ilo, int64_t* ihi,
+                           double* scale, double* abnrm, double* rconde,
+                           double* rcondv );
+
+int64_t LAPACKE_sgehrd_64( int matrix_layout, int64_t n, int64_t ilo,
+                           int64_t ihi, float* a, int64_t lda,
+                           float* tau );
+int64_t LAPACKE_dgehrd_64( int matrix_layout, int64_t n, int64_t ilo,
+                           int64_t ihi, double* a, int64_t lda,
+                           double* tau );
+int64_t LAPACKE_cgehrd_64( int matrix_layout, int64_t n, int64_t ilo,
+                           int64_t ihi, lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* tau );
+int64_t LAPACKE_zgehrd_64( int matrix_layout, int64_t n, int64_t ilo,
+                           int64_t ihi, lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* tau );
+
+int64_t LAPACKE_sgejsv_64( int matrix_layout, char joba, char jobu, char jobv,
+                           char jobr, char jobt, char jobp, int64_t m,
+                           int64_t n, float* a, int64_t lda, float* sva,
+                           float* u, int64_t ldu, float* v, int64_t ldv,
+                           float* stat, int64_t* istat );
+int64_t LAPACKE_dgejsv_64( int matrix_layout, char joba, char jobu, char jobv,
+                           char jobr, char jobt, char jobp, int64_t m,
+                           int64_t n, double* a, int64_t lda, double* sva,
+                           double* u, int64_t ldu, double* v, int64_t ldv,
+                           double* stat, int64_t* istat );
+int64_t LAPACKE_cgejsv_64( int matrix_layout, char joba, char jobu, char jobv,
+                           char jobr, char jobt, char jobp, int64_t m,
+                           int64_t n, lapack_complex_float* a, int64_t lda, float* sva,
+                           lapack_complex_float* u, int64_t ldu, lapack_complex_float* v, int64_t ldv,
+                           float* stat, int64_t* istat );
+int64_t LAPACKE_zgejsv_64( int matrix_layout, char joba, char jobu, char jobv,
+                           char jobr, char jobt, char jobp, int64_t m,
+                           int64_t n, lapack_complex_double* a, int64_t lda, double* sva,
+                           lapack_complex_double* u, int64_t ldu, lapack_complex_double* v, int64_t ldv,
+                           double* stat, int64_t* istat );
+
+int64_t LAPACKE_sgelq2_64( int matrix_layout, int64_t m, int64_t n,
+                           float* a, int64_t lda, float* tau );
+int64_t LAPACKE_dgelq2_64( int matrix_layout, int64_t m, int64_t n,
+                           double* a, int64_t lda, double* tau );
+int64_t LAPACKE_cgelq2_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* tau );
+int64_t LAPACKE_zgelq2_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* tau );
+
+int64_t LAPACKE_sgelqf_64( int matrix_layout, int64_t m, int64_t n,
+                           float* a, int64_t lda, float* tau );
+int64_t LAPACKE_dgelqf_64( int matrix_layout, int64_t m, int64_t n,
+                           double* a, int64_t lda, double* tau );
+int64_t LAPACKE_cgelqf_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* tau );
+int64_t LAPACKE_zgelqf_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* tau );
+
+int64_t LAPACKE_sgels_64( int matrix_layout, char trans, int64_t m,
+                          int64_t n, int64_t nrhs, float* a,
+                          int64_t lda, float* b, int64_t ldb );
+int64_t LAPACKE_dgels_64( int matrix_layout, char trans, int64_t m,
+                          int64_t n, int64_t nrhs, double* a,
+                          int64_t lda, double* b, int64_t ldb );
+int64_t LAPACKE_cgels_64( int matrix_layout, char trans, int64_t m,
+                          int64_t n, int64_t nrhs,
+                          lapack_complex_float* a, int64_t lda,
+                          lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zgels_64( int matrix_layout, char trans, int64_t m,
+                          int64_t n, int64_t nrhs,
+                          lapack_complex_double* a, int64_t lda,
+                          lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_sgelsd_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t nrhs, float* a, int64_t lda, float* b,
+                           int64_t ldb, float* s, float rcond,
+                           int64_t* rank );
+int64_t LAPACKE_dgelsd_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t nrhs, double* a, int64_t lda,
+                           double* b, int64_t ldb, double* s, double rcond,
+                           int64_t* rank );
+int64_t LAPACKE_cgelsd_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t nrhs, lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* b,
+                           int64_t ldb, float* s, float rcond,
+                           int64_t* rank );
+int64_t LAPACKE_zgelsd_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t nrhs, lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* b,
+                           int64_t ldb, double* s, double rcond,
+                           int64_t* rank );
+
+int64_t LAPACKE_sgelss_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t nrhs, float* a, int64_t lda, float* b,
+                           int64_t ldb, float* s, float rcond,
+                           int64_t* rank );
+int64_t LAPACKE_dgelss_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t nrhs, double* a, int64_t lda,
+                           double* b, int64_t ldb, double* s, double rcond,
+                           int64_t* rank );
+int64_t LAPACKE_cgelss_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t nrhs, lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* b,
+                           int64_t ldb, float* s, float rcond,
+                           int64_t* rank );
+int64_t LAPACKE_zgelss_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t nrhs, lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* b,
+                           int64_t ldb, double* s, double rcond,
+                           int64_t* rank );
+
+int64_t LAPACKE_sgelsy_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t nrhs, float* a, int64_t lda, float* b,
+                           int64_t ldb, int64_t* jpvt, float rcond,
+                           int64_t* rank );
+int64_t LAPACKE_dgelsy_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t nrhs, double* a, int64_t lda,
+                           double* b, int64_t ldb, int64_t* jpvt,
+                           double rcond, int64_t* rank );
+int64_t LAPACKE_cgelsy_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t nrhs, lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* b,
+                           int64_t ldb, int64_t* jpvt, float rcond,
+                           int64_t* rank );
+int64_t LAPACKE_zgelsy_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t nrhs, lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* b,
+                           int64_t ldb, int64_t* jpvt, double rcond,
+                           int64_t* rank );
+
+int64_t LAPACKE_sgeqlf_64( int matrix_layout, int64_t m, int64_t n,
+                           float* a, int64_t lda, float* tau );
+int64_t LAPACKE_dgeqlf_64( int matrix_layout, int64_t m, int64_t n,
+                           double* a, int64_t lda, double* tau );
+int64_t LAPACKE_cgeqlf_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* tau );
+int64_t LAPACKE_zgeqlf_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* tau );
+
+int64_t LAPACKE_sgeqp3_64( int matrix_layout, int64_t m, int64_t n,
+                           float* a, int64_t lda, int64_t* jpvt,
+                           float* tau );
+int64_t LAPACKE_dgeqp3_64( int matrix_layout, int64_t m, int64_t n,
+                           double* a, int64_t lda, int64_t* jpvt,
+                           double* tau );
+int64_t LAPACKE_cgeqp3_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           int64_t* jpvt, lapack_complex_float* tau );
+int64_t LAPACKE_zgeqp3_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           int64_t* jpvt, lapack_complex_double* tau );
+
+int64_t LAPACKE_sgeqpf_64( int matrix_layout, int64_t m, int64_t n,
+                           float* a, int64_t lda, int64_t* jpvt,
+                           float* tau );
+int64_t LAPACKE_dgeqpf_64( int matrix_layout, int64_t m, int64_t n,
+                           double* a, int64_t lda, int64_t* jpvt,
+                           double* tau );
+int64_t LAPACKE_cgeqpf_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           int64_t* jpvt, lapack_complex_float* tau );
+int64_t LAPACKE_zgeqpf_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           int64_t* jpvt, lapack_complex_double* tau );
+
+int64_t LAPACKE_sgeqr2_64( int matrix_layout, int64_t m, int64_t n,
+                           float* a, int64_t lda, float* tau );
+int64_t LAPACKE_dgeqr2_64( int matrix_layout, int64_t m, int64_t n,
+                           double* a, int64_t lda, double* tau );
+int64_t LAPACKE_cgeqr2_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* tau );
+int64_t LAPACKE_zgeqr2_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* tau );
+
+int64_t LAPACKE_sgeqrf_64( int matrix_layout, int64_t m, int64_t n,
+                           float* a, int64_t lda, float* tau );
+int64_t LAPACKE_dgeqrf_64( int matrix_layout, int64_t m, int64_t n,
+                           double* a, int64_t lda, double* tau );
+int64_t LAPACKE_cgeqrf_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* tau );
+int64_t LAPACKE_zgeqrf_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* tau );
+
+int64_t LAPACKE_sgeqrfp_64( int matrix_layout, int64_t m, int64_t n,
+                            float* a, int64_t lda, float* tau );
+int64_t LAPACKE_dgeqrfp_64( int matrix_layout, int64_t m, int64_t n,
+                            double* a, int64_t lda, double* tau );
+int64_t LAPACKE_cgeqrfp_64( int matrix_layout, int64_t m, int64_t n,
+                            lapack_complex_float* a, int64_t lda,
+                            lapack_complex_float* tau );
+int64_t LAPACKE_zgeqrfp_64( int matrix_layout, int64_t m, int64_t n,
+                            lapack_complex_double* a, int64_t lda,
+                            lapack_complex_double* tau );
+
+int64_t LAPACKE_sgerfs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t nrhs, const float* a, int64_t lda,
+                           const float* af, int64_t ldaf,
+                           const int64_t* ipiv, const float* b,
+                           int64_t ldb, float* x, int64_t ldx,
+                           float* ferr, float* berr );
+int64_t LAPACKE_dgerfs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t nrhs, const double* a, int64_t lda,
+                           const double* af, int64_t ldaf,
+                           const int64_t* ipiv, const double* b,
+                           int64_t ldb, double* x, int64_t ldx,
+                           double* ferr, double* berr );
+int64_t LAPACKE_cgerfs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* a,
+                           int64_t lda, const lapack_complex_float* af,
+                           int64_t ldaf, const int64_t* ipiv,
+                           const lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx, float* ferr,
+                           float* berr );
+int64_t LAPACKE_zgerfs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* a,
+                           int64_t lda, const lapack_complex_double* af,
+                           int64_t ldaf, const int64_t* ipiv,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* ferr, double* berr );
+
+int64_t LAPACKE_sgerfsx_64( int matrix_layout, char trans, char equed,
+                            int64_t n, int64_t nrhs, const float* a,
+                            int64_t lda, const float* af, int64_t ldaf,
+                            const int64_t* ipiv, const float* r,
+                            const float* c, const float* b, int64_t ldb,
+                            float* x, int64_t ldx, float* rcond, float* berr,
+                            int64_t n_err_bnds, float* err_bnds_norm,
+                            float* err_bnds_comp, int64_t nparams,
+                            float* params );
+int64_t LAPACKE_dgerfsx_64( int matrix_layout, char trans, char equed,
+                            int64_t n, int64_t nrhs, const double* a,
+                            int64_t lda, const double* af, int64_t ldaf,
+                            const int64_t* ipiv, const double* r,
+                            const double* c, const double* b, int64_t ldb,
+                            double* x, int64_t ldx, double* rcond,
+                            double* berr, int64_t n_err_bnds,
+                            double* err_bnds_norm, double* err_bnds_comp,
+                            int64_t nparams, double* params );
+int64_t LAPACKE_cgerfsx_64( int matrix_layout, char trans, char equed,
+                            int64_t n, int64_t nrhs,
+                            const lapack_complex_float* a, int64_t lda,
+                            const lapack_complex_float* af, int64_t ldaf,
+                            const int64_t* ipiv, const float* r,
+                            const float* c, const lapack_complex_float* b,
+                            int64_t ldb, lapack_complex_float* x,
+                            int64_t ldx, float* rcond, float* berr,
+                            int64_t n_err_bnds, float* err_bnds_norm,
+                            float* err_bnds_comp, int64_t nparams,
+                            float* params );
+int64_t LAPACKE_zgerfsx_64( int matrix_layout, char trans, char equed,
+                            int64_t n, int64_t nrhs,
+                            const lapack_complex_double* a, int64_t lda,
+                            const lapack_complex_double* af, int64_t ldaf,
+                            const int64_t* ipiv, const double* r,
+                            const double* c, const lapack_complex_double* b,
+                            int64_t ldb, lapack_complex_double* x,
+                            int64_t ldx, double* rcond, double* berr,
+                            int64_t n_err_bnds, double* err_bnds_norm,
+                            double* err_bnds_comp, int64_t nparams,
+                            double* params );
+
+int64_t LAPACKE_sgerqf_64( int matrix_layout, int64_t m, int64_t n,
+                           float* a, int64_t lda, float* tau );
+int64_t LAPACKE_dgerqf_64( int matrix_layout, int64_t m, int64_t n,
+                           double* a, int64_t lda, double* tau );
+int64_t LAPACKE_cgerqf_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* tau );
+int64_t LAPACKE_zgerqf_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* tau );
+
+int64_t LAPACKE_sgesdd_64( int matrix_layout, char jobz, int64_t m,
+                           int64_t n, float* a, int64_t lda, float* s,
+                           float* u, int64_t ldu, float* vt,
+                           int64_t ldvt );
+int64_t LAPACKE_dgesdd_64( int matrix_layout, char jobz, int64_t m,
+                           int64_t n, double* a, int64_t lda, double* s,
+                           double* u, int64_t ldu, double* vt,
+                           int64_t ldvt );
+int64_t LAPACKE_cgesdd_64( int matrix_layout, char jobz, int64_t m,
+                           int64_t n, lapack_complex_float* a,
+                           int64_t lda, float* s, lapack_complex_float* u,
+                           int64_t ldu, lapack_complex_float* vt,
+                           int64_t ldvt );
+int64_t LAPACKE_zgesdd_64( int matrix_layout, char jobz, int64_t m,
+                           int64_t n, lapack_complex_double* a,
+                           int64_t lda, double* s, lapack_complex_double* u,
+                           int64_t ldu, lapack_complex_double* vt,
+                           int64_t ldvt );
+
+int64_t LAPACKE_sgesv_64( int matrix_layout, int64_t n, int64_t nrhs,
+                          float* a, int64_t lda, int64_t* ipiv, float* b,
+                          int64_t ldb );
+int64_t LAPACKE_dgesv_64( int matrix_layout, int64_t n, int64_t nrhs,
+                          double* a, int64_t lda, int64_t* ipiv,
+                          double* b, int64_t ldb );
+int64_t LAPACKE_cgesv_64( int matrix_layout, int64_t n, int64_t nrhs,
+                          lapack_complex_float* a, int64_t lda,
+                          int64_t* ipiv, lapack_complex_float* b,
+                          int64_t ldb );
+int64_t LAPACKE_zgesv_64( int matrix_layout, int64_t n, int64_t nrhs,
+                          lapack_complex_double* a, int64_t lda,
+                          int64_t* ipiv, lapack_complex_double* b,
+                          int64_t ldb );
+int64_t LAPACKE_dsgesv_64( int matrix_layout, int64_t n, int64_t nrhs,
+                           double* a, int64_t lda, int64_t* ipiv,
+                           const double* b, int64_t ldb, double* x, int64_t ldx,
+                           int64_t* iter );
+int64_t LAPACKE_zcgesv_64( int matrix_layout, int64_t n, int64_t nrhs,
+                           lapack_complex_double* a, int64_t lda,
+                           int64_t* ipiv, const lapack_complex_double* b,
+                           int64_t ldb, lapack_complex_double* x,
+                           int64_t ldx, int64_t* iter );
+
+int64_t LAPACKE_sgesvd_64( int matrix_layout, char jobu, char jobvt,
+                           int64_t m, int64_t n, float* a, int64_t lda,
+                           float* s, float* u, int64_t ldu, float* vt,
+                           int64_t ldvt, float* superb );
+int64_t LAPACKE_dgesvd_64( int matrix_layout, char jobu, char jobvt,
+                           int64_t m, int64_t n, double* a,
+                           int64_t lda, double* s, double* u, int64_t ldu,
+                           double* vt, int64_t ldvt, double* superb );
+int64_t LAPACKE_cgesvd_64( int matrix_layout, char jobu, char jobvt,
+                           int64_t m, int64_t n, lapack_complex_float* a,
+                           int64_t lda, float* s, lapack_complex_float* u,
+                           int64_t ldu, lapack_complex_float* vt,
+                           int64_t ldvt, float* superb );
+int64_t LAPACKE_zgesvd_64( int matrix_layout, char jobu, char jobvt,
+                           int64_t m, int64_t n, lapack_complex_double* a,
+                           int64_t lda, double* s, lapack_complex_double* u,
+                           int64_t ldu, lapack_complex_double* vt,
+                           int64_t ldvt, double* superb );
+
+int64_t LAPACKE_sgesvdx_64( int matrix_layout, char jobu, char jobvt, char range,
+                           int64_t m, int64_t n, float* a,
+                           int64_t lda, float vl, float vu,
+                           int64_t il, int64_t iu, int64_t* ns,
+                           float* s, float* u, int64_t ldu,
+                           float* vt, int64_t ldvt,
+                           int64_t* superb );
+int64_t LAPACKE_dgesvdx_64( int matrix_layout, char jobu, char jobvt, char range,
+                           int64_t m, int64_t n, double* a,
+                           int64_t lda, double vl, double vu,
+                           int64_t il, int64_t iu, int64_t* ns,
+                           double* s, double* u, int64_t ldu,
+                           double* vt, int64_t ldvt,
+                           int64_t* superb );
+int64_t LAPACKE_cgesvdx_64( int matrix_layout, char jobu, char jobvt, char range,
+                           int64_t m, int64_t n, lapack_complex_float* a,
+                           int64_t lda, float vl, float vu,
+                           int64_t il, int64_t iu, int64_t* ns,
+                           float* s, lapack_complex_float* u, int64_t ldu,
+                           lapack_complex_float* vt, int64_t ldvt,
+                           int64_t* superb );
+int64_t LAPACKE_zgesvdx_64( int matrix_layout, char jobu, char jobvt, char range,
+                           int64_t m, int64_t n, lapack_complex_double* a,
+                           int64_t lda, double vl, double vu,
+                           int64_t il, int64_t iu, int64_t* ns,
+                           double* s, lapack_complex_double* u, int64_t ldu,
+                           lapack_complex_double* vt, int64_t ldvt,
+                           int64_t* superb );
+
+int64_t LAPACKE_sgesvdq_64( int matrix_layout, char joba, char jobp, char jobr, char jobu, char jobv,
+                           int64_t m, int64_t n, float* a, int64_t lda,
+                           float* s, float* u, int64_t ldu, float* v,
+                           int64_t ldv, int64_t* numrank );
+int64_t LAPACKE_dgesvdq_64( int matrix_layout, char joba, char jobp, char jobr, char jobu, char jobv,
+                           int64_t m, int64_t n, double* a,
+                           int64_t lda, double* s, double* u, int64_t ldu,
+                           double* v, int64_t ldv, int64_t* numrank);
+int64_t LAPACKE_cgesvdq_64( int matrix_layout, char joba, char jobp, char jobr, char jobu, char jobv,
+                           int64_t m, int64_t n, lapack_complex_float* a,
+                           int64_t lda, float* s, lapack_complex_float* u,
+                           int64_t ldu, lapack_complex_float* v,
+                           int64_t ldv, int64_t* numrank );
+int64_t LAPACKE_zgesvdq_64( int matrix_layout, char joba, char jobp, char jobr, char jobu, char jobv,
+                           int64_t m, int64_t n, lapack_complex_double* a,
+                           int64_t lda, double* s, lapack_complex_double* u,
+                           int64_t ldu, lapack_complex_double* v,
+                           int64_t ldv, int64_t* numrank );
+
+int64_t LAPACKE_sgesvj_64( int matrix_layout, char joba, char jobu, char jobv,
+                           int64_t m, int64_t n, float* a, int64_t lda,
+                           float* sva, int64_t mv, float* v, int64_t ldv,
+                           float* stat );
+int64_t LAPACKE_dgesvj_64( int matrix_layout, char joba, char jobu, char jobv,
+                           int64_t m, int64_t n, double* a,
+                           int64_t lda, double* sva, int64_t mv,
+                           double* v, int64_t ldv, double* stat );
+int64_t LAPACKE_cgesvj_64( int matrix_layout, char joba, char jobu, char jobv,
+                           int64_t m, int64_t n, lapack_complex_float* a,
+                           int64_t lda, float* sva, int64_t mv,
+                           lapack_complex_float* v, int64_t ldv, float* stat );
+int64_t LAPACKE_zgesvj_64( int matrix_layout, char joba, char jobu, char jobv,
+                           int64_t m, int64_t n, lapack_complex_double* a,
+                           int64_t lda, double* sva, int64_t mv,
+                           lapack_complex_double* v, int64_t ldv, double* stat );
+
+int64_t LAPACKE_sgesvx_64( int matrix_layout, char fact, char trans,
+                           int64_t n, int64_t nrhs, float* a,
+                           int64_t lda, float* af, int64_t ldaf,
+                           int64_t* ipiv, char* equed, float* r, float* c,
+                           float* b, int64_t ldb, float* x, int64_t ldx,
+                           float* rcond, float* ferr, float* berr,
+                           float* rpivot );
+int64_t LAPACKE_dgesvx_64( int matrix_layout, char fact, char trans,
+                           int64_t n, int64_t nrhs, double* a,
+                           int64_t lda, double* af, int64_t ldaf,
+                           int64_t* ipiv, char* equed, double* r, double* c,
+                           double* b, int64_t ldb, double* x, int64_t ldx,
+                           double* rcond, double* ferr, double* berr,
+                           double* rpivot );
+int64_t LAPACKE_cgesvx_64( int matrix_layout, char fact, char trans,
+                           int64_t n, int64_t nrhs,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* af, int64_t ldaf,
+                           int64_t* ipiv, char* equed, float* r, float* c,
+                           lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx,
+                           float* rcond, float* ferr, float* berr,
+                           float* rpivot );
+int64_t LAPACKE_zgesvx_64( int matrix_layout, char fact, char trans,
+                           int64_t n, int64_t nrhs,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* af, int64_t ldaf,
+                           int64_t* ipiv, char* equed, double* r, double* c,
+                           lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* rcond, double* ferr, double* berr,
+                           double* rpivot );
+
+int64_t LAPACKE_sgesvxx_64( int matrix_layout, char fact, char trans,
+                            int64_t n, int64_t nrhs, float* a,
+                            int64_t lda, float* af, int64_t ldaf,
+                            int64_t* ipiv, char* equed, float* r, float* c,
+                            float* b, int64_t ldb, float* x, int64_t ldx,
+                            float* rcond, float* rpvgrw, float* berr,
+                            int64_t n_err_bnds, float* err_bnds_norm,
+                            float* err_bnds_comp, int64_t nparams,
+                            float* params );
+int64_t LAPACKE_dgesvxx_64( int matrix_layout, char fact, char trans,
+                            int64_t n, int64_t nrhs, double* a,
+                            int64_t lda, double* af, int64_t ldaf,
+                            int64_t* ipiv, char* equed, double* r, double* c,
+                            double* b, int64_t ldb, double* x,
+                            int64_t ldx, double* rcond, double* rpvgrw,
+                            double* berr, int64_t n_err_bnds,
+                            double* err_bnds_norm, double* err_bnds_comp,
+                            int64_t nparams, double* params );
+int64_t LAPACKE_cgesvxx_64( int matrix_layout, char fact, char trans,
+                            int64_t n, int64_t nrhs,
+                            lapack_complex_float* a, int64_t lda,
+                            lapack_complex_float* af, int64_t ldaf,
+                            int64_t* ipiv, char* equed, float* r, float* c,
+                            lapack_complex_float* b, int64_t ldb,
+                            lapack_complex_float* x, int64_t ldx,
+                            float* rcond, float* rpvgrw, float* berr,
+                            int64_t n_err_bnds, float* err_bnds_norm,
+                            float* err_bnds_comp, int64_t nparams,
+                            float* params );
+int64_t LAPACKE_zgesvxx_64( int matrix_layout, char fact, char trans,
+                            int64_t n, int64_t nrhs,
+                            lapack_complex_double* a, int64_t lda,
+                            lapack_complex_double* af, int64_t ldaf,
+                            int64_t* ipiv, char* equed, double* r, double* c,
+                            lapack_complex_double* b, int64_t ldb,
+                            lapack_complex_double* x, int64_t ldx,
+                            double* rcond, double* rpvgrw, double* berr,
+                            int64_t n_err_bnds, double* err_bnds_norm,
+                            double* err_bnds_comp, int64_t nparams,
+                            double* params );
+
+int64_t LAPACKE_sgetf2_64( int matrix_layout, int64_t m, int64_t n,
+                           float* a, int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_dgetf2_64( int matrix_layout, int64_t m, int64_t n,
+                           double* a, int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_cgetf2_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           int64_t* ipiv );
+int64_t LAPACKE_zgetf2_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           int64_t* ipiv );
+
+int64_t LAPACKE_sgetrf_64( int matrix_layout, int64_t m, int64_t n,
+                           float* a, int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_dgetrf_64( int matrix_layout, int64_t m, int64_t n,
+                           double* a, int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_cgetrf_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           int64_t* ipiv );
+int64_t LAPACKE_zgetrf_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           int64_t* ipiv );
+
+int64_t LAPACKE_sgetrf2_64( int matrix_layout, int64_t m, int64_t n,
+                           float* a, int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_dgetrf2_64( int matrix_layout, int64_t m, int64_t n,
+                           double* a, int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_cgetrf2_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           int64_t* ipiv );
+int64_t LAPACKE_zgetrf2_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           int64_t* ipiv );
+
+int64_t LAPACKE_sgetri_64( int matrix_layout, int64_t n, float* a,
+                           int64_t lda, const int64_t* ipiv );
+int64_t LAPACKE_dgetri_64( int matrix_layout, int64_t n, double* a,
+                           int64_t lda, const int64_t* ipiv );
+int64_t LAPACKE_cgetri_64( int matrix_layout, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           const int64_t* ipiv );
+int64_t LAPACKE_zgetri_64( int matrix_layout, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           const int64_t* ipiv );
+
+int64_t LAPACKE_sgetrs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t nrhs, const float* a, int64_t lda,
+                           const int64_t* ipiv, float* b, int64_t ldb );
+int64_t LAPACKE_dgetrs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t nrhs, const double* a, int64_t lda,
+                           const int64_t* ipiv, double* b, int64_t ldb );
+int64_t LAPACKE_cgetrs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* a,
+                           int64_t lda, const int64_t* ipiv,
+                           lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zgetrs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* a,
+                           int64_t lda, const int64_t* ipiv,
+                           lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_sggbak_64( int matrix_layout, char job, char side, int64_t n,
+                           int64_t ilo, int64_t ihi, const float* lscale,
+                           const float* rscale, int64_t m, float* v,
+                           int64_t ldv );
+int64_t LAPACKE_dggbak_64( int matrix_layout, char job, char side, int64_t n,
+                           int64_t ilo, int64_t ihi, const double* lscale,
+                           const double* rscale, int64_t m, double* v,
+                           int64_t ldv );
+int64_t LAPACKE_cggbak_64( int matrix_layout, char job, char side, int64_t n,
+                           int64_t ilo, int64_t ihi, const float* lscale,
+                           const float* rscale, int64_t m,
+                           lapack_complex_float* v, int64_t ldv );
+int64_t LAPACKE_zggbak_64( int matrix_layout, char job, char side, int64_t n,
+                           int64_t ilo, int64_t ihi, const double* lscale,
+                           const double* rscale, int64_t m,
+                           lapack_complex_double* v, int64_t ldv );
+
+int64_t LAPACKE_sggbal_64( int matrix_layout, char job, int64_t n, float* a,
+                           int64_t lda, float* b, int64_t ldb,
+                           int64_t* ilo, int64_t* ihi, float* lscale,
+                           float* rscale );
+int64_t LAPACKE_dggbal_64( int matrix_layout, char job, int64_t n, double* a,
+                           int64_t lda, double* b, int64_t ldb,
+                           int64_t* ilo, int64_t* ihi, double* lscale,
+                           double* rscale );
+int64_t LAPACKE_cggbal_64( int matrix_layout, char job, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* b, int64_t ldb,
+                           int64_t* ilo, int64_t* ihi, float* lscale,
+                           float* rscale );
+int64_t LAPACKE_zggbal_64( int matrix_layout, char job, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* b, int64_t ldb,
+                           int64_t* ilo, int64_t* ihi, double* lscale,
+                           double* rscale );
+
+int64_t LAPACKE_sgges_64( int matrix_layout, char jobvsl, char jobvsr, char sort,
+                          LAPACK_S_SELECT3 selctg, int64_t n, float* a,
+                          int64_t lda, float* b, int64_t ldb,
+                          int64_t* sdim, float* alphar, float* alphai,
+                          float* beta, float* vsl, int64_t ldvsl, float* vsr,
+                          int64_t ldvsr );
+int64_t LAPACKE_dgges_64( int matrix_layout, char jobvsl, char jobvsr, char sort,
+                          LAPACK_D_SELECT3 selctg, int64_t n, double* a,
+                          int64_t lda, double* b, int64_t ldb,
+                          int64_t* sdim, double* alphar, double* alphai,
+                          double* beta, double* vsl, int64_t ldvsl,
+                          double* vsr, int64_t ldvsr );
+int64_t LAPACKE_cgges_64( int matrix_layout, char jobvsl, char jobvsr, char sort,
+                          LAPACK_C_SELECT2 selctg, int64_t n,
+                          lapack_complex_float* a, int64_t lda,
+                          lapack_complex_float* b, int64_t ldb,
+                          int64_t* sdim, lapack_complex_float* alpha,
+                          lapack_complex_float* beta, lapack_complex_float* vsl,
+                          int64_t ldvsl, lapack_complex_float* vsr,
+                          int64_t ldvsr );
+int64_t LAPACKE_zgges_64( int matrix_layout, char jobvsl, char jobvsr, char sort,
+                          LAPACK_Z_SELECT2 selctg, int64_t n,
+                          lapack_complex_double* a, int64_t lda,
+                          lapack_complex_double* b, int64_t ldb,
+                          int64_t* sdim, lapack_complex_double* alpha,
+                          lapack_complex_double* beta,
+                          lapack_complex_double* vsl, int64_t ldvsl,
+                          lapack_complex_double* vsr, int64_t ldvsr );
+
+int64_t LAPACKE_sgges3_64( int matrix_layout, char jobvsl, char jobvsr,
+                           char sort, LAPACK_S_SELECT3 selctg, int64_t n,
+                           float* a, int64_t lda, float* b, int64_t ldb,
+                           int64_t* sdim, float* alphar, float* alphai,
+                           float* beta, float* vsl, int64_t ldvsl,
+                           float* vsr, int64_t ldvsr );
+int64_t LAPACKE_dgges3_64( int matrix_layout, char jobvsl, char jobvsr,
+                           char sort, LAPACK_D_SELECT3 selctg, int64_t n,
+                           double* a, int64_t lda, double* b, int64_t ldb,
+                           int64_t* sdim, double* alphar, double* alphai,
+                           double* beta, double* vsl, int64_t ldvsl,
+                           double* vsr, int64_t ldvsr );
+int64_t LAPACKE_cgges3_64( int matrix_layout, char jobvsl, char jobvsr,
+                           char sort, LAPACK_C_SELECT2 selctg, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* b, int64_t ldb,
+                           int64_t* sdim, lapack_complex_float* alpha,
+                           lapack_complex_float* beta,
+                           lapack_complex_float* vsl, int64_t ldvsl,
+                           lapack_complex_float* vsr, int64_t ldvsr );
+int64_t LAPACKE_zgges3_64( int matrix_layout, char jobvsl, char jobvsr,
+                           char sort, LAPACK_Z_SELECT2 selctg, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* b, int64_t ldb,
+                           int64_t* sdim, lapack_complex_double* alpha,
+                           lapack_complex_double* beta,
+                           lapack_complex_double* vsl, int64_t ldvsl,
+                           lapack_complex_double* vsr, int64_t ldvsr );
+
+int64_t LAPACKE_sggesx_64( int matrix_layout, char jobvsl, char jobvsr,
+                           char sort, LAPACK_S_SELECT3 selctg, char sense,
+                           int64_t n, float* a, int64_t lda, float* b,
+                           int64_t ldb, int64_t* sdim, float* alphar,
+                           float* alphai, float* beta, float* vsl,
+                           int64_t ldvsl, float* vsr, int64_t ldvsr,
+                           float* rconde, float* rcondv );
+int64_t LAPACKE_dggesx_64( int matrix_layout, char jobvsl, char jobvsr,
+                           char sort, LAPACK_D_SELECT3 selctg, char sense,
+                           int64_t n, double* a, int64_t lda, double* b,
+                           int64_t ldb, int64_t* sdim, double* alphar,
+                           double* alphai, double* beta, double* vsl,
+                           int64_t ldvsl, double* vsr, int64_t ldvsr,
+                           double* rconde, double* rcondv );
+int64_t LAPACKE_cggesx_64( int matrix_layout, char jobvsl, char jobvsr,
+                           char sort, LAPACK_C_SELECT2 selctg, char sense,
+                           int64_t n, lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* b,
+                           int64_t ldb, int64_t* sdim,
+                           lapack_complex_float* alpha,
+                           lapack_complex_float* beta,
+                           lapack_complex_float* vsl, int64_t ldvsl,
+                           lapack_complex_float* vsr, int64_t ldvsr,
+                           float* rconde, float* rcondv );
+int64_t LAPACKE_zggesx_64( int matrix_layout, char jobvsl, char jobvsr,
+                           char sort, LAPACK_Z_SELECT2 selctg, char sense,
+                           int64_t n, lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* b,
+                           int64_t ldb, int64_t* sdim,
+                           lapack_complex_double* alpha,
+                           lapack_complex_double* beta,
+                           lapack_complex_double* vsl, int64_t ldvsl,
+                           lapack_complex_double* vsr, int64_t ldvsr,
+                           double* rconde, double* rcondv );
+
+int64_t LAPACKE_sggev_64( int matrix_layout, char jobvl, char jobvr,
+                          int64_t n, float* a, int64_t lda, float* b,
+                          int64_t ldb, float* alphar, float* alphai,
+                          float* beta, float* vl, int64_t ldvl, float* vr,
+                          int64_t ldvr );
+int64_t LAPACKE_dggev_64( int matrix_layout, char jobvl, char jobvr,
+                          int64_t n, double* a, int64_t lda, double* b,
+                          int64_t ldb, double* alphar, double* alphai,
+                          double* beta, double* vl, int64_t ldvl, double* vr,
+                          int64_t ldvr );
+int64_t LAPACKE_cggev_64( int matrix_layout, char jobvl, char jobvr,
+                          int64_t n, lapack_complex_float* a, int64_t lda,
+                          lapack_complex_float* b, int64_t ldb,
+                          lapack_complex_float* alpha,
+                          lapack_complex_float* beta, lapack_complex_float* vl,
+                          int64_t ldvl, lapack_complex_float* vr,
+                          int64_t ldvr );
+int64_t LAPACKE_zggev_64( int matrix_layout, char jobvl, char jobvr,
+                          int64_t n, lapack_complex_double* a,
+                          int64_t lda, lapack_complex_double* b,
+                          int64_t ldb, lapack_complex_double* alpha,
+                          lapack_complex_double* beta,
+                          lapack_complex_double* vl, int64_t ldvl,
+                          lapack_complex_double* vr, int64_t ldvr );
+
+int64_t LAPACKE_sggev3_64( int matrix_layout, char jobvl, char jobvr,
+                           int64_t n, float* a, int64_t lda,
+                           float* b, int64_t ldb,
+                           float* alphar, float* alphai, float* beta,
+                           float* vl, int64_t ldvl,
+                           float* vr, int64_t ldvr );
+int64_t LAPACKE_dggev3_64( int matrix_layout, char jobvl, char jobvr,
+                           int64_t n, double* a, int64_t lda,
+                           double* b, int64_t ldb,
+                           double* alphar, double* alphai, double* beta,
+                           double* vl, int64_t ldvl,
+                           double* vr, int64_t ldvr );
+int64_t LAPACKE_cggev3_64( int matrix_layout, char jobvl, char jobvr,
+                           int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* alpha,
+                           lapack_complex_float* beta,
+                           lapack_complex_float* vl, int64_t ldvl,
+                           lapack_complex_float* vr, int64_t ldvr );
+int64_t LAPACKE_zggev3_64( int matrix_layout, char jobvl, char jobvr,
+                           int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* alpha,
+                           lapack_complex_double* beta,
+                           lapack_complex_double* vl, int64_t ldvl,
+                           lapack_complex_double* vr, int64_t ldvr );
+
+int64_t LAPACKE_sggevx_64( int matrix_layout, char balanc, char jobvl,
+                           char jobvr, char sense, int64_t n, float* a,
+                           int64_t lda, float* b, int64_t ldb,
+                           float* alphar, float* alphai, float* beta, float* vl,
+                           int64_t ldvl, float* vr, int64_t ldvr,
+                           int64_t* ilo, int64_t* ihi, float* lscale,
+                           float* rscale, float* abnrm, float* bbnrm,
+                           float* rconde, float* rcondv );
+int64_t LAPACKE_dggevx_64( int matrix_layout, char balanc, char jobvl,
+                           char jobvr, char sense, int64_t n, double* a,
+                           int64_t lda, double* b, int64_t ldb,
+                           double* alphar, double* alphai, double* beta,
+                           double* vl, int64_t ldvl, double* vr,
+                           int64_t ldvr, int64_t* ilo, int64_t* ihi,
+                           double* lscale, double* rscale, double* abnrm,
+                           double* bbnrm, double* rconde, double* rcondv );
+int64_t LAPACKE_cggevx_64( int matrix_layout, char balanc, char jobvl,
+                           char jobvr, char sense, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* alpha,
+                           lapack_complex_float* beta, lapack_complex_float* vl,
+                           int64_t ldvl, lapack_complex_float* vr,
+                           int64_t ldvr, int64_t* ilo, int64_t* ihi,
+                           float* lscale, float* rscale, float* abnrm,
+                           float* bbnrm, float* rconde, float* rcondv );
+int64_t LAPACKE_zggevx_64( int matrix_layout, char balanc, char jobvl,
+                           char jobvr, char sense, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* alpha,
+                           lapack_complex_double* beta,
+                           lapack_complex_double* vl, int64_t ldvl,
+                           lapack_complex_double* vr, int64_t ldvr,
+                           int64_t* ilo, int64_t* ihi, double* lscale,
+                           double* rscale, double* abnrm, double* bbnrm,
+                           double* rconde, double* rcondv );
+
+int64_t LAPACKE_sggglm_64( int matrix_layout, int64_t n, int64_t m,
+                           int64_t p, float* a, int64_t lda, float* b,
+                           int64_t ldb, float* d, float* x, float* y );
+int64_t LAPACKE_dggglm_64( int matrix_layout, int64_t n, int64_t m,
+                           int64_t p, double* a, int64_t lda, double* b,
+                           int64_t ldb, double* d, double* x, double* y );
+int64_t LAPACKE_cggglm_64( int matrix_layout, int64_t n, int64_t m,
+                           int64_t p, lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* b,
+                           int64_t ldb, lapack_complex_float* d,
+                           lapack_complex_float* x, lapack_complex_float* y );
+int64_t LAPACKE_zggglm_64( int matrix_layout, int64_t n, int64_t m,
+                           int64_t p, lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* b,
+                           int64_t ldb, lapack_complex_double* d,
+                           lapack_complex_double* x, lapack_complex_double* y );
+
+int64_t LAPACKE_sgghrd_64( int matrix_layout, char compq, char compz,
+                           int64_t n, int64_t ilo, int64_t ihi,
+                           float* a, int64_t lda, float* b, int64_t ldb,
+                           float* q, int64_t ldq, float* z, int64_t ldz );
+int64_t LAPACKE_dgghrd_64( int matrix_layout, char compq, char compz,
+                           int64_t n, int64_t ilo, int64_t ihi,
+                           double* a, int64_t lda, double* b, int64_t ldb,
+                           double* q, int64_t ldq, double* z,
+                           int64_t ldz );
+int64_t LAPACKE_cgghrd_64( int matrix_layout, char compq, char compz,
+                           int64_t n, int64_t ilo, int64_t ihi,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* q, int64_t ldq,
+                           lapack_complex_float* z, int64_t ldz );
+int64_t LAPACKE_zgghrd_64( int matrix_layout, char compq, char compz,
+                           int64_t n, int64_t ilo, int64_t ihi,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* q, int64_t ldq,
+                           lapack_complex_double* z, int64_t ldz );
+
+int64_t LAPACKE_sgghd3_64( int matrix_layout, char compq, char compz,
+                           int64_t n, int64_t ilo, int64_t ihi,
+                           float* a, int64_t lda, float* b, int64_t ldb,
+                           float* q, int64_t ldq, float* z, int64_t ldz );
+int64_t LAPACKE_dgghd3_64( int matrix_layout, char compq, char compz,
+                           int64_t n, int64_t ilo, int64_t ihi,
+                           double* a, int64_t lda, double* b, int64_t ldb,
+                           double* q, int64_t ldq, double* z,
+                           int64_t ldz );
+int64_t LAPACKE_cgghd3_64( int matrix_layout, char compq, char compz,
+                           int64_t n, int64_t ilo, int64_t ihi,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* q, int64_t ldq,
+                           lapack_complex_float* z, int64_t ldz );
+int64_t LAPACKE_zgghd3_64( int matrix_layout, char compq, char compz,
+                           int64_t n, int64_t ilo, int64_t ihi,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* q, int64_t ldq,
+                           lapack_complex_double* z, int64_t ldz );
+
+int64_t LAPACKE_sgglse_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t p, float* a, int64_t lda, float* b,
+                           int64_t ldb, float* c, float* d, float* x );
+int64_t LAPACKE_dgglse_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t p, double* a, int64_t lda, double* b,
+                           int64_t ldb, double* c, double* d, double* x );
+int64_t LAPACKE_cgglse_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t p, lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* b,
+                           int64_t ldb, lapack_complex_float* c,
+                           lapack_complex_float* d, lapack_complex_float* x );
+int64_t LAPACKE_zgglse_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t p, lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* b,
+                           int64_t ldb, lapack_complex_double* c,
+                           lapack_complex_double* d, lapack_complex_double* x );
+
+int64_t LAPACKE_sggqrf_64( int matrix_layout, int64_t n, int64_t m,
+                           int64_t p, float* a, int64_t lda, float* taua,
+                           float* b, int64_t ldb, float* taub );
+int64_t LAPACKE_dggqrf_64( int matrix_layout, int64_t n, int64_t m,
+                           int64_t p, double* a, int64_t lda,
+                           double* taua, double* b, int64_t ldb,
+                           double* taub );
+int64_t LAPACKE_cggqrf_64( int matrix_layout, int64_t n, int64_t m,
+                           int64_t p, lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* taua,
+                           lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* taub );
+int64_t LAPACKE_zggqrf_64( int matrix_layout, int64_t n, int64_t m,
+                           int64_t p, lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* taua,
+                           lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* taub );
+
+int64_t LAPACKE_sggrqf_64( int matrix_layout, int64_t m, int64_t p,
+                           int64_t n, float* a, int64_t lda, float* taua,
+                           float* b, int64_t ldb, float* taub );
+int64_t LAPACKE_dggrqf_64( int matrix_layout, int64_t m, int64_t p,
+                           int64_t n, double* a, int64_t lda,
+                           double* taua, double* b, int64_t ldb,
+                           double* taub );
+int64_t LAPACKE_cggrqf_64( int matrix_layout, int64_t m, int64_t p,
+                           int64_t n, lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* taua,
+                           lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* taub );
+int64_t LAPACKE_zggrqf_64( int matrix_layout, int64_t m, int64_t p,
+                           int64_t n, lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* taua,
+                           lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* taub );
+
+int64_t LAPACKE_sggsvd_64( int matrix_layout, char jobu, char jobv, char jobq,
+                           int64_t m, int64_t n, int64_t p,
+                           int64_t* k, int64_t* l, float* a,
+                           int64_t lda, float* b, int64_t ldb,
+                           float* alpha, float* beta, float* u, int64_t ldu,
+                           float* v, int64_t ldv, float* q, int64_t ldq,
+                           int64_t* iwork );
+int64_t LAPACKE_dggsvd_64( int matrix_layout, char jobu, char jobv, char jobq,
+                           int64_t m, int64_t n, int64_t p,
+                           int64_t* k, int64_t* l, double* a,
+                           int64_t lda, double* b, int64_t ldb,
+                           double* alpha, double* beta, double* u,
+                           int64_t ldu, double* v, int64_t ldv, double* q,
+                           int64_t ldq, int64_t* iwork );
+int64_t LAPACKE_cggsvd_64( int matrix_layout, char jobu, char jobv, char jobq,
+                           int64_t m, int64_t n, int64_t p,
+                           int64_t* k, int64_t* l,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* b, int64_t ldb,
+                           float* alpha, float* beta, lapack_complex_float* u,
+                           int64_t ldu, lapack_complex_float* v,
+                           int64_t ldv, lapack_complex_float* q,
+                           int64_t ldq, int64_t* iwork );
+int64_t LAPACKE_zggsvd_64( int matrix_layout, char jobu, char jobv, char jobq,
+                           int64_t m, int64_t n, int64_t p,
+                           int64_t* k, int64_t* l,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* b, int64_t ldb,
+                           double* alpha, double* beta,
+                           lapack_complex_double* u, int64_t ldu,
+                           lapack_complex_double* v, int64_t ldv,
+                           lapack_complex_double* q, int64_t ldq,
+                           int64_t* iwork );
+
+int64_t LAPACKE_sggsvd3_64( int matrix_layout, char jobu, char jobv, char jobq,
+                            int64_t m, int64_t n, int64_t p,
+                            int64_t* k, int64_t* l, float* a,
+                            int64_t lda, float* b, int64_t ldb,
+                            float* alpha, float* beta, float* u, int64_t ldu,
+                            float* v, int64_t ldv, float* q, int64_t ldq,
+                            int64_t* iwork );
+int64_t LAPACKE_dggsvd3_64( int matrix_layout, char jobu, char jobv, char jobq,
+                            int64_t m, int64_t n, int64_t p,
+                            int64_t* k, int64_t* l, double* a,
+                            int64_t lda, double* b, int64_t ldb,
+                            double* alpha, double* beta, double* u,
+                            int64_t ldu, double* v, int64_t ldv, double* q,
+                            int64_t ldq, int64_t* iwork );
+int64_t LAPACKE_cggsvd3_64( int matrix_layout, char jobu, char jobv, char jobq,
+                            int64_t m, int64_t n, int64_t p,
+                            int64_t* k, int64_t* l,
+                            lapack_complex_float* a, int64_t lda,
+                            lapack_complex_float* b, int64_t ldb,
+                            float* alpha, float* beta, lapack_complex_float* u,
+                            int64_t ldu, lapack_complex_float* v,
+                            int64_t ldv, lapack_complex_float* q,
+                            int64_t ldq, int64_t* iwork );
+int64_t LAPACKE_zggsvd3_64( int matrix_layout, char jobu, char jobv, char jobq,
+                            int64_t m, int64_t n, int64_t p,
+                            int64_t* k, int64_t* l,
+                            lapack_complex_double* a, int64_t lda,
+                            lapack_complex_double* b, int64_t ldb,
+                            double* alpha, double* beta,
+                            lapack_complex_double* u, int64_t ldu,
+                            lapack_complex_double* v, int64_t ldv,
+                            lapack_complex_double* q, int64_t ldq,
+                            int64_t* iwork );
+
+int64_t LAPACKE_sggsvp_64( int matrix_layout, char jobu, char jobv, char jobq,
+                           int64_t m, int64_t p, int64_t n, float* a,
+                           int64_t lda, float* b, int64_t ldb, float tola,
+                           float tolb, int64_t* k, int64_t* l, float* u,
+                           int64_t ldu, float* v, int64_t ldv, float* q,
+                           int64_t ldq );
+int64_t LAPACKE_dggsvp_64( int matrix_layout, char jobu, char jobv, char jobq,
+                           int64_t m, int64_t p, int64_t n, double* a,
+                           int64_t lda, double* b, int64_t ldb,
+                           double tola, double tolb, int64_t* k,
+                           int64_t* l, double* u, int64_t ldu, double* v,
+                           int64_t ldv, double* q, int64_t ldq );
+int64_t LAPACKE_cggsvp_64( int matrix_layout, char jobu, char jobv, char jobq,
+                           int64_t m, int64_t p, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* b, int64_t ldb, float tola,
+                           float tolb, int64_t* k, int64_t* l,
+                           lapack_complex_float* u, int64_t ldu,
+                           lapack_complex_float* v, int64_t ldv,
+                           lapack_complex_float* q, int64_t ldq );
+int64_t LAPACKE_zggsvp_64( int matrix_layout, char jobu, char jobv, char jobq,
+                           int64_t m, int64_t p, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* b, int64_t ldb,
+                           double tola, double tolb, int64_t* k,
+                           int64_t* l, lapack_complex_double* u,
+                           int64_t ldu, lapack_complex_double* v,
+                           int64_t ldv, lapack_complex_double* q,
+                           int64_t ldq );
+
+int64_t LAPACKE_sggsvp3_64( int matrix_layout, char jobu, char jobv, char jobq,
+                            int64_t m, int64_t p, int64_t n, float* a,
+                            int64_t lda, float* b, int64_t ldb, float tola,
+                            float tolb, int64_t* k, int64_t* l, float* u,
+                            int64_t ldu, float* v, int64_t ldv, float* q,
+                            int64_t ldq );
+int64_t LAPACKE_dggsvp3_64( int matrix_layout, char jobu, char jobv, char jobq,
+                            int64_t m, int64_t p, int64_t n, double* a,
+                            int64_t lda, double* b, int64_t ldb,
+                            double tola, double tolb, int64_t* k,
+                            int64_t* l, double* u, int64_t ldu, double* v,
+                            int64_t ldv, double* q, int64_t ldq );
+int64_t LAPACKE_cggsvp3_64( int matrix_layout, char jobu, char jobv, char jobq,
+                            int64_t m, int64_t p, int64_t n,
+                            lapack_complex_float* a, int64_t lda,
+                            lapack_complex_float* b, int64_t ldb, float tola,
+                            float tolb, int64_t* k, int64_t* l,
+                            lapack_complex_float* u, int64_t ldu,
+                            lapack_complex_float* v, int64_t ldv,
+                            lapack_complex_float* q, int64_t ldq );
+int64_t LAPACKE_zggsvp3_64( int matrix_layout, char jobu, char jobv, char jobq,
+                            int64_t m, int64_t p, int64_t n,
+                            lapack_complex_double* a, int64_t lda,
+                            lapack_complex_double* b, int64_t ldb,
+                            double tola, double tolb, int64_t* k,
+                            int64_t* l, lapack_complex_double* u,
+                            int64_t ldu, lapack_complex_double* v,
+                            int64_t ldv, lapack_complex_double* q,
+                            int64_t ldq );
+
+int64_t LAPACKE_sgtcon_64( char norm, int64_t n, const float* dl,
+                           const float* d, const float* du, const float* du2,
+                           const int64_t* ipiv, float anorm, float* rcond );
+int64_t LAPACKE_dgtcon_64( char norm, int64_t n, const double* dl,
+                           const double* d, const double* du, const double* du2,
+                           const int64_t* ipiv, double anorm,
+                           double* rcond );
+int64_t LAPACKE_cgtcon_64( char norm, int64_t n,
+                           const lapack_complex_float* dl,
+                           const lapack_complex_float* d,
+                           const lapack_complex_float* du,
+                           const lapack_complex_float* du2,
+                           const int64_t* ipiv, float anorm, float* rcond );
+int64_t LAPACKE_zgtcon_64( char norm, int64_t n,
+                           const lapack_complex_double* dl,
+                           const lapack_complex_double* d,
+                           const lapack_complex_double* du,
+                           const lapack_complex_double* du2,
+                           const int64_t* ipiv, double anorm,
+                           double* rcond );
+
+int64_t LAPACKE_sgtrfs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t nrhs, const float* dl, const float* d,
+                           const float* du, const float* dlf, const float* df,
+                           const float* duf, const float* du2,
+                           const int64_t* ipiv, const float* b,
+                           int64_t ldb, float* x, int64_t ldx,
+                           float* ferr, float* berr );
+int64_t LAPACKE_dgtrfs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t nrhs, const double* dl, const double* d,
+                           const double* du, const double* dlf,
+                           const double* df, const double* duf,
+                           const double* du2, const int64_t* ipiv,
+                           const double* b, int64_t ldb, double* x,
+                           int64_t ldx, double* ferr, double* berr );
+int64_t LAPACKE_cgtrfs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* dl,
+                           const lapack_complex_float* d,
+                           const lapack_complex_float* du,
+                           const lapack_complex_float* dlf,
+                           const lapack_complex_float* df,
+                           const lapack_complex_float* duf,
+                           const lapack_complex_float* du2,
+                           const int64_t* ipiv,
+                           const lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx, float* ferr,
+                           float* berr );
+int64_t LAPACKE_zgtrfs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* dl,
+                           const lapack_complex_double* d,
+                           const lapack_complex_double* du,
+                           const lapack_complex_double* dlf,
+                           const lapack_complex_double* df,
+                           const lapack_complex_double* duf,
+                           const lapack_complex_double* du2,
+                           const int64_t* ipiv,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* ferr, double* berr );
+
+int64_t LAPACKE_sgtsv_64( int matrix_layout, int64_t n, int64_t nrhs,
+                          float* dl, float* d, float* du, float* b,
+                          int64_t ldb );
+int64_t LAPACKE_dgtsv_64( int matrix_layout, int64_t n, int64_t nrhs,
+                          double* dl, double* d, double* du, double* b,
+                          int64_t ldb );
+int64_t LAPACKE_cgtsv_64( int matrix_layout, int64_t n, int64_t nrhs,
+                          lapack_complex_float* dl, lapack_complex_float* d,
+                          lapack_complex_float* du, lapack_complex_float* b,
+                          int64_t ldb );
+int64_t LAPACKE_zgtsv_64( int matrix_layout, int64_t n, int64_t nrhs,
+                          lapack_complex_double* dl, lapack_complex_double* d,
+                          lapack_complex_double* du, lapack_complex_double* b,
+                          int64_t ldb );
+
+int64_t LAPACKE_sgtsvx_64( int matrix_layout, char fact, char trans,
+                           int64_t n, int64_t nrhs, const float* dl,
+                           const float* d, const float* du, float* dlf,
+                           float* df, float* duf, float* du2, int64_t* ipiv,
+                           const float* b, int64_t ldb, float* x,
+                           int64_t ldx, float* rcond, float* ferr,
+                           float* berr );
+int64_t LAPACKE_dgtsvx_64( int matrix_layout, char fact, char trans,
+                           int64_t n, int64_t nrhs, const double* dl,
+                           const double* d, const double* du, double* dlf,
+                           double* df, double* duf, double* du2,
+                           int64_t* ipiv, const double* b, int64_t ldb,
+                           double* x, int64_t ldx, double* rcond,
+                           double* ferr, double* berr );
+int64_t LAPACKE_cgtsvx_64( int matrix_layout, char fact, char trans,
+                           int64_t n, int64_t nrhs,
+                           const lapack_complex_float* dl,
+                           const lapack_complex_float* d,
+                           const lapack_complex_float* du,
+                           lapack_complex_float* dlf, lapack_complex_float* df,
+                           lapack_complex_float* duf, lapack_complex_float* du2,
+                           int64_t* ipiv, const lapack_complex_float* b,
+                           int64_t ldb, lapack_complex_float* x,
+                           int64_t ldx, float* rcond, float* ferr,
+                           float* berr );
+int64_t LAPACKE_zgtsvx_64( int matrix_layout, char fact, char trans,
+                           int64_t n, int64_t nrhs,
+                           const lapack_complex_double* dl,
+                           const lapack_complex_double* d,
+                           const lapack_complex_double* du,
+                           lapack_complex_double* dlf,
+                           lapack_complex_double* df,
+                           lapack_complex_double* duf,
+                           lapack_complex_double* du2, int64_t* ipiv,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* rcond, double* ferr, double* berr );
+
+int64_t LAPACKE_sgttrf_64( int64_t n, float* dl, float* d, float* du,
+                           float* du2, int64_t* ipiv );
+int64_t LAPACKE_dgttrf_64( int64_t n, double* dl, double* d, double* du,
+                           double* du2, int64_t* ipiv );
+int64_t LAPACKE_cgttrf_64( int64_t n, lapack_complex_float* dl,
+                           lapack_complex_float* d, lapack_complex_float* du,
+                           lapack_complex_float* du2, int64_t* ipiv );
+int64_t LAPACKE_zgttrf_64( int64_t n, lapack_complex_double* dl,
+                           lapack_complex_double* d, lapack_complex_double* du,
+                           lapack_complex_double* du2, int64_t* ipiv );
+
+int64_t LAPACKE_sgttrs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t nrhs, const float* dl, const float* d,
+                           const float* du, const float* du2,
+                           const int64_t* ipiv, float* b, int64_t ldb );
+int64_t LAPACKE_dgttrs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t nrhs, const double* dl, const double* d,
+                           const double* du, const double* du2,
+                           const int64_t* ipiv, double* b, int64_t ldb );
+int64_t LAPACKE_cgttrs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* dl,
+                           const lapack_complex_float* d,
+                           const lapack_complex_float* du,
+                           const lapack_complex_float* du2,
+                           const int64_t* ipiv, lapack_complex_float* b,
+                           int64_t ldb );
+int64_t LAPACKE_zgttrs_64( int matrix_layout, char trans, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* dl,
+                           const lapack_complex_double* d,
+                           const lapack_complex_double* du,
+                           const lapack_complex_double* du2,
+                           const int64_t* ipiv, lapack_complex_double* b,
+                           int64_t ldb );
+
+int64_t LAPACKE_chbev_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          int64_t kd, lapack_complex_float* ab,
+                          int64_t ldab, float* w, lapack_complex_float* z,
+                          int64_t ldz );
+int64_t LAPACKE_zhbev_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          int64_t kd, lapack_complex_double* ab,
+                          int64_t ldab, double* w, lapack_complex_double* z,
+                          int64_t ldz );
+
+int64_t LAPACKE_chbevd_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           int64_t kd, lapack_complex_float* ab,
+                           int64_t ldab, float* w, lapack_complex_float* z,
+                           int64_t ldz );
+int64_t LAPACKE_zhbevd_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           int64_t kd, lapack_complex_double* ab,
+                           int64_t ldab, double* w, lapack_complex_double* z,
+                           int64_t ldz );
+
+int64_t LAPACKE_chbevx_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, int64_t kd,
+                           lapack_complex_float* ab, int64_t ldab,
+                           lapack_complex_float* q, int64_t ldq, float vl,
+                           float vu, int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, lapack_complex_float* z,
+                           int64_t ldz, int64_t* ifail );
+int64_t LAPACKE_zhbevx_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, int64_t kd,
+                           lapack_complex_double* ab, int64_t ldab,
+                           lapack_complex_double* q, int64_t ldq, double vl,
+                           double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w,
+                           lapack_complex_double* z, int64_t ldz,
+                           int64_t* ifail );
+
+int64_t LAPACKE_chbgst_64( int matrix_layout, char vect, char uplo, int64_t n,
+                           int64_t ka, int64_t kb,
+                           lapack_complex_float* ab, int64_t ldab,
+                           const lapack_complex_float* bb, int64_t ldbb,
+                           lapack_complex_float* x, int64_t ldx );
+int64_t LAPACKE_zhbgst_64( int matrix_layout, char vect, char uplo, int64_t n,
+                           int64_t ka, int64_t kb,
+                           lapack_complex_double* ab, int64_t ldab,
+                           const lapack_complex_double* bb, int64_t ldbb,
+                           lapack_complex_double* x, int64_t ldx );
+
+int64_t LAPACKE_chbgv_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          int64_t ka, int64_t kb,
+                          lapack_complex_float* ab, int64_t ldab,
+                          lapack_complex_float* bb, int64_t ldbb, float* w,
+                          lapack_complex_float* z, int64_t ldz );
+int64_t LAPACKE_zhbgv_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          int64_t ka, int64_t kb,
+                          lapack_complex_double* ab, int64_t ldab,
+                          lapack_complex_double* bb, int64_t ldbb, double* w,
+                          lapack_complex_double* z, int64_t ldz );
+
+int64_t LAPACKE_chbgvd_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           int64_t ka, int64_t kb,
+                           lapack_complex_float* ab, int64_t ldab,
+                           lapack_complex_float* bb, int64_t ldbb, float* w,
+                           lapack_complex_float* z, int64_t ldz );
+int64_t LAPACKE_zhbgvd_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           int64_t ka, int64_t kb,
+                           lapack_complex_double* ab, int64_t ldab,
+                           lapack_complex_double* bb, int64_t ldbb,
+                           double* w, lapack_complex_double* z,
+                           int64_t ldz );
+
+int64_t LAPACKE_chbgvx_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, int64_t ka, int64_t kb,
+                           lapack_complex_float* ab, int64_t ldab,
+                           lapack_complex_float* bb, int64_t ldbb,
+                           lapack_complex_float* q, int64_t ldq, float vl,
+                           float vu, int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, lapack_complex_float* z,
+                           int64_t ldz, int64_t* ifail );
+int64_t LAPACKE_zhbgvx_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, int64_t ka, int64_t kb,
+                           lapack_complex_double* ab, int64_t ldab,
+                           lapack_complex_double* bb, int64_t ldbb,
+                           lapack_complex_double* q, int64_t ldq, double vl,
+                           double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w,
+                           lapack_complex_double* z, int64_t ldz,
+                           int64_t* ifail );
+
+int64_t LAPACKE_chbtrd_64( int matrix_layout, char vect, char uplo, int64_t n,
+                           int64_t kd, lapack_complex_float* ab,
+                           int64_t ldab, float* d, float* e,
+                           lapack_complex_float* q, int64_t ldq );
+int64_t LAPACKE_zhbtrd_64( int matrix_layout, char vect, char uplo, int64_t n,
+                           int64_t kd, lapack_complex_double* ab,
+                           int64_t ldab, double* d, double* e,
+                           lapack_complex_double* q, int64_t ldq );
+
+int64_t LAPACKE_checon_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_float* a, int64_t lda,
+                           const int64_t* ipiv, float anorm, float* rcond );
+int64_t LAPACKE_zhecon_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_double* a, int64_t lda,
+                           const int64_t* ipiv, double anorm,
+                           double* rcond );
+
+int64_t LAPACKE_cheequb_64( int matrix_layout, char uplo, int64_t n,
+                            const lapack_complex_float* a, int64_t lda,
+                            float* s, float* scond, float* amax );
+int64_t LAPACKE_zheequb_64( int matrix_layout, char uplo, int64_t n,
+                            const lapack_complex_double* a, int64_t lda,
+                            double* s, double* scond, double* amax );
+
+int64_t LAPACKE_cheev_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          lapack_complex_float* a, int64_t lda, float* w );
+int64_t LAPACKE_zheev_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          lapack_complex_double* a, int64_t lda, double* w );
+
+int64_t LAPACKE_cheevd_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda, float* w );
+int64_t LAPACKE_zheevd_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           double* w );
+
+int64_t LAPACKE_cheevr_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, lapack_complex_float* a,
+                           int64_t lda, float vl, float vu, int64_t il,
+                           int64_t iu, float abstol, int64_t* m, float* w,
+                           lapack_complex_float* z, int64_t ldz,
+                           int64_t* isuppz );
+int64_t LAPACKE_zheevr_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, lapack_complex_double* a,
+                           int64_t lda, double vl, double vu, int64_t il,
+                           int64_t iu, double abstol, int64_t* m,
+                           double* w, lapack_complex_double* z, int64_t ldz,
+                           int64_t* isuppz );
+
+int64_t LAPACKE_cheevx_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, lapack_complex_float* a,
+                           int64_t lda, float vl, float vu, int64_t il,
+                           int64_t iu, float abstol, int64_t* m, float* w,
+                           lapack_complex_float* z, int64_t ldz,
+                           int64_t* ifail );
+int64_t LAPACKE_zheevx_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, lapack_complex_double* a,
+                           int64_t lda, double vl, double vu, int64_t il,
+                           int64_t iu, double abstol, int64_t* m,
+                           double* w, lapack_complex_double* z, int64_t ldz,
+                           int64_t* ifail );
+
+int64_t LAPACKE_chegst_64( int matrix_layout, int64_t itype, char uplo,
+                           int64_t n, lapack_complex_float* a,
+                           int64_t lda, const lapack_complex_float* b,
+                           int64_t ldb );
+int64_t LAPACKE_zhegst_64( int matrix_layout, int64_t itype, char uplo,
+                           int64_t n, lapack_complex_double* a,
+                           int64_t lda, const lapack_complex_double* b,
+                           int64_t ldb );
+
+int64_t LAPACKE_chegv_64( int matrix_layout, int64_t itype, char jobz,
+                          char uplo, int64_t n, lapack_complex_float* a,
+                          int64_t lda, lapack_complex_float* b,
+                          int64_t ldb, float* w );
+int64_t LAPACKE_zhegv_64( int matrix_layout, int64_t itype, char jobz,
+                          char uplo, int64_t n, lapack_complex_double* a,
+                          int64_t lda, lapack_complex_double* b,
+                          int64_t ldb, double* w );
+
+int64_t LAPACKE_chegvd_64( int matrix_layout, int64_t itype, char jobz,
+                           char uplo, int64_t n, lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* b,
+                           int64_t ldb, float* w );
+int64_t LAPACKE_zhegvd_64( int matrix_layout, int64_t itype, char jobz,
+                           char uplo, int64_t n, lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* b,
+                           int64_t ldb, double* w );
+
+int64_t LAPACKE_chegvx_64( int matrix_layout, int64_t itype, char jobz,
+                           char range, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* b, int64_t ldb, float vl,
+                           float vu, int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, lapack_complex_float* z,
+                           int64_t ldz, int64_t* ifail );
+int64_t LAPACKE_zhegvx_64( int matrix_layout, int64_t itype, char jobz,
+                           char range, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* b, int64_t ldb, double vl,
+                           double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w,
+                           lapack_complex_double* z, int64_t ldz,
+                           int64_t* ifail );
+
+int64_t LAPACKE_cherfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* a,
+                           int64_t lda, const lapack_complex_float* af,
+                           int64_t ldaf, const int64_t* ipiv,
+                           const lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx, float* ferr,
+                           float* berr );
+int64_t LAPACKE_zherfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* a,
+                           int64_t lda, const lapack_complex_double* af,
+                           int64_t ldaf, const int64_t* ipiv,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* ferr, double* berr );
+
+int64_t LAPACKE_cherfsx_64( int matrix_layout, char uplo, char equed,
+                            int64_t n, int64_t nrhs,
+                            const lapack_complex_float* a, int64_t lda,
+                            const lapack_complex_float* af, int64_t ldaf,
+                            const int64_t* ipiv, const float* s,
+                            const lapack_complex_float* b, int64_t ldb,
+                            lapack_complex_float* x, int64_t ldx,
+                            float* rcond, float* berr, int64_t n_err_bnds,
+                            float* err_bnds_norm, float* err_bnds_comp,
+                            int64_t nparams, float* params );
+int64_t LAPACKE_zherfsx_64( int matrix_layout, char uplo, char equed,
+                            int64_t n, int64_t nrhs,
+                            const lapack_complex_double* a, int64_t lda,
+                            const lapack_complex_double* af, int64_t ldaf,
+                            const int64_t* ipiv, const double* s,
+                            const lapack_complex_double* b, int64_t ldb,
+                            lapack_complex_double* x, int64_t ldx,
+                            double* rcond, double* berr, int64_t n_err_bnds,
+                            double* err_bnds_norm, double* err_bnds_comp,
+                            int64_t nparams, double* params );
+
+int64_t LAPACKE_chesv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_float* a,
+                          int64_t lda, int64_t* ipiv,
+                          lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zhesv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_double* a,
+                          int64_t lda, int64_t* ipiv,
+                          lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_chesvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* af,
+                           int64_t ldaf, int64_t* ipiv,
+                           const lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx,
+                           float* rcond, float* ferr, float* berr );
+int64_t LAPACKE_zhesvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* af,
+                           int64_t ldaf, int64_t* ipiv,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* rcond, double* ferr, double* berr );
+
+int64_t LAPACKE_chesvxx_64( int matrix_layout, char fact, char uplo,
+                            int64_t n, int64_t nrhs,
+                            lapack_complex_float* a, int64_t lda,
+                            lapack_complex_float* af, int64_t ldaf,
+                            int64_t* ipiv, char* equed, float* s,
+                            lapack_complex_float* b, int64_t ldb,
+                            lapack_complex_float* x, int64_t ldx,
+                            float* rcond, float* rpvgrw, float* berr,
+                            int64_t n_err_bnds, float* err_bnds_norm,
+                            float* err_bnds_comp, int64_t nparams,
+                            float* params );
+int64_t LAPACKE_zhesvxx_64( int matrix_layout, char fact, char uplo,
+                            int64_t n, int64_t nrhs,
+                            lapack_complex_double* a, int64_t lda,
+                            lapack_complex_double* af, int64_t ldaf,
+                            int64_t* ipiv, char* equed, double* s,
+                            lapack_complex_double* b, int64_t ldb,
+                            lapack_complex_double* x, int64_t ldx,
+                            double* rcond, double* rpvgrw, double* berr,
+                            int64_t n_err_bnds, double* err_bnds_norm,
+                            double* err_bnds_comp, int64_t nparams,
+                            double* params );
+
+int64_t LAPACKE_chetrd_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda, float* d,
+                           float* e, lapack_complex_float* tau );
+int64_t LAPACKE_zhetrd_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda, double* d,
+                           double* e, lapack_complex_double* tau );
+
+int64_t LAPACKE_chetrf_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           int64_t* ipiv );
+int64_t LAPACKE_zhetrf_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           int64_t* ipiv );
+
+int64_t LAPACKE_chetri_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           const int64_t* ipiv );
+int64_t LAPACKE_zhetri_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           const int64_t* ipiv );
+
+int64_t LAPACKE_chetrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* a,
+                           int64_t lda, const int64_t* ipiv,
+                           lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zhetrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* a,
+                           int64_t lda, const int64_t* ipiv,
+                           lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_chfrk_64( int matrix_layout, char transr, char uplo, char trans,
+                          int64_t n, int64_t k, float alpha,
+                          const lapack_complex_float* a, int64_t lda,
+                          float beta, lapack_complex_float* c );
+int64_t LAPACKE_zhfrk_64( int matrix_layout, char transr, char uplo, char trans,
+                          int64_t n, int64_t k, double alpha,
+                          const lapack_complex_double* a, int64_t lda,
+                          double beta, lapack_complex_double* c );
+
+int64_t LAPACKE_shgeqz_64( int matrix_layout, char job, char compq, char compz,
+                           int64_t n, int64_t ilo, int64_t ihi,
+                           float* h, int64_t ldh, float* t, int64_t ldt,
+                           float* alphar, float* alphai, float* beta, float* q,
+                           int64_t ldq, float* z, int64_t ldz );
+int64_t LAPACKE_dhgeqz_64( int matrix_layout, char job, char compq, char compz,
+                           int64_t n, int64_t ilo, int64_t ihi,
+                           double* h, int64_t ldh, double* t, int64_t ldt,
+                           double* alphar, double* alphai, double* beta,
+                           double* q, int64_t ldq, double* z,
+                           int64_t ldz );
+int64_t LAPACKE_chgeqz_64( int matrix_layout, char job, char compq, char compz,
+                           int64_t n, int64_t ilo, int64_t ihi,
+                           lapack_complex_float* h, int64_t ldh,
+                           lapack_complex_float* t, int64_t ldt,
+                           lapack_complex_float* alpha,
+                           lapack_complex_float* beta, lapack_complex_float* q,
+                           int64_t ldq, lapack_complex_float* z,
+                           int64_t ldz );
+int64_t LAPACKE_zhgeqz_64( int matrix_layout, char job, char compq, char compz,
+                           int64_t n, int64_t ilo, int64_t ihi,
+                           lapack_complex_double* h, int64_t ldh,
+                           lapack_complex_double* t, int64_t ldt,
+                           lapack_complex_double* alpha,
+                           lapack_complex_double* beta,
+                           lapack_complex_double* q, int64_t ldq,
+                           lapack_complex_double* z, int64_t ldz );
+
+int64_t LAPACKE_chpcon_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_float* ap,
+                           const int64_t* ipiv, float anorm, float* rcond );
+int64_t LAPACKE_zhpcon_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_double* ap,
+                           const int64_t* ipiv, double anorm,
+                           double* rcond );
+
+int64_t LAPACKE_chpev_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          lapack_complex_float* ap, float* w,
+                          lapack_complex_float* z, int64_t ldz );
+int64_t LAPACKE_zhpev_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          lapack_complex_double* ap, double* w,
+                          lapack_complex_double* z, int64_t ldz );
+
+int64_t LAPACKE_chpevd_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           lapack_complex_float* ap, float* w,
+                           lapack_complex_float* z, int64_t ldz );
+int64_t LAPACKE_zhpevd_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           lapack_complex_double* ap, double* w,
+                           lapack_complex_double* z, int64_t ldz );
+
+int64_t LAPACKE_chpevx_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, lapack_complex_float* ap, float vl,
+                           float vu, int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, lapack_complex_float* z,
+                           int64_t ldz, int64_t* ifail );
+int64_t LAPACKE_zhpevx_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, lapack_complex_double* ap, double vl,
+                           double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w,
+                           lapack_complex_double* z, int64_t ldz,
+                           int64_t* ifail );
+
+int64_t LAPACKE_chpgst_64( int matrix_layout, int64_t itype, char uplo,
+                           int64_t n, lapack_complex_float* ap,
+                           const lapack_complex_float* bp );
+int64_t LAPACKE_zhpgst_64( int matrix_layout, int64_t itype, char uplo,
+                           int64_t n, lapack_complex_double* ap,
+                           const lapack_complex_double* bp );
+
+int64_t LAPACKE_chpgv_64( int matrix_layout, int64_t itype, char jobz,
+                          char uplo, int64_t n, lapack_complex_float* ap,
+                          lapack_complex_float* bp, float* w,
+                          lapack_complex_float* z, int64_t ldz );
+int64_t LAPACKE_zhpgv_64( int matrix_layout, int64_t itype, char jobz,
+                          char uplo, int64_t n, lapack_complex_double* ap,
+                          lapack_complex_double* bp, double* w,
+                          lapack_complex_double* z, int64_t ldz );
+
+int64_t LAPACKE_chpgvd_64( int matrix_layout, int64_t itype, char jobz,
+                           char uplo, int64_t n, lapack_complex_float* ap,
+                           lapack_complex_float* bp, float* w,
+                           lapack_complex_float* z, int64_t ldz );
+int64_t LAPACKE_zhpgvd_64( int matrix_layout, int64_t itype, char jobz,
+                           char uplo, int64_t n, lapack_complex_double* ap,
+                           lapack_complex_double* bp, double* w,
+                           lapack_complex_double* z, int64_t ldz );
+
+int64_t LAPACKE_chpgvx_64( int matrix_layout, int64_t itype, char jobz,
+                           char range, char uplo, int64_t n,
+                           lapack_complex_float* ap, lapack_complex_float* bp,
+                           float vl, float vu, int64_t il, int64_t iu,
+                           float abstol, int64_t* m, float* w,
+                           lapack_complex_float* z, int64_t ldz,
+                           int64_t* ifail );
+int64_t LAPACKE_zhpgvx_64( int matrix_layout, int64_t itype, char jobz,
+                           char range, char uplo, int64_t n,
+                           lapack_complex_double* ap, lapack_complex_double* bp,
+                           double vl, double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w,
+                           lapack_complex_double* z, int64_t ldz,
+                           int64_t* ifail );
+
+int64_t LAPACKE_chprfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* ap,
+                           const lapack_complex_float* afp,
+                           const int64_t* ipiv,
+                           const lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx, float* ferr,
+                           float* berr );
+int64_t LAPACKE_zhprfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* ap,
+                           const lapack_complex_double* afp,
+                           const int64_t* ipiv,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* ferr, double* berr );
+
+int64_t LAPACKE_chpsv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_float* ap,
+                          int64_t* ipiv, lapack_complex_float* b,
+                          int64_t ldb );
+int64_t LAPACKE_zhpsv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_double* ap,
+                          int64_t* ipiv, lapack_complex_double* b,
+                          int64_t ldb );
+
+int64_t LAPACKE_chpsvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* ap,
+                           lapack_complex_float* afp, int64_t* ipiv,
+                           const lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx,
+                           float* rcond, float* ferr, float* berr );
+int64_t LAPACKE_zhpsvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* ap,
+                           lapack_complex_double* afp, int64_t* ipiv,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* rcond, double* ferr, double* berr );
+
+int64_t LAPACKE_chptrd_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* ap, float* d, float* e,
+                           lapack_complex_float* tau );
+int64_t LAPACKE_zhptrd_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* ap, double* d, double* e,
+                           lapack_complex_double* tau );
+
+int64_t LAPACKE_chptrf_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* ap, int64_t* ipiv );
+int64_t LAPACKE_zhptrf_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* ap, int64_t* ipiv );
+
+int64_t LAPACKE_chptri_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* ap, const int64_t* ipiv );
+int64_t LAPACKE_zhptri_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* ap, const int64_t* ipiv );
+
+int64_t LAPACKE_chptrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* ap,
+                           const int64_t* ipiv, lapack_complex_float* b,
+                           int64_t ldb );
+int64_t LAPACKE_zhptrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* ap,
+                           const int64_t* ipiv, lapack_complex_double* b,
+                           int64_t ldb );
+
+int64_t LAPACKE_shsein_64( int matrix_layout, char job, char eigsrc, char initv,
+                           lapack_logical* select, int64_t n, const float* h,
+                           int64_t ldh, float* wr, const float* wi,
+                           float* vl, int64_t ldvl, float* vr,
+                           int64_t ldvr, int64_t mm, int64_t* m,
+                           int64_t* ifaill, int64_t* ifailr );
+int64_t LAPACKE_dhsein_64( int matrix_layout, char job, char eigsrc, char initv,
+                           lapack_logical* select, int64_t n,
+                           const double* h, int64_t ldh, double* wr,
+                           const double* wi, double* vl, int64_t ldvl,
+                           double* vr, int64_t ldvr, int64_t mm,
+                           int64_t* m, int64_t* ifaill,
+                           int64_t* ifailr );
+int64_t LAPACKE_chsein_64( int matrix_layout, char job, char eigsrc, char initv,
+                           const lapack_logical* select, int64_t n,
+                           const lapack_complex_float* h, int64_t ldh,
+                           lapack_complex_float* w, lapack_complex_float* vl,
+                           int64_t ldvl, lapack_complex_float* vr,
+                           int64_t ldvr, int64_t mm, int64_t* m,
+                           int64_t* ifaill, int64_t* ifailr );
+int64_t LAPACKE_zhsein_64( int matrix_layout, char job, char eigsrc, char initv,
+                           const lapack_logical* select, int64_t n,
+                           const lapack_complex_double* h, int64_t ldh,
+                           lapack_complex_double* w, lapack_complex_double* vl,
+                           int64_t ldvl, lapack_complex_double* vr,
+                           int64_t ldvr, int64_t mm, int64_t* m,
+                           int64_t* ifaill, int64_t* ifailr );
+
+int64_t LAPACKE_shseqr_64( int matrix_layout, char job, char compz, int64_t n,
+                           int64_t ilo, int64_t ihi, float* h,
+                           int64_t ldh, float* wr, float* wi, float* z,
+                           int64_t ldz );
+int64_t LAPACKE_dhseqr_64( int matrix_layout, char job, char compz, int64_t n,
+                           int64_t ilo, int64_t ihi, double* h,
+                           int64_t ldh, double* wr, double* wi, double* z,
+                           int64_t ldz );
+int64_t LAPACKE_chseqr_64( int matrix_layout, char job, char compz, int64_t n,
+                           int64_t ilo, int64_t ihi,
+                           lapack_complex_float* h, int64_t ldh,
+                           lapack_complex_float* w, lapack_complex_float* z,
+                           int64_t ldz );
+int64_t LAPACKE_zhseqr_64( int matrix_layout, char job, char compz, int64_t n,
+                           int64_t ilo, int64_t ihi,
+                           lapack_complex_double* h, int64_t ldh,
+                           lapack_complex_double* w, lapack_complex_double* z,
+                           int64_t ldz );
+
+int64_t LAPACKE_clacgv_64( int64_t n, lapack_complex_float* x,
+                           int64_t incx );
+int64_t LAPACKE_zlacgv_64( int64_t n, lapack_complex_double* x,
+                           int64_t incx );
+
+int64_t LAPACKE_slacn2_64( int64_t n, float* v, float* x, int64_t* isgn,
+                           float* est, int64_t* kase, int64_t* isave );
+int64_t LAPACKE_dlacn2_64( int64_t n, double* v, double* x, int64_t* isgn,
+                           double* est, int64_t* kase, int64_t* isave );
+int64_t LAPACKE_clacn2_64( int64_t n, lapack_complex_float* v,
+                           lapack_complex_float* x,
+                           float* est, int64_t* kase, int64_t* isave );
+int64_t LAPACKE_zlacn2_64( int64_t n, lapack_complex_double* v,
+                           lapack_complex_double* x,
+                           double* est, int64_t* kase, int64_t* isave );
+
+int64_t LAPACKE_slacpy_64( int matrix_layout, char uplo, int64_t m,
+                           int64_t n, const float* a, int64_t lda, float* b,
+                           int64_t ldb );
+int64_t LAPACKE_dlacpy_64( int matrix_layout, char uplo, int64_t m,
+                           int64_t n, const double* a, int64_t lda, double* b,
+                           int64_t ldb );
+int64_t LAPACKE_clacpy_64( int matrix_layout, char uplo, int64_t m,
+                           int64_t n, const lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* b,
+                           int64_t ldb );
+int64_t LAPACKE_zlacpy_64( int matrix_layout, char uplo, int64_t m,
+                           int64_t n, const lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* b,
+                           int64_t ldb );
+
+int64_t LAPACKE_clacp2_64( int matrix_layout, char uplo, int64_t m,
+                           int64_t n, const float* a, int64_t lda,
+                           lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zlacp2_64( int matrix_layout, char uplo, int64_t m,
+                           int64_t n, const double* a, int64_t lda,
+                           lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_zlag2c_64( int matrix_layout, int64_t m, int64_t n,
+                           const lapack_complex_double* a, int64_t lda,
+                           lapack_complex_float* sa, int64_t ldsa );
+
+int64_t LAPACKE_slag2d_64( int matrix_layout, int64_t m, int64_t n,
+                           const float* sa, int64_t ldsa, double* a,
+                           int64_t lda );
+
+int64_t LAPACKE_dlag2s_64( int matrix_layout, int64_t m, int64_t n,
+                           const double* a, int64_t lda, float* sa,
+                           int64_t ldsa );
+
+int64_t LAPACKE_clag2z_64( int matrix_layout, int64_t m, int64_t n,
+                           const lapack_complex_float* sa, int64_t ldsa,
+                           lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_slagge_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t kl, int64_t ku, const float* d,
+                           float* a, int64_t lda, int64_t* iseed );
+int64_t LAPACKE_dlagge_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t kl, int64_t ku, const double* d,
+                           double* a, int64_t lda, int64_t* iseed );
+int64_t LAPACKE_clagge_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t kl, int64_t ku, const float* d,
+                           lapack_complex_float* a, int64_t lda,
+                           int64_t* iseed );
+int64_t LAPACKE_zlagge_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t kl, int64_t ku, const double* d,
+                           lapack_complex_double* a, int64_t lda,
+                           int64_t* iseed );
+
+float LAPACKE_slamch_64( char cmach );
+double LAPACKE_dlamch_64( char cmach );
+
+float LAPACKE_slangb_64( int matrix_layout, char norm, int64_t n,
+                      int64_t kl, int64_t ku, const float* ab,
+                      int64_t ldab );
+double LAPACKE_dlangb_64( int matrix_layout, char norm, int64_t n,
+                       int64_t kl, int64_t ku, const double* ab,
+                       int64_t ldab );
+float LAPACKE_clangb_64( int matrix_layout, char norm, int64_t n,
+                      int64_t kl, int64_t ku,
+                      const lapack_complex_float* ab, int64_t ldab );
+double LAPACKE_zlangb_64( int matrix_layout, char norm, int64_t n,
+                       int64_t kl, int64_t ku,
+                       const lapack_complex_double* ab, int64_t ldab );
+
+float LAPACKE_slange_64( int matrix_layout, char norm, int64_t m,
+                           int64_t n, const float* a, int64_t lda );
+double LAPACKE_dlange_64( int matrix_layout, char norm, int64_t m,
+                           int64_t n, const double* a, int64_t lda );
+float LAPACKE_clange_64( int matrix_layout, char norm, int64_t m,
+                           int64_t n, const lapack_complex_float* a,
+                           int64_t lda );
+double LAPACKE_zlange_64( int matrix_layout, char norm, int64_t m,
+                           int64_t n, const lapack_complex_double* a,
+                           int64_t lda );
+
+float LAPACKE_clanhe_64( int matrix_layout, char norm, char uplo, int64_t n,
+                           const lapack_complex_float* a, int64_t lda );
+double LAPACKE_zlanhe_64( int matrix_layout, char norm, char uplo, int64_t n,
+                           const lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_clacrm_64( int matrix_layout, int64_t m, int64_t n,
+                          const lapack_complex_float* a,
+                          int64_t lda, const float* b,
+                          int64_t ldb, lapack_complex_float* c,
+                          int64_t ldc );
+int64_t LAPACKE_zlacrm_64( int matrix_layout, int64_t m, int64_t n,
+                           const lapack_complex_double* a,
+                           int64_t lda, const double* b,
+                           int64_t ldb, lapack_complex_double* c,
+                           int64_t ldc );
+
+int64_t LAPACKE_clarcm_64( int matrix_layout, int64_t m, int64_t n,
+                          const float* a, int64_t lda,
+                          const lapack_complex_float* b,
+                          int64_t ldb, lapack_complex_float* c,
+                          int64_t ldc );
+int64_t LAPACKE_zlarcm_64( int matrix_layout, int64_t m, int64_t n,
+                           const double* a, int64_t lda,
+                           const lapack_complex_double* b,
+                           int64_t ldb, lapack_complex_double* c,
+                           int64_t ldc );
+
+float LAPACKE_slansy_64( int matrix_layout, char norm, char uplo, int64_t n,
+                           const float* a, int64_t lda );
+double LAPACKE_dlansy_64( int matrix_layout, char norm, char uplo, int64_t n,
+                           const double* a, int64_t lda );
+float LAPACKE_clansy_64( int matrix_layout, char norm, char uplo, int64_t n,
+                           const lapack_complex_float* a, int64_t lda );
+double LAPACKE_zlansy_64( int matrix_layout, char norm, char uplo, int64_t n,
+                           const lapack_complex_double* a, int64_t lda );
+
+float LAPACKE_slantr_64( int matrix_layout, char norm, char uplo, char diag,
+                           int64_t m, int64_t n, const float* a,
+                           int64_t lda );
+double LAPACKE_dlantr_64( int matrix_layout, char norm, char uplo, char diag,
+                           int64_t m, int64_t n, const double* a,
+                           int64_t lda );
+float LAPACKE_clantr_64( int matrix_layout, char norm, char uplo, char diag,
+                           int64_t m, int64_t n, const lapack_complex_float* a,
+                           int64_t lda );
+double LAPACKE_zlantr_64( int matrix_layout, char norm, char uplo, char diag,
+                           int64_t m, int64_t n, const lapack_complex_double* a,
+                           int64_t lda );
+
+
+int64_t LAPACKE_slarfb_64( int matrix_layout, char side, char trans, char direct,
+                           char storev, int64_t m, int64_t n,
+                           int64_t k, const float* v, int64_t ldv,
+                           const float* t, int64_t ldt, float* c,
+                           int64_t ldc );
+int64_t LAPACKE_dlarfb_64( int matrix_layout, char side, char trans, char direct,
+                           char storev, int64_t m, int64_t n,
+                           int64_t k, const double* v, int64_t ldv,
+                           const double* t, int64_t ldt, double* c,
+                           int64_t ldc );
+int64_t LAPACKE_clarfb_64( int matrix_layout, char side, char trans, char direct,
+                           char storev, int64_t m, int64_t n,
+                           int64_t k, const lapack_complex_float* v,
+                           int64_t ldv, const lapack_complex_float* t,
+                           int64_t ldt, lapack_complex_float* c,
+                           int64_t ldc );
+int64_t LAPACKE_zlarfb_64( int matrix_layout, char side, char trans, char direct,
+                           char storev, int64_t m, int64_t n,
+                           int64_t k, const lapack_complex_double* v,
+                           int64_t ldv, const lapack_complex_double* t,
+                           int64_t ldt, lapack_complex_double* c,
+                           int64_t ldc );
+
+int64_t LAPACKE_slarfg_64( int64_t n, float* alpha, float* x,
+                           int64_t incx, float* tau );
+int64_t LAPACKE_dlarfg_64( int64_t n, double* alpha, double* x,
+                           int64_t incx, double* tau );
+int64_t LAPACKE_clarfg_64( int64_t n, lapack_complex_float* alpha,
+                           lapack_complex_float* x, int64_t incx,
+                           lapack_complex_float* tau );
+int64_t LAPACKE_zlarfg_64( int64_t n, lapack_complex_double* alpha,
+                           lapack_complex_double* x, int64_t incx,
+                           lapack_complex_double* tau );
+
+int64_t LAPACKE_slarft_64( int matrix_layout, char direct, char storev,
+                           int64_t n, int64_t k, const float* v,
+                           int64_t ldv, const float* tau, float* t,
+                           int64_t ldt );
+int64_t LAPACKE_dlarft_64( int matrix_layout, char direct, char storev,
+                           int64_t n, int64_t k, const double* v,
+                           int64_t ldv, const double* tau, double* t,
+                           int64_t ldt );
+int64_t LAPACKE_clarft_64( int matrix_layout, char direct, char storev,
+                           int64_t n, int64_t k,
+                           const lapack_complex_float* v, int64_t ldv,
+                           const lapack_complex_float* tau,
+                           lapack_complex_float* t, int64_t ldt );
+int64_t LAPACKE_zlarft_64( int matrix_layout, char direct, char storev,
+                           int64_t n, int64_t k,
+                           const lapack_complex_double* v, int64_t ldv,
+                           const lapack_complex_double* tau,
+                           lapack_complex_double* t, int64_t ldt );
+
+int64_t LAPACKE_slarfx_64( int matrix_layout, char side, int64_t m,
+                           int64_t n, const float* v, float tau, float* c,
+                           int64_t ldc, float* work );
+int64_t LAPACKE_dlarfx_64( int matrix_layout, char side, int64_t m,
+                           int64_t n, const double* v, double tau, double* c,
+                           int64_t ldc, double* work );
+int64_t LAPACKE_clarfx_64( int matrix_layout, char side, int64_t m,
+                           int64_t n, const lapack_complex_float* v,
+                           lapack_complex_float tau, lapack_complex_float* c,
+                           int64_t ldc, lapack_complex_float* work );
+int64_t LAPACKE_zlarfx_64( int matrix_layout, char side, int64_t m,
+                           int64_t n, const lapack_complex_double* v,
+                           lapack_complex_double tau, lapack_complex_double* c,
+                           int64_t ldc, lapack_complex_double* work );
+
+int64_t LAPACKE_slarnv_64( int64_t idist, int64_t* iseed, int64_t n,
+                           float* x );
+int64_t LAPACKE_dlarnv_64( int64_t idist, int64_t* iseed, int64_t n,
+                           double* x );
+int64_t LAPACKE_clarnv_64( int64_t idist, int64_t* iseed, int64_t n,
+                           lapack_complex_float* x );
+int64_t LAPACKE_zlarnv_64( int64_t idist, int64_t* iseed, int64_t n,
+                           lapack_complex_double* x );
+
+int64_t LAPACKE_slascl_64( int matrix_layout, char type, int64_t kl,
+                           int64_t ku, float cfrom, float cto,
+                           int64_t m, int64_t n, float* a,
+                           int64_t lda );
+int64_t LAPACKE_dlascl_64( int matrix_layout, char type, int64_t kl,
+                           int64_t ku, double cfrom, double cto,
+                           int64_t m, int64_t n, double* a,
+                           int64_t lda );
+int64_t LAPACKE_clascl_64( int matrix_layout, char type, int64_t kl,
+                           int64_t ku, float cfrom, float cto,
+                           int64_t m, int64_t n, lapack_complex_float* a,
+                           int64_t lda );
+int64_t LAPACKE_zlascl_64( int matrix_layout, char type, int64_t kl,
+                           int64_t ku, double cfrom, double cto,
+                           int64_t m, int64_t n, lapack_complex_double* a,
+                           int64_t lda );
+
+int64_t LAPACKE_slaset_64( int matrix_layout, char uplo, int64_t m,
+                           int64_t n, float alpha, float beta, float* a,
+                           int64_t lda );
+int64_t LAPACKE_dlaset_64( int matrix_layout, char uplo, int64_t m,
+                           int64_t n, double alpha, double beta, double* a,
+                           int64_t lda );
+int64_t LAPACKE_claset_64( int matrix_layout, char uplo, int64_t m,
+                           int64_t n, lapack_complex_float alpha,
+                           lapack_complex_float beta, lapack_complex_float* a,
+                           int64_t lda );
+int64_t LAPACKE_zlaset_64( int matrix_layout, char uplo, int64_t m,
+                           int64_t n, lapack_complex_double alpha,
+                           lapack_complex_double beta, lapack_complex_double* a,
+                           int64_t lda );
+
+int64_t LAPACKE_slasrt_64( char id, int64_t n, float* d );
+int64_t LAPACKE_dlasrt_64( char id, int64_t n, double* d );
+
+int64_t LAPACKE_slassq_64( int64_t n,                 const float* x, int64_t incx,  float* scale,  float* sumsq );
+int64_t LAPACKE_dlassq_64( int64_t n,                const double* x, int64_t incx, double* scale, double* sumsq );
+int64_t LAPACKE_classq_64( int64_t n,  const lapack_complex_float* x, int64_t incx,  float* scale,  float* sumsq );
+int64_t LAPACKE_zlassq_64( int64_t n, const lapack_complex_double* x, int64_t incx, double* scale, double* sumsq );
+
+int64_t LAPACKE_slaswp_64( int matrix_layout, int64_t n, float* a,
+                           int64_t lda, int64_t k1, int64_t k2,
+                           const int64_t* ipiv, int64_t incx );
+int64_t LAPACKE_dlaswp_64( int matrix_layout, int64_t n, double* a,
+                           int64_t lda, int64_t k1, int64_t k2,
+                           const int64_t* ipiv, int64_t incx );
+int64_t LAPACKE_claswp_64( int matrix_layout, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           int64_t k1, int64_t k2, const int64_t* ipiv,
+                           int64_t incx );
+int64_t LAPACKE_zlaswp_64( int matrix_layout, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           int64_t k1, int64_t k2, const int64_t* ipiv,
+                           int64_t incx );
+
+int64_t LAPACKE_slatms_64( int matrix_layout, int64_t m, int64_t n,
+                           char dist, int64_t* iseed, char sym, float* d,
+                           int64_t mode, float cond, float dmax,
+                           int64_t kl, int64_t ku, char pack, float* a,
+                           int64_t lda );
+int64_t LAPACKE_dlatms_64( int matrix_layout, int64_t m, int64_t n,
+                           char dist, int64_t* iseed, char sym, double* d,
+                           int64_t mode, double cond, double dmax,
+                           int64_t kl, int64_t ku, char pack, double* a,
+                           int64_t lda );
+int64_t LAPACKE_clatms_64( int matrix_layout, int64_t m, int64_t n,
+                           char dist, int64_t* iseed, char sym, float* d,
+                           int64_t mode, float cond, float dmax,
+                           int64_t kl, int64_t ku, char pack,
+                           lapack_complex_float* a, int64_t lda );
+int64_t LAPACKE_zlatms_64( int matrix_layout, int64_t m, int64_t n,
+                           char dist, int64_t* iseed, char sym, double* d,
+                           int64_t mode, double cond, double dmax,
+                           int64_t kl, int64_t ku, char pack,
+                           lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_slauum_64( int matrix_layout, char uplo, int64_t n, float* a,
+                           int64_t lda );
+int64_t LAPACKE_dlauum_64( int matrix_layout, char uplo, int64_t n, double* a,
+                           int64_t lda );
+int64_t LAPACKE_clauum_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda );
+int64_t LAPACKE_zlauum_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_sopgtr_64( int matrix_layout, char uplo, int64_t n,
+                           const float* ap, const float* tau, float* q,
+                           int64_t ldq );
+int64_t LAPACKE_dopgtr_64( int matrix_layout, char uplo, int64_t n,
+                           const double* ap, const double* tau, double* q,
+                           int64_t ldq );
+
+int64_t LAPACKE_sopmtr_64( int matrix_layout, char side, char uplo, char trans,
+                           int64_t m, int64_t n, const float* ap,
+                           const float* tau, float* c, int64_t ldc );
+int64_t LAPACKE_dopmtr_64( int matrix_layout, char side, char uplo, char trans,
+                           int64_t m, int64_t n, const double* ap,
+                           const double* tau, double* c, int64_t ldc );
+
+int64_t LAPACKE_sorgbr_64( int matrix_layout, char vect, int64_t m,
+                           int64_t n, int64_t k, float* a, int64_t lda,
+                           const float* tau );
+int64_t LAPACKE_dorgbr_64( int matrix_layout, char vect, int64_t m,
+                           int64_t n, int64_t k, double* a,
+                           int64_t lda, const double* tau );
+
+int64_t LAPACKE_sorghr_64( int matrix_layout, int64_t n, int64_t ilo,
+                           int64_t ihi, float* a, int64_t lda,
+                           const float* tau );
+int64_t LAPACKE_dorghr_64( int matrix_layout, int64_t n, int64_t ilo,
+                           int64_t ihi, double* a, int64_t lda,
+                           const double* tau );
+
+int64_t LAPACKE_sorglq_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t k, float* a, int64_t lda,
+                           const float* tau );
+int64_t LAPACKE_dorglq_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t k, double* a, int64_t lda,
+                           const double* tau );
+
+int64_t LAPACKE_sorgql_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t k, float* a, int64_t lda,
+                           const float* tau );
+int64_t LAPACKE_dorgql_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t k, double* a, int64_t lda,
+                           const double* tau );
+
+int64_t LAPACKE_sorgqr_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t k, float* a, int64_t lda,
+                           const float* tau );
+int64_t LAPACKE_dorgqr_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t k, double* a, int64_t lda,
+                           const double* tau );
+
+int64_t LAPACKE_sorgrq_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t k, float* a, int64_t lda,
+                           const float* tau );
+int64_t LAPACKE_dorgrq_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t k, double* a, int64_t lda,
+                           const double* tau );
+
+int64_t LAPACKE_sorgtr_64( int matrix_layout, char uplo, int64_t n, float* a,
+                           int64_t lda, const float* tau );
+int64_t LAPACKE_dorgtr_64( int matrix_layout, char uplo, int64_t n, double* a,
+                           int64_t lda, const double* tau );
+
+int64_t LAPACKE_sorgtsqr_row_64( int matrix_layout, int64_t m, int64_t n,
+                                 int64_t mb, int64_t nb,
+                                 float* a, int64_t lda,
+                                 const float* t, int64_t ldt );
+int64_t LAPACKE_dorgtsqr_row_64( int matrix_layout, int64_t m, int64_t n,
+                                 int64_t mb, int64_t nb,
+                                 double* a, int64_t lda,
+                                 const double* t, int64_t ldt );
+
+int64_t LAPACKE_sormbr_64( int matrix_layout, char vect, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const float* a, int64_t lda, const float* tau,
+                           float* c, int64_t ldc );
+int64_t LAPACKE_dormbr_64( int matrix_layout, char vect, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const double* a, int64_t lda, const double* tau,
+                           double* c, int64_t ldc );
+
+int64_t LAPACKE_sormhr_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t ilo,
+                           int64_t ihi, const float* a, int64_t lda,
+                           const float* tau, float* c, int64_t ldc );
+int64_t LAPACKE_dormhr_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t ilo,
+                           int64_t ihi, const double* a, int64_t lda,
+                           const double* tau, double* c, int64_t ldc );
+
+int64_t LAPACKE_sormlq_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const float* a, int64_t lda, const float* tau,
+                           float* c, int64_t ldc );
+int64_t LAPACKE_dormlq_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const double* a, int64_t lda, const double* tau,
+                           double* c, int64_t ldc );
+
+int64_t LAPACKE_sormql_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const float* a, int64_t lda, const float* tau,
+                           float* c, int64_t ldc );
+int64_t LAPACKE_dormql_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const double* a, int64_t lda, const double* tau,
+                           double* c, int64_t ldc );
+
+int64_t LAPACKE_sormqr_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const float* a, int64_t lda, const float* tau,
+                           float* c, int64_t ldc );
+int64_t LAPACKE_dormqr_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const double* a, int64_t lda, const double* tau,
+                           double* c, int64_t ldc );
+
+int64_t LAPACKE_sormrq_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const float* a, int64_t lda, const float* tau,
+                           float* c, int64_t ldc );
+int64_t LAPACKE_dormrq_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const double* a, int64_t lda, const double* tau,
+                           double* c, int64_t ldc );
+
+int64_t LAPACKE_sormrz_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           int64_t l, const float* a, int64_t lda,
+                           const float* tau, float* c, int64_t ldc );
+int64_t LAPACKE_dormrz_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           int64_t l, const double* a, int64_t lda,
+                           const double* tau, double* c, int64_t ldc );
+
+int64_t LAPACKE_sormtr_64( int matrix_layout, char side, char uplo, char trans,
+                           int64_t m, int64_t n, const float* a,
+                           int64_t lda, const float* tau, float* c,
+                           int64_t ldc );
+int64_t LAPACKE_dormtr_64( int matrix_layout, char side, char uplo, char trans,
+                           int64_t m, int64_t n, const double* a,
+                           int64_t lda, const double* tau, double* c,
+                           int64_t ldc );
+
+int64_t LAPACKE_spbcon_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, const float* ab, int64_t ldab,
+                           float anorm, float* rcond );
+int64_t LAPACKE_dpbcon_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, const double* ab, int64_t ldab,
+                           double anorm, double* rcond );
+int64_t LAPACKE_cpbcon_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, const lapack_complex_float* ab,
+                           int64_t ldab, float anorm, float* rcond );
+int64_t LAPACKE_zpbcon_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, const lapack_complex_double* ab,
+                           int64_t ldab, double anorm, double* rcond );
+
+int64_t LAPACKE_spbequ_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, const float* ab, int64_t ldab,
+                           float* s, float* scond, float* amax );
+int64_t LAPACKE_dpbequ_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, const double* ab, int64_t ldab,
+                           double* s, double* scond, double* amax );
+int64_t LAPACKE_cpbequ_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, const lapack_complex_float* ab,
+                           int64_t ldab, float* s, float* scond,
+                           float* amax );
+int64_t LAPACKE_zpbequ_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, const lapack_complex_double* ab,
+                           int64_t ldab, double* s, double* scond,
+                           double* amax );
+
+int64_t LAPACKE_spbrfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, int64_t nrhs, const float* ab,
+                           int64_t ldab, const float* afb, int64_t ldafb,
+                           const float* b, int64_t ldb, float* x,
+                           int64_t ldx, float* ferr, float* berr );
+int64_t LAPACKE_dpbrfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, int64_t nrhs, const double* ab,
+                           int64_t ldab, const double* afb, int64_t ldafb,
+                           const double* b, int64_t ldb, double* x,
+                           int64_t ldx, double* ferr, double* berr );
+int64_t LAPACKE_cpbrfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, int64_t nrhs,
+                           const lapack_complex_float* ab, int64_t ldab,
+                           const lapack_complex_float* afb, int64_t ldafb,
+                           const lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx, float* ferr,
+                           float* berr );
+int64_t LAPACKE_zpbrfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, int64_t nrhs,
+                           const lapack_complex_double* ab, int64_t ldab,
+                           const lapack_complex_double* afb, int64_t ldafb,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* ferr, double* berr );
+
+int64_t LAPACKE_spbstf_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kb, float* bb, int64_t ldbb );
+int64_t LAPACKE_dpbstf_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kb, double* bb, int64_t ldbb );
+int64_t LAPACKE_cpbstf_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kb, lapack_complex_float* bb,
+                           int64_t ldbb );
+int64_t LAPACKE_zpbstf_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kb, lapack_complex_double* bb,
+                           int64_t ldbb );
+
+int64_t LAPACKE_spbsv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t kd, int64_t nrhs, float* ab,
+                          int64_t ldab, float* b, int64_t ldb );
+int64_t LAPACKE_dpbsv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t kd, int64_t nrhs, double* ab,
+                          int64_t ldab, double* b, int64_t ldb );
+int64_t LAPACKE_cpbsv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t kd, int64_t nrhs,
+                          lapack_complex_float* ab, int64_t ldab,
+                          lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zpbsv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t kd, int64_t nrhs,
+                          lapack_complex_double* ab, int64_t ldab,
+                          lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_spbsvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t kd, int64_t nrhs, float* ab,
+                           int64_t ldab, float* afb, int64_t ldafb,
+                           char* equed, float* s, float* b, int64_t ldb,
+                           float* x, int64_t ldx, float* rcond, float* ferr,
+                           float* berr );
+int64_t LAPACKE_dpbsvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t kd, int64_t nrhs, double* ab,
+                           int64_t ldab, double* afb, int64_t ldafb,
+                           char* equed, double* s, double* b, int64_t ldb,
+                           double* x, int64_t ldx, double* rcond,
+                           double* ferr, double* berr );
+int64_t LAPACKE_cpbsvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t kd, int64_t nrhs,
+                           lapack_complex_float* ab, int64_t ldab,
+                           lapack_complex_float* afb, int64_t ldafb,
+                           char* equed, float* s, lapack_complex_float* b,
+                           int64_t ldb, lapack_complex_float* x,
+                           int64_t ldx, float* rcond, float* ferr,
+                           float* berr );
+int64_t LAPACKE_zpbsvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t kd, int64_t nrhs,
+                           lapack_complex_double* ab, int64_t ldab,
+                           lapack_complex_double* afb, int64_t ldafb,
+                           char* equed, double* s, lapack_complex_double* b,
+                           int64_t ldb, lapack_complex_double* x,
+                           int64_t ldx, double* rcond, double* ferr,
+                           double* berr );
+
+int64_t LAPACKE_spbtrf_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, float* ab, int64_t ldab );
+int64_t LAPACKE_dpbtrf_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, double* ab, int64_t ldab );
+int64_t LAPACKE_cpbtrf_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, lapack_complex_float* ab,
+                           int64_t ldab );
+int64_t LAPACKE_zpbtrf_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, lapack_complex_double* ab,
+                           int64_t ldab );
+
+int64_t LAPACKE_spbtrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, int64_t nrhs, const float* ab,
+                           int64_t ldab, float* b, int64_t ldb );
+int64_t LAPACKE_dpbtrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, int64_t nrhs, const double* ab,
+                           int64_t ldab, double* b, int64_t ldb );
+int64_t LAPACKE_cpbtrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, int64_t nrhs,
+                           const lapack_complex_float* ab, int64_t ldab,
+                           lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zpbtrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t kd, int64_t nrhs,
+                           const lapack_complex_double* ab, int64_t ldab,
+                           lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_spftrf_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, float* a );
+int64_t LAPACKE_dpftrf_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, double* a );
+int64_t LAPACKE_cpftrf_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, lapack_complex_float* a );
+int64_t LAPACKE_zpftrf_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, lapack_complex_double* a );
+
+int64_t LAPACKE_spftri_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, float* a );
+int64_t LAPACKE_dpftri_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, double* a );
+int64_t LAPACKE_cpftri_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, lapack_complex_float* a );
+int64_t LAPACKE_zpftri_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, lapack_complex_double* a );
+
+int64_t LAPACKE_spftrs_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, int64_t nrhs, const float* a,
+                           float* b, int64_t ldb );
+int64_t LAPACKE_dpftrs_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, int64_t nrhs, const double* a,
+                           double* b, int64_t ldb );
+int64_t LAPACKE_cpftrs_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, int64_t nrhs,
+                           const lapack_complex_float* a,
+                           lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zpftrs_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, int64_t nrhs,
+                           const lapack_complex_double* a,
+                           lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_spocon_64( int matrix_layout, char uplo, int64_t n,
+                           const float* a, int64_t lda, float anorm,
+                           float* rcond );
+int64_t LAPACKE_dpocon_64( int matrix_layout, char uplo, int64_t n,
+                           const double* a, int64_t lda, double anorm,
+                           double* rcond );
+int64_t LAPACKE_cpocon_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_float* a, int64_t lda,
+                           float anorm, float* rcond );
+int64_t LAPACKE_zpocon_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_double* a, int64_t lda,
+                           double anorm, double* rcond );
+
+int64_t LAPACKE_spoequ_64( int matrix_layout, int64_t n, const float* a,
+                           int64_t lda, float* s, float* scond,
+                           float* amax );
+int64_t LAPACKE_dpoequ_64( int matrix_layout, int64_t n, const double* a,
+                           int64_t lda, double* s, double* scond,
+                           double* amax );
+int64_t LAPACKE_cpoequ_64( int matrix_layout, int64_t n,
+                           const lapack_complex_float* a, int64_t lda,
+                           float* s, float* scond, float* amax );
+int64_t LAPACKE_zpoequ_64( int matrix_layout, int64_t n,
+                           const lapack_complex_double* a, int64_t lda,
+                           double* s, double* scond, double* amax );
+
+int64_t LAPACKE_spoequb_64( int matrix_layout, int64_t n, const float* a,
+                            int64_t lda, float* s, float* scond,
+                            float* amax );
+int64_t LAPACKE_dpoequb_64( int matrix_layout, int64_t n, const double* a,
+                            int64_t lda, double* s, double* scond,
+                            double* amax );
+int64_t LAPACKE_cpoequb_64( int matrix_layout, int64_t n,
+                            const lapack_complex_float* a, int64_t lda,
+                            float* s, float* scond, float* amax );
+int64_t LAPACKE_zpoequb_64( int matrix_layout, int64_t n,
+                            const lapack_complex_double* a, int64_t lda,
+                            double* s, double* scond, double* amax );
+
+int64_t LAPACKE_sporfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const float* a, int64_t lda,
+                           const float* af, int64_t ldaf, const float* b,
+                           int64_t ldb, float* x, int64_t ldx,
+                           float* ferr, float* berr );
+int64_t LAPACKE_dporfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const double* a, int64_t lda,
+                           const double* af, int64_t ldaf, const double* b,
+                           int64_t ldb, double* x, int64_t ldx,
+                           double* ferr, double* berr );
+int64_t LAPACKE_cporfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* a,
+                           int64_t lda, const lapack_complex_float* af,
+                           int64_t ldaf, const lapack_complex_float* b,
+                           int64_t ldb, lapack_complex_float* x,
+                           int64_t ldx, float* ferr, float* berr );
+int64_t LAPACKE_zporfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* a,
+                           int64_t lda, const lapack_complex_double* af,
+                           int64_t ldaf, const lapack_complex_double* b,
+                           int64_t ldb, lapack_complex_double* x,
+                           int64_t ldx, double* ferr, double* berr );
+
+int64_t LAPACKE_sporfsx_64( int matrix_layout, char uplo, char equed,
+                            int64_t n, int64_t nrhs, const float* a,
+                            int64_t lda, const float* af, int64_t ldaf,
+                            const float* s, const float* b, int64_t ldb,
+                            float* x, int64_t ldx, float* rcond, float* berr,
+                            int64_t n_err_bnds, float* err_bnds_norm,
+                            float* err_bnds_comp, int64_t nparams,
+                            float* params );
+int64_t LAPACKE_dporfsx_64( int matrix_layout, char uplo, char equed,
+                            int64_t n, int64_t nrhs, const double* a,
+                            int64_t lda, const double* af, int64_t ldaf,
+                            const double* s, const double* b, int64_t ldb,
+                            double* x, int64_t ldx, double* rcond,
+                            double* berr, int64_t n_err_bnds,
+                            double* err_bnds_norm, double* err_bnds_comp,
+                            int64_t nparams, double* params );
+int64_t LAPACKE_cporfsx_64( int matrix_layout, char uplo, char equed,
+                            int64_t n, int64_t nrhs,
+                            const lapack_complex_float* a, int64_t lda,
+                            const lapack_complex_float* af, int64_t ldaf,
+                            const float* s, const lapack_complex_float* b,
+                            int64_t ldb, lapack_complex_float* x,
+                            int64_t ldx, float* rcond, float* berr,
+                            int64_t n_err_bnds, float* err_bnds_norm,
+                            float* err_bnds_comp, int64_t nparams,
+                            float* params );
+int64_t LAPACKE_zporfsx_64( int matrix_layout, char uplo, char equed,
+                            int64_t n, int64_t nrhs,
+                            const lapack_complex_double* a, int64_t lda,
+                            const lapack_complex_double* af, int64_t ldaf,
+                            const double* s, const lapack_complex_double* b,
+                            int64_t ldb, lapack_complex_double* x,
+                            int64_t ldx, double* rcond, double* berr,
+                            int64_t n_err_bnds, double* err_bnds_norm,
+                            double* err_bnds_comp, int64_t nparams,
+                            double* params );
+
+int64_t LAPACKE_sposv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, float* a, int64_t lda, float* b,
+                          int64_t ldb );
+int64_t LAPACKE_dposv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, double* a, int64_t lda, double* b,
+                          int64_t ldb );
+int64_t LAPACKE_cposv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_float* a,
+                          int64_t lda, lapack_complex_float* b,
+                          int64_t ldb );
+int64_t LAPACKE_zposv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_double* a,
+                          int64_t lda, lapack_complex_double* b,
+                          int64_t ldb );
+int64_t LAPACKE_dsposv_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, double* a, int64_t lda,
+                           const double* b, int64_t ldb, double* x, int64_t ldx,
+                           int64_t* iter );
+int64_t LAPACKE_zcposv_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, lapack_complex_double* a,
+                           int64_t lda, const lapack_complex_double* b,
+                           int64_t ldb, lapack_complex_double* x,
+                           int64_t ldx, int64_t* iter );
+
+int64_t LAPACKE_sposvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, float* a, int64_t lda, float* af,
+                           int64_t ldaf, char* equed, float* s, float* b,
+                           int64_t ldb, float* x, int64_t ldx,
+                           float* rcond, float* ferr, float* berr );
+int64_t LAPACKE_dposvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, double* a, int64_t lda,
+                           double* af, int64_t ldaf, char* equed, double* s,
+                           double* b, int64_t ldb, double* x, int64_t ldx,
+                           double* rcond, double* ferr, double* berr );
+int64_t LAPACKE_cposvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* af,
+                           int64_t ldaf, char* equed, float* s,
+                           lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx,
+                           float* rcond, float* ferr, float* berr );
+int64_t LAPACKE_zposvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* af,
+                           int64_t ldaf, char* equed, double* s,
+                           lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* rcond, double* ferr, double* berr );
+
+int64_t LAPACKE_sposvxx_64( int matrix_layout, char fact, char uplo,
+                            int64_t n, int64_t nrhs, float* a,
+                            int64_t lda, float* af, int64_t ldaf,
+                            char* equed, float* s, float* b, int64_t ldb,
+                            float* x, int64_t ldx, float* rcond,
+                            float* rpvgrw, float* berr, int64_t n_err_bnds,
+                            float* err_bnds_norm, float* err_bnds_comp,
+                            int64_t nparams, float* params );
+int64_t LAPACKE_dposvxx_64( int matrix_layout, char fact, char uplo,
+                            int64_t n, int64_t nrhs, double* a,
+                            int64_t lda, double* af, int64_t ldaf,
+                            char* equed, double* s, double* b, int64_t ldb,
+                            double* x, int64_t ldx, double* rcond,
+                            double* rpvgrw, double* berr, int64_t n_err_bnds,
+                            double* err_bnds_norm, double* err_bnds_comp,
+                            int64_t nparams, double* params );
+int64_t LAPACKE_cposvxx_64( int matrix_layout, char fact, char uplo,
+                            int64_t n, int64_t nrhs,
+                            lapack_complex_float* a, int64_t lda,
+                            lapack_complex_float* af, int64_t ldaf,
+                            char* equed, float* s, lapack_complex_float* b,
+                            int64_t ldb, lapack_complex_float* x,
+                            int64_t ldx, float* rcond, float* rpvgrw,
+                            float* berr, int64_t n_err_bnds,
+                            float* err_bnds_norm, float* err_bnds_comp,
+                            int64_t nparams, float* params );
+int64_t LAPACKE_zposvxx_64( int matrix_layout, char fact, char uplo,
+                            int64_t n, int64_t nrhs,
+                            lapack_complex_double* a, int64_t lda,
+                            lapack_complex_double* af, int64_t ldaf,
+                            char* equed, double* s, lapack_complex_double* b,
+                            int64_t ldb, lapack_complex_double* x,
+                            int64_t ldx, double* rcond, double* rpvgrw,
+                            double* berr, int64_t n_err_bnds,
+                            double* err_bnds_norm, double* err_bnds_comp,
+                            int64_t nparams, double* params );
+
+int64_t LAPACKE_spotrf2_64( int matrix_layout, char uplo, int64_t n, float* a,
+                           int64_t lda );
+int64_t LAPACKE_dpotrf2_64( int matrix_layout, char uplo, int64_t n, double* a,
+                           int64_t lda );
+int64_t LAPACKE_cpotrf2_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda );
+int64_t LAPACKE_zpotrf2_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_spotrf_64( int matrix_layout, char uplo, int64_t n, float* a,
+                           int64_t lda );
+int64_t LAPACKE_dpotrf_64( int matrix_layout, char uplo, int64_t n, double* a,
+                           int64_t lda );
+int64_t LAPACKE_cpotrf_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda );
+int64_t LAPACKE_zpotrf_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_spotri_64( int matrix_layout, char uplo, int64_t n, float* a,
+                           int64_t lda );
+int64_t LAPACKE_dpotri_64( int matrix_layout, char uplo, int64_t n, double* a,
+                           int64_t lda );
+int64_t LAPACKE_cpotri_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda );
+int64_t LAPACKE_zpotri_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_spotrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const float* a, int64_t lda,
+                           float* b, int64_t ldb );
+int64_t LAPACKE_dpotrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const double* a, int64_t lda,
+                           double* b, int64_t ldb );
+int64_t LAPACKE_cpotrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* b,
+                           int64_t ldb );
+int64_t LAPACKE_zpotrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* b,
+                           int64_t ldb );
+
+int64_t LAPACKE_sppcon_64( int matrix_layout, char uplo, int64_t n,
+                           const float* ap, float anorm, float* rcond );
+int64_t LAPACKE_dppcon_64( int matrix_layout, char uplo, int64_t n,
+                           const double* ap, double anorm, double* rcond );
+int64_t LAPACKE_cppcon_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_float* ap, float anorm,
+                           float* rcond );
+int64_t LAPACKE_zppcon_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_double* ap, double anorm,
+                           double* rcond );
+
+int64_t LAPACKE_sppequ_64( int matrix_layout, char uplo, int64_t n,
+                           const float* ap, float* s, float* scond,
+                           float* amax );
+int64_t LAPACKE_dppequ_64( int matrix_layout, char uplo, int64_t n,
+                           const double* ap, double* s, double* scond,
+                           double* amax );
+int64_t LAPACKE_cppequ_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_float* ap, float* s,
+                           float* scond, float* amax );
+int64_t LAPACKE_zppequ_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_double* ap, double* s,
+                           double* scond, double* amax );
+
+int64_t LAPACKE_spprfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const float* ap, const float* afp,
+                           const float* b, int64_t ldb, float* x,
+                           int64_t ldx, float* ferr, float* berr );
+int64_t LAPACKE_dpprfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const double* ap, const double* afp,
+                           const double* b, int64_t ldb, double* x,
+                           int64_t ldx, double* ferr, double* berr );
+int64_t LAPACKE_cpprfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* ap,
+                           const lapack_complex_float* afp,
+                           const lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx, float* ferr,
+                           float* berr );
+int64_t LAPACKE_zpprfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* ap,
+                           const lapack_complex_double* afp,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* ferr, double* berr );
+
+int64_t LAPACKE_sppsv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, float* ap, float* b,
+                          int64_t ldb );
+int64_t LAPACKE_dppsv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, double* ap, double* b,
+                          int64_t ldb );
+int64_t LAPACKE_cppsv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_float* ap,
+                          lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zppsv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_double* ap,
+                          lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_sppsvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, float* ap, float* afp, char* equed,
+                           float* s, float* b, int64_t ldb, float* x,
+                           int64_t ldx, float* rcond, float* ferr,
+                           float* berr );
+int64_t LAPACKE_dppsvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, double* ap, double* afp,
+                           char* equed, double* s, double* b, int64_t ldb,
+                           double* x, int64_t ldx, double* rcond,
+                           double* ferr, double* berr );
+int64_t LAPACKE_cppsvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, lapack_complex_float* ap,
+                           lapack_complex_float* afp, char* equed, float* s,
+                           lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx,
+                           float* rcond, float* ferr, float* berr );
+int64_t LAPACKE_zppsvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, lapack_complex_double* ap,
+                           lapack_complex_double* afp, char* equed, double* s,
+                           lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* rcond, double* ferr, double* berr );
+
+int64_t LAPACKE_spptrf_64( int matrix_layout, char uplo, int64_t n,
+                           float* ap );
+int64_t LAPACKE_dpptrf_64( int matrix_layout, char uplo, int64_t n,
+                           double* ap );
+int64_t LAPACKE_cpptrf_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* ap );
+int64_t LAPACKE_zpptrf_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* ap );
+
+int64_t LAPACKE_spptri_64( int matrix_layout, char uplo, int64_t n,
+                           float* ap );
+int64_t LAPACKE_dpptri_64( int matrix_layout, char uplo, int64_t n,
+                           double* ap );
+int64_t LAPACKE_cpptri_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* ap );
+int64_t LAPACKE_zpptri_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* ap );
+
+int64_t LAPACKE_spptrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const float* ap, float* b,
+                           int64_t ldb );
+int64_t LAPACKE_dpptrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const double* ap, double* b,
+                           int64_t ldb );
+int64_t LAPACKE_cpptrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* ap,
+                           lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zpptrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* ap,
+                           lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_spstrf_64( int matrix_layout, char uplo, int64_t n, float* a,
+                           int64_t lda, int64_t* piv, int64_t* rank,
+                           float tol );
+int64_t LAPACKE_dpstrf_64( int matrix_layout, char uplo, int64_t n, double* a,
+                           int64_t lda, int64_t* piv, int64_t* rank,
+                           double tol );
+int64_t LAPACKE_cpstrf_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           int64_t* piv, int64_t* rank, float tol );
+int64_t LAPACKE_zpstrf_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           int64_t* piv, int64_t* rank, double tol );
+
+int64_t LAPACKE_sptcon_64( int64_t n, const float* d, const float* e,
+                           float anorm, float* rcond );
+int64_t LAPACKE_dptcon_64( int64_t n, const double* d, const double* e,
+                           double anorm, double* rcond );
+int64_t LAPACKE_cptcon_64( int64_t n, const float* d,
+                           const lapack_complex_float* e, float anorm,
+                           float* rcond );
+int64_t LAPACKE_zptcon_64( int64_t n, const double* d,
+                           const lapack_complex_double* e, double anorm,
+                           double* rcond );
+
+int64_t LAPACKE_spteqr_64( int matrix_layout, char compz, int64_t n, float* d,
+                           float* e, float* z, int64_t ldz );
+int64_t LAPACKE_dpteqr_64( int matrix_layout, char compz, int64_t n,
+                           double* d, double* e, double* z, int64_t ldz );
+int64_t LAPACKE_cpteqr_64( int matrix_layout, char compz, int64_t n, float* d,
+                           float* e, lapack_complex_float* z, int64_t ldz );
+int64_t LAPACKE_zpteqr_64( int matrix_layout, char compz, int64_t n,
+                           double* d, double* e, lapack_complex_double* z,
+                           int64_t ldz );
+
+int64_t LAPACKE_sptrfs_64( int matrix_layout, int64_t n, int64_t nrhs,
+                           const float* d, const float* e, const float* df,
+                           const float* ef, const float* b, int64_t ldb,
+                           float* x, int64_t ldx, float* ferr, float* berr );
+int64_t LAPACKE_dptrfs_64( int matrix_layout, int64_t n, int64_t nrhs,
+                           const double* d, const double* e, const double* df,
+                           const double* ef, const double* b, int64_t ldb,
+                           double* x, int64_t ldx, double* ferr,
+                           double* berr );
+int64_t LAPACKE_cptrfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const float* d,
+                           const lapack_complex_float* e, const float* df,
+                           const lapack_complex_float* ef,
+                           const lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx, float* ferr,
+                           float* berr );
+int64_t LAPACKE_zptrfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const double* d,
+                           const lapack_complex_double* e, const double* df,
+                           const lapack_complex_double* ef,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* ferr, double* berr );
+
+int64_t LAPACKE_sptsv_64( int matrix_layout, int64_t n, int64_t nrhs,
+                          float* d, float* e, float* b, int64_t ldb );
+int64_t LAPACKE_dptsv_64( int matrix_layout, int64_t n, int64_t nrhs,
+                          double* d, double* e, double* b, int64_t ldb );
+int64_t LAPACKE_cptsv_64( int matrix_layout, int64_t n, int64_t nrhs,
+                          float* d, lapack_complex_float* e,
+                          lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zptsv_64( int matrix_layout, int64_t n, int64_t nrhs,
+                          double* d, lapack_complex_double* e,
+                          lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_sptsvx_64( int matrix_layout, char fact, int64_t n,
+                           int64_t nrhs, const float* d, const float* e,
+                           float* df, float* ef, const float* b, int64_t ldb,
+                           float* x, int64_t ldx, float* rcond, float* ferr,
+                           float* berr );
+int64_t LAPACKE_dptsvx_64( int matrix_layout, char fact, int64_t n,
+                           int64_t nrhs, const double* d, const double* e,
+                           double* df, double* ef, const double* b,
+                           int64_t ldb, double* x, int64_t ldx,
+                           double* rcond, double* ferr, double* berr );
+int64_t LAPACKE_cptsvx_64( int matrix_layout, char fact, int64_t n,
+                           int64_t nrhs, const float* d,
+                           const lapack_complex_float* e, float* df,
+                           lapack_complex_float* ef,
+                           const lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx,
+                           float* rcond, float* ferr, float* berr );
+int64_t LAPACKE_zptsvx_64( int matrix_layout, char fact, int64_t n,
+                           int64_t nrhs, const double* d,
+                           const lapack_complex_double* e, double* df,
+                           lapack_complex_double* ef,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* rcond, double* ferr, double* berr );
+
+int64_t LAPACKE_spttrf_64( int64_t n, float* d, float* e );
+int64_t LAPACKE_dpttrf_64( int64_t n, double* d, double* e );
+int64_t LAPACKE_cpttrf_64( int64_t n, float* d, lapack_complex_float* e );
+int64_t LAPACKE_zpttrf_64( int64_t n, double* d, lapack_complex_double* e );
+
+int64_t LAPACKE_spttrs_64( int matrix_layout, int64_t n, int64_t nrhs,
+                           const float* d, const float* e, float* b,
+                           int64_t ldb );
+int64_t LAPACKE_dpttrs_64( int matrix_layout, int64_t n, int64_t nrhs,
+                           const double* d, const double* e, double* b,
+                           int64_t ldb );
+int64_t LAPACKE_cpttrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const float* d,
+                           const lapack_complex_float* e,
+                           lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zpttrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const double* d,
+                           const lapack_complex_double* e,
+                           lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_ssbev_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          int64_t kd, float* ab, int64_t ldab, float* w,
+                          float* z, int64_t ldz );
+int64_t LAPACKE_dsbev_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          int64_t kd, double* ab, int64_t ldab, double* w,
+                          double* z, int64_t ldz );
+
+int64_t LAPACKE_ssbevd_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           int64_t kd, float* ab, int64_t ldab, float* w,
+                           float* z, int64_t ldz );
+int64_t LAPACKE_dsbevd_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           int64_t kd, double* ab, int64_t ldab,
+                           double* w, double* z, int64_t ldz );
+
+int64_t LAPACKE_ssbevx_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, int64_t kd, float* ab,
+                           int64_t ldab, float* q, int64_t ldq, float vl,
+                           float vu, int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, float* z, int64_t ldz,
+                           int64_t* ifail );
+int64_t LAPACKE_dsbevx_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, int64_t kd, double* ab,
+                           int64_t ldab, double* q, int64_t ldq,
+                           double vl, double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w, double* z,
+                           int64_t ldz, int64_t* ifail );
+
+int64_t LAPACKE_ssbgst_64( int matrix_layout, char vect, char uplo, int64_t n,
+                           int64_t ka, int64_t kb, float* ab,
+                           int64_t ldab, const float* bb, int64_t ldbb,
+                           float* x, int64_t ldx );
+int64_t LAPACKE_dsbgst_64( int matrix_layout, char vect, char uplo, int64_t n,
+                           int64_t ka, int64_t kb, double* ab,
+                           int64_t ldab, const double* bb, int64_t ldbb,
+                           double* x, int64_t ldx );
+
+int64_t LAPACKE_ssbgv_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          int64_t ka, int64_t kb, float* ab,
+                          int64_t ldab, float* bb, int64_t ldbb, float* w,
+                          float* z, int64_t ldz );
+int64_t LAPACKE_dsbgv_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          int64_t ka, int64_t kb, double* ab,
+                          int64_t ldab, double* bb, int64_t ldbb,
+                          double* w, double* z, int64_t ldz );
+
+int64_t LAPACKE_ssbgvd_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           int64_t ka, int64_t kb, float* ab,
+                           int64_t ldab, float* bb, int64_t ldbb,
+                           float* w, float* z, int64_t ldz );
+int64_t LAPACKE_dsbgvd_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           int64_t ka, int64_t kb, double* ab,
+                           int64_t ldab, double* bb, int64_t ldbb,
+                           double* w, double* z, int64_t ldz );
+
+int64_t LAPACKE_ssbgvx_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, int64_t ka, int64_t kb,
+                           float* ab, int64_t ldab, float* bb,
+                           int64_t ldbb, float* q, int64_t ldq, float vl,
+                           float vu, int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, float* z, int64_t ldz,
+                           int64_t* ifail );
+int64_t LAPACKE_dsbgvx_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, int64_t ka, int64_t kb,
+                           double* ab, int64_t ldab, double* bb,
+                           int64_t ldbb, double* q, int64_t ldq,
+                           double vl, double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w, double* z,
+                           int64_t ldz, int64_t* ifail );
+
+int64_t LAPACKE_ssbtrd_64( int matrix_layout, char vect, char uplo, int64_t n,
+                           int64_t kd, float* ab, int64_t ldab, float* d,
+                           float* e, float* q, int64_t ldq );
+int64_t LAPACKE_dsbtrd_64( int matrix_layout, char vect, char uplo, int64_t n,
+                           int64_t kd, double* ab, int64_t ldab,
+                           double* d, double* e, double* q, int64_t ldq );
+
+int64_t LAPACKE_ssfrk_64( int matrix_layout, char transr, char uplo, char trans,
+                          int64_t n, int64_t k, float alpha,
+                          const float* a, int64_t lda, float beta,
+                          float* c );
+int64_t LAPACKE_dsfrk_64( int matrix_layout, char transr, char uplo, char trans,
+                          int64_t n, int64_t k, double alpha,
+                          const double* a, int64_t lda, double beta,
+                          double* c );
+
+int64_t LAPACKE_sspcon_64( int matrix_layout, char uplo, int64_t n,
+                           const float* ap, const int64_t* ipiv, float anorm,
+                           float* rcond );
+int64_t LAPACKE_dspcon_64( int matrix_layout, char uplo, int64_t n,
+                           const double* ap, const int64_t* ipiv,
+                           double anorm, double* rcond );
+int64_t LAPACKE_cspcon_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_float* ap,
+                           const int64_t* ipiv, float anorm, float* rcond );
+int64_t LAPACKE_zspcon_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_double* ap,
+                           const int64_t* ipiv, double anorm,
+                           double* rcond );
+
+int64_t LAPACKE_sspev_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          float* ap, float* w, float* z, int64_t ldz );
+int64_t LAPACKE_dspev_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          double* ap, double* w, double* z, int64_t ldz );
+
+int64_t LAPACKE_sspevd_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           float* ap, float* w, float* z, int64_t ldz );
+int64_t LAPACKE_dspevd_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           double* ap, double* w, double* z, int64_t ldz );
+
+int64_t LAPACKE_sspevx_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, float* ap, float vl, float vu,
+                           int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, float* z, int64_t ldz,
+                           int64_t* ifail );
+int64_t LAPACKE_dspevx_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, double* ap, double vl, double vu,
+                           int64_t il, int64_t iu, double abstol,
+                           int64_t* m, double* w, double* z, int64_t ldz,
+                           int64_t* ifail );
+
+int64_t LAPACKE_sspgst_64( int matrix_layout, int64_t itype, char uplo,
+                           int64_t n, float* ap, const float* bp );
+int64_t LAPACKE_dspgst_64( int matrix_layout, int64_t itype, char uplo,
+                           int64_t n, double* ap, const double* bp );
+
+int64_t LAPACKE_sspgv_64( int matrix_layout, int64_t itype, char jobz,
+                          char uplo, int64_t n, float* ap, float* bp,
+                          float* w, float* z, int64_t ldz );
+int64_t LAPACKE_dspgv_64( int matrix_layout, int64_t itype, char jobz,
+                          char uplo, int64_t n, double* ap, double* bp,
+                          double* w, double* z, int64_t ldz );
+
+int64_t LAPACKE_sspgvd_64( int matrix_layout, int64_t itype, char jobz,
+                           char uplo, int64_t n, float* ap, float* bp,
+                           float* w, float* z, int64_t ldz );
+int64_t LAPACKE_dspgvd_64( int matrix_layout, int64_t itype, char jobz,
+                           char uplo, int64_t n, double* ap, double* bp,
+                           double* w, double* z, int64_t ldz );
+
+int64_t LAPACKE_sspgvx_64( int matrix_layout, int64_t itype, char jobz,
+                           char range, char uplo, int64_t n, float* ap,
+                           float* bp, float vl, float vu, int64_t il,
+                           int64_t iu, float abstol, int64_t* m, float* w,
+                           float* z, int64_t ldz, int64_t* ifail );
+int64_t LAPACKE_dspgvx_64( int matrix_layout, int64_t itype, char jobz,
+                           char range, char uplo, int64_t n, double* ap,
+                           double* bp, double vl, double vu, int64_t il,
+                           int64_t iu, double abstol, int64_t* m,
+                           double* w, double* z, int64_t ldz,
+                           int64_t* ifail );
+
+int64_t LAPACKE_ssprfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const float* ap, const float* afp,
+                           const int64_t* ipiv, const float* b,
+                           int64_t ldb, float* x, int64_t ldx,
+                           float* ferr, float* berr );
+int64_t LAPACKE_dsprfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const double* ap, const double* afp,
+                           const int64_t* ipiv, const double* b,
+                           int64_t ldb, double* x, int64_t ldx,
+                           double* ferr, double* berr );
+int64_t LAPACKE_csprfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* ap,
+                           const lapack_complex_float* afp,
+                           const int64_t* ipiv,
+                           const lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx, float* ferr,
+                           float* berr );
+int64_t LAPACKE_zsprfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* ap,
+                           const lapack_complex_double* afp,
+                           const int64_t* ipiv,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* ferr, double* berr );
+
+int64_t LAPACKE_sspsv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, float* ap, int64_t* ipiv,
+                          float* b, int64_t ldb );
+int64_t LAPACKE_dspsv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, double* ap, int64_t* ipiv,
+                          double* b, int64_t ldb );
+int64_t LAPACKE_cspsv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_float* ap,
+                          int64_t* ipiv, lapack_complex_float* b,
+                          int64_t ldb );
+int64_t LAPACKE_zspsv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_double* ap,
+                          int64_t* ipiv, lapack_complex_double* b,
+                          int64_t ldb );
+
+int64_t LAPACKE_sspsvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, const float* ap, float* afp,
+                           int64_t* ipiv, const float* b, int64_t ldb,
+                           float* x, int64_t ldx, float* rcond, float* ferr,
+                           float* berr );
+int64_t LAPACKE_dspsvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, const double* ap, double* afp,
+                           int64_t* ipiv, const double* b, int64_t ldb,
+                           double* x, int64_t ldx, double* rcond,
+                           double* ferr, double* berr );
+int64_t LAPACKE_cspsvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* ap,
+                           lapack_complex_float* afp, int64_t* ipiv,
+                           const lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx,
+                           float* rcond, float* ferr, float* berr );
+int64_t LAPACKE_zspsvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* ap,
+                           lapack_complex_double* afp, int64_t* ipiv,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* rcond, double* ferr, double* berr );
+
+int64_t LAPACKE_ssptrd_64( int matrix_layout, char uplo, int64_t n, float* ap,
+                           float* d, float* e, float* tau );
+int64_t LAPACKE_dsptrd_64( int matrix_layout, char uplo, int64_t n,
+                           double* ap, double* d, double* e, double* tau );
+
+int64_t LAPACKE_ssptrf_64( int matrix_layout, char uplo, int64_t n, float* ap,
+                           int64_t* ipiv );
+int64_t LAPACKE_dsptrf_64( int matrix_layout, char uplo, int64_t n,
+                           double* ap, int64_t* ipiv );
+int64_t LAPACKE_csptrf_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* ap, int64_t* ipiv );
+int64_t LAPACKE_zsptrf_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* ap, int64_t* ipiv );
+
+int64_t LAPACKE_ssptri_64( int matrix_layout, char uplo, int64_t n, float* ap,
+                           const int64_t* ipiv );
+int64_t LAPACKE_dsptri_64( int matrix_layout, char uplo, int64_t n,
+                           double* ap, const int64_t* ipiv );
+int64_t LAPACKE_csptri_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* ap, const int64_t* ipiv );
+int64_t LAPACKE_zsptri_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* ap, const int64_t* ipiv );
+
+int64_t LAPACKE_ssptrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const float* ap,
+                           const int64_t* ipiv, float* b, int64_t ldb );
+int64_t LAPACKE_dsptrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const double* ap,
+                           const int64_t* ipiv, double* b, int64_t ldb );
+int64_t LAPACKE_csptrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* ap,
+                           const int64_t* ipiv, lapack_complex_float* b,
+                           int64_t ldb );
+int64_t LAPACKE_zsptrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* ap,
+                           const int64_t* ipiv, lapack_complex_double* b,
+                           int64_t ldb );
+
+int64_t LAPACKE_sstebz_64( char range, char order, int64_t n, float vl,
+                           float vu, int64_t il, int64_t iu, float abstol,
+                           const float* d, const float* e, int64_t* m,
+                           int64_t* nsplit, float* w, int64_t* iblock,
+                           int64_t* isplit );
+int64_t LAPACKE_dstebz_64( char range, char order, int64_t n, double vl,
+                           double vu, int64_t il, int64_t iu,
+                           double abstol, const double* d, const double* e,
+                           int64_t* m, int64_t* nsplit, double* w,
+                           int64_t* iblock, int64_t* isplit );
+
+int64_t LAPACKE_sstedc_64( int matrix_layout, char compz, int64_t n, float* d,
+                           float* e, float* z, int64_t ldz );
+int64_t LAPACKE_dstedc_64( int matrix_layout, char compz, int64_t n,
+                           double* d, double* e, double* z, int64_t ldz );
+int64_t LAPACKE_cstedc_64( int matrix_layout, char compz, int64_t n, float* d,
+                           float* e, lapack_complex_float* z, int64_t ldz );
+int64_t LAPACKE_zstedc_64( int matrix_layout, char compz, int64_t n,
+                           double* d, double* e, lapack_complex_double* z,
+                           int64_t ldz );
+
+int64_t LAPACKE_sstegr_64( int matrix_layout, char jobz, char range,
+                           int64_t n, float* d, float* e, float vl, float vu,
+                           int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, float* z, int64_t ldz,
+                           int64_t* isuppz );
+int64_t LAPACKE_dstegr_64( int matrix_layout, char jobz, char range,
+                           int64_t n, double* d, double* e, double vl,
+                           double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w, double* z,
+                           int64_t ldz, int64_t* isuppz );
+int64_t LAPACKE_cstegr_64( int matrix_layout, char jobz, char range,
+                           int64_t n, float* d, float* e, float vl, float vu,
+                           int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, lapack_complex_float* z,
+                           int64_t ldz, int64_t* isuppz );
+int64_t LAPACKE_zstegr_64( int matrix_layout, char jobz, char range,
+                           int64_t n, double* d, double* e, double vl,
+                           double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w,
+                           lapack_complex_double* z, int64_t ldz,
+                           int64_t* isuppz );
+
+int64_t LAPACKE_sstein_64( int matrix_layout, int64_t n, const float* d,
+                           const float* e, int64_t m, const float* w,
+                           const int64_t* iblock, const int64_t* isplit,
+                           float* z, int64_t ldz, int64_t* ifailv );
+int64_t LAPACKE_dstein_64( int matrix_layout, int64_t n, const double* d,
+                           const double* e, int64_t m, const double* w,
+                           const int64_t* iblock, const int64_t* isplit,
+                           double* z, int64_t ldz, int64_t* ifailv );
+int64_t LAPACKE_cstein_64( int matrix_layout, int64_t n, const float* d,
+                           const float* e, int64_t m, const float* w,
+                           const int64_t* iblock, const int64_t* isplit,
+                           lapack_complex_float* z, int64_t ldz,
+                           int64_t* ifailv );
+int64_t LAPACKE_zstein_64( int matrix_layout, int64_t n, const double* d,
+                           const double* e, int64_t m, const double* w,
+                           const int64_t* iblock, const int64_t* isplit,
+                           lapack_complex_double* z, int64_t ldz,
+                           int64_t* ifailv );
+
+int64_t LAPACKE_sstemr_64( int matrix_layout, char jobz, char range,
+                           int64_t n, float* d, float* e, float vl, float vu,
+                           int64_t il, int64_t iu, int64_t* m,
+                           float* w, float* z, int64_t ldz, int64_t nzc,
+                           int64_t* isuppz, lapack_logical* tryrac );
+int64_t LAPACKE_dstemr_64( int matrix_layout, char jobz, char range,
+                           int64_t n, double* d, double* e, double vl,
+                           double vu, int64_t il, int64_t iu,
+                           int64_t* m, double* w, double* z, int64_t ldz,
+                           int64_t nzc, int64_t* isuppz,
+                           lapack_logical* tryrac );
+int64_t LAPACKE_cstemr_64( int matrix_layout, char jobz, char range,
+                           int64_t n, float* d, float* e, float vl, float vu,
+                           int64_t il, int64_t iu, int64_t* m,
+                           float* w, lapack_complex_float* z, int64_t ldz,
+                           int64_t nzc, int64_t* isuppz,
+                           lapack_logical* tryrac );
+int64_t LAPACKE_zstemr_64( int matrix_layout, char jobz, char range,
+                           int64_t n, double* d, double* e, double vl,
+                           double vu, int64_t il, int64_t iu,
+                           int64_t* m, double* w, lapack_complex_double* z,
+                           int64_t ldz, int64_t nzc, int64_t* isuppz,
+                           lapack_logical* tryrac );
+
+int64_t LAPACKE_ssteqr_64( int matrix_layout, char compz, int64_t n, float* d,
+                           float* e, float* z, int64_t ldz );
+int64_t LAPACKE_dsteqr_64( int matrix_layout, char compz, int64_t n,
+                           double* d, double* e, double* z, int64_t ldz );
+int64_t LAPACKE_csteqr_64( int matrix_layout, char compz, int64_t n, float* d,
+                           float* e, lapack_complex_float* z, int64_t ldz );
+int64_t LAPACKE_zsteqr_64( int matrix_layout, char compz, int64_t n,
+                           double* d, double* e, lapack_complex_double* z,
+                           int64_t ldz );
+
+int64_t LAPACKE_ssterf_64( int64_t n, float* d, float* e );
+int64_t LAPACKE_dsterf_64( int64_t n, double* d, double* e );
+
+int64_t LAPACKE_sstev_64( int matrix_layout, char jobz, int64_t n, float* d,
+                          float* e, float* z, int64_t ldz );
+int64_t LAPACKE_dstev_64( int matrix_layout, char jobz, int64_t n, double* d,
+                          double* e, double* z, int64_t ldz );
+
+int64_t LAPACKE_sstevd_64( int matrix_layout, char jobz, int64_t n, float* d,
+                           float* e, float* z, int64_t ldz );
+int64_t LAPACKE_dstevd_64( int matrix_layout, char jobz, int64_t n, double* d,
+                           double* e, double* z, int64_t ldz );
+
+int64_t LAPACKE_sstevr_64( int matrix_layout, char jobz, char range,
+                           int64_t n, float* d, float* e, float vl, float vu,
+                           int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, float* z, int64_t ldz,
+                           int64_t* isuppz );
+int64_t LAPACKE_dstevr_64( int matrix_layout, char jobz, char range,
+                           int64_t n, double* d, double* e, double vl,
+                           double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w, double* z,
+                           int64_t ldz, int64_t* isuppz );
+
+int64_t LAPACKE_sstevx_64( int matrix_layout, char jobz, char range,
+                           int64_t n, float* d, float* e, float vl, float vu,
+                           int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, float* z, int64_t ldz,
+                           int64_t* ifail );
+int64_t LAPACKE_dstevx_64( int matrix_layout, char jobz, char range,
+                           int64_t n, double* d, double* e, double vl,
+                           double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w, double* z,
+                           int64_t ldz, int64_t* ifail );
+
+int64_t LAPACKE_ssycon_64( int matrix_layout, char uplo, int64_t n,
+                           const float* a, int64_t lda,
+                           const int64_t* ipiv, float anorm, float* rcond );
+int64_t LAPACKE_dsycon_64( int matrix_layout, char uplo, int64_t n,
+                           const double* a, int64_t lda,
+                           const int64_t* ipiv, double anorm,
+                           double* rcond );
+int64_t LAPACKE_csycon_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_float* a, int64_t lda,
+                           const int64_t* ipiv, float anorm, float* rcond );
+int64_t LAPACKE_zsycon_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_double* a, int64_t lda,
+                           const int64_t* ipiv, double anorm,
+                           double* rcond );
+
+int64_t LAPACKE_ssyequb_64( int matrix_layout, char uplo, int64_t n,
+                            const float* a, int64_t lda, float* s,
+                            float* scond, float* amax );
+int64_t LAPACKE_dsyequb_64( int matrix_layout, char uplo, int64_t n,
+                            const double* a, int64_t lda, double* s,
+                            double* scond, double* amax );
+int64_t LAPACKE_csyequb_64( int matrix_layout, char uplo, int64_t n,
+                            const lapack_complex_float* a, int64_t lda,
+                            float* s, float* scond, float* amax );
+int64_t LAPACKE_zsyequb_64( int matrix_layout, char uplo, int64_t n,
+                            const lapack_complex_double* a, int64_t lda,
+                            double* s, double* scond, double* amax );
+
+int64_t LAPACKE_ssyev_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          float* a, int64_t lda, float* w );
+int64_t LAPACKE_dsyev_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          double* a, int64_t lda, double* w );
+
+int64_t LAPACKE_ssyevd_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           float* a, int64_t lda, float* w );
+int64_t LAPACKE_dsyevd_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           double* a, int64_t lda, double* w );
+
+int64_t LAPACKE_ssyevr_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, float* a, int64_t lda, float vl,
+                           float vu, int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, float* z, int64_t ldz,
+                           int64_t* isuppz );
+int64_t LAPACKE_dsyevr_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, double* a, int64_t lda, double vl,
+                           double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w, double* z,
+                           int64_t ldz, int64_t* isuppz );
+
+int64_t LAPACKE_ssyevx_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, float* a, int64_t lda, float vl,
+                           float vu, int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, float* z, int64_t ldz,
+                           int64_t* ifail );
+int64_t LAPACKE_dsyevx_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, double* a, int64_t lda, double vl,
+                           double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w, double* z,
+                           int64_t ldz, int64_t* ifail );
+
+int64_t LAPACKE_ssygst_64( int matrix_layout, int64_t itype, char uplo,
+                           int64_t n, float* a, int64_t lda,
+                           const float* b, int64_t ldb );
+int64_t LAPACKE_dsygst_64( int matrix_layout, int64_t itype, char uplo,
+                           int64_t n, double* a, int64_t lda,
+                           const double* b, int64_t ldb );
+
+int64_t LAPACKE_ssygv_64( int matrix_layout, int64_t itype, char jobz,
+                          char uplo, int64_t n, float* a, int64_t lda,
+                          float* b, int64_t ldb, float* w );
+int64_t LAPACKE_dsygv_64( int matrix_layout, int64_t itype, char jobz,
+                          char uplo, int64_t n, double* a, int64_t lda,
+                          double* b, int64_t ldb, double* w );
+
+int64_t LAPACKE_ssygvd_64( int matrix_layout, int64_t itype, char jobz,
+                           char uplo, int64_t n, float* a, int64_t lda,
+                           float* b, int64_t ldb, float* w );
+int64_t LAPACKE_dsygvd_64( int matrix_layout, int64_t itype, char jobz,
+                           char uplo, int64_t n, double* a, int64_t lda,
+                           double* b, int64_t ldb, double* w );
+
+int64_t LAPACKE_ssygvx_64( int matrix_layout, int64_t itype, char jobz,
+                           char range, char uplo, int64_t n, float* a,
+                           int64_t lda, float* b, int64_t ldb, float vl,
+                           float vu, int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, float* z, int64_t ldz,
+                           int64_t* ifail );
+int64_t LAPACKE_dsygvx_64( int matrix_layout, int64_t itype, char jobz,
+                           char range, char uplo, int64_t n, double* a,
+                           int64_t lda, double* b, int64_t ldb, double vl,
+                           double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w, double* z,
+                           int64_t ldz, int64_t* ifail );
+
+int64_t LAPACKE_ssyrfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const float* a, int64_t lda,
+                           const float* af, int64_t ldaf,
+                           const int64_t* ipiv, const float* b,
+                           int64_t ldb, float* x, int64_t ldx,
+                           float* ferr, float* berr );
+int64_t LAPACKE_dsyrfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const double* a, int64_t lda,
+                           const double* af, int64_t ldaf,
+                           const int64_t* ipiv, const double* b,
+                           int64_t ldb, double* x, int64_t ldx,
+                           double* ferr, double* berr );
+int64_t LAPACKE_csyrfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* a,
+                           int64_t lda, const lapack_complex_float* af,
+                           int64_t ldaf, const int64_t* ipiv,
+                           const lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx, float* ferr,
+                           float* berr );
+int64_t LAPACKE_zsyrfs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* a,
+                           int64_t lda, const lapack_complex_double* af,
+                           int64_t ldaf, const int64_t* ipiv,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* ferr, double* berr );
+
+int64_t LAPACKE_ssyrfsx_64( int matrix_layout, char uplo, char equed,
+                            int64_t n, int64_t nrhs, const float* a,
+                            int64_t lda, const float* af, int64_t ldaf,
+                            const int64_t* ipiv, const float* s,
+                            const float* b, int64_t ldb, float* x,
+                            int64_t ldx, float* rcond, float* berr,
+                            int64_t n_err_bnds, float* err_bnds_norm,
+                            float* err_bnds_comp, int64_t nparams,
+                            float* params );
+int64_t LAPACKE_dsyrfsx_64( int matrix_layout, char uplo, char equed,
+                            int64_t n, int64_t nrhs, const double* a,
+                            int64_t lda, const double* af, int64_t ldaf,
+                            const int64_t* ipiv, const double* s,
+                            const double* b, int64_t ldb, double* x,
+                            int64_t ldx, double* rcond, double* berr,
+                            int64_t n_err_bnds, double* err_bnds_norm,
+                            double* err_bnds_comp, int64_t nparams,
+                            double* params );
+int64_t LAPACKE_csyrfsx_64( int matrix_layout, char uplo, char equed,
+                            int64_t n, int64_t nrhs,
+                            const lapack_complex_float* a, int64_t lda,
+                            const lapack_complex_float* af, int64_t ldaf,
+                            const int64_t* ipiv, const float* s,
+                            const lapack_complex_float* b, int64_t ldb,
+                            lapack_complex_float* x, int64_t ldx,
+                            float* rcond, float* berr, int64_t n_err_bnds,
+                            float* err_bnds_norm, float* err_bnds_comp,
+                            int64_t nparams, float* params );
+int64_t LAPACKE_zsyrfsx_64( int matrix_layout, char uplo, char equed,
+                            int64_t n, int64_t nrhs,
+                            const lapack_complex_double* a, int64_t lda,
+                            const lapack_complex_double* af, int64_t ldaf,
+                            const int64_t* ipiv, const double* s,
+                            const lapack_complex_double* b, int64_t ldb,
+                            lapack_complex_double* x, int64_t ldx,
+                            double* rcond, double* berr, int64_t n_err_bnds,
+                            double* err_bnds_norm, double* err_bnds_comp,
+                            int64_t nparams, double* params );
+
+int64_t LAPACKE_ssysv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, float* a, int64_t lda,
+                          int64_t* ipiv, float* b, int64_t ldb );
+int64_t LAPACKE_dsysv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, double* a, int64_t lda,
+                          int64_t* ipiv, double* b, int64_t ldb );
+int64_t LAPACKE_csysv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_float* a,
+                          int64_t lda, int64_t* ipiv,
+                          lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zsysv_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_double* a,
+                          int64_t lda, int64_t* ipiv,
+                          lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_ssysvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, const float* a, int64_t lda,
+                           float* af, int64_t ldaf, int64_t* ipiv,
+                           const float* b, int64_t ldb, float* x,
+                           int64_t ldx, float* rcond, float* ferr,
+                           float* berr );
+int64_t LAPACKE_dsysvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, const double* a, int64_t lda,
+                           double* af, int64_t ldaf, int64_t* ipiv,
+                           const double* b, int64_t ldb, double* x,
+                           int64_t ldx, double* rcond, double* ferr,
+                           double* berr );
+int64_t LAPACKE_csysvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* af,
+                           int64_t ldaf, int64_t* ipiv,
+                           const lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* x, int64_t ldx,
+                           float* rcond, float* ferr, float* berr );
+int64_t LAPACKE_zsysvx_64( int matrix_layout, char fact, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* af,
+                           int64_t ldaf, int64_t* ipiv,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* x, int64_t ldx,
+                           double* rcond, double* ferr, double* berr );
+
+int64_t LAPACKE_ssysvxx_64( int matrix_layout, char fact, char uplo,
+                            int64_t n, int64_t nrhs, float* a,
+                            int64_t lda, float* af, int64_t ldaf,
+                            int64_t* ipiv, char* equed, float* s, float* b,
+                            int64_t ldb, float* x, int64_t ldx,
+                            float* rcond, float* rpvgrw, float* berr,
+                            int64_t n_err_bnds, float* err_bnds_norm,
+                            float* err_bnds_comp, int64_t nparams,
+                            float* params );
+int64_t LAPACKE_dsysvxx_64( int matrix_layout, char fact, char uplo,
+                            int64_t n, int64_t nrhs, double* a,
+                            int64_t lda, double* af, int64_t ldaf,
+                            int64_t* ipiv, char* equed, double* s, double* b,
+                            int64_t ldb, double* x, int64_t ldx,
+                            double* rcond, double* rpvgrw, double* berr,
+                            int64_t n_err_bnds, double* err_bnds_norm,
+                            double* err_bnds_comp, int64_t nparams,
+                            double* params );
+int64_t LAPACKE_csysvxx_64( int matrix_layout, char fact, char uplo,
+                            int64_t n, int64_t nrhs,
+                            lapack_complex_float* a, int64_t lda,
+                            lapack_complex_float* af, int64_t ldaf,
+                            int64_t* ipiv, char* equed, float* s,
+                            lapack_complex_float* b, int64_t ldb,
+                            lapack_complex_float* x, int64_t ldx,
+                            float* rcond, float* rpvgrw, float* berr,
+                            int64_t n_err_bnds, float* err_bnds_norm,
+                            float* err_bnds_comp, int64_t nparams,
+                            float* params );
+int64_t LAPACKE_zsysvxx_64( int matrix_layout, char fact, char uplo,
+                            int64_t n, int64_t nrhs,
+                            lapack_complex_double* a, int64_t lda,
+                            lapack_complex_double* af, int64_t ldaf,
+                            int64_t* ipiv, char* equed, double* s,
+                            lapack_complex_double* b, int64_t ldb,
+                            lapack_complex_double* x, int64_t ldx,
+                            double* rcond, double* rpvgrw, double* berr,
+                            int64_t n_err_bnds, double* err_bnds_norm,
+                            double* err_bnds_comp, int64_t nparams,
+                            double* params );
+
+int64_t LAPACKE_ssytrd_64( int matrix_layout, char uplo, int64_t n, float* a,
+                           int64_t lda, float* d, float* e, float* tau );
+int64_t LAPACKE_dsytrd_64( int matrix_layout, char uplo, int64_t n, double* a,
+                           int64_t lda, double* d, double* e, double* tau );
+
+int64_t LAPACKE_ssytrf_64( int matrix_layout, char uplo, int64_t n, float* a,
+                           int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_dsytrf_64( int matrix_layout, char uplo, int64_t n, double* a,
+                           int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_csytrf_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           int64_t* ipiv );
+int64_t LAPACKE_zsytrf_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           int64_t* ipiv );
+
+int64_t LAPACKE_ssytri_64( int matrix_layout, char uplo, int64_t n, float* a,
+                           int64_t lda, const int64_t* ipiv );
+int64_t LAPACKE_dsytri_64( int matrix_layout, char uplo, int64_t n, double* a,
+                           int64_t lda, const int64_t* ipiv );
+int64_t LAPACKE_csytri_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           const int64_t* ipiv );
+int64_t LAPACKE_zsytri_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           const int64_t* ipiv );
+
+int64_t LAPACKE_ssytrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const float* a, int64_t lda,
+                           const int64_t* ipiv, float* b, int64_t ldb );
+int64_t LAPACKE_dsytrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const double* a, int64_t lda,
+                           const int64_t* ipiv, double* b, int64_t ldb );
+int64_t LAPACKE_csytrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* a,
+                           int64_t lda, const int64_t* ipiv,
+                           lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zsytrs_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* a,
+                           int64_t lda, const int64_t* ipiv,
+                           lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_stbcon_64( int matrix_layout, char norm, char uplo, char diag,
+                           int64_t n, int64_t kd, const float* ab,
+                           int64_t ldab, float* rcond );
+int64_t LAPACKE_dtbcon_64( int matrix_layout, char norm, char uplo, char diag,
+                           int64_t n, int64_t kd, const double* ab,
+                           int64_t ldab, double* rcond );
+int64_t LAPACKE_ctbcon_64( int matrix_layout, char norm, char uplo, char diag,
+                           int64_t n, int64_t kd,
+                           const lapack_complex_float* ab, int64_t ldab,
+                           float* rcond );
+int64_t LAPACKE_ztbcon_64( int matrix_layout, char norm, char uplo, char diag,
+                           int64_t n, int64_t kd,
+                           const lapack_complex_double* ab, int64_t ldab,
+                           double* rcond );
+
+int64_t LAPACKE_stbrfs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t kd, int64_t nrhs,
+                           const float* ab, int64_t ldab, const float* b,
+                           int64_t ldb, const float* x, int64_t ldx,
+                           float* ferr, float* berr );
+int64_t LAPACKE_dtbrfs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t kd, int64_t nrhs,
+                           const double* ab, int64_t ldab, const double* b,
+                           int64_t ldb, const double* x, int64_t ldx,
+                           double* ferr, double* berr );
+int64_t LAPACKE_ctbrfs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t kd, int64_t nrhs,
+                           const lapack_complex_float* ab, int64_t ldab,
+                           const lapack_complex_float* b, int64_t ldb,
+                           const lapack_complex_float* x, int64_t ldx,
+                           float* ferr, float* berr );
+int64_t LAPACKE_ztbrfs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t kd, int64_t nrhs,
+                           const lapack_complex_double* ab, int64_t ldab,
+                           const lapack_complex_double* b, int64_t ldb,
+                           const lapack_complex_double* x, int64_t ldx,
+                           double* ferr, double* berr );
+
+int64_t LAPACKE_stbtrs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t kd, int64_t nrhs,
+                           const float* ab, int64_t ldab, float* b,
+                           int64_t ldb );
+int64_t LAPACKE_dtbtrs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t kd, int64_t nrhs,
+                           const double* ab, int64_t ldab, double* b,
+                           int64_t ldb );
+int64_t LAPACKE_ctbtrs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t kd, int64_t nrhs,
+                           const lapack_complex_float* ab, int64_t ldab,
+                           lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_ztbtrs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t kd, int64_t nrhs,
+                           const lapack_complex_double* ab, int64_t ldab,
+                           lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_stfsm_64( int matrix_layout, char transr, char side, char uplo,
+                          char trans, char diag, int64_t m, int64_t n,
+                          float alpha, const float* a, float* b,
+                          int64_t ldb );
+int64_t LAPACKE_dtfsm_64( int matrix_layout, char transr, char side, char uplo,
+                          char trans, char diag, int64_t m, int64_t n,
+                          double alpha, const double* a, double* b,
+                          int64_t ldb );
+int64_t LAPACKE_ctfsm_64( int matrix_layout, char transr, char side, char uplo,
+                          char trans, char diag, int64_t m, int64_t n,
+                          lapack_complex_float alpha,
+                          const lapack_complex_float* a,
+                          lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_ztfsm_64( int matrix_layout, char transr, char side, char uplo,
+                          char trans, char diag, int64_t m, int64_t n,
+                          lapack_complex_double alpha,
+                          const lapack_complex_double* a,
+                          lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_stftri_64( int matrix_layout, char transr, char uplo, char diag,
+                           int64_t n, float* a );
+int64_t LAPACKE_dtftri_64( int matrix_layout, char transr, char uplo, char diag,
+                           int64_t n, double* a );
+int64_t LAPACKE_ctftri_64( int matrix_layout, char transr, char uplo, char diag,
+                           int64_t n, lapack_complex_float* a );
+int64_t LAPACKE_ztftri_64( int matrix_layout, char transr, char uplo, char diag,
+                           int64_t n, lapack_complex_double* a );
+
+int64_t LAPACKE_stfttp_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, const float* arf, float* ap );
+int64_t LAPACKE_dtfttp_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, const double* arf, double* ap );
+int64_t LAPACKE_ctfttp_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, const lapack_complex_float* arf,
+                           lapack_complex_float* ap );
+int64_t LAPACKE_ztfttp_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, const lapack_complex_double* arf,
+                           lapack_complex_double* ap );
+
+int64_t LAPACKE_stfttr_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, const float* arf, float* a,
+                           int64_t lda );
+int64_t LAPACKE_dtfttr_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, const double* arf, double* a,
+                           int64_t lda );
+int64_t LAPACKE_ctfttr_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, const lapack_complex_float* arf,
+                           lapack_complex_float* a, int64_t lda );
+int64_t LAPACKE_ztfttr_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, const lapack_complex_double* arf,
+                           lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_stgevc_64( int matrix_layout, char side, char howmny,
+                           const lapack_logical* select, int64_t n,
+                           const float* s, int64_t lds, const float* p,
+                           int64_t ldp, float* vl, int64_t ldvl,
+                           float* vr, int64_t ldvr, int64_t mm,
+                           int64_t* m );
+int64_t LAPACKE_dtgevc_64( int matrix_layout, char side, char howmny,
+                           const lapack_logical* select, int64_t n,
+                           const double* s, int64_t lds, const double* p,
+                           int64_t ldp, double* vl, int64_t ldvl,
+                           double* vr, int64_t ldvr, int64_t mm,
+                           int64_t* m );
+int64_t LAPACKE_ctgevc_64( int matrix_layout, char side, char howmny,
+                           const lapack_logical* select, int64_t n,
+                           const lapack_complex_float* s, int64_t lds,
+                           const lapack_complex_float* p, int64_t ldp,
+                           lapack_complex_float* vl, int64_t ldvl,
+                           lapack_complex_float* vr, int64_t ldvr,
+                           int64_t mm, int64_t* m );
+int64_t LAPACKE_ztgevc_64( int matrix_layout, char side, char howmny,
+                           const lapack_logical* select, int64_t n,
+                           const lapack_complex_double* s, int64_t lds,
+                           const lapack_complex_double* p, int64_t ldp,
+                           lapack_complex_double* vl, int64_t ldvl,
+                           lapack_complex_double* vr, int64_t ldvr,
+                           int64_t mm, int64_t* m );
+
+int64_t LAPACKE_stgexc_64( int matrix_layout, lapack_logical wantq,
+                           lapack_logical wantz, int64_t n, float* a,
+                           int64_t lda, float* b, int64_t ldb, float* q,
+                           int64_t ldq, float* z, int64_t ldz,
+                           int64_t* ifst, int64_t* ilst );
+int64_t LAPACKE_dtgexc_64( int matrix_layout, lapack_logical wantq,
+                           lapack_logical wantz, int64_t n, double* a,
+                           int64_t lda, double* b, int64_t ldb, double* q,
+                           int64_t ldq, double* z, int64_t ldz,
+                           int64_t* ifst, int64_t* ilst );
+int64_t LAPACKE_ctgexc_64( int matrix_layout, lapack_logical wantq,
+                           lapack_logical wantz, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* q, int64_t ldq,
+                           lapack_complex_float* z, int64_t ldz,
+                           int64_t ifst, int64_t ilst );
+int64_t LAPACKE_ztgexc_64( int matrix_layout, lapack_logical wantq,
+                           lapack_logical wantz, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* q, int64_t ldq,
+                           lapack_complex_double* z, int64_t ldz,
+                           int64_t ifst, int64_t ilst );
+
+int64_t LAPACKE_stgsen_64( int matrix_layout, int64_t ijob,
+                           lapack_logical wantq, lapack_logical wantz,
+                           const lapack_logical* select, int64_t n, float* a,
+                           int64_t lda, float* b, int64_t ldb,
+                           float* alphar, float* alphai, float* beta, float* q,
+                           int64_t ldq, float* z, int64_t ldz,
+                           int64_t* m, float* pl, float* pr, float* dif );
+int64_t LAPACKE_dtgsen_64( int matrix_layout, int64_t ijob,
+                           lapack_logical wantq, lapack_logical wantz,
+                           const lapack_logical* select, int64_t n,
+                           double* a, int64_t lda, double* b, int64_t ldb,
+                           double* alphar, double* alphai, double* beta,
+                           double* q, int64_t ldq, double* z, int64_t ldz,
+                           int64_t* m, double* pl, double* pr, double* dif );
+int64_t LAPACKE_ctgsen_64( int matrix_layout, int64_t ijob,
+                           lapack_logical wantq, lapack_logical wantz,
+                           const lapack_logical* select, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* alpha,
+                           lapack_complex_float* beta, lapack_complex_float* q,
+                           int64_t ldq, lapack_complex_float* z,
+                           int64_t ldz, int64_t* m, float* pl, float* pr,
+                           float* dif );
+int64_t LAPACKE_ztgsen_64( int matrix_layout, int64_t ijob,
+                           lapack_logical wantq, lapack_logical wantz,
+                           const lapack_logical* select, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* alpha,
+                           lapack_complex_double* beta,
+                           lapack_complex_double* q, int64_t ldq,
+                           lapack_complex_double* z, int64_t ldz,
+                           int64_t* m, double* pl, double* pr, double* dif );
+
+int64_t LAPACKE_stgsja_64( int matrix_layout, char jobu, char jobv, char jobq,
+                           int64_t m, int64_t p, int64_t n,
+                           int64_t k, int64_t l, float* a, int64_t lda,
+                           float* b, int64_t ldb, float tola, float tolb,
+                           float* alpha, float* beta, float* u, int64_t ldu,
+                           float* v, int64_t ldv, float* q, int64_t ldq,
+                           int64_t* ncycle );
+int64_t LAPACKE_dtgsja_64( int matrix_layout, char jobu, char jobv, char jobq,
+                           int64_t m, int64_t p, int64_t n,
+                           int64_t k, int64_t l, double* a,
+                           int64_t lda, double* b, int64_t ldb,
+                           double tola, double tolb, double* alpha,
+                           double* beta, double* u, int64_t ldu, double* v,
+                           int64_t ldv, double* q, int64_t ldq,
+                           int64_t* ncycle );
+int64_t LAPACKE_ctgsja_64( int matrix_layout, char jobu, char jobv, char jobq,
+                           int64_t m, int64_t p, int64_t n,
+                           int64_t k, int64_t l, lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* b,
+                           int64_t ldb, float tola, float tolb, float* alpha,
+                           float* beta, lapack_complex_float* u, int64_t ldu,
+                           lapack_complex_float* v, int64_t ldv,
+                           lapack_complex_float* q, int64_t ldq,
+                           int64_t* ncycle );
+int64_t LAPACKE_ztgsja_64( int matrix_layout, char jobu, char jobv, char jobq,
+                           int64_t m, int64_t p, int64_t n,
+                           int64_t k, int64_t l, lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* b,
+                           int64_t ldb, double tola, double tolb,
+                           double* alpha, double* beta,
+                           lapack_complex_double* u, int64_t ldu,
+                           lapack_complex_double* v, int64_t ldv,
+                           lapack_complex_double* q, int64_t ldq,
+                           int64_t* ncycle );
+
+int64_t LAPACKE_stgsna_64( int matrix_layout, char job, char howmny,
+                           const lapack_logical* select, int64_t n,
+                           const float* a, int64_t lda, const float* b,
+                           int64_t ldb, const float* vl, int64_t ldvl,
+                           const float* vr, int64_t ldvr, float* s,
+                           float* dif, int64_t mm, int64_t* m );
+int64_t LAPACKE_dtgsna_64( int matrix_layout, char job, char howmny,
+                           const lapack_logical* select, int64_t n,
+                           const double* a, int64_t lda, const double* b,
+                           int64_t ldb, const double* vl, int64_t ldvl,
+                           const double* vr, int64_t ldvr, double* s,
+                           double* dif, int64_t mm, int64_t* m );
+int64_t LAPACKE_ctgsna_64( int matrix_layout, char job, char howmny,
+                           const lapack_logical* select, int64_t n,
+                           const lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* b, int64_t ldb,
+                           const lapack_complex_float* vl, int64_t ldvl,
+                           const lapack_complex_float* vr, int64_t ldvr,
+                           float* s, float* dif, int64_t mm, int64_t* m );
+int64_t LAPACKE_ztgsna_64( int matrix_layout, char job, char howmny,
+                           const lapack_logical* select, int64_t n,
+                           const lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* b, int64_t ldb,
+                           const lapack_complex_double* vl, int64_t ldvl,
+                           const lapack_complex_double* vr, int64_t ldvr,
+                           double* s, double* dif, int64_t mm,
+                           int64_t* m );
+
+int64_t LAPACKE_stgsyl_64( int matrix_layout, char trans, int64_t ijob,
+                           int64_t m, int64_t n, const float* a,
+                           int64_t lda, const float* b, int64_t ldb,
+                           float* c, int64_t ldc, const float* d,
+                           int64_t ldd, const float* e, int64_t lde,
+                           float* f, int64_t ldf, float* scale, float* dif );
+int64_t LAPACKE_dtgsyl_64( int matrix_layout, char trans, int64_t ijob,
+                           int64_t m, int64_t n, const double* a,
+                           int64_t lda, const double* b, int64_t ldb,
+                           double* c, int64_t ldc, const double* d,
+                           int64_t ldd, const double* e, int64_t lde,
+                           double* f, int64_t ldf, double* scale,
+                           double* dif );
+int64_t LAPACKE_ctgsyl_64( int matrix_layout, char trans, int64_t ijob,
+                           int64_t m, int64_t n,
+                           const lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* c, int64_t ldc,
+                           const lapack_complex_float* d, int64_t ldd,
+                           const lapack_complex_float* e, int64_t lde,
+                           lapack_complex_float* f, int64_t ldf,
+                           float* scale, float* dif );
+int64_t LAPACKE_ztgsyl_64( int matrix_layout, char trans, int64_t ijob,
+                           int64_t m, int64_t n,
+                           const lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* c, int64_t ldc,
+                           const lapack_complex_double* d, int64_t ldd,
+                           const lapack_complex_double* e, int64_t lde,
+                           lapack_complex_double* f, int64_t ldf,
+                           double* scale, double* dif );
+
+int64_t LAPACKE_stpcon_64( int matrix_layout, char norm, char uplo, char diag,
+                           int64_t n, const float* ap, float* rcond );
+int64_t LAPACKE_dtpcon_64( int matrix_layout, char norm, char uplo, char diag,
+                           int64_t n, const double* ap, double* rcond );
+int64_t LAPACKE_ctpcon_64( int matrix_layout, char norm, char uplo, char diag,
+                           int64_t n, const lapack_complex_float* ap,
+                           float* rcond );
+int64_t LAPACKE_ztpcon_64( int matrix_layout, char norm, char uplo, char diag,
+                           int64_t n, const lapack_complex_double* ap,
+                           double* rcond );
+
+int64_t LAPACKE_stprfs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t nrhs, const float* ap,
+                           const float* b, int64_t ldb, const float* x,
+                           int64_t ldx, float* ferr, float* berr );
+int64_t LAPACKE_dtprfs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t nrhs, const double* ap,
+                           const double* b, int64_t ldb, const double* x,
+                           int64_t ldx, double* ferr, double* berr );
+int64_t LAPACKE_ctprfs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t nrhs,
+                           const lapack_complex_float* ap,
+                           const lapack_complex_float* b, int64_t ldb,
+                           const lapack_complex_float* x, int64_t ldx,
+                           float* ferr, float* berr );
+int64_t LAPACKE_ztprfs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t nrhs,
+                           const lapack_complex_double* ap,
+                           const lapack_complex_double* b, int64_t ldb,
+                           const lapack_complex_double* x, int64_t ldx,
+                           double* ferr, double* berr );
+
+int64_t LAPACKE_stptri_64( int matrix_layout, char uplo, char diag, int64_t n,
+                           float* ap );
+int64_t LAPACKE_dtptri_64( int matrix_layout, char uplo, char diag, int64_t n,
+                           double* ap );
+int64_t LAPACKE_ctptri_64( int matrix_layout, char uplo, char diag, int64_t n,
+                           lapack_complex_float* ap );
+int64_t LAPACKE_ztptri_64( int matrix_layout, char uplo, char diag, int64_t n,
+                           lapack_complex_double* ap );
+
+int64_t LAPACKE_stptrs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t nrhs, const float* ap,
+                           float* b, int64_t ldb );
+int64_t LAPACKE_dtptrs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t nrhs, const double* ap,
+                           double* b, int64_t ldb );
+int64_t LAPACKE_ctptrs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t nrhs,
+                           const lapack_complex_float* ap,
+                           lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_ztptrs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t nrhs,
+                           const lapack_complex_double* ap,
+                           lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_stpttf_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, const float* ap, float* arf );
+int64_t LAPACKE_dtpttf_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, const double* ap, double* arf );
+int64_t LAPACKE_ctpttf_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, const lapack_complex_float* ap,
+                           lapack_complex_float* arf );
+int64_t LAPACKE_ztpttf_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, const lapack_complex_double* ap,
+                           lapack_complex_double* arf );
+
+int64_t LAPACKE_stpttr_64( int matrix_layout, char uplo, int64_t n,
+                           const float* ap, float* a, int64_t lda );
+int64_t LAPACKE_dtpttr_64( int matrix_layout, char uplo, int64_t n,
+                           const double* ap, double* a, int64_t lda );
+int64_t LAPACKE_ctpttr_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_float* ap,
+                           lapack_complex_float* a, int64_t lda );
+int64_t LAPACKE_ztpttr_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_double* ap,
+                           lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_strcon_64( int matrix_layout, char norm, char uplo, char diag,
+                           int64_t n, const float* a, int64_t lda,
+                           float* rcond );
+int64_t LAPACKE_dtrcon_64( int matrix_layout, char norm, char uplo, char diag,
+                           int64_t n, const double* a, int64_t lda,
+                           double* rcond );
+int64_t LAPACKE_ctrcon_64( int matrix_layout, char norm, char uplo, char diag,
+                           int64_t n, const lapack_complex_float* a,
+                           int64_t lda, float* rcond );
+int64_t LAPACKE_ztrcon_64( int matrix_layout, char norm, char uplo, char diag,
+                           int64_t n, const lapack_complex_double* a,
+                           int64_t lda, double* rcond );
+
+int64_t LAPACKE_strevc_64( int matrix_layout, char side, char howmny,
+                           lapack_logical* select, int64_t n, const float* t,
+                           int64_t ldt, float* vl, int64_t ldvl,
+                           float* vr, int64_t ldvr, int64_t mm,
+                           int64_t* m );
+int64_t LAPACKE_dtrevc_64( int matrix_layout, char side, char howmny,
+                           lapack_logical* select, int64_t n,
+                           const double* t, int64_t ldt, double* vl,
+                           int64_t ldvl, double* vr, int64_t ldvr,
+                           int64_t mm, int64_t* m );
+int64_t LAPACKE_ctrevc_64( int matrix_layout, char side, char howmny,
+                           const lapack_logical* select, int64_t n,
+                           lapack_complex_float* t, int64_t ldt,
+                           lapack_complex_float* vl, int64_t ldvl,
+                           lapack_complex_float* vr, int64_t ldvr,
+                           int64_t mm, int64_t* m );
+int64_t LAPACKE_ztrevc_64( int matrix_layout, char side, char howmny,
+                           const lapack_logical* select, int64_t n,
+                           lapack_complex_double* t, int64_t ldt,
+                           lapack_complex_double* vl, int64_t ldvl,
+                           lapack_complex_double* vr, int64_t ldvr,
+                           int64_t mm, int64_t* m );
+
+int64_t LAPACKE_strexc_64( int matrix_layout, char compq, int64_t n, float* t,
+                           int64_t ldt, float* q, int64_t ldq,
+                           int64_t* ifst, int64_t* ilst );
+int64_t LAPACKE_dtrexc_64( int matrix_layout, char compq, int64_t n,
+                           double* t, int64_t ldt, double* q, int64_t ldq,
+                           int64_t* ifst, int64_t* ilst );
+int64_t LAPACKE_ctrexc_64( int matrix_layout, char compq, int64_t n,
+                           lapack_complex_float* t, int64_t ldt,
+                           lapack_complex_float* q, int64_t ldq,
+                           int64_t ifst, int64_t ilst );
+int64_t LAPACKE_ztrexc_64( int matrix_layout, char compq, int64_t n,
+                           lapack_complex_double* t, int64_t ldt,
+                           lapack_complex_double* q, int64_t ldq,
+                           int64_t ifst, int64_t ilst );
+
+int64_t LAPACKE_strrfs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t nrhs, const float* a,
+                           int64_t lda, const float* b, int64_t ldb,
+                           const float* x, int64_t ldx, float* ferr,
+                           float* berr );
+int64_t LAPACKE_dtrrfs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t nrhs, const double* a,
+                           int64_t lda, const double* b, int64_t ldb,
+                           const double* x, int64_t ldx, double* ferr,
+                           double* berr );
+int64_t LAPACKE_ctrrfs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t nrhs,
+                           const lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* b, int64_t ldb,
+                           const lapack_complex_float* x, int64_t ldx,
+                           float* ferr, float* berr );
+int64_t LAPACKE_ztrrfs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t nrhs,
+                           const lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* b, int64_t ldb,
+                           const lapack_complex_double* x, int64_t ldx,
+                           double* ferr, double* berr );
+
+int64_t LAPACKE_strsen_64( int matrix_layout, char job, char compq,
+                           const lapack_logical* select, int64_t n, float* t,
+                           int64_t ldt, float* q, int64_t ldq, float* wr,
+                           float* wi, int64_t* m, float* s, float* sep );
+int64_t LAPACKE_dtrsen_64( int matrix_layout, char job, char compq,
+                           const lapack_logical* select, int64_t n,
+                           double* t, int64_t ldt, double* q, int64_t ldq,
+                           double* wr, double* wi, int64_t* m, double* s,
+                           double* sep );
+int64_t LAPACKE_ctrsen_64( int matrix_layout, char job, char compq,
+                           const lapack_logical* select, int64_t n,
+                           lapack_complex_float* t, int64_t ldt,
+                           lapack_complex_float* q, int64_t ldq,
+                           lapack_complex_float* w, int64_t* m, float* s,
+                           float* sep );
+int64_t LAPACKE_ztrsen_64( int matrix_layout, char job, char compq,
+                           const lapack_logical* select, int64_t n,
+                           lapack_complex_double* t, int64_t ldt,
+                           lapack_complex_double* q, int64_t ldq,
+                           lapack_complex_double* w, int64_t* m, double* s,
+                           double* sep );
+
+int64_t LAPACKE_strsna_64( int matrix_layout, char job, char howmny,
+                           const lapack_logical* select, int64_t n,
+                           const float* t, int64_t ldt, const float* vl,
+                           int64_t ldvl, const float* vr, int64_t ldvr,
+                           float* s, float* sep, int64_t mm, int64_t* m );
+int64_t LAPACKE_dtrsna_64( int matrix_layout, char job, char howmny,
+                           const lapack_logical* select, int64_t n,
+                           const double* t, int64_t ldt, const double* vl,
+                           int64_t ldvl, const double* vr, int64_t ldvr,
+                           double* s, double* sep, int64_t mm,
+                           int64_t* m );
+int64_t LAPACKE_ctrsna_64( int matrix_layout, char job, char howmny,
+                           const lapack_logical* select, int64_t n,
+                           const lapack_complex_float* t, int64_t ldt,
+                           const lapack_complex_float* vl, int64_t ldvl,
+                           const lapack_complex_float* vr, int64_t ldvr,
+                           float* s, float* sep, int64_t mm, int64_t* m );
+int64_t LAPACKE_ztrsna_64( int matrix_layout, char job, char howmny,
+                           const lapack_logical* select, int64_t n,
+                           const lapack_complex_double* t, int64_t ldt,
+                           const lapack_complex_double* vl, int64_t ldvl,
+                           const lapack_complex_double* vr, int64_t ldvr,
+                           double* s, double* sep, int64_t mm,
+                           int64_t* m );
+
+int64_t LAPACKE_strsyl_64( int matrix_layout, char trana, char tranb,
+                           int64_t isgn, int64_t m, int64_t n,
+                           const float* a, int64_t lda, const float* b,
+                           int64_t ldb, float* c, int64_t ldc,
+                           float* scale );
+int64_t LAPACKE_dtrsyl_64( int matrix_layout, char trana, char tranb,
+                           int64_t isgn, int64_t m, int64_t n,
+                           const double* a, int64_t lda, const double* b,
+                           int64_t ldb, double* c, int64_t ldc,
+                           double* scale );
+int64_t LAPACKE_ctrsyl_64( int matrix_layout, char trana, char tranb,
+                           int64_t isgn, int64_t m, int64_t n,
+                           const lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* c, int64_t ldc,
+                           float* scale );
+int64_t LAPACKE_ztrsyl_64( int matrix_layout, char trana, char tranb,
+                           int64_t isgn, int64_t m, int64_t n,
+                           const lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* c, int64_t ldc,
+                           double* scale );
+
+int64_t LAPACKE_strsyl3_64( int matrix_layout, char trana, char tranb,
+                            int64_t isgn, int64_t m, int64_t n,
+                            const float* a, int64_t lda, const float* b,
+                            int64_t ldb, float* c, int64_t ldc,
+                            float* scale );
+int64_t LAPACKE_dtrsyl3_64( int matrix_layout, char trana, char tranb,
+                            int64_t isgn, int64_t m, int64_t n,
+                            const double* a, int64_t lda, const double* b,
+                            int64_t ldb, double* c, int64_t ldc,
+                            double* scale );
+int64_t LAPACKE_ztrsyl3_64( int matrix_layout, char trana, char tranb,
+                            int64_t isgn, int64_t m, int64_t n,
+                            const lapack_complex_double* a, int64_t lda,
+                            const lapack_complex_double* b, int64_t ldb,
+                            lapack_complex_double* c, int64_t ldc,
+                            double* scale );
+
+int64_t LAPACKE_strtri_64( int matrix_layout, char uplo, char diag, int64_t n,
+                           float* a, int64_t lda );
+int64_t LAPACKE_dtrtri_64( int matrix_layout, char uplo, char diag, int64_t n,
+                           double* a, int64_t lda );
+int64_t LAPACKE_ctrtri_64( int matrix_layout, char uplo, char diag, int64_t n,
+                           lapack_complex_float* a, int64_t lda );
+int64_t LAPACKE_ztrtri_64( int matrix_layout, char uplo, char diag, int64_t n,
+                           lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_strtrs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t nrhs, const float* a,
+                           int64_t lda, float* b, int64_t ldb );
+int64_t LAPACKE_dtrtrs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t nrhs, const double* a,
+                           int64_t lda, double* b, int64_t ldb );
+int64_t LAPACKE_ctrtrs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t nrhs,
+                           const lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_ztrtrs_64( int matrix_layout, char uplo, char trans, char diag,
+                           int64_t n, int64_t nrhs,
+                           const lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_strttf_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, const float* a, int64_t lda,
+                           float* arf );
+int64_t LAPACKE_dtrttf_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, const double* a, int64_t lda,
+                           double* arf );
+int64_t LAPACKE_ctrttf_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, const lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* arf );
+int64_t LAPACKE_ztrttf_64( int matrix_layout, char transr, char uplo,
+                           int64_t n, const lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* arf );
+
+int64_t LAPACKE_strttp_64( int matrix_layout, char uplo, int64_t n,
+                           const float* a, int64_t lda, float* ap );
+int64_t LAPACKE_dtrttp_64( int matrix_layout, char uplo, int64_t n,
+                           const double* a, int64_t lda, double* ap );
+int64_t LAPACKE_ctrttp_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* ap );
+int64_t LAPACKE_ztrttp_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* ap );
+
+int64_t LAPACKE_stzrzf_64( int matrix_layout, int64_t m, int64_t n,
+                           float* a, int64_t lda, float* tau );
+int64_t LAPACKE_dtzrzf_64( int matrix_layout, int64_t m, int64_t n,
+                           double* a, int64_t lda, double* tau );
+int64_t LAPACKE_ctzrzf_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* tau );
+int64_t LAPACKE_ztzrzf_64( int matrix_layout, int64_t m, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* tau );
+
+int64_t LAPACKE_cungbr_64( int matrix_layout, char vect, int64_t m,
+                           int64_t n, int64_t k, lapack_complex_float* a,
+                           int64_t lda, const lapack_complex_float* tau );
+int64_t LAPACKE_zungbr_64( int matrix_layout, char vect, int64_t m,
+                           int64_t n, int64_t k, lapack_complex_double* a,
+                           int64_t lda, const lapack_complex_double* tau );
+
+int64_t LAPACKE_cunghr_64( int matrix_layout, int64_t n, int64_t ilo,
+                           int64_t ihi, lapack_complex_float* a,
+                           int64_t lda, const lapack_complex_float* tau );
+int64_t LAPACKE_zunghr_64( int matrix_layout, int64_t n, int64_t ilo,
+                           int64_t ihi, lapack_complex_double* a,
+                           int64_t lda, const lapack_complex_double* tau );
+
+int64_t LAPACKE_cunglq_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t k, lapack_complex_float* a,
+                           int64_t lda, const lapack_complex_float* tau );
+int64_t LAPACKE_zunglq_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t k, lapack_complex_double* a,
+                           int64_t lda, const lapack_complex_double* tau );
+
+int64_t LAPACKE_cungql_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t k, lapack_complex_float* a,
+                           int64_t lda, const lapack_complex_float* tau );
+int64_t LAPACKE_zungql_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t k, lapack_complex_double* a,
+                           int64_t lda, const lapack_complex_double* tau );
+
+int64_t LAPACKE_cungqr_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t k, lapack_complex_float* a,
+                           int64_t lda, const lapack_complex_float* tau );
+int64_t LAPACKE_zungqr_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t k, lapack_complex_double* a,
+                           int64_t lda, const lapack_complex_double* tau );
+
+int64_t LAPACKE_cungrq_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t k, lapack_complex_float* a,
+                           int64_t lda, const lapack_complex_float* tau );
+int64_t LAPACKE_zungrq_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t k, lapack_complex_double* a,
+                           int64_t lda, const lapack_complex_double* tau );
+
+int64_t LAPACKE_cungtr_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* tau );
+int64_t LAPACKE_zungtr_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* tau );
+
+int64_t LAPACKE_cungtsqr_row_64( int matrix_layout, int64_t m, int64_t n,
+                                 int64_t mb, int64_t nb,
+                                 lapack_complex_float* a, int64_t lda,
+                                 const lapack_complex_float* t, int64_t ldt );
+int64_t LAPACKE_zungtsqr_row_64( int matrix_layout, int64_t m, int64_t n,
+                                 int64_t mb, int64_t nb,
+                                 lapack_complex_double* a, int64_t lda,
+                                 const lapack_complex_double* t, int64_t ldt );
+
+int64_t LAPACKE_cunmbr_64( int matrix_layout, char vect, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* tau,
+                           lapack_complex_float* c, int64_t ldc );
+int64_t LAPACKE_zunmbr_64( int matrix_layout, char vect, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* tau,
+                           lapack_complex_double* c, int64_t ldc );
+
+int64_t LAPACKE_cunmhr_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t ilo,
+                           int64_t ihi, const lapack_complex_float* a,
+                           int64_t lda, const lapack_complex_float* tau,
+                           lapack_complex_float* c, int64_t ldc );
+int64_t LAPACKE_zunmhr_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t ilo,
+                           int64_t ihi, const lapack_complex_double* a,
+                           int64_t lda, const lapack_complex_double* tau,
+                           lapack_complex_double* c, int64_t ldc );
+
+int64_t LAPACKE_cunmlq_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* tau,
+                           lapack_complex_float* c, int64_t ldc );
+int64_t LAPACKE_zunmlq_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* tau,
+                           lapack_complex_double* c, int64_t ldc );
+
+int64_t LAPACKE_cunmql_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* tau,
+                           lapack_complex_float* c, int64_t ldc );
+int64_t LAPACKE_zunmql_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* tau,
+                           lapack_complex_double* c, int64_t ldc );
+
+int64_t LAPACKE_cunmqr_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* tau,
+                           lapack_complex_float* c, int64_t ldc );
+int64_t LAPACKE_zunmqr_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* tau,
+                           lapack_complex_double* c, int64_t ldc );
+
+int64_t LAPACKE_cunmrq_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* tau,
+                           lapack_complex_float* c, int64_t ldc );
+int64_t LAPACKE_zunmrq_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* tau,
+                           lapack_complex_double* c, int64_t ldc );
+
+int64_t LAPACKE_cunmrz_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           int64_t l, const lapack_complex_float* a,
+                           int64_t lda, const lapack_complex_float* tau,
+                           lapack_complex_float* c, int64_t ldc );
+int64_t LAPACKE_zunmrz_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           int64_t l, const lapack_complex_double* a,
+                           int64_t lda, const lapack_complex_double* tau,
+                           lapack_complex_double* c, int64_t ldc );
+
+int64_t LAPACKE_cunmtr_64( int matrix_layout, char side, char uplo, char trans,
+                           int64_t m, int64_t n,
+                           const lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* tau,
+                           lapack_complex_float* c, int64_t ldc );
+int64_t LAPACKE_zunmtr_64( int matrix_layout, char side, char uplo, char trans,
+                           int64_t m, int64_t n,
+                           const lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* tau,
+                           lapack_complex_double* c, int64_t ldc );
+
+int64_t LAPACKE_cupgtr_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_float* ap,
+                           const lapack_complex_float* tau,
+                           lapack_complex_float* q, int64_t ldq );
+int64_t LAPACKE_zupgtr_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_double* ap,
+                           const lapack_complex_double* tau,
+                           lapack_complex_double* q, int64_t ldq );
+
+int64_t LAPACKE_cupmtr_64( int matrix_layout, char side, char uplo, char trans,
+                           int64_t m, int64_t n,
+                           const lapack_complex_float* ap,
+                           const lapack_complex_float* tau,
+                           lapack_complex_float* c, int64_t ldc );
+int64_t LAPACKE_zupmtr_64( int matrix_layout, char side, char uplo, char trans,
+                           int64_t m, int64_t n,
+                           const lapack_complex_double* ap,
+                           const lapack_complex_double* tau,
+                           lapack_complex_double* c, int64_t ldc );
+
+int64_t LAPACKE_sbdsdc_work_64( int matrix_layout, char uplo, char compq,
+                                int64_t n, float* d, float* e, float* u,
+                                int64_t ldu, float* vt, int64_t ldvt,
+                                float* q, int64_t* iq, float* work,
+                                int64_t* iwork );
+int64_t LAPACKE_dbdsdc_work_64( int matrix_layout, char uplo, char compq,
+                                int64_t n, double* d, double* e, double* u,
+                                int64_t ldu, double* vt, int64_t ldvt,
+                                double* q, int64_t* iq, double* work,
+                                int64_t* iwork );
+
+int64_t LAPACKE_sbdsvdx_work_64( int matrix_layout, char uplo, char jobz, char range,
+                                 int64_t n, const float* d, const float* e,
+                                 float vl, float vu,
+                                 int64_t il, int64_t iu, int64_t* ns,
+                                 float* s, float* z, int64_t ldz,
+                                 float* work, int64_t* iwork );
+int64_t LAPACKE_dbdsvdx_work_64( int matrix_layout, char uplo, char jobz, char range,
+                                 int64_t n, const double* d, const double* e,
+                                 double vl, double vu,
+                                 int64_t il, int64_t iu, int64_t* ns,
+                                 double* s, double* z, int64_t ldz,
+                                 double* work, int64_t* iwork );
+
+int64_t LAPACKE_sbdsqr_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t ncvt, int64_t nru, int64_t ncc,
+                                float* d, float* e, float* vt, int64_t ldvt,
+                                float* u, int64_t ldu, float* c,
+                                int64_t ldc, float* work );
+int64_t LAPACKE_dbdsqr_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t ncvt, int64_t nru, int64_t ncc,
+                                double* d, double* e, double* vt,
+                                int64_t ldvt, double* u, int64_t ldu,
+                                double* c, int64_t ldc, double* work );
+int64_t LAPACKE_cbdsqr_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t ncvt, int64_t nru, int64_t ncc,
+                                float* d, float* e, lapack_complex_float* vt,
+                                int64_t ldvt, lapack_complex_float* u,
+                                int64_t ldu, lapack_complex_float* c,
+                                int64_t ldc, float* work );
+int64_t LAPACKE_zbdsqr_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t ncvt, int64_t nru, int64_t ncc,
+                                double* d, double* e, lapack_complex_double* vt,
+                                int64_t ldvt, lapack_complex_double* u,
+                                int64_t ldu, lapack_complex_double* c,
+                                int64_t ldc, double* work );
+
+int64_t LAPACKE_sdisna_work_64( char job, int64_t m, int64_t n,
+                                const float* d, float* sep );
+int64_t LAPACKE_ddisna_work_64( char job, int64_t m, int64_t n,
+                                const double* d, double* sep );
+
+int64_t LAPACKE_sgbbrd_work_64( int matrix_layout, char vect, int64_t m,
+                                int64_t n, int64_t ncc, int64_t kl,
+                                int64_t ku, float* ab, int64_t ldab,
+                                float* d, float* e, float* q, int64_t ldq,
+                                float* pt, int64_t ldpt, float* c,
+                                int64_t ldc, float* work );
+int64_t LAPACKE_dgbbrd_work_64( int matrix_layout, char vect, int64_t m,
+                                int64_t n, int64_t ncc, int64_t kl,
+                                int64_t ku, double* ab, int64_t ldab,
+                                double* d, double* e, double* q, int64_t ldq,
+                                double* pt, int64_t ldpt, double* c,
+                                int64_t ldc, double* work );
+int64_t LAPACKE_cgbbrd_work_64( int matrix_layout, char vect, int64_t m,
+                                int64_t n, int64_t ncc, int64_t kl,
+                                int64_t ku, lapack_complex_float* ab,
+                                int64_t ldab, float* d, float* e,
+                                lapack_complex_float* q, int64_t ldq,
+                                lapack_complex_float* pt, int64_t ldpt,
+                                lapack_complex_float* c, int64_t ldc,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zgbbrd_work_64( int matrix_layout, char vect, int64_t m,
+                                int64_t n, int64_t ncc, int64_t kl,
+                                int64_t ku, lapack_complex_double* ab,
+                                int64_t ldab, double* d, double* e,
+                                lapack_complex_double* q, int64_t ldq,
+                                lapack_complex_double* pt, int64_t ldpt,
+                                lapack_complex_double* c, int64_t ldc,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_sgbcon_work_64( int matrix_layout, char norm, int64_t n,
+                                int64_t kl, int64_t ku, const float* ab,
+                                int64_t ldab, const int64_t* ipiv,
+                                float anorm, float* rcond, float* work,
+                                int64_t* iwork );
+int64_t LAPACKE_dgbcon_work_64( int matrix_layout, char norm, int64_t n,
+                                int64_t kl, int64_t ku, const double* ab,
+                                int64_t ldab, const int64_t* ipiv,
+                                double anorm, double* rcond, double* work,
+                                int64_t* iwork );
+int64_t LAPACKE_cgbcon_work_64( int matrix_layout, char norm, int64_t n,
+                                int64_t kl, int64_t ku,
+                                const lapack_complex_float* ab, int64_t ldab,
+                                const int64_t* ipiv, float anorm,
+                                float* rcond, lapack_complex_float* work,
+                                float* rwork );
+int64_t LAPACKE_zgbcon_work_64( int matrix_layout, char norm, int64_t n,
+                                int64_t kl, int64_t ku,
+                                const lapack_complex_double* ab,
+                                int64_t ldab, const int64_t* ipiv,
+                                double anorm, double* rcond,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_sgbequ_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t kl, int64_t ku, const float* ab,
+                                int64_t ldab, float* r, float* c,
+                                float* rowcnd, float* colcnd, float* amax );
+int64_t LAPACKE_dgbequ_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t kl, int64_t ku, const double* ab,
+                                int64_t ldab, double* r, double* c,
+                                double* rowcnd, double* colcnd, double* amax );
+int64_t LAPACKE_cgbequ_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t kl, int64_t ku,
+                                const lapack_complex_float* ab, int64_t ldab,
+                                float* r, float* c, float* rowcnd,
+                                float* colcnd, float* amax );
+int64_t LAPACKE_zgbequ_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t kl, int64_t ku,
+                                const lapack_complex_double* ab,
+                                int64_t ldab, double* r, double* c,
+                                double* rowcnd, double* colcnd, double* amax );
+
+int64_t LAPACKE_sgbequb_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 int64_t kl, int64_t ku, const float* ab,
+                                 int64_t ldab, float* r, float* c,
+                                 float* rowcnd, float* colcnd, float* amax );
+int64_t LAPACKE_dgbequb_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 int64_t kl, int64_t ku, const double* ab,
+                                 int64_t ldab, double* r, double* c,
+                                 double* rowcnd, double* colcnd, double* amax );
+int64_t LAPACKE_cgbequb_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 int64_t kl, int64_t ku,
+                                 const lapack_complex_float* ab,
+                                 int64_t ldab, float* r, float* c,
+                                 float* rowcnd, float* colcnd, float* amax );
+int64_t LAPACKE_zgbequb_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 int64_t kl, int64_t ku,
+                                 const lapack_complex_double* ab,
+                                 int64_t ldab, double* r, double* c,
+                                 double* rowcnd, double* colcnd, double* amax );
+
+int64_t LAPACKE_sgbrfs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t kl, int64_t ku, int64_t nrhs,
+                                const float* ab, int64_t ldab,
+                                const float* afb, int64_t ldafb,
+                                const int64_t* ipiv, const float* b,
+                                int64_t ldb, float* x, int64_t ldx,
+                                float* ferr, float* berr, float* work,
+                                int64_t* iwork );
+int64_t LAPACKE_dgbrfs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t kl, int64_t ku, int64_t nrhs,
+                                const double* ab, int64_t ldab,
+                                const double* afb, int64_t ldafb,
+                                const int64_t* ipiv, const double* b,
+                                int64_t ldb, double* x, int64_t ldx,
+                                double* ferr, double* berr, double* work,
+                                int64_t* iwork );
+int64_t LAPACKE_cgbrfs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t kl, int64_t ku, int64_t nrhs,
+                                const lapack_complex_float* ab, int64_t ldab,
+                                const lapack_complex_float* afb,
+                                int64_t ldafb, const int64_t* ipiv,
+                                const lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* x, int64_t ldx,
+                                float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zgbrfs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t kl, int64_t ku, int64_t nrhs,
+                                const lapack_complex_double* ab,
+                                int64_t ldab,
+                                const lapack_complex_double* afb,
+                                int64_t ldafb, const int64_t* ipiv,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_sgbrfsx_work_64( int matrix_layout, char trans, char equed,
+                                 int64_t n, int64_t kl, int64_t ku,
+                                 int64_t nrhs, const float* ab,
+                                 int64_t ldab, const float* afb,
+                                 int64_t ldafb, const int64_t* ipiv,
+                                 const float* r, const float* c, const float* b,
+                                 int64_t ldb, float* x, int64_t ldx,
+                                 float* rcond, float* berr,
+                                 int64_t n_err_bnds, float* err_bnds_norm,
+                                 float* err_bnds_comp, int64_t nparams,
+                                 float* params, float* work,
+                                 int64_t* iwork );
+int64_t LAPACKE_dgbrfsx_work_64( int matrix_layout, char trans, char equed,
+                                 int64_t n, int64_t kl, int64_t ku,
+                                 int64_t nrhs, const double* ab,
+                                 int64_t ldab, const double* afb,
+                                 int64_t ldafb, const int64_t* ipiv,
+                                 const double* r, const double* c,
+                                 const double* b, int64_t ldb, double* x,
+                                 int64_t ldx, double* rcond, double* berr,
+                                 int64_t n_err_bnds, double* err_bnds_norm,
+                                 double* err_bnds_comp, int64_t nparams,
+                                 double* params, double* work,
+                                 int64_t* iwork );
+int64_t LAPACKE_cgbrfsx_work_64( int matrix_layout, char trans, char equed,
+                                 int64_t n, int64_t kl, int64_t ku,
+                                 int64_t nrhs,
+                                 const lapack_complex_float* ab,
+                                 int64_t ldab,
+                                 const lapack_complex_float* afb,
+                                 int64_t ldafb, const int64_t* ipiv,
+                                 const float* r, const float* c,
+                                 const lapack_complex_float* b, int64_t ldb,
+                                 lapack_complex_float* x, int64_t ldx,
+                                 float* rcond, float* berr,
+                                 int64_t n_err_bnds, float* err_bnds_norm,
+                                 float* err_bnds_comp, int64_t nparams,
+                                 float* params, lapack_complex_float* work,
+                                 float* rwork );
+int64_t LAPACKE_zgbrfsx_work_64( int matrix_layout, char trans, char equed,
+                                 int64_t n, int64_t kl, int64_t ku,
+                                 int64_t nrhs,
+                                 const lapack_complex_double* ab,
+                                 int64_t ldab,
+                                 const lapack_complex_double* afb,
+                                 int64_t ldafb, const int64_t* ipiv,
+                                 const double* r, const double* c,
+                                 const lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* x, int64_t ldx,
+                                 double* rcond, double* berr,
+                                 int64_t n_err_bnds, double* err_bnds_norm,
+                                 double* err_bnds_comp, int64_t nparams,
+                                 double* params, lapack_complex_double* work,
+                                 double* rwork );
+
+int64_t LAPACKE_sgbsv_work_64( int matrix_layout, int64_t n, int64_t kl,
+                               int64_t ku, int64_t nrhs, float* ab,
+                               int64_t ldab, int64_t* ipiv, float* b,
+                               int64_t ldb );
+int64_t LAPACKE_dgbsv_work_64( int matrix_layout, int64_t n, int64_t kl,
+                               int64_t ku, int64_t nrhs, double* ab,
+                               int64_t ldab, int64_t* ipiv, double* b,
+                               int64_t ldb );
+int64_t LAPACKE_cgbsv_work_64( int matrix_layout, int64_t n, int64_t kl,
+                               int64_t ku, int64_t nrhs,
+                               lapack_complex_float* ab, int64_t ldab,
+                               int64_t* ipiv, lapack_complex_float* b,
+                               int64_t ldb );
+int64_t LAPACKE_zgbsv_work_64( int matrix_layout, int64_t n, int64_t kl,
+                               int64_t ku, int64_t nrhs,
+                               lapack_complex_double* ab, int64_t ldab,
+                               int64_t* ipiv, lapack_complex_double* b,
+                               int64_t ldb );
+
+int64_t LAPACKE_sgbsvx_work_64( int matrix_layout, char fact, char trans,
+                                int64_t n, int64_t kl, int64_t ku,
+                                int64_t nrhs, float* ab, int64_t ldab,
+                                float* afb, int64_t ldafb, int64_t* ipiv,
+                                char* equed, float* r, float* c, float* b,
+                                int64_t ldb, float* x, int64_t ldx,
+                                float* rcond, float* ferr, float* berr,
+                                float* work, int64_t* iwork );
+int64_t LAPACKE_dgbsvx_work_64( int matrix_layout, char fact, char trans,
+                                int64_t n, int64_t kl, int64_t ku,
+                                int64_t nrhs, double* ab, int64_t ldab,
+                                double* afb, int64_t ldafb, int64_t* ipiv,
+                                char* equed, double* r, double* c, double* b,
+                                int64_t ldb, double* x, int64_t ldx,
+                                double* rcond, double* ferr, double* berr,
+                                double* work, int64_t* iwork );
+int64_t LAPACKE_cgbsvx_work_64( int matrix_layout, char fact, char trans,
+                                int64_t n, int64_t kl, int64_t ku,
+                                int64_t nrhs, lapack_complex_float* ab,
+                                int64_t ldab, lapack_complex_float* afb,
+                                int64_t ldafb, int64_t* ipiv, char* equed,
+                                float* r, float* c, lapack_complex_float* b,
+                                int64_t ldb, lapack_complex_float* x,
+                                int64_t ldx, float* rcond, float* ferr,
+                                float* berr, lapack_complex_float* work,
+                                float* rwork );
+int64_t LAPACKE_zgbsvx_work_64( int matrix_layout, char fact, char trans,
+                                int64_t n, int64_t kl, int64_t ku,
+                                int64_t nrhs, lapack_complex_double* ab,
+                                int64_t ldab, lapack_complex_double* afb,
+                                int64_t ldafb, int64_t* ipiv, char* equed,
+                                double* r, double* c, lapack_complex_double* b,
+                                int64_t ldb, lapack_complex_double* x,
+                                int64_t ldx, double* rcond, double* ferr,
+                                double* berr, lapack_complex_double* work,
+                                double* rwork );
+
+int64_t LAPACKE_sgbsvxx_work_64( int matrix_layout, char fact, char trans,
+                                 int64_t n, int64_t kl, int64_t ku,
+                                 int64_t nrhs, float* ab, int64_t ldab,
+                                 float* afb, int64_t ldafb, int64_t* ipiv,
+                                 char* equed, float* r, float* c, float* b,
+                                 int64_t ldb, float* x, int64_t ldx,
+                                 float* rcond, float* rpvgrw, float* berr,
+                                 int64_t n_err_bnds, float* err_bnds_norm,
+                                 float* err_bnds_comp, int64_t nparams,
+                                 float* params, float* work,
+                                 int64_t* iwork );
+int64_t LAPACKE_dgbsvxx_work_64( int matrix_layout, char fact, char trans,
+                                 int64_t n, int64_t kl, int64_t ku,
+                                 int64_t nrhs, double* ab, int64_t ldab,
+                                 double* afb, int64_t ldafb,
+                                 int64_t* ipiv, char* equed, double* r,
+                                 double* c, double* b, int64_t ldb,
+                                 double* x, int64_t ldx, double* rcond,
+                                 double* rpvgrw, double* berr,
+                                 int64_t n_err_bnds, double* err_bnds_norm,
+                                 double* err_bnds_comp, int64_t nparams,
+                                 double* params, double* work,
+                                 int64_t* iwork );
+int64_t LAPACKE_cgbsvxx_work_64( int matrix_layout, char fact, char trans,
+                                 int64_t n, int64_t kl, int64_t ku,
+                                 int64_t nrhs, lapack_complex_float* ab,
+                                 int64_t ldab, lapack_complex_float* afb,
+                                 int64_t ldafb, int64_t* ipiv,
+                                 char* equed, float* r, float* c,
+                                 lapack_complex_float* b, int64_t ldb,
+                                 lapack_complex_float* x, int64_t ldx,
+                                 float* rcond, float* rpvgrw, float* berr,
+                                 int64_t n_err_bnds, float* err_bnds_norm,
+                                 float* err_bnds_comp, int64_t nparams,
+                                 float* params, lapack_complex_float* work,
+                                 float* rwork );
+int64_t LAPACKE_zgbsvxx_work_64( int matrix_layout, char fact, char trans,
+                                 int64_t n, int64_t kl, int64_t ku,
+                                 int64_t nrhs, lapack_complex_double* ab,
+                                 int64_t ldab, lapack_complex_double* afb,
+                                 int64_t ldafb, int64_t* ipiv,
+                                 char* equed, double* r, double* c,
+                                 lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* x, int64_t ldx,
+                                 double* rcond, double* rpvgrw, double* berr,
+                                 int64_t n_err_bnds, double* err_bnds_norm,
+                                 double* err_bnds_comp, int64_t nparams,
+                                 double* params, lapack_complex_double* work,
+                                 double* rwork );
+
+int64_t LAPACKE_sgbtrf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t kl, int64_t ku, float* ab,
+                                int64_t ldab, int64_t* ipiv );
+int64_t LAPACKE_dgbtrf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t kl, int64_t ku, double* ab,
+                                int64_t ldab, int64_t* ipiv );
+int64_t LAPACKE_cgbtrf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t kl, int64_t ku,
+                                lapack_complex_float* ab, int64_t ldab,
+                                int64_t* ipiv );
+int64_t LAPACKE_zgbtrf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t kl, int64_t ku,
+                                lapack_complex_double* ab, int64_t ldab,
+                                int64_t* ipiv );
+
+int64_t LAPACKE_sgbtrs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t kl, int64_t ku, int64_t nrhs,
+                                const float* ab, int64_t ldab,
+                                const int64_t* ipiv, float* b,
+                                int64_t ldb );
+int64_t LAPACKE_dgbtrs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t kl, int64_t ku, int64_t nrhs,
+                                const double* ab, int64_t ldab,
+                                const int64_t* ipiv, double* b,
+                                int64_t ldb );
+int64_t LAPACKE_cgbtrs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t kl, int64_t ku, int64_t nrhs,
+                                const lapack_complex_float* ab, int64_t ldab,
+                                const int64_t* ipiv, lapack_complex_float* b,
+                                int64_t ldb );
+int64_t LAPACKE_zgbtrs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t kl, int64_t ku, int64_t nrhs,
+                                const lapack_complex_double* ab,
+                                int64_t ldab, const int64_t* ipiv,
+                                lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_sgebak_work_64( int matrix_layout, char job, char side,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                const float* scale, int64_t m, float* v,
+                                int64_t ldv );
+int64_t LAPACKE_dgebak_work_64( int matrix_layout, char job, char side,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                const double* scale, int64_t m, double* v,
+                                int64_t ldv );
+int64_t LAPACKE_cgebak_work_64( int matrix_layout, char job, char side,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                const float* scale, int64_t m,
+                                lapack_complex_float* v, int64_t ldv );
+int64_t LAPACKE_zgebak_work_64( int matrix_layout, char job, char side,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                const double* scale, int64_t m,
+                                lapack_complex_double* v, int64_t ldv );
+
+int64_t LAPACKE_sgebal_work_64( int matrix_layout, char job, int64_t n,
+                                float* a, int64_t lda, int64_t* ilo,
+                                int64_t* ihi, float* scale );
+int64_t LAPACKE_dgebal_work_64( int matrix_layout, char job, int64_t n,
+                                double* a, int64_t lda, int64_t* ilo,
+                                int64_t* ihi, double* scale );
+int64_t LAPACKE_cgebal_work_64( int matrix_layout, char job, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                int64_t* ilo, int64_t* ihi,
+                                float* scale );
+int64_t LAPACKE_zgebal_work_64( int matrix_layout, char job, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                int64_t* ilo, int64_t* ihi,
+                                double* scale );
+
+int64_t LAPACKE_sgebrd_work_64( int matrix_layout, int64_t m, int64_t n,
+                                float* a, int64_t lda, float* d, float* e,
+                                float* tauq, float* taup, float* work,
+                                int64_t lwork );
+int64_t LAPACKE_dgebrd_work_64( int matrix_layout, int64_t m, int64_t n,
+                                double* a, int64_t lda, double* d, double* e,
+                                double* tauq, double* taup, double* work,
+                                int64_t lwork );
+int64_t LAPACKE_cgebrd_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                float* d, float* e, lapack_complex_float* tauq,
+                                lapack_complex_float* taup,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zgebrd_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                double* d, double* e,
+                                lapack_complex_double* tauq,
+                                lapack_complex_double* taup,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sgecon_work_64( int matrix_layout, char norm, int64_t n,
+                                const float* a, int64_t lda, float anorm,
+                                float* rcond, float* work, int64_t* iwork );
+int64_t LAPACKE_dgecon_work_64( int matrix_layout, char norm, int64_t n,
+                                const double* a, int64_t lda, double anorm,
+                                double* rcond, double* work,
+                                int64_t* iwork );
+int64_t LAPACKE_cgecon_work_64( int matrix_layout, char norm, int64_t n,
+                                const lapack_complex_float* a, int64_t lda,
+                                float anorm, float* rcond,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zgecon_work_64( int matrix_layout, char norm, int64_t n,
+                                const lapack_complex_double* a, int64_t lda,
+                                double anorm, double* rcond,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_sgeequ_work_64( int matrix_layout, int64_t m, int64_t n,
+                                const float* a, int64_t lda, float* r,
+                                float* c, float* rowcnd, float* colcnd,
+                                float* amax );
+int64_t LAPACKE_dgeequ_work_64( int matrix_layout, int64_t m, int64_t n,
+                                const double* a, int64_t lda, double* r,
+                                double* c, double* rowcnd, double* colcnd,
+                                double* amax );
+int64_t LAPACKE_cgeequ_work_64( int matrix_layout, int64_t m, int64_t n,
+                                const lapack_complex_float* a, int64_t lda,
+                                float* r, float* c, float* rowcnd,
+                                float* colcnd, float* amax );
+int64_t LAPACKE_zgeequ_work_64( int matrix_layout, int64_t m, int64_t n,
+                                const lapack_complex_double* a, int64_t lda,
+                                double* r, double* c, double* rowcnd,
+                                double* colcnd, double* amax );
+
+int64_t LAPACKE_sgeequb_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 const float* a, int64_t lda, float* r,
+                                 float* c, float* rowcnd, float* colcnd,
+                                 float* amax );
+int64_t LAPACKE_dgeequb_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 const double* a, int64_t lda, double* r,
+                                 double* c, double* rowcnd, double* colcnd,
+                                 double* amax );
+int64_t LAPACKE_cgeequb_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 const lapack_complex_float* a, int64_t lda,
+                                 float* r, float* c, float* rowcnd,
+                                 float* colcnd, float* amax );
+int64_t LAPACKE_zgeequb_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 const lapack_complex_double* a, int64_t lda,
+                                 double* r, double* c, double* rowcnd,
+                                 double* colcnd, double* amax );
+
+int64_t LAPACKE_sgees_work_64( int matrix_layout, char jobvs, char sort,
+                               LAPACK_S_SELECT2 select, int64_t n, float* a,
+                               int64_t lda, int64_t* sdim, float* wr,
+                               float* wi, float* vs, int64_t ldvs,
+                               float* work, int64_t lwork,
+                               lapack_logical* bwork );
+int64_t LAPACKE_dgees_work_64( int matrix_layout, char jobvs, char sort,
+                               LAPACK_D_SELECT2 select, int64_t n, double* a,
+                               int64_t lda, int64_t* sdim, double* wr,
+                               double* wi, double* vs, int64_t ldvs,
+                               double* work, int64_t lwork,
+                               lapack_logical* bwork );
+int64_t LAPACKE_cgees_work_64( int matrix_layout, char jobvs, char sort,
+                               LAPACK_C_SELECT1 select, int64_t n,
+                               lapack_complex_float* a, int64_t lda,
+                               int64_t* sdim, lapack_complex_float* w,
+                               lapack_complex_float* vs, int64_t ldvs,
+                               lapack_complex_float* work, int64_t lwork,
+                               float* rwork, lapack_logical* bwork );
+int64_t LAPACKE_zgees_work_64( int matrix_layout, char jobvs, char sort,
+                               LAPACK_Z_SELECT1 select, int64_t n,
+                               lapack_complex_double* a, int64_t lda,
+                               int64_t* sdim, lapack_complex_double* w,
+                               lapack_complex_double* vs, int64_t ldvs,
+                               lapack_complex_double* work, int64_t lwork,
+                               double* rwork, lapack_logical* bwork );
+
+int64_t LAPACKE_sgeesx_work_64( int matrix_layout, char jobvs, char sort,
+                                LAPACK_S_SELECT2 select, char sense,
+                                int64_t n, float* a, int64_t lda,
+                                int64_t* sdim, float* wr, float* wi,
+                                float* vs, int64_t ldvs, float* rconde,
+                                float* rcondv, float* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork,
+                                lapack_logical* bwork );
+int64_t LAPACKE_dgeesx_work_64( int matrix_layout, char jobvs, char sort,
+                                LAPACK_D_SELECT2 select, char sense,
+                                int64_t n, double* a, int64_t lda,
+                                int64_t* sdim, double* wr, double* wi,
+                                double* vs, int64_t ldvs, double* rconde,
+                                double* rcondv, double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork,
+                                lapack_logical* bwork );
+int64_t LAPACKE_cgeesx_work_64( int matrix_layout, char jobvs, char sort,
+                                LAPACK_C_SELECT1 select, char sense,
+                                int64_t n, lapack_complex_float* a,
+                                int64_t lda, int64_t* sdim,
+                                lapack_complex_float* w,
+                                lapack_complex_float* vs, int64_t ldvs,
+                                float* rconde, float* rcondv,
+                                lapack_complex_float* work, int64_t lwork,
+                                float* rwork, lapack_logical* bwork );
+int64_t LAPACKE_zgeesx_work_64( int matrix_layout, char jobvs, char sort,
+                                LAPACK_Z_SELECT1 select, char sense,
+                                int64_t n, lapack_complex_double* a,
+                                int64_t lda, int64_t* sdim,
+                                lapack_complex_double* w,
+                                lapack_complex_double* vs, int64_t ldvs,
+                                double* rconde, double* rcondv,
+                                lapack_complex_double* work, int64_t lwork,
+                                double* rwork, lapack_logical* bwork );
+
+int64_t LAPACKE_sgeev_work_64( int matrix_layout, char jobvl, char jobvr,
+                               int64_t n, float* a, int64_t lda,
+                               float* wr, float* wi, float* vl, int64_t ldvl,
+                               float* vr, int64_t ldvr, float* work,
+                               int64_t lwork );
+int64_t LAPACKE_dgeev_work_64( int matrix_layout, char jobvl, char jobvr,
+                               int64_t n, double* a, int64_t lda,
+                               double* wr, double* wi, double* vl,
+                               int64_t ldvl, double* vr, int64_t ldvr,
+                               double* work, int64_t lwork );
+int64_t LAPACKE_cgeev_work_64( int matrix_layout, char jobvl, char jobvr,
+                               int64_t n, lapack_complex_float* a,
+                               int64_t lda, lapack_complex_float* w,
+                               lapack_complex_float* vl, int64_t ldvl,
+                               lapack_complex_float* vr, int64_t ldvr,
+                               lapack_complex_float* work, int64_t lwork,
+                               float* rwork );
+int64_t LAPACKE_zgeev_work_64( int matrix_layout, char jobvl, char jobvr,
+                               int64_t n, lapack_complex_double* a,
+                               int64_t lda, lapack_complex_double* w,
+                               lapack_complex_double* vl, int64_t ldvl,
+                               lapack_complex_double* vr, int64_t ldvr,
+                               lapack_complex_double* work, int64_t lwork,
+                               double* rwork );
+
+int64_t LAPACKE_sgeevx_work_64( int matrix_layout, char balanc, char jobvl,
+                                char jobvr, char sense, int64_t n, float* a,
+                                int64_t lda, float* wr, float* wi, float* vl,
+                                int64_t ldvl, float* vr, int64_t ldvr,
+                                int64_t* ilo, int64_t* ihi, float* scale,
+                                float* abnrm, float* rconde, float* rcondv,
+                                float* work, int64_t lwork,
+                                int64_t* iwork );
+int64_t LAPACKE_dgeevx_work_64( int matrix_layout, char balanc, char jobvl,
+                                char jobvr, char sense, int64_t n, double* a,
+                                int64_t lda, double* wr, double* wi,
+                                double* vl, int64_t ldvl, double* vr,
+                                int64_t ldvr, int64_t* ilo,
+                                int64_t* ihi, double* scale, double* abnrm,
+                                double* rconde, double* rcondv, double* work,
+                                int64_t lwork, int64_t* iwork );
+int64_t LAPACKE_cgeevx_work_64( int matrix_layout, char balanc, char jobvl,
+                                char jobvr, char sense, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* w,
+                                lapack_complex_float* vl, int64_t ldvl,
+                                lapack_complex_float* vr, int64_t ldvr,
+                                int64_t* ilo, int64_t* ihi, float* scale,
+                                float* abnrm, float* rconde, float* rcondv,
+                                lapack_complex_float* work, int64_t lwork,
+                                float* rwork );
+int64_t LAPACKE_zgeevx_work_64( int matrix_layout, char balanc, char jobvl,
+                                char jobvr, char sense, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* w,
+                                lapack_complex_double* vl, int64_t ldvl,
+                                lapack_complex_double* vr, int64_t ldvr,
+                                int64_t* ilo, int64_t* ihi, double* scale,
+                                double* abnrm, double* rconde, double* rcondv,
+                                lapack_complex_double* work, int64_t lwork,
+                                double* rwork );
+
+int64_t LAPACKE_sgehrd_work_64( int matrix_layout, int64_t n, int64_t ilo,
+                                int64_t ihi, float* a, int64_t lda,
+                                float* tau, float* work, int64_t lwork );
+int64_t LAPACKE_dgehrd_work_64( int matrix_layout, int64_t n, int64_t ilo,
+                                int64_t ihi, double* a, int64_t lda,
+                                double* tau, double* work, int64_t lwork );
+int64_t LAPACKE_cgehrd_work_64( int matrix_layout, int64_t n, int64_t ilo,
+                                int64_t ihi, lapack_complex_float* a,
+                                int64_t lda, lapack_complex_float* tau,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zgehrd_work_64( int matrix_layout, int64_t n, int64_t ilo,
+                                int64_t ihi, lapack_complex_double* a,
+                                int64_t lda, lapack_complex_double* tau,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sgejsv_work_64( int matrix_layout, char joba, char jobu,
+                                char jobv, char jobr, char jobt, char jobp,
+                                int64_t m, int64_t n, float* a,
+                                int64_t lda, float* sva, float* u,
+                                int64_t ldu, float* v, int64_t ldv,
+                                float* work, int64_t lwork,
+                                int64_t* iwork );
+int64_t LAPACKE_dgejsv_work_64( int matrix_layout, char joba, char jobu,
+                                char jobv, char jobr, char jobt, char jobp,
+                                int64_t m, int64_t n, double* a,
+                                int64_t lda, double* sva, double* u,
+                                int64_t ldu, double* v, int64_t ldv,
+                                double* work, int64_t lwork,
+                                int64_t* iwork );
+int64_t LAPACKE_cgejsv_work_64( int matrix_layout, char joba, char jobu,
+                                char jobv, char jobr, char jobt, char jobp,
+                                int64_t m, int64_t n, lapack_complex_float* a,
+                                int64_t lda, float* sva, lapack_complex_float* u,
+                                int64_t ldu, lapack_complex_float* v, int64_t ldv,
+                                lapack_complex_float* cwork, int64_t lwork,
+                                float* work, int64_t lrwork,
+                                int64_t* iwork );
+int64_t LAPACKE_zgejsv_work_64( int matrix_layout, char joba, char jobu,
+                                char jobv, char jobr, char jobt, char jobp,
+                                int64_t m, int64_t n, lapack_complex_double* a,
+                                int64_t lda, double* sva, lapack_complex_double* u,
+                                int64_t ldu, lapack_complex_double* v, int64_t ldv,
+                                lapack_complex_double* cwork, int64_t lwork,
+                                double* work, int64_t lrwork,
+                                int64_t* iwork );
+
+int64_t LAPACKE_sgelq2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                float* a, int64_t lda, float* tau,
+                                float* work );
+int64_t LAPACKE_dgelq2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                double* a, int64_t lda, double* tau,
+                                double* work );
+int64_t LAPACKE_cgelq2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* tau,
+                                lapack_complex_float* work );
+int64_t LAPACKE_zgelq2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* tau,
+                                lapack_complex_double* work );
+
+int64_t LAPACKE_sgelqf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                float* a, int64_t lda, float* tau,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dgelqf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                double* a, int64_t lda, double* tau,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_cgelqf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* tau,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zgelqf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* tau,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sgels_work_64( int matrix_layout, char trans, int64_t m,
+                               int64_t n, int64_t nrhs, float* a,
+                               int64_t lda, float* b, int64_t ldb,
+                               float* work, int64_t lwork );
+int64_t LAPACKE_dgels_work_64( int matrix_layout, char trans, int64_t m,
+                               int64_t n, int64_t nrhs, double* a,
+                               int64_t lda, double* b, int64_t ldb,
+                               double* work, int64_t lwork );
+int64_t LAPACKE_cgels_work_64( int matrix_layout, char trans, int64_t m,
+                               int64_t n, int64_t nrhs,
+                               lapack_complex_float* a, int64_t lda,
+                               lapack_complex_float* b, int64_t ldb,
+                               lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zgels_work_64( int matrix_layout, char trans, int64_t m,
+                               int64_t n, int64_t nrhs,
+                               lapack_complex_double* a, int64_t lda,
+                               lapack_complex_double* b, int64_t ldb,
+                               lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sgelsd_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t nrhs, float* a, int64_t lda,
+                                float* b, int64_t ldb, float* s, float rcond,
+                                int64_t* rank, float* work, int64_t lwork,
+                                int64_t* iwork );
+int64_t LAPACKE_dgelsd_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t nrhs, double* a, int64_t lda,
+                                double* b, int64_t ldb, double* s,
+                                double rcond, int64_t* rank, double* work,
+                                int64_t lwork, int64_t* iwork );
+int64_t LAPACKE_cgelsd_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t nrhs, lapack_complex_float* a,
+                                int64_t lda, lapack_complex_float* b,
+                                int64_t ldb, float* s, float rcond,
+                                int64_t* rank, lapack_complex_float* work,
+                                int64_t lwork, float* rwork,
+                                int64_t* iwork );
+int64_t LAPACKE_zgelsd_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t nrhs, lapack_complex_double* a,
+                                int64_t lda, lapack_complex_double* b,
+                                int64_t ldb, double* s, double rcond,
+                                int64_t* rank, lapack_complex_double* work,
+                                int64_t lwork, double* rwork,
+                                int64_t* iwork );
+
+int64_t LAPACKE_sgelss_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t nrhs, float* a, int64_t lda,
+                                float* b, int64_t ldb, float* s, float rcond,
+                                int64_t* rank, float* work,
+                                int64_t lwork );
+int64_t LAPACKE_dgelss_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t nrhs, double* a, int64_t lda,
+                                double* b, int64_t ldb, double* s,
+                                double rcond, int64_t* rank, double* work,
+                                int64_t lwork );
+int64_t LAPACKE_cgelss_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t nrhs, lapack_complex_float* a,
+                                int64_t lda, lapack_complex_float* b,
+                                int64_t ldb, float* s, float rcond,
+                                int64_t* rank, lapack_complex_float* work,
+                                int64_t lwork, float* rwork );
+int64_t LAPACKE_zgelss_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t nrhs, lapack_complex_double* a,
+                                int64_t lda, lapack_complex_double* b,
+                                int64_t ldb, double* s, double rcond,
+                                int64_t* rank, lapack_complex_double* work,
+                                int64_t lwork, double* rwork );
+
+int64_t LAPACKE_sgelsy_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t nrhs, float* a, int64_t lda,
+                                float* b, int64_t ldb, int64_t* jpvt,
+                                float rcond, int64_t* rank, float* work,
+                                int64_t lwork );
+int64_t LAPACKE_dgelsy_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t nrhs, double* a, int64_t lda,
+                                double* b, int64_t ldb, int64_t* jpvt,
+                                double rcond, int64_t* rank, double* work,
+                                int64_t lwork );
+int64_t LAPACKE_cgelsy_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t nrhs, lapack_complex_float* a,
+                                int64_t lda, lapack_complex_float* b,
+                                int64_t ldb, int64_t* jpvt, float rcond,
+                                int64_t* rank, lapack_complex_float* work,
+                                int64_t lwork, float* rwork );
+int64_t LAPACKE_zgelsy_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t nrhs, lapack_complex_double* a,
+                                int64_t lda, lapack_complex_double* b,
+                                int64_t ldb, int64_t* jpvt, double rcond,
+                                int64_t* rank, lapack_complex_double* work,
+                                int64_t lwork, double* rwork );
+
+int64_t LAPACKE_sgeqlf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                float* a, int64_t lda, float* tau,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dgeqlf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                double* a, int64_t lda, double* tau,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_cgeqlf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* tau,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zgeqlf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* tau,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sgeqp3_work_64( int matrix_layout, int64_t m, int64_t n,
+                                float* a, int64_t lda, int64_t* jpvt,
+                                float* tau, float* work, int64_t lwork );
+int64_t LAPACKE_dgeqp3_work_64( int matrix_layout, int64_t m, int64_t n,
+                                double* a, int64_t lda, int64_t* jpvt,
+                                double* tau, double* work, int64_t lwork );
+int64_t LAPACKE_cgeqp3_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                int64_t* jpvt, lapack_complex_float* tau,
+                                lapack_complex_float* work, int64_t lwork,
+                                float* rwork );
+int64_t LAPACKE_zgeqp3_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                int64_t* jpvt, lapack_complex_double* tau,
+                                lapack_complex_double* work, int64_t lwork,
+                                double* rwork );
+
+int64_t LAPACKE_sgeqpf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                float* a, int64_t lda, int64_t* jpvt,
+                                float* tau, float* work );
+int64_t LAPACKE_dgeqpf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                double* a, int64_t lda, int64_t* jpvt,
+                                double* tau, double* work );
+int64_t LAPACKE_cgeqpf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                int64_t* jpvt, lapack_complex_float* tau,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zgeqpf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                int64_t* jpvt, lapack_complex_double* tau,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_sgeqr2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                float* a, int64_t lda, float* tau,
+                                float* work );
+int64_t LAPACKE_dgeqr2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                double* a, int64_t lda, double* tau,
+                                double* work );
+int64_t LAPACKE_cgeqr2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* tau,
+                                lapack_complex_float* work );
+int64_t LAPACKE_zgeqr2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* tau,
+                                lapack_complex_double* work );
+
+int64_t LAPACKE_sgeqrf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                float* a, int64_t lda, float* tau,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dgeqrf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                double* a, int64_t lda, double* tau,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_cgeqrf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* tau,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zgeqrf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* tau,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sgeqrfp_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 float* a, int64_t lda, float* tau,
+                                 float* work, int64_t lwork );
+int64_t LAPACKE_dgeqrfp_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 double* a, int64_t lda, double* tau,
+                                 double* work, int64_t lwork );
+int64_t LAPACKE_cgeqrfp_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 lapack_complex_float* a, int64_t lda,
+                                 lapack_complex_float* tau,
+                                 lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zgeqrfp_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 lapack_complex_double* a, int64_t lda,
+                                 lapack_complex_double* tau,
+                                 lapack_complex_double* work,
+                                 int64_t lwork );
+
+int64_t LAPACKE_sgerfs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t nrhs, const float* a, int64_t lda,
+                                const float* af, int64_t ldaf,
+                                const int64_t* ipiv, const float* b,
+                                int64_t ldb, float* x, int64_t ldx,
+                                float* ferr, float* berr, float* work,
+                                int64_t* iwork );
+int64_t LAPACKE_dgerfs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t nrhs, const double* a,
+                                int64_t lda, const double* af,
+                                int64_t ldaf, const int64_t* ipiv,
+                                const double* b, int64_t ldb, double* x,
+                                int64_t ldx, double* ferr, double* berr,
+                                double* work, int64_t* iwork );
+int64_t LAPACKE_cgerfs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* a,
+                                int64_t lda, const lapack_complex_float* af,
+                                int64_t ldaf, const int64_t* ipiv,
+                                const lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* x, int64_t ldx,
+                                float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zgerfs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t nrhs, const lapack_complex_double* a,
+                                int64_t lda, const lapack_complex_double* af,
+                                int64_t ldaf, const int64_t* ipiv,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_sgerfsx_work_64( int matrix_layout, char trans, char equed,
+                                 int64_t n, int64_t nrhs, const float* a,
+                                 int64_t lda, const float* af,
+                                 int64_t ldaf, const int64_t* ipiv,
+                                 const float* r, const float* c, const float* b,
+                                 int64_t ldb, float* x, int64_t ldx,
+                                 float* rcond, float* berr,
+                                 int64_t n_err_bnds, float* err_bnds_norm,
+                                 float* err_bnds_comp, int64_t nparams,
+                                 float* params, float* work,
+                                 int64_t* iwork );
+int64_t LAPACKE_dgerfsx_work_64( int matrix_layout, char trans, char equed,
+                                 int64_t n, int64_t nrhs, const double* a,
+                                 int64_t lda, const double* af,
+                                 int64_t ldaf, const int64_t* ipiv,
+                                 const double* r, const double* c,
+                                 const double* b, int64_t ldb, double* x,
+                                 int64_t ldx, double* rcond, double* berr,
+                                 int64_t n_err_bnds, double* err_bnds_norm,
+                                 double* err_bnds_comp, int64_t nparams,
+                                 double* params, double* work,
+                                 int64_t* iwork );
+int64_t LAPACKE_cgerfsx_work_64( int matrix_layout, char trans, char equed,
+                                 int64_t n, int64_t nrhs,
+                                 const lapack_complex_float* a, int64_t lda,
+                                 const lapack_complex_float* af,
+                                 int64_t ldaf, const int64_t* ipiv,
+                                 const float* r, const float* c,
+                                 const lapack_complex_float* b, int64_t ldb,
+                                 lapack_complex_float* x, int64_t ldx,
+                                 float* rcond, float* berr,
+                                 int64_t n_err_bnds, float* err_bnds_norm,
+                                 float* err_bnds_comp, int64_t nparams,
+                                 float* params, lapack_complex_float* work,
+                                 float* rwork );
+int64_t LAPACKE_zgerfsx_work_64( int matrix_layout, char trans, char equed,
+                                 int64_t n, int64_t nrhs,
+                                 const lapack_complex_double* a, int64_t lda,
+                                 const lapack_complex_double* af,
+                                 int64_t ldaf, const int64_t* ipiv,
+                                 const double* r, const double* c,
+                                 const lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* x, int64_t ldx,
+                                 double* rcond, double* berr,
+                                 int64_t n_err_bnds, double* err_bnds_norm,
+                                 double* err_bnds_comp, int64_t nparams,
+                                 double* params, lapack_complex_double* work,
+                                 double* rwork );
+
+int64_t LAPACKE_sgerqf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                float* a, int64_t lda, float* tau,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dgerqf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                double* a, int64_t lda, double* tau,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_cgerqf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* tau,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zgerqf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* tau,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sgesdd_work_64( int matrix_layout, char jobz, int64_t m,
+                                int64_t n, float* a, int64_t lda,
+                                float* s, float* u, int64_t ldu, float* vt,
+                                int64_t ldvt, float* work, int64_t lwork,
+                                int64_t* iwork );
+int64_t LAPACKE_dgesdd_work_64( int matrix_layout, char jobz, int64_t m,
+                                int64_t n, double* a, int64_t lda,
+                                double* s, double* u, int64_t ldu,
+                                double* vt, int64_t ldvt, double* work,
+                                int64_t lwork, int64_t* iwork );
+int64_t LAPACKE_cgesdd_work_64( int matrix_layout, char jobz, int64_t m,
+                                int64_t n, lapack_complex_float* a,
+                                int64_t lda, float* s,
+                                lapack_complex_float* u, int64_t ldu,
+                                lapack_complex_float* vt, int64_t ldvt,
+                                lapack_complex_float* work, int64_t lwork,
+                                float* rwork, int64_t* iwork );
+int64_t LAPACKE_zgesdd_work_64( int matrix_layout, char jobz, int64_t m,
+                                int64_t n, lapack_complex_double* a,
+                                int64_t lda, double* s,
+                                lapack_complex_double* u, int64_t ldu,
+                                lapack_complex_double* vt, int64_t ldvt,
+                                lapack_complex_double* work, int64_t lwork,
+                                double* rwork, int64_t* iwork );
+
+int64_t LAPACKE_sgedmd_work_64( int matrix_layout, char jobs, char jobz,
+                                char jobr, char jobf, int64_t whtsvd,
+                                int64_t m, int64_t n, float* x,
+                                int64_t ldx, float* y, int64_t ldy,
+                                int64_t nrnk, float* tol, int64_t k,
+                                float* reig, float* imeig,
+                                float* z, int64_t ldz, float* res,
+                                float* b, int64_t ldb, float* w,
+                                int64_t ldw, float* s, int64_t lds,
+                                float* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_dgedmd_work_64( int matrix_layout, char jobs, char jobz,
+                                char jobr, char jobf, int64_t whtsvd,
+                                int64_t m, int64_t n, double* x,
+                                int64_t ldx, double* y, int64_t ldy,
+                                int64_t nrnk, double* tol, int64_t k,
+                                double* reig, double *imeig,
+                                double* z, int64_t ldz, double* res,
+                                double* b, int64_t ldb, double* w,
+                                int64_t ldw, double* s, int64_t lds,
+                                double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_cgedmd_work_64( int matrix_layout, char jobs, char jobz,
+                                char jobr, char jobf, int64_t whtsvd,
+                                int64_t m, int64_t n,
+                                lapack_complex_float* x, int64_t ldx,
+                                lapack_complex_float* y, int64_t ldy,
+                                int64_t nrnk, float* tol, int64_t k,
+                                lapack_complex_float* eigs,
+                                lapack_complex_float* z, int64_t ldz,
+                                float* res,
+                                lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* w, int64_t ldw,
+                                lapack_complex_float* s, int64_t lds,
+                                lapack_complex_float* zwork, int64_t lzwork,
+                                float* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_zgedmd_work_64( int matrix_layout, char jobs, char jobz,
+                                char jobr, char jobf, int64_t whtsvd,
+                                int64_t m, int64_t n,
+                                lapack_complex_double* x, int64_t ldx,
+                                lapack_complex_double* y, int64_t ldy,
+                                int64_t nrnk, double* tol, int64_t k, 
+                                lapack_complex_double* eigs,
+                                lapack_complex_double* z, int64_t ldz,
+                                double* res,
+                                lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* w, int64_t ldw,
+                                lapack_complex_double* s, int64_t lds,
+                                lapack_complex_double* zwork, int64_t lzwork,
+                                double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_sgedmdq_work_64( int matrix_layout, char jobs, char jobz,
+                                 char jobr, char jobq, char jobt, char jobf,
+                                 int64_t whtsvd, int64_t m, int64_t n,
+                                 float* f, int64_t ldf, float* x,
+                                 int64_t ldx, float* y, int64_t ldy,
+                                 int64_t nrnk, float* tol, int64_t k,
+                                 float* reig, float *imeig, float* z,
+                                 int64_t ldz, float* res, float* b,
+                                 int64_t ldb, float* v, int64_t ldv,
+                                 float* s, int64_t lds, float* work,
+                                 int64_t lwork, int64_t* iwork,
+                                 int64_t liwork );
+
+int64_t LAPACKE_dgedmdq_work_64( int matrix_layout, char jobs, char jobz,
+                                 char jobr, char jobq, char jobt, char jobf,
+                                 int64_t whtsvd, int64_t m, int64_t n,
+                                 double* f, int64_t ldf, double* x,
+                                 int64_t ldx, double* y, int64_t ldy,
+                                 int64_t nrnk, double* tol, int64_t k,
+                                 double* reig, double* imeig, double* z,
+                                 int64_t ldz, double* res, double* b,
+                                 int64_t ldb, double* v, int64_t ldv,
+                                 double* s, int64_t lds, double* work,
+                                 int64_t lwork, int64_t* iwork,
+                                 int64_t liwork );
+
+int64_t LAPACKE_cgedmdq_work_64( int matrix_layout, char jobs, char jobz,
+                                 char jobr, char jobq, char jobt, char jobf,
+                                 int64_t whtsvd, int64_t m, int64_t n,
+                                 lapack_complex_float* f, int64_t ldf,
+                                 lapack_complex_float* x, int64_t ldx,
+                                 lapack_complex_float* y, int64_t ldy,
+                                 int64_t nrnk, float* tol, int64_t k,
+                                 lapack_complex_float* eigs,
+                                 lapack_complex_float* z, int64_t ldz,
+                                 float* res,
+                                 lapack_complex_float* b, int64_t ldb,
+                                 lapack_complex_float* v, int64_t ldv,
+                                 lapack_complex_float* s, int64_t lds,
+                                 lapack_complex_float* zwork, int64_t lzwork,
+                                 float* work, int64_t lwork,
+                                 int64_t* iwork, int64_t liwork);
+
+int64_t LAPACKE_zgedmdq_work_64( int matrix_layout, char jobs, char jobz,
+                                 char jobr, char jobq, char jobt, char jobf,
+                                 int64_t whtsvd, int64_t m, int64_t n,
+                                 lapack_complex_double* f, int64_t ldf,
+                                 lapack_complex_double* x, int64_t ldx,
+                                 lapack_complex_double* y, int64_t ldy,
+                                 int64_t nrnk, double* tol, int64_t k,
+                                 lapack_complex_double* eigs,
+                                 lapack_complex_double* z, int64_t ldz,
+                                 double* res,
+                                 lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* v, int64_t ldv,
+                                 lapack_complex_double* s, int64_t lds,
+                                 lapack_complex_double* zwork, int64_t lzwork,
+                                 double* work, int64_t lwork,
+                                 int64_t* iwork, int64_t liwork);
+
+
+int64_t LAPACKE_sgesv_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                               float* a, int64_t lda, int64_t* ipiv,
+                               float* b, int64_t ldb );
+int64_t LAPACKE_dgesv_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                               double* a, int64_t lda, int64_t* ipiv,
+                               double* b, int64_t ldb );
+int64_t LAPACKE_cgesv_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                               lapack_complex_float* a, int64_t lda,
+                               int64_t* ipiv, lapack_complex_float* b,
+                               int64_t ldb );
+int64_t LAPACKE_zgesv_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                               lapack_complex_double* a, int64_t lda,
+                               int64_t* ipiv, lapack_complex_double* b,
+                               int64_t ldb );
+int64_t LAPACKE_dsgesv_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                                double* a, int64_t lda, int64_t* ipiv,
+                                const double* b, int64_t ldb, double* x,
+                                int64_t ldx, double* work, float* swork,
+                                int64_t* iter );
+int64_t LAPACKE_zcgesv_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                                lapack_complex_double* a, int64_t lda,
+                                int64_t* ipiv, const lapack_complex_double* b,
+                                int64_t ldb, lapack_complex_double* x,
+                                int64_t ldx, lapack_complex_double* work,
+                                lapack_complex_float* swork, double* rwork,
+                                int64_t* iter );
+
+int64_t LAPACKE_sgesvd_work_64( int matrix_layout, char jobu, char jobvt,
+                                int64_t m, int64_t n, float* a,
+                                int64_t lda, float* s, float* u,
+                                int64_t ldu, float* vt, int64_t ldvt,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dgesvd_work_64( int matrix_layout, char jobu, char jobvt,
+                                int64_t m, int64_t n, double* a,
+                                int64_t lda, double* s, double* u,
+                                int64_t ldu, double* vt, int64_t ldvt,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_cgesvd_work_64( int matrix_layout, char jobu, char jobvt,
+                                int64_t m, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                float* s, lapack_complex_float* u,
+                                int64_t ldu, lapack_complex_float* vt,
+                                int64_t ldvt, lapack_complex_float* work,
+                                int64_t lwork, float* rwork );
+int64_t LAPACKE_zgesvd_work_64( int matrix_layout, char jobu, char jobvt,
+                                int64_t m, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                double* s, lapack_complex_double* u,
+                                int64_t ldu, lapack_complex_double* vt,
+                                int64_t ldvt, lapack_complex_double* work,
+                                int64_t lwork, double* rwork );
+
+int64_t LAPACKE_sgesvdx_work_64( int matrix_layout, char jobu, char jobvt, char range,
+                                 int64_t m, int64_t n, float* a,
+                                 int64_t lda, float vl, float vu,
+                                 int64_t il, int64_t iu, int64_t* ns,
+                                 float* s, float* u, int64_t ldu,
+                                 float* vt, int64_t ldvt,
+                                 float* work, int64_t lwork, int64_t* iwork );
+int64_t LAPACKE_dgesvdx_work_64( int matrix_layout, char jobu, char jobvt, char range,
+                                 int64_t m, int64_t n, double* a,
+                                 int64_t lda, double vl, double vu,
+                                 int64_t il, int64_t iu, int64_t* ns,
+                                 double* s, double* u, int64_t ldu,
+                                 double* vt, int64_t ldvt,
+                                 double* work, int64_t lwork, int64_t* iwork );
+int64_t LAPACKE_cgesvdx_work_64( int matrix_layout, char jobu, char jobvt, char range,
+                                 int64_t m, int64_t n, lapack_complex_float* a,
+                                 int64_t lda, float vl, float vu,
+                                 int64_t il, int64_t iu, int64_t* ns,
+                                 float* s, lapack_complex_float* u, int64_t ldu,
+                                 lapack_complex_float* vt, int64_t ldvt,
+                                 lapack_complex_float* work, int64_t lwork,
+                                 float* rwork, int64_t* iwork );
+int64_t LAPACKE_zgesvdx_work_64( int matrix_layout, char jobu, char jobvt, char range,
+                                 int64_t m, int64_t n, lapack_complex_double* a,
+                                 int64_t lda, double vl, double vu,
+                                 int64_t il, int64_t iu, int64_t* ns,
+                                 double* s, lapack_complex_double* u, int64_t ldu,
+                                 lapack_complex_double* vt, int64_t ldvt,
+                                 lapack_complex_double* work, int64_t lwork,
+                                 double* rwork, int64_t* iwork );
+
+int64_t LAPACKE_sgesvdq_work_64( int matrix_layout, char joba, char jobp,
+                                char jobr, char jobu, char jobv,
+                                int64_t m, int64_t n, float* a,
+                                int64_t lda, float* s, float* u,
+                                int64_t ldu, float* v, int64_t ldv,
+                                int64_t* numrank,
+                                int64_t* iwork, int64_t liwork,
+                                float* work, int64_t lwork,
+                                float* rwork, int64_t lrwork);
+int64_t LAPACKE_dgesvdq_work_64( int matrix_layout, char joba, char jobp,
+                                char jobr, char jobu, char jobv,
+                                int64_t m, int64_t n, double* a,
+                                int64_t lda, double* s, double* u,
+                                int64_t ldu, double* v, int64_t ldv,
+                                int64_t* numrank,
+                                int64_t* iwork, int64_t liwork,
+                                double* work, int64_t lwork,
+                                double* rwork, int64_t lrwork);
+int64_t LAPACKE_cgesvdq_work_64( int matrix_layout, char joba, char jobp,
+                                char jobr, char jobu, char jobv,
+                                int64_t m, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                float* s, lapack_complex_float* u,
+                                int64_t ldu, lapack_complex_float* v,
+                                int64_t ldv, int64_t* numrank,
+                                int64_t* iwork, int64_t liwork,
+                                lapack_complex_float* cwork, int64_t lcwork,
+                                float* rwork, int64_t lrwork);
+int64_t LAPACKE_zgesvdq_work_64( int matrix_layout, char joba, char jobp,
+                                char jobr, char jobu, char jobv,
+                                int64_t m, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                double* s, lapack_complex_double* u,
+                                int64_t ldu, lapack_complex_double* v,
+                                int64_t ldv, int64_t* numrank,
+                                int64_t* iwork, int64_t liwork,
+                                lapack_complex_double* cwork, int64_t lcwork,
+                                double* rwork, int64_t lrwork);
+
+int64_t LAPACKE_sgesvj_work_64( int matrix_layout, char joba, char jobu,
+                                char jobv, int64_t m, int64_t n, float* a,
+                                int64_t lda, float* sva, int64_t mv,
+                                float* v, int64_t ldv, float* work,
+                                int64_t lwork );
+int64_t LAPACKE_dgesvj_work_64( int matrix_layout, char joba, char jobu,
+                                char jobv, int64_t m, int64_t n,
+                                double* a, int64_t lda, double* sva,
+                                int64_t mv, double* v, int64_t ldv,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_cgesvj_work_64( int matrix_layout, char joba, char jobu,
+                                char jobv, int64_t m, int64_t n, lapack_complex_float* a,
+                                int64_t lda, float* sva, int64_t mv,
+                                lapack_complex_float* v, int64_t ldv,
+                                lapack_complex_float* cwork, int64_t lwork,
+                                float* rwork,int64_t lrwork );
+int64_t LAPACKE_zgesvj_work_64( int matrix_layout, char joba, char jobu,
+                                char jobv, int64_t m, int64_t n,
+                                lapack_complex_double* a, int64_t lda, double* sva,
+                                int64_t mv, lapack_complex_double* v, int64_t ldv,
+                                lapack_complex_double* cwork, int64_t lwork,
+                                double* rwork, int64_t lrwork );
+
+int64_t LAPACKE_sgesvx_work_64( int matrix_layout, char fact, char trans,
+                                int64_t n, int64_t nrhs, float* a,
+                                int64_t lda, float* af, int64_t ldaf,
+                                int64_t* ipiv, char* equed, float* r,
+                                float* c, float* b, int64_t ldb, float* x,
+                                int64_t ldx, float* rcond, float* ferr,
+                                float* berr, float* work, int64_t* iwork );
+int64_t LAPACKE_dgesvx_work_64( int matrix_layout, char fact, char trans,
+                                int64_t n, int64_t nrhs, double* a,
+                                int64_t lda, double* af, int64_t ldaf,
+                                int64_t* ipiv, char* equed, double* r,
+                                double* c, double* b, int64_t ldb, double* x,
+                                int64_t ldx, double* rcond, double* ferr,
+                                double* berr, double* work, int64_t* iwork );
+int64_t LAPACKE_cgesvx_work_64( int matrix_layout, char fact, char trans,
+                                int64_t n, int64_t nrhs,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* af, int64_t ldaf,
+                                int64_t* ipiv, char* equed, float* r,
+                                float* c, lapack_complex_float* b,
+                                int64_t ldb, lapack_complex_float* x,
+                                int64_t ldx, float* rcond, float* ferr,
+                                float* berr, lapack_complex_float* work,
+                                float* rwork );
+int64_t LAPACKE_zgesvx_work_64( int matrix_layout, char fact, char trans,
+                                int64_t n, int64_t nrhs,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* af, int64_t ldaf,
+                                int64_t* ipiv, char* equed, double* r,
+                                double* c, lapack_complex_double* b,
+                                int64_t ldb, lapack_complex_double* x,
+                                int64_t ldx, double* rcond, double* ferr,
+                                double* berr, lapack_complex_double* work,
+                                double* rwork );
+
+int64_t LAPACKE_sgesvxx_work_64( int matrix_layout, char fact, char trans,
+                                 int64_t n, int64_t nrhs, float* a,
+                                 int64_t lda, float* af, int64_t ldaf,
+                                 int64_t* ipiv, char* equed, float* r,
+                                 float* c, float* b, int64_t ldb, float* x,
+                                 int64_t ldx, float* rcond, float* rpvgrw,
+                                 float* berr, int64_t n_err_bnds,
+                                 float* err_bnds_norm, float* err_bnds_comp,
+                                 int64_t nparams, float* params, float* work,
+                                 int64_t* iwork );
+int64_t LAPACKE_dgesvxx_work_64( int matrix_layout, char fact, char trans,
+                                 int64_t n, int64_t nrhs, double* a,
+                                 int64_t lda, double* af, int64_t ldaf,
+                                 int64_t* ipiv, char* equed, double* r,
+                                 double* c, double* b, int64_t ldb,
+                                 double* x, int64_t ldx, double* rcond,
+                                 double* rpvgrw, double* berr,
+                                 int64_t n_err_bnds, double* err_bnds_norm,
+                                 double* err_bnds_comp, int64_t nparams,
+                                 double* params, double* work,
+                                 int64_t* iwork );
+int64_t LAPACKE_cgesvxx_work_64( int matrix_layout, char fact, char trans,
+                                 int64_t n, int64_t nrhs,
+                                 lapack_complex_float* a, int64_t lda,
+                                 lapack_complex_float* af, int64_t ldaf,
+                                 int64_t* ipiv, char* equed, float* r,
+                                 float* c, lapack_complex_float* b,
+                                 int64_t ldb, lapack_complex_float* x,
+                                 int64_t ldx, float* rcond, float* rpvgrw,
+                                 float* berr, int64_t n_err_bnds,
+                                 float* err_bnds_norm, float* err_bnds_comp,
+                                 int64_t nparams, float* params,
+                                 lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zgesvxx_work_64( int matrix_layout, char fact, char trans,
+                                 int64_t n, int64_t nrhs,
+                                 lapack_complex_double* a, int64_t lda,
+                                 lapack_complex_double* af, int64_t ldaf,
+                                 int64_t* ipiv, char* equed, double* r,
+                                 double* c, lapack_complex_double* b,
+                                 int64_t ldb, lapack_complex_double* x,
+                                 int64_t ldx, double* rcond, double* rpvgrw,
+                                 double* berr, int64_t n_err_bnds,
+                                 double* err_bnds_norm, double* err_bnds_comp,
+                                 int64_t nparams, double* params,
+                                 lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_sgetf2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                float* a, int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_dgetf2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                double* a, int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_cgetf2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                int64_t* ipiv );
+int64_t LAPACKE_zgetf2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                int64_t* ipiv );
+
+int64_t LAPACKE_sgetrf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                float* a, int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_dgetrf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                double* a, int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_cgetrf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                int64_t* ipiv );
+int64_t LAPACKE_zgetrf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                int64_t* ipiv );
+
+int64_t LAPACKE_sgetrf2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                float* a, int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_dgetrf2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                double* a, int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_cgetrf2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                int64_t* ipiv );
+int64_t LAPACKE_zgetrf2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                int64_t* ipiv );
+
+int64_t LAPACKE_sgetri_work_64( int matrix_layout, int64_t n, float* a,
+                                int64_t lda, const int64_t* ipiv,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dgetri_work_64( int matrix_layout, int64_t n, double* a,
+                                int64_t lda, const int64_t* ipiv,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_cgetri_work_64( int matrix_layout, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                const int64_t* ipiv,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zgetri_work_64( int matrix_layout, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                const int64_t* ipiv,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sgetrs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t nrhs, const float* a, int64_t lda,
+                                const int64_t* ipiv, float* b,
+                                int64_t ldb );
+int64_t LAPACKE_dgetrs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t nrhs, const double* a,
+                                int64_t lda, const int64_t* ipiv,
+                                double* b, int64_t ldb );
+int64_t LAPACKE_cgetrs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* a,
+                                int64_t lda, const int64_t* ipiv,
+                                lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zgetrs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t nrhs, const lapack_complex_double* a,
+                                int64_t lda, const int64_t* ipiv,
+                                lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_sggbak_work_64( int matrix_layout, char job, char side,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                const float* lscale, const float* rscale,
+                                int64_t m, float* v, int64_t ldv );
+int64_t LAPACKE_dggbak_work_64( int matrix_layout, char job, char side,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                const double* lscale, const double* rscale,
+                                int64_t m, double* v, int64_t ldv );
+int64_t LAPACKE_cggbak_work_64( int matrix_layout, char job, char side,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                const float* lscale, const float* rscale,
+                                int64_t m, lapack_complex_float* v,
+                                int64_t ldv );
+int64_t LAPACKE_zggbak_work_64( int matrix_layout, char job, char side,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                const double* lscale, const double* rscale,
+                                int64_t m, lapack_complex_double* v,
+                                int64_t ldv );
+
+int64_t LAPACKE_sggbal_work_64( int matrix_layout, char job, int64_t n,
+                                float* a, int64_t lda, float* b,
+                                int64_t ldb, int64_t* ilo,
+                                int64_t* ihi, float* lscale, float* rscale,
+                                float* work );
+int64_t LAPACKE_dggbal_work_64( int matrix_layout, char job, int64_t n,
+                                double* a, int64_t lda, double* b,
+                                int64_t ldb, int64_t* ilo,
+                                int64_t* ihi, double* lscale, double* rscale,
+                                double* work );
+int64_t LAPACKE_cggbal_work_64( int matrix_layout, char job, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* b, int64_t ldb,
+                                int64_t* ilo, int64_t* ihi, float* lscale,
+                                float* rscale, float* work );
+int64_t LAPACKE_zggbal_work_64( int matrix_layout, char job, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* b, int64_t ldb,
+                                int64_t* ilo, int64_t* ihi,
+                                double* lscale, double* rscale, double* work );
+
+int64_t LAPACKE_sgges_work_64( int matrix_layout, char jobvsl, char jobvsr,
+                               char sort, LAPACK_S_SELECT3 selctg, int64_t n,
+                               float* a, int64_t lda, float* b,
+                               int64_t ldb, int64_t* sdim, float* alphar,
+                               float* alphai, float* beta, float* vsl,
+                               int64_t ldvsl, float* vsr, int64_t ldvsr,
+                               float* work, int64_t lwork,
+                               lapack_logical* bwork );
+int64_t LAPACKE_dgges_work_64( int matrix_layout, char jobvsl, char jobvsr,
+                               char sort, LAPACK_D_SELECT3 selctg, int64_t n,
+                               double* a, int64_t lda, double* b,
+                               int64_t ldb, int64_t* sdim, double* alphar,
+                               double* alphai, double* beta, double* vsl,
+                               int64_t ldvsl, double* vsr, int64_t ldvsr,
+                               double* work, int64_t lwork,
+                               lapack_logical* bwork );
+int64_t LAPACKE_cgges_work_64( int matrix_layout, char jobvsl, char jobvsr,
+                               char sort, LAPACK_C_SELECT2 selctg, int64_t n,
+                               lapack_complex_float* a, int64_t lda,
+                               lapack_complex_float* b, int64_t ldb,
+                               int64_t* sdim, lapack_complex_float* alpha,
+                               lapack_complex_float* beta,
+                               lapack_complex_float* vsl, int64_t ldvsl,
+                               lapack_complex_float* vsr, int64_t ldvsr,
+                               lapack_complex_float* work, int64_t lwork,
+                               float* rwork, lapack_logical* bwork );
+int64_t LAPACKE_zgges_work_64( int matrix_layout, char jobvsl, char jobvsr,
+                               char sort, LAPACK_Z_SELECT2 selctg, int64_t n,
+                               lapack_complex_double* a, int64_t lda,
+                               lapack_complex_double* b, int64_t ldb,
+                               int64_t* sdim, lapack_complex_double* alpha,
+                               lapack_complex_double* beta,
+                               lapack_complex_double* vsl, int64_t ldvsl,
+                               lapack_complex_double* vsr, int64_t ldvsr,
+                               lapack_complex_double* work, int64_t lwork,
+                               double* rwork, lapack_logical* bwork );
+
+int64_t LAPACKE_sgges3_work_64( int matrix_layout, char jobvsl, char jobvsr,
+                                char sort, LAPACK_S_SELECT3 selctg,
+                                int64_t n,
+                                float* a, int64_t lda,
+                                float* b, int64_t ldb, int64_t* sdim,
+                                float* alphar, float* alphai, float* beta,
+                                float* vsl, int64_t ldvsl,
+                                float* vsr, int64_t ldvsr,
+                                float* work, int64_t lwork,
+                                lapack_logical* bwork );
+int64_t LAPACKE_dgges3_work_64( int matrix_layout, char jobvsl, char jobvsr,
+                                char sort, LAPACK_D_SELECT3 selctg,
+                                int64_t n,
+                                double* a, int64_t lda,
+                                double* b, int64_t ldb, int64_t* sdim,
+                                double* alphar, double* alphai, double* beta,
+                                double* vsl, int64_t ldvsl,
+                                double* vsr, int64_t ldvsr,
+                                double* work, int64_t lwork,
+                                lapack_logical* bwork );
+int64_t LAPACKE_cgges3_work_64( int matrix_layout, char jobvsl, char jobvsr,
+                                char sort, LAPACK_C_SELECT2 selctg,
+                                int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* b, int64_t ldb,
+                                int64_t* sdim, lapack_complex_float* alpha,
+                                lapack_complex_float* beta,
+                                lapack_complex_float* vsl, int64_t ldvsl,
+                                lapack_complex_float* vsr, int64_t ldvsr,
+                                lapack_complex_float* work, int64_t lwork,
+                                float* rwork, lapack_logical* bwork );
+int64_t LAPACKE_zgges3_work_64( int matrix_layout, char jobvsl, char jobvsr,
+                                char sort, LAPACK_Z_SELECT2 selctg,
+                                int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* b, int64_t ldb,
+                                int64_t* sdim, lapack_complex_double* alpha,
+                                lapack_complex_double* beta,
+                                lapack_complex_double* vsl, int64_t ldvsl,
+                                lapack_complex_double* vsr, int64_t ldvsr,
+                                lapack_complex_double* work, int64_t lwork,
+                                double* rwork, lapack_logical* bwork );
+
+int64_t LAPACKE_sggesx_work_64( int matrix_layout, char jobvsl, char jobvsr,
+                                char sort, LAPACK_S_SELECT3 selctg, char sense,
+                                int64_t n, float* a, int64_t lda,
+                                float* b, int64_t ldb, int64_t* sdim,
+                                float* alphar, float* alphai, float* beta,
+                                float* vsl, int64_t ldvsl, float* vsr,
+                                int64_t ldvsr, float* rconde, float* rcondv,
+                                float* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork,
+                                lapack_logical* bwork );
+int64_t LAPACKE_dggesx_work_64( int matrix_layout, char jobvsl, char jobvsr,
+                                char sort, LAPACK_D_SELECT3 selctg, char sense,
+                                int64_t n, double* a, int64_t lda,
+                                double* b, int64_t ldb, int64_t* sdim,
+                                double* alphar, double* alphai, double* beta,
+                                double* vsl, int64_t ldvsl, double* vsr,
+                                int64_t ldvsr, double* rconde,
+                                double* rcondv, double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork,
+                                lapack_logical* bwork );
+int64_t LAPACKE_cggesx_work_64( int matrix_layout, char jobvsl, char jobvsr,
+                                char sort, LAPACK_C_SELECT2 selctg, char sense,
+                                int64_t n, lapack_complex_float* a,
+                                int64_t lda, lapack_complex_float* b,
+                                int64_t ldb, int64_t* sdim,
+                                lapack_complex_float* alpha,
+                                lapack_complex_float* beta,
+                                lapack_complex_float* vsl, int64_t ldvsl,
+                                lapack_complex_float* vsr, int64_t ldvsr,
+                                float* rconde, float* rcondv,
+                                lapack_complex_float* work, int64_t lwork,
+                                float* rwork, int64_t* iwork,
+                                int64_t liwork, lapack_logical* bwork );
+int64_t LAPACKE_zggesx_work_64( int matrix_layout, char jobvsl, char jobvsr,
+                                char sort, LAPACK_Z_SELECT2 selctg, char sense,
+                                int64_t n, lapack_complex_double* a,
+                                int64_t lda, lapack_complex_double* b,
+                                int64_t ldb, int64_t* sdim,
+                                lapack_complex_double* alpha,
+                                lapack_complex_double* beta,
+                                lapack_complex_double* vsl, int64_t ldvsl,
+                                lapack_complex_double* vsr, int64_t ldvsr,
+                                double* rconde, double* rcondv,
+                                lapack_complex_double* work, int64_t lwork,
+                                double* rwork, int64_t* iwork,
+                                int64_t liwork, lapack_logical* bwork );
+
+int64_t LAPACKE_sggev_work_64( int matrix_layout, char jobvl, char jobvr,
+                               int64_t n, float* a, int64_t lda, float* b,
+                               int64_t ldb, float* alphar, float* alphai,
+                               float* beta, float* vl, int64_t ldvl,
+                               float* vr, int64_t ldvr, float* work,
+                               int64_t lwork );
+int64_t LAPACKE_dggev_work_64( int matrix_layout, char jobvl, char jobvr,
+                               int64_t n, double* a, int64_t lda,
+                               double* b, int64_t ldb, double* alphar,
+                               double* alphai, double* beta, double* vl,
+                               int64_t ldvl, double* vr, int64_t ldvr,
+                               double* work, int64_t lwork );
+int64_t LAPACKE_cggev_work_64( int matrix_layout, char jobvl, char jobvr,
+                               int64_t n, lapack_complex_float* a,
+                               int64_t lda, lapack_complex_float* b,
+                               int64_t ldb, lapack_complex_float* alpha,
+                               lapack_complex_float* beta,
+                               lapack_complex_float* vl, int64_t ldvl,
+                               lapack_complex_float* vr, int64_t ldvr,
+                               lapack_complex_float* work, int64_t lwork,
+                               float* rwork );
+int64_t LAPACKE_zggev_work_64( int matrix_layout, char jobvl, char jobvr,
+                               int64_t n, lapack_complex_double* a,
+                               int64_t lda, lapack_complex_double* b,
+                               int64_t ldb, lapack_complex_double* alpha,
+                               lapack_complex_double* beta,
+                               lapack_complex_double* vl, int64_t ldvl,
+                               lapack_complex_double* vr, int64_t ldvr,
+                               lapack_complex_double* work, int64_t lwork,
+                               double* rwork );
+
+int64_t LAPACKE_sggev3_work_64( int matrix_layout, char jobvl, char jobvr,
+                                int64_t n,
+                                float* a, int64_t lda,
+                                float* b, int64_t ldb,
+                                float* alphar, float* alphai, float* beta,
+                                float* vl, int64_t ldvl,
+                                float* vr, int64_t ldvr,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dggev3_work_64( int matrix_layout, char jobvl, char jobvr,
+                                int64_t n,
+                                double* a, int64_t lda,
+                                double* b, int64_t ldb,
+                                double* alphar, double* alphai, double* beta,
+                                double* vl, int64_t ldvl,
+                                double* vr, int64_t ldvr,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_cggev3_work_64( int matrix_layout, char jobvl, char jobvr,
+                                int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* alpha,
+                                lapack_complex_float* beta,
+                                lapack_complex_float* vl, int64_t ldvl,
+                                lapack_complex_float* vr, int64_t ldvr,
+                                lapack_complex_float* work, int64_t lwork,
+                                float* rwork );
+int64_t LAPACKE_zggev3_work_64( int matrix_layout, char jobvl, char jobvr,
+                                int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* alpha,
+                                lapack_complex_double* beta,
+                                lapack_complex_double* vl, int64_t ldvl,
+                                lapack_complex_double* vr, int64_t ldvr,
+                                lapack_complex_double* work, int64_t lwork,
+                                double* rwork );
+
+int64_t LAPACKE_sggevx_work_64( int matrix_layout, char balanc, char jobvl,
+                                char jobvr, char sense, int64_t n, float* a,
+                                int64_t lda, float* b, int64_t ldb,
+                                float* alphar, float* alphai, float* beta,
+                                float* vl, int64_t ldvl, float* vr,
+                                int64_t ldvr, int64_t* ilo,
+                                int64_t* ihi, float* lscale, float* rscale,
+                                float* abnrm, float* bbnrm, float* rconde,
+                                float* rcondv, float* work, int64_t lwork,
+                                int64_t* iwork, lapack_logical* bwork );
+int64_t LAPACKE_dggevx_work_64( int matrix_layout, char balanc, char jobvl,
+                                char jobvr, char sense, int64_t n, double* a,
+                                int64_t lda, double* b, int64_t ldb,
+                                double* alphar, double* alphai, double* beta,
+                                double* vl, int64_t ldvl, double* vr,
+                                int64_t ldvr, int64_t* ilo,
+                                int64_t* ihi, double* lscale, double* rscale,
+                                double* abnrm, double* bbnrm, double* rconde,
+                                double* rcondv, double* work, int64_t lwork,
+                                int64_t* iwork, lapack_logical* bwork );
+int64_t LAPACKE_cggevx_work_64( int matrix_layout, char balanc, char jobvl,
+                                char jobvr, char sense, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* alpha,
+                                lapack_complex_float* beta,
+                                lapack_complex_float* vl, int64_t ldvl,
+                                lapack_complex_float* vr, int64_t ldvr,
+                                int64_t* ilo, int64_t* ihi, float* lscale,
+                                float* rscale, float* abnrm, float* bbnrm,
+                                float* rconde, float* rcondv,
+                                lapack_complex_float* work, int64_t lwork,
+                                float* rwork, int64_t* iwork,
+                                lapack_logical* bwork );
+int64_t LAPACKE_zggevx_work_64( int matrix_layout, char balanc, char jobvl,
+                                char jobvr, char sense, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* alpha,
+                                lapack_complex_double* beta,
+                                lapack_complex_double* vl, int64_t ldvl,
+                                lapack_complex_double* vr, int64_t ldvr,
+                                int64_t* ilo, int64_t* ihi,
+                                double* lscale, double* rscale, double* abnrm,
+                                double* bbnrm, double* rconde, double* rcondv,
+                                lapack_complex_double* work, int64_t lwork,
+                                double* rwork, int64_t* iwork,
+                                lapack_logical* bwork );
+
+int64_t LAPACKE_sggglm_work_64( int matrix_layout, int64_t n, int64_t m,
+                                int64_t p, float* a, int64_t lda,
+                                float* b, int64_t ldb, float* d, float* x,
+                                float* y, float* work, int64_t lwork );
+int64_t LAPACKE_dggglm_work_64( int matrix_layout, int64_t n, int64_t m,
+                                int64_t p, double* a, int64_t lda,
+                                double* b, int64_t ldb, double* d, double* x,
+                                double* y, double* work, int64_t lwork );
+int64_t LAPACKE_cggglm_work_64( int matrix_layout, int64_t n, int64_t m,
+                                int64_t p, lapack_complex_float* a,
+                                int64_t lda, lapack_complex_float* b,
+                                int64_t ldb, lapack_complex_float* d,
+                                lapack_complex_float* x,
+                                lapack_complex_float* y,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zggglm_work_64( int matrix_layout, int64_t n, int64_t m,
+                                int64_t p, lapack_complex_double* a,
+                                int64_t lda, lapack_complex_double* b,
+                                int64_t ldb, lapack_complex_double* d,
+                                lapack_complex_double* x,
+                                lapack_complex_double* y,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sgghrd_work_64( int matrix_layout, char compq, char compz,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                float* a, int64_t lda, float* b,
+                                int64_t ldb, float* q, int64_t ldq,
+                                float* z, int64_t ldz );
+int64_t LAPACKE_dgghrd_work_64( int matrix_layout, char compq, char compz,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                double* a, int64_t lda, double* b,
+                                int64_t ldb, double* q, int64_t ldq,
+                                double* z, int64_t ldz );
+int64_t LAPACKE_cgghrd_work_64( int matrix_layout, char compq, char compz,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* q, int64_t ldq,
+                                lapack_complex_float* z, int64_t ldz );
+int64_t LAPACKE_zgghrd_work_64( int matrix_layout, char compq, char compz,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* q, int64_t ldq,
+                                lapack_complex_double* z, int64_t ldz );
+
+int64_t LAPACKE_sgghd3_work_64( int matrix_layout, char compq, char compz,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                float* a, int64_t lda,
+                                float* b, int64_t ldb,
+                                float* q, int64_t ldq,
+                                float* z, int64_t ldz,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dgghd3_work_64( int matrix_layout, char compq, char compz,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                double* a, int64_t lda,
+                                double* b, int64_t ldb,
+                                double* q, int64_t ldq,
+                                double* z, int64_t ldz,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_cgghd3_work_64( int matrix_layout, char compq, char compz,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* q, int64_t ldq,
+                                lapack_complex_float* z, int64_t ldz,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zgghd3_work_64( int matrix_layout, char compq, char compz,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* q, int64_t ldq,
+                                lapack_complex_double* z, int64_t ldz,
+                                lapack_complex_double* work,
+                                int64_t lwork );
+
+int64_t LAPACKE_sgglse_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t p, float* a, int64_t lda,
+                                float* b, int64_t ldb, float* c, float* d,
+                                float* x, float* work, int64_t lwork );
+int64_t LAPACKE_dgglse_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t p, double* a, int64_t lda,
+                                double* b, int64_t ldb, double* c, double* d,
+                                double* x, double* work, int64_t lwork );
+int64_t LAPACKE_cgglse_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t p, lapack_complex_float* a,
+                                int64_t lda, lapack_complex_float* b,
+                                int64_t ldb, lapack_complex_float* c,
+                                lapack_complex_float* d,
+                                lapack_complex_float* x,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zgglse_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t p, lapack_complex_double* a,
+                                int64_t lda, lapack_complex_double* b,
+                                int64_t ldb, lapack_complex_double* c,
+                                lapack_complex_double* d,
+                                lapack_complex_double* x,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sggqrf_work_64( int matrix_layout, int64_t n, int64_t m,
+                                int64_t p, float* a, int64_t lda,
+                                float* taua, float* b, int64_t ldb,
+                                float* taub, float* work, int64_t lwork );
+int64_t LAPACKE_dggqrf_work_64( int matrix_layout, int64_t n, int64_t m,
+                                int64_t p, double* a, int64_t lda,
+                                double* taua, double* b, int64_t ldb,
+                                double* taub, double* work, int64_t lwork );
+int64_t LAPACKE_cggqrf_work_64( int matrix_layout, int64_t n, int64_t m,
+                                int64_t p, lapack_complex_float* a,
+                                int64_t lda, lapack_complex_float* taua,
+                                lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* taub,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zggqrf_work_64( int matrix_layout, int64_t n, int64_t m,
+                                int64_t p, lapack_complex_double* a,
+                                int64_t lda, lapack_complex_double* taua,
+                                lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* taub,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sggrqf_work_64( int matrix_layout, int64_t m, int64_t p,
+                                int64_t n, float* a, int64_t lda,
+                                float* taua, float* b, int64_t ldb,
+                                float* taub, float* work, int64_t lwork );
+int64_t LAPACKE_dggrqf_work_64( int matrix_layout, int64_t m, int64_t p,
+                                int64_t n, double* a, int64_t lda,
+                                double* taua, double* b, int64_t ldb,
+                                double* taub, double* work, int64_t lwork );
+int64_t LAPACKE_cggrqf_work_64( int matrix_layout, int64_t m, int64_t p,
+                                int64_t n, lapack_complex_float* a,
+                                int64_t lda, lapack_complex_float* taua,
+                                lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* taub,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zggrqf_work_64( int matrix_layout, int64_t m, int64_t p,
+                                int64_t n, lapack_complex_double* a,
+                                int64_t lda, lapack_complex_double* taua,
+                                lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* taub,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sggsvd_work_64( int matrix_layout, char jobu, char jobv,
+                                char jobq, int64_t m, int64_t n,
+                                int64_t p, int64_t* k, int64_t* l,
+                                float* a, int64_t lda, float* b,
+                                int64_t ldb, float* alpha, float* beta,
+                                float* u, int64_t ldu, float* v,
+                                int64_t ldv, float* q, int64_t ldq,
+                                float* work, int64_t* iwork );
+int64_t LAPACKE_dggsvd_work_64( int matrix_layout, char jobu, char jobv,
+                                char jobq, int64_t m, int64_t n,
+                                int64_t p, int64_t* k, int64_t* l,
+                                double* a, int64_t lda, double* b,
+                                int64_t ldb, double* alpha, double* beta,
+                                double* u, int64_t ldu, double* v,
+                                int64_t ldv, double* q, int64_t ldq,
+                                double* work, int64_t* iwork );
+int64_t LAPACKE_cggsvd_work_64( int matrix_layout, char jobu, char jobv,
+                                char jobq, int64_t m, int64_t n,
+                                int64_t p, int64_t* k, int64_t* l,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* b, int64_t ldb,
+                                float* alpha, float* beta,
+                                lapack_complex_float* u, int64_t ldu,
+                                lapack_complex_float* v, int64_t ldv,
+                                lapack_complex_float* q, int64_t ldq,
+                                lapack_complex_float* work, float* rwork,
+                                int64_t* iwork );
+int64_t LAPACKE_zggsvd_work_64( int matrix_layout, char jobu, char jobv,
+                                char jobq, int64_t m, int64_t n,
+                                int64_t p, int64_t* k, int64_t* l,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* b, int64_t ldb,
+                                double* alpha, double* beta,
+                                lapack_complex_double* u, int64_t ldu,
+                                lapack_complex_double* v, int64_t ldv,
+                                lapack_complex_double* q, int64_t ldq,
+                                lapack_complex_double* work, double* rwork,
+                                int64_t* iwork );
+
+int64_t LAPACKE_sggsvd3_work_64( int matrix_layout, char jobu, char jobv,
+                                 char jobq, int64_t m, int64_t n,
+                                 int64_t p, int64_t* k, int64_t* l,
+                                 float* a, int64_t lda, float* b,
+                                 int64_t ldb, float* alpha, float* beta,
+                                 float* u, int64_t ldu, float* v,
+                                 int64_t ldv, float* q, int64_t ldq,
+                                 float* work, int64_t lwork,
+                                 int64_t* iwork );
+int64_t LAPACKE_dggsvd3_work_64( int matrix_layout, char jobu, char jobv,
+                                 char jobq, int64_t m, int64_t n,
+                                 int64_t p, int64_t* k, int64_t* l,
+                                 double* a, int64_t lda, double* b,
+                                 int64_t ldb, double* alpha, double* beta,
+                                 double* u, int64_t ldu, double* v,
+                                 int64_t ldv, double* q, int64_t ldq,
+                                 double* work, int64_t lwork,
+                                 int64_t* iwork );
+int64_t LAPACKE_cggsvd3_work_64( int matrix_layout, char jobu, char jobv,
+                                 char jobq, int64_t m, int64_t n,
+                                 int64_t p, int64_t* k, int64_t* l,
+                                 lapack_complex_float* a, int64_t lda,
+                                 lapack_complex_float* b, int64_t ldb,
+                                 float* alpha, float* beta,
+                                 lapack_complex_float* u, int64_t ldu,
+                                 lapack_complex_float* v, int64_t ldv,
+                                 lapack_complex_float* q, int64_t ldq,
+                                 lapack_complex_float* work, int64_t lwork,
+                                 float* rwork, int64_t* iwork );
+int64_t LAPACKE_zggsvd3_work_64( int matrix_layout, char jobu, char jobv,
+                                 char jobq, int64_t m, int64_t n,
+                                 int64_t p, int64_t* k, int64_t* l,
+                                 lapack_complex_double* a, int64_t lda,
+                                 lapack_complex_double* b, int64_t ldb,
+                                 double* alpha, double* beta,
+                                 lapack_complex_double* u, int64_t ldu,
+                                 lapack_complex_double* v, int64_t ldv,
+                                 lapack_complex_double* q, int64_t ldq,
+                                 lapack_complex_double* work, int64_t lwork,
+                                 double* rwork, int64_t* iwork );
+
+int64_t LAPACKE_sggsvp_work_64( int matrix_layout, char jobu, char jobv,
+                                char jobq, int64_t m, int64_t p,
+                                int64_t n, float* a, int64_t lda,
+                                float* b, int64_t ldb, float tola,
+                                float tolb, int64_t* k, int64_t* l,
+                                float* u, int64_t ldu, float* v,
+                                int64_t ldv, float* q, int64_t ldq,
+                                int64_t* iwork, float* tau, float* work );
+int64_t LAPACKE_dggsvp_work_64( int matrix_layout, char jobu, char jobv,
+                                char jobq, int64_t m, int64_t p,
+                                int64_t n, double* a, int64_t lda,
+                                double* b, int64_t ldb, double tola,
+                                double tolb, int64_t* k, int64_t* l,
+                                double* u, int64_t ldu, double* v,
+                                int64_t ldv, double* q, int64_t ldq,
+                                int64_t* iwork, double* tau, double* work );
+int64_t LAPACKE_cggsvp_work_64( int matrix_layout, char jobu, char jobv,
+                                char jobq, int64_t m, int64_t p,
+                                int64_t n, lapack_complex_float* a,
+                                int64_t lda, lapack_complex_float* b,
+                                int64_t ldb, float tola, float tolb,
+                                int64_t* k, int64_t* l,
+                                lapack_complex_float* u, int64_t ldu,
+                                lapack_complex_float* v, int64_t ldv,
+                                lapack_complex_float* q, int64_t ldq,
+                                int64_t* iwork, float* rwork,
+                                lapack_complex_float* tau,
+                                lapack_complex_float* work );
+int64_t LAPACKE_zggsvp_work_64( int matrix_layout, char jobu, char jobv,
+                                char jobq, int64_t m, int64_t p,
+                                int64_t n, lapack_complex_double* a,
+                                int64_t lda, lapack_complex_double* b,
+                                int64_t ldb, double tola, double tolb,
+                                int64_t* k, int64_t* l,
+                                lapack_complex_double* u, int64_t ldu,
+                                lapack_complex_double* v, int64_t ldv,
+                                lapack_complex_double* q, int64_t ldq,
+                                int64_t* iwork, double* rwork,
+                                lapack_complex_double* tau,
+                                lapack_complex_double* work );
+
+int64_t LAPACKE_sggsvp3_work_64( int matrix_layout, char jobu, char jobv,
+                                 char jobq, int64_t m, int64_t p,
+                                 int64_t n, float* a, int64_t lda,
+                                 float* b, int64_t ldb, float tola,
+                                 float tolb, int64_t* k, int64_t* l,
+                                 float* u, int64_t ldu, float* v,
+                                 int64_t ldv, float* q, int64_t ldq,
+                                 int64_t* iwork, float* tau,
+                                 float* work, int64_t lwork );
+int64_t LAPACKE_dggsvp3_work_64( int matrix_layout, char jobu, char jobv,
+                                 char jobq, int64_t m, int64_t p,
+                                 int64_t n, double* a, int64_t lda,
+                                 double* b, int64_t ldb, double tola,
+                                 double tolb, int64_t* k, int64_t* l,
+                                 double* u, int64_t ldu, double* v,
+                                 int64_t ldv, double* q, int64_t ldq,
+                                 int64_t* iwork, double* tau, double* work,
+                                 int64_t lwork );
+int64_t LAPACKE_cggsvp3_work_64( int matrix_layout, char jobu, char jobv,
+                                 char jobq, int64_t m, int64_t p,
+                                 int64_t n, lapack_complex_float* a,
+                                 int64_t lda, lapack_complex_float* b,
+                                 int64_t ldb, float tola, float tolb,
+                                 int64_t* k, int64_t* l,
+                                 lapack_complex_float* u, int64_t ldu,
+                                 lapack_complex_float* v, int64_t ldv,
+                                 lapack_complex_float* q, int64_t ldq,
+                                 int64_t* iwork, float* rwork,
+                                 lapack_complex_float* tau,
+                                 lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zggsvp3_work_64( int matrix_layout, char jobu, char jobv,
+                                 char jobq, int64_t m, int64_t p,
+                                 int64_t n, lapack_complex_double* a,
+                                 int64_t lda, lapack_complex_double* b,
+                                 int64_t ldb, double tola, double tolb,
+                                 int64_t* k, int64_t* l,
+                                 lapack_complex_double* u, int64_t ldu,
+                                 lapack_complex_double* v, int64_t ldv,
+                                 lapack_complex_double* q, int64_t ldq,
+                                 int64_t* iwork, double* rwork,
+                                 lapack_complex_double* tau,
+                                 lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sgtcon_work_64( char norm, int64_t n, const float* dl,
+                                const float* d, const float* du,
+                                const float* du2, const int64_t* ipiv,
+                                float anorm, float* rcond, float* work,
+                                int64_t* iwork );
+int64_t LAPACKE_dgtcon_work_64( char norm, int64_t n, const double* dl,
+                                const double* d, const double* du,
+                                const double* du2, const int64_t* ipiv,
+                                double anorm, double* rcond, double* work,
+                                int64_t* iwork );
+int64_t LAPACKE_cgtcon_work_64( char norm, int64_t n,
+                                const lapack_complex_float* dl,
+                                const lapack_complex_float* d,
+                                const lapack_complex_float* du,
+                                const lapack_complex_float* du2,
+                                const int64_t* ipiv, float anorm,
+                                float* rcond, lapack_complex_float* work );
+int64_t LAPACKE_zgtcon_work_64( char norm, int64_t n,
+                                const lapack_complex_double* dl,
+                                const lapack_complex_double* d,
+                                const lapack_complex_double* du,
+                                const lapack_complex_double* du2,
+                                const int64_t* ipiv, double anorm,
+                                double* rcond, lapack_complex_double* work );
+
+int64_t LAPACKE_sgtrfs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t nrhs, const float* dl,
+                                const float* d, const float* du,
+                                const float* dlf, const float* df,
+                                const float* duf, const float* du2,
+                                const int64_t* ipiv, const float* b,
+                                int64_t ldb, float* x, int64_t ldx,
+                                float* ferr, float* berr, float* work,
+                                int64_t* iwork );
+int64_t LAPACKE_dgtrfs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t nrhs, const double* dl,
+                                const double* d, const double* du,
+                                const double* dlf, const double* df,
+                                const double* duf, const double* du2,
+                                const int64_t* ipiv, const double* b,
+                                int64_t ldb, double* x, int64_t ldx,
+                                double* ferr, double* berr, double* work,
+                                int64_t* iwork );
+int64_t LAPACKE_cgtrfs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* dl,
+                                const lapack_complex_float* d,
+                                const lapack_complex_float* du,
+                                const lapack_complex_float* dlf,
+                                const lapack_complex_float* df,
+                                const lapack_complex_float* duf,
+                                const lapack_complex_float* du2,
+                                const int64_t* ipiv,
+                                const lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* x, int64_t ldx,
+                                float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zgtrfs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t nrhs,
+                                const lapack_complex_double* dl,
+                                const lapack_complex_double* d,
+                                const lapack_complex_double* du,
+                                const lapack_complex_double* dlf,
+                                const lapack_complex_double* df,
+                                const lapack_complex_double* duf,
+                                const lapack_complex_double* du2,
+                                const int64_t* ipiv,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_sgtsv_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                               float* dl, float* d, float* du, float* b,
+                               int64_t ldb );
+int64_t LAPACKE_dgtsv_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                               double* dl, double* d, double* du, double* b,
+                               int64_t ldb );
+int64_t LAPACKE_cgtsv_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                               lapack_complex_float* dl,
+                               lapack_complex_float* d,
+                               lapack_complex_float* du,
+                               lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zgtsv_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                               lapack_complex_double* dl,
+                               lapack_complex_double* d,
+                               lapack_complex_double* du,
+                               lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_sgtsvx_work_64( int matrix_layout, char fact, char trans,
+                                int64_t n, int64_t nrhs, const float* dl,
+                                const float* d, const float* du, float* dlf,
+                                float* df, float* duf, float* du2,
+                                int64_t* ipiv, const float* b,
+                                int64_t ldb, float* x, int64_t ldx,
+                                float* rcond, float* ferr, float* berr,
+                                float* work, int64_t* iwork );
+int64_t LAPACKE_dgtsvx_work_64( int matrix_layout, char fact, char trans,
+                                int64_t n, int64_t nrhs, const double* dl,
+                                const double* d, const double* du, double* dlf,
+                                double* df, double* duf, double* du2,
+                                int64_t* ipiv, const double* b,
+                                int64_t ldb, double* x, int64_t ldx,
+                                double* rcond, double* ferr, double* berr,
+                                double* work, int64_t* iwork );
+int64_t LAPACKE_cgtsvx_work_64( int matrix_layout, char fact, char trans,
+                                int64_t n, int64_t nrhs,
+                                const lapack_complex_float* dl,
+                                const lapack_complex_float* d,
+                                const lapack_complex_float* du,
+                                lapack_complex_float* dlf,
+                                lapack_complex_float* df,
+                                lapack_complex_float* duf,
+                                lapack_complex_float* du2, int64_t* ipiv,
+                                const lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* x, int64_t ldx,
+                                float* rcond, float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zgtsvx_work_64( int matrix_layout, char fact, char trans,
+                                int64_t n, int64_t nrhs,
+                                const lapack_complex_double* dl,
+                                const lapack_complex_double* d,
+                                const lapack_complex_double* du,
+                                lapack_complex_double* dlf,
+                                lapack_complex_double* df,
+                                lapack_complex_double* duf,
+                                lapack_complex_double* du2, int64_t* ipiv,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* rcond, double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_sgttrf_work_64( int64_t n, float* dl, float* d, float* du,
+                                float* du2, int64_t* ipiv );
+int64_t LAPACKE_dgttrf_work_64( int64_t n, double* dl, double* d, double* du,
+                                double* du2, int64_t* ipiv );
+int64_t LAPACKE_cgttrf_work_64( int64_t n, lapack_complex_float* dl,
+                                lapack_complex_float* d,
+                                lapack_complex_float* du,
+                                lapack_complex_float* du2, int64_t* ipiv );
+int64_t LAPACKE_zgttrf_work_64( int64_t n, lapack_complex_double* dl,
+                                lapack_complex_double* d,
+                                lapack_complex_double* du,
+                                lapack_complex_double* du2, int64_t* ipiv );
+
+int64_t LAPACKE_sgttrs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t nrhs, const float* dl,
+                                const float* d, const float* du,
+                                const float* du2, const int64_t* ipiv,
+                                float* b, int64_t ldb );
+int64_t LAPACKE_dgttrs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t nrhs, const double* dl,
+                                const double* d, const double* du,
+                                const double* du2, const int64_t* ipiv,
+                                double* b, int64_t ldb );
+int64_t LAPACKE_cgttrs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* dl,
+                                const lapack_complex_float* d,
+                                const lapack_complex_float* du,
+                                const lapack_complex_float* du2,
+                                const int64_t* ipiv, lapack_complex_float* b,
+                                int64_t ldb );
+int64_t LAPACKE_zgttrs_work_64( int matrix_layout, char trans, int64_t n,
+                                int64_t nrhs,
+                                const lapack_complex_double* dl,
+                                const lapack_complex_double* d,
+                                const lapack_complex_double* du,
+                                const lapack_complex_double* du2,
+                                const int64_t* ipiv,
+                                lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_chbev_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, int64_t kd,
+                               lapack_complex_float* ab, int64_t ldab,
+                               float* w, lapack_complex_float* z,
+                               int64_t ldz, lapack_complex_float* work,
+                               float* rwork );
+int64_t LAPACKE_zhbev_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, int64_t kd,
+                               lapack_complex_double* ab, int64_t ldab,
+                               double* w, lapack_complex_double* z,
+                               int64_t ldz, lapack_complex_double* work,
+                               double* rwork );
+
+int64_t LAPACKE_chbevd_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, int64_t kd,
+                                lapack_complex_float* ab, int64_t ldab,
+                                float* w, lapack_complex_float* z,
+                                int64_t ldz, lapack_complex_float* work,
+                                int64_t lwork, float* rwork,
+                                int64_t lrwork, int64_t* iwork,
+                                int64_t liwork );
+int64_t LAPACKE_zhbevd_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, int64_t kd,
+                                lapack_complex_double* ab, int64_t ldab,
+                                double* w, lapack_complex_double* z,
+                                int64_t ldz, lapack_complex_double* work,
+                                int64_t lwork, double* rwork,
+                                int64_t lrwork, int64_t* iwork,
+                                int64_t liwork );
+
+int64_t LAPACKE_chbevx_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, int64_t kd,
+                                lapack_complex_float* ab, int64_t ldab,
+                                lapack_complex_float* q, int64_t ldq,
+                                float vl, float vu, int64_t il,
+                                int64_t iu, float abstol, int64_t* m,
+                                float* w, lapack_complex_float* z,
+                                int64_t ldz, lapack_complex_float* work,
+                                float* rwork, int64_t* iwork,
+                                int64_t* ifail );
+int64_t LAPACKE_zhbevx_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, int64_t kd,
+                                lapack_complex_double* ab, int64_t ldab,
+                                lapack_complex_double* q, int64_t ldq,
+                                double vl, double vu, int64_t il,
+                                int64_t iu, double abstol, int64_t* m,
+                                double* w, lapack_complex_double* z,
+                                int64_t ldz, lapack_complex_double* work,
+                                double* rwork, int64_t* iwork,
+                                int64_t* ifail );
+
+int64_t LAPACKE_chbgst_work_64( int matrix_layout, char vect, char uplo,
+                                int64_t n, int64_t ka, int64_t kb,
+                                lapack_complex_float* ab, int64_t ldab,
+                                const lapack_complex_float* bb, int64_t ldbb,
+                                lapack_complex_float* x, int64_t ldx,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zhbgst_work_64( int matrix_layout, char vect, char uplo,
+                                int64_t n, int64_t ka, int64_t kb,
+                                lapack_complex_double* ab, int64_t ldab,
+                                const lapack_complex_double* bb,
+                                int64_t ldbb, lapack_complex_double* x,
+                                int64_t ldx, lapack_complex_double* work,
+                                double* rwork );
+
+int64_t LAPACKE_chbgv_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, int64_t ka, int64_t kb,
+                               lapack_complex_float* ab, int64_t ldab,
+                               lapack_complex_float* bb, int64_t ldbb,
+                               float* w, lapack_complex_float* z,
+                               int64_t ldz, lapack_complex_float* work,
+                               float* rwork );
+int64_t LAPACKE_zhbgv_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, int64_t ka, int64_t kb,
+                               lapack_complex_double* ab, int64_t ldab,
+                               lapack_complex_double* bb, int64_t ldbb,
+                               double* w, lapack_complex_double* z,
+                               int64_t ldz, lapack_complex_double* work,
+                               double* rwork );
+
+int64_t LAPACKE_chbgvd_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, int64_t ka, int64_t kb,
+                                lapack_complex_float* ab, int64_t ldab,
+                                lapack_complex_float* bb, int64_t ldbb,
+                                float* w, lapack_complex_float* z,
+                                int64_t ldz, lapack_complex_float* work,
+                                int64_t lwork, float* rwork,
+                                int64_t lrwork, int64_t* iwork,
+                                int64_t liwork );
+int64_t LAPACKE_zhbgvd_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, int64_t ka, int64_t kb,
+                                lapack_complex_double* ab, int64_t ldab,
+                                lapack_complex_double* bb, int64_t ldbb,
+                                double* w, lapack_complex_double* z,
+                                int64_t ldz, lapack_complex_double* work,
+                                int64_t lwork, double* rwork,
+                                int64_t lrwork, int64_t* iwork,
+                                int64_t liwork );
+
+int64_t LAPACKE_chbgvx_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, int64_t ka,
+                                int64_t kb, lapack_complex_float* ab,
+                                int64_t ldab, lapack_complex_float* bb,
+                                int64_t ldbb, lapack_complex_float* q,
+                                int64_t ldq, float vl, float vu,
+                                int64_t il, int64_t iu, float abstol,
+                                int64_t* m, float* w,
+                                lapack_complex_float* z, int64_t ldz,
+                                lapack_complex_float* work, float* rwork,
+                                int64_t* iwork, int64_t* ifail );
+int64_t LAPACKE_zhbgvx_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, int64_t ka,
+                                int64_t kb, lapack_complex_double* ab,
+                                int64_t ldab, lapack_complex_double* bb,
+                                int64_t ldbb, lapack_complex_double* q,
+                                int64_t ldq, double vl, double vu,
+                                int64_t il, int64_t iu, double abstol,
+                                int64_t* m, double* w,
+                                lapack_complex_double* z, int64_t ldz,
+                                lapack_complex_double* work, double* rwork,
+                                int64_t* iwork, int64_t* ifail );
+
+int64_t LAPACKE_chbtrd_work_64( int matrix_layout, char vect, char uplo,
+                                int64_t n, int64_t kd,
+                                lapack_complex_float* ab, int64_t ldab,
+                                float* d, float* e, lapack_complex_float* q,
+                                int64_t ldq, lapack_complex_float* work );
+int64_t LAPACKE_zhbtrd_work_64( int matrix_layout, char vect, char uplo,
+                                int64_t n, int64_t kd,
+                                lapack_complex_double* ab, int64_t ldab,
+                                double* d, double* e, lapack_complex_double* q,
+                                int64_t ldq, lapack_complex_double* work );
+
+int64_t LAPACKE_checon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_float* a, int64_t lda,
+                                const int64_t* ipiv, float anorm,
+                                float* rcond, lapack_complex_float* work );
+int64_t LAPACKE_zhecon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_double* a, int64_t lda,
+                                const int64_t* ipiv, double anorm,
+                                double* rcond, lapack_complex_double* work );
+
+int64_t LAPACKE_cheequb_work_64( int matrix_layout, char uplo, int64_t n,
+                                 const lapack_complex_float* a, int64_t lda,
+                                 float* s, float* scond, float* amax,
+                                 lapack_complex_float* work );
+int64_t LAPACKE_zheequb_work_64( int matrix_layout, char uplo, int64_t n,
+                                 const lapack_complex_double* a, int64_t lda,
+                                 double* s, double* scond, double* amax,
+                                 lapack_complex_double* work );
+
+int64_t LAPACKE_cheev_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, lapack_complex_float* a,
+                               int64_t lda, float* w,
+                               lapack_complex_float* work, int64_t lwork,
+                               float* rwork );
+int64_t LAPACKE_zheev_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, lapack_complex_double* a,
+                               int64_t lda, double* w,
+                               lapack_complex_double* work, int64_t lwork,
+                               double* rwork );
+
+int64_t LAPACKE_cheevd_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, lapack_complex_float* a,
+                                int64_t lda, float* w,
+                                lapack_complex_float* work, int64_t lwork,
+                                float* rwork, int64_t lrwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_zheevd_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, lapack_complex_double* a,
+                                int64_t lda, double* w,
+                                lapack_complex_double* work, int64_t lwork,
+                                double* rwork, int64_t lrwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_cheevr_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                float vl, float vu, int64_t il,
+                                int64_t iu, float abstol, int64_t* m,
+                                float* w, lapack_complex_float* z,
+                                int64_t ldz, int64_t* isuppz,
+                                lapack_complex_float* work, int64_t lwork,
+                                float* rwork, int64_t lrwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_zheevr_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                double vl, double vu, int64_t il,
+                                int64_t iu, double abstol, int64_t* m,
+                                double* w, lapack_complex_double* z,
+                                int64_t ldz, int64_t* isuppz,
+                                lapack_complex_double* work, int64_t lwork,
+                                double* rwork, int64_t lrwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_cheevx_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                float vl, float vu, int64_t il,
+                                int64_t iu, float abstol, int64_t* m,
+                                float* w, lapack_complex_float* z,
+                                int64_t ldz, lapack_complex_float* work,
+                                int64_t lwork, float* rwork,
+                                int64_t* iwork, int64_t* ifail );
+int64_t LAPACKE_zheevx_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                double vl, double vu, int64_t il,
+                                int64_t iu, double abstol, int64_t* m,
+                                double* w, lapack_complex_double* z,
+                                int64_t ldz, lapack_complex_double* work,
+                                int64_t lwork, double* rwork,
+                                int64_t* iwork, int64_t* ifail );
+
+int64_t LAPACKE_chegst_work_64( int matrix_layout, int64_t itype, char uplo,
+                                int64_t n, lapack_complex_float* a,
+                                int64_t lda, const lapack_complex_float* b,
+                                int64_t ldb );
+int64_t LAPACKE_zhegst_work_64( int matrix_layout, int64_t itype, char uplo,
+                                int64_t n, lapack_complex_double* a,
+                                int64_t lda, const lapack_complex_double* b,
+                                int64_t ldb );
+
+int64_t LAPACKE_chegv_work_64( int matrix_layout, int64_t itype, char jobz,
+                               char uplo, int64_t n, lapack_complex_float* a,
+                               int64_t lda, lapack_complex_float* b,
+                               int64_t ldb, float* w,
+                               lapack_complex_float* work, int64_t lwork,
+                               float* rwork );
+int64_t LAPACKE_zhegv_work_64( int matrix_layout, int64_t itype, char jobz,
+                               char uplo, int64_t n,
+                               lapack_complex_double* a, int64_t lda,
+                               lapack_complex_double* b, int64_t ldb,
+                               double* w, lapack_complex_double* work,
+                               int64_t lwork, double* rwork );
+
+int64_t LAPACKE_chegvd_work_64( int matrix_layout, int64_t itype, char jobz,
+                                char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* b, int64_t ldb,
+                                float* w, lapack_complex_float* work,
+                                int64_t lwork, float* rwork,
+                                int64_t lrwork, int64_t* iwork,
+                                int64_t liwork );
+int64_t LAPACKE_zhegvd_work_64( int matrix_layout, int64_t itype, char jobz,
+                                char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* b, int64_t ldb,
+                                double* w, lapack_complex_double* work,
+                                int64_t lwork, double* rwork,
+                                int64_t lrwork, int64_t* iwork,
+                                int64_t liwork );
+
+int64_t LAPACKE_chegvx_work_64( int matrix_layout, int64_t itype, char jobz,
+                                char range, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* b, int64_t ldb,
+                                float vl, float vu, int64_t il,
+                                int64_t iu, float abstol, int64_t* m,
+                                float* w, lapack_complex_float* z,
+                                int64_t ldz, lapack_complex_float* work,
+                                int64_t lwork, float* rwork,
+                                int64_t* iwork, int64_t* ifail );
+int64_t LAPACKE_zhegvx_work_64( int matrix_layout, int64_t itype, char jobz,
+                                char range, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* b, int64_t ldb,
+                                double vl, double vu, int64_t il,
+                                int64_t iu, double abstol, int64_t* m,
+                                double* w, lapack_complex_double* z,
+                                int64_t ldz, lapack_complex_double* work,
+                                int64_t lwork, double* rwork,
+                                int64_t* iwork, int64_t* ifail );
+
+int64_t LAPACKE_cherfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* a,
+                                int64_t lda, const lapack_complex_float* af,
+                                int64_t ldaf, const int64_t* ipiv,
+                                const lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* x, int64_t ldx,
+                                float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zherfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_double* a,
+                                int64_t lda, const lapack_complex_double* af,
+                                int64_t ldaf, const int64_t* ipiv,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_cherfsx_work_64( int matrix_layout, char uplo, char equed,
+                                 int64_t n, int64_t nrhs,
+                                 const lapack_complex_float* a, int64_t lda,
+                                 const lapack_complex_float* af,
+                                 int64_t ldaf, const int64_t* ipiv,
+                                 const float* s, const lapack_complex_float* b,
+                                 int64_t ldb, lapack_complex_float* x,
+                                 int64_t ldx, float* rcond, float* berr,
+                                 int64_t n_err_bnds, float* err_bnds_norm,
+                                 float* err_bnds_comp, int64_t nparams,
+                                 float* params, lapack_complex_float* work,
+                                 float* rwork );
+int64_t LAPACKE_zherfsx_work_64( int matrix_layout, char uplo, char equed,
+                                 int64_t n, int64_t nrhs,
+                                 const lapack_complex_double* a, int64_t lda,
+                                 const lapack_complex_double* af,
+                                 int64_t ldaf, const int64_t* ipiv,
+                                 const double* s,
+                                 const lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* x, int64_t ldx,
+                                 double* rcond, double* berr,
+                                 int64_t n_err_bnds, double* err_bnds_norm,
+                                 double* err_bnds_comp, int64_t nparams,
+                                 double* params, lapack_complex_double* work,
+                                 double* rwork );
+
+int64_t LAPACKE_chesv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_float* a,
+                               int64_t lda, int64_t* ipiv,
+                               lapack_complex_float* b, int64_t ldb,
+                               lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zhesv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_double* a,
+                               int64_t lda, int64_t* ipiv,
+                               lapack_complex_double* b, int64_t ldb,
+                               lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_chesvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs,
+                                const lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* af, int64_t ldaf,
+                                int64_t* ipiv, const lapack_complex_float* b,
+                                int64_t ldb, lapack_complex_float* x,
+                                int64_t ldx, float* rcond, float* ferr,
+                                float* berr, lapack_complex_float* work,
+                                int64_t lwork, float* rwork );
+int64_t LAPACKE_zhesvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs,
+                                const lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* af, int64_t ldaf,
+                                int64_t* ipiv,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* rcond, double* ferr, double* berr,
+                                lapack_complex_double* work, int64_t lwork,
+                                double* rwork );
+
+int64_t LAPACKE_chesvxx_work_64( int matrix_layout, char fact, char uplo,
+                                 int64_t n, int64_t nrhs,
+                                 lapack_complex_float* a, int64_t lda,
+                                 lapack_complex_float* af, int64_t ldaf,
+                                 int64_t* ipiv, char* equed, float* s,
+                                 lapack_complex_float* b, int64_t ldb,
+                                 lapack_complex_float* x, int64_t ldx,
+                                 float* rcond, float* rpvgrw, float* berr,
+                                 int64_t n_err_bnds, float* err_bnds_norm,
+                                 float* err_bnds_comp, int64_t nparams,
+                                 float* params, lapack_complex_float* work,
+                                 float* rwork );
+int64_t LAPACKE_zhesvxx_work_64( int matrix_layout, char fact, char uplo,
+                                 int64_t n, int64_t nrhs,
+                                 lapack_complex_double* a, int64_t lda,
+                                 lapack_complex_double* af, int64_t ldaf,
+                                 int64_t* ipiv, char* equed, double* s,
+                                 lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* x, int64_t ldx,
+                                 double* rcond, double* rpvgrw, double* berr,
+                                 int64_t n_err_bnds, double* err_bnds_norm,
+                                 double* err_bnds_comp, int64_t nparams,
+                                 double* params, lapack_complex_double* work,
+                                 double* rwork );
+
+int64_t LAPACKE_chetrd_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                float* d, float* e, lapack_complex_float* tau,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zhetrd_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                double* d, double* e,
+                                lapack_complex_double* tau,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_chetrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                int64_t* ipiv, lapack_complex_float* work,
+                                int64_t lwork );
+int64_t LAPACKE_zhetrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                int64_t* ipiv, lapack_complex_double* work,
+                                int64_t lwork );
+
+int64_t LAPACKE_chetri_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                const int64_t* ipiv,
+                                lapack_complex_float* work );
+int64_t LAPACKE_zhetri_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                const int64_t* ipiv,
+                                lapack_complex_double* work );
+
+int64_t LAPACKE_chetrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* a,
+                                int64_t lda, const int64_t* ipiv,
+                                lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zhetrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_double* a,
+                                int64_t lda, const int64_t* ipiv,
+                                lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_chfrk_work_64( int matrix_layout, char transr, char uplo,
+                               char trans, int64_t n, int64_t k,
+                               float alpha, const lapack_complex_float* a,
+                               int64_t lda, float beta,
+                               lapack_complex_float* c );
+int64_t LAPACKE_zhfrk_work_64( int matrix_layout, char transr, char uplo,
+                               char trans, int64_t n, int64_t k,
+                               double alpha, const lapack_complex_double* a,
+                               int64_t lda, double beta,
+                               lapack_complex_double* c );
+
+int64_t LAPACKE_shgeqz_work_64( int matrix_layout, char job, char compq,
+                                char compz, int64_t n, int64_t ilo,
+                                int64_t ihi, float* h, int64_t ldh,
+                                float* t, int64_t ldt, float* alphar,
+                                float* alphai, float* beta, float* q,
+                                int64_t ldq, float* z, int64_t ldz,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dhgeqz_work_64( int matrix_layout, char job, char compq,
+                                char compz, int64_t n, int64_t ilo,
+                                int64_t ihi, double* h, int64_t ldh,
+                                double* t, int64_t ldt, double* alphar,
+                                double* alphai, double* beta, double* q,
+                                int64_t ldq, double* z, int64_t ldz,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_chgeqz_work_64( int matrix_layout, char job, char compq,
+                                char compz, int64_t n, int64_t ilo,
+                                int64_t ihi, lapack_complex_float* h,
+                                int64_t ldh, lapack_complex_float* t,
+                                int64_t ldt, lapack_complex_float* alpha,
+                                lapack_complex_float* beta,
+                                lapack_complex_float* q, int64_t ldq,
+                                lapack_complex_float* z, int64_t ldz,
+                                lapack_complex_float* work, int64_t lwork,
+                                float* rwork );
+int64_t LAPACKE_zhgeqz_work_64( int matrix_layout, char job, char compq,
+                                char compz, int64_t n, int64_t ilo,
+                                int64_t ihi, lapack_complex_double* h,
+                                int64_t ldh, lapack_complex_double* t,
+                                int64_t ldt, lapack_complex_double* alpha,
+                                lapack_complex_double* beta,
+                                lapack_complex_double* q, int64_t ldq,
+                                lapack_complex_double* z, int64_t ldz,
+                                lapack_complex_double* work, int64_t lwork,
+                                double* rwork );
+
+int64_t LAPACKE_chpcon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_float* ap,
+                                const int64_t* ipiv, float anorm,
+                                float* rcond, lapack_complex_float* work );
+int64_t LAPACKE_zhpcon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_double* ap,
+                                const int64_t* ipiv, double anorm,
+                                double* rcond, lapack_complex_double* work );
+
+int64_t LAPACKE_chpev_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, lapack_complex_float* ap, float* w,
+                               lapack_complex_float* z, int64_t ldz,
+                               lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zhpev_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, lapack_complex_double* ap,
+                               double* w, lapack_complex_double* z,
+                               int64_t ldz, lapack_complex_double* work,
+                               double* rwork );
+
+int64_t LAPACKE_chpevd_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, lapack_complex_float* ap,
+                                float* w, lapack_complex_float* z,
+                                int64_t ldz, lapack_complex_float* work,
+                                int64_t lwork, float* rwork,
+                                int64_t lrwork, int64_t* iwork,
+                                int64_t liwork );
+int64_t LAPACKE_zhpevd_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, lapack_complex_double* ap,
+                                double* w, lapack_complex_double* z,
+                                int64_t ldz, lapack_complex_double* work,
+                                int64_t lwork, double* rwork,
+                                int64_t lrwork, int64_t* iwork,
+                                int64_t liwork );
+
+int64_t LAPACKE_chpevx_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n,
+                                lapack_complex_float* ap, float vl, float vu,
+                                int64_t il, int64_t iu, float abstol,
+                                int64_t* m, float* w,
+                                lapack_complex_float* z, int64_t ldz,
+                                lapack_complex_float* work, float* rwork,
+                                int64_t* iwork, int64_t* ifail );
+int64_t LAPACKE_zhpevx_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n,
+                                lapack_complex_double* ap, double vl, double vu,
+                                int64_t il, int64_t iu, double abstol,
+                                int64_t* m, double* w,
+                                lapack_complex_double* z, int64_t ldz,
+                                lapack_complex_double* work, double* rwork,
+                                int64_t* iwork, int64_t* ifail );
+
+int64_t LAPACKE_chpgst_work_64( int matrix_layout, int64_t itype, char uplo,
+                                int64_t n, lapack_complex_float* ap,
+                                const lapack_complex_float* bp );
+int64_t LAPACKE_zhpgst_work_64( int matrix_layout, int64_t itype, char uplo,
+                                int64_t n, lapack_complex_double* ap,
+                                const lapack_complex_double* bp );
+
+int64_t LAPACKE_chpgv_work_64( int matrix_layout, int64_t itype, char jobz,
+                               char uplo, int64_t n,
+                               lapack_complex_float* ap,
+                               lapack_complex_float* bp, float* w,
+                               lapack_complex_float* z, int64_t ldz,
+                               lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zhpgv_work_64( int matrix_layout, int64_t itype, char jobz,
+                               char uplo, int64_t n,
+                               lapack_complex_double* ap,
+                               lapack_complex_double* bp, double* w,
+                               lapack_complex_double* z, int64_t ldz,
+                               lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_chpgvd_work_64( int matrix_layout, int64_t itype, char jobz,
+                                char uplo, int64_t n,
+                                lapack_complex_float* ap,
+                                lapack_complex_float* bp, float* w,
+                                lapack_complex_float* z, int64_t ldz,
+                                lapack_complex_float* work, int64_t lwork,
+                                float* rwork, int64_t lrwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_zhpgvd_work_64( int matrix_layout, int64_t itype, char jobz,
+                                char uplo, int64_t n,
+                                lapack_complex_double* ap,
+                                lapack_complex_double* bp, double* w,
+                                lapack_complex_double* z, int64_t ldz,
+                                lapack_complex_double* work, int64_t lwork,
+                                double* rwork, int64_t lrwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_chpgvx_work_64( int matrix_layout, int64_t itype, char jobz,
+                                char range, char uplo, int64_t n,
+                                lapack_complex_float* ap,
+                                lapack_complex_float* bp, float vl, float vu,
+                                int64_t il, int64_t iu, float abstol,
+                                int64_t* m, float* w,
+                                lapack_complex_float* z, int64_t ldz,
+                                lapack_complex_float* work, float* rwork,
+                                int64_t* iwork, int64_t* ifail );
+int64_t LAPACKE_zhpgvx_work_64( int matrix_layout, int64_t itype, char jobz,
+                                char range, char uplo, int64_t n,
+                                lapack_complex_double* ap,
+                                lapack_complex_double* bp, double vl, double vu,
+                                int64_t il, int64_t iu, double abstol,
+                                int64_t* m, double* w,
+                                lapack_complex_double* z, int64_t ldz,
+                                lapack_complex_double* work, double* rwork,
+                                int64_t* iwork, int64_t* ifail );
+
+int64_t LAPACKE_chprfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* ap,
+                                const lapack_complex_float* afp,
+                                const int64_t* ipiv,
+                                const lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* x, int64_t ldx,
+                                float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zhprfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs,
+                                const lapack_complex_double* ap,
+                                const lapack_complex_double* afp,
+                                const int64_t* ipiv,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_chpsv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_float* ap,
+                               int64_t* ipiv, lapack_complex_float* b,
+                               int64_t ldb );
+int64_t LAPACKE_zhpsv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_double* ap,
+                               int64_t* ipiv, lapack_complex_double* b,
+                               int64_t ldb );
+
+int64_t LAPACKE_chpsvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs,
+                                const lapack_complex_float* ap,
+                                lapack_complex_float* afp, int64_t* ipiv,
+                                const lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* x, int64_t ldx,
+                                float* rcond, float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zhpsvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs,
+                                const lapack_complex_double* ap,
+                                lapack_complex_double* afp, int64_t* ipiv,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* rcond, double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_chptrd_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* ap, float* d, float* e,
+                                lapack_complex_float* tau );
+int64_t LAPACKE_zhptrd_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* ap, double* d, double* e,
+                                lapack_complex_double* tau );
+
+int64_t LAPACKE_chptrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* ap, int64_t* ipiv );
+int64_t LAPACKE_zhptrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* ap, int64_t* ipiv );
+
+int64_t LAPACKE_chptri_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* ap,
+                                const int64_t* ipiv,
+                                lapack_complex_float* work );
+int64_t LAPACKE_zhptri_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* ap,
+                                const int64_t* ipiv,
+                                lapack_complex_double* work );
+
+int64_t LAPACKE_chptrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* ap,
+                                const int64_t* ipiv, lapack_complex_float* b,
+                                int64_t ldb );
+int64_t LAPACKE_zhptrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs,
+                                const lapack_complex_double* ap,
+                                const int64_t* ipiv,
+                                lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_shsein_work_64( int matrix_layout, char job, char eigsrc,
+                                char initv, lapack_logical* select,
+                                int64_t n, const float* h, int64_t ldh,
+                                float* wr, const float* wi, float* vl,
+                                int64_t ldvl, float* vr, int64_t ldvr,
+                                int64_t mm, int64_t* m, float* work,
+                                int64_t* ifaill, int64_t* ifailr );
+int64_t LAPACKE_dhsein_work_64( int matrix_layout, char job, char eigsrc,
+                                char initv, lapack_logical* select,
+                                int64_t n, const double* h, int64_t ldh,
+                                double* wr, const double* wi, double* vl,
+                                int64_t ldvl, double* vr, int64_t ldvr,
+                                int64_t mm, int64_t* m, double* work,
+                                int64_t* ifaill, int64_t* ifailr );
+int64_t LAPACKE_chsein_work_64( int matrix_layout, char job, char eigsrc,
+                                char initv, const lapack_logical* select,
+                                int64_t n, const lapack_complex_float* h,
+                                int64_t ldh, lapack_complex_float* w,
+                                lapack_complex_float* vl, int64_t ldvl,
+                                lapack_complex_float* vr, int64_t ldvr,
+                                int64_t mm, int64_t* m,
+                                lapack_complex_float* work, float* rwork,
+                                int64_t* ifaill, int64_t* ifailr );
+int64_t LAPACKE_zhsein_work_64( int matrix_layout, char job, char eigsrc,
+                                char initv, const lapack_logical* select,
+                                int64_t n, const lapack_complex_double* h,
+                                int64_t ldh, lapack_complex_double* w,
+                                lapack_complex_double* vl, int64_t ldvl,
+                                lapack_complex_double* vr, int64_t ldvr,
+                                int64_t mm, int64_t* m,
+                                lapack_complex_double* work, double* rwork,
+                                int64_t* ifaill, int64_t* ifailr );
+
+int64_t LAPACKE_shseqr_work_64( int matrix_layout, char job, char compz,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                float* h, int64_t ldh, float* wr, float* wi,
+                                float* z, int64_t ldz, float* work,
+                                int64_t lwork );
+int64_t LAPACKE_dhseqr_work_64( int matrix_layout, char job, char compz,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                double* h, int64_t ldh, double* wr,
+                                double* wi, double* z, int64_t ldz,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_chseqr_work_64( int matrix_layout, char job, char compz,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                lapack_complex_float* h, int64_t ldh,
+                                lapack_complex_float* w,
+                                lapack_complex_float* z, int64_t ldz,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zhseqr_work_64( int matrix_layout, char job, char compz,
+                                int64_t n, int64_t ilo, int64_t ihi,
+                                lapack_complex_double* h, int64_t ldh,
+                                lapack_complex_double* w,
+                                lapack_complex_double* z, int64_t ldz,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_clacgv_work_64( int64_t n, lapack_complex_float* x,
+                                int64_t incx );
+int64_t LAPACKE_zlacgv_work_64( int64_t n, lapack_complex_double* x,
+                                int64_t incx );
+
+int64_t LAPACKE_slacn2_work_64( int64_t n, float* v, float* x,
+                                int64_t* isgn, float* est, int64_t* kase,
+                                int64_t* isave );
+int64_t LAPACKE_dlacn2_work_64( int64_t n, double* v, double* x,
+                                int64_t* isgn, double* est, int64_t* kase,
+                                int64_t* isave );
+int64_t LAPACKE_clacn2_work_64( int64_t n, lapack_complex_float* v,
+                                lapack_complex_float* x,
+                                float* est, int64_t* kase,
+                                int64_t* isave );
+int64_t LAPACKE_zlacn2_work_64( int64_t n, lapack_complex_double* v,
+                                lapack_complex_double* x,
+                                double* est, int64_t* kase,
+                                int64_t* isave );
+
+int64_t LAPACKE_slacpy_work_64( int matrix_layout, char uplo, int64_t m,
+                                int64_t n, const float* a, int64_t lda,
+                                float* b, int64_t ldb );
+int64_t LAPACKE_dlacpy_work_64( int matrix_layout, char uplo, int64_t m,
+                                int64_t n, const double* a, int64_t lda,
+                                double* b, int64_t ldb );
+int64_t LAPACKE_clacpy_work_64( int matrix_layout, char uplo, int64_t m,
+                                int64_t n, const lapack_complex_float* a,
+                                int64_t lda, lapack_complex_float* b,
+                                int64_t ldb );
+int64_t LAPACKE_zlacpy_work_64( int matrix_layout, char uplo, int64_t m,
+                                int64_t n, const lapack_complex_double* a,
+                                int64_t lda, lapack_complex_double* b,
+                                int64_t ldb );
+
+int64_t LAPACKE_clacp2_work_64( int matrix_layout, char uplo, int64_t m,
+                                int64_t n, const float* a, int64_t lda,
+                                lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zlacp2_work_64( int matrix_layout, char uplo, int64_t m,
+                                int64_t n, const double* a, int64_t lda,
+                                lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_zlag2c_work_64( int matrix_layout, int64_t m, int64_t n,
+                                const lapack_complex_double* a, int64_t lda,
+                                lapack_complex_float* sa, int64_t ldsa );
+
+int64_t LAPACKE_slag2d_work_64( int matrix_layout, int64_t m, int64_t n,
+                                const float* sa, int64_t ldsa, double* a,
+                                int64_t lda );
+
+int64_t LAPACKE_dlag2s_work_64( int matrix_layout, int64_t m, int64_t n,
+                                const double* a, int64_t lda, float* sa,
+                                int64_t ldsa );
+
+int64_t LAPACKE_clag2z_work_64( int matrix_layout, int64_t m, int64_t n,
+                                const lapack_complex_float* sa, int64_t ldsa,
+                                lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_slagge_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t kl, int64_t ku, const float* d,
+                                float* a, int64_t lda, int64_t* iseed,
+                                float* work );
+int64_t LAPACKE_dlagge_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t kl, int64_t ku, const double* d,
+                                double* a, int64_t lda, int64_t* iseed,
+                                double* work );
+int64_t LAPACKE_clagge_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t kl, int64_t ku, const float* d,
+                                lapack_complex_float* a, int64_t lda,
+                                int64_t* iseed, lapack_complex_float* work );
+int64_t LAPACKE_zlagge_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t kl, int64_t ku, const double* d,
+                                lapack_complex_double* a, int64_t lda,
+                                int64_t* iseed,
+                                lapack_complex_double* work );
+
+int64_t LAPACKE_claghe_work_64( int matrix_layout, int64_t n, int64_t k,
+                                const float* d, lapack_complex_float* a,
+                                int64_t lda, int64_t* iseed,
+                                lapack_complex_float* work );
+int64_t LAPACKE_zlaghe_work_64( int matrix_layout, int64_t n, int64_t k,
+                                const double* d, lapack_complex_double* a,
+                                int64_t lda, int64_t* iseed,
+                                lapack_complex_double* work );
+
+int64_t LAPACKE_slagsy_work_64( int matrix_layout, int64_t n, int64_t k,
+                                const float* d, float* a, int64_t lda,
+                                int64_t* iseed, float* work );
+int64_t LAPACKE_dlagsy_work_64( int matrix_layout, int64_t n, int64_t k,
+                                const double* d, double* a, int64_t lda,
+                                int64_t* iseed, double* work );
+int64_t LAPACKE_clagsy_work_64( int matrix_layout, int64_t n, int64_t k,
+                                const float* d, lapack_complex_float* a,
+                                int64_t lda, int64_t* iseed,
+                                lapack_complex_float* work );
+int64_t LAPACKE_zlagsy_work_64( int matrix_layout, int64_t n, int64_t k,
+                                const double* d, lapack_complex_double* a,
+                                int64_t lda, int64_t* iseed,
+                                lapack_complex_double* work );
+
+int64_t LAPACKE_slapmr_work_64( int matrix_layout, lapack_logical forwrd,
+                                int64_t m, int64_t n, float* x,
+                                int64_t ldx, int64_t* k );
+int64_t LAPACKE_dlapmr_work_64( int matrix_layout, lapack_logical forwrd,
+                                int64_t m, int64_t n, double* x,
+                                int64_t ldx, int64_t* k );
+int64_t LAPACKE_clapmr_work_64( int matrix_layout, lapack_logical forwrd,
+                                int64_t m, int64_t n,
+                                lapack_complex_float* x, int64_t ldx,
+                                int64_t* k );
+int64_t LAPACKE_zlapmr_work_64( int matrix_layout, lapack_logical forwrd,
+                                int64_t m, int64_t n,
+                                lapack_complex_double* x, int64_t ldx,
+                                int64_t* k );
+
+int64_t LAPACKE_slapmt_work_64( int matrix_layout, lapack_logical forwrd,
+                                int64_t m, int64_t n, float* x,
+                                int64_t ldx, int64_t* k );
+int64_t LAPACKE_dlapmt_work_64( int matrix_layout, lapack_logical forwrd,
+                                int64_t m, int64_t n, double* x,
+                                int64_t ldx, int64_t* k );
+int64_t LAPACKE_clapmt_work_64( int matrix_layout, lapack_logical forwrd,
+                                int64_t m, int64_t n,
+                                lapack_complex_float* x, int64_t ldx,
+                                int64_t* k );
+int64_t LAPACKE_zlapmt_work_64( int matrix_layout, lapack_logical forwrd,
+                                int64_t m, int64_t n,
+                                lapack_complex_double* x, int64_t ldx,
+                                int64_t* k );
+
+int64_t LAPACKE_slartgp_work_64( float f, float g, float* cs, float* sn,
+                                 float* r );
+int64_t LAPACKE_dlartgp_work_64( double f, double g, double* cs, double* sn,
+                                 double* r );
+
+int64_t LAPACKE_slartgs_work_64( float x, float y, float sigma, float* cs,
+                                 float* sn );
+int64_t LAPACKE_dlartgs_work_64( double x, double y, double sigma, double* cs,
+                                 double* sn );
+
+float LAPACKE_slapy2_work_64( float x, float y );
+double LAPACKE_dlapy2_work_64( double x, double y );
+
+float LAPACKE_slapy3_work_64( float x, float y, float z );
+double LAPACKE_dlapy3_work_64( double x, double y, double z );
+
+float LAPACKE_slamch_work_64( char cmach );
+double LAPACKE_dlamch_work_64( char cmach );
+
+float LAPACKE_slangb_work_64( int matrix_layout, char norm, int64_t n,
+                           int64_t kl, int64_t ku, const float* ab,
+                           int64_t ldab, float* work );
+double LAPACKE_dlangb_work_64( int matrix_layout, char norm, int64_t n,
+                            int64_t kl, int64_t ku, const double* ab,
+                            int64_t ldab, double* work );
+float LAPACKE_clangb_work_64( int matrix_layout, char norm, int64_t n,
+                           int64_t kl, int64_t ku,
+                           const lapack_complex_float* ab, int64_t ldab,
+                           float* work );
+double LAPACKE_zlangb_work_64( int matrix_layout, char norm, int64_t n,
+                            int64_t kl, int64_t ku,
+                            const lapack_complex_double* ab, int64_t ldab,
+                            double* work );
+
+float LAPACKE_slange_work_64( int matrix_layout, char norm, int64_t m,
+                                int64_t n, const float* a, int64_t lda,
+                                float* work );
+double LAPACKE_dlange_work_64( int matrix_layout, char norm, int64_t m,
+                                int64_t n, const double* a, int64_t lda,
+                                double* work );
+float LAPACKE_clange_work_64( int matrix_layout, char norm, int64_t m,
+                                int64_t n, const lapack_complex_float* a,
+                                int64_t lda, float* work );
+double LAPACKE_zlange_work_64( int matrix_layout, char norm, int64_t m,
+                                int64_t n, const lapack_complex_double* a,
+                                int64_t lda, double* work );
+
+float LAPACKE_clanhe_work_64( int matrix_layout, char norm, char uplo,
+                                int64_t n, const lapack_complex_float* a,
+                                int64_t lda, float* work );
+double LAPACKE_zlanhe_work_64( int matrix_layout, char norm, char uplo,
+                                int64_t n, const lapack_complex_double* a,
+                                int64_t lda, double* work );
+
+int64_t LAPACKE_clacrm_work_64( int matrix_layout, int64_t m, int64_t n,
+                                const lapack_complex_float* a,
+                                int64_t lda, const float* b,
+                                int64_t ldb, lapack_complex_float* c,
+                                int64_t ldc, float* work );
+int64_t LAPACKE_zlacrm_work_64( int matrix_layout, int64_t m, int64_t n,
+                                const lapack_complex_double* a,
+                                int64_t lda, const double* b,
+                                int64_t ldb, lapack_complex_double* c,
+                                int64_t ldc, double* work );
+
+int64_t LAPACKE_clarcm_work_64( int matrix_layout, int64_t m, int64_t n,
+                                const float* a, int64_t lda,
+                                const lapack_complex_float* b,
+                                int64_t ldb, lapack_complex_float* c,
+                                int64_t ldc, float* work );
+int64_t LAPACKE_zlarcm_work_64( int matrix_layout, int64_t m, int64_t n,
+                                const double* a, int64_t lda,
+                                const lapack_complex_double* b,
+                                int64_t ldb, lapack_complex_double* c,
+                                int64_t ldc, double* work );
+
+float LAPACKE_slansy_work_64( int matrix_layout, char norm, char uplo,
+                                int64_t n, const float* a, int64_t lda,
+                                float* work );
+double LAPACKE_dlansy_work_64( int matrix_layout, char norm, char uplo,
+                                int64_t n, const double* a, int64_t lda,
+                                double* work );
+float LAPACKE_clansy_work_64( int matrix_layout, char norm, char uplo,
+                                int64_t n, const lapack_complex_float* a,
+                                int64_t lda, float* work );
+double LAPACKE_zlansy_work_64( int matrix_layout, char norm, char uplo,
+                                int64_t n, const lapack_complex_double* a,
+                                int64_t lda, double* work );
+
+float LAPACKE_slantr_work_64( int matrix_layout, char norm, char uplo,
+                                char diag, int64_t m, int64_t n, const float* a,
+                                int64_t lda, float* work );
+double LAPACKE_dlantr_work_64( int matrix_layout, char norm, char uplo,
+                                char diag, int64_t m, int64_t n,
+                                const double* a, int64_t lda, double* work );
+float LAPACKE_clantr_work_64( int matrix_layout, char norm, char uplo,
+                                char diag, int64_t m, int64_t n,
+                                const lapack_complex_float* a, int64_t lda,
+                                float* work );
+double LAPACKE_zlantr_work_64( int matrix_layout, char norm, char uplo,
+                                char diag, int64_t m, int64_t n,
+                                const lapack_complex_double* a, int64_t lda,
+                                double* work );
+
+int64_t LAPACKE_slarfb_work_64( int matrix_layout, char side, char trans,
+                                char direct, char storev, int64_t m,
+                                int64_t n, int64_t k, const float* v,
+                                int64_t ldv, const float* t, int64_t ldt,
+                                float* c, int64_t ldc, float* work,
+                                int64_t ldwork );
+int64_t LAPACKE_dlarfb_work_64( int matrix_layout, char side, char trans,
+                                char direct, char storev, int64_t m,
+                                int64_t n, int64_t k, const double* v,
+                                int64_t ldv, const double* t, int64_t ldt,
+                                double* c, int64_t ldc, double* work,
+                                int64_t ldwork );
+int64_t LAPACKE_clarfb_work_64( int matrix_layout, char side, char trans,
+                                char direct, char storev, int64_t m,
+                                int64_t n, int64_t k,
+                                const lapack_complex_float* v, int64_t ldv,
+                                const lapack_complex_float* t, int64_t ldt,
+                                lapack_complex_float* c, int64_t ldc,
+                                lapack_complex_float* work, int64_t ldwork );
+int64_t LAPACKE_zlarfb_work_64( int matrix_layout, char side, char trans,
+                                char direct, char storev, int64_t m,
+                                int64_t n, int64_t k,
+                                const lapack_complex_double* v, int64_t ldv,
+                                const lapack_complex_double* t, int64_t ldt,
+                                lapack_complex_double* c, int64_t ldc,
+                                lapack_complex_double* work,
+                                int64_t ldwork );
+
+int64_t LAPACKE_slarfg_work_64( int64_t n, float* alpha, float* x,
+                                int64_t incx, float* tau );
+int64_t LAPACKE_dlarfg_work_64( int64_t n, double* alpha, double* x,
+                                int64_t incx, double* tau );
+int64_t LAPACKE_clarfg_work_64( int64_t n, lapack_complex_float* alpha,
+                                lapack_complex_float* x, int64_t incx,
+                                lapack_complex_float* tau );
+int64_t LAPACKE_zlarfg_work_64( int64_t n, lapack_complex_double* alpha,
+                                lapack_complex_double* x, int64_t incx,
+                                lapack_complex_double* tau );
+
+int64_t LAPACKE_slarft_work_64( int matrix_layout, char direct, char storev,
+                                int64_t n, int64_t k, const float* v,
+                                int64_t ldv, const float* tau, float* t,
+                                int64_t ldt );
+int64_t LAPACKE_dlarft_work_64( int matrix_layout, char direct, char storev,
+                                int64_t n, int64_t k, const double* v,
+                                int64_t ldv, const double* tau, double* t,
+                                int64_t ldt );
+int64_t LAPACKE_clarft_work_64( int matrix_layout, char direct, char storev,
+                                int64_t n, int64_t k,
+                                const lapack_complex_float* v, int64_t ldv,
+                                const lapack_complex_float* tau,
+                                lapack_complex_float* t, int64_t ldt );
+int64_t LAPACKE_zlarft_work_64( int matrix_layout, char direct, char storev,
+                                int64_t n, int64_t k,
+                                const lapack_complex_double* v, int64_t ldv,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* t, int64_t ldt );
+
+int64_t LAPACKE_slarfx_work_64( int matrix_layout, char side, int64_t m,
+                                int64_t n, const float* v, float tau,
+                                float* c, int64_t ldc, float* work );
+int64_t LAPACKE_dlarfx_work_64( int matrix_layout, char side, int64_t m,
+                                int64_t n, const double* v, double tau,
+                                double* c, int64_t ldc, double* work );
+int64_t LAPACKE_clarfx_work_64( int matrix_layout, char side, int64_t m,
+                                int64_t n, const lapack_complex_float* v,
+                                lapack_complex_float tau,
+                                lapack_complex_float* c, int64_t ldc,
+                                lapack_complex_float* work );
+int64_t LAPACKE_zlarfx_work_64( int matrix_layout, char side, int64_t m,
+                                int64_t n, const lapack_complex_double* v,
+                                lapack_complex_double tau,
+                                lapack_complex_double* c, int64_t ldc,
+                                lapack_complex_double* work );
+
+int64_t LAPACKE_slarnv_work_64( int64_t idist, int64_t* iseed,
+                                int64_t n, float* x );
+int64_t LAPACKE_dlarnv_work_64( int64_t idist, int64_t* iseed,
+                                int64_t n, double* x );
+int64_t LAPACKE_clarnv_work_64( int64_t idist, int64_t* iseed,
+                                int64_t n, lapack_complex_float* x );
+int64_t LAPACKE_zlarnv_work_64( int64_t idist, int64_t* iseed,
+                                int64_t n, lapack_complex_double* x );
+
+
+int64_t LAPACKE_slascl_work_64( int matrix_layout, char type, int64_t kl,
+                           int64_t ku, float cfrom, float cto,
+                           int64_t m, int64_t n, float* a,
+                           int64_t lda );
+int64_t LAPACKE_dlascl_work_64( int matrix_layout, char type, int64_t kl,
+                           int64_t ku, double cfrom, double cto,
+                           int64_t m, int64_t n, double* a,
+                           int64_t lda );
+int64_t LAPACKE_clascl_work_64( int matrix_layout, char type, int64_t kl,
+                           int64_t ku, float cfrom, float cto,
+                           int64_t m, int64_t n, lapack_complex_float* a,
+                           int64_t lda );
+int64_t LAPACKE_zlascl_work_64( int matrix_layout, char type, int64_t kl,
+                           int64_t ku, double cfrom, double cto,
+                           int64_t m, int64_t n, lapack_complex_double* a,
+                           int64_t lda );
+
+int64_t LAPACKE_slaset_work_64( int matrix_layout, char uplo, int64_t m,
+                                int64_t n, float alpha, float beta, float* a,
+                                int64_t lda );
+int64_t LAPACKE_dlaset_work_64( int matrix_layout, char uplo, int64_t m,
+                                int64_t n, double alpha, double beta,
+                                double* a, int64_t lda );
+int64_t LAPACKE_claset_work_64( int matrix_layout, char uplo, int64_t m,
+                                int64_t n, lapack_complex_float alpha,
+                                lapack_complex_float beta,
+                                lapack_complex_float* a, int64_t lda );
+int64_t LAPACKE_zlaset_work_64( int matrix_layout, char uplo, int64_t m,
+                                int64_t n, lapack_complex_double alpha,
+                                lapack_complex_double beta,
+                                lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_slasrt_work_64( char id, int64_t n, float* d );
+int64_t LAPACKE_dlasrt_work_64( char id, int64_t n, double* d );
+
+int64_t LAPACKE_slassq_work_64( int64_t n,                 const float* x, int64_t incx,  float* scale,  float* sumsq );
+int64_t LAPACKE_dlassq_work_64( int64_t n,                const double* x, int64_t incx, double* scale, double* sumsq );
+int64_t LAPACKE_classq_work_64( int64_t n,  const lapack_complex_float* x, int64_t incx,  float* scale,  float* sumsq );
+int64_t LAPACKE_zlassq_work_64( int64_t n, const lapack_complex_double* x, int64_t incx, double* scale, double* sumsq );
+
+int64_t LAPACKE_slaswp_work_64( int matrix_layout, int64_t n, float* a,
+                                int64_t lda, int64_t k1, int64_t k2,
+                                const int64_t* ipiv, int64_t incx );
+int64_t LAPACKE_dlaswp_work_64( int matrix_layout, int64_t n, double* a,
+                                int64_t lda, int64_t k1, int64_t k2,
+                                const int64_t* ipiv, int64_t incx );
+int64_t LAPACKE_claswp_work_64( int matrix_layout, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                int64_t k1, int64_t k2,
+                                const int64_t* ipiv, int64_t incx );
+int64_t LAPACKE_zlaswp_work_64( int matrix_layout, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                int64_t k1, int64_t k2,
+                                const int64_t* ipiv, int64_t incx );
+
+int64_t LAPACKE_slatms_work_64( int matrix_layout, int64_t m, int64_t n,
+                                char dist, int64_t* iseed, char sym,
+                                float* d, int64_t mode, float cond,
+                                float dmax, int64_t kl, int64_t ku,
+                                char pack, float* a, int64_t lda,
+                                float* work );
+int64_t LAPACKE_dlatms_work_64( int matrix_layout, int64_t m, int64_t n,
+                                char dist, int64_t* iseed, char sym,
+                                double* d, int64_t mode, double cond,
+                                double dmax, int64_t kl, int64_t ku,
+                                char pack, double* a, int64_t lda,
+                                double* work );
+int64_t LAPACKE_clatms_work_64( int matrix_layout, int64_t m, int64_t n,
+                                char dist, int64_t* iseed, char sym,
+                                float* d, int64_t mode, float cond,
+                                float dmax, int64_t kl, int64_t ku,
+                                char pack, lapack_complex_float* a,
+                                int64_t lda, lapack_complex_float* work );
+int64_t LAPACKE_zlatms_work_64( int matrix_layout, int64_t m, int64_t n,
+                                char dist, int64_t* iseed, char sym,
+                                double* d, int64_t mode, double cond,
+                                double dmax, int64_t kl, int64_t ku,
+                                char pack, lapack_complex_double* a,
+                                int64_t lda, lapack_complex_double* work );
+
+int64_t LAPACKE_slauum_work_64( int matrix_layout, char uplo, int64_t n,
+                                float* a, int64_t lda );
+int64_t LAPACKE_dlauum_work_64( int matrix_layout, char uplo, int64_t n,
+                                double* a, int64_t lda );
+int64_t LAPACKE_clauum_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda );
+int64_t LAPACKE_zlauum_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_sopgtr_work_64( int matrix_layout, char uplo, int64_t n,
+                                const float* ap, const float* tau, float* q,
+                                int64_t ldq, float* work );
+int64_t LAPACKE_dopgtr_work_64( int matrix_layout, char uplo, int64_t n,
+                                const double* ap, const double* tau, double* q,
+                                int64_t ldq, double* work );
+
+int64_t LAPACKE_sopmtr_work_64( int matrix_layout, char side, char uplo,
+                                char trans, int64_t m, int64_t n,
+                                const float* ap, const float* tau, float* c,
+                                int64_t ldc, float* work );
+int64_t LAPACKE_dopmtr_work_64( int matrix_layout, char side, char uplo,
+                                char trans, int64_t m, int64_t n,
+                                const double* ap, const double* tau, double* c,
+                                int64_t ldc, double* work );
+
+int64_t LAPACKE_sorgbr_work_64( int matrix_layout, char vect, int64_t m,
+                                int64_t n, int64_t k, float* a,
+                                int64_t lda, const float* tau, float* work,
+                                int64_t lwork );
+int64_t LAPACKE_dorgbr_work_64( int matrix_layout, char vect, int64_t m,
+                                int64_t n, int64_t k, double* a,
+                                int64_t lda, const double* tau, double* work,
+                                int64_t lwork );
+
+int64_t LAPACKE_sorghr_work_64( int matrix_layout, int64_t n, int64_t ilo,
+                                int64_t ihi, float* a, int64_t lda,
+                                const float* tau, float* work,
+                                int64_t lwork );
+int64_t LAPACKE_dorghr_work_64( int matrix_layout, int64_t n, int64_t ilo,
+                                int64_t ihi, double* a, int64_t lda,
+                                const double* tau, double* work,
+                                int64_t lwork );
+
+int64_t LAPACKE_sorglq_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t k, float* a, int64_t lda,
+                                const float* tau, float* work,
+                                int64_t lwork );
+int64_t LAPACKE_dorglq_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t k, double* a, int64_t lda,
+                                const double* tau, double* work,
+                                int64_t lwork );
+
+int64_t LAPACKE_sorgql_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t k, float* a, int64_t lda,
+                                const float* tau, float* work,
+                                int64_t lwork );
+int64_t LAPACKE_dorgql_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t k, double* a, int64_t lda,
+                                const double* tau, double* work,
+                                int64_t lwork );
+
+int64_t LAPACKE_sorgqr_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t k, float* a, int64_t lda,
+                                const float* tau, float* work,
+                                int64_t lwork );
+int64_t LAPACKE_dorgqr_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t k, double* a, int64_t lda,
+                                const double* tau, double* work,
+                                int64_t lwork );
+
+int64_t LAPACKE_sorgrq_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t k, float* a, int64_t lda,
+                                const float* tau, float* work,
+                                int64_t lwork );
+int64_t LAPACKE_dorgrq_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t k, double* a, int64_t lda,
+                                const double* tau, double* work,
+                                int64_t lwork );
+
+int64_t LAPACKE_sorgtr_work_64( int matrix_layout, char uplo, int64_t n,
+                                float* a, int64_t lda, const float* tau,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dorgtr_work_64( int matrix_layout, char uplo, int64_t n,
+                                double* a, int64_t lda, const double* tau,
+                                double* work, int64_t lwork );
+
+int64_t LAPACKE_sorgtsqr_row_work_64( int matrix_layout,
+                                      int64_t m, int64_t n,
+                                      int64_t mb, int64_t nb,
+                                      float* a, int64_t lda,
+                                      const float* t, int64_t ldt,
+                                      float* work, int64_t lwork );
+int64_t LAPACKE_dorgtsqr_row_work_64( int matrix_layout,
+                                      int64_t m, int64_t n,
+                                      int64_t mb, int64_t nb,
+                                      double* a, int64_t lda,
+                                      const double* t, int64_t ldt,
+                                      double* work, int64_t lwork );
+
+int64_t LAPACKE_sormbr_work_64( int matrix_layout, char vect, char side,
+                                char trans, int64_t m, int64_t n,
+                                int64_t k, const float* a, int64_t lda,
+                                const float* tau, float* c, int64_t ldc,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dormbr_work_64( int matrix_layout, char vect, char side,
+                                char trans, int64_t m, int64_t n,
+                                int64_t k, const double* a, int64_t lda,
+                                const double* tau, double* c, int64_t ldc,
+                                double* work, int64_t lwork );
+
+int64_t LAPACKE_sormhr_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t ilo,
+                                int64_t ihi, const float* a, int64_t lda,
+                                const float* tau, float* c, int64_t ldc,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dormhr_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t ilo,
+                                int64_t ihi, const double* a, int64_t lda,
+                                const double* tau, double* c, int64_t ldc,
+                                double* work, int64_t lwork );
+
+int64_t LAPACKE_sormlq_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const float* a, int64_t lda,
+                                const float* tau, float* c, int64_t ldc,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dormlq_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const double* a, int64_t lda,
+                                const double* tau, double* c, int64_t ldc,
+                                double* work, int64_t lwork );
+
+int64_t LAPACKE_sormql_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const float* a, int64_t lda,
+                                const float* tau, float* c, int64_t ldc,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dormql_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const double* a, int64_t lda,
+                                const double* tau, double* c, int64_t ldc,
+                                double* work, int64_t lwork );
+
+int64_t LAPACKE_sormqr_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const float* a, int64_t lda,
+                                const float* tau, float* c, int64_t ldc,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dormqr_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const double* a, int64_t lda,
+                                const double* tau, double* c, int64_t ldc,
+                                double* work, int64_t lwork );
+
+int64_t LAPACKE_sormrq_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const float* a, int64_t lda,
+                                const float* tau, float* c, int64_t ldc,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dormrq_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const double* a, int64_t lda,
+                                const double* tau, double* c, int64_t ldc,
+                                double* work, int64_t lwork );
+
+int64_t LAPACKE_sormrz_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                int64_t l, const float* a, int64_t lda,
+                                const float* tau, float* c, int64_t ldc,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dormrz_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                int64_t l, const double* a, int64_t lda,
+                                const double* tau, double* c, int64_t ldc,
+                                double* work, int64_t lwork );
+
+int64_t LAPACKE_sormtr_work_64( int matrix_layout, char side, char uplo,
+                                char trans, int64_t m, int64_t n,
+                                const float* a, int64_t lda,
+                                const float* tau, float* c, int64_t ldc,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dormtr_work_64( int matrix_layout, char side, char uplo,
+                                char trans, int64_t m, int64_t n,
+                                const double* a, int64_t lda,
+                                const double* tau, double* c, int64_t ldc,
+                                double* work, int64_t lwork );
+
+int64_t LAPACKE_spbcon_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, const float* ab, int64_t ldab,
+                                float anorm, float* rcond, float* work,
+                                int64_t* iwork );
+int64_t LAPACKE_dpbcon_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, const double* ab,
+                                int64_t ldab, double anorm, double* rcond,
+                                double* work, int64_t* iwork );
+int64_t LAPACKE_cpbcon_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, const lapack_complex_float* ab,
+                                int64_t ldab, float anorm, float* rcond,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zpbcon_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, const lapack_complex_double* ab,
+                                int64_t ldab, double anorm, double* rcond,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_spbequ_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, const float* ab, int64_t ldab,
+                                float* s, float* scond, float* amax );
+int64_t LAPACKE_dpbequ_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, const double* ab,
+                                int64_t ldab, double* s, double* scond,
+                                double* amax );
+int64_t LAPACKE_cpbequ_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, const lapack_complex_float* ab,
+                                int64_t ldab, float* s, float* scond,
+                                float* amax );
+int64_t LAPACKE_zpbequ_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, const lapack_complex_double* ab,
+                                int64_t ldab, double* s, double* scond,
+                                double* amax );
+
+int64_t LAPACKE_spbrfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, int64_t nrhs, const float* ab,
+                                int64_t ldab, const float* afb,
+                                int64_t ldafb, const float* b,
+                                int64_t ldb, float* x, int64_t ldx,
+                                float* ferr, float* berr, float* work,
+                                int64_t* iwork );
+int64_t LAPACKE_dpbrfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, int64_t nrhs,
+                                const double* ab, int64_t ldab,
+                                const double* afb, int64_t ldafb,
+                                const double* b, int64_t ldb, double* x,
+                                int64_t ldx, double* ferr, double* berr,
+                                double* work, int64_t* iwork );
+int64_t LAPACKE_cpbrfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, int64_t nrhs,
+                                const lapack_complex_float* ab, int64_t ldab,
+                                const lapack_complex_float* afb,
+                                int64_t ldafb, const lapack_complex_float* b,
+                                int64_t ldb, lapack_complex_float* x,
+                                int64_t ldx, float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zpbrfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, int64_t nrhs,
+                                const lapack_complex_double* ab,
+                                int64_t ldab,
+                                const lapack_complex_double* afb,
+                                int64_t ldafb,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_spbstf_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kb, float* bb, int64_t ldbb );
+int64_t LAPACKE_dpbstf_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kb, double* bb, int64_t ldbb );
+int64_t LAPACKE_cpbstf_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kb, lapack_complex_float* bb,
+                                int64_t ldbb );
+int64_t LAPACKE_zpbstf_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kb, lapack_complex_double* bb,
+                                int64_t ldbb );
+
+int64_t LAPACKE_spbsv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t kd, int64_t nrhs, float* ab,
+                               int64_t ldab, float* b, int64_t ldb );
+int64_t LAPACKE_dpbsv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t kd, int64_t nrhs, double* ab,
+                               int64_t ldab, double* b, int64_t ldb );
+int64_t LAPACKE_cpbsv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t kd, int64_t nrhs,
+                               lapack_complex_float* ab, int64_t ldab,
+                               lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zpbsv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t kd, int64_t nrhs,
+                               lapack_complex_double* ab, int64_t ldab,
+                               lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_spbsvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t kd, int64_t nrhs,
+                                float* ab, int64_t ldab, float* afb,
+                                int64_t ldafb, char* equed, float* s,
+                                float* b, int64_t ldb, float* x,
+                                int64_t ldx, float* rcond, float* ferr,
+                                float* berr, float* work, int64_t* iwork );
+int64_t LAPACKE_dpbsvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t kd, int64_t nrhs,
+                                double* ab, int64_t ldab, double* afb,
+                                int64_t ldafb, char* equed, double* s,
+                                double* b, int64_t ldb, double* x,
+                                int64_t ldx, double* rcond, double* ferr,
+                                double* berr, double* work, int64_t* iwork );
+int64_t LAPACKE_cpbsvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t kd, int64_t nrhs,
+                                lapack_complex_float* ab, int64_t ldab,
+                                lapack_complex_float* afb, int64_t ldafb,
+                                char* equed, float* s, lapack_complex_float* b,
+                                int64_t ldb, lapack_complex_float* x,
+                                int64_t ldx, float* rcond, float* ferr,
+                                float* berr, lapack_complex_float* work,
+                                float* rwork );
+int64_t LAPACKE_zpbsvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t kd, int64_t nrhs,
+                                lapack_complex_double* ab, int64_t ldab,
+                                lapack_complex_double* afb, int64_t ldafb,
+                                char* equed, double* s,
+                                lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* rcond, double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_spbtrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, float* ab, int64_t ldab );
+int64_t LAPACKE_dpbtrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, double* ab, int64_t ldab );
+int64_t LAPACKE_cpbtrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, lapack_complex_float* ab,
+                                int64_t ldab );
+int64_t LAPACKE_zpbtrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, lapack_complex_double* ab,
+                                int64_t ldab );
+
+int64_t LAPACKE_spbtrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, int64_t nrhs, const float* ab,
+                                int64_t ldab, float* b, int64_t ldb );
+int64_t LAPACKE_dpbtrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, int64_t nrhs,
+                                const double* ab, int64_t ldab, double* b,
+                                int64_t ldb );
+int64_t LAPACKE_cpbtrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, int64_t nrhs,
+                                const lapack_complex_float* ab, int64_t ldab,
+                                lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zpbtrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t kd, int64_t nrhs,
+                                const lapack_complex_double* ab,
+                                int64_t ldab, lapack_complex_double* b,
+                                int64_t ldb );
+
+int64_t LAPACKE_spftrf_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, float* a );
+int64_t LAPACKE_dpftrf_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, double* a );
+int64_t LAPACKE_cpftrf_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, lapack_complex_float* a );
+int64_t LAPACKE_zpftrf_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, lapack_complex_double* a );
+
+int64_t LAPACKE_spftri_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, float* a );
+int64_t LAPACKE_dpftri_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, double* a );
+int64_t LAPACKE_cpftri_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, lapack_complex_float* a );
+int64_t LAPACKE_zpftri_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, lapack_complex_double* a );
+
+int64_t LAPACKE_spftrs_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, int64_t nrhs, const float* a,
+                                float* b, int64_t ldb );
+int64_t LAPACKE_dpftrs_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, int64_t nrhs, const double* a,
+                                double* b, int64_t ldb );
+int64_t LAPACKE_cpftrs_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, int64_t nrhs,
+                                const lapack_complex_float* a,
+                                lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zpftrs_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, int64_t nrhs,
+                                const lapack_complex_double* a,
+                                lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_spocon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const float* a, int64_t lda, float anorm,
+                                float* rcond, float* work, int64_t* iwork );
+int64_t LAPACKE_dpocon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const double* a, int64_t lda, double anorm,
+                                double* rcond, double* work,
+                                int64_t* iwork );
+int64_t LAPACKE_cpocon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_float* a, int64_t lda,
+                                float anorm, float* rcond,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zpocon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_double* a, int64_t lda,
+                                double anorm, double* rcond,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_spoequ_work_64( int matrix_layout, int64_t n, const float* a,
+                                int64_t lda, float* s, float* scond,
+                                float* amax );
+int64_t LAPACKE_dpoequ_work_64( int matrix_layout, int64_t n, const double* a,
+                                int64_t lda, double* s, double* scond,
+                                double* amax );
+int64_t LAPACKE_cpoequ_work_64( int matrix_layout, int64_t n,
+                                const lapack_complex_float* a, int64_t lda,
+                                float* s, float* scond, float* amax );
+int64_t LAPACKE_zpoequ_work_64( int matrix_layout, int64_t n,
+                                const lapack_complex_double* a, int64_t lda,
+                                double* s, double* scond, double* amax );
+
+int64_t LAPACKE_spoequb_work_64( int matrix_layout, int64_t n, const float* a,
+                                 int64_t lda, float* s, float* scond,
+                                 float* amax );
+int64_t LAPACKE_dpoequb_work_64( int matrix_layout, int64_t n,
+                                 const double* a, int64_t lda, double* s,
+                                 double* scond, double* amax );
+int64_t LAPACKE_cpoequb_work_64( int matrix_layout, int64_t n,
+                                 const lapack_complex_float* a, int64_t lda,
+                                 float* s, float* scond, float* amax );
+int64_t LAPACKE_zpoequb_work_64( int matrix_layout, int64_t n,
+                                 const lapack_complex_double* a, int64_t lda,
+                                 double* s, double* scond, double* amax );
+
+int64_t LAPACKE_sporfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const float* a, int64_t lda,
+                                const float* af, int64_t ldaf,
+                                const float* b, int64_t ldb, float* x,
+                                int64_t ldx, float* ferr, float* berr,
+                                float* work, int64_t* iwork );
+int64_t LAPACKE_dporfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const double* a,
+                                int64_t lda, const double* af,
+                                int64_t ldaf, const double* b,
+                                int64_t ldb, double* x, int64_t ldx,
+                                double* ferr, double* berr, double* work,
+                                int64_t* iwork );
+int64_t LAPACKE_cporfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* a,
+                                int64_t lda, const lapack_complex_float* af,
+                                int64_t ldaf, const lapack_complex_float* b,
+                                int64_t ldb, lapack_complex_float* x,
+                                int64_t ldx, float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zporfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_double* a,
+                                int64_t lda, const lapack_complex_double* af,
+                                int64_t ldaf, const lapack_complex_double* b,
+                                int64_t ldb, lapack_complex_double* x,
+                                int64_t ldx, double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_sporfsx_work_64( int matrix_layout, char uplo, char equed,
+                                 int64_t n, int64_t nrhs, const float* a,
+                                 int64_t lda, const float* af,
+                                 int64_t ldaf, const float* s,
+                                 const float* b, int64_t ldb, float* x,
+                                 int64_t ldx, float* rcond, float* berr,
+                                 int64_t n_err_bnds, float* err_bnds_norm,
+                                 float* err_bnds_comp, int64_t nparams,
+                                 float* params, float* work,
+                                 int64_t* iwork );
+int64_t LAPACKE_dporfsx_work_64( int matrix_layout, char uplo, char equed,
+                                 int64_t n, int64_t nrhs, const double* a,
+                                 int64_t lda, const double* af,
+                                 int64_t ldaf, const double* s,
+                                 const double* b, int64_t ldb, double* x,
+                                 int64_t ldx, double* rcond, double* berr,
+                                 int64_t n_err_bnds, double* err_bnds_norm,
+                                 double* err_bnds_comp, int64_t nparams,
+                                 double* params, double* work,
+                                 int64_t* iwork );
+int64_t LAPACKE_cporfsx_work_64( int matrix_layout, char uplo, char equed,
+                                 int64_t n, int64_t nrhs,
+                                 const lapack_complex_float* a, int64_t lda,
+                                 const lapack_complex_float* af,
+                                 int64_t ldaf, const float* s,
+                                 const lapack_complex_float* b, int64_t ldb,
+                                 lapack_complex_float* x, int64_t ldx,
+                                 float* rcond, float* berr,
+                                 int64_t n_err_bnds, float* err_bnds_norm,
+                                 float* err_bnds_comp, int64_t nparams,
+                                 float* params, lapack_complex_float* work,
+                                 float* rwork );
+int64_t LAPACKE_zporfsx_work_64( int matrix_layout, char uplo, char equed,
+                                 int64_t n, int64_t nrhs,
+                                 const lapack_complex_double* a, int64_t lda,
+                                 const lapack_complex_double* af,
+                                 int64_t ldaf, const double* s,
+                                 const lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* x, int64_t ldx,
+                                 double* rcond, double* berr,
+                                 int64_t n_err_bnds, double* err_bnds_norm,
+                                 double* err_bnds_comp, int64_t nparams,
+                                 double* params, lapack_complex_double* work,
+                                 double* rwork );
+
+int64_t LAPACKE_sposv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, float* a, int64_t lda,
+                               float* b, int64_t ldb );
+int64_t LAPACKE_dposv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, double* a, int64_t lda,
+                               double* b, int64_t ldb );
+int64_t LAPACKE_cposv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_float* a,
+                               int64_t lda, lapack_complex_float* b,
+                               int64_t ldb );
+int64_t LAPACKE_zposv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_double* a,
+                               int64_t lda, lapack_complex_double* b,
+                               int64_t ldb );
+int64_t LAPACKE_dsposv_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, double* a, int64_t lda,
+                                const double* b, int64_t ldb, double* x,
+                                int64_t ldx, double* work, float* swork,
+                                int64_t* iter );
+int64_t LAPACKE_zcposv_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, lapack_complex_double* a,
+                                int64_t lda, const lapack_complex_double* b,
+                                int64_t ldb, lapack_complex_double* x,
+                                int64_t ldx, lapack_complex_double* work,
+                                lapack_complex_float* swork, double* rwork,
+                                int64_t* iter );
+
+int64_t LAPACKE_sposvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs, float* a,
+                                int64_t lda, float* af, int64_t ldaf,
+                                char* equed, float* s, float* b, int64_t ldb,
+                                float* x, int64_t ldx, float* rcond,
+                                float* ferr, float* berr, float* work,
+                                int64_t* iwork );
+int64_t LAPACKE_dposvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs, double* a,
+                                int64_t lda, double* af, int64_t ldaf,
+                                char* equed, double* s, double* b,
+                                int64_t ldb, double* x, int64_t ldx,
+                                double* rcond, double* ferr, double* berr,
+                                double* work, int64_t* iwork );
+int64_t LAPACKE_cposvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* af, int64_t ldaf,
+                                char* equed, float* s, lapack_complex_float* b,
+                                int64_t ldb, lapack_complex_float* x,
+                                int64_t ldx, float* rcond, float* ferr,
+                                float* berr, lapack_complex_float* work,
+                                float* rwork );
+int64_t LAPACKE_zposvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* af, int64_t ldaf,
+                                char* equed, double* s,
+                                lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* rcond, double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_sposvxx_work_64( int matrix_layout, char fact, char uplo,
+                                 int64_t n, int64_t nrhs, float* a,
+                                 int64_t lda, float* af, int64_t ldaf,
+                                 char* equed, float* s, float* b,
+                                 int64_t ldb, float* x, int64_t ldx,
+                                 float* rcond, float* rpvgrw, float* berr,
+                                 int64_t n_err_bnds, float* err_bnds_norm,
+                                 float* err_bnds_comp, int64_t nparams,
+                                 float* params, float* work,
+                                 int64_t* iwork );
+int64_t LAPACKE_dposvxx_work_64( int matrix_layout, char fact, char uplo,
+                                 int64_t n, int64_t nrhs, double* a,
+                                 int64_t lda, double* af, int64_t ldaf,
+                                 char* equed, double* s, double* b,
+                                 int64_t ldb, double* x, int64_t ldx,
+                                 double* rcond, double* rpvgrw, double* berr,
+                                 int64_t n_err_bnds, double* err_bnds_norm,
+                                 double* err_bnds_comp, int64_t nparams,
+                                 double* params, double* work,
+                                 int64_t* iwork );
+int64_t LAPACKE_cposvxx_work_64( int matrix_layout, char fact, char uplo,
+                                 int64_t n, int64_t nrhs,
+                                 lapack_complex_float* a, int64_t lda,
+                                 lapack_complex_float* af, int64_t ldaf,
+                                 char* equed, float* s, lapack_complex_float* b,
+                                 int64_t ldb, lapack_complex_float* x,
+                                 int64_t ldx, float* rcond, float* rpvgrw,
+                                 float* berr, int64_t n_err_bnds,
+                                 float* err_bnds_norm, float* err_bnds_comp,
+                                 int64_t nparams, float* params,
+                                 lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zposvxx_work_64( int matrix_layout, char fact, char uplo,
+                                 int64_t n, int64_t nrhs,
+                                 lapack_complex_double* a, int64_t lda,
+                                 lapack_complex_double* af, int64_t ldaf,
+                                 char* equed, double* s,
+                                 lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* x, int64_t ldx,
+                                 double* rcond, double* rpvgrw, double* berr,
+                                 int64_t n_err_bnds, double* err_bnds_norm,
+                                 double* err_bnds_comp, int64_t nparams,
+                                 double* params, lapack_complex_double* work,
+                                 double* rwork );
+
+int64_t LAPACKE_spotrf2_work_64( int matrix_layout, char uplo, int64_t n,
+                                float* a, int64_t lda );
+int64_t LAPACKE_dpotrf2_work_64( int matrix_layout, char uplo, int64_t n,
+                                double* a, int64_t lda );
+int64_t LAPACKE_cpotrf2_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda );
+int64_t LAPACKE_zpotrf2_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_spotrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                float* a, int64_t lda );
+int64_t LAPACKE_dpotrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                double* a, int64_t lda );
+int64_t LAPACKE_cpotrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda );
+int64_t LAPACKE_zpotrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_spotri_work_64( int matrix_layout, char uplo, int64_t n,
+                                float* a, int64_t lda );
+int64_t LAPACKE_dpotri_work_64( int matrix_layout, char uplo, int64_t n,
+                                double* a, int64_t lda );
+int64_t LAPACKE_cpotri_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda );
+int64_t LAPACKE_zpotri_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_spotrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const float* a, int64_t lda,
+                                float* b, int64_t ldb );
+int64_t LAPACKE_dpotrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const double* a,
+                                int64_t lda, double* b, int64_t ldb );
+int64_t LAPACKE_cpotrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* a,
+                                int64_t lda, lapack_complex_float* b,
+                                int64_t ldb );
+int64_t LAPACKE_zpotrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_double* a,
+                                int64_t lda, lapack_complex_double* b,
+                                int64_t ldb );
+
+int64_t LAPACKE_sppcon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const float* ap, float anorm, float* rcond,
+                                float* work, int64_t* iwork );
+int64_t LAPACKE_dppcon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const double* ap, double anorm, double* rcond,
+                                double* work, int64_t* iwork );
+int64_t LAPACKE_cppcon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_float* ap, float anorm,
+                                float* rcond, lapack_complex_float* work,
+                                float* rwork );
+int64_t LAPACKE_zppcon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_double* ap, double anorm,
+                                double* rcond, lapack_complex_double* work,
+                                double* rwork );
+
+int64_t LAPACKE_sppequ_work_64( int matrix_layout, char uplo, int64_t n,
+                                const float* ap, float* s, float* scond,
+                                float* amax );
+int64_t LAPACKE_dppequ_work_64( int matrix_layout, char uplo, int64_t n,
+                                const double* ap, double* s, double* scond,
+                                double* amax );
+int64_t LAPACKE_cppequ_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_float* ap, float* s,
+                                float* scond, float* amax );
+int64_t LAPACKE_zppequ_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_double* ap, double* s,
+                                double* scond, double* amax );
+
+int64_t LAPACKE_spprfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const float* ap,
+                                const float* afp, const float* b,
+                                int64_t ldb, float* x, int64_t ldx,
+                                float* ferr, float* berr, float* work,
+                                int64_t* iwork );
+int64_t LAPACKE_dpprfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const double* ap,
+                                const double* afp, const double* b,
+                                int64_t ldb, double* x, int64_t ldx,
+                                double* ferr, double* berr, double* work,
+                                int64_t* iwork );
+int64_t LAPACKE_cpprfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* ap,
+                                const lapack_complex_float* afp,
+                                const lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* x, int64_t ldx,
+                                float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zpprfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs,
+                                const lapack_complex_double* ap,
+                                const lapack_complex_double* afp,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_sppsv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, float* ap, float* b,
+                               int64_t ldb );
+int64_t LAPACKE_dppsv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, double* ap, double* b,
+                               int64_t ldb );
+int64_t LAPACKE_cppsv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_float* ap,
+                               lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zppsv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_double* ap,
+                               lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_sppsvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs, float* ap,
+                                float* afp, char* equed, float* s, float* b,
+                                int64_t ldb, float* x, int64_t ldx,
+                                float* rcond, float* ferr, float* berr,
+                                float* work, int64_t* iwork );
+int64_t LAPACKE_dppsvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs, double* ap,
+                                double* afp, char* equed, double* s, double* b,
+                                int64_t ldb, double* x, int64_t ldx,
+                                double* rcond, double* ferr, double* berr,
+                                double* work, int64_t* iwork );
+int64_t LAPACKE_cppsvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs,
+                                lapack_complex_float* ap,
+                                lapack_complex_float* afp, char* equed,
+                                float* s, lapack_complex_float* b,
+                                int64_t ldb, lapack_complex_float* x,
+                                int64_t ldx, float* rcond, float* ferr,
+                                float* berr, lapack_complex_float* work,
+                                float* rwork );
+int64_t LAPACKE_zppsvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs,
+                                lapack_complex_double* ap,
+                                lapack_complex_double* afp, char* equed,
+                                double* s, lapack_complex_double* b,
+                                int64_t ldb, lapack_complex_double* x,
+                                int64_t ldx, double* rcond, double* ferr,
+                                double* berr, lapack_complex_double* work,
+                                double* rwork );
+
+int64_t LAPACKE_spptrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                float* ap );
+int64_t LAPACKE_dpptrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                double* ap );
+int64_t LAPACKE_cpptrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* ap );
+int64_t LAPACKE_zpptrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* ap );
+
+int64_t LAPACKE_spptri_work_64( int matrix_layout, char uplo, int64_t n,
+                                float* ap );
+int64_t LAPACKE_dpptri_work_64( int matrix_layout, char uplo, int64_t n,
+                                double* ap );
+int64_t LAPACKE_cpptri_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* ap );
+int64_t LAPACKE_zpptri_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* ap );
+
+int64_t LAPACKE_spptrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const float* ap, float* b,
+                                int64_t ldb );
+int64_t LAPACKE_dpptrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const double* ap, double* b,
+                                int64_t ldb );
+int64_t LAPACKE_cpptrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* ap,
+                                lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zpptrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs,
+                                const lapack_complex_double* ap,
+                                lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_spstrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                float* a, int64_t lda, int64_t* piv,
+                                int64_t* rank, float tol, float* work );
+int64_t LAPACKE_dpstrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                double* a, int64_t lda, int64_t* piv,
+                                int64_t* rank, double tol, double* work );
+int64_t LAPACKE_cpstrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                int64_t* piv, int64_t* rank, float tol,
+                                float* work );
+int64_t LAPACKE_zpstrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                int64_t* piv, int64_t* rank, double tol,
+                                double* work );
+
+int64_t LAPACKE_sptcon_work_64( int64_t n, const float* d, const float* e,
+                                float anorm, float* rcond, float* work );
+int64_t LAPACKE_dptcon_work_64( int64_t n, const double* d, const double* e,
+                                double anorm, double* rcond, double* work );
+int64_t LAPACKE_cptcon_work_64( int64_t n, const float* d,
+                                const lapack_complex_float* e, float anorm,
+                                float* rcond, float* work );
+int64_t LAPACKE_zptcon_work_64( int64_t n, const double* d,
+                                const lapack_complex_double* e, double anorm,
+                                double* rcond, double* work );
+
+int64_t LAPACKE_spteqr_work_64( int matrix_layout, char compz, int64_t n,
+                                float* d, float* e, float* z, int64_t ldz,
+                                float* work );
+int64_t LAPACKE_dpteqr_work_64( int matrix_layout, char compz, int64_t n,
+                                double* d, double* e, double* z, int64_t ldz,
+                                double* work );
+int64_t LAPACKE_cpteqr_work_64( int matrix_layout, char compz, int64_t n,
+                                float* d, float* e, lapack_complex_float* z,
+                                int64_t ldz, float* work );
+int64_t LAPACKE_zpteqr_work_64( int matrix_layout, char compz, int64_t n,
+                                double* d, double* e, lapack_complex_double* z,
+                                int64_t ldz, double* work );
+
+int64_t LAPACKE_sptrfs_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                                const float* d, const float* e, const float* df,
+                                const float* ef, const float* b, int64_t ldb,
+                                float* x, int64_t ldx, float* ferr,
+                                float* berr, float* work );
+int64_t LAPACKE_dptrfs_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                                const double* d, const double* e,
+                                const double* df, const double* ef,
+                                const double* b, int64_t ldb, double* x,
+                                int64_t ldx, double* ferr, double* berr,
+                                double* work );
+int64_t LAPACKE_cptrfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const float* d,
+                                const lapack_complex_float* e, const float* df,
+                                const lapack_complex_float* ef,
+                                const lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* x, int64_t ldx,
+                                float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zptrfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const double* d,
+                                const lapack_complex_double* e,
+                                const double* df,
+                                const lapack_complex_double* ef,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_sptsv_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                               float* d, float* e, float* b, int64_t ldb );
+int64_t LAPACKE_dptsv_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                               double* d, double* e, double* b,
+                               int64_t ldb );
+int64_t LAPACKE_cptsv_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                               float* d, lapack_complex_float* e,
+                               lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zptsv_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                               double* d, lapack_complex_double* e,
+                               lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_sptsvx_work_64( int matrix_layout, char fact, int64_t n,
+                                int64_t nrhs, const float* d, const float* e,
+                                float* df, float* ef, const float* b,
+                                int64_t ldb, float* x, int64_t ldx,
+                                float* rcond, float* ferr, float* berr,
+                                float* work );
+int64_t LAPACKE_dptsvx_work_64( int matrix_layout, char fact, int64_t n,
+                                int64_t nrhs, const double* d,
+                                const double* e, double* df, double* ef,
+                                const double* b, int64_t ldb, double* x,
+                                int64_t ldx, double* rcond, double* ferr,
+                                double* berr, double* work );
+int64_t LAPACKE_cptsvx_work_64( int matrix_layout, char fact, int64_t n,
+                                int64_t nrhs, const float* d,
+                                const lapack_complex_float* e, float* df,
+                                lapack_complex_float* ef,
+                                const lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* x, int64_t ldx,
+                                float* rcond, float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zptsvx_work_64( int matrix_layout, char fact, int64_t n,
+                                int64_t nrhs, const double* d,
+                                const lapack_complex_double* e, double* df,
+                                lapack_complex_double* ef,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* rcond, double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_spttrf_work_64( int64_t n, float* d, float* e );
+int64_t LAPACKE_dpttrf_work_64( int64_t n, double* d, double* e );
+int64_t LAPACKE_cpttrf_work_64( int64_t n, float* d,
+                                lapack_complex_float* e );
+int64_t LAPACKE_zpttrf_work_64( int64_t n, double* d,
+                                lapack_complex_double* e );
+
+int64_t LAPACKE_spttrs_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                                const float* d, const float* e, float* b,
+                                int64_t ldb );
+int64_t LAPACKE_dpttrs_work_64( int matrix_layout, int64_t n, int64_t nrhs,
+                                const double* d, const double* e, double* b,
+                                int64_t ldb );
+int64_t LAPACKE_cpttrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const float* d,
+                                const lapack_complex_float* e,
+                                lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zpttrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const double* d,
+                                const lapack_complex_double* e,
+                                lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_ssbev_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, int64_t kd, float* ab,
+                               int64_t ldab, float* w, float* z,
+                               int64_t ldz, float* work );
+int64_t LAPACKE_dsbev_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, int64_t kd, double* ab,
+                               int64_t ldab, double* w, double* z,
+                               int64_t ldz, double* work );
+
+int64_t LAPACKE_ssbevd_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, int64_t kd, float* ab,
+                                int64_t ldab, float* w, float* z,
+                                int64_t ldz, float* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_dsbevd_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, int64_t kd, double* ab,
+                                int64_t ldab, double* w, double* z,
+                                int64_t ldz, double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_ssbevx_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, int64_t kd,
+                                float* ab, int64_t ldab, float* q,
+                                int64_t ldq, float vl, float vu,
+                                int64_t il, int64_t iu, float abstol,
+                                int64_t* m, float* w, float* z,
+                                int64_t ldz, float* work,
+                                int64_t* iwork, int64_t* ifail );
+int64_t LAPACKE_dsbevx_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, int64_t kd,
+                                double* ab, int64_t ldab, double* q,
+                                int64_t ldq, double vl, double vu,
+                                int64_t il, int64_t iu, double abstol,
+                                int64_t* m, double* w, double* z,
+                                int64_t ldz, double* work,
+                                int64_t* iwork, int64_t* ifail );
+
+int64_t LAPACKE_ssbgst_work_64( int matrix_layout, char vect, char uplo,
+                                int64_t n, int64_t ka, int64_t kb,
+                                float* ab, int64_t ldab, const float* bb,
+                                int64_t ldbb, float* x, int64_t ldx,
+                                float* work );
+int64_t LAPACKE_dsbgst_work_64( int matrix_layout, char vect, char uplo,
+                                int64_t n, int64_t ka, int64_t kb,
+                                double* ab, int64_t ldab, const double* bb,
+                                int64_t ldbb, double* x, int64_t ldx,
+                                double* work );
+
+int64_t LAPACKE_ssbgv_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, int64_t ka, int64_t kb,
+                               float* ab, int64_t ldab, float* bb,
+                               int64_t ldbb, float* w, float* z,
+                               int64_t ldz, float* work );
+int64_t LAPACKE_dsbgv_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, int64_t ka, int64_t kb,
+                               double* ab, int64_t ldab, double* bb,
+                               int64_t ldbb, double* w, double* z,
+                               int64_t ldz, double* work );
+
+int64_t LAPACKE_ssbgvd_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, int64_t ka, int64_t kb,
+                                float* ab, int64_t ldab, float* bb,
+                                int64_t ldbb, float* w, float* z,
+                                int64_t ldz, float* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_dsbgvd_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, int64_t ka, int64_t kb,
+                                double* ab, int64_t ldab, double* bb,
+                                int64_t ldbb, double* w, double* z,
+                                int64_t ldz, double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_ssbgvx_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, int64_t ka,
+                                int64_t kb, float* ab, int64_t ldab,
+                                float* bb, int64_t ldbb, float* q,
+                                int64_t ldq, float vl, float vu,
+                                int64_t il, int64_t iu, float abstol,
+                                int64_t* m, float* w, float* z,
+                                int64_t ldz, float* work, int64_t* iwork,
+                                int64_t* ifail );
+int64_t LAPACKE_dsbgvx_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, int64_t ka,
+                                int64_t kb, double* ab, int64_t ldab,
+                                double* bb, int64_t ldbb, double* q,
+                                int64_t ldq, double vl, double vu,
+                                int64_t il, int64_t iu, double abstol,
+                                int64_t* m, double* w, double* z,
+                                int64_t ldz, double* work, int64_t* iwork,
+                                int64_t* ifail );
+
+int64_t LAPACKE_ssbtrd_work_64( int matrix_layout, char vect, char uplo,
+                                int64_t n, int64_t kd, float* ab,
+                                int64_t ldab, float* d, float* e, float* q,
+                                int64_t ldq, float* work );
+int64_t LAPACKE_dsbtrd_work_64( int matrix_layout, char vect, char uplo,
+                                int64_t n, int64_t kd, double* ab,
+                                int64_t ldab, double* d, double* e,
+                                double* q, int64_t ldq, double* work );
+
+int64_t LAPACKE_ssfrk_work_64( int matrix_layout, char transr, char uplo,
+                               char trans, int64_t n, int64_t k,
+                               float alpha, const float* a, int64_t lda,
+                               float beta, float* c );
+int64_t LAPACKE_dsfrk_work_64( int matrix_layout, char transr, char uplo,
+                               char trans, int64_t n, int64_t k,
+                               double alpha, const double* a, int64_t lda,
+                               double beta, double* c );
+
+int64_t LAPACKE_sspcon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const float* ap, const int64_t* ipiv,
+                                float anorm, float* rcond, float* work,
+                                int64_t* iwork );
+int64_t LAPACKE_dspcon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const double* ap, const int64_t* ipiv,
+                                double anorm, double* rcond, double* work,
+                                int64_t* iwork );
+int64_t LAPACKE_cspcon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_float* ap,
+                                const int64_t* ipiv, float anorm,
+                                float* rcond, lapack_complex_float* work );
+int64_t LAPACKE_zspcon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_double* ap,
+                                const int64_t* ipiv, double anorm,
+                                double* rcond, lapack_complex_double* work );
+
+int64_t LAPACKE_sspev_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, float* ap, float* w, float* z,
+                               int64_t ldz, float* work );
+int64_t LAPACKE_dspev_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, double* ap, double* w, double* z,
+                               int64_t ldz, double* work );
+
+int64_t LAPACKE_sspevd_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, float* ap, float* w, float* z,
+                                int64_t ldz, float* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_dspevd_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, double* ap, double* w, double* z,
+                                int64_t ldz, double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_sspevx_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, float* ap, float vl,
+                                float vu, int64_t il, int64_t iu,
+                                float abstol, int64_t* m, float* w, float* z,
+                                int64_t ldz, float* work, int64_t* iwork,
+                                int64_t* ifail );
+int64_t LAPACKE_dspevx_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, double* ap, double vl,
+                                double vu, int64_t il, int64_t iu,
+                                double abstol, int64_t* m, double* w,
+                                double* z, int64_t ldz, double* work,
+                                int64_t* iwork, int64_t* ifail );
+
+int64_t LAPACKE_sspgst_work_64( int matrix_layout, int64_t itype, char uplo,
+                                int64_t n, float* ap, const float* bp );
+int64_t LAPACKE_dspgst_work_64( int matrix_layout, int64_t itype, char uplo,
+                                int64_t n, double* ap, const double* bp );
+
+int64_t LAPACKE_sspgv_work_64( int matrix_layout, int64_t itype, char jobz,
+                               char uplo, int64_t n, float* ap, float* bp,
+                               float* w, float* z, int64_t ldz,
+                               float* work );
+int64_t LAPACKE_dspgv_work_64( int matrix_layout, int64_t itype, char jobz,
+                               char uplo, int64_t n, double* ap, double* bp,
+                               double* w, double* z, int64_t ldz,
+                               double* work );
+
+int64_t LAPACKE_sspgvd_work_64( int matrix_layout, int64_t itype, char jobz,
+                                char uplo, int64_t n, float* ap, float* bp,
+                                float* w, float* z, int64_t ldz, float* work,
+                                int64_t lwork, int64_t* iwork,
+                                int64_t liwork );
+int64_t LAPACKE_dspgvd_work_64( int matrix_layout, int64_t itype, char jobz,
+                                char uplo, int64_t n, double* ap, double* bp,
+                                double* w, double* z, int64_t ldz,
+                                double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_sspgvx_work_64( int matrix_layout, int64_t itype, char jobz,
+                                char range, char uplo, int64_t n, float* ap,
+                                float* bp, float vl, float vu, int64_t il,
+                                int64_t iu, float abstol, int64_t* m,
+                                float* w, float* z, int64_t ldz, float* work,
+                                int64_t* iwork, int64_t* ifail );
+int64_t LAPACKE_dspgvx_work_64( int matrix_layout, int64_t itype, char jobz,
+                                char range, char uplo, int64_t n, double* ap,
+                                double* bp, double vl, double vu, int64_t il,
+                                int64_t iu, double abstol, int64_t* m,
+                                double* w, double* z, int64_t ldz,
+                                double* work, int64_t* iwork,
+                                int64_t* ifail );
+
+int64_t LAPACKE_ssprfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const float* ap,
+                                const float* afp, const int64_t* ipiv,
+                                const float* b, int64_t ldb, float* x,
+                                int64_t ldx, float* ferr, float* berr,
+                                float* work, int64_t* iwork );
+int64_t LAPACKE_dsprfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const double* ap,
+                                const double* afp, const int64_t* ipiv,
+                                const double* b, int64_t ldb, double* x,
+                                int64_t ldx, double* ferr, double* berr,
+                                double* work, int64_t* iwork );
+int64_t LAPACKE_csprfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* ap,
+                                const lapack_complex_float* afp,
+                                const int64_t* ipiv,
+                                const lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* x, int64_t ldx,
+                                float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zsprfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs,
+                                const lapack_complex_double* ap,
+                                const lapack_complex_double* afp,
+                                const int64_t* ipiv,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_sspsv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, float* ap, int64_t* ipiv,
+                               float* b, int64_t ldb );
+int64_t LAPACKE_dspsv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, double* ap, int64_t* ipiv,
+                               double* b, int64_t ldb );
+int64_t LAPACKE_cspsv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_float* ap,
+                               int64_t* ipiv, lapack_complex_float* b,
+                               int64_t ldb );
+int64_t LAPACKE_zspsv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_double* ap,
+                               int64_t* ipiv, lapack_complex_double* b,
+                               int64_t ldb );
+
+int64_t LAPACKE_sspsvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs, const float* ap,
+                                float* afp, int64_t* ipiv, const float* b,
+                                int64_t ldb, float* x, int64_t ldx,
+                                float* rcond, float* ferr, float* berr,
+                                float* work, int64_t* iwork );
+int64_t LAPACKE_dspsvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs, const double* ap,
+                                double* afp, int64_t* ipiv, const double* b,
+                                int64_t ldb, double* x, int64_t ldx,
+                                double* rcond, double* ferr, double* berr,
+                                double* work, int64_t* iwork );
+int64_t LAPACKE_cspsvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs,
+                                const lapack_complex_float* ap,
+                                lapack_complex_float* afp, int64_t* ipiv,
+                                const lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* x, int64_t ldx,
+                                float* rcond, float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zspsvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs,
+                                const lapack_complex_double* ap,
+                                lapack_complex_double* afp, int64_t* ipiv,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* rcond, double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_ssptrd_work_64( int matrix_layout, char uplo, int64_t n,
+                                float* ap, float* d, float* e, float* tau );
+int64_t LAPACKE_dsptrd_work_64( int matrix_layout, char uplo, int64_t n,
+                                double* ap, double* d, double* e, double* tau );
+
+int64_t LAPACKE_ssptrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                float* ap, int64_t* ipiv );
+int64_t LAPACKE_dsptrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                double* ap, int64_t* ipiv );
+int64_t LAPACKE_csptrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* ap, int64_t* ipiv );
+int64_t LAPACKE_zsptrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* ap, int64_t* ipiv );
+
+int64_t LAPACKE_ssptri_work_64( int matrix_layout, char uplo, int64_t n,
+                                float* ap, const int64_t* ipiv,
+                                float* work );
+int64_t LAPACKE_dsptri_work_64( int matrix_layout, char uplo, int64_t n,
+                                double* ap, const int64_t* ipiv,
+                                double* work );
+int64_t LAPACKE_csptri_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* ap,
+                                const int64_t* ipiv,
+                                lapack_complex_float* work );
+int64_t LAPACKE_zsptri_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* ap,
+                                const int64_t* ipiv,
+                                lapack_complex_double* work );
+
+int64_t LAPACKE_ssptrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const float* ap,
+                                const int64_t* ipiv, float* b,
+                                int64_t ldb );
+int64_t LAPACKE_dsptrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const double* ap,
+                                const int64_t* ipiv, double* b,
+                                int64_t ldb );
+int64_t LAPACKE_csptrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* ap,
+                                const int64_t* ipiv, lapack_complex_float* b,
+                                int64_t ldb );
+int64_t LAPACKE_zsptrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs,
+                                const lapack_complex_double* ap,
+                                const int64_t* ipiv,
+                                lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_sstebz_work_64( char range, char order, int64_t n, float vl,
+                                float vu, int64_t il, int64_t iu,
+                                float abstol, const float* d, const float* e,
+                                int64_t* m, int64_t* nsplit, float* w,
+                                int64_t* iblock, int64_t* isplit,
+                                float* work, int64_t* iwork );
+int64_t LAPACKE_dstebz_work_64( char range, char order, int64_t n, double vl,
+                                double vu, int64_t il, int64_t iu,
+                                double abstol, const double* d, const double* e,
+                                int64_t* m, int64_t* nsplit, double* w,
+                                int64_t* iblock, int64_t* isplit,
+                                double* work, int64_t* iwork );
+
+int64_t LAPACKE_sstedc_work_64( int matrix_layout, char compz, int64_t n,
+                                float* d, float* e, float* z, int64_t ldz,
+                                float* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_dstedc_work_64( int matrix_layout, char compz, int64_t n,
+                                double* d, double* e, double* z, int64_t ldz,
+                                double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_cstedc_work_64( int matrix_layout, char compz, int64_t n,
+                                float* d, float* e, lapack_complex_float* z,
+                                int64_t ldz, lapack_complex_float* work,
+                                int64_t lwork, float* rwork,
+                                int64_t lrwork, int64_t* iwork,
+                                int64_t liwork );
+int64_t LAPACKE_zstedc_work_64( int matrix_layout, char compz, int64_t n,
+                                double* d, double* e, lapack_complex_double* z,
+                                int64_t ldz, lapack_complex_double* work,
+                                int64_t lwork, double* rwork,
+                                int64_t lrwork, int64_t* iwork,
+                                int64_t liwork );
+
+int64_t LAPACKE_sstegr_work_64( int matrix_layout, char jobz, char range,
+                                int64_t n, float* d, float* e, float vl,
+                                float vu, int64_t il, int64_t iu,
+                                float abstol, int64_t* m, float* w, float* z,
+                                int64_t ldz, int64_t* isuppz, float* work,
+                                int64_t lwork, int64_t* iwork,
+                                int64_t liwork );
+int64_t LAPACKE_dstegr_work_64( int matrix_layout, char jobz, char range,
+                                int64_t n, double* d, double* e, double vl,
+                                double vu, int64_t il, int64_t iu,
+                                double abstol, int64_t* m, double* w,
+                                double* z, int64_t ldz, int64_t* isuppz,
+                                double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_cstegr_work_64( int matrix_layout, char jobz, char range,
+                                int64_t n, float* d, float* e, float vl,
+                                float vu, int64_t il, int64_t iu,
+                                float abstol, int64_t* m, float* w,
+                                lapack_complex_float* z, int64_t ldz,
+                                int64_t* isuppz, float* work,
+                                int64_t lwork, int64_t* iwork,
+                                int64_t liwork );
+int64_t LAPACKE_zstegr_work_64( int matrix_layout, char jobz, char range,
+                                int64_t n, double* d, double* e, double vl,
+                                double vu, int64_t il, int64_t iu,
+                                double abstol, int64_t* m, double* w,
+                                lapack_complex_double* z, int64_t ldz,
+                                int64_t* isuppz, double* work,
+                                int64_t lwork, int64_t* iwork,
+                                int64_t liwork );
+
+int64_t LAPACKE_sstein_work_64( int matrix_layout, int64_t n, const float* d,
+                                const float* e, int64_t m, const float* w,
+                                const int64_t* iblock,
+                                const int64_t* isplit, float* z,
+                                int64_t ldz, float* work, int64_t* iwork,
+                                int64_t* ifailv );
+int64_t LAPACKE_dstein_work_64( int matrix_layout, int64_t n, const double* d,
+                                const double* e, int64_t m, const double* w,
+                                const int64_t* iblock,
+                                const int64_t* isplit, double* z,
+                                int64_t ldz, double* work, int64_t* iwork,
+                                int64_t* ifailv );
+int64_t LAPACKE_cstein_work_64( int matrix_layout, int64_t n, const float* d,
+                                const float* e, int64_t m, const float* w,
+                                const int64_t* iblock,
+                                const int64_t* isplit,
+                                lapack_complex_float* z, int64_t ldz,
+                                float* work, int64_t* iwork,
+                                int64_t* ifailv );
+int64_t LAPACKE_zstein_work_64( int matrix_layout, int64_t n, const double* d,
+                                const double* e, int64_t m, const double* w,
+                                const int64_t* iblock,
+                                const int64_t* isplit,
+                                lapack_complex_double* z, int64_t ldz,
+                                double* work, int64_t* iwork,
+                                int64_t* ifailv );
+
+int64_t LAPACKE_sstemr_work_64( int matrix_layout, char jobz, char range,
+                                int64_t n, float* d, float* e, float vl,
+                                float vu, int64_t il, int64_t iu,
+                                int64_t* m, float* w, float* z,
+                                int64_t ldz, int64_t nzc,
+                                int64_t* isuppz, lapack_logical* tryrac,
+                                float* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_dstemr_work_64( int matrix_layout, char jobz, char range,
+                                int64_t n, double* d, double* e, double vl,
+                                double vu, int64_t il, int64_t iu,
+                                int64_t* m, double* w, double* z,
+                                int64_t ldz, int64_t nzc,
+                                int64_t* isuppz, lapack_logical* tryrac,
+                                double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_cstemr_work_64( int matrix_layout, char jobz, char range,
+                                int64_t n, float* d, float* e, float vl,
+                                float vu, int64_t il, int64_t iu,
+                                int64_t* m, float* w,
+                                lapack_complex_float* z, int64_t ldz,
+                                int64_t nzc, int64_t* isuppz,
+                                lapack_logical* tryrac, float* work,
+                                int64_t lwork, int64_t* iwork,
+                                int64_t liwork );
+int64_t LAPACKE_zstemr_work_64( int matrix_layout, char jobz, char range,
+                                int64_t n, double* d, double* e, double vl,
+                                double vu, int64_t il, int64_t iu,
+                                int64_t* m, double* w,
+                                lapack_complex_double* z, int64_t ldz,
+                                int64_t nzc, int64_t* isuppz,
+                                lapack_logical* tryrac, double* work,
+                                int64_t lwork, int64_t* iwork,
+                                int64_t liwork );
+
+int64_t LAPACKE_ssteqr_work_64( int matrix_layout, char compz, int64_t n,
+                                float* d, float* e, float* z, int64_t ldz,
+                                float* work );
+int64_t LAPACKE_dsteqr_work_64( int matrix_layout, char compz, int64_t n,
+                                double* d, double* e, double* z, int64_t ldz,
+                                double* work );
+int64_t LAPACKE_csteqr_work_64( int matrix_layout, char compz, int64_t n,
+                                float* d, float* e, lapack_complex_float* z,
+                                int64_t ldz, float* work );
+int64_t LAPACKE_zsteqr_work_64( int matrix_layout, char compz, int64_t n,
+                                double* d, double* e, lapack_complex_double* z,
+                                int64_t ldz, double* work );
+
+int64_t LAPACKE_ssterf_work_64( int64_t n, float* d, float* e );
+int64_t LAPACKE_dsterf_work_64( int64_t n, double* d, double* e );
+
+int64_t LAPACKE_sstev_work_64( int matrix_layout, char jobz, int64_t n,
+                               float* d, float* e, float* z, int64_t ldz,
+                               float* work );
+int64_t LAPACKE_dstev_work_64( int matrix_layout, char jobz, int64_t n,
+                               double* d, double* e, double* z, int64_t ldz,
+                               double* work );
+
+int64_t LAPACKE_sstevd_work_64( int matrix_layout, char jobz, int64_t n,
+                                float* d, float* e, float* z, int64_t ldz,
+                                float* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_dstevd_work_64( int matrix_layout, char jobz, int64_t n,
+                                double* d, double* e, double* z, int64_t ldz,
+                                double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_sstevr_work_64( int matrix_layout, char jobz, char range,
+                                int64_t n, float* d, float* e, float vl,
+                                float vu, int64_t il, int64_t iu,
+                                float abstol, int64_t* m, float* w, float* z,
+                                int64_t ldz, int64_t* isuppz, float* work,
+                                int64_t lwork, int64_t* iwork,
+                                int64_t liwork );
+int64_t LAPACKE_dstevr_work_64( int matrix_layout, char jobz, char range,
+                                int64_t n, double* d, double* e, double vl,
+                                double vu, int64_t il, int64_t iu,
+                                double abstol, int64_t* m, double* w,
+                                double* z, int64_t ldz, int64_t* isuppz,
+                                double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_sstevx_work_64( int matrix_layout, char jobz, char range,
+                                int64_t n, float* d, float* e, float vl,
+                                float vu, int64_t il, int64_t iu,
+                                float abstol, int64_t* m, float* w, float* z,
+                                int64_t ldz, float* work, int64_t* iwork,
+                                int64_t* ifail );
+int64_t LAPACKE_dstevx_work_64( int matrix_layout, char jobz, char range,
+                                int64_t n, double* d, double* e, double vl,
+                                double vu, int64_t il, int64_t iu,
+                                double abstol, int64_t* m, double* w,
+                                double* z, int64_t ldz, double* work,
+                                int64_t* iwork, int64_t* ifail );
+
+int64_t LAPACKE_ssycon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const float* a, int64_t lda,
+                                const int64_t* ipiv, float anorm,
+                                float* rcond, float* work, int64_t* iwork );
+int64_t LAPACKE_dsycon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const double* a, int64_t lda,
+                                const int64_t* ipiv, double anorm,
+                                double* rcond, double* work,
+                                int64_t* iwork );
+int64_t LAPACKE_csycon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_float* a, int64_t lda,
+                                const int64_t* ipiv, float anorm,
+                                float* rcond, lapack_complex_float* work );
+int64_t LAPACKE_zsycon_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_double* a, int64_t lda,
+                                const int64_t* ipiv, double anorm,
+                                double* rcond, lapack_complex_double* work );
+
+int64_t LAPACKE_ssyequb_work_64( int matrix_layout, char uplo, int64_t n,
+                                 const float* a, int64_t lda, float* s,
+                                 float* scond, float* amax, float* work );
+int64_t LAPACKE_dsyequb_work_64( int matrix_layout, char uplo, int64_t n,
+                                 const double* a, int64_t lda, double* s,
+                                 double* scond, double* amax, double* work );
+int64_t LAPACKE_csyequb_work_64( int matrix_layout, char uplo, int64_t n,
+                                 const lapack_complex_float* a, int64_t lda,
+                                 float* s, float* scond, float* amax,
+                                 lapack_complex_float* work );
+int64_t LAPACKE_zsyequb_work_64( int matrix_layout, char uplo, int64_t n,
+                                 const lapack_complex_double* a, int64_t lda,
+                                 double* s, double* scond, double* amax,
+                                 lapack_complex_double* work );
+
+int64_t LAPACKE_ssyev_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, float* a, int64_t lda, float* w,
+                               float* work, int64_t lwork );
+int64_t LAPACKE_dsyev_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, double* a, int64_t lda,
+                               double* w, double* work, int64_t lwork );
+
+int64_t LAPACKE_ssyevd_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, float* a, int64_t lda,
+                                float* w, float* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_dsyevd_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, double* a, int64_t lda,
+                                double* w, double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_ssyevr_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, float* a,
+                                int64_t lda, float vl, float vu,
+                                int64_t il, int64_t iu, float abstol,
+                                int64_t* m, float* w, float* z,
+                                int64_t ldz, int64_t* isuppz, float* work,
+                                int64_t lwork, int64_t* iwork,
+                                int64_t liwork );
+int64_t LAPACKE_dsyevr_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, double* a,
+                                int64_t lda, double vl, double vu,
+                                int64_t il, int64_t iu, double abstol,
+                                int64_t* m, double* w, double* z,
+                                int64_t ldz, int64_t* isuppz,
+                                double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_ssyevx_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, float* a,
+                                int64_t lda, float vl, float vu,
+                                int64_t il, int64_t iu, float abstol,
+                                int64_t* m, float* w, float* z,
+                                int64_t ldz, float* work, int64_t lwork,
+                                int64_t* iwork, int64_t* ifail );
+int64_t LAPACKE_dsyevx_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, double* a,
+                                int64_t lda, double vl, double vu,
+                                int64_t il, int64_t iu, double abstol,
+                                int64_t* m, double* w, double* z,
+                                int64_t ldz, double* work, int64_t lwork,
+                                int64_t* iwork, int64_t* ifail );
+
+int64_t LAPACKE_ssygst_work_64( int matrix_layout, int64_t itype, char uplo,
+                                int64_t n, float* a, int64_t lda,
+                                const float* b, int64_t ldb );
+int64_t LAPACKE_dsygst_work_64( int matrix_layout, int64_t itype, char uplo,
+                                int64_t n, double* a, int64_t lda,
+                                const double* b, int64_t ldb );
+
+int64_t LAPACKE_ssygv_work_64( int matrix_layout, int64_t itype, char jobz,
+                               char uplo, int64_t n, float* a,
+                               int64_t lda, float* b, int64_t ldb,
+                               float* w, float* work, int64_t lwork );
+int64_t LAPACKE_dsygv_work_64( int matrix_layout, int64_t itype, char jobz,
+                               char uplo, int64_t n, double* a,
+                               int64_t lda, double* b, int64_t ldb,
+                               double* w, double* work, int64_t lwork );
+
+int64_t LAPACKE_ssygvd_work_64( int matrix_layout, int64_t itype, char jobz,
+                                char uplo, int64_t n, float* a,
+                                int64_t lda, float* b, int64_t ldb,
+                                float* w, float* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_dsygvd_work_64( int matrix_layout, int64_t itype, char jobz,
+                                char uplo, int64_t n, double* a,
+                                int64_t lda, double* b, int64_t ldb,
+                                double* w, double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_ssygvx_work_64( int matrix_layout, int64_t itype, char jobz,
+                                char range, char uplo, int64_t n, float* a,
+                                int64_t lda, float* b, int64_t ldb,
+                                float vl, float vu, int64_t il,
+                                int64_t iu, float abstol, int64_t* m,
+                                float* w, float* z, int64_t ldz, float* work,
+                                int64_t lwork, int64_t* iwork,
+                                int64_t* ifail );
+int64_t LAPACKE_dsygvx_work_64( int matrix_layout, int64_t itype, char jobz,
+                                char range, char uplo, int64_t n, double* a,
+                                int64_t lda, double* b, int64_t ldb,
+                                double vl, double vu, int64_t il,
+                                int64_t iu, double abstol, int64_t* m,
+                                double* w, double* z, int64_t ldz,
+                                double* work, int64_t lwork,
+                                int64_t* iwork, int64_t* ifail );
+
+int64_t LAPACKE_ssyrfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const float* a, int64_t lda,
+                                const float* af, int64_t ldaf,
+                                const int64_t* ipiv, const float* b,
+                                int64_t ldb, float* x, int64_t ldx,
+                                float* ferr, float* berr, float* work,
+                                int64_t* iwork );
+int64_t LAPACKE_dsyrfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const double* a,
+                                int64_t lda, const double* af,
+                                int64_t ldaf, const int64_t* ipiv,
+                                const double* b, int64_t ldb, double* x,
+                                int64_t ldx, double* ferr, double* berr,
+                                double* work, int64_t* iwork );
+int64_t LAPACKE_csyrfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* a,
+                                int64_t lda, const lapack_complex_float* af,
+                                int64_t ldaf, const int64_t* ipiv,
+                                const lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* x, int64_t ldx,
+                                float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_zsyrfs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_double* a,
+                                int64_t lda, const lapack_complex_double* af,
+                                int64_t ldaf, const int64_t* ipiv,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_ssyrfsx_work_64( int matrix_layout, char uplo, char equed,
+                                 int64_t n, int64_t nrhs, const float* a,
+                                 int64_t lda, const float* af,
+                                 int64_t ldaf, const int64_t* ipiv,
+                                 const float* s, const float* b, int64_t ldb,
+                                 float* x, int64_t ldx, float* rcond,
+                                 float* berr, int64_t n_err_bnds,
+                                 float* err_bnds_norm, float* err_bnds_comp,
+                                 int64_t nparams, float* params, float* work,
+                                 int64_t* iwork );
+int64_t LAPACKE_dsyrfsx_work_64( int matrix_layout, char uplo, char equed,
+                                 int64_t n, int64_t nrhs, const double* a,
+                                 int64_t lda, const double* af,
+                                 int64_t ldaf, const int64_t* ipiv,
+                                 const double* s, const double* b,
+                                 int64_t ldb, double* x, int64_t ldx,
+                                 double* rcond, double* berr,
+                                 int64_t n_err_bnds, double* err_bnds_norm,
+                                 double* err_bnds_comp, int64_t nparams,
+                                 double* params, double* work,
+                                 int64_t* iwork );
+int64_t LAPACKE_csyrfsx_work_64( int matrix_layout, char uplo, char equed,
+                                 int64_t n, int64_t nrhs,
+                                 const lapack_complex_float* a, int64_t lda,
+                                 const lapack_complex_float* af,
+                                 int64_t ldaf, const int64_t* ipiv,
+                                 const float* s, const lapack_complex_float* b,
+                                 int64_t ldb, lapack_complex_float* x,
+                                 int64_t ldx, float* rcond, float* berr,
+                                 int64_t n_err_bnds, float* err_bnds_norm,
+                                 float* err_bnds_comp, int64_t nparams,
+                                 float* params, lapack_complex_float* work,
+                                 float* rwork );
+int64_t LAPACKE_zsyrfsx_work_64( int matrix_layout, char uplo, char equed,
+                                 int64_t n, int64_t nrhs,
+                                 const lapack_complex_double* a, int64_t lda,
+                                 const lapack_complex_double* af,
+                                 int64_t ldaf, const int64_t* ipiv,
+                                 const double* s,
+                                 const lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* x, int64_t ldx,
+                                 double* rcond, double* berr,
+                                 int64_t n_err_bnds, double* err_bnds_norm,
+                                 double* err_bnds_comp, int64_t nparams,
+                                 double* params, lapack_complex_double* work,
+                                 double* rwork );
+
+int64_t LAPACKE_ssysv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, float* a, int64_t lda,
+                               int64_t* ipiv, float* b, int64_t ldb,
+                               float* work, int64_t lwork );
+int64_t LAPACKE_dsysv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, double* a, int64_t lda,
+                               int64_t* ipiv, double* b, int64_t ldb,
+                               double* work, int64_t lwork );
+int64_t LAPACKE_csysv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_float* a,
+                               int64_t lda, int64_t* ipiv,
+                               lapack_complex_float* b, int64_t ldb,
+                               lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zsysv_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_double* a,
+                               int64_t lda, int64_t* ipiv,
+                               lapack_complex_double* b, int64_t ldb,
+                               lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_ssysvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs, const float* a,
+                                int64_t lda, float* af, int64_t ldaf,
+                                int64_t* ipiv, const float* b,
+                                int64_t ldb, float* x, int64_t ldx,
+                                float* rcond, float* ferr, float* berr,
+                                float* work, int64_t lwork,
+                                int64_t* iwork );
+int64_t LAPACKE_dsysvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs, const double* a,
+                                int64_t lda, double* af, int64_t ldaf,
+                                int64_t* ipiv, const double* b,
+                                int64_t ldb, double* x, int64_t ldx,
+                                double* rcond, double* ferr, double* berr,
+                                double* work, int64_t lwork,
+                                int64_t* iwork );
+int64_t LAPACKE_csysvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs,
+                                const lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* af, int64_t ldaf,
+                                int64_t* ipiv, const lapack_complex_float* b,
+                                int64_t ldb, lapack_complex_float* x,
+                                int64_t ldx, float* rcond, float* ferr,
+                                float* berr, lapack_complex_float* work,
+                                int64_t lwork, float* rwork );
+int64_t LAPACKE_zsysvx_work_64( int matrix_layout, char fact, char uplo,
+                                int64_t n, int64_t nrhs,
+                                const lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* af, int64_t ldaf,
+                                int64_t* ipiv,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* x, int64_t ldx,
+                                double* rcond, double* ferr, double* berr,
+                                lapack_complex_double* work, int64_t lwork,
+                                double* rwork );
+
+int64_t LAPACKE_ssysvxx_work_64( int matrix_layout, char fact, char uplo,
+                                 int64_t n, int64_t nrhs, float* a,
+                                 int64_t lda, float* af, int64_t ldaf,
+                                 int64_t* ipiv, char* equed, float* s,
+                                 float* b, int64_t ldb, float* x,
+                                 int64_t ldx, float* rcond, float* rpvgrw,
+                                 float* berr, int64_t n_err_bnds,
+                                 float* err_bnds_norm, float* err_bnds_comp,
+                                 int64_t nparams, float* params, float* work,
+                                 int64_t* iwork );
+int64_t LAPACKE_dsysvxx_work_64( int matrix_layout, char fact, char uplo,
+                                 int64_t n, int64_t nrhs, double* a,
+                                 int64_t lda, double* af, int64_t ldaf,
+                                 int64_t* ipiv, char* equed, double* s,
+                                 double* b, int64_t ldb, double* x,
+                                 int64_t ldx, double* rcond, double* rpvgrw,
+                                 double* berr, int64_t n_err_bnds,
+                                 double* err_bnds_norm, double* err_bnds_comp,
+                                 int64_t nparams, double* params,
+                                 double* work, int64_t* iwork );
+int64_t LAPACKE_csysvxx_work_64( int matrix_layout, char fact, char uplo,
+                                 int64_t n, int64_t nrhs,
+                                 lapack_complex_float* a, int64_t lda,
+                                 lapack_complex_float* af, int64_t ldaf,
+                                 int64_t* ipiv, char* equed, float* s,
+                                 lapack_complex_float* b, int64_t ldb,
+                                 lapack_complex_float* x, int64_t ldx,
+                                 float* rcond, float* rpvgrw, float* berr,
+                                 int64_t n_err_bnds, float* err_bnds_norm,
+                                 float* err_bnds_comp, int64_t nparams,
+                                 float* params, lapack_complex_float* work,
+                                 float* rwork );
+int64_t LAPACKE_zsysvxx_work_64( int matrix_layout, char fact, char uplo,
+                                 int64_t n, int64_t nrhs,
+                                 lapack_complex_double* a, int64_t lda,
+                                 lapack_complex_double* af, int64_t ldaf,
+                                 int64_t* ipiv, char* equed, double* s,
+                                 lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* x, int64_t ldx,
+                                 double* rcond, double* rpvgrw, double* berr,
+                                 int64_t n_err_bnds, double* err_bnds_norm,
+                                 double* err_bnds_comp, int64_t nparams,
+                                 double* params, lapack_complex_double* work,
+                                 double* rwork );
+
+int64_t LAPACKE_ssytrd_work_64( int matrix_layout, char uplo, int64_t n,
+                                float* a, int64_t lda, float* d, float* e,
+                                float* tau, float* work, int64_t lwork );
+int64_t LAPACKE_dsytrd_work_64( int matrix_layout, char uplo, int64_t n,
+                                double* a, int64_t lda, double* d, double* e,
+                                double* tau, double* work, int64_t lwork );
+
+int64_t LAPACKE_ssytrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                float* a, int64_t lda, int64_t* ipiv,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dsytrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                double* a, int64_t lda, int64_t* ipiv,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_csytrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                int64_t* ipiv, lapack_complex_float* work,
+                                int64_t lwork );
+int64_t LAPACKE_zsytrf_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                int64_t* ipiv, lapack_complex_double* work,
+                                int64_t lwork );
+
+int64_t LAPACKE_ssytri_work_64( int matrix_layout, char uplo, int64_t n,
+                                float* a, int64_t lda,
+                                const int64_t* ipiv, float* work );
+int64_t LAPACKE_dsytri_work_64( int matrix_layout, char uplo, int64_t n,
+                                double* a, int64_t lda,
+                                const int64_t* ipiv, double* work );
+int64_t LAPACKE_csytri_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                const int64_t* ipiv,
+                                lapack_complex_float* work );
+int64_t LAPACKE_zsytri_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                const int64_t* ipiv,
+                                lapack_complex_double* work );
+
+int64_t LAPACKE_ssytrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const float* a, int64_t lda,
+                                const int64_t* ipiv, float* b,
+                                int64_t ldb );
+int64_t LAPACKE_dsytrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const double* a,
+                                int64_t lda, const int64_t* ipiv,
+                                double* b, int64_t ldb );
+int64_t LAPACKE_csytrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* a,
+                                int64_t lda, const int64_t* ipiv,
+                                lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zsytrs_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_double* a,
+                                int64_t lda, const int64_t* ipiv,
+                                lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_stbcon_work_64( int matrix_layout, char norm, char uplo,
+                                char diag, int64_t n, int64_t kd,
+                                const float* ab, int64_t ldab, float* rcond,
+                                float* work, int64_t* iwork );
+int64_t LAPACKE_dtbcon_work_64( int matrix_layout, char norm, char uplo,
+                                char diag, int64_t n, int64_t kd,
+                                const double* ab, int64_t ldab,
+                                double* rcond, double* work,
+                                int64_t* iwork );
+int64_t LAPACKE_ctbcon_work_64( int matrix_layout, char norm, char uplo,
+                                char diag, int64_t n, int64_t kd,
+                                const lapack_complex_float* ab, int64_t ldab,
+                                float* rcond, lapack_complex_float* work,
+                                float* rwork );
+int64_t LAPACKE_ztbcon_work_64( int matrix_layout, char norm, char uplo,
+                                char diag, int64_t n, int64_t kd,
+                                const lapack_complex_double* ab,
+                                int64_t ldab, double* rcond,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_stbrfs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t kd,
+                                int64_t nrhs, const float* ab,
+                                int64_t ldab, const float* b, int64_t ldb,
+                                const float* x, int64_t ldx, float* ferr,
+                                float* berr, float* work, int64_t* iwork );
+int64_t LAPACKE_dtbrfs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t kd,
+                                int64_t nrhs, const double* ab,
+                                int64_t ldab, const double* b,
+                                int64_t ldb, const double* x, int64_t ldx,
+                                double* ferr, double* berr, double* work,
+                                int64_t* iwork );
+int64_t LAPACKE_ctbrfs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t kd,
+                                int64_t nrhs, const lapack_complex_float* ab,
+                                int64_t ldab, const lapack_complex_float* b,
+                                int64_t ldb, const lapack_complex_float* x,
+                                int64_t ldx, float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_ztbrfs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t kd,
+                                int64_t nrhs,
+                                const lapack_complex_double* ab,
+                                int64_t ldab, const lapack_complex_double* b,
+                                int64_t ldb, const lapack_complex_double* x,
+                                int64_t ldx, double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_stbtrs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t kd,
+                                int64_t nrhs, const float* ab,
+                                int64_t ldab, float* b, int64_t ldb );
+int64_t LAPACKE_dtbtrs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t kd,
+                                int64_t nrhs, const double* ab,
+                                int64_t ldab, double* b, int64_t ldb );
+int64_t LAPACKE_ctbtrs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t kd,
+                                int64_t nrhs, const lapack_complex_float* ab,
+                                int64_t ldab, lapack_complex_float* b,
+                                int64_t ldb );
+int64_t LAPACKE_ztbtrs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t kd,
+                                int64_t nrhs,
+                                const lapack_complex_double* ab,
+                                int64_t ldab, lapack_complex_double* b,
+                                int64_t ldb );
+
+int64_t LAPACKE_stfsm_work_64( int matrix_layout, char transr, char side,
+                               char uplo, char trans, char diag, int64_t m,
+                               int64_t n, float alpha, const float* a,
+                               float* b, int64_t ldb );
+int64_t LAPACKE_dtfsm_work_64( int matrix_layout, char transr, char side,
+                               char uplo, char trans, char diag, int64_t m,
+                               int64_t n, double alpha, const double* a,
+                               double* b, int64_t ldb );
+int64_t LAPACKE_ctfsm_work_64( int matrix_layout, char transr, char side,
+                               char uplo, char trans, char diag, int64_t m,
+                               int64_t n, lapack_complex_float alpha,
+                               const lapack_complex_float* a,
+                               lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_ztfsm_work_64( int matrix_layout, char transr, char side,
+                               char uplo, char trans, char diag, int64_t m,
+                               int64_t n, lapack_complex_double alpha,
+                               const lapack_complex_double* a,
+                               lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_stftri_work_64( int matrix_layout, char transr, char uplo,
+                                char diag, int64_t n, float* a );
+int64_t LAPACKE_dtftri_work_64( int matrix_layout, char transr, char uplo,
+                                char diag, int64_t n, double* a );
+int64_t LAPACKE_ctftri_work_64( int matrix_layout, char transr, char uplo,
+                                char diag, int64_t n,
+                                lapack_complex_float* a );
+int64_t LAPACKE_ztftri_work_64( int matrix_layout, char transr, char uplo,
+                                char diag, int64_t n,
+                                lapack_complex_double* a );
+
+int64_t LAPACKE_stfttp_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, const float* arf, float* ap );
+int64_t LAPACKE_dtfttp_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, const double* arf, double* ap );
+int64_t LAPACKE_ctfttp_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, const lapack_complex_float* arf,
+                                lapack_complex_float* ap );
+int64_t LAPACKE_ztfttp_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, const lapack_complex_double* arf,
+                                lapack_complex_double* ap );
+
+int64_t LAPACKE_stfttr_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, const float* arf, float* a,
+                                int64_t lda );
+int64_t LAPACKE_dtfttr_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, const double* arf, double* a,
+                                int64_t lda );
+int64_t LAPACKE_ctfttr_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, const lapack_complex_float* arf,
+                                lapack_complex_float* a, int64_t lda );
+int64_t LAPACKE_ztfttr_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, const lapack_complex_double* arf,
+                                lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_stgevc_work_64( int matrix_layout, char side, char howmny,
+                                const lapack_logical* select, int64_t n,
+                                const float* s, int64_t lds, const float* p,
+                                int64_t ldp, float* vl, int64_t ldvl,
+                                float* vr, int64_t ldvr, int64_t mm,
+                                int64_t* m, float* work );
+int64_t LAPACKE_dtgevc_work_64( int matrix_layout, char side, char howmny,
+                                const lapack_logical* select, int64_t n,
+                                const double* s, int64_t lds,
+                                const double* p, int64_t ldp, double* vl,
+                                int64_t ldvl, double* vr, int64_t ldvr,
+                                int64_t mm, int64_t* m, double* work );
+int64_t LAPACKE_ctgevc_work_64( int matrix_layout, char side, char howmny,
+                                const lapack_logical* select, int64_t n,
+                                const lapack_complex_float* s, int64_t lds,
+                                const lapack_complex_float* p, int64_t ldp,
+                                lapack_complex_float* vl, int64_t ldvl,
+                                lapack_complex_float* vr, int64_t ldvr,
+                                int64_t mm, int64_t* m,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_ztgevc_work_64( int matrix_layout, char side, char howmny,
+                                const lapack_logical* select, int64_t n,
+                                const lapack_complex_double* s, int64_t lds,
+                                const lapack_complex_double* p, int64_t ldp,
+                                lapack_complex_double* vl, int64_t ldvl,
+                                lapack_complex_double* vr, int64_t ldvr,
+                                int64_t mm, int64_t* m,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_stgexc_work_64( int matrix_layout, lapack_logical wantq,
+                                lapack_logical wantz, int64_t n, float* a,
+                                int64_t lda, float* b, int64_t ldb,
+                                float* q, int64_t ldq, float* z,
+                                int64_t ldz, int64_t* ifst,
+                                int64_t* ilst, float* work,
+                                int64_t lwork );
+int64_t LAPACKE_dtgexc_work_64( int matrix_layout, lapack_logical wantq,
+                                lapack_logical wantz, int64_t n, double* a,
+                                int64_t lda, double* b, int64_t ldb,
+                                double* q, int64_t ldq, double* z,
+                                int64_t ldz, int64_t* ifst,
+                                int64_t* ilst, double* work,
+                                int64_t lwork );
+int64_t LAPACKE_ctgexc_work_64( int matrix_layout, lapack_logical wantq,
+                                lapack_logical wantz, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* q, int64_t ldq,
+                                lapack_complex_float* z, int64_t ldz,
+                                int64_t ifst, int64_t ilst );
+int64_t LAPACKE_ztgexc_work_64( int matrix_layout, lapack_logical wantq,
+                                lapack_logical wantz, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* q, int64_t ldq,
+                                lapack_complex_double* z, int64_t ldz,
+                                int64_t ifst, int64_t ilst );
+
+int64_t LAPACKE_stgsen_work_64( int matrix_layout, int64_t ijob,
+                                lapack_logical wantq, lapack_logical wantz,
+                                const lapack_logical* select, int64_t n,
+                                float* a, int64_t lda, float* b,
+                                int64_t ldb, float* alphar, float* alphai,
+                                float* beta, float* q, int64_t ldq, float* z,
+                                int64_t ldz, int64_t* m, float* pl,
+                                float* pr, float* dif, float* work,
+                                int64_t lwork, int64_t* iwork,
+                                int64_t liwork );
+int64_t LAPACKE_dtgsen_work_64( int matrix_layout, int64_t ijob,
+                                lapack_logical wantq, lapack_logical wantz,
+                                const lapack_logical* select, int64_t n,
+                                double* a, int64_t lda, double* b,
+                                int64_t ldb, double* alphar, double* alphai,
+                                double* beta, double* q, int64_t ldq,
+                                double* z, int64_t ldz, int64_t* m,
+                                double* pl, double* pr, double* dif,
+                                double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_ctgsen_work_64( int matrix_layout, int64_t ijob,
+                                lapack_logical wantq, lapack_logical wantz,
+                                const lapack_logical* select, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* alpha,
+                                lapack_complex_float* beta,
+                                lapack_complex_float* q, int64_t ldq,
+                                lapack_complex_float* z, int64_t ldz,
+                                int64_t* m, float* pl, float* pr, float* dif,
+                                lapack_complex_float* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_ztgsen_work_64( int matrix_layout, int64_t ijob,
+                                lapack_logical wantq, lapack_logical wantz,
+                                const lapack_logical* select, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* alpha,
+                                lapack_complex_double* beta,
+                                lapack_complex_double* q, int64_t ldq,
+                                lapack_complex_double* z, int64_t ldz,
+                                int64_t* m, double* pl, double* pr,
+                                double* dif, lapack_complex_double* work,
+                                int64_t lwork, int64_t* iwork,
+                                int64_t liwork );
+
+int64_t LAPACKE_stgsja_work_64( int matrix_layout, char jobu, char jobv,
+                                char jobq, int64_t m, int64_t p,
+                                int64_t n, int64_t k, int64_t l,
+                                float* a, int64_t lda, float* b,
+                                int64_t ldb, float tola, float tolb,
+                                float* alpha, float* beta, float* u,
+                                int64_t ldu, float* v, int64_t ldv,
+                                float* q, int64_t ldq, float* work,
+                                int64_t* ncycle );
+int64_t LAPACKE_dtgsja_work_64( int matrix_layout, char jobu, char jobv,
+                                char jobq, int64_t m, int64_t p,
+                                int64_t n, int64_t k, int64_t l,
+                                double* a, int64_t lda, double* b,
+                                int64_t ldb, double tola, double tolb,
+                                double* alpha, double* beta, double* u,
+                                int64_t ldu, double* v, int64_t ldv,
+                                double* q, int64_t ldq, double* work,
+                                int64_t* ncycle );
+int64_t LAPACKE_ctgsja_work_64( int matrix_layout, char jobu, char jobv,
+                                char jobq, int64_t m, int64_t p,
+                                int64_t n, int64_t k, int64_t l,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* b, int64_t ldb,
+                                float tola, float tolb, float* alpha,
+                                float* beta, lapack_complex_float* u,
+                                int64_t ldu, lapack_complex_float* v,
+                                int64_t ldv, lapack_complex_float* q,
+                                int64_t ldq, lapack_complex_float* work,
+                                int64_t* ncycle );
+int64_t LAPACKE_ztgsja_work_64( int matrix_layout, char jobu, char jobv,
+                                char jobq, int64_t m, int64_t p,
+                                int64_t n, int64_t k, int64_t l,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* b, int64_t ldb,
+                                double tola, double tolb, double* alpha,
+                                double* beta, lapack_complex_double* u,
+                                int64_t ldu, lapack_complex_double* v,
+                                int64_t ldv, lapack_complex_double* q,
+                                int64_t ldq, lapack_complex_double* work,
+                                int64_t* ncycle );
+
+int64_t LAPACKE_stgsna_work_64( int matrix_layout, char job, char howmny,
+                                const lapack_logical* select, int64_t n,
+                                const float* a, int64_t lda, const float* b,
+                                int64_t ldb, const float* vl,
+                                int64_t ldvl, const float* vr,
+                                int64_t ldvr, float* s, float* dif,
+                                int64_t mm, int64_t* m, float* work,
+                                int64_t lwork, int64_t* iwork );
+int64_t LAPACKE_dtgsna_work_64( int matrix_layout, char job, char howmny,
+                                const lapack_logical* select, int64_t n,
+                                const double* a, int64_t lda,
+                                const double* b, int64_t ldb,
+                                const double* vl, int64_t ldvl,
+                                const double* vr, int64_t ldvr, double* s,
+                                double* dif, int64_t mm, int64_t* m,
+                                double* work, int64_t lwork,
+                                int64_t* iwork );
+int64_t LAPACKE_ctgsna_work_64( int matrix_layout, char job, char howmny,
+                                const lapack_logical* select, int64_t n,
+                                const lapack_complex_float* a, int64_t lda,
+                                const lapack_complex_float* b, int64_t ldb,
+                                const lapack_complex_float* vl, int64_t ldvl,
+                                const lapack_complex_float* vr, int64_t ldvr,
+                                float* s, float* dif, int64_t mm,
+                                int64_t* m, lapack_complex_float* work,
+                                int64_t lwork, int64_t* iwork );
+int64_t LAPACKE_ztgsna_work_64( int matrix_layout, char job, char howmny,
+                                const lapack_logical* select, int64_t n,
+                                const lapack_complex_double* a, int64_t lda,
+                                const lapack_complex_double* b, int64_t ldb,
+                                const lapack_complex_double* vl,
+                                int64_t ldvl,
+                                const lapack_complex_double* vr,
+                                int64_t ldvr, double* s, double* dif,
+                                int64_t mm, int64_t* m,
+                                lapack_complex_double* work, int64_t lwork,
+                                int64_t* iwork );
+
+int64_t LAPACKE_stgsyl_work_64( int matrix_layout, char trans, int64_t ijob,
+                                int64_t m, int64_t n, const float* a,
+                                int64_t lda, const float* b, int64_t ldb,
+                                float* c, int64_t ldc, const float* d,
+                                int64_t ldd, const float* e, int64_t lde,
+                                float* f, int64_t ldf, float* scale,
+                                float* dif, float* work, int64_t lwork,
+                                int64_t* iwork );
+int64_t LAPACKE_dtgsyl_work_64( int matrix_layout, char trans, int64_t ijob,
+                                int64_t m, int64_t n, const double* a,
+                                int64_t lda, const double* b, int64_t ldb,
+                                double* c, int64_t ldc, const double* d,
+                                int64_t ldd, const double* e, int64_t lde,
+                                double* f, int64_t ldf, double* scale,
+                                double* dif, double* work, int64_t lwork,
+                                int64_t* iwork );
+int64_t LAPACKE_ctgsyl_work_64( int matrix_layout, char trans, int64_t ijob,
+                                int64_t m, int64_t n,
+                                const lapack_complex_float* a, int64_t lda,
+                                const lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* c, int64_t ldc,
+                                const lapack_complex_float* d, int64_t ldd,
+                                const lapack_complex_float* e, int64_t lde,
+                                lapack_complex_float* f, int64_t ldf,
+                                float* scale, float* dif,
+                                lapack_complex_float* work, int64_t lwork,
+                                int64_t* iwork );
+int64_t LAPACKE_ztgsyl_work_64( int matrix_layout, char trans, int64_t ijob,
+                                int64_t m, int64_t n,
+                                const lapack_complex_double* a, int64_t lda,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* c, int64_t ldc,
+                                const lapack_complex_double* d, int64_t ldd,
+                                const lapack_complex_double* e, int64_t lde,
+                                lapack_complex_double* f, int64_t ldf,
+                                double* scale, double* dif,
+                                lapack_complex_double* work, int64_t lwork,
+                                int64_t* iwork );
+
+int64_t LAPACKE_stpcon_work_64( int matrix_layout, char norm, char uplo,
+                                char diag, int64_t n, const float* ap,
+                                float* rcond, float* work, int64_t* iwork );
+int64_t LAPACKE_dtpcon_work_64( int matrix_layout, char norm, char uplo,
+                                char diag, int64_t n, const double* ap,
+                                double* rcond, double* work,
+                                int64_t* iwork );
+int64_t LAPACKE_ctpcon_work_64( int matrix_layout, char norm, char uplo,
+                                char diag, int64_t n,
+                                const lapack_complex_float* ap, float* rcond,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_ztpcon_work_64( int matrix_layout, char norm, char uplo,
+                                char diag, int64_t n,
+                                const lapack_complex_double* ap, double* rcond,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_stprfs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t nrhs,
+                                const float* ap, const float* b, int64_t ldb,
+                                const float* x, int64_t ldx, float* ferr,
+                                float* berr, float* work, int64_t* iwork );
+int64_t LAPACKE_dtprfs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t nrhs,
+                                const double* ap, const double* b,
+                                int64_t ldb, const double* x, int64_t ldx,
+                                double* ferr, double* berr, double* work,
+                                int64_t* iwork );
+int64_t LAPACKE_ctprfs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t nrhs,
+                                const lapack_complex_float* ap,
+                                const lapack_complex_float* b, int64_t ldb,
+                                const lapack_complex_float* x, int64_t ldx,
+                                float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_ztprfs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t nrhs,
+                                const lapack_complex_double* ap,
+                                const lapack_complex_double* b, int64_t ldb,
+                                const lapack_complex_double* x, int64_t ldx,
+                                double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_stptri_work_64( int matrix_layout, char uplo, char diag,
+                                int64_t n, float* ap );
+int64_t LAPACKE_dtptri_work_64( int matrix_layout, char uplo, char diag,
+                                int64_t n, double* ap );
+int64_t LAPACKE_ctptri_work_64( int matrix_layout, char uplo, char diag,
+                                int64_t n, lapack_complex_float* ap );
+int64_t LAPACKE_ztptri_work_64( int matrix_layout, char uplo, char diag,
+                                int64_t n, lapack_complex_double* ap );
+
+int64_t LAPACKE_stptrs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t nrhs,
+                                const float* ap, float* b, int64_t ldb );
+int64_t LAPACKE_dtptrs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t nrhs,
+                                const double* ap, double* b, int64_t ldb );
+int64_t LAPACKE_ctptrs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t nrhs,
+                                const lapack_complex_float* ap,
+                                lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_ztptrs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t nrhs,
+                                const lapack_complex_double* ap,
+                                lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_stpttf_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, const float* ap, float* arf );
+int64_t LAPACKE_dtpttf_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, const double* ap, double* arf );
+int64_t LAPACKE_ctpttf_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, const lapack_complex_float* ap,
+                                lapack_complex_float* arf );
+int64_t LAPACKE_ztpttf_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, const lapack_complex_double* ap,
+                                lapack_complex_double* arf );
+
+int64_t LAPACKE_stpttr_work_64( int matrix_layout, char uplo, int64_t n,
+                                const float* ap, float* a, int64_t lda );
+int64_t LAPACKE_dtpttr_work_64( int matrix_layout, char uplo, int64_t n,
+                                const double* ap, double* a, int64_t lda );
+int64_t LAPACKE_ctpttr_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_float* ap,
+                                lapack_complex_float* a, int64_t lda );
+int64_t LAPACKE_ztpttr_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_double* ap,
+                                lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_strcon_work_64( int matrix_layout, char norm, char uplo,
+                                char diag, int64_t n, const float* a,
+                                int64_t lda, float* rcond, float* work,
+                                int64_t* iwork );
+int64_t LAPACKE_dtrcon_work_64( int matrix_layout, char norm, char uplo,
+                                char diag, int64_t n, const double* a,
+                                int64_t lda, double* rcond, double* work,
+                                int64_t* iwork );
+int64_t LAPACKE_ctrcon_work_64( int matrix_layout, char norm, char uplo,
+                                char diag, int64_t n,
+                                const lapack_complex_float* a, int64_t lda,
+                                float* rcond, lapack_complex_float* work,
+                                float* rwork );
+int64_t LAPACKE_ztrcon_work_64( int matrix_layout, char norm, char uplo,
+                                char diag, int64_t n,
+                                const lapack_complex_double* a, int64_t lda,
+                                double* rcond, lapack_complex_double* work,
+                                double* rwork );
+
+int64_t LAPACKE_strevc_work_64( int matrix_layout, char side, char howmny,
+                                lapack_logical* select, int64_t n,
+                                const float* t, int64_t ldt, float* vl,
+                                int64_t ldvl, float* vr, int64_t ldvr,
+                                int64_t mm, int64_t* m, float* work );
+int64_t LAPACKE_dtrevc_work_64( int matrix_layout, char side, char howmny,
+                                lapack_logical* select, int64_t n,
+                                const double* t, int64_t ldt, double* vl,
+                                int64_t ldvl, double* vr, int64_t ldvr,
+                                int64_t mm, int64_t* m, double* work );
+int64_t LAPACKE_ctrevc_work_64( int matrix_layout, char side, char howmny,
+                                const lapack_logical* select, int64_t n,
+                                lapack_complex_float* t, int64_t ldt,
+                                lapack_complex_float* vl, int64_t ldvl,
+                                lapack_complex_float* vr, int64_t ldvr,
+                                int64_t mm, int64_t* m,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_ztrevc_work_64( int matrix_layout, char side, char howmny,
+                                const lapack_logical* select, int64_t n,
+                                lapack_complex_double* t, int64_t ldt,
+                                lapack_complex_double* vl, int64_t ldvl,
+                                lapack_complex_double* vr, int64_t ldvr,
+                                int64_t mm, int64_t* m,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_strexc_work_64( int matrix_layout, char compq, int64_t n,
+                                float* t, int64_t ldt, float* q,
+                                int64_t ldq, int64_t* ifst,
+                                int64_t* ilst, float* work );
+int64_t LAPACKE_dtrexc_work_64( int matrix_layout, char compq, int64_t n,
+                                double* t, int64_t ldt, double* q,
+                                int64_t ldq, int64_t* ifst,
+                                int64_t* ilst, double* work );
+int64_t LAPACKE_ctrexc_work_64( int matrix_layout, char compq, int64_t n,
+                                lapack_complex_float* t, int64_t ldt,
+                                lapack_complex_float* q, int64_t ldq,
+                                int64_t ifst, int64_t ilst );
+int64_t LAPACKE_ztrexc_work_64( int matrix_layout, char compq, int64_t n,
+                                lapack_complex_double* t, int64_t ldt,
+                                lapack_complex_double* q, int64_t ldq,
+                                int64_t ifst, int64_t ilst );
+
+int64_t LAPACKE_strrfs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t nrhs,
+                                const float* a, int64_t lda, const float* b,
+                                int64_t ldb, const float* x, int64_t ldx,
+                                float* ferr, float* berr, float* work,
+                                int64_t* iwork );
+int64_t LAPACKE_dtrrfs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t nrhs,
+                                const double* a, int64_t lda,
+                                const double* b, int64_t ldb,
+                                const double* x, int64_t ldx, double* ferr,
+                                double* berr, double* work, int64_t* iwork );
+int64_t LAPACKE_ctrrfs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t nrhs,
+                                const lapack_complex_float* a, int64_t lda,
+                                const lapack_complex_float* b, int64_t ldb,
+                                const lapack_complex_float* x, int64_t ldx,
+                                float* ferr, float* berr,
+                                lapack_complex_float* work, float* rwork );
+int64_t LAPACKE_ztrrfs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t nrhs,
+                                const lapack_complex_double* a, int64_t lda,
+                                const lapack_complex_double* b, int64_t ldb,
+                                const lapack_complex_double* x, int64_t ldx,
+                                double* ferr, double* berr,
+                                lapack_complex_double* work, double* rwork );
+
+int64_t LAPACKE_strsen_work_64( int matrix_layout, char job, char compq,
+                                const lapack_logical* select, int64_t n,
+                                float* t, int64_t ldt, float* q,
+                                int64_t ldq, float* wr, float* wi,
+                                int64_t* m, float* s, float* sep,
+                                float* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_dtrsen_work_64( int matrix_layout, char job, char compq,
+                                const lapack_logical* select, int64_t n,
+                                double* t, int64_t ldt, double* q,
+                                int64_t ldq, double* wr, double* wi,
+                                int64_t* m, double* s, double* sep,
+                                double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_ctrsen_work_64( int matrix_layout, char job, char compq,
+                                const lapack_logical* select, int64_t n,
+                                lapack_complex_float* t, int64_t ldt,
+                                lapack_complex_float* q, int64_t ldq,
+                                lapack_complex_float* w, int64_t* m,
+                                float* s, float* sep,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_ztrsen_work_64( int matrix_layout, char job, char compq,
+                                const lapack_logical* select, int64_t n,
+                                lapack_complex_double* t, int64_t ldt,
+                                lapack_complex_double* q, int64_t ldq,
+                                lapack_complex_double* w, int64_t* m,
+                                double* s, double* sep,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_strsna_work_64( int matrix_layout, char job, char howmny,
+                                const lapack_logical* select, int64_t n,
+                                const float* t, int64_t ldt, const float* vl,
+                                int64_t ldvl, const float* vr,
+                                int64_t ldvr, float* s, float* sep,
+                                int64_t mm, int64_t* m, float* work,
+                                int64_t ldwork, int64_t* iwork );
+int64_t LAPACKE_dtrsna_work_64( int matrix_layout, char job, char howmny,
+                                const lapack_logical* select, int64_t n,
+                                const double* t, int64_t ldt,
+                                const double* vl, int64_t ldvl,
+                                const double* vr, int64_t ldvr, double* s,
+                                double* sep, int64_t mm, int64_t* m,
+                                double* work, int64_t ldwork,
+                                int64_t* iwork );
+int64_t LAPACKE_ctrsna_work_64( int matrix_layout, char job, char howmny,
+                                const lapack_logical* select, int64_t n,
+                                const lapack_complex_float* t, int64_t ldt,
+                                const lapack_complex_float* vl, int64_t ldvl,
+                                const lapack_complex_float* vr, int64_t ldvr,
+                                float* s, float* sep, int64_t mm,
+                                int64_t* m, lapack_complex_float* work,
+                                int64_t ldwork, float* rwork );
+int64_t LAPACKE_ztrsna_work_64( int matrix_layout, char job, char howmny,
+                                const lapack_logical* select, int64_t n,
+                                const lapack_complex_double* t, int64_t ldt,
+                                const lapack_complex_double* vl,
+                                int64_t ldvl,
+                                const lapack_complex_double* vr,
+                                int64_t ldvr, double* s, double* sep,
+                                int64_t mm, int64_t* m,
+                                lapack_complex_double* work, int64_t ldwork,
+                                double* rwork );
+
+int64_t LAPACKE_strsyl_work_64( int matrix_layout, char trana, char tranb,
+                                int64_t isgn, int64_t m, int64_t n,
+                                const float* a, int64_t lda, const float* b,
+                                int64_t ldb, float* c, int64_t ldc,
+                                float* scale );
+int64_t LAPACKE_dtrsyl_work_64( int matrix_layout, char trana, char tranb,
+                                int64_t isgn, int64_t m, int64_t n,
+                                const double* a, int64_t lda,
+                                const double* b, int64_t ldb, double* c,
+                                int64_t ldc, double* scale );
+int64_t LAPACKE_ctrsyl_work_64( int matrix_layout, char trana, char tranb,
+                                int64_t isgn, int64_t m, int64_t n,
+                                const lapack_complex_float* a, int64_t lda,
+                                const lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* c, int64_t ldc,
+                                float* scale );
+int64_t LAPACKE_ztrsyl_work_64( int matrix_layout, char trana, char tranb,
+                                int64_t isgn, int64_t m, int64_t n,
+                                const lapack_complex_double* a, int64_t lda,
+                                const lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* c, int64_t ldc,
+                                double* scale );
+
+int64_t LAPACKE_strsyl3_work_64( int matrix_layout, char trana, char tranb,
+                                 int64_t isgn, int64_t m, int64_t n,
+                                 const float* a, int64_t lda,
+                                 const float* b, int64_t ldb,
+                                 float* c, int64_t ldc, float* scale,
+                                 int64_t* iwork, int64_t liwork,
+                                 float* swork, int64_t ldswork );
+int64_t LAPACKE_dtrsyl3_work_64( int matrix_layout, char trana, char tranb,
+                                 int64_t isgn, int64_t m, int64_t n,
+                                 const double* a, int64_t lda,
+                                 const double* b, int64_t ldb,
+                                 double* c, int64_t ldc, double* scale,
+                                 int64_t* iwork, int64_t liwork,
+                                 double* swork, int64_t ldswork );
+int64_t LAPACKE_ctrsyl3_work_64( int matrix_layout, char trana, char tranb,
+                                 int64_t isgn, int64_t m, int64_t n,
+                                 const lapack_complex_float* a, int64_t lda,
+                                 const lapack_complex_float* b, int64_t ldb,
+                                 lapack_complex_float* c, int64_t ldc,
+                                 float* scale, float* swork,
+                                 int64_t ldswork );
+int64_t LAPACKE_ztrsyl3_work_64( int matrix_layout, char trana, char tranb,
+                                 int64_t isgn, int64_t m, int64_t n,
+                                 const lapack_complex_double* a, int64_t lda,
+                                 const lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* c, int64_t ldc,
+                                 double* scale, double* swork,
+                                 int64_t ldswork );
+
+int64_t LAPACKE_strtri_work_64( int matrix_layout, char uplo, char diag,
+                                int64_t n, float* a, int64_t lda );
+int64_t LAPACKE_dtrtri_work_64( int matrix_layout, char uplo, char diag,
+                                int64_t n, double* a, int64_t lda );
+int64_t LAPACKE_ctrtri_work_64( int matrix_layout, char uplo, char diag,
+                                int64_t n, lapack_complex_float* a,
+                                int64_t lda );
+int64_t LAPACKE_ztrtri_work_64( int matrix_layout, char uplo, char diag,
+                                int64_t n, lapack_complex_double* a,
+                                int64_t lda );
+
+int64_t LAPACKE_strtrs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t nrhs,
+                                const float* a, int64_t lda, float* b,
+                                int64_t ldb );
+int64_t LAPACKE_dtrtrs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t nrhs,
+                                const double* a, int64_t lda, double* b,
+                                int64_t ldb );
+int64_t LAPACKE_ctrtrs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t nrhs,
+                                const lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_ztrtrs_work_64( int matrix_layout, char uplo, char trans,
+                                char diag, int64_t n, int64_t nrhs,
+                                const lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_strttf_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, const float* a, int64_t lda,
+                                float* arf );
+int64_t LAPACKE_dtrttf_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, const double* a, int64_t lda,
+                                double* arf );
+int64_t LAPACKE_ctrttf_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, const lapack_complex_float* a,
+                                int64_t lda, lapack_complex_float* arf );
+int64_t LAPACKE_ztrttf_work_64( int matrix_layout, char transr, char uplo,
+                                int64_t n, const lapack_complex_double* a,
+                                int64_t lda, lapack_complex_double* arf );
+
+int64_t LAPACKE_strttp_work_64( int matrix_layout, char uplo, int64_t n,
+                                const float* a, int64_t lda, float* ap );
+int64_t LAPACKE_dtrttp_work_64( int matrix_layout, char uplo, int64_t n,
+                                const double* a, int64_t lda, double* ap );
+int64_t LAPACKE_ctrttp_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* ap );
+int64_t LAPACKE_ztrttp_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* ap );
+
+int64_t LAPACKE_stzrzf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                float* a, int64_t lda, float* tau,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dtzrzf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                double* a, int64_t lda, double* tau,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_ctzrzf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* tau,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_ztzrzf_work_64( int matrix_layout, int64_t m, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* tau,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_cungbr_work_64( int matrix_layout, char vect, int64_t m,
+                                int64_t n, int64_t k,
+                                lapack_complex_float* a, int64_t lda,
+                                const lapack_complex_float* tau,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zungbr_work_64( int matrix_layout, char vect, int64_t m,
+                                int64_t n, int64_t k,
+                                lapack_complex_double* a, int64_t lda,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_cunghr_work_64( int matrix_layout, int64_t n, int64_t ilo,
+                                int64_t ihi, lapack_complex_float* a,
+                                int64_t lda, const lapack_complex_float* tau,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zunghr_work_64( int matrix_layout, int64_t n, int64_t ilo,
+                                int64_t ihi, lapack_complex_double* a,
+                                int64_t lda,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_cunglq_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t k, lapack_complex_float* a,
+                                int64_t lda, const lapack_complex_float* tau,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zunglq_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t k, lapack_complex_double* a,
+                                int64_t lda,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_cungql_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t k, lapack_complex_float* a,
+                                int64_t lda, const lapack_complex_float* tau,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zungql_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t k, lapack_complex_double* a,
+                                int64_t lda,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_cungqr_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t k, lapack_complex_float* a,
+                                int64_t lda, const lapack_complex_float* tau,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zungqr_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t k, lapack_complex_double* a,
+                                int64_t lda,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_cungrq_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t k, lapack_complex_float* a,
+                                int64_t lda, const lapack_complex_float* tau,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zungrq_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t k, lapack_complex_double* a,
+                                int64_t lda,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_cungtr_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                const lapack_complex_float* tau,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zungtr_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_cungtsqr_row_work_64( int matrix_layout,
+                                      int64_t m, int64_t n,
+                                      int64_t mb, int64_t nb,
+                                      lapack_complex_float* a, int64_t lda,
+                                      const lapack_complex_float* t, int64_t ldt,
+                                      lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zungtsqr_row_work_64( int matrix_layout,
+                                      int64_t m, int64_t n,
+                                      int64_t mb, int64_t nb,
+                                      lapack_complex_double* a, int64_t lda,
+                                      const lapack_complex_double* t, int64_t ldt,
+                                      lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_cunmbr_work_64( int matrix_layout, char vect, char side,
+                                char trans, int64_t m, int64_t n,
+                                int64_t k, const lapack_complex_float* a,
+                                int64_t lda, const lapack_complex_float* tau,
+                                lapack_complex_float* c, int64_t ldc,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zunmbr_work_64( int matrix_layout, char vect, char side,
+                                char trans, int64_t m, int64_t n,
+                                int64_t k, const lapack_complex_double* a,
+                                int64_t lda,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* c, int64_t ldc,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_cunmhr_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t ilo,
+                                int64_t ihi, const lapack_complex_float* a,
+                                int64_t lda, const lapack_complex_float* tau,
+                                lapack_complex_float* c, int64_t ldc,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zunmhr_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t ilo,
+                                int64_t ihi, const lapack_complex_double* a,
+                                int64_t lda,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* c, int64_t ldc,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_cunmlq_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const lapack_complex_float* a, int64_t lda,
+                                const lapack_complex_float* tau,
+                                lapack_complex_float* c, int64_t ldc,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zunmlq_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const lapack_complex_double* a, int64_t lda,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* c, int64_t ldc,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_cunmql_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const lapack_complex_float* a, int64_t lda,
+                                const lapack_complex_float* tau,
+                                lapack_complex_float* c, int64_t ldc,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zunmql_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const lapack_complex_double* a, int64_t lda,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* c, int64_t ldc,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_cunmqr_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const lapack_complex_float* a, int64_t lda,
+                                const lapack_complex_float* tau,
+                                lapack_complex_float* c, int64_t ldc,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zunmqr_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const lapack_complex_double* a, int64_t lda,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* c, int64_t ldc,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_cunmrq_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const lapack_complex_float* a, int64_t lda,
+                                const lapack_complex_float* tau,
+                                lapack_complex_float* c, int64_t ldc,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zunmrq_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const lapack_complex_double* a, int64_t lda,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* c, int64_t ldc,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_cunmrz_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                int64_t l, const lapack_complex_float* a,
+                                int64_t lda, const lapack_complex_float* tau,
+                                lapack_complex_float* c, int64_t ldc,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zunmrz_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                int64_t l, const lapack_complex_double* a,
+                                int64_t lda,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* c, int64_t ldc,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_cunmtr_work_64( int matrix_layout, char side, char uplo,
+                                char trans, int64_t m, int64_t n,
+                                const lapack_complex_float* a, int64_t lda,
+                                const lapack_complex_float* tau,
+                                lapack_complex_float* c, int64_t ldc,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zunmtr_work_64( int matrix_layout, char side, char uplo,
+                                char trans, int64_t m, int64_t n,
+                                const lapack_complex_double* a, int64_t lda,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* c, int64_t ldc,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_cupgtr_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_float* ap,
+                                const lapack_complex_float* tau,
+                                lapack_complex_float* q, int64_t ldq,
+                                lapack_complex_float* work );
+int64_t LAPACKE_zupgtr_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_double* ap,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* q, int64_t ldq,
+                                lapack_complex_double* work );
+
+int64_t LAPACKE_cupmtr_work_64( int matrix_layout, char side, char uplo,
+                                char trans, int64_t m, int64_t n,
+                                const lapack_complex_float* ap,
+                                const lapack_complex_float* tau,
+                                lapack_complex_float* c, int64_t ldc,
+                                lapack_complex_float* work );
+int64_t LAPACKE_zupmtr_work_64( int matrix_layout, char side, char uplo,
+                                char trans, int64_t m, int64_t n,
+                                const lapack_complex_double* ap,
+                                const lapack_complex_double* tau,
+                                lapack_complex_double* c, int64_t ldc,
+                                lapack_complex_double* work );
+
+int64_t LAPACKE_claghe_64( int matrix_layout, int64_t n, int64_t k,
+                           const float* d, lapack_complex_float* a,
+                           int64_t lda, int64_t* iseed );
+int64_t LAPACKE_zlaghe_64( int matrix_layout, int64_t n, int64_t k,
+                           const double* d, lapack_complex_double* a,
+                           int64_t lda, int64_t* iseed );
+
+int64_t LAPACKE_slagsy_64( int matrix_layout, int64_t n, int64_t k,
+                           const float* d, float* a, int64_t lda,
+                           int64_t* iseed );
+int64_t LAPACKE_dlagsy_64( int matrix_layout, int64_t n, int64_t k,
+                           const double* d, double* a, int64_t lda,
+                           int64_t* iseed );
+int64_t LAPACKE_clagsy_64( int matrix_layout, int64_t n, int64_t k,
+                           const float* d, lapack_complex_float* a,
+                           int64_t lda, int64_t* iseed );
+int64_t LAPACKE_zlagsy_64( int matrix_layout, int64_t n, int64_t k,
+                           const double* d, lapack_complex_double* a,
+                           int64_t lda, int64_t* iseed );
+
+int64_t LAPACKE_slapmr_64( int matrix_layout, lapack_logical forwrd,
+                           int64_t m, int64_t n, float* x, int64_t ldx,
+                           int64_t* k );
+int64_t LAPACKE_dlapmr_64( int matrix_layout, lapack_logical forwrd,
+                           int64_t m, int64_t n, double* x,
+                           int64_t ldx, int64_t* k );
+int64_t LAPACKE_clapmr_64( int matrix_layout, lapack_logical forwrd,
+                           int64_t m, int64_t n, lapack_complex_float* x,
+                           int64_t ldx, int64_t* k );
+int64_t LAPACKE_zlapmr_64( int matrix_layout, lapack_logical forwrd,
+                           int64_t m, int64_t n, lapack_complex_double* x,
+                           int64_t ldx, int64_t* k );
+
+int64_t LAPACKE_slapmt_64( int matrix_layout, lapack_logical forwrd,
+                           int64_t m, int64_t n, float* x, int64_t ldx,
+                           int64_t* k );
+int64_t LAPACKE_dlapmt_64( int matrix_layout, lapack_logical forwrd,
+                           int64_t m, int64_t n, double* x,
+                           int64_t ldx, int64_t* k );
+int64_t LAPACKE_clapmt_64( int matrix_layout, lapack_logical forwrd,
+                           int64_t m, int64_t n, lapack_complex_float* x,
+                           int64_t ldx, int64_t* k );
+int64_t LAPACKE_zlapmt_64( int matrix_layout, lapack_logical forwrd,
+                           int64_t m, int64_t n, lapack_complex_double* x,
+                           int64_t ldx, int64_t* k );
+
+float LAPACKE_slapy2_64( float x, float y );
+double LAPACKE_dlapy2_64( double x, double y );
+
+float LAPACKE_slapy3_64( float x, float y, float z );
+double LAPACKE_dlapy3_64( double x, double y, double z );
+
+int64_t LAPACKE_slartgp_64( float f, float g, float* cs, float* sn, float* r );
+int64_t LAPACKE_dlartgp_64( double f, double g, double* cs, double* sn,
+                            double* r );
+
+int64_t LAPACKE_slartgs_64( float x, float y, float sigma, float* cs,
+                            float* sn );
+int64_t LAPACKE_dlartgs_64( double x, double y, double sigma, double* cs,
+                            double* sn );
+
+
+//LAPACK 3.3.0
+int64_t LAPACKE_cbbcsd_64( int matrix_layout, char jobu1, char jobu2,
+                           char jobv1t, char jobv2t, char trans, int64_t m,
+                           int64_t p, int64_t q, float* theta, float* phi,
+                           lapack_complex_float* u1, int64_t ldu1,
+                           lapack_complex_float* u2, int64_t ldu2,
+                           lapack_complex_float* v1t, int64_t ldv1t,
+                           lapack_complex_float* v2t, int64_t ldv2t,
+                           float* b11d, float* b11e, float* b12d, float* b12e,
+                           float* b21d, float* b21e, float* b22d, float* b22e );
+int64_t LAPACKE_cbbcsd_work_64( int matrix_layout, char jobu1, char jobu2,
+                                char jobv1t, char jobv2t, char trans,
+                                int64_t m, int64_t p, int64_t q,
+                                float* theta, float* phi,
+                                lapack_complex_float* u1, int64_t ldu1,
+                                lapack_complex_float* u2, int64_t ldu2,
+                                lapack_complex_float* v1t, int64_t ldv1t,
+                                lapack_complex_float* v2t, int64_t ldv2t,
+                                float* b11d, float* b11e, float* b12d,
+                                float* b12e, float* b21d, float* b21e,
+                                float* b22d, float* b22e, float* rwork,
+                                int64_t lrwork );
+int64_t LAPACKE_cheswapr_64( int matrix_layout, char uplo, int64_t n,
+                             lapack_complex_float* a, int64_t lda,
+                             int64_t i1, int64_t i2 );
+int64_t LAPACKE_cheswapr_work_64( int matrix_layout, char uplo, int64_t n,
+                                  lapack_complex_float* a, int64_t lda,
+                                  int64_t i1, int64_t i2 );
+int64_t LAPACKE_chetri2_64( int matrix_layout, char uplo, int64_t n,
+                            lapack_complex_float* a, int64_t lda,
+                            const int64_t* ipiv );
+int64_t LAPACKE_chetri2_work_64( int matrix_layout, char uplo, int64_t n,
+                                 lapack_complex_float* a, int64_t lda,
+                                 const int64_t* ipiv,
+                                 lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_chetri2x_64( int matrix_layout, char uplo, int64_t n,
+                             lapack_complex_float* a, int64_t lda,
+                             const int64_t* ipiv, int64_t nb );
+int64_t LAPACKE_chetri2x_work_64( int matrix_layout, char uplo, int64_t n,
+                                  lapack_complex_float* a, int64_t lda,
+                                  const int64_t* ipiv,
+                                  lapack_complex_float* work, int64_t nb );
+int64_t LAPACKE_chetrs2_64( int matrix_layout, char uplo, int64_t n,
+                            int64_t nrhs, const lapack_complex_float* a,
+                            int64_t lda, const int64_t* ipiv,
+                            lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_chetrs2_work_64( int matrix_layout, char uplo, int64_t n,
+                                 int64_t nrhs, const lapack_complex_float* a,
+                                 int64_t lda, const int64_t* ipiv,
+                                 lapack_complex_float* b, int64_t ldb,
+                                 lapack_complex_float* work );
+int64_t LAPACKE_csyconv_64( int matrix_layout, char uplo, char way, int64_t n,
+                            lapack_complex_float* a, int64_t lda,
+                            const int64_t* ipiv, lapack_complex_float* e  );
+int64_t LAPACKE_csyconv_work_64( int matrix_layout, char uplo, char way,
+                                 int64_t n, lapack_complex_float* a,
+                                 int64_t lda, const int64_t* ipiv,
+                                 lapack_complex_float* e );
+int64_t LAPACKE_csyswapr_64( int matrix_layout, char uplo, int64_t n,
+                             lapack_complex_float* a, int64_t lda,
+                             int64_t i1, int64_t i2 );
+int64_t LAPACKE_csyswapr_work_64( int matrix_layout, char uplo, int64_t n,
+                                  lapack_complex_float* a, int64_t lda,
+                                  int64_t i1, int64_t i2 );
+int64_t LAPACKE_csytri2_64( int matrix_layout, char uplo, int64_t n,
+                            lapack_complex_float* a, int64_t lda,
+                            const int64_t* ipiv );
+int64_t LAPACKE_csytri2_work_64( int matrix_layout, char uplo, int64_t n,
+                                 lapack_complex_float* a, int64_t lda,
+                                 const int64_t* ipiv,
+                                 lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_csytri2x_64( int matrix_layout, char uplo, int64_t n,
+                             lapack_complex_float* a, int64_t lda,
+                             const int64_t* ipiv, int64_t nb );
+int64_t LAPACKE_csytri2x_work_64( int matrix_layout, char uplo, int64_t n,
+                                  lapack_complex_float* a, int64_t lda,
+                                  const int64_t* ipiv,
+                                  lapack_complex_float* work, int64_t nb );
+int64_t LAPACKE_csytrs2_64( int matrix_layout, char uplo, int64_t n,
+                            int64_t nrhs, const lapack_complex_float* a,
+                            int64_t lda, const int64_t* ipiv,
+                            lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_csytrs2_work_64( int matrix_layout, char uplo, int64_t n,
+                                 int64_t nrhs, const lapack_complex_float* a,
+                                 int64_t lda, const int64_t* ipiv,
+                                 lapack_complex_float* b, int64_t ldb,
+                                 lapack_complex_float* work );
+int64_t LAPACKE_cunbdb_64( int matrix_layout, char trans, char signs,
+                           int64_t m, int64_t p, int64_t q,
+                           lapack_complex_float* x11, int64_t ldx11,
+                           lapack_complex_float* x12, int64_t ldx12,
+                           lapack_complex_float* x21, int64_t ldx21,
+                           lapack_complex_float* x22, int64_t ldx22,
+                           float* theta, float* phi,
+                           lapack_complex_float* taup1,
+                           lapack_complex_float* taup2,
+                           lapack_complex_float* tauq1,
+                           lapack_complex_float* tauq2 );
+int64_t LAPACKE_cunbdb_work_64( int matrix_layout, char trans, char signs,
+                                int64_t m, int64_t p, int64_t q,
+                                lapack_complex_float* x11, int64_t ldx11,
+                                lapack_complex_float* x12, int64_t ldx12,
+                                lapack_complex_float* x21, int64_t ldx21,
+                                lapack_complex_float* x22, int64_t ldx22,
+                                float* theta, float* phi,
+                                lapack_complex_float* taup1,
+                                lapack_complex_float* taup2,
+                                lapack_complex_float* tauq1,
+                                lapack_complex_float* tauq2,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_cuncsd_64( int matrix_layout, char jobu1, char jobu2,
+                           char jobv1t, char jobv2t, char trans, char signs,
+                           int64_t m, int64_t p, int64_t q,
+                           lapack_complex_float* x11, int64_t ldx11,
+                           lapack_complex_float* x12, int64_t ldx12,
+                           lapack_complex_float* x21, int64_t ldx21,
+                           lapack_complex_float* x22, int64_t ldx22,
+                           float* theta, lapack_complex_float* u1,
+                           int64_t ldu1, lapack_complex_float* u2,
+                           int64_t ldu2, lapack_complex_float* v1t,
+                           int64_t ldv1t, lapack_complex_float* v2t,
+                           int64_t ldv2t );
+int64_t LAPACKE_cuncsd_work_64( int matrix_layout, char jobu1, char jobu2,
+                                char jobv1t, char jobv2t, char trans,
+                                char signs, int64_t m, int64_t p,
+                                int64_t q, lapack_complex_float* x11,
+                                int64_t ldx11, lapack_complex_float* x12,
+                                int64_t ldx12, lapack_complex_float* x21,
+                                int64_t ldx21, lapack_complex_float* x22,
+                                int64_t ldx22, float* theta,
+                                lapack_complex_float* u1, int64_t ldu1,
+                                lapack_complex_float* u2, int64_t ldu2,
+                                lapack_complex_float* v1t, int64_t ldv1t,
+                                lapack_complex_float* v2t, int64_t ldv2t,
+                                lapack_complex_float* work, int64_t lwork,
+                                float* rwork, int64_t lrwork,
+                                int64_t* iwork );
+int64_t LAPACKE_cuncsd2by1_64( int matrix_layout, char jobu1, char jobu2,
+                           char jobv1t, int64_t m, int64_t p, int64_t q,
+                           lapack_complex_float* x11, int64_t ldx11,
+                           lapack_complex_float* x21, int64_t ldx21,
+                           float* theta, lapack_complex_float* u1,
+                           int64_t ldu1, lapack_complex_float* u2,
+                           int64_t ldu2, lapack_complex_float* v1t, int64_t ldv1t );
+int64_t LAPACKE_cuncsd2by1_work_64( int matrix_layout, char jobu1, char jobu2,
+                                char jobv1t, int64_t m, int64_t p,
+                                int64_t q, lapack_complex_float* x11, int64_t ldx11,
+                                lapack_complex_float* x21, int64_t ldx21,
+                                float* theta, lapack_complex_float* u1,
+                                int64_t ldu1, lapack_complex_float* u2,
+                                int64_t ldu2, lapack_complex_float* v1t,
+                                int64_t ldv1t, lapack_complex_float* work,
+                                int64_t lwork, float* rwork, int64_t lrwork,
+                                int64_t* iwork );
+int64_t LAPACKE_dbbcsd_64( int matrix_layout, char jobu1, char jobu2,
+                           char jobv1t, char jobv2t, char trans, int64_t m,
+                           int64_t p, int64_t q, double* theta,
+                           double* phi, double* u1, int64_t ldu1, double* u2,
+                           int64_t ldu2, double* v1t, int64_t ldv1t,
+                           double* v2t, int64_t ldv2t, double* b11d,
+                           double* b11e, double* b12d, double* b12e,
+                           double* b21d, double* b21e, double* b22d,
+                           double* b22e );
+int64_t LAPACKE_dbbcsd_work_64( int matrix_layout, char jobu1, char jobu2,
+                                char jobv1t, char jobv2t, char trans,
+                                int64_t m, int64_t p, int64_t q,
+                                double* theta, double* phi, double* u1,
+                                int64_t ldu1, double* u2, int64_t ldu2,
+                                double* v1t, int64_t ldv1t, double* v2t,
+                                int64_t ldv2t, double* b11d, double* b11e,
+                                double* b12d, double* b12e, double* b21d,
+                                double* b21e, double* b22d, double* b22e,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_dorbdb_64( int matrix_layout, char trans, char signs,
+                           int64_t m, int64_t p, int64_t q,
+                           double* x11, int64_t ldx11, double* x12,
+                           int64_t ldx12, double* x21, int64_t ldx21,
+                           double* x22, int64_t ldx22, double* theta,
+                           double* phi, double* taup1, double* taup2,
+                           double* tauq1, double* tauq2 );
+int64_t LAPACKE_dorbdb_work_64( int matrix_layout, char trans, char signs,
+                                int64_t m, int64_t p, int64_t q,
+                                double* x11, int64_t ldx11, double* x12,
+                                int64_t ldx12, double* x21, int64_t ldx21,
+                                double* x22, int64_t ldx22, double* theta,
+                                double* phi, double* taup1, double* taup2,
+                                double* tauq1, double* tauq2, double* work,
+                                int64_t lwork );
+int64_t LAPACKE_dorcsd_64( int matrix_layout, char jobu1, char jobu2,
+                           char jobv1t, char jobv2t, char trans, char signs,
+                           int64_t m, int64_t p, int64_t q,
+                           double* x11, int64_t ldx11, double* x12,
+                           int64_t ldx12, double* x21, int64_t ldx21,
+                           double* x22, int64_t ldx22, double* theta,
+                           double* u1, int64_t ldu1, double* u2,
+                           int64_t ldu2, double* v1t, int64_t ldv1t,
+                           double* v2t, int64_t ldv2t );
+int64_t LAPACKE_dorcsd_work_64( int matrix_layout, char jobu1, char jobu2,
+                                char jobv1t, char jobv2t, char trans,
+                                char signs, int64_t m, int64_t p,
+                                int64_t q, double* x11, int64_t ldx11,
+                                double* x12, int64_t ldx12, double* x21,
+                                int64_t ldx21, double* x22, int64_t ldx22,
+                                double* theta, double* u1, int64_t ldu1,
+                                double* u2, int64_t ldu2, double* v1t,
+                                int64_t ldv1t, double* v2t, int64_t ldv2t,
+                                double* work, int64_t lwork,
+                                int64_t* iwork );
+int64_t LAPACKE_dorcsd2by1_64( int matrix_layout, char jobu1, char jobu2,
+                           char jobv1t, int64_t m, int64_t p, int64_t q,
+                           double* x11, int64_t ldx11, double* x21, int64_t ldx21,
+                           double* theta, double* u1, int64_t ldu1, double* u2,
+                           int64_t ldu2, double* v1t, int64_t ldv1t);
+int64_t LAPACKE_dorcsd2by1_work_64( int matrix_layout, char jobu1, char jobu2,
+                           char jobv1t, int64_t m, int64_t p, int64_t q,
+                           double* x11, int64_t ldx11, double* x21, int64_t ldx21,
+                           double* theta, double* u1, int64_t ldu1, double* u2,
+                           int64_t ldu2, double* v1t, int64_t ldv1t,
+                           double* work, int64_t lwork, int64_t* iwork );
+int64_t LAPACKE_dsyconv_64( int matrix_layout, char uplo, char way, int64_t n,
+                            double* a, int64_t lda, const int64_t* ipiv, double* e);
+int64_t LAPACKE_dsyconv_work_64( int matrix_layout, char uplo, char way,
+                                 int64_t n, double* a, int64_t lda,
+                                 const int64_t* ipiv, double* e );
+int64_t LAPACKE_dsyswapr_64( int matrix_layout, char uplo, int64_t n,
+                             double* a, int64_t lda, int64_t i1,
+                             int64_t i2 );
+int64_t LAPACKE_dsyswapr_work_64( int matrix_layout, char uplo, int64_t n,
+                                  double* a, int64_t lda, int64_t i1,
+                                  int64_t i2 );
+int64_t LAPACKE_dsytri2_64( int matrix_layout, char uplo, int64_t n,
+                            double* a, int64_t lda, const int64_t* ipiv );
+int64_t LAPACKE_dsytri2_work_64( int matrix_layout, char uplo, int64_t n,
+                                 double* a, int64_t lda,
+                                 const int64_t* ipiv,
+                                 double* work, int64_t lwork );
+int64_t LAPACKE_dsytri2x_64( int matrix_layout, char uplo, int64_t n,
+                             double* a, int64_t lda, const int64_t* ipiv,
+                             int64_t nb );
+int64_t LAPACKE_dsytri2x_work_64( int matrix_layout, char uplo, int64_t n,
+                                  double* a, int64_t lda,
+                                  const int64_t* ipiv, double* work,
+                                  int64_t nb );
+int64_t LAPACKE_dsytrs2_64( int matrix_layout, char uplo, int64_t n,
+                            int64_t nrhs, const double* a, int64_t lda,
+                            const int64_t* ipiv, double* b, int64_t ldb );
+int64_t LAPACKE_dsytrs2_work_64( int matrix_layout, char uplo, int64_t n,
+                                 int64_t nrhs, const double* a,
+                                 int64_t lda, const int64_t* ipiv,
+                                 double* b, int64_t ldb, double* work );
+int64_t LAPACKE_sbbcsd_64( int matrix_layout, char jobu1, char jobu2,
+                           char jobv1t, char jobv2t, char trans, int64_t m,
+                           int64_t p, int64_t q, float* theta, float* phi,
+                           float* u1, int64_t ldu1, float* u2,
+                           int64_t ldu2, float* v1t, int64_t ldv1t,
+                           float* v2t, int64_t ldv2t, float* b11d,
+                           float* b11e, float* b12d, float* b12e, float* b21d,
+                           float* b21e, float* b22d, float* b22e );
+int64_t LAPACKE_sbbcsd_work_64( int matrix_layout, char jobu1, char jobu2,
+                                char jobv1t, char jobv2t, char trans,
+                                int64_t m, int64_t p, int64_t q,
+                                float* theta, float* phi, float* u1,
+                                int64_t ldu1, float* u2, int64_t ldu2,
+                                float* v1t, int64_t ldv1t, float* v2t,
+                                int64_t ldv2t, float* b11d, float* b11e,
+                                float* b12d, float* b12e, float* b21d,
+                                float* b21e, float* b22d, float* b22e,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_sorbdb_64( int matrix_layout, char trans, char signs,
+                           int64_t m, int64_t p, int64_t q, float* x11,
+                           int64_t ldx11, float* x12, int64_t ldx12,
+                           float* x21, int64_t ldx21, float* x22,
+                           int64_t ldx22, float* theta, float* phi,
+                           float* taup1, float* taup2, float* tauq1,
+                           float* tauq2 );
+int64_t LAPACKE_sorbdb_work_64( int matrix_layout, char trans, char signs,
+                                int64_t m, int64_t p, int64_t q,
+                                float* x11, int64_t ldx11, float* x12,
+                                int64_t ldx12, float* x21, int64_t ldx21,
+                                float* x22, int64_t ldx22, float* theta,
+                                float* phi, float* taup1, float* taup2,
+                                float* tauq1, float* tauq2, float* work,
+                                int64_t lwork );
+int64_t LAPACKE_sorcsd_64( int matrix_layout, char jobu1, char jobu2,
+                           char jobv1t, char jobv2t, char trans, char signs,
+                           int64_t m, int64_t p, int64_t q, float* x11,
+                           int64_t ldx11, float* x12, int64_t ldx12,
+                           float* x21, int64_t ldx21, float* x22,
+                           int64_t ldx22, float* theta, float* u1,
+                           int64_t ldu1, float* u2, int64_t ldu2,
+                           float* v1t, int64_t ldv1t, float* v2t,
+                           int64_t ldv2t );
+int64_t LAPACKE_sorcsd_work_64( int matrix_layout, char jobu1, char jobu2,
+                                char jobv1t, char jobv2t, char trans,
+                                char signs, int64_t m, int64_t p,
+                                int64_t q, float* x11, int64_t ldx11,
+                                float* x12, int64_t ldx12, float* x21,
+                                int64_t ldx21, float* x22, int64_t ldx22,
+                                float* theta, float* u1, int64_t ldu1,
+                                float* u2, int64_t ldu2, float* v1t,
+                                int64_t ldv1t, float* v2t, int64_t ldv2t,
+                                float* work, int64_t lwork,
+                                int64_t* iwork );
+int64_t LAPACKE_sorcsd2by1_64( int matrix_layout, char jobu1, char jobu2,
+                           char jobv1t, int64_t m, int64_t p, int64_t q,
+                           float* x11, int64_t ldx11, float* x21, int64_t ldx21,
+                           float* theta, float* u1, int64_t ldu1, float* u2,
+                           int64_t ldu2, float* v1t, int64_t ldv1t);
+int64_t LAPACKE_sorcsd2by1_work_64( int matrix_layout, char jobu1, char jobu2,
+                           char jobv1t, int64_t m, int64_t p, int64_t q,
+                           float* x11, int64_t ldx11, float* x21, int64_t ldx21,
+                           float* theta, float* u1, int64_t ldu1, float* u2,
+                           int64_t ldu2, float* v1t, int64_t ldv1t,
+                           float* work, int64_t lwork, int64_t* iwork );
+int64_t LAPACKE_ssyconv_64( int matrix_layout, char uplo, char way, int64_t n,
+                            float* a, int64_t lda, const int64_t* ipiv, float* e );
+int64_t LAPACKE_ssyconv_work_64( int matrix_layout, char uplo, char way,
+                                 int64_t n, float* a, int64_t lda,
+                                 const int64_t* ipiv, float* e );
+int64_t LAPACKE_ssyswapr_64( int matrix_layout, char uplo, int64_t n,
+                             float* a, int64_t lda, int64_t i1,
+                             int64_t i2 );
+int64_t LAPACKE_ssyswapr_work_64( int matrix_layout, char uplo, int64_t n,
+                                  float* a, int64_t lda, int64_t i1,
+                                  int64_t i2 );
+int64_t LAPACKE_ssytri2_64( int matrix_layout, char uplo, int64_t n, float* a,
+                            int64_t lda, const int64_t* ipiv );
+int64_t LAPACKE_ssytri2_work_64( int matrix_layout, char uplo, int64_t n,
+                                 float* a, int64_t lda,
+                                 const int64_t* ipiv,
+                                 float* work, int64_t lwork );
+int64_t LAPACKE_ssytri2x_64( int matrix_layout, char uplo, int64_t n,
+                             float* a, int64_t lda, const int64_t* ipiv,
+                             int64_t nb );
+int64_t LAPACKE_ssytri2x_work_64( int matrix_layout, char uplo, int64_t n,
+                                  float* a, int64_t lda,
+                                  const int64_t* ipiv, float* work,
+                                  int64_t nb );
+int64_t LAPACKE_ssytrs2_64( int matrix_layout, char uplo, int64_t n,
+                            int64_t nrhs, const float* a, int64_t lda,
+                            const int64_t* ipiv, float* b, int64_t ldb );
+int64_t LAPACKE_ssytrs2_work_64( int matrix_layout, char uplo, int64_t n,
+                                 int64_t nrhs, const float* a,
+                                 int64_t lda, const int64_t* ipiv,
+                                 float* b, int64_t ldb, float* work );
+int64_t LAPACKE_zbbcsd_64( int matrix_layout, char jobu1, char jobu2,
+                           char jobv1t, char jobv2t, char trans, int64_t m,
+                           int64_t p, int64_t q, double* theta,
+                           double* phi, lapack_complex_double* u1,
+                           int64_t ldu1, lapack_complex_double* u2,
+                           int64_t ldu2, lapack_complex_double* v1t,
+                           int64_t ldv1t, lapack_complex_double* v2t,
+                           int64_t ldv2t, double* b11d, double* b11e,
+                           double* b12d, double* b12e, double* b21d,
+                           double* b21e, double* b22d, double* b22e );
+int64_t LAPACKE_zbbcsd_work_64( int matrix_layout, char jobu1, char jobu2,
+                                char jobv1t, char jobv2t, char trans,
+                                int64_t m, int64_t p, int64_t q,
+                                double* theta, double* phi,
+                                lapack_complex_double* u1, int64_t ldu1,
+                                lapack_complex_double* u2, int64_t ldu2,
+                                lapack_complex_double* v1t, int64_t ldv1t,
+                                lapack_complex_double* v2t, int64_t ldv2t,
+                                double* b11d, double* b11e, double* b12d,
+                                double* b12e, double* b21d, double* b21e,
+                                double* b22d, double* b22e, double* rwork,
+                                int64_t lrwork );
+int64_t LAPACKE_zheswapr_64( int matrix_layout, char uplo, int64_t n,
+                             lapack_complex_double* a, int64_t lda,
+                             int64_t i1, int64_t i2 );
+int64_t LAPACKE_zheswapr_work_64( int matrix_layout, char uplo, int64_t n,
+                                  lapack_complex_double* a, int64_t lda,
+                                  int64_t i1, int64_t i2 );
+int64_t LAPACKE_zhetri2_64( int matrix_layout, char uplo, int64_t n,
+                            lapack_complex_double* a, int64_t lda,
+                            const int64_t* ipiv );
+int64_t LAPACKE_zhetri2_work_64( int matrix_layout, char uplo, int64_t n,
+                                 lapack_complex_double* a, int64_t lda,
+                                 const int64_t* ipiv,
+                                 lapack_complex_double* work, int64_t lwork );
+int64_t LAPACKE_zhetri2x_64( int matrix_layout, char uplo, int64_t n,
+                             lapack_complex_double* a, int64_t lda,
+                             const int64_t* ipiv, int64_t nb );
+int64_t LAPACKE_zhetri2x_work_64( int matrix_layout, char uplo, int64_t n,
+                                  lapack_complex_double* a, int64_t lda,
+                                  const int64_t* ipiv,
+                                  lapack_complex_double* work, int64_t nb );
+int64_t LAPACKE_zhetrs2_64( int matrix_layout, char uplo, int64_t n,
+                            int64_t nrhs, const lapack_complex_double* a,
+                            int64_t lda, const int64_t* ipiv,
+                            lapack_complex_double* b, int64_t ldb );
+int64_t LAPACKE_zhetrs2_work_64( int matrix_layout, char uplo, int64_t n,
+                                 int64_t nrhs, const lapack_complex_double* a,
+                                 int64_t lda, const int64_t* ipiv,
+                                 lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* work );
+int64_t LAPACKE_zsyconv_64( int matrix_layout, char uplo, char way, int64_t n,
+                            lapack_complex_double* a, int64_t lda,
+                            const int64_t* ipiv, lapack_complex_double* e );
+int64_t LAPACKE_zsyconv_work_64( int matrix_layout, char uplo, char way,
+                                 int64_t n, lapack_complex_double* a,
+                                 int64_t lda, const int64_t* ipiv,
+                                 lapack_complex_double* e );
+int64_t LAPACKE_zsyswapr_64( int matrix_layout, char uplo, int64_t n,
+                             lapack_complex_double* a, int64_t lda,
+                             int64_t i1, int64_t i2 );
+int64_t LAPACKE_zsyswapr_work_64( int matrix_layout, char uplo, int64_t n,
+                                  lapack_complex_double* a, int64_t lda,
+                                  int64_t i1, int64_t i2 );
+int64_t LAPACKE_zsytri2_64( int matrix_layout, char uplo, int64_t n,
+                            lapack_complex_double* a, int64_t lda,
+                            const int64_t* ipiv );
+int64_t LAPACKE_zsytri2_work_64( int matrix_layout, char uplo, int64_t n,
+                                 lapack_complex_double* a, int64_t lda,
+                                 const int64_t* ipiv,
+                                 lapack_complex_double* work, int64_t lwork );
+int64_t LAPACKE_zsytri2x_64( int matrix_layout, char uplo, int64_t n,
+                             lapack_complex_double* a, int64_t lda,
+                             const int64_t* ipiv, int64_t nb );
+int64_t LAPACKE_zsytri2x_work_64( int matrix_layout, char uplo, int64_t n,
+                                  lapack_complex_double* a, int64_t lda,
+                                  const int64_t* ipiv,
+                                  lapack_complex_double* work, int64_t nb );
+int64_t LAPACKE_zsytrs2_64( int matrix_layout, char uplo, int64_t n,
+                            int64_t nrhs, const lapack_complex_double* a,
+                            int64_t lda, const int64_t* ipiv,
+                            lapack_complex_double* b, int64_t ldb );
+int64_t LAPACKE_zsytrs2_work_64( int matrix_layout, char uplo, int64_t n,
+                                 int64_t nrhs, const lapack_complex_double* a,
+                                 int64_t lda, const int64_t* ipiv,
+                                 lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* work );
+int64_t LAPACKE_zunbdb_64( int matrix_layout, char trans, char signs,
+                           int64_t m, int64_t p, int64_t q,
+                           lapack_complex_double* x11, int64_t ldx11,
+                           lapack_complex_double* x12, int64_t ldx12,
+                           lapack_complex_double* x21, int64_t ldx21,
+                           lapack_complex_double* x22, int64_t ldx22,
+                           double* theta, double* phi,
+                           lapack_complex_double* taup1,
+                           lapack_complex_double* taup2,
+                           lapack_complex_double* tauq1,
+                           lapack_complex_double* tauq2 );
+int64_t LAPACKE_zunbdb_work_64( int matrix_layout, char trans, char signs,
+                                int64_t m, int64_t p, int64_t q,
+                                lapack_complex_double* x11, int64_t ldx11,
+                                lapack_complex_double* x12, int64_t ldx12,
+                                lapack_complex_double* x21, int64_t ldx21,
+                                lapack_complex_double* x22, int64_t ldx22,
+                                double* theta, double* phi,
+                                lapack_complex_double* taup1,
+                                lapack_complex_double* taup2,
+                                lapack_complex_double* tauq1,
+                                lapack_complex_double* tauq2,
+                                lapack_complex_double* work, int64_t lwork );
+int64_t LAPACKE_zuncsd_64( int matrix_layout, char jobu1, char jobu2,
+                           char jobv1t, char jobv2t, char trans, char signs,
+                           int64_t m, int64_t p, int64_t q,
+                           lapack_complex_double* x11, int64_t ldx11,
+                           lapack_complex_double* x12, int64_t ldx12,
+                           lapack_complex_double* x21, int64_t ldx21,
+                           lapack_complex_double* x22, int64_t ldx22,
+                           double* theta, lapack_complex_double* u1,
+                           int64_t ldu1, lapack_complex_double* u2,
+                           int64_t ldu2, lapack_complex_double* v1t,
+                           int64_t ldv1t, lapack_complex_double* v2t,
+                           int64_t ldv2t );
+int64_t LAPACKE_zuncsd_work_64( int matrix_layout, char jobu1, char jobu2,
+                                char jobv1t, char jobv2t, char trans,
+                                char signs, int64_t m, int64_t p,
+                                int64_t q, lapack_complex_double* x11,
+                                int64_t ldx11, lapack_complex_double* x12,
+                                int64_t ldx12, lapack_complex_double* x21,
+                                int64_t ldx21, lapack_complex_double* x22,
+                                int64_t ldx22, double* theta,
+                                lapack_complex_double* u1, int64_t ldu1,
+                                lapack_complex_double* u2, int64_t ldu2,
+                                lapack_complex_double* v1t, int64_t ldv1t,
+                                lapack_complex_double* v2t, int64_t ldv2t,
+                                lapack_complex_double* work, int64_t lwork,
+                                double* rwork, int64_t lrwork,
+                                int64_t* iwork );
+int64_t LAPACKE_zuncsd2by1_64( int matrix_layout, char jobu1, char jobu2,
+                           char jobv1t, int64_t m, int64_t p, int64_t q,
+                           lapack_complex_double* x11, int64_t ldx11,
+                           lapack_complex_double* x21, int64_t ldx21,
+                           double* theta, lapack_complex_double* u1,
+                           int64_t ldu1, lapack_complex_double* u2,
+                           int64_t ldu2, lapack_complex_double* v1t, int64_t ldv1t );
+int64_t LAPACKE_zuncsd2by1_work_64( int matrix_layout, char jobu1, char jobu2,
+                                char jobv1t, int64_t m, int64_t p,
+                                int64_t q, lapack_complex_double* x11, int64_t ldx11,
+                                lapack_complex_double* x21, int64_t ldx21,
+                                double* theta, lapack_complex_double* u1,
+                                int64_t ldu1, lapack_complex_double* u2,
+                                int64_t ldu2, lapack_complex_double* v1t,
+                                int64_t ldv1t, lapack_complex_double* work,
+                                int64_t lwork, double* rwork, int64_t lrwork,
+                                int64_t* iwork );
+
+//LAPACK 3.4.0
+int64_t LAPACKE_sgemqrt_64( int matrix_layout, char side, char trans,
+                            int64_t m, int64_t n, int64_t k,
+                            int64_t nb, const float* v, int64_t ldv,
+                            const float* t, int64_t ldt, float* c,
+                            int64_t ldc );
+int64_t LAPACKE_dgemqrt_64( int matrix_layout, char side, char trans,
+                            int64_t m, int64_t n, int64_t k,
+                            int64_t nb, const double* v, int64_t ldv,
+                            const double* t, int64_t ldt, double* c,
+                            int64_t ldc );
+int64_t LAPACKE_cgemqrt_64( int matrix_layout, char side, char trans,
+                            int64_t m, int64_t n, int64_t k,
+                            int64_t nb, const lapack_complex_float* v,
+                            int64_t ldv, const lapack_complex_float* t,
+                            int64_t ldt, lapack_complex_float* c,
+                            int64_t ldc );
+int64_t LAPACKE_zgemqrt_64( int matrix_layout, char side, char trans,
+                            int64_t m, int64_t n, int64_t k,
+                            int64_t nb, const lapack_complex_double* v,
+                            int64_t ldv, const lapack_complex_double* t,
+                            int64_t ldt, lapack_complex_double* c,
+                            int64_t ldc );
+
+int64_t LAPACKE_sgeqrt_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t nb, float* a, int64_t lda, float* t,
+                           int64_t ldt );
+int64_t LAPACKE_dgeqrt_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t nb, double* a, int64_t lda, double* t,
+                           int64_t ldt );
+int64_t LAPACKE_cgeqrt_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t nb, lapack_complex_float* a,
+                           int64_t lda, lapack_complex_float* t,
+                           int64_t ldt );
+int64_t LAPACKE_zgeqrt_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t nb, lapack_complex_double* a,
+                           int64_t lda, lapack_complex_double* t,
+                           int64_t ldt );
+
+int64_t LAPACKE_sgeqrt2_64( int matrix_layout, int64_t m, int64_t n,
+                            float* a, int64_t lda, float* t,
+                            int64_t ldt );
+int64_t LAPACKE_dgeqrt2_64( int matrix_layout, int64_t m, int64_t n,
+                            double* a, int64_t lda, double* t,
+                            int64_t ldt );
+int64_t LAPACKE_cgeqrt2_64( int matrix_layout, int64_t m, int64_t n,
+                            lapack_complex_float* a, int64_t lda,
+                            lapack_complex_float* t, int64_t ldt );
+int64_t LAPACKE_zgeqrt2_64( int matrix_layout, int64_t m, int64_t n,
+                            lapack_complex_double* a, int64_t lda,
+                            lapack_complex_double* t, int64_t ldt );
+
+int64_t LAPACKE_sgeqrt3_64( int matrix_layout, int64_t m, int64_t n,
+                            float* a, int64_t lda, float* t,
+                            int64_t ldt );
+int64_t LAPACKE_dgeqrt3_64( int matrix_layout, int64_t m, int64_t n,
+                            double* a, int64_t lda, double* t,
+                            int64_t ldt );
+int64_t LAPACKE_cgeqrt3_64( int matrix_layout, int64_t m, int64_t n,
+                            lapack_complex_float* a, int64_t lda,
+                            lapack_complex_float* t, int64_t ldt );
+int64_t LAPACKE_zgeqrt3_64( int matrix_layout, int64_t m, int64_t n,
+                            lapack_complex_double* a, int64_t lda,
+                            lapack_complex_double* t, int64_t ldt );
+
+int64_t LAPACKE_stpmqrt_64( int matrix_layout, char side, char trans,
+                            int64_t m, int64_t n, int64_t k,
+                            int64_t l, int64_t nb, const float* v,
+                            int64_t ldv, const float* t, int64_t ldt,
+                            float* a, int64_t lda, float* b,
+                            int64_t ldb );
+int64_t LAPACKE_dtpmqrt_64( int matrix_layout, char side, char trans,
+                            int64_t m, int64_t n, int64_t k,
+                            int64_t l, int64_t nb, const double* v,
+                            int64_t ldv, const double* t, int64_t ldt,
+                            double* a, int64_t lda, double* b,
+                            int64_t ldb );
+int64_t LAPACKE_ctpmqrt_64( int matrix_layout, char side, char trans,
+                            int64_t m, int64_t n, int64_t k,
+                            int64_t l, int64_t nb,
+                            const lapack_complex_float* v, int64_t ldv,
+                            const lapack_complex_float* t, int64_t ldt,
+                            lapack_complex_float* a, int64_t lda,
+                            lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_ztpmqrt_64( int matrix_layout, char side, char trans,
+                            int64_t m, int64_t n, int64_t k,
+                            int64_t l, int64_t nb,
+                            const lapack_complex_double* v, int64_t ldv,
+                            const lapack_complex_double* t, int64_t ldt,
+                            lapack_complex_double* a, int64_t lda,
+                            lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_stpqrt_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t l, int64_t nb, float* a,
+                           int64_t lda, float* b, int64_t ldb, float* t,
+                           int64_t ldt );
+
+int64_t LAPACKE_dtpqrt_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t l, int64_t nb, double* a,
+                           int64_t lda, double* b, int64_t ldb, double* t,
+                           int64_t ldt );
+int64_t LAPACKE_ctpqrt_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t l, int64_t nb,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* b, int64_t ldb,
+                           lapack_complex_float* t, int64_t ldt );
+int64_t LAPACKE_ztpqrt_64( int matrix_layout, int64_t m, int64_t n,
+                           int64_t l, int64_t nb,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* b, int64_t ldb,
+                           lapack_complex_double* t, int64_t ldt );
+
+int64_t LAPACKE_stpqrt2_64( int matrix_layout,
+                            int64_t m, int64_t n, int64_t l,
+                            float* a, int64_t lda,
+                            float* b, int64_t ldb,
+                            float* t, int64_t ldt );
+int64_t LAPACKE_dtpqrt2_64( int matrix_layout,
+                            int64_t m, int64_t n, int64_t l,
+                            double* a, int64_t lda,
+                            double* b, int64_t ldb,
+                            double* t, int64_t ldt );
+int64_t LAPACKE_ctpqrt2_64( int matrix_layout,
+                            int64_t m, int64_t n, int64_t l,
+                            lapack_complex_float* a, int64_t lda,
+                            lapack_complex_float* b, int64_t ldb,
+                            lapack_complex_float* t, int64_t ldt );
+int64_t LAPACKE_ztpqrt2_64( int matrix_layout,
+                            int64_t m, int64_t n, int64_t l,
+                            lapack_complex_double* a, int64_t lda,
+                            lapack_complex_double* b, int64_t ldb,
+                            lapack_complex_double* t, int64_t ldt );
+
+int64_t LAPACKE_stprfb_64( int matrix_layout, char side, char trans, char direct,
+                           char storev, int64_t m, int64_t n,
+                           int64_t k, int64_t l, const float* v,
+                           int64_t ldv, const float* t, int64_t ldt,
+                           float* a, int64_t lda, float* b, int64_t ldb );
+int64_t LAPACKE_dtprfb_64( int matrix_layout, char side, char trans, char direct,
+                           char storev, int64_t m, int64_t n,
+                           int64_t k, int64_t l, const double* v,
+                           int64_t ldv, const double* t, int64_t ldt,
+                           double* a, int64_t lda, double* b, int64_t ldb );
+int64_t LAPACKE_ctprfb_64( int matrix_layout, char side, char trans, char direct,
+                           char storev, int64_t m, int64_t n,
+                           int64_t k, int64_t l,
+                           const lapack_complex_float* v, int64_t ldv,
+                           const lapack_complex_float* t, int64_t ldt,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_ztprfb_64( int matrix_layout, char side, char trans, char direct,
+                           char storev, int64_t m, int64_t n,
+                           int64_t k, int64_t l,
+                           const lapack_complex_double* v, int64_t ldv,
+                           const lapack_complex_double* t, int64_t ldt,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_sgemqrt_work_64( int matrix_layout, char side, char trans,
+                                 int64_t m, int64_t n, int64_t k,
+                                 int64_t nb, const float* v, int64_t ldv,
+                                 const float* t, int64_t ldt, float* c,
+                                 int64_t ldc, float* work );
+int64_t LAPACKE_dgemqrt_work_64( int matrix_layout, char side, char trans,
+                                 int64_t m, int64_t n, int64_t k,
+                                 int64_t nb, const double* v, int64_t ldv,
+                                 const double* t, int64_t ldt, double* c,
+                                 int64_t ldc, double* work );
+int64_t LAPACKE_cgemqrt_work_64( int matrix_layout, char side, char trans,
+                                 int64_t m, int64_t n, int64_t k,
+                                 int64_t nb, const lapack_complex_float* v,
+                                 int64_t ldv, const lapack_complex_float* t,
+                                 int64_t ldt, lapack_complex_float* c,
+                                 int64_t ldc, lapack_complex_float* work );
+int64_t LAPACKE_zgemqrt_work_64( int matrix_layout, char side, char trans,
+                                 int64_t m, int64_t n, int64_t k,
+                                 int64_t nb, const lapack_complex_double* v,
+                                 int64_t ldv, const lapack_complex_double* t,
+                                 int64_t ldt, lapack_complex_double* c,
+                                 int64_t ldc, lapack_complex_double* work );
+
+int64_t LAPACKE_sgeqrt_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t nb, float* a, int64_t lda,
+                                float* t, int64_t ldt, float* work );
+int64_t LAPACKE_dgeqrt_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t nb, double* a, int64_t lda,
+                                double* t, int64_t ldt, double* work );
+int64_t LAPACKE_cgeqrt_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t nb, lapack_complex_float* a,
+                                int64_t lda, lapack_complex_float* t,
+                                int64_t ldt, lapack_complex_float* work );
+int64_t LAPACKE_zgeqrt_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t nb, lapack_complex_double* a,
+                                int64_t lda, lapack_complex_double* t,
+                                int64_t ldt, lapack_complex_double* work );
+
+int64_t LAPACKE_sgeqrt2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 float* a, int64_t lda, float* t,
+                                 int64_t ldt );
+int64_t LAPACKE_dgeqrt2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 double* a, int64_t lda, double* t,
+                                 int64_t ldt );
+int64_t LAPACKE_cgeqrt2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 lapack_complex_float* a, int64_t lda,
+                                 lapack_complex_float* t, int64_t ldt );
+int64_t LAPACKE_zgeqrt2_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 lapack_complex_double* a, int64_t lda,
+                                 lapack_complex_double* t, int64_t ldt );
+
+int64_t LAPACKE_sgeqrt3_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 float* a, int64_t lda, float* t,
+                                 int64_t ldt );
+int64_t LAPACKE_dgeqrt3_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 double* a, int64_t lda, double* t,
+                                 int64_t ldt );
+int64_t LAPACKE_cgeqrt3_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 lapack_complex_float* a, int64_t lda,
+                                 lapack_complex_float* t, int64_t ldt );
+int64_t LAPACKE_zgeqrt3_work_64( int matrix_layout, int64_t m, int64_t n,
+                                 lapack_complex_double* a, int64_t lda,
+                                 lapack_complex_double* t, int64_t ldt );
+
+int64_t LAPACKE_stpmqrt_work_64( int matrix_layout, char side, char trans,
+                                 int64_t m, int64_t n, int64_t k,
+                                 int64_t l, int64_t nb, const float* v,
+                                 int64_t ldv, const float* t, int64_t ldt,
+                                 float* a, int64_t lda, float* b,
+                                 int64_t ldb, float* work );
+int64_t LAPACKE_dtpmqrt_work_64( int matrix_layout, char side, char trans,
+                                 int64_t m, int64_t n, int64_t k,
+                                 int64_t l, int64_t nb, const double* v,
+                                 int64_t ldv, const double* t,
+                                 int64_t ldt, double* a, int64_t lda,
+                                 double* b, int64_t ldb, double* work );
+int64_t LAPACKE_ctpmqrt_work_64( int matrix_layout, char side, char trans,
+                                 int64_t m, int64_t n, int64_t k,
+                                 int64_t l, int64_t nb,
+                                 const lapack_complex_float* v, int64_t ldv,
+                                 const lapack_complex_float* t, int64_t ldt,
+                                 lapack_complex_float* a, int64_t lda,
+                                 lapack_complex_float* b, int64_t ldb,
+                                 lapack_complex_float* work );
+int64_t LAPACKE_ztpmqrt_work_64( int matrix_layout, char side, char trans,
+                                 int64_t m, int64_t n, int64_t k,
+                                 int64_t l, int64_t nb,
+                                 const lapack_complex_double* v, int64_t ldv,
+                                 const lapack_complex_double* t, int64_t ldt,
+                                 lapack_complex_double* a, int64_t lda,
+                                 lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* work );
+
+int64_t LAPACKE_stpqrt_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t l, int64_t nb, float* a,
+                                int64_t lda, float* b, int64_t ldb,
+                                float* t, int64_t ldt, float* work );
+int64_t LAPACKE_dtpqrt_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t l, int64_t nb, double* a,
+                                int64_t lda, double* b, int64_t ldb,
+                                double* t, int64_t ldt, double* work );
+int64_t LAPACKE_ctpqrt_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t l, int64_t nb,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* t, int64_t ldt,
+                                lapack_complex_float* work );
+int64_t LAPACKE_ztpqrt_work_64( int matrix_layout, int64_t m, int64_t n,
+                                int64_t l, int64_t nb,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* t, int64_t ldt,
+                                lapack_complex_double* work );
+
+int64_t LAPACKE_stpqrt2_work_64( int matrix_layout,
+                                 int64_t m, int64_t n, int64_t l,
+                                 float* a, int64_t lda,
+                                 float* b, int64_t ldb,
+                                 float* t, int64_t ldt );
+int64_t LAPACKE_dtpqrt2_work_64( int matrix_layout,
+                                 int64_t m, int64_t n, int64_t l,
+                                 double* a, int64_t lda,
+                                 double* b, int64_t ldb,
+                                 double* t, int64_t ldt );
+int64_t LAPACKE_ctpqrt2_work_64( int matrix_layout,
+                                 int64_t m, int64_t n, int64_t l,
+                                 lapack_complex_float* a, int64_t lda,
+                                 lapack_complex_float* b, int64_t ldb,
+                                 lapack_complex_float* t, int64_t ldt );
+int64_t LAPACKE_ztpqrt2_work_64( int matrix_layout,
+                                 int64_t m, int64_t n, int64_t l,
+                                 lapack_complex_double* a, int64_t lda,
+                                 lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* t, int64_t ldt );
+
+int64_t LAPACKE_stprfb_work_64( int matrix_layout, char side, char trans,
+                                char direct, char storev, int64_t m,
+                                int64_t n, int64_t k, int64_t l,
+                                const float* v, int64_t ldv, const float* t,
+                                int64_t ldt, float* a, int64_t lda,
+                                float* b, int64_t ldb, float* work,
+                                int64_t ldwork );
+int64_t LAPACKE_dtprfb_work_64( int matrix_layout, char side, char trans,
+                                char direct, char storev, int64_t m,
+                                int64_t n, int64_t k, int64_t l,
+                                const double* v, int64_t ldv,
+                                const double* t, int64_t ldt, double* a,
+                                int64_t lda, double* b, int64_t ldb,
+                                double* work, int64_t ldwork );
+int64_t LAPACKE_ctprfb_work_64( int matrix_layout, char side, char trans,
+                                char direct, char storev, int64_t m,
+                                int64_t n, int64_t k, int64_t l,
+                                const lapack_complex_float* v, int64_t ldv,
+                                const lapack_complex_float* t, int64_t ldt,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* b, int64_t ldb,
+                                lapack_complex_float* work, int64_t ldwork );
+int64_t LAPACKE_ztprfb_work_64( int matrix_layout, char side, char trans,
+                                char direct, char storev, int64_t m,
+                                int64_t n, int64_t k, int64_t l,
+                                const lapack_complex_double* v, int64_t ldv,
+                                const lapack_complex_double* t, int64_t ldt,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* b, int64_t ldb,
+                                lapack_complex_double* work, int64_t ldwork );
+//LAPACK 3.X.X
+int64_t LAPACKE_ssysv_rook_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, float* a, int64_t lda,
+                               int64_t* ipiv, float* b, int64_t ldb );
+int64_t LAPACKE_dsysv_rook_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, double* a, int64_t lda,
+                               int64_t* ipiv, double* b, int64_t ldb );
+int64_t LAPACKE_csysv_rook_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_float* a,
+                               int64_t lda, int64_t* ipiv,
+                               lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zsysv_rook_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_double* a,
+                               int64_t lda, int64_t* ipiv,
+                               lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_ssytrf_rook_64( int matrix_layout, char uplo, int64_t n, float* a,
+                           int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_dsytrf_rook_64( int matrix_layout, char uplo, int64_t n, double* a,
+                           int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_csytrf_rook_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           int64_t* ipiv );
+int64_t LAPACKE_zsytrf_rook_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           int64_t* ipiv );
+
+int64_t LAPACKE_ssytrs_rook_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const float* a, int64_t lda,
+                           const int64_t* ipiv, float* b, int64_t ldb );
+int64_t LAPACKE_dsytrs_rook_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const double* a, int64_t lda,
+                           const int64_t* ipiv, double* b, int64_t ldb );
+int64_t LAPACKE_csytrs_rook_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* a,
+                           int64_t lda, const int64_t* ipiv,
+                           lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zsytrs_rook_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* a,
+                           int64_t lda, const int64_t* ipiv,
+                           lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_chetrf_rook_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           int64_t* ipiv );
+int64_t LAPACKE_zhetrf_rook_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           int64_t* ipiv );
+
+int64_t LAPACKE_chetrs_rook_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_float* a,
+                           int64_t lda, const int64_t* ipiv,
+                           lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zhetrs_rook_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const lapack_complex_double* a,
+                           int64_t lda, const int64_t* ipiv,
+                           lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_csyr_64( int matrix_layout, char uplo, int64_t n,
+                             lapack_complex_float alpha,
+                             const lapack_complex_float* x, int64_t incx,
+                             lapack_complex_float* a, int64_t lda );
+int64_t LAPACKE_zsyr_64( int matrix_layout, char uplo, int64_t n,
+                             lapack_complex_double alpha,
+                             const lapack_complex_double* x, int64_t incx,
+                             lapack_complex_double* a, int64_t lda );
+
+int64_t LAPACKE_ssysv_rook_work_64( int matrix_layout, char uplo, int64_t n,
+                                    int64_t nrhs, float* a, int64_t lda,
+                                    int64_t* ipiv, float* b, int64_t ldb,
+                                    float* work, int64_t lwork );
+int64_t LAPACKE_dsysv_rook_work_64( int matrix_layout, char uplo, int64_t n,
+                                    int64_t nrhs, double* a, int64_t lda,
+                                    int64_t* ipiv, double* b, int64_t ldb,
+                                    double* work, int64_t lwork );
+int64_t LAPACKE_csysv_rook_work_64( int matrix_layout, char uplo, int64_t n,
+                                    int64_t nrhs, lapack_complex_float* a,
+                                    int64_t lda, int64_t* ipiv,
+                                    lapack_complex_float* b, int64_t ldb,
+                                    lapack_complex_float* work,
+                                    int64_t lwork );
+int64_t LAPACKE_zsysv_rook_work_64( int matrix_layout, char uplo, int64_t n,
+                                    int64_t nrhs, lapack_complex_double* a,
+                                    int64_t lda, int64_t* ipiv,
+                                    lapack_complex_double* b, int64_t ldb,
+                                    lapack_complex_double* work,
+                                    int64_t lwork );
+
+int64_t LAPACKE_ssytrf_rook_work_64( int matrix_layout, char uplo, int64_t n,
+                                float* a, int64_t lda, int64_t* ipiv,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dsytrf_rook_work_64( int matrix_layout, char uplo, int64_t n,
+                                double* a, int64_t lda, int64_t* ipiv,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_csytrf_rook_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                int64_t* ipiv, lapack_complex_float* work,
+                                int64_t lwork );
+int64_t LAPACKE_zsytrf_rook_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                int64_t* ipiv, lapack_complex_double* work,
+                                int64_t lwork );
+
+int64_t LAPACKE_ssytrs_rook_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const float* a, int64_t lda,
+                                const int64_t* ipiv, float* b,
+                                int64_t ldb );
+int64_t LAPACKE_dsytrs_rook_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const double* a,
+                                int64_t lda, const int64_t* ipiv,
+                                double* b, int64_t ldb );
+int64_t LAPACKE_csytrs_rook_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* a,
+                                int64_t lda, const int64_t* ipiv,
+                                lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zsytrs_rook_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_double* a,
+                                int64_t lda, const int64_t* ipiv,
+                                lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_chetrf_rook_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                int64_t* ipiv, lapack_complex_float* work,
+                                int64_t lwork );
+int64_t LAPACKE_zhetrf_rook_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                int64_t* ipiv, lapack_complex_double* work,
+                                int64_t lwork );
+
+int64_t LAPACKE_chetrs_rook_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_float* a,
+                                int64_t lda, const int64_t* ipiv,
+                                lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zhetrs_rook_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const lapack_complex_double* a,
+                                int64_t lda, const int64_t* ipiv,
+                                lapack_complex_double* b, int64_t ldb );
+
+
+int64_t LAPACKE_csyr_work_64( int matrix_layout, char uplo, int64_t n,
+                                  lapack_complex_float alpha,
+                                  const lapack_complex_float* x,
+                                  int64_t incx, lapack_complex_float* a,
+                                  int64_t lda );
+int64_t LAPACKE_zsyr_work_64( int matrix_layout, char uplo, int64_t n,
+                                  lapack_complex_double alpha,
+                                  const lapack_complex_double* x,
+                                  int64_t incx, lapack_complex_double* a,
+                                  int64_t lda );
+void LAPACKE_ilaver_64( int64_t* vers_major,
+                     int64_t* vers_minor,
+                     int64_t* vers_patch );
+// LAPACK 3.7.0
+int64_t LAPACKE_ssysv_aa_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, float* a, int64_t lda,
+                          int64_t* ipiv, float* b, int64_t ldb );
+int64_t LAPACKE_ssysv_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, float* a, int64_t lda,
+                               int64_t* ipiv, float* b, int64_t ldb,
+                               float* work, int64_t lwork );
+int64_t LAPACKE_dsysv_aa_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, double* a, int64_t lda,
+                          int64_t* ipiv, double* b, int64_t ldb );
+int64_t LAPACKE_dsysv_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, double* a, int64_t lda,
+                               int64_t* ipiv, double* b, int64_t ldb,
+                               double* work, int64_t lwork );
+int64_t LAPACKE_csysv_aa_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_float* a,
+                          int64_t lda, int64_t* ipiv,
+                          lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_csysv_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_float* a,
+                               int64_t lda, int64_t* ipiv,
+                               lapack_complex_float* b, int64_t ldb,
+                               lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zsysv_aa_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_double* a,
+                          int64_t lda, int64_t* ipiv,
+                          lapack_complex_double* b, int64_t ldb );
+int64_t LAPACKE_zsysv_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_double* a,
+                               int64_t lda, int64_t* ipiv,
+                               lapack_complex_double* b, int64_t ldb,
+                               lapack_complex_double* work, int64_t lwork );
+int64_t LAPACKE_chesv_aa_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_float* a,
+                          int64_t lda, int64_t* ipiv,
+                          lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_chesv_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_float* a,
+                               int64_t lda, int64_t* ipiv,
+                               lapack_complex_float* b, int64_t ldb,
+                               lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zhesv_aa_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_double* a,
+                          int64_t lda, int64_t* ipiv,
+                          lapack_complex_double* b, int64_t ldb );
+int64_t LAPACKE_zhesv_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_double* a,
+                               int64_t lda, int64_t* ipiv,
+                               lapack_complex_double* b, int64_t ldb,
+                               lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_ssytrf_aa_64( int matrix_layout, char uplo, int64_t n, float* a,
+                           int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_dsytrf_aa_64( int matrix_layout, char uplo, int64_t n, double* a,
+                           int64_t lda, int64_t* ipiv );
+int64_t LAPACKE_csytrf_aa_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           int64_t* ipiv );
+int64_t LAPACKE_zsytrf_aa_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           int64_t* ipiv );
+int64_t LAPACKE_chetrf_aa_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           int64_t* ipiv );
+int64_t LAPACKE_zhetrf_aa_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           int64_t* ipiv );
+
+int64_t LAPACKE_ssytrf_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                                float* a, int64_t lda, int64_t* ipiv,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dsytrf_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                                double* a, int64_t lda, int64_t* ipiv,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_csytrf_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                int64_t* ipiv, lapack_complex_float* work,
+                                int64_t lwork );
+int64_t LAPACKE_zsytrf_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                int64_t* ipiv, lapack_complex_double* work,
+                                int64_t lwork );
+int64_t LAPACKE_chetrf_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                int64_t* ipiv, lapack_complex_float* work,
+                                int64_t lwork );
+int64_t LAPACKE_zhetrf_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                int64_t* ipiv, lapack_complex_double* work,
+                                int64_t lwork );
+
+
+int64_t LAPACKE_csytrs_aa_64( int matrix_layout, char uplo, int64_t n,
+                            int64_t nrhs, const lapack_complex_float* a,
+                            int64_t lda, const int64_t* ipiv,
+                            lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_csytrs_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                                 int64_t nrhs, const lapack_complex_float* a,
+                                 int64_t lda, const int64_t* ipiv,
+                                 lapack_complex_float* b, int64_t ldb,
+                                 lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_chetrs_aa_64( int matrix_layout, char uplo, int64_t n,
+                            int64_t nrhs, const lapack_complex_float* a,
+                            int64_t lda, const int64_t* ipiv,
+                            lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_chetrs_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                                 int64_t nrhs, const lapack_complex_float* a,
+                                 int64_t lda, const int64_t* ipiv,
+                                 lapack_complex_float* b, int64_t ldb,
+                                 lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_dsytrs_aa_64( int matrix_layout, char uplo, int64_t n,
+                            int64_t nrhs, const double* a, int64_t lda,
+                            const int64_t* ipiv, double* b, int64_t ldb );
+int64_t LAPACKE_dsytrs_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                                 int64_t nrhs, const double* a,
+                                 int64_t lda, const int64_t* ipiv,
+                                 double* b, int64_t ldb, double* work, int64_t lwork );
+int64_t LAPACKE_ssytrs_aa_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const float* a, int64_t lda,
+                           const int64_t* ipiv, float* b, int64_t ldb );
+int64_t LAPACKE_ssytrs_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const float* a, int64_t lda,
+                                const int64_t* ipiv, float* b,
+                                int64_t ldb, float* work, int64_t lwork );
+int64_t LAPACKE_zsytrs_aa_64( int matrix_layout, char uplo, int64_t n,
+                            int64_t nrhs, const lapack_complex_double* a,
+                            int64_t lda, const int64_t* ipiv,
+                            lapack_complex_double* b, int64_t ldb );
+int64_t LAPACKE_zsytrs_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                                 int64_t nrhs, const lapack_complex_double* a,
+                                 int64_t lda, const int64_t* ipiv,
+                                 lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* work,  int64_t lwork);
+int64_t LAPACKE_zhetrs_aa_64( int matrix_layout, char uplo, int64_t n,
+                            int64_t nrhs, const lapack_complex_double* a,
+                            int64_t lda, const int64_t* ipiv,
+                            lapack_complex_double* b, int64_t ldb );
+int64_t LAPACKE_zhetrs_aa_work_64( int matrix_layout, char uplo, int64_t n,
+                                 int64_t nrhs, const lapack_complex_double* a,
+                                 int64_t lda, const int64_t* ipiv,
+                                 lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* work,  int64_t lwork);
+
+
+int64_t LAPACKE_ssysv_rk_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, float* a, int64_t lda,
+                          float* e, int64_t* ipiv, float* b, int64_t ldb );
+int64_t LAPACKE_ssysv_rk_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, float* a, int64_t lda,
+                               float* e, int64_t* ipiv, float* b, int64_t ldb,
+                               float* work, int64_t lwork );
+int64_t LAPACKE_dsysv_rk_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, double* a, int64_t lda,
+                          double* e, int64_t* ipiv, double* b, int64_t ldb );
+int64_t LAPACKE_dsysv_rk_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, double* a, int64_t lda,
+                               double* e, int64_t* ipiv, double* b, int64_t ldb,
+                               double* work, int64_t lwork );
+int64_t LAPACKE_csysv_rk_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_float* a,
+                          int64_t lda, lapack_complex_float* e, int64_t* ipiv,
+                          lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_csysv_rk_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_float* a,
+                               int64_t lda, lapack_complex_float* e, int64_t* ipiv,
+                               lapack_complex_float* b, int64_t ldb,
+                               lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zsysv_rk_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_double* a,
+                          int64_t lda, lapack_complex_double* e, int64_t* ipiv,
+                          lapack_complex_double* b, int64_t ldb );
+int64_t LAPACKE_zsysv_rk_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_double* a,
+                               int64_t lda, lapack_complex_double* e, int64_t* ipiv,
+                               lapack_complex_double* b, int64_t ldb,
+                               lapack_complex_double* work, int64_t lwork );
+int64_t LAPACKE_chesv_rk_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_float* a,
+                          int64_t lda, lapack_complex_float* e, int64_t* ipiv,
+                          lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_chesv_rk_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_float* a,
+                               int64_t lda, lapack_complex_float* e, int64_t* ipiv,
+                               lapack_complex_float* b, int64_t ldb,
+                               lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zhesv_rk_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_double* a,
+                          int64_t lda, lapack_complex_double* e, int64_t* ipiv,
+                          lapack_complex_double* b, int64_t ldb );
+int64_t LAPACKE_zhesv_rk_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_double* a,
+                               int64_t lda, lapack_complex_double* e, int64_t* ipiv,
+                               lapack_complex_double* b, int64_t ldb,
+                               lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_ssytrf_rk_64( int matrix_layout, char uplo, int64_t n, float* a,
+                           int64_t lda, float* e, int64_t* ipiv );
+int64_t LAPACKE_dsytrf_rk_64( int matrix_layout, char uplo, int64_t n, double* a,
+                           int64_t lda, double* e, int64_t* ipiv );
+int64_t LAPACKE_csytrf_rk_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* e, int64_t* ipiv );
+int64_t LAPACKE_zsytrf_rk_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* e, int64_t* ipiv );
+int64_t LAPACKE_chetrf_rk_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           lapack_complex_float* e, int64_t* ipiv );
+int64_t LAPACKE_zhetrf_rk_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           lapack_complex_double* e, int64_t* ipiv );
+int64_t LAPACKE_ssytrf_rk_work_64( int matrix_layout, char uplo, int64_t n,
+                                float* a, int64_t lda, float* e, int64_t* ipiv,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dsytrf_rk_work_64( int matrix_layout, char uplo, int64_t n,
+                                double* a, int64_t lda, double* e, int64_t* ipiv,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_csytrf_rk_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* e,
+                                int64_t* ipiv, lapack_complex_float* work,
+                                int64_t lwork );
+int64_t LAPACKE_zsytrf_rk_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* e,
+                                int64_t* ipiv, lapack_complex_double* work,
+                                int64_t lwork );
+int64_t LAPACKE_chetrf_rk_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                lapack_complex_float* e,
+                                int64_t* ipiv, lapack_complex_float* work,
+                                int64_t lwork );
+int64_t LAPACKE_zhetrf_rk_work_64( int matrix_layout, char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                lapack_complex_double* e,
+                                int64_t* ipiv, lapack_complex_double* work,
+                                int64_t lwork );
+
+int64_t LAPACKE_csytrs_3_64( int matrix_layout, char uplo, int64_t n,
+                            int64_t nrhs, const lapack_complex_float* a,
+                            int64_t lda, const lapack_complex_float* e,
+                            const int64_t* ipiv,
+                            lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_csytrs_3_work_64( int matrix_layout, char uplo, int64_t n,
+                                 int64_t nrhs, const lapack_complex_float* a,
+                                 int64_t lda, const lapack_complex_float* e,
+                                 const int64_t* ipiv,
+                                 lapack_complex_float* b, int64_t ldb);
+int64_t LAPACKE_chetrs_3_64( int matrix_layout, char uplo, int64_t n,
+                            int64_t nrhs, const lapack_complex_float* a,
+                            int64_t lda, const lapack_complex_float* e,
+                            const int64_t* ipiv,
+                            lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_chetrs_3_work_64( int matrix_layout, char uplo, int64_t n,
+                                 int64_t nrhs, const lapack_complex_float* a,
+                                 int64_t lda, const lapack_complex_float* e,
+                                 const int64_t* ipiv,
+                                 lapack_complex_float* b, int64_t ldb);
+int64_t LAPACKE_dsytrs_3_64( int matrix_layout, char uplo, int64_t n,
+                            int64_t nrhs, const double* a, int64_t lda,
+                            const double* e,
+                            const int64_t* ipiv, double* b, int64_t ldb );
+int64_t LAPACKE_dsytrs_3_work_64( int matrix_layout, char uplo, int64_t n,
+                                 int64_t nrhs, const double* a,
+                                 int64_t lda, const double* e,
+                                 const int64_t* ipiv,
+                                 double* b, int64_t ldb);
+int64_t LAPACKE_ssytrs_3_64( int matrix_layout, char uplo, int64_t n,
+                           int64_t nrhs, const float* a, int64_t lda,
+                           const float* e,
+                           const int64_t* ipiv, float* b, int64_t ldb );
+int64_t LAPACKE_ssytrs_3_work_64( int matrix_layout, char uplo, int64_t n,
+                                int64_t nrhs, const float* a, int64_t lda,
+                                const float* e, const int64_t* ipiv, float* b,
+                                int64_t ldb);
+int64_t LAPACKE_zsytrs_3_64( int matrix_layout, char uplo, int64_t n,
+                            int64_t nrhs, const lapack_complex_double* a,
+                            int64_t lda, const lapack_complex_double* e,
+                            const int64_t* ipiv,
+                            lapack_complex_double* b, int64_t ldb );
+int64_t LAPACKE_zsytrs_3_work_64( int matrix_layout, char uplo, int64_t n,
+                                 int64_t nrhs, const lapack_complex_double* a,
+                                 int64_t lda, const lapack_complex_double* e,
+                                 const int64_t* ipiv,
+                                 lapack_complex_double* b, int64_t ldb);
+int64_t LAPACKE_zhetrs_3_64( int matrix_layout, char uplo, int64_t n,
+                            int64_t nrhs, const lapack_complex_double* a,
+                            int64_t lda, const lapack_complex_double* e,
+                            const int64_t* ipiv,
+                            lapack_complex_double* b, int64_t ldb );
+int64_t LAPACKE_zhetrs_3_work_64( int matrix_layout, char uplo, int64_t n,
+                                 int64_t nrhs, const lapack_complex_double* a,
+                                 int64_t lda, const lapack_complex_double* e,
+                                 const int64_t* ipiv,
+                                 lapack_complex_double* b, int64_t ldb);
+
+int64_t LAPACKE_ssytri_3_64( int matrix_layout, char uplo, int64_t n, float* a,
+                           int64_t lda, const float* e, const int64_t* ipiv );
+int64_t LAPACKE_dsytri_3_64( int matrix_layout, char uplo, int64_t n, double* a,
+                           int64_t lda, const double* e, const int64_t* ipiv );
+int64_t LAPACKE_csytri_3_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* e, const int64_t* ipiv );
+int64_t LAPACKE_zsytri_3_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* e, const int64_t* ipiv );
+int64_t LAPACKE_chetri_3_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* e, const int64_t* ipiv );
+int64_t LAPACKE_zhetri_3_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* e, const int64_t* ipiv );
+int64_t LAPACKE_ssytri_3_work_64( int matrix_layout, char uplo, int64_t n, float* a,
+                           int64_t lda, const float* e, const int64_t* ipiv,
+                           float* work, int64_t lwork  );
+int64_t LAPACKE_dsytri_3_work_64( int matrix_layout, char uplo, int64_t n, double* a,
+                           int64_t lda, const double* e, const int64_t* ipiv,
+                           double* work, int64_t lwork  );
+int64_t LAPACKE_csytri_3_work_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* e, const int64_t* ipiv,
+                           lapack_complex_float* work, int64_t lwork  );
+int64_t LAPACKE_zsytri_3_work_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* e, const int64_t* ipiv,
+                           lapack_complex_double* work, int64_t lwork  );
+int64_t LAPACKE_chetri_3_work_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* e, const int64_t* ipiv,
+                           lapack_complex_float* work, int64_t lwork  );
+int64_t LAPACKE_zhetri_3_work_64( int matrix_layout, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* e, const int64_t* ipiv,
+                           lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_ssycon_3_64( int matrix_layout, char uplo, int64_t n,
+                           const float* a, int64_t lda, const float* e,
+                           const int64_t* ipiv, float anorm, float* rcond );
+int64_t LAPACKE_dsycon_3_64( int matrix_layout, char uplo, int64_t n,
+                           const double* a, int64_t lda, const double* e,
+                           const int64_t* ipiv, double anorm,
+                           double* rcond );
+int64_t LAPACKE_csycon_3_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* e,
+                           const int64_t* ipiv, float anorm, float* rcond );
+int64_t LAPACKE_zsycon_3_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* e,
+                           const int64_t* ipiv, double anorm,
+                           double* rcond );
+int64_t LAPACKE_checon_3_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* e,
+                           const int64_t* ipiv, float anorm, float* rcond );
+int64_t LAPACKE_zhecon_3_64( int matrix_layout, char uplo, int64_t n,
+                           const lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* e,
+                           const int64_t* ipiv, double anorm,
+                           double* rcond );
+int64_t LAPACKE_ssycon_3_work_64( int matrix_layout, char uplo, int64_t n,
+                                const float* a, int64_t lda, const float* e,
+                                const int64_t* ipiv, float anorm,
+                                float* rcond, float* work, int64_t* iwork );
+int64_t LAPACKE_dsycon_3_work_64( int matrix_layout, char uplo, int64_t n,
+                                const double* a, int64_t lda, const double* e,
+                                const int64_t* ipiv, double anorm,
+                                double* rcond, double* work,
+                                int64_t* iwork );
+int64_t LAPACKE_csycon_3_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_float* a, int64_t lda,
+                                const lapack_complex_float* e,
+                                const int64_t* ipiv, float anorm,
+                                float* rcond, lapack_complex_float* work );
+int64_t LAPACKE_zsycon_3_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_double* a, int64_t lda,
+                                const lapack_complex_double* e,
+                                const int64_t* ipiv, double anorm,
+                                double* rcond, lapack_complex_double* work );
+int64_t LAPACKE_checon_3_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_float* a, int64_t lda,
+                                const lapack_complex_float* e,
+                                const int64_t* ipiv, float anorm,
+                                float* rcond, lapack_complex_float* work );
+int64_t LAPACKE_zhecon_3_work_64( int matrix_layout, char uplo, int64_t n,
+                                const lapack_complex_double* a, int64_t lda,
+                                const lapack_complex_double* e,
+                                const int64_t* ipiv, double anorm,
+                                double* rcond, lapack_complex_double* work );
+
+int64_t LAPACKE_sgelq_64( int matrix_layout, int64_t m, int64_t n,
+                          float* a, int64_t lda,
+                          float* t, int64_t tsize );
+int64_t LAPACKE_dgelq_64( int matrix_layout, int64_t m, int64_t n,
+                          double* a, int64_t lda,
+                          double* t, int64_t tsize );
+int64_t LAPACKE_cgelq_64( int matrix_layout, int64_t m, int64_t n,
+                          lapack_complex_float* a, int64_t lda,
+                          lapack_complex_float* t, int64_t tsize );
+int64_t LAPACKE_zgelq_64( int matrix_layout, int64_t m, int64_t n,
+                          lapack_complex_double* a, int64_t lda,
+                          lapack_complex_double* t, int64_t tsize );
+
+int64_t LAPACKE_sgelq_work_64( int matrix_layout, int64_t m, int64_t n,
+                               float* a, int64_t lda,
+                               float* t, int64_t tsize,
+                               float* work, int64_t lwork );
+int64_t LAPACKE_dgelq_work_64( int matrix_layout, int64_t m, int64_t n,
+                               double* a, int64_t lda,
+                               double* t, int64_t tsize,
+                               double* work, int64_t lwork );
+int64_t LAPACKE_cgelq_work_64( int matrix_layout, int64_t m, int64_t n,
+                               lapack_complex_float* a, int64_t lda,
+                               lapack_complex_float* t, int64_t tsize,
+                               lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zgelq_work_64( int matrix_layout, int64_t m, int64_t n,
+                               lapack_complex_double* a, int64_t lda,
+                               lapack_complex_double* t, int64_t tsize,
+                               lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sgemlq_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const float* a, int64_t lda,
+                           const float* t, int64_t tsize,
+                           float* c, int64_t ldc );
+int64_t LAPACKE_dgemlq_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const double* a, int64_t lda,
+                           const double* t, int64_t tsize,
+                           double* c, int64_t ldc );
+int64_t LAPACKE_cgemlq_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* t, int64_t tsize,
+                           lapack_complex_float* c, int64_t ldc );
+int64_t LAPACKE_zgemlq_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* t, int64_t tsize,
+                           lapack_complex_double* c, int64_t ldc );
+
+int64_t LAPACKE_sgemlq_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const float* a, int64_t lda,
+                                const float* t, int64_t tsize,
+                                float* c, int64_t ldc,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dgemlq_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const double* a, int64_t lda,
+                                const double* t, int64_t tsize,
+                                double* c, int64_t ldc,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_cgemlq_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const lapack_complex_float* a, int64_t lda,
+                                const lapack_complex_float* t, int64_t tsize,
+                                lapack_complex_float* c, int64_t ldc,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zgemlq_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const lapack_complex_double* a, int64_t lda,
+                                const lapack_complex_double* t, int64_t tsize,
+                                lapack_complex_double* c, int64_t ldc,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sgeqr_64( int matrix_layout, int64_t m, int64_t n,
+                          float* a, int64_t lda,
+                          float* t, int64_t tsize );
+int64_t LAPACKE_dgeqr_64( int matrix_layout, int64_t m, int64_t n,
+                          double* a, int64_t lda,
+                          double* t, int64_t tsize );
+int64_t LAPACKE_cgeqr_64( int matrix_layout, int64_t m, int64_t n,
+                          lapack_complex_float* a, int64_t lda,
+                          lapack_complex_float* t, int64_t tsize );
+int64_t LAPACKE_zgeqr_64( int matrix_layout, int64_t m, int64_t n,
+                          lapack_complex_double* a, int64_t lda,
+                          lapack_complex_double* t, int64_t tsize );
+
+int64_t LAPACKE_sgeqr_work_64( int matrix_layout, int64_t m, int64_t n,
+                               float* a, int64_t lda,
+                               float* t, int64_t tsize,
+                               float* work, int64_t lwork );
+int64_t LAPACKE_dgeqr_work_64( int matrix_layout, int64_t m, int64_t n,
+                               double* a, int64_t lda,
+                               double* t, int64_t tsize,
+                               double* work, int64_t lwork );
+int64_t LAPACKE_cgeqr_work_64( int matrix_layout, int64_t m, int64_t n,
+                               lapack_complex_float* a, int64_t lda,
+                               lapack_complex_float* t, int64_t tsize,
+                               lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zgeqr_work_64( int matrix_layout, int64_t m, int64_t n,
+                               lapack_complex_double* a, int64_t lda,
+                               lapack_complex_double* t, int64_t tsize,
+                               lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sgemqr_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const float* a, int64_t lda,
+                           const float* t, int64_t tsize,
+                           float* c, int64_t ldc );
+int64_t LAPACKE_dgemqr_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const double* a, int64_t lda,
+                           const double* t, int64_t tsize,
+                           double* c, int64_t ldc );
+int64_t LAPACKE_cgemqr_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const lapack_complex_float* a, int64_t lda,
+                           const lapack_complex_float* t, int64_t tsize,
+                           lapack_complex_float* c, int64_t ldc );
+int64_t LAPACKE_zgemqr_64( int matrix_layout, char side, char trans,
+                           int64_t m, int64_t n, int64_t k,
+                           const lapack_complex_double* a, int64_t lda,
+                           const lapack_complex_double* t, int64_t tsize,
+                           lapack_complex_double* c, int64_t ldc );
+
+int64_t LAPACKE_sgemqr_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const float* a, int64_t lda,
+                                const float* t, int64_t tsize,
+                                float* c, int64_t ldc,
+                                float* work, int64_t lwork );
+int64_t LAPACKE_dgemqr_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const double* a, int64_t lda,
+                                const double* t, int64_t tsize,
+                                double* c, int64_t ldc,
+                                double* work, int64_t lwork );
+int64_t LAPACKE_cgemqr_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const lapack_complex_float* a, int64_t lda,
+                                const lapack_complex_float* t, int64_t tsize,
+                                lapack_complex_float* c, int64_t ldc,
+                                lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zgemqr_work_64( int matrix_layout, char side, char trans,
+                                int64_t m, int64_t n, int64_t k,
+                                const lapack_complex_double* a, int64_t lda,
+                                const lapack_complex_double* t, int64_t tsize,
+                                lapack_complex_double* c, int64_t ldc,
+                                lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sgetsls_64( int matrix_layout, char trans, int64_t m,
+                            int64_t n, int64_t nrhs, float* a,
+                            int64_t lda, float* b, int64_t ldb );
+int64_t LAPACKE_dgetsls_64( int matrix_layout, char trans, int64_t m,
+                            int64_t n, int64_t nrhs, double* a,
+                            int64_t lda, double* b, int64_t ldb );
+int64_t LAPACKE_cgetsls_64( int matrix_layout, char trans, int64_t m,
+                            int64_t n, int64_t nrhs,
+                            lapack_complex_float* a, int64_t lda,
+                            lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zgetsls_64( int matrix_layout, char trans, int64_t m,
+                            int64_t n, int64_t nrhs,
+                            lapack_complex_double* a, int64_t lda,
+                            lapack_complex_double* b, int64_t ldb );
+
+int64_t LAPACKE_sgetsls_work_64( int matrix_layout, char trans, int64_t m,
+                                 int64_t n, int64_t nrhs, float* a,
+                                 int64_t lda, float* b, int64_t ldb,
+                                 float* work, int64_t lwork );
+int64_t LAPACKE_dgetsls_work_64( int matrix_layout, char trans, int64_t m,
+                                 int64_t n, int64_t nrhs, double* a,
+                                 int64_t lda, double* b, int64_t ldb,
+                                 double* work, int64_t lwork );
+int64_t LAPACKE_cgetsls_work_64( int matrix_layout, char trans, int64_t m,
+                                 int64_t n, int64_t nrhs,
+                                 lapack_complex_float* a, int64_t lda,
+                                 lapack_complex_float* b, int64_t ldb,
+                                 lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zgetsls_work_64( int matrix_layout, char trans, int64_t m,
+                                 int64_t n, int64_t nrhs,
+                                 lapack_complex_double* a, int64_t lda,
+                                 lapack_complex_double* b, int64_t ldb,
+                                 lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_sgetsqrhrt_64( int matrix_layout, int64_t m, int64_t n,
+                               int64_t mb1, int64_t nb1, int64_t nb2,
+                               float* a, int64_t lda,
+                               float* t, int64_t ldt );
+int64_t LAPACKE_dgetsqrhrt_64( int matrix_layout, int64_t m, int64_t n,
+                               int64_t mb1, int64_t nb1, int64_t nb2,
+                               double* a, int64_t lda,
+                               double* t, int64_t ldt );
+int64_t LAPACKE_cgetsqrhrt_64( int matrix_layout, int64_t m, int64_t n,
+                               int64_t mb1, int64_t nb1, int64_t nb2,
+                               lapack_complex_float* a, int64_t lda,
+                               lapack_complex_float* t, int64_t ldt );
+int64_t LAPACKE_zgetsqrhrt_64( int matrix_layout, int64_t m, int64_t n,
+                               int64_t mb1, int64_t nb1, int64_t nb2,
+                               lapack_complex_double* a, int64_t lda,
+                               lapack_complex_double* t, int64_t ldt );
+
+int64_t LAPACKE_sgetsqrhrt_work_64( int matrix_layout, int64_t m, int64_t n,
+                                    int64_t mb1, int64_t nb1, int64_t nb2,
+                                    float* a, int64_t lda,
+                                    float* t, int64_t ldt,
+                                    float* work, int64_t lwork );
+int64_t LAPACKE_dgetsqrhrt_work_64( int matrix_layout, int64_t m, int64_t n,
+                                    int64_t mb1, int64_t nb1, int64_t nb2,
+                                    double* a, int64_t lda,
+                                    double* t, int64_t ldt,
+                                    double* work, int64_t lwork );
+int64_t LAPACKE_cgetsqrhrt_work_64( int matrix_layout, int64_t m, int64_t n,
+                                    int64_t mb1, int64_t nb1, int64_t nb2,
+                                    lapack_complex_float* a, int64_t lda,
+                                    lapack_complex_float* t, int64_t ldt,
+                                    lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zgetsqrhrt_work_64( int matrix_layout, int64_t m, int64_t n,
+                                    int64_t mb1, int64_t nb1, int64_t nb2,
+                                    lapack_complex_double* a, int64_t lda,
+                                    lapack_complex_double* t, int64_t ldt,
+                                    lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_ssyev_2stage_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          float* a, int64_t lda, float* w );
+int64_t LAPACKE_dsyev_2stage_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          double* a, int64_t lda, double* w );
+
+int64_t LAPACKE_ssyevd_2stage_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           float* a, int64_t lda, float* w );
+int64_t LAPACKE_dsyevd_2stage_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           double* a, int64_t lda, double* w );
+
+int64_t LAPACKE_ssyevr_2stage_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, float* a, int64_t lda, float vl,
+                           float vu, int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, float* z, int64_t ldz,
+                           int64_t* isuppz );
+int64_t LAPACKE_dsyevr_2stage_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, double* a, int64_t lda, double vl,
+                           double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w, double* z,
+                           int64_t ldz, int64_t* isuppz );
+
+int64_t LAPACKE_ssyevx_2stage_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, float* a, int64_t lda, float vl,
+                           float vu, int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, float* z, int64_t ldz,
+                           int64_t* ifail );
+int64_t LAPACKE_dsyevx_2stage_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, double* a, int64_t lda, double vl,
+                           double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w, double* z,
+                           int64_t ldz, int64_t* ifail );
+
+int64_t LAPACKE_ssyev_2stage_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, float* a, int64_t lda, float* w,
+                               float* work, int64_t lwork );
+int64_t LAPACKE_dsyev_2stage_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, double* a, int64_t lda,
+                               double* w, double* work, int64_t lwork );
+
+int64_t LAPACKE_ssyevd_2stage_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, float* a, int64_t lda,
+                                float* w, float* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_dsyevd_2stage_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, double* a, int64_t lda,
+                                double* w, double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_ssyevr_2stage_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, float* a,
+                                int64_t lda, float vl, float vu,
+                                int64_t il, int64_t iu, float abstol,
+                                int64_t* m, float* w, float* z,
+                                int64_t ldz, int64_t* isuppz, float* work,
+                                int64_t lwork, int64_t* iwork,
+                                int64_t liwork );
+int64_t LAPACKE_dsyevr_2stage_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, double* a,
+                                int64_t lda, double vl, double vu,
+                                int64_t il, int64_t iu, double abstol,
+                                int64_t* m, double* w, double* z,
+                                int64_t ldz, int64_t* isuppz,
+                                double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_ssyevx_2stage_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, float* a,
+                                int64_t lda, float vl, float vu,
+                                int64_t il, int64_t iu, float abstol,
+                                int64_t* m, float* w, float* z,
+                                int64_t ldz, float* work, int64_t lwork,
+                                int64_t* iwork, int64_t* ifail );
+int64_t LAPACKE_dsyevx_2stage_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, double* a,
+                                int64_t lda, double vl, double vu,
+                                int64_t il, int64_t iu, double abstol,
+                                int64_t* m, double* w, double* z,
+                                int64_t ldz, double* work, int64_t lwork,
+                                int64_t* iwork, int64_t* ifail );
+
+int64_t LAPACKE_cheev_2stage_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          lapack_complex_float* a, int64_t lda, float* w );
+int64_t LAPACKE_zheev_2stage_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          lapack_complex_double* a, int64_t lda, double* w );
+
+int64_t LAPACKE_cheevd_2stage_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           lapack_complex_float* a, int64_t lda, float* w );
+int64_t LAPACKE_zheevd_2stage_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           lapack_complex_double* a, int64_t lda,
+                           double* w );
+
+int64_t LAPACKE_cheevr_2stage_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, lapack_complex_float* a,
+                           int64_t lda, float vl, float vu, int64_t il,
+                           int64_t iu, float abstol, int64_t* m, float* w,
+                           lapack_complex_float* z, int64_t ldz,
+                           int64_t* isuppz );
+int64_t LAPACKE_zheevr_2stage_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, lapack_complex_double* a,
+                           int64_t lda, double vl, double vu, int64_t il,
+                           int64_t iu, double abstol, int64_t* m,
+                           double* w, lapack_complex_double* z, int64_t ldz,
+                           int64_t* isuppz );
+
+int64_t LAPACKE_cheevx_2stage_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, lapack_complex_float* a,
+                           int64_t lda, float vl, float vu, int64_t il,
+                           int64_t iu, float abstol, int64_t* m, float* w,
+                           lapack_complex_float* z, int64_t ldz,
+                           int64_t* ifail );
+int64_t LAPACKE_zheevx_2stage_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, lapack_complex_double* a,
+                           int64_t lda, double vl, double vu, int64_t il,
+                           int64_t iu, double abstol, int64_t* m,
+                           double* w, lapack_complex_double* z, int64_t ldz,
+                           int64_t* ifail );
+
+int64_t LAPACKE_cheev_2stage_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, lapack_complex_float* a,
+                               int64_t lda, float* w,
+                               lapack_complex_float* work, int64_t lwork,
+                               float* rwork );
+int64_t LAPACKE_zheev_2stage_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, lapack_complex_double* a,
+                               int64_t lda, double* w,
+                               lapack_complex_double* work, int64_t lwork,
+                               double* rwork );
+
+int64_t LAPACKE_cheevd_2stage_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, lapack_complex_float* a,
+                                int64_t lda, float* w,
+                                lapack_complex_float* work, int64_t lwork,
+                                float* rwork, int64_t lrwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_zheevd_2stage_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, lapack_complex_double* a,
+                                int64_t lda, double* w,
+                                lapack_complex_double* work, int64_t lwork,
+                                double* rwork, int64_t lrwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_cheevr_2stage_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                float vl, float vu, int64_t il,
+                                int64_t iu, float abstol, int64_t* m,
+                                float* w, lapack_complex_float* z,
+                                int64_t ldz, int64_t* isuppz,
+                                lapack_complex_float* work, int64_t lwork,
+                                float* rwork, int64_t lrwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_zheevr_2stage_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                double vl, double vu, int64_t il,
+                                int64_t iu, double abstol, int64_t* m,
+                                double* w, lapack_complex_double* z,
+                                int64_t ldz, int64_t* isuppz,
+                                lapack_complex_double* work, int64_t lwork,
+                                double* rwork, int64_t lrwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_cheevx_2stage_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n,
+                                lapack_complex_float* a, int64_t lda,
+                                float vl, float vu, int64_t il,
+                                int64_t iu, float abstol, int64_t* m,
+                                float* w, lapack_complex_float* z,
+                                int64_t ldz, lapack_complex_float* work,
+                                int64_t lwork, float* rwork,
+                                int64_t* iwork, int64_t* ifail );
+int64_t LAPACKE_zheevx_2stage_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n,
+                                lapack_complex_double* a, int64_t lda,
+                                double vl, double vu, int64_t il,
+                                int64_t iu, double abstol, int64_t* m,
+                                double* w, lapack_complex_double* z,
+                                int64_t ldz, lapack_complex_double* work,
+                                int64_t lwork, double* rwork,
+                                int64_t* iwork, int64_t* ifail );
+
+int64_t LAPACKE_ssbev_2stage_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          int64_t kd, float* ab, int64_t ldab, float* w,
+                          float* z, int64_t ldz );
+int64_t LAPACKE_dsbev_2stage_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          int64_t kd, double* ab, int64_t ldab, double* w,
+                          double* z, int64_t ldz );
+
+int64_t LAPACKE_ssbevd_2stage_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           int64_t kd, float* ab, int64_t ldab, float* w,
+                           float* z, int64_t ldz );
+int64_t LAPACKE_dsbevd_2stage_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           int64_t kd, double* ab, int64_t ldab,
+                           double* w, double* z, int64_t ldz );
+
+int64_t LAPACKE_ssbevx_2stage_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, int64_t kd, float* ab,
+                           int64_t ldab, float* q, int64_t ldq, float vl,
+                           float vu, int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, float* z, int64_t ldz,
+                           int64_t* ifail );
+int64_t LAPACKE_dsbevx_2stage_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, int64_t kd, double* ab,
+                           int64_t ldab, double* q, int64_t ldq,
+                           double vl, double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w, double* z,
+                           int64_t ldz, int64_t* ifail );
+
+int64_t LAPACKE_ssbev_2stage_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, int64_t kd, float* ab,
+                               int64_t ldab, float* w, float* z,
+                               int64_t ldz, float* work, int64_t lwork );
+int64_t LAPACKE_dsbev_2stage_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, int64_t kd, double* ab,
+                               int64_t ldab, double* w, double* z,
+                               int64_t ldz, double* work, int64_t lwork );
+
+int64_t LAPACKE_ssbevd_2stage_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, int64_t kd, float* ab,
+                                int64_t ldab, float* w, float* z,
+                                int64_t ldz, float* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+int64_t LAPACKE_dsbevd_2stage_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, int64_t kd, double* ab,
+                                int64_t ldab, double* w, double* z,
+                                int64_t ldz, double* work, int64_t lwork,
+                                int64_t* iwork, int64_t liwork );
+
+int64_t LAPACKE_ssbevx_2stage_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, int64_t kd,
+                                float* ab, int64_t ldab, float* q,
+                                int64_t ldq, float vl, float vu,
+                                int64_t il, int64_t iu, float abstol,
+                                int64_t* m, float* w, float* z,
+                                int64_t ldz, float* work, int64_t lwork, int64_t* iwork,
+                                int64_t* ifail );
+int64_t LAPACKE_dsbevx_2stage_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, int64_t kd,
+                                double* ab, int64_t ldab, double* q,
+                                int64_t ldq, double vl, double vu,
+                                int64_t il, int64_t iu, double abstol,
+                                int64_t* m, double* w, double* z,
+                                int64_t ldz, double* work, int64_t lwork, int64_t* iwork,
+                                int64_t* ifail );
+
+int64_t LAPACKE_chbev_2stage_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          int64_t kd, lapack_complex_float* ab,
+                          int64_t ldab, float* w, lapack_complex_float* z,
+                          int64_t ldz );
+int64_t LAPACKE_zhbev_2stage_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                          int64_t kd, lapack_complex_double* ab,
+                          int64_t ldab, double* w, lapack_complex_double* z,
+                          int64_t ldz );
+
+int64_t LAPACKE_chbevd_2stage_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           int64_t kd, lapack_complex_float* ab,
+                           int64_t ldab, float* w, lapack_complex_float* z,
+                           int64_t ldz );
+int64_t LAPACKE_zhbevd_2stage_64( int matrix_layout, char jobz, char uplo, int64_t n,
+                           int64_t kd, lapack_complex_double* ab,
+                           int64_t ldab, double* w, lapack_complex_double* z,
+                           int64_t ldz );
+
+int64_t LAPACKE_chbevx_2stage_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, int64_t kd,
+                           lapack_complex_float* ab, int64_t ldab,
+                           lapack_complex_float* q, int64_t ldq, float vl,
+                           float vu, int64_t il, int64_t iu, float abstol,
+                           int64_t* m, float* w, lapack_complex_float* z,
+                           int64_t ldz, int64_t* ifail );
+int64_t LAPACKE_zhbevx_2stage_64( int matrix_layout, char jobz, char range, char uplo,
+                           int64_t n, int64_t kd,
+                           lapack_complex_double* ab, int64_t ldab,
+                           lapack_complex_double* q, int64_t ldq, double vl,
+                           double vu, int64_t il, int64_t iu,
+                           double abstol, int64_t* m, double* w,
+                           lapack_complex_double* z, int64_t ldz,
+                           int64_t* ifail );
+
+int64_t LAPACKE_chbev_2stage_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, int64_t kd,
+                               lapack_complex_float* ab, int64_t ldab,
+                               float* w, lapack_complex_float* z,
+                               int64_t ldz, lapack_complex_float* work,
+                               int64_t lwork, float* rwork );
+int64_t LAPACKE_zhbev_2stage_work_64( int matrix_layout, char jobz, char uplo,
+                               int64_t n, int64_t kd,
+                               lapack_complex_double* ab, int64_t ldab,
+                               double* w, lapack_complex_double* z,
+                               int64_t ldz, lapack_complex_double* work,
+                               int64_t lwork, double* rwork );
+
+int64_t LAPACKE_chbevd_2stage_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, int64_t kd,
+                                lapack_complex_float* ab, int64_t ldab,
+                                float* w, lapack_complex_float* z,
+                                int64_t ldz, lapack_complex_float* work,
+                                int64_t lwork, float* rwork,
+                                int64_t lrwork, int64_t* iwork,
+                                int64_t liwork );
+int64_t LAPACKE_zhbevd_2stage_work_64( int matrix_layout, char jobz, char uplo,
+                                int64_t n, int64_t kd,
+                                lapack_complex_double* ab, int64_t ldab,
+                                double* w, lapack_complex_double* z,
+                                int64_t ldz, lapack_complex_double* work,
+                                int64_t lwork, double* rwork,
+                                int64_t lrwork, int64_t* iwork,
+                                int64_t liwork );
+
+int64_t LAPACKE_chbevx_2stage_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, int64_t kd,
+                                lapack_complex_float* ab, int64_t ldab,
+                                lapack_complex_float* q, int64_t ldq,
+                                float vl, float vu, int64_t il,
+                                int64_t iu, float abstol, int64_t* m,
+                                float* w, lapack_complex_float* z,
+                                int64_t ldz, lapack_complex_float* work,
+                                int64_t lwork, float* rwork, int64_t* iwork,
+                                int64_t* ifail );
+int64_t LAPACKE_zhbevx_2stage_work_64( int matrix_layout, char jobz, char range,
+                                char uplo, int64_t n, int64_t kd,
+                                lapack_complex_double* ab, int64_t ldab,
+                                lapack_complex_double* q, int64_t ldq,
+                                double vl, double vu, int64_t il,
+                                int64_t iu, double abstol, int64_t* m,
+                                double* w, lapack_complex_double* z,
+                                int64_t ldz, lapack_complex_double* work,
+                                int64_t lwork, double* rwork, int64_t* iwork,
+                                int64_t* ifail );
+
+int64_t LAPACKE_ssygv_2stage_64( int matrix_layout, int64_t itype, char jobz,
+                          char uplo, int64_t n, float* a, int64_t lda,
+                          float* b, int64_t ldb, float* w );
+int64_t LAPACKE_dsygv_2stage_64( int matrix_layout, int64_t itype, char jobz,
+                          char uplo, int64_t n, double* a, int64_t lda,
+                          double* b, int64_t ldb, double* w );
+int64_t LAPACKE_ssygv_2stage_work_64( int matrix_layout, int64_t itype, char jobz,
+                               char uplo, int64_t n, float* a,
+                               int64_t lda, float* b, int64_t ldb,
+                               float* w, float* work, int64_t lwork );
+int64_t LAPACKE_dsygv_2stage_work_64( int matrix_layout, int64_t itype, char jobz,
+                               char uplo, int64_t n, double* a,
+                               int64_t lda, double* b, int64_t ldb,
+                               double* w, double* work, int64_t lwork );
+
+int64_t LAPACKE_chegv_2stage_64( int matrix_layout, int64_t itype, char jobz,
+                          char uplo, int64_t n, lapack_complex_float* a,
+                          int64_t lda, lapack_complex_float* b,
+                          int64_t ldb, float* w );
+int64_t LAPACKE_zhegv_2stage_64( int matrix_layout, int64_t itype, char jobz,
+                          char uplo, int64_t n, lapack_complex_double* a,
+                          int64_t lda, lapack_complex_double* b,
+                          int64_t ldb, double* w );
+int64_t LAPACKE_chegv_2stage_work_64( int matrix_layout, int64_t itype, char jobz,
+                               char uplo, int64_t n, lapack_complex_float* a,
+                               int64_t lda, lapack_complex_float* b,
+                               int64_t ldb, float* w,
+                               lapack_complex_float* work, int64_t lwork,
+                               float* rwork );
+int64_t LAPACKE_zhegv_2stage_work_64( int matrix_layout, int64_t itype, char jobz,
+                               char uplo, int64_t n,
+                               lapack_complex_double* a, int64_t lda,
+                               lapack_complex_double* b, int64_t ldb,
+                               double* w, lapack_complex_double* work,
+                               int64_t lwork, double* rwork );
+
+//LAPACK 3.8.0
+int64_t LAPACKE_ssysv_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, float* a, int64_t lda,
+                          float* tb, int64_t ltb, int64_t* ipiv,
+                          int64_t* ipiv2, float* b, int64_t ldb );
+int64_t LAPACKE_ssysv_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, float* a, int64_t lda,
+                               float* tb, int64_t ltb, int64_t* ipiv,
+                               int64_t* ipiv2, float* b, int64_t ldb,
+                               float* work, int64_t lwork );
+int64_t LAPACKE_dsysv_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, double* a, int64_t lda,
+                          double* tb, int64_t ltb,
+                          int64_t* ipiv, int64_t* ipiv2,
+                          double* b, int64_t ldb );
+int64_t LAPACKE_dsysv_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, double* a, int64_t lda,
+                               double* tb, int64_t ltb,
+                               int64_t* ipiv, int64_t* ipiv2,
+                               double* b, int64_t ldb,
+                               double* work, int64_t lwork );
+int64_t LAPACKE_csysv_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_float* a,
+                          int64_t lda, lapack_complex_float* tb,
+                          int64_t ltb, int64_t* ipiv, int64_t* ipiv2,
+                          lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_csysv_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_float* a,
+                               int64_t lda, lapack_complex_float* tb,
+                               int64_t ltb, int64_t* ipiv, int64_t* ipiv2,
+                               lapack_complex_float* b, int64_t ldb,
+                               lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zsysv_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_double* a,
+                          int64_t lda, lapack_complex_double* tb,
+                          int64_t ltb, int64_t* ipiv, int64_t* ipiv2,
+                          lapack_complex_double* b, int64_t ldb );
+int64_t LAPACKE_zsysv_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_double* a,
+                               int64_t lda, lapack_complex_double* tb,
+                               int64_t ltb, int64_t* ipiv, int64_t* ipiv2,
+                               lapack_complex_double* b, int64_t ldb,
+                               lapack_complex_double* work, int64_t lwork );
+int64_t LAPACKE_chesv_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_float* a,
+                          int64_t lda, lapack_complex_float* tb,
+                          int64_t ltb, int64_t* ipiv, int64_t* ipiv2,
+                          lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_chesv_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_float* a,
+                               int64_t lda, lapack_complex_float* tb,
+                               int64_t ltb, int64_t* ipiv, int64_t* ipiv2,
+                               lapack_complex_float* b, int64_t ldb,
+                               lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zhesv_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, lapack_complex_double* a,
+                          int64_t lda, lapack_complex_double* tb,
+                          int64_t ltb, int64_t* ipiv, int64_t* ipiv2,
+                          lapack_complex_double* b, int64_t ldb );
+int64_t LAPACKE_zhesv_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, lapack_complex_double* a,
+                               int64_t lda, lapack_complex_double* tb,
+                               int64_t ltb, int64_t* ipiv, int64_t* ipiv2,
+                               lapack_complex_double* b, int64_t ldb,
+                               lapack_complex_double* work, int64_t lwork );
+
+int64_t LAPACKE_ssytrf_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          float* a, int64_t lda,
+                          float* tb, int64_t ltb, int64_t* ipiv,
+                          int64_t* ipiv2 );
+int64_t LAPACKE_ssytrf_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               float* a, int64_t lda,
+                               float* tb, int64_t ltb, int64_t* ipiv,
+                               int64_t* ipiv2,
+                               float* work, int64_t lwork );
+int64_t LAPACKE_dsytrf_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          double* a, int64_t lda,
+                          double* tb, int64_t ltb,
+                          int64_t* ipiv, int64_t* ipiv2 );
+int64_t LAPACKE_dsytrf_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               double* a, int64_t lda,
+                               double* tb, int64_t ltb,
+                               int64_t* ipiv, int64_t* ipiv2,
+                               double* work, int64_t lwork );
+int64_t LAPACKE_csytrf_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          lapack_complex_float* a,
+                          int64_t lda, lapack_complex_float* tb,
+                          int64_t ltb, int64_t* ipiv, int64_t* ipiv2 );
+int64_t LAPACKE_csytrf_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               lapack_complex_float* a,
+                               int64_t lda, lapack_complex_float* tb,
+                               int64_t ltb, int64_t* ipiv, int64_t* ipiv2,
+                               lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zsytrf_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          lapack_complex_double* a,
+                          int64_t lda, lapack_complex_double* tb,
+                          int64_t ltb, int64_t* ipiv, int64_t* ipiv2 );
+int64_t LAPACKE_zsytrf_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               lapack_complex_double* a,
+                               int64_t lda, lapack_complex_double* tb,
+                               int64_t ltb, int64_t* ipiv, int64_t* ipiv2,
+                               lapack_complex_double* work, int64_t lwork );
+int64_t LAPACKE_chetrf_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          lapack_complex_float* a,
+                          int64_t lda, lapack_complex_float* tb,
+                          int64_t ltb, int64_t* ipiv, int64_t* ipiv2 );
+int64_t LAPACKE_chetrf_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               lapack_complex_float* a,
+                               int64_t lda, lapack_complex_float* tb,
+                               int64_t ltb, int64_t* ipiv, int64_t* ipiv2,
+                               lapack_complex_float* work, int64_t lwork );
+int64_t LAPACKE_zhetrf_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          lapack_complex_double* a,
+                          int64_t lda, lapack_complex_double* tb,
+                          int64_t ltb, int64_t* ipiv, int64_t* ipiv2 );
+int64_t LAPACKE_zhetrf_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               lapack_complex_double* a,
+                               int64_t lda, lapack_complex_double* tb,
+                               int64_t ltb, int64_t* ipiv, int64_t* ipiv2,
+                               lapack_complex_double* work, int64_t lwork );
+
+
+int64_t LAPACKE_ssytrs_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, const float* a, int64_t lda,
+                          float* tb, int64_t ltb, const int64_t* ipiv,
+                          const int64_t* ipiv2, float* b, int64_t ldb );
+int64_t LAPACKE_ssytrs_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, const float* a, int64_t lda,
+                               float* tb, int64_t ltb, const int64_t* ipiv,
+                               const int64_t* ipiv2, float* b, int64_t ldb );
+int64_t LAPACKE_dsytrs_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, const double* a, int64_t lda,
+                          double* tb, int64_t ltb,
+                          const int64_t* ipiv, const int64_t* ipiv2,
+                          double* b, int64_t ldb );
+int64_t LAPACKE_dsytrs_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, const double* a, int64_t lda,
+                               double* tb, int64_t ltb,
+                               const int64_t* ipiv, const int64_t* ipiv2,
+                               double* b, int64_t ldb );
+int64_t LAPACKE_csytrs_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, const lapack_complex_float* a,
+                          int64_t lda, lapack_complex_float* tb,
+                          int64_t ltb, const int64_t* ipiv, const int64_t* ipiv2,
+                          lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_csytrs_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, const lapack_complex_float* a,
+                               int64_t lda, lapack_complex_float* tb,
+                               int64_t ltb, const int64_t* ipiv, const int64_t* ipiv2,
+                               lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zsytrs_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, const lapack_complex_double* a,
+                          int64_t lda, lapack_complex_double* tb,
+                          int64_t ltb, const int64_t* ipiv, const int64_t* ipiv2,
+                          lapack_complex_double* b, int64_t ldb );
+int64_t LAPACKE_zsytrs_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, const lapack_complex_double* a,
+                               int64_t lda, lapack_complex_double* tb,
+                               int64_t ltb, const int64_t* ipiv, const int64_t* ipiv2,
+                               lapack_complex_double* b, int64_t ldb );
+int64_t LAPACKE_chetrs_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, const lapack_complex_float* a,
+                          int64_t lda, lapack_complex_float* tb,
+                          int64_t ltb, const int64_t* ipiv, const int64_t* ipiv2,
+                          lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_chetrs_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, const lapack_complex_float* a,
+                               int64_t lda, lapack_complex_float* tb,
+                               int64_t ltb, const int64_t* ipiv, const int64_t* ipiv2,
+                               lapack_complex_float* b, int64_t ldb );
+int64_t LAPACKE_zhetrs_aa_2stage_64( int matrix_layout, char uplo, int64_t n,
+                          int64_t nrhs, const lapack_complex_double* a,
+                          int64_t lda, lapack_complex_double* tb,
+                          int64_t ltb, const int64_t* ipiv, const int64_t* ipiv2,
+                          lapack_complex_double* b, int64_t ldb );
+int64_t LAPACKE_zhetrs_aa_2stage_work_64( int matrix_layout, char uplo, int64_t n,
+                               int64_t nrhs, const lapack_complex_double* a,
+                               int64_t lda, lapack_complex_double* tb,
+                               int64_t ltb, const int64_t* ipiv, const int64_t* ipiv2,
+                               lapack_complex_double* b, int64_t ldb );
+//LAPACK 3.10.0
+int64_t LAPACKE_sorhr_col_64( int matrix_layout, int64_t m, int64_t n,
+                              int64_t nb, float* a,
+                              int64_t lda, float* t,
+                              int64_t ldt, float* d );
+int64_t LAPACKE_sorhr_col_work_64( int matrix_layout, int64_t m, int64_t n,
+                                   int64_t nb, float* a,
+                                   int64_t lda, float* t,
+                                   int64_t ldt, float* d );
+int64_t LAPACKE_dorhr_col_64( int matrix_layout, int64_t m, int64_t n,
+                              int64_t nb, double* a,
+                              int64_t lda, double* t,
+                              int64_t ldt, double* d );
+int64_t LAPACKE_dorhr_col_work_64( int matrix_layout, int64_t m, int64_t n,
+                                   int64_t nb, double* a,
+                                   int64_t lda, double* t,
+                                   int64_t ldt, double* d );
+int64_t LAPACKE_cunhr_col_64( int matrix_layout, int64_t m, int64_t n,
+                              int64_t nb, lapack_complex_float* a,
+                              int64_t lda, lapack_complex_float* t,
+                              int64_t ldt, lapack_complex_float* d );
+int64_t LAPACKE_cunhr_col_work_64( int matrix_layout, int64_t m, int64_t n,
+                                   int64_t nb, lapack_complex_float* a,
+                                   int64_t lda, lapack_complex_float* t,
+                                   int64_t ldt, lapack_complex_float* d );
+int64_t LAPACKE_zunhr_col_64( int matrix_layout, int64_t m, int64_t n,
+                              int64_t nb, lapack_complex_double* a,
+                              int64_t lda, lapack_complex_double* t,
+                              int64_t ldt, lapack_complex_double* d );
+int64_t LAPACKE_zunhr_col_work_64( int matrix_layout, int64_t m, int64_t n,
+                                   int64_t nb, lapack_complex_double* a,
+                                   int64_t lda, lapack_complex_double* t,
+                                   int64_t ldt, lapack_complex_double* d );
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _LAPACKE_64_H_ */
diff --git a/LAPACKE/include/lapacke_config.h b/LAPACKE/include/lapacke_config.h
index 765359163b..753d4587ad 100644
--- a/LAPACKE/include/lapacke_config.h
+++ b/LAPACKE/include/lapacke_config.h
@@ -41,17 +41,30 @@ extern "C" {
 #endif /* __cplusplus */
 
 #include <stdlib.h>
+#include <stdint.h>
+#include <inttypes.h>
 
 #ifndef lapack_int
 #if defined(LAPACK_ILP64)
-#define lapack_int              long
+#define lapack_int        int64_t
 #else
-#define lapack_int              int
+#define lapack_int        int32_t
+#endif
+#endif
+
+/*
+ * Integer format string
+ */
+#ifndef LAPACK_IFMT
+#if defined(LAPACK_ILP64)
+#define LAPACK_IFMT       PRId64
+#else
+#define LAPACK_IFMT       PRId32
 #endif
 #endif
 
 #ifndef lapack_logical
-#define lapack_logical          lapack_int
+#define lapack_logical    lapack_int
 #endif
 
 #ifndef LAPACK_COMPLEX_CUSTOM
@@ -86,6 +99,16 @@ typedef struct { double real, imag; } _lapack_complex_double;
 #define lapack_complex_double_real(z)       ((z).real())
 #define lapack_complex_double_imag(z)       ((z).imag())
 
+#elif _MSC_VER
+
+#include <complex.h>
+#define lapack_complex_float    _Fcomplex
+#define lapack_complex_double   _Dcomplex
+#define lapack_complex_float_real(z)       (crealf(z))
+#define lapack_complex_float_imag(z)       (cimagf(z))
+#define lapack_complex_double_real(z)       (creal(z))
+#define lapack_complex_double_imag(z)       (cimag(z))
+
 #else
 
 #include <complex.h>
diff --git a/LAPACKE/include/lapacke_utils.h b/LAPACKE/include/lapacke_utils.h
index 35d5aae764..02a19995af 100644
--- a/LAPACKE/include/lapacke_utils.h
+++ b/LAPACKE/include/lapacke_utils.h
@@ -5,30 +5,30 @@
   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.
+ * 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 C interface to LAPACK utility functions
-* Author: Intel Corporation
-*****************************************************************************/
+ 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 C interface to LAPACK utility functions
+ * Author: Intel Corporation
+ *****************************************************************************/
 
 #ifndef _LAPACKE_UTILS_H_
 #define _LAPACKE_UTILS_H_
@@ -58,518 +58,552 @@ extern "C" {
 #define IS_S_NONZERO(x) ( (x) < 0 || (x) > 0 )
 #define IS_D_NONZERO(x) ( (x) < 0 || (x) > 0 )
 #define IS_C_NONZERO(x) ( IS_S_NONZERO(*((float*)&x)) ||  \
-                          IS_S_NONZERO(*(((float*)&x)+1)) )
+        IS_S_NONZERO(*(((float*)&x)+1)) )
 #define IS_Z_NONZERO(x) ( IS_D_NONZERO(*((double*)&x)) || \
-                          IS_D_NONZERO(*(((double*)&x)+1)) )
+        IS_D_NONZERO(*(((double*)&x)+1)) )
 
-/* Error handler */
-void LAPACKE_xerbla( const char *name, lapack_int info );
+    /* Error handler */
+    void API_SUFFIX(LAPACKE_xerbla)( const char *name, lapack_int info );
 
-/* Compare two chars (case-insensitive) */
-lapack_logical LAPACKE_lsame( char ca,  char cb );
+    /* Compare two chars (case-insensitive) */
+    lapack_logical API_SUFFIX(LAPACKE_lsame)( char ca,  char cb )
+#if defined __GNUC__
+        __attribute__((const))
+#endif
+        ;
 
-/* Functions to convert column-major to row-major 2d arrays and vice versa. */
-void LAPACKE_cgb_trans( int matrix_layout, lapack_int m, lapack_int n,
-                        lapack_int kl, lapack_int ku,
-                        const lapack_complex_float *in, lapack_int ldin,
-                        lapack_complex_float *out, lapack_int ldout );
-void LAPACKE_cge_trans( int matrix_layout, lapack_int m, lapack_int n,
-                        const lapack_complex_float* in, lapack_int ldin,
-                        lapack_complex_float* out, lapack_int ldout );
-void LAPACKE_cgg_trans( int matrix_layout, lapack_int m, lapack_int n,
-                        const lapack_complex_float* in, lapack_int ldin,
-                        lapack_complex_float* out, lapack_int ldout );
-void LAPACKE_chb_trans( int matrix_layout, char uplo, lapack_int n,
-                        lapack_int kd,
-                        const lapack_complex_float *in, lapack_int ldin,
-                        lapack_complex_float *out, lapack_int ldout );
-void LAPACKE_che_trans( int matrix_layout, char uplo, lapack_int n,
-                        const lapack_complex_float *in, lapack_int ldin,
-                        lapack_complex_float *out, lapack_int ldout );
-void LAPACKE_chp_trans( int matrix_layout, char uplo, lapack_int n,
-                        const lapack_complex_float *in,
-                        lapack_complex_float *out );
-void LAPACKE_chs_trans( int matrix_layout, lapack_int n,
-                        const lapack_complex_float *in, lapack_int ldin,
-                        lapack_complex_float *out, lapack_int ldout );
-void LAPACKE_cpb_trans( int matrix_layout, char uplo, lapack_int n,
-                        lapack_int kd,
-                        const lapack_complex_float *in, lapack_int ldin,
-                        lapack_complex_float *out, lapack_int ldout );
-void LAPACKE_cpf_trans( int matrix_layout, char transr, char uplo,
-                        lapack_int n, const lapack_complex_float *in,
-                        lapack_complex_float *out );
-void LAPACKE_cpo_trans( int matrix_layout, char uplo, lapack_int n,
-                        const lapack_complex_float *in, lapack_int ldin,
-                        lapack_complex_float *out, lapack_int ldout );
-void LAPACKE_cpp_trans( int matrix_layout, char uplo, lapack_int n,
-                        const lapack_complex_float *in,
-                        lapack_complex_float *out );
-void LAPACKE_csp_trans( int matrix_layout, char uplo, lapack_int n,
-                        const lapack_complex_float *in,
-                        lapack_complex_float *out );
-void LAPACKE_csy_trans( int matrix_layout, char uplo, lapack_int n,
-                        const lapack_complex_float *in, lapack_int ldin,
-                        lapack_complex_float *out, lapack_int ldout );
-void LAPACKE_ctb_trans( int matrix_layout, char uplo, char diag,
-                        lapack_int n, lapack_int kd,
-                        const lapack_complex_float *in, lapack_int ldin,
-                        lapack_complex_float *out, lapack_int ldout );
-void LAPACKE_ctf_trans( int matrix_layout, char transr, char uplo, char diag,
-                        lapack_int n, const lapack_complex_float *in,
-                        lapack_complex_float *out );
-void LAPACKE_ctp_trans( int matrix_layout, char uplo, char diag,
-                        lapack_int n, const lapack_complex_float *in,
-                        lapack_complex_float *out );
-void LAPACKE_ctr_trans( int matrix_layout, char uplo, char diag, lapack_int n,
-                        const lapack_complex_float *in, lapack_int ldin,
-                        lapack_complex_float *out, lapack_int ldout );
+    /* Functions to convert column-major to row-major 2d arrays and vice versa. */
+    void API_SUFFIX(LAPACKE_cgb_trans)( int matrix_layout, lapack_int m, lapack_int n,
+            lapack_int kl, lapack_int ku,
+            const lapack_complex_float *in, lapack_int ldin,
+            lapack_complex_float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_cge_trans)( int matrix_layout, lapack_int m, lapack_int n,
+            const lapack_complex_float* in, lapack_int ldin,
+            lapack_complex_float* out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_cgg_trans)( int matrix_layout, lapack_int m, lapack_int n,
+            const lapack_complex_float* in, lapack_int ldin,
+            lapack_complex_float* out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_chb_trans)( int matrix_layout, char uplo, lapack_int n,
+            lapack_int kd,
+            const lapack_complex_float *in, lapack_int ldin,
+            lapack_complex_float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_che_trans)( int matrix_layout, char uplo, lapack_int n,
+            const lapack_complex_float *in, lapack_int ldin,
+            lapack_complex_float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_chp_trans)( int matrix_layout, char uplo, lapack_int n,
+            const lapack_complex_float *in,
+            lapack_complex_float *out );
+    void API_SUFFIX(LAPACKE_chs_trans)( int matrix_layout, lapack_int n,
+            const lapack_complex_float *in, lapack_int ldin,
+            lapack_complex_float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_cpb_trans)( int matrix_layout, char uplo, lapack_int n,
+            lapack_int kd,
+            const lapack_complex_float *in, lapack_int ldin,
+            lapack_complex_float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_cpf_trans)( int matrix_layout, char transr, char uplo,
+            lapack_int n, const lapack_complex_float *in,
+            lapack_complex_float *out );
+    void API_SUFFIX(LAPACKE_cpo_trans)( int matrix_layout, char uplo, lapack_int n,
+            const lapack_complex_float *in, lapack_int ldin,
+            lapack_complex_float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_cpp_trans)( int matrix_layout, char uplo, lapack_int n,
+            const lapack_complex_float *in,
+            lapack_complex_float *out );
+    void API_SUFFIX(LAPACKE_csp_trans)( int matrix_layout, char uplo, lapack_int n,
+            const lapack_complex_float *in,
+            lapack_complex_float *out );
+    void API_SUFFIX(LAPACKE_csy_trans)( int matrix_layout, char uplo, lapack_int n,
+            const lapack_complex_float *in, lapack_int ldin,
+            lapack_complex_float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_ctb_trans)( int matrix_layout, char uplo, char diag,
+            lapack_int n, lapack_int kd,
+            const lapack_complex_float *in, lapack_int ldin,
+            lapack_complex_float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_ctf_trans)( int matrix_layout, char transr, char uplo, char diag,
+            lapack_int n, const lapack_complex_float *in,
+            lapack_complex_float *out );
+    void API_SUFFIX(LAPACKE_ctp_trans)( int matrix_layout, char uplo, char diag,
+            lapack_int n, const lapack_complex_float *in,
+            lapack_complex_float *out );
+    void API_SUFFIX(LAPACKE_ctr_trans)( int matrix_layout, char uplo, char diag, lapack_int n,
+            const lapack_complex_float *in, lapack_int ldin,
+            lapack_complex_float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_ctz_trans)( int matrix_layout, char direct, char uplo,
+            char diag, lapack_int m, lapack_int n,
+            const lapack_complex_float *in, lapack_int ldin,
+            lapack_complex_float *out, lapack_int ldout );
 
-void LAPACKE_dgb_trans( int matrix_layout, lapack_int m, lapack_int n,
-                        lapack_int kl, lapack_int ku,
-                        const double *in, lapack_int ldin,
-                        double *out, lapack_int ldout );
-void LAPACKE_dge_trans( int matrix_layout, lapack_int m, lapack_int n,
-                        const double* in, lapack_int ldin,
-                        double* out, lapack_int ldout );
-void LAPACKE_dgg_trans( int matrix_layout, lapack_int m, lapack_int n,
-                        const double* in, lapack_int ldin,
-                        double* out, lapack_int ldout );
-void LAPACKE_dhs_trans( int matrix_layout, lapack_int n,
-                        const double *in, lapack_int ldin,
-                        double *out, lapack_int ldout );
-void LAPACKE_dpb_trans( int matrix_layout, char uplo, lapack_int n,
-                        lapack_int kd,
-                        const double *in, lapack_int ldin,
-                        double *out, lapack_int ldout );
-void LAPACKE_dpf_trans( int matrix_layout, char transr, char uplo,
-                        lapack_int n, const double *in,
-                        double *out );
-void LAPACKE_dpo_trans( int matrix_layout, char uplo, lapack_int n,
-                        const double *in, lapack_int ldin,
-                        double *out, lapack_int ldout );
-void LAPACKE_dpp_trans( int matrix_layout, char uplo, lapack_int n,
-                        const double *in,
-                        double *out );
-void LAPACKE_dsb_trans( int matrix_layout, char uplo, lapack_int n,
-                        lapack_int kd,
-                        const double *in, lapack_int ldin,
-                        double *out, lapack_int ldout );
-void LAPACKE_dsp_trans( int matrix_layout, char uplo, lapack_int n,
-                        const double *in,
-                        double *out );
-void LAPACKE_dsy_trans( int matrix_layout, char uplo, lapack_int n,
-                        const double *in, lapack_int ldin,
-                        double *out, lapack_int ldout );
-void LAPACKE_dtb_trans( int matrix_layout, char uplo, char diag,
-                        lapack_int n, lapack_int kd,
-                        const double *in, lapack_int ldin,
-                        double *out, lapack_int ldout );
-void LAPACKE_dtf_trans( int matrix_layout, char transr, char uplo, char diag,
-                        lapack_int n, const double *in,
-                        double *out );
-void LAPACKE_dtp_trans( int matrix_layout, char uplo, char diag,
-                        lapack_int n, const double *in,
-                        double *out );
-void LAPACKE_dtr_trans( int matrix_layout, char uplo, char diag, lapack_int n,
-                        const double *in, lapack_int ldin,
-                        double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_dgb_trans)( int matrix_layout, lapack_int m, lapack_int n,
+            lapack_int kl, lapack_int ku,
+            const double *in, lapack_int ldin,
+            double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_dge_trans)( int matrix_layout, lapack_int m, lapack_int n,
+            const double* in, lapack_int ldin,
+            double* out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_dgg_trans)( int matrix_layout, lapack_int m, lapack_int n,
+            const double* in, lapack_int ldin,
+            double* out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_dhs_trans)( int matrix_layout, lapack_int n,
+            const double *in, lapack_int ldin,
+            double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_dpb_trans)( int matrix_layout, char uplo, lapack_int n,
+            lapack_int kd,
+            const double *in, lapack_int ldin,
+            double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_dpf_trans)( int matrix_layout, char transr, char uplo,
+            lapack_int n, const double *in,
+            double *out );
+    void API_SUFFIX(LAPACKE_dpo_trans)( int matrix_layout, char uplo, lapack_int n,
+            const double *in, lapack_int ldin,
+            double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_dpp_trans)( int matrix_layout, char uplo, lapack_int n,
+            const double *in,
+            double *out );
+    void API_SUFFIX(LAPACKE_dsb_trans)( int matrix_layout, char uplo, lapack_int n,
+            lapack_int kd,
+            const double *in, lapack_int ldin,
+            double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_dsp_trans)( int matrix_layout, char uplo, lapack_int n,
+            const double *in,
+            double *out );
+    void API_SUFFIX(LAPACKE_dsy_trans)( int matrix_layout, char uplo, lapack_int n,
+            const double *in, lapack_int ldin,
+            double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_dtb_trans)( int matrix_layout, char uplo, char diag,
+            lapack_int n, lapack_int kd,
+            const double *in, lapack_int ldin,
+            double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_dtf_trans)( int matrix_layout, char transr, char uplo, char diag,
+            lapack_int n, const double *in,
+            double *out );
+    void API_SUFFIX(LAPACKE_dtp_trans)( int matrix_layout, char uplo, char diag,
+            lapack_int n, const double *in,
+            double *out );
+    void API_SUFFIX(LAPACKE_dtr_trans)( int matrix_layout, char uplo, char diag, lapack_int n,
+            const double *in, lapack_int ldin,
+            double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_dtz_trans)( int matrix_layout, char direct, char uplo,
+            char diag, lapack_int m, lapack_int n,
+            const double *in, lapack_int ldin,
+            double *out, lapack_int ldout );
 
-void LAPACKE_sgb_trans( int matrix_layout, lapack_int m, lapack_int n,
-                        lapack_int kl, lapack_int ku,
-                        const float *in, lapack_int ldin,
-                        float *out, lapack_int ldout );
-void LAPACKE_sge_trans( int matrix_layout, lapack_int m, lapack_int n,
-                        const float* in, lapack_int ldin,
-                        float* out, lapack_int ldout );
-void LAPACKE_sgg_trans( int matrix_layout, lapack_int m, lapack_int n,
-                        const float* in, lapack_int ldin,
-                        float* out, lapack_int ldout );
-void LAPACKE_shs_trans( int matrix_layout, lapack_int n,
-                        const float *in, lapack_int ldin,
-                        float *out, lapack_int ldout );
-void LAPACKE_spb_trans( int matrix_layout, char uplo, lapack_int n,
-                        lapack_int kd,
-                        const float *in, lapack_int ldin,
-                        float *out, lapack_int ldout );
-void LAPACKE_spf_trans( int matrix_layout, char transr, char uplo,
-                        lapack_int n, const float *in,
-                        float *out );
-void LAPACKE_spo_trans( int matrix_layout, char uplo, lapack_int n,
-                        const float *in, lapack_int ldin,
-                        float *out, lapack_int ldout );
-void LAPACKE_spp_trans( int matrix_layout, char uplo, lapack_int n,
-                        const float *in,
-                        float *out );
-void LAPACKE_ssb_trans( int matrix_layout, char uplo, lapack_int n,
-                        lapack_int kd,
-                        const float *in, lapack_int ldin,
-                        float *out, lapack_int ldout );
-void LAPACKE_ssp_trans( int matrix_layout, char uplo, lapack_int n,
-                        const float *in,
-                        float *out );
-void LAPACKE_ssy_trans( int matrix_layout, char uplo, lapack_int n,
-                        const float *in, lapack_int ldin,
-                        float *out, lapack_int ldout );
-void LAPACKE_stb_trans( int matrix_layout, char uplo, char diag,
-                        lapack_int n, lapack_int kd,
-                        const float *in, lapack_int ldin,
-                        float *out, lapack_int ldout );
-void LAPACKE_stf_trans( int matrix_layout, char transr, char uplo, char diag,
-                        lapack_int n, const float *in,
-                        float *out );
-void LAPACKE_stp_trans( int matrix_layout, char uplo, char diag,
-                        lapack_int n, const float *in,
-                        float *out );
-void LAPACKE_str_trans( int matrix_layout, char uplo, char diag, lapack_int n,
-                        const float *in, lapack_int ldin,
-                        float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_sgb_trans)( int matrix_layout, lapack_int m, lapack_int n,
+            lapack_int kl, lapack_int ku,
+            const float *in, lapack_int ldin,
+            float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_sge_trans)( int matrix_layout, lapack_int m, lapack_int n,
+            const float* in, lapack_int ldin,
+            float* out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_sgg_trans)( int matrix_layout, lapack_int m, lapack_int n,
+            const float* in, lapack_int ldin,
+            float* out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_shs_trans)( int matrix_layout, lapack_int n,
+            const float *in, lapack_int ldin,
+            float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_spb_trans)( int matrix_layout, char uplo, lapack_int n,
+            lapack_int kd,
+            const float *in, lapack_int ldin,
+            float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_spf_trans)( int matrix_layout, char transr, char uplo,
+            lapack_int n, const float *in,
+            float *out );
+    void API_SUFFIX(LAPACKE_spo_trans)( int matrix_layout, char uplo, lapack_int n,
+            const float *in, lapack_int ldin,
+            float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_spp_trans)( int matrix_layout, char uplo, lapack_int n,
+            const float *in,
+            float *out );
+    void API_SUFFIX(LAPACKE_ssb_trans)( int matrix_layout, char uplo, lapack_int n,
+            lapack_int kd,
+            const float *in, lapack_int ldin,
+            float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_ssp_trans)( int matrix_layout, char uplo, lapack_int n,
+            const float *in,
+            float *out );
+    void API_SUFFIX(LAPACKE_ssy_trans)( int matrix_layout, char uplo, lapack_int n,
+            const float *in, lapack_int ldin,
+            float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_stb_trans)( int matrix_layout, char uplo, char diag,
+            lapack_int n, lapack_int kd,
+            const float *in, lapack_int ldin,
+            float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_stf_trans)( int matrix_layout, char transr, char uplo, char diag,
+            lapack_int n, const float *in,
+            float *out );
+    void API_SUFFIX(LAPACKE_stp_trans)( int matrix_layout, char uplo, char diag,
+            lapack_int n, const float *in,
+            float *out );
+    void API_SUFFIX(LAPACKE_str_trans)( int matrix_layout, char uplo, char diag, lapack_int n,
+            const float *in, lapack_int ldin,
+            float *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_stz_trans)( int matrix_layout, char direct, char uplo,
+            char diag, lapack_int m, lapack_int n,
+            const float *in, lapack_int ldin,
+            float *out, lapack_int ldout );
 
-void LAPACKE_zgb_trans( int matrix_layout, lapack_int m, lapack_int n,
-                        lapack_int kl, lapack_int ku,
-                        const lapack_complex_double *in, lapack_int ldin,
-                        lapack_complex_double *out, lapack_int ldout );
-void LAPACKE_zge_trans( int matrix_layout, lapack_int m, lapack_int n,
-                        const lapack_complex_double* in, lapack_int ldin,
-                        lapack_complex_double* out, lapack_int ldout );
-void LAPACKE_zgg_trans( int matrix_layout, lapack_int m, lapack_int n,
-                        const lapack_complex_double* in, lapack_int ldin,
-                        lapack_complex_double* out, lapack_int ldout );
-void LAPACKE_zhb_trans( int matrix_layout, char uplo, lapack_int n,
-                        lapack_int kd,
-                        const lapack_complex_double *in, lapack_int ldin,
-                        lapack_complex_double *out, lapack_int ldout );
-void LAPACKE_zhe_trans( int matrix_layout, char uplo, lapack_int n,
-                        const lapack_complex_double *in, lapack_int ldin,
-                        lapack_complex_double *out, lapack_int ldout );
-void LAPACKE_zhp_trans( int matrix_layout, char uplo, lapack_int n,
-                        const lapack_complex_double *in,
-                        lapack_complex_double *out );
-void LAPACKE_zhs_trans( int matrix_layout, lapack_int n,
-                        const lapack_complex_double *in, lapack_int ldin,
-                        lapack_complex_double *out, lapack_int ldout );
-void LAPACKE_zpb_trans( int matrix_layout, char uplo, lapack_int n,
-                        lapack_int kd,
-                        const lapack_complex_double *in, lapack_int ldin,
-                        lapack_complex_double *out, lapack_int ldout );
-void LAPACKE_zpf_trans( int matrix_layout, char transr, char uplo,
-                        lapack_int n, const lapack_complex_double *in,
-                        lapack_complex_double *out );
-void LAPACKE_zpo_trans( int matrix_layout, char uplo, lapack_int n,
-                        const lapack_complex_double *in, lapack_int ldin,
-                        lapack_complex_double *out, lapack_int ldout );
-void LAPACKE_zpp_trans( int matrix_layout, char uplo, lapack_int n,
-                        const lapack_complex_double *in,
-                        lapack_complex_double *out );
-void LAPACKE_zsp_trans( int matrix_layout, char uplo, lapack_int n,
-                        const lapack_complex_double *in,
-                        lapack_complex_double *out );
-void LAPACKE_zsy_trans( int matrix_layout, char uplo, lapack_int n,
-                        const lapack_complex_double *in, lapack_int ldin,
-                        lapack_complex_double *out, lapack_int ldout );
-void LAPACKE_ztb_trans( int matrix_layout, char uplo, char diag,
-                        lapack_int n, lapack_int kd,
-                        const lapack_complex_double *in, lapack_int ldin,
-                        lapack_complex_double *out, lapack_int ldout );
-void LAPACKE_ztf_trans( int matrix_layout, char transr, char uplo, char diag,
-                        lapack_int n, const lapack_complex_double *in,
-                        lapack_complex_double *out );
-void LAPACKE_ztp_trans( int matrix_layout, char uplo, char diag,
-                        lapack_int n, const lapack_complex_double *in,
-                        lapack_complex_double *out );
-void LAPACKE_ztr_trans( int matrix_layout, char uplo, char diag, lapack_int n,
-                        const lapack_complex_double *in, lapack_int ldin,
-                        lapack_complex_double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_zgb_trans)( int matrix_layout, lapack_int m, lapack_int n,
+            lapack_int kl, lapack_int ku,
+            const lapack_complex_double *in, lapack_int ldin,
+            lapack_complex_double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_zge_trans)( int matrix_layout, lapack_int m, lapack_int n,
+            const lapack_complex_double* in, lapack_int ldin,
+            lapack_complex_double* out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_zgg_trans)( int matrix_layout, lapack_int m, lapack_int n,
+            const lapack_complex_double* in, lapack_int ldin,
+            lapack_complex_double* out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_zhb_trans)( int matrix_layout, char uplo, lapack_int n,
+            lapack_int kd,
+            const lapack_complex_double *in, lapack_int ldin,
+            lapack_complex_double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_zhe_trans)( int matrix_layout, char uplo, lapack_int n,
+            const lapack_complex_double *in, lapack_int ldin,
+            lapack_complex_double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_zhp_trans)( int matrix_layout, char uplo, lapack_int n,
+            const lapack_complex_double *in,
+            lapack_complex_double *out );
+    void API_SUFFIX(LAPACKE_zhs_trans)( int matrix_layout, lapack_int n,
+            const lapack_complex_double *in, lapack_int ldin,
+            lapack_complex_double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_zpb_trans)( int matrix_layout, char uplo, lapack_int n,
+            lapack_int kd,
+            const lapack_complex_double *in, lapack_int ldin,
+            lapack_complex_double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_zpf_trans)( int matrix_layout, char transr, char uplo,
+            lapack_int n, const lapack_complex_double *in,
+            lapack_complex_double *out );
+    void API_SUFFIX(LAPACKE_zpo_trans)( int matrix_layout, char uplo, lapack_int n,
+            const lapack_complex_double *in, lapack_int ldin,
+            lapack_complex_double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_zpp_trans)( int matrix_layout, char uplo, lapack_int n,
+            const lapack_complex_double *in,
+            lapack_complex_double *out );
+    void API_SUFFIX(LAPACKE_zsp_trans)( int matrix_layout, char uplo, lapack_int n,
+            const lapack_complex_double *in,
+            lapack_complex_double *out );
+    void API_SUFFIX(LAPACKE_zsy_trans)( int matrix_layout, char uplo, lapack_int n,
+            const lapack_complex_double *in, lapack_int ldin,
+            lapack_complex_double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_ztb_trans)( int matrix_layout, char uplo, char diag,
+            lapack_int n, lapack_int kd,
+            const lapack_complex_double *in, lapack_int ldin,
+            lapack_complex_double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_ztf_trans)( int matrix_layout, char transr, char uplo, char diag,
+            lapack_int n, const lapack_complex_double *in,
+            lapack_complex_double *out );
+    void API_SUFFIX(LAPACKE_ztp_trans)( int matrix_layout, char uplo, char diag,
+            lapack_int n, const lapack_complex_double *in,
+            lapack_complex_double *out );
+    void API_SUFFIX(LAPACKE_ztr_trans)( int matrix_layout, char uplo, char diag, lapack_int n,
+            const lapack_complex_double *in, lapack_int ldin,
+            lapack_complex_double *out, lapack_int ldout );
+    void API_SUFFIX(LAPACKE_ztz_trans)( int matrix_layout, char direct, char uplo,
+            char diag, lapack_int m, lapack_int n,
+            const lapack_complex_double *in, lapack_int ldin,
+            lapack_complex_double *out, lapack_int ldout );
 
-/* NaN checkers */
+    /* NaN checkers */
 #define LAPACK_SISNAN( x ) ( x != x )
 #define LAPACK_DISNAN( x ) ( x != x )
-#define LAPACK_CISNAN( x ) ( LAPACK_SISNAN(*((float*) &x)) || \
-                              LAPACK_SISNAN(*(((float*) &x)+1)) )
-#define LAPACK_ZISNAN( x ) ( LAPACK_DISNAN(*((double*)&x)) || \
-                              LAPACK_DISNAN(*(((double*)&x)+1)) )
+#define LAPACK_CISNAN( x ) ( LAPACK_SISNAN(*((const float*) &x)) || \
+        LAPACK_SISNAN(*(((const float*) &x)+1)) )
+#define LAPACK_ZISNAN( x ) ( LAPACK_DISNAN(*((const double*)&x)) || \
+        LAPACK_DISNAN(*(((const double*)&x)+1)) )
 
-/* NaN checkers for vectors */
-lapack_logical LAPACKE_c_nancheck( lapack_int n,
-                                    const lapack_complex_float *x,
-                                    lapack_int incx );
-lapack_logical LAPACKE_d_nancheck( lapack_int n,
-                                    const double *x,
-                                    lapack_int incx );
-lapack_logical LAPACKE_s_nancheck( lapack_int n,
-                                    const float *x,
-                                    lapack_int incx );
-lapack_logical LAPACKE_z_nancheck( lapack_int n,
-                                    const lapack_complex_double *x,
-                                    lapack_int incx );
-/* NaN checkers for matrices */
-lapack_logical LAPACKE_cgb_nancheck( int matrix_layout, lapack_int m,
-                                      lapack_int n, lapack_int kl,
-                                      lapack_int ku,
-                                      const lapack_complex_float *ab,
-                                      lapack_int ldab );
-lapack_logical LAPACKE_cge_nancheck( int matrix_layout, lapack_int m,
-                                      lapack_int n,
-                                      const lapack_complex_float *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_cgg_nancheck( int matrix_layout, lapack_int m,
-                                      lapack_int n,
-                                      const lapack_complex_float *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_cgt_nancheck( lapack_int n,
-                                      const lapack_complex_float *dl,
-                                      const lapack_complex_float *d,
-                                      const lapack_complex_float *du );
-lapack_logical LAPACKE_chb_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n, lapack_int kd,
-                                      const lapack_complex_float* ab,
-                                      lapack_int ldab );
-lapack_logical LAPACKE_che_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n,
-                                      const lapack_complex_float *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_chp_nancheck( lapack_int n,
-                                      const lapack_complex_float *ap );
-lapack_logical LAPACKE_chs_nancheck( int matrix_layout, lapack_int n,
-                                      const lapack_complex_float *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_cpb_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n, lapack_int kd,
-                                      const lapack_complex_float* ab,
-                                      lapack_int ldab );
-lapack_logical LAPACKE_cpf_nancheck( lapack_int n,
-                                      const lapack_complex_float *a );
-lapack_logical LAPACKE_cpo_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n,
-                                      const lapack_complex_float *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_cpp_nancheck( lapack_int n,
-                                      const lapack_complex_float *ap );
-lapack_logical LAPACKE_cpt_nancheck( lapack_int n,
-                                      const float *d,
-                                      const lapack_complex_float *e );
-lapack_logical LAPACKE_csp_nancheck( lapack_int n,
-                                      const lapack_complex_float *ap );
-lapack_logical LAPACKE_cst_nancheck( lapack_int n,
-                                      const lapack_complex_float *d,
-                                      const lapack_complex_float *e );
-lapack_logical LAPACKE_csy_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n,
-                                      const lapack_complex_float *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_ctb_nancheck( int matrix_layout, char uplo, char diag,
-                                      lapack_int n, lapack_int kd,
-                                      const lapack_complex_float* ab,
-                                      lapack_int ldab );
-lapack_logical LAPACKE_ctf_nancheck( int matrix_layout, char transr,
-                                      char uplo, char diag,
-                                      lapack_int n,
-                                      const lapack_complex_float *a );
-lapack_logical LAPACKE_ctp_nancheck( int matrix_layout, char uplo, char diag,
-                                      lapack_int n,
-                                      const lapack_complex_float *ap );
-lapack_logical LAPACKE_ctr_nancheck( int matrix_layout, char uplo, char diag,
-                                      lapack_int n,
-                                      const lapack_complex_float *a,
-                                      lapack_int lda );
+    /* NaN checkers for vectors */
+    lapack_logical API_SUFFIX(LAPACKE_c_nancheck)( lapack_int n,
+            const lapack_complex_float *x,
+            lapack_int incx );
+    lapack_logical API_SUFFIX(LAPACKE_d_nancheck)( lapack_int n,
+            const double *x,
+            lapack_int incx );
+    lapack_logical API_SUFFIX(LAPACKE_s_nancheck)( lapack_int n,
+            const float *x,
+            lapack_int incx );
+    lapack_logical API_SUFFIX(LAPACKE_z_nancheck)( lapack_int n,
+            const lapack_complex_double *x,
+            lapack_int incx );
+    /* NaN checkers for matrices */
+    lapack_logical API_SUFFIX(LAPACKE_cgb_nancheck)( int matrix_layout, lapack_int m,
+            lapack_int n, lapack_int kl,
+            lapack_int ku,
+            const lapack_complex_float *ab,
+            lapack_int ldab );
+    lapack_logical API_SUFFIX(LAPACKE_cge_nancheck)( int matrix_layout, lapack_int m,
+            lapack_int n,
+            const lapack_complex_float *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_cgg_nancheck)( int matrix_layout, lapack_int m,
+            lapack_int n,
+            const lapack_complex_float *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_cgt_nancheck)( lapack_int n,
+            const lapack_complex_float *dl,
+            const lapack_complex_float *d,
+            const lapack_complex_float *du );
+    lapack_logical API_SUFFIX(LAPACKE_chb_nancheck)( int matrix_layout, char uplo,
+            lapack_int n, lapack_int kd,
+            const lapack_complex_float* ab,
+            lapack_int ldab );
+    lapack_logical API_SUFFIX(LAPACKE_che_nancheck)( int matrix_layout, char uplo,
+            lapack_int n,
+            const lapack_complex_float *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_chp_nancheck)( lapack_int n,
+            const lapack_complex_float *ap );
+    lapack_logical API_SUFFIX(LAPACKE_chs_nancheck)( int matrix_layout, lapack_int n,
+            const lapack_complex_float *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_cpb_nancheck)( int matrix_layout, char uplo,
+            lapack_int n, lapack_int kd,
+            const lapack_complex_float* ab,
+            lapack_int ldab );
+    lapack_logical API_SUFFIX(LAPACKE_cpf_nancheck)( lapack_int n,
+            const lapack_complex_float *a );
+    lapack_logical API_SUFFIX(LAPACKE_cpo_nancheck)( int matrix_layout, char uplo,
+            lapack_int n,
+            const lapack_complex_float *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_cpp_nancheck)( lapack_int n,
+            const lapack_complex_float *ap );
+    lapack_logical API_SUFFIX(LAPACKE_cpt_nancheck)( lapack_int n,
+            const float *d,
+            const lapack_complex_float *e );
+    lapack_logical API_SUFFIX(LAPACKE_csp_nancheck)( lapack_int n,
+            const lapack_complex_float *ap );
+    lapack_logical API_SUFFIX(LAPACKE_cst_nancheck)( lapack_int n,
+            const lapack_complex_float *d,
+            const lapack_complex_float *e );
+    lapack_logical API_SUFFIX(LAPACKE_csy_nancheck)( int matrix_layout, char uplo,
+            lapack_int n,
+            const lapack_complex_float *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_ctb_nancheck)( int matrix_layout, char uplo, char diag,
+            lapack_int n, lapack_int kd,
+            const lapack_complex_float* ab,
+            lapack_int ldab );
+    lapack_logical API_SUFFIX(LAPACKE_ctf_nancheck)( int matrix_layout, char transr,
+            char uplo, char diag,
+            lapack_int n,
+            const lapack_complex_float *a );
+    lapack_logical API_SUFFIX(LAPACKE_ctp_nancheck)( int matrix_layout, char uplo, char diag,
+            lapack_int n,
+            const lapack_complex_float *ap );
+    lapack_logical API_SUFFIX(LAPACKE_ctr_nancheck)( int matrix_layout, char uplo, char diag,
+            lapack_int n,
+            const lapack_complex_float *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_ctz_nancheck)( int matrix_layout, char direct, char uplo,
+            char diag, lapack_int m, lapack_int n,
+            const lapack_complex_float *a,
+            lapack_int lda );
 
-lapack_logical LAPACKE_dgb_nancheck( int matrix_layout, lapack_int m,
-                                      lapack_int n, lapack_int kl,
-                                      lapack_int ku,
-                                      const double *ab,
-                                      lapack_int ldab );
-lapack_logical LAPACKE_dge_nancheck( int matrix_layout, lapack_int m,
-                                      lapack_int n,
-                                      const double *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_dgg_nancheck( int matrix_layout, lapack_int m,
-                                      lapack_int n,
-                                      const double *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_dgt_nancheck( lapack_int n,
-                                      const double *dl,
-                                      const double *d,
-                                      const double *du );
-lapack_logical LAPACKE_dhs_nancheck( int matrix_layout, lapack_int n,
-                                      const double *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_dpb_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n, lapack_int kd,
-                                      const double* ab,
-                                      lapack_int ldab );
-lapack_logical LAPACKE_dpf_nancheck( lapack_int n,
-                                      const double *a );
-lapack_logical LAPACKE_dpo_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n,
-                                      const double *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_dpp_nancheck( lapack_int n,
-                                      const double *ap );
-lapack_logical LAPACKE_dpt_nancheck( lapack_int n,
-                                      const double *d,
-                                      const double *e );
-lapack_logical LAPACKE_dsb_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n, lapack_int kd,
-                                      const double* ab,
-                                      lapack_int ldab );
-lapack_logical LAPACKE_dsp_nancheck( lapack_int n,
-                                      const double *ap );
-lapack_logical LAPACKE_dst_nancheck( lapack_int n,
-                                      const double *d,
-                                      const double *e );
-lapack_logical LAPACKE_dsy_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n,
-                                      const double *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_dtb_nancheck( int matrix_layout, char uplo, char diag,
-                                      lapack_int n, lapack_int kd,
-                                      const double* ab,
-                                      lapack_int ldab );
-lapack_logical LAPACKE_dtf_nancheck( int matrix_layout, char transr,
-                                      char uplo, char diag,
-                                      lapack_int n,
-                                      const double *a );
-lapack_logical LAPACKE_dtp_nancheck( int matrix_layout, char uplo, char diag,
-                                      lapack_int n,
-                                      const double *ap );
-lapack_logical LAPACKE_dtr_nancheck( int matrix_layout, char uplo, char diag,
-                                      lapack_int n,
-                                      const double *a,
-                                      lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_dgb_nancheck)( int matrix_layout, lapack_int m,
+            lapack_int n, lapack_int kl,
+            lapack_int ku,
+            const double *ab,
+            lapack_int ldab );
+    lapack_logical API_SUFFIX(LAPACKE_dge_nancheck)( int matrix_layout, lapack_int m,
+            lapack_int n,
+            const double *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_dgg_nancheck)( int matrix_layout, lapack_int m,
+            lapack_int n,
+            const double *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_dgt_nancheck)( lapack_int n,
+            const double *dl,
+            const double *d,
+            const double *du );
+    lapack_logical API_SUFFIX(LAPACKE_dhs_nancheck)( int matrix_layout, lapack_int n,
+            const double *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_dpb_nancheck)( int matrix_layout, char uplo,
+            lapack_int n, lapack_int kd,
+            const double* ab,
+            lapack_int ldab );
+    lapack_logical API_SUFFIX(LAPACKE_dpf_nancheck)( lapack_int n,
+            const double *a );
+    lapack_logical API_SUFFIX(LAPACKE_dpo_nancheck)( int matrix_layout, char uplo,
+            lapack_int n,
+            const double *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_dpp_nancheck)( lapack_int n,
+            const double *ap );
+    lapack_logical API_SUFFIX(LAPACKE_dpt_nancheck)( lapack_int n,
+            const double *d,
+            const double *e );
+    lapack_logical API_SUFFIX(LAPACKE_dsb_nancheck)( int matrix_layout, char uplo,
+            lapack_int n, lapack_int kd,
+            const double* ab,
+            lapack_int ldab );
+    lapack_logical API_SUFFIX(LAPACKE_dsp_nancheck)( lapack_int n,
+            const double *ap );
+    lapack_logical API_SUFFIX(LAPACKE_dst_nancheck)( lapack_int n,
+            const double *d,
+            const double *e );
+    lapack_logical API_SUFFIX(LAPACKE_dsy_nancheck)( int matrix_layout, char uplo,
+            lapack_int n,
+            const double *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_dtb_nancheck)( int matrix_layout, char uplo, char diag,
+            lapack_int n, lapack_int kd,
+            const double* ab,
+            lapack_int ldab );
+    lapack_logical API_SUFFIX(LAPACKE_dtf_nancheck)( int matrix_layout, char transr,
+            char uplo, char diag,
+            lapack_int n,
+            const double *a );
+    lapack_logical API_SUFFIX(LAPACKE_dtp_nancheck)( int matrix_layout, char uplo, char diag,
+            lapack_int n,
+            const double *ap );
+    lapack_logical API_SUFFIX(LAPACKE_dtr_nancheck)( int matrix_layout, char uplo, char diag,
+            lapack_int n,
+            const double *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_dtz_nancheck)( int matrix_layout, char direct, char uplo,
+            char diag, lapack_int m, lapack_int n,
+            const double *a, lapack_int lda );
 
-lapack_logical LAPACKE_sgb_nancheck( int matrix_layout, lapack_int m,
-                                      lapack_int n, lapack_int kl,
-                                      lapack_int ku,
-                                      const float *ab,
-                                      lapack_int ldab );
-lapack_logical LAPACKE_sge_nancheck( int matrix_layout, lapack_int m,
-                                      lapack_int n,
-                                      const float *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_sgg_nancheck( int matrix_layout, lapack_int m,
-                                      lapack_int n,
-                                      const float *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_sgt_nancheck( lapack_int n,
-                                      const float *dl,
-                                      const float *d,
-                                      const float *du );
-lapack_logical LAPACKE_shs_nancheck( int matrix_layout, lapack_int n,
-                                      const float *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_spb_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n, lapack_int kd,
-                                      const float* ab,
-                                      lapack_int ldab );
-lapack_logical LAPACKE_spf_nancheck( lapack_int n,
-                                      const float *a );
-lapack_logical LAPACKE_spo_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n,
-                                      const float *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_spp_nancheck( lapack_int n,
-                                      const float *ap );
-lapack_logical LAPACKE_spt_nancheck( lapack_int n,
-                                      const float *d,
-                                      const float *e );
-lapack_logical LAPACKE_ssb_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n, lapack_int kd,
-                                      const float* ab,
-                                      lapack_int ldab );
-lapack_logical LAPACKE_ssp_nancheck( lapack_int n,
-                                      const float *ap );
-lapack_logical LAPACKE_sst_nancheck( lapack_int n,
-                                      const float *d,
-                                      const float *e );
-lapack_logical LAPACKE_ssy_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n,
-                                      const float *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_stb_nancheck( int matrix_layout, char uplo, char diag,
-                                      lapack_int n, lapack_int kd,
-                                      const float* ab,
-                                      lapack_int ldab );
-lapack_logical LAPACKE_stf_nancheck( int matrix_layout, char transr,
-                                      char uplo, char diag,
-                                      lapack_int n,
-                                      const float *a );
-lapack_logical LAPACKE_stp_nancheck( int matrix_layout, char uplo, char diag,
-                                      lapack_int n,
-                                      const float *ap );
-lapack_logical LAPACKE_str_nancheck( int matrix_layout, char uplo, char diag,
-                                      lapack_int n,
-                                      const float *a,
-                                      lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_sgb_nancheck)( int matrix_layout, lapack_int m,
+            lapack_int n, lapack_int kl,
+            lapack_int ku,
+            const float *ab,
+            lapack_int ldab );
+    lapack_logical API_SUFFIX(LAPACKE_sge_nancheck)( int matrix_layout, lapack_int m,
+            lapack_int n,
+            const float *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_sgg_nancheck)( int matrix_layout, lapack_int m,
+            lapack_int n,
+            const float *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_sgt_nancheck)( lapack_int n,
+            const float *dl,
+            const float *d,
+            const float *du );
+    lapack_logical API_SUFFIX(LAPACKE_shs_nancheck)( int matrix_layout, lapack_int n,
+            const float *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_spb_nancheck)( int matrix_layout, char uplo,
+            lapack_int n, lapack_int kd,
+            const float* ab,
+            lapack_int ldab );
+    lapack_logical API_SUFFIX(LAPACKE_spf_nancheck)( lapack_int n,
+            const float *a );
+    lapack_logical API_SUFFIX(LAPACKE_spo_nancheck)( int matrix_layout, char uplo,
+            lapack_int n,
+            const float *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_spp_nancheck)( lapack_int n,
+            const float *ap );
+    lapack_logical API_SUFFIX(LAPACKE_spt_nancheck)( lapack_int n,
+            const float *d,
+            const float *e );
+    lapack_logical API_SUFFIX(LAPACKE_ssb_nancheck)( int matrix_layout, char uplo,
+            lapack_int n, lapack_int kd,
+            const float* ab,
+            lapack_int ldab );
+    lapack_logical API_SUFFIX(LAPACKE_ssp_nancheck)( lapack_int n,
+            const float *ap );
+    lapack_logical API_SUFFIX(LAPACKE_sst_nancheck)( lapack_int n,
+            const float *d,
+            const float *e );
+    lapack_logical API_SUFFIX(LAPACKE_ssy_nancheck)( int matrix_layout, char uplo,
+            lapack_int n,
+            const float *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_stb_nancheck)( int matrix_layout, char uplo, char diag,
+            lapack_int n, lapack_int kd,
+            const float* ab,
+            lapack_int ldab );
+    lapack_logical API_SUFFIX(LAPACKE_stf_nancheck)( int matrix_layout, char transr,
+            char uplo, char diag,
+            lapack_int n,
+            const float *a );
+    lapack_logical API_SUFFIX(LAPACKE_stp_nancheck)( int matrix_layout, char uplo, char diag,
+            lapack_int n,
+            const float *ap );
+    lapack_logical API_SUFFIX(LAPACKE_str_nancheck)( int matrix_layout, char uplo, char diag,
+            lapack_int n,
+            const float *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_stz_nancheck)( int matrix_layout, char direct, char uplo,
+            char diag, lapack_int m, lapack_int n,
+            const float *a, lapack_int lda );
 
-lapack_logical LAPACKE_zgb_nancheck( int matrix_layout, lapack_int m,
-                                      lapack_int n, lapack_int kl,
-                                      lapack_int ku,
-                                      const lapack_complex_double *ab,
-                                      lapack_int ldab );
-lapack_logical LAPACKE_zge_nancheck( int matrix_layout, lapack_int m,
-                                      lapack_int n,
-                                      const lapack_complex_double *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_zgg_nancheck( int matrix_layout, lapack_int m,
-                                      lapack_int n,
-                                      const lapack_complex_double *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_zgt_nancheck( lapack_int n,
-                                      const lapack_complex_double *dl,
-                                      const lapack_complex_double *d,
-                                      const lapack_complex_double *du );
-lapack_logical LAPACKE_zhb_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n, lapack_int kd,
-                                      const lapack_complex_double* ab,
-                                      lapack_int ldab );
-lapack_logical LAPACKE_zhe_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n,
-                                      const lapack_complex_double *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_zhp_nancheck( lapack_int n,
-                                      const lapack_complex_double *ap );
-lapack_logical LAPACKE_zhs_nancheck( int matrix_layout, lapack_int n,
-                                      const lapack_complex_double *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_zpb_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n, lapack_int kd,
-                                      const lapack_complex_double* ab,
-                                      lapack_int ldab );
-lapack_logical LAPACKE_zpf_nancheck( lapack_int n,
-                                      const lapack_complex_double *a );
-lapack_logical LAPACKE_zpo_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n,
-                                      const lapack_complex_double *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_zpp_nancheck( lapack_int n,
-                                      const lapack_complex_double *ap );
-lapack_logical LAPACKE_zpt_nancheck( lapack_int n,
-                                      const double *d,
-                                      const lapack_complex_double *e );
-lapack_logical LAPACKE_zsp_nancheck( lapack_int n,
-                                      const lapack_complex_double *ap );
-lapack_logical LAPACKE_zst_nancheck( lapack_int n,
-                                      const lapack_complex_double *d,
-                                      const lapack_complex_double *e );
-lapack_logical LAPACKE_zsy_nancheck( int matrix_layout, char uplo,
-                                      lapack_int n,
-                                      const lapack_complex_double *a,
-                                      lapack_int lda );
-lapack_logical LAPACKE_ztb_nancheck( int matrix_layout, char uplo, char diag,
-                                      lapack_int n, lapack_int kd,
-                                      const lapack_complex_double* ab,
-                                      lapack_int ldab );
-lapack_logical LAPACKE_ztf_nancheck( int matrix_layout, char transr,
-                                      char uplo, char diag,
-                                      lapack_int n,
-                                      const lapack_complex_double *a );
-lapack_logical LAPACKE_ztp_nancheck( int matrix_layout, char uplo, char diag,
-                                      lapack_int n,
-                                      const lapack_complex_double *ap );
-lapack_logical LAPACKE_ztr_nancheck( int matrix_layout, char uplo, char diag,
-                                      lapack_int n,
-                                      const lapack_complex_double *a,
-                                      lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_zgb_nancheck)( int matrix_layout, lapack_int m,
+            lapack_int n, lapack_int kl,
+            lapack_int ku,
+            const lapack_complex_double *ab,
+            lapack_int ldab );
+    lapack_logical API_SUFFIX(LAPACKE_zge_nancheck)( int matrix_layout, lapack_int m,
+            lapack_int n,
+            const lapack_complex_double *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_zgg_nancheck)( int matrix_layout, lapack_int m,
+            lapack_int n,
+            const lapack_complex_double *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_zgt_nancheck)( lapack_int n,
+            const lapack_complex_double *dl,
+            const lapack_complex_double *d,
+            const lapack_complex_double *du );
+    lapack_logical API_SUFFIX(LAPACKE_zhb_nancheck)( int matrix_layout, char uplo,
+            lapack_int n, lapack_int kd,
+            const lapack_complex_double* ab,
+            lapack_int ldab );
+    lapack_logical API_SUFFIX(LAPACKE_zhe_nancheck)( int matrix_layout, char uplo,
+            lapack_int n,
+            const lapack_complex_double *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_zhp_nancheck)( lapack_int n,
+            const lapack_complex_double *ap );
+    lapack_logical API_SUFFIX(LAPACKE_zhs_nancheck)( int matrix_layout, lapack_int n,
+            const lapack_complex_double *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_zpb_nancheck)( int matrix_layout, char uplo,
+            lapack_int n, lapack_int kd,
+            const lapack_complex_double* ab,
+            lapack_int ldab );
+    lapack_logical API_SUFFIX(LAPACKE_zpf_nancheck)( lapack_int n,
+            const lapack_complex_double *a );
+    lapack_logical API_SUFFIX(LAPACKE_zpo_nancheck)( int matrix_layout, char uplo,
+            lapack_int n,
+            const lapack_complex_double *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_zpp_nancheck)( lapack_int n,
+            const lapack_complex_double *ap );
+    lapack_logical API_SUFFIX(LAPACKE_zpt_nancheck)( lapack_int n,
+            const double *d,
+            const lapack_complex_double *e );
+    lapack_logical API_SUFFIX(LAPACKE_zsp_nancheck)( lapack_int n,
+            const lapack_complex_double *ap );
+    lapack_logical API_SUFFIX(LAPACKE_zst_nancheck)( lapack_int n,
+            const lapack_complex_double *d,
+            const lapack_complex_double *e );
+    lapack_logical API_SUFFIX(LAPACKE_zsy_nancheck)( int matrix_layout, char uplo,
+            lapack_int n,
+            const lapack_complex_double *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_ztb_nancheck)( int matrix_layout, char uplo, char diag,
+            lapack_int n, lapack_int kd,
+            const lapack_complex_double* ab,
+            lapack_int ldab );
+    lapack_logical API_SUFFIX(LAPACKE_ztf_nancheck)( int matrix_layout, char transr,
+            char uplo, char diag,
+            lapack_int n,
+            const lapack_complex_double *a );
+    lapack_logical API_SUFFIX(LAPACKE_ztp_nancheck)( int matrix_layout, char uplo, char diag,
+            lapack_int n,
+            const lapack_complex_double *ap );
+    lapack_logical API_SUFFIX(LAPACKE_ztr_nancheck)( int matrix_layout, char uplo, char diag,
+            lapack_int n,
+            const lapack_complex_double *a,
+            lapack_int lda );
+    lapack_logical API_SUFFIX(LAPACKE_ztz_nancheck)( int matrix_layout, char direct, char uplo,
+            char diag, lapack_int m, lapack_int n,
+            const lapack_complex_double *a,
+            lapack_int lda );
 
 #ifdef __cplusplus
 }
diff --git a/LAPACKE/mangling/CMakeLists.txt b/LAPACKE/mangling/CMakeLists.txt
index 55986c16d5..a3e20ab79a 100644
--- a/LAPACKE/mangling/CMakeLists.txt
+++ b/LAPACKE/mangling/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.13)
 project(MANGLING C Fortran)
 
 add_executable(xintface Fintface.f Cintface.c)
diff --git a/LAPACKE/src/CMakeLists.txt b/LAPACKE/src/CMakeLists.txt
index 4171a3bd42..eebc5f869f 100644
--- a/LAPACKE/src/CMakeLists.txt
+++ b/LAPACKE/src/CMakeLists.txt
@@ -89,6 +89,10 @@ lapacke_cgerqf.c
 lapacke_cgerqf_work.c
 lapacke_cgesdd.c
 lapacke_cgesdd_work.c
+lapacke_cgedmd.c
+lapacke_cgedmd_work.c
+lapacke_cgedmdq.c
+lapacke_cgedmdq_work.c
 lapacke_cgesv.c
 lapacke_cgesv_work.c
 lapacke_cgesvd.c
@@ -309,6 +313,8 @@ lapacke_clacrm.c
 lapacke_clacrm_work.c
 lapacke_clag2z.c
 lapacke_clag2z_work.c
+lapacke_clangb.c
+lapacke_clangb_work.c
 lapacke_clange.c
 lapacke_clange_work.c
 lapacke_clanhe.c
@@ -557,6 +563,8 @@ lapacke_ctrsna.c
 lapacke_ctrsna_work.c
 lapacke_ctrsyl.c
 lapacke_ctrsyl_work.c
+lapacke_ctrsyl3.c
+lapacke_ctrsyl3_work.c
 lapacke_ctrtri.c
 lapacke_ctrtri_work.c
 lapacke_ctrtrs.c
@@ -589,6 +597,8 @@ lapacke_cungtr.c
 lapacke_cungtr_work.c
 lapacke_cungtsqr_row.c
 lapacke_cungtsqr_row_work.c
+lapacke_cunhr_col.c
+lapacke_cunhr_col_work.c
 lapacke_cunmbr.c
 lapacke_cunmbr_work.c
 lapacke_cunmhr.c
@@ -707,6 +717,10 @@ lapacke_dgerqf.c
 lapacke_dgerqf_work.c
 lapacke_dgesdd.c
 lapacke_dgesdd_work.c
+lapacke_dgedmd.c
+lapacke_dgedmd_work.c
+lapacke_dgedmdq.c
+lapacke_dgedmdq_work.c
 lapacke_dgesv.c
 lapacke_dgesv_work.c
 lapacke_dgesvd.c
@@ -791,6 +805,8 @@ lapacke_dlag2s.c
 lapacke_dlag2s_work.c
 lapacke_dlamch.c
 lapacke_dlamch_work.c
+lapacke_dlangb.c
+lapacke_dlangb_work.c
 lapacke_dlange.c
 lapacke_dlange_work.c
 lapacke_dlansy.c
@@ -857,6 +873,8 @@ lapacke_dorgtr.c
 lapacke_dorgtr_work.c
 lapacke_dorgtsqr_row.c
 lapacke_dorgtsqr_row_work.c
+lapacke_dorhr_col.c
+lapacke_dorhr_col_work.c
 lapacke_dormbr.c
 lapacke_dormbr_work.c
 lapacke_dormhr.c
@@ -1169,6 +1187,8 @@ lapacke_dtrsna.c
 lapacke_dtrsna_work.c
 lapacke_dtrsyl.c
 lapacke_dtrsyl_work.c
+lapacke_dtrsyl3.c
+lapacke_dtrsyl3_work.c
 lapacke_dtrtri.c
 lapacke_dtrtri_work.c
 lapacke_dtrtrs.c
@@ -1282,6 +1302,10 @@ lapacke_sgerqf.c
 lapacke_sgerqf_work.c
 lapacke_sgesdd.c
 lapacke_sgesdd_work.c
+lapacke_sgedmd.c
+lapacke_sgedmd_work.c
+lapacke_sgedmdq.c
+lapacke_sgedmdq_work.c
 lapacke_sgesv.c
 lapacke_sgesv_work.c
 lapacke_sgesvd.c
@@ -1366,6 +1390,8 @@ lapacke_slag2d.c
 lapacke_slag2d_work.c
 lapacke_slamch.c
 lapacke_slamch_work.c
+lapacke_slangb.c
+lapacke_slangb_work.c
 lapacke_slange.c
 lapacke_slange_work.c
 lapacke_slansy.c
@@ -1432,6 +1458,8 @@ lapacke_sorgtr.c
 lapacke_sorgtr_work.c
 lapacke_sorgtsqr_row.c
 lapacke_sorgtsqr_row_work.c
+lapacke_sorhr_col.c
+lapacke_sorhr_col_work.c
 lapacke_sormbr.c
 lapacke_sormbr_work.c
 lapacke_sormhr.c
@@ -1740,6 +1768,8 @@ lapacke_strsna.c
 lapacke_strsna_work.c
 lapacke_strsyl.c
 lapacke_strsyl_work.c
+lapacke_strsyl3.c
+lapacke_strsyl3_work.c
 lapacke_strtri.c
 lapacke_strtri_work.c
 lapacke_strtrs.c
@@ -1846,6 +1876,10 @@ lapacke_zgerqf.c
 lapacke_zgerqf_work.c
 lapacke_zgesdd.c
 lapacke_zgesdd_work.c
+lapacke_zgedmd.c
+lapacke_zgedmd_work.c
+lapacke_zgedmdq.c
+lapacke_zgedmdq_work.c
 lapacke_zgesv.c
 lapacke_zgesv_work.c
 lapacke_zgesvd.c
@@ -2066,6 +2100,8 @@ lapacke_zlacrm.c
 lapacke_zlacrm_work.c
 lapacke_zlag2c.c
 lapacke_zlag2c_work.c
+lapacke_zlangb.c
+lapacke_zlangb_work.c
 lapacke_zlange.c
 lapacke_zlange_work.c
 lapacke_zlanhe.c
@@ -2314,6 +2350,8 @@ lapacke_ztrsna.c
 lapacke_ztrsna_work.c
 lapacke_ztrsyl.c
 lapacke_ztrsyl_work.c
+lapacke_ztrsyl3.c
+lapacke_ztrsyl3_work.c
 lapacke_ztrtri.c
 lapacke_ztrtri_work.c
 lapacke_ztrtrs.c
@@ -2346,6 +2384,8 @@ lapacke_zungtr.c
 lapacke_zungtr_work.c
 lapacke_zungtsqr_row.c
 lapacke_zungtsqr_row_work.c
+lapacke_zunhr_col.c
+lapacke_zunhr_col_work.c
 lapacke_zunmbr.c
 lapacke_zunmbr_work.c
 lapacke_zunmhr.c
diff --git a/LAPACKE/src/Makefile b/LAPACKE/src/Makefile
index 2e62d0324a..fece21af48 100644
--- a/LAPACKE/src/Makefile
+++ b/LAPACKE/src/Makefile
@@ -39,7 +39,7 @@ include $(TOPSRCDIR)/make.inc
 
 .SUFFIXES: .c .o
 .c.o:
-	$(CC) $(CFLAGS) -I../include -c -o $@ $<
+	$(CC) $(CFLAGS) -Wall -I../include -c -o $@ $<
 
 OBJ = \
 lapacke_ilaver.o \
@@ -136,6 +136,10 @@ lapacke_cgerqf.o \
 lapacke_cgerqf_work.o \
 lapacke_cgesdd.o \
 lapacke_cgesdd_work.o \
+lapacke_cgedmd.o \
+lapacke_cgedmd_work.o \
+lapacke_cgedmdq.o \
+lapacke_cgedmdq_work.o \
 lapacke_cgesv.o \
 lapacke_cgesv_work.o \
 lapacke_cgesvd.o \
@@ -356,6 +360,8 @@ lapacke_clacrm.o \
 lapacke_clacrm_work.o \
 lapacke_clag2z.o \
 lapacke_clag2z_work.o \
+lapacke_clangb.o \
+lapacke_clangb_work.o \
 lapacke_clange.o \
 lapacke_clange_work.o \
 lapacke_clanhe.o \
@@ -604,6 +610,8 @@ lapacke_ctrsna.o \
 lapacke_ctrsna_work.o \
 lapacke_ctrsyl.o \
 lapacke_ctrsyl_work.o \
+lapacke_ctrsyl3.o \
+lapacke_ctrsyl3_work.o \
 lapacke_ctrtri.o \
 lapacke_ctrtri_work.o \
 lapacke_ctrtrs.o \
@@ -636,6 +644,8 @@ lapacke_cungtr.o \
 lapacke_cungtr_work.o \
 lapacke_cungtsqr_row.o \
 lapacke_cungtsqr_row_work.o \
+lapacke_cunhr_col.o \
+lapacke_cunhr_col_work.o \
 lapacke_cunmbr.o \
 lapacke_cunmbr_work.o \
 lapacke_cunmhr.o \
@@ -754,6 +764,10 @@ lapacke_dgerqf.o \
 lapacke_dgerqf_work.o \
 lapacke_dgesdd.o \
 lapacke_dgesdd_work.o \
+lapacke_dgedmd.o \
+lapacke_dgedmd_work.o \
+lapacke_dgedmdq.o \
+lapacke_dgedmdq_work.o \
 lapacke_dgesv.o \
 lapacke_dgesv_work.o \
 lapacke_dgesvd.o \
@@ -838,6 +852,8 @@ lapacke_dlag2s.o \
 lapacke_dlag2s_work.o \
 lapacke_dlamch.o \
 lapacke_dlamch_work.o \
+lapacke_dlangb.o \
+lapacke_dlangb_work.o \
 lapacke_dlange.o \
 lapacke_dlange_work.o \
 lapacke_dlansy.o \
@@ -904,6 +920,8 @@ lapacke_dorgtr.o \
 lapacke_dorgtr_work.o \
 lapacke_dorgtsqr_row.o \
 lapacke_dorgtsqr_row_work.o \
+lapacke_dorhr_col.o \
+lapacke_dorhr_col_work.o \
 lapacke_dormbr.o \
 lapacke_dormbr_work.o \
 lapacke_dormhr.o \
@@ -1216,6 +1234,8 @@ lapacke_dtrsna.o \
 lapacke_dtrsna_work.o \
 lapacke_dtrsyl.o \
 lapacke_dtrsyl_work.o \
+lapacke_dtrsyl3.o \
+lapacke_dtrsyl3_work.o \
 lapacke_dtrtri.o \
 lapacke_dtrtri_work.o \
 lapacke_dtrtrs.o \
@@ -1324,6 +1344,10 @@ lapacke_sgerqf.o \
 lapacke_sgerqf_work.o \
 lapacke_sgesdd.o \
 lapacke_sgesdd_work.o \
+lapacke_sgedmd.o \
+lapacke_sgedmd_work.o \
+lapacke_sgedmdq.o \
+lapacke_sgedmdq_work.o \
 lapacke_sgesv.o \
 lapacke_sgesv_work.o \
 lapacke_sgesvd.o \
@@ -1408,6 +1432,8 @@ lapacke_slag2d.o \
 lapacke_slag2d_work.o \
 lapacke_slamch.o \
 lapacke_slamch_work.o \
+lapacke_slangb.o \
+lapacke_slangb_work.o \
 lapacke_slange.o \
 lapacke_slange_work.o \
 lapacke_slansy.o \
@@ -1474,6 +1500,8 @@ lapacke_sorgtr.o \
 lapacke_sorgtr_work.o \
 lapacke_sorgtsqr_row.o \
 lapacke_sorgtsqr_row_work.o \
+lapacke_sorhr_col.o \
+lapacke_sorhr_col_work.o \
 lapacke_sormbr.o \
 lapacke_sormbr_work.o \
 lapacke_sormhr.o \
@@ -1782,6 +1810,8 @@ lapacke_strsna.o \
 lapacke_strsna_work.o \
 lapacke_strsyl.o \
 lapacke_strsyl_work.o \
+lapacke_strsyl3.o \
+lapacke_strsyl3_work.o \
 lapacke_strtri.o \
 lapacke_strtri_work.o \
 lapacke_strtrs.o \
@@ -1888,6 +1918,10 @@ lapacke_zgerqf.o \
 lapacke_zgerqf_work.o \
 lapacke_zgesdd.o \
 lapacke_zgesdd_work.o \
+lapacke_zgedmd.o \
+lapacke_zgedmd_work.o \
+lapacke_zgedmdq.o \
+lapacke_zgedmdq_work.o \
 lapacke_zgesv.o \
 lapacke_zgesv_work.o \
 lapacke_zgesvd.o \
@@ -2108,6 +2142,8 @@ lapacke_zlacrm.o \
 lapacke_zlacrm_work.o \
 lapacke_zlag2c.o \
 lapacke_zlag2c_work.o \
+lapacke_zlangb.o \
+lapacke_zlangb_work.o \
 lapacke_zlange.o \
 lapacke_zlange_work.o \
 lapacke_zlanhe.o \
@@ -2356,6 +2392,8 @@ lapacke_ztrsna.o \
 lapacke_ztrsna_work.o \
 lapacke_ztrsyl.o \
 lapacke_ztrsyl_work.o \
+lapacke_ztrsyl3.o \
+lapacke_ztrsyl3_work.o \
 lapacke_ztrtri.o \
 lapacke_ztrtri_work.o \
 lapacke_ztrtrs.o \
@@ -2388,6 +2426,8 @@ lapacke_zungtr.o \
 lapacke_zungtr_work.o \
 lapacke_zungtsqr_row.o \
 lapacke_zungtsqr_row_work.o \
+lapacke_zunhr_col.o \
+lapacke_zunhr_col_work.o \
 lapacke_zunmbr.o \
 lapacke_zunmbr_work.o \
 lapacke_zunmhr.o \
diff --git a/LAPACKE/src/lapacke_cbbcsd.c b/LAPACKE/src/lapacke_cbbcsd.c
index cfcac5e641..8197654352 100644
--- a/LAPACKE/src/lapacke_cbbcsd.c
+++ b/LAPACKE/src/lapacke_cbbcsd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cbbcsd( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_cbbcsd)( int matrix_layout, char jobu1, char jobu2,
                            char jobv1t, char jobv2t, char trans, lapack_int m,
                            lapack_int p, lapack_int q, float* theta, float* phi,
                            lapack_complex_float* u1, lapack_int ldu1,
@@ -48,10 +48,10 @@ lapack_int LAPACKE_cbbcsd( int matrix_layout, char jobu1, char jobu2,
     float rwork_query;
     int lapack_layout;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cbbcsd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cbbcsd", -1 );
         return -1;
     }
-    if( LAPACKE_lsame( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+    if( API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
         lapack_layout = LAPACK_COL_MAJOR;
     } else {
         lapack_layout = LAPACK_ROW_MAJOR;
@@ -59,36 +59,36 @@ lapack_int LAPACKE_cbbcsd( int matrix_layout, char jobu1, char jobu2,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( q-1, phi, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( q-1, phi, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_s_nancheck( q, theta, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( q, theta, 1 ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( jobu1, 'y' ) ) {
-            if( LAPACKE_cge_nancheck( lapack_layout, p, p, u1, ldu1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( lapack_layout, p, p, u1, ldu1 ) ) {
                 return -12;
             }
         }
-        if( LAPACKE_lsame( jobu2, 'y' ) ) {
-            if( LAPACKE_cge_nancheck( lapack_layout, m-p, m-p, u2, ldu2 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( lapack_layout, m-p, m-p, u2, ldu2 ) ) {
                 return -14;
             }
         }
-        if( LAPACKE_lsame( jobv1t, 'y' ) ) {
-            if( LAPACKE_cge_nancheck( lapack_layout, q, q, v1t, ldv1t ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( lapack_layout, q, q, v1t, ldv1t ) ) {
                 return -16;
             }
         }
-        if( LAPACKE_lsame( jobv2t, 'y' ) ) {
-            if( LAPACKE_cge_nancheck( lapack_layout, m-q, m-q, v2t, ldv2t ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv2t, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( lapack_layout, m-q, m-q, v2t, ldv2t ) ) {
                 return -18;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cbbcsd_work( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
+    info = API_SUFFIX(LAPACKE_cbbcsd_work)( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
                                 trans, m, p, q, theta, phi, u1, ldu1, u2, ldu2,
                                 v1t, ldv1t, v2t, ldv2t, b11d, b11e, b12d, b12e,
                                 b21d, b21e, b22d, b22e, &rwork_query, lrwork );
@@ -103,7 +103,7 @@ lapack_int LAPACKE_cbbcsd( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cbbcsd_work( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
+    info = API_SUFFIX(LAPACKE_cbbcsd_work)( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
                                 trans, m, p, q, theta, phi, u1, ldu1, u2, ldu2,
                                 v1t, ldv1t, v2t, ldv2t, b11d, b11e, b12d, b12e,
                                 b21d, b21e, b22d, b22e, rwork, lrwork );
@@ -111,7 +111,7 @@ lapack_int LAPACKE_cbbcsd( int matrix_layout, char jobu1, char jobu2,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cbbcsd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cbbcsd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cbbcsd_work.c b/LAPACKE/src/lapacke_cbbcsd_work.c
index b7eca09762..c72de40cf7 100644
--- a/LAPACKE/src/lapacke_cbbcsd_work.c
+++ b/LAPACKE/src/lapacke_cbbcsd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cbbcsd_work( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_cbbcsd_work)( int matrix_layout, char jobu1, char jobu2,
                                 char jobv1t, char jobv2t, char trans,
                                 lapack_int m, lapack_int p, lapack_int q,
                                 float* theta, float* phi,
@@ -63,7 +63,7 @@ lapack_int LAPACKE_cbbcsd_work( int matrix_layout, char jobu1, char jobu2,
     if( matrix_layout == LAPACK_COL_MAJOR ||
         matrix_layout == LAPACK_ROW_MAJOR ) {
         char ltrans;
-        if( !LAPACKE_lsame( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+        if( !API_SUFFIX(LAPACKE_lsame)( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
             ltrans = 'n';
         } else {
             ltrans = 't';
@@ -78,7 +78,7 @@ lapack_int LAPACKE_cbbcsd_work( int matrix_layout, char jobu1, char jobu2,
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cbbcsd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cbbcsd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cbdsqr.c b/LAPACKE/src/lapacke_cbdsqr.c
index fa41ebcc1f..8dc947710b 100644
--- a/LAPACKE/src/lapacke_cbdsqr.c
+++ b/LAPACKE/src/lapacke_cbdsqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cbdsqr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cbdsqr)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int ncvt, lapack_int nru, lapack_int ncc,
                            float* d, float* e, lapack_complex_float* vt,
                            lapack_int ldvt, lapack_complex_float* u,
@@ -42,30 +42,30 @@ lapack_int LAPACKE_cbdsqr( int matrix_layout, char uplo, lapack_int n,
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cbdsqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cbdsqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
         if( ncc != 0 ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, ncc, c, ldc ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, ncc, c, ldc ) ) {
                 return -13;
             }
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -8;
         }
         if( nru != 0 ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, nru, n, u, ldu ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, nru, n, u, ldu ) ) {
                 return -11;
             }
         }
         if( ncvt != 0 ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, ncvt, vt, ldvt ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, ncvt, vt, ldvt ) ) {
                 return -9;
             }
         }
@@ -78,13 +78,13 @@ lapack_int LAPACKE_cbdsqr( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cbdsqr_work( matrix_layout, uplo, n, ncvt, nru, ncc, d, e, vt,
+    info = API_SUFFIX(LAPACKE_cbdsqr_work)( matrix_layout, uplo, n, ncvt, nru, ncc, d, e, vt,
                                 ldvt, u, ldu, c, ldc, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cbdsqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cbdsqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cbdsqr_work.c b/LAPACKE/src/lapacke_cbdsqr_work.c
index 2175d38c7b..cc5600e99b 100644
--- a/LAPACKE/src/lapacke_cbdsqr_work.c
+++ b/LAPACKE/src/lapacke_cbdsqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cbdsqr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cbdsqr_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int ncvt, lapack_int nru, lapack_int ncc,
                                 float* d, float* e, lapack_complex_float* vt,
                                 lapack_int ldvt, lapack_complex_float* u,
@@ -57,17 +57,17 @@ lapack_int LAPACKE_cbdsqr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldc < ncc ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_cbdsqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cbdsqr_work", info );
             return info;
         }
         if( ldu < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_cbdsqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cbdsqr_work", info );
             return info;
         }
         if( ldvt < ncvt ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cbdsqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cbdsqr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -100,13 +100,13 @@ lapack_int LAPACKE_cbdsqr_work( int matrix_layout, char uplo, lapack_int n,
         }
         /* Transpose input matrices */
         if( ncvt != 0 ) {
-            LAPACKE_cge_trans( matrix_layout, n, ncvt, vt, ldvt, vt_t, ldvt_t );
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, ncvt, vt, ldvt, vt_t, ldvt_t );
         }
         if( nru != 0 ) {
-            LAPACKE_cge_trans( matrix_layout, nru, n, u, ldu, u_t, ldu_t );
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, nru, n, u, ldu, u_t, ldu_t );
         }
         if( ncc != 0 ) {
-            LAPACKE_cge_trans( matrix_layout, n, ncc, c, ldc, c_t, ldc_t );
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, ncc, c, ldc, c_t, ldc_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_cbdsqr( &uplo, &n, &ncvt, &nru, &ncc, d, e, vt_t, &ldvt_t, u_t,
@@ -116,14 +116,14 @@ lapack_int LAPACKE_cbdsqr_work( int matrix_layout, char uplo, lapack_int n,
         }
         /* Transpose output matrices */
         if( ncvt != 0 ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, ncvt, vt_t, ldvt_t, vt,
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, ncvt, vt_t, ldvt_t, vt,
                                ldvt );
         }
         if( nru != 0 ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nru, n, u_t, ldu_t, u, ldu );
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nru, n, u_t, ldu_t, u, ldu );
         }
         if( ncc != 0 ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, ncc, c_t, ldc_t, c, ldc );
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, ncc, c_t, ldc_t, c, ldc );
         }
         /* Release memory and exit */
         if( ncc != 0 ) {
@@ -139,11 +139,11 @@ lapack_int LAPACKE_cbdsqr_work( int matrix_layout, char uplo, lapack_int n,
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cbdsqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cbdsqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cbdsqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cbdsqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgbbrd.c b/LAPACKE/src/lapacke_cgbbrd.c
index 09947879e7..2105fc2e52 100644
--- a/LAPACKE/src/lapacke_cgbbrd.c
+++ b/LAPACKE/src/lapacke_cgbbrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbbrd( int matrix_layout, char vect, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_cgbbrd)( int matrix_layout, char vect, lapack_int m,
                            lapack_int n, lapack_int ncc, lapack_int kl,
                            lapack_int ku, lapack_complex_float* ab,
                            lapack_int ldab, float* d, float* e,
@@ -44,17 +44,17 @@ lapack_int LAPACKE_cgbbrd( int matrix_layout, char vect, lapack_int m,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgbbrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbbrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cgb_nancheck( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
             return -8;
         }
         if( ncc != 0 ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, m, ncc, c, ldc ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, ncc, c, ldc ) ) {
                 return -16;
             }
         }
@@ -73,7 +73,7 @@ lapack_int LAPACKE_cgbbrd( int matrix_layout, char vect, lapack_int m,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgbbrd_work( matrix_layout, vect, m, n, ncc, kl, ku, ab, ldab,
+    info = API_SUFFIX(LAPACKE_cgbbrd_work)( matrix_layout, vect, m, n, ncc, kl, ku, ab, ldab,
                                 d, e, q, ldq, pt, ldpt, c, ldc, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -81,7 +81,7 @@ lapack_int LAPACKE_cgbbrd( int matrix_layout, char vect, lapack_int m,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgbbrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbbrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgbbrd_work.c b/LAPACKE/src/lapacke_cgbbrd_work.c
index 1565e565e5..62cbac119d 100644
--- a/LAPACKE/src/lapacke_cgbbrd_work.c
+++ b/LAPACKE/src/lapacke_cgbbrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbbrd_work( int matrix_layout, char vect, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_cgbbrd_work)( int matrix_layout, char vect, lapack_int m,
                                 lapack_int n, lapack_int ncc, lapack_int kl,
                                 lapack_int ku, lapack_complex_float* ab,
                                 lapack_int ldab, float* d, float* e,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_cgbbrd_work( int matrix_layout, char vect, lapack_int m,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbbrd_work", info );
             return info;
         }
         if( ldc < ncc ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_cgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbbrd_work", info );
             return info;
         }
         if( ldpt < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_cgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbbrd_work", info );
             return info;
         }
         if( ldq < m ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_cgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbbrd_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -86,7 +86,7 @@ lapack_int LAPACKE_cgbbrd_work( int matrix_layout, char vect, lapack_int m,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ) {
             q_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldq_t * MAX(1,m) );
@@ -95,7 +95,7 @@ lapack_int LAPACKE_cgbbrd_work( int matrix_layout, char vect, lapack_int m,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'p' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'p' ) ) {
             pt_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldpt_t * MAX(1,n) );
@@ -114,9 +114,9 @@ lapack_int LAPACKE_cgbbrd_work( int matrix_layout, char vect, lapack_int m,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cgb_trans( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
         if( ncc != 0 ) {
-            LAPACKE_cge_trans( matrix_layout, m, ncc, c, ldc, c_t, ldc_t );
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, ncc, c, ldc, c_t, ldc_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_cgbbrd( &vect, &m, &n, &ncc, &kl, &ku, ab_t, &ldab_t, d, e, q_t,
@@ -125,38 +125,38 @@ lapack_int LAPACKE_cgbbrd_work( int matrix_layout, char vect, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cgb_trans( LAPACK_COL_MAJOR, m, n, kl, ku, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_cgb_trans)( LAPACK_COL_MAJOR, m, n, kl, ku, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'q' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, m, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, m, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'p' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, pt_t, ldpt_t, pt, ldpt );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'p' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, pt_t, ldpt_t, pt, ldpt );
         }
         if( ncc != 0 ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, ncc, c_t, ldc_t, c, ldc );
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, ncc, c_t, ldc_t, c, ldc );
         }
         /* Release memory and exit */
         if( ncc != 0 ) {
             LAPACKE_free( c_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'p' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'p' ) ) {
             LAPACKE_free( pt_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbbrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgbbrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbbrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgbcon.c b/LAPACKE/src/lapacke_cgbcon.c
index ffa953a79f..8f11d83422 100644
--- a/LAPACKE/src/lapacke_cgbcon.c
+++ b/LAPACKE/src/lapacke_cgbcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbcon( int matrix_layout, char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgbcon)( int matrix_layout, char norm, lapack_int n,
                            lapack_int kl, lapack_int ku,
                            const lapack_complex_float* ab, lapack_int ldab,
                            const lapack_int* ipiv, float anorm, float* rcond )
@@ -41,16 +41,16 @@ lapack_int LAPACKE_cgbcon( int matrix_layout, char norm, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgbcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cgb_nancheck( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -9;
         }
     }
@@ -68,7 +68,7 @@ lapack_int LAPACKE_cgbcon( int matrix_layout, char norm, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgbcon_work( matrix_layout, norm, n, kl, ku, ab, ldab, ipiv,
+    info = API_SUFFIX(LAPACKE_cgbcon_work)( matrix_layout, norm, n, kl, ku, ab, ldab, ipiv,
                                 anorm, rcond, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -76,7 +76,7 @@ lapack_int LAPACKE_cgbcon( int matrix_layout, char norm, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgbcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgbcon_work.c b/LAPACKE/src/lapacke_cgbcon_work.c
index d0ba5131ba..95fa19b8b8 100644
--- a/LAPACKE/src/lapacke_cgbcon_work.c
+++ b/LAPACKE/src/lapacke_cgbcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbcon_work( int matrix_layout, char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgbcon_work)( int matrix_layout, char norm, lapack_int n,
                                 lapack_int kl, lapack_int ku,
                                 const lapack_complex_float* ab, lapack_int ldab,
                                 const lapack_int* ipiv, float anorm,
@@ -53,7 +53,7 @@ lapack_int LAPACKE_cgbcon_work( int matrix_layout, char norm, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cgbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbcon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -64,7 +64,7 @@ lapack_int LAPACKE_cgbcon_work( int matrix_layout, char norm, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cgb_trans( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
                            ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgbcon( &norm, &n, &kl, &ku, ab_t, &ldab_t, ipiv, &anorm, rcond,
@@ -76,11 +76,11 @@ lapack_int LAPACKE_cgbcon_work( int matrix_layout, char norm, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgbcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgbequ.c b/LAPACKE/src/lapacke_cgbequ.c
index 293ee1719b..e690818187 100644
--- a/LAPACKE/src/lapacke_cgbequ.c
+++ b/LAPACKE/src/lapacke_cgbequ.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbequ( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgbequ)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int kl, lapack_int ku,
                            const lapack_complex_float* ab, lapack_int ldab,
                            float* r, float* c, float* rowcnd, float* colcnd,
                            float* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgbequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cgb_nancheck( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_cgbequ_work( matrix_layout, m, n, kl, ku, ab, ldab, r, c,
+    return API_SUFFIX(LAPACKE_cgbequ_work)( matrix_layout, m, n, kl, ku, ab, ldab, r, c,
                                 rowcnd, colcnd, amax );
 }
diff --git a/LAPACKE/src/lapacke_cgbequ_work.c b/LAPACKE/src/lapacke_cgbequ_work.c
index cfa1cf1d2f..84db58ec44 100644
--- a/LAPACKE/src/lapacke_cgbequ_work.c
+++ b/LAPACKE/src/lapacke_cgbequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbequ_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgbequ_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int kl, lapack_int ku,
                                 const lapack_complex_float* ab, lapack_int ldab,
                                 float* r, float* c, float* rowcnd,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_cgbequ_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cgbequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbequ_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,7 +63,7 @@ lapack_int LAPACKE_cgbequ_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cgb_trans( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgbequ( &m, &n, &kl, &ku, ab_t, &ldab_t, r, c, rowcnd, colcnd,
                        amax, &info );
@@ -74,11 +74,11 @@ lapack_int LAPACKE_cgbequ_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgbequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgbequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgbequb.c b/LAPACKE/src/lapacke_cgbequb.c
index 5b5d399004..093dd52ec7 100644
--- a/LAPACKE/src/lapacke_cgbequb.c
+++ b/LAPACKE/src/lapacke_cgbequb.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbequb( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgbequb)( int matrix_layout, lapack_int m, lapack_int n,
                             lapack_int kl, lapack_int ku,
                             const lapack_complex_float* ab, lapack_int ldab,
                             float* r, float* c, float* rowcnd, float* colcnd,
                             float* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgbequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbequb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cgb_nancheck( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_cgbequb_work( matrix_layout, m, n, kl, ku, ab, ldab, r, c,
+    return API_SUFFIX(LAPACKE_cgbequb_work)( matrix_layout, m, n, kl, ku, ab, ldab, r, c,
                                  rowcnd, colcnd, amax );
 }
diff --git a/LAPACKE/src/lapacke_cgbequb_work.c b/LAPACKE/src/lapacke_cgbequb_work.c
index 49f456c4f9..6fdcd9c5ef 100644
--- a/LAPACKE/src/lapacke_cgbequb_work.c
+++ b/LAPACKE/src/lapacke_cgbequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbequb_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgbequb_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  lapack_int kl, lapack_int ku,
                                  const lapack_complex_float* ab,
                                  lapack_int ldab, float* r, float* c,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_cgbequb_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cgbequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,7 +63,7 @@ lapack_int LAPACKE_cgbequb_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cgb_trans( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgbequb( &m, &n, &kl, &ku, ab_t, &ldab_t, r, c, rowcnd, colcnd,
                         amax, &info );
@@ -74,11 +74,11 @@ lapack_int LAPACKE_cgbequb_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgbequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgbequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgbrfs.c b/LAPACKE/src/lapacke_cgbrfs.c
index 1717cb840b..bba789acb7 100644
--- a/LAPACKE/src/lapacke_cgbrfs.c
+++ b/LAPACKE/src/lapacke_cgbrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbrfs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgbrfs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int kl, lapack_int ku, lapack_int nrhs,
                            const lapack_complex_float* ab, lapack_int ldab,
                            const lapack_complex_float* afb, lapack_int ldafb,
@@ -45,22 +45,22 @@ lapack_int LAPACKE_cgbrfs( int matrix_layout, char trans, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgbrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cgb_nancheck( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_cgb_nancheck( matrix_layout, n, n, kl, kl+ku, afb, ldafb ) ) {
+        if( API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, kl, kl+ku, afb, ldafb ) ) {
             return -9;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -14;
         }
     }
@@ -78,7 +78,7 @@ lapack_int LAPACKE_cgbrfs( int matrix_layout, char trans, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgbrfs_work( matrix_layout, trans, n, kl, ku, nrhs, ab, ldab,
+    info = API_SUFFIX(LAPACKE_cgbrfs_work)( matrix_layout, trans, n, kl, ku, nrhs, ab, ldab,
                                 afb, ldafb, ipiv, b, ldb, x, ldx, ferr, berr,
                                 work, rwork );
     /* Release memory and exit */
@@ -87,7 +87,7 @@ lapack_int LAPACKE_cgbrfs( int matrix_layout, char trans, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgbrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgbrfs_work.c b/LAPACKE/src/lapacke_cgbrfs_work.c
index 5c48a7ff5c..a61d0bf112 100644
--- a/LAPACKE/src/lapacke_cgbrfs_work.c
+++ b/LAPACKE/src/lapacke_cgbrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbrfs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgbrfs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int kl, lapack_int ku, lapack_int nrhs,
                                 const lapack_complex_float* ab, lapack_int ldab,
                                 const lapack_complex_float* afb,
@@ -62,22 +62,22 @@ lapack_int LAPACKE_cgbrfs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbrfs_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_cgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_cgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -108,11 +108,11 @@ lapack_int LAPACKE_cgbrfs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_cgb_trans( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
-        LAPACKE_cgb_trans( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
                            ldafb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgbrfs( &trans, &n, &kl, &ku, &nrhs, ab_t, &ldab_t, afb_t,
                        &ldafb_t, ipiv, b_t, &ldb_t, x_t, &ldx_t, ferr, berr,
@@ -121,7 +121,7 @@ lapack_int LAPACKE_cgbrfs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -132,11 +132,11 @@ lapack_int LAPACKE_cgbrfs_work( int matrix_layout, char trans, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgbrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgbrfsx.c b/LAPACKE/src/lapacke_cgbrfsx.c
index 79b202f395..02869f9809 100644
--- a/LAPACKE/src/lapacke_cgbrfsx.c
+++ b/LAPACKE/src/lapacke_cgbrfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbrfsx( int matrix_layout, char trans, char equed,
+lapack_int API_SUFFIX(LAPACKE_cgbrfsx)( int matrix_layout, char trans, char equed,
                             lapack_int n, lapack_int kl, lapack_int ku,
                             lapack_int nrhs, const lapack_complex_float* ab,
                             lapack_int ldab, const lapack_complex_float* afb,
@@ -48,37 +48,37 @@ lapack_int LAPACKE_cgbrfsx( int matrix_layout, char trans, char equed,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgbrfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbrfsx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cgb_nancheck( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_cgb_nancheck( matrix_layout, n, n, kl, kl+ku, afb, ldafb ) ) {
+        if( API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, kl, kl+ku, afb, ldafb ) ) {
             return -10;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -15;
         }
-        if( LAPACKE_lsame( equed, 'b' ) || LAPACKE_lsame( equed, 'c' ) ) {
-            if( LAPACKE_s_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'b' ) || API_SUFFIX(LAPACKE_lsame)( equed, 'c' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, c, 1 ) ) {
                 return -14;
             }
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -25;
             }
         }
-        if( LAPACKE_lsame( equed, 'b' ) || LAPACKE_lsame( equed, 'r' ) ) {
-            if( LAPACKE_s_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'b' ) || API_SUFFIX(LAPACKE_lsame)( equed, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, r, 1 ) ) {
                 return -13;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -17;
         }
     }
@@ -96,7 +96,7 @@ lapack_int LAPACKE_cgbrfsx( int matrix_layout, char trans, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgbrfsx_work( matrix_layout, trans, equed, n, kl, ku, nrhs,
+    info = API_SUFFIX(LAPACKE_cgbrfsx_work)( matrix_layout, trans, equed, n, kl, ku, nrhs,
                                  ab, ldab, afb, ldafb, ipiv, r, c, b, ldb, x,
                                  ldx, rcond, berr, n_err_bnds, err_bnds_norm,
                                  err_bnds_comp, nparams, params, work, rwork );
@@ -106,7 +106,7 @@ lapack_int LAPACKE_cgbrfsx( int matrix_layout, char trans, char equed,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgbrfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbrfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgbrfsx_work.c b/LAPACKE/src/lapacke_cgbrfsx_work.c
index 1a9cef0500..11ad013cd9 100644
--- a/LAPACKE/src/lapacke_cgbrfsx_work.c
+++ b/LAPACKE/src/lapacke_cgbrfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbrfsx_work( int matrix_layout, char trans, char equed,
+lapack_int API_SUFFIX(LAPACKE_cgbrfsx_work)( int matrix_layout, char trans, char equed,
                                  lapack_int n, lapack_int kl, lapack_int ku,
                                  lapack_int nrhs,
                                  const lapack_complex_float* ab,
@@ -72,22 +72,22 @@ lapack_int LAPACKE_cgbrfsx_work( int matrix_layout, char trans, char equed,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbrfsx_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbrfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_cgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbrfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -18;
-            LAPACKE_xerbla( "LAPACKE_cgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbrfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -130,11 +130,11 @@ lapack_int LAPACKE_cgbrfsx_work( int matrix_layout, char trans, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_cgb_trans( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
-        LAPACKE_cgb_trans( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
                            ldafb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgbrfsx( &trans, &equed, &n, &kl, &ku, &nrhs, ab_t, &ldab_t,
                         afb_t, &ldafb_t, ipiv, r, c, b_t, &ldb_t, x_t, &ldx_t,
@@ -144,10 +144,10 @@ lapack_int LAPACKE_cgbrfsx_work( int matrix_layout, char trans, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -163,11 +163,11 @@ lapack_int LAPACKE_cgbrfsx_work( int matrix_layout, char trans, char equed,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbrfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgbrfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbrfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgbsv.c b/LAPACKE/src/lapacke_cgbsv.c
index 226d71e0f6..0a2e8b5997 100644
--- a/LAPACKE/src/lapacke_cgbsv.c
+++ b/LAPACKE/src/lapacke_cgbsv.c
@@ -32,27 +32,27 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbsv( int matrix_layout, lapack_int n, lapack_int kl,
+lapack_int API_SUFFIX(LAPACKE_cgbsv)( int matrix_layout, lapack_int n, lapack_int kl,
                           lapack_int ku, lapack_int nrhs,
                           lapack_complex_float* ab, lapack_int ldab,
                           lapack_int* ipiv, lapack_complex_float* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgbsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cgb_nancheck( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_cgbsv_work( matrix_layout, n, kl, ku, nrhs, ab, ldab, ipiv, b,
+    return API_SUFFIX(LAPACKE_cgbsv_work)( matrix_layout, n, kl, ku, nrhs, ab, ldab, ipiv, b,
                                ldb );
 }
diff --git a/LAPACKE/src/lapacke_cgbsv_work.c b/LAPACKE/src/lapacke_cgbsv_work.c
index e569c10898..4fc7849502 100644
--- a/LAPACKE/src/lapacke_cgbsv_work.c
+++ b/LAPACKE/src/lapacke_cgbsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbsv_work( int matrix_layout, lapack_int n, lapack_int kl,
+lapack_int API_SUFFIX(LAPACKE_cgbsv_work)( int matrix_layout, lapack_int n, lapack_int kl,
                                lapack_int ku, lapack_int nrhs,
                                lapack_complex_float* ab, lapack_int ldab,
                                lapack_int* ipiv, lapack_complex_float* b,
@@ -53,12 +53,12 @@ lapack_int LAPACKE_cgbsv_work( int matrix_layout, lapack_int n, lapack_int kl,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cgbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cgbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -76,9 +76,9 @@ lapack_int LAPACKE_cgbsv_work( int matrix_layout, lapack_int n, lapack_int kl,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cgb_trans( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
                            ldab_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgbsv( &n, &kl, &ku, &nrhs, ab_t, &ldab_t, ipiv, b_t, &ldb_t,
                       &info );
@@ -86,20 +86,20 @@ lapack_int LAPACKE_cgbsv_work( int matrix_layout, lapack_int n, lapack_int kl,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cgb_trans( LAPACK_COL_MAJOR, n, n, kl, kl+ku, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_cgb_trans)( LAPACK_COL_MAJOR, n, n, kl, kl+ku, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgbsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgbsvx.c b/LAPACKE/src/lapacke_cgbsvx.c
index 0e86868030..357887dfa6 100644
--- a/LAPACKE/src/lapacke_cgbsvx.c
+++ b/LAPACKE/src/lapacke_cgbsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbsvx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_cgbsvx)( int matrix_layout, char fact, char trans,
                            lapack_int n, lapack_int kl, lapack_int ku,
                            lapack_int nrhs, lapack_complex_float* ab,
                            lapack_int ldab, lapack_complex_float* afb,
@@ -46,33 +46,33 @@ lapack_int LAPACKE_cgbsvx( int matrix_layout, char fact, char trans,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgbsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cgb_nancheck( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_cgb_nancheck( matrix_layout, n, n, kl, kl+ku, afb,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, kl, kl+ku, afb,
                 ldafb ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -16;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) ) ) {
-            if( LAPACKE_s_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, c, 1 ) ) {
                 return -15;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'r' ) ) ) {
-            if( LAPACKE_s_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, r, 1 ) ) {
                 return -14;
             }
         }
@@ -91,7 +91,7 @@ lapack_int LAPACKE_cgbsvx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgbsvx_work( matrix_layout, fact, trans, n, kl, ku, nrhs, ab,
+    info = API_SUFFIX(LAPACKE_cgbsvx_work)( matrix_layout, fact, trans, n, kl, ku, nrhs, ab,
                                 ldab, afb, ldafb, ipiv, equed, r, c, b, ldb, x,
                                 ldx, rcond, ferr, berr, work, rwork );
     /* Backup significant data from working array(s) */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_cgbsvx( int matrix_layout, char fact, char trans,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgbsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgbsvx_work.c b/LAPACKE/src/lapacke_cgbsvx_work.c
index 5ff0ee9955..de4766e32d 100644
--- a/LAPACKE/src/lapacke_cgbsvx_work.c
+++ b/LAPACKE/src/lapacke_cgbsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbsvx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_cgbsvx_work)( int matrix_layout, char fact, char trans,
                                 lapack_int n, lapack_int kl, lapack_int ku,
                                 lapack_int nrhs, lapack_complex_float* ab,
                                 lapack_int ldab, lapack_complex_float* afb,
@@ -64,22 +64,22 @@ lapack_int LAPACKE_cgbsvx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsvx_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_cgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_cgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -110,12 +110,12 @@ lapack_int LAPACKE_cgbsvx_work( int matrix_layout, char fact, char trans,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_cgb_trans( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_cgb_trans( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
                                ldafb_t );
         }
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgbsvx( &fact, &trans, &n, &kl, &ku, &nrhs, ab_t, &ldab_t, afb_t,
                        &ldafb_t, ipiv, equed, r, c, b_t, &ldb_t, x_t, &ldx_t,
@@ -124,20 +124,20 @@ lapack_int LAPACKE_cgbsvx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_cgb_trans( LAPACK_COL_MAJOR, n, n, kl, ku, ab_t, ldab_t, ab,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_cgb_trans)( LAPACK_COL_MAJOR, n, n, kl, ku, ab_t, ldab_t, ab,
                                ldab );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_cgb_trans( LAPACK_COL_MAJOR, n, n, kl, kl+ku, afb_t,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_cgb_trans)( LAPACK_COL_MAJOR, n, n, kl, kl+ku, afb_t,
                                ldafb_t, afb, ldafb );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -148,11 +148,11 @@ lapack_int LAPACKE_cgbsvx_work( int matrix_layout, char fact, char trans,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgbsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgbsvxx.c b/LAPACKE/src/lapacke_cgbsvxx.c
index 22a4dd8eda..2dcd9fe2b8 100644
--- a/LAPACKE/src/lapacke_cgbsvxx.c
+++ b/LAPACKE/src/lapacke_cgbsvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbsvxx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_cgbsvxx)( int matrix_layout, char fact, char trans,
                             lapack_int n, lapack_int kl, lapack_int ku,
                             lapack_int nrhs, lapack_complex_float* ab,
                             lapack_int ldab, lapack_complex_float* afb,
@@ -48,38 +48,38 @@ lapack_int LAPACKE_cgbsvxx( int matrix_layout, char fact, char trans,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgbsvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsvxx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cgb_nancheck( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_cgb_nancheck( matrix_layout, n, n, kl, kl+ku, afb,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, kl, kl+ku, afb,
                 ldafb ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -16;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) ) ) {
-            if( LAPACKE_s_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, c, 1 ) ) {
                 return -15;
             }
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -27;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'r' ) ) ) {
-            if( LAPACKE_s_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, r, 1 ) ) {
                 return -14;
             }
         }
@@ -98,7 +98,7 @@ lapack_int LAPACKE_cgbsvxx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgbsvxx_work( matrix_layout, fact, trans, n, kl, ku, nrhs, ab,
+    info = API_SUFFIX(LAPACKE_cgbsvxx_work)( matrix_layout, fact, trans, n, kl, ku, nrhs, ab,
                                  ldab, afb, ldafb, ipiv, equed, r, c, b, ldb, x,
                                  ldx, rcond, rpvgrw, berr, n_err_bnds,
                                  err_bnds_norm, err_bnds_comp, nparams, params,
@@ -109,7 +109,7 @@ lapack_int LAPACKE_cgbsvxx( int matrix_layout, char fact, char trans,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgbsvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgbsvxx_work.c b/LAPACKE/src/lapacke_cgbsvxx_work.c
index 84c4891987..fc1f289a69 100644
--- a/LAPACKE/src/lapacke_cgbsvxx_work.c
+++ b/LAPACKE/src/lapacke_cgbsvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbsvxx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_cgbsvxx_work)( int matrix_layout, char fact, char trans,
                                  lapack_int n, lapack_int kl, lapack_int ku,
                                  lapack_int nrhs, lapack_complex_float* ab,
                                  lapack_int ldab, lapack_complex_float* afb,
@@ -70,22 +70,22 @@ lapack_int LAPACKE_cgbsvxx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsvxx_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_cgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_cgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -128,12 +128,12 @@ lapack_int LAPACKE_cgbsvxx_work( int matrix_layout, char fact, char trans,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_cgb_trans( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_cgb_trans( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
                                ldafb_t );
         }
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgbsvxx( &fact, &trans, &n, &kl, &ku, &nrhs, ab_t, &ldab_t,
                         afb_t, &ldafb_t, ipiv, equed, r, c, b_t, &ldb_t, x_t,
@@ -144,23 +144,23 @@ lapack_int LAPACKE_cgbsvxx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_cgb_trans( LAPACK_COL_MAJOR, n, n, kl, ku, ab_t, ldab_t, ab,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_cgb_trans)( LAPACK_COL_MAJOR, n, n, kl, ku, ab_t, ldab_t, ab,
                                ldab );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_cgb_trans( LAPACK_COL_MAJOR, n, n, kl, kl+ku, afb_t,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_cgb_trans)( LAPACK_COL_MAJOR, n, n, kl, kl+ku, afb_t,
                                ldafb_t, afb, ldafb );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -176,11 +176,11 @@ lapack_int LAPACKE_cgbsvxx_work( int matrix_layout, char fact, char trans,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgbsvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbsvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgbtrf.c b/LAPACKE/src/lapacke_cgbtrf.c
index 137ff8edd5..0d8c23a202 100644
--- a/LAPACKE/src/lapacke_cgbtrf.c
+++ b/LAPACKE/src/lapacke_cgbtrf.c
@@ -32,22 +32,22 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbtrf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgbtrf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int kl, lapack_int ku,
                            lapack_complex_float* ab, lapack_int ldab,
                            lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgbtrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbtrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cgb_nancheck( matrix_layout, m, n, kl, kl+ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, m, n, kl, kl+ku, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_cgbtrf_work( matrix_layout, m, n, kl, ku, ab, ldab, ipiv );
+    return API_SUFFIX(LAPACKE_cgbtrf_work)( matrix_layout, m, n, kl, ku, ab, ldab, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_cgbtrf_work.c b/LAPACKE/src/lapacke_cgbtrf_work.c
index f8f350c6f4..28f5c7e028 100644
--- a/LAPACKE/src/lapacke_cgbtrf_work.c
+++ b/LAPACKE/src/lapacke_cgbtrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbtrf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgbtrf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int kl, lapack_int ku,
                                 lapack_complex_float* ab, lapack_int ldab,
                                 lapack_int* ipiv )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cgbtrf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cgbtrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbtrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_cgbtrf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cgb_trans( matrix_layout, m, n, kl, kl+ku, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, m, n, kl, kl+ku, ab, ldab, ab_t,
                            ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgbtrf( &m, &n, &kl, &ku, ab_t, &ldab_t, ipiv, &info );
@@ -69,17 +69,17 @@ lapack_int LAPACKE_cgbtrf_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cgb_trans( LAPACK_COL_MAJOR, m, n, kl, kl+ku, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_cgb_trans)( LAPACK_COL_MAJOR, m, n, kl, kl+ku, ab_t, ldab_t, ab,
                            ldab );
         /* Release memory and exit */
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgbtrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbtrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgbtrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbtrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgbtrs.c b/LAPACKE/src/lapacke_cgbtrs.c
index 724c7db5c6..6dee90f25d 100644
--- a/LAPACKE/src/lapacke_cgbtrs.c
+++ b/LAPACKE/src/lapacke_cgbtrs.c
@@ -32,27 +32,27 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbtrs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgbtrs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int kl, lapack_int ku, lapack_int nrhs,
                            const lapack_complex_float* ab, lapack_int ldab,
                            const lapack_int* ipiv, lapack_complex_float* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgbtrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbtrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cgb_nancheck( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
     }
 #endif
-    return LAPACKE_cgbtrs_work( matrix_layout, trans, n, kl, ku, nrhs, ab, ldab,
+    return API_SUFFIX(LAPACKE_cgbtrs_work)( matrix_layout, trans, n, kl, ku, nrhs, ab, ldab,
                                 ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_cgbtrs_work.c b/LAPACKE/src/lapacke_cgbtrs_work.c
index ceff5fe82d..28c6832211 100644
--- a/LAPACKE/src/lapacke_cgbtrs_work.c
+++ b/LAPACKE/src/lapacke_cgbtrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgbtrs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgbtrs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int kl, lapack_int ku, lapack_int nrhs,
                                 const lapack_complex_float* ab, lapack_int ldab,
                                 const lapack_int* ipiv, lapack_complex_float* b,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_cgbtrs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbtrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cgbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbtrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -77,9 +77,9 @@ lapack_int LAPACKE_cgbtrs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cgb_trans( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
                            ldab_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgbtrs( &trans, &n, &kl, &ku, &nrhs, ab_t, &ldab_t, ipiv, b_t,
                        &ldb_t, &info );
@@ -87,18 +87,18 @@ lapack_int LAPACKE_cgbtrs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbtrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgbtrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgbtrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgebak.c b/LAPACKE/src/lapacke_cgebak.c
index 33d18b12f3..6b10e02ad7 100644
--- a/LAPACKE/src/lapacke_cgebak.c
+++ b/LAPACKE/src/lapacke_cgebak.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgebak( int matrix_layout, char job, char side, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgebak)( int matrix_layout, char job, char side, lapack_int n,
                            lapack_int ilo, lapack_int ihi, const float* scale,
                            lapack_int m, lapack_complex_float* v,
                            lapack_int ldv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgebak", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgebak", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, scale, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, scale, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, m, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, m, v, ldv ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_cgebak_work( matrix_layout, job, side, n, ilo, ihi, scale, m,
+    return API_SUFFIX(LAPACKE_cgebak_work)( matrix_layout, job, side, n, ilo, ihi, scale, m,
                                 v, ldv );
 }
diff --git a/LAPACKE/src/lapacke_cgebak_work.c b/LAPACKE/src/lapacke_cgebak_work.c
index 521b7c06a0..8f9d8e556a 100644
--- a/LAPACKE/src/lapacke_cgebak_work.c
+++ b/LAPACKE/src/lapacke_cgebak_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgebak_work( int matrix_layout, char job, char side,
+lapack_int API_SUFFIX(LAPACKE_cgebak_work)( int matrix_layout, char job, char side,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 const float* scale, lapack_int m,
                                 lapack_complex_float* v, lapack_int ldv )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cgebak_work( int matrix_layout, char job, char side,
         /* Check leading dimension(s) */
         if( ldv < m ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cgebak_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgebak_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_cgebak_work( int matrix_layout, char job, char side,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, m, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, m, v, ldv, v_t, ldv_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgebak( &job, &side, &n, &ilo, &ihi, scale, &m, v_t, &ldv_t,
                        &info );
@@ -69,16 +69,16 @@ lapack_int LAPACKE_cgebak_work( int matrix_layout, char job, char side,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, m, v_t, ldv_t, v, ldv );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, m, v_t, ldv_t, v, ldv );
         /* Release memory and exit */
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgebak_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgebak_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgebak_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgebak_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgebal.c b/LAPACKE/src/lapacke_cgebal.c
index 7645e6bf84..23dbae7bd4 100644
--- a/LAPACKE/src/lapacke_cgebal.c
+++ b/LAPACKE/src/lapacke_cgebal.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgebal( int matrix_layout, char job, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgebal)( int matrix_layout, char job, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_int* ilo, lapack_int* ihi, float* scale )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgebal", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgebal", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
                 return -4;
             }
         }
     }
 #endif
-    return LAPACKE_cgebal_work( matrix_layout, job, n, a, lda, ilo, ihi, scale );
+    return API_SUFFIX(LAPACKE_cgebal_work)( matrix_layout, job, n, a, lda, ilo, ihi, scale );
 }
diff --git a/LAPACKE/src/lapacke_cgebal_work.c b/LAPACKE/src/lapacke_cgebal_work.c
index 75f5a21ad5..008bf7f8ef 100644
--- a/LAPACKE/src/lapacke_cgebal_work.c
+++ b/LAPACKE/src/lapacke_cgebal_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgebal_work( int matrix_layout, char job, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgebal_work)( int matrix_layout, char job, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_int* ilo, lapack_int* ihi, float* scale )
 {
@@ -49,12 +49,12 @@ lapack_int LAPACKE_cgebal_work( int matrix_layout, char job, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgebal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgebal_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
             a_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 lda_t * MAX(1,n) );
@@ -64,9 +64,9 @@ lapack_int LAPACKE_cgebal_work( int matrix_layout, char job, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_cgebal( &job, &n, a_t, &lda_t, ilo, ihi, scale, &info );
@@ -74,22 +74,22 @@ lapack_int LAPACKE_cgebal_work( int matrix_layout, char job, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
             LAPACKE_free( a_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgebal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgebal_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgebal_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgebal_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgebrd.c b/LAPACKE/src/lapacke_cgebrd.c
index 77fe29bdcd..92f9eac3f6 100644
--- a/LAPACKE/src/lapacke_cgebrd.c
+++ b/LAPACKE/src/lapacke_cgebrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgebrd( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgebrd)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_float* a, lapack_int lda, float* d,
                            float* e, lapack_complex_float* tauq,
                            lapack_complex_float* taup )
@@ -42,19 +42,19 @@ lapack_int LAPACKE_cgebrd( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgebrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgebrd", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgebrd_work( matrix_layout, m, n, a, lda, d, e, tauq, taup,
+    info = API_SUFFIX(LAPACKE_cgebrd_work)( matrix_layout, m, n, a, lda, d, e, tauq, taup,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -68,13 +68,13 @@ lapack_int LAPACKE_cgebrd( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgebrd_work( matrix_layout, m, n, a, lda, d, e, tauq, taup,
+    info = API_SUFFIX(LAPACKE_cgebrd_work)( matrix_layout, m, n, a, lda, d, e, tauq, taup,
                                 work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgebrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgebrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgebrd_work.c b/LAPACKE/src/lapacke_cgebrd_work.c
index 1bb45d3e5a..44e8eea1f3 100644
--- a/LAPACKE/src/lapacke_cgebrd_work.c
+++ b/LAPACKE/src/lapacke_cgebrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgebrd_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgebrd_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 float* d, float* e, lapack_complex_float* tauq,
                                 lapack_complex_float* taup,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_cgebrd_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgebrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgebrd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -68,7 +68,7 @@ lapack_int LAPACKE_cgebrd_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgebrd( &m, &n, a_t, &lda_t, d, e, tauq, taup, work, &lwork,
                        &info );
@@ -76,16 +76,16 @@ lapack_int LAPACKE_cgebrd_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgebrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgebrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgebrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgebrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgecon.c b/LAPACKE/src/lapacke_cgecon.c
index c1360cc344..464eff3bc4 100644
--- a/LAPACKE/src/lapacke_cgecon.c
+++ b/LAPACKE/src/lapacke_cgecon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgecon( int matrix_layout, char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgecon)( int matrix_layout, char norm, lapack_int n,
                            const lapack_complex_float* a, lapack_int lda,
                            float anorm, float* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_cgecon( int matrix_layout, char norm, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgecon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgecon", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -6;
         }
     }
@@ -67,7 +67,7 @@ lapack_int LAPACKE_cgecon( int matrix_layout, char norm, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgecon_work( matrix_layout, norm, n, a, lda, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_cgecon_work)( matrix_layout, norm, n, a, lda, anorm, rcond,
                                 work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -75,7 +75,7 @@ lapack_int LAPACKE_cgecon( int matrix_layout, char norm, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgecon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgecon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgecon_work.c b/LAPACKE/src/lapacke_cgecon_work.c
index fb1806f74c..df8dc505e2 100644
--- a/LAPACKE/src/lapacke_cgecon_work.c
+++ b/LAPACKE/src/lapacke_cgecon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgecon_work( int matrix_layout, char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgecon_work)( int matrix_layout, char norm, lapack_int n,
                                 const lapack_complex_float* a, lapack_int lda,
                                 float anorm, float* rcond,
                                 lapack_complex_float* work, float* rwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cgecon_work( int matrix_layout, char norm, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgecon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgecon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_cgecon_work( int matrix_layout, char norm, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgecon( &norm, &n, a_t, &lda_t, &anorm, rcond, work, rwork,
                        &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_cgecon_work( int matrix_layout, char norm, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgecon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgecon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgecon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgecon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgedmd.c b/LAPACKE/src/lapacke_cgedmd.c
new file mode 100644
index 0000000000..76abdf8eb3
--- /dev/null
+++ b/LAPACKE/src/lapacke_cgedmd.c
@@ -0,0 +1,127 @@
+/*****************************************************************************
+  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 cgedmd
+* Author: Intel Corporation
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_cgedmd)( int matrix_layout, char jobs, char jobz, char jobr,
+			   char jobf, lapack_int whtsvd, lapack_int m,
+		 	   lapack_int n, lapack_complex_float* x,
+			   lapack_int ldx, lapack_complex_float* y,
+			   lapack_int ldy, lapack_int nrnk, float* tol,
+			   lapack_int k, lapack_complex_float* eigs,
+               lapack_complex_float* z, lapack_int ldz,
+               float* res, lapack_complex_float* b,
+               lapack_int ldb, lapack_complex_float* w,
+               lapack_int ldw, lapack_complex_float* s, lapack_int lds)
+{
+    lapack_int info = 0;
+    lapack_int lwork = -1;
+    lapack_int liwork = -1;
+    lapack_int lzwork = -1;
+    lapack_complex_float* zwork = NULL;
+    float* work = NULL;
+    lapack_int* iwork = NULL;
+    lapack_complex_float zwork_query;
+    float work_query;
+    lapack_int iwork_query;
+    if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmd", -1 );
+        return -1;
+    }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+    if( LAPACKE_get_nancheck() ) {
+        /* Optionally check input matrices for NaNs */
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, x, ldx ) ) {
+            return -8;
+        }
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, y, ldy ) ) {
+            return -10;
+        }
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, z, ldz ) ) {
+            return -15;
+        }
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
+            return -18;
+        }
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, w, ldw ) ) {
+            return -20;
+        }
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, s, lds ) ) {
+            return -22;
+        }
+    }
+#endif
+    /* Query optimal working array(s) size */
+    info = API_SUFFIX(LAPACKE_cgedmd_work)( matrix_layout, jobs, jobz, jobr, jobf, whtsvd,
+				m, n, x, ldx, y, ldy, nrnk, tol, k, eigs, z, ldz,
+				res, b, ldb, w, ldw, s, lds, &zwork_query, 
+				lzwork, &work_query, lwork, &iwork_query, liwork );
+
+    if( info != 0 ) {
+        goto exit_level_0;
+    }
+    lzwork  = LAPACK_C2INT( zwork_query );
+    lwork  = LAPACK_C2INT( work_query );
+    liwork = iwork_query;
+    /* Allocate memory for work arrays */
+    zwork  = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * lzwork );
+    if( zwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
+    }
+    work  = (float*)LAPACKE_malloc( sizeof(float) * lwork );
+    if( work == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_1;
+    }
+    iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
+    if( iwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_2;
+    }
+    /* Call middle-level interface */
+    info = API_SUFFIX(LAPACKE_cgedmd_work)( matrix_layout, jobs, jobz, jobr, jobf, whtsvd,
+				m, n, x, ldx, y, ldy, nrnk, tol, k, eigs, z, ldz,
+				res, b, ldb, w, ldw, s, lds, zwork, lzwork,
+				work, lwork, iwork, liwork );
+    /* Release memory and exit */
+    LAPACKE_free( iwork );
+exit_level_2:
+    LAPACKE_free( work );
+exit_level_1:
+    LAPACKE_free( zwork );
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmd", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_cgedmd_work.c b/LAPACKE/src/lapacke_cgedmd_work.c
new file mode 100644
index 0000000000..13ad304d5d
--- /dev/null
+++ b/LAPACKE/src/lapacke_cgedmd_work.c
@@ -0,0 +1,184 @@
+/*****************************************************************************
+  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 cgedmd
+* Author: Intel Corporation
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_cgedmd_work)( int matrix_layout, char jobs, char jobz,
+                                char jobr, char jobf, lapack_int whtsvd, lapack_int m,
+                                lapack_int n, lapack_complex_float* x, lapack_int ldx,
+                                lapack_complex_float* y, lapack_int ldy, lapack_int nrnk,
+                                float* tol, lapack_int k, lapack_complex_float* eigs,
+                                lapack_complex_float* z, lapack_int ldz,
+                                float* res, lapack_complex_float* b,
+                                lapack_int ldb, lapack_complex_float* w,
+                                lapack_int ldw, lapack_complex_float* s, lapack_int lds,
+                                lapack_complex_float* zwork, lapack_int lzwork,
+                                float* work, lapack_int lwork,
+                                lapack_int* iwork, lapack_int liwork )
+{
+    lapack_int info = 0;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        LAPACK_cgedmd( &jobs, &jobz, &jobr, &jobf, &whtsvd, &m, &n, x, &ldx, y,
+ 	               &ldy, &nrnk, tol, &k, eigs, z, &ldz, res, b, &ldb, w, &ldw,
+		       s, &lds, zwork, &lzwork, work, &lwork, iwork, &liwork,
+		       &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        lapack_int ldx_t = MAX(1,m);
+        lapack_int ldy_t = MAX(1,m);
+        lapack_int ldz_t = MAX(1,m);
+        lapack_int ldb_t = MAX(1,m);
+        lapack_int ldw_t = MAX(1,m);
+        lapack_int lds_t = MAX(1,m);
+        lapack_complex_float* x_t = NULL;
+        lapack_complex_float* y_t = NULL;
+        lapack_complex_float* z_t = NULL;
+        lapack_complex_float* b_t = NULL;
+        lapack_complex_float* w_t = NULL;
+        lapack_complex_float* s_t = NULL;
+        /* Check leading dimension(s) */
+        if( ldx < n ) {
+            info = -9;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmd_work", info );
+            return info;
+        }
+        if( ldy < n ) {
+            info = -11;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmd_work", info );
+            return info;
+        }
+        if( ldz < n ) {
+            info = -16;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmd_work", info );
+            return info;
+        }
+        if( ldb < n ) {
+            info = -19;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmd_work", info );
+            return info;
+        }
+        if( ldw < n ) {
+            info = -21;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmd_work", info );
+            return info;
+        }
+        if( lds < n ) {
+            info = -23;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmd_work", info );
+            return info;
+        }
+        /* Query optimal working array(s) size if requested */
+        if( lwork == -1 ) {
+            LAPACK_cgedmd( &jobs, &jobz, &jobr, &jobf, &whtsvd, &m, &n, x,
+			   &ldx, y, &ldy, &nrnk, tol, &k, eigs, z, &ldz, res, b,
+			   &ldb, w, &ldw, s, &lds, zwork, &lzwork, 
+			   work, &lwork, iwork, &liwork, &info );
+            return (info < 0) ? (info - 1) : info;
+        }
+        /* Allocate memory for temporary array(s) */
+        x_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * ldx_t * MAX(1,n) );
+        if( x_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+        y_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * ldy_t * MAX(1,n) );
+        if( y_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_1;
+        }
+        z_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * ldz_t * MAX(1,n) );
+        if( z_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_2;
+        }
+        b_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * ldb_t * MAX(1,n) );
+        if( b_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_3;
+        }
+        w_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * ldw_t * MAX(1,n) );
+        if( w_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_4;
+        }
+        s_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * lds_t * MAX(1,n) );
+        if( s_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_5;
+        }
+        /* Transpose input matrices */
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, y, ldy, y_t, ldy_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, z, ldz, z_t, ldz_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, w, ldw, w_t, ldw_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, s, lds, s_t, lds_t );
+        /* Call LAPACK function and adjust info */
+        LAPACK_cgedmd( &jobs, &jobz, &jobr, &jobf, &whtsvd, &m, &n, x_t,
+		       &ldx_t, y_t, &ldy_t, &nrnk, tol, &k, eigs, z_t, &ldz_t,
+		       res, b_t, &ldb_t, w_t, &ldw_t, s_t, &lds_t, zwork,
+		       &lzwork, work, &lwork, iwork, &liwork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+        /* Transpose output matrices */
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, y_t, ldy_t, y, ldy );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, w_t, ldw_t, w, ldw );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, s_t, lds_t, s, lds );
+        /* Release memory and exit */
+        LAPACKE_free( s_t );
+exit_level_5:
+        LAPACKE_free( w_t );
+exit_level_4:
+        LAPACKE_free( b_t );
+exit_level_3:
+        LAPACKE_free( z_t );
+exit_level_2:
+        LAPACKE_free( y_t );
+exit_level_1:
+        LAPACKE_free( x_t );
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmd_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmd_work", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_cgedmdq.c b/LAPACKE/src/lapacke_cgedmdq.c
new file mode 100644
index 0000000000..37e1522023
--- /dev/null
+++ b/LAPACKE/src/lapacke_cgedmdq.c
@@ -0,0 +1,133 @@
+/*****************************************************************************
+  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 cgedmdq
+* Author: Intel Corporation
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_cgedmdq)( int matrix_layout, char jobs, char jobz, char jobr,
+                            char jobq, char jobt, char jobf, lapack_int whtsvd,
+                            lapack_int m, lapack_int n, lapack_complex_float* f,
+                            lapack_int ldf, lapack_complex_float* x,
+                            lapack_int ldx, lapack_complex_float* y,
+                            lapack_int ldy, lapack_int nrnk, float* tol,
+                            lapack_int k, lapack_complex_float* eigs,
+                            lapack_complex_float* z, lapack_int ldz,
+                            float* res, lapack_complex_float* b,
+                            lapack_int ldb, lapack_complex_float* v,
+                            lapack_int ldv, lapack_complex_float* s, lapack_int lds)
+{
+    lapack_int info = 0;
+    lapack_int lwork = -1;
+    lapack_int liwork = -1;
+    lapack_int lzwork = -1;
+    lapack_complex_float* zwork = NULL;
+    float* work = NULL;
+    lapack_int* iwork = NULL;
+    lapack_complex_float zwork_query;
+    float work_query;
+    lapack_int iwork_query;
+    if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmdq", -1 );
+        return -1;
+    }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+    if( LAPACKE_get_nancheck() ) {
+        /* Optionally check input matrices for NaNs */
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, f, ldf ) ) {
+            return -11;
+        }
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, x, ldx ) ) {
+            return -13;
+        }
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, y, ldy ) ) {
+            return -15;
+        }
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, z, ldz ) ) {
+            return -22;
+        }
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
+            return -25;
+        }
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, v, ldv ) ) {
+            return -27;
+        }
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, s, lds ) ) {
+            return -29;
+        }
+    }
+#endif
+    /* Query optimal working array(s) size */
+    info = API_SUFFIX(LAPACKE_cgedmdq_work)( matrix_layout, jobs, jobz, jobr, jobq, jobt,
+                                 jobf, whtsvd, m, n, f, ldf, x, ldx, y, ldy,
+                                 nrnk, tol, k, eigs, z, ldz, res,
+                                 b, ldb, v, ldv, s, lds, &zwork_query, lzwork,
+				 &work_query, lwork, &iwork_query, liwork );
+
+    if( info != 0 ) {
+        goto exit_level_0;
+    }
+    lzwork  = LAPACK_C2INT( zwork_query );
+    lwork  = LAPACK_C2INT( work_query );
+    liwork = iwork_query;
+    /* Allocate memory for work arrays */
+    zwork  = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * lzwork );
+    if( zwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
+    }
+    work  = (float*)LAPACKE_malloc( sizeof(lapack_complex_float) * lwork );
+    if( work == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_1;
+    }
+    iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
+    if( iwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_2;
+    }
+    /* Call middle-level interface */
+    info = API_SUFFIX(LAPACKE_cgedmdq_work)( matrix_layout, jobs, jobz, jobr, jobq, jobt,
+                                 jobf, whtsvd, m, n, f, ldf, x, ldx, y, ldy,
+                                 nrnk, tol, k, eigs, z, ldz, res,
+                                 b, ldb, v, ldv, s, lds, zwork, lzwork,
+				 work, lwork, iwork, liwork );
+    /* Release memory and exit */
+    LAPACKE_free( iwork );
+exit_level_2:
+    LAPACKE_free( work );
+exit_level_1:
+    LAPACKE_free( zwork );
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmdq", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_cgedmdq_work.c b/LAPACKE/src/lapacke_cgedmdq_work.c
new file mode 100644
index 0000000000..8eab4f27a1
--- /dev/null
+++ b/LAPACKE/src/lapacke_cgedmdq_work.c
@@ -0,0 +1,205 @@
+/*****************************************************************************
+  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 cgedmdq
+* Author: Intel Corporation
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_cgedmdq_work)( int matrix_layout, char jobs, char jobz,
+                                 char jobr, char jobq, char jobt, char jobf,
+                                 lapack_int whtsvd, lapack_int m, lapack_int n,
+                                 lapack_complex_float* f, lapack_int ldf,
+                                 lapack_complex_float* x, lapack_int ldx,
+                                 lapack_complex_float* y, lapack_int ldy,
+                                 lapack_int nrnk, float* tol, lapack_int k,
+                                 lapack_complex_float* eigs,
+                                 lapack_complex_float* z,
+                                 lapack_int ldz, float* res,
+                                 lapack_complex_float* b,
+                                 lapack_int ldb, lapack_complex_float* v,
+                                 lapack_int ldv, lapack_complex_float* s,
+                                 lapack_int lds, lapack_complex_float *zwork,
+				 lapack_int lzwork, float* work,
+                                 lapack_int lwork, lapack_int* iwork,
+                                 lapack_int liwork )
+{
+    lapack_int info = 0;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        LAPACK_cgedmdq( &jobs, &jobz, &jobr, &jobq, &jobt, &jobf, &whtsvd, &m,
+                        &n, f, &ldf, x, &ldx, y, &ldy, &nrnk, tol, &k, eigs,
+                        z, &ldz, res, b, &ldb, v, &ldv, s, &lds,
+                        zwork, &lzwork, work, &lwork, iwork, &liwork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        lapack_int ldf_t = MAX(1,m);
+        lapack_int ldx_t = MAX(1,m);
+        lapack_int ldy_t = MAX(1,m);
+        lapack_int ldz_t = MAX(1,m);
+        lapack_int ldb_t = MAX(1,m);
+        lapack_int ldv_t = MAX(1,m);
+        lapack_int lds_t = MAX(1,m);
+        lapack_complex_float* f_t = NULL;
+        lapack_complex_float* x_t = NULL;
+        lapack_complex_float* y_t = NULL;
+        lapack_complex_float* z_t = NULL;
+        lapack_complex_float* b_t = NULL;
+        lapack_complex_float* v_t = NULL;
+        lapack_complex_float* s_t = NULL;
+        /* Check leading dimension(s) */
+        if( ldf < n ) {
+            info = -12;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmdq_work", info );
+            return info;
+        }
+        if( ldx < n ) {
+            info = -14;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmdq_work", info );
+            return info;
+        }
+        if( ldy < n ) {
+            info = -16;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmdq_work", info );
+            return info;
+        }
+        if( ldz < n ) {
+            info = -23;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmdq_work", info );
+            return info;
+        }
+        if( ldb < n ) {
+            info = -26;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmdq_work", info );
+            return info;
+        }
+        if( ldv < n ) {
+            info = -28;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmdq_work", info );
+            return info;
+        }
+        if( lds < n ) {
+            info = -30;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmdq_work", info );
+            return info;
+        }
+        /* Query optimal working array(s) size if requested */
+        if( lzwork == -1 || lwork == -1 || liwork == -1 ) {
+            LAPACK_cgedmdq( &jobs, &jobz, &jobr, &jobq, &jobt, &jobf, &whtsvd, &m,
+                            &n, f, &ldf, x, &ldx, y, &ldy, &nrnk, tol, &k, eigs,
+                            z, &ldz, res, b, &ldb, v, &ldv, s, &lds,
+                            zwork, &lzwork, work, &lwork, iwork, &liwork, &info );
+            return (info < 0) ? (info - 1) : info;
+        }
+        /* Allocate memory for temporary array(s) */
+        f_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * ldf_t * MAX(1,n) );
+        if( f_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+        x_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * ldx_t * MAX(1,n) );
+        if( x_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_1;
+        }
+        y_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * ldy_t * MAX(1,n) );
+        if( y_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_2;
+        }
+        z_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * ldz_t * MAX(1,n) );
+        if( z_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_3;
+        }
+        b_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * ldb_t * MAX(1,n) );
+        if( b_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_4;
+        }
+        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_5;
+        }
+        s_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * lds_t * MAX(1,n) );
+        if( s_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_6;
+        }
+        /* Transpose input matrices */
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, f, ldf, f_t, ldf_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, y, ldy, y_t, ldy_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, z, ldz, z_t, ldz_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, s, lds, s_t, lds_t );
+        /* Call LAPACK function and adjust info */
+        LAPACK_cgedmdq( &jobs, &jobz, &jobr, &jobq, &jobt, &jobf, &whtsvd, &m,
+                        &n, f, &ldf, x, &ldx, y, &ldy, &nrnk, tol, &k, eigs,
+                        z, &ldz, res, b, &ldb, v, &ldv, s, &lds,
+                        zwork, &lzwork, work, &lwork, iwork, &liwork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+        /* Transpose output matrices */
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, f_t, ldf_t, f, ldf );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, y_t, ldy_t, y, ldy );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, v_t, ldv_t, v, ldv );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, s_t, lds_t, s, lds );
+        /* Release memory and exit */
+        LAPACKE_free( s_t );
+exit_level_6:
+        LAPACKE_free( v_t );
+exit_level_5:
+        LAPACKE_free( b_t );
+exit_level_4:
+        LAPACKE_free( z_t );
+exit_level_3:
+        LAPACKE_free( y_t );
+exit_level_2:
+        LAPACKE_free( x_t );
+exit_level_1:
+        LAPACKE_free( f_t );
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmdq_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmdq_work", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_cgeequ.c b/LAPACKE/src/lapacke_cgeequ.c
index fd97acfb51..87a74d1dd0 100644
--- a/LAPACKE/src/lapacke_cgeequ.c
+++ b/LAPACKE/src/lapacke_cgeequ.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeequ( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeequ)( int matrix_layout, lapack_int m, lapack_int n,
                            const lapack_complex_float* a, lapack_int lda,
                            float* r, float* c, float* rowcnd, float* colcnd,
                            float* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeequ", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_cgeequ_work( matrix_layout, m, n, a, lda, r, c, rowcnd,
+    return API_SUFFIX(LAPACKE_cgeequ_work)( matrix_layout, m, n, a, lda, r, c, rowcnd,
                                 colcnd, amax );
 }
diff --git a/LAPACKE/src/lapacke_cgeequ_work.c b/LAPACKE/src/lapacke_cgeequ_work.c
index abcaec976e..647ba0e459 100644
--- a/LAPACKE/src/lapacke_cgeequ_work.c
+++ b/LAPACKE/src/lapacke_cgeequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeequ_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeequ_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 const lapack_complex_float* a, lapack_int lda,
                                 float* r, float* c, float* rowcnd,
                                 float* colcnd, float* amax )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cgeequ_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgeequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeequ_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_cgeequ_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgeequ( &m, &n, a_t, &lda_t, r, c, rowcnd, colcnd, amax, &info );
         if( info < 0 ) {
@@ -71,11 +71,11 @@ lapack_int LAPACKE_cgeequ_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgeequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgeequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeequb.c b/LAPACKE/src/lapacke_cgeequb.c
index 13b69902c5..4f05886042 100644
--- a/LAPACKE/src/lapacke_cgeequb.c
+++ b/LAPACKE/src/lapacke_cgeequb.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeequb( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeequb)( int matrix_layout, lapack_int m, lapack_int n,
                             const lapack_complex_float* a, lapack_int lda,
                             float* r, float* c, float* rowcnd, float* colcnd,
                             float* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeequb", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_cgeequb_work( matrix_layout, m, n, a, lda, r, c, rowcnd,
+    return API_SUFFIX(LAPACKE_cgeequb_work)( matrix_layout, m, n, a, lda, r, c, rowcnd,
                                  colcnd, amax );
 }
diff --git a/LAPACKE/src/lapacke_cgeequb_work.c b/LAPACKE/src/lapacke_cgeequb_work.c
index a4de1edd08..f84f923b79 100644
--- a/LAPACKE/src/lapacke_cgeequb_work.c
+++ b/LAPACKE/src/lapacke_cgeequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeequb_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeequb_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  const lapack_complex_float* a, lapack_int lda,
                                  float* r, float* c, float* rowcnd,
                                  float* colcnd, float* amax )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cgeequb_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgeequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_cgeequb_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgeequb( &m, &n, a_t, &lda_t, r, c, rowcnd, colcnd, amax,
                         &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_cgeequb_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgeequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgeequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgees.c b/LAPACKE/src/lapacke_cgees.c
index 2d04730cc5..530de1f4ef 100644
--- a/LAPACKE/src/lapacke_cgees.c
+++ b/LAPACKE/src/lapacke_cgees.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgees( int matrix_layout, char jobvs, char sort,
+lapack_int API_SUFFIX(LAPACKE_cgees)( int matrix_layout, char jobvs, char sort,
                           LAPACK_C_SELECT1 select, lapack_int n,
                           lapack_complex_float* a, lapack_int lda,
                           lapack_int* sdim, lapack_complex_float* w,
@@ -45,19 +45,19 @@ lapack_int LAPACKE_cgees( int matrix_layout, char jobvs, char sort,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgees", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgees", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -71,7 +71,7 @@ lapack_int LAPACKE_cgees( int matrix_layout, char jobvs, char sort,
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgees_work( matrix_layout, jobvs, sort, select, n, a, lda,
+    info = API_SUFFIX(LAPACKE_cgees_work)( matrix_layout, jobvs, sort, select, n, a, lda,
                                sdim, w, vs, ldvs, &work_query, lwork, rwork,
                                bwork );
     if( info != 0 ) {
@@ -86,19 +86,19 @@ lapack_int LAPACKE_cgees( int matrix_layout, char jobvs, char sort,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgees_work( matrix_layout, jobvs, sort, select, n, a, lda,
+    info = API_SUFFIX(LAPACKE_cgees_work)( matrix_layout, jobvs, sort, select, n, a, lda,
                                sdim, w, vs, ldvs, work, lwork, rwork, bwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_2:
     LAPACKE_free( rwork );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgees", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgees", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgees_work.c b/LAPACKE/src/lapacke_cgees_work.c
index 0416d70fcd..43cae37fbd 100644
--- a/LAPACKE/src/lapacke_cgees_work.c
+++ b/LAPACKE/src/lapacke_cgees_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgees_work( int matrix_layout, char jobvs, char sort,
+lapack_int API_SUFFIX(LAPACKE_cgees_work)( int matrix_layout, char jobvs, char sort,
                                LAPACK_C_SELECT1 select, lapack_int n,
                                lapack_complex_float* a, lapack_int lda,
                                lapack_int* sdim, lapack_complex_float* w,
@@ -56,12 +56,12 @@ lapack_int LAPACKE_cgees_work( int matrix_layout, char jobvs, char sort,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cgees_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgees_work", info );
             return info;
         }
         if( ldvs < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cgees_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgees_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -77,7 +77,7 @@ lapack_int LAPACKE_cgees_work( int matrix_layout, char jobvs, char sort,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
             vs_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvs_t * MAX(1,n) );
@@ -87,7 +87,7 @@ lapack_int LAPACKE_cgees_work( int matrix_layout, char jobvs, char sort,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgees( &jobvs, &sort, select, &n, a_t, &lda_t, sdim, w, vs_t,
                       &ldvs_t, work, &lwork, rwork, bwork, &info );
@@ -95,23 +95,23 @@ lapack_int LAPACKE_cgees_work( int matrix_layout, char jobvs, char sort,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, vs_t, ldvs_t, vs, ldvs );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, vs_t, ldvs_t, vs, ldvs );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
             LAPACKE_free( vs_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgees_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgees_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgees_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgees_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeesx.c b/LAPACKE/src/lapacke_cgeesx.c
index d172f8bf58..e15d6535ba 100644
--- a/LAPACKE/src/lapacke_cgeesx.c
+++ b/LAPACKE/src/lapacke_cgeesx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeesx( int matrix_layout, char jobvs, char sort,
+lapack_int API_SUFFIX(LAPACKE_cgeesx)( int matrix_layout, char jobvs, char sort,
                            LAPACK_C_SELECT1 select, char sense, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_int* sdim, lapack_complex_float* w,
@@ -46,19 +46,19 @@ lapack_int LAPACKE_cgeesx( int matrix_layout, char jobvs, char sort,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeesx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeesx", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -72,7 +72,7 @@ lapack_int LAPACKE_cgeesx( int matrix_layout, char jobvs, char sort,
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgeesx_work( matrix_layout, jobvs, sort, select, sense, n, a,
+    info = API_SUFFIX(LAPACKE_cgeesx_work)( matrix_layout, jobvs, sort, select, sense, n, a,
                                 lda, sdim, w, vs, ldvs, rconde, rcondv,
                                 &work_query, lwork, rwork, bwork );
     if( info != 0 ) {
@@ -87,7 +87,7 @@ lapack_int LAPACKE_cgeesx( int matrix_layout, char jobvs, char sort,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgeesx_work( matrix_layout, jobvs, sort, select, sense, n, a,
+    info = API_SUFFIX(LAPACKE_cgeesx_work)( matrix_layout, jobvs, sort, select, sense, n, a,
                                 lda, sdim, w, vs, ldvs, rconde, rcondv, work,
                                 lwork, rwork, bwork );
     /* Release memory and exit */
@@ -95,12 +95,12 @@ lapack_int LAPACKE_cgeesx( int matrix_layout, char jobvs, char sort,
 exit_level_2:
     LAPACKE_free( rwork );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeesx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeesx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeesx_work.c b/LAPACKE/src/lapacke_cgeesx_work.c
index 4be2ceeb62..201b7d68c6 100644
--- a/LAPACKE/src/lapacke_cgeesx_work.c
+++ b/LAPACKE/src/lapacke_cgeesx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeesx_work( int matrix_layout, char jobvs, char sort,
+lapack_int API_SUFFIX(LAPACKE_cgeesx_work)( int matrix_layout, char jobvs, char sort,
                                 LAPACK_C_SELECT1 select, char sense,
                                 lapack_int n, lapack_complex_float* a,
                                 lapack_int lda, lapack_int* sdim,
@@ -59,12 +59,12 @@ lapack_int LAPACKE_cgeesx_work( int matrix_layout, char jobvs, char sort,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgeesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeesx_work", info );
             return info;
         }
         if( ldvs < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_cgeesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeesx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -81,7 +81,7 @@ lapack_int LAPACKE_cgeesx_work( int matrix_layout, char jobvs, char sort,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
             vs_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvs_t * MAX(1,n) );
@@ -91,7 +91,7 @@ lapack_int LAPACKE_cgeesx_work( int matrix_layout, char jobvs, char sort,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgeesx( &jobvs, &sort, select, &sense, &n, a_t, &lda_t, sdim, w,
                        vs_t, &ldvs_t, rconde, rcondv, work, &lwork, rwork,
@@ -100,23 +100,23 @@ lapack_int LAPACKE_cgeesx_work( int matrix_layout, char jobvs, char sort,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, vs_t, ldvs_t, vs, ldvs );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, vs_t, ldvs_t, vs, ldvs );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
             LAPACKE_free( vs_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgeesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeesx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgeesx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeesx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeev.c b/LAPACKE/src/lapacke_cgeev.c
index 5770f20115..b9a63af0f6 100644
--- a/LAPACKE/src/lapacke_cgeev.c
+++ b/LAPACKE/src/lapacke_cgeev.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeev( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_cgeev)( int matrix_layout, char jobvl, char jobvr,
                           lapack_int n, lapack_complex_float* a, lapack_int lda,
                           lapack_complex_float* w, lapack_complex_float* vl,
                           lapack_int ldvl, lapack_complex_float* vr,
@@ -44,13 +44,13 @@ lapack_int LAPACKE_cgeev( int matrix_layout, char jobvl, char jobvr,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeev", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
     }
@@ -62,7 +62,7 @@ lapack_int LAPACKE_cgeev( int matrix_layout, char jobvl, char jobvr,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgeev_work( matrix_layout, jobvl, jobvr, n, a, lda, w, vl,
+    info = API_SUFFIX(LAPACKE_cgeev_work)( matrix_layout, jobvl, jobvr, n, a, lda, w, vl,
                                ldvl, vr, ldvr, &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -76,7 +76,7 @@ lapack_int LAPACKE_cgeev( int matrix_layout, char jobvl, char jobvr,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgeev_work( matrix_layout, jobvl, jobvr, n, a, lda, w, vl,
+    info = API_SUFFIX(LAPACKE_cgeev_work)( matrix_layout, jobvl, jobvr, n, a, lda, w, vl,
                                ldvl, vr, ldvr, work, lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -84,7 +84,7 @@ lapack_int LAPACKE_cgeev( int matrix_layout, char jobvl, char jobvr,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeev_work.c b/LAPACKE/src/lapacke_cgeev_work.c
index 081f5b1298..e81409f532 100644
--- a/LAPACKE/src/lapacke_cgeev_work.c
+++ b/LAPACKE/src/lapacke_cgeev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeev_work( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_cgeev_work)( int matrix_layout, char jobvl, char jobvr,
                                lapack_int n, lapack_complex_float* a,
                                lapack_int lda, lapack_complex_float* w,
                                lapack_complex_float* vl, lapack_int ldvl,
@@ -58,17 +58,17 @@ lapack_int LAPACKE_cgeev_work( int matrix_layout, char jobvl, char jobvr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cgeev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeev_work", info );
             return info;
         }
-        if( ldvl < n ) {
+        if( ldvl < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) && ldvl < n ) ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cgeev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeev_work", info );
             return info;
         }
-        if( ldvr < n ) {
+        if( ldvr < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) && ldvr < n ) ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cgeev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeev_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,7 +84,7 @@ lapack_int LAPACKE_cgeev_work( int matrix_layout, char jobvl, char jobvr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvl_t * MAX(1,n) );
@@ -93,7 +93,7 @@ lapack_int LAPACKE_cgeev_work( int matrix_layout, char jobvl, char jobvr,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvr_t * MAX(1,n) );
@@ -103,7 +103,7 @@ lapack_int LAPACKE_cgeev_work( int matrix_layout, char jobvl, char jobvr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgeev( &jobvl, &jobvr, &n, a_t, &lda_t, w, vl_t, &ldvl_t, vr_t,
                       &ldvr_t, work, &lwork, rwork, &info );
@@ -111,30 +111,30 @@ lapack_int LAPACKE_cgeev_work( int matrix_layout, char jobvl, char jobvr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgeev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgeev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeevx.c b/LAPACKE/src/lapacke_cgeevx.c
index f9eb943c58..c0a034f2d4 100644
--- a/LAPACKE/src/lapacke_cgeevx.c
+++ b/LAPACKE/src/lapacke_cgeevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeevx( int matrix_layout, char balanc, char jobvl,
+lapack_int API_SUFFIX(LAPACKE_cgeevx)( int matrix_layout, char balanc, char jobvl,
                            char jobvr, char sense, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* w, lapack_complex_float* vl,
@@ -47,13 +47,13 @@ lapack_int LAPACKE_cgeevx( int matrix_layout, char balanc, char jobvl,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeevx", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
     }
@@ -65,7 +65,7 @@ lapack_int LAPACKE_cgeevx( int matrix_layout, char balanc, char jobvl,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgeevx_work( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
+    info = API_SUFFIX(LAPACKE_cgeevx_work)( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
                                 lda, w, vl, ldvl, vr, ldvr, ilo, ihi, scale,
                                 abnrm, rconde, rcondv, &work_query, lwork,
                                 rwork );
@@ -81,7 +81,7 @@ lapack_int LAPACKE_cgeevx( int matrix_layout, char balanc, char jobvl,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgeevx_work( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
+    info = API_SUFFIX(LAPACKE_cgeevx_work)( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
                                 lda, w, vl, ldvl, vr, ldvr, ilo, ihi, scale,
                                 abnrm, rconde, rcondv, work, lwork, rwork );
     /* Release memory and exit */
@@ -90,7 +90,7 @@ lapack_int LAPACKE_cgeevx( int matrix_layout, char balanc, char jobvl,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeevx_work.c b/LAPACKE/src/lapacke_cgeevx_work.c
index 2257c64df5..85edf59d62 100644
--- a/LAPACKE/src/lapacke_cgeevx_work.c
+++ b/LAPACKE/src/lapacke_cgeevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeevx_work( int matrix_layout, char balanc, char jobvl,
+lapack_int API_SUFFIX(LAPACKE_cgeevx_work)( int matrix_layout, char balanc, char jobvl,
                                 char jobvr, char sense, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* w,
@@ -62,17 +62,17 @@ lapack_int LAPACKE_cgeevx_work( int matrix_layout, char balanc, char jobvl,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgeevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeevx_work", info );
             return info;
         }
-        if( ldvl < n ) {
+        if( ldvl < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) && ldvl < n ) ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cgeevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeevx_work", info );
             return info;
         }
-        if( ldvr < n ) {
+        if( ldvr < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) && ldvr < n ) ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_cgeevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeevx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -89,7 +89,7 @@ lapack_int LAPACKE_cgeevx_work( int matrix_layout, char balanc, char jobvl,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvl_t * MAX(1,n) );
@@ -98,7 +98,7 @@ lapack_int LAPACKE_cgeevx_work( int matrix_layout, char balanc, char jobvl,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvr_t * MAX(1,n) );
@@ -108,7 +108,7 @@ lapack_int LAPACKE_cgeevx_work( int matrix_layout, char balanc, char jobvl,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgeevx( &balanc, &jobvl, &jobvr, &sense, &n, a_t, &lda_t, w,
                        vl_t, &ldvl_t, vr_t, &ldvr_t, ilo, ihi, scale, abnrm,
@@ -117,30 +117,30 @@ lapack_int LAPACKE_cgeevx_work( int matrix_layout, char balanc, char jobvl,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgeevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgeevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgehrd.c b/LAPACKE/src/lapacke_cgehrd.c
index 31fd49d46c..376702da95 100644
--- a/LAPACKE/src/lapacke_cgehrd.c
+++ b/LAPACKE/src/lapacke_cgehrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgehrd( int matrix_layout, lapack_int n, lapack_int ilo,
+lapack_int API_SUFFIX(LAPACKE_cgehrd)( int matrix_layout, lapack_int n, lapack_int ilo,
                            lapack_int ihi, lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_cgehrd( int matrix_layout, lapack_int n, lapack_int ilo,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgehrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgehrd", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgehrd_work( matrix_layout, n, ilo, ihi, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_cgehrd_work)( matrix_layout, n, ilo, ihi, a, lda, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_cgehrd( int matrix_layout, lapack_int n, lapack_int ilo,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgehrd_work( matrix_layout, n, ilo, ihi, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_cgehrd_work)( matrix_layout, n, ilo, ihi, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgehrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgehrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgehrd_work.c b/LAPACKE/src/lapacke_cgehrd_work.c
index e5c0295aa2..32b56b2470 100644
--- a/LAPACKE/src/lapacke_cgehrd_work.c
+++ b/LAPACKE/src/lapacke_cgehrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgehrd_work( int matrix_layout, lapack_int n, lapack_int ilo,
+lapack_int API_SUFFIX(LAPACKE_cgehrd_work)( int matrix_layout, lapack_int n, lapack_int ilo,
                                 lapack_int ihi, lapack_complex_float* a,
                                 lapack_int lda, lapack_complex_float* tau,
                                 lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cgehrd_work( int matrix_layout, lapack_int n, lapack_int ilo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cgehrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgehrd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,23 +67,23 @@ lapack_int LAPACKE_cgehrd_work( int matrix_layout, lapack_int n, lapack_int ilo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgehrd( &n, &ilo, &ihi, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgehrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgehrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgehrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgehrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgejsv.c b/LAPACKE/src/lapacke_cgejsv.c
index f5604495ce..4c82f9bd6b 100644
--- a/LAPACKE/src/lapacke_cgejsv.c
+++ b/LAPACKE/src/lapacke_cgejsv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgejsv( int matrix_layout, char joba, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_cgejsv)( int matrix_layout, char joba, char jobu, char jobv,
                            char jobr, char jobt, char jobp, lapack_int m,
                            lapack_int n, lapack_complex_float* a, lapack_int lda, float* sva,
                            lapack_complex_float* u, lapack_int ldu, lapack_complex_float* v, lapack_int ldv,
@@ -41,96 +41,96 @@ lapack_int LAPACKE_cgejsv( int matrix_layout, char joba, char jobu, char jobv,
     lapack_int info = 0;
     lapack_int lwork = (
                 // 1.1
-        (        LAPACKE_lsame( jobu, 'n' ) &&  LAPACKE_lsame( jobv, 'n' ) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) )) ? 2*n+1 :
+        (        API_SUFFIX(LAPACKE_lsame)( jobu, 'n' ) &&  API_SUFFIX(LAPACKE_lsame)( jobv, 'n' ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) )) ? 2*n+1 :
 
                 //1.2
-     (   (       LAPACKE_lsame( jobu, 'n' ) &&  LAPACKE_lsame( jobv, 'n' ) &&
-              !( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) )) ? n*n+3*n :
+     (   (       API_SUFFIX(LAPACKE_lsame)( jobu, 'n' ) &&  API_SUFFIX(LAPACKE_lsame)( jobv, 'n' ) &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) )) ? n*n+3*n :
 
                 //2.1
-    (   (      ( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' ) )  &&
-              !( LAPACKE_lsame( jobu, 'u') ||  LAPACKE_lsame( jobu, 'f' ) )&&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))? 3*n :
+    (   (      ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) )  &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobu, 'u') ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) )&&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))? 3*n :
 
 
                 //2.2
-    (   (      ( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' ) )  &&
-              !( LAPACKE_lsame( jobu, 'u' ) ||  LAPACKE_lsame( jobu, 'f' ) ) &&
-              !( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))? 3*n :
+    (   (      ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) )  &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))? 3*n :
 
                //3.1
-     (   (      ( LAPACKE_lsame( jobu, 'u' ) ||  LAPACKE_lsame( jobu, 'f' )) &&
-              !( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' )) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))?  3*n :
+     (   (      ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' )) &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' )) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))?  3*n :
 
                //3.2
-     (   (      ( LAPACKE_lsame( jobu, 'u' ) || LAPACKE_lsame( jobu, 'f' )) &&
-              !(LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' )) &&
-              !(LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))?  3*n  :
+     (   (      ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'f' )) &&
+              !(API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' )) &&
+              !(API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))?  3*n  :
 
               //4.1
-     (  (       ( LAPACKE_lsame( jobu, 'u' ) ||  LAPACKE_lsame( jobu, 'f' ) ) &&
-               ( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' ) ) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))? 5*n+2*n*n :
+     (  (       ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))? 5*n+2*n*n :
 
               //4.2
-     (  (       ( LAPACKE_lsame( jobu, 'u' ) ||  LAPACKE_lsame( jobu, 'f' ) ) &&
-               ( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' ) ) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))? 4*n*n:
+     (  (       ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))? 4*n*n:
                        1) ) ) ) ) ) ) );
     lapack_int lrwork = (
                 // 1.1
-        (        LAPACKE_lsame( jobu, 'n' ) &&  LAPACKE_lsame( jobv, 'n' ) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) )) ? MAX(7,n+2*m) :
+        (        API_SUFFIX(LAPACKE_lsame)( jobu, 'n' ) &&  API_SUFFIX(LAPACKE_lsame)( jobv, 'n' ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) )) ? MAX(7,n+2*m) :
 
                 //1.2
-     (   (        LAPACKE_lsame( jobu, 'n' ) &&  LAPACKE_lsame( jobv, 'n' ) &&
-              !( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) )) ? MAX(7,2*n) :
+     (   (        API_SUFFIX(LAPACKE_lsame)( jobu, 'n' ) &&  API_SUFFIX(LAPACKE_lsame)( jobv, 'n' ) &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) )) ? MAX(7,2*n) :
 
                 //2.1
-    (   (      ( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' ) )  &&
-              !( LAPACKE_lsame( jobu, 'u') ||  LAPACKE_lsame( jobu, 'f' ) ) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))? MAX( 7, n+ 2*m ) :
+    (   (      ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) )  &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobu, 'u') ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))? MAX( 7, n+ 2*m ) :
 
 
                 //2.2
-    (   (      ( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' ) )  &&
-              !( LAPACKE_lsame( jobu, 'u' ) ||  LAPACKE_lsame( jobu, 'f' ) ) &&
-              !( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))? MAX(7,2*n) :
+    (   (      ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) )  &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))? MAX(7,2*n) :
 
                //3.1
-     (   (      ( LAPACKE_lsame( jobu, 'u' ) ||  LAPACKE_lsame( jobu, 'f' )) &&
-              !( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' )) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))?  MAX( 7, n+ 2*m ) :
+     (   (      ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' )) &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' )) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))?  MAX( 7, n+ 2*m ) :
 
                //3.2
-     (   (      ( LAPACKE_lsame( jobu, 'u' ) || LAPACKE_lsame( jobu, 'f' )) &&
-              !(LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' )) &&
-              !(LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))?  MAX(7,2*n)  :
+     (   (      ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'f' )) &&
+              !(API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' )) &&
+              !(API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))?  MAX(7,2*n)  :
 
               //4.1
-     (  (       ( LAPACKE_lsame( jobu, 'u' ) ||  LAPACKE_lsame( jobu, 'f' ) ) &&
-               ( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' ) ) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))? MAX( 7, n+ 2*m ) :
+     (  (       ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))? MAX( 7, n+ 2*m ) :
 
               //4.2
-     (  (       ( LAPACKE_lsame( jobu, 'u' ) ||  LAPACKE_lsame( jobu, 'f' ) ) &&
-               ( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' ) ) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))? MAX(7,2*n) :
+     (  (       ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))? MAX(7,2*n) :
                        7) ) ) ) ) ) ) );
     lapack_int* iwork = NULL;
     float* rwork = NULL;
     lapack_complex_float* cwork = NULL;
     lapack_int i;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgejsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgejsv", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -10;
         }
     }
@@ -143,13 +143,13 @@ lapack_int LAPACKE_cgejsv( int matrix_layout, char joba, char jobu, char jobv,
     }
     lwork = MAX( lwork, 1 );
     { /* FIXUP LWORK */
-        int want_u = LAPACKE_lsame( jobu, 'u' ) || LAPACKE_lsame( jobu, 'f' );
-        int want_v = LAPACKE_lsame( jobv, 'v' ) || LAPACKE_lsame( jobv, 'j' );
-        int want_sce = LAPACKE_lsame( joba, 'e' ) || LAPACKE_lsame( joba, 'g' );
+        int want_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'f' );
+        int want_v = API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'j' );
+        int want_sce = API_SUFFIX(LAPACKE_lsame)( joba, 'e' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' );
         if( !want_u && !want_v && !want_sce )  lwork = MAX( lwork, 2*n+1 ); // 1.1
         if( !want_u && !want_v && want_sce )   lwork = MAX( lwork, n*n+3*n ); // 1.2
-        if( want_u && LAPACKE_lsame( jobv, 'v' ) ) lwork = MAX( lwork, 5*n+2*n*n ); // 4.1
-        if( want_u && LAPACKE_lsame( jobv, 'j' ) ) lwork = MAX( lwork, 4*n+n*n ); // 4.2
+        if( want_u && API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) lwork = MAX( lwork, 5*n+2*n*n ); // 4.1
+        if( want_u && API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) lwork = MAX( lwork, 4*n+n*n ); // 4.2
     }
     cwork = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * lwork );
     if( cwork == NULL ) {
@@ -163,7 +163,7 @@ lapack_int LAPACKE_cgejsv( int matrix_layout, char joba, char jobu, char jobv,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgejsv_work( matrix_layout, joba, jobu, jobv, jobr, jobt,
+    info = API_SUFFIX(LAPACKE_cgejsv_work)( matrix_layout, joba, jobu, jobv, jobr, jobt,
                                 jobp, m, n, a, lda, sva, u, ldu, v, ldv, cwork,
                                 lwork, rwork, lrwork, iwork );
     /* Backup significant data from working array(s) */
@@ -181,7 +181,7 @@ lapack_int LAPACKE_cgejsv( int matrix_layout, char joba, char jobu, char jobv,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgejsv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgejsv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgejsv_work.c b/LAPACKE/src/lapacke_cgejsv_work.c
index 19ae194add..505cc4af43 100644
--- a/LAPACKE/src/lapacke_cgejsv_work.c
+++ b/LAPACKE/src/lapacke_cgejsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgejsv_work( int matrix_layout, char joba, char jobu,
+lapack_int API_SUFFIX(LAPACKE_cgejsv_work)( int matrix_layout, char joba, char jobu,
                                 char jobv, char jobr, char jobt, char jobp,
                                 lapack_int m, lapack_int n, lapack_complex_float* a,
                                 lapack_int lda, float* sva, lapack_complex_float* u,
@@ -51,10 +51,10 @@ lapack_int LAPACKE_cgejsv_work( int matrix_layout, char joba, char jobu,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nu = LAPACKE_lsame( jobu, 'n' ) ? 1 : m;
-        lapack_int nv = LAPACKE_lsame( jobv, 'n' ) ? 1 : n;
-        lapack_int ncols_u = LAPACKE_lsame( jobu, 'n' ) ? 1 :
-            LAPACKE_lsame( jobu, 'f' ) ? m : n;
+        lapack_int nu = API_SUFFIX(LAPACKE_lsame)( jobu, 'n' ) ? 1 : m;
+        lapack_int nv = API_SUFFIX(LAPACKE_lsame)( jobv, 'n' ) ? 1 : n;
+        lapack_int ncols_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'n' ) ? 1 :
+            API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ? m : n;
         lapack_int lda_t = MAX(1,m);
         lapack_int ldu_t = MAX(1,nu);
         lapack_int ldv_t = MAX(1,nv);
@@ -64,17 +64,17 @@ lapack_int LAPACKE_cgejsv_work( int matrix_layout, char joba, char jobu,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cgejsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgejsv_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_cgejsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgejsv_work", info );
             return info;
         }
         if( ldv < n ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_cgejsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgejsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_cgejsv_work( int matrix_layout, char joba, char jobu,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobu, 'f' ) || LAPACKE_lsame( jobu, 'u' ) ||
-            LAPACKE_lsame( jobu, 'w' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobu, 'w' ) ) {
             u_t = (lapack_complex_float*)
                LAPACKE_malloc( sizeof(lapack_complex_float) * ldu_t * MAX(1,ncols_u) );
             if( u_t == NULL ) {
@@ -93,8 +93,8 @@ lapack_int LAPACKE_cgejsv_work( int matrix_layout, char joba, char jobu,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobv, 'j' ) || LAPACKE_lsame( jobv, 'v' ) ||
-            LAPACKE_lsame( jobv, 'w' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobv, 'w' ) ) {
             v_t = (lapack_complex_float*)
                LAPACKE_malloc( sizeof(lapack_complex_float) * ldv_t * MAX(1,n) );
             if( v_t == NULL ) {
@@ -103,7 +103,7 @@ lapack_int LAPACKE_cgejsv_work( int matrix_layout, char joba, char jobu,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgejsv( &joba, &jobu, &jobv, &jobr, &jobt, &jobp, &m, &n, a_t,
                        &lda_t, sva, u_t, &ldu_t, v_t, &ldv_t, cwork, &lwork,
@@ -112,33 +112,33 @@ lapack_int LAPACKE_cgejsv_work( int matrix_layout, char joba, char jobu,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobu, 'f' ) || LAPACKE_lsame( jobu, 'u' ) ||
-            LAPACKE_lsame( jobu, 'w' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nu, ncols_u, u_t, ldu_t, u, ldu );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobu, 'w' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nu, ncols_u, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'j' ) || LAPACKE_lsame( jobv, 'v' ) ||
-            LAPACKE_lsame( jobv, 'w' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nv, n, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobv, 'w' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nv, n, v_t, ldv_t, v, ldv );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobv, 'j' ) || LAPACKE_lsame( jobv, 'v' ) ||
-            LAPACKE_lsame( jobv, 'w' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobv, 'w' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobu, 'f' ) || LAPACKE_lsame( jobu, 'u' ) ||
-            LAPACKE_lsame( jobu, 'w' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobu, 'w' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgejsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgejsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgejsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgejsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgelq.c b/LAPACKE/src/lapacke_cgelq.c
index 48487f1d8e..b3730f7839 100644
--- a/LAPACKE/src/lapacke_cgelq.c
+++ b/LAPACKE/src/lapacke_cgelq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgelq( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgelq)( int matrix_layout, lapack_int m, lapack_int n,
                           lapack_complex_float* a, lapack_int lda,
                           lapack_complex_float* t, lapack_int tsize )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_cgelq( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgelq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelq", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgelq_work( matrix_layout, m, n, a, lda, t, tsize, &work_query,
+    info = API_SUFFIX(LAPACKE_cgelq_work)( matrix_layout, m, n, a, lda, t, tsize, &work_query,
                                lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,12 +69,12 @@ lapack_int LAPACKE_cgelq( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgelq_work( matrix_layout, m, n, a, lda, t, tsize, work, lwork );
+    info = API_SUFFIX(LAPACKE_cgelq_work)( matrix_layout, m, n, a, lda, t, tsize, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgelq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgelq2.c b/LAPACKE/src/lapacke_cgelq2.c
index a73205a267..2b3aabbb7e 100644
--- a/LAPACKE/src/lapacke_cgelq2.c
+++ b/LAPACKE/src/lapacke_cgelq2.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgelq2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgelq2)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* tau )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgelq2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelq2", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
@@ -58,12 +58,12 @@ lapack_int LAPACKE_cgelq2( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgelq2_work( matrix_layout, m, n, a, lda, tau, work );
+    info = API_SUFFIX(LAPACKE_cgelq2_work)( matrix_layout, m, n, a, lda, tau, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgelq2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelq2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgelq2_work.c b/LAPACKE/src/lapacke_cgelq2_work.c
index 66ff1eed6b..3e485cce5f 100644
--- a/LAPACKE/src/lapacke_cgelq2_work.c
+++ b/LAPACKE/src/lapacke_cgelq2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgelq2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgelq2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* tau,
                                 lapack_complex_float* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cgelq2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgelq2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelq2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_cgelq2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgelq2( &m, &n, a_t, &lda_t, tau, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgelq2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelq2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgelq2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelq2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgelq_work.c b/LAPACKE/src/lapacke_cgelq_work.c
index 3e246d3fc8..85d45d6080 100644
--- a/LAPACKE/src/lapacke_cgelq_work.c
+++ b/LAPACKE/src/lapacke_cgelq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgelq_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgelq_work)( int matrix_layout, lapack_int m, lapack_int n,
                                lapack_complex_float* a, lapack_int lda,
                                lapack_complex_float* t, lapack_int tsize,
                                lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cgelq_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgelq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_cgelq_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgelq( &m, &n, a_t, &lda_t, t, &tsize, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgelq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgelq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgelqf.c b/LAPACKE/src/lapacke_cgelqf.c
index a900631c8b..8c2ed4c25c 100644
--- a/LAPACKE/src/lapacke_cgelqf.c
+++ b/LAPACKE/src/lapacke_cgelqf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgelqf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgelqf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_cgelqf( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgelqf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelqf", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgelqf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_cgelqf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,12 +67,12 @@ lapack_int LAPACKE_cgelqf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgelqf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_cgelqf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgelqf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelqf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgelqf_work.c b/LAPACKE/src/lapacke_cgelqf_work.c
index 8bbb4a8200..3854e70e94 100644
--- a/LAPACKE/src/lapacke_cgelqf_work.c
+++ b/LAPACKE/src/lapacke_cgelqf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgelqf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgelqf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* tau,
                                 lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cgelqf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgelqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelqf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_cgelqf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgelqf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgelqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelqf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgelqf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelqf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgels.c b/LAPACKE/src/lapacke_cgels.c
index 14daaef180..33a466bc95 100644
--- a/LAPACKE/src/lapacke_cgels.c
+++ b/LAPACKE/src/lapacke_cgels.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgels( int matrix_layout, char trans, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_cgels)( int matrix_layout, char trans, lapack_int m,
                           lapack_int n, lapack_int nrhs,
                           lapack_complex_float* a, lapack_int lda,
                           lapack_complex_float* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_cgels( int matrix_layout, char trans, lapack_int m,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgels", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgels", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgels_work( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_cgels_work)( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
                                &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_cgels( int matrix_layout, char trans, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgels_work( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_cgels_work)( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
                                work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgels", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgels", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgels_work.c b/LAPACKE/src/lapacke_cgels_work.c
index 7c7012f6e5..b3b2fd2d1f 100644
--- a/LAPACKE/src/lapacke_cgels_work.c
+++ b/LAPACKE/src/lapacke_cgels_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgels_work( int matrix_layout, char trans, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_cgels_work)( int matrix_layout, char trans, lapack_int m,
                                lapack_int n, lapack_int nrhs,
                                lapack_complex_float* a, lapack_int lda,
                                lapack_complex_float* b, lapack_int ldb,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_cgels_work( int matrix_layout, char trans, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cgels_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgels_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cgels_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgels_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_cgels_work( int matrix_layout, char trans, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgels( &trans, &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -92,8 +92,8 @@ lapack_int LAPACKE_cgels_work( int matrix_layout, char trans, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -101,11 +101,11 @@ lapack_int LAPACKE_cgels_work( int matrix_layout, char trans, lapack_int m,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgels_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgels_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgels_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgels_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgelsd.c b/LAPACKE/src/lapacke_cgelsd.c
index 74197666d8..319c425a90 100644
--- a/LAPACKE/src/lapacke_cgelsd.c
+++ b/LAPACKE/src/lapacke_cgelsd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgelsd( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgelsd)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int nrhs, lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* b,
                            lapack_int ldb, float* s, float rcond,
@@ -50,25 +50,25 @@ lapack_int LAPACKE_cgelsd( int matrix_layout, lapack_int m, lapack_int n,
     float rwork_query;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgelsd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelsd", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &rcond, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &rcond, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgelsd_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
+    info = API_SUFFIX(LAPACKE_cgelsd_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
                                 rcond, rank, &work_query, lwork, &rwork_query,
                                 &iwork_query );
     if( info != 0 ) {
@@ -95,7 +95,7 @@ lapack_int LAPACKE_cgelsd( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgelsd_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
+    info = API_SUFFIX(LAPACKE_cgelsd_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
                                 rcond, rank, work, lwork, rwork, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -105,7 +105,7 @@ lapack_int LAPACKE_cgelsd( int matrix_layout, lapack_int m, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgelsd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelsd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgelsd_work.c b/LAPACKE/src/lapacke_cgelsd_work.c
index 2fc647be07..05d1d29f65 100644
--- a/LAPACKE/src/lapacke_cgelsd_work.c
+++ b/LAPACKE/src/lapacke_cgelsd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgelsd_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int nrhs, lapack_complex_float* a,
                                 lapack_int lda, lapack_complex_float* b,
                                 lapack_int ldb, float* s, float rcond,
@@ -56,12 +56,12 @@ lapack_int LAPACKE_cgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cgelsd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelsd_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgelsd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelsd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -85,8 +85,8 @@ lapack_int LAPACKE_cgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgelsd( &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, s, &rcond, rank,
                        work, &lwork, rwork, iwork, &info );
@@ -94,8 +94,8 @@ lapack_int LAPACKE_cgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -103,11 +103,11 @@ lapack_int LAPACKE_cgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgelsd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelsd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgelsd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelsd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgelss.c b/LAPACKE/src/lapacke_cgelss.c
index 10fcde2ef2..e0d9aeefca 100644
--- a/LAPACKE/src/lapacke_cgelss.c
+++ b/LAPACKE/src/lapacke_cgelss.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgelss( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgelss)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int nrhs, lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* b,
                            lapack_int ldb, float* s, float rcond,
@@ -44,19 +44,19 @@ lapack_int LAPACKE_cgelss( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgelss", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelss", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &rcond, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &rcond, 1 ) ) {
             return -10;
         }
     }
@@ -68,7 +68,7 @@ lapack_int LAPACKE_cgelss( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgelss_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
+    info = API_SUFFIX(LAPACKE_cgelss_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
                                 rcond, rank, &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -82,7 +82,7 @@ lapack_int LAPACKE_cgelss( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgelss_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
+    info = API_SUFFIX(LAPACKE_cgelss_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
                                 rcond, rank, work, lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -90,7 +90,7 @@ lapack_int LAPACKE_cgelss( int matrix_layout, lapack_int m, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgelss", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelss", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgelss_work.c b/LAPACKE/src/lapacke_cgelss_work.c
index ae5773c86c..f64bea1a49 100644
--- a/LAPACKE/src/lapacke_cgelss_work.c
+++ b/LAPACKE/src/lapacke_cgelss_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgelss_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgelss_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int nrhs, lapack_complex_float* a,
                                 lapack_int lda, lapack_complex_float* b,
                                 lapack_int ldb, float* s, float rcond,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_cgelss_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cgelss_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelss_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgelss_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelss_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_cgelss_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgelss( &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, s, &rcond, rank,
                        work, &lwork, rwork, &info );
@@ -93,8 +93,8 @@ lapack_int LAPACKE_cgelss_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -102,11 +102,11 @@ lapack_int LAPACKE_cgelss_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgelss_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelss_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgelss_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelss_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgelsy.c b/LAPACKE/src/lapacke_cgelsy.c
index 8a46e21857..c446b4d852 100644
--- a/LAPACKE/src/lapacke_cgelsy.c
+++ b/LAPACKE/src/lapacke_cgelsy.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgelsy( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgelsy)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int nrhs, lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* b,
                            lapack_int ldb, lapack_int* jpvt, float rcond,
@@ -44,19 +44,19 @@ lapack_int LAPACKE_cgelsy( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgelsy", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelsy", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &rcond, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &rcond, 1 ) ) {
             return -10;
         }
     }
@@ -68,7 +68,7 @@ lapack_int LAPACKE_cgelsy( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgelsy_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, jpvt,
+    info = API_SUFFIX(LAPACKE_cgelsy_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, jpvt,
                                 rcond, rank, &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -82,7 +82,7 @@ lapack_int LAPACKE_cgelsy( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgelsy_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, jpvt,
+    info = API_SUFFIX(LAPACKE_cgelsy_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, jpvt,
                                 rcond, rank, work, lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -90,7 +90,7 @@ lapack_int LAPACKE_cgelsy( int matrix_layout, lapack_int m, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgelsy", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelsy", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgelsy_work.c b/LAPACKE/src/lapacke_cgelsy_work.c
index c2ac423150..322efda050 100644
--- a/LAPACKE/src/lapacke_cgelsy_work.c
+++ b/LAPACKE/src/lapacke_cgelsy_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgelsy_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int nrhs, lapack_complex_float* a,
                                 lapack_int lda, lapack_complex_float* b,
                                 lapack_int ldb, lapack_int* jpvt, float rcond,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_cgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cgelsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelsy_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgelsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelsy_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_cgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgelsy( &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, jpvt, &rcond,
                        rank, work, &lwork, rwork, &info );
@@ -93,8 +93,8 @@ lapack_int LAPACKE_cgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -102,11 +102,11 @@ lapack_int LAPACKE_cgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgelsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelsy_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgelsy_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgelsy_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgemlq.c b/LAPACKE/src/lapacke_cgemlq.c
index 8661b12e9f..eb18b6abef 100644
--- a/LAPACKE/src/lapacke_cgemlq.c
+++ b/LAPACKE/src/lapacke_cgemlq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgemlq( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cgemlq)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const lapack_complex_float* a, lapack_int lda,
                            const lapack_complex_float* t, lapack_int tsize,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_cgemlq( int matrix_layout, char side, char trans,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgemlq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemlq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, k, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, k, m, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_c_nancheck( tsize, t, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( tsize, t, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgemlq_work( matrix_layout, side, trans, m, n, k, a, lda,
+    info = API_SUFFIX(LAPACKE_cgemlq_work)( matrix_layout, side, trans, m, n, k, a, lda,
                                 t, tsize, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -74,13 +74,13 @@ lapack_int LAPACKE_cgemlq( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgemlq_work( matrix_layout, side, trans, m, n, k, a, lda,
+    info = API_SUFFIX(LAPACKE_cgemlq_work)( matrix_layout, side, trans, m, n, k, a, lda,
                                 t, tsize, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgemlq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemlq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgemlq_work.c b/LAPACKE/src/lapacke_cgemlq_work.c
index 071032033a..de9226b4aa 100644
--- a/LAPACKE/src/lapacke_cgemlq_work.c
+++ b/LAPACKE/src/lapacke_cgemlq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgemlq_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cgemlq_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const lapack_complex_float* a, lapack_int lda,
                                 const lapack_complex_float* t, lapack_int tsize,
@@ -51,18 +51,18 @@ lapack_int LAPACKE_cgemlq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lda_t = MAX(1,k);
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( lda < r ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgemlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemlq_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cgemlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemlq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -72,7 +72,7 @@ lapack_int LAPACKE_cgemlq_work( int matrix_layout, char side, char trans,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             a_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * lda_t * MAX(1,m) );
         } else {
             a_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * lda_t * MAX(1,n) );
@@ -87,8 +87,8 @@ lapack_int LAPACKE_cgemlq_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, k, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgemlq( &side, &trans, &m, &n, &k, a_t, &lda_t, t, &tsize,
                        c_t, &ldc_t, work, &lwork, &info );
@@ -96,18 +96,18 @@ lapack_int LAPACKE_cgemlq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgemlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemlq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgemlq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemlq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgemqr.c b/LAPACKE/src/lapacke_cgemqr.c
index 440804c09f..97c71adfd3 100644
--- a/LAPACKE/src/lapacke_cgemqr.c
+++ b/LAPACKE/src/lapacke_cgemqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgemqr( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cgemqr)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const lapack_complex_float* a, lapack_int lda,
                            const lapack_complex_float* t, lapack_int tsize,
@@ -44,26 +44,26 @@ lapack_int LAPACKE_cgemqr( int matrix_layout, char side, char trans,
     lapack_complex_float work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgemqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_cge_nancheck( matrix_layout, r, k, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, r, k, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_c_nancheck( tsize, t, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( tsize, t, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgemqr_work( matrix_layout, side, trans, m, n, k, a, lda,
+    info = API_SUFFIX(LAPACKE_cgemqr_work)( matrix_layout, side, trans, m, n, k, a, lda,
                                 t, tsize, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -77,13 +77,13 @@ lapack_int LAPACKE_cgemqr( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgemqr_work( matrix_layout, side, trans, m, n, k, a, lda,
+    info = API_SUFFIX(LAPACKE_cgemqr_work)( matrix_layout, side, trans, m, n, k, a, lda,
                                 t, tsize, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgemqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgemqr_work.c b/LAPACKE/src/lapacke_cgemqr_work.c
index 1e421864df..17d3dcb0df 100644
--- a/LAPACKE/src/lapacke_cgemqr_work.c
+++ b/LAPACKE/src/lapacke_cgemqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgemqr_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cgemqr_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const lapack_complex_float* a, lapack_int lda,
                                 const lapack_complex_float* t, lapack_int tsize,
@@ -51,18 +51,18 @@ lapack_int LAPACKE_cgemqr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lda_t = MAX(1,r);
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( lda < k ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgemqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemqr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cgemqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -85,8 +85,8 @@ lapack_int LAPACKE_cgemqr_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, r, k, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, r, k, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgemqr( &side, &trans, &m, &n, &k, a_t, &lda_t, t, &tsize,
                        c_t, &ldc_t, work, &lwork, &info );
@@ -94,18 +94,18 @@ lapack_int LAPACKE_cgemqr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgemqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgemqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgemqrt.c b/LAPACKE/src/lapacke_cgemqrt.c
index fdb5a71cc7..4debdeb15b 100644
--- a/LAPACKE/src/lapacke_cgemqrt.c
+++ b/LAPACKE/src/lapacke_cgemqrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgemqrt( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cgemqrt)( int matrix_layout, char side, char trans,
                             lapack_int m, lapack_int n, lapack_int k,
                             lapack_int nb, const lapack_complex_float* v,
                             lapack_int ldv, const lapack_complex_float* t,
@@ -43,21 +43,21 @@ lapack_int LAPACKE_cgemqrt( int matrix_layout, char side, char trans,
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgemqrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemqrt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        nrows_v = LAPACKE_lsame( side, 'L' ) ? m :
-                             ( LAPACKE_lsame( side, 'R' ) ? n : 0 );
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? m :
+                             ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? n : 0 );
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -12;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, nb, k, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, nb, k, t, ldt ) ) {
             return -10;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, nrows_v, k, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, nrows_v, k, v, ldv ) ) {
             return -8;
         }
     }
@@ -70,13 +70,13 @@ lapack_int LAPACKE_cgemqrt( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgemqrt_work( matrix_layout, side, trans, m, n, k, nb, v, ldv,
+    info = API_SUFFIX(LAPACKE_cgemqrt_work)( matrix_layout, side, trans, m, n, k, nb, v, ldv,
                                  t, ldt, c, ldc, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgemqrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemqrt", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgemqrt_work.c b/LAPACKE/src/lapacke_cgemqrt_work.c
index e2772fd78f..bad6aaa2e3 100644
--- a/LAPACKE/src/lapacke_cgemqrt_work.c
+++ b/LAPACKE/src/lapacke_cgemqrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgemqrt_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cgemqrt_work)( int matrix_layout, char side, char trans,
                                  lapack_int m, lapack_int n, lapack_int k,
                                  lapack_int nb, const lapack_complex_float* v,
                                  lapack_int ldv, const lapack_complex_float* t,
@@ -57,17 +57,17 @@ lapack_int LAPACKE_cgemqrt_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( ldc < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_cgemqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemqrt_work", info );
             return info;
         }
         if( ldt < nb ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cgemqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemqrt_work", info );
             return info;
         }
         if( ldv < k ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cgemqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemqrt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -90,9 +90,9 @@ lapack_int LAPACKE_cgemqrt_work( int matrix_layout, char side, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
-        LAPACKE_cge_trans( matrix_layout, ldt, nb, t, ldt, t_t, ldt_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, ldt, nb, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgemqrt( &side, &trans, &m, &n, &k, &nb, v_t, &ldv_t, t_t,
                         &ldt_t, c_t, &ldc_t, work, &info );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_cgemqrt_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_2:
@@ -109,11 +109,11 @@ lapack_int LAPACKE_cgemqrt_work( int matrix_layout, char side, char trans,
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgemqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemqrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgemqrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgemqrt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqlf.c b/LAPACKE/src/lapacke_cgeqlf.c
index a8bcd39d6c..85b848eedc 100644
--- a/LAPACKE/src/lapacke_cgeqlf.c
+++ b/LAPACKE/src/lapacke_cgeqlf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqlf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqlf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_cgeqlf( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqlf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqlf", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgeqlf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_cgeqlf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,12 +67,12 @@ lapack_int LAPACKE_cgeqlf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgeqlf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_cgeqlf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqlf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqlf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqlf_work.c b/LAPACKE/src/lapacke_cgeqlf_work.c
index 7b70fb34d8..1620ec7e5c 100644
--- a/LAPACKE/src/lapacke_cgeqlf_work.c
+++ b/LAPACKE/src/lapacke_cgeqlf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqlf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqlf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* tau,
                                 lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cgeqlf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgeqlf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqlf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_cgeqlf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgeqlf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgeqlf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqlf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgeqlf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqlf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqp3.c b/LAPACKE/src/lapacke_cgeqp3.c
index d4b0c94cf3..583f81bdbb 100644
--- a/LAPACKE/src/lapacke_cgeqp3.c
+++ b/LAPACKE/src/lapacke_cgeqp3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqp3( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqp3)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_int* jpvt, lapack_complex_float* tau )
 {
@@ -42,13 +42,13 @@ lapack_int LAPACKE_cgeqp3( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqp3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqp3", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
@@ -60,7 +60,7 @@ lapack_int LAPACKE_cgeqp3( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgeqp3_work( matrix_layout, m, n, a, lda, jpvt, tau,
+    info = API_SUFFIX(LAPACKE_cgeqp3_work)( matrix_layout, m, n, a, lda, jpvt, tau,
                                 &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -74,7 +74,7 @@ lapack_int LAPACKE_cgeqp3( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgeqp3_work( matrix_layout, m, n, a, lda, jpvt, tau, work,
+    info = API_SUFFIX(LAPACKE_cgeqp3_work)( matrix_layout, m, n, a, lda, jpvt, tau, work,
                                 lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -82,7 +82,7 @@ lapack_int LAPACKE_cgeqp3( int matrix_layout, lapack_int m, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqp3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqp3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqp3_work.c b/LAPACKE/src/lapacke_cgeqp3_work.c
index 638935b2af..053958e857 100644
--- a/LAPACKE/src/lapacke_cgeqp3_work.c
+++ b/LAPACKE/src/lapacke_cgeqp3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqp3_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqp3_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_int* jpvt, lapack_complex_float* tau,
                                 lapack_complex_float* work, lapack_int lwork,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_cgeqp3_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgeqp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqp3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -68,7 +68,7 @@ lapack_int LAPACKE_cgeqp3_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgeqp3( &m, &n, a_t, &lda_t, jpvt, tau, work, &lwork, rwork,
                        &info );
@@ -76,16 +76,16 @@ lapack_int LAPACKE_cgeqp3_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgeqp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqp3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgeqp3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqp3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqpf.c b/LAPACKE/src/lapacke_cgeqpf.c
index 2f161493da..cdda28cb67 100644
--- a/LAPACKE/src/lapacke_cgeqpf.c
+++ b/LAPACKE/src/lapacke_cgeqpf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqpf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqpf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_int* jpvt, lapack_complex_float* tau )
 {
@@ -40,13 +40,13 @@ lapack_int LAPACKE_cgeqpf( int matrix_layout, lapack_int m, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqpf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqpf", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
@@ -64,7 +64,7 @@ lapack_int LAPACKE_cgeqpf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgeqpf_work( matrix_layout, m, n, a, lda, jpvt, tau, work,
+    info = API_SUFFIX(LAPACKE_cgeqpf_work)( matrix_layout, m, n, a, lda, jpvt, tau, work,
                                 rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -72,7 +72,7 @@ lapack_int LAPACKE_cgeqpf( int matrix_layout, lapack_int m, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqpf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqpf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqpf_work.c b/LAPACKE/src/lapacke_cgeqpf_work.c
index da779ac3a8..1ebb563ce6 100644
--- a/LAPACKE/src/lapacke_cgeqpf_work.c
+++ b/LAPACKE/src/lapacke_cgeqpf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqpf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqpf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_int* jpvt, lapack_complex_float* tau,
                                 lapack_complex_float* work, float* rwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cgeqpf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgeqpf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqpf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_cgeqpf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgeqpf( &m, &n, a_t, &lda_t, jpvt, tau, work, rwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgeqpf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqpf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgeqpf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqpf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqr.c b/LAPACKE/src/lapacke_cgeqr.c
index be3e665040..d91ad2e3cf 100644
--- a/LAPACKE/src/lapacke_cgeqr.c
+++ b/LAPACKE/src/lapacke_cgeqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqr( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqr)( int matrix_layout, lapack_int m, lapack_int n,
                           lapack_complex_float* a, lapack_int lda,
                           lapack_complex_float* t, lapack_int tsize )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_cgeqr( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqr", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgeqr_work( matrix_layout, m, n, a, lda, t, tsize, &work_query,
+    info = API_SUFFIX(LAPACKE_cgeqr_work)( matrix_layout, m, n, a, lda, t, tsize, &work_query,
                                lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,12 +70,12 @@ lapack_int LAPACKE_cgeqr( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgeqr_work( matrix_layout, m, n, a, lda, t, tsize, work, lwork );
+    info = API_SUFFIX(LAPACKE_cgeqr_work)( matrix_layout, m, n, a, lda, t, tsize, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqr2.c b/LAPACKE/src/lapacke_cgeqr2.c
index 14f8e9be95..6d94cd77de 100644
--- a/LAPACKE/src/lapacke_cgeqr2.c
+++ b/LAPACKE/src/lapacke_cgeqr2.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqr2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqr2)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* tau )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqr2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqr2", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
@@ -58,12 +58,12 @@ lapack_int LAPACKE_cgeqr2( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgeqr2_work( matrix_layout, m, n, a, lda, tau, work );
+    info = API_SUFFIX(LAPACKE_cgeqr2_work)( matrix_layout, m, n, a, lda, tau, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqr2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqr2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqr2_work.c b/LAPACKE/src/lapacke_cgeqr2_work.c
index 8fa36b85a5..18547f1f39 100644
--- a/LAPACKE/src/lapacke_cgeqr2_work.c
+++ b/LAPACKE/src/lapacke_cgeqr2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqr2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqr2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* tau,
                                 lapack_complex_float* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cgeqr2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgeqr2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqr2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_cgeqr2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgeqr2( &m, &n, a_t, &lda_t, tau, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgeqr2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqr2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgeqr2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqr2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqr_work.c b/LAPACKE/src/lapacke_cgeqr_work.c
index 46ece5ffdd..967c2c8e1a 100644
--- a/LAPACKE/src/lapacke_cgeqr_work.c
+++ b/LAPACKE/src/lapacke_cgeqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqr_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqr_work)( int matrix_layout, lapack_int m, lapack_int n,
                                lapack_complex_float* a, lapack_int lda,
                                lapack_complex_float* t, lapack_int tsize,
                                lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cgeqr_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgeqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_cgeqr_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgeqr( &m, &n, a_t, &lda_t, t, &tsize, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgeqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgeqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqrf.c b/LAPACKE/src/lapacke_cgeqrf.c
index 4a80430b34..7e9a51c643 100644
--- a/LAPACKE/src/lapacke_cgeqrf.c
+++ b/LAPACKE/src/lapacke_cgeqrf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqrf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqrf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_cgeqrf( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrf", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgeqrf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_cgeqrf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,12 +67,12 @@ lapack_int LAPACKE_cgeqrf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgeqrf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_cgeqrf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqrf_work.c b/LAPACKE/src/lapacke_cgeqrf_work.c
index 4733275554..c4c1230434 100644
--- a/LAPACKE/src/lapacke_cgeqrf_work.c
+++ b/LAPACKE/src/lapacke_cgeqrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqrf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqrf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* tau,
                                 lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cgeqrf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgeqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_cgeqrf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgeqrf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgeqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgeqrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqrfp.c b/LAPACKE/src/lapacke_cgeqrfp.c
index a8596a4d51..05e83b1226 100644
--- a/LAPACKE/src/lapacke_cgeqrfp.c
+++ b/LAPACKE/src/lapacke_cgeqrfp.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqrfp( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqrfp)( int matrix_layout, lapack_int m, lapack_int n,
                             lapack_complex_float* a, lapack_int lda,
                             lapack_complex_float* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_cgeqrfp( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqrfp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrfp", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgeqrfp_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_cgeqrfp_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                  lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,12 +67,12 @@ lapack_int LAPACKE_cgeqrfp( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgeqrfp_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_cgeqrfp_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqrfp", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrfp", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqrfp_work.c b/LAPACKE/src/lapacke_cgeqrfp_work.c
index 4d63fc2f15..a12c6796d4 100644
--- a/LAPACKE/src/lapacke_cgeqrfp_work.c
+++ b/LAPACKE/src/lapacke_cgeqrfp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqrfp_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqrfp_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  lapack_complex_float* a, lapack_int lda,
                                  lapack_complex_float* tau,
                                  lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cgeqrfp_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgeqrfp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrfp_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_cgeqrfp_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgeqrfp( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgeqrfp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrfp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgeqrfp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrfp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqrt.c b/LAPACKE/src/lapacke_cgeqrt.c
index 6e3cb656e9..bcdc249299 100644
--- a/LAPACKE/src/lapacke_cgeqrt.c
+++ b/LAPACKE/src/lapacke_cgeqrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqrt( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqrt)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int nb, lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* t,
                            lapack_int ldt )
@@ -40,13 +40,13 @@ lapack_int LAPACKE_cgeqrt( int matrix_layout, lapack_int m, lapack_int n,
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrt", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
@@ -59,12 +59,12 @@ lapack_int LAPACKE_cgeqrt( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgeqrt_work( matrix_layout, m, n, nb, a, lda, t, ldt, work );
+    info = API_SUFFIX(LAPACKE_cgeqrt_work)( matrix_layout, m, n, nb, a, lda, t, ldt, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrt", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqrt2.c b/LAPACKE/src/lapacke_cgeqrt2.c
index dc03b2d020..c570f62fe5 100644
--- a/LAPACKE/src/lapacke_cgeqrt2.c
+++ b/LAPACKE/src/lapacke_cgeqrt2.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqrt2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqrt2)( int matrix_layout, lapack_int m, lapack_int n,
                             lapack_complex_float* a, lapack_int lda,
                             lapack_complex_float* t, lapack_int ldt )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqrt2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrt2", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_cgeqrt2_work( matrix_layout, m, n, a, lda, t, ldt );
+    return API_SUFFIX(LAPACKE_cgeqrt2_work)( matrix_layout, m, n, a, lda, t, ldt );
 }
diff --git a/LAPACKE/src/lapacke_cgeqrt2_work.c b/LAPACKE/src/lapacke_cgeqrt2_work.c
index bfaecd7ce6..015948b589 100644
--- a/LAPACKE/src/lapacke_cgeqrt2_work.c
+++ b/LAPACKE/src/lapacke_cgeqrt2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqrt2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqrt2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  lapack_complex_float* a, lapack_int lda,
                                  lapack_complex_float* t, lapack_int ldt )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_cgeqrt2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgeqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrt2_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cgeqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrt2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -73,26 +73,26 @@ lapack_int LAPACKE_cgeqrt2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgeqrt2( &m, &n, a_t, &lda_t, t_t, &ldt_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgeqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrt2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgeqrt2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrt2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqrt3.c b/LAPACKE/src/lapacke_cgeqrt3.c
index 8cdf3d5b7d..71b886d95e 100644
--- a/LAPACKE/src/lapacke_cgeqrt3.c
+++ b/LAPACKE/src/lapacke_cgeqrt3.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqrt3( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqrt3)( int matrix_layout, lapack_int m, lapack_int n,
                             lapack_complex_float* a, lapack_int lda,
                             lapack_complex_float* t, lapack_int ldt )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgeqrt3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrt3", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_cgeqrt3_work( matrix_layout, m, n, a, lda, t, ldt );
+    return API_SUFFIX(LAPACKE_cgeqrt3_work)( matrix_layout, m, n, a, lda, t, ldt );
 }
diff --git a/LAPACKE/src/lapacke_cgeqrt3_work.c b/LAPACKE/src/lapacke_cgeqrt3_work.c
index de5894e628..55d565d605 100644
--- a/LAPACKE/src/lapacke_cgeqrt3_work.c
+++ b/LAPACKE/src/lapacke_cgeqrt3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqrt3_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqrt3_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  lapack_complex_float* a, lapack_int lda,
                                  lapack_complex_float* t, lapack_int ldt )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_cgeqrt3_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgeqrt3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrt3_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cgeqrt3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrt3_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -73,26 +73,26 @@ lapack_int LAPACKE_cgeqrt3_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgeqrt3( &m, &n, a_t, &lda_t, t_t, &ldt_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgeqrt3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrt3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgeqrt3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrt3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgeqrt_work.c b/LAPACKE/src/lapacke_cgeqrt_work.c
index 962624d217..ca2818e40e 100644
--- a/LAPACKE/src/lapacke_cgeqrt_work.c
+++ b/LAPACKE/src/lapacke_cgeqrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgeqrt_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgeqrt_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int nb, lapack_complex_float* a,
                                 lapack_int lda, lapack_complex_float* t,
                                 lapack_int ldt, lapack_complex_float* work )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_cgeqrt_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cgeqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrt_work", info );
             return info;
         }
         if( ldt < MIN(m,n) ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgeqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,15 +75,15 @@ lapack_int LAPACKE_cgeqrt_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgeqrt( &m, &n, &nb, a_t, &lda_t, t_t, &ldt_t, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, ldt, MIN(m,n), t_t, ldt_t, t,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nb, MIN(m,n), t_t, ldt_t, t,
                            ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
@@ -91,11 +91,11 @@ lapack_int LAPACKE_cgeqrt_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgeqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgeqrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgeqrt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgerfs.c b/LAPACKE/src/lapacke_cgerfs.c
index fe4cfaee37..67b8ae4570 100644
--- a/LAPACKE/src/lapacke_cgerfs.c
+++ b/LAPACKE/src/lapacke_cgerfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgerfs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgerfs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* a,
                            lapack_int lda, const lapack_complex_float* af,
                            lapack_int ldaf, const lapack_int* ipiv,
@@ -44,22 +44,22 @@ lapack_int LAPACKE_cgerfs( int matrix_layout, char trans, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgerfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerfs", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, af, ldaf ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -77,7 +77,7 @@ lapack_int LAPACKE_cgerfs( int matrix_layout, char trans, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgerfs_work( matrix_layout, trans, n, nrhs, a, lda, af, ldaf,
+    info = API_SUFFIX(LAPACKE_cgerfs_work)( matrix_layout, trans, n, nrhs, a, lda, af, ldaf,
                                 ipiv, b, ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -85,7 +85,7 @@ lapack_int LAPACKE_cgerfs( int matrix_layout, char trans, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgerfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgerfs_work.c b/LAPACKE/src/lapacke_cgerfs_work.c
index a16907e272..c724282777 100644
--- a/LAPACKE/src/lapacke_cgerfs_work.c
+++ b/LAPACKE/src/lapacke_cgerfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgerfs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgerfs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* a,
                                 lapack_int lda, const lapack_complex_float* af,
                                 lapack_int ldaf, const lapack_int* ipiv,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_cgerfs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerfs_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_cgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -107,10 +107,10 @@ lapack_int LAPACKE_cgerfs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgerfs( &trans, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, ipiv, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, rwork, &info );
@@ -118,7 +118,7 @@ lapack_int LAPACKE_cgerfs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -129,11 +129,11 @@ lapack_int LAPACKE_cgerfs_work( int matrix_layout, char trans, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgerfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgerfsx.c b/LAPACKE/src/lapacke_cgerfsx.c
index 3bb7670447..cdd6bb6ab4 100644
--- a/LAPACKE/src/lapacke_cgerfsx.c
+++ b/LAPACKE/src/lapacke_cgerfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgerfsx( int matrix_layout, char trans, char equed,
+lapack_int API_SUFFIX(LAPACKE_cgerfsx)( int matrix_layout, char trans, char equed,
                             lapack_int n, lapack_int nrhs,
                             const lapack_complex_float* a, lapack_int lda,
                             const lapack_complex_float* af, lapack_int ldaf,
@@ -48,37 +48,37 @@ lapack_int LAPACKE_cgerfsx( int matrix_layout, char trans, char equed,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgerfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerfsx", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, af, ldaf ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
-        if( LAPACKE_lsame( equed, 'b' ) || LAPACKE_lsame( equed, 'c' ) ) {
-            if( LAPACKE_s_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'b' ) || API_SUFFIX(LAPACKE_lsame)( equed, 'c' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, c, 1 ) ) {
                 return -12;
             }
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -23;
             }
         }
-        if( LAPACKE_lsame( equed, 'b' ) || LAPACKE_lsame( equed, 'r' ) ) {
-            if( LAPACKE_s_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'b' ) || API_SUFFIX(LAPACKE_lsame)( equed, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, r, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -15;
         }
     }
@@ -96,7 +96,7 @@ lapack_int LAPACKE_cgerfsx( int matrix_layout, char trans, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgerfsx_work( matrix_layout, trans, equed, n, nrhs, a, lda,
+    info = API_SUFFIX(LAPACKE_cgerfsx_work)( matrix_layout, trans, equed, n, nrhs, a, lda,
                                  af, ldaf, ipiv, r, c, b, ldb, x, ldx, rcond,
                                  berr, n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, rwork );
@@ -106,7 +106,7 @@ lapack_int LAPACKE_cgerfsx( int matrix_layout, char trans, char equed,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgerfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgerfsx_work.c b/LAPACKE/src/lapacke_cgerfsx_work.c
index 0277d77ed7..2e905e43a4 100644
--- a/LAPACKE/src/lapacke_cgerfsx_work.c
+++ b/LAPACKE/src/lapacke_cgerfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgerfsx_work( int matrix_layout, char trans, char equed,
+lapack_int API_SUFFIX(LAPACKE_cgerfsx_work)( int matrix_layout, char trans, char equed,
                                  lapack_int n, lapack_int nrhs,
                                  const lapack_complex_float* a, lapack_int lda,
                                  const lapack_complex_float* af,
@@ -70,22 +70,22 @@ lapack_int LAPACKE_cgerfsx_work( int matrix_layout, char trans, char equed,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerfsx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_cgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_cgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -128,10 +128,10 @@ lapack_int LAPACKE_cgerfsx_work( int matrix_layout, char trans, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgerfsx( &trans, &equed, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, r, c, b_t, &ldb_t, x_t, &ldx_t, rcond, berr,
@@ -141,10 +141,10 @@ lapack_int LAPACKE_cgerfsx_work( int matrix_layout, char trans, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -160,11 +160,11 @@ lapack_int LAPACKE_cgerfsx_work( int matrix_layout, char trans, char equed,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgerfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgerqf.c b/LAPACKE/src/lapacke_cgerqf.c
index 03492c96da..b1f62b3051 100644
--- a/LAPACKE/src/lapacke_cgerqf.c
+++ b/LAPACKE/src/lapacke_cgerqf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgerqf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgerqf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_cgerqf( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgerqf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerqf", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgerqf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_cgerqf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,12 +67,12 @@ lapack_int LAPACKE_cgerqf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgerqf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_cgerqf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgerqf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerqf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgerqf_work.c b/LAPACKE/src/lapacke_cgerqf_work.c
index 1f00b43a5a..f475de1793 100644
--- a/LAPACKE/src/lapacke_cgerqf_work.c
+++ b/LAPACKE/src/lapacke_cgerqf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgerqf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgerqf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* tau,
                                 lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cgerqf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgerqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerqf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_cgerqf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgerqf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgerqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerqf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgerqf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgerqf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgesdd.c b/LAPACKE/src/lapacke_cgesdd.c
index d28139aabc..928d75ce19 100644
--- a/LAPACKE/src/lapacke_cgesdd.c
+++ b/LAPACKE/src/lapacke_cgesdd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgesdd( int matrix_layout, char jobz, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_cgesdd)( int matrix_layout, char jobz, 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* vt,
@@ -47,19 +47,19 @@ lapack_int LAPACKE_cgesdd( int matrix_layout, char jobz, lapack_int m,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgesdd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesdd", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( jobz, 'n' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( jobz, 'n' ) ) {
         lrwork = MAX(1,7*MIN(m,n));
     } else {
         lrwork = (size_t)MAX(1,MIN(m,n)*MAX(5*MIN(m,n)+7,2*MAX(m,n)+2*MIN(m,n)+1));
@@ -77,7 +77,7 @@ lapack_int LAPACKE_cgesdd( int matrix_layout, char jobz, lapack_int m,
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgesdd_work( matrix_layout, jobz, m, n, a, lda, s, u, ldu, vt,
+    info = API_SUFFIX(LAPACKE_cgesdd_work)( matrix_layout, jobz, m, n, a, lda, s, u, ldu, vt,
                                 ldvt, &work_query, lwork, rwork, iwork );
     if( info != 0 ) {
         goto exit_level_2;
@@ -91,7 +91,7 @@ lapack_int LAPACKE_cgesdd( int matrix_layout, char jobz, lapack_int m,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgesdd_work( matrix_layout, jobz, m, n, a, lda, s, u, ldu, vt,
+    info = API_SUFFIX(LAPACKE_cgesdd_work)( matrix_layout, jobz, m, n, a, lda, s, u, ldu, vt,
                                 ldvt, work, lwork, rwork, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -101,7 +101,7 @@ lapack_int LAPACKE_cgesdd( int matrix_layout, char jobz, lapack_int m,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgesdd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesdd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgesdd_work.c b/LAPACKE/src/lapacke_cgesdd_work.c
index 70198ccdce..cd162cd869 100644
--- a/LAPACKE/src/lapacke_cgesdd_work.c
+++ b/LAPACKE/src/lapacke_cgesdd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgesdd_work( int matrix_layout, char jobz, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_cgesdd_work)( int matrix_layout, char jobz, lapack_int m,
                                 lapack_int n, lapack_complex_float* a,
                                 lapack_int lda, float* s,
                                 lapack_complex_float* u, lapack_int ldu,
@@ -49,15 +49,18 @@ lapack_int LAPACKE_cgesdd_work( int matrix_layout, char jobz, lapack_int m,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_u = ( LAPACKE_lsame( jobz, 'a' ) ||
-                             LAPACKE_lsame( jobz, 's' ) ||
-                             ( LAPACKE_lsame( jobz, 'o' ) && m<n) ) ? m : 1;
-        lapack_int ncols_u = ( LAPACKE_lsame( jobz, 'a' ) ||
-                             ( LAPACKE_lsame( jobz, 'o' ) && m<n) ) ? m :
-                             ( LAPACKE_lsame( jobz, 's' ) ? MIN(m,n) : 1);
-        lapack_int nrows_vt = ( LAPACKE_lsame( jobz, 'a' ) ||
-                              ( LAPACKE_lsame( jobz, 'o' ) && m>=n) ) ? n :
-                              ( LAPACKE_lsame( jobz, 's' ) ? MIN(m,n) : 1);
+        lapack_int nrows_u = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+                             ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && m<n) ) ? m : 1;
+        lapack_int ncols_u = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) ||
+                             ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && m<n) ) ? m :
+                             ( API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ? MIN(m,n) : 1);
+        lapack_int nrows_vt = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) ||
+                              ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && m>=n) ) ? n :
+                              ( API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ? MIN(m,n) : 1);
+        lapack_int ncols_vt = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) ||
+                              API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+                              ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && m>=n) ) ? n : 1;
         lapack_int lda_t = MAX(1,m);
         lapack_int ldu_t = MAX(1,nrows_u);
         lapack_int ldvt_t = MAX(1,nrows_vt);
@@ -67,17 +70,17 @@ lapack_int LAPACKE_cgesdd_work( int matrix_layout, char jobz, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cgesdd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesdd_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cgesdd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesdd_work", info );
             return info;
         }
-        if( ldvt < n ) {
+        if( ldvt < ncols_vt ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cgesdd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesdd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -93,8 +96,8 @@ lapack_int LAPACKE_cgesdd_work( int matrix_layout, char jobz, lapack_int m,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m<n) ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m<n) ) ) {
             u_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldu_t * MAX(1,ncols_u) );
@@ -103,8 +106,8 @@ lapack_int LAPACKE_cgesdd_work( int matrix_layout, char jobz, lapack_int m,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m>=n) ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m>=n) ) ) {
             vt_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvt_t * MAX(1,n) );
@@ -114,7 +117,7 @@ lapack_int LAPACKE_cgesdd_work( int matrix_layout, char jobz, lapack_int m,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgesdd( &jobz, &m, &n, a_t, &lda_t, s, u_t, &ldu_t, vt_t,
                        &ldvt_t, work, &lwork, rwork, iwork, &info );
@@ -122,36 +125,36 @@ lapack_int LAPACKE_cgesdd_work( int matrix_layout, char jobz, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m<n) ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m<n) ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
                                u, ldu );
         }
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m>=n) ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m>=n) ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
                                ldvt );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m>=n) ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m>=n) ) ) {
             LAPACKE_free( vt_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m<n) ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m<n) ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgesdd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesdd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgesdd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesdd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgesv.c b/LAPACKE/src/lapacke_cgesv.c
index 1e9871ccbd..8a5796ac7f 100644
--- a/LAPACKE/src/lapacke_cgesv.c
+++ b/LAPACKE/src/lapacke_cgesv.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgesv( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_cgesv)( int matrix_layout, lapack_int n, lapack_int nrhs,
                           lapack_complex_float* a, lapack_int lda,
                           lapack_int* ipiv, lapack_complex_float* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgesv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesv", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_cgesv_work( matrix_layout, n, nrhs, a, lda, ipiv, b, ldb );
+    return API_SUFFIX(LAPACKE_cgesv_work)( matrix_layout, n, nrhs, a, lda, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_cgesv_work.c b/LAPACKE/src/lapacke_cgesv_work.c
index 53b6d2cc55..1a0e720841 100644
--- a/LAPACKE/src/lapacke_cgesv_work.c
+++ b/LAPACKE/src/lapacke_cgesv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_cgesv_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                lapack_complex_float* a, lapack_int lda,
                                lapack_int* ipiv, lapack_complex_float* b,
                                lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_cgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,27 +75,27 @@ lapack_int LAPACKE_cgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgesv( &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgesv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgesvd.c b/LAPACKE/src/lapacke_cgesvd.c
index 85a15fd4c5..a35cf5cf1f 100644
--- a/LAPACKE/src/lapacke_cgesvd.c
+++ b/LAPACKE/src/lapacke_cgesvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgesvd( int matrix_layout, char jobu, char jobvt,
+lapack_int API_SUFFIX(LAPACKE_cgesvd)( int matrix_layout, char jobu, char jobvt,
                            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* vt,
@@ -45,13 +45,13 @@ lapack_int LAPACKE_cgesvd( int matrix_layout, char jobu, char jobvt,
     lapack_complex_float work_query;
     lapack_int i;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgesvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvd", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
     }
@@ -63,7 +63,7 @@ lapack_int LAPACKE_cgesvd( int matrix_layout, char jobu, char jobvt,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgesvd_work( matrix_layout, jobu, jobvt, m, n, a, lda, s, u,
+    info = API_SUFFIX(LAPACKE_cgesvd_work)( matrix_layout, jobu, jobvt, m, n, a, lda, s, u,
                                 ldu, vt, ldvt, &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -77,7 +77,7 @@ lapack_int LAPACKE_cgesvd( int matrix_layout, char jobu, char jobvt,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgesvd_work( matrix_layout, jobu, jobvt, m, n, a, lda, s, u,
+    info = API_SUFFIX(LAPACKE_cgesvd_work)( matrix_layout, jobu, jobvt, m, n, a, lda, s, u,
                                 ldu, vt, ldvt, work, lwork, rwork );
     /* Backup significant data from working array(s) */
     for( i=0; i<MIN(m,n)-1; i++ ) {
@@ -89,7 +89,7 @@ lapack_int LAPACKE_cgesvd( int matrix_layout, char jobu, char jobvt,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgesvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgesvd_work.c b/LAPACKE/src/lapacke_cgesvd_work.c
index 6bc69d48f0..5045150ff5 100644
--- a/LAPACKE/src/lapacke_cgesvd_work.c
+++ b/LAPACKE/src/lapacke_cgesvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgesvd_work( int matrix_layout, char jobu, char jobvt,
+lapack_int API_SUFFIX(LAPACKE_cgesvd_work)( int matrix_layout, char jobu, char jobvt,
                                 lapack_int m, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 float* s, lapack_complex_float* u,
@@ -49,14 +49,14 @@ lapack_int LAPACKE_cgesvd_work( int matrix_layout, char jobu, char jobvt,
             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_vt = LAPACKE_lsame( jobvt, 'a' ) ? n :
-                              ( LAPACKE_lsame( jobvt, 's' ) ? MIN(m,n) : 1);
-        lapack_int ncols_vt = ( LAPACKE_lsame( jobvt, 'a' ) ||
-                               LAPACKE_lsame( jobvt, 's' ) ) ? n : 1;
+        lapack_int nrows_u = ( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) ? m : 1;
+        lapack_int ncols_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) ? m :
+                             ( API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ? MIN(m,n) : 1);
+        lapack_int nrows_vt = API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) ? n :
+                              ( API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ? MIN(m,n) : 1);
+        lapack_int ncols_vt = ( API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) ||
+                               API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ) ? n : 1;
         lapack_int lda_t = MAX(1,m);
         lapack_int ldu_t = MAX(1,nrows_u);
         lapack_int ldvt_t = MAX(1,nrows_vt);
@@ -66,17 +66,17 @@ lapack_int LAPACKE_cgesvd_work( int matrix_layout, char jobu, char jobvt,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cgesvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvd_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cgesvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvd_work", info );
             return info;
         }
         if( ldvt < ncols_vt ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_cgesvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -92,7 +92,7 @@ lapack_int LAPACKE_cgesvd_work( int matrix_layout, char jobu, char jobvt,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) {
             u_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldu_t * MAX(1,ncols_u) );
@@ -101,7 +101,7 @@ lapack_int LAPACKE_cgesvd_work( int matrix_layout, char jobu, char jobvt,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobvt, 'a' ) || LAPACKE_lsame( jobvt, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ) {
             vt_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvt_t * MAX(1,n) );
@@ -111,7 +111,7 @@ lapack_int LAPACKE_cgesvd_work( int matrix_layout, char jobu, char jobvt,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgesvd( &jobu, &jobvt, &m, &n, a_t, &lda_t, s, u_t, &ldu_t, vt_t,
                        &ldvt_t, work, &lwork, rwork, &info );
@@ -119,32 +119,32 @@ lapack_int LAPACKE_cgesvd_work( int matrix_layout, char jobu, char jobvt,
             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,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
                                u, ldu );
         }
-        if( LAPACKE_lsame( jobvt, 'a' ) || LAPACKE_lsame( jobvt, 's' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
                                ldvt );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvt, 'a' ) || LAPACKE_lsame( jobvt, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ) {
             LAPACKE_free( vt_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(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_cgesvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgesvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgesvdq.c b/LAPACKE/src/lapacke_cgesvdq.c
index 8406635e99..eda40f88be 100644
--- a/LAPACKE/src/lapacke_cgesvdq.c
+++ b/LAPACKE/src/lapacke_cgesvdq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgesvdq( int matrix_layout, char joba, char jobp,
+lapack_int API_SUFFIX(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,
@@ -48,21 +48,20 @@ lapack_int LAPACKE_cgesvdq( int matrix_layout, char joba, char jobp,
     lapack_int lrwork = -1;
     float* rwork = NULL;
     float rwork_query;
-    lapack_int i;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgesvdq", -1 );
+        API_SUFFIX(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 ) ) {
+        if( API_SUFFIX(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,
+    info = API_SUFFIX(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 );
@@ -89,7 +88,7 @@ lapack_int LAPACKE_cgesvdq( int matrix_layout, char joba, char jobp,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgesvdq_work( matrix_layout, joba, jobp, jobr, jobu, jobv,
+    info = API_SUFFIX(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 );
 
@@ -99,7 +98,7 @@ lapack_int LAPACKE_cgesvdq( int matrix_layout, char joba, char jobp,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgesvdq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvdq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgesvdq_work.c b/LAPACKE/src/lapacke_cgesvdq_work.c
index e73e524bd6..b063099807 100644
--- a/LAPACKE/src/lapacke_cgesvdq_work.c
+++ b/LAPACKE/src/lapacke_cgesvdq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgesvdq_work( int matrix_layout, char joba, char jobp,
+lapack_int API_SUFFIX(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,
@@ -50,12 +50,12 @@ lapack_int LAPACKE_cgesvdq_work( int matrix_layout, char joba, char jobp,
             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 nrows_u = ( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) ? m : 1;
+        lapack_int ncols_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) ? m :
+                             (API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ? MIN(m,n) : 1);
+        lapack_int nrows_v = API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) ? n :
+                              ( API_SUFFIX(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);
@@ -65,17 +65,17 @@ lapack_int LAPACKE_cgesvdq_work( int matrix_layout, char joba, char jobp,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cgesvdq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvdq_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_cgesvdq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvdq_work", info );
             return info;
         }
         if( ldv < n ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_cgesvdq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvdq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -91,7 +91,7 @@ lapack_int LAPACKE_cgesvdq_work( int matrix_layout, char joba, char jobp,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(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 ) {
@@ -99,7 +99,7 @@ lapack_int LAPACKE_cgesvdq_work( int matrix_layout, char joba, char jobp,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 's' ) ) {
             v_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) * ldv_t * MAX(1,n) );
             if( v_t == NULL ) {
@@ -108,7 +108,7 @@ lapack_int LAPACKE_cgesvdq_work( int matrix_layout, char joba, char jobp,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(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,
@@ -117,32 +117,32 @@ lapack_int LAPACKE_cgesvdq_work( int matrix_layout, char joba, char jobp,
             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,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) {
+            API_SUFFIX(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,
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 's' ) ) {
+            API_SUFFIX(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' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 's' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(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 );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvdq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgesvdq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvdq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgesvdx.c b/LAPACKE/src/lapacke_cgesvdx.c
index de47ad4ce6..c0fcf3462f 100644
--- a/LAPACKE/src/lapacke_cgesvdx.c
+++ b/LAPACKE/src/lapacke_cgesvdx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgesvdx( int matrix_layout, char jobu, char jobvt, char range,
+lapack_int API_SUFFIX(LAPACKE_cgesvdx)( int matrix_layout, char jobu, char jobvt, char range,
                            lapack_int m, lapack_int n, lapack_complex_float* a,
                            lapack_int lda, float vl, float vu,
                            lapack_int il, lapack_int iu, lapack_int* ns,
@@ -49,19 +49,19 @@ lapack_int LAPACKE_cgesvdx( int matrix_layout, char jobu, char jobvt, char range
     lapack_int* iwork = NULL;
     lapack_int i;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgesvdx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvdx", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgesvdx_work( matrix_layout, jobu, jobvt, range,
+    info = API_SUFFIX(LAPACKE_cgesvdx_work)( matrix_layout, jobu, jobvt, range,
                                  m, n, a, lda, vl, vu, il, iu, ns, s, u,
                                  ldu, vt, ldvt, &work_query, lwork, rwork, iwork );
     if( info != 0 ) {
@@ -86,7 +86,7 @@ lapack_int LAPACKE_cgesvdx( int matrix_layout, char jobu, char jobvt, char range
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgesvdx_work( matrix_layout, jobu, jobvt,  range,
+    info = API_SUFFIX(LAPACKE_cgesvdx_work)( matrix_layout, jobu, jobvt,  range,
                                  m, n, a, lda, vl, vu, il, iu, ns, s, u,
                                  ldu, vt, ldvt, work, lwork, rwork, iwork );
     /* Backup significant data from working array(s) */
@@ -101,7 +101,7 @@ lapack_int LAPACKE_cgesvdx( int matrix_layout, char jobu, char jobvt, char range
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgesvdx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvdx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgesvdx_work.c b/LAPACKE/src/lapacke_cgesvdx_work.c
index 950c6f3271..ec2ad9cd1f 100644
--- a/LAPACKE/src/lapacke_cgesvdx_work.c
+++ b/LAPACKE/src/lapacke_cgesvdx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgesvdx_work( int matrix_layout, char jobu, char jobvt, char range,
+lapack_int API_SUFFIX(LAPACKE_cgesvdx_work)( int matrix_layout, char jobu, char jobvt, char range,
                                  lapack_int m, lapack_int n, lapack_complex_float* a,
                                  lapack_int lda, float vl, float vu,
                                  lapack_int il, lapack_int iu, lapack_int* ns,
@@ -51,12 +51,12 @@ lapack_int LAPACKE_cgesvdx_work( int matrix_layout, char jobu, char jobvt, char
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_u = LAPACKE_lsame( jobu, 'v' ) ? m : 0;
-        lapack_int ncols_u = LAPACKE_lsame( jobu, 'v' ) ?
-                             ( LAPACKE_lsame( range, 'i' ) ? MAX(iu - il + 1, 0) : MIN(m,n)) : 0;
-        lapack_int nrows_vt = LAPACKE_lsame( jobvt, 'v' ) ?
-                             ( LAPACKE_lsame( range, 'i' ) ? MAX(iu - il + 1, 0) : MIN(m,n)) : 0;
-        lapack_int ncols_vt = LAPACKE_lsame( jobvt, 'v' ) ? n : 0;
+        lapack_int nrows_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ? m : 0;
+        lapack_int ncols_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ?
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? MAX(iu - il + 1, 0) : MIN(m,n)) : 0;
+        lapack_int nrows_vt = API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ?
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? MAX(iu - il + 1, 0) : MIN(m,n)) : 0;
+        lapack_int ncols_vt = API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ? n : 0;
 
         lapack_int lda_t = MAX(1,m);
         lapack_int ldu_t = MAX(1,nrows_u);
@@ -68,17 +68,17 @@ lapack_int LAPACKE_cgesvdx_work( int matrix_layout, char jobu, char jobvt, char
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgesvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvdx_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_cgesvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvdx_work", info );
             return info;
         }
         if( ldvt < ncols_vt ) {
             info = -18;
-            LAPACKE_xerbla( "LAPACKE_cgesvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvdx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -95,7 +95,7 @@ lapack_int LAPACKE_cgesvdx_work( int matrix_layout, char jobu, char jobvt, char
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobu, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ) {
             u_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) * ldu_t * MAX(1,ncols_u) );
             if( u_t == NULL ) {
@@ -103,7 +103,7 @@ lapack_int LAPACKE_cgesvdx_work( int matrix_layout, char jobu, char jobvt, char
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobvt, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ) {
             vt_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) * ldvt_t * MAX(1,n) );
             if( vt_t == NULL ) {
@@ -112,7 +112,7 @@ lapack_int LAPACKE_cgesvdx_work( int matrix_layout, char jobu, char jobvt, char
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgesvdx( &jobu, &jobvt, &range, &m, &n, a_t, &lda_t, &vl, &vu,
                         &il, &iu, ns, s, u_t, &ldu_t, vt_t,
@@ -121,32 +121,32 @@ lapack_int LAPACKE_cgesvdx_work( int matrix_layout, char jobu, char jobvt, char
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobu, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
                                u, ldu );
         }
-        if( LAPACKE_lsame( jobvt, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
                                ldvt );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvt, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ) {
             LAPACKE_free( vt_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobu, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgesvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvdx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgesvdx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvdx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgesvj.c b/LAPACKE/src/lapacke_cgesvj.c
index 9ce9e84058..ac314e62ae 100644
--- a/LAPACKE/src/lapacke_cgesvj.c
+++ b/LAPACKE/src/lapacke_cgesvj.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgesvj( int matrix_layout, char joba, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_cgesvj)( int matrix_layout, char joba, char jobu, char jobv,
                            lapack_int m, lapack_int n,
                            lapack_complex_float * a, lapack_int lda,
                            float* sva, lapack_int mv,
@@ -46,19 +46,19 @@ lapack_int LAPACKE_cgesvj( int matrix_layout, char joba, char jobu, char jobv,
     lapack_int i;
     lapack_int nrows_v;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgesvj", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvj", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        nrows_v = LAPACKE_lsame( jobv, 'v' ) ? MAX(0,n) :
-                ( LAPACKE_lsame( jobv, 'a' ) ? MAX(0,mv) : 0);
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ? MAX(0,n) :
+                ( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) ? MAX(0,mv) : 0);
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 'v' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, nrows_v, n, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, nrows_v, n, v, ldv ) ) {
                 return -11;
             }
         }
@@ -78,7 +78,7 @@ lapack_int LAPACKE_cgesvj( int matrix_layout, char joba, char jobu, char jobv,
     }
     rwork[0] = stat[0];  /* Significant if jobu = 'c' */
     /* Call middle-level interface */
-    info = LAPACKE_cgesvj_work( matrix_layout, joba, jobu, jobv, m, n, a, lda,
+    info = API_SUFFIX(LAPACKE_cgesvj_work)( matrix_layout, joba, jobu, jobv, m, n, a, lda,
                                 sva, mv, v, ldv, cwork, lwork, rwork, lrwork );
     /* Backup significant data from working array(s) */
     for( i=0; i<6; i++ ) {
@@ -91,7 +91,7 @@ lapack_int LAPACKE_cgesvj( int matrix_layout, char joba, char jobu, char jobv,
     LAPACKE_free( cwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgesvj", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvj", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgesvj_work.c b/LAPACKE/src/lapacke_cgesvj_work.c
index 34ee42bfbb..979e6aeea8 100644
--- a/LAPACKE/src/lapacke_cgesvj_work.c
+++ b/LAPACKE/src/lapacke_cgesvj_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgesvj_work( int matrix_layout, char joba, char jobu,
+lapack_int API_SUFFIX(LAPACKE_cgesvj_work)( int matrix_layout, char joba, char jobu,
                                 char jobv, lapack_int m, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 float* sva, lapack_int mv,
@@ -49,8 +49,8 @@ lapack_int LAPACKE_cgesvj_work( int matrix_layout, char joba, char jobu,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_v = LAPACKE_lsame( jobv, 'v' ) ? MAX(0,n) :
-                           ( LAPACKE_lsame( jobv, 'a' ) ? MAX(0,mv) : 0);
+        lapack_int nrows_v = API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ? MAX(0,n) :
+                           ( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) ? MAX(0,mv) : 0);
         lapack_int lda_t = MAX(1,m);
         lapack_int ldv_t = MAX(1,nrows_v);
         lapack_complex_float* a_t = NULL;
@@ -58,12 +58,12 @@ lapack_int LAPACKE_cgesvj_work( int matrix_layout, char joba, char jobu,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgesvj_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvj_work", info );
             return info;
         }
         if( ldv < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_cgesvj_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvj_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -73,7 +73,7 @@ lapack_int LAPACKE_cgesvj_work( int matrix_layout, char joba, char jobu,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) * ldv_t * MAX(1,n) );
             if( v_t == NULL ) {
@@ -82,9 +82,9 @@ lapack_int LAPACKE_cgesvj_work( int matrix_layout, char joba, char jobu,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( jobv, 'a' ) ) {
-            LAPACKE_cge_trans( matrix_layout, nrows_v, n, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, nrows_v, n, v, ldv, v_t, ldv_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_cgesvj( &joba, &jobu, &jobv, &m, &n, a_t, &lda_t, sva, &mv, v_t,
@@ -93,24 +93,24 @@ lapack_int LAPACKE_cgesvj_work( int matrix_layout, char joba, char jobu,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_v, n, v_t, ldv_t, v,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(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, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgesvj_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvj_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgesvj_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvj_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgesvx.c b/LAPACKE/src/lapacke_cgesvx.c
index 70fc1a183e..2425f48c39 100644
--- a/LAPACKE/src/lapacke_cgesvx.c
+++ b/LAPACKE/src/lapacke_cgesvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgesvx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_cgesvx)( int matrix_layout, char fact, char trans,
                            lapack_int n, lapack_int nrhs,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* af, lapack_int ldaf,
@@ -46,32 +46,32 @@ lapack_int LAPACKE_cgesvx( int matrix_layout, char fact, char trans,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgesvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvx", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -14;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) ) ) {
-            if( LAPACKE_s_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, c, 1 ) ) {
                 return -13;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'r' ) ) ) {
-            if( LAPACKE_s_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, r, 1 ) ) {
                 return -12;
             }
         }
@@ -90,7 +90,7 @@ lapack_int LAPACKE_cgesvx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgesvx_work( matrix_layout, fact, trans, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_cgesvx_work)( matrix_layout, fact, trans, n, nrhs, a, lda, af,
                                 ldaf, ipiv, equed, r, c, b, ldb, x, ldx, rcond,
                                 ferr, berr, work, rwork );
     /* Backup significant data from working array(s) */
@@ -101,7 +101,7 @@ lapack_int LAPACKE_cgesvx( int matrix_layout, char fact, char trans,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgesvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgesvx_work.c b/LAPACKE/src/lapacke_cgesvx_work.c
index 8136e2c3a4..8672448bbd 100644
--- a/LAPACKE/src/lapacke_cgesvx_work.c
+++ b/LAPACKE/src/lapacke_cgesvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgesvx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_cgesvx_work)( int matrix_layout, char fact, char trans,
                                 lapack_int n, lapack_int nrhs,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* af, lapack_int ldaf,
@@ -64,22 +64,22 @@ lapack_int LAPACKE_cgesvx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_cgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_cgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -110,11 +110,11 @@ lapack_int LAPACKE_cgesvx_work( int matrix_layout, char fact, char trans,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgesvx( &fact, &trans, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                        ipiv, equed, r, c, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr,
@@ -123,18 +123,18 @@ lapack_int LAPACKE_cgesvx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, af_t, ldaf_t, af, ldaf );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, af_t, ldaf_t, af, ldaf );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -145,11 +145,11 @@ lapack_int LAPACKE_cgesvx_work( int matrix_layout, char fact, char trans,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgesvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgesvxx.c b/LAPACKE/src/lapacke_cgesvxx.c
index 8098462173..a7893224e7 100644
--- a/LAPACKE/src/lapacke_cgesvxx.c
+++ b/LAPACKE/src/lapacke_cgesvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgesvxx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_cgesvxx)( int matrix_layout, char fact, char trans,
                             lapack_int n, lapack_int nrhs,
                             lapack_complex_float* a, lapack_int lda,
                             lapack_complex_float* af, lapack_int ldaf,
@@ -48,37 +48,37 @@ lapack_int LAPACKE_cgesvxx( int matrix_layout, char fact, char trans,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgesvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvxx", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -14;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) ) ) {
-            if( LAPACKE_s_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, c, 1 ) ) {
                 return -13;
             }
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -25;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'r' ) ) ) {
-            if( LAPACKE_s_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, r, 1 ) ) {
                 return -12;
             }
         }
@@ -97,7 +97,7 @@ lapack_int LAPACKE_cgesvxx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgesvxx_work( matrix_layout, fact, trans, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_cgesvxx_work)( matrix_layout, fact, trans, n, nrhs, a, lda, af,
                                  ldaf, ipiv, equed, r, c, b, ldb, x, ldx, rcond,
                                  rpvgrw, berr, n_err_bnds, err_bnds_norm,
                                  err_bnds_comp, nparams, params, work, rwork );
@@ -107,7 +107,7 @@ lapack_int LAPACKE_cgesvxx( int matrix_layout, char fact, char trans,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgesvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgesvxx_work.c b/LAPACKE/src/lapacke_cgesvxx_work.c
index f192d2a526..50f4b5873b 100644
--- a/LAPACKE/src/lapacke_cgesvxx_work.c
+++ b/LAPACKE/src/lapacke_cgesvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgesvxx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_cgesvxx_work)( int matrix_layout, char fact, char trans,
                                  lapack_int n, lapack_int nrhs,
                                  lapack_complex_float* a, lapack_int lda,
                                  lapack_complex_float* af, lapack_int ldaf,
@@ -69,22 +69,22 @@ lapack_int LAPACKE_cgesvxx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvxx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_cgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_cgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -127,11 +127,11 @@ lapack_int LAPACKE_cgesvxx_work( int matrix_layout, char fact, char trans,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgesvxx( &fact, &trans, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, equed, r, c, b_t, &ldb_t, x_t, &ldx_t, rcond,
@@ -141,21 +141,21 @@ lapack_int LAPACKE_cgesvxx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, af_t, ldaf_t, af, ldaf );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, af_t, ldaf_t, af, ldaf );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -171,11 +171,11 @@ lapack_int LAPACKE_cgesvxx_work( int matrix_layout, char fact, char trans,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgesvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgesvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgetf2.c b/LAPACKE/src/lapacke_cgetf2.c
index eba00c30d0..8b6bda87c4 100644
--- a/LAPACKE/src/lapacke_cgetf2.c
+++ b/LAPACKE/src/lapacke_cgetf2.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgetf2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgetf2)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgetf2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetf2", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_cgetf2_work( matrix_layout, m, n, a, lda, ipiv );
+    return API_SUFFIX(LAPACKE_cgetf2_work)( matrix_layout, m, n, a, lda, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_cgetf2_work.c b/LAPACKE/src/lapacke_cgetf2_work.c
index 1eb26d1fa2..53643cd7c3 100644
--- a/LAPACKE/src/lapacke_cgetf2_work.c
+++ b/LAPACKE/src/lapacke_cgetf2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgetf2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgetf2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_int* ipiv )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_cgetf2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgetf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetf2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,23 +60,23 @@ lapack_int LAPACKE_cgetf2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgetf2( &m, &n, a_t, &lda_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgetf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetf2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgetf2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetf2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgetrf.c b/LAPACKE/src/lapacke_cgetrf.c
index 90b17b24dd..7327482dad 100644
--- a/LAPACKE/src/lapacke_cgetrf.c
+++ b/LAPACKE/src/lapacke_cgetrf.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgetrf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgetrf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgetrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetrf", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_cgetrf_work( matrix_layout, m, n, a, lda, ipiv );
+    return API_SUFFIX(LAPACKE_cgetrf_work)( matrix_layout, m, n, a, lda, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_cgetrf2.c b/LAPACKE/src/lapacke_cgetrf2.c
index 7d335fac1e..0089c7f885 100644
--- a/LAPACKE/src/lapacke_cgetrf2.c
+++ b/LAPACKE/src/lapacke_cgetrf2.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgetrf2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgetrf2)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgetrf2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetrf2", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_cgetrf2_work( matrix_layout, m, n, a, lda, ipiv );
+    return API_SUFFIX(LAPACKE_cgetrf2_work)( matrix_layout, m, n, a, lda, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_cgetrf2_work.c b/LAPACKE/src/lapacke_cgetrf2_work.c
index b93a4056c7..2586244a3e 100644
--- a/LAPACKE/src/lapacke_cgetrf2_work.c
+++ b/LAPACKE/src/lapacke_cgetrf2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgetrf2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgetrf2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_int* ipiv )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_cgetrf2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgetrf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetrf2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,23 +60,23 @@ lapack_int LAPACKE_cgetrf2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgetrf2( &m, &n, a_t, &lda_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgetrf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetrf2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgetrf2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetrf2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgetrf_work.c b/LAPACKE/src/lapacke_cgetrf_work.c
index cc4d90096d..32b8751acc 100644
--- a/LAPACKE/src/lapacke_cgetrf_work.c
+++ b/LAPACKE/src/lapacke_cgetrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgetrf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgetrf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_int* ipiv )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_cgetrf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cgetrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,23 +60,23 @@ lapack_int LAPACKE_cgetrf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgetrf( &m, &n, a_t, &lda_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgetrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgetrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgetri.c b/LAPACKE/src/lapacke_cgetri.c
index 2e25e863e2..67b49fd1ef 100644
--- a/LAPACKE/src/lapacke_cgetri.c
+++ b/LAPACKE/src/lapacke_cgetri.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgetri( int matrix_layout, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgetri)( int matrix_layout, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            const lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_cgetri( int matrix_layout, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgetri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetri", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -3;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgetri_work( matrix_layout, n, a, lda, ipiv, &work_query,
+    info = API_SUFFIX(LAPACKE_cgetri_work)( matrix_layout, n, a, lda, ipiv, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,12 +67,12 @@ lapack_int LAPACKE_cgetri( int matrix_layout, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgetri_work( matrix_layout, n, a, lda, ipiv, work, lwork );
+    info = API_SUFFIX(LAPACKE_cgetri_work)( matrix_layout, n, a, lda, ipiv, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgetri", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetri", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgetri_work.c b/LAPACKE/src/lapacke_cgetri_work.c
index 1a1d7b23bd..d053dfee70 100644
--- a/LAPACKE/src/lapacke_cgetri_work.c
+++ b/LAPACKE/src/lapacke_cgetri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgetri_work( int matrix_layout, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgetri_work)( int matrix_layout, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 const lapack_int* ipiv,
                                 lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cgetri_work( int matrix_layout, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -4;
-            LAPACKE_xerbla( "LAPACKE_cgetri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetri_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_cgetri_work( int matrix_layout, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgetri( &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgetri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgetri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgetrs.c b/LAPACKE/src/lapacke_cgetrs.c
index 192e1497a9..f33b2dfcb1 100644
--- a/LAPACKE/src/lapacke_cgetrs.c
+++ b/LAPACKE/src/lapacke_cgetrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgetrs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgetrs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* a,
                            lapack_int lda, const lapack_int* ipiv,
                            lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgetrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetrs", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_cgetrs_work( matrix_layout, trans, n, nrhs, a, lda, ipiv, b,
+    return API_SUFFIX(LAPACKE_cgetrs_work)( matrix_layout, trans, n, nrhs, a, lda, ipiv, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_cgetrs_work.c b/LAPACKE/src/lapacke_cgetrs_work.c
index 47783ed62d..a8d317d062 100644
--- a/LAPACKE/src/lapacke_cgetrs_work.c
+++ b/LAPACKE/src/lapacke_cgetrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgetrs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgetrs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* a,
                                 lapack_int lda, const lapack_int* ipiv,
                                 lapack_complex_float* b, lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_cgetrs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cgetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cgetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,8 +75,8 @@ lapack_int LAPACKE_cgetrs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgetrs( &trans, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                        &info );
@@ -84,18 +84,18 @@ lapack_int LAPACKE_cgetrs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgetrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgetsls.c b/LAPACKE/src/lapacke_cgetsls.c
index ed6c5ad51b..82521c16de 100644
--- a/LAPACKE/src/lapacke_cgetsls.c
+++ b/LAPACKE/src/lapacke_cgetsls.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgetsls( int matrix_layout, char trans, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_cgetsls)( int matrix_layout, char trans, lapack_int m,
                           lapack_int n, lapack_int nrhs,
                           lapack_complex_float* a, lapack_int lda,
                           lapack_complex_float* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_cgetsls( int matrix_layout, char trans, lapack_int m,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgetsls", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetsls", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgetsls_work( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_cgetsls_work)( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
                                &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_cgetsls( int matrix_layout, char trans, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgetsls_work( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_cgetsls_work)( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
                                work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgetsls", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetsls", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgetsls_work.c b/LAPACKE/src/lapacke_cgetsls_work.c
index 0e68339443..83b2c6ce4a 100644
--- a/LAPACKE/src/lapacke_cgetsls_work.c
+++ b/LAPACKE/src/lapacke_cgetsls_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgetsls_work( int matrix_layout, char trans, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_cgetsls_work)( int matrix_layout, char trans, lapack_int m,
                                lapack_int n, lapack_int nrhs,
                                lapack_complex_float* a, lapack_int lda,
                                lapack_complex_float* b, lapack_int ldb,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_cgetsls_work( int matrix_layout, char trans, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cgetsls_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetsls_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cgetsls_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetsls_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_cgetsls_work( int matrix_layout, char trans, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgetsls( &trans, &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -92,8 +92,8 @@ lapack_int LAPACKE_cgetsls_work( int matrix_layout, char trans, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -101,11 +101,11 @@ lapack_int LAPACKE_cgetsls_work( int matrix_layout, char trans, lapack_int m,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgetsls_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetsls_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgetsls_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetsls_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgetsqrhrt.c b/LAPACKE/src/lapacke_cgetsqrhrt.c
index 0e67e0b831..7bd49f76fd 100644
--- a/LAPACKE/src/lapacke_cgetsqrhrt.c
+++ b/LAPACKE/src/lapacke_cgetsqrhrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgetsqrhrt( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgetsqrhrt)( int matrix_layout, lapack_int m, lapack_int n,
                                lapack_int mb1, lapack_int nb1, lapack_int nb2,
                                lapack_complex_float* a, lapack_int lda,
                                lapack_complex_float* t, lapack_int ldt )
@@ -42,19 +42,19 @@ lapack_int LAPACKE_cgetsqrhrt( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgetsqrhrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetsqrhrt", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgetsqrhrt_work( matrix_layout, m, n, mb1, nb1, nb2,
+    info = API_SUFFIX(LAPACKE_cgetsqrhrt_work)( matrix_layout, m, n, mb1, nb1, nb2,
                                     a, lda, t, ldt, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -68,13 +68,13 @@ lapack_int LAPACKE_cgetsqrhrt( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgetsqrhrt_work( matrix_layout, m, n, mb1, nb1, nb2,
+    info = API_SUFFIX(LAPACKE_cgetsqrhrt_work)( matrix_layout, m, n, mb1, nb1, nb2,
                                     a, lda, t, ldt, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgetsqrhrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetsqrhrt", info );
     }
     return info;
 }
\ No newline at end of file
diff --git a/LAPACKE/src/lapacke_cgetsqrhrt_work.c b/LAPACKE/src/lapacke_cgetsqrhrt_work.c
index 598f193e6f..d8fd5dbec7 100644
--- a/LAPACKE/src/lapacke_cgetsqrhrt_work.c
+++ b/LAPACKE/src/lapacke_cgetsqrhrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgetsqrhrt_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgetsqrhrt_work)( int matrix_layout, lapack_int m, lapack_int n,
                                     lapack_int mb1, lapack_int nb1, lapack_int nb2,
                                     lapack_complex_float* a, lapack_int lda,
                                     lapack_complex_float* t, lapack_int ldt,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_cgetsqrhrt_work( int matrix_layout, lapack_int m, lapack_int
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgetsqrhrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetsqrhrt_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cgetsqrhrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetsqrhrt_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -82,7 +82,7 @@ lapack_int LAPACKE_cgetsqrhrt_work( int matrix_layout, lapack_int m, lapack_int
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgetsqrhrt( &m, &n, &mb1, &nb1, &nb2, a_t, &lda_t, t_t, &ldt_t,
                            work, &lwork, &info );
@@ -90,19 +90,19 @@ lapack_int LAPACKE_cgetsqrhrt_work( int matrix_layout, lapack_int m, lapack_int
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, nb2, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nb2, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgetsqrhrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetsqrhrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgetsqrhrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgetsqrhrt_work", info );
     }
     return info;
 }
\ No newline at end of file
diff --git a/LAPACKE/src/lapacke_cggbak.c b/LAPACKE/src/lapacke_cggbak.c
index 3dafa4242a..8dd6dad0ce 100644
--- a/LAPACKE/src/lapacke_cggbak.c
+++ b/LAPACKE/src/lapacke_cggbak.c
@@ -32,29 +32,29 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggbak( int matrix_layout, char job, char side, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cggbak)( int matrix_layout, char job, char side, lapack_int n,
                            lapack_int ilo, lapack_int ihi, const float* lscale,
                            const float* rscale, lapack_int m,
                            lapack_complex_float* v, lapack_int ldv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cggbak", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggbak", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, lscale, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, lscale, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( n, rscale, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, rscale, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, m, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, m, v, ldv ) ) {
             return -10;
         }
     }
 #endif
-    return LAPACKE_cggbak_work( matrix_layout, job, side, n, ilo, ihi, lscale,
+    return API_SUFFIX(LAPACKE_cggbak_work)( matrix_layout, job, side, n, ilo, ihi, lscale,
                                 rscale, m, v, ldv );
 }
diff --git a/LAPACKE/src/lapacke_cggbak_work.c b/LAPACKE/src/lapacke_cggbak_work.c
index 58fc3ca2d9..76481993a4 100644
--- a/LAPACKE/src/lapacke_cggbak_work.c
+++ b/LAPACKE/src/lapacke_cggbak_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggbak_work( int matrix_layout, char job, char side,
+lapack_int API_SUFFIX(LAPACKE_cggbak_work)( int matrix_layout, char job, char side,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 const float* lscale, const float* rscale,
                                 lapack_int m, lapack_complex_float* v,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_cggbak_work( int matrix_layout, char job, char side,
         /* Check leading dimension(s) */
         if( ldv < m ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cggbak_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggbak_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,7 +63,7 @@ lapack_int LAPACKE_cggbak_work( int matrix_layout, char job, char side,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, m, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, m, v, ldv, v_t, ldv_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cggbak( &job, &side, &n, &ilo, &ihi, lscale, rscale, &m, v_t,
                        &ldv_t, &info );
@@ -71,16 +71,16 @@ lapack_int LAPACKE_cggbak_work( int matrix_layout, char job, char side,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, m, v_t, ldv_t, v, ldv );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, m, v_t, ldv_t, v, ldv );
         /* Release memory and exit */
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cggbak_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggbak_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cggbak_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggbak_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggbal.c b/LAPACKE/src/lapacke_cggbal.c
index 101d1a147e..29610a73e3 100644
--- a/LAPACKE/src/lapacke_cggbal.c
+++ b/LAPACKE/src/lapacke_cggbal.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggbal( int matrix_layout, char job, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cggbal)( int matrix_layout, char job, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* b, lapack_int ldb,
                            lapack_int* ilo, lapack_int* ihi, float* lscale,
@@ -43,28 +43,28 @@ lapack_int LAPACKE_cggbal( int matrix_layout, char job, lapack_int n,
     lapack_int lwork;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cggbal", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggbal", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
                 return -4;
             }
         }
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
                 return -6;
             }
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( job, 's' ) || LAPACKE_lsame( job, 'b' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 's' ) || API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
         lwork = MAX(1,6*n);
     } else {
         lwork = 1;
@@ -76,13 +76,13 @@ lapack_int LAPACKE_cggbal( int matrix_layout, char job, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cggbal_work( matrix_layout, job, n, a, lda, b, ldb, ilo, ihi,
+    info = API_SUFFIX(LAPACKE_cggbal_work)( matrix_layout, job, n, a, lda, b, ldb, ilo, ihi,
                                 lscale, rscale, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cggbal", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggbal", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggbal_work.c b/LAPACKE/src/lapacke_cggbal_work.c
index 765b290c5e..3e3de7c7f5 100644
--- a/LAPACKE/src/lapacke_cggbal_work.c
+++ b/LAPACKE/src/lapacke_cggbal_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggbal_work( int matrix_layout, char job, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cggbal_work)( int matrix_layout, char job, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* b, lapack_int ldb,
                                 lapack_int* ilo, lapack_int* ihi, float* lscale,
@@ -54,17 +54,17 @@ lapack_int LAPACKE_cggbal_work( int matrix_layout, char job, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cggbal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggbal_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cggbal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggbal_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
             a_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 lda_t * MAX(1,n) );
@@ -73,8 +73,8 @@ lapack_int LAPACKE_cggbal_work( int matrix_layout, char job, lapack_int n,
                 goto exit_level_0;
             }
         }
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
             b_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldb_t * MAX(1,n) );
@@ -84,13 +84,13 @@ lapack_int LAPACKE_cggbal_work( int matrix_layout, char job, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         }
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_cggbal( &job, &n, a_t, &lda_t, b_t, &ldb_t, ilo, ihi, lscale,
@@ -99,31 +99,31 @@ lapack_int LAPACKE_cggbal_work( int matrix_layout, char job, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
             LAPACKE_free( b_t );
         }
 exit_level_1:
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
             LAPACKE_free( a_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cggbal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggbal_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cggbal_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggbal_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgges.c b/LAPACKE/src/lapacke_cgges.c
index f521323712..8460d927ff 100644
--- a/LAPACKE/src/lapacke_cgges.c
+++ b/LAPACKE/src/lapacke_cgges.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgges( int matrix_layout, char jobvsl, char jobvsr, char sort,
+lapack_int API_SUFFIX(LAPACKE_cgges)( int matrix_layout, char jobvsl, char jobvsr, char sort,
                           LAPACK_C_SELECT2 selctg, lapack_int n,
                           lapack_complex_float* a, lapack_int lda,
                           lapack_complex_float* b, lapack_int ldb,
@@ -48,22 +48,22 @@ lapack_int LAPACKE_cgges( int matrix_layout, char jobvsl, char jobvsr, char sort
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgges", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgges", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -77,7 +77,7 @@ lapack_int LAPACKE_cgges( int matrix_layout, char jobvsl, char jobvsr, char sort
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgges_work( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
+    info = API_SUFFIX(LAPACKE_cgges_work)( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
                                lda, b, ldb, sdim, alpha, beta, vsl, ldvsl, vsr,
                                ldvsr, &work_query, lwork, rwork, bwork );
     if( info != 0 ) {
@@ -92,7 +92,7 @@ lapack_int LAPACKE_cgges( int matrix_layout, char jobvsl, char jobvsr, char sort
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgges_work( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
+    info = API_SUFFIX(LAPACKE_cgges_work)( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
                                lda, b, ldb, sdim, alpha, beta, vsl, ldvsl, vsr,
                                ldvsr, work, lwork, rwork, bwork );
     /* Release memory and exit */
@@ -100,12 +100,12 @@ lapack_int LAPACKE_cgges( int matrix_layout, char jobvsl, char jobvsr, char sort
 exit_level_2:
     LAPACKE_free( rwork );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgges", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgges", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgges3.c b/LAPACKE/src/lapacke_cgges3.c
index b1dcad8cc0..bf40fd65ac 100644
--- a/LAPACKE/src/lapacke_cgges3.c
+++ b/LAPACKE/src/lapacke_cgges3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgges3( int matrix_layout, char jobvsl, char jobvsr, char sort,
+lapack_int API_SUFFIX(LAPACKE_cgges3)( int matrix_layout, char jobvsl, char jobvsr, char sort,
                            LAPACK_C_SELECT2 selctg, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* b, lapack_int ldb,
@@ -48,22 +48,22 @@ lapack_int LAPACKE_cgges3( int matrix_layout, char jobvsl, char jobvsr, char sor
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgges3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgges3", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -77,7 +77,7 @@ lapack_int LAPACKE_cgges3( int matrix_layout, char jobvsl, char jobvsr, char sor
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgges3_work( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
+    info = API_SUFFIX(LAPACKE_cgges3_work)( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
                                 lda, b, ldb, sdim, alpha, beta, vsl, ldvsl, vsr,
                                 ldvsr, &work_query, lwork, rwork, bwork );
     if( info != 0 ) {
@@ -92,7 +92,7 @@ lapack_int LAPACKE_cgges3( int matrix_layout, char jobvsl, char jobvsr, char sor
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgges3_work( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
+    info = API_SUFFIX(LAPACKE_cgges3_work)( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
                                 lda, b, ldb, sdim, alpha, beta, vsl, ldvsl, vsr,
                                 ldvsr, work, lwork, rwork, bwork );
     /* Release memory and exit */
@@ -100,12 +100,12 @@ lapack_int LAPACKE_cgges3( int matrix_layout, char jobvsl, char jobvsr, char sor
 exit_level_2:
     LAPACKE_free( rwork );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgges3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgges3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgges3_work.c b/LAPACKE/src/lapacke_cgges3_work.c
index a8f06f5a13..886817adc9 100644
--- a/LAPACKE/src/lapacke_cgges3_work.c
+++ b/LAPACKE/src/lapacke_cgges3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgges3_work( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_cgges3_work)( int matrix_layout, char jobvsl, char jobvsr,
                                char sort, LAPACK_C_SELECT2 selctg, lapack_int n,
                                lapack_complex_float* a, lapack_int lda,
                                lapack_complex_float* b, lapack_int ldb,
@@ -64,22 +64,22 @@ lapack_int LAPACKE_cgges3_work( int matrix_layout, char jobvsl, char jobvsr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgges3_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgges3_work", info );
             return info;
         }
         if( ldvsl < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_cgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgges3_work", info );
             return info;
         }
         if( ldvsr < n ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_cgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgges3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_cgges3_work( int matrix_layout, char jobvsl, char jobvsr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             vsl_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvsl_t * MAX(1,n) );
@@ -111,7 +111,7 @@ lapack_int LAPACKE_cgges3_work( int matrix_layout, char jobvsl, char jobvsr,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             vsr_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvsr_t * MAX(1,n) );
@@ -121,8 +121,8 @@ lapack_int LAPACKE_cgges3_work( int matrix_layout, char jobvsl, char jobvsr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgges3( &jobvsl, &jobvsr, &sort, selctg, &n, a_t, &lda_t, b_t,
                        &ldb_t, sdim, alpha, beta, vsl_t, &ldvsl_t, vsr_t,
@@ -131,22 +131,22 @@ lapack_int LAPACKE_cgges3_work( int matrix_layout, char jobvsl, char jobvsr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
                                ldvsl );
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
                                ldvsr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             LAPACKE_free( vsr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             LAPACKE_free( vsl_t );
         }
 exit_level_2:
@@ -155,11 +155,11 @@ lapack_int LAPACKE_cgges3_work( int matrix_layout, char jobvsl, char jobvsr,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgges3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgges3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgges3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgges_work.c b/LAPACKE/src/lapacke_cgges_work.c
index ff74939a3a..b45a881d9e 100644
--- a/LAPACKE/src/lapacke_cgges_work.c
+++ b/LAPACKE/src/lapacke_cgges_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgges_work( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_cgges_work)( int matrix_layout, char jobvsl, char jobvsr,
                                char sort, LAPACK_C_SELECT2 selctg, lapack_int n,
                                lapack_complex_float* a, lapack_int lda,
                                lapack_complex_float* b, lapack_int ldb,
@@ -64,22 +64,22 @@ lapack_int LAPACKE_cgges_work( int matrix_layout, char jobvsl, char jobvsr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgges_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgges_work", info );
             return info;
         }
-        if( ldvsl < n ) {
+        if( ldvsl < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) && ldvsl < n ) ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_cgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgges_work", info );
             return info;
         }
-        if( ldvsr < n ) {
+        if( ldvsr < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) && ldvsr < n ) ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_cgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgges_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_cgges_work( int matrix_layout, char jobvsl, char jobvsr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             vsl_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvsl_t * MAX(1,n) );
@@ -111,7 +111,7 @@ lapack_int LAPACKE_cgges_work( int matrix_layout, char jobvsl, char jobvsr,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             vsr_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvsr_t * MAX(1,n) );
@@ -121,8 +121,8 @@ lapack_int LAPACKE_cgges_work( int matrix_layout, char jobvsl, char jobvsr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgges( &jobvsl, &jobvsr, &sort, selctg, &n, a_t, &lda_t, b_t,
                       &ldb_t, sdim, alpha, beta, vsl_t, &ldvsl_t, vsr_t,
@@ -131,22 +131,22 @@ lapack_int LAPACKE_cgges_work( int matrix_layout, char jobvsl, char jobvsr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
                                ldvsl );
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
                                ldvsr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             LAPACKE_free( vsr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             LAPACKE_free( vsl_t );
         }
 exit_level_2:
@@ -155,11 +155,11 @@ lapack_int LAPACKE_cgges_work( int matrix_layout, char jobvsl, char jobvsr,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgges_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgges_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgges_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggesx.c b/LAPACKE/src/lapacke_cggesx.c
index 5962dadb14..5a7999a6e4 100644
--- a/LAPACKE/src/lapacke_cggesx.c
+++ b/LAPACKE/src/lapacke_cggesx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggesx( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_cggesx)( int matrix_layout, char jobvsl, char jobvsr,
                            char sort, LAPACK_C_SELECT2 selctg, char sense,
                            lapack_int n, lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* b,
@@ -53,22 +53,22 @@ lapack_int LAPACKE_cggesx( int matrix_layout, char jobvsl, char jobvsr,
     lapack_int iwork_query;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cggesx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggesx", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -10;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -82,7 +82,7 @@ lapack_int LAPACKE_cggesx( int matrix_layout, char jobvsl, char jobvsr,
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cggesx_work( matrix_layout, jobvsl, jobvsr, sort, selctg,
+    info = API_SUFFIX(LAPACKE_cggesx_work)( matrix_layout, jobvsl, jobvsr, sort, selctg,
                                 sense, n, a, lda, b, ldb, sdim, alpha, beta,
                                 vsl, ldvsl, vsr, ldvsr, rconde, rcondv,
                                 &work_query, lwork, rwork, &iwork_query, liwork,
@@ -105,7 +105,7 @@ lapack_int LAPACKE_cggesx( int matrix_layout, char jobvsl, char jobvsr,
         goto exit_level_3;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cggesx_work( matrix_layout, jobvsl, jobvsr, sort, selctg,
+    info = API_SUFFIX(LAPACKE_cggesx_work)( matrix_layout, jobvsl, jobvsr, sort, selctg,
                                 sense, n, a, lda, b, ldb, sdim, alpha, beta,
                                 vsl, ldvsl, vsr, ldvsr, rconde, rcondv, work,
                                 lwork, rwork, iwork, liwork, bwork );
@@ -116,12 +116,12 @@ lapack_int LAPACKE_cggesx( int matrix_layout, char jobvsl, char jobvsr,
 exit_level_2:
     LAPACKE_free( rwork );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cggesx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggesx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggesx_work.c b/LAPACKE/src/lapacke_cggesx_work.c
index 7edb1fa9bf..de49f385dd 100644
--- a/LAPACKE/src/lapacke_cggesx_work.c
+++ b/LAPACKE/src/lapacke_cggesx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggesx_work( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_cggesx_work)( int matrix_layout, char jobvsl, char jobvsr,
                                 char sort, LAPACK_C_SELECT2 selctg, char sense,
                                 lapack_int n, lapack_complex_float* a,
                                 lapack_int lda, lapack_complex_float* b,
@@ -68,22 +68,22 @@ lapack_int LAPACKE_cggesx_work( int matrix_layout, char jobvsl, char jobvsr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggesx_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggesx_work", info );
             return info;
         }
-        if( ldvsl < n ) {
+        if( ldvsl < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) && ldvsl < n ) ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_cggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggesx_work", info );
             return info;
         }
-        if( ldvsr < n ) {
+        if( ldvsr < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) && ldvsr < n ) ) {
             info = -18;
-            LAPACKE_xerbla( "LAPACKE_cggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggesx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -107,7 +107,7 @@ lapack_int LAPACKE_cggesx_work( int matrix_layout, char jobvsl, char jobvsr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             vsl_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvsl_t * MAX(1,n) );
@@ -116,7 +116,7 @@ lapack_int LAPACKE_cggesx_work( int matrix_layout, char jobvsl, char jobvsr,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             vsr_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvsr_t * MAX(1,n) );
@@ -126,8 +126,8 @@ lapack_int LAPACKE_cggesx_work( int matrix_layout, char jobvsl, char jobvsr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cggesx( &jobvsl, &jobvsr, &sort, selctg, &sense, &n, a_t, &lda_t,
                        b_t, &ldb_t, sdim, alpha, beta, vsl_t, &ldvsl_t, vsr_t,
@@ -137,22 +137,22 @@ lapack_int LAPACKE_cggesx_work( int matrix_layout, char jobvsl, char jobvsr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
                                ldvsl );
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
                                ldvsr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             LAPACKE_free( vsr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             LAPACKE_free( vsl_t );
         }
 exit_level_2:
@@ -161,11 +161,11 @@ lapack_int LAPACKE_cggesx_work( int matrix_layout, char jobvsl, char jobvsr,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggesx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cggesx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggesx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggev.c b/LAPACKE/src/lapacke_cggev.c
index 629a53bc90..50d55bb094 100644
--- a/LAPACKE/src/lapacke_cggev.c
+++ b/LAPACKE/src/lapacke_cggev.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggev( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_cggev)( int matrix_layout, char jobvl, char jobvr,
                           lapack_int n, lapack_complex_float* a, lapack_int lda,
                           lapack_complex_float* b, lapack_int ldb,
                           lapack_complex_float* alpha,
@@ -46,16 +46,16 @@ lapack_int LAPACKE_cggev( int matrix_layout, char jobvl, char jobvr,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cggev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggev", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -7;
         }
     }
@@ -67,7 +67,7 @@ lapack_int LAPACKE_cggev( int matrix_layout, char jobvl, char jobvr,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cggev_work( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_cggev_work)( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
                                alpha, beta, vl, ldvl, vr, ldvr, &work_query,
                                lwork, rwork );
     if( info != 0 ) {
@@ -82,7 +82,7 @@ lapack_int LAPACKE_cggev( int matrix_layout, char jobvl, char jobvr,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cggev_work( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_cggev_work)( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
                                alpha, beta, vl, ldvl, vr, ldvr, work, lwork,
                                rwork );
     /* Release memory and exit */
@@ -91,7 +91,7 @@ lapack_int LAPACKE_cggev( int matrix_layout, char jobvl, char jobvr,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cggev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggev3.c b/LAPACKE/src/lapacke_cggev3.c
index b14ec96aac..711fb0d555 100644
--- a/LAPACKE/src/lapacke_cggev3.c
+++ b/LAPACKE/src/lapacke_cggev3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggev3( int matrix_layout,
+lapack_int API_SUFFIX(LAPACKE_cggev3)( int matrix_layout,
                            char jobvl, char jobvr, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* b, lapack_int ldb,
@@ -47,16 +47,16 @@ lapack_int LAPACKE_cggev3( int matrix_layout,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cggev3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggev3", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -7;
         }
     }
@@ -68,7 +68,7 @@ lapack_int LAPACKE_cggev3( int matrix_layout,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cggev3_work( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_cggev3_work)( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
                                 alpha, beta, vl, ldvl, vr, ldvr, &work_query,
                                 lwork, rwork );
     if( info != 0 ) {
@@ -83,7 +83,7 @@ lapack_int LAPACKE_cggev3( int matrix_layout,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cggev3_work( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_cggev3_work)( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
                                 alpha, beta, vl, ldvl, vr, ldvr, work, lwork,
                                 rwork );
     /* Release memory and exit */
@@ -92,7 +92,7 @@ lapack_int LAPACKE_cggev3( int matrix_layout,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cggev3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggev3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggev3_work.c b/LAPACKE/src/lapacke_cggev3_work.c
index 6443a84827..74fcd01c8f 100644
--- a/LAPACKE/src/lapacke_cggev3_work.c
+++ b/LAPACKE/src/lapacke_cggev3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggev3_work( int matrix_layout,
+lapack_int API_SUFFIX(LAPACKE_cggev3_work)( int matrix_layout,
                                 char jobvl, char jobvr, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* b, lapack_int ldb,
@@ -52,10 +52,10 @@ lapack_int LAPACKE_cggev3_work( int matrix_layout,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_vl = LAPACKE_lsame( jobvl, 'v' ) ? n : 1;
-        lapack_int ncols_vl = LAPACKE_lsame( jobvl, 'v' ) ? n : 1;
-        lapack_int nrows_vr = LAPACKE_lsame( jobvr, 'v' ) ? n : 1;
-        lapack_int ncols_vr = LAPACKE_lsame( jobvr, 'v' ) ? n : 1;
+        lapack_int nrows_vl = API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ? n : 1;
+        lapack_int ncols_vl = API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ? n : 1;
+        lapack_int nrows_vr = API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ? n : 1;
+        lapack_int ncols_vr = API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ? n : 1;
         lapack_int lda_t = MAX(1,n);
         lapack_int ldb_t = MAX(1,n);
         lapack_int ldvl_t = MAX(1,nrows_vl);
@@ -67,22 +67,22 @@ lapack_int LAPACKE_cggev3_work( int matrix_layout,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggev3_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggev3_work", info );
             return info;
         }
         if( ldvl < ncols_vl ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_cggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggev3_work", info );
             return info;
         }
         if( ldvr < ncols_vr ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_cggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggev3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -105,7 +105,7 @@ lapack_int LAPACKE_cggev3_work( int matrix_layout,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvl_t * MAX(1,ncols_vl) );
@@ -114,7 +114,7 @@ lapack_int LAPACKE_cggev3_work( int matrix_layout,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvr_t * MAX(1,ncols_vr) );
@@ -124,8 +124,8 @@ lapack_int LAPACKE_cggev3_work( int matrix_layout,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cggev3( &jobvl, &jobvr, &n, a_t, &lda_t, b_t, &ldb_t, alpha,
                        beta, vl_t, &ldvl_t, vr_t, &ldvr_t, work, &lwork, rwork,
@@ -134,22 +134,22 @@ lapack_int LAPACKE_cggev3_work( int matrix_layout,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_vl, ncols_vl, vl_t,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nrows_vl, ncols_vl, vl_t,
                                ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_vr, ncols_vr, vr_t,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nrows_vr, ncols_vr, vr_t,
                                ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -158,11 +158,11 @@ lapack_int LAPACKE_cggev3_work( int matrix_layout,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggev3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cggev3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggev3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggev_work.c b/LAPACKE/src/lapacke_cggev_work.c
index ff129a8b80..fdfc90c76d 100644
--- a/LAPACKE/src/lapacke_cggev_work.c
+++ b/LAPACKE/src/lapacke_cggev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggev_work( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_cggev_work)( int matrix_layout, char jobvl, char jobvr,
                                lapack_int n, lapack_complex_float* a,
                                lapack_int lda, lapack_complex_float* b,
                                lapack_int ldb, lapack_complex_float* alpha,
@@ -51,10 +51,10 @@ lapack_int LAPACKE_cggev_work( int matrix_layout, char jobvl, char jobvr,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_vl = LAPACKE_lsame( jobvl, 'v' ) ? n : 1;
-        lapack_int ncols_vl = LAPACKE_lsame( jobvl, 'v' ) ? n : 1;
-        lapack_int nrows_vr = LAPACKE_lsame( jobvr, 'v' ) ? n : 1;
-        lapack_int ncols_vr = LAPACKE_lsame( jobvr, 'v' ) ? n : 1;
+        lapack_int nrows_vl = API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ? n : 1;
+        lapack_int ncols_vl = API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ? n : 1;
+        lapack_int nrows_vr = API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ? n : 1;
+        lapack_int ncols_vr = API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ? n : 1;
         lapack_int lda_t = MAX(1,n);
         lapack_int ldb_t = MAX(1,n);
         lapack_int ldvl_t = MAX(1,nrows_vl);
@@ -66,22 +66,22 @@ lapack_int LAPACKE_cggev_work( int matrix_layout, char jobvl, char jobvr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggev_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggev_work", info );
             return info;
         }
         if( ldvl < ncols_vl ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_cggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggev_work", info );
             return info;
         }
         if( ldvr < ncols_vr ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_cggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggev_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -104,7 +104,7 @@ lapack_int LAPACKE_cggev_work( int matrix_layout, char jobvl, char jobvr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvl_t * MAX(1,ncols_vl) );
@@ -113,7 +113,7 @@ lapack_int LAPACKE_cggev_work( int matrix_layout, char jobvl, char jobvr,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvr_t * MAX(1,ncols_vr) );
@@ -123,8 +123,8 @@ lapack_int LAPACKE_cggev_work( int matrix_layout, char jobvl, char jobvr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cggev( &jobvl, &jobvr, &n, a_t, &lda_t, b_t, &ldb_t, alpha, beta,
                       vl_t, &ldvl_t, vr_t, &ldvr_t, work, &lwork, rwork,
@@ -133,22 +133,22 @@ lapack_int LAPACKE_cggev_work( int matrix_layout, char jobvl, char jobvr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_vl, ncols_vl, vl_t,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nrows_vl, ncols_vl, vl_t,
                                ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_vr, ncols_vr, vr_t,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nrows_vr, ncols_vr, vr_t,
                                ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -157,11 +157,11 @@ lapack_int LAPACKE_cggev_work( int matrix_layout, char jobvl, char jobvr,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cggev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggevx.c b/LAPACKE/src/lapacke_cggevx.c
index 89785ed8ca..0f6b10ad5f 100644
--- a/LAPACKE/src/lapacke_cggevx.c
+++ b/LAPACKE/src/lapacke_cggevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggevx( int matrix_layout, char balanc, char jobvl,
+lapack_int API_SUFFIX(LAPACKE_cggevx)( int matrix_layout, char balanc, char jobvl,
                            char jobvr, char sense, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* b, lapack_int ldb,
@@ -53,29 +53,29 @@ lapack_int LAPACKE_cggevx( int matrix_layout, char balanc, char jobvl,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cggevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggevx", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( balanc, 's' ) || LAPACKE_lsame( balanc, 'b' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( balanc, 's' ) || API_SUFFIX(LAPACKE_lsame)( balanc, 'b' ) ) {
         lrwork = MAX(1,6*n);
     } else {
         lrwork = MAX(1,2*n);
     }
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'e' ) ||
-        LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'e' ) ||
+        API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -83,8 +83,8 @@ lapack_int LAPACKE_cggevx( int matrix_layout, char balanc, char jobvl,
             goto exit_level_0;
         }
     }
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'n' ) ||
-        LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'n' ) ||
+        API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * MAX(1,n+2) );
         if( iwork == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -97,7 +97,7 @@ lapack_int LAPACKE_cggevx( int matrix_layout, char balanc, char jobvl,
         goto exit_level_2;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cggevx_work( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
+    info = API_SUFFIX(LAPACKE_cggevx_work)( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
                                 lda, b, ldb, alpha, beta, vl, ldvl, vr, ldvr,
                                 ilo, ihi, lscale, rscale, abnrm, bbnrm, rconde,
                                 rcondv, &work_query, lwork, rwork, iwork,
@@ -114,7 +114,7 @@ lapack_int LAPACKE_cggevx( int matrix_layout, char balanc, char jobvl,
         goto exit_level_3;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cggevx_work( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
+    info = API_SUFFIX(LAPACKE_cggevx_work)( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
                                 lda, b, ldb, alpha, beta, vl, ldvl, vr, ldvr,
                                 ilo, ihi, lscale, rscale, abnrm, bbnrm, rconde,
                                 rcondv, work, lwork, rwork, iwork, bwork );
@@ -123,18 +123,18 @@ lapack_int LAPACKE_cggevx( int matrix_layout, char balanc, char jobvl,
 exit_level_3:
     LAPACKE_free( rwork );
 exit_level_2:
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'n' ) ||
-        LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'n' ) ||
+        API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         LAPACKE_free( iwork );
     }
 exit_level_1:
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'e' ) ||
-        LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'e' ) ||
+        API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cggevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggevx_work.c b/LAPACKE/src/lapacke_cggevx_work.c
index 9c3adb6b46..3632e58f1a 100644
--- a/LAPACKE/src/lapacke_cggevx_work.c
+++ b/LAPACKE/src/lapacke_cggevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggevx_work( int matrix_layout, char balanc, char jobvl,
+lapack_int API_SUFFIX(LAPACKE_cggevx_work)( int matrix_layout, char balanc, char jobvl,
                                 char jobvr, char sense, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* b, lapack_int ldb,
@@ -69,22 +69,22 @@ lapack_int LAPACKE_cggevx_work( int matrix_layout, char balanc, char jobvl,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggevx_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggevx_work", info );
             return info;
         }
         if( ldvl < n ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_cggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggevx_work", info );
             return info;
         }
         if( ldvr < n ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_cggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggevx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -108,7 +108,7 @@ lapack_int LAPACKE_cggevx_work( int matrix_layout, char balanc, char jobvl,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvl_t * MAX(1,n) );
@@ -117,7 +117,7 @@ lapack_int LAPACKE_cggevx_work( int matrix_layout, char balanc, char jobvl,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvr_t * MAX(1,n) );
@@ -127,8 +127,8 @@ lapack_int LAPACKE_cggevx_work( int matrix_layout, char balanc, char jobvl,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cggevx( &balanc, &jobvl, &jobvr, &sense, &n, a_t, &lda_t, b_t,
                        &ldb_t, alpha, beta, vl_t, &ldvl_t, vr_t, &ldvr_t, ilo,
@@ -138,20 +138,20 @@ lapack_int LAPACKE_cggevx_work( int matrix_layout, char balanc, char jobvl,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -160,11 +160,11 @@ lapack_int LAPACKE_cggevx_work( int matrix_layout, char balanc, char jobvl,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cggevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggglm.c b/LAPACKE/src/lapacke_cggglm.c
index 62740bbf62..34ad7f2b95 100644
--- a/LAPACKE/src/lapacke_cggglm.c
+++ b/LAPACKE/src/lapacke_cggglm.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggglm( int matrix_layout, lapack_int n, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_cggglm)( int matrix_layout, lapack_int n, lapack_int m,
                            lapack_int p, lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* b,
                            lapack_int ldb, lapack_complex_float* d,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_cggglm( int matrix_layout, lapack_int n, lapack_int m,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cggglm", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggglm", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, m, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, p, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, p, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_c_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n, d, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cggglm_work( matrix_layout, n, m, p, a, lda, b, ldb, d, x, y,
+    info = API_SUFFIX(LAPACKE_cggglm_work)( matrix_layout, n, m, p, a, lda, b, ldb, d, x, y,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_cggglm( int matrix_layout, lapack_int n, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cggglm_work( matrix_layout, n, m, p, a, lda, b, ldb, d, x, y,
+    info = API_SUFFIX(LAPACKE_cggglm_work)( matrix_layout, n, m, p, a, lda, b, ldb, d, x, y,
                                 work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cggglm", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggglm", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggglm_work.c b/LAPACKE/src/lapacke_cggglm_work.c
index 0b3da2d7a1..aaacb360f8 100644
--- a/LAPACKE/src/lapacke_cggglm_work.c
+++ b/LAPACKE/src/lapacke_cggglm_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggglm_work( int matrix_layout, lapack_int n, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_cggglm_work)( int matrix_layout, lapack_int n, lapack_int m,
                                 lapack_int p, lapack_complex_float* a,
                                 lapack_int lda, lapack_complex_float* b,
                                 lapack_int ldb, lapack_complex_float* d,
@@ -56,12 +56,12 @@ lapack_int LAPACKE_cggglm_work( int matrix_layout, lapack_int n, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cggglm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggglm_work", info );
             return info;
         }
         if( ldb < p ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cggglm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggglm_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_cggglm_work( int matrix_layout, lapack_int n, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, m, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, p, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, p, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cggglm( &n, &m, &p, a_t, &lda_t, b_t, &ldb_t, d, x, y, work,
                        &lwork, &info );
@@ -93,19 +93,19 @@ lapack_int LAPACKE_cggglm_work( int matrix_layout, lapack_int n, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, m, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, p, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, m, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, p, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cggglm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggglm_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cggglm_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggglm_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgghd3.c b/LAPACKE/src/lapacke_cgghd3.c
index dce0b2ab75..593a1453d2 100644
--- a/LAPACKE/src/lapacke_cgghd3.c
+++ b/LAPACKE/src/lapacke_cgghd3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgghd3( int matrix_layout, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_cgghd3)( int matrix_layout, char compq, char compz,
                            lapack_int n, lapack_int ilo, lapack_int ihi,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* b, lapack_int ldb,
@@ -45,32 +45,32 @@ lapack_int LAPACKE_cgghd3( int matrix_layout, char compq, char compz,
     lapack_complex_float work_query;
 
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgghd3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgghd3", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -13;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info =  LAPACKE_cgghd3_work( matrix_layout, compq, compz, n, ilo, ihi,
+    info =  API_SUFFIX(LAPACKE_cgghd3_work)( matrix_layout, compq, compz, n, ilo, ihi,
                                  a, lda, b, ldb, q, ldq, z, ldz, &work_query,
                                  lwork );
     if( info != 0 ) {
@@ -85,14 +85,14 @@ lapack_int LAPACKE_cgghd3( int matrix_layout, char compq, char compz,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info =  LAPACKE_cgghd3_work( matrix_layout, compq, compz, n, ilo, ihi,
+    info =  API_SUFFIX(LAPACKE_cgghd3_work)( matrix_layout, compq, compz, n, ilo, ihi,
                                  a, lda, b, ldb, q, ldq, z, ldz, work,
                                  lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgghd3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgghd3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgghd3_work.c b/LAPACKE/src/lapacke_cgghd3_work.c
index e91ee810e9..f707b8f548 100644
--- a/LAPACKE/src/lapacke_cgghd3_work.c
+++ b/LAPACKE/src/lapacke_cgghd3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgghd3_work( int matrix_layout, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_cgghd3_work)( int matrix_layout, char compq, char compz,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* b, lapack_int ldb,
@@ -66,22 +66,22 @@ lapack_int LAPACKE_cgghd3_work( int matrix_layout, char compq, char compz,
     /* Check leading dimension(s) */
     if( lda < n ) {
       info = -8;
-      LAPACKE_xerbla( "LAPACKE_cgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgghd3_work", info );
       return info;
     }
     if( ldb < n ) {
       info = -10;
-      LAPACKE_xerbla( "LAPACKE_cgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgghd3_work", info );
       return info;
     }
     if( ldq < n ) {
       info = -12;
-      LAPACKE_xerbla( "LAPACKE_cgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgghd3_work", info );
       return info;
     }
     if( ldz < n ) {
       info = -14;
-      LAPACKE_xerbla( "LAPACKE_cgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgghd3_work", info );
       return info;
     }
     /* Allocate memory for temporary array(s) */
@@ -95,14 +95,14 @@ lapack_int LAPACKE_cgghd3_work( int matrix_layout, char compq, char compz,
       info = LAPACK_TRANSPOSE_MEMORY_ERROR;
       goto exit_level_1;
     }
-    if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
       q_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * ldq_t * MAX(1,n) );
       if( q_t == NULL ) {
         info = LAPACK_TRANSPOSE_MEMORY_ERROR;
         goto exit_level_2;
       }
     }
-    if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
       z_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * ldz_t * MAX(1,n) );
       if( z_t == NULL ) {
         info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -110,13 +110,13 @@ lapack_int LAPACKE_cgghd3_work( int matrix_layout, char compq, char compz,
       }
     }
     /* Transpose input matrices */
-    LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-    LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-    if( LAPACKE_lsame( compq, 'v' ) ) {
-      LAPACKE_cge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+    API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+    API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+      API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
     }
-    if( LAPACKE_lsame( compz, 'v' ) ) {
-      LAPACKE_cge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+      API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
     }
     /* Call LAPACK function and adjust info */
     LAPACK_cgghd3( &compq, &compz, &n, &ilo, &ihi, a_t, &lda_t, b_t, &ldb_t,
@@ -125,20 +125,20 @@ lapack_int LAPACKE_cgghd3_work( int matrix_layout, char compq, char compz,
       info = info - 1;
     }
     /* Transpose output matrices */
-    LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-    LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-    if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-      LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+    API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+    API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+      API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
     }
-    if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-      LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+      API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
     }
     /* Release memory and exit */
-    if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
       LAPACKE_free( z_t );
     }
   exit_level_3:
-    if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
       LAPACKE_free( q_t );
     }
   exit_level_2:
@@ -147,11 +147,11 @@ lapack_int LAPACKE_cgghd3_work( int matrix_layout, char compq, char compz,
     LAPACKE_free( a_t );
   exit_level_0:
     if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-      LAPACKE_xerbla( "LAPACKE_cgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgghd3_work", info );
     }
   } else {
     info = -1;
-    LAPACKE_xerbla( "LAPACKE_cgghd3_work", info );
+    API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgghd3_work", info );
   }
   return info;
 }
diff --git a/LAPACKE/src/lapacke_cgghrd.c b/LAPACKE/src/lapacke_cgghrd.c
index a3e41570cc..31a0ea7d47 100644
--- a/LAPACKE/src/lapacke_cgghrd.c
+++ b/LAPACKE/src/lapacke_cgghrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgghrd( int matrix_layout, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_cgghrd)( int matrix_layout, char compq, char compz,
                            lapack_int n, lapack_int ilo, lapack_int ihi,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* b, lapack_int ldb,
@@ -40,30 +40,30 @@ lapack_int LAPACKE_cgghrd( int matrix_layout, char compq, char compz,
                            lapack_complex_float* z, lapack_int ldz )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgghrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgghrd", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -13;
             }
         }
     }
 #endif
-    return LAPACKE_cgghrd_work( matrix_layout, compq, compz, n, ilo, ihi, a, lda,
+    return API_SUFFIX(LAPACKE_cgghrd_work)( matrix_layout, compq, compz, n, ilo, ihi, a, lda,
                                 b, ldb, q, ldq, z, ldz );
 }
diff --git a/LAPACKE/src/lapacke_cgghrd_work.c b/LAPACKE/src/lapacke_cgghrd_work.c
index 31cb555036..51bf95d77c 100644
--- a/LAPACKE/src/lapacke_cgghrd_work.c
+++ b/LAPACKE/src/lapacke_cgghrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgghrd_work( int matrix_layout, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_cgghrd_work)( int matrix_layout, char compq, char compz,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* b, lapack_int ldb,
@@ -59,22 +59,22 @@ lapack_int LAPACKE_cgghrd_work( int matrix_layout, char compq, char compz,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgghrd_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgghrd_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_cgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgghrd_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_cgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgghrd_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -90,7 +90,7 @@ lapack_int LAPACKE_cgghrd_work( int matrix_layout, char compq, char compz,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             q_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldq_t * MAX(1,n) );
@@ -99,7 +99,7 @@ lapack_int LAPACKE_cgghrd_work( int matrix_layout, char compq, char compz,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,n) );
@@ -109,13 +109,13 @@ lapack_int LAPACKE_cgghrd_work( int matrix_layout, char compq, char compz,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_cgghrd( &compq, &compz, &n, &ilo, &ihi, a_t, &lda_t, b_t, &ldb_t,
@@ -124,20 +124,20 @@ lapack_int LAPACKE_cgghrd_work( int matrix_layout, char compq, char compz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_2:
@@ -146,11 +146,11 @@ lapack_int LAPACKE_cgghrd_work( int matrix_layout, char compq, char compz,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgghrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgghrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgghrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgglse.c b/LAPACKE/src/lapacke_cgglse.c
index 17bcc981db..933c72d226 100644
--- a/LAPACKE/src/lapacke_cgglse.c
+++ b/LAPACKE/src/lapacke_cgglse.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgglse( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgglse)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int p, lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* b,
                            lapack_int ldb, lapack_complex_float* c,
@@ -43,28 +43,28 @@ lapack_int LAPACKE_cgglse( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgglse", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgglse", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_c_nancheck( m, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( m, c, 1 ) ) {
             return -9;
         }
-        if( LAPACKE_c_nancheck( p, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( p, d, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cgglse_work( matrix_layout, m, n, p, a, lda, b, ldb, c, d, x,
+    info = API_SUFFIX(LAPACKE_cgglse_work)( matrix_layout, m, n, p, a, lda, b, ldb, c, d, x,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -78,13 +78,13 @@ lapack_int LAPACKE_cgglse( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgglse_work( matrix_layout, m, n, p, a, lda, b, ldb, c, d, x,
+    info = API_SUFFIX(LAPACKE_cgglse_work)( matrix_layout, m, n, p, a, lda, b, ldb, c, d, x,
                                 work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgglse", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgglse", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgglse_work.c b/LAPACKE/src/lapacke_cgglse_work.c
index d352dfa096..53da78bc9b 100644
--- a/LAPACKE/src/lapacke_cgglse_work.c
+++ b/LAPACKE/src/lapacke_cgglse_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgglse_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgglse_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int p, lapack_complex_float* a,
                                 lapack_int lda, lapack_complex_float* b,
                                 lapack_int ldb, lapack_complex_float* c,
@@ -56,12 +56,12 @@ lapack_int LAPACKE_cgglse_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cgglse_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgglse_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgglse_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgglse_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_cgglse_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgglse( &m, &n, &p, a_t, &lda_t, b_t, &ldb_t, c, d, x, work,
                        &lwork, &info );
@@ -93,19 +93,19 @@ lapack_int LAPACKE_cgglse_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgglse_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgglse_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgglse_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgglse_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggqrf.c b/LAPACKE/src/lapacke_cggqrf.c
index 247fcd06d3..fd178e9934 100644
--- a/LAPACKE/src/lapacke_cggqrf.c
+++ b/LAPACKE/src/lapacke_cggqrf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggqrf( int matrix_layout, lapack_int n, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_cggqrf)( int matrix_layout, lapack_int n, lapack_int m,
                            lapack_int p, lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* taua,
                            lapack_complex_float* b, lapack_int ldb,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_cggqrf( int matrix_layout, lapack_int n, lapack_int m,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cggqrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggqrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, m, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, p, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, p, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cggqrf_work( matrix_layout, n, m, p, a, lda, taua, b, ldb,
+    info = API_SUFFIX(LAPACKE_cggqrf_work)( matrix_layout, n, m, p, a, lda, taua, b, ldb,
                                 taub, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -72,13 +72,13 @@ lapack_int LAPACKE_cggqrf( int matrix_layout, lapack_int n, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cggqrf_work( matrix_layout, n, m, p, a, lda, taua, b, ldb,
+    info = API_SUFFIX(LAPACKE_cggqrf_work)( matrix_layout, n, m, p, a, lda, taua, b, ldb,
                                 taub, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cggqrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggqrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggqrf_work.c b/LAPACKE/src/lapacke_cggqrf_work.c
index 4e70f2b5aa..5ce130d191 100644
--- a/LAPACKE/src/lapacke_cggqrf_work.c
+++ b/LAPACKE/src/lapacke_cggqrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggqrf_work( int matrix_layout, lapack_int n, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_cggqrf_work)( int matrix_layout, lapack_int n, lapack_int m,
                                 lapack_int p, lapack_complex_float* a,
                                 lapack_int lda, lapack_complex_float* taua,
                                 lapack_complex_float* b, lapack_int ldb,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_cggqrf_work( int matrix_layout, lapack_int n, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cggqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggqrf_work", info );
             return info;
         }
         if( ldb < p ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cggqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggqrf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_cggqrf_work( int matrix_layout, lapack_int n, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, m, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, p, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, p, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cggqrf( &n, &m, &p, a_t, &lda_t, taua, b_t, &ldb_t, taub, work,
                        &lwork, &info );
@@ -92,19 +92,19 @@ lapack_int LAPACKE_cggqrf_work( int matrix_layout, lapack_int n, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, m, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, p, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, m, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, p, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cggqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggqrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cggqrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggqrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggrqf.c b/LAPACKE/src/lapacke_cggrqf.c
index 660ce46260..6291578e5d 100644
--- a/LAPACKE/src/lapacke_cggrqf.c
+++ b/LAPACKE/src/lapacke_cggrqf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggrqf( int matrix_layout, lapack_int m, lapack_int p,
+lapack_int API_SUFFIX(LAPACKE_cggrqf)( int matrix_layout, lapack_int m, lapack_int p,
                            lapack_int n, lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* taua,
                            lapack_complex_float* b, lapack_int ldb,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_cggrqf( int matrix_layout, lapack_int m, lapack_int p,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cggrqf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggrqf", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cggrqf_work( matrix_layout, m, p, n, a, lda, taua, b, ldb,
+    info = API_SUFFIX(LAPACKE_cggrqf_work)( matrix_layout, m, p, n, a, lda, taua, b, ldb,
                                 taub, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -72,13 +72,13 @@ lapack_int LAPACKE_cggrqf( int matrix_layout, lapack_int m, lapack_int p,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cggrqf_work( matrix_layout, m, p, n, a, lda, taua, b, ldb,
+    info = API_SUFFIX(LAPACKE_cggrqf_work)( matrix_layout, m, p, n, a, lda, taua, b, ldb,
                                 taub, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cggrqf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggrqf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggrqf_work.c b/LAPACKE/src/lapacke_cggrqf_work.c
index 9462e88fe3..fffa79b795 100644
--- a/LAPACKE/src/lapacke_cggrqf_work.c
+++ b/LAPACKE/src/lapacke_cggrqf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggrqf_work( int matrix_layout, lapack_int m, lapack_int p,
+lapack_int API_SUFFIX(LAPACKE_cggrqf_work)( int matrix_layout, lapack_int m, lapack_int p,
                                 lapack_int n, lapack_complex_float* a,
                                 lapack_int lda, lapack_complex_float* taua,
                                 lapack_complex_float* b, lapack_int ldb,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_cggrqf_work( int matrix_layout, lapack_int m, lapack_int p,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cggrqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggrqf_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cggrqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggrqf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_cggrqf_work( int matrix_layout, lapack_int m, lapack_int p,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cggrqf( &m, &p, &n, a_t, &lda_t, taua, b_t, &ldb_t, taub, work,
                        &lwork, &info );
@@ -92,19 +92,19 @@ lapack_int LAPACKE_cggrqf_work( int matrix_layout, lapack_int m, lapack_int p,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cggrqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggrqf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cggrqf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggrqf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggsvd.c b/LAPACKE/src/lapacke_cggsvd.c
index 16d622a76c..a40f693753 100644
--- a/LAPACKE/src/lapacke_cggsvd.c
+++ b/LAPACKE/src/lapacke_cggsvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggsvd( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_cggsvd)( int matrix_layout, char jobu, char jobv, char jobq,
                            lapack_int m, lapack_int n, lapack_int p,
                            lapack_int* k, lapack_int* l,
                            lapack_complex_float* a, lapack_int lda,
@@ -46,16 +46,16 @@ lapack_int LAPACKE_cggsvd( int matrix_layout, char jobu, char jobv, char jobq,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cggsvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -10;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -12;
         }
     }
@@ -73,7 +73,7 @@ lapack_int LAPACKE_cggsvd( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cggsvd_work( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
+    info = API_SUFFIX(LAPACKE_cggsvd_work)( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
                                 a, lda, b, ldb, alpha, beta, u, ldu, v, ldv, q,
                                 ldq, work, rwork, iwork );
     /* Release memory and exit */
@@ -82,7 +82,7 @@ lapack_int LAPACKE_cggsvd( int matrix_layout, char jobu, char jobv, char jobq,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cggsvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggsvd3.c b/LAPACKE/src/lapacke_cggsvd3.c
index e0a00c6165..6cdd88eadc 100644
--- a/LAPACKE/src/lapacke_cggsvd3.c
+++ b/LAPACKE/src/lapacke_cggsvd3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggsvd3( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_cggsvd3)( int matrix_layout, char jobu, char jobv, char jobq,
                             lapack_int m, lapack_int n, lapack_int p,
                             lapack_int* k, lapack_int* l,
                             lapack_complex_float* a, lapack_int lda,
@@ -48,22 +48,22 @@ lapack_int LAPACKE_cggsvd3( int matrix_layout, char jobu, char jobv, char jobq,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cggsvd3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd3", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -10;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -12;
         }
     }
 #endif
     /* Query optimal size for working array */
-    info = LAPACKE_cggsvd3_work( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
+    info = API_SUFFIX(LAPACKE_cggsvd3_work)( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
                                  a, lda, b, ldb, alpha, beta, u, ldu, v, ldv, q,
                                  ldq, &work_query, lwork, rwork, iwork );
     if( info != 0 )
@@ -82,7 +82,7 @@ lapack_int LAPACKE_cggsvd3( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cggsvd3_work( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
+    info = API_SUFFIX(LAPACKE_cggsvd3_work)( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
                                  a, lda, b, ldb, alpha, beta, u, ldu, v, ldv, q,
                                  ldq, work, lwork, rwork, iwork );
     /* Release memory and exit */
@@ -91,7 +91,7 @@ lapack_int LAPACKE_cggsvd3( int matrix_layout, char jobu, char jobv, char jobq,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cggsvd3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggsvd3_work.c b/LAPACKE/src/lapacke_cggsvd3_work.c
index 17b6b54b04..6cfb38e320 100644
--- a/LAPACKE/src/lapacke_cggsvd3_work.c
+++ b/LAPACKE/src/lapacke_cggsvd3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggsvd3_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_cggsvd3_work)( int matrix_layout, char jobu, char jobv,
                                   char jobq, lapack_int m, lapack_int n,
                                   lapack_int p, lapack_int* k, lapack_int* l,
                                   lapack_complex_float* a, lapack_int lda,
@@ -67,27 +67,27 @@ lapack_int LAPACKE_cggsvd3_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd3_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_cggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd3_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_cggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd3_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_cggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd3_work", info );
             return info;
         }
         if( ldv < p ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_cggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -111,7 +111,7 @@ lapack_int LAPACKE_cggsvd3_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldu_t * MAX(1,m) );
@@ -120,7 +120,7 @@ lapack_int LAPACKE_cggsvd3_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldv_t * MAX(1,p) );
@@ -129,7 +129,7 @@ lapack_int LAPACKE_cggsvd3_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldq_t * MAX(1,n) );
@@ -139,8 +139,8 @@ lapack_int LAPACKE_cggsvd3_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cggsvd3( &jobu, &jobv, &jobq, &m, &n, &p, k, l, a_t, &lda_t, b_t,
                         &ldb_t, alpha, beta, u_t, &ldu_t, v_t, &ldv_t, q_t,
@@ -149,27 +149,27 @@ lapack_int LAPACKE_cggsvd3_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -178,11 +178,11 @@ lapack_int LAPACKE_cggsvd3_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cggsvd3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggsvd_work.c b/LAPACKE/src/lapacke_cggsvd_work.c
index ce6d50cbeb..44cf6d09bc 100644
--- a/LAPACKE/src/lapacke_cggsvd_work.c
+++ b/LAPACKE/src/lapacke_cggsvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggsvd_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_cggsvd_work)( int matrix_layout, char jobu, char jobv,
                                 char jobq, lapack_int m, lapack_int n,
                                 lapack_int p, lapack_int* k, lapack_int* l,
                                 lapack_complex_float* a, lapack_int lda,
@@ -67,27 +67,27 @@ lapack_int LAPACKE_cggsvd_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_cggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_cggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_cggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd_work", info );
             return info;
         }
         if( ldv < p ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_cggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -103,7 +103,7 @@ lapack_int LAPACKE_cggsvd_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldu_t * MAX(1,m) );
@@ -112,7 +112,7 @@ lapack_int LAPACKE_cggsvd_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldv_t * MAX(1,p) );
@@ -121,7 +121,7 @@ lapack_int LAPACKE_cggsvd_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldq_t * MAX(1,n) );
@@ -131,8 +131,8 @@ lapack_int LAPACKE_cggsvd_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cggsvd( &jobu, &jobv, &jobq, &m, &n, &p, k, l, a_t, &lda_t, b_t,
                        &ldb_t, alpha, beta, u_t, &ldu_t, v_t, &ldv_t, q_t,
@@ -141,27 +141,27 @@ lapack_int LAPACKE_cggsvd_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -170,11 +170,11 @@ lapack_int LAPACKE_cggsvd_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cggsvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggsvp.c b/LAPACKE/src/lapacke_cggsvp.c
index 324b23197b..bcc6b5df25 100644
--- a/LAPACKE/src/lapacke_cggsvp.c
+++ b/LAPACKE/src/lapacke_cggsvp.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggsvp( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_cggsvp)( int matrix_layout, char jobu, char jobv, char jobq,
                            lapack_int m, lapack_int p, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* b, lapack_int ldb, float tola,
@@ -47,22 +47,22 @@ lapack_int LAPACKE_cggsvp( int matrix_layout, char jobu, char jobv, char jobq,
     lapack_complex_float* tau = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cggsvp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_s_nancheck( 1, &tola, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &tola, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_s_nancheck( 1, &tolb, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &tolb, 1 ) ) {
             return -13;
         }
     }
@@ -91,7 +91,7 @@ lapack_int LAPACKE_cggsvp( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_3;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cggsvp_work( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
+    info = API_SUFFIX(LAPACKE_cggsvp_work)( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
                                 b, ldb, tola, tolb, k, l, u, ldu, v, ldv, q,
                                 ldq, iwork, rwork, tau, work );
     /* Release memory and exit */
@@ -104,7 +104,7 @@ lapack_int LAPACKE_cggsvp( int matrix_layout, char jobu, char jobv, char jobq,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cggsvp", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggsvp3.c b/LAPACKE/src/lapacke_cggsvp3.c
index b82b5a0048..b1c258d33b 100644
--- a/LAPACKE/src/lapacke_cggsvp3.c
+++ b/LAPACKE/src/lapacke_cggsvp3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggsvp3( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_cggsvp3)( int matrix_layout, char jobu, char jobv, char jobq,
                             lapack_int m, lapack_int p, lapack_int n,
                             lapack_complex_float* a, lapack_int lda,
                             lapack_complex_float* b, lapack_int ldb, float tola,
@@ -49,28 +49,28 @@ lapack_int LAPACKE_cggsvp3( int matrix_layout, char jobu, char jobv, char jobq,
     lapack_int lwork = -1;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cggsvp3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp3", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_s_nancheck( 1, &tola, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &tola, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_s_nancheck( 1, &tolb, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &tolb, 1 ) ) {
             return -13;
         }
     }
 #endif
     /* Query optimal size for working array */
-    info = LAPACKE_cggsvp3_work( matrix_layout, jobu, jobv, jobq, m, p, n,
+    info = API_SUFFIX(LAPACKE_cggsvp3_work)( matrix_layout, jobu, jobv, jobq, m, p, n,
                                  a, lda, b, ldb, tola, tolb, k, l, u, ldu,
                                  v, ldv, q, ldq, iwork, rwork, tau,
                                  &work_query, lwork );
@@ -101,7 +101,7 @@ lapack_int LAPACKE_cggsvp3( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_3;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cggsvp3_work( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
+    info = API_SUFFIX(LAPACKE_cggsvp3_work)( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
                                  b, ldb, tola, tolb, k, l, u, ldu, v, ldv, q,
                                  ldq, iwork, rwork, tau, work, lwork );
     /* Release memory and exit */
@@ -114,7 +114,7 @@ lapack_int LAPACKE_cggsvp3( int matrix_layout, char jobu, char jobv, char jobq,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cggsvp3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggsvp3_work.c b/LAPACKE/src/lapacke_cggsvp3_work.c
index 28ca7d9a95..067fde065b 100644
--- a/LAPACKE/src/lapacke_cggsvp3_work.c
+++ b/LAPACKE/src/lapacke_cggsvp3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggsvp3_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_cggsvp3_work)( int matrix_layout, char jobu, char jobv,
                                  char jobq, lapack_int m, lapack_int p,
                                  lapack_int n, lapack_complex_float* a,
                                  lapack_int lda, lapack_complex_float* b,
@@ -68,27 +68,27 @@ lapack_int LAPACKE_cggsvp3_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp3_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp3_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_cggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp3_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_cggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp3_work", info );
             return info;
         }
         if( ldv < p ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_cggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -111,7 +111,7 @@ lapack_int LAPACKE_cggsvp3_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldu_t * MAX(1,m) );
@@ -120,7 +120,7 @@ lapack_int LAPACKE_cggsvp3_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldv_t * MAX(1,p) );
@@ -129,7 +129,7 @@ lapack_int LAPACKE_cggsvp3_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldq_t * MAX(1,n) );
@@ -139,8 +139,8 @@ lapack_int LAPACKE_cggsvp3_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cggsvp3( &jobu, &jobv, &jobq, &m, &p, &n, a_t, &lda_t, b_t,
                         &ldb_t, &tola, &tolb, k, l, u_t, &ldu_t, v_t, &ldv_t,
@@ -149,27 +149,27 @@ lapack_int LAPACKE_cggsvp3_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -178,11 +178,11 @@ lapack_int LAPACKE_cggsvp3_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cggsvp3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cggsvp_work.c b/LAPACKE/src/lapacke_cggsvp_work.c
index fc04a92fdc..6bd3a72ed7 100644
--- a/LAPACKE/src/lapacke_cggsvp_work.c
+++ b/LAPACKE/src/lapacke_cggsvp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cggsvp_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_cggsvp_work)( int matrix_layout, char jobu, char jobv,
                                 char jobq, lapack_int m, lapack_int p,
                                 lapack_int n, lapack_complex_float* a,
                                 lapack_int lda, lapack_complex_float* b,
@@ -68,27 +68,27 @@ lapack_int LAPACKE_cggsvp_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_cggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_cggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp_work", info );
             return info;
         }
         if( ldv < m ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_cggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -104,7 +104,7 @@ lapack_int LAPACKE_cggsvp_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldu_t * MAX(1,m) );
@@ -113,7 +113,7 @@ lapack_int LAPACKE_cggsvp_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldv_t * MAX(1,m) );
@@ -122,7 +122,7 @@ lapack_int LAPACKE_cggsvp_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldq_t * MAX(1,n) );
@@ -132,8 +132,8 @@ lapack_int LAPACKE_cggsvp_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cggsvp( &jobu, &jobv, &jobq, &m, &p, &n, a_t, &lda_t, b_t,
                        &ldb_t, &tola, &tolb, k, l, u_t, &ldu_t, v_t, &ldv_t,
@@ -142,27 +142,27 @@ lapack_int LAPACKE_cggsvp_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, p, m, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, p, m, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -171,11 +171,11 @@ lapack_int LAPACKE_cggsvp_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cggsvp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cggsvp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgtcon.c b/LAPACKE/src/lapacke_cgtcon.c
index d79f95cf76..7b80382a61 100644
--- a/LAPACKE/src/lapacke_cgtcon.c
+++ b/LAPACKE/src/lapacke_cgtcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgtcon( char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgtcon)( char norm, lapack_int n,
                            const lapack_complex_float* dl,
                            const lapack_complex_float* d,
                            const lapack_complex_float* du,
@@ -44,19 +44,19 @@ lapack_int LAPACKE_cgtcon( char norm, lapack_int n,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_c_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_c_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, dl, 1 ) ) {
             return -3;
         }
-        if( LAPACKE_c_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, du, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_c_nancheck( n-2, du2, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-2, du2, 1 ) ) {
             return -6;
         }
     }
@@ -69,13 +69,13 @@ lapack_int LAPACKE_cgtcon( char norm, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgtcon_work( norm, n, dl, d, du, du2, ipiv, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_cgtcon_work)( norm, n, dl, d, du, du2, ipiv, anorm, rcond,
                                 work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgtcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgtcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgtcon_work.c b/LAPACKE/src/lapacke_cgtcon_work.c
index b3f729b0de..da5660365a 100644
--- a/LAPACKE/src/lapacke_cgtcon_work.c
+++ b/LAPACKE/src/lapacke_cgtcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgtcon_work( char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgtcon_work)( char norm, lapack_int n,
                                 const lapack_complex_float* dl,
                                 const lapack_complex_float* d,
                                 const lapack_complex_float* du,
diff --git a/LAPACKE/src/lapacke_cgtrfs.c b/LAPACKE/src/lapacke_cgtrfs.c
index 80094adcf4..1c7bbb5f64 100644
--- a/LAPACKE/src/lapacke_cgtrfs.c
+++ b/LAPACKE/src/lapacke_cgtrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgtrfs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgtrfs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* dl,
                            const lapack_complex_float* d,
                            const lapack_complex_float* du,
@@ -49,37 +49,37 @@ lapack_int LAPACKE_cgtrfs( int matrix_layout, char trans, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgtrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgtrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
-        if( LAPACKE_c_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n, d, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_c_nancheck( n, df, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n, df, 1 ) ) {
             return -9;
         }
-        if( LAPACKE_c_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, dl, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_c_nancheck( n-1, dlf, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, dlf, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_c_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, du, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_c_nancheck( n-2, du2, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-2, du2, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_c_nancheck( n-1, duf, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, duf, 1 ) ) {
             return -10;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -15;
         }
     }
@@ -97,7 +97,7 @@ lapack_int LAPACKE_cgtrfs( int matrix_layout, char trans, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgtrfs_work( matrix_layout, trans, n, nrhs, dl, d, du, dlf,
+    info = API_SUFFIX(LAPACKE_cgtrfs_work)( matrix_layout, trans, n, nrhs, dl, d, du, dlf,
                                 df, duf, du2, ipiv, b, ldb, x, ldx, ferr, berr,
                                 work, rwork );
     /* Release memory and exit */
@@ -106,7 +106,7 @@ lapack_int LAPACKE_cgtrfs( int matrix_layout, char trans, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgtrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgtrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgtrfs_work.c b/LAPACKE/src/lapacke_cgtrfs_work.c
index 83330ce126..19873838a7 100644
--- a/LAPACKE/src/lapacke_cgtrfs_work.c
+++ b/LAPACKE/src/lapacke_cgtrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgtrfs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgtrfs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* dl,
                                 const lapack_complex_float* d,
                                 const lapack_complex_float* du,
@@ -62,12 +62,12 @@ lapack_int LAPACKE_cgtrfs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_cgtrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgtrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_cgtrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgtrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -86,8 +86,8 @@ lapack_int LAPACKE_cgtrfs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgtrfs( &trans, &n, &nrhs, dl, d, du, dlf, df, duf, du2, ipiv,
                        b_t, &ldb_t, x_t, &ldx_t, ferr, berr, work, rwork,
@@ -96,18 +96,18 @@ lapack_int LAPACKE_cgtrfs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgtrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgtrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgtrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgtrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgtsv.c b/LAPACKE/src/lapacke_cgtsv.c
index 1002f6f743..d9725da1ab 100644
--- a/LAPACKE/src/lapacke_cgtsv.c
+++ b/LAPACKE/src/lapacke_cgtsv.c
@@ -32,31 +32,31 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgtsv( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_cgtsv)( int matrix_layout, lapack_int n, lapack_int nrhs,
                           lapack_complex_float* dl, lapack_complex_float* d,
                           lapack_complex_float* du, lapack_complex_float* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgtsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgtsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_c_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_c_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, dl, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_c_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, du, 1 ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_cgtsv_work( matrix_layout, n, nrhs, dl, d, du, b, ldb );
+    return API_SUFFIX(LAPACKE_cgtsv_work)( matrix_layout, n, nrhs, dl, d, du, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_cgtsv_work.c b/LAPACKE/src/lapacke_cgtsv_work.c
index 926b109f3e..5a61a105dd 100644
--- a/LAPACKE/src/lapacke_cgtsv_work.c
+++ b/LAPACKE/src/lapacke_cgtsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgtsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_cgtsv_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                lapack_complex_float* dl,
                                lapack_complex_float* d,
                                lapack_complex_float* du,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_cgtsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cgtsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgtsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,23 +63,23 @@ lapack_int LAPACKE_cgtsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgtsv( &n, &nrhs, dl, d, du, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgtsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgtsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgtsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgtsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgtsvx.c b/LAPACKE/src/lapacke_cgtsvx.c
index 1cfe558579..b971e84893 100644
--- a/LAPACKE/src/lapacke_cgtsvx.c
+++ b/LAPACKE/src/lapacke_cgtsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgtsvx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_cgtsvx)( int matrix_layout, char fact, char trans,
                            lapack_int n, lapack_int nrhs,
                            const lapack_complex_float* dl,
                            const lapack_complex_float* d,
@@ -48,41 +48,41 @@ lapack_int LAPACKE_cgtsvx( int matrix_layout, char fact, char trans,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgtsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgtsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -14;
         }
-        if( LAPACKE_c_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n, d, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_c_nancheck( n, df, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_c_nancheck)( n, df, 1 ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_c_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, dl, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_c_nancheck( n-1, dlf, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, dlf, 1 ) ) {
                 return -9;
             }
         }
-        if( LAPACKE_c_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, du, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_c_nancheck( n-2, du2, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_c_nancheck)( n-2, du2, 1 ) ) {
                 return -12;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_c_nancheck( n-1, duf, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, duf, 1 ) ) {
                 return -11;
             }
         }
@@ -101,7 +101,7 @@ lapack_int LAPACKE_cgtsvx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cgtsvx_work( matrix_layout, fact, trans, n, nrhs, dl, d, du,
+    info = API_SUFFIX(LAPACKE_cgtsvx_work)( matrix_layout, fact, trans, n, nrhs, dl, d, du,
                                 dlf, df, duf, du2, ipiv, b, ldb, x, ldx, rcond,
                                 ferr, berr, work, rwork );
     /* Release memory and exit */
@@ -110,7 +110,7 @@ lapack_int LAPACKE_cgtsvx( int matrix_layout, char fact, char trans,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cgtsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgtsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgtsvx_work.c b/LAPACKE/src/lapacke_cgtsvx_work.c
index 2873010ed0..c2939470a8 100644
--- a/LAPACKE/src/lapacke_cgtsvx_work.c
+++ b/LAPACKE/src/lapacke_cgtsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgtsvx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_cgtsvx_work)( int matrix_layout, char fact, char trans,
                                 lapack_int n, lapack_int nrhs,
                                 const lapack_complex_float* dl,
                                 const lapack_complex_float* d,
@@ -63,12 +63,12 @@ lapack_int LAPACKE_cgtsvx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_cgtsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgtsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_cgtsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgtsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -87,7 +87,7 @@ lapack_int LAPACKE_cgtsvx_work( int matrix_layout, char fact, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgtsvx( &fact, &trans, &n, &nrhs, dl, d, du, dlf, df, duf, du2,
                        ipiv, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr, berr, work,
@@ -96,18 +96,18 @@ lapack_int LAPACKE_cgtsvx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgtsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgtsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgtsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgtsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cgttrf.c b/LAPACKE/src/lapacke_cgttrf.c
index f63ec8e8b1..012d3b4e23 100644
--- a/LAPACKE/src/lapacke_cgttrf.c
+++ b/LAPACKE/src/lapacke_cgttrf.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgttrf( lapack_int n, lapack_complex_float* dl,
+lapack_int API_SUFFIX(LAPACKE_cgttrf)( lapack_int n, lapack_complex_float* dl,
                            lapack_complex_float* d, lapack_complex_float* du,
                            lapack_complex_float* du2, lapack_int* ipiv )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_c_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n, d, 1 ) ) {
             return -3;
         }
-        if( LAPACKE_c_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, dl, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_c_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, du, 1 ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_cgttrf_work( n, dl, d, du, du2, ipiv );
+    return API_SUFFIX(LAPACKE_cgttrf_work)( n, dl, d, du, du2, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_cgttrf_work.c b/LAPACKE/src/lapacke_cgttrf_work.c
index d55ebb3f77..4c3c7a21ec 100644
--- a/LAPACKE/src/lapacke_cgttrf_work.c
+++ b/LAPACKE/src/lapacke_cgttrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgttrf_work( lapack_int n, lapack_complex_float* dl,
+lapack_int API_SUFFIX(LAPACKE_cgttrf_work)( lapack_int n, lapack_complex_float* dl,
                                 lapack_complex_float* d,
                                 lapack_complex_float* du,
                                 lapack_complex_float* du2, lapack_int* ipiv )
diff --git a/LAPACKE/src/lapacke_cgttrs.c b/LAPACKE/src/lapacke_cgttrs.c
index 696f66649a..1ccd388382 100644
--- a/LAPACKE/src/lapacke_cgttrs.c
+++ b/LAPACKE/src/lapacke_cgttrs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgttrs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgttrs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* dl,
                            const lapack_complex_float* d,
                            const lapack_complex_float* du,
@@ -41,29 +41,29 @@ lapack_int LAPACKE_cgttrs( int matrix_layout, char trans, lapack_int n,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cgttrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgttrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_c_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n, d, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_c_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, dl, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_c_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, du, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_c_nancheck( n-2, du2, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-2, du2, 1 ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_cgttrs_work( matrix_layout, trans, n, nrhs, dl, d, du, du2,
+    return API_SUFFIX(LAPACKE_cgttrs_work)( matrix_layout, trans, n, nrhs, dl, d, du, du2,
                                 ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_cgttrs_work.c b/LAPACKE/src/lapacke_cgttrs_work.c
index 4d17200b48..9225a2722a 100644
--- a/LAPACKE/src/lapacke_cgttrs_work.c
+++ b/LAPACKE/src/lapacke_cgttrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cgttrs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cgttrs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* dl,
                                 const lapack_complex_float* d,
                                 const lapack_complex_float* du,
@@ -54,7 +54,7 @@ lapack_int LAPACKE_cgttrs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cgttrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgttrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,7 +66,7 @@ lapack_int LAPACKE_cgttrs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cgttrs( &trans, &n, &nrhs, dl, d, du, du2, ipiv, b_t, &ldb_t,
                        &info );
@@ -74,16 +74,16 @@ lapack_int LAPACKE_cgttrs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cgttrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgttrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cgttrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgttrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbev.c b/LAPACKE/src/lapacke_chbev.c
index 9f0da84a8f..a0241df28d 100644
--- a/LAPACKE/src/lapacke_chbev.c
+++ b/LAPACKE/src/lapacke_chbev.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbev( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chbev)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_int kd, lapack_complex_float* ab,
                           lapack_int ldab, float* w, lapack_complex_float* z,
                           lapack_int ldz )
@@ -41,13 +41,13 @@ lapack_int LAPACKE_chbev( int matrix_layout, char jobz, char uplo, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chbev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_chb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
     }
@@ -65,7 +65,7 @@ lapack_int LAPACKE_chbev( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chbev_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_chbev_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                ldz, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -73,7 +73,7 @@ lapack_int LAPACKE_chbev( int matrix_layout, char jobz, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chbev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbev_2stage.c b/LAPACKE/src/lapacke_chbev_2stage.c
index aeba6302cc..58122b43fe 100644
--- a/LAPACKE/src/lapacke_chbev_2stage.c
+++ b/LAPACKE/src/lapacke_chbev_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbev_2stage( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chbev_2stage)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_int kd, lapack_complex_float* ab,
                           lapack_int ldab, float* w, lapack_complex_float* z,
                           lapack_int ldz )
@@ -43,19 +43,19 @@ lapack_int LAPACKE_chbev_2stage( int matrix_layout, char jobz, char uplo, lapack
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chbev_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbev_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_chb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chbev_2stage_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_chbev_2stage_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                ldz, &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -74,7 +74,7 @@ lapack_int LAPACKE_chbev_2stage( int matrix_layout, char jobz, char uplo, lapack
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chbev_2stage_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_chbev_2stage_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                ldz, work, lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -82,7 +82,7 @@ lapack_int LAPACKE_chbev_2stage( int matrix_layout, char jobz, char uplo, lapack
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chbev_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbev_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbev_2stage_work.c b/LAPACKE/src/lapacke_chbev_2stage_work.c
index 809ebea5f6..8c2b7828d8 100644
--- a/LAPACKE/src/lapacke_chbev_2stage_work.c
+++ b/LAPACKE/src/lapacke_chbev_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbev_2stage_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chbev_2stage_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_int kd,
                                lapack_complex_float* ab, lapack_int ldab,
                                float* w, lapack_complex_float* z,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_chbev_2stage_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_chbev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbev_2stage_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_chbev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbev_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -76,7 +76,7 @@ lapack_int LAPACKE_chbev_2stage_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,n) );
@@ -86,7 +86,7 @@ lapack_int LAPACKE_chbev_2stage_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_chb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_chb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chbev_2stage( &jobz, &uplo, &n, &kd, ab_t, &ldab_t, w, z_t, &ldz_t,
                       work, &lwork, rwork, &info );
@@ -94,24 +94,24 @@ lapack_int LAPACKE_chbev_2stage_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_chb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_chb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chbev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbev_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chbev_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbev_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbev_work.c b/LAPACKE/src/lapacke_chbev_work.c
index 933c5afd93..2485843a3d 100644
--- a/LAPACKE/src/lapacke_chbev_work.c
+++ b/LAPACKE/src/lapacke_chbev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbev_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chbev_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_int kd,
                                lapack_complex_float* ab, lapack_int ldab,
                                float* w, lapack_complex_float* z,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_chbev_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_chbev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbev_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_chbev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbev_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,7 +70,7 @@ lapack_int LAPACKE_chbev_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,n) );
@@ -80,7 +80,7 @@ lapack_int LAPACKE_chbev_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_chb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_chb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chbev( &jobz, &uplo, &n, &kd, ab_t, &ldab_t, w, z_t, &ldz_t,
                       work, rwork, &info );
@@ -88,24 +88,24 @@ lapack_int LAPACKE_chbev_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_chb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_chb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chbev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chbev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbevd.c b/LAPACKE/src/lapacke_chbevd.c
index 0321d7baf8..f613bdcd9c 100644
--- a/LAPACKE/src/lapacke_chbevd.c
+++ b/LAPACKE/src/lapacke_chbevd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbevd( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chbevd)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_int kd, lapack_complex_float* ab,
                            lapack_int ldab, float* w, lapack_complex_float* z,
                            lapack_int ldz )
@@ -48,19 +48,19 @@ lapack_int LAPACKE_chbevd( int matrix_layout, char jobz, char uplo, lapack_int n
     float rwork_query;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chbevd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_chb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chbevd_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_chbevd_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                 ldz, &work_query, lwork, &rwork_query, lrwork,
                                 &iwork_query, liwork );
     if( info != 0 ) {
@@ -87,7 +87,7 @@ lapack_int LAPACKE_chbevd( int matrix_layout, char jobz, char uplo, lapack_int n
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chbevd_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_chbevd_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                 ldz, work, lwork, rwork, lrwork, iwork,
                                 liwork );
     /* Release memory and exit */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_chbevd( int matrix_layout, char jobz, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chbevd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbevd_2stage.c b/LAPACKE/src/lapacke_chbevd_2stage.c
index 839e74b3c8..1c44ed9495 100644
--- a/LAPACKE/src/lapacke_chbevd_2stage.c
+++ b/LAPACKE/src/lapacke_chbevd_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbevd_2stage( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chbevd_2stage)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_int kd, lapack_complex_float* ab,
                            lapack_int ldab, float* w, lapack_complex_float* z,
                            lapack_int ldz )
@@ -48,19 +48,19 @@ lapack_int LAPACKE_chbevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     float rwork_query;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chbevd_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevd_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_chb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chbevd_2stage_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_chbevd_2stage_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                 ldz, &work_query, lwork, &rwork_query, lrwork,
                                 &iwork_query, liwork );
     if( info != 0 ) {
@@ -87,7 +87,7 @@ lapack_int LAPACKE_chbevd_2stage( int matrix_layout, char jobz, char uplo, lapac
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chbevd_2stage_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_chbevd_2stage_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                 ldz, work, lwork, rwork, lrwork, iwork,
                                 liwork );
     /* Release memory and exit */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_chbevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chbevd_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevd_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbevd_2stage_work.c b/LAPACKE/src/lapacke_chbevd_2stage_work.c
index 83cdd05ee4..56e0f1a22c 100644
--- a/LAPACKE/src/lapacke_chbevd_2stage_work.c
+++ b/LAPACKE/src/lapacke_chbevd_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbevd_2stage_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chbevd_2stage_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_int kd,
                                 lapack_complex_float* ab, lapack_int ldab,
                                 float* w, lapack_complex_float* z,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_chbevd_2stage_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_chbevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevd_2stage_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_chbevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevd_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,7 +79,7 @@ lapack_int LAPACKE_chbevd_2stage_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,n) );
@@ -89,7 +89,7 @@ lapack_int LAPACKE_chbevd_2stage_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_chb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_chb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chbevd_2stage( &jobz, &uplo, &n, &kd, ab_t, &ldab_t, w, z_t, &ldz_t,
                        work, &lwork, rwork, &lrwork, iwork, &liwork, &info );
@@ -97,24 +97,24 @@ lapack_int LAPACKE_chbevd_2stage_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_chb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_chb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chbevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevd_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chbevd_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevd_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbevd_work.c b/LAPACKE/src/lapacke_chbevd_work.c
index ce554ad787..61be1330b7 100644
--- a/LAPACKE/src/lapacke_chbevd_work.c
+++ b/LAPACKE/src/lapacke_chbevd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbevd_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chbevd_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_int kd,
                                 lapack_complex_float* ab, lapack_int ldab,
                                 float* w, lapack_complex_float* z,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_chbevd_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_chbevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevd_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_chbevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,7 +79,7 @@ lapack_int LAPACKE_chbevd_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,n) );
@@ -89,7 +89,7 @@ lapack_int LAPACKE_chbevd_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_chb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_chb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chbevd( &jobz, &uplo, &n, &kd, ab_t, &ldab_t, w, z_t, &ldz_t,
                        work, &lwork, rwork, &lrwork, iwork, &liwork, &info );
@@ -97,24 +97,24 @@ lapack_int LAPACKE_chbevd_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_chb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_chb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chbevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chbevd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbevx.c b/LAPACKE/src/lapacke_chbevx.c
index fba050c365..9d829ac84d 100644
--- a/LAPACKE/src/lapacke_chbevx.c
+++ b/LAPACKE/src/lapacke_chbevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbevx( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chbevx)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_int kd,
                            lapack_complex_float* ab, lapack_int ldab,
                            lapack_complex_float* q, lapack_int ldq, float vl,
@@ -45,25 +45,25 @@ lapack_int LAPACKE_chbevx( int matrix_layout, char jobz, char range, char uplo,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chbevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_chb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -15;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -12;
             }
         }
@@ -87,7 +87,7 @@ lapack_int LAPACKE_chbevx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chbevx_work( matrix_layout, jobz, range, uplo, n, kd, ab,
+    info = API_SUFFIX(LAPACKE_chbevx_work)( matrix_layout, jobz, range, uplo, n, kd, ab,
                                 ldab, q, ldq, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, work, rwork, iwork, ifail );
     /* Release memory and exit */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_chbevx( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chbevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbevx_2stage.c b/LAPACKE/src/lapacke_chbevx_2stage.c
index ea94132b6c..2545d3c0e2 100644
--- a/LAPACKE/src/lapacke_chbevx_2stage.c
+++ b/LAPACKE/src/lapacke_chbevx_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbevx_2stage( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chbevx_2stage)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_int kd,
                            lapack_complex_float* ab, lapack_int ldab,
                            lapack_complex_float* q, lapack_int ldq, float vl,
@@ -47,32 +47,32 @@ lapack_int LAPACKE_chbevx_2stage( int matrix_layout, char jobz, char range, char
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chbevx_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevx_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_chb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -15;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -12;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chbevx_2stage_work( matrix_layout, jobz, range, uplo, n, kd, ab,
+    info = API_SUFFIX(LAPACKE_chbevx_2stage_work)( matrix_layout, jobz, range, uplo, n, kd, ab,
                                 ldab, q, ldq, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, &work_query, lwork, rwork, iwork, ifail );
     if( info != 0 ) {
@@ -97,7 +97,7 @@ lapack_int LAPACKE_chbevx_2stage( int matrix_layout, char jobz, char range, char
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chbevx_2stage_work( matrix_layout, jobz, range, uplo, n, kd, ab,
+    info = API_SUFFIX(LAPACKE_chbevx_2stage_work)( matrix_layout, jobz, range, uplo, n, kd, ab,
                                 ldab, q, ldq, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, work, lwork, rwork, iwork, ifail );
     /* Release memory and exit */
@@ -108,7 +108,7 @@ lapack_int LAPACKE_chbevx_2stage( int matrix_layout, char jobz, char range, char
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chbevx_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevx_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbevx_2stage_work.c b/LAPACKE/src/lapacke_chbevx_2stage_work.c
index 9e8a26842d..2371e6d941 100644
--- a/LAPACKE/src/lapacke_chbevx_2stage_work.c
+++ b/LAPACKE/src/lapacke_chbevx_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbevx_2stage_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_chbevx_2stage_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, lapack_int kd,
                                 lapack_complex_float* ab, lapack_int ldab,
                                 lapack_complex_float* q, lapack_int ldq,
@@ -53,9 +53,9 @@ lapack_int LAPACKE_chbevx_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldab_t = MAX(1,kd+1);
         lapack_int ldq_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
@@ -65,17 +65,17 @@ lapack_int LAPACKE_chbevx_2stage_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_chbevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevx_2stage_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_chbevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevx_2stage_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_chbevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevx_2stage_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -85,7 +85,7 @@ lapack_int LAPACKE_chbevx_2stage_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             q_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldq_t * MAX(1,n) );
@@ -94,7 +94,7 @@ lapack_int LAPACKE_chbevx_2stage_work( int matrix_layout, char jobz, char range,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -111,7 +111,7 @@ lapack_int LAPACKE_chbevx_2stage_work( int matrix_layout, char jobz, char range,
             return (info < 0) ? (info - 1) : info;
         }
         /* Transpose input matrices */
-        LAPACKE_chb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_chb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chbevx_2stage( &jobz, &range, &uplo, &n, &kd, ab_t, &ldab_t, q_t,
                        &ldq_t, &vl, &vu, &il, &iu, &abstol, m, w, z_t, &ldz_t,
@@ -120,32 +120,32 @@ lapack_int LAPACKE_chbevx_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_chb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_chb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chbevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevx_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chbevx_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevx_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbevx_work.c b/LAPACKE/src/lapacke_chbevx_work.c
index ddebb9e735..ffc6c177c6 100644
--- a/LAPACKE/src/lapacke_chbevx_work.c
+++ b/LAPACKE/src/lapacke_chbevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbevx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_chbevx_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, lapack_int kd,
                                 lapack_complex_float* ab, lapack_int ldab,
                                 lapack_complex_float* q, lapack_int ldq,
@@ -53,9 +53,9 @@ lapack_int LAPACKE_chbevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldab_t = MAX(1,kd+1);
         lapack_int ldq_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
@@ -65,17 +65,17 @@ lapack_int LAPACKE_chbevx_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_chbevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevx_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_chbevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevx_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_chbevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -85,7 +85,7 @@ lapack_int LAPACKE_chbevx_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             q_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldq_t * MAX(1,n) );
@@ -94,7 +94,7 @@ lapack_int LAPACKE_chbevx_work( int matrix_layout, char jobz, char range,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -104,7 +104,7 @@ lapack_int LAPACKE_chbevx_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_chb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_chb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chbevx( &jobz, &range, &uplo, &n, &kd, ab_t, &ldab_t, q_t,
                        &ldq_t, &vl, &vu, &il, &iu, &abstol, m, w, z_t, &ldz_t,
@@ -113,32 +113,32 @@ lapack_int LAPACKE_chbevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_chb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_chb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chbevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chbevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbgst.c b/LAPACKE/src/lapacke_chbgst.c
index 13d4272593..d098cdc7f6 100644
--- a/LAPACKE/src/lapacke_chbgst.c
+++ b/LAPACKE/src/lapacke_chbgst.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbgst( int matrix_layout, char vect, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chbgst)( int matrix_layout, char vect, char uplo, lapack_int n,
                            lapack_int ka, lapack_int kb,
                            lapack_complex_float* ab, lapack_int ldab,
                            const lapack_complex_float* bb, lapack_int ldbb,
@@ -42,16 +42,16 @@ lapack_int LAPACKE_chbgst( int matrix_layout, char vect, char uplo, lapack_int n
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chbgst", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgst", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chb_nancheck( matrix_layout, uplo, n, ka, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_chb_nancheck)( matrix_layout, uplo, n, ka, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_chb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_chb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -9;
         }
     }
@@ -69,7 +69,7 @@ lapack_int LAPACKE_chbgst( int matrix_layout, char vect, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chbgst_work( matrix_layout, vect, uplo, n, ka, kb, ab, ldab,
+    info = API_SUFFIX(LAPACKE_chbgst_work)( matrix_layout, vect, uplo, n, ka, kb, ab, ldab,
                                 bb, ldbb, x, ldx, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -77,7 +77,7 @@ lapack_int LAPACKE_chbgst( int matrix_layout, char vect, char uplo, lapack_int n
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chbgst", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgst", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbgst_work.c b/LAPACKE/src/lapacke_chbgst_work.c
index a04b04a26a..4d31dd1838 100644
--- a/LAPACKE/src/lapacke_chbgst_work.c
+++ b/LAPACKE/src/lapacke_chbgst_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbgst_work( int matrix_layout, char vect, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chbgst_work)( int matrix_layout, char vect, char uplo,
                                 lapack_int n, lapack_int ka, lapack_int kb,
                                 lapack_complex_float* ab, lapack_int ldab,
                                 const lapack_complex_float* bb, lapack_int ldbb,
@@ -57,17 +57,17 @@ lapack_int LAPACKE_chbgst_work( int matrix_layout, char vect, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_chbgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgst_work", info );
             return info;
         }
         if( ldbb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_chbgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgst_work", info );
             return info;
         }
         if( ldx < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_chbgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgst_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -83,7 +83,7 @@ lapack_int LAPACKE_chbgst_work( int matrix_layout, char vect, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( vect, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
             x_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldx_t * MAX(1,n) );
@@ -93,8 +93,8 @@ lapack_int LAPACKE_chbgst_work( int matrix_layout, char vect, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_chb_trans( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
-        LAPACKE_chb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_chb_trans)( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_chb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chbgst( &vect, &uplo, &n, &ka, &kb, ab_t, &ldab_t, bb_t, &ldbb_t,
                        x_t, &ldx_t, work, rwork, &info );
@@ -102,13 +102,13 @@ lapack_int LAPACKE_chbgst_work( int matrix_layout, char vect, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_chb_trans( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_chb_trans)( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( vect, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, x_t, ldx_t, x, ldx );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, x_t, ldx_t, x, ldx );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( vect, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
             LAPACKE_free( x_t );
         }
 exit_level_2:
@@ -117,11 +117,11 @@ lapack_int LAPACKE_chbgst_work( int matrix_layout, char vect, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chbgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgst_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chbgst_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgst_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbgv.c b/LAPACKE/src/lapacke_chbgv.c
index d28f0f1f31..6b7dda8dbb 100644
--- a/LAPACKE/src/lapacke_chbgv.c
+++ b/LAPACKE/src/lapacke_chbgv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbgv( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chbgv)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_int ka, lapack_int kb,
                           lapack_complex_float* ab, lapack_int ldab,
                           lapack_complex_float* bb, lapack_int ldbb, float* w,
@@ -42,16 +42,16 @@ lapack_int LAPACKE_chbgv( int matrix_layout, char jobz, char uplo, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chbgv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chb_nancheck( matrix_layout, uplo, n, ka, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_chb_nancheck)( matrix_layout, uplo, n, ka, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_chb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_chb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -9;
         }
     }
@@ -69,7 +69,7 @@ lapack_int LAPACKE_chbgv( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chbgv_work( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
+    info = API_SUFFIX(LAPACKE_chbgv_work)( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
                                bb, ldbb, w, z, ldz, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -77,7 +77,7 @@ lapack_int LAPACKE_chbgv( int matrix_layout, char jobz, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chbgv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbgv_work.c b/LAPACKE/src/lapacke_chbgv_work.c
index b977a94fa8..de2abb0168 100644
--- a/LAPACKE/src/lapacke_chbgv_work.c
+++ b/LAPACKE/src/lapacke_chbgv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbgv_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chbgv_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_int ka, lapack_int kb,
                                lapack_complex_float* ab, lapack_int ldab,
                                lapack_complex_float* bb, lapack_int ldbb,
@@ -58,17 +58,17 @@ lapack_int LAPACKE_chbgv_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_chbgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgv_work", info );
             return info;
         }
         if( ldbb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_chbgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgv_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_chbgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -84,7 +84,7 @@ lapack_int LAPACKE_chbgv_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,n) );
@@ -94,8 +94,8 @@ lapack_int LAPACKE_chbgv_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_chb_trans( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
-        LAPACKE_chb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_chb_trans)( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_chb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chbgv( &jobz, &uplo, &n, &ka, &kb, ab_t, &ldab_t, bb_t, &ldbb_t,
                       w, z_t, &ldz_t, work, rwork, &info );
@@ -103,15 +103,15 @@ lapack_int LAPACKE_chbgv_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_chb_trans( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_chb_trans)( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_chb_trans( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
+        API_SUFFIX(LAPACKE_chb_trans)( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
                            ldbb );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
@@ -120,11 +120,11 @@ lapack_int LAPACKE_chbgv_work( int matrix_layout, char jobz, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chbgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chbgv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbgvd.c b/LAPACKE/src/lapacke_chbgvd.c
index f1b037a116..42fdbf784e 100644
--- a/LAPACKE/src/lapacke_chbgvd.c
+++ b/LAPACKE/src/lapacke_chbgvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbgvd( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chbgvd)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_int ka, lapack_int kb,
                            lapack_complex_float* ab, lapack_int ldab,
                            lapack_complex_float* bb, lapack_int ldbb, float* w,
@@ -49,22 +49,22 @@ lapack_int LAPACKE_chbgvd( int matrix_layout, char jobz, char uplo, lapack_int n
     float rwork_query;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chbgvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chb_nancheck( matrix_layout, uplo, n, ka, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_chb_nancheck)( matrix_layout, uplo, n, ka, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_chb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_chb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chbgvd_work( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
+    info = API_SUFFIX(LAPACKE_chbgvd_work)( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
                                 bb, ldbb, w, z, ldz, &work_query, lwork,
                                 &rwork_query, lrwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -91,7 +91,7 @@ lapack_int LAPACKE_chbgvd( int matrix_layout, char jobz, char uplo, lapack_int n
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chbgvd_work( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
+    info = API_SUFFIX(LAPACKE_chbgvd_work)( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
                                 bb, ldbb, w, z, ldz, work, lwork, rwork, lrwork,
                                 iwork, liwork );
     /* Release memory and exit */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_chbgvd( int matrix_layout, char jobz, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chbgvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbgvd_work.c b/LAPACKE/src/lapacke_chbgvd_work.c
index f6e2ac84a2..7aff46d95c 100644
--- a/LAPACKE/src/lapacke_chbgvd_work.c
+++ b/LAPACKE/src/lapacke_chbgvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbgvd_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chbgvd_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_int ka, lapack_int kb,
                                 lapack_complex_float* ab, lapack_int ldab,
                                 lapack_complex_float* bb, lapack_int ldbb,
@@ -61,17 +61,17 @@ lapack_int LAPACKE_chbgvd_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_chbgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgvd_work", info );
             return info;
         }
         if( ldbb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_chbgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgvd_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_chbgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgvd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -94,7 +94,7 @@ lapack_int LAPACKE_chbgvd_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,n) );
@@ -104,8 +104,8 @@ lapack_int LAPACKE_chbgvd_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_chb_trans( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
-        LAPACKE_chb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_chb_trans)( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_chb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chbgvd( &jobz, &uplo, &n, &ka, &kb, ab_t, &ldab_t, bb_t, &ldbb_t,
                        w, z_t, &ldz_t, work, &lwork, rwork, &lrwork, iwork,
@@ -114,15 +114,15 @@ lapack_int LAPACKE_chbgvd_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_chb_trans( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_chb_trans)( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_chb_trans( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
+        API_SUFFIX(LAPACKE_chb_trans)( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
                            ldbb );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
@@ -131,11 +131,11 @@ lapack_int LAPACKE_chbgvd_work( int matrix_layout, char jobz, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chbgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chbgvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbgvx.c b/LAPACKE/src/lapacke_chbgvx.c
index 736c33e887..ae9260fcfd 100644
--- a/LAPACKE/src/lapacke_chbgvx.c
+++ b/LAPACKE/src/lapacke_chbgvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbgvx( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chbgvx)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_int ka, lapack_int kb,
                            lapack_complex_float* ab, lapack_int ldab,
                            lapack_complex_float* bb, lapack_int ldbb,
@@ -46,28 +46,28 @@ lapack_int LAPACKE_chbgvx( int matrix_layout, char jobz, char range, char uplo,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chbgvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chb_nancheck( matrix_layout, uplo, n, ka, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_chb_nancheck)( matrix_layout, uplo, n, ka, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -18;
         }
-        if( LAPACKE_chb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_chb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -14;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -15;
             }
         }
@@ -91,7 +91,7 @@ lapack_int LAPACKE_chbgvx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chbgvx_work( matrix_layout, jobz, range, uplo, n, ka, kb, ab,
+    info = API_SUFFIX(LAPACKE_chbgvx_work)( matrix_layout, jobz, range, uplo, n, ka, kb, ab,
                                 ldab, bb, ldbb, q, ldq, vl, vu, il, iu, abstol,
                                 m, w, z, ldz, work, rwork, iwork, ifail );
     /* Release memory and exit */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_chbgvx( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chbgvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbgvx_work.c b/LAPACKE/src/lapacke_chbgvx_work.c
index 1fe2c9e69d..11f329ecc6 100644
--- a/LAPACKE/src/lapacke_chbgvx_work.c
+++ b/LAPACKE/src/lapacke_chbgvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbgvx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_chbgvx_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, lapack_int ka,
                                 lapack_int kb, lapack_complex_float* ab,
                                 lapack_int ldab, lapack_complex_float* bb,
@@ -65,22 +65,22 @@ lapack_int LAPACKE_chbgvx_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_chbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgvx_work", info );
             return info;
         }
         if( ldbb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_chbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgvx_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_chbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgvx_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -22;
-            LAPACKE_xerbla( "LAPACKE_chbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -96,7 +96,7 @@ lapack_int LAPACKE_chbgvx_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             q_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldq_t * MAX(1,n) );
@@ -105,7 +105,7 @@ lapack_int LAPACKE_chbgvx_work( int matrix_layout, char jobz, char range,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,n) );
@@ -115,8 +115,8 @@ lapack_int LAPACKE_chbgvx_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_chb_trans( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
-        LAPACKE_chb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_chb_trans)( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_chb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chbgvx( &jobz, &range, &uplo, &n, &ka, &kb, ab_t, &ldab_t, bb_t,
                        &ldbb_t, q_t, &ldq_t, &vl, &vu, &il, &iu, &abstol, m, w,
@@ -125,22 +125,22 @@ lapack_int LAPACKE_chbgvx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_chb_trans( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_chb_trans)( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_chb_trans( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
+        API_SUFFIX(LAPACKE_chb_trans)( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
                            ldbb );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_2:
@@ -149,11 +149,11 @@ lapack_int LAPACKE_chbgvx_work( int matrix_layout, char jobz, char range,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chbgvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbgvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbtrd.c b/LAPACKE/src/lapacke_chbtrd.c
index c54dc555fe..74ad8129a3 100644
--- a/LAPACKE/src/lapacke_chbtrd.c
+++ b/LAPACKE/src/lapacke_chbtrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbtrd( int matrix_layout, char vect, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chbtrd)( int matrix_layout, char vect, char uplo, lapack_int n,
                            lapack_int kd, lapack_complex_float* ab,
                            lapack_int ldab, float* d, float* e,
                            lapack_complex_float* q, lapack_int ldq )
@@ -40,17 +40,17 @@ lapack_int LAPACKE_chbtrd( int matrix_layout, char vect, char uplo, lapack_int n
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chbtrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbtrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_chb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( vect, 'u' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -10;
             }
         }
@@ -64,13 +64,13 @@ lapack_int LAPACKE_chbtrd( int matrix_layout, char vect, char uplo, lapack_int n
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chbtrd_work( matrix_layout, vect, uplo, n, kd, ab, ldab, d, e,
+    info = API_SUFFIX(LAPACKE_chbtrd_work)( matrix_layout, vect, uplo, n, kd, ab, ldab, d, e,
                                 q, ldq, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chbtrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbtrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chbtrd_work.c b/LAPACKE/src/lapacke_chbtrd_work.c
index 3b58b0e2b8..d0b44c5caa 100644
--- a/LAPACKE/src/lapacke_chbtrd_work.c
+++ b/LAPACKE/src/lapacke_chbtrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chbtrd_work( int matrix_layout, char vect, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chbtrd_work)( int matrix_layout, char vect, char uplo,
                                 lapack_int n, lapack_int kd,
                                 lapack_complex_float* ab, lapack_int ldab,
                                 float* d, float* e, lapack_complex_float* q,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_chbtrd_work( int matrix_layout, char vect, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_chbtrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbtrd_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_chbtrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbtrd_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -69,7 +69,7 @@ lapack_int LAPACKE_chbtrd_work( int matrix_layout, char vect, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( vect, 'u' ) || LAPACKE_lsame( vect, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
             q_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldq_t * MAX(1,n) );
@@ -79,9 +79,9 @@ lapack_int LAPACKE_chbtrd_work( int matrix_layout, char vect, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_chb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        if( LAPACKE_lsame( vect, 'u' ) || LAPACKE_lsame( vect, 'v' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_chb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_chbtrd( &vect, &uplo, &n, &kd, ab_t, &ldab_t, d, e, q_t, &ldq_t,
@@ -90,24 +90,24 @@ lapack_int LAPACKE_chbtrd_work( int matrix_layout, char vect, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_chb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_chb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( vect, 'u' ) || LAPACKE_lsame( vect, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( vect, 'u' ) || LAPACKE_lsame( vect, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chbtrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbtrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chbtrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chbtrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_checon.c b/LAPACKE/src/lapacke_checon.c
index af00a5366f..e4a57df6ea 100644
--- a/LAPACKE/src/lapacke_checon.c
+++ b/LAPACKE/src/lapacke_checon.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_checon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_checon)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_float* a, lapack_int lda,
                            const lapack_int* ipiv, float anorm, float* rcond )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_checon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_checon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -7;
         }
     }
@@ -61,13 +61,13 @@ lapack_int LAPACKE_checon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_checon_work( matrix_layout, uplo, n, a, lda, ipiv, anorm,
+    info = API_SUFFIX(LAPACKE_checon_work)( matrix_layout, uplo, n, a, lda, ipiv, anorm,
                                 rcond, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_checon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_checon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_checon_3.c b/LAPACKE/src/lapacke_checon_3.c
index 08a2f0e130..28591a3f38 100644
--- a/LAPACKE/src/lapacke_checon_3.c
+++ b/LAPACKE/src/lapacke_checon_3.c
@@ -32,28 +32,28 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_checon_3( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_checon_3)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_float* a, lapack_int lda,
                            const lapack_complex_float* e,
                            const lapack_int* ipiv, float anorm, float* rcond )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
-    lapack_int e_start = LAPACKE_lsame( uplo, 'U' ) ? 1 : 0;
+    lapack_int e_start = API_SUFFIX(LAPACKE_lsame)( uplo, 'U' ) ? 1 : 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_checon_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_checon_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_c_nancheck( n-1, e + e_start, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, e + e_start, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -8;
         }
     }
@@ -66,13 +66,13 @@ lapack_int LAPACKE_checon_3( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_checon_3_work( matrix_layout, uplo, n, a, lda, e, ipiv, anorm,
+    info = API_SUFFIX(LAPACKE_checon_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv, anorm,
                                 rcond, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_checon_3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_checon_3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_checon_3_work.c b/LAPACKE/src/lapacke_checon_3_work.c
index 30294c58b8..e23df7fa12 100644
--- a/LAPACKE/src/lapacke_checon_3_work.c
+++ b/LAPACKE/src/lapacke_checon_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_checon_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_checon_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_float* a, lapack_int lda,
                                 const lapack_complex_float* e,
                                 const lapack_int* ipiv, float anorm,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_checon_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_checon_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_checon_3_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -62,7 +62,7 @@ lapack_int LAPACKE_checon_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_checon_3( &uplo, &n, a_t, &lda_t, e, ipiv, &anorm, rcond, work,
                        &info );
@@ -73,11 +73,11 @@ lapack_int LAPACKE_checon_3_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_checon_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_checon_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_checon_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_checon_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_checon_work.c b/LAPACKE/src/lapacke_checon_work.c
index e0977e0b02..27ae39caa7 100644
--- a/LAPACKE/src/lapacke_checon_work.c
+++ b/LAPACKE/src/lapacke_checon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_checon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_checon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_float* a, lapack_int lda,
                                 const lapack_int* ipiv, float anorm,
                                 float* rcond, lapack_complex_float* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_checon_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_checon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_checon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_checon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_checon( &uplo, &n, a_t, &lda_t, ipiv, &anorm, rcond, work,
                        &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_checon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_checon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_checon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_checon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_checon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheequb.c b/LAPACKE/src/lapacke_cheequb.c
index 795d074f59..7f4d6351e9 100644
--- a/LAPACKE/src/lapacke_cheequb.c
+++ b/LAPACKE/src/lapacke_cheequb.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheequb( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cheequb)( int matrix_layout, char uplo, lapack_int n,
                             const lapack_complex_float* a, lapack_int lda,
                             float* s, float* scond, float* amax )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cheequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheequb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -58,13 +58,13 @@ lapack_int LAPACKE_cheequb( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cheequb_work( matrix_layout, uplo, n, a, lda, s, scond, amax,
+    info = API_SUFFIX(LAPACKE_cheequb_work)( matrix_layout, uplo, n, a, lda, s, scond, amax,
                                  work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cheequb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheequb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheequb_work.c b/LAPACKE/src/lapacke_cheequb_work.c
index 730bcb759e..7ea7179102 100644
--- a/LAPACKE/src/lapacke_cheequb_work.c
+++ b/LAPACKE/src/lapacke_cheequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheequb_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cheequb_work)( int matrix_layout, char uplo, lapack_int n,
                                  const lapack_complex_float* a, lapack_int lda,
                                  float* s, float* scond, float* amax,
                                  lapack_complex_float* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cheequb_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cheequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_cheequb_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cheequb( &uplo, &n, a_t, &lda_t, s, scond, amax, work, &info );
         if( info < 0 ) {
@@ -71,11 +71,11 @@ lapack_int LAPACKE_cheequb_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cheequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cheequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheev.c b/LAPACKE/src/lapacke_cheev.c
index 02e5df29dc..a499986fde 100644
--- a/LAPACKE/src/lapacke_cheev.c
+++ b/LAPACKE/src/lapacke_cheev.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheev( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cheev)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_complex_float* a, lapack_int lda, float* w )
 {
     lapack_int info = 0;
@@ -41,13 +41,13 @@ lapack_int LAPACKE_cheev( int matrix_layout, char jobz, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cheev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
@@ -59,7 +59,7 @@ lapack_int LAPACKE_cheev( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cheev_work( matrix_layout, jobz, uplo, n, a, lda, w,
+    info = API_SUFFIX(LAPACKE_cheev_work)( matrix_layout, jobz, uplo, n, a, lda, w,
                                &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -73,7 +73,7 @@ lapack_int LAPACKE_cheev( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cheev_work( matrix_layout, jobz, uplo, n, a, lda, w, work,
+    info = API_SUFFIX(LAPACKE_cheev_work)( matrix_layout, jobz, uplo, n, a, lda, w, work,
                                lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -81,7 +81,7 @@ lapack_int LAPACKE_cheev( int matrix_layout, char jobz, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cheev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheev_2stage.c b/LAPACKE/src/lapacke_cheev_2stage.c
index 4e18f9b380..45283d8563 100644
--- a/LAPACKE/src/lapacke_cheev_2stage.c
+++ b/LAPACKE/src/lapacke_cheev_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheev_2stage( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cheev_2stage)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_complex_float* a, lapack_int lda, float* w )
 {
     lapack_int info = 0;
@@ -41,13 +41,13 @@ lapack_int LAPACKE_cheev_2stage( int matrix_layout, char jobz, char uplo, lapack
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cheev_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheev_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
@@ -59,7 +59,7 @@ lapack_int LAPACKE_cheev_2stage( int matrix_layout, char jobz, char uplo, lapack
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cheev_2stage_work( matrix_layout, jobz, uplo, n, a, lda, w,
+    info = API_SUFFIX(LAPACKE_cheev_2stage_work)( matrix_layout, jobz, uplo, n, a, lda, w,
                                &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -73,7 +73,7 @@ lapack_int LAPACKE_cheev_2stage( int matrix_layout, char jobz, char uplo, lapack
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cheev_2stage_work( matrix_layout, jobz, uplo, n, a, lda, w, work,
+    info = API_SUFFIX(LAPACKE_cheev_2stage_work)( matrix_layout, jobz, uplo, n, a, lda, w, work,
                                lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -81,7 +81,7 @@ lapack_int LAPACKE_cheev_2stage( int matrix_layout, char jobz, char uplo, lapack
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cheev_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheev_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheev_2stage_work.c b/LAPACKE/src/lapacke_cheev_2stage_work.c
index 4efb6c03db..3c341728d2 100644
--- a/LAPACKE/src/lapacke_cheev_2stage_work.c
+++ b/LAPACKE/src/lapacke_cheev_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheev_2stage_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cheev_2stage_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_complex_float* a,
                                lapack_int lda, float* w,
                                lapack_complex_float* work, lapack_int lwork,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_cheev_2stage_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cheev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheev_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -69,7 +69,7 @@ lapack_int LAPACKE_cheev_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 );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cheev_2stage( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, rwork,
                       &info );
@@ -77,16 +77,16 @@ lapack_int LAPACKE_cheev_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 );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cheev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheev_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cheev_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheev_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheev_work.c b/LAPACKE/src/lapacke_cheev_work.c
index 3cf5a963f9..a7f3a871a4 100644
--- a/LAPACKE/src/lapacke_cheev_work.c
+++ b/LAPACKE/src/lapacke_cheev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheev_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cheev_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_complex_float* a,
                                lapack_int lda, float* w,
                                lapack_complex_float* work, lapack_int lwork,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_cheev_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cheev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheev_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -69,7 +69,7 @@ lapack_int LAPACKE_cheev_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(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,19 +78,19 @@ lapack_int LAPACKE_cheev_work( int matrix_layout, char jobz, char uplo,
         }
         /* Transpose output matrices */
         if ( jobz == 'V' || jobz == 'v' ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         } else {
-            LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+            API_SUFFIX(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:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cheev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cheev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheevd.c b/LAPACKE/src/lapacke_cheevd.c
index 56bfc411ce..48765be638 100644
--- a/LAPACKE/src/lapacke_cheevd.c
+++ b/LAPACKE/src/lapacke_cheevd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheevd( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cheevd)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda, float* w )
 {
     lapack_int info = 0;
@@ -46,19 +46,19 @@ lapack_int LAPACKE_cheevd( int matrix_layout, char jobz, char uplo, lapack_int n
     float rwork_query;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cheevd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cheevd_work( matrix_layout, jobz, uplo, n, a, lda, w,
+    info = API_SUFFIX(LAPACKE_cheevd_work)( matrix_layout, jobz, uplo, n, a, lda, w,
                                 &work_query, lwork, &rwork_query, lrwork,
                                 &iwork_query, liwork );
     if( info != 0 ) {
@@ -85,7 +85,7 @@ lapack_int LAPACKE_cheevd( int matrix_layout, char jobz, char uplo, lapack_int n
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cheevd_work( matrix_layout, jobz, uplo, n, a, lda, w, work,
+    info = API_SUFFIX(LAPACKE_cheevd_work)( matrix_layout, jobz, uplo, n, a, lda, w, work,
                                 lwork, rwork, lrwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -95,7 +95,7 @@ lapack_int LAPACKE_cheevd( int matrix_layout, char jobz, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cheevd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheevd_2stage.c b/LAPACKE/src/lapacke_cheevd_2stage.c
index 4fa71d2526..a5220dc8e7 100644
--- a/LAPACKE/src/lapacke_cheevd_2stage.c
+++ b/LAPACKE/src/lapacke_cheevd_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheevd_2stage( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cheevd_2stage)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda, float* w )
 {
     lapack_int info = 0;
@@ -46,19 +46,19 @@ lapack_int LAPACKE_cheevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     float rwork_query;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cheevd_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevd_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cheevd_2stage_work( matrix_layout, jobz, uplo, n, a, lda, w,
+    info = API_SUFFIX(LAPACKE_cheevd_2stage_work)( matrix_layout, jobz, uplo, n, a, lda, w,
                                 &work_query, lwork, &rwork_query, lrwork,
                                 &iwork_query, liwork );
     if( info != 0 ) {
@@ -85,7 +85,7 @@ lapack_int LAPACKE_cheevd_2stage( int matrix_layout, char jobz, char uplo, lapac
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cheevd_2stage_work( matrix_layout, jobz, uplo, n, a, lda, w, work,
+    info = API_SUFFIX(LAPACKE_cheevd_2stage_work)( matrix_layout, jobz, uplo, n, a, lda, w, work,
                                 lwork, rwork, lrwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -95,7 +95,7 @@ lapack_int LAPACKE_cheevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cheevd_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevd_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheevd_2stage_work.c b/LAPACKE/src/lapacke_cheevd_2stage_work.c
index b2c861206b..32b58602a2 100644
--- a/LAPACKE/src/lapacke_cheevd_2stage_work.c
+++ b/LAPACKE/src/lapacke_cheevd_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheevd_2stage_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cheevd_2stage_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_complex_float* a,
                                 lapack_int lda, float* w,
                                 lapack_complex_float* work, lapack_int lwork,
@@ -53,7 +53,7 @@ lapack_int LAPACKE_cheevd_2stage_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cheevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevd_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -70,7 +70,7 @@ lapack_int LAPACKE_cheevd_2stage_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(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,19 +79,19 @@ lapack_int LAPACKE_cheevd_2stage_work( int matrix_layout, char jobz, char uplo,
         }
         /* Transpose output matrices */
         if ( jobz == 'V' || jobz == 'v' ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         } else {
-            LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda ); 
+            API_SUFFIX(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:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cheevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevd_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cheevd_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevd_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheevd_work.c b/LAPACKE/src/lapacke_cheevd_work.c
index 942c8b3eb1..15592d8fa8 100644
--- a/LAPACKE/src/lapacke_cheevd_work.c
+++ b/LAPACKE/src/lapacke_cheevd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheevd_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cheevd_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_complex_float* a,
                                 lapack_int lda, float* w,
                                 lapack_complex_float* work, lapack_int lwork,
@@ -53,7 +53,7 @@ lapack_int LAPACKE_cheevd_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cheevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -70,7 +70,7 @@ lapack_int LAPACKE_cheevd_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(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,19 +79,19 @@ lapack_int LAPACKE_cheevd_work( int matrix_layout, char jobz, char uplo,
         }
         /* Transpose output matrices */
         if ( jobz == 'V' || jobz == 'v' ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         } else { 
-            LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+            API_SUFFIX(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:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cheevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cheevd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheevr.c b/LAPACKE/src/lapacke_cheevr.c
index bfa2468d70..d2f1d8238f 100644
--- a/LAPACKE/src/lapacke_cheevr.c
+++ b/LAPACKE/src/lapacke_cheevr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheevr( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cheevr)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_complex_float* a,
                            lapack_int lda, float vl, float vu, lapack_int il,
                            lapack_int iu, float abstol, lapack_int* m, float* w,
@@ -50,32 +50,32 @@ lapack_int LAPACKE_cheevr( int matrix_layout, char jobz, char range, char uplo,
     float rwork_query;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cheevr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -9;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cheevr_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_cheevr_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, isuppz,
                                 &work_query, lwork, &rwork_query, lrwork,
                                 &iwork_query, liwork );
@@ -103,7 +103,7 @@ lapack_int LAPACKE_cheevr( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cheevr_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_cheevr_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, isuppz, work,
                                 lwork, rwork, lrwork, iwork, liwork );
     /* Release memory and exit */
@@ -114,7 +114,7 @@ lapack_int LAPACKE_cheevr( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cheevr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheevr_2stage.c b/LAPACKE/src/lapacke_cheevr_2stage.c
index 788d287696..01ba48dcf8 100644
--- a/LAPACKE/src/lapacke_cheevr_2stage.c
+++ b/LAPACKE/src/lapacke_cheevr_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheevr_2stage( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cheevr_2stage)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_complex_float* a,
                            lapack_int lda, float vl, float vu, lapack_int il,
                            lapack_int iu, float abstol, lapack_int* m, float* w,
@@ -50,32 +50,32 @@ lapack_int LAPACKE_cheevr_2stage( int matrix_layout, char jobz, char range, char
     float rwork_query;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cheevr_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevr_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -9;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cheevr_2stage_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_cheevr_2stage_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, isuppz,
                                 &work_query, lwork, &rwork_query, lrwork,
                                 &iwork_query, liwork );
@@ -103,7 +103,7 @@ lapack_int LAPACKE_cheevr_2stage( int matrix_layout, char jobz, char range, char
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cheevr_2stage_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_cheevr_2stage_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, isuppz, work,
                                 lwork, rwork, lrwork, iwork, liwork );
     /* Release memory and exit */
@@ -114,7 +114,7 @@ lapack_int LAPACKE_cheevr_2stage( int matrix_layout, char jobz, char range, char
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cheevr_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevr_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheevr_2stage_work.c b/LAPACKE/src/lapacke_cheevr_2stage_work.c
index 29525cbebf..7365e5410e 100644
--- a/LAPACKE/src/lapacke_cheevr_2stage_work.c
+++ b/LAPACKE/src/lapacke_cheevr_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheevr_2stage_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_cheevr_2stage_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 float vl, float vu, lapack_int il,
@@ -53,9 +53,9 @@ lapack_int LAPACKE_cheevr_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
         lapack_complex_float* a_t = NULL;
@@ -63,12 +63,12 @@ lapack_int LAPACKE_cheevr_2stage_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cheevr_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevr_2stage_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_cheevr_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevr_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -85,7 +85,7 @@ lapack_int LAPACKE_cheevr_2stage_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -95,7 +95,7 @@ lapack_int LAPACKE_cheevr_2stage_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cheevr_2stage( &jobz, &range, &uplo, &n, a_t, &lda_t, &vl, &vu, &il,
                        &iu, &abstol, m, w, z_t, &ldz_t, isuppz, work, &lwork,
@@ -104,24 +104,24 @@ lapack_int LAPACKE_cheevr_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_che_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cheevr_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevr_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cheevr_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevr_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheevr_work.c b/LAPACKE/src/lapacke_cheevr_work.c
index 3e4f75ef49..7c4a8523fd 100644
--- a/LAPACKE/src/lapacke_cheevr_work.c
+++ b/LAPACKE/src/lapacke_cheevr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheevr_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_cheevr_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 float vl, float vu, lapack_int il,
@@ -53,10 +53,10 @@ lapack_int LAPACKE_cheevr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( !LAPACKE_lsame( jobz, 'v' ) ) ? 1 :
-                             ( LAPACKE_lsame( range, 'a' ) ||
-                               LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( !API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) ? 1 :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                               API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
         lapack_complex_float* a_t = NULL;
@@ -64,12 +64,12 @@ lapack_int LAPACKE_cheevr_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cheevr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevr_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_cheevr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -86,7 +86,7 @@ lapack_int LAPACKE_cheevr_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -96,7 +96,7 @@ lapack_int LAPACKE_cheevr_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cheevr( &jobz, &range, &uplo, &n, a_t, &lda_t, &vl, &vu, &il,
                        &iu, &abstol, m, w, z_t, &ldz_t, isuppz, work, &lwork,
@@ -105,24 +105,24 @@ lapack_int LAPACKE_cheevr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_che_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cheevr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cheevr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheevx.c b/LAPACKE/src/lapacke_cheevx.c
index 44cae07d2d..582fc77e62 100644
--- a/LAPACKE/src/lapacke_cheevx.c
+++ b/LAPACKE/src/lapacke_cheevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheevx( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cheevx)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_complex_float* a,
                            lapack_int lda, float vl, float vu, lapack_int il,
                            lapack_int iu, float abstol, lapack_int* m, float* w,
@@ -46,25 +46,25 @@ lapack_int LAPACKE_cheevx( int matrix_layout, char jobz, char range, char uplo,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cheevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -9;
             }
         }
@@ -82,7 +82,7 @@ lapack_int LAPACKE_cheevx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cheevx_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_cheevx_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, &work_query,
                                 lwork, rwork, iwork, ifail );
     if( info != 0 ) {
@@ -97,7 +97,7 @@ lapack_int LAPACKE_cheevx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cheevx_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_cheevx_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, work, lwork,
                                 rwork, iwork, ifail );
     /* Release memory and exit */
@@ -108,7 +108,7 @@ lapack_int LAPACKE_cheevx( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cheevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheevx_2stage.c b/LAPACKE/src/lapacke_cheevx_2stage.c
index 22b6594ed7..d98c65c09c 100644
--- a/LAPACKE/src/lapacke_cheevx_2stage.c
+++ b/LAPACKE/src/lapacke_cheevx_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheevx_2stage( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cheevx_2stage)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_complex_float* a,
                            lapack_int lda, float vl, float vu, lapack_int il,
                            lapack_int iu, float abstol, lapack_int* m, float* w,
@@ -46,25 +46,25 @@ lapack_int LAPACKE_cheevx_2stage( int matrix_layout, char jobz, char range, char
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cheevx_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevx_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -9;
             }
         }
@@ -82,7 +82,7 @@ lapack_int LAPACKE_cheevx_2stage( int matrix_layout, char jobz, char range, char
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cheevx_2stage_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_cheevx_2stage_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, &work_query,
                                 lwork, rwork, iwork, ifail );
     if( info != 0 ) {
@@ -97,7 +97,7 @@ lapack_int LAPACKE_cheevx_2stage( int matrix_layout, char jobz, char range, char
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cheevx_2stage_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_cheevx_2stage_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, work, lwork,
                                 rwork, iwork, ifail );
     /* Release memory and exit */
@@ -108,7 +108,7 @@ lapack_int LAPACKE_cheevx_2stage( int matrix_layout, char jobz, char range, char
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cheevx_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevx_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheevx_2stage_work.c b/LAPACKE/src/lapacke_cheevx_2stage_work.c
index 4d90468cee..088f92157c 100644
--- a/LAPACKE/src/lapacke_cheevx_2stage_work.c
+++ b/LAPACKE/src/lapacke_cheevx_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheevx_2stage_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_cheevx_2stage_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 float vl, float vu, lapack_int il,
@@ -52,9 +52,9 @@ lapack_int LAPACKE_cheevx_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
         lapack_complex_float* a_t = NULL;
@@ -62,12 +62,12 @@ lapack_int LAPACKE_cheevx_2stage_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cheevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevx_2stage_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_cheevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevx_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,7 +84,7 @@ lapack_int LAPACKE_cheevx_2stage_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -94,7 +94,7 @@ lapack_int LAPACKE_cheevx_2stage_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cheevx_2stage( &jobz, &range, &uplo, &n, a_t, &lda_t, &vl, &vu, &il,
                        &iu, &abstol, m, w, z_t, &ldz_t, work, &lwork, rwork,
@@ -103,24 +103,24 @@ lapack_int LAPACKE_cheevx_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_che_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cheevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevx_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cheevx_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevx_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheevx_work.c b/LAPACKE/src/lapacke_cheevx_work.c
index ca0ed9ec70..bc47dfa8b1 100644
--- a/LAPACKE/src/lapacke_cheevx_work.c
+++ b/LAPACKE/src/lapacke_cheevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheevx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_cheevx_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 float vl, float vu, lapack_int il,
@@ -52,10 +52,10 @@ lapack_int LAPACKE_cheevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( !LAPACKE_lsame( jobz, 'v' ) ) ? 1 :
-                             ( LAPACKE_lsame( range, 'a' ) ||
-                               LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( !API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) ? 1 :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                               API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
         lapack_complex_float* a_t = NULL;
@@ -63,12 +63,12 @@ lapack_int LAPACKE_cheevx_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cheevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevx_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_cheevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -85,7 +85,7 @@ lapack_int LAPACKE_cheevx_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -95,7 +95,7 @@ lapack_int LAPACKE_cheevx_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cheevx( &jobz, &range, &uplo, &n, a_t, &lda_t, &vl, &vu, &il,
                        &iu, &abstol, m, w, z_t, &ldz_t, work, &lwork, rwork,
@@ -104,24 +104,24 @@ lapack_int LAPACKE_cheevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_che_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cheevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cheevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chegst.c b/LAPACKE/src/lapacke_chegst.c
index d4961620d5..93405f49d6 100644
--- a/LAPACKE/src/lapacke_chegst.c
+++ b/LAPACKE/src/lapacke_chegst.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chegst( int matrix_layout, lapack_int itype, char uplo,
+lapack_int API_SUFFIX(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 ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chegst", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegst", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_chegst_work( matrix_layout, itype, uplo, n, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_chegst_work)( matrix_layout, itype, uplo, n, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_chegst_work.c b/LAPACKE/src/lapacke_chegst_work.c
index 9318e02dda..048f9e5b78 100644
--- a/LAPACKE/src/lapacke_chegst_work.c
+++ b/LAPACKE/src/lapacke_chegst_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chegst_work( int matrix_layout, lapack_int itype, char uplo,
+lapack_int API_SUFFIX(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 ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_chegst_work( int matrix_layout, lapack_int itype, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_chegst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegst_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_chegst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegst_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -74,26 +74,26 @@ lapack_int LAPACKE_chegst_work( int matrix_layout, lapack_int itype, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chegst( &itype, &uplo, &n, a_t, &lda_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_che_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chegst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegst_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chegst_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegst_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chegv.c b/LAPACKE/src/lapacke_chegv.c
index 4b676e6250..f65f426512 100644
--- a/LAPACKE/src/lapacke_chegv.c
+++ b/LAPACKE/src/lapacke_chegv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chegv( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_chegv)( int matrix_layout, lapack_int itype, char jobz,
                           char uplo, lapack_int n, lapack_complex_float* a,
                           lapack_int lda, lapack_complex_float* b,
                           lapack_int ldb, float* w )
@@ -43,16 +43,16 @@ lapack_int LAPACKE_chegv( int matrix_layout, lapack_int itype, char jobz,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chegv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -8;
         }
     }
@@ -64,7 +64,7 @@ lapack_int LAPACKE_chegv( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_chegv_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_chegv_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                ldb, w, &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -78,7 +78,7 @@ lapack_int LAPACKE_chegv( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chegv_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_chegv_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                ldb, w, work, lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -86,7 +86,7 @@ lapack_int LAPACKE_chegv( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chegv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chegv_2stage.c b/LAPACKE/src/lapacke_chegv_2stage.c
index 0ebcb74dc6..041c342c9f 100644
--- a/LAPACKE/src/lapacke_chegv_2stage.c
+++ b/LAPACKE/src/lapacke_chegv_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chegv_2stage( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_chegv_2stage)( int matrix_layout, lapack_int itype, char jobz,
                           char uplo, lapack_int n, lapack_complex_float* a,
                           lapack_int lda, lapack_complex_float* b,
                           lapack_int ldb, float* w )
@@ -43,16 +43,16 @@ lapack_int LAPACKE_chegv_2stage( int matrix_layout, lapack_int itype, char jobz,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chegv_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegv_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -8;
         }
     }
@@ -64,7 +64,7 @@ lapack_int LAPACKE_chegv_2stage( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_chegv_2stage_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_chegv_2stage_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                ldb, w, &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -78,7 +78,7 @@ lapack_int LAPACKE_chegv_2stage( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chegv_2stage_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_chegv_2stage_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                ldb, w, work, lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -86,7 +86,7 @@ lapack_int LAPACKE_chegv_2stage( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chegv_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegv_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chegv_2stage_work.c b/LAPACKE/src/lapacke_chegv_2stage_work.c
index 52a7356a5f..339f99f374 100644
--- a/LAPACKE/src/lapacke_chegv_2stage_work.c
+++ b/LAPACKE/src/lapacke_chegv_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chegv_2stage_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_chegv_2stage_work)( int matrix_layout, lapack_int itype, char jobz,
                                char uplo, lapack_int n, lapack_complex_float* a,
                                lapack_int lda, lapack_complex_float* b,
                                lapack_int ldb, float* w,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_chegv_2stage_work( int matrix_layout, lapack_int itype, char
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_chegv_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegv_2stage_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_chegv_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegv_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_chegv_2stage_work( int matrix_layout, lapack_int itype, char
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chegv_2stage( &itype, &jobz, &uplo, &n, a_t, &lda_t, b_t, &ldb_t, w,
                       work, &lwork, rwork, &info );
@@ -92,19 +92,19 @@ lapack_int LAPACKE_chegv_2stage_work( int matrix_layout, lapack_int itype, char
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chegv_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegv_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chegv_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegv_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chegv_work.c b/LAPACKE/src/lapacke_chegv_work.c
index 35d69120d3..b821aacf78 100644
--- a/LAPACKE/src/lapacke_chegv_work.c
+++ b/LAPACKE/src/lapacke_chegv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chegv_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_chegv_work)( int matrix_layout, lapack_int itype, char jobz,
                                char uplo, lapack_int n, lapack_complex_float* a,
                                lapack_int lda, lapack_complex_float* b,
                                lapack_int ldb, float* w,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_chegv_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_chegv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegv_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_chegv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegv_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_chegv_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chegv( &itype, &jobz, &uplo, &n, a_t, &lda_t, b_t, &ldb_t, w,
                       work, &lwork, rwork, &info );
@@ -92,19 +92,19 @@ lapack_int LAPACKE_chegv_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chegv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chegv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chegvd.c b/LAPACKE/src/lapacke_chegvd.c
index 21a33fadf6..11e91927c3 100644
--- a/LAPACKE/src/lapacke_chegvd.c
+++ b/LAPACKE/src/lapacke_chegvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chegvd( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_chegvd)( int matrix_layout, lapack_int itype, char jobz,
                            char uplo, lapack_int n, lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* b,
                            lapack_int ldb, float* w )
@@ -48,22 +48,22 @@ lapack_int LAPACKE_chegvd( int matrix_layout, lapack_int itype, char jobz,
     float rwork_query;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chegvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chegvd_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_chegvd_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                 ldb, w, &work_query, lwork, &rwork_query,
                                 lrwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -90,7 +90,7 @@ lapack_int LAPACKE_chegvd( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chegvd_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_chegvd_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                 ldb, w, work, lwork, rwork, lrwork, iwork,
                                 liwork );
     /* Release memory and exit */
@@ -101,7 +101,7 @@ lapack_int LAPACKE_chegvd( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chegvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chegvd_work.c b/LAPACKE/src/lapacke_chegvd_work.c
index b9749d9352..10e7dcbde5 100644
--- a/LAPACKE/src/lapacke_chegvd_work.c
+++ b/LAPACKE/src/lapacke_chegvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chegvd_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_chegvd_work)( int matrix_layout, lapack_int itype, char jobz,
                                 char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* b, lapack_int ldb,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_chegvd_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_chegvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegvd_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_chegvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegvd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -86,8 +86,8 @@ lapack_int LAPACKE_chegvd_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chegvd( &itype, &jobz, &uplo, &n, a_t, &lda_t, b_t, &ldb_t, w,
                        work, &lwork, rwork, &lrwork, iwork, &liwork, &info );
@@ -95,19 +95,19 @@ lapack_int LAPACKE_chegvd_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chegvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chegvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chegvx.c b/LAPACKE/src/lapacke_chegvx.c
index 688ea34ff2..236196c8ea 100644
--- a/LAPACKE/src/lapacke_chegvx.c
+++ b/LAPACKE/src/lapacke_chegvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chegvx( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_chegvx)( int matrix_layout, lapack_int itype, char jobz,
                            char range, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* b, lapack_int ldb, float vl,
@@ -47,28 +47,28 @@ lapack_int LAPACKE_chegvx( int matrix_layout, lapack_int itype, char jobz,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chegvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -15;
         }
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -12;
             }
         }
@@ -86,7 +86,7 @@ lapack_int LAPACKE_chegvx( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_chegvx_work( matrix_layout, itype, jobz, range, uplo, n, a,
+    info = API_SUFFIX(LAPACKE_chegvx_work)( matrix_layout, itype, jobz, range, uplo, n, a,
                                 lda, b, ldb, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, &work_query, lwork, rwork, iwork, ifail );
     if( info != 0 ) {
@@ -101,7 +101,7 @@ lapack_int LAPACKE_chegvx( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chegvx_work( matrix_layout, itype, jobz, range, uplo, n, a,
+    info = API_SUFFIX(LAPACKE_chegvx_work)( matrix_layout, itype, jobz, range, uplo, n, a,
                                 lda, b, ldb, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, work, lwork, rwork, iwork, ifail );
     /* Release memory and exit */
@@ -112,7 +112,7 @@ lapack_int LAPACKE_chegvx( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chegvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chegvx_work.c b/LAPACKE/src/lapacke_chegvx_work.c
index 132d0c0e10..cad37eae2a 100644
--- a/LAPACKE/src/lapacke_chegvx_work.c
+++ b/LAPACKE/src/lapacke_chegvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chegvx_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_chegvx_work)( int matrix_layout, lapack_int itype, char jobz,
                                 char range, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* b, lapack_int ldb,
@@ -53,9 +53,9 @@ lapack_int LAPACKE_chegvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldb_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
@@ -65,17 +65,17 @@ lapack_int LAPACKE_chegvx_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_chegvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegvx_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_chegvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegvx_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_chegvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegvx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_chegvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -108,8 +108,8 @@ lapack_int LAPACKE_chegvx_work( int matrix_layout, lapack_int itype, char jobz,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_che_trans( matrix_layout, uplo, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chegvx( &itype, &jobz, &range, &uplo, &n, a_t, &lda_t, b_t,
                        &ldb_t, &vl, &vu, &il, &iu, &abstol, m, w, z_t, &ldz_t,
@@ -118,14 +118,14 @@ lapack_int LAPACKE_chegvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_che_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_che_trans)( LAPACK_COL_MAJOR, uplo, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
@@ -134,11 +134,11 @@ lapack_int LAPACKE_chegvx_work( int matrix_layout, lapack_int itype, char jobz,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chegvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chegvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chegvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cherfs.c b/LAPACKE/src/lapacke_cherfs.c
index dfcda32e12..f84ea8605e 100644
--- a/LAPACKE/src/lapacke_cherfs.c
+++ b/LAPACKE/src/lapacke_cherfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cherfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cherfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* a,
                            lapack_int lda, const lapack_complex_float* af,
                            lapack_int ldaf, const lapack_int* ipiv,
@@ -44,22 +44,22 @@ lapack_int LAPACKE_cherfs( int matrix_layout, char uplo, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cherfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cherfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -77,7 +77,7 @@ lapack_int LAPACKE_cherfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cherfs_work( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
+    info = API_SUFFIX(LAPACKE_cherfs_work)( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
                                 ipiv, b, ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -85,7 +85,7 @@ lapack_int LAPACKE_cherfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cherfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cherfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cherfs_work.c b/LAPACKE/src/lapacke_cherfs_work.c
index 88a000be0c..1d8e68a41b 100644
--- a/LAPACKE/src/lapacke_cherfs_work.c
+++ b/LAPACKE/src/lapacke_cherfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cherfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cherfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* a,
                                 lapack_int lda, const lapack_complex_float* af,
                                 lapack_int ldaf, const lapack_int* ipiv,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_cherfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cherfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cherfs_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cherfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cherfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cherfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cherfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_cherfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cherfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -107,10 +107,10 @@ lapack_int LAPACKE_cherfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_che_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cherfs( &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, ipiv, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, rwork, &info );
@@ -118,7 +118,7 @@ lapack_int LAPACKE_cherfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -129,11 +129,11 @@ lapack_int LAPACKE_cherfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cherfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cherfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cherfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cherfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cherfsx.c b/LAPACKE/src/lapacke_cherfsx.c
index c2da393393..5f566c7527 100644
--- a/LAPACKE/src/lapacke_cherfsx.c
+++ b/LAPACKE/src/lapacke_cherfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cherfsx( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_cherfsx)( int matrix_layout, char uplo, char equed,
                             lapack_int n, lapack_int nrhs,
                             const lapack_complex_float* a, lapack_int lda,
                             const lapack_complex_float* af, lapack_int ldaf,
@@ -47,32 +47,32 @@ lapack_int LAPACKE_cherfsx( int matrix_layout, char uplo, char equed,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cherfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cherfsx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -22;
             }
         }
-        if( LAPACKE_lsame( equed, 'y' ) ) {
-            if( LAPACKE_s_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, s, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -14;
         }
     }
@@ -90,7 +90,7 @@ lapack_int LAPACKE_cherfsx( int matrix_layout, char uplo, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cherfsx_work( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_cherfsx_work)( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
                                  ldaf, ipiv, s, b, ldb, x, ldx, rcond, berr,
                                  n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, rwork );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_cherfsx( int matrix_layout, char uplo, char equed,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cherfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cherfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cherfsx_work.c b/LAPACKE/src/lapacke_cherfsx_work.c
index 438803de03..b343b103bb 100644
--- a/LAPACKE/src/lapacke_cherfsx_work.c
+++ b/LAPACKE/src/lapacke_cherfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cherfsx_work( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_cherfsx_work)( int matrix_layout, char uplo, char equed,
                                  lapack_int n, lapack_int nrhs,
                                  const lapack_complex_float* a, lapack_int lda,
                                  const lapack_complex_float* af,
@@ -69,22 +69,22 @@ lapack_int LAPACKE_cherfsx_work( int matrix_layout, char uplo, char equed,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cherfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cherfsx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cherfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cherfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_cherfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cherfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_cherfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cherfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -127,10 +127,10 @@ lapack_int LAPACKE_cherfsx_work( int matrix_layout, char uplo, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_che_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cherfsx( &uplo, &equed, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, s, b_t, &ldb_t, x_t, &ldx_t, rcond, berr,
@@ -140,10 +140,10 @@ lapack_int LAPACKE_cherfsx_work( int matrix_layout, char uplo, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -159,11 +159,11 @@ lapack_int LAPACKE_cherfsx_work( int matrix_layout, char uplo, char equed,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cherfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cherfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cherfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cherfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chesv.c b/LAPACKE/src/lapacke_chesv.c
index 2fc9c9dae7..bef17720ef 100644
--- a/LAPACKE/src/lapacke_chesv.c
+++ b/LAPACKE/src/lapacke_chesv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chesv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chesv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_float* a,
                           lapack_int lda, lapack_int* ipiv,
                           lapack_complex_float* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_chesv( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chesv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chesv_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_chesv_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_chesv( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chesv_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_chesv_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chesv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chesv_aa.c b/LAPACKE/src/lapacke_chesv_aa.c
index 4a72778975..2050b55792 100644
--- a/LAPACKE/src/lapacke_chesv_aa.c
+++ b/LAPACKE/src/lapacke_chesv_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chesv_aa( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chesv_aa)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_float* a,
                           lapack_int lda, lapack_int* ipiv,
                           lapack_complex_float* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_chesv_aa( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chesv_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chesv_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_chesv_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_chesv_aa( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chesv_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_chesv_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chesv_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chesv_aa_2stage.c b/LAPACKE/src/lapacke_chesv_aa_2stage.c
index 4ba72aeca1..3c2da04066 100644
--- a/LAPACKE/src/lapacke_chesv_aa_2stage.c
+++ b/LAPACKE/src/lapacke_chesv_aa_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chesv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chesv_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_float* a,
                           lapack_int lda, lapack_complex_float* tb,
                           lapack_int ltb, lapack_int* ipiv, lapack_int* ipiv2,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_chesv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chesv_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chesv_aa_2stage_work( matrix_layout, uplo, n, nrhs,  
+    info = API_SUFFIX(LAPACKE_chesv_aa_2stage_work)( matrix_layout, uplo, n, nrhs,  
                                a, lda, tb, ltb, ipiv, ipiv2, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
@@ -76,14 +76,14 @@ lapack_int LAPACKE_chesv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chesv_aa_2stage_work( matrix_layout, uplo, n, nrhs,
+    info = API_SUFFIX(LAPACKE_chesv_aa_2stage_work)( matrix_layout, uplo, n, nrhs,
     					       a, lda, tb, ltb, ipiv, ipiv2, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chesv_aa_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_aa_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chesv_aa_2stage_work.c b/LAPACKE/src/lapacke_chesv_aa_2stage_work.c
index 7115052326..a044c9c58b 100644
--- a/LAPACKE/src/lapacke_chesv_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_chesv_aa_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chesv_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chesv_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_float* a, lapack_int lda,
                                lapack_complex_float* tb, lapack_int ltb, lapack_int* ipiv, 
                                lapack_int* ipiv2, lapack_complex_float* b, lapack_int ldb,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_chesv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_chesv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_chesv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_aa_2stage_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_chesv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_aa_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -93,8 +93,8 @@ lapack_int LAPACKE_chesv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chesv_aa_2stage( &uplo, &n, &nrhs, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, b_t, &ldb_t, work,
@@ -103,8 +103,8 @@ lapack_int LAPACKE_chesv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_che_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_2:
@@ -113,11 +113,11 @@ lapack_int LAPACKE_chesv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chesv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chesv_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chesv_aa_work.c b/LAPACKE/src/lapacke_chesv_aa_work.c
index 62ee5bc968..9203a58675 100644
--- a/LAPACKE/src/lapacke_chesv_aa_work.c
+++ b/LAPACKE/src/lapacke_chesv_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chesv_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chesv_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_float* a,
                                lapack_int lda, lapack_int* ipiv,
                                lapack_complex_float* b, lapack_int ldb,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_chesv_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_chesv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_aa_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_chesv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_aa_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_chesv_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chesv_aa( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -92,19 +92,19 @@ lapack_int LAPACKE_chesv_aa_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_che_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chesv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chesv_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chesv_rk.c b/LAPACKE/src/lapacke_chesv_rk.c
index c5a5caa447..6182d99e41 100644
--- a/LAPACKE/src/lapacke_chesv_rk.c
+++ b/LAPACKE/src/lapacke_chesv_rk.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chesv_rk( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chesv_rk)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_float* a,
                           lapack_int lda, lapack_complex_float* e,
                           lapack_int* ipiv,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_chesv_rk( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chesv_rk", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_rk", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chesv_rk_work( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
+    info = API_SUFFIX(LAPACKE_chesv_rk_work)( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -72,13 +72,13 @@ lapack_int LAPACKE_chesv_rk( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chesv_rk_work( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
+    info = API_SUFFIX(LAPACKE_chesv_rk_work)( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chesv_rk", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_rk", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chesv_rk_work.c b/LAPACKE/src/lapacke_chesv_rk_work.c
index 83a5bcd420..1a7b407231 100644
--- a/LAPACKE/src/lapacke_chesv_rk_work.c
+++ b/LAPACKE/src/lapacke_chesv_rk_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chesv_rk_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chesv_rk_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_float* a,
                                lapack_int lda, lapack_complex_float* e,
                                lapack_int* ipiv,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_chesv_rk_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_chesv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_rk_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_chesv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_rk_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_chesv_rk_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chesv_rk( &uplo, &n, &nrhs, a_t, &lda_t, e, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -93,19 +93,19 @@ lapack_int LAPACKE_chesv_rk_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_che_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chesv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_rk_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chesv_rk_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_rk_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chesv_work.c b/LAPACKE/src/lapacke_chesv_work.c
index 8647396621..9013dddea5 100644
--- a/LAPACKE/src/lapacke_chesv_work.c
+++ b/LAPACKE/src/lapacke_chesv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chesv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chesv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_float* a,
                                lapack_int lda, lapack_int* ipiv,
                                lapack_complex_float* b, lapack_int ldb,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_chesv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_chesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_chesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_chesv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chesv( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -92,19 +92,19 @@ lapack_int LAPACKE_chesv_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_che_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chesv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chesvx.c b/LAPACKE/src/lapacke_chesvx.c
index 9cf0c0460c..d9f93020fd 100644
--- a/LAPACKE/src/lapacke_chesvx.c
+++ b/LAPACKE/src/lapacke_chesvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chesvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chesvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* af,
                            lapack_int ldaf, lapack_int* ipiv,
@@ -46,21 +46,21 @@ lapack_int LAPACKE_chesvx( int matrix_layout, char fact, char uplo, lapack_int n
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chesvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_che_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
@@ -72,7 +72,7 @@ lapack_int LAPACKE_chesvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_chesvx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_chesvx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                 ldaf, ipiv, b, ldb, x, ldx, rcond, ferr, berr,
                                 &work_query, lwork, rwork );
     if( info != 0 ) {
@@ -87,7 +87,7 @@ lapack_int LAPACKE_chesvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chesvx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_chesvx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                 ldaf, ipiv, b, ldb, x, ldx, rcond, ferr, berr,
                                 work, lwork, rwork );
     /* Release memory and exit */
@@ -96,7 +96,7 @@ lapack_int LAPACKE_chesvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chesvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chesvx_work.c b/LAPACKE/src/lapacke_chesvx_work.c
index 3e1aa96076..bbfb2cb89e 100644
--- a/LAPACKE/src/lapacke_chesvx_work.c
+++ b/LAPACKE/src/lapacke_chesvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chesvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chesvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs,
                                 const lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* af, lapack_int ldaf,
@@ -63,22 +63,22 @@ lapack_int LAPACKE_chesvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_chesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesvx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_chesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_chesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_chesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesvx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -116,11 +116,11 @@ lapack_int LAPACKE_chesvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_che_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chesvx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                        ipiv, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr, berr, work,
@@ -129,11 +129,11 @@ lapack_int LAPACKE_chesvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_che_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -144,11 +144,11 @@ lapack_int LAPACKE_chesvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chesvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chesvxx.c b/LAPACKE/src/lapacke_chesvxx.c
index 9ef8749298..af400f742a 100644
--- a/LAPACKE/src/lapacke_chesvxx.c
+++ b/LAPACKE/src/lapacke_chesvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chesvxx( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chesvxx)( int matrix_layout, char fact, char uplo,
                             lapack_int n, lapack_int nrhs,
                             lapack_complex_float* a, lapack_int lda,
                             lapack_complex_float* af, lapack_int ldaf,
@@ -48,30 +48,30 @@ lapack_int LAPACKE_chesvxx( int matrix_layout, char fact, char uplo,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chesvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesvxx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_che_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -24;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_s_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, s, 1 ) ) {
                 return -12;
             }
         }
@@ -90,7 +90,7 @@ lapack_int LAPACKE_chesvxx( int matrix_layout, char fact, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chesvxx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_chesvxx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                  ldaf, ipiv, equed, s, b, ldb, x, ldx, rcond,
                                  rpvgrw, berr, n_err_bnds, err_bnds_norm,
                                  err_bnds_comp, nparams, params, work, rwork );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_chesvxx( int matrix_layout, char fact, char uplo,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chesvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chesvxx_work.c b/LAPACKE/src/lapacke_chesvxx_work.c
index 700ecf7a08..2ecd7fc810 100644
--- a/LAPACKE/src/lapacke_chesvxx_work.c
+++ b/LAPACKE/src/lapacke_chesvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chesvxx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chesvxx_work)( int matrix_layout, char fact, char uplo,
                                  lapack_int n, lapack_int nrhs,
                                  lapack_complex_float* a, lapack_int lda,
                                  lapack_complex_float* af, lapack_int ldaf,
@@ -69,22 +69,22 @@ lapack_int LAPACKE_chesvxx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_chesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesvxx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_chesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_chesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_chesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -127,11 +127,11 @@ lapack_int LAPACKE_chesvxx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_che_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chesvxx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond, rpvgrw,
@@ -141,20 +141,20 @@ lapack_int LAPACKE_chesvxx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_che_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_che_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -170,11 +170,11 @@ lapack_int LAPACKE_chesvxx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chesvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chesvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cheswapr.c b/LAPACKE/src/lapacke_cheswapr.c
index 8acee82280..99f7c4f324 100644
--- a/LAPACKE/src/lapacke_cheswapr.c
+++ b/LAPACKE/src/lapacke_cheswapr.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheswapr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cheswapr)( int matrix_layout, char uplo, lapack_int n,
                              lapack_complex_float* a, lapack_int lda,
                              lapack_int i1, lapack_int i2 )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cheswapr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheswapr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_cheswapr_work( matrix_layout, uplo, n, a, lda, i1, i2 );
+    return API_SUFFIX(LAPACKE_cheswapr_work)( matrix_layout, uplo, n, a, lda, i1, i2 );
 }
diff --git a/LAPACKE/src/lapacke_cheswapr_work.c b/LAPACKE/src/lapacke_cheswapr_work.c
index 378cd75862..0554a593ae 100644
--- a/LAPACKE/src/lapacke_cheswapr_work.c
+++ b/LAPACKE/src/lapacke_cheswapr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cheswapr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cheswapr_work)( int matrix_layout, char uplo, lapack_int n,
                                   lapack_complex_float* a, lapack_int lda,
                                   lapack_int i1, lapack_int i2 )
 {
@@ -54,21 +54,21 @@ lapack_int LAPACKE_cheswapr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cheswapr( &uplo, &n, a_t, &lda_t, &i1, &i2 );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(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:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cheswapr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheswapr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cheswapr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cheswapr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrd.c b/LAPACKE/src/lapacke_chetrd.c
index bdfb2493f1..e87c6da9e1 100644
--- a/LAPACKE/src/lapacke_chetrd.c
+++ b/LAPACKE/src/lapacke_chetrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrd( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrd)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda, float* d,
                            float* e, lapack_complex_float* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_chetrd( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chetrd_work( matrix_layout, uplo, n, a, lda, d, e, tau,
+    info = API_SUFFIX(LAPACKE_chetrd_work)( matrix_layout, uplo, n, a, lda, d, e, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_chetrd( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chetrd_work( matrix_layout, uplo, n, a, lda, d, e, tau, work,
+    info = API_SUFFIX(LAPACKE_chetrd_work)( matrix_layout, uplo, n, a, lda, d, e, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrd_work.c b/LAPACKE/src/lapacke_chetrd_work.c
index 6c950ee7a3..85a6f4d4fd 100644
--- a/LAPACKE/src/lapacke_chetrd_work.c
+++ b/LAPACKE/src/lapacke_chetrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrd_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrd_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 float* d, float* e, lapack_complex_float* tau,
                                 lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_chetrd_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_chetrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,23 +67,23 @@ lapack_int LAPACKE_chetrd_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chetrd( &uplo, &n, a_t, &lda_t, d, e, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(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:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chetrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chetrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrf.c b/LAPACKE/src/lapacke_chetrf.c
index 3238059188..f93ce8facd 100644
--- a/LAPACKE/src/lapacke_chetrf.c
+++ b/LAPACKE/src/lapacke_chetrf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_chetrf( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chetrf_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_chetrf_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_chetrf( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chetrf_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_chetrf_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrf_aa.c b/LAPACKE/src/lapacke_chetrf_aa.c
index be3a442c16..bde35b62ad 100644
--- a/LAPACKE/src/lapacke_chetrf_aa.c
+++ b/LAPACKE/src/lapacke_chetrf_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrf_aa( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrf_aa)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_chetrf_aa( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrf_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chetrf_aa_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_chetrf_aa_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_chetrf_aa( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chetrf_aa_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_chetrf_aa_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrf_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrf_aa_2stage.c b/LAPACKE/src/lapacke_chetrf_aa_2stage.c
index 2ecf93478a..7108696561 100644
--- a/LAPACKE/src/lapacke_chetrf_aa_2stage.c
+++ b/LAPACKE/src/lapacke_chetrf_aa_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrf_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
                           lapack_complex_float* a,
                           lapack_int lda, lapack_complex_float* tb,
                           lapack_int ltb, lapack_int* ipiv, lapack_int* ipiv2 )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_chetrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrf_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chetrf_aa_2stage_work( matrix_layout, uplo, n,
+    info = API_SUFFIX(LAPACKE_chetrf_aa_2stage_work)( matrix_layout, uplo, n,
                                a, lda, tb, ltb, ipiv, ipiv2,
                                &work_query, lwork );
     if( info != 0 ) {
@@ -72,14 +72,14 @@ lapack_int LAPACKE_chetrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chetrf_aa_2stage_work( matrix_layout, uplo, n,
+    info = API_SUFFIX(LAPACKE_chetrf_aa_2stage_work)( matrix_layout, uplo, n,
     					       a, lda, tb, ltb, ipiv, ipiv2,
                                work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrf_aa_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_aa_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrf_aa_2stage_work.c b/LAPACKE/src/lapacke_chetrf_aa_2stage_work.c
index ccb41ee623..eb22b3335a 100644
--- a/LAPACKE/src/lapacke_chetrf_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_chetrf_aa_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrf_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrf_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_complex_float* a, lapack_int lda,
                                lapack_complex_float* tb, lapack_int ltb, 
                                lapack_int* ipiv, lapack_int* ipiv2, 
@@ -54,12 +54,12 @@ lapack_int LAPACKE_chetrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_chetrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_chetrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_aa_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -81,7 +81,7 @@ lapack_int LAPACKE_chetrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chetrf_aa_2stage( &uplo, &n, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, work,
@@ -90,18 +90,18 @@ lapack_int LAPACKE_chetrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_che_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( tb_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chetrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chetrf_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrf_aa_work.c b/LAPACKE/src/lapacke_chetrf_aa_work.c
index dcebaf2f21..487df5e3c0 100644
--- a/LAPACKE/src/lapacke_chetrf_aa_work.c
+++ b/LAPACKE/src/lapacke_chetrf_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrf_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrf_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_int* ipiv, lapack_complex_float* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_chetrf_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_chetrf_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_aa_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_chetrf_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chetrf_aa( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(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:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chetrf_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chetrf_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrf_rk.c b/LAPACKE/src/lapacke_chetrf_rk.c
index 7caf6f2bbb..51dff5534b 100644
--- a/LAPACKE/src/lapacke_chetrf_rk.c
+++ b/LAPACKE/src/lapacke_chetrf_rk.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrf_rk( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrf_rk)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* e, lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_chetrf_rk( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrf_rk", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_rk", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chetrf_rk_work( matrix_layout, uplo, n, a, lda, e, ipiv,
+    info = API_SUFFIX(LAPACKE_chetrf_rk_work)( matrix_layout, uplo, n, a, lda, e, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_chetrf_rk( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chetrf_rk_work( matrix_layout, uplo, n, a, lda, e, ipiv, work,
+    info = API_SUFFIX(LAPACKE_chetrf_rk_work)( matrix_layout, uplo, n, a, lda, e, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrf_rk", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_rk", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrf_rk_work.c b/LAPACKE/src/lapacke_chetrf_rk_work.c
index b43d92bb9e..7b840bd25b 100644
--- a/LAPACKE/src/lapacke_chetrf_rk_work.c
+++ b/LAPACKE/src/lapacke_chetrf_rk_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrf_rk_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrf_rk_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* e,
                                 lapack_int* ipiv, lapack_complex_float* work,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_chetrf_rk_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_chetrf_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_rk_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,23 +67,23 @@ lapack_int LAPACKE_chetrf_rk_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chetrf_rk( &uplo, &n, a_t, &lda_t, e, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(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:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chetrf_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_rk_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chetrf_rk_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_rk_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrf_rook.c b/LAPACKE/src/lapacke_chetrf_rook.c
index 73ce55ac68..8d75607e62 100644
--- a/LAPACKE/src/lapacke_chetrf_rook.c
+++ b/LAPACKE/src/lapacke_chetrf_rook.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrf_rook( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrf_rook)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_chetrf_rook( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrf_rook", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_rook", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chetrf_rook_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_chetrf_rook_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_chetrf_rook( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chetrf_rook_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_chetrf_rook_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrf_rook", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_rook", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrf_rook_work.c b/LAPACKE/src/lapacke_chetrf_rook_work.c
index a2afa602e1..ce99a97c90 100644
--- a/LAPACKE/src/lapacke_chetrf_rook_work.c
+++ b/LAPACKE/src/lapacke_chetrf_rook_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrf_rook_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrf_rook_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_int* ipiv, lapack_complex_float* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_chetrf_rook_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_chetrf_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_rook_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_chetrf_rook_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chetrf_rook( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(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:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chetrf_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_rook_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chetrf_rook_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_rook_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrf_work.c b/LAPACKE/src/lapacke_chetrf_work.c
index b043364a31..f0f5dc54e1 100644
--- a/LAPACKE/src/lapacke_chetrf_work.c
+++ b/LAPACKE/src/lapacke_chetrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_int* ipiv, lapack_complex_float* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_chetrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_chetrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_chetrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chetrf( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(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:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chetrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chetrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetri.c b/LAPACKE/src/lapacke_chetri.c
index 5d68dd005b..e0579a49c2 100644
--- a/LAPACKE/src/lapacke_chetri.c
+++ b/LAPACKE/src/lapacke_chetri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetri( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetri)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            const lapack_int* ipiv )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chetri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -58,12 +58,12 @@ lapack_int LAPACKE_chetri( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chetri_work( matrix_layout, uplo, n, a, lda, ipiv, work );
+    info = API_SUFFIX(LAPACKE_chetri_work)( matrix_layout, uplo, n, a, lda, ipiv, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chetri", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetri2.c b/LAPACKE/src/lapacke_chetri2.c
index 3822bbae54..e7d3d7be7d 100644
--- a/LAPACKE/src/lapacke_chetri2.c
+++ b/LAPACKE/src/lapacke_chetri2.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetri2( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetri2)( int matrix_layout, char uplo, lapack_int n,
                             lapack_complex_float* a, lapack_int lda,
                             const lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_chetri2( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chetri2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chetri2_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_chetri2_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                  &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_chetri2( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chetri2_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_chetri2_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                  lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chetri2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetri2_work.c b/LAPACKE/src/lapacke_chetri2_work.c
index c87c032d25..3e98df8a63 100644
--- a/LAPACKE/src/lapacke_chetri2_work.c
+++ b/LAPACKE/src/lapacke_chetri2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetri2_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetri2_work)( int matrix_layout, char uplo, lapack_int n,
                                  lapack_complex_float* a, lapack_int lda,
                                  const lapack_int* ipiv,
                                  lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_chetri2_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_chetri2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri2_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_chetri2_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chetri2( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(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:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chetri2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chetri2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetri2x.c b/LAPACKE/src/lapacke_chetri2x.c
index 7260d9bb92..0a4bfd1abd 100644
--- a/LAPACKE/src/lapacke_chetri2x.c
+++ b/LAPACKE/src/lapacke_chetri2x.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetri2x( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetri2x)( int matrix_layout, char uplo, lapack_int n,
                              lapack_complex_float* a, lapack_int lda,
                              const lapack_int* ipiv, lapack_int nb )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chetri2x", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri2x", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -58,13 +58,13 @@ lapack_int LAPACKE_chetri2x( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chetri2x_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_chetri2x_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                   nb );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chetri2x", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri2x", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetri2x_work.c b/LAPACKE/src/lapacke_chetri2x_work.c
index ea36e0c70e..b65df81857 100644
--- a/LAPACKE/src/lapacke_chetri2x_work.c
+++ b/LAPACKE/src/lapacke_chetri2x_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetri2x_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetri2x_work)( int matrix_layout, char uplo, lapack_int n,
                                   lapack_complex_float* a, lapack_int lda,
                                   const lapack_int* ipiv,
                                   lapack_complex_float* work, lapack_int nb )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_chetri2x_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_chetri2x_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri2x_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_chetri2x_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, lda, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, lda, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chetri2x( &uplo, &n, a_t, &lda_t, ipiv, work, &nb, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, lda, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, lda, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chetri2x_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri2x_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chetri2x_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri2x_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetri_3.c b/LAPACKE/src/lapacke_chetri_3.c
index 2e0031a040..c9d4bb39f9 100644
--- a/LAPACKE/src/lapacke_chetri_3.c
+++ b/LAPACKE/src/lapacke_chetri_3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetri_3( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetri_3)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            const lapack_complex_float* e, const lapack_int* ipiv )
 {
@@ -40,24 +40,24 @@ lapack_int LAPACKE_chetri_3( int matrix_layout, char uplo, lapack_int n,
     lapack_int lwork = -1;
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
-    lapack_int e_start = LAPACKE_lsame( uplo, 'U' ) ? 1 : 0;
+    lapack_int e_start = API_SUFFIX(LAPACKE_lsame)( uplo, 'U' ) ? 1 : 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chetri_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_c_nancheck( n-1, e + e_start, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, e + e_start, 1 ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chetri_3_work( matrix_layout, uplo, n, a, lda, e, ipiv,
+    info = API_SUFFIX(LAPACKE_chetri_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,12 +71,12 @@ lapack_int LAPACKE_chetri_3( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chetri_3_work( matrix_layout, uplo, n, a, lda, e, ipiv, work, lwork );
+    info = API_SUFFIX(LAPACKE_chetri_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chetri_3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri_3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetri_3_work.c b/LAPACKE/src/lapacke_chetri_3_work.c
index 5650df6e82..f38dca7b8b 100644
--- a/LAPACKE/src/lapacke_chetri_3_work.c
+++ b/LAPACKE/src/lapacke_chetri_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetri_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetri_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 const lapack_complex_float* e, const lapack_int* ipiv,
                                 lapack_complex_float* work, lapack_int lwork)
@@ -50,7 +50,7 @@ lapack_int LAPACKE_chetri_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_chetri_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri_3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_chetri_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chetri_3( &uplo, &n, a_t, &lda_t, e, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(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:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chetri_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chetri_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetri_work.c b/LAPACKE/src/lapacke_chetri_work.c
index a47da60284..464fff79f0 100644
--- a/LAPACKE/src/lapacke_chetri_work.c
+++ b/LAPACKE/src/lapacke_chetri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetri_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 const lapack_int* ipiv,
                                 lapack_complex_float* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_chetri_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_chetri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_chetri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chetri( &uplo, &n, a_t, &lda_t, ipiv, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(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:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chetri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chetri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrs.c b/LAPACKE/src/lapacke_chetrs.c
index f00609f795..0f05cebe81 100644
--- a/LAPACKE/src/lapacke_chetrs.c
+++ b/LAPACKE/src/lapacke_chetrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* a,
                            lapack_int lda, const lapack_int* ipiv,
                            lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_chetrs_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    return API_SUFFIX(LAPACKE_chetrs_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_chetrs2.c b/LAPACKE/src/lapacke_chetrs2.c
index 60ab9044f6..8e53c3d3c0 100644
--- a/LAPACKE/src/lapacke_chetrs2.c
+++ b/LAPACKE/src/lapacke_chetrs2.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrs2( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrs2)( int matrix_layout, char uplo, lapack_int n,
                             lapack_int nrhs, const lapack_complex_float* a,
                             lapack_int lda, const lapack_int* ipiv,
                             lapack_complex_float* b, lapack_int ldb )
@@ -40,16 +40,16 @@ lapack_int LAPACKE_chetrs2( int matrix_layout, char uplo, lapack_int n,
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrs2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
@@ -62,13 +62,13 @@ lapack_int LAPACKE_chetrs2( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chetrs2_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_chetrs2_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrs2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrs2_work.c b/LAPACKE/src/lapacke_chetrs2_work.c
index b564a84d21..d4cc2de2e2 100644
--- a/LAPACKE/src/lapacke_chetrs2_work.c
+++ b/LAPACKE/src/lapacke_chetrs2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrs2_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrs2_work)( int matrix_layout, char uplo, lapack_int n,
                                  lapack_int nrhs, const lapack_complex_float* a,
                                  lapack_int lda, const lapack_int* ipiv,
                                  lapack_complex_float* b, lapack_int ldb,
@@ -53,12 +53,12 @@ lapack_int LAPACKE_chetrs2_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_chetrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs2_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_chetrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -76,8 +76,8 @@ lapack_int LAPACKE_chetrs2_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chetrs2( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                         &info );
@@ -85,18 +85,18 @@ lapack_int LAPACKE_chetrs2_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chetrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chetrs2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrs_3.c b/LAPACKE/src/lapacke_chetrs_3.c
index ab5610a051..d97d92d8ae 100644
--- a/LAPACKE/src/lapacke_chetrs_3.c
+++ b/LAPACKE/src/lapacke_chetrs_3.c
@@ -32,30 +32,30 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrs_3( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrs_3)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* a,
                            lapack_int lda, const lapack_complex_float* e,
                            const lapack_int* ipiv,
                            lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrs_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_c_nancheck( n, e ,1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n, e ,1 ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_chetrs_3_work( matrix_layout, uplo, n, nrhs, a, lda,
+    return API_SUFFIX(LAPACKE_chetrs_3_work)( matrix_layout, uplo, n, nrhs, a, lda,
                                   e, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_chetrs_3_work.c b/LAPACKE/src/lapacke_chetrs_3_work.c
index 1d521d7202..424e8216a1 100644
--- a/LAPACKE/src/lapacke_chetrs_3_work.c
+++ b/LAPACKE/src/lapacke_chetrs_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrs_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrs_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* a,
                                 lapack_int lda, const lapack_complex_float* e,
                                 const lapack_int* ipiv,
@@ -53,12 +53,12 @@ lapack_int LAPACKE_chetrs_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_chetrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_3_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_chetrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_3_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -76,8 +76,8 @@ lapack_int LAPACKE_chetrs_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chetrs_3( &uplo, &n, &nrhs, a_t, &lda_t, e, ipiv, b_t, &ldb_t,
                        &info );
@@ -85,18 +85,18 @@ lapack_int LAPACKE_chetrs_3_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chetrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chetrs_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrs_aa.c b/LAPACKE/src/lapacke_chetrs_aa.c
index aa85d5df5c..33b3c11a45 100644
--- a/LAPACKE/src/lapacke_chetrs_aa.c
+++ b/LAPACKE/src/lapacke_chetrs_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrs_aa( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrs_aa)( int matrix_layout, char uplo, lapack_int n,
                             lapack_int nrhs, const lapack_complex_float* a,
                             lapack_int lda, const lapack_int* ipiv,
                             lapack_complex_float* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_chetrs_aa( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrs_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chetrs_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_chetrs_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_chetrs_aa( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chetrs_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_chetrs_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrs_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrs_aa_2stage.c b/LAPACKE/src/lapacke_chetrs_aa_2stage.c
index ca57ca9d9c..138fba984a 100644
--- a/LAPACKE/src/lapacke_chetrs_aa_2stage.c
+++ b/LAPACKE/src/lapacke_chetrs_aa_2stage.c
@@ -32,33 +32,33 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrs_aa_2stage( int matrix_layout, char uplo, lapack_int n,
-                          lapack_int nrhs, lapack_complex_float* a,
+lapack_int API_SUFFIX(LAPACKE_chetrs_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
+                          lapack_int nrhs, const lapack_complex_float* a,
                           lapack_int lda, lapack_complex_float* tb,
-                          lapack_int ltb, lapack_int* ipiv, lapack_int* ipiv2,
+                          lapack_int ltb, const lapack_int* ipiv, const lapack_int* ipiv2,
                           lapack_complex_float* b, lapack_int ldb )
 {
     lapack_int info = 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrs_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
 #endif
        /* Call middle-level interface */
-    info = LAPACKE_chetrs_aa_2stage_work( matrix_layout, uplo, n, nrhs,
+    info = API_SUFFIX(LAPACKE_chetrs_aa_2stage_work)( matrix_layout, uplo, n, nrhs,
     					       a, lda, tb, ltb, ipiv, ipiv2, b,
                                ldb );
     return info;
diff --git a/LAPACKE/src/lapacke_chetrs_aa_2stage_work.c b/LAPACKE/src/lapacke_chetrs_aa_2stage_work.c
index 6c781d6b82..7bd0f54320 100644
--- a/LAPACKE/src/lapacke_chetrs_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_chetrs_aa_2stage_work.c
@@ -32,10 +32,10 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrs_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
-                               lapack_int nrhs, lapack_complex_float* a, lapack_int lda,
-                               lapack_complex_float* tb, lapack_int ltb, lapack_int* ipiv, 
-                               lapack_int* ipiv2, lapack_complex_float* b, lapack_int ldb )
+lapack_int API_SUFFIX(LAPACKE_chetrs_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
+                               lapack_int nrhs, const lapack_complex_float* a, lapack_int lda,
+                               lapack_complex_float* tb, lapack_int ltb, const lapack_int* ipiv, 
+                               const lapack_int* ipiv2, lapack_complex_float* b, lapack_int ldb )
 {
     lapack_int info = 0;
     if( matrix_layout == LAPACK_COL_MAJOR ) {
@@ -55,17 +55,17 @@ lapack_int LAPACKE_chetrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_chetrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_chetrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_aa_2stage_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_chetrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_aa_2stage_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -85,8 +85,8 @@ lapack_int LAPACKE_chetrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chetrs_aa_2stage( &uplo, &n, &nrhs, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, b_t, &ldb_t, &info );
@@ -94,8 +94,7 @@ lapack_int LAPACKE_chetrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_2:
@@ -104,11 +103,11 @@ lapack_int LAPACKE_chetrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chetrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chetrs_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrs_aa_work.c b/LAPACKE/src/lapacke_chetrs_aa_work.c
index b09bea793b..03688eb8cf 100644
--- a/LAPACKE/src/lapacke_chetrs_aa_work.c
+++ b/LAPACKE/src/lapacke_chetrs_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrs_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrs_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                  lapack_int nrhs, const lapack_complex_float* a,
                                  lapack_int lda, const lapack_int* ipiv,
                                  lapack_complex_float* b, lapack_int ldb,
@@ -53,12 +53,12 @@ lapack_int LAPACKE_chetrs_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_chetrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_aa_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_chetrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_aa_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -76,8 +76,8 @@ lapack_int LAPACKE_chetrs_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chetrs_aa( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                          &lwork, &info );
@@ -85,18 +85,18 @@ lapack_int LAPACKE_chetrs_aa_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chetrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chetrs_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrs_rook.c b/LAPACKE/src/lapacke_chetrs_rook.c
index fda67007cc..2a6470e02f 100644
--- a/LAPACKE/src/lapacke_chetrs_rook.c
+++ b/LAPACKE/src/lapacke_chetrs_rook.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrs_rook( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrs_rook)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* a,
                            lapack_int lda, const lapack_int* ipiv,
                            lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chetrs_rook", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_rook", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_chetrs_rook_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    return API_SUFFIX(LAPACKE_chetrs_rook_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_chetrs_rook_work.c b/LAPACKE/src/lapacke_chetrs_rook_work.c
index b3b5fd4335..4f05696864 100644
--- a/LAPACKE/src/lapacke_chetrs_rook_work.c
+++ b/LAPACKE/src/lapacke_chetrs_rook_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrs_rook_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrs_rook_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* a,
                                 lapack_int lda, const lapack_int* ipiv,
                                 lapack_complex_float* b, lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_chetrs_rook_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_chetrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_rook_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_chetrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_rook_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,8 +75,8 @@ lapack_int LAPACKE_chetrs_rook_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chetrs_rook( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                        &info );
@@ -84,18 +84,18 @@ lapack_int LAPACKE_chetrs_rook_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chetrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_rook_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chetrs_rook_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_rook_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chetrs_work.c b/LAPACKE/src/lapacke_chetrs_work.c
index ec1a7d09e3..e8a010b084 100644
--- a/LAPACKE/src/lapacke_chetrs_work.c
+++ b/LAPACKE/src/lapacke_chetrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chetrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chetrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* a,
                                 lapack_int lda, const lapack_int* ipiv,
                                 lapack_complex_float* b, lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_chetrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_chetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_chetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,8 +75,8 @@ lapack_int LAPACKE_chetrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chetrs( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                        &info );
@@ -84,18 +84,18 @@ lapack_int LAPACKE_chetrs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chetrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chetrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chfrk.c b/LAPACKE/src/lapacke_chfrk.c
index 9a51bbecc1..b760887980 100644
--- a/LAPACKE/src/lapacke_chfrk.c
+++ b/LAPACKE/src/lapacke_chfrk.c
@@ -32,35 +32,35 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chfrk( int matrix_layout, char transr, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_chfrk)( int matrix_layout, char transr, char uplo, char trans,
                           lapack_int n, lapack_int k, float alpha,
                           const lapack_complex_float* a, lapack_int lda,
                           float beta, lapack_complex_float* c )
 {
     lapack_int ka, na;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chfrk", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chfrk", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        ka = LAPACKE_lsame( trans, 'n' ) ? k : n;
-        na = LAPACKE_lsame( trans, 'n' ) ? n : k;
-        if( LAPACKE_cge_nancheck( matrix_layout, na, ka, a, lda ) ) {
+        ka = API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) ? k : n;
+        na = API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) ? n : k;
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, na, ka, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_s_nancheck( 1, &alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &alpha, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &beta, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &beta, 1 ) ) {
             return -10;
         }
-        if( LAPACKE_cpf_nancheck( n, c ) ) {
+        if( API_SUFFIX(LAPACKE_cpf_nancheck)( n, c ) ) {
             return -11;
         }
     }
 #endif
-    return LAPACKE_chfrk_work( matrix_layout, transr, uplo, trans, n, k, alpha,
+    return API_SUFFIX(LAPACKE_chfrk_work)( matrix_layout, transr, uplo, trans, n, k, alpha,
                                a, lda, beta, c );
 }
diff --git a/LAPACKE/src/lapacke_chfrk_work.c b/LAPACKE/src/lapacke_chfrk_work.c
index 0686916223..cfafeb35ce 100644
--- a/LAPACKE/src/lapacke_chfrk_work.c
+++ b/LAPACKE/src/lapacke_chfrk_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chfrk_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chfrk_work)( int matrix_layout, char transr, char uplo,
                                char trans, lapack_int n, lapack_int k,
                                float alpha, const lapack_complex_float* a,
                                lapack_int lda, float beta,
@@ -49,13 +49,13 @@ lapack_int LAPACKE_chfrk_work( int matrix_layout, char transr, char uplo,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        na = LAPACKE_lsame( trans, 'n' ) ? n : k;
-        ka = LAPACKE_lsame( trans, 'n' ) ? k : n;
+        na = API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) ? n : k;
+        ka = API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) ? k : n;
         lda_t = MAX(1,na);
         /* Check leading dimension(s) */
         if( lda < ka ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_chfrk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chfrk_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -73,25 +73,25 @@ lapack_int LAPACKE_chfrk_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, na, ka, a, lda, a_t, lda_t );
-        LAPACKE_cpf_trans( matrix_layout, transr, uplo, n, c, c_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, na, ka, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cpf_trans)( matrix_layout, transr, uplo, n, c, c_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chfrk( &transr, &uplo, &trans, &n, &k, &alpha, a_t, &lda_t,
                       &beta, c_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_cpf_trans( LAPACK_COL_MAJOR, transr, uplo, n, c_t, c );
+        API_SUFFIX(LAPACKE_cpf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, c_t, c );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chfrk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chfrk_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chfrk_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chfrk_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chgeqz.c b/LAPACKE/src/lapacke_chgeqz.c
index b264791851..7557cc607f 100644
--- a/LAPACKE/src/lapacke_chgeqz.c
+++ b/LAPACKE/src/lapacke_chgeqz.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chgeqz( int matrix_layout, char job, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_chgeqz)( int matrix_layout, char job, char compq, char compz,
                            lapack_int n, lapack_int ilo, lapack_int ihi,
                            lapack_complex_float* h, lapack_int ldh,
                            lapack_complex_float* t, lapack_int ldt,
@@ -47,25 +47,25 @@ lapack_int LAPACKE_chgeqz( int matrix_layout, char job, char compq, char compz,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chgeqz", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chgeqz", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, h, ldh ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, h, ldh ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -14;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -16;
             }
         }
@@ -78,7 +78,7 @@ lapack_int LAPACKE_chgeqz( int matrix_layout, char job, char compq, char compz,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_chgeqz_work( matrix_layout, job, compq, compz, n, ilo, ihi, h,
+    info = API_SUFFIX(LAPACKE_chgeqz_work)( matrix_layout, job, compq, compz, n, ilo, ihi, h,
                                 ldh, t, ldt, alpha, beta, q, ldq, z, ldz,
                                 &work_query, lwork, rwork );
     if( info != 0 ) {
@@ -93,7 +93,7 @@ lapack_int LAPACKE_chgeqz( int matrix_layout, char job, char compq, char compz,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chgeqz_work( matrix_layout, job, compq, compz, n, ilo, ihi, h,
+    info = API_SUFFIX(LAPACKE_chgeqz_work)( matrix_layout, job, compq, compz, n, ilo, ihi, h,
                                 ldh, t, ldt, alpha, beta, q, ldq, z, ldz, work,
                                 lwork, rwork );
     /* Release memory and exit */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_chgeqz( int matrix_layout, char job, char compq, char compz,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chgeqz", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chgeqz", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chgeqz_work.c b/LAPACKE/src/lapacke_chgeqz_work.c
index eefec0b076..08aee9762c 100644
--- a/LAPACKE/src/lapacke_chgeqz_work.c
+++ b/LAPACKE/src/lapacke_chgeqz_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chgeqz_work( int matrix_layout, char job, char compq,
+lapack_int API_SUFFIX(LAPACKE_chgeqz_work)( int matrix_layout, char job, char compq,
                                 char compz, lapack_int n, lapack_int ilo,
                                 lapack_int ihi, lapack_complex_float* h,
                                 lapack_int ldh, lapack_complex_float* t,
@@ -64,22 +64,22 @@ lapack_int LAPACKE_chgeqz_work( int matrix_layout, char job, char compq,
         /* Check leading dimension(s) */
         if( ldh < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_chgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chgeqz_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_chgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chgeqz_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_chgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chgeqz_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_chgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chgeqz_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_chgeqz_work( int matrix_layout, char job, char compq,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             q_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldq_t * MAX(1,n) );
@@ -111,7 +111,7 @@ lapack_int LAPACKE_chgeqz_work( int matrix_layout, char job, char compq,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,n) );
@@ -121,13 +121,13 @@ lapack_int LAPACKE_chgeqz_work( int matrix_layout, char job, char compq,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, h, ldh, h_t, ldh_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, h, ldh, h_t, ldh_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_chgeqz( &job, &compq, &compz, &n, &ilo, &ihi, h_t, &ldh_t, t_t,
@@ -137,20 +137,20 @@ lapack_int LAPACKE_chgeqz_work( int matrix_layout, char job, char compq,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, h_t, ldh_t, h, ldh );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, h_t, ldh_t, h, ldh );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_2:
@@ -159,11 +159,11 @@ lapack_int LAPACKE_chgeqz_work( int matrix_layout, char job, char compq,
         LAPACKE_free( h_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chgeqz_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chgeqz_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chgeqz_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpcon.c b/LAPACKE/src/lapacke_chpcon.c
index ce312e6e10..29007badd6 100644
--- a/LAPACKE/src/lapacke_chpcon.c
+++ b/LAPACKE/src/lapacke_chpcon.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpcon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chpcon)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_float* ap,
                            const lapack_int* ipiv, float anorm, float* rcond )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chpcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_chp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
@@ -61,13 +61,13 @@ lapack_int LAPACKE_chpcon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chpcon_work( matrix_layout, uplo, n, ap, ipiv, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_chpcon_work)( matrix_layout, uplo, n, ap, ipiv, anorm, rcond,
                                 work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chpcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpcon_work.c b/LAPACKE/src/lapacke_chpcon_work.c
index 327aa03dc2..0d9ee830ff 100644
--- a/LAPACKE/src/lapacke_chpcon_work.c
+++ b/LAPACKE/src/lapacke_chpcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpcon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chpcon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_float* ap,
                                 const lapack_int* ipiv, float anorm,
                                 float* rcond, lapack_complex_float* work )
@@ -55,7 +55,7 @@ lapack_int LAPACKE_chpcon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_chp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chpcon( &uplo, &n, ap_t, ipiv, &anorm, rcond, work, &info );
         if( info < 0 ) {
@@ -65,11 +65,11 @@ lapack_int LAPACKE_chpcon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chpcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chpcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpev.c b/LAPACKE/src/lapacke_chpev.c
index 36fff84e25..0acf5889d6 100644
--- a/LAPACKE/src/lapacke_chpev.c
+++ b/LAPACKE/src/lapacke_chpev.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpev( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chpev)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_complex_float* ap, float* w,
                           lapack_complex_float* z, lapack_int ldz )
 {
@@ -40,13 +40,13 @@ lapack_int LAPACKE_chpev( int matrix_layout, char jobz, char uplo, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chpev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, ap ) ) {
             return -5;
         }
     }
@@ -64,7 +64,7 @@ lapack_int LAPACKE_chpev( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chpev_work( matrix_layout, jobz, uplo, n, ap, w, z, ldz, work,
+    info = API_SUFFIX(LAPACKE_chpev_work)( matrix_layout, jobz, uplo, n, ap, w, z, ldz, work,
                                rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -72,7 +72,7 @@ lapack_int LAPACKE_chpev( int matrix_layout, char jobz, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chpev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpev_work.c b/LAPACKE/src/lapacke_chpev_work.c
index deaa8dd03b..9de1f3d687 100644
--- a/LAPACKE/src/lapacke_chpev_work.c
+++ b/LAPACKE/src/lapacke_chpev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpev_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chpev_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_complex_float* ap, float* w,
                                lapack_complex_float* z, lapack_int ldz,
                                lapack_complex_float* work, float* rwork )
@@ -51,11 +51,11 @@ lapack_int LAPACKE_chpev_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_chpev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpev_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,n) );
@@ -72,7 +72,7 @@ lapack_int LAPACKE_chpev_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_chp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chpev( &jobz, &uplo, &n, ap_t, w, z_t, &ldz_t, work, rwork,
                       &info );
@@ -80,23 +80,23 @@ lapack_int LAPACKE_chpev_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
-        LAPACKE_chp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_chp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chpev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chpev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpevd.c b/LAPACKE/src/lapacke_chpevd.c
index 7fb13d0d1a..3cad9459dd 100644
--- a/LAPACKE/src/lapacke_chpevd.c
+++ b/LAPACKE/src/lapacke_chpevd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpevd( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chpevd)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_complex_float* ap, float* w,
                            lapack_complex_float* z, lapack_int ldz )
 {
@@ -47,19 +47,19 @@ lapack_int LAPACKE_chpevd( int matrix_layout, char jobz, char uplo, lapack_int n
     float rwork_query;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chpevd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpevd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, ap ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chpevd_work( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
+    info = API_SUFFIX(LAPACKE_chpevd_work)( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
                                 &work_query, lwork, &rwork_query, lrwork,
                                 &iwork_query, liwork );
     if( info != 0 ) {
@@ -86,7 +86,7 @@ lapack_int LAPACKE_chpevd( int matrix_layout, char jobz, char uplo, lapack_int n
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chpevd_work( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
+    info = API_SUFFIX(LAPACKE_chpevd_work)( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
                                 work, lwork, rwork, lrwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -96,7 +96,7 @@ lapack_int LAPACKE_chpevd( int matrix_layout, char jobz, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chpevd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpevd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpevd_work.c b/LAPACKE/src/lapacke_chpevd_work.c
index 90b89ce8aa..baca17aaed 100644
--- a/LAPACKE/src/lapacke_chpevd_work.c
+++ b/LAPACKE/src/lapacke_chpevd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpevd_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chpevd_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_complex_float* ap,
                                 float* w, lapack_complex_float* z,
                                 lapack_int ldz, lapack_complex_float* work,
@@ -55,7 +55,7 @@ lapack_int LAPACKE_chpevd_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_chpevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpevd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,7 +65,7 @@ lapack_int LAPACKE_chpevd_work( int matrix_layout, char jobz, char uplo,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,n) );
@@ -82,7 +82,7 @@ lapack_int LAPACKE_chpevd_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_chp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chpevd( &jobz, &uplo, &n, ap_t, w, z_t, &ldz_t, work, &lwork,
                        rwork, &lrwork, iwork, &liwork, &info );
@@ -90,23 +90,23 @@ lapack_int LAPACKE_chpevd_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
-        LAPACKE_chp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_chp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chpevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpevd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chpevd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpevd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpevx.c b/LAPACKE/src/lapacke_chpevx.c
index eb383edbb3..5ad1f130af 100644
--- a/LAPACKE/src/lapacke_chpevx.c
+++ b/LAPACKE/src/lapacke_chpevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpevx( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chpevx)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_complex_float* ap, float vl,
                            float vu, lapack_int il, lapack_int iu, float abstol,
                            lapack_int* m, float* w, lapack_complex_float* z,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_chpevx( int matrix_layout, char jobz, char range, char uplo,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chpevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_chp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -8;
             }
         }
@@ -85,7 +85,7 @@ lapack_int LAPACKE_chpevx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chpevx_work( matrix_layout, jobz, range, uplo, n, ap, vl, vu,
+    info = API_SUFFIX(LAPACKE_chpevx_work)( matrix_layout, jobz, range, uplo, n, ap, vl, vu,
                                 il, iu, abstol, m, w, z, ldz, work, rwork,
                                 iwork, ifail );
     /* Release memory and exit */
@@ -96,7 +96,7 @@ lapack_int LAPACKE_chpevx( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chpevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpevx_work.c b/LAPACKE/src/lapacke_chpevx_work.c
index 2aac2227f0..61606cda1a 100644
--- a/LAPACKE/src/lapacke_chpevx_work.c
+++ b/LAPACKE/src/lapacke_chpevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpevx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_chpevx_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n,
                                 lapack_complex_float* ap, float vl, float vu,
                                 lapack_int il, lapack_int iu, float abstol,
@@ -51,20 +51,20 @@ lapack_int LAPACKE_chpevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldz_t = MAX(1,n);
         lapack_complex_float* z_t = NULL;
         lapack_complex_float* ap_t = NULL;
         /* Check leading dimension(s) */
         if( ldz < ncols_z ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_chpevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpevx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -81,7 +81,7 @@ lapack_int LAPACKE_chpevx_work( int matrix_layout, char jobz, char range,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_chp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chpevx( &jobz, &range, &uplo, &n, ap_t, &vl, &vu, &il, &iu,
                        &abstol, m, w, z_t, &ldz_t, work, rwork, iwork, ifail,
@@ -90,24 +90,24 @@ lapack_int LAPACKE_chpevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
-        LAPACKE_chp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_chp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chpevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chpevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpgst.c b/LAPACKE/src/lapacke_chpgst.c
index 0672f9ba99..64b6530e5c 100644
--- a/LAPACKE/src/lapacke_chpgst.c
+++ b/LAPACKE/src/lapacke_chpgst.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpgst( int matrix_layout, lapack_int itype, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chpgst)( int matrix_layout, lapack_int itype, char uplo,
                            lapack_int n, lapack_complex_float* ap,
                            const lapack_complex_float* bp )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chpgst", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgst", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_chp_nancheck( n, bp ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, bp ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_chpgst_work( matrix_layout, itype, uplo, n, ap, bp );
+    return API_SUFFIX(LAPACKE_chpgst_work)( matrix_layout, itype, uplo, n, ap, bp );
 }
diff --git a/LAPACKE/src/lapacke_chpgst_work.c b/LAPACKE/src/lapacke_chpgst_work.c
index 7e4509e259..ea66d9d103 100644
--- a/LAPACKE/src/lapacke_chpgst_work.c
+++ b/LAPACKE/src/lapacke_chpgst_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpgst_work( int matrix_layout, lapack_int itype, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chpgst_work)( int matrix_layout, lapack_int itype, char uplo,
                                 lapack_int n, lapack_complex_float* ap,
                                 const lapack_complex_float* bp )
 {
@@ -62,26 +62,26 @@ lapack_int LAPACKE_chpgst_work( int matrix_layout, lapack_int itype, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_chp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_chp_trans( matrix_layout, uplo, n, bp, bp_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, bp, bp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chpgst( &itype, &uplo, &n, ap_t, bp_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_chp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_chp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( bp_t );
 exit_level_1:
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chpgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgst_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chpgst_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgst_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpgv.c b/LAPACKE/src/lapacke_chpgv.c
index 71499d275c..cfbded2d2c 100644
--- a/LAPACKE/src/lapacke_chpgv.c
+++ b/LAPACKE/src/lapacke_chpgv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpgv( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_chpgv)( int matrix_layout, lapack_int itype, char jobz,
                           char uplo, lapack_int n, lapack_complex_float* ap,
                           lapack_complex_float* bp, float* w,
                           lapack_complex_float* z, lapack_int ldz )
@@ -41,16 +41,16 @@ lapack_int LAPACKE_chpgv( int matrix_layout, lapack_int itype, char jobz,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chpgv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_chp_nancheck( n, bp ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, bp ) ) {
             return -7;
         }
     }
@@ -68,7 +68,7 @@ lapack_int LAPACKE_chpgv( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chpgv_work( matrix_layout, itype, jobz, uplo, n, ap, bp, w, z,
+    info = API_SUFFIX(LAPACKE_chpgv_work)( matrix_layout, itype, jobz, uplo, n, ap, bp, w, z,
                                ldz, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -76,7 +76,7 @@ lapack_int LAPACKE_chpgv( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chpgv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpgv_work.c b/LAPACKE/src/lapacke_chpgv_work.c
index 8bbf650f6a..c75e583d2f 100644
--- a/LAPACKE/src/lapacke_chpgv_work.c
+++ b/LAPACKE/src/lapacke_chpgv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpgv_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_chpgv_work)( int matrix_layout, lapack_int itype, char jobz,
                                char uplo, lapack_int n,
                                lapack_complex_float* ap,
                                lapack_complex_float* bp, float* w,
@@ -55,11 +55,11 @@ lapack_int LAPACKE_chpgv_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_chpgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,n) );
@@ -83,8 +83,8 @@ lapack_int LAPACKE_chpgv_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_chp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_chp_trans( matrix_layout, uplo, n, bp, bp_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, bp, bp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chpgv( &itype, &jobz, &uplo, &n, ap_t, bp_t, w, z_t, &ldz_t,
                       work, rwork, &info );
@@ -92,26 +92,26 @@ lapack_int LAPACKE_chpgv_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
-        LAPACKE_chp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
-        LAPACKE_chp_trans( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
+        API_SUFFIX(LAPACKE_chp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_chp_trans)( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
         /* Release memory and exit */
         LAPACKE_free( bp_t );
 exit_level_2:
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chpgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chpgv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpgvd.c b/LAPACKE/src/lapacke_chpgvd.c
index df8989f541..ebaed8df5b 100644
--- a/LAPACKE/src/lapacke_chpgvd.c
+++ b/LAPACKE/src/lapacke_chpgvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpgvd( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_chpgvd)( int matrix_layout, lapack_int itype, char jobz,
                            char uplo, lapack_int n, lapack_complex_float* ap,
                            lapack_complex_float* bp, float* w,
                            lapack_complex_float* z, lapack_int ldz )
@@ -48,22 +48,22 @@ lapack_int LAPACKE_chpgvd( int matrix_layout, lapack_int itype, char jobz,
     float rwork_query;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chpgvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_chp_nancheck( n, bp ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, bp ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chpgvd_work( matrix_layout, itype, jobz, uplo, n, ap, bp, w,
+    info = API_SUFFIX(LAPACKE_chpgvd_work)( matrix_layout, itype, jobz, uplo, n, ap, bp, w,
                                 z, ldz, &work_query, lwork, &rwork_query,
                                 lrwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -90,7 +90,7 @@ lapack_int LAPACKE_chpgvd( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chpgvd_work( matrix_layout, itype, jobz, uplo, n, ap, bp, w,
+    info = API_SUFFIX(LAPACKE_chpgvd_work)( matrix_layout, itype, jobz, uplo, n, ap, bp, w,
                                 z, ldz, work, lwork, rwork, lrwork, iwork,
                                 liwork );
     /* Release memory and exit */
@@ -101,7 +101,7 @@ lapack_int LAPACKE_chpgvd( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chpgvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpgvd_work.c b/LAPACKE/src/lapacke_chpgvd_work.c
index 98b28a0741..b866877736 100644
--- a/LAPACKE/src/lapacke_chpgvd_work.c
+++ b/LAPACKE/src/lapacke_chpgvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpgvd_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_chpgvd_work)( int matrix_layout, lapack_int itype, char jobz,
                                 char uplo, lapack_int n,
                                 lapack_complex_float* ap,
                                 lapack_complex_float* bp, float* w,
@@ -57,7 +57,7 @@ lapack_int LAPACKE_chpgvd_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_chpgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgvd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,7 +67,7 @@ lapack_int LAPACKE_chpgvd_work( int matrix_layout, lapack_int itype, char jobz,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,n) );
@@ -91,8 +91,8 @@ lapack_int LAPACKE_chpgvd_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_chp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_chp_trans( matrix_layout, uplo, n, bp, bp_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, bp, bp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chpgvd( &itype, &jobz, &uplo, &n, ap_t, bp_t, w, z_t, &ldz_t,
                        work, &lwork, rwork, &lrwork, iwork, &liwork, &info );
@@ -100,26 +100,26 @@ lapack_int LAPACKE_chpgvd_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
-        LAPACKE_chp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
-        LAPACKE_chp_trans( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
+        API_SUFFIX(LAPACKE_chp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_chp_trans)( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
         /* Release memory and exit */
         LAPACKE_free( bp_t );
 exit_level_2:
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chpgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chpgvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpgvx.c b/LAPACKE/src/lapacke_chpgvx.c
index 0e3876d224..eee12850c8 100644
--- a/LAPACKE/src/lapacke_chpgvx.c
+++ b/LAPACKE/src/lapacke_chpgvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpgvx( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_chpgvx)( int matrix_layout, lapack_int itype, char jobz,
                            char range, char uplo, lapack_int n,
                            lapack_complex_float* ap, lapack_complex_float* bp,
                            float vl, float vu, lapack_int il, lapack_int iu,
@@ -45,28 +45,28 @@ lapack_int LAPACKE_chpgvx( int matrix_layout, lapack_int itype, char jobz,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chpgvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -13;
         }
-        if( LAPACKE_chp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, ap ) ) {
             return -7;
         }
-        if( LAPACKE_chp_nancheck( n, bp ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, bp ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -9;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -10;
             }
         }
@@ -90,7 +90,7 @@ lapack_int LAPACKE_chpgvx( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chpgvx_work( matrix_layout, itype, jobz, range, uplo, n, ap,
+    info = API_SUFFIX(LAPACKE_chpgvx_work)( matrix_layout, itype, jobz, range, uplo, n, ap,
                                 bp, vl, vu, il, iu, abstol, m, w, z, ldz, work,
                                 rwork, iwork, ifail );
     /* Release memory and exit */
@@ -101,7 +101,7 @@ lapack_int LAPACKE_chpgvx( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chpgvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpgvx_work.c b/LAPACKE/src/lapacke_chpgvx_work.c
index 7ff379d9ed..49f5331649 100644
--- a/LAPACKE/src/lapacke_chpgvx_work.c
+++ b/LAPACKE/src/lapacke_chpgvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpgvx_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_chpgvx_work)( int matrix_layout, lapack_int itype, char jobz,
                                 char range, char uplo, lapack_int n,
                                 lapack_complex_float* ap,
                                 lapack_complex_float* bp, float vl, float vu,
@@ -52,9 +52,9 @@ lapack_int LAPACKE_chpgvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldz_t = MAX(1,n);
         lapack_complex_float* z_t = NULL;
         lapack_complex_float* ap_t = NULL;
@@ -62,11 +62,11 @@ lapack_int LAPACKE_chpgvx_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( ldz < ncols_z ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_chpgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -90,8 +90,8 @@ lapack_int LAPACKE_chpgvx_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_chp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_chp_trans( matrix_layout, uplo, n, bp, bp_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, bp, bp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chpgvx( &itype, &jobz, &range, &uplo, &n, ap_t, bp_t, &vl, &vu,
                        &il, &iu, &abstol, m, w, z_t, &ldz_t, work, rwork, iwork,
@@ -100,27 +100,27 @@ lapack_int LAPACKE_chpgvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
-        LAPACKE_chp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
-        LAPACKE_chp_trans( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
+        API_SUFFIX(LAPACKE_chp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_chp_trans)( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
         /* Release memory and exit */
         LAPACKE_free( bp_t );
 exit_level_2:
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chpgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chpgvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpgvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chprfs.c b/LAPACKE/src/lapacke_chprfs.c
index 0eacaf3821..c544cbb93e 100644
--- a/LAPACKE/src/lapacke_chprfs.c
+++ b/LAPACKE/src/lapacke_chprfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chprfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chprfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* ap,
                            const lapack_complex_float* afp,
                            const lapack_int* ipiv,
@@ -44,22 +44,22 @@ lapack_int LAPACKE_chprfs( int matrix_layout, char uplo, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chprfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chprfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, afp ) ) {
             return -6;
         }
-        if( LAPACKE_chp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -10;
         }
     }
@@ -77,7 +77,7 @@ lapack_int LAPACKE_chprfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chprfs_work( matrix_layout, uplo, n, nrhs, ap, afp, ipiv, b,
+    info = API_SUFFIX(LAPACKE_chprfs_work)( matrix_layout, uplo, n, nrhs, ap, afp, ipiv, b,
                                 ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -85,7 +85,7 @@ lapack_int LAPACKE_chprfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chprfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chprfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chprfs_work.c b/LAPACKE/src/lapacke_chprfs_work.c
index d51f00c809..a0eee7e525 100644
--- a/LAPACKE/src/lapacke_chprfs_work.c
+++ b/LAPACKE/src/lapacke_chprfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chprfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chprfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* ap,
                                 const lapack_complex_float* afp,
                                 const lapack_int* ipiv,
@@ -59,12 +59,12 @@ lapack_int LAPACKE_chprfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_chprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chprfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_chprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chprfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -97,10 +97,10 @@ lapack_int LAPACKE_chprfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
-        LAPACKE_chp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_chp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, afp, afp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chprfs( &uplo, &n, &nrhs, ap_t, afp_t, ipiv, b_t, &ldb_t, x_t,
                        &ldx_t, ferr, berr, work, rwork, &info );
@@ -108,7 +108,7 @@ lapack_int LAPACKE_chprfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( afp_t );
 exit_level_3:
@@ -119,11 +119,11 @@ lapack_int LAPACKE_chprfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chprfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chprfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chprfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpsv.c b/LAPACKE/src/lapacke_chpsv.c
index c82716af20..6c098ee4aa 100644
--- a/LAPACKE/src/lapacke_chpsv.c
+++ b/LAPACKE/src/lapacke_chpsv.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpsv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chpsv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_float* ap,
                           lapack_int* ipiv, lapack_complex_float* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chpsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_chpsv_work( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
+    return API_SUFFIX(LAPACKE_chpsv_work)( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_chpsv_work.c b/LAPACKE/src/lapacke_chpsv_work.c
index 7260defb8d..4a54409052 100644
--- a/LAPACKE/src/lapacke_chpsv_work.c
+++ b/LAPACKE/src/lapacke_chpsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpsv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chpsv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_float* ap,
                                lapack_int* ipiv, lapack_complex_float* b,
                                lapack_int ldb )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_chpsv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_chpsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,27 +70,27 @@ lapack_int LAPACKE_chpsv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_chp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chpsv( &uplo, &n, &nrhs, ap_t, ipiv, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_chp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_chp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chpsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chpsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpsvx.c b/LAPACKE/src/lapacke_chpsvx.c
index 21dec80cbe..78866d0502 100644
--- a/LAPACKE/src/lapacke_chpsvx.c
+++ b/LAPACKE/src/lapacke_chpsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpsvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chpsvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* ap,
                            lapack_complex_float* afp, lapack_int* ipiv,
                            const lapack_complex_float* b, lapack_int ldb,
@@ -43,21 +43,21 @@ lapack_int LAPACKE_chpsvx( int matrix_layout, char fact, char uplo, lapack_int n
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chpsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_chp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_chp_nancheck)( n, afp ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_chp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
@@ -75,7 +75,7 @@ lapack_int LAPACKE_chpsvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chpsvx_work( matrix_layout, fact, uplo, n, nrhs, ap, afp,
+    info = API_SUFFIX(LAPACKE_chpsvx_work)( matrix_layout, fact, uplo, n, nrhs, ap, afp,
                                 ipiv, b, ldb, x, ldx, rcond, ferr, berr, work,
                                 rwork );
     /* Release memory and exit */
@@ -84,7 +84,7 @@ lapack_int LAPACKE_chpsvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chpsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chpsvx_work.c b/LAPACKE/src/lapacke_chpsvx_work.c
index 6084db1928..9fc72eaa95 100644
--- a/LAPACKE/src/lapacke_chpsvx_work.c
+++ b/LAPACKE/src/lapacke_chpsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chpsvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_chpsvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs,
                                 const lapack_complex_float* ap,
                                 lapack_complex_float* afp, lapack_int* ipiv,
@@ -59,12 +59,12 @@ lapack_int LAPACKE_chpsvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_chpsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_chpsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -97,10 +97,10 @@ lapack_int LAPACKE_chpsvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_chp_trans( matrix_layout, uplo, n, ap, ap_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_chp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, afp, afp_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_chpsvx( &fact, &uplo, &n, &nrhs, ap_t, afp_t, ipiv, b_t, &ldb_t,
@@ -109,9 +109,9 @@ lapack_int LAPACKE_chpsvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        if( LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_chp_trans( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_chp_trans)( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
         }
         /* Release memory and exit */
         LAPACKE_free( afp_t );
@@ -123,11 +123,11 @@ lapack_int LAPACKE_chpsvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chpsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chpsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chpsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chptrd.c b/LAPACKE/src/lapacke_chptrd.c
index 7a2c7923ca..7538893508 100644
--- a/LAPACKE/src/lapacke_chptrd.c
+++ b/LAPACKE/src/lapacke_chptrd.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chptrd( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chptrd)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* ap, float* d, float* e,
                            lapack_complex_float* tau )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chptrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chptrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_chptrd_work( matrix_layout, uplo, n, ap, d, e, tau );
+    return API_SUFFIX(LAPACKE_chptrd_work)( matrix_layout, uplo, n, ap, d, e, tau );
 }
diff --git a/LAPACKE/src/lapacke_chptrd_work.c b/LAPACKE/src/lapacke_chptrd_work.c
index dc3313f684..1c2b47c15b 100644
--- a/LAPACKE/src/lapacke_chptrd_work.c
+++ b/LAPACKE/src/lapacke_chptrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chptrd_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chptrd_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* ap, float* d, float* e,
                                 lapack_complex_float* tau )
 {
@@ -54,23 +54,23 @@ lapack_int LAPACKE_chptrd_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_chp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chptrd( &uplo, &n, ap_t, d, e, tau, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_chp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_chp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chptrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chptrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chptrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chptrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chptrf.c b/LAPACKE/src/lapacke_chptrf.c
index 957f16d776..1698d3f310 100644
--- a/LAPACKE/src/lapacke_chptrf.c
+++ b/LAPACKE/src/lapacke_chptrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chptrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chptrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* ap, lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chptrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chptrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_chptrf_work( matrix_layout, uplo, n, ap, ipiv );
+    return API_SUFFIX(LAPACKE_chptrf_work)( matrix_layout, uplo, n, ap, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_chptrf_work.c b/LAPACKE/src/lapacke_chptrf_work.c
index 43d9c89923..c80bee6fdb 100644
--- a/LAPACKE/src/lapacke_chptrf_work.c
+++ b/LAPACKE/src/lapacke_chptrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chptrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chptrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* ap, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -53,23 +53,23 @@ lapack_int LAPACKE_chptrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_chp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chptrf( &uplo, &n, ap_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_chp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_chp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chptrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chptrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chptrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chptrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chptri.c b/LAPACKE/src/lapacke_chptri.c
index 1d159b7e70..a5ce2036bd 100644
--- a/LAPACKE/src/lapacke_chptri.c
+++ b/LAPACKE/src/lapacke_chptri.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chptri( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chptri)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* ap, const lapack_int* ipiv )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chptri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chptri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
@@ -57,12 +57,12 @@ lapack_int LAPACKE_chptri( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chptri_work( matrix_layout, uplo, n, ap, ipiv, work );
+    info = API_SUFFIX(LAPACKE_chptri_work)( matrix_layout, uplo, n, ap, ipiv, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chptri", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chptri", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chptri_work.c b/LAPACKE/src/lapacke_chptri_work.c
index 51a10195d0..869c7a3b05 100644
--- a/LAPACKE/src/lapacke_chptri_work.c
+++ b/LAPACKE/src/lapacke_chptri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chptri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chptri_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* ap,
                                 const lapack_int* ipiv,
                                 lapack_complex_float* work )
@@ -55,23 +55,23 @@ lapack_int LAPACKE_chptri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_chp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chptri( &uplo, &n, ap_t, ipiv, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_chp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_chp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chptri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chptri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chptri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chptri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chptrs.c b/LAPACKE/src/lapacke_chptrs.c
index ba3590d929..6ad4fbb036 100644
--- a/LAPACKE/src/lapacke_chptrs.c
+++ b/LAPACKE/src/lapacke_chptrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chptrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chptrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* ap,
                            const lapack_int* ipiv, lapack_complex_float* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chptrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chptrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_chp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_chp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_chptrs_work( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
+    return API_SUFFIX(LAPACKE_chptrs_work)( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_chptrs_work.c b/LAPACKE/src/lapacke_chptrs_work.c
index 139de1dcfe..c4d0467e26 100644
--- a/LAPACKE/src/lapacke_chptrs_work.c
+++ b/LAPACKE/src/lapacke_chptrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chptrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chptrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* ap,
                                 const lapack_int* ipiv, lapack_complex_float* b,
                                 lapack_int ldb )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_chptrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_chptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chptrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,26 +70,26 @@ lapack_int LAPACKE_chptrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_chp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_chp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_chptrs( &uplo, &n, &nrhs, ap_t, ipiv, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chptrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chptrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chptrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chsein.c b/LAPACKE/src/lapacke_chsein.c
index 4e606b9481..9cb00b0205 100644
--- a/LAPACKE/src/lapacke_chsein.c
+++ b/LAPACKE/src/lapacke_chsein.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chsein( int matrix_layout, char job, char eigsrc, char initv,
+lapack_int API_SUFFIX(LAPACKE_chsein)( int matrix_layout, char job, char eigsrc, char initv,
                            const lapack_logical* select, lapack_int n,
                            const lapack_complex_float* h, lapack_int ldh,
                            lapack_complex_float* w, lapack_complex_float* vl,
@@ -44,26 +44,26 @@ lapack_int LAPACKE_chsein( int matrix_layout, char job, char eigsrc, char initv,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chsein", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chsein", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, h, ldh ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, h, ldh ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'l' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'l' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'r' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -12;
             }
         }
-        if( LAPACKE_c_nancheck( n, w, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n, w, 1 ) ) {
             return -9;
         }
     }
@@ -81,7 +81,7 @@ lapack_int LAPACKE_chsein( int matrix_layout, char job, char eigsrc, char initv,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chsein_work( matrix_layout, job, eigsrc, initv, select, n, h,
+    info = API_SUFFIX(LAPACKE_chsein_work)( matrix_layout, job, eigsrc, initv, select, n, h,
                                 ldh, w, vl, ldvl, vr, ldvr, mm, m, work, rwork,
                                 ifaill, ifailr );
     /* Release memory and exit */
@@ -90,7 +90,7 @@ lapack_int LAPACKE_chsein( int matrix_layout, char job, char eigsrc, char initv,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chsein", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chsein", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chsein_work.c b/LAPACKE/src/lapacke_chsein_work.c
index 8c58add548..90f3654af3 100644
--- a/LAPACKE/src/lapacke_chsein_work.c
+++ b/LAPACKE/src/lapacke_chsein_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chsein_work( int matrix_layout, char job, char eigsrc,
+lapack_int API_SUFFIX(LAPACKE_chsein_work)( int matrix_layout, char job, char eigsrc,
                                 char initv, const lapack_logical* select,
                                 lapack_int n, const lapack_complex_float* h,
                                 lapack_int ldh, lapack_complex_float* w,
@@ -60,17 +60,17 @@ lapack_int LAPACKE_chsein_work( int matrix_layout, char job, char eigsrc,
         /* Check leading dimension(s) */
         if( ldh < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_chsein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chsein_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_chsein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chsein_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_chsein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chsein_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -80,7 +80,7 @@ lapack_int LAPACKE_chsein_work( int matrix_layout, char job, char eigsrc,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'l' ) ) {
             vl_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvl_t * MAX(1,mm) );
@@ -89,7 +89,7 @@ lapack_int LAPACKE_chsein_work( int matrix_layout, char job, char eigsrc,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'r' ) ) {
             vr_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvr_t * MAX(1,mm) );
@@ -99,14 +99,14 @@ lapack_int LAPACKE_chsein_work( int matrix_layout, char job, char eigsrc,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, h, ldh, h_t, ldh_t );
-        if( ( LAPACKE_lsame( job, 'l' ) || LAPACKE_lsame( job, 'b' ) ) &&
-            LAPACKE_lsame( initv, 'v' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, h, ldh, h_t, ldh_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( job, 'l' ) || API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( initv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( ( LAPACKE_lsame( job, 'r' ) || LAPACKE_lsame( job, 'b' ) ) &&
-            LAPACKE_lsame( initv, 'v' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( job, 'r' ) || API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( initv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_chsein( &job, &eigsrc, &initv, select, &n, h_t, &ldh_t, w, vl_t,
@@ -116,31 +116,31 @@ lapack_int LAPACKE_chsein_work( int matrix_layout, char job, char eigsrc,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'l' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'l' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
                                ldvl );
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'r' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'r' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
                                ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'r' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'l' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( h_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chsein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chsein_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chsein_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chsein_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chseqr.c b/LAPACKE/src/lapacke_chseqr.c
index ad364f84e6..78e668ec81 100644
--- a/LAPACKE/src/lapacke_chseqr.c
+++ b/LAPACKE/src/lapacke_chseqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chseqr( int matrix_layout, char job, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_chseqr)( int matrix_layout, char job, char compz, lapack_int n,
                            lapack_int ilo, lapack_int ihi,
                            lapack_complex_float* h, lapack_int ldh,
                            lapack_complex_float* w, lapack_complex_float* z,
@@ -43,24 +43,24 @@ lapack_int LAPACKE_chseqr( int matrix_layout, char job, char compz, lapack_int n
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_chseqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chseqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, h, ldh ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, h, ldh ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -10;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_chseqr_work( matrix_layout, job, compz, n, ilo, ihi, h, ldh,
+    info = API_SUFFIX(LAPACKE_chseqr_work)( matrix_layout, job, compz, n, ilo, ihi, h, ldh,
                                 w, z, ldz, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -74,13 +74,13 @@ lapack_int LAPACKE_chseqr( int matrix_layout, char job, char compz, lapack_int n
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_chseqr_work( matrix_layout, job, compz, n, ilo, ihi, h, ldh,
+    info = API_SUFFIX(LAPACKE_chseqr_work)( matrix_layout, job, compz, n, ilo, ihi, h, ldh,
                                 w, z, ldz, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_chseqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chseqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_chseqr_work.c b/LAPACKE/src/lapacke_chseqr_work.c
index 11bac7ccb0..1161f0c64a 100644
--- a/LAPACKE/src/lapacke_chseqr_work.c
+++ b/LAPACKE/src/lapacke_chseqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_chseqr_work( int matrix_layout, char job, char compz,
+lapack_int API_SUFFIX(LAPACKE_chseqr_work)( int matrix_layout, char job, char compz,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 lapack_complex_float* h, lapack_int ldh,
                                 lapack_complex_float* w,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_chseqr_work( int matrix_layout, char job, char compz,
         /* Check leading dimension(s) */
         if( ldh < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_chseqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chseqr_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_chseqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chseqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -76,7 +76,7 @@ lapack_int LAPACKE_chseqr_work( int matrix_layout, char job, char compz,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,n) );
@@ -86,9 +86,9 @@ lapack_int LAPACKE_chseqr_work( int matrix_layout, char job, char compz,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, h, ldh, h_t, ldh_t );
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, h, ldh, h_t, ldh_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_chseqr( &job, &compz, &n, &ilo, &ihi, h_t, &ldh_t, w, z_t,
@@ -97,23 +97,23 @@ lapack_int LAPACKE_chseqr_work( int matrix_layout, char job, char compz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, h_t, ldh_t, h, ldh );
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, h_t, ldh_t, h, ldh );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( h_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_chseqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chseqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_chseqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_chseqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clacgv.c b/LAPACKE/src/lapacke_clacgv.c
index 1e6ed883e8..f821a870bc 100644
--- a/LAPACKE/src/lapacke_clacgv.c
+++ b/LAPACKE/src/lapacke_clacgv.c
@@ -32,16 +32,16 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clacgv( lapack_int n, lapack_complex_float* x,
+lapack_int API_SUFFIX(LAPACKE_clacgv)( lapack_int n, lapack_complex_float* x,
                            lapack_int incx )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_c_nancheck( n, x, incx ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n, x, incx ) ) {
             return -2;
         }
     }
 #endif
-    return LAPACKE_clacgv_work( n, x, incx );
+    return API_SUFFIX(LAPACKE_clacgv_work)( n, x, incx );
 }
diff --git a/LAPACKE/src/lapacke_clacgv_work.c b/LAPACKE/src/lapacke_clacgv_work.c
index 11f41bed37..9cc41f4557 100644
--- a/LAPACKE/src/lapacke_clacgv_work.c
+++ b/LAPACKE/src/lapacke_clacgv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clacgv_work( lapack_int n, lapack_complex_float* x,
+lapack_int API_SUFFIX(LAPACKE_clacgv_work)( lapack_int n, lapack_complex_float* x,
                                 lapack_int incx )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_clacn2.c b/LAPACKE/src/lapacke_clacn2.c
index 8cb37df7fb..bd43fb5b29 100644
--- a/LAPACKE/src/lapacke_clacn2.c
+++ b/LAPACKE/src/lapacke_clacn2.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clacn2( lapack_int n, lapack_complex_float* v,
+lapack_int API_SUFFIX(LAPACKE_clacn2)( lapack_int n, lapack_complex_float* v,
                            lapack_complex_float* x,
                            float* est, lapack_int* kase, lapack_int* isave )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, est, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, est, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_c_nancheck( n, x, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n, x, 1 ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_clacn2_work( n, v, x, est, kase, isave );
+    return API_SUFFIX(LAPACKE_clacn2_work)( n, v, x, est, kase, isave );
 }
diff --git a/LAPACKE/src/lapacke_clacn2_work.c b/LAPACKE/src/lapacke_clacn2_work.c
index 390e42068e..415ccbcff2 100644
--- a/LAPACKE/src/lapacke_clacn2_work.c
+++ b/LAPACKE/src/lapacke_clacn2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clacn2_work( lapack_int n, lapack_complex_float* v,
+lapack_int API_SUFFIX(LAPACKE_clacn2_work)( lapack_int n, lapack_complex_float* v,
                                 lapack_complex_float* x,
                                 float* est, lapack_int* kase,
                                 lapack_int* isave )
diff --git a/LAPACKE/src/lapacke_clacp2.c b/LAPACKE/src/lapacke_clacp2.c
index fc9b9f8d97..177d787d44 100644
--- a/LAPACKE/src/lapacke_clacp2.c
+++ b/LAPACKE/src/lapacke_clacp2.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clacp2( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_clacp2)( int matrix_layout, char uplo, lapack_int m,
                            lapack_int n, const float* a, lapack_int lda,
                            lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_clacp2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clacp2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_clacp2_work( matrix_layout, uplo, m, n, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_clacp2_work)( matrix_layout, uplo, m, n, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_clacp2_work.c b/LAPACKE/src/lapacke_clacp2_work.c
index d565e46698..008cecb083 100644
--- a/LAPACKE/src/lapacke_clacp2_work.c
+++ b/LAPACKE/src/lapacke_clacp2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clacp2_work( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_clacp2_work)( int matrix_layout, char uplo, lapack_int m,
                                 lapack_int n, const float* a, lapack_int lda,
                                 lapack_complex_float* b, lapack_int ldb )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_clacp2_work( int matrix_layout, char uplo, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_clacp2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clacp2_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_clacp2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clacp2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,23 +72,23 @@ lapack_int LAPACKE_clacp2_work( int matrix_layout, char uplo, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_clacp2( &uplo, &m, &n, a_t, &lda_t, b_t, &ldb_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clacp2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clacp2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_clacp2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clacp2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clacpy.c b/LAPACKE/src/lapacke_clacpy.c
index f5f6216fa6..21b88be010 100644
--- a/LAPACKE/src/lapacke_clacpy.c
+++ b/LAPACKE/src/lapacke_clacpy.c
@@ -32,22 +32,22 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clacpy( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_clacpy)( int matrix_layout, char uplo, lapack_int m,
                            lapack_int n, const lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_clacpy", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clacpy", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_clacpy_work( matrix_layout, uplo, m, n, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_clacpy_work)( matrix_layout, uplo, m, n, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_clacpy_work.c b/LAPACKE/src/lapacke_clacpy_work.c
index 59cab5aa30..dfea330042 100644
--- a/LAPACKE/src/lapacke_clacpy_work.c
+++ b/LAPACKE/src/lapacke_clacpy_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clacpy_work( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_clacpy_work)( int matrix_layout, char uplo, lapack_int m,
                                 lapack_int n, const lapack_complex_float* a,
                                 lapack_int lda, lapack_complex_float* b,
                                 lapack_int ldb )
@@ -49,12 +49,12 @@ lapack_int LAPACKE_clacpy_work( int matrix_layout, char uplo, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_clacpy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clacpy_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_clacpy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clacpy_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,23 +71,23 @@ lapack_int LAPACKE_clacpy_work( int matrix_layout, char uplo, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_clacpy( &uplo, &m, &n, a_t, &lda_t, b_t, &ldb_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clacpy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clacpy_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_clacpy_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clacpy_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clacrm.c b/LAPACKE/src/lapacke_clacrm.c
index c14540589c..37f6592c67 100644
--- a/LAPACKE/src/lapacke_clacrm.c
+++ b/LAPACKE/src/lapacke_clacrm.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clacrm(int matrix_layout, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_clacrm)(int matrix_layout, lapack_int m,
                            lapack_int n, const lapack_complex_float* a,
                            lapack_int lda, const float* b, lapack_int ldb,
                            lapack_complex_float* c, lapack_int ldc)
@@ -41,16 +41,16 @@ lapack_int LAPACKE_clacrm(int matrix_layout, lapack_int m,
     float* rwork = NULL;
 
     if (matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR) {
-        LAPACKE_xerbla("LAPACKE_clacrm", -1);
+        API_SUFFIX(LAPACKE_xerbla)("LAPACKE_clacrm", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -6;
         }
     }
@@ -63,13 +63,13 @@ lapack_int LAPACKE_clacrm(int matrix_layout, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_clacrm_work(matrix_layout, m, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_clacrm_work)(matrix_layout, m, n, a, lda, b, ldb,
                                 c, ldc, rwork);
     /* Release memory and exit */
     LAPACKE_free(rwork);
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_clacrm", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clacrm", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clacrm_work.c b/LAPACKE/src/lapacke_clacrm_work.c
index a9befaf088..4425e7a9dc 100644
--- a/LAPACKE/src/lapacke_clacrm_work.c
+++ b/LAPACKE/src/lapacke_clacrm_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clacrm_work(int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_clacrm_work)(int matrix_layout, lapack_int m, lapack_int n,
                                 const lapack_complex_float* a, lapack_int lda,
                                 const float* b, lapack_int ldb,
                                 lapack_complex_float* c, lapack_int ldc,
@@ -52,17 +52,17 @@ lapack_int LAPACKE_clacrm_work(int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_clacrm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clacrm_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_clacrm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clacrm_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_clacrm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clacrm_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -85,12 +85,12 @@ lapack_int LAPACKE_clacrm_work(int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans(matrix_layout, m, n, a, lda, a_t, lda_t);
-        LAPACKE_sge_trans(matrix_layout, n, n, b, ldb, b_t, ldb_t);
+        API_SUFFIX(LAPACKE_cge_trans)(matrix_layout, m, n, a, lda, a_t, lda_t);
+        API_SUFFIX(LAPACKE_sge_trans)(matrix_layout, n, n, b, ldb, b_t, ldb_t);
         /* Call LAPACK function */
         LAPACK_clacrm(&m, &n, a_t, &lda_t, b_t, &ldb_t, c_t, &ldc_t, rwork);
         /* Transpose output matrices */
-        LAPACKE_cge_trans(LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc);
+        API_SUFFIX(LAPACKE_cge_trans)(LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc);
         /* Release memory and exit */
         LAPACKE_free(c_t);
 exit_level_2:
@@ -99,11 +99,11 @@ lapack_int LAPACKE_clacrm_work(int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free(a_t);
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clacrm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clacrm_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla("LAPACKE_clacrm_work", -1);
+        API_SUFFIX(LAPACKE_xerbla)("LAPACKE_clacrm_work", -1);
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clag2z.c b/LAPACKE/src/lapacke_clag2z.c
index 77af6c4da2..899b5fbbc3 100644
--- a/LAPACKE/src/lapacke_clag2z.c
+++ b/LAPACKE/src/lapacke_clag2z.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clag2z( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_clag2z)( int matrix_layout, lapack_int m, lapack_int n,
                            const lapack_complex_float* sa, lapack_int ldsa,
                            lapack_complex_double* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_clag2z", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clag2z", -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, sa, ldsa ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, sa, ldsa ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_clag2z_work( matrix_layout, m, n, sa, ldsa, a, lda );
+    return API_SUFFIX(LAPACKE_clag2z_work)( matrix_layout, m, n, sa, ldsa, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_clag2z_work.c b/LAPACKE/src/lapacke_clag2z_work.c
index 727bd54388..a057f3e825 100644
--- a/LAPACKE/src/lapacke_clag2z_work.c
+++ b/LAPACKE/src/lapacke_clag2z_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clag2z_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_clag2z_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 const lapack_complex_float* sa, lapack_int ldsa,
                                 lapack_complex_double* a, lapack_int lda )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_clag2z_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_clag2z_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clag2z_work", info );
             return info;
         }
         if( ldsa < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_clag2z_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clag2z_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -73,25 +73,25 @@ lapack_int LAPACKE_clag2z_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, sa, ldsa, sa_t, ldsa_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, sa, ldsa, sa_t, ldsa_t );
         /* Call LAPACK function and adjust info */
         LAPACK_clag2z( &m, &n, sa_t, &ldsa_t, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_1:
         LAPACKE_free( sa_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clag2z_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clag2z_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_clag2z_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clag2z_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clagge.c b/LAPACKE/src/lapacke_clagge.c
index abe1a96556..5e6f562b10 100644
--- a/LAPACKE/src/lapacke_clagge.c
+++ b/LAPACKE/src/lapacke_clagge.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clagge( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_clagge)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int kl, lapack_int ku, const float* d,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_int* iseed )
@@ -40,13 +40,13 @@ lapack_int LAPACKE_clagge( int matrix_layout, lapack_int m, lapack_int n,
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_clagge", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clagge", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( MIN(m,n), d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( MIN(m,n), d, 1 ) ) {
             return -6;
         }
     }
@@ -59,13 +59,13 @@ lapack_int LAPACKE_clagge( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_clagge_work( matrix_layout, m, n, kl, ku, d, a, lda, iseed,
+    info = API_SUFFIX(LAPACKE_clagge_work)( matrix_layout, m, n, kl, ku, d, a, lda, iseed,
                                 work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_clagge", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clagge", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clagge_work.c b/LAPACKE/src/lapacke_clagge_work.c
index 99f14e882c..72e03560de 100644
--- a/LAPACKE/src/lapacke_clagge_work.c
+++ b/LAPACKE/src/lapacke_clagge_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clagge_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_clagge_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int kl, lapack_int ku, const float* d,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_int* iseed, lapack_complex_float* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_clagge_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_clagge_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clagge_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,16 +66,16 @@ lapack_int LAPACKE_clagge_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clagge_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clagge_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_clagge_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clagge_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_claghe.c b/LAPACKE/src/lapacke_claghe.c
index 281a12f72c..ec3447ecaa 100644
--- a/LAPACKE/src/lapacke_claghe.c
+++ b/LAPACKE/src/lapacke_claghe.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_claghe( int matrix_layout, lapack_int n, lapack_int k,
+lapack_int API_SUFFIX(LAPACKE_claghe)( int matrix_layout, lapack_int n, lapack_int k,
                            const float* d, lapack_complex_float* a,
                            lapack_int lda, lapack_int* iseed )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_claghe", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_claghe", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -4;
         }
     }
@@ -58,12 +58,12 @@ lapack_int LAPACKE_claghe( int matrix_layout, lapack_int n, lapack_int k,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_claghe_work( matrix_layout, n, k, d, a, lda, iseed, work );
+    info = API_SUFFIX(LAPACKE_claghe_work)( matrix_layout, n, k, d, a, lda, iseed, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_claghe", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_claghe", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_claghe_work.c b/LAPACKE/src/lapacke_claghe_work.c
index a72cb152ea..d2db2a9f25 100644
--- a/LAPACKE/src/lapacke_claghe_work.c
+++ b/LAPACKE/src/lapacke_claghe_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_claghe_work( int matrix_layout, lapack_int n, lapack_int k,
+lapack_int API_SUFFIX(LAPACKE_claghe_work)( int matrix_layout, lapack_int n, lapack_int k,
                                 const float* d, lapack_complex_float* a,
                                 lapack_int lda, lapack_int* iseed,
                                 lapack_complex_float* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_claghe_work( int matrix_layout, lapack_int n, lapack_int k,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_claghe_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_claghe_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,16 +66,16 @@ lapack_int LAPACKE_claghe_work( int matrix_layout, lapack_int n, lapack_int k,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_claghe_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_claghe_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_claghe_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_claghe_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clagsy.c b/LAPACKE/src/lapacke_clagsy.c
index 841d41c441..6972d2b3af 100644
--- a/LAPACKE/src/lapacke_clagsy.c
+++ b/LAPACKE/src/lapacke_clagsy.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clagsy( int matrix_layout, lapack_int n, lapack_int k,
+lapack_int API_SUFFIX(LAPACKE_clagsy)( int matrix_layout, lapack_int n, lapack_int k,
                            const float* d, lapack_complex_float* a,
                            lapack_int lda, lapack_int* iseed )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_clagsy", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clagsy", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -4;
         }
     }
@@ -58,12 +58,12 @@ lapack_int LAPACKE_clagsy( int matrix_layout, lapack_int n, lapack_int k,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_clagsy_work( matrix_layout, n, k, d, a, lda, iseed, work );
+    info = API_SUFFIX(LAPACKE_clagsy_work)( matrix_layout, n, k, d, a, lda, iseed, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_clagsy", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clagsy", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clagsy_work.c b/LAPACKE/src/lapacke_clagsy_work.c
index 6b1c25f66c..9ddb08552c 100644
--- a/LAPACKE/src/lapacke_clagsy_work.c
+++ b/LAPACKE/src/lapacke_clagsy_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clagsy_work( int matrix_layout, lapack_int n, lapack_int k,
+lapack_int API_SUFFIX(LAPACKE_clagsy_work)( int matrix_layout, lapack_int n, lapack_int k,
                                 const float* d, lapack_complex_float* a,
                                 lapack_int lda, lapack_int* iseed,
                                 lapack_complex_float* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_clagsy_work( int matrix_layout, lapack_int n, lapack_int k,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_clagsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clagsy_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,16 +66,16 @@ lapack_int LAPACKE_clagsy_work( int matrix_layout, lapack_int n, lapack_int k,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clagsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clagsy_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_clagsy_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clagsy_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clangb.c b/LAPACKE/src/lapacke_clangb.c
new file mode 100644
index 0000000000..0fec1bf497
--- /dev/null
+++ b/LAPACKE/src/lapacke_clangb.c
@@ -0,0 +1,73 @@
+/*****************************************************************************
+  Copyright (c) 2022, 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 clangb
+* Author: Simon Märtens
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+float API_SUFFIX(LAPACKE_clangb)( int matrix_layout, char norm, lapack_int n,
+                      lapack_int kl, lapack_int ku,
+                      const lapack_complex_float* ab, lapack_int ldab )
+{
+    lapack_int info = 0;
+    float res = 0.;
+    float* work = NULL;
+    if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clangb", -1 );
+        return -1;
+    }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+    if( LAPACKE_get_nancheck() ) {
+        /* Optionally check input matrices for NaNs */
+        if( API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+            return -6;
+        }
+    }
+#endif
+    /* Allocate memory for working array(s) */
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
+        work = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,n) );
+        if( work == NULL ) {
+            info = LAPACK_WORK_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+    }
+    /* Call middle-level interface */
+    res = API_SUFFIX(LAPACKE_clangb_work)( matrix_layout, norm, n, kl, ku, ab, ldab, work );
+    /* Release memory and exit */
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
+        LAPACKE_free( work );
+    }
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clangb", info );
+    }
+    return res;
+}
diff --git a/LAPACKE/src/lapacke_clangb_work.c b/LAPACKE/src/lapacke_clangb_work.c
new file mode 100644
index 0000000000..83c3a6a993
--- /dev/null
+++ b/LAPACKE/src/lapacke_clangb_work.c
@@ -0,0 +1,84 @@
+/*****************************************************************************
+  Copyright (c) 2022, 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 clangb
+* Author: Simon Märtens
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+float API_SUFFIX(LAPACKE_clangb_work)( int matrix_layout, char norm, lapack_int n,
+                           lapack_int kl, lapack_int ku,
+                           const lapack_complex_float* ab, lapack_int ldab,
+                           float* work )
+{
+    lapack_int info = 0;
+    float res = 0.;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        res = LAPACK_clangb( &norm, &n, &kl, &ku, ab, &ldab, work );
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        char norm_lapack;
+        float* work_lapack = NULL;
+        /* Check leading dimension(s) */
+        if( ldab < kl+ku+1 ) {
+            info = -7;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clangb_work", info );
+            return info;
+        }
+        if( API_SUFFIX(LAPACKE_lsame)( norm, '1' ) || API_SUFFIX(LAPACKE_lsame)( norm, 'o' ) ) {
+            norm_lapack = 'i';
+        } else if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
+            norm_lapack = '1';
+        } else {
+            norm_lapack = norm;
+        }
+        /* Allocate memory for work array(s) */
+        if( API_SUFFIX(LAPACKE_lsame)( norm_lapack, 'i' ) ) {
+            work_lapack = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,n) );
+            if( work_lapack == NULL ) {
+                info = LAPACK_WORK_MEMORY_ERROR;
+                goto exit_level_0;
+            }
+        }
+        /* Call LAPACK function */
+        res = LAPACK_clangb( &norm, &n, &ku, &kl, ab, &ldab, work );
+        /* Release memory and exit */
+        if( work_lapack ) {
+            LAPACKE_free( work_lapack );
+        }
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clangb_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clangb_work", info );
+    }
+    return res;
+}
diff --git a/LAPACKE/src/lapacke_clange.c b/LAPACKE/src/lapacke_clange.c
index 7bd436d4dc..fbcf159f6b 100644
--- a/LAPACKE/src/lapacke_clange.c
+++ b/LAPACKE/src/lapacke_clange.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_clange( int matrix_layout, char norm, lapack_int m,
+float API_SUFFIX(LAPACKE_clange)( int matrix_layout, char norm, lapack_int m,
                            lapack_int n, const lapack_complex_float* a,
                            lapack_int lda )
 {
@@ -40,19 +40,19 @@ float LAPACKE_clange( int matrix_layout, char norm, lapack_int m,
     float res = 0.;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_clange", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clange", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( norm, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
         work = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,m) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -60,14 +60,14 @@ float LAPACKE_clange( int matrix_layout, char norm, lapack_int m,
         }
     }
     /* Call middle-level interface */
-    res = LAPACKE_clange_work( matrix_layout, norm, m, n, a, lda, work );
+    res = API_SUFFIX(LAPACKE_clange_work)( matrix_layout, norm, m, n, a, lda, work );
     /* Release memory and exit */
-    if( LAPACKE_lsame( norm, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
         LAPACKE_free( work );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_clange", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clange", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_clange_work.c b/LAPACKE/src/lapacke_clange_work.c
index 4875031dc6..9e41478a49 100644
--- a/LAPACKE/src/lapacke_clange_work.c
+++ b/LAPACKE/src/lapacke_clange_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_clange_work( int matrix_layout, char norm, lapack_int m,
+float API_SUFFIX(LAPACKE_clange_work)( int matrix_layout, char norm, lapack_int m,
                                 lapack_int n, const lapack_complex_float* a,
                                 lapack_int lda, float* work )
 {
@@ -47,18 +47,18 @@ float LAPACKE_clange_work( int matrix_layout, char norm, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_clange_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clange_work", info );
             return info;
         }
-        if( LAPACKE_lsame( norm, '1' ) || LAPACKE_lsame( norm, 'o' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( norm, '1' ) || API_SUFFIX(LAPACKE_lsame)( norm, 'o' ) ) {
             norm_lapack = 'i';
-        } else if( LAPACKE_lsame( norm, 'i' ) ) {
+        } else if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
             norm_lapack = '1';
         } else {
             norm_lapack = norm;
         }
         /* Allocate memory for work array(s) */
-        if( LAPACKE_lsame( norm_lapack, 'i' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( norm_lapack, 'i' ) ) {
             work_lapack = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,n) );
             if( work_lapack == NULL ) {
                 info = LAPACK_WORK_MEMORY_ERROR;
@@ -73,11 +73,11 @@ float LAPACKE_clange_work( int matrix_layout, char norm, lapack_int m,
         }
 exit_level_0:
         if( info == LAPACK_WORK_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clange_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clange_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_clange_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clange_work", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_clanhe.c b/LAPACKE/src/lapacke_clanhe.c
index b515348ea4..571f9009ff 100644
--- a/LAPACKE/src/lapacke_clanhe.c
+++ b/LAPACKE/src/lapacke_clanhe.c
@@ -32,27 +32,27 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_clanhe( int matrix_layout, char norm, char uplo, lapack_int n,
+float API_SUFFIX(LAPACKE_clanhe)( int matrix_layout, char norm, char uplo, lapack_int n,
                       const lapack_complex_float* a, lapack_int lda )
 {
     lapack_int info = 0;
     float res = 0.;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_clanhe", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clanhe", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( norm, 'i' ) || LAPACKE_lsame( norm, '1' ) ||
-        LAPACKE_lsame( norm, 'O' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) || API_SUFFIX(LAPACKE_lsame)( norm, '1' ) ||
+        API_SUFFIX(LAPACKE_lsame)( norm, 'O' ) ) {
         work = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,n) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -60,15 +60,15 @@ float LAPACKE_clanhe( int matrix_layout, char norm, char uplo, lapack_int n,
         }
     }
     /* Call middle-level interface */
-    res = LAPACKE_clanhe_work( matrix_layout, norm, uplo, n, a, lda, work );
+    res = API_SUFFIX(LAPACKE_clanhe_work)( matrix_layout, norm, uplo, n, a, lda, work );
     /* Release memory and exit */
-    if( LAPACKE_lsame( norm, 'i' ) || LAPACKE_lsame( norm, '1' ) ||
-        LAPACKE_lsame( norm, 'O' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) || API_SUFFIX(LAPACKE_lsame)( norm, '1' ) ||
+        API_SUFFIX(LAPACKE_lsame)( norm, 'O' ) ) {
         LAPACKE_free( work );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_clanhe", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clanhe", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_clanhe_work.c b/LAPACKE/src/lapacke_clanhe_work.c
index 561b8fad3d..5fc67733fa 100644
--- a/LAPACKE/src/lapacke_clanhe_work.c
+++ b/LAPACKE/src/lapacke_clanhe_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_clanhe_work( int matrix_layout, char norm, char uplo,
+float API_SUFFIX(LAPACKE_clanhe_work)( int matrix_layout, char norm, char uplo,
                                 lapack_int n, const lapack_complex_float* a,
                                 lapack_int lda, float* work )
 {
@@ -50,7 +50,7 @@ float LAPACKE_clanhe_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_clanhe_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clanhe_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ float LAPACKE_clanhe_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_che_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         res = LAPACK_clanhe( &norm, &uplo, &n, a_t, &lda_t, work );
         info = 0;  /* LAPACK call is ok! */
@@ -69,11 +69,11 @@ float LAPACKE_clanhe_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clanhe_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clanhe_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_clanhe_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clanhe_work", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_clansy.c b/LAPACKE/src/lapacke_clansy.c
index 018f873738..3c3a477828 100644
--- a/LAPACKE/src/lapacke_clansy.c
+++ b/LAPACKE/src/lapacke_clansy.c
@@ -32,27 +32,27 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_clansy( int matrix_layout, char norm, char uplo, lapack_int n,
+float API_SUFFIX(LAPACKE_clansy)( int matrix_layout, char norm, char uplo, lapack_int n,
                       const lapack_complex_float* a, lapack_int lda )
 {
     lapack_int info = 0;
     float res = 0.;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_clansy", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clansy", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( norm, 'i' ) || LAPACKE_lsame( norm, '1' ) ||
-        LAPACKE_lsame( norm, 'O' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) || API_SUFFIX(LAPACKE_lsame)( norm, '1' ) ||
+        API_SUFFIX(LAPACKE_lsame)( norm, 'O' ) ) {
         work = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,n) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -60,15 +60,15 @@ float LAPACKE_clansy( int matrix_layout, char norm, char uplo, lapack_int n,
         }
     }
     /* Call middle-level interface */
-    res = LAPACKE_clansy_work( matrix_layout, norm, uplo, n, a, lda, work );
+    res = API_SUFFIX(LAPACKE_clansy_work)( matrix_layout, norm, uplo, n, a, lda, work );
     /* Release memory and exit */
-    if( LAPACKE_lsame( norm, 'i' ) || LAPACKE_lsame( norm, '1' ) ||
-        LAPACKE_lsame( norm, 'O' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) || API_SUFFIX(LAPACKE_lsame)( norm, '1' ) ||
+        API_SUFFIX(LAPACKE_lsame)( norm, 'O' ) ) {
         LAPACKE_free( work );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_clansy", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clansy", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_clansy_work.c b/LAPACKE/src/lapacke_clansy_work.c
index 6c30105f97..40dc293ad8 100644
--- a/LAPACKE/src/lapacke_clansy_work.c
+++ b/LAPACKE/src/lapacke_clansy_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_clansy_work( int matrix_layout, char norm, char uplo,
+float API_SUFFIX(LAPACKE_clansy_work)( int matrix_layout, char norm, char uplo,
                                 lapack_int n, const lapack_complex_float* a,
                                 lapack_int lda, float* work )
 {
@@ -50,7 +50,7 @@ float LAPACKE_clansy_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_clansy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clansy_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ float LAPACKE_clansy_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         res = LAPACK_clansy( &norm, &uplo, &n, a_t, &lda_t, work );
         info = 0;  /* LAPACK call is ok! */
@@ -69,11 +69,11 @@ float LAPACKE_clansy_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clansy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clansy_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_clansy_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clansy_work", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_clantr.c b/LAPACKE/src/lapacke_clantr.c
index 88e765f2b8..cea035df8c 100644
--- a/LAPACKE/src/lapacke_clantr.c
+++ b/LAPACKE/src/lapacke_clantr.c
@@ -32,27 +32,27 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_clantr( int matrix_layout, char norm, char uplo, char diag,
-                           lapack_int m, lapack_int n, const lapack_complex_float* a,
-                           lapack_int lda )
+float API_SUFFIX(LAPACKE_clantr)( int matrix_layout, char norm, char uplo, char diag,
+                      lapack_int m, lapack_int n, const lapack_complex_float* a,
+                      lapack_int lda )
 {
     lapack_int info = 0;
     float res = 0.;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_clantr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clantr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ctr_nancheck( matrix_layout, uplo, diag, MIN(m,n), a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ctz_nancheck)( matrix_layout, 'f', uplo, diag, m, n, a, lda ) ) {
             return -7;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( norm, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
         work = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,MAX(m,n)) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -60,15 +60,15 @@ float LAPACKE_clantr( int matrix_layout, char norm, char uplo, char diag,
         }
     }
     /* Call middle-level interface */
-    res = LAPACKE_clantr_work( matrix_layout, norm, uplo, diag, m, n, a, lda,
+    res = API_SUFFIX(LAPACKE_clantr_work)( matrix_layout, norm, uplo, diag, m, n, a, lda,
                                 work );
     /* Release memory and exit */
-    if( LAPACKE_lsame( norm, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
         LAPACKE_free( work );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_clantr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clantr", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_clantr_work.c b/LAPACKE/src/lapacke_clantr_work.c
index 2c64600f84..b5be0b256f 100644
--- a/LAPACKE/src/lapacke_clantr_work.c
+++ b/LAPACKE/src/lapacke_clantr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_clantr_work( int matrix_layout, char norm, char uplo,
+float API_SUFFIX(LAPACKE_clantr_work)( int matrix_layout, char norm, char uplo,
                                 char diag, lapack_int m, lapack_int n,
                                 const lapack_complex_float* a, lapack_int lda,
                                 float* work )
@@ -49,23 +49,23 @@ float LAPACKE_clantr_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_clantr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clantr_work", info );
             return info;
         }
-        if( LAPACKE_lsame( norm, '1' ) || LAPACKE_lsame( norm, 'o' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( norm, '1' ) || API_SUFFIX(LAPACKE_lsame)( norm, 'o' ) ) {
             norm_lapack = 'i';
-        } else if( LAPACKE_lsame( norm, 'i' ) ) {
+        } else if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
             norm_lapack = '1';
         } else {
             norm_lapack = norm;
         }
-        if( LAPACKE_lsame( uplo, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
             uplo_lapack = 'l';
         } else {
             uplo_lapack = 'u';
         }
         /* Allocate memory for work array(s) */
-        if( LAPACKE_lsame( norm_lapack, 'i' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( norm_lapack, 'i' ) ) {
             work_lapack = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,n) );
             if( work_lapack == NULL ) {
                 info = LAPACK_WORK_MEMORY_ERROR;
@@ -80,11 +80,11 @@ float LAPACKE_clantr_work( int matrix_layout, char norm, char uplo,
         }
 exit_level_0:
         if( info == LAPACK_WORK_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clantr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clantr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_clantr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clantr_work", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_clapmr.c b/LAPACKE/src/lapacke_clapmr.c
index 8b2a4da344..a1f8de2d93 100644
--- a/LAPACKE/src/lapacke_clapmr.c
+++ b/LAPACKE/src/lapacke_clapmr.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clapmr( int matrix_layout, lapack_logical forwrd,
+lapack_int API_SUFFIX(LAPACKE_clapmr)( int matrix_layout, lapack_logical forwrd,
                            lapack_int m, lapack_int n, lapack_complex_float* x,
                            lapack_int ldx, lapack_int* k )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_clapmr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clapmr", -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, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, x, ldx ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_clapmr_work( matrix_layout, forwrd, m, n, x, ldx, k );
+    return API_SUFFIX(LAPACKE_clapmr_work)( matrix_layout, forwrd, m, n, x, ldx, k );
 }
diff --git a/LAPACKE/src/lapacke_clapmr_work.c b/LAPACKE/src/lapacke_clapmr_work.c
index 2496296dba..3b42b0048a 100644
--- a/LAPACKE/src/lapacke_clapmr_work.c
+++ b/LAPACKE/src/lapacke_clapmr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clapmr_work( int matrix_layout, lapack_logical forwrd,
+lapack_int API_SUFFIX(LAPACKE_clapmr_work)( int matrix_layout, lapack_logical forwrd,
                                 lapack_int m, lapack_int n,
                                 lapack_complex_float* x, lapack_int ldx,
                                 lapack_int* k )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_clapmr_work( int matrix_layout, lapack_logical forwrd,
         /* Check leading dimension(s) */
         if( ldx < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_clapmr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clapmr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,21 +61,21 @@ lapack_int LAPACKE_clapmr_work( int matrix_layout, lapack_logical forwrd,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_clapmr( &forwrd, &m, &n, x_t, &ldx_t, k );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clapmr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clapmr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_clapmr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clapmr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clapmt.c b/LAPACKE/src/lapacke_clapmt.c
index 95ba11b052..e7a6e116fc 100644
--- a/LAPACKE/src/lapacke_clapmt.c
+++ b/LAPACKE/src/lapacke_clapmt.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clapmt( int matrix_layout, lapack_logical forwrd,
+lapack_int API_SUFFIX(LAPACKE_clapmt)( int matrix_layout, lapack_logical forwrd,
                            lapack_int m, lapack_int n, lapack_complex_float* x,
                            lapack_int ldx, lapack_int* k )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_clapmt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clapmt", -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, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, x, ldx ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_clapmt_work( matrix_layout, forwrd, m, n, x, ldx, k );
+    return API_SUFFIX(LAPACKE_clapmt_work)( matrix_layout, forwrd, m, n, x, ldx, k );
 }
diff --git a/LAPACKE/src/lapacke_clapmt_work.c b/LAPACKE/src/lapacke_clapmt_work.c
index 9cbdcc3352..e17a1da1f0 100644
--- a/LAPACKE/src/lapacke_clapmt_work.c
+++ b/LAPACKE/src/lapacke_clapmt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clapmt_work( int matrix_layout, lapack_logical forwrd,
+lapack_int API_SUFFIX(LAPACKE_clapmt_work)( int matrix_layout, lapack_logical forwrd,
                                 lapack_int m, lapack_int n,
                                 lapack_complex_float* x, lapack_int ldx,
                                 lapack_int* k )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_clapmt_work( int matrix_layout, lapack_logical forwrd,
         /* Check leading dimension(s) */
         if( ldx < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_clapmt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clapmt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,21 +61,21 @@ lapack_int LAPACKE_clapmt_work( int matrix_layout, lapack_logical forwrd,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_clapmt( &forwrd, &m, &n, x_t, &ldx_t, k );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clapmt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clapmt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_clapmt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clapmt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clarcm.c b/LAPACKE/src/lapacke_clarcm.c
index 9fb300d605..fab71e1657 100644
--- a/LAPACKE/src/lapacke_clarcm.c
+++ b/LAPACKE/src/lapacke_clarcm.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clarcm(int matrix_layout, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_clarcm)(int matrix_layout, lapack_int m,
                            lapack_int n, const float* a, lapack_int lda,
                            const lapack_complex_float* b, lapack_int ldb,
                            lapack_complex_float* c, lapack_int ldc)
@@ -41,16 +41,16 @@ lapack_int LAPACKE_clarcm(int matrix_layout, lapack_int m,
     float* rwork = NULL;
 
     if (matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR) {
-        LAPACKE_xerbla("LAPACKE_clarcm", -1);
+        API_SUFFIX(LAPACKE_xerbla)("LAPACKE_clarcm", -1);
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if ( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, m, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -6;
         }
     }
@@ -63,13 +63,13 @@ lapack_int LAPACKE_clarcm(int matrix_layout, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_clarcm_work(matrix_layout, m, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_clarcm_work)(matrix_layout, m, n, a, lda, b, ldb,
                                 c, ldc, rwork);
     /* Release memory and exit */
     LAPACKE_free(rwork);
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_clarcm", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarcm", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clarcm_work.c b/LAPACKE/src/lapacke_clarcm_work.c
index a2c048cf4e..103853c309 100644
--- a/LAPACKE/src/lapacke_clarcm_work.c
+++ b/LAPACKE/src/lapacke_clarcm_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clarcm_work(int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_clarcm_work)(int matrix_layout, lapack_int m, lapack_int n,
                                 const float* a, lapack_int lda,
                                 const lapack_complex_float* b, lapack_int ldb,
                                 lapack_complex_float* c, lapack_int ldc,
@@ -52,17 +52,17 @@ lapack_int LAPACKE_clarcm_work(int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_clarcm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarcm_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_clarcm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarcm_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_clarcm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarcm_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -85,12 +85,12 @@ lapack_int LAPACKE_clarcm_work(int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans(matrix_layout, m, m, a, lda, a_t, lda_t);
-        LAPACKE_cge_trans(matrix_layout, m, n, b, ldb, b_t, ldb_t);
+        API_SUFFIX(LAPACKE_sge_trans)(matrix_layout, m, m, a, lda, a_t, lda_t);
+        API_SUFFIX(LAPACKE_cge_trans)(matrix_layout, m, n, b, ldb, b_t, ldb_t);
         /* Call LAPACK function */
         LAPACK_clarcm(&m, &n, a_t, &lda_t, b_t, &ldb_t, c_t, &ldc_t, rwork);
         /* Transpose output matrices */
-        LAPACKE_cge_trans(LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc);
+        API_SUFFIX(LAPACKE_cge_trans)(LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc);
         /* Release memory and exit */
         LAPACKE_free(c_t);
 exit_level_2:
@@ -99,11 +99,11 @@ lapack_int LAPACKE_clarcm_work(int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free(a_t);
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clarcm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarcm_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla("LAPACKE_clarcm_work", -1);
+        API_SUFFIX(LAPACKE_xerbla)("LAPACKE_clarcm_work", -1);
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clarfb.c b/LAPACKE/src/lapacke_clarfb.c
index ccd34cecdf..f48c7e3831 100644
--- a/LAPACKE/src/lapacke_clarfb.c
+++ b/LAPACKE/src/lapacke_clarfb.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clarfb( int matrix_layout, char side, char trans, char direct,
+lapack_int API_SUFFIX(LAPACKE_clarfb)( int matrix_layout, char side, char trans, char direct,
                            char storev, lapack_int m, lapack_int n,
                            lapack_int k, const lapack_complex_float* v,
                            lapack_int ldv, const lapack_complex_float* t,
@@ -42,73 +42,43 @@ lapack_int LAPACKE_clarfb( int matrix_layout, char side, char trans, char direct
     lapack_int info = 0;
     lapack_int ldwork;
     lapack_complex_float* work = NULL;
-    lapack_int ncols_v, nrows_v;
+    lapack_int nrows_v, ncols_v;
+    lapack_logical left, col, forward;
+    char uplo;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_clarfb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarfb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        lapack_int lrv, lcv;  /* row, column stride */
-        if( matrix_layout == LAPACK_COL_MAJOR ) {
-            lrv = 1;
-            lcv = ldv;
-        } else {
-            lrv = ldv;
-            lcv = 1;
-        }
-        ncols_v =     LAPACKE_lsame( storev, 'c' ) ? k :
-                  ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'l' ) ) ? m :
-                  ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'r' ) ) ? n : 1) );
+        left = API_SUFFIX(LAPACKE_lsame)( side, 'l' );
+        col = API_SUFFIX(LAPACKE_lsame)( storev, 'c' );
+        forward = API_SUFFIX(LAPACKE_lsame)( direct, 'f' );
 
-        nrows_v =   ( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( side, 'l' ) ) ? m :
-                  ( ( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( side, 'r' ) ) ? n :
-                    ( LAPACKE_lsame( storev, 'r' ) ? k : 1) );
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, c, ldc ) ) {
-            return -13;
+        nrows_v = ( col && left ) ? m : ( ( col && !left ) ? n : ( !col ? k : 1) );
+        ncols_v = ( !col && left ) ? m : ( ( !col && !left ) ? n : ( col ? k : 1 ) );
+        uplo = ( ( forward && col ) || !( forward || col ) ) ? 'l' : 'u';
+
+        if( ( col && k > nrows_v ) || ( !col && k > ncols_v ) ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarfb", -8 );
+            return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, k, k, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_ctz_nancheck)( matrix_layout, direct, uplo, 'u',
+                                  nrows_v, ncols_v, v, ldv ) ) {
+            return -9;
+        }
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, k, k, t, ldt ) ) {
             return -11;
         }
-        if( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( direct, 'f' ) ) {
-            if( LAPACKE_ctr_nancheck( matrix_layout, 'l', 'u', k, v, ldv ) )
-                return -9;
-            if( LAPACKE_cge_nancheck( matrix_layout, nrows_v-k, ncols_v,
-                                      &v[k*lrv], ldv ) )
-                return -9;
-        } else if( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( direct, 'b' ) ) {
-            if( k > nrows_v ) {
-                LAPACKE_xerbla( "LAPACKE_clarfb", -8 );
-                return -8;
-            }
-            if( LAPACKE_ctr_nancheck( matrix_layout, 'u', 'u', k,
-                                      &v[(nrows_v-k)*lrv], ldv ) )
-                return -9;
-            if( LAPACKE_cge_nancheck( matrix_layout, nrows_v-k, ncols_v, v, ldv ) )
-                return -9;
-        } else if( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( direct, 'f' ) ) {
-            if( LAPACKE_ctr_nancheck( matrix_layout, 'u', 'u', k, v, ldv ) )
-                return -9;
-            if( LAPACKE_cge_nancheck( matrix_layout, nrows_v, ncols_v-k,
-                                      &v[k*lrv], ldv ) )
-                return -9;
-        } else if( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( direct, 'b' ) ) {
-            if( k > ncols_v ) {
-                LAPACKE_xerbla( "LAPACKE_clarfb", -8 );
-                return -8;
-            }
-            if( LAPACKE_ctr_nancheck( matrix_layout, 'l', 'u', k,
-                                      &v[(ncols_v-k)*lcv], ldv ) )
-                return -9;
-            if( LAPACKE_cge_nancheck( matrix_layout, nrows_v, ncols_v-k, v, ldv ) )
-                return -9;
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
+            return -13;
         }
     }
 #endif
-    if( LAPACKE_lsame( side, 'l' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
         ldwork = n;
-    } else if( LAPACKE_lsame( side, 'r' ) ) {
+    } else if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
         ldwork = m;
     } else {
         ldwork = 1;
@@ -121,13 +91,13 @@ lapack_int LAPACKE_clarfb( int matrix_layout, char side, char trans, char direct
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_clarfb_work( matrix_layout, side, trans, direct, storev, m, n,
+    info = API_SUFFIX(LAPACKE_clarfb_work)( matrix_layout, side, trans, direct, storev, m, n,
                                 k, v, ldv, t, ldt, c, ldc, work, ldwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_clarfb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarfb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clarfb_work.c b/LAPACKE/src/lapacke_clarfb_work.c
index 3ad97c22d0..68eec0c4cb 100644
--- a/LAPACKE/src/lapacke_clarfb_work.c
+++ b/LAPACKE/src/lapacke_clarfb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clarfb_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_clarfb_work)( int matrix_layout, char side, char trans,
                                 char direct, char storev, lapack_int m,
                                 lapack_int n, lapack_int k,
                                 const lapack_complex_float* v, lapack_int ldv,
@@ -42,6 +42,8 @@ lapack_int LAPACKE_clarfb_work( int matrix_layout, char side, char trans,
 {
     lapack_int info = 0;
     lapack_int nrows_v, ncols_v;
+    lapack_logical left, col, forward;
+    char uplo;
     lapack_int ldc_t, ldt_t, ldv_t;
     lapack_complex_float *v_t = NULL, *t_t = NULL, *c_t = NULL;
     if( matrix_layout == LAPACK_COL_MAJOR ) {
@@ -52,33 +54,36 @@ lapack_int LAPACKE_clarfb_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        nrows_v = ( LAPACKE_lsame( storev, 'c' ) &&
-                             LAPACKE_lsame( side, 'l' ) ) ? m :
-                             ( ( LAPACKE_lsame( storev, 'c' ) &&
-                             LAPACKE_lsame( side, 'r' ) ) ? n :
-                             ( LAPACKE_lsame( storev, 'r' ) ? k : 1) );
-        ncols_v = LAPACKE_lsame( storev, 'c' ) ? k :
-                             ( ( LAPACKE_lsame( storev, 'r' ) &&
-                             LAPACKE_lsame( side, 'l' ) ) ? m :
-                             ( ( LAPACKE_lsame( storev, 'r' ) &&
-                             LAPACKE_lsame( side, 'r' ) ) ? n : 1) );
+        left = API_SUFFIX(LAPACKE_lsame)( side, 'l' );
+        col = API_SUFFIX(LAPACKE_lsame)( storev, 'c' );
+        forward = API_SUFFIX(LAPACKE_lsame)( direct, 'f' );
+
+        nrows_v = ( col && left ) ? m : ( ( col && !left ) ? n : ( !col ? k : 1) );
+        ncols_v = ( !col && left ) ? m : ( ( !col && !left ) ? n : ( col ? k : 1 ) );
+        uplo = ( ( forward && col ) || !( forward || col ) ) ? 'l' : 'u';
+
         ldc_t = MAX(1,m);
         ldt_t = MAX(1,k);
         ldv_t = MAX(1,nrows_v);
         /* Check leading dimension(s) */
         if( ldc < n ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_clarfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarfb_work", info );
             return info;
         }
         if( ldt < k ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_clarfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarfb_work", info );
             return info;
         }
         if( ldv < ncols_v ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_clarfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarfb_work", info );
+            return info;
+        }
+        if( ( col && k > nrows_v ) || ( !col && k > ncols_v ) ) {
+            info = -8;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarfb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -102,44 +107,16 @@ lapack_int LAPACKE_clarfb_work( int matrix_layout, char side, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( direct, 'f' ) ) {
-            LAPACKE_ctr_trans( matrix_layout, 'l', 'u', k, v, ldv, v_t, ldv_t );
-            LAPACKE_cge_trans( matrix_layout, nrows_v-k, ncols_v, &v[k*ldv], ldv,
-                               &v_t[k], ldv_t );
-        } else if( LAPACKE_lsame( storev, 'c' ) &&
-                   LAPACKE_lsame( direct, 'b' ) ) {
-            if( k > nrows_v ) {
-                LAPACKE_xerbla( "LAPACKE_clarfb_work", -8 );
-                return -8;
-            }
-            LAPACKE_ctr_trans( matrix_layout, 'u', 'u', k, &v[(nrows_v-k)*ldv],
-                               ldv, &v_t[nrows_v-k], ldv_t );
-            LAPACKE_cge_trans( matrix_layout, nrows_v-k, ncols_v, v, ldv, v_t,
-                               ldv_t );
-        } else if( LAPACKE_lsame( storev, 'r' ) &&
-                   LAPACKE_lsame( direct, 'f' ) ) {
-            LAPACKE_ctr_trans( matrix_layout, 'u', 'u', k, v, ldv, v_t, ldv_t );
-            LAPACKE_cge_trans( matrix_layout, nrows_v, ncols_v-k, &v[k], ldv,
-                               &v_t[k*ldv_t], ldv_t );
-        } else if( LAPACKE_lsame( storev, 'r' ) &&
-                   LAPACKE_lsame( direct, 'b' ) ) {
-            if( k > ncols_v ) {
-                LAPACKE_xerbla( "LAPACKE_clarfb_work", -8 );
-                return -8;
-            }
-            LAPACKE_ctr_trans( matrix_layout, 'l', 'u', k, &v[ncols_v-k], ldv,
-                               &v_t[(ncols_v-k)*ldv_t], ldv_t );
-            LAPACKE_cge_trans( matrix_layout, nrows_v, ncols_v-k, v, ldv, v_t,
-                               ldv_t );
-        }
-        LAPACKE_cge_trans( matrix_layout, k, k, t, ldt, t_t, ldt_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_ctz_trans)( matrix_layout, direct, uplo, 'u', nrows_v, ncols_v,
+                           v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, k, k, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_clarfb( &side, &trans, &direct, &storev, &m, &n, &k, v_t, &ldv_t,
                        t_t, &ldt_t, c_t, &ldc_t, work, &ldwork );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_2:
@@ -148,11 +125,11 @@ lapack_int LAPACKE_clarfb_work( int matrix_layout, char side, char trans,
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clarfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarfb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_clarfb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarfb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clarfg.c b/LAPACKE/src/lapacke_clarfg.c
index 238b81f27f..14ee6eb40c 100644
--- a/LAPACKE/src/lapacke_clarfg.c
+++ b/LAPACKE/src/lapacke_clarfg.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clarfg( lapack_int n, lapack_complex_float* alpha,
+lapack_int API_SUFFIX(LAPACKE_clarfg)( lapack_int n, lapack_complex_float* alpha,
                            lapack_complex_float* x, lapack_int incx,
                            lapack_complex_float* tau )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_c_nancheck( 1, alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( 1, alpha, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_c_nancheck( n-1, x, incx ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, x, incx ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_clarfg_work( n, alpha, x, incx, tau );
+    return API_SUFFIX(LAPACKE_clarfg_work)( n, alpha, x, incx, tau );
 }
diff --git a/LAPACKE/src/lapacke_clarfg_work.c b/LAPACKE/src/lapacke_clarfg_work.c
index 06a6a93ff6..cf5c253315 100644
--- a/LAPACKE/src/lapacke_clarfg_work.c
+++ b/LAPACKE/src/lapacke_clarfg_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clarfg_work( lapack_int n, lapack_complex_float* alpha,
+lapack_int API_SUFFIX(LAPACKE_clarfg_work)( lapack_int n, lapack_complex_float* alpha,
                                 lapack_complex_float* x, lapack_int incx,
                                 lapack_complex_float* tau )
 {
diff --git a/LAPACKE/src/lapacke_clarft.c b/LAPACKE/src/lapacke_clarft.c
index 9691afb856..f6dc8f3c8f 100644
--- a/LAPACKE/src/lapacke_clarft.c
+++ b/LAPACKE/src/lapacke_clarft.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clarft( int matrix_layout, char direct, char storev,
+lapack_int API_SUFFIX(LAPACKE_clarft)( int matrix_layout, char direct, char storev,
                            lapack_int n, lapack_int k,
                            const lapack_complex_float* v, lapack_int ldv,
                            const lapack_complex_float* tau,
@@ -40,24 +40,24 @@ lapack_int LAPACKE_clarft( int matrix_layout, char direct, char storev,
 {
     lapack_int ncols_v, nrows_v;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_clarft", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarft", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        ncols_v = LAPACKE_lsame( storev, 'c' ) ? k :
-                             ( LAPACKE_lsame( storev, 'r' ) ? n : 1);
-        nrows_v = LAPACKE_lsame( storev, 'c' ) ? n :
-                             ( LAPACKE_lsame( storev, 'r' ) ? k : 1);
-        if( LAPACKE_c_nancheck( k, tau, 1 ) ) {
+        ncols_v = API_SUFFIX(LAPACKE_lsame)( storev, 'c' ) ? k :
+                             ( API_SUFFIX(LAPACKE_lsame)( storev, 'r' ) ? n : 1);
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( storev, 'c' ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( storev, 'r' ) ? k : 1);
+        if( API_SUFFIX(LAPACKE_c_nancheck)( k, tau, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, nrows_v, ncols_v, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, nrows_v, ncols_v, v, ldv ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_clarft_work( matrix_layout, direct, storev, n, k, v, ldv, tau,
+    return API_SUFFIX(LAPACKE_clarft_work)( matrix_layout, direct, storev, n, k, v, ldv, tau,
                                 t, ldt );
 }
diff --git a/LAPACKE/src/lapacke_clarft_work.c b/LAPACKE/src/lapacke_clarft_work.c
index f540bd1fbd..cd277875a0 100644
--- a/LAPACKE/src/lapacke_clarft_work.c
+++ b/LAPACKE/src/lapacke_clarft_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clarft_work( int matrix_layout, char direct, char storev,
+lapack_int API_SUFFIX(LAPACKE_clarft_work)( int matrix_layout, char direct, char storev,
                                 lapack_int n, lapack_int k,
                                 const lapack_complex_float* v, lapack_int ldv,
                                 const lapack_complex_float* tau,
@@ -49,21 +49,21 @@ lapack_int LAPACKE_clarft_work( int matrix_layout, char direct, char storev,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        nrows_v = LAPACKE_lsame( storev, 'c' ) ? n :
-                             ( LAPACKE_lsame( storev, 'r' ) ? k : 1);
-        ncols_v = LAPACKE_lsame( storev, 'c' ) ? k :
-                             ( LAPACKE_lsame( storev, 'r' ) ? n : 1);
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( storev, 'c' ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( storev, 'r' ) ? k : 1);
+        ncols_v = API_SUFFIX(LAPACKE_lsame)( storev, 'c' ) ? k :
+                             ( API_SUFFIX(LAPACKE_lsame)( storev, 'r' ) ? n : 1);
         ldt_t = MAX(1,k);
         ldv_t = MAX(1,nrows_v);
         /* Check leading dimension(s) */
         if( ldt < k ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_clarft_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarft_work", info );
             return info;
         }
         if( ldv < ncols_v ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_clarft_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarft_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -81,24 +81,24 @@ lapack_int LAPACKE_clarft_work( int matrix_layout, char direct, char storev,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, nrows_v, ncols_v, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, nrows_v, ncols_v, v, ldv, v_t, ldv_t );
         /* Call LAPACK function and adjust info */
         LAPACK_clarft( &direct, &storev, &n, &k, v_t, &ldv_t, tau, t_t,
                        &ldt_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, k, k, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, k, k, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clarft_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarft_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_clarft_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarft_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clarfx.c b/LAPACKE/src/lapacke_clarfx.c
index 6ee8d09ff8..f6aff83ad8 100644
--- a/LAPACKE/src/lapacke_clarfx.c
+++ b/LAPACKE/src/lapacke_clarfx.c
@@ -32,31 +32,31 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clarfx( int matrix_layout, char side, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_clarfx)( int matrix_layout, char side, lapack_int m,
                            lapack_int n, const lapack_complex_float* v,
                            lapack_complex_float tau, lapack_complex_float* c,
                            lapack_int ldc, lapack_complex_float* work )
 {
     lapack_int lv;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_clarfx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarfx", -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, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -7;
         }
-        if( LAPACKE_c_nancheck( 1, &tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( 1, &tau, 1 ) ) {
             return -6;
         }
-        lv = (LAPACKE_lsame( side, 'l' ) ? m : n);
-        if( LAPACKE_c_nancheck( lv, v, 1 ) ) {
+        lv = (API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n);
+        if( API_SUFFIX(LAPACKE_c_nancheck)( lv, v, 1 ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_clarfx_work( matrix_layout, side, m, n, v, tau, c, ldc,
+    return API_SUFFIX(LAPACKE_clarfx_work)( matrix_layout, side, m, n, v, tau, c, ldc,
                                 work );
 }
diff --git a/LAPACKE/src/lapacke_clarfx_work.c b/LAPACKE/src/lapacke_clarfx_work.c
index f8d6f2dd5e..8566c17f2a 100644
--- a/LAPACKE/src/lapacke_clarfx_work.c
+++ b/LAPACKE/src/lapacke_clarfx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clarfx_work( int matrix_layout, char side, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_clarfx_work)( int matrix_layout, char side, lapack_int m,
                                 lapack_int n, const lapack_complex_float* v,
                                 lapack_complex_float tau,
                                 lapack_complex_float* c, lapack_int ldc,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_clarfx_work( int matrix_layout, char side, lapack_int m,
         /* Check leading dimension(s) */
         if( ldc < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_clarfx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarfx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -62,21 +62,21 @@ lapack_int LAPACKE_clarfx_work( int matrix_layout, char side, lapack_int m,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_clarfx( &side, &m, &n, v, &tau, c_t, &ldc_t, work );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clarfx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarfx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_clarfx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clarfx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clarnv.c b/LAPACKE/src/lapacke_clarnv.c
index 9cb36c3048..4f7d6b740e 100644
--- a/LAPACKE/src/lapacke_clarnv.c
+++ b/LAPACKE/src/lapacke_clarnv.c
@@ -32,8 +32,8 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clarnv( lapack_int idist, lapack_int* iseed, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_clarnv)( lapack_int idist, lapack_int* iseed, lapack_int n,
                            lapack_complex_float* x )
 {
-    return LAPACKE_clarnv_work( idist, iseed, n, x );
+    return API_SUFFIX(LAPACKE_clarnv_work)( idist, iseed, n, x );
 }
diff --git a/LAPACKE/src/lapacke_clarnv_work.c b/LAPACKE/src/lapacke_clarnv_work.c
index ef5061a62a..ce0f5eca96 100644
--- a/LAPACKE/src/lapacke_clarnv_work.c
+++ b/LAPACKE/src/lapacke_clarnv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clarnv_work( lapack_int idist, lapack_int* iseed,
+lapack_int API_SUFFIX(LAPACKE_clarnv_work)( lapack_int idist, lapack_int* iseed,
                                 lapack_int n, lapack_complex_float* x )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_clascl.c b/LAPACKE/src/lapacke_clascl.c
index 7a10c130e5..84373d5bbc 100644
--- a/LAPACKE/src/lapacke_clascl.c
+++ b/LAPACKE/src/lapacke_clascl.c
@@ -32,13 +32,13 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clascl( int matrix_layout, char type, lapack_int kl,
+lapack_int API_SUFFIX(LAPACKE_clascl)( int matrix_layout, char type, lapack_int kl,
                            lapack_int ku, float cfrom, float cto,
                            lapack_int m, lapack_int n, lapack_complex_float* a,
                            lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_clascl", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clascl", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
@@ -46,68 +46,68 @@ lapack_int LAPACKE_clascl( int matrix_layout, char type, lapack_int kl,
         /* Optionally check input matrices for NaNs */
         switch (type) {
         case 'G':
-            if( LAPACKE_cge_nancheck( matrix_layout, m, n, a, lda ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
                 return -9;
             }
             break;
         case 'L':
             // TYPE = 'L' - lower triangle of general matrix
             if( matrix_layout == LAPACK_COL_MAJOR &&
-                LAPACKE_cgb_nancheck( matrix_layout, m, n, m-1, 0, a, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, m, n, m-1, 0, a, lda+1 ) ) {
                 return -9;
             }
             if( matrix_layout == LAPACK_ROW_MAJOR &&
-                LAPACKE_cgb_nancheck( LAPACK_COL_MAJOR, n, m, 0, m-1, a-m+1, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_cgb_nancheck)( LAPACK_COL_MAJOR, n, m, 0, m-1, a-m+1, lda+1 ) ) {
                 return -9;
             }
             break;
         case 'U':
             // TYPE = 'U' - upper triangle of general matrix
             if( matrix_layout == LAPACK_COL_MAJOR &&
-                LAPACKE_cgb_nancheck( matrix_layout, m, n, 0, n-1, a-n+1, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, m, n, 0, n-1, a-n+1, lda+1 ) ) {
                 return -9;
             }
             if( matrix_layout == LAPACK_ROW_MAJOR &&
-                LAPACKE_cgb_nancheck( LAPACK_COL_MAJOR, n, m, n-1, 0, a, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_cgb_nancheck)( LAPACK_COL_MAJOR, n, m, n-1, 0, a, lda+1 ) ) {
                 return -9;
             }
             break;
         case 'H':
             // TYPE = 'H' - part of upper Hessenberg matrix in general matrix
             if( matrix_layout == LAPACK_COL_MAJOR &&
-                LAPACKE_cgb_nancheck( matrix_layout, m, n, 1, n-1, a-n+1, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, m, n, 1, n-1, a-n+1, lda+1 ) ) {
                 return -9;
             }
             if( matrix_layout == LAPACK_ROW_MAJOR &&
-                LAPACKE_cgb_nancheck( LAPACK_COL_MAJOR, n, m, n-1, 1, a-1, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_cgb_nancheck)( LAPACK_COL_MAJOR, n, m, n-1, 1, a-1, lda+1 ) ) {
                 return -9;
             }
             break;
         case 'B':
             // TYPE = 'B' - lower part of symmetric band matrix (assume m==n)
-            if( LAPACKE_chb_nancheck( matrix_layout, 'L', n, kl, a, lda ) ) {
+            if( API_SUFFIX(LAPACKE_chb_nancheck)( matrix_layout, 'L', n, kl, a, lda ) ) {
                 return -9;
             }
             break;
         case 'Q':
             // TYPE = 'Q' - upper part of symmetric band matrix (assume m==n)
-            if( LAPACKE_chb_nancheck( matrix_layout, 'U', n, ku, a, lda ) ) {
+            if( API_SUFFIX(LAPACKE_chb_nancheck)( matrix_layout, 'U', n, ku, a, lda ) ) {
                 return -9;
             }
             break;
         case 'Z':
             // TYPE = 'Z' -  band matrix laid out for ?GBTRF
             if( matrix_layout == LAPACK_COL_MAJOR &&
-                LAPACKE_cgb_nancheck( matrix_layout, m, n, kl, ku, a+kl, lda ) ) {
+                API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, m, n, kl, ku, a+kl, lda ) ) {
                 return -9;
             }
             if( matrix_layout == LAPACK_ROW_MAJOR &&
-                LAPACKE_cgb_nancheck( matrix_layout, m, n, kl, ku, a+lda*kl, lda ) ) {
+                API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, m, n, kl, ku, a+lda*kl, lda ) ) {
                 return -9;
             }
             break;
         }
     }
 #endif
-    return LAPACKE_clascl_work( matrix_layout, type, kl, ku, cfrom, cto, m,  n, a, lda );
+    return API_SUFFIX(LAPACKE_clascl_work)( matrix_layout, type, kl, ku, cfrom, cto, m,  n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_clascl_work.c b/LAPACKE/src/lapacke_clascl_work.c
index 2f4a781ef4..88a10eae40 100644
--- a/LAPACKE/src/lapacke_clascl_work.c
+++ b/LAPACKE/src/lapacke_clascl_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clascl_work( int matrix_layout, char type, lapack_int kl,
+lapack_int API_SUFFIX(LAPACKE_clascl_work)( int matrix_layout, char type, lapack_int kl,
                            lapack_int ku, float cfrom, float cto,
                            lapack_int m, lapack_int n, lapack_complex_float* a,
                            lapack_int lda )
@@ -45,15 +45,15 @@ lapack_int LAPACKE_clascl_work( int matrix_layout, char type, lapack_int kl,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_a = LAPACKE_lsame(type, 'b') ? kl + 1 :
-                             LAPACKE_lsame(type, 'q') ? ku + 1 :
-                             LAPACKE_lsame(type, 'z') ? 2 * kl + ku + 1 : m;
+        lapack_int nrows_a = API_SUFFIX(LAPACKE_lsame)(type, 'b') ? kl + 1 :
+                             API_SUFFIX(LAPACKE_lsame)(type, 'q') ? ku + 1 :
+                             API_SUFFIX(LAPACKE_lsame)(type, 'z') ? 2 * kl + ku + 1 : m;
         lapack_int lda_t = MAX(1,nrows_a);
         lapack_complex_float* a_t = NULL;
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_clascl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clascl_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_clascl_work( int matrix_layout, char type, lapack_int kl,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, nrows_a, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, nrows_a, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_clascl( &type, &kl, &ku, &cfrom, &cto, &m, &n, a_t, &lda_t, &info);
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_a, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nrows_a, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clascl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clascl_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_clascl_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clascl_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_claset.c b/LAPACKE/src/lapacke_claset.c
index 3e320f5561..1f77013c3c 100644
--- a/LAPACKE/src/lapacke_claset.c
+++ b/LAPACKE/src/lapacke_claset.c
@@ -32,14 +32,14 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_claset( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_claset)( int matrix_layout, char uplo, lapack_int m,
                            lapack_int n, lapack_complex_float alpha,
                            lapack_complex_float beta, lapack_complex_float* a,
                            lapack_int lda )
 {
 
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_claset", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_claset", -1 );
         return -1;
     }
 
@@ -51,14 +51,14 @@ lapack_int LAPACKE_claset( int matrix_layout, char uplo, lapack_int m,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_c_nancheck( 1, &alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( 1, &alpha, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_c_nancheck( 1, &beta, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( 1, &beta, 1 ) ) {
             return -6;
         }
     }
 #endif
 
-    return LAPACKE_claset_work( matrix_layout, uplo, m, n, alpha, beta, a, lda );
+    return API_SUFFIX(LAPACKE_claset_work)( matrix_layout, uplo, m, n, alpha, beta, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_claset_work.c b/LAPACKE/src/lapacke_claset_work.c
index af1fe23aa9..cd1882c740 100644
--- a/LAPACKE/src/lapacke_claset_work.c
+++ b/LAPACKE/src/lapacke_claset_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_claset_work( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_claset_work)( int matrix_layout, char uplo, lapack_int m,
                                 lapack_int n, lapack_complex_float alpha,
                                 lapack_complex_float beta,
                                 lapack_complex_float* a, lapack_int lda )
@@ -47,7 +47,7 @@ lapack_int LAPACKE_claset_work( int matrix_layout, char uplo, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_claset_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_claset_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,21 +58,21 @@ lapack_int LAPACKE_claset_work( int matrix_layout, char uplo, lapack_int m,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_claset( &uplo, &m, &n, &alpha, &beta, a_t, &lda_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_claset_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_claset_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_claset_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_claset_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_classq.c b/LAPACKE/src/lapacke_classq.c
index f2fa6a7d4f..c02406f7a3 100644
--- a/LAPACKE/src/lapacke_classq.c
+++ b/LAPACKE/src/lapacke_classq.c
@@ -32,22 +32,22 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_classq( lapack_int n, lapack_complex_float* x,
+lapack_int API_SUFFIX(LAPACKE_classq)( lapack_int n, const lapack_complex_float* x,
                            lapack_int incx, float* scale, float* sumsq )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input vector `x` and in/out scalars `scale` and `sumsq` for NaNs */
-        if( LAPACKE_c_nancheck( n, x, incx ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n, x, incx ) ) {
             return -2;
         }
-        if( LAPACKE_s_nancheck( 1, scale, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, scale, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( 1, sumsq, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, sumsq, 1 ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_classq_work( n, x, incx, scale, sumsq );
+    return API_SUFFIX(LAPACKE_classq_work)( n, x, incx, scale, sumsq );
 }
diff --git a/LAPACKE/src/lapacke_classq_work.c b/LAPACKE/src/lapacke_classq_work.c
index 79ed26a19b..8b95483ac3 100644
--- a/LAPACKE/src/lapacke_classq_work.c
+++ b/LAPACKE/src/lapacke_classq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_classq_work( lapack_int n, lapack_complex_float* x, lapack_int incx, float* scale, float* sumsq )
+lapack_int API_SUFFIX(LAPACKE_classq_work)( lapack_int n, const lapack_complex_float* x, lapack_int incx, float* scale, float* sumsq )
 {
     lapack_int info = 0;
     LAPACK_classq( &n, x, &incx, scale, sumsq );
diff --git a/LAPACKE/src/lapacke_claswp.c b/LAPACKE/src/lapacke_claswp.c
index 62d0e8918e..4f3b27bc6c 100644
--- a/LAPACKE/src/lapacke_claswp.c
+++ b/LAPACKE/src/lapacke_claswp.c
@@ -32,13 +32,13 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_claswp( int matrix_layout, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_claswp)( int matrix_layout, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_int k1, lapack_int k2, const lapack_int* ipiv,
                            lapack_int incx )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_claswp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_claswp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
@@ -48,15 +48,15 @@ lapack_int LAPACKE_claswp( int matrix_layout, lapack_int n,
     *      Disable the check as is below, the check below was checking for NaN
     *      from lda to n since there is no (obvious) way to knowing m. This is not
     *      a good idea. We could get a lower bound of m by scanning from ipiv. Or
-    *      we could pass on the NaN check to LAPACKE_dlaswp_work. For now disable
+    *      we could pass on the NaN check to API_SUFFIX(LAPACKE_dlaswp_work). For now disable
     *      the buggy Nan check.
     *      See forum: http://icl.cs.utk.edu/lapack-forum/viewtopic.php?t=4827
     *****************************************************************************/
-    /*  if( LAPACKE_cge_nancheck( matrix_layout, lda, n, a, lda ) ) {
+    /*  if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, lda, n, a, lda ) ) {
     *       return -3;
     *   }
     */
     }
 #endif
-    return LAPACKE_claswp_work( matrix_layout, n, a, lda, k1, k2, ipiv, incx );
+    return API_SUFFIX(LAPACKE_claswp_work)( matrix_layout, n, a, lda, k1, k2, ipiv, incx );
 }
diff --git a/LAPACKE/src/lapacke_claswp_work.c b/LAPACKE/src/lapacke_claswp_work.c
index 0b7d2cde09..76e0159695 100644
--- a/LAPACKE/src/lapacke_claswp_work.c
+++ b/LAPACKE/src/lapacke_claswp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_claswp_work( int matrix_layout, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_claswp_work)( int matrix_layout, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_int k1, lapack_int k2,
                                 const lapack_int* ipiv, lapack_int incx )
@@ -54,7 +54,7 @@ lapack_int LAPACKE_claswp_work( int matrix_layout, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -4;
-            LAPACKE_xerbla( "LAPACKE_claswp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_claswp_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -65,21 +65,21 @@ lapack_int LAPACKE_claswp_work( int matrix_layout, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, lda_t, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, lda_t, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_claswp( &n, a_t, &lda_t, &k1, &k2, ipiv, &incx );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, lda_t, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, lda_t, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_claswp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_claswp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_claswp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_claswp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clatms.c b/LAPACKE/src/lapacke_clatms.c
index 04847345c2..1b5a5870f0 100644
--- a/LAPACKE/src/lapacke_clatms.c
+++ b/LAPACKE/src/lapacke_clatms.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clatms( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_clatms)( int matrix_layout, lapack_int m, lapack_int n,
                            char dist, lapack_int* iseed, char sym, float* d,
                            lapack_int mode, float cond, float dmax,
                            lapack_int kl, lapack_int ku, char pack,
@@ -41,22 +41,22 @@ lapack_int LAPACKE_clatms( int matrix_layout, lapack_int m, lapack_int n,
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_clatms", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clatms", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -14;
         }
-        if( LAPACKE_s_nancheck( 1, &cond, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &cond, 1 ) ) {
             return -9;
         }
-        if( LAPACKE_s_nancheck( MIN(n,m), d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( MIN(n,m), d, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &dmax, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &dmax, 1 ) ) {
             return -10;
         }
     }
@@ -69,13 +69,13 @@ lapack_int LAPACKE_clatms( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_clatms_work( matrix_layout, m, n, dist, iseed, sym, d, mode,
+    info = API_SUFFIX(LAPACKE_clatms_work)( matrix_layout, m, n, dist, iseed, sym, d, mode,
                                 cond, dmax, kl, ku, pack, a, lda, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_clatms", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clatms", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clatms_work.c b/LAPACKE/src/lapacke_clatms_work.c
index b96cf936a8..a1c1501a3b 100644
--- a/LAPACKE/src/lapacke_clatms_work.c
+++ b/LAPACKE/src/lapacke_clatms_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clatms_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_clatms_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 char dist, lapack_int* iseed, char sym,
                                 float* d, lapack_int mode, float cond,
                                 float dmax, lapack_int kl, lapack_int ku,
@@ -53,7 +53,7 @@ lapack_int LAPACKE_clatms_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_clatms_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clatms_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -64,7 +64,7 @@ lapack_int LAPACKE_clatms_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_clatms( &m, &n, &dist, iseed, &sym, d, &mode, &cond, &dmax, &kl,
                        &ku, &pack, a_t, &lda_t, work, &info );
@@ -72,16 +72,16 @@ lapack_int LAPACKE_clatms_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clatms_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clatms_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_clatms_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clatms_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_clauum.c b/LAPACKE/src/lapacke_clauum.c
index 071a956130..e223799017 100644
--- a/LAPACKE/src/lapacke_clauum.c
+++ b/LAPACKE/src/lapacke_clauum.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clauum( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_clauum)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_clauum", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clauum", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_clauum_work( matrix_layout, uplo, n, a, lda );
+    return API_SUFFIX(LAPACKE_clauum_work)( matrix_layout, uplo, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_clauum_work.c b/LAPACKE/src/lapacke_clauum_work.c
index 8d71c3768d..67d45297b3 100644
--- a/LAPACKE/src/lapacke_clauum_work.c
+++ b/LAPACKE/src/lapacke_clauum_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_clauum_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_clauum_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_clauum_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_clauum_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clauum_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_clauum_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_clauum( &uplo, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_clauum_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clauum_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_clauum_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_clauum_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpbcon.c b/LAPACKE/src/lapacke_cpbcon.c
index e5f81169bf..ff009e3817 100644
--- a/LAPACKE/src/lapacke_cpbcon.c
+++ b/LAPACKE/src/lapacke_cpbcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpbcon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpbcon)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, const lapack_complex_float* ab,
                            lapack_int ldab, float anorm, float* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_cpbcon( int matrix_layout, char uplo, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpbcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -7;
         }
     }
@@ -67,7 +67,7 @@ lapack_int LAPACKE_cpbcon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cpbcon_work( matrix_layout, uplo, n, kd, ab, ldab, anorm,
+    info = API_SUFFIX(LAPACKE_cpbcon_work)( matrix_layout, uplo, n, kd, ab, ldab, anorm,
                                 rcond, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -75,7 +75,7 @@ lapack_int LAPACKE_cpbcon( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cpbcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpbcon_work.c b/LAPACKE/src/lapacke_cpbcon_work.c
index 340fcd61ee..2949e1f383 100644
--- a/LAPACKE/src/lapacke_cpbcon_work.c
+++ b/LAPACKE/src/lapacke_cpbcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpbcon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpbcon_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, const lapack_complex_float* ab,
                                 lapack_int ldab, float anorm, float* rcond,
                                 lapack_complex_float* work, float* rwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_cpbcon_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cpbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbcon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -62,7 +62,7 @@ lapack_int LAPACKE_cpbcon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_cpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpbcon( &uplo, &n, &kd, ab_t, &ldab_t, &anorm, rcond, work,
                        rwork, &info );
@@ -73,11 +73,11 @@ lapack_int LAPACKE_cpbcon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpbcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpbequ.c b/LAPACKE/src/lapacke_cpbequ.c
index ee0bba51b8..dcf0c85be5 100644
--- a/LAPACKE/src/lapacke_cpbequ.c
+++ b/LAPACKE/src/lapacke_cpbequ.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpbequ( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpbequ)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, const lapack_complex_float* ab,
                            lapack_int ldab, float* s, float* scond,
                            float* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpbequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_cpbequ_work( matrix_layout, uplo, n, kd, ab, ldab, s, scond,
+    return API_SUFFIX(LAPACKE_cpbequ_work)( matrix_layout, uplo, n, kd, ab, ldab, s, scond,
                                 amax );
 }
diff --git a/LAPACKE/src/lapacke_cpbequ_work.c b/LAPACKE/src/lapacke_cpbequ_work.c
index f139ecaf69..a6ac444f4e 100644
--- a/LAPACKE/src/lapacke_cpbequ_work.c
+++ b/LAPACKE/src/lapacke_cpbequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpbequ_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpbequ_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, const lapack_complex_float* ab,
                                 lapack_int ldab, float* s, float* scond,
                                 float* amax )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cpbequ_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cpbequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbequ_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_cpbequ_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_cpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpbequ( &uplo, &n, &kd, ab_t, &ldab_t, s, scond, amax, &info );
         if( info < 0 ) {
@@ -71,11 +71,11 @@ lapack_int LAPACKE_cpbequ_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpbequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpbequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpbrfs.c b/LAPACKE/src/lapacke_cpbrfs.c
index 4c8faaf625..bed7d0f4a3 100644
--- a/LAPACKE/src/lapacke_cpbrfs.c
+++ b/LAPACKE/src/lapacke_cpbrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpbrfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpbrfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, lapack_int nrhs,
                            const lapack_complex_float* ab, lapack_int ldab,
                            const lapack_complex_float* afb, lapack_int ldafb,
@@ -44,22 +44,22 @@ lapack_int LAPACKE_cpbrfs( int matrix_layout, char uplo, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpbrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_cpb_nancheck( matrix_layout, uplo, n, kd, afb, ldafb ) ) {
+        if( API_SUFFIX(LAPACKE_cpb_nancheck)( matrix_layout, uplo, n, kd, afb, ldafb ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -77,7 +77,7 @@ lapack_int LAPACKE_cpbrfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cpbrfs_work( matrix_layout, uplo, n, kd, nrhs, ab, ldab, afb,
+    info = API_SUFFIX(LAPACKE_cpbrfs_work)( matrix_layout, uplo, n, kd, nrhs, ab, ldab, afb,
                                 ldafb, b, ldb, x, ldx, ferr, berr, work,
                                 rwork );
     /* Release memory and exit */
@@ -86,7 +86,7 @@ lapack_int LAPACKE_cpbrfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cpbrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpbrfs_work.c b/LAPACKE/src/lapacke_cpbrfs_work.c
index 3bcc7ca4ff..5a28680530 100644
--- a/LAPACKE/src/lapacke_cpbrfs_work.c
+++ b/LAPACKE/src/lapacke_cpbrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpbrfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpbrfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, lapack_int nrhs,
                                 const lapack_complex_float* ab, lapack_int ldab,
                                 const lapack_complex_float* afb,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_cpbrfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cpbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbrfs_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cpbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cpbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_cpbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -107,11 +107,11 @@ lapack_int LAPACKE_cpbrfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_cpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        LAPACKE_cpb_trans( matrix_layout, uplo, n, kd, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_cpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_cpb_trans)( matrix_layout, uplo, n, kd, afb, ldafb, afb_t,
                            ldafb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpbrfs( &uplo, &n, &kd, &nrhs, ab_t, &ldab_t, afb_t, &ldafb_t,
                        b_t, &ldb_t, x_t, &ldx_t, ferr, berr, work, rwork,
@@ -120,7 +120,7 @@ lapack_int LAPACKE_cpbrfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -131,11 +131,11 @@ lapack_int LAPACKE_cpbrfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpbrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpbstf.c b/LAPACKE/src/lapacke_cpbstf.c
index d886421910..cffd53964b 100644
--- a/LAPACKE/src/lapacke_cpbstf.c
+++ b/LAPACKE/src/lapacke_cpbstf.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpbstf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpbstf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kb, lapack_complex_float* bb,
                            lapack_int ldbb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpbstf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbstf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_cpb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_cpbstf_work( matrix_layout, uplo, n, kb, bb, ldbb );
+    return API_SUFFIX(LAPACKE_cpbstf_work)( matrix_layout, uplo, n, kb, bb, ldbb );
 }
diff --git a/LAPACKE/src/lapacke_cpbstf_work.c b/LAPACKE/src/lapacke_cpbstf_work.c
index 1e583fb3be..347e3e6f46 100644
--- a/LAPACKE/src/lapacke_cpbstf_work.c
+++ b/LAPACKE/src/lapacke_cpbstf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpbstf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpbstf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kb, lapack_complex_float* bb,
                                 lapack_int ldbb )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_cpbstf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldbb < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cpbstf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbstf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,24 +60,24 @@ lapack_int LAPACKE_cpbstf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cpb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_cpb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpbstf( &uplo, &n, &kb, bb_t, &ldbb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cpb_trans( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
+        API_SUFFIX(LAPACKE_cpb_trans)( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
                            ldbb );
         /* Release memory and exit */
         LAPACKE_free( bb_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpbstf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbstf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpbstf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbstf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpbsv.c b/LAPACKE/src/lapacke_cpbsv.c
index 4c0b27d219..d53e6a433a 100644
--- a/LAPACKE/src/lapacke_cpbsv.c
+++ b/LAPACKE/src/lapacke_cpbsv.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpbsv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpbsv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int kd, lapack_int nrhs,
                           lapack_complex_float* ab, lapack_int ldab,
                           lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpbsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_cpbsv_work( matrix_layout, uplo, n, kd, nrhs, ab, ldab, b,
+    return API_SUFFIX(LAPACKE_cpbsv_work)( matrix_layout, uplo, n, kd, nrhs, ab, ldab, b,
                                ldb );
 }
diff --git a/LAPACKE/src/lapacke_cpbsv_work.c b/LAPACKE/src/lapacke_cpbsv_work.c
index f6f356e4f0..9d4e965677 100644
--- a/LAPACKE/src/lapacke_cpbsv_work.c
+++ b/LAPACKE/src/lapacke_cpbsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpbsv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpbsv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int kd, lapack_int nrhs,
                                lapack_complex_float* ab, lapack_int ldab,
                                lapack_complex_float* b, lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_cpbsv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cpbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbsv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cpbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,8 +75,8 @@ lapack_int LAPACKE_cpbsv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpbsv( &uplo, &n, &kd, &nrhs, ab_t, &ldab_t, b_t, &ldb_t,
                       &info );
@@ -84,20 +84,20 @@ lapack_int LAPACKE_cpbsv_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cpb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_cpb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpbsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpbsvx.c b/LAPACKE/src/lapacke_cpbsvx.c
index 47a12dd3e2..00cf4b70cb 100644
--- a/LAPACKE/src/lapacke_cpbsvx.c
+++ b/LAPACKE/src/lapacke_cpbsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpbsvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpbsvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int kd, lapack_int nrhs,
                            lapack_complex_float* ab, lapack_int ldab,
                            lapack_complex_float* afb, lapack_int ldafb,
@@ -45,25 +45,25 @@ lapack_int LAPACKE_cpbsvx( int matrix_layout, char fact, char uplo, lapack_int n
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpbsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_cpb_nancheck( matrix_layout, uplo, n, kd, afb, ldafb ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_cpb_nancheck)( matrix_layout, uplo, n, kd, afb, ldafb ) ) {
                 return -9;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            if( LAPACKE_s_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, s, 1 ) ) {
                 return -12;
             }
         }
@@ -82,7 +82,7 @@ lapack_int LAPACKE_cpbsvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cpbsvx_work( matrix_layout, fact, uplo, n, kd, nrhs, ab, ldab,
+    info = API_SUFFIX(LAPACKE_cpbsvx_work)( matrix_layout, fact, uplo, n, kd, nrhs, ab, ldab,
                                 afb, ldafb, equed, s, b, ldb, x, ldx, rcond,
                                 ferr, berr, work, rwork );
     /* Release memory and exit */
@@ -91,7 +91,7 @@ lapack_int LAPACKE_cpbsvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cpbsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpbsvx_work.c b/LAPACKE/src/lapacke_cpbsvx_work.c
index a63c8fddda..e95bd47d51 100644
--- a/LAPACKE/src/lapacke_cpbsvx_work.c
+++ b/LAPACKE/src/lapacke_cpbsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpbsvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cpbsvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int kd, lapack_int nrhs,
                                 lapack_complex_float* ab, lapack_int ldab,
                                 lapack_complex_float* afb, lapack_int ldafb,
@@ -63,22 +63,22 @@ lapack_int LAPACKE_cpbsvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cpbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbsvx_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cpbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbsvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_cpbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_cpbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -109,12 +109,12 @@ lapack_int LAPACKE_cpbsvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_cpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_cpb_trans( matrix_layout, uplo, n, kd, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_cpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_cpb_trans)( matrix_layout, uplo, n, kd, afb, ldafb, afb_t,
                                ldafb_t );
         }
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpbsvx( &fact, &uplo, &n, &kd, &nrhs, ab_t, &ldab_t, afb_t,
                        &ldafb_t, equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond,
@@ -123,16 +123,16 @@ lapack_int LAPACKE_cpbsvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_cpb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_cpb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                                ldab );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_cpb_trans( LAPACK_COL_MAJOR, uplo, n, kd, afb_t, ldafb_t,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_cpb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, afb_t, ldafb_t,
                                afb, ldafb );
         }
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -143,11 +143,11 @@ lapack_int LAPACKE_cpbsvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpbsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpbtrf.c b/LAPACKE/src/lapacke_cpbtrf.c
index 9b2f160eb6..a295d8e491 100644
--- a/LAPACKE/src/lapacke_cpbtrf.c
+++ b/LAPACKE/src/lapacke_cpbtrf.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpbtrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpbtrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, lapack_complex_float* ab,
                            lapack_int ldab )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpbtrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbtrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_cpbtrf_work( matrix_layout, uplo, n, kd, ab, ldab );
+    return API_SUFFIX(LAPACKE_cpbtrf_work)( matrix_layout, uplo, n, kd, ab, ldab );
 }
diff --git a/LAPACKE/src/lapacke_cpbtrf_work.c b/LAPACKE/src/lapacke_cpbtrf_work.c
index a0c1d4c0db..2ce1b3052c 100644
--- a/LAPACKE/src/lapacke_cpbtrf_work.c
+++ b/LAPACKE/src/lapacke_cpbtrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpbtrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpbtrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, lapack_complex_float* ab,
                                 lapack_int ldab )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_cpbtrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cpbtrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbtrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,24 +60,24 @@ lapack_int LAPACKE_cpbtrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_cpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpbtrf( &uplo, &n, &kd, ab_t, &ldab_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cpb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_cpb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
         /* Release memory and exit */
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpbtrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbtrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpbtrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbtrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpbtrs.c b/LAPACKE/src/lapacke_cpbtrs.c
index 144c2af899..064c6af333 100644
--- a/LAPACKE/src/lapacke_cpbtrs.c
+++ b/LAPACKE/src/lapacke_cpbtrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpbtrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpbtrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, lapack_int nrhs,
                            const lapack_complex_float* ab, lapack_int ldab,
                            lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpbtrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbtrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_cpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_cpbtrs_work( matrix_layout, uplo, n, kd, nrhs, ab, ldab, b,
+    return API_SUFFIX(LAPACKE_cpbtrs_work)( matrix_layout, uplo, n, kd, nrhs, ab, ldab, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_cpbtrs_work.c b/LAPACKE/src/lapacke_cpbtrs_work.c
index af8078b84b..a7d3f39643 100644
--- a/LAPACKE/src/lapacke_cpbtrs_work.c
+++ b/LAPACKE/src/lapacke_cpbtrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpbtrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpbtrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, lapack_int nrhs,
                                 const lapack_complex_float* ab, lapack_int ldab,
                                 lapack_complex_float* b, lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_cpbtrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cpbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbtrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cpbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbtrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,8 +75,8 @@ lapack_int LAPACKE_cpbtrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpbtrs( &uplo, &n, &kd, &nrhs, ab_t, &ldab_t, b_t, &ldb_t,
                        &info );
@@ -84,18 +84,18 @@ lapack_int LAPACKE_cpbtrs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbtrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpbtrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpbtrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpftrf.c b/LAPACKE/src/lapacke_cpftrf.c
index afc8343c9b..982d9a843f 100644
--- a/LAPACKE/src/lapacke_cpftrf.c
+++ b/LAPACKE/src/lapacke_cpftrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpftrf( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cpftrf)( int matrix_layout, char transr, char uplo,
                            lapack_int n, lapack_complex_float* a )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpftrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpftrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpf_nancheck( n, a ) ) {
+        if( API_SUFFIX(LAPACKE_cpf_nancheck)( n, a ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_cpftrf_work( matrix_layout, transr, uplo, n, a );
+    return API_SUFFIX(LAPACKE_cpftrf_work)( matrix_layout, transr, uplo, n, a );
 }
diff --git a/LAPACKE/src/lapacke_cpftrf_work.c b/LAPACKE/src/lapacke_cpftrf_work.c
index 29f939246c..bc18aabf76 100644
--- a/LAPACKE/src/lapacke_cpftrf_work.c
+++ b/LAPACKE/src/lapacke_cpftrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpftrf_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cpftrf_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, lapack_complex_float* a )
 {
     lapack_int info = 0;
@@ -53,23 +53,23 @@ lapack_int LAPACKE_cpftrf_work( int matrix_layout, char transr, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cpf_trans( matrix_layout, transr, uplo, n, a, a_t );
+        API_SUFFIX(LAPACKE_cpf_trans)( matrix_layout, transr, uplo, n, a, a_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpftrf( &transr, &uplo, &n, a_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cpf_trans( LAPACK_COL_MAJOR, transr, uplo, n, a_t, a );
+        API_SUFFIX(LAPACKE_cpf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, a_t, a );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpftrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpftrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpftrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpftrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpftri.c b/LAPACKE/src/lapacke_cpftri.c
index 0637acb96f..109750d5e3 100644
--- a/LAPACKE/src/lapacke_cpftri.c
+++ b/LAPACKE/src/lapacke_cpftri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpftri( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cpftri)( int matrix_layout, char transr, char uplo,
                            lapack_int n, lapack_complex_float* a )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpftri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpftri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpf_nancheck( n, a ) ) {
+        if( API_SUFFIX(LAPACKE_cpf_nancheck)( n, a ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_cpftri_work( matrix_layout, transr, uplo, n, a );
+    return API_SUFFIX(LAPACKE_cpftri_work)( matrix_layout, transr, uplo, n, a );
 }
diff --git a/LAPACKE/src/lapacke_cpftri_work.c b/LAPACKE/src/lapacke_cpftri_work.c
index 1120cc25f8..bcb29ba9e2 100644
--- a/LAPACKE/src/lapacke_cpftri_work.c
+++ b/LAPACKE/src/lapacke_cpftri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpftri_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cpftri_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, lapack_complex_float* a )
 {
     lapack_int info = 0;
@@ -53,23 +53,23 @@ lapack_int LAPACKE_cpftri_work( int matrix_layout, char transr, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cpf_trans( matrix_layout, transr, uplo, n, a, a_t );
+        API_SUFFIX(LAPACKE_cpf_trans)( matrix_layout, transr, uplo, n, a, a_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpftri( &transr, &uplo, &n, a_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cpf_trans( LAPACK_COL_MAJOR, transr, uplo, n, a_t, a );
+        API_SUFFIX(LAPACKE_cpf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, a_t, a );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpftri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpftri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpftri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpftri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpftrs.c b/LAPACKE/src/lapacke_cpftrs.c
index 81ecd03fdc..cdcdad2d8d 100644
--- a/LAPACKE/src/lapacke_cpftrs.c
+++ b/LAPACKE/src/lapacke_cpftrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpftrs( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cpftrs)( int matrix_layout, char transr, char uplo,
                            lapack_int n, lapack_int nrhs,
                            const lapack_complex_float* a,
                            lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpftrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpftrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpf_nancheck( n, a ) ) {
+        if( API_SUFFIX(LAPACKE_cpf_nancheck)( n, a ) ) {
             return -6;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_cpftrs_work( matrix_layout, transr, uplo, n, nrhs, a, b,
+    return API_SUFFIX(LAPACKE_cpftrs_work)( matrix_layout, transr, uplo, n, nrhs, a, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_cpftrs_work.c b/LAPACKE/src/lapacke_cpftrs_work.c
index 819bbdcbb3..0a3a915b89 100644
--- a/LAPACKE/src/lapacke_cpftrs_work.c
+++ b/LAPACKE/src/lapacke_cpftrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpftrs_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cpftrs_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, lapack_int nrhs,
                                 const lapack_complex_float* a,
                                 lapack_complex_float* b, lapack_int ldb )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_cpftrs_work( int matrix_layout, char transr, char uplo,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cpftrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpftrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,26 +70,26 @@ lapack_int LAPACKE_cpftrs_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cpf_trans( matrix_layout, transr, uplo, n, a, a_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cpf_trans)( matrix_layout, transr, uplo, n, a, a_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpftrs( &transr, &uplo, &n, &nrhs, a_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpftrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpftrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpftrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpftrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpocon.c b/LAPACKE/src/lapacke_cpocon.c
index bd8fd6b97c..4f3c9871b7 100644
--- a/LAPACKE/src/lapacke_cpocon.c
+++ b/LAPACKE/src/lapacke_cpocon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpocon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpocon)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_float* a, lapack_int lda,
                            float anorm, float* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_cpocon( int matrix_layout, char uplo, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpocon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpocon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_cpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -6;
         }
     }
@@ -67,7 +67,7 @@ lapack_int LAPACKE_cpocon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cpocon_work( matrix_layout, uplo, n, a, lda, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_cpocon_work)( matrix_layout, uplo, n, a, lda, anorm, rcond,
                                 work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -75,7 +75,7 @@ lapack_int LAPACKE_cpocon( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cpocon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpocon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpocon_work.c b/LAPACKE/src/lapacke_cpocon_work.c
index 25024a6ade..945fde6d6f 100644
--- a/LAPACKE/src/lapacke_cpocon_work.c
+++ b/LAPACKE/src/lapacke_cpocon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpocon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpocon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_float* a, lapack_int lda,
                                 float anorm, float* rcond,
                                 lapack_complex_float* work, float* rwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cpocon_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cpocon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpocon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_cpocon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpocon( &uplo, &n, a_t, &lda_t, &anorm, rcond, work, rwork,
                        &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_cpocon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpocon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpocon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpocon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpocon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpoequ.c b/LAPACKE/src/lapacke_cpoequ.c
index 1945af0c7f..a7660e4940 100644
--- a/LAPACKE/src/lapacke_cpoequ.c
+++ b/LAPACKE/src/lapacke_cpoequ.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpoequ( int matrix_layout, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpoequ)( int matrix_layout, lapack_int n,
                            const lapack_complex_float* a, lapack_int lda,
                            float* s, float* scond, float* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpoequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpoequ", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_cpoequ_work( matrix_layout, n, a, lda, s, scond, amax );
+    return API_SUFFIX(LAPACKE_cpoequ_work)( matrix_layout, n, a, lda, s, scond, amax );
 }
diff --git a/LAPACKE/src/lapacke_cpoequ_work.c b/LAPACKE/src/lapacke_cpoequ_work.c
index 39e45ea820..42d4ed2d57 100644
--- a/LAPACKE/src/lapacke_cpoequ_work.c
+++ b/LAPACKE/src/lapacke_cpoequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpoequ_work( int matrix_layout, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpoequ_work)( int matrix_layout, lapack_int n,
                                 const lapack_complex_float* a, lapack_int lda,
                                 float* s, float* scond, float* amax )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_cpoequ_work( int matrix_layout, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -4;
-            LAPACKE_xerbla( "LAPACKE_cpoequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpoequ_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,7 +60,7 @@ lapack_int LAPACKE_cpoequ_work( int matrix_layout, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpoequ( &n, a_t, &lda_t, s, scond, amax, &info );
         if( info < 0 ) {
@@ -70,11 +70,11 @@ lapack_int LAPACKE_cpoequ_work( int matrix_layout, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpoequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpoequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpoequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpoequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpoequb.c b/LAPACKE/src/lapacke_cpoequb.c
index 50bb97998e..0828ad471e 100644
--- a/LAPACKE/src/lapacke_cpoequb.c
+++ b/LAPACKE/src/lapacke_cpoequb.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpoequb( int matrix_layout, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpoequb)( int matrix_layout, lapack_int n,
                             const lapack_complex_float* a, lapack_int lda,
                             float* s, float* scond, float* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpoequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpoequb", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_cpoequb_work( matrix_layout, n, a, lda, s, scond, amax );
+    return API_SUFFIX(LAPACKE_cpoequb_work)( matrix_layout, n, a, lda, s, scond, amax );
 }
diff --git a/LAPACKE/src/lapacke_cpoequb_work.c b/LAPACKE/src/lapacke_cpoequb_work.c
index 2df58a1668..b1abc4ecca 100644
--- a/LAPACKE/src/lapacke_cpoequb_work.c
+++ b/LAPACKE/src/lapacke_cpoequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpoequb_work( int matrix_layout, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpoequb_work)( int matrix_layout, lapack_int n,
                                  const lapack_complex_float* a, lapack_int lda,
                                  float* s, float* scond, float* amax )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_cpoequb_work( int matrix_layout, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -4;
-            LAPACKE_xerbla( "LAPACKE_cpoequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpoequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,7 +60,7 @@ lapack_int LAPACKE_cpoequb_work( int matrix_layout, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpoequb( &n, a_t, &lda_t, s, scond, amax, &info );
         if( info < 0 ) {
@@ -70,11 +70,11 @@ lapack_int LAPACKE_cpoequb_work( int matrix_layout, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpoequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpoequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpoequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpoequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cporfs.c b/LAPACKE/src/lapacke_cporfs.c
index 3063f97167..32462801b2 100644
--- a/LAPACKE/src/lapacke_cporfs.c
+++ b/LAPACKE/src/lapacke_cporfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cporfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cporfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* a,
                            lapack_int lda, const lapack_complex_float* af,
                            lapack_int ldaf, const lapack_complex_float* b,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_cporfs( int matrix_layout, char uplo, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cporfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cporfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_cpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cpo_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_cpo_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -11;
         }
     }
@@ -76,7 +76,7 @@ lapack_int LAPACKE_cporfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cporfs_work( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
+    info = API_SUFFIX(LAPACKE_cporfs_work)( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
                                 b, ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -84,7 +84,7 @@ lapack_int LAPACKE_cporfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cporfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cporfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cporfs_work.c b/LAPACKE/src/lapacke_cporfs_work.c
index aa9421b7f0..68e644b815 100644
--- a/LAPACKE/src/lapacke_cporfs_work.c
+++ b/LAPACKE/src/lapacke_cporfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cporfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cporfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* a,
                                 lapack_int lda, const lapack_complex_float* af,
                                 lapack_int ldaf, const lapack_complex_float* b,
@@ -60,22 +60,22 @@ lapack_int LAPACKE_cporfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cporfs_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cporfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cporfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_cporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cporfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -106,10 +106,10 @@ lapack_int LAPACKE_cporfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_cpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cpo_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_cpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cpo_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cporfs( &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, rwork, &info );
@@ -117,7 +117,7 @@ lapack_int LAPACKE_cporfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -128,11 +128,11 @@ lapack_int LAPACKE_cporfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cporfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cporfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cporfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cporfsx.c b/LAPACKE/src/lapacke_cporfsx.c
index 530d96775e..9a2108c635 100644
--- a/LAPACKE/src/lapacke_cporfsx.c
+++ b/LAPACKE/src/lapacke_cporfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cporfsx( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_cporfsx)( int matrix_layout, char uplo, char equed,
                             lapack_int n, lapack_int nrhs,
                             const lapack_complex_float* a, lapack_int lda,
                             const lapack_complex_float* af, lapack_int ldaf,
@@ -47,32 +47,32 @@ lapack_int LAPACKE_cporfsx( int matrix_layout, char uplo, char equed,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cporfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cporfsx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -21;
             }
         }
-        if( LAPACKE_lsame( equed, 'y' ) ) {
-            if( LAPACKE_s_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, s, 1 ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -13;
         }
     }
@@ -90,7 +90,7 @@ lapack_int LAPACKE_cporfsx( int matrix_layout, char uplo, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cporfsx_work( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_cporfsx_work)( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
                                  ldaf, s, b, ldb, x, ldx, rcond, berr,
                                  n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, rwork );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_cporfsx( int matrix_layout, char uplo, char equed,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cporfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cporfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cporfsx_work.c b/LAPACKE/src/lapacke_cporfsx_work.c
index 4e4342eb54..39d8b47d43 100644
--- a/LAPACKE/src/lapacke_cporfsx_work.c
+++ b/LAPACKE/src/lapacke_cporfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cporfsx_work( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_cporfsx_work)( int matrix_layout, char uplo, char equed,
                                  lapack_int n, lapack_int nrhs,
                                  const lapack_complex_float* a, lapack_int lda,
                                  const lapack_complex_float* af,
@@ -68,22 +68,22 @@ lapack_int LAPACKE_cporfsx_work( int matrix_layout, char uplo, char equed,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cporfsx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cporfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_cporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cporfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_cporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cporfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -126,10 +126,10 @@ lapack_int LAPACKE_cporfsx_work( int matrix_layout, char uplo, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_csy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cporfsx( &uplo, &equed, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, s,
                         b_t, &ldb_t, x_t, &ldx_t, rcond, berr, &n_err_bnds,
@@ -139,10 +139,10 @@ lapack_int LAPACKE_cporfsx_work( int matrix_layout, char uplo, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -158,11 +158,11 @@ lapack_int LAPACKE_cporfsx_work( int matrix_layout, char uplo, char equed,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cporfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cporfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cporfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cposv.c b/LAPACKE/src/lapacke_cposv.c
index 94296c7d72..143dd0d12a 100644
--- a/LAPACKE/src/lapacke_cposv.c
+++ b/LAPACKE/src/lapacke_cposv.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cposv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cposv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_float* a,
                           lapack_int lda, lapack_complex_float* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cposv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_cpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_cposv_work( matrix_layout, uplo, n, nrhs, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_cposv_work)( matrix_layout, uplo, n, nrhs, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_cposv_work.c b/LAPACKE/src/lapacke_cposv_work.c
index f5903a8b41..180bf6fba6 100644
--- a/LAPACKE/src/lapacke_cposv_work.c
+++ b/LAPACKE/src/lapacke_cposv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cposv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cposv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_float* a,
                                lapack_int lda, lapack_complex_float* b,
                                lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_cposv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,27 +75,27 @@ lapack_int LAPACKE_cposv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cposv( &uplo, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cposv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cposvx.c b/LAPACKE/src/lapacke_cposvx.c
index fa401cde17..4a43e45861 100644
--- a/LAPACKE/src/lapacke_cposvx.c
+++ b/LAPACKE/src/lapacke_cposvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cposvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cposvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* af,
                            lapack_int ldaf, char* equed, float* s,
@@ -44,25 +44,25 @@ lapack_int LAPACKE_cposvx( int matrix_layout, char fact, char uplo, lapack_int n
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cposvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_cpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_cpo_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_cpo_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            if( LAPACKE_s_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, s, 1 ) ) {
                 return -11;
             }
         }
@@ -81,7 +81,7 @@ lapack_int LAPACKE_cposvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cposvx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_cposvx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                 ldaf, equed, s, b, ldb, x, ldx, rcond, ferr,
                                 berr, work, rwork );
     /* Release memory and exit */
@@ -90,7 +90,7 @@ lapack_int LAPACKE_cposvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cposvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cposvx_work.c b/LAPACKE/src/lapacke_cposvx_work.c
index d732801d09..c88382622b 100644
--- a/LAPACKE/src/lapacke_cposvx_work.c
+++ b/LAPACKE/src/lapacke_cposvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cposvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cposvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* af, lapack_int ldaf,
@@ -62,22 +62,22 @@ lapack_int LAPACKE_cposvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposvx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_cposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_cposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -108,11 +108,11 @@ lapack_int LAPACKE_cposvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_cpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_cpo_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_cpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_cpo_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cposvx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                        equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr, berr,
@@ -121,15 +121,15 @@ lapack_int LAPACKE_cposvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_cpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_cpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_cpo_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_cpo_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -140,11 +140,11 @@ lapack_int LAPACKE_cposvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cposvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cposvxx.c b/LAPACKE/src/lapacke_cposvxx.c
index d420171aba..2582415bb0 100644
--- a/LAPACKE/src/lapacke_cposvxx.c
+++ b/LAPACKE/src/lapacke_cposvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cposvxx( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cposvxx)( int matrix_layout, char fact, char uplo,
                             lapack_int n, lapack_int nrhs,
                             lapack_complex_float* a, lapack_int lda,
                             lapack_complex_float* af, lapack_int ldaf,
@@ -47,30 +47,30 @@ lapack_int LAPACKE_cposvxx( int matrix_layout, char fact, char uplo,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cposvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposvxx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_cpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_cpo_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_cpo_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -23;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            if( LAPACKE_s_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, s, 1 ) ) {
                 return -11;
             }
         }
@@ -89,7 +89,7 @@ lapack_int LAPACKE_cposvxx( int matrix_layout, char fact, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cposvxx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_cposvxx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                  ldaf, equed, s, b, ldb, x, ldx, rcond, rpvgrw,
                                  berr, n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, rwork );
@@ -99,7 +99,7 @@ lapack_int LAPACKE_cposvxx( int matrix_layout, char fact, char uplo,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cposvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cposvxx_work.c b/LAPACKE/src/lapacke_cposvxx_work.c
index a329787df5..11e4c46787 100644
--- a/LAPACKE/src/lapacke_cposvxx_work.c
+++ b/LAPACKE/src/lapacke_cposvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cposvxx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cposvxx_work)( int matrix_layout, char fact, char uplo,
                                  lapack_int n, lapack_int nrhs,
                                  lapack_complex_float* a, lapack_int lda,
                                  lapack_complex_float* af, lapack_int ldaf,
@@ -68,22 +68,22 @@ lapack_int LAPACKE_cposvxx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposvxx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_cposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_cposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -126,11 +126,11 @@ lapack_int LAPACKE_cposvxx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_cpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_cpo_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_cpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_cpo_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cposvxx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond, rpvgrw, berr,
@@ -140,18 +140,18 @@ lapack_int LAPACKE_cposvxx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_cpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_cpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_cpo_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_cpo_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -167,11 +167,11 @@ lapack_int LAPACKE_cposvxx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cposvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cposvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpotrf.c b/LAPACKE/src/lapacke_cpotrf.c
index d8c7a24792..fcce319c67 100644
--- a/LAPACKE/src/lapacke_cpotrf.c
+++ b/LAPACKE/src/lapacke_cpotrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpotrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpotrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpotrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpotrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_cpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_cpotrf_work( matrix_layout, uplo, n, a, lda );
+    return API_SUFFIX(LAPACKE_cpotrf_work)( matrix_layout, uplo, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_cpotrf2.c b/LAPACKE/src/lapacke_cpotrf2.c
index 7fd0560a7e..601a1bb662 100644
--- a/LAPACKE/src/lapacke_cpotrf2.c
+++ b/LAPACKE/src/lapacke_cpotrf2.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpotrf2( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpotrf2)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpotrf2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpotrf2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_cpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_cpotrf2_work( matrix_layout, uplo, n, a, lda );
+    return API_SUFFIX(LAPACKE_cpotrf2_work)( matrix_layout, uplo, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_cpotrf2_work.c b/LAPACKE/src/lapacke_cpotrf2_work.c
index 9d29d58427..e12e522b00 100644
--- a/LAPACKE/src/lapacke_cpotrf2_work.c
+++ b/LAPACKE/src/lapacke_cpotrf2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpotrf2_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpotrf2_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_cpotrf2_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cpotrf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpotrf2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_cpotrf2_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpotrf2( &uplo, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpotrf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpotrf2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpotrf2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpotrf2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpotrf_work.c b/LAPACKE/src/lapacke_cpotrf_work.c
index 128a1638ed..df1d1dbfd0 100644
--- a/LAPACKE/src/lapacke_cpotrf_work.c
+++ b/LAPACKE/src/lapacke_cpotrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpotrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpotrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_cpotrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cpotrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpotrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_cpotrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpotrf( &uplo, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpotrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpotrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpotrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpotrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpotri.c b/LAPACKE/src/lapacke_cpotri.c
index 3b006e6a83..71e2fd1482 100644
--- a/LAPACKE/src/lapacke_cpotri.c
+++ b/LAPACKE/src/lapacke_cpotri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpotri( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpotri)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpotri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpotri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_cpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_cpotri_work( matrix_layout, uplo, n, a, lda );
+    return API_SUFFIX(LAPACKE_cpotri_work)( matrix_layout, uplo, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_cpotri_work.c b/LAPACKE/src/lapacke_cpotri_work.c
index d4f9878190..449e9cceeb 100644
--- a/LAPACKE/src/lapacke_cpotri_work.c
+++ b/LAPACKE/src/lapacke_cpotri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpotri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpotri_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_cpotri_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cpotri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpotri_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_cpotri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpotri( &uplo, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpotri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpotri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpotri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpotri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpotrs.c b/LAPACKE/src/lapacke_cpotrs.c
index 638b7595e1..6315bd30c7 100644
--- a/LAPACKE/src/lapacke_cpotrs.c
+++ b/LAPACKE/src/lapacke_cpotrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpotrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpotrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpotrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpotrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_cpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_cpotrs_work( matrix_layout, uplo, n, nrhs, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_cpotrs_work)( matrix_layout, uplo, n, nrhs, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_cpotrs_work.c b/LAPACKE/src/lapacke_cpotrs_work.c
index dee555b635..2b9a4a1118 100644
--- a/LAPACKE/src/lapacke_cpotrs_work.c
+++ b/LAPACKE/src/lapacke_cpotrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpotrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpotrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* a,
                                 lapack_int lda, lapack_complex_float* b,
                                 lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_cpotrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cpotrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpotrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cpotrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpotrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,26 +75,26 @@ lapack_int LAPACKE_cpotrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpotrs( &uplo, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpotrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpotrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpotrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpotrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cppcon.c b/LAPACKE/src/lapacke_cppcon.c
index 0f4cb52a12..b1a9cac4ba 100644
--- a/LAPACKE/src/lapacke_cppcon.c
+++ b/LAPACKE/src/lapacke_cppcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cppcon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cppcon)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_float* ap, float anorm,
                            float* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_cppcon( int matrix_layout, char uplo, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cppcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cppcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_cpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_cpp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
@@ -67,7 +67,7 @@ lapack_int LAPACKE_cppcon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cppcon_work( matrix_layout, uplo, n, ap, anorm, rcond, work,
+    info = API_SUFFIX(LAPACKE_cppcon_work)( matrix_layout, uplo, n, ap, anorm, rcond, work,
                                 rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -75,7 +75,7 @@ lapack_int LAPACKE_cppcon( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cppcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cppcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cppcon_work.c b/LAPACKE/src/lapacke_cppcon_work.c
index aea7edd3c2..a5f50577ea 100644
--- a/LAPACKE/src/lapacke_cppcon_work.c
+++ b/LAPACKE/src/lapacke_cppcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cppcon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cppcon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_float* ap, float anorm,
                                 float* rcond, lapack_complex_float* work,
                                 float* rwork )
@@ -55,7 +55,7 @@ lapack_int LAPACKE_cppcon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_cpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cppcon( &uplo, &n, ap_t, &anorm, rcond, work, rwork, &info );
         if( info < 0 ) {
@@ -65,11 +65,11 @@ lapack_int LAPACKE_cppcon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cppcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cppcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cppcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cppcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cppequ.c b/LAPACKE/src/lapacke_cppequ.c
index 1cb51bfdf3..649d3b5aea 100644
--- a/LAPACKE/src/lapacke_cppequ.c
+++ b/LAPACKE/src/lapacke_cppequ.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cppequ( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cppequ)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_float* ap, float* s,
                            float* scond, float* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cppequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cppequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_cpp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_cppequ_work( matrix_layout, uplo, n, ap, s, scond, amax );
+    return API_SUFFIX(LAPACKE_cppequ_work)( matrix_layout, uplo, n, ap, s, scond, amax );
 }
diff --git a/LAPACKE/src/lapacke_cppequ_work.c b/LAPACKE/src/lapacke_cppequ_work.c
index 111f50c772..9d24d5ab49 100644
--- a/LAPACKE/src/lapacke_cppequ_work.c
+++ b/LAPACKE/src/lapacke_cppequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cppequ_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cppequ_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_float* ap, float* s,
                                 float* scond, float* amax )
 {
@@ -54,7 +54,7 @@ lapack_int LAPACKE_cppequ_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_cpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cppequ( &uplo, &n, ap_t, s, scond, amax, &info );
         if( info < 0 ) {
@@ -64,11 +64,11 @@ lapack_int LAPACKE_cppequ_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cppequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cppequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cppequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cppequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpprfs.c b/LAPACKE/src/lapacke_cpprfs.c
index 7fc34be98a..f69369aa85 100644
--- a/LAPACKE/src/lapacke_cpprfs.c
+++ b/LAPACKE/src/lapacke_cpprfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpprfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpprfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* ap,
                            const lapack_complex_float* afp,
                            const lapack_complex_float* b, lapack_int ldb,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_cpprfs( int matrix_layout, char uplo, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpprfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpprfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_cpp_nancheck)( n, afp ) ) {
             return -6;
         }
-        if( LAPACKE_cpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_cpp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -9;
         }
     }
@@ -76,7 +76,7 @@ lapack_int LAPACKE_cpprfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cpprfs_work( matrix_layout, uplo, n, nrhs, ap, afp, b, ldb, x,
+    info = API_SUFFIX(LAPACKE_cpprfs_work)( matrix_layout, uplo, n, nrhs, ap, afp, b, ldb, x,
                                 ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -84,7 +84,7 @@ lapack_int LAPACKE_cpprfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cpprfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpprfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpprfs_work.c b/LAPACKE/src/lapacke_cpprfs_work.c
index 312280a58b..eec06dafa4 100644
--- a/LAPACKE/src/lapacke_cpprfs_work.c
+++ b/LAPACKE/src/lapacke_cpprfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpprfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpprfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* ap,
                                 const lapack_complex_float* afp,
                                 const lapack_complex_float* b, lapack_int ldb,
@@ -58,12 +58,12 @@ lapack_int LAPACKE_cpprfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cpprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpprfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cpprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpprfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -96,10 +96,10 @@ lapack_int LAPACKE_cpprfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
-        LAPACKE_cpp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_cpp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_cpp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_cpp_trans)( matrix_layout, uplo, n, afp, afp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpprfs( &uplo, &n, &nrhs, ap_t, afp_t, b_t, &ldb_t, x_t, &ldx_t,
                        ferr, berr, work, rwork, &info );
@@ -107,7 +107,7 @@ lapack_int LAPACKE_cpprfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( afp_t );
 exit_level_3:
@@ -118,11 +118,11 @@ lapack_int LAPACKE_cpprfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpprfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpprfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpprfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cppsv.c b/LAPACKE/src/lapacke_cppsv.c
index 6d6ddcc028..36ef29fd26 100644
--- a/LAPACKE/src/lapacke_cppsv.c
+++ b/LAPACKE/src/lapacke_cppsv.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cppsv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cppsv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_float* ap,
                           lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cppsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cppsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_cpp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_cppsv_work( matrix_layout, uplo, n, nrhs, ap, b, ldb );
+    return API_SUFFIX(LAPACKE_cppsv_work)( matrix_layout, uplo, n, nrhs, ap, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_cppsv_work.c b/LAPACKE/src/lapacke_cppsv_work.c
index ad9516912e..a15f6278bd 100644
--- a/LAPACKE/src/lapacke_cppsv_work.c
+++ b/LAPACKE/src/lapacke_cppsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cppsv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cppsv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_float* ap,
                                lapack_complex_float* b, lapack_int ldb )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cppsv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cppsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cppsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -69,27 +69,27 @@ lapack_int LAPACKE_cppsv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cppsv( &uplo, &n, &nrhs, ap_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_cpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cppsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cppsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cppsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cppsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cppsvx.c b/LAPACKE/src/lapacke_cppsvx.c
index fbf68f9777..4f16706fe7 100644
--- a/LAPACKE/src/lapacke_cppsvx.c
+++ b/LAPACKE/src/lapacke_cppsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cppsvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cppsvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, lapack_complex_float* ap,
                            lapack_complex_float* afp, char* equed, float* s,
                            lapack_complex_float* b, lapack_int ldb,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_cppsvx( int matrix_layout, char fact, char uplo, lapack_int n
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cppsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cppsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_cpp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_cpp_nancheck)( n, afp ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_cpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_cpp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            if( LAPACKE_s_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, s, 1 ) ) {
                 return -9;
             }
         }
@@ -80,7 +80,7 @@ lapack_int LAPACKE_cppsvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cppsvx_work( matrix_layout, fact, uplo, n, nrhs, ap, afp,
+    info = API_SUFFIX(LAPACKE_cppsvx_work)( matrix_layout, fact, uplo, n, nrhs, ap, afp,
                                 equed, s, b, ldb, x, ldx, rcond, ferr, berr,
                                 work, rwork );
     /* Release memory and exit */
@@ -89,7 +89,7 @@ lapack_int LAPACKE_cppsvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cppsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cppsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cppsvx_work.c b/LAPACKE/src/lapacke_cppsvx_work.c
index d4a3135e67..25c8ac725b 100644
--- a/LAPACKE/src/lapacke_cppsvx_work.c
+++ b/LAPACKE/src/lapacke_cppsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cppsvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cppsvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs,
                                 lapack_complex_float* ap,
                                 lapack_complex_float* afp, char* equed,
@@ -60,12 +60,12 @@ lapack_int LAPACKE_cppsvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cppsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cppsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_cppsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cppsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -98,10 +98,10 @@ lapack_int LAPACKE_cppsvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cpp_trans( matrix_layout, uplo, n, ap, ap_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_cpp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cpp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_cpp_trans)( matrix_layout, uplo, n, afp, afp_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_cppsvx( &fact, &uplo, &n, &nrhs, ap_t, afp_t, equed, s, b_t,
@@ -111,13 +111,13 @@ lapack_int LAPACKE_cppsvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_cpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_cpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_cpp_trans( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_cpp_trans)( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
         }
         /* Release memory and exit */
         LAPACKE_free( afp_t );
@@ -129,11 +129,11 @@ lapack_int LAPACKE_cppsvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cppsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cppsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cppsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cppsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpptrf.c b/LAPACKE/src/lapacke_cpptrf.c
index 38247619bb..a279130eab 100644
--- a/LAPACKE/src/lapacke_cpptrf.c
+++ b/LAPACKE/src/lapacke_cpptrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpptrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpptrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpptrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpptrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_cpp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_cpptrf_work( matrix_layout, uplo, n, ap );
+    return API_SUFFIX(LAPACKE_cpptrf_work)( matrix_layout, uplo, n, ap );
 }
diff --git a/LAPACKE/src/lapacke_cpptrf_work.c b/LAPACKE/src/lapacke_cpptrf_work.c
index b786bd4c29..c901c178d8 100644
--- a/LAPACKE/src/lapacke_cpptrf_work.c
+++ b/LAPACKE/src/lapacke_cpptrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpptrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpptrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* ap )
 {
     lapack_int info = 0;
@@ -53,23 +53,23 @@ lapack_int LAPACKE_cpptrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_cpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpptrf( &uplo, &n, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_cpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpptrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpptrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpptrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpptrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpptri.c b/LAPACKE/src/lapacke_cpptri.c
index 89fba4257d..5a76b7e94c 100644
--- a/LAPACKE/src/lapacke_cpptri.c
+++ b/LAPACKE/src/lapacke_cpptri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpptri( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpptri)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpptri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpptri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_cpp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_cpptri_work( matrix_layout, uplo, n, ap );
+    return API_SUFFIX(LAPACKE_cpptri_work)( matrix_layout, uplo, n, ap );
 }
diff --git a/LAPACKE/src/lapacke_cpptri_work.c b/LAPACKE/src/lapacke_cpptri_work.c
index 91a54af814..8ccfa7bc09 100644
--- a/LAPACKE/src/lapacke_cpptri_work.c
+++ b/LAPACKE/src/lapacke_cpptri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpptri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpptri_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* ap )
 {
     lapack_int info = 0;
@@ -53,23 +53,23 @@ lapack_int LAPACKE_cpptri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_cpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpptri( &uplo, &n, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_cpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpptri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpptri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpptri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpptri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpptrs.c b/LAPACKE/src/lapacke_cpptrs.c
index 091c6dceb2..8d5b812bee 100644
--- a/LAPACKE/src/lapacke_cpptrs.c
+++ b/LAPACKE/src/lapacke_cpptrs.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpptrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpptrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* ap,
                            lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpptrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpptrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_cpp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_cpptrs_work( matrix_layout, uplo, n, nrhs, ap, b, ldb );
+    return API_SUFFIX(LAPACKE_cpptrs_work)( matrix_layout, uplo, n, nrhs, ap, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_cpptrs_work.c b/LAPACKE/src/lapacke_cpptrs_work.c
index b59a21fc70..2d544be656 100644
--- a/LAPACKE/src/lapacke_cpptrs_work.c
+++ b/LAPACKE/src/lapacke_cpptrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpptrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpptrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* ap,
                                 lapack_complex_float* b, lapack_int ldb )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cpptrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cpptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpptrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -69,26 +69,26 @@ lapack_int LAPACKE_cpptrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpptrs( &uplo, &n, &nrhs, ap_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpptrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpptrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpptrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpstrf.c b/LAPACKE/src/lapacke_cpstrf.c
index 630e154c55..f0711891e7 100644
--- a/LAPACKE/src/lapacke_cpstrf.c
+++ b/LAPACKE/src/lapacke_cpstrf.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpstrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpstrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_int* piv, lapack_int* rank, float tol )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpstrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpstrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_cpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( 1, &tol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &tol, 1 ) ) {
             return -8;
         }
     }
@@ -60,13 +60,13 @@ lapack_int LAPACKE_cpstrf( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cpstrf_work( matrix_layout, uplo, n, a, lda, piv, rank, tol,
+    info = API_SUFFIX(LAPACKE_cpstrf_work)( matrix_layout, uplo, n, a, lda, piv, rank, tol,
                                 work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cpstrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpstrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpstrf_work.c b/LAPACKE/src/lapacke_cpstrf_work.c
index d4f5e53d0f..bd09022335 100644
--- a/LAPACKE/src/lapacke_cpstrf_work.c
+++ b/LAPACKE/src/lapacke_cpstrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpstrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpstrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_int* piv, lapack_int* rank, float tol,
                                 float* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cpstrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cpstrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpstrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_cpstrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpstrf( &uplo, &n, a_t, &lda_t, piv, rank, &tol, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpstrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpstrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpstrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpstrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cptcon.c b/LAPACKE/src/lapacke_cptcon.c
index eb861647fc..11e83656d9 100644
--- a/LAPACKE/src/lapacke_cptcon.c
+++ b/LAPACKE/src/lapacke_cptcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cptcon( lapack_int n, const float* d,
+lapack_int API_SUFFIX(LAPACKE_cptcon)( lapack_int n, const float* d,
                            const lapack_complex_float* e, float anorm,
                            float* rcond )
 {
@@ -41,13 +41,13 @@ lapack_int LAPACKE_cptcon( lapack_int n, const float* d,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_c_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, e, 1 ) ) {
             return -3;
         }
     }
@@ -59,12 +59,12 @@ lapack_int LAPACKE_cptcon( lapack_int n, const float* d,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cptcon_work( n, d, e, anorm, rcond, work );
+    info = API_SUFFIX(LAPACKE_cptcon_work)( n, d, e, anorm, rcond, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cptcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cptcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cptcon_work.c b/LAPACKE/src/lapacke_cptcon_work.c
index 1298bda8e8..30287d931f 100644
--- a/LAPACKE/src/lapacke_cptcon_work.c
+++ b/LAPACKE/src/lapacke_cptcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cptcon_work( lapack_int n, const float* d,
+lapack_int API_SUFFIX(LAPACKE_cptcon_work)( lapack_int n, const float* d,
                                 const lapack_complex_float* e, float anorm,
                                 float* rcond, float* work )
 {
diff --git a/LAPACKE/src/lapacke_cpteqr.c b/LAPACKE/src/lapacke_cpteqr.c
index 1205a58136..dcadf0e62b 100644
--- a/LAPACKE/src/lapacke_cpteqr.c
+++ b/LAPACKE/src/lapacke_cpteqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpteqr( int matrix_layout, char compz, lapack_int n, float* d,
+lapack_int API_SUFFIX(LAPACKE_cpteqr)( int matrix_layout, char compz, lapack_int n, float* d,
                            float* e, lapack_complex_float* z, lapack_int ldz )
 {
     lapack_int info = 0;
@@ -40,27 +40,27 @@ lapack_int LAPACKE_cpteqr( int matrix_layout, char compz, lapack_int n, float* d
     lapack_int lwork;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpteqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpteqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -6;
             }
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( compz, 'n' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'n' ) ) {
         lwork = 1;
     } else {
         lwork = MAX(1,4*n-4);
@@ -72,12 +72,12 @@ lapack_int LAPACKE_cpteqr( int matrix_layout, char compz, lapack_int n, float* d
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cpteqr_work( matrix_layout, compz, n, d, e, z, ldz, work );
+    info = API_SUFFIX(LAPACKE_cpteqr_work)( matrix_layout, compz, n, d, e, z, ldz, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cpteqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpteqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpteqr_work.c b/LAPACKE/src/lapacke_cpteqr_work.c
index 501e85b45a..5ab420a9bd 100644
--- a/LAPACKE/src/lapacke_cpteqr_work.c
+++ b/LAPACKE/src/lapacke_cpteqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpteqr_work( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpteqr_work)( int matrix_layout, char compz, lapack_int n,
                                 float* d, float* e, lapack_complex_float* z,
                                 lapack_int ldz, float* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_cpteqr_work( int matrix_layout, char compz, lapack_int n,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cpteqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpteqr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,8 +60,8 @@ lapack_int LAPACKE_cpteqr_work( int matrix_layout, char compz, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_cpteqr( &compz, &n, d, e, z_t, &ldz_t, work, &info );
@@ -69,16 +69,16 @@ lapack_int LAPACKE_cpteqr_work( int matrix_layout, char compz, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         /* Release memory and exit */
         LAPACKE_free( z_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpteqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpteqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpteqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpteqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cptrfs.c b/LAPACKE/src/lapacke_cptrfs.c
index b7c7b236b9..9c789947c6 100644
--- a/LAPACKE/src/lapacke_cptrfs.c
+++ b/LAPACKE/src/lapacke_cptrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cptrfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cptrfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const float* d,
                            const lapack_complex_float* e, const float* df,
                            const lapack_complex_float* ef,
@@ -44,28 +44,28 @@ lapack_int LAPACKE_cptrfs( int matrix_layout, char uplo, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cptrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cptrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( n, df, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, df, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_c_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_c_nancheck( n-1, ef, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, ef, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -11;
         }
     }
@@ -83,7 +83,7 @@ lapack_int LAPACKE_cptrfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cptrfs_work( matrix_layout, uplo, n, nrhs, d, e, df, ef, b,
+    info = API_SUFFIX(LAPACKE_cptrfs_work)( matrix_layout, uplo, n, nrhs, d, e, df, ef, b,
                                 ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -91,7 +91,7 @@ lapack_int LAPACKE_cptrfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cptrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cptrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cptrfs_work.c b/LAPACKE/src/lapacke_cptrfs_work.c
index f2128fa3e9..25000b1001 100644
--- a/LAPACKE/src/lapacke_cptrfs_work.c
+++ b/LAPACKE/src/lapacke_cptrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cptrfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cptrfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const float* d,
                                 const lapack_complex_float* e, const float* df,
                                 const lapack_complex_float* ef,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_cptrfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cptrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cptrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_cptrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cptrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -81,8 +81,8 @@ lapack_int LAPACKE_cptrfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cptrfs( &uplo, &n, &nrhs, d, e, df, ef, b_t, &ldb_t, x_t, &ldx_t,
                        ferr, berr, work, rwork, &info );
@@ -90,18 +90,18 @@ lapack_int LAPACKE_cptrfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cptrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cptrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cptrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cptrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cptsv.c b/LAPACKE/src/lapacke_cptsv.c
index c617fb344d..50c954857b 100644
--- a/LAPACKE/src/lapacke_cptsv.c
+++ b/LAPACKE/src/lapacke_cptsv.c
@@ -32,27 +32,27 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cptsv( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_cptsv)( int matrix_layout, lapack_int n, lapack_int nrhs,
                           float* d, lapack_complex_float* e,
                           lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cptsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cptsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_c_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_cptsv_work( matrix_layout, n, nrhs, d, e, b, ldb );
+    return API_SUFFIX(LAPACKE_cptsv_work)( matrix_layout, n, nrhs, d, e, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_cptsv_work.c b/LAPACKE/src/lapacke_cptsv_work.c
index 262ea94708..70af7e5862 100644
--- a/LAPACKE/src/lapacke_cptsv_work.c
+++ b/LAPACKE/src/lapacke_cptsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cptsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_cptsv_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                float* d, lapack_complex_float* e,
                                lapack_complex_float* b, lapack_int ldb )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_cptsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cptsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cptsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_cptsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cptsv( &n, &nrhs, d, e, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cptsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cptsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cptsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cptsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cptsvx.c b/LAPACKE/src/lapacke_cptsvx.c
index ce4a51292c..ddf433531b 100644
--- a/LAPACKE/src/lapacke_cptsvx.c
+++ b/LAPACKE/src/lapacke_cptsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cptsvx( int matrix_layout, char fact, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cptsvx)( int matrix_layout, char fact, lapack_int n,
                            lapack_int nrhs, const float* d,
                            const lapack_complex_float* e, float* df,
                            lapack_complex_float* ef,
@@ -44,28 +44,28 @@ lapack_int LAPACKE_cptsvx( int matrix_layout, char fact, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cptsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cptsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_s_nancheck( n, df, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, df, 1 ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_c_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_c_nancheck( n-1, ef, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, ef, 1 ) ) {
                 return -8;
             }
         }
@@ -84,7 +84,7 @@ lapack_int LAPACKE_cptsvx( int matrix_layout, char fact, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cptsvx_work( matrix_layout, fact, n, nrhs, d, e, df, ef, b,
+    info = API_SUFFIX(LAPACKE_cptsvx_work)( matrix_layout, fact, n, nrhs, d, e, df, ef, b,
                                 ldb, x, ldx, rcond, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -92,7 +92,7 @@ lapack_int LAPACKE_cptsvx( int matrix_layout, char fact, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cptsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cptsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cptsvx_work.c b/LAPACKE/src/lapacke_cptsvx_work.c
index 5a16eb7e53..a0b7ce21bf 100644
--- a/LAPACKE/src/lapacke_cptsvx_work.c
+++ b/LAPACKE/src/lapacke_cptsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cptsvx_work( int matrix_layout, char fact, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cptsvx_work)( int matrix_layout, char fact, lapack_int n,
                                 lapack_int nrhs, const float* d,
                                 const lapack_complex_float* e, float* df,
                                 lapack_complex_float* ef,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_cptsvx_work( int matrix_layout, char fact, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cptsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cptsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_cptsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cptsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -81,7 +81,7 @@ lapack_int LAPACKE_cptsvx_work( int matrix_layout, char fact, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cptsvx( &fact, &n, &nrhs, d, e, df, ef, b_t, &ldb_t, x_t, &ldx_t,
                        rcond, ferr, berr, work, rwork, &info );
@@ -89,18 +89,18 @@ lapack_int LAPACKE_cptsvx_work( int matrix_layout, char fact, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cptsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cptsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cptsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cptsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cpttrf.c b/LAPACKE/src/lapacke_cpttrf.c
index 6dd5476aa6..1d95ff7d93 100644
--- a/LAPACKE/src/lapacke_cpttrf.c
+++ b/LAPACKE/src/lapacke_cpttrf.c
@@ -32,18 +32,18 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpttrf( lapack_int n, float* d, lapack_complex_float* e )
+lapack_int API_SUFFIX(LAPACKE_cpttrf)( lapack_int n, float* d, lapack_complex_float* e )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_c_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, e, 1 ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_cpttrf_work( n, d, e );
+    return API_SUFFIX(LAPACKE_cpttrf_work)( n, d, e );
 }
diff --git a/LAPACKE/src/lapacke_cpttrf_work.c b/LAPACKE/src/lapacke_cpttrf_work.c
index b49017814d..e31353969f 100644
--- a/LAPACKE/src/lapacke_cpttrf_work.c
+++ b/LAPACKE/src/lapacke_cpttrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpttrf_work( lapack_int n, float* d,
+lapack_int API_SUFFIX(LAPACKE_cpttrf_work)( lapack_int n, float* d,
                                 lapack_complex_float* e )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_cpttrs.c b/LAPACKE/src/lapacke_cpttrs.c
index 61d22b4962..5578443c70 100644
--- a/LAPACKE/src/lapacke_cpttrs.c
+++ b/LAPACKE/src/lapacke_cpttrs.c
@@ -32,28 +32,28 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpttrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpttrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const float* d,
                            const lapack_complex_float* e,
                            lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cpttrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpttrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_c_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_cpttrs_work( matrix_layout, uplo, n, nrhs, d, e, b, ldb );
+    return API_SUFFIX(LAPACKE_cpttrs_work)( matrix_layout, uplo, n, nrhs, d, e, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_cpttrs_work.c b/LAPACKE/src/lapacke_cpttrs_work.c
index fe9150bedf..25ade7559a 100644
--- a/LAPACKE/src/lapacke_cpttrs_work.c
+++ b/LAPACKE/src/lapacke_cpttrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cpttrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cpttrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const float* d,
                                 const lapack_complex_float* e,
                                 lapack_complex_float* b, lapack_int ldb )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cpttrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cpttrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpttrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -62,23 +62,23 @@ lapack_int LAPACKE_cpttrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cpttrs( &uplo, &n, &nrhs, d, e, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cpttrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpttrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cpttrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cpttrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cspcon.c b/LAPACKE/src/lapacke_cspcon.c
index d17277b655..ced2500d32 100644
--- a/LAPACKE/src/lapacke_cspcon.c
+++ b/LAPACKE/src/lapacke_cspcon.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cspcon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cspcon)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_float* ap,
                            const lapack_int* ipiv, float anorm, float* rcond )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cspcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cspcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_csp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_csp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
@@ -61,13 +61,13 @@ lapack_int LAPACKE_cspcon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cspcon_work( matrix_layout, uplo, n, ap, ipiv, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_cspcon_work)( matrix_layout, uplo, n, ap, ipiv, anorm, rcond,
                                 work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cspcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cspcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cspcon_work.c b/LAPACKE/src/lapacke_cspcon_work.c
index 90fffaed2f..221f4b21ad 100644
--- a/LAPACKE/src/lapacke_cspcon_work.c
+++ b/LAPACKE/src/lapacke_cspcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cspcon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cspcon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_float* ap,
                                 const lapack_int* ipiv, float anorm,
                                 float* rcond, lapack_complex_float* work )
@@ -55,7 +55,7 @@ lapack_int LAPACKE_cspcon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_csp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cspcon( &uplo, &n, ap_t, ipiv, &anorm, rcond, work, &info );
         if( info < 0 ) {
@@ -65,11 +65,11 @@ lapack_int LAPACKE_cspcon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cspcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cspcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cspcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cspcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csprfs.c b/LAPACKE/src/lapacke_csprfs.c
index 6d4a52dc4a..96fd3c5b20 100644
--- a/LAPACKE/src/lapacke_csprfs.c
+++ b/LAPACKE/src/lapacke_csprfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csprfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csprfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* ap,
                            const lapack_complex_float* afp,
                            const lapack_int* ipiv,
@@ -44,22 +44,22 @@ lapack_int LAPACKE_csprfs( int matrix_layout, char uplo, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csprfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csprfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_csp_nancheck)( n, afp ) ) {
             return -6;
         }
-        if( LAPACKE_csp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_csp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -10;
         }
     }
@@ -77,7 +77,7 @@ lapack_int LAPACKE_csprfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csprfs_work( matrix_layout, uplo, n, nrhs, ap, afp, ipiv, b,
+    info = API_SUFFIX(LAPACKE_csprfs_work)( matrix_layout, uplo, n, nrhs, ap, afp, ipiv, b,
                                 ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -85,7 +85,7 @@ lapack_int LAPACKE_csprfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csprfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csprfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csprfs_work.c b/LAPACKE/src/lapacke_csprfs_work.c
index b245cd06d7..be983eb151 100644
--- a/LAPACKE/src/lapacke_csprfs_work.c
+++ b/LAPACKE/src/lapacke_csprfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csprfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csprfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* ap,
                                 const lapack_complex_float* afp,
                                 const lapack_int* ipiv,
@@ -59,12 +59,12 @@ lapack_int LAPACKE_csprfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_csprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csprfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_csprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csprfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -97,10 +97,10 @@ lapack_int LAPACKE_csprfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
-        LAPACKE_csp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_csp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_csp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_csp_trans)( matrix_layout, uplo, n, afp, afp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csprfs( &uplo, &n, &nrhs, ap_t, afp_t, ipiv, b_t, &ldb_t, x_t,
                        &ldx_t, ferr, berr, work, rwork, &info );
@@ -108,7 +108,7 @@ lapack_int LAPACKE_csprfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( afp_t );
 exit_level_3:
@@ -119,11 +119,11 @@ lapack_int LAPACKE_csprfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csprfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csprfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csprfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cspsv.c b/LAPACKE/src/lapacke_cspsv.c
index 078356f57d..bb96c40286 100644
--- a/LAPACKE/src/lapacke_cspsv.c
+++ b/LAPACKE/src/lapacke_cspsv.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cspsv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cspsv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_float* ap,
                           lapack_int* ipiv, lapack_complex_float* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cspsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cspsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_csp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_cspsv_work( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
+    return API_SUFFIX(LAPACKE_cspsv_work)( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_cspsv_work.c b/LAPACKE/src/lapacke_cspsv_work.c
index 794e99e12a..22a5209e5f 100644
--- a/LAPACKE/src/lapacke_cspsv_work.c
+++ b/LAPACKE/src/lapacke_cspsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cspsv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cspsv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_float* ap,
                                lapack_int* ipiv, lapack_complex_float* b,
                                lapack_int ldb )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_cspsv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cspsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cspsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,27 +70,27 @@ lapack_int LAPACKE_cspsv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_csp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_csp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cspsv( &uplo, &n, &nrhs, ap_t, ipiv, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_csp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_csp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cspsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cspsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cspsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cspsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cspsvx.c b/LAPACKE/src/lapacke_cspsvx.c
index f75ac35b7d..b6435d76b8 100644
--- a/LAPACKE/src/lapacke_cspsvx.c
+++ b/LAPACKE/src/lapacke_cspsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cspsvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cspsvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* ap,
                            lapack_complex_float* afp, lapack_int* ipiv,
                            const lapack_complex_float* b, lapack_int ldb,
@@ -43,21 +43,21 @@ lapack_int LAPACKE_cspsvx( int matrix_layout, char fact, char uplo, lapack_int n
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cspsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cspsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_csp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_csp_nancheck)( n, afp ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_csp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_csp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
@@ -75,7 +75,7 @@ lapack_int LAPACKE_cspsvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cspsvx_work( matrix_layout, fact, uplo, n, nrhs, ap, afp,
+    info = API_SUFFIX(LAPACKE_cspsvx_work)( matrix_layout, fact, uplo, n, nrhs, ap, afp,
                                 ipiv, b, ldb, x, ldx, rcond, ferr, berr, work,
                                 rwork );
     /* Release memory and exit */
@@ -84,7 +84,7 @@ lapack_int LAPACKE_cspsvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cspsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cspsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cspsvx_work.c b/LAPACKE/src/lapacke_cspsvx_work.c
index b3ba12b5d7..4a0c0116be 100644
--- a/LAPACKE/src/lapacke_cspsvx_work.c
+++ b/LAPACKE/src/lapacke_cspsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cspsvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cspsvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs,
                                 const lapack_complex_float* ap,
                                 lapack_complex_float* afp, lapack_int* ipiv,
@@ -59,12 +59,12 @@ lapack_int LAPACKE_cspsvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cspsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cspsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_cspsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cspsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -97,10 +97,10 @@ lapack_int LAPACKE_cspsvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_csp_trans( matrix_layout, uplo, n, ap, ap_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_csp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_csp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_csp_trans)( matrix_layout, uplo, n, afp, afp_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_cspsvx( &fact, &uplo, &n, &nrhs, ap_t, afp_t, ipiv, b_t, &ldb_t,
@@ -109,9 +109,9 @@ lapack_int LAPACKE_cspsvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        if( LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_csp_trans( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_csp_trans)( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
         }
         /* Release memory and exit */
         LAPACKE_free( afp_t );
@@ -123,11 +123,11 @@ lapack_int LAPACKE_cspsvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cspsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cspsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cspsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cspsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csptrf.c b/LAPACKE/src/lapacke_csptrf.c
index 6ba643e25d..4d8b728e69 100644
--- a/LAPACKE/src/lapacke_csptrf.c
+++ b/LAPACKE/src/lapacke_csptrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csptrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csptrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* ap, lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csptrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csptrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_csp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_csptrf_work( matrix_layout, uplo, n, ap, ipiv );
+    return API_SUFFIX(LAPACKE_csptrf_work)( matrix_layout, uplo, n, ap, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_csptrf_work.c b/LAPACKE/src/lapacke_csptrf_work.c
index 6b640445d4..06d25d129f 100644
--- a/LAPACKE/src/lapacke_csptrf_work.c
+++ b/LAPACKE/src/lapacke_csptrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csptrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csptrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* ap, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -53,23 +53,23 @@ lapack_int LAPACKE_csptrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_csp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csptrf( &uplo, &n, ap_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_csp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csptrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csptrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csptrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csptrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csptri.c b/LAPACKE/src/lapacke_csptri.c
index 5897d74bb6..aded51773d 100644
--- a/LAPACKE/src/lapacke_csptri.c
+++ b/LAPACKE/src/lapacke_csptri.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csptri( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csptri)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* ap, const lapack_int* ipiv )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csptri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csptri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_csp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
@@ -57,12 +57,12 @@ lapack_int LAPACKE_csptri( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csptri_work( matrix_layout, uplo, n, ap, ipiv, work );
+    info = API_SUFFIX(LAPACKE_csptri_work)( matrix_layout, uplo, n, ap, ipiv, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csptri", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csptri", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csptri_work.c b/LAPACKE/src/lapacke_csptri_work.c
index 185c164a57..53a86d676a 100644
--- a/LAPACKE/src/lapacke_csptri_work.c
+++ b/LAPACKE/src/lapacke_csptri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csptri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csptri_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* ap,
                                 const lapack_int* ipiv,
                                 lapack_complex_float* work )
@@ -55,23 +55,23 @@ lapack_int LAPACKE_csptri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_csp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csptri( &uplo, &n, ap_t, ipiv, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_csp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csptri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csptri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csptri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csptri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csptrs.c b/LAPACKE/src/lapacke_csptrs.c
index ca97e4d794..bd77ddf966 100644
--- a/LAPACKE/src/lapacke_csptrs.c
+++ b/LAPACKE/src/lapacke_csptrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csptrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csptrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* ap,
                            const lapack_int* ipiv, lapack_complex_float* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csptrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csptrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_csp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_csptrs_work( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
+    return API_SUFFIX(LAPACKE_csptrs_work)( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_csptrs_work.c b/LAPACKE/src/lapacke_csptrs_work.c
index 58f3dfae93..c1bdcd45b9 100644
--- a/LAPACKE/src/lapacke_csptrs_work.c
+++ b/LAPACKE/src/lapacke_csptrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csptrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csptrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* ap,
                                 const lapack_int* ipiv, lapack_complex_float* b,
                                 lapack_int ldb )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_csptrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_csptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csptrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,26 +70,26 @@ lapack_int LAPACKE_csptrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_csp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_csp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csptrs( &uplo, &n, &nrhs, ap_t, ipiv, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csptrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csptrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csptrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cstedc.c b/LAPACKE/src/lapacke_cstedc.c
index 61cacfb148..17c172505f 100644
--- a/LAPACKE/src/lapacke_cstedc.c
+++ b/LAPACKE/src/lapacke_cstedc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cstedc( int matrix_layout, char compz, lapack_int n, float* d,
+lapack_int API_SUFFIX(LAPACKE_cstedc)( int matrix_layout, char compz, lapack_int n, float* d,
                            float* e, lapack_complex_float* z, lapack_int ldz )
 {
     lapack_int info = 0;
@@ -46,27 +46,27 @@ lapack_int LAPACKE_cstedc( int matrix_layout, char compz, lapack_int n, float* d
     float rwork_query;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cstedc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstedc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -6;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cstedc_work( matrix_layout, compz, n, d, e, z, ldz,
+    info = API_SUFFIX(LAPACKE_cstedc_work)( matrix_layout, compz, n, d, e, z, ldz,
                                 &work_query, lwork, &rwork_query, lrwork,
                                 &iwork_query, liwork );
     if( info != 0 ) {
@@ -93,7 +93,7 @@ lapack_int LAPACKE_cstedc( int matrix_layout, char compz, lapack_int n, float* d
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cstedc_work( matrix_layout, compz, n, d, e, z, ldz, work,
+    info = API_SUFFIX(LAPACKE_cstedc_work)( matrix_layout, compz, n, d, e, z, ldz, work,
                                 lwork, rwork, lrwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -103,7 +103,7 @@ lapack_int LAPACKE_cstedc( int matrix_layout, char compz, lapack_int n, float* d
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cstedc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstedc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cstedc_work.c b/LAPACKE/src/lapacke_cstedc_work.c
index 5574ea58df..f74759b7ac 100644
--- a/LAPACKE/src/lapacke_cstedc_work.c
+++ b/LAPACKE/src/lapacke_cstedc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cstedc_work( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cstedc_work)( int matrix_layout, char compz, lapack_int n,
                                 float* d, float* e, lapack_complex_float* z,
                                 lapack_int ldz, lapack_complex_float* work,
                                 lapack_int lwork, float* rwork,
@@ -53,7 +53,7 @@ lapack_int LAPACKE_cstedc_work( int matrix_layout, char compz, lapack_int n,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cstedc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstedc_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -63,7 +63,7 @@ lapack_int LAPACKE_cstedc_work( int matrix_layout, char compz, lapack_int n,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,n) );
@@ -73,8 +73,8 @@ lapack_int LAPACKE_cstedc_work( int matrix_layout, char compz, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_cstedc( &compz, &n, d, e, z_t, &ldz_t, work, &lwork, rwork,
@@ -83,20 +83,20 @@ lapack_int LAPACKE_cstedc_work( int matrix_layout, char compz, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cstedc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstedc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cstedc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstedc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cstegr.c b/LAPACKE/src/lapacke_cstegr.c
index 8d81dc1630..b11bf13c7a 100644
--- a/LAPACKE/src/lapacke_cstegr.c
+++ b/LAPACKE/src/lapacke_cstegr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cstegr( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_cstegr)( int matrix_layout, char jobz, char range,
                            lapack_int n, float* d, float* e, float vl, float vu,
                            lapack_int il, lapack_int iu, float abstol,
                            lapack_int* m, float* w, lapack_complex_float* z,
@@ -46,35 +46,35 @@ lapack_int LAPACKE_cstegr( int matrix_layout, char jobz, char range,
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cstegr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstegr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -8;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cstegr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_cstegr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, abstol, m, w, z, ldz, isuppz, &work_query,
                                 lwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -94,7 +94,7 @@ lapack_int LAPACKE_cstegr( int matrix_layout, char jobz, char range,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cstegr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_cstegr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, abstol, m, w, z, ldz, isuppz, work, lwork,
                                 iwork, liwork );
     /* Release memory and exit */
@@ -103,7 +103,7 @@ lapack_int LAPACKE_cstegr( int matrix_layout, char jobz, char range,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cstegr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstegr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cstegr_work.c b/LAPACKE/src/lapacke_cstegr_work.c
index 49f1b394db..5d4f3f100f 100644
--- a/LAPACKE/src/lapacke_cstegr_work.c
+++ b/LAPACKE/src/lapacke_cstegr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cstegr_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_cstegr_work)( int matrix_layout, char jobz, char range,
                                 lapack_int n, float* d, float* e, float vl,
                                 float vu, lapack_int il, lapack_int iu,
                                 float abstol, lapack_int* m, float* w,
@@ -54,9 +54,9 @@ lapack_int LAPACKE_cstegr_work( int matrix_layout, char jobz, char range,
         lapack_int ldz_t = MAX(1,n);
         lapack_complex_float* z_t = NULL;
         /* Check leading dimension(s) */
-        if( ( LAPACKE_lsame( jobz, 'v' ) && ( ldz < ldz_t )  ) || ( ldz < 1 ) ) {
+        if( ( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) && ( ldz < ldz_t )  ) || ( ldz < 1 ) ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_cstegr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstegr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,7 +67,7 @@ lapack_int LAPACKE_cstegr_work( int matrix_layout, char jobz, char range,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             /* Let be always 'n' instead of 'm' */
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
@@ -85,20 +85,20 @@ lapack_int LAPACKE_cstegr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, *m, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, *m, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cstegr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstegr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cstegr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstegr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cstein.c b/LAPACKE/src/lapacke_cstein.c
index 693e84aa7f..2aea218d42 100644
--- a/LAPACKE/src/lapacke_cstein.c
+++ b/LAPACKE/src/lapacke_cstein.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cstein( int matrix_layout, lapack_int n, const float* d,
+lapack_int API_SUFFIX(LAPACKE_cstein)( int matrix_layout, lapack_int n, const float* d,
                            const float* e, lapack_int m, const float* w,
                            const lapack_int* iblock, const lapack_int* isplit,
                            lapack_complex_float* z, lapack_int ldz,
@@ -42,19 +42,19 @@ lapack_int LAPACKE_cstein( int matrix_layout, lapack_int n, const float* d,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cstein", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstein", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -3;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n, w, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, w, 1 ) ) {
             return -6;
         }
     }
@@ -71,7 +71,7 @@ lapack_int LAPACKE_cstein( int matrix_layout, lapack_int n, const float* d,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cstein_work( matrix_layout, n, d, e, m, w, iblock, isplit, z,
+    info = API_SUFFIX(LAPACKE_cstein_work)( matrix_layout, n, d, e, m, w, iblock, isplit, z,
                                 ldz, work, iwork, ifailv );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -79,7 +79,7 @@ lapack_int LAPACKE_cstein( int matrix_layout, lapack_int n, const float* d,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cstein", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstein", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cstein_work.c b/LAPACKE/src/lapacke_cstein_work.c
index 53e686b471..d0af13b07a 100644
--- a/LAPACKE/src/lapacke_cstein_work.c
+++ b/LAPACKE/src/lapacke_cstein_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cstein_work( int matrix_layout, lapack_int n, const float* d,
+lapack_int API_SUFFIX(LAPACKE_cstein_work)( int matrix_layout, lapack_int n, const float* d,
                                 const float* e, lapack_int m, const float* w,
                                 const lapack_int* iblock,
                                 const lapack_int* isplit,
@@ -54,7 +54,7 @@ lapack_int LAPACKE_cstein_work( int matrix_layout, lapack_int n, const float* d,
         /* Check leading dimension(s) */
         if( ldz < m ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cstein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstein_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,16 +71,16 @@ lapack_int LAPACKE_cstein_work( int matrix_layout, lapack_int n, const float* d,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, m, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, m, z_t, ldz_t, z, ldz );
         /* Release memory and exit */
         LAPACKE_free( z_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cstein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstein_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cstein_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstein_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cstemr.c b/LAPACKE/src/lapacke_cstemr.c
index 304914526f..d3d8ff938c 100644
--- a/LAPACKE/src/lapacke_cstemr.c
+++ b/LAPACKE/src/lapacke_cstemr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cstemr( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_cstemr)( int matrix_layout, char jobz, char range,
                            lapack_int n, float* d, float* e, float vl, float vu,
                            lapack_int il, lapack_int iu, lapack_int* m,
                            float* w, lapack_complex_float* z, lapack_int ldz,
@@ -47,28 +47,28 @@ lapack_int LAPACKE_cstemr( int matrix_layout, char jobz, char range,
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cstemr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstemr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cstemr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_cstemr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, m, w, z, ldz, nzc, isuppz, tryrac,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -88,7 +88,7 @@ lapack_int LAPACKE_cstemr( int matrix_layout, char jobz, char range,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cstemr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_cstemr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, m, w, z, ldz, nzc, isuppz, tryrac, work,
                                 lwork, iwork, liwork );
     /* Release memory and exit */
@@ -97,7 +97,7 @@ lapack_int LAPACKE_cstemr( int matrix_layout, char jobz, char range,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cstemr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstemr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cstemr_work.c b/LAPACKE/src/lapacke_cstemr_work.c
index 7327bfb159..0d54b540fd 100644
--- a/LAPACKE/src/lapacke_cstemr_work.c
+++ b/LAPACKE/src/lapacke_cstemr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cstemr_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_cstemr_work)( int matrix_layout, char jobz, char range,
                                 lapack_int n, float* d, float* e, float vl,
                                 float vu, lapack_int il, lapack_int iu,
                                 lapack_int* m, float* w,
@@ -55,9 +55,9 @@ lapack_int LAPACKE_cstemr_work( int matrix_layout, char jobz, char range,
         lapack_int ldz_t = MAX(1,n);
         lapack_complex_float* z_t = NULL;
         /* Check leading dimension(s) */
-        if( ldz < 1 || ( LAPACKE_lsame( jobz, 'v' ) && ldz < n ) ) {
+        if( ldz < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) && ldz < n ) ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_cstemr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstemr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -68,7 +68,7 @@ lapack_int LAPACKE_cstemr_work( int matrix_layout, char jobz, char range,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,n) );
@@ -85,20 +85,20 @@ lapack_int LAPACKE_cstemr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cstemr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstemr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cstemr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cstemr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csteqr.c b/LAPACKE/src/lapacke_csteqr.c
index 457d70bf03..de2795981c 100644
--- a/LAPACKE/src/lapacke_csteqr.c
+++ b/LAPACKE/src/lapacke_csteqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csteqr( int matrix_layout, char compz, lapack_int n, float* d,
+lapack_int API_SUFFIX(LAPACKE_csteqr)( int matrix_layout, char compz, lapack_int n, float* d,
                            float* e, lapack_complex_float* z, lapack_int ldz )
 {
     lapack_int info = 0;
@@ -40,27 +40,27 @@ lapack_int LAPACKE_csteqr( int matrix_layout, char compz, lapack_int n, float* d
     lapack_int lwork;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csteqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csteqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -6;
             }
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( compz, 'n' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'n' ) ) {
         lwork = 1;
     } else {
         lwork = MAX(1,2*n-2);
@@ -72,12 +72,12 @@ lapack_int LAPACKE_csteqr( int matrix_layout, char compz, lapack_int n, float* d
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csteqr_work( matrix_layout, compz, n, d, e, z, ldz, work );
+    info = API_SUFFIX(LAPACKE_csteqr_work)( matrix_layout, compz, n, d, e, z, ldz, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csteqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csteqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csteqr_work.c b/LAPACKE/src/lapacke_csteqr_work.c
index 7ccbfd7bb7..45f2000e6e 100644
--- a/LAPACKE/src/lapacke_csteqr_work.c
+++ b/LAPACKE/src/lapacke_csteqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csteqr_work( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csteqr_work)( int matrix_layout, char compz, lapack_int n,
                                 float* d, float* e, lapack_complex_float* z,
                                 lapack_int ldz, float* work )
 {
@@ -49,11 +49,11 @@ lapack_int LAPACKE_csteqr_work( int matrix_layout, char compz, lapack_int n,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_csteqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csteqr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldz_t * MAX(1,n) );
@@ -63,8 +63,8 @@ lapack_int LAPACKE_csteqr_work( int matrix_layout, char compz, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_csteqr( &compz, &n, d, e, z_t, &ldz_t, work, &info );
@@ -72,20 +72,20 @@ lapack_int LAPACKE_csteqr_work( int matrix_layout, char compz, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csteqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csteqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csteqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csteqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csycon.c b/LAPACKE/src/lapacke_csycon.c
index 1472442ad3..39a61a321c 100644
--- a/LAPACKE/src/lapacke_csycon.c
+++ b/LAPACKE/src/lapacke_csycon.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csycon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csycon)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_float* a, lapack_int lda,
                            const lapack_int* ipiv, float anorm, float* rcond )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csycon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csycon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -7;
         }
     }
@@ -61,13 +61,13 @@ lapack_int LAPACKE_csycon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csycon_work( matrix_layout, uplo, n, a, lda, ipiv, anorm,
+    info = API_SUFFIX(LAPACKE_csycon_work)( matrix_layout, uplo, n, a, lda, ipiv, anorm,
                                 rcond, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csycon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csycon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csycon_3.c b/LAPACKE/src/lapacke_csycon_3.c
index bb1ad9d10a..c72b818b0d 100644
--- a/LAPACKE/src/lapacke_csycon_3.c
+++ b/LAPACKE/src/lapacke_csycon_3.c
@@ -32,28 +32,28 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csycon_3( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csycon_3)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_float* a, lapack_int lda,
                            const lapack_complex_float* e,
                            const lapack_int* ipiv, float anorm, float* rcond )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
-    lapack_int e_start = LAPACKE_lsame( uplo, 'U' ) ? 1 : 0;
+    lapack_int e_start = API_SUFFIX(LAPACKE_lsame)( uplo, 'U' ) ? 1 : 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csycon_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csycon_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_c_nancheck( n-1, e + e_start, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, e + e_start, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -8;
         }
     }
@@ -66,13 +66,13 @@ lapack_int LAPACKE_csycon_3( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csycon_3_work( matrix_layout, uplo, n, a, lda, e, ipiv, anorm,
+    info = API_SUFFIX(LAPACKE_csycon_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv, anorm,
                                 rcond, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csycon_3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csycon_3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csycon_3_work.c b/LAPACKE/src/lapacke_csycon_3_work.c
index b00e8fd96f..73b5f181f9 100644
--- a/LAPACKE/src/lapacke_csycon_3_work.c
+++ b/LAPACKE/src/lapacke_csycon_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csycon_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csycon_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_float* a, lapack_int lda,
                                 const lapack_complex_float* e,
                                 const lapack_int* ipiv, float anorm,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_csycon_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_csycon_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csycon_3_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -62,7 +62,7 @@ lapack_int LAPACKE_csycon_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csycon_3( &uplo, &n, a_t, &lda_t, e, ipiv, &anorm, rcond, work,
                        &info );
@@ -73,11 +73,11 @@ lapack_int LAPACKE_csycon_3_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csycon_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csycon_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csycon_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csycon_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csycon_work.c b/LAPACKE/src/lapacke_csycon_work.c
index 3fa8a69399..d4edce7811 100644
--- a/LAPACKE/src/lapacke_csycon_work.c
+++ b/LAPACKE/src/lapacke_csycon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csycon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csycon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_float* a, lapack_int lda,
                                 const lapack_int* ipiv, float anorm,
                                 float* rcond, lapack_complex_float* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_csycon_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_csycon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csycon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_csycon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csycon( &uplo, &n, a_t, &lda_t, ipiv, &anorm, rcond, work,
                        &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_csycon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csycon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csycon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csycon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csycon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csyconv.c b/LAPACKE/src/lapacke_csyconv.c
index b9df46e9e7..46e04daf42 100644
--- a/LAPACKE/src/lapacke_csyconv.c
+++ b/LAPACKE/src/lapacke_csyconv.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csyconv( int matrix_layout, char uplo, char way, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csyconv)( int matrix_layout, char uplo, char way, lapack_int n,
                             lapack_complex_float* a, lapack_int lda,
                             const lapack_int* ipiv,
                             lapack_complex_float* e )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csyconv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyconv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Call middle-level interface */
-    return LAPACKE_csyconv_work( matrix_layout, uplo, way, n, a, lda, ipiv, e );
+    return API_SUFFIX(LAPACKE_csyconv_work)( matrix_layout, uplo, way, n, a, lda, ipiv, e );
 }
diff --git a/LAPACKE/src/lapacke_csyconv_work.c b/LAPACKE/src/lapacke_csyconv_work.c
index be6da33396..c2210de409 100644
--- a/LAPACKE/src/lapacke_csyconv_work.c
+++ b/LAPACKE/src/lapacke_csyconv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csyconv_work( int matrix_layout, char uplo, char way,
+lapack_int API_SUFFIX(LAPACKE_csyconv_work)( int matrix_layout, char uplo, char way,
                                  lapack_int n, lapack_complex_float* a,
                                  lapack_int lda, const lapack_int* ipiv,
                                  lapack_complex_float* e )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_csyconv_work( int matrix_layout, char uplo, char way,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_csyconv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyconv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_csyconv_work( int matrix_layout, char uplo, char way,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, lda, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, lda, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csyconv( &uplo, &way, &n, a_t, &lda_t, ipiv, e, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, lda, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, lda, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csyconv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyconv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csyconv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyconv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csyequb.c b/LAPACKE/src/lapacke_csyequb.c
index e1bb1621f6..5e4b730689 100644
--- a/LAPACKE/src/lapacke_csyequb.c
+++ b/LAPACKE/src/lapacke_csyequb.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csyequb( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csyequb)( int matrix_layout, char uplo, lapack_int n,
                             const lapack_complex_float* a, lapack_int lda,
                             float* s, float* scond, float* amax )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csyequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyequb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -58,13 +58,13 @@ lapack_int LAPACKE_csyequb( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csyequb_work( matrix_layout, uplo, n, a, lda, s, scond, amax,
+    info = API_SUFFIX(LAPACKE_csyequb_work)( matrix_layout, uplo, n, a, lda, s, scond, amax,
                                  work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csyequb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyequb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csyequb_work.c b/LAPACKE/src/lapacke_csyequb_work.c
index 3469e11e00..d5055e63f1 100644
--- a/LAPACKE/src/lapacke_csyequb_work.c
+++ b/LAPACKE/src/lapacke_csyequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csyequb_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csyequb_work)( int matrix_layout, char uplo, lapack_int n,
                                  const lapack_complex_float* a, lapack_int lda,
                                  float* s, float* scond, float* amax,
                                  lapack_complex_float* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_csyequb_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_csyequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_csyequb_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csyequb( &uplo, &n, a_t, &lda_t, s, scond, amax, work, &info );
         if( info < 0 ) {
@@ -71,11 +71,11 @@ lapack_int LAPACKE_csyequb_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csyequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csyequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csyr.c b/LAPACKE/src/lapacke_csyr.c
index ea5da573f5..dec181b09f 100644
--- a/LAPACKE/src/lapacke_csyr.c
+++ b/LAPACKE/src/lapacke_csyr.c
@@ -32,29 +32,29 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csyr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csyr)( int matrix_layout, char uplo, lapack_int n,
                              lapack_complex_float alpha,
                              const lapack_complex_float* x, lapack_int incx,
                              lapack_complex_float* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csyr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_c_nancheck( 1, &alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( 1, &alpha, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_c_nancheck( n, x, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n, x, 1 ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_csyr_work( matrix_layout, uplo, n, alpha, x, incx, a,
+    return API_SUFFIX(LAPACKE_csyr_work)( matrix_layout, uplo, n, alpha, x, incx, a,
                                   lda );
 }
diff --git a/LAPACKE/src/lapacke_csyr_work.c b/LAPACKE/src/lapacke_csyr_work.c
index 2769eaa3e7..a87fe6c79e 100644
--- a/LAPACKE/src/lapacke_csyr_work.c
+++ b/LAPACKE/src/lapacke_csyr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csyr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csyr_work)( int matrix_layout, char uplo, lapack_int n,
                                   lapack_complex_float alpha,
                                   const lapack_complex_float* x,
                                   lapack_int incx, lapack_complex_float* a,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_csyr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_csyr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -62,21 +62,21 @@ lapack_int LAPACKE_csyr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csyr( &uplo, &n, &alpha, x, &incx, a_t, &lda_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csyr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csyr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csyrfs.c b/LAPACKE/src/lapacke_csyrfs.c
index b8d8b8bdc5..132a1d3a36 100644
--- a/LAPACKE/src/lapacke_csyrfs.c
+++ b/LAPACKE/src/lapacke_csyrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csyrfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csyrfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* a,
                            lapack_int lda, const lapack_complex_float* af,
                            lapack_int ldaf, const lapack_int* ipiv,
@@ -44,22 +44,22 @@ lapack_int LAPACKE_csyrfs( int matrix_layout, char uplo, lapack_int n,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csyrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -77,7 +77,7 @@ lapack_int LAPACKE_csyrfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csyrfs_work( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
+    info = API_SUFFIX(LAPACKE_csyrfs_work)( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
                                 ipiv, b, ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -85,7 +85,7 @@ lapack_int LAPACKE_csyrfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csyrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csyrfs_work.c b/LAPACKE/src/lapacke_csyrfs_work.c
index e22ce1c406..0540897a98 100644
--- a/LAPACKE/src/lapacke_csyrfs_work.c
+++ b/LAPACKE/src/lapacke_csyrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csyrfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csyrfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* a,
                                 lapack_int lda, const lapack_complex_float* af,
                                 lapack_int ldaf, const lapack_int* ipiv,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_csyrfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_csyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyrfs_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_csyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_csyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_csyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -107,10 +107,10 @@ lapack_int LAPACKE_csyrfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_csy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csyrfs( &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, ipiv, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, rwork, &info );
@@ -118,7 +118,7 @@ lapack_int LAPACKE_csyrfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -129,11 +129,11 @@ lapack_int LAPACKE_csyrfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csyrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csyrfsx.c b/LAPACKE/src/lapacke_csyrfsx.c
index 6ea79675a8..43572e9ad5 100644
--- a/LAPACKE/src/lapacke_csyrfsx.c
+++ b/LAPACKE/src/lapacke_csyrfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csyrfsx( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_csyrfsx)( int matrix_layout, char uplo, char equed,
                             lapack_int n, lapack_int nrhs,
                             const lapack_complex_float* a, lapack_int lda,
                             const lapack_complex_float* af, lapack_int ldaf,
@@ -47,32 +47,32 @@ lapack_int LAPACKE_csyrfsx( int matrix_layout, char uplo, char equed,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csyrfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyrfsx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -22;
             }
         }
-        if( LAPACKE_lsame( equed, 'y' ) ) {
-            if( LAPACKE_s_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, s, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -14;
         }
     }
@@ -90,7 +90,7 @@ lapack_int LAPACKE_csyrfsx( int matrix_layout, char uplo, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csyrfsx_work( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_csyrfsx_work)( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
                                  ldaf, ipiv, s, b, ldb, x, ldx, rcond, berr,
                                  n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, rwork );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_csyrfsx( int matrix_layout, char uplo, char equed,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csyrfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyrfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csyrfsx_work.c b/LAPACKE/src/lapacke_csyrfsx_work.c
index fa422849b8..068efe6b35 100644
--- a/LAPACKE/src/lapacke_csyrfsx_work.c
+++ b/LAPACKE/src/lapacke_csyrfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csyrfsx_work( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_csyrfsx_work)( int matrix_layout, char uplo, char equed,
                                  lapack_int n, lapack_int nrhs,
                                  const lapack_complex_float* a, lapack_int lda,
                                  const lapack_complex_float* af,
@@ -69,22 +69,22 @@ lapack_int LAPACKE_csyrfsx_work( int matrix_layout, char uplo, char equed,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_csyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyrfsx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_csyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyrfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_csyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyrfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_csyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyrfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -127,10 +127,10 @@ lapack_int LAPACKE_csyrfsx_work( int matrix_layout, char uplo, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_csy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csyrfsx( &uplo, &equed, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, s, b_t, &ldb_t, x_t, &ldx_t, rcond, berr,
@@ -140,10 +140,10 @@ lapack_int LAPACKE_csyrfsx_work( int matrix_layout, char uplo, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -159,11 +159,11 @@ lapack_int LAPACKE_csyrfsx_work( int matrix_layout, char uplo, char equed,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyrfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csyrfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyrfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csysv.c b/LAPACKE/src/lapacke_csysv.c
index 022271052a..c0930bcdcf 100644
--- a/LAPACKE/src/lapacke_csysv.c
+++ b/LAPACKE/src/lapacke_csysv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csysv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csysv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_float* a,
                           lapack_int lda, lapack_int* ipiv,
                           lapack_complex_float* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_csysv( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csysv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_csysv_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_csysv_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_csysv( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csysv_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_csysv_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csysv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csysv_aa.c b/LAPACKE/src/lapacke_csysv_aa.c
index 53f0f90326..7541bf3350 100644
--- a/LAPACKE/src/lapacke_csysv_aa.c
+++ b/LAPACKE/src/lapacke_csysv_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csysv_aa( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csysv_aa)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_float* a,
                           lapack_int lda, lapack_int* ipiv,
                           lapack_complex_float* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_csysv_aa( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csysv_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_csysv_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_csysv_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_csysv_aa( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csysv_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_csysv_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csysv_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csysv_aa_2stage.c b/LAPACKE/src/lapacke_csysv_aa_2stage.c
index db154bd91c..ee08177ebf 100644
--- a/LAPACKE/src/lapacke_csysv_aa_2stage.c
+++ b/LAPACKE/src/lapacke_csysv_aa_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csysv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csysv_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_float* a, lapack_int lda,
                           lapack_complex_float* tb, lapack_int ltb, lapack_int* ipiv, 
                           lapack_int* ipiv2, lapack_complex_float* b, lapack_int ldb )
@@ -42,25 +42,25 @@ lapack_int LAPACKE_csysv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csysv_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_csysv_aa_2stage_work( matrix_layout, uplo, n, nrhs, 
+    info = API_SUFFIX(LAPACKE_csysv_aa_2stage_work)( matrix_layout, uplo, n, nrhs, 
     						   a, lda, tb, ltb, ipiv, ipiv2, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
@@ -75,14 +75,14 @@ lapack_int LAPACKE_csysv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csysv_aa_2stage_work( matrix_layout, uplo, n, nrhs,
+    info = API_SUFFIX(LAPACKE_csysv_aa_2stage_work)( matrix_layout, uplo, n, nrhs,
                                a, lda, tb, ltb, ipiv, ipiv2, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csysv_aa_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_aa_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csysv_aa_2stage_work.c b/LAPACKE/src/lapacke_csysv_aa_2stage_work.c
index 6180de7760..afddf1f9ac 100644
--- a/LAPACKE/src/lapacke_csysv_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_csysv_aa_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csysv_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csysv_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_float* a, lapack_int lda,
                                lapack_complex_float* tb, lapack_int ltb, lapack_int* ipiv, 
                                lapack_int* ipiv2, lapack_complex_float* b, lapack_int ldb,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_csysv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_csysv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_csysv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_aa_2stage_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_csysv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_aa_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -93,8 +93,8 @@ lapack_int LAPACKE_csysv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csysv_aa_2stage( &uplo, &n, &nrhs, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, b_t, &ldb_t, work,
@@ -103,8 +103,8 @@ lapack_int LAPACKE_csysv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_2:
@@ -113,11 +113,11 @@ lapack_int LAPACKE_csysv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csysv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csysv_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csysv_aa_work.c b/LAPACKE/src/lapacke_csysv_aa_work.c
index 8abf0e0703..8a80354d14 100644
--- a/LAPACKE/src/lapacke_csysv_aa_work.c
+++ b/LAPACKE/src/lapacke_csysv_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csysv_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csysv_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_float* a,
                                lapack_int lda, lapack_int* ipiv,
                                lapack_complex_float* b, lapack_int ldb,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_csysv_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_csysv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_aa_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_csysv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_aa_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_csysv_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csysv_aa( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -92,19 +92,19 @@ lapack_int LAPACKE_csysv_aa_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csysv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csysv_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csysv_rk.c b/LAPACKE/src/lapacke_csysv_rk.c
index 9721074a15..707cb498c3 100644
--- a/LAPACKE/src/lapacke_csysv_rk.c
+++ b/LAPACKE/src/lapacke_csysv_rk.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csysv_rk( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csysv_rk)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_float* a,
                           lapack_int lda, lapack_complex_float* e,
                           lapack_int* ipiv,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_csysv_rk( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csysv_rk", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_rk", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_csysv_rk_work( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
+    info = API_SUFFIX(LAPACKE_csysv_rk_work)( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -72,13 +72,13 @@ lapack_int LAPACKE_csysv_rk( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csysv_rk_work( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
+    info = API_SUFFIX(LAPACKE_csysv_rk_work)( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csysv_rk", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_rk", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csysv_rk_work.c b/LAPACKE/src/lapacke_csysv_rk_work.c
index 71facf581f..41ed262175 100644
--- a/LAPACKE/src/lapacke_csysv_rk_work.c
+++ b/LAPACKE/src/lapacke_csysv_rk_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csysv_rk_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csysv_rk_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_float* a,
                                lapack_int lda, lapack_complex_float* e,
                                lapack_int* ipiv,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_csysv_rk_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_csysv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_rk_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_csysv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_rk_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_csysv_rk_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csysv_rk( &uplo, &n, &nrhs, a_t, &lda_t, e, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -93,19 +93,19 @@ lapack_int LAPACKE_csysv_rk_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csysv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_rk_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csysv_rk_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_rk_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csysv_rook.c b/LAPACKE/src/lapacke_csysv_rook.c
index 95dbd0d8c2..fe52fb455d 100644
--- a/LAPACKE/src/lapacke_csysv_rook.c
+++ b/LAPACKE/src/lapacke_csysv_rook.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csysv_rook( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csysv_rook)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_float* a,
                                lapack_int lda, lapack_int* ipiv,
                                lapack_complex_float* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_csysv_rook( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csysv_rook", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_rook", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_csysv_rook_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_csysv_rook_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv,
                                     b, ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_csysv_rook( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csysv_rook_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_csysv_rook_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv,
                                     b, ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csysv_rook", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_rook", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csysv_rook_work.c b/LAPACKE/src/lapacke_csysv_rook_work.c
index b3feff5b51..99aa19b96d 100644
--- a/LAPACKE/src/lapacke_csysv_rook_work.c
+++ b/LAPACKE/src/lapacke_csysv_rook_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csysv_rook_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csysv_rook_work)( int matrix_layout, char uplo, lapack_int n,
                                     lapack_int nrhs, lapack_complex_float* a,
                                     lapack_int lda, lapack_int* ipiv,
                                     lapack_complex_float* b, lapack_int ldb,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_csysv_rook_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_csysv_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_rook_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_csysv_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_rook_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_csysv_rook_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csysv_rook( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                            work, &lwork, &info );
@@ -93,19 +93,19 @@ lapack_int LAPACKE_csysv_rook_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csysv_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_rook_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csysv_rook_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_rook_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csysv_work.c b/LAPACKE/src/lapacke_csysv_work.c
index 291da4e712..d41435367d 100644
--- a/LAPACKE/src/lapacke_csysv_work.c
+++ b/LAPACKE/src/lapacke_csysv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csysv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csysv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_float* a,
                                lapack_int lda, lapack_int* ipiv,
                                lapack_complex_float* b, lapack_int ldb,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_csysv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_csysv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_csysv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_csysv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csysv( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -92,19 +92,19 @@ lapack_int LAPACKE_csysv_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csysv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csysv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csysvx.c b/LAPACKE/src/lapacke_csysvx.c
index a9e4f784d4..ada6cd4a63 100644
--- a/LAPACKE/src/lapacke_csysvx.c
+++ b/LAPACKE/src/lapacke_csysvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csysvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csysvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* af,
                            lapack_int ldaf, lapack_int* ipiv,
@@ -46,21 +46,21 @@ lapack_int LAPACKE_csysvx( int matrix_layout, char fact, char uplo, lapack_int n
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csysvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
@@ -72,7 +72,7 @@ lapack_int LAPACKE_csysvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_csysvx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_csysvx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                 ldaf, ipiv, b, ldb, x, ldx, rcond, ferr, berr,
                                 &work_query, lwork, rwork );
     if( info != 0 ) {
@@ -87,7 +87,7 @@ lapack_int LAPACKE_csysvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csysvx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_csysvx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                 ldaf, ipiv, b, ldb, x, ldx, rcond, ferr, berr,
                                 work, lwork, rwork );
     /* Release memory and exit */
@@ -96,7 +96,7 @@ lapack_int LAPACKE_csysvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csysvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csysvx_work.c b/LAPACKE/src/lapacke_csysvx_work.c
index dfd4a16392..589673e515 100644
--- a/LAPACKE/src/lapacke_csysvx_work.c
+++ b/LAPACKE/src/lapacke_csysvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csysvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_csysvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs,
                                 const lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* af, lapack_int ldaf,
@@ -63,22 +63,22 @@ lapack_int LAPACKE_csysvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_csysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysvx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_csysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_csysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_csysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysvx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -116,11 +116,11 @@ lapack_int LAPACKE_csysvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_csy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csysvx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                        ipiv, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr, berr, work,
@@ -129,11 +129,11 @@ lapack_int LAPACKE_csysvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -144,11 +144,11 @@ lapack_int LAPACKE_csysvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csysvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csysvxx.c b/LAPACKE/src/lapacke_csysvxx.c
index ae60885a4c..44ad8f3063 100644
--- a/LAPACKE/src/lapacke_csysvxx.c
+++ b/LAPACKE/src/lapacke_csysvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csysvxx( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_csysvxx)( int matrix_layout, char fact, char uplo,
                             lapack_int n, lapack_int nrhs,
                             lapack_complex_float* a, lapack_int lda,
                             lapack_complex_float* af, lapack_int ldaf,
@@ -48,30 +48,30 @@ lapack_int LAPACKE_csysvxx( int matrix_layout, char fact, char uplo,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csysvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysvxx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -24;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_s_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, s, 1 ) ) {
                 return -12;
             }
         }
@@ -90,7 +90,7 @@ lapack_int LAPACKE_csysvxx( int matrix_layout, char fact, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csysvxx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_csysvxx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                  ldaf, ipiv, equed, s, b, ldb, x, ldx, rcond,
                                  rpvgrw, berr, n_err_bnds, err_bnds_norm,
                                  err_bnds_comp, nparams, params, work, rwork );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_csysvxx( int matrix_layout, char fact, char uplo,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csysvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csysvxx_work.c b/LAPACKE/src/lapacke_csysvxx_work.c
index d2bcd301a4..6ccaf01c4b 100644
--- a/LAPACKE/src/lapacke_csysvxx_work.c
+++ b/LAPACKE/src/lapacke_csysvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csysvxx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_csysvxx_work)( int matrix_layout, char fact, char uplo,
                                  lapack_int n, lapack_int nrhs,
                                  lapack_complex_float* a, lapack_int lda,
                                  lapack_complex_float* af, lapack_int ldaf,
@@ -69,22 +69,22 @@ lapack_int LAPACKE_csysvxx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_csysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysvxx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_csysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_csysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_csysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -127,11 +127,11 @@ lapack_int LAPACKE_csysvxx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_csy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csysvxx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond, rpvgrw,
@@ -141,20 +141,20 @@ lapack_int LAPACKE_csysvxx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -170,11 +170,11 @@ lapack_int LAPACKE_csysvxx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csysvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csysvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csyswapr.c b/LAPACKE/src/lapacke_csyswapr.c
index be412876bd..c048c2d13d 100644
--- a/LAPACKE/src/lapacke_csyswapr.c
+++ b/LAPACKE/src/lapacke_csyswapr.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csyswapr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csyswapr)( int matrix_layout, char uplo, lapack_int n,
                              lapack_complex_float* a, lapack_int lda,
                              lapack_int i1, lapack_int i2 )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csyswapr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyswapr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_csyswapr_work( matrix_layout, uplo, n, a, lda, i1, i2 );
+    return API_SUFFIX(LAPACKE_csyswapr_work)( matrix_layout, uplo, n, a, lda, i1, i2 );
 }
diff --git a/LAPACKE/src/lapacke_csyswapr_work.c b/LAPACKE/src/lapacke_csyswapr_work.c
index def8e235ac..7b95a68158 100644
--- a/LAPACKE/src/lapacke_csyswapr_work.c
+++ b/LAPACKE/src/lapacke_csyswapr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csyswapr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csyswapr_work)( int matrix_layout, char uplo, lapack_int n,
                                   lapack_complex_float* a, lapack_int lda,
                                   lapack_int i1, lapack_int i2 )
 {
@@ -54,21 +54,21 @@ lapack_int LAPACKE_csyswapr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csyswapr( &uplo, &n, a_t, &lda_t, &i1, &i2 );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csyswapr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyswapr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csyswapr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csyswapr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrf.c b/LAPACKE/src/lapacke_csytrf.c
index 9b1f6b5455..ab93ed3df3 100644
--- a/LAPACKE/src/lapacke_csytrf.c
+++ b/LAPACKE/src/lapacke_csytrf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_csytrf( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_csytrf_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_csytrf_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_csytrf( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csytrf_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_csytrf_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrf_aa.c b/LAPACKE/src/lapacke_csytrf_aa.c
index 7dafe090fe..e3cb5d8a98 100644
--- a/LAPACKE/src/lapacke_csytrf_aa.c
+++ b/LAPACKE/src/lapacke_csytrf_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrf_aa( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrf_aa)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_csytrf_aa( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrf_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally csyck input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_csytrf_aa_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_csytrf_aa_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_csytrf_aa( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csytrf_aa_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_csytrf_aa_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrf_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrf_aa_2stage.c b/LAPACKE/src/lapacke_csytrf_aa_2stage.c
index 8cad47aa9a..a57b6138c5 100644
--- a/LAPACKE/src/lapacke_csytrf_aa_2stage.c
+++ b/LAPACKE/src/lapacke_csytrf_aa_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrf_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
                           lapack_complex_float* a, lapack_int lda,
                           lapack_complex_float* tb, lapack_int ltb, 
                           lapack_int* ipiv, lapack_int* ipiv2 )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_csytrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrf_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_csytrf_aa_2stage_work( matrix_layout, uplo, n, 
+    info = API_SUFFIX(LAPACKE_csytrf_aa_2stage_work)( matrix_layout, uplo, n, 
     						   a, lda, tb, ltb, ipiv, ipiv2,
                                &work_query, lwork );
     if( info != 0 ) {
@@ -72,14 +72,14 @@ lapack_int LAPACKE_csytrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csytrf_aa_2stage_work( matrix_layout, uplo, n,
+    info = API_SUFFIX(LAPACKE_csytrf_aa_2stage_work)( matrix_layout, uplo, n,
                                a, lda, tb, ltb, ipiv, ipiv2,
                                work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrf_aa_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_aa_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrf_aa_2stage_work.c b/LAPACKE/src/lapacke_csytrf_aa_2stage_work.c
index 7139a2d156..0cdb400f8d 100644
--- a/LAPACKE/src/lapacke_csytrf_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_csytrf_aa_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrf_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrf_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_complex_float* a, lapack_int lda,
                                lapack_complex_float* tb, lapack_int ltb,  
                                lapack_int* ipiv, lapack_int* ipiv2,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_csytrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_csytrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_csytrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_aa_2stage_work", info );
             return info;
         }
      
@@ -82,7 +82,7 @@ lapack_int LAPACKE_csytrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csytrf_aa_2stage( &uplo, &n, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, work,
@@ -91,18 +91,18 @@ lapack_int LAPACKE_csytrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( tb_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csytrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csytrf_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrf_aa_work.c b/LAPACKE/src/lapacke_csytrf_aa_work.c
index 1a25fcc482..60b1e8612c 100644
--- a/LAPACKE/src/lapacke_csytrf_aa_work.c
+++ b/LAPACKE/src/lapacke_csytrf_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrf_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrf_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_int* ipiv, lapack_complex_float* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_csytrf_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_csytrf_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_aa_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_csytrf_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csytrf_aa( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csytrf_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csytrf_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrf_rk.c b/LAPACKE/src/lapacke_csytrf_rk.c
index 5b21a0ad74..de844a5aad 100644
--- a/LAPACKE/src/lapacke_csytrf_rk.c
+++ b/LAPACKE/src/lapacke_csytrf_rk.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrf_rk( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrf_rk)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* e, lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_csytrf_rk( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrf_rk", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_rk", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_csytrf_rk_work( matrix_layout, uplo, n, a, lda, e, ipiv,
+    info = API_SUFFIX(LAPACKE_csytrf_rk_work)( matrix_layout, uplo, n, a, lda, e, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_csytrf_rk( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csytrf_rk_work( matrix_layout, uplo, n, a, lda, e, ipiv, work,
+    info = API_SUFFIX(LAPACKE_csytrf_rk_work)( matrix_layout, uplo, n, a, lda, e, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrf_rk", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_rk", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrf_rk_work.c b/LAPACKE/src/lapacke_csytrf_rk_work.c
index 740d917dcb..5683913308 100644
--- a/LAPACKE/src/lapacke_csytrf_rk_work.c
+++ b/LAPACKE/src/lapacke_csytrf_rk_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrf_rk_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrf_rk_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* e,
                                 lapack_int* ipiv, lapack_complex_float* work,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_csytrf_rk_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_csytrf_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_rk_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,23 +67,23 @@ lapack_int LAPACKE_csytrf_rk_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csytrf_rk( &uplo, &n, a_t, &lda_t, e, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csytrf_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_rk_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csytrf_rk_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_rk_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrf_rook.c b/LAPACKE/src/lapacke_csytrf_rook.c
index 0f76a80e9b..ef60086c82 100644
--- a/LAPACKE/src/lapacke_csytrf_rook.c
+++ b/LAPACKE/src/lapacke_csytrf_rook.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrf_rook( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrf_rook)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_csytrf_rook( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrf_rook", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_rook", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_csytrf_rook_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_csytrf_rook_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_csytrf_rook( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csytrf_rook_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_csytrf_rook_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrf_rook", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_rook", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrf_rook_work.c b/LAPACKE/src/lapacke_csytrf_rook_work.c
index 0e927ae263..666b77e2bb 100644
--- a/LAPACKE/src/lapacke_csytrf_rook_work.c
+++ b/LAPACKE/src/lapacke_csytrf_rook_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrf_rook_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrf_rook_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_int* ipiv, lapack_complex_float* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_csytrf_rook_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_csytrf_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_rook_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_csytrf_rook_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csytrf_rook( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csytrf_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_rook_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csytrf_rook_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_rook_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrf_work.c b/LAPACKE/src/lapacke_csytrf_work.c
index 5ed9fae6cb..2590522a66 100644
--- a/LAPACKE/src/lapacke_csytrf_work.c
+++ b/LAPACKE/src/lapacke_csytrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_int* ipiv, lapack_complex_float* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_csytrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_csytrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_csytrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csytrf( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csytrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csytrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytri.c b/LAPACKE/src/lapacke_csytri.c
index 14d37f6216..5a2316b3a7 100644
--- a/LAPACKE/src/lapacke_csytri.c
+++ b/LAPACKE/src/lapacke_csytri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytri( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytri)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            const lapack_int* ipiv )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csytri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -58,12 +58,12 @@ lapack_int LAPACKE_csytri( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csytri_work( matrix_layout, uplo, n, a, lda, ipiv, work );
+    info = API_SUFFIX(LAPACKE_csytri_work)( matrix_layout, uplo, n, a, lda, ipiv, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csytri", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytri2.c b/LAPACKE/src/lapacke_csytri2.c
index c9fe76d5f8..77d75b0137 100644
--- a/LAPACKE/src/lapacke_csytri2.c
+++ b/LAPACKE/src/lapacke_csytri2.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytri2( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytri2)( int matrix_layout, char uplo, lapack_int n,
                             lapack_complex_float* a, lapack_int lda,
                             const lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_csytri2( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csytri2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_csytri2_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_csytri2_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                  &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_csytri2( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csytri2_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_csytri2_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                  lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csytri2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytri2_work.c b/LAPACKE/src/lapacke_csytri2_work.c
index a1660758ff..5cb2c4f2dc 100644
--- a/LAPACKE/src/lapacke_csytri2_work.c
+++ b/LAPACKE/src/lapacke_csytri2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytri2_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytri2_work)( int matrix_layout, char uplo, lapack_int n,
                                  lapack_complex_float* a, lapack_int lda,
                                  const lapack_int* ipiv,
                                  lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_csytri2_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_csytri2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri2_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_csytri2_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csytri2( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csytri2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csytri2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytri2x.c b/LAPACKE/src/lapacke_csytri2x.c
index f47f6ca55e..646201864f 100644
--- a/LAPACKE/src/lapacke_csytri2x.c
+++ b/LAPACKE/src/lapacke_csytri2x.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytri2x( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytri2x)( int matrix_layout, char uplo, lapack_int n,
                              lapack_complex_float* a, lapack_int lda,
                              const lapack_int* ipiv, lapack_int nb )
 {
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csytri2x", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri2x", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -58,13 +58,13 @@ lapack_int LAPACKE_csytri2x( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csytri2x_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_csytri2x_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                   nb );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csytri2x", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri2x", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytri2x_work.c b/LAPACKE/src/lapacke_csytri2x_work.c
index 56b5e72021..42b384c994 100644
--- a/LAPACKE/src/lapacke_csytri2x_work.c
+++ b/LAPACKE/src/lapacke_csytri2x_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytri2x_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytri2x_work)( int matrix_layout, char uplo, lapack_int n,
                                   lapack_complex_float* a, lapack_int lda,
                                   const lapack_int* ipiv,
                                   lapack_complex_float* work, lapack_int nb )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_csytri2x_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_csytri2x_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri2x_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_csytri2x_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csytri2x( &uplo, &n, a_t, &lda_t, ipiv, work, &nb, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csytri2x_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri2x_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csytri2x_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri2x_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytri_3.c b/LAPACKE/src/lapacke_csytri_3.c
index a08dbda641..403e02c6cd 100644
--- a/LAPACKE/src/lapacke_csytri_3.c
+++ b/LAPACKE/src/lapacke_csytri_3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytri_3( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytri_3)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            const lapack_complex_float* e, const lapack_int* ipiv )
 {
@@ -40,24 +40,24 @@ lapack_int LAPACKE_csytri_3( int matrix_layout, char uplo, lapack_int n,
     lapack_int lwork = -1;
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
-    lapack_int e_start = LAPACKE_lsame( uplo, 'U' ) ? 1 : 0;
+    lapack_int e_start = API_SUFFIX(LAPACKE_lsame)( uplo, 'U' ) ? 1 : 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csytri_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_c_nancheck( n-1, e + e_start, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, e + e_start, 1 ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_csytri_3_work( matrix_layout, uplo, n, a, lda, e, ipiv,
+    info = API_SUFFIX(LAPACKE_csytri_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,12 +71,12 @@ lapack_int LAPACKE_csytri_3( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csytri_3_work( matrix_layout, uplo, n, a, lda, e, ipiv, work, lwork );
+    info = API_SUFFIX(LAPACKE_csytri_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csytri_3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri_3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytri_3_work.c b/LAPACKE/src/lapacke_csytri_3_work.c
index 5cf6448397..f5fd4073b0 100644
--- a/LAPACKE/src/lapacke_csytri_3_work.c
+++ b/LAPACKE/src/lapacke_csytri_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytri_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytri_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 const lapack_complex_float* e, const lapack_int* ipiv,
                                 lapack_complex_float* work, lapack_int lwork)
@@ -50,7 +50,7 @@ lapack_int LAPACKE_csytri_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_csytri_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri_3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_csytri_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csytri_3( &uplo, &n, a_t, &lda_t, e, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csytri_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csytri_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytri_work.c b/LAPACKE/src/lapacke_csytri_work.c
index 3fad4a5656..4ec782ae10 100644
--- a/LAPACKE/src/lapacke_csytri_work.c
+++ b/LAPACKE/src/lapacke_csytri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytri_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 const lapack_int* ipiv,
                                 lapack_complex_float* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_csytri_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_csytri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_csytri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csytri( &uplo, &n, a_t, &lda_t, ipiv, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_csy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csytri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csytri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrs.c b/LAPACKE/src/lapacke_csytrs.c
index 12356251d7..87fbd617dc 100644
--- a/LAPACKE/src/lapacke_csytrs.c
+++ b/LAPACKE/src/lapacke_csytrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* a,
                            lapack_int lda, const lapack_int* ipiv,
                            lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_csytrs_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    return API_SUFFIX(LAPACKE_csytrs_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_csytrs2.c b/LAPACKE/src/lapacke_csytrs2.c
index b7312d0d72..e6d4c5fba4 100644
--- a/LAPACKE/src/lapacke_csytrs2.c
+++ b/LAPACKE/src/lapacke_csytrs2.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrs2( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrs2)( int matrix_layout, char uplo, lapack_int n,
                             lapack_int nrhs, const lapack_complex_float* a,
                             lapack_int lda, const lapack_int* ipiv,
                             lapack_complex_float* b, lapack_int ldb )
@@ -40,16 +40,16 @@ lapack_int LAPACKE_csytrs2( int matrix_layout, char uplo, lapack_int n,
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrs2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
@@ -62,13 +62,13 @@ lapack_int LAPACKE_csytrs2( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csytrs2_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_csytrs2_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrs2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrs2_work.c b/LAPACKE/src/lapacke_csytrs2_work.c
index e2c56fbecf..fc95fd35f9 100644
--- a/LAPACKE/src/lapacke_csytrs2_work.c
+++ b/LAPACKE/src/lapacke_csytrs2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrs2_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrs2_work)( int matrix_layout, char uplo, lapack_int n,
                                  lapack_int nrhs, const lapack_complex_float* a,
                                  lapack_int lda, const lapack_int* ipiv,
                                  lapack_complex_float* b, lapack_int ldb,
@@ -53,12 +53,12 @@ lapack_int LAPACKE_csytrs2_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_csytrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs2_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_csytrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -76,8 +76,8 @@ lapack_int LAPACKE_csytrs2_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csytrs2( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                         &info );
@@ -85,18 +85,18 @@ lapack_int LAPACKE_csytrs2_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csytrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csytrs2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrs_3.c b/LAPACKE/src/lapacke_csytrs_3.c
index 628eb2617f..35a355c146 100644
--- a/LAPACKE/src/lapacke_csytrs_3.c
+++ b/LAPACKE/src/lapacke_csytrs_3.c
@@ -32,30 +32,30 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrs_3( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrs_3)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* a,
                            lapack_int lda, const lapack_complex_float* e,
                            const lapack_int* ipiv,
                            lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrs_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_c_nancheck( n, e ,1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n, e ,1 ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_csytrs_3_work( matrix_layout, uplo, n, nrhs, a, lda,
+    return API_SUFFIX(LAPACKE_csytrs_3_work)( matrix_layout, uplo, n, nrhs, a, lda,
                                   e, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_csytrs_3_work.c b/LAPACKE/src/lapacke_csytrs_3_work.c
index 5183ea6374..7d638470fe 100644
--- a/LAPACKE/src/lapacke_csytrs_3_work.c
+++ b/LAPACKE/src/lapacke_csytrs_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrs_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrs_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* a,
                                 lapack_int lda, const lapack_complex_float* e,
                                 const lapack_int* ipiv,
@@ -53,12 +53,12 @@ lapack_int LAPACKE_csytrs_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_csytrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_3_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_csytrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_3_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -76,8 +76,8 @@ lapack_int LAPACKE_csytrs_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csytrs_3( &uplo, &n, &nrhs, a_t, &lda_t, e, ipiv, b_t, &ldb_t,
                        &info );
@@ -85,18 +85,18 @@ lapack_int LAPACKE_csytrs_3_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csytrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csytrs_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrs_aa.c b/LAPACKE/src/lapacke_csytrs_aa.c
index fc71b4a3bc..bedb54935d 100644
--- a/LAPACKE/src/lapacke_csytrs_aa.c
+++ b/LAPACKE/src/lapacke_csytrs_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrs_aa( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrs_aa)( int matrix_layout, char uplo, lapack_int n,
                             lapack_int nrhs, const lapack_complex_float* a,
                             lapack_int lda, const lapack_int* ipiv,
                             lapack_complex_float* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_csytrs_aa( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrs_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally csyck input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_csytrs_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_csytrs_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_csytrs_aa( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_csytrs_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_csytrs_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrs_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrs_aa_2stage.c b/LAPACKE/src/lapacke_csytrs_aa_2stage.c
index 1396d0b500..78ae75e358 100644
--- a/LAPACKE/src/lapacke_csytrs_aa_2stage.c
+++ b/LAPACKE/src/lapacke_csytrs_aa_2stage.c
@@ -32,32 +32,32 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrs_aa_2stage( int matrix_layout, char uplo, lapack_int n,
-                          lapack_int nrhs, lapack_complex_float* a, lapack_int lda,
-                          lapack_complex_float* tb, lapack_int ltb, lapack_int* ipiv, 
-                          lapack_int* ipiv2, lapack_complex_float* b, lapack_int ldb )
+lapack_int API_SUFFIX(LAPACKE_csytrs_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
+                          lapack_int nrhs, const lapack_complex_float* a, lapack_int lda,
+                          lapack_complex_float* tb, lapack_int ltb, const lapack_int* ipiv, 
+                          const lapack_int* ipiv2, lapack_complex_float* b, lapack_int ldb )
 {
     lapack_int info = 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrs_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
 #endif
     /* Call middle-level interface */
-    info = LAPACKE_csytrs_aa_2stage_work( matrix_layout, uplo, n, nrhs,
+    info = API_SUFFIX(LAPACKE_csytrs_aa_2stage_work)( matrix_layout, uplo, n, nrhs,
                                a, lda, tb, ltb, ipiv, ipiv2, b,
                                ldb );
     
diff --git a/LAPACKE/src/lapacke_csytrs_aa_2stage_work.c b/LAPACKE/src/lapacke_csytrs_aa_2stage_work.c
index f144e470c7..1a4f2799f2 100644
--- a/LAPACKE/src/lapacke_csytrs_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_csytrs_aa_2stage_work.c
@@ -32,10 +32,10 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
-                               lapack_int nrhs, lapack_complex_float* a, lapack_int lda,
-                               lapack_complex_float* tb, lapack_int ltb, lapack_int* ipiv, 
-                               lapack_int* ipiv2, lapack_complex_float* b, lapack_int ldb )
+lapack_int API_SUFFIX(LAPACKE_csytrs_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
+                               lapack_int nrhs, const lapack_complex_float* a, lapack_int lda,
+                               lapack_complex_float* tb, lapack_int ltb, const lapack_int* ipiv,
+                               const lapack_int* ipiv2, lapack_complex_float* b, lapack_int ldb )
 {
     lapack_int info = 0;
     if( matrix_layout == LAPACK_COL_MAJOR ) {
@@ -54,17 +54,17 @@ lapack_int LAPACKE_csytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_csytrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_csytrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_aa_2stage_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_csytrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_aa_2stage_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_csytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csytrs_aa_2stage( &uplo, &n, &nrhs, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, b_t, &ldb_t, &info );
@@ -93,8 +93,7 @@ lapack_int LAPACKE_csytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_2:
@@ -103,11 +102,11 @@ lapack_int LAPACKE_csytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csytrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csytrs_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrs_aa_work.c b/LAPACKE/src/lapacke_csytrs_aa_work.c
index 1be7791b24..d748c9bfe1 100644
--- a/LAPACKE/src/lapacke_csytrs_aa_work.c
+++ b/LAPACKE/src/lapacke_csytrs_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrs_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrs_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                  lapack_int nrhs, const lapack_complex_float* a,
                                  lapack_int lda, const lapack_int* ipiv,
                                  lapack_complex_float* b, lapack_int ldb,
@@ -53,12 +53,12 @@ lapack_int LAPACKE_csytrs_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_csytrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_aa_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_csytrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_aa_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -76,8 +76,8 @@ lapack_int LAPACKE_csytrs_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csytrs_aa( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                          &lwork, &info );
@@ -85,18 +85,18 @@ lapack_int LAPACKE_csytrs_aa_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csytrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csytrs_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrs_rook.c b/LAPACKE/src/lapacke_csytrs_rook.c
index a22bc29eaf..6d5f2e4210 100644
--- a/LAPACKE/src/lapacke_csytrs_rook.c
+++ b/LAPACKE/src/lapacke_csytrs_rook.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrs_rook( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrs_rook)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_float* a,
                            lapack_int lda, const lapack_int* ipiv,
                            lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_csytrs_rook", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_rook", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_csy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_csy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_csytrs_rook_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    return API_SUFFIX(LAPACKE_csytrs_rook_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_csytrs_rook_work.c b/LAPACKE/src/lapacke_csytrs_rook_work.c
index 9683fd46d2..065fb40584 100644
--- a/LAPACKE/src/lapacke_csytrs_rook_work.c
+++ b/LAPACKE/src/lapacke_csytrs_rook_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrs_rook_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrs_rook_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* a,
                                 lapack_int lda, const lapack_int* ipiv,
                                 lapack_complex_float* b, lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_csytrs_rook_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_csytrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_rook_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_csytrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_rook_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,8 +75,8 @@ lapack_int LAPACKE_csytrs_rook_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csytrs_rook( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                        &info );
@@ -84,18 +84,18 @@ lapack_int LAPACKE_csytrs_rook_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csytrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_rook_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csytrs_rook_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_rook_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_csytrs_work.c b/LAPACKE/src/lapacke_csytrs_work.c
index c7403bb5ec..5ff07a631e 100644
--- a/LAPACKE/src/lapacke_csytrs_work.c
+++ b/LAPACKE/src/lapacke_csytrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_csytrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_csytrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_float* a,
                                 lapack_int lda, const lapack_int* ipiv,
                                 lapack_complex_float* b, lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_csytrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_csytrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_csytrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,8 +75,8 @@ lapack_int LAPACKE_csytrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_csy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_csy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_csytrs( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                        &info );
@@ -84,18 +84,18 @@ lapack_int LAPACKE_csytrs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_csytrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_csytrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_csytrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctbcon.c b/LAPACKE/src/lapacke_ctbcon.c
index 35fc065d69..002517046e 100644
--- a/LAPACKE/src/lapacke_ctbcon.c
+++ b/LAPACKE/src/lapacke_ctbcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctbcon( int matrix_layout, char norm, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_ctbcon)( int matrix_layout, char norm, char uplo, char diag,
                            lapack_int n, lapack_int kd,
                            const lapack_complex_float* ab, lapack_int ldab,
                            float* rcond )
@@ -41,13 +41,13 @@ lapack_int LAPACKE_ctbcon( int matrix_layout, char norm, char uplo, char diag,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctbcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctbcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ctb_nancheck( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_ctb_nancheck)( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
             return -7;
         }
     }
@@ -65,7 +65,7 @@ lapack_int LAPACKE_ctbcon( int matrix_layout, char norm, char uplo, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctbcon_work( matrix_layout, norm, uplo, diag, n, kd, ab, ldab,
+    info = API_SUFFIX(LAPACKE_ctbcon_work)( matrix_layout, norm, uplo, diag, n, kd, ab, ldab,
                                 rcond, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -73,7 +73,7 @@ lapack_int LAPACKE_ctbcon( int matrix_layout, char norm, char uplo, char diag,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctbcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctbcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctbcon_work.c b/LAPACKE/src/lapacke_ctbcon_work.c
index 0ffc705a32..f6a1305549 100644
--- a/LAPACKE/src/lapacke_ctbcon_work.c
+++ b/LAPACKE/src/lapacke_ctbcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctbcon_work( int matrix_layout, char norm, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ctbcon_work)( int matrix_layout, char norm, char uplo,
                                 char diag, lapack_int n, lapack_int kd,
                                 const lapack_complex_float* ab, lapack_int ldab,
                                 float* rcond, lapack_complex_float* work,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_ctbcon_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ctbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctbcon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,7 +63,7 @@ lapack_int LAPACKE_ctbcon_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ctb_trans( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_ctb_trans)( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
                            ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctbcon( &norm, &uplo, &diag, &n, &kd, ab_t, &ldab_t, rcond, work,
@@ -75,11 +75,11 @@ lapack_int LAPACKE_ctbcon_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctbcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctbcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctbcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctbrfs.c b/LAPACKE/src/lapacke_ctbrfs.c
index 62228ace9d..58a9afac5d 100644
--- a/LAPACKE/src/lapacke_ctbrfs.c
+++ b/LAPACKE/src/lapacke_ctbrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctbrfs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_ctbrfs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int kd, lapack_int nrhs,
                            const lapack_complex_float* ab, lapack_int ldab,
                            const lapack_complex_float* b, lapack_int ldb,
@@ -43,19 +43,19 @@ lapack_int LAPACKE_ctbrfs( int matrix_layout, char uplo, char trans, char diag,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctbrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctbrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ctb_nancheck( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_ctb_nancheck)( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -73,7 +73,7 @@ lapack_int LAPACKE_ctbrfs( int matrix_layout, char uplo, char trans, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctbrfs_work( matrix_layout, uplo, trans, diag, n, kd, nrhs,
+    info = API_SUFFIX(LAPACKE_ctbrfs_work)( matrix_layout, uplo, trans, diag, n, kd, nrhs,
                                 ab, ldab, b, ldb, x, ldx, ferr, berr, work,
                                 rwork );
     /* Release memory and exit */
@@ -82,7 +82,7 @@ lapack_int LAPACKE_ctbrfs( int matrix_layout, char uplo, char trans, char diag,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctbrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctbrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctbrfs_work.c b/LAPACKE/src/lapacke_ctbrfs_work.c
index 18ac02dc20..f92708aceb 100644
--- a/LAPACKE/src/lapacke_ctbrfs_work.c
+++ b/LAPACKE/src/lapacke_ctbrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctbrfs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_ctbrfs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int kd,
                                 lapack_int nrhs, const lapack_complex_float* ab,
                                 lapack_int ldab, const lapack_complex_float* b,
@@ -58,17 +58,17 @@ lapack_int LAPACKE_ctbrfs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ctbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctbrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ctbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctbrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_ctbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctbrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -93,10 +93,10 @@ lapack_int LAPACKE_ctbrfs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_ctb_trans( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_ctb_trans)( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
                            ldab_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctbrfs( &uplo, &trans, &diag, &n, &kd, &nrhs, ab_t, &ldab_t, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, rwork, &info );
@@ -111,11 +111,11 @@ lapack_int LAPACKE_ctbrfs_work( int matrix_layout, char uplo, char trans,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctbrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctbrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctbrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctbtrs.c b/LAPACKE/src/lapacke_ctbtrs.c
index 0b617f2931..4f509ae042 100644
--- a/LAPACKE/src/lapacke_ctbtrs.c
+++ b/LAPACKE/src/lapacke_ctbtrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctbtrs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_ctbtrs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int kd, lapack_int nrhs,
                            const lapack_complex_float* ab, lapack_int ldab,
                            lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctbtrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctbtrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ctb_nancheck( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_ctb_nancheck)( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
     }
 #endif
-    return LAPACKE_ctbtrs_work( matrix_layout, uplo, trans, diag, n, kd, nrhs,
+    return API_SUFFIX(LAPACKE_ctbtrs_work)( matrix_layout, uplo, trans, diag, n, kd, nrhs,
                                 ab, ldab, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_ctbtrs_work.c b/LAPACKE/src/lapacke_ctbtrs_work.c
index a4ab5cab78..3b0e15e2b9 100644
--- a/LAPACKE/src/lapacke_ctbtrs_work.c
+++ b/LAPACKE/src/lapacke_ctbtrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctbtrs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_ctbtrs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int kd,
                                 lapack_int nrhs, const lapack_complex_float* ab,
                                 lapack_int ldab, lapack_complex_float* b,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_ctbtrs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ctbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctbtrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ctbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctbtrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -77,9 +77,9 @@ lapack_int LAPACKE_ctbtrs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ctb_trans( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_ctb_trans)( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
                            ldab_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctbtrs( &uplo, &trans, &diag, &n, &kd, &nrhs, ab_t, &ldab_t, b_t,
                        &ldb_t, &info );
@@ -87,18 +87,18 @@ lapack_int LAPACKE_ctbtrs_work( int matrix_layout, char uplo, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctbtrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctbtrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctbtrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctfsm.c b/LAPACKE/src/lapacke_ctfsm.c
index 40330fb33c..1d50a59707 100644
--- a/LAPACKE/src/lapacke_ctfsm.c
+++ b/LAPACKE/src/lapacke_ctfsm.c
@@ -32,34 +32,36 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctfsm( int matrix_layout, char transr, char side, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ctfsm)( int matrix_layout, char transr, char side, char uplo,
                           char trans, char diag, lapack_int m, lapack_int n,
                           lapack_complex_float alpha,
                           const lapack_complex_float* a,
                           lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctfsm", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctfsm", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
+        lapack_int mn = m;
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
         /* Optionally check input matrices for NaNs */
         if( IS_C_NONZERO(alpha) ) {
-            if( LAPACKE_ctf_nancheck( matrix_layout, transr, uplo, diag, n, a ) ) {
+            if( API_SUFFIX(LAPACKE_ctf_nancheck)( matrix_layout, transr, uplo, diag, mn, a ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_c_nancheck( 1, &alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( 1, &alpha, 1 ) ) {
             return -9;
         }
         if( IS_C_NONZERO(alpha) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
                 return -11;
             }
         }
     }
 #endif
-    return LAPACKE_ctfsm_work( matrix_layout, transr, side, uplo, trans, diag, m,
+    return API_SUFFIX(LAPACKE_ctfsm_work)( matrix_layout, transr, side, uplo, trans, diag, m,
                                n, alpha, a, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_ctfsm_work.c b/LAPACKE/src/lapacke_ctfsm_work.c
index 7ea6ec8cc0..1916df9d5a 100644
--- a/LAPACKE/src/lapacke_ctfsm_work.c
+++ b/LAPACKE/src/lapacke_ctfsm_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctfsm_work( int matrix_layout, char transr, char side,
+lapack_int API_SUFFIX(LAPACKE_ctfsm_work)( int matrix_layout, char transr, char side,
                                char uplo, char trans, char diag, lapack_int m,
                                lapack_int n, lapack_complex_float alpha,
                                const lapack_complex_float* a,
@@ -48,12 +48,14 @@ lapack_int LAPACKE_ctfsm_work( int matrix_layout, char transr, char side,
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
         lapack_int ldb_t = MAX(1,m);
+        lapack_int mn = m;
         lapack_complex_float* b_t = NULL;
         lapack_complex_float* a_t = NULL;
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
         /* Check leading dimension(s) */
-        if( ldb < n ) {
+        if( ldb < m ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_ctfsm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctfsm_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,7 +68,7 @@ lapack_int LAPACKE_ctfsm_work( int matrix_layout, char transr, char side,
         if( IS_C_NONZERO(alpha) ) {
             a_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
-                                ( MAX(1,n) * MAX(2,n+1) ) / 2 );
+                                ( MAX(1,mn) * MAX(2,mn+1) ) / 2 );
             if( a_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_1;
@@ -74,17 +76,17 @@ lapack_int LAPACKE_ctfsm_work( int matrix_layout, char transr, char side,
         }
         /* Transpose input matrices */
         if( IS_C_NONZERO(alpha) ) {
-            LAPACKE_cge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
         }
         if( IS_C_NONZERO(alpha) ) {
-            LAPACKE_ctf_trans( matrix_layout, transr, uplo, diag, n, a, a_t );
+            API_SUFFIX(LAPACKE_ctf_trans)( matrix_layout, transr, uplo, diag, mn, a, a_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ctfsm( &transr, &side, &uplo, &trans, &diag, &m, &n, &alpha, a_t,
                       b_t, &ldb_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         if( IS_C_NONZERO(alpha) ) {
             LAPACKE_free( a_t );
@@ -93,11 +95,11 @@ lapack_int LAPACKE_ctfsm_work( int matrix_layout, char transr, char side,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctfsm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctfsm_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctfsm_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctfsm_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctftri.c b/LAPACKE/src/lapacke_ctftri.c
index 5916f9e05e..096fe72c24 100644
--- a/LAPACKE/src/lapacke_ctftri.c
+++ b/LAPACKE/src/lapacke_ctftri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctftri( int matrix_layout, char transr, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_ctftri)( int matrix_layout, char transr, char uplo, char diag,
                            lapack_int n, lapack_complex_float* a )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctftri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctftri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ctf_nancheck( matrix_layout, transr, uplo, diag, n, a ) ) {
+        if( API_SUFFIX(LAPACKE_ctf_nancheck)( matrix_layout, transr, uplo, diag, n, a ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_ctftri_work( matrix_layout, transr, uplo, diag, n, a );
+    return API_SUFFIX(LAPACKE_ctftri_work)( matrix_layout, transr, uplo, diag, n, a );
 }
diff --git a/LAPACKE/src/lapacke_ctftri_work.c b/LAPACKE/src/lapacke_ctftri_work.c
index fe135147f0..d9fb46c3ad 100644
--- a/LAPACKE/src/lapacke_ctftri_work.c
+++ b/LAPACKE/src/lapacke_ctftri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctftri_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ctftri_work)( int matrix_layout, char transr, char uplo,
                                 char diag, lapack_int n,
                                 lapack_complex_float* a )
 {
@@ -54,23 +54,23 @@ lapack_int LAPACKE_ctftri_work( int matrix_layout, char transr, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ctf_trans( matrix_layout, transr, uplo, diag, n, a, a_t );
+        API_SUFFIX(LAPACKE_ctf_trans)( matrix_layout, transr, uplo, diag, n, a, a_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctftri( &transr, &uplo, &diag, &n, a_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ctf_trans( LAPACK_COL_MAJOR, transr, uplo, diag, n, a_t, a );
+        API_SUFFIX(LAPACKE_ctf_trans)( LAPACK_COL_MAJOR, transr, uplo, diag, n, a_t, a );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctftri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctftri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctftri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctftri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctfttp.c b/LAPACKE/src/lapacke_ctfttp.c
index 6648c407c7..f26e653ea5 100644
--- a/LAPACKE/src/lapacke_ctfttp.c
+++ b/LAPACKE/src/lapacke_ctfttp.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctfttp( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ctfttp)( int matrix_layout, char transr, char uplo,
                            lapack_int n, const lapack_complex_float* arf,
                            lapack_complex_float* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctfttp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctfttp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpf_nancheck( n, arf ) ) {
+        if( API_SUFFIX(LAPACKE_cpf_nancheck)( n, arf ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_ctfttp_work( matrix_layout, transr, uplo, n, arf, ap );
+    return API_SUFFIX(LAPACKE_ctfttp_work)( matrix_layout, transr, uplo, n, arf, ap );
 }
diff --git a/LAPACKE/src/lapacke_ctfttp_work.c b/LAPACKE/src/lapacke_ctfttp_work.c
index df022e409d..119be15bfd 100644
--- a/LAPACKE/src/lapacke_ctfttp_work.c
+++ b/LAPACKE/src/lapacke_ctfttp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctfttp_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ctfttp_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, const lapack_complex_float* arf,
                                 lapack_complex_float* ap )
 {
@@ -62,25 +62,25 @@ lapack_int LAPACKE_ctfttp_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cpf_trans( matrix_layout, transr, uplo, n, arf, arf_t );
+        API_SUFFIX(LAPACKE_cpf_trans)( matrix_layout, transr, uplo, n, arf, arf_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctfttp( &transr, &uplo, &n, arf_t, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_cpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( arf_t );
 exit_level_1:
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctfttp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctfttp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctfttp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctfttp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctfttr.c b/LAPACKE/src/lapacke_ctfttr.c
index c230cf3da2..86460dd543 100644
--- a/LAPACKE/src/lapacke_ctfttr.c
+++ b/LAPACKE/src/lapacke_ctfttr.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctfttr( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ctfttr)( int matrix_layout, char transr, char uplo,
                            lapack_int n, const lapack_complex_float* arf,
                            lapack_complex_float* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctfttr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctfttr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpf_nancheck( n, arf ) ) {
+        if( API_SUFFIX(LAPACKE_cpf_nancheck)( n, arf ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_ctfttr_work( matrix_layout, transr, uplo, n, arf, a, lda );
+    return API_SUFFIX(LAPACKE_ctfttr_work)( matrix_layout, transr, uplo, n, arf, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_ctfttr_work.c b/LAPACKE/src/lapacke_ctfttr_work.c
index d0ac11a674..3e83a5ba09 100644
--- a/LAPACKE/src/lapacke_ctfttr_work.c
+++ b/LAPACKE/src/lapacke_ctfttr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctfttr_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ctfttr_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, const lapack_complex_float* arf,
                                 lapack_complex_float* a, lapack_int lda )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_ctfttr_work( int matrix_layout, char transr, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ctfttr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctfttr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -68,25 +68,25 @@ lapack_int LAPACKE_ctfttr_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cpf_trans( matrix_layout, transr, uplo, n, arf, arf_t );
+        API_SUFFIX(LAPACKE_cpf_trans)( matrix_layout, transr, uplo, n, arf, arf_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctfttr( &transr, &uplo, &n, arf_t, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( arf_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctfttr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctfttr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctfttr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctfttr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctgevc.c b/LAPACKE/src/lapacke_ctgevc.c
index 33ea8b4690..15fc954534 100644
--- a/LAPACKE/src/lapacke_ctgevc.c
+++ b/LAPACKE/src/lapacke_ctgevc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctgevc( int matrix_layout, char side, char howmny,
+lapack_int API_SUFFIX(LAPACKE_ctgevc)( int matrix_layout, char side, char howmny,
                            const lapack_logical* select, lapack_int n,
                            const lapack_complex_float* s, lapack_int lds,
                            const lapack_complex_float* p, lapack_int ldp,
@@ -44,25 +44,25 @@ lapack_int LAPACKE_ctgevc( int matrix_layout, char side, char howmny,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctgevc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgevc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, p, ldp ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, p, ldp ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, s, lds ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, s, lds ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -12;
             }
         }
@@ -81,7 +81,7 @@ lapack_int LAPACKE_ctgevc( int matrix_layout, char side, char howmny,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctgevc_work( matrix_layout, side, howmny, select, n, s, lds,
+    info = API_SUFFIX(LAPACKE_ctgevc_work)( matrix_layout, side, howmny, select, n, s, lds,
                                 p, ldp, vl, ldvl, vr, ldvr, mm, m, work,
                                 rwork );
     /* Release memory and exit */
@@ -90,7 +90,7 @@ lapack_int LAPACKE_ctgevc( int matrix_layout, char side, char howmny,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctgevc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgevc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctgevc_work.c b/LAPACKE/src/lapacke_ctgevc_work.c
index 3e3de5df0b..72d2b1b661 100644
--- a/LAPACKE/src/lapacke_ctgevc_work.c
+++ b/LAPACKE/src/lapacke_ctgevc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctgevc_work( int matrix_layout, char side, char howmny,
+lapack_int API_SUFFIX(LAPACKE_ctgevc_work)( int matrix_layout, char side, char howmny,
                                 const lapack_logical* select, lapack_int n,
                                 const lapack_complex_float* s, lapack_int lds,
                                 const lapack_complex_float* p, lapack_int ldp,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_ctgevc_work( int matrix_layout, char side, char howmny,
         /* Check leading dimension(s) */
         if( ldp < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ctgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgevc_work", info );
             return info;
         }
         if( lds < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ctgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgevc_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ctgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgevc_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_ctgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgevc_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -92,7 +92,7 @@ lapack_int LAPACKE_ctgevc_work( int matrix_layout, char side, char howmny,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             vl_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvl_t * MAX(1,mm) );
@@ -101,7 +101,7 @@ lapack_int LAPACKE_ctgevc_work( int matrix_layout, char side, char howmny,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
             vr_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvr_t * MAX(1,mm) );
@@ -111,15 +111,15 @@ lapack_int LAPACKE_ctgevc_work( int matrix_layout, char side, char howmny,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, s, lds, s_t, lds_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, p, ldp, p_t, ldp_t );
-        if( ( LAPACKE_lsame( side, 'l' ) || LAPACKE_lsame( side, 'b' ) ) &&
-            LAPACKE_lsame( howmny, 'b' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, s, lds, s_t, lds_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, p, ldp, p_t, ldp_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) || API_SUFFIX(LAPACKE_lsame)( side, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( howmny, 'b' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( ( LAPACKE_lsame( side, 'r' ) || LAPACKE_lsame( side, 'b' ) ) &&
-            LAPACKE_lsame( howmny, 'b' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) || API_SUFFIX(LAPACKE_lsame)( side, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( howmny, 'b' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ctgevc( &side, &howmny, select, &n, s_t, &lds_t, p_t, &ldp_t,
@@ -129,20 +129,20 @@ lapack_int LAPACKE_ctgevc_work( int matrix_layout, char side, char howmny,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
                                ldvl );
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
                                ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -151,11 +151,11 @@ lapack_int LAPACKE_ctgevc_work( int matrix_layout, char side, char howmny,
         LAPACKE_free( s_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgevc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctgevc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgevc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctgexc.c b/LAPACKE/src/lapacke_ctgexc.c
index f6f56e457d..70da96c4b1 100644
--- a/LAPACKE/src/lapacke_ctgexc.c
+++ b/LAPACKE/src/lapacke_ctgexc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctgexc( int matrix_layout, lapack_logical wantq,
+lapack_int API_SUFFIX(LAPACKE_ctgexc)( int matrix_layout, lapack_logical wantq,
                            lapack_logical wantz, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* b, lapack_int ldb,
@@ -41,30 +41,30 @@ lapack_int LAPACKE_ctgexc( int matrix_layout, lapack_logical wantq,
                            lapack_int ifst, lapack_int ilst )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctgexc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgexc", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -7;
         }
         if( wantq ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -9;
             }
         }
         if( wantz ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -11;
             }
         }
     }
 #endif
-    return LAPACKE_ctgexc_work( matrix_layout, wantq, wantz, n, a, lda, b, ldb,
+    return API_SUFFIX(LAPACKE_ctgexc_work)( matrix_layout, wantq, wantz, n, a, lda, b, ldb,
                                 q, ldq, z, ldz, ifst, ilst );
 }
diff --git a/LAPACKE/src/lapacke_ctgexc_work.c b/LAPACKE/src/lapacke_ctgexc_work.c
index 1b7e5ed113..6f4355c365 100644
--- a/LAPACKE/src/lapacke_ctgexc_work.c
+++ b/LAPACKE/src/lapacke_ctgexc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctgexc_work( int matrix_layout, lapack_logical wantq,
+lapack_int API_SUFFIX(LAPACKE_ctgexc_work)( int matrix_layout, lapack_logical wantq,
                                 lapack_logical wantz, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* b, lapack_int ldb,
@@ -60,22 +60,22 @@ lapack_int LAPACKE_ctgexc_work( int matrix_layout, lapack_logical wantq,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ctgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgexc_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ctgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgexc_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ctgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgexc_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_ctgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgexc_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -110,13 +110,13 @@ lapack_int LAPACKE_ctgexc_work( int matrix_layout, lapack_logical wantq,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         if( wantq ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         if( wantz ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ctgexc( &wantq, &wantz, &n, a_t, &lda_t, b_t, &ldb_t, q_t,
@@ -125,13 +125,13 @@ lapack_int LAPACKE_ctgexc_work( int matrix_layout, lapack_logical wantq,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         if( wantq ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         if( wantz ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
         if( wantz ) {
@@ -147,11 +147,11 @@ lapack_int LAPACKE_ctgexc_work( int matrix_layout, lapack_logical wantq,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgexc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctgexc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgexc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctgsen.c b/LAPACKE/src/lapacke_ctgsen.c
index c543cd44f9..65438835b7 100644
--- a/LAPACKE/src/lapacke_ctgsen.c
+++ b/LAPACKE/src/lapacke_ctgsen.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctgsen( int matrix_layout, lapack_int ijob,
+lapack_int API_SUFFIX(LAPACKE_ctgsen)( int matrix_layout, lapack_int ijob,
                            lapack_logical wantq, lapack_logical wantz,
                            const lapack_logical* select, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
@@ -51,32 +51,32 @@ lapack_int LAPACKE_ctgsen( int matrix_layout, lapack_int ijob,
     lapack_int iwork_query;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctgsen", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsen", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
         if( wantq ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -13;
             }
         }
         if( wantz ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -15;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ctgsen_work( matrix_layout, ijob, wantq, wantz, select, n, a,
+    info = API_SUFFIX(LAPACKE_ctgsen_work)( matrix_layout, ijob, wantq, wantz, select, n, a,
                                 lda, b, ldb, alpha, beta, q, ldq, z, ldz, m, pl,
                                 pr, dif, &work_query, lwork, &iwork_query,
                                 liwork );
@@ -86,12 +86,10 @@ lapack_int LAPACKE_ctgsen( int matrix_layout, lapack_int ijob,
     liwork = iwork_query;
     lwork = LAPACK_C2INT( work_query );
     /* Allocate memory for work arrays */
-    if( ijob != 0 ) {
-        iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
-        if( iwork == NULL ) {
-            info = LAPACK_WORK_MEMORY_ERROR;
-            goto exit_level_0;
-        }
+    iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
+    if( iwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
     }
     work = (lapack_complex_float*)
         LAPACKE_malloc( sizeof(lapack_complex_float) * lwork );
@@ -100,18 +98,16 @@ lapack_int LAPACKE_ctgsen( int matrix_layout, lapack_int ijob,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctgsen_work( matrix_layout, ijob, wantq, wantz, select, n, a,
+    info = API_SUFFIX(LAPACKE_ctgsen_work)( matrix_layout, ijob, wantq, wantz, select, n, a,
                                 lda, b, ldb, alpha, beta, q, ldq, z, ldz, m, pl,
                                 pr, dif, work, lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_1:
-    if( ijob != 0 ) {
-        LAPACKE_free( iwork );
-    }
+    LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctgsen", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsen", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctgsen_work.c b/LAPACKE/src/lapacke_ctgsen_work.c
index 2bf21a8f03..6eaa4c9ef2 100644
--- a/LAPACKE/src/lapacke_ctgsen_work.c
+++ b/LAPACKE/src/lapacke_ctgsen_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctgsen_work( int matrix_layout, lapack_int ijob,
+lapack_int API_SUFFIX(LAPACKE_ctgsen_work)( int matrix_layout, lapack_int ijob,
                                 lapack_logical wantq, lapack_logical wantz,
                                 const lapack_logical* select, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
@@ -66,22 +66,22 @@ lapack_int LAPACKE_ctgsen_work( int matrix_layout, lapack_int ijob,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ctgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsen_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ctgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsen_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_ctgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsen_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_ctgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsen_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -123,13 +123,13 @@ lapack_int LAPACKE_ctgsen_work( int matrix_layout, lapack_int ijob,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         if( wantq ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         if( wantz ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ctgsen( &ijob, &wantq, &wantz, select, &n, a_t, &lda_t, b_t,
@@ -139,13 +139,13 @@ lapack_int LAPACKE_ctgsen_work( int matrix_layout, lapack_int ijob,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         if( wantq ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         if( wantz ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
         if( wantz ) {
@@ -161,11 +161,11 @@ lapack_int LAPACKE_ctgsen_work( int matrix_layout, lapack_int ijob,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsen_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctgsen_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsen_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctgsja.c b/LAPACKE/src/lapacke_ctgsja.c
index f864b37bf6..4d81a186fb 100644
--- a/LAPACKE/src/lapacke_ctgsja.c
+++ b/LAPACKE/src/lapacke_ctgsja.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctgsja( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_ctgsja)( int matrix_layout, char jobu, char jobv, char jobq,
                            lapack_int m, lapack_int p, lapack_int n,
                            lapack_int k, lapack_int l, lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* b,
@@ -45,36 +45,36 @@ lapack_int LAPACKE_ctgsja( int matrix_layout, char jobu, char jobv, char jobq,
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctgsja", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsja", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -10;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( jobq, 'i' ) || LAPACKE_lsame( jobq, 'q' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -22;
             }
         }
-        if( LAPACKE_s_nancheck( 1, &tola, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &tola, 1 ) ) {
             return -14;
         }
-        if( LAPACKE_s_nancheck( 1, &tolb, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &tolb, 1 ) ) {
             return -15;
         }
-        if( LAPACKE_lsame( jobu, 'i' ) || LAPACKE_lsame( jobu, 'u' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, m, m, u, ldu ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, m, u, ldu ) ) {
                 return -18;
             }
         }
-        if( LAPACKE_lsame( jobv, 'i' ) || LAPACKE_lsame( jobv, 'v' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, p, p, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, p, p, v, ldv ) ) {
                 return -20;
             }
         }
@@ -88,14 +88,14 @@ lapack_int LAPACKE_ctgsja( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctgsja_work( matrix_layout, jobu, jobv, jobq, m, p, n, k, l,
+    info = API_SUFFIX(LAPACKE_ctgsja_work)( matrix_layout, jobu, jobv, jobq, m, p, n, k, l,
                                 a, lda, b, ldb, tola, tolb, alpha, beta, u, ldu,
                                 v, ldv, q, ldq, work, ncycle );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctgsja", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsja", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctgsja_work.c b/LAPACKE/src/lapacke_ctgsja_work.c
index 3cfa3ec528..66b1d11a25 100644
--- a/LAPACKE/src/lapacke_ctgsja_work.c
+++ b/LAPACKE/src/lapacke_ctgsja_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctgsja_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_ctgsja_work)( int matrix_layout, char jobu, char jobv,
                                 char jobq, lapack_int m, lapack_int p,
                                 lapack_int n, lapack_int k, lapack_int l,
                                 lapack_complex_float* a, lapack_int lda,
@@ -67,27 +67,27 @@ lapack_int LAPACKE_ctgsja_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ctgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsja_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_ctgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsja_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -23;
-            LAPACKE_xerbla( "LAPACKE_ctgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsja_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_ctgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsja_work", info );
             return info;
         }
         if( ldv < p ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_ctgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsja_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -103,7 +103,7 @@ lapack_int LAPACKE_ctgsja_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'i' ) || LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldu_t * MAX(1,m) );
@@ -112,7 +112,7 @@ lapack_int LAPACKE_ctgsja_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'i' ) || LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldv_t * MAX(1,p) );
@@ -121,7 +121,7 @@ lapack_int LAPACKE_ctgsja_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'i' ) || LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldq_t * MAX(1,n) );
@@ -131,16 +131,16 @@ lapack_int LAPACKE_ctgsja_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_cge_trans( matrix_layout, m, m, u, ldu, u_t, ldu_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, m, u, ldu, u_t, ldu_t );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_cge_trans( matrix_layout, p, p, v, ldv, v_t, ldv_t );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, p, p, v, ldv, v_t, ldv_t );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ctgsja( &jobu, &jobv, &jobq, &m, &p, &n, &k, &l, a_t, &lda_t,
@@ -150,27 +150,27 @@ lapack_int LAPACKE_ctgsja_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'i' ) || LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'i' ) || LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'i' ) || LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'i' ) || LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'i' ) || LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'i' ) || LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -179,11 +179,11 @@ lapack_int LAPACKE_ctgsja_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsja_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctgsja_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsja_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctgsna.c b/LAPACKE/src/lapacke_ctgsna.c
index 358836a8a5..269709aa49 100644
--- a/LAPACKE/src/lapacke_ctgsna.c
+++ b/LAPACKE/src/lapacke_ctgsna.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctgsna( int matrix_layout, char job, char howmny,
+lapack_int API_SUFFIX(LAPACKE_ctgsna)( int matrix_layout, char job, char howmny,
                            const lapack_logical* select, lapack_int n,
                            const lapack_complex_float* a, lapack_int lda,
                            const lapack_complex_float* b, lapack_int ldb,
@@ -46,32 +46,32 @@ lapack_int LAPACKE_ctgsna( int matrix_layout, char job, char howmny,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctgsna", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsna", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -12;
             }
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * MAX(1,n+2) );
         if( iwork == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -79,7 +79,7 @@ lapack_int LAPACKE_ctgsna( int matrix_layout, char job, char howmny,
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_ctgsna_work( matrix_layout, job, howmny, select, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_ctgsna_work)( matrix_layout, job, howmny, select, n, a, lda, b,
                                 ldb, vl, ldvl, vr, ldvr, s, dif, mm, m,
                                 &work_query, lwork, iwork );
     if( info != 0 ) {
@@ -87,7 +87,7 @@ lapack_int LAPACKE_ctgsna( int matrix_layout, char job, char howmny,
     }
     lwork = LAPACK_C2INT( work_query );
     /* Allocate memory for work arrays */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         work = (lapack_complex_float*)
             LAPACKE_malloc( sizeof(lapack_complex_float) * lwork );
         if( work == NULL ) {
@@ -96,20 +96,20 @@ lapack_int LAPACKE_ctgsna( int matrix_layout, char job, char howmny,
         }
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctgsna_work( matrix_layout, job, howmny, select, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_ctgsna_work)( matrix_layout, job, howmny, select, n, a, lda, b,
                                 ldb, vl, ldvl, vr, ldvr, s, dif, mm, m, work,
                                 lwork, iwork );
     /* Release memory and exit */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( work );
     }
 exit_level_1:
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( iwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctgsna", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsna", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctgsna_work.c b/LAPACKE/src/lapacke_ctgsna_work.c
index 7728527f93..2596b6e40a 100644
--- a/LAPACKE/src/lapacke_ctgsna_work.c
+++ b/LAPACKE/src/lapacke_ctgsna_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctgsna_work( int matrix_layout, char job, char howmny,
+lapack_int API_SUFFIX(LAPACKE_ctgsna_work)( int matrix_layout, char job, char howmny,
                                 const lapack_logical* select, lapack_int n,
                                 const lapack_complex_float* a, lapack_int lda,
                                 const lapack_complex_float* b, lapack_int ldb,
@@ -62,22 +62,22 @@ lapack_int LAPACKE_ctgsna_work( int matrix_layout, char job, char howmny,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ctgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsna_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ctgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsna_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ctgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsna_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_ctgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsna_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -100,7 +100,7 @@ lapack_int LAPACKE_ctgsna_work( int matrix_layout, char job, char howmny,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             vl_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvl_t * MAX(1,mm) );
@@ -109,7 +109,7 @@ lapack_int LAPACKE_ctgsna_work( int matrix_layout, char job, char howmny,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             vr_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvr_t * MAX(1,mm) );
@@ -119,13 +119,13 @@ lapack_int LAPACKE_ctgsna_work( int matrix_layout, char job, char howmny,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ctgsna( &job, &howmny, select, &n, a_t, &lda_t, b_t, &ldb_t,
@@ -135,11 +135,11 @@ lapack_int LAPACKE_ctgsna_work( int matrix_layout, char job, char howmny,
             info = info - 1;
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -148,11 +148,11 @@ lapack_int LAPACKE_ctgsna_work( int matrix_layout, char job, char howmny,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsna_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctgsna_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsna_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctgsyl.c b/LAPACKE/src/lapacke_ctgsyl.c
index 3ead5ed916..36304b8387 100644
--- a/LAPACKE/src/lapacke_ctgsyl.c
+++ b/LAPACKE/src/lapacke_ctgsyl.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctgsyl( int matrix_layout, char trans, lapack_int ijob,
+lapack_int API_SUFFIX(LAPACKE_ctgsyl)( int matrix_layout, char trans, lapack_int ijob,
                            lapack_int m, lapack_int n,
                            const lapack_complex_float* a, lapack_int lda,
                            const lapack_complex_float* b, lapack_int ldb,
@@ -48,28 +48,28 @@ lapack_int LAPACKE_ctgsyl( int matrix_layout, char trans, lapack_int ijob,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctgsyl", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsyl", -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, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, m, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, m, d, ldd ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, m, d, ldd ) ) {
             return -12;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, e, lde ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, e, lde ) ) {
             return -14;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, f, ldf ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, f, ldf ) ) {
             return -16;
         }
     }
@@ -81,7 +81,7 @@ lapack_int LAPACKE_ctgsyl( int matrix_layout, char trans, lapack_int ijob,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_ctgsyl_work( matrix_layout, trans, ijob, m, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_ctgsyl_work)( matrix_layout, trans, ijob, m, n, a, lda, b, ldb,
                                 c, ldc, d, ldd, e, lde, f, ldf, scale, dif,
                                 &work_query, lwork, iwork );
     if( info != 0 ) {
@@ -96,7 +96,7 @@ lapack_int LAPACKE_ctgsyl( int matrix_layout, char trans, lapack_int ijob,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctgsyl_work( matrix_layout, trans, ijob, m, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_ctgsyl_work)( matrix_layout, trans, ijob, m, n, a, lda, b, ldb,
                                 c, ldc, d, ldd, e, lde, f, ldf, scale, dif,
                                 work, lwork, iwork );
     /* Release memory and exit */
@@ -105,7 +105,7 @@ lapack_int LAPACKE_ctgsyl( int matrix_layout, char trans, lapack_int ijob,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctgsyl", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsyl", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctgsyl_work.c b/LAPACKE/src/lapacke_ctgsyl_work.c
index 1d0b0126ad..5fe3c8fdce 100644
--- a/LAPACKE/src/lapacke_ctgsyl_work.c
+++ b/LAPACKE/src/lapacke_ctgsyl_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctgsyl_work( int matrix_layout, char trans, lapack_int ijob,
+lapack_int API_SUFFIX(LAPACKE_ctgsyl_work)( int matrix_layout, char trans, lapack_int ijob,
                                 lapack_int m, lapack_int n,
                                 const lapack_complex_float* a, lapack_int lda,
                                 const lapack_complex_float* b, lapack_int ldb,
@@ -69,32 +69,32 @@ lapack_int LAPACKE_ctgsyl_work( int matrix_layout, char trans, lapack_int ijob,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ctgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsyl_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ctgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsyl_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ctgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsyl_work", info );
             return info;
         }
         if( ldd < m ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_ctgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsyl_work", info );
             return info;
         }
         if( lde < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_ctgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsyl_work", info );
             return info;
         }
         if( ldf < n ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_ctgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsyl_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -142,12 +142,12 @@ lapack_int LAPACKE_ctgsyl_work( int matrix_layout, char trans, lapack_int ijob,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, m, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
-        LAPACKE_cge_trans( matrix_layout, m, m, d, ldd, d_t, ldd_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, e, lde, e_t, lde_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, f, ldf, f_t, ldf_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, m, d, ldd, d_t, ldd_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, e, lde, e_t, lde_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, f, ldf, f_t, ldf_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctgsyl( &trans, &ijob, &m, &n, a_t, &lda_t, b_t, &ldb_t, c_t,
                        &ldc_t, d_t, &ldd_t, e_t, &lde_t, f_t, &ldf_t, scale,
@@ -156,8 +156,8 @@ lapack_int LAPACKE_ctgsyl_work( int matrix_layout, char trans, lapack_int ijob,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, f_t, ldf_t, f, ldf );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, f_t, ldf_t, f, ldf );
         /* Release memory and exit */
         LAPACKE_free( f_t );
 exit_level_5:
@@ -172,11 +172,11 @@ lapack_int LAPACKE_ctgsyl_work( int matrix_layout, char trans, lapack_int ijob,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsyl_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctgsyl_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctgsyl_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctpcon.c b/LAPACKE/src/lapacke_ctpcon.c
index 9a688e2ea3..e9fa3b3bed 100644
--- a/LAPACKE/src/lapacke_ctpcon.c
+++ b/LAPACKE/src/lapacke_ctpcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctpcon( int matrix_layout, char norm, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_ctpcon)( int matrix_layout, char norm, char uplo, char diag,
                            lapack_int n, const lapack_complex_float* ap,
                            float* rcond )
 {
@@ -40,13 +40,13 @@ lapack_int LAPACKE_ctpcon( int matrix_layout, char norm, char uplo, char diag,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctpcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ctp_nancheck( matrix_layout, uplo, diag, n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ctp_nancheck)( matrix_layout, uplo, diag, n, ap ) ) {
             return -6;
         }
     }
@@ -64,7 +64,7 @@ lapack_int LAPACKE_ctpcon( int matrix_layout, char norm, char uplo, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctpcon_work( matrix_layout, norm, uplo, diag, n, ap, rcond,
+    info = API_SUFFIX(LAPACKE_ctpcon_work)( matrix_layout, norm, uplo, diag, n, ap, rcond,
                                 work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -72,7 +72,7 @@ lapack_int LAPACKE_ctpcon( int matrix_layout, char norm, char uplo, char diag,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctpcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctpcon_work.c b/LAPACKE/src/lapacke_ctpcon_work.c
index e57bcc1987..1c5bc4b554 100644
--- a/LAPACKE/src/lapacke_ctpcon_work.c
+++ b/LAPACKE/src/lapacke_ctpcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctpcon_work( int matrix_layout, char norm, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ctpcon_work)( int matrix_layout, char norm, char uplo,
                                 char diag, lapack_int n,
                                 const lapack_complex_float* ap, float* rcond,
                                 lapack_complex_float* work, float* rwork )
@@ -55,7 +55,7 @@ lapack_int LAPACKE_ctpcon_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ctp_trans( matrix_layout, uplo, diag, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_ctp_trans)( matrix_layout, uplo, diag, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctpcon( &norm, &uplo, &diag, &n, ap_t, rcond, work, rwork,
                        &info );
@@ -66,11 +66,11 @@ lapack_int LAPACKE_ctpcon_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctpcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctpcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctpmqrt.c b/LAPACKE/src/lapacke_ctpmqrt.c
index 78ccd85705..9d71ecc5e8 100644
--- a/LAPACKE/src/lapacke_ctpmqrt.c
+++ b/LAPACKE/src/lapacke_ctpmqrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctpmqrt( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_ctpmqrt)( int matrix_layout, char side, char trans,
                             lapack_int m, lapack_int n, lapack_int k,
                             lapack_int l, lapack_int nb,
                             const lapack_complex_float* v, lapack_int ldv,
@@ -46,35 +46,35 @@ lapack_int LAPACKE_ctpmqrt( int matrix_layout, char side, char trans,
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctpmqrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpmqrt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        ncols_a = LAPACKE_lsame( side, 'L' ) ? n :
-                             ( LAPACKE_lsame( side, 'R' ) ? k : 0 );
-        nrows_a = LAPACKE_lsame( side, 'L' ) ? k :
-                             ( LAPACKE_lsame( side, 'R' ) ? m : 0 );
-        nrows_v = LAPACKE_lsame( side, 'L' ) ? m :
-                             ( LAPACKE_lsame( side, 'R' ) ? n : 0 );
-        if( LAPACKE_cge_nancheck( matrix_layout, nrows_a, ncols_a, a, lda ) ) {
+        ncols_a = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? k : 0 );
+        nrows_a = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? k :
+                             ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? m : 0 );
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? m :
+                             ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? n : 0 );
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, nrows_a, ncols_a, a, lda ) ) {
             return -13;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -15;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, nb, k, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, nb, k, t, ldt ) ) {
             return -11;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, nrows_v, k, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, nrows_v, k, v, ldv ) ) {
             return -9;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    lwork = LAPACKE_lsame( side, 'L' ) ? MAX(1,nb) * MAX(1,n) :
-                       ( LAPACKE_lsame( side, 'R' ) ? MAX(1,m) * MAX(1,nb) : 0 );
+    lwork = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? MAX(1,nb) * MAX(1,n) :
+                       ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? MAX(1,m) * MAX(1,nb) : 0 );
     work = (lapack_complex_float*)
         LAPACKE_malloc( sizeof(lapack_complex_float) * lwork );
     if( work == NULL ) {
@@ -82,13 +82,13 @@ lapack_int LAPACKE_ctpmqrt( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctpmqrt_work( matrix_layout, side, trans, m, n, k, l, nb, v,
+    info = API_SUFFIX(LAPACKE_ctpmqrt_work)( matrix_layout, side, trans, m, n, k, l, nb, v,
                                  ldv, t, ldt, a, lda, b, ldb, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctpmqrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpmqrt", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctpmqrt_work.c b/LAPACKE/src/lapacke_ctpmqrt_work.c
index 5ec948e7bb..afce8f8cc0 100644
--- a/LAPACKE/src/lapacke_ctpmqrt_work.c
+++ b/LAPACKE/src/lapacke_ctpmqrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctpmqrt_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_ctpmqrt_work)( int matrix_layout, char side, char trans,
                                  lapack_int m, lapack_int n, lapack_int k,
                                  lapack_int l, lapack_int nb,
                                  const lapack_complex_float* v, lapack_int ldv,
@@ -50,33 +50,41 @@ lapack_int LAPACKE_ctpmqrt_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int lda_t = MAX(1,k);
+        lapack_int nrowsA, ncolsA, nrowsV;
+        if      ( API_SUFFIX(LAPACKE_lsame)(side, 'l') ) { nrowsA = k; ncolsA = n; nrowsV = m; }
+        else if ( API_SUFFIX(LAPACKE_lsame)(side, 'r') ) { nrowsA = m; ncolsA = k; nrowsV = n; }
+        else {
+            info = -2;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpmqrt_work", info );
+            return info;
+        }
+        lapack_int lda_t = MAX(1,nrowsA);
         lapack_int ldb_t = MAX(1,m);
-        lapack_int ldt_t = MAX(1,ldt);
-        lapack_int ldv_t = MAX(1,ldv);
+        lapack_int ldt_t = MAX(1,nb);
+        lapack_int ldv_t = MAX(1,nrowsV);
         lapack_complex_float* v_t = NULL;
         lapack_complex_float* t_t = NULL;
         lapack_complex_float* a_t = NULL;
         lapack_complex_float* b_t = NULL;
         /* Check leading dimension(s) */
-        if( lda < m ) {
+        if( lda < ncolsA ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_ctpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpmqrt_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_ctpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpmqrt_work", info );
             return info;
         }
-        if( ldt < nb ) {
+        if( ldt < k ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_ctpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpmqrt_work", info );
             return info;
         }
         if( ldv < k ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ctpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpmqrt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -87,13 +95,13 @@ lapack_int LAPACKE_ctpmqrt_work( int matrix_layout, char side, char trans,
             goto exit_level_0;
         }
         t_t = (lapack_complex_float*)
-            LAPACKE_malloc( sizeof(lapack_complex_float) * ldt_t * MAX(1,nb) );
+            LAPACKE_malloc( sizeof(lapack_complex_float) * ldt_t * MAX(1,k) );
         if( t_t == NULL ) {
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
         a_t = (lapack_complex_float*)
-            LAPACKE_malloc( sizeof(lapack_complex_float) * lda_t * MAX(1,m) );
+            LAPACKE_malloc( sizeof(lapack_complex_float) * lda_t * MAX(1,ncolsA) );
         if( a_t == NULL ) {
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_2;
@@ -105,10 +113,10 @@ lapack_int LAPACKE_ctpmqrt_work( int matrix_layout, char side, char trans,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
-        LAPACKE_cge_trans( matrix_layout, ldt, nb, t, ldt, t_t, ldt_t );
-        LAPACKE_cge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_ROW_MAJOR, nrowsV, k, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_ROW_MAJOR, nb, k, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_ROW_MAJOR, nrowsA, ncolsA, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_ROW_MAJOR, m, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctpmqrt( &side, &trans, &m, &n, &k, &l, &nb, v_t, &ldv_t, t_t,
                         &ldt_t, a_t, &lda_t, b_t, &ldb_t, work, &info );
@@ -116,8 +124,8 @@ lapack_int LAPACKE_ctpmqrt_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, k, m, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nrowsA, ncolsA, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_3:
@@ -128,11 +136,11 @@ lapack_int LAPACKE_ctpmqrt_work( int matrix_layout, char side, char trans,
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpmqrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctpmqrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpmqrt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctpqrt.c b/LAPACKE/src/lapacke_ctpqrt.c
index 3c22910185..ecbc2ef68c 100644
--- a/LAPACKE/src/lapacke_ctpqrt.c
+++ b/LAPACKE/src/lapacke_ctpqrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctpqrt( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ctpqrt)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int l, lapack_int nb,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* b, lapack_int ldb,
@@ -41,16 +41,16 @@ lapack_int LAPACKE_ctpqrt( int matrix_layout, lapack_int m, lapack_int n,
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctpqrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpqrt", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -9;
         }
     }
@@ -63,13 +63,13 @@ lapack_int LAPACKE_ctpqrt( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctpqrt_work( matrix_layout, m, n, l, nb, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_ctpqrt_work)( matrix_layout, m, n, l, nb, a, lda, b, ldb,
                                 t, ldt, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctpqrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpqrt", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctpqrt2.c b/LAPACKE/src/lapacke_ctpqrt2.c
index c1ce56e6eb..da50eea76d 100644
--- a/LAPACKE/src/lapacke_ctpqrt2.c
+++ b/LAPACKE/src/lapacke_ctpqrt2.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctpqrt2( int matrix_layout,
+lapack_int API_SUFFIX(LAPACKE_ctpqrt2)( int matrix_layout,
                             lapack_int m, lapack_int n, lapack_int l,
                             lapack_complex_float* a, lapack_int lda,
                             lapack_complex_float* b, lapack_int ldb,
                             lapack_complex_float* t, lapack_int ldt )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctpqrt2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpqrt2", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_ctpqrt2_work( matrix_layout, m, n, l, a, lda, b, ldb, t, ldt );
+    return API_SUFFIX(LAPACKE_ctpqrt2_work)( matrix_layout, m, n, l, a, lda, b, ldb, t, ldt );
 }
diff --git a/LAPACKE/src/lapacke_ctpqrt2_work.c b/LAPACKE/src/lapacke_ctpqrt2_work.c
index cb5c7831d9..3e418991aa 100644
--- a/LAPACKE/src/lapacke_ctpqrt2_work.c
+++ b/LAPACKE/src/lapacke_ctpqrt2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctpqrt2_work( int matrix_layout,
+lapack_int API_SUFFIX(LAPACKE_ctpqrt2_work)( int matrix_layout,
                                  lapack_int m, lapack_int n, lapack_int l,
                                  lapack_complex_float* a, lapack_int lda,
                                  lapack_complex_float* b, lapack_int ldb,
@@ -55,17 +55,17 @@ lapack_int LAPACKE_ctpqrt2_work( int matrix_layout,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ctpqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpqrt2_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ctpqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpqrt2_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ctpqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpqrt2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -88,17 +88,17 @@ lapack_int LAPACKE_ctpqrt2_work( int matrix_layout,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctpqrt2( &m, &n, &l, a_t, &lda_t, b_t, &ldb_t, t_t, &ldt_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_2:
@@ -107,11 +107,11 @@ lapack_int LAPACKE_ctpqrt2_work( int matrix_layout,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctpqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpqrt2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctpqrt2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpqrt2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctpqrt_work.c b/LAPACKE/src/lapacke_ctpqrt_work.c
index 4ac84f3d50..010a22811c 100644
--- a/LAPACKE/src/lapacke_ctpqrt_work.c
+++ b/LAPACKE/src/lapacke_ctpqrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ctpqrt_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int l, lapack_int nb,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* b, lapack_int ldb,
@@ -57,17 +57,17 @@ lapack_int LAPACKE_ctpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ctpqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpqrt_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ctpqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpqrt_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ctpqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpqrt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -90,8 +90,8 @@ lapack_int LAPACKE_ctpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctpqrt( &m, &n, &l, &nb, a_t, &lda_t, b_t, &ldb_t, t_t, &ldt_t,
                        work, &info );
@@ -99,9 +99,9 @@ lapack_int LAPACKE_ctpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, nb, n, t_t, ldt_t, t, ldt );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nb, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_2:
@@ -110,11 +110,11 @@ lapack_int LAPACKE_ctpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctpqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpqrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctpqrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpqrt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctprfb.c b/LAPACKE/src/lapacke_ctprfb.c
index d82d269a4c..a8bd37b9d6 100644
--- a/LAPACKE/src/lapacke_ctprfb.c
+++ b/LAPACKE/src/lapacke_ctprfb.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctprfb( int matrix_layout, char side, char trans, char direct,
+lapack_int API_SUFFIX(LAPACKE_ctprfb)( int matrix_layout, char side, char trans, char direct,
                            char storev, lapack_int m, lapack_int n,
                            lapack_int k, lapack_int l,
                            const lapack_complex_float* v, lapack_int ldv,
@@ -46,7 +46,7 @@ lapack_int LAPACKE_ctprfb( int matrix_layout, char side, char trans, char direct
     lapack_int work_size;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctprfb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctprfb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
@@ -61,32 +61,32 @@ lapack_int LAPACKE_ctprfb( int matrix_layout, char side, char trans, char direct
          *   or m-by-k (right)
          * B is m-by-n
          */
-        if( LAPACKE_lsame( storev, 'C' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( storev, 'C' ) ) {
             ncols_v = k;
-            nrows_v = LAPACKE_lsame( side, 'L' ) ? m :
-                      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;
+            nrows_v = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? m :
+                      API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? n : 0;
+        } else if( API_SUFFIX(LAPACKE_lsame)( storev, 'R' ) ) {
+            ncols_v = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? m :
+                      API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? n : 0;
             nrows_v = k;
         } else {
             ncols_v = 0;
             nrows_v = 0;
         }
-        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 ) ) {
+        nrows_a = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? k :
+                  API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? m : 0;
+        ncols_a = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? n :
+                  API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? k : 0;
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, ncols_a, nrows_a, a, lda ) ) {
             return -14;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -16;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, k, k, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, k, k, t, ldt ) ) {
             return -12;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, nrows_v, ncols_v, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, nrows_v, ncols_v, v, ldv ) ) {
             return -10;
         }
     }
@@ -107,14 +107,14 @@ lapack_int LAPACKE_ctprfb( int matrix_layout, char side, char trans, char direct
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctprfb_work( matrix_layout, side, trans, direct, storev, m, n,
+    info = API_SUFFIX(LAPACKE_ctprfb_work)( matrix_layout, side, trans, direct, storev, m, n,
                                 k, l, v, ldv, t, ldt, a, lda, b, ldb, work,
                                 ldwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctprfb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctprfb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctprfb_work.c b/LAPACKE/src/lapacke_ctprfb_work.c
index 8406c1a877..4ccf11ac98 100644
--- a/LAPACKE/src/lapacke_ctprfb_work.c
+++ b/LAPACKE/src/lapacke_ctprfb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctprfb_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_ctprfb_work)( int matrix_layout, char side, char trans,
                                 char direct, char storev, lapack_int m,
                                 lapack_int n, lapack_int k, lapack_int l,
                                 const lapack_complex_float* v, lapack_int ldv,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_ctprfb_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_ctprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctprfb_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_ctprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctprfb_work", info );
             return info;
         }
         if( ldt < k ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_ctprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctprfb_work", info );
             return info;
         }
         if( ldv < k ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ctprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctprfb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -105,18 +105,18 @@ lapack_int LAPACKE_ctprfb_work( int matrix_layout, char side, char trans,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
-        LAPACKE_cge_trans( matrix_layout, ldt, k, t, ldt, t_t, ldt_t );
-        LAPACKE_cge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, ldt, k, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, k, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctprfb( &side, &trans, &direct, &storev, &m, &n, &k, &l, v_t,
                        &ldv_t, t_t, &ldt_t, a_t, &lda_t, b_t, &ldb_t, work,
                        &ldwork );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, k, m, a_t, lda_t, a, lda );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, k, m, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_3:
@@ -127,11 +127,11 @@ lapack_int LAPACKE_ctprfb_work( int matrix_layout, char side, char trans,
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctprfb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctprfb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctprfb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctprfs.c b/LAPACKE/src/lapacke_ctprfs.c
index 4d7093eae7..64d99a2114 100644
--- a/LAPACKE/src/lapacke_ctprfs.c
+++ b/LAPACKE/src/lapacke_ctprfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctprfs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_ctprfs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int nrhs,
                            const lapack_complex_float* ap,
                            const lapack_complex_float* b, lapack_int ldb,
@@ -43,19 +43,19 @@ lapack_int LAPACKE_ctprfs( int matrix_layout, char uplo, char trans, char diag,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctprfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctprfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ctp_nancheck( matrix_layout, uplo, diag, n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ctp_nancheck)( matrix_layout, uplo, diag, n, ap ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -10;
         }
     }
@@ -73,7 +73,7 @@ lapack_int LAPACKE_ctprfs( int matrix_layout, char uplo, char trans, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctprfs_work( matrix_layout, uplo, trans, diag, n, nrhs, ap, b,
+    info = API_SUFFIX(LAPACKE_ctprfs_work)( matrix_layout, uplo, trans, diag, n, nrhs, ap, b,
                                 ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -81,7 +81,7 @@ lapack_int LAPACKE_ctprfs( int matrix_layout, char uplo, char trans, char diag,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctprfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctprfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctprfs_work.c b/LAPACKE/src/lapacke_ctprfs_work.c
index 8ee69bee07..45a6d02092 100644
--- a/LAPACKE/src/lapacke_ctprfs_work.c
+++ b/LAPACKE/src/lapacke_ctprfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctprfs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_ctprfs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int nrhs,
                                 const lapack_complex_float* ap,
                                 const lapack_complex_float* b, lapack_int ldb,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_ctprfs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ctprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctprfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ctprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctprfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -88,9 +88,9 @@ lapack_int LAPACKE_ctprfs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
-        LAPACKE_ctp_trans( matrix_layout, uplo, diag, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_ctp_trans)( matrix_layout, uplo, diag, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctprfs( &uplo, &trans, &diag, &n, &nrhs, ap_t, b_t, &ldb_t, x_t,
                        &ldx_t, ferr, berr, work, rwork, &info );
@@ -105,11 +105,11 @@ lapack_int LAPACKE_ctprfs_work( int matrix_layout, char uplo, char trans,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctprfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctprfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctprfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctptri.c b/LAPACKE/src/lapacke_ctptri.c
index ae6b319195..e7bcdaf296 100644
--- a/LAPACKE/src/lapacke_ctptri.c
+++ b/LAPACKE/src/lapacke_ctptri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctptri( int matrix_layout, char uplo, char diag, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ctptri)( int matrix_layout, char uplo, char diag, lapack_int n,
                            lapack_complex_float* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctptri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctptri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ctp_nancheck( matrix_layout, uplo, diag, n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ctp_nancheck)( matrix_layout, uplo, diag, n, ap ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_ctptri_work( matrix_layout, uplo, diag, n, ap );
+    return API_SUFFIX(LAPACKE_ctptri_work)( matrix_layout, uplo, diag, n, ap );
 }
diff --git a/LAPACKE/src/lapacke_ctptri_work.c b/LAPACKE/src/lapacke_ctptri_work.c
index 583550ceb1..ff15ce0e2b 100644
--- a/LAPACKE/src/lapacke_ctptri_work.c
+++ b/LAPACKE/src/lapacke_ctptri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctptri_work( int matrix_layout, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_ctptri_work)( int matrix_layout, char uplo, char diag,
                                 lapack_int n, lapack_complex_float* ap )
 {
     lapack_int info = 0;
@@ -53,23 +53,23 @@ lapack_int LAPACKE_ctptri_work( int matrix_layout, char uplo, char diag,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ctp_trans( matrix_layout, uplo, diag, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_ctp_trans)( matrix_layout, uplo, diag, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctptri( &uplo, &diag, &n, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ctp_trans( LAPACK_COL_MAJOR, uplo, diag, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_ctp_trans)( LAPACK_COL_MAJOR, uplo, diag, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctptri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctptri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctptri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctptri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctptrs.c b/LAPACKE/src/lapacke_ctptrs.c
index b9cc0ff364..daa3b10b47 100644
--- a/LAPACKE/src/lapacke_ctptrs.c
+++ b/LAPACKE/src/lapacke_ctptrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctptrs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_ctptrs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int nrhs,
                            const lapack_complex_float* ap,
                            lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctptrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctptrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ctp_nancheck( matrix_layout, uplo, diag, n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ctp_nancheck)( matrix_layout, uplo, diag, n, ap ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_ctptrs_work( matrix_layout, uplo, trans, diag, n, nrhs, ap, b,
+    return API_SUFFIX(LAPACKE_ctptrs_work)( matrix_layout, uplo, trans, diag, n, nrhs, ap, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_ctptrs_work.c b/LAPACKE/src/lapacke_ctptrs_work.c
index 2b6de32218..8a0af2befb 100644
--- a/LAPACKE/src/lapacke_ctptrs_work.c
+++ b/LAPACKE/src/lapacke_ctptrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctptrs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_ctptrs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int nrhs,
                                 const lapack_complex_float* ap,
                                 lapack_complex_float* b, lapack_int ldb )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_ctptrs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ctptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctptrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,8 +70,8 @@ lapack_int LAPACKE_ctptrs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_ctp_trans( matrix_layout, uplo, diag, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ctp_trans)( matrix_layout, uplo, diag, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctptrs( &uplo, &trans, &diag, &n, &nrhs, ap_t, b_t, &ldb_t,
                        &info );
@@ -79,18 +79,18 @@ lapack_int LAPACKE_ctptrs_work( int matrix_layout, char uplo, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctptrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctptrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctptrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctpttf.c b/LAPACKE/src/lapacke_ctpttf.c
index 5683ca4984..6d668e9654 100644
--- a/LAPACKE/src/lapacke_ctpttf.c
+++ b/LAPACKE/src/lapacke_ctpttf.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctpttf( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ctpttf)( int matrix_layout, char transr, char uplo,
                            lapack_int n, const lapack_complex_float* ap,
                            lapack_complex_float* arf )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctpttf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpttf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_cpp_nancheck)( n, ap ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_ctpttf_work( matrix_layout, transr, uplo, n, ap, arf );
+    return API_SUFFIX(LAPACKE_ctpttf_work)( matrix_layout, transr, uplo, n, ap, arf );
 }
diff --git a/LAPACKE/src/lapacke_ctpttf_work.c b/LAPACKE/src/lapacke_ctpttf_work.c
index e34eb02406..5985a680d0 100644
--- a/LAPACKE/src/lapacke_ctpttf_work.c
+++ b/LAPACKE/src/lapacke_ctpttf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctpttf_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ctpttf_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, const lapack_complex_float* ap,
                                 lapack_complex_float* arf )
 {
@@ -62,25 +62,25 @@ lapack_int LAPACKE_ctpttf_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_cpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctpttf( &transr, &uplo, &n, ap_t, arf_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cpf_trans( LAPACK_COL_MAJOR, transr, uplo, n, arf_t, arf );
+        API_SUFFIX(LAPACKE_cpf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, arf_t, arf );
         /* Release memory and exit */
         LAPACKE_free( arf_t );
 exit_level_1:
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctpttf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpttf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctpttf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpttf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctpttr.c b/LAPACKE/src/lapacke_ctpttr.c
index 8c0445b015..a9928ac822 100644
--- a/LAPACKE/src/lapacke_ctpttr.c
+++ b/LAPACKE/src/lapacke_ctpttr.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctpttr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ctpttr)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_float* ap,
                            lapack_complex_float* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctpttr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpttr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_cpp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_ctpttr_work( matrix_layout, uplo, n, ap, a, lda );
+    return API_SUFFIX(LAPACKE_ctpttr_work)( matrix_layout, uplo, n, ap, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_ctpttr_work.c b/LAPACKE/src/lapacke_ctpttr_work.c
index 49c6863d70..fcfc5b46f5 100644
--- a/LAPACKE/src/lapacke_ctpttr_work.c
+++ b/LAPACKE/src/lapacke_ctpttr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctpttr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ctpttr_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_float* ap,
                                 lapack_complex_float* a, lapack_int lda )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_ctpttr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ctpttr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpttr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -68,25 +68,25 @@ lapack_int LAPACKE_ctpttr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_cpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctpttr( &uplo, &n, ap_t, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctpttr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpttr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctpttr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpttr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctrcon.c b/LAPACKE/src/lapacke_ctrcon.c
index e9ace28444..75d30f37f2 100644
--- a/LAPACKE/src/lapacke_ctrcon.c
+++ b/LAPACKE/src/lapacke_ctrcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrcon( int matrix_layout, char norm, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_ctrcon)( int matrix_layout, char norm, char uplo, char diag,
                            lapack_int n, const lapack_complex_float* a,
                            lapack_int lda, float* rcond )
 {
@@ -40,13 +40,13 @@ lapack_int LAPACKE_ctrcon( int matrix_layout, char norm, char uplo, char diag,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctrcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ctr_nancheck( matrix_layout, uplo, diag, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ctr_nancheck)( matrix_layout, uplo, diag, n, a, lda ) ) {
             return -6;
         }
     }
@@ -64,7 +64,7 @@ lapack_int LAPACKE_ctrcon( int matrix_layout, char norm, char uplo, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctrcon_work( matrix_layout, norm, uplo, diag, n, a, lda,
+    info = API_SUFFIX(LAPACKE_ctrcon_work)( matrix_layout, norm, uplo, diag, n, a, lda,
                                 rcond, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -72,7 +72,7 @@ lapack_int LAPACKE_ctrcon( int matrix_layout, char norm, char uplo, char diag,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctrcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctrcon_work.c b/LAPACKE/src/lapacke_ctrcon_work.c
index 8e03dfc4a4..ae1a0538fa 100644
--- a/LAPACKE/src/lapacke_ctrcon_work.c
+++ b/LAPACKE/src/lapacke_ctrcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrcon_work( int matrix_layout, char norm, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ctrcon_work)( int matrix_layout, char norm, char uplo,
                                 char diag, lapack_int n,
                                 const lapack_complex_float* a, lapack_int lda,
                                 float* rcond, lapack_complex_float* work,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_ctrcon_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ctrcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrcon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,7 +63,7 @@ lapack_int LAPACKE_ctrcon_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ctr_trans( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ctr_trans)( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctrcon( &norm, &uplo, &diag, &n, a_t, &lda_t, rcond, work, rwork,
                        &info );
@@ -74,11 +74,11 @@ lapack_int LAPACKE_ctrcon_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctrcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctrcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctrevc.c b/LAPACKE/src/lapacke_ctrevc.c
index af53062eac..0308d8e9bc 100644
--- a/LAPACKE/src/lapacke_ctrevc.c
+++ b/LAPACKE/src/lapacke_ctrevc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrevc( int matrix_layout, char side, char howmny,
+lapack_int API_SUFFIX(LAPACKE_ctrevc)( int matrix_layout, char side, char howmny,
                            const lapack_logical* select, lapack_int n,
                            lapack_complex_float* t, lapack_int ldt,
                            lapack_complex_float* vl, lapack_int ldvl,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_ctrevc( int matrix_layout, char side, char howmny,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctrevc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrevc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -10;
             }
         }
@@ -77,7 +77,7 @@ lapack_int LAPACKE_ctrevc( int matrix_layout, char side, char howmny,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctrevc_work( matrix_layout, side, howmny, select, n, t, ldt,
+    info = API_SUFFIX(LAPACKE_ctrevc_work)( matrix_layout, side, howmny, select, n, t, ldt,
                                 vl, ldvl, vr, ldvr, mm, m, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -85,7 +85,7 @@ lapack_int LAPACKE_ctrevc( int matrix_layout, char side, char howmny,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctrevc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrevc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctrevc_work.c b/LAPACKE/src/lapacke_ctrevc_work.c
index af4b366d9e..3cdb9eedde 100644
--- a/LAPACKE/src/lapacke_ctrevc_work.c
+++ b/LAPACKE/src/lapacke_ctrevc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrevc_work( int matrix_layout, char side, char howmny,
+lapack_int API_SUFFIX(LAPACKE_ctrevc_work)( int matrix_layout, char side, char howmny,
                                 const lapack_logical* select, lapack_int n,
                                 lapack_complex_float* t, lapack_int ldt,
                                 lapack_complex_float* vl, lapack_int ldvl,
@@ -58,17 +58,17 @@ lapack_int LAPACKE_ctrevc_work( int matrix_layout, char side, char howmny,
         /* Check leading dimension(s) */
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ctrevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrevc_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ctrevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrevc_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ctrevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrevc_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -78,7 +78,7 @@ lapack_int LAPACKE_ctrevc_work( int matrix_layout, char side, char howmny,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             vl_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvl_t * MAX(1,mm) );
@@ -87,7 +87,7 @@ lapack_int LAPACKE_ctrevc_work( int matrix_layout, char side, char howmny,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
             vr_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvr_t * MAX(1,mm) );
@@ -97,14 +97,14 @@ lapack_int LAPACKE_ctrevc_work( int matrix_layout, char side, char howmny,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( ( LAPACKE_lsame( side, 'l' ) || LAPACKE_lsame( side, 'b' ) ) &&
-            LAPACKE_lsame( howmny, 'b' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) || API_SUFFIX(LAPACKE_lsame)( side, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( howmny, 'b' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( ( LAPACKE_lsame( side, 'r' ) || LAPACKE_lsame( side, 'b' ) ) &&
-            LAPACKE_lsame( howmny, 'b' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) || API_SUFFIX(LAPACKE_lsame)( side, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( howmny, 'b' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ctrevc( &side, &howmny, select, &n, t_t, &ldt_t, vl_t, &ldvl_t,
@@ -113,32 +113,32 @@ lapack_int LAPACKE_ctrevc_work( int matrix_layout, char side, char howmny,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
                                ldvl );
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
                                ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( t_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctrevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrevc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctrevc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrevc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctrexc.c b/LAPACKE/src/lapacke_ctrexc.c
index dc003c8430..d69cfdacbf 100644
--- a/LAPACKE/src/lapacke_ctrexc.c
+++ b/LAPACKE/src/lapacke_ctrexc.c
@@ -32,28 +32,28 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrexc( int matrix_layout, char compq, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ctrexc)( int matrix_layout, char compq, lapack_int n,
                            lapack_complex_float* t, lapack_int ldt,
                            lapack_complex_float* q, lapack_int ldq,
                            lapack_int ifst, lapack_int ilst )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctrexc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrexc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -6;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_ctrexc_work( matrix_layout, compq, n, t, ldt, q, ldq, ifst,
+    return API_SUFFIX(LAPACKE_ctrexc_work)( matrix_layout, compq, n, t, ldt, q, ldq, ifst,
                                 ilst );
 }
diff --git a/LAPACKE/src/lapacke_ctrexc_work.c b/LAPACKE/src/lapacke_ctrexc_work.c
index 9f301b52a0..af057a9584 100644
--- a/LAPACKE/src/lapacke_ctrexc_work.c
+++ b/LAPACKE/src/lapacke_ctrexc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrexc_work( int matrix_layout, char compq, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ctrexc_work)( int matrix_layout, char compq, lapack_int n,
                                 lapack_complex_float* t, lapack_int ldt,
                                 lapack_complex_float* q, lapack_int ldq,
                                 lapack_int ifst, lapack_int ilst )
@@ -50,14 +50,14 @@ lapack_int LAPACKE_ctrexc_work( int matrix_layout, char compq, lapack_int n,
         lapack_complex_float* t_t = NULL;
         lapack_complex_float* q_t = NULL;
         /* Check leading dimension(s) */
-        if( ldq < n && LAPACKE_lsame( compq, 'v' ) ) {
+        if( ldq < n && API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ctrexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrexc_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ctrexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrexc_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -67,7 +67,7 @@ lapack_int LAPACKE_ctrexc_work( int matrix_layout, char compq, lapack_int n,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             q_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldq_t * MAX(1,n) );
@@ -77,9 +77,9 @@ lapack_int LAPACKE_ctrexc_work( int matrix_layout, char compq, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ctrexc( &compq, &n, t_t, &ldt_t, q_t, &ldq_t, &ifst, &ilst,
@@ -88,23 +88,23 @@ lapack_int LAPACKE_ctrexc_work( int matrix_layout, char compq, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( t_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctrexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrexc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctrexc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrexc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctrrfs.c b/LAPACKE/src/lapacke_ctrrfs.c
index 20019fd51c..575fcded66 100644
--- a/LAPACKE/src/lapacke_ctrrfs.c
+++ b/LAPACKE/src/lapacke_ctrrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrrfs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_ctrrfs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int nrhs,
                            const lapack_complex_float* a, lapack_int lda,
                            const lapack_complex_float* b, lapack_int ldb,
@@ -43,19 +43,19 @@ lapack_int LAPACKE_ctrrfs( int matrix_layout, char uplo, char trans, char diag,
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctrrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ctr_nancheck( matrix_layout, uplo, diag, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ctr_nancheck)( matrix_layout, uplo, diag, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -11;
         }
     }
@@ -73,7 +73,7 @@ lapack_int LAPACKE_ctrrfs( int matrix_layout, char uplo, char trans, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctrrfs_work( matrix_layout, uplo, trans, diag, n, nrhs, a,
+    info = API_SUFFIX(LAPACKE_ctrrfs_work)( matrix_layout, uplo, trans, diag, n, nrhs, a,
                                 lda, b, ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -81,7 +81,7 @@ lapack_int LAPACKE_ctrrfs( int matrix_layout, char uplo, char trans, char diag,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctrrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctrrfs_work.c b/LAPACKE/src/lapacke_ctrrfs_work.c
index d1babfeee5..a699876f25 100644
--- a/LAPACKE/src/lapacke_ctrrfs_work.c
+++ b/LAPACKE/src/lapacke_ctrrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrrfs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_ctrrfs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int nrhs,
                                 const lapack_complex_float* a, lapack_int lda,
                                 const lapack_complex_float* b, lapack_int ldb,
@@ -58,17 +58,17 @@ lapack_int LAPACKE_ctrrfs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ctrrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ctrrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_ctrrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -93,9 +93,9 @@ lapack_int LAPACKE_ctrrfs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_ctr_trans( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_ctr_trans)( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctrrfs( &uplo, &trans, &diag, &n, &nrhs, a_t, &lda_t, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, rwork, &info );
@@ -110,11 +110,11 @@ lapack_int LAPACKE_ctrrfs_work( int matrix_layout, char uplo, char trans,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctrrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctrrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctrsen.c b/LAPACKE/src/lapacke_ctrsen.c
index f7a57c6701..6bfcc8f5f3 100644
--- a/LAPACKE/src/lapacke_ctrsen.c
+++ b/LAPACKE/src/lapacke_ctrsen.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrsen( int matrix_layout, char job, char compq,
+lapack_int API_SUFFIX(LAPACKE_ctrsen)( int matrix_layout, char job, char compq,
                            const lapack_logical* select, lapack_int n,
                            lapack_complex_float* t, lapack_int ldt,
                            lapack_complex_float* q, lapack_int ldq,
@@ -44,24 +44,24 @@ lapack_int LAPACKE_ctrsen( int matrix_layout, char job, char compq,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctrsen", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsen", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ctrsen_work( matrix_layout, job, compq, select, n, t, ldt, q,
+    info = API_SUFFIX(LAPACKE_ctrsen_work)( matrix_layout, job, compq, select, n, t, ldt, q,
                                 ldq, w, m, s, sep, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_ctrsen( int matrix_layout, char job, char compq,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctrsen_work( matrix_layout, job, compq, select, n, t, ldt, q,
+    info = API_SUFFIX(LAPACKE_ctrsen_work)( matrix_layout, job, compq, select, n, t, ldt, q,
                                 ldq, w, m, s, sep, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctrsen", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsen", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctrsen_work.c b/LAPACKE/src/lapacke_ctrsen_work.c
index 8959d5ce8f..c27589c783 100644
--- a/LAPACKE/src/lapacke_ctrsen_work.c
+++ b/LAPACKE/src/lapacke_ctrsen_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrsen_work( int matrix_layout, char job, char compq,
+lapack_int API_SUFFIX(LAPACKE_ctrsen_work)( int matrix_layout, char job, char compq,
                                 const lapack_logical* select, lapack_int n,
                                 lapack_complex_float* t, lapack_int ldt,
                                 lapack_complex_float* q, lapack_int ldq,
@@ -56,12 +56,12 @@ lapack_int LAPACKE_ctrsen_work( int matrix_layout, char job, char compq,
         /* Check leading dimension(s) */
         if( ldq < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ctrsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsen_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ctrsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsen_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -77,7 +77,7 @@ lapack_int LAPACKE_ctrsen_work( int matrix_layout, char job, char compq,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             q_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldq_t * MAX(1,n) );
@@ -87,9 +87,9 @@ lapack_int LAPACKE_ctrsen_work( int matrix_layout, char job, char compq,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ctrsen( &job, &compq, select, &n, t_t, &ldt_t, q_t, &ldq_t, w, m,
@@ -98,23 +98,23 @@ lapack_int LAPACKE_ctrsen_work( int matrix_layout, char job, char compq,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( t_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctrsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsen_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctrsen_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsen_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctrsna.c b/LAPACKE/src/lapacke_ctrsna.c
index 667d40aba4..7260aecabe 100644
--- a/LAPACKE/src/lapacke_ctrsna.c
+++ b/LAPACKE/src/lapacke_ctrsna.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrsna( int matrix_layout, char job, char howmny,
+lapack_int API_SUFFIX(LAPACKE_ctrsna)( int matrix_layout, char job, char howmny,
                            const lapack_logical* select, lapack_int n,
                            const lapack_complex_float* t, lapack_int ldt,
                            const lapack_complex_float* vl, lapack_int ldvl,
@@ -40,40 +40,40 @@ lapack_int LAPACKE_ctrsna( int matrix_layout, char job, char howmny,
                            float* s, float* sep, lapack_int mm, lapack_int* m )
 {
     lapack_int info = 0;
-    lapack_int ldwork =  LAPACKE_lsame( job, 'e' ) ? 1 : MAX(1,n) ;
+    lapack_int ldwork =  API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ? 1 : MAX(1,n) ;
     float* rwork = NULL;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctrsna", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsna", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            if( LAPACKE_cge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -10;
             }
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         rwork = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,n) );
         if( rwork == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
             goto exit_level_0;
         }
     }
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         work = (lapack_complex_float*)
             LAPACKE_malloc( sizeof(lapack_complex_float) *
                             ldwork * MAX(1,n+6) );
@@ -83,20 +83,20 @@ lapack_int LAPACKE_ctrsna( int matrix_layout, char job, char howmny,
         }
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctrsna_work( matrix_layout, job, howmny, select, n, t, ldt,
+    info = API_SUFFIX(LAPACKE_ctrsna_work)( matrix_layout, job, howmny, select, n, t, ldt,
                                 vl, ldvl, vr, ldvr, s, sep, mm, m, work, ldwork,
                                 rwork );
     /* Release memory and exit */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( work );
     }
 exit_level_1:
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( rwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctrsna", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsna", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctrsna_work.c b/LAPACKE/src/lapacke_ctrsna_work.c
index 865b5769a4..b97a9e8b11 100644
--- a/LAPACKE/src/lapacke_ctrsna_work.c
+++ b/LAPACKE/src/lapacke_ctrsna_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrsna_work( int matrix_layout, char job, char howmny,
+lapack_int API_SUFFIX(LAPACKE_ctrsna_work)( int matrix_layout, char job, char howmny,
                                 const lapack_logical* select, lapack_int n,
                                 const lapack_complex_float* t, lapack_int ldt,
                                 const lapack_complex_float* vl, lapack_int ldvl,
@@ -59,17 +59,17 @@ lapack_int LAPACKE_ctrsna_work( int matrix_layout, char job, char howmny,
         /* Check leading dimension(s) */
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ctrsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsna_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ctrsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsna_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ctrsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsna_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -79,7 +79,7 @@ lapack_int LAPACKE_ctrsna_work( int matrix_layout, char job, char howmny,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             vl_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvl_t * MAX(1,mm) );
@@ -88,7 +88,7 @@ lapack_int LAPACKE_ctrsna_work( int matrix_layout, char job, char howmny,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             vr_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) *
                                 ldvr_t * MAX(1,mm) );
@@ -98,12 +98,12 @@ lapack_int LAPACKE_ctrsna_work( int matrix_layout, char job, char howmny,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            LAPACKE_cge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ctrsna( &job, &howmny, select, &n, t_t, &ldt_t, vl_t, &ldvl_t,
@@ -113,22 +113,22 @@ lapack_int LAPACKE_ctrsna_work( int matrix_layout, char job, char howmny,
             info = info - 1;
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( t_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctrsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsna_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctrsna_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsna_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctrsyl.c b/LAPACKE/src/lapacke_ctrsyl.c
index 1952e024bf..e8345e240e 100644
--- a/LAPACKE/src/lapacke_ctrsyl.c
+++ b/LAPACKE/src/lapacke_ctrsyl.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrsyl( int matrix_layout, char trana, char tranb,
+lapack_int API_SUFFIX(LAPACKE_ctrsyl)( int matrix_layout, char trana, char tranb,
                            lapack_int isgn, lapack_int m, lapack_int n,
                            const lapack_complex_float* a, lapack_int lda,
                            const lapack_complex_float* b, lapack_int ldb,
@@ -40,23 +40,23 @@ lapack_int LAPACKE_ctrsyl( int matrix_layout, char trana, char tranb,
                            float* scale )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctrsyl", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsyl", -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, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, m, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -11;
         }
     }
 #endif
-    return LAPACKE_ctrsyl_work( matrix_layout, trana, tranb, isgn, m, n, a, lda,
+    return API_SUFFIX(LAPACKE_ctrsyl_work)( matrix_layout, trana, tranb, isgn, m, n, a, lda,
                                 b, ldb, c, ldc, scale );
 }
diff --git a/LAPACKE/src/lapacke_ctrsyl3.c b/LAPACKE/src/lapacke_ctrsyl3.c
new file mode 100644
index 0000000000..9b079bab69
--- /dev/null
+++ b/LAPACKE/src/lapacke_ctrsyl3.c
@@ -0,0 +1,56 @@
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_ctrsyl3)( int matrix_layout, char trana, char tranb,
+                            lapack_int isgn, lapack_int m, lapack_int n,
+                            const lapack_complex_float* a, lapack_int lda,
+                            const lapack_complex_float* b, lapack_int ldb,
+                            lapack_complex_float* c, lapack_int ldc,
+                            float* scale )
+{
+    lapack_int info = 0;
+    float swork_query[2];
+    float* swork = NULL;
+    lapack_int ldswork = -1;
+    lapack_int swork_size = -1;
+    if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsyl3", -1 );
+        return -1;
+    }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+    if( LAPACKE_get_nancheck() ) {
+        /* Optionally check input matrices for NaNs */
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, m, a, lda ) ) {
+            return -7;
+        }
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
+            return -9;
+        }
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
+            return -11;
+        }
+    }
+#endif
+    /* Query optimal working array sizes */
+    info = API_SUFFIX(LAPACKE_ctrsyl3_work)( matrix_layout, trana, tranb, isgn, m, n, a, lda,
+                                 b, ldb, c, ldc, scale, swork_query, ldswork );
+    if( info != 0 ) {
+        goto exit_level_0;
+    }
+    ldswork = swork_query[0];
+    swork_size = ldswork * swork_query[1];
+    swork = (float*)LAPACKE_malloc( sizeof(float) * swork_size);
+    if( swork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
+    }
+    /* Call middle-level interface */
+    info = API_SUFFIX(LAPACKE_ctrsyl3_work)( matrix_layout, trana, tranb, isgn, m, n, a,
+                                 lda, b, ldb, c, ldc, scale, swork, ldswork );
+    /* Release memory and exit */
+    LAPACKE_free( swork );
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsyl3", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_ctrsyl3_work.c b/LAPACKE/src/lapacke_ctrsyl3_work.c
new file mode 100644
index 0000000000..2b0621e115
--- /dev/null
+++ b/LAPACKE/src/lapacke_ctrsyl3_work.c
@@ -0,0 +1,88 @@
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_ctrsyl3_work)( int matrix_layout, char trana, char tranb,
+                                 lapack_int isgn, lapack_int m, lapack_int n,
+                                 const lapack_complex_float* a, lapack_int lda,
+                                 const lapack_complex_float* b, lapack_int ldb,
+                                 lapack_complex_float* c, lapack_int ldc,
+                                 float* scale, float* swork,
+                                 lapack_int ldswork )
+{
+    lapack_int info = 0;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        LAPACK_ctrsyl3( &trana, &tranb, &isgn, &m, &n, a, &lda, b, &ldb, c, &ldc,
+                        scale, swork, &ldswork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        lapack_int lda_t = MAX(1,m);
+        lapack_int ldb_t = MAX(1,n);
+        lapack_int ldc_t = MAX(1,m);
+        lapack_complex_float* a_t = NULL;
+        lapack_complex_float* b_t = NULL;
+        lapack_complex_float* c_t = NULL;
+        /* Check leading dimension(s) */
+        if( lda < m ) {
+            info = -8;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsyl3_work", info );
+            return info;
+        }
+        if( ldb < n ) {
+            info = -10;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsyl3_work", info );
+            return info;
+        }
+        if( ldc < n ) {
+            info = -12;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsyl3_work", info );
+            return info;
+        }
+        /* Allocate memory for temporary array(s) */
+        a_t = (lapack_complex_float*)
+            LAPACKE_malloc( sizeof(lapack_complex_float) * lda_t * MAX(1,m) );
+        if( a_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+        b_t = (lapack_complex_float*)
+            LAPACKE_malloc( sizeof(lapack_complex_float) * ldb_t * MAX(1,n) );
+        if( b_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_1;
+        }
+        c_t = (lapack_complex_float*)
+            LAPACKE_malloc( sizeof(lapack_complex_float) * ldc_t * MAX(1,n) );
+        if( c_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_2;
+        }
+        /* Transpose input matrices */
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        /* Call LAPACK function and adjust info */
+        LAPACK_ctrsyl3( &trana, &tranb, &isgn, &m, &n, a_t, &lda_t, b_t, &ldb_t,
+                        c_t, &ldc_t, scale, swork, &ldswork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+        /* Transpose output matrices */
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        /* Release memory and exit */
+        LAPACKE_free( c_t );
+exit_level_2:
+        LAPACKE_free( b_t );
+exit_level_1:
+        LAPACKE_free( a_t );
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsyl3_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsyl3_work", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_ctrsyl_work.c b/LAPACKE/src/lapacke_ctrsyl_work.c
index 1c345f1211..69856666d9 100644
--- a/LAPACKE/src/lapacke_ctrsyl_work.c
+++ b/LAPACKE/src/lapacke_ctrsyl_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrsyl_work( int matrix_layout, char trana, char tranb,
+lapack_int API_SUFFIX(LAPACKE_ctrsyl_work)( int matrix_layout, char trana, char tranb,
                                 lapack_int isgn, lapack_int m, lapack_int n,
                                 const lapack_complex_float* a, lapack_int lda,
                                 const lapack_complex_float* b, lapack_int ldb,
@@ -57,17 +57,17 @@ lapack_int LAPACKE_ctrsyl_work( int matrix_layout, char trana, char tranb,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ctrsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsyl_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ctrsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsyl_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_ctrsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsyl_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -90,9 +90,9 @@ lapack_int LAPACKE_ctrsyl_work( int matrix_layout, char trana, char tranb,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, m, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctrsyl( &trana, &tranb, &isgn, &m, &n, a_t, &lda_t, b_t, &ldb_t,
                        c_t, &ldc_t, scale, &info );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_ctrsyl_work( int matrix_layout, char trana, char tranb,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_2:
@@ -109,11 +109,11 @@ lapack_int LAPACKE_ctrsyl_work( int matrix_layout, char trana, char tranb,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctrsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsyl_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctrsyl_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrsyl_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctrtri.c b/LAPACKE/src/lapacke_ctrtri.c
index 6dd50ba90e..45e9f9264c 100644
--- a/LAPACKE/src/lapacke_ctrtri.c
+++ b/LAPACKE/src/lapacke_ctrtri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrtri( int matrix_layout, char uplo, char diag, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ctrtri)( int matrix_layout, char uplo, char diag, lapack_int n,
                            lapack_complex_float* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctrtri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrtri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ctr_nancheck( matrix_layout, uplo, diag, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ctr_nancheck)( matrix_layout, uplo, diag, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_ctrtri_work( matrix_layout, uplo, diag, n, a, lda );
+    return API_SUFFIX(LAPACKE_ctrtri_work)( matrix_layout, uplo, diag, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_ctrtri_work.c b/LAPACKE/src/lapacke_ctrtri_work.c
index d21c99bce8..fc43bfdf8a 100644
--- a/LAPACKE/src/lapacke_ctrtri_work.c
+++ b/LAPACKE/src/lapacke_ctrtri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrtri_work( int matrix_layout, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_ctrtri_work)( int matrix_layout, char uplo, char diag,
                                 lapack_int n, lapack_complex_float* a,
                                 lapack_int lda )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_ctrtri_work( int matrix_layout, char uplo, char diag,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ctrtri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrtri_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,24 +60,24 @@ lapack_int LAPACKE_ctrtri_work( int matrix_layout, char uplo, char diag,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ctr_trans( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ctr_trans)( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctrtri( &uplo, &diag, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ctr_trans( LAPACK_COL_MAJOR, uplo, diag, n, a_t, lda_t, a,
+        API_SUFFIX(LAPACKE_ctr_trans)( LAPACK_COL_MAJOR, uplo, diag, n, a_t, lda_t, a,
                            lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctrtri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrtri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctrtri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrtri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctrtrs.c b/LAPACKE/src/lapacke_ctrtrs.c
index 061ae686d7..c7a5a2037c 100644
--- a/LAPACKE/src/lapacke_ctrtrs.c
+++ b/LAPACKE/src/lapacke_ctrtrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrtrs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_ctrtrs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int nrhs,
                            const lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctrtrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrtrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ctr_nancheck( matrix_layout, uplo, diag, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ctr_nancheck)( matrix_layout, uplo, diag, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_ctrtrs_work( matrix_layout, uplo, trans, diag, n, nrhs, a,
+    return API_SUFFIX(LAPACKE_ctrtrs_work)( matrix_layout, uplo, trans, diag, n, nrhs, a,
                                 lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_ctrtrs_work.c b/LAPACKE/src/lapacke_ctrtrs_work.c
index 228fd38bac..63e3c6310f 100644
--- a/LAPACKE/src/lapacke_ctrtrs_work.c
+++ b/LAPACKE/src/lapacke_ctrtrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrtrs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_ctrtrs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int nrhs,
                                 const lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* b, lapack_int ldb )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_ctrtrs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ctrtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrtrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ctrtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrtrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -76,8 +76,8 @@ lapack_int LAPACKE_ctrtrs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ctr_trans( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ctr_trans)( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctrtrs( &uplo, &trans, &diag, &n, &nrhs, a_t, &lda_t, b_t,
                        &ldb_t, &info );
@@ -85,18 +85,18 @@ lapack_int LAPACKE_ctrtrs_work( int matrix_layout, char uplo, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctrtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrtrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctrtrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrtrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctrttf.c b/LAPACKE/src/lapacke_ctrttf.c
index e5a3c0e4ae..005d3274a5 100644
--- a/LAPACKE/src/lapacke_ctrttf.c
+++ b/LAPACKE/src/lapacke_ctrttf.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrttf( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ctrttf)( int matrix_layout, char transr, char uplo,
                            lapack_int n, const lapack_complex_float* a,
                            lapack_int lda, lapack_complex_float* arf )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctrttf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrttf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ctr_nancheck( matrix_layout, uplo, 'n', n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ctr_nancheck)( matrix_layout, uplo, 'n', n, a, lda ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_ctrttf_work( matrix_layout, transr, uplo, n, a, lda, arf );
+    return API_SUFFIX(LAPACKE_ctrttf_work)( matrix_layout, transr, uplo, n, a, lda, arf );
 }
diff --git a/LAPACKE/src/lapacke_ctrttf_work.c b/LAPACKE/src/lapacke_ctrttf_work.c
index 8589a65892..49424fa86f 100644
--- a/LAPACKE/src/lapacke_ctrttf_work.c
+++ b/LAPACKE/src/lapacke_ctrttf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrttf_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ctrttf_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, const lapack_complex_float* a,
                                 lapack_int lda, lapack_complex_float* arf )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_ctrttf_work( int matrix_layout, char transr, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ctrttf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrttf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -68,25 +68,25 @@ lapack_int LAPACKE_ctrttf_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctrttf( &transr, &uplo, &n, a_t, &lda_t, arf_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cpf_trans( LAPACK_COL_MAJOR, transr, uplo, n, arf_t, arf );
+        API_SUFFIX(LAPACKE_cpf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, arf_t, arf );
         /* Release memory and exit */
         LAPACKE_free( arf_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctrttf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrttf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctrttf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrttf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctrttp.c b/LAPACKE/src/lapacke_ctrttp.c
index 624cd2d2fe..ced8afc554 100644
--- a/LAPACKE/src/lapacke_ctrttp.c
+++ b/LAPACKE/src/lapacke_ctrttp.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrttp( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ctrttp)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctrttp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrttp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ctr_nancheck( matrix_layout, uplo, 'n', n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ctr_nancheck)( matrix_layout, uplo, 'n', n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_ctrttp_work( matrix_layout, uplo, n, a, lda, ap );
+    return API_SUFFIX(LAPACKE_ctrttp_work)( matrix_layout, uplo, n, a, lda, ap );
 }
diff --git a/LAPACKE/src/lapacke_ctrttp_work.c b/LAPACKE/src/lapacke_ctrttp_work.c
index 9a557b6024..f5d71fa1d3 100644
--- a/LAPACKE/src/lapacke_ctrttp_work.c
+++ b/LAPACKE/src/lapacke_ctrttp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctrttp_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ctrttp_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* ap )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_ctrttp_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ctrttp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrttp_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -68,25 +68,25 @@ lapack_int LAPACKE_ctrttp_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctrttp( &uplo, &n, a_t, &lda_t, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_cpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctrttp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrttp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctrttp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctrttp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctzrzf.c b/LAPACKE/src/lapacke_ctzrzf.c
index c33b868baa..3808aa608d 100644
--- a/LAPACKE/src/lapacke_ctzrzf.c
+++ b/LAPACKE/src/lapacke_ctzrzf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctzrzf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ctzrzf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_ctzrzf( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ctzrzf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctzrzf", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ctzrzf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_ctzrzf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,12 +67,12 @@ lapack_int LAPACKE_ctzrzf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ctzrzf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_ctzrzf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ctzrzf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctzrzf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ctzrzf_work.c b/LAPACKE/src/lapacke_ctzrzf_work.c
index c5178ce3fc..a1d7fb1f49 100644
--- a/LAPACKE/src/lapacke_ctzrzf_work.c
+++ b/LAPACKE/src/lapacke_ctzrzf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ctzrzf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ctzrzf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 lapack_complex_float* tau,
                                 lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_ctzrzf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ctzrzf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctzrzf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_ctzrzf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ctzrzf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ctzrzf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctzrzf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ctzrzf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctzrzf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunbdb.c b/LAPACKE/src/lapacke_cunbdb.c
index 779e461f32..bf5b7bfa05 100644
--- a/LAPACKE/src/lapacke_cunbdb.c
+++ b/LAPACKE/src/lapacke_cunbdb.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunbdb( int matrix_layout, char trans, char signs,
+lapack_int API_SUFFIX(LAPACKE_cunbdb)( int matrix_layout, char trans, char signs,
                            lapack_int m, lapack_int p, lapack_int q,
                            lapack_complex_float* x11, lapack_int ldx11,
                            lapack_complex_float* x12, lapack_int ldx12,
@@ -50,10 +50,10 @@ lapack_int LAPACKE_cunbdb( int matrix_layout, char trans, char signs,
     lapack_complex_float work_query;
     int lapack_layout;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cunbdb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunbdb", -1 );
         return -1;
     }
-    if( LAPACKE_lsame( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+    if( API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
         lapack_layout = LAPACK_COL_MAJOR;
     } else {
         lapack_layout = LAPACK_ROW_MAJOR;
@@ -61,22 +61,22 @@ lapack_int LAPACKE_cunbdb( int matrix_layout, char trans, char signs,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( lapack_layout, p, q, x11, ldx11 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( lapack_layout, p, q, x11, ldx11 ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( lapack_layout, p, m-q, x12, ldx12 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( lapack_layout, p, m-q, x12, ldx12 ) ) {
             return -9;
         }
-        if( LAPACKE_cge_nancheck( lapack_layout, m-p, q, x21, ldx21 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( lapack_layout, m-p, q, x21, ldx21 ) ) {
             return -11;
         }
-        if( LAPACKE_cge_nancheck( lapack_layout, m-p, m-q, x22, ldx22 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( lapack_layout, m-p, m-q, x22, ldx22 ) ) {
             return -13;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cunbdb_work( matrix_layout, trans, signs, m, p, q, x11, ldx11,
+    info = API_SUFFIX(LAPACKE_cunbdb_work)( matrix_layout, trans, signs, m, p, q, x11, ldx11,
                                 x12, ldx12, x21, ldx21, x22, ldx22, theta, phi,
                                 taup1, taup2, tauq1, tauq2, &work_query,
                                 lwork );
@@ -92,14 +92,14 @@ lapack_int LAPACKE_cunbdb( int matrix_layout, char trans, char signs,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cunbdb_work( matrix_layout, trans, signs, m, p, q, x11, ldx11,
+    info = API_SUFFIX(LAPACKE_cunbdb_work)( matrix_layout, trans, signs, m, p, q, x11, ldx11,
                                 x12, ldx12, x21, ldx21, x22, ldx22, theta, phi,
                                 taup1, taup2, tauq1, tauq2, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cunbdb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunbdb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunbdb_work.c b/LAPACKE/src/lapacke_cunbdb_work.c
index fa05aafb2f..3a20b82dbf 100644
--- a/LAPACKE/src/lapacke_cunbdb_work.c
+++ b/LAPACKE/src/lapacke_cunbdb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunbdb_work( int matrix_layout, char trans, char signs,
+lapack_int API_SUFFIX(LAPACKE_cunbdb_work)( int matrix_layout, char trans, char signs,
                                 lapack_int m, lapack_int p, lapack_int q,
                                 lapack_complex_float* x11, lapack_int ldx11,
                                 lapack_complex_float* x12, lapack_int ldx12,
@@ -63,7 +63,7 @@ lapack_int LAPACKE_cunbdb_work( int matrix_layout, char trans, char signs,
     if( matrix_layout == LAPACK_COL_MAJOR ||
         matrix_layout == LAPACK_ROW_MAJOR ) {
         char ltrans;
-        if( !LAPACKE_lsame( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+        if( !API_SUFFIX(LAPACKE_lsame)( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
             ltrans = 'n';
         } else {
             ltrans = 't';
@@ -77,7 +77,7 @@ lapack_int LAPACKE_cunbdb_work( int matrix_layout, char trans, char signs,
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cunbdb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunbdb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cuncsd.c b/LAPACKE/src/lapacke_cuncsd.c
index 91a4ca9f1b..4a99970cda 100644
--- a/LAPACKE/src/lapacke_cuncsd.c
+++ b/LAPACKE/src/lapacke_cuncsd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cuncsd( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_cuncsd)( int matrix_layout, char jobu1, char jobu2,
                            char jobv1t, char jobv2t, char trans, char signs,
                            lapack_int m, lapack_int p, lapack_int q,
                            lapack_complex_float* x11, lapack_int ldx11,
@@ -55,10 +55,10 @@ lapack_int LAPACKE_cuncsd( int matrix_layout, char jobu1, char jobu2,
     lapack_complex_float work_query;
     int lapack_layout;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cuncsd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cuncsd", -1 );
         return -1;
     }
-    if( LAPACKE_lsame( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+    if( API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
         lapack_layout = LAPACK_COL_MAJOR;
     } else {
         lapack_layout = LAPACK_ROW_MAJOR;
@@ -66,16 +66,16 @@ lapack_int LAPACKE_cuncsd( int matrix_layout, char jobu1, char jobu2,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( lapack_layout, p, q, x11, ldx11 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( lapack_layout, p, q, x11, ldx11 ) ) {
             return -11;
         }
-        if( LAPACKE_cge_nancheck( lapack_layout, p, m-q, x12, ldx12 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( lapack_layout, p, m-q, x12, ldx12 ) ) {
             return -13;
         }
-        if( LAPACKE_cge_nancheck( lapack_layout, m-p, q, x21, ldx21 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( lapack_layout, m-p, q, x21, ldx21 ) ) {
             return -15;
         }
-        if( LAPACKE_cge_nancheck( lapack_layout, m-p, m-q, x22, ldx22 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( lapack_layout, m-p, m-q, x22, ldx22 ) ) {
             return -17;
         }
     }
@@ -87,7 +87,7 @@ lapack_int LAPACKE_cuncsd( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cuncsd_work( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
+    info = API_SUFFIX(LAPACKE_cuncsd_work)( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
                                 trans, signs, m, p, q, x11, ldx11, x12, ldx12,
                                 x21, ldx21, x22, ldx22, theta, u1, ldu1, u2,
                                 ldu2, v1t, ldv1t, v2t, ldv2t, &work_query,
@@ -110,7 +110,7 @@ lapack_int LAPACKE_cuncsd( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cuncsd_work( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
+    info = API_SUFFIX(LAPACKE_cuncsd_work)( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
                                 trans, signs, m, p, q, x11, ldx11, x12, ldx12,
                                 x21, ldx21, x22, ldx22, theta, u1, ldu1, u2,
                                 ldu2, v1t, ldv1t, v2t, ldv2t, work, lwork,
@@ -123,7 +123,7 @@ lapack_int LAPACKE_cuncsd( int matrix_layout, char jobu1, char jobu2,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cuncsd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cuncsd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cuncsd2by1.c b/LAPACKE/src/lapacke_cuncsd2by1.c
index 8a1fc02f36..3482377797 100644
--- a/LAPACKE/src/lapacke_cuncsd2by1.c
+++ b/LAPACKE/src/lapacke_cuncsd2by1.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cuncsd2by1( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_cuncsd2by1)( int matrix_layout, char jobu1, char jobu2,
                            char jobv1t, lapack_int m, lapack_int p, lapack_int q,
                            lapack_complex_float* x11, lapack_int ldx11,
                            lapack_complex_float* x21, lapack_int ldx21,
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cuncsd2by1( int matrix_layout, char jobu1, char jobu2,
     lapack_complex_float work_query;
     lapack_int nrows_x11, nrows_x21;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cuncsd2by1", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cuncsd2by1", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
@@ -58,11 +58,11 @@ lapack_int LAPACKE_cuncsd2by1( int matrix_layout, char jobu1, char jobu2,
         /* Optionally check input matrices for NaNs */
         nrows_x11 = p;
         nrows_x21 = m-p;
-        if( LAPACKE_cge_nancheck( matrix_layout, nrows_x11, q, x11, ldx11 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, nrows_x11, q, x11, ldx11 ) ) {
             return -8;
         }
 
-        if( LAPACKE_cge_nancheck( matrix_layout, nrows_x21, q, x21, ldx21 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, nrows_x21, q, x21, ldx21 ) ) {
             return -9;
         }
     }
@@ -74,7 +74,7 @@ lapack_int LAPACKE_cuncsd2by1( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_cuncsd2by1_work( matrix_layout, jobu1, jobu2, jobv1t, m, p, q,
+    info = API_SUFFIX(LAPACKE_cuncsd2by1_work)( matrix_layout, jobu1, jobu2, jobv1t, m, p, q,
                                 x11, ldx11, x21, ldx21, theta, u1, ldu1, u2,
                                 ldu2, v1t, ldv1t, &work_query,
                                 lwork, &rwork_query, lrwork, iwork );
@@ -95,7 +95,7 @@ lapack_int LAPACKE_cuncsd2by1( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cuncsd2by1_work( matrix_layout, jobu1, jobu2, jobv1t, m, p, q,
+    info = API_SUFFIX(LAPACKE_cuncsd2by1_work)( matrix_layout, jobu1, jobu2, jobv1t, m, p, q,
                                 x11, ldx11, x21, ldx21, theta, u1, ldu1, u2,
                                 ldu2, v1t, ldv1t, work, lwork, rwork, lrwork, iwork );
     /* Release memory and exit */
@@ -106,7 +106,7 @@ lapack_int LAPACKE_cuncsd2by1( int matrix_layout, char jobu1, char jobu2,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cuncsd2by1", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cuncsd2by1", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cuncsd2by1_work.c b/LAPACKE/src/lapacke_cuncsd2by1_work.c
index 4e7e2cc165..1e34d84fcd 100644
--- a/LAPACKE/src/lapacke_cuncsd2by1_work.c
+++ b/LAPACKE/src/lapacke_cuncsd2by1_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_cuncsd2by1_work)( int matrix_layout, char jobu1, char jobu2,
                                 char jobv1t, lapack_int m, lapack_int p,
                                 lapack_int q, lapack_complex_float* x11, lapack_int ldx11,
                                 lapack_complex_float* x21, lapack_int ldx21,
@@ -56,9 +56,9 @@ lapack_int LAPACKE_cuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
         lapack_int nrows_x11 = p;
         lapack_int nrows_x21 = m-p;
-        lapack_int nrows_u1 = ( LAPACKE_lsame( jobu1, 'y' ) ? p : 1);
-        lapack_int nrows_u2 = ( LAPACKE_lsame( jobu2, 'y' ) ? m-p : 1);
-        lapack_int nrows_v1t = ( LAPACKE_lsame( jobv1t, 'y' ) ? q : 1);
+        lapack_int nrows_u1 = ( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ? p : 1);
+        lapack_int nrows_u2 = ( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ? m-p : 1);
+        lapack_int nrows_v1t = ( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ? q : 1);
         lapack_int ldu1_t = MAX(1,nrows_u1);
         lapack_int ldu2_t = MAX(1,nrows_u2);
         lapack_int ldv1t_t = MAX(1,nrows_v1t);
@@ -72,27 +72,27 @@ lapack_int LAPACKE_cuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
         /* Check leading dimension(s) */
         if( ldu1 < p ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_cuncsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cuncsd2by1_work", info );
             return info;
         }
         if( ldu2 < m-p ) {
             info = -23;
-            LAPACKE_xerbla( "LAPACKE_cuncsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cuncsd2by1_work", info );
             return info;
         }
         if( ldv1t < q ) {
             info = -25;
-            LAPACKE_xerbla( "LAPACKE_cuncsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cuncsd2by1_work", info );
             return info;
         }
         if( ldx11 < q ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_cuncsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cuncsd2by1_work", info );
             return info;
         }
         if( ldx21 < q ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_cuncsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cuncsd2by1_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -114,7 +114,7 @@ lapack_int LAPACKE_cuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu1, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ) {
             u1_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) * ldu1_t * MAX(1,p) );
             if( u1_t == NULL ) {
@@ -122,7 +122,7 @@ lapack_int LAPACKE_cuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobu2, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ) {
             u2_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) * ldu2_t * MAX(1,m-p) );
             if( u2_t == NULL ) {
@@ -130,7 +130,7 @@ lapack_int LAPACKE_cuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobv1t, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ) {
             v1t_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) * ldv1t_t * MAX(1,q) );
             if( v1t_t == NULL ) {
@@ -139,9 +139,9 @@ lapack_int LAPACKE_cuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, nrows_x11, q, x11, ldx11, x11_t,
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, nrows_x11, q, x11, ldx11, x11_t,
                            ldx11_t );
-        LAPACKE_cge_trans( matrix_layout, nrows_x21, q, x21, ldx21, x21_t,
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, nrows_x21, q, x21, ldx21, x21_t,
                            ldx21_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cuncsd2by1( &jobu1, &jobu2, &jobv1t, &m, &p,
@@ -152,32 +152,32 @@ lapack_int LAPACKE_cuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_x11, q, x11_t, ldx11_t, x11,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nrows_x11, q, x11_t, ldx11_t, x11,
                            ldx11 );
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_x21, q, x21_t, ldx21_t, x21,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nrows_x21, q, x21_t, ldx21_t, x21,
                            ldx21 );
-        if( LAPACKE_lsame( jobu1, 'y' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_u1, p, u1_t, ldu1_t, u1,
+        if( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nrows_u1, p, u1_t, ldu1_t, u1,
                                ldu1 );
         }
-        if( LAPACKE_lsame( jobu2, 'y' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_u2, m-p, u2_t, ldu2_t,
+        if( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nrows_u2, m-p, u2_t, ldu2_t,
                                u2, ldu2 );
         }
-        if( LAPACKE_lsame( jobv1t, 'y' ) ) {
-            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_v1t, q, v1t_t, ldv1t_t,
+        if( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ) {
+            API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, nrows_v1t, q, v1t_t, ldv1t_t,
                                v1t, ldv1t );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobv1t, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ) {
             LAPACKE_free( v1t_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobu2, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ) {
             LAPACKE_free( u2_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu1, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ) {
             LAPACKE_free( u1_t );
         }
 exit_level_2:
@@ -186,11 +186,11 @@ lapack_int LAPACKE_cuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
         LAPACKE_free( x11_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cuncsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cuncsd2by1_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cuncsd2by1_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cuncsd2by1_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cuncsd_work.c b/LAPACKE/src/lapacke_cuncsd_work.c
index a5c24a301f..40775b1fcc 100644
--- a/LAPACKE/src/lapacke_cuncsd_work.c
+++ b/LAPACKE/src/lapacke_cuncsd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cuncsd_work( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_cuncsd_work)( int matrix_layout, char jobu1, char jobu2,
                                 char jobv1t, char jobv2t, char trans,
                                 char signs, lapack_int m, lapack_int p,
                                 lapack_int q, lapack_complex_float* x11,
@@ -66,7 +66,7 @@ lapack_int LAPACKE_cuncsd_work( int matrix_layout, char jobu1, char jobu2,
     if( matrix_layout == LAPACK_COL_MAJOR ||
         matrix_layout == LAPACK_ROW_MAJOR ) {
         char ltrans;
-        if( !LAPACKE_lsame( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+        if( !API_SUFFIX(LAPACKE_lsame)( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
             ltrans = 'n';
         } else {
             ltrans = 't';
@@ -81,7 +81,7 @@ lapack_int LAPACKE_cuncsd_work( int matrix_layout, char jobu1, char jobu2,
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cuncsd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cuncsd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cungbr.c b/LAPACKE/src/lapacke_cungbr.c
index d71462d915..5085bc7b2f 100644
--- a/LAPACKE/src/lapacke_cungbr.c
+++ b/LAPACKE/src/lapacke_cungbr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cungbr( int matrix_layout, char vect, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_cungbr)( int matrix_layout, char vect, lapack_int m,
                            lapack_int n, lapack_int k, lapack_complex_float* a,
                            lapack_int lda, const lapack_complex_float* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_cungbr( int matrix_layout, char vect, lapack_int m,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cungbr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungbr", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_c_nancheck( MIN(m,k), tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( MIN(m,k), tau, 1 ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cungbr_work( matrix_layout, vect, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_cungbr_work)( matrix_layout, vect, m, n, k, a, lda, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_cungbr( int matrix_layout, char vect, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cungbr_work( matrix_layout, vect, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_cungbr_work)( matrix_layout, vect, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cungbr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungbr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cungbr_work.c b/LAPACKE/src/lapacke_cungbr_work.c
index 88429715c8..9b70f51b30 100644
--- a/LAPACKE/src/lapacke_cungbr_work.c
+++ b/LAPACKE/src/lapacke_cungbr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cungbr_work( int matrix_layout, char vect, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_cungbr_work)( int matrix_layout, char vect, lapack_int m,
                                 lapack_int n, lapack_int k,
                                 lapack_complex_float* a, lapack_int lda,
                                 const lapack_complex_float* tau,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_cungbr_work( int matrix_layout, char vect, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cungbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungbr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -68,7 +68,7 @@ lapack_int LAPACKE_cungbr_work( int matrix_layout, char vect, lapack_int m,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cungbr( &vect, &m, &n, &k, a_t, &lda_t, tau, work, &lwork,
                        &info );
@@ -76,16 +76,16 @@ lapack_int LAPACKE_cungbr_work( int matrix_layout, char vect, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cungbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungbr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cungbr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungbr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunghr.c b/LAPACKE/src/lapacke_cunghr.c
index 45fc0556f7..9cb50541d7 100644
--- a/LAPACKE/src/lapacke_cunghr.c
+++ b/LAPACKE/src/lapacke_cunghr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunghr( int matrix_layout, lapack_int n, lapack_int ilo,
+lapack_int API_SUFFIX(LAPACKE_cunghr)( int matrix_layout, lapack_int n, lapack_int ilo,
                            lapack_int ihi, lapack_complex_float* a,
                            lapack_int lda, const lapack_complex_float* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_cunghr( int matrix_layout, lapack_int n, lapack_int ilo,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cunghr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunghr", -1 );
         return -1;
     }
 #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( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_c_nancheck( n-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cunghr_work( matrix_layout, n, ilo, ihi, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_cunghr_work)( matrix_layout, n, ilo, ihi, a, lda, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_cunghr( int matrix_layout, lapack_int n, lapack_int ilo,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cunghr_work( matrix_layout, n, ilo, ihi, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_cunghr_work)( matrix_layout, n, ilo, ihi, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cunghr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunghr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunghr_work.c b/LAPACKE/src/lapacke_cunghr_work.c
index 14b888ed22..472606ff09 100644
--- a/LAPACKE/src/lapacke_cunghr_work.c
+++ b/LAPACKE/src/lapacke_cunghr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunghr_work( int matrix_layout, lapack_int n, lapack_int ilo,
+lapack_int API_SUFFIX(LAPACKE_cunghr_work)( int matrix_layout, lapack_int n, lapack_int ilo,
                                 lapack_int ihi, lapack_complex_float* a,
                                 lapack_int lda, const lapack_complex_float* tau,
                                 lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cunghr_work( int matrix_layout, lapack_int n, lapack_int ilo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cunghr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunghr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,23 +67,23 @@ lapack_int LAPACKE_cunghr_work( int matrix_layout, lapack_int n, lapack_int ilo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cunghr( &n, &ilo, &ihi, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cunghr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunghr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cunghr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunghr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunglq.c b/LAPACKE/src/lapacke_cunglq.c
index a3bf9abbd9..fac40ab93c 100644
--- a/LAPACKE/src/lapacke_cunglq.c
+++ b/LAPACKE/src/lapacke_cunglq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunglq( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cunglq)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int k, lapack_complex_float* a,
                            lapack_int lda, const lapack_complex_float* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_cunglq( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cunglq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunglq", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_c_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( k, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cunglq_work( matrix_layout, m, n, k, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_cunglq_work)( matrix_layout, m, n, k, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_cunglq( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cunglq_work( matrix_layout, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_cunglq_work)( matrix_layout, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cunglq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunglq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunglq_work.c b/LAPACKE/src/lapacke_cunglq_work.c
index 3c9d9f806b..cce163d647 100644
--- a/LAPACKE/src/lapacke_cunglq_work.c
+++ b/LAPACKE/src/lapacke_cunglq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunglq_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cunglq_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int k, lapack_complex_float* a,
                                 lapack_int lda, const lapack_complex_float* tau,
                                 lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cunglq_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cunglq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunglq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_cunglq_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cunglq( &m, &n, &k, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cunglq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunglq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cunglq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunglq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cungql.c b/LAPACKE/src/lapacke_cungql.c
index 668c39c0fd..30b5e77651 100644
--- a/LAPACKE/src/lapacke_cungql.c
+++ b/LAPACKE/src/lapacke_cungql.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cungql( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cungql)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int k, lapack_complex_float* a,
                            lapack_int lda, const lapack_complex_float* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_cungql( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cungql", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungql", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_c_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( k, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cungql_work( matrix_layout, m, n, k, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_cungql_work)( matrix_layout, m, n, k, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_cungql( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cungql_work( matrix_layout, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_cungql_work)( matrix_layout, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cungql", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungql", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cungql_work.c b/LAPACKE/src/lapacke_cungql_work.c
index 8920917bea..9d44a80d5b 100644
--- a/LAPACKE/src/lapacke_cungql_work.c
+++ b/LAPACKE/src/lapacke_cungql_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cungql_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cungql_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int k, lapack_complex_float* a,
                                 lapack_int lda, const lapack_complex_float* tau,
                                 lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cungql_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cungql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungql_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_cungql_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cungql( &m, &n, &k, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cungql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungql_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cungql_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungql_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cungqr.c b/LAPACKE/src/lapacke_cungqr.c
index bad2c322c1..fa18c9a037 100644
--- a/LAPACKE/src/lapacke_cungqr.c
+++ b/LAPACKE/src/lapacke_cungqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cungqr( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cungqr)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int k, lapack_complex_float* a,
                            lapack_int lda, const lapack_complex_float* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_cungqr( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cungqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungqr", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_c_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( k, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cungqr_work( matrix_layout, m, n, k, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_cungqr_work)( matrix_layout, m, n, k, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_cungqr( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cungqr_work( matrix_layout, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_cungqr_work)( matrix_layout, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cungqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cungqr_work.c b/LAPACKE/src/lapacke_cungqr_work.c
index 0f8426e232..f22a65aac8 100644
--- a/LAPACKE/src/lapacke_cungqr_work.c
+++ b/LAPACKE/src/lapacke_cungqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cungqr_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cungqr_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int k, lapack_complex_float* a,
                                 lapack_int lda, const lapack_complex_float* tau,
                                 lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cungqr_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cungqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_cungqr_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cungqr( &m, &n, &k, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cungqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cungqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cungrq.c b/LAPACKE/src/lapacke_cungrq.c
index 65154554b8..4f1fa5a8ff 100644
--- a/LAPACKE/src/lapacke_cungrq.c
+++ b/LAPACKE/src/lapacke_cungrq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cungrq( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cungrq)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int k, lapack_complex_float* a,
                            lapack_int lda, const lapack_complex_float* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_cungrq( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cungrq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungrq", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_c_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( k, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cungrq_work( matrix_layout, m, n, k, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_cungrq_work)( matrix_layout, m, n, k, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_cungrq( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cungrq_work( matrix_layout, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_cungrq_work)( matrix_layout, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cungrq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungrq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cungrq_work.c b/LAPACKE/src/lapacke_cungrq_work.c
index 76a0f9da3f..062413fc9f 100644
--- a/LAPACKE/src/lapacke_cungrq_work.c
+++ b/LAPACKE/src/lapacke_cungrq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cungrq_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cungrq_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int k, lapack_complex_float* a,
                                 lapack_int lda, const lapack_complex_float* tau,
                                 lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cungrq_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_cungrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungrq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_cungrq_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cungrq( &m, &n, &k, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cungrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungrq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cungrq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungrq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cungtr.c b/LAPACKE/src/lapacke_cungtr.c
index c0da66df8d..5016408e13 100644
--- a/LAPACKE/src/lapacke_cungtr.c
+++ b/LAPACKE/src/lapacke_cungtr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cungtr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cungtr)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_float* a, lapack_int lda,
                            const lapack_complex_float* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_cungtr( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cungtr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungtr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_c_nancheck( n-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, tau, 1 ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cungtr_work( matrix_layout, uplo, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_cungtr_work)( matrix_layout, uplo, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_cungtr( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cungtr_work( matrix_layout, uplo, n, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_cungtr_work)( matrix_layout, uplo, n, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cungtr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungtr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cungtr_work.c b/LAPACKE/src/lapacke_cungtr_work.c
index b892740de9..d1dd25adee 100644
--- a/LAPACKE/src/lapacke_cungtr_work.c
+++ b/LAPACKE/src/lapacke_cungtr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cungtr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cungtr_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_float* a, lapack_int lda,
                                 const lapack_complex_float* tau,
                                 lapack_complex_float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_cungtr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_cungtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungtr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_cungtr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cungtr( &uplo, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cungtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungtr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cungtr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungtr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cungtsqr_row.c b/LAPACKE/src/lapacke_cungtsqr_row.c
index bb551fcbc7..a8a27f6186 100644
--- a/LAPACKE/src/lapacke_cungtsqr_row.c
+++ b/LAPACKE/src/lapacke_cungtsqr_row.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cungtsqr_row( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cungtsqr_row)( int matrix_layout, lapack_int m, lapack_int n,
                                  lapack_int mb, lapack_int nb,
                                  lapack_complex_float* a, lapack_int lda,
                                  const lapack_complex_float* t, lapack_int ldt )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_cungtsqr_row( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cungtsqr_row", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungtsqr_row", -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 ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, nb, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, nb, n, t, ldt ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cungtsqr_row_work( matrix_layout, m, n, mb, nb,
+    info = API_SUFFIX(LAPACKE_cungtsqr_row_work)( matrix_layout, m, n, mb, nb,
                                       a, lda, t, ldt, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_cungtsqr_row( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cungtsqr_row_work( matrix_layout, m, n, mb, nb,
+    info = API_SUFFIX(LAPACKE_cungtsqr_row_work)( matrix_layout, m, n, mb, nb,
                                       a, lda, t, ldt, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cungtsqr_row", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungtsqr_row", info );
     }
     return info;
 }
\ No newline at end of file
diff --git a/LAPACKE/src/lapacke_cungtsqr_row_work.c b/LAPACKE/src/lapacke_cungtsqr_row_work.c
index 96b18ab137..f128e13eab 100644
--- a/LAPACKE/src/lapacke_cungtsqr_row_work.c
+++ b/LAPACKE/src/lapacke_cungtsqr_row_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cungtsqr_row_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cungtsqr_row_work)( int matrix_layout, lapack_int m, lapack_int n,
                                       lapack_int mb, lapack_int nb,
                                       lapack_complex_float* a, lapack_int lda,
                                       const lapack_complex_float* t, lapack_int ldt,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_cungtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cungtsqr_row_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungtsqr_row_work", info );
             return info;
         }
         lapack_int ldt_t = MAX(1,nb);
@@ -60,7 +60,7 @@ lapack_int LAPACKE_cungtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
         /* Check leading dimension(s) */
         if( ldt < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cungtsqr_row_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungtsqr_row_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_cungtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, nb, n, a, lda, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, nb, n, a, lda, t_t, ldt_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cungtsqr_row( &m, &n, &mb, &nb, a_t, &lda_t, t_t, &ldt_t,
                              work, &lwork, &info );
@@ -92,18 +92,18 @@ lapack_int LAPACKE_cungtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cungtsqr_row_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungtsqr_row_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cungtsqr_row_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cungtsqr_row_work", info );
     }
     return info;
 }
\ No newline at end of file
diff --git a/LAPACKE/src/lapacke_cunhr_col.c b/LAPACKE/src/lapacke_cunhr_col.c
new file mode 100644
index 0000000000..27e6f29a10
--- /dev/null
+++ b/LAPACKE/src/lapacke_cunhr_col.c
@@ -0,0 +1,24 @@
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_cunhr_col)( int matrix_layout, lapack_int m, lapack_int n,
+                              lapack_int nb, lapack_complex_float* a,
+                              lapack_int lda, lapack_complex_float* t,
+                              lapack_int ldt, lapack_complex_float* d)
+{
+  lapack_int info = 0;
+  if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+    API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunhr_col", -1 );
+    return -1;
+  }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+  if( LAPACKE_get_nancheck() ) {
+    /* Optionally check input matrices for NaNs */
+    if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda ) ) {
+      return -5;
+    }
+  }
+#endif
+  /* Call middle-level interface */
+  info = API_SUFFIX(LAPACKE_cunhr_col_work)( matrix_layout, m, n, nb, a, lda, t, ldt, d );
+  return info;
+}
diff --git a/LAPACKE/src/lapacke_cunhr_col_work.c b/LAPACKE/src/lapacke_cunhr_col_work.c
new file mode 100644
index 0000000000..bd2005dd06
--- /dev/null
+++ b/LAPACKE/src/lapacke_cunhr_col_work.c
@@ -0,0 +1,69 @@
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_cunhr_col_work)( int matrix_layout, lapack_int m, lapack_int n,
+                                   lapack_int nb, lapack_complex_float* a,
+                                   lapack_int lda, lapack_complex_float* t,
+                                   lapack_int ldt, lapack_complex_float* d )
+{
+    lapack_int info = 0;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        LAPACK_cunhr_col( &m, &n, &nb, a, &lda, t, &ldt, d, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        lapack_int lda_t = MAX(1,m);
+        lapack_int ldt_t = MAX(1,MIN(nb,n));
+        lapack_complex_float* a_t = NULL;
+        lapack_complex_float* t_t = NULL;
+        /* Check leading dimension(s) */
+        if( lda < n ) {
+            info = -6;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunhr_col_work", info );
+            return info;
+        }
+        if( ldt < n ) {
+            info = -8;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunhr_col_work", info );
+            return 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;
+        }
+        t_t = (lapack_complex_float*)
+            LAPACKE_malloc( sizeof(lapack_complex_float) *
+                            ldt_t * MAX(1,n) );
+        if( t_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_1;
+        }
+        /* Transpose input matrices */
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        /* Call LAPACK function and adjust info */
+        LAPACK_cunhr_col( &m, &n, &nb, a_t, &lda_t, t_t, &ldt_t, d, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+        /* Transpose output matrices */
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, ldt, n, t_t, ldt_t, t,
+                           ldt );
+        /* Release memory and exit */
+        LAPACKE_free( t_t );
+exit_level_1:
+        LAPACKE_free( a_t );
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunhr_col_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunhr_col_work", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_cunmbr.c b/LAPACKE/src/lapacke_cunmbr.c
index 3273b4297b..054d89bc5d 100644
--- a/LAPACKE/src/lapacke_cunmbr.c
+++ b/LAPACKE/src/lapacke_cunmbr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunmbr( int matrix_layout, char vect, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cunmbr)( int matrix_layout, char vect, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const lapack_complex_float* a, lapack_int lda,
                            const lapack_complex_float* tau,
@@ -44,27 +44,27 @@ lapack_int LAPACKE_cunmbr( int matrix_layout, char vect, char side, char trans,
     lapack_complex_float work_query;
     lapack_int nq, r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cunmbr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmbr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        nq = LAPACKE_lsame( side, 'l' ) ? m : n;
-        r = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k);
-        if( LAPACKE_cge_nancheck( matrix_layout, r, MIN(nq,k), a, lda ) ) {
+        nq = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ? nq : MIN(nq,k);
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, r, MIN(nq,k), a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -11;
         }
-        if( LAPACKE_c_nancheck( MIN(nq,k), tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( MIN(nq,k), tau, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cunmbr_work( matrix_layout, vect, side, trans, m, n, k, a,
+    info = API_SUFFIX(LAPACKE_cunmbr_work)( matrix_layout, vect, side, trans, m, n, k, a,
                                 lda, tau, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -78,13 +78,13 @@ lapack_int LAPACKE_cunmbr( int matrix_layout, char vect, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cunmbr_work( matrix_layout, vect, side, trans, m, n, k, a,
+    info = API_SUFFIX(LAPACKE_cunmbr_work)( matrix_layout, vect, side, trans, m, n, k, a,
                                 lda, tau, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cunmbr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmbr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunmbr_work.c b/LAPACKE/src/lapacke_cunmbr_work.c
index 75be3d9e46..06d8a97880 100644
--- a/LAPACKE/src/lapacke_cunmbr_work.c
+++ b/LAPACKE/src/lapacke_cunmbr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunmbr_work( int matrix_layout, char vect, char side,
+lapack_int API_SUFFIX(LAPACKE_cunmbr_work)( int matrix_layout, char vect, char side,
                                 char trans, lapack_int m, lapack_int n,
                                 lapack_int k, const lapack_complex_float* a,
                                 lapack_int lda, const lapack_complex_float* tau,
@@ -48,8 +48,8 @@ lapack_int LAPACKE_cunmbr_work( int matrix_layout, char vect, char side,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nq = LAPACKE_lsame( side, 'l' ) ? m : n;
-        lapack_int r = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k);
+        lapack_int nq = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ? nq : MIN(nq,k);
         lapack_int lda_t = MAX(1,r);
         lapack_int ldc_t = MAX(1,m);
         lapack_complex_float* a_t = NULL;
@@ -57,12 +57,12 @@ lapack_int LAPACKE_cunmbr_work( int matrix_layout, char vect, char side,
         /* Check leading dimension(s) */
         if( lda < MIN(nq,k) ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cunmbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmbr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_cunmbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmbr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -72,7 +72,7 @@ lapack_int LAPACKE_cunmbr_work( int matrix_layout, char vect, char side,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( vect, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ) {
           a_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * lda_t * MAX(1,k) );
         } else {
           a_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * lda_t * MAX(1,nq) );
@@ -88,8 +88,8 @@ lapack_int LAPACKE_cunmbr_work( int matrix_layout, char vect, char side,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, r, MIN(nq,k), a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, r, MIN(nq,k), a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cunmbr( &vect, &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t,
                        &ldc_t, work, &lwork, &info );
@@ -97,18 +97,18 @@ lapack_int LAPACKE_cunmbr_work( int matrix_layout, char vect, char side,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cunmbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmbr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cunmbr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmbr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunmhr.c b/LAPACKE/src/lapacke_cunmhr.c
index 003939ebf8..4305057eee 100644
--- a/LAPACKE/src/lapacke_cunmhr.c
+++ b/LAPACKE/src/lapacke_cunmhr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunmhr( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cunmhr)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int ilo,
                            lapack_int ihi, const lapack_complex_float* a,
                            lapack_int lda, const lapack_complex_float* tau,
@@ -44,26 +44,26 @@ lapack_int LAPACKE_cunmhr( int matrix_layout, char side, char trans,
     lapack_complex_float work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cunmhr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmhr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_cge_nancheck( matrix_layout, r, r, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, r, r, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -11;
         }
-        if( LAPACKE_c_nancheck( r-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( r-1, tau, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cunmhr_work( matrix_layout, side, trans, m, n, ilo, ihi, a,
+    info = API_SUFFIX(LAPACKE_cunmhr_work)( matrix_layout, side, trans, m, n, ilo, ihi, a,
                                 lda, tau, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -77,13 +77,13 @@ lapack_int LAPACKE_cunmhr( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cunmhr_work( matrix_layout, side, trans, m, n, ilo, ihi, a,
+    info = API_SUFFIX(LAPACKE_cunmhr_work)( matrix_layout, side, trans, m, n, ilo, ihi, a,
                                 lda, tau, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cunmhr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmhr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunmhr_work.c b/LAPACKE/src/lapacke_cunmhr_work.c
index d73a76f906..e4ae3d5579 100644
--- a/LAPACKE/src/lapacke_cunmhr_work.c
+++ b/LAPACKE/src/lapacke_cunmhr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunmhr_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cunmhr_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int ilo,
                                 lapack_int ihi, const lapack_complex_float* a,
                                 lapack_int lda, const lapack_complex_float* tau,
@@ -48,7 +48,7 @@ lapack_int LAPACKE_cunmhr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lapack_int lda_t = MAX(1,r);
         lapack_int ldc_t = MAX(1,m);
         lapack_complex_float* a_t = NULL;
@@ -56,12 +56,12 @@ lapack_int LAPACKE_cunmhr_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < r ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cunmhr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmhr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_cunmhr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmhr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_cunmhr_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, r, r, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, r, r, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cunmhr( &side, &trans, &m, &n, &ilo, &ihi, a_t, &lda_t, tau, c_t,
                        &ldc_t, work, &lwork, &info );
@@ -93,18 +93,18 @@ lapack_int LAPACKE_cunmhr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cunmhr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmhr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cunmhr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmhr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunmlq.c b/LAPACKE/src/lapacke_cunmlq.c
index 224fa7866d..2fa8089ef0 100644
--- a/LAPACKE/src/lapacke_cunmlq.c
+++ b/LAPACKE/src/lapacke_cunmlq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunmlq( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cunmlq)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const lapack_complex_float* a, lapack_int lda,
                            const lapack_complex_float* tau,
@@ -43,25 +43,26 @@ lapack_int LAPACKE_cunmlq( int matrix_layout, char side, char trans,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cunmlq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmlq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, k, m, a, lda ) ) {
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, k, r, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_c_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( k, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cunmlq_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_cunmlq_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +76,13 @@ lapack_int LAPACKE_cunmlq( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cunmlq_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_cunmlq_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cunmlq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmlq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunmlq_work.c b/LAPACKE/src/lapacke_cunmlq_work.c
index 204dc72a71..8a08fbdaba 100644
--- a/LAPACKE/src/lapacke_cunmlq_work.c
+++ b/LAPACKE/src/lapacke_cunmlq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunmlq_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cunmlq_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const lapack_complex_float* a, lapack_int lda,
                                 const lapack_complex_float* tau,
@@ -49,7 +49,7 @@ lapack_int LAPACKE_cunmlq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lapack_int lda_t = MAX(1,k);
         lapack_int ldc_t = MAX(1,m);
         lapack_complex_float* a_t = NULL;
@@ -57,12 +57,12 @@ lapack_int LAPACKE_cunmlq_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < r ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cunmlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmlq_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cunmlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmlq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -72,7 +72,7 @@ lapack_int LAPACKE_cunmlq_work( int matrix_layout, char side, char trans,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             a_t = (lapack_complex_float*)
                 LAPACKE_malloc( sizeof(lapack_complex_float) * lda_t * MAX(1,m) );
         } else {
@@ -90,8 +90,8 @@ lapack_int LAPACKE_cunmlq_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, k, r, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cunmlq( &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t, &ldc_t,
                        work, &lwork, &info );
@@ -99,18 +99,18 @@ lapack_int LAPACKE_cunmlq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cunmlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmlq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cunmlq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmlq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunmql.c b/LAPACKE/src/lapacke_cunmql.c
index 1256dd5475..96133ef66b 100644
--- a/LAPACKE/src/lapacke_cunmql.c
+++ b/LAPACKE/src/lapacke_cunmql.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunmql( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cunmql)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const lapack_complex_float* a, lapack_int lda,
                            const lapack_complex_float* tau,
@@ -44,26 +44,26 @@ lapack_int LAPACKE_cunmql( int matrix_layout, char side, char trans,
     lapack_complex_float work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cunmql", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmql", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_cge_nancheck( matrix_layout, r, k, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, r, k, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_c_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( k, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cunmql_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_cunmql_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -77,13 +77,13 @@ lapack_int LAPACKE_cunmql( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cunmql_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_cunmql_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cunmql", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmql", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunmql_work.c b/LAPACKE/src/lapacke_cunmql_work.c
index ccfda0ea60..58a338c5f6 100644
--- a/LAPACKE/src/lapacke_cunmql_work.c
+++ b/LAPACKE/src/lapacke_cunmql_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunmql_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cunmql_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const lapack_complex_float* a, lapack_int lda,
                                 const lapack_complex_float* tau,
@@ -48,7 +48,7 @@ lapack_int LAPACKE_cunmql_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lapack_int lda_t = MAX(1,r);
         lapack_int ldc_t = MAX(1,m);
         lapack_complex_float* a_t = NULL;
@@ -56,12 +56,12 @@ lapack_int LAPACKE_cunmql_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < k ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cunmql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmql_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cunmql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmql_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_cunmql_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, r, k, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, r, k, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cunmql( &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t, &ldc_t,
                        work, &lwork, &info );
@@ -93,18 +93,18 @@ lapack_int LAPACKE_cunmql_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cunmql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmql_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cunmql_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmql_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunmqr.c b/LAPACKE/src/lapacke_cunmqr.c
index a49796773b..e53fdc602a 100644
--- a/LAPACKE/src/lapacke_cunmqr.c
+++ b/LAPACKE/src/lapacke_cunmqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunmqr( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cunmqr)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const lapack_complex_float* a, lapack_int lda,
                            const lapack_complex_float* tau,
@@ -44,26 +44,26 @@ lapack_int LAPACKE_cunmqr( int matrix_layout, char side, char trans,
     lapack_complex_float work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cunmqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_cge_nancheck( matrix_layout, r, k, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, r, k, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_c_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( k, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cunmqr_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_cunmqr_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -77,13 +77,13 @@ lapack_int LAPACKE_cunmqr( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cunmqr_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_cunmqr_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cunmqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunmqr_work.c b/LAPACKE/src/lapacke_cunmqr_work.c
index ce5a37cbcc..a380912cea 100644
--- a/LAPACKE/src/lapacke_cunmqr_work.c
+++ b/LAPACKE/src/lapacke_cunmqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunmqr_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cunmqr_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const lapack_complex_float* a, lapack_int lda,
                                 const lapack_complex_float* tau,
@@ -48,7 +48,7 @@ lapack_int LAPACKE_cunmqr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lapack_int lda_t = MAX(1,r);
         lapack_int ldc_t = MAX(1,m);
         lapack_complex_float* a_t = NULL;
@@ -56,12 +56,12 @@ lapack_int LAPACKE_cunmqr_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < k ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cunmqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmqr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cunmqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_cunmqr_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, r, k, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, r, k, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cunmqr( &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t, &ldc_t,
                        work, &lwork, &info );
@@ -93,18 +93,18 @@ lapack_int LAPACKE_cunmqr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cunmqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cunmqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunmrq.c b/LAPACKE/src/lapacke_cunmrq.c
index e410b95c86..13edeb1886 100644
--- a/LAPACKE/src/lapacke_cunmrq.c
+++ b/LAPACKE/src/lapacke_cunmrq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunmrq( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cunmrq)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const lapack_complex_float* a, lapack_int lda,
                            const lapack_complex_float* tau,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_cunmrq( int matrix_layout, char side, char trans,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cunmrq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmrq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, k, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, k, m, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_c_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( k, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cunmrq_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_cunmrq_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_cunmrq( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cunmrq_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_cunmrq_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cunmrq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmrq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunmrq_work.c b/LAPACKE/src/lapacke_cunmrq_work.c
index cc99429406..2cb0379903 100644
--- a/LAPACKE/src/lapacke_cunmrq_work.c
+++ b/LAPACKE/src/lapacke_cunmrq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunmrq_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cunmrq_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const lapack_complex_float* a, lapack_int lda,
                                 const lapack_complex_float* tau,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_cunmrq_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cunmrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmrq_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cunmrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmrq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_cunmrq_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, k, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cunmrq( &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t, &ldc_t,
                        work, &lwork, &info );
@@ -92,18 +92,18 @@ lapack_int LAPACKE_cunmrq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cunmrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmrq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cunmrq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmrq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunmrz.c b/LAPACKE/src/lapacke_cunmrz.c
index c2e235ae84..a3f5859c00 100644
--- a/LAPACKE/src/lapacke_cunmrz.c
+++ b/LAPACKE/src/lapacke_cunmrz.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunmrz( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cunmrz)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            lapack_int l, const lapack_complex_float* a,
                            lapack_int lda, const lapack_complex_float* tau,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_cunmrz( int matrix_layout, char side, char trans,
     lapack_complex_float* work = NULL;
     lapack_complex_float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cunmrz", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmrz", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, k, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, k, m, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -11;
         }
-        if( LAPACKE_c_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( k, tau, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cunmrz_work( matrix_layout, side, trans, m, n, k, l, a, lda,
+    info = API_SUFFIX(LAPACKE_cunmrz_work)( matrix_layout, side, trans, m, n, k, l, a, lda,
                                 tau, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_cunmrz( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cunmrz_work( matrix_layout, side, trans, m, n, k, l, a, lda,
+    info = API_SUFFIX(LAPACKE_cunmrz_work)( matrix_layout, side, trans, m, n, k, l, a, lda,
                                 tau, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cunmrz", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmrz", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunmrz_work.c b/LAPACKE/src/lapacke_cunmrz_work.c
index 5dd15775a3..a634f0d4b9 100644
--- a/LAPACKE/src/lapacke_cunmrz_work.c
+++ b/LAPACKE/src/lapacke_cunmrz_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunmrz_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_cunmrz_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 lapack_int l, const lapack_complex_float* a,
                                 lapack_int lda, const lapack_complex_float* tau,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_cunmrz_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_cunmrz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmrz_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_cunmrz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmrz_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_cunmrz_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, k, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cunmrz( &side, &trans, &m, &n, &k, &l, a_t, &lda_t, tau, c_t,
                        &ldc_t, work, &lwork, &info );
@@ -92,18 +92,18 @@ lapack_int LAPACKE_cunmrz_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cunmrz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmrz_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cunmrz_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmrz_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunmtr.c b/LAPACKE/src/lapacke_cunmtr.c
index f98a205763..ab07409807 100644
--- a/LAPACKE/src/lapacke_cunmtr.c
+++ b/LAPACKE/src/lapacke_cunmtr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunmtr( int matrix_layout, char side, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_cunmtr)( int matrix_layout, char side, char uplo, char trans,
                            lapack_int m, lapack_int n,
                            const lapack_complex_float* a, lapack_int lda,
                            const lapack_complex_float* tau,
@@ -44,26 +44,26 @@ lapack_int LAPACKE_cunmtr( int matrix_layout, char side, char uplo, char trans,
     lapack_complex_float work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cunmtr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmtr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_che_nancheck( matrix_layout, uplo, r, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_che_nancheck)( matrix_layout, uplo, r, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_c_nancheck( r-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( r-1, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_cunmtr_work( matrix_layout, side, uplo, trans, m, n, a, lda,
+    info = API_SUFFIX(LAPACKE_cunmtr_work)( matrix_layout, side, uplo, trans, m, n, a, lda,
                                 tau, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -77,13 +77,13 @@ lapack_int LAPACKE_cunmtr( int matrix_layout, char side, char uplo, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cunmtr_work( matrix_layout, side, uplo, trans, m, n, a, lda,
+    info = API_SUFFIX(LAPACKE_cunmtr_work)( matrix_layout, side, uplo, trans, m, n, a, lda,
                                 tau, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cunmtr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmtr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cunmtr_work.c b/LAPACKE/src/lapacke_cunmtr_work.c
index 8a22f3c7e0..422607a6ab 100644
--- a/LAPACKE/src/lapacke_cunmtr_work.c
+++ b/LAPACKE/src/lapacke_cunmtr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cunmtr_work( int matrix_layout, char side, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cunmtr_work)( int matrix_layout, char side, char uplo,
                                 char trans, lapack_int m, lapack_int n,
                                 const lapack_complex_float* a, lapack_int lda,
                                 const lapack_complex_float* tau,
@@ -48,7 +48,7 @@ lapack_int LAPACKE_cunmtr_work( int matrix_layout, char side, char uplo,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lapack_int lda_t = MAX(1,r);
         lapack_int ldc_t = MAX(1,m);
         lapack_complex_float* a_t = NULL;
@@ -56,12 +56,12 @@ lapack_int LAPACKE_cunmtr_work( int matrix_layout, char side, char uplo,
         /* Check leading dimension(s) */
         if( lda < r ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_cunmtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmtr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_cunmtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmtr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_cunmtr_work( int matrix_layout, char side, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, r, r, a, lda, a_t, lda_t );
-        LAPACKE_cge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, r, r, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cunmtr( &side, &uplo, &trans, &m, &n, a_t, &lda_t, tau, c_t,
                        &ldc_t, work, &lwork, &info );
@@ -93,18 +93,18 @@ lapack_int LAPACKE_cunmtr_work( int matrix_layout, char side, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cunmtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmtr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cunmtr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cunmtr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cupgtr.c b/LAPACKE/src/lapacke_cupgtr.c
index 662cce33e7..118492c656 100644
--- a/LAPACKE/src/lapacke_cupgtr.c
+++ b/LAPACKE/src/lapacke_cupgtr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cupgtr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cupgtr)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_float* ap,
                            const lapack_complex_float* tau,
                            lapack_complex_float* q, lapack_int ldq )
@@ -40,16 +40,16 @@ lapack_int LAPACKE_cupgtr( int matrix_layout, char uplo, lapack_int n,
     lapack_int info = 0;
     lapack_complex_float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cupgtr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cupgtr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_cpp_nancheck)( n, ap ) ) {
             return -4;
         }
-        if( LAPACKE_c_nancheck( n-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( n-1, tau, 1 ) ) {
             return -5;
         }
     }
@@ -62,12 +62,12 @@ lapack_int LAPACKE_cupgtr( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cupgtr_work( matrix_layout, uplo, n, ap, tau, q, ldq, work );
+    info = API_SUFFIX(LAPACKE_cupgtr_work)( matrix_layout, uplo, n, ap, tau, q, ldq, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cupgtr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cupgtr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cupgtr_work.c b/LAPACKE/src/lapacke_cupgtr_work.c
index b37afb1c6e..95b9c2f62d 100644
--- a/LAPACKE/src/lapacke_cupgtr_work.c
+++ b/LAPACKE/src/lapacke_cupgtr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cupgtr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_cupgtr_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_float* ap,
                                 const lapack_complex_float* tau,
                                 lapack_complex_float* q, lapack_int ldq,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_cupgtr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldq < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_cupgtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cupgtr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,25 +70,25 @@ lapack_int LAPACKE_cupgtr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_cpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cupgtr( &uplo, &n, ap_t, tau, q_t, &ldq_t, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( q_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cupgtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cupgtr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cupgtr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cupgtr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cupmtr.c b/LAPACKE/src/lapacke_cupmtr.c
index 1ea17ca56b..4c6f4020d0 100644
--- a/LAPACKE/src/lapacke_cupmtr.c
+++ b/LAPACKE/src/lapacke_cupmtr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cupmtr( int matrix_layout, char side, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_cupmtr)( int matrix_layout, char side, char uplo, char trans,
                            lapack_int m, lapack_int n,
                            const lapack_complex_float* ap,
                            const lapack_complex_float* tau,
@@ -44,28 +44,28 @@ lapack_int LAPACKE_cupmtr( int matrix_layout, char side, char uplo, char trans,
     lapack_complex_float* work = NULL;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_cupmtr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cupmtr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_cpp_nancheck( r, ap ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_cpp_nancheck)( r, ap ) ) {
             return -7;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -9;
         }
-        if( LAPACKE_c_nancheck( r-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_c_nancheck)( r-1, tau, 1 ) ) {
             return -8;
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( side, 'l' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
         lwork = MAX(1,n);
-    } else if( LAPACKE_lsame( side, 'r' ) ) {
+    } else if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
         lwork = MAX(1,m);
     } else {
         lwork = 1; /* Any value */
@@ -78,13 +78,13 @@ lapack_int LAPACKE_cupmtr( int matrix_layout, char side, char uplo, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_cupmtr_work( matrix_layout, side, uplo, trans, m, n, ap, tau,
+    info = API_SUFFIX(LAPACKE_cupmtr_work)( matrix_layout, side, uplo, trans, m, n, ap, tau,
                                 c, ldc, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_cupmtr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cupmtr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_cupmtr_work.c b/LAPACKE/src/lapacke_cupmtr_work.c
index cb273ac44e..56d1424dff 100644
--- a/LAPACKE/src/lapacke_cupmtr_work.c
+++ b/LAPACKE/src/lapacke_cupmtr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_cupmtr_work( int matrix_layout, char side, char uplo,
+lapack_int API_SUFFIX(LAPACKE_cupmtr_work)( int matrix_layout, char side, char uplo,
                                 char trans, lapack_int m, lapack_int n,
                                 const lapack_complex_float* ap,
                                 const lapack_complex_float* tau,
@@ -48,14 +48,14 @@ lapack_int LAPACKE_cupmtr_work( int matrix_layout, char side, char uplo,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lapack_int ldc_t = MAX(1,m);
         lapack_complex_float* c_t = NULL;
         lapack_complex_float* ap_t = NULL;
         /* Check leading dimension(s) */
         if( ldc < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_cupmtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cupmtr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -73,8 +73,8 @@ lapack_int LAPACKE_cupmtr_work( int matrix_layout, char side, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
-        LAPACKE_cpp_trans( matrix_layout, uplo, r, ap, ap_t );
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_cpp_trans)( matrix_layout, uplo, r, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cupmtr( &side, &uplo, &trans, &m, &n, ap_t, tau, c_t, &ldc_t,
                        work, &info );
@@ -82,18 +82,18 @@ lapack_int LAPACKE_cupmtr_work( int matrix_layout, char side, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( c_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_cupmtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cupmtr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_cupmtr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cupmtr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dbbcsd.c b/LAPACKE/src/lapacke_dbbcsd.c
index afa01f3cbc..3f32865d75 100644
--- a/LAPACKE/src/lapacke_dbbcsd.c
+++ b/LAPACKE/src/lapacke_dbbcsd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dbbcsd( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_dbbcsd)( int matrix_layout, char jobu1, char jobu2,
                            char jobv1t, char jobv2t, char trans, lapack_int m,
                            lapack_int p, lapack_int q, double* theta,
                            double* phi, double* u1, lapack_int ldu1, double* u2,
@@ -48,10 +48,10 @@ lapack_int LAPACKE_dbbcsd( int matrix_layout, char jobu1, char jobu2,
     double work_query;
     int lapack_layout;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dbbcsd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbbcsd", -1 );
         return -1;
     }
-    if( LAPACKE_lsame( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+    if( API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
         lapack_layout = LAPACK_COL_MAJOR;
     } else {
         lapack_layout = LAPACK_ROW_MAJOR;
@@ -59,36 +59,36 @@ lapack_int LAPACKE_dbbcsd( int matrix_layout, char jobu1, char jobu2,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( q-1, phi, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( q-1, phi, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_d_nancheck( q, theta, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( q, theta, 1 ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( jobu1, 'y' ) ) {
-            if( LAPACKE_dge_nancheck( lapack_layout, p, p, u1, ldu1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( lapack_layout, p, p, u1, ldu1 ) ) {
                 return -12;
             }
         }
-        if( LAPACKE_lsame( jobu2, 'y' ) ) {
-            if( LAPACKE_dge_nancheck( lapack_layout, m-p, m-p, u2, ldu2 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( lapack_layout, m-p, m-p, u2, ldu2 ) ) {
                 return -14;
             }
         }
-        if( LAPACKE_lsame( jobv1t, 'y' ) ) {
-            if( LAPACKE_dge_nancheck( lapack_layout, q, q, v1t, ldv1t ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( lapack_layout, q, q, v1t, ldv1t ) ) {
                 return -16;
             }
         }
-        if( LAPACKE_lsame( jobv2t, 'y' ) ) {
-            if( LAPACKE_dge_nancheck( lapack_layout, m-q, m-q, v2t, ldv2t ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv2t, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( lapack_layout, m-q, m-q, v2t, ldv2t ) ) {
                 return -18;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dbbcsd_work( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
+    info = API_SUFFIX(LAPACKE_dbbcsd_work)( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
                                 trans, m, p, q, theta, phi, u1, ldu1, u2, ldu2,
                                 v1t, ldv1t, v2t, ldv2t, b11d, b11e, b12d, b12e,
                                 b21d, b21e, b22d, b22e, &work_query, lwork );
@@ -103,7 +103,7 @@ lapack_int LAPACKE_dbbcsd( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dbbcsd_work( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
+    info = API_SUFFIX(LAPACKE_dbbcsd_work)( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
                                 trans, m, p, q, theta, phi, u1, ldu1, u2, ldu2,
                                 v1t, ldv1t, v2t, ldv2t, b11d, b11e, b12d, b12e,
                                 b21d, b21e, b22d, b22e, work, lwork );
@@ -111,7 +111,7 @@ lapack_int LAPACKE_dbbcsd( int matrix_layout, char jobu1, char jobu2,
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dbbcsd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbbcsd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dbbcsd_work.c b/LAPACKE/src/lapacke_dbbcsd_work.c
index 888fa6c2b3..45424f5702 100644
--- a/LAPACKE/src/lapacke_dbbcsd_work.c
+++ b/LAPACKE/src/lapacke_dbbcsd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dbbcsd_work( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_dbbcsd_work)( int matrix_layout, char jobu1, char jobu2,
                                 char jobv1t, char jobv2t, char trans,
                                 lapack_int m, lapack_int p, lapack_int q,
                                 double* theta, double* phi, double* u1,
@@ -61,7 +61,7 @@ lapack_int LAPACKE_dbbcsd_work( int matrix_layout, char jobu1, char jobu2,
     if( matrix_layout == LAPACK_COL_MAJOR ||
         matrix_layout == LAPACK_ROW_MAJOR ) {
         char ltrans;
-        if( !LAPACKE_lsame( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+        if( !API_SUFFIX(LAPACKE_lsame)( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
             ltrans = 'n';
         } else {
             ltrans = 't';
@@ -76,7 +76,7 @@ lapack_int LAPACKE_dbbcsd_work( int matrix_layout, char jobu1, char jobu2,
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dbbcsd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbbcsd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dbdsdc.c b/LAPACKE/src/lapacke_dbdsdc.c
index aaa7060990..46500e130d 100644
--- a/LAPACKE/src/lapacke_dbdsdc.c
+++ b/LAPACKE/src/lapacke_dbdsdc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dbdsdc( int matrix_layout, char uplo, char compq,
+lapack_int API_SUFFIX(LAPACKE_dbdsdc)( int matrix_layout, char uplo, char compq,
                            lapack_int n, double* d, double* e, double* u,
                            lapack_int ldu, double* vt, lapack_int ldvt,
                            double* q, lapack_int* iq )
@@ -43,26 +43,26 @@ lapack_int LAPACKE_dbdsdc( int matrix_layout, char uplo, char compq,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dbdsdc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsdc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( compq, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) ) {
         lwork = (size_t)3*MAX(1,n)*MAX(1,n)+4*MAX(1,n);
-    } else if( LAPACKE_lsame( compq, 'p' ) ) {
+    } else if( API_SUFFIX(LAPACKE_lsame)( compq, 'p' ) ) {
         lwork = MAX(1,6*n);
-    } else if( LAPACKE_lsame( compq, 'n' ) ) {
+    } else if( API_SUFFIX(LAPACKE_lsame)( compq, 'n' ) ) {
         lwork = MAX(1,4*n);
     } else {
         lwork = 1; /* Any value */
@@ -79,7 +79,7 @@ lapack_int LAPACKE_dbdsdc( int matrix_layout, char uplo, char compq,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dbdsdc_work( matrix_layout, uplo, compq, n, d, e, u, ldu, vt,
+    info = API_SUFFIX(LAPACKE_dbdsdc_work)( matrix_layout, uplo, compq, n, d, e, u, ldu, vt,
                                 ldvt, q, iq, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -87,7 +87,7 @@ lapack_int LAPACKE_dbdsdc( int matrix_layout, char uplo, char compq,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dbdsdc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsdc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dbdsdc_work.c b/LAPACKE/src/lapacke_dbdsdc_work.c
index 7e498a225d..9f4d8c94b9 100644
--- a/LAPACKE/src/lapacke_dbdsdc_work.c
+++ b/LAPACKE/src/lapacke_dbdsdc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dbdsdc_work( int matrix_layout, char uplo, char compq,
+lapack_int API_SUFFIX(LAPACKE_dbdsdc_work)( int matrix_layout, char uplo, char compq,
                                 lapack_int n, double* d, double* e, double* u,
                                 lapack_int ldu, double* vt, lapack_int ldvt,
                                 double* q, lapack_int* iq, double* work,
@@ -54,23 +54,23 @@ lapack_int LAPACKE_dbdsdc_work( int matrix_layout, char uplo, char compq,
         /* Check leading dimension(s) */
         if( ldu < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dbdsdc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsdc_work", info );
             return info;
         }
         if( ldvt < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dbdsdc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsdc_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( compq, 'i' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) ) {
             u_t = (double*)LAPACKE_malloc( sizeof(double) * ldu_t * MAX(1,n) );
             if( u_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_0;
             }
         }
-        if( LAPACKE_lsame( compq, 'i' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) ) {
             vt_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvt_t * MAX(1,n) );
             if( vt_t == NULL ) {
@@ -85,27 +85,27 @@ lapack_int LAPACKE_dbdsdc_work( int matrix_layout, char uplo, char compq,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( compq, 'i' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, u_t, ldu_t, u, ldu );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( compq, 'i' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, vt_t, ldvt_t, vt, ldvt );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, vt_t, ldvt_t, vt, ldvt );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compq, 'i' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) ) {
             LAPACKE_free( vt_t );
         }
 exit_level_1:
-        if( LAPACKE_lsame( compq, 'i' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dbdsdc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsdc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dbdsdc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsdc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dbdsqr.c b/LAPACKE/src/lapacke_dbdsqr.c
index 2f0ba24307..2b78a31d7d 100644
--- a/LAPACKE/src/lapacke_dbdsqr.c
+++ b/LAPACKE/src/lapacke_dbdsqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dbdsqr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dbdsqr)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int ncvt, lapack_int nru, lapack_int ncc,
                            double* d, double* e, double* vt, lapack_int ldvt,
                            double* u, lapack_int ldu, double* c,
@@ -41,30 +41,30 @@ lapack_int LAPACKE_dbdsqr( int matrix_layout, char uplo, lapack_int n,
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dbdsqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
         if( ncc != 0 ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, ncc, c, ldc ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, ncc, c, ldc ) ) {
                 return -13;
             }
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -8;
         }
         if( nru != 0 ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, nru, n, u, ldu ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, nru, n, u, ldu ) ) {
                 return -11;
             }
         }
         if( ncvt != 0 ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, ncvt, vt, ldvt ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, ncvt, vt, ldvt ) ) {
                 return -9;
             }
         }
@@ -77,13 +77,13 @@ lapack_int LAPACKE_dbdsqr( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dbdsqr_work( matrix_layout, uplo, n, ncvt, nru, ncc, d, e, vt,
+    info = API_SUFFIX(LAPACKE_dbdsqr_work)( matrix_layout, uplo, n, ncvt, nru, ncc, d, e, vt,
                                 ldvt, u, ldu, c, ldc, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dbdsqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dbdsqr_work.c b/LAPACKE/src/lapacke_dbdsqr_work.c
index d3330cf9b1..7f5cde0bea 100644
--- a/LAPACKE/src/lapacke_dbdsqr_work.c
+++ b/LAPACKE/src/lapacke_dbdsqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dbdsqr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dbdsqr_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int ncvt, lapack_int nru, lapack_int ncc,
                                 double* d, double* e, double* vt,
                                 lapack_int ldvt, double* u, lapack_int ldu,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_dbdsqr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldc < ncc ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_dbdsqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsqr_work", info );
             return info;
         }
         if( ldu < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dbdsqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsqr_work", info );
             return info;
         }
         if( ldvt < ncvt ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dbdsqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsqr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -95,13 +95,13 @@ lapack_int LAPACKE_dbdsqr_work( int matrix_layout, char uplo, lapack_int n,
         }
         /* Transpose input matrices */
         if( ncvt != 0 ) {
-            LAPACKE_dge_trans( matrix_layout, n, ncvt, vt, ldvt, vt_t, ldvt_t );
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, ncvt, vt, ldvt, vt_t, ldvt_t );
         }
         if( nru != 0 ) {
-            LAPACKE_dge_trans( matrix_layout, nru, n, u, ldu, u_t, ldu_t );
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, nru, n, u, ldu, u_t, ldu_t );
         }
         if( ncc != 0 ) {
-            LAPACKE_dge_trans( matrix_layout, n, ncc, c, ldc, c_t, ldc_t );
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, ncc, c, ldc, c_t, ldc_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dbdsqr( &uplo, &n, &ncvt, &nru, &ncc, d, e, vt_t, &ldvt_t, u_t,
@@ -111,14 +111,14 @@ lapack_int LAPACKE_dbdsqr_work( int matrix_layout, char uplo, lapack_int n,
         }
         /* Transpose output matrices */
         if( ncvt != 0 ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, ncvt, vt_t, ldvt_t, vt,
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, ncvt, vt_t, ldvt_t, vt,
                                ldvt );
         }
         if( nru != 0 ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nru, n, u_t, ldu_t, u, ldu );
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nru, n, u_t, ldu_t, u, ldu );
         }
         if( ncc != 0 ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, ncc, c_t, ldc_t, c, ldc );
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, ncc, c_t, ldc_t, c, ldc );
         }
         /* Release memory and exit */
         if( ncc != 0 ) {
@@ -134,11 +134,11 @@ lapack_int LAPACKE_dbdsqr_work( int matrix_layout, char uplo, lapack_int n,
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dbdsqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dbdsqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dbdsvdx.c b/LAPACKE/src/lapacke_dbdsvdx.c
index 88d0e87654..dddea43450 100644
--- a/LAPACKE/src/lapacke_dbdsvdx.c
+++ b/LAPACKE/src/lapacke_dbdsvdx.c
@@ -32,8 +32,8 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dbdsvdx( int matrix_layout, char uplo, char jobz, char range,
-                           lapack_int n, double* d, double* e,
+lapack_int API_SUFFIX(LAPACKE_dbdsvdx)( int matrix_layout, char uplo, char jobz, char range,
+                           lapack_int n, const double* d, const double* e,
                            double vl, double vu,
                            lapack_int il, lapack_int iu, lapack_int* ns,
                            double* s, double* z, lapack_int ldz,
@@ -45,16 +45,16 @@ lapack_int LAPACKE_dbdsvdx( int matrix_layout, char uplo, char jobz, char range,
     lapack_int* iwork = NULL;
     lapack_int i;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dbdsvdx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsvdx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( n - 1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n - 1, e, 1 ) ) {
             return -7;
         }
     }
@@ -71,7 +71,7 @@ lapack_int LAPACKE_dbdsvdx( int matrix_layout, char uplo, char jobz, char range,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dbdsvdx_work( matrix_layout, uplo, jobz,  range,
+    info = API_SUFFIX(LAPACKE_dbdsvdx_work)( matrix_layout, uplo, jobz,  range,
                                  n, d, e, vl, vu, il, iu, ns, s, z,
                                  ldz, work, iwork);
     /* Backup significant data from working array(s) */
@@ -84,7 +84,7 @@ lapack_int LAPACKE_dbdsvdx( int matrix_layout, char uplo, char jobz, char range,
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dbdsvdx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsvdx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dbdsvdx_work.c b/LAPACKE/src/lapacke_dbdsvdx_work.c
index f5506ac1dc..20f6ee2686 100644
--- a/LAPACKE/src/lapacke_dbdsvdx_work.c
+++ b/LAPACKE/src/lapacke_dbdsvdx_work.c
@@ -32,8 +32,8 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dbdsvdx_work( int matrix_layout, char uplo, char jobz, char range,
-                                 lapack_int n, double* d, double* e,
+lapack_int API_SUFFIX(LAPACKE_dbdsvdx_work)( int matrix_layout, char uplo, char jobz, char range,
+                                 lapack_int n, const double* d, const double* e,
                                  double vl, double vu,
                                  lapack_int il, lapack_int iu, lapack_int* ns,
                                  double* s, double* z, lapack_int ldz,
@@ -49,19 +49,19 @@ lapack_int LAPACKE_dbdsvdx_work( int matrix_layout, char uplo, char jobz, char r
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_z = ( LAPACKE_lsame( jobz, 'v' ) ) ? 2*n : 0;
-        lapack_int ncols_z = ( LAPACKE_lsame( jobz, 'v' ) ) ?
-            ( LAPACKE_lsame( range, 'i' ) ? MAX(0,iu - il + 1) : n + 1 ) : 0;
+        lapack_int nrows_z = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) ? 2*n : 0;
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) ?
+            ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? MAX(0,iu - il + 1) : n + 1 ) : 0;
         lapack_int ldz_t = MAX(1,nrows_z);
         double* z_t = NULL;
         /* Check leading dimension(s) */
         if( ldz < ncols_z ) {
             info = -3;
-            LAPACKE_xerbla( "LAPACKE_dbdsvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsvdx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
            z_t = (double*)
               LAPACKE_malloc( sizeof(double) * ldz_t * MAX(ncols_z,1) );
            if( z_t == NULL ) {
@@ -77,20 +77,20 @@ lapack_int LAPACKE_dbdsvdx_work( int matrix_layout, char uplo, char jobz, char r
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_z, ncols_z, z_t, ldz_t, z, ldz);
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_z, ncols_z, z_t, ldz_t, z, ldz);
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dbdsvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsvdx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dbdsvdx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dbdsvdx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ddisna.c b/LAPACKE/src/lapacke_ddisna.c
index a73a6e9478..919cad029a 100644
--- a/LAPACKE/src/lapacke_ddisna.c
+++ b/LAPACKE/src/lapacke_ddisna.c
@@ -32,16 +32,16 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ddisna( char job, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ddisna)( char job, lapack_int m, lapack_int n,
                            const double* d, double* sep )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( MIN(m,n), d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( MIN(m,n), d, 1 ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_ddisna_work( job, m, n, d, sep );
+    return API_SUFFIX(LAPACKE_ddisna_work)( job, m, n, d, sep );
 }
diff --git a/LAPACKE/src/lapacke_ddisna_work.c b/LAPACKE/src/lapacke_ddisna_work.c
index b8e03c6836..dadbd8be11 100644
--- a/LAPACKE/src/lapacke_ddisna_work.c
+++ b/LAPACKE/src/lapacke_ddisna_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ddisna_work( char job, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ddisna_work)( char job, lapack_int m, lapack_int n,
                                 const double* d, double* sep )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_dgbbrd.c b/LAPACKE/src/lapacke_dgbbrd.c
index ff655d969e..68d2614b6d 100644
--- a/LAPACKE/src/lapacke_dgbbrd.c
+++ b/LAPACKE/src/lapacke_dgbbrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbbrd( int matrix_layout, char vect, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dgbbrd)( int matrix_layout, char vect, lapack_int m,
                            lapack_int n, lapack_int ncc, lapack_int kl,
                            lapack_int ku, double* ab, lapack_int ldab,
                            double* d, double* e, double* q, lapack_int ldq,
@@ -42,17 +42,17 @@ lapack_int LAPACKE_dgbbrd( int matrix_layout, char vect, lapack_int m,
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgbbrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbbrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dgb_nancheck( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
             return -8;
         }
         if( ncc != 0 ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, m, ncc, c, ldc ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, ncc, c, ldc ) ) {
                 return -16;
             }
         }
@@ -65,13 +65,13 @@ lapack_int LAPACKE_dgbbrd( int matrix_layout, char vect, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgbbrd_work( matrix_layout, vect, m, n, ncc, kl, ku, ab, ldab,
+    info = API_SUFFIX(LAPACKE_dgbbrd_work)( matrix_layout, vect, m, n, ncc, kl, ku, ab, ldab,
                                 d, e, q, ldq, pt, ldpt, c, ldc, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgbbrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbbrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgbbrd_work.c b/LAPACKE/src/lapacke_dgbbrd_work.c
index 79c7a9ec11..98fccae1f5 100644
--- a/LAPACKE/src/lapacke_dgbbrd_work.c
+++ b/LAPACKE/src/lapacke_dgbbrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbbrd_work( int matrix_layout, char vect, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dgbbrd_work)( int matrix_layout, char vect, lapack_int m,
                                 lapack_int n, lapack_int ncc, lapack_int kl,
                                 lapack_int ku, double* ab, lapack_int ldab,
                                 double* d, double* e, double* q, lapack_int ldq,
@@ -59,22 +59,22 @@ lapack_int LAPACKE_dgbbrd_work( int matrix_layout, char vect, lapack_int m,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbbrd_work", info );
             return info;
         }
         if( ldc < ncc ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_dgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbbrd_work", info );
             return info;
         }
         if( ldpt < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbbrd_work", info );
             return info;
         }
         if( ldq < m ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbbrd_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -83,14 +83,14 @@ lapack_int LAPACKE_dgbbrd_work( int matrix_layout, char vect, lapack_int m,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ) {
             q_t = (double*)LAPACKE_malloc( sizeof(double) * ldq_t * MAX(1,m) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'p' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'p' ) ) {
             pt_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldpt_t * MAX(1,n) );
             if( pt_t == NULL ) {
@@ -107,9 +107,9 @@ lapack_int LAPACKE_dgbbrd_work( int matrix_layout, char vect, lapack_int m,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dgb_trans( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
         if( ncc != 0 ) {
-            LAPACKE_dge_trans( matrix_layout, m, ncc, c, ldc, c_t, ldc_t );
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, ncc, c, ldc, c_t, ldc_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dgbbrd( &vect, &m, &n, &ncc, &kl, &ku, ab_t, &ldab_t, d, e, q_t,
@@ -118,38 +118,38 @@ lapack_int LAPACKE_dgbbrd_work( int matrix_layout, char vect, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dgb_trans( LAPACK_COL_MAJOR, m, n, kl, ku, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_dgb_trans)( LAPACK_COL_MAJOR, m, n, kl, ku, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'q' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, m, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, m, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'p' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, pt_t, ldpt_t, pt, ldpt );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'p' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, pt_t, ldpt_t, pt, ldpt );
         }
         if( ncc != 0 ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, ncc, c_t, ldc_t, c, ldc );
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, ncc, c_t, ldc_t, c, ldc );
         }
         /* Release memory and exit */
         if( ncc != 0 ) {
             LAPACKE_free( c_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'p' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'p' ) ) {
             LAPACKE_free( pt_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbbrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgbbrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbbrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgbcon.c b/LAPACKE/src/lapacke_dgbcon.c
index c1d0f430e5..866c8c3322 100644
--- a/LAPACKE/src/lapacke_dgbcon.c
+++ b/LAPACKE/src/lapacke_dgbcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbcon( int matrix_layout, char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgbcon)( int matrix_layout, char norm, lapack_int n,
                            lapack_int kl, lapack_int ku, const double* ab,
                            lapack_int ldab, const lapack_int* ipiv,
                            double anorm, double* rcond )
@@ -41,16 +41,16 @@ lapack_int LAPACKE_dgbcon( int matrix_layout, char norm, lapack_int n,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgbcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dgb_nancheck( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -9;
         }
     }
@@ -67,7 +67,7 @@ lapack_int LAPACKE_dgbcon( int matrix_layout, char norm, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgbcon_work( matrix_layout, norm, n, kl, ku, ab, ldab, ipiv,
+    info = API_SUFFIX(LAPACKE_dgbcon_work)( matrix_layout, norm, n, kl, ku, ab, ldab, ipiv,
                                 anorm, rcond, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -75,7 +75,7 @@ lapack_int LAPACKE_dgbcon( int matrix_layout, char norm, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgbcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgbcon_work.c b/LAPACKE/src/lapacke_dgbcon_work.c
index 1e7904e6e5..ca0bb14557 100644
--- a/LAPACKE/src/lapacke_dgbcon_work.c
+++ b/LAPACKE/src/lapacke_dgbcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbcon_work( int matrix_layout, char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgbcon_work)( int matrix_layout, char norm, lapack_int n,
                                 lapack_int kl, lapack_int ku, const double* ab,
                                 lapack_int ldab, const lapack_int* ipiv,
                                 double anorm, double* rcond, double* work,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_dgbcon_work( int matrix_layout, char norm, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dgbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbcon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -62,7 +62,7 @@ lapack_int LAPACKE_dgbcon_work( int matrix_layout, char norm, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dgb_trans( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
                            ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgbcon( &norm, &n, &kl, &ku, ab_t, &ldab_t, ipiv, &anorm, rcond,
@@ -74,11 +74,11 @@ lapack_int LAPACKE_dgbcon_work( int matrix_layout, char norm, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgbcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgbequ.c b/LAPACKE/src/lapacke_dgbequ.c
index 465e599e8b..78fb51fb4f 100644
--- a/LAPACKE/src/lapacke_dgbequ.c
+++ b/LAPACKE/src/lapacke_dgbequ.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbequ( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgbequ)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int kl, lapack_int ku, const double* ab,
                            lapack_int ldab, double* r, double* c,
                            double* rowcnd, double* colcnd, double* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgbequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dgb_nancheck( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_dgbequ_work( matrix_layout, m, n, kl, ku, ab, ldab, r, c,
+    return API_SUFFIX(LAPACKE_dgbequ_work)( matrix_layout, m, n, kl, ku, ab, ldab, r, c,
                                 rowcnd, colcnd, amax );
 }
diff --git a/LAPACKE/src/lapacke_dgbequ_work.c b/LAPACKE/src/lapacke_dgbequ_work.c
index fcba3475b1..dbd1cb5747 100644
--- a/LAPACKE/src/lapacke_dgbequ_work.c
+++ b/LAPACKE/src/lapacke_dgbequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbequ_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgbequ_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int kl, lapack_int ku, const double* ab,
                                 lapack_int ldab, double* r, double* c,
                                 double* rowcnd, double* colcnd, double* amax )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_dgbequ_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dgbequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbequ_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_dgbequ_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dgb_trans( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgbequ( &m, &n, &kl, &ku, ab_t, &ldab_t, r, c, rowcnd, colcnd,
                        amax, &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_dgbequ_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgbequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgbequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgbequb.c b/LAPACKE/src/lapacke_dgbequb.c
index 6fbbdb2b53..d7befeda6f 100644
--- a/LAPACKE/src/lapacke_dgbequb.c
+++ b/LAPACKE/src/lapacke_dgbequb.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbequb( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgbequb)( int matrix_layout, lapack_int m, lapack_int n,
                             lapack_int kl, lapack_int ku, const double* ab,
                             lapack_int ldab, double* r, double* c,
                             double* rowcnd, double* colcnd, double* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgbequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbequb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dgb_nancheck( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_dgbequb_work( matrix_layout, m, n, kl, ku, ab, ldab, r, c,
+    return API_SUFFIX(LAPACKE_dgbequb_work)( matrix_layout, m, n, kl, ku, ab, ldab, r, c,
                                  rowcnd, colcnd, amax );
 }
diff --git a/LAPACKE/src/lapacke_dgbequb_work.c b/LAPACKE/src/lapacke_dgbequb_work.c
index 3eaafa13c6..bf83deaa17 100644
--- a/LAPACKE/src/lapacke_dgbequb_work.c
+++ b/LAPACKE/src/lapacke_dgbequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbequb_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgbequb_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  lapack_int kl, lapack_int ku, const double* ab,
                                  lapack_int ldab, double* r, double* c,
                                  double* rowcnd, double* colcnd, double* amax )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_dgbequb_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dgbequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_dgbequb_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dgb_trans( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgbequb( &m, &n, &kl, &ku, ab_t, &ldab_t, r, c, rowcnd, colcnd,
                         amax, &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_dgbequb_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgbequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgbequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgbrfs.c b/LAPACKE/src/lapacke_dgbrfs.c
index 7877ab94d1..a93c1c1f78 100644
--- a/LAPACKE/src/lapacke_dgbrfs.c
+++ b/LAPACKE/src/lapacke_dgbrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbrfs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgbrfs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int kl, lapack_int ku, lapack_int nrhs,
                            const double* ab, lapack_int ldab, const double* afb,
                            lapack_int ldafb, const lapack_int* ipiv,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_dgbrfs( int matrix_layout, char trans, lapack_int n,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgbrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dgb_nancheck( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_dgb_nancheck( matrix_layout, n, n, kl, kl+ku, afb, ldafb ) ) {
+        if( API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, kl, kl+ku, afb, ldafb ) ) {
             return -9;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -14;
         }
     }
@@ -75,7 +75,7 @@ lapack_int LAPACKE_dgbrfs( int matrix_layout, char trans, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgbrfs_work( matrix_layout, trans, n, kl, ku, nrhs, ab, ldab,
+    info = API_SUFFIX(LAPACKE_dgbrfs_work)( matrix_layout, trans, n, kl, ku, nrhs, ab, ldab,
                                 afb, ldafb, ipiv, b, ldb, x, ldx, ferr, berr,
                                 work, iwork );
     /* Release memory and exit */
@@ -84,7 +84,7 @@ lapack_int LAPACKE_dgbrfs( int matrix_layout, char trans, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgbrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgbrfs_work.c b/LAPACKE/src/lapacke_dgbrfs_work.c
index 9c095e2832..8fcc5b67f7 100644
--- a/LAPACKE/src/lapacke_dgbrfs_work.c
+++ b/LAPACKE/src/lapacke_dgbrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbrfs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgbrfs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int kl, lapack_int ku, lapack_int nrhs,
                                 const double* ab, lapack_int ldab,
                                 const double* afb, lapack_int ldafb,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_dgbrfs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbrfs_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -101,11 +101,11 @@ lapack_int LAPACKE_dgbrfs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_dgb_trans( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
-        LAPACKE_dgb_trans( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
                            ldafb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgbrfs( &trans, &n, &kl, &ku, &nrhs, ab_t, &ldab_t, afb_t,
                        &ldafb_t, ipiv, b_t, &ldb_t, x_t, &ldx_t, ferr, berr,
@@ -114,7 +114,7 @@ lapack_int LAPACKE_dgbrfs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -125,11 +125,11 @@ lapack_int LAPACKE_dgbrfs_work( int matrix_layout, char trans, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgbrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgbrfsx.c b/LAPACKE/src/lapacke_dgbrfsx.c
index 3f54f67e87..128355b8df 100644
--- a/LAPACKE/src/lapacke_dgbrfsx.c
+++ b/LAPACKE/src/lapacke_dgbrfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbrfsx( int matrix_layout, char trans, char equed,
+lapack_int API_SUFFIX(LAPACKE_dgbrfsx)( int matrix_layout, char trans, char equed,
                             lapack_int n, lapack_int kl, lapack_int ku,
                             lapack_int nrhs, const double* ab, lapack_int ldab,
                             const double* afb, lapack_int ldafb,
@@ -47,37 +47,37 @@ lapack_int LAPACKE_dgbrfsx( int matrix_layout, char trans, char equed,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgbrfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbrfsx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dgb_nancheck( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_dgb_nancheck( matrix_layout, n, n, kl, kl+ku, afb, ldafb ) ) {
+        if( API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, kl, kl+ku, afb, ldafb ) ) {
             return -10;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -15;
         }
-        if( LAPACKE_lsame( equed, 'b' ) || LAPACKE_lsame( equed, 'c' ) ) {
-            if( LAPACKE_d_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'b' ) || API_SUFFIX(LAPACKE_lsame)( equed, 'c' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, c, 1 ) ) {
                 return -14;
             }
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -25;
             }
         }
-        if( LAPACKE_lsame( equed, 'b' ) || LAPACKE_lsame( equed, 'r' ) ) {
-            if( LAPACKE_d_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'b' ) || API_SUFFIX(LAPACKE_lsame)( equed, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, r, 1 ) ) {
                 return -13;
             }
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -17;
         }
     }
@@ -94,7 +94,7 @@ lapack_int LAPACKE_dgbrfsx( int matrix_layout, char trans, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgbrfsx_work( matrix_layout, trans, equed, n, kl, ku, nrhs,
+    info = API_SUFFIX(LAPACKE_dgbrfsx_work)( matrix_layout, trans, equed, n, kl, ku, nrhs,
                                  ab, ldab, afb, ldafb, ipiv, r, c, b, ldb, x,
                                  ldx, rcond, berr, n_err_bnds, err_bnds_norm,
                                  err_bnds_comp, nparams, params, work, iwork );
@@ -104,7 +104,7 @@ lapack_int LAPACKE_dgbrfsx( int matrix_layout, char trans, char equed,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgbrfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbrfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgbrfsx_work.c b/LAPACKE/src/lapacke_dgbrfsx_work.c
index 484d10d96f..bae397f585 100644
--- a/LAPACKE/src/lapacke_dgbrfsx_work.c
+++ b/LAPACKE/src/lapacke_dgbrfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbrfsx_work( int matrix_layout, char trans, char equed,
+lapack_int API_SUFFIX(LAPACKE_dgbrfsx_work)( int matrix_layout, char trans, char equed,
                                  lapack_int n, lapack_int kl, lapack_int ku,
                                  lapack_int nrhs, const double* ab,
                                  lapack_int ldab, const double* afb,
@@ -69,22 +69,22 @@ lapack_int LAPACKE_dgbrfsx_work( int matrix_layout, char trans, char equed,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbrfsx_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbrfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_dgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbrfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -18;
-            LAPACKE_xerbla( "LAPACKE_dgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbrfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -121,11 +121,11 @@ lapack_int LAPACKE_dgbrfsx_work( int matrix_layout, char trans, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_dgb_trans( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
-        LAPACKE_dgb_trans( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
                            ldafb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgbrfsx( &trans, &equed, &n, &kl, &ku, &nrhs, ab_t, &ldab_t,
                         afb_t, &ldafb_t, ipiv, r, c, b_t, &ldb_t, x_t, &ldx_t,
@@ -135,10 +135,10 @@ lapack_int LAPACKE_dgbrfsx_work( int matrix_layout, char trans, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -154,11 +154,11 @@ lapack_int LAPACKE_dgbrfsx_work( int matrix_layout, char trans, char equed,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbrfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgbrfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbrfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgbsv.c b/LAPACKE/src/lapacke_dgbsv.c
index 305ad68c81..a36906e5a4 100644
--- a/LAPACKE/src/lapacke_dgbsv.c
+++ b/LAPACKE/src/lapacke_dgbsv.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbsv( int matrix_layout, lapack_int n, lapack_int kl,
+lapack_int API_SUFFIX(LAPACKE_dgbsv)( int matrix_layout, lapack_int n, lapack_int kl,
                           lapack_int ku, lapack_int nrhs, double* ab,
                           lapack_int ldab, lapack_int* ipiv, double* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgbsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dgb_nancheck( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_dgbsv_work( matrix_layout, n, kl, ku, nrhs, ab, ldab, ipiv, b,
+    return API_SUFFIX(LAPACKE_dgbsv_work)( matrix_layout, n, kl, ku, nrhs, ab, ldab, ipiv, b,
                                ldb );
 }
diff --git a/LAPACKE/src/lapacke_dgbsv_work.c b/LAPACKE/src/lapacke_dgbsv_work.c
index cb29d3d952..f927851157 100644
--- a/LAPACKE/src/lapacke_dgbsv_work.c
+++ b/LAPACKE/src/lapacke_dgbsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbsv_work( int matrix_layout, lapack_int n, lapack_int kl,
+lapack_int API_SUFFIX(LAPACKE_dgbsv_work)( int matrix_layout, lapack_int n, lapack_int kl,
                                lapack_int ku, lapack_int nrhs, double* ab,
                                lapack_int ldab, lapack_int* ipiv, double* b,
                                lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_dgbsv_work( int matrix_layout, lapack_int n, lapack_int kl,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dgbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dgbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,9 +72,9 @@ lapack_int LAPACKE_dgbsv_work( int matrix_layout, lapack_int n, lapack_int kl,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dgb_trans( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
                            ldab_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgbsv( &n, &kl, &ku, &nrhs, ab_t, &ldab_t, ipiv, b_t, &ldb_t,
                       &info );
@@ -82,20 +82,20 @@ lapack_int LAPACKE_dgbsv_work( int matrix_layout, lapack_int n, lapack_int kl,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dgb_trans( LAPACK_COL_MAJOR, n, n, kl, kl+ku, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_dgb_trans)( LAPACK_COL_MAJOR, n, n, kl, kl+ku, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgbsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgbsvx.c b/LAPACKE/src/lapacke_dgbsvx.c
index 0176dc952d..ceb8695a78 100644
--- a/LAPACKE/src/lapacke_dgbsvx.c
+++ b/LAPACKE/src/lapacke_dgbsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbsvx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_dgbsvx)( int matrix_layout, char fact, char trans,
                            lapack_int n, lapack_int kl, lapack_int ku,
                            lapack_int nrhs, double* ab, lapack_int ldab,
                            double* afb, lapack_int ldafb, lapack_int* ipiv,
@@ -45,33 +45,33 @@ lapack_int LAPACKE_dgbsvx( int matrix_layout, char fact, char trans,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgbsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dgb_nancheck( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_dgb_nancheck( matrix_layout, n, n, kl, kl+ku, afb,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, kl, kl+ku, afb,
                 ldafb ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -16;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) ) ) {
-            if( LAPACKE_d_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, c, 1 ) ) {
                 return -15;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'r' ) ) ) {
-            if( LAPACKE_d_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, r, 1 ) ) {
                 return -14;
             }
         }
@@ -89,7 +89,7 @@ lapack_int LAPACKE_dgbsvx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgbsvx_work( matrix_layout, fact, trans, n, kl, ku, nrhs, ab,
+    info = API_SUFFIX(LAPACKE_dgbsvx_work)( matrix_layout, fact, trans, n, kl, ku, nrhs, ab,
                                 ldab, afb, ldafb, ipiv, equed, r, c, b, ldb, x,
                                 ldx, rcond, ferr, berr, work, iwork );
     /* Backup significant data from working array(s) */
@@ -100,7 +100,7 @@ lapack_int LAPACKE_dgbsvx( int matrix_layout, char fact, char trans,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgbsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgbsvx_work.c b/LAPACKE/src/lapacke_dgbsvx_work.c
index 6b48820658..f3a73eff96 100644
--- a/LAPACKE/src/lapacke_dgbsvx_work.c
+++ b/LAPACKE/src/lapacke_dgbsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbsvx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_dgbsvx_work)( int matrix_layout, char fact, char trans,
                                 lapack_int n, lapack_int kl, lapack_int ku,
                                 lapack_int nrhs, double* ab, lapack_int ldab,
                                 double* afb, lapack_int ldafb, lapack_int* ipiv,
@@ -62,22 +62,22 @@ lapack_int LAPACKE_dgbsvx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsvx_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_dgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_dgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -102,12 +102,12 @@ lapack_int LAPACKE_dgbsvx_work( int matrix_layout, char fact, char trans,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_dgb_trans( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_dgb_trans( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
                                ldafb_t );
         }
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgbsvx( &fact, &trans, &n, &kl, &ku, &nrhs, ab_t, &ldab_t, afb_t,
                        &ldafb_t, ipiv, equed, r, c, b_t, &ldb_t, x_t, &ldx_t,
@@ -116,20 +116,20 @@ lapack_int LAPACKE_dgbsvx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_dgb_trans( LAPACK_COL_MAJOR, n, n, kl, ku, ab_t, ldab_t, ab,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_dgb_trans)( LAPACK_COL_MAJOR, n, n, kl, ku, ab_t, ldab_t, ab,
                                ldab );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_dgb_trans( LAPACK_COL_MAJOR, n, n, kl, kl+ku, afb_t,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_dgb_trans)( LAPACK_COL_MAJOR, n, n, kl, kl+ku, afb_t,
                                ldafb_t, afb, ldafb );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -140,11 +140,11 @@ lapack_int LAPACKE_dgbsvx_work( int matrix_layout, char fact, char trans,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgbsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgbsvxx.c b/LAPACKE/src/lapacke_dgbsvxx.c
index 9178bc3b7a..2e0af69c43 100644
--- a/LAPACKE/src/lapacke_dgbsvxx.c
+++ b/LAPACKE/src/lapacke_dgbsvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbsvxx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_dgbsvxx)( int matrix_layout, char fact, char trans,
                             lapack_int n, lapack_int kl, lapack_int ku,
                             lapack_int nrhs, double* ab, lapack_int ldab,
                             double* afb, lapack_int ldafb, lapack_int* ipiv,
@@ -47,38 +47,38 @@ lapack_int LAPACKE_dgbsvxx( int matrix_layout, char fact, char trans,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgbsvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsvxx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dgb_nancheck( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_dgb_nancheck( matrix_layout, n, n, kl, kl+ku, afb,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, kl, kl+ku, afb,
                 ldafb ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -16;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) ) ) {
-            if( LAPACKE_d_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, c, 1 ) ) {
                 return -15;
             }
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -27;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'r' ) ) ) {
-            if( LAPACKE_d_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, r, 1 ) ) {
                 return -14;
             }
         }
@@ -96,7 +96,7 @@ lapack_int LAPACKE_dgbsvxx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgbsvxx_work( matrix_layout, fact, trans, n, kl, ku, nrhs, ab,
+    info = API_SUFFIX(LAPACKE_dgbsvxx_work)( matrix_layout, fact, trans, n, kl, ku, nrhs, ab,
                                  ldab, afb, ldafb, ipiv, equed, r, c, b, ldb, x,
                                  ldx, rcond, rpvgrw, berr, n_err_bnds,
                                  err_bnds_norm, err_bnds_comp, nparams, params,
@@ -107,7 +107,7 @@ lapack_int LAPACKE_dgbsvxx( int matrix_layout, char fact, char trans,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgbsvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgbsvxx_work.c b/LAPACKE/src/lapacke_dgbsvxx_work.c
index a52d721876..d751168102 100644
--- a/LAPACKE/src/lapacke_dgbsvxx_work.c
+++ b/LAPACKE/src/lapacke_dgbsvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbsvxx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_dgbsvxx_work)( int matrix_layout, char fact, char trans,
                                  lapack_int n, lapack_int kl, lapack_int ku,
                                  lapack_int nrhs, double* ab, lapack_int ldab,
                                  double* afb, lapack_int ldafb,
@@ -69,22 +69,22 @@ lapack_int LAPACKE_dgbsvxx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsvxx_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_dgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_dgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -121,12 +121,12 @@ lapack_int LAPACKE_dgbsvxx_work( int matrix_layout, char fact, char trans,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_dgb_trans( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_dgb_trans( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
                                ldafb_t );
         }
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgbsvxx( &fact, &trans, &n, &kl, &ku, &nrhs, ab_t, &ldab_t,
                         afb_t, &ldafb_t, ipiv, equed, r, c, b_t, &ldb_t, x_t,
@@ -137,23 +137,23 @@ lapack_int LAPACKE_dgbsvxx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_dgb_trans( LAPACK_COL_MAJOR, n, n, kl, ku, ab_t, ldab_t, ab,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_dgb_trans)( LAPACK_COL_MAJOR, n, n, kl, ku, ab_t, ldab_t, ab,
                                ldab );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_dgb_trans( LAPACK_COL_MAJOR, n, n, kl, kl+ku, afb_t,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_dgb_trans)( LAPACK_COL_MAJOR, n, n, kl, kl+ku, afb_t,
                                ldafb_t, afb, ldafb );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -169,11 +169,11 @@ lapack_int LAPACKE_dgbsvxx_work( int matrix_layout, char fact, char trans,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgbsvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbsvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgbtrf.c b/LAPACKE/src/lapacke_dgbtrf.c
index baac4b61c2..b9fceb8e30 100644
--- a/LAPACKE/src/lapacke_dgbtrf.c
+++ b/LAPACKE/src/lapacke_dgbtrf.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbtrf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgbtrf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int kl, lapack_int ku, double* ab,
                            lapack_int ldab, lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgbtrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbtrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dgb_nancheck( matrix_layout, m, n, kl, kl+ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, m, n, kl, kl+ku, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_dgbtrf_work( matrix_layout, m, n, kl, ku, ab, ldab, ipiv );
+    return API_SUFFIX(LAPACKE_dgbtrf_work)( matrix_layout, m, n, kl, ku, ab, ldab, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_dgbtrf_work.c b/LAPACKE/src/lapacke_dgbtrf_work.c
index ff5096f964..06eb39d2cb 100644
--- a/LAPACKE/src/lapacke_dgbtrf_work.c
+++ b/LAPACKE/src/lapacke_dgbtrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbtrf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgbtrf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int kl, lapack_int ku, double* ab,
                                 lapack_int ldab, lapack_int* ipiv )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dgbtrf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dgbtrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbtrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,7 +59,7 @@ lapack_int LAPACKE_dgbtrf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dgb_trans( matrix_layout, m, n, kl, kl+ku, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, m, n, kl, kl+ku, ab, ldab, ab_t,
                            ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgbtrf( &m, &n, &kl, &ku, ab_t, &ldab_t, ipiv, &info );
@@ -67,17 +67,17 @@ lapack_int LAPACKE_dgbtrf_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dgb_trans( LAPACK_COL_MAJOR, m, n, kl, kl+ku, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_dgb_trans)( LAPACK_COL_MAJOR, m, n, kl, kl+ku, ab_t, ldab_t, ab,
                            ldab );
         /* Release memory and exit */
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgbtrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbtrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgbtrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbtrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgbtrs.c b/LAPACKE/src/lapacke_dgbtrs.c
index cb86478d1e..58b0ca1fac 100644
--- a/LAPACKE/src/lapacke_dgbtrs.c
+++ b/LAPACKE/src/lapacke_dgbtrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbtrs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgbtrs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int kl, lapack_int ku, lapack_int nrhs,
                            const double* ab, lapack_int ldab,
                            const lapack_int* ipiv, double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgbtrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbtrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dgb_nancheck( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
     }
 #endif
-    return LAPACKE_dgbtrs_work( matrix_layout, trans, n, kl, ku, nrhs, ab, ldab,
+    return API_SUFFIX(LAPACKE_dgbtrs_work)( matrix_layout, trans, n, kl, ku, nrhs, ab, ldab,
                                 ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dgbtrs_work.c b/LAPACKE/src/lapacke_dgbtrs_work.c
index bdc2d129e5..8fd4855723 100644
--- a/LAPACKE/src/lapacke_dgbtrs_work.c
+++ b/LAPACKE/src/lapacke_dgbtrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgbtrs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgbtrs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int kl, lapack_int ku, lapack_int nrhs,
                                 const double* ab, lapack_int ldab,
                                 const lapack_int* ipiv, double* b,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_dgbtrs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbtrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dgbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbtrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -74,9 +74,9 @@ lapack_int LAPACKE_dgbtrs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dgb_trans( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
                            ldab_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgbtrs( &trans, &n, &kl, &ku, &nrhs, ab_t, &ldab_t, ipiv, b_t,
                        &ldb_t, &info );
@@ -84,18 +84,18 @@ lapack_int LAPACKE_dgbtrs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbtrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgbtrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgbtrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgebak.c b/LAPACKE/src/lapacke_dgebak.c
index 744ca54f3e..e66337c761 100644
--- a/LAPACKE/src/lapacke_dgebak.c
+++ b/LAPACKE/src/lapacke_dgebak.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgebak( int matrix_layout, char job, char side, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgebak)( int matrix_layout, char job, char side, lapack_int n,
                            lapack_int ilo, lapack_int ihi, const double* scale,
                            lapack_int m, double* v, lapack_int ldv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgebak", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgebak", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, scale, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, scale, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, m, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, m, v, ldv ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_dgebak_work( matrix_layout, job, side, n, ilo, ihi, scale, m,
+    return API_SUFFIX(LAPACKE_dgebak_work)( matrix_layout, job, side, n, ilo, ihi, scale, m,
                                 v, ldv );
 }
diff --git a/LAPACKE/src/lapacke_dgebak_work.c b/LAPACKE/src/lapacke_dgebak_work.c
index afa8b1e52d..da726ab168 100644
--- a/LAPACKE/src/lapacke_dgebak_work.c
+++ b/LAPACKE/src/lapacke_dgebak_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgebak_work( int matrix_layout, char job, char side,
+lapack_int API_SUFFIX(LAPACKE_dgebak_work)( int matrix_layout, char job, char side,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 const double* scale, lapack_int m, double* v,
                                 lapack_int ldv )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dgebak_work( int matrix_layout, char job, char side,
         /* Check leading dimension(s) */
         if( ldv < m ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dgebak_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgebak_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,7 +60,7 @@ lapack_int LAPACKE_dgebak_work( int matrix_layout, char job, char side,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, m, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, m, v, ldv, v_t, ldv_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgebak( &job, &side, &n, &ilo, &ihi, scale, &m, v_t, &ldv_t,
                        &info );
@@ -68,16 +68,16 @@ lapack_int LAPACKE_dgebak_work( int matrix_layout, char job, char side,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, m, v_t, ldv_t, v, ldv );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, m, v_t, ldv_t, v, ldv );
         /* Release memory and exit */
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgebak_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgebak_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgebak_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgebak_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgebal.c b/LAPACKE/src/lapacke_dgebal.c
index e9a63fbad0..a16c21c526 100644
--- a/LAPACKE/src/lapacke_dgebal.c
+++ b/LAPACKE/src/lapacke_dgebal.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgebal( int matrix_layout, char job, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dgebal)( int matrix_layout, char job, lapack_int n, double* a,
                            lapack_int lda, lapack_int* ilo, lapack_int* ihi,
                            double* scale )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgebal", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgebal", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
                 return -4;
             }
         }
     }
 #endif
-    return LAPACKE_dgebal_work( matrix_layout, job, n, a, lda, ilo, ihi, scale );
+    return API_SUFFIX(LAPACKE_dgebal_work)( matrix_layout, job, n, a, lda, ilo, ihi, scale );
 }
diff --git a/LAPACKE/src/lapacke_dgebal_work.c b/LAPACKE/src/lapacke_dgebal_work.c
index c0d113e19e..e9622d17e4 100644
--- a/LAPACKE/src/lapacke_dgebal_work.c
+++ b/LAPACKE/src/lapacke_dgebal_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgebal_work( int matrix_layout, char job, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgebal_work)( int matrix_layout, char job, lapack_int n,
                                 double* a, lapack_int lda, lapack_int* ilo,
                                 lapack_int* ihi, double* scale )
 {
@@ -49,12 +49,12 @@ lapack_int LAPACKE_dgebal_work( int matrix_layout, char job, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgebal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgebal_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
             a_t = (double*)LAPACKE_malloc( sizeof(double) * lda_t * MAX(1,n) );
             if( a_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -62,9 +62,9 @@ lapack_int LAPACKE_dgebal_work( int matrix_layout, char job, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dgebal( &job, &n, a_t, &lda_t, ilo, ihi, scale, &info );
@@ -72,22 +72,22 @@ lapack_int LAPACKE_dgebal_work( int matrix_layout, char job, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
             LAPACKE_free( a_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgebal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgebal_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgebal_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgebal_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgebrd.c b/LAPACKE/src/lapacke_dgebrd.c
index 9ffc4374b5..3c33661982 100644
--- a/LAPACKE/src/lapacke_dgebrd.c
+++ b/LAPACKE/src/lapacke_dgebrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgebrd( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgebrd)( int matrix_layout, lapack_int m, lapack_int n,
                            double* a, lapack_int lda, double* d, double* e,
                            double* tauq, double* taup )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_dgebrd( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgebrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgebrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgebrd_work( matrix_layout, m, n, a, lda, d, e, tauq, taup,
+    info = API_SUFFIX(LAPACKE_dgebrd_work)( matrix_layout, m, n, a, lda, d, e, tauq, taup,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -66,13 +66,13 @@ lapack_int LAPACKE_dgebrd( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgebrd_work( matrix_layout, m, n, a, lda, d, e, tauq, taup,
+    info = API_SUFFIX(LAPACKE_dgebrd_work)( matrix_layout, m, n, a, lda, d, e, tauq, taup,
                                 work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgebrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgebrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgebrd_work.c b/LAPACKE/src/lapacke_dgebrd_work.c
index 267d773b51..c9096694d5 100644
--- a/LAPACKE/src/lapacke_dgebrd_work.c
+++ b/LAPACKE/src/lapacke_dgebrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgebrd_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgebrd_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 double* a, lapack_int lda, double* d, double* e,
                                 double* tauq, double* taup, double* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dgebrd_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgebrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgebrd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,7 +66,7 @@ lapack_int LAPACKE_dgebrd_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgebrd( &m, &n, a_t, &lda_t, d, e, tauq, taup, work, &lwork,
                        &info );
@@ -74,16 +74,16 @@ lapack_int LAPACKE_dgebrd_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgebrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgebrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgebrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgebrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgecon.c b/LAPACKE/src/lapacke_dgecon.c
index 9ca44f8a7c..52ad3df3c2 100644
--- a/LAPACKE/src/lapacke_dgecon.c
+++ b/LAPACKE/src/lapacke_dgecon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgecon( int matrix_layout, char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgecon)( int matrix_layout, char norm, lapack_int n,
                            const double* a, lapack_int lda, double anorm,
                            double* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_dgecon( int matrix_layout, char norm, lapack_int n,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgecon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgecon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -6;
         }
     }
@@ -66,7 +66,7 @@ lapack_int LAPACKE_dgecon( int matrix_layout, char norm, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgecon_work( matrix_layout, norm, n, a, lda, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_dgecon_work)( matrix_layout, norm, n, a, lda, anorm, rcond,
                                 work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -74,7 +74,7 @@ lapack_int LAPACKE_dgecon( int matrix_layout, char norm, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgecon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgecon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgecon_work.c b/LAPACKE/src/lapacke_dgecon_work.c
index 9b475df5ba..6c838b1476 100644
--- a/LAPACKE/src/lapacke_dgecon_work.c
+++ b/LAPACKE/src/lapacke_dgecon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgecon_work( int matrix_layout, char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgecon_work)( int matrix_layout, char norm, lapack_int n,
                                 const double* a, lapack_int lda, double anorm,
                                 double* rcond, double* work, lapack_int* iwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dgecon_work( int matrix_layout, char norm, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgecon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgecon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,7 +59,7 @@ lapack_int LAPACKE_dgecon_work( int matrix_layout, char norm, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgecon( &norm, &n, a_t, &lda_t, &anorm, rcond, work, iwork,
                        &info );
@@ -70,11 +70,11 @@ lapack_int LAPACKE_dgecon_work( int matrix_layout, char norm, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgecon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgecon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgecon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgecon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgedmd.c b/LAPACKE/src/lapacke_dgedmd.c
new file mode 100644
index 0000000000..3077b6ea5d
--- /dev/null
+++ b/LAPACKE/src/lapacke_dgedmd.c
@@ -0,0 +1,114 @@
+/*****************************************************************************
+  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 dgedmd
+* Author: Intel Corporation
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_dgedmd)( int matrix_layout, char jobs, char jobz, char jobr,
+			   char jobf, lapack_int whtsvd, lapack_int m,
+			   lapack_int n, double* x, lapack_int ldx, double* y,
+			   lapack_int ldy, lapack_int nrnk, double* tol, 
+			   lapack_int k, double* reig, double* imeig,
+			   double* z, lapack_int ldz,
+			   double* res, double* b, lapack_int ldb,
+               double* w, lapack_int ldw, double* s, lapack_int lds)
+{
+    lapack_int info = 0;
+    lapack_int lwork = -1;
+    lapack_int liwork = -1;
+    double* work = NULL;
+    lapack_int* iwork = NULL;
+    double work_query;
+    lapack_int iwork_query;
+    if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmd", -1 );
+        return -1;
+    }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+    if( LAPACKE_get_nancheck() ) {
+        /* Optionally check input matrices for NaNs */
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, x, ldx ) ) {
+            return -8;
+        }
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, y, ldy ) ) {
+            return -10;
+        }
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, z, ldz ) ) {
+            return -15;
+        }
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
+            return -18;
+        }
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, s, lds ) ) {
+            return -20;
+        }
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, w, ldw ) ) {
+            return -22;
+        }
+    }
+#endif
+    /* Query optimal working array(s) size */
+    info = API_SUFFIX(LAPACKE_dgedmd_work)( matrix_layout, jobs, jobz, jobr, jobf, whtsvd,
+				m, n, x, ldx, y, ldy, nrnk, tol, k, reig, imeig, z, ldz,
+				res, b, ldb, w, ldw, s, lds, &work_query,
+				lwork, &iwork_query, liwork );
+
+    if( info != 0 ) {
+        goto exit_level_0;
+    }
+    lwork  = (lapack_int) work_query;
+    liwork = iwork_query;
+    /* Allocate memory for work arrays */
+    work  = (double*)LAPACKE_malloc( sizeof(double) * lwork );
+    if( work == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
+    }
+    iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
+    if( iwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_1;
+    }
+    /* Call middle-level interface */
+    info = API_SUFFIX(LAPACKE_dgedmd_work)( matrix_layout, jobs, jobz, jobr, jobf, whtsvd,
+				m, n, x, ldx, y, ldy, nrnk, tol, k, reig, imeig, z, ldz,
+				res, b, ldb, w, ldw, s, lds, work, lwork,
+				iwork, liwork );
+    /* Release memory and exit */
+    LAPACKE_free( iwork );
+exit_level_1:
+    LAPACKE_free( work );
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmd", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_dgedmd_work.c b/LAPACKE/src/lapacke_dgedmd_work.c
new file mode 100644
index 0000000000..6a99b09021
--- /dev/null
+++ b/LAPACKE/src/lapacke_dgedmd_work.c
@@ -0,0 +1,181 @@
+/*****************************************************************************
+  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 dgedmd
+* Author: Intel Corporation
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_dgedmd_work)( int matrix_layout, char jobs, char jobz,
+                                char jobr, char jobf, lapack_int whtsvd,
+				lapack_int m, lapack_int n, double* x,
+				lapack_int ldx, double* y, lapack_int ldy,
+				lapack_int nrnk, double* tol, lapack_int k,
+			       	double* reig, double* imeig,
+				double* z, lapack_int ldz, double* res,
+				double* b, lapack_int ldb, double* w,
+				lapack_int ldw, double* s, lapack_int lds,
+				double* work, lapack_int lwork,
+				lapack_int* iwork, lapack_int liwork )
+{
+    lapack_int info = 0;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        LAPACK_dgedmd( &jobs, &jobz, &jobr, &jobf, &whtsvd, &m, &n, x, &ldx, y,
+		       &ldy, &nrnk, tol, &k, reig, imeig, z, &ldz, res, b, &ldb, w, &ldw,
+		       s, &lds, work, &lwork, iwork, &liwork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        lapack_int ldx_t = MAX(1,m);
+        lapack_int ldy_t = MAX(1,m);
+        lapack_int ldz_t = MAX(1,m);
+        lapack_int ldb_t = MAX(1,m);
+        lapack_int ldw_t = MAX(1,m);
+        lapack_int lds_t = MAX(1,m);
+        double* x_t = NULL;
+        double* y_t = NULL;
+        double* z_t = NULL;
+        double* b_t = NULL;
+        double* w_t = NULL;
+        double* s_t = NULL;
+        /* Check leading dimension(s) */
+        if( ldx < n ) {
+            info = -9;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmd_work", info );
+            return info;
+        }
+        if( ldy < n ) {
+            info = -11;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmd_work", info );
+            return info;
+        }
+        if( ldz < n ) {
+            info = -16;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmd_work", info );
+            return info;
+        }
+        if( ldb < n ) {
+            info = -19;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmd_work", info );
+            return info;
+        }
+        if( ldw < n ) {
+            info = -21;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmd_work", info );
+            return info;
+        }
+        if( lds < n ) {
+            info = -23;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmd_work", info );
+            return info;
+        }
+        /* Query optimal working array(s) size if requested */
+        if( lwork == -1 ) {
+            LAPACK_dgedmd( &jobs, &jobz, &jobr, &jobf, &whtsvd, &m, &n, x, &ldx,
+			   y, &ldy, &nrnk, tol, &k, reig, imeig, z, &ldz, res, b, &ldb, w,
+			   &ldw, s, &lds, work, &lwork, iwork, &liwork, &info );
+            return (info < 0) ? (info - 1) : info;
+        }
+        /* Allocate memory for temporary array(s) */
+        x_t = (double*)LAPACKE_malloc( sizeof(double) * ldx_t * MAX(1,n) );
+        if( x_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+        y_t = (double*)LAPACKE_malloc( sizeof(double) * ldy_t * MAX(1,n) );
+        if( y_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_1;
+        }
+        z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
+        if( z_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_2;
+        }
+        b_t = (double*)LAPACKE_malloc( sizeof(double) * ldb_t * MAX(1,n) );
+        if( b_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_3;
+        }
+        w_t = (double*)LAPACKE_malloc( sizeof(double) * ldw_t * MAX(1,n) );
+        if( w_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_4;
+        }
+        s_t = (double*)LAPACKE_malloc( sizeof(double) * lds_t * MAX(1,n) );
+        if( s_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_5;
+        }
+        /* Transpose input matrices */
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, y, ldy, y_t, ldy_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, z, ldz, z_t, ldz_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, w, ldw, w_t, ldw_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, s, lds, s_t, lds_t );
+        /* Call LAPACK function and adjust info */
+        LAPACK_dgedmd( &jobs, &jobz, &jobr, &jobf, &whtsvd, &m, &n, x_t, &ldx_t,
+		       y_t, &ldy_t, &nrnk, tol, &k, reig, imeig, z_t, &ldz_t, res, b_t,
+		       &ldb_t, w_t, &ldw_t, s_t, &lds_t, work, &lwork,
+		       iwork, &liwork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+        /* Transpose output matrices */
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, y_t, ldy_t, y, ldy );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, w_t, ldw_t, w, ldw );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, s_t, lds_t, s, lds );
+        /* Release memory and exit */
+        LAPACKE_free( s_t );
+exit_level_5:
+        LAPACKE_free( w_t );
+exit_level_4:
+        LAPACKE_free( b_t );
+exit_level_3:
+        LAPACKE_free( z_t );
+exit_level_2:
+        LAPACKE_free( y_t );
+exit_level_1:
+        LAPACKE_free( x_t );
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmd_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmd_work", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_dgedmdq.c b/LAPACKE/src/lapacke_dgedmdq.c
new file mode 100644
index 0000000000..7b7dc8ef15
--- /dev/null
+++ b/LAPACKE/src/lapacke_dgedmdq.c
@@ -0,0 +1,119 @@
+/*****************************************************************************
+  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 dgedmdq
+* Author: Intel Corporation
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_dgedmdq)( int matrix_layout, char jobs, char jobz, char jobr,
+                            char jobq, char jobt, char jobf, lapack_int whtsvd,
+                            lapack_int m, lapack_int n, double* f, lapack_int ldf,
+                            double* x, lapack_int ldx, double* y, lapack_int ldy,
+                            lapack_int nrnk, double* tol, lapack_int k,
+                            double* reig, double* imeig, double* z,
+                            lapack_int ldz, double* res, double* b, lapack_int ldb,
+                            double* v, lapack_int ldv, double* s, lapack_int lds)
+{
+    lapack_int info = 0;
+    lapack_int lwork = -1;
+    lapack_int liwork = -1;
+    double* work = NULL;
+    lapack_int* iwork = NULL;
+    double work_query;
+    lapack_int iwork_query;
+    if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmdq", -1 );
+        return -1;
+    }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+    if( LAPACKE_get_nancheck() ) {
+        /* Optionally check input matrices for NaNs */
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, f, ldf ) ) {
+            return -11;
+        }
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, x, ldx ) ) {
+            return -13;
+        }
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, y, ldy ) ) {
+            return -15;
+        }
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, z, ldz ) ) {
+            return -22;
+        }
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
+            return -25;
+        }
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, v, ldv ) ) {
+            return -27;
+        }
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, s, lds ) ) {
+            return -29;
+        }
+    }
+#endif
+    /* Query optimal working array(s) size */
+    info = API_SUFFIX(LAPACKE_dgedmdq_work)( matrix_layout, jobs, jobz, jobr, jobq, jobt,
+                                 jobf, whtsvd, m, n, f, ldf, x, ldx, y, ldy,
+                                 nrnk, tol, k, reig, imeig, z, ldz, res,
+                                 b, ldb, v, ldv, s, lds, &work_query, lwork,
+                                 &iwork_query, liwork );
+
+    if( info != 0 ) {
+        goto exit_level_0;
+    }
+    lwork  = (lapack_int) work_query;
+    liwork = iwork_query;
+    /* Allocate memory for work arrays */
+    work  = (double*)LAPACKE_malloc( sizeof(double) * lwork );
+    if( work == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
+    }
+    iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
+    if( iwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_1;
+    }
+    /* Call middle-level interface */
+    info = API_SUFFIX(LAPACKE_dgedmdq_work)( matrix_layout, jobs, jobz, jobr, jobq, jobt,
+                                 jobf, whtsvd, m, n, f, ldf, x, ldx, y, ldy,
+                                 nrnk, tol, k, reig, imeig, z, ldz, res,
+                                 b, ldb, v, ldv, s, lds, work, lwork, iwork,
+                                 liwork );
+    /* Release memory and exit */
+    LAPACKE_free( iwork );
+exit_level_1:
+    LAPACKE_free( work );
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmdq", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_dgedmdq_work.c b/LAPACKE/src/lapacke_dgedmdq_work.c
new file mode 100644
index 0000000000..8cc4a77bb6
--- /dev/null
+++ b/LAPACKE/src/lapacke_dgedmdq_work.c
@@ -0,0 +1,200 @@
+/*****************************************************************************
+  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 dgedmdq
+* Author: Intel Corporation
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_dgedmdq_work)( int matrix_layout, char jobs, char jobz,
+                                 char jobr, char jobq, char jobt, char jobf,
+                                 lapack_int whtsvd, lapack_int m, lapack_int n,
+                                 double* f, lapack_int ldf, double* x,
+                                 lapack_int ldx, double* y, lapack_int ldy,
+                                 lapack_int nrnk, double* tol, lapack_int k,
+                                 double* reig, double* imeig, double* z,
+                                 lapack_int ldz, double* res, double* b,
+                                 lapack_int ldb, double* v, lapack_int ldv,
+                                 double* s, lapack_int lds, double* work,
+                                 lapack_int lwork, lapack_int* iwork,
+                                 lapack_int liwork )
+{
+    lapack_int info = 0;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        LAPACK_dgedmdq( &jobs, &jobz, &jobr, &jobq, &jobt, &jobf, &whtsvd, &m,
+                        &n, f, &ldf, x, &ldx, y, &ldy, &nrnk, tol, &k, reig, imeig,
+                        z, &ldz, res, b, &ldb, v, &ldv, s, &lds,
+                        work, &lwork, iwork, &liwork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        lapack_int ldf_t = MAX(1,m);
+        lapack_int ldx_t = MAX(1,m);
+        lapack_int ldy_t = MAX(1,m);
+        lapack_int ldz_t = MAX(1,m);
+        lapack_int ldb_t = MAX(1,m);
+        lapack_int ldv_t = MAX(1,m);
+        lapack_int lds_t = MAX(1,m);
+        double* f_t = NULL;
+        double* x_t = NULL;
+        double* y_t = NULL;
+        double* z_t = NULL;
+        double* b_t = NULL;
+        double* v_t = NULL;
+        double* s_t = NULL;
+        /* Check leading dimension(s) */
+        if( ldf < n ) {
+            info = -12;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmdq_work", info );
+            return info;
+        }
+        if( ldx < n ) {
+            info = -14;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmdq_work", info );
+            return info;
+        }
+        if( ldy < n ) {
+            info = -16;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmdq_work", info );
+            return info;
+        }
+        if( ldz < n ) {
+            info = -23;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmdq_work", info );
+            return info;
+        }
+        if( ldb < n ) {
+            info = -26;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmdq_work", info );
+            return info;
+        }
+        if( ldv < n ) {
+            info = -28;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmdq_work", info );
+            return info;
+        }
+        if( lds < n ) {
+            info = -30;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmdq_work", info );
+            return info;
+        }
+        /* Query optimal working array(s) size if requested */
+        if( lwork == -1 || liwork == -1 ) {
+            LAPACK_dgedmdq( &jobs, &jobz, &jobr, &jobq, &jobt, &jobf, &whtsvd, &m,
+                            &n, f, &ldf, x, &ldx, y, &ldy, &nrnk, tol, &k, reig, imeig,
+                            z, &ldz, res, b, &ldb, v, &ldv, s, &lds,
+                            work, &lwork, iwork, &liwork, &info );
+            return (info < 0) ? (info - 1) : info;
+        }
+        /* Allocate memory for temporary array(s) */
+        f_t = (double*)LAPACKE_malloc( sizeof(double) * ldf_t * MAX(1,n) );
+        if( f_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+        x_t = (double*)LAPACKE_malloc( sizeof(double) * ldx_t * MAX(1,n) );
+        if( x_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_1;
+        }
+        y_t = (double*)LAPACKE_malloc( sizeof(double) * ldy_t * MAX(1,n) );
+        if( y_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_2;
+        }
+        z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
+        if( z_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_3;
+        }
+        b_t = (double*)LAPACKE_malloc( sizeof(double) * ldb_t * MAX(1,n) );
+        if( b_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_4;
+        }
+        v_t = (double*)LAPACKE_malloc( sizeof(double) * ldv_t * MAX(1,n) );
+        if( v_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_5;
+        }
+        s_t = (double*)LAPACKE_malloc( sizeof(double) * lds_t * MAX(1,n) );
+        if( s_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_6;
+        }
+        /* Transpose input matrices */
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, f, ldf, f_t, ldf_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, y, ldy, y_t, ldy_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, z, ldz, z_t, ldz_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, s, lds, s_t, lds_t );
+        /* Call LAPACK function and adjust info */
+        LAPACK_dgedmdq( &jobs, &jobz, &jobr, &jobq, &jobt, &jobf, &whtsvd, &m,
+                        &n, f, &ldf, x, &ldx, y, &ldy, &nrnk, tol, &k, reig, imeig,
+                        z, &ldz, res, b, &ldb, v, &ldv, s, &lds,
+                        work, &lwork, iwork, &liwork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+        /* Transpose output matrices */
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, f_t, ldf_t, f, ldf );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, y_t, ldy_t, y, ldy );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, v_t, ldv_t, v, ldv );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, s_t, lds_t, s, lds );
+        /* Release memory and exit */
+        LAPACKE_free( s_t );
+exit_level_6:
+        LAPACKE_free( v_t );
+exit_level_5:
+        LAPACKE_free( b_t );
+exit_level_4:
+        LAPACKE_free( z_t );
+exit_level_3:
+        LAPACKE_free( y_t );
+exit_level_2:
+        LAPACKE_free( x_t );
+exit_level_1:
+        LAPACKE_free( f_t );
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmdq_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgedmdq_work", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_dgeequ.c b/LAPACKE/src/lapacke_dgeequ.c
index b6c1c23b45..b1b8024e7b 100644
--- a/LAPACKE/src/lapacke_dgeequ.c
+++ b/LAPACKE/src/lapacke_dgeequ.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeequ( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeequ)( int matrix_layout, lapack_int m, lapack_int n,
                            const double* a, lapack_int lda, double* r,
                            double* c, double* rowcnd, double* colcnd,
                            double* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dgeequ_work( matrix_layout, m, n, a, lda, r, c, rowcnd,
+    return API_SUFFIX(LAPACKE_dgeequ_work)( matrix_layout, m, n, a, lda, r, c, rowcnd,
                                 colcnd, amax );
 }
diff --git a/LAPACKE/src/lapacke_dgeequ_work.c b/LAPACKE/src/lapacke_dgeequ_work.c
index 09290ed478..d5a03019f7 100644
--- a/LAPACKE/src/lapacke_dgeequ_work.c
+++ b/LAPACKE/src/lapacke_dgeequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeequ_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeequ_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 const double* a, lapack_int lda, double* r,
                                 double* c, double* rowcnd, double* colcnd,
                                 double* amax )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dgeequ_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgeequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeequ_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,7 +60,7 @@ lapack_int LAPACKE_dgeequ_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgeequ( &m, &n, a_t, &lda_t, r, c, rowcnd, colcnd, amax, &info );
         if( info < 0 ) {
@@ -70,11 +70,11 @@ lapack_int LAPACKE_dgeequ_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgeequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgeequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeequb.c b/LAPACKE/src/lapacke_dgeequb.c
index 0011c76509..2891ab1ceb 100644
--- a/LAPACKE/src/lapacke_dgeequb.c
+++ b/LAPACKE/src/lapacke_dgeequb.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeequb( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeequb)( int matrix_layout, lapack_int m, lapack_int n,
                             const double* a, lapack_int lda, double* r,
                             double* c, double* rowcnd, double* colcnd,
                             double* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeequb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dgeequb_work( matrix_layout, m, n, a, lda, r, c, rowcnd,
+    return API_SUFFIX(LAPACKE_dgeequb_work)( matrix_layout, m, n, a, lda, r, c, rowcnd,
                                  colcnd, amax );
 }
diff --git a/LAPACKE/src/lapacke_dgeequb_work.c b/LAPACKE/src/lapacke_dgeequb_work.c
index 36336d1b65..c46c781b6d 100644
--- a/LAPACKE/src/lapacke_dgeequb_work.c
+++ b/LAPACKE/src/lapacke_dgeequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeequb_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeequb_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  const double* a, lapack_int lda, double* r,
                                  double* c, double* rowcnd, double* colcnd,
                                  double* amax )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dgeequb_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgeequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,7 +60,7 @@ lapack_int LAPACKE_dgeequb_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgeequb( &m, &n, a_t, &lda_t, r, c, rowcnd, colcnd, amax,
                         &info );
@@ -71,11 +71,11 @@ lapack_int LAPACKE_dgeequb_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgeequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgeequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgees.c b/LAPACKE/src/lapacke_dgees.c
index 875972d296..776cc2c56e 100644
--- a/LAPACKE/src/lapacke_dgees.c
+++ b/LAPACKE/src/lapacke_dgees.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgees( int matrix_layout, char jobvs, char sort,
+lapack_int API_SUFFIX(LAPACKE_dgees)( int matrix_layout, char jobvs, char sort,
                           LAPACK_D_SELECT2 select, lapack_int n, double* a,
                           lapack_int lda, lapack_int* sdim, double* wr,
                           double* wi, double* vs, lapack_int ldvs )
@@ -43,19 +43,19 @@ lapack_int LAPACKE_dgees( int matrix_layout, char jobvs, char sort,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgees", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgees", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -64,7 +64,7 @@ lapack_int LAPACKE_dgees( int matrix_layout, char jobvs, char sort,
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgees_work( matrix_layout, jobvs, sort, select, n, a, lda,
+    info = API_SUFFIX(LAPACKE_dgees_work)( matrix_layout, jobvs, sort, select, n, a, lda,
                                sdim, wr, wi, vs, ldvs, &work_query, lwork,
                                bwork );
     if( info != 0 ) {
@@ -78,17 +78,17 @@ lapack_int LAPACKE_dgees( int matrix_layout, char jobvs, char sort,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgees_work( matrix_layout, jobvs, sort, select, n, a, lda,
+    info = API_SUFFIX(LAPACKE_dgees_work)( matrix_layout, jobvs, sort, select, n, a, lda,
                                sdim, wr, wi, vs, ldvs, work, lwork, bwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgees", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgees", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgees_work.c b/LAPACKE/src/lapacke_dgees_work.c
index 6a18199fa9..30fe0d8c56 100644
--- a/LAPACKE/src/lapacke_dgees_work.c
+++ b/LAPACKE/src/lapacke_dgees_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgees_work( int matrix_layout, char jobvs, char sort,
+lapack_int API_SUFFIX(LAPACKE_dgees_work)( int matrix_layout, char jobvs, char sort,
                                LAPACK_D_SELECT2 select, lapack_int n, double* a,
                                lapack_int lda, lapack_int* sdim, double* wr,
                                double* wi, double* vs, lapack_int ldvs,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_dgees_work( int matrix_layout, char jobvs, char sort,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dgees_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgees_work", info );
             return info;
         }
         if( ldvs < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dgees_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgees_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -75,7 +75,7 @@ lapack_int LAPACKE_dgees_work( int matrix_layout, char jobvs, char sort,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
             vs_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvs_t * MAX(1,n) );
             if( vs_t == NULL ) {
@@ -84,7 +84,7 @@ lapack_int LAPACKE_dgees_work( int matrix_layout, char jobvs, char sort,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgees( &jobvs, &sort, select, &n, a_t, &lda_t, sdim, wr, wi,
                       vs_t, &ldvs_t, work, &lwork, bwork, &info );
@@ -92,23 +92,23 @@ lapack_int LAPACKE_dgees_work( int matrix_layout, char jobvs, char sort,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, vs_t, ldvs_t, vs, ldvs );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, vs_t, ldvs_t, vs, ldvs );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
             LAPACKE_free( vs_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgees_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgees_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgees_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgees_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeesx.c b/LAPACKE/src/lapacke_dgeesx.c
index 7796edffc1..374057c00c 100644
--- a/LAPACKE/src/lapacke_dgeesx.c
+++ b/LAPACKE/src/lapacke_dgeesx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeesx( int matrix_layout, char jobvs, char sort,
+lapack_int API_SUFFIX(LAPACKE_dgeesx)( int matrix_layout, char jobvs, char sort,
                            LAPACK_D_SELECT2 select, char sense, lapack_int n,
                            double* a, lapack_int lda, lapack_int* sdim,
                            double* wr, double* wi, double* vs, lapack_int ldvs,
@@ -47,19 +47,19 @@ lapack_int LAPACKE_dgeesx( int matrix_layout, char jobvs, char sort,
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeesx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeesx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -68,7 +68,7 @@ lapack_int LAPACKE_dgeesx( int matrix_layout, char jobvs, char sort,
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgeesx_work( matrix_layout, jobvs, sort, select, sense, n, a,
+    info = API_SUFFIX(LAPACKE_dgeesx_work)( matrix_layout, jobvs, sort, select, sense, n, a,
                                 lda, sdim, wr, wi, vs, ldvs, rconde, rcondv,
                                 &work_query, lwork, &iwork_query, liwork,
                                 bwork );
@@ -78,12 +78,15 @@ lapack_int LAPACKE_dgeesx( int matrix_layout, char jobvs, char sort,
     liwork = iwork_query;
     lwork = (lapack_int)work_query;
     /* Allocate memory for work arrays */
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
-        if( iwork == NULL ) {
-            info = LAPACK_WORK_MEMORY_ERROR;
-            goto exit_level_1;
-        }
+    }
+    else {
+        iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * 1 );
+    }
+    if( iwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_1;
     }
     work = (double*)LAPACKE_malloc( sizeof(double) * lwork );
     if( work == NULL ) {
@@ -91,22 +94,20 @@ lapack_int LAPACKE_dgeesx( int matrix_layout, char jobvs, char sort,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgeesx_work( matrix_layout, jobvs, sort, select, sense, n, a,
+    info = API_SUFFIX(LAPACKE_dgeesx_work)( matrix_layout, jobvs, sort, select, sense, n, a,
                                 lda, sdim, wr, wi, vs, ldvs, rconde, rcondv,
                                 work, lwork, iwork, liwork, bwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_2:
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'v' ) ) {
-        LAPACKE_free( iwork );
-    }
+    LAPACKE_free( iwork );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeesx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeesx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeesx_work.c b/LAPACKE/src/lapacke_dgeesx_work.c
index dcdd64621b..48c6fad89e 100644
--- a/LAPACKE/src/lapacke_dgeesx_work.c
+++ b/LAPACKE/src/lapacke_dgeesx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeesx_work( int matrix_layout, char jobvs, char sort,
+lapack_int API_SUFFIX(LAPACKE_dgeesx_work)( int matrix_layout, char jobvs, char sort,
                                 LAPACK_D_SELECT2 select, char sense,
                                 lapack_int n, double* a, lapack_int lda,
                                 lapack_int* sdim, double* wr, double* wi,
@@ -58,12 +58,12 @@ lapack_int LAPACKE_dgeesx_work( int matrix_layout, char jobvs, char sort,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgeesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeesx_work", info );
             return info;
         }
         if( ldvs < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dgeesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeesx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,7 +79,7 @@ lapack_int LAPACKE_dgeesx_work( int matrix_layout, char jobvs, char sort,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
             vs_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvs_t * MAX(1,n) );
             if( vs_t == NULL ) {
@@ -88,7 +88,7 @@ lapack_int LAPACKE_dgeesx_work( int matrix_layout, char jobvs, char sort,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgeesx( &jobvs, &sort, select, &sense, &n, a_t, &lda_t, sdim, wr,
                        wi, vs_t, &ldvs_t, rconde, rcondv, work, &lwork, iwork,
@@ -97,23 +97,23 @@ lapack_int LAPACKE_dgeesx_work( int matrix_layout, char jobvs, char sort,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, vs_t, ldvs_t, vs, ldvs );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, vs_t, ldvs_t, vs, ldvs );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
             LAPACKE_free( vs_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgeesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeesx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgeesx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeesx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeev.c b/LAPACKE/src/lapacke_dgeev.c
index a2a351d1b5..2c3a0d5619 100644
--- a/LAPACKE/src/lapacke_dgeev.c
+++ b/LAPACKE/src/lapacke_dgeev.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeev( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_dgeev)( int matrix_layout, char jobvl, char jobvr,
                           lapack_int n, double* a, lapack_int lda, double* wr,
                           double* wi, double* vl, lapack_int ldvl, double* vr,
                           lapack_int ldvr )
@@ -42,19 +42,19 @@ lapack_int LAPACKE_dgeev( int matrix_layout, char jobvl, char jobvr,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgeev_work( matrix_layout, jobvl, jobvr, n, a, lda, wr, wi,
+    info = API_SUFFIX(LAPACKE_dgeev_work)( matrix_layout, jobvl, jobvr, n, a, lda, wr, wi,
                                vl, ldvl, vr, ldvr, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_dgeev( int matrix_layout, char jobvl, char jobvr,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgeev_work( matrix_layout, jobvl, jobvr, n, a, lda, wr, wi,
+    info = API_SUFFIX(LAPACKE_dgeev_work)( matrix_layout, jobvl, jobvr, n, a, lda, wr, wi,
                                vl, ldvl, vr, ldvr, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeev_work.c b/LAPACKE/src/lapacke_dgeev_work.c
index c4de72394e..83c4f83f38 100644
--- a/LAPACKE/src/lapacke_dgeev_work.c
+++ b/LAPACKE/src/lapacke_dgeev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeev_work( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_dgeev_work)( int matrix_layout, char jobvl, char jobvr,
                                lapack_int n, double* a, lapack_int lda,
                                double* wr, double* wi, double* vl,
                                lapack_int ldvl, double* vr, lapack_int ldvr,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_dgeev_work( int matrix_layout, char jobvl, char jobvr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dgeev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeev_work", info );
             return info;
         }
-        if( ldvl < n ) {
+        if( ldvl < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) && ldvl < n ) ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dgeev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeev_work", info );
             return info;
         }
-        if( ldvr < n ) {
+        if( ldvr < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) && ldvr < n ) ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dgeev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeev_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -81,7 +81,7 @@ lapack_int LAPACKE_dgeev_work( int matrix_layout, char jobvl, char jobvr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvl_t * MAX(1,n) );
             if( vl_t == NULL ) {
@@ -89,7 +89,7 @@ lapack_int LAPACKE_dgeev_work( int matrix_layout, char jobvl, char jobvr,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvr_t * MAX(1,n) );
             if( vr_t == NULL ) {
@@ -98,7 +98,7 @@ lapack_int LAPACKE_dgeev_work( int matrix_layout, char jobvl, char jobvr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgeev( &jobvl, &jobvr, &n, a_t, &lda_t, wr, wi, vl_t, &ldvl_t,
                       vr_t, &ldvr_t, work, &lwork, &info );
@@ -106,30 +106,30 @@ lapack_int LAPACKE_dgeev_work( int matrix_layout, char jobvl, char jobvr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgeev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgeev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeevx.c b/LAPACKE/src/lapacke_dgeevx.c
index dd14b990e2..3f222b6231 100644
--- a/LAPACKE/src/lapacke_dgeevx.c
+++ b/LAPACKE/src/lapacke_dgeevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeevx( int matrix_layout, char balanc, char jobvl,
+lapack_int API_SUFFIX(LAPACKE_dgeevx)( int matrix_layout, char balanc, char jobvl,
                            char jobvr, char sense, lapack_int n, double* a,
                            lapack_int lda, double* wr, double* wi, double* vl,
                            lapack_int ldvl, double* vr, lapack_int ldvr,
@@ -45,19 +45,19 @@ lapack_int LAPACKE_dgeevx( int matrix_layout, char balanc, char jobvl,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         iwork = (lapack_int*)
             LAPACKE_malloc( sizeof(lapack_int) * MAX(1,2*n-2) );
         if( iwork == NULL ) {
@@ -66,7 +66,7 @@ lapack_int LAPACKE_dgeevx( int matrix_layout, char balanc, char jobvl,
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgeevx_work( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
+    info = API_SUFFIX(LAPACKE_dgeevx_work)( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
                                 lda, wr, wi, vl, ldvl, vr, ldvr, ilo, ihi,
                                 scale, abnrm, rconde, rcondv, &work_query,
                                 lwork, iwork );
@@ -81,19 +81,19 @@ lapack_int LAPACKE_dgeevx( int matrix_layout, char balanc, char jobvl,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgeevx_work( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
+    info = API_SUFFIX(LAPACKE_dgeevx_work)( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
                                 lda, wr, wi, vl, ldvl, vr, ldvr, ilo, ihi,
                                 scale, abnrm, rconde, rcondv, work, lwork,
                                 iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_1:
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         LAPACKE_free( iwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeevx_work.c b/LAPACKE/src/lapacke_dgeevx_work.c
index 9efb49ed3a..ab240498e0 100644
--- a/LAPACKE/src/lapacke_dgeevx_work.c
+++ b/LAPACKE/src/lapacke_dgeevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeevx_work( int matrix_layout, char balanc, char jobvl,
+lapack_int API_SUFFIX(LAPACKE_dgeevx_work)( int matrix_layout, char balanc, char jobvl,
                                 char jobvr, char sense, lapack_int n, double* a,
                                 lapack_int lda, double* wr, double* wi,
                                 double* vl, lapack_int ldvl, double* vr,
@@ -60,17 +60,17 @@ lapack_int LAPACKE_dgeevx_work( int matrix_layout, char balanc, char jobvl,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgeevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeevx_work", info );
             return info;
         }
-        if( ldvl < n ) {
+        if( ldvl < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) && ldvl < n ) ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dgeevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeevx_work", info );
             return info;
         }
-        if( ldvr < n ) {
+        if( ldvr < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) && ldvr < n ) ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_dgeevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeevx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -86,7 +86,7 @@ lapack_int LAPACKE_dgeevx_work( int matrix_layout, char balanc, char jobvl,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvl_t * MAX(1,n) );
             if( vl_t == NULL ) {
@@ -94,7 +94,7 @@ lapack_int LAPACKE_dgeevx_work( int matrix_layout, char balanc, char jobvl,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvr_t * MAX(1,n) );
             if( vr_t == NULL ) {
@@ -103,7 +103,7 @@ lapack_int LAPACKE_dgeevx_work( int matrix_layout, char balanc, char jobvl,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgeevx( &balanc, &jobvl, &jobvr, &sense, &n, a_t, &lda_t, wr, wi,
                        vl_t, &ldvl_t, vr_t, &ldvr_t, ilo, ihi, scale, abnrm,
@@ -112,30 +112,30 @@ lapack_int LAPACKE_dgeevx_work( int matrix_layout, char balanc, char jobvl,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgeevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgeevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgehrd.c b/LAPACKE/src/lapacke_dgehrd.c
index f5b8c2871e..35eead5971 100644
--- a/LAPACKE/src/lapacke_dgehrd.c
+++ b/LAPACKE/src/lapacke_dgehrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgehrd( int matrix_layout, lapack_int n, lapack_int ilo,
+lapack_int API_SUFFIX(LAPACKE_dgehrd)( int matrix_layout, lapack_int n, lapack_int ilo,
                            lapack_int ihi, double* a, lapack_int lda,
                            double* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_dgehrd( int matrix_layout, lapack_int n, lapack_int ilo,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgehrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgehrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgehrd_work( matrix_layout, n, ilo, ihi, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_dgehrd_work)( matrix_layout, n, ilo, ihi, a, lda, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -66,13 +66,13 @@ lapack_int LAPACKE_dgehrd( int matrix_layout, lapack_int n, lapack_int ilo,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgehrd_work( matrix_layout, n, ilo, ihi, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_dgehrd_work)( matrix_layout, n, ilo, ihi, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgehrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgehrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgehrd_work.c b/LAPACKE/src/lapacke_dgehrd_work.c
index 019bc822b8..18f03981f0 100644
--- a/LAPACKE/src/lapacke_dgehrd_work.c
+++ b/LAPACKE/src/lapacke_dgehrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgehrd_work( int matrix_layout, lapack_int n, lapack_int ilo,
+lapack_int API_SUFFIX(LAPACKE_dgehrd_work)( int matrix_layout, lapack_int n, lapack_int ilo,
                                 lapack_int ihi, double* a, lapack_int lda,
                                 double* tau, double* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dgehrd_work( int matrix_layout, lapack_int n, lapack_int ilo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dgehrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgehrd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_dgehrd_work( int matrix_layout, lapack_int n, lapack_int ilo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgehrd( &n, &ilo, &ihi, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgehrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgehrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgehrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgehrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgejsv.c b/LAPACKE/src/lapacke_dgejsv.c
index b8952e21be..4ef9f484d3 100644
--- a/LAPACKE/src/lapacke_dgejsv.c
+++ b/LAPACKE/src/lapacke_dgejsv.c
@@ -32,55 +32,55 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgejsv( int matrix_layout, char joba, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_dgejsv)( int matrix_layout, char joba, char jobu, char jobv,
                            char jobr, char jobt, char jobp, lapack_int m,
                            lapack_int n, double* a, lapack_int lda, double* sva,
                            double* u, lapack_int ldu, double* v, lapack_int ldv,
                            double* stat, lapack_int* istat )
 {
     lapack_int info = 0;
-    lapack_int lwork = (!( LAPACKE_lsame( jobu, 'u' ) ||
-                       LAPACKE_lsame( jobu, 'f' ) ||
-                       LAPACKE_lsame( jobv, 'v' ) ||
-                       LAPACKE_lsame( jobv, 'j' ) ||
-                       LAPACKE_lsame( joba, 'e' ) ||
-                       LAPACKE_lsame( joba, 'g' ) ) ? MAX3(7,4*n+1,2*m+n) :
-                       ( (!( LAPACKE_lsame( jobu, 'u' ) ||
-                       LAPACKE_lsame( jobu, 'f' ) ||
-                       LAPACKE_lsame( jobv, 'v' ) ||
-                       LAPACKE_lsame( jobv, 'j' ) ) &&
-                       ( LAPACKE_lsame( joba, 'e' ) ||
-                       LAPACKE_lsame( joba, 'g' ) ) ) ? MAX3(7,4*n+n*n,2*m+n) :
-                       ( ( LAPACKE_lsame( jobu, 'u' ) ||
-                       LAPACKE_lsame( jobu, 'f' ) ) &&
-                       (!( LAPACKE_lsame( jobv, 'v' ) ||
-                       LAPACKE_lsame( jobv, 'j' ) ) ) ? MAX(7,2*n+m) :
-                       ( ( LAPACKE_lsame( jobv, 'v' ) ||
-                       LAPACKE_lsame( jobv, 'j' ) ) &&
-                       (!( LAPACKE_lsame( jobu, 'u' ) ||
-                       LAPACKE_lsame( jobu, 'f' ) ) ) ? MAX(7,2*n+m) :
-                       ( ( LAPACKE_lsame( jobu, 'u' ) ||
-                       LAPACKE_lsame( jobu, 'f' ) ) &&
-                       ( LAPACKE_lsame( jobv, 'v' ) ||
-                       LAPACKE_lsame( jobv, 'j' ) ) &&
-                       !LAPACKE_lsame( jobv, 'j' ) ? MAX(1,6*n+2*n*n) :
-                       ( ( LAPACKE_lsame( jobu, 'u' ) ||
-                       LAPACKE_lsame( jobu, 'f' ) ) &&
-                       ( LAPACKE_lsame( jobv, 'v' ) ||
-                       LAPACKE_lsame( jobv, 'j' ) ) &&
-                       LAPACKE_lsame( jobv, 'j' ) ? MAX(7,m+3*n+n*n) :
+    lapack_int lwork = (!( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( joba, 'e' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ) ? MAX3(7,4*n+1,2*m+n) :
+                       ( (!( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) &&
+                       ( API_SUFFIX(LAPACKE_lsame)( joba, 'e' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ) ) ? MAX3(7,4*n+n*n,2*m+n) :
+                       ( ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+                       (!( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) ) ? MAX(7,2*n+m) :
+                       ( ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) &&
+                       (!( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) ) ? MAX(7,2*n+m) :
+                       ( ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+                       ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) &&
+                       !API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ? MAX(1,6*n+2*n*n) :
+                       ( ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+                       ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) &&
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ? MAX(7,m+3*n+n*n) :
                        7) ) ) ) ) );
     lapack_int* iwork = NULL;
     double* work = NULL;
     lapack_int i;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgejsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgejsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -10;
         }
     }
@@ -93,15 +93,15 @@ lapack_int LAPACKE_dgejsv( int matrix_layout, char joba, char jobu, char jobv,
     }
     lwork = MAX3( lwork, 7, 2*m+n );
     { /* FIXUP LWORK */
-        int want_u = LAPACKE_lsame( jobu, 'u' ) || LAPACKE_lsame( jobu, 'f' );
-        int want_v = LAPACKE_lsame( jobv, 'v' ) || LAPACKE_lsame( jobv, 'j' );
-        int want_sce = LAPACKE_lsame( joba, 'e' ) || LAPACKE_lsame( joba, 'g' );
+        int want_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'f' );
+        int want_v = API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'j' );
+        int want_sce = API_SUFFIX(LAPACKE_lsame)( joba, 'e' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' );
         if( !want_u && !want_v && !want_sce )  lwork = MAX( lwork, 4*n+1 ); // 1.1
         if( !want_u && !want_v && want_sce )   lwork = MAX( lwork, n*n+4*n ); // 1.2
         if( !want_u && want_v ) lwork = MAX( lwork, 4*n+1 ); // 2
         if( want_u && !want_v ) lwork = MAX( lwork, 4*n+1 ); // 3
-        if( want_u && LAPACKE_lsame( jobv, 'v' ) ) lwork = MAX( lwork, 6*n+2*n*n ); // 4.1
-        if( want_u && LAPACKE_lsame( jobv, 'j' ) ) lwork = MAX3( lwork, 4*n+n*n, 2*n+n*n+6 ); // 4.2
+        if( want_u && API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) lwork = MAX( lwork, 6*n+2*n*n ); // 4.1
+        if( want_u && API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) lwork = MAX3( lwork, 4*n+n*n, 2*n+n*n+6 ); // 4.2
     }
     work = (double*)LAPACKE_malloc( sizeof(double) * lwork );
     if( work == NULL ) {
@@ -109,7 +109,7 @@ lapack_int LAPACKE_dgejsv( int matrix_layout, char joba, char jobu, char jobv,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgejsv_work( matrix_layout, joba, jobu, jobv, jobr, jobt,
+    info = API_SUFFIX(LAPACKE_dgejsv_work)( matrix_layout, joba, jobu, jobv, jobr, jobt,
                                 jobp, m, n, a, lda, sva, u, ldu, v, ldv, work,
                                 lwork, iwork );
     /* Backup significant data from working array(s) */
@@ -125,7 +125,7 @@ lapack_int LAPACKE_dgejsv( int matrix_layout, char joba, char jobu, char jobv,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgejsv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgejsv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgejsv_work.c b/LAPACKE/src/lapacke_dgejsv_work.c
index b13a240760..4cc0f0d4f0 100644
--- a/LAPACKE/src/lapacke_dgejsv_work.c
+++ b/LAPACKE/src/lapacke_dgejsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgejsv_work( int matrix_layout, char joba, char jobu,
+lapack_int API_SUFFIX(LAPACKE_dgejsv_work)( int matrix_layout, char joba, char jobu,
                                 char jobv, char jobr, char jobt, char jobp,
                                 lapack_int m, lapack_int n, double* a,
                                 lapack_int lda, double* sva, double* u,
@@ -50,10 +50,10 @@ lapack_int LAPACKE_dgejsv_work( int matrix_layout, char joba, char jobu,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nu = LAPACKE_lsame( jobu, 'n' ) ? 1 : m;
-        lapack_int nv = LAPACKE_lsame( jobv, 'n' ) ? 1 : n;
-        lapack_int ncols_u = LAPACKE_lsame( jobu, 'n' ) ? 1 :
-            LAPACKE_lsame( jobu, 'f' ) ? m : n;
+        lapack_int nu = API_SUFFIX(LAPACKE_lsame)( jobu, 'n' ) ? 1 : m;
+        lapack_int nv = API_SUFFIX(LAPACKE_lsame)( jobv, 'n' ) ? 1 : n;
+        lapack_int ncols_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'n' ) ? 1 :
+            API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ? m : n;
         lapack_int lda_t = MAX(1,m);
         lapack_int ldu_t = MAX(1,nu);
         lapack_int ldv_t = MAX(1,nv);
@@ -63,17 +63,17 @@ lapack_int LAPACKE_dgejsv_work( int matrix_layout, char joba, char jobu,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dgejsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgejsv_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_dgejsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgejsv_work", info );
             return info;
         }
         if( ldv < n ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_dgejsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgejsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -82,16 +82,16 @@ lapack_int LAPACKE_dgejsv_work( int matrix_layout, char joba, char jobu,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobu, 'f' ) || LAPACKE_lsame( jobu, 'u' ) ||
-            LAPACKE_lsame( jobu, 'w' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobu, 'w' ) ) {
             u_t = (double*)LAPACKE_malloc( sizeof(double) * ldu_t * MAX(1,ncols_u) );
             if( u_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobv, 'j' ) || LAPACKE_lsame( jobv, 'v' ) ||
-            LAPACKE_lsame( jobv, 'w' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobv, 'w' ) ) {
             v_t = (double*)LAPACKE_malloc( sizeof(double) * ldv_t * MAX(1,n) );
             if( v_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -99,7 +99,7 @@ lapack_int LAPACKE_dgejsv_work( int matrix_layout, char joba, char jobu,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgejsv( &joba, &jobu, &jobv, &jobr, &jobt, &jobp, &m, &n, a_t,
                        &lda_t, sva, u_t, &ldu_t, v_t, &ldv_t, work, &lwork,
@@ -108,33 +108,33 @@ lapack_int LAPACKE_dgejsv_work( int matrix_layout, char joba, char jobu,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobu, 'f' ) || LAPACKE_lsame( jobu, 'u' ) ||
-            LAPACKE_lsame( jobu, 'w' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nu, ncols_u, u_t, ldu_t, u, ldu );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobu, 'w' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nu, ncols_u, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'j' ) || LAPACKE_lsame( jobv, 'v' ) ||
-            LAPACKE_lsame( jobv, 'w' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nv, n, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobv, 'w' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nv, n, v_t, ldv_t, v, ldv );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobv, 'j' ) || LAPACKE_lsame( jobv, 'v' ) ||
-            LAPACKE_lsame( jobv, 'w' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobv, 'w' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobu, 'f' ) || LAPACKE_lsame( jobu, 'u' ) ||
-            LAPACKE_lsame( jobu, 'w' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobu, 'w' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgejsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgejsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgejsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgejsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgelq.c b/LAPACKE/src/lapacke_dgelq.c
index 35d9d826dd..77c08e8903 100644
--- a/LAPACKE/src/lapacke_dgelq.c
+++ b/LAPACKE/src/lapacke_dgelq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgelq( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgelq)( int matrix_layout, lapack_int m, lapack_int n,
                           double* a, lapack_int lda,
                           double* t, lapack_int tsize )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_dgelq( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgelq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgelq_work( matrix_layout, m, n, a, lda, t, tsize, &work_query,
+    info = API_SUFFIX(LAPACKE_dgelq_work)( matrix_layout, m, n, a, lda, t, tsize, &work_query,
                                lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,12 +69,12 @@ lapack_int LAPACKE_dgelq( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgelq_work( matrix_layout, m, n, a, lda, t, tsize, work, lwork );
+    info = API_SUFFIX(LAPACKE_dgelq_work)( matrix_layout, m, n, a, lda, t, tsize, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgelq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgelq2.c b/LAPACKE/src/lapacke_dgelq2.c
index 3bf06cee7d..5ef3f4528d 100644
--- a/LAPACKE/src/lapacke_dgelq2.c
+++ b/LAPACKE/src/lapacke_dgelq2.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgelq2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgelq2)( int matrix_layout, lapack_int m, lapack_int n,
                            double* a, lapack_int lda, double* tau )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgelq2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelq2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
@@ -56,12 +56,12 @@ lapack_int LAPACKE_dgelq2( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgelq2_work( matrix_layout, m, n, a, lda, tau, work );
+    info = API_SUFFIX(LAPACKE_dgelq2_work)( matrix_layout, m, n, a, lda, tau, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgelq2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelq2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgelq2_work.c b/LAPACKE/src/lapacke_dgelq2_work.c
index cf838d01db..b14c1b5700 100644
--- a/LAPACKE/src/lapacke_dgelq2_work.c
+++ b/LAPACKE/src/lapacke_dgelq2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgelq2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgelq2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 double* a, lapack_int lda, double* tau,
                                 double* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dgelq2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgelq2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelq2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_dgelq2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgelq2( &m, &n, a_t, &lda_t, tau, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgelq2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelq2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgelq2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelq2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgelq_work.c b/LAPACKE/src/lapacke_dgelq_work.c
index 7d367b19e8..77cf070d1c 100644
--- a/LAPACKE/src/lapacke_dgelq_work.c
+++ b/LAPACKE/src/lapacke_dgelq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgelq_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgelq_work)( int matrix_layout, lapack_int m, lapack_int n,
                                double* a, lapack_int lda,
                                double* t, lapack_int tsize,
                                double* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dgelq_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgelq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_dgelq_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgelq( &m, &n, a_t, &lda_t, t, &tsize, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgelq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgelq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgelqf.c b/LAPACKE/src/lapacke_dgelqf.c
index 8880e3ca2e..5bc7365593 100644
--- a/LAPACKE/src/lapacke_dgelqf.c
+++ b/LAPACKE/src/lapacke_dgelqf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgelqf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgelqf)( int matrix_layout, lapack_int m, lapack_int n,
                            double* a, lapack_int lda, double* tau )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_dgelqf( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgelqf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelqf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgelqf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_dgelqf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,12 +65,12 @@ lapack_int LAPACKE_dgelqf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgelqf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_dgelqf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgelqf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelqf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgelqf_work.c b/LAPACKE/src/lapacke_dgelqf_work.c
index 7a64cded6e..595dc2853c 100644
--- a/LAPACKE/src/lapacke_dgelqf_work.c
+++ b/LAPACKE/src/lapacke_dgelqf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgelqf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgelqf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 double* a, lapack_int lda, double* tau,
                                 double* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dgelqf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgelqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelqf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_dgelqf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgelqf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgelqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelqf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgelqf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelqf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgels.c b/LAPACKE/src/lapacke_dgels.c
index 1852cfb228..def2cf406c 100644
--- a/LAPACKE/src/lapacke_dgels.c
+++ b/LAPACKE/src/lapacke_dgels.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgels( int matrix_layout, char trans, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dgels)( int matrix_layout, char trans, lapack_int m,
                           lapack_int n, lapack_int nrhs, double* a,
                           lapack_int lda, double* b, lapack_int ldb )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dgels( int matrix_layout, char trans, lapack_int m,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgels", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgels", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgels_work( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_dgels_work)( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
                                &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_dgels( int matrix_layout, char trans, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgels_work( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_dgels_work)( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
                                work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgels", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgels", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgels_work.c b/LAPACKE/src/lapacke_dgels_work.c
index 853c5614f0..7edf30fb01 100644
--- a/LAPACKE/src/lapacke_dgels_work.c
+++ b/LAPACKE/src/lapacke_dgels_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgels_work( int matrix_layout, char trans, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dgels_work)( int matrix_layout, char trans, lapack_int m,
                                lapack_int n, lapack_int nrhs, double* a,
                                lapack_int lda, double* b, lapack_int ldb,
                                double* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_dgels_work( int matrix_layout, char trans, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dgels_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgels_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dgels_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgels_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_dgels_work( int matrix_layout, char trans, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgels( &trans, &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -88,8 +88,8 @@ lapack_int LAPACKE_dgels_work( int matrix_layout, char trans, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -97,11 +97,11 @@ lapack_int LAPACKE_dgels_work( int matrix_layout, char trans, lapack_int m,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgels_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgels_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgels_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgels_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgelsd.c b/LAPACKE/src/lapacke_dgelsd.c
index d096313d5a..d4a83dda04 100644
--- a/LAPACKE/src/lapacke_dgelsd.c
+++ b/LAPACKE/src/lapacke_dgelsd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgelsd( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgelsd)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int nrhs, double* a, lapack_int lda,
                            double* b, lapack_int ldb, double* s, double rcond,
                            lapack_int* rank )
@@ -46,25 +46,25 @@ lapack_int LAPACKE_dgelsd( int matrix_layout, lapack_int m, lapack_int n,
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgelsd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelsd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &rcond, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &rcond, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgelsd_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
+    info = API_SUFFIX(LAPACKE_dgelsd_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
                                 rcond, rank, &work_query, lwork, &iwork_query );
     if( info != 0 ) {
         goto exit_level_0;
@@ -83,7 +83,7 @@ lapack_int LAPACKE_dgelsd( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgelsd_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
+    info = API_SUFFIX(LAPACKE_dgelsd_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
                                 rcond, rank, work, lwork, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -91,7 +91,7 @@ lapack_int LAPACKE_dgelsd( int matrix_layout, lapack_int m, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgelsd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelsd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgelsd_work.c b/LAPACKE/src/lapacke_dgelsd_work.c
index 242082216f..4e28931be1 100644
--- a/LAPACKE/src/lapacke_dgelsd_work.c
+++ b/LAPACKE/src/lapacke_dgelsd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgelsd_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int nrhs, double* a, lapack_int lda,
                                 double* b, lapack_int ldb, double* s,
                                 double rcond, lapack_int* rank, double* work,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_dgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dgelsd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelsd_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgelsd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelsd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -80,8 +80,8 @@ lapack_int LAPACKE_dgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgelsd( &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, s, &rcond, rank,
                        work, &lwork, iwork, &info );
@@ -89,8 +89,8 @@ lapack_int LAPACKE_dgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -98,11 +98,11 @@ lapack_int LAPACKE_dgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgelsd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelsd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgelsd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelsd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgelss.c b/LAPACKE/src/lapacke_dgelss.c
index e1692dc300..4b178c3eda 100644
--- a/LAPACKE/src/lapacke_dgelss.c
+++ b/LAPACKE/src/lapacke_dgelss.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgelss( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgelss)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int nrhs, double* a, lapack_int lda,
                            double* b, lapack_int ldb, double* s, double rcond,
                            lapack_int* rank )
@@ -42,25 +42,25 @@ lapack_int LAPACKE_dgelss( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgelss", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelss", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &rcond, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &rcond, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgelss_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
+    info = API_SUFFIX(LAPACKE_dgelss_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
                                 rcond, rank, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -73,13 +73,13 @@ lapack_int LAPACKE_dgelss( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgelss_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
+    info = API_SUFFIX(LAPACKE_dgelss_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
                                 rcond, rank, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgelss", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelss", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgelss_work.c b/LAPACKE/src/lapacke_dgelss_work.c
index a3d595acb2..111b274a57 100644
--- a/LAPACKE/src/lapacke_dgelss_work.c
+++ b/LAPACKE/src/lapacke_dgelss_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgelss_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgelss_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int nrhs, double* a, lapack_int lda,
                                 double* b, lapack_int ldb, double* s,
                                 double rcond, lapack_int* rank, double* work,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_dgelss_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dgelss_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelss_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgelss_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelss_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -80,8 +80,8 @@ lapack_int LAPACKE_dgelss_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgelss( &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, s, &rcond, rank,
                        work, &lwork, &info );
@@ -89,8 +89,8 @@ lapack_int LAPACKE_dgelss_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -98,11 +98,11 @@ lapack_int LAPACKE_dgelss_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgelss_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelss_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgelss_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelss_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgelsy.c b/LAPACKE/src/lapacke_dgelsy.c
index 97a1c90ac4..7b6b2a05bc 100644
--- a/LAPACKE/src/lapacke_dgelsy.c
+++ b/LAPACKE/src/lapacke_dgelsy.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgelsy( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgelsy)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int nrhs, double* a, lapack_int lda,
                            double* b, lapack_int ldb, lapack_int* jpvt,
                            double rcond, lapack_int* rank )
@@ -42,25 +42,25 @@ lapack_int LAPACKE_dgelsy( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgelsy", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelsy", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &rcond, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &rcond, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgelsy_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, jpvt,
+    info = API_SUFFIX(LAPACKE_dgelsy_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, jpvt,
                                 rcond, rank, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -73,13 +73,13 @@ lapack_int LAPACKE_dgelsy( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgelsy_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, jpvt,
+    info = API_SUFFIX(LAPACKE_dgelsy_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, jpvt,
                                 rcond, rank, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgelsy", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelsy", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgelsy_work.c b/LAPACKE/src/lapacke_dgelsy_work.c
index 2ba4f07ca3..70369af285 100644
--- a/LAPACKE/src/lapacke_dgelsy_work.c
+++ b/LAPACKE/src/lapacke_dgelsy_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgelsy_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int nrhs, double* a, lapack_int lda,
                                 double* b, lapack_int ldb, lapack_int* jpvt,
                                 double rcond, lapack_int* rank, double* work,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_dgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dgelsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelsy_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgelsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelsy_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -80,8 +80,8 @@ lapack_int LAPACKE_dgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgelsy( &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, jpvt, &rcond,
                        rank, work, &lwork, &info );
@@ -89,8 +89,8 @@ lapack_int LAPACKE_dgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -98,11 +98,11 @@ lapack_int LAPACKE_dgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgelsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelsy_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgelsy_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgelsy_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgemlq.c b/LAPACKE/src/lapacke_dgemlq.c
index a5fc7b8850..f9d7bb68c2 100644
--- a/LAPACKE/src/lapacke_dgemlq.c
+++ b/LAPACKE/src/lapacke_dgemlq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgemlq( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dgemlq)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const double* a, lapack_int lda,
                            const double* t, lapack_int tsize,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_dgemlq( int matrix_layout, char side, char trans,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgemlq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemlq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, k, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, k, m, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_d_nancheck( tsize, t, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( tsize, t, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgemlq_work( matrix_layout, side, trans, m, n, k, a, lda,
+    info = API_SUFFIX(LAPACKE_dgemlq_work)( matrix_layout, side, trans, m, n, k, a, lda,
                                 t, tsize, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -74,13 +74,13 @@ lapack_int LAPACKE_dgemlq( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgemlq_work( matrix_layout, side, trans, m, n, k, a, lda,
+    info = API_SUFFIX(LAPACKE_dgemlq_work)( matrix_layout, side, trans, m, n, k, a, lda,
                                 t, tsize, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgemlq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemlq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgemlq_work.c b/LAPACKE/src/lapacke_dgemlq_work.c
index 80072ffdf5..f015fd11cb 100644
--- a/LAPACKE/src/lapacke_dgemlq_work.c
+++ b/LAPACKE/src/lapacke_dgemlq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgemlq_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dgemlq_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const double* a, lapack_int lda,
                                 const double* t, lapack_int tsize,
@@ -51,18 +51,18 @@ lapack_int LAPACKE_dgemlq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lda_t = MAX(1,k);
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( lda < r ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgemlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemlq_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dgemlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemlq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -72,7 +72,7 @@ lapack_int LAPACKE_dgemlq_work( int matrix_layout, char side, char trans,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             a_t = (double*)LAPACKE_malloc( sizeof(double) * lda_t * MAX(1,m) );
         } else {
             a_t = (double*)LAPACKE_malloc( sizeof(double) * lda_t * MAX(1,n) );
@@ -87,8 +87,8 @@ lapack_int LAPACKE_dgemlq_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, k, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgemlq( &side, &trans, &m, &n, &k, a_t, &lda_t, t, &tsize,
                        c_t, &ldc_t, work, &lwork, &info );
@@ -96,18 +96,18 @@ lapack_int LAPACKE_dgemlq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgemlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemlq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgemlq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemlq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgemqr.c b/LAPACKE/src/lapacke_dgemqr.c
index 6fbcc20476..da4b3e423c 100644
--- a/LAPACKE/src/lapacke_dgemqr.c
+++ b/LAPACKE/src/lapacke_dgemqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgemqr( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dgemqr)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const double* a, lapack_int lda,
                            const double* t, lapack_int tsize,
@@ -44,26 +44,26 @@ lapack_int LAPACKE_dgemqr( int matrix_layout, char side, char trans,
     double work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgemqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_dge_nancheck( matrix_layout, r, k, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, r, k, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_d_nancheck( tsize, t, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( tsize, t, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgemqr_work( matrix_layout, side, trans, m, n, k, a, lda,
+    info = API_SUFFIX(LAPACKE_dgemqr_work)( matrix_layout, side, trans, m, n, k, a, lda,
                                 t, tsize, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -76,13 +76,13 @@ lapack_int LAPACKE_dgemqr( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgemqr_work( matrix_layout, side, trans, m, n, k, a, lda,
+    info = API_SUFFIX(LAPACKE_dgemqr_work)( matrix_layout, side, trans, m, n, k, a, lda,
                                 t, tsize, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgemqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgemqr_work.c b/LAPACKE/src/lapacke_dgemqr_work.c
index b254538a25..5687fda577 100644
--- a/LAPACKE/src/lapacke_dgemqr_work.c
+++ b/LAPACKE/src/lapacke_dgemqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgemqr_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dgemqr_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const double* a, lapack_int lda,
                                 const double* t, lapack_int tsize,
@@ -51,18 +51,18 @@ lapack_int LAPACKE_dgemqr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lda_t = MAX(1,r);
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( lda < k ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgemqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemqr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dgemqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -85,8 +85,8 @@ lapack_int LAPACKE_dgemqr_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, r, k, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, r, k, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgemqr( &side, &trans, &m, &n, &k, a_t, &lda_t, t, &tsize,
                        c_t, &ldc_t, work, &lwork, &info );
@@ -94,18 +94,18 @@ lapack_int LAPACKE_dgemqr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgemqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgemqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgemqrt.c b/LAPACKE/src/lapacke_dgemqrt.c
index 7b9e8c3503..7d2073fc0f 100644
--- a/LAPACKE/src/lapacke_dgemqrt.c
+++ b/LAPACKE/src/lapacke_dgemqrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgemqrt( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dgemqrt)( int matrix_layout, char side, char trans,
                             lapack_int m, lapack_int n, lapack_int k,
                             lapack_int nb, const double* v, lapack_int ldv,
                             const double* t, lapack_int ldt, double* c,
@@ -42,21 +42,21 @@ lapack_int LAPACKE_dgemqrt( int matrix_layout, char side, char trans,
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgemqrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemqrt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        nrows_v = LAPACKE_lsame( side, 'L' ) ? m :
-                             ( LAPACKE_lsame( side, 'R' ) ? n : 0 );
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? m :
+                             ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? n : 0 );
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -12;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, nb, k, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, nb, k, t, ldt ) ) {
             return -10;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, nrows_v, k, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, nrows_v, k, v, ldv ) ) {
             return -8;
         }
     }
@@ -68,13 +68,13 @@ lapack_int LAPACKE_dgemqrt( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgemqrt_work( matrix_layout, side, trans, m, n, k, nb, v, ldv,
+    info = API_SUFFIX(LAPACKE_dgemqrt_work)( matrix_layout, side, trans, m, n, k, nb, v, ldv,
                                  t, ldt, c, ldc, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgemqrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemqrt", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgemqrt_work.c b/LAPACKE/src/lapacke_dgemqrt_work.c
index 2ecca45374..061fbbf181 100644
--- a/LAPACKE/src/lapacke_dgemqrt_work.c
+++ b/LAPACKE/src/lapacke_dgemqrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgemqrt_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dgemqrt_work)( int matrix_layout, char side, char trans,
                                  lapack_int m, lapack_int n, lapack_int k,
                                  lapack_int nb, const double* v, lapack_int ldv,
                                  const double* t, lapack_int ldt, double* c,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_dgemqrt_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( ldc < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dgemqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemqrt_work", info );
             return info;
         }
         if( ldt < nb ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dgemqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemqrt_work", info );
             return info;
         }
         if( ldv < k ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dgemqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemqrt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -86,9 +86,9 @@ lapack_int LAPACKE_dgemqrt_work( int matrix_layout, char side, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
-        LAPACKE_dge_trans( matrix_layout, ldt, nb, t, ldt, t_t, ldt_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, ldt, nb, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgemqrt( &side, &trans, &m, &n, &k, &nb, v_t, &ldv_t, t_t,
                         &ldt_t, c_t, &ldc_t, work, &info );
@@ -96,7 +96,7 @@ lapack_int LAPACKE_dgemqrt_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_2:
@@ -105,11 +105,11 @@ lapack_int LAPACKE_dgemqrt_work( int matrix_layout, char side, char trans,
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgemqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemqrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgemqrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgemqrt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqlf.c b/LAPACKE/src/lapacke_dgeqlf.c
index c8891f6f2a..1f42a3d6f7 100644
--- a/LAPACKE/src/lapacke_dgeqlf.c
+++ b/LAPACKE/src/lapacke_dgeqlf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqlf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqlf)( int matrix_layout, lapack_int m, lapack_int n,
                            double* a, lapack_int lda, double* tau )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_dgeqlf( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqlf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqlf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgeqlf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_dgeqlf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,12 +65,12 @@ lapack_int LAPACKE_dgeqlf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgeqlf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_dgeqlf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqlf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqlf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqlf_work.c b/LAPACKE/src/lapacke_dgeqlf_work.c
index c5274633f8..d8a8e3ce0b 100644
--- a/LAPACKE/src/lapacke_dgeqlf_work.c
+++ b/LAPACKE/src/lapacke_dgeqlf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqlf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqlf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 double* a, lapack_int lda, double* tau,
                                 double* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dgeqlf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgeqlf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqlf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_dgeqlf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgeqlf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgeqlf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqlf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgeqlf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqlf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqp3.c b/LAPACKE/src/lapacke_dgeqp3.c
index b9bde96f21..d713daa4f5 100644
--- a/LAPACKE/src/lapacke_dgeqp3.c
+++ b/LAPACKE/src/lapacke_dgeqp3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqp3( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqp3)( int matrix_layout, lapack_int m, lapack_int n,
                            double* a, lapack_int lda, lapack_int* jpvt,
                            double* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_dgeqp3( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqp3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqp3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgeqp3_work( matrix_layout, m, n, a, lda, jpvt, tau,
+    info = API_SUFFIX(LAPACKE_dgeqp3_work)( matrix_layout, m, n, a, lda, jpvt, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -66,13 +66,13 @@ lapack_int LAPACKE_dgeqp3( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgeqp3_work( matrix_layout, m, n, a, lda, jpvt, tau, work,
+    info = API_SUFFIX(LAPACKE_dgeqp3_work)( matrix_layout, m, n, a, lda, jpvt, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqp3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqp3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqp3_work.c b/LAPACKE/src/lapacke_dgeqp3_work.c
index 130490ab12..1828581c51 100644
--- a/LAPACKE/src/lapacke_dgeqp3_work.c
+++ b/LAPACKE/src/lapacke_dgeqp3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqp3_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqp3_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 double* a, lapack_int lda, lapack_int* jpvt,
                                 double* tau, double* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dgeqp3_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgeqp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqp3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_dgeqp3_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgeqp3( &m, &n, a_t, &lda_t, jpvt, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgeqp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqp3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgeqp3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqp3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqpf.c b/LAPACKE/src/lapacke_dgeqpf.c
index 74256a0fd6..4331e7fddd 100644
--- a/LAPACKE/src/lapacke_dgeqpf.c
+++ b/LAPACKE/src/lapacke_dgeqpf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqpf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqpf)( int matrix_layout, lapack_int m, lapack_int n,
                            double* a, lapack_int lda, lapack_int* jpvt,
                            double* tau )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqpf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqpf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
@@ -57,12 +57,12 @@ lapack_int LAPACKE_dgeqpf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgeqpf_work( matrix_layout, m, n, a, lda, jpvt, tau, work );
+    info = API_SUFFIX(LAPACKE_dgeqpf_work)( matrix_layout, m, n, a, lda, jpvt, tau, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqpf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqpf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqpf_work.c b/LAPACKE/src/lapacke_dgeqpf_work.c
index 8d53351d76..fad6b21025 100644
--- a/LAPACKE/src/lapacke_dgeqpf_work.c
+++ b/LAPACKE/src/lapacke_dgeqpf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqpf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqpf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 double* a, lapack_int lda, lapack_int* jpvt,
                                 double* tau, double* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dgeqpf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgeqpf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqpf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_dgeqpf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgeqpf( &m, &n, a_t, &lda_t, jpvt, tau, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgeqpf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqpf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgeqpf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqpf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqr.c b/LAPACKE/src/lapacke_dgeqr.c
index 20a1700fdb..467ace5fc9 100644
--- a/LAPACKE/src/lapacke_dgeqr.c
+++ b/LAPACKE/src/lapacke_dgeqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqr( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqr)( int matrix_layout, lapack_int m, lapack_int n,
                           double* a, lapack_int lda,
                           double* t, lapack_int tsize )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_dgeqr( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgeqr_work( matrix_layout, m, n, a, lda, t, tsize, &work_query,
+    info = API_SUFFIX(LAPACKE_dgeqr_work)( matrix_layout, m, n, a, lda, t, tsize, &work_query,
                                lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,12 +69,12 @@ lapack_int LAPACKE_dgeqr( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgeqr_work( matrix_layout, m, n, a, lda, t, tsize, work, lwork );
+    info = API_SUFFIX(LAPACKE_dgeqr_work)( matrix_layout, m, n, a, lda, t, tsize, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqr2.c b/LAPACKE/src/lapacke_dgeqr2.c
index a340e3a9a7..bbd1793ff0 100644
--- a/LAPACKE/src/lapacke_dgeqr2.c
+++ b/LAPACKE/src/lapacke_dgeqr2.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqr2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqr2)( int matrix_layout, lapack_int m, lapack_int n,
                            double* a, lapack_int lda, double* tau )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqr2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqr2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
@@ -56,12 +56,12 @@ lapack_int LAPACKE_dgeqr2( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgeqr2_work( matrix_layout, m, n, a, lda, tau, work );
+    info = API_SUFFIX(LAPACKE_dgeqr2_work)( matrix_layout, m, n, a, lda, tau, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqr2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqr2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqr2_work.c b/LAPACKE/src/lapacke_dgeqr2_work.c
index 6e461c643c..44374bb730 100644
--- a/LAPACKE/src/lapacke_dgeqr2_work.c
+++ b/LAPACKE/src/lapacke_dgeqr2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqr2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqr2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 double* a, lapack_int lda, double* tau,
                                 double* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dgeqr2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgeqr2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqr2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_dgeqr2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgeqr2( &m, &n, a_t, &lda_t, tau, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgeqr2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqr2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgeqr2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqr2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqr_work.c b/LAPACKE/src/lapacke_dgeqr_work.c
index 112e3fcbca..51f44322cf 100644
--- a/LAPACKE/src/lapacke_dgeqr_work.c
+++ b/LAPACKE/src/lapacke_dgeqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqr_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqr_work)( int matrix_layout, lapack_int m, lapack_int n,
                                double* a, lapack_int lda,
                                double* t, lapack_int tsize,
                                double* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dgeqr_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgeqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_dgeqr_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgeqr( &m, &n, a_t, &lda_t, t, &tsize, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgeqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgeqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqrf.c b/LAPACKE/src/lapacke_dgeqrf.c
index 81a2d4d6b0..9b1cd92678 100644
--- a/LAPACKE/src/lapacke_dgeqrf.c
+++ b/LAPACKE/src/lapacke_dgeqrf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqrf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqrf)( int matrix_layout, lapack_int m, lapack_int n,
                            double* a, lapack_int lda, double* tau )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_dgeqrf( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgeqrf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_dgeqrf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,12 +65,12 @@ lapack_int LAPACKE_dgeqrf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgeqrf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_dgeqrf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqrf_work.c b/LAPACKE/src/lapacke_dgeqrf_work.c
index abd8f1726a..df9a6896d0 100644
--- a/LAPACKE/src/lapacke_dgeqrf_work.c
+++ b/LAPACKE/src/lapacke_dgeqrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqrf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqrf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 double* a, lapack_int lda, double* tau,
                                 double* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dgeqrf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgeqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_dgeqrf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgeqrf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgeqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgeqrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqrfp.c b/LAPACKE/src/lapacke_dgeqrfp.c
index fcac667628..4657175203 100644
--- a/LAPACKE/src/lapacke_dgeqrfp.c
+++ b/LAPACKE/src/lapacke_dgeqrfp.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqrfp( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqrfp)( int matrix_layout, lapack_int m, lapack_int n,
                             double* a, lapack_int lda, double* tau )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_dgeqrfp( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqrfp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrfp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgeqrfp_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_dgeqrfp_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                  lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,12 +65,12 @@ lapack_int LAPACKE_dgeqrfp( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgeqrfp_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_dgeqrfp_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqrfp", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrfp", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqrfp_work.c b/LAPACKE/src/lapacke_dgeqrfp_work.c
index 433e34bfcd..d748059e1f 100644
--- a/LAPACKE/src/lapacke_dgeqrfp_work.c
+++ b/LAPACKE/src/lapacke_dgeqrfp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqrfp_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqrfp_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  double* a, lapack_int lda, double* tau,
                                  double* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dgeqrfp_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgeqrfp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrfp_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_dgeqrfp_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgeqrfp( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgeqrfp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrfp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgeqrfp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrfp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqrt.c b/LAPACKE/src/lapacke_dgeqrt.c
index 3967b5c19a..06f3390d2e 100644
--- a/LAPACKE/src/lapacke_dgeqrt.c
+++ b/LAPACKE/src/lapacke_dgeqrt.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqrt( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqrt)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int nb, double* a, lapack_int lda, double* t,
                            lapack_int ldt )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
@@ -57,12 +57,12 @@ lapack_int LAPACKE_dgeqrt( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgeqrt_work( matrix_layout, m, n, nb, a, lda, t, ldt, work );
+    info = API_SUFFIX(LAPACKE_dgeqrt_work)( matrix_layout, m, n, nb, a, lda, t, ldt, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrt", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqrt2.c b/LAPACKE/src/lapacke_dgeqrt2.c
index f522694547..a056713fd5 100644
--- a/LAPACKE/src/lapacke_dgeqrt2.c
+++ b/LAPACKE/src/lapacke_dgeqrt2.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqrt2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqrt2)( int matrix_layout, lapack_int m, lapack_int n,
                             double* a, lapack_int lda, double* t,
                             lapack_int ldt )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqrt2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrt2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dgeqrt2_work( matrix_layout, m, n, a, lda, t, ldt );
+    return API_SUFFIX(LAPACKE_dgeqrt2_work)( matrix_layout, m, n, a, lda, t, ldt );
 }
diff --git a/LAPACKE/src/lapacke_dgeqrt2_work.c b/LAPACKE/src/lapacke_dgeqrt2_work.c
index 04a7985091..b332ee6b28 100644
--- a/LAPACKE/src/lapacke_dgeqrt2_work.c
+++ b/LAPACKE/src/lapacke_dgeqrt2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqrt2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqrt2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  double* a, lapack_int lda, double* t,
                                  lapack_int ldt )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_dgeqrt2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgeqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrt2_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dgeqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrt2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,26 +71,26 @@ lapack_int LAPACKE_dgeqrt2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgeqrt2( &m, &n, a_t, &lda_t, t_t, &ldt_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgeqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrt2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgeqrt2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrt2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqrt3.c b/LAPACKE/src/lapacke_dgeqrt3.c
index 513cf68155..8548b65d81 100644
--- a/LAPACKE/src/lapacke_dgeqrt3.c
+++ b/LAPACKE/src/lapacke_dgeqrt3.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqrt3( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqrt3)( int matrix_layout, lapack_int m, lapack_int n,
                             double* a, lapack_int lda, double* t,
                             lapack_int ldt )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgeqrt3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrt3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dgeqrt3_work( matrix_layout, m, n, a, lda, t, ldt );
+    return API_SUFFIX(LAPACKE_dgeqrt3_work)( matrix_layout, m, n, a, lda, t, ldt );
 }
diff --git a/LAPACKE/src/lapacke_dgeqrt3_work.c b/LAPACKE/src/lapacke_dgeqrt3_work.c
index e2c8706aa0..69a17f6a86 100644
--- a/LAPACKE/src/lapacke_dgeqrt3_work.c
+++ b/LAPACKE/src/lapacke_dgeqrt3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqrt3_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqrt3_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  double* a, lapack_int lda, double* t,
                                  lapack_int ldt )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_dgeqrt3_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgeqrt3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrt3_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dgeqrt3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrt3_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,26 +71,26 @@ lapack_int LAPACKE_dgeqrt3_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgeqrt3( &m, &n, a_t, &lda_t, t_t, &ldt_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgeqrt3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrt3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgeqrt3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrt3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgeqrt_work.c b/LAPACKE/src/lapacke_dgeqrt_work.c
index 8a4c7ceadd..103c177bf5 100644
--- a/LAPACKE/src/lapacke_dgeqrt_work.c
+++ b/LAPACKE/src/lapacke_dgeqrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgeqrt_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgeqrt_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int nb, double* a, lapack_int lda,
                                 double* t, lapack_int ldt, double* work )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_dgeqrt_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dgeqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrt_work", info );
             return info;
         }
         if( ldt < MIN(m,n) ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgeqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,15 +72,15 @@ lapack_int LAPACKE_dgeqrt_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgeqrt( &m, &n, &nb, a_t, &lda_t, t_t, &ldt_t, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, ldt, MIN(m,n), t_t, ldt_t, t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nb, MIN(m,n), t_t, ldt_t, t,
                            ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
@@ -88,11 +88,11 @@ lapack_int LAPACKE_dgeqrt_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgeqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgeqrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgeqrt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgerfs.c b/LAPACKE/src/lapacke_dgerfs.c
index b447e258af..81239fefe9 100644
--- a/LAPACKE/src/lapacke_dgerfs.c
+++ b/LAPACKE/src/lapacke_dgerfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgerfs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgerfs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int nrhs, const double* a, lapack_int lda,
                            const double* af, lapack_int ldaf,
                            const lapack_int* ipiv, const double* b,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_dgerfs( int matrix_layout, char trans, lapack_int n,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgerfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, af, ldaf ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -75,7 +75,7 @@ lapack_int LAPACKE_dgerfs( int matrix_layout, char trans, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgerfs_work( matrix_layout, trans, n, nrhs, a, lda, af, ldaf,
+    info = API_SUFFIX(LAPACKE_dgerfs_work)( matrix_layout, trans, n, nrhs, a, lda, af, ldaf,
                                 ipiv, b, ldb, x, ldx, ferr, berr, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -83,7 +83,7 @@ lapack_int LAPACKE_dgerfs( int matrix_layout, char trans, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgerfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgerfs_work.c b/LAPACKE/src/lapacke_dgerfs_work.c
index 85e53a74fd..05b35b13ec 100644
--- a/LAPACKE/src/lapacke_dgerfs_work.c
+++ b/LAPACKE/src/lapacke_dgerfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgerfs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgerfs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int nrhs, const double* a,
                                 lapack_int lda, const double* af,
                                 lapack_int ldaf, const lapack_int* ipiv,
@@ -60,22 +60,22 @@ lapack_int LAPACKE_dgerfs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerfs_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -100,10 +100,10 @@ lapack_int LAPACKE_dgerfs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgerfs( &trans, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, ipiv, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, iwork, &info );
@@ -111,7 +111,7 @@ lapack_int LAPACKE_dgerfs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -122,11 +122,11 @@ lapack_int LAPACKE_dgerfs_work( int matrix_layout, char trans, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgerfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgerfsx.c b/LAPACKE/src/lapacke_dgerfsx.c
index ce069abf82..ce36f0d36f 100644
--- a/LAPACKE/src/lapacke_dgerfsx.c
+++ b/LAPACKE/src/lapacke_dgerfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgerfsx( int matrix_layout, char trans, char equed,
+lapack_int API_SUFFIX(LAPACKE_dgerfsx)( int matrix_layout, char trans, char equed,
                             lapack_int n, lapack_int nrhs, const double* a,
                             lapack_int lda, const double* af, lapack_int ldaf,
                             const lapack_int* ipiv, const double* r,
@@ -46,37 +46,37 @@ lapack_int LAPACKE_dgerfsx( int matrix_layout, char trans, char equed,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgerfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerfsx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, af, ldaf ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
-        if( LAPACKE_lsame( equed, 'b' ) || LAPACKE_lsame( equed, 'c' ) ) {
-            if( LAPACKE_d_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'b' ) || API_SUFFIX(LAPACKE_lsame)( equed, 'c' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, c, 1 ) ) {
                 return -12;
             }
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -23;
             }
         }
-        if( LAPACKE_lsame( equed, 'b' ) || LAPACKE_lsame( equed, 'r' ) ) {
-            if( LAPACKE_d_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'b' ) || API_SUFFIX(LAPACKE_lsame)( equed, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, r, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -15;
         }
     }
@@ -93,7 +93,7 @@ lapack_int LAPACKE_dgerfsx( int matrix_layout, char trans, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgerfsx_work( matrix_layout, trans, equed, n, nrhs, a, lda,
+    info = API_SUFFIX(LAPACKE_dgerfsx_work)( matrix_layout, trans, equed, n, nrhs, a, lda,
                                  af, ldaf, ipiv, r, c, b, ldb, x, ldx, rcond,
                                  berr, n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, iwork );
@@ -103,7 +103,7 @@ lapack_int LAPACKE_dgerfsx( int matrix_layout, char trans, char equed,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgerfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgerfsx_work.c b/LAPACKE/src/lapacke_dgerfsx_work.c
index d6606e3f3a..a2ccdfbf4b 100644
--- a/LAPACKE/src/lapacke_dgerfsx_work.c
+++ b/LAPACKE/src/lapacke_dgerfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgerfsx_work( int matrix_layout, char trans, char equed,
+lapack_int API_SUFFIX(LAPACKE_dgerfsx_work)( int matrix_layout, char trans, char equed,
                                  lapack_int n, lapack_int nrhs, const double* a,
                                  lapack_int lda, const double* af,
                                  lapack_int ldaf, const lapack_int* ipiv,
@@ -68,22 +68,22 @@ lapack_int LAPACKE_dgerfsx_work( int matrix_layout, char trans, char equed,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerfsx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_dgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_dgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -120,10 +120,10 @@ lapack_int LAPACKE_dgerfsx_work( int matrix_layout, char trans, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgerfsx( &trans, &equed, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, r, c, b_t, &ldb_t, x_t, &ldx_t, rcond, berr,
@@ -133,10 +133,10 @@ lapack_int LAPACKE_dgerfsx_work( int matrix_layout, char trans, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -152,11 +152,11 @@ lapack_int LAPACKE_dgerfsx_work( int matrix_layout, char trans, char equed,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgerfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgerqf.c b/LAPACKE/src/lapacke_dgerqf.c
index 6cea16ba97..f87186b94f 100644
--- a/LAPACKE/src/lapacke_dgerqf.c
+++ b/LAPACKE/src/lapacke_dgerqf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgerqf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgerqf)( int matrix_layout, lapack_int m, lapack_int n,
                            double* a, lapack_int lda, double* tau )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_dgerqf( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgerqf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerqf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgerqf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_dgerqf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,12 +65,12 @@ lapack_int LAPACKE_dgerqf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgerqf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_dgerqf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgerqf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerqf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgerqf_work.c b/LAPACKE/src/lapacke_dgerqf_work.c
index cd571fb092..e7e441aabb 100644
--- a/LAPACKE/src/lapacke_dgerqf_work.c
+++ b/LAPACKE/src/lapacke_dgerqf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgerqf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgerqf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 double* a, lapack_int lda, double* tau,
                                 double* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dgerqf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgerqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerqf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_dgerqf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgerqf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgerqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerqf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgerqf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgerqf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgesdd.c b/LAPACKE/src/lapacke_dgesdd.c
index 6b261e9534..76584d5786 100644
--- a/LAPACKE/src/lapacke_dgesdd.c
+++ b/LAPACKE/src/lapacke_dgesdd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgesdd( int matrix_layout, char jobz, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dgesdd)( int matrix_layout, char jobz, lapack_int m,
                            lapack_int n, double* a, lapack_int lda, double* s,
                            double* u, lapack_int ldu, double* vt,
                            lapack_int ldvt )
@@ -43,13 +43,13 @@ lapack_int LAPACKE_dgesdd( int matrix_layout, char jobz, lapack_int m,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgesdd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesdd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
@@ -62,7 +62,7 @@ lapack_int LAPACKE_dgesdd( int matrix_layout, char jobz, lapack_int m,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgesdd_work( matrix_layout, jobz, m, n, a, lda, s, u, ldu, vt,
+    info = API_SUFFIX(LAPACKE_dgesdd_work)( matrix_layout, jobz, m, n, a, lda, s, u, ldu, vt,
                                 ldvt, &work_query, lwork, iwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -75,7 +75,7 @@ lapack_int LAPACKE_dgesdd( int matrix_layout, char jobz, lapack_int m,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgesdd_work( matrix_layout, jobz, m, n, a, lda, s, u, ldu, vt,
+    info = API_SUFFIX(LAPACKE_dgesdd_work)( matrix_layout, jobz, m, n, a, lda, s, u, ldu, vt,
                                 ldvt, work, lwork, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -83,7 +83,7 @@ lapack_int LAPACKE_dgesdd( int matrix_layout, char jobz, lapack_int m,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgesdd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesdd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgesdd_work.c b/LAPACKE/src/lapacke_dgesdd_work.c
index 7bef2230c3..16a92b3219 100644
--- a/LAPACKE/src/lapacke_dgesdd_work.c
+++ b/LAPACKE/src/lapacke_dgesdd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgesdd_work( int matrix_layout, char jobz, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dgesdd_work)( int matrix_layout, char jobz, lapack_int m,
                                 lapack_int n, double* a, lapack_int lda,
                                 double* s, double* u, lapack_int ldu,
                                 double* vt, lapack_int ldvt, double* work,
@@ -47,15 +47,18 @@ lapack_int LAPACKE_dgesdd_work( int matrix_layout, char jobz, lapack_int m,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_u = ( LAPACKE_lsame( jobz, 'a' ) ||
-                             LAPACKE_lsame( jobz, 's' ) ||
-                             ( LAPACKE_lsame( jobz, 'o' ) && m<n) ) ? m : 1;
-        lapack_int ncols_u = ( LAPACKE_lsame( jobz, 'a' ) ||
-                             ( LAPACKE_lsame( jobz, 'o' ) && m<n) ) ? m :
-                             ( LAPACKE_lsame( jobz, 's' ) ? MIN(m,n) : 1);
-        lapack_int nrows_vt = ( LAPACKE_lsame( jobz, 'a' ) ||
-                              ( LAPACKE_lsame( jobz, 'o' ) && m>=n) ) ? n :
-                              ( LAPACKE_lsame( jobz, 's' ) ? MIN(m,n) : 1);
+        lapack_int nrows_u = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+                             ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && m<n) ) ? m : 1;
+        lapack_int ncols_u = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) ||
+                             ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && m<n) ) ? m :
+                             ( API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ? MIN(m,n) : 1);
+        lapack_int nrows_vt = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) ||
+                              ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && m>=n) ) ? n :
+                              ( API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ? MIN(m,n) : 1);
+        lapack_int ncols_vt = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) ||
+                              API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+                              ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && m>=n) ) ? n : 1;
         lapack_int lda_t = MAX(1,m);
         lapack_int ldu_t = MAX(1,nrows_u);
         lapack_int ldvt_t = MAX(1,nrows_vt);
@@ -65,17 +68,17 @@ lapack_int LAPACKE_dgesdd_work( int matrix_layout, char jobz, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dgesdd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesdd_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dgesdd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesdd_work", info );
             return info;
         }
-        if( ldvt < n ) {
+        if( ldvt < ncols_vt ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dgesdd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesdd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -90,8 +93,8 @@ lapack_int LAPACKE_dgesdd_work( int matrix_layout, char jobz, lapack_int m,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m<n) ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m<n) ) ) {
             u_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldu_t * MAX(1,ncols_u) );
             if( u_t == NULL ) {
@@ -99,8 +102,8 @@ lapack_int LAPACKE_dgesdd_work( int matrix_layout, char jobz, lapack_int m,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m>=n) ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m>=n) ) ) {
             vt_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvt_t * MAX(1,n) );
             if( vt_t == NULL ) {
@@ -109,7 +112,7 @@ lapack_int LAPACKE_dgesdd_work( int matrix_layout, char jobz, lapack_int m,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgesdd( &jobz, &m, &n, a_t, &lda_t, s, u_t, &ldu_t, vt_t,
                        &ldvt_t, work, &lwork, iwork, &info );
@@ -117,36 +120,36 @@ lapack_int LAPACKE_dgesdd_work( int matrix_layout, char jobz, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m<n) ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m<n) ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
                                u, ldu );
         }
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m>=n) ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m>=n) ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
                                ldvt );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m>=n) ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m>=n) ) ) {
             LAPACKE_free( vt_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m<n) ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m<n) ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgesdd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesdd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgesdd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesdd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgesv.c b/LAPACKE/src/lapacke_dgesv.c
index 52a0695804..c138426241 100644
--- a/LAPACKE/src/lapacke_dgesv.c
+++ b/LAPACKE/src/lapacke_dgesv.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgesv( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_dgesv)( int matrix_layout, lapack_int n, lapack_int nrhs,
                           double* a, lapack_int lda, lapack_int* ipiv,
                           double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgesv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_dgesv_work( matrix_layout, n, nrhs, a, lda, ipiv, b, ldb );
+    return API_SUFFIX(LAPACKE_dgesv_work)( matrix_layout, n, nrhs, a, lda, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dgesv_work.c b/LAPACKE/src/lapacke_dgesv_work.c
index c6c65d2ec2..ec48c27e12 100644
--- a/LAPACKE/src/lapacke_dgesv_work.c
+++ b/LAPACKE/src/lapacke_dgesv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_dgesv_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                double* a, lapack_int lda, lapack_int* ipiv,
                                double* b, lapack_int ldb )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_dgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,27 +71,27 @@ lapack_int LAPACKE_dgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgesv( &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgesv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgesvd.c b/LAPACKE/src/lapacke_dgesvd.c
index cc77177526..f2102cecb7 100644
--- a/LAPACKE/src/lapacke_dgesvd.c
+++ b/LAPACKE/src/lapacke_dgesvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgesvd( int matrix_layout, char jobu, char jobvt,
+lapack_int API_SUFFIX(LAPACKE_dgesvd)( int matrix_layout, char jobu, char jobvt,
                            lapack_int m, lapack_int n, double* a,
                            lapack_int lda, double* s, double* u, lapack_int ldu,
                            double* vt, lapack_int ldvt, double* superb )
@@ -43,19 +43,19 @@ lapack_int LAPACKE_dgesvd( int matrix_layout, char jobu, char jobvt,
     double work_query;
     lapack_int i;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgesvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgesvd_work( matrix_layout, jobu, jobvt, m, n, a, lda, s, u,
+    info = API_SUFFIX(LAPACKE_dgesvd_work)( matrix_layout, jobu, jobvt, m, n, a, lda, s, u,
                                 ldu, vt, ldvt, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -68,7 +68,7 @@ lapack_int LAPACKE_dgesvd( int matrix_layout, char jobu, char jobvt,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgesvd_work( matrix_layout, jobu, jobvt, m, n, a, lda, s, u,
+    info = API_SUFFIX(LAPACKE_dgesvd_work)( matrix_layout, jobu, jobvt, m, n, a, lda, s, u,
                                 ldu, vt, ldvt, work, lwork );
     /* Backup significant data from working array(s) */
     for( i=0; i<MIN(m,n)-1; i++ ) {
@@ -78,7 +78,7 @@ lapack_int LAPACKE_dgesvd( int matrix_layout, char jobu, char jobvt,
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgesvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgesvd_work.c b/LAPACKE/src/lapacke_dgesvd_work.c
index 6668dd7484..99e27cfbda 100644
--- a/LAPACKE/src/lapacke_dgesvd_work.c
+++ b/LAPACKE/src/lapacke_dgesvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgesvd_work( int matrix_layout, char jobu, char jobvt,
+lapack_int API_SUFFIX(LAPACKE_dgesvd_work)( int matrix_layout, char jobu, char jobvt,
                                 lapack_int m, lapack_int n, double* a,
                                 lapack_int lda, double* s, double* u,
                                 lapack_int ldu, double* vt, lapack_int ldvt,
@@ -47,14 +47,14 @@ lapack_int LAPACKE_dgesvd_work( int matrix_layout, char jobu, char jobvt,
             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_vt = LAPACKE_lsame( jobvt, 'a' ) ? n :
-                              ( LAPACKE_lsame( jobvt, 's' ) ? MIN(m,n) : 1);
-        lapack_int ncols_vt = ( LAPACKE_lsame( jobvt, 'a' ) ||
-                               LAPACKE_lsame( jobvt, 's' ) ) ? n : 1;
+        lapack_int nrows_u = ( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) ? m : 1;
+        lapack_int ncols_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) ? m :
+                             ( API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ? MIN(m,n) : 1);
+        lapack_int nrows_vt = API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) ? n :
+                              ( API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ? MIN(m,n) : 1);
+        lapack_int ncols_vt = ( API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) ||
+                               API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ) ? n : 1;
         lapack_int lda_t = MAX(1,m);
         lapack_int ldu_t = MAX(1,nrows_u);
         lapack_int ldvt_t = MAX(1,nrows_vt);
@@ -64,17 +64,17 @@ lapack_int LAPACKE_dgesvd_work( int matrix_layout, char jobu, char jobvt,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dgesvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvd_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dgesvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvd_work", info );
             return info;
         }
         if( ldvt < ncols_vt ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dgesvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -89,7 +89,7 @@ lapack_int LAPACKE_dgesvd_work( int matrix_layout, char jobu, char jobvt,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) {
             u_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldu_t * MAX(1,ncols_u) );
             if( u_t == NULL ) {
@@ -97,7 +97,7 @@ lapack_int LAPACKE_dgesvd_work( int matrix_layout, char jobu, char jobvt,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobvt, 'a' ) || LAPACKE_lsame( jobvt, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ) {
             vt_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvt_t * MAX(1,n) );
             if( vt_t == NULL ) {
@@ -106,7 +106,7 @@ lapack_int LAPACKE_dgesvd_work( int matrix_layout, char jobu, char jobvt,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgesvd( &jobu, &jobvt, &m, &n, a_t, &lda_t, s, u_t, &ldu_t, vt_t,
                        &ldvt_t, work, &lwork, &info );
@@ -114,32 +114,32 @@ lapack_int LAPACKE_dgesvd_work( int matrix_layout, char jobu, char jobvt,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
                                u, ldu );
         }
-        if( LAPACKE_lsame( jobvt, 'a' ) || LAPACKE_lsame( jobvt, 's' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
                                ldvt );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvt, 'a' ) || LAPACKE_lsame( jobvt, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ) {
             LAPACKE_free( vt_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(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_dgesvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgesvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgesvdq.c b/LAPACKE/src/lapacke_dgesvdq.c
index 4e1b876810..f025905728 100644
--- a/LAPACKE/src/lapacke_dgesvdq.c
+++ b/LAPACKE/src/lapacke_dgesvdq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgesvdq( int matrix_layout, char joba, char jobp,
+lapack_int API_SUFFIX(LAPACKE_dgesvdq)( int matrix_layout, char joba, char jobp,
                            char jobr, char jobu, char jobv,
                            lapack_int m, lapack_int n, double* a,
                            lapack_int lda, double* s, double* u, lapack_int ldu,
@@ -48,21 +48,20 @@ lapack_int LAPACKE_dgesvdq( int matrix_layout, char joba, char jobp,
     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_dgesvdq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvdq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgesvdq_work( matrix_layout, joba, jobp, jobr, jobu, jobv,
+    info = API_SUFFIX(LAPACKE_dgesvdq_work)( matrix_layout, joba, jobp, jobr, jobu, jobv,
                                  m, n, a, lda, s, u, ldu, v, ldv, numrank,
                                  &iwork_query, liwork, &work_query, lwork,
                                  &rwork_query, lrwork );
@@ -89,7 +88,7 @@ lapack_int LAPACKE_dgesvdq( int matrix_layout, char joba, char jobp,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgesvdq_work( matrix_layout, joba, jobp, jobr, jobu, jobv,
+    info = API_SUFFIX(LAPACKE_dgesvdq_work)( matrix_layout, joba, jobp, jobr, jobu, jobv,
                                  m, n, a, lda, s, u, ldu, v, ldv, numrank,
                                  iwork, liwork, work, lwork, rwork, lrwork );
 
@@ -99,7 +98,7 @@ lapack_int LAPACKE_dgesvdq( int matrix_layout, char joba, char jobp,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgesvdq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvdq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgesvdq_work.c b/LAPACKE/src/lapacke_dgesvdq_work.c
index 0d65f05298..b91637df74 100644
--- a/LAPACKE/src/lapacke_dgesvdq_work.c
+++ b/LAPACKE/src/lapacke_dgesvdq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgesvdq_work( int matrix_layout, char joba, char jobp,
+lapack_int API_SUFFIX(LAPACKE_dgesvdq_work)( int matrix_layout, char joba, char jobp,
                            char jobr, char jobu, char jobv,
                            lapack_int m, lapack_int n, double* a,
                            lapack_int lda, double* s, double* u, lapack_int ldu,
@@ -50,12 +50,12 @@ lapack_int LAPACKE_dgesvdq_work( int matrix_layout, char joba, char jobp,
             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 nrows_u = ( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) ? m : 1;
+        lapack_int ncols_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) ? m :
+                             (API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ? MIN(m,n) : 1);
+        lapack_int nrows_v = API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) ? n :
+                              ( API_SUFFIX(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);
@@ -65,17 +65,17 @@ lapack_int LAPACKE_dgesvdq_work( int matrix_layout, char joba, char jobp,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dgesvdq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvdq_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dgesvdq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvdq_work", info );
             return info;
         }
         if( ldv < n ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_dgesvdq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvdq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -91,7 +91,7 @@ lapack_int LAPACKE_dgesvdq_work( int matrix_layout, char joba, char jobp,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) {
             u_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldu_t * MAX(1,ncols_u) );
             if( u_t == NULL ) {
@@ -99,7 +99,7 @@ lapack_int LAPACKE_dgesvdq_work( int matrix_layout, char joba, char jobp,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 's' ) ) {
             v_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldv_t * MAX(1,n) );
             if( v_t == NULL ) {
@@ -108,7 +108,7 @@ lapack_int LAPACKE_dgesvdq_work( int matrix_layout, char joba, char jobp,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
             LAPACK_dgesvdq( &joba, &jobp, &jobr, &jobu, &jobv, &m, &n, a, &lda_t,
                              s, u, &ldu_t, v, &ldv_t, numrank, iwork, &liwork,
@@ -117,32 +117,32 @@ lapack_int LAPACKE_dgesvdq_work( int matrix_layout, char joba, char jobp,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
                                u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 's' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_v, n, v_t, ldv_t, v,
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 's' ) ) {
+            API_SUFFIX(LAPACKE_dge_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' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 's' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(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_dgesvdq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvdq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgesvdq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvdq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgesvdx.c b/LAPACKE/src/lapacke_dgesvdx.c
index ff78c13d2b..b158b9c1a7 100644
--- a/LAPACKE/src/lapacke_dgesvdx.c
+++ b/LAPACKE/src/lapacke_dgesvdx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgesvdx( int matrix_layout, char jobu, char jobvt, char range,
+lapack_int API_SUFFIX(LAPACKE_dgesvdx)( int matrix_layout, char jobu, char jobvt, char range,
                            lapack_int m, lapack_int n, double* a,
                            lapack_int lda, double vl, double vu,
                            lapack_int il, lapack_int iu, lapack_int* ns,
@@ -47,19 +47,19 @@ lapack_int LAPACKE_dgesvdx( int matrix_layout, char jobu, char jobvt, char range
     lapack_int* iwork = NULL;
     lapack_int i;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgesvdx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvdx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgesvdx_work( matrix_layout, jobu, jobvt, range,
+    info = API_SUFFIX(LAPACKE_dgesvdx_work)( matrix_layout, jobu, jobvt, range,
                                  m, n, a, lda, vl, vu, il, iu, ns, s, u,
                                  ldu, vt, ldvt, &work_query, lwork, iwork );
     if( info != 0 ) {
@@ -78,7 +78,7 @@ lapack_int LAPACKE_dgesvdx( int matrix_layout, char jobu, char jobvt, char range
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgesvdx_work( matrix_layout, jobu, jobvt,  range,
+    info = API_SUFFIX(LAPACKE_dgesvdx_work)( matrix_layout, jobu, jobvt,  range,
                                  m, n, a, lda, vl, vu, il, iu, ns, s, u,
                                  ldu, vt, ldvt, work, lwork, iwork );
     /* Backup significant data from working array(s) */
@@ -91,7 +91,7 @@ lapack_int LAPACKE_dgesvdx( int matrix_layout, char jobu, char jobvt, char range
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgesvdx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvdx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgesvdx_work.c b/LAPACKE/src/lapacke_dgesvdx_work.c
index a2faa39bc4..5c076b09f2 100644
--- a/LAPACKE/src/lapacke_dgesvdx_work.c
+++ b/LAPACKE/src/lapacke_dgesvdx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgesvdx_work( int matrix_layout, char jobu, char jobvt, char range,
+lapack_int API_SUFFIX(LAPACKE_dgesvdx_work)( int matrix_layout, char jobu, char jobvt, char range,
                                  lapack_int m, lapack_int n, double* a,
                                  lapack_int lda, double vl, double vu,
                                  lapack_int il, lapack_int iu, lapack_int* ns,
@@ -50,12 +50,12 @@ lapack_int LAPACKE_dgesvdx_work( int matrix_layout, char jobu, char jobvt, char
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_u = LAPACKE_lsame( jobu, 'v' ) ? m : 0;
-        lapack_int ncols_u = LAPACKE_lsame( jobu, 'v' ) ?
-                             ( LAPACKE_lsame( range, 'i' ) ? MAX(iu - il + 1, 0) : MIN(m,n)) : 0;
-        lapack_int nrows_vt = LAPACKE_lsame( jobvt, 'v' ) ?
-                             ( LAPACKE_lsame( range, 'i' ) ? MAX(iu - il + 1, 0) : MIN(m,n)) : 0;
-        lapack_int ncols_vt = LAPACKE_lsame( jobvt, 'v' ) ? n : 0;
+        lapack_int nrows_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ? m : 0;
+        lapack_int ncols_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ?
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? MAX(iu - il + 1, 0) : MIN(m,n)) : 0;
+        lapack_int nrows_vt = API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ?
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? MAX(iu - il + 1, 0) : MIN(m,n)) : 0;
+        lapack_int ncols_vt = API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ? n : 0;
 
         lapack_int lda_t = MAX(1,m);
         lapack_int ldu_t = MAX(1,nrows_u);
@@ -67,17 +67,17 @@ lapack_int LAPACKE_dgesvdx_work( int matrix_layout, char jobu, char jobvt, char
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgesvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvdx_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_dgesvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvdx_work", info );
             return info;
         }
         if( ldvt < ncols_vt ) {
             info = -18;
-            LAPACKE_xerbla( "LAPACKE_dgesvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvdx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -93,7 +93,7 @@ lapack_int LAPACKE_dgesvdx_work( int matrix_layout, char jobu, char jobvt, char
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobu, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ) {
             u_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldu_t * MAX(1,ncols_u) );
             if( u_t == NULL ) {
@@ -101,7 +101,7 @@ lapack_int LAPACKE_dgesvdx_work( int matrix_layout, char jobu, char jobvt, char
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobvt, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ) {
             vt_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvt_t * MAX(1,n) );
             if( vt_t == NULL ) {
@@ -110,7 +110,7 @@ lapack_int LAPACKE_dgesvdx_work( int matrix_layout, char jobu, char jobvt, char
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgesvdx( &jobu, &jobvt, &range, &m, &n, a_t, &lda_t, &vl, &vu,
                         &il, &iu, ns, s, u_t, &ldu_t, vt_t,
@@ -119,32 +119,32 @@ lapack_int LAPACKE_dgesvdx_work( int matrix_layout, char jobu, char jobvt, char
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobu, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
                                u, ldu );
         }
-        if( LAPACKE_lsame( jobvt, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
                                ldvt );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvt, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ) {
             LAPACKE_free( vt_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobu, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgesvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvdx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgesvdx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvdx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgesvj.c b/LAPACKE/src/lapacke_dgesvj.c
index c2cfab8bed..209a9b717f 100644
--- a/LAPACKE/src/lapacke_dgesvj.c
+++ b/LAPACKE/src/lapacke_dgesvj.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgesvj( int matrix_layout, char joba, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_dgesvj)( int matrix_layout, char joba, char jobu, char jobv,
                            lapack_int m, lapack_int n, double* a,
                            lapack_int lda, double* sva, lapack_int mv,
                            double* v, lapack_int ldv, double* stat )
@@ -43,19 +43,19 @@ lapack_int LAPACKE_dgesvj( int matrix_layout, char joba, char jobu, char jobv,
     lapack_int i;
     lapack_int nrows_v;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgesvj", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvj", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        nrows_v = LAPACKE_lsame( jobv, 'v' ) ? MAX(0,n) :
-                ( LAPACKE_lsame( jobv, 'a' ) ? MAX(0,mv) : 0);
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ? MAX(0,n) :
+                ( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) ? MAX(0,mv) : 0);
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 'v' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, nrows_v, n, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, nrows_v, n, v, ldv ) ) {
                 return -11;
             }
         }
@@ -69,7 +69,7 @@ lapack_int LAPACKE_dgesvj( int matrix_layout, char joba, char jobu, char jobv,
     }
     work[0] = stat[0];  /* Significant if jobu = 'c' */
     /* Call middle-level interface */
-    info = LAPACKE_dgesvj_work( matrix_layout, joba, jobu, jobv, m, n, a, lda,
+    info = API_SUFFIX(LAPACKE_dgesvj_work)( matrix_layout, joba, jobu, jobv, m, n, a, lda,
                                 sva, mv, v, ldv, work, lwork );
     /* Backup significant data from working array(s) */
     for( i=0; i<6; i++ ) {
@@ -79,7 +79,7 @@ lapack_int LAPACKE_dgesvj( int matrix_layout, char joba, char jobu, char jobv,
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgesvj", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvj", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgesvj_work.c b/LAPACKE/src/lapacke_dgesvj_work.c
index 3ed28908cd..50ef12d55a 100644
--- a/LAPACKE/src/lapacke_dgesvj_work.c
+++ b/LAPACKE/src/lapacke_dgesvj_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgesvj_work( int matrix_layout, char joba, char jobu,
+lapack_int API_SUFFIX(LAPACKE_dgesvj_work)( int matrix_layout, char joba, char jobu,
                                 char jobv, lapack_int m, lapack_int n,
                                 double* a, lapack_int lda, double* sva,
                                 lapack_int mv, double* v, lapack_int ldv,
@@ -47,8 +47,8 @@ lapack_int LAPACKE_dgesvj_work( int matrix_layout, char joba, char jobu,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_v = LAPACKE_lsame( jobv, 'v' ) ? MAX(0,n) :
-                           ( LAPACKE_lsame( jobv, 'a' ) ? MAX(0,mv) : 0);
+        lapack_int nrows_v = API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ? MAX(0,n) :
+                           ( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) ? MAX(0,mv) : 0);
         lapack_int lda_t = MAX(1,m);
         lapack_int ldv_t = MAX(1,nrows_v);
         double* a_t = NULL;
@@ -56,12 +56,12 @@ lapack_int LAPACKE_dgesvj_work( int matrix_layout, char joba, char jobu,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgesvj_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvj_work", info );
             return info;
         }
         if( ldv < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dgesvj_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvj_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,7 +70,7 @@ lapack_int LAPACKE_dgesvj_work( int matrix_layout, char joba, char jobu,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (double*)LAPACKE_malloc( sizeof(double) * ldv_t * MAX(1,n) );
             if( v_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -78,9 +78,9 @@ lapack_int LAPACKE_dgesvj_work( int matrix_layout, char joba, char jobu,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( jobv, 'a' ) ) {
-            LAPACKE_dge_trans( matrix_layout, nrows_v, n, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, nrows_v, n, v, ldv, v_t, ldv_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dgesvj( &joba, &jobu, &jobv, &m, &n, a_t, &lda_t, sva, &mv, v_t,
@@ -89,24 +89,24 @@ lapack_int LAPACKE_dgesvj_work( int matrix_layout, char joba, char jobu,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_v, n, v_t, ldv_t, v,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_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, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgesvj_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvj_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgesvj_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvj_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgesvx.c b/LAPACKE/src/lapacke_dgesvx.c
index 1a22d312d9..46cd8922e1 100644
--- a/LAPACKE/src/lapacke_dgesvx.c
+++ b/LAPACKE/src/lapacke_dgesvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgesvx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_dgesvx)( int matrix_layout, char fact, char trans,
                            lapack_int n, lapack_int nrhs, double* a,
                            lapack_int lda, double* af, lapack_int ldaf,
                            lapack_int* ipiv, char* equed, double* r, double* c,
@@ -44,32 +44,32 @@ lapack_int LAPACKE_dgesvx( int matrix_layout, char fact, char trans,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgesvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -14;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) ) ) {
-            if( LAPACKE_d_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, c, 1 ) ) {
                 return -13;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'r' ) ) ) {
-            if( LAPACKE_d_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, r, 1 ) ) {
                 return -12;
             }
         }
@@ -87,7 +87,7 @@ lapack_int LAPACKE_dgesvx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgesvx_work( matrix_layout, fact, trans, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_dgesvx_work)( matrix_layout, fact, trans, n, nrhs, a, lda, af,
                                 ldaf, ipiv, equed, r, c, b, ldb, x, ldx, rcond,
                                 ferr, berr, work, iwork );
     /* Backup significant data from working array(s) */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_dgesvx( int matrix_layout, char fact, char trans,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgesvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgesvx_work.c b/LAPACKE/src/lapacke_dgesvx_work.c
index 0de5f58882..c1b5dc0996 100644
--- a/LAPACKE/src/lapacke_dgesvx_work.c
+++ b/LAPACKE/src/lapacke_dgesvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgesvx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_dgesvx_work)( int matrix_layout, char fact, char trans,
                                 lapack_int n, lapack_int nrhs, double* a,
                                 lapack_int lda, double* af, lapack_int ldaf,
                                 lapack_int* ipiv, char* equed, double* r,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_dgesvx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_dgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -101,11 +101,11 @@ lapack_int LAPACKE_dgesvx_work( int matrix_layout, char fact, char trans,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgesvx( &fact, &trans, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                        ipiv, equed, r, c, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr,
@@ -114,18 +114,18 @@ lapack_int LAPACKE_dgesvx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, af_t, ldaf_t, af, ldaf );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, af_t, ldaf_t, af, ldaf );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -136,11 +136,11 @@ lapack_int LAPACKE_dgesvx_work( int matrix_layout, char fact, char trans,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgesvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgesvxx.c b/LAPACKE/src/lapacke_dgesvxx.c
index 9464013375..6a325376ab 100644
--- a/LAPACKE/src/lapacke_dgesvxx.c
+++ b/LAPACKE/src/lapacke_dgesvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgesvxx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_dgesvxx)( int matrix_layout, char fact, char trans,
                             lapack_int n, lapack_int nrhs, double* a,
                             lapack_int lda, double* af, lapack_int ldaf,
                             lapack_int* ipiv, char* equed, double* r, double* c,
@@ -46,37 +46,37 @@ lapack_int LAPACKE_dgesvxx( int matrix_layout, char fact, char trans,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgesvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvxx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -14;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) ) ) {
-            if( LAPACKE_d_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, c, 1 ) ) {
                 return -13;
             }
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -25;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'r' ) ) ) {
-            if( LAPACKE_d_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, r, 1 ) ) {
                 return -12;
             }
         }
@@ -94,7 +94,7 @@ lapack_int LAPACKE_dgesvxx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgesvxx_work( matrix_layout, fact, trans, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_dgesvxx_work)( matrix_layout, fact, trans, n, nrhs, a, lda, af,
                                  ldaf, ipiv, equed, r, c, b, ldb, x, ldx, rcond,
                                  rpvgrw, berr, n_err_bnds, err_bnds_norm,
                                  err_bnds_comp, nparams, params, work, iwork );
@@ -104,7 +104,7 @@ lapack_int LAPACKE_dgesvxx( int matrix_layout, char fact, char trans,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgesvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgesvxx_work.c b/LAPACKE/src/lapacke_dgesvxx_work.c
index 7fce9ac206..6a5d17d16a 100644
--- a/LAPACKE/src/lapacke_dgesvxx_work.c
+++ b/LAPACKE/src/lapacke_dgesvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgesvxx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_dgesvxx_work)( int matrix_layout, char fact, char trans,
                                  lapack_int n, lapack_int nrhs, double* a,
                                  lapack_int lda, double* af, lapack_int ldaf,
                                  lapack_int* ipiv, char* equed, double* r,
@@ -68,22 +68,22 @@ lapack_int LAPACKE_dgesvxx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvxx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_dgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -120,11 +120,11 @@ lapack_int LAPACKE_dgesvxx_work( int matrix_layout, char fact, char trans,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgesvxx( &fact, &trans, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, equed, r, c, b_t, &ldb_t, x_t, &ldx_t, rcond,
@@ -134,21 +134,21 @@ lapack_int LAPACKE_dgesvxx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, af_t, ldaf_t, af, ldaf );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, af_t, ldaf_t, af, ldaf );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -164,11 +164,11 @@ lapack_int LAPACKE_dgesvxx_work( int matrix_layout, char fact, char trans,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgesvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgesvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgetf2.c b/LAPACKE/src/lapacke_dgetf2.c
index 2e34caba42..c38eb6a0df 100644
--- a/LAPACKE/src/lapacke_dgetf2.c
+++ b/LAPACKE/src/lapacke_dgetf2.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgetf2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgetf2)( int matrix_layout, lapack_int m, lapack_int n,
                            double* a, lapack_int lda, lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgetf2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetf2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dgetf2_work( matrix_layout, m, n, a, lda, ipiv );
+    return API_SUFFIX(LAPACKE_dgetf2_work)( matrix_layout, m, n, a, lda, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_dgetf2_work.c b/LAPACKE/src/lapacke_dgetf2_work.c
index 5835fc51d8..3e798d65f8 100644
--- a/LAPACKE/src/lapacke_dgetf2_work.c
+++ b/LAPACKE/src/lapacke_dgetf2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgetf2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgetf2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 double* a, lapack_int lda, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_dgetf2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgetf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetf2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,23 +58,23 @@ lapack_int LAPACKE_dgetf2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgetf2( &m, &n, a_t, &lda_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgetf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetf2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgetf2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetf2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgetrf.c b/LAPACKE/src/lapacke_dgetrf.c
index 819196bc49..6232721b4c 100644
--- a/LAPACKE/src/lapacke_dgetrf.c
+++ b/LAPACKE/src/lapacke_dgetrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgetrf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgetrf)( int matrix_layout, lapack_int m, lapack_int n,
                            double* a, lapack_int lda, lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgetrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dgetrf_work( matrix_layout, m, n, a, lda, ipiv );
+    return API_SUFFIX(LAPACKE_dgetrf_work)( matrix_layout, m, n, a, lda, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_dgetrf2.c b/LAPACKE/src/lapacke_dgetrf2.c
index ed34dde9af..b886332e08 100644
--- a/LAPACKE/src/lapacke_dgetrf2.c
+++ b/LAPACKE/src/lapacke_dgetrf2.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgetrf2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgetrf2)( int matrix_layout, lapack_int m, lapack_int n,
                            double* a, lapack_int lda, lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgetrf2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetrf2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dgetrf2_work( matrix_layout, m, n, a, lda, ipiv );
+    return API_SUFFIX(LAPACKE_dgetrf2_work)( matrix_layout, m, n, a, lda, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_dgetrf2_work.c b/LAPACKE/src/lapacke_dgetrf2_work.c
index 4ef372005c..433d2ad07c 100644
--- a/LAPACKE/src/lapacke_dgetrf2_work.c
+++ b/LAPACKE/src/lapacke_dgetrf2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgetrf2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgetrf2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 double* a, lapack_int lda, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_dgetrf2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgetrf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetrf2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,23 +58,23 @@ lapack_int LAPACKE_dgetrf2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgetrf2( &m, &n, a_t, &lda_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgetrf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetrf2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgetrf2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetrf2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgetrf_work.c b/LAPACKE/src/lapacke_dgetrf_work.c
index 6f79ae7375..62e6fa5027 100644
--- a/LAPACKE/src/lapacke_dgetrf_work.c
+++ b/LAPACKE/src/lapacke_dgetrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgetrf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgetrf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 double* a, lapack_int lda, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_dgetrf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dgetrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,23 +58,23 @@ lapack_int LAPACKE_dgetrf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgetrf( &m, &n, a_t, &lda_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgetrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgetrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgetri.c b/LAPACKE/src/lapacke_dgetri.c
index 9f889e4641..d776684acb 100644
--- a/LAPACKE/src/lapacke_dgetri.c
+++ b/LAPACKE/src/lapacke_dgetri.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgetri( int matrix_layout, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dgetri)( int matrix_layout, lapack_int n, double* a,
                            lapack_int lda, const lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_dgetri( int matrix_layout, lapack_int n, double* a,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgetri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -3;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgetri_work( matrix_layout, n, a, lda, ipiv, &work_query,
+    info = API_SUFFIX(LAPACKE_dgetri_work)( matrix_layout, n, a, lda, ipiv, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,12 +65,12 @@ lapack_int LAPACKE_dgetri( int matrix_layout, lapack_int n, double* a,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgetri_work( matrix_layout, n, a, lda, ipiv, work, lwork );
+    info = API_SUFFIX(LAPACKE_dgetri_work)( matrix_layout, n, a, lda, ipiv, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgetri", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetri", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgetri_work.c b/LAPACKE/src/lapacke_dgetri_work.c
index dbc9e10a79..fc395e8dce 100644
--- a/LAPACKE/src/lapacke_dgetri_work.c
+++ b/LAPACKE/src/lapacke_dgetri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgetri_work( int matrix_layout, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dgetri_work)( int matrix_layout, lapack_int n, double* a,
                                 lapack_int lda, const lapack_int* ipiv,
                                 double* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dgetri_work( int matrix_layout, lapack_int n, double* a,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -4;
-            LAPACKE_xerbla( "LAPACKE_dgetri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetri_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_dgetri_work( int matrix_layout, lapack_int n, double* a,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgetri( &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgetri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgetri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgetrs.c b/LAPACKE/src/lapacke_dgetrs.c
index 1dfc507eed..2d269244e9 100644
--- a/LAPACKE/src/lapacke_dgetrs.c
+++ b/LAPACKE/src/lapacke_dgetrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgetrs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgetrs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int nrhs, const double* a, lapack_int lda,
                            const lapack_int* ipiv, double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgetrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_dgetrs_work( matrix_layout, trans, n, nrhs, a, lda, ipiv, b,
+    return API_SUFFIX(LAPACKE_dgetrs_work)( matrix_layout, trans, n, nrhs, a, lda, ipiv, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_dgetrs_work.c b/LAPACKE/src/lapacke_dgetrs_work.c
index b2de85a6c8..89dba256bb 100644
--- a/LAPACKE/src/lapacke_dgetrs_work.c
+++ b/LAPACKE/src/lapacke_dgetrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgetrs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgetrs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int nrhs, const double* a,
                                 lapack_int lda, const lapack_int* ipiv,
                                 double* b, lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_dgetrs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dgetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dgetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,8 +72,8 @@ lapack_int LAPACKE_dgetrs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgetrs( &trans, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                        &info );
@@ -81,18 +81,18 @@ lapack_int LAPACKE_dgetrs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgetrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgetsls.c b/LAPACKE/src/lapacke_dgetsls.c
index 2098e94246..5a3e082ead 100644
--- a/LAPACKE/src/lapacke_dgetsls.c
+++ b/LAPACKE/src/lapacke_dgetsls.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgetsls( int matrix_layout, char trans, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dgetsls)( int matrix_layout, char trans, lapack_int m,
                           lapack_int n, lapack_int nrhs, double* a,
                           lapack_int lda, double* b, lapack_int ldb )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dgetsls( int matrix_layout, char trans, lapack_int m,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgetsls", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetsls", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgetsls_work( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_dgetsls_work)( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
                                &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_dgetsls( int matrix_layout, char trans, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgetsls_work( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_dgetsls_work)( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
                                work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgetsls", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetsls", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgetsls_work.c b/LAPACKE/src/lapacke_dgetsls_work.c
index c551b6266e..abba19e0fb 100644
--- a/LAPACKE/src/lapacke_dgetsls_work.c
+++ b/LAPACKE/src/lapacke_dgetsls_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgetsls_work( int matrix_layout, char trans, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dgetsls_work)( int matrix_layout, char trans, lapack_int m,
                                lapack_int n, lapack_int nrhs, double* a,
                                lapack_int lda, double* b, lapack_int ldb,
                                double* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_dgetsls_work( int matrix_layout, char trans, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dgetsls_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetsls_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dgetsls_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetsls_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_dgetsls_work( int matrix_layout, char trans, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgetsls( &trans, &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -88,8 +88,8 @@ lapack_int LAPACKE_dgetsls_work( int matrix_layout, char trans, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -97,11 +97,11 @@ lapack_int LAPACKE_dgetsls_work( int matrix_layout, char trans, lapack_int m,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgetsls_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetsls_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgetsls_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetsls_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgetsqrhrt.c b/LAPACKE/src/lapacke_dgetsqrhrt.c
index cf0e3200ce..80de83441d 100644
--- a/LAPACKE/src/lapacke_dgetsqrhrt.c
+++ b/LAPACKE/src/lapacke_dgetsqrhrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgetsqrhrt( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgetsqrhrt)( int matrix_layout, lapack_int m, lapack_int n,
                                lapack_int mb1, lapack_int nb1, lapack_int nb2,
                                double* a, lapack_int lda,
                                double* t, lapack_int ldt )
@@ -42,19 +42,19 @@ lapack_int LAPACKE_dgetsqrhrt( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgetsqrhrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetsqrhrt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgetsqrhrt_work( matrix_layout, m, n, mb1, nb1, nb2,
+    info = API_SUFFIX(LAPACKE_dgetsqrhrt_work)( matrix_layout, m, n, mb1, nb1, nb2,
                                     a, lda, t, ldt, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_dgetsqrhrt( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgetsqrhrt_work( matrix_layout, m, n, mb1, nb1, nb2,
+    info = API_SUFFIX(LAPACKE_dgetsqrhrt_work)( matrix_layout, m, n, mb1, nb1, nb2,
                                     a, lda, t, ldt, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgetsqrhrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetsqrhrt", info );
     }
     return info;
 }
\ No newline at end of file
diff --git a/LAPACKE/src/lapacke_dgetsqrhrt_work.c b/LAPACKE/src/lapacke_dgetsqrhrt_work.c
index f91887ffec..2da2c171d9 100644
--- a/LAPACKE/src/lapacke_dgetsqrhrt_work.c
+++ b/LAPACKE/src/lapacke_dgetsqrhrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgetsqrhrt_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgetsqrhrt_work)( int matrix_layout, lapack_int m, lapack_int n,
                                     lapack_int mb1, lapack_int nb1, lapack_int nb2,
                                     double* a, lapack_int lda,
                                     double* t, lapack_int ldt,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_dgetsqrhrt_work( int matrix_layout, lapack_int m, lapack_int
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgetsqrhrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetsqrhrt_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dgetsqrhrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetsqrhrt_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -80,7 +80,7 @@ lapack_int LAPACKE_dgetsqrhrt_work( int matrix_layout, lapack_int m, lapack_int
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgetsqrhrt( &m, &n, &mb1, &nb1, &nb2, a_t, &lda_t, t_t, &ldt_t,
                            work, &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_dgetsqrhrt_work( int matrix_layout, lapack_int m, lapack_int
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nb2, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nb2, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgetsqrhrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetsqrhrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgetsqrhrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgetsqrhrt_work", info );
     }
     return info;
 }
\ No newline at end of file
diff --git a/LAPACKE/src/lapacke_dggbak.c b/LAPACKE/src/lapacke_dggbak.c
index 8dfb851ef0..b5f3072c3f 100644
--- a/LAPACKE/src/lapacke_dggbak.c
+++ b/LAPACKE/src/lapacke_dggbak.c
@@ -32,29 +32,29 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggbak( int matrix_layout, char job, char side, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dggbak)( int matrix_layout, char job, char side, lapack_int n,
                            lapack_int ilo, lapack_int ihi, const double* lscale,
                            const double* rscale, lapack_int m, double* v,
                            lapack_int ldv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dggbak", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggbak", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, lscale, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, lscale, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( n, rscale, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, rscale, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, m, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, m, v, ldv ) ) {
             return -10;
         }
     }
 #endif
-    return LAPACKE_dggbak_work( matrix_layout, job, side, n, ilo, ihi, lscale,
+    return API_SUFFIX(LAPACKE_dggbak_work)( matrix_layout, job, side, n, ilo, ihi, lscale,
                                 rscale, m, v, ldv );
 }
diff --git a/LAPACKE/src/lapacke_dggbak_work.c b/LAPACKE/src/lapacke_dggbak_work.c
index c49152aa7d..c2a7bd6275 100644
--- a/LAPACKE/src/lapacke_dggbak_work.c
+++ b/LAPACKE/src/lapacke_dggbak_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggbak_work( int matrix_layout, char job, char side,
+lapack_int API_SUFFIX(LAPACKE_dggbak_work)( int matrix_layout, char job, char side,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 const double* lscale, const double* rscale,
                                 lapack_int m, double* v, lapack_int ldv )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_dggbak_work( int matrix_layout, char job, char side,
         /* Check leading dimension(s) */
         if( ldv < m ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dggbak_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggbak_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_dggbak_work( int matrix_layout, char job, char side,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, m, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, m, v, ldv, v_t, ldv_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dggbak( &job, &side, &n, &ilo, &ihi, lscale, rscale, &m, v_t,
                        &ldv_t, &info );
@@ -69,16 +69,16 @@ lapack_int LAPACKE_dggbak_work( int matrix_layout, char job, char side,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, m, v_t, ldv_t, v, ldv );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, m, v_t, ldv_t, v, ldv );
         /* Release memory and exit */
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dggbak_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggbak_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dggbak_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggbak_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggbal.c b/LAPACKE/src/lapacke_dggbal.c
index 42f58afc4f..934bb224d6 100644
--- a/LAPACKE/src/lapacke_dggbal.c
+++ b/LAPACKE/src/lapacke_dggbal.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggbal( int matrix_layout, char job, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dggbal)( int matrix_layout, char job, lapack_int n, double* a,
                            lapack_int lda, double* b, lapack_int ldb,
                            lapack_int* ilo, lapack_int* ihi, double* lscale,
                            double* rscale )
@@ -42,28 +42,28 @@ lapack_int LAPACKE_dggbal( int matrix_layout, char job, lapack_int n, double* a,
     lapack_int lwork;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dggbal", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggbal", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
                 return -4;
             }
         }
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
                 return -6;
             }
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( job, 's' ) || LAPACKE_lsame( job, 'b' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 's' ) || API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
         lwork = MAX(1,6*n);
     } else {
         lwork = 1;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_dggbal( int matrix_layout, char job, lapack_int n, double* a,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dggbal_work( matrix_layout, job, n, a, lda, b, ldb, ilo, ihi,
+    info = API_SUFFIX(LAPACKE_dggbal_work)( matrix_layout, job, n, a, lda, b, ldb, ilo, ihi,
                                 lscale, rscale, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dggbal", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggbal", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggbal_work.c b/LAPACKE/src/lapacke_dggbal_work.c
index f512d6afed..1c239da79c 100644
--- a/LAPACKE/src/lapacke_dggbal_work.c
+++ b/LAPACKE/src/lapacke_dggbal_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggbal_work( int matrix_layout, char job, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dggbal_work)( int matrix_layout, char job, lapack_int n,
                                 double* a, lapack_int lda, double* b,
                                 lapack_int ldb, lapack_int* ilo,
                                 lapack_int* ihi, double* lscale, double* rscale,
@@ -54,25 +54,25 @@ lapack_int LAPACKE_dggbal_work( int matrix_layout, char job, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dggbal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggbal_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dggbal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggbal_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
             a_t = (double*)LAPACKE_malloc( sizeof(double) * lda_t * MAX(1,n) );
             if( a_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_0;
             }
         }
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
             b_t = (double*)LAPACKE_malloc( sizeof(double) * ldb_t * MAX(1,n) );
             if( b_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -80,13 +80,13 @@ lapack_int LAPACKE_dggbal_work( int matrix_layout, char job, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         }
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dggbal( &job, &n, a_t, &lda_t, b_t, &ldb_t, ilo, ihi, lscale,
@@ -95,31 +95,31 @@ lapack_int LAPACKE_dggbal_work( int matrix_layout, char job, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
             LAPACKE_free( b_t );
         }
 exit_level_1:
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
             LAPACKE_free( a_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dggbal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggbal_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dggbal_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggbal_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgges.c b/LAPACKE/src/lapacke_dgges.c
index b2c3fa3c72..a5472cb21c 100644
--- a/LAPACKE/src/lapacke_dgges.c
+++ b/LAPACKE/src/lapacke_dgges.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgges( int matrix_layout, char jobvsl, char jobvsr, char sort,
+lapack_int API_SUFFIX(LAPACKE_dgges)( int matrix_layout, char jobvsl, char jobvsr, char sort,
                           LAPACK_D_SELECT3 selctg, lapack_int n, double* a,
                           lapack_int lda, double* b, lapack_int ldb,
                           lapack_int* sdim, double* alphar, double* alphai,
@@ -45,22 +45,22 @@ lapack_int LAPACKE_dgges( int matrix_layout, char jobvsl, char jobvsr, char sort
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgges", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgges", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -69,7 +69,7 @@ lapack_int LAPACKE_dgges( int matrix_layout, char jobvsl, char jobvsr, char sort
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgges_work( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
+    info = API_SUFFIX(LAPACKE_dgges_work)( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
                                lda, b, ldb, sdim, alphar, alphai, beta, vsl,
                                ldvsl, vsr, ldvsr, &work_query, lwork, bwork );
     if( info != 0 ) {
@@ -83,18 +83,18 @@ lapack_int LAPACKE_dgges( int matrix_layout, char jobvsl, char jobvsr, char sort
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgges_work( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
+    info = API_SUFFIX(LAPACKE_dgges_work)( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
                                lda, b, ldb, sdim, alphar, alphai, beta, vsl,
                                ldvsl, vsr, ldvsr, work, lwork, bwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgges", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgges", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgges3.c b/LAPACKE/src/lapacke_dgges3.c
index 079ead78cf..b843d679da 100644
--- a/LAPACKE/src/lapacke_dgges3.c
+++ b/LAPACKE/src/lapacke_dgges3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgges3( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_dgges3)( int matrix_layout, char jobvsl, char jobvsr,
                            char sort, LAPACK_D_SELECT3 selctg, lapack_int n,
                            double* a, lapack_int lda, double* b, lapack_int ldb,
                            lapack_int* sdim, double* alphar, double* alphai,
@@ -45,22 +45,22 @@ lapack_int LAPACKE_dgges3( int matrix_layout, char jobvsl, char jobvsr,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgges3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgges3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -69,7 +69,7 @@ lapack_int LAPACKE_dgges3( int matrix_layout, char jobvsl, char jobvsr,
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgges3_work( matrix_layout, jobvsl, jobvsr, sort, selctg,
+    info = API_SUFFIX(LAPACKE_dgges3_work)( matrix_layout, jobvsl, jobvsr, sort, selctg,
                                 n, a, lda, b, ldb, sdim, alphar, alphai, beta,
                                 vsl, ldvsl, vsr, ldvsr,
                                 &work_query, lwork, bwork );
@@ -84,18 +84,18 @@ lapack_int LAPACKE_dgges3( int matrix_layout, char jobvsl, char jobvsr,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgges3_work( matrix_layout, jobvsl, jobvsr, sort, selctg,
+    info = API_SUFFIX(LAPACKE_dgges3_work)( matrix_layout, jobvsl, jobvsr, sort, selctg,
                                 n, a, lda, b, ldb, sdim, alphar, alphai, beta,
                                 vsl, ldvsl, vsr, ldvsr, work, lwork, bwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgges3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgges3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgges3_work.c b/LAPACKE/src/lapacke_dgges3_work.c
index 43771ef17b..162afdf3b6 100644
--- a/LAPACKE/src/lapacke_dgges3_work.c
+++ b/LAPACKE/src/lapacke_dgges3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgges3_work( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_dgges3_work)( int matrix_layout, char jobvsl, char jobvsr,
                                 char sort, LAPACK_D_SELECT3 selctg,
                                 lapack_int n, double* a, lapack_int lda,
                                 double* b, lapack_int ldb, lapack_int* sdim,
@@ -63,22 +63,22 @@ lapack_int LAPACKE_dgges3_work( int matrix_layout, char jobvsl, char jobvsr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgges3_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgges3_work", info );
             return info;
         }
         if( ldvsl < n ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_dgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgges3_work", info );
             return info;
         }
         if( ldvsr < n ) {
             info = -18;
-            LAPACKE_xerbla( "LAPACKE_dgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgges3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -99,7 +99,7 @@ lapack_int LAPACKE_dgges3_work( int matrix_layout, char jobvsl, char jobvsr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             vsl_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvsl_t * MAX(1,n) );
             if( vsl_t == NULL ) {
@@ -107,7 +107,7 @@ lapack_int LAPACKE_dgges3_work( int matrix_layout, char jobvsl, char jobvsr,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             vsr_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvsr_t * MAX(1,n) );
             if( vsr_t == NULL ) {
@@ -116,8 +116,8 @@ lapack_int LAPACKE_dgges3_work( int matrix_layout, char jobvsl, char jobvsr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgges3( &jobvsl, &jobvsr, &sort, selctg, &n, a_t, &lda_t, b_t,
                        &ldb_t, sdim, alphar, alphai, beta, vsl_t, &ldvsl_t,
@@ -126,22 +126,22 @@ lapack_int LAPACKE_dgges3_work( int matrix_layout, char jobvsl, char jobvsr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
                                ldvsl );
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
                                ldvsr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             LAPACKE_free( vsr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             LAPACKE_free( vsl_t );
         }
 exit_level_2:
@@ -150,11 +150,11 @@ lapack_int LAPACKE_dgges3_work( int matrix_layout, char jobvsl, char jobvsr,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgges3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgges3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgges3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgges_work.c b/LAPACKE/src/lapacke_dgges_work.c
index effa1b3f5a..10ae6abc50 100644
--- a/LAPACKE/src/lapacke_dgges_work.c
+++ b/LAPACKE/src/lapacke_dgges_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgges_work( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_dgges_work)( int matrix_layout, char jobvsl, char jobvsr,
                                char sort, LAPACK_D_SELECT3 selctg, lapack_int n,
                                double* a, lapack_int lda, double* b,
                                lapack_int ldb, lapack_int* sdim, double* alphar,
@@ -62,22 +62,22 @@ lapack_int LAPACKE_dgges_work( int matrix_layout, char jobvsl, char jobvsr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgges_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgges_work", info );
             return info;
         }
-        if( ldvsl < n ) {
+        if( ldvsl < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) && ldvsl < n ) ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_dgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgges_work", info );
             return info;
         }
-        if( ldvsr < n ) {
+        if( ldvsr < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) && ldvsr < n ) ) {
             info = -18;
-            LAPACKE_xerbla( "LAPACKE_dgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgges_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_dgges_work( int matrix_layout, char jobvsl, char jobvsr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             vsl_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvsl_t * MAX(1,n) );
             if( vsl_t == NULL ) {
@@ -106,7 +106,7 @@ lapack_int LAPACKE_dgges_work( int matrix_layout, char jobvsl, char jobvsr,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             vsr_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvsr_t * MAX(1,n) );
             if( vsr_t == NULL ) {
@@ -115,8 +115,8 @@ lapack_int LAPACKE_dgges_work( int matrix_layout, char jobvsl, char jobvsr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgges( &jobvsl, &jobvsr, &sort, selctg, &n, a_t, &lda_t, b_t,
                       &ldb_t, sdim, alphar, alphai, beta, vsl_t, &ldvsl_t,
@@ -125,22 +125,22 @@ lapack_int LAPACKE_dgges_work( int matrix_layout, char jobvsl, char jobvsr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
                                ldvsl );
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
                                ldvsr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             LAPACKE_free( vsr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             LAPACKE_free( vsl_t );
         }
 exit_level_2:
@@ -149,11 +149,11 @@ lapack_int LAPACKE_dgges_work( int matrix_layout, char jobvsl, char jobvsr,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgges_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgges_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgges_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggesx.c b/LAPACKE/src/lapacke_dggesx.c
index 605b637c8b..4290db8e27 100644
--- a/LAPACKE/src/lapacke_dggesx.c
+++ b/LAPACKE/src/lapacke_dggesx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggesx( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_dggesx)( int matrix_layout, char jobvsl, char jobvsr,
                            char sort, LAPACK_D_SELECT3 selctg, char sense,
                            lapack_int n, double* a, lapack_int lda, double* b,
                            lapack_int ldb, lapack_int* sdim, double* alphar,
@@ -49,22 +49,22 @@ lapack_int LAPACKE_dggesx( int matrix_layout, char jobvsl, char jobvsr,
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dggesx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggesx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -10;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -73,7 +73,7 @@ lapack_int LAPACKE_dggesx( int matrix_layout, char jobvsl, char jobvsr,
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_dggesx_work( matrix_layout, jobvsl, jobvsr, sort, selctg,
+    info = API_SUFFIX(LAPACKE_dggesx_work)( matrix_layout, jobvsl, jobvsr, sort, selctg,
                                 sense, n, a, lda, b, ldb, sdim, alphar, alphai,
                                 beta, vsl, ldvsl, vsr, ldvsr, rconde, rcondv,
                                 &work_query, lwork, &iwork_query, liwork,
@@ -95,7 +95,7 @@ lapack_int LAPACKE_dggesx( int matrix_layout, char jobvsl, char jobvsr,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dggesx_work( matrix_layout, jobvsl, jobvsr, sort, selctg,
+    info = API_SUFFIX(LAPACKE_dggesx_work)( matrix_layout, jobvsl, jobvsr, sort, selctg,
                                 sense, n, a, lda, b, ldb, sdim, alphar, alphai,
                                 beta, vsl, ldvsl, vsr, ldvsr, rconde, rcondv,
                                 work, lwork, iwork, liwork, bwork );
@@ -104,12 +104,12 @@ lapack_int LAPACKE_dggesx( int matrix_layout, char jobvsl, char jobvsr,
 exit_level_2:
     LAPACKE_free( iwork );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dggesx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggesx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggesx_work.c b/LAPACKE/src/lapacke_dggesx_work.c
index ace40a32ab..2430581112 100644
--- a/LAPACKE/src/lapacke_dggesx_work.c
+++ b/LAPACKE/src/lapacke_dggesx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggesx_work( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_dggesx_work)( int matrix_layout, char jobvsl, char jobvsr,
                                 char sort, LAPACK_D_SELECT3 selctg, char sense,
                                 lapack_int n, double* a, lapack_int lda,
                                 double* b, lapack_int ldb, lapack_int* sdim,
@@ -65,22 +65,22 @@ lapack_int LAPACKE_dggesx_work( int matrix_layout, char jobvsl, char jobvsr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggesx_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggesx_work", info );
             return info;
         }
-        if( ldvsl < n ) {
+        if( ldvsl < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) && ldvsl < n ) ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_dggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggesx_work", info );
             return info;
         }
-        if( ldvsr < n ) {
+        if( ldvsr < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) && ldvsr < n ) ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_dggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggesx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_dggesx_work( int matrix_layout, char jobvsl, char jobvsr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             vsl_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvsl_t * MAX(1,n) );
             if( vsl_t == NULL ) {
@@ -110,7 +110,7 @@ lapack_int LAPACKE_dggesx_work( int matrix_layout, char jobvsl, char jobvsr,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             vsr_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvsr_t * MAX(1,n) );
             if( vsr_t == NULL ) {
@@ -119,8 +119,8 @@ lapack_int LAPACKE_dggesx_work( int matrix_layout, char jobvsl, char jobvsr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dggesx( &jobvsl, &jobvsr, &sort, selctg, &sense, &n, a_t, &lda_t,
                        b_t, &ldb_t, sdim, alphar, alphai, beta, vsl_t, &ldvsl_t,
@@ -130,22 +130,22 @@ lapack_int LAPACKE_dggesx_work( int matrix_layout, char jobvsl, char jobvsr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
                                ldvsl );
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
                                ldvsr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             LAPACKE_free( vsr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             LAPACKE_free( vsl_t );
         }
 exit_level_2:
@@ -154,11 +154,11 @@ lapack_int LAPACKE_dggesx_work( int matrix_layout, char jobvsl, char jobvsr,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggesx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dggesx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggesx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggev.c b/LAPACKE/src/lapacke_dggev.c
index 002f4ac989..2d3114edb0 100644
--- a/LAPACKE/src/lapacke_dggev.c
+++ b/LAPACKE/src/lapacke_dggev.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggev( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_dggev)( int matrix_layout, char jobvl, char jobvr,
                           lapack_int n, double* a, lapack_int lda, double* b,
                           lapack_int ldb, double* alphar, double* alphai,
                           double* beta, double* vl, lapack_int ldvl, double* vr,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_dggev( int matrix_layout, char jobvl, char jobvr,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dggev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dggev_work( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_dggev_work)( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
                                alphar, alphai, beta, vl, ldvl, vr, ldvr,
                                &work_query, lwork );
     if( info != 0 ) {
@@ -72,14 +72,14 @@ lapack_int LAPACKE_dggev( int matrix_layout, char jobvl, char jobvr,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dggev_work( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_dggev_work)( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
                                alphar, alphai, beta, vl, ldvl, vr, ldvr, work,
                                lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dggev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggev3.c b/LAPACKE/src/lapacke_dggev3.c
index 2323ec8f88..a376dabc1a 100644
--- a/LAPACKE/src/lapacke_dggev3.c
+++ b/LAPACKE/src/lapacke_dggev3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggev3( int matrix_layout,
+lapack_int API_SUFFIX(LAPACKE_dggev3)( int matrix_layout,
                            char jobvl, char jobvr, lapack_int n,
                            double* a, lapack_int lda,
                            double* b, lapack_int ldb,
@@ -45,22 +45,22 @@ lapack_int LAPACKE_dggev3( int matrix_layout,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dggev3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggev3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dggev3_work( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_dggev3_work)( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
                                 alphar, alphai, beta, vl, ldvl, vr, ldvr,
                                 &work_query, lwork );
     if( info != 0 ) {
@@ -74,14 +74,14 @@ lapack_int LAPACKE_dggev3( int matrix_layout,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dggev3_work( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_dggev3_work)( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
                                 alphar, alphai, beta, vl, ldvl, vr, ldvr, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dggev3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggev3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggev3_work.c b/LAPACKE/src/lapacke_dggev3_work.c
index 2f9f5c34db..8812fefce8 100644
--- a/LAPACKE/src/lapacke_dggev3_work.c
+++ b/LAPACKE/src/lapacke_dggev3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggev3_work( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_dggev3_work)( int matrix_layout, char jobvl, char jobvr,
                                 lapack_int n, double* a, lapack_int lda,
                                 double* b, lapack_int ldb, double* alphar,
                                 double* alphai, double* beta, double* vl,
@@ -48,10 +48,10 @@ lapack_int LAPACKE_dggev3_work( int matrix_layout, char jobvl, char jobvr,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_vl = LAPACKE_lsame( jobvl, 'v' ) ? n : 1;
-        lapack_int ncols_vl = LAPACKE_lsame( jobvl, 'v' ) ? n : 1;
-        lapack_int nrows_vr = LAPACKE_lsame( jobvr, 'v' ) ? n : 1;
-        lapack_int ncols_vr = LAPACKE_lsame( jobvr, 'v' ) ? n : 1;
+        lapack_int nrows_vl = API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ? n : 1;
+        lapack_int ncols_vl = API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ? n : 1;
+        lapack_int nrows_vr = API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ? n : 1;
+        lapack_int ncols_vr = API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ? n : 1;
         lapack_int lda_t = MAX(1,n);
         lapack_int ldb_t = MAX(1,n);
         lapack_int ldvl_t = MAX(1,nrows_vl);
@@ -63,22 +63,22 @@ lapack_int LAPACKE_dggev3_work( int matrix_layout, char jobvl, char jobvr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggev3_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggev3_work", info );
             return info;
         }
         if( ldvl < ncols_vl ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggev3_work", info );
             return info;
         }
         if( ldvr < ncols_vr ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggev3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -99,7 +99,7 @@ lapack_int LAPACKE_dggev3_work( int matrix_layout, char jobvl, char jobvr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvl_t * MAX(1,ncols_vl) );
             if( vl_t == NULL ) {
@@ -107,7 +107,7 @@ lapack_int LAPACKE_dggev3_work( int matrix_layout, char jobvl, char jobvr,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvr_t * MAX(1,ncols_vr) );
             if( vr_t == NULL ) {
@@ -116,8 +116,8 @@ lapack_int LAPACKE_dggev3_work( int matrix_layout, char jobvl, char jobvr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dggev3( &jobvl, &jobvr, &n, a_t, &lda_t, b_t, &ldb_t,
                        alphar, alphai, beta, vl_t, &ldvl_t, vr_t, &ldvr_t,
@@ -126,22 +126,22 @@ lapack_int LAPACKE_dggev3_work( int matrix_layout, char jobvl, char jobvr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_vl, ncols_vl, vl_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_vl, ncols_vl, vl_t,
                                ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_vr, ncols_vr, vr_t,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_vr, ncols_vr, vr_t,
                                ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -150,11 +150,11 @@ lapack_int LAPACKE_dggev3_work( int matrix_layout, char jobvl, char jobvr,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggev3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dggev3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggev3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggev_work.c b/LAPACKE/src/lapacke_dggev_work.c
index 0a6ff6ab05..78f70a83e9 100644
--- a/LAPACKE/src/lapacke_dggev_work.c
+++ b/LAPACKE/src/lapacke_dggev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggev_work( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_dggev_work)( int matrix_layout, char jobvl, char jobvr,
                                lapack_int n, double* a, lapack_int lda,
                                double* b, lapack_int ldb, double* alphar,
                                double* alphai, double* beta, double* vl,
@@ -48,10 +48,10 @@ lapack_int LAPACKE_dggev_work( int matrix_layout, char jobvl, char jobvr,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_vl = LAPACKE_lsame( jobvl, 'v' ) ? n : 1;
-        lapack_int ncols_vl = LAPACKE_lsame( jobvl, 'v' ) ? n : 1;
-        lapack_int nrows_vr = LAPACKE_lsame( jobvr, 'v' ) ? n : 1;
-        lapack_int ncols_vr = LAPACKE_lsame( jobvr, 'v' ) ? n : 1;
+        lapack_int nrows_vl = API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ? n : 1;
+        lapack_int ncols_vl = API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ? n : 1;
+        lapack_int nrows_vr = API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ? n : 1;
+        lapack_int ncols_vr = API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ? n : 1;
         lapack_int lda_t = MAX(1,n);
         lapack_int ldb_t = MAX(1,n);
         lapack_int ldvl_t = MAX(1,nrows_vl);
@@ -63,22 +63,22 @@ lapack_int LAPACKE_dggev_work( int matrix_layout, char jobvl, char jobvr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggev_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggev_work", info );
             return info;
         }
         if( ldvl < ncols_vl ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggev_work", info );
             return info;
         }
         if( ldvr < ncols_vr ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggev_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -99,7 +99,7 @@ lapack_int LAPACKE_dggev_work( int matrix_layout, char jobvl, char jobvr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvl_t * MAX(1,ncols_vl) );
             if( vl_t == NULL ) {
@@ -107,7 +107,7 @@ lapack_int LAPACKE_dggev_work( int matrix_layout, char jobvl, char jobvr,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvr_t * MAX(1,ncols_vr) );
             if( vr_t == NULL ) {
@@ -116,8 +116,8 @@ lapack_int LAPACKE_dggev_work( int matrix_layout, char jobvl, char jobvr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dggev( &jobvl, &jobvr, &n, a_t, &lda_t, b_t, &ldb_t, alphar,
                       alphai, beta, vl_t, &ldvl_t, vr_t, &ldvr_t, work, &lwork,
@@ -126,22 +126,22 @@ lapack_int LAPACKE_dggev_work( int matrix_layout, char jobvl, char jobvr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_vl, ncols_vl, vl_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_vl, ncols_vl, vl_t,
                                ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_vr, ncols_vr, vr_t,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_vr, ncols_vr, vr_t,
                                ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -150,11 +150,11 @@ lapack_int LAPACKE_dggev_work( int matrix_layout, char jobvl, char jobvr,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dggev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggevx.c b/LAPACKE/src/lapacke_dggevx.c
index 723b6c340e..4c8def034a 100644
--- a/LAPACKE/src/lapacke_dggevx.c
+++ b/LAPACKE/src/lapacke_dggevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggevx( int matrix_layout, char balanc, char jobvl,
+lapack_int API_SUFFIX(LAPACKE_dggevx)( int matrix_layout, char balanc, char jobvl,
                            char jobvr, char sense, lapack_int n, double* a,
                            lapack_int lda, double* b, lapack_int ldb,
                            double* alphar, double* alphai, double* beta,
@@ -48,23 +48,23 @@ lapack_int LAPACKE_dggevx( int matrix_layout, char balanc, char jobvl,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dggevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'e' ) ||
-        LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'e' ) ||
+        API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -72,8 +72,8 @@ lapack_int LAPACKE_dggevx( int matrix_layout, char balanc, char jobvl,
             goto exit_level_0;
         }
     }
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'n' ) ||
-        LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'n' ) ||
+        API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * MAX(1,n+6) );
         if( iwork == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -81,7 +81,7 @@ lapack_int LAPACKE_dggevx( int matrix_layout, char balanc, char jobvl,
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_dggevx_work( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
+    info = API_SUFFIX(LAPACKE_dggevx_work)( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
                                 lda, b, ldb, alphar, alphai, beta, vl, ldvl, vr,
                                 ldvr, ilo, ihi, lscale, rscale, abnrm, bbnrm,
                                 rconde, rcondv, &work_query, lwork, iwork,
@@ -97,25 +97,25 @@ lapack_int LAPACKE_dggevx( int matrix_layout, char balanc, char jobvl,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dggevx_work( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
+    info = API_SUFFIX(LAPACKE_dggevx_work)( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
                                 lda, b, ldb, alphar, alphai, beta, vl, ldvl, vr,
                                 ldvr, ilo, ihi, lscale, rscale, abnrm, bbnrm,
                                 rconde, rcondv, work, lwork, iwork, bwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_2:
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'n' ) ||
-        LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'n' ) ||
+        API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         LAPACKE_free( iwork );
     }
 exit_level_1:
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'e' ) ||
-        LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'e' ) ||
+        API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dggevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggevx_work.c b/LAPACKE/src/lapacke_dggevx_work.c
index 458832e1e3..798b837a30 100644
--- a/LAPACKE/src/lapacke_dggevx_work.c
+++ b/LAPACKE/src/lapacke_dggevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggevx_work( int matrix_layout, char balanc, char jobvl,
+lapack_int API_SUFFIX(LAPACKE_dggevx_work)( int matrix_layout, char balanc, char jobvl,
                                 char jobvr, char sense, lapack_int n, double* a,
                                 lapack_int lda, double* b, lapack_int ldb,
                                 double* alphar, double* alphai, double* beta,
@@ -65,22 +65,22 @@ lapack_int LAPACKE_dggevx_work( int matrix_layout, char balanc, char jobvl,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggevx_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggevx_work", info );
             return info;
         }
         if( ldvl < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggevx_work", info );
             return info;
         }
         if( ldvr < n ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_dggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggevx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_dggevx_work( int matrix_layout, char balanc, char jobvl,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvl_t * MAX(1,n) );
             if( vl_t == NULL ) {
@@ -110,7 +110,7 @@ lapack_int LAPACKE_dggevx_work( int matrix_layout, char balanc, char jobvl,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvr_t * MAX(1,n) );
             if( vr_t == NULL ) {
@@ -119,8 +119,8 @@ lapack_int LAPACKE_dggevx_work( int matrix_layout, char balanc, char jobvl,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dggevx( &balanc, &jobvl, &jobvr, &sense, &n, a_t, &lda_t, b_t,
                        &ldb_t, alphar, alphai, beta, vl_t, &ldvl_t, vr_t,
@@ -130,20 +130,20 @@ lapack_int LAPACKE_dggevx_work( int matrix_layout, char balanc, char jobvl,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -152,11 +152,11 @@ lapack_int LAPACKE_dggevx_work( int matrix_layout, char balanc, char jobvl,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dggevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggglm.c b/LAPACKE/src/lapacke_dggglm.c
index c896ee1852..bf2106346d 100644
--- a/LAPACKE/src/lapacke_dggglm.c
+++ b/LAPACKE/src/lapacke_dggglm.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggglm( int matrix_layout, lapack_int n, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dggglm)( int matrix_layout, lapack_int n, lapack_int m,
                            lapack_int p, double* a, lapack_int lda, double* b,
                            lapack_int ldb, double* d, double* x, double* y )
 {
@@ -41,25 +41,25 @@ lapack_int LAPACKE_dggglm( int matrix_layout, lapack_int n, lapack_int m,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dggglm", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggglm", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, m, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, p, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, p, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dggglm_work( matrix_layout, n, m, p, a, lda, b, ldb, d, x, y,
+    info = API_SUFFIX(LAPACKE_dggglm_work)( matrix_layout, n, m, p, a, lda, b, ldb, d, x, y,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -72,13 +72,13 @@ lapack_int LAPACKE_dggglm( int matrix_layout, lapack_int n, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dggglm_work( matrix_layout, n, m, p, a, lda, b, ldb, d, x, y,
+    info = API_SUFFIX(LAPACKE_dggglm_work)( matrix_layout, n, m, p, a, lda, b, ldb, d, x, y,
                                 work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dggglm", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggglm", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggglm_work.c b/LAPACKE/src/lapacke_dggglm_work.c
index 72b11309ca..dc69295c17 100644
--- a/LAPACKE/src/lapacke_dggglm_work.c
+++ b/LAPACKE/src/lapacke_dggglm_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggglm_work( int matrix_layout, lapack_int n, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dggglm_work)( int matrix_layout, lapack_int n, lapack_int m,
                                 lapack_int p, double* a, lapack_int lda,
                                 double* b, lapack_int ldb, double* d, double* x,
                                 double* y, double* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_dggglm_work( int matrix_layout, lapack_int n, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dggglm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggglm_work", info );
             return info;
         }
         if( ldb < p ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dggglm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggglm_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_dggglm_work( int matrix_layout, lapack_int n, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, m, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, p, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, p, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dggglm( &n, &m, &p, a_t, &lda_t, b_t, &ldb_t, d, x, y, work,
                        &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_dggglm_work( int matrix_layout, lapack_int n, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, m, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, p, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, m, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, p, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dggglm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggglm_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dggglm_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggglm_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgghd3.c b/LAPACKE/src/lapacke_dgghd3.c
index 900bb4dd1c..36b4e7f97f 100644
--- a/LAPACKE/src/lapacke_dgghd3.c
+++ b/LAPACKE/src/lapacke_dgghd3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgghd3( int matrix_layout, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_dgghd3)( int matrix_layout, char compq, char compz,
                            lapack_int n, lapack_int ilo, lapack_int ihi,
                            double* a, lapack_int lda,
                            double* b, lapack_int ldb,
@@ -44,32 +44,32 @@ lapack_int LAPACKE_dgghd3( int matrix_layout, char compq, char compz,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgghd3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgghd3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -13;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgghd3_work( matrix_layout, compq, compz, n, ilo, ihi,
+    info = API_SUFFIX(LAPACKE_dgghd3_work)( matrix_layout, compq, compz, n, ilo, ihi,
                                 a, lda, b, ldb, q, ldq, z, ldz, &work_query,
                                 lwork );
     if( info != 0 ) {
@@ -83,13 +83,13 @@ lapack_int LAPACKE_dgghd3( int matrix_layout, char compq, char compz,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgghd3_work( matrix_layout, compq, compz, n, ilo, ihi,
+    info = API_SUFFIX(LAPACKE_dgghd3_work)( matrix_layout, compq, compz, n, ilo, ihi,
                                 a, lda, b, ldb, q, ldq, z, ldz, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgghd3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgghd3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgghd3_work.c b/LAPACKE/src/lapacke_dgghd3_work.c
index a115b2bd6c..d029ac542a 100644
--- a/LAPACKE/src/lapacke_dgghd3_work.c
+++ b/LAPACKE/src/lapacke_dgghd3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgghd3_work( int matrix_layout, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_dgghd3_work)( int matrix_layout, char compq, char compz,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 double* a, lapack_int lda, double* b,
                                 lapack_int ldb, double* q, lapack_int ldq,
@@ -65,22 +65,22 @@ lapack_int LAPACKE_dgghd3_work( int matrix_layout, char compq, char compz,
     /* Check leading dimension(s) */
     if( lda < n ) {
       info = -8;
-      LAPACKE_xerbla( "LAPACKE_dgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgghd3_work", info );
       return info;
     }
     if( ldb < n ) {
       info = -10;
-      LAPACKE_xerbla( "LAPACKE_dgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgghd3_work", info );
       return info;
     }
     if( ldq < n ) {
       info = -12;
-      LAPACKE_xerbla( "LAPACKE_dgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgghd3_work", info );
       return info;
     }
     if( ldz < n ) {
       info = -14;
-      LAPACKE_xerbla( "LAPACKE_dgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgghd3_work", info );
       return info;
     }
     /* Allocate memory for temporary array(s) */
@@ -94,14 +94,14 @@ lapack_int LAPACKE_dgghd3_work( int matrix_layout, char compq, char compz,
       info = LAPACK_TRANSPOSE_MEMORY_ERROR;
       goto exit_level_1;
     }
-    if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
       q_t = (double*)LAPACKE_malloc( sizeof(double) * ldq_t * MAX(1,n) );
       if( q_t == NULL ) {
         info = LAPACK_TRANSPOSE_MEMORY_ERROR;
         goto exit_level_2;
       }
     }
-    if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
       z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
       if( z_t == NULL ) {
         info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -109,13 +109,13 @@ lapack_int LAPACKE_dgghd3_work( int matrix_layout, char compq, char compz,
       }
     }
     /* Transpose input matrices */
-    LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-    LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-    if( LAPACKE_lsame( compq, 'v' ) ) {
-      LAPACKE_dge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+    API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+    API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+      API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
     }
-    if( LAPACKE_lsame( compz, 'v' ) ) {
-      LAPACKE_dge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+      API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
     }
     /* Call LAPACK function and adjust info */
     LAPACK_dgghd3( &compq, &compz, &n, &ilo, &ihi, a_t, &lda_t, b_t, &ldb_t,
@@ -124,20 +124,20 @@ lapack_int LAPACKE_dgghd3_work( int matrix_layout, char compq, char compz,
       info = info - 1;
     }
     /* Transpose output matrices */
-    LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-    LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-    if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-      LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+    API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+    API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+      API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
     }
-    if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-      LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+      API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
     }
     /* Release memory and exit */
-    if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
       LAPACKE_free( z_t );
     }
   exit_level_3:
-    if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
       LAPACKE_free( q_t );
     }
   exit_level_2:
@@ -146,11 +146,11 @@ lapack_int LAPACKE_dgghd3_work( int matrix_layout, char compq, char compz,
     LAPACKE_free( a_t );
   exit_level_0:
     if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-      LAPACKE_xerbla( "LAPACKE_dgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgghd3_work", info );
     }
   } else {
     info = -1;
-    LAPACKE_xerbla( "LAPACKE_dgghd3_work", info );
+    API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgghd3_work", info );
   }
   return info;
 }
diff --git a/LAPACKE/src/lapacke_dgghrd.c b/LAPACKE/src/lapacke_dgghrd.c
index fd6083a739..1fb5890b7e 100644
--- a/LAPACKE/src/lapacke_dgghrd.c
+++ b/LAPACKE/src/lapacke_dgghrd.c
@@ -32,37 +32,37 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgghrd( int matrix_layout, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_dgghrd)( int matrix_layout, char compq, char compz,
                            lapack_int n, lapack_int ilo, lapack_int ihi,
                            double* a, lapack_int lda, double* b, lapack_int ldb,
                            double* q, lapack_int ldq, double* z,
                            lapack_int ldz )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgghrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgghrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -13;
             }
         }
     }
 #endif
-    return LAPACKE_dgghrd_work( matrix_layout, compq, compz, n, ilo, ihi, a, lda,
+    return API_SUFFIX(LAPACKE_dgghrd_work)( matrix_layout, compq, compz, n, ilo, ihi, a, lda,
                                 b, ldb, q, ldq, z, ldz );
 }
diff --git a/LAPACKE/src/lapacke_dgghrd_work.c b/LAPACKE/src/lapacke_dgghrd_work.c
index 58110b553e..1c130fb077 100644
--- a/LAPACKE/src/lapacke_dgghrd_work.c
+++ b/LAPACKE/src/lapacke_dgghrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgghrd_work( int matrix_layout, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_dgghrd_work)( int matrix_layout, char compq, char compz,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 double* a, lapack_int lda, double* b,
                                 lapack_int ldb, double* q, lapack_int ldq,
@@ -58,22 +58,22 @@ lapack_int LAPACKE_dgghrd_work( int matrix_layout, char compq, char compz,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgghrd_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgghrd_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgghrd_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_dgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgghrd_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -87,14 +87,14 @@ lapack_int LAPACKE_dgghrd_work( int matrix_layout, char compq, char compz,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             q_t = (double*)LAPACKE_malloc( sizeof(double) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -102,13 +102,13 @@ lapack_int LAPACKE_dgghrd_work( int matrix_layout, char compq, char compz,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dgghrd( &compq, &compz, &n, &ilo, &ihi, a_t, &lda_t, b_t, &ldb_t,
@@ -117,20 +117,20 @@ lapack_int LAPACKE_dgghrd_work( int matrix_layout, char compq, char compz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_2:
@@ -139,11 +139,11 @@ lapack_int LAPACKE_dgghrd_work( int matrix_layout, char compq, char compz,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgghrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgghrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgghrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgglse.c b/LAPACKE/src/lapacke_dgglse.c
index e666c40a3f..3f61e392f6 100644
--- a/LAPACKE/src/lapacke_dgglse.c
+++ b/LAPACKE/src/lapacke_dgglse.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgglse( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgglse)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int p, double* a, lapack_int lda, double* b,
                            lapack_int ldb, double* c, double* d, double* x )
 {
@@ -41,28 +41,28 @@ lapack_int LAPACKE_dgglse( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgglse", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgglse", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( m, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( m, c, 1 ) ) {
             return -9;
         }
-        if( LAPACKE_d_nancheck( p, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( p, d, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dgglse_work( matrix_layout, m, n, p, a, lda, b, ldb, c, d, x,
+    info = API_SUFFIX(LAPACKE_dgglse_work)( matrix_layout, m, n, p, a, lda, b, ldb, c, d, x,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_dgglse( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgglse_work( matrix_layout, m, n, p, a, lda, b, ldb, c, d, x,
+    info = API_SUFFIX(LAPACKE_dgglse_work)( matrix_layout, m, n, p, a, lda, b, ldb, c, d, x,
                                 work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgglse", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgglse", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgglse_work.c b/LAPACKE/src/lapacke_dgglse_work.c
index 3f1e8e9412..67dd77aaa1 100644
--- a/LAPACKE/src/lapacke_dgglse_work.c
+++ b/LAPACKE/src/lapacke_dgglse_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgglse_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgglse_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int p, double* a, lapack_int lda,
                                 double* b, lapack_int ldb, double* c, double* d,
                                 double* x, double* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_dgglse_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dgglse_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgglse_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgglse_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgglse_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_dgglse_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgglse( &m, &n, &p, a_t, &lda_t, b_t, &ldb_t, c, d, x, work,
                        &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_dgglse_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgglse_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgglse_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgglse_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgglse_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggqrf.c b/LAPACKE/src/lapacke_dggqrf.c
index fd16eacafe..43526233ad 100644
--- a/LAPACKE/src/lapacke_dggqrf.c
+++ b/LAPACKE/src/lapacke_dggqrf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggqrf( int matrix_layout, lapack_int n, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dggqrf)( int matrix_layout, lapack_int n, lapack_int m,
                            lapack_int p, double* a, lapack_int lda,
                            double* taua, double* b, lapack_int ldb,
                            double* taub )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_dggqrf( int matrix_layout, lapack_int n, lapack_int m,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dggqrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggqrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, m, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, p, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, p, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dggqrf_work( matrix_layout, n, m, p, a, lda, taua, b, ldb,
+    info = API_SUFFIX(LAPACKE_dggqrf_work)( matrix_layout, n, m, p, a, lda, taua, b, ldb,
                                 taub, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_dggqrf( int matrix_layout, lapack_int n, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dggqrf_work( matrix_layout, n, m, p, a, lda, taua, b, ldb,
+    info = API_SUFFIX(LAPACKE_dggqrf_work)( matrix_layout, n, m, p, a, lda, taua, b, ldb,
                                 taub, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dggqrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggqrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggqrf_work.c b/LAPACKE/src/lapacke_dggqrf_work.c
index 01b8770b30..f442a57877 100644
--- a/LAPACKE/src/lapacke_dggqrf_work.c
+++ b/LAPACKE/src/lapacke_dggqrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggqrf_work( int matrix_layout, lapack_int n, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dggqrf_work)( int matrix_layout, lapack_int n, lapack_int m,
                                 lapack_int p, double* a, lapack_int lda,
                                 double* taua, double* b, lapack_int ldb,
                                 double* taub, double* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_dggqrf_work( int matrix_layout, lapack_int n, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dggqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggqrf_work", info );
             return info;
         }
         if( ldb < p ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dggqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggqrf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_dggqrf_work( int matrix_layout, lapack_int n, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, m, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, p, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, p, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dggqrf( &n, &m, &p, a_t, &lda_t, taua, b_t, &ldb_t, taub, work,
                        &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_dggqrf_work( int matrix_layout, lapack_int n, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, m, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, p, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, m, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, p, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dggqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggqrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dggqrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggqrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggrqf.c b/LAPACKE/src/lapacke_dggrqf.c
index 5bbb7046c2..7cb2367073 100644
--- a/LAPACKE/src/lapacke_dggrqf.c
+++ b/LAPACKE/src/lapacke_dggrqf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggrqf( int matrix_layout, lapack_int m, lapack_int p,
+lapack_int API_SUFFIX(LAPACKE_dggrqf)( int matrix_layout, lapack_int m, lapack_int p,
                            lapack_int n, double* a, lapack_int lda,
                            double* taua, double* b, lapack_int ldb,
                            double* taub )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_dggrqf( int matrix_layout, lapack_int m, lapack_int p,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dggrqf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggrqf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dggrqf_work( matrix_layout, m, p, n, a, lda, taua, b, ldb,
+    info = API_SUFFIX(LAPACKE_dggrqf_work)( matrix_layout, m, p, n, a, lda, taua, b, ldb,
                                 taub, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_dggrqf( int matrix_layout, lapack_int m, lapack_int p,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dggrqf_work( matrix_layout, m, p, n, a, lda, taua, b, ldb,
+    info = API_SUFFIX(LAPACKE_dggrqf_work)( matrix_layout, m, p, n, a, lda, taua, b, ldb,
                                 taub, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dggrqf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggrqf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggrqf_work.c b/LAPACKE/src/lapacke_dggrqf_work.c
index e6dc6f64a6..e2a296443d 100644
--- a/LAPACKE/src/lapacke_dggrqf_work.c
+++ b/LAPACKE/src/lapacke_dggrqf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggrqf_work( int matrix_layout, lapack_int m, lapack_int p,
+lapack_int API_SUFFIX(LAPACKE_dggrqf_work)( int matrix_layout, lapack_int m, lapack_int p,
                                 lapack_int n, double* a, lapack_int lda,
                                 double* taua, double* b, lapack_int ldb,
                                 double* taub, double* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_dggrqf_work( int matrix_layout, lapack_int m, lapack_int p,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dggrqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggrqf_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dggrqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggrqf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_dggrqf_work( int matrix_layout, lapack_int m, lapack_int p,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dggrqf( &m, &p, &n, a_t, &lda_t, taua, b_t, &ldb_t, taub, work,
                        &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_dggrqf_work( int matrix_layout, lapack_int m, lapack_int p,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dggrqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggrqf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dggrqf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggrqf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggsvd.c b/LAPACKE/src/lapacke_dggsvd.c
index 2eb8b271b5..50f9d8a903 100644
--- a/LAPACKE/src/lapacke_dggsvd.c
+++ b/LAPACKE/src/lapacke_dggsvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggsvd( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_dggsvd)( int matrix_layout, char jobu, char jobv, char jobq,
                            lapack_int m, lapack_int n, lapack_int p,
                            lapack_int* k, lapack_int* l, double* a,
                            lapack_int lda, double* b, lapack_int ldb,
@@ -43,16 +43,16 @@ lapack_int LAPACKE_dggsvd( int matrix_layout, char jobu, char jobv, char jobq,
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dggsvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -10;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -12;
         }
     }
@@ -64,14 +64,14 @@ lapack_int LAPACKE_dggsvd( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dggsvd_work( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
+    info = API_SUFFIX(LAPACKE_dggsvd_work)( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
                                 a, lda, b, ldb, alpha, beta, u, ldu, v, ldv, q,
                                 ldq, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dggsvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggsvd3.c b/LAPACKE/src/lapacke_dggsvd3.c
index 586254997e..76fc0721a6 100644
--- a/LAPACKE/src/lapacke_dggsvd3.c
+++ b/LAPACKE/src/lapacke_dggsvd3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggsvd3( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_dggsvd3)( int matrix_layout, char jobu, char jobv, char jobq,
                             lapack_int m, lapack_int n, lapack_int p,
                             lapack_int* k, lapack_int* l, double* a,
                             lapack_int lda, double* b, lapack_int ldb,
@@ -45,21 +45,21 @@ lapack_int LAPACKE_dggsvd3( int matrix_layout, char jobu, char jobv, char jobq,
     lapack_int lwork = -1;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dggsvd3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -10;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -12;
         }
     }
 #endif
-    info = LAPACKE_dggsvd3_work( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
+    info = API_SUFFIX(LAPACKE_dggsvd3_work)( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
                                  a, lda, b, ldb, alpha, beta, u, ldu, v, ldv, q,
                                  ldq, &work_query, lwork, iwork );
     if( info != 0 )
@@ -72,14 +72,14 @@ lapack_int LAPACKE_dggsvd3( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dggsvd3_work( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
+    info = API_SUFFIX(LAPACKE_dggsvd3_work)( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
                                  a, lda, b, ldb, alpha, beta, u, ldu, v, ldv, q,
                                  ldq, work, lwork, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dggsvd3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggsvd3_work.c b/LAPACKE/src/lapacke_dggsvd3_work.c
index 1a5cc2e81d..e46167122d 100644
--- a/LAPACKE/src/lapacke_dggsvd3_work.c
+++ b/LAPACKE/src/lapacke_dggsvd3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggsvd3_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_dggsvd3_work)( int matrix_layout, char jobu, char jobv,
                                  char jobq, lapack_int m, lapack_int n,
                                  lapack_int p, lapack_int* k, lapack_int* l,
                                  double* a, lapack_int lda, double* b,
@@ -65,27 +65,27 @@ lapack_int LAPACKE_dggsvd3_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd3_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd3_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_dggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd3_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_dggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd3_work", info );
             return info;
         }
         if( ldv < p ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_dggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -106,21 +106,21 @@ lapack_int LAPACKE_dggsvd3_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (double*)LAPACKE_malloc( sizeof(double) * ldu_t * MAX(1,m) );
             if( u_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (double*)LAPACKE_malloc( sizeof(double) * ldv_t * MAX(1,p) );
             if( v_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (double*)LAPACKE_malloc( sizeof(double) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -128,8 +128,8 @@ lapack_int LAPACKE_dggsvd3_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dggsvd3( &jobu, &jobv, &jobq, &m, &n, &p, k, l, a_t, &lda_t, b_t,
                         &ldb_t, alpha, beta, u_t, &ldu_t, v_t, &ldv_t, q_t,
@@ -138,27 +138,27 @@ lapack_int LAPACKE_dggsvd3_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -167,11 +167,11 @@ lapack_int LAPACKE_dggsvd3_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dggsvd3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggsvd_work.c b/LAPACKE/src/lapacke_dggsvd_work.c
index eda8e4a225..6ccef6a4bb 100644
--- a/LAPACKE/src/lapacke_dggsvd_work.c
+++ b/LAPACKE/src/lapacke_dggsvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggsvd_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_dggsvd_work)( int matrix_layout, char jobu, char jobv,
                                 char jobq, lapack_int m, lapack_int n,
                                 lapack_int p, lapack_int* k, lapack_int* l,
                                 double* a, lapack_int lda, double* b,
@@ -64,27 +64,27 @@ lapack_int LAPACKE_dggsvd_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_dggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_dggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd_work", info );
             return info;
         }
         if( ldv < p ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_dggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -98,21 +98,21 @@ lapack_int LAPACKE_dggsvd_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (double*)LAPACKE_malloc( sizeof(double) * ldu_t * MAX(1,m) );
             if( u_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (double*)LAPACKE_malloc( sizeof(double) * ldv_t * MAX(1,p) );
             if( v_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (double*)LAPACKE_malloc( sizeof(double) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -120,8 +120,8 @@ lapack_int LAPACKE_dggsvd_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dggsvd( &jobu, &jobv, &jobq, &m, &n, &p, k, l, a_t, &lda_t, b_t,
                        &ldb_t, alpha, beta, u_t, &ldu_t, v_t, &ldv_t, q_t,
@@ -130,27 +130,27 @@ lapack_int LAPACKE_dggsvd_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -159,11 +159,11 @@ lapack_int LAPACKE_dggsvd_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dggsvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggsvp.c b/LAPACKE/src/lapacke_dggsvp.c
index 1ddd7cc633..99e3cf6f9d 100644
--- a/LAPACKE/src/lapacke_dggsvp.c
+++ b/LAPACKE/src/lapacke_dggsvp.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggsvp( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_dggsvp)( int matrix_layout, char jobu, char jobv, char jobq,
                            lapack_int m, lapack_int p, lapack_int n, double* a,
                            lapack_int lda, double* b, lapack_int ldb,
                            double tola, double tolb, lapack_int* k,
@@ -44,22 +44,22 @@ lapack_int LAPACKE_dggsvp( int matrix_layout, char jobu, char jobv, char jobq,
     double* tau = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dggsvp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_d_nancheck( 1, &tola, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &tola, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_d_nancheck( 1, &tolb, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &tolb, 1 ) ) {
             return -13;
         }
     }
@@ -81,7 +81,7 @@ lapack_int LAPACKE_dggsvp( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dggsvp_work( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
+    info = API_SUFFIX(LAPACKE_dggsvp_work)( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
                                 b, ldb, tola, tolb, k, l, u, ldu, v, ldv, q,
                                 ldq, iwork, tau, work );
     /* Release memory and exit */
@@ -92,7 +92,7 @@ lapack_int LAPACKE_dggsvp( int matrix_layout, char jobu, char jobv, char jobq,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dggsvp", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggsvp3.c b/LAPACKE/src/lapacke_dggsvp3.c
index 3e5ad77afe..8f58586005 100644
--- a/LAPACKE/src/lapacke_dggsvp3.c
+++ b/LAPACKE/src/lapacke_dggsvp3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggsvp3( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_dggsvp3)( int matrix_layout, char jobu, char jobv, char jobq,
                             lapack_int m, lapack_int p, lapack_int n, double* a,
                             lapack_int lda, double* b, lapack_int ldb,
                             double tola, double tolb, lapack_int* k,
@@ -46,28 +46,28 @@ lapack_int LAPACKE_dggsvp3( int matrix_layout, char jobu, char jobv, char jobq,
     lapack_int lwork = -1;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dggsvp3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_d_nancheck( 1, &tola, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &tola, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_d_nancheck( 1, &tolb, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &tolb, 1 ) ) {
             return -13;
         }
     }
 #endif
     /* Query optimal size for working array */
-    info = LAPACKE_dggsvp3_work( matrix_layout, jobu, jobv, jobq, m, p, n,
+    info = API_SUFFIX(LAPACKE_dggsvp3_work)( matrix_layout, jobu, jobv, jobq, m, p, n,
                                  a, lda, b, ldb, tola, tolb, k, l, u, ldu,
                                  v, ldv, q, ldq, iwork, tau, &work_query,
                                  lwork );
@@ -91,7 +91,7 @@ lapack_int LAPACKE_dggsvp3( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dggsvp3_work( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
+    info = API_SUFFIX(LAPACKE_dggsvp3_work)( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
                                  b, ldb, tola, tolb, k, l, u, ldu, v, ldv, q,
                                  ldq, iwork, tau, work, lwork );
     /* Release memory and exit */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_dggsvp3( int matrix_layout, char jobu, char jobv, char jobq,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dggsvp3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggsvp3_work.c b/LAPACKE/src/lapacke_dggsvp3_work.c
index d5b119d0f2..ad0ea40f37 100644
--- a/LAPACKE/src/lapacke_dggsvp3_work.c
+++ b/LAPACKE/src/lapacke_dggsvp3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggsvp3_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_dggsvp3_work)( int matrix_layout, char jobu, char jobv,
                                  char jobq, lapack_int m, lapack_int p,
                                  lapack_int n, double* a, lapack_int lda,
                                  double* b, lapack_int ldb, double tola,
@@ -65,27 +65,27 @@ lapack_int LAPACKE_dggsvp3_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp3_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp3_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_dggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp3_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_dggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp3_work", info );
             return info;
         }
         if( ldv < p ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_dggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp3_work", info );
             return info;
         }
         if( lwork == -1 ) {
@@ -106,21 +106,21 @@ lapack_int LAPACKE_dggsvp3_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (double*)LAPACKE_malloc( sizeof(double) * ldu_t * MAX(1,m) );
             if( u_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (double*)LAPACKE_malloc( sizeof(double) * ldv_t * MAX(1,p) );
             if( v_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (double*)LAPACKE_malloc( sizeof(double) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -128,8 +128,8 @@ lapack_int LAPACKE_dggsvp3_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dggsvp3( &jobu, &jobv, &jobq, &m, &p, &n, a_t, &lda_t, b_t,
                         &ldb_t, &tola, &tolb, k, l, u_t, &ldu_t, v_t, &ldv_t,
@@ -138,27 +138,27 @@ lapack_int LAPACKE_dggsvp3_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -167,11 +167,11 @@ lapack_int LAPACKE_dggsvp3_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dggsvp3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dggsvp_work.c b/LAPACKE/src/lapacke_dggsvp_work.c
index 5e919c501e..827b802c33 100644
--- a/LAPACKE/src/lapacke_dggsvp_work.c
+++ b/LAPACKE/src/lapacke_dggsvp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dggsvp_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_dggsvp_work)( int matrix_layout, char jobu, char jobv,
                                 char jobq, lapack_int m, lapack_int p,
                                 lapack_int n, double* a, lapack_int lda,
                                 double* b, lapack_int ldb, double tola,
@@ -64,27 +64,27 @@ lapack_int LAPACKE_dggsvp_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_dggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_dggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp_work", info );
             return info;
         }
         if( ldv < m ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_dggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -98,21 +98,21 @@ lapack_int LAPACKE_dggsvp_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (double*)LAPACKE_malloc( sizeof(double) * ldu_t * MAX(1,m) );
             if( u_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (double*)LAPACKE_malloc( sizeof(double) * ldv_t * MAX(1,m) );
             if( v_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (double*)LAPACKE_malloc( sizeof(double) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -120,8 +120,8 @@ lapack_int LAPACKE_dggsvp_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dggsvp( &jobu, &jobv, &jobq, &m, &p, &n, a_t, &lda_t, b_t,
                        &ldb_t, &tola, &tolb, k, l, u_t, &ldu_t, v_t, &ldv_t,
@@ -130,27 +130,27 @@ lapack_int LAPACKE_dggsvp_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, p, m, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, p, m, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -159,11 +159,11 @@ lapack_int LAPACKE_dggsvp_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dggsvp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dggsvp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgtcon.c b/LAPACKE/src/lapacke_dgtcon.c
index 378693ea5a..12b00b4bf3 100644
--- a/LAPACKE/src/lapacke_dgtcon.c
+++ b/LAPACKE/src/lapacke_dgtcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgtcon( char norm, lapack_int n, const double* dl,
+lapack_int API_SUFFIX(LAPACKE_dgtcon)( char norm, lapack_int n, const double* dl,
                            const double* d, const double* du, const double* du2,
                            const lapack_int* ipiv, double anorm, double* rcond )
 {
@@ -42,19 +42,19 @@ lapack_int LAPACKE_dgtcon( char norm, lapack_int n, const double* dl,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, dl, 1 ) ) {
             return -3;
         }
-        if( LAPACKE_d_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, du, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( n-2, du2, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-2, du2, 1 ) ) {
             return -6;
         }
     }
@@ -71,7 +71,7 @@ lapack_int LAPACKE_dgtcon( char norm, lapack_int n, const double* dl,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgtcon_work( norm, n, dl, d, du, du2, ipiv, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_dgtcon_work)( norm, n, dl, d, du, du2, ipiv, anorm, rcond,
                                 work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -79,7 +79,7 @@ lapack_int LAPACKE_dgtcon( char norm, lapack_int n, const double* dl,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgtcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgtcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgtcon_work.c b/LAPACKE/src/lapacke_dgtcon_work.c
index 56d9c45cb7..fe31ee5534 100644
--- a/LAPACKE/src/lapacke_dgtcon_work.c
+++ b/LAPACKE/src/lapacke_dgtcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgtcon_work( char norm, lapack_int n, const double* dl,
+lapack_int API_SUFFIX(LAPACKE_dgtcon_work)( char norm, lapack_int n, const double* dl,
                                 const double* d, const double* du,
                                 const double* du2, const lapack_int* ipiv,
                                 double anorm, double* rcond, double* work,
diff --git a/LAPACKE/src/lapacke_dgtrfs.c b/LAPACKE/src/lapacke_dgtrfs.c
index 98f3e38e15..98e9f61478 100644
--- a/LAPACKE/src/lapacke_dgtrfs.c
+++ b/LAPACKE/src/lapacke_dgtrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgtrfs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgtrfs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int nrhs, const double* dl, const double* d,
                            const double* du, const double* dlf,
                            const double* df, const double* duf,
@@ -44,37 +44,37 @@ lapack_int LAPACKE_dgtrfs( int matrix_layout, char trans, lapack_int n,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgtrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgtrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( n, df, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, df, 1 ) ) {
             return -9;
         }
-        if( LAPACKE_d_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, dl, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( n-1, dlf, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, dlf, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_d_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, du, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( n-2, du2, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-2, du2, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_d_nancheck( n-1, duf, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, duf, 1 ) ) {
             return -10;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -15;
         }
     }
@@ -91,7 +91,7 @@ lapack_int LAPACKE_dgtrfs( int matrix_layout, char trans, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgtrfs_work( matrix_layout, trans, n, nrhs, dl, d, du, dlf,
+    info = API_SUFFIX(LAPACKE_dgtrfs_work)( matrix_layout, trans, n, nrhs, dl, d, du, dlf,
                                 df, duf, du2, ipiv, b, ldb, x, ldx, ferr, berr,
                                 work, iwork );
     /* Release memory and exit */
@@ -100,7 +100,7 @@ lapack_int LAPACKE_dgtrfs( int matrix_layout, char trans, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgtrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgtrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgtrfs_work.c b/LAPACKE/src/lapacke_dgtrfs_work.c
index 557e9a8531..0f93273364 100644
--- a/LAPACKE/src/lapacke_dgtrfs_work.c
+++ b/LAPACKE/src/lapacke_dgtrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgtrfs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgtrfs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int nrhs, const double* dl,
                                 const double* d, const double* du,
                                 const double* dlf, const double* df,
@@ -58,12 +58,12 @@ lapack_int LAPACKE_dgtrfs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_dgtrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgtrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_dgtrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgtrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -78,8 +78,8 @@ lapack_int LAPACKE_dgtrfs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgtrfs( &trans, &n, &nrhs, dl, d, du, dlf, df, duf, du2, ipiv,
                        b_t, &ldb_t, x_t, &ldx_t, ferr, berr, work, iwork,
@@ -88,18 +88,18 @@ lapack_int LAPACKE_dgtrfs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgtrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgtrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgtrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgtrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgtsv.c b/LAPACKE/src/lapacke_dgtsv.c
index 9efdd73aac..eafdd4fd4f 100644
--- a/LAPACKE/src/lapacke_dgtsv.c
+++ b/LAPACKE/src/lapacke_dgtsv.c
@@ -32,30 +32,30 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgtsv( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_dgtsv)( int matrix_layout, lapack_int n, lapack_int nrhs,
                           double* dl, double* d, double* du, double* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgtsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgtsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, dl, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, du, 1 ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_dgtsv_work( matrix_layout, n, nrhs, dl, d, du, b, ldb );
+    return API_SUFFIX(LAPACKE_dgtsv_work)( matrix_layout, n, nrhs, dl, d, du, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dgtsv_work.c b/LAPACKE/src/lapacke_dgtsv_work.c
index a230e204ef..4cef203964 100644
--- a/LAPACKE/src/lapacke_dgtsv_work.c
+++ b/LAPACKE/src/lapacke_dgtsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgtsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_dgtsv_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                double* dl, double* d, double* du, double* b,
                                lapack_int ldb )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dgtsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dgtsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgtsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_dgtsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgtsv( &n, &nrhs, dl, d, du, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgtsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgtsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgtsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgtsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgtsvx.c b/LAPACKE/src/lapacke_dgtsvx.c
index 9ad89a7123..fb6d209fde 100644
--- a/LAPACKE/src/lapacke_dgtsvx.c
+++ b/LAPACKE/src/lapacke_dgtsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgtsvx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_dgtsvx)( int matrix_layout, char fact, char trans,
                            lapack_int n, lapack_int nrhs, const double* dl,
                            const double* d, const double* du, double* dlf,
                            double* df, double* duf, double* du2,
@@ -44,41 +44,41 @@ lapack_int LAPACKE_dgtsvx( int matrix_layout, char fact, char trans,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgtsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgtsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -14;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_d_nancheck( n, df, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, df, 1 ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_d_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, dl, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_d_nancheck( n-1, dlf, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, dlf, 1 ) ) {
                 return -9;
             }
         }
-        if( LAPACKE_d_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, du, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_d_nancheck( n-2, du2, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n-2, du2, 1 ) ) {
                 return -12;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_d_nancheck( n-1, duf, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, duf, 1 ) ) {
                 return -11;
             }
         }
@@ -96,7 +96,7 @@ lapack_int LAPACKE_dgtsvx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dgtsvx_work( matrix_layout, fact, trans, n, nrhs, dl, d, du,
+    info = API_SUFFIX(LAPACKE_dgtsvx_work)( matrix_layout, fact, trans, n, nrhs, dl, d, du,
                                 dlf, df, duf, du2, ipiv, b, ldb, x, ldx, rcond,
                                 ferr, berr, work, iwork );
     /* Release memory and exit */
@@ -105,7 +105,7 @@ lapack_int LAPACKE_dgtsvx( int matrix_layout, char fact, char trans,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dgtsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgtsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgtsvx_work.c b/LAPACKE/src/lapacke_dgtsvx_work.c
index 3cbc8f31a2..5205289dd4 100644
--- a/LAPACKE/src/lapacke_dgtsvx_work.c
+++ b/LAPACKE/src/lapacke_dgtsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgtsvx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_dgtsvx_work)( int matrix_layout, char fact, char trans,
                                 lapack_int n, lapack_int nrhs, const double* dl,
                                 const double* d, const double* du, double* dlf,
                                 double* df, double* duf, double* du2,
@@ -58,12 +58,12 @@ lapack_int LAPACKE_dgtsvx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dgtsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgtsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_dgtsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgtsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -78,7 +78,7 @@ lapack_int LAPACKE_dgtsvx_work( int matrix_layout, char fact, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgtsvx( &fact, &trans, &n, &nrhs, dl, d, du, dlf, df, duf, du2,
                        ipiv, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr, berr, work,
@@ -87,18 +87,18 @@ lapack_int LAPACKE_dgtsvx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgtsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgtsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgtsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgtsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dgttrf.c b/LAPACKE/src/lapacke_dgttrf.c
index bed9525416..d298fa6e82 100644
--- a/LAPACKE/src/lapacke_dgttrf.c
+++ b/LAPACKE/src/lapacke_dgttrf.c
@@ -32,22 +32,22 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgttrf( lapack_int n, double* dl, double* d, double* du,
+lapack_int API_SUFFIX(LAPACKE_dgttrf)( lapack_int n, double* dl, double* d, double* du,
                            double* du2, lapack_int* ipiv )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -3;
         }
-        if( LAPACKE_d_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, dl, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_d_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, du, 1 ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dgttrf_work( n, dl, d, du, du2, ipiv );
+    return API_SUFFIX(LAPACKE_dgttrf_work)( n, dl, d, du, du2, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_dgttrf_work.c b/LAPACKE/src/lapacke_dgttrf_work.c
index 04b9fe325c..ffe3273b6e 100644
--- a/LAPACKE/src/lapacke_dgttrf_work.c
+++ b/LAPACKE/src/lapacke_dgttrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgttrf_work( lapack_int n, double* dl, double* d, double* du,
+lapack_int API_SUFFIX(LAPACKE_dgttrf_work)( lapack_int n, double* dl, double* d, double* du,
                                 double* du2, lapack_int* ipiv )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_dgttrs.c b/LAPACKE/src/lapacke_dgttrs.c
index 1e14efca3c..744c916c12 100644
--- a/LAPACKE/src/lapacke_dgttrs.c
+++ b/LAPACKE/src/lapacke_dgttrs.c
@@ -32,35 +32,35 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgttrs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgttrs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int nrhs, const double* dl, const double* d,
                            const double* du, const double* du2,
                            const lapack_int* ipiv, double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dgttrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgttrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, dl, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, du, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( n-2, du2, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-2, du2, 1 ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_dgttrs_work( matrix_layout, trans, n, nrhs, dl, d, du, du2,
+    return API_SUFFIX(LAPACKE_dgttrs_work)( matrix_layout, trans, n, nrhs, dl, d, du, du2,
                                 ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dgttrs_work.c b/LAPACKE/src/lapacke_dgttrs_work.c
index ca581622ea..6c3356f6b6 100644
--- a/LAPACKE/src/lapacke_dgttrs_work.c
+++ b/LAPACKE/src/lapacke_dgttrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dgttrs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dgttrs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int nrhs, const double* dl,
                                 const double* d, const double* du,
                                 const double* du2, const lapack_int* ipiv,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_dgttrs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dgttrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgttrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -62,7 +62,7 @@ lapack_int LAPACKE_dgttrs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dgttrs( &trans, &n, &nrhs, dl, d, du, du2, ipiv, b_t, &ldb_t,
                        &info );
@@ -70,16 +70,16 @@ lapack_int LAPACKE_dgttrs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dgttrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgttrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dgttrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dgttrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dhgeqz.c b/LAPACKE/src/lapacke_dhgeqz.c
index d333594705..3038afd42c 100644
--- a/LAPACKE/src/lapacke_dhgeqz.c
+++ b/LAPACKE/src/lapacke_dhgeqz.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dhgeqz( int matrix_layout, char job, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_dhgeqz)( int matrix_layout, char job, char compq, char compz,
                            lapack_int n, lapack_int ilo, lapack_int ihi,
                            double* h, lapack_int ldh, double* t, lapack_int ldt,
                            double* alphar, double* alphai, double* beta,
@@ -44,32 +44,32 @@ lapack_int LAPACKE_dhgeqz( int matrix_layout, char job, char compq, char compz,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dhgeqz", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhgeqz", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, h, ldh ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, h, ldh ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -15;
             }
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -17;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dhgeqz_work( matrix_layout, job, compq, compz, n, ilo, ihi, h,
+    info = API_SUFFIX(LAPACKE_dhgeqz_work)( matrix_layout, job, compq, compz, n, ilo, ihi, h,
                                 ldh, t, ldt, alphar, alphai, beta, q, ldq, z,
                                 ldz, &work_query, lwork );
     if( info != 0 ) {
@@ -83,14 +83,14 @@ lapack_int LAPACKE_dhgeqz( int matrix_layout, char job, char compq, char compz,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dhgeqz_work( matrix_layout, job, compq, compz, n, ilo, ihi, h,
+    info = API_SUFFIX(LAPACKE_dhgeqz_work)( matrix_layout, job, compq, compz, n, ilo, ihi, h,
                                 ldh, t, ldt, alphar, alphai, beta, q, ldq, z,
                                 ldz, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dhgeqz", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhgeqz", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dhgeqz_work.c b/LAPACKE/src/lapacke_dhgeqz_work.c
index dd08080b7a..c7b2e1be9a 100644
--- a/LAPACKE/src/lapacke_dhgeqz_work.c
+++ b/LAPACKE/src/lapacke_dhgeqz_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dhgeqz_work( int matrix_layout, char job, char compq,
+lapack_int API_SUFFIX(LAPACKE_dhgeqz_work)( int matrix_layout, char job, char compq,
                                 char compz, lapack_int n, lapack_int ilo,
                                 lapack_int ihi, double* h, lapack_int ldh,
                                 double* t, lapack_int ldt, double* alphar,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_dhgeqz_work( int matrix_layout, char job, char compq,
         /* Check leading dimension(s) */
         if( ldh < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dhgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhgeqz_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_dhgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhgeqz_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dhgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhgeqz_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -18;
-            LAPACKE_xerbla( "LAPACKE_dhgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhgeqz_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -97,14 +97,14 @@ lapack_int LAPACKE_dhgeqz_work( int matrix_layout, char job, char compq,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             q_t = (double*)LAPACKE_malloc( sizeof(double) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -112,13 +112,13 @@ lapack_int LAPACKE_dhgeqz_work( int matrix_layout, char job, char compq,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, h, ldh, h_t, ldh_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, h, ldh, h_t, ldh_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dhgeqz( &job, &compq, &compz, &n, &ilo, &ihi, h_t, &ldh_t, t_t,
@@ -128,20 +128,20 @@ lapack_int LAPACKE_dhgeqz_work( int matrix_layout, char job, char compq,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, h_t, ldh_t, h, ldh );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, h_t, ldh_t, h, ldh );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_2:
@@ -150,11 +150,11 @@ lapack_int LAPACKE_dhgeqz_work( int matrix_layout, char job, char compq,
         LAPACKE_free( h_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dhgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhgeqz_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dhgeqz_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhgeqz_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dhsein.c b/LAPACKE/src/lapacke_dhsein.c
index 3843701cc4..2ef746204d 100644
--- a/LAPACKE/src/lapacke_dhsein.c
+++ b/LAPACKE/src/lapacke_dhsein.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dhsein( int matrix_layout, char job, char eigsrc, char initv,
+lapack_int API_SUFFIX(LAPACKE_dhsein)( int matrix_layout, char job, char eigsrc, char initv,
                            lapack_logical* select, lapack_int n,
                            const double* h, lapack_int ldh, double* wr,
                            const double* wi, double* vl, lapack_int ldvl,
@@ -43,29 +43,29 @@ lapack_int LAPACKE_dhsein( int matrix_layout, char job, char eigsrc, char initv,
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dhsein", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhsein", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, h, ldh ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, h, ldh ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'l' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'l' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'r' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -13;
             }
         }
-        if( LAPACKE_d_nancheck( n, wi, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, wi, 1 ) ) {
             return -10;
         }
-        if( LAPACKE_d_nancheck( n, wr, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, wr, 1 ) ) {
             return -9;
         }
     }
@@ -77,14 +77,14 @@ lapack_int LAPACKE_dhsein( int matrix_layout, char job, char eigsrc, char initv,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dhsein_work( matrix_layout, job, eigsrc, initv, select, n, h,
+    info = API_SUFFIX(LAPACKE_dhsein_work)( matrix_layout, job, eigsrc, initv, select, n, h,
                                 ldh, wr, wi, vl, ldvl, vr, ldvr, mm, m, work,
                                 ifaill, ifailr );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dhsein", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhsein", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dhsein_work.c b/LAPACKE/src/lapacke_dhsein_work.c
index b234c97404..6feb9e7028 100644
--- a/LAPACKE/src/lapacke_dhsein_work.c
+++ b/LAPACKE/src/lapacke_dhsein_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dhsein_work( int matrix_layout, char job, char eigsrc,
+lapack_int API_SUFFIX(LAPACKE_dhsein_work)( int matrix_layout, char job, char eigsrc,
                                 char initv, lapack_logical* select,
                                 lapack_int n, const double* h, lapack_int ldh,
                                 double* wr, const double* wi, double* vl,
@@ -58,17 +58,17 @@ lapack_int LAPACKE_dhsein_work( int matrix_layout, char job, char eigsrc,
         /* Check leading dimension(s) */
         if( ldh < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dhsein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhsein_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dhsein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhsein_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_dhsein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhsein_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -77,7 +77,7 @@ lapack_int LAPACKE_dhsein_work( int matrix_layout, char job, char eigsrc,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'l' ) ) {
             vl_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvl_t * MAX(1,mm) );
             if( vl_t == NULL ) {
@@ -85,7 +85,7 @@ lapack_int LAPACKE_dhsein_work( int matrix_layout, char job, char eigsrc,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'r' ) ) {
             vr_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvr_t * MAX(1,mm) );
             if( vr_t == NULL ) {
@@ -94,14 +94,14 @@ lapack_int LAPACKE_dhsein_work( int matrix_layout, char job, char eigsrc,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, h, ldh, h_t, ldh_t );
-        if( ( LAPACKE_lsame( job, 'l' ) || LAPACKE_lsame( job, 'b' ) ) &&
-            LAPACKE_lsame( initv, 'v' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, h, ldh, h_t, ldh_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( job, 'l' ) || API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( initv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( ( LAPACKE_lsame( job, 'r' ) || LAPACKE_lsame( job, 'b' ) ) &&
-            LAPACKE_lsame( initv, 'v' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( job, 'r' ) || API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( initv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dhsein( &job, &eigsrc, &initv, select, &n, h_t, &ldh_t, wr, wi,
@@ -111,31 +111,31 @@ lapack_int LAPACKE_dhsein_work( int matrix_layout, char job, char eigsrc,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'l' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'l' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
                                ldvl );
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'r' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'r' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
                                ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'r' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'l' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( h_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dhsein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhsein_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dhsein_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhsein_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dhseqr.c b/LAPACKE/src/lapacke_dhseqr.c
index 736bf3ea04..9069ad2f8a 100644
--- a/LAPACKE/src/lapacke_dhseqr.c
+++ b/LAPACKE/src/lapacke_dhseqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dhseqr( int matrix_layout, char job, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dhseqr)( int matrix_layout, char job, char compz, lapack_int n,
                            lapack_int ilo, lapack_int ihi, double* h,
                            lapack_int ldh, double* wr, double* wi, double* z,
                            lapack_int ldz )
@@ -42,24 +42,24 @@ lapack_int LAPACKE_dhseqr( int matrix_layout, char job, char compz, lapack_int n
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dhseqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhseqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, h, ldh ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, h, ldh ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -11;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dhseqr_work( matrix_layout, job, compz, n, ilo, ihi, h, ldh,
+    info = API_SUFFIX(LAPACKE_dhseqr_work)( matrix_layout, job, compz, n, ilo, ihi, h, ldh,
                                 wr, wi, z, ldz, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -72,13 +72,13 @@ lapack_int LAPACKE_dhseqr( int matrix_layout, char job, char compz, lapack_int n
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dhseqr_work( matrix_layout, job, compz, n, ilo, ihi, h, ldh,
+    info = API_SUFFIX(LAPACKE_dhseqr_work)( matrix_layout, job, compz, n, ilo, ihi, h, ldh,
                                 wr, wi, z, ldz, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dhseqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhseqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dhseqr_work.c b/LAPACKE/src/lapacke_dhseqr_work.c
index 5bd6de7aa4..e8e265ad73 100644
--- a/LAPACKE/src/lapacke_dhseqr_work.c
+++ b/LAPACKE/src/lapacke_dhseqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dhseqr_work( int matrix_layout, char job, char compz,
+lapack_int API_SUFFIX(LAPACKE_dhseqr_work)( int matrix_layout, char job, char compz,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 double* h, lapack_int ldh, double* wr,
                                 double* wi, double* z, lapack_int ldz,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_dhseqr_work( int matrix_layout, char job, char compz,
         /* Check leading dimension(s) */
         if( ldh < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dhseqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhseqr_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dhseqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhseqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -74,7 +74,7 @@ lapack_int LAPACKE_dhseqr_work( int matrix_layout, char job, char compz,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -82,9 +82,9 @@ lapack_int LAPACKE_dhseqr_work( int matrix_layout, char job, char compz,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, h, ldh, h_t, ldh_t );
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, h, ldh, h_t, ldh_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dhseqr( &job, &compz, &n, &ilo, &ihi, h_t, &ldh_t, wr, wi, z_t,
@@ -93,23 +93,23 @@ lapack_int LAPACKE_dhseqr_work( int matrix_layout, char job, char compz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, h_t, ldh_t, h, ldh );
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, h_t, ldh_t, h, ldh );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( h_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dhseqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhseqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dhseqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dhseqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlacn2.c b/LAPACKE/src/lapacke_dlacn2.c
index 6658b5bf15..26059d1482 100644
--- a/LAPACKE/src/lapacke_dlacn2.c
+++ b/LAPACKE/src/lapacke_dlacn2.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlacn2( lapack_int n, double* v, double* x, lapack_int* isgn,
+lapack_int API_SUFFIX(LAPACKE_dlacn2)( lapack_int n, double* v, double* x, lapack_int* isgn,
                            double* est, lapack_int* kase, lapack_int* isave )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, est, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, est, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( n, x, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, x, 1 ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_dlacn2_work( n, v, x, isgn, est, kase, isave );
+    return API_SUFFIX(LAPACKE_dlacn2_work)( n, v, x, isgn, est, kase, isave );
 }
diff --git a/LAPACKE/src/lapacke_dlacn2_work.c b/LAPACKE/src/lapacke_dlacn2_work.c
index 0e4cb07b5f..4ed7f7a452 100644
--- a/LAPACKE/src/lapacke_dlacn2_work.c
+++ b/LAPACKE/src/lapacke_dlacn2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlacn2_work( lapack_int n, double* v, double* x,
+lapack_int API_SUFFIX(LAPACKE_dlacn2_work)( lapack_int n, double* v, double* x,
                                 lapack_int* isgn, double* est, lapack_int* kase,
                                 lapack_int* isave )
 {
diff --git a/LAPACKE/src/lapacke_dlacpy.c b/LAPACKE/src/lapacke_dlacpy.c
index 8c59e75e05..1c102991ff 100644
--- a/LAPACKE/src/lapacke_dlacpy.c
+++ b/LAPACKE/src/lapacke_dlacpy.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlacpy( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dlacpy)( int matrix_layout, char uplo, lapack_int m,
                            lapack_int n, const double* a, lapack_int lda,
                            double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dlacpy", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlacpy", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dlacpy_work( matrix_layout, uplo, m, n, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_dlacpy_work)( matrix_layout, uplo, m, n, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dlacpy_work.c b/LAPACKE/src/lapacke_dlacpy_work.c
index 82a76dca37..fa20a9dcff 100644
--- a/LAPACKE/src/lapacke_dlacpy_work.c
+++ b/LAPACKE/src/lapacke_dlacpy_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlacpy_work( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dlacpy_work)( int matrix_layout, char uplo, lapack_int m,
                                 lapack_int n, const double* a, lapack_int lda,
                                 double* b, lapack_int ldb )
 {
@@ -48,12 +48,12 @@ lapack_int LAPACKE_dlacpy_work( int matrix_layout, char uplo, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dlacpy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlacpy_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dlacpy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlacpy_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -68,23 +68,23 @@ lapack_int LAPACKE_dlacpy_work( int matrix_layout, char uplo, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dlacpy( &uplo, &m, &n, a_t, &lda_t, b_t, &ldb_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dlacpy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlacpy_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dlacpy_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlacpy_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlag2s.c b/LAPACKE/src/lapacke_dlag2s.c
index e5421b34e7..af14376c84 100644
--- a/LAPACKE/src/lapacke_dlag2s.c
+++ b/LAPACKE/src/lapacke_dlag2s.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlag2s( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dlag2s)( int matrix_layout, lapack_int m, lapack_int n,
                            const double* a, lapack_int lda, float* sa,
                            lapack_int ldsa )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dlag2s", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlag2s", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dlag2s_work( matrix_layout, m, n, a, lda, sa, ldsa );
+    return API_SUFFIX(LAPACKE_dlag2s_work)( matrix_layout, m, n, a, lda, sa, ldsa );
 }
diff --git a/LAPACKE/src/lapacke_dlag2s_work.c b/LAPACKE/src/lapacke_dlag2s_work.c
index a5ec0383e4..a4bd6d2912 100644
--- a/LAPACKE/src/lapacke_dlag2s_work.c
+++ b/LAPACKE/src/lapacke_dlag2s_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlag2s_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dlag2s_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 const double* a, lapack_int lda, float* sa,
                                 lapack_int ldsa )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_dlag2s_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dlag2s_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlag2s_work", info );
             return info;
         }
         if( ldsa < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dlag2s_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlag2s_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,25 +71,25 @@ lapack_int LAPACKE_dlag2s_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dlag2s( &m, &n, a_t, &lda_t, sa_t, &ldsa_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, sa_t, ldsa_t, sa, ldsa );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, sa_t, ldsa_t, sa, ldsa );
         /* Release memory and exit */
         LAPACKE_free( sa_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dlag2s_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlag2s_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dlag2s_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlag2s_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlagge.c b/LAPACKE/src/lapacke_dlagge.c
index 5fe0bb5781..a9d2889a8f 100644
--- a/LAPACKE/src/lapacke_dlagge.c
+++ b/LAPACKE/src/lapacke_dlagge.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlagge( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dlagge)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int kl, lapack_int ku, const double* d,
                            double* a, lapack_int lda, lapack_int* iseed )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dlagge", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlagge", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( MIN(m,n), d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( MIN(m,n), d, 1 ) ) {
             return -6;
         }
     }
@@ -57,13 +57,13 @@ lapack_int LAPACKE_dlagge( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dlagge_work( matrix_layout, m, n, kl, ku, d, a, lda, iseed,
+    info = API_SUFFIX(LAPACKE_dlagge_work)( matrix_layout, m, n, kl, ku, d, a, lda, iseed,
                                 work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dlagge", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlagge", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlagge_work.c b/LAPACKE/src/lapacke_dlagge_work.c
index ccf3ae9b08..a8d2233d2f 100644
--- a/LAPACKE/src/lapacke_dlagge_work.c
+++ b/LAPACKE/src/lapacke_dlagge_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlagge_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dlagge_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int kl, lapack_int ku, const double* d,
                                 double* a, lapack_int lda, lapack_int* iseed,
                                 double* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dlagge_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dlagge_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlagge_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -65,16 +65,16 @@ lapack_int LAPACKE_dlagge_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dlagge_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlagge_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dlagge_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlagge_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlagsy.c b/LAPACKE/src/lapacke_dlagsy.c
index b081fd5008..d26e0190f3 100644
--- a/LAPACKE/src/lapacke_dlagsy.c
+++ b/LAPACKE/src/lapacke_dlagsy.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlagsy( int matrix_layout, lapack_int n, lapack_int k,
+lapack_int API_SUFFIX(LAPACKE_dlagsy)( int matrix_layout, lapack_int n, lapack_int k,
                            const double* d, double* a, lapack_int lda,
                            lapack_int* iseed )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dlagsy", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlagsy", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -4;
         }
     }
@@ -57,12 +57,12 @@ lapack_int LAPACKE_dlagsy( int matrix_layout, lapack_int n, lapack_int k,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dlagsy_work( matrix_layout, n, k, d, a, lda, iseed, work );
+    info = API_SUFFIX(LAPACKE_dlagsy_work)( matrix_layout, n, k, d, a, lda, iseed, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dlagsy", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlagsy", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlagsy_work.c b/LAPACKE/src/lapacke_dlagsy_work.c
index d160fcbdeb..3460f72d7a 100644
--- a/LAPACKE/src/lapacke_dlagsy_work.c
+++ b/LAPACKE/src/lapacke_dlagsy_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlagsy_work( int matrix_layout, lapack_int n, lapack_int k,
+lapack_int API_SUFFIX(LAPACKE_dlagsy_work)( int matrix_layout, lapack_int n, lapack_int k,
                                 const double* d, double* a, lapack_int lda,
                                 lapack_int* iseed, double* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dlagsy_work( int matrix_layout, lapack_int n, lapack_int k,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dlagsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlagsy_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -64,16 +64,16 @@ lapack_int LAPACKE_dlagsy_work( int matrix_layout, lapack_int n, lapack_int k,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dlagsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlagsy_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dlagsy_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlagsy_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlamch.c b/LAPACKE/src/lapacke_dlamch.c
index 0828867874..e406a097b2 100644
--- a/LAPACKE/src/lapacke_dlamch.c
+++ b/LAPACKE/src/lapacke_dlamch.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_dlamch( char cmach )
+double API_SUFFIX(LAPACKE_dlamch)( char cmach )
 {
-    return LAPACKE_dlamch_work( cmach );
+    return API_SUFFIX(LAPACKE_dlamch_work)( cmach );
 }
diff --git a/LAPACKE/src/lapacke_dlamch_work.c b/LAPACKE/src/lapacke_dlamch_work.c
index cc57f6e0bb..a8a5927d1d 100644
--- a/LAPACKE/src/lapacke_dlamch_work.c
+++ b/LAPACKE/src/lapacke_dlamch_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_dlamch_work( char cmach )
+double API_SUFFIX(LAPACKE_dlamch_work)( char cmach )
 {
     double res;
     /* Call LAPACK function and adjust info */
diff --git a/LAPACKE/src/lapacke_dlangb.c b/LAPACKE/src/lapacke_dlangb.c
new file mode 100644
index 0000000000..618625f99c
--- /dev/null
+++ b/LAPACKE/src/lapacke_dlangb.c
@@ -0,0 +1,73 @@
+/*****************************************************************************
+  Copyright (c) 2022, 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 dlangb
+* Author: Simon Märtens
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+double API_SUFFIX(LAPACKE_dlangb)( int matrix_layout, char norm, lapack_int n,
+                       lapack_int kl, lapack_int ku, const double* ab,
+                       lapack_int ldab )
+{
+    lapack_int info = 0;
+    double res = 0.;
+    double* work = NULL;
+    if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlangb", -1 );
+        return -1;
+    }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+    if( LAPACKE_get_nancheck() ) {
+        /* Optionally check input matrices for NaNs */
+        if( API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+            return -6;
+        }
+    }
+#endif
+    /* Allocate memory for working array(s) */
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
+        work = (double*)LAPACKE_malloc( sizeof(double) * MAX(1,n) );
+        if( work == NULL ) {
+            info = LAPACK_WORK_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+    }
+    /* Call middle-level interface */
+    res = API_SUFFIX(LAPACKE_dlangb_work)( matrix_layout, norm, n, kl, ku, ab, ldab, work );
+    /* Release memory and exit */
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
+        LAPACKE_free( work );
+    }
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlangb", info );
+    }
+    return res;
+}
diff --git a/LAPACKE/src/lapacke_dlangb_work.c b/LAPACKE/src/lapacke_dlangb_work.c
new file mode 100644
index 0000000000..6ab5a35d89
--- /dev/null
+++ b/LAPACKE/src/lapacke_dlangb_work.c
@@ -0,0 +1,83 @@
+/*****************************************************************************
+  Copyright (c) 2022, 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 dlangb
+* Author: Simon Märtens
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+double API_SUFFIX(LAPACKE_dlangb_work)( int matrix_layout, char norm, lapack_int n,
+                            lapack_int kl, lapack_int ku, const double* ab,
+                            lapack_int ldab, double* work )
+{
+    lapack_int info = 0;
+    double res = 0.;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        res = LAPACK_dlangb( &norm, &n, &kl, &ku, ab, &ldab, work );
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        char norm_lapack;
+        double* work_lapack = NULL;
+        /* Check leading dimension(s) */
+        if( ldab < kl+ku+1 ) {
+            info = -7;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlangb_work", info );
+            return info;
+        }
+        if( API_SUFFIX(LAPACKE_lsame)( norm, '1' ) || API_SUFFIX(LAPACKE_lsame)( norm, 'o' ) ) {
+            norm_lapack = 'i';
+        } else if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
+            norm_lapack = '1';
+        } else {
+            norm_lapack = norm;
+        }
+        /* Allocate memory for work array(s) */
+        if( API_SUFFIX(LAPACKE_lsame)( norm_lapack, 'i' ) ) {
+            work_lapack = (double*)LAPACKE_malloc( sizeof(double) * MAX(1,n) );
+            if( work_lapack == NULL ) {
+                info = LAPACK_WORK_MEMORY_ERROR;
+                goto exit_level_0;
+            }
+        }
+        /* Call LAPACK function */
+        res = LAPACK_dlangb( &norm, &n, &ku, &kl, ab, &ldab, work );
+        /* Release memory and exit */
+        if( work_lapack ) {
+            LAPACKE_free( work_lapack );
+        }
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlangb_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlangb_work", info );
+    }
+    return res;
+}
diff --git a/LAPACKE/src/lapacke_dlange.c b/LAPACKE/src/lapacke_dlange.c
index 30094bd9e4..3ae347614e 100644
--- a/LAPACKE/src/lapacke_dlange.c
+++ b/LAPACKE/src/lapacke_dlange.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_dlange( int matrix_layout, char norm, lapack_int m,
+double API_SUFFIX(LAPACKE_dlange)( int matrix_layout, char norm, lapack_int m,
                            lapack_int n, const double* a, lapack_int lda )
 {
     lapack_int info = 0;
     double res = 0.;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dlange", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlange", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( norm, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
         work = (double*)LAPACKE_malloc( sizeof(double) * MAX(1,m) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -59,14 +59,14 @@ double LAPACKE_dlange( int matrix_layout, char norm, lapack_int m,
         }
     }
     /* Call middle-level interface */
-    res = LAPACKE_dlange_work( matrix_layout, norm, m, n, a, lda, work );
+    res = API_SUFFIX(LAPACKE_dlange_work)( matrix_layout, norm, m, n, a, lda, work );
     /* Release memory and exit */
-    if( LAPACKE_lsame( norm, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
         LAPACKE_free( work );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dlange", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlange", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_dlange_work.c b/LAPACKE/src/lapacke_dlange_work.c
index 56750bb76f..dbe9aafb15 100644
--- a/LAPACKE/src/lapacke_dlange_work.c
+++ b/LAPACKE/src/lapacke_dlange_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_dlange_work( int matrix_layout, char norm, lapack_int m,
+double API_SUFFIX(LAPACKE_dlange_work)( int matrix_layout, char norm, lapack_int m,
                                 lapack_int n, const double* a, lapack_int lda,
                                 double* work )
 {
@@ -47,18 +47,18 @@ double LAPACKE_dlange_work( int matrix_layout, char norm, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dlange_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlange_work", info );
             return info;
         }
-        if( LAPACKE_lsame( norm, '1' ) || LAPACKE_lsame( norm, 'o' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( norm, '1' ) || API_SUFFIX(LAPACKE_lsame)( norm, 'o' ) ) {
             norm_lapack = 'i';
-        } else if( LAPACKE_lsame( norm, 'i' ) ) {
+        } else if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
             norm_lapack = '1';
         } else {
             norm_lapack = norm;
         }
         /* Allocate memory for work array(s) */
-        if( LAPACKE_lsame( norm_lapack, 'i' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( norm_lapack, 'i' ) ) {
             work_lapack = (double*)LAPACKE_malloc( sizeof(double) * MAX(1,n) );
             if( work_lapack == NULL ) {
                 info = LAPACK_WORK_MEMORY_ERROR;
@@ -73,11 +73,11 @@ double LAPACKE_dlange_work( int matrix_layout, char norm, lapack_int m,
         }
 exit_level_0:
         if( info == LAPACK_WORK_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dlange_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlange_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dlange_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlange_work", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_dlansy.c b/LAPACKE/src/lapacke_dlansy.c
index 4007cc9127..917bd1e683 100644
--- a/LAPACKE/src/lapacke_dlansy.c
+++ b/LAPACKE/src/lapacke_dlansy.c
@@ -32,27 +32,27 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_dlansy( int matrix_layout, char norm, char uplo, lapack_int n,
+double API_SUFFIX(LAPACKE_dlansy)( int matrix_layout, char norm, char uplo, lapack_int n,
                            const double* a, lapack_int lda )
 {
     lapack_int info = 0;
     double res = 0.;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dlansy", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlansy", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( norm, 'i' ) || LAPACKE_lsame( norm, '1' ) ||
-        LAPACKE_lsame( norm, 'O' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) || API_SUFFIX(LAPACKE_lsame)( norm, '1' ) ||
+        API_SUFFIX(LAPACKE_lsame)( norm, 'O' ) ) {
         work = (double*)LAPACKE_malloc( sizeof(double) * MAX(1,n) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -60,15 +60,15 @@ double LAPACKE_dlansy( int matrix_layout, char norm, char uplo, lapack_int n,
         }
     }
     /* Call middle-level interface */
-    res = LAPACKE_dlansy_work( matrix_layout, norm, uplo, n, a, lda, work );
+    res = API_SUFFIX(LAPACKE_dlansy_work)( matrix_layout, norm, uplo, n, a, lda, work );
     /* Release memory and exit */
-    if( LAPACKE_lsame( norm, 'i' ) || LAPACKE_lsame( norm, '1' ) ||
-        LAPACKE_lsame( norm, 'O' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) || API_SUFFIX(LAPACKE_lsame)( norm, '1' ) ||
+        API_SUFFIX(LAPACKE_lsame)( norm, 'O' ) ) {
         LAPACKE_free( work );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dlansy", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlansy", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_dlansy_work.c b/LAPACKE/src/lapacke_dlansy_work.c
index a370261c35..59c4ebf495 100644
--- a/LAPACKE/src/lapacke_dlansy_work.c
+++ b/LAPACKE/src/lapacke_dlansy_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_dlansy_work( int matrix_layout, char norm, char uplo,
+double API_SUFFIX(LAPACKE_dlansy_work)( int matrix_layout, char norm, char uplo,
                                 lapack_int n, const double* a, lapack_int lda,
                                 double* work )
 {
@@ -50,7 +50,7 @@ double LAPACKE_dlansy_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dlansy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlansy_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,7 +60,7 @@ double LAPACKE_dlansy_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         res = LAPACK_dlansy( &norm, &uplo, &n, a_t, &lda_t, work );
         info = 0;  /* LAPACK call is ok! */
@@ -68,11 +68,11 @@ double LAPACKE_dlansy_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dlansy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlansy_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dlansy_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlansy_work", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_dlantr.c b/LAPACKE/src/lapacke_dlantr.c
index 4d1be93d73..41745d83b5 100644
--- a/LAPACKE/src/lapacke_dlantr.c
+++ b/LAPACKE/src/lapacke_dlantr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_dlantr( int matrix_layout, char norm, char uplo, char diag,
+double API_SUFFIX(LAPACKE_dlantr)( int matrix_layout, char norm, char uplo, char diag,
                            lapack_int m, lapack_int n, const double* a,
                            lapack_int lda )
 {
@@ -40,19 +40,19 @@ double LAPACKE_dlantr( int matrix_layout, char norm, char uplo, char diag,
     double res = 0.;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dlantr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlantr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dtr_nancheck( matrix_layout, uplo, diag, MIN(m,n), a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dtz_nancheck)( matrix_layout, 'f', uplo, diag, m, n, a, lda ) ) {
             return -7;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( norm, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
         work = (double*)LAPACKE_malloc( sizeof(double) * MAX(1,MAX(m,n)) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -60,15 +60,15 @@ double LAPACKE_dlantr( int matrix_layout, char norm, char uplo, char diag,
         }
     }
     /* Call middle-level interface */
-    res = LAPACKE_dlantr_work( matrix_layout, norm, uplo, diag, m, n, a, lda,
+    res = API_SUFFIX(LAPACKE_dlantr_work)( matrix_layout, norm, uplo, diag, m, n, a, lda,
                                 work );
     /* Release memory and exit */
-    if( LAPACKE_lsame( norm, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
         LAPACKE_free( work );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dlantr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlantr", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_dlantr_work.c b/LAPACKE/src/lapacke_dlantr_work.c
index 34fa94c439..876a2095f3 100644
--- a/LAPACKE/src/lapacke_dlantr_work.c
+++ b/LAPACKE/src/lapacke_dlantr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_dlantr_work( int matrix_layout, char norm, char uplo,
+double API_SUFFIX(LAPACKE_dlantr_work)( int matrix_layout, char norm, char uplo,
                                 char diag, lapack_int m, lapack_int n,
                                 const double* a, lapack_int lda, double* work )
 {
@@ -48,23 +48,23 @@ double LAPACKE_dlantr_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dlantr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlantr_work", info );
             return info;
         }
-        if( LAPACKE_lsame( norm, '1' ) || LAPACKE_lsame( norm, 'o' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( norm, '1' ) || API_SUFFIX(LAPACKE_lsame)( norm, 'o' ) ) {
             norm_lapack = 'i';
-        } else if( LAPACKE_lsame( norm, 'i' ) ) {
+        } else if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
             norm_lapack = '1';
         } else {
             norm_lapack = norm;
         }
-        if( LAPACKE_lsame( uplo, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
             uplo_lapack = 'l';
         } else {
             uplo_lapack = 'u';
         }
         /* Allocate memory for work array(s) */
-        if( LAPACKE_lsame( norm_lapack, 'i' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( norm_lapack, 'i' ) ) {
             work_lapack = (double*)LAPACKE_malloc( sizeof(double) * MAX(1,n) );
             if( work_lapack == NULL ) {
                 info = LAPACK_WORK_MEMORY_ERROR;
@@ -79,11 +79,11 @@ double LAPACKE_dlantr_work( int matrix_layout, char norm, char uplo,
         }
 exit_level_0:
         if( info == LAPACK_WORK_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dlantr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlantr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dlantr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlantr_work", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_dlapmr.c b/LAPACKE/src/lapacke_dlapmr.c
index 3ccddda2fb..424d04d849 100644
--- a/LAPACKE/src/lapacke_dlapmr.c
+++ b/LAPACKE/src/lapacke_dlapmr.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlapmr( int matrix_layout, lapack_logical forwrd,
+lapack_int API_SUFFIX(LAPACKE_dlapmr)( int matrix_layout, lapack_logical forwrd,
                            lapack_int m, lapack_int n, double* x,
                            lapack_int ldx, lapack_int* k )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dlapmr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlapmr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, x, ldx ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dlapmr_work( matrix_layout, forwrd, m, n, x, ldx, k );
+    return API_SUFFIX(LAPACKE_dlapmr_work)( matrix_layout, forwrd, m, n, x, ldx, k );
 }
diff --git a/LAPACKE/src/lapacke_dlapmr_work.c b/LAPACKE/src/lapacke_dlapmr_work.c
index 888649e0b3..deb4a7b070 100644
--- a/LAPACKE/src/lapacke_dlapmr_work.c
+++ b/LAPACKE/src/lapacke_dlapmr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlapmr_work( int matrix_layout, lapack_logical forwrd,
+lapack_int API_SUFFIX(LAPACKE_dlapmr_work)( int matrix_layout, lapack_logical forwrd,
                                 lapack_int m, lapack_int n, double* x,
                                 lapack_int ldx, lapack_int* k )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dlapmr_work( int matrix_layout, lapack_logical forwrd,
         /* Check leading dimension(s) */
         if( ldx < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dlapmr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlapmr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,21 +59,21 @@ lapack_int LAPACKE_dlapmr_work( int matrix_layout, lapack_logical forwrd,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dlapmr( &forwrd, &m, &n, x_t, &ldx_t, k );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dlapmr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlapmr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dlapmr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlapmr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlapmt.c b/LAPACKE/src/lapacke_dlapmt.c
index 23f3932ffc..2544c81a9e 100644
--- a/LAPACKE/src/lapacke_dlapmt.c
+++ b/LAPACKE/src/lapacke_dlapmt.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlapmt( int matrix_layout, lapack_logical forwrd,
+lapack_int API_SUFFIX(LAPACKE_dlapmt)( int matrix_layout, lapack_logical forwrd,
                            lapack_int m, lapack_int n, double* x,
                            lapack_int ldx, lapack_int* k )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dlapmt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlapmt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, x, ldx ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dlapmt_work( matrix_layout, forwrd, m, n, x, ldx, k );
+    return API_SUFFIX(LAPACKE_dlapmt_work)( matrix_layout, forwrd, m, n, x, ldx, k );
 }
diff --git a/LAPACKE/src/lapacke_dlapmt_work.c b/LAPACKE/src/lapacke_dlapmt_work.c
index 1eb7557854..b2da97b19d 100644
--- a/LAPACKE/src/lapacke_dlapmt_work.c
+++ b/LAPACKE/src/lapacke_dlapmt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlapmt_work( int matrix_layout, lapack_logical forwrd,
+lapack_int API_SUFFIX(LAPACKE_dlapmt_work)( int matrix_layout, lapack_logical forwrd,
                                 lapack_int m, lapack_int n, double* x,
                                 lapack_int ldx, lapack_int* k )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dlapmt_work( int matrix_layout, lapack_logical forwrd,
         /* Check leading dimension(s) */
         if( ldx < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dlapmt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlapmt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,21 +59,21 @@ lapack_int LAPACKE_dlapmt_work( int matrix_layout, lapack_logical forwrd,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dlapmt( &forwrd, &m, &n, x_t, &ldx_t, k );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dlapmt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlapmt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dlapmt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlapmt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlapy2.c b/LAPACKE/src/lapacke_dlapy2.c
index fd8a145932..83b1b55a29 100644
--- a/LAPACKE/src/lapacke_dlapy2.c
+++ b/LAPACKE/src/lapacke_dlapy2.c
@@ -32,18 +32,18 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_dlapy2( double x, double y )
+double API_SUFFIX(LAPACKE_dlapy2)( double x, double y )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &x, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &x, 1 ) ) {
             return -1;
         }
-        if( LAPACKE_d_nancheck( 1, &y, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &y, 1 ) ) {
             return -2;
         }
     }
 #endif
-    return LAPACKE_dlapy2_work( x, y );
+    return API_SUFFIX(LAPACKE_dlapy2_work)( x, y );
 }
diff --git a/LAPACKE/src/lapacke_dlapy2_work.c b/LAPACKE/src/lapacke_dlapy2_work.c
index 45377c523f..4aa91781e9 100644
--- a/LAPACKE/src/lapacke_dlapy2_work.c
+++ b/LAPACKE/src/lapacke_dlapy2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_dlapy2_work( double x, double y )
+double API_SUFFIX(LAPACKE_dlapy2_work)( double x, double y )
 {
     double res = 0.;
     /* Call LAPACK function and adjust info */
diff --git a/LAPACKE/src/lapacke_dlapy3.c b/LAPACKE/src/lapacke_dlapy3.c
index f1ef9420b7..62ae6e9da1 100644
--- a/LAPACKE/src/lapacke_dlapy3.c
+++ b/LAPACKE/src/lapacke_dlapy3.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_dlapy3( double x, double y, double z )
+double API_SUFFIX(LAPACKE_dlapy3)( double x, double y, double z )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &x, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &x, 1 ) ) {
             return -1;
         }
-        if( LAPACKE_d_nancheck( 1, &y, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &y, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_d_nancheck( 1, &z, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &z, 1 ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_dlapy3_work( x, y, z );
+    return API_SUFFIX(LAPACKE_dlapy3_work)( x, y, z );
 }
diff --git a/LAPACKE/src/lapacke_dlapy3_work.c b/LAPACKE/src/lapacke_dlapy3_work.c
index 98a17d3669..353b0b1234 100644
--- a/LAPACKE/src/lapacke_dlapy3_work.c
+++ b/LAPACKE/src/lapacke_dlapy3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_dlapy3_work( double x, double y, double z )
+double API_SUFFIX(LAPACKE_dlapy3_work)( double x, double y, double z )
 {
     double res = 0.;
     /* Call LAPACK function and adjust info */
diff --git a/LAPACKE/src/lapacke_dlarfb.c b/LAPACKE/src/lapacke_dlarfb.c
index 3c3c24c54b..fee6d8e3b0 100644
--- a/LAPACKE/src/lapacke_dlarfb.c
+++ b/LAPACKE/src/lapacke_dlarfb.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlarfb( int matrix_layout, char side, char trans, char direct,
+lapack_int API_SUFFIX(LAPACKE_dlarfb)( int matrix_layout, char side, char trans, char direct,
                            char storev, lapack_int m, lapack_int n,
                            lapack_int k, const double* v, lapack_int ldv,
                            const double* t, lapack_int ldt, double* c,
@@ -41,73 +41,43 @@ lapack_int LAPACKE_dlarfb( int matrix_layout, char side, char trans, char direct
     lapack_int info = 0;
     lapack_int ldwork;
     double* work = NULL;
-    lapack_int ncols_v, nrows_v;
+    lapack_int nrows_v, ncols_v;
+    lapack_logical left, col, forward;
+    char uplo;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dlarfb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarfb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        lapack_int lrv, lcv;  /* row, column stride */
-        if( matrix_layout == LAPACK_COL_MAJOR ) {
-            lrv = 1;
-            lcv = ldv;
-        } else {
-            lrv = ldv;
-            lcv = 1;
-        }
-        ncols_v =     LAPACKE_lsame( storev, 'c' ) ? k :
-                  ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'l' ) ) ? m :
-                  ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'r' ) ) ? n : 1) );
+        left = API_SUFFIX(LAPACKE_lsame)( side, 'l' );
+        col = API_SUFFIX(LAPACKE_lsame)( storev, 'c' );
+        forward = API_SUFFIX(LAPACKE_lsame)( direct, 'f' );
 
-        nrows_v =   ( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( side, 'l' ) ) ? m :
-                  ( ( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( side, 'r' ) ) ? n :
-                    ( LAPACKE_lsame( storev, 'r' ) ? k : 1) );
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, c, ldc ) ) {
-            return -13;
+        nrows_v = ( col && left ) ? m : ( ( col && !left ) ? n : ( !col ? k : 1) );
+        ncols_v = ( !col && left ) ? m : ( ( !col && !left ) ? n : ( col ? k : 1 ) );
+        uplo = ( ( forward && col ) || !( forward || col ) ) ? 'l' : 'u';
+
+        if( ( col && k > nrows_v ) || ( !col && k > ncols_v ) ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarfb", -8 );
+            return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, k, k, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_dtz_nancheck)( matrix_layout, direct, uplo, 'u',
+                                  nrows_v, ncols_v, v, ldv ) ) {
+            return -9;
+        }
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, k, k, t, ldt ) ) {
             return -11;
         }
-        if( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( direct, 'f' ) ) {
-            if( LAPACKE_dtr_nancheck( matrix_layout, 'l', 'u', k, v, ldv ) )
-                return -9;
-            if( LAPACKE_dge_nancheck( matrix_layout, nrows_v-k, ncols_v,
-                                      &v[k*lrv], ldv ) )
-                return -9;
-        } else if( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( direct, 'b' ) ) {
-            if( k > nrows_v ) {
-                LAPACKE_xerbla( "LAPACKE_dlarfb", -8 );
-                return -8;
-            }
-            if( LAPACKE_dtr_nancheck( matrix_layout, 'u', 'u', k,
-                                      &v[(nrows_v-k)*lrv], ldv ) )
-                return -9;
-            if( LAPACKE_dge_nancheck( matrix_layout, nrows_v-k, ncols_v, v, ldv ) )
-                return -9;
-        } else if( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( direct, 'f' ) ) {
-            if( LAPACKE_dtr_nancheck( matrix_layout, 'u', 'u', k, v, ldv ) )
-                return -9;
-            if( LAPACKE_dge_nancheck( matrix_layout, nrows_v, ncols_v-k,
-                                      &v[k*lrv], ldv ) )
-                return -9;
-        } else if( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( direct, 'b' ) ) {
-            if( k > ncols_v ) {
-                LAPACKE_xerbla( "LAPACKE_dlarfb", -8 );
-                return -8;
-            }
-            if( LAPACKE_dtr_nancheck( matrix_layout, 'l', 'u', k,
-                                      &v[(ncols_v-k)*lcv], ldv ) )
-                return -9;
-            if( LAPACKE_dge_nancheck( matrix_layout, nrows_v, ncols_v-k, v, ldv ) )
-                return -9;
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
+            return -13;
         }
     }
 #endif
-    if( LAPACKE_lsame( side, 'l' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
         ldwork = n;
-    } else if( LAPACKE_lsame( side, 'r' ) ) {
+    } else if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
         ldwork = m;
     } else {
         ldwork = 1;
@@ -119,13 +89,13 @@ lapack_int LAPACKE_dlarfb( int matrix_layout, char side, char trans, char direct
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dlarfb_work( matrix_layout, side, trans, direct, storev, m, n,
+    info = API_SUFFIX(LAPACKE_dlarfb_work)( matrix_layout, side, trans, direct, storev, m, n,
                                 k, v, ldv, t, ldt, c, ldc, work, ldwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dlarfb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarfb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlarfb_work.c b/LAPACKE/src/lapacke_dlarfb_work.c
index 57c53bae31..fec4ac692e 100644
--- a/LAPACKE/src/lapacke_dlarfb_work.c
+++ b/LAPACKE/src/lapacke_dlarfb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlarfb_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dlarfb_work)( int matrix_layout, char side, char trans,
                                 char direct, char storev, lapack_int m,
                                 lapack_int n, lapack_int k, const double* v,
                                 lapack_int ldv, const double* t, lapack_int ldt,
@@ -41,6 +41,8 @@ lapack_int LAPACKE_dlarfb_work( int matrix_layout, char side, char trans,
 {
     lapack_int info = 0;
     lapack_int nrows_v, ncols_v;
+    lapack_logical left, col, forward;
+    char uplo;
     lapack_int ldc_t, ldt_t, ldv_t;
     double *v_t = NULL, *t_t = NULL, *c_t = NULL;
     if( matrix_layout == LAPACK_COL_MAJOR ) {
@@ -51,33 +53,36 @@ lapack_int LAPACKE_dlarfb_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        nrows_v = ( LAPACKE_lsame( storev, 'c' ) &&
-                             LAPACKE_lsame( side, 'l' ) ) ? m :
-                             ( ( LAPACKE_lsame( storev, 'c' ) &&
-                             LAPACKE_lsame( side, 'r' ) ) ? n :
-                             ( LAPACKE_lsame( storev, 'r' ) ? k : 1) );
-        ncols_v = LAPACKE_lsame( storev, 'c' ) ? k :
-                             ( ( LAPACKE_lsame( storev, 'r' ) &&
-                             LAPACKE_lsame( side, 'l' ) ) ? m :
-                             ( ( LAPACKE_lsame( storev, 'r' ) &&
-                             LAPACKE_lsame( side, 'r' ) ) ? n : 1) );
+        left = API_SUFFIX(LAPACKE_lsame)( side, 'l' );
+        col = API_SUFFIX(LAPACKE_lsame)( storev, 'c' );
+        forward = API_SUFFIX(LAPACKE_lsame)( direct, 'f' );
+
+        nrows_v = ( col && left ) ? m : ( ( col && !left ) ? n : ( !col ? k : 1) );
+        ncols_v = ( !col && left ) ? m : ( ( !col && !left ) ? n : ( col ? k : 1 ) );
+        uplo = ( ( forward && col ) || !( forward || col ) ) ? 'l' : 'u';
+
         ldc_t = MAX(1,m);
         ldt_t = MAX(1,k);
         ldv_t = MAX(1,nrows_v);
         /* Check leading dimension(s) */
         if( ldc < n ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_dlarfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarfb_work", info );
             return info;
         }
         if( ldt < k ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dlarfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarfb_work", info );
             return info;
         }
         if( ldv < ncols_v ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dlarfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarfb_work", info );
+            return info;
+        }
+        if( ( col && k > nrows_v ) || ( !col && k > ncols_v ) ) {
+            info = -8;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarfb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -98,44 +103,16 @@ lapack_int LAPACKE_dlarfb_work( int matrix_layout, char side, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( direct, 'f' ) ) {
-            LAPACKE_dtr_trans( matrix_layout, 'l', 'u', k, v, ldv, v_t, ldv_t );
-            LAPACKE_dge_trans( matrix_layout, nrows_v-k, ncols_v, &v[k*ldv], ldv,
-                               &v_t[k], ldv_t );
-        } else if( LAPACKE_lsame( storev, 'c' ) &&
-                   LAPACKE_lsame( direct, 'b' ) ) {
-            if( k > nrows_v ) {
-                LAPACKE_xerbla( "LAPACKE_dlarfb_work", -8 );
-                return -8;
-            }
-            LAPACKE_dtr_trans( matrix_layout, 'u', 'u', k, &v[(nrows_v-k)*ldv],
-                               ldv, &v_t[nrows_v-k], ldv_t );
-            LAPACKE_dge_trans( matrix_layout, nrows_v-k, ncols_v, v, ldv, v_t,
-                               ldv_t );
-        } else if( LAPACKE_lsame( storev, 'r' ) &&
-                   LAPACKE_lsame( direct, 'f' ) ) {
-            LAPACKE_dtr_trans( matrix_layout, 'u', 'u', k, v, ldv, v_t, ldv_t );
-            LAPACKE_dge_trans( matrix_layout, nrows_v, ncols_v-k, &v[k], ldv,
-                               &v_t[k*ldv_t], ldv_t );
-        } else if( LAPACKE_lsame( storev, 'r' ) &&
-                   LAPACKE_lsame( direct, 'b' ) ) {
-            if( k > ncols_v ) {
-                LAPACKE_xerbla( "LAPACKE_dlarfb_work", -8 );
-                return -8;
-            }
-            LAPACKE_dtr_trans( matrix_layout, 'l', 'u', k, &v[ncols_v-k], ldv,
-                               &v_t[(ncols_v-k)*ldv_t], ldv_t );
-            LAPACKE_dge_trans( matrix_layout, nrows_v, ncols_v-k, v, ldv, v_t,
-                               ldv_t );
-        }
-        LAPACKE_dge_trans( matrix_layout, k, k, t, ldt, t_t, ldt_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_dtz_trans)( matrix_layout, direct, uplo, 'u', nrows_v, ncols_v,
+                           v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, k, k, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dlarfb( &side, &trans, &direct, &storev, &m, &n, &k, v_t, &ldv_t,
                        t_t, &ldt_t, c_t, &ldc_t, work, &ldwork );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_2:
@@ -144,11 +121,11 @@ lapack_int LAPACKE_dlarfb_work( int matrix_layout, char side, char trans,
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dlarfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarfb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dlarfb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarfb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlarfg.c b/LAPACKE/src/lapacke_dlarfg.c
index 95cd4d7d3f..ba0c600e21 100644
--- a/LAPACKE/src/lapacke_dlarfg.c
+++ b/LAPACKE/src/lapacke_dlarfg.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlarfg( lapack_int n, double* alpha, double* x,
+lapack_int API_SUFFIX(LAPACKE_dlarfg)( lapack_int n, double* alpha, double* x,
                            lapack_int incx, double* tau )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, alpha, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_d_nancheck( n-1, x, incx ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, x, incx ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_dlarfg_work( n, alpha, x, incx, tau );
+    return API_SUFFIX(LAPACKE_dlarfg_work)( n, alpha, x, incx, tau );
 }
diff --git a/LAPACKE/src/lapacke_dlarfg_work.c b/LAPACKE/src/lapacke_dlarfg_work.c
index eaa49449d7..226c5398df 100644
--- a/LAPACKE/src/lapacke_dlarfg_work.c
+++ b/LAPACKE/src/lapacke_dlarfg_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlarfg_work( lapack_int n, double* alpha, double* x,
+lapack_int API_SUFFIX(LAPACKE_dlarfg_work)( lapack_int n, double* alpha, double* x,
                                 lapack_int incx, double* tau )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_dlarft.c b/LAPACKE/src/lapacke_dlarft.c
index a8d8fa6d3d..e02d8b03ae 100644
--- a/LAPACKE/src/lapacke_dlarft.c
+++ b/LAPACKE/src/lapacke_dlarft.c
@@ -32,31 +32,31 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlarft( int matrix_layout, char direct, char storev,
+lapack_int API_SUFFIX(LAPACKE_dlarft)( int matrix_layout, char direct, char storev,
                            lapack_int n, lapack_int k, const double* v,
                            lapack_int ldv, const double* tau, double* t,
                            lapack_int ldt )
 {
     lapack_int ncols_v, nrows_v;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dlarft", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarft", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        ncols_v = LAPACKE_lsame( storev, 'c' ) ? k :
-                             ( LAPACKE_lsame( storev, 'r' ) ? n : 1);
-        nrows_v = LAPACKE_lsame( storev, 'c' ) ? n :
-                             ( LAPACKE_lsame( storev, 'r' ) ? k : 1);
-        if( LAPACKE_d_nancheck( k, tau, 1 ) ) {
+        ncols_v = API_SUFFIX(LAPACKE_lsame)( storev, 'c' ) ? k :
+                             ( API_SUFFIX(LAPACKE_lsame)( storev, 'r' ) ? n : 1);
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( storev, 'c' ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( storev, 'r' ) ? k : 1);
+        if( API_SUFFIX(LAPACKE_d_nancheck)( k, tau, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, nrows_v, ncols_v, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, nrows_v, ncols_v, v, ldv ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_dlarft_work( matrix_layout, direct, storev, n, k, v, ldv, tau,
+    return API_SUFFIX(LAPACKE_dlarft_work)( matrix_layout, direct, storev, n, k, v, ldv, tau,
                                 t, ldt );
 }
diff --git a/LAPACKE/src/lapacke_dlarft_work.c b/LAPACKE/src/lapacke_dlarft_work.c
index c430f1bb57..ff5e56d7d6 100644
--- a/LAPACKE/src/lapacke_dlarft_work.c
+++ b/LAPACKE/src/lapacke_dlarft_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlarft_work( int matrix_layout, char direct, char storev,
+lapack_int API_SUFFIX(LAPACKE_dlarft_work)( int matrix_layout, char direct, char storev,
                                 lapack_int n, lapack_int k, const double* v,
                                 lapack_int ldv, const double* tau, double* t,
                                 lapack_int ldt )
@@ -48,21 +48,21 @@ lapack_int LAPACKE_dlarft_work( int matrix_layout, char direct, char storev,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        nrows_v = LAPACKE_lsame( storev, 'c' ) ? n :
-                             ( LAPACKE_lsame( storev, 'r' ) ? k : 1);
-        ncols_v = LAPACKE_lsame( storev, 'c' ) ? k :
-                             ( LAPACKE_lsame( storev, 'r' ) ? n : 1);
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( storev, 'c' ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( storev, 'r' ) ? k : 1);
+        ncols_v = API_SUFFIX(LAPACKE_lsame)( storev, 'c' ) ? k :
+                             ( API_SUFFIX(LAPACKE_lsame)( storev, 'r' ) ? n : 1);
         ldt_t = MAX(1,k);
         ldv_t = MAX(1,nrows_v);
         /* Check leading dimension(s) */
         if( ldt < k ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dlarft_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarft_work", info );
             return info;
         }
         if( ldv < ncols_v ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dlarft_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarft_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -78,24 +78,24 @@ lapack_int LAPACKE_dlarft_work( int matrix_layout, char direct, char storev,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, nrows_v, ncols_v, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, nrows_v, ncols_v, v, ldv, v_t, ldv_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dlarft( &direct, &storev, &n, &k, v_t, &ldv_t, tau, t_t,
                        &ldt_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, k, k, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, k, k, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dlarft_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarft_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dlarft_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarft_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlarfx.c b/LAPACKE/src/lapacke_dlarfx.c
index 18676b4cc1..0b76d1f51a 100644
--- a/LAPACKE/src/lapacke_dlarfx.c
+++ b/LAPACKE/src/lapacke_dlarfx.c
@@ -32,30 +32,30 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlarfx( int matrix_layout, char side, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dlarfx)( int matrix_layout, char side, lapack_int m,
                            lapack_int n, const double* v, double tau, double* c,
                            lapack_int ldc, double* work )
 {
     lapack_int lv;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dlarfx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarfx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &tau, 1 ) ) {
             return -6;
         }
-        lv = (LAPACKE_lsame( side, 'l' ) ? m : n);
-        if( LAPACKE_d_nancheck( lv, v, 1 ) ) {
+        lv = (API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n);
+        if( API_SUFFIX(LAPACKE_d_nancheck)( lv, v, 1 ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dlarfx_work( matrix_layout, side, m, n, v, tau, c, ldc,
+    return API_SUFFIX(LAPACKE_dlarfx_work)( matrix_layout, side, m, n, v, tau, c, ldc,
                                 work );
 }
diff --git a/LAPACKE/src/lapacke_dlarfx_work.c b/LAPACKE/src/lapacke_dlarfx_work.c
index 7345976b85..f9ac0626ee 100644
--- a/LAPACKE/src/lapacke_dlarfx_work.c
+++ b/LAPACKE/src/lapacke_dlarfx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlarfx_work( int matrix_layout, char side, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dlarfx_work)( int matrix_layout, char side, lapack_int m,
                                 lapack_int n, const double* v, double tau,
                                 double* c, lapack_int ldc, double* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dlarfx_work( int matrix_layout, char side, lapack_int m,
         /* Check leading dimension(s) */
         if( ldc < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dlarfx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarfx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,21 +59,21 @@ lapack_int LAPACKE_dlarfx_work( int matrix_layout, char side, lapack_int m,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dlarfx( &side, &m, &n, v, &tau, c_t, &ldc_t, work );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dlarfx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarfx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dlarfx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlarfx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlarnv.c b/LAPACKE/src/lapacke_dlarnv.c
index 004fee2ae3..f634150ccc 100644
--- a/LAPACKE/src/lapacke_dlarnv.c
+++ b/LAPACKE/src/lapacke_dlarnv.c
@@ -32,8 +32,8 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlarnv( lapack_int idist, lapack_int* iseed, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dlarnv)( lapack_int idist, lapack_int* iseed, lapack_int n,
                            double* x )
 {
-    return LAPACKE_dlarnv_work( idist, iseed, n, x );
+    return API_SUFFIX(LAPACKE_dlarnv_work)( idist, iseed, n, x );
 }
diff --git a/LAPACKE/src/lapacke_dlarnv_work.c b/LAPACKE/src/lapacke_dlarnv_work.c
index e430e52ac0..5cc116e1f0 100644
--- a/LAPACKE/src/lapacke_dlarnv_work.c
+++ b/LAPACKE/src/lapacke_dlarnv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlarnv_work( lapack_int idist, lapack_int* iseed,
+lapack_int API_SUFFIX(LAPACKE_dlarnv_work)( lapack_int idist, lapack_int* iseed,
                                 lapack_int n, double* x )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_dlartgp.c b/LAPACKE/src/lapacke_dlartgp.c
index 1ec778e09a..053c39886a 100644
--- a/LAPACKE/src/lapacke_dlartgp.c
+++ b/LAPACKE/src/lapacke_dlartgp.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlartgp( double f, double g, double* cs, double* sn,
+lapack_int API_SUFFIX(LAPACKE_dlartgp)( double f, double g, double* cs, double* sn,
                             double* r )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &f, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &f, 1 ) ) {
             return -1;
         }
-        if( LAPACKE_d_nancheck( 1, &g, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &g, 1 ) ) {
             return -2;
         }
     }
 #endif
-    return LAPACKE_dlartgp_work( f, g, cs, sn, r );
+    return API_SUFFIX(LAPACKE_dlartgp_work)( f, g, cs, sn, r );
 }
diff --git a/LAPACKE/src/lapacke_dlartgp_work.c b/LAPACKE/src/lapacke_dlartgp_work.c
index ee71072a53..94f45f977f 100644
--- a/LAPACKE/src/lapacke_dlartgp_work.c
+++ b/LAPACKE/src/lapacke_dlartgp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlartgp_work( double f, double g, double* cs, double* sn,
+lapack_int API_SUFFIX(LAPACKE_dlartgp_work)( double f, double g, double* cs, double* sn,
                                  double* r )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_dlartgs.c b/LAPACKE/src/lapacke_dlartgs.c
index 795164466e..d31d1499ef 100644
--- a/LAPACKE/src/lapacke_dlartgs.c
+++ b/LAPACKE/src/lapacke_dlartgs.c
@@ -32,22 +32,22 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlartgs( double x, double y, double sigma, double* cs,
+lapack_int API_SUFFIX(LAPACKE_dlartgs)( double x, double y, double sigma, double* cs,
                             double* sn )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &sigma, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &sigma, 1 ) ) {
             return -3;
         }
-        if( LAPACKE_d_nancheck( 1, &x, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &x, 1 ) ) {
             return -1;
         }
-        if( LAPACKE_d_nancheck( 1, &y, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &y, 1 ) ) {
             return -2;
         }
     }
 #endif
-    return LAPACKE_dlartgs_work( x, y, sigma, cs, sn );
+    return API_SUFFIX(LAPACKE_dlartgs_work)( x, y, sigma, cs, sn );
 }
diff --git a/LAPACKE/src/lapacke_dlartgs_work.c b/LAPACKE/src/lapacke_dlartgs_work.c
index 1e3f805273..acf576e370 100644
--- a/LAPACKE/src/lapacke_dlartgs_work.c
+++ b/LAPACKE/src/lapacke_dlartgs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlartgs_work( double x, double y, double sigma, double* cs,
+lapack_int API_SUFFIX(LAPACKE_dlartgs_work)( double x, double y, double sigma, double* cs,
                                  double* sn )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_dlascl.c b/LAPACKE/src/lapacke_dlascl.c
index 71a7ef4e45..2d5b7a88c9 100644
--- a/LAPACKE/src/lapacke_dlascl.c
+++ b/LAPACKE/src/lapacke_dlascl.c
@@ -32,13 +32,13 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlascl( int matrix_layout, char type, lapack_int kl,
+lapack_int API_SUFFIX(LAPACKE_dlascl)( int matrix_layout, char type, lapack_int kl,
                            lapack_int ku, double cfrom, double cto,
                            lapack_int m, lapack_int n, double* a,
                            lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dlascl", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlascl", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
@@ -46,68 +46,68 @@ lapack_int LAPACKE_dlascl( int matrix_layout, char type, lapack_int kl,
         /* Optionally check input matrices for NaNs */
         switch (type) {
         case 'G':
-            if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
                 return -9;
             }
             break;
         case 'L':
             // TYPE = 'L' - lower triangle of general matrix
             if( matrix_layout == LAPACK_COL_MAJOR &&
-                LAPACKE_dgb_nancheck( matrix_layout, m, n, m-1, 0, a, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, m, n, m-1, 0, a, lda+1 ) ) {
                 return -9;
             }
             if( matrix_layout == LAPACK_ROW_MAJOR &&
-                LAPACKE_dgb_nancheck( LAPACK_COL_MAJOR, n, m, 0, m-1, a-m+1, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_dgb_nancheck)( LAPACK_COL_MAJOR, n, m, 0, m-1, a-m+1, lda+1 ) ) {
                 return -9;
             }
             break;
         case 'U':
             // TYPE = 'U' - upper triangle of general matrix
             if( matrix_layout == LAPACK_COL_MAJOR &&
-                LAPACKE_dgb_nancheck( matrix_layout, m, n, 0, n-1, a-n+1, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, m, n, 0, n-1, a-n+1, lda+1 ) ) {
                 return -9;
             }
             if( matrix_layout == LAPACK_ROW_MAJOR &&
-                LAPACKE_dgb_nancheck( LAPACK_COL_MAJOR, n, m, n-1, 0, a, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_dgb_nancheck)( LAPACK_COL_MAJOR, n, m, n-1, 0, a, lda+1 ) ) {
                 return -9;
             }
             break;
         case 'H':
             // TYPE = 'H' - part of upper Hessenberg matrix in general matrix
             if( matrix_layout == LAPACK_COL_MAJOR &&
-                LAPACKE_dgb_nancheck( matrix_layout, m, n, 1, n-1, a-n+1, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, m, n, 1, n-1, a-n+1, lda+1 ) ) {
                 return -9;
             }
             if( matrix_layout == LAPACK_ROW_MAJOR &&
-                LAPACKE_dgb_nancheck( LAPACK_COL_MAJOR, n, m, n-1, 1, a-1, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_dgb_nancheck)( LAPACK_COL_MAJOR, n, m, n-1, 1, a-1, lda+1 ) ) {
                 return -9;
             }
             break;
         case 'B':
             // TYPE = 'B' - lower part of symmetric band matrix (assume m==n)
-            if( LAPACKE_dsb_nancheck( matrix_layout, 'L', n, kl, a, lda ) ) {
+            if( API_SUFFIX(LAPACKE_dsb_nancheck)( matrix_layout, 'L', n, kl, a, lda ) ) {
                 return -9;
             }
             break;
         case 'Q':
             // TYPE = 'Q' - upper part of symmetric band matrix (assume m==n)
-            if( LAPACKE_dsb_nancheck( matrix_layout, 'U', n, ku, a, lda ) ) {
+            if( API_SUFFIX(LAPACKE_dsb_nancheck)( matrix_layout, 'U', n, ku, a, lda ) ) {
                 return -9;
             }
             break;
         case 'Z':
             // TYPE = 'Z' -  band matrix laid out for ?GBTRF
             if( matrix_layout == LAPACK_COL_MAJOR &&
-                LAPACKE_dgb_nancheck( matrix_layout, m, n, kl, ku, a+kl, lda ) ) {
+                API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, m, n, kl, ku, a+kl, lda ) ) {
                 return -9;
             }
             if( matrix_layout == LAPACK_ROW_MAJOR &&
-                LAPACKE_dgb_nancheck( matrix_layout, m, n, kl, ku, a+lda*kl, lda ) ) {
+                API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, m, n, kl, ku, a+lda*kl, lda ) ) {
                 return -9;
             }
             break;
         }
     }
 #endif
-    return LAPACKE_dlascl_work( matrix_layout, type, kl, ku, cfrom, cto, m,  n, a, lda );
+    return API_SUFFIX(LAPACKE_dlascl_work)( matrix_layout, type, kl, ku, cfrom, cto, m,  n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_dlascl_work.c b/LAPACKE/src/lapacke_dlascl_work.c
index 0ab8570b79..95566f78a0 100644
--- a/LAPACKE/src/lapacke_dlascl_work.c
+++ b/LAPACKE/src/lapacke_dlascl_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlascl_work( int matrix_layout, char type, lapack_int kl,
+lapack_int API_SUFFIX(LAPACKE_dlascl_work)( int matrix_layout, char type, lapack_int kl,
                            lapack_int ku, double cfrom, double cto,
                            lapack_int m, lapack_int n, double* a,
                            lapack_int lda )
@@ -45,15 +45,15 @@ lapack_int LAPACKE_dlascl_work( int matrix_layout, char type, lapack_int kl,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_a = LAPACKE_lsame(type, 'b') ? kl + 1 :
-                             LAPACKE_lsame(type, 'q') ? ku + 1 :
-                             LAPACKE_lsame(type, 'z') ? 2 * kl + ku + 1 : m;
+        lapack_int nrows_a = API_SUFFIX(LAPACKE_lsame)(type, 'b') ? kl + 1 :
+                             API_SUFFIX(LAPACKE_lsame)(type, 'q') ? ku + 1 :
+                             API_SUFFIX(LAPACKE_lsame)(type, 'z') ? 2 * kl + ku + 1 : m;
         lapack_int lda_t = MAX(1,nrows_a);
         double* a_t = NULL;
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dlascl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlascl_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,23 +63,23 @@ lapack_int LAPACKE_dlascl_work( int matrix_layout, char type, lapack_int kl,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, nrows_a, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, nrows_a, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dlascl( &type, &kl, &ku, &cfrom, &cto, &m, &n, a_t, &lda_t, &info);
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_a, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_a, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dlascl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlascl_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dlascl_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlascl_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlaset.c b/LAPACKE/src/lapacke_dlaset.c
index 7de7dac21b..4f95ad75f2 100644
--- a/LAPACKE/src/lapacke_dlaset.c
+++ b/LAPACKE/src/lapacke_dlaset.c
@@ -32,13 +32,13 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlaset( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dlaset)( int matrix_layout, char uplo, lapack_int m,
                            lapack_int n, double alpha, double beta, double* a,
                            lapack_int lda )
 {
 
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dlaset", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlaset", -1 );
         return -1;
     }
 
@@ -49,14 +49,14 @@ lapack_int LAPACKE_dlaset( int matrix_layout, char uplo, lapack_int m,
 
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
-        if( LAPACKE_d_nancheck( 1, &alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &alpha, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( 1, &beta, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &beta, 1 ) ) {
             return -6;
         }
     }
 #endif
 
-    return LAPACKE_dlaset_work( matrix_layout, uplo, m, n, alpha, beta, a, lda );
+    return API_SUFFIX(LAPACKE_dlaset_work)( matrix_layout, uplo, m, n, alpha, beta, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_dlaset_work.c b/LAPACKE/src/lapacke_dlaset_work.c
index b18cc331c4..768c9e3058 100644
--- a/LAPACKE/src/lapacke_dlaset_work.c
+++ b/LAPACKE/src/lapacke_dlaset_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlaset_work( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dlaset_work)( int matrix_layout, char uplo, lapack_int m,
                                 lapack_int n, double alpha, double beta,
                                 double* a, lapack_int lda )
 {
@@ -46,7 +46,7 @@ lapack_int LAPACKE_dlaset_work( int matrix_layout, char uplo, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dlaset_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlaset_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -56,21 +56,21 @@ lapack_int LAPACKE_dlaset_work( int matrix_layout, char uplo, lapack_int m,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dlaset( &uplo, &m, &n, &alpha, &beta, a_t, &lda_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dlaset_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlaset_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dlaset_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlaset_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlasrt.c b/LAPACKE/src/lapacke_dlasrt.c
index 101917a233..190abf470a 100644
--- a/LAPACKE/src/lapacke_dlasrt.c
+++ b/LAPACKE/src/lapacke_dlasrt.c
@@ -32,15 +32,15 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlasrt( char id, lapack_int n, double* d )
+lapack_int API_SUFFIX(LAPACKE_dlasrt)( char id, lapack_int n, double* d )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_dlasrt_work( id, n, d );
+    return API_SUFFIX(LAPACKE_dlasrt_work)( id, n, d );
 }
diff --git a/LAPACKE/src/lapacke_dlasrt_work.c b/LAPACKE/src/lapacke_dlasrt_work.c
index cce8791496..1831a070ac 100644
--- a/LAPACKE/src/lapacke_dlasrt_work.c
+++ b/LAPACKE/src/lapacke_dlasrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlasrt_work( char id, lapack_int n, double* d )
+lapack_int API_SUFFIX(LAPACKE_dlasrt_work)( char id, lapack_int n, double* d )
 {
     lapack_int info = 0;
     /* Call LAPACK function and adjust info */
diff --git a/LAPACKE/src/lapacke_dlassq.c b/LAPACKE/src/lapacke_dlassq.c
index 6bd255804a..1e9726e0e3 100644
--- a/LAPACKE/src/lapacke_dlassq.c
+++ b/LAPACKE/src/lapacke_dlassq.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlassq( lapack_int n, double* x, lapack_int incx, double* scale, double* sumsq )
+lapack_int API_SUFFIX(LAPACKE_dlassq)( lapack_int n, const double* x, lapack_int incx, double* scale, double* sumsq )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input vector `x` and in/out scalars `scale` and `sumsq` for NaNs */
-        if( LAPACKE_d_nancheck( n, x, incx ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, x, incx ) ) {
             return -2;
         }
-        if( LAPACKE_d_nancheck( 1, scale, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, scale, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( 1, sumsq, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, sumsq, 1 ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dlassq_work( n, x, incx, scale, sumsq );
+    return API_SUFFIX(LAPACKE_dlassq_work)( n, x, incx, scale, sumsq );
 }
diff --git a/LAPACKE/src/lapacke_dlassq_work.c b/LAPACKE/src/lapacke_dlassq_work.c
index 56a29bcdd5..f8e1b758ab 100644
--- a/LAPACKE/src/lapacke_dlassq_work.c
+++ b/LAPACKE/src/lapacke_dlassq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlassq_work( lapack_int n, double* x, lapack_int incx, double* scale, double* sumsq )
+lapack_int API_SUFFIX(LAPACKE_dlassq_work)( lapack_int n, const double* x, lapack_int incx, double* scale, double* sumsq )
 {
     lapack_int info = 0;
     LAPACK_dlassq( &n, x, &incx, scale, sumsq );
diff --git a/LAPACKE/src/lapacke_dlaswp.c b/LAPACKE/src/lapacke_dlaswp.c
index de4e540b5c..f4a42c8de3 100644
--- a/LAPACKE/src/lapacke_dlaswp.c
+++ b/LAPACKE/src/lapacke_dlaswp.c
@@ -32,12 +32,12 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlaswp( int matrix_layout, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dlaswp)( int matrix_layout, lapack_int n, double* a,
                            lapack_int lda, lapack_int k1, lapack_int k2,
                            const lapack_int* ipiv, lapack_int incx )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dlaswp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlaswp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
@@ -47,15 +47,15 @@ lapack_int LAPACKE_dlaswp( int matrix_layout, lapack_int n, double* a,
     *      Disable the check as is below, the check below was checking for NaN
     *      from lda to n since there is no (obvious) way to knowing m. This is not
     *      a good idea. We could get a lower bound of m by scanning from ipiv. Or
-    *      we could pass on the NaN check to LAPACKE_dlaswp_work. For now disable
+    *      we could pass on the NaN check to API_SUFFIX(LAPACKE_dlaswp_work). For now disable
     *      the buggy Nan check.
     *      See forum: http://icl.cs.utk.edu/lapack-forum/viewtopic.php?t=4827
     *****************************************************************************/
-    /*  if( LAPACKE_dge_nancheck( matrix_layout, lda, n, a, lda ) ) {
+    /*  if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, lda, n, a, lda ) ) {
     *       return -3;
     *   }
     */
     }
 #endif
-    return LAPACKE_dlaswp_work( matrix_layout, n, a, lda, k1, k2, ipiv, incx );
+    return API_SUFFIX(LAPACKE_dlaswp_work)( matrix_layout, n, a, lda, k1, k2, ipiv, incx );
 }
diff --git a/LAPACKE/src/lapacke_dlaswp_work.c b/LAPACKE/src/lapacke_dlaswp_work.c
index ac61ce4e89..1c4574ec3a 100644
--- a/LAPACKE/src/lapacke_dlaswp_work.c
+++ b/LAPACKE/src/lapacke_dlaswp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlaswp_work( int matrix_layout, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dlaswp_work)( int matrix_layout, lapack_int n, double* a,
                                 lapack_int lda, lapack_int k1, lapack_int k2,
                                 const lapack_int* ipiv, lapack_int incx )
 {
@@ -53,7 +53,7 @@ lapack_int LAPACKE_dlaswp_work( int matrix_layout, lapack_int n, double* a,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -4;
-            LAPACKE_xerbla( "LAPACKE_dlaswp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlaswp_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,21 +63,21 @@ lapack_int LAPACKE_dlaswp_work( int matrix_layout, lapack_int n, double* a,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, lda_t, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, lda_t, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dlaswp( &n, a_t, &lda_t, &k1, &k2, ipiv, &incx );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, lda_t, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, lda_t, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dlaswp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlaswp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dlaswp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlaswp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlatms.c b/LAPACKE/src/lapacke_dlatms.c
index a20fedb57d..4c4bcd909f 100644
--- a/LAPACKE/src/lapacke_dlatms.c
+++ b/LAPACKE/src/lapacke_dlatms.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlatms( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dlatms)( int matrix_layout, lapack_int m, lapack_int n,
                            char dist, lapack_int* iseed, char sym, double* d,
                            lapack_int mode, double cond, double dmax,
                            lapack_int kl, lapack_int ku, char pack, double* a,
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dlatms( int matrix_layout, lapack_int m, lapack_int n,
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dlatms", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlatms", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -14;
         }
-        if( LAPACKE_d_nancheck( 1, &cond, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &cond, 1 ) ) {
             return -9;
         }
-        if( LAPACKE_d_nancheck( MIN(n,m), d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( MIN(n,m), d, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &dmax, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &dmax, 1 ) ) {
             return -10;
         }
     }
@@ -68,13 +68,13 @@ lapack_int LAPACKE_dlatms( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dlatms_work( matrix_layout, m, n, dist, iseed, sym, d, mode,
+    info = API_SUFFIX(LAPACKE_dlatms_work)( matrix_layout, m, n, dist, iseed, sym, d, mode,
                                 cond, dmax, kl, ku, pack, a, lda, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dlatms", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlatms", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlatms_work.c b/LAPACKE/src/lapacke_dlatms_work.c
index 3f98722466..7801edf593 100644
--- a/LAPACKE/src/lapacke_dlatms_work.c
+++ b/LAPACKE/src/lapacke_dlatms_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlatms_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dlatms_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 char dist, lapack_int* iseed, char sym,
                                 double* d, lapack_int mode, double cond,
                                 double dmax, lapack_int kl, lapack_int ku,
@@ -53,7 +53,7 @@ lapack_int LAPACKE_dlatms_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dlatms_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlatms_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,7 +63,7 @@ lapack_int LAPACKE_dlatms_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dlatms( &m, &n, &dist, iseed, &sym, d, &mode, &cond, &dmax, &kl,
                        &ku, &pack, a_t, &lda_t, work, &info );
@@ -71,16 +71,16 @@ lapack_int LAPACKE_dlatms_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dlatms_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlatms_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dlatms_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlatms_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dlauum.c b/LAPACKE/src/lapacke_dlauum.c
index 8c9c54599b..05587a8c00 100644
--- a/LAPACKE/src/lapacke_dlauum.c
+++ b/LAPACKE/src/lapacke_dlauum.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlauum( int matrix_layout, char uplo, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dlauum)( int matrix_layout, char uplo, lapack_int n, double* a,
                            lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dlauum", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlauum", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dlauum_work( matrix_layout, uplo, n, a, lda );
+    return API_SUFFIX(LAPACKE_dlauum_work)( matrix_layout, uplo, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_dlauum_work.c b/LAPACKE/src/lapacke_dlauum_work.c
index b28543f9ce..ae1bcc59bf 100644
--- a/LAPACKE/src/lapacke_dlauum_work.c
+++ b/LAPACKE/src/lapacke_dlauum_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dlauum_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dlauum_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_dlauum_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dlauum_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlauum_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,23 +58,23 @@ lapack_int LAPACKE_dlauum_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dlauum( &uplo, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dlauum_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlauum_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dlauum_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dlauum_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dopgtr.c b/LAPACKE/src/lapacke_dopgtr.c
index 74d4b62ff6..518f50d9e4 100644
--- a/LAPACKE/src/lapacke_dopgtr.c
+++ b/LAPACKE/src/lapacke_dopgtr.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dopgtr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dopgtr)( int matrix_layout, char uplo, lapack_int n,
                            const double* ap, const double* tau, double* q,
                            lapack_int ldq )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dopgtr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dopgtr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, ap ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, tau, 1 ) ) {
             return -5;
         }
     }
@@ -60,12 +60,12 @@ lapack_int LAPACKE_dopgtr( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dopgtr_work( matrix_layout, uplo, n, ap, tau, q, ldq, work );
+    info = API_SUFFIX(LAPACKE_dopgtr_work)( matrix_layout, uplo, n, ap, tau, q, ldq, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dopgtr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dopgtr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dopgtr_work.c b/LAPACKE/src/lapacke_dopgtr_work.c
index d5b704447d..592fbf44f2 100644
--- a/LAPACKE/src/lapacke_dopgtr_work.c
+++ b/LAPACKE/src/lapacke_dopgtr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dopgtr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dopgtr_work)( int matrix_layout, char uplo, lapack_int n,
                                 const double* ap, const double* tau, double* q,
                                 lapack_int ldq, double* work )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dopgtr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldq < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dopgtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dopgtr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,25 +66,25 @@ lapack_int LAPACKE_dopgtr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dopgtr( &uplo, &n, ap_t, tau, q_t, &ldq_t, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( q_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dopgtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dopgtr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dopgtr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dopgtr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dopmtr.c b/LAPACKE/src/lapacke_dopmtr.c
index 9ec15270c6..75feb46545 100644
--- a/LAPACKE/src/lapacke_dopmtr.c
+++ b/LAPACKE/src/lapacke_dopmtr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dopmtr( int matrix_layout, char side, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_dopmtr)( int matrix_layout, char side, char uplo, char trans,
                            lapack_int m, lapack_int n, const double* ap,
                            const double* tau, double* c, lapack_int ldc )
 {
@@ -42,28 +42,28 @@ lapack_int LAPACKE_dopmtr( int matrix_layout, char side, char uplo, char trans,
     double* work = NULL;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dopmtr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dopmtr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_dsp_nancheck( r, ap ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( r, ap ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -9;
         }
-        if( LAPACKE_d_nancheck( r-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( r-1, tau, 1 ) ) {
             return -8;
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( side, 'l' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
         lwork = MAX(1,n);
-    } else if( LAPACKE_lsame( side, 'r' ) ) {
+    } else if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
         lwork = MAX(1,m);
     } else {
         lwork = 1; /* Any value */
@@ -75,13 +75,13 @@ lapack_int LAPACKE_dopmtr( int matrix_layout, char side, char uplo, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dopmtr_work( matrix_layout, side, uplo, trans, m, n, ap, tau,
+    info = API_SUFFIX(LAPACKE_dopmtr_work)( matrix_layout, side, uplo, trans, m, n, ap, tau,
                                 c, ldc, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dopmtr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dopmtr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dopmtr_work.c b/LAPACKE/src/lapacke_dopmtr_work.c
index 2fa65f2f6b..49bc10d13c 100644
--- a/LAPACKE/src/lapacke_dopmtr_work.c
+++ b/LAPACKE/src/lapacke_dopmtr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dopmtr_work( int matrix_layout, char side, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dopmtr_work)( int matrix_layout, char side, char uplo,
                                 char trans, lapack_int m, lapack_int n,
                                 const double* ap, const double* tau, double* c,
                                 lapack_int ldc, double* work )
@@ -49,12 +49,12 @@ lapack_int LAPACKE_dopmtr_work( int matrix_layout, char side, char uplo,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( ldc < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dopmtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dopmtr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,8 +70,8 @@ lapack_int LAPACKE_dopmtr_work( int matrix_layout, char side, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
-        LAPACKE_dsp_trans( matrix_layout, uplo, r, ap, ap_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, r, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dopmtr( &side, &uplo, &trans, &m, &n, ap_t, tau, c_t, &ldc_t,
                        work, &info );
@@ -79,18 +79,18 @@ lapack_int LAPACKE_dopmtr_work( int matrix_layout, char side, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( c_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dopmtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dopmtr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dopmtr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dopmtr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorbdb.c b/LAPACKE/src/lapacke_dorbdb.c
index bd7eaf5d1a..f936da23f9 100644
--- a/LAPACKE/src/lapacke_dorbdb.c
+++ b/LAPACKE/src/lapacke_dorbdb.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorbdb( int matrix_layout, char trans, char signs,
+lapack_int API_SUFFIX(LAPACKE_dorbdb)( int matrix_layout, char trans, char signs,
                            lapack_int m, lapack_int p, lapack_int q,
                            double* x11, lapack_int ldx11, double* x12,
                            lapack_int ldx12, double* x21, lapack_int ldx21,
@@ -46,10 +46,10 @@ lapack_int LAPACKE_dorbdb( int matrix_layout, char trans, char signs,
     double work_query;
     int lapack_layout;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dorbdb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorbdb", -1 );
         return -1;
     }
-    if( LAPACKE_lsame( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+    if( API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
         lapack_layout = LAPACK_COL_MAJOR;
     } else {
         lapack_layout = LAPACK_ROW_MAJOR;
@@ -57,22 +57,22 @@ lapack_int LAPACKE_dorbdb( int matrix_layout, char trans, char signs,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( lapack_layout, p, q, x11, ldx11 ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( lapack_layout, p, q, x11, ldx11 ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( lapack_layout, p, m-q, x12, ldx12 ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( lapack_layout, p, m-q, x12, ldx12 ) ) {
             return -9;
         }
-        if( LAPACKE_dge_nancheck( lapack_layout, m-p, q, x21, ldx21 ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( lapack_layout, m-p, q, x21, ldx21 ) ) {
             return -11;
         }
-        if( LAPACKE_dge_nancheck( lapack_layout, m-p, m-q, x22, ldx22 ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( lapack_layout, m-p, m-q, x22, ldx22 ) ) {
             return -13;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dorbdb_work( matrix_layout, trans, signs, m, p, q, x11, ldx11,
+    info = API_SUFFIX(LAPACKE_dorbdb_work)( matrix_layout, trans, signs, m, p, q, x11, ldx11,
                                 x12, ldx12, x21, ldx21, x22, ldx22, theta, phi,
                                 taup1, taup2, tauq1, tauq2, &work_query,
                                 lwork );
@@ -87,14 +87,14 @@ lapack_int LAPACKE_dorbdb( int matrix_layout, char trans, char signs,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dorbdb_work( matrix_layout, trans, signs, m, p, q, x11, ldx11,
+    info = API_SUFFIX(LAPACKE_dorbdb_work)( matrix_layout, trans, signs, m, p, q, x11, ldx11,
                                 x12, ldx12, x21, ldx21, x22, ldx22, theta, phi,
                                 taup1, taup2, tauq1, tauq2, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dorbdb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorbdb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorbdb_work.c b/LAPACKE/src/lapacke_dorbdb_work.c
index 6286c3cec7..e2d8828152 100644
--- a/LAPACKE/src/lapacke_dorbdb_work.c
+++ b/LAPACKE/src/lapacke_dorbdb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorbdb_work( int matrix_layout, char trans, char signs,
+lapack_int API_SUFFIX(LAPACKE_dorbdb_work)( int matrix_layout, char trans, char signs,
                                 lapack_int m, lapack_int p, lapack_int q,
                                 double* x11, lapack_int ldx11, double* x12,
                                 lapack_int ldx12, double* x21, lapack_int ldx21,
@@ -59,7 +59,7 @@ lapack_int LAPACKE_dorbdb_work( int matrix_layout, char trans, char signs,
     if( matrix_layout == LAPACK_COL_MAJOR ||
         matrix_layout == LAPACK_ROW_MAJOR ) {
         char ltrans;
-        if( !LAPACKE_lsame( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+        if( !API_SUFFIX(LAPACKE_lsame)( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
             ltrans = 'n';
         } else {
             ltrans = 't';
@@ -73,7 +73,7 @@ lapack_int LAPACKE_dorbdb_work( int matrix_layout, char trans, char signs,
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dorbdb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorbdb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorcsd.c b/LAPACKE/src/lapacke_dorcsd.c
index 26756ff52b..a5846cbedb 100644
--- a/LAPACKE/src/lapacke_dorcsd.c
+++ b/LAPACKE/src/lapacke_dorcsd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorcsd( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_dorcsd)( int matrix_layout, char jobu1, char jobu2,
                            char jobv1t, char jobv2t, char trans, char signs,
                            lapack_int m, lapack_int p, lapack_int q,
                            double* x11, lapack_int ldx11, double* x12,
@@ -49,10 +49,10 @@ lapack_int LAPACKE_dorcsd( int matrix_layout, char jobu1, char jobu2,
     double work_query;
     int lapack_layout;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dorcsd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorcsd", -1 );
         return -1;
     }
-    if( LAPACKE_lsame( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+    if( API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
         lapack_layout = LAPACK_COL_MAJOR;
     } else {
         lapack_layout = LAPACK_ROW_MAJOR;
@@ -60,16 +60,16 @@ lapack_int LAPACKE_dorcsd( int matrix_layout, char jobu1, char jobu2,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( lapack_layout, p, q, x11, ldx11 ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( lapack_layout, p, q, x11, ldx11 ) ) {
             return -11;
         }
-        if( LAPACKE_dge_nancheck( lapack_layout, p, m-q, x12, ldx12 ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( lapack_layout, p, m-q, x12, ldx12 ) ) {
             return -13;
         }
-        if( LAPACKE_dge_nancheck( lapack_layout, m-p, q, x21, ldx21 ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( lapack_layout, m-p, q, x21, ldx21 ) ) {
             return -15;
         }
-        if( LAPACKE_dge_nancheck( lapack_layout, m-p, m-q, x22, ldx22 ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( lapack_layout, m-p, m-q, x22, ldx22 ) ) {
             return -17;
         }
     }
@@ -81,7 +81,7 @@ lapack_int LAPACKE_dorcsd( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_dorcsd_work( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
+    info = API_SUFFIX(LAPACKE_dorcsd_work)( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
                                 trans, signs, m, p, q, x11, ldx11, x12, ldx12,
                                 x21, ldx21, x22, ldx22, theta, u1, ldu1, u2,
                                 ldu2, v1t, ldv1t, v2t, ldv2t, &work_query,
@@ -97,7 +97,7 @@ lapack_int LAPACKE_dorcsd( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dorcsd_work( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
+    info = API_SUFFIX(LAPACKE_dorcsd_work)( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
                                 trans, signs, m, p, q, x11, ldx11, x12, ldx12,
                                 x21, ldx21, x22, ldx22, theta, u1, ldu1, u2,
                                 ldu2, v1t, ldv1t, v2t, ldv2t, work, lwork,
@@ -108,7 +108,7 @@ lapack_int LAPACKE_dorcsd( int matrix_layout, char jobu1, char jobu2,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dorcsd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorcsd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorcsd2by1.c b/LAPACKE/src/lapacke_dorcsd2by1.c
index 213af715b8..30ec654054 100644
--- a/LAPACKE/src/lapacke_dorcsd2by1.c
+++ b/LAPACKE/src/lapacke_dorcsd2by1.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorcsd2by1( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_dorcsd2by1)( int matrix_layout, char jobu1, char jobu2,
                            char jobv1t, lapack_int m, lapack_int p, lapack_int q,
                            double* x11, lapack_int ldx11, double* x21, lapack_int ldx21,
                            double* theta, double* u1, lapack_int ldu1, double* u2,
@@ -45,7 +45,7 @@ lapack_int LAPACKE_dorcsd2by1( int matrix_layout, char jobu1, char jobu2,
     double work_query;
     lapack_int nrows_x11, nrows_x21;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dorcsd2by1", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorcsd2by1", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
@@ -53,11 +53,11 @@ lapack_int LAPACKE_dorcsd2by1( int matrix_layout, char jobu1, char jobu2,
         /* Optionally check input matrices for NaNs */
         nrows_x11 = p;
         nrows_x21 = m-p;
-        if( LAPACKE_dge_nancheck( matrix_layout, nrows_x11, q, x11, ldx11 ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, nrows_x11, q, x11, ldx11 ) ) {
             return -8;
         }
  
-        if( LAPACKE_dge_nancheck( matrix_layout, nrows_x21, q, x21, ldx21 ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, nrows_x21, q, x21, ldx21 ) ) {
             return -9;
         }
     }
@@ -69,7 +69,7 @@ lapack_int LAPACKE_dorcsd2by1( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_dorcsd2by1_work( matrix_layout, jobu1, jobu2, jobv1t, m, p, q,
+    info = API_SUFFIX(LAPACKE_dorcsd2by1_work)( matrix_layout, jobu1, jobu2, jobv1t, m, p, q,
                                 x11, ldx11, x21, ldx21, theta, u1, ldu1, u2,
                                 ldu2, v1t, ldv1t, &work_query,
                                 lwork, iwork );
@@ -84,7 +84,7 @@ lapack_int LAPACKE_dorcsd2by1( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dorcsd2by1_work( matrix_layout, jobu1, jobu2, jobv1t, m, p, q,
+    info = API_SUFFIX(LAPACKE_dorcsd2by1_work)( matrix_layout, jobu1, jobu2, jobv1t, m, p, q,
                                 x11, ldx11, x21, ldx21, theta, u1, ldu1, u2,
                                 ldu2, v1t, ldv1t, work, lwork, iwork );
     /* Release memory and exit */
@@ -93,7 +93,7 @@ lapack_int LAPACKE_dorcsd2by1( int matrix_layout, char jobu1, char jobu2,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dorcsd2by1", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorcsd2by1", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorcsd2by1_work.c b/LAPACKE/src/lapacke_dorcsd2by1_work.c
index 3e8802bcf8..57a0323e52 100644
--- a/LAPACKE/src/lapacke_dorcsd2by1_work.c
+++ b/LAPACKE/src/lapacke_dorcsd2by1_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_dorcsd2by1_work)( int matrix_layout, char jobu1, char jobu2,
                                 char jobv1t, lapack_int m, lapack_int p,
                                 lapack_int q, double* x11, lapack_int ldx11,
                                 double* x21, lapack_int ldx21,
@@ -54,9 +54,9 @@ lapack_int LAPACKE_dorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
         lapack_int nrows_x11 = p;
         lapack_int nrows_x21 = m-p;
-        lapack_int nrows_u1 = ( LAPACKE_lsame( jobu1, 'y' ) ? p : 1);
-        lapack_int nrows_u2 = ( LAPACKE_lsame( jobu2, 'y' ) ? m-p : 1);
-        lapack_int nrows_v1t = ( LAPACKE_lsame( jobv1t, 'y' ) ? q : 1);
+        lapack_int nrows_u1 = ( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ? p : 1);
+        lapack_int nrows_u2 = ( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ? m-p : 1);
+        lapack_int nrows_v1t = ( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ? q : 1);
         lapack_int ldu1_t = MAX(1,nrows_u1);
         lapack_int ldu2_t = MAX(1,nrows_u2);
         lapack_int ldv1t_t = MAX(1,nrows_v1t);
@@ -70,27 +70,27 @@ lapack_int LAPACKE_dorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
         /* Check leading dimension(s) */
         if( ldu1 < p ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_dorcsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorcsd2by1_work", info );
             return info;
         }
         if( ldu2 < m-p ) {
             info = -23;
-            LAPACKE_xerbla( "LAPACKE_dorcsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorcsd2by1_work", info );
             return info;
         }
         if( ldv1t < q ) {
             info = -25;
-            LAPACKE_xerbla( "LAPACKE_dorcsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorcsd2by1_work", info );
             return info;
         }
         if( ldx11 < q ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dorcsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorcsd2by1_work", info );
             return info;
         }
         if( ldx21 < q ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_dorcsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorcsd2by1_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -112,7 +112,7 @@ lapack_int LAPACKE_dorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu1, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ) {
             u1_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldu1_t * MAX(1,p) );
             if( u1_t == NULL ) {
@@ -120,7 +120,7 @@ lapack_int LAPACKE_dorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobu2, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ) {
             u2_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldu2_t * MAX(1,m-p) );
             if( u2_t == NULL ) {
@@ -128,7 +128,7 @@ lapack_int LAPACKE_dorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobv1t, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ) {
             v1t_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldv1t_t * MAX(1,q) );
             if( v1t_t == NULL ) {
@@ -137,9 +137,9 @@ lapack_int LAPACKE_dorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, nrows_x11, q, x11, ldx11, x11_t,
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, nrows_x11, q, x11, ldx11, x11_t,
                            ldx11_t );
-        LAPACKE_dge_trans( matrix_layout, nrows_x21, q, x21, ldx21, x21_t,
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, nrows_x21, q, x21, ldx21, x21_t,
                            ldx21_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dorcsd2by1( &jobu1, &jobu2, &jobv1t, &m, &p,
@@ -150,32 +150,32 @@ lapack_int LAPACKE_dorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_x11, q, x11_t, ldx11_t, x11,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_x11, q, x11_t, ldx11_t, x11,
                            ldx11 );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_x21, q, x21_t, ldx21_t, x21,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_x21, q, x21_t, ldx21_t, x21,
                            ldx21 );
-        if( LAPACKE_lsame( jobu1, 'y' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_u1, p, u1_t, ldu1_t, u1,
+        if( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_u1, p, u1_t, ldu1_t, u1,
                                ldu1 );
         }
-        if( LAPACKE_lsame( jobu2, 'y' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_u2, m-p, u2_t, ldu2_t,
+        if( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_u2, m-p, u2_t, ldu2_t,
                                u2, ldu2 );
         }
-        if( LAPACKE_lsame( jobv1t, 'y' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrows_v1t, q, v1t_t, ldv1t_t,
+        if( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrows_v1t, q, v1t_t, ldv1t_t,
                                v1t, ldv1t );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobv1t, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ) {
             LAPACKE_free( v1t_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobu2, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ) {
             LAPACKE_free( u2_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu1, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ) {
             LAPACKE_free( u1_t );
         }
 exit_level_2:
@@ -184,11 +184,11 @@ lapack_int LAPACKE_dorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
         LAPACKE_free( x11_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dorcsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorcsd2by1_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dorcsd2by1_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorcsd2by1_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorcsd_work.c b/LAPACKE/src/lapacke_dorcsd_work.c
index d121f7cd65..09b6ad80f5 100644
--- a/LAPACKE/src/lapacke_dorcsd_work.c
+++ b/LAPACKE/src/lapacke_dorcsd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorcsd_work( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_dorcsd_work)( int matrix_layout, char jobu1, char jobu2,
                                 char jobv1t, char jobv2t, char trans,
                                 char signs, lapack_int m, lapack_int p,
                                 lapack_int q, double* x11, lapack_int ldx11,
@@ -62,7 +62,7 @@ lapack_int LAPACKE_dorcsd_work( int matrix_layout, char jobu1, char jobu2,
     if( matrix_layout == LAPACK_COL_MAJOR ||
         matrix_layout == LAPACK_ROW_MAJOR ) {
         char ltrans;
-        if( !LAPACKE_lsame( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+        if( !API_SUFFIX(LAPACKE_lsame)( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
             ltrans = 'n';
         } else {
             ltrans = 't';
@@ -77,7 +77,7 @@ lapack_int LAPACKE_dorcsd_work( int matrix_layout, char jobu1, char jobu2,
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dorcsd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorcsd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorgbr.c b/LAPACKE/src/lapacke_dorgbr.c
index 9f001a8cde..6d75ff139b 100644
--- a/LAPACKE/src/lapacke_dorgbr.c
+++ b/LAPACKE/src/lapacke_dorgbr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorgbr( int matrix_layout, char vect, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dorgbr)( int matrix_layout, char vect, lapack_int m,
                            lapack_int n, lapack_int k, double* a,
                            lapack_int lda, const double* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dorgbr( int matrix_layout, char vect, lapack_int m,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dorgbr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgbr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( MIN(m,k), tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( MIN(m,k), tau, 1 ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dorgbr_work( matrix_layout, vect, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_dorgbr_work)( matrix_layout, vect, m, n, k, a, lda, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_dorgbr( int matrix_layout, char vect, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dorgbr_work( matrix_layout, vect, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_dorgbr_work)( matrix_layout, vect, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dorgbr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgbr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorgbr_work.c b/LAPACKE/src/lapacke_dorgbr_work.c
index 8e5bc130d9..1945f603aa 100644
--- a/LAPACKE/src/lapacke_dorgbr_work.c
+++ b/LAPACKE/src/lapacke_dorgbr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorgbr_work( int matrix_layout, char vect, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_dorgbr_work)( int matrix_layout, char vect, lapack_int m,
                                 lapack_int n, lapack_int k, double* a,
                                 lapack_int lda, const double* tau, double* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dorgbr_work( int matrix_layout, char vect, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dorgbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgbr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,7 +66,7 @@ lapack_int LAPACKE_dorgbr_work( int matrix_layout, char vect, lapack_int m,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dorgbr( &vect, &m, &n, &k, a_t, &lda_t, tau, work, &lwork,
                        &info );
@@ -74,16 +74,16 @@ lapack_int LAPACKE_dorgbr_work( int matrix_layout, char vect, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dorgbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgbr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dorgbr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgbr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorghr.c b/LAPACKE/src/lapacke_dorghr.c
index 982f906e88..3185743fe8 100644
--- a/LAPACKE/src/lapacke_dorghr.c
+++ b/LAPACKE/src/lapacke_dorghr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorghr( int matrix_layout, lapack_int n, lapack_int ilo,
+lapack_int API_SUFFIX(LAPACKE_dorghr)( int matrix_layout, lapack_int n, lapack_int ilo,
                            lapack_int ihi, double* a, lapack_int lda,
                            const double* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dorghr( int matrix_layout, lapack_int n, lapack_int ilo,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dorghr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorghr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( n-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dorghr_work( matrix_layout, n, ilo, ihi, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_dorghr_work)( matrix_layout, n, ilo, ihi, a, lda, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_dorghr( int matrix_layout, lapack_int n, lapack_int ilo,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dorghr_work( matrix_layout, n, ilo, ihi, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_dorghr_work)( matrix_layout, n, ilo, ihi, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dorghr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorghr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorghr_work.c b/LAPACKE/src/lapacke_dorghr_work.c
index cca0413d85..ad5445e367 100644
--- a/LAPACKE/src/lapacke_dorghr_work.c
+++ b/LAPACKE/src/lapacke_dorghr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorghr_work( int matrix_layout, lapack_int n, lapack_int ilo,
+lapack_int API_SUFFIX(LAPACKE_dorghr_work)( int matrix_layout, lapack_int n, lapack_int ilo,
                                 lapack_int ihi, double* a, lapack_int lda,
                                 const double* tau, double* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dorghr_work( int matrix_layout, lapack_int n, lapack_int ilo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dorghr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorghr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_dorghr_work( int matrix_layout, lapack_int n, lapack_int ilo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dorghr( &n, &ilo, &ihi, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dorghr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorghr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dorghr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorghr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorglq.c b/LAPACKE/src/lapacke_dorglq.c
index d984ace1a8..a50cd263b4 100644
--- a/LAPACKE/src/lapacke_dorglq.c
+++ b/LAPACKE/src/lapacke_dorglq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorglq( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dorglq)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int k, double* a, lapack_int lda,
                            const double* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dorglq( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dorglq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorglq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( k, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dorglq_work( matrix_layout, m, n, k, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_dorglq_work)( matrix_layout, m, n, k, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_dorglq( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dorglq_work( matrix_layout, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_dorglq_work)( matrix_layout, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dorglq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorglq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorglq_work.c b/LAPACKE/src/lapacke_dorglq_work.c
index b69ceddade..c791885fd0 100644
--- a/LAPACKE/src/lapacke_dorglq_work.c
+++ b/LAPACKE/src/lapacke_dorglq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorglq_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dorglq_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int k, double* a, lapack_int lda,
                                 const double* tau, double* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dorglq_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dorglq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorglq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_dorglq_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dorglq( &m, &n, &k, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dorglq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorglq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dorglq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorglq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorgql.c b/LAPACKE/src/lapacke_dorgql.c
index ce8e1177a2..f0bf0e903d 100644
--- a/LAPACKE/src/lapacke_dorgql.c
+++ b/LAPACKE/src/lapacke_dorgql.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorgql( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dorgql)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int k, double* a, lapack_int lda,
                            const double* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dorgql( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dorgql", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgql", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( k, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dorgql_work( matrix_layout, m, n, k, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_dorgql_work)( matrix_layout, m, n, k, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_dorgql( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dorgql_work( matrix_layout, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_dorgql_work)( matrix_layout, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dorgql", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgql", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorgql_work.c b/LAPACKE/src/lapacke_dorgql_work.c
index 636d1f682d..f5bda0116b 100644
--- a/LAPACKE/src/lapacke_dorgql_work.c
+++ b/LAPACKE/src/lapacke_dorgql_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorgql_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dorgql_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int k, double* a, lapack_int lda,
                                 const double* tau, double* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dorgql_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dorgql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgql_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_dorgql_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dorgql( &m, &n, &k, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dorgql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgql_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dorgql_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgql_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorgqr.c b/LAPACKE/src/lapacke_dorgqr.c
index 6cbd699013..c9b6127946 100644
--- a/LAPACKE/src/lapacke_dorgqr.c
+++ b/LAPACKE/src/lapacke_dorgqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorgqr( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dorgqr)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int k, double* a, lapack_int lda,
                            const double* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dorgqr( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dorgqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( k, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dorgqr_work( matrix_layout, m, n, k, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_dorgqr_work)( matrix_layout, m, n, k, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_dorgqr( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dorgqr_work( matrix_layout, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_dorgqr_work)( matrix_layout, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dorgqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorgqr_work.c b/LAPACKE/src/lapacke_dorgqr_work.c
index 44f6b7ea1a..07b8c14557 100644
--- a/LAPACKE/src/lapacke_dorgqr_work.c
+++ b/LAPACKE/src/lapacke_dorgqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorgqr_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dorgqr_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int k, double* a, lapack_int lda,
                                 const double* tau, double* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dorgqr_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dorgqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_dorgqr_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dorgqr( &m, &n, &k, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dorgqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dorgqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorgrq.c b/LAPACKE/src/lapacke_dorgrq.c
index bea1bd6e2e..9b54b6b933 100644
--- a/LAPACKE/src/lapacke_dorgrq.c
+++ b/LAPACKE/src/lapacke_dorgrq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorgrq( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dorgrq)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int k, double* a, lapack_int lda,
                            const double* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dorgrq( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dorgrq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgrq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( k, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dorgrq_work( matrix_layout, m, n, k, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_dorgrq_work)( matrix_layout, m, n, k, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_dorgrq( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dorgrq_work( matrix_layout, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_dorgrq_work)( matrix_layout, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dorgrq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgrq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorgrq_work.c b/LAPACKE/src/lapacke_dorgrq_work.c
index 784915f0b4..17b9d41406 100644
--- a/LAPACKE/src/lapacke_dorgrq_work.c
+++ b/LAPACKE/src/lapacke_dorgrq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorgrq_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dorgrq_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int k, double* a, lapack_int lda,
                                 const double* tau, double* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dorgrq_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dorgrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgrq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_dorgrq_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dorgrq( &m, &n, &k, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dorgrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgrq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dorgrq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgrq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorgtr.c b/LAPACKE/src/lapacke_dorgtr.c
index 14e9b5f36a..967ff698cf 100644
--- a/LAPACKE/src/lapacke_dorgtr.c
+++ b/LAPACKE/src/lapacke_dorgtr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorgtr( int matrix_layout, char uplo, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dorgtr)( int matrix_layout, char uplo, lapack_int n, double* a,
                            lapack_int lda, const double* tau )
 {
     lapack_int info = 0;
@@ -40,22 +40,22 @@ lapack_int LAPACKE_dorgtr( int matrix_layout, char uplo, lapack_int n, double* a
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dorgtr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgtr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, tau, 1 ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dorgtr_work( matrix_layout, uplo, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_dorgtr_work)( matrix_layout, uplo, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -68,13 +68,13 @@ lapack_int LAPACKE_dorgtr( int matrix_layout, char uplo, lapack_int n, double* a
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dorgtr_work( matrix_layout, uplo, n, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_dorgtr_work)( matrix_layout, uplo, n, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dorgtr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgtr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorgtr_work.c b/LAPACKE/src/lapacke_dorgtr_work.c
index 709d131254..08dcd9d4f0 100644
--- a/LAPACKE/src/lapacke_dorgtr_work.c
+++ b/LAPACKE/src/lapacke_dorgtr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorgtr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dorgtr_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* a, lapack_int lda, const double* tau,
                                 double* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dorgtr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dorgtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgtr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_dorgtr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dorgtr( &uplo, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dorgtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgtr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dorgtr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgtr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dorgtsqr_row.c b/LAPACKE/src/lapacke_dorgtsqr_row.c
index 1da3405a89..156ba48571 100644
--- a/LAPACKE/src/lapacke_dorgtsqr_row.c
+++ b/LAPACKE/src/lapacke_dorgtsqr_row.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorgtsqr_row( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dorgtsqr_row)( int matrix_layout, lapack_int m, lapack_int n,
                                  lapack_int mb, lapack_int nb,
                                  double* a, lapack_int lda,
                                  const double* t, lapack_int ldt )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_dorgtsqr_row( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dorgtsqr_row", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgtsqr_row", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, nb, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, nb, n, t, ldt ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dorgtsqr_row_work( matrix_layout, m, n, mb, nb,
+    info = API_SUFFIX(LAPACKE_dorgtsqr_row_work)( matrix_layout, m, n, mb, nb,
                                       a, lda, t, ldt, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_dorgtsqr_row( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dorgtsqr_row_work( matrix_layout, m, n, mb, nb,
+    info = API_SUFFIX(LAPACKE_dorgtsqr_row_work)( matrix_layout, m, n, mb, nb,
                                       a, lda, t, ldt, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dorgtsqr_row", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgtsqr_row", info );
     }
     return info;
 }
\ No newline at end of file
diff --git a/LAPACKE/src/lapacke_dorgtsqr_row_work.c b/LAPACKE/src/lapacke_dorgtsqr_row_work.c
index e16467f3a2..b76bf8c655 100644
--- a/LAPACKE/src/lapacke_dorgtsqr_row_work.c
+++ b/LAPACKE/src/lapacke_dorgtsqr_row_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dorgtsqr_row_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dorgtsqr_row_work)( int matrix_layout, lapack_int m, lapack_int n,
                                       lapack_int mb, lapack_int nb,
                                       double* a, lapack_int lda,
                                       const double* t, lapack_int ldt,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_dorgtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dorgtsqr_row_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgtsqr_row_work", info );
             return info;
         }
         lapack_int ldt_t = MAX(1,nb);
@@ -60,7 +60,7 @@ lapack_int LAPACKE_dorgtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
         /* Check leading dimension(s) */
         if( ldt < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dorgtsqr_row_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgtsqr_row_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -81,8 +81,8 @@ lapack_int LAPACKE_dorgtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, nb, n, a, lda, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, nb, n, a, lda, t_t, ldt_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dorgtsqr_row( &m, &n, &mb, &nb, a_t, &lda_t, t_t, &ldt_t,
                              work, &lwork, &info );
@@ -90,7 +90,7 @@ lapack_int LAPACKE_dorgtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
 
         /* Release memory and exit */
         LAPACKE_free( t_t );
@@ -98,11 +98,11 @@ lapack_int LAPACKE_dorgtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dorgtsqr_row_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgtsqr_row_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dorgtsqr_row_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorgtsqr_row_work", info );
     }
     return info;
 }
\ No newline at end of file
diff --git a/LAPACKE/src/lapacke_dorhr_col.c b/LAPACKE/src/lapacke_dorhr_col.c
new file mode 100644
index 0000000000..3350f516e0
--- /dev/null
+++ b/LAPACKE/src/lapacke_dorhr_col.c
@@ -0,0 +1,24 @@
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_dorhr_col)( int matrix_layout, lapack_int m, lapack_int n,
+                              lapack_int nb, double* a,
+                              lapack_int lda, double* t,
+                              lapack_int ldt, double* d)
+{
+  lapack_int info = 0;
+  if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+    API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorhr_col", -1 );
+    return -1;
+  }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+  if( LAPACKE_get_nancheck() ) {
+    /* Optionally check input matrices for NaNs */
+    if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
+      return -5;
+    }
+  }
+#endif
+  /* Call middle-level interface */
+  info = API_SUFFIX(LAPACKE_dorhr_col_work)( matrix_layout, m, n, nb, a, lda, t, ldt, d );
+  return info;
+}
diff --git a/LAPACKE/src/lapacke_dorhr_col_work.c b/LAPACKE/src/lapacke_dorhr_col_work.c
new file mode 100644
index 0000000000..f4a5524bd5
--- /dev/null
+++ b/LAPACKE/src/lapacke_dorhr_col_work.c
@@ -0,0 +1,69 @@
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_dorhr_col_work)( int matrix_layout, lapack_int m, lapack_int n,
+                                   lapack_int nb, double* a,
+                                   lapack_int lda, double* t,
+                                   lapack_int ldt, double* d )
+{
+    lapack_int info = 0;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        LAPACK_dorhr_col( &m, &n, &nb, a, &lda, t, &ldt, d, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        lapack_int lda_t = MAX(1,m);
+        lapack_int ldt_t = MAX(1,MIN(nb,n));
+        double* a_t = NULL;
+        double* t_t = NULL;
+        /* Check leading dimension(s) */
+        if( lda < n ) {
+            info = -6;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorhr_col_work", info );
+            return info;
+        }
+        if( ldt < n ) {
+            info = -8;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorhr_col_work", info );
+            return info;
+        }
+        /* Allocate memory for temporary array(s) */
+        a_t = (double*)
+            LAPACKE_malloc( sizeof(double) * lda_t * MAX(1,n) );
+        if( a_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+        t_t = (double*)
+            LAPACKE_malloc( sizeof(double) *
+                            ldt_t * MAX(1,n) );
+        if( t_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_1;
+        }
+        /* Transpose input matrices */
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        /* Call LAPACK function and adjust info */
+        LAPACK_dorhr_col( &m, &n, &nb, a_t, &lda_t, t_t, &ldt_t, d, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+        /* Transpose output matrices */
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, ldt, n, t_t, ldt_t, t,
+                           ldt );
+        /* Release memory and exit */
+        LAPACKE_free( t_t );
+exit_level_1:
+        LAPACKE_free( a_t );
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorhr_col_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dorhr_col_work", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_dormbr.c b/LAPACKE/src/lapacke_dormbr.c
index 298fce81c4..01fb982f5f 100644
--- a/LAPACKE/src/lapacke_dormbr.c
+++ b/LAPACKE/src/lapacke_dormbr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dormbr( int matrix_layout, char vect, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dormbr)( int matrix_layout, char vect, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const double* a, lapack_int lda, const double* tau,
                            double* c, lapack_int ldc )
@@ -43,28 +43,28 @@ lapack_int LAPACKE_dormbr( int matrix_layout, char vect, char side, char trans,
     double work_query;
     lapack_int nq, ar, ac;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dormbr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormbr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        nq = LAPACKE_lsame( side, 'l' ) ? m : n;
-        ar = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k);
-        ac = LAPACKE_lsame( vect, 'q' ) ? MIN(nq,k) : nq;
-        if( LAPACKE_dge_nancheck( matrix_layout, ar, ac, a, lda ) ) {
+        nq = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        ar = API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ? nq : MIN(nq,k);
+        ac = API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ? MIN(nq,k) : nq;
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, ar, ac, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -11;
         }
-        if( LAPACKE_d_nancheck( MIN(nq,k), tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( MIN(nq,k), tau, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dormbr_work( matrix_layout, vect, side, trans, m, n, k, a,
+    info = API_SUFFIX(LAPACKE_dormbr_work)( matrix_layout, vect, side, trans, m, n, k, a,
                                 lda, tau, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -77,13 +77,13 @@ lapack_int LAPACKE_dormbr( int matrix_layout, char vect, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dormbr_work( matrix_layout, vect, side, trans, m, n, k, a,
+    info = API_SUFFIX(LAPACKE_dormbr_work)( matrix_layout, vect, side, trans, m, n, k, a,
                                 lda, tau, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dormbr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormbr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dormbr_work.c b/LAPACKE/src/lapacke_dormbr_work.c
index d7cf78a2d2..b0d0d5c8b3 100644
--- a/LAPACKE/src/lapacke_dormbr_work.c
+++ b/LAPACKE/src/lapacke_dormbr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dormbr_work( int matrix_layout, char vect, char side,
+lapack_int API_SUFFIX(LAPACKE_dormbr_work)( int matrix_layout, char vect, char side,
                                 char trans, lapack_int m, lapack_int n,
                                 lapack_int k, const double* a, lapack_int lda,
                                 const double* tau, double* c, lapack_int ldc,
@@ -47,9 +47,9 @@ lapack_int LAPACKE_dormbr_work( int matrix_layout, char vect, char side,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nq = LAPACKE_lsame( side, 'l' ) ? m : n;
-        lapack_int ar = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k);
-        lapack_int ac = LAPACKE_lsame( vect, 'q' ) ? MIN(nq,k) : nq;
+        lapack_int nq = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        lapack_int ar = API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ? nq : MIN(nq,k);
+        lapack_int ac = API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ? MIN(nq,k) : nq;
         lapack_int lda_t = MAX(1,ar);
         lapack_int ldc_t = MAX(1,m);
         double *a_t = NULL;
@@ -57,12 +57,12 @@ lapack_int LAPACKE_dormbr_work( int matrix_layout, char vect, char side,
         /* Check leading dimension(s) */
         if( lda < ac ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dormbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormbr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dormbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormbr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_dormbr_work( int matrix_layout, char vect, char side,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, ar, ac, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, ar, ac, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dormbr( &vect, &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t,
                        &ldc_t, work, &lwork, &info );
@@ -92,18 +92,18 @@ lapack_int LAPACKE_dormbr_work( int matrix_layout, char vect, char side,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dormbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormbr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dormbr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormbr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dormhr.c b/LAPACKE/src/lapacke_dormhr.c
index 627b92aa4c..3a65a8bbc2 100644
--- a/LAPACKE/src/lapacke_dormhr.c
+++ b/LAPACKE/src/lapacke_dormhr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dormhr( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dormhr)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int ilo,
                            lapack_int ihi, const double* a, lapack_int lda,
                            const double* tau, double* c, lapack_int ldc )
@@ -43,26 +43,26 @@ lapack_int LAPACKE_dormhr( int matrix_layout, char side, char trans,
     double work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dormhr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormhr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_dge_nancheck( matrix_layout, r, r, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, r, r, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -11;
         }
-        if( LAPACKE_d_nancheck( r-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( r-1, tau, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dormhr_work( matrix_layout, side, trans, m, n, ilo, ihi, a,
+    info = API_SUFFIX(LAPACKE_dormhr_work)( matrix_layout, side, trans, m, n, ilo, ihi, a,
                                 lda, tau, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_dormhr( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dormhr_work( matrix_layout, side, trans, m, n, ilo, ihi, a,
+    info = API_SUFFIX(LAPACKE_dormhr_work)( matrix_layout, side, trans, m, n, ilo, ihi, a,
                                 lda, tau, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dormhr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormhr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dormhr_work.c b/LAPACKE/src/lapacke_dormhr_work.c
index f158f71613..65a15905bb 100644
--- a/LAPACKE/src/lapacke_dormhr_work.c
+++ b/LAPACKE/src/lapacke_dormhr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dormhr_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dormhr_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int ilo,
                                 lapack_int ihi, const double* a, lapack_int lda,
                                 const double* tau, double* c, lapack_int ldc,
@@ -50,18 +50,18 @@ lapack_int LAPACKE_dormhr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lda_t = MAX(1,r);
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( lda < r ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dormhr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormhr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dormhr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormhr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -82,8 +82,8 @@ lapack_int LAPACKE_dormhr_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, r, r, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, r, r, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dormhr( &side, &trans, &m, &n, &ilo, &ihi, a_t, &lda_t, tau, c_t,
                        &ldc_t, work, &lwork, &info );
@@ -91,18 +91,18 @@ lapack_int LAPACKE_dormhr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dormhr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormhr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dormhr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormhr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dormlq.c b/LAPACKE/src/lapacke_dormlq.c
index 06880747a8..c15a4ad796 100644
--- a/LAPACKE/src/lapacke_dormlq.c
+++ b/LAPACKE/src/lapacke_dormlq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dormlq( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dormlq)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const double* a, lapack_int lda, const double* tau,
                            double* c, lapack_int ldc )
@@ -42,26 +42,26 @@ lapack_int LAPACKE_dormlq( int matrix_layout, char side, char trans,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dormlq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormlq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_dge_nancheck( matrix_layout, k, r, a, lda ) ) {
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, k, r, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_d_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( k, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dormlq_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_dormlq_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -74,13 +74,13 @@ lapack_int LAPACKE_dormlq( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dormlq_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_dormlq_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dormlq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormlq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dormlq_work.c b/LAPACKE/src/lapacke_dormlq_work.c
index 6bd12624f0..73205bfa01 100644
--- a/LAPACKE/src/lapacke_dormlq_work.c
+++ b/LAPACKE/src/lapacke_dormlq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dormlq_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dormlq_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const double* a, lapack_int lda,
                                 const double* tau, double* c, lapack_int ldc,
@@ -47,7 +47,7 @@ lapack_int LAPACKE_dormlq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lapack_int lda_t = MAX(1,k);
         lapack_int ldc_t = MAX(1,m);
         double *a_t = NULL;
@@ -55,12 +55,12 @@ lapack_int LAPACKE_dormlq_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < r ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dormlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormlq_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dormlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormlq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -81,8 +81,8 @@ lapack_int LAPACKE_dormlq_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, k, r, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, k, r, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dormlq( &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t, &ldc_t,
                        work, &lwork, &info );
@@ -90,18 +90,18 @@ lapack_int LAPACKE_dormlq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dormlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormlq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dormlq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormlq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dormql.c b/LAPACKE/src/lapacke_dormql.c
index 1e4d7efd3e..50f9c70f59 100644
--- a/LAPACKE/src/lapacke_dormql.c
+++ b/LAPACKE/src/lapacke_dormql.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dormql( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dormql)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const double* a, lapack_int lda, const double* tau,
                            double* c, lapack_int ldc )
@@ -43,26 +43,26 @@ lapack_int LAPACKE_dormql( int matrix_layout, char side, char trans,
     double work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dormql", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormql", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_dge_nancheck( matrix_layout, r, k, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, r, k, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_d_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( k, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dormql_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_dormql_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_dormql( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dormql_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_dormql_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dormql", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormql", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dormql_work.c b/LAPACKE/src/lapacke_dormql_work.c
index c7336e816b..639b6d8d1d 100644
--- a/LAPACKE/src/lapacke_dormql_work.c
+++ b/LAPACKE/src/lapacke_dormql_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dormql_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dormql_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const double* a, lapack_int lda,
                                 const double* tau, double* c, lapack_int ldc,
@@ -50,18 +50,18 @@ lapack_int LAPACKE_dormql_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lda_t = MAX(1,r);
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( lda < k ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dormql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormql_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dormql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormql_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -82,8 +82,8 @@ lapack_int LAPACKE_dormql_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, r, k, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, r, k, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dormql( &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t, &ldc_t,
                        work, &lwork, &info );
@@ -91,18 +91,18 @@ lapack_int LAPACKE_dormql_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dormql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormql_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dormql_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormql_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dormqr.c b/LAPACKE/src/lapacke_dormqr.c
index 820805ba00..c2f80f98b7 100644
--- a/LAPACKE/src/lapacke_dormqr.c
+++ b/LAPACKE/src/lapacke_dormqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dormqr( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dormqr)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const double* a, lapack_int lda, const double* tau,
                            double* c, lapack_int ldc )
@@ -43,26 +43,26 @@ lapack_int LAPACKE_dormqr( int matrix_layout, char side, char trans,
     double work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dormqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_dge_nancheck( matrix_layout, r, k, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, r, k, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_d_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( k, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dormqr_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_dormqr_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_dormqr( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dormqr_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_dormqr_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dormqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dormqr_work.c b/LAPACKE/src/lapacke_dormqr_work.c
index 2455774420..0cafc9c8e0 100644
--- a/LAPACKE/src/lapacke_dormqr_work.c
+++ b/LAPACKE/src/lapacke_dormqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dormqr_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dormqr_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const double* a, lapack_int lda,
                                 const double* tau, double* c, lapack_int ldc,
@@ -50,18 +50,18 @@ lapack_int LAPACKE_dormqr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lda_t = MAX(1,r);
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( lda < k ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dormqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormqr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dormqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -82,8 +82,8 @@ lapack_int LAPACKE_dormqr_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, r, k, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, r, k, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dormqr( &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t, &ldc_t,
                        work, &lwork, &info );
@@ -91,18 +91,18 @@ lapack_int LAPACKE_dormqr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dormqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dormqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dormrq.c b/LAPACKE/src/lapacke_dormrq.c
index cfa1deef21..bb4aeb8af7 100644
--- a/LAPACKE/src/lapacke_dormrq.c
+++ b/LAPACKE/src/lapacke_dormrq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dormrq( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dormrq)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const double* a, lapack_int lda, const double* tau,
                            double* c, lapack_int ldc )
@@ -42,25 +42,25 @@ lapack_int LAPACKE_dormrq( int matrix_layout, char side, char trans,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dormrq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormrq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, k, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, k, m, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_d_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( k, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dormrq_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_dormrq_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -73,13 +73,13 @@ lapack_int LAPACKE_dormrq( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dormrq_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_dormrq_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dormrq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormrq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dormrq_work.c b/LAPACKE/src/lapacke_dormrq_work.c
index f4372a186c..f9db22099b 100644
--- a/LAPACKE/src/lapacke_dormrq_work.c
+++ b/LAPACKE/src/lapacke_dormrq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dormrq_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dormrq_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const double* a, lapack_int lda,
                                 const double* tau, double* c, lapack_int ldc,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_dormrq_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dormrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormrq_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dormrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormrq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -80,8 +80,8 @@ lapack_int LAPACKE_dormrq_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, k, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dormrq( &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t, &ldc_t,
                        work, &lwork, &info );
@@ -89,18 +89,18 @@ lapack_int LAPACKE_dormrq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dormrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormrq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dormrq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormrq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dormrz.c b/LAPACKE/src/lapacke_dormrz.c
index 091248c1c2..2d2715f538 100644
--- a/LAPACKE/src/lapacke_dormrz.c
+++ b/LAPACKE/src/lapacke_dormrz.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dormrz( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dormrz)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            lapack_int l, const double* a, lapack_int lda,
                            const double* tau, double* c, lapack_int ldc )
@@ -42,25 +42,25 @@ lapack_int LAPACKE_dormrz( int matrix_layout, char side, char trans,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dormrz", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormrz", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, k, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, k, m, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -11;
         }
-        if( LAPACKE_d_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( k, tau, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dormrz_work( matrix_layout, side, trans, m, n, k, l, a, lda,
+    info = API_SUFFIX(LAPACKE_dormrz_work)( matrix_layout, side, trans, m, n, k, l, a, lda,
                                 tau, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -73,13 +73,13 @@ lapack_int LAPACKE_dormrz( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dormrz_work( matrix_layout, side, trans, m, n, k, l, a, lda,
+    info = API_SUFFIX(LAPACKE_dormrz_work)( matrix_layout, side, trans, m, n, k, l, a, lda,
                                 tau, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dormrz", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormrz", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dormrz_work.c b/LAPACKE/src/lapacke_dormrz_work.c
index c77cb505ce..07f59731a7 100644
--- a/LAPACKE/src/lapacke_dormrz_work.c
+++ b/LAPACKE/src/lapacke_dormrz_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dormrz_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dormrz_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 lapack_int l, const double* a, lapack_int lda,
                                 const double* tau, double* c, lapack_int ldc,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_dormrz_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dormrz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormrz_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dormrz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormrz_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -80,8 +80,8 @@ lapack_int LAPACKE_dormrz_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, k, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dormrz( &side, &trans, &m, &n, &k, &l, a_t, &lda_t, tau, c_t,
                        &ldc_t, work, &lwork, &info );
@@ -89,18 +89,18 @@ lapack_int LAPACKE_dormrz_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dormrz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormrz_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dormrz_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormrz_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dormtr.c b/LAPACKE/src/lapacke_dormtr.c
index 56add4b3fb..fbd7ff170f 100644
--- a/LAPACKE/src/lapacke_dormtr.c
+++ b/LAPACKE/src/lapacke_dormtr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dormtr( int matrix_layout, char side, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_dormtr)( int matrix_layout, char side, char uplo, char trans,
                            lapack_int m, lapack_int n, const double* a,
                            lapack_int lda, const double* tau, double* c,
                            lapack_int ldc )
@@ -43,26 +43,26 @@ lapack_int LAPACKE_dormtr( int matrix_layout, char side, char uplo, char trans,
     double work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dormtr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormtr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, r, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, r, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_d_nancheck( r-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( r-1, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dormtr_work( matrix_layout, side, uplo, trans, m, n, a, lda,
+    info = API_SUFFIX(LAPACKE_dormtr_work)( matrix_layout, side, uplo, trans, m, n, a, lda,
                                 tau, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_dormtr( int matrix_layout, char side, char uplo, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dormtr_work( matrix_layout, side, uplo, trans, m, n, a, lda,
+    info = API_SUFFIX(LAPACKE_dormtr_work)( matrix_layout, side, uplo, trans, m, n, a, lda,
                                 tau, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dormtr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormtr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dormtr_work.c b/LAPACKE/src/lapacke_dormtr_work.c
index cb53363d41..2a58d81c9f 100644
--- a/LAPACKE/src/lapacke_dormtr_work.c
+++ b/LAPACKE/src/lapacke_dormtr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dormtr_work( int matrix_layout, char side, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dormtr_work)( int matrix_layout, char side, char uplo,
                                 char trans, lapack_int m, lapack_int n,
                                 const double* a, lapack_int lda,
                                 const double* tau, double* c, lapack_int ldc,
@@ -49,18 +49,18 @@ lapack_int LAPACKE_dormtr_work( int matrix_layout, char side, char uplo,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lda_t = MAX(1,r);
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( lda < r ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dormtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormtr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dormtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormtr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -81,8 +81,8 @@ lapack_int LAPACKE_dormtr_work( int matrix_layout, char side, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, r, r, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, r, r, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dormtr( &side, &uplo, &trans, &m, &n, a_t, &lda_t, tau, c_t,
                        &ldc_t, work, &lwork, &info );
@@ -90,18 +90,18 @@ lapack_int LAPACKE_dormtr_work( int matrix_layout, char side, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dormtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormtr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dormtr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dormtr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpbcon.c b/LAPACKE/src/lapacke_dpbcon.c
index a5ef670e80..fd4efab0e7 100644
--- a/LAPACKE/src/lapacke_dpbcon.c
+++ b/LAPACKE/src/lapacke_dpbcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpbcon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpbcon)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, const double* ab, lapack_int ldab,
                            double anorm, double* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_dpbcon( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpbcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -7;
         }
     }
@@ -66,7 +66,7 @@ lapack_int LAPACKE_dpbcon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dpbcon_work( matrix_layout, uplo, n, kd, ab, ldab, anorm,
+    info = API_SUFFIX(LAPACKE_dpbcon_work)( matrix_layout, uplo, n, kd, ab, ldab, anorm,
                                 rcond, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -74,7 +74,7 @@ lapack_int LAPACKE_dpbcon( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dpbcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpbcon_work.c b/LAPACKE/src/lapacke_dpbcon_work.c
index a75a9152d0..0dcb89c588 100644
--- a/LAPACKE/src/lapacke_dpbcon_work.c
+++ b/LAPACKE/src/lapacke_dpbcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpbcon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpbcon_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, const double* ab,
                                 lapack_int ldab, double anorm, double* rcond,
                                 double* work, lapack_int* iwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_dpbcon_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dpbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbcon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_dpbcon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpbcon( &uplo, &n, &kd, ab_t, &ldab_t, &anorm, rcond, work,
                        iwork, &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_dpbcon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpbcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpbequ.c b/LAPACKE/src/lapacke_dpbequ.c
index c938b22937..da5c213655 100644
--- a/LAPACKE/src/lapacke_dpbequ.c
+++ b/LAPACKE/src/lapacke_dpbequ.c
@@ -32,22 +32,22 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpbequ( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpbequ)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, const double* ab, lapack_int ldab,
                            double* s, double* scond, double* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpbequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dpbequ_work( matrix_layout, uplo, n, kd, ab, ldab, s, scond,
+    return API_SUFFIX(LAPACKE_dpbequ_work)( matrix_layout, uplo, n, kd, ab, ldab, s, scond,
                                 amax );
 }
diff --git a/LAPACKE/src/lapacke_dpbequ_work.c b/LAPACKE/src/lapacke_dpbequ_work.c
index 9c00aebb0d..c0ce0ed1c5 100644
--- a/LAPACKE/src/lapacke_dpbequ_work.c
+++ b/LAPACKE/src/lapacke_dpbequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpbequ_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpbequ_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, const double* ab,
                                 lapack_int ldab, double* s, double* scond,
                                 double* amax )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dpbequ_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dpbequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbequ_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,7 +60,7 @@ lapack_int LAPACKE_dpbequ_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpbequ( &uplo, &n, &kd, ab_t, &ldab_t, s, scond, amax, &info );
         if( info < 0 ) {
@@ -70,11 +70,11 @@ lapack_int LAPACKE_dpbequ_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpbequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpbequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpbrfs.c b/LAPACKE/src/lapacke_dpbrfs.c
index 3c88bfdcf9..d86fb81c38 100644
--- a/LAPACKE/src/lapacke_dpbrfs.c
+++ b/LAPACKE/src/lapacke_dpbrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpbrfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpbrfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, lapack_int nrhs, const double* ab,
                            lapack_int ldab, const double* afb, lapack_int ldafb,
                            const double* b, lapack_int ldb, double* x,
@@ -42,22 +42,22 @@ lapack_int LAPACKE_dpbrfs( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpbrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_dpb_nancheck( matrix_layout, uplo, n, kd, afb, ldafb ) ) {
+        if( API_SUFFIX(LAPACKE_dpb_nancheck)( matrix_layout, uplo, n, kd, afb, ldafb ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -74,7 +74,7 @@ lapack_int LAPACKE_dpbrfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dpbrfs_work( matrix_layout, uplo, n, kd, nrhs, ab, ldab, afb,
+    info = API_SUFFIX(LAPACKE_dpbrfs_work)( matrix_layout, uplo, n, kd, nrhs, ab, ldab, afb,
                                 ldafb, b, ldb, x, ldx, ferr, berr, work,
                                 iwork );
     /* Release memory and exit */
@@ -83,7 +83,7 @@ lapack_int LAPACKE_dpbrfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dpbrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpbrfs_work.c b/LAPACKE/src/lapacke_dpbrfs_work.c
index df4ec65a14..5567146a74 100644
--- a/LAPACKE/src/lapacke_dpbrfs_work.c
+++ b/LAPACKE/src/lapacke_dpbrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpbrfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpbrfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, lapack_int nrhs,
                                 const double* ab, lapack_int ldab,
                                 const double* afb, lapack_int ldafb,
@@ -60,22 +60,22 @@ lapack_int LAPACKE_dpbrfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dpbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbrfs_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dpbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dpbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dpbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -100,11 +100,11 @@ lapack_int LAPACKE_dpbrfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_dpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        LAPACKE_dpb_trans( matrix_layout, uplo, n, kd, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_dpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dpb_trans)( matrix_layout, uplo, n, kd, afb, ldafb, afb_t,
                            ldafb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpbrfs( &uplo, &n, &kd, &nrhs, ab_t, &ldab_t, afb_t, &ldafb_t,
                        b_t, &ldb_t, x_t, &ldx_t, ferr, berr, work, iwork,
@@ -113,7 +113,7 @@ lapack_int LAPACKE_dpbrfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -124,11 +124,11 @@ lapack_int LAPACKE_dpbrfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpbrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpbstf.c b/LAPACKE/src/lapacke_dpbstf.c
index 5404aba9e4..56c28cc7e9 100644
--- a/LAPACKE/src/lapacke_dpbstf.c
+++ b/LAPACKE/src/lapacke_dpbstf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpbstf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpbstf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kb, double* bb, lapack_int ldbb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpbstf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbstf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_dpb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dpbstf_work( matrix_layout, uplo, n, kb, bb, ldbb );
+    return API_SUFFIX(LAPACKE_dpbstf_work)( matrix_layout, uplo, n, kb, bb, ldbb );
 }
diff --git a/LAPACKE/src/lapacke_dpbstf_work.c b/LAPACKE/src/lapacke_dpbstf_work.c
index d1521a6f5b..a9a335a04b 100644
--- a/LAPACKE/src/lapacke_dpbstf_work.c
+++ b/LAPACKE/src/lapacke_dpbstf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpbstf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpbstf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kb, double* bb, lapack_int ldbb )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_dpbstf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldbb < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dpbstf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbstf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,24 +58,24 @@ lapack_int LAPACKE_dpbstf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dpb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_dpb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpbstf( &uplo, &n, &kb, bb_t, &ldbb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dpb_trans( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
+        API_SUFFIX(LAPACKE_dpb_trans)( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
                            ldbb );
         /* Release memory and exit */
         LAPACKE_free( bb_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpbstf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbstf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpbstf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbstf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpbsv.c b/LAPACKE/src/lapacke_dpbsv.c
index f5daeaefcf..bf01e3e0a2 100644
--- a/LAPACKE/src/lapacke_dpbsv.c
+++ b/LAPACKE/src/lapacke_dpbsv.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpbsv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpbsv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int kd, lapack_int nrhs, double* ab,
                           lapack_int ldab, double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpbsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_dpbsv_work( matrix_layout, uplo, n, kd, nrhs, ab, ldab, b,
+    return API_SUFFIX(LAPACKE_dpbsv_work)( matrix_layout, uplo, n, kd, nrhs, ab, ldab, b,
                                ldb );
 }
diff --git a/LAPACKE/src/lapacke_dpbsv_work.c b/LAPACKE/src/lapacke_dpbsv_work.c
index 0d4ba28dec..0b84ed01c4 100644
--- a/LAPACKE/src/lapacke_dpbsv_work.c
+++ b/LAPACKE/src/lapacke_dpbsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpbsv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpbsv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int kd, lapack_int nrhs, double* ab,
                                lapack_int ldab, double* b, lapack_int ldb )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_dpbsv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dpbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbsv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dpbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,8 +71,8 @@ lapack_int LAPACKE_dpbsv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpbsv( &uplo, &n, &kd, &nrhs, ab_t, &ldab_t, b_t, &ldb_t,
                       &info );
@@ -80,20 +80,20 @@ lapack_int LAPACKE_dpbsv_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dpb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_dpb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpbsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpbsvx.c b/LAPACKE/src/lapacke_dpbsvx.c
index 60f2605978..fafa59e0ab 100644
--- a/LAPACKE/src/lapacke_dpbsvx.c
+++ b/LAPACKE/src/lapacke_dpbsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpbsvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpbsvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int kd, lapack_int nrhs, double* ab,
                            lapack_int ldab, double* afb, lapack_int ldafb,
                            char* equed, double* s, double* b, lapack_int ldb,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_dpbsvx( int matrix_layout, char fact, char uplo, lapack_int n
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpbsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_dpb_nancheck( matrix_layout, uplo, n, kd, afb, ldafb ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_dpb_nancheck)( matrix_layout, uplo, n, kd, afb, ldafb ) ) {
                 return -9;
             }
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            if( LAPACKE_d_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, s, 1 ) ) {
                 return -12;
             }
         }
@@ -79,7 +79,7 @@ lapack_int LAPACKE_dpbsvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dpbsvx_work( matrix_layout, fact, uplo, n, kd, nrhs, ab, ldab,
+    info = API_SUFFIX(LAPACKE_dpbsvx_work)( matrix_layout, fact, uplo, n, kd, nrhs, ab, ldab,
                                 afb, ldafb, equed, s, b, ldb, x, ldx, rcond,
                                 ferr, berr, work, iwork );
     /* Release memory and exit */
@@ -88,7 +88,7 @@ lapack_int LAPACKE_dpbsvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dpbsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpbsvx_work.c b/LAPACKE/src/lapacke_dpbsvx_work.c
index be99b7ad74..15917737b9 100644
--- a/LAPACKE/src/lapacke_dpbsvx_work.c
+++ b/LAPACKE/src/lapacke_dpbsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpbsvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dpbsvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int kd, lapack_int nrhs,
                                 double* ab, lapack_int ldab, double* afb,
                                 lapack_int ldafb, char* equed, double* s,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_dpbsvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dpbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbsvx_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dpbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbsvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_dpbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_dpbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -101,12 +101,12 @@ lapack_int LAPACKE_dpbsvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_dpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_dpb_trans( matrix_layout, uplo, n, kd, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_dpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_dpb_trans)( matrix_layout, uplo, n, kd, afb, ldafb, afb_t,
                                ldafb_t );
         }
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpbsvx( &fact, &uplo, &n, &kd, &nrhs, ab_t, &ldab_t, afb_t,
                        &ldafb_t, equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond,
@@ -115,16 +115,16 @@ lapack_int LAPACKE_dpbsvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_dpb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_dpb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                                ldab );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_dpb_trans( LAPACK_COL_MAJOR, uplo, n, kd, afb_t, ldafb_t,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_dpb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, afb_t, ldafb_t,
                                afb, ldafb );
         }
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -135,11 +135,11 @@ lapack_int LAPACKE_dpbsvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpbsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpbtrf.c b/LAPACKE/src/lapacke_dpbtrf.c
index c18992fd8b..1917084896 100644
--- a/LAPACKE/src/lapacke_dpbtrf.c
+++ b/LAPACKE/src/lapacke_dpbtrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpbtrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpbtrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, double* ab, lapack_int ldab )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpbtrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbtrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dpbtrf_work( matrix_layout, uplo, n, kd, ab, ldab );
+    return API_SUFFIX(LAPACKE_dpbtrf_work)( matrix_layout, uplo, n, kd, ab, ldab );
 }
diff --git a/LAPACKE/src/lapacke_dpbtrf_work.c b/LAPACKE/src/lapacke_dpbtrf_work.c
index d1e1bbcb09..a39cb5e028 100644
--- a/LAPACKE/src/lapacke_dpbtrf_work.c
+++ b/LAPACKE/src/lapacke_dpbtrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpbtrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpbtrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, double* ab, lapack_int ldab )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_dpbtrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dpbtrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbtrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,24 +58,24 @@ lapack_int LAPACKE_dpbtrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpbtrf( &uplo, &n, &kd, ab_t, &ldab_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dpb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_dpb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
         /* Release memory and exit */
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpbtrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbtrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpbtrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbtrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpbtrs.c b/LAPACKE/src/lapacke_dpbtrs.c
index de35260c55..4ef68d1731 100644
--- a/LAPACKE/src/lapacke_dpbtrs.c
+++ b/LAPACKE/src/lapacke_dpbtrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpbtrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpbtrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, lapack_int nrhs, const double* ab,
                            lapack_int ldab, double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpbtrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbtrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_dpbtrs_work( matrix_layout, uplo, n, kd, nrhs, ab, ldab, b,
+    return API_SUFFIX(LAPACKE_dpbtrs_work)( matrix_layout, uplo, n, kd, nrhs, ab, ldab, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_dpbtrs_work.c b/LAPACKE/src/lapacke_dpbtrs_work.c
index a87645a03c..8d2fc67791 100644
--- a/LAPACKE/src/lapacke_dpbtrs_work.c
+++ b/LAPACKE/src/lapacke_dpbtrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpbtrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpbtrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, lapack_int nrhs,
                                 const double* ab, lapack_int ldab, double* b,
                                 lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_dpbtrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dpbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbtrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dpbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbtrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,8 +72,8 @@ lapack_int LAPACKE_dpbtrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpbtrs( &uplo, &n, &kd, &nrhs, ab_t, &ldab_t, b_t, &ldb_t,
                        &info );
@@ -81,18 +81,18 @@ lapack_int LAPACKE_dpbtrs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbtrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpbtrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpbtrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpftrf.c b/LAPACKE/src/lapacke_dpftrf.c
index 444f4b945b..1e870a1412 100644
--- a/LAPACKE/src/lapacke_dpftrf.c
+++ b/LAPACKE/src/lapacke_dpftrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpftrf( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dpftrf)( int matrix_layout, char transr, char uplo,
                            lapack_int n, double* a )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpftrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpftrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpf_nancheck( n, a ) ) {
+        if( API_SUFFIX(LAPACKE_dpf_nancheck)( n, a ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dpftrf_work( matrix_layout, transr, uplo, n, a );
+    return API_SUFFIX(LAPACKE_dpftrf_work)( matrix_layout, transr, uplo, n, a );
 }
diff --git a/LAPACKE/src/lapacke_dpftrf_work.c b/LAPACKE/src/lapacke_dpftrf_work.c
index 289b5ab260..75e7d1928e 100644
--- a/LAPACKE/src/lapacke_dpftrf_work.c
+++ b/LAPACKE/src/lapacke_dpftrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpftrf_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dpftrf_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, double* a )
 {
     lapack_int info = 0;
@@ -52,23 +52,23 @@ lapack_int LAPACKE_dpftrf_work( int matrix_layout, char transr, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dpf_trans( matrix_layout, transr, uplo, n, a, a_t );
+        API_SUFFIX(LAPACKE_dpf_trans)( matrix_layout, transr, uplo, n, a, a_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpftrf( &transr, &uplo, &n, a_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dpf_trans( LAPACK_COL_MAJOR, transr, uplo, n, a_t, a );
+        API_SUFFIX(LAPACKE_dpf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, a_t, a );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpftrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpftrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpftrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpftrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpftri.c b/LAPACKE/src/lapacke_dpftri.c
index 367b670a69..65012f32b0 100644
--- a/LAPACKE/src/lapacke_dpftri.c
+++ b/LAPACKE/src/lapacke_dpftri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpftri( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dpftri)( int matrix_layout, char transr, char uplo,
                            lapack_int n, double* a )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpftri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpftri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpf_nancheck( n, a ) ) {
+        if( API_SUFFIX(LAPACKE_dpf_nancheck)( n, a ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dpftri_work( matrix_layout, transr, uplo, n, a );
+    return API_SUFFIX(LAPACKE_dpftri_work)( matrix_layout, transr, uplo, n, a );
 }
diff --git a/LAPACKE/src/lapacke_dpftri_work.c b/LAPACKE/src/lapacke_dpftri_work.c
index 7845489d2c..84626ebc04 100644
--- a/LAPACKE/src/lapacke_dpftri_work.c
+++ b/LAPACKE/src/lapacke_dpftri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpftri_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dpftri_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, double* a )
 {
     lapack_int info = 0;
@@ -52,23 +52,23 @@ lapack_int LAPACKE_dpftri_work( int matrix_layout, char transr, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dpf_trans( matrix_layout, transr, uplo, n, a, a_t );
+        API_SUFFIX(LAPACKE_dpf_trans)( matrix_layout, transr, uplo, n, a, a_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpftri( &transr, &uplo, &n, a_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dpf_trans( LAPACK_COL_MAJOR, transr, uplo, n, a_t, a );
+        API_SUFFIX(LAPACKE_dpf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, a_t, a );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpftri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpftri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpftri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpftri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpftrs.c b/LAPACKE/src/lapacke_dpftrs.c
index 3ed9450384..795edd0bb9 100644
--- a/LAPACKE/src/lapacke_dpftrs.c
+++ b/LAPACKE/src/lapacke_dpftrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpftrs( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dpftrs)( int matrix_layout, char transr, char uplo,
                            lapack_int n, lapack_int nrhs, const double* a,
                            double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpftrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpftrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpf_nancheck( n, a ) ) {
+        if( API_SUFFIX(LAPACKE_dpf_nancheck)( n, a ) ) {
             return -6;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_dpftrs_work( matrix_layout, transr, uplo, n, nrhs, a, b,
+    return API_SUFFIX(LAPACKE_dpftrs_work)( matrix_layout, transr, uplo, n, nrhs, a, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_dpftrs_work.c b/LAPACKE/src/lapacke_dpftrs_work.c
index c5a826d16f..ffddfc83e1 100644
--- a/LAPACKE/src/lapacke_dpftrs_work.c
+++ b/LAPACKE/src/lapacke_dpftrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpftrs_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dpftrs_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, lapack_int nrhs, const double* a,
                                 double* b, lapack_int ldb )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dpftrs_work( int matrix_layout, char transr, char uplo,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dpftrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpftrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,26 +66,26 @@ lapack_int LAPACKE_dpftrs_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dpf_trans( matrix_layout, transr, uplo, n, a, a_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dpf_trans)( matrix_layout, transr, uplo, n, a, a_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpftrs( &transr, &uplo, &n, &nrhs, a_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpftrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpftrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpftrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpftrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpocon.c b/LAPACKE/src/lapacke_dpocon.c
index faca6f32b7..9658ec8f22 100644
--- a/LAPACKE/src/lapacke_dpocon.c
+++ b/LAPACKE/src/lapacke_dpocon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpocon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpocon)( int matrix_layout, char uplo, lapack_int n,
                            const double* a, lapack_int lda, double anorm,
                            double* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_dpocon( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpocon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpocon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -6;
         }
     }
@@ -66,7 +66,7 @@ lapack_int LAPACKE_dpocon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dpocon_work( matrix_layout, uplo, n, a, lda, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_dpocon_work)( matrix_layout, uplo, n, a, lda, anorm, rcond,
                                 work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -74,7 +74,7 @@ lapack_int LAPACKE_dpocon( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dpocon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpocon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpocon_work.c b/LAPACKE/src/lapacke_dpocon_work.c
index 12537eb065..0f1d6b32a9 100644
--- a/LAPACKE/src/lapacke_dpocon_work.c
+++ b/LAPACKE/src/lapacke_dpocon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpocon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpocon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const double* a, lapack_int lda, double anorm,
                                 double* rcond, double* work, lapack_int* iwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dpocon_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dpocon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpocon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,7 +59,7 @@ lapack_int LAPACKE_dpocon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpocon( &uplo, &n, a_t, &lda_t, &anorm, rcond, work, iwork,
                        &info );
@@ -70,11 +70,11 @@ lapack_int LAPACKE_dpocon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpocon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpocon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpocon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpocon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpoequ.c b/LAPACKE/src/lapacke_dpoequ.c
index c31be21395..d96b60e400 100644
--- a/LAPACKE/src/lapacke_dpoequ.c
+++ b/LAPACKE/src/lapacke_dpoequ.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpoequ( int matrix_layout, lapack_int n, const double* a,
+lapack_int API_SUFFIX(LAPACKE_dpoequ)( int matrix_layout, lapack_int n, const double* a,
                            lapack_int lda, double* s, double* scond,
                            double* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpoequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpoequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_dpoequ_work( matrix_layout, n, a, lda, s, scond, amax );
+    return API_SUFFIX(LAPACKE_dpoequ_work)( matrix_layout, n, a, lda, s, scond, amax );
 }
diff --git a/LAPACKE/src/lapacke_dpoequ_work.c b/LAPACKE/src/lapacke_dpoequ_work.c
index f1d1fb743c..d248a638ee 100644
--- a/LAPACKE/src/lapacke_dpoequ_work.c
+++ b/LAPACKE/src/lapacke_dpoequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpoequ_work( int matrix_layout, lapack_int n, const double* a,
+lapack_int API_SUFFIX(LAPACKE_dpoequ_work)( int matrix_layout, lapack_int n, const double* a,
                                 lapack_int lda, double* s, double* scond,
                                 double* amax )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dpoequ_work( int matrix_layout, lapack_int n, const double* a
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -4;
-            LAPACKE_xerbla( "LAPACKE_dpoequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpoequ_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,7 +59,7 @@ lapack_int LAPACKE_dpoequ_work( int matrix_layout, lapack_int n, const double* a
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpoequ( &n, a_t, &lda_t, s, scond, amax, &info );
         if( info < 0 ) {
@@ -69,11 +69,11 @@ lapack_int LAPACKE_dpoequ_work( int matrix_layout, lapack_int n, const double* a
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpoequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpoequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpoequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpoequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpoequb.c b/LAPACKE/src/lapacke_dpoequb.c
index 661008de7f..f9c668dfdb 100644
--- a/LAPACKE/src/lapacke_dpoequb.c
+++ b/LAPACKE/src/lapacke_dpoequb.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpoequb( int matrix_layout, lapack_int n, const double* a,
+lapack_int API_SUFFIX(LAPACKE_dpoequb)( int matrix_layout, lapack_int n, const double* a,
                             lapack_int lda, double* s, double* scond,
                             double* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpoequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpoequb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_dpoequb_work( matrix_layout, n, a, lda, s, scond, amax );
+    return API_SUFFIX(LAPACKE_dpoequb_work)( matrix_layout, n, a, lda, s, scond, amax );
 }
diff --git a/LAPACKE/src/lapacke_dpoequb_work.c b/LAPACKE/src/lapacke_dpoequb_work.c
index c59c251d9c..ee44ece2dc 100644
--- a/LAPACKE/src/lapacke_dpoequb_work.c
+++ b/LAPACKE/src/lapacke_dpoequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpoequb_work( int matrix_layout, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpoequb_work)( int matrix_layout, lapack_int n,
                                  const double* a, lapack_int lda, double* s,
                                  double* scond, double* amax )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dpoequb_work( int matrix_layout, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -4;
-            LAPACKE_xerbla( "LAPACKE_dpoequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpoequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,7 +59,7 @@ lapack_int LAPACKE_dpoequb_work( int matrix_layout, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpoequb( &n, a_t, &lda_t, s, scond, amax, &info );
         if( info < 0 ) {
@@ -69,11 +69,11 @@ lapack_int LAPACKE_dpoequb_work( int matrix_layout, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpoequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpoequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpoequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpoequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dporfs.c b/LAPACKE/src/lapacke_dporfs.c
index b55e84ce6c..5d1984d6fd 100644
--- a/LAPACKE/src/lapacke_dporfs.c
+++ b/LAPACKE/src/lapacke_dporfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dporfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dporfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const double* a, lapack_int lda,
                            const double* af, lapack_int ldaf, const double* b,
                            lapack_int ldb, double* x, lapack_int ldx,
@@ -42,22 +42,22 @@ lapack_int LAPACKE_dporfs( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dporfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dporfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dpo_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_dpo_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -11;
         }
     }
@@ -74,7 +74,7 @@ lapack_int LAPACKE_dporfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dporfs_work( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
+    info = API_SUFFIX(LAPACKE_dporfs_work)( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
                                 b, ldb, x, ldx, ferr, berr, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -82,7 +82,7 @@ lapack_int LAPACKE_dporfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dporfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dporfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dporfs_work.c b/LAPACKE/src/lapacke_dporfs_work.c
index 79e04ce3fb..9f8ad65eca 100644
--- a/LAPACKE/src/lapacke_dporfs_work.c
+++ b/LAPACKE/src/lapacke_dporfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dporfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dporfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const double* a,
                                 lapack_int lda, const double* af,
                                 lapack_int ldaf, const double* b,
@@ -60,22 +60,22 @@ lapack_int LAPACKE_dporfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dporfs_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dporfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dporfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dporfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -100,10 +100,10 @@ lapack_int LAPACKE_dporfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_dpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dpo_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dpo_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dporfs( &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, iwork, &info );
@@ -111,7 +111,7 @@ lapack_int LAPACKE_dporfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -122,11 +122,11 @@ lapack_int LAPACKE_dporfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dporfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dporfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dporfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dporfsx.c b/LAPACKE/src/lapacke_dporfsx.c
index 2cb74dad1d..86314f8b40 100644
--- a/LAPACKE/src/lapacke_dporfsx.c
+++ b/LAPACKE/src/lapacke_dporfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dporfsx( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_dporfsx)( int matrix_layout, char uplo, char equed,
                             lapack_int n, lapack_int nrhs, const double* a,
                             lapack_int lda, const double* af, lapack_int ldaf,
                             const double* s, const double* b, lapack_int ldb,
@@ -45,32 +45,32 @@ lapack_int LAPACKE_dporfsx( int matrix_layout, char uplo, char equed,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dporfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dporfsx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -21;
             }
         }
-        if( LAPACKE_lsame( equed, 'y' ) ) {
-            if( LAPACKE_d_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, s, 1 ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -13;
         }
     }
@@ -87,7 +87,7 @@ lapack_int LAPACKE_dporfsx( int matrix_layout, char uplo, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dporfsx_work( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_dporfsx_work)( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
                                  ldaf, s, b, ldb, x, ldx, rcond, berr,
                                  n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, iwork );
@@ -97,7 +97,7 @@ lapack_int LAPACKE_dporfsx( int matrix_layout, char uplo, char equed,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dporfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dporfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dporfsx_work.c b/LAPACKE/src/lapacke_dporfsx_work.c
index c43dff18a9..2328c82723 100644
--- a/LAPACKE/src/lapacke_dporfsx_work.c
+++ b/LAPACKE/src/lapacke_dporfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dporfsx_work( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_dporfsx_work)( int matrix_layout, char uplo, char equed,
                                  lapack_int n, lapack_int nrhs, const double* a,
                                  lapack_int lda, const double* af,
                                  lapack_int ldaf, const double* s,
@@ -66,22 +66,22 @@ lapack_int LAPACKE_dporfsx_work( int matrix_layout, char uplo, char equed,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dporfsx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dporfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dporfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_dporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dporfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -118,10 +118,10 @@ lapack_int LAPACKE_dporfsx_work( int matrix_layout, char uplo, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dporfsx( &uplo, &equed, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, s,
                         b_t, &ldb_t, x_t, &ldx_t, rcond, berr, &n_err_bnds,
@@ -131,10 +131,10 @@ lapack_int LAPACKE_dporfsx_work( int matrix_layout, char uplo, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -150,11 +150,11 @@ lapack_int LAPACKE_dporfsx_work( int matrix_layout, char uplo, char equed,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dporfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dporfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dporfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dposv.c b/LAPACKE/src/lapacke_dposv.c
index 1ca4b4d389..41eab3f44c 100644
--- a/LAPACKE/src/lapacke_dposv.c
+++ b/LAPACKE/src/lapacke_dposv.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dposv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dposv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, double* a, lapack_int lda, double* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dposv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_dposv_work( matrix_layout, uplo, n, nrhs, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_dposv_work)( matrix_layout, uplo, n, nrhs, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dposv_work.c b/LAPACKE/src/lapacke_dposv_work.c
index afdb6d6eee..e07398dec6 100644
--- a/LAPACKE/src/lapacke_dposv_work.c
+++ b/LAPACKE/src/lapacke_dposv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dposv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dposv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, double* a, lapack_int lda,
                                double* b, lapack_int ldb )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_dposv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,27 +71,27 @@ lapack_int LAPACKE_dposv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dposv( &uplo, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dposv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dposvx.c b/LAPACKE/src/lapacke_dposvx.c
index cc2fbc8a87..2b9b1d8de8 100644
--- a/LAPACKE/src/lapacke_dposvx.c
+++ b/LAPACKE/src/lapacke_dposvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dposvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dposvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, double* a, lapack_int lda,
                            double* af, lapack_int ldaf, char* equed, double* s,
                            double* b, lapack_int ldb, double* x, lapack_int ldx,
@@ -42,25 +42,25 @@ lapack_int LAPACKE_dposvx( int matrix_layout, char fact, char uplo, lapack_int n
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dposvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_dpo_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_dpo_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            if( LAPACKE_d_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, s, 1 ) ) {
                 return -11;
             }
         }
@@ -78,7 +78,7 @@ lapack_int LAPACKE_dposvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dposvx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_dposvx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                 ldaf, equed, s, b, ldb, x, ldx, rcond, ferr,
                                 berr, work, iwork );
     /* Release memory and exit */
@@ -87,7 +87,7 @@ lapack_int LAPACKE_dposvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dposvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dposvx_work.c b/LAPACKE/src/lapacke_dposvx_work.c
index f5967c5eb5..7437dcffb8 100644
--- a/LAPACKE/src/lapacke_dposvx_work.c
+++ b/LAPACKE/src/lapacke_dposvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dposvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dposvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs, double* a,
                                 lapack_int lda, double* af, lapack_int ldaf,
                                 char* equed, double* s, double* b,
@@ -60,22 +60,22 @@ lapack_int LAPACKE_dposvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposvx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -100,11 +100,11 @@ lapack_int LAPACKE_dposvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_dpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_dpo_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_dpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_dpo_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dposvx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                        equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr, berr,
@@ -113,15 +113,15 @@ lapack_int LAPACKE_dposvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_dpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_dpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_dpo_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_dpo_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -132,11 +132,11 @@ lapack_int LAPACKE_dposvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dposvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dposvxx.c b/LAPACKE/src/lapacke_dposvxx.c
index aca5eb1b58..611d2fc850 100644
--- a/LAPACKE/src/lapacke_dposvxx.c
+++ b/LAPACKE/src/lapacke_dposvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dposvxx( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dposvxx)( int matrix_layout, char fact, char uplo,
                             lapack_int n, lapack_int nrhs, double* a,
                             lapack_int lda, double* af, lapack_int ldaf,
                             char* equed, double* s, double* b, lapack_int ldb,
@@ -45,30 +45,30 @@ lapack_int LAPACKE_dposvxx( int matrix_layout, char fact, char uplo,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dposvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposvxx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_dpo_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_dpo_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -23;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            if( LAPACKE_d_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, s, 1 ) ) {
                 return -11;
             }
         }
@@ -86,7 +86,7 @@ lapack_int LAPACKE_dposvxx( int matrix_layout, char fact, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dposvxx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_dposvxx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                  ldaf, equed, s, b, ldb, x, ldx, rcond, rpvgrw,
                                  berr, n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, iwork );
@@ -96,7 +96,7 @@ lapack_int LAPACKE_dposvxx( int matrix_layout, char fact, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dposvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dposvxx_work.c b/LAPACKE/src/lapacke_dposvxx_work.c
index a14cf72b2a..e84ba8b803 100644
--- a/LAPACKE/src/lapacke_dposvxx_work.c
+++ b/LAPACKE/src/lapacke_dposvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dposvxx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dposvxx_work)( int matrix_layout, char fact, char uplo,
                                  lapack_int n, lapack_int nrhs, double* a,
                                  lapack_int lda, double* af, lapack_int ldaf,
                                  char* equed, double* s, double* b,
@@ -67,22 +67,22 @@ lapack_int LAPACKE_dposvxx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposvxx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -119,11 +119,11 @@ lapack_int LAPACKE_dposvxx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_dpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_dpo_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_dpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_dpo_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dposvxx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond, rpvgrw, berr,
@@ -133,18 +133,18 @@ lapack_int LAPACKE_dposvxx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_dpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_dpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_dpo_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_dpo_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -160,11 +160,11 @@ lapack_int LAPACKE_dposvxx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dposvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dposvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpotrf.c b/LAPACKE/src/lapacke_dpotrf.c
index 6915b607df..8c2cb63fb1 100644
--- a/LAPACKE/src/lapacke_dpotrf.c
+++ b/LAPACKE/src/lapacke_dpotrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpotrf( int matrix_layout, char uplo, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dpotrf)( int matrix_layout, char uplo, lapack_int n, double* a,
                            lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpotrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpotrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dpotrf_work( matrix_layout, uplo, n, a, lda );
+    return API_SUFFIX(LAPACKE_dpotrf_work)( matrix_layout, uplo, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_dpotrf2.c b/LAPACKE/src/lapacke_dpotrf2.c
index f3498f9874..c9052aa389 100644
--- a/LAPACKE/src/lapacke_dpotrf2.c
+++ b/LAPACKE/src/lapacke_dpotrf2.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpotrf2( int matrix_layout, char uplo, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dpotrf2)( int matrix_layout, char uplo, lapack_int n, double* a,
                            lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpotrf2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpotrf2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dpotrf2_work( matrix_layout, uplo, n, a, lda );
+    return API_SUFFIX(LAPACKE_dpotrf2_work)( matrix_layout, uplo, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_dpotrf2_work.c b/LAPACKE/src/lapacke_dpotrf2_work.c
index de5720b6a8..316546f79e 100644
--- a/LAPACKE/src/lapacke_dpotrf2_work.c
+++ b/LAPACKE/src/lapacke_dpotrf2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpotrf2_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpotrf2_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_dpotrf2_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dpotrf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpotrf2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,23 +58,23 @@ lapack_int LAPACKE_dpotrf2_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpotrf2( &uplo, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpotrf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpotrf2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpotrf2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpotrf2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpotrf_work.c b/LAPACKE/src/lapacke_dpotrf_work.c
index 6bb5cb3a6c..b9910ad7ce 100644
--- a/LAPACKE/src/lapacke_dpotrf_work.c
+++ b/LAPACKE/src/lapacke_dpotrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpotrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpotrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_dpotrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dpotrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpotrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,23 +58,23 @@ lapack_int LAPACKE_dpotrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpotrf( &uplo, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpotrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpotrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpotrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpotrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpotri.c b/LAPACKE/src/lapacke_dpotri.c
index 41084ab966..b0746d7969 100644
--- a/LAPACKE/src/lapacke_dpotri.c
+++ b/LAPACKE/src/lapacke_dpotri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpotri( int matrix_layout, char uplo, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dpotri)( int matrix_layout, char uplo, lapack_int n, double* a,
                            lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpotri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpotri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dpotri_work( matrix_layout, uplo, n, a, lda );
+    return API_SUFFIX(LAPACKE_dpotri_work)( matrix_layout, uplo, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_dpotri_work.c b/LAPACKE/src/lapacke_dpotri_work.c
index 6e84a886ae..08c9f543d5 100644
--- a/LAPACKE/src/lapacke_dpotri_work.c
+++ b/LAPACKE/src/lapacke_dpotri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpotri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpotri_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_dpotri_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dpotri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpotri_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,23 +58,23 @@ lapack_int LAPACKE_dpotri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpotri( &uplo, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpotri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpotri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpotri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpotri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpotrs.c b/LAPACKE/src/lapacke_dpotrs.c
index eeb355bd7a..b42acc1f8f 100644
--- a/LAPACKE/src/lapacke_dpotrs.c
+++ b/LAPACKE/src/lapacke_dpotrs.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpotrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpotrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const double* a, lapack_int lda,
                            double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpotrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpotrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_dpotrs_work( matrix_layout, uplo, n, nrhs, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_dpotrs_work)( matrix_layout, uplo, n, nrhs, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dpotrs_work.c b/LAPACKE/src/lapacke_dpotrs_work.c
index 11307f5ed3..498c12c7ae 100644
--- a/LAPACKE/src/lapacke_dpotrs_work.c
+++ b/LAPACKE/src/lapacke_dpotrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpotrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpotrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const double* a,
                                 lapack_int lda, double* b, lapack_int ldb )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_dpotrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dpotrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpotrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dpotrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpotrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,26 +71,26 @@ lapack_int LAPACKE_dpotrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpotrs( &uplo, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpotrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpotrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpotrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpotrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dppcon.c b/LAPACKE/src/lapacke_dppcon.c
index ffe002fa8e..f0834c7519 100644
--- a/LAPACKE/src/lapacke_dppcon.c
+++ b/LAPACKE/src/lapacke_dppcon.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dppcon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dppcon)( int matrix_layout, char uplo, lapack_int n,
                            const double* ap, double anorm, double* rcond )
 {
     lapack_int info = 0;
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dppcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dppcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_dpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dpp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
@@ -65,7 +65,7 @@ lapack_int LAPACKE_dppcon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dppcon_work( matrix_layout, uplo, n, ap, anorm, rcond, work,
+    info = API_SUFFIX(LAPACKE_dppcon_work)( matrix_layout, uplo, n, ap, anorm, rcond, work,
                                 iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -73,7 +73,7 @@ lapack_int LAPACKE_dppcon( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dppcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dppcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dppcon_work.c b/LAPACKE/src/lapacke_dppcon_work.c
index 09a8e28384..e4544d9ea3 100644
--- a/LAPACKE/src/lapacke_dppcon_work.c
+++ b/LAPACKE/src/lapacke_dppcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dppcon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dppcon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const double* ap, double anorm, double* rcond,
                                 double* work, lapack_int* iwork )
 {
@@ -53,7 +53,7 @@ lapack_int LAPACKE_dppcon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dppcon( &uplo, &n, ap_t, &anorm, rcond, work, iwork, &info );
         if( info < 0 ) {
@@ -63,11 +63,11 @@ lapack_int LAPACKE_dppcon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dppcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dppcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dppcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dppcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dppequ.c b/LAPACKE/src/lapacke_dppequ.c
index d9de7cf765..14532157cc 100644
--- a/LAPACKE/src/lapacke_dppequ.c
+++ b/LAPACKE/src/lapacke_dppequ.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dppequ( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dppequ)( int matrix_layout, char uplo, lapack_int n,
                            const double* ap, double* s, double* scond,
                            double* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dppequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dppequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dpp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dppequ_work( matrix_layout, uplo, n, ap, s, scond, amax );
+    return API_SUFFIX(LAPACKE_dppequ_work)( matrix_layout, uplo, n, ap, s, scond, amax );
 }
diff --git a/LAPACKE/src/lapacke_dppequ_work.c b/LAPACKE/src/lapacke_dppequ_work.c
index 8b7513c238..d441b43b72 100644
--- a/LAPACKE/src/lapacke_dppequ_work.c
+++ b/LAPACKE/src/lapacke_dppequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dppequ_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dppequ_work)( int matrix_layout, char uplo, lapack_int n,
                                 const double* ap, double* s, double* scond,
                                 double* amax )
 {
@@ -53,7 +53,7 @@ lapack_int LAPACKE_dppequ_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dppequ( &uplo, &n, ap_t, s, scond, amax, &info );
         if( info < 0 ) {
@@ -63,11 +63,11 @@ lapack_int LAPACKE_dppequ_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dppequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dppequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dppequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dppequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpprfs.c b/LAPACKE/src/lapacke_dpprfs.c
index e16f25e7a2..fa5e5110a2 100644
--- a/LAPACKE/src/lapacke_dpprfs.c
+++ b/LAPACKE/src/lapacke_dpprfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpprfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpprfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const double* ap, const double* afp,
                            const double* b, lapack_int ldb, double* x,
                            lapack_int ldx, double* ferr, double* berr )
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dpprfs( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpprfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpprfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_dpp_nancheck)( n, afp ) ) {
             return -6;
         }
-        if( LAPACKE_dpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dpp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -9;
         }
     }
@@ -73,7 +73,7 @@ lapack_int LAPACKE_dpprfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dpprfs_work( matrix_layout, uplo, n, nrhs, ap, afp, b, ldb, x,
+    info = API_SUFFIX(LAPACKE_dpprfs_work)( matrix_layout, uplo, n, nrhs, ap, afp, b, ldb, x,
                                 ldx, ferr, berr, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -81,7 +81,7 @@ lapack_int LAPACKE_dpprfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dpprfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpprfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpprfs_work.c b/LAPACKE/src/lapacke_dpprfs_work.c
index f88877800d..5c42c009a8 100644
--- a/LAPACKE/src/lapacke_dpprfs_work.c
+++ b/LAPACKE/src/lapacke_dpprfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpprfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpprfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const double* ap,
                                 const double* afp, const double* b,
                                 lapack_int ldb, double* x, lapack_int ldx,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_dpprfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dpprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpprfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dpprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpprfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -89,10 +89,10 @@ lapack_int LAPACKE_dpprfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
-        LAPACKE_dpp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_dpp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dpp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dpp_trans)( matrix_layout, uplo, n, afp, afp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpprfs( &uplo, &n, &nrhs, ap_t, afp_t, b_t, &ldb_t, x_t, &ldx_t,
                        ferr, berr, work, iwork, &info );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_dpprfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( afp_t );
 exit_level_3:
@@ -111,11 +111,11 @@ lapack_int LAPACKE_dpprfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpprfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpprfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpprfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dppsv.c b/LAPACKE/src/lapacke_dppsv.c
index ef3dc82a2a..ae4a69f3bc 100644
--- a/LAPACKE/src/lapacke_dppsv.c
+++ b/LAPACKE/src/lapacke_dppsv.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dppsv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dppsv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, double* ap, double* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dppsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dppsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dpp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_dppsv_work( matrix_layout, uplo, n, nrhs, ap, b, ldb );
+    return API_SUFFIX(LAPACKE_dppsv_work)( matrix_layout, uplo, n, nrhs, ap, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dppsv_work.c b/LAPACKE/src/lapacke_dppsv_work.c
index 4e1ff98b2c..3a1515ecc2 100644
--- a/LAPACKE/src/lapacke_dppsv_work.c
+++ b/LAPACKE/src/lapacke_dppsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dppsv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dppsv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, double* ap, double* b,
                                lapack_int ldb )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dppsv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dppsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dppsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,27 +66,27 @@ lapack_int LAPACKE_dppsv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dppsv( &uplo, &n, &nrhs, ap_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_dpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dppsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dppsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dppsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dppsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dppsvx.c b/LAPACKE/src/lapacke_dppsvx.c
index a8bf715236..6d294067ba 100644
--- a/LAPACKE/src/lapacke_dppsvx.c
+++ b/LAPACKE/src/lapacke_dppsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dppsvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dppsvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, double* ap, double* afp,
                            char* equed, double* s, double* b, lapack_int ldb,
                            double* x, lapack_int ldx, double* rcond,
@@ -42,25 +42,25 @@ lapack_int LAPACKE_dppsvx( int matrix_layout, char fact, char uplo, lapack_int n
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dppsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dppsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_dpp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_dpp_nancheck)( n, afp ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_dpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dpp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            if( LAPACKE_d_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, s, 1 ) ) {
                 return -9;
             }
         }
@@ -78,7 +78,7 @@ lapack_int LAPACKE_dppsvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dppsvx_work( matrix_layout, fact, uplo, n, nrhs, ap, afp,
+    info = API_SUFFIX(LAPACKE_dppsvx_work)( matrix_layout, fact, uplo, n, nrhs, ap, afp,
                                 equed, s, b, ldb, x, ldx, rcond, ferr, berr,
                                 work, iwork );
     /* Release memory and exit */
@@ -87,7 +87,7 @@ lapack_int LAPACKE_dppsvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dppsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dppsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dppsvx_work.c b/LAPACKE/src/lapacke_dppsvx_work.c
index 5eafa8681e..d99930431b 100644
--- a/LAPACKE/src/lapacke_dppsvx_work.c
+++ b/LAPACKE/src/lapacke_dppsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dppsvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dppsvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs, double* ap,
                                 double* afp, char* equed, double* s, double* b,
                                 lapack_int ldb, double* x, lapack_int ldx,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_dppsvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dppsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dppsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dppsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dppsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -89,10 +89,10 @@ lapack_int LAPACKE_dppsvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dpp_trans( matrix_layout, uplo, n, ap, ap_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_dpp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dpp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_dpp_trans)( matrix_layout, uplo, n, afp, afp_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dppsvx( &fact, &uplo, &n, &nrhs, ap_t, afp_t, equed, s, b_t,
@@ -102,13 +102,13 @@ lapack_int LAPACKE_dppsvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_dpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_dpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_dpp_trans( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_dpp_trans)( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
         }
         /* Release memory and exit */
         LAPACKE_free( afp_t );
@@ -120,11 +120,11 @@ lapack_int LAPACKE_dppsvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dppsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dppsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dppsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dppsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpptrf.c b/LAPACKE/src/lapacke_dpptrf.c
index 777345a8b6..3fdc01c3fe 100644
--- a/LAPACKE/src/lapacke_dpptrf.c
+++ b/LAPACKE/src/lapacke_dpptrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpptrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpptrf)( int matrix_layout, char uplo, lapack_int n,
                            double* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpptrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpptrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dpp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dpptrf_work( matrix_layout, uplo, n, ap );
+    return API_SUFFIX(LAPACKE_dpptrf_work)( matrix_layout, uplo, n, ap );
 }
diff --git a/LAPACKE/src/lapacke_dpptrf_work.c b/LAPACKE/src/lapacke_dpptrf_work.c
index ff66fde216..37482b4320 100644
--- a/LAPACKE/src/lapacke_dpptrf_work.c
+++ b/LAPACKE/src/lapacke_dpptrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpptrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpptrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* ap )
 {
     lapack_int info = 0;
@@ -52,23 +52,23 @@ lapack_int LAPACKE_dpptrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpptrf( &uplo, &n, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpptrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpptrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpptrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpptrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpptri.c b/LAPACKE/src/lapacke_dpptri.c
index e798ae11f7..f25f5cdef1 100644
--- a/LAPACKE/src/lapacke_dpptri.c
+++ b/LAPACKE/src/lapacke_dpptri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpptri( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpptri)( int matrix_layout, char uplo, lapack_int n,
                            double* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpptri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpptri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dpp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dpptri_work( matrix_layout, uplo, n, ap );
+    return API_SUFFIX(LAPACKE_dpptri_work)( matrix_layout, uplo, n, ap );
 }
diff --git a/LAPACKE/src/lapacke_dpptri_work.c b/LAPACKE/src/lapacke_dpptri_work.c
index ca88281882..882adbf096 100644
--- a/LAPACKE/src/lapacke_dpptri_work.c
+++ b/LAPACKE/src/lapacke_dpptri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpptri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpptri_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* ap )
 {
     lapack_int info = 0;
@@ -52,23 +52,23 @@ lapack_int LAPACKE_dpptri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpptri( &uplo, &n, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpptri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpptri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpptri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpptri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpptrs.c b/LAPACKE/src/lapacke_dpptrs.c
index ff6198cd23..fdda07065a 100644
--- a/LAPACKE/src/lapacke_dpptrs.c
+++ b/LAPACKE/src/lapacke_dpptrs.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpptrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpptrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const double* ap, double* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpptrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpptrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dpp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_dpptrs_work( matrix_layout, uplo, n, nrhs, ap, b, ldb );
+    return API_SUFFIX(LAPACKE_dpptrs_work)( matrix_layout, uplo, n, nrhs, ap, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dpptrs_work.c b/LAPACKE/src/lapacke_dpptrs_work.c
index 25312dbca4..37cb76624f 100644
--- a/LAPACKE/src/lapacke_dpptrs_work.c
+++ b/LAPACKE/src/lapacke_dpptrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpptrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpptrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const double* ap, double* b,
                                 lapack_int ldb )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dpptrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dpptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpptrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,26 +66,26 @@ lapack_int LAPACKE_dpptrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpptrs( &uplo, &n, &nrhs, ap_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpptrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpptrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpptrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpstrf.c b/LAPACKE/src/lapacke_dpstrf.c
index c153d665a9..8bd5edee82 100644
--- a/LAPACKE/src/lapacke_dpstrf.c
+++ b/LAPACKE/src/lapacke_dpstrf.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpstrf( int matrix_layout, char uplo, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dpstrf)( int matrix_layout, char uplo, lapack_int n, double* a,
                            lapack_int lda, lapack_int* piv, lapack_int* rank,
                            double tol )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpstrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpstrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( 1, &tol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &tol, 1 ) ) {
             return -8;
         }
     }
@@ -60,13 +60,13 @@ lapack_int LAPACKE_dpstrf( int matrix_layout, char uplo, lapack_int n, double* a
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dpstrf_work( matrix_layout, uplo, n, a, lda, piv, rank, tol,
+    info = API_SUFFIX(LAPACKE_dpstrf_work)( matrix_layout, uplo, n, a, lda, piv, rank, tol,
                                 work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dpstrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpstrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpstrf_work.c b/LAPACKE/src/lapacke_dpstrf_work.c
index fa9a729cdc..b2b2135e54 100644
--- a/LAPACKE/src/lapacke_dpstrf_work.c
+++ b/LAPACKE/src/lapacke_dpstrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpstrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpstrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* a, lapack_int lda, lapack_int* piv,
                                 lapack_int* rank, double tol, double* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dpstrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dpstrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpstrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_dpstrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpstrf( &uplo, &n, a_t, &lda_t, piv, rank, &tol, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpstrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpstrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpstrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpstrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dptcon.c b/LAPACKE/src/lapacke_dptcon.c
index 7279485e9d..2a5b993872 100644
--- a/LAPACKE/src/lapacke_dptcon.c
+++ b/LAPACKE/src/lapacke_dptcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dptcon( lapack_int n, const double* d, const double* e,
+lapack_int API_SUFFIX(LAPACKE_dptcon)( lapack_int n, const double* d, const double* e,
                            double anorm, double* rcond )
 {
     lapack_int info = 0;
@@ -40,13 +40,13 @@ lapack_int LAPACKE_dptcon( lapack_int n, const double* d, const double* e,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -3;
         }
     }
@@ -58,12 +58,12 @@ lapack_int LAPACKE_dptcon( lapack_int n, const double* d, const double* e,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dptcon_work( n, d, e, anorm, rcond, work );
+    info = API_SUFFIX(LAPACKE_dptcon_work)( n, d, e, anorm, rcond, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dptcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dptcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dptcon_work.c b/LAPACKE/src/lapacke_dptcon_work.c
index d48767a6d7..1474249a2a 100644
--- a/LAPACKE/src/lapacke_dptcon_work.c
+++ b/LAPACKE/src/lapacke_dptcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dptcon_work( lapack_int n, const double* d, const double* e,
+lapack_int API_SUFFIX(LAPACKE_dptcon_work)( lapack_int n, const double* d, const double* e,
                                 double anorm, double* rcond, double* work )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_dpteqr.c b/LAPACKE/src/lapacke_dpteqr.c
index 4ee19366e9..0f91da84e6 100644
--- a/LAPACKE/src/lapacke_dpteqr.c
+++ b/LAPACKE/src/lapacke_dpteqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpteqr( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpteqr)( int matrix_layout, char compz, lapack_int n,
                            double* d, double* e, double* z, lapack_int ldz )
 {
     lapack_int info = 0;
@@ -40,27 +40,27 @@ lapack_int LAPACKE_dpteqr( int matrix_layout, char compz, lapack_int n,
     lapack_int lwork;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpteqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpteqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -6;
             }
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( compz, 'n' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'n' ) ) {
         lwork = 1;
     } else {
         lwork = MAX(1,4*n-4);
@@ -72,12 +72,12 @@ lapack_int LAPACKE_dpteqr( int matrix_layout, char compz, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dpteqr_work( matrix_layout, compz, n, d, e, z, ldz, work );
+    info = API_SUFFIX(LAPACKE_dpteqr_work)( matrix_layout, compz, n, d, e, z, ldz, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dpteqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpteqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpteqr_work.c b/LAPACKE/src/lapacke_dpteqr_work.c
index 902b06bafd..8ce353734b 100644
--- a/LAPACKE/src/lapacke_dpteqr_work.c
+++ b/LAPACKE/src/lapacke_dpteqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpteqr_work( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dpteqr_work)( int matrix_layout, char compz, lapack_int n,
                                 double* d, double* e, double* z, lapack_int ldz,
                                 double* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dpteqr_work( int matrix_layout, char compz, lapack_int n,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dpteqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpteqr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,8 +59,8 @@ lapack_int LAPACKE_dpteqr_work( int matrix_layout, char compz, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dpteqr( &compz, &n, d, e, z_t, &ldz_t, work, &info );
@@ -68,16 +68,16 @@ lapack_int LAPACKE_dpteqr_work( int matrix_layout, char compz, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         /* Release memory and exit */
         LAPACKE_free( z_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpteqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpteqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpteqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpteqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dptrfs.c b/LAPACKE/src/lapacke_dptrfs.c
index f235dc3d0a..a052855fd4 100644
--- a/LAPACKE/src/lapacke_dptrfs.c
+++ b/LAPACKE/src/lapacke_dptrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dptrfs( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_dptrfs)( int matrix_layout, lapack_int n, lapack_int nrhs,
                            const double* d, const double* e, const double* df,
                            const double* ef, const double* b, lapack_int ldb,
                            double* x, lapack_int ldx, double* ferr,
@@ -41,28 +41,28 @@ lapack_int LAPACKE_dptrfs( int matrix_layout, lapack_int n, lapack_int nrhs,
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dptrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dptrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n, df, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, df, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( n-1, ef, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, ef, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -10;
         }
     }
@@ -74,13 +74,13 @@ lapack_int LAPACKE_dptrfs( int matrix_layout, lapack_int n, lapack_int nrhs,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dptrfs_work( matrix_layout, n, nrhs, d, e, df, ef, b, ldb, x,
+    info = API_SUFFIX(LAPACKE_dptrfs_work)( matrix_layout, n, nrhs, d, e, df, ef, b, ldb, x,
                                 ldx, ferr, berr, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dptrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dptrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dptrfs_work.c b/LAPACKE/src/lapacke_dptrfs_work.c
index 7139876f61..4bf79061c6 100644
--- a/LAPACKE/src/lapacke_dptrfs_work.c
+++ b/LAPACKE/src/lapacke_dptrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dptrfs_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_dptrfs_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                 const double* d, const double* e,
                                 const double* df, const double* ef,
                                 const double* b, lapack_int ldb, double* x,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_dptrfs_work( int matrix_layout, lapack_int n, lapack_int nrhs
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dptrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dptrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dptrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dptrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,8 +75,8 @@ lapack_int LAPACKE_dptrfs_work( int matrix_layout, lapack_int n, lapack_int nrhs
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dptrfs( &n, &nrhs, d, e, df, ef, b_t, &ldb_t, x_t, &ldx_t, ferr,
                        berr, work, &info );
@@ -84,18 +84,18 @@ lapack_int LAPACKE_dptrfs_work( int matrix_layout, lapack_int n, lapack_int nrhs
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dptrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dptrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dptrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dptrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dptsv.c b/LAPACKE/src/lapacke_dptsv.c
index be1c16cb1f..66d8639415 100644
--- a/LAPACKE/src/lapacke_dptsv.c
+++ b/LAPACKE/src/lapacke_dptsv.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dptsv( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_dptsv)( int matrix_layout, lapack_int n, lapack_int nrhs,
                           double* d, double* e, double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dptsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dptsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dptsv_work( matrix_layout, n, nrhs, d, e, b, ldb );
+    return API_SUFFIX(LAPACKE_dptsv_work)( matrix_layout, n, nrhs, d, e, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dptsv_work.c b/LAPACKE/src/lapacke_dptsv_work.c
index 92631b3afa..abfe9b655a 100644
--- a/LAPACKE/src/lapacke_dptsv_work.c
+++ b/LAPACKE/src/lapacke_dptsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dptsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_dptsv_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                double* d, double* e, double* b, lapack_int ldb )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_dptsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dptsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dptsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,23 +58,23 @@ lapack_int LAPACKE_dptsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dptsv( &n, &nrhs, d, e, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dptsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dptsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dptsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dptsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dptsvx.c b/LAPACKE/src/lapacke_dptsvx.c
index 6ce2b5e0fa..7e47ecda1c 100644
--- a/LAPACKE/src/lapacke_dptsvx.c
+++ b/LAPACKE/src/lapacke_dptsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dptsvx( int matrix_layout, char fact, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dptsvx)( int matrix_layout, char fact, lapack_int n,
                            lapack_int nrhs, const double* d, const double* e,
                            double* df, double* ef, const double* b,
                            lapack_int ldb, double* x, lapack_int ldx,
@@ -41,28 +41,28 @@ lapack_int LAPACKE_dptsvx( int matrix_layout, char fact, lapack_int n,
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dptsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dptsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_d_nancheck( n, df, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, df, 1 ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_d_nancheck( n-1, ef, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, ef, 1 ) ) {
                 return -8;
             }
         }
@@ -75,13 +75,13 @@ lapack_int LAPACKE_dptsvx( int matrix_layout, char fact, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dptsvx_work( matrix_layout, fact, n, nrhs, d, e, df, ef, b,
+    info = API_SUFFIX(LAPACKE_dptsvx_work)( matrix_layout, fact, n, nrhs, d, e, df, ef, b,
                                 ldb, x, ldx, rcond, ferr, berr, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dptsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dptsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dptsvx_work.c b/LAPACKE/src/lapacke_dptsvx_work.c
index 1040df224a..9846cbb6e6 100644
--- a/LAPACKE/src/lapacke_dptsvx_work.c
+++ b/LAPACKE/src/lapacke_dptsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dptsvx_work( int matrix_layout, char fact, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dptsvx_work)( int matrix_layout, char fact, lapack_int n,
                                 lapack_int nrhs, const double* d,
                                 const double* e, double* df, double* ef,
                                 const double* b, lapack_int ldb, double* x,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_dptsvx_work( int matrix_layout, char fact, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dptsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dptsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dptsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dptsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,7 +75,7 @@ lapack_int LAPACKE_dptsvx_work( int matrix_layout, char fact, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dptsvx( &fact, &n, &nrhs, d, e, df, ef, b_t, &ldb_t, x_t, &ldx_t,
                        rcond, ferr, berr, work, &info );
@@ -83,18 +83,18 @@ lapack_int LAPACKE_dptsvx_work( int matrix_layout, char fact, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dptsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dptsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dptsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dptsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dpttrf.c b/LAPACKE/src/lapacke_dpttrf.c
index 525dff8b37..500c3b1b28 100644
--- a/LAPACKE/src/lapacke_dpttrf.c
+++ b/LAPACKE/src/lapacke_dpttrf.c
@@ -32,18 +32,18 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpttrf( lapack_int n, double* d, double* e )
+lapack_int API_SUFFIX(LAPACKE_dpttrf)( lapack_int n, double* d, double* e )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_dpttrf_work( n, d, e );
+    return API_SUFFIX(LAPACKE_dpttrf_work)( n, d, e );
 }
diff --git a/LAPACKE/src/lapacke_dpttrf_work.c b/LAPACKE/src/lapacke_dpttrf_work.c
index e636342068..87ab639829 100644
--- a/LAPACKE/src/lapacke_dpttrf_work.c
+++ b/LAPACKE/src/lapacke_dpttrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpttrf_work( lapack_int n, double* d, double* e )
+lapack_int API_SUFFIX(LAPACKE_dpttrf_work)( lapack_int n, double* d, double* e )
 {
     lapack_int info = 0;
     /* Call LAPACK function and adjust info */
diff --git a/LAPACKE/src/lapacke_dpttrs.c b/LAPACKE/src/lapacke_dpttrs.c
index 375cb0831f..e4412cd5c4 100644
--- a/LAPACKE/src/lapacke_dpttrs.c
+++ b/LAPACKE/src/lapacke_dpttrs.c
@@ -32,27 +32,27 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpttrs( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_dpttrs)( int matrix_layout, lapack_int n, lapack_int nrhs,
                            const double* d, const double* e, double* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dpttrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpttrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dpttrs_work( matrix_layout, n, nrhs, d, e, b, ldb );
+    return API_SUFFIX(LAPACKE_dpttrs_work)( matrix_layout, n, nrhs, d, e, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dpttrs_work.c b/LAPACKE/src/lapacke_dpttrs_work.c
index c21df1db76..08c97c8b1f 100644
--- a/LAPACKE/src/lapacke_dpttrs_work.c
+++ b/LAPACKE/src/lapacke_dpttrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dpttrs_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_dpttrs_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                 const double* d, const double* e, double* b,
                                 lapack_int ldb )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dpttrs_work( int matrix_layout, lapack_int n, lapack_int nrhs
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dpttrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpttrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_dpttrs_work( int matrix_layout, lapack_int n, lapack_int nrhs
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dpttrs( &n, &nrhs, d, e, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dpttrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpttrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dpttrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dpttrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbev.c b/LAPACKE/src/lapacke_dsbev.c
index 2e326c69cb..476032ad72 100644
--- a/LAPACKE/src/lapacke_dsbev.c
+++ b/LAPACKE/src/lapacke_dsbev.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbev( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsbev)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_int kd, double* ab, lapack_int ldab, double* w,
                           double* z, lapack_int ldz )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dsb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
     }
@@ -57,13 +57,13 @@ lapack_int LAPACKE_dsbev( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsbev_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_dsbev_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                ldz, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbev_2stage.c b/LAPACKE/src/lapacke_dsbev_2stage.c
index 6027a602d3..d156fcc47b 100644
--- a/LAPACKE/src/lapacke_dsbev_2stage.c
+++ b/LAPACKE/src/lapacke_dsbev_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbev_2stage( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsbev_2stage)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_int kd, double* ab, lapack_int ldab, double* w,
                           double* z, lapack_int ldz )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_dsbev_2stage( int matrix_layout, char jobz, char uplo, lapack
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbev_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbev_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dsb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsbev_2stage_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_dsbev_2stage_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                ldz, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -66,13 +66,13 @@ lapack_int LAPACKE_dsbev_2stage( int matrix_layout, char jobz, char uplo, lapack
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsbev_2stage_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_dsbev_2stage_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                ldz, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbev_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbev_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbev_2stage_work.c b/LAPACKE/src/lapacke_dsbev_2stage_work.c
index e8bf948d76..16c52c9ec1 100644
--- a/LAPACKE/src/lapacke_dsbev_2stage_work.c
+++ b/LAPACKE/src/lapacke_dsbev_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbev_2stage_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsbev_2stage_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_int kd, double* ab,
                                lapack_int ldab, double* w, double* z,
                                lapack_int ldz, double* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_dsbev_2stage_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dsbev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbev_2stage_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dsbev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbev_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -73,7 +73,7 @@ lapack_int LAPACKE_dsbev_2stage_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -81,7 +81,7 @@ lapack_int LAPACKE_dsbev_2stage_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dsb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dsb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsbev_2stage( &jobz, &uplo, &n, &kd, ab_t, &ldab_t, w, z_t, &ldz_t,
                       work, &lwork, &info );
@@ -89,24 +89,24 @@ lapack_int LAPACKE_dsbev_2stage_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_dsb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsbev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbev_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsbev_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbev_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbev_work.c b/LAPACKE/src/lapacke_dsbev_work.c
index 74321ecbbd..01d9e17344 100644
--- a/LAPACKE/src/lapacke_dsbev_work.c
+++ b/LAPACKE/src/lapacke_dsbev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbev_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsbev_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_int kd, double* ab,
                                lapack_int ldab, double* w, double* z,
                                lapack_int ldz, double* work )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_dsbev_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dsbev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbev_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dsbev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbev_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -67,7 +67,7 @@ lapack_int LAPACKE_dsbev_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -75,7 +75,7 @@ lapack_int LAPACKE_dsbev_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dsb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dsb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsbev( &jobz, &uplo, &n, &kd, ab_t, &ldab_t, w, z_t, &ldz_t,
                       work, &info );
@@ -83,24 +83,24 @@ lapack_int LAPACKE_dsbev_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_dsb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsbev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsbev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbevd.c b/LAPACKE/src/lapacke_dsbevd.c
index 27dd8100a2..9f56b9ffe4 100644
--- a/LAPACKE/src/lapacke_dsbevd.c
+++ b/LAPACKE/src/lapacke_dsbevd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbevd( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsbevd)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_int kd, double* ab, lapack_int ldab,
                            double* w, double* z, lapack_int ldz )
 {
@@ -44,19 +44,19 @@ lapack_int LAPACKE_dsbevd( int matrix_layout, char jobz, char uplo, lapack_int n
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbevd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dsb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsbevd_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_dsbevd_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                 ldz, &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,7 +75,7 @@ lapack_int LAPACKE_dsbevd( int matrix_layout, char jobz, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsbevd_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_dsbevd_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                 ldz, work, lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -83,7 +83,7 @@ lapack_int LAPACKE_dsbevd( int matrix_layout, char jobz, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbevd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbevd_2stage.c b/LAPACKE/src/lapacke_dsbevd_2stage.c
index 41e3f3a3aa..455f85717e 100644
--- a/LAPACKE/src/lapacke_dsbevd_2stage.c
+++ b/LAPACKE/src/lapacke_dsbevd_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbevd_2stage( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsbevd_2stage)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_int kd, double* ab, lapack_int ldab,
                            double* w, double* z, lapack_int ldz )
 {
@@ -44,19 +44,19 @@ lapack_int LAPACKE_dsbevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbevd_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevd_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dsb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsbevd_2stage_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_dsbevd_2stage_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                 ldz, &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,7 +75,7 @@ lapack_int LAPACKE_dsbevd_2stage( int matrix_layout, char jobz, char uplo, lapac
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsbevd_2stage_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_dsbevd_2stage_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                 ldz, work, lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -83,7 +83,7 @@ lapack_int LAPACKE_dsbevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbevd_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevd_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbevd_2stage_work.c b/LAPACKE/src/lapacke_dsbevd_2stage_work.c
index c2c21fb3c4..5025655d29 100644
--- a/LAPACKE/src/lapacke_dsbevd_2stage_work.c
+++ b/LAPACKE/src/lapacke_dsbevd_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbevd_2stage_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsbevd_2stage_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_int kd, double* ab,
                                 lapack_int ldab, double* w, double* z,
                                 lapack_int ldz, double* work, lapack_int lwork,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_dsbevd_2stage_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dsbevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevd_2stage_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dsbevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevd_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -74,7 +74,7 @@ lapack_int LAPACKE_dsbevd_2stage_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -82,7 +82,7 @@ lapack_int LAPACKE_dsbevd_2stage_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dsb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dsb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsbevd_2stage( &jobz, &uplo, &n, &kd, ab_t, &ldab_t, w, z_t, &ldz_t,
                        work, &lwork, iwork, &liwork, &info );
@@ -90,24 +90,24 @@ lapack_int LAPACKE_dsbevd_2stage_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_dsb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsbevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevd_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsbevd_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevd_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbevd_work.c b/LAPACKE/src/lapacke_dsbevd_work.c
index 8b96b1ecf0..7372709133 100644
--- a/LAPACKE/src/lapacke_dsbevd_work.c
+++ b/LAPACKE/src/lapacke_dsbevd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbevd_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsbevd_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_int kd, double* ab,
                                 lapack_int ldab, double* w, double* z,
                                 lapack_int ldz, double* work, lapack_int lwork,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_dsbevd_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dsbevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevd_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dsbevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -74,7 +74,7 @@ lapack_int LAPACKE_dsbevd_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -82,7 +82,7 @@ lapack_int LAPACKE_dsbevd_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dsb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dsb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsbevd( &jobz, &uplo, &n, &kd, ab_t, &ldab_t, w, z_t, &ldz_t,
                        work, &lwork, iwork, &liwork, &info );
@@ -90,24 +90,24 @@ lapack_int LAPACKE_dsbevd_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_dsb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsbevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsbevd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbevx.c b/LAPACKE/src/lapacke_dsbevx.c
index b27ba2114f..3a06af216e 100644
--- a/LAPACKE/src/lapacke_dsbevx.c
+++ b/LAPACKE/src/lapacke_dsbevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbevx( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsbevx)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_int kd, double* ab,
                            lapack_int ldab, double* q, lapack_int ldq,
                            double vl, double vu, lapack_int il, lapack_int iu,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_dsbevx( int matrix_layout, char jobz, char range, char uplo,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dsb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -15;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -12;
             }
         }
@@ -79,7 +79,7 @@ lapack_int LAPACKE_dsbevx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsbevx_work( matrix_layout, jobz, range, uplo, n, kd, ab,
+    info = API_SUFFIX(LAPACKE_dsbevx_work)( matrix_layout, jobz, range, uplo, n, kd, ab,
                                 ldab, q, ldq, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, work, iwork, ifail );
     /* Release memory and exit */
@@ -88,7 +88,7 @@ lapack_int LAPACKE_dsbevx( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbevx_2stage.c b/LAPACKE/src/lapacke_dsbevx_2stage.c
index 74d88b99d5..923f425fd4 100644
--- a/LAPACKE/src/lapacke_dsbevx_2stage.c
+++ b/LAPACKE/src/lapacke_dsbevx_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbevx_2stage( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsbevx_2stage)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_int kd, double* ab,
                            lapack_int ldab, double* q, lapack_int ldq,
                            double vl, double vu, lapack_int il, lapack_int iu,
@@ -45,32 +45,32 @@ lapack_int LAPACKE_dsbevx_2stage( int matrix_layout, char jobz, char range, char
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbevx_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevx_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dsb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -15;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -12;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsbevx_2stage_work( matrix_layout, jobz, range, uplo, n, kd, ab,
+    info = API_SUFFIX(LAPACKE_dsbevx_2stage_work)( matrix_layout, jobz, range, uplo, n, kd, ab,
                                 ldab, q, ldq, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, &work_query, lwork, iwork, ifail );
     if( info != 0 ) {
@@ -89,7 +89,7 @@ lapack_int LAPACKE_dsbevx_2stage( int matrix_layout, char jobz, char range, char
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsbevx_2stage_work( matrix_layout, jobz, range, uplo, n, kd, ab,
+    info = API_SUFFIX(LAPACKE_dsbevx_2stage_work)( matrix_layout, jobz, range, uplo, n, kd, ab,
                                 ldab, q, ldq, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, work, lwork, iwork, ifail );
     /* Release memory and exit */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_dsbevx_2stage( int matrix_layout, char jobz, char range, char
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbevx_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevx_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbevx_2stage_work.c b/LAPACKE/src/lapacke_dsbevx_2stage_work.c
index 6750e2acb1..3bd194ed4a 100644
--- a/LAPACKE/src/lapacke_dsbevx_2stage_work.c
+++ b/LAPACKE/src/lapacke_dsbevx_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbevx_2stage_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_dsbevx_2stage_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, lapack_int kd,
                                 double* ab, lapack_int ldab, double* q,
                                 lapack_int ldq, double vl, double vu,
@@ -51,9 +51,9 @@ lapack_int LAPACKE_dsbevx_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldab_t = MAX(1,kd+1);
         lapack_int ldq_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
@@ -63,17 +63,17 @@ lapack_int LAPACKE_dsbevx_2stage_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dsbevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevx_2stage_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dsbevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevx_2stage_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_dsbevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevx_2stage_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -82,14 +82,14 @@ lapack_int LAPACKE_dsbevx_2stage_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             q_t = (double*)LAPACKE_malloc( sizeof(double) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -105,7 +105,7 @@ lapack_int LAPACKE_dsbevx_2stage_work( int matrix_layout, char jobz, char range,
             return (info < 0) ? (info - 1) : info;
         }
         /* Transpose input matrices */
-        LAPACKE_dsb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dsb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsbevx_2stage( &jobz, &range, &uplo, &n, &kd, ab_t, &ldab_t, q_t,
                        &ldq_t, &vl, &vu, &il, &iu, &abstol, m, w, z_t, &ldz_t,
@@ -114,32 +114,32 @@ lapack_int LAPACKE_dsbevx_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_dsb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsbevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevx_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsbevx_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevx_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbevx_work.c b/LAPACKE/src/lapacke_dsbevx_work.c
index 40457ee4a3..00af3b3415 100644
--- a/LAPACKE/src/lapacke_dsbevx_work.c
+++ b/LAPACKE/src/lapacke_dsbevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbevx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_dsbevx_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, lapack_int kd,
                                 double* ab, lapack_int ldab, double* q,
                                 lapack_int ldq, double vl, double vu,
@@ -51,9 +51,9 @@ lapack_int LAPACKE_dsbevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldab_t = MAX(1,kd+1);
         lapack_int ldq_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
@@ -63,17 +63,17 @@ lapack_int LAPACKE_dsbevx_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dsbevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevx_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dsbevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevx_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_dsbevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -82,14 +82,14 @@ lapack_int LAPACKE_dsbevx_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             q_t = (double*)LAPACKE_malloc( sizeof(double) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -98,7 +98,7 @@ lapack_int LAPACKE_dsbevx_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dsb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dsb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsbevx( &jobz, &range, &uplo, &n, &kd, ab_t, &ldab_t, q_t,
                        &ldq_t, &vl, &vu, &il, &iu, &abstol, m, w, z_t, &ldz_t,
@@ -107,32 +107,32 @@ lapack_int LAPACKE_dsbevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_dsb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsbevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsbevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbgst.c b/LAPACKE/src/lapacke_dsbgst.c
index 46706d8448..f11211efc7 100644
--- a/LAPACKE/src/lapacke_dsbgst.c
+++ b/LAPACKE/src/lapacke_dsbgst.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbgst( int matrix_layout, char vect, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsbgst)( int matrix_layout, char vect, char uplo, lapack_int n,
                            lapack_int ka, lapack_int kb, double* ab,
                            lapack_int ldab, const double* bb, lapack_int ldbb,
                            double* x, lapack_int ldx )
@@ -40,16 +40,16 @@ lapack_int LAPACKE_dsbgst( int matrix_layout, char vect, char uplo, lapack_int n
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbgst", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgst", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsb_nancheck( matrix_layout, uplo, n, ka, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dsb_nancheck)( matrix_layout, uplo, n, ka, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_dsb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_dsb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -9;
         }
     }
@@ -61,13 +61,13 @@ lapack_int LAPACKE_dsbgst( int matrix_layout, char vect, char uplo, lapack_int n
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsbgst_work( matrix_layout, vect, uplo, n, ka, kb, ab, ldab,
+    info = API_SUFFIX(LAPACKE_dsbgst_work)( matrix_layout, vect, uplo, n, ka, kb, ab, ldab,
                                 bb, ldbb, x, ldx, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbgst", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgst", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbgst_work.c b/LAPACKE/src/lapacke_dsbgst_work.c
index 0f2efb15e5..9a69319246 100644
--- a/LAPACKE/src/lapacke_dsbgst_work.c
+++ b/LAPACKE/src/lapacke_dsbgst_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbgst_work( int matrix_layout, char vect, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsbgst_work)( int matrix_layout, char vect, char uplo,
                                 lapack_int n, lapack_int ka, lapack_int kb,
                                 double* ab, lapack_int ldab, const double* bb,
                                 lapack_int ldbb, double* x, lapack_int ldx,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_dsbgst_work( int matrix_layout, char vect, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dsbgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgst_work", info );
             return info;
         }
         if( ldbb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dsbgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgst_work", info );
             return info;
         }
         if( ldx < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dsbgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgst_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -80,7 +80,7 @@ lapack_int LAPACKE_dsbgst_work( int matrix_layout, char vect, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( vect, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
             x_t = (double*)LAPACKE_malloc( sizeof(double) * ldx_t * MAX(1,n) );
             if( x_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -88,8 +88,8 @@ lapack_int LAPACKE_dsbgst_work( int matrix_layout, char vect, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dsb_trans( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
-        LAPACKE_dsb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_dsb_trans)( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dsb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsbgst( &vect, &uplo, &n, &ka, &kb, ab_t, &ldab_t, bb_t, &ldbb_t,
                        x_t, &ldx_t, work, &info );
@@ -97,13 +97,13 @@ lapack_int LAPACKE_dsbgst_work( int matrix_layout, char vect, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsb_trans( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_dsb_trans)( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( vect, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, x_t, ldx_t, x, ldx );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, x_t, ldx_t, x, ldx );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( vect, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
             LAPACKE_free( x_t );
         }
 exit_level_2:
@@ -112,11 +112,11 @@ lapack_int LAPACKE_dsbgst_work( int matrix_layout, char vect, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsbgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgst_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsbgst_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgst_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbgv.c b/LAPACKE/src/lapacke_dsbgv.c
index 8696973055..b62a6ccbf1 100644
--- a/LAPACKE/src/lapacke_dsbgv.c
+++ b/LAPACKE/src/lapacke_dsbgv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbgv( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsbgv)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_int ka, lapack_int kb, double* ab,
                           lapack_int ldab, double* bb, lapack_int ldbb,
                           double* w, double* z, lapack_int ldz )
@@ -40,16 +40,16 @@ lapack_int LAPACKE_dsbgv( int matrix_layout, char jobz, char uplo, lapack_int n,
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbgv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsb_nancheck( matrix_layout, uplo, n, ka, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dsb_nancheck)( matrix_layout, uplo, n, ka, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_dsb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_dsb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -9;
         }
     }
@@ -61,13 +61,13 @@ lapack_int LAPACKE_dsbgv( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsbgv_work( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
+    info = API_SUFFIX(LAPACKE_dsbgv_work)( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
                                bb, ldbb, w, z, ldz, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbgv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbgv_work.c b/LAPACKE/src/lapacke_dsbgv_work.c
index c50562dcc0..53eb388b1e 100644
--- a/LAPACKE/src/lapacke_dsbgv_work.c
+++ b/LAPACKE/src/lapacke_dsbgv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbgv_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsbgv_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_int ka, lapack_int kb,
                                double* ab, lapack_int ldab, double* bb,
                                lapack_int ldbb, double* w, double* z,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_dsbgv_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dsbgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgv_work", info );
             return info;
         }
         if( ldbb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dsbgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgv_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dsbgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -80,7 +80,7 @@ lapack_int LAPACKE_dsbgv_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -88,8 +88,8 @@ lapack_int LAPACKE_dsbgv_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dsb_trans( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
-        LAPACKE_dsb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_dsb_trans)( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dsb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsbgv( &jobz, &uplo, &n, &ka, &kb, ab_t, &ldab_t, bb_t, &ldbb_t,
                       w, z_t, &ldz_t, work, &info );
@@ -97,15 +97,15 @@ lapack_int LAPACKE_dsbgv_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsb_trans( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_dsb_trans)( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_dsb_trans( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
+        API_SUFFIX(LAPACKE_dsb_trans)( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
                            ldbb );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
@@ -114,11 +114,11 @@ lapack_int LAPACKE_dsbgv_work( int matrix_layout, char jobz, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsbgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsbgv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbgvd.c b/LAPACKE/src/lapacke_dsbgvd.c
index 05555c89db..6e109b2bbe 100644
--- a/LAPACKE/src/lapacke_dsbgvd.c
+++ b/LAPACKE/src/lapacke_dsbgvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbgvd( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsbgvd)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_int ka, lapack_int kb, double* ab,
                            lapack_int ldab, double* bb, lapack_int ldbb,
                            double* w, double* z, lapack_int ldz )
@@ -45,22 +45,22 @@ lapack_int LAPACKE_dsbgvd( int matrix_layout, char jobz, char uplo, lapack_int n
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbgvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsb_nancheck( matrix_layout, uplo, n, ka, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dsb_nancheck)( matrix_layout, uplo, n, ka, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_dsb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_dsb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsbgvd_work( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
+    info = API_SUFFIX(LAPACKE_dsbgvd_work)( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
                                 bb, ldbb, w, z, ldz, &work_query, lwork,
                                 &iwork_query, liwork );
     if( info != 0 ) {
@@ -80,7 +80,7 @@ lapack_int LAPACKE_dsbgvd( int matrix_layout, char jobz, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsbgvd_work( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
+    info = API_SUFFIX(LAPACKE_dsbgvd_work)( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
                                 bb, ldbb, w, z, ldz, work, lwork, iwork,
                                 liwork );
     /* Release memory and exit */
@@ -89,7 +89,7 @@ lapack_int LAPACKE_dsbgvd( int matrix_layout, char jobz, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbgvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbgvd_work.c b/LAPACKE/src/lapacke_dsbgvd_work.c
index 1960271305..8465cb7720 100644
--- a/LAPACKE/src/lapacke_dsbgvd_work.c
+++ b/LAPACKE/src/lapacke_dsbgvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbgvd_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsbgvd_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_int ka, lapack_int kb,
                                 double* ab, lapack_int ldab, double* bb,
                                 lapack_int ldbb, double* w, double* z,
@@ -57,17 +57,17 @@ lapack_int LAPACKE_dsbgvd_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dsbgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgvd_work", info );
             return info;
         }
         if( ldbb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dsbgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgvd_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dsbgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgvd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -87,7 +87,7 @@ lapack_int LAPACKE_dsbgvd_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -95,8 +95,8 @@ lapack_int LAPACKE_dsbgvd_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dsb_trans( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
-        LAPACKE_dsb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_dsb_trans)( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dsb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsbgvd( &jobz, &uplo, &n, &ka, &kb, ab_t, &ldab_t, bb_t, &ldbb_t,
                        w, z_t, &ldz_t, work, &lwork, iwork, &liwork, &info );
@@ -104,15 +104,15 @@ lapack_int LAPACKE_dsbgvd_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsb_trans( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_dsb_trans)( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_dsb_trans( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
+        API_SUFFIX(LAPACKE_dsb_trans)( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
                            ldbb );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
@@ -121,11 +121,11 @@ lapack_int LAPACKE_dsbgvd_work( int matrix_layout, char jobz, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsbgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsbgvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbgvx.c b/LAPACKE/src/lapacke_dsbgvx.c
index 3217d402ce..4026323269 100644
--- a/LAPACKE/src/lapacke_dsbgvx.c
+++ b/LAPACKE/src/lapacke_dsbgvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbgvx( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsbgvx)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_int ka, lapack_int kb,
                            double* ab, lapack_int ldab, double* bb,
                            lapack_int ldbb, double* q, lapack_int ldq,
@@ -44,28 +44,28 @@ lapack_int LAPACKE_dsbgvx( int matrix_layout, char jobz, char range, char uplo,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbgvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsb_nancheck( matrix_layout, uplo, n, ka, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dsb_nancheck)( matrix_layout, uplo, n, ka, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -18;
         }
-        if( LAPACKE_dsb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_dsb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -14;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -15;
             }
         }
@@ -83,7 +83,7 @@ lapack_int LAPACKE_dsbgvx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsbgvx_work( matrix_layout, jobz, range, uplo, n, ka, kb, ab,
+    info = API_SUFFIX(LAPACKE_dsbgvx_work)( matrix_layout, jobz, range, uplo, n, ka, kb, ab,
                                 ldab, bb, ldbb, q, ldq, vl, vu, il, iu, abstol,
                                 m, w, z, ldz, work, iwork, ifail );
     /* Release memory and exit */
@@ -92,7 +92,7 @@ lapack_int LAPACKE_dsbgvx( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbgvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbgvx_work.c b/LAPACKE/src/lapacke_dsbgvx_work.c
index b381439290..a80da9548b 100644
--- a/LAPACKE/src/lapacke_dsbgvx_work.c
+++ b/LAPACKE/src/lapacke_dsbgvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbgvx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_dsbgvx_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, lapack_int ka,
                                 lapack_int kb, double* ab, lapack_int ldab,
                                 double* bb, lapack_int ldbb, double* q,
@@ -63,22 +63,22 @@ lapack_int LAPACKE_dsbgvx_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dsbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgvx_work", info );
             return info;
         }
         if( ldbb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dsbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgvx_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dsbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgvx_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -22;
-            LAPACKE_xerbla( "LAPACKE_dsbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -92,14 +92,14 @@ lapack_int LAPACKE_dsbgvx_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             q_t = (double*)LAPACKE_malloc( sizeof(double) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -107,8 +107,8 @@ lapack_int LAPACKE_dsbgvx_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dsb_trans( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
-        LAPACKE_dsb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_dsb_trans)( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_dsb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsbgvx( &jobz, &range, &uplo, &n, &ka, &kb, ab_t, &ldab_t, bb_t,
                        &ldbb_t, q_t, &ldq_t, &vl, &vu, &il, &iu, &abstol, m, w,
@@ -117,22 +117,22 @@ lapack_int LAPACKE_dsbgvx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsb_trans( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_dsb_trans)( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_dsb_trans( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
+        API_SUFFIX(LAPACKE_dsb_trans)( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
                            ldbb );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_2:
@@ -141,11 +141,11 @@ lapack_int LAPACKE_dsbgvx_work( int matrix_layout, char jobz, char range,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsbgvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbgvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbtrd.c b/LAPACKE/src/lapacke_dsbtrd.c
index 84e84e8360..29b8d70a2a 100644
--- a/LAPACKE/src/lapacke_dsbtrd.c
+++ b/LAPACKE/src/lapacke_dsbtrd.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbtrd( int matrix_layout, char vect, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsbtrd)( int matrix_layout, char vect, char uplo, lapack_int n,
                            lapack_int kd, double* ab, lapack_int ldab,
                            double* d, double* e, double* q, lapack_int ldq )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbtrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbtrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dsb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( vect, 'u' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -10;
             }
         }
@@ -62,13 +62,13 @@ lapack_int LAPACKE_dsbtrd( int matrix_layout, char vect, char uplo, lapack_int n
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsbtrd_work( matrix_layout, vect, uplo, n, kd, ab, ldab, d, e,
+    info = API_SUFFIX(LAPACKE_dsbtrd_work)( matrix_layout, vect, uplo, n, kd, ab, ldab, d, e,
                                 q, ldq, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsbtrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbtrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsbtrd_work.c b/LAPACKE/src/lapacke_dsbtrd_work.c
index 0d9ed3cfde..e6926acb3a 100644
--- a/LAPACKE/src/lapacke_dsbtrd_work.c
+++ b/LAPACKE/src/lapacke_dsbtrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsbtrd_work( int matrix_layout, char vect, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsbtrd_work)( int matrix_layout, char vect, char uplo,
                                 lapack_int n, lapack_int kd, double* ab,
                                 lapack_int ldab, double* d, double* e,
                                 double* q, lapack_int ldq, double* work )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_dsbtrd_work( int matrix_layout, char vect, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dsbtrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbtrd_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dsbtrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbtrd_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -67,7 +67,7 @@ lapack_int LAPACKE_dsbtrd_work( int matrix_layout, char vect, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( vect, 'u' ) || LAPACKE_lsame( vect, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
             q_t = (double*)LAPACKE_malloc( sizeof(double) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -75,9 +75,9 @@ lapack_int LAPACKE_dsbtrd_work( int matrix_layout, char vect, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dsb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        if( LAPACKE_lsame( vect, 'u' ) || LAPACKE_lsame( vect, 'v' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_dsb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dsbtrd( &vect, &uplo, &n, &kd, ab_t, &ldab_t, d, e, q_t, &ldq_t,
@@ -86,24 +86,24 @@ lapack_int LAPACKE_dsbtrd_work( int matrix_layout, char vect, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_dsb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( vect, 'u' ) || LAPACKE_lsame( vect, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( vect, 'u' ) || LAPACKE_lsame( vect, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsbtrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbtrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsbtrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsbtrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsfrk.c b/LAPACKE/src/lapacke_dsfrk.c
index 4af9a7922e..a30dfd1806 100644
--- a/LAPACKE/src/lapacke_dsfrk.c
+++ b/LAPACKE/src/lapacke_dsfrk.c
@@ -32,35 +32,35 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsfrk( int matrix_layout, char transr, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_dsfrk)( int matrix_layout, char transr, char uplo, char trans,
                           lapack_int n, lapack_int k, double alpha,
                           const double* a, lapack_int lda, double beta,
                           double* c )
 {
     lapack_int ka, na;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsfrk", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsfrk", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        ka = LAPACKE_lsame( trans, 'n' ) ? k : n;
-        na = LAPACKE_lsame( trans, 'n' ) ? n : k;
-        if( LAPACKE_dge_nancheck( matrix_layout, na, ka, a, lda ) ) {
+        ka = API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) ? k : n;
+        na = API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) ? n : k;
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, na, ka, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_d_nancheck( 1, &alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &alpha, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &beta, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &beta, 1 ) ) {
             return -10;
         }
-        if( LAPACKE_dpf_nancheck( n, c ) ) {
+        if( API_SUFFIX(LAPACKE_dpf_nancheck)( n, c ) ) {
             return -11;
         }
     }
 #endif
-    return LAPACKE_dsfrk_work( matrix_layout, transr, uplo, trans, n, k, alpha,
+    return API_SUFFIX(LAPACKE_dsfrk_work)( matrix_layout, transr, uplo, trans, n, k, alpha,
                                a, lda, beta, c );
 }
diff --git a/LAPACKE/src/lapacke_dsfrk_work.c b/LAPACKE/src/lapacke_dsfrk_work.c
index 6072648eb2..bebee2c523 100644
--- a/LAPACKE/src/lapacke_dsfrk_work.c
+++ b/LAPACKE/src/lapacke_dsfrk_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsfrk_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsfrk_work)( int matrix_layout, char transr, char uplo,
                                char trans, lapack_int n, lapack_int k,
                                double alpha, const double* a, lapack_int lda,
                                double beta, double* c )
@@ -46,15 +46,15 @@ lapack_int LAPACKE_dsfrk_work( int matrix_layout, char transr, char uplo,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int na = LAPACKE_lsame( trans, 'n' ) ? n : k;
-        lapack_int ka = LAPACKE_lsame( trans, 'n' ) ? k : n;
+        lapack_int na = API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) ? n : k;
+        lapack_int ka = API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) ? k : n;
         lapack_int lda_t = MAX(1,na);
         double* a_t = NULL;
         double* c_t = NULL;
         /* Check leading dimension(s) */
         if( lda < ka ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dsfrk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsfrk_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,25 +70,25 @@ lapack_int LAPACKE_dsfrk_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, na, ka, a, lda, a_t, lda_t );
-        LAPACKE_dpf_trans( matrix_layout, transr, uplo, n, c, c_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, na, ka, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dpf_trans)( matrix_layout, transr, uplo, n, c, c_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsfrk( &transr, &uplo, &trans, &n, &k, &alpha, a_t, &lda_t,
                       &beta, c_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_dpf_trans( LAPACK_COL_MAJOR, transr, uplo, n, c_t, c );
+        API_SUFFIX(LAPACKE_dpf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, c_t, c );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsfrk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsfrk_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsfrk_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsfrk_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsgesv.c b/LAPACKE/src/lapacke_dsgesv.c
index b8e8930eac..62aceea3b9 100644
--- a/LAPACKE/src/lapacke_dsgesv.c
+++ b/LAPACKE/src/lapacke_dsgesv.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsgesv( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_dsgesv)( int matrix_layout, lapack_int n, lapack_int nrhs,
                            double* a, lapack_int lda, lapack_int* ipiv,
-                           double* b, lapack_int ldb, double* x, lapack_int ldx,
+                           const double* b, lapack_int ldb, double* x, lapack_int ldx,
                            lapack_int* iter )
 {
     lapack_int info = 0;
     float* swork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsgesv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsgesv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
@@ -67,7 +67,7 @@ lapack_int LAPACKE_dsgesv( int matrix_layout, lapack_int n, lapack_int nrhs,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsgesv_work( matrix_layout, n, nrhs, a, lda, ipiv, b, ldb, x,
+    info = API_SUFFIX(LAPACKE_dsgesv_work)( matrix_layout, n, nrhs, a, lda, ipiv, b, ldb, x,
                                 ldx, work, swork, iter );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -75,7 +75,7 @@ lapack_int LAPACKE_dsgesv( int matrix_layout, lapack_int n, lapack_int nrhs,
     LAPACKE_free( swork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsgesv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsgesv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsgesv_work.c b/LAPACKE/src/lapacke_dsgesv_work.c
index 5eeaffd0f5..0384cce2e7 100644
--- a/LAPACKE/src/lapacke_dsgesv_work.c
+++ b/LAPACKE/src/lapacke_dsgesv_work.c
@@ -32,9 +32,9 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_dsgesv_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                 double* a, lapack_int lda, lapack_int* ipiv,
-                                double* b, lapack_int ldb, double* x,
+                                const double* b, lapack_int ldb, double* x,
                                 lapack_int ldx, double* work, float* swork,
                                 lapack_int* iter )
 {
@@ -56,17 +56,17 @@ lapack_int LAPACKE_dsgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dsgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsgesv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dsgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsgesv_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dsgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsgesv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -86,8 +86,8 @@ lapack_int LAPACKE_dsgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsgesv( &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, x_t, &ldx_t,
                        work, swork, iter, &info );
@@ -95,9 +95,8 @@ lapack_int LAPACKE_dsgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_2:
@@ -106,11 +105,11 @@ lapack_int LAPACKE_dsgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsgesv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsgesv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsgesv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspcon.c b/LAPACKE/src/lapacke_dspcon.c
index 3b16c513e4..53c3d605ae 100644
--- a/LAPACKE/src/lapacke_dspcon.c
+++ b/LAPACKE/src/lapacke_dspcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspcon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dspcon)( int matrix_layout, char uplo, lapack_int n,
                            const double* ap, const lapack_int* ipiv,
                            double anorm, double* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_dspcon( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dspcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_dsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
@@ -66,7 +66,7 @@ lapack_int LAPACKE_dspcon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dspcon_work( matrix_layout, uplo, n, ap, ipiv, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_dspcon_work)( matrix_layout, uplo, n, ap, ipiv, anorm, rcond,
                                 work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -74,7 +74,7 @@ lapack_int LAPACKE_dspcon( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dspcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspcon_work.c b/LAPACKE/src/lapacke_dspcon_work.c
index be0fc30f28..94e263cdeb 100644
--- a/LAPACKE/src/lapacke_dspcon_work.c
+++ b/LAPACKE/src/lapacke_dspcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspcon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dspcon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const double* ap, const lapack_int* ipiv,
                                 double anorm, double* rcond, double* work,
                                 lapack_int* iwork )
@@ -54,7 +54,7 @@ lapack_int LAPACKE_dspcon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dspcon( &uplo, &n, ap_t, ipiv, &anorm, rcond, work, iwork,
                        &info );
@@ -65,11 +65,11 @@ lapack_int LAPACKE_dspcon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dspcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dspcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspev.c b/LAPACKE/src/lapacke_dspev.c
index 90c1659643..68e36d99ab 100644
--- a/LAPACKE/src/lapacke_dspev.c
+++ b/LAPACKE/src/lapacke_dspev.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspev( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dspev)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           double* ap, double* w, double* z, lapack_int ldz )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dspev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, ap ) ) {
             return -5;
         }
     }
@@ -56,13 +56,13 @@ lapack_int LAPACKE_dspev( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dspev_work( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
+    info = API_SUFFIX(LAPACKE_dspev_work)( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
                                work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dspev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspev_work.c b/LAPACKE/src/lapacke_dspev_work.c
index f74284bcc7..6d034e8c5f 100644
--- a/LAPACKE/src/lapacke_dspev_work.c
+++ b/LAPACKE/src/lapacke_dspev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspev_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dspev_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, double* ap, double* w, double* z,
                                lapack_int ldz, double* work )
 {
@@ -50,11 +50,11 @@ lapack_int LAPACKE_dspev_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dspev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspev_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -68,30 +68,30 @@ lapack_int LAPACKE_dspev_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dspev( &jobz, &uplo, &n, ap_t, w, z_t, &ldz_t, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
-        LAPACKE_dsp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dsp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dspev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dspev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspevd.c b/LAPACKE/src/lapacke_dspevd.c
index 20a0cc8136..af6584d112 100644
--- a/LAPACKE/src/lapacke_dspevd.c
+++ b/LAPACKE/src/lapacke_dspevd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspevd( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dspevd)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            double* ap, double* w, double* z, lapack_int ldz )
 {
     lapack_int info = 0;
@@ -43,19 +43,19 @@ lapack_int LAPACKE_dspevd( int matrix_layout, char jobz, char uplo, lapack_int n
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dspevd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspevd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, ap ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dspevd_work( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
+    info = API_SUFFIX(LAPACKE_dspevd_work)( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -74,7 +74,7 @@ lapack_int LAPACKE_dspevd( int matrix_layout, char jobz, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dspevd_work( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
+    info = API_SUFFIX(LAPACKE_dspevd_work)( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
                                 work, lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -82,7 +82,7 @@ lapack_int LAPACKE_dspevd( int matrix_layout, char jobz, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dspevd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspevd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspevd_work.c b/LAPACKE/src/lapacke_dspevd_work.c
index af34d8b0a2..19c7d29b20 100644
--- a/LAPACKE/src/lapacke_dspevd_work.c
+++ b/LAPACKE/src/lapacke_dspevd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspevd_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dspevd_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, double* ap, double* w, double* z,
                                 lapack_int ldz, double* work, lapack_int lwork,
                                 lapack_int* iwork, lapack_int liwork )
@@ -52,7 +52,7 @@ lapack_int LAPACKE_dspevd_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dspevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspevd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -62,7 +62,7 @@ lapack_int LAPACKE_dspevd_work( int matrix_layout, char jobz, char uplo,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -76,7 +76,7 @@ lapack_int LAPACKE_dspevd_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dspevd( &jobz, &uplo, &n, ap_t, w, z_t, &ldz_t, work, &lwork,
                        iwork, &liwork, &info );
@@ -84,23 +84,23 @@ lapack_int LAPACKE_dspevd_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
-        LAPACKE_dsp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dsp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dspevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspevd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dspevd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspevd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspevx.c b/LAPACKE/src/lapacke_dspevx.c
index 05d3cad17d..272a740a98 100644
--- a/LAPACKE/src/lapacke_dspevx.c
+++ b/LAPACKE/src/lapacke_dspevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspevx( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dspevx)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, double* ap, double vl, double vu,
                            lapack_int il, lapack_int iu, double abstol,
                            lapack_int* m, double* w, double* z, lapack_int ldz,
@@ -42,25 +42,25 @@ lapack_int LAPACKE_dspevx( int matrix_layout, char jobz, char range, char uplo,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dspevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_dsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -8;
             }
         }
@@ -78,7 +78,7 @@ lapack_int LAPACKE_dspevx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dspevx_work( matrix_layout, jobz, range, uplo, n, ap, vl, vu,
+    info = API_SUFFIX(LAPACKE_dspevx_work)( matrix_layout, jobz, range, uplo, n, ap, vl, vu,
                                 il, iu, abstol, m, w, z, ldz, work, iwork,
                                 ifail );
     /* Release memory and exit */
@@ -87,7 +87,7 @@ lapack_int LAPACKE_dspevx( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dspevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspevx_work.c b/LAPACKE/src/lapacke_dspevx_work.c
index ea902587d7..9f38490a19 100644
--- a/LAPACKE/src/lapacke_dspevx_work.c
+++ b/LAPACKE/src/lapacke_dspevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspevx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_dspevx_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, double* ap, double vl,
                                 double vu, lapack_int il, lapack_int iu,
                                 double abstol, lapack_int* m, double* w,
@@ -48,20 +48,20 @@ lapack_int LAPACKE_dspevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldz_t = MAX(1,n);
         double* z_t = NULL;
         double* ap_t = NULL;
         /* Check leading dimension(s) */
         if( ldz < ncols_z ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dspevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspevx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -76,7 +76,7 @@ lapack_int LAPACKE_dspevx_work( int matrix_layout, char jobz, char range,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dspevx( &jobz, &range, &uplo, &n, ap_t, &vl, &vu, &il, &iu,
                        &abstol, m, w, z_t, &ldz_t, work, iwork, ifail, &info );
@@ -84,24 +84,24 @@ lapack_int LAPACKE_dspevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
-        LAPACKE_dsp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dsp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dspevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dspevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspgst.c b/LAPACKE/src/lapacke_dspgst.c
index 9d0e1873ba..bb01a55ab0 100644
--- a/LAPACKE/src/lapacke_dspgst.c
+++ b/LAPACKE/src/lapacke_dspgst.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspgst( int matrix_layout, lapack_int itype, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dspgst)( int matrix_layout, lapack_int itype, char uplo,
                            lapack_int n, double* ap, const double* bp )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dspgst", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgst", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_dsp_nancheck( n, bp ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, bp ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_dspgst_work( matrix_layout, itype, uplo, n, ap, bp );
+    return API_SUFFIX(LAPACKE_dspgst_work)( matrix_layout, itype, uplo, n, ap, bp );
 }
diff --git a/LAPACKE/src/lapacke_dspgst_work.c b/LAPACKE/src/lapacke_dspgst_work.c
index a58614f831..f9b10b6185 100644
--- a/LAPACKE/src/lapacke_dspgst_work.c
+++ b/LAPACKE/src/lapacke_dspgst_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspgst_work( int matrix_layout, lapack_int itype, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dspgst_work)( int matrix_layout, lapack_int itype, char uplo,
                                 lapack_int n, double* ap, const double* bp )
 {
     lapack_int info = 0;
@@ -59,26 +59,26 @@ lapack_int LAPACKE_dspgst_work( int matrix_layout, lapack_int itype, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, bp, bp_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, bp, bp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dspgst( &itype, &uplo, &n, ap_t, bp_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dsp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( bp_t );
 exit_level_1:
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dspgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgst_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dspgst_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgst_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspgv.c b/LAPACKE/src/lapacke_dspgv.c
index df42ce91b9..03428fd8f9 100644
--- a/LAPACKE/src/lapacke_dspgv.c
+++ b/LAPACKE/src/lapacke_dspgv.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspgv( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_dspgv)( int matrix_layout, lapack_int itype, char jobz,
                           char uplo, lapack_int n, double* ap, double* bp,
                           double* w, double* z, lapack_int ldz )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dspgv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_dsp_nancheck( n, bp ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, bp ) ) {
             return -7;
         }
     }
@@ -60,13 +60,13 @@ lapack_int LAPACKE_dspgv( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dspgv_work( matrix_layout, itype, jobz, uplo, n, ap, bp, w, z,
+    info = API_SUFFIX(LAPACKE_dspgv_work)( matrix_layout, itype, jobz, uplo, n, ap, bp, w, z,
                                ldz, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dspgv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspgv_work.c b/LAPACKE/src/lapacke_dspgv_work.c
index 689517e704..949e56a39c 100644
--- a/LAPACKE/src/lapacke_dspgv_work.c
+++ b/LAPACKE/src/lapacke_dspgv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspgv_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_dspgv_work)( int matrix_layout, lapack_int itype, char jobz,
                                char uplo, lapack_int n, double* ap, double* bp,
                                double* w, double* z, lapack_int ldz,
                                double* work )
@@ -53,11 +53,11 @@ lapack_int LAPACKE_dspgv_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dspgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -77,8 +77,8 @@ lapack_int LAPACKE_dspgv_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, bp, bp_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, bp, bp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dspgv( &itype, &jobz, &uplo, &n, ap_t, bp_t, w, z_t, &ldz_t,
                       work, &info );
@@ -86,26 +86,26 @@ lapack_int LAPACKE_dspgv_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
-        LAPACKE_dsp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
-        LAPACKE_dsp_trans( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
+        API_SUFFIX(LAPACKE_dsp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dsp_trans)( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
         /* Release memory and exit */
         LAPACKE_free( bp_t );
 exit_level_2:
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dspgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dspgv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspgvd.c b/LAPACKE/src/lapacke_dspgvd.c
index ab6910d1dd..8db8ed79a3 100644
--- a/LAPACKE/src/lapacke_dspgvd.c
+++ b/LAPACKE/src/lapacke_dspgvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspgvd( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_dspgvd)( int matrix_layout, lapack_int itype, char jobz,
                            char uplo, lapack_int n, double* ap, double* bp,
                            double* w, double* z, lapack_int ldz )
 {
@@ -44,22 +44,22 @@ lapack_int LAPACKE_dspgvd( int matrix_layout, lapack_int itype, char jobz,
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dspgvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_dsp_nancheck( n, bp ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, bp ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dspgvd_work( matrix_layout, itype, jobz, uplo, n, ap, bp, w,
+    info = API_SUFFIX(LAPACKE_dspgvd_work)( matrix_layout, itype, jobz, uplo, n, ap, bp, w,
                                 z, ldz, &work_query, lwork, &iwork_query,
                                 liwork );
     if( info != 0 ) {
@@ -79,7 +79,7 @@ lapack_int LAPACKE_dspgvd( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dspgvd_work( matrix_layout, itype, jobz, uplo, n, ap, bp, w,
+    info = API_SUFFIX(LAPACKE_dspgvd_work)( matrix_layout, itype, jobz, uplo, n, ap, bp, w,
                                 z, ldz, work, lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -87,7 +87,7 @@ lapack_int LAPACKE_dspgvd( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dspgvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspgvd_work.c b/LAPACKE/src/lapacke_dspgvd_work.c
index 7a075de3d3..bed3971c28 100644
--- a/LAPACKE/src/lapacke_dspgvd_work.c
+++ b/LAPACKE/src/lapacke_dspgvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspgvd_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_dspgvd_work)( int matrix_layout, lapack_int itype, char jobz,
                                 char uplo, lapack_int n, double* ap, double* bp,
                                 double* w, double* z, lapack_int ldz,
                                 double* work, lapack_int lwork,
@@ -54,7 +54,7 @@ lapack_int LAPACKE_dspgvd_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dspgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgvd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,7 +64,7 @@ lapack_int LAPACKE_dspgvd_work( int matrix_layout, lapack_int itype, char jobz,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -84,8 +84,8 @@ lapack_int LAPACKE_dspgvd_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, bp, bp_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, bp, bp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dspgvd( &itype, &jobz, &uplo, &n, ap_t, bp_t, w, z_t, &ldz_t,
                        work, &lwork, iwork, &liwork, &info );
@@ -93,26 +93,26 @@ lapack_int LAPACKE_dspgvd_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
-        LAPACKE_dsp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
-        LAPACKE_dsp_trans( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
+        API_SUFFIX(LAPACKE_dsp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dsp_trans)( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
         /* Release memory and exit */
         LAPACKE_free( bp_t );
 exit_level_2:
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dspgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dspgvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspgvx.c b/LAPACKE/src/lapacke_dspgvx.c
index eb09e490bb..68d62ef312 100644
--- a/LAPACKE/src/lapacke_dspgvx.c
+++ b/LAPACKE/src/lapacke_dspgvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspgvx( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_dspgvx)( int matrix_layout, lapack_int itype, char jobz,
                            char range, char uplo, lapack_int n, double* ap,
                            double* bp, double vl, double vu, lapack_int il,
                            lapack_int iu, double abstol, lapack_int* m,
@@ -43,28 +43,28 @@ lapack_int LAPACKE_dspgvx( int matrix_layout, lapack_int itype, char jobz,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dspgvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -13;
         }
-        if( LAPACKE_dsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, ap ) ) {
             return -7;
         }
-        if( LAPACKE_dsp_nancheck( n, bp ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, bp ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -9;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -10;
             }
         }
@@ -82,7 +82,7 @@ lapack_int LAPACKE_dspgvx( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dspgvx_work( matrix_layout, itype, jobz, range, uplo, n, ap,
+    info = API_SUFFIX(LAPACKE_dspgvx_work)( matrix_layout, itype, jobz, range, uplo, n, ap,
                                 bp, vl, vu, il, iu, abstol, m, w, z, ldz, work,
                                 iwork, ifail );
     /* Release memory and exit */
@@ -91,7 +91,7 @@ lapack_int LAPACKE_dspgvx( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dspgvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspgvx_work.c b/LAPACKE/src/lapacke_dspgvx_work.c
index 1a6036b1b4..2c027c84b1 100644
--- a/LAPACKE/src/lapacke_dspgvx_work.c
+++ b/LAPACKE/src/lapacke_dspgvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspgvx_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_dspgvx_work)( int matrix_layout, lapack_int itype, char jobz,
                                 char range, char uplo, lapack_int n, double* ap,
                                 double* bp, double vl, double vu, lapack_int il,
                                 lapack_int iu, double abstol, lapack_int* m,
@@ -49,9 +49,9 @@ lapack_int LAPACKE_dspgvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldz_t = MAX(1,n);
         double* z_t = NULL;
         double* ap_t = NULL;
@@ -59,11 +59,11 @@ lapack_int LAPACKE_dspgvx_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( ldz < ncols_z ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_dspgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -84,8 +84,8 @@ lapack_int LAPACKE_dspgvx_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, bp, bp_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, bp, bp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dspgvx( &itype, &jobz, &range, &uplo, &n, ap_t, bp_t, &vl, &vu,
                        &il, &iu, &abstol, m, w, z_t, &ldz_t, work, iwork, ifail,
@@ -94,27 +94,27 @@ lapack_int LAPACKE_dspgvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
-        LAPACKE_dsp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
-        LAPACKE_dsp_trans( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
+        API_SUFFIX(LAPACKE_dsp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dsp_trans)( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
         /* Release memory and exit */
         LAPACKE_free( bp_t );
 exit_level_2:
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dspgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dspgvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspgvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsposv.c b/LAPACKE/src/lapacke_dsposv.c
index f589444361..a28f8a3945 100644
--- a/LAPACKE/src/lapacke_dsposv.c
+++ b/LAPACKE/src/lapacke_dsposv.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsposv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsposv)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, double* a, lapack_int lda,
-                           double* b, lapack_int ldb, double* x, lapack_int ldx,
+                           const double* b, lapack_int ldb, double* x, lapack_int ldx,
                            lapack_int* iter )
 {
     lapack_int info = 0;
     float* swork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsposv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsposv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
@@ -67,7 +67,7 @@ lapack_int LAPACKE_dsposv( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsposv_work( matrix_layout, uplo, n, nrhs, a, lda, b, ldb, x,
+    info = API_SUFFIX(LAPACKE_dsposv_work)( matrix_layout, uplo, n, nrhs, a, lda, b, ldb, x,
                                 ldx, work, swork, iter );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -75,7 +75,7 @@ lapack_int LAPACKE_dsposv( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( swork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsposv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsposv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsposv_work.c b/LAPACKE/src/lapacke_dsposv_work.c
index 66bbb10528..40120e31da 100644
--- a/LAPACKE/src/lapacke_dsposv_work.c
+++ b/LAPACKE/src/lapacke_dsposv_work.c
@@ -32,9 +32,9 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsposv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsposv_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, double* a, lapack_int lda,
-                                double* b, lapack_int ldb, double* x,
+                                const double* b, lapack_int ldb, double* x,
                                 lapack_int ldx, double* work, float* swork,
                                 lapack_int* iter )
 {
@@ -56,17 +56,17 @@ lapack_int LAPACKE_dsposv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsposv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dsposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsposv_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dsposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsposv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -86,8 +86,8 @@ lapack_int LAPACKE_dsposv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_dpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsposv( &uplo, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, x_t, &ldx_t,
                        work, swork, iter, &info );
@@ -95,9 +95,8 @@ lapack_int LAPACKE_dsposv_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_2:
@@ -106,11 +105,11 @@ lapack_int LAPACKE_dsposv_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsposv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsposv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsposv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsprfs.c b/LAPACKE/src/lapacke_dsprfs.c
index 14a2acf071..f697acbcad 100644
--- a/LAPACKE/src/lapacke_dsprfs.c
+++ b/LAPACKE/src/lapacke_dsprfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsprfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsprfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const double* ap, const double* afp,
                            const lapack_int* ipiv, const double* b,
                            lapack_int ldb, double* x, lapack_int ldx,
@@ -42,22 +42,22 @@ lapack_int LAPACKE_dsprfs( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsprfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsprfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, afp ) ) {
             return -6;
         }
-        if( LAPACKE_dsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -10;
         }
     }
@@ -74,7 +74,7 @@ lapack_int LAPACKE_dsprfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsprfs_work( matrix_layout, uplo, n, nrhs, ap, afp, ipiv, b,
+    info = API_SUFFIX(LAPACKE_dsprfs_work)( matrix_layout, uplo, n, nrhs, ap, afp, ipiv, b,
                                 ldb, x, ldx, ferr, berr, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -82,7 +82,7 @@ lapack_int LAPACKE_dsprfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsprfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsprfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsprfs_work.c b/LAPACKE/src/lapacke_dsprfs_work.c
index ce6e9c5577..a3149545f9 100644
--- a/LAPACKE/src/lapacke_dsprfs_work.c
+++ b/LAPACKE/src/lapacke_dsprfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsprfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsprfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const double* ap,
                                 const double* afp, const lapack_int* ipiv,
                                 const double* b, lapack_int ldb, double* x,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_dsprfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dsprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsprfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dsprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsprfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -89,10 +89,10 @@ lapack_int LAPACKE_dsprfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, afp, afp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsprfs( &uplo, &n, &nrhs, ap_t, afp_t, ipiv, b_t, &ldb_t, x_t,
                        &ldx_t, ferr, berr, work, iwork, &info );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_dsprfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( afp_t );
 exit_level_3:
@@ -111,11 +111,11 @@ lapack_int LAPACKE_dsprfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsprfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsprfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsprfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspsv.c b/LAPACKE/src/lapacke_dspsv.c
index 73606a602b..46d01e66ba 100644
--- a/LAPACKE/src/lapacke_dspsv.c
+++ b/LAPACKE/src/lapacke_dspsv.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspsv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dspsv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, double* ap, lapack_int* ipiv,
                           double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dspsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_dspsv_work( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
+    return API_SUFFIX(LAPACKE_dspsv_work)( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dspsv_work.c b/LAPACKE/src/lapacke_dspsv_work.c
index 3878c651e6..eefbf6776a 100644
--- a/LAPACKE/src/lapacke_dspsv_work.c
+++ b/LAPACKE/src/lapacke_dspsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspsv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dspsv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, double* ap, lapack_int* ipiv,
                                double* b, lapack_int ldb )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dspsv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dspsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,27 +66,27 @@ lapack_int LAPACKE_dspsv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dspsv( &uplo, &n, &nrhs, ap_t, ipiv, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_dsp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dsp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dspsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dspsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspsvx.c b/LAPACKE/src/lapacke_dspsvx.c
index 6c0fef7753..c2d4bcce7b 100644
--- a/LAPACKE/src/lapacke_dspsvx.c
+++ b/LAPACKE/src/lapacke_dspsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspsvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dspsvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, const double* ap, double* afp,
                            lapack_int* ipiv, const double* b, lapack_int ldb,
                            double* x, lapack_int ldx, double* rcond,
@@ -42,21 +42,21 @@ lapack_int LAPACKE_dspsvx( int matrix_layout, char fact, char uplo, lapack_int n
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dspsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_dsp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, afp ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_dsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
@@ -73,7 +73,7 @@ lapack_int LAPACKE_dspsvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dspsvx_work( matrix_layout, fact, uplo, n, nrhs, ap, afp,
+    info = API_SUFFIX(LAPACKE_dspsvx_work)( matrix_layout, fact, uplo, n, nrhs, ap, afp,
                                 ipiv, b, ldb, x, ldx, rcond, ferr, berr, work,
                                 iwork );
     /* Release memory and exit */
@@ -82,7 +82,7 @@ lapack_int LAPACKE_dspsvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dspsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dspsvx_work.c b/LAPACKE/src/lapacke_dspsvx_work.c
index dfd1dde265..29df47d5aa 100644
--- a/LAPACKE/src/lapacke_dspsvx_work.c
+++ b/LAPACKE/src/lapacke_dspsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dspsvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dspsvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs, const double* ap,
                                 double* afp, lapack_int* ipiv, const double* b,
                                 lapack_int ldb, double* x, lapack_int ldx,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_dspsvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dspsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dspsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -89,10 +89,10 @@ lapack_int LAPACKE_dspsvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, ap, ap_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_dsp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, afp, afp_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dspsvx( &fact, &uplo, &n, &nrhs, ap_t, afp_t, ipiv, b_t, &ldb_t,
@@ -101,9 +101,9 @@ lapack_int LAPACKE_dspsvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        if( LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_dsp_trans( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_dsp_trans)( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
         }
         /* Release memory and exit */
         LAPACKE_free( afp_t );
@@ -115,11 +115,11 @@ lapack_int LAPACKE_dspsvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dspsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dspsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dspsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsptrd.c b/LAPACKE/src/lapacke_dsptrd.c
index 56941f116e..da8911f91c 100644
--- a/LAPACKE/src/lapacke_dsptrd.c
+++ b/LAPACKE/src/lapacke_dsptrd.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsptrd( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsptrd)( int matrix_layout, char uplo, lapack_int n,
                            double* ap, double* d, double* e, double* tau )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsptrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsptrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dsptrd_work( matrix_layout, uplo, n, ap, d, e, tau );
+    return API_SUFFIX(LAPACKE_dsptrd_work)( matrix_layout, uplo, n, ap, d, e, tau );
 }
diff --git a/LAPACKE/src/lapacke_dsptrd_work.c b/LAPACKE/src/lapacke_dsptrd_work.c
index 28b9fc032a..8fbb16db70 100644
--- a/LAPACKE/src/lapacke_dsptrd_work.c
+++ b/LAPACKE/src/lapacke_dsptrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsptrd_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsptrd_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* ap, double* d, double* e, double* tau )
 {
     lapack_int info = 0;
@@ -52,23 +52,23 @@ lapack_int LAPACKE_dsptrd_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsptrd( &uplo, &n, ap_t, d, e, tau, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dsp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsptrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsptrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsptrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsptrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsptrf.c b/LAPACKE/src/lapacke_dsptrf.c
index 01b9c5a6de..8ba3d042e8 100644
--- a/LAPACKE/src/lapacke_dsptrf.c
+++ b/LAPACKE/src/lapacke_dsptrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsptrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsptrf)( int matrix_layout, char uplo, lapack_int n,
                            double* ap, lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsptrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsptrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dsptrf_work( matrix_layout, uplo, n, ap, ipiv );
+    return API_SUFFIX(LAPACKE_dsptrf_work)( matrix_layout, uplo, n, ap, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_dsptrf_work.c b/LAPACKE/src/lapacke_dsptrf_work.c
index c4446492f6..db5590ab7e 100644
--- a/LAPACKE/src/lapacke_dsptrf_work.c
+++ b/LAPACKE/src/lapacke_dsptrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsptrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsptrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* ap, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -52,23 +52,23 @@ lapack_int LAPACKE_dsptrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsptrf( &uplo, &n, ap_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dsp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsptrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsptrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsptrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsptrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsptri.c b/LAPACKE/src/lapacke_dsptri.c
index 7817a0d9e4..44149c4375 100644
--- a/LAPACKE/src/lapacke_dsptri.c
+++ b/LAPACKE/src/lapacke_dsptri.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsptri( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsptri)( int matrix_layout, char uplo, lapack_int n,
                            double* ap, const lapack_int* ipiv )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsptri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsptri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
@@ -56,12 +56,12 @@ lapack_int LAPACKE_dsptri( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsptri_work( matrix_layout, uplo, n, ap, ipiv, work );
+    info = API_SUFFIX(LAPACKE_dsptri_work)( matrix_layout, uplo, n, ap, ipiv, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsptri", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsptri", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsptri_work.c b/LAPACKE/src/lapacke_dsptri_work.c
index 5fcef36e7d..bbf2bb9a65 100644
--- a/LAPACKE/src/lapacke_dsptri_work.c
+++ b/LAPACKE/src/lapacke_dsptri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsptri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsptri_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* ap, const lapack_int* ipiv,
                                 double* work )
 {
@@ -53,23 +53,23 @@ lapack_int LAPACKE_dsptri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsptri( &uplo, &n, ap_t, ipiv, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dsp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsptri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsptri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsptri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsptri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsptrs.c b/LAPACKE/src/lapacke_dsptrs.c
index d8f2db1c4f..0cb020cdc9 100644
--- a/LAPACKE/src/lapacke_dsptrs.c
+++ b/LAPACKE/src/lapacke_dsptrs.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsptrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsptrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const double* ap,
                            const lapack_int* ipiv, double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsptrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsptrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dsp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_dsptrs_work( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
+    return API_SUFFIX(LAPACKE_dsptrs_work)( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dsptrs_work.c b/LAPACKE/src/lapacke_dsptrs_work.c
index 4d21200d5f..f0b8e1a7a8 100644
--- a/LAPACKE/src/lapacke_dsptrs_work.c
+++ b/LAPACKE/src/lapacke_dsptrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsptrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsptrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const double* ap,
                                 const lapack_int* ipiv, double* b,
                                 lapack_int ldb )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_dsptrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dsptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsptrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -67,26 +67,26 @@ lapack_int LAPACKE_dsptrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dsp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dsp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsptrs( &uplo, &n, &nrhs, ap_t, ipiv, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsptrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsptrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsptrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dstebz.c b/LAPACKE/src/lapacke_dstebz.c
index 6616c5b2e9..0a33730c67 100644
--- a/LAPACKE/src/lapacke_dstebz.c
+++ b/LAPACKE/src/lapacke_dstebz.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstebz( char range, char order, lapack_int n, double vl,
+lapack_int API_SUFFIX(LAPACKE_dstebz)( char range, char order, lapack_int n, double vl,
                            double vu, lapack_int il, lapack_int iu,
                            double abstol, const double* d, const double* e,
                            lapack_int* m, lapack_int* nsplit, double* w,
@@ -44,22 +44,22 @@ lapack_int LAPACKE_dstebz( char range, char order, lapack_int n, double vl,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -9;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -4;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -5;
             }
         }
@@ -77,7 +77,7 @@ lapack_int LAPACKE_dstebz( char range, char order, lapack_int n, double vl,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dstebz_work( range, order, n, vl, vu, il, iu, abstol, d, e,
+    info = API_SUFFIX(LAPACKE_dstebz_work)( range, order, n, vl, vu, il, iu, abstol, d, e,
                                 m, nsplit, w, iblock, isplit, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -85,7 +85,7 @@ lapack_int LAPACKE_dstebz( char range, char order, lapack_int n, double vl,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dstebz", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstebz", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dstebz_work.c b/LAPACKE/src/lapacke_dstebz_work.c
index 0861b9d84c..573b0feb48 100644
--- a/LAPACKE/src/lapacke_dstebz_work.c
+++ b/LAPACKE/src/lapacke_dstebz_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstebz_work( char range, char order, lapack_int n, double vl,
+lapack_int API_SUFFIX(LAPACKE_dstebz_work)( char range, char order, lapack_int n, double vl,
                                 double vu, lapack_int il, lapack_int iu,
                                 double abstol, const double* d, const double* e,
                                 lapack_int* m, lapack_int* nsplit, double* w,
diff --git a/LAPACKE/src/lapacke_dstedc.c b/LAPACKE/src/lapacke_dstedc.c
index 29ef80656f..3d76d8e27b 100644
--- a/LAPACKE/src/lapacke_dstedc.c
+++ b/LAPACKE/src/lapacke_dstedc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstedc( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dstedc)( int matrix_layout, char compz, lapack_int n,
                            double* d, double* e, double* z, lapack_int ldz )
 {
     lapack_int info = 0;
@@ -43,27 +43,27 @@ lapack_int LAPACKE_dstedc( int matrix_layout, char compz, lapack_int n,
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dstedc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstedc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -6;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dstedc_work( matrix_layout, compz, n, d, e, z, ldz,
+    info = API_SUFFIX(LAPACKE_dstedc_work)( matrix_layout, compz, n, d, e, z, ldz,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -82,7 +82,7 @@ lapack_int LAPACKE_dstedc( int matrix_layout, char compz, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dstedc_work( matrix_layout, compz, n, d, e, z, ldz, work,
+    info = API_SUFFIX(LAPACKE_dstedc_work)( matrix_layout, compz, n, d, e, z, ldz, work,
                                 lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -90,7 +90,7 @@ lapack_int LAPACKE_dstedc( int matrix_layout, char compz, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dstedc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstedc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dstedc_work.c b/LAPACKE/src/lapacke_dstedc_work.c
index e197899c14..c95567f10e 100644
--- a/LAPACKE/src/lapacke_dstedc_work.c
+++ b/LAPACKE/src/lapacke_dstedc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstedc_work( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dstedc_work)( int matrix_layout, char compz, lapack_int n,
                                 double* d, double* e, double* z, lapack_int ldz,
                                 double* work, lapack_int lwork,
                                 lapack_int* iwork, lapack_int liwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_dstedc_work( int matrix_layout, char compz, lapack_int n,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dstedc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstedc_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_dstedc_work( int matrix_layout, char compz, lapack_int n,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -69,8 +69,8 @@ lapack_int LAPACKE_dstedc_work( int matrix_layout, char compz, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dstedc( &compz, &n, d, e, z_t, &ldz_t, work, &lwork, iwork,
@@ -79,20 +79,20 @@ lapack_int LAPACKE_dstedc_work( int matrix_layout, char compz, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dstedc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstedc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dstedc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstedc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dstegr.c b/LAPACKE/src/lapacke_dstegr.c
index 50871aaff0..1afbbf27d8 100644
--- a/LAPACKE/src/lapacke_dstegr.c
+++ b/LAPACKE/src/lapacke_dstegr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstegr( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_dstegr)( int matrix_layout, char jobz, char range,
                            lapack_int n, double* d, double* e, double vl,
                            double vu, lapack_int il, lapack_int iu,
                            double abstol, lapack_int* m, double* w, double* z,
@@ -46,35 +46,35 @@ lapack_int LAPACKE_dstegr( int matrix_layout, char jobz, char range,
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dstegr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstegr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -8;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dstegr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_dstegr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, abstol, m, w, z, ldz, isuppz, &work_query,
                                 lwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -94,7 +94,7 @@ lapack_int LAPACKE_dstegr( int matrix_layout, char jobz, char range,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dstegr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_dstegr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, abstol, m, w, z, ldz, isuppz, work, lwork,
                                 iwork, liwork );
     /* Release memory and exit */
@@ -103,7 +103,7 @@ lapack_int LAPACKE_dstegr( int matrix_layout, char jobz, char range,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dstegr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstegr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dstegr_work.c b/LAPACKE/src/lapacke_dstegr_work.c
index 320f162e12..7538eae8d9 100644
--- a/LAPACKE/src/lapacke_dstegr_work.c
+++ b/LAPACKE/src/lapacke_dstegr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstegr_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_dstegr_work)( int matrix_layout, char jobz, char range,
                                 lapack_int n, double* d, double* e, double vl,
                                 double vu, lapack_int il, lapack_int iu,
                                 double abstol, lapack_int* m, double* w,
@@ -53,9 +53,9 @@ lapack_int LAPACKE_dstegr_work( int matrix_layout, char jobz, char range,
         lapack_int ldz_t = MAX(1,n);
         double* z_t = NULL;
         /* Check leading dimension(s) */
-        if( ( LAPACKE_lsame( jobz, 'v' ) && ( ldz < ldz_t )  ) || ( ldz < 1 ) ) {
+        if( ( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) && ( ldz < ldz_t )  ) || ( ldz < 1 ) ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dstegr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstegr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,7 +66,7 @@ lapack_int LAPACKE_dstegr_work( int matrix_layout, char jobz, char range,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             /* Let be always 'n' instead of 'm' */
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
@@ -82,20 +82,20 @@ lapack_int LAPACKE_dstegr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, *m, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, *m, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dstegr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstegr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dstegr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstegr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dstein.c b/LAPACKE/src/lapacke_dstein.c
index bddfa2ae42..00e6514fae 100644
--- a/LAPACKE/src/lapacke_dstein.c
+++ b/LAPACKE/src/lapacke_dstein.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstein( int matrix_layout, lapack_int n, const double* d,
+lapack_int API_SUFFIX(LAPACKE_dstein)( int matrix_layout, lapack_int n, const double* d,
                            const double* e, lapack_int m, const double* w,
                            const lapack_int* iblock, const lapack_int* isplit,
                            double* z, lapack_int ldz, lapack_int* ifailv )
@@ -41,19 +41,19 @@ lapack_int LAPACKE_dstein( int matrix_layout, lapack_int n, const double* d,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dstein", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstein", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -3;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n, w, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, w, 1 ) ) {
             return -6;
         }
     }
@@ -70,7 +70,7 @@ lapack_int LAPACKE_dstein( int matrix_layout, lapack_int n, const double* d,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dstein_work( matrix_layout, n, d, e, m, w, iblock, isplit, z,
+    info = API_SUFFIX(LAPACKE_dstein_work)( matrix_layout, n, d, e, m, w, iblock, isplit, z,
                                 ldz, work, iwork, ifailv );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -78,7 +78,7 @@ lapack_int LAPACKE_dstein( int matrix_layout, lapack_int n, const double* d,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dstein", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstein", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dstein_work.c b/LAPACKE/src/lapacke_dstein_work.c
index a1e2779fc8..7c3adc22e9 100644
--- a/LAPACKE/src/lapacke_dstein_work.c
+++ b/LAPACKE/src/lapacke_dstein_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstein_work( int matrix_layout, lapack_int n, const double* d,
+lapack_int API_SUFFIX(LAPACKE_dstein_work)( int matrix_layout, lapack_int n, const double* d,
                                 const double* e, lapack_int m, const double* w,
                                 const lapack_int* iblock,
                                 const lapack_int* isplit, double* z,
@@ -53,7 +53,7 @@ lapack_int LAPACKE_dstein_work( int matrix_layout, lapack_int n, const double* d
         /* Check leading dimension(s) */
         if( ldz < m ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dstein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstein_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -69,16 +69,16 @@ lapack_int LAPACKE_dstein_work( int matrix_layout, lapack_int n, const double* d
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, m, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, m, z_t, ldz_t, z, ldz );
         /* Release memory and exit */
         LAPACKE_free( z_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dstein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstein_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dstein_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstein_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dstemr.c b/LAPACKE/src/lapacke_dstemr.c
index a56a36f7b6..b03a0a76b7 100644
--- a/LAPACKE/src/lapacke_dstemr.c
+++ b/LAPACKE/src/lapacke_dstemr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstemr( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_dstemr)( int matrix_layout, char jobz, char range,
                            lapack_int n, double* d, double* e, double vl,
                            double vu, lapack_int il, lapack_int iu,
                            lapack_int* m, double* w, double* z, lapack_int ldz,
@@ -47,28 +47,28 @@ lapack_int LAPACKE_dstemr( int matrix_layout, char jobz, char range,
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dstemr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstemr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dstemr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_dstemr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, m, w, z, ldz, nzc, isuppz, tryrac,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -88,7 +88,7 @@ lapack_int LAPACKE_dstemr( int matrix_layout, char jobz, char range,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dstemr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_dstemr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, m, w, z, ldz, nzc, isuppz, tryrac, work,
                                 lwork, iwork, liwork );
     /* Release memory and exit */
@@ -97,7 +97,7 @@ lapack_int LAPACKE_dstemr( int matrix_layout, char jobz, char range,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dstemr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstemr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dstemr_work.c b/LAPACKE/src/lapacke_dstemr_work.c
index 560721b7d2..2d1b702372 100644
--- a/LAPACKE/src/lapacke_dstemr_work.c
+++ b/LAPACKE/src/lapacke_dstemr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstemr_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_dstemr_work)( int matrix_layout, char jobz, char range,
                                 lapack_int n, double* d, double* e, double vl,
                                 double vu, lapack_int il, lapack_int iu,
                                 lapack_int* m, double* w, double* z,
@@ -54,9 +54,9 @@ lapack_int LAPACKE_dstemr_work( int matrix_layout, char jobz, char range,
         lapack_int ldz_t = MAX(1,n);
         double* z_t = NULL;
         /* Check leading dimension(s) */
-        if( ldz < 1 || ( LAPACKE_lsame( jobz, 'v' ) && ldz < n ) ) {
+        if( ldz < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) && ldz < n ) ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_dstemr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstemr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,7 +67,7 @@ lapack_int LAPACKE_dstemr_work( int matrix_layout, char jobz, char range,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -82,20 +82,20 @@ lapack_int LAPACKE_dstemr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dstemr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstemr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dstemr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstemr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsteqr.c b/LAPACKE/src/lapacke_dsteqr.c
index fb2c4e8463..e0b4abf921 100644
--- a/LAPACKE/src/lapacke_dsteqr.c
+++ b/LAPACKE/src/lapacke_dsteqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsteqr( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsteqr)( int matrix_layout, char compz, lapack_int n,
                            double* d, double* e, double* z, lapack_int ldz )
 {
     lapack_int info = 0;
@@ -40,27 +40,27 @@ lapack_int LAPACKE_dsteqr( int matrix_layout, char compz, lapack_int n,
     lapack_int lwork;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsteqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsteqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -6;
             }
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( compz, 'n' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'n' ) ) {
         lwork = 1;
     } else {
         lwork = MAX(1,2*n-2);
@@ -72,12 +72,12 @@ lapack_int LAPACKE_dsteqr( int matrix_layout, char compz, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsteqr_work( matrix_layout, compz, n, d, e, z, ldz, work );
+    info = API_SUFFIX(LAPACKE_dsteqr_work)( matrix_layout, compz, n, d, e, z, ldz, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsteqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsteqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsteqr_work.c b/LAPACKE/src/lapacke_dsteqr_work.c
index ae61a378e8..6d7a5aa708 100644
--- a/LAPACKE/src/lapacke_dsteqr_work.c
+++ b/LAPACKE/src/lapacke_dsteqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsteqr_work( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsteqr_work)( int matrix_layout, char compz, lapack_int n,
                                 double* d, double* e, double* z, lapack_int ldz,
                                 double* work )
 {
@@ -49,11 +49,11 @@ lapack_int LAPACKE_dsteqr_work( int matrix_layout, char compz, lapack_int n,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dsteqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsteqr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -61,8 +61,8 @@ lapack_int LAPACKE_dsteqr_work( int matrix_layout, char compz, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dsteqr( &compz, &n, d, e, z_t, &ldz_t, work, &info );
@@ -70,20 +70,20 @@ lapack_int LAPACKE_dsteqr_work( int matrix_layout, char compz, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsteqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsteqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsteqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsteqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsterf.c b/LAPACKE/src/lapacke_dsterf.c
index 1dd5a3c8f8..77ed69f3d0 100644
--- a/LAPACKE/src/lapacke_dsterf.c
+++ b/LAPACKE/src/lapacke_dsterf.c
@@ -32,18 +32,18 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsterf( lapack_int n, double* d, double* e )
+lapack_int API_SUFFIX(LAPACKE_dsterf)( lapack_int n, double* d, double* e )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_dsterf_work( n, d, e );
+    return API_SUFFIX(LAPACKE_dsterf_work)( n, d, e );
 }
diff --git a/LAPACKE/src/lapacke_dsterf_work.c b/LAPACKE/src/lapacke_dsterf_work.c
index 390f5a5799..67f45ec9ae 100644
--- a/LAPACKE/src/lapacke_dsterf_work.c
+++ b/LAPACKE/src/lapacke_dsterf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsterf_work( lapack_int n, double* d, double* e )
+lapack_int API_SUFFIX(LAPACKE_dsterf_work)( lapack_int n, double* d, double* e )
 {
     lapack_int info = 0;
     /* Call LAPACK function and adjust info */
diff --git a/LAPACKE/src/lapacke_dstev.c b/LAPACKE/src/lapacke_dstev.c
index 90c111be53..d1af4cf8ca 100644
--- a/LAPACKE/src/lapacke_dstev.c
+++ b/LAPACKE/src/lapacke_dstev.c
@@ -32,28 +32,28 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstev( int matrix_layout, char jobz, lapack_int n, double* d,
+lapack_int API_SUFFIX(LAPACKE_dstev)( int matrix_layout, char jobz, lapack_int n, double* d,
                           double* e, double* z, lapack_int ldz )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dstev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( jobz, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
         work = (double*)LAPACKE_malloc( sizeof(double) * MAX(1,2*n-2) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -61,14 +61,14 @@ lapack_int LAPACKE_dstev( int matrix_layout, char jobz, lapack_int n, double* d,
         }
     }
     /* Call middle-level interface */
-    info = LAPACKE_dstev_work( matrix_layout, jobz, n, d, e, z, ldz, work );
+    info = API_SUFFIX(LAPACKE_dstev_work)( matrix_layout, jobz, n, d, e, z, ldz, work );
     /* Release memory and exit */
-    if( LAPACKE_lsame( jobz, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
         LAPACKE_free( work );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dstev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dstev_work.c b/LAPACKE/src/lapacke_dstev_work.c
index a71a0ea7e1..0160c12799 100644
--- a/LAPACKE/src/lapacke_dstev_work.c
+++ b/LAPACKE/src/lapacke_dstev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstev_work( int matrix_layout, char jobz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dstev_work)( int matrix_layout, char jobz, lapack_int n,
                                double* d, double* e, double* z, lapack_int ldz,
                                double* work )
 {
@@ -49,11 +49,11 @@ lapack_int LAPACKE_dstev_work( int matrix_layout, char jobz, lapack_int n,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dstev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstev_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -66,20 +66,20 @@ lapack_int LAPACKE_dstev_work( int matrix_layout, char jobz, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dstev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dstev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dstevd.c b/LAPACKE/src/lapacke_dstevd.c
index bb5435fa0a..75f2b72717 100644
--- a/LAPACKE/src/lapacke_dstevd.c
+++ b/LAPACKE/src/lapacke_dstevd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstevd( int matrix_layout, char jobz, lapack_int n, double* d,
+lapack_int API_SUFFIX(LAPACKE_dstevd)( int matrix_layout, char jobz, lapack_int n, double* d,
                            double* e, double* z, lapack_int ldz )
 {
     lapack_int info = 0;
@@ -43,22 +43,22 @@ lapack_int LAPACKE_dstevd( int matrix_layout, char jobz, lapack_int n, double* d
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dstevd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstevd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dstevd_work( matrix_layout, jobz, n, d, e, z, ldz,
+    info = API_SUFFIX(LAPACKE_dstevd_work)( matrix_layout, jobz, n, d, e, z, ldz,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -77,7 +77,7 @@ lapack_int LAPACKE_dstevd( int matrix_layout, char jobz, lapack_int n, double* d
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dstevd_work( matrix_layout, jobz, n, d, e, z, ldz, work,
+    info = API_SUFFIX(LAPACKE_dstevd_work)( matrix_layout, jobz, n, d, e, z, ldz, work,
                                 lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -85,7 +85,7 @@ lapack_int LAPACKE_dstevd( int matrix_layout, char jobz, lapack_int n, double* d
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dstevd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstevd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dstevd_work.c b/LAPACKE/src/lapacke_dstevd_work.c
index da9577abe9..22d47b0b10 100644
--- a/LAPACKE/src/lapacke_dstevd_work.c
+++ b/LAPACKE/src/lapacke_dstevd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstevd_work( int matrix_layout, char jobz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dstevd_work)( int matrix_layout, char jobz, lapack_int n,
                                 double* d, double* e, double* z, lapack_int ldz,
                                 double* work, lapack_int lwork,
                                 lapack_int* iwork, lapack_int liwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_dstevd_work( int matrix_layout, char jobz, lapack_int n,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dstevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstevd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_dstevd_work( int matrix_layout, char jobz, lapack_int n,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -75,20 +75,20 @@ lapack_int LAPACKE_dstevd_work( int matrix_layout, char jobz, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dstevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstevd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dstevd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstevd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dstevr.c b/LAPACKE/src/lapacke_dstevr.c
index b745ce75d1..5d83d6ac6c 100644
--- a/LAPACKE/src/lapacke_dstevr.c
+++ b/LAPACKE/src/lapacke_dstevr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstevr( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_dstevr)( int matrix_layout, char jobz, char range,
                            lapack_int n, double* d, double* e, double vl,
                            double vu, lapack_int il, lapack_int iu,
                            double abstol, lapack_int* m, double* w, double* z,
@@ -46,35 +46,35 @@ lapack_int LAPACKE_dstevr( int matrix_layout, char jobz, char range,
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dstevr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstevr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -8;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dstevr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_dstevr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, abstol, m, w, z, ldz, isuppz, &work_query,
                                 lwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -94,7 +94,7 @@ lapack_int LAPACKE_dstevr( int matrix_layout, char jobz, char range,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dstevr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_dstevr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, abstol, m, w, z, ldz, isuppz, work, lwork,
                                 iwork, liwork );
     /* Release memory and exit */
@@ -103,7 +103,7 @@ lapack_int LAPACKE_dstevr( int matrix_layout, char jobz, char range,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dstevr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstevr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dstevr_work.c b/LAPACKE/src/lapacke_dstevr_work.c
index 1505226206..21716e7483 100644
--- a/LAPACKE/src/lapacke_dstevr_work.c
+++ b/LAPACKE/src/lapacke_dstevr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstevr_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_dstevr_work)( int matrix_layout, char jobz, char range,
                                 lapack_int n, double* d, double* e, double vl,
                                 double vu, lapack_int il, lapack_int iu,
                                 double abstol, lapack_int* m, double* w,
@@ -50,15 +50,15 @@ lapack_int LAPACKE_dstevr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldz_t = MAX(1,n);
         double* z_t = NULL;
         /* Check leading dimension(s) */
         if( ldz < ncols_z ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dstevr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstevr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -69,7 +69,7 @@ lapack_int LAPACKE_dstevr_work( int matrix_layout, char jobz, char range,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -85,21 +85,21 @@ lapack_int LAPACKE_dstevr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dstevr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstevr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dstevr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstevr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dstevx.c b/LAPACKE/src/lapacke_dstevx.c
index 1b0219dabf..29e5b53162 100644
--- a/LAPACKE/src/lapacke_dstevx.c
+++ b/LAPACKE/src/lapacke_dstevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstevx( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_dstevx)( int matrix_layout, char jobz, char range,
                            lapack_int n, double* d, double* e, double vl,
                            double vu, lapack_int il, lapack_int iu,
                            double abstol, lapack_int* m, double* w, double* z,
@@ -42,28 +42,28 @@ lapack_int LAPACKE_dstevx( int matrix_layout, char jobz, char range,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dstevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -8;
             }
         }
@@ -81,7 +81,7 @@ lapack_int LAPACKE_dstevx( int matrix_layout, char jobz, char range,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dstevx_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_dstevx_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, abstol, m, w, z, ldz, work, iwork, ifail );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -89,7 +89,7 @@ lapack_int LAPACKE_dstevx( int matrix_layout, char jobz, char range,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dstevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dstevx_work.c b/LAPACKE/src/lapacke_dstevx_work.c
index 6e83917583..19acc72a22 100644
--- a/LAPACKE/src/lapacke_dstevx_work.c
+++ b/LAPACKE/src/lapacke_dstevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dstevx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_dstevx_work)( int matrix_layout, char jobz, char range,
                                 lapack_int n, double* d, double* e, double vl,
                                 double vu, lapack_int il, lapack_int iu,
                                 double abstol, lapack_int* m, double* w,
@@ -48,19 +48,19 @@ lapack_int LAPACKE_dstevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldz_t = MAX(1,n);
         double* z_t = NULL;
         /* Check leading dimension(s) */
         if( ldz < ncols_z ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dstevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstevx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -75,21 +75,21 @@ lapack_int LAPACKE_dstevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dstevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dstevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dstevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsycon.c b/LAPACKE/src/lapacke_dsycon.c
index 6ffc01b2cb..8ab722bb0a 100644
--- a/LAPACKE/src/lapacke_dsycon.c
+++ b/LAPACKE/src/lapacke_dsycon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsycon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsycon)( int matrix_layout, char uplo, lapack_int n,
                            const double* a, lapack_int lda,
                            const lapack_int* ipiv, double anorm, double* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_dsycon( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsycon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsycon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -7;
         }
     }
@@ -66,7 +66,7 @@ lapack_int LAPACKE_dsycon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsycon_work( matrix_layout, uplo, n, a, lda, ipiv, anorm,
+    info = API_SUFFIX(LAPACKE_dsycon_work)( matrix_layout, uplo, n, a, lda, ipiv, anorm,
                                 rcond, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -74,7 +74,7 @@ lapack_int LAPACKE_dsycon( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsycon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsycon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsycon_3.c b/LAPACKE/src/lapacke_dsycon_3.c
index 0ffd22680f..1999ce2e28 100644
--- a/LAPACKE/src/lapacke_dsycon_3.c
+++ b/LAPACKE/src/lapacke_dsycon_3.c
@@ -32,28 +32,28 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsycon_3( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsycon_3)( int matrix_layout, char uplo, lapack_int n,
                            const double* a, lapack_int lda, const double* e,
                            const lapack_int* ipiv, double anorm, double* rcond )
 {
     lapack_int info = 0;
     lapack_int* iwork = NULL;
     double* work = NULL;
-    lapack_int e_start = LAPACKE_lsame( uplo, 'U' ) ? 1 : 0;
+    lapack_int e_start = API_SUFFIX(LAPACKE_lsame)( uplo, 'U' ) ? 1 : 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsycon_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsycon_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n-1, e + e_start, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e + e_start, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -8;
         }
     }
@@ -70,7 +70,7 @@ lapack_int LAPACKE_dsycon_3( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsycon_3_work( matrix_layout, uplo, n, a, lda, e, ipiv, anorm,
+    info = API_SUFFIX(LAPACKE_dsycon_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv, anorm,
                                 rcond, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -78,7 +78,7 @@ lapack_int LAPACKE_dsycon_3( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsycon_3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsycon_3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsycon_3_work.c b/LAPACKE/src/lapacke_dsycon_3_work.c
index fedc94cec3..deba4f9ce2 100644
--- a/LAPACKE/src/lapacke_dsycon_3_work.c
+++ b/LAPACKE/src/lapacke_dsycon_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsycon_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsycon_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 const double* a, lapack_int lda,
                                 const double* e, const lapack_int* ipiv, double anorm,
                                 double* rcond, double* work, lapack_int* iwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_dsycon_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dsycon_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsycon_3_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_dsycon_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsycon_3( &uplo, &n, a_t, &lda_t, e, ipiv, &anorm, rcond, work, iwork,
                        &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_dsycon_3_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsycon_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsycon_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsycon_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsycon_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsycon_work.c b/LAPACKE/src/lapacke_dsycon_work.c
index 11400648c7..3268e8679a 100644
--- a/LAPACKE/src/lapacke_dsycon_work.c
+++ b/LAPACKE/src/lapacke_dsycon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsycon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsycon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const double* a, lapack_int lda,
                                 const lapack_int* ipiv, double anorm,
                                 double* rcond, double* work, lapack_int* iwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_dsycon_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dsycon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsycon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_dsycon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsycon( &uplo, &n, a_t, &lda_t, ipiv, &anorm, rcond, work, iwork,
                        &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_dsycon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsycon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsycon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsycon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsycon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyconv.c b/LAPACKE/src/lapacke_dsyconv.c
index a1b63f1f0f..f977635e07 100644
--- a/LAPACKE/src/lapacke_dsyconv.c
+++ b/LAPACKE/src/lapacke_dsyconv.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyconv( int matrix_layout, char uplo, char way, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsyconv)( int matrix_layout, char uplo, char way, lapack_int n,
                             double* a, lapack_int lda, const lapack_int* ipiv, double* e )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyconv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyconv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Call middle-level interface */
-    return LAPACKE_dsyconv_work( matrix_layout, uplo, way, n, a, lda, ipiv, e );
+    return API_SUFFIX(LAPACKE_dsyconv_work)( matrix_layout, uplo, way, n, a, lda, ipiv, e );
 }
diff --git a/LAPACKE/src/lapacke_dsyconv_work.c b/LAPACKE/src/lapacke_dsyconv_work.c
index 4c3e094dd4..cf710257f8 100644
--- a/LAPACKE/src/lapacke_dsyconv_work.c
+++ b/LAPACKE/src/lapacke_dsyconv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyconv_work( int matrix_layout, char uplo, char way,
+lapack_int API_SUFFIX(LAPACKE_dsyconv_work)( int matrix_layout, char uplo, char way,
                                  lapack_int n, double* a, lapack_int lda,
                                  const lapack_int* ipiv, double* e )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dsyconv_work( int matrix_layout, char uplo, char way,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsyconv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyconv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_dsyconv_work( int matrix_layout, char uplo, char way,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, lda, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, lda, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsyconv( &uplo, &way, &n, a_t, &lda_t, ipiv, e, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, lda, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, lda, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsyconv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyconv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsyconv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyconv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyequb.c b/LAPACKE/src/lapacke_dsyequb.c
index 80fcad4735..fd851ce56b 100644
--- a/LAPACKE/src/lapacke_dsyequb.c
+++ b/LAPACKE/src/lapacke_dsyequb.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyequb( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsyequb)( int matrix_layout, char uplo, lapack_int n,
                             const double* a, lapack_int lda, double* s,
                             double* scond, double* amax )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyequb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -57,13 +57,13 @@ lapack_int LAPACKE_dsyequb( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsyequb_work( matrix_layout, uplo, n, a, lda, s, scond, amax,
+    info = API_SUFFIX(LAPACKE_dsyequb_work)( matrix_layout, uplo, n, a, lda, s, scond, amax,
                                  work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyequb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyequb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyequb_work.c b/LAPACKE/src/lapacke_dsyequb_work.c
index 18dcf9c4c7..7a5eab661e 100644
--- a/LAPACKE/src/lapacke_dsyequb_work.c
+++ b/LAPACKE/src/lapacke_dsyequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyequb_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsyequb_work)( int matrix_layout, char uplo, lapack_int n,
                                  const double* a, lapack_int lda, double* s,
                                  double* scond, double* amax, double* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dsyequb_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dsyequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,7 +59,7 @@ lapack_int LAPACKE_dsyequb_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsyequb( &uplo, &n, a_t, &lda_t, s, scond, amax, work, &info );
         if( info < 0 ) {
@@ -69,11 +69,11 @@ lapack_int LAPACKE_dsyequb_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsyequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsyequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyev.c b/LAPACKE/src/lapacke_dsyev.c
index 33c9710f4c..68a91ff1df 100644
--- a/LAPACKE/src/lapacke_dsyev.c
+++ b/LAPACKE/src/lapacke_dsyev.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyev( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsyev)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           double* a, lapack_int lda, double* w )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_dsyev( int matrix_layout, char jobz, char uplo, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsyev_work( matrix_layout, jobz, uplo, n, a, lda, w,
+    info = API_SUFFIX(LAPACKE_dsyev_work)( matrix_layout, jobz, uplo, n, a, lda, w,
                                &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,13 +65,13 @@ lapack_int LAPACKE_dsyev( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsyev_work( matrix_layout, jobz, uplo, n, a, lda, w, work,
+    info = API_SUFFIX(LAPACKE_dsyev_work)( matrix_layout, jobz, uplo, n, a, lda, w, work,
                                lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyev_2stage.c b/LAPACKE/src/lapacke_dsyev_2stage.c
index ce8b7bbcc0..b5266ebfa9 100644
--- a/LAPACKE/src/lapacke_dsyev_2stage.c
+++ b/LAPACKE/src/lapacke_dsyev_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyev_2stage( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsyev_2stage)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           double* a, lapack_int lda, double* w )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_dsyev_2stage( int matrix_layout, char jobz, char uplo, lapack
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyev_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyev_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsyev_2stage_work( matrix_layout, jobz, uplo, n, a, lda, w,
+    info = API_SUFFIX(LAPACKE_dsyev_2stage_work)( matrix_layout, jobz, uplo, n, a, lda, w,
                                &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,13 +65,13 @@ lapack_int LAPACKE_dsyev_2stage( int matrix_layout, char jobz, char uplo, lapack
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsyev_2stage_work( matrix_layout, jobz, uplo, n, a, lda, w, work,
+    info = API_SUFFIX(LAPACKE_dsyev_2stage_work)( matrix_layout, jobz, uplo, n, a, lda, w, work,
                                lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyev_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyev_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyev_2stage_work.c b/LAPACKE/src/lapacke_dsyev_2stage_work.c
index a50254d4a3..17f76e5bf0 100644
--- a/LAPACKE/src/lapacke_dsyev_2stage_work.c
+++ b/LAPACKE/src/lapacke_dsyev_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyev_2stage_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsyev_2stage_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, double* a, lapack_int lda,
                                double* w, double* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dsyev_2stage_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsyev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyev_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_dsyev_2stage_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsyev_2stage( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsyev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyev_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsyev_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyev_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyev_work.c b/LAPACKE/src/lapacke_dsyev_work.c
index 343135eeab..dc6a7f1568 100644
--- a/LAPACKE/src/lapacke_dsyev_work.c
+++ b/LAPACKE/src/lapacke_dsyev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyev_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsyev_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, double* a, lapack_int lda,
                                double* w, double* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dsyev_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsyev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyev_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,7 +64,7 @@ lapack_int LAPACKE_dsyev_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsyev( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, &info );
         if( info < 0 ) {
@@ -72,19 +72,19 @@ lapack_int LAPACKE_dsyev_work( int matrix_layout, char jobz, char uplo,
         }
         /* Transpose output matrices */
         if ( jobz == 'V' || jobz == 'v' ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         } else {
-            LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsyev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsyev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyevd.c b/LAPACKE/src/lapacke_dsyevd.c
index 1c128f8c7d..79beddbd6f 100644
--- a/LAPACKE/src/lapacke_dsyevd.c
+++ b/LAPACKE/src/lapacke_dsyevd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyevd( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsyevd)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            double* a, lapack_int lda, double* w )
 {
     lapack_int info = 0;
@@ -43,19 +43,19 @@ lapack_int LAPACKE_dsyevd( int matrix_layout, char jobz, char uplo, lapack_int n
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyevd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsyevd_work( matrix_layout, jobz, uplo, n, a, lda, w,
+    info = API_SUFFIX(LAPACKE_dsyevd_work)( matrix_layout, jobz, uplo, n, a, lda, w,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -74,7 +74,7 @@ lapack_int LAPACKE_dsyevd( int matrix_layout, char jobz, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsyevd_work( matrix_layout, jobz, uplo, n, a, lda, w, work,
+    info = API_SUFFIX(LAPACKE_dsyevd_work)( matrix_layout, jobz, uplo, n, a, lda, w, work,
                                 lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -82,7 +82,7 @@ lapack_int LAPACKE_dsyevd( int matrix_layout, char jobz, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyevd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyevd_2stage.c b/LAPACKE/src/lapacke_dsyevd_2stage.c
index c720f197a2..94b5b28462 100644
--- a/LAPACKE/src/lapacke_dsyevd_2stage.c
+++ b/LAPACKE/src/lapacke_dsyevd_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyevd_2stage( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsyevd_2stage)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            double* a, lapack_int lda, double* w )
 {
     lapack_int info = 0;
@@ -43,19 +43,19 @@ lapack_int LAPACKE_dsyevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyevd_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevd_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsyevd_2stage_work( matrix_layout, jobz, uplo, n, a, lda, w,
+    info = API_SUFFIX(LAPACKE_dsyevd_2stage_work)( matrix_layout, jobz, uplo, n, a, lda, w,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -74,7 +74,7 @@ lapack_int LAPACKE_dsyevd_2stage( int matrix_layout, char jobz, char uplo, lapac
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsyevd_2stage_work( matrix_layout, jobz, uplo, n, a, lda, w, work,
+    info = API_SUFFIX(LAPACKE_dsyevd_2stage_work)( matrix_layout, jobz, uplo, n, a, lda, w, work,
                                 lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -82,7 +82,7 @@ lapack_int LAPACKE_dsyevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyevd_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevd_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyevd_2stage_work.c b/LAPACKE/src/lapacke_dsyevd_2stage_work.c
index 4fce77a668..9bc45c60fb 100644
--- a/LAPACKE/src/lapacke_dsyevd_2stage_work.c
+++ b/LAPACKE/src/lapacke_dsyevd_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyevd_2stage_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsyevd_2stage_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, double* a, lapack_int lda,
                                 double* w, double* work, lapack_int lwork,
                                 lapack_int* iwork, lapack_int liwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_dsyevd_2stage_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsyevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevd_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,7 +67,7 @@ lapack_int LAPACKE_dsyevd_2stage_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsyevd_2stage( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, iwork,
                        &liwork, &info );
@@ -76,19 +76,19 @@ lapack_int LAPACKE_dsyevd_2stage_work( int matrix_layout, char jobz, char uplo,
         }
         /* Transpose output matrices */
         if ( jobz == 'V' || jobz == 'v' ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         } else {
-            LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsyevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevd_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsyevd_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevd_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyevd_work.c b/LAPACKE/src/lapacke_dsyevd_work.c
index c3cc755b18..1dead1b00b 100644
--- a/LAPACKE/src/lapacke_dsyevd_work.c
+++ b/LAPACKE/src/lapacke_dsyevd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyevd_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsyevd_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, double* a, lapack_int lda,
                                 double* w, double* work, lapack_int lwork,
                                 lapack_int* iwork, lapack_int liwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_dsyevd_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsyevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,7 +67,7 @@ lapack_int LAPACKE_dsyevd_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsyevd( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, iwork,
                        &liwork, &info );
@@ -76,19 +76,19 @@ lapack_int LAPACKE_dsyevd_work( int matrix_layout, char jobz, char uplo,
         }
         /* Transpose output matrices */
         if ( jobz == 'V' || jobz == 'v' ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         } else {
-            LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsyevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsyevd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyevr.c b/LAPACKE/src/lapacke_dsyevr.c
index 8fba691d6c..9af609447d 100644
--- a/LAPACKE/src/lapacke_dsyevr.c
+++ b/LAPACKE/src/lapacke_dsyevr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyevr( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsyevr)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, double* a, lapack_int lda, double vl,
                            double vu, lapack_int il, lapack_int iu,
                            double abstol, lapack_int* m, double* w, double* z,
@@ -46,32 +46,32 @@ lapack_int LAPACKE_dsyevr( int matrix_layout, char jobz, char range, char uplo,
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyevr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -9;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsyevr_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_dsyevr_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, isuppz,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -91,7 +91,7 @@ lapack_int LAPACKE_dsyevr( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsyevr_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_dsyevr_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, isuppz, work,
                                 lwork, iwork, liwork );
     /* Release memory and exit */
@@ -100,7 +100,7 @@ lapack_int LAPACKE_dsyevr( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyevr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyevr_2stage.c b/LAPACKE/src/lapacke_dsyevr_2stage.c
index abd85b8ccf..319a268365 100644
--- a/LAPACKE/src/lapacke_dsyevr_2stage.c
+++ b/LAPACKE/src/lapacke_dsyevr_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyevr_2stage( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsyevr_2stage)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, double* a, lapack_int lda, double vl,
                            double vu, lapack_int il, lapack_int iu,
                            double abstol, lapack_int* m, double* w, double* z,
@@ -46,32 +46,32 @@ lapack_int LAPACKE_dsyevr_2stage( int matrix_layout, char jobz, char range, char
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyevr_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevr_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -9;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsyevr_2stage_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_dsyevr_2stage_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, isuppz,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -91,7 +91,7 @@ lapack_int LAPACKE_dsyevr_2stage( int matrix_layout, char jobz, char range, char
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsyevr_2stage_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_dsyevr_2stage_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, isuppz, work,
                                 lwork, iwork, liwork );
     /* Release memory and exit */
@@ -100,7 +100,7 @@ lapack_int LAPACKE_dsyevr_2stage( int matrix_layout, char jobz, char range, char
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyevr_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevr_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyevr_2stage_work.c b/LAPACKE/src/lapacke_dsyevr_2stage_work.c
index 0e055c1c8b..8308a54bc9 100644
--- a/LAPACKE/src/lapacke_dsyevr_2stage_work.c
+++ b/LAPACKE/src/lapacke_dsyevr_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyevr_2stage_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_dsyevr_2stage_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, double* a,
                                 lapack_int lda, double vl, double vu,
                                 lapack_int il, lapack_int iu, double abstol,
@@ -51,9 +51,9 @@ lapack_int LAPACKE_dsyevr_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
         double* a_t = NULL;
@@ -61,12 +61,12 @@ lapack_int LAPACKE_dsyevr_2stage_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dsyevr_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevr_2stage_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_dsyevr_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevr_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -82,7 +82,7 @@ lapack_int LAPACKE_dsyevr_2stage_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -91,7 +91,7 @@ lapack_int LAPACKE_dsyevr_2stage_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsyevr_2stage( &jobz, &range, &uplo, &n, a_t, &lda_t, &vl, &vu, &il,
                        &iu, &abstol, m, w, z_t, &ldz_t, isuppz, work, &lwork,
@@ -100,24 +100,24 @@ lapack_int LAPACKE_dsyevr_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsyevr_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevr_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsyevr_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevr_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyevr_work.c b/LAPACKE/src/lapacke_dsyevr_work.c
index 12c356f285..184629f28e 100644
--- a/LAPACKE/src/lapacke_dsyevr_work.c
+++ b/LAPACKE/src/lapacke_dsyevr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyevr_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_dsyevr_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, double* a,
                                 lapack_int lda, double vl, double vu,
                                 lapack_int il, lapack_int iu, double abstol,
@@ -51,10 +51,10 @@ lapack_int LAPACKE_dsyevr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( !LAPACKE_lsame( jobz, 'v' ) ) ? 1 :
-                             ( LAPACKE_lsame( range, 'a' ) ||
-                               LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( !API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) ? 1 :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                               API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
         double* a_t = NULL;
@@ -62,12 +62,12 @@ lapack_int LAPACKE_dsyevr_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dsyevr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevr_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_dsyevr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,7 +83,7 @@ lapack_int LAPACKE_dsyevr_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -92,7 +92,7 @@ lapack_int LAPACKE_dsyevr_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsyevr( &jobz, &range, &uplo, &n, a_t, &lda_t, &vl, &vu, &il,
                        &iu, &abstol, m, w, z_t, &ldz_t, isuppz, work, &lwork,
@@ -101,24 +101,24 @@ lapack_int LAPACKE_dsyevr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsyevr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsyevr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyevx.c b/LAPACKE/src/lapacke_dsyevx.c
index 39e2b921f5..04ae4d7bcd 100644
--- a/LAPACKE/src/lapacke_dsyevx.c
+++ b/LAPACKE/src/lapacke_dsyevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyevx( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsyevx)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, double* a, lapack_int lda, double vl,
                            double vu, lapack_int il, lapack_int iu,
                            double abstol, lapack_int* m, double* w, double* z,
@@ -44,25 +44,25 @@ lapack_int LAPACKE_dsyevx( int matrix_layout, char jobz, char range, char uplo,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -9;
             }
         }
@@ -75,7 +75,7 @@ lapack_int LAPACKE_dsyevx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsyevx_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_dsyevx_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, &work_query,
                                 lwork, iwork, ifail );
     if( info != 0 ) {
@@ -89,7 +89,7 @@ lapack_int LAPACKE_dsyevx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsyevx_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_dsyevx_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, work, lwork,
                                 iwork, ifail );
     /* Release memory and exit */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_dsyevx( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyevx_2stage.c b/LAPACKE/src/lapacke_dsyevx_2stage.c
index 904089295c..4047116f42 100644
--- a/LAPACKE/src/lapacke_dsyevx_2stage.c
+++ b/LAPACKE/src/lapacke_dsyevx_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyevx_2stage( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsyevx_2stage)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, double* a, lapack_int lda, double vl,
                            double vu, lapack_int il, lapack_int iu,
                            double abstol, lapack_int* m, double* w, double* z,
@@ -44,25 +44,25 @@ lapack_int LAPACKE_dsyevx_2stage( int matrix_layout, char jobz, char range, char
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyevx_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevx_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -9;
             }
         }
@@ -75,7 +75,7 @@ lapack_int LAPACKE_dsyevx_2stage( int matrix_layout, char jobz, char range, char
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsyevx_2stage_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_dsyevx_2stage_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, &work_query,
                                 lwork, iwork, ifail );
     if( info != 0 ) {
@@ -89,7 +89,7 @@ lapack_int LAPACKE_dsyevx_2stage( int matrix_layout, char jobz, char range, char
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsyevx_2stage_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_dsyevx_2stage_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, work, lwork,
                                 iwork, ifail );
     /* Release memory and exit */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_dsyevx_2stage( int matrix_layout, char jobz, char range, char
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyevx_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevx_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyevx_2stage_work.c b/LAPACKE/src/lapacke_dsyevx_2stage_work.c
index ea00282c15..19539a0775 100644
--- a/LAPACKE/src/lapacke_dsyevx_2stage_work.c
+++ b/LAPACKE/src/lapacke_dsyevx_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyevx_2stage_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_dsyevx_2stage_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, double* a,
                                 lapack_int lda, double vl, double vu,
                                 lapack_int il, lapack_int iu, double abstol,
@@ -50,9 +50,9 @@ lapack_int LAPACKE_dsyevx_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
         double* a_t = NULL;
@@ -60,12 +60,12 @@ lapack_int LAPACKE_dsyevx_2stage_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dsyevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevx_2stage_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_dsyevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevx_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -81,7 +81,7 @@ lapack_int LAPACKE_dsyevx_2stage_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -90,7 +90,7 @@ lapack_int LAPACKE_dsyevx_2stage_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsyevx_2stage( &jobz, &range, &uplo, &n, a_t, &lda_t, &vl, &vu, &il,
                        &iu, &abstol, m, w, z_t, &ldz_t, work, &lwork, iwork,
@@ -99,24 +99,24 @@ lapack_int LAPACKE_dsyevx_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsyevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevx_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsyevx_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevx_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyevx_work.c b/LAPACKE/src/lapacke_dsyevx_work.c
index 7d94a08951..ce20575663 100644
--- a/LAPACKE/src/lapacke_dsyevx_work.c
+++ b/LAPACKE/src/lapacke_dsyevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyevx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_dsyevx_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, double* a,
                                 lapack_int lda, double vl, double vu,
                                 lapack_int il, lapack_int iu, double abstol,
@@ -50,10 +50,10 @@ lapack_int LAPACKE_dsyevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( !LAPACKE_lsame( jobz, 'v' ) ) ? 1 :
-                             ( LAPACKE_lsame( range, 'a' ) ||
-                               LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( !API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) ? 1 :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                               API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
         double* a_t = NULL;
@@ -61,12 +61,12 @@ lapack_int LAPACKE_dsyevx_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dsyevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevx_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_dsyevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -82,7 +82,7 @@ lapack_int LAPACKE_dsyevx_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -91,7 +91,7 @@ lapack_int LAPACKE_dsyevx_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsyevx( &jobz, &range, &uplo, &n, a_t, &lda_t, &vl, &vu, &il,
                        &iu, &abstol, m, w, z_t, &ldz_t, work, &lwork, iwork,
@@ -100,24 +100,24 @@ lapack_int LAPACKE_dsyevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsyevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsyevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsygst.c b/LAPACKE/src/lapacke_dsygst.c
index 128a9a2ac5..836bc152cc 100644
--- a/LAPACKE/src/lapacke_dsygst.c
+++ b/LAPACKE/src/lapacke_dsygst.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsygst( int matrix_layout, lapack_int itype, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsygst)( int matrix_layout, lapack_int itype, char uplo,
                            lapack_int n, double* a, lapack_int lda,
                            const double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsygst", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygst", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_dsygst_work( matrix_layout, itype, uplo, n, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_dsygst_work)( matrix_layout, itype, uplo, n, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dsygst_work.c b/LAPACKE/src/lapacke_dsygst_work.c
index e85b641f0d..ce08a50313 100644
--- a/LAPACKE/src/lapacke_dsygst_work.c
+++ b/LAPACKE/src/lapacke_dsygst_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsygst_work( int matrix_layout, lapack_int itype, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsygst_work)( int matrix_layout, lapack_int itype, char uplo,
                                 lapack_int n, double* a, lapack_int lda,
                                 const double* b, lapack_int ldb )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_dsygst_work( int matrix_layout, lapack_int itype, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsygst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygst_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dsygst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygst_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,26 +71,26 @@ lapack_int LAPACKE_dsygst_work( int matrix_layout, lapack_int itype, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsygst( &itype, &uplo, &n, a_t, &lda_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsygst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygst_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsygst_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygst_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsygv.c b/LAPACKE/src/lapacke_dsygv.c
index c989bdac2f..56b840a1bb 100644
--- a/LAPACKE/src/lapacke_dsygv.c
+++ b/LAPACKE/src/lapacke_dsygv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsygv( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_dsygv)( int matrix_layout, lapack_int itype, char jobz,
                           char uplo, lapack_int n, double* a, lapack_int lda,
                           double* b, lapack_int ldb, double* w )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dsygv( int matrix_layout, lapack_int itype, char jobz,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsygv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsygv_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_dsygv_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                ldb, w, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_dsygv( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsygv_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_dsygv_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                ldb, w, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsygv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsygv_2stage.c b/LAPACKE/src/lapacke_dsygv_2stage.c
index 4bcacd3063..546a63bf6a 100644
--- a/LAPACKE/src/lapacke_dsygv_2stage.c
+++ b/LAPACKE/src/lapacke_dsygv_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsygv_2stage( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_dsygv_2stage)( int matrix_layout, lapack_int itype, char jobz,
                           char uplo, lapack_int n, double* a, lapack_int lda,
                           double* b, lapack_int ldb, double* w )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dsygv_2stage( int matrix_layout, lapack_int itype, char jobz,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsygv_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygv_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsygv_2stage_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_dsygv_2stage_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                ldb, w, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_dsygv_2stage( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsygv_2stage_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_dsygv_2stage_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                ldb, w, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsygv_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygv_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsygv_2stage_work.c b/LAPACKE/src/lapacke_dsygv_2stage_work.c
index 5f6b620230..240097c241 100644
--- a/LAPACKE/src/lapacke_dsygv_2stage_work.c
+++ b/LAPACKE/src/lapacke_dsygv_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsygv_2stage_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_dsygv_2stage_work)( int matrix_layout, lapack_int itype, char jobz,
                                char uplo, lapack_int n, double* a,
                                lapack_int lda, double* b, lapack_int ldb,
                                double* w, double* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_dsygv_2stage_work( int matrix_layout, lapack_int itype, char
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dsygv_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygv_2stage_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dsygv_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygv_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_dsygv_2stage_work( int matrix_layout, lapack_int itype, char
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsygv_2stage( &itype, &jobz, &uplo, &n, a_t, &lda_t, b_t, &ldb_t, w,
                       work, &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_dsygv_2stage_work( int matrix_layout, lapack_int itype, char
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsygv_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygv_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsygv_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygv_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsygv_work.c b/LAPACKE/src/lapacke_dsygv_work.c
index 7ccefa4518..eee082d579 100644
--- a/LAPACKE/src/lapacke_dsygv_work.c
+++ b/LAPACKE/src/lapacke_dsygv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsygv_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_dsygv_work)( int matrix_layout, lapack_int itype, char jobz,
                                char uplo, lapack_int n, double* a,
                                lapack_int lda, double* b, lapack_int ldb,
                                double* w, double* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_dsygv_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dsygv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygv_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dsygv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygv_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_dsygv_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsygv( &itype, &jobz, &uplo, &n, a_t, &lda_t, b_t, &ldb_t, w,
                       work, &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_dsygv_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsygv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsygv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsygvd.c b/LAPACKE/src/lapacke_dsygvd.c
index d40c4a1c42..586bed464f 100644
--- a/LAPACKE/src/lapacke_dsygvd.c
+++ b/LAPACKE/src/lapacke_dsygvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsygvd( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_dsygvd)( int matrix_layout, lapack_int itype, char jobz,
                            char uplo, lapack_int n, double* a, lapack_int lda,
                            double* b, lapack_int ldb, double* w )
 {
@@ -44,22 +44,22 @@ lapack_int LAPACKE_dsygvd( int matrix_layout, lapack_int itype, char jobz,
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsygvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsygvd_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_dsygvd_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                 ldb, w, &work_query, lwork, &iwork_query,
                                 liwork );
     if( info != 0 ) {
@@ -79,7 +79,7 @@ lapack_int LAPACKE_dsygvd( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsygvd_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_dsygvd_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                 ldb, w, work, lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -87,7 +87,7 @@ lapack_int LAPACKE_dsygvd( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsygvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsygvd_work.c b/LAPACKE/src/lapacke_dsygvd_work.c
index d49ed790b6..125ec686ca 100644
--- a/LAPACKE/src/lapacke_dsygvd_work.c
+++ b/LAPACKE/src/lapacke_dsygvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsygvd_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_dsygvd_work)( int matrix_layout, lapack_int itype, char jobz,
                                 char uplo, lapack_int n, double* a,
                                 lapack_int lda, double* b, lapack_int ldb,
                                 double* w, double* work, lapack_int lwork,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_dsygvd_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dsygvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygvd_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dsygvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygvd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -80,8 +80,8 @@ lapack_int LAPACKE_dsygvd_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsygvd( &itype, &jobz, &uplo, &n, a_t, &lda_t, b_t, &ldb_t, w,
                        work, &lwork, iwork, &liwork, &info );
@@ -89,19 +89,19 @@ lapack_int LAPACKE_dsygvd_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsygvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsygvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsygvx.c b/LAPACKE/src/lapacke_dsygvx.c
index 9396d5a09c..7dacdbbb16 100644
--- a/LAPACKE/src/lapacke_dsygvx.c
+++ b/LAPACKE/src/lapacke_dsygvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsygvx( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_dsygvx)( int matrix_layout, lapack_int itype, char jobz,
                            char range, char uplo, lapack_int n, double* a,
                            lapack_int lda, double* b, lapack_int ldb, double vl,
                            double vu, lapack_int il, lapack_int iu,
@@ -45,28 +45,28 @@ lapack_int LAPACKE_dsygvx( int matrix_layout, lapack_int itype, char jobz,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsygvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -15;
         }
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -12;
             }
         }
@@ -79,7 +79,7 @@ lapack_int LAPACKE_dsygvx( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsygvx_work( matrix_layout, itype, jobz, range, uplo, n, a,
+    info = API_SUFFIX(LAPACKE_dsygvx_work)( matrix_layout, itype, jobz, range, uplo, n, a,
                                 lda, b, ldb, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, &work_query, lwork, iwork, ifail );
     if( info != 0 ) {
@@ -93,7 +93,7 @@ lapack_int LAPACKE_dsygvx( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsygvx_work( matrix_layout, itype, jobz, range, uplo, n, a,
+    info = API_SUFFIX(LAPACKE_dsygvx_work)( matrix_layout, itype, jobz, range, uplo, n, a,
                                 lda, b, ldb, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, work, lwork, iwork, ifail );
     /* Release memory and exit */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_dsygvx( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsygvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsygvx_work.c b/LAPACKE/src/lapacke_dsygvx_work.c
index 91a8d98224..77ec1bca8a 100644
--- a/LAPACKE/src/lapacke_dsygvx_work.c
+++ b/LAPACKE/src/lapacke_dsygvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsygvx_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_dsygvx_work)( int matrix_layout, lapack_int itype, char jobz,
                                 char range, char uplo, lapack_int n, double* a,
                                 lapack_int lda, double* b, lapack_int ldb,
                                 double vl, double vu, lapack_int il,
@@ -51,9 +51,9 @@ lapack_int LAPACKE_dsygvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldb_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
@@ -63,17 +63,17 @@ lapack_int LAPACKE_dsygvx_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dsygvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygvx_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dsygvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygvx_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_dsygvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygvx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -94,7 +94,7 @@ lapack_int LAPACKE_dsygvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -103,8 +103,8 @@ lapack_int LAPACKE_dsygvx_work( int matrix_layout, lapack_int itype, char jobz,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsygvx( &itype, &jobz, &range, &uplo, &n, a_t, &lda_t, b_t,
                        &ldb_t, &vl, &vu, &il, &iu, &abstol, m, w, z_t, &ldz_t,
@@ -113,14 +113,14 @@ lapack_int LAPACKE_dsygvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
@@ -129,11 +129,11 @@ lapack_int LAPACKE_dsygvx_work( int matrix_layout, lapack_int itype, char jobz,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsygvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsygvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsygvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyrfs.c b/LAPACKE/src/lapacke_dsyrfs.c
index c63c9c5ce9..e5a8b61ebe 100644
--- a/LAPACKE/src/lapacke_dsyrfs.c
+++ b/LAPACKE/src/lapacke_dsyrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyrfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsyrfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const double* a, lapack_int lda,
                            const double* af, lapack_int ldaf,
                            const lapack_int* ipiv, const double* b,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_dsyrfs( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -75,7 +75,7 @@ lapack_int LAPACKE_dsyrfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsyrfs_work( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
+    info = API_SUFFIX(LAPACKE_dsyrfs_work)( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
                                 ipiv, b, ldb, x, ldx, ferr, berr, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -83,7 +83,7 @@ lapack_int LAPACKE_dsyrfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyrfs_work.c b/LAPACKE/src/lapacke_dsyrfs_work.c
index 573087b368..13754f7409 100644
--- a/LAPACKE/src/lapacke_dsyrfs_work.c
+++ b/LAPACKE/src/lapacke_dsyrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyrfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsyrfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const double* a,
                                 lapack_int lda, const double* af,
                                 lapack_int ldaf, const lapack_int* ipiv,
@@ -60,22 +60,22 @@ lapack_int LAPACKE_dsyrfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyrfs_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dsyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dsyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dsyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -100,10 +100,10 @@ lapack_int LAPACKE_dsyrfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsyrfs( &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, ipiv, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, iwork, &info );
@@ -111,7 +111,7 @@ lapack_int LAPACKE_dsyrfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -122,11 +122,11 @@ lapack_int LAPACKE_dsyrfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsyrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyrfsx.c b/LAPACKE/src/lapacke_dsyrfsx.c
index b0590d60cf..8323043355 100644
--- a/LAPACKE/src/lapacke_dsyrfsx.c
+++ b/LAPACKE/src/lapacke_dsyrfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyrfsx( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_dsyrfsx)( int matrix_layout, char uplo, char equed,
                             lapack_int n, lapack_int nrhs, const double* a,
                             lapack_int lda, const double* af, lapack_int ldaf,
                             const lapack_int* ipiv, const double* s,
@@ -46,32 +46,32 @@ lapack_int LAPACKE_dsyrfsx( int matrix_layout, char uplo, char equed,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyrfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyrfsx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -22;
             }
         }
-        if( LAPACKE_lsame( equed, 'y' ) ) {
-            if( LAPACKE_d_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, s, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -14;
         }
     }
@@ -88,7 +88,7 @@ lapack_int LAPACKE_dsyrfsx( int matrix_layout, char uplo, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsyrfsx_work( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_dsyrfsx_work)( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
                                  ldaf, ipiv, s, b, ldb, x, ldx, rcond, berr,
                                  n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, iwork );
@@ -98,7 +98,7 @@ lapack_int LAPACKE_dsyrfsx( int matrix_layout, char uplo, char equed,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyrfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyrfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyrfsx_work.c b/LAPACKE/src/lapacke_dsyrfsx_work.c
index 1e2ba0e578..5ac9e864ca 100644
--- a/LAPACKE/src/lapacke_dsyrfsx_work.c
+++ b/LAPACKE/src/lapacke_dsyrfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyrfsx_work( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_dsyrfsx_work)( int matrix_layout, char uplo, char equed,
                                  lapack_int n, lapack_int nrhs, const double* a,
                                  lapack_int lda, const double* af,
                                  lapack_int ldaf, const lapack_int* ipiv,
@@ -68,22 +68,22 @@ lapack_int LAPACKE_dsyrfsx_work( int matrix_layout, char uplo, char equed,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dsyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyrfsx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dsyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyrfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dsyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyrfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dsyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyrfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -120,10 +120,10 @@ lapack_int LAPACKE_dsyrfsx_work( int matrix_layout, char uplo, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsyrfsx( &uplo, &equed, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, s, b_t, &ldb_t, x_t, &ldx_t, rcond, berr,
@@ -133,10 +133,10 @@ lapack_int LAPACKE_dsyrfsx_work( int matrix_layout, char uplo, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -152,11 +152,11 @@ lapack_int LAPACKE_dsyrfsx_work( int matrix_layout, char uplo, char equed,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyrfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsyrfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyrfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsysv.c b/LAPACKE/src/lapacke_dsysv.c
index 0ef7fbc6c4..3e00b522cc 100644
--- a/LAPACKE/src/lapacke_dsysv.c
+++ b/LAPACKE/src/lapacke_dsysv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsysv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsysv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, double* a, lapack_int lda,
                           lapack_int* ipiv, double* b, lapack_int ldb )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dsysv( int matrix_layout, char uplo, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsysv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsysv_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_dsysv_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_dsysv( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsysv_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_dsysv_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsysv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsysv_aa.c b/LAPACKE/src/lapacke_dsysv_aa.c
index 1197d03fb5..d2525c4556 100644
--- a/LAPACKE/src/lapacke_dsysv_aa.c
+++ b/LAPACKE/src/lapacke_dsysv_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsysv_aa( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsysv_aa)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, double* a, lapack_int lda,
                           lapack_int* ipiv, double* b, lapack_int ldb )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dsysv_aa( int matrix_layout, char uplo, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsysv_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsysv_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_dsysv_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_dsysv_aa( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsysv_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_dsysv_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsysv_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsysv_aa_2stage.c b/LAPACKE/src/lapacke_dsysv_aa_2stage.c
index 95222b0e7b..90b9b156d5 100644
--- a/LAPACKE/src/lapacke_dsysv_aa_2stage.c
+++ b/LAPACKE/src/lapacke_dsysv_aa_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsysv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsysv_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, double* a, lapack_int lda,
                           double* tb, lapack_int ltb, lapack_int* ipiv, 
                           lapack_int* ipiv2, double* b, lapack_int ldb )
@@ -42,25 +42,25 @@ lapack_int LAPACKE_dsysv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsysv_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsysv_aa_2stage_work( matrix_layout, uplo, n, nrhs, 
+    info = API_SUFFIX(LAPACKE_dsysv_aa_2stage_work)( matrix_layout, uplo, n, nrhs, 
     						   a, lda, tb, ltb, ipiv, ipiv2, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
@@ -74,14 +74,14 @@ lapack_int LAPACKE_dsysv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsysv_aa_2stage_work( matrix_layout, uplo, n, nrhs,
+    info = API_SUFFIX(LAPACKE_dsysv_aa_2stage_work)( matrix_layout, uplo, n, nrhs,
                                a, lda, tb, ltb, ipiv, ipiv2, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsysv_aa_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_aa_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsysv_aa_2stage_work.c b/LAPACKE/src/lapacke_dsysv_aa_2stage_work.c
index 9e421361a7..dbff2b8410 100644
--- a/LAPACKE/src/lapacke_dsysv_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_dsysv_aa_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsysv_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsysv_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, double* a, lapack_int lda,
                                double* tb, lapack_int ltb, lapack_int* ipiv, 
                                lapack_int* ipiv2, double* b, lapack_int ldb,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_dsysv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsysv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dsysv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_aa_2stage_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dsysv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_aa_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -93,8 +93,8 @@ lapack_int LAPACKE_dsysv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsysv_aa_2stage( &uplo, &n, &nrhs, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, b_t, &ldb_t, work,
@@ -103,8 +103,8 @@ lapack_int LAPACKE_dsysv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_2:
@@ -113,11 +113,11 @@ lapack_int LAPACKE_dsysv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsysv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsysv_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsysv_aa_work.c b/LAPACKE/src/lapacke_dsysv_aa_work.c
index 8054b01288..844538f3a2 100644
--- a/LAPACKE/src/lapacke_dsysv_aa_work.c
+++ b/LAPACKE/src/lapacke_dsysv_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsysv_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsysv_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, double* a, lapack_int lda,
                                lapack_int* ipiv, double* b, lapack_int ldb,
                                double* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_dsysv_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsysv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_aa_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dsysv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_aa_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_dsysv_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsysv_aa( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_dsysv_aa_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsysv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsysv_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsysv_rk.c b/LAPACKE/src/lapacke_dsysv_rk.c
index 2a6303049a..96c16f2c74 100644
--- a/LAPACKE/src/lapacke_dsysv_rk.c
+++ b/LAPACKE/src/lapacke_dsysv_rk.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsysv_rk( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsysv_rk)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, double* a, lapack_int lda,
                           double* e, lapack_int* ipiv, double* b, lapack_int ldb )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dsysv_rk( int matrix_layout, char uplo, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsysv_rk", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_rk", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsysv_rk_work( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
+    info = API_SUFFIX(LAPACKE_dsysv_rk_work)( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_dsysv_rk( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsysv_rk_work( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
+    info = API_SUFFIX(LAPACKE_dsysv_rk_work)( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsysv_rk", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_rk", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsysv_rk_work.c b/LAPACKE/src/lapacke_dsysv_rk_work.c
index f8e41d6ddf..ad638cec85 100644
--- a/LAPACKE/src/lapacke_dsysv_rk_work.c
+++ b/LAPACKE/src/lapacke_dsysv_rk_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsysv_rk_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsysv_rk_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, double* a, lapack_int lda,
                                double* e, lapack_int* ipiv, double* b, lapack_int ldb,
                                double* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_dsysv_rk_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsysv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_rk_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dsysv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_rk_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_dsysv_rk_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsysv_rk( &uplo, &n, &nrhs, a_t, &lda_t, e, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_dsysv_rk_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsysv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_rk_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsysv_rk_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_rk_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsysv_rook.c b/LAPACKE/src/lapacke_dsysv_rook.c
index 843d10b9f0..a918d98ce1 100644
--- a/LAPACKE/src/lapacke_dsysv_rook.c
+++ b/LAPACKE/src/lapacke_dsysv_rook.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsysv_rook( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsysv_rook)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, double* a, lapack_int lda,
                                lapack_int* ipiv, double* b, lapack_int ldb )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dsysv_rook( int matrix_layout, char uplo, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsysv_rook", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_rook", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsysv_rook_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_dsysv_rook_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv,
                                     b, ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_dsysv_rook( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsysv_rook_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_dsysv_rook_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv,
                                     b, ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsysv_rook", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_rook", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsysv_rook_work.c b/LAPACKE/src/lapacke_dsysv_rook_work.c
index 9d6d10f028..e041179017 100644
--- a/LAPACKE/src/lapacke_dsysv_rook_work.c
+++ b/LAPACKE/src/lapacke_dsysv_rook_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsysv_rook_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsysv_rook_work)( int matrix_layout, char uplo, lapack_int n,
                                     lapack_int nrhs, double* a, lapack_int lda,
                                     lapack_int* ipiv, double* b, lapack_int ldb,
                                     double* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_dsysv_rook_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsysv_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_rook_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dsysv_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_rook_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_dsysv_rook_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsysv_rook( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                            work, &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_dsysv_rook_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsysv_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_rook_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsysv_rook_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_rook_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsysv_work.c b/LAPACKE/src/lapacke_dsysv_work.c
index 2b1f42f51b..16280a2a99 100644
--- a/LAPACKE/src/lapacke_dsysv_work.c
+++ b/LAPACKE/src/lapacke_dsysv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsysv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsysv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, double* a, lapack_int lda,
                                lapack_int* ipiv, double* b, lapack_int ldb,
                                double* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_dsysv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsysv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dsysv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_dsysv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsysv( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_dsysv_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsysv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsysv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsysvx.c b/LAPACKE/src/lapacke_dsysvx.c
index 8695bd677b..c1df1d85e0 100644
--- a/LAPACKE/src/lapacke_dsysvx.c
+++ b/LAPACKE/src/lapacke_dsysvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsysvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsysvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, const double* a, lapack_int lda,
                            double* af, lapack_int ldaf, lapack_int* ipiv,
                            const double* b, lapack_int ldb, double* x,
@@ -45,21 +45,21 @@ lapack_int LAPACKE_dsysvx( int matrix_layout, char fact, char uplo, lapack_int n
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsysvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
@@ -71,7 +71,7 @@ lapack_int LAPACKE_dsysvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsysvx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_dsysvx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                 ldaf, ipiv, b, ldb, x, ldx, rcond, ferr, berr,
                                 &work_query, lwork, iwork );
     if( info != 0 ) {
@@ -85,7 +85,7 @@ lapack_int LAPACKE_dsysvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsysvx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_dsysvx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                 ldaf, ipiv, b, ldb, x, ldx, rcond, ferr, berr,
                                 work, lwork, iwork );
     /* Release memory and exit */
@@ -94,7 +94,7 @@ lapack_int LAPACKE_dsysvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsysvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsysvx_work.c b/LAPACKE/src/lapacke_dsysvx_work.c
index 625f7f31ad..7d56fbd424 100644
--- a/LAPACKE/src/lapacke_dsysvx_work.c
+++ b/LAPACKE/src/lapacke_dsysvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsysvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsysvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs, const double* a,
                                 lapack_int lda, double* af, lapack_int ldaf,
                                 lapack_int* ipiv, const double* b,
@@ -62,22 +62,22 @@ lapack_int LAPACKE_dsysvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dsysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysvx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dsysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dsysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_dsysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysvx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -109,11 +109,11 @@ lapack_int LAPACKE_dsysvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_dsy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsysvx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                        ipiv, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr, berr, work,
@@ -122,11 +122,11 @@ lapack_int LAPACKE_dsysvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -137,11 +137,11 @@ lapack_int LAPACKE_dsysvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsysvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsysvxx.c b/LAPACKE/src/lapacke_dsysvxx.c
index 81124a54c7..c8aa120e22 100644
--- a/LAPACKE/src/lapacke_dsysvxx.c
+++ b/LAPACKE/src/lapacke_dsysvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsysvxx( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsysvxx)( int matrix_layout, char fact, char uplo,
                             lapack_int n, lapack_int nrhs, double* a,
                             lapack_int lda, double* af, lapack_int ldaf,
                             lapack_int* ipiv, char* equed, double* s, double* b,
@@ -46,30 +46,30 @@ lapack_int LAPACKE_dsysvxx( int matrix_layout, char fact, char uplo,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsysvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysvxx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -24;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_d_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, s, 1 ) ) {
                 return -12;
             }
         }
@@ -87,7 +87,7 @@ lapack_int LAPACKE_dsysvxx( int matrix_layout, char fact, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsysvxx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_dsysvxx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                  ldaf, ipiv, equed, s, b, ldb, x, ldx, rcond,
                                  rpvgrw, berr, n_err_bnds, err_bnds_norm,
                                  err_bnds_comp, nparams, params, work, iwork );
@@ -97,7 +97,7 @@ lapack_int LAPACKE_dsysvxx( int matrix_layout, char fact, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsysvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsysvxx_work.c b/LAPACKE/src/lapacke_dsysvxx_work.c
index 722d9dea1c..808e8a15bf 100644
--- a/LAPACKE/src/lapacke_dsysvxx_work.c
+++ b/LAPACKE/src/lapacke_dsysvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsysvxx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dsysvxx_work)( int matrix_layout, char fact, char uplo,
                                  lapack_int n, lapack_int nrhs, double* a,
                                  lapack_int lda, double* af, lapack_int ldaf,
                                  lapack_int* ipiv, char* equed, double* s,
@@ -67,22 +67,22 @@ lapack_int LAPACKE_dsysvxx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dsysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysvxx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dsysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_dsysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_dsysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -119,11 +119,11 @@ lapack_int LAPACKE_dsysvxx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_dsy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsysvxx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond, rpvgrw,
@@ -133,20 +133,20 @@ lapack_int LAPACKE_dsysvxx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -162,11 +162,11 @@ lapack_int LAPACKE_dsysvxx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsysvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsysvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsyswapr.c b/LAPACKE/src/lapacke_dsyswapr.c
index 5da8ac7ffd..0155e9cac5 100644
--- a/LAPACKE/src/lapacke_dsyswapr.c
+++ b/LAPACKE/src/lapacke_dsyswapr.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyswapr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsyswapr)( int matrix_layout, char uplo, lapack_int n,
                              double* a, lapack_int lda, lapack_int i1, lapack_int i2 )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsyswapr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyswapr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dsyswapr_work( matrix_layout, uplo, n, a, lda, i1, i2 );
+    return API_SUFFIX(LAPACKE_dsyswapr_work)( matrix_layout, uplo, n, a, lda, i1, i2 );
 }
diff --git a/LAPACKE/src/lapacke_dsyswapr_work.c b/LAPACKE/src/lapacke_dsyswapr_work.c
index 32d5c8682c..72a067ebf9 100644
--- a/LAPACKE/src/lapacke_dsyswapr_work.c
+++ b/LAPACKE/src/lapacke_dsyswapr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsyswapr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsyswapr_work)( int matrix_layout, char uplo, lapack_int n,
                                   double* a, lapack_int lda,
                                   lapack_int i1, lapack_int i2 )
 {
@@ -53,21 +53,21 @@ lapack_int LAPACKE_dsyswapr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsyswapr( &uplo, &n, a_t, &lda_t, &i1, &i2 );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsyswapr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyswapr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsyswapr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsyswapr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrd.c b/LAPACKE/src/lapacke_dsytrd.c
index b4f09ea46e..b18fe167ca 100644
--- a/LAPACKE/src/lapacke_dsytrd.c
+++ b/LAPACKE/src/lapacke_dsytrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrd( int matrix_layout, char uplo, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dsytrd)( int matrix_layout, char uplo, lapack_int n, double* a,
                            lapack_int lda, double* d, double* e, double* tau )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_dsytrd( int matrix_layout, char uplo, lapack_int n, double* a
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsytrd_work( matrix_layout, uplo, n, a, lda, d, e, tau,
+    info = API_SUFFIX(LAPACKE_dsytrd_work)( matrix_layout, uplo, n, a, lda, d, e, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,13 +65,13 @@ lapack_int LAPACKE_dsytrd( int matrix_layout, char uplo, lapack_int n, double* a
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsytrd_work( matrix_layout, uplo, n, a, lda, d, e, tau, work,
+    info = API_SUFFIX(LAPACKE_dsytrd_work)( matrix_layout, uplo, n, a, lda, d, e, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrd_work.c b/LAPACKE/src/lapacke_dsytrd_work.c
index a501ec7fda..143c1b4382 100644
--- a/LAPACKE/src/lapacke_dsytrd_work.c
+++ b/LAPACKE/src/lapacke_dsytrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrd_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytrd_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* a, lapack_int lda, double* d, double* e,
                                 double* tau, double* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dsytrd_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dsytrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_dsytrd_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsytrd( &uplo, &n, a_t, &lda_t, d, e, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsytrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsytrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrf.c b/LAPACKE/src/lapacke_dsytrf.c
index 1c452236f6..22900ef30c 100644
--- a/LAPACKE/src/lapacke_dsytrf.c
+++ b/LAPACKE/src/lapacke_dsytrf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrf( int matrix_layout, char uplo, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dsytrf)( int matrix_layout, char uplo, lapack_int n, double* a,
                            lapack_int lda, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_dsytrf( int matrix_layout, char uplo, lapack_int n, double* a
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsytrf_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_dsytrf_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,13 +65,13 @@ lapack_int LAPACKE_dsytrf( int matrix_layout, char uplo, lapack_int n, double* a
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsytrf_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_dsytrf_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrf_aa.c b/LAPACKE/src/lapacke_dsytrf_aa.c
index 17eb31b80c..07b87b305a 100644
--- a/LAPACKE/src/lapacke_dsytrf_aa.c
+++ b/LAPACKE/src/lapacke_dsytrf_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrf_aa( int matrix_layout, char uplo, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dsytrf_aa)( int matrix_layout, char uplo, lapack_int n, double* a,
                            lapack_int lda, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_dsytrf_aa( int matrix_layout, char uplo, lapack_int n, double
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrf_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsytrf_aa_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_dsytrf_aa_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,13 +65,13 @@ lapack_int LAPACKE_dsytrf_aa( int matrix_layout, char uplo, lapack_int n, double
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsytrf_aa_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_dsytrf_aa_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrf_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrf_aa_2stage.c b/LAPACKE/src/lapacke_dsytrf_aa_2stage.c
index ec153d176d..7a3a91d079 100644
--- a/LAPACKE/src/lapacke_dsytrf_aa_2stage.c
+++ b/LAPACKE/src/lapacke_dsytrf_aa_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytrf_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
                           double* a, lapack_int lda,
                           double* tb, lapack_int ltb,  
                           lapack_int* ipiv, lapack_int* ipiv2 )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_dsytrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrf_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsytrf_aa_2stage_work( matrix_layout, uplo, n, 
+    info = API_SUFFIX(LAPACKE_dsytrf_aa_2stage_work)( matrix_layout, uplo, n, 
     						   a, lda, tb, ltb, ipiv, ipiv2,
                                &work_query, lwork );
     if( info != 0 ) {
@@ -71,14 +71,14 @@ lapack_int LAPACKE_dsytrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsytrf_aa_2stage_work( matrix_layout, uplo, n,
+    info = API_SUFFIX(LAPACKE_dsytrf_aa_2stage_work)( matrix_layout, uplo, n,
                                a, lda, tb, ltb, ipiv, ipiv2,
                                work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrf_aa_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_aa_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrf_aa_2stage_work.c b/LAPACKE/src/lapacke_dsytrf_aa_2stage_work.c
index 77a5940738..aaf30ef65f 100644
--- a/LAPACKE/src/lapacke_dsytrf_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_dsytrf_aa_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrf_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytrf_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
                                double* a, lapack_int lda,
                                double* tb, lapack_int ltb,  
                                lapack_int* ipiv, lapack_int* ipiv2,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_dsytrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsytrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dsytrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_aa_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -81,7 +81,7 @@ lapack_int LAPACKE_dsytrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsytrf_aa_2stage( &uplo, &n, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, work,
@@ -90,18 +90,18 @@ lapack_int LAPACKE_dsytrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( tb_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsytrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsytrf_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrf_aa_work.c b/LAPACKE/src/lapacke_dsytrf_aa_work.c
index f479afc7e5..0c7286b8f8 100644
--- a/LAPACKE/src/lapacke_dsytrf_aa_work.c
+++ b/LAPACKE/src/lapacke_dsytrf_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrf_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytrf_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* a, lapack_int lda, lapack_int* ipiv,
                                 double* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dsytrf_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dsytrf_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_aa_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_dsytrf_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsytrf_aa( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsytrf_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsytrf_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrf_rk.c b/LAPACKE/src/lapacke_dsytrf_rk.c
index 30639d47f3..4996ec74e8 100644
--- a/LAPACKE/src/lapacke_dsytrf_rk.c
+++ b/LAPACKE/src/lapacke_dsytrf_rk.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrf_rk( int matrix_layout, char uplo, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dsytrf_rk)( int matrix_layout, char uplo, lapack_int n, double* a,
                            lapack_int lda, double* e, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_dsytrf_rk( int matrix_layout, char uplo, lapack_int n, double
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrf_rk", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_rk", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsytrf_rk_work( matrix_layout, uplo, n, a, lda, e, ipiv,
+    info = API_SUFFIX(LAPACKE_dsytrf_rk_work)( matrix_layout, uplo, n, a, lda, e, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,13 +65,13 @@ lapack_int LAPACKE_dsytrf_rk( int matrix_layout, char uplo, lapack_int n, double
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsytrf_rk_work( matrix_layout, uplo, n, a, lda, e, ipiv, work,
+    info = API_SUFFIX(LAPACKE_dsytrf_rk_work)( matrix_layout, uplo, n, a, lda, e, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrf_rk", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_rk", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrf_rk_work.c b/LAPACKE/src/lapacke_dsytrf_rk_work.c
index 74eeabbc33..51307c62f0 100644
--- a/LAPACKE/src/lapacke_dsytrf_rk_work.c
+++ b/LAPACKE/src/lapacke_dsytrf_rk_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrf_rk_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytrf_rk_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* a, lapack_int lda, double* e, lapack_int* ipiv,
                                 double* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dsytrf_rk_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dsytrf_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_rk_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_dsytrf_rk_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsytrf_rk( &uplo, &n, a_t, &lda_t, e, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsytrf_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_rk_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsytrf_rk_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_rk_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrf_rook.c b/LAPACKE/src/lapacke_dsytrf_rook.c
index 5ef77738f5..8091e9c359 100644
--- a/LAPACKE/src/lapacke_dsytrf_rook.c
+++ b/LAPACKE/src/lapacke_dsytrf_rook.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrf_rook( int matrix_layout, char uplo, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dsytrf_rook)( int matrix_layout, char uplo, lapack_int n, double* a,
                            lapack_int lda, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_dsytrf_rook( int matrix_layout, char uplo, lapack_int n, doub
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrf_rook", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_rook", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsytrf_rook_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_dsytrf_rook_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,13 +65,13 @@ lapack_int LAPACKE_dsytrf_rook( int matrix_layout, char uplo, lapack_int n, doub
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsytrf_rook_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_dsytrf_rook_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrf_rook", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_rook", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrf_rook_work.c b/LAPACKE/src/lapacke_dsytrf_rook_work.c
index 53536523af..29d5f23d8a 100644
--- a/LAPACKE/src/lapacke_dsytrf_rook_work.c
+++ b/LAPACKE/src/lapacke_dsytrf_rook_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrf_rook_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytrf_rook_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* a, lapack_int lda, lapack_int* ipiv,
                                 double* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dsytrf_rook_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dsytrf_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_rook_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_dsytrf_rook_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsytrf_rook( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsytrf_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_rook_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsytrf_rook_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_rook_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrf_work.c b/LAPACKE/src/lapacke_dsytrf_work.c
index b6788f76b0..34b4256d79 100644
--- a/LAPACKE/src/lapacke_dsytrf_work.c
+++ b/LAPACKE/src/lapacke_dsytrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* a, lapack_int lda, lapack_int* ipiv,
                                 double* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dsytrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dsytrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_dsytrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsytrf( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsytrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsytrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytri.c b/LAPACKE/src/lapacke_dsytri.c
index 2175cfaf54..15403a3a5a 100644
--- a/LAPACKE/src/lapacke_dsytri.c
+++ b/LAPACKE/src/lapacke_dsytri.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytri( int matrix_layout, char uplo, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dsytri)( int matrix_layout, char uplo, lapack_int n, double* a,
                            lapack_int lda, const lapack_int* ipiv )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -56,12 +56,12 @@ lapack_int LAPACKE_dsytri( int matrix_layout, char uplo, lapack_int n, double* a
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsytri_work( matrix_layout, uplo, n, a, lda, ipiv, work );
+    info = API_SUFFIX(LAPACKE_dsytri_work)( matrix_layout, uplo, n, a, lda, ipiv, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytri", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytri2.c b/LAPACKE/src/lapacke_dsytri2.c
index 3ac3f73ad2..487d427c49 100644
--- a/LAPACKE/src/lapacke_dsytri2.c
+++ b/LAPACKE/src/lapacke_dsytri2.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytri2( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytri2)( int matrix_layout, char uplo, lapack_int n,
                             double* a, lapack_int lda, const lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_dsytri2( int matrix_layout, char uplo, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytri2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsytri2_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_dsytri2_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                  &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -66,13 +66,13 @@ lapack_int LAPACKE_dsytri2( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsytri2_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_dsytri2_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                  lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytri2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytri2_work.c b/LAPACKE/src/lapacke_dsytri2_work.c
index 29881c0c26..3ae17b67af 100644
--- a/LAPACKE/src/lapacke_dsytri2_work.c
+++ b/LAPACKE/src/lapacke_dsytri2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytri2_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytri2_work)( int matrix_layout, char uplo, lapack_int n,
                                  double* a, lapack_int lda,
                                  const lapack_int* ipiv,
                                  double* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dsytri2_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dsytri2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri2_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_dsytri2_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsytri2( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsytri2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsytri2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytri2x.c b/LAPACKE/src/lapacke_dsytri2x.c
index d322823883..90d6cb8575 100644
--- a/LAPACKE/src/lapacke_dsytri2x.c
+++ b/LAPACKE/src/lapacke_dsytri2x.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytri2x( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytri2x)( int matrix_layout, char uplo, lapack_int n,
                              double* a, lapack_int lda, const lapack_int* ipiv,
                              lapack_int nb )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytri2x", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri2x", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -57,13 +57,13 @@ lapack_int LAPACKE_dsytri2x( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsytri2x_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_dsytri2x_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                   nb );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytri2x", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri2x", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytri2x_work.c b/LAPACKE/src/lapacke_dsytri2x_work.c
index ae6e70fda7..c0c70d6b43 100644
--- a/LAPACKE/src/lapacke_dsytri2x_work.c
+++ b/LAPACKE/src/lapacke_dsytri2x_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytri2x_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytri2x_work)( int matrix_layout, char uplo, lapack_int n,
                                   double* a, lapack_int lda,
                                   const lapack_int* ipiv, double* work,
                                   lapack_int nb )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dsytri2x_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dsytri2x_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri2x_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,23 +60,23 @@ lapack_int LAPACKE_dsytri2x_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsytri2x( &uplo, &n, a_t, &lda_t, ipiv, work, &nb, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsytri2x_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri2x_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsytri2x_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri2x_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytri_3.c b/LAPACKE/src/lapacke_dsytri_3.c
index d71e920c1b..108dca60a3 100644
--- a/LAPACKE/src/lapacke_dsytri_3.c
+++ b/LAPACKE/src/lapacke_dsytri_3.c
@@ -32,31 +32,31 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytri_3( int matrix_layout, char uplo, lapack_int n, double* a,
+lapack_int API_SUFFIX(LAPACKE_dsytri_3)( int matrix_layout, char uplo, lapack_int n, double* a,
                             lapack_int lda, const double* e, const lapack_int* ipiv )
 {
     lapack_int info = 0;
     lapack_int lwork = -1;
     double* work = NULL;
     double work_query;
-    lapack_int e_start = LAPACKE_lsame( uplo, 'U' ) ? 1 : 0;
+    lapack_int e_start = API_SUFFIX(LAPACKE_lsame)( uplo, 'U' ) ? 1 : 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytri_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n-1, e + e_start, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e + e_start, 1 ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsytri_3_work( matrix_layout, uplo, n, a, lda, e, ipiv,
+    info = API_SUFFIX(LAPACKE_dsytri_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,12 +69,12 @@ lapack_int LAPACKE_dsytri_3( int matrix_layout, char uplo, lapack_int n, double*
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsytri_3_work( matrix_layout, uplo, n, a, lda, e, ipiv, work, lwork );
+    info = API_SUFFIX(LAPACKE_dsytri_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytri_3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri_3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytri_3_work.c b/LAPACKE/src/lapacke_dsytri_3_work.c
index 7c2e831630..3c7c37ca3a 100644
--- a/LAPACKE/src/lapacke_dsytri_3_work.c
+++ b/LAPACKE/src/lapacke_dsytri_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytri_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytri_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* a, lapack_int lda, const double* e,
                                 const lapack_int* ipiv, double* work, lapack_int lwork)
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dsytri_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dsytri_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri_3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_dsytri_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsytri_3( &uplo, &n, a_t, &lda_t, e, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsytri_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsytri_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytri_work.c b/LAPACKE/src/lapacke_dsytri_work.c
index c8749f9ccc..df9b69fef2 100644
--- a/LAPACKE/src/lapacke_dsytri_work.c
+++ b/LAPACKE/src/lapacke_dsytri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytri_work)( int matrix_layout, char uplo, lapack_int n,
                                 double* a, lapack_int lda,
                                 const lapack_int* ipiv, double* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dsytri_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dsytri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_dsytri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsytri( &uplo, &n, a_t, &lda_t, ipiv, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsytri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsytri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrs.c b/LAPACKE/src/lapacke_dsytrs.c
index 34df6d777b..44925ac44e 100644
--- a/LAPACKE/src/lapacke_dsytrs.c
+++ b/LAPACKE/src/lapacke_dsytrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const double* a, lapack_int lda,
                            const lapack_int* ipiv, double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_dsytrs_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    return API_SUFFIX(LAPACKE_dsytrs_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_dsytrs2.c b/LAPACKE/src/lapacke_dsytrs2.c
index 7b653b2ed1..9aa2b285f6 100644
--- a/LAPACKE/src/lapacke_dsytrs2.c
+++ b/LAPACKE/src/lapacke_dsytrs2.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrs2( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytrs2)( int matrix_layout, char uplo, lapack_int n,
                             lapack_int nrhs, const double* a, lapack_int lda,
                             const lapack_int* ipiv, double* b, lapack_int ldb )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrs2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
@@ -60,13 +60,13 @@ lapack_int LAPACKE_dsytrs2( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsytrs2_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_dsytrs2_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrs2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrs2_work.c b/LAPACKE/src/lapacke_dsytrs2_work.c
index b1af18ea3d..eb3178f43a 100644
--- a/LAPACKE/src/lapacke_dsytrs2_work.c
+++ b/LAPACKE/src/lapacke_dsytrs2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrs2_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytrs2_work)( int matrix_layout, char uplo, lapack_int n,
                                  lapack_int nrhs, const double* a,
                                  lapack_int lda, const lapack_int* ipiv,
                                  double* b, lapack_int ldb, double* work )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_dsytrs2_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsytrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs2_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dsytrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,8 +72,8 @@ lapack_int LAPACKE_dsytrs2_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsytrs2( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                         &info );
@@ -81,18 +81,18 @@ lapack_int LAPACKE_dsytrs2_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsytrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsytrs2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrs_3.c b/LAPACKE/src/lapacke_dsytrs_3.c
index 34d32831d3..343bc84b54 100644
--- a/LAPACKE/src/lapacke_dsytrs_3.c
+++ b/LAPACKE/src/lapacke_dsytrs_3.c
@@ -32,29 +32,29 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrs_3( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytrs_3)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const double* a, lapack_int lda,
                            const double* e,
                            const lapack_int* ipiv, double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrs_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( n, e ,1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, e ,1 ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_dsytrs_3_work( matrix_layout, uplo, n, nrhs, a, lda,
+    return API_SUFFIX(LAPACKE_dsytrs_3_work)( matrix_layout, uplo, n, nrhs, a, lda,
                                   e, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dsytrs_3_work.c b/LAPACKE/src/lapacke_dsytrs_3_work.c
index cd8b79b94f..3bb9ff95d3 100644
--- a/LAPACKE/src/lapacke_dsytrs_3_work.c
+++ b/LAPACKE/src/lapacke_dsytrs_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrs_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytrs_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const double* a,
                                 lapack_int lda, const double* e,
                                 const lapack_int* ipiv, double* b, lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_dsytrs_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsytrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_3_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dsytrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_3_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,8 +72,8 @@ lapack_int LAPACKE_dsytrs_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsytrs_3( &uplo, &n, &nrhs, a_t, &lda_t, e, ipiv, b_t, &ldb_t,
                        &info );
@@ -81,18 +81,18 @@ lapack_int LAPACKE_dsytrs_3_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsytrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsytrs_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrs_aa.c b/LAPACKE/src/lapacke_dsytrs_aa.c
index 545d9efcd0..56f6dc839a 100644
--- a/LAPACKE/src/lapacke_dsytrs_aa.c
+++ b/LAPACKE/src/lapacke_dsytrs_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrs_aa( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytrs_aa)( int matrix_layout, char uplo, lapack_int n,
                             lapack_int nrhs, const double* a, lapack_int lda,
                             const lapack_int* ipiv, double* b, lapack_int ldb )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dsytrs_aa( int matrix_layout, char uplo, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrs_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dsytrs_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_dsytrs_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_dsytrs_aa( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dsytrs_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_dsytrs_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrs_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrs_aa_2stage.c b/LAPACKE/src/lapacke_dsytrs_aa_2stage.c
index 95e4f04ec9..ca7fca13ea 100644
--- a/LAPACKE/src/lapacke_dsytrs_aa_2stage.c
+++ b/LAPACKE/src/lapacke_dsytrs_aa_2stage.c
@@ -32,32 +32,32 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrs_aa_2stage( int matrix_layout, char uplo, lapack_int n,
-                          lapack_int nrhs, double* a, lapack_int lda,
-                          double* tb, lapack_int ltb, lapack_int* ipiv, 
-                          lapack_int* ipiv2, double* b, lapack_int ldb )
+lapack_int API_SUFFIX(LAPACKE_dsytrs_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
+                          lapack_int nrhs, const double* a, lapack_int lda,
+                          double* tb, lapack_int ltb, const lapack_int* ipiv, 
+                          const lapack_int* ipiv2, double* b, lapack_int ldb )
 {
     lapack_int info = 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrs_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
 #endif
     /* Call middle-level interface */
-    info = LAPACKE_dsytrs_aa_2stage_work( matrix_layout, uplo, n, nrhs,
+    info = API_SUFFIX(LAPACKE_dsytrs_aa_2stage_work)( matrix_layout, uplo, n, nrhs,
                                a, lda, tb, ltb, ipiv, ipiv2, b,
                                ldb );
     return info;
diff --git a/LAPACKE/src/lapacke_dsytrs_aa_2stage_work.c b/LAPACKE/src/lapacke_dsytrs_aa_2stage_work.c
index 294e3f36dc..f8f6e62f90 100644
--- a/LAPACKE/src/lapacke_dsytrs_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_dsytrs_aa_2stage_work.c
@@ -32,10 +32,10 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
-                               lapack_int nrhs, double* a, lapack_int lda,
-                               double* tb, lapack_int ltb, lapack_int* ipiv, 
-                               lapack_int* ipiv2, double* b, lapack_int ldb )
+lapack_int API_SUFFIX(LAPACKE_dsytrs_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
+                               lapack_int nrhs, const double* a, lapack_int lda,
+                               double* tb, lapack_int ltb, const lapack_int* ipiv, 
+                               const lapack_int* ipiv2, double* b, lapack_int ldb )
 {
     lapack_int info = 0;
     if( matrix_layout == LAPACK_COL_MAJOR ) {
@@ -54,17 +54,17 @@ lapack_int LAPACKE_dsytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsytrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dsytrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_aa_2stage_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dsytrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_aa_2stage_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_dsytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsytrs_aa_2stage( &uplo, &n, &nrhs, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, b_t, &ldb_t, &info );
@@ -93,8 +93,7 @@ lapack_int LAPACKE_dsytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_2:
@@ -103,11 +102,11 @@ lapack_int LAPACKE_dsytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsytrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsytrs_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrs_aa_work.c b/LAPACKE/src/lapacke_dsytrs_aa_work.c
index d259690fce..cbe79b9b19 100644
--- a/LAPACKE/src/lapacke_dsytrs_aa_work.c
+++ b/LAPACKE/src/lapacke_dsytrs_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrs_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytrs_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                  lapack_int nrhs, const double* a,
                                  lapack_int lda, const lapack_int* ipiv,
                                  double* b, lapack_int ldb, double* work, lapack_int lwork )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_dsytrs_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsytrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_aa_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dsytrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_aa_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,8 +72,8 @@ lapack_int LAPACKE_dsytrs_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsytrs_aa( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                         &lwork, &info );
@@ -81,18 +81,18 @@ lapack_int LAPACKE_dsytrs_aa_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsytrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsytrs_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrs_rook.c b/LAPACKE/src/lapacke_dsytrs_rook.c
index e086a46cd9..a288c0b5fa 100644
--- a/LAPACKE/src/lapacke_dsytrs_rook.c
+++ b/LAPACKE/src/lapacke_dsytrs_rook.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrs_rook( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytrs_rook)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const double* a, lapack_int lda,
                            const lapack_int* ipiv, double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dsytrs_rook", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_rook", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_dsytrs_rook_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    return API_SUFFIX(LAPACKE_dsytrs_rook_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_dsytrs_rook_work.c b/LAPACKE/src/lapacke_dsytrs_rook_work.c
index b3ffd24bd9..bf4c0ef95f 100644
--- a/LAPACKE/src/lapacke_dsytrs_rook_work.c
+++ b/LAPACKE/src/lapacke_dsytrs_rook_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrs_rook_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytrs_rook_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const double* a,
                                 lapack_int lda, const lapack_int* ipiv,
                                 double* b, lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_dsytrs_rook_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsytrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_rook_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dsytrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_rook_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,8 +72,8 @@ lapack_int LAPACKE_dsytrs_rook_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsytrs_rook( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                        &info );
@@ -81,18 +81,18 @@ lapack_int LAPACKE_dsytrs_rook_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsytrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_rook_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsytrs_rook_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_rook_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dsytrs_work.c b/LAPACKE/src/lapacke_dsytrs_work.c
index fe0125dcc8..eb19dbaeeb 100644
--- a/LAPACKE/src/lapacke_dsytrs_work.c
+++ b/LAPACKE/src/lapacke_dsytrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dsytrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dsytrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const double* a,
                                 lapack_int lda, const lapack_int* ipiv,
                                 double* b, lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_dsytrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dsytrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dsytrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,8 +72,8 @@ lapack_int LAPACKE_dsytrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dsytrs( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                        &info );
@@ -81,18 +81,18 @@ lapack_int LAPACKE_dsytrs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dsytrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dsytrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dsytrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtbcon.c b/LAPACKE/src/lapacke_dtbcon.c
index e7effad595..cd72084c2d 100644
--- a/LAPACKE/src/lapacke_dtbcon.c
+++ b/LAPACKE/src/lapacke_dtbcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtbcon( int matrix_layout, char norm, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_dtbcon)( int matrix_layout, char norm, char uplo, char diag,
                            lapack_int n, lapack_int kd, const double* ab,
                            lapack_int ldab, double* rcond )
 {
@@ -40,13 +40,13 @@ lapack_int LAPACKE_dtbcon( int matrix_layout, char norm, char uplo, char diag,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtbcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtbcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dtb_nancheck( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dtb_nancheck)( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
             return -7;
         }
     }
@@ -63,7 +63,7 @@ lapack_int LAPACKE_dtbcon( int matrix_layout, char norm, char uplo, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtbcon_work( matrix_layout, norm, uplo, diag, n, kd, ab, ldab,
+    info = API_SUFFIX(LAPACKE_dtbcon_work)( matrix_layout, norm, uplo, diag, n, kd, ab, ldab,
                                 rcond, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -71,7 +71,7 @@ lapack_int LAPACKE_dtbcon( int matrix_layout, char norm, char uplo, char diag,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtbcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtbcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtbcon_work.c b/LAPACKE/src/lapacke_dtbcon_work.c
index 03043580f4..d122cfd443 100644
--- a/LAPACKE/src/lapacke_dtbcon_work.c
+++ b/LAPACKE/src/lapacke_dtbcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtbcon_work( int matrix_layout, char norm, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dtbcon_work)( int matrix_layout, char norm, char uplo,
                                 char diag, lapack_int n, lapack_int kd,
                                 const double* ab, lapack_int ldab,
                                 double* rcond, double* work, lapack_int* iwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_dtbcon_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dtbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtbcon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_dtbcon_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dtb_trans( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_dtb_trans)( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
                            ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtbcon( &norm, &uplo, &diag, &n, &kd, ab_t, &ldab_t, rcond, work,
@@ -73,11 +73,11 @@ lapack_int LAPACKE_dtbcon_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtbcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtbcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtbcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtbrfs.c b/LAPACKE/src/lapacke_dtbrfs.c
index 69f074b2a0..e87c213db5 100644
--- a/LAPACKE/src/lapacke_dtbrfs.c
+++ b/LAPACKE/src/lapacke_dtbrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtbrfs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_dtbrfs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int kd, lapack_int nrhs,
                            const double* ab, lapack_int ldab, const double* b,
                            lapack_int ldb, const double* x, lapack_int ldx,
@@ -42,19 +42,19 @@ lapack_int LAPACKE_dtbrfs( int matrix_layout, char uplo, char trans, char diag,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtbrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtbrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dtb_nancheck( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dtb_nancheck)( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -71,7 +71,7 @@ lapack_int LAPACKE_dtbrfs( int matrix_layout, char uplo, char trans, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtbrfs_work( matrix_layout, uplo, trans, diag, n, kd, nrhs,
+    info = API_SUFFIX(LAPACKE_dtbrfs_work)( matrix_layout, uplo, trans, diag, n, kd, nrhs,
                                 ab, ldab, b, ldb, x, ldx, ferr, berr, work,
                                 iwork );
     /* Release memory and exit */
@@ -80,7 +80,7 @@ lapack_int LAPACKE_dtbrfs( int matrix_layout, char uplo, char trans, char diag,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtbrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtbrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtbrfs_work.c b/LAPACKE/src/lapacke_dtbrfs_work.c
index 6eef42d0d6..4a588eb993 100644
--- a/LAPACKE/src/lapacke_dtbrfs_work.c
+++ b/LAPACKE/src/lapacke_dtbrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtbrfs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_dtbrfs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int kd,
                                 lapack_int nrhs, const double* ab,
                                 lapack_int ldab, const double* b,
@@ -58,17 +58,17 @@ lapack_int LAPACKE_dtbrfs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dtbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtbrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dtbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtbrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dtbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtbrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -88,10 +88,10 @@ lapack_int LAPACKE_dtbrfs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_dtb_trans( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_dtb_trans)( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
                            ldab_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtbrfs( &uplo, &trans, &diag, &n, &kd, &nrhs, ab_t, &ldab_t, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, iwork, &info );
@@ -106,11 +106,11 @@ lapack_int LAPACKE_dtbrfs_work( int matrix_layout, char uplo, char trans,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtbrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtbrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtbrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtbtrs.c b/LAPACKE/src/lapacke_dtbtrs.c
index 87b8d2d91b..5528c1fc31 100644
--- a/LAPACKE/src/lapacke_dtbtrs.c
+++ b/LAPACKE/src/lapacke_dtbtrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtbtrs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_dtbtrs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int kd, lapack_int nrhs,
                            const double* ab, lapack_int ldab, double* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtbtrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtbtrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dtb_nancheck( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_dtb_nancheck)( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
     }
 #endif
-    return LAPACKE_dtbtrs_work( matrix_layout, uplo, trans, diag, n, kd, nrhs,
+    return API_SUFFIX(LAPACKE_dtbtrs_work)( matrix_layout, uplo, trans, diag, n, kd, nrhs,
                                 ab, ldab, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dtbtrs_work.c b/LAPACKE/src/lapacke_dtbtrs_work.c
index f5e5e313a4..bc74bb640b 100644
--- a/LAPACKE/src/lapacke_dtbtrs_work.c
+++ b/LAPACKE/src/lapacke_dtbtrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtbtrs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_dtbtrs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int kd,
                                 lapack_int nrhs, const double* ab,
                                 lapack_int ldab, double* b, lapack_int ldb )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_dtbtrs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dtbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtbtrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dtbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtbtrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -73,9 +73,9 @@ lapack_int LAPACKE_dtbtrs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dtb_trans( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_dtb_trans)( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
                            ldab_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtbtrs( &uplo, &trans, &diag, &n, &kd, &nrhs, ab_t, &ldab_t, b_t,
                        &ldb_t, &info );
@@ -83,18 +83,18 @@ lapack_int LAPACKE_dtbtrs_work( int matrix_layout, char uplo, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtbtrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtbtrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtbtrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtfsm.c b/LAPACKE/src/lapacke_dtfsm.c
index 7b655e6cb8..964d500815 100644
--- a/LAPACKE/src/lapacke_dtfsm.c
+++ b/LAPACKE/src/lapacke_dtfsm.c
@@ -32,33 +32,35 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtfsm( int matrix_layout, char transr, char side, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dtfsm)( int matrix_layout, char transr, char side, char uplo,
                           char trans, char diag, lapack_int m, lapack_int n,
                           double alpha, const double* a, double* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtfsm", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtfsm", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
+        lapack_int mn = m;
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
         if( IS_D_NONZERO(alpha) ) {
-            if( LAPACKE_dtf_nancheck( matrix_layout, transr, uplo, diag, n, a ) ) {
+            if( API_SUFFIX(LAPACKE_dtf_nancheck)( matrix_layout, transr, uplo, diag, mn, a ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_d_nancheck( 1, &alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &alpha, 1 ) ) {
             return -9;
         }
         if( IS_D_NONZERO(alpha) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
                 return -11;
             }
         }
     }
 #endif
-    return LAPACKE_dtfsm_work( matrix_layout, transr, side, uplo, trans, diag, m,
+    return API_SUFFIX(LAPACKE_dtfsm_work)( matrix_layout, transr, side, uplo, trans, diag, m,
                                n, alpha, a, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dtfsm_work.c b/LAPACKE/src/lapacke_dtfsm_work.c
index 7d12cf890b..30396d6ed7 100644
--- a/LAPACKE/src/lapacke_dtfsm_work.c
+++ b/LAPACKE/src/lapacke_dtfsm_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtfsm_work( int matrix_layout, char transr, char side,
+lapack_int API_SUFFIX(LAPACKE_dtfsm_work)( int matrix_layout, char transr, char side,
                                char uplo, char trans, char diag, lapack_int m,
                                lapack_int n, double alpha, const double* a,
                                double* b, lapack_int ldb )
@@ -47,12 +47,14 @@ lapack_int LAPACKE_dtfsm_work( int matrix_layout, char transr, char side,
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
         lapack_int ldb_t = MAX(1,m);
+        lapack_int mn = m;
         double* b_t = NULL;
         double* a_t = NULL;
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
         /* Check leading dimension(s) */
-        if( ldb < n ) {
+        if( ldb < m ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dtfsm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtfsm_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -64,7 +66,7 @@ lapack_int LAPACKE_dtfsm_work( int matrix_layout, char transr, char side,
         if( IS_D_NONZERO(alpha) ) {
             a_t = (double*)
                 LAPACKE_malloc( sizeof(double) *
-                                ( MAX(1,n) * MAX(2,n+1) ) / 2 );
+                                ( MAX(1,mn) * MAX(2,mn+1) ) / 2 );
             if( a_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_1;
@@ -72,17 +74,17 @@ lapack_int LAPACKE_dtfsm_work( int matrix_layout, char transr, char side,
         }
         /* Transpose input matrices */
         if( IS_D_NONZERO(alpha) ) {
-            LAPACKE_dge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
         }
         if( IS_D_NONZERO(alpha) ) {
-            LAPACKE_dtf_trans( matrix_layout, transr, uplo, diag, n, a, a_t );
+            API_SUFFIX(LAPACKE_dtf_trans)( matrix_layout, transr, uplo, diag, mn, a, a_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dtfsm( &transr, &side, &uplo, &trans, &diag, &m, &n, &alpha, a_t,
                       b_t, &ldb_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         if( IS_D_NONZERO(alpha) ) {
             LAPACKE_free( a_t );
@@ -91,11 +93,11 @@ lapack_int LAPACKE_dtfsm_work( int matrix_layout, char transr, char side,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtfsm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtfsm_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtfsm_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtfsm_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtftri.c b/LAPACKE/src/lapacke_dtftri.c
index 1db80b6e70..8adf5a0ba8 100644
--- a/LAPACKE/src/lapacke_dtftri.c
+++ b/LAPACKE/src/lapacke_dtftri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtftri( int matrix_layout, char transr, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_dtftri)( int matrix_layout, char transr, char uplo, char diag,
                            lapack_int n, double* a )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtftri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtftri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dtf_nancheck( matrix_layout, transr, uplo, diag, n, a ) ) {
+        if( API_SUFFIX(LAPACKE_dtf_nancheck)( matrix_layout, transr, uplo, diag, n, a ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_dtftri_work( matrix_layout, transr, uplo, diag, n, a );
+    return API_SUFFIX(LAPACKE_dtftri_work)( matrix_layout, transr, uplo, diag, n, a );
 }
diff --git a/LAPACKE/src/lapacke_dtftri_work.c b/LAPACKE/src/lapacke_dtftri_work.c
index 66150897c0..0cdd738aee 100644
--- a/LAPACKE/src/lapacke_dtftri_work.c
+++ b/LAPACKE/src/lapacke_dtftri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtftri_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dtftri_work)( int matrix_layout, char transr, char uplo,
                                 char diag, lapack_int n, double* a )
 {
     lapack_int info = 0;
@@ -52,23 +52,23 @@ lapack_int LAPACKE_dtftri_work( int matrix_layout, char transr, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dtf_trans( matrix_layout, transr, uplo, diag, n, a, a_t );
+        API_SUFFIX(LAPACKE_dtf_trans)( matrix_layout, transr, uplo, diag, n, a, a_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtftri( &transr, &uplo, &diag, &n, a_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dtf_trans( LAPACK_COL_MAJOR, transr, uplo, diag, n, a_t, a );
+        API_SUFFIX(LAPACKE_dtf_trans)( LAPACK_COL_MAJOR, transr, uplo, diag, n, a_t, a );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtftri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtftri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtftri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtftri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtfttp.c b/LAPACKE/src/lapacke_dtfttp.c
index fafc376f3d..71bf80798a 100644
--- a/LAPACKE/src/lapacke_dtfttp.c
+++ b/LAPACKE/src/lapacke_dtfttp.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtfttp( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dtfttp)( int matrix_layout, char transr, char uplo,
                            lapack_int n, const double* arf, double* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtfttp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtfttp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpf_nancheck( n, arf ) ) {
+        if( API_SUFFIX(LAPACKE_dpf_nancheck)( n, arf ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dtfttp_work( matrix_layout, transr, uplo, n, arf, ap );
+    return API_SUFFIX(LAPACKE_dtfttp_work)( matrix_layout, transr, uplo, n, arf, ap );
 }
diff --git a/LAPACKE/src/lapacke_dtfttp_work.c b/LAPACKE/src/lapacke_dtfttp_work.c
index a8cf680e80..92caebb447 100644
--- a/LAPACKE/src/lapacke_dtfttp_work.c
+++ b/LAPACKE/src/lapacke_dtfttp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtfttp_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dtfttp_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, const double* arf, double* ap )
 {
     lapack_int info = 0;
@@ -59,25 +59,25 @@ lapack_int LAPACKE_dtfttp_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dpf_trans( matrix_layout, transr, uplo, n, arf, arf_t );
+        API_SUFFIX(LAPACKE_dpf_trans)( matrix_layout, transr, uplo, n, arf, arf_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtfttp( &transr, &uplo, &n, arf_t, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( arf_t );
 exit_level_1:
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtfttp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtfttp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtfttp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtfttp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtfttr.c b/LAPACKE/src/lapacke_dtfttr.c
index 39333cceba..60112b2dab 100644
--- a/LAPACKE/src/lapacke_dtfttr.c
+++ b/LAPACKE/src/lapacke_dtfttr.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtfttr( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dtfttr)( int matrix_layout, char transr, char uplo,
                            lapack_int n, const double* arf, double* a,
                            lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtfttr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtfttr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpf_nancheck( n, arf ) ) {
+        if( API_SUFFIX(LAPACKE_dpf_nancheck)( n, arf ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dtfttr_work( matrix_layout, transr, uplo, n, arf, a, lda );
+    return API_SUFFIX(LAPACKE_dtfttr_work)( matrix_layout, transr, uplo, n, arf, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_dtfttr_work.c b/LAPACKE/src/lapacke_dtfttr_work.c
index b12aae0b05..a532e6907a 100644
--- a/LAPACKE/src/lapacke_dtfttr_work.c
+++ b/LAPACKE/src/lapacke_dtfttr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtfttr_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dtfttr_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, const double* arf, double* a,
                                 lapack_int lda )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dtfttr_work( int matrix_layout, char transr, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dtfttr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtfttr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,25 +66,25 @@ lapack_int LAPACKE_dtfttr_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dpf_trans( matrix_layout, transr, uplo, n, arf, arf_t );
+        API_SUFFIX(LAPACKE_dpf_trans)( matrix_layout, transr, uplo, n, arf, arf_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtfttr( &transr, &uplo, &n, arf_t, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( arf_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtfttr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtfttr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtfttr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtfttr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtgevc.c b/LAPACKE/src/lapacke_dtgevc.c
index f70abfb4bf..ef0ce13ee9 100644
--- a/LAPACKE/src/lapacke_dtgevc.c
+++ b/LAPACKE/src/lapacke_dtgevc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtgevc( int matrix_layout, char side, char howmny,
+lapack_int API_SUFFIX(LAPACKE_dtgevc)( int matrix_layout, char side, char howmny,
                            const lapack_logical* select, lapack_int n,
                            const double* s, lapack_int lds, const double* p,
                            lapack_int ldp, double* vl, lapack_int ldvl,
@@ -42,25 +42,25 @@ lapack_int LAPACKE_dtgevc( int matrix_layout, char side, char howmny,
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtgevc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgevc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, p, ldp ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, p, ldp ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, s, lds ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, s, lds ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -12;
             }
         }
@@ -73,13 +73,13 @@ lapack_int LAPACKE_dtgevc( int matrix_layout, char side, char howmny,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtgevc_work( matrix_layout, side, howmny, select, n, s, lds,
+    info = API_SUFFIX(LAPACKE_dtgevc_work)( matrix_layout, side, howmny, select, n, s, lds,
                                 p, ldp, vl, ldvl, vr, ldvr, mm, m, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtgevc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgevc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtgevc_work.c b/LAPACKE/src/lapacke_dtgevc_work.c
index ef4a538455..266b235f91 100644
--- a/LAPACKE/src/lapacke_dtgevc_work.c
+++ b/LAPACKE/src/lapacke_dtgevc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtgevc_work( int matrix_layout, char side, char howmny,
+lapack_int API_SUFFIX(LAPACKE_dtgevc_work)( int matrix_layout, char side, char howmny,
                                 const lapack_logical* select, lapack_int n,
                                 const double* s, lapack_int lds,
                                 const double* p, lapack_int ldp, double* vl,
@@ -59,22 +59,22 @@ lapack_int LAPACKE_dtgevc_work( int matrix_layout, char side, char howmny,
         /* Check leading dimension(s) */
         if( ldp < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dtgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgevc_work", info );
             return info;
         }
         if( lds < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dtgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgevc_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dtgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgevc_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dtgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgevc_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -88,7 +88,7 @@ lapack_int LAPACKE_dtgevc_work( int matrix_layout, char side, char howmny,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             vl_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvl_t * MAX(1,mm) );
             if( vl_t == NULL ) {
@@ -96,7 +96,7 @@ lapack_int LAPACKE_dtgevc_work( int matrix_layout, char side, char howmny,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
             vr_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvr_t * MAX(1,mm) );
             if( vr_t == NULL ) {
@@ -105,15 +105,15 @@ lapack_int LAPACKE_dtgevc_work( int matrix_layout, char side, char howmny,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, s, lds, s_t, lds_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, p, ldp, p_t, ldp_t );
-        if( ( LAPACKE_lsame( side, 'l' ) || LAPACKE_lsame( side, 'b' ) ) &&
-            LAPACKE_lsame( howmny, 'b' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, s, lds, s_t, lds_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, p, ldp, p_t, ldp_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) || API_SUFFIX(LAPACKE_lsame)( side, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( howmny, 'b' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( ( LAPACKE_lsame( side, 'r' ) || LAPACKE_lsame( side, 'b' ) ) &&
-            LAPACKE_lsame( howmny, 'b' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) || API_SUFFIX(LAPACKE_lsame)( side, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( howmny, 'b' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dtgevc( &side, &howmny, select, &n, s_t, &lds_t, p_t, &ldp_t,
@@ -122,20 +122,20 @@ lapack_int LAPACKE_dtgevc_work( int matrix_layout, char side, char howmny,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
                                ldvl );
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
                                ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -144,11 +144,11 @@ lapack_int LAPACKE_dtgevc_work( int matrix_layout, char side, char howmny,
         LAPACKE_free( s_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgevc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtgevc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgevc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtgexc.c b/LAPACKE/src/lapacke_dtgexc.c
index 6f09f9eb7c..f69962fa39 100644
--- a/LAPACKE/src/lapacke_dtgexc.c
+++ b/LAPACKE/src/lapacke_dtgexc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtgexc( int matrix_layout, lapack_logical wantq,
+lapack_int API_SUFFIX(LAPACKE_dtgexc)( int matrix_layout, lapack_logical wantq,
                            lapack_logical wantz, lapack_int n, double* a,
                            lapack_int lda, double* b, lapack_int ldb, double* q,
                            lapack_int ldq, double* z, lapack_int ldz,
@@ -43,32 +43,32 @@ lapack_int LAPACKE_dtgexc( int matrix_layout, lapack_logical wantq,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtgexc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgexc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -7;
         }
         if( wantq ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -9;
             }
         }
         if( wantz ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -11;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dtgexc_work( matrix_layout, wantq, wantz, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_dtgexc_work)( matrix_layout, wantq, wantz, n, a, lda, b, ldb,
                                 q, ldq, z, ldz, ifst, ilst, &work_query,
                                 lwork );
     if( info != 0 ) {
@@ -82,13 +82,13 @@ lapack_int LAPACKE_dtgexc( int matrix_layout, lapack_logical wantq,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtgexc_work( matrix_layout, wantq, wantz, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_dtgexc_work)( matrix_layout, wantq, wantz, n, a, lda, b, ldb,
                                 q, ldq, z, ldz, ifst, ilst, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtgexc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgexc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtgexc_work.c b/LAPACKE/src/lapacke_dtgexc_work.c
index 6756d5e60c..a4a8806934 100644
--- a/LAPACKE/src/lapacke_dtgexc_work.c
+++ b/LAPACKE/src/lapacke_dtgexc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtgexc_work( int matrix_layout, lapack_logical wantq,
+lapack_int API_SUFFIX(LAPACKE_dtgexc_work)( int matrix_layout, lapack_logical wantq,
                                 lapack_logical wantz, lapack_int n, double* a,
                                 lapack_int lda, double* b, lapack_int ldb,
                                 double* q, lapack_int ldq, double* z,
@@ -60,22 +60,22 @@ lapack_int LAPACKE_dtgexc_work( int matrix_layout, lapack_logical wantq,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dtgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgexc_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dtgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgexc_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dtgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgexc_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dtgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgexc_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -110,13 +110,13 @@ lapack_int LAPACKE_dtgexc_work( int matrix_layout, lapack_logical wantq,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         if( wantq ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         if( wantz ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dtgexc( &wantq, &wantz, &n, a_t, &lda_t, b_t, &ldb_t, q_t,
@@ -125,13 +125,13 @@ lapack_int LAPACKE_dtgexc_work( int matrix_layout, lapack_logical wantq,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         if( wantq ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         if( wantz ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
         if( wantz ) {
@@ -147,11 +147,11 @@ lapack_int LAPACKE_dtgexc_work( int matrix_layout, lapack_logical wantq,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgexc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtgexc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgexc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtgsen.c b/LAPACKE/src/lapacke_dtgsen.c
index 11496c1c0f..81a7f9b744 100644
--- a/LAPACKE/src/lapacke_dtgsen.c
+++ b/LAPACKE/src/lapacke_dtgsen.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtgsen( int matrix_layout, lapack_int ijob,
+lapack_int API_SUFFIX(LAPACKE_dtgsen)( int matrix_layout, lapack_int ijob,
                            lapack_logical wantq, lapack_logical wantz,
                            const lapack_logical* select, lapack_int n,
                            double* a, lapack_int lda, double* b, lapack_int ldb,
@@ -48,32 +48,32 @@ lapack_int LAPACKE_dtgsen( int matrix_layout, lapack_int ijob,
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtgsen", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsen", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
         if( wantq ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -14;
             }
         }
         if( wantz ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -16;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dtgsen_work( matrix_layout, ijob, wantq, wantz, select, n, a,
+    info = API_SUFFIX(LAPACKE_dtgsen_work)( matrix_layout, ijob, wantq, wantz, select, n, a,
                                 lda, b, ldb, alphar, alphai, beta, q, ldq, z,
                                 ldz, m, pl, pr, dif, &work_query, lwork,
                                 &iwork_query, liwork );
@@ -83,12 +83,10 @@ lapack_int LAPACKE_dtgsen( int matrix_layout, lapack_int ijob,
     liwork = iwork_query;
     lwork = (lapack_int)work_query;
     /* Allocate memory for work arrays */
-    if( ijob != 0 ) {
-        iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
-        if( iwork == NULL ) {
-            info = LAPACK_WORK_MEMORY_ERROR;
-            goto exit_level_0;
-        }
+    iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
+    if( iwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
     }
     work = (double*)LAPACKE_malloc( sizeof(double) * lwork );
     if( work == NULL ) {
@@ -96,19 +94,17 @@ lapack_int LAPACKE_dtgsen( int matrix_layout, lapack_int ijob,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtgsen_work( matrix_layout, ijob, wantq, wantz, select, n, a,
+    info = API_SUFFIX(LAPACKE_dtgsen_work)( matrix_layout, ijob, wantq, wantz, select, n, a,
                                 lda, b, ldb, alphar, alphai, beta, q, ldq, z,
                                 ldz, m, pl, pr, dif, work, lwork, iwork,
                                 liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_1:
-    if( ijob != 0 ) {
-        LAPACKE_free( iwork );
-    }
+    LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtgsen", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsen", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtgsen_work.c b/LAPACKE/src/lapacke_dtgsen_work.c
index a8b68763e3..422f8a41d1 100644
--- a/LAPACKE/src/lapacke_dtgsen_work.c
+++ b/LAPACKE/src/lapacke_dtgsen_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtgsen_work( int matrix_layout, lapack_int ijob,
+lapack_int API_SUFFIX(LAPACKE_dtgsen_work)( int matrix_layout, lapack_int ijob,
                                 lapack_logical wantq, lapack_logical wantz,
                                 const lapack_logical* select, lapack_int n,
                                 double* a, lapack_int lda, double* b,
@@ -64,22 +64,22 @@ lapack_int LAPACKE_dtgsen_work( int matrix_layout, lapack_int ijob,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dtgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsen_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dtgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsen_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dtgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsen_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_dtgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsen_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -116,13 +116,13 @@ lapack_int LAPACKE_dtgsen_work( int matrix_layout, lapack_int ijob,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         if( wantq ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         if( wantz ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dtgsen( &ijob, &wantq, &wantz, select, &n, a_t, &lda_t, b_t,
@@ -132,13 +132,13 @@ lapack_int LAPACKE_dtgsen_work( int matrix_layout, lapack_int ijob,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         if( wantq ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         if( wantz ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
         if( wantz ) {
@@ -154,11 +154,11 @@ lapack_int LAPACKE_dtgsen_work( int matrix_layout, lapack_int ijob,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsen_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtgsen_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsen_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtgsja.c b/LAPACKE/src/lapacke_dtgsja.c
index 7709fb954f..2fb318cd18 100644
--- a/LAPACKE/src/lapacke_dtgsja.c
+++ b/LAPACKE/src/lapacke_dtgsja.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtgsja( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_dtgsja)( int matrix_layout, char jobu, char jobv, char jobq,
                            lapack_int m, lapack_int p, lapack_int n,
                            lapack_int k, lapack_int l, double* a,
                            lapack_int lda, double* b, lapack_int ldb,
@@ -44,36 +44,36 @@ lapack_int LAPACKE_dtgsja( int matrix_layout, char jobu, char jobv, char jobq,
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtgsja", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsja", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -10;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( jobq, 'i' ) || LAPACKE_lsame( jobq, 'q' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -22;
             }
         }
-        if( LAPACKE_d_nancheck( 1, &tola, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &tola, 1 ) ) {
             return -14;
         }
-        if( LAPACKE_d_nancheck( 1, &tolb, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &tolb, 1 ) ) {
             return -15;
         }
-        if( LAPACKE_lsame( jobu, 'i' ) || LAPACKE_lsame( jobu, 'u' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, m, m, u, ldu ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, m, u, ldu ) ) {
                 return -18;
             }
         }
-        if( LAPACKE_lsame( jobv, 'i' ) || LAPACKE_lsame( jobv, 'v' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, p, p, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, p, p, v, ldv ) ) {
                 return -20;
             }
         }
@@ -86,14 +86,14 @@ lapack_int LAPACKE_dtgsja( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtgsja_work( matrix_layout, jobu, jobv, jobq, m, p, n, k, l,
+    info = API_SUFFIX(LAPACKE_dtgsja_work)( matrix_layout, jobu, jobv, jobq, m, p, n, k, l,
                                 a, lda, b, ldb, tola, tolb, alpha, beta, u, ldu,
                                 v, ldv, q, ldq, work, ncycle );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtgsja", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsja", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtgsja_work.c b/LAPACKE/src/lapacke_dtgsja_work.c
index 3a4bda6571..3e3dcaf3e8 100644
--- a/LAPACKE/src/lapacke_dtgsja_work.c
+++ b/LAPACKE/src/lapacke_dtgsja_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtgsja_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_dtgsja_work)( int matrix_layout, char jobu, char jobv,
                                 char jobq, lapack_int m, lapack_int p,
                                 lapack_int n, lapack_int k, lapack_int l,
                                 double* a, lapack_int lda, double* b,
@@ -65,27 +65,27 @@ lapack_int LAPACKE_dtgsja_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dtgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsja_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dtgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsja_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -23;
-            LAPACKE_xerbla( "LAPACKE_dtgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsja_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_dtgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsja_work", info );
             return info;
         }
         if( ldv < p ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_dtgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsja_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -99,21 +99,21 @@ lapack_int LAPACKE_dtgsja_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'i' ) || LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (double*)LAPACKE_malloc( sizeof(double) * ldu_t * MAX(1,m) );
             if( u_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'i' ) || LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (double*)LAPACKE_malloc( sizeof(double) * ldv_t * MAX(1,p) );
             if( v_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'i' ) || LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (double*)LAPACKE_malloc( sizeof(double) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -121,16 +121,16 @@ lapack_int LAPACKE_dtgsja_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_dge_trans( matrix_layout, m, m, u, ldu, u_t, ldu_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, m, u, ldu, u_t, ldu_t );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_dge_trans( matrix_layout, p, p, v, ldv, v_t, ldv_t );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, p, p, v, ldv, v_t, ldv_t );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dtgsja( &jobu, &jobv, &jobq, &m, &p, &n, &k, &l, a_t, &lda_t,
@@ -140,27 +140,27 @@ lapack_int LAPACKE_dtgsja_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'i' ) || LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'i' ) || LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'i' ) || LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'i' ) || LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'i' ) || LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'i' ) || LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -169,11 +169,11 @@ lapack_int LAPACKE_dtgsja_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsja_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtgsja_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsja_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtgsna.c b/LAPACKE/src/lapacke_dtgsna.c
index e47100422b..bb6380d90b 100644
--- a/LAPACKE/src/lapacke_dtgsna.c
+++ b/LAPACKE/src/lapacke_dtgsna.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtgsna( int matrix_layout, char job, char howmny,
+lapack_int API_SUFFIX(LAPACKE_dtgsna)( int matrix_layout, char job, char howmny,
                            const lapack_logical* select, lapack_int n,
                            const double* a, lapack_int lda, const double* b,
                            lapack_int ldb, const double* vl, lapack_int ldvl,
@@ -45,32 +45,32 @@ lapack_int LAPACKE_dtgsna( int matrix_layout, char job, char howmny,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtgsna", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsna", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -12;
             }
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * MAX(1,n+6) );
         if( iwork == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -78,7 +78,7 @@ lapack_int LAPACKE_dtgsna( int matrix_layout, char job, char howmny,
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_dtgsna_work( matrix_layout, job, howmny, select, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_dtgsna_work)( matrix_layout, job, howmny, select, n, a, lda, b,
                                 ldb, vl, ldvl, vr, ldvr, s, dif, mm, m,
                                 &work_query, lwork, iwork );
     if( info != 0 ) {
@@ -86,7 +86,7 @@ lapack_int LAPACKE_dtgsna( int matrix_layout, char job, char howmny,
     }
     lwork = (lapack_int)work_query;
     /* Allocate memory for work arrays */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         work = (double*)LAPACKE_malloc( sizeof(double) * lwork );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -94,20 +94,20 @@ lapack_int LAPACKE_dtgsna( int matrix_layout, char job, char howmny,
         }
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtgsna_work( matrix_layout, job, howmny, select, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_dtgsna_work)( matrix_layout, job, howmny, select, n, a, lda, b,
                                 ldb, vl, ldvl, vr, ldvr, s, dif, mm, m, work,
                                 lwork, iwork );
     /* Release memory and exit */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( work );
     }
 exit_level_1:
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( iwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtgsna", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsna", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtgsna_work.c b/LAPACKE/src/lapacke_dtgsna_work.c
index 6b549d00ef..478e71ddef 100644
--- a/LAPACKE/src/lapacke_dtgsna_work.c
+++ b/LAPACKE/src/lapacke_dtgsna_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtgsna_work( int matrix_layout, char job, char howmny,
+lapack_int API_SUFFIX(LAPACKE_dtgsna_work)( int matrix_layout, char job, char howmny,
                                 const lapack_logical* select, lapack_int n,
                                 const double* a, lapack_int lda,
                                 const double* b, lapack_int ldb,
@@ -62,22 +62,22 @@ lapack_int LAPACKE_dtgsna_work( int matrix_layout, char job, char howmny,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dtgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsna_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dtgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsna_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dtgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsna_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dtgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsna_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_dtgsna_work( int matrix_layout, char job, char howmny,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             vl_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvl_t * MAX(1,mm) );
             if( vl_t == NULL ) {
@@ -106,7 +106,7 @@ lapack_int LAPACKE_dtgsna_work( int matrix_layout, char job, char howmny,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             vr_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvr_t * MAX(1,mm) );
             if( vr_t == NULL ) {
@@ -115,13 +115,13 @@ lapack_int LAPACKE_dtgsna_work( int matrix_layout, char job, char howmny,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dtgsna( &job, &howmny, select, &n, a_t, &lda_t, b_t, &ldb_t,
@@ -131,11 +131,11 @@ lapack_int LAPACKE_dtgsna_work( int matrix_layout, char job, char howmny,
             info = info - 1;
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -144,11 +144,11 @@ lapack_int LAPACKE_dtgsna_work( int matrix_layout, char job, char howmny,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsna_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtgsna_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsna_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtgsyl.c b/LAPACKE/src/lapacke_dtgsyl.c
index 42ad6991c2..cd430880e6 100644
--- a/LAPACKE/src/lapacke_dtgsyl.c
+++ b/LAPACKE/src/lapacke_dtgsyl.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtgsyl( int matrix_layout, char trans, lapack_int ijob,
+lapack_int API_SUFFIX(LAPACKE_dtgsyl)( int matrix_layout, char trans, lapack_int ijob,
                            lapack_int m, lapack_int n, const double* a,
                            lapack_int lda, const double* b, lapack_int ldb,
                            double* c, lapack_int ldc, const double* d,
@@ -46,28 +46,28 @@ lapack_int LAPACKE_dtgsyl( int matrix_layout, char trans, lapack_int ijob,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtgsyl", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsyl", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, m, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, m, d, ldd ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, m, d, ldd ) ) {
             return -12;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, e, lde ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, e, lde ) ) {
             return -14;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, f, ldf ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, f, ldf ) ) {
             return -16;
         }
     }
@@ -79,7 +79,7 @@ lapack_int LAPACKE_dtgsyl( int matrix_layout, char trans, lapack_int ijob,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_dtgsyl_work( matrix_layout, trans, ijob, m, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_dtgsyl_work)( matrix_layout, trans, ijob, m, n, a, lda, b, ldb,
                                 c, ldc, d, ldd, e, lde, f, ldf, scale, dif,
                                 &work_query, lwork, iwork );
     if( info != 0 ) {
@@ -93,7 +93,7 @@ lapack_int LAPACKE_dtgsyl( int matrix_layout, char trans, lapack_int ijob,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtgsyl_work( matrix_layout, trans, ijob, m, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_dtgsyl_work)( matrix_layout, trans, ijob, m, n, a, lda, b, ldb,
                                 c, ldc, d, ldd, e, lde, f, ldf, scale, dif,
                                 work, lwork, iwork );
     /* Release memory and exit */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_dtgsyl( int matrix_layout, char trans, lapack_int ijob,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtgsyl", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsyl", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtgsyl_work.c b/LAPACKE/src/lapacke_dtgsyl_work.c
index 1f7b07e8dc..af4c8a72ad 100644
--- a/LAPACKE/src/lapacke_dtgsyl_work.c
+++ b/LAPACKE/src/lapacke_dtgsyl_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtgsyl_work( int matrix_layout, char trans, lapack_int ijob,
+lapack_int API_SUFFIX(LAPACKE_dtgsyl_work)( int matrix_layout, char trans, lapack_int ijob,
                                 lapack_int m, lapack_int n, const double* a,
                                 lapack_int lda, const double* b, lapack_int ldb,
                                 double* c, lapack_int ldc, const double* d,
@@ -66,32 +66,32 @@ lapack_int LAPACKE_dtgsyl_work( int matrix_layout, char trans, lapack_int ijob,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dtgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsyl_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dtgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsyl_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dtgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsyl_work", info );
             return info;
         }
         if( ldd < m ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dtgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsyl_work", info );
             return info;
         }
         if( lde < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dtgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsyl_work", info );
             return info;
         }
         if( ldf < n ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_dtgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsyl_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -133,12 +133,12 @@ lapack_int LAPACKE_dtgsyl_work( int matrix_layout, char trans, lapack_int ijob,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, m, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
-        LAPACKE_dge_trans( matrix_layout, m, m, d, ldd, d_t, ldd_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, e, lde, e_t, lde_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, f, ldf, f_t, ldf_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, m, d, ldd, d_t, ldd_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, e, lde, e_t, lde_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, f, ldf, f_t, ldf_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtgsyl( &trans, &ijob, &m, &n, a_t, &lda_t, b_t, &ldb_t, c_t,
                        &ldc_t, d_t, &ldd_t, e_t, &lde_t, f_t, &ldf_t, scale,
@@ -147,8 +147,8 @@ lapack_int LAPACKE_dtgsyl_work( int matrix_layout, char trans, lapack_int ijob,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, f_t, ldf_t, f, ldf );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, f_t, ldf_t, f, ldf );
         /* Release memory and exit */
         LAPACKE_free( f_t );
 exit_level_5:
@@ -163,11 +163,11 @@ lapack_int LAPACKE_dtgsyl_work( int matrix_layout, char trans, lapack_int ijob,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsyl_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtgsyl_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtgsyl_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtpcon.c b/LAPACKE/src/lapacke_dtpcon.c
index 28884fe767..3438b1e2f9 100644
--- a/LAPACKE/src/lapacke_dtpcon.c
+++ b/LAPACKE/src/lapacke_dtpcon.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtpcon( int matrix_layout, char norm, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_dtpcon)( int matrix_layout, char norm, char uplo, char diag,
                            lapack_int n, const double* ap, double* rcond )
 {
     lapack_int info = 0;
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtpcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dtp_nancheck( matrix_layout, uplo, diag, n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dtp_nancheck)( matrix_layout, uplo, diag, n, ap ) ) {
             return -6;
         }
     }
@@ -62,7 +62,7 @@ lapack_int LAPACKE_dtpcon( int matrix_layout, char norm, char uplo, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtpcon_work( matrix_layout, norm, uplo, diag, n, ap, rcond,
+    info = API_SUFFIX(LAPACKE_dtpcon_work)( matrix_layout, norm, uplo, diag, n, ap, rcond,
                                 work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -70,7 +70,7 @@ lapack_int LAPACKE_dtpcon( int matrix_layout, char norm, char uplo, char diag,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtpcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtpcon_work.c b/LAPACKE/src/lapacke_dtpcon_work.c
index 6c87547941..794bf97820 100644
--- a/LAPACKE/src/lapacke_dtpcon_work.c
+++ b/LAPACKE/src/lapacke_dtpcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtpcon_work( int matrix_layout, char norm, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dtpcon_work)( int matrix_layout, char norm, char uplo,
                                 char diag, lapack_int n, const double* ap,
                                 double* rcond, double* work, lapack_int* iwork )
 {
@@ -53,7 +53,7 @@ lapack_int LAPACKE_dtpcon_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dtp_trans( matrix_layout, uplo, diag, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dtp_trans)( matrix_layout, uplo, diag, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtpcon( &norm, &uplo, &diag, &n, ap_t, rcond, work, iwork,
                        &info );
@@ -64,11 +64,11 @@ lapack_int LAPACKE_dtpcon_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtpcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtpcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtpmqrt.c b/LAPACKE/src/lapacke_dtpmqrt.c
index b78da024b2..2a584e0f8a 100644
--- a/LAPACKE/src/lapacke_dtpmqrt.c
+++ b/LAPACKE/src/lapacke_dtpmqrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtpmqrt( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dtpmqrt)( int matrix_layout, char side, char trans,
                             lapack_int m, lapack_int n, lapack_int k,
                             lapack_int l, lapack_int nb, const double* v,
                             lapack_int ldv, const double* t, lapack_int ldt,
@@ -45,48 +45,48 @@ lapack_int LAPACKE_dtpmqrt( int matrix_layout, char side, char trans,
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtpmqrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpmqrt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        ncols_a = LAPACKE_lsame( side, 'L' ) ? n :
-                             ( LAPACKE_lsame( side, 'R' ) ? k : 0 );
-        nrows_a = LAPACKE_lsame( side, 'L' ) ? k :
-                             ( LAPACKE_lsame( side, 'R' ) ? m : 0 );
-        nrows_v = LAPACKE_lsame( side, 'L' ) ? m :
-                             ( LAPACKE_lsame( side, 'R' ) ? n : 0 );
-        if( LAPACKE_dge_nancheck( matrix_layout, nrows_a, ncols_a, a, lda ) ) {
+        ncols_a = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? k : 0 );
+        nrows_a = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? k :
+                             ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? m : 0 );
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? m :
+                             ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? n : 0 );
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, nrows_a, ncols_a, a, lda ) ) {
             return -13;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -15;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, nb, k, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, nb, k, t, ldt ) ) {
             return -11;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, nrows_v, k, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, nrows_v, k, v, ldv ) ) {
             return -9;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    lwork = LAPACKE_lsame( side, 'L' ) ? MAX(1,nb) * MAX(1,n) :
-                       ( LAPACKE_lsame( side, 'R' ) ? MAX(1,m) * MAX(1,nb) : 0 );
+    lwork = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? MAX(1,nb) * MAX(1,n) :
+                       ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? MAX(1,m) * MAX(1,nb) : 0 );
     work = (double*)LAPACKE_malloc( sizeof(double) * lwork );
     if( work == NULL ) {
         info = LAPACK_WORK_MEMORY_ERROR;
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtpmqrt_work( matrix_layout, side, trans, m, n, k, l, nb, v,
+    info = API_SUFFIX(LAPACKE_dtpmqrt_work)( matrix_layout, side, trans, m, n, k, l, nb, v,
                                  ldv, t, ldt, a, lda, b, ldb, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtpmqrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpmqrt", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtpmqrt_work.c b/LAPACKE/src/lapacke_dtpmqrt_work.c
index d9ee6226be..2dea60cdae 100644
--- a/LAPACKE/src/lapacke_dtpmqrt_work.c
+++ b/LAPACKE/src/lapacke_dtpmqrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtpmqrt_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dtpmqrt_work)( int matrix_layout, char side, char trans,
                                  lapack_int m, lapack_int n, lapack_int k,
                                  lapack_int l, lapack_int nb, const double* v,
                                  lapack_int ldv, const double* t,
@@ -48,33 +48,41 @@ lapack_int LAPACKE_dtpmqrt_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int lda_t = MAX(1,k);
+        lapack_int nrowsA, ncolsA, nrowsV;
+        if      ( API_SUFFIX(LAPACKE_lsame)(side, 'l') ) { nrowsA = k; ncolsA = n; nrowsV = m; }
+        else if ( API_SUFFIX(LAPACKE_lsame)(side, 'r') ) { nrowsA = m; ncolsA = k; nrowsV = n; }
+        else {
+            info = -2;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpmqrt_work", info );
+            return info;
+        }
+        lapack_int lda_t = MAX(1,nrowsA);
         lapack_int ldb_t = MAX(1,m);
-        lapack_int ldt_t = MAX(1,ldt);
-        lapack_int ldv_t = MAX(1,ldv);
+        lapack_int ldt_t = MAX(1,nb);
+        lapack_int ldv_t = MAX(1,nrowsV);
         double* v_t = NULL;
         double* t_t = NULL;
         double* a_t = NULL;
         double* b_t = NULL;
         /* Check leading dimension(s) */
-        if( lda < m ) {
+        if( lda < ncolsA ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_dtpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpmqrt_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_dtpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpmqrt_work", info );
             return info;
         }
-        if( ldt < nb ) {
+        if( ldt < k ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dtpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpmqrt_work", info );
             return info;
         }
         if( ldv < k ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dtpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpmqrt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -83,12 +91,12 @@ lapack_int LAPACKE_dtpmqrt_work( int matrix_layout, char side, char trans,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        t_t = (double*)LAPACKE_malloc( sizeof(double) * ldt_t * MAX(1,nb) );
+        t_t = (double*)LAPACKE_malloc( sizeof(double) * ldt_t * MAX(1,k) );
         if( t_t == NULL ) {
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        a_t = (double*)LAPACKE_malloc( sizeof(double) * lda_t * MAX(1,m) );
+        a_t = (double*)LAPACKE_malloc( sizeof(double) * lda_t * MAX(1,ncolsA) );
         if( a_t == NULL ) {
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_2;
@@ -99,10 +107,10 @@ lapack_int LAPACKE_dtpmqrt_work( int matrix_layout, char side, char trans,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
-        LAPACKE_dge_trans( matrix_layout, ldt, nb, t, ldt, t_t, ldt_t );
-        LAPACKE_dge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_ROW_MAJOR, nrowsV, k, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_ROW_MAJOR, nb, k, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_ROW_MAJOR, nrowsA, ncolsA, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_ROW_MAJOR, m, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtpmqrt( &side, &trans, &m, &n, &k, &l, &nb, v_t, &ldv_t, t_t,
                         &ldt_t, a_t, &lda_t, b_t, &ldb_t, work, &info );
@@ -110,8 +118,8 @@ lapack_int LAPACKE_dtpmqrt_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, k, m, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrowsA, ncolsA, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_3:
@@ -122,11 +130,11 @@ lapack_int LAPACKE_dtpmqrt_work( int matrix_layout, char side, char trans,
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpmqrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtpmqrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpmqrt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtpqrt.c b/LAPACKE/src/lapacke_dtpqrt.c
index 992e179931..ed7950a4f2 100644
--- a/LAPACKE/src/lapacke_dtpqrt.c
+++ b/LAPACKE/src/lapacke_dtpqrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtpqrt( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dtpqrt)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int l, lapack_int nb, double* a,
                            lapack_int lda, double* b, lapack_int ldb, double* t,
                            lapack_int ldt )
@@ -40,16 +40,16 @@ lapack_int LAPACKE_dtpqrt( int matrix_layout, lapack_int m, lapack_int n,
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtpqrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpqrt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -8;
         }
     }
@@ -61,13 +61,13 @@ lapack_int LAPACKE_dtpqrt( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtpqrt_work( matrix_layout, m, n, l, nb, a, lda, b, ldb, t,
+    info = API_SUFFIX(LAPACKE_dtpqrt_work)( matrix_layout, m, n, l, nb, a, lda, b, ldb, t,
                                 ldt, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtpqrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpqrt", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtpqrt2.c b/LAPACKE/src/lapacke_dtpqrt2.c
index d68e1102cf..4451c63c45 100644
--- a/LAPACKE/src/lapacke_dtpqrt2.c
+++ b/LAPACKE/src/lapacke_dtpqrt2.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtpqrt2( int matrix_layout,
+lapack_int API_SUFFIX(LAPACKE_dtpqrt2)( int matrix_layout,
                             lapack_int m, lapack_int n, lapack_int l,
                             double* a, lapack_int lda, double* b,
                             lapack_int ldb, double* t, lapack_int ldt )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtpqrt2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpqrt2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_dtpqrt2_work( matrix_layout, m, n, l, a, lda, b, ldb, t, ldt );
+    return API_SUFFIX(LAPACKE_dtpqrt2_work)( matrix_layout, m, n, l, a, lda, b, ldb, t, ldt );
 }
diff --git a/LAPACKE/src/lapacke_dtpqrt2_work.c b/LAPACKE/src/lapacke_dtpqrt2_work.c
index 5a36c475b4..1b221fef81 100644
--- a/LAPACKE/src/lapacke_dtpqrt2_work.c
+++ b/LAPACKE/src/lapacke_dtpqrt2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtpqrt2_work( int matrix_layout,
+lapack_int API_SUFFIX(LAPACKE_dtpqrt2_work)( int matrix_layout,
                                  lapack_int m, lapack_int n, lapack_int l,
                                  double* a, lapack_int lda, double* b,
                                  lapack_int ldb, double* t, lapack_int ldt )
@@ -54,17 +54,17 @@ lapack_int LAPACKE_dtpqrt2_work( int matrix_layout,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dtpqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpqrt2_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dtpqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpqrt2_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dtpqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpqrt2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -84,17 +84,17 @@ lapack_int LAPACKE_dtpqrt2_work( int matrix_layout,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtpqrt2( &m, &n, &l, a_t, &lda_t, b_t, &ldb_t, t_t, &ldt_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_2:
@@ -103,11 +103,11 @@ lapack_int LAPACKE_dtpqrt2_work( int matrix_layout,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtpqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpqrt2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtpqrt2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpqrt2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtpqrt_work.c b/LAPACKE/src/lapacke_dtpqrt_work.c
index c522f3aa71..dcbbe8cfbc 100644
--- a/LAPACKE/src/lapacke_dtpqrt_work.c
+++ b/LAPACKE/src/lapacke_dtpqrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dtpqrt_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int l, lapack_int nb, double* a,
                                 lapack_int lda, double* b, lapack_int ldb,
                                 double* t, lapack_int ldt, double* work )
@@ -55,17 +55,17 @@ lapack_int LAPACKE_dtpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dtpqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpqrt_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dtpqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpqrt_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dtpqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpqrt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -85,8 +85,8 @@ lapack_int LAPACKE_dtpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtpqrt( &m, &n, &l, &nb, a_t, &lda_t, b_t, &ldb_t, t_t, &ldt_t,
                        work, &info );
@@ -94,9 +94,9 @@ lapack_int LAPACKE_dtpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nb, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nb, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_2:
@@ -105,11 +105,11 @@ lapack_int LAPACKE_dtpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtpqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpqrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtpqrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpqrt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtprfb.c b/LAPACKE/src/lapacke_dtprfb.c
index b854d5b88a..d2f578fc60 100644
--- a/LAPACKE/src/lapacke_dtprfb.c
+++ b/LAPACKE/src/lapacke_dtprfb.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtprfb( int matrix_layout, char side, char trans, char direct,
+lapack_int API_SUFFIX(LAPACKE_dtprfb)( int matrix_layout, char side, char trans, char direct,
                            char storev, lapack_int m, lapack_int n,
                            lapack_int k, lapack_int l, const double* v,
                            lapack_int ldv, const double* t, lapack_int ldt,
@@ -44,7 +44,7 @@ lapack_int LAPACKE_dtprfb( int matrix_layout, char side, char trans, char direct
     lapack_int work_size;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtprfb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtprfb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
@@ -59,32 +59,32 @@ lapack_int LAPACKE_dtprfb( int matrix_layout, char side, char trans, char direct
          *   or m-by-k (right)
          * B is m-by-n
          */
-        if( LAPACKE_lsame( storev, 'C' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( storev, 'C' ) ) {
             ncols_v = k;
-            nrows_v = LAPACKE_lsame( side, 'L' ) ? m :
-                      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;
+            nrows_v = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? m :
+                      API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? n : 0;
+        } else if( API_SUFFIX(LAPACKE_lsame)( storev, 'R' ) ) {
+            ncols_v = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? m :
+                      API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? n : 0;
             nrows_v = k;
         } else {
             ncols_v = 0;
             nrows_v = 0;
         }
-        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_dge_nancheck( matrix_layout, ncols_a, nrows_a, a, lda ) ) {
+        nrows_a = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? k :
+                  API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? m : 0;
+        ncols_a = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? n :
+                  API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? k : 0;
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, ncols_a, nrows_a, a, lda ) ) {
             return -14;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -16;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, k, k, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, k, k, t, ldt ) ) {
             return -12;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, nrows_v, ncols_v, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, nrows_v, ncols_v, v, ldv ) ) {
             return -10;
         }
     }
@@ -105,14 +105,14 @@ lapack_int LAPACKE_dtprfb( int matrix_layout, char side, char trans, char direct
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtprfb_work( matrix_layout, side, trans, direct, storev, m, n,
+    info = API_SUFFIX(LAPACKE_dtprfb_work)( matrix_layout, side, trans, direct, storev, m, n,
                                 k, l, v, ldv, t, ldt, a, lda, b, ldb, work,
                                 ldwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtprfb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtprfb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtprfb_work.c b/LAPACKE/src/lapacke_dtprfb_work.c
index e4be902045..81339dd751 100644
--- a/LAPACKE/src/lapacke_dtprfb_work.c
+++ b/LAPACKE/src/lapacke_dtprfb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtprfb_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_dtprfb_work)( int matrix_layout, char side, char trans,
                                 char direct, char storev, lapack_int m,
                                 lapack_int n, lapack_int k, lapack_int l,
                                 const double* v, lapack_int ldv,
@@ -60,22 +60,22 @@ lapack_int LAPACKE_dtprfb_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_dtprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtprfb_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_dtprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtprfb_work", info );
             return info;
         }
         if( ldt < k ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_dtprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtprfb_work", info );
             return info;
         }
         if( ldv < k ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dtprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtprfb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -100,18 +100,18 @@ lapack_int LAPACKE_dtprfb_work( int matrix_layout, char side, char trans,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
-        LAPACKE_dge_trans( matrix_layout, ldt, k, t, ldt, t_t, ldt_t );
-        LAPACKE_dge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, ldt, k, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, k, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtprfb( &side, &trans, &direct, &storev, &m, &n, &k, &l, v_t,
                        &ldv_t, t_t, &ldt_t, a_t, &lda_t, b_t, &ldb_t, work,
                        &ldwork );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, k, m, a_t, lda_t, a, lda );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, k, m, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_3:
@@ -122,11 +122,11 @@ lapack_int LAPACKE_dtprfb_work( int matrix_layout, char side, char trans,
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtprfb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtprfb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtprfb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtprfs.c b/LAPACKE/src/lapacke_dtprfs.c
index d44d9d8d10..bda7049d59 100644
--- a/LAPACKE/src/lapacke_dtprfs.c
+++ b/LAPACKE/src/lapacke_dtprfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtprfs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_dtprfs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int nrhs, const double* ap,
                            const double* b, lapack_int ldb, const double* x,
                            lapack_int ldx, double* ferr, double* berr )
@@ -41,19 +41,19 @@ lapack_int LAPACKE_dtprfs( int matrix_layout, char uplo, char trans, char diag,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtprfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtprfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dtp_nancheck( matrix_layout, uplo, diag, n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dtp_nancheck)( matrix_layout, uplo, diag, n, ap ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -10;
         }
     }
@@ -70,7 +70,7 @@ lapack_int LAPACKE_dtprfs( int matrix_layout, char uplo, char trans, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtprfs_work( matrix_layout, uplo, trans, diag, n, nrhs, ap, b,
+    info = API_SUFFIX(LAPACKE_dtprfs_work)( matrix_layout, uplo, trans, diag, n, nrhs, ap, b,
                                 ldb, x, ldx, ferr, berr, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -78,7 +78,7 @@ lapack_int LAPACKE_dtprfs( int matrix_layout, char uplo, char trans, char diag,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtprfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtprfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtprfs_work.c b/LAPACKE/src/lapacke_dtprfs_work.c
index 26b001117c..61c6c9d5dd 100644
--- a/LAPACKE/src/lapacke_dtprfs_work.c
+++ b/LAPACKE/src/lapacke_dtprfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtprfs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_dtprfs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int nrhs,
                                 const double* ap, const double* b,
                                 lapack_int ldb, const double* x, lapack_int ldx,
@@ -56,12 +56,12 @@ lapack_int LAPACKE_dtprfs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dtprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtprfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dtprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtprfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -82,9 +82,9 @@ lapack_int LAPACKE_dtprfs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
-        LAPACKE_dtp_trans( matrix_layout, uplo, diag, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dtp_trans)( matrix_layout, uplo, diag, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtprfs( &uplo, &trans, &diag, &n, &nrhs, ap_t, b_t, &ldb_t, x_t,
                        &ldx_t, ferr, berr, work, iwork, &info );
@@ -99,11 +99,11 @@ lapack_int LAPACKE_dtprfs_work( int matrix_layout, char uplo, char trans,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtprfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtprfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtprfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtptri.c b/LAPACKE/src/lapacke_dtptri.c
index 1a07325518..dbc9908753 100644
--- a/LAPACKE/src/lapacke_dtptri.c
+++ b/LAPACKE/src/lapacke_dtptri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtptri( int matrix_layout, char uplo, char diag, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dtptri)( int matrix_layout, char uplo, char diag, lapack_int n,
                            double* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtptri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtptri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dtp_nancheck( matrix_layout, uplo, diag, n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dtp_nancheck)( matrix_layout, uplo, diag, n, ap ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dtptri_work( matrix_layout, uplo, diag, n, ap );
+    return API_SUFFIX(LAPACKE_dtptri_work)( matrix_layout, uplo, diag, n, ap );
 }
diff --git a/LAPACKE/src/lapacke_dtptri_work.c b/LAPACKE/src/lapacke_dtptri_work.c
index ef158b4532..142dc9b116 100644
--- a/LAPACKE/src/lapacke_dtptri_work.c
+++ b/LAPACKE/src/lapacke_dtptri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtptri_work( int matrix_layout, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_dtptri_work)( int matrix_layout, char uplo, char diag,
                                 lapack_int n, double* ap )
 {
     lapack_int info = 0;
@@ -52,23 +52,23 @@ lapack_int LAPACKE_dtptri_work( int matrix_layout, char uplo, char diag,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dtp_trans( matrix_layout, uplo, diag, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dtp_trans)( matrix_layout, uplo, diag, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtptri( &uplo, &diag, &n, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dtp_trans( LAPACK_COL_MAJOR, uplo, diag, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dtp_trans)( LAPACK_COL_MAJOR, uplo, diag, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtptri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtptri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtptri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtptri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtptrs.c b/LAPACKE/src/lapacke_dtptrs.c
index 4187f2fa84..71ee10b566 100644
--- a/LAPACKE/src/lapacke_dtptrs.c
+++ b/LAPACKE/src/lapacke_dtptrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtptrs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_dtptrs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int nrhs, const double* ap,
                            double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtptrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtptrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dtp_nancheck( matrix_layout, uplo, diag, n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dtp_nancheck)( matrix_layout, uplo, diag, n, ap ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_dtptrs_work( matrix_layout, uplo, trans, diag, n, nrhs, ap, b,
+    return API_SUFFIX(LAPACKE_dtptrs_work)( matrix_layout, uplo, trans, diag, n, nrhs, ap, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_dtptrs_work.c b/LAPACKE/src/lapacke_dtptrs_work.c
index f458e92441..ccbe5124d1 100644
--- a/LAPACKE/src/lapacke_dtptrs_work.c
+++ b/LAPACKE/src/lapacke_dtptrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtptrs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_dtptrs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int nrhs,
                                 const double* ap, double* b, lapack_int ldb )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dtptrs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dtptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtptrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,8 +66,8 @@ lapack_int LAPACKE_dtptrs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dtp_trans( matrix_layout, uplo, diag, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dtp_trans)( matrix_layout, uplo, diag, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtptrs( &uplo, &trans, &diag, &n, &nrhs, ap_t, b_t, &ldb_t,
                        &info );
@@ -75,18 +75,18 @@ lapack_int LAPACKE_dtptrs_work( int matrix_layout, char uplo, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtptrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtptrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtptrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtpttf.c b/LAPACKE/src/lapacke_dtpttf.c
index f9484ef307..a5a8e15622 100644
--- a/LAPACKE/src/lapacke_dtpttf.c
+++ b/LAPACKE/src/lapacke_dtpttf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtpttf( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dtpttf)( int matrix_layout, char transr, char uplo,
                            lapack_int n, const double* ap, double* arf )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtpttf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpttf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dpp_nancheck)( n, ap ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dtpttf_work( matrix_layout, transr, uplo, n, ap, arf );
+    return API_SUFFIX(LAPACKE_dtpttf_work)( matrix_layout, transr, uplo, n, ap, arf );
 }
diff --git a/LAPACKE/src/lapacke_dtpttf_work.c b/LAPACKE/src/lapacke_dtpttf_work.c
index 9ad0c4c76c..b074d140f0 100644
--- a/LAPACKE/src/lapacke_dtpttf_work.c
+++ b/LAPACKE/src/lapacke_dtpttf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtpttf_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dtpttf_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, const double* ap, double* arf )
 {
     lapack_int info = 0;
@@ -59,25 +59,25 @@ lapack_int LAPACKE_dtpttf_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtpttf( &transr, &uplo, &n, ap_t, arf_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dpf_trans( LAPACK_COL_MAJOR, transr, uplo, n, arf_t, arf );
+        API_SUFFIX(LAPACKE_dpf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, arf_t, arf );
         /* Release memory and exit */
         LAPACKE_free( arf_t );
 exit_level_1:
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtpttf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpttf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtpttf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpttf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtpttr.c b/LAPACKE/src/lapacke_dtpttr.c
index 1359dee069..725b78b64c 100644
--- a/LAPACKE/src/lapacke_dtpttr.c
+++ b/LAPACKE/src/lapacke_dtpttr.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtpttr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dtpttr)( int matrix_layout, char uplo, lapack_int n,
                            const double* ap, double* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtpttr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpttr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_dpp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dtpttr_work( matrix_layout, uplo, n, ap, a, lda );
+    return API_SUFFIX(LAPACKE_dtpttr_work)( matrix_layout, uplo, n, ap, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_dtpttr_work.c b/LAPACKE/src/lapacke_dtpttr_work.c
index 610cc58d6c..729bdf35b1 100644
--- a/LAPACKE/src/lapacke_dtpttr_work.c
+++ b/LAPACKE/src/lapacke_dtpttr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtpttr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dtpttr_work)( int matrix_layout, char uplo, lapack_int n,
                                 const double* ap, double* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dtpttr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dtpttr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpttr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -65,25 +65,25 @@ lapack_int LAPACKE_dtpttr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_dpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtpttr( &uplo, &n, ap_t, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtpttr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpttr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtpttr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpttr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtrcon.c b/LAPACKE/src/lapacke_dtrcon.c
index b24705f367..b778be6240 100644
--- a/LAPACKE/src/lapacke_dtrcon.c
+++ b/LAPACKE/src/lapacke_dtrcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrcon( int matrix_layout, char norm, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_dtrcon)( int matrix_layout, char norm, char uplo, char diag,
                            lapack_int n, const double* a, lapack_int lda,
                            double* rcond )
 {
@@ -40,13 +40,13 @@ lapack_int LAPACKE_dtrcon( int matrix_layout, char norm, char uplo, char diag,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtrcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dtr_nancheck( matrix_layout, uplo, diag, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dtr_nancheck)( matrix_layout, uplo, diag, n, a, lda ) ) {
             return -6;
         }
     }
@@ -63,7 +63,7 @@ lapack_int LAPACKE_dtrcon( int matrix_layout, char norm, char uplo, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtrcon_work( matrix_layout, norm, uplo, diag, n, a, lda,
+    info = API_SUFFIX(LAPACKE_dtrcon_work)( matrix_layout, norm, uplo, diag, n, a, lda,
                                 rcond, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -71,7 +71,7 @@ lapack_int LAPACKE_dtrcon( int matrix_layout, char norm, char uplo, char diag,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtrcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtrcon_work.c b/LAPACKE/src/lapacke_dtrcon_work.c
index b77869b0d2..b647cd9b2e 100644
--- a/LAPACKE/src/lapacke_dtrcon_work.c
+++ b/LAPACKE/src/lapacke_dtrcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrcon_work( int matrix_layout, char norm, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dtrcon_work)( int matrix_layout, char norm, char uplo,
                                 char diag, lapack_int n, const double* a,
                                 lapack_int lda, double* rcond, double* work,
                                 lapack_int* iwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_dtrcon_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dtrcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrcon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_dtrcon_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dtr_trans( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dtr_trans)( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtrcon( &norm, &uplo, &diag, &n, a_t, &lda_t, rcond, work, iwork,
                        &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_dtrcon_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtrcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtrcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtrevc.c b/LAPACKE/src/lapacke_dtrevc.c
index 5e7e6c1305..e38e802fc8 100644
--- a/LAPACKE/src/lapacke_dtrevc.c
+++ b/LAPACKE/src/lapacke_dtrevc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrevc( int matrix_layout, char side, char howmny,
+lapack_int API_SUFFIX(LAPACKE_dtrevc)( int matrix_layout, char side, char howmny,
                            lapack_logical* select, lapack_int n,
                            const double* t, lapack_int ldt, double* vl,
                            lapack_int ldvl, double* vr, lapack_int ldvr,
@@ -41,22 +41,22 @@ lapack_int LAPACKE_dtrevc( int matrix_layout, char side, char howmny,
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtrevc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrevc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -10;
             }
         }
@@ -69,13 +69,13 @@ lapack_int LAPACKE_dtrevc( int matrix_layout, char side, char howmny,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtrevc_work( matrix_layout, side, howmny, select, n, t, ldt,
+    info = API_SUFFIX(LAPACKE_dtrevc_work)( matrix_layout, side, howmny, select, n, t, ldt,
                                 vl, ldvl, vr, ldvr, mm, m, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtrevc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrevc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtrevc_work.c b/LAPACKE/src/lapacke_dtrevc_work.c
index 924e4382ad..7b00aa26e8 100644
--- a/LAPACKE/src/lapacke_dtrevc_work.c
+++ b/LAPACKE/src/lapacke_dtrevc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrevc_work( int matrix_layout, char side, char howmny,
+lapack_int API_SUFFIX(LAPACKE_dtrevc_work)( int matrix_layout, char side, char howmny,
                                 lapack_logical* select, lapack_int n,
                                 const double* t, lapack_int ldt, double* vl,
                                 lapack_int ldvl, double* vr, lapack_int ldvr,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_dtrevc_work( int matrix_layout, char side, char howmny,
         /* Check leading dimension(s) */
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dtrevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrevc_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dtrevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrevc_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dtrevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrevc_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,7 +75,7 @@ lapack_int LAPACKE_dtrevc_work( int matrix_layout, char side, char howmny,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             vl_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvl_t * MAX(1,mm) );
             if( vl_t == NULL ) {
@@ -83,7 +83,7 @@ lapack_int LAPACKE_dtrevc_work( int matrix_layout, char side, char howmny,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
             vr_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvr_t * MAX(1,mm) );
             if( vr_t == NULL ) {
@@ -92,14 +92,14 @@ lapack_int LAPACKE_dtrevc_work( int matrix_layout, char side, char howmny,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( ( LAPACKE_lsame( side, 'l' ) || LAPACKE_lsame( side, 'b' ) ) &&
-            LAPACKE_lsame( howmny, 'b' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) || API_SUFFIX(LAPACKE_lsame)( side, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( howmny, 'b' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( ( LAPACKE_lsame( side, 'r' ) || LAPACKE_lsame( side, 'b' ) ) &&
-            LAPACKE_lsame( howmny, 'b' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) || API_SUFFIX(LAPACKE_lsame)( side, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( howmny, 'b' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dtrevc( &side, &howmny, select, &n, t_t, &ldt_t, vl_t, &ldvl_t,
@@ -108,31 +108,31 @@ lapack_int LAPACKE_dtrevc_work( int matrix_layout, char side, char howmny,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
                                ldvl );
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
                                ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( t_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtrevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrevc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtrevc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrevc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtrexc.c b/LAPACKE/src/lapacke_dtrexc.c
index 33c1632027..ae17634093 100644
--- a/LAPACKE/src/lapacke_dtrexc.c
+++ b/LAPACKE/src/lapacke_dtrexc.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrexc( int matrix_layout, char compq, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dtrexc)( int matrix_layout, char compq, lapack_int n,
                            double* t, lapack_int ldt, double* q, lapack_int ldq,
                            lapack_int* ifst, lapack_int* ilst )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtrexc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrexc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -6;
             }
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -4;
         }
     }
@@ -62,13 +62,13 @@ lapack_int LAPACKE_dtrexc( int matrix_layout, char compq, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtrexc_work( matrix_layout, compq, n, t, ldt, q, ldq, ifst,
+    info = API_SUFFIX(LAPACKE_dtrexc_work)( matrix_layout, compq, n, t, ldt, q, ldq, ifst,
                                 ilst, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtrexc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrexc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtrexc_work.c b/LAPACKE/src/lapacke_dtrexc_work.c
index 2b2dc2586c..b346b82602 100644
--- a/LAPACKE/src/lapacke_dtrexc_work.c
+++ b/LAPACKE/src/lapacke_dtrexc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrexc_work( int matrix_layout, char compq, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dtrexc_work)( int matrix_layout, char compq, lapack_int n,
                                 double* t, lapack_int ldt, double* q,
                                 lapack_int ldq, lapack_int* ifst,
                                 lapack_int* ilst, double* work )
@@ -50,14 +50,14 @@ lapack_int LAPACKE_dtrexc_work( int matrix_layout, char compq, lapack_int n,
         double* t_t = NULL;
         double* q_t = NULL;
         /* Check leading dimension(s) */
-        if( ldq < n && LAPACKE_lsame( compq, 'v' ) ) {
+        if( ldq < n && API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dtrexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrexc_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dtrexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrexc_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,7 +66,7 @@ lapack_int LAPACKE_dtrexc_work( int matrix_layout, char compq, lapack_int n,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             q_t = (double*)LAPACKE_malloc( sizeof(double) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -74,9 +74,9 @@ lapack_int LAPACKE_dtrexc_work( int matrix_layout, char compq, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dtrexc( &compq, &n, t_t, &ldt_t, q_t, &ldq_t, ifst, ilst, work,
@@ -85,23 +85,23 @@ lapack_int LAPACKE_dtrexc_work( int matrix_layout, char compq, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( t_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtrexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrexc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtrexc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrexc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtrrfs.c b/LAPACKE/src/lapacke_dtrrfs.c
index ce32f82d9c..8185ef5f0f 100644
--- a/LAPACKE/src/lapacke_dtrrfs.c
+++ b/LAPACKE/src/lapacke_dtrrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrrfs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_dtrrfs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int nrhs, const double* a,
                            lapack_int lda, const double* b, lapack_int ldb,
                            const double* x, lapack_int ldx, double* ferr,
@@ -42,19 +42,19 @@ lapack_int LAPACKE_dtrrfs( int matrix_layout, char uplo, char trans, char diag,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtrrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dtr_nancheck( matrix_layout, uplo, diag, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dtr_nancheck)( matrix_layout, uplo, diag, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -11;
         }
     }
@@ -71,7 +71,7 @@ lapack_int LAPACKE_dtrrfs( int matrix_layout, char uplo, char trans, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtrrfs_work( matrix_layout, uplo, trans, diag, n, nrhs, a,
+    info = API_SUFFIX(LAPACKE_dtrrfs_work)( matrix_layout, uplo, trans, diag, n, nrhs, a,
                                 lda, b, ldb, x, ldx, ferr, berr, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -79,7 +79,7 @@ lapack_int LAPACKE_dtrrfs( int matrix_layout, char uplo, char trans, char diag,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtrrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtrrfs_work.c b/LAPACKE/src/lapacke_dtrrfs_work.c
index 9cbfe342e4..57d7104c7e 100644
--- a/LAPACKE/src/lapacke_dtrrfs_work.c
+++ b/LAPACKE/src/lapacke_dtrrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrrfs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_dtrrfs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int nrhs,
                                 const double* a, lapack_int lda,
                                 const double* b, lapack_int ldb,
@@ -57,17 +57,17 @@ lapack_int LAPACKE_dtrrfs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dtrrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dtrrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dtrrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -87,9 +87,9 @@ lapack_int LAPACKE_dtrrfs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_dtr_trans( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_dtr_trans)( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtrrfs( &uplo, &trans, &diag, &n, &nrhs, a_t, &lda_t, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, iwork, &info );
@@ -104,11 +104,11 @@ lapack_int LAPACKE_dtrrfs_work( int matrix_layout, char uplo, char trans,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtrrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtrrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtrsen.c b/LAPACKE/src/lapacke_dtrsen.c
index 255ea34ea6..9daf023014 100644
--- a/LAPACKE/src/lapacke_dtrsen.c
+++ b/LAPACKE/src/lapacke_dtrsen.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrsen( int matrix_layout, char job, char compq,
+lapack_int API_SUFFIX(LAPACKE_dtrsen)( int matrix_layout, char job, char compq,
                            const lapack_logical* select, lapack_int n,
                            double* t, lapack_int ldt, double* q, lapack_int ldq,
                            double* wr, double* wi, lapack_int* m, double* s,
@@ -46,24 +46,24 @@ lapack_int LAPACKE_dtrsen( int matrix_layout, char job, char compq,
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtrsen", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsen", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dtrsen_work( matrix_layout, job, compq, select, n, t, ldt, q,
+    info = API_SUFFIX(LAPACKE_dtrsen_work)( matrix_layout, job, compq, select, n, t, ldt, q,
                                 ldq, wr, wi, m, s, sep, &work_query, lwork,
                                 &iwork_query, liwork );
     if( info != 0 ) {
@@ -72,12 +72,18 @@ lapack_int LAPACKE_dtrsen( int matrix_layout, char job, char compq,
     liwork = iwork_query;
     lwork = (lapack_int)work_query;
     /* Allocate memory for work arrays */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
         if( iwork == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
             goto exit_level_0;
         }
+    } else {
+        iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) );
+        if( iwork == NULL ) {
+            info = LAPACK_WORK_MEMORY_ERROR;
+            goto exit_level_0;
+        }
     }
     work = (double*)LAPACKE_malloc( sizeof(double) * lwork );
     if( work == NULL ) {
@@ -85,18 +91,18 @@ lapack_int LAPACKE_dtrsen( int matrix_layout, char job, char compq,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtrsen_work( matrix_layout, job, compq, select, n, t, ldt, q,
+    info = API_SUFFIX(LAPACKE_dtrsen_work)( matrix_layout, job, compq, select, n, t, ldt, q,
                                 ldq, wr, wi, m, s, sep, work, lwork, iwork,
                                 liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_1:
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( iwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtrsen", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsen", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtrsen_work.c b/LAPACKE/src/lapacke_dtrsen_work.c
index 98ac743b9a..bb74d4771e 100644
--- a/LAPACKE/src/lapacke_dtrsen_work.c
+++ b/LAPACKE/src/lapacke_dtrsen_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrsen_work( int matrix_layout, char job, char compq,
+lapack_int API_SUFFIX(LAPACKE_dtrsen_work)( int matrix_layout, char job, char compq,
                                 const lapack_logical* select, lapack_int n,
                                 double* t, lapack_int ldt, double* q,
                                 lapack_int ldq, double* wr, double* wi,
@@ -56,12 +56,12 @@ lapack_int LAPACKE_dtrsen_work( int matrix_layout, char job, char compq,
         /* Check leading dimension(s) */
         if( ldq < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dtrsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsen_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dtrsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsen_work", info );
             return info;
         }
         /* Allocate memory for temporary array T */
@@ -71,7 +71,7 @@ lapack_int LAPACKE_dtrsen_work( int matrix_layout, char job, char compq,
             goto exit_level_0;
         }
         /* Transpose input matrix T */
-        LAPACKE_dge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
         /* Query optimal working array(s) size if requested */
         if( liwork == -1 || lwork == -1 ) {
             LAPACK_dtrsen( &job, &compq, select, &n, t_t, &ldt_t, q, &ldq_t, wr,
@@ -80,7 +80,7 @@ lapack_int LAPACKE_dtrsen_work( int matrix_layout, char job, char compq,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             q_t = (double*)LAPACKE_malloc( sizeof(double) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -88,8 +88,8 @@ lapack_int LAPACKE_dtrsen_work( int matrix_layout, char job, char compq,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dtrsen( &job, &compq, select, &n, t_t, &ldt_t, q_t, &ldq_t, wr,
@@ -98,23 +98,23 @@ lapack_int LAPACKE_dtrsen_work( int matrix_layout, char job, char compq,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( t_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtrsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsen_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtrsen_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsen_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtrsna.c b/LAPACKE/src/lapacke_dtrsna.c
index 98ef3279d5..d5a21e9410 100644
--- a/LAPACKE/src/lapacke_dtrsna.c
+++ b/LAPACKE/src/lapacke_dtrsna.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrsna( int matrix_layout, char job, char howmny,
+lapack_int API_SUFFIX(LAPACKE_dtrsna)( int matrix_layout, char job, char howmny,
                            const lapack_logical* select, lapack_int n,
                            const double* t, lapack_int ldt, const double* vl,
                            lapack_int ldvl, const double* vr, lapack_int ldvr,
@@ -40,33 +40,33 @@ lapack_int LAPACKE_dtrsna( int matrix_layout, char job, char howmny,
                            lapack_int* m )
 {
     lapack_int info = 0;
-    lapack_int ldwork =  LAPACKE_lsame( job, 'e' ) ? 1 : MAX(1,n) ;
+    lapack_int ldwork =  API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ? 1 : MAX(1,n) ;
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtrsna", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsna", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            if( LAPACKE_dge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -10;
             }
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         iwork = (lapack_int*)
             LAPACKE_malloc( sizeof(lapack_int) * MAX(1,2*(n-1)) );
         if( iwork == NULL ) {
@@ -74,7 +74,7 @@ lapack_int LAPACKE_dtrsna( int matrix_layout, char job, char howmny,
             goto exit_level_0;
         }
     }
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         work = (double*)LAPACKE_malloc( sizeof(double) * ldwork * MAX(1,n+6) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -82,20 +82,20 @@ lapack_int LAPACKE_dtrsna( int matrix_layout, char job, char howmny,
         }
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtrsna_work( matrix_layout, job, howmny, select, n, t, ldt,
+    info = API_SUFFIX(LAPACKE_dtrsna_work)( matrix_layout, job, howmny, select, n, t, ldt,
                                 vl, ldvl, vr, ldvr, s, sep, mm, m, work, ldwork,
                                 iwork );
     /* Release memory and exit */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( work );
     }
 exit_level_1:
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( iwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtrsna", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsna", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtrsna_work.c b/LAPACKE/src/lapacke_dtrsna_work.c
index bb7723fa71..3fb5010ab5 100644
--- a/LAPACKE/src/lapacke_dtrsna_work.c
+++ b/LAPACKE/src/lapacke_dtrsna_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrsna_work( int matrix_layout, char job, char howmny,
+lapack_int API_SUFFIX(LAPACKE_dtrsna_work)( int matrix_layout, char job, char howmny,
                                 const lapack_logical* select, lapack_int n,
                                 const double* t, lapack_int ldt,
                                 const double* vl, lapack_int ldvl,
@@ -59,17 +59,17 @@ lapack_int LAPACKE_dtrsna_work( int matrix_layout, char job, char howmny,
         /* Check leading dimension(s) */
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_dtrsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsna_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_dtrsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsna_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_dtrsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsna_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -78,7 +78,7 @@ lapack_int LAPACKE_dtrsna_work( int matrix_layout, char job, char howmny,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             vl_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvl_t * MAX(1,mm) );
             if( vl_t == NULL ) {
@@ -86,7 +86,7 @@ lapack_int LAPACKE_dtrsna_work( int matrix_layout, char job, char howmny,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             vr_t = (double*)
                 LAPACKE_malloc( sizeof(double) * ldvr_t * MAX(1,mm) );
             if( vr_t == NULL ) {
@@ -95,12 +95,12 @@ lapack_int LAPACKE_dtrsna_work( int matrix_layout, char job, char howmny,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            LAPACKE_dge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_dtrsna( &job, &howmny, select, &n, t_t, &ldt_t, vl_t, &ldvl_t,
@@ -110,22 +110,22 @@ lapack_int LAPACKE_dtrsna_work( int matrix_layout, char job, char howmny,
             info = info - 1;
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( t_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtrsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsna_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtrsna_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsna_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtrsyl.c b/LAPACKE/src/lapacke_dtrsyl.c
index 5652f28467..713899cf60 100644
--- a/LAPACKE/src/lapacke_dtrsyl.c
+++ b/LAPACKE/src/lapacke_dtrsyl.c
@@ -32,30 +32,30 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrsyl( int matrix_layout, char trana, char tranb,
+lapack_int API_SUFFIX(LAPACKE_dtrsyl)( int matrix_layout, char trana, char tranb,
                            lapack_int isgn, lapack_int m, lapack_int n,
                            const double* a, lapack_int lda, const double* b,
                            lapack_int ldb, double* c, lapack_int ldc,
                            double* scale )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtrsyl", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsyl", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, m, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -11;
         }
     }
 #endif
-    return LAPACKE_dtrsyl_work( matrix_layout, trana, tranb, isgn, m, n, a, lda,
+    return API_SUFFIX(LAPACKE_dtrsyl_work)( matrix_layout, trana, tranb, isgn, m, n, a, lda,
                                 b, ldb, c, ldc, scale );
 }
diff --git a/LAPACKE/src/lapacke_dtrsyl3.c b/LAPACKE/src/lapacke_dtrsyl3.c
new file mode 100644
index 0000000000..3ed03f0db4
--- /dev/null
+++ b/LAPACKE/src/lapacke_dtrsyl3.c
@@ -0,0 +1,68 @@
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_dtrsyl3)( int matrix_layout, char trana, char tranb,
+                            lapack_int isgn, lapack_int m, lapack_int n,
+                            const double* a, lapack_int lda, const double* b,
+                            lapack_int ldb, double* c, lapack_int ldc,
+                            double* scale )
+{
+    lapack_int info = 0;
+    double swork_query[2];
+    double* swork = NULL;
+    lapack_int ldswork = -1;
+    lapack_int swork_size = -1;
+    lapack_int iwork_query;
+    lapack_int* iwork = NULL;
+    lapack_int liwork = -1;
+    if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsyl3", -1 );
+        return -1;
+    }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+    if( LAPACKE_get_nancheck() ) {
+        /* Optionally check input matrices for NaNs */
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, m, a, lda ) ) {
+            return -7;
+        }
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
+            return -9;
+        }
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
+            return -11;
+        }
+    }
+#endif
+    /* Query optimal working array sizes */
+    info = API_SUFFIX(LAPACKE_dtrsyl3_work)( matrix_layout, trana, tranb, isgn, m, n, a, lda,
+                                 b, ldb, c, ldc, scale, &iwork_query, liwork,
+                                 swork_query, ldswork );
+    if( info != 0 ) {
+        goto exit_level_0;
+    }
+    ldswork = swork_query[0];
+    swork_size = ldswork * swork_query[1];
+    swork = (double*)LAPACKE_malloc( sizeof(double) * swork_size);
+    if( swork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
+    }
+    liwork = iwork_query;
+    iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
+    if ( iwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_1;
+    }
+    /* Call middle-level interface */
+    info = API_SUFFIX(LAPACKE_dtrsyl3_work)( matrix_layout, trana, tranb, isgn, m, n, a,
+                                 lda, b, ldb, c, ldc, scale, iwork, liwork,
+                                 swork, ldswork );
+    /* Release memory and exit */
+    LAPACKE_free( iwork );
+exit_level_1:
+    LAPACKE_free( swork );
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsyl3", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_dtrsyl3_work.c b/LAPACKE/src/lapacke_dtrsyl3_work.c
new file mode 100644
index 0000000000..2b4dcd44da
--- /dev/null
+++ b/LAPACKE/src/lapacke_dtrsyl3_work.c
@@ -0,0 +1,86 @@
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_dtrsyl3_work)( int matrix_layout, char trana, char tranb,
+                                 lapack_int isgn, lapack_int m, lapack_int n,
+                                 const double* a, lapack_int lda,
+                                 const double* b, lapack_int ldb, double* c,
+                                 lapack_int ldc, double* scale,
+                                 lapack_int* iwork, lapack_int liwork,
+                                 double* swork, lapack_int ldswork )
+{
+    lapack_int info = 0;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        LAPACK_dtrsyl3( &trana, &tranb, &isgn, &m, &n, a, &lda, b, &ldb, c, &ldc,
+                        scale, iwork, &liwork, swork, &ldswork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        lapack_int lda_t = MAX(1,m);
+        lapack_int ldb_t = MAX(1,n);
+        lapack_int ldc_t = MAX(1,m);
+        double* a_t = NULL;
+        double* b_t = NULL;
+        double* c_t = NULL;
+        /* Check leading dimension(s) */
+        if( lda < m ) {
+            info = -8;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsyl3_work", info );
+            return info;
+        }
+        if( ldb < n ) {
+            info = -10;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsyl3_work", info );
+            return info;
+        }
+        if( ldc < n ) {
+            info = -12;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsyl3_work", info );
+            return info;
+        }
+        /* Allocate memory for temporary array(s) */
+        a_t = (double*)LAPACKE_malloc( sizeof(double) * lda_t * MAX(1,m) );
+        if( a_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+        b_t = (double*)LAPACKE_malloc( sizeof(double) * ldb_t * MAX(1,n) );
+        if( b_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_1;
+        }
+        c_t = (double*)LAPACKE_malloc( sizeof(double) * ldc_t * MAX(1,n) );
+        if( c_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_2;
+        }
+        /* Transpose input matrices */
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        /* Call LAPACK function and adjust info */
+        LAPACK_dtrsyl3( &trana, &tranb, &isgn, &m, &n, a_t, &lda_t, b_t, &ldb_t,
+                        c_t, &ldc_t, scale, iwork, &liwork, swork, &ldswork,
+                        &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+        /* Transpose output matrices */
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        /* Release memory and exit */
+        LAPACKE_free( c_t );
+exit_level_2:
+        LAPACKE_free( b_t );
+exit_level_1:
+        LAPACKE_free( a_t );
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsyl3_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsyl3_work", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_dtrsyl_work.c b/LAPACKE/src/lapacke_dtrsyl_work.c
index f613312457..9129bacd92 100644
--- a/LAPACKE/src/lapacke_dtrsyl_work.c
+++ b/LAPACKE/src/lapacke_dtrsyl_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrsyl_work( int matrix_layout, char trana, char tranb,
+lapack_int API_SUFFIX(LAPACKE_dtrsyl_work)( int matrix_layout, char trana, char tranb,
                                 lapack_int isgn, lapack_int m, lapack_int n,
                                 const double* a, lapack_int lda,
                                 const double* b, lapack_int ldb, double* c,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_dtrsyl_work( int matrix_layout, char trana, char tranb,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dtrsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsyl_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dtrsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsyl_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_dtrsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsyl_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -86,9 +86,9 @@ lapack_int LAPACKE_dtrsyl_work( int matrix_layout, char trana, char tranb,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, m, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-        LAPACKE_dge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtrsyl( &trana, &tranb, &isgn, &m, &n, a_t, &lda_t, b_t, &ldb_t,
                        c_t, &ldc_t, scale, &info );
@@ -96,7 +96,7 @@ lapack_int LAPACKE_dtrsyl_work( int matrix_layout, char trana, char tranb,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_2:
@@ -105,11 +105,11 @@ lapack_int LAPACKE_dtrsyl_work( int matrix_layout, char trana, char tranb,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtrsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsyl_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtrsyl_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrsyl_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtrtri.c b/LAPACKE/src/lapacke_dtrtri.c
index a4cc52162d..a6ef1707c3 100644
--- a/LAPACKE/src/lapacke_dtrtri.c
+++ b/LAPACKE/src/lapacke_dtrtri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrtri( int matrix_layout, char uplo, char diag, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dtrtri)( int matrix_layout, char uplo, char diag, lapack_int n,
                            double* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtrtri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrtri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dtr_nancheck( matrix_layout, uplo, diag, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dtr_nancheck)( matrix_layout, uplo, diag, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dtrtri_work( matrix_layout, uplo, diag, n, a, lda );
+    return API_SUFFIX(LAPACKE_dtrtri_work)( matrix_layout, uplo, diag, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_dtrtri_work.c b/LAPACKE/src/lapacke_dtrtri_work.c
index 520b68c865..32646ef6ac 100644
--- a/LAPACKE/src/lapacke_dtrtri_work.c
+++ b/LAPACKE/src/lapacke_dtrtri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrtri_work( int matrix_layout, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_dtrtri_work)( int matrix_layout, char uplo, char diag,
                                 lapack_int n, double* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_dtrtri_work( int matrix_layout, char uplo, char diag,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dtrtri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrtri_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,24 +58,24 @@ lapack_int LAPACKE_dtrtri_work( int matrix_layout, char uplo, char diag,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dtr_trans( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dtr_trans)( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtrtri( &uplo, &diag, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dtr_trans( LAPACK_COL_MAJOR, uplo, diag, n, a_t, lda_t, a,
+        API_SUFFIX(LAPACKE_dtr_trans)( LAPACK_COL_MAJOR, uplo, diag, n, a_t, lda_t, a,
                            lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtrtri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrtri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtrtri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrtri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtrtrs.c b/LAPACKE/src/lapacke_dtrtrs.c
index f035927b83..413f54baa8 100644
--- a/LAPACKE/src/lapacke_dtrtrs.c
+++ b/LAPACKE/src/lapacke_dtrtrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrtrs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_dtrtrs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int nrhs, const double* a,
                            lapack_int lda, double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtrtrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrtrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dtr_nancheck( matrix_layout, uplo, diag, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dtr_nancheck)( matrix_layout, uplo, diag, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_dtrtrs_work( matrix_layout, uplo, trans, diag, n, nrhs, a,
+    return API_SUFFIX(LAPACKE_dtrtrs_work)( matrix_layout, uplo, trans, diag, n, nrhs, a,
                                 lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_dtrtrs_work.c b/LAPACKE/src/lapacke_dtrtrs_work.c
index 41675e5053..35265f79b3 100644
--- a/LAPACKE/src/lapacke_dtrtrs_work.c
+++ b/LAPACKE/src/lapacke_dtrtrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrtrs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_dtrtrs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int nrhs,
                                 const double* a, lapack_int lda, double* b,
                                 lapack_int ldb )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_dtrtrs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_dtrtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrtrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_dtrtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrtrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -73,8 +73,8 @@ lapack_int LAPACKE_dtrtrs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dtr_trans( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
-        LAPACKE_dge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_dtr_trans)( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtrtrs( &uplo, &trans, &diag, &n, &nrhs, a_t, &lda_t, b_t,
                        &ldb_t, &info );
@@ -82,18 +82,18 @@ lapack_int LAPACKE_dtrtrs_work( int matrix_layout, char uplo, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtrtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrtrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtrtrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrtrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtrttf.c b/LAPACKE/src/lapacke_dtrttf.c
index 79deb02771..88762a1408 100644
--- a/LAPACKE/src/lapacke_dtrttf.c
+++ b/LAPACKE/src/lapacke_dtrttf.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrttf( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dtrttf)( int matrix_layout, char transr, char uplo,
                            lapack_int n, const double* a, lapack_int lda,
                            double* arf )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtrttf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrttf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dtr_nancheck( matrix_layout, uplo, 'n', n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dtr_nancheck)( matrix_layout, uplo, 'n', n, a, lda ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_dtrttf_work( matrix_layout, transr, uplo, n, a, lda, arf );
+    return API_SUFFIX(LAPACKE_dtrttf_work)( matrix_layout, transr, uplo, n, a, lda, arf );
 }
diff --git a/LAPACKE/src/lapacke_dtrttf_work.c b/LAPACKE/src/lapacke_dtrttf_work.c
index 7404ebe17a..4ab395b203 100644
--- a/LAPACKE/src/lapacke_dtrttf_work.c
+++ b/LAPACKE/src/lapacke_dtrttf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrttf_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_dtrttf_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, const double* a, lapack_int lda,
                                 double* arf )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_dtrttf_work( int matrix_layout, char transr, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_dtrttf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrttf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,25 +66,25 @@ lapack_int LAPACKE_dtrttf_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtrttf( &transr, &uplo, &n, a_t, &lda_t, arf_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dpf_trans( LAPACK_COL_MAJOR, transr, uplo, n, arf_t, arf );
+        API_SUFFIX(LAPACKE_dpf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, arf_t, arf );
         /* Release memory and exit */
         LAPACKE_free( arf_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtrttf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrttf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtrttf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrttf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtrttp.c b/LAPACKE/src/lapacke_dtrttp.c
index 5f6ddbcdc5..f2360b4637 100644
--- a/LAPACKE/src/lapacke_dtrttp.c
+++ b/LAPACKE/src/lapacke_dtrttp.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrttp( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dtrttp)( int matrix_layout, char uplo, lapack_int n,
                            const double* a, lapack_int lda, double* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtrttp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrttp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dtr_nancheck( matrix_layout, uplo, 'n', n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dtr_nancheck)( matrix_layout, uplo, 'n', n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_dtrttp_work( matrix_layout, uplo, n, a, lda, ap );
+    return API_SUFFIX(LAPACKE_dtrttp_work)( matrix_layout, uplo, n, a, lda, ap );
 }
diff --git a/LAPACKE/src/lapacke_dtrttp_work.c b/LAPACKE/src/lapacke_dtrttp_work.c
index 6a1fe6fae6..c0c5b4b77c 100644
--- a/LAPACKE/src/lapacke_dtrttp_work.c
+++ b/LAPACKE/src/lapacke_dtrttp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtrttp_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dtrttp_work)( int matrix_layout, char uplo, lapack_int n,
                                 const double* a, lapack_int lda, double* ap )
 {
     lapack_int info = 0;
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dtrttp_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dtrttp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrttp_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -65,25 +65,25 @@ lapack_int LAPACKE_dtrttp_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtrttp( &uplo, &n, a_t, &lda_t, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_dpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtrttp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrttp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtrttp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtrttp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtzrzf.c b/LAPACKE/src/lapacke_dtzrzf.c
index 769c571390..18f6984faf 100644
--- a/LAPACKE/src/lapacke_dtzrzf.c
+++ b/LAPACKE/src/lapacke_dtzrzf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtzrzf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dtzrzf)( int matrix_layout, lapack_int m, lapack_int n,
                            double* a, lapack_int lda, double* tau )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_dtzrzf( int matrix_layout, lapack_int m, lapack_int n,
     double* work = NULL;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_dtzrzf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtzrzf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_dtzrzf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_dtzrzf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,12 +65,12 @@ lapack_int LAPACKE_dtzrzf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_dtzrzf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_dtzrzf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_dtzrzf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtzrzf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_dtzrzf_work.c b/LAPACKE/src/lapacke_dtzrzf_work.c
index e59826ec26..e74194f2b2 100644
--- a/LAPACKE/src/lapacke_dtzrzf_work.c
+++ b/LAPACKE/src/lapacke_dtzrzf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_dtzrzf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_dtzrzf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 double* a, lapack_int lda, double* tau,
                                 double* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_dtzrzf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_dtzrzf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtzrzf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_dtzrzf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_dtzrzf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_dtzrzf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtzrzf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_dtzrzf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtzrzf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ilaver.c b/LAPACKE/src/lapacke_ilaver.c
index b37c5c8a22..0de76d31d8 100644
--- a/LAPACKE/src/lapacke_ilaver.c
+++ b/LAPACKE/src/lapacke_ilaver.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-void LAPACKE_ilaver( lapack_int* vers_major,
+void API_SUFFIX(LAPACKE_ilaver)( lapack_int* vers_major,
                      lapack_int* vers_minor,
                      lapack_int* vers_patch )
 {
diff --git a/LAPACKE/src/lapacke_sbbcsd.c b/LAPACKE/src/lapacke_sbbcsd.c
index cee19a9177..542fda7bb7 100644
--- a/LAPACKE/src/lapacke_sbbcsd.c
+++ b/LAPACKE/src/lapacke_sbbcsd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sbbcsd( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_sbbcsd)( int matrix_layout, char jobu1, char jobu2,
                            char jobv1t, char jobv2t, char trans, lapack_int m,
                            lapack_int p, lapack_int q, float* theta, float* phi,
                            float* u1, lapack_int ldu1, float* u2,
@@ -47,10 +47,10 @@ lapack_int LAPACKE_sbbcsd( int matrix_layout, char jobu1, char jobu2,
     float work_query;
     int lapack_layout;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sbbcsd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbbcsd", -1 );
         return -1;
     }
-    if( LAPACKE_lsame( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+    if( API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
         lapack_layout = LAPACK_COL_MAJOR;
     } else {
         lapack_layout = LAPACK_ROW_MAJOR;
@@ -58,36 +58,36 @@ lapack_int LAPACKE_sbbcsd( int matrix_layout, char jobu1, char jobu2,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( q-1, phi, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( q-1, phi, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_s_nancheck( q, theta, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( q, theta, 1 ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( jobu1, 'y' ) ) {
-            if( LAPACKE_sge_nancheck( lapack_layout, p, p, u1, ldu1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( lapack_layout, p, p, u1, ldu1 ) ) {
                 return -12;
             }
         }
-        if( LAPACKE_lsame( jobu2, 'y' ) ) {
-            if( LAPACKE_sge_nancheck( lapack_layout, m-p, m-p, u2, ldu2 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( lapack_layout, m-p, m-p, u2, ldu2 ) ) {
                 return -14;
             }
         }
-        if( LAPACKE_lsame( jobv1t, 'y' ) ) {
-            if( LAPACKE_sge_nancheck( lapack_layout, q, q, v1t, ldv1t ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( lapack_layout, q, q, v1t, ldv1t ) ) {
                 return -16;
             }
         }
-        if( LAPACKE_lsame( jobv2t, 'y' ) ) {
-            if( LAPACKE_sge_nancheck( lapack_layout, m-q, m-q, v2t, ldv2t ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv2t, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( lapack_layout, m-q, m-q, v2t, ldv2t ) ) {
                 return -18;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sbbcsd_work( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
+    info = API_SUFFIX(LAPACKE_sbbcsd_work)( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
                                 trans, m, p, q, theta, phi, u1, ldu1, u2, ldu2,
                                 v1t, ldv1t, v2t, ldv2t, b11d, b11e, b12d, b12e,
                                 b21d, b21e, b22d, b22e, &work_query, lwork );
@@ -102,7 +102,7 @@ lapack_int LAPACKE_sbbcsd( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sbbcsd_work( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
+    info = API_SUFFIX(LAPACKE_sbbcsd_work)( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
                                 trans, m, p, q, theta, phi, u1, ldu1, u2, ldu2,
                                 v1t, ldv1t, v2t, ldv2t, b11d, b11e, b12d, b12e,
                                 b21d, b21e, b22d, b22e, work, lwork );
@@ -110,7 +110,7 @@ lapack_int LAPACKE_sbbcsd( int matrix_layout, char jobu1, char jobu2,
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sbbcsd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbbcsd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sbbcsd_work.c b/LAPACKE/src/lapacke_sbbcsd_work.c
index 9ffc3a0ddb..e829f779f5 100644
--- a/LAPACKE/src/lapacke_sbbcsd_work.c
+++ b/LAPACKE/src/lapacke_sbbcsd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sbbcsd_work( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_sbbcsd_work)( int matrix_layout, char jobu1, char jobu2,
                                 char jobv1t, char jobv2t, char trans,
                                 lapack_int m, lapack_int p, lapack_int q,
                                 float* theta, float* phi, float* u1,
@@ -61,7 +61,7 @@ lapack_int LAPACKE_sbbcsd_work( int matrix_layout, char jobu1, char jobu2,
     if( matrix_layout == LAPACK_COL_MAJOR ||
         matrix_layout == LAPACK_ROW_MAJOR ) {
         char ltrans;
-        if( !LAPACKE_lsame( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+        if( !API_SUFFIX(LAPACKE_lsame)( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
             ltrans = 'n';
         } else {
             ltrans = 't';
@@ -76,7 +76,7 @@ lapack_int LAPACKE_sbbcsd_work( int matrix_layout, char jobu1, char jobu2,
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sbbcsd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbbcsd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sbdsdc.c b/LAPACKE/src/lapacke_sbdsdc.c
index 3f475b6d3c..3aa25bc859 100644
--- a/LAPACKE/src/lapacke_sbdsdc.c
+++ b/LAPACKE/src/lapacke_sbdsdc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sbdsdc( int matrix_layout, char uplo, char compq,
+lapack_int API_SUFFIX(LAPACKE_sbdsdc)( int matrix_layout, char uplo, char compq,
                            lapack_int n, float* d, float* e, float* u,
                            lapack_int ldu, float* vt, lapack_int ldvt, float* q,
                            lapack_int* iq )
@@ -43,26 +43,26 @@ lapack_int LAPACKE_sbdsdc( int matrix_layout, char uplo, char compq,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sbdsdc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsdc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( compq, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) ) {
         lwork = (size_t)3*MAX(1,n)*MAX(1,n)+4*MAX(1,n);
-    } else if( LAPACKE_lsame( compq, 'p' ) ) {
+    } else if( API_SUFFIX(LAPACKE_lsame)( compq, 'p' ) ) {
         lwork = MAX(1,6*n);
-    } else if( LAPACKE_lsame( compq, 'n' ) ) {
+    } else if( API_SUFFIX(LAPACKE_lsame)( compq, 'n' ) ) {
         lwork = MAX(1,4*n);
     } else {
         lwork = 1; /* Any value */
@@ -79,7 +79,7 @@ lapack_int LAPACKE_sbdsdc( int matrix_layout, char uplo, char compq,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sbdsdc_work( matrix_layout, uplo, compq, n, d, e, u, ldu, vt,
+    info = API_SUFFIX(LAPACKE_sbdsdc_work)( matrix_layout, uplo, compq, n, d, e, u, ldu, vt,
                                 ldvt, q, iq, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -87,7 +87,7 @@ lapack_int LAPACKE_sbdsdc( int matrix_layout, char uplo, char compq,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sbdsdc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsdc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sbdsdc_work.c b/LAPACKE/src/lapacke_sbdsdc_work.c
index b05587f2b2..54788116b1 100644
--- a/LAPACKE/src/lapacke_sbdsdc_work.c
+++ b/LAPACKE/src/lapacke_sbdsdc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sbdsdc_work( int matrix_layout, char uplo, char compq,
+lapack_int API_SUFFIX(LAPACKE_sbdsdc_work)( int matrix_layout, char uplo, char compq,
                                 lapack_int n, float* d, float* e, float* u,
                                 lapack_int ldu, float* vt, lapack_int ldvt,
                                 float* q, lapack_int* iq, float* work,
@@ -54,23 +54,23 @@ lapack_int LAPACKE_sbdsdc_work( int matrix_layout, char uplo, char compq,
         /* Check leading dimension(s) */
         if( ldu < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sbdsdc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsdc_work", info );
             return info;
         }
         if( ldvt < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sbdsdc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsdc_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( compq, 'i' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) ) {
             u_t = (float*)LAPACKE_malloc( sizeof(float) * ldu_t * MAX(1,n) );
             if( u_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_0;
             }
         }
-        if( LAPACKE_lsame( compq, 'i' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) ) {
             vt_t = (float*)LAPACKE_malloc( sizeof(float) * ldvt_t * MAX(1,n) );
             if( vt_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -84,27 +84,27 @@ lapack_int LAPACKE_sbdsdc_work( int matrix_layout, char uplo, char compq,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( compq, 'i' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, u_t, ldu_t, u, ldu );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( compq, 'i' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, vt_t, ldvt_t, vt, ldvt );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, vt_t, ldvt_t, vt, ldvt );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compq, 'i' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) ) {
             LAPACKE_free( vt_t );
         }
 exit_level_1:
-        if( LAPACKE_lsame( compq, 'i' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sbdsdc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsdc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sbdsdc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsdc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sbdsqr.c b/LAPACKE/src/lapacke_sbdsqr.c
index 060da17445..1bbfafa87c 100644
--- a/LAPACKE/src/lapacke_sbdsqr.c
+++ b/LAPACKE/src/lapacke_sbdsqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sbdsqr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sbdsqr)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int ncvt, lapack_int nru, lapack_int ncc,
                            float* d, float* e, float* vt, lapack_int ldvt,
                            float* u, lapack_int ldu, float* c, lapack_int ldc )
@@ -40,30 +40,30 @@ lapack_int LAPACKE_sbdsqr( int matrix_layout, char uplo, lapack_int n,
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sbdsqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
         if( ncc != 0 ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, ncc, c, ldc ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, ncc, c, ldc ) ) {
                 return -13;
             }
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -8;
         }
         if( nru != 0 ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, nru, n, u, ldu ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, nru, n, u, ldu ) ) {
                 return -11;
             }
         }
         if( ncvt != 0 ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, ncvt, vt, ldvt ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, ncvt, vt, ldvt ) ) {
                 return -9;
             }
         }
@@ -76,13 +76,13 @@ lapack_int LAPACKE_sbdsqr( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sbdsqr_work( matrix_layout, uplo, n, ncvt, nru, ncc, d, e, vt,
+    info = API_SUFFIX(LAPACKE_sbdsqr_work)( matrix_layout, uplo, n, ncvt, nru, ncc, d, e, vt,
                                 ldvt, u, ldu, c, ldc, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sbdsqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sbdsqr_work.c b/LAPACKE/src/lapacke_sbdsqr_work.c
index 9d3dfdb064..b41acec137 100644
--- a/LAPACKE/src/lapacke_sbdsqr_work.c
+++ b/LAPACKE/src/lapacke_sbdsqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sbdsqr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sbdsqr_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int ncvt, lapack_int nru, lapack_int ncc,
                                 float* d, float* e, float* vt, lapack_int ldvt,
                                 float* u, lapack_int ldu, float* c,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_sbdsqr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldc < ncc ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_sbdsqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsqr_work", info );
             return info;
         }
         if( ldu < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_sbdsqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsqr_work", info );
             return info;
         }
         if( ldvt < ncvt ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sbdsqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsqr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -94,13 +94,13 @@ lapack_int LAPACKE_sbdsqr_work( int matrix_layout, char uplo, lapack_int n,
         }
         /* Transpose input matrices */
         if( ncvt != 0 ) {
-            LAPACKE_sge_trans( matrix_layout, n, ncvt, vt, ldvt, vt_t, ldvt_t );
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, ncvt, vt, ldvt, vt_t, ldvt_t );
         }
         if( nru != 0 ) {
-            LAPACKE_sge_trans( matrix_layout, nru, n, u, ldu, u_t, ldu_t );
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, nru, n, u, ldu, u_t, ldu_t );
         }
         if( ncc != 0 ) {
-            LAPACKE_sge_trans( matrix_layout, n, ncc, c, ldc, c_t, ldc_t );
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, ncc, c, ldc, c_t, ldc_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_sbdsqr( &uplo, &n, &ncvt, &nru, &ncc, d, e, vt_t, &ldvt_t, u_t,
@@ -110,14 +110,14 @@ lapack_int LAPACKE_sbdsqr_work( int matrix_layout, char uplo, lapack_int n,
         }
         /* Transpose output matrices */
         if( ncvt != 0 ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, ncvt, vt_t, ldvt_t, vt,
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, ncvt, vt_t, ldvt_t, vt,
                                ldvt );
         }
         if( nru != 0 ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nru, n, u_t, ldu_t, u, ldu );
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nru, n, u_t, ldu_t, u, ldu );
         }
         if( ncc != 0 ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, ncc, c_t, ldc_t, c, ldc );
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, ncc, c_t, ldc_t, c, ldc );
         }
         /* Release memory and exit */
         if( ncc != 0 ) {
@@ -133,11 +133,11 @@ lapack_int LAPACKE_sbdsqr_work( int matrix_layout, char uplo, lapack_int n,
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sbdsqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sbdsqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sbdsvdx.c b/LAPACKE/src/lapacke_sbdsvdx.c
index c46fa3d556..27b5fd4978 100644
--- a/LAPACKE/src/lapacke_sbdsvdx.c
+++ b/LAPACKE/src/lapacke_sbdsvdx.c
@@ -32,8 +32,8 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sbdsvdx( int matrix_layout, char uplo, char jobz, char range,
-                           lapack_int n, float* d, float* e,
+lapack_int API_SUFFIX(LAPACKE_sbdsvdx)( int matrix_layout, char uplo, char jobz, char range,
+                           lapack_int n, const float* d, const float* e,
                            float vl, float vu,
                            lapack_int il, lapack_int iu, lapack_int* ns,
                            float* s, float* z, lapack_int ldz,
@@ -45,16 +45,16 @@ lapack_int LAPACKE_sbdsvdx( int matrix_layout, char uplo, char jobz, char range,
     lapack_int* iwork = NULL;
     lapack_int i;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sbdsvdx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsvdx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( n - 1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n - 1, e, 1 ) ) {
             return -7;
         }
     }
@@ -71,7 +71,7 @@ lapack_int LAPACKE_sbdsvdx( int matrix_layout, char uplo, char jobz, char range,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sbdsvdx_work( matrix_layout, uplo, jobz,  range,
+    info = API_SUFFIX(LAPACKE_sbdsvdx_work)( matrix_layout, uplo, jobz,  range,
                                  n, d, e, vl, vu, il, iu, ns, s, z,
                                  ldz, work, iwork);
     /* Backup significant data from working array(s) */
@@ -84,7 +84,7 @@ lapack_int LAPACKE_sbdsvdx( int matrix_layout, char uplo, char jobz, char range,
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sbdsvdx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsvdx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sbdsvdx_work.c b/LAPACKE/src/lapacke_sbdsvdx_work.c
index bb7096788e..89e6a5fa75 100644
--- a/LAPACKE/src/lapacke_sbdsvdx_work.c
+++ b/LAPACKE/src/lapacke_sbdsvdx_work.c
@@ -32,8 +32,8 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sbdsvdx_work( int matrix_layout, char uplo, char jobz, char range,
-                                 lapack_int n, float* d, float* e,
+lapack_int API_SUFFIX(LAPACKE_sbdsvdx_work)( int matrix_layout, char uplo, char jobz, char range,
+                                 lapack_int n, const float* d, const float* e,
                                  float vl, float vu,
                                  lapack_int il, lapack_int iu, lapack_int* ns,
                                  float* s, float* z, lapack_int ldz,
@@ -49,19 +49,19 @@ lapack_int LAPACKE_sbdsvdx_work( int matrix_layout, char uplo, char jobz, char r
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_z = ( LAPACKE_lsame( jobz, 'v' ) ) ? 2*n : 0;
-        lapack_int ncols_z = ( LAPACKE_lsame( jobz, 'v' ) ) ?
-            ( LAPACKE_lsame( range, 'i' ) ? MAX(0,iu - il + 1) : n + 1 ) : 0;
+        lapack_int nrows_z = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) ? 2*n : 0;
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) ?
+            ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? MAX(0,iu - il + 1) : n + 1 ) : 0;
         lapack_int ldz_t = MAX(1,nrows_z);
         float* z_t = NULL;
         /* Check leading dimension(s) */
         if( ldz < ncols_z ) {
             info = -3;
-            LAPACKE_xerbla( "LAPACKE_sbdsvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsvdx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
            z_t = (float*)
                LAPACKE_malloc( sizeof(float) * ldz_t * MAX(ncols_z,1) );
            if( z_t == NULL ) {
@@ -77,20 +77,20 @@ lapack_int LAPACKE_sbdsvdx_work( int matrix_layout, char uplo, char jobz, char r
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_z, ncols_z, z_t, ldz_t, z, ldz);
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_z, ncols_z, z_t, ldz_t, z, ldz);
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sbdsvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsvdx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sbdsvdx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sbdsvdx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sdisna.c b/LAPACKE/src/lapacke_sdisna.c
index 10552fd532..f69dc00248 100644
--- a/LAPACKE/src/lapacke_sdisna.c
+++ b/LAPACKE/src/lapacke_sdisna.c
@@ -32,16 +32,16 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sdisna( char job, lapack_int m, lapack_int n, const float* d,
+lapack_int API_SUFFIX(LAPACKE_sdisna)( char job, lapack_int m, lapack_int n, const float* d,
                            float* sep )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( MIN(m,n), d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( MIN(m,n), d, 1 ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_sdisna_work( job, m, n, d, sep );
+    return API_SUFFIX(LAPACKE_sdisna_work)( job, m, n, d, sep );
 }
diff --git a/LAPACKE/src/lapacke_sdisna_work.c b/LAPACKE/src/lapacke_sdisna_work.c
index e6bd6cb6c2..7c1cf1a294 100644
--- a/LAPACKE/src/lapacke_sdisna_work.c
+++ b/LAPACKE/src/lapacke_sdisna_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sdisna_work( char job, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sdisna_work)( char job, lapack_int m, lapack_int n,
                                 const float* d, float* sep )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_sgbbrd.c b/LAPACKE/src/lapacke_sgbbrd.c
index 97907b1140..4cadd836fc 100644
--- a/LAPACKE/src/lapacke_sgbbrd.c
+++ b/LAPACKE/src/lapacke_sgbbrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbbrd( int matrix_layout, char vect, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_sgbbrd)( int matrix_layout, char vect, lapack_int m,
                            lapack_int n, lapack_int ncc, lapack_int kl,
                            lapack_int ku, float* ab, lapack_int ldab, float* d,
                            float* e, float* q, lapack_int ldq, float* pt,
@@ -41,17 +41,17 @@ lapack_int LAPACKE_sgbbrd( int matrix_layout, char vect, lapack_int m,
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgbbrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbbrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sgb_nancheck( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
             return -8;
         }
         if( ncc != 0 ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, m, ncc, c, ldc ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, ncc, c, ldc ) ) {
                 return -16;
             }
         }
@@ -64,13 +64,13 @@ lapack_int LAPACKE_sgbbrd( int matrix_layout, char vect, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgbbrd_work( matrix_layout, vect, m, n, ncc, kl, ku, ab, ldab,
+    info = API_SUFFIX(LAPACKE_sgbbrd_work)( matrix_layout, vect, m, n, ncc, kl, ku, ab, ldab,
                                 d, e, q, ldq, pt, ldpt, c, ldc, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgbbrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbbrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgbbrd_work.c b/LAPACKE/src/lapacke_sgbbrd_work.c
index 9b6640b354..8f4eac2fa5 100644
--- a/LAPACKE/src/lapacke_sgbbrd_work.c
+++ b/LAPACKE/src/lapacke_sgbbrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbbrd_work( int matrix_layout, char vect, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_sgbbrd_work)( int matrix_layout, char vect, lapack_int m,
                                 lapack_int n, lapack_int ncc, lapack_int kl,
                                 lapack_int ku, float* ab, lapack_int ldab,
                                 float* d, float* e, float* q, lapack_int ldq,
@@ -59,22 +59,22 @@ lapack_int LAPACKE_sgbbrd_work( int matrix_layout, char vect, lapack_int m,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbbrd_work", info );
             return info;
         }
         if( ldc < ncc ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_sgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbbrd_work", info );
             return info;
         }
         if( ldpt < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_sgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbbrd_work", info );
             return info;
         }
         if( ldq < m ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_sgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbbrd_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -83,14 +83,14 @@ lapack_int LAPACKE_sgbbrd_work( int matrix_layout, char vect, lapack_int m,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ) {
             q_t = (float*)LAPACKE_malloc( sizeof(float) * ldq_t * MAX(1,m) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'p' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'p' ) ) {
             pt_t = (float*)LAPACKE_malloc( sizeof(float) * ldpt_t * MAX(1,n) );
             if( pt_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -105,9 +105,9 @@ lapack_int LAPACKE_sgbbrd_work( int matrix_layout, char vect, lapack_int m,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sgb_trans( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
         if( ncc != 0 ) {
-            LAPACKE_sge_trans( matrix_layout, m, ncc, c, ldc, c_t, ldc_t );
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, ncc, c, ldc, c_t, ldc_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_sgbbrd( &vect, &m, &n, &ncc, &kl, &ku, ab_t, &ldab_t, d, e, q_t,
@@ -116,38 +116,38 @@ lapack_int LAPACKE_sgbbrd_work( int matrix_layout, char vect, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sgb_trans( LAPACK_COL_MAJOR, m, n, kl, ku, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_sgb_trans)( LAPACK_COL_MAJOR, m, n, kl, ku, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'q' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, m, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, m, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'p' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, pt_t, ldpt_t, pt, ldpt );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'p' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, pt_t, ldpt_t, pt, ldpt );
         }
         if( ncc != 0 ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, ncc, c_t, ldc_t, c, ldc );
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, ncc, c_t, ldc_t, c, ldc );
         }
         /* Release memory and exit */
         if( ncc != 0 ) {
             LAPACKE_free( c_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'p' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'p' ) ) {
             LAPACKE_free( pt_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbbrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgbbrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbbrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgbcon.c b/LAPACKE/src/lapacke_sgbcon.c
index e3038ccf88..89b6234891 100644
--- a/LAPACKE/src/lapacke_sgbcon.c
+++ b/LAPACKE/src/lapacke_sgbcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbcon( int matrix_layout, char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgbcon)( int matrix_layout, char norm, lapack_int n,
                            lapack_int kl, lapack_int ku, const float* ab,
                            lapack_int ldab, const lapack_int* ipiv, float anorm,
                            float* rcond )
@@ -41,16 +41,16 @@ lapack_int LAPACKE_sgbcon( int matrix_layout, char norm, lapack_int n,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgbcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sgb_nancheck( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -9;
         }
     }
@@ -67,7 +67,7 @@ lapack_int LAPACKE_sgbcon( int matrix_layout, char norm, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgbcon_work( matrix_layout, norm, n, kl, ku, ab, ldab, ipiv,
+    info = API_SUFFIX(LAPACKE_sgbcon_work)( matrix_layout, norm, n, kl, ku, ab, ldab, ipiv,
                                 anorm, rcond, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -75,7 +75,7 @@ lapack_int LAPACKE_sgbcon( int matrix_layout, char norm, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgbcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgbcon_work.c b/LAPACKE/src/lapacke_sgbcon_work.c
index 6d42685b25..12a1fe8623 100644
--- a/LAPACKE/src/lapacke_sgbcon_work.c
+++ b/LAPACKE/src/lapacke_sgbcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbcon_work( int matrix_layout, char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgbcon_work)( int matrix_layout, char norm, lapack_int n,
                                 lapack_int kl, lapack_int ku, const float* ab,
                                 lapack_int ldab, const lapack_int* ipiv,
                                 float anorm, float* rcond, float* work,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_sgbcon_work( int matrix_layout, char norm, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sgbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbcon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -62,7 +62,7 @@ lapack_int LAPACKE_sgbcon_work( int matrix_layout, char norm, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sgb_trans( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
                            ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgbcon( &norm, &n, &kl, &ku, ab_t, &ldab_t, ipiv, &anorm, rcond,
@@ -74,11 +74,11 @@ lapack_int LAPACKE_sgbcon_work( int matrix_layout, char norm, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgbcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgbequ.c b/LAPACKE/src/lapacke_sgbequ.c
index 74ee036a14..7696da9e00 100644
--- a/LAPACKE/src/lapacke_sgbequ.c
+++ b/LAPACKE/src/lapacke_sgbequ.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbequ( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgbequ)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int kl, lapack_int ku, const float* ab,
                            lapack_int ldab, float* r, float* c, float* rowcnd,
                            float* colcnd, float* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgbequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sgb_nancheck( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_sgbequ_work( matrix_layout, m, n, kl, ku, ab, ldab, r, c,
+    return API_SUFFIX(LAPACKE_sgbequ_work)( matrix_layout, m, n, kl, ku, ab, ldab, r, c,
                                 rowcnd, colcnd, amax );
 }
diff --git a/LAPACKE/src/lapacke_sgbequ_work.c b/LAPACKE/src/lapacke_sgbequ_work.c
index 674a803eec..e10ecbb0d0 100644
--- a/LAPACKE/src/lapacke_sgbequ_work.c
+++ b/LAPACKE/src/lapacke_sgbequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbequ_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgbequ_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int kl, lapack_int ku, const float* ab,
                                 lapack_int ldab, float* r, float* c,
                                 float* rowcnd, float* colcnd, float* amax )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_sgbequ_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sgbequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbequ_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_sgbequ_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sgb_trans( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgbequ( &m, &n, &kl, &ku, ab_t, &ldab_t, r, c, rowcnd, colcnd,
                        amax, &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_sgbequ_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgbequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgbequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgbequb.c b/LAPACKE/src/lapacke_sgbequb.c
index e2d8eb803e..5df29d8c2d 100644
--- a/LAPACKE/src/lapacke_sgbequb.c
+++ b/LAPACKE/src/lapacke_sgbequb.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbequb( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgbequb)( int matrix_layout, lapack_int m, lapack_int n,
                             lapack_int kl, lapack_int ku, const float* ab,
                             lapack_int ldab, float* r, float* c, float* rowcnd,
                             float* colcnd, float* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgbequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbequb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sgb_nancheck( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_sgbequb_work( matrix_layout, m, n, kl, ku, ab, ldab, r, c,
+    return API_SUFFIX(LAPACKE_sgbequb_work)( matrix_layout, m, n, kl, ku, ab, ldab, r, c,
                                  rowcnd, colcnd, amax );
 }
diff --git a/LAPACKE/src/lapacke_sgbequb_work.c b/LAPACKE/src/lapacke_sgbequb_work.c
index 1fa181b44a..636c072421 100644
--- a/LAPACKE/src/lapacke_sgbequb_work.c
+++ b/LAPACKE/src/lapacke_sgbequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbequb_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgbequb_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  lapack_int kl, lapack_int ku, const float* ab,
                                  lapack_int ldab, float* r, float* c,
                                  float* rowcnd, float* colcnd, float* amax )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_sgbequb_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sgbequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_sgbequb_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sgb_trans( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgbequb( &m, &n, &kl, &ku, ab_t, &ldab_t, r, c, rowcnd, colcnd,
                         amax, &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_sgbequb_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgbequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgbequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgbrfs.c b/LAPACKE/src/lapacke_sgbrfs.c
index 238fed38cb..245f2560a8 100644
--- a/LAPACKE/src/lapacke_sgbrfs.c
+++ b/LAPACKE/src/lapacke_sgbrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbrfs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgbrfs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int kl, lapack_int ku, lapack_int nrhs,
                            const float* ab, lapack_int ldab, const float* afb,
                            lapack_int ldafb, const lapack_int* ipiv,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_sgbrfs( int matrix_layout, char trans, lapack_int n,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgbrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sgb_nancheck( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_sgb_nancheck( matrix_layout, n, n, kl, kl+ku, afb, ldafb ) ) {
+        if( API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, kl, kl+ku, afb, ldafb ) ) {
             return -9;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -14;
         }
     }
@@ -75,7 +75,7 @@ lapack_int LAPACKE_sgbrfs( int matrix_layout, char trans, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgbrfs_work( matrix_layout, trans, n, kl, ku, nrhs, ab, ldab,
+    info = API_SUFFIX(LAPACKE_sgbrfs_work)( matrix_layout, trans, n, kl, ku, nrhs, ab, ldab,
                                 afb, ldafb, ipiv, b, ldb, x, ldx, ferr, berr,
                                 work, iwork );
     /* Release memory and exit */
@@ -84,7 +84,7 @@ lapack_int LAPACKE_sgbrfs( int matrix_layout, char trans, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgbrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgbrfs_work.c b/LAPACKE/src/lapacke_sgbrfs_work.c
index 1a386693df..653651f58e 100644
--- a/LAPACKE/src/lapacke_sgbrfs_work.c
+++ b/LAPACKE/src/lapacke_sgbrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbrfs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgbrfs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int kl, lapack_int ku, lapack_int nrhs,
                                 const float* ab, lapack_int ldab,
                                 const float* afb, lapack_int ldafb,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_sgbrfs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbrfs_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_sgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_sgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -101,11 +101,11 @@ lapack_int LAPACKE_sgbrfs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_sgb_trans( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
-        LAPACKE_sgb_trans( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
                            ldafb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgbrfs( &trans, &n, &kl, &ku, &nrhs, ab_t, &ldab_t, afb_t,
                        &ldafb_t, ipiv, b_t, &ldb_t, x_t, &ldx_t, ferr, berr,
@@ -114,7 +114,7 @@ lapack_int LAPACKE_sgbrfs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -125,11 +125,11 @@ lapack_int LAPACKE_sgbrfs_work( int matrix_layout, char trans, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgbrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgbrfsx.c b/LAPACKE/src/lapacke_sgbrfsx.c
index d2177f7663..fb2b6d9fb4 100644
--- a/LAPACKE/src/lapacke_sgbrfsx.c
+++ b/LAPACKE/src/lapacke_sgbrfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbrfsx( int matrix_layout, char trans, char equed,
+lapack_int API_SUFFIX(LAPACKE_sgbrfsx)( int matrix_layout, char trans, char equed,
                             lapack_int n, lapack_int kl, lapack_int ku,
                             lapack_int nrhs, const float* ab, lapack_int ldab,
                             const float* afb, lapack_int ldafb,
@@ -47,37 +47,37 @@ lapack_int LAPACKE_sgbrfsx( int matrix_layout, char trans, char equed,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgbrfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbrfsx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sgb_nancheck( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_sgb_nancheck( matrix_layout, n, n, kl, kl+ku, afb, ldafb ) ) {
+        if( API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, kl, kl+ku, afb, ldafb ) ) {
             return -10;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -15;
         }
-        if( LAPACKE_lsame( equed, 'b' ) || LAPACKE_lsame( equed, 'c' ) ) {
-            if( LAPACKE_s_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'b' ) || API_SUFFIX(LAPACKE_lsame)( equed, 'c' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, c, 1 ) ) {
                 return -14;
             }
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -25;
             }
         }
-        if( LAPACKE_lsame( equed, 'b' ) || LAPACKE_lsame( equed, 'r' ) ) {
-            if( LAPACKE_s_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'b' ) || API_SUFFIX(LAPACKE_lsame)( equed, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, r, 1 ) ) {
                 return -13;
             }
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -17;
         }
     }
@@ -94,7 +94,7 @@ lapack_int LAPACKE_sgbrfsx( int matrix_layout, char trans, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgbrfsx_work( matrix_layout, trans, equed, n, kl, ku, nrhs,
+    info = API_SUFFIX(LAPACKE_sgbrfsx_work)( matrix_layout, trans, equed, n, kl, ku, nrhs,
                                  ab, ldab, afb, ldafb, ipiv, r, c, b, ldb, x,
                                  ldx, rcond, berr, n_err_bnds, err_bnds_norm,
                                  err_bnds_comp, nparams, params, work, iwork );
@@ -104,7 +104,7 @@ lapack_int LAPACKE_sgbrfsx( int matrix_layout, char trans, char equed,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgbrfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbrfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgbrfsx_work.c b/LAPACKE/src/lapacke_sgbrfsx_work.c
index a7db63e4b7..7f812790e7 100644
--- a/LAPACKE/src/lapacke_sgbrfsx_work.c
+++ b/LAPACKE/src/lapacke_sgbrfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbrfsx_work( int matrix_layout, char trans, char equed,
+lapack_int API_SUFFIX(LAPACKE_sgbrfsx_work)( int matrix_layout, char trans, char equed,
                                  lapack_int n, lapack_int kl, lapack_int ku,
                                  lapack_int nrhs, const float* ab,
                                  lapack_int ldab, const float* afb,
@@ -68,22 +68,22 @@ lapack_int LAPACKE_sgbrfsx_work( int matrix_layout, char trans, char equed,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbrfsx_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbrfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_sgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbrfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -18;
-            LAPACKE_xerbla( "LAPACKE_sgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbrfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -120,11 +120,11 @@ lapack_int LAPACKE_sgbrfsx_work( int matrix_layout, char trans, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_sgb_trans( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
-        LAPACKE_sgb_trans( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
                            ldafb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgbrfsx( &trans, &equed, &n, &kl, &ku, &nrhs, ab_t, &ldab_t,
                         afb_t, &ldafb_t, ipiv, r, c, b_t, &ldb_t, x_t, &ldx_t,
@@ -134,10 +134,10 @@ lapack_int LAPACKE_sgbrfsx_work( int matrix_layout, char trans, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -153,11 +153,11 @@ lapack_int LAPACKE_sgbrfsx_work( int matrix_layout, char trans, char equed,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbrfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgbrfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbrfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgbsv.c b/LAPACKE/src/lapacke_sgbsv.c
index d8df16eb14..2f2f80f27f 100644
--- a/LAPACKE/src/lapacke_sgbsv.c
+++ b/LAPACKE/src/lapacke_sgbsv.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbsv( int matrix_layout, lapack_int n, lapack_int kl,
+lapack_int API_SUFFIX(LAPACKE_sgbsv)( int matrix_layout, lapack_int n, lapack_int kl,
                           lapack_int ku, lapack_int nrhs, float* ab,
                           lapack_int ldab, lapack_int* ipiv, float* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgbsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sgb_nancheck( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_sgbsv_work( matrix_layout, n, kl, ku, nrhs, ab, ldab, ipiv, b,
+    return API_SUFFIX(LAPACKE_sgbsv_work)( matrix_layout, n, kl, ku, nrhs, ab, ldab, ipiv, b,
                                ldb );
 }
diff --git a/LAPACKE/src/lapacke_sgbsv_work.c b/LAPACKE/src/lapacke_sgbsv_work.c
index 2d41abf21d..736ac2d724 100644
--- a/LAPACKE/src/lapacke_sgbsv_work.c
+++ b/LAPACKE/src/lapacke_sgbsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbsv_work( int matrix_layout, lapack_int n, lapack_int kl,
+lapack_int API_SUFFIX(LAPACKE_sgbsv_work)( int matrix_layout, lapack_int n, lapack_int kl,
                                lapack_int ku, lapack_int nrhs, float* ab,
                                lapack_int ldab, lapack_int* ipiv, float* b,
                                lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_sgbsv_work( int matrix_layout, lapack_int n, lapack_int kl,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sgbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sgbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,9 +72,9 @@ lapack_int LAPACKE_sgbsv_work( int matrix_layout, lapack_int n, lapack_int kl,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sgb_trans( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
                            ldab_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgbsv( &n, &kl, &ku, &nrhs, ab_t, &ldab_t, ipiv, b_t, &ldb_t,
                       &info );
@@ -82,20 +82,20 @@ lapack_int LAPACKE_sgbsv_work( int matrix_layout, lapack_int n, lapack_int kl,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sgb_trans( LAPACK_COL_MAJOR, n, n, kl, kl+ku, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_sgb_trans)( LAPACK_COL_MAJOR, n, n, kl, kl+ku, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgbsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgbsvx.c b/LAPACKE/src/lapacke_sgbsvx.c
index 95b3694a9c..1f67698f50 100644
--- a/LAPACKE/src/lapacke_sgbsvx.c
+++ b/LAPACKE/src/lapacke_sgbsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbsvx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_sgbsvx)( int matrix_layout, char fact, char trans,
                            lapack_int n, lapack_int kl, lapack_int ku,
                            lapack_int nrhs, float* ab, lapack_int ldab,
                            float* afb, lapack_int ldafb, lapack_int* ipiv,
@@ -45,33 +45,33 @@ lapack_int LAPACKE_sgbsvx( int matrix_layout, char fact, char trans,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgbsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sgb_nancheck( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_sgb_nancheck( matrix_layout, n, n, kl, kl+ku, afb,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, kl, kl+ku, afb,
                 ldafb ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -16;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) ) ) {
-            if( LAPACKE_s_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, c, 1 ) ) {
                 return -15;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'r' ) ) ) {
-            if( LAPACKE_s_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, r, 1 ) ) {
                 return -14;
             }
         }
@@ -89,7 +89,7 @@ lapack_int LAPACKE_sgbsvx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgbsvx_work( matrix_layout, fact, trans, n, kl, ku, nrhs, ab,
+    info = API_SUFFIX(LAPACKE_sgbsvx_work)( matrix_layout, fact, trans, n, kl, ku, nrhs, ab,
                                 ldab, afb, ldafb, ipiv, equed, r, c, b, ldb, x,
                                 ldx, rcond, ferr, berr, work, iwork );
     /* Backup significant data from working array(s) */
@@ -100,7 +100,7 @@ lapack_int LAPACKE_sgbsvx( int matrix_layout, char fact, char trans,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgbsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgbsvx_work.c b/LAPACKE/src/lapacke_sgbsvx_work.c
index 2613117905..a654542198 100644
--- a/LAPACKE/src/lapacke_sgbsvx_work.c
+++ b/LAPACKE/src/lapacke_sgbsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbsvx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_sgbsvx_work)( int matrix_layout, char fact, char trans,
                                 lapack_int n, lapack_int kl, lapack_int ku,
                                 lapack_int nrhs, float* ab, lapack_int ldab,
                                 float* afb, lapack_int ldafb, lapack_int* ipiv,
@@ -62,22 +62,22 @@ lapack_int LAPACKE_sgbsvx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsvx_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_sgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_sgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -102,12 +102,12 @@ lapack_int LAPACKE_sgbsvx_work( int matrix_layout, char fact, char trans,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_sgb_trans( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_sgb_trans( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
                                ldafb_t );
         }
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgbsvx( &fact, &trans, &n, &kl, &ku, &nrhs, ab_t, &ldab_t, afb_t,
                        &ldafb_t, ipiv, equed, r, c, b_t, &ldb_t, x_t, &ldx_t,
@@ -116,20 +116,20 @@ lapack_int LAPACKE_sgbsvx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_sgb_trans( LAPACK_COL_MAJOR, n, n, kl, ku, ab_t, ldab_t, ab,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_sgb_trans)( LAPACK_COL_MAJOR, n, n, kl, ku, ab_t, ldab_t, ab,
                                ldab );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_sgb_trans( LAPACK_COL_MAJOR, n, n, kl, kl+ku, afb_t,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_sgb_trans)( LAPACK_COL_MAJOR, n, n, kl, kl+ku, afb_t,
                                ldafb_t, afb, ldafb );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -140,11 +140,11 @@ lapack_int LAPACKE_sgbsvx_work( int matrix_layout, char fact, char trans,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgbsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgbsvxx.c b/LAPACKE/src/lapacke_sgbsvxx.c
index e9d8a6251a..517e01b606 100644
--- a/LAPACKE/src/lapacke_sgbsvxx.c
+++ b/LAPACKE/src/lapacke_sgbsvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbsvxx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_sgbsvxx)( int matrix_layout, char fact, char trans,
                             lapack_int n, lapack_int kl, lapack_int ku,
                             lapack_int nrhs, float* ab, lapack_int ldab,
                             float* afb, lapack_int ldafb, lapack_int* ipiv,
@@ -47,38 +47,38 @@ lapack_int LAPACKE_sgbsvxx( int matrix_layout, char fact, char trans,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgbsvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsvxx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sgb_nancheck( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_sgb_nancheck( matrix_layout, n, n, kl, kl+ku, afb,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, kl, kl+ku, afb,
                 ldafb ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -16;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) ) ) {
-            if( LAPACKE_s_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, c, 1 ) ) {
                 return -15;
             }
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -27;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'r' ) ) ) {
-            if( LAPACKE_s_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, r, 1 ) ) {
                 return -14;
             }
         }
@@ -96,7 +96,7 @@ lapack_int LAPACKE_sgbsvxx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgbsvxx_work( matrix_layout, fact, trans, n, kl, ku, nrhs, ab,
+    info = API_SUFFIX(LAPACKE_sgbsvxx_work)( matrix_layout, fact, trans, n, kl, ku, nrhs, ab,
                                  ldab, afb, ldafb, ipiv, equed, r, c, b, ldb, x,
                                  ldx, rcond, rpvgrw, berr, n_err_bnds,
                                  err_bnds_norm, err_bnds_comp, nparams, params,
@@ -107,7 +107,7 @@ lapack_int LAPACKE_sgbsvxx( int matrix_layout, char fact, char trans,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgbsvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgbsvxx_work.c b/LAPACKE/src/lapacke_sgbsvxx_work.c
index 9b62a21366..5674bd1a07 100644
--- a/LAPACKE/src/lapacke_sgbsvxx_work.c
+++ b/LAPACKE/src/lapacke_sgbsvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbsvxx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_sgbsvxx_work)( int matrix_layout, char fact, char trans,
                                  lapack_int n, lapack_int kl, lapack_int ku,
                                  lapack_int nrhs, float* ab, lapack_int ldab,
                                  float* afb, lapack_int ldafb, lapack_int* ipiv,
@@ -67,22 +67,22 @@ lapack_int LAPACKE_sgbsvxx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsvxx_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_sgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_sgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -119,12 +119,12 @@ lapack_int LAPACKE_sgbsvxx_work( int matrix_layout, char fact, char trans,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_sgb_trans( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_sgb_trans( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
                                ldafb_t );
         }
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgbsvxx( &fact, &trans, &n, &kl, &ku, &nrhs, ab_t, &ldab_t,
                         afb_t, &ldafb_t, ipiv, equed, r, c, b_t, &ldb_t, x_t,
@@ -135,23 +135,23 @@ lapack_int LAPACKE_sgbsvxx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_sgb_trans( LAPACK_COL_MAJOR, n, n, kl, ku, ab_t, ldab_t, ab,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_sgb_trans)( LAPACK_COL_MAJOR, n, n, kl, ku, ab_t, ldab_t, ab,
                                ldab );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_sgb_trans( LAPACK_COL_MAJOR, n, n, kl, kl+ku, afb_t,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_sgb_trans)( LAPACK_COL_MAJOR, n, n, kl, kl+ku, afb_t,
                                ldafb_t, afb, ldafb );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -167,11 +167,11 @@ lapack_int LAPACKE_sgbsvxx_work( int matrix_layout, char fact, char trans,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgbsvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbsvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgbtrf.c b/LAPACKE/src/lapacke_sgbtrf.c
index d6e3415218..4114e42eca 100644
--- a/LAPACKE/src/lapacke_sgbtrf.c
+++ b/LAPACKE/src/lapacke_sgbtrf.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbtrf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgbtrf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int kl, lapack_int ku, float* ab,
                            lapack_int ldab, lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgbtrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbtrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sgb_nancheck( matrix_layout, m, n, kl, kl+ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, m, n, kl, kl+ku, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_sgbtrf_work( matrix_layout, m, n, kl, ku, ab, ldab, ipiv );
+    return API_SUFFIX(LAPACKE_sgbtrf_work)( matrix_layout, m, n, kl, ku, ab, ldab, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_sgbtrf_work.c b/LAPACKE/src/lapacke_sgbtrf_work.c
index da489148cc..96899ca2cc 100644
--- a/LAPACKE/src/lapacke_sgbtrf_work.c
+++ b/LAPACKE/src/lapacke_sgbtrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbtrf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgbtrf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int kl, lapack_int ku, float* ab,
                                 lapack_int ldab, lapack_int* ipiv )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_sgbtrf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sgbtrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbtrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,7 +59,7 @@ lapack_int LAPACKE_sgbtrf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sgb_trans( matrix_layout, m, n, kl, kl+ku, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, m, n, kl, kl+ku, ab, ldab, ab_t,
                            ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgbtrf( &m, &n, &kl, &ku, ab_t, &ldab_t, ipiv, &info );
@@ -67,17 +67,17 @@ lapack_int LAPACKE_sgbtrf_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sgb_trans( LAPACK_COL_MAJOR, m, n, kl, kl+ku, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_sgb_trans)( LAPACK_COL_MAJOR, m, n, kl, kl+ku, ab_t, ldab_t, ab,
                            ldab );
         /* Release memory and exit */
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgbtrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbtrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgbtrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbtrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgbtrs.c b/LAPACKE/src/lapacke_sgbtrs.c
index 4e4bb284f3..318fc94c52 100644
--- a/LAPACKE/src/lapacke_sgbtrs.c
+++ b/LAPACKE/src/lapacke_sgbtrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbtrs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgbtrs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int kl, lapack_int ku, lapack_int nrhs,
                            const float* ab, lapack_int ldab,
                            const lapack_int* ipiv, float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgbtrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbtrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sgb_nancheck( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
     }
 #endif
-    return LAPACKE_sgbtrs_work( matrix_layout, trans, n, kl, ku, nrhs, ab, ldab,
+    return API_SUFFIX(LAPACKE_sgbtrs_work)( matrix_layout, trans, n, kl, ku, nrhs, ab, ldab,
                                 ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_sgbtrs_work.c b/LAPACKE/src/lapacke_sgbtrs_work.c
index d60177a177..4b024c21e0 100644
--- a/LAPACKE/src/lapacke_sgbtrs_work.c
+++ b/LAPACKE/src/lapacke_sgbtrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgbtrs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgbtrs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int kl, lapack_int ku, lapack_int nrhs,
                                 const float* ab, lapack_int ldab,
                                 const lapack_int* ipiv, float* b,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_sgbtrs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbtrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sgbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbtrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -74,9 +74,9 @@ lapack_int LAPACKE_sgbtrs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sgb_trans( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
                            ldab_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgbtrs( &trans, &n, &kl, &ku, &nrhs, ab_t, &ldab_t, ipiv, b_t,
                        &ldb_t, &info );
@@ -84,18 +84,18 @@ lapack_int LAPACKE_sgbtrs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbtrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgbtrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgbtrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgebak.c b/LAPACKE/src/lapacke_sgebak.c
index 14973b7a8a..2347f9e281 100644
--- a/LAPACKE/src/lapacke_sgebak.c
+++ b/LAPACKE/src/lapacke_sgebak.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgebak( int matrix_layout, char job, char side, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgebak)( int matrix_layout, char job, char side, lapack_int n,
                            lapack_int ilo, lapack_int ihi, const float* scale,
                            lapack_int m, float* v, lapack_int ldv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgebak", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgebak", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, scale, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, scale, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, m, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, m, v, ldv ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_sgebak_work( matrix_layout, job, side, n, ilo, ihi, scale, m,
+    return API_SUFFIX(LAPACKE_sgebak_work)( matrix_layout, job, side, n, ilo, ihi, scale, m,
                                 v, ldv );
 }
diff --git a/LAPACKE/src/lapacke_sgebak_work.c b/LAPACKE/src/lapacke_sgebak_work.c
index 7bf021513a..a49fa9ca1f 100644
--- a/LAPACKE/src/lapacke_sgebak_work.c
+++ b/LAPACKE/src/lapacke_sgebak_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgebak_work( int matrix_layout, char job, char side,
+lapack_int API_SUFFIX(LAPACKE_sgebak_work)( int matrix_layout, char job, char side,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 const float* scale, lapack_int m, float* v,
                                 lapack_int ldv )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_sgebak_work( int matrix_layout, char job, char side,
         /* Check leading dimension(s) */
         if( ldv < m ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sgebak_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgebak_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,7 +60,7 @@ lapack_int LAPACKE_sgebak_work( int matrix_layout, char job, char side,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, m, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, m, v, ldv, v_t, ldv_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgebak( &job, &side, &n, &ilo, &ihi, scale, &m, v_t, &ldv_t,
                        &info );
@@ -68,16 +68,16 @@ lapack_int LAPACKE_sgebak_work( int matrix_layout, char job, char side,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, m, v_t, ldv_t, v, ldv );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, m, v_t, ldv_t, v, ldv );
         /* Release memory and exit */
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgebak_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgebak_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgebak_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgebak_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgebal.c b/LAPACKE/src/lapacke_sgebal.c
index be92e0e2ba..12c0a70018 100644
--- a/LAPACKE/src/lapacke_sgebal.c
+++ b/LAPACKE/src/lapacke_sgebal.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgebal( int matrix_layout, char job, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_sgebal)( int matrix_layout, char job, lapack_int n, float* a,
                            lapack_int lda, lapack_int* ilo, lapack_int* ihi,
                            float* scale )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgebal", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgebal", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
                 return -4;
             }
         }
     }
 #endif
-    return LAPACKE_sgebal_work( matrix_layout, job, n, a, lda, ilo, ihi, scale );
+    return API_SUFFIX(LAPACKE_sgebal_work)( matrix_layout, job, n, a, lda, ilo, ihi, scale );
 }
diff --git a/LAPACKE/src/lapacke_sgebal_work.c b/LAPACKE/src/lapacke_sgebal_work.c
index ddb4309488..5b55be9d7a 100644
--- a/LAPACKE/src/lapacke_sgebal_work.c
+++ b/LAPACKE/src/lapacke_sgebal_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgebal_work( int matrix_layout, char job, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgebal_work)( int matrix_layout, char job, lapack_int n,
                                 float* a, lapack_int lda, lapack_int* ilo,
                                 lapack_int* ihi, float* scale )
 {
@@ -49,12 +49,12 @@ lapack_int LAPACKE_sgebal_work( int matrix_layout, char job, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgebal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgebal_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
             a_t = (float*)LAPACKE_malloc( sizeof(float) * lda_t * MAX(1,n) );
             if( a_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -62,9 +62,9 @@ lapack_int LAPACKE_sgebal_work( int matrix_layout, char job, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_sgebal( &job, &n, a_t, &lda_t, ilo, ihi, scale, &info );
@@ -72,22 +72,22 @@ lapack_int LAPACKE_sgebal_work( int matrix_layout, char job, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
             LAPACKE_free( a_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgebal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgebal_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgebal_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgebal_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgebrd.c b/LAPACKE/src/lapacke_sgebrd.c
index 9f31522417..782699e989 100644
--- a/LAPACKE/src/lapacke_sgebrd.c
+++ b/LAPACKE/src/lapacke_sgebrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgebrd( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgebrd)( int matrix_layout, lapack_int m, lapack_int n,
                            float* a, lapack_int lda, float* d, float* e,
                            float* tauq, float* taup )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_sgebrd( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgebrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgebrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgebrd_work( matrix_layout, m, n, a, lda, d, e, tauq, taup,
+    info = API_SUFFIX(LAPACKE_sgebrd_work)( matrix_layout, m, n, a, lda, d, e, tauq, taup,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -66,13 +66,13 @@ lapack_int LAPACKE_sgebrd( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgebrd_work( matrix_layout, m, n, a, lda, d, e, tauq, taup,
+    info = API_SUFFIX(LAPACKE_sgebrd_work)( matrix_layout, m, n, a, lda, d, e, tauq, taup,
                                 work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgebrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgebrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgebrd_work.c b/LAPACKE/src/lapacke_sgebrd_work.c
index 323acc713f..18f5e7d606 100644
--- a/LAPACKE/src/lapacke_sgebrd_work.c
+++ b/LAPACKE/src/lapacke_sgebrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgebrd_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgebrd_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 float* a, lapack_int lda, float* d, float* e,
                                 float* tauq, float* taup, float* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_sgebrd_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgebrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgebrd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,7 +66,7 @@ lapack_int LAPACKE_sgebrd_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgebrd( &m, &n, a_t, &lda_t, d, e, tauq, taup, work, &lwork,
                        &info );
@@ -74,16 +74,16 @@ lapack_int LAPACKE_sgebrd_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgebrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgebrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgebrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgebrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgecon.c b/LAPACKE/src/lapacke_sgecon.c
index 81bada83e2..2cb2520687 100644
--- a/LAPACKE/src/lapacke_sgecon.c
+++ b/LAPACKE/src/lapacke_sgecon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgecon( int matrix_layout, char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgecon)( int matrix_layout, char norm, lapack_int n,
                            const float* a, lapack_int lda, float anorm,
                            float* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_sgecon( int matrix_layout, char norm, lapack_int n,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgecon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgecon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -6;
         }
     }
@@ -66,7 +66,7 @@ lapack_int LAPACKE_sgecon( int matrix_layout, char norm, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgecon_work( matrix_layout, norm, n, a, lda, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_sgecon_work)( matrix_layout, norm, n, a, lda, anorm, rcond,
                                 work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -74,7 +74,7 @@ lapack_int LAPACKE_sgecon( int matrix_layout, char norm, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgecon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgecon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgecon_work.c b/LAPACKE/src/lapacke_sgecon_work.c
index 77d3c04912..fc89530e64 100644
--- a/LAPACKE/src/lapacke_sgecon_work.c
+++ b/LAPACKE/src/lapacke_sgecon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgecon_work( int matrix_layout, char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgecon_work)( int matrix_layout, char norm, lapack_int n,
                                 const float* a, lapack_int lda, float anorm,
                                 float* rcond, float* work, lapack_int* iwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_sgecon_work( int matrix_layout, char norm, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgecon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgecon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,7 +59,7 @@ lapack_int LAPACKE_sgecon_work( int matrix_layout, char norm, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgecon( &norm, &n, a_t, &lda_t, &anorm, rcond, work, iwork,
                        &info );
@@ -70,11 +70,11 @@ lapack_int LAPACKE_sgecon_work( int matrix_layout, char norm, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgecon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgecon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgecon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgecon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgedmd.c b/LAPACKE/src/lapacke_sgedmd.c
new file mode 100644
index 0000000000..a5ce50e4ce
--- /dev/null
+++ b/LAPACKE/src/lapacke_sgedmd.c
@@ -0,0 +1,114 @@
+/*****************************************************************************
+  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 sgedmd
+* Author: Intel Corporation
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_sgedmd)( int matrix_layout, char jobs, char jobz, char jobr,
+			   char jobf, lapack_int whtsvd, lapack_int m,
+			   lapack_int n, float* x, lapack_int ldx, float* y,
+			   lapack_int ldy, lapack_int nrnk, float* tol, 
+			   lapack_int k, float* reig, float* imeig,
+			   float* z, lapack_int ldz, float* res,
+			   float* b, lapack_int ldb, float* w, lapack_int ldw,
+			   float* s, lapack_int lds)
+{
+    lapack_int info = 0;
+    lapack_int lwork = -1;
+    lapack_int liwork = -1;
+    float* work = NULL;
+    lapack_int* iwork = NULL;
+    float work_query;
+    lapack_int iwork_query;
+    if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmd", -1 );
+        return -1;
+    }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+    if( LAPACKE_get_nancheck() ) {
+        /* Optionally check input matrices for NaNs */
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, x, ldx ) ) {
+            return -8;
+        }
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, y, ldy ) ) {
+            return -10;
+        }
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, z, ldz ) ) {
+            return -15;
+        }
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
+            return -18;
+        }
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, s, lds ) ) {
+            return -20;
+        }
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, w, ldw ) ) {
+            return -22;
+        }
+    }
+#endif
+    /* Query optimal working array(s) size */
+    info = API_SUFFIX(LAPACKE_sgedmd_work)( matrix_layout, jobs, jobz, jobr, jobf, whtsvd,
+				m, n, x, ldx, y, ldy, nrnk, tol, k, reig, imeig, z, ldz,
+				res, b, ldb, w, ldw, s, lds, &work_query,
+				lwork, &iwork_query, liwork );
+
+    if( info != 0 ) {
+        goto exit_level_0;
+    }
+    lwork  = (lapack_int) work_query;
+    liwork = iwork_query;
+    /* Allocate memory for work arrays */
+    work  = (float*)LAPACKE_malloc( sizeof(float) * lwork );
+    if( work == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
+    }
+    iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
+    if( iwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_1;
+    }
+    /* Call middle-level interface */
+    info = API_SUFFIX(LAPACKE_sgedmd_work)( matrix_layout, jobs, jobz, jobr, jobf, whtsvd,
+				m, n, x, ldx, y, ldy, nrnk, tol, k, reig, imeig, z, ldz,
+				res, b, ldb, w, ldw, s, lds, work, lwork,
+				iwork, liwork );
+    /* Release memory and exit */
+    LAPACKE_free( iwork );
+exit_level_1:
+    LAPACKE_free( work );
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmd", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_sgedmd_work.c b/LAPACKE/src/lapacke_sgedmd_work.c
new file mode 100644
index 0000000000..8a07e39a46
--- /dev/null
+++ b/LAPACKE/src/lapacke_sgedmd_work.c
@@ -0,0 +1,182 @@
+/*****************************************************************************
+  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 sgedmd
+* Author: Intel Corporation
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_sgedmd_work)( int matrix_layout, char jobs, char jobz,
+				char jobr, char jobf, lapack_int whtsvd,
+				lapack_int m, lapack_int n, float* x,
+				lapack_int ldx, float* y, lapack_int ldy,
+				lapack_int nrnk, float* tol, lapack_int k, 
+				float* reig, float* imeig,
+				float* z, lapack_int ldz, float* res,
+				float* b, lapack_int ldb, float* w,
+				lapack_int ldw, float* s, lapack_int lds,
+				float* work, lapack_int lwork,
+				lapack_int* iwork, lapack_int liwork )
+{
+    lapack_int info = 0;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        LAPACK_sgedmd( &jobs, &jobz, &jobr, &jobf, &whtsvd, &m, &n, x, &ldx, y,
+		       &ldy, &nrnk, tol, &k, reig, imeig, z, &ldz, res, b, &ldb, w, &ldw,
+		       s, &lds, work, &lwork, iwork, &liwork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        lapack_int ldx_t = MAX(1,m);
+        lapack_int ldy_t = MAX(1,m);
+        lapack_int ldz_t = MAX(1,m);
+        lapack_int ldb_t = MAX(1,m);
+        lapack_int ldw_t = MAX(1,m);
+        lapack_int lds_t = MAX(1,m);
+        float* x_t = NULL;
+        float* y_t = NULL;
+        float* z_t = NULL;
+        float* b_t = NULL;
+        float* w_t = NULL;
+        float* s_t = NULL;
+        /* Check leading dimension(s) */
+        if( ldx < n ) {
+            info = -9;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmd_work", info );
+            return info;
+        }
+        if( ldy < n ) {
+            info = -11;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmd_work", info );
+            return info;
+        }
+        if( ldz < n ) {
+            info = -16;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmd_work", info );
+            return info;
+        }
+        if( ldb < n ) {
+            info = -19;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmd_work", info );
+            return info;
+        }
+        if( ldw < n ) {
+            info = -21;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmd_work", info );
+            return info;
+        }
+        if( lds < n ) {
+            info = -23;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmd_work", info );
+            return info;
+        }
+        /* Query optimal working array(s) size if requested */
+        if( lwork == -1 ) {
+            LAPACK_sgedmd( &jobs, &jobz, &jobr, &jobf, &whtsvd, &m, &n, x,
+			   &ldx, y, &ldy, &nrnk, tol, &k, reig, imeig, z, &ldz, res, b,
+			   &ldb, w, &ldw, s, &lds, work, &lwork, iwork,
+			   &liwork, &info );
+            return (info < 0) ? (info - 1) : info;
+        }
+        /* Allocate memory for temporary array(s) */
+        x_t = (float*)LAPACKE_malloc( sizeof(float) * ldx_t * MAX(1,n) );
+        if( x_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+        y_t = (float*)LAPACKE_malloc( sizeof(float) * ldy_t * MAX(1,n) );
+        if( y_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_1;
+        }
+        z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
+        if( z_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_2;
+        }
+        b_t = (float*)LAPACKE_malloc( sizeof(float) * ldb_t * MAX(1,n) );
+        if( b_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_3;
+        }
+        w_t = (float*)LAPACKE_malloc( sizeof(float) * ldw_t * MAX(1,n) );
+        if( w_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_4;
+        }
+        s_t = (float*)LAPACKE_malloc( sizeof(float) * lds_t * MAX(1,n) );
+        if( s_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_5;
+        }
+        /* Transpose input matrices */
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, y, ldy, y_t, ldy_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, z, ldz, z_t, ldz_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, w, ldw, w_t, ldw_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, s, lds, s_t, lds_t );
+        /* Call LAPACK function and adjust info */
+        LAPACK_sgedmd( &jobs, &jobz, &jobr, &jobf, &whtsvd, &m, &n, x_t,
+	    	       &ldx_t, y_t, &ldy_t, &nrnk, tol, &k, reig, imeig, z_t, &ldz_t,
+		       res, b_t, &ldb_t, w_t, &ldw_t, s_t, &lds_t, work,
+		       &lwork, iwork, &liwork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+        /* Transpose output matrices */
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, y_t, ldy_t, y, ldy );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, w_t, ldw_t, w, ldw );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, s_t, lds_t, s, lds );
+        /* Release memory and exit */
+        LAPACKE_free( s_t );
+exit_level_5:
+        LAPACKE_free( w_t );
+exit_level_4:
+        LAPACKE_free( b_t );
+exit_level_3:
+        LAPACKE_free( z_t );
+exit_level_2:
+        LAPACKE_free( y_t );
+exit_level_1:
+        LAPACKE_free( x_t );
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmd_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmd_work", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_sgedmdq.c b/LAPACKE/src/lapacke_sgedmdq.c
new file mode 100644
index 0000000000..7ae1aeeb5a
--- /dev/null
+++ b/LAPACKE/src/lapacke_sgedmdq.c
@@ -0,0 +1,119 @@
+/*****************************************************************************
+  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 sgedmdq
+* Author: Intel Corporation
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_sgedmdq)( int matrix_layout, char jobs, char jobz, char jobr,
+                            char jobq, char jobt, char jobf, lapack_int whtsvd,
+                            lapack_int m, lapack_int n, float* f, lapack_int ldf,
+                            float* x, lapack_int ldx, float* y, lapack_int ldy,
+                            lapack_int nrnk, float* tol, lapack_int k,
+                            float* reig, float* imeig, float* z,
+                            lapack_int ldz, float* res, float* b, lapack_int ldb,
+                            float* v, lapack_int ldv, float* s, lapack_int lds)
+{
+    lapack_int info = 0;
+    lapack_int lwork = -1;
+    lapack_int liwork = -1;
+    float* work = NULL;
+    lapack_int* iwork = NULL;
+    float work_query;
+    lapack_int iwork_query;
+    if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmdq", -1 );
+        return -1;
+    }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+    if( LAPACKE_get_nancheck() ) {
+        /* Optionally check input matrices for NaNs */
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, f, ldf ) ) {
+            return -11;
+        }
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, x, ldx ) ) {
+            return -13;
+        }
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, y, ldy ) ) {
+            return -15;
+        }
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, z, ldz ) ) {
+            return -22;
+        }
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
+            return -25;
+        }
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, v, ldv ) ) {
+            return -27;
+        }
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, s, lds ) ) {
+            return -29;
+        }
+    }
+#endif
+    /* Query optimal working array(s) size */
+    info = API_SUFFIX(LAPACKE_sgedmdq_work)( matrix_layout, jobs, jobz, jobr, jobq, jobt,
+                                 jobf, whtsvd, m, n, f, ldf, x, ldx, y, ldy,
+                                 nrnk, tol, k, reig, imeig, z, ldz, res,
+                                 b, ldb, v, ldv, s, lds, &work_query, lwork,
+                                 &iwork_query, liwork );
+
+    if( info != 0 ) {
+        goto exit_level_0;
+    }
+    lwork  = (lapack_int) work_query;
+    liwork = iwork_query;
+    /* Allocate memory for work arrays */
+    work  = (float*)LAPACKE_malloc( sizeof(float) * lwork );
+    if( work == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
+    }
+    iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
+    if( iwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_1;
+    }
+    /* Call middle-level interface */
+    info = API_SUFFIX(LAPACKE_sgedmdq_work)( matrix_layout, jobs, jobz, jobr, jobq, jobt,
+                                 jobf, whtsvd, m, n, f, ldf, x, ldx, y, ldy,
+                                 nrnk, tol, k, reig, imeig, z, ldz, res,
+                                 b, ldb, v, ldv, s, lds, work, lwork, iwork,
+                                 liwork );
+    /* Release memory and exit */
+    LAPACKE_free( iwork );
+exit_level_1:
+    LAPACKE_free( work );
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmdq", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_sgedmdq_work.c b/LAPACKE/src/lapacke_sgedmdq_work.c
new file mode 100644
index 0000000000..98010a24bb
--- /dev/null
+++ b/LAPACKE/src/lapacke_sgedmdq_work.c
@@ -0,0 +1,200 @@
+/*****************************************************************************
+  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 sgedmdq
+* Author: Intel Corporation
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_sgedmdq_work)( int matrix_layout, char jobs, char jobz,
+                                 char jobr, char jobq, char jobt, char jobf,
+                                 lapack_int whtsvd, lapack_int m, lapack_int n,
+                                 float* f, lapack_int ldf, float* x,
+                                 lapack_int ldx, float* y, lapack_int ldy,
+                                 lapack_int nrnk, float* tol, lapack_int k,
+                                 float* reig, float* imeig, float* z,
+                                 lapack_int ldz, float* res, float* b,
+                                 lapack_int ldb, float* v, lapack_int ldv,
+                                 float* s, lapack_int lds, float* work,
+                                 lapack_int lwork, lapack_int* iwork,
+                                 lapack_int liwork )
+{
+    lapack_int info = 0;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        LAPACK_sgedmdq( &jobs, &jobz, &jobr, &jobq, &jobt, &jobf, &whtsvd, &m,
+                        &n, f, &ldf, x, &ldx, y, &ldy, &nrnk, tol, &k, reig, imeig,
+                        z, &ldz, res, b, &ldb, v, &ldv, s, &lds,
+                        work, &lwork, iwork, &liwork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        lapack_int ldf_t = MAX(1,m);
+        lapack_int ldx_t = MAX(1,m);
+        lapack_int ldy_t = MAX(1,m);
+        lapack_int ldz_t = MAX(1,m);
+        lapack_int ldb_t = MAX(1,m);
+        lapack_int ldv_t = MAX(1,m);
+        lapack_int lds_t = MAX(1,m);
+        float* f_t = NULL;
+        float* x_t = NULL;
+        float* y_t = NULL;
+        float* z_t = NULL;
+        float* b_t = NULL;
+        float* v_t = NULL;
+        float* s_t = NULL;
+        /* Check leading dimension(s) */
+        if( ldf < n ) {
+            info = -12;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmdq_work", info );
+            return info;
+        }
+        if( ldx < n ) {
+            info = -14;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmdq_work", info );
+            return info;
+        }
+        if( ldy < n ) {
+            info = -16;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmdq_work", info );
+            return info;
+        }
+        if( ldz < n ) {
+            info = -23;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmdq_work", info );
+            return info;
+        }
+        if( ldb < n ) {
+            info = -26;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmdq_work", info );
+            return info;
+        }
+        if( ldv < n ) {
+            info = -28;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmdq_work", info );
+            return info;
+        }
+        if( lds < n ) {
+            info = -30;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmdq_work", info );
+            return info;
+        }
+        /* Query optimal working array(s) size if requested */
+        if( lwork == -1 || liwork == -1 ) {
+            LAPACK_sgedmdq( &jobs, &jobz, &jobr, &jobq, &jobt, &jobf, &whtsvd, &m,
+                            &n, f, &ldf, x, &ldx, y, &ldy, &nrnk, tol, &k, reig, imeig,
+                            z, &ldz, res, b, &ldb, v, &ldv, s, &lds,
+                            work, &lwork, iwork, &liwork, &info );
+            return (info < 0) ? (info - 1) : info;
+        }
+        /* Allocate memory for temporary array(s) */
+        f_t = (float*)LAPACKE_malloc( sizeof(float) * ldf_t * MAX(1,n) );
+        if( f_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+        x_t = (float*)LAPACKE_malloc( sizeof(float) * ldx_t * MAX(1,n) );
+        if( x_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_1;
+        }
+        y_t = (float*)LAPACKE_malloc( sizeof(float) * ldy_t * MAX(1,n) );
+        if( y_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_2;
+        }
+        z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
+        if( z_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_3;
+        }
+        b_t = (float*)LAPACKE_malloc( sizeof(float) * ldb_t * MAX(1,n) );
+        if( b_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_4;
+        }
+        v_t = (float*)LAPACKE_malloc( sizeof(float) * ldv_t * MAX(1,n) );
+        if( v_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_5;
+        }
+        s_t = (float*)LAPACKE_malloc( sizeof(float) * lds_t * MAX(1,n) );
+        if( s_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_6;
+        }
+        /* Transpose input matrices */
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, f, ldf, f_t, ldf_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, y, ldy, y_t, ldy_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, z, ldz, z_t, ldz_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, s, lds, s_t, lds_t );
+        /* Call LAPACK function and adjust info */
+        LAPACK_sgedmdq( &jobs, &jobz, &jobr, &jobq, &jobt, &jobf, &whtsvd, &m,
+                        &n, f, &ldf, x, &ldx, y, &ldy, &nrnk, tol, &k, reig, imeig,
+                        z, &ldz, res, b, &ldb, v, &ldv, s, &lds,
+                        work, &lwork, iwork, &liwork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+        /* Transpose output matrices */
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, f_t, ldf_t, f, ldf );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, y_t, ldy_t, y, ldy );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, v_t, ldv_t, v, ldv );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, s_t, lds_t, s, lds );
+        /* Release memory and exit */
+        LAPACKE_free( s_t );
+exit_level_6:
+        LAPACKE_free( v_t );
+exit_level_5:
+        LAPACKE_free( b_t );
+exit_level_4:
+        LAPACKE_free( z_t );
+exit_level_3:
+        LAPACKE_free( y_t );
+exit_level_2:
+        LAPACKE_free( x_t );
+exit_level_1:
+        LAPACKE_free( f_t );
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmdq_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgedmdq_work", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_sgeequ.c b/LAPACKE/src/lapacke_sgeequ.c
index 9395639c13..a41fd77646 100644
--- a/LAPACKE/src/lapacke_sgeequ.c
+++ b/LAPACKE/src/lapacke_sgeequ.c
@@ -32,22 +32,22 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeequ( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeequ)( int matrix_layout, lapack_int m, lapack_int n,
                            const float* a, lapack_int lda, float* r, float* c,
                            float* rowcnd, float* colcnd, float* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_sgeequ_work( matrix_layout, m, n, a, lda, r, c, rowcnd,
+    return API_SUFFIX(LAPACKE_sgeequ_work)( matrix_layout, m, n, a, lda, r, c, rowcnd,
                                 colcnd, amax );
 }
diff --git a/LAPACKE/src/lapacke_sgeequ_work.c b/LAPACKE/src/lapacke_sgeequ_work.c
index b501d6e73f..ca31073088 100644
--- a/LAPACKE/src/lapacke_sgeequ_work.c
+++ b/LAPACKE/src/lapacke_sgeequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeequ_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeequ_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 const float* a, lapack_int lda, float* r,
                                 float* c, float* rowcnd, float* colcnd,
                                 float* amax )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_sgeequ_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgeequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeequ_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,7 +60,7 @@ lapack_int LAPACKE_sgeequ_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgeequ( &m, &n, a_t, &lda_t, r, c, rowcnd, colcnd, amax, &info );
         if( info < 0 ) {
@@ -70,11 +70,11 @@ lapack_int LAPACKE_sgeequ_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgeequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgeequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeequb.c b/LAPACKE/src/lapacke_sgeequb.c
index 10fbf2a1c6..8e720d40c5 100644
--- a/LAPACKE/src/lapacke_sgeequb.c
+++ b/LAPACKE/src/lapacke_sgeequb.c
@@ -32,22 +32,22 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeequb( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeequb)( int matrix_layout, lapack_int m, lapack_int n,
                             const float* a, lapack_int lda, float* r, float* c,
                             float* rowcnd, float* colcnd, float* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeequb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_sgeequb_work( matrix_layout, m, n, a, lda, r, c, rowcnd,
+    return API_SUFFIX(LAPACKE_sgeequb_work)( matrix_layout, m, n, a, lda, r, c, rowcnd,
                                  colcnd, amax );
 }
diff --git a/LAPACKE/src/lapacke_sgeequb_work.c b/LAPACKE/src/lapacke_sgeequb_work.c
index 118848ad81..0d9313278c 100644
--- a/LAPACKE/src/lapacke_sgeequb_work.c
+++ b/LAPACKE/src/lapacke_sgeequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeequb_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeequb_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  const float* a, lapack_int lda, float* r,
                                  float* c, float* rowcnd, float* colcnd,
                                  float* amax )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_sgeequb_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgeequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,7 +60,7 @@ lapack_int LAPACKE_sgeequb_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgeequb( &m, &n, a_t, &lda_t, r, c, rowcnd, colcnd, amax,
                         &info );
@@ -71,11 +71,11 @@ lapack_int LAPACKE_sgeequb_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgeequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgeequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgees.c b/LAPACKE/src/lapacke_sgees.c
index 28bdcb1ff0..935ca458d5 100644
--- a/LAPACKE/src/lapacke_sgees.c
+++ b/LAPACKE/src/lapacke_sgees.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgees( int matrix_layout, char jobvs, char sort,
+lapack_int API_SUFFIX(LAPACKE_sgees)( int matrix_layout, char jobvs, char sort,
                           LAPACK_S_SELECT2 select, lapack_int n, float* a,
                           lapack_int lda, lapack_int* sdim, float* wr,
                           float* wi, float* vs, lapack_int ldvs )
@@ -43,19 +43,19 @@ lapack_int LAPACKE_sgees( int matrix_layout, char jobvs, char sort,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgees", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgees", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -64,7 +64,7 @@ lapack_int LAPACKE_sgees( int matrix_layout, char jobvs, char sort,
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgees_work( matrix_layout, jobvs, sort, select, n, a, lda,
+    info = API_SUFFIX(LAPACKE_sgees_work)( matrix_layout, jobvs, sort, select, n, a, lda,
                                sdim, wr, wi, vs, ldvs, &work_query, lwork,
                                bwork );
     if( info != 0 ) {
@@ -78,17 +78,17 @@ lapack_int LAPACKE_sgees( int matrix_layout, char jobvs, char sort,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgees_work( matrix_layout, jobvs, sort, select, n, a, lda,
+    info = API_SUFFIX(LAPACKE_sgees_work)( matrix_layout, jobvs, sort, select, n, a, lda,
                                sdim, wr, wi, vs, ldvs, work, lwork, bwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgees", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgees", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgees_work.c b/LAPACKE/src/lapacke_sgees_work.c
index afcd5c67e4..00b17a8696 100644
--- a/LAPACKE/src/lapacke_sgees_work.c
+++ b/LAPACKE/src/lapacke_sgees_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgees_work( int matrix_layout, char jobvs, char sort,
+lapack_int API_SUFFIX(LAPACKE_sgees_work)( int matrix_layout, char jobvs, char sort,
                                LAPACK_S_SELECT2 select, lapack_int n, float* a,
                                lapack_int lda, lapack_int* sdim, float* wr,
                                float* wi, float* vs, lapack_int ldvs,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_sgees_work( int matrix_layout, char jobvs, char sort,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sgees_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgees_work", info );
             return info;
         }
         if( ldvs < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_sgees_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgees_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -75,7 +75,7 @@ lapack_int LAPACKE_sgees_work( int matrix_layout, char jobvs, char sort,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
             vs_t = (float*)LAPACKE_malloc( sizeof(float) * ldvs_t * MAX(1,n) );
             if( vs_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -83,7 +83,7 @@ lapack_int LAPACKE_sgees_work( int matrix_layout, char jobvs, char sort,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgees( &jobvs, &sort, select, &n, a_t, &lda_t, sdim, wr, wi,
                       vs_t, &ldvs_t, work, &lwork, bwork, &info );
@@ -91,23 +91,23 @@ lapack_int LAPACKE_sgees_work( int matrix_layout, char jobvs, char sort,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, vs_t, ldvs_t, vs, ldvs );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, vs_t, ldvs_t, vs, ldvs );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
             LAPACKE_free( vs_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgees_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgees_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgees_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgees_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeesx.c b/LAPACKE/src/lapacke_sgeesx.c
index f7be44297a..a32e2ec6b8 100644
--- a/LAPACKE/src/lapacke_sgeesx.c
+++ b/LAPACKE/src/lapacke_sgeesx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeesx( int matrix_layout, char jobvs, char sort,
+lapack_int API_SUFFIX(LAPACKE_sgeesx)( int matrix_layout, char jobvs, char sort,
                            LAPACK_S_SELECT2 select, char sense, lapack_int n,
                            float* a, lapack_int lda, lapack_int* sdim,
                            float* wr, float* wi, float* vs, lapack_int ldvs,
@@ -47,19 +47,19 @@ lapack_int LAPACKE_sgeesx( int matrix_layout, char jobvs, char sort,
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeesx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeesx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -68,7 +68,7 @@ lapack_int LAPACKE_sgeesx( int matrix_layout, char jobvs, char sort,
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgeesx_work( matrix_layout, jobvs, sort, select, sense, n, a,
+    info = API_SUFFIX(LAPACKE_sgeesx_work)( matrix_layout, jobvs, sort, select, sense, n, a,
                                 lda, sdim, wr, wi, vs, ldvs, rconde, rcondv,
                                 &work_query, lwork, &iwork_query, liwork,
                                 bwork );
@@ -78,12 +78,15 @@ lapack_int LAPACKE_sgeesx( int matrix_layout, char jobvs, char sort,
     liwork = iwork_query;
     lwork = (lapack_int)work_query;
     /* Allocate memory for work arrays */
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
-        if( iwork == NULL ) {
-            info = LAPACK_WORK_MEMORY_ERROR;
-            goto exit_level_1;
-        }
+    }
+    else {
+        iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * 1 );
+    }
+    if( iwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_1;
     }
     work = (float*)LAPACKE_malloc( sizeof(float) * lwork );
     if( work == NULL ) {
@@ -91,22 +94,20 @@ lapack_int LAPACKE_sgeesx( int matrix_layout, char jobvs, char sort,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgeesx_work( matrix_layout, jobvs, sort, select, sense, n, a,
+    info = API_SUFFIX(LAPACKE_sgeesx_work)( matrix_layout, jobvs, sort, select, sense, n, a,
                                 lda, sdim, wr, wi, vs, ldvs, rconde, rcondv,
                                 work, lwork, iwork, liwork, bwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_2:
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'v' ) ) {
-        LAPACKE_free( iwork );
-    }
+    LAPACKE_free( iwork );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeesx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeesx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeesx_work.c b/LAPACKE/src/lapacke_sgeesx_work.c
index 589a8a5b3c..377fd7713c 100644
--- a/LAPACKE/src/lapacke_sgeesx_work.c
+++ b/LAPACKE/src/lapacke_sgeesx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeesx_work( int matrix_layout, char jobvs, char sort,
+lapack_int API_SUFFIX(LAPACKE_sgeesx_work)( int matrix_layout, char jobvs, char sort,
                                 LAPACK_S_SELECT2 select, char sense,
                                 lapack_int n, float* a, lapack_int lda,
                                 lapack_int* sdim, float* wr, float* wi,
@@ -58,12 +58,12 @@ lapack_int LAPACKE_sgeesx_work( int matrix_layout, char jobvs, char sort,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgeesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeesx_work", info );
             return info;
         }
         if( ldvs < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_sgeesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeesx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,7 +79,7 @@ lapack_int LAPACKE_sgeesx_work( int matrix_layout, char jobvs, char sort,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
             vs_t = (float*)LAPACKE_malloc( sizeof(float) * ldvs_t * MAX(1,n) );
             if( vs_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -87,7 +87,7 @@ lapack_int LAPACKE_sgeesx_work( int matrix_layout, char jobvs, char sort,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgeesx( &jobvs, &sort, select, &sense, &n, a_t, &lda_t, sdim, wr,
                        wi, vs_t, &ldvs_t, rconde, rcondv, work, &lwork, iwork,
@@ -96,23 +96,23 @@ lapack_int LAPACKE_sgeesx_work( int matrix_layout, char jobvs, char sort,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, vs_t, ldvs_t, vs, ldvs );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, vs_t, ldvs_t, vs, ldvs );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
             LAPACKE_free( vs_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgeesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeesx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgeesx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeesx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeev.c b/LAPACKE/src/lapacke_sgeev.c
index d8fb0bb52d..342bea684e 100644
--- a/LAPACKE/src/lapacke_sgeev.c
+++ b/LAPACKE/src/lapacke_sgeev.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeev( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_sgeev)( int matrix_layout, char jobvl, char jobvr,
                           lapack_int n, float* a, lapack_int lda, float* wr,
                           float* wi, float* vl, lapack_int ldvl, float* vr,
                           lapack_int ldvr )
@@ -42,19 +42,19 @@ lapack_int LAPACKE_sgeev( int matrix_layout, char jobvl, char jobvr,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgeev_work( matrix_layout, jobvl, jobvr, n, a, lda, wr, wi,
+    info = API_SUFFIX(LAPACKE_sgeev_work)( matrix_layout, jobvl, jobvr, n, a, lda, wr, wi,
                                vl, ldvl, vr, ldvr, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_sgeev( int matrix_layout, char jobvl, char jobvr,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgeev_work( matrix_layout, jobvl, jobvr, n, a, lda, wr, wi,
+    info = API_SUFFIX(LAPACKE_sgeev_work)( matrix_layout, jobvl, jobvr, n, a, lda, wr, wi,
                                vl, ldvl, vr, ldvr, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeev_work.c b/LAPACKE/src/lapacke_sgeev_work.c
index 0f5a8e0048..c2687135bb 100644
--- a/LAPACKE/src/lapacke_sgeev_work.c
+++ b/LAPACKE/src/lapacke_sgeev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeev_work( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_sgeev_work)( int matrix_layout, char jobvl, char jobvr,
                                lapack_int n, float* a, lapack_int lda,
                                float* wr, float* wi, float* vl, lapack_int ldvl,
                                float* vr, lapack_int ldvr, float* work,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_sgeev_work( int matrix_layout, char jobvl, char jobvr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sgeev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeev_work", info );
             return info;
         }
-        if( ldvl < n ) {
+        if( ldvl < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) && ldvl < n ) ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sgeev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeev_work", info );
             return info;
         }
-        if( ldvr < n ) {
+        if( ldvr < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) && ldvr < n ) ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_sgeev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeev_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -81,14 +81,14 @@ lapack_int LAPACKE_sgeev_work( int matrix_layout, char jobvl, char jobvr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (float*)LAPACKE_malloc( sizeof(float) * ldvl_t * MAX(1,n) );
             if( vl_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (float*)LAPACKE_malloc( sizeof(float) * ldvr_t * MAX(1,n) );
             if( vr_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -96,7 +96,7 @@ lapack_int LAPACKE_sgeev_work( int matrix_layout, char jobvl, char jobvr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgeev( &jobvl, &jobvr, &n, a_t, &lda_t, wr, wi, vl_t, &ldvl_t,
                       vr_t, &ldvr_t, work, &lwork, &info );
@@ -104,30 +104,30 @@ lapack_int LAPACKE_sgeev_work( int matrix_layout, char jobvl, char jobvr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgeev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgeev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeevx.c b/LAPACKE/src/lapacke_sgeevx.c
index 89f955bf3a..454a089092 100644
--- a/LAPACKE/src/lapacke_sgeevx.c
+++ b/LAPACKE/src/lapacke_sgeevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeevx( int matrix_layout, char balanc, char jobvl,
+lapack_int API_SUFFIX(LAPACKE_sgeevx)( int matrix_layout, char balanc, char jobvl,
                            char jobvr, char sense, lapack_int n, float* a,
                            lapack_int lda, float* wr, float* wi, float* vl,
                            lapack_int ldvl, float* vr, lapack_int ldvr,
@@ -45,19 +45,19 @@ lapack_int LAPACKE_sgeevx( int matrix_layout, char balanc, char jobvl,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         iwork = (lapack_int*)
             LAPACKE_malloc( sizeof(lapack_int) * MAX(1,2*n-2) );
         if( iwork == NULL ) {
@@ -66,7 +66,7 @@ lapack_int LAPACKE_sgeevx( int matrix_layout, char balanc, char jobvl,
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgeevx_work( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
+    info = API_SUFFIX(LAPACKE_sgeevx_work)( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
                                 lda, wr, wi, vl, ldvl, vr, ldvr, ilo, ihi,
                                 scale, abnrm, rconde, rcondv, &work_query,
                                 lwork, iwork );
@@ -81,19 +81,19 @@ lapack_int LAPACKE_sgeevx( int matrix_layout, char balanc, char jobvl,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgeevx_work( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
+    info = API_SUFFIX(LAPACKE_sgeevx_work)( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
                                 lda, wr, wi, vl, ldvl, vr, ldvr, ilo, ihi,
                                 scale, abnrm, rconde, rcondv, work, lwork,
                                 iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_1:
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         LAPACKE_free( iwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeevx_work.c b/LAPACKE/src/lapacke_sgeevx_work.c
index d05ea16e9e..7ff3deb534 100644
--- a/LAPACKE/src/lapacke_sgeevx_work.c
+++ b/LAPACKE/src/lapacke_sgeevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeevx_work( int matrix_layout, char balanc, char jobvl,
+lapack_int API_SUFFIX(LAPACKE_sgeevx_work)( int matrix_layout, char balanc, char jobvl,
                                 char jobvr, char sense, lapack_int n, float* a,
                                 lapack_int lda, float* wr, float* wi, float* vl,
                                 lapack_int ldvl, float* vr, lapack_int ldvr,
@@ -60,17 +60,17 @@ lapack_int LAPACKE_sgeevx_work( int matrix_layout, char balanc, char jobvl,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgeevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeevx_work", info );
             return info;
         }
-        if( ldvl < n ) {
+        if( ldvl < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) && ldvl < n ) ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_sgeevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeevx_work", info );
             return info;
         }
-        if( ldvr < n ) {
+        if( ldvr < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) && ldvr < n ) ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_sgeevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeevx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -86,14 +86,14 @@ lapack_int LAPACKE_sgeevx_work( int matrix_layout, char balanc, char jobvl,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (float*)LAPACKE_malloc( sizeof(float) * ldvl_t * MAX(1,n) );
             if( vl_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (float*)LAPACKE_malloc( sizeof(float) * ldvr_t * MAX(1,n) );
             if( vr_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -101,7 +101,7 @@ lapack_int LAPACKE_sgeevx_work( int matrix_layout, char balanc, char jobvl,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgeevx( &balanc, &jobvl, &jobvr, &sense, &n, a_t, &lda_t, wr, wi,
                        vl_t, &ldvl_t, vr_t, &ldvr_t, ilo, ihi, scale, abnrm,
@@ -110,30 +110,30 @@ lapack_int LAPACKE_sgeevx_work( int matrix_layout, char balanc, char jobvl,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgeevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgeevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgehrd.c b/LAPACKE/src/lapacke_sgehrd.c
index 838c7a5877..4399f6c41a 100644
--- a/LAPACKE/src/lapacke_sgehrd.c
+++ b/LAPACKE/src/lapacke_sgehrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgehrd( int matrix_layout, lapack_int n, lapack_int ilo,
+lapack_int API_SUFFIX(LAPACKE_sgehrd)( int matrix_layout, lapack_int n, lapack_int ilo,
                            lapack_int ihi, float* a, lapack_int lda,
                            float* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_sgehrd( int matrix_layout, lapack_int n, lapack_int ilo,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgehrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgehrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgehrd_work( matrix_layout, n, ilo, ihi, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_sgehrd_work)( matrix_layout, n, ilo, ihi, a, lda, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -66,13 +66,13 @@ lapack_int LAPACKE_sgehrd( int matrix_layout, lapack_int n, lapack_int ilo,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgehrd_work( matrix_layout, n, ilo, ihi, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_sgehrd_work)( matrix_layout, n, ilo, ihi, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgehrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgehrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgehrd_work.c b/LAPACKE/src/lapacke_sgehrd_work.c
index 127307da88..8a12e1a20b 100644
--- a/LAPACKE/src/lapacke_sgehrd_work.c
+++ b/LAPACKE/src/lapacke_sgehrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgehrd_work( int matrix_layout, lapack_int n, lapack_int ilo,
+lapack_int API_SUFFIX(LAPACKE_sgehrd_work)( int matrix_layout, lapack_int n, lapack_int ilo,
                                 lapack_int ihi, float* a, lapack_int lda,
                                 float* tau, float* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_sgehrd_work( int matrix_layout, lapack_int n, lapack_int ilo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sgehrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgehrd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_sgehrd_work( int matrix_layout, lapack_int n, lapack_int ilo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgehrd( &n, &ilo, &ihi, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgehrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgehrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgehrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgehrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgejsv.c b/LAPACKE/src/lapacke_sgejsv.c
index 2138751b97..a25d9150ec 100644
--- a/LAPACKE/src/lapacke_sgejsv.c
+++ b/LAPACKE/src/lapacke_sgejsv.c
@@ -32,55 +32,55 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgejsv( int matrix_layout, char joba, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_sgejsv)( int matrix_layout, char joba, char jobu, char jobv,
                            char jobr, char jobt, char jobp, lapack_int m,
                            lapack_int n, float* a, lapack_int lda, float* sva,
                            float* u, lapack_int ldu, float* v, lapack_int ldv,
                            float* stat, lapack_int* istat )
 {
     lapack_int info = 0;
-    lapack_int lwork = (!( LAPACKE_lsame( jobu, 'u' ) ||
-                       LAPACKE_lsame( jobu, 'f' ) ||
-                       LAPACKE_lsame( jobv, 'v' ) ||
-                       LAPACKE_lsame( jobv, 'j' ) ||
-                       LAPACKE_lsame( joba, 'e' ) ||
-                       LAPACKE_lsame( joba, 'g' ) ) ? MAX3(7,4*n+1,2*m+n) :
-                       ( (!( LAPACKE_lsame( jobu, 'u' ) ||
-                       LAPACKE_lsame( jobu, 'f' ) ||
-                       LAPACKE_lsame( jobv, 'v' ) ||
-                       LAPACKE_lsame( jobv, 'j' ) ) &&
-                       ( LAPACKE_lsame( joba, 'e' ) ||
-                       LAPACKE_lsame( joba, 'g' ) ) ) ? MAX3(7,4*n+n*n,2*m+n) :
-                       ( ( LAPACKE_lsame( jobu, 'u' ) ||
-                       LAPACKE_lsame( jobu, 'f' ) ) &&
-                       (!( LAPACKE_lsame( jobv, 'v' ) ||
-                       LAPACKE_lsame( jobv, 'j' ) ) ) ? MAX(7,2*n+m) :
-                       ( ( LAPACKE_lsame( jobv, 'v' ) ||
-                       LAPACKE_lsame( jobv, 'j' ) ) &&
-                       (!( LAPACKE_lsame( jobu, 'u' ) ||
-                       LAPACKE_lsame( jobu, 'f' ) ) ) ? MAX(7,2*n+m) :
-                       ( ( LAPACKE_lsame( jobu, 'u' ) ||
-                       LAPACKE_lsame( jobu, 'f' ) ) &&
-                       ( LAPACKE_lsame( jobv, 'v' ) ||
-                       LAPACKE_lsame( jobv, 'j' ) ) &&
-                       !LAPACKE_lsame( jobv, 'j' ) ? MAX(1,6*n+2*n*n) :
-                       ( ( LAPACKE_lsame( jobu, 'u' ) ||
-                       LAPACKE_lsame( jobu, 'f' ) ) &&
-                       ( LAPACKE_lsame( jobv, 'v' ) ||
-                       LAPACKE_lsame( jobv, 'j' ) ) &&
-                       LAPACKE_lsame( jobv, 'j' ) ? MAX(7,m+3*n+n*n) :
+    lapack_int lwork = (!( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( joba, 'e' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ) ? MAX3(7,4*n+1,2*m+n) :
+                       ( (!( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) &&
+                       ( API_SUFFIX(LAPACKE_lsame)( joba, 'e' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ) ) ? MAX3(7,4*n+n*n,2*m+n) :
+                       ( ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+                       (!( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) ) ? MAX(7,2*n+m) :
+                       ( ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) &&
+                       (!( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) ) ? MAX(7,2*n+m) :
+                       ( ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+                       ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) &&
+                       !API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ? MAX(1,6*n+2*n*n) :
+                       ( ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+                       ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) &&
+                       API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ? MAX(7,m+3*n+n*n) :
                        7) ) ) ) ) );
     lapack_int* iwork = NULL;
     float* work = NULL;
     lapack_int i;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgejsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgejsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -10;
         }
     }
@@ -93,15 +93,15 @@ lapack_int LAPACKE_sgejsv( int matrix_layout, char joba, char jobu, char jobv,
     }
     lwork = MAX3( lwork, 7, 2*m+n );
     { /* FIXUP LWORK */
-        int want_u = LAPACKE_lsame( jobu, 'u' ) || LAPACKE_lsame( jobu, 'f' );
-        int want_v = LAPACKE_lsame( jobv, 'v' ) || LAPACKE_lsame( jobv, 'j' );
-        int want_sce = LAPACKE_lsame( joba, 'e' ) || LAPACKE_lsame( joba, 'g' );
+        int want_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'f' );
+        int want_v = API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'j' );
+        int want_sce = API_SUFFIX(LAPACKE_lsame)( joba, 'e' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' );
         if( !want_u && !want_v && !want_sce )  lwork = MAX( lwork, 4*n+1 ); // 1.1
         if( !want_u && !want_v && want_sce )   lwork = MAX( lwork, n*n+4*n ); // 1.2
         if( !want_u && want_v ) lwork = MAX( lwork, 4*n+1 ); // 2
         if( want_u && !want_v ) lwork = MAX( lwork, 4*n+1 ); // 3
-        if( want_u && LAPACKE_lsame( jobv, 'v' ) ) lwork = MAX( lwork, 6*n+2*n*n ); // 4.1
-        if( want_u && LAPACKE_lsame( jobv, 'j' ) ) lwork = MAX3( lwork, 4*n+n*n, 2*n+n*n+6 ); // 4.2
+        if( want_u && API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) lwork = MAX( lwork, 6*n+2*n*n ); // 4.1
+        if( want_u && API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) lwork = MAX3( lwork, 4*n+n*n, 2*n+n*n+6 ); // 4.2
     }
     work = (float*)LAPACKE_malloc( sizeof(float) * lwork );
     if( work == NULL ) {
@@ -109,7 +109,7 @@ lapack_int LAPACKE_sgejsv( int matrix_layout, char joba, char jobu, char jobv,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgejsv_work( matrix_layout, joba, jobu, jobv, jobr, jobt,
+    info = API_SUFFIX(LAPACKE_sgejsv_work)( matrix_layout, joba, jobu, jobv, jobr, jobt,
                                 jobp, m, n, a, lda, sva, u, ldu, v, ldv, work,
                                 lwork, iwork );
     /* Backup significant data from working array(s) */
@@ -125,7 +125,7 @@ lapack_int LAPACKE_sgejsv( int matrix_layout, char joba, char jobu, char jobv,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgejsv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgejsv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgejsv_work.c b/LAPACKE/src/lapacke_sgejsv_work.c
index 1c5ed064ec..41078572b4 100644
--- a/LAPACKE/src/lapacke_sgejsv_work.c
+++ b/LAPACKE/src/lapacke_sgejsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgejsv_work( int matrix_layout, char joba, char jobu,
+lapack_int API_SUFFIX(LAPACKE_sgejsv_work)( int matrix_layout, char joba, char jobu,
                                 char jobv, char jobr, char jobt, char jobp,
                                 lapack_int m, lapack_int n, float* a,
                                 lapack_int lda, float* sva, float* u,
@@ -50,10 +50,10 @@ lapack_int LAPACKE_sgejsv_work( int matrix_layout, char joba, char jobu,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nu = LAPACKE_lsame( jobu, 'n' ) ? 1 : m;
-        lapack_int nv = LAPACKE_lsame( jobv, 'n' ) ? 1 : n;
-        lapack_int ncols_u = LAPACKE_lsame( jobu, 'n' ) ? 1 :
-            LAPACKE_lsame( jobu, 'f' ) ? m : n;
+        lapack_int nu = API_SUFFIX(LAPACKE_lsame)( jobu, 'n' ) ? 1 : m;
+        lapack_int nv = API_SUFFIX(LAPACKE_lsame)( jobv, 'n' ) ? 1 : n;
+        lapack_int ncols_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'n' ) ? 1 :
+            API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ? m : n;
         lapack_int lda_t = MAX(1,m);
         lapack_int ldu_t = MAX(1,nu);
         lapack_int ldv_t = MAX(1,nv);
@@ -63,17 +63,17 @@ lapack_int LAPACKE_sgejsv_work( int matrix_layout, char joba, char jobu,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sgejsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgejsv_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_sgejsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgejsv_work", info );
             return info;
         }
         if( ldv < n ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_sgejsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgejsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -82,16 +82,16 @@ lapack_int LAPACKE_sgejsv_work( int matrix_layout, char joba, char jobu,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobu, 'f' ) || LAPACKE_lsame( jobu, 'u' ) ||
-            LAPACKE_lsame( jobu, 'w' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobu, 'w' ) ) {
             u_t = (float*)LAPACKE_malloc( sizeof(float) * ldu_t * MAX(1,ncols_u) );
             if( u_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobv, 'j' ) || LAPACKE_lsame( jobv, 'v' ) ||
-            LAPACKE_lsame( jobv, 'w' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobv, 'w' ) ) {
             v_t = (float*)LAPACKE_malloc( sizeof(float) * ldv_t * MAX(1,n) );
             if( v_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -99,7 +99,7 @@ lapack_int LAPACKE_sgejsv_work( int matrix_layout, char joba, char jobu,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgejsv( &joba, &jobu, &jobv, &jobr, &jobt, &jobp, &m, &n, a_t,
                        &lda_t, sva, u_t, &ldu_t, v_t, &ldv_t, work, &lwork,
@@ -108,33 +108,33 @@ lapack_int LAPACKE_sgejsv_work( int matrix_layout, char joba, char jobu,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobu, 'f' ) || LAPACKE_lsame( jobu, 'u' ) ||
-            LAPACKE_lsame( jobu, 'w' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nu, ncols_u, u_t, ldu_t, u, ldu );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobu, 'w' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nu, ncols_u, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'j' ) || LAPACKE_lsame( jobv, 'v' ) ||
-            LAPACKE_lsame( jobv, 'w' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nv, n, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobv, 'w' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nv, n, v_t, ldv_t, v, ldv );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobv, 'j' ) || LAPACKE_lsame( jobv, 'v' ) ||
-            LAPACKE_lsame( jobv, 'w' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobv, 'w' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobu, 'f' ) || LAPACKE_lsame( jobu, 'u' ) ||
-            LAPACKE_lsame( jobu, 'w' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobu, 'w' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgejsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgejsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgejsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgejsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgelq.c b/LAPACKE/src/lapacke_sgelq.c
index 5228a80723..7653e5f87e 100644
--- a/LAPACKE/src/lapacke_sgelq.c
+++ b/LAPACKE/src/lapacke_sgelq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgelq( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgelq)( int matrix_layout, lapack_int m, lapack_int n,
                           float* a, lapack_int lda,
                           float* t, lapack_int tsize )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_sgelq( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgelq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgelq_work( matrix_layout, m, n, a, lda, t, tsize, &work_query,
+    info = API_SUFFIX(LAPACKE_sgelq_work)( matrix_layout, m, n, a, lda, t, tsize, &work_query,
                                lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,12 +69,12 @@ lapack_int LAPACKE_sgelq( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgelq_work( matrix_layout, m, n, a, lda, t, tsize, work, lwork );
+    info = API_SUFFIX(LAPACKE_sgelq_work)( matrix_layout, m, n, a, lda, t, tsize, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgelq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgelq2.c b/LAPACKE/src/lapacke_sgelq2.c
index 9b4d8dafd1..74771ad4d0 100644
--- a/LAPACKE/src/lapacke_sgelq2.c
+++ b/LAPACKE/src/lapacke_sgelq2.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgelq2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgelq2)( int matrix_layout, lapack_int m, lapack_int n,
                            float* a, lapack_int lda, float* tau )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgelq2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelq2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
@@ -56,12 +56,12 @@ lapack_int LAPACKE_sgelq2( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgelq2_work( matrix_layout, m, n, a, lda, tau, work );
+    info = API_SUFFIX(LAPACKE_sgelq2_work)( matrix_layout, m, n, a, lda, tau, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgelq2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelq2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgelq2_work.c b/LAPACKE/src/lapacke_sgelq2_work.c
index 8f7d4fb4f7..11a23dfc3c 100644
--- a/LAPACKE/src/lapacke_sgelq2_work.c
+++ b/LAPACKE/src/lapacke_sgelq2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgelq2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgelq2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 float* a, lapack_int lda, float* tau,
                                 float* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_sgelq2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgelq2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelq2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_sgelq2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgelq2( &m, &n, a_t, &lda_t, tau, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgelq2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelq2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgelq2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelq2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgelq_work.c b/LAPACKE/src/lapacke_sgelq_work.c
index 0cd356f4a4..ac26fcf0ee 100644
--- a/LAPACKE/src/lapacke_sgelq_work.c
+++ b/LAPACKE/src/lapacke_sgelq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgelq_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgelq_work)( int matrix_layout, lapack_int m, lapack_int n,
                                float* a, lapack_int lda,
                                float* t, lapack_int tsize,
                                float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_sgelq_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgelq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_sgelq_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgelq( &m, &n, a_t, &lda_t, t, &tsize, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgelq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgelq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgelqf.c b/LAPACKE/src/lapacke_sgelqf.c
index cdbb47a98f..32d2788aff 100644
--- a/LAPACKE/src/lapacke_sgelqf.c
+++ b/LAPACKE/src/lapacke_sgelqf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgelqf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgelqf)( int matrix_layout, lapack_int m, lapack_int n,
                            float* a, lapack_int lda, float* tau )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_sgelqf( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgelqf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelqf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgelqf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_sgelqf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,12 +65,12 @@ lapack_int LAPACKE_sgelqf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgelqf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_sgelqf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgelqf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelqf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgelqf_work.c b/LAPACKE/src/lapacke_sgelqf_work.c
index f93abf355d..a354cbb84f 100644
--- a/LAPACKE/src/lapacke_sgelqf_work.c
+++ b/LAPACKE/src/lapacke_sgelqf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgelqf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgelqf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 float* a, lapack_int lda, float* tau,
                                 float* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_sgelqf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgelqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelqf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_sgelqf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgelqf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgelqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelqf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgelqf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelqf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgels.c b/LAPACKE/src/lapacke_sgels.c
index 9002b95514..899de53a8d 100644
--- a/LAPACKE/src/lapacke_sgels.c
+++ b/LAPACKE/src/lapacke_sgels.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgels( int matrix_layout, char trans, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_sgels)( int matrix_layout, char trans, lapack_int m,
                           lapack_int n, lapack_int nrhs, float* a,
                           lapack_int lda, float* b, lapack_int ldb )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_sgels( int matrix_layout, char trans, lapack_int m,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgels", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgels", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgels_work( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_sgels_work)( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
                                &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_sgels( int matrix_layout, char trans, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgels_work( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_sgels_work)( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
                                work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgels", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgels", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgels_work.c b/LAPACKE/src/lapacke_sgels_work.c
index 7ae2caa05b..0700f651b1 100644
--- a/LAPACKE/src/lapacke_sgels_work.c
+++ b/LAPACKE/src/lapacke_sgels_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgels_work( int matrix_layout, char trans, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_sgels_work)( int matrix_layout, char trans, lapack_int m,
                                lapack_int n, lapack_int nrhs, float* a,
                                lapack_int lda, float* b, lapack_int ldb,
                                float* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_sgels_work( int matrix_layout, char trans, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sgels_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgels_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sgels_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgels_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_sgels_work( int matrix_layout, char trans, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgels( &trans, &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -88,8 +88,8 @@ lapack_int LAPACKE_sgels_work( int matrix_layout, char trans, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -97,11 +97,11 @@ lapack_int LAPACKE_sgels_work( int matrix_layout, char trans, lapack_int m,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgels_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgels_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgels_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgels_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgelsd.c b/LAPACKE/src/lapacke_sgelsd.c
index 7023c3467d..28988eb7ce 100644
--- a/LAPACKE/src/lapacke_sgelsd.c
+++ b/LAPACKE/src/lapacke_sgelsd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgelsd( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgelsd)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int nrhs, float* a, lapack_int lda, float* b,
                            lapack_int ldb, float* s, float rcond,
                            lapack_int* rank )
@@ -46,25 +46,25 @@ lapack_int LAPACKE_sgelsd( int matrix_layout, lapack_int m, lapack_int n,
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgelsd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelsd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &rcond, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &rcond, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgelsd_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
+    info = API_SUFFIX(LAPACKE_sgelsd_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
                                 rcond, rank, &work_query, lwork, &iwork_query );
     if( info != 0 ) {
         goto exit_level_0;
@@ -83,7 +83,7 @@ lapack_int LAPACKE_sgelsd( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgelsd_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
+    info = API_SUFFIX(LAPACKE_sgelsd_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
                                 rcond, rank, work, lwork, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -91,7 +91,7 @@ lapack_int LAPACKE_sgelsd( int matrix_layout, lapack_int m, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgelsd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelsd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgelsd_work.c b/LAPACKE/src/lapacke_sgelsd_work.c
index edc7562d03..9bbef500e6 100644
--- a/LAPACKE/src/lapacke_sgelsd_work.c
+++ b/LAPACKE/src/lapacke_sgelsd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgelsd_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int nrhs, float* a, lapack_int lda,
                                 float* b, lapack_int ldb, float* s, float rcond,
                                 lapack_int* rank, float* work, lapack_int lwork,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_sgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sgelsd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelsd_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgelsd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelsd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -80,8 +80,8 @@ lapack_int LAPACKE_sgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgelsd( &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, s, &rcond, rank,
                        work, &lwork, iwork, &info );
@@ -89,8 +89,8 @@ lapack_int LAPACKE_sgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -98,11 +98,11 @@ lapack_int LAPACKE_sgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgelsd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelsd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgelsd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelsd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgelss.c b/LAPACKE/src/lapacke_sgelss.c
index 73f5809c11..f486b35d93 100644
--- a/LAPACKE/src/lapacke_sgelss.c
+++ b/LAPACKE/src/lapacke_sgelss.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgelss( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgelss)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int nrhs, float* a, lapack_int lda, float* b,
                            lapack_int ldb, float* s, float rcond,
                            lapack_int* rank )
@@ -42,25 +42,25 @@ lapack_int LAPACKE_sgelss( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgelss", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelss", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &rcond, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &rcond, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgelss_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
+    info = API_SUFFIX(LAPACKE_sgelss_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
                                 rcond, rank, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -73,13 +73,13 @@ lapack_int LAPACKE_sgelss( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgelss_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
+    info = API_SUFFIX(LAPACKE_sgelss_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
                                 rcond, rank, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgelss", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelss", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgelss_work.c b/LAPACKE/src/lapacke_sgelss_work.c
index e747d58963..2cfb3a6448 100644
--- a/LAPACKE/src/lapacke_sgelss_work.c
+++ b/LAPACKE/src/lapacke_sgelss_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgelss_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgelss_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int nrhs, float* a, lapack_int lda,
                                 float* b, lapack_int ldb, float* s, float rcond,
                                 lapack_int* rank, float* work,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_sgelss_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sgelss_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelss_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgelss_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelss_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -80,8 +80,8 @@ lapack_int LAPACKE_sgelss_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgelss( &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, s, &rcond, rank,
                        work, &lwork, &info );
@@ -89,8 +89,8 @@ lapack_int LAPACKE_sgelss_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -98,11 +98,11 @@ lapack_int LAPACKE_sgelss_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgelss_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelss_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgelss_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelss_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgelsy.c b/LAPACKE/src/lapacke_sgelsy.c
index 8785996ae4..b5b78ce827 100644
--- a/LAPACKE/src/lapacke_sgelsy.c
+++ b/LAPACKE/src/lapacke_sgelsy.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgelsy( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgelsy)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int nrhs, float* a, lapack_int lda, float* b,
                            lapack_int ldb, lapack_int* jpvt, float rcond,
                            lapack_int* rank )
@@ -42,25 +42,25 @@ lapack_int LAPACKE_sgelsy( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgelsy", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelsy", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &rcond, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &rcond, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgelsy_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, jpvt,
+    info = API_SUFFIX(LAPACKE_sgelsy_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, jpvt,
                                 rcond, rank, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -73,13 +73,13 @@ lapack_int LAPACKE_sgelsy( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgelsy_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, jpvt,
+    info = API_SUFFIX(LAPACKE_sgelsy_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, jpvt,
                                 rcond, rank, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgelsy", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelsy", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgelsy_work.c b/LAPACKE/src/lapacke_sgelsy_work.c
index a6c207398c..a8c7c897ef 100644
--- a/LAPACKE/src/lapacke_sgelsy_work.c
+++ b/LAPACKE/src/lapacke_sgelsy_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgelsy_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int nrhs, float* a, lapack_int lda,
                                 float* b, lapack_int ldb, lapack_int* jpvt,
                                 float rcond, lapack_int* rank, float* work,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_sgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sgelsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelsy_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgelsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelsy_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -80,8 +80,8 @@ lapack_int LAPACKE_sgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgelsy( &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, jpvt, &rcond,
                        rank, work, &lwork, &info );
@@ -89,8 +89,8 @@ lapack_int LAPACKE_sgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -98,11 +98,11 @@ lapack_int LAPACKE_sgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgelsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelsy_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgelsy_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgelsy_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgemlq.c b/LAPACKE/src/lapacke_sgemlq.c
index 6677ae9703..9751f6081d 100644
--- a/LAPACKE/src/lapacke_sgemlq.c
+++ b/LAPACKE/src/lapacke_sgemlq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgemlq( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sgemlq)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const float* a, lapack_int lda,
                            const float* t, lapack_int tsize,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_sgemlq( int matrix_layout, char side, char trans,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgemlq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemlq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, k, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, k, m, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_s_nancheck( tsize, t, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( tsize, t, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgemlq_work( matrix_layout, side, trans, m, n, k, a, lda,
+    info = API_SUFFIX(LAPACKE_sgemlq_work)( matrix_layout, side, trans, m, n, k, a, lda,
                                 t, tsize, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -74,13 +74,13 @@ lapack_int LAPACKE_sgemlq( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgemlq_work( matrix_layout, side, trans, m, n, k, a, lda,
+    info = API_SUFFIX(LAPACKE_sgemlq_work)( matrix_layout, side, trans, m, n, k, a, lda,
                                 t, tsize, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgemlq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemlq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgemlq_work.c b/LAPACKE/src/lapacke_sgemlq_work.c
index d63d4efe80..75942786c5 100644
--- a/LAPACKE/src/lapacke_sgemlq_work.c
+++ b/LAPACKE/src/lapacke_sgemlq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgemlq_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sgemlq_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const float* a, lapack_int lda,
                                 const float* t, lapack_int tsize,
@@ -51,18 +51,18 @@ lapack_int LAPACKE_sgemlq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lda_t = MAX(1,k);
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( lda < r ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgemlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemlq_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sgemlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemlq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -72,7 +72,7 @@ lapack_int LAPACKE_sgemlq_work( int matrix_layout, char side, char trans,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             a_t = (float*)LAPACKE_malloc( sizeof(float) * lda_t * MAX(1,m) );
         } else {
             a_t = (float*)LAPACKE_malloc( sizeof(float) * lda_t * MAX(1,n) );
@@ -87,8 +87,8 @@ lapack_int LAPACKE_sgemlq_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, k, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgemlq( &side, &trans, &m, &n, &k, a_t, &lda_t, t, &tsize,
                        c_t, &ldc_t, work, &lwork, &info );
@@ -96,18 +96,18 @@ lapack_int LAPACKE_sgemlq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgemlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemlq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgemlq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemlq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgemqr.c b/LAPACKE/src/lapacke_sgemqr.c
index ceeac349a3..27d9ccc909 100644
--- a/LAPACKE/src/lapacke_sgemqr.c
+++ b/LAPACKE/src/lapacke_sgemqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgemqr( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sgemqr)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const float* a, lapack_int lda,
                            const float* t, lapack_int tsize,
@@ -44,26 +44,26 @@ lapack_int LAPACKE_sgemqr( int matrix_layout, char side, char trans,
     float work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgemqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_sge_nancheck( matrix_layout, r, k, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, r, k, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_s_nancheck( tsize, t, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( tsize, t, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgemqr_work( matrix_layout, side, trans, m, n, k, a, lda,
+    info = API_SUFFIX(LAPACKE_sgemqr_work)( matrix_layout, side, trans, m, n, k, a, lda,
                                 t, tsize, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -76,13 +76,13 @@ lapack_int LAPACKE_sgemqr( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgemqr_work( matrix_layout, side, trans, m, n, k, a, lda,
+    info = API_SUFFIX(LAPACKE_sgemqr_work)( matrix_layout, side, trans, m, n, k, a, lda,
                                 t, tsize, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgemqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgemqr_work.c b/LAPACKE/src/lapacke_sgemqr_work.c
index d05c429763..d657c14fa5 100644
--- a/LAPACKE/src/lapacke_sgemqr_work.c
+++ b/LAPACKE/src/lapacke_sgemqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgemqr_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sgemqr_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const float* a, lapack_int lda,
                                 const float* t, lapack_int tsize,
@@ -51,18 +51,18 @@ lapack_int LAPACKE_sgemqr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lda_t = MAX(1,r);
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( lda < k ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgemqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemqr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sgemqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -85,8 +85,8 @@ lapack_int LAPACKE_sgemqr_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, r, k, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, r, k, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgemqr( &side, &trans, &m, &n, &k, a_t, &lda_t, t, &tsize,
                        c_t, &ldc_t, work, &lwork, &info );
@@ -94,18 +94,18 @@ lapack_int LAPACKE_sgemqr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgemqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgemqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgemqrt.c b/LAPACKE/src/lapacke_sgemqrt.c
index 79685c8ccf..920a26dbc5 100644
--- a/LAPACKE/src/lapacke_sgemqrt.c
+++ b/LAPACKE/src/lapacke_sgemqrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgemqrt( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sgemqrt)( int matrix_layout, char side, char trans,
                             lapack_int m, lapack_int n, lapack_int k,
                             lapack_int nb, const float* v, lapack_int ldv,
                             const float* t, lapack_int ldt, float* c,
@@ -42,21 +42,21 @@ lapack_int LAPACKE_sgemqrt( int matrix_layout, char side, char trans,
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgemqrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemqrt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        nrows_v = LAPACKE_lsame( side, 'L' ) ? m :
-                             ( LAPACKE_lsame( side, 'R' ) ? n : 0 );
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? m :
+                             ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? n : 0 );
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -12;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, nb, k, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, nb, k, t, ldt ) ) {
             return -10;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, nrows_v, k, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, nrows_v, k, v, ldv ) ) {
             return -8;
         }
     }
@@ -68,13 +68,13 @@ lapack_int LAPACKE_sgemqrt( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgemqrt_work( matrix_layout, side, trans, m, n, k, nb, v, ldv,
+    info = API_SUFFIX(LAPACKE_sgemqrt_work)( matrix_layout, side, trans, m, n, k, nb, v, ldv,
                                  t, ldt, c, ldc, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgemqrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemqrt", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgemqrt_work.c b/LAPACKE/src/lapacke_sgemqrt_work.c
index a1aac6a5ad..ef8388cb93 100644
--- a/LAPACKE/src/lapacke_sgemqrt_work.c
+++ b/LAPACKE/src/lapacke_sgemqrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgemqrt_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sgemqrt_work)( int matrix_layout, char side, char trans,
                                  lapack_int m, lapack_int n, lapack_int k,
                                  lapack_int nb, const float* v, lapack_int ldv,
                                  const float* t, lapack_int ldt, float* c,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_sgemqrt_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( ldc < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_sgemqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemqrt_work", info );
             return info;
         }
         if( ldt < nb ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sgemqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemqrt_work", info );
             return info;
         }
         if( ldv < k ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sgemqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemqrt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -86,9 +86,9 @@ lapack_int LAPACKE_sgemqrt_work( int matrix_layout, char side, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
-        LAPACKE_sge_trans( matrix_layout, ldt, nb, t, ldt, t_t, ldt_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, ldt, nb, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgemqrt( &side, &trans, &m, &n, &k, &nb, v_t, &ldv_t, t_t,
                         &ldt_t, c_t, &ldc_t, work, &info );
@@ -96,7 +96,7 @@ lapack_int LAPACKE_sgemqrt_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_2:
@@ -105,11 +105,11 @@ lapack_int LAPACKE_sgemqrt_work( int matrix_layout, char side, char trans,
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgemqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemqrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgemqrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgemqrt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqlf.c b/LAPACKE/src/lapacke_sgeqlf.c
index 3418461fe7..5616db2aa3 100644
--- a/LAPACKE/src/lapacke_sgeqlf.c
+++ b/LAPACKE/src/lapacke_sgeqlf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqlf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqlf)( int matrix_layout, lapack_int m, lapack_int n,
                            float* a, lapack_int lda, float* tau )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_sgeqlf( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqlf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqlf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgeqlf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_sgeqlf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,12 +65,12 @@ lapack_int LAPACKE_sgeqlf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgeqlf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_sgeqlf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqlf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqlf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqlf_work.c b/LAPACKE/src/lapacke_sgeqlf_work.c
index 7892dd23b4..ea3ba44c90 100644
--- a/LAPACKE/src/lapacke_sgeqlf_work.c
+++ b/LAPACKE/src/lapacke_sgeqlf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqlf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqlf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 float* a, lapack_int lda, float* tau,
                                 float* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_sgeqlf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgeqlf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqlf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_sgeqlf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgeqlf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgeqlf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqlf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgeqlf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqlf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqp3.c b/LAPACKE/src/lapacke_sgeqp3.c
index e9a2382392..7e5162d908 100644
--- a/LAPACKE/src/lapacke_sgeqp3.c
+++ b/LAPACKE/src/lapacke_sgeqp3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqp3( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqp3)( int matrix_layout, lapack_int m, lapack_int n,
                            float* a, lapack_int lda, lapack_int* jpvt,
                            float* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_sgeqp3( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqp3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqp3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgeqp3_work( matrix_layout, m, n, a, lda, jpvt, tau,
+    info = API_SUFFIX(LAPACKE_sgeqp3_work)( matrix_layout, m, n, a, lda, jpvt, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -66,13 +66,13 @@ lapack_int LAPACKE_sgeqp3( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgeqp3_work( matrix_layout, m, n, a, lda, jpvt, tau, work,
+    info = API_SUFFIX(LAPACKE_sgeqp3_work)( matrix_layout, m, n, a, lda, jpvt, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqp3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqp3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqp3_work.c b/LAPACKE/src/lapacke_sgeqp3_work.c
index 65281a3b19..12c45ba9fe 100644
--- a/LAPACKE/src/lapacke_sgeqp3_work.c
+++ b/LAPACKE/src/lapacke_sgeqp3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqp3_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqp3_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 float* a, lapack_int lda, lapack_int* jpvt,
                                 float* tau, float* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_sgeqp3_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgeqp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqp3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_sgeqp3_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgeqp3( &m, &n, a_t, &lda_t, jpvt, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgeqp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqp3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgeqp3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqp3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqpf.c b/LAPACKE/src/lapacke_sgeqpf.c
index 4a70cee5c3..ff6c0b49a5 100644
--- a/LAPACKE/src/lapacke_sgeqpf.c
+++ b/LAPACKE/src/lapacke_sgeqpf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqpf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqpf)( int matrix_layout, lapack_int m, lapack_int n,
                            float* a, lapack_int lda, lapack_int* jpvt,
                            float* tau )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqpf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqpf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
@@ -57,12 +57,12 @@ lapack_int LAPACKE_sgeqpf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgeqpf_work( matrix_layout, m, n, a, lda, jpvt, tau, work );
+    info = API_SUFFIX(LAPACKE_sgeqpf_work)( matrix_layout, m, n, a, lda, jpvt, tau, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqpf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqpf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqpf_work.c b/LAPACKE/src/lapacke_sgeqpf_work.c
index 3d52190193..a468eb2ce6 100644
--- a/LAPACKE/src/lapacke_sgeqpf_work.c
+++ b/LAPACKE/src/lapacke_sgeqpf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqpf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqpf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 float* a, lapack_int lda, lapack_int* jpvt,
                                 float* tau, float* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_sgeqpf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgeqpf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqpf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_sgeqpf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgeqpf( &m, &n, a_t, &lda_t, jpvt, tau, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgeqpf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqpf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgeqpf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqpf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqr.c b/LAPACKE/src/lapacke_sgeqr.c
index d3876420b4..030927398e 100644
--- a/LAPACKE/src/lapacke_sgeqr.c
+++ b/LAPACKE/src/lapacke_sgeqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqr( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqr)( int matrix_layout, lapack_int m, lapack_int n,
                           float* a, lapack_int lda,
                           float* t, lapack_int tsize )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_sgeqr( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgeqr_work( matrix_layout, m, n, a, lda, t, tsize, &work_query,
+    info = API_SUFFIX(LAPACKE_sgeqr_work)( matrix_layout, m, n, a, lda, t, tsize, &work_query,
                                lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,12 +69,12 @@ lapack_int LAPACKE_sgeqr( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgeqr_work( matrix_layout, m, n, a, lda, t, tsize, work, lwork );
+    info = API_SUFFIX(LAPACKE_sgeqr_work)( matrix_layout, m, n, a, lda, t, tsize, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqr2.c b/LAPACKE/src/lapacke_sgeqr2.c
index 5f125b1705..6ff7663b2c 100644
--- a/LAPACKE/src/lapacke_sgeqr2.c
+++ b/LAPACKE/src/lapacke_sgeqr2.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqr2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqr2)( int matrix_layout, lapack_int m, lapack_int n,
                            float* a, lapack_int lda, float* tau )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqr2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqr2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
@@ -56,12 +56,12 @@ lapack_int LAPACKE_sgeqr2( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgeqr2_work( matrix_layout, m, n, a, lda, tau, work );
+    info = API_SUFFIX(LAPACKE_sgeqr2_work)( matrix_layout, m, n, a, lda, tau, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqr2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqr2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqr2_work.c b/LAPACKE/src/lapacke_sgeqr2_work.c
index 3ac4d12b3f..6e6ac33775 100644
--- a/LAPACKE/src/lapacke_sgeqr2_work.c
+++ b/LAPACKE/src/lapacke_sgeqr2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqr2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqr2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 float* a, lapack_int lda, float* tau,
                                 float* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_sgeqr2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgeqr2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqr2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_sgeqr2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgeqr2( &m, &n, a_t, &lda_t, tau, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgeqr2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqr2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgeqr2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqr2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqr_work.c b/LAPACKE/src/lapacke_sgeqr_work.c
index 4951b90f48..fa1219947d 100644
--- a/LAPACKE/src/lapacke_sgeqr_work.c
+++ b/LAPACKE/src/lapacke_sgeqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqr_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqr_work)( int matrix_layout, lapack_int m, lapack_int n,
                                float* a, lapack_int lda,
                                float* t, lapack_int tsize,
                                float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_sgeqr_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgeqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_sgeqr_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgeqr( &m, &n, a_t, &lda_t, t, &tsize, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgeqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgeqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqrf.c b/LAPACKE/src/lapacke_sgeqrf.c
index 9f295d9bbd..e26e2ee425 100644
--- a/LAPACKE/src/lapacke_sgeqrf.c
+++ b/LAPACKE/src/lapacke_sgeqrf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqrf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqrf)( int matrix_layout, lapack_int m, lapack_int n,
                            float* a, lapack_int lda, float* tau )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_sgeqrf( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgeqrf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_sgeqrf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,12 +65,12 @@ lapack_int LAPACKE_sgeqrf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgeqrf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_sgeqrf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqrf_work.c b/LAPACKE/src/lapacke_sgeqrf_work.c
index 5df36005b3..07dce5afc1 100644
--- a/LAPACKE/src/lapacke_sgeqrf_work.c
+++ b/LAPACKE/src/lapacke_sgeqrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqrf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqrf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 float* a, lapack_int lda, float* tau,
                                 float* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_sgeqrf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgeqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_sgeqrf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgeqrf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgeqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgeqrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqrfp.c b/LAPACKE/src/lapacke_sgeqrfp.c
index 25a05f70bd..69c20824b3 100644
--- a/LAPACKE/src/lapacke_sgeqrfp.c
+++ b/LAPACKE/src/lapacke_sgeqrfp.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqrfp( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqrfp)( int matrix_layout, lapack_int m, lapack_int n,
                             float* a, lapack_int lda, float* tau )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_sgeqrfp( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqrfp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrfp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgeqrfp_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_sgeqrfp_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                  lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,12 +65,12 @@ lapack_int LAPACKE_sgeqrfp( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgeqrfp_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_sgeqrfp_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqrfp", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrfp", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqrfp_work.c b/LAPACKE/src/lapacke_sgeqrfp_work.c
index ae8fe0586c..8dec069b36 100644
--- a/LAPACKE/src/lapacke_sgeqrfp_work.c
+++ b/LAPACKE/src/lapacke_sgeqrfp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqrfp_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqrfp_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  float* a, lapack_int lda, float* tau,
                                  float* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_sgeqrfp_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgeqrfp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrfp_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_sgeqrfp_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgeqrfp( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgeqrfp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrfp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgeqrfp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrfp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqrt.c b/LAPACKE/src/lapacke_sgeqrt.c
index d8f0c1d65e..28ad0d294d 100644
--- a/LAPACKE/src/lapacke_sgeqrt.c
+++ b/LAPACKE/src/lapacke_sgeqrt.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqrt( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqrt)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int nb, float* a, lapack_int lda, float* t,
                            lapack_int ldt )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
@@ -57,12 +57,12 @@ lapack_int LAPACKE_sgeqrt( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgeqrt_work( matrix_layout, m, n, nb, a, lda, t, ldt, work );
+    info = API_SUFFIX(LAPACKE_sgeqrt_work)( matrix_layout, m, n, nb, a, lda, t, ldt, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrt", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqrt2.c b/LAPACKE/src/lapacke_sgeqrt2.c
index 9f4910695b..36a790bd8c 100644
--- a/LAPACKE/src/lapacke_sgeqrt2.c
+++ b/LAPACKE/src/lapacke_sgeqrt2.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqrt2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqrt2)( int matrix_layout, lapack_int m, lapack_int n,
                             float* a, lapack_int lda, float* t, lapack_int ldt )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqrt2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrt2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_sgeqrt2_work( matrix_layout, m, n, a, lda, t, ldt );
+    return API_SUFFIX(LAPACKE_sgeqrt2_work)( matrix_layout, m, n, a, lda, t, ldt );
 }
diff --git a/LAPACKE/src/lapacke_sgeqrt2_work.c b/LAPACKE/src/lapacke_sgeqrt2_work.c
index 3c204620fe..7fd858f459 100644
--- a/LAPACKE/src/lapacke_sgeqrt2_work.c
+++ b/LAPACKE/src/lapacke_sgeqrt2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqrt2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqrt2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  float* a, lapack_int lda, float* t,
                                  lapack_int ldt )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_sgeqrt2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgeqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrt2_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sgeqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrt2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,26 +71,26 @@ lapack_int LAPACKE_sgeqrt2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgeqrt2( &m, &n, a_t, &lda_t, t_t, &ldt_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgeqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrt2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgeqrt2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrt2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqrt3.c b/LAPACKE/src/lapacke_sgeqrt3.c
index 32cce825be..8d118bd97c 100644
--- a/LAPACKE/src/lapacke_sgeqrt3.c
+++ b/LAPACKE/src/lapacke_sgeqrt3.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqrt3( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqrt3)( int matrix_layout, lapack_int m, lapack_int n,
                             float* a, lapack_int lda, float* t, lapack_int ldt )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgeqrt3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrt3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_sgeqrt3_work( matrix_layout, m, n, a, lda, t, ldt );
+    return API_SUFFIX(LAPACKE_sgeqrt3_work)( matrix_layout, m, n, a, lda, t, ldt );
 }
diff --git a/LAPACKE/src/lapacke_sgeqrt3_work.c b/LAPACKE/src/lapacke_sgeqrt3_work.c
index 7950df25e4..032d316e23 100644
--- a/LAPACKE/src/lapacke_sgeqrt3_work.c
+++ b/LAPACKE/src/lapacke_sgeqrt3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqrt3_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqrt3_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  float* a, lapack_int lda, float* t,
                                  lapack_int ldt )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_sgeqrt3_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgeqrt3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrt3_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sgeqrt3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrt3_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,26 +71,26 @@ lapack_int LAPACKE_sgeqrt3_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgeqrt3( &m, &n, a_t, &lda_t, t_t, &ldt_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgeqrt3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrt3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgeqrt3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrt3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgeqrt_work.c b/LAPACKE/src/lapacke_sgeqrt_work.c
index 00ca6e5017..06a1874b3e 100644
--- a/LAPACKE/src/lapacke_sgeqrt_work.c
+++ b/LAPACKE/src/lapacke_sgeqrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgeqrt_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgeqrt_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int nb, float* a, lapack_int lda,
                                 float* t, lapack_int ldt, float* work )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_sgeqrt_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sgeqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrt_work", info );
             return info;
         }
         if( ldt < MIN(m,n) ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgeqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,15 +71,15 @@ lapack_int LAPACKE_sgeqrt_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgeqrt( &m, &n, &nb, a_t, &lda_t, t_t, &ldt_t, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, ldt, MIN(m,n), t_t, ldt_t, t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nb, MIN(m,n), t_t, ldt_t, t,
                            ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
@@ -87,11 +87,11 @@ lapack_int LAPACKE_sgeqrt_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgeqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgeqrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgeqrt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgerfs.c b/LAPACKE/src/lapacke_sgerfs.c
index 8cd3aaa83c..e69f05b5e2 100644
--- a/LAPACKE/src/lapacke_sgerfs.c
+++ b/LAPACKE/src/lapacke_sgerfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgerfs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgerfs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int nrhs, const float* a, lapack_int lda,
                            const float* af, lapack_int ldaf,
                            const lapack_int* ipiv, const float* b,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_sgerfs( int matrix_layout, char trans, lapack_int n,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgerfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, af, ldaf ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -75,7 +75,7 @@ lapack_int LAPACKE_sgerfs( int matrix_layout, char trans, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgerfs_work( matrix_layout, trans, n, nrhs, a, lda, af, ldaf,
+    info = API_SUFFIX(LAPACKE_sgerfs_work)( matrix_layout, trans, n, nrhs, a, lda, af, ldaf,
                                 ipiv, b, ldb, x, ldx, ferr, berr, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -83,7 +83,7 @@ lapack_int LAPACKE_sgerfs( int matrix_layout, char trans, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgerfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgerfs_work.c b/LAPACKE/src/lapacke_sgerfs_work.c
index a9a462f76d..f3dfa7e857 100644
--- a/LAPACKE/src/lapacke_sgerfs_work.c
+++ b/LAPACKE/src/lapacke_sgerfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgerfs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgerfs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int nrhs, const float* a, lapack_int lda,
                                 const float* af, lapack_int ldaf,
                                 const lapack_int* ipiv, const float* b,
@@ -60,22 +60,22 @@ lapack_int LAPACKE_sgerfs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerfs_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_sgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -100,10 +100,10 @@ lapack_int LAPACKE_sgerfs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgerfs( &trans, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, ipiv, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, iwork, &info );
@@ -111,7 +111,7 @@ lapack_int LAPACKE_sgerfs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -122,11 +122,11 @@ lapack_int LAPACKE_sgerfs_work( int matrix_layout, char trans, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgerfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgerfsx.c b/LAPACKE/src/lapacke_sgerfsx.c
index e6203ed511..09bdd626b5 100644
--- a/LAPACKE/src/lapacke_sgerfsx.c
+++ b/LAPACKE/src/lapacke_sgerfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgerfsx( int matrix_layout, char trans, char equed,
+lapack_int API_SUFFIX(LAPACKE_sgerfsx)( int matrix_layout, char trans, char equed,
                             lapack_int n, lapack_int nrhs, const float* a,
                             lapack_int lda, const float* af, lapack_int ldaf,
                             const lapack_int* ipiv, const float* r,
@@ -46,37 +46,37 @@ lapack_int LAPACKE_sgerfsx( int matrix_layout, char trans, char equed,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgerfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerfsx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, af, ldaf ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
-        if( LAPACKE_lsame( equed, 'b' ) || LAPACKE_lsame( equed, 'c' ) ) {
-            if( LAPACKE_s_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'b' ) || API_SUFFIX(LAPACKE_lsame)( equed, 'c' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, c, 1 ) ) {
                 return -12;
             }
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -23;
             }
         }
-        if( LAPACKE_lsame( equed, 'b' ) || LAPACKE_lsame( equed, 'r' ) ) {
-            if( LAPACKE_s_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'b' ) || API_SUFFIX(LAPACKE_lsame)( equed, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, r, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -15;
         }
     }
@@ -93,7 +93,7 @@ lapack_int LAPACKE_sgerfsx( int matrix_layout, char trans, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgerfsx_work( matrix_layout, trans, equed, n, nrhs, a, lda,
+    info = API_SUFFIX(LAPACKE_sgerfsx_work)( matrix_layout, trans, equed, n, nrhs, a, lda,
                                  af, ldaf, ipiv, r, c, b, ldb, x, ldx, rcond,
                                  berr, n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, iwork );
@@ -103,7 +103,7 @@ lapack_int LAPACKE_sgerfsx( int matrix_layout, char trans, char equed,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgerfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgerfsx_work.c b/LAPACKE/src/lapacke_sgerfsx_work.c
index 7e2148606b..b7a61d774e 100644
--- a/LAPACKE/src/lapacke_sgerfsx_work.c
+++ b/LAPACKE/src/lapacke_sgerfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgerfsx_work( int matrix_layout, char trans, char equed,
+lapack_int API_SUFFIX(LAPACKE_sgerfsx_work)( int matrix_layout, char trans, char equed,
                                  lapack_int n, lapack_int nrhs, const float* a,
                                  lapack_int lda, const float* af,
                                  lapack_int ldaf, const lapack_int* ipiv,
@@ -67,22 +67,22 @@ lapack_int LAPACKE_sgerfsx_work( int matrix_layout, char trans, char equed,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerfsx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_sgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_sgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -119,10 +119,10 @@ lapack_int LAPACKE_sgerfsx_work( int matrix_layout, char trans, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgerfsx( &trans, &equed, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, r, c, b_t, &ldb_t, x_t, &ldx_t, rcond, berr,
@@ -132,10 +132,10 @@ lapack_int LAPACKE_sgerfsx_work( int matrix_layout, char trans, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -151,11 +151,11 @@ lapack_int LAPACKE_sgerfsx_work( int matrix_layout, char trans, char equed,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgerfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgerqf.c b/LAPACKE/src/lapacke_sgerqf.c
index b82649a0a6..0d1bae4a37 100644
--- a/LAPACKE/src/lapacke_sgerqf.c
+++ b/LAPACKE/src/lapacke_sgerqf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgerqf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgerqf)( int matrix_layout, lapack_int m, lapack_int n,
                            float* a, lapack_int lda, float* tau )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_sgerqf( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgerqf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerqf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgerqf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_sgerqf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,12 +65,12 @@ lapack_int LAPACKE_sgerqf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgerqf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_sgerqf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgerqf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerqf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgerqf_work.c b/LAPACKE/src/lapacke_sgerqf_work.c
index a5cd487076..21c4015160 100644
--- a/LAPACKE/src/lapacke_sgerqf_work.c
+++ b/LAPACKE/src/lapacke_sgerqf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgerqf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgerqf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 float* a, lapack_int lda, float* tau,
                                 float* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_sgerqf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgerqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerqf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_sgerqf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgerqf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgerqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerqf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgerqf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgerqf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgesdd.c b/LAPACKE/src/lapacke_sgesdd.c
index bbefdad384..c13a6d4d2b 100644
--- a/LAPACKE/src/lapacke_sgesdd.c
+++ b/LAPACKE/src/lapacke_sgesdd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgesdd( int matrix_layout, char jobz, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_sgesdd)( int matrix_layout, char jobz, lapack_int m,
                            lapack_int n, float* a, lapack_int lda, float* s,
                            float* u, lapack_int ldu, float* vt,
                            lapack_int ldvt )
@@ -43,13 +43,13 @@ lapack_int LAPACKE_sgesdd( int matrix_layout, char jobz, lapack_int m,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgesdd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesdd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
@@ -62,7 +62,7 @@ lapack_int LAPACKE_sgesdd( int matrix_layout, char jobz, lapack_int m,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgesdd_work( matrix_layout, jobz, m, n, a, lda, s, u, ldu, vt,
+    info = API_SUFFIX(LAPACKE_sgesdd_work)( matrix_layout, jobz, m, n, a, lda, s, u, ldu, vt,
                                 ldvt, &work_query, lwork, iwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -75,7 +75,7 @@ lapack_int LAPACKE_sgesdd( int matrix_layout, char jobz, lapack_int m,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgesdd_work( matrix_layout, jobz, m, n, a, lda, s, u, ldu, vt,
+    info = API_SUFFIX(LAPACKE_sgesdd_work)( matrix_layout, jobz, m, n, a, lda, s, u, ldu, vt,
                                 ldvt, work, lwork, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -83,7 +83,7 @@ lapack_int LAPACKE_sgesdd( int matrix_layout, char jobz, lapack_int m,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgesdd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesdd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgesdd_work.c b/LAPACKE/src/lapacke_sgesdd_work.c
index b6619e38bb..ff0567e851 100644
--- a/LAPACKE/src/lapacke_sgesdd_work.c
+++ b/LAPACKE/src/lapacke_sgesdd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgesdd_work( int matrix_layout, char jobz, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_sgesdd_work)( int matrix_layout, char jobz, lapack_int m,
                                 lapack_int n, float* a, lapack_int lda,
                                 float* s, float* u, lapack_int ldu, float* vt,
                                 lapack_int ldvt, float* work, lapack_int lwork,
@@ -47,15 +47,18 @@ lapack_int LAPACKE_sgesdd_work( int matrix_layout, char jobz, lapack_int m,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_u = ( LAPACKE_lsame( jobz, 'a' ) ||
-                             LAPACKE_lsame( jobz, 's' ) ||
-                             ( LAPACKE_lsame( jobz, 'o' ) && m<n) ) ? m : 1;
-        lapack_int ncols_u = ( LAPACKE_lsame( jobz, 'a' ) ||
-                             ( LAPACKE_lsame( jobz, 'o' ) && m<n) ) ? m :
-                             ( LAPACKE_lsame( jobz, 's' ) ? MIN(m,n) : 1);
-        lapack_int nrows_vt = ( LAPACKE_lsame( jobz, 'a' ) ||
-                              ( LAPACKE_lsame( jobz, 'o' ) && m>=n) ) ? n :
-                              ( LAPACKE_lsame( jobz, 's' ) ? MIN(m,n) : 1);
+        lapack_int nrows_u = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+                             ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && m<n) ) ? m : 1;
+        lapack_int ncols_u = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) ||
+                             ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && m<n) ) ? m :
+                             ( API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ? MIN(m,n) : 1);
+        lapack_int nrows_vt = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) ||
+                              ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && m>=n) ) ? n :
+                              ( API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ? MIN(m,n) : 1);
+        lapack_int ncols_vt = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) ||
+                              API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+                              ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && m>=n) ) ? n : 1;
         lapack_int lda_t = MAX(1,m);
         lapack_int ldu_t = MAX(1,nrows_u);
         lapack_int ldvt_t = MAX(1,nrows_vt);
@@ -65,17 +68,17 @@ lapack_int LAPACKE_sgesdd_work( int matrix_layout, char jobz, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sgesdd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesdd_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sgesdd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesdd_work", info );
             return info;
         }
-        if( ldvt < n ) {
+        if( ldvt < ncols_vt ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sgesdd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesdd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -90,8 +93,8 @@ lapack_int LAPACKE_sgesdd_work( int matrix_layout, char jobz, lapack_int m,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m<n) ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m<n) ) ) {
             u_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldu_t * MAX(1,ncols_u) );
             if( u_t == NULL ) {
@@ -99,8 +102,8 @@ lapack_int LAPACKE_sgesdd_work( int matrix_layout, char jobz, lapack_int m,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m>=n) ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m>=n) ) ) {
             vt_t = (float*)LAPACKE_malloc( sizeof(float) * ldvt_t * MAX(1,n) );
             if( vt_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -108,7 +111,7 @@ lapack_int LAPACKE_sgesdd_work( int matrix_layout, char jobz, lapack_int m,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgesdd( &jobz, &m, &n, a_t, &lda_t, s, u_t, &ldu_t, vt_t,
                        &ldvt_t, work, &lwork, iwork, &info );
@@ -116,36 +119,36 @@ lapack_int LAPACKE_sgesdd_work( int matrix_layout, char jobz, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m<n) ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m<n) ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
                                u, ldu );
         }
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m>=n) ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m>=n) ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
                                ldvt );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m>=n) ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m>=n) ) ) {
             LAPACKE_free( vt_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m<n) ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m<n) ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgesdd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesdd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgesdd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesdd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgesv.c b/LAPACKE/src/lapacke_sgesv.c
index 1a905db17b..03fb55e228 100644
--- a/LAPACKE/src/lapacke_sgesv.c
+++ b/LAPACKE/src/lapacke_sgesv.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgesv( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_sgesv)( int matrix_layout, lapack_int n, lapack_int nrhs,
                           float* a, lapack_int lda, lapack_int* ipiv, float* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgesv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_sgesv_work( matrix_layout, n, nrhs, a, lda, ipiv, b, ldb );
+    return API_SUFFIX(LAPACKE_sgesv_work)( matrix_layout, n, nrhs, a, lda, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_sgesv_work.c b/LAPACKE/src/lapacke_sgesv_work.c
index 62a3953346..b5a77bac97 100644
--- a/LAPACKE/src/lapacke_sgesv_work.c
+++ b/LAPACKE/src/lapacke_sgesv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_sgesv_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                float* a, lapack_int lda, lapack_int* ipiv,
                                float* b, lapack_int ldb )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_sgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,27 +71,27 @@ lapack_int LAPACKE_sgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgesv( &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgesv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgesvd.c b/LAPACKE/src/lapacke_sgesvd.c
index ffe88ff2af..29f9905337 100644
--- a/LAPACKE/src/lapacke_sgesvd.c
+++ b/LAPACKE/src/lapacke_sgesvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgesvd( int matrix_layout, char jobu, char jobvt,
+lapack_int API_SUFFIX(LAPACKE_sgesvd)( int matrix_layout, char jobu, char jobvt,
                            lapack_int m, lapack_int n, float* a, lapack_int lda,
                            float* s, float* u, lapack_int ldu, float* vt,
                            lapack_int ldvt, float* superb )
@@ -43,19 +43,19 @@ lapack_int LAPACKE_sgesvd( int matrix_layout, char jobu, char jobvt,
     float work_query;
     lapack_int i;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgesvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgesvd_work( matrix_layout, jobu, jobvt, m, n, a, lda, s, u,
+    info = API_SUFFIX(LAPACKE_sgesvd_work)( matrix_layout, jobu, jobvt, m, n, a, lda, s, u,
                                 ldu, vt, ldvt, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -68,7 +68,7 @@ lapack_int LAPACKE_sgesvd( int matrix_layout, char jobu, char jobvt,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgesvd_work( matrix_layout, jobu, jobvt, m, n, a, lda, s, u,
+    info = API_SUFFIX(LAPACKE_sgesvd_work)( matrix_layout, jobu, jobvt, m, n, a, lda, s, u,
                                 ldu, vt, ldvt, work, lwork );
     /* Backup significant data from working array(s) */
     for( i=0; i<MIN(m,n)-1; i++ ) {
@@ -78,7 +78,7 @@ lapack_int LAPACKE_sgesvd( int matrix_layout, char jobu, char jobvt,
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgesvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgesvd_work.c b/LAPACKE/src/lapacke_sgesvd_work.c
index c764333ed3..f339db2f21 100644
--- a/LAPACKE/src/lapacke_sgesvd_work.c
+++ b/LAPACKE/src/lapacke_sgesvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgesvd_work( int matrix_layout, char jobu, char jobvt,
+lapack_int API_SUFFIX(LAPACKE_sgesvd_work)( int matrix_layout, char jobu, char jobvt,
                                 lapack_int m, lapack_int n, float* a,
                                 lapack_int lda, float* s, float* u,
                                 lapack_int ldu, float* vt, lapack_int ldvt,
@@ -47,14 +47,14 @@ lapack_int LAPACKE_sgesvd_work( int matrix_layout, char jobu, char jobvt,
             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_vt = LAPACKE_lsame( jobvt, 'a' ) ? n :
-                              ( LAPACKE_lsame( jobvt, 's' ) ? MIN(m,n) : 1);
-        lapack_int ncols_vt = ( LAPACKE_lsame( jobvt, 'a' ) ||
-                               LAPACKE_lsame( jobvt, 's' ) ) ? n : 1;
+        lapack_int nrows_u = ( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) ? m : 1;
+        lapack_int ncols_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) ? m :
+                             ( API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ? MIN(m,n) : 1);
+        lapack_int nrows_vt = API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) ? n :
+                              ( API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ? MIN(m,n) : 1);
+        lapack_int ncols_vt = ( API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) ||
+                               API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ) ? n : 1;
         lapack_int lda_t = MAX(1,m);
         lapack_int ldu_t = MAX(1,nrows_u);
         lapack_int ldvt_t = MAX(1,nrows_vt);
@@ -64,17 +64,17 @@ lapack_int LAPACKE_sgesvd_work( int matrix_layout, char jobu, char jobvt,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sgesvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvd_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sgesvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvd_work", info );
             return info;
         }
         if( ldvt < ncols_vt ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_sgesvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -89,7 +89,7 @@ lapack_int LAPACKE_sgesvd_work( int matrix_layout, char jobu, char jobvt,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) {
             u_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldu_t * MAX(1,ncols_u) );
             if( u_t == NULL ) {
@@ -97,7 +97,7 @@ lapack_int LAPACKE_sgesvd_work( int matrix_layout, char jobu, char jobvt,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobvt, 'a' ) || LAPACKE_lsame( jobvt, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ) {
             vt_t = (float*)LAPACKE_malloc( sizeof(float) * ldvt_t * MAX(1,n) );
             if( vt_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -105,7 +105,7 @@ lapack_int LAPACKE_sgesvd_work( int matrix_layout, char jobu, char jobvt,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgesvd( &jobu, &jobvt, &m, &n, a_t, &lda_t, s, u_t, &ldu_t, vt_t,
                        &ldvt_t, work, &lwork, &info );
@@ -113,32 +113,32 @@ lapack_int LAPACKE_sgesvd_work( int matrix_layout, char jobu, char jobvt,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
                                u, ldu );
         }
-        if( LAPACKE_lsame( jobvt, 'a' ) || LAPACKE_lsame( jobvt, 's' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
                                ldvt );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvt, 'a' ) || LAPACKE_lsame( jobvt, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ) {
             LAPACKE_free( vt_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(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_sgesvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgesvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgesvdq.c b/LAPACKE/src/lapacke_sgesvdq.c
index 0b6406dec6..94df2bc1d8 100644
--- a/LAPACKE/src/lapacke_sgesvdq.c
+++ b/LAPACKE/src/lapacke_sgesvdq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgesvdq( int matrix_layout, char joba, char jobp,
+lapack_int API_SUFFIX(LAPACKE_sgesvdq)( int matrix_layout, char joba, char jobp,
                            char jobr, char jobu, char jobv,
                            lapack_int m, lapack_int n, float* a,
                            lapack_int lda, float* s, float* u, lapack_int ldu,
@@ -48,21 +48,20 @@ lapack_int LAPACKE_sgesvdq( int matrix_layout, char joba, char jobp,
     lapack_int lrwork = -1;
     float* rwork = NULL;
     float rwork_query;
-    lapack_int i;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgesvdq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvdq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgesvdq_work( matrix_layout, joba, jobp, jobr, jobu, jobv,
+    info = API_SUFFIX(LAPACKE_sgesvdq_work)( matrix_layout, joba, jobp, jobr, jobu, jobv,
                                  m, n, a, lda, s, u, ldu, v, ldv, numrank,
                                  &iwork_query, liwork, &work_query, lwork,
                                  &rwork_query, lrwork );
@@ -89,7 +88,7 @@ lapack_int LAPACKE_sgesvdq( int matrix_layout, char joba, char jobp,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgesvdq_work( matrix_layout, joba, jobp, jobr, jobu, jobv,
+    info = API_SUFFIX(LAPACKE_sgesvdq_work)( matrix_layout, joba, jobp, jobr, jobu, jobv,
                                  m, n, a, lda, s, u, ldu, v, ldv, numrank,
                                  iwork, liwork, work, lwork, rwork, lrwork );
 
@@ -99,7 +98,7 @@ lapack_int LAPACKE_sgesvdq( int matrix_layout, char joba, char jobp,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgesvdq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvdq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgesvdq_work.c b/LAPACKE/src/lapacke_sgesvdq_work.c
index b65bd9abfb..b80ca03adc 100644
--- a/LAPACKE/src/lapacke_sgesvdq_work.c
+++ b/LAPACKE/src/lapacke_sgesvdq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgesvdq_work( int matrix_layout, char joba, char jobp,
+lapack_int API_SUFFIX(LAPACKE_sgesvdq_work)( int matrix_layout, char joba, char jobp,
                            char jobr, char jobu, char jobv,
                            lapack_int m, lapack_int n, float* a,
                            lapack_int lda, float* s, float* u, lapack_int ldu,
@@ -50,11 +50,11 @@ lapack_int LAPACKE_sgesvdq_work( int matrix_layout, char joba, char jobp,
             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 : 1;
+        lapack_int nrows_u = ( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) ? m : 1;
+        lapack_int ncols_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) ? m :
+                             (API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ? MIN(m,n) : 1);
+        lapack_int nrows_v = API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) ? 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);
@@ -64,17 +64,17 @@ lapack_int LAPACKE_sgesvdq_work( int matrix_layout, char joba, char jobp,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sgesvdq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvdq_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_sgesvdq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvdq_work", info );
             return info;
         }
         if( ldv < n ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_sgesvdq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvdq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -90,7 +90,7 @@ lapack_int LAPACKE_sgesvdq_work( int matrix_layout, char joba, char jobp,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) {
             u_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldu_t * MAX(1,ncols_u) );
             if( u_t == NULL ) {
@@ -98,7 +98,7 @@ lapack_int LAPACKE_sgesvdq_work( int matrix_layout, char joba, char jobp,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 's' ) ) {
             v_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldv_t * MAX(1,n) );
             if( v_t == NULL ) {
@@ -107,7 +107,7 @@ lapack_int LAPACKE_sgesvdq_work( int matrix_layout, char joba, char jobp,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
             LAPACK_sgesvdq( &joba, &jobp, &jobr, &jobu, &jobv, &m, &n, a, &lda_t,
                              s, u, &ldu_t, v, &ldv_t, numrank, iwork, &liwork,
@@ -116,32 +116,32 @@ lapack_int LAPACKE_sgesvdq_work( int matrix_layout, char joba, char jobp,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
                                u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 's' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_v, n, v_t, ldv_t, v,
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 's' ) ) {
+            API_SUFFIX(LAPACKE_sge_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' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 's' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(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_sgesvdq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvdq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgesvdq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvdq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgesvdx.c b/LAPACKE/src/lapacke_sgesvdx.c
index 432f56944d..38fbb179a6 100644
--- a/LAPACKE/src/lapacke_sgesvdx.c
+++ b/LAPACKE/src/lapacke_sgesvdx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgesvdx( int matrix_layout, char jobu, char jobvt, char range,
+lapack_int API_SUFFIX(LAPACKE_sgesvdx)( int matrix_layout, char jobu, char jobvt, char range,
                            lapack_int m, lapack_int n, float* a,
                            lapack_int lda, float vl, float vu,
                            lapack_int il, lapack_int iu, lapack_int* ns,
@@ -47,19 +47,19 @@ lapack_int LAPACKE_sgesvdx( int matrix_layout, char jobu, char jobvt, char range
     lapack_int* iwork = NULL;
     lapack_int i;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgesvdx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvdx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgesvdx_work( matrix_layout, jobu, jobvt, range,
+    info = API_SUFFIX(LAPACKE_sgesvdx_work)( matrix_layout, jobu, jobvt, range,
                                  m, n, a, lda, vl, vu, il, iu, ns, s, u,
                                  ldu, vt, ldvt, &work_query, lwork, iwork );
     if( info != 0 ) {
@@ -78,7 +78,7 @@ lapack_int LAPACKE_sgesvdx( int matrix_layout, char jobu, char jobvt, char range
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgesvdx_work( matrix_layout, jobu, jobvt,  range,
+    info = API_SUFFIX(LAPACKE_sgesvdx_work)( matrix_layout, jobu, jobvt,  range,
                                  m, n, a, lda, vl, vu, il, iu, ns, s, u,
                                  ldu, vt, ldvt, work, lwork, iwork );
     /* Backup significant data from working array(s) */
@@ -91,7 +91,7 @@ lapack_int LAPACKE_sgesvdx( int matrix_layout, char jobu, char jobvt, char range
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgesvdx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvdx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgesvdx_work.c b/LAPACKE/src/lapacke_sgesvdx_work.c
index feed435e01..00f8b94cc5 100644
--- a/LAPACKE/src/lapacke_sgesvdx_work.c
+++ b/LAPACKE/src/lapacke_sgesvdx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgesvdx_work( int matrix_layout, char jobu, char jobvt, char range,
+lapack_int API_SUFFIX(LAPACKE_sgesvdx_work)( int matrix_layout, char jobu, char jobvt, char range,
                                  lapack_int m, lapack_int n, float* a,
                                  lapack_int lda, float vl, float vu,
                                  lapack_int il, lapack_int iu, lapack_int* ns,
@@ -50,12 +50,12 @@ lapack_int LAPACKE_sgesvdx_work( int matrix_layout, char jobu, char jobvt, char
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_u = LAPACKE_lsame( jobu, 'v' ) ? m : 0;
-        lapack_int ncols_u = LAPACKE_lsame( jobu, 'v' ) ?
-                             ( LAPACKE_lsame( range, 'i' ) ? MAX(iu - il + 1, 0) : MIN(m,n)) : 0;
-        lapack_int nrows_vt = LAPACKE_lsame( jobvt, 'v' ) ?
-                             ( LAPACKE_lsame( range, 'i' ) ? MAX(iu - il + 1, 0) : MIN(m,n)) : 0;
-        lapack_int ncols_vt = LAPACKE_lsame( jobvt, 'v' ) ? n : 0;
+        lapack_int nrows_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ? m : 0;
+        lapack_int ncols_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ?
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? MAX(iu - il + 1, 0) : MIN(m,n)) : 0;
+        lapack_int nrows_vt = API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ?
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? MAX(iu - il + 1, 0) : MIN(m,n)) : 0;
+        lapack_int ncols_vt = API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ? n : 0;
 
         lapack_int lda_t = MAX(1,m);
         lapack_int ldu_t = MAX(1,nrows_u);
@@ -67,17 +67,17 @@ lapack_int LAPACKE_sgesvdx_work( int matrix_layout, char jobu, char jobvt, char
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgesvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvdx_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_sgesvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvdx_work", info );
             return info;
         }
         if( ldvt < ncols_vt ) {
             info = -18;
-            LAPACKE_xerbla( "LAPACKE_sgesvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvdx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -93,7 +93,7 @@ lapack_int LAPACKE_sgesvdx_work( int matrix_layout, char jobu, char jobvt, char
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobu, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ) {
             u_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldu_t * MAX(1,ncols_u) );
             if( u_t == NULL ) {
@@ -101,7 +101,7 @@ lapack_int LAPACKE_sgesvdx_work( int matrix_layout, char jobu, char jobvt, char
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobvt, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ) {
             vt_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldvt_t * MAX(1,n) );
             if( vt_t == NULL ) {
@@ -110,7 +110,7 @@ lapack_int LAPACKE_sgesvdx_work( int matrix_layout, char jobu, char jobvt, char
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgesvdx( &jobu, &jobvt, &range, &m, &n, a_t, &lda_t, &vl, &vu,
                         &il, &iu, ns, s, u_t, &ldu_t, vt_t,
@@ -119,32 +119,32 @@ lapack_int LAPACKE_sgesvdx_work( int matrix_layout, char jobu, char jobvt, char
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobu, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
                                u, ldu );
         }
-        if( LAPACKE_lsame( jobvt, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
                                ldvt );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvt, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ) {
             LAPACKE_free( vt_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobu, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgesvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvdx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgesvdx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvdx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgesvj.c b/LAPACKE/src/lapacke_sgesvj.c
index ba61c166b3..63c512319d 100644
--- a/LAPACKE/src/lapacke_sgesvj.c
+++ b/LAPACKE/src/lapacke_sgesvj.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgesvj( int matrix_layout, char joba, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_sgesvj)( int matrix_layout, char joba, char jobu, char jobv,
                            lapack_int m, lapack_int n, float* a, lapack_int lda,
                            float* sva, lapack_int mv, float* v, lapack_int ldv,
                            float* stat )
@@ -43,19 +43,19 @@ lapack_int LAPACKE_sgesvj( int matrix_layout, char joba, char jobu, char jobv,
     lapack_int i;
     lapack_int nrows_v;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgesvj", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvj", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        nrows_v = LAPACKE_lsame( jobv, 'v' ) ? MAX(0,n) :
-                ( LAPACKE_lsame( jobv, 'a' ) ? MAX(0,mv) : 0 );
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ? MAX(0,n) :
+                ( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) ? MAX(0,mv) : 0 );
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 'v' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, nrows_v, n, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, nrows_v, n, v, ldv ) ) {
                 return -11;
             }
         }
@@ -69,7 +69,7 @@ lapack_int LAPACKE_sgesvj( int matrix_layout, char joba, char jobu, char jobv,
     }
     work[0] = stat[0];  /* Significant if jobu = 'c' */
     /* Call middle-level interface */
-    info = LAPACKE_sgesvj_work( matrix_layout, joba, jobu, jobv, m, n, a, lda,
+    info = API_SUFFIX(LAPACKE_sgesvj_work)( matrix_layout, joba, jobu, jobv, m, n, a, lda,
                                 sva, mv, v, ldv, work, lwork );
     /* Backup significant data from working array(s) */
     for( i=0; i<6; i++ ) {
@@ -79,7 +79,7 @@ lapack_int LAPACKE_sgesvj( int matrix_layout, char joba, char jobu, char jobv,
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgesvj", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvj", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgesvj_work.c b/LAPACKE/src/lapacke_sgesvj_work.c
index 50a03839dd..3b1269445d 100644
--- a/LAPACKE/src/lapacke_sgesvj_work.c
+++ b/LAPACKE/src/lapacke_sgesvj_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgesvj_work( int matrix_layout, char joba, char jobu,
+lapack_int API_SUFFIX(LAPACKE_sgesvj_work)( int matrix_layout, char joba, char jobu,
                                 char jobv, lapack_int m, lapack_int n, float* a,
                                 lapack_int lda, float* sva, lapack_int mv,
                                 float* v, lapack_int ldv, float* work,
@@ -47,8 +47,8 @@ lapack_int LAPACKE_sgesvj_work( int matrix_layout, char joba, char jobu,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_v = LAPACKE_lsame( jobv, 'v' ) ? MAX(0,n) :
-                           ( LAPACKE_lsame( jobv, 'a' ) ? MAX(0,mv) : 0);
+        lapack_int nrows_v = API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ? MAX(0,n) :
+                           ( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) ? MAX(0,mv) : 0);
         lapack_int lda_t = MAX(1,m);
         lapack_int ldv_t = MAX(1,nrows_v);
         float* a_t = NULL;
@@ -56,12 +56,12 @@ lapack_int LAPACKE_sgesvj_work( int matrix_layout, char joba, char jobu,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgesvj_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvj_work", info );
             return info;
         }
         if( ldv < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_sgesvj_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvj_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,7 +70,7 @@ lapack_int LAPACKE_sgesvj_work( int matrix_layout, char joba, char jobu,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (float*)LAPACKE_malloc( sizeof(float) * ldv_t * MAX(1,n) );
             if( v_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -78,9 +78,9 @@ lapack_int LAPACKE_sgesvj_work( int matrix_layout, char joba, char jobu,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( jobv, 'a' ) ) {
-            LAPACKE_sge_trans( matrix_layout, nrows_v, n, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, nrows_v, n, v, ldv, v_t, ldv_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_sgesvj( &joba, &jobu, &jobv, &m, &n, a_t, &lda_t, sva, &mv, v_t,
@@ -89,24 +89,24 @@ lapack_int LAPACKE_sgesvj_work( int matrix_layout, char joba, char jobu,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_v, n, v_t, ldv_t, v,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_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, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgesvj_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvj_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgesvj_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvj_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgesvx.c b/LAPACKE/src/lapacke_sgesvx.c
index 0792ba73b7..cad9799cc9 100644
--- a/LAPACKE/src/lapacke_sgesvx.c
+++ b/LAPACKE/src/lapacke_sgesvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgesvx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_sgesvx)( int matrix_layout, char fact, char trans,
                            lapack_int n, lapack_int nrhs, float* a,
                            lapack_int lda, float* af, lapack_int ldaf,
                            lapack_int* ipiv, char* equed, float* r, float* c,
@@ -44,32 +44,32 @@ lapack_int LAPACKE_sgesvx( int matrix_layout, char fact, char trans,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgesvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -14;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) ) ) {
-            if( LAPACKE_s_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, c, 1 ) ) {
                 return -13;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'r' ) ) ) {
-            if( LAPACKE_s_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, r, 1 ) ) {
                 return -12;
             }
         }
@@ -87,7 +87,7 @@ lapack_int LAPACKE_sgesvx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgesvx_work( matrix_layout, fact, trans, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_sgesvx_work)( matrix_layout, fact, trans, n, nrhs, a, lda, af,
                                 ldaf, ipiv, equed, r, c, b, ldb, x, ldx, rcond,
                                 ferr, berr, work, iwork );
     /* Backup significant data from working array(s) */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_sgesvx( int matrix_layout, char fact, char trans,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgesvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgesvx_work.c b/LAPACKE/src/lapacke_sgesvx_work.c
index 74fa4a2f65..d0d09ef9ef 100644
--- a/LAPACKE/src/lapacke_sgesvx_work.c
+++ b/LAPACKE/src/lapacke_sgesvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgesvx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_sgesvx_work)( int matrix_layout, char fact, char trans,
                                 lapack_int n, lapack_int nrhs, float* a,
                                 lapack_int lda, float* af, lapack_int ldaf,
                                 lapack_int* ipiv, char* equed, float* r,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_sgesvx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_sgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_sgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -101,11 +101,11 @@ lapack_int LAPACKE_sgesvx_work( int matrix_layout, char fact, char trans,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgesvx( &fact, &trans, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                        ipiv, equed, r, c, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr,
@@ -114,18 +114,18 @@ lapack_int LAPACKE_sgesvx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, af_t, ldaf_t, af, ldaf );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, af_t, ldaf_t, af, ldaf );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -136,11 +136,11 @@ lapack_int LAPACKE_sgesvx_work( int matrix_layout, char fact, char trans,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgesvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgesvxx.c b/LAPACKE/src/lapacke_sgesvxx.c
index 418f450d30..5863b0f8aa 100644
--- a/LAPACKE/src/lapacke_sgesvxx.c
+++ b/LAPACKE/src/lapacke_sgesvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgesvxx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_sgesvxx)( int matrix_layout, char fact, char trans,
                             lapack_int n, lapack_int nrhs, float* a,
                             lapack_int lda, float* af, lapack_int ldaf,
                             lapack_int* ipiv, char* equed, float* r, float* c,
@@ -46,37 +46,37 @@ lapack_int LAPACKE_sgesvxx( int matrix_layout, char fact, char trans,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgesvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvxx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -14;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) ) ) {
-            if( LAPACKE_s_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, c, 1 ) ) {
                 return -13;
             }
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -25;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'r' ) ) ) {
-            if( LAPACKE_s_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, r, 1 ) ) {
                 return -12;
             }
         }
@@ -94,7 +94,7 @@ lapack_int LAPACKE_sgesvxx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgesvxx_work( matrix_layout, fact, trans, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_sgesvxx_work)( matrix_layout, fact, trans, n, nrhs, a, lda, af,
                                  ldaf, ipiv, equed, r, c, b, ldb, x, ldx, rcond,
                                  rpvgrw, berr, n_err_bnds, err_bnds_norm,
                                  err_bnds_comp, nparams, params, work, iwork );
@@ -104,7 +104,7 @@ lapack_int LAPACKE_sgesvxx( int matrix_layout, char fact, char trans,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgesvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgesvxx_work.c b/LAPACKE/src/lapacke_sgesvxx_work.c
index 66ea83345b..480f685bc3 100644
--- a/LAPACKE/src/lapacke_sgesvxx_work.c
+++ b/LAPACKE/src/lapacke_sgesvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgesvxx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_sgesvxx_work)( int matrix_layout, char fact, char trans,
                                  lapack_int n, lapack_int nrhs, float* a,
                                  lapack_int lda, float* af, lapack_int ldaf,
                                  lapack_int* ipiv, char* equed, float* r,
@@ -67,22 +67,22 @@ lapack_int LAPACKE_sgesvxx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvxx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_sgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_sgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -119,11 +119,11 @@ lapack_int LAPACKE_sgesvxx_work( int matrix_layout, char fact, char trans,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgesvxx( &fact, &trans, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, equed, r, c, b_t, &ldb_t, x_t, &ldx_t, rcond,
@@ -133,21 +133,21 @@ lapack_int LAPACKE_sgesvxx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, af_t, ldaf_t, af, ldaf );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, af_t, ldaf_t, af, ldaf );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -163,11 +163,11 @@ lapack_int LAPACKE_sgesvxx_work( int matrix_layout, char fact, char trans,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgesvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgesvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgetf2.c b/LAPACKE/src/lapacke_sgetf2.c
index 249aad026b..0f68d64f4c 100644
--- a/LAPACKE/src/lapacke_sgetf2.c
+++ b/LAPACKE/src/lapacke_sgetf2.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgetf2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgetf2)( int matrix_layout, lapack_int m, lapack_int n,
                            float* a, lapack_int lda, lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgetf2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetf2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_sgetf2_work( matrix_layout, m, n, a, lda, ipiv );
+    return API_SUFFIX(LAPACKE_sgetf2_work)( matrix_layout, m, n, a, lda, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_sgetf2_work.c b/LAPACKE/src/lapacke_sgetf2_work.c
index 90e1a398c7..036fd392d5 100644
--- a/LAPACKE/src/lapacke_sgetf2_work.c
+++ b/LAPACKE/src/lapacke_sgetf2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgetf2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgetf2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 float* a, lapack_int lda, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_sgetf2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgetf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetf2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,23 +58,23 @@ lapack_int LAPACKE_sgetf2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgetf2( &m, &n, a_t, &lda_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgetf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetf2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgetf2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetf2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgetrf.c b/LAPACKE/src/lapacke_sgetrf.c
index 992d0d44d7..4c75edf387 100644
--- a/LAPACKE/src/lapacke_sgetrf.c
+++ b/LAPACKE/src/lapacke_sgetrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgetrf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgetrf)( int matrix_layout, lapack_int m, lapack_int n,
                            float* a, lapack_int lda, lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgetrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_sgetrf_work( matrix_layout, m, n, a, lda, ipiv );
+    return API_SUFFIX(LAPACKE_sgetrf_work)( matrix_layout, m, n, a, lda, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_sgetrf2.c b/LAPACKE/src/lapacke_sgetrf2.c
index f320b22dbc..2866fd9f76 100644
--- a/LAPACKE/src/lapacke_sgetrf2.c
+++ b/LAPACKE/src/lapacke_sgetrf2.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgetrf2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgetrf2)( int matrix_layout, lapack_int m, lapack_int n,
                            float* a, lapack_int lda, lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgetrf2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetrf2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_sgetrf2_work( matrix_layout, m, n, a, lda, ipiv );
+    return API_SUFFIX(LAPACKE_sgetrf2_work)( matrix_layout, m, n, a, lda, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_sgetrf2_work.c b/LAPACKE/src/lapacke_sgetrf2_work.c
index 502ab66767..bad838e990 100644
--- a/LAPACKE/src/lapacke_sgetrf2_work.c
+++ b/LAPACKE/src/lapacke_sgetrf2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgetrf2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgetrf2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 float* a, lapack_int lda, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_sgetrf2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgetrf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetrf2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,23 +58,23 @@ lapack_int LAPACKE_sgetrf2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgetrf2( &m, &n, a_t, &lda_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgetrf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetrf2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgetrf2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetrf2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgetrf_work.c b/LAPACKE/src/lapacke_sgetrf_work.c
index 6d24244390..8b5b9d86c6 100644
--- a/LAPACKE/src/lapacke_sgetrf_work.c
+++ b/LAPACKE/src/lapacke_sgetrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgetrf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgetrf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 float* a, lapack_int lda, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_sgetrf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sgetrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,23 +58,23 @@ lapack_int LAPACKE_sgetrf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgetrf( &m, &n, a_t, &lda_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgetrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgetrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgetri.c b/LAPACKE/src/lapacke_sgetri.c
index 128bf92a27..cd6d2f4ba6 100644
--- a/LAPACKE/src/lapacke_sgetri.c
+++ b/LAPACKE/src/lapacke_sgetri.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgetri( int matrix_layout, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_sgetri)( int matrix_layout, lapack_int n, float* a,
                            lapack_int lda, const lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_sgetri( int matrix_layout, lapack_int n, float* a,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgetri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -3;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgetri_work( matrix_layout, n, a, lda, ipiv, &work_query,
+    info = API_SUFFIX(LAPACKE_sgetri_work)( matrix_layout, n, a, lda, ipiv, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,12 +65,12 @@ lapack_int LAPACKE_sgetri( int matrix_layout, lapack_int n, float* a,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgetri_work( matrix_layout, n, a, lda, ipiv, work, lwork );
+    info = API_SUFFIX(LAPACKE_sgetri_work)( matrix_layout, n, a, lda, ipiv, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgetri", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetri", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgetri_work.c b/LAPACKE/src/lapacke_sgetri_work.c
index b1f1d18cba..cc5a1446e3 100644
--- a/LAPACKE/src/lapacke_sgetri_work.c
+++ b/LAPACKE/src/lapacke_sgetri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgetri_work( int matrix_layout, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_sgetri_work)( int matrix_layout, lapack_int n, float* a,
                                 lapack_int lda, const lapack_int* ipiv,
                                 float* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_sgetri_work( int matrix_layout, lapack_int n, float* a,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -4;
-            LAPACKE_xerbla( "LAPACKE_sgetri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetri_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_sgetri_work( int matrix_layout, lapack_int n, float* a,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgetri( &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgetri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgetri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgetrs.c b/LAPACKE/src/lapacke_sgetrs.c
index 20595db6d7..4388ac0663 100644
--- a/LAPACKE/src/lapacke_sgetrs.c
+++ b/LAPACKE/src/lapacke_sgetrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgetrs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgetrs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int nrhs, const float* a, lapack_int lda,
                            const lapack_int* ipiv, float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgetrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_sgetrs_work( matrix_layout, trans, n, nrhs, a, lda, ipiv, b,
+    return API_SUFFIX(LAPACKE_sgetrs_work)( matrix_layout, trans, n, nrhs, a, lda, ipiv, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_sgetrs_work.c b/LAPACKE/src/lapacke_sgetrs_work.c
index 0917f344d6..ef59c4393c 100644
--- a/LAPACKE/src/lapacke_sgetrs_work.c
+++ b/LAPACKE/src/lapacke_sgetrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgetrs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgetrs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int nrhs, const float* a, lapack_int lda,
                                 const lapack_int* ipiv, float* b,
                                 lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_sgetrs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sgetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sgetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,8 +72,8 @@ lapack_int LAPACKE_sgetrs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgetrs( &trans, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                        &info );
@@ -81,18 +81,18 @@ lapack_int LAPACKE_sgetrs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgetrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgetsls.c b/LAPACKE/src/lapacke_sgetsls.c
index 72be1c7ee6..b1f9958d21 100644
--- a/LAPACKE/src/lapacke_sgetsls.c
+++ b/LAPACKE/src/lapacke_sgetsls.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgetsls( int matrix_layout, char trans, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_sgetsls)( int matrix_layout, char trans, lapack_int m,
                           lapack_int n, lapack_int nrhs, float* a,
                           lapack_int lda, float* b, lapack_int ldb )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_sgetsls( int matrix_layout, char trans, lapack_int m,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgetsls", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetsls", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgetsls_work( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_sgetsls_work)( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
                                &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_sgetsls( int matrix_layout, char trans, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgetsls_work( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_sgetsls_work)( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
                                work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgetsls", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetsls", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgetsls_work.c b/LAPACKE/src/lapacke_sgetsls_work.c
index 49a79fd757..253135fe43 100644
--- a/LAPACKE/src/lapacke_sgetsls_work.c
+++ b/LAPACKE/src/lapacke_sgetsls_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgetsls_work( int matrix_layout, char trans, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_sgetsls_work)( int matrix_layout, char trans, lapack_int m,
                                lapack_int n, lapack_int nrhs, float* a,
                                lapack_int lda, float* b, lapack_int ldb,
                                float* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_sgetsls_work( int matrix_layout, char trans, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sgetsls_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetsls_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sgetsls_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetsls_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_sgetsls_work( int matrix_layout, char trans, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgetsls( &trans, &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -88,8 +88,8 @@ lapack_int LAPACKE_sgetsls_work( int matrix_layout, char trans, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -97,11 +97,11 @@ lapack_int LAPACKE_sgetsls_work( int matrix_layout, char trans, lapack_int m,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgetsls_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetsls_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgetsls_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetsls_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgetsqrhrt.c b/LAPACKE/src/lapacke_sgetsqrhrt.c
index 759afce485..069e2a7c7c 100644
--- a/LAPACKE/src/lapacke_sgetsqrhrt.c
+++ b/LAPACKE/src/lapacke_sgetsqrhrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgetsqrhrt( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgetsqrhrt)( int matrix_layout, lapack_int m, lapack_int n,
                                lapack_int mb1, lapack_int nb1, lapack_int nb2,
                                float* a, lapack_int lda,
                                float* t, lapack_int ldt )
@@ -42,19 +42,19 @@ lapack_int LAPACKE_sgetsqrhrt( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgetsqrhrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetsqrhrt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgetsqrhrt_work( matrix_layout, m, n, mb1, nb1, nb2,
+    info = API_SUFFIX(LAPACKE_sgetsqrhrt_work)( matrix_layout, m, n, mb1, nb1, nb2,
                                     a, lda, t, ldt, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_sgetsqrhrt( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgetsqrhrt_work( matrix_layout, m, n, mb1, nb1, nb2,
+    info = API_SUFFIX(LAPACKE_sgetsqrhrt_work)( matrix_layout, m, n, mb1, nb1, nb2,
                                     a, lda, t, ldt, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgetsqrhrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetsqrhrt", info );
     }
     return info;
 }
\ No newline at end of file
diff --git a/LAPACKE/src/lapacke_sgetsqrhrt_work.c b/LAPACKE/src/lapacke_sgetsqrhrt_work.c
index 40193008d5..1c1b316430 100644
--- a/LAPACKE/src/lapacke_sgetsqrhrt_work.c
+++ b/LAPACKE/src/lapacke_sgetsqrhrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgetsqrhrt_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgetsqrhrt_work)( int matrix_layout, lapack_int m, lapack_int n,
                                     lapack_int mb1, lapack_int nb1, lapack_int nb2,
                                     float* a, lapack_int lda,
                                     float* t, lapack_int ldt,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_sgetsqrhrt_work( int matrix_layout, lapack_int m, lapack_int
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgetsqrhrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetsqrhrt_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sgetsqrhrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetsqrhrt_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -80,7 +80,7 @@ lapack_int LAPACKE_sgetsqrhrt_work( int matrix_layout, lapack_int m, lapack_int
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgetsqrhrt( &m, &n, &mb1, &nb1, &nb2, a_t, &lda_t, t_t, &ldt_t,
                            work, &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_sgetsqrhrt_work( int matrix_layout, lapack_int m, lapack_int
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nb2, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nb2, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgetsqrhrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetsqrhrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgetsqrhrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgetsqrhrt_work", info );
     }
     return info;
 }
\ No newline at end of file
diff --git a/LAPACKE/src/lapacke_sggbak.c b/LAPACKE/src/lapacke_sggbak.c
index ecc079c60e..1dd606118c 100644
--- a/LAPACKE/src/lapacke_sggbak.c
+++ b/LAPACKE/src/lapacke_sggbak.c
@@ -32,29 +32,29 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggbak( int matrix_layout, char job, char side, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sggbak)( int matrix_layout, char job, char side, lapack_int n,
                            lapack_int ilo, lapack_int ihi, const float* lscale,
                            const float* rscale, lapack_int m, float* v,
                            lapack_int ldv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sggbak", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggbak", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, lscale, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, lscale, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( n, rscale, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, rscale, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, m, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, m, v, ldv ) ) {
             return -10;
         }
     }
 #endif
-    return LAPACKE_sggbak_work( matrix_layout, job, side, n, ilo, ihi, lscale,
+    return API_SUFFIX(LAPACKE_sggbak_work)( matrix_layout, job, side, n, ilo, ihi, lscale,
                                 rscale, m, v, ldv );
 }
diff --git a/LAPACKE/src/lapacke_sggbak_work.c b/LAPACKE/src/lapacke_sggbak_work.c
index 9b53851047..a78009615c 100644
--- a/LAPACKE/src/lapacke_sggbak_work.c
+++ b/LAPACKE/src/lapacke_sggbak_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggbak_work( int matrix_layout, char job, char side,
+lapack_int API_SUFFIX(LAPACKE_sggbak_work)( int matrix_layout, char job, char side,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 const float* lscale, const float* rscale,
                                 lapack_int m, float* v, lapack_int ldv )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_sggbak_work( int matrix_layout, char job, char side,
         /* Check leading dimension(s) */
         if( ldv < m ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sggbak_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggbak_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_sggbak_work( int matrix_layout, char job, char side,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, m, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, m, v, ldv, v_t, ldv_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sggbak( &job, &side, &n, &ilo, &ihi, lscale, rscale, &m, v_t,
                        &ldv_t, &info );
@@ -69,16 +69,16 @@ lapack_int LAPACKE_sggbak_work( int matrix_layout, char job, char side,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, m, v_t, ldv_t, v, ldv );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, m, v_t, ldv_t, v, ldv );
         /* Release memory and exit */
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sggbak_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggbak_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sggbak_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggbak_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggbal.c b/LAPACKE/src/lapacke_sggbal.c
index 6f82a94154..3e355f19b8 100644
--- a/LAPACKE/src/lapacke_sggbal.c
+++ b/LAPACKE/src/lapacke_sggbal.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggbal( int matrix_layout, char job, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_sggbal)( int matrix_layout, char job, lapack_int n, float* a,
                            lapack_int lda, float* b, lapack_int ldb,
                            lapack_int* ilo, lapack_int* ihi, float* lscale,
                            float* rscale )
@@ -42,28 +42,28 @@ lapack_int LAPACKE_sggbal( int matrix_layout, char job, lapack_int n, float* a,
     lapack_int lwork;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sggbal", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggbal", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
                 return -4;
             }
         }
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
                 return -6;
             }
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( job, 's' ) || LAPACKE_lsame( job, 'b' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 's' ) || API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
         lwork = MAX(1,6*n);
     } else {
         lwork = 1;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_sggbal( int matrix_layout, char job, lapack_int n, float* a,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sggbal_work( matrix_layout, job, n, a, lda, b, ldb, ilo, ihi,
+    info = API_SUFFIX(LAPACKE_sggbal_work)( matrix_layout, job, n, a, lda, b, ldb, ilo, ihi,
                                 lscale, rscale, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sggbal", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggbal", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggbal_work.c b/LAPACKE/src/lapacke_sggbal_work.c
index e425e95b29..e224b53086 100644
--- a/LAPACKE/src/lapacke_sggbal_work.c
+++ b/LAPACKE/src/lapacke_sggbal_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggbal_work( int matrix_layout, char job, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sggbal_work)( int matrix_layout, char job, lapack_int n,
                                 float* a, lapack_int lda, float* b,
                                 lapack_int ldb, lapack_int* ilo,
                                 lapack_int* ihi, float* lscale, float* rscale,
@@ -54,25 +54,25 @@ lapack_int LAPACKE_sggbal_work( int matrix_layout, char job, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sggbal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggbal_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sggbal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggbal_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
             a_t = (float*)LAPACKE_malloc( sizeof(float) * lda_t * MAX(1,n) );
             if( a_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_0;
             }
         }
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
             b_t = (float*)LAPACKE_malloc( sizeof(float) * ldb_t * MAX(1,n) );
             if( b_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -80,13 +80,13 @@ lapack_int LAPACKE_sggbal_work( int matrix_layout, char job, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         }
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_sggbal( &job, &n, a_t, &lda_t, b_t, &ldb_t, ilo, ihi, lscale,
@@ -95,31 +95,31 @@ lapack_int LAPACKE_sggbal_work( int matrix_layout, char job, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
             LAPACKE_free( b_t );
         }
 exit_level_1:
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
             LAPACKE_free( a_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sggbal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggbal_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sggbal_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggbal_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgges.c b/LAPACKE/src/lapacke_sgges.c
index 478df5000d..06459652d9 100644
--- a/LAPACKE/src/lapacke_sgges.c
+++ b/LAPACKE/src/lapacke_sgges.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgges( int matrix_layout, char jobvsl, char jobvsr, char sort,
+lapack_int API_SUFFIX(LAPACKE_sgges)( int matrix_layout, char jobvsl, char jobvsr, char sort,
                           LAPACK_S_SELECT3 selctg, lapack_int n, float* a,
                           lapack_int lda, float* b, lapack_int ldb,
                           lapack_int* sdim, float* alphar, float* alphai,
@@ -45,22 +45,22 @@ lapack_int LAPACKE_sgges( int matrix_layout, char jobvsl, char jobvsr, char sort
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgges", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgges", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -69,7 +69,7 @@ lapack_int LAPACKE_sgges( int matrix_layout, char jobvsl, char jobvsr, char sort
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgges_work( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
+    info = API_SUFFIX(LAPACKE_sgges_work)( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
                                lda, b, ldb, sdim, alphar, alphai, beta, vsl,
                                ldvsl, vsr, ldvsr, &work_query, lwork, bwork );
     if( info != 0 ) {
@@ -83,18 +83,18 @@ lapack_int LAPACKE_sgges( int matrix_layout, char jobvsl, char jobvsr, char sort
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgges_work( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
+    info = API_SUFFIX(LAPACKE_sgges_work)( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
                                lda, b, ldb, sdim, alphar, alphai, beta, vsl,
                                ldvsl, vsr, ldvsr, work, lwork, bwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgges", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgges", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgges3.c b/LAPACKE/src/lapacke_sgges3.c
index 24450034c6..80f8dfbf8f 100644
--- a/LAPACKE/src/lapacke_sgges3.c
+++ b/LAPACKE/src/lapacke_sgges3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgges3( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_sgges3)( int matrix_layout, char jobvsl, char jobvsr,
                            char sort, LAPACK_S_SELECT3 selctg, lapack_int n,
                            float* a, lapack_int lda, float* b, lapack_int ldb,
                            lapack_int* sdim, float* alphar, float* alphai,
@@ -45,22 +45,22 @@ lapack_int LAPACKE_sgges3( int matrix_layout, char jobvsl, char jobvsr,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgges3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgges3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -69,7 +69,7 @@ lapack_int LAPACKE_sgges3( int matrix_layout, char jobvsl, char jobvsr,
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgges3_work( matrix_layout, jobvsl, jobvsr, sort, selctg, n,
+    info = API_SUFFIX(LAPACKE_sgges3_work)( matrix_layout, jobvsl, jobvsr, sort, selctg, n,
                                 a, lda, b, ldb, sdim, alphar, alphai, beta, vsl,
                                 ldvsl, vsr, ldvsr, &work_query, lwork, bwork );
     if( info != 0 ) {
@@ -83,18 +83,18 @@ lapack_int LAPACKE_sgges3( int matrix_layout, char jobvsl, char jobvsr,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgges3_work( matrix_layout, jobvsl, jobvsr, sort, selctg, n,
+    info = API_SUFFIX(LAPACKE_sgges3_work)( matrix_layout, jobvsl, jobvsr, sort, selctg, n,
                                 a, lda, b, ldb, sdim, alphar, alphai, beta, vsl,
                                 ldvsl, vsr, ldvsr, work, lwork, bwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgges3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgges3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgges3_work.c b/LAPACKE/src/lapacke_sgges3_work.c
index a06adc087b..aebeb06b33 100644
--- a/LAPACKE/src/lapacke_sgges3_work.c
+++ b/LAPACKE/src/lapacke_sgges3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgges3_work( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_sgges3_work)( int matrix_layout, char jobvsl, char jobvsr,
                                 char sort, LAPACK_S_SELECT3 selctg,
                                 lapack_int n, float* a, lapack_int lda,
                                 float* b, lapack_int ldb, lapack_int* sdim,
@@ -63,22 +63,22 @@ lapack_int LAPACKE_sgges3_work( int matrix_layout, char jobvsl, char jobvsr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgges3_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgges3_work", info );
             return info;
         }
         if( ldvsl < n ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_sgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgges3_work", info );
             return info;
         }
         if( ldvsr < n ) {
             info = -18;
-            LAPACKE_xerbla( "LAPACKE_sgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgges3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -99,7 +99,7 @@ lapack_int LAPACKE_sgges3_work( int matrix_layout, char jobvsl, char jobvsr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             vsl_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldvsl_t * MAX(1,n) );
             if( vsl_t == NULL ) {
@@ -107,7 +107,7 @@ lapack_int LAPACKE_sgges3_work( int matrix_layout, char jobvsl, char jobvsr,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             vsr_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldvsr_t * MAX(1,n) );
             if( vsr_t == NULL ) {
@@ -116,8 +116,8 @@ lapack_int LAPACKE_sgges3_work( int matrix_layout, char jobvsl, char jobvsr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgges3( &jobvsl, &jobvsr, &sort, selctg, &n, a_t, &lda_t, b_t,
                        &ldb_t, sdim, alphar, alphai, beta, vsl_t, &ldvsl_t,
@@ -126,22 +126,22 @@ lapack_int LAPACKE_sgges3_work( int matrix_layout, char jobvsl, char jobvsr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
                                ldvsl );
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
                                ldvsr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             LAPACKE_free( vsr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             LAPACKE_free( vsl_t );
         }
 exit_level_2:
@@ -150,11 +150,11 @@ lapack_int LAPACKE_sgges3_work( int matrix_layout, char jobvsl, char jobvsr,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgges3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgges3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgges3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgges_work.c b/LAPACKE/src/lapacke_sgges_work.c
index a3b09de300..d5427754d3 100644
--- a/LAPACKE/src/lapacke_sgges_work.c
+++ b/LAPACKE/src/lapacke_sgges_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgges_work( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_sgges_work)( int matrix_layout, char jobvsl, char jobvsr,
                                char sort, LAPACK_S_SELECT3 selctg, lapack_int n,
                                float* a, lapack_int lda, float* b,
                                lapack_int ldb, lapack_int* sdim, float* alphar,
@@ -62,22 +62,22 @@ lapack_int LAPACKE_sgges_work( int matrix_layout, char jobvsl, char jobvsr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgges_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgges_work", info );
             return info;
         }
-        if( ldvsl < n ) {
+        if( ldvsl < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) && ldvsl < n ) ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_sgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgges_work", info );
             return info;
         }
-        if( ldvsr < n ) {
+        if( ldvsr < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) && ldvsr < n ) ) {
             info = -18;
-            LAPACKE_xerbla( "LAPACKE_sgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgges_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_sgges_work( int matrix_layout, char jobvsl, char jobvsr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             vsl_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldvsl_t * MAX(1,n) );
             if( vsl_t == NULL ) {
@@ -106,7 +106,7 @@ lapack_int LAPACKE_sgges_work( int matrix_layout, char jobvsl, char jobvsr,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             vsr_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldvsr_t * MAX(1,n) );
             if( vsr_t == NULL ) {
@@ -115,8 +115,8 @@ lapack_int LAPACKE_sgges_work( int matrix_layout, char jobvsl, char jobvsr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgges( &jobvsl, &jobvsr, &sort, selctg, &n, a_t, &lda_t, b_t,
                       &ldb_t, sdim, alphar, alphai, beta, vsl_t, &ldvsl_t,
@@ -125,22 +125,22 @@ lapack_int LAPACKE_sgges_work( int matrix_layout, char jobvsl, char jobvsr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
                                ldvsl );
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
                                ldvsr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             LAPACKE_free( vsr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             LAPACKE_free( vsl_t );
         }
 exit_level_2:
@@ -149,11 +149,11 @@ lapack_int LAPACKE_sgges_work( int matrix_layout, char jobvsl, char jobvsr,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgges_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgges_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgges_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggesx.c b/LAPACKE/src/lapacke_sggesx.c
index 4caf461e9f..eda07fa88c 100644
--- a/LAPACKE/src/lapacke_sggesx.c
+++ b/LAPACKE/src/lapacke_sggesx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggesx( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_sggesx)( int matrix_layout, char jobvsl, char jobvsr,
                            char sort, LAPACK_S_SELECT3 selctg, char sense,
                            lapack_int n, float* a, lapack_int lda, float* b,
                            lapack_int ldb, lapack_int* sdim, float* alphar,
@@ -49,22 +49,22 @@ lapack_int LAPACKE_sggesx( int matrix_layout, char jobvsl, char jobvsr,
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sggesx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggesx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -10;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -73,7 +73,7 @@ lapack_int LAPACKE_sggesx( int matrix_layout, char jobvsl, char jobvsr,
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_sggesx_work( matrix_layout, jobvsl, jobvsr, sort, selctg,
+    info = API_SUFFIX(LAPACKE_sggesx_work)( matrix_layout, jobvsl, jobvsr, sort, selctg,
                                 sense, n, a, lda, b, ldb, sdim, alphar, alphai,
                                 beta, vsl, ldvsl, vsr, ldvsr, rconde, rcondv,
                                 &work_query, lwork, &iwork_query, liwork,
@@ -95,7 +95,7 @@ lapack_int LAPACKE_sggesx( int matrix_layout, char jobvsl, char jobvsr,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sggesx_work( matrix_layout, jobvsl, jobvsr, sort, selctg,
+    info = API_SUFFIX(LAPACKE_sggesx_work)( matrix_layout, jobvsl, jobvsr, sort, selctg,
                                 sense, n, a, lda, b, ldb, sdim, alphar, alphai,
                                 beta, vsl, ldvsl, vsr, ldvsr, rconde, rcondv,
                                 work, lwork, iwork, liwork, bwork );
@@ -104,12 +104,12 @@ lapack_int LAPACKE_sggesx( int matrix_layout, char jobvsl, char jobvsr,
 exit_level_2:
     LAPACKE_free( iwork );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sggesx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggesx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggesx_work.c b/LAPACKE/src/lapacke_sggesx_work.c
index d3927e525d..49c2036db7 100644
--- a/LAPACKE/src/lapacke_sggesx_work.c
+++ b/LAPACKE/src/lapacke_sggesx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggesx_work( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_sggesx_work)( int matrix_layout, char jobvsl, char jobvsr,
                                 char sort, LAPACK_S_SELECT3 selctg, char sense,
                                 lapack_int n, float* a, lapack_int lda,
                                 float* b, lapack_int ldb, lapack_int* sdim,
@@ -65,22 +65,22 @@ lapack_int LAPACKE_sggesx_work( int matrix_layout, char jobvsl, char jobvsr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggesx_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggesx_work", info );
             return info;
         }
-        if( ldvsl < n ) {
+        if( ldvsl < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) && ldvsl < n ) ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_sggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggesx_work", info );
             return info;
         }
-        if( ldvsr < n ) {
+        if( ldvsr < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) && ldvsr < n ) ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_sggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggesx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_sggesx_work( int matrix_layout, char jobvsl, char jobvsr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             vsl_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldvsl_t * MAX(1,n) );
             if( vsl_t == NULL ) {
@@ -110,7 +110,7 @@ lapack_int LAPACKE_sggesx_work( int matrix_layout, char jobvsl, char jobvsr,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             vsr_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldvsr_t * MAX(1,n) );
             if( vsr_t == NULL ) {
@@ -119,8 +119,8 @@ lapack_int LAPACKE_sggesx_work( int matrix_layout, char jobvsl, char jobvsr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sggesx( &jobvsl, &jobvsr, &sort, selctg, &sense, &n, a_t, &lda_t,
                        b_t, &ldb_t, sdim, alphar, alphai, beta, vsl_t, &ldvsl_t,
@@ -130,22 +130,22 @@ lapack_int LAPACKE_sggesx_work( int matrix_layout, char jobvsl, char jobvsr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
                                ldvsl );
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
                                ldvsr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             LAPACKE_free( vsr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             LAPACKE_free( vsl_t );
         }
 exit_level_2:
@@ -154,11 +154,11 @@ lapack_int LAPACKE_sggesx_work( int matrix_layout, char jobvsl, char jobvsr,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggesx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sggesx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggesx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggev.c b/LAPACKE/src/lapacke_sggev.c
index c7ed5d569f..dbe5891fc5 100644
--- a/LAPACKE/src/lapacke_sggev.c
+++ b/LAPACKE/src/lapacke_sggev.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggev( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_sggev)( int matrix_layout, char jobvl, char jobvr,
                           lapack_int n, float* a, lapack_int lda, float* b,
                           lapack_int ldb, float* alphar, float* alphai,
                           float* beta, float* vl, lapack_int ldvl, float* vr,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_sggev( int matrix_layout, char jobvl, char jobvr,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sggev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sggev_work( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_sggev_work)( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
                                alphar, alphai, beta, vl, ldvl, vr, ldvr,
                                &work_query, lwork );
     if( info != 0 ) {
@@ -72,14 +72,14 @@ lapack_int LAPACKE_sggev( int matrix_layout, char jobvl, char jobvr,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sggev_work( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_sggev_work)( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
                                alphar, alphai, beta, vl, ldvl, vr, ldvr, work,
                                lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sggev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggev3.c b/LAPACKE/src/lapacke_sggev3.c
index 1ac2a364bb..d0d1b45bdb 100644
--- a/LAPACKE/src/lapacke_sggev3.c
+++ b/LAPACKE/src/lapacke_sggev3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggev3( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_sggev3)( int matrix_layout, char jobvl, char jobvr,
                            lapack_int n, float* a, lapack_int lda, float* b,
                            lapack_int ldb, float* alphar, float* alphai,
                            float* beta, float* vl, lapack_int ldvl, float* vr,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_sggev3( int matrix_layout, char jobvl, char jobvr,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sggev3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggev3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sggev3_work( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_sggev3_work)( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
                                 alphar, alphai, beta, vl, ldvl, vr, ldvr,
                                 &work_query, lwork );
     if( info != 0 ) {
@@ -72,14 +72,14 @@ lapack_int LAPACKE_sggev3( int matrix_layout, char jobvl, char jobvr,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sggev3_work( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_sggev3_work)( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
                                 alphar, alphai, beta, vl, ldvl, vr, ldvr, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sggev3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggev3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggev3_work.c b/LAPACKE/src/lapacke_sggev3_work.c
index aa61dabd94..c4c569809f 100644
--- a/LAPACKE/src/lapacke_sggev3_work.c
+++ b/LAPACKE/src/lapacke_sggev3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggev3_work( int matrix_layout,
+lapack_int API_SUFFIX(LAPACKE_sggev3_work)( int matrix_layout,
                                 char jobvl, char jobvr, lapack_int n,
                                 float* a, lapack_int lda,
                                 float* b, lapack_int ldb,
@@ -50,10 +50,10 @@ lapack_int LAPACKE_sggev3_work( int matrix_layout,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_vl = LAPACKE_lsame( jobvl, 'v' ) ? n : 1;
-        lapack_int ncols_vl = LAPACKE_lsame( jobvl, 'v' ) ? n : 1;
-        lapack_int nrows_vr = LAPACKE_lsame( jobvr, 'v' ) ? n : 1;
-        lapack_int ncols_vr = LAPACKE_lsame( jobvr, 'v' ) ? n : 1;
+        lapack_int nrows_vl = API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ? n : 1;
+        lapack_int ncols_vl = API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ? n : 1;
+        lapack_int nrows_vr = API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ? n : 1;
+        lapack_int ncols_vr = API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ? n : 1;
         lapack_int lda_t = MAX(1,n);
         lapack_int ldb_t = MAX(1,n);
         lapack_int ldvl_t = MAX(1,nrows_vl);
@@ -65,22 +65,22 @@ lapack_int LAPACKE_sggev3_work( int matrix_layout,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggev3_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggev3_work", info );
             return info;
         }
         if( ldvl < ncols_vl ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_sggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggev3_work", info );
             return info;
         }
         if( ldvr < ncols_vr ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_sggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggev3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -101,7 +101,7 @@ lapack_int LAPACKE_sggev3_work( int matrix_layout,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldvl_t * MAX(1,ncols_vl) );
             if( vl_t == NULL ) {
@@ -109,7 +109,7 @@ lapack_int LAPACKE_sggev3_work( int matrix_layout,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldvr_t * MAX(1,ncols_vr) );
             if( vr_t == NULL ) {
@@ -118,8 +118,8 @@ lapack_int LAPACKE_sggev3_work( int matrix_layout,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sggev3( &jobvl, &jobvr, &n, a_t, &lda_t, b_t, &ldb_t, alphar,
                        alphai, beta, vl_t, &ldvl_t, vr_t, &ldvr_t,
@@ -128,22 +128,22 @@ lapack_int LAPACKE_sggev3_work( int matrix_layout,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_vl, ncols_vl, vl_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_vl, ncols_vl, vl_t,
                                ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_vr, ncols_vr, vr_t,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_vr, ncols_vr, vr_t,
                                ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -152,11 +152,11 @@ lapack_int LAPACKE_sggev3_work( int matrix_layout,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggev3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sggev3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggev3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggev_work.c b/LAPACKE/src/lapacke_sggev_work.c
index 6417694408..bb1d078cab 100644
--- a/LAPACKE/src/lapacke_sggev_work.c
+++ b/LAPACKE/src/lapacke_sggev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggev_work( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_sggev_work)( int matrix_layout, char jobvl, char jobvr,
                                lapack_int n, float* a, lapack_int lda, float* b,
                                lapack_int ldb, float* alphar, float* alphai,
                                float* beta, float* vl, lapack_int ldvl,
@@ -48,10 +48,10 @@ lapack_int LAPACKE_sggev_work( int matrix_layout, char jobvl, char jobvr,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_vl = LAPACKE_lsame( jobvl, 'v' ) ? n : 1;
-        lapack_int ncols_vl = LAPACKE_lsame( jobvl, 'v' ) ? n : 1;
-        lapack_int nrows_vr = LAPACKE_lsame( jobvr, 'v' ) ? n : 1;
-        lapack_int ncols_vr = LAPACKE_lsame( jobvr, 'v' ) ? n : 1;
+        lapack_int nrows_vl = API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ? n : 1;
+        lapack_int ncols_vl = API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ? n : 1;
+        lapack_int nrows_vr = API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ? n : 1;
+        lapack_int ncols_vr = API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ? n : 1;
         lapack_int lda_t = MAX(1,n);
         lapack_int ldb_t = MAX(1,n);
         lapack_int ldvl_t = MAX(1,nrows_vl);
@@ -63,22 +63,22 @@ lapack_int LAPACKE_sggev_work( int matrix_layout, char jobvl, char jobvr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggev_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggev_work", info );
             return info;
         }
         if( ldvl < ncols_vl ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_sggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggev_work", info );
             return info;
         }
         if( ldvr < ncols_vr ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_sggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggev_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -99,7 +99,7 @@ lapack_int LAPACKE_sggev_work( int matrix_layout, char jobvl, char jobvr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldvl_t * MAX(1,ncols_vl) );
             if( vl_t == NULL ) {
@@ -107,7 +107,7 @@ lapack_int LAPACKE_sggev_work( int matrix_layout, char jobvl, char jobvr,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldvr_t * MAX(1,ncols_vr) );
             if( vr_t == NULL ) {
@@ -116,8 +116,8 @@ lapack_int LAPACKE_sggev_work( int matrix_layout, char jobvl, char jobvr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sggev( &jobvl, &jobvr, &n, a_t, &lda_t, b_t, &ldb_t, alphar,
                       alphai, beta, vl_t, &ldvl_t, vr_t, &ldvr_t, work, &lwork,
@@ -126,22 +126,22 @@ lapack_int LAPACKE_sggev_work( int matrix_layout, char jobvl, char jobvr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_vl, ncols_vl, vl_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_vl, ncols_vl, vl_t,
                                ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_vr, ncols_vr, vr_t,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_vr, ncols_vr, vr_t,
                                ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -150,11 +150,11 @@ lapack_int LAPACKE_sggev_work( int matrix_layout, char jobvl, char jobvr,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sggev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggevx.c b/LAPACKE/src/lapacke_sggevx.c
index f40f7e3409..9b076aa76c 100644
--- a/LAPACKE/src/lapacke_sggevx.c
+++ b/LAPACKE/src/lapacke_sggevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggevx( int matrix_layout, char balanc, char jobvl,
+lapack_int API_SUFFIX(LAPACKE_sggevx)( int matrix_layout, char balanc, char jobvl,
                            char jobvr, char sense, lapack_int n, float* a,
                            lapack_int lda, float* b, lapack_int ldb,
                            float* alphar, float* alphai, float* beta, float* vl,
@@ -48,23 +48,23 @@ lapack_int LAPACKE_sggevx( int matrix_layout, char balanc, char jobvl,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sggevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'e' ) ||
-        LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'e' ) ||
+        API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -72,8 +72,8 @@ lapack_int LAPACKE_sggevx( int matrix_layout, char balanc, char jobvl,
             goto exit_level_0;
         }
     }
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'n' ) ||
-        LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'n' ) ||
+        API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * MAX(1,n+6) );
         if( iwork == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -81,7 +81,7 @@ lapack_int LAPACKE_sggevx( int matrix_layout, char balanc, char jobvl,
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_sggevx_work( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
+    info = API_SUFFIX(LAPACKE_sggevx_work)( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
                                 lda, b, ldb, alphar, alphai, beta, vl, ldvl, vr,
                                 ldvr, ilo, ihi, lscale, rscale, abnrm, bbnrm,
                                 rconde, rcondv, &work_query, lwork, iwork,
@@ -97,25 +97,25 @@ lapack_int LAPACKE_sggevx( int matrix_layout, char balanc, char jobvl,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sggevx_work( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
+    info = API_SUFFIX(LAPACKE_sggevx_work)( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
                                 lda, b, ldb, alphar, alphai, beta, vl, ldvl, vr,
                                 ldvr, ilo, ihi, lscale, rscale, abnrm, bbnrm,
                                 rconde, rcondv, work, lwork, iwork, bwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_2:
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'n' ) ||
-        LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'n' ) ||
+        API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         LAPACKE_free( iwork );
     }
 exit_level_1:
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'e' ) ||
-        LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'e' ) ||
+        API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sggevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggevx_work.c b/LAPACKE/src/lapacke_sggevx_work.c
index 054509abee..ad8ec922f7 100644
--- a/LAPACKE/src/lapacke_sggevx_work.c
+++ b/LAPACKE/src/lapacke_sggevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggevx_work( int matrix_layout, char balanc, char jobvl,
+lapack_int API_SUFFIX(LAPACKE_sggevx_work)( int matrix_layout, char balanc, char jobvl,
                                 char jobvr, char sense, lapack_int n, float* a,
                                 lapack_int lda, float* b, lapack_int ldb,
                                 float* alphar, float* alphai, float* beta,
@@ -65,22 +65,22 @@ lapack_int LAPACKE_sggevx_work( int matrix_layout, char balanc, char jobvl,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggevx_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggevx_work", info );
             return info;
         }
         if( ldvl < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_sggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggevx_work", info );
             return info;
         }
         if( ldvr < n ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_sggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggevx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -102,14 +102,14 @@ lapack_int LAPACKE_sggevx_work( int matrix_layout, char balanc, char jobvl,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (float*)LAPACKE_malloc( sizeof(float) * ldvl_t * MAX(1,n) );
             if( vl_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (float*)LAPACKE_malloc( sizeof(float) * ldvr_t * MAX(1,n) );
             if( vr_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -117,8 +117,8 @@ lapack_int LAPACKE_sggevx_work( int matrix_layout, char balanc, char jobvl,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sggevx( &balanc, &jobvl, &jobvr, &sense, &n, a_t, &lda_t, b_t,
                        &ldb_t, alphar, alphai, beta, vl_t, &ldvl_t, vr_t,
@@ -128,20 +128,20 @@ lapack_int LAPACKE_sggevx_work( int matrix_layout, char balanc, char jobvl,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -150,11 +150,11 @@ lapack_int LAPACKE_sggevx_work( int matrix_layout, char balanc, char jobvl,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sggevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggglm.c b/LAPACKE/src/lapacke_sggglm.c
index 073ed25d1b..906afc9fe9 100644
--- a/LAPACKE/src/lapacke_sggglm.c
+++ b/LAPACKE/src/lapacke_sggglm.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggglm( int matrix_layout, lapack_int n, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_sggglm)( int matrix_layout, lapack_int n, lapack_int m,
                            lapack_int p, float* a, lapack_int lda, float* b,
                            lapack_int ldb, float* d, float* x, float* y )
 {
@@ -41,25 +41,25 @@ lapack_int LAPACKE_sggglm( int matrix_layout, lapack_int n, lapack_int m,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sggglm", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggglm", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, m, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, p, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, p, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sggglm_work( matrix_layout, n, m, p, a, lda, b, ldb, d, x, y,
+    info = API_SUFFIX(LAPACKE_sggglm_work)( matrix_layout, n, m, p, a, lda, b, ldb, d, x, y,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -72,13 +72,13 @@ lapack_int LAPACKE_sggglm( int matrix_layout, lapack_int n, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sggglm_work( matrix_layout, n, m, p, a, lda, b, ldb, d, x, y,
+    info = API_SUFFIX(LAPACKE_sggglm_work)( matrix_layout, n, m, p, a, lda, b, ldb, d, x, y,
                                 work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sggglm", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggglm", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggglm_work.c b/LAPACKE/src/lapacke_sggglm_work.c
index 17342e32ce..286a139556 100644
--- a/LAPACKE/src/lapacke_sggglm_work.c
+++ b/LAPACKE/src/lapacke_sggglm_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggglm_work( int matrix_layout, lapack_int n, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_sggglm_work)( int matrix_layout, lapack_int n, lapack_int m,
                                 lapack_int p, float* a, lapack_int lda,
                                 float* b, lapack_int ldb, float* d, float* x,
                                 float* y, float* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_sggglm_work( int matrix_layout, lapack_int n, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sggglm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggglm_work", info );
             return info;
         }
         if( ldb < p ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sggglm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggglm_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_sggglm_work( int matrix_layout, lapack_int n, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, m, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, p, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, p, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sggglm( &n, &m, &p, a_t, &lda_t, b_t, &ldb_t, d, x, y, work,
                        &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_sggglm_work( int matrix_layout, lapack_int n, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, m, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, p, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, m, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, p, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sggglm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggglm_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sggglm_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggglm_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgghd3.c b/LAPACKE/src/lapacke_sgghd3.c
index 96e8252f0e..cb1173466f 100644
--- a/LAPACKE/src/lapacke_sgghd3.c
+++ b/LAPACKE/src/lapacke_sgghd3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgghd3( int matrix_layout, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_sgghd3)( int matrix_layout, char compq, char compz,
                            lapack_int n, lapack_int ilo, lapack_int ihi,
                            float* a, lapack_int lda, float* b, lapack_int ldb,
                            float* q, lapack_int ldq, float* z, lapack_int ldz )
@@ -42,32 +42,32 @@ lapack_int LAPACKE_sgghd3( int matrix_layout, char compq, char compz,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgghd3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgghd3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -13;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgghd3_work( matrix_layout, compq, compz, n, ilo, ihi,
+    info = API_SUFFIX(LAPACKE_sgghd3_work)( matrix_layout, compq, compz, n, ilo, ihi,
                                 a, lda, b, ldb, q, ldq, z, ldz, &work_query,
                                 lwork );
     if( info != 0 ) {
@@ -81,13 +81,13 @@ lapack_int LAPACKE_sgghd3( int matrix_layout, char compq, char compz,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgghd3_work( matrix_layout, compq, compz, n, ilo, ihi,
+    info = API_SUFFIX(LAPACKE_sgghd3_work)( matrix_layout, compq, compz, n, ilo, ihi,
                                 a, lda, b, ldb, q, ldq, z, ldz, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgghd3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgghd3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgghd3_work.c b/LAPACKE/src/lapacke_sgghd3_work.c
index 7edaa7f224..b06a231989 100644
--- a/LAPACKE/src/lapacke_sgghd3_work.c
+++ b/LAPACKE/src/lapacke_sgghd3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgghd3_work( int matrix_layout, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_sgghd3_work)( int matrix_layout, char compq, char compz,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 float* a, lapack_int lda, float* b,
                                 lapack_int ldb, float* q, lapack_int ldq,
@@ -65,22 +65,22 @@ lapack_int LAPACKE_sgghd3_work( int matrix_layout, char compq, char compz,
     /* Check leading dimension(s) */
     if( lda < n ) {
       info = -8;
-      LAPACKE_xerbla( "LAPACKE_sgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgghd3_work", info );
       return info;
     }
     if( ldb < n ) {
       info = -10;
-      LAPACKE_xerbla( "LAPACKE_sgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgghd3_work", info );
       return info;
     }
     if( ldq < n ) {
       info = -12;
-      LAPACKE_xerbla( "LAPACKE_sgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgghd3_work", info );
       return info;
     }
     if( ldz < n ) {
       info = -14;
-      LAPACKE_xerbla( "LAPACKE_sgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgghd3_work", info );
       return info;
     }
     /* Allocate memory for temporary array(s) */
@@ -94,14 +94,14 @@ lapack_int LAPACKE_sgghd3_work( int matrix_layout, char compq, char compz,
       info = LAPACK_TRANSPOSE_MEMORY_ERROR;
       goto exit_level_1;
     }
-    if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
       q_t = (float*)LAPACKE_malloc( sizeof(float) * ldq_t * MAX(1,n) );
       if( q_t == NULL ) {
         info = LAPACK_TRANSPOSE_MEMORY_ERROR;
         goto exit_level_2;
       }
     }
-    if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
       z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
       if( z_t == NULL ) {
         info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -109,13 +109,13 @@ lapack_int LAPACKE_sgghd3_work( int matrix_layout, char compq, char compz,
       }
     }
     /* Transpose input matrices */
-    LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-    LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-    if( LAPACKE_lsame( compq, 'v' ) ) {
-      LAPACKE_sge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+    API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+    API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+      API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
     }
-    if( LAPACKE_lsame( compz, 'v' ) ) {
-      LAPACKE_sge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+      API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
     }
     /* Call LAPACK function and adjust info */
     LAPACK_sgghd3( &compq, &compz, &n, &ilo, &ihi, a_t, &lda_t, b_t, &ldb_t,
@@ -124,20 +124,20 @@ lapack_int LAPACKE_sgghd3_work( int matrix_layout, char compq, char compz,
       info = info - 1;
     }
     /* Transpose output matrices */
-    LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-    LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-    if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-      LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+    API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+    API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+      API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
     }
-    if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-      LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+      API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
     }
     /* Release memory and exit */
-    if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
       LAPACKE_free( z_t );
     }
   exit_level_3:
-    if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
       LAPACKE_free( q_t );
     }
   exit_level_2:
@@ -146,11 +146,11 @@ lapack_int LAPACKE_sgghd3_work( int matrix_layout, char compq, char compz,
     LAPACKE_free( a_t );
   exit_level_0:
     if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-      LAPACKE_xerbla( "LAPACKE_sgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgghd3_work", info );
     }
   } else {
     info = -1;
-    LAPACKE_xerbla( "LAPACKE_sgghd3_work", info );
+    API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgghd3_work", info );
   }
   return info;
 }
diff --git a/LAPACKE/src/lapacke_sgghrd.c b/LAPACKE/src/lapacke_sgghrd.c
index 7f09e4e6e0..469942c675 100644
--- a/LAPACKE/src/lapacke_sgghrd.c
+++ b/LAPACKE/src/lapacke_sgghrd.c
@@ -32,36 +32,36 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgghrd( int matrix_layout, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_sgghrd)( int matrix_layout, char compq, char compz,
                            lapack_int n, lapack_int ilo, lapack_int ihi,
                            float* a, lapack_int lda, float* b, lapack_int ldb,
                            float* q, lapack_int ldq, float* z, lapack_int ldz )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgghrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgghrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -13;
             }
         }
     }
 #endif
-    return LAPACKE_sgghrd_work( matrix_layout, compq, compz, n, ilo, ihi, a, lda,
+    return API_SUFFIX(LAPACKE_sgghrd_work)( matrix_layout, compq, compz, n, ilo, ihi, a, lda,
                                 b, ldb, q, ldq, z, ldz );
 }
diff --git a/LAPACKE/src/lapacke_sgghrd_work.c b/LAPACKE/src/lapacke_sgghrd_work.c
index d770b5d6fe..608e8aa962 100644
--- a/LAPACKE/src/lapacke_sgghrd_work.c
+++ b/LAPACKE/src/lapacke_sgghrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgghrd_work( int matrix_layout, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_sgghrd_work)( int matrix_layout, char compq, char compz,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 float* a, lapack_int lda, float* b,
                                 lapack_int ldb, float* q, lapack_int ldq,
@@ -58,22 +58,22 @@ lapack_int LAPACKE_sgghrd_work( int matrix_layout, char compq, char compz,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgghrd_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgghrd_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_sgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgghrd_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_sgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgghrd_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -87,14 +87,14 @@ lapack_int LAPACKE_sgghrd_work( int matrix_layout, char compq, char compz,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             q_t = (float*)LAPACKE_malloc( sizeof(float) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -102,13 +102,13 @@ lapack_int LAPACKE_sgghrd_work( int matrix_layout, char compq, char compz,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_sgghrd( &compq, &compz, &n, &ilo, &ihi, a_t, &lda_t, b_t, &ldb_t,
@@ -117,20 +117,20 @@ lapack_int LAPACKE_sgghrd_work( int matrix_layout, char compq, char compz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_2:
@@ -139,11 +139,11 @@ lapack_int LAPACKE_sgghrd_work( int matrix_layout, char compq, char compz,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgghrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgghrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgghrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgglse.c b/LAPACKE/src/lapacke_sgglse.c
index df26412536..e854f4fc53 100644
--- a/LAPACKE/src/lapacke_sgglse.c
+++ b/LAPACKE/src/lapacke_sgglse.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgglse( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgglse)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int p, float* a, lapack_int lda, float* b,
                            lapack_int ldb, float* c, float* d, float* x )
 {
@@ -41,28 +41,28 @@ lapack_int LAPACKE_sgglse( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgglse", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgglse", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( m, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( m, c, 1 ) ) {
             return -9;
         }
-        if( LAPACKE_s_nancheck( p, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( p, d, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sgglse_work( matrix_layout, m, n, p, a, lda, b, ldb, c, d, x,
+    info = API_SUFFIX(LAPACKE_sgglse_work)( matrix_layout, m, n, p, a, lda, b, ldb, c, d, x,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_sgglse( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgglse_work( matrix_layout, m, n, p, a, lda, b, ldb, c, d, x,
+    info = API_SUFFIX(LAPACKE_sgglse_work)( matrix_layout, m, n, p, a, lda, b, ldb, c, d, x,
                                 work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgglse", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgglse", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgglse_work.c b/LAPACKE/src/lapacke_sgglse_work.c
index ed7322af93..72bd76b516 100644
--- a/LAPACKE/src/lapacke_sgglse_work.c
+++ b/LAPACKE/src/lapacke_sgglse_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgglse_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgglse_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int p, float* a, lapack_int lda,
                                 float* b, lapack_int ldb, float* c, float* d,
                                 float* x, float* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_sgglse_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sgglse_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgglse_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgglse_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgglse_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_sgglse_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgglse( &m, &n, &p, a_t, &lda_t, b_t, &ldb_t, c, d, x, work,
                        &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_sgglse_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgglse_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgglse_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgglse_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgglse_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggqrf.c b/LAPACKE/src/lapacke_sggqrf.c
index 1a0136379d..39fdad6444 100644
--- a/LAPACKE/src/lapacke_sggqrf.c
+++ b/LAPACKE/src/lapacke_sggqrf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggqrf( int matrix_layout, lapack_int n, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_sggqrf)( int matrix_layout, lapack_int n, lapack_int m,
                            lapack_int p, float* a, lapack_int lda, float* taua,
                            float* b, lapack_int ldb, float* taub )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_sggqrf( int matrix_layout, lapack_int n, lapack_int m,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sggqrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggqrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, m, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, p, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, p, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sggqrf_work( matrix_layout, n, m, p, a, lda, taua, b, ldb,
+    info = API_SUFFIX(LAPACKE_sggqrf_work)( matrix_layout, n, m, p, a, lda, taua, b, ldb,
                                 taub, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_sggqrf( int matrix_layout, lapack_int n, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sggqrf_work( matrix_layout, n, m, p, a, lda, taua, b, ldb,
+    info = API_SUFFIX(LAPACKE_sggqrf_work)( matrix_layout, n, m, p, a, lda, taua, b, ldb,
                                 taub, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sggqrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggqrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggqrf_work.c b/LAPACKE/src/lapacke_sggqrf_work.c
index d15cee195f..c37171e156 100644
--- a/LAPACKE/src/lapacke_sggqrf_work.c
+++ b/LAPACKE/src/lapacke_sggqrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggqrf_work( int matrix_layout, lapack_int n, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_sggqrf_work)( int matrix_layout, lapack_int n, lapack_int m,
                                 lapack_int p, float* a, lapack_int lda,
                                 float* taua, float* b, lapack_int ldb,
                                 float* taub, float* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_sggqrf_work( int matrix_layout, lapack_int n, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sggqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggqrf_work", info );
             return info;
         }
         if( ldb < p ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sggqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggqrf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_sggqrf_work( int matrix_layout, lapack_int n, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, m, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, p, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, p, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sggqrf( &n, &m, &p, a_t, &lda_t, taua, b_t, &ldb_t, taub, work,
                        &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_sggqrf_work( int matrix_layout, lapack_int n, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, m, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, p, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, m, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, p, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sggqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggqrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sggqrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggqrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggrqf.c b/LAPACKE/src/lapacke_sggrqf.c
index b3a20202ff..f35c499096 100644
--- a/LAPACKE/src/lapacke_sggrqf.c
+++ b/LAPACKE/src/lapacke_sggrqf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggrqf( int matrix_layout, lapack_int m, lapack_int p,
+lapack_int API_SUFFIX(LAPACKE_sggrqf)( int matrix_layout, lapack_int m, lapack_int p,
                            lapack_int n, float* a, lapack_int lda, float* taua,
                            float* b, lapack_int ldb, float* taub )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_sggrqf( int matrix_layout, lapack_int m, lapack_int p,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sggrqf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggrqf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sggrqf_work( matrix_layout, m, p, n, a, lda, taua, b, ldb,
+    info = API_SUFFIX(LAPACKE_sggrqf_work)( matrix_layout, m, p, n, a, lda, taua, b, ldb,
                                 taub, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_sggrqf( int matrix_layout, lapack_int m, lapack_int p,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sggrqf_work( matrix_layout, m, p, n, a, lda, taua, b, ldb,
+    info = API_SUFFIX(LAPACKE_sggrqf_work)( matrix_layout, m, p, n, a, lda, taua, b, ldb,
                                 taub, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sggrqf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggrqf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggrqf_work.c b/LAPACKE/src/lapacke_sggrqf_work.c
index d151c93db7..2b357745c6 100644
--- a/LAPACKE/src/lapacke_sggrqf_work.c
+++ b/LAPACKE/src/lapacke_sggrqf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggrqf_work( int matrix_layout, lapack_int m, lapack_int p,
+lapack_int API_SUFFIX(LAPACKE_sggrqf_work)( int matrix_layout, lapack_int m, lapack_int p,
                                 lapack_int n, float* a, lapack_int lda,
                                 float* taua, float* b, lapack_int ldb,
                                 float* taub, float* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_sggrqf_work( int matrix_layout, lapack_int m, lapack_int p,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sggrqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggrqf_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sggrqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggrqf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_sggrqf_work( int matrix_layout, lapack_int m, lapack_int p,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sggrqf( &m, &p, &n, a_t, &lda_t, taua, b_t, &ldb_t, taub, work,
                        &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_sggrqf_work( int matrix_layout, lapack_int m, lapack_int p,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sggrqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggrqf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sggrqf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggrqf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggsvd.c b/LAPACKE/src/lapacke_sggsvd.c
index e416c85394..3156bfee22 100644
--- a/LAPACKE/src/lapacke_sggsvd.c
+++ b/LAPACKE/src/lapacke_sggsvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggsvd( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_sggsvd)( int matrix_layout, char jobu, char jobv, char jobq,
                            lapack_int m, lapack_int n, lapack_int p,
                            lapack_int* k, lapack_int* l, float* a,
                            lapack_int lda, float* b, lapack_int ldb,
@@ -43,16 +43,16 @@ lapack_int LAPACKE_sggsvd( int matrix_layout, char jobu, char jobv, char jobq,
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sggsvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -10;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -12;
         }
     }
@@ -64,14 +64,14 @@ lapack_int LAPACKE_sggsvd( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sggsvd_work( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
+    info = API_SUFFIX(LAPACKE_sggsvd_work)( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
                                 a, lda, b, ldb, alpha, beta, u, ldu, v, ldv, q,
                                 ldq, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sggsvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggsvd3.c b/LAPACKE/src/lapacke_sggsvd3.c
index e602ed1b91..39304d287d 100644
--- a/LAPACKE/src/lapacke_sggsvd3.c
+++ b/LAPACKE/src/lapacke_sggsvd3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggsvd3( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_sggsvd3)( int matrix_layout, char jobu, char jobv, char jobq,
                             lapack_int m, lapack_int n, lapack_int p,
                             lapack_int* k, lapack_int* l, float* a,
                             lapack_int lda, float* b, lapack_int ldb,
@@ -45,22 +45,22 @@ lapack_int LAPACKE_sggsvd3( int matrix_layout, char jobu, char jobv, char jobq,
     lapack_int lwork = -1;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sggsvd3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -10;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -12;
         }
     }
 #endif
     /* Query optimal working array(s) size if requested */
-    info = LAPACKE_sggsvd3_work( matrix_layout, jobu, jobv, jobq, m, n, p,
+    info = API_SUFFIX(LAPACKE_sggsvd3_work)( matrix_layout, jobu, jobv, jobq, m, n, p,
                                  k, l, a, lda, b, ldb, alpha, beta, u, ldu,
                                  v, ldv, q, ldq, &work_query, lwork, iwork );
     if( info != 0 )
@@ -73,14 +73,14 @@ lapack_int LAPACKE_sggsvd3( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sggsvd3_work( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
+    info = API_SUFFIX(LAPACKE_sggsvd3_work)( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
                                  a, lda, b, ldb, alpha, beta, u, ldu, v, ldv, q,
                                  ldq, work, lwork, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sggsvd3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggsvd3_work.c b/LAPACKE/src/lapacke_sggsvd3_work.c
index aec1f1eac5..63026e5b04 100644
--- a/LAPACKE/src/lapacke_sggsvd3_work.c
+++ b/LAPACKE/src/lapacke_sggsvd3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggsvd3_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_sggsvd3_work)( int matrix_layout, char jobu, char jobv,
                                  char jobq, lapack_int m, lapack_int n,
                                  lapack_int p, lapack_int* k, lapack_int* l,
                                  float* a, lapack_int lda, float* b,
@@ -65,27 +65,27 @@ lapack_int LAPACKE_sggsvd3_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd3_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_sggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd3_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_sggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd3_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_sggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd3_work", info );
             return info;
         }
         if( ldv < p ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_sggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -107,21 +107,21 @@ lapack_int LAPACKE_sggsvd3_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (float*)LAPACKE_malloc( sizeof(float) * ldu_t * MAX(1,m) );
             if( u_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (float*)LAPACKE_malloc( sizeof(float) * ldv_t * MAX(1,p) );
             if( v_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (float*)LAPACKE_malloc( sizeof(float) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -129,8 +129,8 @@ lapack_int LAPACKE_sggsvd3_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sggsvd3( &jobu, &jobv, &jobq, &m, &n, &p, k, l, a_t, &lda_t, b_t,
                         &ldb_t, alpha, beta, u_t, &ldu_t, v_t, &ldv_t, q_t,
@@ -139,27 +139,27 @@ lapack_int LAPACKE_sggsvd3_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -168,11 +168,11 @@ lapack_int LAPACKE_sggsvd3_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sggsvd3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggsvd_work.c b/LAPACKE/src/lapacke_sggsvd_work.c
index b5805bb4d3..353bef114d 100644
--- a/LAPACKE/src/lapacke_sggsvd_work.c
+++ b/LAPACKE/src/lapacke_sggsvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggsvd_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_sggsvd_work)( int matrix_layout, char jobu, char jobv,
                                 char jobq, lapack_int m, lapack_int n,
                                 lapack_int p, lapack_int* k, lapack_int* l,
                                 float* a, lapack_int lda, float* b,
@@ -64,27 +64,27 @@ lapack_int LAPACKE_sggsvd_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_sggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_sggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_sggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd_work", info );
             return info;
         }
         if( ldv < p ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_sggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -98,21 +98,21 @@ lapack_int LAPACKE_sggsvd_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (float*)LAPACKE_malloc( sizeof(float) * ldu_t * MAX(1,m) );
             if( u_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (float*)LAPACKE_malloc( sizeof(float) * ldv_t * MAX(1,p) );
             if( v_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (float*)LAPACKE_malloc( sizeof(float) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -120,8 +120,8 @@ lapack_int LAPACKE_sggsvd_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sggsvd( &jobu, &jobv, &jobq, &m, &n, &p, k, l, a_t, &lda_t, b_t,
                        &ldb_t, alpha, beta, u_t, &ldu_t, v_t, &ldv_t, q_t,
@@ -130,27 +130,27 @@ lapack_int LAPACKE_sggsvd_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -159,11 +159,11 @@ lapack_int LAPACKE_sggsvd_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sggsvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggsvp.c b/LAPACKE/src/lapacke_sggsvp.c
index a5607a139f..e85f15042d 100644
--- a/LAPACKE/src/lapacke_sggsvp.c
+++ b/LAPACKE/src/lapacke_sggsvp.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggsvp( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_sggsvp)( int matrix_layout, char jobu, char jobv, char jobq,
                            lapack_int m, lapack_int p, lapack_int n, float* a,
                            lapack_int lda, float* b, lapack_int ldb, float tola,
                            float tolb, lapack_int* k, lapack_int* l, float* u,
@@ -44,22 +44,22 @@ lapack_int LAPACKE_sggsvp( int matrix_layout, char jobu, char jobv, char jobq,
     float* tau = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sggsvp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_s_nancheck( 1, &tola, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &tola, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_s_nancheck( 1, &tolb, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &tolb, 1 ) ) {
             return -13;
         }
     }
@@ -81,7 +81,7 @@ lapack_int LAPACKE_sggsvp( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sggsvp_work( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
+    info = API_SUFFIX(LAPACKE_sggsvp_work)( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
                                 b, ldb, tola, tolb, k, l, u, ldu, v, ldv, q,
                                 ldq, iwork, tau, work );
     /* Release memory and exit */
@@ -92,7 +92,7 @@ lapack_int LAPACKE_sggsvp( int matrix_layout, char jobu, char jobv, char jobq,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sggsvp", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggsvp3.c b/LAPACKE/src/lapacke_sggsvp3.c
index 475b57dd67..90a8a6ee7f 100644
--- a/LAPACKE/src/lapacke_sggsvp3.c
+++ b/LAPACKE/src/lapacke_sggsvp3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggsvp3( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_sggsvp3)( int matrix_layout, char jobu, char jobv, char jobq,
                             lapack_int m, lapack_int p, lapack_int n, float* a,
                             lapack_int lda, float* b, lapack_int ldb, float tola,
                             float tolb, lapack_int* k, lapack_int* l, float* u,
@@ -46,28 +46,28 @@ lapack_int LAPACKE_sggsvp3( int matrix_layout, char jobu, char jobv, char jobq,
     lapack_int lwork = -1;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sggsvp3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_s_nancheck( 1, &tola, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &tola, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_s_nancheck( 1, &tolb, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &tolb, 1 ) ) {
             return -13;
         }
     }
 #endif
     /* Query optimal size for working array */
-    info = LAPACKE_sggsvp3_work( matrix_layout, jobu, jobv, jobq, m, p, n,
+    info = API_SUFFIX(LAPACKE_sggsvp3_work)( matrix_layout, jobu, jobv, jobq, m, p, n,
                                  a, lda, b, ldb, tola, tolb, k, l, u, ldu,
                                  v, ldv, q, ldq, iwork, tau, &work_query,
                                  lwork );
@@ -91,7 +91,7 @@ lapack_int LAPACKE_sggsvp3( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sggsvp3_work( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
+    info = API_SUFFIX(LAPACKE_sggsvp3_work)( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
                                  b, ldb, tola, tolb, k, l, u, ldu, v, ldv, q,
                                  ldq, iwork, tau, work, lwork );
     /* Release memory and exit */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_sggsvp3( int matrix_layout, char jobu, char jobv, char jobq,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sggsvp3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggsvp3_work.c b/LAPACKE/src/lapacke_sggsvp3_work.c
index 97707ede1e..49b1b79416 100644
--- a/LAPACKE/src/lapacke_sggsvp3_work.c
+++ b/LAPACKE/src/lapacke_sggsvp3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggsvp3_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_sggsvp3_work)( int matrix_layout, char jobu, char jobv,
                                  char jobq, lapack_int m, lapack_int p,
                                  lapack_int n, float* a, lapack_int lda,
                                  float* b, lapack_int ldb, float tola,
@@ -65,27 +65,27 @@ lapack_int LAPACKE_sggsvp3_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp3_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp3_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_sggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp3_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_sggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp3_work", info );
             return info;
         }
         if( ldv < p ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_sggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -107,21 +107,21 @@ lapack_int LAPACKE_sggsvp3_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (float*)LAPACKE_malloc( sizeof(float) * ldu_t * MAX(1,m) );
             if( u_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (float*)LAPACKE_malloc( sizeof(float) * ldv_t * MAX(1,p) );
             if( v_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (float*)LAPACKE_malloc( sizeof(float) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -129,8 +129,8 @@ lapack_int LAPACKE_sggsvp3_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sggsvp3( &jobu, &jobv, &jobq, &m, &p, &n, a_t, &lda_t, b_t,
                         &ldb_t, &tola, &tolb, k, l, u_t, &ldu_t, v_t, &ldv_t,
@@ -139,27 +139,27 @@ lapack_int LAPACKE_sggsvp3_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -168,11 +168,11 @@ lapack_int LAPACKE_sggsvp3_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sggsvp3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sggsvp_work.c b/LAPACKE/src/lapacke_sggsvp_work.c
index 1fcde307bf..3c0f740154 100644
--- a/LAPACKE/src/lapacke_sggsvp_work.c
+++ b/LAPACKE/src/lapacke_sggsvp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sggsvp_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_sggsvp_work)( int matrix_layout, char jobu, char jobv,
                                 char jobq, lapack_int m, lapack_int p,
                                 lapack_int n, float* a, lapack_int lda,
                                 float* b, lapack_int ldb, float tola,
@@ -64,27 +64,27 @@ lapack_int LAPACKE_sggsvp_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_sggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_sggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp_work", info );
             return info;
         }
         if( ldv < m ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_sggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -98,21 +98,21 @@ lapack_int LAPACKE_sggsvp_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (float*)LAPACKE_malloc( sizeof(float) * ldu_t * MAX(1,m) );
             if( u_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (float*)LAPACKE_malloc( sizeof(float) * ldv_t * MAX(1,m) );
             if( v_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (float*)LAPACKE_malloc( sizeof(float) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -120,8 +120,8 @@ lapack_int LAPACKE_sggsvp_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sggsvp( &jobu, &jobv, &jobq, &m, &p, &n, a_t, &lda_t, b_t,
                        &ldb_t, &tola, &tolb, k, l, u_t, &ldu_t, v_t, &ldv_t,
@@ -130,27 +130,27 @@ lapack_int LAPACKE_sggsvp_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, p, m, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, p, m, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -159,11 +159,11 @@ lapack_int LAPACKE_sggsvp_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sggsvp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sggsvp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgtcon.c b/LAPACKE/src/lapacke_sgtcon.c
index d851cc857b..3bd5871c7c 100644
--- a/LAPACKE/src/lapacke_sgtcon.c
+++ b/LAPACKE/src/lapacke_sgtcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgtcon( char norm, lapack_int n, const float* dl,
+lapack_int API_SUFFIX(LAPACKE_sgtcon)( char norm, lapack_int n, const float* dl,
                            const float* d, const float* du, const float* du2,
                            const lapack_int* ipiv, float anorm, float* rcond )
 {
@@ -42,19 +42,19 @@ lapack_int LAPACKE_sgtcon( char norm, lapack_int n, const float* dl,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, dl, 1 ) ) {
             return -3;
         }
-        if( LAPACKE_s_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, du, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( n-2, du2, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-2, du2, 1 ) ) {
             return -6;
         }
     }
@@ -71,7 +71,7 @@ lapack_int LAPACKE_sgtcon( char norm, lapack_int n, const float* dl,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgtcon_work( norm, n, dl, d, du, du2, ipiv, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_sgtcon_work)( norm, n, dl, d, du, du2, ipiv, anorm, rcond,
                                 work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -79,7 +79,7 @@ lapack_int LAPACKE_sgtcon( char norm, lapack_int n, const float* dl,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgtcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgtcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgtcon_work.c b/LAPACKE/src/lapacke_sgtcon_work.c
index 157aec3db4..5e444b8ab2 100644
--- a/LAPACKE/src/lapacke_sgtcon_work.c
+++ b/LAPACKE/src/lapacke_sgtcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgtcon_work( char norm, lapack_int n, const float* dl,
+lapack_int API_SUFFIX(LAPACKE_sgtcon_work)( char norm, lapack_int n, const float* dl,
                                 const float* d, const float* du,
                                 const float* du2, const lapack_int* ipiv,
                                 float anorm, float* rcond, float* work,
diff --git a/LAPACKE/src/lapacke_sgtrfs.c b/LAPACKE/src/lapacke_sgtrfs.c
index 13bcc61e85..a1954fe670 100644
--- a/LAPACKE/src/lapacke_sgtrfs.c
+++ b/LAPACKE/src/lapacke_sgtrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgtrfs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgtrfs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int nrhs, const float* dl, const float* d,
                            const float* du, const float* dlf, const float* df,
                            const float* duf, const float* du2,
@@ -44,37 +44,37 @@ lapack_int LAPACKE_sgtrfs( int matrix_layout, char trans, lapack_int n,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgtrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgtrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( n, df, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, df, 1 ) ) {
             return -9;
         }
-        if( LAPACKE_s_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, dl, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( n-1, dlf, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, dlf, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_s_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, du, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( n-2, du2, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-2, du2, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_s_nancheck( n-1, duf, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, duf, 1 ) ) {
             return -10;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -15;
         }
     }
@@ -91,7 +91,7 @@ lapack_int LAPACKE_sgtrfs( int matrix_layout, char trans, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgtrfs_work( matrix_layout, trans, n, nrhs, dl, d, du, dlf,
+    info = API_SUFFIX(LAPACKE_sgtrfs_work)( matrix_layout, trans, n, nrhs, dl, d, du, dlf,
                                 df, duf, du2, ipiv, b, ldb, x, ldx, ferr, berr,
                                 work, iwork );
     /* Release memory and exit */
@@ -100,7 +100,7 @@ lapack_int LAPACKE_sgtrfs( int matrix_layout, char trans, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgtrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgtrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgtrfs_work.c b/LAPACKE/src/lapacke_sgtrfs_work.c
index ced9f2c67b..756bc52b82 100644
--- a/LAPACKE/src/lapacke_sgtrfs_work.c
+++ b/LAPACKE/src/lapacke_sgtrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgtrfs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgtrfs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int nrhs, const float* dl,
                                 const float* d, const float* du,
                                 const float* dlf, const float* df,
@@ -58,12 +58,12 @@ lapack_int LAPACKE_sgtrfs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_sgtrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgtrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_sgtrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgtrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -78,8 +78,8 @@ lapack_int LAPACKE_sgtrfs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgtrfs( &trans, &n, &nrhs, dl, d, du, dlf, df, duf, du2, ipiv,
                        b_t, &ldb_t, x_t, &ldx_t, ferr, berr, work, iwork,
@@ -88,18 +88,18 @@ lapack_int LAPACKE_sgtrfs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgtrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgtrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgtrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgtrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgtsv.c b/LAPACKE/src/lapacke_sgtsv.c
index 41a4408896..41f34806bc 100644
--- a/LAPACKE/src/lapacke_sgtsv.c
+++ b/LAPACKE/src/lapacke_sgtsv.c
@@ -32,30 +32,30 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgtsv( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_sgtsv)( int matrix_layout, lapack_int n, lapack_int nrhs,
                           float* dl, float* d, float* du, float* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgtsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgtsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, dl, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, du, 1 ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_sgtsv_work( matrix_layout, n, nrhs, dl, d, du, b, ldb );
+    return API_SUFFIX(LAPACKE_sgtsv_work)( matrix_layout, n, nrhs, dl, d, du, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_sgtsv_work.c b/LAPACKE/src/lapacke_sgtsv_work.c
index b2f8473e72..ca38061d7d 100644
--- a/LAPACKE/src/lapacke_sgtsv_work.c
+++ b/LAPACKE/src/lapacke_sgtsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgtsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_sgtsv_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                float* dl, float* d, float* du, float* b,
                                lapack_int ldb )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_sgtsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sgtsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgtsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_sgtsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgtsv( &n, &nrhs, dl, d, du, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgtsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgtsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgtsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgtsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgtsvx.c b/LAPACKE/src/lapacke_sgtsvx.c
index 2050b62923..8335b4878a 100644
--- a/LAPACKE/src/lapacke_sgtsvx.c
+++ b/LAPACKE/src/lapacke_sgtsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgtsvx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_sgtsvx)( int matrix_layout, char fact, char trans,
                            lapack_int n, lapack_int nrhs, const float* dl,
                            const float* d, const float* du, float* dlf,
                            float* df, float* duf, float* du2, lapack_int* ipiv,
@@ -44,41 +44,41 @@ lapack_int LAPACKE_sgtsvx( int matrix_layout, char fact, char trans,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgtsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgtsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -14;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_s_nancheck( n, df, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, df, 1 ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_s_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, dl, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_s_nancheck( n-1, dlf, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, dlf, 1 ) ) {
                 return -9;
             }
         }
-        if( LAPACKE_s_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, du, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_s_nancheck( n-2, du2, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n-2, du2, 1 ) ) {
                 return -12;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_s_nancheck( n-1, duf, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, duf, 1 ) ) {
                 return -11;
             }
         }
@@ -96,7 +96,7 @@ lapack_int LAPACKE_sgtsvx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sgtsvx_work( matrix_layout, fact, trans, n, nrhs, dl, d, du,
+    info = API_SUFFIX(LAPACKE_sgtsvx_work)( matrix_layout, fact, trans, n, nrhs, dl, d, du,
                                 dlf, df, duf, du2, ipiv, b, ldb, x, ldx, rcond,
                                 ferr, berr, work, iwork );
     /* Release memory and exit */
@@ -105,7 +105,7 @@ lapack_int LAPACKE_sgtsvx( int matrix_layout, char fact, char trans,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sgtsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgtsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgtsvx_work.c b/LAPACKE/src/lapacke_sgtsvx_work.c
index acc72ef82c..305210850c 100644
--- a/LAPACKE/src/lapacke_sgtsvx_work.c
+++ b/LAPACKE/src/lapacke_sgtsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgtsvx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_sgtsvx_work)( int matrix_layout, char fact, char trans,
                                 lapack_int n, lapack_int nrhs, const float* dl,
                                 const float* d, const float* du, float* dlf,
                                 float* df, float* duf, float* du2,
@@ -58,12 +58,12 @@ lapack_int LAPACKE_sgtsvx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_sgtsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgtsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_sgtsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgtsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -78,7 +78,7 @@ lapack_int LAPACKE_sgtsvx_work( int matrix_layout, char fact, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgtsvx( &fact, &trans, &n, &nrhs, dl, d, du, dlf, df, duf, du2,
                        ipiv, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr, berr, work,
@@ -87,18 +87,18 @@ lapack_int LAPACKE_sgtsvx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgtsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgtsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgtsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgtsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sgttrf.c b/LAPACKE/src/lapacke_sgttrf.c
index 17aa36e9ed..ad33ad2b53 100644
--- a/LAPACKE/src/lapacke_sgttrf.c
+++ b/LAPACKE/src/lapacke_sgttrf.c
@@ -32,22 +32,22 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgttrf( lapack_int n, float* dl, float* d, float* du,
+lapack_int API_SUFFIX(LAPACKE_sgttrf)( lapack_int n, float* dl, float* d, float* du,
                            float* du2, lapack_int* ipiv )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -3;
         }
-        if( LAPACKE_s_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, dl, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_s_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, du, 1 ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_sgttrf_work( n, dl, d, du, du2, ipiv );
+    return API_SUFFIX(LAPACKE_sgttrf_work)( n, dl, d, du, du2, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_sgttrf_work.c b/LAPACKE/src/lapacke_sgttrf_work.c
index 0e9e573f5a..48cd98b6ff 100644
--- a/LAPACKE/src/lapacke_sgttrf_work.c
+++ b/LAPACKE/src/lapacke_sgttrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgttrf_work( lapack_int n, float* dl, float* d, float* du,
+lapack_int API_SUFFIX(LAPACKE_sgttrf_work)( lapack_int n, float* dl, float* d, float* du,
                                 float* du2, lapack_int* ipiv )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_sgttrs.c b/LAPACKE/src/lapacke_sgttrs.c
index 1f7eff2572..445605d487 100644
--- a/LAPACKE/src/lapacke_sgttrs.c
+++ b/LAPACKE/src/lapacke_sgttrs.c
@@ -32,35 +32,35 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgttrs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgttrs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int nrhs, const float* dl, const float* d,
                            const float* du, const float* du2,
                            const lapack_int* ipiv, float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sgttrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgttrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, dl, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, du, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( n-2, du2, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-2, du2, 1 ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_sgttrs_work( matrix_layout, trans, n, nrhs, dl, d, du, du2,
+    return API_SUFFIX(LAPACKE_sgttrs_work)( matrix_layout, trans, n, nrhs, dl, d, du, du2,
                                 ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_sgttrs_work.c b/LAPACKE/src/lapacke_sgttrs_work.c
index 4a77cf59ff..43eb4dcb6e 100644
--- a/LAPACKE/src/lapacke_sgttrs_work.c
+++ b/LAPACKE/src/lapacke_sgttrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sgttrs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sgttrs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int nrhs, const float* dl,
                                 const float* d, const float* du,
                                 const float* du2, const lapack_int* ipiv,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_sgttrs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sgttrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgttrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -62,7 +62,7 @@ lapack_int LAPACKE_sgttrs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sgttrs( &trans, &n, &nrhs, dl, d, du, du2, ipiv, b_t, &ldb_t,
                        &info );
@@ -70,16 +70,16 @@ lapack_int LAPACKE_sgttrs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sgttrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgttrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sgttrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sgttrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_shgeqz.c b/LAPACKE/src/lapacke_shgeqz.c
index 4dbc1034e5..18d0357852 100644
--- a/LAPACKE/src/lapacke_shgeqz.c
+++ b/LAPACKE/src/lapacke_shgeqz.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_shgeqz( int matrix_layout, char job, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_shgeqz)( int matrix_layout, char job, char compq, char compz,
                            lapack_int n, lapack_int ilo, lapack_int ihi,
                            float* h, lapack_int ldh, float* t, lapack_int ldt,
                            float* alphar, float* alphai, float* beta, float* q,
@@ -43,32 +43,32 @@ lapack_int LAPACKE_shgeqz( int matrix_layout, char job, char compq, char compz,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_shgeqz", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shgeqz", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, h, ldh ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, h, ldh ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -15;
             }
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -17;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_shgeqz_work( matrix_layout, job, compq, compz, n, ilo, ihi, h,
+    info = API_SUFFIX(LAPACKE_shgeqz_work)( matrix_layout, job, compq, compz, n, ilo, ihi, h,
                                 ldh, t, ldt, alphar, alphai, beta, q, ldq, z,
                                 ldz, &work_query, lwork );
     if( info != 0 ) {
@@ -82,14 +82,14 @@ lapack_int LAPACKE_shgeqz( int matrix_layout, char job, char compq, char compz,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_shgeqz_work( matrix_layout, job, compq, compz, n, ilo, ihi, h,
+    info = API_SUFFIX(LAPACKE_shgeqz_work)( matrix_layout, job, compq, compz, n, ilo, ihi, h,
                                 ldh, t, ldt, alphar, alphai, beta, q, ldq, z,
                                 ldz, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_shgeqz", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shgeqz", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_shgeqz_work.c b/LAPACKE/src/lapacke_shgeqz_work.c
index a0f67bc245..069523ed3f 100644
--- a/LAPACKE/src/lapacke_shgeqz_work.c
+++ b/LAPACKE/src/lapacke_shgeqz_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_shgeqz_work( int matrix_layout, char job, char compq,
+lapack_int API_SUFFIX(LAPACKE_shgeqz_work)( int matrix_layout, char job, char compq,
                                 char compz, lapack_int n, lapack_int ilo,
                                 lapack_int ihi, float* h, lapack_int ldh,
                                 float* t, lapack_int ldt, float* alphar,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_shgeqz_work( int matrix_layout, char job, char compq,
         /* Check leading dimension(s) */
         if( ldh < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_shgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shgeqz_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_shgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shgeqz_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_shgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shgeqz_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -18;
-            LAPACKE_xerbla( "LAPACKE_shgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shgeqz_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -97,14 +97,14 @@ lapack_int LAPACKE_shgeqz_work( int matrix_layout, char job, char compq,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             q_t = (float*)LAPACKE_malloc( sizeof(float) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -112,13 +112,13 @@ lapack_int LAPACKE_shgeqz_work( int matrix_layout, char job, char compq,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, h, ldh, h_t, ldh_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, h, ldh, h_t, ldh_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_shgeqz( &job, &compq, &compz, &n, &ilo, &ihi, h_t, &ldh_t, t_t,
@@ -128,20 +128,20 @@ lapack_int LAPACKE_shgeqz_work( int matrix_layout, char job, char compq,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, h_t, ldh_t, h, ldh );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, h_t, ldh_t, h, ldh );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_2:
@@ -150,11 +150,11 @@ lapack_int LAPACKE_shgeqz_work( int matrix_layout, char job, char compq,
         LAPACKE_free( h_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_shgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shgeqz_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_shgeqz_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shgeqz_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_shsein.c b/LAPACKE/src/lapacke_shsein.c
index 6b4fd25718..ee1852debd 100644
--- a/LAPACKE/src/lapacke_shsein.c
+++ b/LAPACKE/src/lapacke_shsein.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_shsein( int matrix_layout, char job, char eigsrc, char initv,
+lapack_int API_SUFFIX(LAPACKE_shsein)( int matrix_layout, char job, char eigsrc, char initv,
                            lapack_logical* select, lapack_int n, const float* h,
                            lapack_int ldh, float* wr, const float* wi,
                            float* vl, lapack_int ldvl, float* vr,
@@ -42,29 +42,29 @@ lapack_int LAPACKE_shsein( int matrix_layout, char job, char eigsrc, char initv,
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_shsein", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shsein", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, h, ldh ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, h, ldh ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'l' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'l' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'r' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -13;
             }
         }
-        if( LAPACKE_s_nancheck( n, wi, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, wi, 1 ) ) {
             return -10;
         }
-        if( LAPACKE_s_nancheck( n, wr, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, wr, 1 ) ) {
             return -9;
         }
     }
@@ -76,14 +76,14 @@ lapack_int LAPACKE_shsein( int matrix_layout, char job, char eigsrc, char initv,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_shsein_work( matrix_layout, job, eigsrc, initv, select, n, h,
+    info = API_SUFFIX(LAPACKE_shsein_work)( matrix_layout, job, eigsrc, initv, select, n, h,
                                 ldh, wr, wi, vl, ldvl, vr, ldvr, mm, m, work,
                                 ifaill, ifailr );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_shsein", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shsein", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_shsein_work.c b/LAPACKE/src/lapacke_shsein_work.c
index 80db160dfd..e2db05fc65 100644
--- a/LAPACKE/src/lapacke_shsein_work.c
+++ b/LAPACKE/src/lapacke_shsein_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_shsein_work( int matrix_layout, char job, char eigsrc,
+lapack_int API_SUFFIX(LAPACKE_shsein_work)( int matrix_layout, char job, char eigsrc,
                                 char initv, lapack_logical* select,
                                 lapack_int n, const float* h, lapack_int ldh,
                                 float* wr, const float* wi, float* vl,
@@ -58,17 +58,17 @@ lapack_int LAPACKE_shsein_work( int matrix_layout, char job, char eigsrc,
         /* Check leading dimension(s) */
         if( ldh < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_shsein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shsein_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_shsein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shsein_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_shsein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shsein_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -77,14 +77,14 @@ lapack_int LAPACKE_shsein_work( int matrix_layout, char job, char eigsrc,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'l' ) ) {
             vl_t = (float*)LAPACKE_malloc( sizeof(float) * ldvl_t * MAX(1,mm) );
             if( vl_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'r' ) ) {
             vr_t = (float*)LAPACKE_malloc( sizeof(float) * ldvr_t * MAX(1,mm) );
             if( vr_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -92,14 +92,14 @@ lapack_int LAPACKE_shsein_work( int matrix_layout, char job, char eigsrc,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, h, ldh, h_t, ldh_t );
-        if( ( LAPACKE_lsame( job, 'l' ) || LAPACKE_lsame( job, 'b' ) ) &&
-            LAPACKE_lsame( initv, 'v' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, h, ldh, h_t, ldh_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( job, 'l' ) || API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( initv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( ( LAPACKE_lsame( job, 'r' ) || LAPACKE_lsame( job, 'b' ) ) &&
-            LAPACKE_lsame( initv, 'v' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( job, 'r' ) || API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( initv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_shsein( &job, &eigsrc, &initv, select, &n, h_t, &ldh_t, wr, wi,
@@ -109,31 +109,31 @@ lapack_int LAPACKE_shsein_work( int matrix_layout, char job, char eigsrc,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'l' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'l' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
                                ldvl );
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'r' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'r' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
                                ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'r' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'l' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( h_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_shsein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shsein_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_shsein_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shsein_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_shseqr.c b/LAPACKE/src/lapacke_shseqr.c
index 45c1b19073..8bf042c6b9 100644
--- a/LAPACKE/src/lapacke_shseqr.c
+++ b/LAPACKE/src/lapacke_shseqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_shseqr( int matrix_layout, char job, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_shseqr)( int matrix_layout, char job, char compz, lapack_int n,
                            lapack_int ilo, lapack_int ihi, float* h,
                            lapack_int ldh, float* wr, float* wi, float* z,
                            lapack_int ldz )
@@ -42,24 +42,24 @@ lapack_int LAPACKE_shseqr( int matrix_layout, char job, char compz, lapack_int n
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_shseqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shseqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, h, ldh ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, h, ldh ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -11;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_shseqr_work( matrix_layout, job, compz, n, ilo, ihi, h, ldh,
+    info = API_SUFFIX(LAPACKE_shseqr_work)( matrix_layout, job, compz, n, ilo, ihi, h, ldh,
                                 wr, wi, z, ldz, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -72,13 +72,13 @@ lapack_int LAPACKE_shseqr( int matrix_layout, char job, char compz, lapack_int n
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_shseqr_work( matrix_layout, job, compz, n, ilo, ihi, h, ldh,
+    info = API_SUFFIX(LAPACKE_shseqr_work)( matrix_layout, job, compz, n, ilo, ihi, h, ldh,
                                 wr, wi, z, ldz, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_shseqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shseqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_shseqr_work.c b/LAPACKE/src/lapacke_shseqr_work.c
index 8e964b2732..66d6acfce0 100644
--- a/LAPACKE/src/lapacke_shseqr_work.c
+++ b/LAPACKE/src/lapacke_shseqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_shseqr_work( int matrix_layout, char job, char compz,
+lapack_int API_SUFFIX(LAPACKE_shseqr_work)( int matrix_layout, char job, char compz,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 float* h, lapack_int ldh, float* wr, float* wi,
                                 float* z, lapack_int ldz, float* work,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_shseqr_work( int matrix_layout, char job, char compz,
         /* Check leading dimension(s) */
         if( ldh < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_shseqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shseqr_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_shseqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shseqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -74,7 +74,7 @@ lapack_int LAPACKE_shseqr_work( int matrix_layout, char job, char compz,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -82,9 +82,9 @@ lapack_int LAPACKE_shseqr_work( int matrix_layout, char job, char compz,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, h, ldh, h_t, ldh_t );
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, h, ldh, h_t, ldh_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_shseqr( &job, &compz, &n, &ilo, &ihi, h_t, &ldh_t, wr, wi, z_t,
@@ -93,23 +93,23 @@ lapack_int LAPACKE_shseqr_work( int matrix_layout, char job, char compz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, h_t, ldh_t, h, ldh );
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, h_t, ldh_t, h, ldh );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( h_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_shseqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shseqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_shseqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_shseqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slacn2.c b/LAPACKE/src/lapacke_slacn2.c
index 3eb1db5b1c..613223a651 100644
--- a/LAPACKE/src/lapacke_slacn2.c
+++ b/LAPACKE/src/lapacke_slacn2.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slacn2( lapack_int n, float* v, float* x, lapack_int* isgn,
+lapack_int API_SUFFIX(LAPACKE_slacn2)( lapack_int n, float* v, float* x, lapack_int* isgn,
                            float* est, lapack_int* kase, lapack_int* isave )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, est, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, est, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( n, x, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, x, 1 ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_slacn2_work( n, v, x, isgn, est, kase, isave );
+    return API_SUFFIX(LAPACKE_slacn2_work)( n, v, x, isgn, est, kase, isave );
 }
diff --git a/LAPACKE/src/lapacke_slacn2_work.c b/LAPACKE/src/lapacke_slacn2_work.c
index aa341d7996..3434e75d19 100644
--- a/LAPACKE/src/lapacke_slacn2_work.c
+++ b/LAPACKE/src/lapacke_slacn2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slacn2_work( lapack_int n, float* v, float* x,
+lapack_int API_SUFFIX(LAPACKE_slacn2_work)( lapack_int n, float* v, float* x,
                                 lapack_int* isgn, float* est, lapack_int* kase,
                                 lapack_int* isave )
 {
diff --git a/LAPACKE/src/lapacke_slacpy.c b/LAPACKE/src/lapacke_slacpy.c
index 7f6b2e8433..5fec06b49a 100644
--- a/LAPACKE/src/lapacke_slacpy.c
+++ b/LAPACKE/src/lapacke_slacpy.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slacpy( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_slacpy)( int matrix_layout, char uplo, lapack_int m,
                            lapack_int n, const float* a, lapack_int lda,
                            float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_slacpy", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slacpy", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_slacpy_work( matrix_layout, uplo, m, n, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_slacpy_work)( matrix_layout, uplo, m, n, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_slacpy_work.c b/LAPACKE/src/lapacke_slacpy_work.c
index 5f960a2922..2b4de4dfb6 100644
--- a/LAPACKE/src/lapacke_slacpy_work.c
+++ b/LAPACKE/src/lapacke_slacpy_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slacpy_work( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_slacpy_work)( int matrix_layout, char uplo, lapack_int m,
                                 lapack_int n, const float* a, lapack_int lda,
                                 float* b, lapack_int ldb )
 {
@@ -48,12 +48,12 @@ lapack_int LAPACKE_slacpy_work( int matrix_layout, char uplo, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_slacpy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slacpy_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_slacpy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slacpy_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -68,23 +68,23 @@ lapack_int LAPACKE_slacpy_work( int matrix_layout, char uplo, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_slacpy( &uplo, &m, &n, a_t, &lda_t, b_t, &ldb_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_slacpy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slacpy_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_slacpy_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slacpy_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slag2d.c b/LAPACKE/src/lapacke_slag2d.c
index 28f7ae7e06..bba691dfa8 100644
--- a/LAPACKE/src/lapacke_slag2d.c
+++ b/LAPACKE/src/lapacke_slag2d.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slag2d( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_slag2d)( int matrix_layout, lapack_int m, lapack_int n,
                            const float* sa, lapack_int ldsa, double* a,
                            lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_slag2d", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slag2d", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, sa, ldsa ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, sa, ldsa ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_slag2d_work( matrix_layout, m, n, sa, ldsa, a, lda );
+    return API_SUFFIX(LAPACKE_slag2d_work)( matrix_layout, m, n, sa, ldsa, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_slag2d_work.c b/LAPACKE/src/lapacke_slag2d_work.c
index 374df20ed4..90d86e5355 100644
--- a/LAPACKE/src/lapacke_slag2d_work.c
+++ b/LAPACKE/src/lapacke_slag2d_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slag2d_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_slag2d_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 const float* sa, lapack_int ldsa, double* a,
                                 lapack_int lda )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_slag2d_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_slag2d_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slag2d_work", info );
             return info;
         }
         if( ldsa < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_slag2d_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slag2d_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,25 +71,25 @@ lapack_int LAPACKE_slag2d_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, sa, ldsa, sa_t, ldsa_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, sa, ldsa, sa_t, ldsa_t );
         /* Call LAPACK function and adjust info */
         LAPACK_slag2d( &m, &n, sa_t, &ldsa_t, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_1:
         LAPACKE_free( sa_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_slag2d_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slag2d_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_slag2d_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slag2d_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slagge.c b/LAPACKE/src/lapacke_slagge.c
index 315b4a4ec6..9e73e4fb7b 100644
--- a/LAPACKE/src/lapacke_slagge.c
+++ b/LAPACKE/src/lapacke_slagge.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slagge( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_slagge)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int kl, lapack_int ku, const float* d,
                            float* a, lapack_int lda, lapack_int* iseed )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_slagge", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slagge", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( MIN(m,n), d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( MIN(m,n), d, 1 ) ) {
             return -6;
         }
     }
@@ -57,13 +57,13 @@ lapack_int LAPACKE_slagge( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_slagge_work( matrix_layout, m, n, kl, ku, d, a, lda, iseed,
+    info = API_SUFFIX(LAPACKE_slagge_work)( matrix_layout, m, n, kl, ku, d, a, lda, iseed,
                                 work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_slagge", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slagge", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slagge_work.c b/LAPACKE/src/lapacke_slagge_work.c
index 45c4324537..8339824c93 100644
--- a/LAPACKE/src/lapacke_slagge_work.c
+++ b/LAPACKE/src/lapacke_slagge_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slagge_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_slagge_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int kl, lapack_int ku, const float* d,
                                 float* a, lapack_int lda, lapack_int* iseed,
                                 float* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_slagge_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_slagge_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slagge_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -65,16 +65,16 @@ lapack_int LAPACKE_slagge_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_slagge_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slagge_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_slagge_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slagge_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slagsy.c b/LAPACKE/src/lapacke_slagsy.c
index d2487a7dac..8a7d8151ee 100644
--- a/LAPACKE/src/lapacke_slagsy.c
+++ b/LAPACKE/src/lapacke_slagsy.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slagsy( int matrix_layout, lapack_int n, lapack_int k,
+lapack_int API_SUFFIX(LAPACKE_slagsy)( int matrix_layout, lapack_int n, lapack_int k,
                            const float* d, float* a, lapack_int lda,
                            lapack_int* iseed )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_slagsy", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slagsy", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -4;
         }
     }
@@ -57,12 +57,12 @@ lapack_int LAPACKE_slagsy( int matrix_layout, lapack_int n, lapack_int k,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_slagsy_work( matrix_layout, n, k, d, a, lda, iseed, work );
+    info = API_SUFFIX(LAPACKE_slagsy_work)( matrix_layout, n, k, d, a, lda, iseed, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_slagsy", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slagsy", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slagsy_work.c b/LAPACKE/src/lapacke_slagsy_work.c
index 6b2c588b33..ae6da7c773 100644
--- a/LAPACKE/src/lapacke_slagsy_work.c
+++ b/LAPACKE/src/lapacke_slagsy_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slagsy_work( int matrix_layout, lapack_int n, lapack_int k,
+lapack_int API_SUFFIX(LAPACKE_slagsy_work)( int matrix_layout, lapack_int n, lapack_int k,
                                 const float* d, float* a, lapack_int lda,
                                 lapack_int* iseed, float* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_slagsy_work( int matrix_layout, lapack_int n, lapack_int k,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_slagsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slagsy_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -64,16 +64,16 @@ lapack_int LAPACKE_slagsy_work( int matrix_layout, lapack_int n, lapack_int k,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_slagsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slagsy_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_slagsy_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slagsy_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slamch.c b/LAPACKE/src/lapacke_slamch.c
index 893525538a..35344b6513 100644
--- a/LAPACKE/src/lapacke_slamch.c
+++ b/LAPACKE/src/lapacke_slamch.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_slamch( char cmach )
+float API_SUFFIX(LAPACKE_slamch)( char cmach )
 {
-    return LAPACKE_slamch_work( cmach );
+    return API_SUFFIX(LAPACKE_slamch_work)( cmach );
 }
diff --git a/LAPACKE/src/lapacke_slamch_work.c b/LAPACKE/src/lapacke_slamch_work.c
index fd115842ab..1e5064f4d4 100644
--- a/LAPACKE/src/lapacke_slamch_work.c
+++ b/LAPACKE/src/lapacke_slamch_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_slamch_work( char cmach )
+float API_SUFFIX(LAPACKE_slamch_work)( char cmach )
 {
     float res;
     /* Call LAPACK function and adjust info */
diff --git a/LAPACKE/src/lapacke_slangb.c b/LAPACKE/src/lapacke_slangb.c
new file mode 100644
index 0000000000..bb0bca857f
--- /dev/null
+++ b/LAPACKE/src/lapacke_slangb.c
@@ -0,0 +1,73 @@
+/*****************************************************************************
+  Copyright (c) 2022, 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 slangb
+* Author: Simon Märtens
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+float API_SUFFIX(LAPACKE_slangb)( int matrix_layout, char norm, lapack_int n,
+                      lapack_int kl, lapack_int ku, const float* ab,
+                      lapack_int ldab )
+{
+    lapack_int info = 0;
+    float res = 0.;
+    float* work = NULL;
+    if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slangb", -1 );
+        return -1;
+    }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+    if( LAPACKE_get_nancheck() ) {
+        /* Optionally check input matrices for NaNs */
+        if( API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+            return -6;
+        }
+    }
+#endif
+    /* Allocate memory for working array(s) */
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
+        work = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,n) );
+        if( work == NULL ) {
+            info = LAPACK_WORK_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+    }
+    /* Call middle-level interface */
+    res = API_SUFFIX(LAPACKE_slangb_work)( matrix_layout, norm, n, kl, ku, ab, ldab, work );
+    /* Release memory and exit */
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
+        LAPACKE_free( work );
+    }
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slangb", info );
+    }
+    return res;
+}
diff --git a/LAPACKE/src/lapacke_slangb_work.c b/LAPACKE/src/lapacke_slangb_work.c
new file mode 100644
index 0000000000..a15c727ad5
--- /dev/null
+++ b/LAPACKE/src/lapacke_slangb_work.c
@@ -0,0 +1,83 @@
+/*****************************************************************************
+  Copyright (c) 2022, 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 slangb
+* Author: Simon Märtens
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+float API_SUFFIX(LAPACKE_slangb_work)( int matrix_layout, char norm, lapack_int n,
+                           lapack_int kl, lapack_int ku, const float* ab,
+                           lapack_int ldab, float* work )
+{
+    lapack_int info = 0;
+    float res = 0.;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        res = LAPACK_slangb( &norm, &n, &kl, &ku, ab, &ldab, work );
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        char norm_lapack;
+        float* work_lapack = NULL;
+        /* Check leading dimension(s) */
+        if( ldab < kl+ku+1 ) {
+            info = -7;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slangb_work", info );
+            return info;
+        }
+        if( API_SUFFIX(LAPACKE_lsame)( norm, '1' ) || API_SUFFIX(LAPACKE_lsame)( norm, 'o' ) ) {
+            norm_lapack = 'i';
+        } else if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
+            norm_lapack = '1';
+        } else {
+            norm_lapack = norm;
+        }
+        /* Allocate memory for work array(s) */
+        if( API_SUFFIX(LAPACKE_lsame)( norm_lapack, 'i' ) ) {
+            work_lapack = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,n) );
+            if( work_lapack == NULL ) {
+                info = LAPACK_WORK_MEMORY_ERROR;
+                goto exit_level_0;
+            }
+        }
+        /* Call LAPACK function */
+        res = LAPACK_slangb( &norm, &n, &ku, &kl, ab, &ldab, work );
+        /* Release memory and exit */
+        if( work_lapack ) {
+            LAPACKE_free( work_lapack );
+        }
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slangb_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slangb_work", info );
+    }
+    return res;
+}
diff --git a/LAPACKE/src/lapacke_slange.c b/LAPACKE/src/lapacke_slange.c
index 2c4f2dbb80..ff4631ca9c 100644
--- a/LAPACKE/src/lapacke_slange.c
+++ b/LAPACKE/src/lapacke_slange.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_slange( int matrix_layout, char norm, lapack_int m,
+float API_SUFFIX(LAPACKE_slange)( int matrix_layout, char norm, lapack_int m,
                            lapack_int n, const float* a, lapack_int lda )
 {
     lapack_int info = 0;
     float res = 0.;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_slange", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slange", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( norm, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
         work = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,m) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -59,14 +59,14 @@ float LAPACKE_slange( int matrix_layout, char norm, lapack_int m,
         }
     }
     /* Call middle-level interface */
-    res = LAPACKE_slange_work( matrix_layout, norm, m, n, a, lda, work );
+    res = API_SUFFIX(LAPACKE_slange_work)( matrix_layout, norm, m, n, a, lda, work );
     /* Release memory and exit */
-    if( LAPACKE_lsame( norm, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
         LAPACKE_free( work );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_slange", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slange", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_slange_work.c b/LAPACKE/src/lapacke_slange_work.c
index 6be0468e8e..42693cc9f9 100644
--- a/LAPACKE/src/lapacke_slange_work.c
+++ b/LAPACKE/src/lapacke_slange_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_slange_work( int matrix_layout, char norm, lapack_int m,
+float API_SUFFIX(LAPACKE_slange_work)( int matrix_layout, char norm, lapack_int m,
                                 lapack_int n, const float* a, lapack_int lda,
                                 float* work )
 {
@@ -47,18 +47,18 @@ float LAPACKE_slange_work( int matrix_layout, char norm, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_slange_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slange_work", info );
             return info;
         }
-        if( LAPACKE_lsame( norm, '1' ) || LAPACKE_lsame( norm, 'o' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( norm, '1' ) || API_SUFFIX(LAPACKE_lsame)( norm, 'o' ) ) {
             norm_lapack = 'i';
-        } else if( LAPACKE_lsame( norm, 'i' ) ) {
+        } else if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
             norm_lapack = '1';
         } else {
             norm_lapack = norm;
         }
         /* Allocate memory for work array(s) */
-        if( LAPACKE_lsame( norm_lapack, 'i' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( norm_lapack, 'i' ) ) {
             work_lapack = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,n) );
             if( work_lapack == NULL ) {
                 info = LAPACK_WORK_MEMORY_ERROR;
@@ -73,11 +73,11 @@ float LAPACKE_slange_work( int matrix_layout, char norm, lapack_int m,
         }
 exit_level_0:
         if( info == LAPACK_WORK_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_slange_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slange_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_slange_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slange_work", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_slansy.c b/LAPACKE/src/lapacke_slansy.c
index 4e5047cef6..71a16b60a7 100644
--- a/LAPACKE/src/lapacke_slansy.c
+++ b/LAPACKE/src/lapacke_slansy.c
@@ -32,27 +32,27 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_slansy( int matrix_layout, char norm, char uplo, lapack_int n,
+float API_SUFFIX(LAPACKE_slansy)( int matrix_layout, char norm, char uplo, lapack_int n,
                            const float* a, lapack_int lda )
 {
     lapack_int info = 0;
     float res = 0.;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_slansy", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slansy", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( norm, 'i' ) || LAPACKE_lsame( norm, '1' ) ||
-        LAPACKE_lsame( norm, 'O' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) || API_SUFFIX(LAPACKE_lsame)( norm, '1' ) ||
+        API_SUFFIX(LAPACKE_lsame)( norm, 'O' ) ) {
         work = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,n) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -60,15 +60,15 @@ float LAPACKE_slansy( int matrix_layout, char norm, char uplo, lapack_int n,
         }
     }
     /* Call middle-level interface */
-    res = LAPACKE_slansy_work( matrix_layout, norm, uplo, n, a, lda, work );
+    res = API_SUFFIX(LAPACKE_slansy_work)( matrix_layout, norm, uplo, n, a, lda, work );
     /* Release memory and exit */
-    if( LAPACKE_lsame( norm, 'i' ) || LAPACKE_lsame( norm, '1' ) ||
-        LAPACKE_lsame( norm, 'O' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) || API_SUFFIX(LAPACKE_lsame)( norm, '1' ) ||
+        API_SUFFIX(LAPACKE_lsame)( norm, 'O' ) ) {
         LAPACKE_free( work );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_slansy", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slansy", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_slansy_work.c b/LAPACKE/src/lapacke_slansy_work.c
index f74856dcb4..285e8937a3 100644
--- a/LAPACKE/src/lapacke_slansy_work.c
+++ b/LAPACKE/src/lapacke_slansy_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_slansy_work( int matrix_layout, char norm, char uplo,
+float API_SUFFIX(LAPACKE_slansy_work)( int matrix_layout, char norm, char uplo,
                                 lapack_int n, const float* a, lapack_int lda,
                                 float* work )
 {
@@ -50,7 +50,7 @@ float LAPACKE_slansy_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_slansy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slansy_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,7 +60,7 @@ float LAPACKE_slansy_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         res = LAPACK_slansy( &norm, &uplo, &n, a_t, &lda_t, work );
         info = 0;  /* LAPACK call is ok! */
@@ -68,11 +68,11 @@ float LAPACKE_slansy_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_slansy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slansy_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_slansy_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slansy_work", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_slantr.c b/LAPACKE/src/lapacke_slantr.c
index 2f4c65889a..340a08df6f 100644
--- a/LAPACKE/src/lapacke_slantr.c
+++ b/LAPACKE/src/lapacke_slantr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_slantr( int matrix_layout, char norm, char uplo, char diag,
+float API_SUFFIX(LAPACKE_slantr)( int matrix_layout, char norm, char uplo, char diag,
                            lapack_int m, lapack_int n, const float* a,
                            lapack_int lda )
 {
@@ -40,19 +40,19 @@ float LAPACKE_slantr( int matrix_layout, char norm, char uplo, char diag,
     float res = 0.;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_slantr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slantr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_str_nancheck( matrix_layout, uplo, diag, MIN(m,n), a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_stz_nancheck)( matrix_layout, 'f', uplo, diag, m, n, a, lda ) ) {
             return -7;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( norm, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
         work = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,MAX(m,n)) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -60,15 +60,15 @@ float LAPACKE_slantr( int matrix_layout, char norm, char uplo, char diag,
         }
     }
     /* Call middle-level interface */
-    res = LAPACKE_slantr_work( matrix_layout, norm, uplo, diag, m, n, a, lda,
+    res = API_SUFFIX(LAPACKE_slantr_work)( matrix_layout, norm, uplo, diag, m, n, a, lda,
                                 work );
     /* Release memory and exit */
-    if( LAPACKE_lsame( norm, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
         LAPACKE_free( work );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_slantr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slantr", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_slantr_work.c b/LAPACKE/src/lapacke_slantr_work.c
index de82479615..b27dcbcfff 100644
--- a/LAPACKE/src/lapacke_slantr_work.c
+++ b/LAPACKE/src/lapacke_slantr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_slantr_work( int matrix_layout, char norm, char uplo,
+float API_SUFFIX(LAPACKE_slantr_work)( int matrix_layout, char norm, char uplo,
                                 char diag, lapack_int m, lapack_int n,
                                 const float* a, lapack_int lda, float* work )
 {
@@ -48,23 +48,23 @@ float LAPACKE_slantr_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_slantr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slantr_work", info );
             return info;
         }
-        if( LAPACKE_lsame( norm, '1' ) || LAPACKE_lsame( norm, 'o' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( norm, '1' ) || API_SUFFIX(LAPACKE_lsame)( norm, 'o' ) ) {
             norm_lapack = 'i';
-        } else if( LAPACKE_lsame( norm, 'i' ) ) {
+        } else if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
             norm_lapack = '1';
         } else {
             norm_lapack = norm;
         }
-        if( LAPACKE_lsame( uplo, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
             uplo_lapack = 'l';
         } else {
             uplo_lapack = 'u';
         }
         /* Allocate memory for work array(s) */
-        if( LAPACKE_lsame( norm_lapack, 'i' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( norm_lapack, 'i' ) ) {
             work_lapack = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,n) );
             if( work_lapack == NULL ) {
                 info = LAPACK_WORK_MEMORY_ERROR;
@@ -79,11 +79,11 @@ float LAPACKE_slantr_work( int matrix_layout, char norm, char uplo,
         }
 exit_level_0:
         if( info == LAPACK_WORK_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_slantr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slantr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_slantr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slantr_work", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_slapmr.c b/LAPACKE/src/lapacke_slapmr.c
index 6fbbae3c92..b1f88ee2d2 100644
--- a/LAPACKE/src/lapacke_slapmr.c
+++ b/LAPACKE/src/lapacke_slapmr.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slapmr( int matrix_layout, lapack_logical forwrd,
+lapack_int API_SUFFIX(LAPACKE_slapmr)( int matrix_layout, lapack_logical forwrd,
                            lapack_int m, lapack_int n, float* x, lapack_int ldx,
                            lapack_int* k )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_slapmr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slapmr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, x, ldx ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_slapmr_work( matrix_layout, forwrd, m, n, x, ldx, k );
+    return API_SUFFIX(LAPACKE_slapmr_work)( matrix_layout, forwrd, m, n, x, ldx, k );
 }
diff --git a/LAPACKE/src/lapacke_slapmr_work.c b/LAPACKE/src/lapacke_slapmr_work.c
index 0b0cc7995e..f7223ab45b 100644
--- a/LAPACKE/src/lapacke_slapmr_work.c
+++ b/LAPACKE/src/lapacke_slapmr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slapmr_work( int matrix_layout, lapack_logical forwrd,
+lapack_int API_SUFFIX(LAPACKE_slapmr_work)( int matrix_layout, lapack_logical forwrd,
                                 lapack_int m, lapack_int n, float* x,
                                 lapack_int ldx, lapack_int* k )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_slapmr_work( int matrix_layout, lapack_logical forwrd,
         /* Check leading dimension(s) */
         if( ldx < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_slapmr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slapmr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,21 +59,21 @@ lapack_int LAPACKE_slapmr_work( int matrix_layout, lapack_logical forwrd,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_slapmr( &forwrd, &m, &n, x_t, &ldx_t, k );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_slapmr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slapmr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_slapmr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slapmr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slapmt.c b/LAPACKE/src/lapacke_slapmt.c
index 99358f0b23..08c8d79abc 100644
--- a/LAPACKE/src/lapacke_slapmt.c
+++ b/LAPACKE/src/lapacke_slapmt.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slapmt( int matrix_layout, lapack_logical forwrd,
+lapack_int API_SUFFIX(LAPACKE_slapmt)( int matrix_layout, lapack_logical forwrd,
                            lapack_int m, lapack_int n, float* x, lapack_int ldx,
                            lapack_int* k )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_slapmt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slapmt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, x, ldx ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_slapmt_work( matrix_layout, forwrd, m, n, x, ldx, k );
+    return API_SUFFIX(LAPACKE_slapmt_work)( matrix_layout, forwrd, m, n, x, ldx, k );
 }
diff --git a/LAPACKE/src/lapacke_slapmt_work.c b/LAPACKE/src/lapacke_slapmt_work.c
index c812b7b524..0342cba9fd 100644
--- a/LAPACKE/src/lapacke_slapmt_work.c
+++ b/LAPACKE/src/lapacke_slapmt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slapmt_work( int matrix_layout, lapack_logical forwrd,
+lapack_int API_SUFFIX(LAPACKE_slapmt_work)( int matrix_layout, lapack_logical forwrd,
                                 lapack_int m, lapack_int n, float* x,
                                 lapack_int ldx, lapack_int* k )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_slapmt_work( int matrix_layout, lapack_logical forwrd,
         /* Check leading dimension(s) */
         if( ldx < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_slapmt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slapmt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,21 +59,21 @@ lapack_int LAPACKE_slapmt_work( int matrix_layout, lapack_logical forwrd,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_slapmt( &forwrd, &m, &n, x_t, &ldx_t, k );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_slapmt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slapmt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_slapmt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slapmt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slapy2.c b/LAPACKE/src/lapacke_slapy2.c
index 2c041def9e..b5b86a5ed2 100644
--- a/LAPACKE/src/lapacke_slapy2.c
+++ b/LAPACKE/src/lapacke_slapy2.c
@@ -32,18 +32,18 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_slapy2( float x, float y )
+float API_SUFFIX(LAPACKE_slapy2)( float x, float y )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &x, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &x, 1 ) ) {
             return -1;
         }
-        if( LAPACKE_s_nancheck( 1, &y, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &y, 1 ) ) {
             return -2;
         }
     }
 #endif
-    return LAPACKE_slapy2_work( x, y );
+    return API_SUFFIX(LAPACKE_slapy2_work)( x, y );
 }
diff --git a/LAPACKE/src/lapacke_slapy2_work.c b/LAPACKE/src/lapacke_slapy2_work.c
index 2f206958a1..dd58c12dbf 100644
--- a/LAPACKE/src/lapacke_slapy2_work.c
+++ b/LAPACKE/src/lapacke_slapy2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_slapy2_work( float x, float y )
+float API_SUFFIX(LAPACKE_slapy2_work)( float x, float y )
 {
     float res = 0.;
     /* Call LAPACK function and adjust info */
diff --git a/LAPACKE/src/lapacke_slapy3.c b/LAPACKE/src/lapacke_slapy3.c
index 3aaadc89ca..9d5bc0cd59 100644
--- a/LAPACKE/src/lapacke_slapy3.c
+++ b/LAPACKE/src/lapacke_slapy3.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_slapy3( float x, float y, float z )
+float API_SUFFIX(LAPACKE_slapy3)( float x, float y, float z )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &x, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &x, 1 ) ) {
             return -1;
         }
-        if( LAPACKE_s_nancheck( 1, &y, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &y, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_s_nancheck( 1, &z, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &z, 1 ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_slapy3_work( x, y, z );
+    return API_SUFFIX(LAPACKE_slapy3_work)( x, y, z );
 }
diff --git a/LAPACKE/src/lapacke_slapy3_work.c b/LAPACKE/src/lapacke_slapy3_work.c
index c0351a051b..ad97aff3a5 100644
--- a/LAPACKE/src/lapacke_slapy3_work.c
+++ b/LAPACKE/src/lapacke_slapy3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-float LAPACKE_slapy3_work( float x, float y, float z )
+float API_SUFFIX(LAPACKE_slapy3_work)( float x, float y, float z )
 {
     float res = 0.;
     /* Call LAPACK function and adjust info */
diff --git a/LAPACKE/src/lapacke_slarfb.c b/LAPACKE/src/lapacke_slarfb.c
index 37d51dee58..39ba18dc1a 100644
--- a/LAPACKE/src/lapacke_slarfb.c
+++ b/LAPACKE/src/lapacke_slarfb.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slarfb( int matrix_layout, char side, char trans, char direct,
+lapack_int API_SUFFIX(LAPACKE_slarfb)( int matrix_layout, char side, char trans, char direct,
                            char storev, lapack_int m, lapack_int n,
                            lapack_int k, const float* v, lapack_int ldv,
                            const float* t, lapack_int ldt, float* c,
@@ -41,73 +41,43 @@ lapack_int LAPACKE_slarfb( int matrix_layout, char side, char trans, char direct
     lapack_int info = 0;
     lapack_int ldwork;
     float* work = NULL;
-    lapack_int ncols_v, nrows_v;
+    lapack_int nrows_v, ncols_v;
+    lapack_logical left, col, forward;
+    char uplo;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_slarfb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarfb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        lapack_int lrv, lcv;  /* row, column stride */
-        if( matrix_layout == LAPACK_COL_MAJOR ) {
-            lrv = 1;
-            lcv = ldv;
-        } else {
-            lrv = ldv;
-            lcv = 1;
-        }
-        ncols_v =     LAPACKE_lsame( storev, 'c' ) ? k :
-                  ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'l' ) ) ? m :
-                  ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'r' ) ) ? n : 1) );
+        left = API_SUFFIX(LAPACKE_lsame)( side, 'l' );
+        col = API_SUFFIX(LAPACKE_lsame)( storev, 'c' );
+        forward = API_SUFFIX(LAPACKE_lsame)( direct, 'f' );
 
-        nrows_v =   ( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( side, 'l' ) ) ? m :
-                  ( ( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( side, 'r' ) ) ? n :
-                    ( LAPACKE_lsame( storev, 'r' ) ? k : 1) );
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, c, ldc ) ) {
-            return -13;
+        nrows_v = ( col && left ) ? m : ( ( col && !left ) ? n : ( !col ? k : 1) );
+        ncols_v = ( !col && left ) ? m : ( ( !col && !left ) ? n : ( col ? k : 1 ) );
+        uplo = ( ( forward && col ) || !( forward || col ) ) ? 'l' : 'u';
+
+        if( ( col && k > nrows_v ) || ( !col && k > ncols_v ) ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarfb", -8 );
+            return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, k, k, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_stz_nancheck)( matrix_layout, direct, uplo, 'u',
+                                  nrows_v, ncols_v, v, ldv ) ) {
+            return -9;
+        }
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, k, k, t, ldt ) ) {
             return -11;
         }
-        if( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( direct, 'f' ) ) {
-            if( LAPACKE_str_nancheck( matrix_layout, 'l', 'u', k, v, ldv ) )
-                return -9;
-            if( LAPACKE_sge_nancheck( matrix_layout, nrows_v-k, ncols_v,
-                                      &v[k*lrv], ldv ) )
-                return -9;
-        } else if( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( direct, 'b' ) ) {
-            if( k > nrows_v ) {
-                LAPACKE_xerbla( "LAPACKE_slarfb", -8 );
-                return -8;
-            }
-            if( LAPACKE_str_nancheck( matrix_layout, 'u', 'u', k,
-                                      &v[(nrows_v-k)*lrv], ldv ) )
-                return -9;
-            if( LAPACKE_sge_nancheck( matrix_layout, nrows_v-k, ncols_v, v, ldv ) )
-                return -9;
-        } else if( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( direct, 'f' ) ) {
-            if( LAPACKE_str_nancheck( matrix_layout, 'u', 'u', k, v, ldv ) )
-                return -9;
-            if( LAPACKE_sge_nancheck( matrix_layout, nrows_v, ncols_v-k,
-                                      &v[k*lrv], ldv ) )
-                return -9;
-        } else if( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( direct, 'b' ) ) {
-            if( k > ncols_v ) {
-                LAPACKE_xerbla( "LAPACKE_slarfb", -8 );
-                return -8;
-            }
-            if( LAPACKE_str_nancheck( matrix_layout, 'l', 'u', k,
-                                      &v[(ncols_v-k)*lcv], ldv ) )
-                return -9;
-            if( LAPACKE_sge_nancheck( matrix_layout, nrows_v, ncols_v-k, v, ldv ) )
-                return -9;
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
+            return -13;
         }
     }
 #endif
-    if( LAPACKE_lsame( side, 'l' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
         ldwork = n;
-    } else if( LAPACKE_lsame( side, 'r' ) ) {
+    } else if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
         ldwork = m;
     } else {
         ldwork = 1;
@@ -119,13 +89,13 @@ lapack_int LAPACKE_slarfb( int matrix_layout, char side, char trans, char direct
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_slarfb_work( matrix_layout, side, trans, direct, storev, m, n,
+    info = API_SUFFIX(LAPACKE_slarfb_work)( matrix_layout, side, trans, direct, storev, m, n,
                                 k, v, ldv, t, ldt, c, ldc, work, ldwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_slarfb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarfb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slarfb_work.c b/LAPACKE/src/lapacke_slarfb_work.c
index 2f5d616767..0ff23f50b4 100644
--- a/LAPACKE/src/lapacke_slarfb_work.c
+++ b/LAPACKE/src/lapacke_slarfb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slarfb_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_slarfb_work)( int matrix_layout, char side, char trans,
                                 char direct, char storev, lapack_int m,
                                 lapack_int n, lapack_int k, const float* v,
                                 lapack_int ldv, const float* t, lapack_int ldt,
@@ -41,6 +41,8 @@ lapack_int LAPACKE_slarfb_work( int matrix_layout, char side, char trans,
 {
     lapack_int info = 0;
     lapack_int nrows_v, ncols_v;
+    lapack_logical left, col, forward;
+    char uplo;
     lapack_int ldc_t, ldt_t, ldv_t;
     float *v_t = NULL, *t_t = NULL, *c_t = NULL;
     if( matrix_layout == LAPACK_COL_MAJOR ) {
@@ -51,33 +53,36 @@ lapack_int LAPACKE_slarfb_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        nrows_v = ( LAPACKE_lsame( storev, 'c' ) &&
-                             LAPACKE_lsame( side, 'l' ) ) ? m :
-                             ( ( LAPACKE_lsame( storev, 'c' ) &&
-                             LAPACKE_lsame( side, 'r' ) ) ? n :
-                             ( LAPACKE_lsame( storev, 'r' ) ? k : 1) );
-        ncols_v = LAPACKE_lsame( storev, 'c' ) ? k :
-                             ( ( LAPACKE_lsame( storev, 'r' ) &&
-                             LAPACKE_lsame( side, 'l' ) ) ? m :
-                             ( ( LAPACKE_lsame( storev, 'r' ) &&
-                             LAPACKE_lsame( side, 'r' ) ) ? n : 1) );
+        left = API_SUFFIX(LAPACKE_lsame)( side, 'l' );
+        col = API_SUFFIX(LAPACKE_lsame)( storev, 'c' );
+        forward = API_SUFFIX(LAPACKE_lsame)( direct, 'f' );
+
+        nrows_v = ( col && left ) ? m : ( ( col && !left ) ? n : ( !col ? k : 1) );
+        ncols_v = ( !col && left ) ? m : ( ( !col && !left ) ? n : ( col ? k : 1 ) );
+        uplo = ( ( forward && col ) || !( forward || col ) ) ? 'l' : 'u';
+
         ldc_t = MAX(1,m);
         ldt_t = MAX(1,k);
         ldv_t = MAX(1,nrows_v);
         /* Check leading dimension(s) */
         if( ldc < n ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_slarfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarfb_work", info );
             return info;
         }
         if( ldt < k ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_slarfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarfb_work", info );
             return info;
         }
         if( ldv < ncols_v ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_slarfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarfb_work", info );
+            return info;
+        }
+        if( ( col && k > nrows_v ) || ( !col && k > ncols_v ) ) {
+            info = -8;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarfb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -97,44 +102,16 @@ lapack_int LAPACKE_slarfb_work( int matrix_layout, char side, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( direct, 'f' ) ) {
-            LAPACKE_str_trans( matrix_layout, 'l', 'u', k, v, ldv, v_t, ldv_t );
-            LAPACKE_sge_trans( matrix_layout, nrows_v-k, ncols_v, &v[k*ldv], ldv,
-                               &v_t[k], ldv_t );
-        } else if( LAPACKE_lsame( storev, 'c' ) &&
-                   LAPACKE_lsame( direct, 'b' ) ) {
-            if( k > nrows_v ) {
-                LAPACKE_xerbla( "LAPACKE_slarfb_work", -8 );
-                return -8;
-            }
-            LAPACKE_str_trans( matrix_layout, 'u', 'u', k, &v[(nrows_v-k)*ldv],
-                               ldv, &v_t[nrows_v-k], ldv_t );
-            LAPACKE_sge_trans( matrix_layout, nrows_v-k, ncols_v, v, ldv, v_t,
-                               ldv_t );
-        } else if( LAPACKE_lsame( storev, 'r' ) &&
-                   LAPACKE_lsame( direct, 'f' ) ) {
-            LAPACKE_str_trans( matrix_layout, 'u', 'u', k, v, ldv, v_t, ldv_t );
-            LAPACKE_sge_trans( matrix_layout, nrows_v, ncols_v-k, &v[k], ldv,
-                               &v_t[k*ldv_t], ldv_t );
-        } else if( LAPACKE_lsame( storev, 'r' ) &&
-                   LAPACKE_lsame( direct, 'b' ) ) {
-            if( k > ncols_v ) {
-                LAPACKE_xerbla( "LAPACKE_slarfb_work", -8 );
-                return -8;
-            }
-            LAPACKE_str_trans( matrix_layout, 'l', 'u', k, &v[ncols_v-k], ldv,
-                               &v_t[(ncols_v-k)*ldv_t], ldv_t );
-            LAPACKE_sge_trans( matrix_layout, nrows_v, ncols_v-k, v, ldv, v_t,
-                               ldv_t );
-        }
-        LAPACKE_sge_trans( matrix_layout, k, k, t, ldt, t_t, ldt_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_stz_trans)( matrix_layout, direct, uplo, 'u', nrows_v, ncols_v,
+                           v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, k, k, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_slarfb( &side, &trans, &direct, &storev, &m, &n, &k, v_t, &ldv_t,
                        t_t, &ldt_t, c_t, &ldc_t, work, &ldwork );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_2:
@@ -143,11 +120,11 @@ lapack_int LAPACKE_slarfb_work( int matrix_layout, char side, char trans,
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_slarfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarfb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_slarfb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarfb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slarfg.c b/LAPACKE/src/lapacke_slarfg.c
index 56ed416ab8..9db0c5d821 100644
--- a/LAPACKE/src/lapacke_slarfg.c
+++ b/LAPACKE/src/lapacke_slarfg.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slarfg( lapack_int n, float* alpha, float* x,
+lapack_int API_SUFFIX(LAPACKE_slarfg)( lapack_int n, float* alpha, float* x,
                            lapack_int incx, float* tau )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, alpha, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_s_nancheck( n-1, x, incx ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, x, incx ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_slarfg_work( n, alpha, x, incx, tau );
+    return API_SUFFIX(LAPACKE_slarfg_work)( n, alpha, x, incx, tau );
 }
diff --git a/LAPACKE/src/lapacke_slarfg_work.c b/LAPACKE/src/lapacke_slarfg_work.c
index f824c29e77..d85b3a1149 100644
--- a/LAPACKE/src/lapacke_slarfg_work.c
+++ b/LAPACKE/src/lapacke_slarfg_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slarfg_work( lapack_int n, float* alpha, float* x,
+lapack_int API_SUFFIX(LAPACKE_slarfg_work)( lapack_int n, float* alpha, float* x,
                                 lapack_int incx, float* tau )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_slarft.c b/LAPACKE/src/lapacke_slarft.c
index d9d1df3360..8aa75cb323 100644
--- a/LAPACKE/src/lapacke_slarft.c
+++ b/LAPACKE/src/lapacke_slarft.c
@@ -32,31 +32,31 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slarft( int matrix_layout, char direct, char storev,
+lapack_int API_SUFFIX(LAPACKE_slarft)( int matrix_layout, char direct, char storev,
                            lapack_int n, lapack_int k, const float* v,
                            lapack_int ldv, const float* tau, float* t,
                            lapack_int ldt )
 {
     lapack_int ncols_v, nrows_v;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_slarft", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarft", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        ncols_v = LAPACKE_lsame( storev, 'c' ) ? k :
-                             ( LAPACKE_lsame( storev, 'r' ) ? n : 1);
-        nrows_v = LAPACKE_lsame( storev, 'c' ) ? n :
-                             ( LAPACKE_lsame( storev, 'r' ) ? k : 1);
-        if( LAPACKE_s_nancheck( k, tau, 1 ) ) {
+        ncols_v = API_SUFFIX(LAPACKE_lsame)( storev, 'c' ) ? k :
+                             ( API_SUFFIX(LAPACKE_lsame)( storev, 'r' ) ? n : 1);
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( storev, 'c' ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( storev, 'r' ) ? k : 1);
+        if( API_SUFFIX(LAPACKE_s_nancheck)( k, tau, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, nrows_v, ncols_v, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, nrows_v, ncols_v, v, ldv ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_slarft_work( matrix_layout, direct, storev, n, k, v, ldv, tau,
+    return API_SUFFIX(LAPACKE_slarft_work)( matrix_layout, direct, storev, n, k, v, ldv, tau,
                                 t, ldt );
 }
diff --git a/LAPACKE/src/lapacke_slarft_work.c b/LAPACKE/src/lapacke_slarft_work.c
index 1efb6afd9c..ea518f3358 100644
--- a/LAPACKE/src/lapacke_slarft_work.c
+++ b/LAPACKE/src/lapacke_slarft_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slarft_work( int matrix_layout, char direct, char storev,
+lapack_int API_SUFFIX(LAPACKE_slarft_work)( int matrix_layout, char direct, char storev,
                                 lapack_int n, lapack_int k, const float* v,
                                 lapack_int ldv, const float* tau, float* t,
                                 lapack_int ldt )
@@ -48,21 +48,21 @@ lapack_int LAPACKE_slarft_work( int matrix_layout, char direct, char storev,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        nrows_v = LAPACKE_lsame( storev, 'c' ) ? n :
-                             ( LAPACKE_lsame( storev, 'r' ) ? k : 1);
-        ncols_v = LAPACKE_lsame( storev, 'c' ) ? k :
-                             ( LAPACKE_lsame( storev, 'r' ) ? n : 1);
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( storev, 'c' ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( storev, 'r' ) ? k : 1);
+        ncols_v = API_SUFFIX(LAPACKE_lsame)( storev, 'c' ) ? k :
+                             ( API_SUFFIX(LAPACKE_lsame)( storev, 'r' ) ? n : 1);
         ldt_t = MAX(1,k);
         ldv_t = MAX(1,nrows_v);
         /* Check leading dimension(s) */
         if( ldt < k ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_slarft_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarft_work", info );
             return info;
         }
         if( ldv < ncols_v ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_slarft_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarft_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -77,24 +77,24 @@ lapack_int LAPACKE_slarft_work( int matrix_layout, char direct, char storev,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, nrows_v, ncols_v, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, nrows_v, ncols_v, v, ldv, v_t, ldv_t );
         /* Call LAPACK function and adjust info */
         LAPACK_slarft( &direct, &storev, &n, &k, v_t, &ldv_t, tau, t_t,
                        &ldt_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, k, k, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, k, k, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_slarft_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarft_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_slarft_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarft_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slarfx.c b/LAPACKE/src/lapacke_slarfx.c
index d5d61fda5c..27c0e3e10c 100644
--- a/LAPACKE/src/lapacke_slarfx.c
+++ b/LAPACKE/src/lapacke_slarfx.c
@@ -32,30 +32,30 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slarfx( int matrix_layout, char side, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_slarfx)( int matrix_layout, char side, lapack_int m,
                            lapack_int n, const float* v, float tau, float* c,
                            lapack_int ldc, float* work )
 {
     lapack_int lv;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_slarfx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarfx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &tau, 1 ) ) {
             return -6;
         }
-        lv = (LAPACKE_lsame( side, 'l' ) ? m : n);
-        if( LAPACKE_s_nancheck( lv, v, 1 ) ) {
+        lv = (API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n);
+        if( API_SUFFIX(LAPACKE_s_nancheck)( lv, v, 1 ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_slarfx_work( matrix_layout, side, m, n, v, tau, c, ldc,
+    return API_SUFFIX(LAPACKE_slarfx_work)( matrix_layout, side, m, n, v, tau, c, ldc,
                                 work );
 }
diff --git a/LAPACKE/src/lapacke_slarfx_work.c b/LAPACKE/src/lapacke_slarfx_work.c
index cc566a3aea..0be8084dd7 100644
--- a/LAPACKE/src/lapacke_slarfx_work.c
+++ b/LAPACKE/src/lapacke_slarfx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slarfx_work( int matrix_layout, char side, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_slarfx_work)( int matrix_layout, char side, lapack_int m,
                                 lapack_int n, const float* v, float tau,
                                 float* c, lapack_int ldc, float* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_slarfx_work( int matrix_layout, char side, lapack_int m,
         /* Check leading dimension(s) */
         if( ldc < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_slarfx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarfx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,21 +59,21 @@ lapack_int LAPACKE_slarfx_work( int matrix_layout, char side, lapack_int m,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_slarfx( &side, &m, &n, v, &tau, c_t, &ldc_t, work );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_slarfx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarfx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_slarfx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slarfx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slarnv.c b/LAPACKE/src/lapacke_slarnv.c
index f86bd220c7..e0c63e2c01 100644
--- a/LAPACKE/src/lapacke_slarnv.c
+++ b/LAPACKE/src/lapacke_slarnv.c
@@ -32,8 +32,8 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slarnv( lapack_int idist, lapack_int* iseed, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_slarnv)( lapack_int idist, lapack_int* iseed, lapack_int n,
                            float* x )
 {
-    return LAPACKE_slarnv_work( idist, iseed, n, x );
+    return API_SUFFIX(LAPACKE_slarnv_work)( idist, iseed, n, x );
 }
diff --git a/LAPACKE/src/lapacke_slarnv_work.c b/LAPACKE/src/lapacke_slarnv_work.c
index 0024f7ddd9..06bac6f43b 100644
--- a/LAPACKE/src/lapacke_slarnv_work.c
+++ b/LAPACKE/src/lapacke_slarnv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slarnv_work( lapack_int idist, lapack_int* iseed,
+lapack_int API_SUFFIX(LAPACKE_slarnv_work)( lapack_int idist, lapack_int* iseed,
                                 lapack_int n, float* x )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_slartgp.c b/LAPACKE/src/lapacke_slartgp.c
index 5e12e3f20b..455f57a30b 100644
--- a/LAPACKE/src/lapacke_slartgp.c
+++ b/LAPACKE/src/lapacke_slartgp.c
@@ -32,18 +32,18 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slartgp( float f, float g, float* cs, float* sn, float* r )
+lapack_int API_SUFFIX(LAPACKE_slartgp)( float f, float g, float* cs, float* sn, float* r )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &f, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &f, 1 ) ) {
             return -1;
         }
-        if( LAPACKE_s_nancheck( 1, &g, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &g, 1 ) ) {
             return -2;
         }
     }
 #endif
-    return LAPACKE_slartgp_work( f, g, cs, sn, r );
+    return API_SUFFIX(LAPACKE_slartgp_work)( f, g, cs, sn, r );
 }
diff --git a/LAPACKE/src/lapacke_slartgp_work.c b/LAPACKE/src/lapacke_slartgp_work.c
index 64d2be328b..57766934e0 100644
--- a/LAPACKE/src/lapacke_slartgp_work.c
+++ b/LAPACKE/src/lapacke_slartgp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slartgp_work( float f, float g, float* cs, float* sn,
+lapack_int API_SUFFIX(LAPACKE_slartgp_work)( float f, float g, float* cs, float* sn,
                                  float* r )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_slartgs.c b/LAPACKE/src/lapacke_slartgs.c
index fc56cc442e..02cc4bdf12 100644
--- a/LAPACKE/src/lapacke_slartgs.c
+++ b/LAPACKE/src/lapacke_slartgs.c
@@ -32,22 +32,22 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slartgs( float x, float y, float sigma, float* cs,
+lapack_int API_SUFFIX(LAPACKE_slartgs)( float x, float y, float sigma, float* cs,
                             float* sn )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &sigma, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &sigma, 1 ) ) {
             return -3;
         }
-        if( LAPACKE_s_nancheck( 1, &x, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &x, 1 ) ) {
             return -1;
         }
-        if( LAPACKE_s_nancheck( 1, &y, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &y, 1 ) ) {
             return -2;
         }
     }
 #endif
-    return LAPACKE_slartgs_work( x, y, sigma, cs, sn );
+    return API_SUFFIX(LAPACKE_slartgs_work)( x, y, sigma, cs, sn );
 }
diff --git a/LAPACKE/src/lapacke_slartgs_work.c b/LAPACKE/src/lapacke_slartgs_work.c
index 4dc3142c8c..f495303b79 100644
--- a/LAPACKE/src/lapacke_slartgs_work.c
+++ b/LAPACKE/src/lapacke_slartgs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slartgs_work( float x, float y, float sigma, float* cs,
+lapack_int API_SUFFIX(LAPACKE_slartgs_work)( float x, float y, float sigma, float* cs,
                                  float* sn )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_slascl.c b/LAPACKE/src/lapacke_slascl.c
index 969ba1dd7e..e85f62c63f 100644
--- a/LAPACKE/src/lapacke_slascl.c
+++ b/LAPACKE/src/lapacke_slascl.c
@@ -32,13 +32,13 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slascl( int matrix_layout, char type, lapack_int kl,
+lapack_int API_SUFFIX(LAPACKE_slascl)( int matrix_layout, char type, lapack_int kl,
                            lapack_int ku, float cfrom, float cto,
                            lapack_int m, lapack_int n, float* a,
                            lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_slascl", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slascl", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
@@ -46,68 +46,68 @@ lapack_int LAPACKE_slascl( int matrix_layout, char type, lapack_int kl,
         /* Optionally check input matrices for NaNs */
         switch (type) {
         case 'G':
-            if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
                 return -9;
             }
             break;
         case 'L':
             // TYPE = 'L' - lower triangle of general matrix
             if( matrix_layout == LAPACK_COL_MAJOR &&
-                LAPACKE_sgb_nancheck( matrix_layout, m, n, m-1, 0, a, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, m, n, m-1, 0, a, lda+1 ) ) {
                 return -9;
             }
             if( matrix_layout == LAPACK_ROW_MAJOR &&
-                LAPACKE_sgb_nancheck( LAPACK_COL_MAJOR, n, m, 0, m-1, a-m+1, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_sgb_nancheck)( LAPACK_COL_MAJOR, n, m, 0, m-1, a-m+1, lda+1 ) ) {
                 return -9;
             }
             break;
         case 'U':
             // TYPE = 'U' - upper triangle of general matrix
             if( matrix_layout == LAPACK_COL_MAJOR &&
-                LAPACKE_sgb_nancheck( matrix_layout, m, n, 0, n-1, a-n+1, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, m, n, 0, n-1, a-n+1, lda+1 ) ) {
                 return -9;
             }
             if( matrix_layout == LAPACK_ROW_MAJOR &&
-                LAPACKE_sgb_nancheck( LAPACK_COL_MAJOR, n, m, n-1, 0, a, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_sgb_nancheck)( LAPACK_COL_MAJOR, n, m, n-1, 0, a, lda+1 ) ) {
                 return -9;
             }
             break;
         case 'H':
             // TYPE = 'H' - part of upper Hessenberg matrix in general matrix
             if( matrix_layout == LAPACK_COL_MAJOR &&
-                LAPACKE_sgb_nancheck( matrix_layout, m, n, 1, n-1, a-n+1, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, m, n, 1, n-1, a-n+1, lda+1 ) ) {
                 return -9;
             }
             if( matrix_layout == LAPACK_ROW_MAJOR &&
-                LAPACKE_sgb_nancheck( LAPACK_COL_MAJOR, n, m, n-1, 1, a-1, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_sgb_nancheck)( LAPACK_COL_MAJOR, n, m, n-1, 1, a-1, lda+1 ) ) {
                 return -9;
             }
             break;
         case 'B':
             // TYPE = 'B' - lower part of symmetric band matrix (assume m==n)
-            if( LAPACKE_ssb_nancheck( matrix_layout, 'L', n, kl, a, lda ) ) {
+            if( API_SUFFIX(LAPACKE_ssb_nancheck)( matrix_layout, 'L', n, kl, a, lda ) ) {
                 return -9;
             }
             break;
         case 'Q':
             // TYPE = 'Q' - upper part of symmetric band matrix (assume m==n)
-            if( LAPACKE_ssb_nancheck( matrix_layout, 'U', n, ku, a, lda ) ) {
+            if( API_SUFFIX(LAPACKE_ssb_nancheck)( matrix_layout, 'U', n, ku, a, lda ) ) {
                 return -9;
             }
             break;
         case 'Z':
             // TYPE = 'Z' -  band matrix laid out for ?GBTRF
             if( matrix_layout == LAPACK_COL_MAJOR &&
-                LAPACKE_sgb_nancheck( matrix_layout, m, n, kl, ku, a+kl, lda ) ) {
+                API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, m, n, kl, ku, a+kl, lda ) ) {
                 return -9;
             }
             if( matrix_layout == LAPACK_ROW_MAJOR &&
-                LAPACKE_sgb_nancheck( matrix_layout, m, n, kl, ku, a+lda*kl, lda ) ) {
+                API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, m, n, kl, ku, a+lda*kl, lda ) ) {
                 return -9;
             }
             break;
         }
     }
 #endif
-    return LAPACKE_slascl_work( matrix_layout, type, kl, ku, cfrom, cto, m,  n, a, lda );
+    return API_SUFFIX(LAPACKE_slascl_work)( matrix_layout, type, kl, ku, cfrom, cto, m,  n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_slascl_work.c b/LAPACKE/src/lapacke_slascl_work.c
index ee373c6832..6449f36702 100644
--- a/LAPACKE/src/lapacke_slascl_work.c
+++ b/LAPACKE/src/lapacke_slascl_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slascl_work( int matrix_layout, char type, lapack_int kl,
+lapack_int API_SUFFIX(LAPACKE_slascl_work)( int matrix_layout, char type, lapack_int kl,
                            lapack_int ku, float cfrom, float cto,
                            lapack_int m, lapack_int n, float* a,
                            lapack_int lda )
@@ -45,15 +45,15 @@ lapack_int LAPACKE_slascl_work( int matrix_layout, char type, lapack_int kl,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_a = LAPACKE_lsame(type, 'b') ? kl + 1 :
-                             LAPACKE_lsame(type, 'q') ? ku + 1 :
-                             LAPACKE_lsame(type, 'z') ? 2 * kl + ku + 1 : m;
+        lapack_int nrows_a = API_SUFFIX(LAPACKE_lsame)(type, 'b') ? kl + 1 :
+                             API_SUFFIX(LAPACKE_lsame)(type, 'q') ? ku + 1 :
+                             API_SUFFIX(LAPACKE_lsame)(type, 'z') ? 2 * kl + ku + 1 : m;
         lapack_int lda_t = MAX(1,nrows_a);
         float* a_t = NULL;
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_slascl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slascl_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,23 +63,23 @@ lapack_int LAPACKE_slascl_work( int matrix_layout, char type, lapack_int kl,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, nrows_a, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, nrows_a, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_slascl( &type, &kl, &ku, &cfrom, &cto, &m, &n, a_t, &lda_t, &info);
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_a, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_a, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_slascl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slascl_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_slascl_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slascl_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slaset.c b/LAPACKE/src/lapacke_slaset.c
index 031565bf5a..b109c4c6ff 100644
--- a/LAPACKE/src/lapacke_slaset.c
+++ b/LAPACKE/src/lapacke_slaset.c
@@ -32,13 +32,13 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slaset( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_slaset)( int matrix_layout, char uplo, lapack_int m,
                            lapack_int n, float alpha, float beta, float* a,
                            lapack_int lda )
 {
 
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_slaset", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slaset", -1 );
         return -1;
     }
 
@@ -50,14 +50,14 @@ lapack_int LAPACKE_slaset( int matrix_layout, char uplo, lapack_int m,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &alpha, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( 1, &beta, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &beta, 1 ) ) {
             return -6;
         }
     }
 #endif
 
-    return LAPACKE_slaset_work( matrix_layout, uplo, m, n, alpha, beta, a, lda );
+    return API_SUFFIX(LAPACKE_slaset_work)( matrix_layout, uplo, m, n, alpha, beta, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_slaset_work.c b/LAPACKE/src/lapacke_slaset_work.c
index 38a66a14d4..c573686733 100644
--- a/LAPACKE/src/lapacke_slaset_work.c
+++ b/LAPACKE/src/lapacke_slaset_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slaset_work( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_slaset_work)( int matrix_layout, char uplo, lapack_int m,
                                 lapack_int n, float alpha, float beta, float* a,
                                 lapack_int lda )
 {
@@ -46,7 +46,7 @@ lapack_int LAPACKE_slaset_work( int matrix_layout, char uplo, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_slaset_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slaset_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -56,21 +56,21 @@ lapack_int LAPACKE_slaset_work( int matrix_layout, char uplo, lapack_int m,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_slaset( &uplo, &m, &n, &alpha, &beta, a_t, &lda_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_slaset_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slaset_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_slaset_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slaset_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slasrt.c b/LAPACKE/src/lapacke_slasrt.c
index 78a7509a26..618f6f996d 100644
--- a/LAPACKE/src/lapacke_slasrt.c
+++ b/LAPACKE/src/lapacke_slasrt.c
@@ -32,15 +32,15 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slasrt( char id, lapack_int n, float* d )
+lapack_int API_SUFFIX(LAPACKE_slasrt)( char id, lapack_int n, float* d )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_slasrt_work( id, n, d );
+    return API_SUFFIX(LAPACKE_slasrt_work)( id, n, d );
 }
diff --git a/LAPACKE/src/lapacke_slasrt_work.c b/LAPACKE/src/lapacke_slasrt_work.c
index eff9b6a519..adad429794 100644
--- a/LAPACKE/src/lapacke_slasrt_work.c
+++ b/LAPACKE/src/lapacke_slasrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slasrt_work( char id, lapack_int n, float* d )
+lapack_int API_SUFFIX(LAPACKE_slasrt_work)( char id, lapack_int n, float* d )
 {
     lapack_int info = 0;
     /* Call LAPACK function and adjust info */
diff --git a/LAPACKE/src/lapacke_slassq.c b/LAPACKE/src/lapacke_slassq.c
index 81330d63e4..e62933cce6 100644
--- a/LAPACKE/src/lapacke_slassq.c
+++ b/LAPACKE/src/lapacke_slassq.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slassq( lapack_int n, float* x, lapack_int incx, float* scale, float* sumsq )
+lapack_int API_SUFFIX(LAPACKE_slassq)( lapack_int n, const float* x, lapack_int incx, float* scale, float* sumsq )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input vector `x` and in/out scalars `scale` and `sumsq` for NaNs */
-        if( LAPACKE_s_nancheck( n, x, incx ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, x, incx ) ) {
             return -2;
         }
-        if( LAPACKE_s_nancheck( 1, scale, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, scale, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( 1, sumsq, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, sumsq, 1 ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_slassq_work( n, x, incx, scale, sumsq );
+    return API_SUFFIX(LAPACKE_slassq_work)( n, x, incx, scale, sumsq );
 }
diff --git a/LAPACKE/src/lapacke_slassq_work.c b/LAPACKE/src/lapacke_slassq_work.c
index f206ef4a01..3767f6a84e 100644
--- a/LAPACKE/src/lapacke_slassq_work.c
+++ b/LAPACKE/src/lapacke_slassq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slassq_work( lapack_int n, float* x, lapack_int incx, float* scale, float* sumsq )
+lapack_int API_SUFFIX(LAPACKE_slassq_work)( lapack_int n, const float* x, lapack_int incx, float* scale, float* sumsq )
 {
     lapack_int info = 0;
     LAPACK_slassq( &n, x, &incx, scale, sumsq );
diff --git a/LAPACKE/src/lapacke_slaswp.c b/LAPACKE/src/lapacke_slaswp.c
index d71a2dfbf0..b9905ad1c6 100644
--- a/LAPACKE/src/lapacke_slaswp.c
+++ b/LAPACKE/src/lapacke_slaswp.c
@@ -32,12 +32,12 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slaswp( int matrix_layout, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_slaswp)( int matrix_layout, lapack_int n, float* a,
                            lapack_int lda, lapack_int k1, lapack_int k2,
                            const lapack_int* ipiv, lapack_int incx )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_slaswp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slaswp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
@@ -47,15 +47,15 @@ lapack_int LAPACKE_slaswp( int matrix_layout, lapack_int n, float* a,
     *      Disable the check as is below, the check below was checking for NaN
     *      from lda to n since there is no (obvious) way to knowing m. This is not
     *      a good idea. We could get a lower bound of m by scanning from ipiv. Or
-    *      we could pass on the NaN check to LAPACKE_dlaswp_work. For now disable
+    *      we could pass on the NaN check to API_SUFFIX(LAPACKE_dlaswp_work). For now disable
     *      the buggy Nan check.
     *      See forum: http://icl.cs.utk.edu/lapack-forum/viewtopic.php?t=4827
     *****************************************************************************/
-    /*  if( LAPACKE_sge_nancheck( matrix_layout, lda, n, a, lda ) ) {
+    /*  if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, lda, n, a, lda ) ) {
     *       return -3;
     *   }
     */
     }
 #endif
-    return LAPACKE_slaswp_work( matrix_layout, n, a, lda, k1, k2, ipiv, incx );
+    return API_SUFFIX(LAPACKE_slaswp_work)( matrix_layout, n, a, lda, k1, k2, ipiv, incx );
 }
diff --git a/LAPACKE/src/lapacke_slaswp_work.c b/LAPACKE/src/lapacke_slaswp_work.c
index 32f5c8a4f6..36ddcd3104 100644
--- a/LAPACKE/src/lapacke_slaswp_work.c
+++ b/LAPACKE/src/lapacke_slaswp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slaswp_work( int matrix_layout, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_slaswp_work)( int matrix_layout, lapack_int n, float* a,
                                 lapack_int lda, lapack_int k1, lapack_int k2,
                                 const lapack_int* ipiv, lapack_int incx )
 {
@@ -53,7 +53,7 @@ lapack_int LAPACKE_slaswp_work( int matrix_layout, lapack_int n, float* a,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -4;
-            LAPACKE_xerbla( "LAPACKE_slaswp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slaswp_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,21 +63,21 @@ lapack_int LAPACKE_slaswp_work( int matrix_layout, lapack_int n, float* a,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, lda_t, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, lda_t, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_slaswp( &n, a_t, &lda_t, &k1, &k2, ipiv, &incx );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, lda_t, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, lda_t, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_slaswp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slaswp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_slaswp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slaswp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slatms.c b/LAPACKE/src/lapacke_slatms.c
index 75a9198169..f7028ef07a 100644
--- a/LAPACKE/src/lapacke_slatms.c
+++ b/LAPACKE/src/lapacke_slatms.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slatms( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_slatms)( int matrix_layout, lapack_int m, lapack_int n,
                            char dist, lapack_int* iseed, char sym, float* d,
                            lapack_int mode, float cond, float dmax,
                            lapack_int kl, lapack_int ku, char pack, float* a,
@@ -41,22 +41,22 @@ lapack_int LAPACKE_slatms( int matrix_layout, lapack_int m, lapack_int n,
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_slatms", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slatms", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -14;
         }
-        if( LAPACKE_s_nancheck( 1, &cond, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &cond, 1 ) ) {
             return -9;
         }
-        if( LAPACKE_s_nancheck( MIN(n,m), d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( MIN(n,m), d, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &dmax, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &dmax, 1 ) ) {
             return -10;
         }
     }
@@ -68,13 +68,13 @@ lapack_int LAPACKE_slatms( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_slatms_work( matrix_layout, m, n, dist, iseed, sym, d, mode,
+    info = API_SUFFIX(LAPACKE_slatms_work)( matrix_layout, m, n, dist, iseed, sym, d, mode,
                                 cond, dmax, kl, ku, pack, a, lda, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_slatms", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slatms", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slatms_work.c b/LAPACKE/src/lapacke_slatms_work.c
index 8a66b8525f..42611f7277 100644
--- a/LAPACKE/src/lapacke_slatms_work.c
+++ b/LAPACKE/src/lapacke_slatms_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slatms_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_slatms_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 char dist, lapack_int* iseed, char sym,
                                 float* d, lapack_int mode, float cond,
                                 float dmax, lapack_int kl, lapack_int ku,
@@ -53,7 +53,7 @@ lapack_int LAPACKE_slatms_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_slatms_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slatms_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,7 +63,7 @@ lapack_int LAPACKE_slatms_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_slatms( &m, &n, &dist, iseed, &sym, d, &mode, &cond, &dmax, &kl,
                        &ku, &pack, a_t, &lda_t, work, &info );
@@ -71,16 +71,16 @@ lapack_int LAPACKE_slatms_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_slatms_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slatms_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_slatms_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slatms_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_slauum.c b/LAPACKE/src/lapacke_slauum.c
index 841e6c05fa..5a16d4b69c 100644
--- a/LAPACKE/src/lapacke_slauum.c
+++ b/LAPACKE/src/lapacke_slauum.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slauum( int matrix_layout, char uplo, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_slauum)( int matrix_layout, char uplo, lapack_int n, float* a,
                            lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_slauum", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slauum", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_slauum_work( matrix_layout, uplo, n, a, lda );
+    return API_SUFFIX(LAPACKE_slauum_work)( matrix_layout, uplo, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_slauum_work.c b/LAPACKE/src/lapacke_slauum_work.c
index 54dae6492c..78e9ab2dba 100644
--- a/LAPACKE/src/lapacke_slauum_work.c
+++ b/LAPACKE/src/lapacke_slauum_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_slauum_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_slauum_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_slauum_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_slauum_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slauum_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,23 +58,23 @@ lapack_int LAPACKE_slauum_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_slauum( &uplo, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_slauum_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slauum_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_slauum_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_slauum_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sopgtr.c b/LAPACKE/src/lapacke_sopgtr.c
index 28a2d19585..7b26a2070c 100644
--- a/LAPACKE/src/lapacke_sopgtr.c
+++ b/LAPACKE/src/lapacke_sopgtr.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sopgtr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sopgtr)( int matrix_layout, char uplo, lapack_int n,
                            const float* ap, const float* tau, float* q,
                            lapack_int ldq )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sopgtr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sopgtr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, ap ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, tau, 1 ) ) {
             return -5;
         }
     }
@@ -60,12 +60,12 @@ lapack_int LAPACKE_sopgtr( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sopgtr_work( matrix_layout, uplo, n, ap, tau, q, ldq, work );
+    info = API_SUFFIX(LAPACKE_sopgtr_work)( matrix_layout, uplo, n, ap, tau, q, ldq, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sopgtr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sopgtr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sopgtr_work.c b/LAPACKE/src/lapacke_sopgtr_work.c
index c85d8827f9..be3b193a45 100644
--- a/LAPACKE/src/lapacke_sopgtr_work.c
+++ b/LAPACKE/src/lapacke_sopgtr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sopgtr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sopgtr_work)( int matrix_layout, char uplo, lapack_int n,
                                 const float* ap, const float* tau, float* q,
                                 lapack_int ldq, float* work )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_sopgtr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldq < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sopgtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sopgtr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,25 +66,25 @@ lapack_int LAPACKE_sopgtr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sopgtr( &uplo, &n, ap_t, tau, q_t, &ldq_t, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( q_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sopgtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sopgtr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sopgtr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sopgtr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sopmtr.c b/LAPACKE/src/lapacke_sopmtr.c
index b7a5517578..f51e45d867 100644
--- a/LAPACKE/src/lapacke_sopmtr.c
+++ b/LAPACKE/src/lapacke_sopmtr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sopmtr( int matrix_layout, char side, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_sopmtr)( int matrix_layout, char side, char uplo, char trans,
                            lapack_int m, lapack_int n, const float* ap,
                            const float* tau, float* c, lapack_int ldc )
 {
@@ -42,28 +42,28 @@ lapack_int LAPACKE_sopmtr( int matrix_layout, char side, char uplo, char trans,
     float* work = NULL;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sopmtr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sopmtr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_ssp_nancheck( r, ap ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( r, ap ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -9;
         }
-        if( LAPACKE_s_nancheck( r-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( r-1, tau, 1 ) ) {
             return -8;
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( side, 'l' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
         lwork = MAX(1,n);
-    } else if( LAPACKE_lsame( side, 'r' ) ) {
+    } else if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
         lwork = MAX(1,m);
     } else {
         lwork = 1; /* Any value */
@@ -75,13 +75,13 @@ lapack_int LAPACKE_sopmtr( int matrix_layout, char side, char uplo, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sopmtr_work( matrix_layout, side, uplo, trans, m, n, ap, tau,
+    info = API_SUFFIX(LAPACKE_sopmtr_work)( matrix_layout, side, uplo, trans, m, n, ap, tau,
                                 c, ldc, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sopmtr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sopmtr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sopmtr_work.c b/LAPACKE/src/lapacke_sopmtr_work.c
index 5b7db0c71e..10e7792010 100644
--- a/LAPACKE/src/lapacke_sopmtr_work.c
+++ b/LAPACKE/src/lapacke_sopmtr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sopmtr_work( int matrix_layout, char side, char uplo,
+lapack_int API_SUFFIX(LAPACKE_sopmtr_work)( int matrix_layout, char side, char uplo,
                                 char trans, lapack_int m, lapack_int n,
                                 const float* ap, const float* tau, float* c,
                                 lapack_int ldc, float* work )
@@ -49,12 +49,12 @@ lapack_int LAPACKE_sopmtr_work( int matrix_layout, char side, char uplo,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( ldc < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sopmtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sopmtr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,8 +70,8 @@ lapack_int LAPACKE_sopmtr_work( int matrix_layout, char side, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
-        LAPACKE_ssp_trans( matrix_layout, uplo, r, ap, ap_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, r, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sopmtr( &side, &uplo, &trans, &m, &n, ap_t, tau, c_t, &ldc_t,
                        work, &info );
@@ -79,18 +79,18 @@ lapack_int LAPACKE_sopmtr_work( int matrix_layout, char side, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( c_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sopmtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sopmtr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sopmtr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sopmtr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorbdb.c b/LAPACKE/src/lapacke_sorbdb.c
index 7f652c2c2f..67975b658e 100644
--- a/LAPACKE/src/lapacke_sorbdb.c
+++ b/LAPACKE/src/lapacke_sorbdb.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorbdb( int matrix_layout, char trans, char signs,
+lapack_int API_SUFFIX(LAPACKE_sorbdb)( int matrix_layout, char trans, char signs,
                            lapack_int m, lapack_int p, lapack_int q, float* x11,
                            lapack_int ldx11, float* x12, lapack_int ldx12,
                            float* x21, lapack_int ldx21, float* x22,
@@ -46,10 +46,10 @@ lapack_int LAPACKE_sorbdb( int matrix_layout, char trans, char signs,
     float work_query;
     int lapack_layout;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sorbdb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorbdb", -1 );
         return -1;
     }
-    if( LAPACKE_lsame( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+    if( API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
         lapack_layout = LAPACK_COL_MAJOR;
     } else {
         lapack_layout = LAPACK_ROW_MAJOR;
@@ -57,22 +57,22 @@ lapack_int LAPACKE_sorbdb( int matrix_layout, char trans, char signs,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( lapack_layout, p, q, x11, ldx11 ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( lapack_layout, p, q, x11, ldx11 ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( lapack_layout, p, m-q, x12, ldx12 ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( lapack_layout, p, m-q, x12, ldx12 ) ) {
             return -9;
         }
-        if( LAPACKE_sge_nancheck( lapack_layout, m-p, q, x21, ldx21 ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( lapack_layout, m-p, q, x21, ldx21 ) ) {
             return -11;
         }
-        if( LAPACKE_sge_nancheck( lapack_layout, m-p, m-q, x22, ldx22 ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( lapack_layout, m-p, m-q, x22, ldx22 ) ) {
             return -13;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sorbdb_work( matrix_layout, trans, signs, m, p, q, x11, ldx11,
+    info = API_SUFFIX(LAPACKE_sorbdb_work)( matrix_layout, trans, signs, m, p, q, x11, ldx11,
                                 x12, ldx12, x21, ldx21, x22, ldx22, theta, phi,
                                 taup1, taup2, tauq1, tauq2, &work_query,
                                 lwork );
@@ -87,14 +87,14 @@ lapack_int LAPACKE_sorbdb( int matrix_layout, char trans, char signs,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sorbdb_work( matrix_layout, trans, signs, m, p, q, x11, ldx11,
+    info = API_SUFFIX(LAPACKE_sorbdb_work)( matrix_layout, trans, signs, m, p, q, x11, ldx11,
                                 x12, ldx12, x21, ldx21, x22, ldx22, theta, phi,
                                 taup1, taup2, tauq1, tauq2, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sorbdb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorbdb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorbdb_work.c b/LAPACKE/src/lapacke_sorbdb_work.c
index 9ca4e0b592..b7f6f98d3b 100644
--- a/LAPACKE/src/lapacke_sorbdb_work.c
+++ b/LAPACKE/src/lapacke_sorbdb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorbdb_work( int matrix_layout, char trans, char signs,
+lapack_int API_SUFFIX(LAPACKE_sorbdb_work)( int matrix_layout, char trans, char signs,
                                 lapack_int m, lapack_int p, lapack_int q,
                                 float* x11, lapack_int ldx11, float* x12,
                                 lapack_int ldx12, float* x21, lapack_int ldx21,
@@ -59,7 +59,7 @@ lapack_int LAPACKE_sorbdb_work( int matrix_layout, char trans, char signs,
     if( matrix_layout == LAPACK_COL_MAJOR ||
         matrix_layout == LAPACK_ROW_MAJOR ) {
         char ltrans;
-        if( !LAPACKE_lsame( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+        if( !API_SUFFIX(LAPACKE_lsame)( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
             ltrans = 'n';
         } else {
             ltrans = 't';
@@ -73,7 +73,7 @@ lapack_int LAPACKE_sorbdb_work( int matrix_layout, char trans, char signs,
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sorbdb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorbdb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorcsd.c b/LAPACKE/src/lapacke_sorcsd.c
index 90e94ba94b..c104d138c3 100644
--- a/LAPACKE/src/lapacke_sorcsd.c
+++ b/LAPACKE/src/lapacke_sorcsd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorcsd( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_sorcsd)( int matrix_layout, char jobu1, char jobu2,
                            char jobv1t, char jobv2t, char trans, char signs,
                            lapack_int m, lapack_int p, lapack_int q, float* x11,
                            lapack_int ldx11, float* x12, lapack_int ldx12,
@@ -49,10 +49,10 @@ lapack_int LAPACKE_sorcsd( int matrix_layout, char jobu1, char jobu2,
     float work_query;
     int lapack_layout;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sorcsd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorcsd", -1 );
         return -1;
     }
-    if( LAPACKE_lsame( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+    if( API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
         lapack_layout = LAPACK_COL_MAJOR;
     } else {
         lapack_layout = LAPACK_ROW_MAJOR;
@@ -60,16 +60,16 @@ lapack_int LAPACKE_sorcsd( int matrix_layout, char jobu1, char jobu2,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( lapack_layout, p, q, x11, ldx11 ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( lapack_layout, p, q, x11, ldx11 ) ) {
             return -11;
         }
-        if( LAPACKE_sge_nancheck( lapack_layout, p, m-q, x12, ldx12 ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( lapack_layout, p, m-q, x12, ldx12 ) ) {
             return -13;
         }
-        if( LAPACKE_sge_nancheck( lapack_layout, m-p, q, x21, ldx21 ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( lapack_layout, m-p, q, x21, ldx21 ) ) {
             return -15;
         }
-        if( LAPACKE_sge_nancheck( lapack_layout, m-p, m-q, x22, ldx22 ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( lapack_layout, m-p, m-q, x22, ldx22 ) ) {
             return -17;
         }
     }
@@ -81,7 +81,7 @@ lapack_int LAPACKE_sorcsd( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_sorcsd_work( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
+    info = API_SUFFIX(LAPACKE_sorcsd_work)( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
                                 trans, signs, m, p, q, x11, ldx11, x12, ldx12,
                                 x21, ldx21, x22, ldx22, theta, u1, ldu1, u2,
                                 ldu2, v1t, ldv1t, v2t, ldv2t, &work_query,
@@ -97,7 +97,7 @@ lapack_int LAPACKE_sorcsd( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sorcsd_work( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
+    info = API_SUFFIX(LAPACKE_sorcsd_work)( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
                                 trans, signs, m, p, q, x11, ldx11, x12, ldx12,
                                 x21, ldx21, x22, ldx22, theta, u1, ldu1, u2,
                                 ldu2, v1t, ldv1t, v2t, ldv2t, work, lwork,
@@ -108,7 +108,7 @@ lapack_int LAPACKE_sorcsd( int matrix_layout, char jobu1, char jobu2,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sorcsd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorcsd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorcsd2by1.c b/LAPACKE/src/lapacke_sorcsd2by1.c
index c1af8e874b..48854aba20 100644
--- a/LAPACKE/src/lapacke_sorcsd2by1.c
+++ b/LAPACKE/src/lapacke_sorcsd2by1.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorcsd2by1( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_sorcsd2by1)( int matrix_layout, char jobu1, char jobu2,
                            char jobv1t, lapack_int m, lapack_int p, lapack_int q,
                            float* x11, lapack_int ldx11, float* x21, lapack_int ldx21,
                            float* theta, float* u1, lapack_int ldu1, float* u2,
@@ -45,7 +45,7 @@ lapack_int LAPACKE_sorcsd2by1( int matrix_layout, char jobu1, char jobu2,
     float work_query;
     lapack_int nrows_x11, nrows_x21;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sorcsd2by1", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorcsd2by1", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
@@ -53,11 +53,11 @@ lapack_int LAPACKE_sorcsd2by1( int matrix_layout, char jobu1, char jobu2,
         /* Optionally check input matrices for NaNs */
         nrows_x11 = p;
         nrows_x21 = m-p;
-        if( LAPACKE_sge_nancheck( matrix_layout, nrows_x11, q, x11, ldx11 ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, nrows_x11, q, x11, ldx11 ) ) {
             return -8;
         }
  
-        if( LAPACKE_sge_nancheck( matrix_layout, nrows_x21, q, x21, ldx21 ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, nrows_x21, q, x21, ldx21 ) ) {
             return -9;
         }
     }
@@ -69,7 +69,7 @@ lapack_int LAPACKE_sorcsd2by1( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_sorcsd2by1_work( matrix_layout, jobu1, jobu2, jobv1t, m, p, q,
+    info = API_SUFFIX(LAPACKE_sorcsd2by1_work)( matrix_layout, jobu1, jobu2, jobv1t, m, p, q,
                                 x11, ldx11, x21, ldx21, theta, u1, ldu1, u2,
                                 ldu2, v1t, ldv1t, &work_query,
                                 lwork, iwork );
@@ -84,7 +84,7 @@ lapack_int LAPACKE_sorcsd2by1( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sorcsd2by1_work( matrix_layout, jobu1, jobu2, jobv1t, m, p, q,
+    info = API_SUFFIX(LAPACKE_sorcsd2by1_work)( matrix_layout, jobu1, jobu2, jobv1t, m, p, q,
                                 x11, ldx11, x21, ldx21, theta, u1, ldu1, u2,
                                 ldu2, v1t, ldv1t, work, lwork, iwork );
     /* Release memory and exit */
@@ -93,7 +93,7 @@ lapack_int LAPACKE_sorcsd2by1( int matrix_layout, char jobu1, char jobu2,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sorcsd2by1", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorcsd2by1", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorcsd2by1_work.c b/LAPACKE/src/lapacke_sorcsd2by1_work.c
index d9d70ec43d..b12fd3511e 100644
--- a/LAPACKE/src/lapacke_sorcsd2by1_work.c
+++ b/LAPACKE/src/lapacke_sorcsd2by1_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_sorcsd2by1_work)( int matrix_layout, char jobu1, char jobu2,
                                 char jobv1t, lapack_int m, lapack_int p,
                                 lapack_int q, float* x11, lapack_int ldx11,
                                 float* x21, lapack_int ldx21,
@@ -54,9 +54,9 @@ lapack_int LAPACKE_sorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
         lapack_int nrows_x11 = p;
         lapack_int nrows_x21 = m-p;
-        lapack_int nrows_u1 = ( LAPACKE_lsame( jobu1, 'y' ) ? p : 1);
-        lapack_int nrows_u2 = ( LAPACKE_lsame( jobu2, 'y' ) ? m-p : 1);
-        lapack_int nrows_v1t = ( LAPACKE_lsame( jobv1t, 'y' ) ? q : 1);
+        lapack_int nrows_u1 = ( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ? p : 1);
+        lapack_int nrows_u2 = ( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ? m-p : 1);
+        lapack_int nrows_v1t = ( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ? q : 1);
         lapack_int ldu1_t = MAX(1,nrows_u1);
         lapack_int ldu2_t = MAX(1,nrows_u2);
         lapack_int ldv1t_t = MAX(1,nrows_v1t);
@@ -70,27 +70,27 @@ lapack_int LAPACKE_sorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
         /* Check leading dimension(s) */
         if( ldu1 < p ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_sorcsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorcsd2by1_work", info );
             return info;
         }
         if( ldu2 < m-p ) {
             info = -23;
-            LAPACKE_xerbla( "LAPACKE_sorcsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorcsd2by1_work", info );
             return info;
         }
         if( ldv1t < q ) {
             info = -25;
-            LAPACKE_xerbla( "LAPACKE_sorcsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorcsd2by1_work", info );
             return info;
         }
         if( ldx11 < q ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_sorcsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorcsd2by1_work", info );
             return info;
         }
         if( ldx21 < q ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_sorcsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorcsd2by1_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -112,7 +112,7 @@ lapack_int LAPACKE_sorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu1, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ) {
             u1_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldu1_t * MAX(1,p) );
             if( u1_t == NULL ) {
@@ -120,7 +120,7 @@ lapack_int LAPACKE_sorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobu2, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ) {
             u2_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldu2_t * MAX(1,m-p) );
             if( u2_t == NULL ) {
@@ -128,7 +128,7 @@ lapack_int LAPACKE_sorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobv1t, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ) {
             v1t_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldv1t_t * MAX(1,q) );
             if( v1t_t == NULL ) {
@@ -137,9 +137,9 @@ lapack_int LAPACKE_sorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, nrows_x11, q, x11, ldx11, x11_t,
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, nrows_x11, q, x11, ldx11, x11_t,
                            ldx11_t );
-        LAPACKE_sge_trans( matrix_layout, nrows_x21, q, x21, ldx21, x21_t,
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, nrows_x21, q, x21, ldx21, x21_t,
                            ldx21_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sorcsd2by1( &jobu1, &jobu2, &jobv1t, &m, &p,
@@ -150,32 +150,32 @@ lapack_int LAPACKE_sorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_x11, q, x11_t, ldx11_t, x11,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_x11, q, x11_t, ldx11_t, x11,
                            ldx11 );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_x21, q, x21_t, ldx21_t, x21,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_x21, q, x21_t, ldx21_t, x21,
                            ldx21 );
-        if( LAPACKE_lsame( jobu1, 'y' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_u1, p, u1_t, ldu1_t, u1,
+        if( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_u1, p, u1_t, ldu1_t, u1,
                                ldu1 );
         }
-        if( LAPACKE_lsame( jobu2, 'y' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_u2, m-p, u2_t, ldu2_t,
+        if( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_u2, m-p, u2_t, ldu2_t,
                                u2, ldu2 );
         }
-        if( LAPACKE_lsame( jobv1t, 'y' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrows_v1t, q, v1t_t, ldv1t_t,
+        if( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrows_v1t, q, v1t_t, ldv1t_t,
                                v1t, ldv1t );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobv1t, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ) {
             LAPACKE_free( v1t_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobu2, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ) {
             LAPACKE_free( u2_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu1, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ) {
             LAPACKE_free( u1_t );
         }
 exit_level_2:
@@ -184,11 +184,11 @@ lapack_int LAPACKE_sorcsd2by1_work( int matrix_layout, char jobu1, char jobu2,
         LAPACKE_free( x11_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sorcsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorcsd2by1_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sorcsd2by1_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorcsd2by1_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorcsd_work.c b/LAPACKE/src/lapacke_sorcsd_work.c
index 31c957e841..ea21049305 100644
--- a/LAPACKE/src/lapacke_sorcsd_work.c
+++ b/LAPACKE/src/lapacke_sorcsd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorcsd_work( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_sorcsd_work)( int matrix_layout, char jobu1, char jobu2,
                                 char jobv1t, char jobv2t, char trans,
                                 char signs, lapack_int m, lapack_int p,
                                 lapack_int q, float* x11, lapack_int ldx11,
@@ -62,7 +62,7 @@ lapack_int LAPACKE_sorcsd_work( int matrix_layout, char jobu1, char jobu2,
     if( matrix_layout == LAPACK_COL_MAJOR ||
         matrix_layout == LAPACK_ROW_MAJOR ) {
         char ltrans;
-        if( !LAPACKE_lsame( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+        if( !API_SUFFIX(LAPACKE_lsame)( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
             ltrans = 'n';
         } else {
             ltrans = 't';
@@ -77,7 +77,7 @@ lapack_int LAPACKE_sorcsd_work( int matrix_layout, char jobu1, char jobu2,
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sorcsd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorcsd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorgbr.c b/LAPACKE/src/lapacke_sorgbr.c
index 8cb51dbe11..cd1bfc54c8 100644
--- a/LAPACKE/src/lapacke_sorgbr.c
+++ b/LAPACKE/src/lapacke_sorgbr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorgbr( int matrix_layout, char vect, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_sorgbr)( int matrix_layout, char vect, lapack_int m,
                            lapack_int n, lapack_int k, float* a, lapack_int lda,
                            const float* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_sorgbr( int matrix_layout, char vect, lapack_int m,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sorgbr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgbr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( MIN(m,k), tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( MIN(m,k), tau, 1 ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sorgbr_work( matrix_layout, vect, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_sorgbr_work)( matrix_layout, vect, m, n, k, a, lda, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_sorgbr( int matrix_layout, char vect, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sorgbr_work( matrix_layout, vect, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_sorgbr_work)( matrix_layout, vect, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sorgbr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgbr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorgbr_work.c b/LAPACKE/src/lapacke_sorgbr_work.c
index 2788efe69d..1ac7956c9c 100644
--- a/LAPACKE/src/lapacke_sorgbr_work.c
+++ b/LAPACKE/src/lapacke_sorgbr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorgbr_work( int matrix_layout, char vect, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_sorgbr_work)( int matrix_layout, char vect, lapack_int m,
                                 lapack_int n, lapack_int k, float* a,
                                 lapack_int lda, const float* tau, float* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_sorgbr_work( int matrix_layout, char vect, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sorgbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgbr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,7 +66,7 @@ lapack_int LAPACKE_sorgbr_work( int matrix_layout, char vect, lapack_int m,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sorgbr( &vect, &m, &n, &k, a_t, &lda_t, tau, work, &lwork,
                        &info );
@@ -74,16 +74,16 @@ lapack_int LAPACKE_sorgbr_work( int matrix_layout, char vect, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sorgbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgbr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sorgbr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgbr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorghr.c b/LAPACKE/src/lapacke_sorghr.c
index c1a267ee35..0c07df3532 100644
--- a/LAPACKE/src/lapacke_sorghr.c
+++ b/LAPACKE/src/lapacke_sorghr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorghr( int matrix_layout, lapack_int n, lapack_int ilo,
+lapack_int API_SUFFIX(LAPACKE_sorghr)( int matrix_layout, lapack_int n, lapack_int ilo,
                            lapack_int ihi, float* a, lapack_int lda,
                            const float* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_sorghr( int matrix_layout, lapack_int n, lapack_int ilo,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sorghr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorghr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( n-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sorghr_work( matrix_layout, n, ilo, ihi, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_sorghr_work)( matrix_layout, n, ilo, ihi, a, lda, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_sorghr( int matrix_layout, lapack_int n, lapack_int ilo,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sorghr_work( matrix_layout, n, ilo, ihi, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_sorghr_work)( matrix_layout, n, ilo, ihi, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sorghr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorghr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorghr_work.c b/LAPACKE/src/lapacke_sorghr_work.c
index 949f28bb2b..f6f1d6e2de 100644
--- a/LAPACKE/src/lapacke_sorghr_work.c
+++ b/LAPACKE/src/lapacke_sorghr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorghr_work( int matrix_layout, lapack_int n, lapack_int ilo,
+lapack_int API_SUFFIX(LAPACKE_sorghr_work)( int matrix_layout, lapack_int n, lapack_int ilo,
                                 lapack_int ihi, float* a, lapack_int lda,
                                 const float* tau, float* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_sorghr_work( int matrix_layout, lapack_int n, lapack_int ilo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sorghr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorghr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_sorghr_work( int matrix_layout, lapack_int n, lapack_int ilo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sorghr( &n, &ilo, &ihi, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sorghr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorghr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sorghr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorghr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorglq.c b/LAPACKE/src/lapacke_sorglq.c
index e902c2b74a..1154f4ac64 100644
--- a/LAPACKE/src/lapacke_sorglq.c
+++ b/LAPACKE/src/lapacke_sorglq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorglq( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sorglq)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int k, float* a, lapack_int lda,
                            const float* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_sorglq( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sorglq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorglq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( k, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sorglq_work( matrix_layout, m, n, k, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_sorglq_work)( matrix_layout, m, n, k, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_sorglq( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sorglq_work( matrix_layout, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_sorglq_work)( matrix_layout, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sorglq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorglq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorglq_work.c b/LAPACKE/src/lapacke_sorglq_work.c
index bb8045093a..351c06c279 100644
--- a/LAPACKE/src/lapacke_sorglq_work.c
+++ b/LAPACKE/src/lapacke_sorglq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorglq_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sorglq_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int k, float* a, lapack_int lda,
                                 const float* tau, float* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_sorglq_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sorglq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorglq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_sorglq_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sorglq( &m, &n, &k, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sorglq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorglq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sorglq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorglq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorgql.c b/LAPACKE/src/lapacke_sorgql.c
index f8855ed904..ec5c11c284 100644
--- a/LAPACKE/src/lapacke_sorgql.c
+++ b/LAPACKE/src/lapacke_sorgql.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorgql( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sorgql)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int k, float* a, lapack_int lda,
                            const float* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_sorgql( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sorgql", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgql", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( k, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sorgql_work( matrix_layout, m, n, k, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_sorgql_work)( matrix_layout, m, n, k, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_sorgql( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sorgql_work( matrix_layout, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_sorgql_work)( matrix_layout, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sorgql", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgql", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorgql_work.c b/LAPACKE/src/lapacke_sorgql_work.c
index 7f7fddcdb9..2a312f34d0 100644
--- a/LAPACKE/src/lapacke_sorgql_work.c
+++ b/LAPACKE/src/lapacke_sorgql_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorgql_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sorgql_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int k, float* a, lapack_int lda,
                                 const float* tau, float* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_sorgql_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sorgql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgql_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_sorgql_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sorgql( &m, &n, &k, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sorgql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgql_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sorgql_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgql_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorgqr.c b/LAPACKE/src/lapacke_sorgqr.c
index 1e6688c344..d05430943c 100644
--- a/LAPACKE/src/lapacke_sorgqr.c
+++ b/LAPACKE/src/lapacke_sorgqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorgqr( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sorgqr)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int k, float* a, lapack_int lda,
                            const float* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_sorgqr( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sorgqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( k, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sorgqr_work( matrix_layout, m, n, k, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_sorgqr_work)( matrix_layout, m, n, k, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_sorgqr( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sorgqr_work( matrix_layout, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_sorgqr_work)( matrix_layout, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sorgqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorgqr_work.c b/LAPACKE/src/lapacke_sorgqr_work.c
index 4407ec8877..1c191f76ed 100644
--- a/LAPACKE/src/lapacke_sorgqr_work.c
+++ b/LAPACKE/src/lapacke_sorgqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorgqr_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sorgqr_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int k, float* a, lapack_int lda,
                                 const float* tau, float* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_sorgqr_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sorgqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_sorgqr_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sorgqr( &m, &n, &k, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sorgqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sorgqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorgrq.c b/LAPACKE/src/lapacke_sorgrq.c
index 51cabe03a0..c1310e3678 100644
--- a/LAPACKE/src/lapacke_sorgrq.c
+++ b/LAPACKE/src/lapacke_sorgrq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorgrq( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sorgrq)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int k, float* a, lapack_int lda,
                            const float* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_sorgrq( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sorgrq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgrq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( k, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sorgrq_work( matrix_layout, m, n, k, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_sorgrq_work)( matrix_layout, m, n, k, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_sorgrq( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sorgrq_work( matrix_layout, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_sorgrq_work)( matrix_layout, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sorgrq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgrq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorgrq_work.c b/LAPACKE/src/lapacke_sorgrq_work.c
index 290a50f84e..baf0c81e1f 100644
--- a/LAPACKE/src/lapacke_sorgrq_work.c
+++ b/LAPACKE/src/lapacke_sorgrq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorgrq_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sorgrq_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int k, float* a, lapack_int lda,
                                 const float* tau, float* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_sorgrq_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sorgrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgrq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_sorgrq_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sorgrq( &m, &n, &k, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sorgrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgrq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sorgrq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgrq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorgtr.c b/LAPACKE/src/lapacke_sorgtr.c
index c79b66fe47..bc7a9ebaaa 100644
--- a/LAPACKE/src/lapacke_sorgtr.c
+++ b/LAPACKE/src/lapacke_sorgtr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorgtr( int matrix_layout, char uplo, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_sorgtr)( int matrix_layout, char uplo, lapack_int n, float* a,
                            lapack_int lda, const float* tau )
 {
     lapack_int info = 0;
@@ -40,22 +40,22 @@ lapack_int LAPACKE_sorgtr( int matrix_layout, char uplo, lapack_int n, float* a,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sorgtr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgtr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, tau, 1 ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sorgtr_work( matrix_layout, uplo, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_sorgtr_work)( matrix_layout, uplo, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -68,13 +68,13 @@ lapack_int LAPACKE_sorgtr( int matrix_layout, char uplo, lapack_int n, float* a,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sorgtr_work( matrix_layout, uplo, n, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_sorgtr_work)( matrix_layout, uplo, n, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sorgtr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgtr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorgtr_work.c b/LAPACKE/src/lapacke_sorgtr_work.c
index 0a93eefa9c..ee8b9858a5 100644
--- a/LAPACKE/src/lapacke_sorgtr_work.c
+++ b/LAPACKE/src/lapacke_sorgtr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorgtr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sorgtr_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* a, lapack_int lda, const float* tau,
                                 float* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_sorgtr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_sorgtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgtr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_sorgtr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sorgtr( &uplo, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sorgtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgtr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sorgtr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgtr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sorgtsqr_row.c b/LAPACKE/src/lapacke_sorgtsqr_row.c
index 350783a78f..555765b10e 100644
--- a/LAPACKE/src/lapacke_sorgtsqr_row.c
+++ b/LAPACKE/src/lapacke_sorgtsqr_row.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorgtsqr_row( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sorgtsqr_row)( int matrix_layout, lapack_int m, lapack_int n,
                                  lapack_int mb, lapack_int nb,
                                  float* a, lapack_int lda,
                                  const float* t, lapack_int ldt )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_sorgtsqr_row( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sorgtsqr_row", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgtsqr_row", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, nb, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, nb, n, t, ldt ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sorgtsqr_row_work( matrix_layout, m, n, mb, nb,
+    info = API_SUFFIX(LAPACKE_sorgtsqr_row_work)( matrix_layout, m, n, mb, nb,
                                       a, lda, t, ldt, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_sorgtsqr_row( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sorgtsqr_row_work( matrix_layout, m, n, mb, nb,
+    info = API_SUFFIX(LAPACKE_sorgtsqr_row_work)( matrix_layout, m, n, mb, nb,
                                       a, lda, t, ldt, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sorgtsqr_row", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgtsqr_row", info );
     }
     return info;
 }
\ No newline at end of file
diff --git a/LAPACKE/src/lapacke_sorgtsqr_row_work.c b/LAPACKE/src/lapacke_sorgtsqr_row_work.c
index a66f70b526..67a0198ab9 100644
--- a/LAPACKE/src/lapacke_sorgtsqr_row_work.c
+++ b/LAPACKE/src/lapacke_sorgtsqr_row_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sorgtsqr_row_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sorgtsqr_row_work)( int matrix_layout, lapack_int m, lapack_int n,
                                       lapack_int mb, lapack_int nb,
                                       float* a, lapack_int lda,
                                       const float* t, lapack_int ldt,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_sorgtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sorgtsqr_row_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgtsqr_row_work", info );
             return info;
         }
         lapack_int ldt_t = MAX(1,nb);
@@ -60,7 +60,7 @@ lapack_int LAPACKE_sorgtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
         /* Check leading dimension(s) */
         if( ldt < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sorgtsqr_row_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgtsqr_row_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -81,8 +81,8 @@ lapack_int LAPACKE_sorgtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, nb, n, a, lda, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, nb, n, a, lda, t_t, ldt_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sorgtsqr_row( &m, &n, &mb, &nb, a_t, &lda_t, t_t, &ldt_t,
                              work, &lwork, &info );
@@ -90,7 +90,7 @@ lapack_int LAPACKE_sorgtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
 
         /* Release memory and exit */
         LAPACKE_free( t_t );
@@ -98,11 +98,11 @@ lapack_int LAPACKE_sorgtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sorgtsqr_row_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgtsqr_row_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sorgtsqr_row_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorgtsqr_row_work", info );
     }
     return info;
 }
\ No newline at end of file
diff --git a/LAPACKE/src/lapacke_sorhr_col.c b/LAPACKE/src/lapacke_sorhr_col.c
new file mode 100644
index 0000000000..372bd59712
--- /dev/null
+++ b/LAPACKE/src/lapacke_sorhr_col.c
@@ -0,0 +1,24 @@
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_sorhr_col)( int matrix_layout, lapack_int m, lapack_int n,
+                              lapack_int nb, float* a,
+                              lapack_int lda, float* t,
+                              lapack_int ldt, float* d)
+{
+  lapack_int info = 0;
+  if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+    API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorhr_col", -1 );
+    return -1;
+  }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+  if( LAPACKE_get_nancheck() ) {
+    /* Optionally check input matrices for NaNs */
+    if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
+      return -5;
+    }
+  }
+#endif
+  /* Call middle-level interface */
+  info = API_SUFFIX(LAPACKE_sorhr_col_work)( matrix_layout, m, n, nb, a, lda, t, ldt, d );
+  return info;
+}
diff --git a/LAPACKE/src/lapacke_sorhr_col_work.c b/LAPACKE/src/lapacke_sorhr_col_work.c
new file mode 100644
index 0000000000..0d3d6387f6
--- /dev/null
+++ b/LAPACKE/src/lapacke_sorhr_col_work.c
@@ -0,0 +1,69 @@
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_sorhr_col_work)( int matrix_layout, lapack_int m, lapack_int n,
+                                   lapack_int nb, float* a,
+                                   lapack_int lda, float* t,
+                                   lapack_int ldt, float* d )
+{
+    lapack_int info = 0;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        LAPACK_sorhr_col( &m, &n, &nb, a, &lda, t, &ldt, d, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        lapack_int lda_t = MAX(1,m);
+        lapack_int ldt_t = MAX(1,MIN(nb,n));
+        float* a_t = NULL;
+        float* t_t = NULL;
+        /* Check leading dimension(s) */
+        if( lda < n ) {
+            info = -6;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorhr_col_work", info );
+            return info;
+        }
+        if( ldt < n ) {
+            info = -8;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorhr_col_work", info );
+            return info;
+        }
+        /* Allocate memory for temporary array(s) */
+        a_t = (float*)
+            LAPACKE_malloc( sizeof(float) * lda_t * MAX(1,n) );
+        if( a_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+        t_t = (float*)
+            LAPACKE_malloc( sizeof(float) *
+                            ldt_t * MAX(1,n) );
+        if( t_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_1;
+        }
+        /* Transpose input matrices */
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        /* Call LAPACK function and adjust info */
+        LAPACK_sorhr_col( &m, &n, &nb, a_t, &lda_t, t_t, &ldt_t, d, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+        /* Transpose output matrices */
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, ldt, n, t_t, ldt_t, t,
+                           ldt );
+        /* Release memory and exit */
+        LAPACKE_free( t_t );
+exit_level_1:
+        LAPACKE_free( a_t );
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorhr_col_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sorhr_col_work", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_sormbr.c b/LAPACKE/src/lapacke_sormbr.c
index cac61a6d5d..e962a668da 100644
--- a/LAPACKE/src/lapacke_sormbr.c
+++ b/LAPACKE/src/lapacke_sormbr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sormbr( int matrix_layout, char vect, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sormbr)( int matrix_layout, char vect, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const float* a, lapack_int lda, const float* tau,
                            float* c, lapack_int ldc )
@@ -43,28 +43,28 @@ lapack_int LAPACKE_sormbr( int matrix_layout, char vect, char side, char trans,
     float work_query;
     lapack_int nq, ar, ac;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sormbr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormbr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        nq = LAPACKE_lsame( side, 'l' ) ? m : n;
-        ar = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k);
-        ac = LAPACKE_lsame( vect, 'q' ) ? MIN(nq,k) : nq;
-        if( LAPACKE_sge_nancheck( matrix_layout, ar, ac, a, lda ) ) {
+        nq = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        ar = API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ? nq : MIN(nq,k);
+        ac = API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ? MIN(nq,k) : nq;
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, ar, ac, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -11;
         }
-        if( LAPACKE_s_nancheck( MIN(nq,k), tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( MIN(nq,k), tau, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sormbr_work( matrix_layout, vect, side, trans, m, n, k, a,
+    info = API_SUFFIX(LAPACKE_sormbr_work)( matrix_layout, vect, side, trans, m, n, k, a,
                                 lda, tau, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -77,13 +77,13 @@ lapack_int LAPACKE_sormbr( int matrix_layout, char vect, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sormbr_work( matrix_layout, vect, side, trans, m, n, k, a,
+    info = API_SUFFIX(LAPACKE_sormbr_work)( matrix_layout, vect, side, trans, m, n, k, a,
                                 lda, tau, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sormbr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormbr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sormbr_work.c b/LAPACKE/src/lapacke_sormbr_work.c
index 9d78a45800..e40a291eb2 100644
--- a/LAPACKE/src/lapacke_sormbr_work.c
+++ b/LAPACKE/src/lapacke_sormbr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sormbr_work( int matrix_layout, char vect, char side,
+lapack_int API_SUFFIX(LAPACKE_sormbr_work)( int matrix_layout, char vect, char side,
                                 char trans, lapack_int m, lapack_int n,
                                 lapack_int k, const float* a, lapack_int lda,
                                 const float* tau, float* c, lapack_int ldc,
@@ -47,9 +47,9 @@ lapack_int LAPACKE_sormbr_work( int matrix_layout, char vect, char side,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nq = LAPACKE_lsame( side, 'l' ) ? m : n;
-        lapack_int ar = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k);
-        lapack_int ac = LAPACKE_lsame( vect, 'q' ) ? MIN(nq,k) : nq;
+        lapack_int nq = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        lapack_int ar = API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ? nq : MIN(nq,k);
+        lapack_int ac = API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ? MIN(nq,k) : nq;
         lapack_int lda_t = MAX(1,ar);
         lapack_int ldc_t = MAX(1,m);
         float *a_t = NULL;
@@ -57,12 +57,12 @@ lapack_int LAPACKE_sormbr_work( int matrix_layout, char vect, char side,
         /* Check leading dimension(s) */
         if( lda < ac ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sormbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormbr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_sormbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormbr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_sormbr_work( int matrix_layout, char vect, char side,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, ar, ac, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, ar, ac, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sormbr( &vect, &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t,
                        &ldc_t, work, &lwork, &info );
@@ -92,18 +92,18 @@ lapack_int LAPACKE_sormbr_work( int matrix_layout, char vect, char side,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sormbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormbr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sormbr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormbr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sormhr.c b/LAPACKE/src/lapacke_sormhr.c
index 99c635dc2e..54aab7bc72 100644
--- a/LAPACKE/src/lapacke_sormhr.c
+++ b/LAPACKE/src/lapacke_sormhr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sormhr( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sormhr)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int ilo,
                            lapack_int ihi, const float* a, lapack_int lda,
                            const float* tau, float* c, lapack_int ldc )
@@ -43,26 +43,26 @@ lapack_int LAPACKE_sormhr( int matrix_layout, char side, char trans,
     float work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sormhr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormhr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_sge_nancheck( matrix_layout, r, r, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, r, r, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -11;
         }
-        if( LAPACKE_s_nancheck( r-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( r-1, tau, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sormhr_work( matrix_layout, side, trans, m, n, ilo, ihi, a,
+    info = API_SUFFIX(LAPACKE_sormhr_work)( matrix_layout, side, trans, m, n, ilo, ihi, a,
                                 lda, tau, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_sormhr( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sormhr_work( matrix_layout, side, trans, m, n, ilo, ihi, a,
+    info = API_SUFFIX(LAPACKE_sormhr_work)( matrix_layout, side, trans, m, n, ilo, ihi, a,
                                 lda, tau, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sormhr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormhr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sormhr_work.c b/LAPACKE/src/lapacke_sormhr_work.c
index 754aa7bb8a..3025dc610a 100644
--- a/LAPACKE/src/lapacke_sormhr_work.c
+++ b/LAPACKE/src/lapacke_sormhr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sormhr_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sormhr_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int ilo,
                                 lapack_int ihi, const float* a, lapack_int lda,
                                 const float* tau, float* c, lapack_int ldc,
@@ -50,18 +50,18 @@ lapack_int LAPACKE_sormhr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lda_t = MAX(1,r);
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( lda < r ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sormhr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormhr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_sormhr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormhr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -82,8 +82,8 @@ lapack_int LAPACKE_sormhr_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, r, r, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, r, r, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sormhr( &side, &trans, &m, &n, &ilo, &ihi, a_t, &lda_t, tau, c_t,
                        &ldc_t, work, &lwork, &info );
@@ -91,18 +91,18 @@ lapack_int LAPACKE_sormhr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sormhr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormhr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sormhr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormhr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sormlq.c b/LAPACKE/src/lapacke_sormlq.c
index 1eac482a2e..4e0568a750 100644
--- a/LAPACKE/src/lapacke_sormlq.c
+++ b/LAPACKE/src/lapacke_sormlq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sormlq( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sormlq)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const float* a, lapack_int lda, const float* tau,
                            float* c, lapack_int ldc )
@@ -42,26 +42,26 @@ lapack_int LAPACKE_sormlq( int matrix_layout, char side, char trans,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sormlq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormlq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_sge_nancheck( matrix_layout, k, r, a, lda ) ) {
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, k, r, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_s_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( k, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sormlq_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_sormlq_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -74,13 +74,13 @@ lapack_int LAPACKE_sormlq( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sormlq_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_sormlq_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sormlq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormlq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sormlq_work.c b/LAPACKE/src/lapacke_sormlq_work.c
index 9058f5bb63..03ea0f95d4 100644
--- a/LAPACKE/src/lapacke_sormlq_work.c
+++ b/LAPACKE/src/lapacke_sormlq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sormlq_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sormlq_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const float* a, lapack_int lda,
                                 const float* tau, float* c, lapack_int ldc,
@@ -47,7 +47,7 @@ lapack_int LAPACKE_sormlq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lapack_int lda_t = MAX(1,k);
         lapack_int ldc_t = MAX(1,m);
         float *a_t = NULL;
@@ -55,12 +55,12 @@ lapack_int LAPACKE_sormlq_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < r ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sormlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormlq_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sormlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormlq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -81,8 +81,8 @@ lapack_int LAPACKE_sormlq_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, k, r, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, k, r, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sormlq( &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t, &ldc_t,
                        work, &lwork, &info );
@@ -90,18 +90,18 @@ lapack_int LAPACKE_sormlq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sormlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormlq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sormlq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormlq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sormql.c b/LAPACKE/src/lapacke_sormql.c
index bbc7634eb8..df14532008 100644
--- a/LAPACKE/src/lapacke_sormql.c
+++ b/LAPACKE/src/lapacke_sormql.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sormql( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sormql)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const float* a, lapack_int lda, const float* tau,
                            float* c, lapack_int ldc )
@@ -43,26 +43,26 @@ lapack_int LAPACKE_sormql( int matrix_layout, char side, char trans,
     float work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sormql", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormql", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_sge_nancheck( matrix_layout, r, k, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, r, k, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_s_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( k, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sormql_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_sormql_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_sormql( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sormql_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_sormql_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sormql", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormql", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sormql_work.c b/LAPACKE/src/lapacke_sormql_work.c
index 1f399c755b..e22342fbc4 100644
--- a/LAPACKE/src/lapacke_sormql_work.c
+++ b/LAPACKE/src/lapacke_sormql_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sormql_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sormql_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const float* a, lapack_int lda,
                                 const float* tau, float* c, lapack_int ldc,
@@ -50,18 +50,18 @@ lapack_int LAPACKE_sormql_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lda_t = MAX(1,r);
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( lda < k ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sormql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormql_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sormql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormql_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -82,8 +82,8 @@ lapack_int LAPACKE_sormql_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, r, k, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, r, k, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sormql( &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t, &ldc_t,
                        work, &lwork, &info );
@@ -91,18 +91,18 @@ lapack_int LAPACKE_sormql_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sormql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormql_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sormql_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormql_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sormqr.c b/LAPACKE/src/lapacke_sormqr.c
index 9fd7b2a149..28b1d65e4b 100644
--- a/LAPACKE/src/lapacke_sormqr.c
+++ b/LAPACKE/src/lapacke_sormqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sormqr( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sormqr)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const float* a, lapack_int lda, const float* tau,
                            float* c, lapack_int ldc )
@@ -43,26 +43,26 @@ lapack_int LAPACKE_sormqr( int matrix_layout, char side, char trans,
     float work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sormqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_sge_nancheck( matrix_layout, r, k, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, r, k, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_s_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( k, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sormqr_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_sormqr_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_sormqr( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sormqr_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_sormqr_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sormqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sormqr_work.c b/LAPACKE/src/lapacke_sormqr_work.c
index 1cb7875812..973f90711f 100644
--- a/LAPACKE/src/lapacke_sormqr_work.c
+++ b/LAPACKE/src/lapacke_sormqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sormqr_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sormqr_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const float* a, lapack_int lda,
                                 const float* tau, float* c, lapack_int ldc,
@@ -50,18 +50,18 @@ lapack_int LAPACKE_sormqr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lda_t = MAX(1,r);
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( lda < k ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sormqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormqr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sormqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -82,8 +82,8 @@ lapack_int LAPACKE_sormqr_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, r, k, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, r, k, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sormqr( &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t, &ldc_t,
                        work, &lwork, &info );
@@ -91,18 +91,18 @@ lapack_int LAPACKE_sormqr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sormqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sormqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sormrq.c b/LAPACKE/src/lapacke_sormrq.c
index 5570c0bb0a..b9b1124672 100644
--- a/LAPACKE/src/lapacke_sormrq.c
+++ b/LAPACKE/src/lapacke_sormrq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sormrq( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sormrq)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const float* a, lapack_int lda, const float* tau,
                            float* c, lapack_int ldc )
@@ -42,25 +42,25 @@ lapack_int LAPACKE_sormrq( int matrix_layout, char side, char trans,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sormrq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormrq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, k, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, k, m, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_s_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( k, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sormrq_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_sormrq_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -73,13 +73,13 @@ lapack_int LAPACKE_sormrq( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sormrq_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_sormrq_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sormrq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormrq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sormrq_work.c b/LAPACKE/src/lapacke_sormrq_work.c
index d773f32b08..e7bc80558e 100644
--- a/LAPACKE/src/lapacke_sormrq_work.c
+++ b/LAPACKE/src/lapacke_sormrq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sormrq_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sormrq_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const float* a, lapack_int lda,
                                 const float* tau, float* c, lapack_int ldc,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_sormrq_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sormrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormrq_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sormrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormrq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -80,8 +80,8 @@ lapack_int LAPACKE_sormrq_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, k, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sormrq( &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t, &ldc_t,
                        work, &lwork, &info );
@@ -89,18 +89,18 @@ lapack_int LAPACKE_sormrq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sormrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormrq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sormrq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormrq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sormrz.c b/LAPACKE/src/lapacke_sormrz.c
index d6f7f0182d..d70f764a4a 100644
--- a/LAPACKE/src/lapacke_sormrz.c
+++ b/LAPACKE/src/lapacke_sormrz.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sormrz( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sormrz)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            lapack_int l, const float* a, lapack_int lda,
                            const float* tau, float* c, lapack_int ldc )
@@ -42,25 +42,25 @@ lapack_int LAPACKE_sormrz( int matrix_layout, char side, char trans,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sormrz", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormrz", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, k, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, k, m, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -11;
         }
-        if( LAPACKE_s_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( k, tau, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sormrz_work( matrix_layout, side, trans, m, n, k, l, a, lda,
+    info = API_SUFFIX(LAPACKE_sormrz_work)( matrix_layout, side, trans, m, n, k, l, a, lda,
                                 tau, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -73,13 +73,13 @@ lapack_int LAPACKE_sormrz( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sormrz_work( matrix_layout, side, trans, m, n, k, l, a, lda,
+    info = API_SUFFIX(LAPACKE_sormrz_work)( matrix_layout, side, trans, m, n, k, l, a, lda,
                                 tau, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sormrz", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormrz", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sormrz_work.c b/LAPACKE/src/lapacke_sormrz_work.c
index 885138a448..4860ac89d9 100644
--- a/LAPACKE/src/lapacke_sormrz_work.c
+++ b/LAPACKE/src/lapacke_sormrz_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sormrz_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_sormrz_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 lapack_int l, const float* a, lapack_int lda,
                                 const float* tau, float* c, lapack_int ldc,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_sormrz_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sormrz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormrz_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_sormrz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormrz_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -80,8 +80,8 @@ lapack_int LAPACKE_sormrz_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, k, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sormrz( &side, &trans, &m, &n, &k, &l, a_t, &lda_t, tau, c_t,
                        &ldc_t, work, &lwork, &info );
@@ -89,18 +89,18 @@ lapack_int LAPACKE_sormrz_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sormrz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormrz_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sormrz_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormrz_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sormtr.c b/LAPACKE/src/lapacke_sormtr.c
index 171cc4fc3d..5552b9a95f 100644
--- a/LAPACKE/src/lapacke_sormtr.c
+++ b/LAPACKE/src/lapacke_sormtr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sormtr( int matrix_layout, char side, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_sormtr)( int matrix_layout, char side, char uplo, char trans,
                            lapack_int m, lapack_int n, const float* a,
                            lapack_int lda, const float* tau, float* c,
                            lapack_int ldc )
@@ -43,26 +43,26 @@ lapack_int LAPACKE_sormtr( int matrix_layout, char side, char uplo, char trans,
     float work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sormtr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormtr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, r, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, r, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_s_nancheck( r-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( r-1, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sormtr_work( matrix_layout, side, uplo, trans, m, n, a, lda,
+    info = API_SUFFIX(LAPACKE_sormtr_work)( matrix_layout, side, uplo, trans, m, n, a, lda,
                                 tau, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_sormtr( int matrix_layout, char side, char uplo, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sormtr_work( matrix_layout, side, uplo, trans, m, n, a, lda,
+    info = API_SUFFIX(LAPACKE_sormtr_work)( matrix_layout, side, uplo, trans, m, n, a, lda,
                                 tau, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sormtr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormtr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sormtr_work.c b/LAPACKE/src/lapacke_sormtr_work.c
index ba82ebdaf3..c7238a1a1c 100644
--- a/LAPACKE/src/lapacke_sormtr_work.c
+++ b/LAPACKE/src/lapacke_sormtr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sormtr_work( int matrix_layout, char side, char uplo,
+lapack_int API_SUFFIX(LAPACKE_sormtr_work)( int matrix_layout, char side, char uplo,
                                 char trans, lapack_int m, lapack_int n,
                                 const float* a, lapack_int lda,
                                 const float* tau, float* c, lapack_int ldc,
@@ -49,18 +49,18 @@ lapack_int LAPACKE_sormtr_work( int matrix_layout, char side, char uplo,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lda_t = MAX(1,r);
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( lda < r ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sormtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormtr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sormtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormtr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -81,8 +81,8 @@ lapack_int LAPACKE_sormtr_work( int matrix_layout, char side, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, r, r, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, r, r, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sormtr( &side, &uplo, &trans, &m, &n, a_t, &lda_t, tau, c_t,
                        &ldc_t, work, &lwork, &info );
@@ -90,18 +90,18 @@ lapack_int LAPACKE_sormtr_work( int matrix_layout, char side, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sormtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormtr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sormtr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sormtr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spbcon.c b/LAPACKE/src/lapacke_spbcon.c
index aff83c5225..0b474da193 100644
--- a/LAPACKE/src/lapacke_spbcon.c
+++ b/LAPACKE/src/lapacke_spbcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spbcon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spbcon)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, const float* ab, lapack_int ldab,
                            float anorm, float* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_spbcon( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spbcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_spb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -7;
         }
     }
@@ -66,7 +66,7 @@ lapack_int LAPACKE_spbcon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_spbcon_work( matrix_layout, uplo, n, kd, ab, ldab, anorm,
+    info = API_SUFFIX(LAPACKE_spbcon_work)( matrix_layout, uplo, n, kd, ab, ldab, anorm,
                                 rcond, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -74,7 +74,7 @@ lapack_int LAPACKE_spbcon( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_spbcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spbcon_work.c b/LAPACKE/src/lapacke_spbcon_work.c
index 7db74b4761..48f0db9f4a 100644
--- a/LAPACKE/src/lapacke_spbcon_work.c
+++ b/LAPACKE/src/lapacke_spbcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spbcon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spbcon_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, const float* ab, lapack_int ldab,
                                 float anorm, float* rcond, float* work,
                                 lapack_int* iwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_spbcon_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_spbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbcon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_spbcon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_spb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_spb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spbcon( &uplo, &n, &kd, ab_t, &ldab_t, &anorm, rcond, work,
                        iwork, &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_spbcon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spbcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spbequ.c b/LAPACKE/src/lapacke_spbequ.c
index bffea674dd..4b1fab9fb5 100644
--- a/LAPACKE/src/lapacke_spbequ.c
+++ b/LAPACKE/src/lapacke_spbequ.c
@@ -32,22 +32,22 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spbequ( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spbequ)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, const float* ab, lapack_int ldab,
                            float* s, float* scond, float* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spbequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_spb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_spbequ_work( matrix_layout, uplo, n, kd, ab, ldab, s, scond,
+    return API_SUFFIX(LAPACKE_spbequ_work)( matrix_layout, uplo, n, kd, ab, ldab, s, scond,
                                 amax );
 }
diff --git a/LAPACKE/src/lapacke_spbequ_work.c b/LAPACKE/src/lapacke_spbequ_work.c
index 8e1e2baf2a..b5bda9973d 100644
--- a/LAPACKE/src/lapacke_spbequ_work.c
+++ b/LAPACKE/src/lapacke_spbequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spbequ_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spbequ_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, const float* ab, lapack_int ldab,
                                 float* s, float* scond, float* amax )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_spbequ_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_spbequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbequ_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,7 +59,7 @@ lapack_int LAPACKE_spbequ_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_spb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_spb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spbequ( &uplo, &n, &kd, ab_t, &ldab_t, s, scond, amax, &info );
         if( info < 0 ) {
@@ -69,11 +69,11 @@ lapack_int LAPACKE_spbequ_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spbequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spbequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spbrfs.c b/LAPACKE/src/lapacke_spbrfs.c
index 894b6be8ac..58fa250074 100644
--- a/LAPACKE/src/lapacke_spbrfs.c
+++ b/LAPACKE/src/lapacke_spbrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spbrfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spbrfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, lapack_int nrhs, const float* ab,
                            lapack_int ldab, const float* afb, lapack_int ldafb,
                            const float* b, lapack_int ldb, float* x,
@@ -42,22 +42,22 @@ lapack_int LAPACKE_spbrfs( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spbrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_spb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_spb_nancheck( matrix_layout, uplo, n, kd, afb, ldafb ) ) {
+        if( API_SUFFIX(LAPACKE_spb_nancheck)( matrix_layout, uplo, n, kd, afb, ldafb ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -74,7 +74,7 @@ lapack_int LAPACKE_spbrfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_spbrfs_work( matrix_layout, uplo, n, kd, nrhs, ab, ldab, afb,
+    info = API_SUFFIX(LAPACKE_spbrfs_work)( matrix_layout, uplo, n, kd, nrhs, ab, ldab, afb,
                                 ldafb, b, ldb, x, ldx, ferr, berr, work,
                                 iwork );
     /* Release memory and exit */
@@ -83,7 +83,7 @@ lapack_int LAPACKE_spbrfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_spbrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spbrfs_work.c b/LAPACKE/src/lapacke_spbrfs_work.c
index 7450f3f9a8..d296a2ebfc 100644
--- a/LAPACKE/src/lapacke_spbrfs_work.c
+++ b/LAPACKE/src/lapacke_spbrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spbrfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spbrfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, lapack_int nrhs, const float* ab,
                                 lapack_int ldab, const float* afb,
                                 lapack_int ldafb, const float* b,
@@ -60,22 +60,22 @@ lapack_int LAPACKE_spbrfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_spbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbrfs_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_spbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_spbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_spbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -100,11 +100,11 @@ lapack_int LAPACKE_spbrfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_spb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        LAPACKE_spb_trans( matrix_layout, uplo, n, kd, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_spb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_spb_trans)( matrix_layout, uplo, n, kd, afb, ldafb, afb_t,
                            ldafb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spbrfs( &uplo, &n, &kd, &nrhs, ab_t, &ldab_t, afb_t, &ldafb_t,
                        b_t, &ldb_t, x_t, &ldx_t, ferr, berr, work, iwork,
@@ -113,7 +113,7 @@ lapack_int LAPACKE_spbrfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -124,11 +124,11 @@ lapack_int LAPACKE_spbrfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spbrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spbstf.c b/LAPACKE/src/lapacke_spbstf.c
index 46e795d5c9..68df2dab6b 100644
--- a/LAPACKE/src/lapacke_spbstf.c
+++ b/LAPACKE/src/lapacke_spbstf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spbstf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spbstf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kb, float* bb, lapack_int ldbb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spbstf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbstf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_spb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_spbstf_work( matrix_layout, uplo, n, kb, bb, ldbb );
+    return API_SUFFIX(LAPACKE_spbstf_work)( matrix_layout, uplo, n, kb, bb, ldbb );
 }
diff --git a/LAPACKE/src/lapacke_spbstf_work.c b/LAPACKE/src/lapacke_spbstf_work.c
index 10824426bd..2bf8f41a29 100644
--- a/LAPACKE/src/lapacke_spbstf_work.c
+++ b/LAPACKE/src/lapacke_spbstf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spbstf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spbstf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kb, float* bb, lapack_int ldbb )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_spbstf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldbb < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_spbstf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbstf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,24 +58,24 @@ lapack_int LAPACKE_spbstf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_spb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_spb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spbstf( &uplo, &n, &kb, bb_t, &ldbb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_spb_trans( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
+        API_SUFFIX(LAPACKE_spb_trans)( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
                            ldbb );
         /* Release memory and exit */
         LAPACKE_free( bb_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spbstf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbstf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spbstf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbstf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spbsv.c b/LAPACKE/src/lapacke_spbsv.c
index 4a340fc23d..8037bbdb6e 100644
--- a/LAPACKE/src/lapacke_spbsv.c
+++ b/LAPACKE/src/lapacke_spbsv.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spbsv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spbsv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int kd, lapack_int nrhs, float* ab,
                           lapack_int ldab, float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spbsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_spb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_spbsv_work( matrix_layout, uplo, n, kd, nrhs, ab, ldab, b,
+    return API_SUFFIX(LAPACKE_spbsv_work)( matrix_layout, uplo, n, kd, nrhs, ab, ldab, b,
                                ldb );
 }
diff --git a/LAPACKE/src/lapacke_spbsv_work.c b/LAPACKE/src/lapacke_spbsv_work.c
index 458b8b6901..952f7de2a3 100644
--- a/LAPACKE/src/lapacke_spbsv_work.c
+++ b/LAPACKE/src/lapacke_spbsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spbsv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spbsv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int kd, lapack_int nrhs, float* ab,
                                lapack_int ldab, float* b, lapack_int ldb )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_spbsv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_spbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbsv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_spbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,8 +71,8 @@ lapack_int LAPACKE_spbsv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_spb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_spb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spbsv( &uplo, &n, &kd, &nrhs, ab_t, &ldab_t, b_t, &ldb_t,
                       &info );
@@ -80,20 +80,20 @@ lapack_int LAPACKE_spbsv_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_spb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_spb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spbsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spbsvx.c b/LAPACKE/src/lapacke_spbsvx.c
index 5e46948f3f..f5c00a71db 100644
--- a/LAPACKE/src/lapacke_spbsvx.c
+++ b/LAPACKE/src/lapacke_spbsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spbsvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spbsvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int kd, lapack_int nrhs, float* ab,
                            lapack_int ldab, float* afb, lapack_int ldafb,
                            char* equed, float* s, float* b, lapack_int ldb,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_spbsvx( int matrix_layout, char fact, char uplo, lapack_int n
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spbsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_spb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_spb_nancheck( matrix_layout, uplo, n, kd, afb, ldafb ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_spb_nancheck)( matrix_layout, uplo, n, kd, afb, ldafb ) ) {
                 return -9;
             }
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            if( LAPACKE_s_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, s, 1 ) ) {
                 return -12;
             }
         }
@@ -79,7 +79,7 @@ lapack_int LAPACKE_spbsvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_spbsvx_work( matrix_layout, fact, uplo, n, kd, nrhs, ab, ldab,
+    info = API_SUFFIX(LAPACKE_spbsvx_work)( matrix_layout, fact, uplo, n, kd, nrhs, ab, ldab,
                                 afb, ldafb, equed, s, b, ldb, x, ldx, rcond,
                                 ferr, berr, work, iwork );
     /* Release memory and exit */
@@ -88,7 +88,7 @@ lapack_int LAPACKE_spbsvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_spbsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spbsvx_work.c b/LAPACKE/src/lapacke_spbsvx_work.c
index 0b55b47e86..2ee016e82c 100644
--- a/LAPACKE/src/lapacke_spbsvx_work.c
+++ b/LAPACKE/src/lapacke_spbsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spbsvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_spbsvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int kd, lapack_int nrhs,
                                 float* ab, lapack_int ldab, float* afb,
                                 lapack_int ldafb, char* equed, float* s,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_spbsvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_spbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbsvx_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_spbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbsvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_spbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_spbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -101,12 +101,12 @@ lapack_int LAPACKE_spbsvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_spb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_spb_trans( matrix_layout, uplo, n, kd, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_spb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_spb_trans)( matrix_layout, uplo, n, kd, afb, ldafb, afb_t,
                                ldafb_t );
         }
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spbsvx( &fact, &uplo, &n, &kd, &nrhs, ab_t, &ldab_t, afb_t,
                        &ldafb_t, equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond,
@@ -115,16 +115,16 @@ lapack_int LAPACKE_spbsvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_spb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_spb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                                ldab );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_spb_trans( LAPACK_COL_MAJOR, uplo, n, kd, afb_t, ldafb_t,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_spb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, afb_t, ldafb_t,
                                afb, ldafb );
         }
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -135,11 +135,11 @@ lapack_int LAPACKE_spbsvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spbsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spbtrf.c b/LAPACKE/src/lapacke_spbtrf.c
index 0131141de4..a29efd0090 100644
--- a/LAPACKE/src/lapacke_spbtrf.c
+++ b/LAPACKE/src/lapacke_spbtrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spbtrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spbtrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, float* ab, lapack_int ldab )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spbtrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbtrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_spb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_spbtrf_work( matrix_layout, uplo, n, kd, ab, ldab );
+    return API_SUFFIX(LAPACKE_spbtrf_work)( matrix_layout, uplo, n, kd, ab, ldab );
 }
diff --git a/LAPACKE/src/lapacke_spbtrf_work.c b/LAPACKE/src/lapacke_spbtrf_work.c
index 69262fd3dc..baa7370594 100644
--- a/LAPACKE/src/lapacke_spbtrf_work.c
+++ b/LAPACKE/src/lapacke_spbtrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spbtrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spbtrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, float* ab, lapack_int ldab )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_spbtrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_spbtrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbtrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,24 +58,24 @@ lapack_int LAPACKE_spbtrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_spb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_spb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spbtrf( &uplo, &n, &kd, ab_t, &ldab_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_spb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_spb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
         /* Release memory and exit */
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spbtrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbtrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spbtrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbtrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spbtrs.c b/LAPACKE/src/lapacke_spbtrs.c
index e2c837409a..3ce650b2b3 100644
--- a/LAPACKE/src/lapacke_spbtrs.c
+++ b/LAPACKE/src/lapacke_spbtrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spbtrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spbtrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, lapack_int nrhs, const float* ab,
                            lapack_int ldab, float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spbtrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbtrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_spb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_spbtrs_work( matrix_layout, uplo, n, kd, nrhs, ab, ldab, b,
+    return API_SUFFIX(LAPACKE_spbtrs_work)( matrix_layout, uplo, n, kd, nrhs, ab, ldab, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_spbtrs_work.c b/LAPACKE/src/lapacke_spbtrs_work.c
index 89fd0244bd..89183018cc 100644
--- a/LAPACKE/src/lapacke_spbtrs_work.c
+++ b/LAPACKE/src/lapacke_spbtrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spbtrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spbtrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, lapack_int nrhs, const float* ab,
                                 lapack_int ldab, float* b, lapack_int ldb )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_spbtrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_spbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbtrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_spbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbtrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,8 +71,8 @@ lapack_int LAPACKE_spbtrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_spb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_spb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spbtrs( &uplo, &n, &kd, &nrhs, ab_t, &ldab_t, b_t, &ldb_t,
                        &info );
@@ -80,18 +80,18 @@ lapack_int LAPACKE_spbtrs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbtrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spbtrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spbtrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spftrf.c b/LAPACKE/src/lapacke_spftrf.c
index 4c1a3ffcbb..f340f23afd 100644
--- a/LAPACKE/src/lapacke_spftrf.c
+++ b/LAPACKE/src/lapacke_spftrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spftrf( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_spftrf)( int matrix_layout, char transr, char uplo,
                            lapack_int n, float* a )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spftrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spftrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spf_nancheck( n, a ) ) {
+        if( API_SUFFIX(LAPACKE_spf_nancheck)( n, a ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_spftrf_work( matrix_layout, transr, uplo, n, a );
+    return API_SUFFIX(LAPACKE_spftrf_work)( matrix_layout, transr, uplo, n, a );
 }
diff --git a/LAPACKE/src/lapacke_spftrf_work.c b/LAPACKE/src/lapacke_spftrf_work.c
index e2cf1fc745..dcda1069f4 100644
--- a/LAPACKE/src/lapacke_spftrf_work.c
+++ b/LAPACKE/src/lapacke_spftrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spftrf_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_spftrf_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, float* a )
 {
     lapack_int info = 0;
@@ -52,23 +52,23 @@ lapack_int LAPACKE_spftrf_work( int matrix_layout, char transr, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_spf_trans( matrix_layout, transr, uplo, n, a, a_t );
+        API_SUFFIX(LAPACKE_spf_trans)( matrix_layout, transr, uplo, n, a, a_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spftrf( &transr, &uplo, &n, a_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_spf_trans( LAPACK_COL_MAJOR, transr, uplo, n, a_t, a );
+        API_SUFFIX(LAPACKE_spf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, a_t, a );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spftrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spftrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spftrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spftrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spftri.c b/LAPACKE/src/lapacke_spftri.c
index 83a3c7516d..28c893549e 100644
--- a/LAPACKE/src/lapacke_spftri.c
+++ b/LAPACKE/src/lapacke_spftri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spftri( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_spftri)( int matrix_layout, char transr, char uplo,
                            lapack_int n, float* a )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spftri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spftri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spf_nancheck( n, a ) ) {
+        if( API_SUFFIX(LAPACKE_spf_nancheck)( n, a ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_spftri_work( matrix_layout, transr, uplo, n, a );
+    return API_SUFFIX(LAPACKE_spftri_work)( matrix_layout, transr, uplo, n, a );
 }
diff --git a/LAPACKE/src/lapacke_spftri_work.c b/LAPACKE/src/lapacke_spftri_work.c
index 887fccac45..0a63d1ce4f 100644
--- a/LAPACKE/src/lapacke_spftri_work.c
+++ b/LAPACKE/src/lapacke_spftri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spftri_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_spftri_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, float* a )
 {
     lapack_int info = 0;
@@ -52,23 +52,23 @@ lapack_int LAPACKE_spftri_work( int matrix_layout, char transr, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_spf_trans( matrix_layout, transr, uplo, n, a, a_t );
+        API_SUFFIX(LAPACKE_spf_trans)( matrix_layout, transr, uplo, n, a, a_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spftri( &transr, &uplo, &n, a_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_spf_trans( LAPACK_COL_MAJOR, transr, uplo, n, a_t, a );
+        API_SUFFIX(LAPACKE_spf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, a_t, a );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spftri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spftri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spftri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spftri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spftrs.c b/LAPACKE/src/lapacke_spftrs.c
index c8b7d034e5..4a5c48dc03 100644
--- a/LAPACKE/src/lapacke_spftrs.c
+++ b/LAPACKE/src/lapacke_spftrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spftrs( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_spftrs)( int matrix_layout, char transr, char uplo,
                            lapack_int n, lapack_int nrhs, const float* a,
                            float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spftrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spftrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spf_nancheck( n, a ) ) {
+        if( API_SUFFIX(LAPACKE_spf_nancheck)( n, a ) ) {
             return -6;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_spftrs_work( matrix_layout, transr, uplo, n, nrhs, a, b,
+    return API_SUFFIX(LAPACKE_spftrs_work)( matrix_layout, transr, uplo, n, nrhs, a, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_spftrs_work.c b/LAPACKE/src/lapacke_spftrs_work.c
index e2e7a9b805..507ed57775 100644
--- a/LAPACKE/src/lapacke_spftrs_work.c
+++ b/LAPACKE/src/lapacke_spftrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spftrs_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_spftrs_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, lapack_int nrhs, const float* a,
                                 float* b, lapack_int ldb )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_spftrs_work( int matrix_layout, char transr, char uplo,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_spftrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spftrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,26 +66,26 @@ lapack_int LAPACKE_spftrs_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_spf_trans( matrix_layout, transr, uplo, n, a, a_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_spf_trans)( matrix_layout, transr, uplo, n, a, a_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spftrs( &transr, &uplo, &n, &nrhs, a_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spftrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spftrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spftrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spftrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spocon.c b/LAPACKE/src/lapacke_spocon.c
index 1f2971ca4f..069663225c 100644
--- a/LAPACKE/src/lapacke_spocon.c
+++ b/LAPACKE/src/lapacke_spocon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spocon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spocon)( int matrix_layout, char uplo, lapack_int n,
                            const float* a, lapack_int lda, float anorm,
                            float* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_spocon( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spocon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spocon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_spo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -6;
         }
     }
@@ -66,7 +66,7 @@ lapack_int LAPACKE_spocon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_spocon_work( matrix_layout, uplo, n, a, lda, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_spocon_work)( matrix_layout, uplo, n, a, lda, anorm, rcond,
                                 work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -74,7 +74,7 @@ lapack_int LAPACKE_spocon( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_spocon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spocon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spocon_work.c b/LAPACKE/src/lapacke_spocon_work.c
index d1292ee916..b7fe2b98b1 100644
--- a/LAPACKE/src/lapacke_spocon_work.c
+++ b/LAPACKE/src/lapacke_spocon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spocon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spocon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const float* a, lapack_int lda, float anorm,
                                 float* rcond, float* work, lapack_int* iwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_spocon_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_spocon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spocon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,7 +59,7 @@ lapack_int LAPACKE_spocon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_spo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_spo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spocon( &uplo, &n, a_t, &lda_t, &anorm, rcond, work, iwork,
                        &info );
@@ -70,11 +70,11 @@ lapack_int LAPACKE_spocon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spocon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spocon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spocon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spocon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spoequ.c b/LAPACKE/src/lapacke_spoequ.c
index cf8b078e5d..fa690c3f6a 100644
--- a/LAPACKE/src/lapacke_spoequ.c
+++ b/LAPACKE/src/lapacke_spoequ.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spoequ( int matrix_layout, lapack_int n, const float* a,
+lapack_int API_SUFFIX(LAPACKE_spoequ)( int matrix_layout, lapack_int n, const float* a,
                            lapack_int lda, float* s, float* scond, float* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spoequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spoequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_spoequ_work( matrix_layout, n, a, lda, s, scond, amax );
+    return API_SUFFIX(LAPACKE_spoequ_work)( matrix_layout, n, a, lda, s, scond, amax );
 }
diff --git a/LAPACKE/src/lapacke_spoequ_work.c b/LAPACKE/src/lapacke_spoequ_work.c
index 774da39c49..f6cd35a45b 100644
--- a/LAPACKE/src/lapacke_spoequ_work.c
+++ b/LAPACKE/src/lapacke_spoequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spoequ_work( int matrix_layout, lapack_int n, const float* a,
+lapack_int API_SUFFIX(LAPACKE_spoequ_work)( int matrix_layout, lapack_int n, const float* a,
                                 lapack_int lda, float* s, float* scond,
                                 float* amax )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_spoequ_work( int matrix_layout, lapack_int n, const float* a,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -4;
-            LAPACKE_xerbla( "LAPACKE_spoequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spoequ_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,7 +59,7 @@ lapack_int LAPACKE_spoequ_work( int matrix_layout, lapack_int n, const float* a,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spoequ( &n, a_t, &lda_t, s, scond, amax, &info );
         if( info < 0 ) {
@@ -69,11 +69,11 @@ lapack_int LAPACKE_spoequ_work( int matrix_layout, lapack_int n, const float* a,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spoequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spoequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spoequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spoequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spoequb.c b/LAPACKE/src/lapacke_spoequb.c
index 973112f2c0..a431540ef0 100644
--- a/LAPACKE/src/lapacke_spoequb.c
+++ b/LAPACKE/src/lapacke_spoequb.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spoequb( int matrix_layout, lapack_int n, const float* a,
+lapack_int API_SUFFIX(LAPACKE_spoequb)( int matrix_layout, lapack_int n, const float* a,
                             lapack_int lda, float* s, float* scond,
                             float* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spoequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spoequb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_spoequb_work( matrix_layout, n, a, lda, s, scond, amax );
+    return API_SUFFIX(LAPACKE_spoequb_work)( matrix_layout, n, a, lda, s, scond, amax );
 }
diff --git a/LAPACKE/src/lapacke_spoequb_work.c b/LAPACKE/src/lapacke_spoequb_work.c
index 5f5f974777..014400823f 100644
--- a/LAPACKE/src/lapacke_spoequb_work.c
+++ b/LAPACKE/src/lapacke_spoequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spoequb_work( int matrix_layout, lapack_int n, const float* a,
+lapack_int API_SUFFIX(LAPACKE_spoequb_work)( int matrix_layout, lapack_int n, const float* a,
                                  lapack_int lda, float* s, float* scond,
                                  float* amax )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_spoequb_work( int matrix_layout, lapack_int n, const float* a
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -4;
-            LAPACKE_xerbla( "LAPACKE_spoequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spoequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,7 +59,7 @@ lapack_int LAPACKE_spoequb_work( int matrix_layout, lapack_int n, const float* a
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spoequb( &n, a_t, &lda_t, s, scond, amax, &info );
         if( info < 0 ) {
@@ -69,11 +69,11 @@ lapack_int LAPACKE_spoequb_work( int matrix_layout, lapack_int n, const float* a
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spoequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spoequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spoequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spoequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sporfs.c b/LAPACKE/src/lapacke_sporfs.c
index e21e075b90..81df00fe21 100644
--- a/LAPACKE/src/lapacke_sporfs.c
+++ b/LAPACKE/src/lapacke_sporfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sporfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sporfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const float* a, lapack_int lda,
                            const float* af, lapack_int ldaf, const float* b,
                            lapack_int ldb, float* x, lapack_int ldx,
@@ -42,22 +42,22 @@ lapack_int LAPACKE_sporfs( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sporfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sporfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_spo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_spo_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_spo_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -11;
         }
     }
@@ -74,7 +74,7 @@ lapack_int LAPACKE_sporfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sporfs_work( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
+    info = API_SUFFIX(LAPACKE_sporfs_work)( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
                                 b, ldb, x, ldx, ferr, berr, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -82,7 +82,7 @@ lapack_int LAPACKE_sporfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sporfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sporfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sporfs_work.c b/LAPACKE/src/lapacke_sporfs_work.c
index cd848e5032..4ca8b83b5e 100644
--- a/LAPACKE/src/lapacke_sporfs_work.c
+++ b/LAPACKE/src/lapacke_sporfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sporfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sporfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const float* a, lapack_int lda,
                                 const float* af, lapack_int ldaf,
                                 const float* b, lapack_int ldb, float* x,
@@ -59,22 +59,22 @@ lapack_int LAPACKE_sporfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sporfs_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sporfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sporfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_sporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sporfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -99,10 +99,10 @@ lapack_int LAPACKE_sporfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_spo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_spo_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_spo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_spo_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sporfs( &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, iwork, &info );
@@ -110,7 +110,7 @@ lapack_int LAPACKE_sporfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -121,11 +121,11 @@ lapack_int LAPACKE_sporfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sporfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sporfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sporfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sporfsx.c b/LAPACKE/src/lapacke_sporfsx.c
index 10f6c58694..a3da821889 100644
--- a/LAPACKE/src/lapacke_sporfsx.c
+++ b/LAPACKE/src/lapacke_sporfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sporfsx( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_sporfsx)( int matrix_layout, char uplo, char equed,
                             lapack_int n, lapack_int nrhs, const float* a,
                             lapack_int lda, const float* af, lapack_int ldaf,
                             const float* s, const float* b, lapack_int ldb,
@@ -45,32 +45,32 @@ lapack_int LAPACKE_sporfsx( int matrix_layout, char uplo, char equed,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sporfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sporfsx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -21;
             }
         }
-        if( LAPACKE_lsame( equed, 'y' ) ) {
-            if( LAPACKE_s_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, s, 1 ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -13;
         }
     }
@@ -87,7 +87,7 @@ lapack_int LAPACKE_sporfsx( int matrix_layout, char uplo, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sporfsx_work( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_sporfsx_work)( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
                                  ldaf, s, b, ldb, x, ldx, rcond, berr,
                                  n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, iwork );
@@ -97,7 +97,7 @@ lapack_int LAPACKE_sporfsx( int matrix_layout, char uplo, char equed,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sporfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sporfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sporfsx_work.c b/LAPACKE/src/lapacke_sporfsx_work.c
index 3a31356b26..b1626f3a65 100644
--- a/LAPACKE/src/lapacke_sporfsx_work.c
+++ b/LAPACKE/src/lapacke_sporfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sporfsx_work( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_sporfsx_work)( int matrix_layout, char uplo, char equed,
                                  lapack_int n, lapack_int nrhs, const float* a,
                                  lapack_int lda, const float* af,
                                  lapack_int ldaf, const float* s,
@@ -65,22 +65,22 @@ lapack_int LAPACKE_sporfsx_work( int matrix_layout, char uplo, char equed,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sporfsx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sporfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_sporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sporfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_sporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sporfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -117,10 +117,10 @@ lapack_int LAPACKE_sporfsx_work( int matrix_layout, char uplo, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sporfsx( &uplo, &equed, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, s,
                         b_t, &ldb_t, x_t, &ldx_t, rcond, berr, &n_err_bnds,
@@ -130,10 +130,10 @@ lapack_int LAPACKE_sporfsx_work( int matrix_layout, char uplo, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -149,11 +149,11 @@ lapack_int LAPACKE_sporfsx_work( int matrix_layout, char uplo, char equed,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sporfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sporfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sporfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sposv.c b/LAPACKE/src/lapacke_sposv.c
index 6a3095d0c2..6c248c3ce1 100644
--- a/LAPACKE/src/lapacke_sposv.c
+++ b/LAPACKE/src/lapacke_sposv.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sposv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sposv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, float* a, lapack_int lda, float* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sposv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_spo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_sposv_work( matrix_layout, uplo, n, nrhs, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_sposv_work)( matrix_layout, uplo, n, nrhs, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_sposv_work.c b/LAPACKE/src/lapacke_sposv_work.c
index bba55897cd..f6c2ff937f 100644
--- a/LAPACKE/src/lapacke_sposv_work.c
+++ b/LAPACKE/src/lapacke_sposv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sposv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sposv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, float* a, lapack_int lda,
                                float* b, lapack_int ldb )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_sposv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_sposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,27 +71,27 @@ lapack_int LAPACKE_sposv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_spo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_spo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sposv( &uplo, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_spo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_spo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sposv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sposvx.c b/LAPACKE/src/lapacke_sposvx.c
index f06b9dc111..9af1e951b4 100644
--- a/LAPACKE/src/lapacke_sposvx.c
+++ b/LAPACKE/src/lapacke_sposvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sposvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sposvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, float* a, lapack_int lda, float* af,
                            lapack_int ldaf, char* equed, float* s, float* b,
                            lapack_int ldb, float* x, lapack_int ldx,
@@ -42,25 +42,25 @@ lapack_int LAPACKE_sposvx( int matrix_layout, char fact, char uplo, lapack_int n
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sposvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_spo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_spo_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_spo_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            if( LAPACKE_s_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, s, 1 ) ) {
                 return -11;
             }
         }
@@ -78,7 +78,7 @@ lapack_int LAPACKE_sposvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sposvx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_sposvx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                 ldaf, equed, s, b, ldb, x, ldx, rcond, ferr,
                                 berr, work, iwork );
     /* Release memory and exit */
@@ -87,7 +87,7 @@ lapack_int LAPACKE_sposvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sposvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sposvx_work.c b/LAPACKE/src/lapacke_sposvx_work.c
index a8911e5c93..5d50c83288 100644
--- a/LAPACKE/src/lapacke_sposvx_work.c
+++ b/LAPACKE/src/lapacke_sposvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sposvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_sposvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs, float* a,
                                 lapack_int lda, float* af, lapack_int ldaf,
                                 char* equed, float* s, float* b, lapack_int ldb,
@@ -60,22 +60,22 @@ lapack_int LAPACKE_sposvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposvx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_sposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_sposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -100,11 +100,11 @@ lapack_int LAPACKE_sposvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_spo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_spo_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_spo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_spo_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sposvx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                        equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr, berr,
@@ -113,15 +113,15 @@ lapack_int LAPACKE_sposvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_spo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_spo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_spo_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_spo_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -132,11 +132,11 @@ lapack_int LAPACKE_sposvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sposvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sposvxx.c b/LAPACKE/src/lapacke_sposvxx.c
index d2d0f72f93..69f7eb9de5 100644
--- a/LAPACKE/src/lapacke_sposvxx.c
+++ b/LAPACKE/src/lapacke_sposvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sposvxx( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_sposvxx)( int matrix_layout, char fact, char uplo,
                             lapack_int n, lapack_int nrhs, float* a,
                             lapack_int lda, float* af, lapack_int ldaf,
                             char* equed, float* s, float* b, lapack_int ldb,
@@ -45,30 +45,30 @@ lapack_int LAPACKE_sposvxx( int matrix_layout, char fact, char uplo,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sposvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposvxx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_spo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_spo_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_spo_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -23;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            if( LAPACKE_s_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, s, 1 ) ) {
                 return -11;
             }
         }
@@ -86,7 +86,7 @@ lapack_int LAPACKE_sposvxx( int matrix_layout, char fact, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sposvxx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_sposvxx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                  ldaf, equed, s, b, ldb, x, ldx, rcond, rpvgrw,
                                  berr, n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, iwork );
@@ -96,7 +96,7 @@ lapack_int LAPACKE_sposvxx( int matrix_layout, char fact, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sposvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sposvxx_work.c b/LAPACKE/src/lapacke_sposvxx_work.c
index cb31c80a2e..da9cde175f 100644
--- a/LAPACKE/src/lapacke_sposvxx_work.c
+++ b/LAPACKE/src/lapacke_sposvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sposvxx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_sposvxx_work)( int matrix_layout, char fact, char uplo,
                                  lapack_int n, lapack_int nrhs, float* a,
                                  lapack_int lda, float* af, lapack_int ldaf,
                                  char* equed, float* s, float* b,
@@ -66,22 +66,22 @@ lapack_int LAPACKE_sposvxx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposvxx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_sposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_sposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -118,11 +118,11 @@ lapack_int LAPACKE_sposvxx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_spo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_spo_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_spo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_spo_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sposvxx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond, rpvgrw, berr,
@@ -132,18 +132,18 @@ lapack_int LAPACKE_sposvxx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_spo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_spo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_spo_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_spo_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -159,11 +159,11 @@ lapack_int LAPACKE_sposvxx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sposvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sposvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spotrf.c b/LAPACKE/src/lapacke_spotrf.c
index 7f3f330e46..04de40683e 100644
--- a/LAPACKE/src/lapacke_spotrf.c
+++ b/LAPACKE/src/lapacke_spotrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spotrf( int matrix_layout, char uplo, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_spotrf)( int matrix_layout, char uplo, lapack_int n, float* a,
                            lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spotrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spotrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_spo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_spotrf_work( matrix_layout, uplo, n, a, lda );
+    return API_SUFFIX(LAPACKE_spotrf_work)( matrix_layout, uplo, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_spotrf2.c b/LAPACKE/src/lapacke_spotrf2.c
index b3de0d934c..39c1dfec3c 100644
--- a/LAPACKE/src/lapacke_spotrf2.c
+++ b/LAPACKE/src/lapacke_spotrf2.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spotrf2( int matrix_layout, char uplo, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_spotrf2)( int matrix_layout, char uplo, lapack_int n, float* a,
                            lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spotrf2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spotrf2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_spo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_spotrf2_work( matrix_layout, uplo, n, a, lda );
+    return API_SUFFIX(LAPACKE_spotrf2_work)( matrix_layout, uplo, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_spotrf2_work.c b/LAPACKE/src/lapacke_spotrf2_work.c
index 12ed95650d..c29fc46b05 100644
--- a/LAPACKE/src/lapacke_spotrf2_work.c
+++ b/LAPACKE/src/lapacke_spotrf2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spotrf2_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spotrf2_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_spotrf2_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_spotrf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spotrf2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,23 +58,23 @@ lapack_int LAPACKE_spotrf2_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_spo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_spo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spotrf2( &uplo, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_spo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_spo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spotrf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spotrf2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spotrf2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spotrf2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spotrf_work.c b/LAPACKE/src/lapacke_spotrf_work.c
index 82c8431adc..f71e8b897f 100644
--- a/LAPACKE/src/lapacke_spotrf_work.c
+++ b/LAPACKE/src/lapacke_spotrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spotrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spotrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_spotrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_spotrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spotrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,23 +58,23 @@ lapack_int LAPACKE_spotrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_spo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_spo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spotrf( &uplo, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_spo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_spo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spotrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spotrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spotrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spotrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spotri.c b/LAPACKE/src/lapacke_spotri.c
index 5f4779d976..d9632947a6 100644
--- a/LAPACKE/src/lapacke_spotri.c
+++ b/LAPACKE/src/lapacke_spotri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spotri( int matrix_layout, char uplo, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_spotri)( int matrix_layout, char uplo, lapack_int n, float* a,
                            lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spotri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spotri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_spo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_spotri_work( matrix_layout, uplo, n, a, lda );
+    return API_SUFFIX(LAPACKE_spotri_work)( matrix_layout, uplo, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_spotri_work.c b/LAPACKE/src/lapacke_spotri_work.c
index a8d98c2d9a..92fcfe6c01 100644
--- a/LAPACKE/src/lapacke_spotri_work.c
+++ b/LAPACKE/src/lapacke_spotri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spotri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spotri_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_spotri_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_spotri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spotri_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,23 +58,23 @@ lapack_int LAPACKE_spotri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_spo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_spo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spotri( &uplo, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_spo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_spo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spotri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spotri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spotri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spotri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spotrs.c b/LAPACKE/src/lapacke_spotrs.c
index 739a125ea2..4ed90faeb0 100644
--- a/LAPACKE/src/lapacke_spotrs.c
+++ b/LAPACKE/src/lapacke_spotrs.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spotrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spotrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const float* a, lapack_int lda,
                            float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spotrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spotrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_spo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_spotrs_work( matrix_layout, uplo, n, nrhs, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_spotrs_work)( matrix_layout, uplo, n, nrhs, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_spotrs_work.c b/LAPACKE/src/lapacke_spotrs_work.c
index e5cd7c59da..024fc4419a 100644
--- a/LAPACKE/src/lapacke_spotrs_work.c
+++ b/LAPACKE/src/lapacke_spotrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spotrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spotrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const float* a, lapack_int lda,
                                 float* b, lapack_int ldb )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_spotrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_spotrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spotrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_spotrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spotrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,26 +71,26 @@ lapack_int LAPACKE_spotrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_spo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_spo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spotrs( &uplo, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spotrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spotrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spotrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spotrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sppcon.c b/LAPACKE/src/lapacke_sppcon.c
index 0e1c9eb9d3..64170be844 100644
--- a/LAPACKE/src/lapacke_sppcon.c
+++ b/LAPACKE/src/lapacke_sppcon.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sppcon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sppcon)( int matrix_layout, char uplo, lapack_int n,
                            const float* ap, float anorm, float* rcond )
 {
     lapack_int info = 0;
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sppcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sppcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_spp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_spp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
@@ -65,7 +65,7 @@ lapack_int LAPACKE_sppcon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sppcon_work( matrix_layout, uplo, n, ap, anorm, rcond, work,
+    info = API_SUFFIX(LAPACKE_sppcon_work)( matrix_layout, uplo, n, ap, anorm, rcond, work,
                                 iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -73,7 +73,7 @@ lapack_int LAPACKE_sppcon( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sppcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sppcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sppcon_work.c b/LAPACKE/src/lapacke_sppcon_work.c
index 1e4fee4f43..33cbfe573d 100644
--- a/LAPACKE/src/lapacke_sppcon_work.c
+++ b/LAPACKE/src/lapacke_sppcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sppcon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sppcon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const float* ap, float anorm, float* rcond,
                                 float* work, lapack_int* iwork )
 {
@@ -53,7 +53,7 @@ lapack_int LAPACKE_sppcon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_spp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_spp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sppcon( &uplo, &n, ap_t, &anorm, rcond, work, iwork, &info );
         if( info < 0 ) {
@@ -63,11 +63,11 @@ lapack_int LAPACKE_sppcon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sppcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sppcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sppcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sppcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sppequ.c b/LAPACKE/src/lapacke_sppequ.c
index de1d0d5ece..7c5d6609b0 100644
--- a/LAPACKE/src/lapacke_sppequ.c
+++ b/LAPACKE/src/lapacke_sppequ.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sppequ( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sppequ)( int matrix_layout, char uplo, lapack_int n,
                            const float* ap, float* s, float* scond,
                            float* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sppequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sppequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_spp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_sppequ_work( matrix_layout, uplo, n, ap, s, scond, amax );
+    return API_SUFFIX(LAPACKE_sppequ_work)( matrix_layout, uplo, n, ap, s, scond, amax );
 }
diff --git a/LAPACKE/src/lapacke_sppequ_work.c b/LAPACKE/src/lapacke_sppequ_work.c
index e3e8fdb910..e3cb6ccc16 100644
--- a/LAPACKE/src/lapacke_sppequ_work.c
+++ b/LAPACKE/src/lapacke_sppequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sppequ_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sppequ_work)( int matrix_layout, char uplo, lapack_int n,
                                 const float* ap, float* s, float* scond,
                                 float* amax )
 {
@@ -53,7 +53,7 @@ lapack_int LAPACKE_sppequ_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_spp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_spp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sppequ( &uplo, &n, ap_t, s, scond, amax, &info );
         if( info < 0 ) {
@@ -63,11 +63,11 @@ lapack_int LAPACKE_sppequ_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sppequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sppequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sppequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sppequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spprfs.c b/LAPACKE/src/lapacke_spprfs.c
index 1d73b91f3e..a80630b3f9 100644
--- a/LAPACKE/src/lapacke_spprfs.c
+++ b/LAPACKE/src/lapacke_spprfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spprfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spprfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const float* ap, const float* afp,
                            const float* b, lapack_int ldb, float* x,
                            lapack_int ldx, float* ferr, float* berr )
@@ -41,22 +41,22 @@ lapack_int LAPACKE_spprfs( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spprfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spprfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_spp_nancheck)( n, afp ) ) {
             return -6;
         }
-        if( LAPACKE_spp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_spp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -9;
         }
     }
@@ -73,7 +73,7 @@ lapack_int LAPACKE_spprfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_spprfs_work( matrix_layout, uplo, n, nrhs, ap, afp, b, ldb, x,
+    info = API_SUFFIX(LAPACKE_spprfs_work)( matrix_layout, uplo, n, nrhs, ap, afp, b, ldb, x,
                                 ldx, ferr, berr, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -81,7 +81,7 @@ lapack_int LAPACKE_spprfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_spprfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spprfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spprfs_work.c b/LAPACKE/src/lapacke_spprfs_work.c
index aae87cd529..d5382f3d71 100644
--- a/LAPACKE/src/lapacke_spprfs_work.c
+++ b/LAPACKE/src/lapacke_spprfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spprfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spprfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const float* ap,
                                 const float* afp, const float* b,
                                 lapack_int ldb, float* x, lapack_int ldx,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_spprfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_spprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spprfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_spprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spprfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -89,10 +89,10 @@ lapack_int LAPACKE_spprfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
-        LAPACKE_spp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_spp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_spp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_spp_trans)( matrix_layout, uplo, n, afp, afp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spprfs( &uplo, &n, &nrhs, ap_t, afp_t, b_t, &ldb_t, x_t, &ldx_t,
                        ferr, berr, work, iwork, &info );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_spprfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( afp_t );
 exit_level_3:
@@ -111,11 +111,11 @@ lapack_int LAPACKE_spprfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spprfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spprfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spprfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sppsv.c b/LAPACKE/src/lapacke_sppsv.c
index b8c00b9a41..4a39ec8e27 100644
--- a/LAPACKE/src/lapacke_sppsv.c
+++ b/LAPACKE/src/lapacke_sppsv.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sppsv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sppsv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, float* ap, float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sppsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sppsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_spp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_sppsv_work( matrix_layout, uplo, n, nrhs, ap, b, ldb );
+    return API_SUFFIX(LAPACKE_sppsv_work)( matrix_layout, uplo, n, nrhs, ap, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_sppsv_work.c b/LAPACKE/src/lapacke_sppsv_work.c
index 1a6946a343..eac20287bd 100644
--- a/LAPACKE/src/lapacke_sppsv_work.c
+++ b/LAPACKE/src/lapacke_sppsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sppsv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sppsv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, float* ap, float* b,
                                lapack_int ldb )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_sppsv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sppsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sppsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,27 +66,27 @@ lapack_int LAPACKE_sppsv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_spp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_spp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sppsv( &uplo, &n, &nrhs, ap_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_spp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_spp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sppsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sppsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sppsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sppsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sppsvx.c b/LAPACKE/src/lapacke_sppsvx.c
index 961ad403c2..6c4105a9b9 100644
--- a/LAPACKE/src/lapacke_sppsvx.c
+++ b/LAPACKE/src/lapacke_sppsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sppsvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sppsvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, float* ap, float* afp, char* equed,
                            float* s, float* b, lapack_int ldb, float* x,
                            lapack_int ldx, float* rcond, float* ferr,
@@ -42,25 +42,25 @@ lapack_int LAPACKE_sppsvx( int matrix_layout, char fact, char uplo, lapack_int n
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sppsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sppsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_spp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_spp_nancheck)( n, afp ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_spp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_spp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            if( LAPACKE_s_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, s, 1 ) ) {
                 return -9;
             }
         }
@@ -78,7 +78,7 @@ lapack_int LAPACKE_sppsvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sppsvx_work( matrix_layout, fact, uplo, n, nrhs, ap, afp,
+    info = API_SUFFIX(LAPACKE_sppsvx_work)( matrix_layout, fact, uplo, n, nrhs, ap, afp,
                                 equed, s, b, ldb, x, ldx, rcond, ferr, berr,
                                 work, iwork );
     /* Release memory and exit */
@@ -87,7 +87,7 @@ lapack_int LAPACKE_sppsvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sppsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sppsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sppsvx_work.c b/LAPACKE/src/lapacke_sppsvx_work.c
index f08b24c80f..e34f3e197f 100644
--- a/LAPACKE/src/lapacke_sppsvx_work.c
+++ b/LAPACKE/src/lapacke_sppsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sppsvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_sppsvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs, float* ap,
                                 float* afp, char* equed, float* s, float* b,
                                 lapack_int ldb, float* x, lapack_int ldx,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_sppsvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sppsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sppsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_sppsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sppsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -89,10 +89,10 @@ lapack_int LAPACKE_sppsvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_spp_trans( matrix_layout, uplo, n, ap, ap_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_spp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_spp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_spp_trans)( matrix_layout, uplo, n, afp, afp_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_sppsvx( &fact, &uplo, &n, &nrhs, ap_t, afp_t, equed, s, b_t,
@@ -102,13 +102,13 @@ lapack_int LAPACKE_sppsvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_spp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_spp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_spp_trans( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_spp_trans)( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
         }
         /* Release memory and exit */
         LAPACKE_free( afp_t );
@@ -120,11 +120,11 @@ lapack_int LAPACKE_sppsvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sppsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sppsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sppsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sppsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spptrf.c b/LAPACKE/src/lapacke_spptrf.c
index 32ab5636f7..3c3d597f6f 100644
--- a/LAPACKE/src/lapacke_spptrf.c
+++ b/LAPACKE/src/lapacke_spptrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spptrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spptrf)( int matrix_layout, char uplo, lapack_int n,
                            float* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spptrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spptrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_spp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_spptrf_work( matrix_layout, uplo, n, ap );
+    return API_SUFFIX(LAPACKE_spptrf_work)( matrix_layout, uplo, n, ap );
 }
diff --git a/LAPACKE/src/lapacke_spptrf_work.c b/LAPACKE/src/lapacke_spptrf_work.c
index ca3ec43d93..9318b616ae 100644
--- a/LAPACKE/src/lapacke_spptrf_work.c
+++ b/LAPACKE/src/lapacke_spptrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spptrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spptrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* ap )
 {
     lapack_int info = 0;
@@ -52,23 +52,23 @@ lapack_int LAPACKE_spptrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_spp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_spp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spptrf( &uplo, &n, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_spp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_spp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spptrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spptrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spptrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spptrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spptri.c b/LAPACKE/src/lapacke_spptri.c
index 85c2643aee..fc18728c1e 100644
--- a/LAPACKE/src/lapacke_spptri.c
+++ b/LAPACKE/src/lapacke_spptri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spptri( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spptri)( int matrix_layout, char uplo, lapack_int n,
                            float* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spptri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spptri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_spp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_spptri_work( matrix_layout, uplo, n, ap );
+    return API_SUFFIX(LAPACKE_spptri_work)( matrix_layout, uplo, n, ap );
 }
diff --git a/LAPACKE/src/lapacke_spptri_work.c b/LAPACKE/src/lapacke_spptri_work.c
index f67d66f6bd..257f294daa 100644
--- a/LAPACKE/src/lapacke_spptri_work.c
+++ b/LAPACKE/src/lapacke_spptri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spptri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spptri_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* ap )
 {
     lapack_int info = 0;
@@ -52,23 +52,23 @@ lapack_int LAPACKE_spptri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_spp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_spp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spptri( &uplo, &n, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_spp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_spp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spptri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spptri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spptri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spptri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spptrs.c b/LAPACKE/src/lapacke_spptrs.c
index 73c0de30d3..009c195de3 100644
--- a/LAPACKE/src/lapacke_spptrs.c
+++ b/LAPACKE/src/lapacke_spptrs.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spptrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spptrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const float* ap, float* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spptrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spptrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_spp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_spptrs_work( matrix_layout, uplo, n, nrhs, ap, b, ldb );
+    return API_SUFFIX(LAPACKE_spptrs_work)( matrix_layout, uplo, n, nrhs, ap, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_spptrs_work.c b/LAPACKE/src/lapacke_spptrs_work.c
index edb150c0ec..6cc2c68444 100644
--- a/LAPACKE/src/lapacke_spptrs_work.c
+++ b/LAPACKE/src/lapacke_spptrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spptrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spptrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const float* ap, float* b,
                                 lapack_int ldb )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_spptrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_spptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spptrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,26 +66,26 @@ lapack_int LAPACKE_spptrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_spp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_spp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spptrs( &uplo, &n, &nrhs, ap_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spptrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spptrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spptrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spstrf.c b/LAPACKE/src/lapacke_spstrf.c
index 24b6805ea0..4c6b49a0f7 100644
--- a/LAPACKE/src/lapacke_spstrf.c
+++ b/LAPACKE/src/lapacke_spstrf.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spstrf( int matrix_layout, char uplo, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_spstrf)( int matrix_layout, char uplo, lapack_int n, float* a,
                            lapack_int lda, lapack_int* piv, lapack_int* rank,
                            float tol )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spstrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spstrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_spo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( 1, &tol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &tol, 1 ) ) {
             return -8;
         }
     }
@@ -60,13 +60,13 @@ lapack_int LAPACKE_spstrf( int matrix_layout, char uplo, lapack_int n, float* a,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_spstrf_work( matrix_layout, uplo, n, a, lda, piv, rank, tol,
+    info = API_SUFFIX(LAPACKE_spstrf_work)( matrix_layout, uplo, n, a, lda, piv, rank, tol,
                                 work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_spstrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spstrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spstrf_work.c b/LAPACKE/src/lapacke_spstrf_work.c
index 4a55dab52f..bd8716705f 100644
--- a/LAPACKE/src/lapacke_spstrf_work.c
+++ b/LAPACKE/src/lapacke_spstrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spstrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spstrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* a, lapack_int lda, lapack_int* piv,
                                 lapack_int* rank, float tol, float* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_spstrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_spstrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spstrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_spstrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_spo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_spo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spstrf( &uplo, &n, a_t, &lda_t, piv, rank, &tol, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_spo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_spo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spstrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spstrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spstrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spstrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sptcon.c b/LAPACKE/src/lapacke_sptcon.c
index 03ab09a23d..5e148efd8f 100644
--- a/LAPACKE/src/lapacke_sptcon.c
+++ b/LAPACKE/src/lapacke_sptcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sptcon( lapack_int n, const float* d, const float* e,
+lapack_int API_SUFFIX(LAPACKE_sptcon)( lapack_int n, const float* d, const float* e,
                            float anorm, float* rcond )
 {
     lapack_int info = 0;
@@ -40,13 +40,13 @@ lapack_int LAPACKE_sptcon( lapack_int n, const float* d, const float* e,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -3;
         }
     }
@@ -58,12 +58,12 @@ lapack_int LAPACKE_sptcon( lapack_int n, const float* d, const float* e,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sptcon_work( n, d, e, anorm, rcond, work );
+    info = API_SUFFIX(LAPACKE_sptcon_work)( n, d, e, anorm, rcond, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sptcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sptcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sptcon_work.c b/LAPACKE/src/lapacke_sptcon_work.c
index 4e8397ea2a..3e5ebea07f 100644
--- a/LAPACKE/src/lapacke_sptcon_work.c
+++ b/LAPACKE/src/lapacke_sptcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sptcon_work( lapack_int n, const float* d, const float* e,
+lapack_int API_SUFFIX(LAPACKE_sptcon_work)( lapack_int n, const float* d, const float* e,
                                 float anorm, float* rcond, float* work )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_spteqr.c b/LAPACKE/src/lapacke_spteqr.c
index 74ac93135b..df3626286a 100644
--- a/LAPACKE/src/lapacke_spteqr.c
+++ b/LAPACKE/src/lapacke_spteqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spteqr( int matrix_layout, char compz, lapack_int n, float* d,
+lapack_int API_SUFFIX(LAPACKE_spteqr)( int matrix_layout, char compz, lapack_int n, float* d,
                            float* e, float* z, lapack_int ldz )
 {
     lapack_int info = 0;
@@ -40,27 +40,27 @@ lapack_int LAPACKE_spteqr( int matrix_layout, char compz, lapack_int n, float* d
     lapack_int lwork;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spteqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spteqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -6;
             }
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( compz, 'n' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'n' ) ) {
         lwork = 1;
     } else {
         lwork = MAX(1,4*n-4);
@@ -72,12 +72,12 @@ lapack_int LAPACKE_spteqr( int matrix_layout, char compz, lapack_int n, float* d
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_spteqr_work( matrix_layout, compz, n, d, e, z, ldz, work );
+    info = API_SUFFIX(LAPACKE_spteqr_work)( matrix_layout, compz, n, d, e, z, ldz, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_spteqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spteqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spteqr_work.c b/LAPACKE/src/lapacke_spteqr_work.c
index 72e80fe0f3..373bb95b2c 100644
--- a/LAPACKE/src/lapacke_spteqr_work.c
+++ b/LAPACKE/src/lapacke_spteqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spteqr_work( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_spteqr_work)( int matrix_layout, char compz, lapack_int n,
                                 float* d, float* e, float* z, lapack_int ldz,
                                 float* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_spteqr_work( int matrix_layout, char compz, lapack_int n,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_spteqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spteqr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,8 +59,8 @@ lapack_int LAPACKE_spteqr_work( int matrix_layout, char compz, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_spteqr( &compz, &n, d, e, z_t, &ldz_t, work, &info );
@@ -68,16 +68,16 @@ lapack_int LAPACKE_spteqr_work( int matrix_layout, char compz, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         /* Release memory and exit */
         LAPACKE_free( z_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spteqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spteqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spteqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spteqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sptrfs.c b/LAPACKE/src/lapacke_sptrfs.c
index d6c1b98f42..40efda7ad4 100644
--- a/LAPACKE/src/lapacke_sptrfs.c
+++ b/LAPACKE/src/lapacke_sptrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sptrfs( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_sptrfs)( int matrix_layout, lapack_int n, lapack_int nrhs,
                            const float* d, const float* e, const float* df,
                            const float* ef, const float* b, lapack_int ldb,
                            float* x, lapack_int ldx, float* ferr, float* berr )
@@ -40,28 +40,28 @@ lapack_int LAPACKE_sptrfs( int matrix_layout, lapack_int n, lapack_int nrhs,
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sptrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sptrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n, df, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, df, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( n-1, ef, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, ef, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -10;
         }
     }
@@ -73,13 +73,13 @@ lapack_int LAPACKE_sptrfs( int matrix_layout, lapack_int n, lapack_int nrhs,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sptrfs_work( matrix_layout, n, nrhs, d, e, df, ef, b, ldb, x,
+    info = API_SUFFIX(LAPACKE_sptrfs_work)( matrix_layout, n, nrhs, d, e, df, ef, b, ldb, x,
                                 ldx, ferr, berr, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sptrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sptrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sptrfs_work.c b/LAPACKE/src/lapacke_sptrfs_work.c
index c193372898..bd6da029e0 100644
--- a/LAPACKE/src/lapacke_sptrfs_work.c
+++ b/LAPACKE/src/lapacke_sptrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sptrfs_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_sptrfs_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                 const float* d, const float* e, const float* df,
                                 const float* ef, const float* b, lapack_int ldb,
                                 float* x, lapack_int ldx, float* ferr,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_sptrfs_work( int matrix_layout, lapack_int n, lapack_int nrhs
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_sptrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sptrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_sptrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sptrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -74,8 +74,8 @@ lapack_int LAPACKE_sptrfs_work( int matrix_layout, lapack_int n, lapack_int nrhs
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sptrfs( &n, &nrhs, d, e, df, ef, b_t, &ldb_t, x_t, &ldx_t, ferr,
                        berr, work, &info );
@@ -83,18 +83,18 @@ lapack_int LAPACKE_sptrfs_work( int matrix_layout, lapack_int n, lapack_int nrhs
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sptrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sptrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sptrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sptrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sptsv.c b/LAPACKE/src/lapacke_sptsv.c
index 870ff602fa..30d77dc4b1 100644
--- a/LAPACKE/src/lapacke_sptsv.c
+++ b/LAPACKE/src/lapacke_sptsv.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sptsv( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_sptsv)( int matrix_layout, lapack_int n, lapack_int nrhs,
                           float* d, float* e, float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sptsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sptsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_sptsv_work( matrix_layout, n, nrhs, d, e, b, ldb );
+    return API_SUFFIX(LAPACKE_sptsv_work)( matrix_layout, n, nrhs, d, e, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_sptsv_work.c b/LAPACKE/src/lapacke_sptsv_work.c
index ea9841ee43..e3414d71de 100644
--- a/LAPACKE/src/lapacke_sptsv_work.c
+++ b/LAPACKE/src/lapacke_sptsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sptsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_sptsv_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                float* d, float* e, float* b, lapack_int ldb )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_sptsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sptsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sptsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,23 +58,23 @@ lapack_int LAPACKE_sptsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sptsv( &n, &nrhs, d, e, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sptsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sptsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sptsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sptsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sptsvx.c b/LAPACKE/src/lapacke_sptsvx.c
index 4462d525fb..f88a51ee0e 100644
--- a/LAPACKE/src/lapacke_sptsvx.c
+++ b/LAPACKE/src/lapacke_sptsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sptsvx( int matrix_layout, char fact, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sptsvx)( int matrix_layout, char fact, lapack_int n,
                            lapack_int nrhs, const float* d, const float* e,
                            float* df, float* ef, const float* b, lapack_int ldb,
                            float* x, lapack_int ldx, float* rcond, float* ferr,
@@ -41,28 +41,28 @@ lapack_int LAPACKE_sptsvx( int matrix_layout, char fact, lapack_int n,
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sptsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sptsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_s_nancheck( n, df, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, df, 1 ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_s_nancheck( n-1, ef, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, ef, 1 ) ) {
                 return -8;
             }
         }
@@ -75,13 +75,13 @@ lapack_int LAPACKE_sptsvx( int matrix_layout, char fact, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sptsvx_work( matrix_layout, fact, n, nrhs, d, e, df, ef, b,
+    info = API_SUFFIX(LAPACKE_sptsvx_work)( matrix_layout, fact, n, nrhs, d, e, df, ef, b,
                                 ldb, x, ldx, rcond, ferr, berr, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sptsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sptsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sptsvx_work.c b/LAPACKE/src/lapacke_sptsvx_work.c
index d9e12de176..c022d4b57e 100644
--- a/LAPACKE/src/lapacke_sptsvx_work.c
+++ b/LAPACKE/src/lapacke_sptsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sptsvx_work( int matrix_layout, char fact, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sptsvx_work)( int matrix_layout, char fact, lapack_int n,
                                 lapack_int nrhs, const float* d, const float* e,
                                 float* df, float* ef, const float* b,
                                 lapack_int ldb, float* x, lapack_int ldx,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_sptsvx_work( int matrix_layout, char fact, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sptsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sptsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_sptsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sptsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,7 +75,7 @@ lapack_int LAPACKE_sptsvx_work( int matrix_layout, char fact, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sptsvx( &fact, &n, &nrhs, d, e, df, ef, b_t, &ldb_t, x_t, &ldx_t,
                        rcond, ferr, berr, work, &info );
@@ -83,18 +83,18 @@ lapack_int LAPACKE_sptsvx_work( int matrix_layout, char fact, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sptsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sptsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sptsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sptsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_spttrf.c b/LAPACKE/src/lapacke_spttrf.c
index 3d1e10a9e5..1f22fa7765 100644
--- a/LAPACKE/src/lapacke_spttrf.c
+++ b/LAPACKE/src/lapacke_spttrf.c
@@ -32,18 +32,18 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spttrf( lapack_int n, float* d, float* e )
+lapack_int API_SUFFIX(LAPACKE_spttrf)( lapack_int n, float* d, float* e )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_spttrf_work( n, d, e );
+    return API_SUFFIX(LAPACKE_spttrf_work)( n, d, e );
 }
diff --git a/LAPACKE/src/lapacke_spttrf_work.c b/LAPACKE/src/lapacke_spttrf_work.c
index 4f6ad23556..8dd4b01785 100644
--- a/LAPACKE/src/lapacke_spttrf_work.c
+++ b/LAPACKE/src/lapacke_spttrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spttrf_work( lapack_int n, float* d, float* e )
+lapack_int API_SUFFIX(LAPACKE_spttrf_work)( lapack_int n, float* d, float* e )
 {
     lapack_int info = 0;
     /* Call LAPACK function and adjust info */
diff --git a/LAPACKE/src/lapacke_spttrs.c b/LAPACKE/src/lapacke_spttrs.c
index 20203589b3..18ab39cd1c 100644
--- a/LAPACKE/src/lapacke_spttrs.c
+++ b/LAPACKE/src/lapacke_spttrs.c
@@ -32,27 +32,27 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spttrs( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_spttrs)( int matrix_layout, lapack_int n, lapack_int nrhs,
                            const float* d, const float* e, float* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_spttrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spttrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_spttrs_work( matrix_layout, n, nrhs, d, e, b, ldb );
+    return API_SUFFIX(LAPACKE_spttrs_work)( matrix_layout, n, nrhs, d, e, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_spttrs_work.c b/LAPACKE/src/lapacke_spttrs_work.c
index 785a757469..15536bc0d5 100644
--- a/LAPACKE/src/lapacke_spttrs_work.c
+++ b/LAPACKE/src/lapacke_spttrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_spttrs_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_spttrs_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                 const float* d, const float* e, float* b,
                                 lapack_int ldb )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_spttrs_work( int matrix_layout, lapack_int n, lapack_int nrhs
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_spttrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spttrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_spttrs_work( int matrix_layout, lapack_int n, lapack_int nrhs
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_spttrs( &n, &nrhs, d, e, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_spttrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spttrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_spttrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_spttrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbev.c b/LAPACKE/src/lapacke_ssbev.c
index 1d65b0c3c5..d18d7ac9c6 100644
--- a/LAPACKE/src/lapacke_ssbev.c
+++ b/LAPACKE/src/lapacke_ssbev.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbev( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssbev)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_int kd, float* ab, lapack_int ldab, float* w,
                           float* z, lapack_int ldz )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_ssb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
     }
@@ -57,13 +57,13 @@ lapack_int LAPACKE_ssbev( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssbev_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_ssbev_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                ldz, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbev_2stage.c b/LAPACKE/src/lapacke_ssbev_2stage.c
index 91923a9461..803cc41529 100644
--- a/LAPACKE/src/lapacke_ssbev_2stage.c
+++ b/LAPACKE/src/lapacke_ssbev_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbev_2stage( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssbev_2stage)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_int kd, float* ab, lapack_int ldab, float* w,
                           float* z, lapack_int ldz )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_ssbev_2stage( int matrix_layout, char jobz, char uplo, lapack
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbev_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbev_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_ssb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssbev_2stage_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_ssbev_2stage_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                ldz, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -66,13 +66,13 @@ lapack_int LAPACKE_ssbev_2stage( int matrix_layout, char jobz, char uplo, lapack
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssbev_2stage_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_ssbev_2stage_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                ldz, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbev_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbev_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbev_2stage_work.c b/LAPACKE/src/lapacke_ssbev_2stage_work.c
index 3f5d5b9520..a7c03df446 100644
--- a/LAPACKE/src/lapacke_ssbev_2stage_work.c
+++ b/LAPACKE/src/lapacke_ssbev_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbev_2stage_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssbev_2stage_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_int kd, float* ab,
                                lapack_int ldab, float* w, float* z,
                                lapack_int ldz, float* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_ssbev_2stage_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ssbev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbev_2stage_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ssbev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbev_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -73,7 +73,7 @@ lapack_int LAPACKE_ssbev_2stage_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -81,7 +81,7 @@ lapack_int LAPACKE_ssbev_2stage_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_ssb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_ssb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssbev_2stage( &jobz, &uplo, &n, &kd, ab_t, &ldab_t, w, z_t, &ldz_t,
                       work, &lwork, &info );
@@ -89,24 +89,24 @@ lapack_int LAPACKE_ssbev_2stage_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_ssb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssbev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbev_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssbev_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbev_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbev_work.c b/LAPACKE/src/lapacke_ssbev_work.c
index e0dfb2938f..bcc887b8b9 100644
--- a/LAPACKE/src/lapacke_ssbev_work.c
+++ b/LAPACKE/src/lapacke_ssbev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbev_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssbev_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_int kd, float* ab,
                                lapack_int ldab, float* w, float* z,
                                lapack_int ldz, float* work )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_ssbev_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ssbev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbev_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ssbev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbev_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -67,7 +67,7 @@ lapack_int LAPACKE_ssbev_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -75,7 +75,7 @@ lapack_int LAPACKE_ssbev_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_ssb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_ssb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssbev( &jobz, &uplo, &n, &kd, ab_t, &ldab_t, w, z_t, &ldz_t,
                       work, &info );
@@ -83,24 +83,24 @@ lapack_int LAPACKE_ssbev_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_ssb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssbev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssbev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbevd.c b/LAPACKE/src/lapacke_ssbevd.c
index 6630b58c50..acc9993a45 100644
--- a/LAPACKE/src/lapacke_ssbevd.c
+++ b/LAPACKE/src/lapacke_ssbevd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbevd( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssbevd)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_int kd, float* ab, lapack_int ldab, float* w,
                            float* z, lapack_int ldz )
 {
@@ -44,19 +44,19 @@ lapack_int LAPACKE_ssbevd( int matrix_layout, char jobz, char uplo, lapack_int n
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbevd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_ssb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssbevd_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_ssbevd_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                 ldz, &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,7 +75,7 @@ lapack_int LAPACKE_ssbevd( int matrix_layout, char jobz, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssbevd_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_ssbevd_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                 ldz, work, lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -83,7 +83,7 @@ lapack_int LAPACKE_ssbevd( int matrix_layout, char jobz, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbevd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbevd_2stage.c b/LAPACKE/src/lapacke_ssbevd_2stage.c
index a4770d4797..90a078e0b1 100644
--- a/LAPACKE/src/lapacke_ssbevd_2stage.c
+++ b/LAPACKE/src/lapacke_ssbevd_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbevd_2stage( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssbevd_2stage)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_int kd, float* ab, lapack_int ldab, float* w,
                            float* z, lapack_int ldz )
 {
@@ -44,19 +44,19 @@ lapack_int LAPACKE_ssbevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbevd_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevd_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_ssb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssbevd_2stage_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_ssbevd_2stage_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                 ldz, &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,7 +75,7 @@ lapack_int LAPACKE_ssbevd_2stage( int matrix_layout, char jobz, char uplo, lapac
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssbevd_2stage_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_ssbevd_2stage_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                 ldz, work, lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -83,7 +83,7 @@ lapack_int LAPACKE_ssbevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbevd_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevd_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbevd_2stage_work.c b/LAPACKE/src/lapacke_ssbevd_2stage_work.c
index 2087708e11..0ec152cac8 100644
--- a/LAPACKE/src/lapacke_ssbevd_2stage_work.c
+++ b/LAPACKE/src/lapacke_ssbevd_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbevd_2stage_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssbevd_2stage_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_int kd, float* ab,
                                 lapack_int ldab, float* w, float* z,
                                 lapack_int ldz, float* work, lapack_int lwork,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_ssbevd_2stage_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ssbevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevd_2stage_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ssbevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevd_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -74,7 +74,7 @@ lapack_int LAPACKE_ssbevd_2stage_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -82,7 +82,7 @@ lapack_int LAPACKE_ssbevd_2stage_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_ssb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_ssb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssbevd_2stage( &jobz, &uplo, &n, &kd, ab_t, &ldab_t, w, z_t, &ldz_t,
                        work, &lwork, iwork, &liwork, &info );
@@ -90,24 +90,24 @@ lapack_int LAPACKE_ssbevd_2stage_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_ssb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssbevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevd_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssbevd_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevd_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbevd_work.c b/LAPACKE/src/lapacke_ssbevd_work.c
index e56be4b281..6d53102ffb 100644
--- a/LAPACKE/src/lapacke_ssbevd_work.c
+++ b/LAPACKE/src/lapacke_ssbevd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbevd_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssbevd_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_int kd, float* ab,
                                 lapack_int ldab, float* w, float* z,
                                 lapack_int ldz, float* work, lapack_int lwork,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_ssbevd_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ssbevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevd_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ssbevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -74,7 +74,7 @@ lapack_int LAPACKE_ssbevd_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -82,7 +82,7 @@ lapack_int LAPACKE_ssbevd_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_ssb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_ssb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssbevd( &jobz, &uplo, &n, &kd, ab_t, &ldab_t, w, z_t, &ldz_t,
                        work, &lwork, iwork, &liwork, &info );
@@ -90,24 +90,24 @@ lapack_int LAPACKE_ssbevd_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_ssb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssbevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssbevd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbevx.c b/LAPACKE/src/lapacke_ssbevx.c
index 01f3f8f06a..e6fd2b6146 100644
--- a/LAPACKE/src/lapacke_ssbevx.c
+++ b/LAPACKE/src/lapacke_ssbevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbevx( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssbevx)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_int kd, float* ab,
                            lapack_int ldab, float* q, lapack_int ldq, float vl,
                            float vu, lapack_int il, lapack_int iu, float abstol,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_ssbevx( int matrix_layout, char jobz, char range, char uplo,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_ssb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -15;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -12;
             }
         }
@@ -79,7 +79,7 @@ lapack_int LAPACKE_ssbevx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssbevx_work( matrix_layout, jobz, range, uplo, n, kd, ab,
+    info = API_SUFFIX(LAPACKE_ssbevx_work)( matrix_layout, jobz, range, uplo, n, kd, ab,
                                 ldab, q, ldq, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, work, iwork, ifail );
     /* Release memory and exit */
@@ -88,7 +88,7 @@ lapack_int LAPACKE_ssbevx( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbevx_2stage.c b/LAPACKE/src/lapacke_ssbevx_2stage.c
index 77ed44004a..4e1cc8f222 100644
--- a/LAPACKE/src/lapacke_ssbevx_2stage.c
+++ b/LAPACKE/src/lapacke_ssbevx_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbevx_2stage( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssbevx_2stage)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_int kd, float* ab,
                            lapack_int ldab, float* q, lapack_int ldq, float vl,
                            float vu, lapack_int il, lapack_int iu, float abstol,
@@ -45,32 +45,32 @@ lapack_int LAPACKE_ssbevx_2stage( int matrix_layout, char jobz, char range, char
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbevx_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevx_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_ssb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -15;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -12;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssbevx_2stage_work( matrix_layout, jobz, range, uplo, n, kd, ab,
+    info = API_SUFFIX(LAPACKE_ssbevx_2stage_work)( matrix_layout, jobz, range, uplo, n, kd, ab,
                                 ldab, q, ldq, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, &work_query, lwork, iwork, ifail );
     if( info != 0 ) {
@@ -89,7 +89,7 @@ lapack_int LAPACKE_ssbevx_2stage( int matrix_layout, char jobz, char range, char
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssbevx_2stage_work( matrix_layout, jobz, range, uplo, n, kd, ab,
+    info = API_SUFFIX(LAPACKE_ssbevx_2stage_work)( matrix_layout, jobz, range, uplo, n, kd, ab,
                                 ldab, q, ldq, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, work, lwork, iwork, ifail );
     /* Release memory and exit */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_ssbevx_2stage( int matrix_layout, char jobz, char range, char
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbevx_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevx_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbevx_2stage_work.c b/LAPACKE/src/lapacke_ssbevx_2stage_work.c
index 36a33fda73..3dbc4d732e 100644
--- a/LAPACKE/src/lapacke_ssbevx_2stage_work.c
+++ b/LAPACKE/src/lapacke_ssbevx_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbevx_2stage_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_ssbevx_2stage_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, lapack_int kd,
                                 float* ab, lapack_int ldab, float* q,
                                 lapack_int ldq, float vl, float vu,
@@ -51,9 +51,9 @@ lapack_int LAPACKE_ssbevx_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldab_t = MAX(1,kd+1);
         lapack_int ldq_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
@@ -63,17 +63,17 @@ lapack_int LAPACKE_ssbevx_2stage_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ssbevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevx_2stage_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ssbevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevx_2stage_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_ssbevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevx_2stage_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -82,14 +82,14 @@ lapack_int LAPACKE_ssbevx_2stage_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             q_t = (float*)LAPACKE_malloc( sizeof(float) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -105,7 +105,7 @@ lapack_int LAPACKE_ssbevx_2stage_work( int matrix_layout, char jobz, char range,
             return (info < 0) ? (info - 1) : info;
         }
         /* Transpose input matrices */
-        LAPACKE_ssb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_ssb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssbevx_2stage( &jobz, &range, &uplo, &n, &kd, ab_t, &ldab_t, q_t,
                        &ldq_t, &vl, &vu, &il, &iu, &abstol, m, w, z_t, &ldz_t,
@@ -114,32 +114,32 @@ lapack_int LAPACKE_ssbevx_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_ssb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssbevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevx_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssbevx_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevx_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbevx_work.c b/LAPACKE/src/lapacke_ssbevx_work.c
index 5640400624..b3ae7ba7b7 100644
--- a/LAPACKE/src/lapacke_ssbevx_work.c
+++ b/LAPACKE/src/lapacke_ssbevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbevx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_ssbevx_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, lapack_int kd,
                                 float* ab, lapack_int ldab, float* q,
                                 lapack_int ldq, float vl, float vu,
@@ -51,9 +51,9 @@ lapack_int LAPACKE_ssbevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldab_t = MAX(1,kd+1);
         lapack_int ldq_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
@@ -63,17 +63,17 @@ lapack_int LAPACKE_ssbevx_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ssbevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevx_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ssbevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevx_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_ssbevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -82,14 +82,14 @@ lapack_int LAPACKE_ssbevx_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             q_t = (float*)LAPACKE_malloc( sizeof(float) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -98,7 +98,7 @@ lapack_int LAPACKE_ssbevx_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_ssb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_ssb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssbevx( &jobz, &range, &uplo, &n, &kd, ab_t, &ldab_t, q_t,
                        &ldq_t, &vl, &vu, &il, &iu, &abstol, m, w, z_t, &ldz_t,
@@ -107,32 +107,32 @@ lapack_int LAPACKE_ssbevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_ssb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssbevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssbevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbgst.c b/LAPACKE/src/lapacke_ssbgst.c
index 42b89a3bf7..e6c3decf5c 100644
--- a/LAPACKE/src/lapacke_ssbgst.c
+++ b/LAPACKE/src/lapacke_ssbgst.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbgst( int matrix_layout, char vect, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssbgst)( int matrix_layout, char vect, char uplo, lapack_int n,
                            lapack_int ka, lapack_int kb, float* ab,
                            lapack_int ldab, const float* bb, lapack_int ldbb,
                            float* x, lapack_int ldx )
@@ -40,16 +40,16 @@ lapack_int LAPACKE_ssbgst( int matrix_layout, char vect, char uplo, lapack_int n
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbgst", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgst", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssb_nancheck( matrix_layout, uplo, n, ka, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_ssb_nancheck)( matrix_layout, uplo, n, ka, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_ssb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_ssb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -9;
         }
     }
@@ -61,13 +61,13 @@ lapack_int LAPACKE_ssbgst( int matrix_layout, char vect, char uplo, lapack_int n
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssbgst_work( matrix_layout, vect, uplo, n, ka, kb, ab, ldab,
+    info = API_SUFFIX(LAPACKE_ssbgst_work)( matrix_layout, vect, uplo, n, ka, kb, ab, ldab,
                                 bb, ldbb, x, ldx, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbgst", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgst", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbgst_work.c b/LAPACKE/src/lapacke_ssbgst_work.c
index 5346796fb6..3105b674ea 100644
--- a/LAPACKE/src/lapacke_ssbgst_work.c
+++ b/LAPACKE/src/lapacke_ssbgst_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbgst_work( int matrix_layout, char vect, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssbgst_work)( int matrix_layout, char vect, char uplo,
                                 lapack_int n, lapack_int ka, lapack_int kb,
                                 float* ab, lapack_int ldab, const float* bb,
                                 lapack_int ldbb, float* x, lapack_int ldx,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_ssbgst_work( int matrix_layout, char vect, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ssbgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgst_work", info );
             return info;
         }
         if( ldbb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ssbgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgst_work", info );
             return info;
         }
         if( ldx < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_ssbgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgst_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -80,7 +80,7 @@ lapack_int LAPACKE_ssbgst_work( int matrix_layout, char vect, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( vect, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
             x_t = (float*)LAPACKE_malloc( sizeof(float) * ldx_t * MAX(1,n) );
             if( x_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -88,8 +88,8 @@ lapack_int LAPACKE_ssbgst_work( int matrix_layout, char vect, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_ssb_trans( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
-        LAPACKE_ssb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_ssb_trans)( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_ssb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssbgst( &vect, &uplo, &n, &ka, &kb, ab_t, &ldab_t, bb_t, &ldbb_t,
                        x_t, &ldx_t, work, &info );
@@ -97,13 +97,13 @@ lapack_int LAPACKE_ssbgst_work( int matrix_layout, char vect, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssb_trans( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_ssb_trans)( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( vect, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, x_t, ldx_t, x, ldx );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, x_t, ldx_t, x, ldx );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( vect, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
             LAPACKE_free( x_t );
         }
 exit_level_2:
@@ -112,11 +112,11 @@ lapack_int LAPACKE_ssbgst_work( int matrix_layout, char vect, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssbgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgst_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssbgst_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgst_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbgv.c b/LAPACKE/src/lapacke_ssbgv.c
index 22572a28e9..94c1af4f20 100644
--- a/LAPACKE/src/lapacke_ssbgv.c
+++ b/LAPACKE/src/lapacke_ssbgv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbgv( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssbgv)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_int ka, lapack_int kb, float* ab,
                           lapack_int ldab, float* bb, lapack_int ldbb, float* w,
                           float* z, lapack_int ldz )
@@ -40,16 +40,16 @@ lapack_int LAPACKE_ssbgv( int matrix_layout, char jobz, char uplo, lapack_int n,
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbgv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssb_nancheck( matrix_layout, uplo, n, ka, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_ssb_nancheck)( matrix_layout, uplo, n, ka, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_ssb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_ssb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -9;
         }
     }
@@ -61,13 +61,13 @@ lapack_int LAPACKE_ssbgv( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssbgv_work( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
+    info = API_SUFFIX(LAPACKE_ssbgv_work)( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
                                bb, ldbb, w, z, ldz, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbgv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbgv_work.c b/LAPACKE/src/lapacke_ssbgv_work.c
index 60e3df8104..dc86005191 100644
--- a/LAPACKE/src/lapacke_ssbgv_work.c
+++ b/LAPACKE/src/lapacke_ssbgv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbgv_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssbgv_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_int ka, lapack_int kb,
                                float* ab, lapack_int ldab, float* bb,
                                lapack_int ldbb, float* w, float* z,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_ssbgv_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ssbgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgv_work", info );
             return info;
         }
         if( ldbb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ssbgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgv_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_ssbgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -80,7 +80,7 @@ lapack_int LAPACKE_ssbgv_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -88,8 +88,8 @@ lapack_int LAPACKE_ssbgv_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_ssb_trans( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
-        LAPACKE_ssb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_ssb_trans)( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_ssb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssbgv( &jobz, &uplo, &n, &ka, &kb, ab_t, &ldab_t, bb_t, &ldbb_t,
                       w, z_t, &ldz_t, work, &info );
@@ -97,15 +97,15 @@ lapack_int LAPACKE_ssbgv_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssb_trans( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_ssb_trans)( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_ssb_trans( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
+        API_SUFFIX(LAPACKE_ssb_trans)( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
                            ldbb );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
@@ -114,11 +114,11 @@ lapack_int LAPACKE_ssbgv_work( int matrix_layout, char jobz, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssbgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssbgv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbgvd.c b/LAPACKE/src/lapacke_ssbgvd.c
index 794e72b613..d0534fdf39 100644
--- a/LAPACKE/src/lapacke_ssbgvd.c
+++ b/LAPACKE/src/lapacke_ssbgvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbgvd( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssbgvd)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_int ka, lapack_int kb, float* ab,
                            lapack_int ldab, float* bb, lapack_int ldbb,
                            float* w, float* z, lapack_int ldz )
@@ -45,22 +45,22 @@ lapack_int LAPACKE_ssbgvd( int matrix_layout, char jobz, char uplo, lapack_int n
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbgvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssb_nancheck( matrix_layout, uplo, n, ka, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_ssb_nancheck)( matrix_layout, uplo, n, ka, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_ssb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_ssb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssbgvd_work( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
+    info = API_SUFFIX(LAPACKE_ssbgvd_work)( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
                                 bb, ldbb, w, z, ldz, &work_query, lwork,
                                 &iwork_query, liwork );
     if( info != 0 ) {
@@ -80,7 +80,7 @@ lapack_int LAPACKE_ssbgvd( int matrix_layout, char jobz, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssbgvd_work( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
+    info = API_SUFFIX(LAPACKE_ssbgvd_work)( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
                                 bb, ldbb, w, z, ldz, work, lwork, iwork,
                                 liwork );
     /* Release memory and exit */
@@ -89,7 +89,7 @@ lapack_int LAPACKE_ssbgvd( int matrix_layout, char jobz, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbgvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbgvd_work.c b/LAPACKE/src/lapacke_ssbgvd_work.c
index 78b3d4921c..c62052f7fa 100644
--- a/LAPACKE/src/lapacke_ssbgvd_work.c
+++ b/LAPACKE/src/lapacke_ssbgvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbgvd_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssbgvd_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_int ka, lapack_int kb,
                                 float* ab, lapack_int ldab, float* bb,
                                 lapack_int ldbb, float* w, float* z,
@@ -57,17 +57,17 @@ lapack_int LAPACKE_ssbgvd_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ssbgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgvd_work", info );
             return info;
         }
         if( ldbb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ssbgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgvd_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_ssbgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgvd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -87,7 +87,7 @@ lapack_int LAPACKE_ssbgvd_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -95,8 +95,8 @@ lapack_int LAPACKE_ssbgvd_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_ssb_trans( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
-        LAPACKE_ssb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_ssb_trans)( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_ssb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssbgvd( &jobz, &uplo, &n, &ka, &kb, ab_t, &ldab_t, bb_t, &ldbb_t,
                        w, z_t, &ldz_t, work, &lwork, iwork, &liwork, &info );
@@ -104,15 +104,15 @@ lapack_int LAPACKE_ssbgvd_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssb_trans( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_ssb_trans)( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_ssb_trans( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
+        API_SUFFIX(LAPACKE_ssb_trans)( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
                            ldbb );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
@@ -121,11 +121,11 @@ lapack_int LAPACKE_ssbgvd_work( int matrix_layout, char jobz, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssbgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssbgvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbgvx.c b/LAPACKE/src/lapacke_ssbgvx.c
index 49d62d84f7..f1331aa1dd 100644
--- a/LAPACKE/src/lapacke_ssbgvx.c
+++ b/LAPACKE/src/lapacke_ssbgvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbgvx( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssbgvx)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_int ka, lapack_int kb,
                            float* ab, lapack_int ldab, float* bb,
                            lapack_int ldbb, float* q, lapack_int ldq, float vl,
@@ -44,28 +44,28 @@ lapack_int LAPACKE_ssbgvx( int matrix_layout, char jobz, char range, char uplo,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbgvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssb_nancheck( matrix_layout, uplo, n, ka, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_ssb_nancheck)( matrix_layout, uplo, n, ka, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -18;
         }
-        if( LAPACKE_ssb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_ssb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -14;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -15;
             }
         }
@@ -83,7 +83,7 @@ lapack_int LAPACKE_ssbgvx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssbgvx_work( matrix_layout, jobz, range, uplo, n, ka, kb, ab,
+    info = API_SUFFIX(LAPACKE_ssbgvx_work)( matrix_layout, jobz, range, uplo, n, ka, kb, ab,
                                 ldab, bb, ldbb, q, ldq, vl, vu, il, iu, abstol,
                                 m, w, z, ldz, work, iwork, ifail );
     /* Release memory and exit */
@@ -92,7 +92,7 @@ lapack_int LAPACKE_ssbgvx( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbgvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbgvx_work.c b/LAPACKE/src/lapacke_ssbgvx_work.c
index 36d08e6ed2..c948c67f9c 100644
--- a/LAPACKE/src/lapacke_ssbgvx_work.c
+++ b/LAPACKE/src/lapacke_ssbgvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbgvx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_ssbgvx_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, lapack_int ka,
                                 lapack_int kb, float* ab, lapack_int ldab,
                                 float* bb, lapack_int ldbb, float* q,
@@ -63,22 +63,22 @@ lapack_int LAPACKE_ssbgvx_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ssbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgvx_work", info );
             return info;
         }
         if( ldbb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ssbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgvx_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_ssbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgvx_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -22;
-            LAPACKE_xerbla( "LAPACKE_ssbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -92,14 +92,14 @@ lapack_int LAPACKE_ssbgvx_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             q_t = (float*)LAPACKE_malloc( sizeof(float) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -107,8 +107,8 @@ lapack_int LAPACKE_ssbgvx_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_ssb_trans( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
-        LAPACKE_ssb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_ssb_trans)( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_ssb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssbgvx( &jobz, &range, &uplo, &n, &ka, &kb, ab_t, &ldab_t, bb_t,
                        &ldbb_t, q_t, &ldq_t, &vl, &vu, &il, &iu, &abstol, m, w,
@@ -117,22 +117,22 @@ lapack_int LAPACKE_ssbgvx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssb_trans( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_ssb_trans)( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_ssb_trans( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
+        API_SUFFIX(LAPACKE_ssb_trans)( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
                            ldbb );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_2:
@@ -141,11 +141,11 @@ lapack_int LAPACKE_ssbgvx_work( int matrix_layout, char jobz, char range,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssbgvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbgvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbtrd.c b/LAPACKE/src/lapacke_ssbtrd.c
index 0d34aee227..39543987ef 100644
--- a/LAPACKE/src/lapacke_ssbtrd.c
+++ b/LAPACKE/src/lapacke_ssbtrd.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbtrd( int matrix_layout, char vect, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssbtrd)( int matrix_layout, char vect, char uplo, lapack_int n,
                            lapack_int kd, float* ab, lapack_int ldab, float* d,
                            float* e, float* q, lapack_int ldq )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbtrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbtrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_ssb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( vect, 'u' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -10;
             }
         }
@@ -62,13 +62,13 @@ lapack_int LAPACKE_ssbtrd( int matrix_layout, char vect, char uplo, lapack_int n
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssbtrd_work( matrix_layout, vect, uplo, n, kd, ab, ldab, d, e,
+    info = API_SUFFIX(LAPACKE_ssbtrd_work)( matrix_layout, vect, uplo, n, kd, ab, ldab, d, e,
                                 q, ldq, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssbtrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbtrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssbtrd_work.c b/LAPACKE/src/lapacke_ssbtrd_work.c
index f1d9fda1e1..3b141b4b84 100644
--- a/LAPACKE/src/lapacke_ssbtrd_work.c
+++ b/LAPACKE/src/lapacke_ssbtrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssbtrd_work( int matrix_layout, char vect, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssbtrd_work)( int matrix_layout, char vect, char uplo,
                                 lapack_int n, lapack_int kd, float* ab,
                                 lapack_int ldab, float* d, float* e, float* q,
                                 lapack_int ldq, float* work )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_ssbtrd_work( int matrix_layout, char vect, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ssbtrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbtrd_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ssbtrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbtrd_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -67,7 +67,7 @@ lapack_int LAPACKE_ssbtrd_work( int matrix_layout, char vect, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( vect, 'u' ) || LAPACKE_lsame( vect, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
             q_t = (float*)LAPACKE_malloc( sizeof(float) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -75,9 +75,9 @@ lapack_int LAPACKE_ssbtrd_work( int matrix_layout, char vect, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_ssb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        if( LAPACKE_lsame( vect, 'u' ) || LAPACKE_lsame( vect, 'v' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_ssb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ssbtrd( &vect, &uplo, &n, &kd, ab_t, &ldab_t, d, e, q_t, &ldq_t,
@@ -86,24 +86,24 @@ lapack_int LAPACKE_ssbtrd_work( int matrix_layout, char vect, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_ssb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( vect, 'u' ) || LAPACKE_lsame( vect, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( vect, 'u' ) || LAPACKE_lsame( vect, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssbtrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbtrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssbtrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssbtrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssfrk.c b/LAPACKE/src/lapacke_ssfrk.c
index d82bc3e22a..53cc4a7654 100644
--- a/LAPACKE/src/lapacke_ssfrk.c
+++ b/LAPACKE/src/lapacke_ssfrk.c
@@ -32,34 +32,34 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssfrk( int matrix_layout, char transr, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_ssfrk)( int matrix_layout, char transr, char uplo, char trans,
                           lapack_int n, lapack_int k, float alpha,
                           const float* a, lapack_int lda, float beta, float* c )
 {
     lapack_int ka, na;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssfrk", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssfrk", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        ka = LAPACKE_lsame( trans, 'n' ) ? k : n;
-        na = LAPACKE_lsame( trans, 'n' ) ? n : k;
-        if( LAPACKE_sge_nancheck( matrix_layout, na, ka, a, lda ) ) {
+        ka = API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) ? k : n;
+        na = API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) ? n : k;
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, na, ka, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_s_nancheck( 1, &alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &alpha, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &beta, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &beta, 1 ) ) {
             return -10;
         }
-        if( LAPACKE_spf_nancheck( n, c ) ) {
+        if( API_SUFFIX(LAPACKE_spf_nancheck)( n, c ) ) {
             return -11;
         }
     }
 #endif
-    return LAPACKE_ssfrk_work( matrix_layout, transr, uplo, trans, n, k, alpha,
+    return API_SUFFIX(LAPACKE_ssfrk_work)( matrix_layout, transr, uplo, trans, n, k, alpha,
                                a, lda, beta, c );
 }
diff --git a/LAPACKE/src/lapacke_ssfrk_work.c b/LAPACKE/src/lapacke_ssfrk_work.c
index bf156359ee..da2598cc1f 100644
--- a/LAPACKE/src/lapacke_ssfrk_work.c
+++ b/LAPACKE/src/lapacke_ssfrk_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssfrk_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssfrk_work)( int matrix_layout, char transr, char uplo,
                                char trans, lapack_int n, lapack_int k,
                                float alpha, const float* a, lapack_int lda,
                                float beta, float* c )
@@ -46,15 +46,15 @@ lapack_int LAPACKE_ssfrk_work( int matrix_layout, char transr, char uplo,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int na = LAPACKE_lsame( trans, 'n' ) ? n : k;
-        lapack_int ka = LAPACKE_lsame( trans, 'n' ) ? k : n;
+        lapack_int na = API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) ? n : k;
+        lapack_int ka = API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) ? k : n;
         lapack_int lda_t = MAX(1,na);
         float* a_t = NULL;
         float* c_t = NULL;
         /* Check leading dimension(s) */
         if( lda < ka ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ssfrk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssfrk_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,25 +70,25 @@ lapack_int LAPACKE_ssfrk_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, na, ka, a, lda, a_t, lda_t );
-        LAPACKE_spf_trans( matrix_layout, transr, uplo, n, c, c_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, na, ka, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_spf_trans)( matrix_layout, transr, uplo, n, c, c_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssfrk( &transr, &uplo, &trans, &n, &k, &alpha, a_t, &lda_t,
                       &beta, c_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_spf_trans( LAPACK_COL_MAJOR, transr, uplo, n, c_t, c );
+        API_SUFFIX(LAPACKE_spf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, c_t, c );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssfrk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssfrk_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssfrk_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssfrk_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspcon.c b/LAPACKE/src/lapacke_sspcon.c
index 73bbdfb384..ba85453910 100644
--- a/LAPACKE/src/lapacke_sspcon.c
+++ b/LAPACKE/src/lapacke_sspcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspcon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sspcon)( int matrix_layout, char uplo, lapack_int n,
                            const float* ap, const lapack_int* ipiv, float anorm,
                            float* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_sspcon( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sspcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_ssp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
@@ -66,7 +66,7 @@ lapack_int LAPACKE_sspcon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sspcon_work( matrix_layout, uplo, n, ap, ipiv, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_sspcon_work)( matrix_layout, uplo, n, ap, ipiv, anorm, rcond,
                                 work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -74,7 +74,7 @@ lapack_int LAPACKE_sspcon( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sspcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspcon_work.c b/LAPACKE/src/lapacke_sspcon_work.c
index d0010f059f..49dfde68bc 100644
--- a/LAPACKE/src/lapacke_sspcon_work.c
+++ b/LAPACKE/src/lapacke_sspcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspcon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sspcon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const float* ap, const lapack_int* ipiv,
                                 float anorm, float* rcond, float* work,
                                 lapack_int* iwork )
@@ -54,7 +54,7 @@ lapack_int LAPACKE_sspcon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sspcon( &uplo, &n, ap_t, ipiv, &anorm, rcond, work, iwork,
                        &info );
@@ -65,11 +65,11 @@ lapack_int LAPACKE_sspcon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sspcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sspcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspev.c b/LAPACKE/src/lapacke_sspev.c
index 5ef49226f6..3da357d1c7 100644
--- a/LAPACKE/src/lapacke_sspev.c
+++ b/LAPACKE/src/lapacke_sspev.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspev( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sspev)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           float* ap, float* w, float* z, lapack_int ldz )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sspev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, ap ) ) {
             return -5;
         }
     }
@@ -56,13 +56,13 @@ lapack_int LAPACKE_sspev( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sspev_work( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
+    info = API_SUFFIX(LAPACKE_sspev_work)( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
                                work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sspev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspev_work.c b/LAPACKE/src/lapacke_sspev_work.c
index ee8ab7898c..d8dd5c06d9 100644
--- a/LAPACKE/src/lapacke_sspev_work.c
+++ b/LAPACKE/src/lapacke_sspev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspev_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_sspev_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, float* ap, float* w, float* z,
                                lapack_int ldz, float* work )
 {
@@ -50,11 +50,11 @@ lapack_int LAPACKE_sspev_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sspev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspev_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -68,30 +68,30 @@ lapack_int LAPACKE_sspev_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sspev( &jobz, &uplo, &n, ap_t, w, z_t, &ldz_t, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
-        LAPACKE_ssp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_ssp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sspev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sspev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspevd.c b/LAPACKE/src/lapacke_sspevd.c
index 8a7e629126..7ee6cdac68 100644
--- a/LAPACKE/src/lapacke_sspevd.c
+++ b/LAPACKE/src/lapacke_sspevd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspevd( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sspevd)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            float* ap, float* w, float* z, lapack_int ldz )
 {
     lapack_int info = 0;
@@ -43,19 +43,19 @@ lapack_int LAPACKE_sspevd( int matrix_layout, char jobz, char uplo, lapack_int n
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sspevd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspevd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, ap ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sspevd_work( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
+    info = API_SUFFIX(LAPACKE_sspevd_work)( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -74,7 +74,7 @@ lapack_int LAPACKE_sspevd( int matrix_layout, char jobz, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sspevd_work( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
+    info = API_SUFFIX(LAPACKE_sspevd_work)( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
                                 work, lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -82,7 +82,7 @@ lapack_int LAPACKE_sspevd( int matrix_layout, char jobz, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sspevd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspevd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspevd_work.c b/LAPACKE/src/lapacke_sspevd_work.c
index a49a339fe3..6a65c5c84a 100644
--- a/LAPACKE/src/lapacke_sspevd_work.c
+++ b/LAPACKE/src/lapacke_sspevd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspevd_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_sspevd_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, float* ap, float* w, float* z,
                                 lapack_int ldz, float* work, lapack_int lwork,
                                 lapack_int* iwork, lapack_int liwork )
@@ -52,7 +52,7 @@ lapack_int LAPACKE_sspevd_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sspevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspevd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -62,7 +62,7 @@ lapack_int LAPACKE_sspevd_work( int matrix_layout, char jobz, char uplo,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -76,7 +76,7 @@ lapack_int LAPACKE_sspevd_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sspevd( &jobz, &uplo, &n, ap_t, w, z_t, &ldz_t, work, &lwork,
                        iwork, &liwork, &info );
@@ -84,23 +84,23 @@ lapack_int LAPACKE_sspevd_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
-        LAPACKE_ssp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_ssp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sspevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspevd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sspevd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspevd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspevx.c b/LAPACKE/src/lapacke_sspevx.c
index ba16ed8ebc..5d16414f17 100644
--- a/LAPACKE/src/lapacke_sspevx.c
+++ b/LAPACKE/src/lapacke_sspevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspevx( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_sspevx)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, float* ap, float vl, float vu,
                            lapack_int il, lapack_int iu, float abstol,
                            lapack_int* m, float* w, float* z, lapack_int ldz,
@@ -42,25 +42,25 @@ lapack_int LAPACKE_sspevx( int matrix_layout, char jobz, char range, char uplo,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sspevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_ssp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -8;
             }
         }
@@ -78,7 +78,7 @@ lapack_int LAPACKE_sspevx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sspevx_work( matrix_layout, jobz, range, uplo, n, ap, vl, vu,
+    info = API_SUFFIX(LAPACKE_sspevx_work)( matrix_layout, jobz, range, uplo, n, ap, vl, vu,
                                 il, iu, abstol, m, w, z, ldz, work, iwork,
                                 ifail );
     /* Release memory and exit */
@@ -87,7 +87,7 @@ lapack_int LAPACKE_sspevx( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sspevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspevx_work.c b/LAPACKE/src/lapacke_sspevx_work.c
index 2c02e8ebb1..55604941db 100644
--- a/LAPACKE/src/lapacke_sspevx_work.c
+++ b/LAPACKE/src/lapacke_sspevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspevx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_sspevx_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, float* ap, float vl,
                                 float vu, lapack_int il, lapack_int iu,
                                 float abstol, lapack_int* m, float* w, float* z,
@@ -48,20 +48,20 @@ lapack_int LAPACKE_sspevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldz_t = MAX(1,n);
         float* z_t = NULL;
         float* ap_t = NULL;
         /* Check leading dimension(s) */
         if( ldz < ncols_z ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_sspevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspevx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -76,7 +76,7 @@ lapack_int LAPACKE_sspevx_work( int matrix_layout, char jobz, char range,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sspevx( &jobz, &range, &uplo, &n, ap_t, &vl, &vu, &il, &iu,
                        &abstol, m, w, z_t, &ldz_t, work, iwork, ifail, &info );
@@ -84,24 +84,24 @@ lapack_int LAPACKE_sspevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
-        LAPACKE_ssp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_ssp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sspevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sspevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspgst.c b/LAPACKE/src/lapacke_sspgst.c
index 834abeb61a..f8471df4b8 100644
--- a/LAPACKE/src/lapacke_sspgst.c
+++ b/LAPACKE/src/lapacke_sspgst.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspgst( int matrix_layout, lapack_int itype, char uplo,
+lapack_int API_SUFFIX(LAPACKE_sspgst)( int matrix_layout, lapack_int itype, char uplo,
                            lapack_int n, float* ap, const float* bp )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sspgst", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgst", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_ssp_nancheck( n, bp ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, bp ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_sspgst_work( matrix_layout, itype, uplo, n, ap, bp );
+    return API_SUFFIX(LAPACKE_sspgst_work)( matrix_layout, itype, uplo, n, ap, bp );
 }
diff --git a/LAPACKE/src/lapacke_sspgst_work.c b/LAPACKE/src/lapacke_sspgst_work.c
index 98d55b3a90..512a704bb6 100644
--- a/LAPACKE/src/lapacke_sspgst_work.c
+++ b/LAPACKE/src/lapacke_sspgst_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspgst_work( int matrix_layout, lapack_int itype, char uplo,
+lapack_int API_SUFFIX(LAPACKE_sspgst_work)( int matrix_layout, lapack_int itype, char uplo,
                                 lapack_int n, float* ap, const float* bp )
 {
     lapack_int info = 0;
@@ -59,26 +59,26 @@ lapack_int LAPACKE_sspgst_work( int matrix_layout, lapack_int itype, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, bp, bp_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, bp, bp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sspgst( &itype, &uplo, &n, ap_t, bp_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_ssp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( bp_t );
 exit_level_1:
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sspgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgst_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sspgst_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgst_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspgv.c b/LAPACKE/src/lapacke_sspgv.c
index 2cbd2b4215..f073f1abbc 100644
--- a/LAPACKE/src/lapacke_sspgv.c
+++ b/LAPACKE/src/lapacke_sspgv.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspgv( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_sspgv)( int matrix_layout, lapack_int itype, char jobz,
                           char uplo, lapack_int n, float* ap, float* bp,
                           float* w, float* z, lapack_int ldz )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sspgv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_ssp_nancheck( n, bp ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, bp ) ) {
             return -7;
         }
     }
@@ -60,13 +60,13 @@ lapack_int LAPACKE_sspgv( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sspgv_work( matrix_layout, itype, jobz, uplo, n, ap, bp, w, z,
+    info = API_SUFFIX(LAPACKE_sspgv_work)( matrix_layout, itype, jobz, uplo, n, ap, bp, w, z,
                                ldz, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sspgv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspgv_work.c b/LAPACKE/src/lapacke_sspgv_work.c
index ae9c2ff61a..6130fc446e 100644
--- a/LAPACKE/src/lapacke_sspgv_work.c
+++ b/LAPACKE/src/lapacke_sspgv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspgv_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_sspgv_work)( int matrix_layout, lapack_int itype, char jobz,
                                char uplo, lapack_int n, float* ap, float* bp,
                                float* w, float* z, lapack_int ldz, float* work )
 {
@@ -52,11 +52,11 @@ lapack_int LAPACKE_sspgv_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sspgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -76,8 +76,8 @@ lapack_int LAPACKE_sspgv_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, bp, bp_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, bp, bp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sspgv( &itype, &jobz, &uplo, &n, ap_t, bp_t, w, z_t, &ldz_t,
                       work, &info );
@@ -85,26 +85,26 @@ lapack_int LAPACKE_sspgv_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
-        LAPACKE_ssp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
-        LAPACKE_ssp_trans( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
+        API_SUFFIX(LAPACKE_ssp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_ssp_trans)( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
         /* Release memory and exit */
         LAPACKE_free( bp_t );
 exit_level_2:
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sspgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sspgv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspgvd.c b/LAPACKE/src/lapacke_sspgvd.c
index df2ddfa5d4..6fca317f1f 100644
--- a/LAPACKE/src/lapacke_sspgvd.c
+++ b/LAPACKE/src/lapacke_sspgvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspgvd( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_sspgvd)( int matrix_layout, lapack_int itype, char jobz,
                            char uplo, lapack_int n, float* ap, float* bp,
                            float* w, float* z, lapack_int ldz )
 {
@@ -44,22 +44,22 @@ lapack_int LAPACKE_sspgvd( int matrix_layout, lapack_int itype, char jobz,
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sspgvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_ssp_nancheck( n, bp ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, bp ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sspgvd_work( matrix_layout, itype, jobz, uplo, n, ap, bp, w,
+    info = API_SUFFIX(LAPACKE_sspgvd_work)( matrix_layout, itype, jobz, uplo, n, ap, bp, w,
                                 z, ldz, &work_query, lwork, &iwork_query,
                                 liwork );
     if( info != 0 ) {
@@ -79,7 +79,7 @@ lapack_int LAPACKE_sspgvd( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sspgvd_work( matrix_layout, itype, jobz, uplo, n, ap, bp, w,
+    info = API_SUFFIX(LAPACKE_sspgvd_work)( matrix_layout, itype, jobz, uplo, n, ap, bp, w,
                                 z, ldz, work, lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -87,7 +87,7 @@ lapack_int LAPACKE_sspgvd( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sspgvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspgvd_work.c b/LAPACKE/src/lapacke_sspgvd_work.c
index 572016567a..f0b97fcd0c 100644
--- a/LAPACKE/src/lapacke_sspgvd_work.c
+++ b/LAPACKE/src/lapacke_sspgvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspgvd_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_sspgvd_work)( int matrix_layout, lapack_int itype, char jobz,
                                 char uplo, lapack_int n, float* ap, float* bp,
                                 float* w, float* z, lapack_int ldz, float* work,
                                 lapack_int lwork, lapack_int* iwork,
@@ -54,7 +54,7 @@ lapack_int LAPACKE_sspgvd_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sspgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgvd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,7 +64,7 @@ lapack_int LAPACKE_sspgvd_work( int matrix_layout, lapack_int itype, char jobz,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -84,8 +84,8 @@ lapack_int LAPACKE_sspgvd_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, bp, bp_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, bp, bp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sspgvd( &itype, &jobz, &uplo, &n, ap_t, bp_t, w, z_t, &ldz_t,
                        work, &lwork, iwork, &liwork, &info );
@@ -93,26 +93,26 @@ lapack_int LAPACKE_sspgvd_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
-        LAPACKE_ssp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
-        LAPACKE_ssp_trans( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
+        API_SUFFIX(LAPACKE_ssp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_ssp_trans)( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
         /* Release memory and exit */
         LAPACKE_free( bp_t );
 exit_level_2:
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sspgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sspgvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspgvx.c b/LAPACKE/src/lapacke_sspgvx.c
index 44bcb23997..e9c96fc0eb 100644
--- a/LAPACKE/src/lapacke_sspgvx.c
+++ b/LAPACKE/src/lapacke_sspgvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspgvx( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_sspgvx)( int matrix_layout, lapack_int itype, char jobz,
                            char range, char uplo, lapack_int n, float* ap,
                            float* bp, float vl, float vu, lapack_int il,
                            lapack_int iu, float abstol, lapack_int* m, float* w,
@@ -42,28 +42,28 @@ lapack_int LAPACKE_sspgvx( int matrix_layout, lapack_int itype, char jobz,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sspgvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -13;
         }
-        if( LAPACKE_ssp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, ap ) ) {
             return -7;
         }
-        if( LAPACKE_ssp_nancheck( n, bp ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, bp ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -9;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -10;
             }
         }
@@ -81,7 +81,7 @@ lapack_int LAPACKE_sspgvx( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sspgvx_work( matrix_layout, itype, jobz, range, uplo, n, ap,
+    info = API_SUFFIX(LAPACKE_sspgvx_work)( matrix_layout, itype, jobz, range, uplo, n, ap,
                                 bp, vl, vu, il, iu, abstol, m, w, z, ldz, work,
                                 iwork, ifail );
     /* Release memory and exit */
@@ -90,7 +90,7 @@ lapack_int LAPACKE_sspgvx( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sspgvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspgvx_work.c b/LAPACKE/src/lapacke_sspgvx_work.c
index d53877948d..59aceee471 100644
--- a/LAPACKE/src/lapacke_sspgvx_work.c
+++ b/LAPACKE/src/lapacke_sspgvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspgvx_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_sspgvx_work)( int matrix_layout, lapack_int itype, char jobz,
                                 char range, char uplo, lapack_int n, float* ap,
                                 float* bp, float vl, float vu, lapack_int il,
                                 lapack_int iu, float abstol, lapack_int* m,
@@ -48,9 +48,9 @@ lapack_int LAPACKE_sspgvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldz_t = MAX(1,n);
         float* z_t = NULL;
         float* ap_t = NULL;
@@ -58,11 +58,11 @@ lapack_int LAPACKE_sspgvx_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( ldz < ncols_z ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_sspgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -83,8 +83,8 @@ lapack_int LAPACKE_sspgvx_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, bp, bp_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, bp, bp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sspgvx( &itype, &jobz, &range, &uplo, &n, ap_t, bp_t, &vl, &vu,
                        &il, &iu, &abstol, m, w, z_t, &ldz_t, work, iwork, ifail,
@@ -93,27 +93,27 @@ lapack_int LAPACKE_sspgvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
-        LAPACKE_ssp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
-        LAPACKE_ssp_trans( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
+        API_SUFFIX(LAPACKE_ssp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_ssp_trans)( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
         /* Release memory and exit */
         LAPACKE_free( bp_t );
 exit_level_2:
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sspgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sspgvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspgvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssprfs.c b/LAPACKE/src/lapacke_ssprfs.c
index bb61bf77d2..22f2840b8d 100644
--- a/LAPACKE/src/lapacke_ssprfs.c
+++ b/LAPACKE/src/lapacke_ssprfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssprfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssprfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const float* ap, const float* afp,
                            const lapack_int* ipiv, const float* b,
                            lapack_int ldb, float* x, lapack_int ldx,
@@ -42,22 +42,22 @@ lapack_int LAPACKE_ssprfs( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssprfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssprfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, afp ) ) {
             return -6;
         }
-        if( LAPACKE_ssp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -10;
         }
     }
@@ -74,7 +74,7 @@ lapack_int LAPACKE_ssprfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssprfs_work( matrix_layout, uplo, n, nrhs, ap, afp, ipiv, b,
+    info = API_SUFFIX(LAPACKE_ssprfs_work)( matrix_layout, uplo, n, nrhs, ap, afp, ipiv, b,
                                 ldb, x, ldx, ferr, berr, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -82,7 +82,7 @@ lapack_int LAPACKE_ssprfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssprfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssprfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssprfs_work.c b/LAPACKE/src/lapacke_ssprfs_work.c
index f07a0848d8..03244a5286 100644
--- a/LAPACKE/src/lapacke_ssprfs_work.c
+++ b/LAPACKE/src/lapacke_ssprfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssprfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssprfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const float* ap,
                                 const float* afp, const lapack_int* ipiv,
                                 const float* b, lapack_int ldb, float* x,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_ssprfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ssprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssprfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ssprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssprfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -89,10 +89,10 @@ lapack_int LAPACKE_ssprfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, afp, afp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssprfs( &uplo, &n, &nrhs, ap_t, afp_t, ipiv, b_t, &ldb_t, x_t,
                        &ldx_t, ferr, berr, work, iwork, &info );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_ssprfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( afp_t );
 exit_level_3:
@@ -111,11 +111,11 @@ lapack_int LAPACKE_ssprfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssprfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssprfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssprfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspsv.c b/LAPACKE/src/lapacke_sspsv.c
index 667eadf934..a115c9a874 100644
--- a/LAPACKE/src/lapacke_sspsv.c
+++ b/LAPACKE/src/lapacke_sspsv.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspsv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sspsv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, float* ap, lapack_int* ipiv,
                           float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sspsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_sspsv_work( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
+    return API_SUFFIX(LAPACKE_sspsv_work)( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_sspsv_work.c b/LAPACKE/src/lapacke_sspsv_work.c
index acba6a5393..b632c0263c 100644
--- a/LAPACKE/src/lapacke_sspsv_work.c
+++ b/LAPACKE/src/lapacke_sspsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspsv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sspsv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, float* ap, lapack_int* ipiv,
                                float* b, lapack_int ldb )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_sspsv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_sspsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,27 +66,27 @@ lapack_int LAPACKE_sspsv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_sspsv( &uplo, &n, &nrhs, ap_t, ipiv, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_ssp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_ssp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sspsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sspsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspsvx.c b/LAPACKE/src/lapacke_sspsvx.c
index e89032b297..2a4469922b 100644
--- a/LAPACKE/src/lapacke_sspsvx.c
+++ b/LAPACKE/src/lapacke_sspsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspsvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sspsvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, const float* ap, float* afp,
                            lapack_int* ipiv, const float* b, lapack_int ldb,
                            float* x, lapack_int ldx, float* rcond, float* ferr,
@@ -42,21 +42,21 @@ lapack_int LAPACKE_sspsvx( int matrix_layout, char fact, char uplo, lapack_int n
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sspsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_ssp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, afp ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_ssp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
@@ -73,7 +73,7 @@ lapack_int LAPACKE_sspsvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sspsvx_work( matrix_layout, fact, uplo, n, nrhs, ap, afp,
+    info = API_SUFFIX(LAPACKE_sspsvx_work)( matrix_layout, fact, uplo, n, nrhs, ap, afp,
                                 ipiv, b, ldb, x, ldx, rcond, ferr, berr, work,
                                 iwork );
     /* Release memory and exit */
@@ -82,7 +82,7 @@ lapack_int LAPACKE_sspsvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sspsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sspsvx_work.c b/LAPACKE/src/lapacke_sspsvx_work.c
index f4c2f5f38d..e68236fc8c 100644
--- a/LAPACKE/src/lapacke_sspsvx_work.c
+++ b/LAPACKE/src/lapacke_sspsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sspsvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_sspsvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs, const float* ap,
                                 float* afp, lapack_int* ipiv, const float* b,
                                 lapack_int ldb, float* x, lapack_int ldx,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_sspsvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sspsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_sspsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -89,10 +89,10 @@ lapack_int LAPACKE_sspsvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, ap, ap_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_ssp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, afp, afp_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_sspsvx( &fact, &uplo, &n, &nrhs, ap_t, afp_t, ipiv, b_t, &ldb_t,
@@ -101,9 +101,9 @@ lapack_int LAPACKE_sspsvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        if( LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_ssp_trans( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_ssp_trans)( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
         }
         /* Release memory and exit */
         LAPACKE_free( afp_t );
@@ -115,11 +115,11 @@ lapack_int LAPACKE_sspsvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sspsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sspsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sspsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssptrd.c b/LAPACKE/src/lapacke_ssptrd.c
index e62b6aae9d..9f628ecb7d 100644
--- a/LAPACKE/src/lapacke_ssptrd.c
+++ b/LAPACKE/src/lapacke_ssptrd.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssptrd( int matrix_layout, char uplo, lapack_int n, float* ap,
+lapack_int API_SUFFIX(LAPACKE_ssptrd)( int matrix_layout, char uplo, lapack_int n, float* ap,
                            float* d, float* e, float* tau )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssptrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssptrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_ssptrd_work( matrix_layout, uplo, n, ap, d, e, tau );
+    return API_SUFFIX(LAPACKE_ssptrd_work)( matrix_layout, uplo, n, ap, d, e, tau );
 }
diff --git a/LAPACKE/src/lapacke_ssptrd_work.c b/LAPACKE/src/lapacke_ssptrd_work.c
index a33db9917a..a0eefccb0c 100644
--- a/LAPACKE/src/lapacke_ssptrd_work.c
+++ b/LAPACKE/src/lapacke_ssptrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssptrd_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssptrd_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* ap, float* d, float* e, float* tau )
 {
     lapack_int info = 0;
@@ -52,23 +52,23 @@ lapack_int LAPACKE_ssptrd_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssptrd( &uplo, &n, ap_t, d, e, tau, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_ssp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssptrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssptrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssptrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssptrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssptrf.c b/LAPACKE/src/lapacke_ssptrf.c
index 7b5d655bc0..10d16da5fb 100644
--- a/LAPACKE/src/lapacke_ssptrf.c
+++ b/LAPACKE/src/lapacke_ssptrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssptrf( int matrix_layout, char uplo, lapack_int n, float* ap,
+lapack_int API_SUFFIX(LAPACKE_ssptrf)( int matrix_layout, char uplo, lapack_int n, float* ap,
                            lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssptrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssptrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_ssptrf_work( matrix_layout, uplo, n, ap, ipiv );
+    return API_SUFFIX(LAPACKE_ssptrf_work)( matrix_layout, uplo, n, ap, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_ssptrf_work.c b/LAPACKE/src/lapacke_ssptrf_work.c
index 7d4135f6a0..373732d7bf 100644
--- a/LAPACKE/src/lapacke_ssptrf_work.c
+++ b/LAPACKE/src/lapacke_ssptrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssptrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssptrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* ap, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -52,23 +52,23 @@ lapack_int LAPACKE_ssptrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssptrf( &uplo, &n, ap_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_ssp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssptrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssptrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssptrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssptrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssptri.c b/LAPACKE/src/lapacke_ssptri.c
index 7c1ead66a7..d2b65665eb 100644
--- a/LAPACKE/src/lapacke_ssptri.c
+++ b/LAPACKE/src/lapacke_ssptri.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssptri( int matrix_layout, char uplo, lapack_int n, float* ap,
+lapack_int API_SUFFIX(LAPACKE_ssptri)( int matrix_layout, char uplo, lapack_int n, float* ap,
                            const lapack_int* ipiv )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssptri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssptri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
@@ -56,12 +56,12 @@ lapack_int LAPACKE_ssptri( int matrix_layout, char uplo, lapack_int n, float* ap
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssptri_work( matrix_layout, uplo, n, ap, ipiv, work );
+    info = API_SUFFIX(LAPACKE_ssptri_work)( matrix_layout, uplo, n, ap, ipiv, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssptri", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssptri", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssptri_work.c b/LAPACKE/src/lapacke_ssptri_work.c
index e8caef5f8d..4fdb86af33 100644
--- a/LAPACKE/src/lapacke_ssptri_work.c
+++ b/LAPACKE/src/lapacke_ssptri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssptri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssptri_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* ap, const lapack_int* ipiv, float* work )
 {
     lapack_int info = 0;
@@ -52,23 +52,23 @@ lapack_int LAPACKE_ssptri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssptri( &uplo, &n, ap_t, ipiv, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_ssp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssptri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssptri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssptri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssptri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssptrs.c b/LAPACKE/src/lapacke_ssptrs.c
index 8a306e74e1..9b692c464d 100644
--- a/LAPACKE/src/lapacke_ssptrs.c
+++ b/LAPACKE/src/lapacke_ssptrs.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssptrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssptrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const float* ap,
                            const lapack_int* ipiv, float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssptrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssptrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ssp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_ssptrs_work( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
+    return API_SUFFIX(LAPACKE_ssptrs_work)( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_ssptrs_work.c b/LAPACKE/src/lapacke_ssptrs_work.c
index 4987103173..3dcdcefb61 100644
--- a/LAPACKE/src/lapacke_ssptrs_work.c
+++ b/LAPACKE/src/lapacke_ssptrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssptrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssptrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const float* ap,
                                 const lapack_int* ipiv, float* b,
                                 lapack_int ldb )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_ssptrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ssptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssptrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -67,26 +67,26 @@ lapack_int LAPACKE_ssptrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_ssp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ssp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssptrs( &uplo, &n, &nrhs, ap_t, ipiv, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssptrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssptrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssptrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sstebz.c b/LAPACKE/src/lapacke_sstebz.c
index ffd4216d25..1ff2e920dd 100644
--- a/LAPACKE/src/lapacke_sstebz.c
+++ b/LAPACKE/src/lapacke_sstebz.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstebz( char range, char order, lapack_int n, float vl,
+lapack_int API_SUFFIX(LAPACKE_sstebz)( char range, char order, lapack_int n, float vl,
                            float vu, lapack_int il, lapack_int iu, float abstol,
                            const float* d, const float* e, lapack_int* m,
                            lapack_int* nsplit, float* w, lapack_int* iblock,
@@ -44,22 +44,22 @@ lapack_int LAPACKE_sstebz( char range, char order, lapack_int n, float vl,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -9;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -4;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -5;
             }
         }
@@ -77,7 +77,7 @@ lapack_int LAPACKE_sstebz( char range, char order, lapack_int n, float vl,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sstebz_work( range, order, n, vl, vu, il, iu, abstol, d, e,
+    info = API_SUFFIX(LAPACKE_sstebz_work)( range, order, n, vl, vu, il, iu, abstol, d, e,
                                 m, nsplit, w, iblock, isplit, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -85,7 +85,7 @@ lapack_int LAPACKE_sstebz( char range, char order, lapack_int n, float vl,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sstebz", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstebz", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sstebz_work.c b/LAPACKE/src/lapacke_sstebz_work.c
index e625b551bf..33d30f2f1a 100644
--- a/LAPACKE/src/lapacke_sstebz_work.c
+++ b/LAPACKE/src/lapacke_sstebz_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstebz_work( char range, char order, lapack_int n, float vl,
+lapack_int API_SUFFIX(LAPACKE_sstebz_work)( char range, char order, lapack_int n, float vl,
                                 float vu, lapack_int il, lapack_int iu,
                                 float abstol, const float* d, const float* e,
                                 lapack_int* m, lapack_int* nsplit, float* w,
diff --git a/LAPACKE/src/lapacke_sstedc.c b/LAPACKE/src/lapacke_sstedc.c
index b30f851502..2cfc1d2908 100644
--- a/LAPACKE/src/lapacke_sstedc.c
+++ b/LAPACKE/src/lapacke_sstedc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstedc( int matrix_layout, char compz, lapack_int n, float* d,
+lapack_int API_SUFFIX(LAPACKE_sstedc)( int matrix_layout, char compz, lapack_int n, float* d,
                            float* e, float* z, lapack_int ldz )
 {
     lapack_int info = 0;
@@ -43,27 +43,27 @@ lapack_int LAPACKE_sstedc( int matrix_layout, char compz, lapack_int n, float* d
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sstedc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstedc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -6;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sstedc_work( matrix_layout, compz, n, d, e, z, ldz,
+    info = API_SUFFIX(LAPACKE_sstedc_work)( matrix_layout, compz, n, d, e, z, ldz,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -82,7 +82,7 @@ lapack_int LAPACKE_sstedc( int matrix_layout, char compz, lapack_int n, float* d
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sstedc_work( matrix_layout, compz, n, d, e, z, ldz, work,
+    info = API_SUFFIX(LAPACKE_sstedc_work)( matrix_layout, compz, n, d, e, z, ldz, work,
                                 lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -90,7 +90,7 @@ lapack_int LAPACKE_sstedc( int matrix_layout, char compz, lapack_int n, float* d
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sstedc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstedc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sstedc_work.c b/LAPACKE/src/lapacke_sstedc_work.c
index 775dd89c51..374a33fe19 100644
--- a/LAPACKE/src/lapacke_sstedc_work.c
+++ b/LAPACKE/src/lapacke_sstedc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstedc_work( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sstedc_work)( int matrix_layout, char compz, lapack_int n,
                                 float* d, float* e, float* z, lapack_int ldz,
                                 float* work, lapack_int lwork,
                                 lapack_int* iwork, lapack_int liwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_sstedc_work( int matrix_layout, char compz, lapack_int n,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sstedc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstedc_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_sstedc_work( int matrix_layout, char compz, lapack_int n,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -69,8 +69,8 @@ lapack_int LAPACKE_sstedc_work( int matrix_layout, char compz, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_sstedc( &compz, &n, d, e, z_t, &ldz_t, work, &lwork, iwork,
@@ -79,20 +79,20 @@ lapack_int LAPACKE_sstedc_work( int matrix_layout, char compz, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sstedc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstedc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sstedc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstedc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sstegr.c b/LAPACKE/src/lapacke_sstegr.c
index 6711f9258d..0a15ad67a6 100644
--- a/LAPACKE/src/lapacke_sstegr.c
+++ b/LAPACKE/src/lapacke_sstegr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstegr( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_sstegr)( int matrix_layout, char jobz, char range,
                            lapack_int n, float* d, float* e, float vl, float vu,
                            lapack_int il, lapack_int iu, float abstol,
                            lapack_int* m, float* w, float* z, lapack_int ldz,
@@ -46,35 +46,35 @@ lapack_int LAPACKE_sstegr( int matrix_layout, char jobz, char range,
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sstegr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstegr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -8;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sstegr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_sstegr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, abstol, m, w, z, ldz, isuppz, &work_query,
                                 lwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -94,7 +94,7 @@ lapack_int LAPACKE_sstegr( int matrix_layout, char jobz, char range,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sstegr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_sstegr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, abstol, m, w, z, ldz, isuppz, work, lwork,
                                 iwork, liwork );
     /* Release memory and exit */
@@ -103,7 +103,7 @@ lapack_int LAPACKE_sstegr( int matrix_layout, char jobz, char range,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sstegr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstegr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sstegr_work.c b/LAPACKE/src/lapacke_sstegr_work.c
index 99060cc9f4..2b1916cbb7 100644
--- a/LAPACKE/src/lapacke_sstegr_work.c
+++ b/LAPACKE/src/lapacke_sstegr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstegr_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_sstegr_work)( int matrix_layout, char jobz, char range,
                                 lapack_int n, float* d, float* e, float vl,
                                 float vu, lapack_int il, lapack_int iu,
                                 float abstol, lapack_int* m, float* w, float* z,
@@ -53,9 +53,9 @@ lapack_int LAPACKE_sstegr_work( int matrix_layout, char jobz, char range,
         lapack_int ldz_t = MAX(1,n);
         float* z_t = NULL;
         /* Check leading dimension(s) */
-        if( ( LAPACKE_lsame( jobz, 'v' ) && ( ldz < ldz_t )  ) || ( ldz < 1 ) ) {
+        if( ( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) && ( ldz < ldz_t )  ) || ( ldz < 1 ) ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_sstegr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstegr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,7 +66,7 @@ lapack_int LAPACKE_sstegr_work( int matrix_layout, char jobz, char range,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             /* Let be always 'n' instead of 'm' */
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
@@ -82,20 +82,20 @@ lapack_int LAPACKE_sstegr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, *m, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, *m, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sstegr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstegr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sstegr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstegr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sstein.c b/LAPACKE/src/lapacke_sstein.c
index cb6412a11a..053edbc95b 100644
--- a/LAPACKE/src/lapacke_sstein.c
+++ b/LAPACKE/src/lapacke_sstein.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstein( int matrix_layout, lapack_int n, const float* d,
+lapack_int API_SUFFIX(LAPACKE_sstein)( int matrix_layout, lapack_int n, const float* d,
                            const float* e, lapack_int m, const float* w,
                            const lapack_int* iblock, const lapack_int* isplit,
                            float* z, lapack_int ldz, lapack_int* ifailv )
@@ -41,19 +41,19 @@ lapack_int LAPACKE_sstein( int matrix_layout, lapack_int n, const float* d,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sstein", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstein", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -3;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n, w, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, w, 1 ) ) {
             return -6;
         }
     }
@@ -70,7 +70,7 @@ lapack_int LAPACKE_sstein( int matrix_layout, lapack_int n, const float* d,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sstein_work( matrix_layout, n, d, e, m, w, iblock, isplit, z,
+    info = API_SUFFIX(LAPACKE_sstein_work)( matrix_layout, n, d, e, m, w, iblock, isplit, z,
                                 ldz, work, iwork, ifailv );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -78,7 +78,7 @@ lapack_int LAPACKE_sstein( int matrix_layout, lapack_int n, const float* d,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sstein", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstein", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sstein_work.c b/LAPACKE/src/lapacke_sstein_work.c
index 29c227b5f5..ce4053bab5 100644
--- a/LAPACKE/src/lapacke_sstein_work.c
+++ b/LAPACKE/src/lapacke_sstein_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstein_work( int matrix_layout, lapack_int n, const float* d,
+lapack_int API_SUFFIX(LAPACKE_sstein_work)( int matrix_layout, lapack_int n, const float* d,
                                 const float* e, lapack_int m, const float* w,
                                 const lapack_int* iblock,
                                 const lapack_int* isplit, float* z,
@@ -53,7 +53,7 @@ lapack_int LAPACKE_sstein_work( int matrix_layout, lapack_int n, const float* d,
         /* Check leading dimension(s) */
         if( ldz < m ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_sstein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstein_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -69,16 +69,16 @@ lapack_int LAPACKE_sstein_work( int matrix_layout, lapack_int n, const float* d,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, m, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, m, z_t, ldz_t, z, ldz );
         /* Release memory and exit */
         LAPACKE_free( z_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sstein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstein_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sstein_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstein_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sstemr.c b/LAPACKE/src/lapacke_sstemr.c
index 594d5944b3..e1fcfd61ed 100644
--- a/LAPACKE/src/lapacke_sstemr.c
+++ b/LAPACKE/src/lapacke_sstemr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstemr( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_sstemr)( int matrix_layout, char jobz, char range,
                            lapack_int n, float* d, float* e, float vl, float vu,
                            lapack_int il, lapack_int iu, lapack_int* m,
                            float* w, float* z, lapack_int ldz, lapack_int nzc,
@@ -46,28 +46,28 @@ lapack_int LAPACKE_sstemr( int matrix_layout, char jobz, char range,
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sstemr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstemr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sstemr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_sstemr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, m, w, z, ldz, nzc, isuppz, tryrac,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -87,7 +87,7 @@ lapack_int LAPACKE_sstemr( int matrix_layout, char jobz, char range,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sstemr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_sstemr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, m, w, z, ldz, nzc, isuppz, tryrac, work,
                                 lwork, iwork, liwork );
     /* Release memory and exit */
@@ -96,7 +96,7 @@ lapack_int LAPACKE_sstemr( int matrix_layout, char jobz, char range,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sstemr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstemr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sstemr_work.c b/LAPACKE/src/lapacke_sstemr_work.c
index 09ed54b3e8..70dd064571 100644
--- a/LAPACKE/src/lapacke_sstemr_work.c
+++ b/LAPACKE/src/lapacke_sstemr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstemr_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_sstemr_work)( int matrix_layout, char jobz, char range,
                                 lapack_int n, float* d, float* e, float vl,
                                 float vu, lapack_int il, lapack_int iu,
                                 lapack_int* m, float* w, float* z,
@@ -54,9 +54,9 @@ lapack_int LAPACKE_sstemr_work( int matrix_layout, char jobz, char range,
         lapack_int ldz_t = MAX(1,n);
         float* z_t = NULL;
         /* Check leading dimension(s) */
-        if( ldz < 1 || ( LAPACKE_lsame( jobz, 'v' ) && ldz < n ) ) {
+        if( ldz < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) && ldz < n ) ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_sstemr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstemr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,7 +67,7 @@ lapack_int LAPACKE_sstemr_work( int matrix_layout, char jobz, char range,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -82,20 +82,20 @@ lapack_int LAPACKE_sstemr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sstemr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstemr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sstemr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstemr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssteqr.c b/LAPACKE/src/lapacke_ssteqr.c
index 1ce7476c18..caba20e8f7 100644
--- a/LAPACKE/src/lapacke_ssteqr.c
+++ b/LAPACKE/src/lapacke_ssteqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssteqr( int matrix_layout, char compz, lapack_int n, float* d,
+lapack_int API_SUFFIX(LAPACKE_ssteqr)( int matrix_layout, char compz, lapack_int n, float* d,
                            float* e, float* z, lapack_int ldz )
 {
     lapack_int info = 0;
@@ -40,27 +40,27 @@ lapack_int LAPACKE_ssteqr( int matrix_layout, char compz, lapack_int n, float* d
     lapack_int lwork;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssteqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssteqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -6;
             }
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( compz, 'n' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'n' ) ) {
         lwork = 1;
     } else {
         lwork = MAX(1,2*n-2);
@@ -72,12 +72,12 @@ lapack_int LAPACKE_ssteqr( int matrix_layout, char compz, lapack_int n, float* d
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssteqr_work( matrix_layout, compz, n, d, e, z, ldz, work );
+    info = API_SUFFIX(LAPACKE_ssteqr_work)( matrix_layout, compz, n, d, e, z, ldz, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssteqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssteqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssteqr_work.c b/LAPACKE/src/lapacke_ssteqr_work.c
index a76e306704..2be8193e5f 100644
--- a/LAPACKE/src/lapacke_ssteqr_work.c
+++ b/LAPACKE/src/lapacke_ssteqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssteqr_work( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssteqr_work)( int matrix_layout, char compz, lapack_int n,
                                 float* d, float* e, float* z, lapack_int ldz,
                                 float* work )
 {
@@ -49,11 +49,11 @@ lapack_int LAPACKE_ssteqr_work( int matrix_layout, char compz, lapack_int n,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ssteqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssteqr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -61,8 +61,8 @@ lapack_int LAPACKE_ssteqr_work( int matrix_layout, char compz, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ssteqr( &compz, &n, d, e, z_t, &ldz_t, work, &info );
@@ -70,20 +70,20 @@ lapack_int LAPACKE_ssteqr_work( int matrix_layout, char compz, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssteqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssteqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssteqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssteqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssterf.c b/LAPACKE/src/lapacke_ssterf.c
index a59d7fdb04..0e45e3438d 100644
--- a/LAPACKE/src/lapacke_ssterf.c
+++ b/LAPACKE/src/lapacke_ssterf.c
@@ -32,18 +32,18 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssterf( lapack_int n, float* d, float* e )
+lapack_int API_SUFFIX(LAPACKE_ssterf)( lapack_int n, float* d, float* e )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_ssterf_work( n, d, e );
+    return API_SUFFIX(LAPACKE_ssterf_work)( n, d, e );
 }
diff --git a/LAPACKE/src/lapacke_ssterf_work.c b/LAPACKE/src/lapacke_ssterf_work.c
index f636a9c8e0..b3deea1cb0 100644
--- a/LAPACKE/src/lapacke_ssterf_work.c
+++ b/LAPACKE/src/lapacke_ssterf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssterf_work( lapack_int n, float* d, float* e )
+lapack_int API_SUFFIX(LAPACKE_ssterf_work)( lapack_int n, float* d, float* e )
 {
     lapack_int info = 0;
     /* Call LAPACK function and adjust info */
diff --git a/LAPACKE/src/lapacke_sstev.c b/LAPACKE/src/lapacke_sstev.c
index 743793c0d1..12138ad7ea 100644
--- a/LAPACKE/src/lapacke_sstev.c
+++ b/LAPACKE/src/lapacke_sstev.c
@@ -32,28 +32,28 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstev( int matrix_layout, char jobz, lapack_int n, float* d,
+lapack_int API_SUFFIX(LAPACKE_sstev)( int matrix_layout, char jobz, lapack_int n, float* d,
                           float* e, float* z, lapack_int ldz )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sstev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( jobz, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
         work = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,2*n-2) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -61,14 +61,14 @@ lapack_int LAPACKE_sstev( int matrix_layout, char jobz, lapack_int n, float* d,
         }
     }
     /* Call middle-level interface */
-    info = LAPACKE_sstev_work( matrix_layout, jobz, n, d, e, z, ldz, work );
+    info = API_SUFFIX(LAPACKE_sstev_work)( matrix_layout, jobz, n, d, e, z, ldz, work );
     /* Release memory and exit */
-    if( LAPACKE_lsame( jobz, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
         LAPACKE_free( work );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sstev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sstev_work.c b/LAPACKE/src/lapacke_sstev_work.c
index 373d2b2217..ee7f6f3b5e 100644
--- a/LAPACKE/src/lapacke_sstev_work.c
+++ b/LAPACKE/src/lapacke_sstev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstev_work( int matrix_layout, char jobz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sstev_work)( int matrix_layout, char jobz, lapack_int n,
                                float* d, float* e, float* z, lapack_int ldz,
                                float* work )
 {
@@ -49,11 +49,11 @@ lapack_int LAPACKE_sstev_work( int matrix_layout, char jobz, lapack_int n,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sstev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstev_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -66,20 +66,20 @@ lapack_int LAPACKE_sstev_work( int matrix_layout, char jobz, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sstev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sstev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sstevd.c b/LAPACKE/src/lapacke_sstevd.c
index 8a47bb6b2b..def57215c8 100644
--- a/LAPACKE/src/lapacke_sstevd.c
+++ b/LAPACKE/src/lapacke_sstevd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstevd( int matrix_layout, char jobz, lapack_int n, float* d,
+lapack_int API_SUFFIX(LAPACKE_sstevd)( int matrix_layout, char jobz, lapack_int n, float* d,
                            float* e, float* z, lapack_int ldz )
 {
     lapack_int info = 0;
@@ -43,22 +43,22 @@ lapack_int LAPACKE_sstevd( int matrix_layout, char jobz, lapack_int n, float* d,
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sstevd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstevd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sstevd_work( matrix_layout, jobz, n, d, e, z, ldz,
+    info = API_SUFFIX(LAPACKE_sstevd_work)( matrix_layout, jobz, n, d, e, z, ldz,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -77,7 +77,7 @@ lapack_int LAPACKE_sstevd( int matrix_layout, char jobz, lapack_int n, float* d,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sstevd_work( matrix_layout, jobz, n, d, e, z, ldz, work,
+    info = API_SUFFIX(LAPACKE_sstevd_work)( matrix_layout, jobz, n, d, e, z, ldz, work,
                                 lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -85,7 +85,7 @@ lapack_int LAPACKE_sstevd( int matrix_layout, char jobz, lapack_int n, float* d,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sstevd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstevd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sstevd_work.c b/LAPACKE/src/lapacke_sstevd_work.c
index 41900bad9c..c184a2775c 100644
--- a/LAPACKE/src/lapacke_sstevd_work.c
+++ b/LAPACKE/src/lapacke_sstevd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstevd_work( int matrix_layout, char jobz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_sstevd_work)( int matrix_layout, char jobz, lapack_int n,
                                 float* d, float* e, float* z, lapack_int ldz,
                                 float* work, lapack_int lwork,
                                 lapack_int* iwork, lapack_int liwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_sstevd_work( int matrix_layout, char jobz, lapack_int n,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_sstevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstevd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_sstevd_work( int matrix_layout, char jobz, lapack_int n,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,n) );
             if( z_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -75,20 +75,20 @@ lapack_int LAPACKE_sstevd_work( int matrix_layout, char jobz, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sstevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstevd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sstevd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstevd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sstevr.c b/LAPACKE/src/lapacke_sstevr.c
index 9908a60b6d..212b25a3ca 100644
--- a/LAPACKE/src/lapacke_sstevr.c
+++ b/LAPACKE/src/lapacke_sstevr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstevr( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_sstevr)( int matrix_layout, char jobz, char range,
                            lapack_int n, float* d, float* e, float vl, float vu,
                            lapack_int il, lapack_int iu, float abstol,
                            lapack_int* m, float* w, float* z, lapack_int ldz,
@@ -46,35 +46,35 @@ lapack_int LAPACKE_sstevr( int matrix_layout, char jobz, char range,
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sstevr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstevr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -8;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_sstevr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_sstevr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, abstol, m, w, z, ldz, isuppz, &work_query,
                                 lwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -94,7 +94,7 @@ lapack_int LAPACKE_sstevr( int matrix_layout, char jobz, char range,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sstevr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_sstevr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, abstol, m, w, z, ldz, isuppz, work, lwork,
                                 iwork, liwork );
     /* Release memory and exit */
@@ -103,7 +103,7 @@ lapack_int LAPACKE_sstevr( int matrix_layout, char jobz, char range,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sstevr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstevr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sstevr_work.c b/LAPACKE/src/lapacke_sstevr_work.c
index 5ea804af06..0a1d0e9e65 100644
--- a/LAPACKE/src/lapacke_sstevr_work.c
+++ b/LAPACKE/src/lapacke_sstevr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstevr_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_sstevr_work)( int matrix_layout, char jobz, char range,
                                 lapack_int n, float* d, float* e, float vl,
                                 float vu, lapack_int il, lapack_int iu,
                                 float abstol, lapack_int* m, float* w, float* z,
@@ -50,15 +50,15 @@ lapack_int LAPACKE_sstevr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldz_t = MAX(1,n);
         float* z_t = NULL;
         /* Check leading dimension(s) */
         if( ldz < ncols_z ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_sstevr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstevr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -69,7 +69,7 @@ lapack_int LAPACKE_sstevr_work( int matrix_layout, char jobz, char range,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -85,21 +85,21 @@ lapack_int LAPACKE_sstevr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sstevr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstevr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sstevr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstevr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sstevx.c b/LAPACKE/src/lapacke_sstevx.c
index 8e27018c90..5ddcd5fde3 100644
--- a/LAPACKE/src/lapacke_sstevx.c
+++ b/LAPACKE/src/lapacke_sstevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstevx( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_sstevx)( int matrix_layout, char jobz, char range,
                            lapack_int n, float* d, float* e, float vl, float vu,
                            lapack_int il, lapack_int iu, float abstol,
                            lapack_int* m, float* w, float* z, lapack_int ldz,
@@ -42,28 +42,28 @@ lapack_int LAPACKE_sstevx( int matrix_layout, char jobz, char range,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_sstevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_s_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -8;
             }
         }
@@ -81,7 +81,7 @@ lapack_int LAPACKE_sstevx( int matrix_layout, char jobz, char range,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_sstevx_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_sstevx_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, abstol, m, w, z, ldz, work, iwork, ifail );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -89,7 +89,7 @@ lapack_int LAPACKE_sstevx( int matrix_layout, char jobz, char range,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_sstevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_sstevx_work.c b/LAPACKE/src/lapacke_sstevx_work.c
index fa45159762..c9d9a18e4f 100644
--- a/LAPACKE/src/lapacke_sstevx_work.c
+++ b/LAPACKE/src/lapacke_sstevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_sstevx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_sstevx_work)( int matrix_layout, char jobz, char range,
                                 lapack_int n, float* d, float* e, float vl,
                                 float vu, lapack_int il, lapack_int iu,
                                 float abstol, lapack_int* m, float* w, float* z,
@@ -48,19 +48,19 @@ lapack_int LAPACKE_sstevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldz_t = MAX(1,n);
         float* z_t = NULL;
         /* Check leading dimension(s) */
         if( ldz < ncols_z ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_sstevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstevx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -75,21 +75,21 @@ lapack_int LAPACKE_sstevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_sstevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_sstevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_sstevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssycon.c b/LAPACKE/src/lapacke_ssycon.c
index 0cb6e2ae79..a292b5eb83 100644
--- a/LAPACKE/src/lapacke_ssycon.c
+++ b/LAPACKE/src/lapacke_ssycon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssycon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssycon)( int matrix_layout, char uplo, lapack_int n,
                            const float* a, lapack_int lda,
                            const lapack_int* ipiv, float anorm, float* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_ssycon( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssycon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssycon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -7;
         }
     }
@@ -66,7 +66,7 @@ lapack_int LAPACKE_ssycon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssycon_work( matrix_layout, uplo, n, a, lda, ipiv, anorm,
+    info = API_SUFFIX(LAPACKE_ssycon_work)( matrix_layout, uplo, n, a, lda, ipiv, anorm,
                                 rcond, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -74,7 +74,7 @@ lapack_int LAPACKE_ssycon( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssycon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssycon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssycon_3.c b/LAPACKE/src/lapacke_ssycon_3.c
index 7870924e78..9219634f4f 100644
--- a/LAPACKE/src/lapacke_ssycon_3.c
+++ b/LAPACKE/src/lapacke_ssycon_3.c
@@ -32,28 +32,28 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssycon_3( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssycon_3)( int matrix_layout, char uplo, lapack_int n,
                            const float* a, lapack_int lda, const float* e,
                            const lapack_int* ipiv, float anorm, float* rcond )
 {
     lapack_int info = 0;
     lapack_int* iwork = NULL;
     float* work = NULL;
-    lapack_int e_start = LAPACKE_lsame( uplo, 'U' ) ? 1 : 0;
+    lapack_int e_start = API_SUFFIX(LAPACKE_lsame)( uplo, 'U' ) ? 1 : 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssycon_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssycon_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n-1, e + e_start, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e + e_start, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &anorm, 1 ) ) {
             return -8;
         }
     }
@@ -70,7 +70,7 @@ lapack_int LAPACKE_ssycon_3( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssycon_3_work( matrix_layout, uplo, n, a, lda, e, ipiv, anorm,
+    info = API_SUFFIX(LAPACKE_ssycon_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv, anorm,
                                 rcond, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -78,7 +78,7 @@ lapack_int LAPACKE_ssycon_3( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssycon_3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssycon_3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssycon_3_work.c b/LAPACKE/src/lapacke_ssycon_3_work.c
index db0a7df25f..e11ffa3311 100644
--- a/LAPACKE/src/lapacke_ssycon_3_work.c
+++ b/LAPACKE/src/lapacke_ssycon_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssycon_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssycon_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 const float* a, lapack_int lda,
                                 const float* e, const lapack_int* ipiv, float anorm,
                                 float* rcond, float* work, lapack_int* iwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_ssycon_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ssycon_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssycon_3_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_ssycon_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssycon_3( &uplo, &n, a_t, &lda_t, e, ipiv, &anorm, rcond, work, iwork,
                        &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_ssycon_3_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssycon_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssycon_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssycon_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssycon_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssycon_work.c b/LAPACKE/src/lapacke_ssycon_work.c
index afe14b5f77..fa86260505 100644
--- a/LAPACKE/src/lapacke_ssycon_work.c
+++ b/LAPACKE/src/lapacke_ssycon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssycon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssycon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const float* a, lapack_int lda,
                                 const lapack_int* ipiv, float anorm,
                                 float* rcond, float* work, lapack_int* iwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_ssycon_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ssycon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssycon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_ssycon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssycon( &uplo, &n, a_t, &lda_t, ipiv, &anorm, rcond, work, iwork,
                        &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_ssycon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssycon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssycon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssycon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssycon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyconv.c b/LAPACKE/src/lapacke_ssyconv.c
index 9b0ebbddc2..5d18dd410c 100644
--- a/LAPACKE/src/lapacke_ssyconv.c
+++ b/LAPACKE/src/lapacke_ssyconv.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyconv( int matrix_layout, char uplo, char way, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssyconv)( int matrix_layout, char uplo, char way, lapack_int n,
                             float* a, lapack_int lda, const lapack_int* ipiv, float* e )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyconv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyconv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Call middle-level interface */
-    return LAPACKE_ssyconv_work( matrix_layout, uplo, way, n, a, lda, ipiv, e );
+    return API_SUFFIX(LAPACKE_ssyconv_work)( matrix_layout, uplo, way, n, a, lda, ipiv, e );
 }
diff --git a/LAPACKE/src/lapacke_ssyconv_work.c b/LAPACKE/src/lapacke_ssyconv_work.c
index 668775f743..8189f85422 100644
--- a/LAPACKE/src/lapacke_ssyconv_work.c
+++ b/LAPACKE/src/lapacke_ssyconv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyconv_work( int matrix_layout, char uplo, char way,
+lapack_int API_SUFFIX(LAPACKE_ssyconv_work)( int matrix_layout, char uplo, char way,
                                  lapack_int n, float* a, lapack_int lda,
                                  const lapack_int* ipiv, float* e )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_ssyconv_work( int matrix_layout, char uplo, char way,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssyconv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyconv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_ssyconv_work( int matrix_layout, char uplo, char way,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, lda, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, lda, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssyconv( &uplo, &way, &n, a_t, &lda_t, ipiv, e, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, lda, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, lda, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssyconv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyconv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssyconv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyconv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyequb.c b/LAPACKE/src/lapacke_ssyequb.c
index 7784923ad5..cafd2ac6c0 100644
--- a/LAPACKE/src/lapacke_ssyequb.c
+++ b/LAPACKE/src/lapacke_ssyequb.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyequb( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssyequb)( int matrix_layout, char uplo, lapack_int n,
                             const float* a, lapack_int lda, float* s,
                             float* scond, float* amax )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyequb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -57,13 +57,13 @@ lapack_int LAPACKE_ssyequb( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssyequb_work( matrix_layout, uplo, n, a, lda, s, scond, amax,
+    info = API_SUFFIX(LAPACKE_ssyequb_work)( matrix_layout, uplo, n, a, lda, s, scond, amax,
                                  work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyequb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyequb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyequb_work.c b/LAPACKE/src/lapacke_ssyequb_work.c
index 3979d6f79e..6bf7bd9ceb 100644
--- a/LAPACKE/src/lapacke_ssyequb_work.c
+++ b/LAPACKE/src/lapacke_ssyequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyequb_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssyequb_work)( int matrix_layout, char uplo, lapack_int n,
                                  const float* a, lapack_int lda, float* s,
                                  float* scond, float* amax, float* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_ssyequb_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ssyequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,7 +59,7 @@ lapack_int LAPACKE_ssyequb_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssyequb( &uplo, &n, a_t, &lda_t, s, scond, amax, work, &info );
         if( info < 0 ) {
@@ -69,11 +69,11 @@ lapack_int LAPACKE_ssyequb_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssyequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssyequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyev.c b/LAPACKE/src/lapacke_ssyev.c
index 0bf5cf8311..d18786deba 100644
--- a/LAPACKE/src/lapacke_ssyev.c
+++ b/LAPACKE/src/lapacke_ssyev.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyev( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssyev)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           float* a, lapack_int lda, float* w )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_ssyev( int matrix_layout, char jobz, char uplo, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssyev_work( matrix_layout, jobz, uplo, n, a, lda, w,
+    info = API_SUFFIX(LAPACKE_ssyev_work)( matrix_layout, jobz, uplo, n, a, lda, w,
                                &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,13 +65,13 @@ lapack_int LAPACKE_ssyev( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssyev_work( matrix_layout, jobz, uplo, n, a, lda, w, work,
+    info = API_SUFFIX(LAPACKE_ssyev_work)( matrix_layout, jobz, uplo, n, a, lda, w, work,
                                lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyev_2stage.c b/LAPACKE/src/lapacke_ssyev_2stage.c
index cc4ecc04ec..9b4150f56b 100644
--- a/LAPACKE/src/lapacke_ssyev_2stage.c
+++ b/LAPACKE/src/lapacke_ssyev_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyev_2stage( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssyev_2stage)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           float* a, lapack_int lda, float* w )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_ssyev_2stage( int matrix_layout, char jobz, char uplo, lapack
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyev_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyev_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssyev_2stage_work( matrix_layout, jobz, uplo, n, a, lda, w,
+    info = API_SUFFIX(LAPACKE_ssyev_2stage_work)( matrix_layout, jobz, uplo, n, a, lda, w,
                                &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,13 +65,13 @@ lapack_int LAPACKE_ssyev_2stage( int matrix_layout, char jobz, char uplo, lapack
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssyev_2stage_work( matrix_layout, jobz, uplo, n, a, lda, w, work,
+    info = API_SUFFIX(LAPACKE_ssyev_2stage_work)( matrix_layout, jobz, uplo, n, a, lda, w, work,
                                lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyev_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyev_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyev_2stage_work.c b/LAPACKE/src/lapacke_ssyev_2stage_work.c
index 7c46efc8f1..f0310f85ee 100644
--- a/LAPACKE/src/lapacke_ssyev_2stage_work.c
+++ b/LAPACKE/src/lapacke_ssyev_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyev_2stage_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssyev_2stage_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, float* a, lapack_int lda, float* w,
                                float* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_ssyev_2stage_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssyev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyev_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_ssyev_2stage_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssyev_2stage( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssyev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyev_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssyev_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyev_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyev_work.c b/LAPACKE/src/lapacke_ssyev_work.c
index 259fd90d2d..8310227989 100644
--- a/LAPACKE/src/lapacke_ssyev_work.c
+++ b/LAPACKE/src/lapacke_ssyev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyev_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssyev_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, float* a, lapack_int lda, float* w,
                                float* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_ssyev_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssyev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyev_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,7 +64,7 @@ lapack_int LAPACKE_ssyev_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssyev( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, &info );
         if( info < 0 ) {
@@ -72,19 +72,19 @@ lapack_int LAPACKE_ssyev_work( int matrix_layout, char jobz, char uplo,
         }
         /* Transpose output matrices */
         if ( jobz == 'V' || jobz == 'v' ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         } else {
-            LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssyev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssyev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyevd.c b/LAPACKE/src/lapacke_ssyevd.c
index 317cd0cd0a..ee5a0da7f0 100644
--- a/LAPACKE/src/lapacke_ssyevd.c
+++ b/LAPACKE/src/lapacke_ssyevd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyevd( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssyevd)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            float* a, lapack_int lda, float* w )
 {
     lapack_int info = 0;
@@ -43,19 +43,19 @@ lapack_int LAPACKE_ssyevd( int matrix_layout, char jobz, char uplo, lapack_int n
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyevd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssyevd_work( matrix_layout, jobz, uplo, n, a, lda, w,
+    info = API_SUFFIX(LAPACKE_ssyevd_work)( matrix_layout, jobz, uplo, n, a, lda, w,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -74,7 +74,7 @@ lapack_int LAPACKE_ssyevd( int matrix_layout, char jobz, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssyevd_work( matrix_layout, jobz, uplo, n, a, lda, w, work,
+    info = API_SUFFIX(LAPACKE_ssyevd_work)( matrix_layout, jobz, uplo, n, a, lda, w, work,
                                 lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -82,7 +82,7 @@ lapack_int LAPACKE_ssyevd( int matrix_layout, char jobz, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyevd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyevd_2stage.c b/LAPACKE/src/lapacke_ssyevd_2stage.c
index c723dd1261..e006ed5683 100644
--- a/LAPACKE/src/lapacke_ssyevd_2stage.c
+++ b/LAPACKE/src/lapacke_ssyevd_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyevd_2stage( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssyevd_2stage)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            float* a, lapack_int lda, float* w )
 {
     lapack_int info = 0;
@@ -43,19 +43,19 @@ lapack_int LAPACKE_ssyevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyevd_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevd_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssyevd_2stage_work( matrix_layout, jobz, uplo, n, a, lda, w,
+    info = API_SUFFIX(LAPACKE_ssyevd_2stage_work)( matrix_layout, jobz, uplo, n, a, lda, w,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -74,7 +74,7 @@ lapack_int LAPACKE_ssyevd_2stage( int matrix_layout, char jobz, char uplo, lapac
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssyevd_2stage_work( matrix_layout, jobz, uplo, n, a, lda, w, work,
+    info = API_SUFFIX(LAPACKE_ssyevd_2stage_work)( matrix_layout, jobz, uplo, n, a, lda, w, work,
                                 lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -82,7 +82,7 @@ lapack_int LAPACKE_ssyevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyevd_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevd_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyevd_2stage_work.c b/LAPACKE/src/lapacke_ssyevd_2stage_work.c
index 6604d2a5f5..a06cc2c3b9 100644
--- a/LAPACKE/src/lapacke_ssyevd_2stage_work.c
+++ b/LAPACKE/src/lapacke_ssyevd_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyevd_2stage_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssyevd_2stage_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, float* a, lapack_int lda,
                                 float* w, float* work, lapack_int lwork,
                                 lapack_int* iwork, lapack_int liwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_ssyevd_2stage_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssyevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevd_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,7 +67,7 @@ lapack_int LAPACKE_ssyevd_2stage_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssyevd_2stage( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, iwork,
                        &liwork, &info );
@@ -76,19 +76,19 @@ lapack_int LAPACKE_ssyevd_2stage_work( int matrix_layout, char jobz, char uplo,
         }
         /* Transpose output matrices */
         if ( jobz == 'V' || jobz == 'v' ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         } else {
-            LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda ); 
+            API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda ); 
         }
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssyevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevd_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssyevd_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevd_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyevd_work.c b/LAPACKE/src/lapacke_ssyevd_work.c
index 85679e6e46..87139c3973 100644
--- a/LAPACKE/src/lapacke_ssyevd_work.c
+++ b/LAPACKE/src/lapacke_ssyevd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyevd_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssyevd_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, float* a, lapack_int lda,
                                 float* w, float* work, lapack_int lwork,
                                 lapack_int* iwork, lapack_int liwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_ssyevd_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssyevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,7 +67,7 @@ lapack_int LAPACKE_ssyevd_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssyevd( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, iwork,
                        &liwork, &info );
@@ -76,19 +76,19 @@ lapack_int LAPACKE_ssyevd_work( int matrix_layout, char jobz, char uplo,
         }
         /* Transpose output matrices */
         if ( jobz == 'V' || jobz == 'v' ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         } else {
-            LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssyevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssyevd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyevr.c b/LAPACKE/src/lapacke_ssyevr.c
index efbbaa73ae..27b94afc40 100644
--- a/LAPACKE/src/lapacke_ssyevr.c
+++ b/LAPACKE/src/lapacke_ssyevr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyevr( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssyevr)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, float* a, lapack_int lda, float vl,
                            float vu, lapack_int il, lapack_int iu, float abstol,
                            lapack_int* m, float* w, float* z, lapack_int ldz,
@@ -46,32 +46,32 @@ lapack_int LAPACKE_ssyevr( int matrix_layout, char jobz, char range, char uplo,
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyevr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -9;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssyevr_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_ssyevr_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, isuppz,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -91,7 +91,7 @@ lapack_int LAPACKE_ssyevr( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssyevr_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_ssyevr_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, isuppz, work,
                                 lwork, iwork, liwork );
     /* Release memory and exit */
@@ -100,7 +100,7 @@ lapack_int LAPACKE_ssyevr( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyevr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyevr_2stage.c b/LAPACKE/src/lapacke_ssyevr_2stage.c
index c7f17378de..6421990222 100644
--- a/LAPACKE/src/lapacke_ssyevr_2stage.c
+++ b/LAPACKE/src/lapacke_ssyevr_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyevr_2stage( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssyevr_2stage)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, float* a, lapack_int lda, float vl,
                            float vu, lapack_int il, lapack_int iu, float abstol,
                            lapack_int* m, float* w, float* z, lapack_int ldz,
@@ -46,32 +46,32 @@ lapack_int LAPACKE_ssyevr_2stage( int matrix_layout, char jobz, char range, char
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyevr_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevr_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -9;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssyevr_2stage_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_ssyevr_2stage_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, isuppz,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -91,7 +91,7 @@ lapack_int LAPACKE_ssyevr_2stage( int matrix_layout, char jobz, char range, char
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssyevr_2stage_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_ssyevr_2stage_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, isuppz, work,
                                 lwork, iwork, liwork );
     /* Release memory and exit */
@@ -100,7 +100,7 @@ lapack_int LAPACKE_ssyevr_2stage( int matrix_layout, char jobz, char range, char
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyevr_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevr_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyevr_2stage_work.c b/LAPACKE/src/lapacke_ssyevr_2stage_work.c
index cbb62d1954..ede8591666 100644
--- a/LAPACKE/src/lapacke_ssyevr_2stage_work.c
+++ b/LAPACKE/src/lapacke_ssyevr_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyevr_2stage_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_ssyevr_2stage_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, float* a,
                                 lapack_int lda, float vl, float vu,
                                 lapack_int il, lapack_int iu, float abstol,
@@ -51,9 +51,9 @@ lapack_int LAPACKE_ssyevr_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
         float* a_t = NULL;
@@ -61,12 +61,12 @@ lapack_int LAPACKE_ssyevr_2stage_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ssyevr_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevr_2stage_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_ssyevr_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevr_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -82,7 +82,7 @@ lapack_int LAPACKE_ssyevr_2stage_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -91,7 +91,7 @@ lapack_int LAPACKE_ssyevr_2stage_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssyevr_2stage( &jobz, &range, &uplo, &n, a_t, &lda_t, &vl, &vu, &il,
                        &iu, &abstol, m, w, z_t, &ldz_t, isuppz, work, &lwork,
@@ -100,24 +100,24 @@ lapack_int LAPACKE_ssyevr_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssyevr_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevr_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssyevr_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevr_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyevr_work.c b/LAPACKE/src/lapacke_ssyevr_work.c
index c6e0e3a2e5..8792ae9137 100644
--- a/LAPACKE/src/lapacke_ssyevr_work.c
+++ b/LAPACKE/src/lapacke_ssyevr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyevr_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_ssyevr_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, float* a,
                                 lapack_int lda, float vl, float vu,
                                 lapack_int il, lapack_int iu, float abstol,
@@ -51,10 +51,10 @@ lapack_int LAPACKE_ssyevr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( !LAPACKE_lsame( jobz, 'v' ) ) ? 1 :
-                             ( LAPACKE_lsame( range, 'a' ) ||
-                               LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( !API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) ? 1 :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                               API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
         float* a_t = NULL;
@@ -62,12 +62,12 @@ lapack_int LAPACKE_ssyevr_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ssyevr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevr_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_ssyevr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,7 +83,7 @@ lapack_int LAPACKE_ssyevr_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -92,7 +92,7 @@ lapack_int LAPACKE_ssyevr_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssyevr( &jobz, &range, &uplo, &n, a_t, &lda_t, &vl, &vu, &il,
                        &iu, &abstol, m, w, z_t, &ldz_t, isuppz, work, &lwork,
@@ -101,24 +101,24 @@ lapack_int LAPACKE_ssyevr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssyevr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssyevr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyevx.c b/LAPACKE/src/lapacke_ssyevx.c
index 5b949d2c53..1bebf5f8dd 100644
--- a/LAPACKE/src/lapacke_ssyevx.c
+++ b/LAPACKE/src/lapacke_ssyevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyevx( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssyevx)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, float* a, lapack_int lda, float vl,
                            float vu, lapack_int il, lapack_int iu, float abstol,
                            lapack_int* m, float* w, float* z, lapack_int ldz,
@@ -44,25 +44,25 @@ lapack_int LAPACKE_ssyevx( int matrix_layout, char jobz, char range, char uplo,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -9;
             }
         }
@@ -75,7 +75,7 @@ lapack_int LAPACKE_ssyevx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssyevx_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_ssyevx_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, &work_query,
                                 lwork, iwork, ifail );
     if( info != 0 ) {
@@ -89,7 +89,7 @@ lapack_int LAPACKE_ssyevx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssyevx_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_ssyevx_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, work, lwork,
                                 iwork, ifail );
     /* Release memory and exit */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_ssyevx( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyevx_2stage.c b/LAPACKE/src/lapacke_ssyevx_2stage.c
index 2c5f4c7f37..b2fa28350e 100644
--- a/LAPACKE/src/lapacke_ssyevx_2stage.c
+++ b/LAPACKE/src/lapacke_ssyevx_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyevx_2stage( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssyevx_2stage)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, float* a, lapack_int lda, float vl,
                            float vu, lapack_int il, lapack_int iu, float abstol,
                            lapack_int* m, float* w, float* z, lapack_int ldz,
@@ -44,25 +44,25 @@ lapack_int LAPACKE_ssyevx_2stage( int matrix_layout, char jobz, char range, char
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyevx_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevx_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -9;
             }
         }
@@ -75,7 +75,7 @@ lapack_int LAPACKE_ssyevx_2stage( int matrix_layout, char jobz, char range, char
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssyevx_2stage_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_ssyevx_2stage_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, &work_query,
                                 lwork, iwork, ifail );
     if( info != 0 ) {
@@ -89,7 +89,7 @@ lapack_int LAPACKE_ssyevx_2stage( int matrix_layout, char jobz, char range, char
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssyevx_2stage_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_ssyevx_2stage_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, work, lwork,
                                 iwork, ifail );
     /* Release memory and exit */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_ssyevx_2stage( int matrix_layout, char jobz, char range, char
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyevx_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevx_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyevx_2stage_work.c b/LAPACKE/src/lapacke_ssyevx_2stage_work.c
index 3b8b08f436..ca64d1bde8 100644
--- a/LAPACKE/src/lapacke_ssyevx_2stage_work.c
+++ b/LAPACKE/src/lapacke_ssyevx_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyevx_2stage_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_ssyevx_2stage_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, float* a,
                                 lapack_int lda, float vl, float vu,
                                 lapack_int il, lapack_int iu, float abstol,
@@ -50,9 +50,9 @@ lapack_int LAPACKE_ssyevx_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
         float* a_t = NULL;
@@ -60,12 +60,12 @@ lapack_int LAPACKE_ssyevx_2stage_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ssyevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevx_2stage_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_ssyevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevx_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -81,7 +81,7 @@ lapack_int LAPACKE_ssyevx_2stage_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -90,7 +90,7 @@ lapack_int LAPACKE_ssyevx_2stage_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssyevx_2stage( &jobz, &range, &uplo, &n, a_t, &lda_t, &vl, &vu, &il,
                        &iu, &abstol, m, w, z_t, &ldz_t, work, &lwork, iwork,
@@ -99,24 +99,24 @@ lapack_int LAPACKE_ssyevx_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssyevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevx_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssyevx_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevx_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyevx_work.c b/LAPACKE/src/lapacke_ssyevx_work.c
index 45beee937a..a491134ae5 100644
--- a/LAPACKE/src/lapacke_ssyevx_work.c
+++ b/LAPACKE/src/lapacke_ssyevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyevx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_ssyevx_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, float* a,
                                 lapack_int lda, float vl, float vu,
                                 lapack_int il, lapack_int iu, float abstol,
@@ -50,10 +50,10 @@ lapack_int LAPACKE_ssyevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( !LAPACKE_lsame( jobz, 'v' ) ) ? 1 :
-                             ( LAPACKE_lsame( range, 'a' ) ||
-                               LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( !API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) ? 1 :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                               API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
         float* a_t = NULL;
@@ -61,12 +61,12 @@ lapack_int LAPACKE_ssyevx_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ssyevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevx_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_ssyevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -82,7 +82,7 @@ lapack_int LAPACKE_ssyevx_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -91,7 +91,7 @@ lapack_int LAPACKE_ssyevx_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssyevx( &jobz, &range, &uplo, &n, a_t, &lda_t, &vl, &vu, &il,
                        &iu, &abstol, m, w, z_t, &ldz_t, work, &lwork, iwork,
@@ -100,24 +100,24 @@ lapack_int LAPACKE_ssyevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssyevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssyevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssygst.c b/LAPACKE/src/lapacke_ssygst.c
index 267ca34b0e..fd1f110d4d 100644
--- a/LAPACKE/src/lapacke_ssygst.c
+++ b/LAPACKE/src/lapacke_ssygst.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssygst( int matrix_layout, lapack_int itype, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssygst)( int matrix_layout, lapack_int itype, char uplo,
                            lapack_int n, float* a, lapack_int lda,
                            const float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssygst", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygst", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_ssygst_work( matrix_layout, itype, uplo, n, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_ssygst_work)( matrix_layout, itype, uplo, n, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_ssygst_work.c b/LAPACKE/src/lapacke_ssygst_work.c
index 356079da46..85a956b015 100644
--- a/LAPACKE/src/lapacke_ssygst_work.c
+++ b/LAPACKE/src/lapacke_ssygst_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssygst_work( int matrix_layout, lapack_int itype, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssygst_work)( int matrix_layout, lapack_int itype, char uplo,
                                 lapack_int n, float* a, lapack_int lda,
                                 const float* b, lapack_int ldb )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_ssygst_work( int matrix_layout, lapack_int itype, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssygst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygst_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ssygst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygst_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,26 +71,26 @@ lapack_int LAPACKE_ssygst_work( int matrix_layout, lapack_int itype, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssygst( &itype, &uplo, &n, a_t, &lda_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssygst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygst_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssygst_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygst_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssygv.c b/LAPACKE/src/lapacke_ssygv.c
index 367c50c943..e3be454a19 100644
--- a/LAPACKE/src/lapacke_ssygv.c
+++ b/LAPACKE/src/lapacke_ssygv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssygv( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_ssygv)( int matrix_layout, lapack_int itype, char jobz,
                           char uplo, lapack_int n, float* a, lapack_int lda,
                           float* b, lapack_int ldb, float* w )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_ssygv( int matrix_layout, lapack_int itype, char jobz,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssygv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssygv_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_ssygv_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                ldb, w, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_ssygv( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssygv_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_ssygv_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                ldb, w, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssygv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssygv_2stage.c b/LAPACKE/src/lapacke_ssygv_2stage.c
index 257aa83b6c..292e65de6d 100644
--- a/LAPACKE/src/lapacke_ssygv_2stage.c
+++ b/LAPACKE/src/lapacke_ssygv_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssygv_2stage( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_ssygv_2stage)( int matrix_layout, lapack_int itype, char jobz,
                           char uplo, lapack_int n, float* a, lapack_int lda,
                           float* b, lapack_int ldb, float* w )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_ssygv_2stage( int matrix_layout, lapack_int itype, char jobz,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssygv_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygv_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssygv_2stage_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_ssygv_2stage_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                ldb, w, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_ssygv_2stage( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssygv_2stage_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_ssygv_2stage_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                ldb, w, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssygv_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygv_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssygv_2stage_work.c b/LAPACKE/src/lapacke_ssygv_2stage_work.c
index d2bd07ac74..e01a68d06d 100644
--- a/LAPACKE/src/lapacke_ssygv_2stage_work.c
+++ b/LAPACKE/src/lapacke_ssygv_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssygv_2stage_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_ssygv_2stage_work)( int matrix_layout, lapack_int itype, char jobz,
                                char uplo, lapack_int n, float* a,
                                lapack_int lda, float* b, lapack_int ldb,
                                float* w, float* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_ssygv_2stage_work( int matrix_layout, lapack_int itype, char
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ssygv_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygv_2stage_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ssygv_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygv_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_ssygv_2stage_work( int matrix_layout, lapack_int itype, char
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssygv_2stage( &itype, &jobz, &uplo, &n, a_t, &lda_t, b_t, &ldb_t, w,
                       work, &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_ssygv_2stage_work( int matrix_layout, lapack_int itype, char
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssygv_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygv_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssygv_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygv_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssygv_work.c b/LAPACKE/src/lapacke_ssygv_work.c
index d5873d5bc5..ecc57e1332 100644
--- a/LAPACKE/src/lapacke_ssygv_work.c
+++ b/LAPACKE/src/lapacke_ssygv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssygv_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_ssygv_work)( int matrix_layout, lapack_int itype, char jobz,
                                char uplo, lapack_int n, float* a,
                                lapack_int lda, float* b, lapack_int ldb,
                                float* w, float* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_ssygv_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ssygv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygv_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ssygv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygv_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_ssygv_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssygv( &itype, &jobz, &uplo, &n, a_t, &lda_t, b_t, &ldb_t, w,
                       work, &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_ssygv_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssygv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssygv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssygvd.c b/LAPACKE/src/lapacke_ssygvd.c
index 4fd120abdc..2ee675ee6b 100644
--- a/LAPACKE/src/lapacke_ssygvd.c
+++ b/LAPACKE/src/lapacke_ssygvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssygvd( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_ssygvd)( int matrix_layout, lapack_int itype, char jobz,
                            char uplo, lapack_int n, float* a, lapack_int lda,
                            float* b, lapack_int ldb, float* w )
 {
@@ -44,22 +44,22 @@ lapack_int LAPACKE_ssygvd( int matrix_layout, lapack_int itype, char jobz,
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssygvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssygvd_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_ssygvd_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                 ldb, w, &work_query, lwork, &iwork_query,
                                 liwork );
     if( info != 0 ) {
@@ -79,7 +79,7 @@ lapack_int LAPACKE_ssygvd( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssygvd_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_ssygvd_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                 ldb, w, work, lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -87,7 +87,7 @@ lapack_int LAPACKE_ssygvd( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssygvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssygvd_work.c b/LAPACKE/src/lapacke_ssygvd_work.c
index 1cd9a3aa41..a76bad8948 100644
--- a/LAPACKE/src/lapacke_ssygvd_work.c
+++ b/LAPACKE/src/lapacke_ssygvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssygvd_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_ssygvd_work)( int matrix_layout, lapack_int itype, char jobz,
                                 char uplo, lapack_int n, float* a,
                                 lapack_int lda, float* b, lapack_int ldb,
                                 float* w, float* work, lapack_int lwork,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_ssygvd_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ssygvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygvd_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ssygvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygvd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -80,8 +80,8 @@ lapack_int LAPACKE_ssygvd_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssygvd( &itype, &jobz, &uplo, &n, a_t, &lda_t, b_t, &ldb_t, w,
                        work, &lwork, iwork, &liwork, &info );
@@ -89,19 +89,19 @@ lapack_int LAPACKE_ssygvd_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssygvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssygvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssygvx.c b/LAPACKE/src/lapacke_ssygvx.c
index 9e8b63355d..c36df28a3b 100644
--- a/LAPACKE/src/lapacke_ssygvx.c
+++ b/LAPACKE/src/lapacke_ssygvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssygvx( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_ssygvx)( int matrix_layout, lapack_int itype, char jobz,
                            char range, char uplo, lapack_int n, float* a,
                            lapack_int lda, float* b, lapack_int ldb, float vl,
                            float vu, lapack_int il, lapack_int iu, float abstol,
@@ -45,28 +45,28 @@ lapack_int LAPACKE_ssygvx( int matrix_layout, lapack_int itype, char jobz,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssygvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_s_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &abstol, 1 ) ) {
             return -15;
         }
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vl, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_s_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &vu, 1 ) ) {
                 return -12;
             }
         }
@@ -79,7 +79,7 @@ lapack_int LAPACKE_ssygvx( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssygvx_work( matrix_layout, itype, jobz, range, uplo, n, a,
+    info = API_SUFFIX(LAPACKE_ssygvx_work)( matrix_layout, itype, jobz, range, uplo, n, a,
                                 lda, b, ldb, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, &work_query, lwork, iwork, ifail );
     if( info != 0 ) {
@@ -93,7 +93,7 @@ lapack_int LAPACKE_ssygvx( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssygvx_work( matrix_layout, itype, jobz, range, uplo, n, a,
+    info = API_SUFFIX(LAPACKE_ssygvx_work)( matrix_layout, itype, jobz, range, uplo, n, a,
                                 lda, b, ldb, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, work, lwork, iwork, ifail );
     /* Release memory and exit */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_ssygvx( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssygvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssygvx_work.c b/LAPACKE/src/lapacke_ssygvx_work.c
index d17dd8da23..9a9a8b3fda 100644
--- a/LAPACKE/src/lapacke_ssygvx_work.c
+++ b/LAPACKE/src/lapacke_ssygvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssygvx_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_ssygvx_work)( int matrix_layout, lapack_int itype, char jobz,
                                 char range, char uplo, lapack_int n, float* a,
                                 lapack_int lda, float* b, lapack_int ldb,
                                 float vl, float vu, lapack_int il,
@@ -51,9 +51,9 @@ lapack_int LAPACKE_ssygvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldb_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
@@ -63,17 +63,17 @@ lapack_int LAPACKE_ssygvx_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ssygvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygvx_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ssygvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygvx_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_ssygvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygvx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -94,7 +94,7 @@ lapack_int LAPACKE_ssygvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (float*)
                 LAPACKE_malloc( sizeof(float) * ldz_t * MAX(1,ncols_z) );
             if( z_t == NULL ) {
@@ -103,8 +103,8 @@ lapack_int LAPACKE_ssygvx_work( int matrix_layout, lapack_int itype, char jobz,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssygvx( &itype, &jobz, &range, &uplo, &n, a_t, &lda_t, b_t,
                        &ldb_t, &vl, &vu, &il, &iu, &abstol, m, w, z_t, &ldz_t,
@@ -113,14 +113,14 @@ lapack_int LAPACKE_ssygvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
@@ -129,11 +129,11 @@ lapack_int LAPACKE_ssygvx_work( int matrix_layout, lapack_int itype, char jobz,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssygvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssygvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssygvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyrfs.c b/LAPACKE/src/lapacke_ssyrfs.c
index 0fab0a7342..972b310fd6 100644
--- a/LAPACKE/src/lapacke_ssyrfs.c
+++ b/LAPACKE/src/lapacke_ssyrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyrfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssyrfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const float* a, lapack_int lda,
                            const float* af, lapack_int ldaf,
                            const lapack_int* ipiv, const float* b,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_ssyrfs( int matrix_layout, char uplo, lapack_int n,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -75,7 +75,7 @@ lapack_int LAPACKE_ssyrfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssyrfs_work( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
+    info = API_SUFFIX(LAPACKE_ssyrfs_work)( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
                                 ipiv, b, ldb, x, ldx, ferr, berr, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -83,7 +83,7 @@ lapack_int LAPACKE_ssyrfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyrfs_work.c b/LAPACKE/src/lapacke_ssyrfs_work.c
index 247b717a61..b77db74fff 100644
--- a/LAPACKE/src/lapacke_ssyrfs_work.c
+++ b/LAPACKE/src/lapacke_ssyrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyrfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssyrfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const float* a, lapack_int lda,
                                 const float* af, lapack_int ldaf,
                                 const lapack_int* ipiv, const float* b,
@@ -60,22 +60,22 @@ lapack_int LAPACKE_ssyrfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyrfs_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ssyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ssyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_ssyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -100,10 +100,10 @@ lapack_int LAPACKE_ssyrfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssyrfs( &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, ipiv, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, iwork, &info );
@@ -111,7 +111,7 @@ lapack_int LAPACKE_ssyrfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -122,11 +122,11 @@ lapack_int LAPACKE_ssyrfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssyrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyrfsx.c b/LAPACKE/src/lapacke_ssyrfsx.c
index 10b855e5ea..9b5f46b638 100644
--- a/LAPACKE/src/lapacke_ssyrfsx.c
+++ b/LAPACKE/src/lapacke_ssyrfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyrfsx( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_ssyrfsx)( int matrix_layout, char uplo, char equed,
                             lapack_int n, lapack_int nrhs, const float* a,
                             lapack_int lda, const float* af, lapack_int ldaf,
                             const lapack_int* ipiv, const float* s,
@@ -46,32 +46,32 @@ lapack_int LAPACKE_ssyrfsx( int matrix_layout, char uplo, char equed,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyrfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyrfsx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -22;
             }
         }
-        if( LAPACKE_lsame( equed, 'y' ) ) {
-            if( LAPACKE_s_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, s, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -14;
         }
     }
@@ -88,7 +88,7 @@ lapack_int LAPACKE_ssyrfsx( int matrix_layout, char uplo, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssyrfsx_work( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_ssyrfsx_work)( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
                                  ldaf, ipiv, s, b, ldb, x, ldx, rcond, berr,
                                  n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, iwork );
@@ -98,7 +98,7 @@ lapack_int LAPACKE_ssyrfsx( int matrix_layout, char uplo, char equed,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyrfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyrfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyrfsx_work.c b/LAPACKE/src/lapacke_ssyrfsx_work.c
index 17dda3f41f..d99c851e29 100644
--- a/LAPACKE/src/lapacke_ssyrfsx_work.c
+++ b/LAPACKE/src/lapacke_ssyrfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyrfsx_work( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_ssyrfsx_work)( int matrix_layout, char uplo, char equed,
                                  lapack_int n, lapack_int nrhs, const float* a,
                                  lapack_int lda, const float* af,
                                  lapack_int ldaf, const lapack_int* ipiv,
@@ -67,22 +67,22 @@ lapack_int LAPACKE_ssyrfsx_work( int matrix_layout, char uplo, char equed,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ssyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyrfsx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ssyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyrfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_ssyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyrfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_ssyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyrfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -119,10 +119,10 @@ lapack_int LAPACKE_ssyrfsx_work( int matrix_layout, char uplo, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssyrfsx( &uplo, &equed, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, s, b_t, &ldb_t, x_t, &ldx_t, rcond, berr,
@@ -132,10 +132,10 @@ lapack_int LAPACKE_ssyrfsx_work( int matrix_layout, char uplo, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -151,11 +151,11 @@ lapack_int LAPACKE_ssyrfsx_work( int matrix_layout, char uplo, char equed,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyrfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssyrfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyrfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssysv.c b/LAPACKE/src/lapacke_ssysv.c
index 44c714e63d..8d01fc8491 100644
--- a/LAPACKE/src/lapacke_ssysv.c
+++ b/LAPACKE/src/lapacke_ssysv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssysv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssysv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, float* a, lapack_int lda,
                           lapack_int* ipiv, float* b, lapack_int ldb )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_ssysv( int matrix_layout, char uplo, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssysv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssysv_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_ssysv_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_ssysv( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssysv_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_ssysv_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssysv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssysv_aa.c b/LAPACKE/src/lapacke_ssysv_aa.c
index ab03c3bc6f..f2ac2a9653 100644
--- a/LAPACKE/src/lapacke_ssysv_aa.c
+++ b/LAPACKE/src/lapacke_ssysv_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssysv_aa( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssysv_aa)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, float* a, lapack_int lda,
                           lapack_int* ipiv, float* b, lapack_int ldb )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_ssysv_aa( int matrix_layout, char uplo, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssysv_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssysv_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_ssysv_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_ssysv_aa( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssysv_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_ssysv_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssysv_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssysv_aa_2stage.c b/LAPACKE/src/lapacke_ssysv_aa_2stage.c
index 3f9d8963bd..937786bb9e 100644
--- a/LAPACKE/src/lapacke_ssysv_aa_2stage.c
+++ b/LAPACKE/src/lapacke_ssysv_aa_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssysv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssysv_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, float* a, lapack_int lda,
                           float* tb, lapack_int ltb, lapack_int* ipiv, 
                           lapack_int* ipiv2, float* b, lapack_int ldb )
@@ -42,25 +42,25 @@ lapack_int LAPACKE_ssysv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssysv_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssysv_aa_2stage_work( matrix_layout, uplo, n, nrhs, 
+    info = API_SUFFIX(LAPACKE_ssysv_aa_2stage_work)( matrix_layout, uplo, n, nrhs, 
     						   a, lda, tb, ltb, ipiv, ipiv2, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
@@ -75,14 +75,14 @@ lapack_int LAPACKE_ssysv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssysv_aa_2stage_work( matrix_layout, uplo, n, nrhs,
+    info = API_SUFFIX(LAPACKE_ssysv_aa_2stage_work)( matrix_layout, uplo, n, nrhs,
                                a, lda, tb, ltb, ipiv, ipiv2, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssysv_aa_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_aa_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssysv_aa_2stage_work.c b/LAPACKE/src/lapacke_ssysv_aa_2stage_work.c
index 661bc80e54..a34247eaef 100644
--- a/LAPACKE/src/lapacke_ssysv_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_ssysv_aa_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssysv_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssysv_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, float* a, lapack_int lda,
                                float* tb, lapack_int ltb, lapack_int* ipiv, 
                                lapack_int* ipiv2, float* b, lapack_int ldb,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_ssysv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssysv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ssysv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_aa_2stage_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_ssysv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_aa_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -93,8 +93,8 @@ lapack_int LAPACKE_ssysv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssysv_aa_2stage( &uplo, &n, &nrhs, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, b_t, &ldb_t, work,
@@ -103,8 +103,8 @@ lapack_int LAPACKE_ssysv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_2:
@@ -113,11 +113,11 @@ lapack_int LAPACKE_ssysv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssysv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssysv_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssysv_aa_work.c b/LAPACKE/src/lapacke_ssysv_aa_work.c
index 63aba3a6eb..a6da2e1ce0 100644
--- a/LAPACKE/src/lapacke_ssysv_aa_work.c
+++ b/LAPACKE/src/lapacke_ssysv_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssysv_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssysv_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, float* a, lapack_int lda,
                                lapack_int* ipiv, float* b, lapack_int ldb,
                                float* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_ssysv_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssysv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_aa_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ssysv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_aa_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_ssysv_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssysv_aa( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_ssysv_aa_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssysv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssysv_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssysv_rk.c b/LAPACKE/src/lapacke_ssysv_rk.c
index 2e8669c4ae..5c0b1f86ef 100644
--- a/LAPACKE/src/lapacke_ssysv_rk.c
+++ b/LAPACKE/src/lapacke_ssysv_rk.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssysv_rk( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssysv_rk)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, float* a, lapack_int lda,
                           float* e, lapack_int* ipiv, float* b, lapack_int ldb )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_ssysv_rk( int matrix_layout, char uplo, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssysv_rk", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_rk", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssysv_rk_work( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
+    info = API_SUFFIX(LAPACKE_ssysv_rk_work)( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_ssysv_rk( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssysv_rk_work( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
+    info = API_SUFFIX(LAPACKE_ssysv_rk_work)( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssysv_rk", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_rk", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssysv_rk_work.c b/LAPACKE/src/lapacke_ssysv_rk_work.c
index a38699a40a..25fb739358 100644
--- a/LAPACKE/src/lapacke_ssysv_rk_work.c
+++ b/LAPACKE/src/lapacke_ssysv_rk_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssysv_rk_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssysv_rk_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, float* a, lapack_int lda,
                                float* e, lapack_int* ipiv, float* b, lapack_int ldb,
                                float* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_ssysv_rk_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssysv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_rk_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ssysv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_rk_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_ssysv_rk_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssysv_rk( &uplo, &n, &nrhs, a_t, &lda_t, e, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_ssysv_rk_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssysv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_rk_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssysv_rk_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_rk_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssysv_rook.c b/LAPACKE/src/lapacke_ssysv_rook.c
index 361643d17e..e2f6b4787d 100644
--- a/LAPACKE/src/lapacke_ssysv_rook.c
+++ b/LAPACKE/src/lapacke_ssysv_rook.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssysv_rook( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssysv_rook)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, float* a, lapack_int lda,
                                lapack_int* ipiv, float* b, lapack_int ldb )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_ssysv_rook( int matrix_layout, char uplo, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssysv_rook", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_rook", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssysv_rook_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_ssysv_rook_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv,
                                     b, ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,13 +69,13 @@ lapack_int LAPACKE_ssysv_rook( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssysv_rook_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_ssysv_rook_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv,
                                     b, ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssysv_rook", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_rook", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssysv_rook_work.c b/LAPACKE/src/lapacke_ssysv_rook_work.c
index c4b3984799..bd6bf5692d 100644
--- a/LAPACKE/src/lapacke_ssysv_rook_work.c
+++ b/LAPACKE/src/lapacke_ssysv_rook_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssysv_rook_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssysv_rook_work)( int matrix_layout, char uplo, lapack_int n,
                                     lapack_int nrhs, float* a, lapack_int lda,
                                     lapack_int* ipiv, float* b, lapack_int ldb,
                                     float* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_ssysv_rook_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssysv_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_rook_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ssysv_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_rook_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_ssysv_rook_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssysv_rook( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                            work, &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_ssysv_rook_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssysv_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_rook_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssysv_rook_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_rook_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssysv_work.c b/LAPACKE/src/lapacke_ssysv_work.c
index 28e164f5bc..2b8f3c46f4 100644
--- a/LAPACKE/src/lapacke_ssysv_work.c
+++ b/LAPACKE/src/lapacke_ssysv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssysv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssysv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, float* a, lapack_int lda,
                                lapack_int* ipiv, float* b, lapack_int ldb,
                                float* work, lapack_int lwork )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_ssysv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssysv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ssysv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,8 +79,8 @@ lapack_int LAPACKE_ssysv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssysv( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -88,19 +88,19 @@ lapack_int LAPACKE_ssysv_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssysv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssysv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssysvx.c b/LAPACKE/src/lapacke_ssysvx.c
index 3ffc65b367..e7b95d9313 100644
--- a/LAPACKE/src/lapacke_ssysvx.c
+++ b/LAPACKE/src/lapacke_ssysvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssysvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssysvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, const float* a, lapack_int lda,
                            float* af, lapack_int ldaf, lapack_int* ipiv,
                            const float* b, lapack_int ldb, float* x,
@@ -45,21 +45,21 @@ lapack_int LAPACKE_ssysvx( int matrix_layout, char fact, char uplo, lapack_int n
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssysvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
@@ -71,7 +71,7 @@ lapack_int LAPACKE_ssysvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssysvx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_ssysvx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                 ldaf, ipiv, b, ldb, x, ldx, rcond, ferr, berr,
                                 &work_query, lwork, iwork );
     if( info != 0 ) {
@@ -85,7 +85,7 @@ lapack_int LAPACKE_ssysvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssysvx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_ssysvx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                 ldaf, ipiv, b, ldb, x, ldx, rcond, ferr, berr,
                                 work, lwork, iwork );
     /* Release memory and exit */
@@ -94,7 +94,7 @@ lapack_int LAPACKE_ssysvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssysvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssysvx_work.c b/LAPACKE/src/lapacke_ssysvx_work.c
index b35ce341ff..1ccd58899e 100644
--- a/LAPACKE/src/lapacke_ssysvx_work.c
+++ b/LAPACKE/src/lapacke_ssysvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssysvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssysvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs, const float* a,
                                 lapack_int lda, float* af, lapack_int ldaf,
                                 lapack_int* ipiv, const float* b,
@@ -62,22 +62,22 @@ lapack_int LAPACKE_ssysvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ssysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysvx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ssysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_ssysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_ssysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysvx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -109,11 +109,11 @@ lapack_int LAPACKE_ssysvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_ssy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssysvx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                        ipiv, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr, berr, work,
@@ -122,11 +122,11 @@ lapack_int LAPACKE_ssysvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -137,11 +137,11 @@ lapack_int LAPACKE_ssysvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssysvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssysvxx.c b/LAPACKE/src/lapacke_ssysvxx.c
index 3553e6073d..e85f8b1328 100644
--- a/LAPACKE/src/lapacke_ssysvxx.c
+++ b/LAPACKE/src/lapacke_ssysvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssysvxx( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssysvxx)( int matrix_layout, char fact, char uplo,
                             lapack_int n, lapack_int nrhs, float* a,
                             lapack_int lda, float* af, lapack_int ldaf,
                             lapack_int* ipiv, char* equed, float* s, float* b,
@@ -46,30 +46,30 @@ lapack_int LAPACKE_ssysvxx( int matrix_layout, char fact, char uplo,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssysvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysvxx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
         if( nparams>0 ) {
-            if( LAPACKE_s_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( nparams, params, 1 ) ) {
                 return -24;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_s_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_s_nancheck)( n, s, 1 ) ) {
                 return -12;
             }
         }
@@ -87,7 +87,7 @@ lapack_int LAPACKE_ssysvxx( int matrix_layout, char fact, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssysvxx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_ssysvxx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                  ldaf, ipiv, equed, s, b, ldb, x, ldx, rcond,
                                  rpvgrw, berr, n_err_bnds, err_bnds_norm,
                                  err_bnds_comp, nparams, params, work, iwork );
@@ -97,7 +97,7 @@ lapack_int LAPACKE_ssysvxx( int matrix_layout, char fact, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssysvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssysvxx_work.c b/LAPACKE/src/lapacke_ssysvxx_work.c
index 94a032d59a..1baefe958d 100644
--- a/LAPACKE/src/lapacke_ssysvxx_work.c
+++ b/LAPACKE/src/lapacke_ssysvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssysvxx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ssysvxx_work)( int matrix_layout, char fact, char uplo,
                                  lapack_int n, lapack_int nrhs, float* a,
                                  lapack_int lda, float* af, lapack_int ldaf,
                                  lapack_int* ipiv, char* equed, float* s,
@@ -67,22 +67,22 @@ lapack_int LAPACKE_ssysvxx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ssysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysvxx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ssysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_ssysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_ssysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -119,11 +119,11 @@ lapack_int LAPACKE_ssysvxx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_ssy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssysvxx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond, rpvgrw,
@@ -133,20 +133,20 @@ lapack_int LAPACKE_ssysvxx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -162,11 +162,11 @@ lapack_int LAPACKE_ssysvxx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssysvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssysvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssyswapr.c b/LAPACKE/src/lapacke_ssyswapr.c
index 151f10ffb2..e9be1c5d55 100644
--- a/LAPACKE/src/lapacke_ssyswapr.c
+++ b/LAPACKE/src/lapacke_ssyswapr.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyswapr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssyswapr)( int matrix_layout, char uplo, lapack_int n,
                              float* a, lapack_int lda, lapack_int i1, lapack_int i2 )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssyswapr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyswapr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_ssyswapr_work( matrix_layout, uplo, n, a, lda, i1, i2 );
+    return API_SUFFIX(LAPACKE_ssyswapr_work)( matrix_layout, uplo, n, a, lda, i1, i2 );
 }
diff --git a/LAPACKE/src/lapacke_ssyswapr_work.c b/LAPACKE/src/lapacke_ssyswapr_work.c
index d12ca5fc15..f62950a79b 100644
--- a/LAPACKE/src/lapacke_ssyswapr_work.c
+++ b/LAPACKE/src/lapacke_ssyswapr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssyswapr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssyswapr_work)( int matrix_layout, char uplo, lapack_int n,
                                   float* a, lapack_int lda,
                                   lapack_int i1, lapack_int i2 )
 {
@@ -53,21 +53,21 @@ lapack_int LAPACKE_ssyswapr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssyswapr( &uplo, &n, a_t, &lda_t, &i1, &i2 );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssyswapr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyswapr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssyswapr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssyswapr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrd.c b/LAPACKE/src/lapacke_ssytrd.c
index fa14112b74..5be16d6087 100644
--- a/LAPACKE/src/lapacke_ssytrd.c
+++ b/LAPACKE/src/lapacke_ssytrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrd( int matrix_layout, char uplo, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_ssytrd)( int matrix_layout, char uplo, lapack_int n, float* a,
                            lapack_int lda, float* d, float* e, float* tau )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_ssytrd( int matrix_layout, char uplo, lapack_int n, float* a,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssytrd_work( matrix_layout, uplo, n, a, lda, d, e, tau,
+    info = API_SUFFIX(LAPACKE_ssytrd_work)( matrix_layout, uplo, n, a, lda, d, e, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,13 +65,13 @@ lapack_int LAPACKE_ssytrd( int matrix_layout, char uplo, lapack_int n, float* a,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssytrd_work( matrix_layout, uplo, n, a, lda, d, e, tau, work,
+    info = API_SUFFIX(LAPACKE_ssytrd_work)( matrix_layout, uplo, n, a, lda, d, e, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrd_work.c b/LAPACKE/src/lapacke_ssytrd_work.c
index 19bfb2a684..ad33e8c9ff 100644
--- a/LAPACKE/src/lapacke_ssytrd_work.c
+++ b/LAPACKE/src/lapacke_ssytrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrd_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytrd_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* a, lapack_int lda, float* d, float* e,
                                 float* tau, float* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_ssytrd_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ssytrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_ssytrd_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssytrd( &uplo, &n, a_t, &lda_t, d, e, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssytrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssytrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrf.c b/LAPACKE/src/lapacke_ssytrf.c
index d5664ae127..d8671e7009 100644
--- a/LAPACKE/src/lapacke_ssytrf.c
+++ b/LAPACKE/src/lapacke_ssytrf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrf( int matrix_layout, char uplo, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_ssytrf)( int matrix_layout, char uplo, lapack_int n, float* a,
                            lapack_int lda, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_ssytrf( int matrix_layout, char uplo, lapack_int n, float* a,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssytrf_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_ssytrf_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,13 +65,13 @@ lapack_int LAPACKE_ssytrf( int matrix_layout, char uplo, lapack_int n, float* a,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssytrf_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_ssytrf_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrf_aa.c b/LAPACKE/src/lapacke_ssytrf_aa.c
index 3f5cf78dbf..3a23a65e1e 100644
--- a/LAPACKE/src/lapacke_ssytrf_aa.c
+++ b/LAPACKE/src/lapacke_ssytrf_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrf_aa( int matrix_layout, char uplo, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_ssytrf_aa)( int matrix_layout, char uplo, lapack_int n, float* a,
                            lapack_int lda, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_ssytrf_aa( int matrix_layout, char uplo, lapack_int n, float*
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrf_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssytrf_aa_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_ssytrf_aa_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,13 +65,13 @@ lapack_int LAPACKE_ssytrf_aa( int matrix_layout, char uplo, lapack_int n, float*
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssytrf_aa_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_ssytrf_aa_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrf_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrf_aa_2stage.c b/LAPACKE/src/lapacke_ssytrf_aa_2stage.c
index 8d3fba851e..a7e2b5dcfb 100644
--- a/LAPACKE/src/lapacke_ssytrf_aa_2stage.c
+++ b/LAPACKE/src/lapacke_ssytrf_aa_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytrf_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
                             float* a, lapack_int lda,
                             float* tb, lapack_int ltb, 
                             lapack_int* ipiv, lapack_int* ipiv2 )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_ssytrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrf_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-       if( LAPACKE_sge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+       if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssytrf_aa_2stage_work( matrix_layout, uplo, n, 
+    info = API_SUFFIX(LAPACKE_ssytrf_aa_2stage_work)( matrix_layout, uplo, n, 
                                  a, lda, tb, ltb, ipiv, ipiv2,
                                  &work_query, lwork );
     if( info != 0 ) {
@@ -72,14 +72,14 @@ lapack_int LAPACKE_ssytrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssytrf_aa_2stage_work( matrix_layout, uplo, n,
+    info = API_SUFFIX(LAPACKE_ssytrf_aa_2stage_work)( matrix_layout, uplo, n,
                                  a, lda, tb, ltb, ipiv, ipiv2,
                                  work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrf_aa_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_aa_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrf_aa_2stage_work.c b/LAPACKE/src/lapacke_ssytrf_aa_2stage_work.c
index ba697fab50..f78b8d7da3 100644
--- a/LAPACKE/src/lapacke_ssytrf_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_ssytrf_aa_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrf_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytrf_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
                                float* a, lapack_int lda,
                                float* tb, lapack_int ltb, 
                                lapack_int* ipiv, lapack_int* ipiv2, 
@@ -54,12 +54,12 @@ lapack_int LAPACKE_ssytrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssytrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ssytrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_aa_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -81,7 +81,7 @@ lapack_int LAPACKE_ssytrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssytrf_aa_2stage( &uplo, &n, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, work,
@@ -90,18 +90,18 @@ lapack_int LAPACKE_ssytrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( tb_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssytrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssytrf_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrf_aa_work.c b/LAPACKE/src/lapacke_ssytrf_aa_work.c
index 5931efb01b..beea261f03 100644
--- a/LAPACKE/src/lapacke_ssytrf_aa_work.c
+++ b/LAPACKE/src/lapacke_ssytrf_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrf_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytrf_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* a, lapack_int lda, lapack_int* ipiv,
                                 float* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_ssytrf_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ssytrf_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_aa_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_ssytrf_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssytrf_aa( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssytrf_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssytrf_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrf_rk.c b/LAPACKE/src/lapacke_ssytrf_rk.c
index 060c680120..40c36ef6c9 100644
--- a/LAPACKE/src/lapacke_ssytrf_rk.c
+++ b/LAPACKE/src/lapacke_ssytrf_rk.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrf_rk( int matrix_layout, char uplo, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_ssytrf_rk)( int matrix_layout, char uplo, lapack_int n, float* a,
                            lapack_int lda, float* e, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_ssytrf_rk( int matrix_layout, char uplo, lapack_int n, float*
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrf_rk", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_rk", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssytrf_rk_work( matrix_layout, uplo, n, a, lda, e, ipiv,
+    info = API_SUFFIX(LAPACKE_ssytrf_rk_work)( matrix_layout, uplo, n, a, lda, e, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,13 +65,13 @@ lapack_int LAPACKE_ssytrf_rk( int matrix_layout, char uplo, lapack_int n, float*
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssytrf_rk_work( matrix_layout, uplo, n, a, lda, e, ipiv, work,
+    info = API_SUFFIX(LAPACKE_ssytrf_rk_work)( matrix_layout, uplo, n, a, lda, e, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrf_rk", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_rk", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrf_rk_work.c b/LAPACKE/src/lapacke_ssytrf_rk_work.c
index 07531d6ba4..a5b9b07be1 100644
--- a/LAPACKE/src/lapacke_ssytrf_rk_work.c
+++ b/LAPACKE/src/lapacke_ssytrf_rk_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrf_rk_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytrf_rk_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* a, lapack_int lda, float* e, lapack_int* ipiv,
                                 float* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_ssytrf_rk_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ssytrf_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_rk_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_ssytrf_rk_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssytrf_rk( &uplo, &n, a_t, &lda_t, e, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssytrf_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_rk_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssytrf_rk_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_rk_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrf_rook.c b/LAPACKE/src/lapacke_ssytrf_rook.c
index 67ef606846..c1ea5bbf68 100644
--- a/LAPACKE/src/lapacke_ssytrf_rook.c
+++ b/LAPACKE/src/lapacke_ssytrf_rook.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrf_rook( int matrix_layout, char uplo, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_ssytrf_rook)( int matrix_layout, char uplo, lapack_int n, float* a,
                            lapack_int lda, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_ssytrf_rook( int matrix_layout, char uplo, lapack_int n, floa
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrf_rook", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_rook", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssytrf_rook_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_ssytrf_rook_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,13 +65,13 @@ lapack_int LAPACKE_ssytrf_rook( int matrix_layout, char uplo, lapack_int n, floa
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssytrf_rook_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_ssytrf_rook_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrf_rook", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_rook", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrf_rook_work.c b/LAPACKE/src/lapacke_ssytrf_rook_work.c
index aaa0c6057c..629f89ae2c 100644
--- a/LAPACKE/src/lapacke_ssytrf_rook_work.c
+++ b/LAPACKE/src/lapacke_ssytrf_rook_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrf_rook_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytrf_rook_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* a, lapack_int lda, lapack_int* ipiv,
                                 float* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_ssytrf_rook_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ssytrf_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_rook_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_ssytrf_rook_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssytrf_rook( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssytrf_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_rook_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssytrf_rook_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_rook_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrf_work.c b/LAPACKE/src/lapacke_ssytrf_work.c
index 0b78eaab3e..f2355ca154 100644
--- a/LAPACKE/src/lapacke_ssytrf_work.c
+++ b/LAPACKE/src/lapacke_ssytrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* a, lapack_int lda, lapack_int* ipiv,
                                 float* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_ssytrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ssytrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_ssytrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssytrf( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssytrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssytrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytri.c b/LAPACKE/src/lapacke_ssytri.c
index ac8ad22528..722dfbb63c 100644
--- a/LAPACKE/src/lapacke_ssytri.c
+++ b/LAPACKE/src/lapacke_ssytri.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytri( int matrix_layout, char uplo, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_ssytri)( int matrix_layout, char uplo, lapack_int n, float* a,
                            lapack_int lda, const lapack_int* ipiv )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -56,12 +56,12 @@ lapack_int LAPACKE_ssytri( int matrix_layout, char uplo, lapack_int n, float* a,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssytri_work( matrix_layout, uplo, n, a, lda, ipiv, work );
+    info = API_SUFFIX(LAPACKE_ssytri_work)( matrix_layout, uplo, n, a, lda, ipiv, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytri", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytri2.c b/LAPACKE/src/lapacke_ssytri2.c
index de321708c6..33ab53e759 100644
--- a/LAPACKE/src/lapacke_ssytri2.c
+++ b/LAPACKE/src/lapacke_ssytri2.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytri2( int matrix_layout, char uplo, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_ssytri2)( int matrix_layout, char uplo, lapack_int n, float* a,
                             lapack_int lda, const lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_ssytri2( int matrix_layout, char uplo, lapack_int n, float* a
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytri2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssytri2_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_ssytri2_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                  &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -66,13 +66,13 @@ lapack_int LAPACKE_ssytri2( int matrix_layout, char uplo, lapack_int n, float* a
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssytri2_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_ssytri2_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                  lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytri2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytri2_work.c b/LAPACKE/src/lapacke_ssytri2_work.c
index 0f9f73d52a..888460ae6b 100644
--- a/LAPACKE/src/lapacke_ssytri2_work.c
+++ b/LAPACKE/src/lapacke_ssytri2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytri2_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytri2_work)( int matrix_layout, char uplo, lapack_int n,
                                  float* a, lapack_int lda,
                                  const lapack_int* ipiv,
                                  float* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_ssytri2_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ssytri2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri2_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_ssytri2_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssytri2( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssytri2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssytri2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytri2x.c b/LAPACKE/src/lapacke_ssytri2x.c
index 4702880f90..dc3c4955f1 100644
--- a/LAPACKE/src/lapacke_ssytri2x.c
+++ b/LAPACKE/src/lapacke_ssytri2x.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytri2x( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytri2x)( int matrix_layout, char uplo, lapack_int n,
                              float* a, lapack_int lda, const lapack_int* ipiv,
                              lapack_int nb )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytri2x", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri2x", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -57,13 +57,13 @@ lapack_int LAPACKE_ssytri2x( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssytri2x_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_ssytri2x_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                   nb );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytri2x", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri2x", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytri2x_work.c b/LAPACKE/src/lapacke_ssytri2x_work.c
index 33174aaa00..a61ee4e6ae 100644
--- a/LAPACKE/src/lapacke_ssytri2x_work.c
+++ b/LAPACKE/src/lapacke_ssytri2x_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytri2x_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytri2x_work)( int matrix_layout, char uplo, lapack_int n,
                                   float* a, lapack_int lda,
                                   const lapack_int* ipiv, float* work,
                                   lapack_int nb )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_ssytri2x_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ssytri2x_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri2x_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,23 +60,23 @@ lapack_int LAPACKE_ssytri2x_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssytri2x( &uplo, &n, a_t, &lda_t, ipiv, work, &nb, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssytri2x_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri2x_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssytri2x_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri2x_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytri_3.c b/LAPACKE/src/lapacke_ssytri_3.c
index 79dd0157d1..c2a706f267 100644
--- a/LAPACKE/src/lapacke_ssytri_3.c
+++ b/LAPACKE/src/lapacke_ssytri_3.c
@@ -32,31 +32,31 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytri_3( int matrix_layout, char uplo, lapack_int n, float* a,
+lapack_int API_SUFFIX(LAPACKE_ssytri_3)( int matrix_layout, char uplo, lapack_int n, float* a,
                            lapack_int lda, const float* e, const lapack_int* ipiv )
 {
     lapack_int info = 0;
     lapack_int lwork = -1;
     float* work = NULL;
     float work_query;
-    lapack_int e_start = LAPACKE_lsame( uplo, 'U' ) ? 1 : 0;
+    lapack_int e_start = API_SUFFIX(LAPACKE_lsame)( uplo, 'U' ) ? 1 : 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytri_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_s_nancheck( n-1, e + e_start, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n-1, e + e_start, 1 ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssytri_3_work( matrix_layout, uplo, n, a, lda, e, ipiv,
+    info = API_SUFFIX(LAPACKE_ssytri_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,12 +69,12 @@ lapack_int LAPACKE_ssytri_3( int matrix_layout, char uplo, lapack_int n, float*
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssytri_3_work( matrix_layout, uplo, n, a, lda, e, ipiv, work, lwork);
+    info = API_SUFFIX(LAPACKE_ssytri_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv, work, lwork);
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytri_3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri_3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytri_3_work.c b/LAPACKE/src/lapacke_ssytri_3_work.c
index c60c613e3f..ff13d5ca32 100644
--- a/LAPACKE/src/lapacke_ssytri_3_work.c
+++ b/LAPACKE/src/lapacke_ssytri_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytri_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytri_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* a, lapack_int lda, const float* e,
                                 const lapack_int* ipiv, float* work, lapack_int lwork)
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_ssytri_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ssytri_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri_3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_ssytri_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssytri_3( &uplo, &n, a_t, &lda_t, e, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssytri_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssytri_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytri_work.c b/LAPACKE/src/lapacke_ssytri_work.c
index 5cee20b5ed..30ca61499b 100644
--- a/LAPACKE/src/lapacke_ssytri_work.c
+++ b/LAPACKE/src/lapacke_ssytri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytri_work)( int matrix_layout, char uplo, lapack_int n,
                                 float* a, lapack_int lda,
                                 const lapack_int* ipiv, float* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_ssytri_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ssytri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_ssytri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssytri( &uplo, &n, a_t, &lda_t, ipiv, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_ssy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssytri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssytri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrs.c b/LAPACKE/src/lapacke_ssytrs.c
index 8b84eccf41..a3016be032 100644
--- a/LAPACKE/src/lapacke_ssytrs.c
+++ b/LAPACKE/src/lapacke_ssytrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const float* a, lapack_int lda,
                            const lapack_int* ipiv, float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_ssytrs_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    return API_SUFFIX(LAPACKE_ssytrs_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_ssytrs2.c b/LAPACKE/src/lapacke_ssytrs2.c
index 97325966d2..421f980915 100644
--- a/LAPACKE/src/lapacke_ssytrs2.c
+++ b/LAPACKE/src/lapacke_ssytrs2.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrs2( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytrs2)( int matrix_layout, char uplo, lapack_int n,
                             lapack_int nrhs, const float* a, lapack_int lda,
                             const lapack_int* ipiv, float* b, lapack_int ldb )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrs2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
@@ -60,13 +60,13 @@ lapack_int LAPACKE_ssytrs2( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssytrs2_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_ssytrs2_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrs2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrs2_work.c b/LAPACKE/src/lapacke_ssytrs2_work.c
index e8b50cf26d..1b3415676b 100644
--- a/LAPACKE/src/lapacke_ssytrs2_work.c
+++ b/LAPACKE/src/lapacke_ssytrs2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrs2_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytrs2_work)( int matrix_layout, char uplo, lapack_int n,
                                  lapack_int nrhs, const float* a,
                                  lapack_int lda, const lapack_int* ipiv,
                                  float* b, lapack_int ldb, float* work )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_ssytrs2_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssytrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs2_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ssytrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,8 +72,8 @@ lapack_int LAPACKE_ssytrs2_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssytrs2( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                         &info );
@@ -81,18 +81,18 @@ lapack_int LAPACKE_ssytrs2_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssytrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssytrs2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrs_3.c b/LAPACKE/src/lapacke_ssytrs_3.c
index d0fd17a3cb..c84c1b0d4e 100644
--- a/LAPACKE/src/lapacke_ssytrs_3.c
+++ b/LAPACKE/src/lapacke_ssytrs_3.c
@@ -32,29 +32,29 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrs_3( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytrs_3)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const float* a, lapack_int lda,
                            const float* e,
                            const lapack_int* ipiv, float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrs_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_s_nancheck( n, e ,1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( n, e ,1 ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_ssytrs_3_work( matrix_layout, uplo, n, nrhs, a, lda,
+    return API_SUFFIX(LAPACKE_ssytrs_3_work)( matrix_layout, uplo, n, nrhs, a, lda,
                                   e, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_ssytrs_3_work.c b/LAPACKE/src/lapacke_ssytrs_3_work.c
index ad5dac9e6a..22534debc6 100644
--- a/LAPACKE/src/lapacke_ssytrs_3_work.c
+++ b/LAPACKE/src/lapacke_ssytrs_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrs_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytrs_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const float* a, lapack_int lda,
                                 const float* e, const lapack_int* ipiv, float* b,
                                 lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_ssytrs_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssytrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_3_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ssytrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_3_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,8 +72,8 @@ lapack_int LAPACKE_ssytrs_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssytrs_3( &uplo, &n, &nrhs, a_t, &lda_t, e, ipiv, b_t, &ldb_t,
                        &info );
@@ -81,18 +81,18 @@ lapack_int LAPACKE_ssytrs_3_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssytrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssytrs_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrs_aa.c b/LAPACKE/src/lapacke_ssytrs_aa.c
index 665e9ed988..d0c94ebbf8 100644
--- a/LAPACKE/src/lapacke_ssytrs_aa.c
+++ b/LAPACKE/src/lapacke_ssytrs_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrs_aa( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytrs_aa)( int matrix_layout, char uplo, lapack_int n,
                             lapack_int nrhs, const float* a, lapack_int lda,
                             const lapack_int* ipiv, float* b, lapack_int ldb )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_ssytrs_aa( int matrix_layout, char uplo, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrs_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ssytrs_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_ssytrs_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_ssytrs_aa( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ssytrs_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_ssytrs_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrs_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrs_aa_2stage.c b/LAPACKE/src/lapacke_ssytrs_aa_2stage.c
index d03def93ea..4238749018 100644
--- a/LAPACKE/src/lapacke_ssytrs_aa_2stage.c
+++ b/LAPACKE/src/lapacke_ssytrs_aa_2stage.c
@@ -32,33 +32,33 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrs_aa_2stage( int matrix_layout, char uplo, lapack_int n,
-                            lapack_int nrhs, float* a, lapack_int lda,
+lapack_int API_SUFFIX(LAPACKE_ssytrs_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
+                            lapack_int nrhs, const float* a, lapack_int lda,
                             float* tb, lapack_int ltb, 
-                            lapack_int* ipiv, lapack_int* ipiv2, 
+                            const lapack_int* ipiv, const lapack_int* ipiv2, 
                             float* b, lapack_int ldb )
 {
     lapack_int info = 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrs_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-       if( LAPACKE_sge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+       if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
 #endif
     /* Call middle-level interface */
-    info = LAPACKE_ssytrs_aa_2stage_work( matrix_layout, uplo, n, nrhs,
+    info = API_SUFFIX(LAPACKE_ssytrs_aa_2stage_work)( matrix_layout, uplo, n, nrhs,
                                  a, lda, tb, ltb, ipiv, ipiv2, b,
                                  ldb );
     return info;
diff --git a/LAPACKE/src/lapacke_ssytrs_aa_2stage_work.c b/LAPACKE/src/lapacke_ssytrs_aa_2stage_work.c
index a2644029c3..80f893b32c 100644
--- a/LAPACKE/src/lapacke_ssytrs_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_ssytrs_aa_2stage_work.c
@@ -32,10 +32,10 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
-                               lapack_int nrhs, float* a, lapack_int lda,
-                               float* tb, lapack_int ltb, lapack_int* ipiv, 
-                               lapack_int* ipiv2, float* b, lapack_int ldb )
+lapack_int API_SUFFIX(LAPACKE_ssytrs_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
+                               lapack_int nrhs, const float* a, lapack_int lda,
+                               float* tb, lapack_int ltb, const lapack_int* ipiv, 
+                               const lapack_int* ipiv2, float* b, lapack_int ldb )
 {
     lapack_int info = 0;
     if( matrix_layout == LAPACK_COL_MAJOR ) {
@@ -54,17 +54,17 @@ lapack_int LAPACKE_ssytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssytrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ssytrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_aa_2stage_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_ssytrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_aa_2stage_work", info );
             return info;
         }
          /* Allocate memory for temporary array(s) */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_ssytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssytrs_aa_2stage( &uplo, &n, &nrhs, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, b_t, &ldb_t, &info );
@@ -93,8 +93,7 @@ lapack_int LAPACKE_ssytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_2:
@@ -103,11 +102,11 @@ lapack_int LAPACKE_ssytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssytrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssytrs_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrs_aa_work.c b/LAPACKE/src/lapacke_ssytrs_aa_work.c
index 7bfd6086aa..35b263d231 100644
--- a/LAPACKE/src/lapacke_ssytrs_aa_work.c
+++ b/LAPACKE/src/lapacke_ssytrs_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrs_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytrs_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                  lapack_int nrhs, const float* a,
                                  lapack_int lda, const lapack_int* ipiv,
                                  float* b, lapack_int ldb, float* work, lapack_int lwork )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_ssytrs_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssytrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_aa_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ssytrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_aa_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,8 +72,8 @@ lapack_int LAPACKE_ssytrs_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssytrs_aa( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                         &lwork, &info );
@@ -81,18 +81,18 @@ lapack_int LAPACKE_ssytrs_aa_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssytrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssytrs_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrs_rook.c b/LAPACKE/src/lapacke_ssytrs_rook.c
index bba3d2352e..812093dac8 100644
--- a/LAPACKE/src/lapacke_ssytrs_rook.c
+++ b/LAPACKE/src/lapacke_ssytrs_rook.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrs_rook( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytrs_rook)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const float* a, lapack_int lda,
                            const lapack_int* ipiv, float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ssytrs_rook", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_rook", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ssy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_ssytrs_rook_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    return API_SUFFIX(LAPACKE_ssytrs_rook_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_ssytrs_rook_work.c b/LAPACKE/src/lapacke_ssytrs_rook_work.c
index 93d03e819c..ad0835553f 100644
--- a/LAPACKE/src/lapacke_ssytrs_rook_work.c
+++ b/LAPACKE/src/lapacke_ssytrs_rook_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrs_rook_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytrs_rook_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const float* a, lapack_int lda,
                                 const lapack_int* ipiv, float* b,
                                 lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_ssytrs_rook_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssytrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_rook_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ssytrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_rook_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,8 +72,8 @@ lapack_int LAPACKE_ssytrs_rook_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssytrs_rook( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                        &info );
@@ -81,18 +81,18 @@ lapack_int LAPACKE_ssytrs_rook_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssytrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_rook_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssytrs_rook_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_rook_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ssytrs_work.c b/LAPACKE/src/lapacke_ssytrs_work.c
index f98aa4ae6d..403a6f83b9 100644
--- a/LAPACKE/src/lapacke_ssytrs_work.c
+++ b/LAPACKE/src/lapacke_ssytrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ssytrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ssytrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const float* a, lapack_int lda,
                                 const lapack_int* ipiv, float* b,
                                 lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_ssytrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ssytrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ssytrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,8 +72,8 @@ lapack_int LAPACKE_ssytrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ssy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ssytrs( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                        &info );
@@ -81,18 +81,18 @@ lapack_int LAPACKE_ssytrs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ssytrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ssytrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ssytrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stbcon.c b/LAPACKE/src/lapacke_stbcon.c
index 8c27b4b4aa..a219c494c1 100644
--- a/LAPACKE/src/lapacke_stbcon.c
+++ b/LAPACKE/src/lapacke_stbcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stbcon( int matrix_layout, char norm, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_stbcon)( int matrix_layout, char norm, char uplo, char diag,
                            lapack_int n, lapack_int kd, const float* ab,
                            lapack_int ldab, float* rcond )
 {
@@ -40,13 +40,13 @@ lapack_int LAPACKE_stbcon( int matrix_layout, char norm, char uplo, char diag,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stbcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stbcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_stb_nancheck( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_stb_nancheck)( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
             return -7;
         }
     }
@@ -63,7 +63,7 @@ lapack_int LAPACKE_stbcon( int matrix_layout, char norm, char uplo, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_stbcon_work( matrix_layout, norm, uplo, diag, n, kd, ab, ldab,
+    info = API_SUFFIX(LAPACKE_stbcon_work)( matrix_layout, norm, uplo, diag, n, kd, ab, ldab,
                                 rcond, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -71,7 +71,7 @@ lapack_int LAPACKE_stbcon( int matrix_layout, char norm, char uplo, char diag,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_stbcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stbcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stbcon_work.c b/LAPACKE/src/lapacke_stbcon_work.c
index d3ac7c80b8..9dcc7ddc5f 100644
--- a/LAPACKE/src/lapacke_stbcon_work.c
+++ b/LAPACKE/src/lapacke_stbcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stbcon_work( int matrix_layout, char norm, char uplo,
+lapack_int API_SUFFIX(LAPACKE_stbcon_work)( int matrix_layout, char norm, char uplo,
                                 char diag, lapack_int n, lapack_int kd,
                                 const float* ab, lapack_int ldab, float* rcond,
                                 float* work, lapack_int* iwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_stbcon_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_stbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stbcon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_stbcon_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_stb_trans( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_stb_trans)( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
                            ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stbcon( &norm, &uplo, &diag, &n, &kd, ab_t, &ldab_t, rcond, work,
@@ -73,11 +73,11 @@ lapack_int LAPACKE_stbcon_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stbcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stbcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stbcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stbrfs.c b/LAPACKE/src/lapacke_stbrfs.c
index 860e66c5d9..8c58ce6d87 100644
--- a/LAPACKE/src/lapacke_stbrfs.c
+++ b/LAPACKE/src/lapacke_stbrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stbrfs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_stbrfs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int kd, lapack_int nrhs,
                            const float* ab, lapack_int ldab, const float* b,
                            lapack_int ldb, const float* x, lapack_int ldx,
@@ -42,19 +42,19 @@ lapack_int LAPACKE_stbrfs( int matrix_layout, char uplo, char trans, char diag,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stbrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stbrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_stb_nancheck( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_stb_nancheck)( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -71,7 +71,7 @@ lapack_int LAPACKE_stbrfs( int matrix_layout, char uplo, char trans, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_stbrfs_work( matrix_layout, uplo, trans, diag, n, kd, nrhs,
+    info = API_SUFFIX(LAPACKE_stbrfs_work)( matrix_layout, uplo, trans, diag, n, kd, nrhs,
                                 ab, ldab, b, ldb, x, ldx, ferr, berr, work,
                                 iwork );
     /* Release memory and exit */
@@ -80,7 +80,7 @@ lapack_int LAPACKE_stbrfs( int matrix_layout, char uplo, char trans, char diag,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_stbrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stbrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stbrfs_work.c b/LAPACKE/src/lapacke_stbrfs_work.c
index 39d19f9e6d..a45aee240c 100644
--- a/LAPACKE/src/lapacke_stbrfs_work.c
+++ b/LAPACKE/src/lapacke_stbrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stbrfs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_stbrfs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int kd,
                                 lapack_int nrhs, const float* ab,
                                 lapack_int ldab, const float* b, lapack_int ldb,
@@ -57,17 +57,17 @@ lapack_int LAPACKE_stbrfs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_stbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stbrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_stbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stbrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_stbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stbrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -87,10 +87,10 @@ lapack_int LAPACKE_stbrfs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_stb_trans( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_stb_trans)( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
                            ldab_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stbrfs( &uplo, &trans, &diag, &n, &kd, &nrhs, ab_t, &ldab_t, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, iwork, &info );
@@ -105,11 +105,11 @@ lapack_int LAPACKE_stbrfs_work( int matrix_layout, char uplo, char trans,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stbrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stbrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stbrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stbtrs.c b/LAPACKE/src/lapacke_stbtrs.c
index 3421eae3bb..39f6ff04c2 100644
--- a/LAPACKE/src/lapacke_stbtrs.c
+++ b/LAPACKE/src/lapacke_stbtrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stbtrs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_stbtrs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int kd, lapack_int nrhs,
                            const float* ab, lapack_int ldab, float* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stbtrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stbtrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_stb_nancheck( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_stb_nancheck)( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
     }
 #endif
-    return LAPACKE_stbtrs_work( matrix_layout, uplo, trans, diag, n, kd, nrhs,
+    return API_SUFFIX(LAPACKE_stbtrs_work)( matrix_layout, uplo, trans, diag, n, kd, nrhs,
                                 ab, ldab, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_stbtrs_work.c b/LAPACKE/src/lapacke_stbtrs_work.c
index 46ac0b0fcb..e6f66f9113 100644
--- a/LAPACKE/src/lapacke_stbtrs_work.c
+++ b/LAPACKE/src/lapacke_stbtrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stbtrs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_stbtrs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int kd,
                                 lapack_int nrhs, const float* ab,
                                 lapack_int ldab, float* b, lapack_int ldb )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_stbtrs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_stbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stbtrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_stbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stbtrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -73,9 +73,9 @@ lapack_int LAPACKE_stbtrs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_stb_trans( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_stb_trans)( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
                            ldab_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stbtrs( &uplo, &trans, &diag, &n, &kd, &nrhs, ab_t, &ldab_t, b_t,
                        &ldb_t, &info );
@@ -83,18 +83,18 @@ lapack_int LAPACKE_stbtrs_work( int matrix_layout, char uplo, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stbtrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stbtrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stbtrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stfsm.c b/LAPACKE/src/lapacke_stfsm.c
index 7f8a38da3e..55f0b1a2e7 100644
--- a/LAPACKE/src/lapacke_stfsm.c
+++ b/LAPACKE/src/lapacke_stfsm.c
@@ -32,33 +32,35 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stfsm( int matrix_layout, char transr, char side, char uplo,
+lapack_int API_SUFFIX(LAPACKE_stfsm)( int matrix_layout, char transr, char side, char uplo,
                           char trans, char diag, lapack_int m, lapack_int n,
                           float alpha, const float* a, float* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stfsm", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stfsm", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
+        lapack_int mn = m;
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
         /* Optionally check input matrices for NaNs */
         if( IS_S_NONZERO(alpha) ) {
-            if( LAPACKE_stf_nancheck( matrix_layout, transr, uplo, diag, n, a ) ) {
+            if( API_SUFFIX(LAPACKE_stf_nancheck)( matrix_layout, transr, uplo, diag, mn, a ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_s_nancheck( 1, &alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &alpha, 1 ) ) {
             return -9;
         }
         if( IS_S_NONZERO(alpha) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
                 return -11;
             }
         }
     }
 #endif
-    return LAPACKE_stfsm_work( matrix_layout, transr, side, uplo, trans, diag, m,
+    return API_SUFFIX(LAPACKE_stfsm_work)( matrix_layout, transr, side, uplo, trans, diag, m,
                                n, alpha, a, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_stfsm_work.c b/LAPACKE/src/lapacke_stfsm_work.c
index e6b14c960a..8d828c0828 100644
--- a/LAPACKE/src/lapacke_stfsm_work.c
+++ b/LAPACKE/src/lapacke_stfsm_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stfsm_work( int matrix_layout, char transr, char side,
+lapack_int API_SUFFIX(LAPACKE_stfsm_work)( int matrix_layout, char transr, char side,
                                char uplo, char trans, char diag, lapack_int m,
                                lapack_int n, float alpha, const float* a,
                                float* b, lapack_int ldb )
@@ -47,12 +47,14 @@ lapack_int LAPACKE_stfsm_work( int matrix_layout, char transr, char side,
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
         lapack_int ldb_t = MAX(1,m);
+        lapack_int mn = MAX(1,m);
         float* b_t = NULL;
         float* a_t = NULL;
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
         /* Check leading dimension(s) */
-        if( ldb < n ) {
+        if( ldb < m ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_stfsm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stfsm_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,7 +65,7 @@ lapack_int LAPACKE_stfsm_work( int matrix_layout, char transr, char side,
         }
         if( IS_S_NONZERO(alpha) ) {
             a_t = (float*)
-                LAPACKE_malloc( sizeof(float) * ( MAX(1,n) * MAX(2,n+1) ) / 2 );
+                LAPACKE_malloc( sizeof(float) * ( MAX(1,mn) * MAX(2,mn+1) ) / 2 );
             if( a_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_1;
@@ -71,17 +73,17 @@ lapack_int LAPACKE_stfsm_work( int matrix_layout, char transr, char side,
         }
         /* Transpose input matrices */
         if( IS_S_NONZERO(alpha) ) {
-            LAPACKE_sge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
         }
         if( IS_S_NONZERO(alpha) ) {
-            LAPACKE_stf_trans( matrix_layout, transr, uplo, diag, n, a, a_t );
+            API_SUFFIX(LAPACKE_stf_trans)( matrix_layout, transr, uplo, diag, mn, a, a_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_stfsm( &transr, &side, &uplo, &trans, &diag, &m, &n, &alpha, a_t,
                       b_t, &ldb_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         if( IS_S_NONZERO(alpha) ) {
             LAPACKE_free( a_t );
@@ -90,11 +92,11 @@ lapack_int LAPACKE_stfsm_work( int matrix_layout, char transr, char side,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stfsm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stfsm_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stfsm_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stfsm_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stftri.c b/LAPACKE/src/lapacke_stftri.c
index 33538a93b2..599df14941 100644
--- a/LAPACKE/src/lapacke_stftri.c
+++ b/LAPACKE/src/lapacke_stftri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stftri( int matrix_layout, char transr, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_stftri)( int matrix_layout, char transr, char uplo, char diag,
                            lapack_int n, float* a )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stftri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stftri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_stf_nancheck( matrix_layout, transr, uplo, diag, n, a ) ) {
+        if( API_SUFFIX(LAPACKE_stf_nancheck)( matrix_layout, transr, uplo, diag, n, a ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_stftri_work( matrix_layout, transr, uplo, diag, n, a );
+    return API_SUFFIX(LAPACKE_stftri_work)( matrix_layout, transr, uplo, diag, n, a );
 }
diff --git a/LAPACKE/src/lapacke_stftri_work.c b/LAPACKE/src/lapacke_stftri_work.c
index 5efc8b2878..a2f8152279 100644
--- a/LAPACKE/src/lapacke_stftri_work.c
+++ b/LAPACKE/src/lapacke_stftri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stftri_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_stftri_work)( int matrix_layout, char transr, char uplo,
                                 char diag, lapack_int n, float* a )
 {
     lapack_int info = 0;
@@ -52,23 +52,23 @@ lapack_int LAPACKE_stftri_work( int matrix_layout, char transr, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_stf_trans( matrix_layout, transr, uplo, diag, n, a, a_t );
+        API_SUFFIX(LAPACKE_stf_trans)( matrix_layout, transr, uplo, diag, n, a, a_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stftri( &transr, &uplo, &diag, &n, a_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_stf_trans( LAPACK_COL_MAJOR, transr, uplo, diag, n, a_t, a );
+        API_SUFFIX(LAPACKE_stf_trans)( LAPACK_COL_MAJOR, transr, uplo, diag, n, a_t, a );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stftri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stftri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stftri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stftri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stfttp.c b/LAPACKE/src/lapacke_stfttp.c
index 902b6dce01..87df8656e3 100644
--- a/LAPACKE/src/lapacke_stfttp.c
+++ b/LAPACKE/src/lapacke_stfttp.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stfttp( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_stfttp)( int matrix_layout, char transr, char uplo,
                            lapack_int n, const float* arf, float* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stfttp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stfttp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spf_nancheck( n, arf ) ) {
+        if( API_SUFFIX(LAPACKE_spf_nancheck)( n, arf ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_stfttp_work( matrix_layout, transr, uplo, n, arf, ap );
+    return API_SUFFIX(LAPACKE_stfttp_work)( matrix_layout, transr, uplo, n, arf, ap );
 }
diff --git a/LAPACKE/src/lapacke_stfttp_work.c b/LAPACKE/src/lapacke_stfttp_work.c
index 805fd07f19..3b2d6b03db 100644
--- a/LAPACKE/src/lapacke_stfttp_work.c
+++ b/LAPACKE/src/lapacke_stfttp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stfttp_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_stfttp_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, const float* arf, float* ap )
 {
     lapack_int info = 0;
@@ -59,25 +59,25 @@ lapack_int LAPACKE_stfttp_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_spf_trans( matrix_layout, transr, uplo, n, arf, arf_t );
+        API_SUFFIX(LAPACKE_spf_trans)( matrix_layout, transr, uplo, n, arf, arf_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stfttp( &transr, &uplo, &n, arf_t, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_spp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_spp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( arf_t );
 exit_level_1:
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stfttp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stfttp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stfttp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stfttp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stfttr.c b/LAPACKE/src/lapacke_stfttr.c
index 6a418f0fc8..2bd68ab6ca 100644
--- a/LAPACKE/src/lapacke_stfttr.c
+++ b/LAPACKE/src/lapacke_stfttr.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stfttr( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_stfttr)( int matrix_layout, char transr, char uplo,
                            lapack_int n, const float* arf, float* a,
                            lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stfttr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stfttr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spf_nancheck( n, arf ) ) {
+        if( API_SUFFIX(LAPACKE_spf_nancheck)( n, arf ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_stfttr_work( matrix_layout, transr, uplo, n, arf, a, lda );
+    return API_SUFFIX(LAPACKE_stfttr_work)( matrix_layout, transr, uplo, n, arf, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_stfttr_work.c b/LAPACKE/src/lapacke_stfttr_work.c
index a9fb091547..4da3ac767d 100644
--- a/LAPACKE/src/lapacke_stfttr_work.c
+++ b/LAPACKE/src/lapacke_stfttr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stfttr_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_stfttr_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, const float* arf, float* a,
                                 lapack_int lda )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_stfttr_work( int matrix_layout, char transr, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_stfttr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stfttr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,25 +66,25 @@ lapack_int LAPACKE_stfttr_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_spf_trans( matrix_layout, transr, uplo, n, arf, arf_t );
+        API_SUFFIX(LAPACKE_spf_trans)( matrix_layout, transr, uplo, n, arf, arf_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stfttr( &transr, &uplo, &n, arf_t, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( arf_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stfttr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stfttr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stfttr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stfttr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stgevc.c b/LAPACKE/src/lapacke_stgevc.c
index 3e6fe851f6..d7c31ae91f 100644
--- a/LAPACKE/src/lapacke_stgevc.c
+++ b/LAPACKE/src/lapacke_stgevc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stgevc( int matrix_layout, char side, char howmny,
+lapack_int API_SUFFIX(LAPACKE_stgevc)( int matrix_layout, char side, char howmny,
                            const lapack_logical* select, lapack_int n,
                            const float* s, lapack_int lds, const float* p,
                            lapack_int ldp, float* vl, lapack_int ldvl,
@@ -42,25 +42,25 @@ lapack_int LAPACKE_stgevc( int matrix_layout, char side, char howmny,
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stgevc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgevc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, p, ldp ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, p, ldp ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, s, lds ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, s, lds ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -12;
             }
         }
@@ -73,13 +73,13 @@ lapack_int LAPACKE_stgevc( int matrix_layout, char side, char howmny,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_stgevc_work( matrix_layout, side, howmny, select, n, s, lds,
+    info = API_SUFFIX(LAPACKE_stgevc_work)( matrix_layout, side, howmny, select, n, s, lds,
                                 p, ldp, vl, ldvl, vr, ldvr, mm, m, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_stgevc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgevc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stgevc_work.c b/LAPACKE/src/lapacke_stgevc_work.c
index fd9f6ca029..12b37961da 100644
--- a/LAPACKE/src/lapacke_stgevc_work.c
+++ b/LAPACKE/src/lapacke_stgevc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stgevc_work( int matrix_layout, char side, char howmny,
+lapack_int API_SUFFIX(LAPACKE_stgevc_work)( int matrix_layout, char side, char howmny,
                                 const lapack_logical* select, lapack_int n,
                                 const float* s, lapack_int lds, const float* p,
                                 lapack_int ldp, float* vl, lapack_int ldvl,
@@ -59,22 +59,22 @@ lapack_int LAPACKE_stgevc_work( int matrix_layout, char side, char howmny,
         /* Check leading dimension(s) */
         if( ldp < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_stgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgevc_work", info );
             return info;
         }
         if( lds < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_stgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgevc_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_stgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgevc_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_stgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgevc_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -88,14 +88,14 @@ lapack_int LAPACKE_stgevc_work( int matrix_layout, char side, char howmny,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             vl_t = (float*)LAPACKE_malloc( sizeof(float) * ldvl_t * MAX(1,mm) );
             if( vl_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
             vr_t = (float*)LAPACKE_malloc( sizeof(float) * ldvr_t * MAX(1,mm) );
             if( vr_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -103,15 +103,15 @@ lapack_int LAPACKE_stgevc_work( int matrix_layout, char side, char howmny,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, s, lds, s_t, lds_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, p, ldp, p_t, ldp_t );
-        if( ( LAPACKE_lsame( side, 'l' ) || LAPACKE_lsame( side, 'b' ) ) &&
-            LAPACKE_lsame( howmny, 'b' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, s, lds, s_t, lds_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, p, ldp, p_t, ldp_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) || API_SUFFIX(LAPACKE_lsame)( side, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( howmny, 'b' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( ( LAPACKE_lsame( side, 'r' ) || LAPACKE_lsame( side, 'b' ) ) &&
-            LAPACKE_lsame( howmny, 'b' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) || API_SUFFIX(LAPACKE_lsame)( side, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( howmny, 'b' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_stgevc( &side, &howmny, select, &n, s_t, &lds_t, p_t, &ldp_t,
@@ -120,20 +120,20 @@ lapack_int LAPACKE_stgevc_work( int matrix_layout, char side, char howmny,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
                                ldvl );
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
                                ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -142,11 +142,11 @@ lapack_int LAPACKE_stgevc_work( int matrix_layout, char side, char howmny,
         LAPACKE_free( s_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgevc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stgevc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgevc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stgexc.c b/LAPACKE/src/lapacke_stgexc.c
index 5b0fc4700f..f3efb0eadd 100644
--- a/LAPACKE/src/lapacke_stgexc.c
+++ b/LAPACKE/src/lapacke_stgexc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stgexc( int matrix_layout, lapack_logical wantq,
+lapack_int API_SUFFIX(LAPACKE_stgexc)( int matrix_layout, lapack_logical wantq,
                            lapack_logical wantz, lapack_int n, float* a,
                            lapack_int lda, float* b, lapack_int ldb, float* q,
                            lapack_int ldq, float* z, lapack_int ldz,
@@ -43,32 +43,32 @@ lapack_int LAPACKE_stgexc( int matrix_layout, lapack_logical wantq,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stgexc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgexc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -7;
         }
         if( wantq ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -9;
             }
         }
         if( wantz ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -11;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_stgexc_work( matrix_layout, wantq, wantz, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_stgexc_work)( matrix_layout, wantq, wantz, n, a, lda, b, ldb,
                                 q, ldq, z, ldz, ifst, ilst, &work_query,
                                 lwork );
     if( info != 0 ) {
@@ -82,13 +82,13 @@ lapack_int LAPACKE_stgexc( int matrix_layout, lapack_logical wantq,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_stgexc_work( matrix_layout, wantq, wantz, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_stgexc_work)( matrix_layout, wantq, wantz, n, a, lda, b, ldb,
                                 q, ldq, z, ldz, ifst, ilst, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_stgexc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgexc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stgexc_work.c b/LAPACKE/src/lapacke_stgexc_work.c
index aea9cbd29e..25be312af2 100644
--- a/LAPACKE/src/lapacke_stgexc_work.c
+++ b/LAPACKE/src/lapacke_stgexc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stgexc_work( int matrix_layout, lapack_logical wantq,
+lapack_int API_SUFFIX(LAPACKE_stgexc_work)( int matrix_layout, lapack_logical wantq,
                                 lapack_logical wantz, lapack_int n, float* a,
                                 lapack_int lda, float* b, lapack_int ldb,
                                 float* q, lapack_int ldq, float* z,
@@ -60,22 +60,22 @@ lapack_int LAPACKE_stgexc_work( int matrix_layout, lapack_logical wantq,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_stgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgexc_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_stgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgexc_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_stgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgexc_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_stgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgexc_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -110,13 +110,13 @@ lapack_int LAPACKE_stgexc_work( int matrix_layout, lapack_logical wantq,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         if( wantq ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         if( wantz ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_stgexc( &wantq, &wantz, &n, a_t, &lda_t, b_t, &ldb_t, q_t,
@@ -125,13 +125,13 @@ lapack_int LAPACKE_stgexc_work( int matrix_layout, lapack_logical wantq,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         if( wantq ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         if( wantz ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
         if( wantz ) {
@@ -147,11 +147,11 @@ lapack_int LAPACKE_stgexc_work( int matrix_layout, lapack_logical wantq,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgexc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stgexc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgexc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stgsen.c b/LAPACKE/src/lapacke_stgsen.c
index c3b0c4bf82..312ac5e430 100644
--- a/LAPACKE/src/lapacke_stgsen.c
+++ b/LAPACKE/src/lapacke_stgsen.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stgsen( int matrix_layout, lapack_int ijob,
+lapack_int API_SUFFIX(LAPACKE_stgsen)( int matrix_layout, lapack_int ijob,
                            lapack_logical wantq, lapack_logical wantz,
                            const lapack_logical* select, lapack_int n, float* a,
                            lapack_int lda, float* b, lapack_int ldb,
@@ -48,32 +48,32 @@ lapack_int LAPACKE_stgsen( int matrix_layout, lapack_int ijob,
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stgsen", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsen", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
         if( wantq ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -14;
             }
         }
         if( wantz ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -16;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_stgsen_work( matrix_layout, ijob, wantq, wantz, select, n, a,
+    info = API_SUFFIX(LAPACKE_stgsen_work)( matrix_layout, ijob, wantq, wantz, select, n, a,
                                 lda, b, ldb, alphar, alphai, beta, q, ldq, z,
                                 ldz, m, pl, pr, dif, &work_query, lwork,
                                 &iwork_query, liwork );
@@ -83,12 +83,10 @@ lapack_int LAPACKE_stgsen( int matrix_layout, lapack_int ijob,
     liwork = iwork_query;
     lwork = (lapack_int)work_query;
     /* Allocate memory for work arrays */
-    if( ijob != 0 ) {
-        iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
-        if( iwork == NULL ) {
-            info = LAPACK_WORK_MEMORY_ERROR;
-            goto exit_level_0;
-        }
+    iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
+    if( iwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
     }
     work = (float*)LAPACKE_malloc( sizeof(float) * lwork );
     if( work == NULL ) {
@@ -96,19 +94,17 @@ lapack_int LAPACKE_stgsen( int matrix_layout, lapack_int ijob,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_stgsen_work( matrix_layout, ijob, wantq, wantz, select, n, a,
+    info = API_SUFFIX(LAPACKE_stgsen_work)( matrix_layout, ijob, wantq, wantz, select, n, a,
                                 lda, b, ldb, alphar, alphai, beta, q, ldq, z,
                                 ldz, m, pl, pr, dif, work, lwork, iwork,
                                 liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_1:
-    if( ijob != 0 ) {
-        LAPACKE_free( iwork );
-    }
+    LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_stgsen", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsen", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stgsen_work.c b/LAPACKE/src/lapacke_stgsen_work.c
index 0d7eacb31a..e0a81174b1 100644
--- a/LAPACKE/src/lapacke_stgsen_work.c
+++ b/LAPACKE/src/lapacke_stgsen_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stgsen_work( int matrix_layout, lapack_int ijob,
+lapack_int API_SUFFIX(LAPACKE_stgsen_work)( int matrix_layout, lapack_int ijob,
                                 lapack_logical wantq, lapack_logical wantz,
                                 const lapack_logical* select, lapack_int n,
                                 float* a, lapack_int lda, float* b,
@@ -64,22 +64,22 @@ lapack_int LAPACKE_stgsen_work( int matrix_layout, lapack_int ijob,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_stgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsen_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_stgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsen_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_stgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsen_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_stgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsen_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -116,13 +116,13 @@ lapack_int LAPACKE_stgsen_work( int matrix_layout, lapack_int ijob,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         if( wantq ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         if( wantz ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_stgsen( &ijob, &wantq, &wantz, select, &n, a_t, &lda_t, b_t,
@@ -132,13 +132,13 @@ lapack_int LAPACKE_stgsen_work( int matrix_layout, lapack_int ijob,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         if( wantq ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         if( wantz ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
         if( wantz ) {
@@ -154,11 +154,11 @@ lapack_int LAPACKE_stgsen_work( int matrix_layout, lapack_int ijob,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsen_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stgsen_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsen_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stgsja.c b/LAPACKE/src/lapacke_stgsja.c
index 24e5bcefa9..589297095c 100644
--- a/LAPACKE/src/lapacke_stgsja.c
+++ b/LAPACKE/src/lapacke_stgsja.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stgsja( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_stgsja)( int matrix_layout, char jobu, char jobv, char jobq,
                            lapack_int m, lapack_int p, lapack_int n,
                            lapack_int k, lapack_int l, float* a, lapack_int lda,
                            float* b, lapack_int ldb, float tola, float tolb,
@@ -43,36 +43,36 @@ lapack_int LAPACKE_stgsja( int matrix_layout, char jobu, char jobv, char jobq,
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stgsja", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsja", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -10;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( jobq, 'i' ) || LAPACKE_lsame( jobq, 'q' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -22;
             }
         }
-        if( LAPACKE_s_nancheck( 1, &tola, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &tola, 1 ) ) {
             return -14;
         }
-        if( LAPACKE_s_nancheck( 1, &tolb, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_s_nancheck)( 1, &tolb, 1 ) ) {
             return -15;
         }
-        if( LAPACKE_lsame( jobu, 'i' ) || LAPACKE_lsame( jobu, 'u' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, m, m, u, ldu ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, m, u, ldu ) ) {
                 return -18;
             }
         }
-        if( LAPACKE_lsame( jobv, 'i' ) || LAPACKE_lsame( jobv, 'v' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, p, p, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, p, p, v, ldv ) ) {
                 return -20;
             }
         }
@@ -85,14 +85,14 @@ lapack_int LAPACKE_stgsja( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_stgsja_work( matrix_layout, jobu, jobv, jobq, m, p, n, k, l,
+    info = API_SUFFIX(LAPACKE_stgsja_work)( matrix_layout, jobu, jobv, jobq, m, p, n, k, l,
                                 a, lda, b, ldb, tola, tolb, alpha, beta, u, ldu,
                                 v, ldv, q, ldq, work, ncycle );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_stgsja", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsja", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stgsja_work.c b/LAPACKE/src/lapacke_stgsja_work.c
index 1cc98ce686..2ac6a97635 100644
--- a/LAPACKE/src/lapacke_stgsja_work.c
+++ b/LAPACKE/src/lapacke_stgsja_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stgsja_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_stgsja_work)( int matrix_layout, char jobu, char jobv,
                                 char jobq, lapack_int m, lapack_int p,
                                 lapack_int n, lapack_int k, lapack_int l,
                                 float* a, lapack_int lda, float* b,
@@ -65,27 +65,27 @@ lapack_int LAPACKE_stgsja_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_stgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsja_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_stgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsja_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -23;
-            LAPACKE_xerbla( "LAPACKE_stgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsja_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_stgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsja_work", info );
             return info;
         }
         if( ldv < p ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_stgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsja_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -99,21 +99,21 @@ lapack_int LAPACKE_stgsja_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'i' ) || LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (float*)LAPACKE_malloc( sizeof(float) * ldu_t * MAX(1,m) );
             if( u_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'i' ) || LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (float*)LAPACKE_malloc( sizeof(float) * ldv_t * MAX(1,p) );
             if( v_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'i' ) || LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (float*)LAPACKE_malloc( sizeof(float) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -121,16 +121,16 @@ lapack_int LAPACKE_stgsja_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_sge_trans( matrix_layout, m, m, u, ldu, u_t, ldu_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, m, u, ldu, u_t, ldu_t );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_sge_trans( matrix_layout, p, p, v, ldv, v_t, ldv_t );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, p, p, v, ldv, v_t, ldv_t );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_stgsja( &jobu, &jobv, &jobq, &m, &p, &n, &k, &l, a_t, &lda_t,
@@ -140,27 +140,27 @@ lapack_int LAPACKE_stgsja_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'i' ) || LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'i' ) || LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'i' ) || LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'i' ) || LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'i' ) || LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'i' ) || LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -169,11 +169,11 @@ lapack_int LAPACKE_stgsja_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsja_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stgsja_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsja_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stgsna.c b/LAPACKE/src/lapacke_stgsna.c
index e8c6113188..d4223c3e08 100644
--- a/LAPACKE/src/lapacke_stgsna.c
+++ b/LAPACKE/src/lapacke_stgsna.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stgsna( int matrix_layout, char job, char howmny,
+lapack_int API_SUFFIX(LAPACKE_stgsna)( int matrix_layout, char job, char howmny,
                            const lapack_logical* select, lapack_int n,
                            const float* a, lapack_int lda, const float* b,
                            lapack_int ldb, const float* vl, lapack_int ldvl,
@@ -45,32 +45,32 @@ lapack_int LAPACKE_stgsna( int matrix_layout, char job, char howmny,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stgsna", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsna", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -12;
             }
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * MAX(1,n+6) );
         if( iwork == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -78,7 +78,7 @@ lapack_int LAPACKE_stgsna( int matrix_layout, char job, char howmny,
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_stgsna_work( matrix_layout, job, howmny, select, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_stgsna_work)( matrix_layout, job, howmny, select, n, a, lda, b,
                                 ldb, vl, ldvl, vr, ldvr, s, dif, mm, m,
                                 &work_query, lwork, iwork );
     if( info != 0 ) {
@@ -86,7 +86,7 @@ lapack_int LAPACKE_stgsna( int matrix_layout, char job, char howmny,
     }
     lwork = (lapack_int)work_query;
     /* Allocate memory for work arrays */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         work = (float*)LAPACKE_malloc( sizeof(float) * lwork );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -94,20 +94,20 @@ lapack_int LAPACKE_stgsna( int matrix_layout, char job, char howmny,
         }
     }
     /* Call middle-level interface */
-    info = LAPACKE_stgsna_work( matrix_layout, job, howmny, select, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_stgsna_work)( matrix_layout, job, howmny, select, n, a, lda, b,
                                 ldb, vl, ldvl, vr, ldvr, s, dif, mm, m, work,
                                 lwork, iwork );
     /* Release memory and exit */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( work );
     }
 exit_level_1:
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( iwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_stgsna", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsna", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stgsna_work.c b/LAPACKE/src/lapacke_stgsna_work.c
index d10868305d..e66bd8a6c5 100644
--- a/LAPACKE/src/lapacke_stgsna_work.c
+++ b/LAPACKE/src/lapacke_stgsna_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stgsna_work( int matrix_layout, char job, char howmny,
+lapack_int API_SUFFIX(LAPACKE_stgsna_work)( int matrix_layout, char job, char howmny,
                                 const lapack_logical* select, lapack_int n,
                                 const float* a, lapack_int lda, const float* b,
                                 lapack_int ldb, const float* vl,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_stgsna_work( int matrix_layout, char job, char howmny,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_stgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsna_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_stgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsna_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_stgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsna_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_stgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsna_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -97,14 +97,14 @@ lapack_int LAPACKE_stgsna_work( int matrix_layout, char job, char howmny,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             vl_t = (float*)LAPACKE_malloc( sizeof(float) * ldvl_t * MAX(1,mm) );
             if( vl_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             vr_t = (float*)LAPACKE_malloc( sizeof(float) * ldvr_t * MAX(1,mm) );
             if( vr_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -112,13 +112,13 @@ lapack_int LAPACKE_stgsna_work( int matrix_layout, char job, char howmny,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_stgsna( &job, &howmny, select, &n, a_t, &lda_t, b_t, &ldb_t,
@@ -128,11 +128,11 @@ lapack_int LAPACKE_stgsna_work( int matrix_layout, char job, char howmny,
             info = info - 1;
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -141,11 +141,11 @@ lapack_int LAPACKE_stgsna_work( int matrix_layout, char job, char howmny,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsna_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stgsna_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsna_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stgsyl.c b/LAPACKE/src/lapacke_stgsyl.c
index b7efeafb83..5d683479d5 100644
--- a/LAPACKE/src/lapacke_stgsyl.c
+++ b/LAPACKE/src/lapacke_stgsyl.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stgsyl( int matrix_layout, char trans, lapack_int ijob,
+lapack_int API_SUFFIX(LAPACKE_stgsyl)( int matrix_layout, char trans, lapack_int ijob,
                            lapack_int m, lapack_int n, const float* a,
                            lapack_int lda, const float* b, lapack_int ldb,
                            float* c, lapack_int ldc, const float* d,
@@ -45,28 +45,28 @@ lapack_int LAPACKE_stgsyl( int matrix_layout, char trans, lapack_int ijob,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stgsyl", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsyl", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, m, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, m, d, ldd ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, m, d, ldd ) ) {
             return -12;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, e, lde ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, e, lde ) ) {
             return -14;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, f, ldf ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, f, ldf ) ) {
             return -16;
         }
     }
@@ -78,7 +78,7 @@ lapack_int LAPACKE_stgsyl( int matrix_layout, char trans, lapack_int ijob,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_stgsyl_work( matrix_layout, trans, ijob, m, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_stgsyl_work)( matrix_layout, trans, ijob, m, n, a, lda, b, ldb,
                                 c, ldc, d, ldd, e, lde, f, ldf, scale, dif,
                                 &work_query, lwork, iwork );
     if( info != 0 ) {
@@ -92,7 +92,7 @@ lapack_int LAPACKE_stgsyl( int matrix_layout, char trans, lapack_int ijob,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_stgsyl_work( matrix_layout, trans, ijob, m, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_stgsyl_work)( matrix_layout, trans, ijob, m, n, a, lda, b, ldb,
                                 c, ldc, d, ldd, e, lde, f, ldf, scale, dif,
                                 work, lwork, iwork );
     /* Release memory and exit */
@@ -101,7 +101,7 @@ lapack_int LAPACKE_stgsyl( int matrix_layout, char trans, lapack_int ijob,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_stgsyl", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsyl", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stgsyl_work.c b/LAPACKE/src/lapacke_stgsyl_work.c
index 8b7ab8ae07..7694848040 100644
--- a/LAPACKE/src/lapacke_stgsyl_work.c
+++ b/LAPACKE/src/lapacke_stgsyl_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stgsyl_work( int matrix_layout, char trans, lapack_int ijob,
+lapack_int API_SUFFIX(LAPACKE_stgsyl_work)( int matrix_layout, char trans, lapack_int ijob,
                                 lapack_int m, lapack_int n, const float* a,
                                 lapack_int lda, const float* b, lapack_int ldb,
                                 float* c, lapack_int ldc, const float* d,
@@ -66,32 +66,32 @@ lapack_int LAPACKE_stgsyl_work( int matrix_layout, char trans, lapack_int ijob,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_stgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsyl_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_stgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsyl_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_stgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsyl_work", info );
             return info;
         }
         if( ldd < m ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_stgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsyl_work", info );
             return info;
         }
         if( lde < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_stgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsyl_work", info );
             return info;
         }
         if( ldf < n ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_stgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsyl_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -133,12 +133,12 @@ lapack_int LAPACKE_stgsyl_work( int matrix_layout, char trans, lapack_int ijob,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, m, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
-        LAPACKE_sge_trans( matrix_layout, m, m, d, ldd, d_t, ldd_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, e, lde, e_t, lde_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, f, ldf, f_t, ldf_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, m, d, ldd, d_t, ldd_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, e, lde, e_t, lde_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, f, ldf, f_t, ldf_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stgsyl( &trans, &ijob, &m, &n, a_t, &lda_t, b_t, &ldb_t, c_t,
                        &ldc_t, d_t, &ldd_t, e_t, &lde_t, f_t, &ldf_t, scale,
@@ -147,8 +147,8 @@ lapack_int LAPACKE_stgsyl_work( int matrix_layout, char trans, lapack_int ijob,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, f_t, ldf_t, f, ldf );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, f_t, ldf_t, f, ldf );
         /* Release memory and exit */
         LAPACKE_free( f_t );
 exit_level_5:
@@ -163,11 +163,11 @@ lapack_int LAPACKE_stgsyl_work( int matrix_layout, char trans, lapack_int ijob,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsyl_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stgsyl_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stgsyl_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stpcon.c b/LAPACKE/src/lapacke_stpcon.c
index 04583cd185..a70dca4757 100644
--- a/LAPACKE/src/lapacke_stpcon.c
+++ b/LAPACKE/src/lapacke_stpcon.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stpcon( int matrix_layout, char norm, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_stpcon)( int matrix_layout, char norm, char uplo, char diag,
                            lapack_int n, const float* ap, float* rcond )
 {
     lapack_int info = 0;
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stpcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_stp_nancheck( matrix_layout, uplo, diag, n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_stp_nancheck)( matrix_layout, uplo, diag, n, ap ) ) {
             return -6;
         }
     }
@@ -62,7 +62,7 @@ lapack_int LAPACKE_stpcon( int matrix_layout, char norm, char uplo, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_stpcon_work( matrix_layout, norm, uplo, diag, n, ap, rcond,
+    info = API_SUFFIX(LAPACKE_stpcon_work)( matrix_layout, norm, uplo, diag, n, ap, rcond,
                                 work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -70,7 +70,7 @@ lapack_int LAPACKE_stpcon( int matrix_layout, char norm, char uplo, char diag,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_stpcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stpcon_work.c b/LAPACKE/src/lapacke_stpcon_work.c
index ef5c3fa840..1f716006e6 100644
--- a/LAPACKE/src/lapacke_stpcon_work.c
+++ b/LAPACKE/src/lapacke_stpcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stpcon_work( int matrix_layout, char norm, char uplo,
+lapack_int API_SUFFIX(LAPACKE_stpcon_work)( int matrix_layout, char norm, char uplo,
                                 char diag, lapack_int n, const float* ap,
                                 float* rcond, float* work, lapack_int* iwork )
 {
@@ -53,7 +53,7 @@ lapack_int LAPACKE_stpcon_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_stp_trans( matrix_layout, uplo, diag, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_stp_trans)( matrix_layout, uplo, diag, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stpcon( &norm, &uplo, &diag, &n, ap_t, rcond, work, iwork,
                        &info );
@@ -64,11 +64,11 @@ lapack_int LAPACKE_stpcon_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stpcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stpcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stpmqrt.c b/LAPACKE/src/lapacke_stpmqrt.c
index be7c117b08..e00b4f7f17 100644
--- a/LAPACKE/src/lapacke_stpmqrt.c
+++ b/LAPACKE/src/lapacke_stpmqrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stpmqrt( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_stpmqrt)( int matrix_layout, char side, char trans,
                             lapack_int m, lapack_int n, lapack_int k,
                             lapack_int l, lapack_int nb, const float* v,
                             lapack_int ldv, const float* t, lapack_int ldt,
@@ -44,48 +44,48 @@ lapack_int LAPACKE_stpmqrt( int matrix_layout, char side, char trans,
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stpmqrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpmqrt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        ncols_a = LAPACKE_lsame( side, 'L' ) ? n :
-                             ( LAPACKE_lsame( side, 'R' ) ? k : 0 );
-        nrows_a = LAPACKE_lsame( side, 'L' ) ? k :
-                             ( LAPACKE_lsame( side, 'R' ) ? m : 0 );
-        nrows_v = LAPACKE_lsame( side, 'L' ) ? m :
-                             ( LAPACKE_lsame( side, 'R' ) ? n : 0 );
-        if( LAPACKE_sge_nancheck( matrix_layout, nrows_a, ncols_a, a, lda ) ) {
+        ncols_a = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? k : 0 );
+        nrows_a = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? k :
+                             ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? m : 0 );
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? m :
+                             ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? n : 0 );
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, nrows_a, ncols_a, a, lda ) ) {
             return -13;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -15;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, nb, k, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, nb, k, t, ldt ) ) {
             return -11;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, nrows_v, k, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, nrows_v, k, v, ldv ) ) {
             return -9;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    lwork = LAPACKE_lsame( side, 'L' ) ? MAX(1,nb) * MAX(1,n) :
-        ( LAPACKE_lsame( side, 'R' ) ? MAX(1,m) * MAX(1,nb) : 0 );
+    lwork = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? MAX(1,nb) * MAX(1,n) :
+        ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? MAX(1,m) * MAX(1,nb) : 0 );
     work = (float*)LAPACKE_malloc( sizeof(float) * lwork );
     if( work == NULL ) {
         info = LAPACK_WORK_MEMORY_ERROR;
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_stpmqrt_work( matrix_layout, side, trans, m, n, k, l, nb, v,
+    info = API_SUFFIX(LAPACKE_stpmqrt_work)( matrix_layout, side, trans, m, n, k, l, nb, v,
                                  ldv, t, ldt, a, lda, b, ldb, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_stpmqrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpmqrt", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stpmqrt_work.c b/LAPACKE/src/lapacke_stpmqrt_work.c
index 095fbdcd9f..4e06221a78 100644
--- a/LAPACKE/src/lapacke_stpmqrt_work.c
+++ b/LAPACKE/src/lapacke_stpmqrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stpmqrt_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_stpmqrt_work)( int matrix_layout, char side, char trans,
                                  lapack_int m, lapack_int n, lapack_int k,
                                  lapack_int l, lapack_int nb, const float* v,
                                  lapack_int ldv, const float* t, lapack_int ldt,
@@ -48,33 +48,41 @@ lapack_int LAPACKE_stpmqrt_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int lda_t = MAX(1,k);
+        lapack_int nrowsA, ncolsA, nrowsV;
+        if      ( API_SUFFIX(LAPACKE_lsame)(side, 'l') ) { nrowsA = k; ncolsA = n; nrowsV = m; }
+        else if ( API_SUFFIX(LAPACKE_lsame)(side, 'r') ) { nrowsA = m; ncolsA = k; nrowsV = n; }
+        else {
+            info = -2;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpmqrt_work", info );
+            return info;
+        }
+        lapack_int lda_t = MAX(1,nrowsA);
         lapack_int ldb_t = MAX(1,m);
-        lapack_int ldt_t = MAX(1,ldt);
-        lapack_int ldv_t = MAX(1,ldv);
+        lapack_int ldt_t = MAX(1,nb);
+        lapack_int ldv_t = MAX(1,nrowsV);
         float* v_t = NULL;
         float* t_t = NULL;
         float* a_t = NULL;
         float* b_t = NULL;
         /* Check leading dimension(s) */
-        if( lda < m ) {
+        if( lda < ncolsA ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_stpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpmqrt_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_stpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpmqrt_work", info );
             return info;
         }
-        if( ldt < nb ) {
+        if( ldt < k ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_stpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpmqrt_work", info );
             return info;
         }
         if( ldv < k ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_stpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpmqrt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -83,12 +91,12 @@ lapack_int LAPACKE_stpmqrt_work( int matrix_layout, char side, char trans,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        t_t = (float*)LAPACKE_malloc( sizeof(float) * ldt_t * MAX(1,nb) );
+        t_t = (float*)LAPACKE_malloc( sizeof(float) * ldt_t * MAX(1,k) );
         if( t_t == NULL ) {
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        a_t = (float*)LAPACKE_malloc( sizeof(float) * lda_t * MAX(1,m) );
+        a_t = (float*)LAPACKE_malloc( sizeof(float) * lda_t * MAX(1,ncolsA) );
         if( a_t == NULL ) {
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_2;
@@ -99,10 +107,10 @@ lapack_int LAPACKE_stpmqrt_work( int matrix_layout, char side, char trans,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
-        LAPACKE_sge_trans( matrix_layout, ldt, nb, t, ldt, t_t, ldt_t );
-        LAPACKE_sge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_ROW_MAJOR, nrowsV, k, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_ROW_MAJOR, nb, k, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_ROW_MAJOR, nrowsA, ncolsA, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_ROW_MAJOR, m, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stpmqrt( &side, &trans, &m, &n, &k, &l, &nb, v_t, &ldv_t, t_t,
                         &ldt_t, a_t, &lda_t, b_t, &ldb_t, work, &info );
@@ -110,8 +118,8 @@ lapack_int LAPACKE_stpmqrt_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, k, m, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nrowsA, ncolsA, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_3:
@@ -122,11 +130,11 @@ lapack_int LAPACKE_stpmqrt_work( int matrix_layout, char side, char trans,
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpmqrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stpmqrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpmqrt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stpqrt.c b/LAPACKE/src/lapacke_stpqrt.c
index 9df06332c2..620b75a76d 100644
--- a/LAPACKE/src/lapacke_stpqrt.c
+++ b/LAPACKE/src/lapacke_stpqrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stpqrt( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_stpqrt)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int l, lapack_int nb, float* a,
                            lapack_int lda, float* b, lapack_int ldb, float* t,
                            lapack_int ldt )
@@ -40,16 +40,16 @@ lapack_int LAPACKE_stpqrt( int matrix_layout, lapack_int m, lapack_int n,
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stpqrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpqrt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -8;
         }
     }
@@ -61,13 +61,13 @@ lapack_int LAPACKE_stpqrt( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_stpqrt_work( matrix_layout, m, n, l, nb, a, lda, b, ldb, t,
+    info = API_SUFFIX(LAPACKE_stpqrt_work)( matrix_layout, m, n, l, nb, a, lda, b, ldb, t,
                                 ldt, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_stpqrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpqrt", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stpqrt2.c b/LAPACKE/src/lapacke_stpqrt2.c
index fc539ab4a2..be170aa564 100644
--- a/LAPACKE/src/lapacke_stpqrt2.c
+++ b/LAPACKE/src/lapacke_stpqrt2.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stpqrt2( int matrix_layout,
+lapack_int API_SUFFIX(LAPACKE_stpqrt2)( int matrix_layout,
                             lapack_int m, lapack_int n, lapack_int l,
                             float* a, lapack_int lda, float* b, lapack_int ldb,
                             float* t, lapack_int ldt )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stpqrt2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpqrt2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_stpqrt2_work( matrix_layout, m, n, l, a, lda, b, ldb, t, ldt );
+    return API_SUFFIX(LAPACKE_stpqrt2_work)( matrix_layout, m, n, l, a, lda, b, ldb, t, ldt );
 }
diff --git a/LAPACKE/src/lapacke_stpqrt2_work.c b/LAPACKE/src/lapacke_stpqrt2_work.c
index 7e8200e0dd..2747dbde92 100644
--- a/LAPACKE/src/lapacke_stpqrt2_work.c
+++ b/LAPACKE/src/lapacke_stpqrt2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stpqrt2_work( int matrix_layout,
+lapack_int API_SUFFIX(LAPACKE_stpqrt2_work)( int matrix_layout,
                                  lapack_int m, lapack_int n, lapack_int l,
                                  float* a, lapack_int lda, float* b,
                                  lapack_int ldb, float* t, lapack_int ldt )
@@ -54,17 +54,17 @@ lapack_int LAPACKE_stpqrt2_work( int matrix_layout,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_stpqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpqrt2_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_stpqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpqrt2_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_stpqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpqrt2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -84,17 +84,17 @@ lapack_int LAPACKE_stpqrt2_work( int matrix_layout,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stpqrt2( &m, &n, &l, a_t, &lda_t, b_t, &ldb_t, t_t, &ldt_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_2:
@@ -103,11 +103,11 @@ lapack_int LAPACKE_stpqrt2_work( int matrix_layout,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stpqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpqrt2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stpqrt2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpqrt2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stpqrt_work.c b/LAPACKE/src/lapacke_stpqrt_work.c
index 9477607e36..7493b540a1 100644
--- a/LAPACKE/src/lapacke_stpqrt_work.c
+++ b/LAPACKE/src/lapacke_stpqrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_stpqrt_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int l, lapack_int nb, float* a,
                                 lapack_int lda, float* b, lapack_int ldb,
                                 float* t, lapack_int ldt, float* work )
@@ -55,17 +55,17 @@ lapack_int LAPACKE_stpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_stpqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpqrt_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_stpqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpqrt_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_stpqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpqrt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -85,8 +85,8 @@ lapack_int LAPACKE_stpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stpqrt( &m, &n, &l, &nb, a_t, &lda_t, b_t, &ldb_t, t_t, &ldt_t,
                        work, &info );
@@ -94,9 +94,9 @@ lapack_int LAPACKE_stpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, nb, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, nb, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_2:
@@ -105,11 +105,11 @@ lapack_int LAPACKE_stpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stpqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpqrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stpqrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpqrt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stprfb.c b/LAPACKE/src/lapacke_stprfb.c
index 1146e40dcd..2c685ef920 100644
--- a/LAPACKE/src/lapacke_stprfb.c
+++ b/LAPACKE/src/lapacke_stprfb.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stprfb( int matrix_layout, char side, char trans, char direct,
+lapack_int API_SUFFIX(LAPACKE_stprfb)( int matrix_layout, char side, char trans, char direct,
                            char storev, lapack_int m, lapack_int n,
                            lapack_int k, lapack_int l, const float* v,
                            lapack_int ldv, const float* t, lapack_int ldt,
@@ -44,7 +44,7 @@ lapack_int LAPACKE_stprfb( int matrix_layout, char side, char trans, char direct
     lapack_int work_size;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stprfb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stprfb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
@@ -59,32 +59,32 @@ lapack_int LAPACKE_stprfb( int matrix_layout, char side, char trans, char direct
          *   or m-by-k (right)
          * B is m-by-n
          */
-        if( LAPACKE_lsame( storev, 'C' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( storev, 'C' ) ) {
             ncols_v = k;
-            nrows_v = LAPACKE_lsame( side, 'L' ) ? m :
-                      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;
+            nrows_v = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? m :
+                      API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? n : 0;
+        } else if( API_SUFFIX(LAPACKE_lsame)( storev, 'R' ) ) {
+            ncols_v = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? m :
+                      API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? n : 0;
             nrows_v = k;
         } else {
             ncols_v = 0;
             nrows_v = 0;
         }
-        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_sge_nancheck( matrix_layout, ncols_a, nrows_a, a, lda ) ) {
+        nrows_a = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? k :
+                  API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? m : 0;
+        ncols_a = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? n :
+                  API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? k : 0;
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, ncols_a, nrows_a, a, lda ) ) {
             return -14;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -16;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, k, k, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, k, k, t, ldt ) ) {
             return -12;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, nrows_v, ncols_v, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, nrows_v, ncols_v, v, ldv ) ) {
             return -10;
         }
     }
@@ -105,14 +105,14 @@ lapack_int LAPACKE_stprfb( int matrix_layout, char side, char trans, char direct
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_stprfb_work( matrix_layout, side, trans, direct, storev, m, n,
+    info = API_SUFFIX(LAPACKE_stprfb_work)( matrix_layout, side, trans, direct, storev, m, n,
                                 k, l, v, ldv, t, ldt, a, lda, b, ldb, work,
                                 ldwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_stprfb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stprfb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stprfb_work.c b/LAPACKE/src/lapacke_stprfb_work.c
index 06f9faa7c1..cfa0dc6f7a 100644
--- a/LAPACKE/src/lapacke_stprfb_work.c
+++ b/LAPACKE/src/lapacke_stprfb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stprfb_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_stprfb_work)( int matrix_layout, char side, char trans,
                                 char direct, char storev, lapack_int m,
                                 lapack_int n, lapack_int k, lapack_int l,
                                 const float* v, lapack_int ldv, const float* t,
@@ -60,22 +60,22 @@ lapack_int LAPACKE_stprfb_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_stprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stprfb_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_stprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stprfb_work", info );
             return info;
         }
         if( ldt < k ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_stprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stprfb_work", info );
             return info;
         }
         if( ldv < k ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_stprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stprfb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -100,18 +100,18 @@ lapack_int LAPACKE_stprfb_work( int matrix_layout, char side, char trans,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
-        LAPACKE_sge_trans( matrix_layout, ldt, k, t, ldt, t_t, ldt_t );
-        LAPACKE_sge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, ldt, k, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, k, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stprfb( &side, &trans, &direct, &storev, &m, &n, &k, &l, v_t,
                        &ldv_t, t_t, &ldt_t, a_t, &lda_t, b_t, &ldb_t, work,
                        &ldwork );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, k, m, a_t, lda_t, a, lda );
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, k, m, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_3:
@@ -122,11 +122,11 @@ lapack_int LAPACKE_stprfb_work( int matrix_layout, char side, char trans,
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stprfb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stprfb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stprfb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stprfs.c b/LAPACKE/src/lapacke_stprfs.c
index 10f80b08bd..113f2e7cb8 100644
--- a/LAPACKE/src/lapacke_stprfs.c
+++ b/LAPACKE/src/lapacke_stprfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stprfs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_stprfs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int nrhs, const float* ap,
                            const float* b, lapack_int ldb, const float* x,
                            lapack_int ldx, float* ferr, float* berr )
@@ -41,19 +41,19 @@ lapack_int LAPACKE_stprfs( int matrix_layout, char uplo, char trans, char diag,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stprfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stprfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_stp_nancheck( matrix_layout, uplo, diag, n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_stp_nancheck)( matrix_layout, uplo, diag, n, ap ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -10;
         }
     }
@@ -70,7 +70,7 @@ lapack_int LAPACKE_stprfs( int matrix_layout, char uplo, char trans, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_stprfs_work( matrix_layout, uplo, trans, diag, n, nrhs, ap, b,
+    info = API_SUFFIX(LAPACKE_stprfs_work)( matrix_layout, uplo, trans, diag, n, nrhs, ap, b,
                                 ldb, x, ldx, ferr, berr, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -78,7 +78,7 @@ lapack_int LAPACKE_stprfs( int matrix_layout, char uplo, char trans, char diag,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_stprfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stprfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stprfs_work.c b/LAPACKE/src/lapacke_stprfs_work.c
index fa8bb72b74..1977bfe193 100644
--- a/LAPACKE/src/lapacke_stprfs_work.c
+++ b/LAPACKE/src/lapacke_stprfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stprfs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_stprfs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int nrhs,
                                 const float* ap, const float* b, lapack_int ldb,
                                 const float* x, lapack_int ldx, float* ferr,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_stprfs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_stprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stprfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_stprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stprfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -81,9 +81,9 @@ lapack_int LAPACKE_stprfs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
-        LAPACKE_stp_trans( matrix_layout, uplo, diag, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_stp_trans)( matrix_layout, uplo, diag, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stprfs( &uplo, &trans, &diag, &n, &nrhs, ap_t, b_t, &ldb_t, x_t,
                        &ldx_t, ferr, berr, work, iwork, &info );
@@ -98,11 +98,11 @@ lapack_int LAPACKE_stprfs_work( int matrix_layout, char uplo, char trans,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stprfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stprfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stprfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stptri.c b/LAPACKE/src/lapacke_stptri.c
index 052da0ec81..971705c141 100644
--- a/LAPACKE/src/lapacke_stptri.c
+++ b/LAPACKE/src/lapacke_stptri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stptri( int matrix_layout, char uplo, char diag, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_stptri)( int matrix_layout, char uplo, char diag, lapack_int n,
                            float* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stptri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stptri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_stp_nancheck( matrix_layout, uplo, diag, n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_stp_nancheck)( matrix_layout, uplo, diag, n, ap ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_stptri_work( matrix_layout, uplo, diag, n, ap );
+    return API_SUFFIX(LAPACKE_stptri_work)( matrix_layout, uplo, diag, n, ap );
 }
diff --git a/LAPACKE/src/lapacke_stptri_work.c b/LAPACKE/src/lapacke_stptri_work.c
index 6d2e43d003..a6916b5cf2 100644
--- a/LAPACKE/src/lapacke_stptri_work.c
+++ b/LAPACKE/src/lapacke_stptri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stptri_work( int matrix_layout, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_stptri_work)( int matrix_layout, char uplo, char diag,
                                 lapack_int n, float* ap )
 {
     lapack_int info = 0;
@@ -52,23 +52,23 @@ lapack_int LAPACKE_stptri_work( int matrix_layout, char uplo, char diag,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_stp_trans( matrix_layout, uplo, diag, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_stp_trans)( matrix_layout, uplo, diag, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stptri( &uplo, &diag, &n, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_stp_trans( LAPACK_COL_MAJOR, uplo, diag, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_stp_trans)( LAPACK_COL_MAJOR, uplo, diag, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stptri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stptri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stptri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stptri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stptrs.c b/LAPACKE/src/lapacke_stptrs.c
index 98a7e825b3..d9e8af855d 100644
--- a/LAPACKE/src/lapacke_stptrs.c
+++ b/LAPACKE/src/lapacke_stptrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stptrs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_stptrs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int nrhs, const float* ap,
                            float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stptrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stptrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_stp_nancheck( matrix_layout, uplo, diag, n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_stp_nancheck)( matrix_layout, uplo, diag, n, ap ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_stptrs_work( matrix_layout, uplo, trans, diag, n, nrhs, ap, b,
+    return API_SUFFIX(LAPACKE_stptrs_work)( matrix_layout, uplo, trans, diag, n, nrhs, ap, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_stptrs_work.c b/LAPACKE/src/lapacke_stptrs_work.c
index 46d74aa849..83b1ca141e 100644
--- a/LAPACKE/src/lapacke_stptrs_work.c
+++ b/LAPACKE/src/lapacke_stptrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stptrs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_stptrs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int nrhs,
                                 const float* ap, float* b, lapack_int ldb )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_stptrs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_stptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stptrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,8 +66,8 @@ lapack_int LAPACKE_stptrs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_stp_trans( matrix_layout, uplo, diag, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_stp_trans)( matrix_layout, uplo, diag, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stptrs( &uplo, &trans, &diag, &n, &nrhs, ap_t, b_t, &ldb_t,
                        &info );
@@ -75,18 +75,18 @@ lapack_int LAPACKE_stptrs_work( int matrix_layout, char uplo, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stptrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stptrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stptrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stpttf.c b/LAPACKE/src/lapacke_stpttf.c
index dd3ecc8828..cc40dfa61a 100644
--- a/LAPACKE/src/lapacke_stpttf.c
+++ b/LAPACKE/src/lapacke_stpttf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stpttf( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_stpttf)( int matrix_layout, char transr, char uplo,
                            lapack_int n, const float* ap, float* arf )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stpttf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpttf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_spp_nancheck)( n, ap ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_stpttf_work( matrix_layout, transr, uplo, n, ap, arf );
+    return API_SUFFIX(LAPACKE_stpttf_work)( matrix_layout, transr, uplo, n, ap, arf );
 }
diff --git a/LAPACKE/src/lapacke_stpttf_work.c b/LAPACKE/src/lapacke_stpttf_work.c
index d534e65e58..d1d5e23773 100644
--- a/LAPACKE/src/lapacke_stpttf_work.c
+++ b/LAPACKE/src/lapacke_stpttf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stpttf_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_stpttf_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, const float* ap, float* arf )
 {
     lapack_int info = 0;
@@ -59,25 +59,25 @@ lapack_int LAPACKE_stpttf_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_spp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_spp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stpttf( &transr, &uplo, &n, ap_t, arf_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_spf_trans( LAPACK_COL_MAJOR, transr, uplo, n, arf_t, arf );
+        API_SUFFIX(LAPACKE_spf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, arf_t, arf );
         /* Release memory and exit */
         LAPACKE_free( arf_t );
 exit_level_1:
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stpttf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpttf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stpttf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpttf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stpttr.c b/LAPACKE/src/lapacke_stpttr.c
index f65504442b..093d4ba2eb 100644
--- a/LAPACKE/src/lapacke_stpttr.c
+++ b/LAPACKE/src/lapacke_stpttr.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stpttr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_stpttr)( int matrix_layout, char uplo, lapack_int n,
                            const float* ap, float* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stpttr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpttr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_spp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_spp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_stpttr_work( matrix_layout, uplo, n, ap, a, lda );
+    return API_SUFFIX(LAPACKE_stpttr_work)( matrix_layout, uplo, n, ap, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_stpttr_work.c b/LAPACKE/src/lapacke_stpttr_work.c
index 0604a21bd2..af61aa31a2 100644
--- a/LAPACKE/src/lapacke_stpttr_work.c
+++ b/LAPACKE/src/lapacke_stpttr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stpttr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_stpttr_work)( int matrix_layout, char uplo, lapack_int n,
                                 const float* ap, float* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -49,7 +49,7 @@ lapack_int LAPACKE_stpttr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_stpttr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpttr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -65,25 +65,25 @@ lapack_int LAPACKE_stpttr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_spp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_spp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stpttr( &uplo, &n, ap_t, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stpttr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpttr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stpttr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpttr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_strcon.c b/LAPACKE/src/lapacke_strcon.c
index a64ae67615..1f0788b2cb 100644
--- a/LAPACKE/src/lapacke_strcon.c
+++ b/LAPACKE/src/lapacke_strcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strcon( int matrix_layout, char norm, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_strcon)( int matrix_layout, char norm, char uplo, char diag,
                            lapack_int n, const float* a, lapack_int lda,
                            float* rcond )
 {
@@ -40,13 +40,13 @@ lapack_int LAPACKE_strcon( int matrix_layout, char norm, char uplo, char diag,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_strcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_str_nancheck( matrix_layout, uplo, diag, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_str_nancheck)( matrix_layout, uplo, diag, n, a, lda ) ) {
             return -6;
         }
     }
@@ -63,7 +63,7 @@ lapack_int LAPACKE_strcon( int matrix_layout, char norm, char uplo, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_strcon_work( matrix_layout, norm, uplo, diag, n, a, lda,
+    info = API_SUFFIX(LAPACKE_strcon_work)( matrix_layout, norm, uplo, diag, n, a, lda,
                                 rcond, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -71,7 +71,7 @@ lapack_int LAPACKE_strcon( int matrix_layout, char norm, char uplo, char diag,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_strcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_strcon_work.c b/LAPACKE/src/lapacke_strcon_work.c
index 6b0c779b21..398211e601 100644
--- a/LAPACKE/src/lapacke_strcon_work.c
+++ b/LAPACKE/src/lapacke_strcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strcon_work( int matrix_layout, char norm, char uplo,
+lapack_int API_SUFFIX(LAPACKE_strcon_work)( int matrix_layout, char norm, char uplo,
                                 char diag, lapack_int n, const float* a,
                                 lapack_int lda, float* rcond, float* work,
                                 lapack_int* iwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_strcon_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_strcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strcon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_strcon_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_str_trans( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_str_trans)( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_strcon( &norm, &uplo, &diag, &n, a_t, &lda_t, rcond, work, iwork,
                        &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_strcon_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_strcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_strcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_strevc.c b/LAPACKE/src/lapacke_strevc.c
index 4e9db85409..dd6ee6cab8 100644
--- a/LAPACKE/src/lapacke_strevc.c
+++ b/LAPACKE/src/lapacke_strevc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strevc( int matrix_layout, char side, char howmny,
+lapack_int API_SUFFIX(LAPACKE_strevc)( int matrix_layout, char side, char howmny,
                            lapack_logical* select, lapack_int n, const float* t,
                            lapack_int ldt, float* vl, lapack_int ldvl,
                            float* vr, lapack_int ldvr, lapack_int mm,
@@ -41,22 +41,22 @@ lapack_int LAPACKE_strevc( int matrix_layout, char side, char howmny,
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_strevc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strevc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -10;
             }
         }
@@ -69,13 +69,13 @@ lapack_int LAPACKE_strevc( int matrix_layout, char side, char howmny,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_strevc_work( matrix_layout, side, howmny, select, n, t, ldt,
+    info = API_SUFFIX(LAPACKE_strevc_work)( matrix_layout, side, howmny, select, n, t, ldt,
                                 vl, ldvl, vr, ldvr, mm, m, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_strevc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strevc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_strevc_work.c b/LAPACKE/src/lapacke_strevc_work.c
index e98496f874..a811b69ec5 100644
--- a/LAPACKE/src/lapacke_strevc_work.c
+++ b/LAPACKE/src/lapacke_strevc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strevc_work( int matrix_layout, char side, char howmny,
+lapack_int API_SUFFIX(LAPACKE_strevc_work)( int matrix_layout, char side, char howmny,
                                 lapack_logical* select, lapack_int n,
                                 const float* t, lapack_int ldt, float* vl,
                                 lapack_int ldvl, float* vr, lapack_int ldvr,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_strevc_work( int matrix_layout, char side, char howmny,
         /* Check leading dimension(s) */
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_strevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strevc_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_strevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strevc_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_strevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strevc_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,14 +75,14 @@ lapack_int LAPACKE_strevc_work( int matrix_layout, char side, char howmny,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             vl_t = (float*)LAPACKE_malloc( sizeof(float) * ldvl_t * MAX(1,mm) );
             if( vl_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
             vr_t = (float*)LAPACKE_malloc( sizeof(float) * ldvr_t * MAX(1,mm) );
             if( vr_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -90,14 +90,14 @@ lapack_int LAPACKE_strevc_work( int matrix_layout, char side, char howmny,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( ( LAPACKE_lsame( side, 'l' ) || LAPACKE_lsame( side, 'b' ) ) &&
-            LAPACKE_lsame( howmny, 'b' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) || API_SUFFIX(LAPACKE_lsame)( side, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( howmny, 'b' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( ( LAPACKE_lsame( side, 'r' ) || LAPACKE_lsame( side, 'b' ) ) &&
-            LAPACKE_lsame( howmny, 'b' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) || API_SUFFIX(LAPACKE_lsame)( side, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( howmny, 'b' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_strevc( &side, &howmny, select, &n, t_t, &ldt_t, vl_t, &ldvl_t,
@@ -106,31 +106,31 @@ lapack_int LAPACKE_strevc_work( int matrix_layout, char side, char howmny,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
                                ldvl );
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
                                ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( t_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_strevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strevc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_strevc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strevc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_strexc.c b/LAPACKE/src/lapacke_strexc.c
index 62e285e265..7aa84ad228 100644
--- a/LAPACKE/src/lapacke_strexc.c
+++ b/LAPACKE/src/lapacke_strexc.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strexc( int matrix_layout, char compq, lapack_int n, float* t,
+lapack_int API_SUFFIX(LAPACKE_strexc)( int matrix_layout, char compq, lapack_int n, float* t,
                            lapack_int ldt, float* q, lapack_int ldq,
                            lapack_int* ifst, lapack_int* ilst )
 {
     lapack_int info = 0;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_strexc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strexc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -6;
             }
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -4;
         }
     }
@@ -62,13 +62,13 @@ lapack_int LAPACKE_strexc( int matrix_layout, char compq, lapack_int n, float* t
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_strexc_work( matrix_layout, compq, n, t, ldt, q, ldq, ifst,
+    info = API_SUFFIX(LAPACKE_strexc_work)( matrix_layout, compq, n, t, ldt, q, ldq, ifst,
                                 ilst, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_strexc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strexc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_strexc_work.c b/LAPACKE/src/lapacke_strexc_work.c
index cbbed9d8ba..02022e18cc 100644
--- a/LAPACKE/src/lapacke_strexc_work.c
+++ b/LAPACKE/src/lapacke_strexc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strexc_work( int matrix_layout, char compq, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_strexc_work)( int matrix_layout, char compq, lapack_int n,
                                 float* t, lapack_int ldt, float* q,
                                 lapack_int ldq, lapack_int* ifst,
                                 lapack_int* ilst, float* work )
@@ -50,14 +50,14 @@ lapack_int LAPACKE_strexc_work( int matrix_layout, char compq, lapack_int n,
         float* t_t = NULL;
         float* q_t = NULL;
         /* Check leading dimension(s) */
-        if( ldq < n && LAPACKE_lsame( compq, 'v' ) ) {
+        if( ldq < n && API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_strexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strexc_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_strexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strexc_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,7 +66,7 @@ lapack_int LAPACKE_strexc_work( int matrix_layout, char compq, lapack_int n,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             q_t = (float*)LAPACKE_malloc( sizeof(float) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -74,9 +74,9 @@ lapack_int LAPACKE_strexc_work( int matrix_layout, char compq, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_strexc( &compq, &n, t_t, &ldt_t, q_t, &ldq_t, ifst, ilst, work,
@@ -85,23 +85,23 @@ lapack_int LAPACKE_strexc_work( int matrix_layout, char compq, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( t_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_strexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strexc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_strexc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strexc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_strrfs.c b/LAPACKE/src/lapacke_strrfs.c
index 3370c20b3f..1d4fceb648 100644
--- a/LAPACKE/src/lapacke_strrfs.c
+++ b/LAPACKE/src/lapacke_strrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strrfs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_strrfs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int nrhs, const float* a,
                            lapack_int lda, const float* b, lapack_int ldb,
                            const float* x, lapack_int ldx, float* ferr,
@@ -42,19 +42,19 @@ lapack_int LAPACKE_strrfs( int matrix_layout, char uplo, char trans, char diag,
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_strrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_str_nancheck( matrix_layout, uplo, diag, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_str_nancheck)( matrix_layout, uplo, diag, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -11;
         }
     }
@@ -71,7 +71,7 @@ lapack_int LAPACKE_strrfs( int matrix_layout, char uplo, char trans, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_strrfs_work( matrix_layout, uplo, trans, diag, n, nrhs, a,
+    info = API_SUFFIX(LAPACKE_strrfs_work)( matrix_layout, uplo, trans, diag, n, nrhs, a,
                                 lda, b, ldb, x, ldx, ferr, berr, work, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -79,7 +79,7 @@ lapack_int LAPACKE_strrfs( int matrix_layout, char uplo, char trans, char diag,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_strrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_strrfs_work.c b/LAPACKE/src/lapacke_strrfs_work.c
index 59305a96d5..2291334e09 100644
--- a/LAPACKE/src/lapacke_strrfs_work.c
+++ b/LAPACKE/src/lapacke_strrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strrfs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_strrfs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int nrhs,
                                 const float* a, lapack_int lda, const float* b,
                                 lapack_int ldb, const float* x, lapack_int ldx,
@@ -57,17 +57,17 @@ lapack_int LAPACKE_strrfs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_strrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_strrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_strrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -87,9 +87,9 @@ lapack_int LAPACKE_strrfs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_str_trans( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_str_trans)( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_strrfs( &uplo, &trans, &diag, &n, &nrhs, a_t, &lda_t, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, iwork, &info );
@@ -104,11 +104,11 @@ lapack_int LAPACKE_strrfs_work( int matrix_layout, char uplo, char trans,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_strrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_strrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_strsen.c b/LAPACKE/src/lapacke_strsen.c
index c9a5b845cc..3813e3b281 100644
--- a/LAPACKE/src/lapacke_strsen.c
+++ b/LAPACKE/src/lapacke_strsen.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strsen( int matrix_layout, char job, char compq,
+lapack_int API_SUFFIX(LAPACKE_strsen)( int matrix_layout, char job, char compq,
                            const lapack_logical* select, lapack_int n, float* t,
                            lapack_int ldt, float* q, lapack_int ldq, float* wr,
                            float* wi, lapack_int* m, float* s, float* sep )
@@ -45,24 +45,24 @@ lapack_int LAPACKE_strsen( int matrix_layout, char job, char compq,
     lapack_int iwork_query;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_strsen", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsen", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_strsen_work( matrix_layout, job, compq, select, n, t, ldt, q,
+    info = API_SUFFIX(LAPACKE_strsen_work)( matrix_layout, job, compq, select, n, t, ldt, q,
                                 ldq, wr, wi, m, s, sep, &work_query, lwork,
                                 &iwork_query, liwork );
     if( info != 0 ) {
@@ -71,12 +71,18 @@ lapack_int LAPACKE_strsen( int matrix_layout, char job, char compq,
     liwork = iwork_query;
     lwork = (lapack_int)work_query;
     /* Allocate memory for work arrays */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
         if( iwork == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
             goto exit_level_0;
         }
+    } else {
+        iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) );
+        if( iwork == NULL ) {
+            info = LAPACK_WORK_MEMORY_ERROR;
+            goto exit_level_0;
+        }
     }
     work = (float*)LAPACKE_malloc( sizeof(float) * lwork );
     if( work == NULL ) {
@@ -84,18 +90,18 @@ lapack_int LAPACKE_strsen( int matrix_layout, char job, char compq,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_strsen_work( matrix_layout, job, compq, select, n, t, ldt, q,
+    info = API_SUFFIX(LAPACKE_strsen_work)( matrix_layout, job, compq, select, n, t, ldt, q,
                                 ldq, wr, wi, m, s, sep, work, lwork, iwork,
                                 liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_1:
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( iwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_strsen", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsen", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_strsen_work.c b/LAPACKE/src/lapacke_strsen_work.c
index 6e0a48346c..92b11911c1 100644
--- a/LAPACKE/src/lapacke_strsen_work.c
+++ b/LAPACKE/src/lapacke_strsen_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strsen_work( int matrix_layout, char job, char compq,
+lapack_int API_SUFFIX(LAPACKE_strsen_work)( int matrix_layout, char job, char compq,
                                 const lapack_logical* select, lapack_int n,
                                 float* t, lapack_int ldt, float* q,
                                 lapack_int ldq, float* wr, float* wi,
@@ -56,12 +56,12 @@ lapack_int LAPACKE_strsen_work( int matrix_layout, char job, char compq,
         /* Check leading dimension(s) */
         if( ldq < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_strsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsen_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_strsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsen_work", info );
             return info;
         }
         /* Allocate memory for temporary array T */
@@ -71,7 +71,7 @@ lapack_int LAPACKE_strsen_work( int matrix_layout, char job, char compq,
             goto exit_level_0;
         }
         /* Transpose input matrix T */
-        LAPACKE_sge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
         /* Query optimal working array(s) size if requested */
         if( liwork == -1 || lwork == -1 ) {
             LAPACK_strsen( &job, &compq, select, &n, t_t, &ldt_t, q, &ldq_t, wr,
@@ -80,7 +80,7 @@ lapack_int LAPACKE_strsen_work( int matrix_layout, char job, char compq,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             q_t = (float*)LAPACKE_malloc( sizeof(float) * ldq_t * MAX(1,n) );
             if( q_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -88,8 +88,8 @@ lapack_int LAPACKE_strsen_work( int matrix_layout, char job, char compq,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_strsen( &job, &compq, select, &n, t_t, &ldt_t, q_t, &ldq_t, wr,
@@ -98,23 +98,23 @@ lapack_int LAPACKE_strsen_work( int matrix_layout, char job, char compq,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( t_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_strsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsen_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_strsen_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsen_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_strsna.c b/LAPACKE/src/lapacke_strsna.c
index 463a598d4b..4fe59d2db4 100644
--- a/LAPACKE/src/lapacke_strsna.c
+++ b/LAPACKE/src/lapacke_strsna.c
@@ -32,40 +32,40 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strsna( int matrix_layout, char job, char howmny,
+lapack_int API_SUFFIX(LAPACKE_strsna)( int matrix_layout, char job, char howmny,
                            const lapack_logical* select, lapack_int n,
                            const float* t, lapack_int ldt, const float* vl,
                            lapack_int ldvl, const float* vr, lapack_int ldvr,
                            float* s, float* sep, lapack_int mm, lapack_int* m )
 {
     lapack_int info = 0;
-    lapack_int ldwork =  LAPACKE_lsame( job, 'e' ) ? 1 : MAX(1,n) ;
+    lapack_int ldwork =  API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ? 1 : MAX(1,n) ;
     lapack_int* iwork = NULL;
     float* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_strsna", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsna", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            if( LAPACKE_sge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -10;
             }
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         iwork = (lapack_int*)
             LAPACKE_malloc( sizeof(lapack_int) * MAX(1,2*(n-1)) );
         if( iwork == NULL ) {
@@ -73,7 +73,7 @@ lapack_int LAPACKE_strsna( int matrix_layout, char job, char howmny,
             goto exit_level_0;
         }
     }
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         work = (float*)LAPACKE_malloc( sizeof(float) * ldwork * MAX(1,n+6) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -81,20 +81,20 @@ lapack_int LAPACKE_strsna( int matrix_layout, char job, char howmny,
         }
     }
     /* Call middle-level interface */
-    info = LAPACKE_strsna_work( matrix_layout, job, howmny, select, n, t, ldt,
+    info = API_SUFFIX(LAPACKE_strsna_work)( matrix_layout, job, howmny, select, n, t, ldt,
                                 vl, ldvl, vr, ldvr, s, sep, mm, m, work, ldwork,
                                 iwork );
     /* Release memory and exit */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( work );
     }
 exit_level_1:
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( iwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_strsna", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsna", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_strsna_work.c b/LAPACKE/src/lapacke_strsna_work.c
index 02c439405f..93a2605d4d 100644
--- a/LAPACKE/src/lapacke_strsna_work.c
+++ b/LAPACKE/src/lapacke_strsna_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strsna_work( int matrix_layout, char job, char howmny,
+lapack_int API_SUFFIX(LAPACKE_strsna_work)( int matrix_layout, char job, char howmny,
                                 const lapack_logical* select, lapack_int n,
                                 const float* t, lapack_int ldt, const float* vl,
                                 lapack_int ldvl, const float* vr,
@@ -58,17 +58,17 @@ lapack_int LAPACKE_strsna_work( int matrix_layout, char job, char howmny,
         /* Check leading dimension(s) */
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_strsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsna_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_strsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsna_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_strsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsna_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -77,14 +77,14 @@ lapack_int LAPACKE_strsna_work( int matrix_layout, char job, char howmny,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             vl_t = (float*)LAPACKE_malloc( sizeof(float) * ldvl_t * MAX(1,mm) );
             if( vl_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             vr_t = (float*)LAPACKE_malloc( sizeof(float) * ldvr_t * MAX(1,mm) );
             if( vr_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -92,12 +92,12 @@ lapack_int LAPACKE_strsna_work( int matrix_layout, char job, char howmny,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            LAPACKE_sge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_strsna( &job, &howmny, select, &n, t_t, &ldt_t, vl_t, &ldvl_t,
@@ -107,22 +107,22 @@ lapack_int LAPACKE_strsna_work( int matrix_layout, char job, char howmny,
             info = info - 1;
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( t_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_strsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsna_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_strsna_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsna_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_strsyl.c b/LAPACKE/src/lapacke_strsyl.c
index 8bc1ea44f3..a10c2116d5 100644
--- a/LAPACKE/src/lapacke_strsyl.c
+++ b/LAPACKE/src/lapacke_strsyl.c
@@ -32,30 +32,30 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strsyl( int matrix_layout, char trana, char tranb,
+lapack_int API_SUFFIX(LAPACKE_strsyl)( int matrix_layout, char trana, char tranb,
                            lapack_int isgn, lapack_int m, lapack_int n,
                            const float* a, lapack_int lda, const float* b,
                            lapack_int ldb, float* c, lapack_int ldc,
                            float* scale )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_strsyl", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsyl", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, m, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -11;
         }
     }
 #endif
-    return LAPACKE_strsyl_work( matrix_layout, trana, tranb, isgn, m, n, a, lda,
+    return API_SUFFIX(LAPACKE_strsyl_work)( matrix_layout, trana, tranb, isgn, m, n, a, lda,
                                 b, ldb, c, ldc, scale );
 }
diff --git a/LAPACKE/src/lapacke_strsyl3.c b/LAPACKE/src/lapacke_strsyl3.c
new file mode 100644
index 0000000000..620c1a74d0
--- /dev/null
+++ b/LAPACKE/src/lapacke_strsyl3.c
@@ -0,0 +1,68 @@
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_strsyl3)( int matrix_layout, char trana, char tranb,
+                            lapack_int isgn, lapack_int m, lapack_int n,
+                            const float* a, lapack_int lda, const float* b,
+                            lapack_int ldb, float* c, lapack_int ldc,
+                            float* scale )
+{
+    lapack_int info = 0;
+    float swork_query[2];
+    float* swork = NULL;
+    lapack_int ldswork = -1;
+    lapack_int swork_size = -1;
+    lapack_int iwork_query;
+    lapack_int* iwork = NULL;
+    lapack_int liwork = -1;
+    if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsyl3", -1 );
+        return -1;
+    }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+    if( LAPACKE_get_nancheck() ) {
+        /* Optionally check input matrices for NaNs */
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, m, a, lda ) ) {
+            return -7;
+        }
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
+            return -9;
+        }
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
+            return -11;
+        }
+    }
+#endif
+    /* Query optimal working array sizes */
+    info = API_SUFFIX(LAPACKE_strsyl3_work)( matrix_layout, trana, tranb, isgn, m, n, a, lda,
+                                 b, ldb, c, ldc, scale, &iwork_query, liwork,
+                                 swork_query, ldswork );
+    if( info != 0 ) {
+        goto exit_level_0;
+    }
+    ldswork = swork_query[0];
+    swork_size = ldswork * swork_query[1];
+    swork = (float*)LAPACKE_malloc( sizeof(float) * swork_size);
+    if( swork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
+    }
+    liwork = iwork_query;
+    iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
+    if ( iwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_1;
+    }
+    /* Call middle-level interface */
+    info = API_SUFFIX(LAPACKE_strsyl3_work)( matrix_layout, trana, tranb, isgn, m, n, a,
+                                 lda, b, ldb, c, ldc, scale, iwork, liwork,
+                                 swork, ldswork );
+    /* Release memory and exit */
+    LAPACKE_free( iwork );
+exit_level_1:
+    LAPACKE_free( swork );
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsyl3", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_strsyl3_work.c b/LAPACKE/src/lapacke_strsyl3_work.c
new file mode 100644
index 0000000000..a647a8747c
--- /dev/null
+++ b/LAPACKE/src/lapacke_strsyl3_work.c
@@ -0,0 +1,86 @@
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_strsyl3_work)( int matrix_layout, char trana, char tranb,
+                                 lapack_int isgn, lapack_int m, lapack_int n,
+                                 const float* a, lapack_int lda,
+                                 const float* b, lapack_int ldb, float* c,
+                                 lapack_int ldc, float* scale,
+                                 lapack_int* iwork, lapack_int liwork,
+                                 float* swork, lapack_int ldswork )
+{
+    lapack_int info = 0;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        LAPACK_strsyl3( &trana, &tranb, &isgn, &m, &n, a, &lda, b, &ldb, c, &ldc,
+                        scale, iwork, &liwork, swork, &ldswork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        lapack_int lda_t = MAX(1,m);
+        lapack_int ldb_t = MAX(1,n);
+        lapack_int ldc_t = MAX(1,m);
+        float* a_t = NULL;
+        float* b_t = NULL;
+        float* c_t = NULL;
+        /* Check leading dimension(s) */
+        if( lda < m ) {
+            info = -8;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsyl3_work", info );
+            return info;
+        }
+        if( ldb < n ) {
+            info = -10;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsyl3_work", info );
+            return info;
+        }
+        if( ldc < n ) {
+            info = -12;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsyl3_work", info );
+            return info;
+        }
+        /* Allocate memory for temporary array(s) */
+        a_t = (float*)LAPACKE_malloc( sizeof(float) * lda_t * MAX(1,m) );
+        if( a_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+        b_t = (float*)LAPACKE_malloc( sizeof(float) * ldb_t * MAX(1,n) );
+        if( b_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_1;
+        }
+        c_t = (float*)LAPACKE_malloc( sizeof(float) * ldc_t * MAX(1,n) );
+        if( c_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_2;
+        }
+        /* Transpose input matrices */
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        /* Call LAPACK function and adjust info */
+        LAPACK_strsyl3( &trana, &tranb, &isgn, &m, &n, a_t, &lda_t, b_t, &ldb_t,
+                        c_t, &ldc_t, scale, iwork, &liwork, swork, &ldswork,
+                        &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+        /* Transpose output matrices */
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        /* Release memory and exit */
+        LAPACKE_free( c_t );
+exit_level_2:
+        LAPACKE_free( b_t );
+exit_level_1:
+        LAPACKE_free( a_t );
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsyl3_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsyl3_work", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_strsyl_work.c b/LAPACKE/src/lapacke_strsyl_work.c
index 5f545df373..50c2cc9c0c 100644
--- a/LAPACKE/src/lapacke_strsyl_work.c
+++ b/LAPACKE/src/lapacke_strsyl_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strsyl_work( int matrix_layout, char trana, char tranb,
+lapack_int API_SUFFIX(LAPACKE_strsyl_work)( int matrix_layout, char trana, char tranb,
                                 lapack_int isgn, lapack_int m, lapack_int n,
                                 const float* a, lapack_int lda, const float* b,
                                 lapack_int ldb, float* c, lapack_int ldc,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_strsyl_work( int matrix_layout, char trana, char tranb,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_strsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsyl_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_strsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsyl_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_strsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsyl_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -86,9 +86,9 @@ lapack_int LAPACKE_strsyl_work( int matrix_layout, char trana, char tranb,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, m, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-        LAPACKE_sge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_strsyl( &trana, &tranb, &isgn, &m, &n, a_t, &lda_t, b_t, &ldb_t,
                        c_t, &ldc_t, scale, &info );
@@ -96,7 +96,7 @@ lapack_int LAPACKE_strsyl_work( int matrix_layout, char trana, char tranb,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_2:
@@ -105,11 +105,11 @@ lapack_int LAPACKE_strsyl_work( int matrix_layout, char trana, char tranb,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_strsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsyl_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_strsyl_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strsyl_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_strtri.c b/LAPACKE/src/lapacke_strtri.c
index 4502bb515a..76bec882bc 100644
--- a/LAPACKE/src/lapacke_strtri.c
+++ b/LAPACKE/src/lapacke_strtri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strtri( int matrix_layout, char uplo, char diag, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_strtri)( int matrix_layout, char uplo, char diag, lapack_int n,
                            float* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_strtri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strtri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_str_nancheck( matrix_layout, uplo, diag, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_str_nancheck)( matrix_layout, uplo, diag, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_strtri_work( matrix_layout, uplo, diag, n, a, lda );
+    return API_SUFFIX(LAPACKE_strtri_work)( matrix_layout, uplo, diag, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_strtri_work.c b/LAPACKE/src/lapacke_strtri_work.c
index 237bf2101f..663e1bceac 100644
--- a/LAPACKE/src/lapacke_strtri_work.c
+++ b/LAPACKE/src/lapacke_strtri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strtri_work( int matrix_layout, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_strtri_work)( int matrix_layout, char uplo, char diag,
                                 lapack_int n, float* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_strtri_work( int matrix_layout, char uplo, char diag,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_strtri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strtri_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,24 +58,24 @@ lapack_int LAPACKE_strtri_work( int matrix_layout, char uplo, char diag,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_str_trans( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_str_trans)( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_strtri( &uplo, &diag, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_str_trans( LAPACK_COL_MAJOR, uplo, diag, n, a_t, lda_t, a,
+        API_SUFFIX(LAPACKE_str_trans)( LAPACK_COL_MAJOR, uplo, diag, n, a_t, lda_t, a,
                            lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_strtri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strtri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_strtri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strtri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_strtrs.c b/LAPACKE/src/lapacke_strtrs.c
index eeb1e3fb17..a25e8b4e0a 100644
--- a/LAPACKE/src/lapacke_strtrs.c
+++ b/LAPACKE/src/lapacke_strtrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strtrs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_strtrs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int nrhs, const float* a,
                            lapack_int lda, float* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_strtrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strtrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_str_nancheck( matrix_layout, uplo, diag, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_str_nancheck)( matrix_layout, uplo, diag, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_sge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_strtrs_work( matrix_layout, uplo, trans, diag, n, nrhs, a,
+    return API_SUFFIX(LAPACKE_strtrs_work)( matrix_layout, uplo, trans, diag, n, nrhs, a,
                                 lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_strtrs_work.c b/LAPACKE/src/lapacke_strtrs_work.c
index fc02026c09..180ac7b7f7 100644
--- a/LAPACKE/src/lapacke_strtrs_work.c
+++ b/LAPACKE/src/lapacke_strtrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strtrs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_strtrs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int nrhs,
                                 const float* a, lapack_int lda, float* b,
                                 lapack_int ldb )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_strtrs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_strtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strtrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_strtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strtrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -73,8 +73,8 @@ lapack_int LAPACKE_strtrs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_str_trans( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
-        LAPACKE_sge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_str_trans)( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_strtrs( &uplo, &trans, &diag, &n, &nrhs, a_t, &lda_t, b_t,
                        &ldb_t, &info );
@@ -82,18 +82,18 @@ lapack_int LAPACKE_strtrs_work( int matrix_layout, char uplo, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_strtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strtrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_strtrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strtrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_strttf.c b/LAPACKE/src/lapacke_strttf.c
index 96b2d33855..8a0410ec00 100644
--- a/LAPACKE/src/lapacke_strttf.c
+++ b/LAPACKE/src/lapacke_strttf.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strttf( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_strttf)( int matrix_layout, char transr, char uplo,
                            lapack_int n, const float* a, lapack_int lda,
                            float* arf )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_strttf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strttf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_str_nancheck( matrix_layout, uplo, 'n', n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_str_nancheck)( matrix_layout, uplo, 'n', n, a, lda ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_strttf_work( matrix_layout, transr, uplo, n, a, lda, arf );
+    return API_SUFFIX(LAPACKE_strttf_work)( matrix_layout, transr, uplo, n, a, lda, arf );
 }
diff --git a/LAPACKE/src/lapacke_strttf_work.c b/LAPACKE/src/lapacke_strttf_work.c
index cc00af6fa9..cd810133ef 100644
--- a/LAPACKE/src/lapacke_strttf_work.c
+++ b/LAPACKE/src/lapacke_strttf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strttf_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_strttf_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, const float* a, lapack_int lda,
                                 float* arf )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_strttf_work( int matrix_layout, char transr, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_strttf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strttf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,25 +66,25 @@ lapack_int LAPACKE_strttf_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_strttf( &transr, &uplo, &n, a_t, &lda_t, arf_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_spf_trans( LAPACK_COL_MAJOR, transr, uplo, n, arf_t, arf );
+        API_SUFFIX(LAPACKE_spf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, arf_t, arf );
         /* Release memory and exit */
         LAPACKE_free( arf_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_strttf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strttf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_strttf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strttf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_strttp.c b/LAPACKE/src/lapacke_strttp.c
index 6b5e5f00c9..14e421a551 100644
--- a/LAPACKE/src/lapacke_strttp.c
+++ b/LAPACKE/src/lapacke_strttp.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strttp( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_strttp)( int matrix_layout, char uplo, lapack_int n,
                            const float* a, lapack_int lda, float* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_strttp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strttp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_str_nancheck( matrix_layout, uplo, 'n', n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_str_nancheck)( matrix_layout, uplo, 'n', n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_strttp_work( matrix_layout, uplo, n, a, lda, ap );
+    return API_SUFFIX(LAPACKE_strttp_work)( matrix_layout, uplo, n, a, lda, ap );
 }
diff --git a/LAPACKE/src/lapacke_strttp_work.c b/LAPACKE/src/lapacke_strttp_work.c
index ca62cbf801..cc14087bf5 100644
--- a/LAPACKE/src/lapacke_strttp_work.c
+++ b/LAPACKE/src/lapacke_strttp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_strttp_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_strttp_work)( int matrix_layout, char uplo, lapack_int n,
                                 const float* a, lapack_int lda, float* ap )
 {
     lapack_int info = 0;
@@ -49,7 +49,7 @@ lapack_int LAPACKE_strttp_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_strttp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strttp_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -65,25 +65,25 @@ lapack_int LAPACKE_strttp_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_strttp( &uplo, &n, a_t, &lda_t, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_spp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_spp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_strttp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strttp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_strttp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_strttp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stzrzf.c b/LAPACKE/src/lapacke_stzrzf.c
index b7fe7ce85e..2d74e5cab7 100644
--- a/LAPACKE/src/lapacke_stzrzf.c
+++ b/LAPACKE/src/lapacke_stzrzf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stzrzf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_stzrzf)( int matrix_layout, lapack_int m, lapack_int n,
                            float* a, lapack_int lda, float* tau )
 {
     lapack_int info = 0;
@@ -40,19 +40,19 @@ lapack_int LAPACKE_stzrzf( int matrix_layout, lapack_int m, lapack_int n,
     float* work = NULL;
     float work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_stzrzf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stzrzf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_stzrzf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_stzrzf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -65,12 +65,12 @@ lapack_int LAPACKE_stzrzf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_stzrzf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_stzrzf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_stzrzf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stzrzf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_stzrzf_work.c b/LAPACKE/src/lapacke_stzrzf_work.c
index bbe3cb6e82..5851305e0d 100644
--- a/LAPACKE/src/lapacke_stzrzf_work.c
+++ b/LAPACKE/src/lapacke_stzrzf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_stzrzf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_stzrzf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 float* a, lapack_int lda, float* tau,
                                 float* work, lapack_int lwork )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_stzrzf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_stzrzf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stzrzf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_stzrzf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_sge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_stzrzf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_stzrzf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stzrzf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_stzrzf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stzrzf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zbbcsd.c b/LAPACKE/src/lapacke_zbbcsd.c
index 6eda685f08..ea70e1473a 100644
--- a/LAPACKE/src/lapacke_zbbcsd.c
+++ b/LAPACKE/src/lapacke_zbbcsd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zbbcsd( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_zbbcsd)( int matrix_layout, char jobu1, char jobu2,
                            char jobv1t, char jobv2t, char trans, lapack_int m,
                            lapack_int p, lapack_int q, double* theta,
                            double* phi, lapack_complex_double* u1,
@@ -49,10 +49,10 @@ lapack_int LAPACKE_zbbcsd( int matrix_layout, char jobu1, char jobu2,
     double rwork_query;
     int lapack_layout;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zbbcsd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zbbcsd", -1 );
         return -1;
     }
-    if( LAPACKE_lsame( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+    if( API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
         lapack_layout = LAPACK_COL_MAJOR;
     } else {
         lapack_layout = LAPACK_ROW_MAJOR;
@@ -60,36 +60,36 @@ lapack_int LAPACKE_zbbcsd( int matrix_layout, char jobu1, char jobu2,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( q-1, phi, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( q-1, phi, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_d_nancheck( q, theta, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( q, theta, 1 ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( jobu1, 'y' ) ) {
-            if( LAPACKE_zge_nancheck( lapack_layout, p, p, u1, ldu1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( lapack_layout, p, p, u1, ldu1 ) ) {
                 return -12;
             }
         }
-        if( LAPACKE_lsame( jobu2, 'y' ) ) {
-            if( LAPACKE_zge_nancheck( lapack_layout, m-p, m-p, u2, ldu2 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( lapack_layout, m-p, m-p, u2, ldu2 ) ) {
                 return -14;
             }
         }
-        if( LAPACKE_lsame( jobv1t, 'y' ) ) {
-            if( LAPACKE_zge_nancheck( lapack_layout, q, q, v1t, ldv1t ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( lapack_layout, q, q, v1t, ldv1t ) ) {
                 return -16;
             }
         }
-        if( LAPACKE_lsame( jobv2t, 'y' ) ) {
-            if( LAPACKE_zge_nancheck( lapack_layout, m-q, m-q, v2t, ldv2t ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv2t, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( lapack_layout, m-q, m-q, v2t, ldv2t ) ) {
                 return -18;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zbbcsd_work( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
+    info = API_SUFFIX(LAPACKE_zbbcsd_work)( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
                                 trans, m, p, q, theta, phi, u1, ldu1, u2, ldu2,
                                 v1t, ldv1t, v2t, ldv2t, b11d, b11e, b12d, b12e,
                                 b21d, b21e, b22d, b22e, &rwork_query, lrwork );
@@ -104,7 +104,7 @@ lapack_int LAPACKE_zbbcsd( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zbbcsd_work( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
+    info = API_SUFFIX(LAPACKE_zbbcsd_work)( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
                                 trans, m, p, q, theta, phi, u1, ldu1, u2, ldu2,
                                 v1t, ldv1t, v2t, ldv2t, b11d, b11e, b12d, b12e,
                                 b21d, b21e, b22d, b22e, rwork, lrwork );
@@ -112,7 +112,7 @@ lapack_int LAPACKE_zbbcsd( int matrix_layout, char jobu1, char jobu2,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zbbcsd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zbbcsd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zbbcsd_work.c b/LAPACKE/src/lapacke_zbbcsd_work.c
index 05d405ed4f..01c363a241 100644
--- a/LAPACKE/src/lapacke_zbbcsd_work.c
+++ b/LAPACKE/src/lapacke_zbbcsd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zbbcsd_work( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_zbbcsd_work)( int matrix_layout, char jobu1, char jobu2,
                                 char jobv1t, char jobv2t, char trans,
                                 lapack_int m, lapack_int p, lapack_int q,
                                 double* theta, double* phi,
@@ -63,7 +63,7 @@ lapack_int LAPACKE_zbbcsd_work( int matrix_layout, char jobu1, char jobu2,
     if( matrix_layout == LAPACK_COL_MAJOR ||
         matrix_layout == LAPACK_ROW_MAJOR ) {
         char ltrans;
-        if( !LAPACKE_lsame( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+        if( !API_SUFFIX(LAPACKE_lsame)( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
             ltrans = 'n';
         } else {
             ltrans = 't';
@@ -78,7 +78,7 @@ lapack_int LAPACKE_zbbcsd_work( int matrix_layout, char jobu1, char jobu2,
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zbbcsd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zbbcsd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zbdsqr.c b/LAPACKE/src/lapacke_zbdsqr.c
index cc71ad977b..2b6783602d 100644
--- a/LAPACKE/src/lapacke_zbdsqr.c
+++ b/LAPACKE/src/lapacke_zbdsqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zbdsqr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zbdsqr)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int ncvt, lapack_int nru, lapack_int ncc,
                            double* d, double* e, lapack_complex_double* vt,
                            lapack_int ldvt, lapack_complex_double* u,
@@ -42,30 +42,30 @@ lapack_int LAPACKE_zbdsqr( int matrix_layout, char uplo, lapack_int n,
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zbdsqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zbdsqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
         if( ncc != 0 ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, ncc, c, ldc ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, ncc, c, ldc ) ) {
                 return -13;
             }
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -8;
         }
         if( nru != 0 ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, nru, n, u, ldu ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, nru, n, u, ldu ) ) {
                 return -11;
             }
         }
         if( ncvt != 0 ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, ncvt, vt, ldvt ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, ncvt, vt, ldvt ) ) {
                 return -9;
             }
         }
@@ -78,13 +78,13 @@ lapack_int LAPACKE_zbdsqr( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zbdsqr_work( matrix_layout, uplo, n, ncvt, nru, ncc, d, e, vt,
+    info = API_SUFFIX(LAPACKE_zbdsqr_work)( matrix_layout, uplo, n, ncvt, nru, ncc, d, e, vt,
                                 ldvt, u, ldu, c, ldc, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zbdsqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zbdsqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zbdsqr_work.c b/LAPACKE/src/lapacke_zbdsqr_work.c
index b54ccff929..4c143f0858 100644
--- a/LAPACKE/src/lapacke_zbdsqr_work.c
+++ b/LAPACKE/src/lapacke_zbdsqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zbdsqr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zbdsqr_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int ncvt, lapack_int nru, lapack_int ncc,
                                 double* d, double* e, lapack_complex_double* vt,
                                 lapack_int ldvt, lapack_complex_double* u,
@@ -57,17 +57,17 @@ lapack_int LAPACKE_zbdsqr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldc < ncc ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_zbdsqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zbdsqr_work", info );
             return info;
         }
         if( ldu < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zbdsqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zbdsqr_work", info );
             return info;
         }
         if( ldvt < ncvt ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zbdsqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zbdsqr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -100,13 +100,13 @@ lapack_int LAPACKE_zbdsqr_work( int matrix_layout, char uplo, lapack_int n,
         }
         /* Transpose input matrices */
         if( ncvt != 0 ) {
-            LAPACKE_zge_trans( matrix_layout, n, ncvt, vt, ldvt, vt_t, ldvt_t );
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, ncvt, vt, ldvt, vt_t, ldvt_t );
         }
         if( nru != 0 ) {
-            LAPACKE_zge_trans( matrix_layout, nru, n, u, ldu, u_t, ldu_t );
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, nru, n, u, ldu, u_t, ldu_t );
         }
         if( ncc != 0 ) {
-            LAPACKE_zge_trans( matrix_layout, n, ncc, c, ldc, c_t, ldc_t );
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, ncc, c, ldc, c_t, ldc_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_zbdsqr( &uplo, &n, &ncvt, &nru, &ncc, d, e, vt_t, &ldvt_t, u_t,
@@ -116,14 +116,14 @@ lapack_int LAPACKE_zbdsqr_work( int matrix_layout, char uplo, lapack_int n,
         }
         /* Transpose output matrices */
         if( ncvt != 0 ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, ncvt, vt_t, ldvt_t, vt,
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, ncvt, vt_t, ldvt_t, vt,
                                ldvt );
         }
         if( nru != 0 ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nru, n, u_t, ldu_t, u, ldu );
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nru, n, u_t, ldu_t, u, ldu );
         }
         if( ncc != 0 ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, ncc, c_t, ldc_t, c, ldc );
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, ncc, c_t, ldc_t, c, ldc );
         }
         /* Release memory and exit */
         if( ncc != 0 ) {
@@ -139,11 +139,11 @@ lapack_int LAPACKE_zbdsqr_work( int matrix_layout, char uplo, lapack_int n,
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zbdsqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zbdsqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zbdsqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zbdsqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zcgesv.c b/LAPACKE/src/lapacke_zcgesv.c
index 600f1d6175..e03dc8133f 100644
--- a/LAPACKE/src/lapacke_zcgesv.c
+++ b/LAPACKE/src/lapacke_zcgesv.c
@@ -32,9 +32,9 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zcgesv( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_zcgesv)( int matrix_layout, lapack_int n, lapack_int nrhs,
                            lapack_complex_double* a, lapack_int lda,
-                           lapack_int* ipiv, lapack_complex_double* b,
+                           lapack_int* ipiv, const lapack_complex_double* b,
                            lapack_int ldb, lapack_complex_double* x,
                            lapack_int ldx, lapack_int* iter )
 {
@@ -43,16 +43,16 @@ lapack_int LAPACKE_zcgesv( int matrix_layout, lapack_int n, lapack_int nrhs,
     lapack_complex_float* swork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zcgesv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zcgesv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
@@ -78,7 +78,7 @@ lapack_int LAPACKE_zcgesv( int matrix_layout, lapack_int n, lapack_int nrhs,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zcgesv_work( matrix_layout, n, nrhs, a, lda, ipiv, b, ldb, x,
+    info = API_SUFFIX(LAPACKE_zcgesv_work)( matrix_layout, n, nrhs, a, lda, ipiv, b, ldb, x,
                                 ldx, work, swork, rwork, iter );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -88,7 +88,7 @@ lapack_int LAPACKE_zcgesv( int matrix_layout, lapack_int n, lapack_int nrhs,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zcgesv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zcgesv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zcgesv_work.c b/LAPACKE/src/lapacke_zcgesv_work.c
index 88ea127e6c..2f7d11b55a 100644
--- a/LAPACKE/src/lapacke_zcgesv_work.c
+++ b/LAPACKE/src/lapacke_zcgesv_work.c
@@ -32,9 +32,9 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zcgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_zcgesv_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                 lapack_complex_double* a, lapack_int lda,
-                                lapack_int* ipiv, lapack_complex_double* b,
+                                lapack_int* ipiv, const lapack_complex_double* b,
                                 lapack_int ldb, lapack_complex_double* x,
                                 lapack_int ldx, lapack_complex_double* work,
                                 lapack_complex_float* swork, double* rwork,
@@ -58,17 +58,17 @@ lapack_int LAPACKE_zcgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zcgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zcgesv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zcgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zcgesv_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zcgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zcgesv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -93,8 +93,8 @@ lapack_int LAPACKE_zcgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zcgesv( &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, x_t, &ldx_t,
                        work, swork, rwork, iter, &info );
@@ -102,9 +102,8 @@ lapack_int LAPACKE_zcgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_2:
@@ -113,11 +112,11 @@ lapack_int LAPACKE_zcgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zcgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zcgesv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zcgesv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zcgesv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zcposv.c b/LAPACKE/src/lapacke_zcposv.c
index c5638dbc24..cf47ab6022 100644
--- a/LAPACKE/src/lapacke_zcposv.c
+++ b/LAPACKE/src/lapacke_zcposv.c
@@ -32,9 +32,9 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zcposv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zcposv)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, lapack_complex_double* a,
-                           lapack_int lda, lapack_complex_double* b,
+                           lapack_int lda, const lapack_complex_double* b,
                            lapack_int ldb, lapack_complex_double* x,
                            lapack_int ldx, lapack_int* iter )
 {
@@ -43,16 +43,16 @@ lapack_int LAPACKE_zcposv( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_float* swork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zcposv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zcposv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
@@ -78,7 +78,7 @@ lapack_int LAPACKE_zcposv( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zcposv_work( matrix_layout, uplo, n, nrhs, a, lda, b, ldb, x,
+    info = API_SUFFIX(LAPACKE_zcposv_work)( matrix_layout, uplo, n, nrhs, a, lda, b, ldb, x,
                                 ldx, work, swork, rwork, iter );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -88,7 +88,7 @@ lapack_int LAPACKE_zcposv( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zcposv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zcposv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zcposv_work.c b/LAPACKE/src/lapacke_zcposv_work.c
index d6258ea5d3..9decdde100 100644
--- a/LAPACKE/src/lapacke_zcposv_work.c
+++ b/LAPACKE/src/lapacke_zcposv_work.c
@@ -32,9 +32,9 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zcposv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zcposv_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, lapack_complex_double* a,
-                                lapack_int lda, lapack_complex_double* b,
+                                lapack_int lda, const lapack_complex_double* b,
                                 lapack_int ldb, lapack_complex_double* x,
                                 lapack_int ldx, lapack_complex_double* work,
                                 lapack_complex_float* swork, double* rwork,
@@ -58,17 +58,17 @@ lapack_int LAPACKE_zcposv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zcposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zcposv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zcposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zcposv_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zcposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zcposv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -93,8 +93,8 @@ lapack_int LAPACKE_zcposv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_zpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zcposv( &uplo, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, x_t, &ldx_t,
                        work, swork, rwork, iter, &info );
@@ -102,9 +102,8 @@ lapack_int LAPACKE_zcposv_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_2:
@@ -113,11 +112,11 @@ lapack_int LAPACKE_zcposv_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zcposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zcposv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zcposv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zcposv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgbbrd.c b/LAPACKE/src/lapacke_zgbbrd.c
index 08ac86243a..2441ab4257 100644
--- a/LAPACKE/src/lapacke_zgbbrd.c
+++ b/LAPACKE/src/lapacke_zgbbrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbbrd( int matrix_layout, char vect, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zgbbrd)( int matrix_layout, char vect, lapack_int m,
                            lapack_int n, lapack_int ncc, lapack_int kl,
                            lapack_int ku, lapack_complex_double* ab,
                            lapack_int ldab, double* d, double* e,
@@ -44,17 +44,17 @@ lapack_int LAPACKE_zgbbrd( int matrix_layout, char vect, lapack_int m,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgbbrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbbrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zgb_nancheck( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
             return -8;
         }
         if( ncc != 0 ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, m, ncc, c, ldc ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, ncc, c, ldc ) ) {
                 return -16;
             }
         }
@@ -73,7 +73,7 @@ lapack_int LAPACKE_zgbbrd( int matrix_layout, char vect, lapack_int m,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgbbrd_work( matrix_layout, vect, m, n, ncc, kl, ku, ab, ldab,
+    info = API_SUFFIX(LAPACKE_zgbbrd_work)( matrix_layout, vect, m, n, ncc, kl, ku, ab, ldab,
                                 d, e, q, ldq, pt, ldpt, c, ldc, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -81,7 +81,7 @@ lapack_int LAPACKE_zgbbrd( int matrix_layout, char vect, lapack_int m,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgbbrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbbrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgbbrd_work.c b/LAPACKE/src/lapacke_zgbbrd_work.c
index 693cad63c1..5bedd1be60 100644
--- a/LAPACKE/src/lapacke_zgbbrd_work.c
+++ b/LAPACKE/src/lapacke_zgbbrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbbrd_work( int matrix_layout, char vect, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zgbbrd_work)( int matrix_layout, char vect, lapack_int m,
                                 lapack_int n, lapack_int ncc, lapack_int kl,
                                 lapack_int ku, lapack_complex_double* ab,
                                 lapack_int ldab, double* d, double* e,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_zgbbrd_work( int matrix_layout, char vect, lapack_int m,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbbrd_work", info );
             return info;
         }
         if( ldc < ncc ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_zgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbbrd_work", info );
             return info;
         }
         if( ldpt < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_zgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbbrd_work", info );
             return info;
         }
         if( ldq < m ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbbrd_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -86,7 +86,7 @@ lapack_int LAPACKE_zgbbrd_work( int matrix_layout, char vect, lapack_int m,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ) {
             q_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldq_t * MAX(1,m) );
@@ -95,7 +95,7 @@ lapack_int LAPACKE_zgbbrd_work( int matrix_layout, char vect, lapack_int m,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'p' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'p' ) ) {
             pt_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldpt_t * MAX(1,n) );
@@ -114,9 +114,9 @@ lapack_int LAPACKE_zgbbrd_work( int matrix_layout, char vect, lapack_int m,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zgb_trans( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
         if( ncc != 0 ) {
-            LAPACKE_zge_trans( matrix_layout, m, ncc, c, ldc, c_t, ldc_t );
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, ncc, c, ldc, c_t, ldc_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_zgbbrd( &vect, &m, &n, &ncc, &kl, &ku, ab_t, &ldab_t, d, e, q_t,
@@ -125,38 +125,38 @@ lapack_int LAPACKE_zgbbrd_work( int matrix_layout, char vect, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zgb_trans( LAPACK_COL_MAJOR, m, n, kl, ku, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_zgb_trans)( LAPACK_COL_MAJOR, m, n, kl, ku, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'q' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, m, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, m, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'p' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, pt_t, ldpt_t, pt, ldpt );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'p' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, pt_t, ldpt_t, pt, ldpt );
         }
         if( ncc != 0 ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, ncc, c_t, ldc_t, c, ldc );
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, ncc, c_t, ldc_t, c, ldc );
         }
         /* Release memory and exit */
         if( ncc != 0 ) {
             LAPACKE_free( c_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'p' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'p' ) ) {
             LAPACKE_free( pt_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( vect, 'b' ) || LAPACKE_lsame( vect, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'b' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgbbrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbbrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgbbrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbbrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgbcon.c b/LAPACKE/src/lapacke_zgbcon.c
index a3c1b267dd..e6f65c23c6 100644
--- a/LAPACKE/src/lapacke_zgbcon.c
+++ b/LAPACKE/src/lapacke_zgbcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbcon( int matrix_layout, char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgbcon)( int matrix_layout, char norm, lapack_int n,
                            lapack_int kl, lapack_int ku,
                            const lapack_complex_double* ab, lapack_int ldab,
                            const lapack_int* ipiv, double anorm, double* rcond )
@@ -41,16 +41,16 @@ lapack_int LAPACKE_zgbcon( int matrix_layout, char norm, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgbcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zgb_nancheck( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -9;
         }
     }
@@ -68,7 +68,7 @@ lapack_int LAPACKE_zgbcon( int matrix_layout, char norm, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgbcon_work( matrix_layout, norm, n, kl, ku, ab, ldab, ipiv,
+    info = API_SUFFIX(LAPACKE_zgbcon_work)( matrix_layout, norm, n, kl, ku, ab, ldab, ipiv,
                                 anorm, rcond, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -76,7 +76,7 @@ lapack_int LAPACKE_zgbcon( int matrix_layout, char norm, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgbcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgbcon_work.c b/LAPACKE/src/lapacke_zgbcon_work.c
index bcac6fed9c..bc7c6217e9 100644
--- a/LAPACKE/src/lapacke_zgbcon_work.c
+++ b/LAPACKE/src/lapacke_zgbcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbcon_work( int matrix_layout, char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgbcon_work)( int matrix_layout, char norm, lapack_int n,
                                 lapack_int kl, lapack_int ku,
                                 const lapack_complex_double* ab,
                                 lapack_int ldab, const lapack_int* ipiv,
@@ -53,7 +53,7 @@ lapack_int LAPACKE_zgbcon_work( int matrix_layout, char norm, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zgbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbcon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -64,7 +64,7 @@ lapack_int LAPACKE_zgbcon_work( int matrix_layout, char norm, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zgb_trans( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
                            ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgbcon( &norm, &n, &kl, &ku, ab_t, &ldab_t, ipiv, &anorm, rcond,
@@ -76,11 +76,11 @@ lapack_int LAPACKE_zgbcon_work( int matrix_layout, char norm, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgbcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgbequ.c b/LAPACKE/src/lapacke_zgbequ.c
index 805ced166f..69dab94eda 100644
--- a/LAPACKE/src/lapacke_zgbequ.c
+++ b/LAPACKE/src/lapacke_zgbequ.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbequ( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgbequ)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int kl, lapack_int ku,
                            const lapack_complex_double* ab, lapack_int ldab,
                            double* r, double* c, double* rowcnd, double* colcnd,
                            double* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgbequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zgb_nancheck( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_zgbequ_work( matrix_layout, m, n, kl, ku, ab, ldab, r, c,
+    return API_SUFFIX(LAPACKE_zgbequ_work)( matrix_layout, m, n, kl, ku, ab, ldab, r, c,
                                 rowcnd, colcnd, amax );
 }
diff --git a/LAPACKE/src/lapacke_zgbequ_work.c b/LAPACKE/src/lapacke_zgbequ_work.c
index 2e61d352d4..403e4c2b97 100644
--- a/LAPACKE/src/lapacke_zgbequ_work.c
+++ b/LAPACKE/src/lapacke_zgbequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbequ_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgbequ_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int kl, lapack_int ku,
                                 const lapack_complex_double* ab,
                                 lapack_int ldab, double* r, double* c,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_zgbequ_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zgbequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbequ_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,7 +63,7 @@ lapack_int LAPACKE_zgbequ_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zgb_trans( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgbequ( &m, &n, &kl, &ku, ab_t, &ldab_t, r, c, rowcnd, colcnd,
                        amax, &info );
@@ -74,11 +74,11 @@ lapack_int LAPACKE_zgbequ_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgbequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgbequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgbequb.c b/LAPACKE/src/lapacke_zgbequb.c
index 3bf1be924d..01e498a02b 100644
--- a/LAPACKE/src/lapacke_zgbequb.c
+++ b/LAPACKE/src/lapacke_zgbequb.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbequb( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgbequb)( int matrix_layout, lapack_int m, lapack_int n,
                             lapack_int kl, lapack_int ku,
                             const lapack_complex_double* ab, lapack_int ldab,
                             double* r, double* c, double* rowcnd,
                             double* colcnd, double* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgbequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbequb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zgb_nancheck( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, m, n, kl, ku, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_zgbequb_work( matrix_layout, m, n, kl, ku, ab, ldab, r, c,
+    return API_SUFFIX(LAPACKE_zgbequb_work)( matrix_layout, m, n, kl, ku, ab, ldab, r, c,
                                  rowcnd, colcnd, amax );
 }
diff --git a/LAPACKE/src/lapacke_zgbequb_work.c b/LAPACKE/src/lapacke_zgbequb_work.c
index e1a37683ef..1848b06b11 100644
--- a/LAPACKE/src/lapacke_zgbequb_work.c
+++ b/LAPACKE/src/lapacke_zgbequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbequb_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgbequb_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  lapack_int kl, lapack_int ku,
                                  const lapack_complex_double* ab,
                                  lapack_int ldab, double* r, double* c,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_zgbequb_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zgbequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,7 +63,7 @@ lapack_int LAPACKE_zgbequb_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zgb_trans( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, m, n, kl, ku, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgbequb( &m, &n, &kl, &ku, ab_t, &ldab_t, r, c, rowcnd, colcnd,
                         amax, &info );
@@ -74,11 +74,11 @@ lapack_int LAPACKE_zgbequb_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgbequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgbequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgbrfs.c b/LAPACKE/src/lapacke_zgbrfs.c
index a4a4f33f21..3ae07434fc 100644
--- a/LAPACKE/src/lapacke_zgbrfs.c
+++ b/LAPACKE/src/lapacke_zgbrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbrfs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgbrfs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int kl, lapack_int ku, lapack_int nrhs,
                            const lapack_complex_double* ab, lapack_int ldab,
                            const lapack_complex_double* afb, lapack_int ldafb,
@@ -45,22 +45,22 @@ lapack_int LAPACKE_zgbrfs( int matrix_layout, char trans, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgbrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zgb_nancheck( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_zgb_nancheck( matrix_layout, n, n, kl, kl+ku, afb, ldafb ) ) {
+        if( API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, kl, kl+ku, afb, ldafb ) ) {
             return -9;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -14;
         }
     }
@@ -78,7 +78,7 @@ lapack_int LAPACKE_zgbrfs( int matrix_layout, char trans, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgbrfs_work( matrix_layout, trans, n, kl, ku, nrhs, ab, ldab,
+    info = API_SUFFIX(LAPACKE_zgbrfs_work)( matrix_layout, trans, n, kl, ku, nrhs, ab, ldab,
                                 afb, ldafb, ipiv, b, ldb, x, ldx, ferr, berr,
                                 work, rwork );
     /* Release memory and exit */
@@ -87,7 +87,7 @@ lapack_int LAPACKE_zgbrfs( int matrix_layout, char trans, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgbrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgbrfs_work.c b/LAPACKE/src/lapacke_zgbrfs_work.c
index 28300861c3..2fc556e87a 100644
--- a/LAPACKE/src/lapacke_zgbrfs_work.c
+++ b/LAPACKE/src/lapacke_zgbrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbrfs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgbrfs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int kl, lapack_int ku, lapack_int nrhs,
                                 const lapack_complex_double* ab,
                                 lapack_int ldab,
@@ -63,22 +63,22 @@ lapack_int LAPACKE_zgbrfs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbrfs_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_zgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -110,11 +110,11 @@ lapack_int LAPACKE_zgbrfs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zgb_trans( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
-        LAPACKE_zgb_trans( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
                            ldafb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgbrfs( &trans, &n, &kl, &ku, &nrhs, ab_t, &ldab_t, afb_t,
                        &ldafb_t, ipiv, b_t, &ldb_t, x_t, &ldx_t, ferr, berr,
@@ -123,7 +123,7 @@ lapack_int LAPACKE_zgbrfs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -134,11 +134,11 @@ lapack_int LAPACKE_zgbrfs_work( int matrix_layout, char trans, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgbrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgbrfsx.c b/LAPACKE/src/lapacke_zgbrfsx.c
index d08ec77a28..8fd8cdfa91 100644
--- a/LAPACKE/src/lapacke_zgbrfsx.c
+++ b/LAPACKE/src/lapacke_zgbrfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbrfsx( int matrix_layout, char trans, char equed,
+lapack_int API_SUFFIX(LAPACKE_zgbrfsx)( int matrix_layout, char trans, char equed,
                             lapack_int n, lapack_int kl, lapack_int ku,
                             lapack_int nrhs, const lapack_complex_double* ab,
                             lapack_int ldab, const lapack_complex_double* afb,
@@ -48,37 +48,37 @@ lapack_int LAPACKE_zgbrfsx( int matrix_layout, char trans, char equed,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgbrfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbrfsx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zgb_nancheck( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_zgb_nancheck( matrix_layout, n, n, kl, kl+ku, afb, ldafb ) ) {
+        if( API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, kl, kl+ku, afb, ldafb ) ) {
             return -10;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -15;
         }
-        if( LAPACKE_lsame( equed, 'b' ) || LAPACKE_lsame( equed, 'c' ) ) {
-            if( LAPACKE_d_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'b' ) || API_SUFFIX(LAPACKE_lsame)( equed, 'c' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, c, 1 ) ) {
                 return -14;
             }
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -25;
             }
         }
-        if( LAPACKE_lsame( equed, 'b' ) || LAPACKE_lsame( equed, 'r' ) ) {
-            if( LAPACKE_d_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'b' ) || API_SUFFIX(LAPACKE_lsame)( equed, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, r, 1 ) ) {
                 return -13;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -17;
         }
     }
@@ -96,7 +96,7 @@ lapack_int LAPACKE_zgbrfsx( int matrix_layout, char trans, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgbrfsx_work( matrix_layout, trans, equed, n, kl, ku, nrhs,
+    info = API_SUFFIX(LAPACKE_zgbrfsx_work)( matrix_layout, trans, equed, n, kl, ku, nrhs,
                                  ab, ldab, afb, ldafb, ipiv, r, c, b, ldb, x,
                                  ldx, rcond, berr, n_err_bnds, err_bnds_norm,
                                  err_bnds_comp, nparams, params, work, rwork );
@@ -106,7 +106,7 @@ lapack_int LAPACKE_zgbrfsx( int matrix_layout, char trans, char equed,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgbrfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbrfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgbrfsx_work.c b/LAPACKE/src/lapacke_zgbrfsx_work.c
index 285f4a9b33..edb955ffe2 100644
--- a/LAPACKE/src/lapacke_zgbrfsx_work.c
+++ b/LAPACKE/src/lapacke_zgbrfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbrfsx_work( int matrix_layout, char trans, char equed,
+lapack_int API_SUFFIX(LAPACKE_zgbrfsx_work)( int matrix_layout, char trans, char equed,
                                  lapack_int n, lapack_int kl, lapack_int ku,
                                  lapack_int nrhs,
                                  const lapack_complex_double* ab,
@@ -72,22 +72,22 @@ lapack_int LAPACKE_zgbrfsx_work( int matrix_layout, char trans, char equed,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbrfsx_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbrfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_zgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbrfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -18;
-            LAPACKE_xerbla( "LAPACKE_zgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbrfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -131,11 +131,11 @@ lapack_int LAPACKE_zgbrfsx_work( int matrix_layout, char trans, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_zgb_trans( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
-        LAPACKE_zgb_trans( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
                            ldafb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgbrfsx( &trans, &equed, &n, &kl, &ku, &nrhs, ab_t, &ldab_t,
                         afb_t, &ldafb_t, ipiv, r, c, b_t, &ldb_t, x_t, &ldx_t,
@@ -145,10 +145,10 @@ lapack_int LAPACKE_zgbrfsx_work( int matrix_layout, char trans, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -164,11 +164,11 @@ lapack_int LAPACKE_zgbrfsx_work( int matrix_layout, char trans, char equed,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgbrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbrfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgbrfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbrfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgbsv.c b/LAPACKE/src/lapacke_zgbsv.c
index 118473fd08..dee55c0a77 100644
--- a/LAPACKE/src/lapacke_zgbsv.c
+++ b/LAPACKE/src/lapacke_zgbsv.c
@@ -32,27 +32,27 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbsv( int matrix_layout, lapack_int n, lapack_int kl,
+lapack_int API_SUFFIX(LAPACKE_zgbsv)( int matrix_layout, lapack_int n, lapack_int kl,
                           lapack_int ku, lapack_int nrhs,
                           lapack_complex_double* ab, lapack_int ldab,
                           lapack_int* ipiv, lapack_complex_double* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgbsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zgb_nancheck( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_zgbsv_work( matrix_layout, n, kl, ku, nrhs, ab, ldab, ipiv, b,
+    return API_SUFFIX(LAPACKE_zgbsv_work)( matrix_layout, n, kl, ku, nrhs, ab, ldab, ipiv, b,
                                ldb );
 }
diff --git a/LAPACKE/src/lapacke_zgbsv_work.c b/LAPACKE/src/lapacke_zgbsv_work.c
index 56bc1bb4b2..8d53374cc4 100644
--- a/LAPACKE/src/lapacke_zgbsv_work.c
+++ b/LAPACKE/src/lapacke_zgbsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbsv_work( int matrix_layout, lapack_int n, lapack_int kl,
+lapack_int API_SUFFIX(LAPACKE_zgbsv_work)( int matrix_layout, lapack_int n, lapack_int kl,
                                lapack_int ku, lapack_int nrhs,
                                lapack_complex_double* ab, lapack_int ldab,
                                lapack_int* ipiv, lapack_complex_double* b,
@@ -53,12 +53,12 @@ lapack_int LAPACKE_zgbsv_work( int matrix_layout, lapack_int n, lapack_int kl,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zgbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zgbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -76,9 +76,9 @@ lapack_int LAPACKE_zgbsv_work( int matrix_layout, lapack_int n, lapack_int kl,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zgb_trans( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
                            ldab_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgbsv( &n, &kl, &ku, &nrhs, ab_t, &ldab_t, ipiv, b_t, &ldb_t,
                       &info );
@@ -86,20 +86,20 @@ lapack_int LAPACKE_zgbsv_work( int matrix_layout, lapack_int n, lapack_int kl,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zgb_trans( LAPACK_COL_MAJOR, n, n, kl, kl+ku, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_zgb_trans)( LAPACK_COL_MAJOR, n, n, kl, kl+ku, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgbsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgbsvx.c b/LAPACKE/src/lapacke_zgbsvx.c
index 3b593d4792..84b65b4198 100644
--- a/LAPACKE/src/lapacke_zgbsvx.c
+++ b/LAPACKE/src/lapacke_zgbsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbsvx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_zgbsvx)( int matrix_layout, char fact, char trans,
                            lapack_int n, lapack_int kl, lapack_int ku,
                            lapack_int nrhs, lapack_complex_double* ab,
                            lapack_int ldab, lapack_complex_double* afb,
@@ -46,33 +46,33 @@ lapack_int LAPACKE_zgbsvx( int matrix_layout, char fact, char trans,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgbsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zgb_nancheck( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_zgb_nancheck( matrix_layout, n, n, kl, kl+ku, afb,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, kl, kl+ku, afb,
                 ldafb ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -16;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) ) ) {
-            if( LAPACKE_d_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, c, 1 ) ) {
                 return -15;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'r' ) ) ) {
-            if( LAPACKE_d_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, r, 1 ) ) {
                 return -14;
             }
         }
@@ -91,7 +91,7 @@ lapack_int LAPACKE_zgbsvx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgbsvx_work( matrix_layout, fact, trans, n, kl, ku, nrhs, ab,
+    info = API_SUFFIX(LAPACKE_zgbsvx_work)( matrix_layout, fact, trans, n, kl, ku, nrhs, ab,
                                 ldab, afb, ldafb, ipiv, equed, r, c, b, ldb, x,
                                 ldx, rcond, ferr, berr, work, rwork );
     /* Backup significant data from working array(s) */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_zgbsvx( int matrix_layout, char fact, char trans,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgbsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgbsvx_work.c b/LAPACKE/src/lapacke_zgbsvx_work.c
index fe7183c969..c5e7adb410 100644
--- a/LAPACKE/src/lapacke_zgbsvx_work.c
+++ b/LAPACKE/src/lapacke_zgbsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbsvx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_zgbsvx_work)( int matrix_layout, char fact, char trans,
                                 lapack_int n, lapack_int kl, lapack_int ku,
                                 lapack_int nrhs, lapack_complex_double* ab,
                                 lapack_int ldab, lapack_complex_double* afb,
@@ -64,22 +64,22 @@ lapack_int LAPACKE_zgbsvx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsvx_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_zgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_zgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -111,12 +111,12 @@ lapack_int LAPACKE_zgbsvx_work( int matrix_layout, char fact, char trans,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zgb_trans( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_zgb_trans( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
                                ldafb_t );
         }
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgbsvx( &fact, &trans, &n, &kl, &ku, &nrhs, ab_t, &ldab_t, afb_t,
                        &ldafb_t, ipiv, equed, r, c, b_t, &ldb_t, x_t, &ldx_t,
@@ -125,20 +125,20 @@ lapack_int LAPACKE_zgbsvx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_zgb_trans( LAPACK_COL_MAJOR, n, n, kl, ku, ab_t, ldab_t, ab,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_zgb_trans)( LAPACK_COL_MAJOR, n, n, kl, ku, ab_t, ldab_t, ab,
                                ldab );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_zgb_trans( LAPACK_COL_MAJOR, n, n, kl, kl+ku, afb_t,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_zgb_trans)( LAPACK_COL_MAJOR, n, n, kl, kl+ku, afb_t,
                                ldafb_t, afb, ldafb );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -149,11 +149,11 @@ lapack_int LAPACKE_zgbsvx_work( int matrix_layout, char fact, char trans,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgbsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgbsvxx.c b/LAPACKE/src/lapacke_zgbsvxx.c
index de4a260e6c..30389445b7 100644
--- a/LAPACKE/src/lapacke_zgbsvxx.c
+++ b/LAPACKE/src/lapacke_zgbsvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbsvxx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_zgbsvxx)( int matrix_layout, char fact, char trans,
                             lapack_int n, lapack_int kl, lapack_int ku,
                             lapack_int nrhs, lapack_complex_double* ab,
                             lapack_int ldab, lapack_complex_double* afb,
@@ -48,38 +48,38 @@ lapack_int LAPACKE_zgbsvxx( int matrix_layout, char fact, char trans,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgbsvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsvxx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zgb_nancheck( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_zgb_nancheck( matrix_layout, n, n, kl, kl+ku, afb,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, kl, kl+ku, afb,
                 ldafb ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -16;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) ) ) {
-            if( LAPACKE_d_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, c, 1 ) ) {
                 return -15;
             }
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -27;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'r' ) ) ) {
-            if( LAPACKE_d_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, r, 1 ) ) {
                 return -14;
             }
         }
@@ -98,7 +98,7 @@ lapack_int LAPACKE_zgbsvxx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgbsvxx_work( matrix_layout, fact, trans, n, kl, ku, nrhs, ab,
+    info = API_SUFFIX(LAPACKE_zgbsvxx_work)( matrix_layout, fact, trans, n, kl, ku, nrhs, ab,
                                  ldab, afb, ldafb, ipiv, equed, r, c, b, ldb, x,
                                  ldx, rcond, rpvgrw, berr, n_err_bnds,
                                  err_bnds_norm, err_bnds_comp, nparams, params,
@@ -109,7 +109,7 @@ lapack_int LAPACKE_zgbsvxx( int matrix_layout, char fact, char trans,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgbsvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgbsvxx_work.c b/LAPACKE/src/lapacke_zgbsvxx_work.c
index 8fec5ecb80..982c58aa71 100644
--- a/LAPACKE/src/lapacke_zgbsvxx_work.c
+++ b/LAPACKE/src/lapacke_zgbsvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbsvxx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_zgbsvxx_work)( int matrix_layout, char fact, char trans,
                                  lapack_int n, lapack_int kl, lapack_int ku,
                                  lapack_int nrhs, lapack_complex_double* ab,
                                  lapack_int ldab, lapack_complex_double* afb,
@@ -70,22 +70,22 @@ lapack_int LAPACKE_zgbsvxx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsvxx_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_zgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_zgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -129,12 +129,12 @@ lapack_int LAPACKE_zgbsvxx_work( int matrix_layout, char fact, char trans,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_zgb_trans( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_zgb_trans( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n, n, kl, ku, ab, ldab, ab_t, ldab_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n, n, kl, kl+ku, afb, ldafb, afb_t,
                                ldafb_t );
         }
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgbsvxx( &fact, &trans, &n, &kl, &ku, &nrhs, ab_t, &ldab_t,
                         afb_t, &ldafb_t, ipiv, equed, r, c, b_t, &ldb_t, x_t,
@@ -145,23 +145,23 @@ lapack_int LAPACKE_zgbsvxx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_zgb_trans( LAPACK_COL_MAJOR, n, n, kl, ku, ab_t, ldab_t, ab,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_zgb_trans)( LAPACK_COL_MAJOR, n, n, kl, ku, ab_t, ldab_t, ab,
                                ldab );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_zgb_trans( LAPACK_COL_MAJOR, n, n, kl, kl+ku, afb_t,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_zgb_trans)( LAPACK_COL_MAJOR, n, n, kl, kl+ku, afb_t,
                                ldafb_t, afb, ldafb );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -177,11 +177,11 @@ lapack_int LAPACKE_zgbsvxx_work( int matrix_layout, char fact, char trans,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgbsvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgbsvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbsvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgbtrf.c b/LAPACKE/src/lapacke_zgbtrf.c
index c325dad976..9abedb7590 100644
--- a/LAPACKE/src/lapacke_zgbtrf.c
+++ b/LAPACKE/src/lapacke_zgbtrf.c
@@ -32,22 +32,22 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbtrf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgbtrf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int kl, lapack_int ku,
                            lapack_complex_double* ab, lapack_int ldab,
                            lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgbtrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbtrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zgb_nancheck( matrix_layout, m, n, kl, kl+ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, m, n, kl, kl+ku, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_zgbtrf_work( matrix_layout, m, n, kl, ku, ab, ldab, ipiv );
+    return API_SUFFIX(LAPACKE_zgbtrf_work)( matrix_layout, m, n, kl, ku, ab, ldab, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_zgbtrf_work.c b/LAPACKE/src/lapacke_zgbtrf_work.c
index b0afaf92e9..2cee61b65e 100644
--- a/LAPACKE/src/lapacke_zgbtrf_work.c
+++ b/LAPACKE/src/lapacke_zgbtrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbtrf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgbtrf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int kl, lapack_int ku,
                                 lapack_complex_double* ab, lapack_int ldab,
                                 lapack_int* ipiv )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zgbtrf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zgbtrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbtrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_zgbtrf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zgb_trans( matrix_layout, m, n, kl, kl+ku, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, m, n, kl, kl+ku, ab, ldab, ab_t,
                            ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgbtrf( &m, &n, &kl, &ku, ab_t, &ldab_t, ipiv, &info );
@@ -69,17 +69,17 @@ lapack_int LAPACKE_zgbtrf_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zgb_trans( LAPACK_COL_MAJOR, m, n, kl, kl+ku, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_zgb_trans)( LAPACK_COL_MAJOR, m, n, kl, kl+ku, ab_t, ldab_t, ab,
                            ldab );
         /* Release memory and exit */
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgbtrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbtrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgbtrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbtrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgbtrs.c b/LAPACKE/src/lapacke_zgbtrs.c
index cac06b206a..9382f1b255 100644
--- a/LAPACKE/src/lapacke_zgbtrs.c
+++ b/LAPACKE/src/lapacke_zgbtrs.c
@@ -32,27 +32,27 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbtrs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgbtrs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int kl, lapack_int ku, lapack_int nrhs,
                            const lapack_complex_double* ab, lapack_int ldab,
                            const lapack_int* ipiv, lapack_complex_double* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgbtrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbtrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zgb_nancheck( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, kl, kl+ku, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
     }
 #endif
-    return LAPACKE_zgbtrs_work( matrix_layout, trans, n, kl, ku, nrhs, ab, ldab,
+    return API_SUFFIX(LAPACKE_zgbtrs_work)( matrix_layout, trans, n, kl, ku, nrhs, ab, ldab,
                                 ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zgbtrs_work.c b/LAPACKE/src/lapacke_zgbtrs_work.c
index e4e9faf1f2..60943004e7 100644
--- a/LAPACKE/src/lapacke_zgbtrs_work.c
+++ b/LAPACKE/src/lapacke_zgbtrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgbtrs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgbtrs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int kl, lapack_int ku, lapack_int nrhs,
                                 const lapack_complex_double* ab,
                                 lapack_int ldab, const lapack_int* ipiv,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_zgbtrs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbtrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zgbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbtrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -77,9 +77,9 @@ lapack_int LAPACKE_zgbtrs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zgb_trans( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n, n, kl, kl+ku, ab, ldab, ab_t,
                            ldab_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgbtrs( &trans, &n, &kl, &ku, &nrhs, ab_t, &ldab_t, ipiv, b_t,
                        &ldb_t, &info );
@@ -87,18 +87,18 @@ lapack_int LAPACKE_zgbtrs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbtrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgbtrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgbtrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgebak.c b/LAPACKE/src/lapacke_zgebak.c
index cd71fb0900..c420dc40c0 100644
--- a/LAPACKE/src/lapacke_zgebak.c
+++ b/LAPACKE/src/lapacke_zgebak.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgebak( int matrix_layout, char job, char side, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgebak)( int matrix_layout, char job, char side, lapack_int n,
                            lapack_int ilo, lapack_int ihi, const double* scale,
                            lapack_int m, lapack_complex_double* v,
                            lapack_int ldv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgebak", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgebak", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, scale, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, scale, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, m, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, m, v, ldv ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_zgebak_work( matrix_layout, job, side, n, ilo, ihi, scale, m,
+    return API_SUFFIX(LAPACKE_zgebak_work)( matrix_layout, job, side, n, ilo, ihi, scale, m,
                                 v, ldv );
 }
diff --git a/LAPACKE/src/lapacke_zgebak_work.c b/LAPACKE/src/lapacke_zgebak_work.c
index 724ae20f23..d6a97382e4 100644
--- a/LAPACKE/src/lapacke_zgebak_work.c
+++ b/LAPACKE/src/lapacke_zgebak_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgebak_work( int matrix_layout, char job, char side,
+lapack_int API_SUFFIX(LAPACKE_zgebak_work)( int matrix_layout, char job, char side,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 const double* scale, lapack_int m,
                                 lapack_complex_double* v, lapack_int ldv )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zgebak_work( int matrix_layout, char job, char side,
         /* Check leading dimension(s) */
         if( ldv < m ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zgebak_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgebak_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_zgebak_work( int matrix_layout, char job, char side,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, m, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, m, v, ldv, v_t, ldv_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgebak( &job, &side, &n, &ilo, &ihi, scale, &m, v_t, &ldv_t,
                        &info );
@@ -69,16 +69,16 @@ lapack_int LAPACKE_zgebak_work( int matrix_layout, char job, char side,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, m, v_t, ldv_t, v, ldv );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, m, v_t, ldv_t, v, ldv );
         /* Release memory and exit */
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgebak_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgebak_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgebak_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgebak_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgebal.c b/LAPACKE/src/lapacke_zgebal.c
index 5ccb858bc2..01179d5bc0 100644
--- a/LAPACKE/src/lapacke_zgebal.c
+++ b/LAPACKE/src/lapacke_zgebal.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgebal( int matrix_layout, char job, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgebal)( int matrix_layout, char job, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_int* ilo, lapack_int* ihi, double* scale )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgebal", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgebal", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
                 return -4;
             }
         }
     }
 #endif
-    return LAPACKE_zgebal_work( matrix_layout, job, n, a, lda, ilo, ihi, scale );
+    return API_SUFFIX(LAPACKE_zgebal_work)( matrix_layout, job, n, a, lda, ilo, ihi, scale );
 }
diff --git a/LAPACKE/src/lapacke_zgebal_work.c b/LAPACKE/src/lapacke_zgebal_work.c
index 0cdc764bea..20902a652c 100644
--- a/LAPACKE/src/lapacke_zgebal_work.c
+++ b/LAPACKE/src/lapacke_zgebal_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgebal_work( int matrix_layout, char job, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgebal_work)( int matrix_layout, char job, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_int* ilo, lapack_int* ihi,
                                 double* scale )
@@ -50,12 +50,12 @@ lapack_int LAPACKE_zgebal_work( int matrix_layout, char job, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgebal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgebal_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
             a_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 lda_t * MAX(1,n) );
@@ -65,9 +65,9 @@ lapack_int LAPACKE_zgebal_work( int matrix_layout, char job, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_zgebal( &job, &n, a_t, &lda_t, ilo, ihi, scale, &info );
@@ -75,22 +75,22 @@ lapack_int LAPACKE_zgebal_work( int matrix_layout, char job, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'p' ) ||
-            LAPACKE_lsame( job, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'p' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 's' ) ) {
             LAPACKE_free( a_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgebal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgebal_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgebal_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgebal_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgebrd.c b/LAPACKE/src/lapacke_zgebrd.c
index 30fc46a436..9310f1ce38 100644
--- a/LAPACKE/src/lapacke_zgebrd.c
+++ b/LAPACKE/src/lapacke_zgebrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgebrd( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgebrd)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_double* a, lapack_int lda, double* d,
                            double* e, lapack_complex_double* tauq,
                            lapack_complex_double* taup )
@@ -42,19 +42,19 @@ lapack_int LAPACKE_zgebrd( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgebrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgebrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgebrd_work( matrix_layout, m, n, a, lda, d, e, tauq, taup,
+    info = API_SUFFIX(LAPACKE_zgebrd_work)( matrix_layout, m, n, a, lda, d, e, tauq, taup,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -68,13 +68,13 @@ lapack_int LAPACKE_zgebrd( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgebrd_work( matrix_layout, m, n, a, lda, d, e, tauq, taup,
+    info = API_SUFFIX(LAPACKE_zgebrd_work)( matrix_layout, m, n, a, lda, d, e, tauq, taup,
                                 work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgebrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgebrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgebrd_work.c b/LAPACKE/src/lapacke_zgebrd_work.c
index 8f30dcba74..3f7a2fcd2e 100644
--- a/LAPACKE/src/lapacke_zgebrd_work.c
+++ b/LAPACKE/src/lapacke_zgebrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgebrd_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgebrd_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 double* d, double* e,
                                 lapack_complex_double* tauq,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_zgebrd_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgebrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgebrd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -69,7 +69,7 @@ lapack_int LAPACKE_zgebrd_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgebrd( &m, &n, a_t, &lda_t, d, e, tauq, taup, work, &lwork,
                        &info );
@@ -77,16 +77,16 @@ lapack_int LAPACKE_zgebrd_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgebrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgebrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgebrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgebrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgecon.c b/LAPACKE/src/lapacke_zgecon.c
index ca59138aa7..451970118b 100644
--- a/LAPACKE/src/lapacke_zgecon.c
+++ b/LAPACKE/src/lapacke_zgecon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgecon( int matrix_layout, char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgecon)( int matrix_layout, char norm, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda,
                            double anorm, double* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_zgecon( int matrix_layout, char norm, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgecon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgecon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -6;
         }
     }
@@ -67,7 +67,7 @@ lapack_int LAPACKE_zgecon( int matrix_layout, char norm, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgecon_work( matrix_layout, norm, n, a, lda, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_zgecon_work)( matrix_layout, norm, n, a, lda, anorm, rcond,
                                 work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -75,7 +75,7 @@ lapack_int LAPACKE_zgecon( int matrix_layout, char norm, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgecon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgecon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgecon_work.c b/LAPACKE/src/lapacke_zgecon_work.c
index b18dbf1845..d8c7cc0490 100644
--- a/LAPACKE/src/lapacke_zgecon_work.c
+++ b/LAPACKE/src/lapacke_zgecon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgecon_work( int matrix_layout, char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgecon_work)( int matrix_layout, char norm, lapack_int n,
                                 const lapack_complex_double* a, lapack_int lda,
                                 double anorm, double* rcond,
                                 lapack_complex_double* work, double* rwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zgecon_work( int matrix_layout, char norm, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgecon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgecon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_zgecon_work( int matrix_layout, char norm, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgecon( &norm, &n, a_t, &lda_t, &anorm, rcond, work, rwork,
                        &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_zgecon_work( int matrix_layout, char norm, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgecon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgecon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgecon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgecon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgedmd.c b/LAPACKE/src/lapacke_zgedmd.c
new file mode 100644
index 0000000000..1c1d1ab749
--- /dev/null
+++ b/LAPACKE/src/lapacke_zgedmd.c
@@ -0,0 +1,128 @@
+/*****************************************************************************
+  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 zgedmd
+* Author: Intel Corporation
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_zgedmd)( int matrix_layout, char jobs, char jobz, char jobr,
+			   char jobf, lapack_int whtsvd, lapack_int m,
+			   lapack_int n, lapack_complex_double* x,
+			   lapack_int ldx, lapack_complex_double* y,
+			   lapack_int ldy, lapack_int nrnk, double *tol, lapack_int k,
+               lapack_complex_double* eigs, lapack_complex_double* z,
+               lapack_int ldz, double* res,
+               lapack_complex_double* b, lapack_int ldb,
+               lapack_complex_double* zw, lapack_int lzw,
+               lapack_complex_double* w, lapack_int ldw,
+               lapack_complex_double* s, lapack_int lds)
+{
+    lapack_int info = 0;
+    lapack_int lwork = -1;
+    lapack_int liwork = -1;
+    lapack_int lzwork = -1;
+    lapack_complex_double* zwork = NULL;
+    double* work = NULL;
+    lapack_int* iwork = NULL;
+    double work_query;
+    lapack_int iwork_query;
+    lapack_complex_double zwork_query;
+    if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmd", -1 );
+        return -1;
+    }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+    if( LAPACKE_get_nancheck() ) {
+        /* Optionally check input matrices for NaNs */
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, x, ldx ) ) {
+            return -8;
+        }
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, y, ldy ) ) {
+            return -10;
+        }
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, z, ldz ) ) {
+            return -15;
+        }
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
+            return -18;
+        }
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, s, lds ) ) {
+            return -20;
+        }
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, w, ldw ) ) {
+            return -22;
+        }
+    }
+#endif
+    /* Query optimal working array(s) size */
+    info = API_SUFFIX(LAPACKE_zgedmd_work)( matrix_layout, jobs, jobz, jobr, jobf, whtsvd,
+				m, n, x, ldx, y, ldy, nrnk, tol, k, eigs, z, ldz,
+				res, b, ldb, w, ldw, s, lds, &zwork_query, lzwork,
+				&work_query, lwork, &iwork_query, liwork );
+
+    if( info != 0 ) {
+        goto exit_level_0;
+    }
+    lwork  = LAPACK_Z2INT( work_query );
+    liwork = iwork_query;
+    lzwork = LAPACK_Z2INT( zwork_query );
+    /* Allocate memory for work arrays */
+    zwork  = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * lzwork );
+    if( zwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
+    }
+    work  = (double*)LAPACKE_malloc( sizeof(double) * lwork );
+    if( work == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_1;
+    }
+    iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
+    if( iwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_2;
+    }
+    /* Call middle-level interface */
+    info = API_SUFFIX(LAPACKE_zgedmd_work)( matrix_layout, jobs, jobz, jobr, jobf, whtsvd,
+				m, n, x, ldx, y, ldy, nrnk, tol, k, eigs, z, ldz,
+				res, b, ldb, w, ldw, s, lds, zwork, lzwork,
+				work, lwork, iwork, liwork );
+    /* Release memory and exit */
+    LAPACKE_free( iwork );
+exit_level_2:
+    LAPACKE_free( work );
+exit_level_1:
+    LAPACKE_free( zwork );
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmd", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_zgedmd_work.c b/LAPACKE/src/lapacke_zgedmd_work.c
new file mode 100644
index 0000000000..c097385186
--- /dev/null
+++ b/LAPACKE/src/lapacke_zgedmd_work.c
@@ -0,0 +1,186 @@
+/*****************************************************************************
+  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 zgedmd
+* Author: Intel Corporation
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_zgedmd_work)( int matrix_layout, char jobs, char jobz,
+                char jobr, char jobf, lapack_int whtsvd,
+				lapack_int m, lapack_int n,
+				lapack_complex_double* x,
+                lapack_int ldx, lapack_complex_double* y,
+                lapack_int ldy, lapack_int nrnk, double *tol, lapack_int k,
+                lapack_complex_double* eigs, lapack_complex_double* z,
+                lapack_int ldz, double* res,
+                lapack_complex_double* b, lapack_int ldb,
+                lapack_complex_double* w, lapack_int ldw,
+                lapack_complex_double* s, lapack_int lds,
+                lapack_complex_double* zwork, lapack_int lzwork,
+                double* work, lapack_int lwork,
+                lapack_int* iwork, lapack_int liwork )
+{
+    lapack_int info = 0;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        LAPACK_zgedmd( &jobs, &jobz, &jobr, &jobf, &whtsvd, &m, &n, x, &ldx,
+		       y, &ldy, &nrnk, tol, &k, eigs, z, &ldz, res, b, &ldb, w,
+		       &ldw, s, &lds, zwork, &lzwork, work, &lwork, iwork, 
+		       &liwork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        lapack_int ldx_t = MAX(1,m);
+        lapack_int ldy_t = MAX(1,m);
+        lapack_int ldz_t = MAX(1,m);
+        lapack_int ldb_t = MAX(1,m);
+        lapack_int ldw_t = MAX(1,m);
+        lapack_int lds_t = MAX(1,m);
+        lapack_complex_double* x_t = NULL;
+        lapack_complex_double* y_t = NULL;
+        lapack_complex_double* z_t = NULL;
+        lapack_complex_double* b_t = NULL;
+        lapack_complex_double* w_t = NULL;
+        lapack_complex_double* s_t = NULL;
+        /* Check leading dimension(s) */
+        if( ldx < n ) {
+            info = -9;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmd_work", info );
+            return info;
+        }
+        if( ldy < n ) {
+            info = -11;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmd_work", info );
+            return info;
+        }
+        if( ldz < n ) {
+            info = -16;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmd_work", info );
+            return info;
+        }
+        if( ldb < n ) {
+            info = -19;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmd_work", info );
+            return info;
+        }
+        if( ldw < n ) {
+            info = -21;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmd_work", info );
+            return info;
+        }
+        if( lds < n ) {
+            info = -23;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmd_work", info );
+            return info;
+        }
+        /* Query optimal working array(s) size if requested */
+        if( lwork == -1 ) {
+            LAPACK_zgedmd( &jobs, &jobz, &jobr, &jobf, &whtsvd, &m, &n, x,
+			   &ldx, y, &ldy, &nrnk, tol, &k, eigs, z, &ldz, res, b,
+			   &ldb, w, &ldw, s, &lds, zwork, &lzwork, work, 
+			   &lwork, iwork, &liwork, &info );
+            return (info < 0) ? (info - 1) : info;
+        }
+        /* Allocate memory for temporary array(s) */
+        x_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * ldx_t * MAX(1,n) );
+        if( x_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+        y_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * ldy_t * MAX(1,n) );
+        if( y_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_1;
+        }
+        z_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * ldz_t * MAX(1,n) );
+        if( z_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_2;
+        }
+        b_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * ldb_t * MAX(1,n) );
+        if( b_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_3;
+        }
+        w_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * ldw_t * MAX(1,n) );
+        if( w_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_4;
+        }
+        s_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * lds_t * MAX(1,n) );
+        if( s_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_5;
+        }
+        /* Transpose input matrices */
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, y, ldy, y_t, ldy_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, z, ldz, z_t, ldz_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, w, ldw, w_t, ldw_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, s, lds, s_t, lds_t );
+        /* Call LAPACK function and adjust info */
+        LAPACK_zgedmd( &jobs, &jobz, &jobr, &jobf, &whtsvd, &m, &n, x_t,
+		       &ldx_t, y_t, &ldy_t, &nrnk, tol, &k, eigs, z_t, &ldz_t,
+		       res, b_t, &ldb_t, w_t, &ldw_t, s_t, &lds_t, zwork,
+		       &lzwork, work, &lwork, iwork, &liwork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+        /* Transpose output matrices */
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, y_t, ldy_t, y, ldy );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, w_t, ldw_t, w, ldw );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, s_t, lds_t, s, lds );
+        /* Release memory and exit */
+        LAPACKE_free( s_t );
+exit_level_5:
+        LAPACKE_free( w_t );
+exit_level_4:
+        LAPACKE_free( b_t );
+exit_level_3:
+        LAPACKE_free( z_t );
+exit_level_2:
+        LAPACKE_free( y_t );
+exit_level_1:
+        LAPACKE_free( x_t );
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmd_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmd_work", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_zgedmdq.c b/LAPACKE/src/lapacke_zgedmdq.c
new file mode 100644
index 0000000000..4cc2605b5a
--- /dev/null
+++ b/LAPACKE/src/lapacke_zgedmdq.c
@@ -0,0 +1,133 @@
+/*****************************************************************************
+  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 zgedmdq
+* Author: Intel Corporation
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_zgedmdq)( int matrix_layout, char jobs, char jobz, char jobr,
+                            char jobq, char jobt, char jobf, lapack_int whtsvd,
+                            lapack_int m, lapack_int n, lapack_complex_double* f,
+                            lapack_int ldf, lapack_complex_double* x,
+                            lapack_int ldx, lapack_complex_double* y,
+                            lapack_int ldy, lapack_int nrnk, double* tol,
+                            lapack_int k, lapack_complex_double* eigs,
+                            lapack_complex_double* z, lapack_int ldz,
+                            double* res, lapack_complex_double* b,
+                            lapack_int ldb, lapack_complex_double* v,
+                            lapack_int ldv, lapack_complex_double* s, lapack_int lds)
+{
+    lapack_int info = 0;
+    lapack_int lwork = -1;
+    lapack_int liwork = -1;
+    lapack_int lzwork = -1;
+    lapack_complex_double* zwork = NULL;
+    double* work = NULL;
+    lapack_int* iwork = NULL;
+    double work_query;
+    lapack_complex_double zwork_query;
+    lapack_int iwork_query;
+    if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_cgedmdq", -1 );
+        return -1;
+    }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+    if( LAPACKE_get_nancheck() ) {
+        /* Optionally check input matrices for NaNs */
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, f, ldf ) ) {
+            return -11;
+        }
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, x, ldx ) ) {
+            return -13;
+        }
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, y, ldy ) ) {
+            return -15;
+        }
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, z, ldz ) ) {
+            return -22;
+        }
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
+            return -25;
+        }
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, v, ldv ) ) {
+            return -27;
+        }
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, s, lds ) ) {
+            return -29;
+        }
+    }
+#endif
+    /* Query optimal working array(s) size */
+    info = API_SUFFIX(LAPACKE_zgedmdq_work)( matrix_layout, jobs, jobz, jobr, jobq, jobt,
+                                 jobf, whtsvd, m, n, f, ldf, x, ldx, y, ldy,
+                                 nrnk, tol, k, eigs, z, ldz, res,
+                                 b, ldb, v, ldv, s, lds, &zwork_query, lzwork, 
+				 &work_query, lwork, &iwork_query, liwork );
+
+    if( info != 0 ) {
+        goto exit_level_0;
+    }
+    lwork  = LAPACK_Z2INT( work_query );
+    lzwork  = LAPACK_Z2INT( zwork_query );
+    liwork = iwork_query;
+    /* Allocate memory for work arrays */
+    zwork  = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * lzwork );
+    if( zwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
+    }
+    work  = (double*)LAPACKE_malloc( sizeof(lapack_complex_double) * lwork );
+    if( work == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_1;
+    }
+    iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
+    if( iwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_2;
+    }
+    /* Call middle-level interface */
+    info = API_SUFFIX(LAPACKE_zgedmdq_work)( matrix_layout, jobs, jobz, jobr, jobq, jobt,
+                                 jobf, whtsvd, m, n, f, ldf, x, ldx, y, ldy,
+                                 nrnk, tol, k, eigs, z, ldz, res,
+                                 b, ldb, v, ldv, s, lds, zwork, lzwork, 
+				 work, lwork, iwork, liwork );
+    /* Release memory and exit */
+    LAPACKE_free( iwork );
+exit_level_2:
+    LAPACKE_free( work );
+exit_level_1:
+    LAPACKE_free( zwork );
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmdq", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_zgedmdq_work.c b/LAPACKE/src/lapacke_zgedmdq_work.c
new file mode 100644
index 0000000000..318213ebd9
--- /dev/null
+++ b/LAPACKE/src/lapacke_zgedmdq_work.c
@@ -0,0 +1,205 @@
+/*****************************************************************************
+  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 zgedmdq
+* Author: Intel Corporation
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_zgedmdq_work)( int matrix_layout, char jobs, char jobz,
+                                 char jobr, char jobq, char jobt, char jobf,
+                                 lapack_int whtsvd, lapack_int m, lapack_int n,
+                                 lapack_complex_double* f, lapack_int ldf,
+                                 lapack_complex_double* x, lapack_int ldx,
+                                 lapack_complex_double* y, lapack_int ldy,
+                                 lapack_int nrnk, double* tol, lapack_int k,
+                                 lapack_complex_double* eigs,
+                                 lapack_complex_double* z,
+                                 lapack_int ldz, double* res,
+                                 lapack_complex_double* b,
+                                 lapack_int ldb, lapack_complex_double* v,
+                                 lapack_int ldv, lapack_complex_double* s,
+                                 lapack_int lds, lapack_complex_double* zwork,
+				 lapack_int lzwork, double* work,
+                                 lapack_int lwork, lapack_int* iwork,
+                                 lapack_int liwork )
+{
+    lapack_int info = 0;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        LAPACK_zgedmdq( &jobs, &jobz, &jobr, &jobq, &jobt, &jobf, &whtsvd, &m,
+                        &n, f, &ldf, x, &ldx, y, &ldy, &nrnk, tol, &k, eigs,
+                        z, &ldz, res, b, &ldb, v, &ldv, s, &lds,
+                        zwork, &lzwork, work, &lwork, iwork, &liwork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        lapack_int ldf_t = MAX(1,m);
+        lapack_int ldx_t = MAX(1,m);
+        lapack_int ldy_t = MAX(1,m);
+        lapack_int ldz_t = MAX(1,m);
+        lapack_int ldb_t = MAX(1,m);
+        lapack_int ldv_t = MAX(1,m);
+        lapack_int lds_t = MAX(1,m);
+        lapack_complex_double* f_t = NULL;
+        lapack_complex_double* x_t = NULL;
+        lapack_complex_double* y_t = NULL;
+        lapack_complex_double* z_t = NULL;
+        lapack_complex_double* b_t = NULL;
+        lapack_complex_double* v_t = NULL;
+        lapack_complex_double* s_t = NULL;
+        /* Check leading dimension(s) */
+        if( ldf < n ) {
+            info = -12;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmdq_work", info );
+            return info;
+        }
+        if( ldx < n ) {
+            info = -14;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmdq_work", info );
+            return info;
+        }
+        if( ldy < n ) {
+            info = -16;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmdq_work", info );
+            return info;
+        }
+        if( ldz < n ) {
+            info = -23;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmdq_work", info );
+            return info;
+        }
+        if( ldb < n ) {
+            info = -26;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmdq_work", info );
+            return info;
+        }
+        if( ldv < n ) {
+            info = -28;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmdq_work", info );
+            return info;
+        }
+        if( lds < n ) {
+            info = -30;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmdq_work", info );
+            return info;
+        }
+        /* Query optimal working array(s) size if requested */
+        if( lwork == -1 || liwork == -1 ) {
+            LAPACK_zgedmdq( &jobs, &jobz, &jobr, &jobq, &jobt, &jobf, &whtsvd, &m,
+                            &n, f, &ldf, x, &ldx, y, &ldy, &nrnk, tol, &k, eigs,
+                            z, &ldz, res, b, &ldb, v, &ldv, s, &lds,
+                            zwork, &lzwork, work, &lwork, iwork, &liwork, &info );
+            return (info < 0) ? (info - 1) : info;
+        }
+        /* Allocate memory for temporary array(s) */
+        f_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * ldf_t * MAX(1,n) );
+        if( f_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+        x_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * ldx_t * MAX(1,n) );
+        if( x_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_1;
+        }
+        y_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * ldy_t * MAX(1,n) );
+        if( y_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_2;
+        }
+        z_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * ldz_t * MAX(1,n) );
+        if( z_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_3;
+        }
+        b_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * ldb_t * MAX(1,n) );
+        if( b_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_4;
+        }
+        v_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * ldv_t * MAX(1,n) );
+        if( v_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_5;
+        }
+        s_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * lds_t * MAX(1,n) );
+        if( s_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_6;
+        }
+        /* Transpose input matrices */
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, f, ldf, f_t, ldf_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, y, ldy, y_t, ldy_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, z, ldz, z_t, ldz_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, s, lds, s_t, lds_t );
+        /* Call LAPACK function and adjust info */
+        LAPACK_zgedmdq( &jobs, &jobz, &jobr, &jobq, &jobt, &jobf, &whtsvd, &m,
+                        &n, f, &ldf, x, &ldx, y, &ldy, &nrnk, tol, &k, eigs,
+                        z, &ldz, res, b, &ldb, v, &ldv, s, &lds,
+                        zwork, &lzwork, work, &lwork, iwork, &liwork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+        /* Transpose output matrices */
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, f_t, ldf_t, f, ldf );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, y_t, ldy_t, y, ldy );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, v_t, ldv_t, v, ldv );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, s_t, lds_t, s, lds );
+        /* Release memory and exit */
+        LAPACKE_free( s_t );
+exit_level_6:
+        LAPACKE_free( v_t );
+exit_level_5:
+        LAPACKE_free( b_t );
+exit_level_4:
+        LAPACKE_free( z_t );
+exit_level_3:
+        LAPACKE_free( y_t );
+exit_level_2:
+        LAPACKE_free( x_t );
+exit_level_1:
+        LAPACKE_free( f_t );
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmdq_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgedmdq_work", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_zgeequ.c b/LAPACKE/src/lapacke_zgeequ.c
index 297a76e1da..f8ac753ec1 100644
--- a/LAPACKE/src/lapacke_zgeequ.c
+++ b/LAPACKE/src/lapacke_zgeequ.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeequ( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeequ)( int matrix_layout, lapack_int m, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda,
                            double* r, double* c, double* rowcnd, double* colcnd,
                            double* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zgeequ_work( matrix_layout, m, n, a, lda, r, c, rowcnd,
+    return API_SUFFIX(LAPACKE_zgeequ_work)( matrix_layout, m, n, a, lda, r, c, rowcnd,
                                 colcnd, amax );
 }
diff --git a/LAPACKE/src/lapacke_zgeequ_work.c b/LAPACKE/src/lapacke_zgeequ_work.c
index 019fcac8f2..6593dfb8e4 100644
--- a/LAPACKE/src/lapacke_zgeequ_work.c
+++ b/LAPACKE/src/lapacke_zgeequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeequ_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeequ_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 const lapack_complex_double* a, lapack_int lda,
                                 double* r, double* c, double* rowcnd,
                                 double* colcnd, double* amax )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zgeequ_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgeequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeequ_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_zgeequ_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgeequ( &m, &n, a_t, &lda_t, r, c, rowcnd, colcnd, amax, &info );
         if( info < 0 ) {
@@ -71,11 +71,11 @@ lapack_int LAPACKE_zgeequ_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgeequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgeequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeequb.c b/LAPACKE/src/lapacke_zgeequb.c
index c565da024a..9d4fb3de63 100644
--- a/LAPACKE/src/lapacke_zgeequb.c
+++ b/LAPACKE/src/lapacke_zgeequb.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeequb( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeequb)( int matrix_layout, lapack_int m, lapack_int n,
                             const lapack_complex_double* a, lapack_int lda,
                             double* r, double* c, double* rowcnd,
                             double* colcnd, double* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeequb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zgeequb_work( matrix_layout, m, n, a, lda, r, c, rowcnd,
+    return API_SUFFIX(LAPACKE_zgeequb_work)( matrix_layout, m, n, a, lda, r, c, rowcnd,
                                  colcnd, amax );
 }
diff --git a/LAPACKE/src/lapacke_zgeequb_work.c b/LAPACKE/src/lapacke_zgeequb_work.c
index c28a31f925..dd6d4eb742 100644
--- a/LAPACKE/src/lapacke_zgeequb_work.c
+++ b/LAPACKE/src/lapacke_zgeequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeequb_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeequb_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  const lapack_complex_double* a, lapack_int lda,
                                  double* r, double* c, double* rowcnd,
                                  double* colcnd, double* amax )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zgeequb_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgeequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_zgeequb_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgeequb( &m, &n, a_t, &lda_t, r, c, rowcnd, colcnd, amax,
                         &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_zgeequb_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgeequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgeequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgees.c b/LAPACKE/src/lapacke_zgees.c
index b3ccd2ede5..441fbeb611 100644
--- a/LAPACKE/src/lapacke_zgees.c
+++ b/LAPACKE/src/lapacke_zgees.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgees( int matrix_layout, char jobvs, char sort,
+lapack_int API_SUFFIX(LAPACKE_zgees)( int matrix_layout, char jobvs, char sort,
                           LAPACK_Z_SELECT1 select, lapack_int n,
                           lapack_complex_double* a, lapack_int lda,
                           lapack_int* sdim, lapack_complex_double* w,
@@ -45,19 +45,19 @@ lapack_int LAPACKE_zgees( int matrix_layout, char jobvs, char sort,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgees", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgees", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -71,7 +71,7 @@ lapack_int LAPACKE_zgees( int matrix_layout, char jobvs, char sort,
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgees_work( matrix_layout, jobvs, sort, select, n, a, lda,
+    info = API_SUFFIX(LAPACKE_zgees_work)( matrix_layout, jobvs, sort, select, n, a, lda,
                                sdim, w, vs, ldvs, &work_query, lwork, rwork,
                                bwork );
     if( info != 0 ) {
@@ -86,19 +86,19 @@ lapack_int LAPACKE_zgees( int matrix_layout, char jobvs, char sort,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgees_work( matrix_layout, jobvs, sort, select, n, a, lda,
+    info = API_SUFFIX(LAPACKE_zgees_work)( matrix_layout, jobvs, sort, select, n, a, lda,
                                sdim, w, vs, ldvs, work, lwork, rwork, bwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_2:
     LAPACKE_free( rwork );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgees", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgees", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgees_work.c b/LAPACKE/src/lapacke_zgees_work.c
index 05685823de..7bed43e00d 100644
--- a/LAPACKE/src/lapacke_zgees_work.c
+++ b/LAPACKE/src/lapacke_zgees_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgees_work( int matrix_layout, char jobvs, char sort,
+lapack_int API_SUFFIX(LAPACKE_zgees_work)( int matrix_layout, char jobvs, char sort,
                                LAPACK_Z_SELECT1 select, lapack_int n,
                                lapack_complex_double* a, lapack_int lda,
                                lapack_int* sdim, lapack_complex_double* w,
@@ -56,12 +56,12 @@ lapack_int LAPACKE_zgees_work( int matrix_layout, char jobvs, char sort,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zgees_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgees_work", info );
             return info;
         }
         if( ldvs < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zgees_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgees_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -77,7 +77,7 @@ lapack_int LAPACKE_zgees_work( int matrix_layout, char jobvs, char sort,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
             vs_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvs_t * MAX(1,n) );
@@ -87,7 +87,7 @@ lapack_int LAPACKE_zgees_work( int matrix_layout, char jobvs, char sort,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgees( &jobvs, &sort, select, &n, a_t, &lda_t, sdim, w, vs_t,
                       &ldvs_t, work, &lwork, rwork, bwork, &info );
@@ -95,23 +95,23 @@ lapack_int LAPACKE_zgees_work( int matrix_layout, char jobvs, char sort,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, vs_t, ldvs_t, vs, ldvs );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, vs_t, ldvs_t, vs, ldvs );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
             LAPACKE_free( vs_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgees_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgees_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgees_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgees_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeesx.c b/LAPACKE/src/lapacke_zgeesx.c
index c3756d90e9..a0a942e0c9 100644
--- a/LAPACKE/src/lapacke_zgeesx.c
+++ b/LAPACKE/src/lapacke_zgeesx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeesx( int matrix_layout, char jobvs, char sort,
+lapack_int API_SUFFIX(LAPACKE_zgeesx)( int matrix_layout, char jobvs, char sort,
                            LAPACK_Z_SELECT1 select, char sense, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_int* sdim, lapack_complex_double* w,
@@ -46,19 +46,19 @@ lapack_int LAPACKE_zgeesx( int matrix_layout, char jobvs, char sort,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeesx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeesx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -72,7 +72,7 @@ lapack_int LAPACKE_zgeesx( int matrix_layout, char jobvs, char sort,
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgeesx_work( matrix_layout, jobvs, sort, select, sense, n, a,
+    info = API_SUFFIX(LAPACKE_zgeesx_work)( matrix_layout, jobvs, sort, select, sense, n, a,
                                 lda, sdim, w, vs, ldvs, rconde, rcondv,
                                 &work_query, lwork, rwork, bwork );
     if( info != 0 ) {
@@ -87,7 +87,7 @@ lapack_int LAPACKE_zgeesx( int matrix_layout, char jobvs, char sort,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgeesx_work( matrix_layout, jobvs, sort, select, sense, n, a,
+    info = API_SUFFIX(LAPACKE_zgeesx_work)( matrix_layout, jobvs, sort, select, sense, n, a,
                                 lda, sdim, w, vs, ldvs, rconde, rcondv, work,
                                 lwork, rwork, bwork );
     /* Release memory and exit */
@@ -95,12 +95,12 @@ lapack_int LAPACKE_zgeesx( int matrix_layout, char jobvs, char sort,
 exit_level_2:
     LAPACKE_free( rwork );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeesx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeesx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeesx_work.c b/LAPACKE/src/lapacke_zgeesx_work.c
index b338f0f29e..c2843f05a6 100644
--- a/LAPACKE/src/lapacke_zgeesx_work.c
+++ b/LAPACKE/src/lapacke_zgeesx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeesx_work( int matrix_layout, char jobvs, char sort,
+lapack_int API_SUFFIX(LAPACKE_zgeesx_work)( int matrix_layout, char jobvs, char sort,
                                 LAPACK_Z_SELECT1 select, char sense,
                                 lapack_int n, lapack_complex_double* a,
                                 lapack_int lda, lapack_int* sdim,
@@ -59,12 +59,12 @@ lapack_int LAPACKE_zgeesx_work( int matrix_layout, char jobvs, char sort,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgeesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeesx_work", info );
             return info;
         }
         if( ldvs < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zgeesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeesx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -81,7 +81,7 @@ lapack_int LAPACKE_zgeesx_work( int matrix_layout, char jobvs, char sort,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
             vs_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvs_t * MAX(1,n) );
@@ -91,7 +91,7 @@ lapack_int LAPACKE_zgeesx_work( int matrix_layout, char jobvs, char sort,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgeesx( &jobvs, &sort, select, &sense, &n, a_t, &lda_t, sdim, w,
                        vs_t, &ldvs_t, rconde, rcondv, work, &lwork, rwork,
@@ -100,23 +100,23 @@ lapack_int LAPACKE_zgeesx_work( int matrix_layout, char jobvs, char sort,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, vs_t, ldvs_t, vs, ldvs );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, vs_t, ldvs_t, vs, ldvs );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvs, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvs, 'v' ) ) {
             LAPACKE_free( vs_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgeesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeesx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgeesx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeesx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeev.c b/LAPACKE/src/lapacke_zgeev.c
index 4ab99c3b7e..247f16c5cc 100644
--- a/LAPACKE/src/lapacke_zgeev.c
+++ b/LAPACKE/src/lapacke_zgeev.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeev( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_zgeev)( int matrix_layout, char jobvl, char jobvr,
                           lapack_int n, lapack_complex_double* a,
                           lapack_int lda, lapack_complex_double* w,
                           lapack_complex_double* vl, lapack_int ldvl,
@@ -44,13 +44,13 @@ lapack_int LAPACKE_zgeev( int matrix_layout, char jobvl, char jobvr,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
     }
@@ -62,7 +62,7 @@ lapack_int LAPACKE_zgeev( int matrix_layout, char jobvl, char jobvr,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgeev_work( matrix_layout, jobvl, jobvr, n, a, lda, w, vl,
+    info = API_SUFFIX(LAPACKE_zgeev_work)( matrix_layout, jobvl, jobvr, n, a, lda, w, vl,
                                ldvl, vr, ldvr, &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -76,7 +76,7 @@ lapack_int LAPACKE_zgeev( int matrix_layout, char jobvl, char jobvr,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgeev_work( matrix_layout, jobvl, jobvr, n, a, lda, w, vl,
+    info = API_SUFFIX(LAPACKE_zgeev_work)( matrix_layout, jobvl, jobvr, n, a, lda, w, vl,
                                ldvl, vr, ldvr, work, lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -84,7 +84,7 @@ lapack_int LAPACKE_zgeev( int matrix_layout, char jobvl, char jobvr,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeev_work.c b/LAPACKE/src/lapacke_zgeev_work.c
index 9393f825a0..e2bb5022b1 100644
--- a/LAPACKE/src/lapacke_zgeev_work.c
+++ b/LAPACKE/src/lapacke_zgeev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeev_work( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_zgeev_work)( int matrix_layout, char jobvl, char jobvr,
                                lapack_int n, lapack_complex_double* a,
                                lapack_int lda, lapack_complex_double* w,
                                lapack_complex_double* vl, lapack_int ldvl,
@@ -58,17 +58,17 @@ lapack_int LAPACKE_zgeev_work( int matrix_layout, char jobvl, char jobvr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zgeev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeev_work", info );
             return info;
         }
-        if( ldvl < n ) {
+        if( ldvl < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) && ldvl < n ) ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zgeev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeev_work", info );
             return info;
         }
-        if( ldvr < n ) {
+        if( ldvr < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) && ldvr < n ) ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zgeev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeev_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,7 +84,7 @@ lapack_int LAPACKE_zgeev_work( int matrix_layout, char jobvl, char jobvr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvl_t * MAX(1,n) );
@@ -93,7 +93,7 @@ lapack_int LAPACKE_zgeev_work( int matrix_layout, char jobvl, char jobvr,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvr_t * MAX(1,n) );
@@ -103,7 +103,7 @@ lapack_int LAPACKE_zgeev_work( int matrix_layout, char jobvl, char jobvr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgeev( &jobvl, &jobvr, &n, a_t, &lda_t, w, vl_t, &ldvl_t, vr_t,
                       &ldvr_t, work, &lwork, rwork, &info );
@@ -111,30 +111,30 @@ lapack_int LAPACKE_zgeev_work( int matrix_layout, char jobvl, char jobvr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgeev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgeev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeevx.c b/LAPACKE/src/lapacke_zgeevx.c
index 25d2e735d6..87f82afa63 100644
--- a/LAPACKE/src/lapacke_zgeevx.c
+++ b/LAPACKE/src/lapacke_zgeevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeevx( int matrix_layout, char balanc, char jobvl,
+lapack_int API_SUFFIX(LAPACKE_zgeevx)( int matrix_layout, char balanc, char jobvl,
                            char jobvr, char sense, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* w, lapack_complex_double* vl,
@@ -47,13 +47,13 @@ lapack_int LAPACKE_zgeevx( int matrix_layout, char balanc, char jobvl,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
     }
@@ -65,7 +65,7 @@ lapack_int LAPACKE_zgeevx( int matrix_layout, char balanc, char jobvl,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgeevx_work( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
+    info = API_SUFFIX(LAPACKE_zgeevx_work)( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
                                 lda, w, vl, ldvl, vr, ldvr, ilo, ihi, scale,
                                 abnrm, rconde, rcondv, &work_query, lwork,
                                 rwork );
@@ -81,7 +81,7 @@ lapack_int LAPACKE_zgeevx( int matrix_layout, char balanc, char jobvl,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgeevx_work( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
+    info = API_SUFFIX(LAPACKE_zgeevx_work)( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
                                 lda, w, vl, ldvl, vr, ldvr, ilo, ihi, scale,
                                 abnrm, rconde, rcondv, work, lwork, rwork );
     /* Release memory and exit */
@@ -90,7 +90,7 @@ lapack_int LAPACKE_zgeevx( int matrix_layout, char balanc, char jobvl,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeevx_work.c b/LAPACKE/src/lapacke_zgeevx_work.c
index e34112c09f..89599c3d04 100644
--- a/LAPACKE/src/lapacke_zgeevx_work.c
+++ b/LAPACKE/src/lapacke_zgeevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeevx_work( int matrix_layout, char balanc, char jobvl,
+lapack_int API_SUFFIX(LAPACKE_zgeevx_work)( int matrix_layout, char balanc, char jobvl,
                                 char jobvr, char sense, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* w,
@@ -62,17 +62,17 @@ lapack_int LAPACKE_zgeevx_work( int matrix_layout, char balanc, char jobvl,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgeevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeevx_work", info );
             return info;
         }
-        if( ldvl < n ) {
+        if( ldvl < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) && ldvl < n ) ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zgeevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeevx_work", info );
             return info;
         }
-        if( ldvr < n ) {
+        if( ldvr < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) && ldvr < n ) ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zgeevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeevx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -89,7 +89,7 @@ lapack_int LAPACKE_zgeevx_work( int matrix_layout, char balanc, char jobvl,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvl_t * MAX(1,n) );
@@ -98,7 +98,7 @@ lapack_int LAPACKE_zgeevx_work( int matrix_layout, char balanc, char jobvl,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvr_t * MAX(1,n) );
@@ -108,7 +108,7 @@ lapack_int LAPACKE_zgeevx_work( int matrix_layout, char balanc, char jobvl,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgeevx( &balanc, &jobvl, &jobvr, &sense, &n, a_t, &lda_t, w,
                        vl_t, &ldvl_t, vr_t, &ldvr_t, ilo, ihi, scale, abnrm,
@@ -117,30 +117,30 @@ lapack_int LAPACKE_zgeevx_work( int matrix_layout, char balanc, char jobvl,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgeevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgeevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgehrd.c b/LAPACKE/src/lapacke_zgehrd.c
index 82399abede..327091264b 100644
--- a/LAPACKE/src/lapacke_zgehrd.c
+++ b/LAPACKE/src/lapacke_zgehrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgehrd( int matrix_layout, lapack_int n, lapack_int ilo,
+lapack_int API_SUFFIX(LAPACKE_zgehrd)( int matrix_layout, lapack_int n, lapack_int ilo,
                            lapack_int ihi, lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zgehrd( int matrix_layout, lapack_int n, lapack_int ilo,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgehrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgehrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgehrd_work( matrix_layout, n, ilo, ihi, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_zgehrd_work)( matrix_layout, n, ilo, ihi, a, lda, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_zgehrd( int matrix_layout, lapack_int n, lapack_int ilo,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgehrd_work( matrix_layout, n, ilo, ihi, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_zgehrd_work)( matrix_layout, n, ilo, ihi, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgehrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgehrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgehrd_work.c b/LAPACKE/src/lapacke_zgehrd_work.c
index c79ce4dba2..d0ab87150b 100644
--- a/LAPACKE/src/lapacke_zgehrd_work.c
+++ b/LAPACKE/src/lapacke_zgehrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgehrd_work( int matrix_layout, lapack_int n, lapack_int ilo,
+lapack_int API_SUFFIX(LAPACKE_zgehrd_work)( int matrix_layout, lapack_int n, lapack_int ilo,
                                 lapack_int ihi, lapack_complex_double* a,
                                 lapack_int lda, lapack_complex_double* tau,
                                 lapack_complex_double* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zgehrd_work( int matrix_layout, lapack_int n, lapack_int ilo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zgehrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgehrd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,23 +67,23 @@ lapack_int LAPACKE_zgehrd_work( int matrix_layout, lapack_int n, lapack_int ilo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgehrd( &n, &ilo, &ihi, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgehrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgehrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgehrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgehrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgejsv.c b/LAPACKE/src/lapacke_zgejsv.c
index ccada9404e..fcf0820233 100644
--- a/LAPACKE/src/lapacke_zgejsv.c
+++ b/LAPACKE/src/lapacke_zgejsv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgejsv( int matrix_layout, char joba, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_zgejsv)( int matrix_layout, char joba, char jobu, char jobv,
                            char jobr, char jobt, char jobp, lapack_int m,
                            lapack_int n, lapack_complex_double* a, lapack_int lda, double* sva,
                            lapack_complex_double* u, lapack_int ldu, lapack_complex_double* v, lapack_int ldv,
@@ -41,96 +41,96 @@ lapack_int LAPACKE_zgejsv( int matrix_layout, char joba, char jobu, char jobv,
     lapack_int info = 0;
     lapack_int lwork = (
                 // 1.1
-        (        LAPACKE_lsame( jobu, 'n' ) &&  LAPACKE_lsame( jobv, 'n' ) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) )) ? 2*n+1 :
+        (        API_SUFFIX(LAPACKE_lsame)( jobu, 'n' ) &&  API_SUFFIX(LAPACKE_lsame)( jobv, 'n' ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) )) ? 2*n+1 :
 
                 //1.2
-     (   (       LAPACKE_lsame( jobu, 'n' ) &&  LAPACKE_lsame( jobv, 'n' ) &&
-              !( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) )) ? n*n+3*n :
+     (   (       API_SUFFIX(LAPACKE_lsame)( jobu, 'n' ) &&  API_SUFFIX(LAPACKE_lsame)( jobv, 'n' ) &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) )) ? n*n+3*n :
 
                 //2.1
-    (   (      ( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' ) )  &&
-              !( LAPACKE_lsame( jobu, 'u') ||  LAPACKE_lsame( jobu, 'f' ) )&&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))? 3*n :
+    (   (      ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) )  &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobu, 'u') ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) )&&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))? 3*n :
 
 
                 //2.2
-    (   (      ( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' ) )  &&
-              !( LAPACKE_lsame( jobu, 'u' ) ||  LAPACKE_lsame( jobu, 'f' ) ) &&
-              !( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))? 3*n :
+    (   (      ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) )  &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))? 3*n :
 
                //3.1
-     (   (      ( LAPACKE_lsame( jobu, 'u' ) ||  LAPACKE_lsame( jobu, 'f' )) &&
-              !( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' )) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))?  3*n :
+     (   (      ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' )) &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' )) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))?  3*n :
 
                //3.2
-     (   (      ( LAPACKE_lsame( jobu, 'u' ) || LAPACKE_lsame( jobu, 'f' )) &&
-              !(LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' )) &&
-              !(LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))?  3*n  :
+     (   (      ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'f' )) &&
+              !(API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' )) &&
+              !(API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))?  3*n  :
 
               //4.1
-     (  (       ( LAPACKE_lsame( jobu, 'u' ) ||  LAPACKE_lsame( jobu, 'f' ) ) &&
-               ( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' ) ) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))? 5*n+2*n*n :
+     (  (       ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))? 5*n+2*n*n :
 
               //4.2
-     (  (       ( LAPACKE_lsame( jobu, 'u' ) ||  LAPACKE_lsame( jobu, 'f' ) ) &&
-               ( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' ) ) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))? 4*n*n:
+     (  (       ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))? 4*n*n:
                        1) ) ) ) ) ) ) );
     lapack_int lrwork = (
                 // 1.1
-        (        LAPACKE_lsame( jobu, 'n' ) &&  LAPACKE_lsame( jobv, 'n' ) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) )) ? MAX(7,n+2*m) :
+        (        API_SUFFIX(LAPACKE_lsame)( jobu, 'n' ) &&  API_SUFFIX(LAPACKE_lsame)( jobv, 'n' ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) )) ? MAX(7,n+2*m) :
 
                 //1.2
-     (   (        LAPACKE_lsame( jobu, 'n' ) &&  LAPACKE_lsame( jobv, 'n' ) &&
-              !( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) )) ? MAX(7,2*n) :
+     (   (        API_SUFFIX(LAPACKE_lsame)( jobu, 'n' ) &&  API_SUFFIX(LAPACKE_lsame)( jobv, 'n' ) &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) )) ? MAX(7,2*n) :
 
                 //2.1
-    (   (      ( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' ) )  &&
-              !( LAPACKE_lsame( jobu, 'u') ||  LAPACKE_lsame( jobu, 'f' ) ) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))? MAX( 7, n+ 2*m ) :
+    (   (      ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) )  &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobu, 'u') ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))? MAX( 7, n+ 2*m ) :
 
 
                 //2.2
-    (   (      ( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' ) )  &&
-              !( LAPACKE_lsame( jobu, 'u' ) ||  LAPACKE_lsame( jobu, 'f' ) ) &&
-              !( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))? MAX(7,2*n) :
+    (   (      ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) )  &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))? MAX(7,2*n) :
 
                //3.1
-     (   (      ( LAPACKE_lsame( jobu, 'u' ) ||  LAPACKE_lsame( jobu, 'f' )) &&
-              !( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' )) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))?  MAX( 7, n+ 2*m ) :
+     (   (      ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' )) &&
+              !( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' )) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))?  MAX( 7, n+ 2*m ) :
 
                //3.2
-     (   (      ( LAPACKE_lsame( jobu, 'u' ) || LAPACKE_lsame( jobu, 'f' )) &&
-              !(LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' )) &&
-              !(LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))?  MAX(7,2*n)  :
+     (   (      ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'f' )) &&
+              !(API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' )) &&
+              !(API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))?  MAX(7,2*n)  :
 
               //4.1
-     (  (       ( LAPACKE_lsame( jobu, 'u' ) ||  LAPACKE_lsame( jobu, 'f' ) ) &&
-               ( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' ) ) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))? MAX( 7, n+ 2*m ) :
+     (  (       ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))? MAX( 7, n+ 2*m ) :
 
               //4.2
-     (  (       ( LAPACKE_lsame( jobu, 'u' ) ||  LAPACKE_lsame( jobu, 'f' ) ) &&
-               ( LAPACKE_lsame( jobv, 'v' ) ||  LAPACKE_lsame( jobv, 'j' ) ) &&
-               ( LAPACKE_lsame( jobt, 't' ) ||  LAPACKE_lsame( joba, 'f' ) || LAPACKE_lsame( joba, 'g' ) ))? MAX(7,2*n) :
+     (  (       ( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||  API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||  API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) &&
+               ( API_SUFFIX(LAPACKE_lsame)( jobt, 't' ) ||  API_SUFFIX(LAPACKE_lsame)( joba, 'f' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' ) ))? MAX(7,2*n) :
                        7) ) ) ) ) ) ) );
     lapack_int* iwork = NULL;
     double* rwork = NULL;
     lapack_complex_double* cwork = NULL;
     lapack_int i;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgejsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgejsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -10;
         }
     }
@@ -143,13 +143,13 @@ lapack_int LAPACKE_zgejsv( int matrix_layout, char joba, char jobu, char jobv,
     }
     lwork = MAX( lwork, 1 );
     { /* FIXUP LWORK */
-        int want_u = LAPACKE_lsame( jobu, 'u' ) || LAPACKE_lsame( jobu, 'f' );
-        int want_v = LAPACKE_lsame( jobv, 'v' ) || LAPACKE_lsame( jobv, 'j' );
-        int want_sce = LAPACKE_lsame( joba, 'e' ) || LAPACKE_lsame( joba, 'g' );
+        int want_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'f' );
+        int want_v = API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'j' );
+        int want_sce = API_SUFFIX(LAPACKE_lsame)( joba, 'e' ) || API_SUFFIX(LAPACKE_lsame)( joba, 'g' );
         if( !want_u && !want_v && !want_sce )  lwork = MAX( lwork, 2*n+1 ); // 1.1
         if( !want_u && !want_v && want_sce )   lwork = MAX( lwork, n*n+3*n ); // 1.2
-        if( want_u && LAPACKE_lsame( jobv, 'v' ) ) lwork = MAX( lwork, 5*n+2*n*n ); // 4.1
-        if( want_u && LAPACKE_lsame( jobv, 'j' ) ) lwork = MAX( lwork, 4*n+n*n ); // 4.2
+        if( want_u && API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) lwork = MAX( lwork, 5*n+2*n*n ); // 4.1
+        if( want_u && API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) ) lwork = MAX( lwork, 4*n+n*n ); // 4.2
     }
     cwork = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * lwork );
     if( cwork == NULL ) {
@@ -163,7 +163,7 @@ lapack_int LAPACKE_zgejsv( int matrix_layout, char joba, char jobu, char jobv,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgejsv_work( matrix_layout, joba, jobu, jobv, jobr, jobt,
+    info = API_SUFFIX(LAPACKE_zgejsv_work)( matrix_layout, joba, jobu, jobv, jobr, jobt,
                                 jobp, m, n, a, lda, sva, u, ldu, v, ldv, cwork,
                                 lwork, rwork, lrwork, iwork );
     /* Backup significant data from working array(s) */
@@ -181,7 +181,7 @@ lapack_int LAPACKE_zgejsv( int matrix_layout, char joba, char jobu, char jobv,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgejsv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgejsv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgejsv_work.c b/LAPACKE/src/lapacke_zgejsv_work.c
index 51d51023b9..1067a4ad8c 100644
--- a/LAPACKE/src/lapacke_zgejsv_work.c
+++ b/LAPACKE/src/lapacke_zgejsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgejsv_work( int matrix_layout, char joba, char jobu,
+lapack_int API_SUFFIX(LAPACKE_zgejsv_work)( int matrix_layout, char joba, char jobu,
                                 char jobv, char jobr, char jobt, char jobp,
                                 lapack_int m, lapack_int n, lapack_complex_double* a,
                                 lapack_int lda, double* sva, lapack_complex_double* u,
@@ -51,10 +51,10 @@ lapack_int LAPACKE_zgejsv_work( int matrix_layout, char joba, char jobu,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nu = LAPACKE_lsame( jobu, 'n' ) ? 1 : m;
-        lapack_int nv = LAPACKE_lsame( jobv, 'n' ) ? 1 : n;
-        lapack_int ncols_u = LAPACKE_lsame( jobu, 'n' ) ? 1 :
-            LAPACKE_lsame( jobu, 'f' ) ? m : n;
+        lapack_int nu = API_SUFFIX(LAPACKE_lsame)( jobu, 'n' ) ? 1 : m;
+        lapack_int nv = API_SUFFIX(LAPACKE_lsame)( jobv, 'n' ) ? 1 : n;
+        lapack_int ncols_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'n' ) ? 1 :
+            API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) ? m : n;
         lapack_int lda_t = MAX(1,m);
         lapack_int ldu_t = MAX(1,nu);
         lapack_int ldv_t = MAX(1,nv);
@@ -64,17 +64,17 @@ lapack_int LAPACKE_zgejsv_work( int matrix_layout, char joba, char jobu,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zgejsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgejsv_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_zgejsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgejsv_work", info );
             return info;
         }
         if( ldv < n ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_zgejsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgejsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_zgejsv_work( int matrix_layout, char joba, char jobu,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobu, 'f' ) || LAPACKE_lsame( jobu, 'u' ) ||
-            LAPACKE_lsame( jobu, 'w' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobu, 'w' ) ) {
             u_t = (lapack_complex_double*)
                LAPACKE_malloc( sizeof(lapack_complex_double) * ldu_t * MAX(1,ncols_u) );
             if( u_t == NULL ) {
@@ -93,8 +93,8 @@ lapack_int LAPACKE_zgejsv_work( int matrix_layout, char joba, char jobu,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobv, 'j' ) || LAPACKE_lsame( jobv, 'v' ) ||
-            LAPACKE_lsame( jobv, 'w' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobv, 'w' ) ) {
             v_t = (lapack_complex_double*)
                LAPACKE_malloc( sizeof(lapack_complex_double) * ldv_t * MAX(1,n) );
             if( v_t == NULL ) {
@@ -103,7 +103,7 @@ lapack_int LAPACKE_zgejsv_work( int matrix_layout, char joba, char jobu,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgejsv( &joba, &jobu, &jobv, &jobr, &jobt, &jobp, &m, &n, a_t,
                        &lda_t, sva, u_t, &ldu_t, v_t, &ldv_t, cwork, &lwork,
@@ -112,33 +112,33 @@ lapack_int LAPACKE_zgejsv_work( int matrix_layout, char joba, char jobu,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobu, 'f' ) || LAPACKE_lsame( jobu, 'u' ) ||
-            LAPACKE_lsame( jobu, 'w' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nu, ncols_u, u_t, ldu_t, u, ldu );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobu, 'w' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nu, ncols_u, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'j' ) || LAPACKE_lsame( jobv, 'v' ) ||
-            LAPACKE_lsame( jobv, 'w' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nv, n, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobv, 'w' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nv, n, v_t, ldv_t, v, ldv );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobv, 'j' ) || LAPACKE_lsame( jobv, 'v' ) ||
-            LAPACKE_lsame( jobv, 'w' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'j' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobv, 'w' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobu, 'f' ) || LAPACKE_lsame( jobu, 'u' ) ||
-            LAPACKE_lsame( jobu, 'w' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'f' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ||
+            API_SUFFIX(LAPACKE_lsame)( jobu, 'w' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgejsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgejsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgejsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgejsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgelq.c b/LAPACKE/src/lapacke_zgelq.c
index c5c2fa7195..75d899de1e 100644
--- a/LAPACKE/src/lapacke_zgelq.c
+++ b/LAPACKE/src/lapacke_zgelq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgelq( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgelq)( int matrix_layout, lapack_int m, lapack_int n,
                           lapack_complex_double* a, lapack_int lda,
                           lapack_complex_double* t, lapack_int tsize )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zgelq( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgelq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgelq_work( matrix_layout, m, n, a, lda, t, tsize, &work_query,
+    info = API_SUFFIX(LAPACKE_zgelq_work)( matrix_layout, m, n, a, lda, t, tsize, &work_query,
                                lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -69,12 +69,12 @@ lapack_int LAPACKE_zgelq( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgelq_work( matrix_layout, m, n, a, lda, t, tsize, work, lwork );
+    info = API_SUFFIX(LAPACKE_zgelq_work)( matrix_layout, m, n, a, lda, t, tsize, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgelq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgelq2.c b/LAPACKE/src/lapacke_zgelq2.c
index 56cbec346e..f0787bf08b 100644
--- a/LAPACKE/src/lapacke_zgelq2.c
+++ b/LAPACKE/src/lapacke_zgelq2.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgelq2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgelq2)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* tau )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgelq2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelq2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
@@ -58,12 +58,12 @@ lapack_int LAPACKE_zgelq2( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgelq2_work( matrix_layout, m, n, a, lda, tau, work );
+    info = API_SUFFIX(LAPACKE_zgelq2_work)( matrix_layout, m, n, a, lda, tau, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgelq2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelq2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgelq2_work.c b/LAPACKE/src/lapacke_zgelq2_work.c
index 3146803c95..7a253f293d 100644
--- a/LAPACKE/src/lapacke_zgelq2_work.c
+++ b/LAPACKE/src/lapacke_zgelq2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgelq2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgelq2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* tau,
                                 lapack_complex_double* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zgelq2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgelq2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelq2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_zgelq2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgelq2( &m, &n, a_t, &lda_t, tau, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgelq2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelq2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgelq2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelq2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgelq_work.c b/LAPACKE/src/lapacke_zgelq_work.c
index c395bc4138..39207c9c69 100644
--- a/LAPACKE/src/lapacke_zgelq_work.c
+++ b/LAPACKE/src/lapacke_zgelq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgelq_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgelq_work)( int matrix_layout, lapack_int m, lapack_int n,
                                lapack_complex_double* a, lapack_int lda,
                                lapack_complex_double* t, lapack_int tsize,
                                lapack_complex_double* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zgelq_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgelq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,23 +65,23 @@ lapack_int LAPACKE_zgelq_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgelq( &m, &n, a_t, &lda_t, t, &tsize, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgelq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgelq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgelqf.c b/LAPACKE/src/lapacke_zgelqf.c
index d14cb5f3e0..cf02c42248 100644
--- a/LAPACKE/src/lapacke_zgelqf.c
+++ b/LAPACKE/src/lapacke_zgelqf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgelqf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgelqf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zgelqf( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgelqf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelqf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgelqf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_zgelqf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,12 +67,12 @@ lapack_int LAPACKE_zgelqf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgelqf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_zgelqf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgelqf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelqf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgelqf_work.c b/LAPACKE/src/lapacke_zgelqf_work.c
index ba4ccc273e..71467cd254 100644
--- a/LAPACKE/src/lapacke_zgelqf_work.c
+++ b/LAPACKE/src/lapacke_zgelqf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgelqf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgelqf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* tau,
                                 lapack_complex_double* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zgelqf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgelqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelqf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zgelqf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgelqf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgelqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelqf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgelqf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelqf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgels.c b/LAPACKE/src/lapacke_zgels.c
index 8b72315411..47a3e39a66 100644
--- a/LAPACKE/src/lapacke_zgels.c
+++ b/LAPACKE/src/lapacke_zgels.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgels( int matrix_layout, char trans, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zgels)( int matrix_layout, char trans, lapack_int m,
                           lapack_int n, lapack_int nrhs,
                           lapack_complex_double* a, lapack_int lda,
                           lapack_complex_double* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_zgels( int matrix_layout, char trans, lapack_int m,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgels", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgels", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgels_work( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_zgels_work)( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
                                &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_zgels( int matrix_layout, char trans, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgels_work( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_zgels_work)( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
                                work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgels", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgels", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgels_work.c b/LAPACKE/src/lapacke_zgels_work.c
index b7b434d7e7..731c60f5de 100644
--- a/LAPACKE/src/lapacke_zgels_work.c
+++ b/LAPACKE/src/lapacke_zgels_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgels_work( int matrix_layout, char trans, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zgels_work)( int matrix_layout, char trans, lapack_int m,
                                lapack_int n, lapack_int nrhs,
                                lapack_complex_double* a, lapack_int lda,
                                lapack_complex_double* b, lapack_int ldb,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_zgels_work( int matrix_layout, char trans, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zgels_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgels_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zgels_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgels_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_zgels_work( int matrix_layout, char trans, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgels( &trans, &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -92,8 +92,8 @@ lapack_int LAPACKE_zgels_work( int matrix_layout, char trans, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -101,11 +101,11 @@ lapack_int LAPACKE_zgels_work( int matrix_layout, char trans, lapack_int m,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgels_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgels_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgels_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgels_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgelsd.c b/LAPACKE/src/lapacke_zgelsd.c
index 5635f8e6b9..56a887f01c 100644
--- a/LAPACKE/src/lapacke_zgelsd.c
+++ b/LAPACKE/src/lapacke_zgelsd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgelsd( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgelsd)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int nrhs, lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* b,
                            lapack_int ldb, double* s, double rcond,
@@ -50,25 +50,25 @@ lapack_int LAPACKE_zgelsd( int matrix_layout, lapack_int m, lapack_int n,
     double rwork_query;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgelsd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelsd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &rcond, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &rcond, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgelsd_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
+    info = API_SUFFIX(LAPACKE_zgelsd_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
                                 rcond, rank, &work_query, lwork, &rwork_query,
                                 &iwork_query );
     if( info != 0 ) {
@@ -95,7 +95,7 @@ lapack_int LAPACKE_zgelsd( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgelsd_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
+    info = API_SUFFIX(LAPACKE_zgelsd_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
                                 rcond, rank, work, lwork, rwork, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -105,7 +105,7 @@ lapack_int LAPACKE_zgelsd( int matrix_layout, lapack_int m, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgelsd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelsd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgelsd_work.c b/LAPACKE/src/lapacke_zgelsd_work.c
index 09004cc723..8aca905855 100644
--- a/LAPACKE/src/lapacke_zgelsd_work.c
+++ b/LAPACKE/src/lapacke_zgelsd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgelsd_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int nrhs, lapack_complex_double* a,
                                 lapack_int lda, lapack_complex_double* b,
                                 lapack_int ldb, double* s, double rcond,
@@ -56,12 +56,12 @@ lapack_int LAPACKE_zgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zgelsd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelsd_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgelsd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelsd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -85,8 +85,8 @@ lapack_int LAPACKE_zgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgelsd( &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, s, &rcond, rank,
                        work, &lwork, rwork, iwork, &info );
@@ -94,8 +94,8 @@ lapack_int LAPACKE_zgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -103,11 +103,11 @@ lapack_int LAPACKE_zgelsd_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgelsd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelsd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgelsd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelsd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgelss.c b/LAPACKE/src/lapacke_zgelss.c
index c3a70e664c..6ca68d064c 100644
--- a/LAPACKE/src/lapacke_zgelss.c
+++ b/LAPACKE/src/lapacke_zgelss.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgelss( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgelss)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int nrhs, lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* b,
                            lapack_int ldb, double* s, double rcond,
@@ -44,19 +44,19 @@ lapack_int LAPACKE_zgelss( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgelss", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelss", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &rcond, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &rcond, 1 ) ) {
             return -10;
         }
     }
@@ -68,7 +68,7 @@ lapack_int LAPACKE_zgelss( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgelss_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
+    info = API_SUFFIX(LAPACKE_zgelss_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
                                 rcond, rank, &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -82,7 +82,7 @@ lapack_int LAPACKE_zgelss( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgelss_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
+    info = API_SUFFIX(LAPACKE_zgelss_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, s,
                                 rcond, rank, work, lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -90,7 +90,7 @@ lapack_int LAPACKE_zgelss( int matrix_layout, lapack_int m, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgelss", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelss", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgelss_work.c b/LAPACKE/src/lapacke_zgelss_work.c
index 92c5b8cccc..2a3d469a34 100644
--- a/LAPACKE/src/lapacke_zgelss_work.c
+++ b/LAPACKE/src/lapacke_zgelss_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgelss_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgelss_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int nrhs, lapack_complex_double* a,
                                 lapack_int lda, lapack_complex_double* b,
                                 lapack_int ldb, double* s, double rcond,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_zgelss_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zgelss_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelss_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgelss_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelss_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_zgelss_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgelss( &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, s, &rcond, rank,
                        work, &lwork, rwork, &info );
@@ -93,8 +93,8 @@ lapack_int LAPACKE_zgelss_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -102,11 +102,11 @@ lapack_int LAPACKE_zgelss_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgelss_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelss_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgelss_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelss_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgelsy.c b/LAPACKE/src/lapacke_zgelsy.c
index e340d6d16d..fe4793baae 100644
--- a/LAPACKE/src/lapacke_zgelsy.c
+++ b/LAPACKE/src/lapacke_zgelsy.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgelsy( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgelsy)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int nrhs, lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* b,
                            lapack_int ldb, lapack_int* jpvt, double rcond,
@@ -44,19 +44,19 @@ lapack_int LAPACKE_zgelsy( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgelsy", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelsy", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &rcond, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &rcond, 1 ) ) {
             return -10;
         }
     }
@@ -68,7 +68,7 @@ lapack_int LAPACKE_zgelsy( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgelsy_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, jpvt,
+    info = API_SUFFIX(LAPACKE_zgelsy_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, jpvt,
                                 rcond, rank, &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -82,7 +82,7 @@ lapack_int LAPACKE_zgelsy( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgelsy_work( matrix_layout, m, n, nrhs, a, lda, b, ldb, jpvt,
+    info = API_SUFFIX(LAPACKE_zgelsy_work)( matrix_layout, m, n, nrhs, a, lda, b, ldb, jpvt,
                                 rcond, rank, work, lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -90,7 +90,7 @@ lapack_int LAPACKE_zgelsy( int matrix_layout, lapack_int m, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgelsy", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelsy", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgelsy_work.c b/LAPACKE/src/lapacke_zgelsy_work.c
index 03ee8d0d50..9a2dad97b7 100644
--- a/LAPACKE/src/lapacke_zgelsy_work.c
+++ b/LAPACKE/src/lapacke_zgelsy_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgelsy_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int nrhs, lapack_complex_double* a,
                                 lapack_int lda, lapack_complex_double* b,
                                 lapack_int ldb, lapack_int* jpvt, double rcond,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_zgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zgelsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelsy_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgelsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelsy_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_zgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgelsy( &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, jpvt, &rcond,
                        rank, work, &lwork, rwork, &info );
@@ -93,8 +93,8 @@ lapack_int LAPACKE_zgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -102,11 +102,11 @@ lapack_int LAPACKE_zgelsy_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgelsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelsy_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgelsy_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgelsy_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgemlq.c b/LAPACKE/src/lapacke_zgemlq.c
index 8825594a2d..0a35828fa9 100644
--- a/LAPACKE/src/lapacke_zgemlq.c
+++ b/LAPACKE/src/lapacke_zgemlq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgemlq( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zgemlq)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const lapack_complex_double* a, lapack_int lda,
                            const lapack_complex_double* t, lapack_int tsize,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_zgemlq( int matrix_layout, char side, char trans,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgemlq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemlq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, k, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, k, m, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_z_nancheck( tsize, t, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( tsize, t, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgemlq_work( matrix_layout, side, trans, m, n, k, a, lda,
+    info = API_SUFFIX(LAPACKE_zgemlq_work)( matrix_layout, side, trans, m, n, k, a, lda,
                                 t, tsize, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -74,13 +74,13 @@ lapack_int LAPACKE_zgemlq( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgemlq_work( matrix_layout, side, trans, m, n, k, a, lda,
+    info = API_SUFFIX(LAPACKE_zgemlq_work)( matrix_layout, side, trans, m, n, k, a, lda,
                                 t, tsize, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgemlq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemlq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgemlq_work.c b/LAPACKE/src/lapacke_zgemlq_work.c
index 50261f10a9..36e6efa183 100644
--- a/LAPACKE/src/lapacke_zgemlq_work.c
+++ b/LAPACKE/src/lapacke_zgemlq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgemlq_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zgemlq_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const lapack_complex_double* a, lapack_int lda,
                                 const lapack_complex_double* t, lapack_int tsize,
@@ -51,18 +51,18 @@ lapack_int LAPACKE_zgemlq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lda_t = MAX(1,k);
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( lda < r ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgemlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemlq_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zgemlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemlq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -72,7 +72,7 @@ lapack_int LAPACKE_zgemlq_work( int matrix_layout, char side, char trans,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             a_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * lda_t * MAX(1,m) );
         } else {
             a_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * lda_t * MAX(1,n) );
@@ -87,8 +87,8 @@ lapack_int LAPACKE_zgemlq_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, k, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgemlq( &side, &trans, &m, &n, &k, a_t, &lda_t, t, &tsize,
                        c_t, &ldc_t, work, &lwork, &info );
@@ -96,18 +96,18 @@ lapack_int LAPACKE_zgemlq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgemlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemlq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgemlq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemlq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgemqr.c b/LAPACKE/src/lapacke_zgemqr.c
index c793ef34b8..ae2e6ec571 100644
--- a/LAPACKE/src/lapacke_zgemqr.c
+++ b/LAPACKE/src/lapacke_zgemqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgemqr( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zgemqr)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const lapack_complex_double* a, lapack_int lda,
                            const lapack_complex_double* t, lapack_int tsize,
@@ -44,26 +44,26 @@ lapack_int LAPACKE_zgemqr( int matrix_layout, char side, char trans,
     lapack_complex_double work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgemqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_zge_nancheck( matrix_layout, r, k, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, r, k, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_z_nancheck( tsize, t, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( tsize, t, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgemqr_work( matrix_layout, side, trans, m, n, k, a, lda,
+    info = API_SUFFIX(LAPACKE_zgemqr_work)( matrix_layout, side, trans, m, n, k, a, lda,
                                 t, tsize, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -77,13 +77,13 @@ lapack_int LAPACKE_zgemqr( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgemqr_work( matrix_layout, side, trans, m, n, k, a, lda,
+    info = API_SUFFIX(LAPACKE_zgemqr_work)( matrix_layout, side, trans, m, n, k, a, lda,
                                 t, tsize, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgemqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgemqr_work.c b/LAPACKE/src/lapacke_zgemqr_work.c
index 88d06c2846..6f88e8c20f 100644
--- a/LAPACKE/src/lapacke_zgemqr_work.c
+++ b/LAPACKE/src/lapacke_zgemqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgemqr_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zgemqr_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const lapack_complex_double* a, lapack_int lda,
                                 const lapack_complex_double* t, lapack_int tsize,
@@ -51,18 +51,18 @@ lapack_int LAPACKE_zgemqr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lda_t = MAX(1,r);
         ldc_t = MAX(1,m);
         /* Check leading dimension(s) */
         if( lda < k ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgemqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemqr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zgemqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -85,8 +85,8 @@ lapack_int LAPACKE_zgemqr_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, r, k, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, r, k, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgemqr( &side, &trans, &m, &n, &k, a_t, &lda_t, t, &tsize,
                        c_t, &ldc_t, work, &lwork, &info );
@@ -94,18 +94,18 @@ lapack_int LAPACKE_zgemqr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgemqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgemqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgemqrt.c b/LAPACKE/src/lapacke_zgemqrt.c
index 65b4684050..00ebbf1f5d 100644
--- a/LAPACKE/src/lapacke_zgemqrt.c
+++ b/LAPACKE/src/lapacke_zgemqrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgemqrt( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zgemqrt)( int matrix_layout, char side, char trans,
                             lapack_int m, lapack_int n, lapack_int k,
                             lapack_int nb, const lapack_complex_double* v,
                             lapack_int ldv, const lapack_complex_double* t,
@@ -43,21 +43,21 @@ lapack_int LAPACKE_zgemqrt( int matrix_layout, char side, char trans,
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgemqrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemqrt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        nrows_v = LAPACKE_lsame( side, 'L' ) ? m :
-                             ( LAPACKE_lsame( side, 'R' ) ? n : 0 );
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? m :
+                             ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? n : 0 );
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -12;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, nb, k, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, nb, k, t, ldt ) ) {
             return -10;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, nrows_v, k, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, nrows_v, k, v, ldv ) ) {
             return -8;
         }
     }
@@ -70,13 +70,13 @@ lapack_int LAPACKE_zgemqrt( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgemqrt_work( matrix_layout, side, trans, m, n, k, nb, v, ldv,
+    info = API_SUFFIX(LAPACKE_zgemqrt_work)( matrix_layout, side, trans, m, n, k, nb, v, ldv,
                                  t, ldt, c, ldc, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgemqrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemqrt", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgemqrt_work.c b/LAPACKE/src/lapacke_zgemqrt_work.c
index 734889efb5..cc2063529e 100644
--- a/LAPACKE/src/lapacke_zgemqrt_work.c
+++ b/LAPACKE/src/lapacke_zgemqrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgemqrt_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zgemqrt_work)( int matrix_layout, char side, char trans,
                                  lapack_int m, lapack_int n, lapack_int k,
                                  lapack_int nb, const lapack_complex_double* v,
                                  lapack_int ldv, const lapack_complex_double* t,
@@ -57,17 +57,17 @@ lapack_int LAPACKE_zgemqrt_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( ldc < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zgemqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemqrt_work", info );
             return info;
         }
         if( ldt < nb ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zgemqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemqrt_work", info );
             return info;
         }
         if( ldv < k ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zgemqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemqrt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -90,9 +90,9 @@ lapack_int LAPACKE_zgemqrt_work( int matrix_layout, char side, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
-        LAPACKE_zge_trans( matrix_layout, ldt, nb, t, ldt, t_t, ldt_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, ldt, nb, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgemqrt( &side, &trans, &m, &n, &k, &nb, v_t, &ldv_t, t_t,
                         &ldt_t, c_t, &ldc_t, work, &info );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_zgemqrt_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_2:
@@ -109,11 +109,11 @@ lapack_int LAPACKE_zgemqrt_work( int matrix_layout, char side, char trans,
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgemqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemqrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgemqrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgemqrt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqlf.c b/LAPACKE/src/lapacke_zgeqlf.c
index 499270f629..cd6e3ca6ba 100644
--- a/LAPACKE/src/lapacke_zgeqlf.c
+++ b/LAPACKE/src/lapacke_zgeqlf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqlf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqlf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zgeqlf( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqlf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqlf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgeqlf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_zgeqlf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,12 +67,12 @@ lapack_int LAPACKE_zgeqlf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgeqlf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_zgeqlf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqlf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqlf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqlf_work.c b/LAPACKE/src/lapacke_zgeqlf_work.c
index fe10813a34..1ea6ba30dd 100644
--- a/LAPACKE/src/lapacke_zgeqlf_work.c
+++ b/LAPACKE/src/lapacke_zgeqlf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqlf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqlf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* tau,
                                 lapack_complex_double* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zgeqlf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgeqlf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqlf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zgeqlf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgeqlf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgeqlf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqlf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgeqlf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqlf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqp3.c b/LAPACKE/src/lapacke_zgeqp3.c
index 2aafafc869..0c40fe7771 100644
--- a/LAPACKE/src/lapacke_zgeqp3.c
+++ b/LAPACKE/src/lapacke_zgeqp3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqp3( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqp3)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_int* jpvt, lapack_complex_double* tau )
 {
@@ -42,13 +42,13 @@ lapack_int LAPACKE_zgeqp3( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqp3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqp3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
@@ -60,7 +60,7 @@ lapack_int LAPACKE_zgeqp3( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgeqp3_work( matrix_layout, m, n, a, lda, jpvt, tau,
+    info = API_SUFFIX(LAPACKE_zgeqp3_work)( matrix_layout, m, n, a, lda, jpvt, tau,
                                 &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -74,7 +74,7 @@ lapack_int LAPACKE_zgeqp3( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgeqp3_work( matrix_layout, m, n, a, lda, jpvt, tau, work,
+    info = API_SUFFIX(LAPACKE_zgeqp3_work)( matrix_layout, m, n, a, lda, jpvt, tau, work,
                                 lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -82,7 +82,7 @@ lapack_int LAPACKE_zgeqp3( int matrix_layout, lapack_int m, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqp3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqp3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqp3_work.c b/LAPACKE/src/lapacke_zgeqp3_work.c
index 76d437f871..04b82c0c4a 100644
--- a/LAPACKE/src/lapacke_zgeqp3_work.c
+++ b/LAPACKE/src/lapacke_zgeqp3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqp3_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqp3_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_int* jpvt, lapack_complex_double* tau,
                                 lapack_complex_double* work, lapack_int lwork,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zgeqp3_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgeqp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqp3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -68,7 +68,7 @@ lapack_int LAPACKE_zgeqp3_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgeqp3( &m, &n, a_t, &lda_t, jpvt, tau, work, &lwork, rwork,
                        &info );
@@ -76,16 +76,16 @@ lapack_int LAPACKE_zgeqp3_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgeqp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqp3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgeqp3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqp3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqpf.c b/LAPACKE/src/lapacke_zgeqpf.c
index c5be1df529..df9361ac95 100644
--- a/LAPACKE/src/lapacke_zgeqpf.c
+++ b/LAPACKE/src/lapacke_zgeqpf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqpf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqpf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_int* jpvt, lapack_complex_double* tau )
 {
@@ -40,13 +40,13 @@ lapack_int LAPACKE_zgeqpf( int matrix_layout, lapack_int m, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqpf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqpf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
@@ -64,7 +64,7 @@ lapack_int LAPACKE_zgeqpf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgeqpf_work( matrix_layout, m, n, a, lda, jpvt, tau, work,
+    info = API_SUFFIX(LAPACKE_zgeqpf_work)( matrix_layout, m, n, a, lda, jpvt, tau, work,
                                 rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -72,7 +72,7 @@ lapack_int LAPACKE_zgeqpf( int matrix_layout, lapack_int m, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqpf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqpf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqpf_work.c b/LAPACKE/src/lapacke_zgeqpf_work.c
index 489805d388..ae653dbb62 100644
--- a/LAPACKE/src/lapacke_zgeqpf_work.c
+++ b/LAPACKE/src/lapacke_zgeqpf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqpf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqpf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_int* jpvt, lapack_complex_double* tau,
                                 lapack_complex_double* work, double* rwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zgeqpf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgeqpf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqpf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_zgeqpf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgeqpf( &m, &n, a_t, &lda_t, jpvt, tau, work, rwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgeqpf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqpf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgeqpf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqpf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqr.c b/LAPACKE/src/lapacke_zgeqr.c
index 78eca38e3b..621f51960c 100644
--- a/LAPACKE/src/lapacke_zgeqr.c
+++ b/LAPACKE/src/lapacke_zgeqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqr( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqr)( int matrix_layout, lapack_int m, lapack_int n,
                           lapack_complex_double* a, lapack_int lda,
                           lapack_complex_double* t, lapack_int tsize )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zgeqr( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgeqr_work( matrix_layout, m, n, a, lda, t, tsize, &work_query,
+    info = API_SUFFIX(LAPACKE_zgeqr_work)( matrix_layout, m, n, a, lda, t, tsize, &work_query,
                                lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,12 +70,12 @@ lapack_int LAPACKE_zgeqr( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgeqr_work( matrix_layout, m, n, a, lda, t, tsize, work, lwork );
+    info = API_SUFFIX(LAPACKE_zgeqr_work)( matrix_layout, m, n, a, lda, t, tsize, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqr2.c b/LAPACKE/src/lapacke_zgeqr2.c
index eaa6adb093..13343ca94e 100644
--- a/LAPACKE/src/lapacke_zgeqr2.c
+++ b/LAPACKE/src/lapacke_zgeqr2.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqr2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqr2)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* tau )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqr2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqr2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
@@ -58,12 +58,12 @@ lapack_int LAPACKE_zgeqr2( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgeqr2_work( matrix_layout, m, n, a, lda, tau, work );
+    info = API_SUFFIX(LAPACKE_zgeqr2_work)( matrix_layout, m, n, a, lda, tau, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqr2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqr2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqr2_work.c b/LAPACKE/src/lapacke_zgeqr2_work.c
index 7a428b49f5..573dfb7cb3 100644
--- a/LAPACKE/src/lapacke_zgeqr2_work.c
+++ b/LAPACKE/src/lapacke_zgeqr2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqr2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqr2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* tau,
                                 lapack_complex_double* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zgeqr2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgeqr2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqr2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_zgeqr2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgeqr2( &m, &n, a_t, &lda_t, tau, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgeqr2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqr2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgeqr2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqr2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqr_work.c b/LAPACKE/src/lapacke_zgeqr_work.c
index 9a2ff6d4bc..cf1b9b9e9f 100644
--- a/LAPACKE/src/lapacke_zgeqr_work.c
+++ b/LAPACKE/src/lapacke_zgeqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqr_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqr_work)( int matrix_layout, lapack_int m, lapack_int n,
                                lapack_complex_double* a, lapack_int lda,
                                lapack_complex_double* t, lapack_int tsize,
                                lapack_complex_double* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zgeqr_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgeqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zgeqr_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgeqr( &m, &n, a_t, &lda_t, t, &tsize, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgeqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgeqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqrf.c b/LAPACKE/src/lapacke_zgeqrf.c
index 71b6341198..9f492359f0 100644
--- a/LAPACKE/src/lapacke_zgeqrf.c
+++ b/LAPACKE/src/lapacke_zgeqrf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqrf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqrf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zgeqrf( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgeqrf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_zgeqrf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,12 +67,12 @@ lapack_int LAPACKE_zgeqrf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgeqrf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_zgeqrf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqrf_work.c b/LAPACKE/src/lapacke_zgeqrf_work.c
index a13b9ecd6f..7463d5c834 100644
--- a/LAPACKE/src/lapacke_zgeqrf_work.c
+++ b/LAPACKE/src/lapacke_zgeqrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqrf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqrf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* tau,
                                 lapack_complex_double* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zgeqrf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgeqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zgeqrf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgeqrf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgeqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgeqrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqrfp.c b/LAPACKE/src/lapacke_zgeqrfp.c
index d1e64a3dfd..1b4e4c57f2 100644
--- a/LAPACKE/src/lapacke_zgeqrfp.c
+++ b/LAPACKE/src/lapacke_zgeqrfp.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqrfp( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqrfp)( int matrix_layout, lapack_int m, lapack_int n,
                             lapack_complex_double* a, lapack_int lda,
                             lapack_complex_double* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zgeqrfp( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqrfp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrfp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgeqrfp_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_zgeqrfp_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                  lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,12 +67,12 @@ lapack_int LAPACKE_zgeqrfp( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgeqrfp_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_zgeqrfp_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqrfp", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrfp", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqrfp_work.c b/LAPACKE/src/lapacke_zgeqrfp_work.c
index 919e3a0cb7..8eea37babd 100644
--- a/LAPACKE/src/lapacke_zgeqrfp_work.c
+++ b/LAPACKE/src/lapacke_zgeqrfp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqrfp_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqrfp_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  lapack_complex_double* a, lapack_int lda,
                                  lapack_complex_double* tau,
                                  lapack_complex_double* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zgeqrfp_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgeqrfp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrfp_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zgeqrfp_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgeqrfp( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgeqrfp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrfp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgeqrfp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrfp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqrt.c b/LAPACKE/src/lapacke_zgeqrt.c
index 0612daee58..d230784eda 100644
--- a/LAPACKE/src/lapacke_zgeqrt.c
+++ b/LAPACKE/src/lapacke_zgeqrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqrt( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqrt)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int nb, lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* t,
                            lapack_int ldt )
@@ -40,13 +40,13 @@ lapack_int LAPACKE_zgeqrt( int matrix_layout, lapack_int m, lapack_int n,
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
@@ -59,12 +59,12 @@ lapack_int LAPACKE_zgeqrt( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgeqrt_work( matrix_layout, m, n, nb, a, lda, t, ldt, work );
+    info = API_SUFFIX(LAPACKE_zgeqrt_work)( matrix_layout, m, n, nb, a, lda, t, ldt, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrt", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqrt2.c b/LAPACKE/src/lapacke_zgeqrt2.c
index 5209a41001..a0522c09b5 100644
--- a/LAPACKE/src/lapacke_zgeqrt2.c
+++ b/LAPACKE/src/lapacke_zgeqrt2.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqrt2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqrt2)( int matrix_layout, lapack_int m, lapack_int n,
                             lapack_complex_double* a, lapack_int lda,
                             lapack_complex_double* t, lapack_int ldt )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqrt2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrt2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zgeqrt2_work( matrix_layout, m, n, a, lda, t, ldt );
+    return API_SUFFIX(LAPACKE_zgeqrt2_work)( matrix_layout, m, n, a, lda, t, ldt );
 }
diff --git a/LAPACKE/src/lapacke_zgeqrt2_work.c b/LAPACKE/src/lapacke_zgeqrt2_work.c
index 90f17f276d..718cdbeb03 100644
--- a/LAPACKE/src/lapacke_zgeqrt2_work.c
+++ b/LAPACKE/src/lapacke_zgeqrt2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqrt2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqrt2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  lapack_complex_double* a, lapack_int lda,
                                  lapack_complex_double* t, lapack_int ldt )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_zgeqrt2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgeqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrt2_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zgeqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrt2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -73,26 +73,26 @@ lapack_int LAPACKE_zgeqrt2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgeqrt2( &m, &n, a_t, &lda_t, t_t, &ldt_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgeqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrt2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgeqrt2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrt2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqrt3.c b/LAPACKE/src/lapacke_zgeqrt3.c
index 97a6ae71c6..7d26d0d14e 100644
--- a/LAPACKE/src/lapacke_zgeqrt3.c
+++ b/LAPACKE/src/lapacke_zgeqrt3.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqrt3( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqrt3)( int matrix_layout, lapack_int m, lapack_int n,
                             lapack_complex_double* a, lapack_int lda,
                             lapack_complex_double* t, lapack_int ldt )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgeqrt3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrt3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zgeqrt3_work( matrix_layout, m, n, a, lda, t, ldt );
+    return API_SUFFIX(LAPACKE_zgeqrt3_work)( matrix_layout, m, n, a, lda, t, ldt );
 }
diff --git a/LAPACKE/src/lapacke_zgeqrt3_work.c b/LAPACKE/src/lapacke_zgeqrt3_work.c
index 048ec92d23..02f898a30d 100644
--- a/LAPACKE/src/lapacke_zgeqrt3_work.c
+++ b/LAPACKE/src/lapacke_zgeqrt3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqrt3_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqrt3_work)( int matrix_layout, lapack_int m, lapack_int n,
                                  lapack_complex_double* a, lapack_int lda,
                                  lapack_complex_double* t, lapack_int ldt )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_zgeqrt3_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgeqrt3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrt3_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zgeqrt3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrt3_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -73,26 +73,26 @@ lapack_int LAPACKE_zgeqrt3_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgeqrt3( &m, &n, a_t, &lda_t, t_t, &ldt_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgeqrt3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrt3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgeqrt3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrt3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgeqrt_work.c b/LAPACKE/src/lapacke_zgeqrt_work.c
index 8f6f1ed0ba..2ba60db2e3 100644
--- a/LAPACKE/src/lapacke_zgeqrt_work.c
+++ b/LAPACKE/src/lapacke_zgeqrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgeqrt_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgeqrt_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int nb, lapack_complex_double* a,
                                 lapack_int lda, lapack_complex_double* t,
                                 lapack_int ldt, lapack_complex_double* work )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_zgeqrt_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zgeqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrt_work", info );
             return info;
         }
         if( ldt < MIN(m,n) ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgeqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,15 +75,15 @@ lapack_int LAPACKE_zgeqrt_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgeqrt( &m, &n, &nb, a_t, &lda_t, t_t, &ldt_t, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, ldt, MIN(m,n), t_t, ldt_t, t,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nb, MIN(m,n), t_t, ldt_t, t,
                            ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
@@ -91,11 +91,11 @@ lapack_int LAPACKE_zgeqrt_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgeqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgeqrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgeqrt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgerfs.c b/LAPACKE/src/lapacke_zgerfs.c
index 47e38aeeeb..dea0d804ff 100644
--- a/LAPACKE/src/lapacke_zgerfs.c
+++ b/LAPACKE/src/lapacke_zgerfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgerfs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgerfs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* a,
                            lapack_int lda, const lapack_complex_double* af,
                            lapack_int ldaf, const lapack_int* ipiv,
@@ -44,22 +44,22 @@ lapack_int LAPACKE_zgerfs( int matrix_layout, char trans, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgerfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, af, ldaf ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -77,7 +77,7 @@ lapack_int LAPACKE_zgerfs( int matrix_layout, char trans, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgerfs_work( matrix_layout, trans, n, nrhs, a, lda, af, ldaf,
+    info = API_SUFFIX(LAPACKE_zgerfs_work)( matrix_layout, trans, n, nrhs, a, lda, af, ldaf,
                                 ipiv, b, ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -85,7 +85,7 @@ lapack_int LAPACKE_zgerfs( int matrix_layout, char trans, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgerfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgerfs_work.c b/LAPACKE/src/lapacke_zgerfs_work.c
index b1804ddbf8..ac2cfb9a74 100644
--- a/LAPACKE/src/lapacke_zgerfs_work.c
+++ b/LAPACKE/src/lapacke_zgerfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgerfs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgerfs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_double* a,
                                 lapack_int lda, const lapack_complex_double* af,
                                 lapack_int ldaf, const lapack_int* ipiv,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_zgerfs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerfs_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -107,10 +107,10 @@ lapack_int LAPACKE_zgerfs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgerfs( &trans, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, ipiv, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, rwork, &info );
@@ -118,7 +118,7 @@ lapack_int LAPACKE_zgerfs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -129,11 +129,11 @@ lapack_int LAPACKE_zgerfs_work( int matrix_layout, char trans, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgerfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgerfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgerfsx.c b/LAPACKE/src/lapacke_zgerfsx.c
index de15f8d2bb..79c5e34350 100644
--- a/LAPACKE/src/lapacke_zgerfsx.c
+++ b/LAPACKE/src/lapacke_zgerfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgerfsx( int matrix_layout, char trans, char equed,
+lapack_int API_SUFFIX(LAPACKE_zgerfsx)( int matrix_layout, char trans, char equed,
                             lapack_int n, lapack_int nrhs,
                             const lapack_complex_double* a, lapack_int lda,
                             const lapack_complex_double* af, lapack_int ldaf,
@@ -48,37 +48,37 @@ lapack_int LAPACKE_zgerfsx( int matrix_layout, char trans, char equed,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgerfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerfsx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, af, ldaf ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
-        if( LAPACKE_lsame( equed, 'b' ) || LAPACKE_lsame( equed, 'c' ) ) {
-            if( LAPACKE_d_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'b' ) || API_SUFFIX(LAPACKE_lsame)( equed, 'c' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, c, 1 ) ) {
                 return -12;
             }
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -23;
             }
         }
-        if( LAPACKE_lsame( equed, 'b' ) || LAPACKE_lsame( equed, 'r' ) ) {
-            if( LAPACKE_d_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'b' ) || API_SUFFIX(LAPACKE_lsame)( equed, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, r, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -15;
         }
     }
@@ -96,7 +96,7 @@ lapack_int LAPACKE_zgerfsx( int matrix_layout, char trans, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgerfsx_work( matrix_layout, trans, equed, n, nrhs, a, lda,
+    info = API_SUFFIX(LAPACKE_zgerfsx_work)( matrix_layout, trans, equed, n, nrhs, a, lda,
                                  af, ldaf, ipiv, r, c, b, ldb, x, ldx, rcond,
                                  berr, n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, rwork );
@@ -106,7 +106,7 @@ lapack_int LAPACKE_zgerfsx( int matrix_layout, char trans, char equed,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgerfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgerfsx_work.c b/LAPACKE/src/lapacke_zgerfsx_work.c
index a56a5ae623..e58c8b93e5 100644
--- a/LAPACKE/src/lapacke_zgerfsx_work.c
+++ b/LAPACKE/src/lapacke_zgerfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgerfsx_work( int matrix_layout, char trans, char equed,
+lapack_int API_SUFFIX(LAPACKE_zgerfsx_work)( int matrix_layout, char trans, char equed,
                                  lapack_int n, lapack_int nrhs,
                                  const lapack_complex_double* a, lapack_int lda,
                                  const lapack_complex_double* af,
@@ -70,22 +70,22 @@ lapack_int LAPACKE_zgerfsx_work( int matrix_layout, char trans, char equed,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerfsx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_zgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_zgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -128,10 +128,10 @@ lapack_int LAPACKE_zgerfsx_work( int matrix_layout, char trans, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgerfsx( &trans, &equed, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, r, c, b_t, &ldb_t, x_t, &ldx_t, rcond, berr,
@@ -141,10 +141,10 @@ lapack_int LAPACKE_zgerfsx_work( int matrix_layout, char trans, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -160,11 +160,11 @@ lapack_int LAPACKE_zgerfsx_work( int matrix_layout, char trans, char equed,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgerfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgerfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgerqf.c b/LAPACKE/src/lapacke_zgerqf.c
index e9629bb958..80e9277b05 100644
--- a/LAPACKE/src/lapacke_zgerqf.c
+++ b/LAPACKE/src/lapacke_zgerqf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgerqf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgerqf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zgerqf( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgerqf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerqf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgerqf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_zgerqf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,12 +67,12 @@ lapack_int LAPACKE_zgerqf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgerqf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_zgerqf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgerqf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerqf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgerqf_work.c b/LAPACKE/src/lapacke_zgerqf_work.c
index 8a375832b4..5a2c50ef9e 100644
--- a/LAPACKE/src/lapacke_zgerqf_work.c
+++ b/LAPACKE/src/lapacke_zgerqf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgerqf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgerqf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* tau,
                                 lapack_complex_double* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zgerqf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgerqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerqf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zgerqf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgerqf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgerqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerqf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgerqf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgerqf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgesdd.c b/LAPACKE/src/lapacke_zgesdd.c
index 1f465001ba..412690cf78 100644
--- a/LAPACKE/src/lapacke_zgesdd.c
+++ b/LAPACKE/src/lapacke_zgesdd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgesdd( int matrix_layout, char jobz, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zgesdd)( int matrix_layout, char jobz, lapack_int m,
                            lapack_int n, lapack_complex_double* a,
                            lapack_int lda, double* s, lapack_complex_double* u,
                            lapack_int ldu, lapack_complex_double* vt,
@@ -47,19 +47,19 @@ lapack_int LAPACKE_zgesdd( int matrix_layout, char jobz, lapack_int m,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgesdd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesdd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( jobz, 'n' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( jobz, 'n' ) ) {
         lrwork = MAX(1,7*MIN(m,n));
     } else {
         lrwork = (size_t)MAX(1,MIN(m,n)*MAX(5*MIN(m,n)+7,2*MAX(m,n)+2*MIN(m,n)+1));
@@ -77,7 +77,7 @@ lapack_int LAPACKE_zgesdd( int matrix_layout, char jobz, lapack_int m,
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgesdd_work( matrix_layout, jobz, m, n, a, lda, s, u, ldu, vt,
+    info = API_SUFFIX(LAPACKE_zgesdd_work)( matrix_layout, jobz, m, n, a, lda, s, u, ldu, vt,
                                 ldvt, &work_query, lwork, rwork, iwork );
     if( info != 0 ) {
         goto exit_level_2;
@@ -91,7 +91,7 @@ lapack_int LAPACKE_zgesdd( int matrix_layout, char jobz, lapack_int m,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgesdd_work( matrix_layout, jobz, m, n, a, lda, s, u, ldu, vt,
+    info = API_SUFFIX(LAPACKE_zgesdd_work)( matrix_layout, jobz, m, n, a, lda, s, u, ldu, vt,
                                 ldvt, work, lwork, rwork, iwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -101,7 +101,7 @@ lapack_int LAPACKE_zgesdd( int matrix_layout, char jobz, lapack_int m,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgesdd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesdd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgesdd_work.c b/LAPACKE/src/lapacke_zgesdd_work.c
index fc07fe9cbf..7bb5dacdc4 100644
--- a/LAPACKE/src/lapacke_zgesdd_work.c
+++ b/LAPACKE/src/lapacke_zgesdd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgesdd_work( int matrix_layout, char jobz, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zgesdd_work)( int matrix_layout, char jobz, lapack_int m,
                                 lapack_int n, lapack_complex_double* a,
                                 lapack_int lda, double* s,
                                 lapack_complex_double* u, lapack_int ldu,
@@ -49,15 +49,18 @@ lapack_int LAPACKE_zgesdd_work( int matrix_layout, char jobz, lapack_int m,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_u = ( LAPACKE_lsame( jobz, 'a' ) ||
-                             LAPACKE_lsame( jobz, 's' ) ||
-                             ( LAPACKE_lsame( jobz, 'o' ) && m<n) ) ? m : 1;
-        lapack_int ncols_u = ( LAPACKE_lsame( jobz, 'a' ) ||
-                             ( LAPACKE_lsame( jobz, 'o' ) && m<n) ) ? m :
-                             ( LAPACKE_lsame( jobz, 's' ) ? MIN(m,n) : 1);
-        lapack_int nrows_vt = ( LAPACKE_lsame( jobz, 'a' ) ||
-                              ( LAPACKE_lsame( jobz, 'o' ) && m>=n) ) ? n :
-                              ( LAPACKE_lsame( jobz, 's' ) ? MIN(m,n) : 1);
+        lapack_int nrows_u = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+                             ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && m<n) ) ? m : 1;
+        lapack_int ncols_u = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) ||
+                             ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && m<n) ) ? m :
+                             ( API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ? MIN(m,n) : 1);
+        lapack_int nrows_vt = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) ||
+                              ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && m>=n) ) ? n :
+                              ( API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ? MIN(m,n) : 1);
+        lapack_int ncols_vt = ( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) ||
+                              API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+                              ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && m>=n) ) ? n : 1;
         lapack_int lda_t = MAX(1,m);
         lapack_int ldu_t = MAX(1,nrows_u);
         lapack_int ldvt_t = MAX(1,nrows_vt);
@@ -67,17 +70,17 @@ lapack_int LAPACKE_zgesdd_work( int matrix_layout, char jobz, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zgesdd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesdd_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zgesdd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesdd_work", info );
             return info;
         }
-        if( ldvt < n ) {
+        if( ldvt < ncols_vt ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zgesdd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesdd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -93,8 +96,8 @@ lapack_int LAPACKE_zgesdd_work( int matrix_layout, char jobz, lapack_int m,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m<n) ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m<n) ) ) {
             u_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldu_t * MAX(1,ncols_u) );
@@ -103,8 +106,8 @@ lapack_int LAPACKE_zgesdd_work( int matrix_layout, char jobz, lapack_int m,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m>=n) ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m>=n) ) ) {
             vt_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvt_t * MAX(1,n) );
@@ -114,7 +117,7 @@ lapack_int LAPACKE_zgesdd_work( int matrix_layout, char jobz, lapack_int m,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgesdd( &jobz, &m, &n, a_t, &lda_t, s, u_t, &ldu_t, vt_t,
                        &ldvt_t, work, &lwork, rwork, iwork, &info );
@@ -122,36 +125,36 @@ lapack_int LAPACKE_zgesdd_work( int matrix_layout, char jobz, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m<n) ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m<n) ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
                                u, ldu );
         }
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m>=n) ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m>=n) ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
                                ldvt );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m>=n) ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m>=n) ) ) {
             LAPACKE_free( vt_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobz, 'a' ) || LAPACKE_lsame( jobz, 's' ) ||
-            ( LAPACKE_lsame( jobz, 'o' ) && (m<n) ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobz, 's' ) ||
+            ( API_SUFFIX(LAPACKE_lsame)( jobz, 'o' ) && (m<n) ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgesdd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesdd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgesdd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesdd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgesv.c b/LAPACKE/src/lapacke_zgesv.c
index abb2881438..aa7a41eb53 100644
--- a/LAPACKE/src/lapacke_zgesv.c
+++ b/LAPACKE/src/lapacke_zgesv.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgesv( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_zgesv)( int matrix_layout, lapack_int n, lapack_int nrhs,
                           lapack_complex_double* a, lapack_int lda,
                           lapack_int* ipiv, lapack_complex_double* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgesv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_zgesv_work( matrix_layout, n, nrhs, a, lda, ipiv, b, ldb );
+    return API_SUFFIX(LAPACKE_zgesv_work)( matrix_layout, n, nrhs, a, lda, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zgesv_work.c b/LAPACKE/src/lapacke_zgesv_work.c
index 1a8fe59526..c83afcbee9 100644
--- a/LAPACKE/src/lapacke_zgesv_work.c
+++ b/LAPACKE/src/lapacke_zgesv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_zgesv_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                lapack_complex_double* a, lapack_int lda,
                                lapack_int* ipiv, lapack_complex_double* b,
                                lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_zgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,27 +75,27 @@ lapack_int LAPACKE_zgesv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgesv( &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgesv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgesvd.c b/LAPACKE/src/lapacke_zgesvd.c
index ec7f6e19b7..c4af6ed620 100644
--- a/LAPACKE/src/lapacke_zgesvd.c
+++ b/LAPACKE/src/lapacke_zgesvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgesvd( int matrix_layout, char jobu, char jobvt,
+lapack_int API_SUFFIX(LAPACKE_zgesvd)( int matrix_layout, char jobu, char jobvt,
                            lapack_int m, lapack_int n, lapack_complex_double* a,
                            lapack_int lda, double* s, lapack_complex_double* u,
                            lapack_int ldu, lapack_complex_double* vt,
@@ -45,13 +45,13 @@ lapack_int LAPACKE_zgesvd( int matrix_layout, char jobu, char jobvt,
     lapack_complex_double work_query;
     lapack_int i;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgesvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
     }
@@ -63,7 +63,7 @@ lapack_int LAPACKE_zgesvd( int matrix_layout, char jobu, char jobvt,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgesvd_work( matrix_layout, jobu, jobvt, m, n, a, lda, s, u,
+    info = API_SUFFIX(LAPACKE_zgesvd_work)( matrix_layout, jobu, jobvt, m, n, a, lda, s, u,
                                 ldu, vt, ldvt, &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -77,7 +77,7 @@ lapack_int LAPACKE_zgesvd( int matrix_layout, char jobu, char jobvt,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgesvd_work( matrix_layout, jobu, jobvt, m, n, a, lda, s, u,
+    info = API_SUFFIX(LAPACKE_zgesvd_work)( matrix_layout, jobu, jobvt, m, n, a, lda, s, u,
                                 ldu, vt, ldvt, work, lwork, rwork );
     /* Backup significant data from working array(s) */
     for( i=0; i<MIN(m,n)-1; i++ ) {
@@ -89,7 +89,7 @@ lapack_int LAPACKE_zgesvd( int matrix_layout, char jobu, char jobvt,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgesvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgesvd_work.c b/LAPACKE/src/lapacke_zgesvd_work.c
index ba48bb052f..71af24e0ae 100644
--- a/LAPACKE/src/lapacke_zgesvd_work.c
+++ b/LAPACKE/src/lapacke_zgesvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgesvd_work( int matrix_layout, char jobu, char jobvt,
+lapack_int API_SUFFIX(LAPACKE_zgesvd_work)( int matrix_layout, char jobu, char jobvt,
                                 lapack_int m, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 double* s, lapack_complex_double* u,
@@ -49,14 +49,14 @@ lapack_int LAPACKE_zgesvd_work( int matrix_layout, char jobu, char jobvt,
             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_vt = LAPACKE_lsame( jobvt, 'a' ) ? n :
-                              ( LAPACKE_lsame( jobvt, 's' ) ? MIN(m,n) : 1);
-        lapack_int ncols_vt = ( LAPACKE_lsame( jobvt, 'a' ) ||
-                               LAPACKE_lsame( jobvt, 's' ) ) ? n : 1;
+        lapack_int nrows_u = ( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) ? m : 1;
+        lapack_int ncols_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) ? m :
+                             ( API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ? MIN(m,n) : 1);
+        lapack_int nrows_vt = API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) ? n :
+                              ( API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ? MIN(m,n) : 1);
+        lapack_int ncols_vt = ( API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) ||
+                               API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ) ? n : 1;
         lapack_int lda_t = MAX(1,m);
         lapack_int ldu_t = MAX(1,nrows_u);
         lapack_int ldvt_t = MAX(1,nrows_vt);
@@ -66,17 +66,17 @@ lapack_int LAPACKE_zgesvd_work( int matrix_layout, char jobu, char jobvt,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zgesvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvd_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zgesvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvd_work", info );
             return info;
         }
         if( ldvt < ncols_vt ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zgesvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -92,7 +92,7 @@ lapack_int LAPACKE_zgesvd_work( int matrix_layout, char jobu, char jobvt,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) {
             u_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldu_t * MAX(1,ncols_u) );
@@ -101,7 +101,7 @@ lapack_int LAPACKE_zgesvd_work( int matrix_layout, char jobu, char jobvt,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobvt, 'a' ) || LAPACKE_lsame( jobvt, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ) {
             vt_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvt_t * MAX(1,n) );
@@ -111,7 +111,7 @@ lapack_int LAPACKE_zgesvd_work( int matrix_layout, char jobu, char jobvt,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgesvd( &jobu, &jobvt, &m, &n, a_t, &lda_t, s, u_t, &ldu_t, vt_t,
                        &ldvt_t, work, &lwork, rwork, &info );
@@ -119,32 +119,32 @@ lapack_int LAPACKE_zgesvd_work( int matrix_layout, char jobu, char jobvt,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
                                u, ldu );
         }
-        if( LAPACKE_lsame( jobvt, 'a' ) || LAPACKE_lsame( jobvt, 's' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
                                ldvt );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvt, 'a' ) || LAPACKE_lsame( jobvt, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobvt, 's' ) ) {
             LAPACKE_free( vt_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(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_zgesvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgesvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgesvdq.c b/LAPACKE/src/lapacke_zgesvdq.c
index 528b94a47e..b141f32536 100644
--- a/LAPACKE/src/lapacke_zgesvdq.c
+++ b/LAPACKE/src/lapacke_zgesvdq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgesvdq( int matrix_layout, char joba, char jobp,
+lapack_int API_SUFFIX(LAPACKE_zgesvdq)( int matrix_layout, char joba, char jobp,
                            char jobr, char jobu, char jobv,
                            lapack_int m, lapack_int n, lapack_complex_double* a,
                            lapack_int lda, double* s, lapack_complex_double* u, lapack_int ldu,
@@ -48,21 +48,20 @@ lapack_int LAPACKE_zgesvdq( int matrix_layout, char joba, char jobp,
     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_zgesvdq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvdq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgesvdq_work( matrix_layout, joba, jobp, jobr, jobu, jobv,
+    info = API_SUFFIX(LAPACKE_zgesvdq_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 );
@@ -89,7 +88,7 @@ lapack_int LAPACKE_zgesvdq( int matrix_layout, char joba, char jobp,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgesvdq_work( matrix_layout, joba, jobp, jobr, jobu, jobv,
+    info = API_SUFFIX(LAPACKE_zgesvdq_work)( matrix_layout, joba, jobp, jobr, jobu, jobv,
                                  m, n, a, lda, s, u, ldu, v, ldv, numrank,
                                  iwork, liwork, cwork, lcwork, rwork, lrwork );
 
@@ -99,7 +98,7 @@ lapack_int LAPACKE_zgesvdq( int matrix_layout, char joba, char jobp,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgesvdq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvdq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgesvdq_work.c b/LAPACKE/src/lapacke_zgesvdq_work.c
index 1a6437555e..b8f5cae1f5 100644
--- a/LAPACKE/src/lapacke_zgesvdq_work.c
+++ b/LAPACKE/src/lapacke_zgesvdq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgesvdq_work( int matrix_layout, char joba, char jobp,
+lapack_int API_SUFFIX(LAPACKE_zgesvdq_work)( int matrix_layout, char joba, char jobp,
                            char jobr, char jobu, char jobv,
                            lapack_int m, lapack_int n, lapack_complex_double* a,
                            lapack_int lda, double* s, lapack_complex_double* u, lapack_int ldu,
@@ -50,12 +50,12 @@ lapack_int LAPACKE_zgesvdq_work( int matrix_layout, char joba, char jobp,
             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 nrows_u = ( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) ? m : 1;
+        lapack_int ncols_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) ? m :
+                             (API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ? MIN(m,n) : 1);
+        lapack_int nrows_v = API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) ? n :
+                              ( API_SUFFIX(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);
@@ -65,17 +65,17 @@ lapack_int LAPACKE_zgesvdq_work( int matrix_layout, char joba, char jobp,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zgesvdq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvdq_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zgesvdq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvdq_work", info );
             return info;
         }
         if( ldv < n ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_zgesvdq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvdq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -91,7 +91,7 @@ lapack_int LAPACKE_zgesvdq_work( int matrix_layout, char joba, char jobp,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) {
             u_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) * ldu_t * MAX(1,ncols_u) );
             if( u_t == NULL ) {
@@ -99,7 +99,7 @@ lapack_int LAPACKE_zgesvdq_work( int matrix_layout, char joba, char jobp,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 's' ) ) {
             v_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) * ldv_t * MAX(1,n) );
             if( v_t == NULL ) {
@@ -108,7 +108,7 @@ lapack_int LAPACKE_zgesvdq_work( int matrix_layout, char joba, char jobp,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
             LAPACK_zgesvdq( &joba, &jobp, &jobr, &jobu, &jobv, &m, &n, a, &lda_t,
                              s, u, &ldu_t, v, &ldv_t, numrank, iwork, &liwork,
@@ -117,32 +117,32 @@ lapack_int LAPACKE_zgesvdq_work( int matrix_layout, char joba, char jobp,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 's' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
                                u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 's' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_v, n, v_t, ldv_t, v,
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 's' ) ) {
+            API_SUFFIX(LAPACKE_zge_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' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 's' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'a' ) || API_SUFFIX(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_zgesvdq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvdq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgesvdq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvdq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgesvdx.c b/LAPACKE/src/lapacke_zgesvdx.c
index 90a3f449ae..cd09b9211e 100644
--- a/LAPACKE/src/lapacke_zgesvdx.c
+++ b/LAPACKE/src/lapacke_zgesvdx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgesvdx( int matrix_layout, char jobu, char jobvt, char range,
+lapack_int API_SUFFIX(LAPACKE_zgesvdx)( int matrix_layout, char jobu, char jobvt, char range,
                             lapack_int m, lapack_int n, lapack_complex_double* a,
                             lapack_int lda, double vl, double vu,
                             lapack_int il, lapack_int iu, lapack_int* ns,
@@ -49,19 +49,19 @@ lapack_int LAPACKE_zgesvdx( int matrix_layout, char jobu, char jobvt, char range
     lapack_int* iwork = NULL;
     lapack_int i;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgesvdx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvdx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgesvdx_work( matrix_layout, jobu, jobvt, range,
+    info = API_SUFFIX(LAPACKE_zgesvdx_work)( matrix_layout, jobu, jobvt, range,
                                  m, n, a, lda, vl, vu, il, iu, ns, s, u,
                                  ldu, vt, ldvt, &work_query, lwork, rwork, iwork );
     if( info != 0 ) {
@@ -86,7 +86,7 @@ lapack_int LAPACKE_zgesvdx( int matrix_layout, char jobu, char jobvt, char range
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgesvdx_work( matrix_layout, jobu, jobvt,  range,
+    info = API_SUFFIX(LAPACKE_zgesvdx_work)( matrix_layout, jobu, jobvt,  range,
                                  m, n, a, lda, vl, vu, il, iu, ns, s, u,
                                  ldu, vt, ldvt, work, lwork, rwork, iwork );
     /* Backup significant data from working array(s) */
@@ -101,7 +101,7 @@ lapack_int LAPACKE_zgesvdx( int matrix_layout, char jobu, char jobvt, char range
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgesvdx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvdx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgesvdx_work.c b/LAPACKE/src/lapacke_zgesvdx_work.c
index b6f32b8b5d..7316b101f2 100644
--- a/LAPACKE/src/lapacke_zgesvdx_work.c
+++ b/LAPACKE/src/lapacke_zgesvdx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgesvdx_work( int matrix_layout, char jobu, char jobvt, char range,
+lapack_int API_SUFFIX(LAPACKE_zgesvdx_work)( int matrix_layout, char jobu, char jobvt, char range,
                                  lapack_int m, lapack_int n, lapack_complex_double* a,
                                  lapack_int lda, double vl, double vu,
                                  lapack_int il, lapack_int iu, lapack_int* ns,
@@ -51,12 +51,12 @@ lapack_int LAPACKE_zgesvdx_work( int matrix_layout, char jobu, char jobvt, char
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_u = LAPACKE_lsame( jobu, 'v' ) ? m : 0;
-        lapack_int ncols_u = LAPACKE_lsame( jobu, 'v' ) ?
-                             ( LAPACKE_lsame( range, 'i' ) ? MAX(iu - il + 1, 0) : MIN(m,n)) : 0;
-        lapack_int nrows_vt = LAPACKE_lsame( jobvt, 'v' ) ?
-                             ( LAPACKE_lsame( range, 'i' ) ? MAX(iu - il + 1, 0) : MIN(m,n)) : 0;
-        lapack_int ncols_vt = LAPACKE_lsame( jobvt, 'v' ) ? n : 0;
+        lapack_int nrows_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ? m : 0;
+        lapack_int ncols_u = API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ?
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? MAX(iu - il + 1, 0) : MIN(m,n)) : 0;
+        lapack_int nrows_vt = API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ?
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? MAX(iu - il + 1, 0) : MIN(m,n)) : 0;
+        lapack_int ncols_vt = API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ? n : 0;
 
         lapack_int lda_t = MAX(1,m);
         lapack_int ldu_t = MAX(1,nrows_u);
@@ -68,17 +68,17 @@ lapack_int LAPACKE_zgesvdx_work( int matrix_layout, char jobu, char jobvt, char
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgesvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvdx_work", info );
             return info;
         }
         if( ldu < ncols_u ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_zgesvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvdx_work", info );
             return info;
         }
         if( ldvt < ncols_vt ) {
             info = -18;
-            LAPACKE_xerbla( "LAPACKE_zgesvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvdx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -95,7 +95,7 @@ lapack_int LAPACKE_zgesvdx_work( int matrix_layout, char jobu, char jobvt, char
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobu, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ) {
             u_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) * ldu_t * MAX(1,ncols_u) );
             if( u_t == NULL ) {
@@ -103,7 +103,7 @@ lapack_int LAPACKE_zgesvdx_work( int matrix_layout, char jobu, char jobvt, char
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobvt, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ) {
             vt_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) * ldvt_t * MAX(1,n) );
             if( vt_t == NULL ) {
@@ -112,7 +112,7 @@ lapack_int LAPACKE_zgesvdx_work( int matrix_layout, char jobu, char jobvt, char
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgesvdx( &jobu, &jobvt, &range, &m, &n, a_t, &lda_t, &vl, &vu,
                             &il, &iu, ns, s, u_t, &ldu_t, vt_t,
@@ -121,32 +121,32 @@ lapack_int LAPACKE_zgesvdx_work( int matrix_layout, char jobu, char jobvt, char
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobu, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
                                u, ldu );
         }
-        if( LAPACKE_lsame( jobvt, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrows_vt, n, vt_t, ldvt_t, vt,
                                ldvt );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvt, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvt, 'v' ) ) {
             LAPACKE_free( vt_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobu, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'v' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgesvdx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvdx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgesvdx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvdx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgesvj.c b/LAPACKE/src/lapacke_zgesvj.c
index 0619afa8d4..524f20855f 100644
--- a/LAPACKE/src/lapacke_zgesvj.c
+++ b/LAPACKE/src/lapacke_zgesvj.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgesvj( int matrix_layout, char joba, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_zgesvj)( int matrix_layout, char joba, char jobu, char jobv,
                            lapack_int m, lapack_int n,
                            lapack_complex_double * a, lapack_int lda,
                            double* sva, lapack_int mv,
@@ -46,19 +46,19 @@ lapack_int LAPACKE_zgesvj( int matrix_layout, char joba, char jobu, char jobv,
     lapack_int i;
     lapack_int nrows_v;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgesvj", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvj", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        nrows_v = LAPACKE_lsame( jobv, 'v' ) ? MAX(0,n) :
-                ( LAPACKE_lsame( jobv, 'a' ) ? MAX(0,mv) : 0);
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ? MAX(0,n) :
+                ( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) ? MAX(0,mv) : 0);
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 'v' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, nrows_v, n, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, nrows_v, n, v, ldv ) ) {
                 return -11;
             }
         }
@@ -78,7 +78,7 @@ lapack_int LAPACKE_zgesvj( int matrix_layout, char joba, char jobu, char jobv,
     }
     rwork[0] = stat[0];  /* Significant if jobu = 'c' */
     /* Call middle-level interface */
-    info = LAPACKE_zgesvj_work( matrix_layout, joba, jobu, jobv, m, n, a, lda,
+    info = API_SUFFIX(LAPACKE_zgesvj_work)( matrix_layout, joba, jobu, jobv, m, n, a, lda,
                                 sva, mv, v, ldv, cwork, lwork, rwork, lrwork );
     /* Backup significant data from working array(s) */
     for( i=0; i<6; i++ ) {
@@ -91,7 +91,7 @@ lapack_int LAPACKE_zgesvj( int matrix_layout, char joba, char jobu, char jobv,
     LAPACKE_free( cwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgesvj", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvj", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgesvj_work.c b/LAPACKE/src/lapacke_zgesvj_work.c
index 4d59821ac3..50326362e6 100644
--- a/LAPACKE/src/lapacke_zgesvj_work.c
+++ b/LAPACKE/src/lapacke_zgesvj_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgesvj_work( int matrix_layout, char joba, char jobu,
+lapack_int API_SUFFIX(LAPACKE_zgesvj_work)( int matrix_layout, char joba, char jobu,
                                 char jobv, lapack_int m, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 double* sva, lapack_int mv,
@@ -49,8 +49,8 @@ lapack_int LAPACKE_zgesvj_work( int matrix_layout, char joba, char jobu,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_v = LAPACKE_lsame( jobv, 'v' ) ? MAX(0,n) :
-                           ( LAPACKE_lsame( jobv, 'a' ) ? MAX(0,mv) : 0);
+        lapack_int nrows_v = API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ? MAX(0,n) :
+                           ( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) ? MAX(0,mv) : 0);
         lapack_int lda_t = MAX(1,m);
         lapack_int ldv_t = MAX(1,nrows_v);
         lapack_complex_double* a_t = NULL;
@@ -58,12 +58,12 @@ lapack_int LAPACKE_zgesvj_work( int matrix_layout, char joba, char jobu,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgesvj_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvj_work", info );
             return info;
         }
         if( ldv < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zgesvj_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvj_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -73,7 +73,7 @@ lapack_int LAPACKE_zgesvj_work( int matrix_layout, char joba, char jobu,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (lapack_complex_double*)
                LAPACKE_malloc( sizeof(lapack_complex_double) * ldv_t * MAX(1,n) );
             if( v_t == NULL ) {
@@ -82,9 +82,9 @@ lapack_int LAPACKE_zgesvj_work( int matrix_layout, char joba, char jobu,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( jobv, 'a' ) ) {
-            LAPACKE_zge_trans( matrix_layout, nrows_v, n, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, nrows_v, n, v, ldv, v_t, ldv_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_zgesvj( &joba, &jobu, &jobv, &m, &n, a_t, &lda_t, sva, &mv, v_t,
@@ -93,24 +93,24 @@ lapack_int LAPACKE_zgesvj_work( int matrix_layout, char joba, char jobu,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_v, n, v_t, ldv_t, v,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_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, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'a' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgesvj_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvj_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgesvj_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvj_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgesvx.c b/LAPACKE/src/lapacke_zgesvx.c
index 226f09d929..1ac62fd7c3 100644
--- a/LAPACKE/src/lapacke_zgesvx.c
+++ b/LAPACKE/src/lapacke_zgesvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgesvx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_zgesvx)( int matrix_layout, char fact, char trans,
                            lapack_int n, lapack_int nrhs,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* af, lapack_int ldaf,
@@ -46,32 +46,32 @@ lapack_int LAPACKE_zgesvx( int matrix_layout, char fact, char trans,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgesvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -14;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) ) ) {
-            if( LAPACKE_d_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, c, 1 ) ) {
                 return -13;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'r' ) ) ) {
-            if( LAPACKE_d_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, r, 1 ) ) {
                 return -12;
             }
         }
@@ -90,7 +90,7 @@ lapack_int LAPACKE_zgesvx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgesvx_work( matrix_layout, fact, trans, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_zgesvx_work)( matrix_layout, fact, trans, n, nrhs, a, lda, af,
                                 ldaf, ipiv, equed, r, c, b, ldb, x, ldx, rcond,
                                 ferr, berr, work, rwork );
     /* Backup significant data from working array(s) */
@@ -101,7 +101,7 @@ lapack_int LAPACKE_zgesvx( int matrix_layout, char fact, char trans,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgesvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgesvx_work.c b/LAPACKE/src/lapacke_zgesvx_work.c
index be7e9c543d..82272e93c8 100644
--- a/LAPACKE/src/lapacke_zgesvx_work.c
+++ b/LAPACKE/src/lapacke_zgesvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgesvx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_zgesvx_work)( int matrix_layout, char fact, char trans,
                                 lapack_int n, lapack_int nrhs,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* af, lapack_int ldaf,
@@ -64,22 +64,22 @@ lapack_int LAPACKE_zgesvx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_zgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_zgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -110,11 +110,11 @@ lapack_int LAPACKE_zgesvx_work( int matrix_layout, char fact, char trans,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgesvx( &fact, &trans, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                        ipiv, equed, r, c, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr,
@@ -123,18 +123,18 @@ lapack_int LAPACKE_zgesvx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, af_t, ldaf_t, af, ldaf );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, af_t, ldaf_t, af, ldaf );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -145,11 +145,11 @@ lapack_int LAPACKE_zgesvx_work( int matrix_layout, char fact, char trans,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgesvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgesvxx.c b/LAPACKE/src/lapacke_zgesvxx.c
index 04bd68ea8d..dee5b11e81 100644
--- a/LAPACKE/src/lapacke_zgesvxx.c
+++ b/LAPACKE/src/lapacke_zgesvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgesvxx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_zgesvxx)( int matrix_layout, char fact, char trans,
                             lapack_int n, lapack_int nrhs,
                             lapack_complex_double* a, lapack_int lda,
                             lapack_complex_double* af, lapack_int ldaf,
@@ -48,37 +48,37 @@ lapack_int LAPACKE_zgesvxx( int matrix_layout, char fact, char trans,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgesvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvxx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -14;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) ) ) {
-            if( LAPACKE_d_nancheck( n, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, c, 1 ) ) {
                 return -13;
             }
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -25;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'r' ) ) ) {
-            if( LAPACKE_d_nancheck( n, r, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, r, 1 ) ) {
                 return -12;
             }
         }
@@ -97,7 +97,7 @@ lapack_int LAPACKE_zgesvxx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgesvxx_work( matrix_layout, fact, trans, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_zgesvxx_work)( matrix_layout, fact, trans, n, nrhs, a, lda, af,
                                  ldaf, ipiv, equed, r, c, b, ldb, x, ldx, rcond,
                                  rpvgrw, berr, n_err_bnds, err_bnds_norm,
                                  err_bnds_comp, nparams, params, work, rwork );
@@ -107,7 +107,7 @@ lapack_int LAPACKE_zgesvxx( int matrix_layout, char fact, char trans,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgesvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgesvxx_work.c b/LAPACKE/src/lapacke_zgesvxx_work.c
index bb03176913..8c1f55b84b 100644
--- a/LAPACKE/src/lapacke_zgesvxx_work.c
+++ b/LAPACKE/src/lapacke_zgesvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgesvxx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_zgesvxx_work)( int matrix_layout, char fact, char trans,
                                  lapack_int n, lapack_int nrhs,
                                  lapack_complex_double* a, lapack_int lda,
                                  lapack_complex_double* af, lapack_int ldaf,
@@ -69,22 +69,22 @@ lapack_int LAPACKE_zgesvxx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvxx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_zgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_zgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -127,11 +127,11 @@ lapack_int LAPACKE_zgesvxx_work( int matrix_layout, char fact, char trans,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgesvxx( &fact, &trans, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, equed, r, c, b_t, &ldb_t, x_t, &ldx_t, rcond,
@@ -141,21 +141,21 @@ lapack_int LAPACKE_zgesvxx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, af_t, ldaf_t, af, ldaf );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, af_t, ldaf_t, af, ldaf );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && ( LAPACKE_lsame( *equed, 'b' ) ||
-            LAPACKE_lsame( *equed, 'c' ) || LAPACKE_lsame( *equed, 'r' ) ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && ( API_SUFFIX(LAPACKE_lsame)( *equed, 'b' ) ||
+            API_SUFFIX(LAPACKE_lsame)( *equed, 'c' ) || API_SUFFIX(LAPACKE_lsame)( *equed, 'r' ) ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -171,11 +171,11 @@ lapack_int LAPACKE_zgesvxx_work( int matrix_layout, char fact, char trans,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgesvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgesvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgetf2.c b/LAPACKE/src/lapacke_zgetf2.c
index 967ffc7e3f..5625c2d634 100644
--- a/LAPACKE/src/lapacke_zgetf2.c
+++ b/LAPACKE/src/lapacke_zgetf2.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgetf2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgetf2)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgetf2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetf2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zgetf2_work( matrix_layout, m, n, a, lda, ipiv );
+    return API_SUFFIX(LAPACKE_zgetf2_work)( matrix_layout, m, n, a, lda, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_zgetf2_work.c b/LAPACKE/src/lapacke_zgetf2_work.c
index 20358b9d04..848293565b 100644
--- a/LAPACKE/src/lapacke_zgetf2_work.c
+++ b/LAPACKE/src/lapacke_zgetf2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgetf2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgetf2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_int* ipiv )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_zgetf2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgetf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetf2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,23 +60,23 @@ lapack_int LAPACKE_zgetf2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgetf2( &m, &n, a_t, &lda_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgetf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetf2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgetf2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetf2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgetrf.c b/LAPACKE/src/lapacke_zgetrf.c
index a0233c9a17..87127eddbd 100644
--- a/LAPACKE/src/lapacke_zgetrf.c
+++ b/LAPACKE/src/lapacke_zgetrf.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgetrf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgetrf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgetrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zgetrf_work( matrix_layout, m, n, a, lda, ipiv );
+    return API_SUFFIX(LAPACKE_zgetrf_work)( matrix_layout, m, n, a, lda, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_zgetrf2.c b/LAPACKE/src/lapacke_zgetrf2.c
index cb4824ce0c..3d1bb2f84a 100644
--- a/LAPACKE/src/lapacke_zgetrf2.c
+++ b/LAPACKE/src/lapacke_zgetrf2.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgetrf2( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgetrf2)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgetrf2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetrf2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zgetrf2_work( matrix_layout, m, n, a, lda, ipiv );
+    return API_SUFFIX(LAPACKE_zgetrf2_work)( matrix_layout, m, n, a, lda, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_zgetrf2_work.c b/LAPACKE/src/lapacke_zgetrf2_work.c
index 2597753285..5e810fe2b1 100644
--- a/LAPACKE/src/lapacke_zgetrf2_work.c
+++ b/LAPACKE/src/lapacke_zgetrf2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgetrf2_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgetrf2_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_int* ipiv )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_zgetrf2_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgetrf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetrf2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,23 +60,23 @@ lapack_int LAPACKE_zgetrf2_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgetrf2( &m, &n, a_t, &lda_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgetrf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetrf2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgetrf2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetrf2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgetrf_work.c b/LAPACKE/src/lapacke_zgetrf_work.c
index 847cdaae74..eea2757180 100644
--- a/LAPACKE/src/lapacke_zgetrf_work.c
+++ b/LAPACKE/src/lapacke_zgetrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgetrf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgetrf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_int* ipiv )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_zgetrf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zgetrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,23 +60,23 @@ lapack_int LAPACKE_zgetrf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgetrf( &m, &n, a_t, &lda_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgetrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgetrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgetri.c b/LAPACKE/src/lapacke_zgetri.c
index 294e21fbac..0af2ecfd5a 100644
--- a/LAPACKE/src/lapacke_zgetri.c
+++ b/LAPACKE/src/lapacke_zgetri.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgetri( int matrix_layout, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgetri)( int matrix_layout, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            const lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zgetri( int matrix_layout, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgetri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -3;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgetri_work( matrix_layout, n, a, lda, ipiv, &work_query,
+    info = API_SUFFIX(LAPACKE_zgetri_work)( matrix_layout, n, a, lda, ipiv, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,12 +67,12 @@ lapack_int LAPACKE_zgetri( int matrix_layout, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgetri_work( matrix_layout, n, a, lda, ipiv, work, lwork );
+    info = API_SUFFIX(LAPACKE_zgetri_work)( matrix_layout, n, a, lda, ipiv, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgetri", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetri", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgetri_work.c b/LAPACKE/src/lapacke_zgetri_work.c
index bdad9cf474..93c19c59e8 100644
--- a/LAPACKE/src/lapacke_zgetri_work.c
+++ b/LAPACKE/src/lapacke_zgetri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgetri_work( int matrix_layout, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgetri_work)( int matrix_layout, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 const lapack_int* ipiv,
                                 lapack_complex_double* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zgetri_work( int matrix_layout, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -4;
-            LAPACKE_xerbla( "LAPACKE_zgetri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetri_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zgetri_work( int matrix_layout, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgetri( &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgetri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgetri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgetrs.c b/LAPACKE/src/lapacke_zgetrs.c
index ad0799cdc3..d76e323c14 100644
--- a/LAPACKE/src/lapacke_zgetrs.c
+++ b/LAPACKE/src/lapacke_zgetrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgetrs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgetrs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* a,
                            lapack_int lda, const lapack_int* ipiv,
                            lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgetrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_zgetrs_work( matrix_layout, trans, n, nrhs, a, lda, ipiv, b,
+    return API_SUFFIX(LAPACKE_zgetrs_work)( matrix_layout, trans, n, nrhs, a, lda, ipiv, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_zgetrs_work.c b/LAPACKE/src/lapacke_zgetrs_work.c
index ca0cb4ffbc..b9dde38658 100644
--- a/LAPACKE/src/lapacke_zgetrs_work.c
+++ b/LAPACKE/src/lapacke_zgetrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgetrs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgetrs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_double* a,
                                 lapack_int lda, const lapack_int* ipiv,
                                 lapack_complex_double* b, lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_zgetrs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zgetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zgetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,8 +75,8 @@ lapack_int LAPACKE_zgetrs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgetrs( &trans, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                        &info );
@@ -84,18 +84,18 @@ lapack_int LAPACKE_zgetrs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgetrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgetsls.c b/LAPACKE/src/lapacke_zgetsls.c
index 0657bd9517..dc81633806 100644
--- a/LAPACKE/src/lapacke_zgetsls.c
+++ b/LAPACKE/src/lapacke_zgetsls.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgetsls( int matrix_layout, char trans, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zgetsls)( int matrix_layout, char trans, lapack_int m,
                           lapack_int n, lapack_int nrhs,
                           lapack_complex_double* a, lapack_int lda,
                           lapack_complex_double* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_zgetsls( int matrix_layout, char trans, lapack_int m,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgetsls", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetsls", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, MAX(m,n), nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgetsls_work( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_zgetsls_work)( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
                                &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_zgetsls( int matrix_layout, char trans, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgetsls_work( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_zgetsls_work)( matrix_layout, trans, m, n, nrhs, a, lda, b, ldb,
                                work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgetsls", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetsls", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgetsls_work.c b/LAPACKE/src/lapacke_zgetsls_work.c
index 465dcc2371..431ac8ea68 100644
--- a/LAPACKE/src/lapacke_zgetsls_work.c
+++ b/LAPACKE/src/lapacke_zgetsls_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgetsls_work( int matrix_layout, char trans, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zgetsls_work)( int matrix_layout, char trans, lapack_int m,
                                lapack_int n, lapack_int nrhs,
                                lapack_complex_double* a, lapack_int lda,
                                lapack_complex_double* b, lapack_int ldb,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_zgetsls_work( int matrix_layout, char trans, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zgetsls_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetsls_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zgetsls_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetsls_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_zgetsls_work( int matrix_layout, char trans, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, MAX(m,n), nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgetsls( &trans, &m, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -92,8 +92,8 @@ lapack_int LAPACKE_zgetsls_work( int matrix_layout, char trans, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, MAX(m,n), nrhs, b_t, ldb_t, b,
                            ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
@@ -101,11 +101,11 @@ lapack_int LAPACKE_zgetsls_work( int matrix_layout, char trans, lapack_int m,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgetsls_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetsls_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgetsls_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetsls_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgetsqrhrt.c b/LAPACKE/src/lapacke_zgetsqrhrt.c
index 53557c92d1..040c929310 100644
--- a/LAPACKE/src/lapacke_zgetsqrhrt.c
+++ b/LAPACKE/src/lapacke_zgetsqrhrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgetsqrhrt( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgetsqrhrt)( int matrix_layout, lapack_int m, lapack_int n,
                                lapack_int mb1, lapack_int nb1, lapack_int nb2,
                                lapack_complex_double* a, lapack_int lda,
                                lapack_complex_double* t, lapack_int ldt )
@@ -42,19 +42,19 @@ lapack_int LAPACKE_zgetsqrhrt( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgetsqrhrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetsqrhrt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgetsqrhrt_work( matrix_layout, m, n, mb1, nb1, nb2,
+    info = API_SUFFIX(LAPACKE_zgetsqrhrt_work)( matrix_layout, m, n, mb1, nb1, nb2,
                                     a, lda, t, ldt, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -68,13 +68,13 @@ lapack_int LAPACKE_zgetsqrhrt( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgetsqrhrt_work( matrix_layout, m, n, mb1, nb1, nb2,
+    info = API_SUFFIX(LAPACKE_zgetsqrhrt_work)( matrix_layout, m, n, mb1, nb1, nb2,
                                     a, lda, t, ldt, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgetsqrhrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetsqrhrt", info );
     }
     return info;
 }
\ No newline at end of file
diff --git a/LAPACKE/src/lapacke_zgetsqrhrt_work.c b/LAPACKE/src/lapacke_zgetsqrhrt_work.c
index a6825df56d..3e2aa3b28c 100644
--- a/LAPACKE/src/lapacke_zgetsqrhrt_work.c
+++ b/LAPACKE/src/lapacke_zgetsqrhrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgetsqrhrt_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgetsqrhrt_work)( int matrix_layout, lapack_int m, lapack_int n,
                                     lapack_int mb1, lapack_int nb1, lapack_int nb2,
                                     lapack_complex_double* a, lapack_int lda,
                                     lapack_complex_double* t, lapack_int ldt,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_zgetsqrhrt_work( int matrix_layout, lapack_int m, lapack_int
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgetsqrhrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetsqrhrt_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zgetsqrhrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetsqrhrt_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -82,7 +82,7 @@ lapack_int LAPACKE_zgetsqrhrt_work( int matrix_layout, lapack_int m, lapack_int
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgetsqrhrt( &m, &n, &mb1, &nb1, &nb2, a_t, &lda_t, t_t, &ldt_t,
                            work, &lwork, &info );
@@ -90,19 +90,19 @@ lapack_int LAPACKE_zgetsqrhrt_work( int matrix_layout, lapack_int m, lapack_int
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, nb2, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nb2, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgetsqrhrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetsqrhrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgetsqrhrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgetsqrhrt_work", info );
     }
     return info;
 }
\ No newline at end of file
diff --git a/LAPACKE/src/lapacke_zggbak.c b/LAPACKE/src/lapacke_zggbak.c
index b87c132636..0af1c81a5a 100644
--- a/LAPACKE/src/lapacke_zggbak.c
+++ b/LAPACKE/src/lapacke_zggbak.c
@@ -32,29 +32,29 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggbak( int matrix_layout, char job, char side, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zggbak)( int matrix_layout, char job, char side, lapack_int n,
                            lapack_int ilo, lapack_int ihi, const double* lscale,
                            const double* rscale, lapack_int m,
                            lapack_complex_double* v, lapack_int ldv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zggbak", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggbak", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, lscale, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, lscale, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( n, rscale, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, rscale, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, m, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, m, v, ldv ) ) {
             return -10;
         }
     }
 #endif
-    return LAPACKE_zggbak_work( matrix_layout, job, side, n, ilo, ihi, lscale,
+    return API_SUFFIX(LAPACKE_zggbak_work)( matrix_layout, job, side, n, ilo, ihi, lscale,
                                 rscale, m, v, ldv );
 }
diff --git a/LAPACKE/src/lapacke_zggbak_work.c b/LAPACKE/src/lapacke_zggbak_work.c
index 128099db4c..8468360cfa 100644
--- a/LAPACKE/src/lapacke_zggbak_work.c
+++ b/LAPACKE/src/lapacke_zggbak_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggbak_work( int matrix_layout, char job, char side,
+lapack_int API_SUFFIX(LAPACKE_zggbak_work)( int matrix_layout, char job, char side,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 const double* lscale, const double* rscale,
                                 lapack_int m, lapack_complex_double* v,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_zggbak_work( int matrix_layout, char job, char side,
         /* Check leading dimension(s) */
         if( ldv < m ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zggbak_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggbak_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,7 +63,7 @@ lapack_int LAPACKE_zggbak_work( int matrix_layout, char job, char side,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, m, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, m, v, ldv, v_t, ldv_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zggbak( &job, &side, &n, &ilo, &ihi, lscale, rscale, &m, v_t,
                        &ldv_t, &info );
@@ -71,16 +71,16 @@ lapack_int LAPACKE_zggbak_work( int matrix_layout, char job, char side,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, m, v_t, ldv_t, v, ldv );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, m, v_t, ldv_t, v, ldv );
         /* Release memory and exit */
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zggbak_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggbak_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zggbak_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggbak_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggbal.c b/LAPACKE/src/lapacke_zggbal.c
index 0a180ecf01..df2526bc2b 100644
--- a/LAPACKE/src/lapacke_zggbal.c
+++ b/LAPACKE/src/lapacke_zggbal.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggbal( int matrix_layout, char job, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zggbal)( int matrix_layout, char job, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* b, lapack_int ldb,
                            lapack_int* ilo, lapack_int* ihi, double* lscale,
@@ -43,28 +43,28 @@ lapack_int LAPACKE_zggbal( int matrix_layout, char job, lapack_int n,
     lapack_int lwork;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zggbal", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggbal", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
                 return -4;
             }
         }
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
                 return -6;
             }
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( job, 's' ) || LAPACKE_lsame( job, 'b' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 's' ) || API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
         lwork = MAX(1,6*n);
     } else {
         lwork = 1;
@@ -76,13 +76,13 @@ lapack_int LAPACKE_zggbal( int matrix_layout, char job, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zggbal_work( matrix_layout, job, n, a, lda, b, ldb, ilo, ihi,
+    info = API_SUFFIX(LAPACKE_zggbal_work)( matrix_layout, job, n, a, lda, b, ldb, ilo, ihi,
                                 lscale, rscale, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zggbal", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggbal", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggbal_work.c b/LAPACKE/src/lapacke_zggbal_work.c
index 2f4481c306..33b91dc0af 100644
--- a/LAPACKE/src/lapacke_zggbal_work.c
+++ b/LAPACKE/src/lapacke_zggbal_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggbal_work( int matrix_layout, char job, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zggbal_work)( int matrix_layout, char job, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* b, lapack_int ldb,
                                 lapack_int* ilo, lapack_int* ihi,
@@ -54,17 +54,17 @@ lapack_int LAPACKE_zggbal_work( int matrix_layout, char job, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zggbal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggbal_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zggbal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggbal_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
             a_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 lda_t * MAX(1,n) );
@@ -73,8 +73,8 @@ lapack_int LAPACKE_zggbal_work( int matrix_layout, char job, lapack_int n,
                 goto exit_level_0;
             }
         }
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
             b_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldb_t * MAX(1,n) );
@@ -84,13 +84,13 @@ lapack_int LAPACKE_zggbal_work( int matrix_layout, char job, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         }
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_zggbal( &job, &n, a_t, &lda_t, b_t, &ldb_t, ilo, ihi, lscale,
@@ -99,31 +99,31 @@ lapack_int LAPACKE_zggbal_work( int matrix_layout, char job, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
             LAPACKE_free( b_t );
         }
 exit_level_1:
-        if( LAPACKE_lsame( job, 'p' ) || LAPACKE_lsame( job, 's' ) ||
-            LAPACKE_lsame( job, 'b' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'p' ) || API_SUFFIX(LAPACKE_lsame)( job, 's' ) ||
+            API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) {
             LAPACKE_free( a_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zggbal_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggbal_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zggbal_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggbal_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgges.c b/LAPACKE/src/lapacke_zgges.c
index fbc1c5a87d..cc74f8d380 100644
--- a/LAPACKE/src/lapacke_zgges.c
+++ b/LAPACKE/src/lapacke_zgges.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgges( int matrix_layout, char jobvsl, char jobvsr, char sort,
+lapack_int API_SUFFIX(LAPACKE_zgges)( int matrix_layout, char jobvsl, char jobvsr, char sort,
                           LAPACK_Z_SELECT2 selctg, lapack_int n,
                           lapack_complex_double* a, lapack_int lda,
                           lapack_complex_double* b, lapack_int ldb,
@@ -48,22 +48,22 @@ lapack_int LAPACKE_zgges( int matrix_layout, char jobvsl, char jobvsr, char sort
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgges", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgges", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -77,7 +77,7 @@ lapack_int LAPACKE_zgges( int matrix_layout, char jobvsl, char jobvsr, char sort
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgges_work( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
+    info = API_SUFFIX(LAPACKE_zgges_work)( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
                                lda, b, ldb, sdim, alpha, beta, vsl, ldvsl, vsr,
                                ldvsr, &work_query, lwork, rwork, bwork );
     if( info != 0 ) {
@@ -92,7 +92,7 @@ lapack_int LAPACKE_zgges( int matrix_layout, char jobvsl, char jobvsr, char sort
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgges_work( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
+    info = API_SUFFIX(LAPACKE_zgges_work)( matrix_layout, jobvsl, jobvsr, sort, selctg, n, a,
                                lda, b, ldb, sdim, alpha, beta, vsl, ldvsl, vsr,
                                ldvsr, work, lwork, rwork, bwork );
     /* Release memory and exit */
@@ -100,12 +100,12 @@ lapack_int LAPACKE_zgges( int matrix_layout, char jobvsl, char jobvsr, char sort
 exit_level_2:
     LAPACKE_free( rwork );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgges", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgges", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgges3.c b/LAPACKE/src/lapacke_zgges3.c
index 7f322c38fe..ac61448a3b 100644
--- a/LAPACKE/src/lapacke_zgges3.c
+++ b/LAPACKE/src/lapacke_zgges3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgges3( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_zgges3)( int matrix_layout, char jobvsl, char jobvsr,
                            char sort, LAPACK_Z_SELECT2 selctg, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* b, lapack_int ldb,
@@ -48,22 +48,22 @@ lapack_int LAPACKE_zgges3( int matrix_layout, char jobvsl, char jobvsr,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgges3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgges3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -77,7 +77,7 @@ lapack_int LAPACKE_zgges3( int matrix_layout, char jobvsl, char jobvsr,
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgges3_work( matrix_layout, jobvsl, jobvsr, sort, selctg, n,
+    info = API_SUFFIX(LAPACKE_zgges3_work)( matrix_layout, jobvsl, jobvsr, sort, selctg, n,
                                 a, lda, b, ldb, sdim, alpha, beta, vsl, ldvsl,
                                 vsr, ldvsr, &work_query, lwork, rwork, bwork );
     if( info != 0 ) {
@@ -92,7 +92,7 @@ lapack_int LAPACKE_zgges3( int matrix_layout, char jobvsl, char jobvsr,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgges3_work( matrix_layout, jobvsl, jobvsr, sort, selctg, n,
+    info = API_SUFFIX(LAPACKE_zgges3_work)( matrix_layout, jobvsl, jobvsr, sort, selctg, n,
                                 a, lda, b, ldb, sdim, alpha, beta, vsl, ldvsl,
                                 vsr, ldvsr, work, lwork, rwork, bwork );
     /* Release memory and exit */
@@ -100,12 +100,12 @@ lapack_int LAPACKE_zgges3( int matrix_layout, char jobvsl, char jobvsr,
 exit_level_2:
     LAPACKE_free( rwork );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgges3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgges3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgges3_work.c b/LAPACKE/src/lapacke_zgges3_work.c
index 00677931d5..c8b5ac3fc3 100644
--- a/LAPACKE/src/lapacke_zgges3_work.c
+++ b/LAPACKE/src/lapacke_zgges3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgges3_work( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_zgges3_work)( int matrix_layout, char jobvsl, char jobvsr,
                                 char sort, LAPACK_Z_SELECT2 selctg,
                                 lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
@@ -65,22 +65,22 @@ lapack_int LAPACKE_zgges3_work( int matrix_layout, char jobvsl, char jobvsr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgges3_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgges3_work", info );
             return info;
         }
         if( ldvsl < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_zgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgges3_work", info );
             return info;
         }
         if( ldvsr < n ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_zgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgges3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -103,7 +103,7 @@ lapack_int LAPACKE_zgges3_work( int matrix_layout, char jobvsl, char jobvsr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             vsl_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvsl_t * MAX(1,n) );
@@ -112,7 +112,7 @@ lapack_int LAPACKE_zgges3_work( int matrix_layout, char jobvsl, char jobvsr,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             vsr_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvsr_t * MAX(1,n) );
@@ -122,8 +122,8 @@ lapack_int LAPACKE_zgges3_work( int matrix_layout, char jobvsl, char jobvsr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgges3( &jobvsl, &jobvsr, &sort, selctg, &n, a_t, &lda_t, b_t,
                        &ldb_t, sdim, alpha, beta, vsl_t, &ldvsl_t, vsr_t,
@@ -132,22 +132,22 @@ lapack_int LAPACKE_zgges3_work( int matrix_layout, char jobvsl, char jobvsr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
                                ldvsl );
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
                                ldvsr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             LAPACKE_free( vsr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             LAPACKE_free( vsl_t );
         }
 exit_level_2:
@@ -156,11 +156,11 @@ lapack_int LAPACKE_zgges3_work( int matrix_layout, char jobvsl, char jobvsr,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgges3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgges3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgges3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgges3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgges_work.c b/LAPACKE/src/lapacke_zgges_work.c
index 2694c65306..0fc31bbf2d 100644
--- a/LAPACKE/src/lapacke_zgges_work.c
+++ b/LAPACKE/src/lapacke_zgges_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgges_work( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_zgges_work)( int matrix_layout, char jobvsl, char jobvsr,
                                char sort, LAPACK_Z_SELECT2 selctg, lapack_int n,
                                lapack_complex_double* a, lapack_int lda,
                                lapack_complex_double* b, lapack_int ldb,
@@ -64,22 +64,22 @@ lapack_int LAPACKE_zgges_work( int matrix_layout, char jobvsl, char jobvsr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgges_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgges_work", info );
             return info;
         }
-        if( ldvsl < n ) {
+        if( ldvsl < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) && ldvsl < n ) ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_zgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgges_work", info );
             return info;
         }
-        if( ldvsr < n ) {
+        if( ldvsr < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) && ldvsr < n ) ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_zgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgges_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_zgges_work( int matrix_layout, char jobvsl, char jobvsr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             vsl_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvsl_t * MAX(1,n) );
@@ -111,7 +111,7 @@ lapack_int LAPACKE_zgges_work( int matrix_layout, char jobvsl, char jobvsr,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             vsr_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvsr_t * MAX(1,n) );
@@ -121,8 +121,8 @@ lapack_int LAPACKE_zgges_work( int matrix_layout, char jobvsl, char jobvsr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgges( &jobvsl, &jobvsr, &sort, selctg, &n, a_t, &lda_t, b_t,
                       &ldb_t, sdim, alpha, beta, vsl_t, &ldvsl_t, vsr_t,
@@ -131,22 +131,22 @@ lapack_int LAPACKE_zgges_work( int matrix_layout, char jobvsl, char jobvsr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
                                ldvsl );
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
                                ldvsr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             LAPACKE_free( vsr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             LAPACKE_free( vsl_t );
         }
 exit_level_2:
@@ -155,11 +155,11 @@ lapack_int LAPACKE_zgges_work( int matrix_layout, char jobvsl, char jobvsr,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgges_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgges_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgges_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgges_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggesx.c b/LAPACKE/src/lapacke_zggesx.c
index 05e7f902b7..f0542bed23 100644
--- a/LAPACKE/src/lapacke_zggesx.c
+++ b/LAPACKE/src/lapacke_zggesx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggesx( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_zggesx)( int matrix_layout, char jobvsl, char jobvsr,
                            char sort, LAPACK_Z_SELECT2 selctg, char sense,
                            lapack_int n, lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* b,
@@ -53,22 +53,22 @@ lapack_int LAPACKE_zggesx( int matrix_layout, char jobvsl, char jobvsr,
     lapack_int iwork_query;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zggesx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggesx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -10;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -82,7 +82,7 @@ lapack_int LAPACKE_zggesx( int matrix_layout, char jobvsl, char jobvsr,
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zggesx_work( matrix_layout, jobvsl, jobvsr, sort, selctg,
+    info = API_SUFFIX(LAPACKE_zggesx_work)( matrix_layout, jobvsl, jobvsr, sort, selctg,
                                 sense, n, a, lda, b, ldb, sdim, alpha, beta,
                                 vsl, ldvsl, vsr, ldvsr, rconde, rcondv,
                                 &work_query, lwork, rwork, &iwork_query, liwork,
@@ -105,7 +105,7 @@ lapack_int LAPACKE_zggesx( int matrix_layout, char jobvsl, char jobvsr,
         goto exit_level_3;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zggesx_work( matrix_layout, jobvsl, jobvsr, sort, selctg,
+    info = API_SUFFIX(LAPACKE_zggesx_work)( matrix_layout, jobvsl, jobvsr, sort, selctg,
                                 sense, n, a, lda, b, ldb, sdim, alpha, beta,
                                 vsl, ldvsl, vsr, ldvsr, rconde, rcondv, work,
                                 lwork, rwork, iwork, liwork, bwork );
@@ -116,12 +116,12 @@ lapack_int LAPACKE_zggesx( int matrix_layout, char jobvsl, char jobvsr,
 exit_level_2:
     LAPACKE_free( rwork );
 exit_level_1:
-    if( LAPACKE_lsame( sort, 's' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sort, 's' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zggesx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggesx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggesx_work.c b/LAPACKE/src/lapacke_zggesx_work.c
index f9f1ccee10..08cf96a51a 100644
--- a/LAPACKE/src/lapacke_zggesx_work.c
+++ b/LAPACKE/src/lapacke_zggesx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggesx_work( int matrix_layout, char jobvsl, char jobvsr,
+lapack_int API_SUFFIX(LAPACKE_zggesx_work)( int matrix_layout, char jobvsl, char jobvsr,
                                 char sort, LAPACK_Z_SELECT2 selctg, char sense,
                                 lapack_int n, lapack_complex_double* a,
                                 lapack_int lda, lapack_complex_double* b,
@@ -68,22 +68,22 @@ lapack_int LAPACKE_zggesx_work( int matrix_layout, char jobvsl, char jobvsr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggesx_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggesx_work", info );
             return info;
         }
-        if( ldvsl < n ) {
+        if( ldvsl < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) && ldvsl < n ) ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_zggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggesx_work", info );
             return info;
         }
-        if( ldvsr < n ) {
+        if( ldvsr < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) && ldvsr < n ) ) {
             info = -18;
-            LAPACKE_xerbla( "LAPACKE_zggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggesx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -107,7 +107,7 @@ lapack_int LAPACKE_zggesx_work( int matrix_layout, char jobvsl, char jobvsr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             vsl_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvsl_t * MAX(1,n) );
@@ -116,7 +116,7 @@ lapack_int LAPACKE_zggesx_work( int matrix_layout, char jobvsl, char jobvsr,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             vsr_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvsr_t * MAX(1,n) );
@@ -126,8 +126,8 @@ lapack_int LAPACKE_zggesx_work( int matrix_layout, char jobvsl, char jobvsr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zggesx( &jobvsl, &jobvsr, &sort, selctg, &sense, &n, a_t, &lda_t,
                        b_t, &ldb_t, sdim, alpha, beta, vsl_t, &ldvsl_t, vsr_t,
@@ -137,22 +137,22 @@ lapack_int LAPACKE_zggesx_work( int matrix_layout, char jobvsl, char jobvsr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, vsl_t, ldvsl_t, vsl,
                                ldvsl );
         }
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, vsr_t, ldvsr_t, vsr,
                                ldvsr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvsr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsr, 'v' ) ) {
             LAPACKE_free( vsr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvsl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvsl, 'v' ) ) {
             LAPACKE_free( vsl_t );
         }
 exit_level_2:
@@ -161,11 +161,11 @@ lapack_int LAPACKE_zggesx_work( int matrix_layout, char jobvsl, char jobvsr,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zggesx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggesx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zggesx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggesx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggev.c b/LAPACKE/src/lapacke_zggev.c
index a92571b141..10a9469245 100644
--- a/LAPACKE/src/lapacke_zggev.c
+++ b/LAPACKE/src/lapacke_zggev.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggev( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_zggev)( int matrix_layout, char jobvl, char jobvr,
                           lapack_int n, lapack_complex_double* a,
                           lapack_int lda, lapack_complex_double* b,
                           lapack_int ldb, lapack_complex_double* alpha,
@@ -46,16 +46,16 @@ lapack_int LAPACKE_zggev( int matrix_layout, char jobvl, char jobvr,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zggev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -7;
         }
     }
@@ -67,7 +67,7 @@ lapack_int LAPACKE_zggev( int matrix_layout, char jobvl, char jobvr,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zggev_work( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_zggev_work)( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
                                alpha, beta, vl, ldvl, vr, ldvr, &work_query,
                                lwork, rwork );
     if( info != 0 ) {
@@ -82,7 +82,7 @@ lapack_int LAPACKE_zggev( int matrix_layout, char jobvl, char jobvr,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zggev_work( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_zggev_work)( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
                                alpha, beta, vl, ldvl, vr, ldvr, work, lwork,
                                rwork );
     /* Release memory and exit */
@@ -91,7 +91,7 @@ lapack_int LAPACKE_zggev( int matrix_layout, char jobvl, char jobvr,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zggev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggev3.c b/LAPACKE/src/lapacke_zggev3.c
index fa5fbe0fef..d32dd1a563 100644
--- a/LAPACKE/src/lapacke_zggev3.c
+++ b/LAPACKE/src/lapacke_zggev3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggev3( int matrix_layout,
+lapack_int API_SUFFIX(LAPACKE_zggev3)( int matrix_layout,
                            char jobvl, char jobvr, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* b, lapack_int ldb,
@@ -47,16 +47,16 @@ lapack_int LAPACKE_zggev3( int matrix_layout,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zggev3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggev3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -7;
         }
     }
@@ -68,7 +68,7 @@ lapack_int LAPACKE_zggev3( int matrix_layout,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zggev3_work( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_zggev3_work)( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
                                 alpha, beta, vl, ldvl, vr, ldvr, &work_query,
                                 lwork, rwork );
     if( info != 0 ) {
@@ -83,7 +83,7 @@ lapack_int LAPACKE_zggev3( int matrix_layout,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zggev3_work( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_zggev3_work)( matrix_layout, jobvl, jobvr, n, a, lda, b, ldb,
                                 alpha, beta, vl, ldvl, vr, ldvr, work, lwork,
                                 rwork );
     /* Release memory and exit */
@@ -92,7 +92,7 @@ lapack_int LAPACKE_zggev3( int matrix_layout,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zggev3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggev3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggev3_work.c b/LAPACKE/src/lapacke_zggev3_work.c
index 21bcd61870..96e9fda9a4 100644
--- a/LAPACKE/src/lapacke_zggev3_work.c
+++ b/LAPACKE/src/lapacke_zggev3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggev3_work( int matrix_layout,
+lapack_int API_SUFFIX(LAPACKE_zggev3_work)( int matrix_layout,
                                 char jobvl, char jobvr, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* b, lapack_int ldb,
@@ -52,10 +52,10 @@ lapack_int LAPACKE_zggev3_work( int matrix_layout,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_vl = LAPACKE_lsame( jobvl, 'v' ) ? n : 1;
-        lapack_int ncols_vl = LAPACKE_lsame( jobvl, 'v' ) ? n : 1;
-        lapack_int nrows_vr = LAPACKE_lsame( jobvr, 'v' ) ? n : 1;
-        lapack_int ncols_vr = LAPACKE_lsame( jobvr, 'v' ) ? n : 1;
+        lapack_int nrows_vl = API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ? n : 1;
+        lapack_int ncols_vl = API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ? n : 1;
+        lapack_int nrows_vr = API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ? n : 1;
+        lapack_int ncols_vr = API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ? n : 1;
         lapack_int lda_t = MAX(1,n);
         lapack_int ldb_t = MAX(1,n);
         lapack_int ldvl_t = MAX(1,nrows_vl);
@@ -67,22 +67,22 @@ lapack_int LAPACKE_zggev3_work( int matrix_layout,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggev3_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggev3_work", info );
             return info;
         }
         if( ldvl < ncols_vl ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggev3_work", info );
             return info;
         }
         if( ldvr < ncols_vr ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_zggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggev3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -105,7 +105,7 @@ lapack_int LAPACKE_zggev3_work( int matrix_layout,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvl_t * MAX(1,ncols_vl) );
@@ -114,7 +114,7 @@ lapack_int LAPACKE_zggev3_work( int matrix_layout,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvr_t * MAX(1,ncols_vr) );
@@ -124,8 +124,8 @@ lapack_int LAPACKE_zggev3_work( int matrix_layout,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zggev3( &jobvl, &jobvr, &n, a_t, &lda_t, b_t, &ldb_t,
                        alpha, beta, vl_t, &ldvl_t, vr_t, &ldvr_t,
@@ -134,22 +134,22 @@ lapack_int LAPACKE_zggev3_work( int matrix_layout,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_vl, ncols_vl, vl_t,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrows_vl, ncols_vl, vl_t,
                                ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_vr, ncols_vr, vr_t,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrows_vr, ncols_vr, vr_t,
                                ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -158,11 +158,11 @@ lapack_int LAPACKE_zggev3_work( int matrix_layout,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zggev3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggev3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zggev3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggev3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggev_work.c b/LAPACKE/src/lapacke_zggev_work.c
index 2c55e4f29b..6636ef8ad0 100644
--- a/LAPACKE/src/lapacke_zggev_work.c
+++ b/LAPACKE/src/lapacke_zggev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggev_work( int matrix_layout, char jobvl, char jobvr,
+lapack_int API_SUFFIX(LAPACKE_zggev_work)( int matrix_layout, char jobvl, char jobvr,
                                lapack_int n, lapack_complex_double* a,
                                lapack_int lda, lapack_complex_double* b,
                                lapack_int ldb, lapack_complex_double* alpha,
@@ -51,10 +51,10 @@ lapack_int LAPACKE_zggev_work( int matrix_layout, char jobvl, char jobvr,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_vl = LAPACKE_lsame( jobvl, 'v' ) ? n : 1;
-        lapack_int ncols_vl = LAPACKE_lsame( jobvl, 'v' ) ? n : 1;
-        lapack_int nrows_vr = LAPACKE_lsame( jobvr, 'v' ) ? n : 1;
-        lapack_int ncols_vr = LAPACKE_lsame( jobvr, 'v' ) ? n : 1;
+        lapack_int nrows_vl = API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ? n : 1;
+        lapack_int ncols_vl = API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ? n : 1;
+        lapack_int nrows_vr = API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ? n : 1;
+        lapack_int ncols_vr = API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ? n : 1;
         lapack_int lda_t = MAX(1,n);
         lapack_int ldb_t = MAX(1,n);
         lapack_int ldvl_t = MAX(1,nrows_vl);
@@ -66,22 +66,22 @@ lapack_int LAPACKE_zggev_work( int matrix_layout, char jobvl, char jobvr,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggev_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggev_work", info );
             return info;
         }
         if( ldvl < ncols_vl ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggev_work", info );
             return info;
         }
         if( ldvr < ncols_vr ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_zggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggev_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -104,7 +104,7 @@ lapack_int LAPACKE_zggev_work( int matrix_layout, char jobvl, char jobvr,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvl_t * MAX(1,ncols_vl) );
@@ -113,7 +113,7 @@ lapack_int LAPACKE_zggev_work( int matrix_layout, char jobvl, char jobvr,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvr_t * MAX(1,ncols_vr) );
@@ -123,8 +123,8 @@ lapack_int LAPACKE_zggev_work( int matrix_layout, char jobvl, char jobvr,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zggev( &jobvl, &jobvr, &n, a_t, &lda_t, b_t, &ldb_t, alpha, beta,
                       vl_t, &ldvl_t, vr_t, &ldvr_t, work, &lwork, rwork,
@@ -133,22 +133,22 @@ lapack_int LAPACKE_zggev_work( int matrix_layout, char jobvl, char jobvr,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_vl, ncols_vl, vl_t,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrows_vl, ncols_vl, vl_t,
                                ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_vr, ncols_vr, vr_t,
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrows_vr, ncols_vr, vr_t,
                                ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -157,11 +157,11 @@ lapack_int LAPACKE_zggev_work( int matrix_layout, char jobvl, char jobvr,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zggev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zggev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggevx.c b/LAPACKE/src/lapacke_zggevx.c
index 451cd27903..050a5921f4 100644
--- a/LAPACKE/src/lapacke_zggevx.c
+++ b/LAPACKE/src/lapacke_zggevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggevx( int matrix_layout, char balanc, char jobvl,
+lapack_int API_SUFFIX(LAPACKE_zggevx)( int matrix_layout, char balanc, char jobvl,
                            char jobvr, char sense, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* b, lapack_int ldb,
@@ -54,29 +54,29 @@ lapack_int LAPACKE_zggevx( int matrix_layout, char balanc, char jobvl,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zggevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( balanc, 's' ) || LAPACKE_lsame( balanc, 'b' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( balanc, 's' ) || API_SUFFIX(LAPACKE_lsame)( balanc, 'b' ) ) {
         lrwork = MAX(1,6*n);
     } else {
         lrwork = MAX(1,2*n);
     }
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'e' ) ||
-        LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'e' ) ||
+        API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         bwork = (lapack_logical*)
             LAPACKE_malloc( sizeof(lapack_logical) * MAX(1,n) );
         if( bwork == NULL ) {
@@ -84,8 +84,8 @@ lapack_int LAPACKE_zggevx( int matrix_layout, char balanc, char jobvl,
             goto exit_level_0;
         }
     }
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'n' ) ||
-        LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'n' ) ||
+        API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * MAX(1,n+2) );
         if( iwork == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -98,7 +98,7 @@ lapack_int LAPACKE_zggevx( int matrix_layout, char balanc, char jobvl,
         goto exit_level_2;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zggevx_work( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
+    info = API_SUFFIX(LAPACKE_zggevx_work)( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
                                 lda, b, ldb, alpha, beta, vl, ldvl, vr, ldvr,
                                 ilo, ihi, lscale, rscale, abnrm, bbnrm, rconde,
                                 rcondv, &work_query, lwork, rwork, iwork,
@@ -115,7 +115,7 @@ lapack_int LAPACKE_zggevx( int matrix_layout, char balanc, char jobvl,
         goto exit_level_3;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zggevx_work( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
+    info = API_SUFFIX(LAPACKE_zggevx_work)( matrix_layout, balanc, jobvl, jobvr, sense, n, a,
                                 lda, b, ldb, alpha, beta, vl, ldvl, vr, ldvr,
                                 ilo, ihi, lscale, rscale, abnrm, bbnrm, rconde,
                                 rcondv, work, lwork, rwork, iwork, bwork );
@@ -124,18 +124,18 @@ lapack_int LAPACKE_zggevx( int matrix_layout, char balanc, char jobvl,
 exit_level_3:
     LAPACKE_free( rwork );
 exit_level_2:
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'n' ) ||
-        LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'n' ) ||
+        API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         LAPACKE_free( iwork );
     }
 exit_level_1:
-    if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'e' ) ||
-        LAPACKE_lsame( sense, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( sense, 'b' ) || API_SUFFIX(LAPACKE_lsame)( sense, 'e' ) ||
+        API_SUFFIX(LAPACKE_lsame)( sense, 'v' ) ) {
         LAPACKE_free( bwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zggevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggevx_work.c b/LAPACKE/src/lapacke_zggevx_work.c
index 56a258b9df..8006710295 100644
--- a/LAPACKE/src/lapacke_zggevx_work.c
+++ b/LAPACKE/src/lapacke_zggevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggevx_work( int matrix_layout, char balanc, char jobvl,
+lapack_int API_SUFFIX(LAPACKE_zggevx_work)( int matrix_layout, char balanc, char jobvl,
                                 char jobvr, char sense, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* b, lapack_int ldb,
@@ -69,22 +69,22 @@ lapack_int LAPACKE_zggevx_work( int matrix_layout, char balanc, char jobvl,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggevx_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggevx_work", info );
             return info;
         }
         if( ldvl < n ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_zggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggevx_work", info );
             return info;
         }
         if( ldvr < n ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_zggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggevx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -108,7 +108,7 @@ lapack_int LAPACKE_zggevx_work( int matrix_layout, char balanc, char jobvl,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             vl_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvl_t * MAX(1,n) );
@@ -117,7 +117,7 @@ lapack_int LAPACKE_zggevx_work( int matrix_layout, char balanc, char jobvl,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             vr_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvr_t * MAX(1,n) );
@@ -127,8 +127,8 @@ lapack_int LAPACKE_zggevx_work( int matrix_layout, char balanc, char jobvl,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zggevx( &balanc, &jobvl, &jobvr, &sense, &n, a_t, &lda_t, b_t,
                        &ldb_t, alpha, beta, vl_t, &ldvl_t, vr_t, &ldvr_t, ilo,
@@ -138,20 +138,20 @@ lapack_int LAPACKE_zggevx_work( int matrix_layout, char balanc, char jobvl,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, vl_t, ldvl_t, vl, ldvl );
         }
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, vr_t, ldvr_t, vr, ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobvr, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvr, 'v' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobvl, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobvl, 'v' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -160,11 +160,11 @@ lapack_int LAPACKE_zggevx_work( int matrix_layout, char balanc, char jobvl,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zggevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zggevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggglm.c b/LAPACKE/src/lapacke_zggglm.c
index 323d2ee309..dce791355b 100644
--- a/LAPACKE/src/lapacke_zggglm.c
+++ b/LAPACKE/src/lapacke_zggglm.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggglm( int matrix_layout, lapack_int n, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zggglm)( int matrix_layout, lapack_int n, lapack_int m,
                            lapack_int p, lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* b,
                            lapack_int ldb, lapack_complex_double* d,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_zggglm( int matrix_layout, lapack_int n, lapack_int m,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zggglm", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggglm", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, m, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, p, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, p, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_z_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n, d, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zggglm_work( matrix_layout, n, m, p, a, lda, b, ldb, d, x, y,
+    info = API_SUFFIX(LAPACKE_zggglm_work)( matrix_layout, n, m, p, a, lda, b, ldb, d, x, y,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_zggglm( int matrix_layout, lapack_int n, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zggglm_work( matrix_layout, n, m, p, a, lda, b, ldb, d, x, y,
+    info = API_SUFFIX(LAPACKE_zggglm_work)( matrix_layout, n, m, p, a, lda, b, ldb, d, x, y,
                                 work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zggglm", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggglm", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggglm_work.c b/LAPACKE/src/lapacke_zggglm_work.c
index bc96333f14..3d767321a7 100644
--- a/LAPACKE/src/lapacke_zggglm_work.c
+++ b/LAPACKE/src/lapacke_zggglm_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggglm_work( int matrix_layout, lapack_int n, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zggglm_work)( int matrix_layout, lapack_int n, lapack_int m,
                                 lapack_int p, lapack_complex_double* a,
                                 lapack_int lda, lapack_complex_double* b,
                                 lapack_int ldb, lapack_complex_double* d,
@@ -56,12 +56,12 @@ lapack_int LAPACKE_zggglm_work( int matrix_layout, lapack_int n, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zggglm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggglm_work", info );
             return info;
         }
         if( ldb < p ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zggglm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggglm_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_zggglm_work( int matrix_layout, lapack_int n, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, m, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, p, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, p, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zggglm( &n, &m, &p, a_t, &lda_t, b_t, &ldb_t, d, x, y, work,
                        &lwork, &info );
@@ -93,19 +93,19 @@ lapack_int LAPACKE_zggglm_work( int matrix_layout, lapack_int n, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, m, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, p, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, m, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, p, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zggglm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggglm_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zggglm_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggglm_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgghd3.c b/LAPACKE/src/lapacke_zgghd3.c
index 3450167d1f..8470c89556 100644
--- a/LAPACKE/src/lapacke_zgghd3.c
+++ b/LAPACKE/src/lapacke_zgghd3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgghd3( int matrix_layout, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_zgghd3)( int matrix_layout, char compq, char compz,
                            lapack_int n, lapack_int ilo, lapack_int ihi,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* b, lapack_int ldb,
@@ -45,32 +45,32 @@ lapack_int LAPACKE_zgghd3( int matrix_layout, char compq, char compz,
     lapack_complex_double work_query;
 
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgghd3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgghd3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -13;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info =  LAPACKE_zgghd3_work( matrix_layout, compq, compz, n, ilo, ihi,
+    info =  API_SUFFIX(LAPACKE_zgghd3_work)( matrix_layout, compq, compz, n, ilo, ihi,
                                  a, lda, b, ldb, q, ldq, z, ldz, &work_query,
                                  lwork );
     if( info != 0 ) {
@@ -85,14 +85,14 @@ lapack_int LAPACKE_zgghd3( int matrix_layout, char compq, char compz,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info =  LAPACKE_zgghd3_work( matrix_layout, compq, compz, n, ilo, ihi,
+    info =  API_SUFFIX(LAPACKE_zgghd3_work)( matrix_layout, compq, compz, n, ilo, ihi,
                                  a, lda, b, ldb, q, ldq, z, ldz, work,
                                  lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgghd3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgghd3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgghd3_work.c b/LAPACKE/src/lapacke_zgghd3_work.c
index d8d361a76f..e81f7c50c0 100644
--- a/LAPACKE/src/lapacke_zgghd3_work.c
+++ b/LAPACKE/src/lapacke_zgghd3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgghd3_work( int matrix_layout, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_zgghd3_work)( int matrix_layout, char compq, char compz,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* b, lapack_int ldb,
@@ -67,22 +67,22 @@ lapack_int LAPACKE_zgghd3_work( int matrix_layout, char compq, char compz,
     /* Check leading dimension(s) */
     if( lda < n ) {
       info = -8;
-      LAPACKE_xerbla( "LAPACKE_zgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgghd3_work", info );
       return info;
     }
     if( ldb < n ) {
       info = -10;
-      LAPACKE_xerbla( "LAPACKE_zgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgghd3_work", info );
       return info;
     }
     if( ldq < n ) {
       info = -12;
-      LAPACKE_xerbla( "LAPACKE_zgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgghd3_work", info );
       return info;
     }
     if( ldz < n ) {
       info = -14;
-      LAPACKE_xerbla( "LAPACKE_zgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgghd3_work", info );
       return info;
     }
     /* Allocate memory for temporary array(s) */
@@ -96,14 +96,14 @@ lapack_int LAPACKE_zgghd3_work( int matrix_layout, char compq, char compz,
       info = LAPACK_TRANSPOSE_MEMORY_ERROR;
       goto exit_level_1;
     }
-    if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
       q_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * ldq_t * MAX(1,n) );
       if( q_t == NULL ) {
         info = LAPACK_TRANSPOSE_MEMORY_ERROR;
         goto exit_level_2;
       }
     }
-    if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
       z_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * ldz_t * MAX(1,n) );
       if( z_t == NULL ) {
         info = LAPACK_TRANSPOSE_MEMORY_ERROR;
@@ -111,13 +111,13 @@ lapack_int LAPACKE_zgghd3_work( int matrix_layout, char compq, char compz,
       }
     }
     /* Transpose input matrices */
-    LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-    LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-    if( LAPACKE_lsame( compq, 'v' ) ) {
-      LAPACKE_zge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+    API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+    API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+      API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
     }
-    if( LAPACKE_lsame( compz, 'v' ) ) {
-      LAPACKE_zge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+      API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
     }
     /* Call LAPACK function and adjust info */
     LAPACK_zgghd3( &compq, &compz, &n, &ilo, &ihi, a_t, &lda_t, b_t, &ldb_t,
@@ -126,20 +126,20 @@ lapack_int LAPACKE_zgghd3_work( int matrix_layout, char compq, char compz,
       info = info - 1;
     }
     /* Transpose output matrices */
-    LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-    LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-    if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-      LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+    API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+    API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+      API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
     }
-    if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-      LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+      API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
     }
     /* Release memory and exit */
-    if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
       LAPACKE_free( z_t );
     }
   exit_level_3:
-    if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
       LAPACKE_free( q_t );
     }
   exit_level_2:
@@ -148,11 +148,11 @@ lapack_int LAPACKE_zgghd3_work( int matrix_layout, char compq, char compz,
     LAPACKE_free( a_t );
   exit_level_0:
     if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-      LAPACKE_xerbla( "LAPACKE_zgghd3_work", info );
+      API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgghd3_work", info );
     }
   } else {
     info = -1;
-    LAPACKE_xerbla( "LAPACKE_zgghd3_work", info );
+    API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgghd3_work", info );
   }
   return info;
 }
diff --git a/LAPACKE/src/lapacke_zgghrd.c b/LAPACKE/src/lapacke_zgghrd.c
index 27ab1f3d72..d11ef2b71b 100644
--- a/LAPACKE/src/lapacke_zgghrd.c
+++ b/LAPACKE/src/lapacke_zgghrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgghrd( int matrix_layout, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_zgghrd)( int matrix_layout, char compq, char compz,
                            lapack_int n, lapack_int ilo, lapack_int ihi,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* b, lapack_int ldb,
@@ -40,30 +40,30 @@ lapack_int LAPACKE_zgghrd( int matrix_layout, char compq, char compz,
                            lapack_complex_double* z, lapack_int ldz )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgghrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgghrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -13;
             }
         }
     }
 #endif
-    return LAPACKE_zgghrd_work( matrix_layout, compq, compz, n, ilo, ihi, a, lda,
+    return API_SUFFIX(LAPACKE_zgghrd_work)( matrix_layout, compq, compz, n, ilo, ihi, a, lda,
                                 b, ldb, q, ldq, z, ldz );
 }
diff --git a/LAPACKE/src/lapacke_zgghrd_work.c b/LAPACKE/src/lapacke_zgghrd_work.c
index 29f81b2fcb..d665016900 100644
--- a/LAPACKE/src/lapacke_zgghrd_work.c
+++ b/LAPACKE/src/lapacke_zgghrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgghrd_work( int matrix_layout, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_zgghrd_work)( int matrix_layout, char compq, char compz,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* b, lapack_int ldb,
@@ -59,22 +59,22 @@ lapack_int LAPACKE_zgghrd_work( int matrix_layout, char compq, char compz,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgghrd_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgghrd_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgghrd_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_zgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgghrd_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -90,7 +90,7 @@ lapack_int LAPACKE_zgghrd_work( int matrix_layout, char compq, char compz,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             q_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldq_t * MAX(1,n) );
@@ -99,7 +99,7 @@ lapack_int LAPACKE_zgghrd_work( int matrix_layout, char compq, char compz,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,n) );
@@ -109,13 +109,13 @@ lapack_int LAPACKE_zgghrd_work( int matrix_layout, char compq, char compz,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_zgghrd( &compq, &compz, &n, &ilo, &ihi, a_t, &lda_t, b_t, &ldb_t,
@@ -124,20 +124,20 @@ lapack_int LAPACKE_zgghrd_work( int matrix_layout, char compq, char compz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_2:
@@ -146,11 +146,11 @@ lapack_int LAPACKE_zgghrd_work( int matrix_layout, char compq, char compz,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgghrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgghrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgghrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgghrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgglse.c b/LAPACKE/src/lapacke_zgglse.c
index 4477a874af..6c3b01a1a3 100644
--- a/LAPACKE/src/lapacke_zgglse.c
+++ b/LAPACKE/src/lapacke_zgglse.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgglse( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgglse)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int p, lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* b,
                            lapack_int ldb, lapack_complex_double* c,
@@ -43,28 +43,28 @@ lapack_int LAPACKE_zgglse( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgglse", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgglse", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_z_nancheck( m, c, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( m, c, 1 ) ) {
             return -9;
         }
-        if( LAPACKE_z_nancheck( p, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( p, d, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zgglse_work( matrix_layout, m, n, p, a, lda, b, ldb, c, d, x,
+    info = API_SUFFIX(LAPACKE_zgglse_work)( matrix_layout, m, n, p, a, lda, b, ldb, c, d, x,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -78,13 +78,13 @@ lapack_int LAPACKE_zgglse( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgglse_work( matrix_layout, m, n, p, a, lda, b, ldb, c, d, x,
+    info = API_SUFFIX(LAPACKE_zgglse_work)( matrix_layout, m, n, p, a, lda, b, ldb, c, d, x,
                                 work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgglse", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgglse", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgglse_work.c b/LAPACKE/src/lapacke_zgglse_work.c
index b8b41b1a1c..af6dbd2564 100644
--- a/LAPACKE/src/lapacke_zgglse_work.c
+++ b/LAPACKE/src/lapacke_zgglse_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgglse_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgglse_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int p, lapack_complex_double* a,
                                 lapack_int lda, lapack_complex_double* b,
                                 lapack_int ldb, lapack_complex_double* c,
@@ -56,12 +56,12 @@ lapack_int LAPACKE_zgglse_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zgglse_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgglse_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgglse_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgglse_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_zgglse_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgglse( &m, &n, &p, a_t, &lda_t, b_t, &ldb_t, c, d, x, work,
                        &lwork, &info );
@@ -93,19 +93,19 @@ lapack_int LAPACKE_zgglse_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgglse_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgglse_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgglse_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgglse_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggqrf.c b/LAPACKE/src/lapacke_zggqrf.c
index 88b5e2a576..56a95cd61c 100644
--- a/LAPACKE/src/lapacke_zggqrf.c
+++ b/LAPACKE/src/lapacke_zggqrf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggqrf( int matrix_layout, lapack_int n, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zggqrf)( int matrix_layout, lapack_int n, lapack_int m,
                            lapack_int p, lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* taua,
                            lapack_complex_double* b, lapack_int ldb,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_zggqrf( int matrix_layout, lapack_int n, lapack_int m,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zggqrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggqrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, m, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, p, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, p, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zggqrf_work( matrix_layout, n, m, p, a, lda, taua, b, ldb,
+    info = API_SUFFIX(LAPACKE_zggqrf_work)( matrix_layout, n, m, p, a, lda, taua, b, ldb,
                                 taub, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -72,13 +72,13 @@ lapack_int LAPACKE_zggqrf( int matrix_layout, lapack_int n, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zggqrf_work( matrix_layout, n, m, p, a, lda, taua, b, ldb,
+    info = API_SUFFIX(LAPACKE_zggqrf_work)( matrix_layout, n, m, p, a, lda, taua, b, ldb,
                                 taub, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zggqrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggqrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggqrf_work.c b/LAPACKE/src/lapacke_zggqrf_work.c
index 27430b2f82..8567c6cbfc 100644
--- a/LAPACKE/src/lapacke_zggqrf_work.c
+++ b/LAPACKE/src/lapacke_zggqrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggqrf_work( int matrix_layout, lapack_int n, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zggqrf_work)( int matrix_layout, lapack_int n, lapack_int m,
                                 lapack_int p, lapack_complex_double* a,
                                 lapack_int lda, lapack_complex_double* taua,
                                 lapack_complex_double* b, lapack_int ldb,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_zggqrf_work( int matrix_layout, lapack_int n, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zggqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggqrf_work", info );
             return info;
         }
         if( ldb < p ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zggqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggqrf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_zggqrf_work( int matrix_layout, lapack_int n, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, m, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, p, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, p, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zggqrf( &n, &m, &p, a_t, &lda_t, taua, b_t, &ldb_t, taub, work,
                        &lwork, &info );
@@ -92,19 +92,19 @@ lapack_int LAPACKE_zggqrf_work( int matrix_layout, lapack_int n, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, m, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, p, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, m, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, p, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zggqrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggqrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zggqrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggqrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggrqf.c b/LAPACKE/src/lapacke_zggrqf.c
index 0a3dad2e0f..0842ceca0a 100644
--- a/LAPACKE/src/lapacke_zggrqf.c
+++ b/LAPACKE/src/lapacke_zggrqf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggrqf( int matrix_layout, lapack_int m, lapack_int p,
+lapack_int API_SUFFIX(LAPACKE_zggrqf)( int matrix_layout, lapack_int m, lapack_int p,
                            lapack_int n, lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* taua,
                            lapack_complex_double* b, lapack_int ldb,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_zggrqf( int matrix_layout, lapack_int m, lapack_int p,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zggrqf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggrqf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zggrqf_work( matrix_layout, m, p, n, a, lda, taua, b, ldb,
+    info = API_SUFFIX(LAPACKE_zggrqf_work)( matrix_layout, m, p, n, a, lda, taua, b, ldb,
                                 taub, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -72,13 +72,13 @@ lapack_int LAPACKE_zggrqf( int matrix_layout, lapack_int m, lapack_int p,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zggrqf_work( matrix_layout, m, p, n, a, lda, taua, b, ldb,
+    info = API_SUFFIX(LAPACKE_zggrqf_work)( matrix_layout, m, p, n, a, lda, taua, b, ldb,
                                 taub, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zggrqf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggrqf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggrqf_work.c b/LAPACKE/src/lapacke_zggrqf_work.c
index 12f03139e4..66268071ad 100644
--- a/LAPACKE/src/lapacke_zggrqf_work.c
+++ b/LAPACKE/src/lapacke_zggrqf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggrqf_work( int matrix_layout, lapack_int m, lapack_int p,
+lapack_int API_SUFFIX(LAPACKE_zggrqf_work)( int matrix_layout, lapack_int m, lapack_int p,
                                 lapack_int n, lapack_complex_double* a,
                                 lapack_int lda, lapack_complex_double* taua,
                                 lapack_complex_double* b, lapack_int ldb,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_zggrqf_work( int matrix_layout, lapack_int m, lapack_int p,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zggrqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggrqf_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zggrqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggrqf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_zggrqf_work( int matrix_layout, lapack_int m, lapack_int p,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zggrqf( &m, &p, &n, a_t, &lda_t, taua, b_t, &ldb_t, taub, work,
                        &lwork, &info );
@@ -92,19 +92,19 @@ lapack_int LAPACKE_zggrqf_work( int matrix_layout, lapack_int m, lapack_int p,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zggrqf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggrqf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zggrqf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggrqf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggsvd.c b/LAPACKE/src/lapacke_zggsvd.c
index 2e02383999..14b2794381 100644
--- a/LAPACKE/src/lapacke_zggsvd.c
+++ b/LAPACKE/src/lapacke_zggsvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggsvd( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_zggsvd)( int matrix_layout, char jobu, char jobv, char jobq,
                            lapack_int m, lapack_int n, lapack_int p,
                            lapack_int* k, lapack_int* l,
                            lapack_complex_double* a, lapack_int lda,
@@ -47,16 +47,16 @@ lapack_int LAPACKE_zggsvd( int matrix_layout, char jobu, char jobv, char jobq,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zggsvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -10;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -12;
         }
     }
@@ -75,7 +75,7 @@ lapack_int LAPACKE_zggsvd( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zggsvd_work( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
+    info = API_SUFFIX(LAPACKE_zggsvd_work)( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
                                 a, lda, b, ldb, alpha, beta, u, ldu, v, ldv, q,
                                 ldq, work, rwork, iwork );
     /* Release memory and exit */
@@ -84,7 +84,7 @@ lapack_int LAPACKE_zggsvd( int matrix_layout, char jobu, char jobv, char jobq,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zggsvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggsvd3.c b/LAPACKE/src/lapacke_zggsvd3.c
index a342fd7798..dbb0d75d29 100644
--- a/LAPACKE/src/lapacke_zggsvd3.c
+++ b/LAPACKE/src/lapacke_zggsvd3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggsvd3( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_zggsvd3)( int matrix_layout, char jobu, char jobv, char jobq,
                             lapack_int m, lapack_int n, lapack_int p,
                             lapack_int* k, lapack_int* l,
                             lapack_complex_double* a, lapack_int lda,
@@ -49,22 +49,22 @@ lapack_int LAPACKE_zggsvd3( int matrix_layout, char jobu, char jobv, char jobq,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zggsvd3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -10;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -12;
         }
     }
 #endif
     /* Query optimal size for working array */
-    info = LAPACKE_zggsvd3_work( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
+    info = API_SUFFIX(LAPACKE_zggsvd3_work)( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
                                  a, lda, b, ldb, alpha, beta, u, ldu, v, ldv, q,
                                  ldq, &work_query, lwork, rwork, iwork );
     if( info != 0 )
@@ -83,7 +83,7 @@ lapack_int LAPACKE_zggsvd3( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zggsvd3_work( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
+    info = API_SUFFIX(LAPACKE_zggsvd3_work)( matrix_layout, jobu, jobv, jobq, m, n, p, k, l,
                                  a, lda, b, ldb, alpha, beta, u, ldu, v, ldv, q,
                                  ldq, work, lwork, rwork, iwork );
     /* Release memory and exit */
@@ -92,7 +92,7 @@ lapack_int LAPACKE_zggsvd3( int matrix_layout, char jobu, char jobv, char jobq,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zggsvd3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggsvd3_work.c b/LAPACKE/src/lapacke_zggsvd3_work.c
index 59401be961..0578a9857e 100644
--- a/LAPACKE/src/lapacke_zggsvd3_work.c
+++ b/LAPACKE/src/lapacke_zggsvd3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggsvd3_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_zggsvd3_work)( int matrix_layout, char jobu, char jobv,
                                  char jobq, lapack_int m, lapack_int n,
                                  lapack_int p, lapack_int* k, lapack_int* l,
                                  lapack_complex_double* a, lapack_int lda,
@@ -67,27 +67,27 @@ lapack_int LAPACKE_zggsvd3_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd3_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd3_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_zggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd3_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_zggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd3_work", info );
             return info;
         }
         if( ldv < p ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_zggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -110,7 +110,7 @@ lapack_int LAPACKE_zggsvd3_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldu_t * MAX(1,m) );
@@ -119,7 +119,7 @@ lapack_int LAPACKE_zggsvd3_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldv_t * MAX(1,p) );
@@ -128,7 +128,7 @@ lapack_int LAPACKE_zggsvd3_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldq_t * MAX(1,n) );
@@ -138,8 +138,8 @@ lapack_int LAPACKE_zggsvd3_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zggsvd3( &jobu, &jobv, &jobq, &m, &n, &p, k, l, a_t, &lda_t, b_t,
                         &ldb_t, alpha, beta, u_t, &ldu_t, v_t, &ldv_t, q_t,
@@ -148,27 +148,27 @@ lapack_int LAPACKE_zggsvd3_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -177,11 +177,11 @@ lapack_int LAPACKE_zggsvd3_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zggsvd3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zggsvd3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggsvd_work.c b/LAPACKE/src/lapacke_zggsvd_work.c
index 88ed68a154..5af8c1dd91 100644
--- a/LAPACKE/src/lapacke_zggsvd_work.c
+++ b/LAPACKE/src/lapacke_zggsvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggsvd_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_zggsvd_work)( int matrix_layout, char jobu, char jobv,
                                 char jobq, lapack_int m, lapack_int n,
                                 lapack_int p, lapack_int* k, lapack_int* l,
                                 lapack_complex_double* a, lapack_int lda,
@@ -67,27 +67,27 @@ lapack_int LAPACKE_zggsvd_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_zggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_zggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd_work", info );
             return info;
         }
         if( ldv < p ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_zggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -103,7 +103,7 @@ lapack_int LAPACKE_zggsvd_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldu_t * MAX(1,m) );
@@ -112,7 +112,7 @@ lapack_int LAPACKE_zggsvd_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldv_t * MAX(1,p) );
@@ -121,7 +121,7 @@ lapack_int LAPACKE_zggsvd_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldq_t * MAX(1,n) );
@@ -131,8 +131,8 @@ lapack_int LAPACKE_zggsvd_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zggsvd( &jobu, &jobv, &jobq, &m, &n, &p, k, l, a_t, &lda_t, b_t,
                        &ldb_t, alpha, beta, u_t, &ldu_t, v_t, &ldv_t, q_t,
@@ -141,27 +141,27 @@ lapack_int LAPACKE_zggsvd_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -170,11 +170,11 @@ lapack_int LAPACKE_zggsvd_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zggsvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zggsvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggsvp.c b/LAPACKE/src/lapacke_zggsvp.c
index 5b983dcf8a..e33f163e4d 100644
--- a/LAPACKE/src/lapacke_zggsvp.c
+++ b/LAPACKE/src/lapacke_zggsvp.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggsvp( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_zggsvp)( int matrix_layout, char jobu, char jobv, char jobq,
                            lapack_int m, lapack_int p, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* b, lapack_int ldb,
@@ -48,22 +48,22 @@ lapack_int LAPACKE_zggsvp( int matrix_layout, char jobu, char jobv, char jobq,
     lapack_complex_double* tau = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zggsvp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_d_nancheck( 1, &tola, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &tola, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_d_nancheck( 1, &tolb, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &tolb, 1 ) ) {
             return -13;
         }
     }
@@ -92,7 +92,7 @@ lapack_int LAPACKE_zggsvp( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_3;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zggsvp_work( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
+    info = API_SUFFIX(LAPACKE_zggsvp_work)( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
                                 b, ldb, tola, tolb, k, l, u, ldu, v, ldv, q,
                                 ldq, iwork, rwork, tau, work );
     /* Release memory and exit */
@@ -105,7 +105,7 @@ lapack_int LAPACKE_zggsvp( int matrix_layout, char jobu, char jobv, char jobq,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zggsvp", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggsvp3.c b/LAPACKE/src/lapacke_zggsvp3.c
index 94f97216eb..8bd3f72466 100644
--- a/LAPACKE/src/lapacke_zggsvp3.c
+++ b/LAPACKE/src/lapacke_zggsvp3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggsvp3( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_zggsvp3)( int matrix_layout, char jobu, char jobv, char jobq,
                             lapack_int m, lapack_int p, lapack_int n,
                             lapack_complex_double* a, lapack_int lda,
                             lapack_complex_double* b, lapack_int ldb,
@@ -50,28 +50,28 @@ lapack_int LAPACKE_zggsvp3( int matrix_layout, char jobu, char jobv, char jobq,
     lapack_int lwork = -1;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zggsvp3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_d_nancheck( 1, &tola, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &tola, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_d_nancheck( 1, &tolb, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &tolb, 1 ) ) {
             return -13;
         }
     }
 #endif
     /* Query optimal size for working array */
-    info = LAPACKE_zggsvp3_work( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
+    info = API_SUFFIX(LAPACKE_zggsvp3_work)( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
                                  b, ldb, tola, tolb, k, l, u, ldu, v, ldv, q,
                                  ldq, iwork, rwork, tau, &work_query, lwork );
     if( info != 0 )
@@ -101,7 +101,7 @@ lapack_int LAPACKE_zggsvp3( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_3;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zggsvp3_work( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
+    info = API_SUFFIX(LAPACKE_zggsvp3_work)( matrix_layout, jobu, jobv, jobq, m, p, n, a, lda,
                                  b, ldb, tola, tolb, k, l, u, ldu, v, ldv, q,
                                  ldq, iwork, rwork, tau, work, lwork );
     /* Release memory and exit */
@@ -114,7 +114,7 @@ lapack_int LAPACKE_zggsvp3( int matrix_layout, char jobu, char jobv, char jobq,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zggsvp3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggsvp3_work.c b/LAPACKE/src/lapacke_zggsvp3_work.c
index a2c023d9fa..b24b4b684e 100644
--- a/LAPACKE/src/lapacke_zggsvp3_work.c
+++ b/LAPACKE/src/lapacke_zggsvp3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggsvp3_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_zggsvp3_work)( int matrix_layout, char jobu, char jobv,
                                  char jobq, lapack_int m, lapack_int p,
                                  lapack_int n, lapack_complex_double* a,
                                  lapack_int lda, lapack_complex_double* b,
@@ -68,27 +68,27 @@ lapack_int LAPACKE_zggsvp3_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp3_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp3_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_zggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp3_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_zggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp3_work", info );
             return info;
         }
         if( ldv < p ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_zggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -112,7 +112,7 @@ lapack_int LAPACKE_zggsvp3_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldu_t * MAX(1,m) );
@@ -121,7 +121,7 @@ lapack_int LAPACKE_zggsvp3_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldv_t * MAX(1,p) );
@@ -130,7 +130,7 @@ lapack_int LAPACKE_zggsvp3_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldq_t * MAX(1,n) );
@@ -140,8 +140,8 @@ lapack_int LAPACKE_zggsvp3_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zggsvp3( &jobu, &jobv, &jobq, &m, &p, &n, a_t, &lda_t, b_t,
                         &ldb_t, &tola, &tolb, k, l, u_t, &ldu_t, v_t, &ldv_t,
@@ -150,27 +150,27 @@ lapack_int LAPACKE_zggsvp3_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -179,11 +179,11 @@ lapack_int LAPACKE_zggsvp3_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zggsvp3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zggsvp3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zggsvp_work.c b/LAPACKE/src/lapacke_zggsvp_work.c
index 94287ede81..a48611e4a3 100644
--- a/LAPACKE/src/lapacke_zggsvp_work.c
+++ b/LAPACKE/src/lapacke_zggsvp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zggsvp_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_zggsvp_work)( int matrix_layout, char jobu, char jobv,
                                 char jobq, lapack_int m, lapack_int p,
                                 lapack_int n, lapack_complex_double* a,
                                 lapack_int lda, lapack_complex_double* b,
@@ -68,27 +68,27 @@ lapack_int LAPACKE_zggsvp_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_zggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_zggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp_work", info );
             return info;
         }
         if( ldv < m ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_zggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -104,7 +104,7 @@ lapack_int LAPACKE_zggsvp_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldu_t * MAX(1,m) );
@@ -113,7 +113,7 @@ lapack_int LAPACKE_zggsvp_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldv_t * MAX(1,m) );
@@ -122,7 +122,7 @@ lapack_int LAPACKE_zggsvp_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldq_t * MAX(1,n) );
@@ -132,8 +132,8 @@ lapack_int LAPACKE_zggsvp_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zggsvp( &jobu, &jobv, &jobq, &m, &p, &n, a_t, &lda_t, b_t,
                        &ldb_t, &tola, &tolb, k, l, u_t, &ldu_t, v_t, &ldv_t,
@@ -142,27 +142,27 @@ lapack_int LAPACKE_zggsvp_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, p, m, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, p, m, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -171,11 +171,11 @@ lapack_int LAPACKE_zggsvp_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zggsvp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zggsvp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zggsvp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgtcon.c b/LAPACKE/src/lapacke_zgtcon.c
index e6a216a2cb..bee354be9d 100644
--- a/LAPACKE/src/lapacke_zgtcon.c
+++ b/LAPACKE/src/lapacke_zgtcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgtcon( char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgtcon)( char norm, lapack_int n,
                            const lapack_complex_double* dl,
                            const lapack_complex_double* d,
                            const lapack_complex_double* du,
@@ -44,19 +44,19 @@ lapack_int LAPACKE_zgtcon( char norm, lapack_int n,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_z_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_z_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, dl, 1 ) ) {
             return -3;
         }
-        if( LAPACKE_z_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, du, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_z_nancheck( n-2, du2, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-2, du2, 1 ) ) {
             return -6;
         }
     }
@@ -69,13 +69,13 @@ lapack_int LAPACKE_zgtcon( char norm, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgtcon_work( norm, n, dl, d, du, du2, ipiv, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_zgtcon_work)( norm, n, dl, d, du, du2, ipiv, anorm, rcond,
                                 work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgtcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgtcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgtcon_work.c b/LAPACKE/src/lapacke_zgtcon_work.c
index 8b73db9c31..704a3404bd 100644
--- a/LAPACKE/src/lapacke_zgtcon_work.c
+++ b/LAPACKE/src/lapacke_zgtcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgtcon_work( char norm, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgtcon_work)( char norm, lapack_int n,
                                 const lapack_complex_double* dl,
                                 const lapack_complex_double* d,
                                 const lapack_complex_double* du,
diff --git a/LAPACKE/src/lapacke_zgtrfs.c b/LAPACKE/src/lapacke_zgtrfs.c
index 3e82b8eaea..4be3ab999a 100644
--- a/LAPACKE/src/lapacke_zgtrfs.c
+++ b/LAPACKE/src/lapacke_zgtrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgtrfs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgtrfs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* dl,
                            const lapack_complex_double* d,
                            const lapack_complex_double* du,
@@ -49,37 +49,37 @@ lapack_int LAPACKE_zgtrfs( int matrix_layout, char trans, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgtrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgtrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
-        if( LAPACKE_z_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n, d, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_z_nancheck( n, df, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n, df, 1 ) ) {
             return -9;
         }
-        if( LAPACKE_z_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, dl, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_z_nancheck( n-1, dlf, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, dlf, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_z_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, du, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_z_nancheck( n-2, du2, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-2, du2, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_z_nancheck( n-1, duf, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, duf, 1 ) ) {
             return -10;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -15;
         }
     }
@@ -97,7 +97,7 @@ lapack_int LAPACKE_zgtrfs( int matrix_layout, char trans, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgtrfs_work( matrix_layout, trans, n, nrhs, dl, d, du, dlf,
+    info = API_SUFFIX(LAPACKE_zgtrfs_work)( matrix_layout, trans, n, nrhs, dl, d, du, dlf,
                                 df, duf, du2, ipiv, b, ldb, x, ldx, ferr, berr,
                                 work, rwork );
     /* Release memory and exit */
@@ -106,7 +106,7 @@ lapack_int LAPACKE_zgtrfs( int matrix_layout, char trans, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgtrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgtrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgtrfs_work.c b/LAPACKE/src/lapacke_zgtrfs_work.c
index e45fac1692..babe452a99 100644
--- a/LAPACKE/src/lapacke_zgtrfs_work.c
+++ b/LAPACKE/src/lapacke_zgtrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgtrfs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgtrfs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int nrhs,
                                 const lapack_complex_double* dl,
                                 const lapack_complex_double* d,
@@ -63,12 +63,12 @@ lapack_int LAPACKE_zgtrfs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_zgtrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgtrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_zgtrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgtrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -87,8 +87,8 @@ lapack_int LAPACKE_zgtrfs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgtrfs( &trans, &n, &nrhs, dl, d, du, dlf, df, duf, du2, ipiv,
                        b_t, &ldb_t, x_t, &ldx_t, ferr, berr, work, rwork,
@@ -97,18 +97,18 @@ lapack_int LAPACKE_zgtrfs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgtrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgtrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgtrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgtrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgtsv.c b/LAPACKE/src/lapacke_zgtsv.c
index 7f4afdba23..1c94f8ad51 100644
--- a/LAPACKE/src/lapacke_zgtsv.c
+++ b/LAPACKE/src/lapacke_zgtsv.c
@@ -32,31 +32,31 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgtsv( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_zgtsv)( int matrix_layout, lapack_int n, lapack_int nrhs,
                           lapack_complex_double* dl, lapack_complex_double* d,
                           lapack_complex_double* du, lapack_complex_double* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgtsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgtsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_z_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_z_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, dl, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_z_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, du, 1 ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_zgtsv_work( matrix_layout, n, nrhs, dl, d, du, b, ldb );
+    return API_SUFFIX(LAPACKE_zgtsv_work)( matrix_layout, n, nrhs, dl, d, du, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zgtsv_work.c b/LAPACKE/src/lapacke_zgtsv_work.c
index ef49ec2258..3b0516d5fd 100644
--- a/LAPACKE/src/lapacke_zgtsv_work.c
+++ b/LAPACKE/src/lapacke_zgtsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgtsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_zgtsv_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                lapack_complex_double* dl,
                                lapack_complex_double* d,
                                lapack_complex_double* du,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zgtsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zgtsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgtsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,23 +63,23 @@ lapack_int LAPACKE_zgtsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgtsv( &n, &nrhs, dl, d, du, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgtsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgtsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgtsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgtsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgtsvx.c b/LAPACKE/src/lapacke_zgtsvx.c
index 80ab003f45..f767106e46 100644
--- a/LAPACKE/src/lapacke_zgtsvx.c
+++ b/LAPACKE/src/lapacke_zgtsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgtsvx( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_zgtsvx)( int matrix_layout, char fact, char trans,
                            lapack_int n, lapack_int nrhs,
                            const lapack_complex_double* dl,
                            const lapack_complex_double* d,
@@ -49,41 +49,41 @@ lapack_int LAPACKE_zgtsvx( int matrix_layout, char fact, char trans,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgtsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgtsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -14;
         }
-        if( LAPACKE_z_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n, d, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_z_nancheck( n, df, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_z_nancheck)( n, df, 1 ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_z_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, dl, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_z_nancheck( n-1, dlf, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, dlf, 1 ) ) {
                 return -9;
             }
         }
-        if( LAPACKE_z_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, du, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_z_nancheck( n-2, du2, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_z_nancheck)( n-2, du2, 1 ) ) {
                 return -12;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_z_nancheck( n-1, duf, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, duf, 1 ) ) {
                 return -11;
             }
         }
@@ -102,7 +102,7 @@ lapack_int LAPACKE_zgtsvx( int matrix_layout, char fact, char trans,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zgtsvx_work( matrix_layout, fact, trans, n, nrhs, dl, d, du,
+    info = API_SUFFIX(LAPACKE_zgtsvx_work)( matrix_layout, fact, trans, n, nrhs, dl, d, du,
                                 dlf, df, duf, du2, ipiv, b, ldb, x, ldx, rcond,
                                 ferr, berr, work, rwork );
     /* Release memory and exit */
@@ -111,7 +111,7 @@ lapack_int LAPACKE_zgtsvx( int matrix_layout, char fact, char trans,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zgtsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgtsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgtsvx_work.c b/LAPACKE/src/lapacke_zgtsvx_work.c
index b3f929e212..5569f418ae 100644
--- a/LAPACKE/src/lapacke_zgtsvx_work.c
+++ b/LAPACKE/src/lapacke_zgtsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgtsvx_work( int matrix_layout, char fact, char trans,
+lapack_int API_SUFFIX(LAPACKE_zgtsvx_work)( int matrix_layout, char fact, char trans,
                                 lapack_int n, lapack_int nrhs,
                                 const lapack_complex_double* dl,
                                 const lapack_complex_double* d,
@@ -63,12 +63,12 @@ lapack_int LAPACKE_zgtsvx_work( int matrix_layout, char fact, char trans,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_zgtsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgtsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_zgtsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgtsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -87,7 +87,7 @@ lapack_int LAPACKE_zgtsvx_work( int matrix_layout, char fact, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgtsvx( &fact, &trans, &n, &nrhs, dl, d, du, dlf, df, duf, du2,
                        ipiv, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr, berr, work,
@@ -96,18 +96,18 @@ lapack_int LAPACKE_zgtsvx_work( int matrix_layout, char fact, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgtsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgtsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgtsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgtsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zgttrf.c b/LAPACKE/src/lapacke_zgttrf.c
index 7033b76db0..7647575208 100644
--- a/LAPACKE/src/lapacke_zgttrf.c
+++ b/LAPACKE/src/lapacke_zgttrf.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgttrf( lapack_int n, lapack_complex_double* dl,
+lapack_int API_SUFFIX(LAPACKE_zgttrf)( lapack_int n, lapack_complex_double* dl,
                            lapack_complex_double* d, lapack_complex_double* du,
                            lapack_complex_double* du2, lapack_int* ipiv )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_z_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n, d, 1 ) ) {
             return -3;
         }
-        if( LAPACKE_z_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, dl, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_z_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, du, 1 ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zgttrf_work( n, dl, d, du, du2, ipiv );
+    return API_SUFFIX(LAPACKE_zgttrf_work)( n, dl, d, du, du2, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_zgttrf_work.c b/LAPACKE/src/lapacke_zgttrf_work.c
index 1b6dc5d724..5fdd8666ee 100644
--- a/LAPACKE/src/lapacke_zgttrf_work.c
+++ b/LAPACKE/src/lapacke_zgttrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgttrf_work( lapack_int n, lapack_complex_double* dl,
+lapack_int API_SUFFIX(LAPACKE_zgttrf_work)( lapack_int n, lapack_complex_double* dl,
                                 lapack_complex_double* d,
                                 lapack_complex_double* du,
                                 lapack_complex_double* du2, lapack_int* ipiv )
diff --git a/LAPACKE/src/lapacke_zgttrs.c b/LAPACKE/src/lapacke_zgttrs.c
index 379b8e0f66..33fbd7e318 100644
--- a/LAPACKE/src/lapacke_zgttrs.c
+++ b/LAPACKE/src/lapacke_zgttrs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgttrs( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgttrs)( int matrix_layout, char trans, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* dl,
                            const lapack_complex_double* d,
                            const lapack_complex_double* du,
@@ -41,29 +41,29 @@ lapack_int LAPACKE_zgttrs( int matrix_layout, char trans, lapack_int n,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zgttrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgttrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_z_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n, d, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_z_nancheck( n-1, dl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, dl, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_z_nancheck( n-1, du, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, du, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_z_nancheck( n-2, du2, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-2, du2, 1 ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_zgttrs_work( matrix_layout, trans, n, nrhs, dl, d, du, du2,
+    return API_SUFFIX(LAPACKE_zgttrs_work)( matrix_layout, trans, n, nrhs, dl, d, du, du2,
                                 ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zgttrs_work.c b/LAPACKE/src/lapacke_zgttrs_work.c
index d3d43cc088..9db6d357a0 100644
--- a/LAPACKE/src/lapacke_zgttrs_work.c
+++ b/LAPACKE/src/lapacke_zgttrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zgttrs_work( int matrix_layout, char trans, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zgttrs_work)( int matrix_layout, char trans, lapack_int n,
                                 lapack_int nrhs,
                                 const lapack_complex_double* dl,
                                 const lapack_complex_double* d,
@@ -55,7 +55,7 @@ lapack_int LAPACKE_zgttrs_work( int matrix_layout, char trans, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zgttrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgttrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -67,7 +67,7 @@ lapack_int LAPACKE_zgttrs_work( int matrix_layout, char trans, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zgttrs( &trans, &n, &nrhs, dl, d, du, du2, ipiv, b_t, &ldb_t,
                        &info );
@@ -75,16 +75,16 @@ lapack_int LAPACKE_zgttrs_work( int matrix_layout, char trans, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zgttrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgttrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zgttrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zgttrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbev.c b/LAPACKE/src/lapacke_zhbev.c
index 23e9167a97..74cbe96f43 100644
--- a/LAPACKE/src/lapacke_zhbev.c
+++ b/LAPACKE/src/lapacke_zhbev.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbev( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhbev)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_int kd, lapack_complex_double* ab,
                           lapack_int ldab, double* w, lapack_complex_double* z,
                           lapack_int ldz )
@@ -41,13 +41,13 @@ lapack_int LAPACKE_zhbev( int matrix_layout, char jobz, char uplo, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zhb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
     }
@@ -65,7 +65,7 @@ lapack_int LAPACKE_zhbev( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhbev_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_zhbev_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                ldz, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -73,7 +73,7 @@ lapack_int LAPACKE_zhbev( int matrix_layout, char jobz, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbev_2stage.c b/LAPACKE/src/lapacke_zhbev_2stage.c
index 993dcc17ed..5b26fc0e9e 100644
--- a/LAPACKE/src/lapacke_zhbev_2stage.c
+++ b/LAPACKE/src/lapacke_zhbev_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbev_2stage( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhbev_2stage)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_int kd, lapack_complex_double* ab,
                           lapack_int ldab, double* w, lapack_complex_double* z,
                           lapack_int ldz )
@@ -43,19 +43,19 @@ lapack_int LAPACKE_zhbev_2stage( int matrix_layout, char jobz, char uplo, lapack
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbev_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbev_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zhb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhbev_2stage_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_zhbev_2stage_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                ldz, &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -74,7 +74,7 @@ lapack_int LAPACKE_zhbev_2stage( int matrix_layout, char jobz, char uplo, lapack
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhbev_2stage_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_zhbev_2stage_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                ldz, work, lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -82,7 +82,7 @@ lapack_int LAPACKE_zhbev_2stage( int matrix_layout, char jobz, char uplo, lapack
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbev_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbev_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbev_2stage_work.c b/LAPACKE/src/lapacke_zhbev_2stage_work.c
index 931fe0529f..bd95ea15ee 100644
--- a/LAPACKE/src/lapacke_zhbev_2stage_work.c
+++ b/LAPACKE/src/lapacke_zhbev_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbev_2stage_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhbev_2stage_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_int kd,
                                lapack_complex_double* ab, lapack_int ldab,
                                double* w, lapack_complex_double* z,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_zhbev_2stage_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zhbev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbev_2stage_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zhbev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbev_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -76,7 +76,7 @@ lapack_int LAPACKE_zhbev_2stage_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,n) );
@@ -86,7 +86,7 @@ lapack_int LAPACKE_zhbev_2stage_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zhb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zhb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhbev_2stage( &jobz, &uplo, &n, &kd, ab_t, &ldab_t, w, z_t, &ldz_t,
                       work, &lwork, rwork, &info );
@@ -94,24 +94,24 @@ lapack_int LAPACKE_zhbev_2stage_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_zhb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhbev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbev_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhbev_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbev_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbev_work.c b/LAPACKE/src/lapacke_zhbev_work.c
index aa6a8ec54a..5b7af15568 100644
--- a/LAPACKE/src/lapacke_zhbev_work.c
+++ b/LAPACKE/src/lapacke_zhbev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbev_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhbev_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_int kd,
                                lapack_complex_double* ab, lapack_int ldab,
                                double* w, lapack_complex_double* z,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_zhbev_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zhbev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbev_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zhbev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbev_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,7 +70,7 @@ lapack_int LAPACKE_zhbev_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,n) );
@@ -80,7 +80,7 @@ lapack_int LAPACKE_zhbev_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zhb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zhb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhbev( &jobz, &uplo, &n, &kd, ab_t, &ldab_t, w, z_t, &ldz_t,
                       work, rwork, &info );
@@ -88,24 +88,24 @@ lapack_int LAPACKE_zhbev_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_zhb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhbev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhbev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbevd.c b/LAPACKE/src/lapacke_zhbevd.c
index ea92e2a6db..4d003f73e2 100644
--- a/LAPACKE/src/lapacke_zhbevd.c
+++ b/LAPACKE/src/lapacke_zhbevd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbevd( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhbevd)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_int kd, lapack_complex_double* ab,
                            lapack_int ldab, double* w, lapack_complex_double* z,
                            lapack_int ldz )
@@ -48,19 +48,19 @@ lapack_int LAPACKE_zhbevd( int matrix_layout, char jobz, char uplo, lapack_int n
     double rwork_query;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbevd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zhb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhbevd_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_zhbevd_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                 ldz, &work_query, lwork, &rwork_query, lrwork,
                                 &iwork_query, liwork );
     if( info != 0 ) {
@@ -87,7 +87,7 @@ lapack_int LAPACKE_zhbevd( int matrix_layout, char jobz, char uplo, lapack_int n
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhbevd_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_zhbevd_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                 ldz, work, lwork, rwork, lrwork, iwork,
                                 liwork );
     /* Release memory and exit */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_zhbevd( int matrix_layout, char jobz, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbevd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbevd_2stage.c b/LAPACKE/src/lapacke_zhbevd_2stage.c
index ba14fe2904..b878db9ff9 100644
--- a/LAPACKE/src/lapacke_zhbevd_2stage.c
+++ b/LAPACKE/src/lapacke_zhbevd_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbevd_2stage( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhbevd_2stage)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_int kd, lapack_complex_double* ab,
                            lapack_int ldab, double* w, lapack_complex_double* z,
                            lapack_int ldz )
@@ -48,19 +48,19 @@ lapack_int LAPACKE_zhbevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     double rwork_query;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbevd_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevd_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zhb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhbevd_2stage_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_zhbevd_2stage_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                 ldz, &work_query, lwork, &rwork_query, lrwork,
                                 &iwork_query, liwork );
     if( info != 0 ) {
@@ -87,7 +87,7 @@ lapack_int LAPACKE_zhbevd_2stage( int matrix_layout, char jobz, char uplo, lapac
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhbevd_2stage_work( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
+    info = API_SUFFIX(LAPACKE_zhbevd_2stage_work)( matrix_layout, jobz, uplo, n, kd, ab, ldab, w, z,
                                 ldz, work, lwork, rwork, lrwork, iwork,
                                 liwork );
     /* Release memory and exit */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_zhbevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbevd_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevd_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbevd_2stage_work.c b/LAPACKE/src/lapacke_zhbevd_2stage_work.c
index 18485312b2..ad5781a334 100644
--- a/LAPACKE/src/lapacke_zhbevd_2stage_work.c
+++ b/LAPACKE/src/lapacke_zhbevd_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbevd_2stage_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhbevd_2stage_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_int kd,
                                 lapack_complex_double* ab, lapack_int ldab,
                                 double* w, lapack_complex_double* z,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_zhbevd_2stage_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zhbevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevd_2stage_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zhbevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevd_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,7 +79,7 @@ lapack_int LAPACKE_zhbevd_2stage_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,n) );
@@ -89,7 +89,7 @@ lapack_int LAPACKE_zhbevd_2stage_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zhb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zhb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhbevd_2stage( &jobz, &uplo, &n, &kd, ab_t, &ldab_t, w, z_t, &ldz_t,
                        work, &lwork, rwork, &lrwork, iwork, &liwork, &info );
@@ -97,24 +97,24 @@ lapack_int LAPACKE_zhbevd_2stage_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_zhb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhbevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevd_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhbevd_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevd_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbevd_work.c b/LAPACKE/src/lapacke_zhbevd_work.c
index 7e1d07ac27..0dafc74fa4 100644
--- a/LAPACKE/src/lapacke_zhbevd_work.c
+++ b/LAPACKE/src/lapacke_zhbevd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbevd_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhbevd_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_int kd,
                                 lapack_complex_double* ab, lapack_int ldab,
                                 double* w, lapack_complex_double* z,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_zhbevd_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zhbevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevd_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zhbevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -79,7 +79,7 @@ lapack_int LAPACKE_zhbevd_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,n) );
@@ -89,7 +89,7 @@ lapack_int LAPACKE_zhbevd_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zhb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zhb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhbevd( &jobz, &uplo, &n, &kd, ab_t, &ldab_t, w, z_t, &ldz_t,
                        work, &lwork, rwork, &lrwork, iwork, &liwork, &info );
@@ -97,24 +97,24 @@ lapack_int LAPACKE_zhbevd_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_zhb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhbevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhbevd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbevx.c b/LAPACKE/src/lapacke_zhbevx.c
index 3f2853ed5f..f839502bf5 100644
--- a/LAPACKE/src/lapacke_zhbevx.c
+++ b/LAPACKE/src/lapacke_zhbevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbevx( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhbevx)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_int kd,
                            lapack_complex_double* ab, lapack_int ldab,
                            lapack_complex_double* q, lapack_int ldq, double vl,
@@ -46,25 +46,25 @@ lapack_int LAPACKE_zhbevx( int matrix_layout, char jobz, char range, char uplo,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zhb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -15;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -12;
             }
         }
@@ -88,7 +88,7 @@ lapack_int LAPACKE_zhbevx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhbevx_work( matrix_layout, jobz, range, uplo, n, kd, ab,
+    info = API_SUFFIX(LAPACKE_zhbevx_work)( matrix_layout, jobz, range, uplo, n, kd, ab,
                                 ldab, q, ldq, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, work, rwork, iwork, ifail );
     /* Release memory and exit */
@@ -99,7 +99,7 @@ lapack_int LAPACKE_zhbevx( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbevx_2stage.c b/LAPACKE/src/lapacke_zhbevx_2stage.c
index 37a9c21b72..f4e8dc7904 100644
--- a/LAPACKE/src/lapacke_zhbevx_2stage.c
+++ b/LAPACKE/src/lapacke_zhbevx_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbevx_2stage( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhbevx_2stage)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_int kd,
                            lapack_complex_double* ab, lapack_int ldab,
                            lapack_complex_double* q, lapack_int ldq, double vl,
@@ -48,32 +48,32 @@ lapack_int LAPACKE_zhbevx_2stage( int matrix_layout, char jobz, char range, char
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbevx_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevx_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zhb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -15;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -12;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhbevx_2stage_work( matrix_layout, jobz, range, uplo, n, kd, ab,
+    info = API_SUFFIX(LAPACKE_zhbevx_2stage_work)( matrix_layout, jobz, range, uplo, n, kd, ab,
                                 ldab, q, ldq, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, &work_query, lwork, rwork, iwork, ifail );
     if( info != 0 ) {
@@ -98,7 +98,7 @@ lapack_int LAPACKE_zhbevx_2stage( int matrix_layout, char jobz, char range, char
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhbevx_2stage_work( matrix_layout, jobz, range, uplo, n, kd, ab,
+    info = API_SUFFIX(LAPACKE_zhbevx_2stage_work)( matrix_layout, jobz, range, uplo, n, kd, ab,
                                 ldab, q, ldq, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, work, lwork, rwork, iwork, ifail );
     /* Release memory and exit */
@@ -109,7 +109,7 @@ lapack_int LAPACKE_zhbevx_2stage( int matrix_layout, char jobz, char range, char
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbevx_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevx_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbevx_2stage_work.c b/LAPACKE/src/lapacke_zhbevx_2stage_work.c
index 1801a6da62..dff171ede6 100644
--- a/LAPACKE/src/lapacke_zhbevx_2stage_work.c
+++ b/LAPACKE/src/lapacke_zhbevx_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbevx_2stage_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_zhbevx_2stage_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, lapack_int kd,
                                 lapack_complex_double* ab, lapack_int ldab,
                                 lapack_complex_double* q, lapack_int ldq,
@@ -53,9 +53,9 @@ lapack_int LAPACKE_zhbevx_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldab_t = MAX(1,kd+1);
         lapack_int ldq_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
@@ -65,17 +65,17 @@ lapack_int LAPACKE_zhbevx_2stage_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zhbevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevx_2stage_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zhbevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevx_2stage_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_zhbevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevx_2stage_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -85,7 +85,7 @@ lapack_int LAPACKE_zhbevx_2stage_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             q_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldq_t * MAX(1,n) );
@@ -94,7 +94,7 @@ lapack_int LAPACKE_zhbevx_2stage_work( int matrix_layout, char jobz, char range,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -111,7 +111,7 @@ lapack_int LAPACKE_zhbevx_2stage_work( int matrix_layout, char jobz, char range,
             return (info < 0) ? (info - 1) : info;
         }
         /* Transpose input matrices */
-        LAPACKE_zhb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zhb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhbevx_2stage( &jobz, &range, &uplo, &n, &kd, ab_t, &ldab_t, q_t,
                        &ldq_t, &vl, &vu, &il, &iu, &abstol, m, w, z_t, &ldz_t,
@@ -120,32 +120,32 @@ lapack_int LAPACKE_zhbevx_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_zhb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhbevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevx_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhbevx_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevx_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbevx_work.c b/LAPACKE/src/lapacke_zhbevx_work.c
index 75ab852953..d8af48cdeb 100644
--- a/LAPACKE/src/lapacke_zhbevx_work.c
+++ b/LAPACKE/src/lapacke_zhbevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbevx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_zhbevx_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, lapack_int kd,
                                 lapack_complex_double* ab, lapack_int ldab,
                                 lapack_complex_double* q, lapack_int ldq,
@@ -53,9 +53,9 @@ lapack_int LAPACKE_zhbevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldab_t = MAX(1,kd+1);
         lapack_int ldq_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
@@ -65,17 +65,17 @@ lapack_int LAPACKE_zhbevx_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zhbevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevx_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zhbevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevx_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_zhbevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -85,7 +85,7 @@ lapack_int LAPACKE_zhbevx_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             q_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldq_t * MAX(1,n) );
@@ -94,7 +94,7 @@ lapack_int LAPACKE_zhbevx_work( int matrix_layout, char jobz, char range,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -104,7 +104,7 @@ lapack_int LAPACKE_zhbevx_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zhb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zhb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhbevx( &jobz, &range, &uplo, &n, &kd, ab_t, &ldab_t, q_t,
                        &ldq_t, &vl, &vu, &il, &iu, &abstol, m, w, z_t, &ldz_t,
@@ -113,32 +113,32 @@ lapack_int LAPACKE_zhbevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_zhb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhbevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhbevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbgst.c b/LAPACKE/src/lapacke_zhbgst.c
index 607d7b0650..4361f0581d 100644
--- a/LAPACKE/src/lapacke_zhbgst.c
+++ b/LAPACKE/src/lapacke_zhbgst.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbgst( int matrix_layout, char vect, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhbgst)( int matrix_layout, char vect, char uplo, lapack_int n,
                            lapack_int ka, lapack_int kb,
                            lapack_complex_double* ab, lapack_int ldab,
                            const lapack_complex_double* bb, lapack_int ldbb,
@@ -42,16 +42,16 @@ lapack_int LAPACKE_zhbgst( int matrix_layout, char vect, char uplo, lapack_int n
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbgst", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgst", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhb_nancheck( matrix_layout, uplo, n, ka, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zhb_nancheck)( matrix_layout, uplo, n, ka, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_zhb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_zhb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -9;
         }
     }
@@ -69,7 +69,7 @@ lapack_int LAPACKE_zhbgst( int matrix_layout, char vect, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhbgst_work( matrix_layout, vect, uplo, n, ka, kb, ab, ldab,
+    info = API_SUFFIX(LAPACKE_zhbgst_work)( matrix_layout, vect, uplo, n, ka, kb, ab, ldab,
                                 bb, ldbb, x, ldx, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -77,7 +77,7 @@ lapack_int LAPACKE_zhbgst( int matrix_layout, char vect, char uplo, lapack_int n
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbgst", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgst", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbgst_work.c b/LAPACKE/src/lapacke_zhbgst_work.c
index 926ecd9a25..028e2935bf 100644
--- a/LAPACKE/src/lapacke_zhbgst_work.c
+++ b/LAPACKE/src/lapacke_zhbgst_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbgst_work( int matrix_layout, char vect, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhbgst_work)( int matrix_layout, char vect, char uplo,
                                 lapack_int n, lapack_int ka, lapack_int kb,
                                 lapack_complex_double* ab, lapack_int ldab,
                                 const lapack_complex_double* bb,
@@ -58,17 +58,17 @@ lapack_int LAPACKE_zhbgst_work( int matrix_layout, char vect, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zhbgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgst_work", info );
             return info;
         }
         if( ldbb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zhbgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgst_work", info );
             return info;
         }
         if( ldx < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zhbgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgst_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -84,7 +84,7 @@ lapack_int LAPACKE_zhbgst_work( int matrix_layout, char vect, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( vect, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
             x_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldx_t * MAX(1,n) );
@@ -94,8 +94,8 @@ lapack_int LAPACKE_zhbgst_work( int matrix_layout, char vect, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zhb_trans( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
-        LAPACKE_zhb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_zhb_trans)( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zhb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhbgst( &vect, &uplo, &n, &ka, &kb, ab_t, &ldab_t, bb_t, &ldbb_t,
                        x_t, &ldx_t, work, rwork, &info );
@@ -103,13 +103,13 @@ lapack_int LAPACKE_zhbgst_work( int matrix_layout, char vect, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhb_trans( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_zhb_trans)( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( vect, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, x_t, ldx_t, x, ldx );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, x_t, ldx_t, x, ldx );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( vect, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
             LAPACKE_free( x_t );
         }
 exit_level_2:
@@ -118,11 +118,11 @@ lapack_int LAPACKE_zhbgst_work( int matrix_layout, char vect, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhbgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgst_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhbgst_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgst_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbgv.c b/LAPACKE/src/lapacke_zhbgv.c
index 7fb988abf7..0cbb2833a6 100644
--- a/LAPACKE/src/lapacke_zhbgv.c
+++ b/LAPACKE/src/lapacke_zhbgv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbgv( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhbgv)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_int ka, lapack_int kb,
                           lapack_complex_double* ab, lapack_int ldab,
                           lapack_complex_double* bb, lapack_int ldbb, double* w,
@@ -42,16 +42,16 @@ lapack_int LAPACKE_zhbgv( int matrix_layout, char jobz, char uplo, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbgv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhb_nancheck( matrix_layout, uplo, n, ka, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zhb_nancheck)( matrix_layout, uplo, n, ka, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_zhb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_zhb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -9;
         }
     }
@@ -69,7 +69,7 @@ lapack_int LAPACKE_zhbgv( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhbgv_work( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
+    info = API_SUFFIX(LAPACKE_zhbgv_work)( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
                                bb, ldbb, w, z, ldz, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -77,7 +77,7 @@ lapack_int LAPACKE_zhbgv( int matrix_layout, char jobz, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbgv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbgv_work.c b/LAPACKE/src/lapacke_zhbgv_work.c
index eb35499d71..b07229b135 100644
--- a/LAPACKE/src/lapacke_zhbgv_work.c
+++ b/LAPACKE/src/lapacke_zhbgv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbgv_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhbgv_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_int ka, lapack_int kb,
                                lapack_complex_double* ab, lapack_int ldab,
                                lapack_complex_double* bb, lapack_int ldbb,
@@ -58,17 +58,17 @@ lapack_int LAPACKE_zhbgv_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zhbgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgv_work", info );
             return info;
         }
         if( ldbb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zhbgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgv_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zhbgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -84,7 +84,7 @@ lapack_int LAPACKE_zhbgv_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,n) );
@@ -94,8 +94,8 @@ lapack_int LAPACKE_zhbgv_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zhb_trans( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
-        LAPACKE_zhb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_zhb_trans)( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zhb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhbgv( &jobz, &uplo, &n, &ka, &kb, ab_t, &ldab_t, bb_t, &ldbb_t,
                       w, z_t, &ldz_t, work, rwork, &info );
@@ -103,15 +103,15 @@ lapack_int LAPACKE_zhbgv_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhb_trans( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_zhb_trans)( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_zhb_trans( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
+        API_SUFFIX(LAPACKE_zhb_trans)( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
                            ldbb );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
@@ -120,11 +120,11 @@ lapack_int LAPACKE_zhbgv_work( int matrix_layout, char jobz, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhbgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhbgv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbgvd.c b/LAPACKE/src/lapacke_zhbgvd.c
index 3fba8cd66b..43cdffb9bc 100644
--- a/LAPACKE/src/lapacke_zhbgvd.c
+++ b/LAPACKE/src/lapacke_zhbgvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbgvd( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhbgvd)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_int ka, lapack_int kb,
                            lapack_complex_double* ab, lapack_int ldab,
                            lapack_complex_double* bb, lapack_int ldbb,
@@ -49,22 +49,22 @@ lapack_int LAPACKE_zhbgvd( int matrix_layout, char jobz, char uplo, lapack_int n
     double rwork_query;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbgvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhb_nancheck( matrix_layout, uplo, n, ka, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zhb_nancheck)( matrix_layout, uplo, n, ka, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_zhb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_zhb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhbgvd_work( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
+    info = API_SUFFIX(LAPACKE_zhbgvd_work)( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
                                 bb, ldbb, w, z, ldz, &work_query, lwork,
                                 &rwork_query, lrwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -91,7 +91,7 @@ lapack_int LAPACKE_zhbgvd( int matrix_layout, char jobz, char uplo, lapack_int n
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhbgvd_work( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
+    info = API_SUFFIX(LAPACKE_zhbgvd_work)( matrix_layout, jobz, uplo, n, ka, kb, ab, ldab,
                                 bb, ldbb, w, z, ldz, work, lwork, rwork, lrwork,
                                 iwork, liwork );
     /* Release memory and exit */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_zhbgvd( int matrix_layout, char jobz, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbgvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbgvd_work.c b/LAPACKE/src/lapacke_zhbgvd_work.c
index 6588e7368f..73203f23cf 100644
--- a/LAPACKE/src/lapacke_zhbgvd_work.c
+++ b/LAPACKE/src/lapacke_zhbgvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbgvd_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhbgvd_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_int ka, lapack_int kb,
                                 lapack_complex_double* ab, lapack_int ldab,
                                 lapack_complex_double* bb, lapack_int ldbb,
@@ -61,17 +61,17 @@ lapack_int LAPACKE_zhbgvd_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zhbgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgvd_work", info );
             return info;
         }
         if( ldbb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zhbgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgvd_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zhbgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgvd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -94,7 +94,7 @@ lapack_int LAPACKE_zhbgvd_work( int matrix_layout, char jobz, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,n) );
@@ -104,8 +104,8 @@ lapack_int LAPACKE_zhbgvd_work( int matrix_layout, char jobz, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zhb_trans( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
-        LAPACKE_zhb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_zhb_trans)( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zhb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhbgvd( &jobz, &uplo, &n, &ka, &kb, ab_t, &ldab_t, bb_t, &ldbb_t,
                        w, z_t, &ldz_t, work, &lwork, rwork, &lrwork, iwork,
@@ -114,15 +114,15 @@ lapack_int LAPACKE_zhbgvd_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhb_trans( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_zhb_trans)( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_zhb_trans( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
+        API_SUFFIX(LAPACKE_zhb_trans)( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
                            ldbb );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
@@ -131,11 +131,11 @@ lapack_int LAPACKE_zhbgvd_work( int matrix_layout, char jobz, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhbgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhbgvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbgvx.c b/LAPACKE/src/lapacke_zhbgvx.c
index 03f154180c..d39d0d71a1 100644
--- a/LAPACKE/src/lapacke_zhbgvx.c
+++ b/LAPACKE/src/lapacke_zhbgvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbgvx( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhbgvx)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_int ka, lapack_int kb,
                            lapack_complex_double* ab, lapack_int ldab,
                            lapack_complex_double* bb, lapack_int ldbb,
@@ -47,28 +47,28 @@ lapack_int LAPACKE_zhbgvx( int matrix_layout, char jobz, char range, char uplo,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbgvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhb_nancheck( matrix_layout, uplo, n, ka, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zhb_nancheck)( matrix_layout, uplo, n, ka, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -18;
         }
-        if( LAPACKE_zhb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_zhb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -14;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -15;
             }
         }
@@ -92,7 +92,7 @@ lapack_int LAPACKE_zhbgvx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhbgvx_work( matrix_layout, jobz, range, uplo, n, ka, kb, ab,
+    info = API_SUFFIX(LAPACKE_zhbgvx_work)( matrix_layout, jobz, range, uplo, n, ka, kb, ab,
                                 ldab, bb, ldbb, q, ldq, vl, vu, il, iu, abstol,
                                 m, w, z, ldz, work, rwork, iwork, ifail );
     /* Release memory and exit */
@@ -103,7 +103,7 @@ lapack_int LAPACKE_zhbgvx( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbgvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbgvx_work.c b/LAPACKE/src/lapacke_zhbgvx_work.c
index 566ebe6be3..46b7abe197 100644
--- a/LAPACKE/src/lapacke_zhbgvx_work.c
+++ b/LAPACKE/src/lapacke_zhbgvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbgvx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_zhbgvx_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n, lapack_int ka,
                                 lapack_int kb, lapack_complex_double* ab,
                                 lapack_int ldab, lapack_complex_double* bb,
@@ -65,22 +65,22 @@ lapack_int LAPACKE_zhbgvx_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zhbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgvx_work", info );
             return info;
         }
         if( ldbb < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zhbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgvx_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zhbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgvx_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -22;
-            LAPACKE_xerbla( "LAPACKE_zhbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -96,7 +96,7 @@ lapack_int LAPACKE_zhbgvx_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             q_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldq_t * MAX(1,n) );
@@ -105,7 +105,7 @@ lapack_int LAPACKE_zhbgvx_work( int matrix_layout, char jobz, char range,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,n) );
@@ -115,8 +115,8 @@ lapack_int LAPACKE_zhbgvx_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zhb_trans( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
-        LAPACKE_zhb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_zhb_trans)( matrix_layout, uplo, n, ka, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zhb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhbgvx( &jobz, &range, &uplo, &n, &ka, &kb, ab_t, &ldab_t, bb_t,
                        &ldbb_t, q_t, &ldq_t, &vl, &vu, &il, &iu, &abstol, m, w,
@@ -125,22 +125,22 @@ lapack_int LAPACKE_zhbgvx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhb_trans( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_zhb_trans)( LAPACK_COL_MAJOR, uplo, n, ka, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_zhb_trans( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
+        API_SUFFIX(LAPACKE_zhb_trans)( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
                            ldbb );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_2:
@@ -149,11 +149,11 @@ lapack_int LAPACKE_zhbgvx_work( int matrix_layout, char jobz, char range,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhbgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhbgvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbgvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbtrd.c b/LAPACKE/src/lapacke_zhbtrd.c
index 6205ee9ed0..26449cc617 100644
--- a/LAPACKE/src/lapacke_zhbtrd.c
+++ b/LAPACKE/src/lapacke_zhbtrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbtrd( int matrix_layout, char vect, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhbtrd)( int matrix_layout, char vect, char uplo, lapack_int n,
                            lapack_int kd, lapack_complex_double* ab,
                            lapack_int ldab, double* d, double* e,
                            lapack_complex_double* q, lapack_int ldq )
@@ -40,17 +40,17 @@ lapack_int LAPACKE_zhbtrd( int matrix_layout, char vect, char uplo, lapack_int n
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbtrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbtrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zhb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( vect, 'u' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -10;
             }
         }
@@ -64,13 +64,13 @@ lapack_int LAPACKE_zhbtrd( int matrix_layout, char vect, char uplo, lapack_int n
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhbtrd_work( matrix_layout, vect, uplo, n, kd, ab, ldab, d, e,
+    info = API_SUFFIX(LAPACKE_zhbtrd_work)( matrix_layout, vect, uplo, n, kd, ab, ldab, d, e,
                                 q, ldq, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhbtrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbtrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhbtrd_work.c b/LAPACKE/src/lapacke_zhbtrd_work.c
index 71dbb8e1a5..6d331b9afc 100644
--- a/LAPACKE/src/lapacke_zhbtrd_work.c
+++ b/LAPACKE/src/lapacke_zhbtrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhbtrd_work( int matrix_layout, char vect, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhbtrd_work)( int matrix_layout, char vect, char uplo,
                                 lapack_int n, lapack_int kd,
                                 lapack_complex_double* ab, lapack_int ldab,
                                 double* d, double* e, lapack_complex_double* q,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_zhbtrd_work( int matrix_layout, char vect, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zhbtrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbtrd_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zhbtrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbtrd_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -69,7 +69,7 @@ lapack_int LAPACKE_zhbtrd_work( int matrix_layout, char vect, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( vect, 'u' ) || LAPACKE_lsame( vect, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
             q_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldq_t * MAX(1,n) );
@@ -79,9 +79,9 @@ lapack_int LAPACKE_zhbtrd_work( int matrix_layout, char vect, char uplo,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zhb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        if( LAPACKE_lsame( vect, 'u' ) || LAPACKE_lsame( vect, 'v' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_zhb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_zhbtrd( &vect, &uplo, &n, &kd, ab_t, &ldab_t, d, e, q_t, &ldq_t,
@@ -90,24 +90,24 @@ lapack_int LAPACKE_zhbtrd_work( int matrix_layout, char vect, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_zhb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        if( LAPACKE_lsame( vect, 'u' ) || LAPACKE_lsame( vect, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( vect, 'u' ) || LAPACKE_lsame( vect, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'u' ) || API_SUFFIX(LAPACKE_lsame)( vect, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhbtrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbtrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhbtrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhbtrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhecon.c b/LAPACKE/src/lapacke_zhecon.c
index 40b5950741..c268ce38ba 100644
--- a/LAPACKE/src/lapacke_zhecon.c
+++ b/LAPACKE/src/lapacke_zhecon.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhecon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhecon)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda,
                            const lapack_int* ipiv, double anorm, double* rcond )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhecon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhecon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -7;
         }
     }
@@ -61,13 +61,13 @@ lapack_int LAPACKE_zhecon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhecon_work( matrix_layout, uplo, n, a, lda, ipiv, anorm,
+    info = API_SUFFIX(LAPACKE_zhecon_work)( matrix_layout, uplo, n, a, lda, ipiv, anorm,
                                 rcond, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhecon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhecon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhecon_3.c b/LAPACKE/src/lapacke_zhecon_3.c
index f696ae3708..3307d77362 100644
--- a/LAPACKE/src/lapacke_zhecon_3.c
+++ b/LAPACKE/src/lapacke_zhecon_3.c
@@ -32,28 +32,28 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhecon_3( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhecon_3)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda,
                            const lapack_complex_double* e,
                            const lapack_int* ipiv, double anorm, double* rcond )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
-    lapack_int e_start = LAPACKE_lsame( uplo, 'U' ) ? 1 : 0;
+    lapack_int e_start = API_SUFFIX(LAPACKE_lsame)( uplo, 'U' ) ? 1 : 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhecon_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhecon_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_z_nancheck( n-1, e + e_start, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, e + e_start, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -8;
         }
     }
@@ -66,13 +66,13 @@ lapack_int LAPACKE_zhecon_3( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhecon_3_work( matrix_layout, uplo, n, a, lda, e, ipiv, anorm,
+    info = API_SUFFIX(LAPACKE_zhecon_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv, anorm,
                                 rcond, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhecon_3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhecon_3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhecon_3_work.c b/LAPACKE/src/lapacke_zhecon_3_work.c
index 2064e4fb47..63800491b3 100644
--- a/LAPACKE/src/lapacke_zhecon_3_work.c
+++ b/LAPACKE/src/lapacke_zhecon_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhecon_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhecon_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_double* a, lapack_int lda,
                                 const lapack_complex_double* e,
                                 const lapack_int* ipiv, double anorm,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zhecon_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zhecon_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhecon_3_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -62,7 +62,7 @@ lapack_int LAPACKE_zhecon_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhecon_3( &uplo, &n, a_t, &lda_t, e, ipiv, &anorm, rcond, work,
                        &info );
@@ -73,11 +73,11 @@ lapack_int LAPACKE_zhecon_3_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhecon_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhecon_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhecon_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhecon_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhecon_work.c b/LAPACKE/src/lapacke_zhecon_work.c
index e7209e47d3..cb3b94eb05 100644
--- a/LAPACKE/src/lapacke_zhecon_work.c
+++ b/LAPACKE/src/lapacke_zhecon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhecon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhecon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_double* a, lapack_int lda,
                                 const lapack_int* ipiv, double anorm,
                                 double* rcond, lapack_complex_double* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zhecon_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zhecon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhecon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_zhecon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhecon( &uplo, &n, a_t, &lda_t, ipiv, &anorm, rcond, work,
                        &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_zhecon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhecon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhecon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhecon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhecon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheequb.c b/LAPACKE/src/lapacke_zheequb.c
index a9d03590d8..3b025bec94 100644
--- a/LAPACKE/src/lapacke_zheequb.c
+++ b/LAPACKE/src/lapacke_zheequb.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheequb( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zheequb)( int matrix_layout, char uplo, lapack_int n,
                             const lapack_complex_double* a, lapack_int lda,
                             double* s, double* scond, double* amax )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zheequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheequb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -58,13 +58,13 @@ lapack_int LAPACKE_zheequb( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zheequb_work( matrix_layout, uplo, n, a, lda, s, scond, amax,
+    info = API_SUFFIX(LAPACKE_zheequb_work)( matrix_layout, uplo, n, a, lda, s, scond, amax,
                                  work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zheequb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheequb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheequb_work.c b/LAPACKE/src/lapacke_zheequb_work.c
index 62d9712509..206f518694 100644
--- a/LAPACKE/src/lapacke_zheequb_work.c
+++ b/LAPACKE/src/lapacke_zheequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheequb_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zheequb_work)( int matrix_layout, char uplo, lapack_int n,
                                  const lapack_complex_double* a, lapack_int lda,
                                  double* s, double* scond, double* amax,
                                  lapack_complex_double* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zheequb_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zheequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_zheequb_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zheequb( &uplo, &n, a_t, &lda_t, s, scond, amax, work, &info );
         if( info < 0 ) {
@@ -71,11 +71,11 @@ lapack_int LAPACKE_zheequb_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zheequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zheequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheev.c b/LAPACKE/src/lapacke_zheev.c
index 0126e3d14b..b1fe9c6530 100644
--- a/LAPACKE/src/lapacke_zheev.c
+++ b/LAPACKE/src/lapacke_zheev.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheev( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zheev)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_complex_double* a, lapack_int lda, double* w )
 {
     lapack_int info = 0;
@@ -41,13 +41,13 @@ lapack_int LAPACKE_zheev( int matrix_layout, char jobz, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zheev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
@@ -59,7 +59,7 @@ lapack_int LAPACKE_zheev( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zheev_work( matrix_layout, jobz, uplo, n, a, lda, w,
+    info = API_SUFFIX(LAPACKE_zheev_work)( matrix_layout, jobz, uplo, n, a, lda, w,
                                &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -73,7 +73,7 @@ lapack_int LAPACKE_zheev( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zheev_work( matrix_layout, jobz, uplo, n, a, lda, w, work,
+    info = API_SUFFIX(LAPACKE_zheev_work)( matrix_layout, jobz, uplo, n, a, lda, w, work,
                                lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -81,7 +81,7 @@ lapack_int LAPACKE_zheev( int matrix_layout, char jobz, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zheev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheev_2stage.c b/LAPACKE/src/lapacke_zheev_2stage.c
index 889ff0e15a..999b95768f 100644
--- a/LAPACKE/src/lapacke_zheev_2stage.c
+++ b/LAPACKE/src/lapacke_zheev_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheev_2stage( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zheev_2stage)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_complex_double* a, lapack_int lda, double* w )
 {
     lapack_int info = 0;
@@ -41,13 +41,13 @@ lapack_int LAPACKE_zheev_2stage( int matrix_layout, char jobz, char uplo, lapack
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zheev_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheev_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
@@ -59,7 +59,7 @@ lapack_int LAPACKE_zheev_2stage( int matrix_layout, char jobz, char uplo, lapack
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zheev_2stage_work( matrix_layout, jobz, uplo, n, a, lda, w,
+    info = API_SUFFIX(LAPACKE_zheev_2stage_work)( matrix_layout, jobz, uplo, n, a, lda, w,
                                &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -73,7 +73,7 @@ lapack_int LAPACKE_zheev_2stage( int matrix_layout, char jobz, char uplo, lapack
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zheev_2stage_work( matrix_layout, jobz, uplo, n, a, lda, w, work,
+    info = API_SUFFIX(LAPACKE_zheev_2stage_work)( matrix_layout, jobz, uplo, n, a, lda, w, work,
                                lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -81,7 +81,7 @@ lapack_int LAPACKE_zheev_2stage( int matrix_layout, char jobz, char uplo, lapack
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zheev_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheev_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheev_2stage_work.c b/LAPACKE/src/lapacke_zheev_2stage_work.c
index 11246e1966..2a3dfd5785 100644
--- a/LAPACKE/src/lapacke_zheev_2stage_work.c
+++ b/LAPACKE/src/lapacke_zheev_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheev_2stage_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zheev_2stage_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_complex_double* a,
                                lapack_int lda, double* w,
                                lapack_complex_double* work, lapack_int lwork,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_zheev_2stage_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zheev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheev_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -69,7 +69,7 @@ lapack_int LAPACKE_zheev_2stage_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zheev_2stage( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, rwork,
                       &info );
@@ -77,16 +77,16 @@ lapack_int LAPACKE_zheev_2stage_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zheev_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheev_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zheev_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheev_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheev_work.c b/LAPACKE/src/lapacke_zheev_work.c
index 43d33eb2e4..1f321214ba 100644
--- a/LAPACKE/src/lapacke_zheev_work.c
+++ b/LAPACKE/src/lapacke_zheev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheev_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zheev_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_complex_double* a,
                                lapack_int lda, double* w,
                                lapack_complex_double* work, lapack_int lwork,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_zheev_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zheev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheev_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -69,7 +69,7 @@ lapack_int LAPACKE_zheev_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zheev( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, rwork,
                       &info );
@@ -78,19 +78,19 @@ lapack_int LAPACKE_zheev_work( int matrix_layout, char jobz, char uplo,
         }
         /* Transpose output matrices */
         if ( jobz == 'V' || jobz == 'v' ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         } else {
-            LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zheev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zheev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheevd.c b/LAPACKE/src/lapacke_zheevd.c
index da5df1de42..a70e26e10b 100644
--- a/LAPACKE/src/lapacke_zheevd.c
+++ b/LAPACKE/src/lapacke_zheevd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheevd( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zheevd)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda, double* w )
 {
     lapack_int info = 0;
@@ -46,19 +46,19 @@ lapack_int LAPACKE_zheevd( int matrix_layout, char jobz, char uplo, lapack_int n
     double rwork_query;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zheevd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zheevd_work( matrix_layout, jobz, uplo, n, a, lda, w,
+    info = API_SUFFIX(LAPACKE_zheevd_work)( matrix_layout, jobz, uplo, n, a, lda, w,
                                 &work_query, lwork, &rwork_query, lrwork,
                                 &iwork_query, liwork );
     if( info != 0 ) {
@@ -85,7 +85,7 @@ lapack_int LAPACKE_zheevd( int matrix_layout, char jobz, char uplo, lapack_int n
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zheevd_work( matrix_layout, jobz, uplo, n, a, lda, w, work,
+    info = API_SUFFIX(LAPACKE_zheevd_work)( matrix_layout, jobz, uplo, n, a, lda, w, work,
                                 lwork, rwork, lrwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -95,7 +95,7 @@ lapack_int LAPACKE_zheevd( int matrix_layout, char jobz, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zheevd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheevd_2stage.c b/LAPACKE/src/lapacke_zheevd_2stage.c
index 2d747f8d08..34ce0c1714 100644
--- a/LAPACKE/src/lapacke_zheevd_2stage.c
+++ b/LAPACKE/src/lapacke_zheevd_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheevd_2stage( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zheevd_2stage)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda, double* w )
 {
     lapack_int info = 0;
@@ -46,19 +46,19 @@ lapack_int LAPACKE_zheevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     double rwork_query;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zheevd_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevd_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zheevd_2stage_work( matrix_layout, jobz, uplo, n, a, lda, w,
+    info = API_SUFFIX(LAPACKE_zheevd_2stage_work)( matrix_layout, jobz, uplo, n, a, lda, w,
                                 &work_query, lwork, &rwork_query, lrwork,
                                 &iwork_query, liwork );
     if( info != 0 ) {
@@ -85,7 +85,7 @@ lapack_int LAPACKE_zheevd_2stage( int matrix_layout, char jobz, char uplo, lapac
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zheevd_2stage_work( matrix_layout, jobz, uplo, n, a, lda, w, work,
+    info = API_SUFFIX(LAPACKE_zheevd_2stage_work)( matrix_layout, jobz, uplo, n, a, lda, w, work,
                                 lwork, rwork, lrwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -95,7 +95,7 @@ lapack_int LAPACKE_zheevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zheevd_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevd_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheevd_2stage_work.c b/LAPACKE/src/lapacke_zheevd_2stage_work.c
index 0538eefbbc..fc1105bafd 100644
--- a/LAPACKE/src/lapacke_zheevd_2stage_work.c
+++ b/LAPACKE/src/lapacke_zheevd_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheevd_2stage_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zheevd_2stage_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_complex_double* a,
                                 lapack_int lda, double* w,
                                 lapack_complex_double* work, lapack_int lwork,
@@ -53,7 +53,7 @@ lapack_int LAPACKE_zheevd_2stage_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zheevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevd_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -70,7 +70,7 @@ lapack_int LAPACKE_zheevd_2stage_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zheevd_2stage( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, rwork,
                        &lrwork, iwork, &liwork, &info );
@@ -79,19 +79,19 @@ lapack_int LAPACKE_zheevd_2stage_work( int matrix_layout, char jobz, char uplo,
         }
         /* Transpose output matrices */
         if ( jobz == 'V' || jobz == 'v' ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         } else {
-            LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zheevd_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevd_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zheevd_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevd_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheevd_work.c b/LAPACKE/src/lapacke_zheevd_work.c
index 086df88e74..f3ae213337 100644
--- a/LAPACKE/src/lapacke_zheevd_work.c
+++ b/LAPACKE/src/lapacke_zheevd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheevd_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zheevd_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_complex_double* a,
                                 lapack_int lda, double* w,
                                 lapack_complex_double* work, lapack_int lwork,
@@ -53,7 +53,7 @@ lapack_int LAPACKE_zheevd_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zheevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -70,7 +70,7 @@ lapack_int LAPACKE_zheevd_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zheevd( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, rwork,
                        &lrwork, iwork, &liwork, &info );
@@ -79,19 +79,19 @@ lapack_int LAPACKE_zheevd_work( int matrix_layout, char jobz, char uplo,
         }
         /* Transpose output matrices */
         if ( jobz == 'V' || jobz == 'v' ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         } else { 
-            LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+            API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zheevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zheevd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheevr.c b/LAPACKE/src/lapacke_zheevr.c
index a8f6078ded..aecaaca9d1 100644
--- a/LAPACKE/src/lapacke_zheevr.c
+++ b/LAPACKE/src/lapacke_zheevr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheevr( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zheevr)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_complex_double* a,
                            lapack_int lda, double vl, double vu, lapack_int il,
                            lapack_int iu, double abstol, lapack_int* m,
@@ -50,32 +50,32 @@ lapack_int LAPACKE_zheevr( int matrix_layout, char jobz, char range, char uplo,
     double rwork_query;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zheevr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -9;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zheevr_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_zheevr_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, isuppz,
                                 &work_query, lwork, &rwork_query, lrwork,
                                 &iwork_query, liwork );
@@ -103,7 +103,7 @@ lapack_int LAPACKE_zheevr( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zheevr_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_zheevr_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, isuppz, work,
                                 lwork, rwork, lrwork, iwork, liwork );
     /* Release memory and exit */
@@ -114,7 +114,7 @@ lapack_int LAPACKE_zheevr( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zheevr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheevr_2stage.c b/LAPACKE/src/lapacke_zheevr_2stage.c
index 7931822627..63505da134 100644
--- a/LAPACKE/src/lapacke_zheevr_2stage.c
+++ b/LAPACKE/src/lapacke_zheevr_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheevr_2stage( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zheevr_2stage)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_complex_double* a,
                            lapack_int lda, double vl, double vu, lapack_int il,
                            lapack_int iu, double abstol, lapack_int* m,
@@ -50,32 +50,32 @@ lapack_int LAPACKE_zheevr_2stage( int matrix_layout, char jobz, char range, char
     double rwork_query;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zheevr_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevr_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -9;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zheevr_2stage_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_zheevr_2stage_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, isuppz,
                                 &work_query, lwork, &rwork_query, lrwork,
                                 &iwork_query, liwork );
@@ -103,7 +103,7 @@ lapack_int LAPACKE_zheevr_2stage( int matrix_layout, char jobz, char range, char
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zheevr_2stage_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_zheevr_2stage_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, isuppz, work,
                                 lwork, rwork, lrwork, iwork, liwork );
     /* Release memory and exit */
@@ -114,7 +114,7 @@ lapack_int LAPACKE_zheevr_2stage( int matrix_layout, char jobz, char range, char
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zheevr_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevr_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheevr_2stage_work.c b/LAPACKE/src/lapacke_zheevr_2stage_work.c
index 73b2edbd5c..8bd70ad5ef 100644
--- a/LAPACKE/src/lapacke_zheevr_2stage_work.c
+++ b/LAPACKE/src/lapacke_zheevr_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheevr_2stage_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_zheevr_2stage_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 double vl, double vu, lapack_int il,
@@ -53,9 +53,9 @@ lapack_int LAPACKE_zheevr_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
         lapack_complex_double* a_t = NULL;
@@ -63,12 +63,12 @@ lapack_int LAPACKE_zheevr_2stage_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zheevr_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevr_2stage_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_zheevr_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevr_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -85,7 +85,7 @@ lapack_int LAPACKE_zheevr_2stage_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -95,7 +95,7 @@ lapack_int LAPACKE_zheevr_2stage_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zheevr_2stage( &jobz, &range, &uplo, &n, a_t, &lda_t, &vl, &vu, &il,
                        &iu, &abstol, m, w, z_t, &ldz_t, isuppz, work, &lwork,
@@ -104,24 +104,24 @@ lapack_int LAPACKE_zheevr_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zheevr_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevr_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zheevr_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevr_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheevr_work.c b/LAPACKE/src/lapacke_zheevr_work.c
index ef405f1b50..e5413aef6b 100644
--- a/LAPACKE/src/lapacke_zheevr_work.c
+++ b/LAPACKE/src/lapacke_zheevr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheevr_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_zheevr_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 double vl, double vu, lapack_int il,
@@ -53,10 +53,10 @@ lapack_int LAPACKE_zheevr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( !LAPACKE_lsame( jobz, 'v' ) ) ? 1 :
-                             ( LAPACKE_lsame( range, 'a' ) ||
-                               LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( !API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) ? 1 :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                               API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
         lapack_complex_double* a_t = NULL;
@@ -64,12 +64,12 @@ lapack_int LAPACKE_zheevr_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zheevr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevr_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_zheevr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -86,7 +86,7 @@ lapack_int LAPACKE_zheevr_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -96,7 +96,7 @@ lapack_int LAPACKE_zheevr_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zheevr( &jobz, &range, &uplo, &n, a_t, &lda_t, &vl, &vu, &il,
                        &iu, &abstol, m, w, z_t, &ldz_t, isuppz, work, &lwork,
@@ -105,24 +105,24 @@ lapack_int LAPACKE_zheevr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zheevr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zheevr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheevx.c b/LAPACKE/src/lapacke_zheevx.c
index 731dbab297..d85dacf26a 100644
--- a/LAPACKE/src/lapacke_zheevx.c
+++ b/LAPACKE/src/lapacke_zheevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheevx( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zheevx)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_complex_double* a,
                            lapack_int lda, double vl, double vu, lapack_int il,
                            lapack_int iu, double abstol, lapack_int* m,
@@ -46,25 +46,25 @@ lapack_int LAPACKE_zheevx( int matrix_layout, char jobz, char range, char uplo,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zheevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -9;
             }
         }
@@ -82,7 +82,7 @@ lapack_int LAPACKE_zheevx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zheevx_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_zheevx_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, &work_query,
                                 lwork, rwork, iwork, ifail );
     if( info != 0 ) {
@@ -97,7 +97,7 @@ lapack_int LAPACKE_zheevx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zheevx_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_zheevx_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, work, lwork,
                                 rwork, iwork, ifail );
     /* Release memory and exit */
@@ -108,7 +108,7 @@ lapack_int LAPACKE_zheevx( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zheevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheevx_2stage.c b/LAPACKE/src/lapacke_zheevx_2stage.c
index cb95285acb..af10b885bf 100644
--- a/LAPACKE/src/lapacke_zheevx_2stage.c
+++ b/LAPACKE/src/lapacke_zheevx_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheevx_2stage( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zheevx_2stage)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_complex_double* a,
                            lapack_int lda, double vl, double vu, lapack_int il,
                            lapack_int iu, double abstol, lapack_int* m,
@@ -46,25 +46,25 @@ lapack_int LAPACKE_zheevx_2stage( int matrix_layout, char jobz, char range, char
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zheevx_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevx_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -9;
             }
         }
@@ -82,7 +82,7 @@ lapack_int LAPACKE_zheevx_2stage( int matrix_layout, char jobz, char range, char
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zheevx_2stage_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_zheevx_2stage_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, &work_query,
                                 lwork, rwork, iwork, ifail );
     if( info != 0 ) {
@@ -97,7 +97,7 @@ lapack_int LAPACKE_zheevx_2stage( int matrix_layout, char jobz, char range, char
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zheevx_2stage_work( matrix_layout, jobz, range, uplo, n, a, lda, vl,
+    info = API_SUFFIX(LAPACKE_zheevx_2stage_work)( matrix_layout, jobz, range, uplo, n, a, lda, vl,
                                 vu, il, iu, abstol, m, w, z, ldz, work, lwork,
                                 rwork, iwork, ifail );
     /* Release memory and exit */
@@ -108,7 +108,7 @@ lapack_int LAPACKE_zheevx_2stage( int matrix_layout, char jobz, char range, char
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zheevx_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevx_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheevx_2stage_work.c b/LAPACKE/src/lapacke_zheevx_2stage_work.c
index c9bdd88062..b78acad82d 100644
--- a/LAPACKE/src/lapacke_zheevx_2stage_work.c
+++ b/LAPACKE/src/lapacke_zheevx_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheevx_2stage_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_zheevx_2stage_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 double vl, double vu, lapack_int il,
@@ -52,9 +52,9 @@ lapack_int LAPACKE_zheevx_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
         lapack_complex_double* a_t = NULL;
@@ -62,12 +62,12 @@ lapack_int LAPACKE_zheevx_2stage_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zheevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevx_2stage_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_zheevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevx_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,7 +84,7 @@ lapack_int LAPACKE_zheevx_2stage_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -94,7 +94,7 @@ lapack_int LAPACKE_zheevx_2stage_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zheevx_2stage( &jobz, &range, &uplo, &n, a_t, &lda_t, &vl, &vu, &il,
                        &iu, &abstol, m, w, z_t, &ldz_t, work, &lwork, rwork,
@@ -103,24 +103,24 @@ lapack_int LAPACKE_zheevx_2stage_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zheevx_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevx_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zheevx_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevx_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheevx_work.c b/LAPACKE/src/lapacke_zheevx_work.c
index 1a61928cfc..7aea466267 100644
--- a/LAPACKE/src/lapacke_zheevx_work.c
+++ b/LAPACKE/src/lapacke_zheevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheevx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_zheevx_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 double vl, double vu, lapack_int il,
@@ -52,10 +52,10 @@ lapack_int LAPACKE_zheevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( !LAPACKE_lsame( jobz, 'v' ) ) ? 1 :
-                             ( LAPACKE_lsame( range, 'a' ) ||
-                               LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( !API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) ? 1 :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                               API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
         lapack_complex_double* a_t = NULL;
@@ -63,12 +63,12 @@ lapack_int LAPACKE_zheevx_work( int matrix_layout, char jobz, char range,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zheevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevx_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_zheevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -85,7 +85,7 @@ lapack_int LAPACKE_zheevx_work( int matrix_layout, char jobz, char range,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -95,7 +95,7 @@ lapack_int LAPACKE_zheevx_work( int matrix_layout, char jobz, char range,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zheevx( &jobz, &range, &uplo, &n, a_t, &lda_t, &vl, &vu, &il,
                        &iu, &abstol, m, w, z_t, &ldz_t, work, &lwork, rwork,
@@ -104,24 +104,24 @@ lapack_int LAPACKE_zheevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zheevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zheevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhegst.c b/LAPACKE/src/lapacke_zhegst.c
index 7ca618ba2d..ede99efb40 100644
--- a/LAPACKE/src/lapacke_zhegst.c
+++ b/LAPACKE/src/lapacke_zhegst.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhegst( int matrix_layout, lapack_int itype, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhegst)( int matrix_layout, lapack_int itype, char uplo,
                            lapack_int n, lapack_complex_double* a,
                            lapack_int lda, const lapack_complex_double* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhegst", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegst", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_zhegst_work( matrix_layout, itype, uplo, n, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_zhegst_work)( matrix_layout, itype, uplo, n, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zhegst_work.c b/LAPACKE/src/lapacke_zhegst_work.c
index a87d663a4d..5fd2361ff9 100644
--- a/LAPACKE/src/lapacke_zhegst_work.c
+++ b/LAPACKE/src/lapacke_zhegst_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhegst_work( int matrix_layout, lapack_int itype, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhegst_work)( int matrix_layout, lapack_int itype, char uplo,
                                 lapack_int n, lapack_complex_double* a,
                                 lapack_int lda, const lapack_complex_double* b,
                                 lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_zhegst_work( int matrix_layout, lapack_int itype, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zhegst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegst_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zhegst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegst_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -74,26 +74,26 @@ lapack_int LAPACKE_zhegst_work( int matrix_layout, lapack_int itype, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhegst( &itype, &uplo, &n, a_t, &lda_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhegst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegst_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhegst_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegst_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhegv.c b/LAPACKE/src/lapacke_zhegv.c
index 2f8964783b..987fe9659d 100644
--- a/LAPACKE/src/lapacke_zhegv.c
+++ b/LAPACKE/src/lapacke_zhegv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhegv( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_zhegv)( int matrix_layout, lapack_int itype, char jobz,
                           char uplo, lapack_int n, lapack_complex_double* a,
                           lapack_int lda, lapack_complex_double* b,
                           lapack_int ldb, double* w )
@@ -43,16 +43,16 @@ lapack_int LAPACKE_zhegv( int matrix_layout, lapack_int itype, char jobz,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhegv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -8;
         }
     }
@@ -64,7 +64,7 @@ lapack_int LAPACKE_zhegv( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhegv_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_zhegv_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                ldb, w, &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -78,7 +78,7 @@ lapack_int LAPACKE_zhegv( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhegv_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_zhegv_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                ldb, w, work, lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -86,7 +86,7 @@ lapack_int LAPACKE_zhegv( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhegv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhegv_2stage.c b/LAPACKE/src/lapacke_zhegv_2stage.c
index 1d540a56df..fb737bf9e8 100644
--- a/LAPACKE/src/lapacke_zhegv_2stage.c
+++ b/LAPACKE/src/lapacke_zhegv_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhegv_2stage( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_zhegv_2stage)( int matrix_layout, lapack_int itype, char jobz,
                           char uplo, lapack_int n, lapack_complex_double* a,
                           lapack_int lda, lapack_complex_double* b,
                           lapack_int ldb, double* w )
@@ -43,16 +43,16 @@ lapack_int LAPACKE_zhegv_2stage( int matrix_layout, lapack_int itype, char jobz,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhegv_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegv_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -8;
         }
     }
@@ -64,7 +64,7 @@ lapack_int LAPACKE_zhegv_2stage( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhegv_2stage_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_zhegv_2stage_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                ldb, w, &work_query, lwork, rwork );
     if( info != 0 ) {
         goto exit_level_1;
@@ -78,7 +78,7 @@ lapack_int LAPACKE_zhegv_2stage( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhegv_2stage_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_zhegv_2stage_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                ldb, w, work, lwork, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -86,7 +86,7 @@ lapack_int LAPACKE_zhegv_2stage( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhegv_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegv_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhegv_2stage_work.c b/LAPACKE/src/lapacke_zhegv_2stage_work.c
index 6a808e2a03..348b6abdf6 100644
--- a/LAPACKE/src/lapacke_zhegv_2stage_work.c
+++ b/LAPACKE/src/lapacke_zhegv_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhegv_2stage_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_zhegv_2stage_work)( int matrix_layout, lapack_int itype, char jobz,
                                char uplo, lapack_int n,
                                lapack_complex_double* a, lapack_int lda,
                                lapack_complex_double* b, lapack_int ldb,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_zhegv_2stage_work( int matrix_layout, lapack_int itype, char
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zhegv_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegv_2stage_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zhegv_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegv_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_zhegv_2stage_work( int matrix_layout, lapack_int itype, char
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhegv_2stage( &itype, &jobz, &uplo, &n, a_t, &lda_t, b_t, &ldb_t, w,
                       work, &lwork, rwork, &info );
@@ -92,19 +92,19 @@ lapack_int LAPACKE_zhegv_2stage_work( int matrix_layout, lapack_int itype, char
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhegv_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegv_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhegv_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegv_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhegv_work.c b/LAPACKE/src/lapacke_zhegv_work.c
index ca4ebf70c2..a2c3c03bd6 100644
--- a/LAPACKE/src/lapacke_zhegv_work.c
+++ b/LAPACKE/src/lapacke_zhegv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhegv_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_zhegv_work)( int matrix_layout, lapack_int itype, char jobz,
                                char uplo, lapack_int n,
                                lapack_complex_double* a, lapack_int lda,
                                lapack_complex_double* b, lapack_int ldb,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_zhegv_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zhegv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegv_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zhegv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegv_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_zhegv_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhegv( &itype, &jobz, &uplo, &n, a_t, &lda_t, b_t, &ldb_t, w,
                       work, &lwork, rwork, &info );
@@ -92,19 +92,19 @@ lapack_int LAPACKE_zhegv_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhegv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhegv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhegvd.c b/LAPACKE/src/lapacke_zhegvd.c
index 33bffeca8f..ad069803f6 100644
--- a/LAPACKE/src/lapacke_zhegvd.c
+++ b/LAPACKE/src/lapacke_zhegvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhegvd( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_zhegvd)( int matrix_layout, lapack_int itype, char jobz,
                            char uplo, lapack_int n, lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* b,
                            lapack_int ldb, double* w )
@@ -48,22 +48,22 @@ lapack_int LAPACKE_zhegvd( int matrix_layout, lapack_int itype, char jobz,
     double rwork_query;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhegvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhegvd_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_zhegvd_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                 ldb, w, &work_query, lwork, &rwork_query,
                                 lrwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -90,7 +90,7 @@ lapack_int LAPACKE_zhegvd( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhegvd_work( matrix_layout, itype, jobz, uplo, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_zhegvd_work)( matrix_layout, itype, jobz, uplo, n, a, lda, b,
                                 ldb, w, work, lwork, rwork, lrwork, iwork,
                                 liwork );
     /* Release memory and exit */
@@ -101,7 +101,7 @@ lapack_int LAPACKE_zhegvd( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhegvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhegvd_work.c b/LAPACKE/src/lapacke_zhegvd_work.c
index 6e0ea7c48e..edf99fb047 100644
--- a/LAPACKE/src/lapacke_zhegvd_work.c
+++ b/LAPACKE/src/lapacke_zhegvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhegvd_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_zhegvd_work)( int matrix_layout, lapack_int itype, char jobz,
                                 char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* b, lapack_int ldb,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_zhegvd_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zhegvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegvd_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zhegvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegvd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -86,8 +86,8 @@ lapack_int LAPACKE_zhegvd_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhegvd( &itype, &jobz, &uplo, &n, a_t, &lda_t, b_t, &ldb_t, w,
                        work, &lwork, rwork, &lrwork, iwork, &liwork, &info );
@@ -95,19 +95,19 @@ lapack_int LAPACKE_zhegvd_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhegvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhegvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhegvx.c b/LAPACKE/src/lapacke_zhegvx.c
index 8227832e10..6edc074d20 100644
--- a/LAPACKE/src/lapacke_zhegvx.c
+++ b/LAPACKE/src/lapacke_zhegvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhegvx( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_zhegvx)( int matrix_layout, lapack_int itype, char jobz,
                            char range, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* b, lapack_int ldb, double vl,
@@ -48,28 +48,28 @@ lapack_int LAPACKE_zhegvx( int matrix_layout, lapack_int itype, char jobz,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhegvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -15;
         }
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -12;
             }
         }
@@ -87,7 +87,7 @@ lapack_int LAPACKE_zhegvx( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_1;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhegvx_work( matrix_layout, itype, jobz, range, uplo, n, a,
+    info = API_SUFFIX(LAPACKE_zhegvx_work)( matrix_layout, itype, jobz, range, uplo, n, a,
                                 lda, b, ldb, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, &work_query, lwork, rwork, iwork, ifail );
     if( info != 0 ) {
@@ -102,7 +102,7 @@ lapack_int LAPACKE_zhegvx( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhegvx_work( matrix_layout, itype, jobz, range, uplo, n, a,
+    info = API_SUFFIX(LAPACKE_zhegvx_work)( matrix_layout, itype, jobz, range, uplo, n, a,
                                 lda, b, ldb, vl, vu, il, iu, abstol, m, w, z,
                                 ldz, work, lwork, rwork, iwork, ifail );
     /* Release memory and exit */
@@ -113,7 +113,7 @@ lapack_int LAPACKE_zhegvx( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhegvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhegvx_work.c b/LAPACKE/src/lapacke_zhegvx_work.c
index eb29c34d41..39e3596992 100644
--- a/LAPACKE/src/lapacke_zhegvx_work.c
+++ b/LAPACKE/src/lapacke_zhegvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhegvx_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_zhegvx_work)( int matrix_layout, lapack_int itype, char jobz,
                                 char range, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* b, lapack_int ldb,
@@ -53,9 +53,9 @@ lapack_int LAPACKE_zhegvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int lda_t = MAX(1,n);
         lapack_int ldb_t = MAX(1,n);
         lapack_int ldz_t = MAX(1,n);
@@ -65,17 +65,17 @@ lapack_int LAPACKE_zhegvx_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zhegvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegvx_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zhegvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegvx_work", info );
             return info;
         }
         if( ldz < ncols_z ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_zhegvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegvx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -98,7 +98,7 @@ lapack_int LAPACKE_zhegvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -108,8 +108,8 @@ lapack_int LAPACKE_zhegvx_work( int matrix_layout, lapack_int itype, char jobz,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhegvx( &itype, &jobz, &range, &uplo, &n, a_t, &lda_t, b_t,
                        &ldb_t, &vl, &vu, &il, &iu, &abstol, m, w, z_t, &ldz_t,
@@ -118,14 +118,14 @@ lapack_int LAPACKE_zhegvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_2:
@@ -134,11 +134,11 @@ lapack_int LAPACKE_zhegvx_work( int matrix_layout, lapack_int itype, char jobz,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhegvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhegvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhegvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zherfs.c b/LAPACKE/src/lapacke_zherfs.c
index 1d9c9dac2b..c40294f5e5 100644
--- a/LAPACKE/src/lapacke_zherfs.c
+++ b/LAPACKE/src/lapacke_zherfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zherfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zherfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* a,
                            lapack_int lda, const lapack_complex_double* af,
                            lapack_int ldaf, const lapack_int* ipiv,
@@ -44,22 +44,22 @@ lapack_int LAPACKE_zherfs( int matrix_layout, char uplo, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zherfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zherfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -77,7 +77,7 @@ lapack_int LAPACKE_zherfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zherfs_work( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
+    info = API_SUFFIX(LAPACKE_zherfs_work)( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
                                 ipiv, b, ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -85,7 +85,7 @@ lapack_int LAPACKE_zherfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zherfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zherfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zherfs_work.c b/LAPACKE/src/lapacke_zherfs_work.c
index d14783756f..40ede52cad 100644
--- a/LAPACKE/src/lapacke_zherfs_work.c
+++ b/LAPACKE/src/lapacke_zherfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zherfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zherfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_double* a,
                                 lapack_int lda, const lapack_complex_double* af,
                                 lapack_int ldaf, const lapack_int* ipiv,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_zherfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zherfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zherfs_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zherfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zherfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zherfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zherfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zherfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zherfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -107,10 +107,10 @@ lapack_int LAPACKE_zherfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zherfs( &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, ipiv, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, rwork, &info );
@@ -118,7 +118,7 @@ lapack_int LAPACKE_zherfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -129,11 +129,11 @@ lapack_int LAPACKE_zherfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zherfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zherfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zherfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zherfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zherfsx.c b/LAPACKE/src/lapacke_zherfsx.c
index 9da13b03f1..88326f37c6 100644
--- a/LAPACKE/src/lapacke_zherfsx.c
+++ b/LAPACKE/src/lapacke_zherfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zherfsx( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_zherfsx)( int matrix_layout, char uplo, char equed,
                             lapack_int n, lapack_int nrhs,
                             const lapack_complex_double* a, lapack_int lda,
                             const lapack_complex_double* af, lapack_int ldaf,
@@ -47,32 +47,32 @@ lapack_int LAPACKE_zherfsx( int matrix_layout, char uplo, char equed,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zherfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zherfsx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -22;
             }
         }
-        if( LAPACKE_lsame( equed, 'y' ) ) {
-            if( LAPACKE_d_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, s, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -14;
         }
     }
@@ -90,7 +90,7 @@ lapack_int LAPACKE_zherfsx( int matrix_layout, char uplo, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zherfsx_work( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_zherfsx_work)( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
                                  ldaf, ipiv, s, b, ldb, x, ldx, rcond, berr,
                                  n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, rwork );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_zherfsx( int matrix_layout, char uplo, char equed,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zherfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zherfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zherfsx_work.c b/LAPACKE/src/lapacke_zherfsx_work.c
index 125092eb5e..198b750b69 100644
--- a/LAPACKE/src/lapacke_zherfsx_work.c
+++ b/LAPACKE/src/lapacke_zherfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zherfsx_work( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_zherfsx_work)( int matrix_layout, char uplo, char equed,
                                  lapack_int n, lapack_int nrhs,
                                  const lapack_complex_double* a, lapack_int lda,
                                  const lapack_complex_double* af,
@@ -70,22 +70,22 @@ lapack_int LAPACKE_zherfsx_work( int matrix_layout, char uplo, char equed,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zherfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zherfsx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zherfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zherfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zherfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zherfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_zherfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zherfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -128,10 +128,10 @@ lapack_int LAPACKE_zherfsx_work( int matrix_layout, char uplo, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zherfsx( &uplo, &equed, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, s, b_t, &ldb_t, x_t, &ldx_t, rcond, berr,
@@ -141,10 +141,10 @@ lapack_int LAPACKE_zherfsx_work( int matrix_layout, char uplo, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -160,11 +160,11 @@ lapack_int LAPACKE_zherfsx_work( int matrix_layout, char uplo, char equed,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zherfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zherfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zherfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zherfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhesv.c b/LAPACKE/src/lapacke_zhesv.c
index 10239198b1..21d1c9dc55 100644
--- a/LAPACKE/src/lapacke_zhesv.c
+++ b/LAPACKE/src/lapacke_zhesv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhesv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhesv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_double* a,
                           lapack_int lda, lapack_int* ipiv,
                           lapack_complex_double* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_zhesv( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhesv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhesv_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zhesv_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_zhesv( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhesv_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zhesv_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhesv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhesv_aa.c b/LAPACKE/src/lapacke_zhesv_aa.c
index 2fdd82c2fa..e3186a9e0c 100644
--- a/LAPACKE/src/lapacke_zhesv_aa.c
+++ b/LAPACKE/src/lapacke_zhesv_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhesv_aa( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhesv_aa)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_double* a,
                           lapack_int lda, lapack_int* ipiv,
                           lapack_complex_double* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_zhesv_aa( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhesv_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhesv_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zhesv_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_zhesv_aa( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhesv_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zhesv_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhesv_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhesv_aa_2stage.c b/LAPACKE/src/lapacke_zhesv_aa_2stage.c
index e0a00d7eae..bb2c87f19d 100644
--- a/LAPACKE/src/lapacke_zhesv_aa_2stage.c
+++ b/LAPACKE/src/lapacke_zhesv_aa_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhesv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhesv_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_double* a,
                           lapack_int lda, lapack_complex_double* tb,
                           lapack_int ltb, lapack_int* ipiv, lapack_int* ipiv2,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_zhesv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhesv_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhesv_aa_2stage_work( matrix_layout, uplo, n, nrhs,  
+    info = API_SUFFIX(LAPACKE_zhesv_aa_2stage_work)( matrix_layout, uplo, n, nrhs,  
                                a, lda, tb, ltb, ipiv, ipiv2, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
@@ -76,14 +76,14 @@ lapack_int LAPACKE_zhesv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhesv_aa_2stage_work( matrix_layout, uplo, n, nrhs,
+    info = API_SUFFIX(LAPACKE_zhesv_aa_2stage_work)( matrix_layout, uplo, n, nrhs,
     					       a, lda, tb, ltb, ipiv, ipiv2, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhesv_aa_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_aa_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhesv_aa_2stage_work.c b/LAPACKE/src/lapacke_zhesv_aa_2stage_work.c
index 16b79add48..b3da163f68 100644
--- a/LAPACKE/src/lapacke_zhesv_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_zhesv_aa_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhesv_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhesv_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_double* a, lapack_int lda,
                                lapack_complex_double* tb, lapack_int ltb, lapack_int* ipiv, 
                                lapack_int* ipiv2, lapack_complex_double* b, lapack_int ldb,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_zhesv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zhesv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zhesv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_aa_2stage_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zhesv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_aa_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -93,8 +93,8 @@ lapack_int LAPACKE_zhesv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhesv_aa_2stage( &uplo, &n, &nrhs, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, b_t, &ldb_t, work,
@@ -103,8 +103,8 @@ lapack_int LAPACKE_zhesv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_2:
@@ -113,11 +113,11 @@ lapack_int LAPACKE_zhesv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhesv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhesv_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhesv_aa_work.c b/LAPACKE/src/lapacke_zhesv_aa_work.c
index cd3e1de09d..e94bdc12d0 100644
--- a/LAPACKE/src/lapacke_zhesv_aa_work.c
+++ b/LAPACKE/src/lapacke_zhesv_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhesv_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhesv_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_double* a,
                                lapack_int lda, lapack_int* ipiv,
                                lapack_complex_double* b, lapack_int ldb,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_zhesv_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zhesv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_aa_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zhesv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_aa_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_zhesv_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhesv_aa( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -92,19 +92,19 @@ lapack_int LAPACKE_zhesv_aa_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhesv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhesv_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhesv_rk.c b/LAPACKE/src/lapacke_zhesv_rk.c
index 00ab102023..0057a8a9b1 100644
--- a/LAPACKE/src/lapacke_zhesv_rk.c
+++ b/LAPACKE/src/lapacke_zhesv_rk.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhesv_rk( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhesv_rk)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_double* a,
                           lapack_int lda, lapack_complex_double* e, lapack_int* ipiv,
                           lapack_complex_double* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_zhesv_rk( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhesv_rk", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_rk", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhesv_rk_work( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zhesv_rk_work)( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_zhesv_rk( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhesv_rk_work( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zhesv_rk_work)( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhesv_rk", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_rk", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhesv_rk_work.c b/LAPACKE/src/lapacke_zhesv_rk_work.c
index 790e75ad94..0b099d4f36 100644
--- a/LAPACKE/src/lapacke_zhesv_rk_work.c
+++ b/LAPACKE/src/lapacke_zhesv_rk_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhesv_rk_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhesv_rk_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_double* a,
                                lapack_int lda, lapack_complex_double* e,
                                lapack_int* ipiv,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_zhesv_rk_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zhesv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_rk_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zhesv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_rk_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_zhesv_rk_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhesv_rk( &uplo, &n, &nrhs, a_t, &lda_t, e, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -93,19 +93,19 @@ lapack_int LAPACKE_zhesv_rk_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhesv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_rk_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhesv_rk_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_rk_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhesv_work.c b/LAPACKE/src/lapacke_zhesv_work.c
index e0d4882543..9a1d4b7cab 100644
--- a/LAPACKE/src/lapacke_zhesv_work.c
+++ b/LAPACKE/src/lapacke_zhesv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhesv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhesv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_double* a,
                                lapack_int lda, lapack_int* ipiv,
                                lapack_complex_double* b, lapack_int ldb,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_zhesv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zhesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zhesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_zhesv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhesv( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -92,19 +92,19 @@ lapack_int LAPACKE_zhesv_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhesv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhesv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhesvx.c b/LAPACKE/src/lapacke_zhesvx.c
index a1cf5be4e5..e17c7ab27a 100644
--- a/LAPACKE/src/lapacke_zhesvx.c
+++ b/LAPACKE/src/lapacke_zhesvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhesvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhesvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* af,
                            lapack_int ldaf, lapack_int* ipiv,
@@ -46,21 +46,21 @@ lapack_int LAPACKE_zhesvx( int matrix_layout, char fact, char uplo, lapack_int n
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhesvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
@@ -72,7 +72,7 @@ lapack_int LAPACKE_zhesvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhesvx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_zhesvx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                 ldaf, ipiv, b, ldb, x, ldx, rcond, ferr, berr,
                                 &work_query, lwork, rwork );
     if( info != 0 ) {
@@ -87,7 +87,7 @@ lapack_int LAPACKE_zhesvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhesvx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_zhesvx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                 ldaf, ipiv, b, ldb, x, ldx, rcond, ferr, berr,
                                 work, lwork, rwork );
     /* Release memory and exit */
@@ -96,7 +96,7 @@ lapack_int LAPACKE_zhesvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhesvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhesvx_work.c b/LAPACKE/src/lapacke_zhesvx_work.c
index e372cd3abd..fa20778f26 100644
--- a/LAPACKE/src/lapacke_zhesvx_work.c
+++ b/LAPACKE/src/lapacke_zhesvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhesvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhesvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs,
                                 const lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* af, lapack_int ldaf,
@@ -64,22 +64,22 @@ lapack_int LAPACKE_zhesvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zhesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesvx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zhesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zhesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_zhesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesvx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -117,11 +117,11 @@ lapack_int LAPACKE_zhesvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_zhe_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhesvx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                        ipiv, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr, berr, work,
@@ -130,11 +130,11 @@ lapack_int LAPACKE_zhesvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -145,11 +145,11 @@ lapack_int LAPACKE_zhesvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhesvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhesvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhesvxx.c b/LAPACKE/src/lapacke_zhesvxx.c
index 0b14784e5e..b0911bbb27 100644
--- a/LAPACKE/src/lapacke_zhesvxx.c
+++ b/LAPACKE/src/lapacke_zhesvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhesvxx( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhesvxx)( int matrix_layout, char fact, char uplo,
                             lapack_int n, lapack_int nrhs,
                             lapack_complex_double* a, lapack_int lda,
                             lapack_complex_double* af, lapack_int ldaf,
@@ -48,30 +48,30 @@ lapack_int LAPACKE_zhesvxx( int matrix_layout, char fact, char uplo,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhesvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesvxx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -24;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_d_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, s, 1 ) ) {
                 return -12;
             }
         }
@@ -90,7 +90,7 @@ lapack_int LAPACKE_zhesvxx( int matrix_layout, char fact, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhesvxx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_zhesvxx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                  ldaf, ipiv, equed, s, b, ldb, x, ldx, rcond,
                                  rpvgrw, berr, n_err_bnds, err_bnds_norm,
                                  err_bnds_comp, nparams, params, work, rwork );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_zhesvxx( int matrix_layout, char fact, char uplo,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhesvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhesvxx_work.c b/LAPACKE/src/lapacke_zhesvxx_work.c
index 052e2c687c..079ebf7f1e 100644
--- a/LAPACKE/src/lapacke_zhesvxx_work.c
+++ b/LAPACKE/src/lapacke_zhesvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhesvxx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhesvxx_work)( int matrix_layout, char fact, char uplo,
                                  lapack_int n, lapack_int nrhs,
                                  lapack_complex_double* a, lapack_int lda,
                                  lapack_complex_double* af, lapack_int ldaf,
@@ -69,22 +69,22 @@ lapack_int LAPACKE_zhesvxx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zhesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesvxx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zhesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_zhesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_zhesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -127,11 +127,11 @@ lapack_int LAPACKE_zhesvxx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_zhe_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhesvxx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond, rpvgrw,
@@ -141,20 +141,20 @@ lapack_int LAPACKE_zhesvxx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -170,11 +170,11 @@ lapack_int LAPACKE_zhesvxx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhesvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhesvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhesvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zheswapr.c b/LAPACKE/src/lapacke_zheswapr.c
index 17ca30fab2..ec01630e6d 100644
--- a/LAPACKE/src/lapacke_zheswapr.c
+++ b/LAPACKE/src/lapacke_zheswapr.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheswapr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zheswapr)( int matrix_layout, char uplo, lapack_int n,
                              lapack_complex_double* a, lapack_int lda,
                              lapack_int i1, lapack_int i2 )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zheswapr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheswapr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zheswapr_work( matrix_layout, uplo, n, a, lda, i1, i2 );
+    return API_SUFFIX(LAPACKE_zheswapr_work)( matrix_layout, uplo, n, a, lda, i1, i2 );
 }
diff --git a/LAPACKE/src/lapacke_zheswapr_work.c b/LAPACKE/src/lapacke_zheswapr_work.c
index a89e12d481..2268f9958b 100644
--- a/LAPACKE/src/lapacke_zheswapr_work.c
+++ b/LAPACKE/src/lapacke_zheswapr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zheswapr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zheswapr_work)( int matrix_layout, char uplo, lapack_int n,
                                   lapack_complex_double* a, lapack_int lda,
                                   lapack_int i1, lapack_int i2 )
 {
@@ -54,21 +54,21 @@ lapack_int LAPACKE_zheswapr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zheswapr( &uplo, &n, a_t, &lda_t, &i1, &i2 );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zheswapr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheswapr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zheswapr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zheswapr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrd.c b/LAPACKE/src/lapacke_zhetrd.c
index af7338d28e..9f6e1d07d8 100644
--- a/LAPACKE/src/lapacke_zhetrd.c
+++ b/LAPACKE/src/lapacke_zhetrd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrd( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrd)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda, double* d,
                            double* e, lapack_complex_double* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zhetrd( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhetrd_work( matrix_layout, uplo, n, a, lda, d, e, tau,
+    info = API_SUFFIX(LAPACKE_zhetrd_work)( matrix_layout, uplo, n, a, lda, d, e, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_zhetrd( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhetrd_work( matrix_layout, uplo, n, a, lda, d, e, tau, work,
+    info = API_SUFFIX(LAPACKE_zhetrd_work)( matrix_layout, uplo, n, a, lda, d, e, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrd_work.c b/LAPACKE/src/lapacke_zhetrd_work.c
index 7822019905..57845c1267 100644
--- a/LAPACKE/src/lapacke_zhetrd_work.c
+++ b/LAPACKE/src/lapacke_zhetrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrd_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrd_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 double* d, double* e,
                                 lapack_complex_double* tau,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zhetrd_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zhetrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -68,23 +68,23 @@ lapack_int LAPACKE_zhetrd_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhetrd( &uplo, &n, a_t, &lda_t, d, e, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhetrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhetrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrf.c b/LAPACKE/src/lapacke_zhetrf.c
index 543b8bffd3..20fe528510 100644
--- a/LAPACKE/src/lapacke_zhetrf.c
+++ b/LAPACKE/src/lapacke_zhetrf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zhetrf( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhetrf_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_zhetrf_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_zhetrf( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhetrf_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_zhetrf_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrf_aa.c b/LAPACKE/src/lapacke_zhetrf_aa.c
index d9df39f7c5..1fff2819ff 100644
--- a/LAPACKE/src/lapacke_zhetrf_aa.c
+++ b/LAPACKE/src/lapacke_zhetrf_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrf_aa( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrf_aa)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zhetrf_aa( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrf_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhetrf_aa_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_zhetrf_aa_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_zhetrf_aa( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhetrf_aa_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_zhetrf_aa_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrf_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrf_aa_2stage.c b/LAPACKE/src/lapacke_zhetrf_aa_2stage.c
index b93a365bb2..c27a91a554 100644
--- a/LAPACKE/src/lapacke_zhetrf_aa_2stage.c
+++ b/LAPACKE/src/lapacke_zhetrf_aa_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrf_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
                           lapack_complex_double* a,
                           lapack_int lda, lapack_complex_double* tb,
                           lapack_int ltb, lapack_int* ipiv, lapack_int* ipiv2 )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_zhetrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrf_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhetrf_aa_2stage_work( matrix_layout, uplo, n,  
+    info = API_SUFFIX(LAPACKE_zhetrf_aa_2stage_work)( matrix_layout, uplo, n,  
                                a, lda, tb, ltb, ipiv, ipiv2,
                                &work_query, lwork );
     if( info != 0 ) {
@@ -72,14 +72,14 @@ lapack_int LAPACKE_zhetrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhetrf_aa_2stage_work( matrix_layout, uplo, n,
+    info = API_SUFFIX(LAPACKE_zhetrf_aa_2stage_work)( matrix_layout, uplo, n,
     					       a, lda, tb, ltb, ipiv, ipiv2,
                                work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrf_aa_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_aa_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrf_aa_2stage_work.c b/LAPACKE/src/lapacke_zhetrf_aa_2stage_work.c
index 10d7a5c393..b810b03859 100644
--- a/LAPACKE/src/lapacke_zhetrf_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_zhetrf_aa_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrf_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrf_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_complex_double* a, lapack_int lda,
                                lapack_complex_double* tb, lapack_int ltb,  
                                lapack_int* ipiv, lapack_int* ipiv2,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_zhetrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zhetrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zhetrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_aa_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -81,7 +81,7 @@ lapack_int LAPACKE_zhetrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhetrf_aa_2stage( &uplo, &n, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, work,
@@ -90,18 +90,18 @@ lapack_int LAPACKE_zhetrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( tb_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhetrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhetrf_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrf_aa_work.c b/LAPACKE/src/lapacke_zhetrf_aa_work.c
index 93fd5e704f..ec4ae96f4e 100644
--- a/LAPACKE/src/lapacke_zhetrf_aa_work.c
+++ b/LAPACKE/src/lapacke_zhetrf_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrf_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrf_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_int* ipiv, lapack_complex_double* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zhetrf_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zhetrf_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_aa_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zhetrf_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhetrf_aa( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhetrf_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhetrf_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrf_rk.c b/LAPACKE/src/lapacke_zhetrf_rk.c
index 9212a0840f..f09094a537 100644
--- a/LAPACKE/src/lapacke_zhetrf_rk.c
+++ b/LAPACKE/src/lapacke_zhetrf_rk.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrf_rk( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrf_rk)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* e, lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zhetrf_rk( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrf_rk", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_rk", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhetrf_rk_work( matrix_layout, uplo, n, a, lda, e, ipiv,
+    info = API_SUFFIX(LAPACKE_zhetrf_rk_work)( matrix_layout, uplo, n, a, lda, e, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_zhetrf_rk( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhetrf_rk_work( matrix_layout, uplo, n, a, lda, e, ipiv, work,
+    info = API_SUFFIX(LAPACKE_zhetrf_rk_work)( matrix_layout, uplo, n, a, lda, e, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrf_rk", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_rk", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrf_rk_work.c b/LAPACKE/src/lapacke_zhetrf_rk_work.c
index 3a87509665..985a575246 100644
--- a/LAPACKE/src/lapacke_zhetrf_rk_work.c
+++ b/LAPACKE/src/lapacke_zhetrf_rk_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrf_rk_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrf_rk_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* e,
                                 lapack_int* ipiv, lapack_complex_double* work,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zhetrf_rk_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zhetrf_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_rk_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,23 +67,23 @@ lapack_int LAPACKE_zhetrf_rk_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhetrf_rk( &uplo, &n, a_t, &lda_t, e, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhetrf_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_rk_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhetrf_rk_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_rk_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrf_rook.c b/LAPACKE/src/lapacke_zhetrf_rook.c
index f6680928bc..7535fe5801 100644
--- a/LAPACKE/src/lapacke_zhetrf_rook.c
+++ b/LAPACKE/src/lapacke_zhetrf_rook.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrf_rook( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrf_rook)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zhetrf_rook( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrf_rook", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_rook", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhetrf_rook_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_zhetrf_rook_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_zhetrf_rook( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhetrf_rook_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_zhetrf_rook_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrf_rook", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_rook", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrf_rook_work.c b/LAPACKE/src/lapacke_zhetrf_rook_work.c
index 5baa68b3b6..e653ab3a4b 100644
--- a/LAPACKE/src/lapacke_zhetrf_rook_work.c
+++ b/LAPACKE/src/lapacke_zhetrf_rook_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrf_rook_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrf_rook_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_int* ipiv, lapack_complex_double* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zhetrf_rook_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zhetrf_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_rook_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zhetrf_rook_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhetrf_rook( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhetrf_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_rook_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhetrf_rook_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_rook_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrf_work.c b/LAPACKE/src/lapacke_zhetrf_work.c
index bef9a1ef5a..49389ff4e6 100644
--- a/LAPACKE/src/lapacke_zhetrf_work.c
+++ b/LAPACKE/src/lapacke_zhetrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_int* ipiv, lapack_complex_double* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zhetrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zhetrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zhetrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhetrf( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhetrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhetrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetri.c b/LAPACKE/src/lapacke_zhetri.c
index aa56a4bd8a..b6d87fa722 100644
--- a/LAPACKE/src/lapacke_zhetri.c
+++ b/LAPACKE/src/lapacke_zhetri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetri( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetri)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            const lapack_int* ipiv )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -58,12 +58,12 @@ lapack_int LAPACKE_zhetri( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhetri_work( matrix_layout, uplo, n, a, lda, ipiv, work );
+    info = API_SUFFIX(LAPACKE_zhetri_work)( matrix_layout, uplo, n, a, lda, ipiv, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetri", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetri2.c b/LAPACKE/src/lapacke_zhetri2.c
index 9109f05426..61b0c73324 100644
--- a/LAPACKE/src/lapacke_zhetri2.c
+++ b/LAPACKE/src/lapacke_zhetri2.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetri2( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetri2)( int matrix_layout, char uplo, lapack_int n,
                             lapack_complex_double* a, lapack_int lda,
                             const lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zhetri2( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetri2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhetri2_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_zhetri2_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                  &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_zhetri2( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhetri2_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_zhetri2_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                  lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetri2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetri2_work.c b/LAPACKE/src/lapacke_zhetri2_work.c
index 262c1cea64..eda5ad607a 100644
--- a/LAPACKE/src/lapacke_zhetri2_work.c
+++ b/LAPACKE/src/lapacke_zhetri2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetri2_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetri2_work)( int matrix_layout, char uplo, lapack_int n,
                                  lapack_complex_double* a, lapack_int lda,
                                  const lapack_int* ipiv,
                                  lapack_complex_double* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zhetri2_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zhetri2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri2_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zhetri2_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhetri2( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhetri2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhetri2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetri2x.c b/LAPACKE/src/lapacke_zhetri2x.c
index d8b56f5dda..9f0340045a 100644
--- a/LAPACKE/src/lapacke_zhetri2x.c
+++ b/LAPACKE/src/lapacke_zhetri2x.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetri2x( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetri2x)( int matrix_layout, char uplo, lapack_int n,
                              lapack_complex_double* a, lapack_int lda,
                              const lapack_int* ipiv, lapack_int nb )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetri2x", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri2x", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -58,13 +58,13 @@ lapack_int LAPACKE_zhetri2x( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhetri2x_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_zhetri2x_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                   nb );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetri2x", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri2x", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetri2x_work.c b/LAPACKE/src/lapacke_zhetri2x_work.c
index 297a299bef..8a607272e5 100644
--- a/LAPACKE/src/lapacke_zhetri2x_work.c
+++ b/LAPACKE/src/lapacke_zhetri2x_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetri2x_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetri2x_work)( int matrix_layout, char uplo, lapack_int n,
                                   lapack_complex_double* a, lapack_int lda,
                                   const lapack_int* ipiv,
                                   lapack_complex_double* work, lapack_int nb )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zhetri2x_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zhetri2x_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri2x_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_zhetri2x_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, lda, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, lda, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhetri2x( &uplo, &n, a_t, &lda_t, ipiv, work, &nb, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, lda, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, lda, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhetri2x_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri2x_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhetri2x_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri2x_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetri_3.c b/LAPACKE/src/lapacke_zhetri_3.c
index 69b0f4e527..4694fb99a9 100644
--- a/LAPACKE/src/lapacke_zhetri_3.c
+++ b/LAPACKE/src/lapacke_zhetri_3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetri_3( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetri_3)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            const lapack_complex_double* e, const lapack_int* ipiv )
 {
@@ -40,24 +40,24 @@ lapack_int LAPACKE_zhetri_3( int matrix_layout, char uplo, lapack_int n,
     lapack_int lwork = -1;
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
-    lapack_int e_start = LAPACKE_lsame( uplo, 'U' ) ? 1 : 0;
+    lapack_int e_start = API_SUFFIX(LAPACKE_lsame)( uplo, 'U' ) ? 1 : 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetri_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_z_nancheck( n-1, e + e_start, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, e + e_start, 1 ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhetri_3_work( matrix_layout, uplo, n, a, lda, e, ipiv,
+    info = API_SUFFIX(LAPACKE_zhetri_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,12 +71,12 @@ lapack_int LAPACKE_zhetri_3( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhetri_3_work( matrix_layout, uplo, n, a, lda, e, ipiv, work, lwork );
+    info = API_SUFFIX(LAPACKE_zhetri_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetri_3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri_3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetri_3_work.c b/LAPACKE/src/lapacke_zhetri_3_work.c
index 6acfad8e17..24a4f1b4ee 100644
--- a/LAPACKE/src/lapacke_zhetri_3_work.c
+++ b/LAPACKE/src/lapacke_zhetri_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetri_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetri_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 const lapack_complex_double* e, const lapack_int* ipiv,
                                 lapack_complex_double* work, lapack_int lwork)
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zhetri_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zhetri_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri_3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zhetri_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhetri_3( &uplo, &n, a_t, &lda_t, e, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhetri_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhetri_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetri_work.c b/LAPACKE/src/lapacke_zhetri_work.c
index 1ebb544c6d..77c2c0ff12 100644
--- a/LAPACKE/src/lapacke_zhetri_work.c
+++ b/LAPACKE/src/lapacke_zhetri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetri_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 const lapack_int* ipiv,
                                 lapack_complex_double* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zhetri_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zhetri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_zhetri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhetri( &uplo, &n, a_t, &lda_t, ipiv, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zhe_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhetri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhetri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrs.c b/LAPACKE/src/lapacke_zhetrs.c
index 87a1207fda..8f9b4ffb5a 100644
--- a/LAPACKE/src/lapacke_zhetrs.c
+++ b/LAPACKE/src/lapacke_zhetrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* a,
                            lapack_int lda, const lapack_int* ipiv,
                            lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_zhetrs_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    return API_SUFFIX(LAPACKE_zhetrs_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_zhetrs2.c b/LAPACKE/src/lapacke_zhetrs2.c
index fefb1de101..69a7e7cea6 100644
--- a/LAPACKE/src/lapacke_zhetrs2.c
+++ b/LAPACKE/src/lapacke_zhetrs2.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrs2( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrs2)( int matrix_layout, char uplo, lapack_int n,
                             lapack_int nrhs, const lapack_complex_double* a,
                             lapack_int lda, const lapack_int* ipiv,
                             lapack_complex_double* b, lapack_int ldb )
@@ -40,16 +40,16 @@ lapack_int LAPACKE_zhetrs2( int matrix_layout, char uplo, lapack_int n,
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrs2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
@@ -62,13 +62,13 @@ lapack_int LAPACKE_zhetrs2( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhetrs2_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zhetrs2_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrs2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrs2_work.c b/LAPACKE/src/lapacke_zhetrs2_work.c
index 8b1afe196a..5eecbdc670 100644
--- a/LAPACKE/src/lapacke_zhetrs2_work.c
+++ b/LAPACKE/src/lapacke_zhetrs2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrs2_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrs2_work)( int matrix_layout, char uplo, lapack_int n,
                                  lapack_int nrhs,
                                  const lapack_complex_double* a, lapack_int lda,
                                  const lapack_int* ipiv,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_zhetrs2_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zhetrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs2_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zhetrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -77,8 +77,8 @@ lapack_int LAPACKE_zhetrs2_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhetrs2( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                         &info );
@@ -86,18 +86,18 @@ lapack_int LAPACKE_zhetrs2_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhetrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhetrs2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrs_3.c b/LAPACKE/src/lapacke_zhetrs_3.c
index 59fdcd9c89..3a782cbd71 100644
--- a/LAPACKE/src/lapacke_zhetrs_3.c
+++ b/LAPACKE/src/lapacke_zhetrs_3.c
@@ -32,30 +32,30 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrs_3( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrs_3)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* a,
                            lapack_int lda, const lapack_complex_double* e,
                            const lapack_int* ipiv,
                            lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrs_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_z_nancheck( n, e ,1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n, e ,1 ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_zhetrs_3_work( matrix_layout, uplo, n, nrhs, a, lda,
+    return API_SUFFIX(LAPACKE_zhetrs_3_work)( matrix_layout, uplo, n, nrhs, a, lda,
                                   e, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zhetrs_3_work.c b/LAPACKE/src/lapacke_zhetrs_3_work.c
index fe8ca713ea..0cea5cdbe5 100644
--- a/LAPACKE/src/lapacke_zhetrs_3_work.c
+++ b/LAPACKE/src/lapacke_zhetrs_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrs_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrs_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_double* a,
                                 lapack_int lda, const lapack_complex_double* e,
                                 const lapack_int* ipiv,
@@ -53,12 +53,12 @@ lapack_int LAPACKE_zhetrs_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zhetrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_3_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zhetrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_3_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -76,8 +76,8 @@ lapack_int LAPACKE_zhetrs_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhetrs_3( &uplo, &n, &nrhs, a_t, &lda_t, e, ipiv, b_t, &ldb_t,
                        &info );
@@ -85,18 +85,18 @@ lapack_int LAPACKE_zhetrs_3_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhetrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhetrs_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrs_aa.c b/LAPACKE/src/lapacke_zhetrs_aa.c
index f39b99ecd4..971206754f 100644
--- a/LAPACKE/src/lapacke_zhetrs_aa.c
+++ b/LAPACKE/src/lapacke_zhetrs_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrs_aa( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrs_aa)( int matrix_layout, char uplo, lapack_int n,
                             lapack_int nrhs, const lapack_complex_double* a,
                             lapack_int lda, const lapack_int* ipiv,
                             lapack_complex_double* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_zhetrs_aa( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrs_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhetrs_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zhetrs_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_zhetrs_aa( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhetrs_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zhetrs_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrs_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrs_aa_2stage.c b/LAPACKE/src/lapacke_zhetrs_aa_2stage.c
index f071cb21ce..53956d2a5d 100644
--- a/LAPACKE/src/lapacke_zhetrs_aa_2stage.c
+++ b/LAPACKE/src/lapacke_zhetrs_aa_2stage.c
@@ -32,33 +32,33 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrs_aa_2stage( int matrix_layout, char uplo, lapack_int n,
-                          lapack_int nrhs, lapack_complex_double* a,
+lapack_int API_SUFFIX(LAPACKE_zhetrs_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
+                          lapack_int nrhs, const lapack_complex_double* a,
                           lapack_int lda, lapack_complex_double* tb,
-                          lapack_int ltb, lapack_int* ipiv, lapack_int* ipiv2,
+                          lapack_int ltb, const lapack_int* ipiv, const lapack_int* ipiv2,
                           lapack_complex_double* b, lapack_int ldb )
 {
     lapack_int info = 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrs_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
 #endif
     /* Call middle-level interface */
-    info = LAPACKE_zhetrs_aa_2stage_work( matrix_layout, uplo, n, nrhs,
+    info = API_SUFFIX(LAPACKE_zhetrs_aa_2stage_work)( matrix_layout, uplo, n, nrhs,
     					       a, lda, tb, ltb, ipiv, ipiv2, b,
                                ldb);
     return info;
diff --git a/LAPACKE/src/lapacke_zhetrs_aa_2stage_work.c b/LAPACKE/src/lapacke_zhetrs_aa_2stage_work.c
index 8286569d2a..e2b81deced 100644
--- a/LAPACKE/src/lapacke_zhetrs_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_zhetrs_aa_2stage_work.c
@@ -32,10 +32,10 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrs_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
-                               lapack_int nrhs, lapack_complex_double* a, lapack_int lda,
-                               lapack_complex_double* tb, lapack_int ltb, lapack_int* ipiv, 
-                               lapack_int* ipiv2, lapack_complex_double* b, lapack_int ldb )
+lapack_int API_SUFFIX(LAPACKE_zhetrs_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
+                               lapack_int nrhs, const lapack_complex_double* a, lapack_int lda,
+                               lapack_complex_double* tb, lapack_int ltb, const lapack_int* ipiv, 
+                               const lapack_int* ipiv2, lapack_complex_double* b, lapack_int ldb )
 {
     lapack_int info = 0;
     if( matrix_layout == LAPACK_COL_MAJOR ) {
@@ -54,17 +54,17 @@ lapack_int LAPACKE_zhetrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zhetrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zhetrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_aa_2stage_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zhetrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_aa_2stage_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_zhetrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhetrs_aa_2stage( &uplo, &n, &nrhs, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, b_t, &ldb_t, &info );
@@ -93,8 +93,7 @@ lapack_int LAPACKE_zhetrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhe_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_2:
@@ -103,11 +102,11 @@ lapack_int LAPACKE_zhetrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhetrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhetrs_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrs_aa_work.c b/LAPACKE/src/lapacke_zhetrs_aa_work.c
index c8a9ed1606..179abeb018 100644
--- a/LAPACKE/src/lapacke_zhetrs_aa_work.c
+++ b/LAPACKE/src/lapacke_zhetrs_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrs_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrs_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                  lapack_int nrhs,
                                  const lapack_complex_double* a, lapack_int lda,
                                  const lapack_int* ipiv,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_zhetrs_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zhetrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_aa_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zhetrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_aa_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -77,8 +77,8 @@ lapack_int LAPACKE_zhetrs_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhetrs_aa( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                         &lwork, &info );
@@ -86,18 +86,18 @@ lapack_int LAPACKE_zhetrs_aa_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhetrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhetrs_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrs_rook.c b/LAPACKE/src/lapacke_zhetrs_rook.c
index 3ce8160d57..436e7b4f1d 100644
--- a/LAPACKE/src/lapacke_zhetrs_rook.c
+++ b/LAPACKE/src/lapacke_zhetrs_rook.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrs_rook( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrs_rook)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* a,
                            lapack_int lda, const lapack_int* ipiv,
                            lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhetrs_rook", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_rook", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_zhetrs_rook_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    return API_SUFFIX(LAPACKE_zhetrs_rook_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_zhetrs_rook_work.c b/LAPACKE/src/lapacke_zhetrs_rook_work.c
index 7ffe68bf14..36b0bec4a2 100644
--- a/LAPACKE/src/lapacke_zhetrs_rook_work.c
+++ b/LAPACKE/src/lapacke_zhetrs_rook_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrs_rook_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrs_rook_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_double* a,
                                 lapack_int lda, const lapack_int* ipiv,
                                 lapack_complex_double* b, lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_zhetrs_rook_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zhetrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_rook_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zhetrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_rook_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,8 +75,8 @@ lapack_int LAPACKE_zhetrs_rook_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhetrs_rook( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                        &info );
@@ -84,18 +84,18 @@ lapack_int LAPACKE_zhetrs_rook_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhetrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_rook_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhetrs_rook_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_rook_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhetrs_work.c b/LAPACKE/src/lapacke_zhetrs_work.c
index 07dddf07c7..2a373935ac 100644
--- a/LAPACKE/src/lapacke_zhetrs_work.c
+++ b/LAPACKE/src/lapacke_zhetrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhetrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhetrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_double* a,
                                 lapack_int lda, const lapack_int* ipiv,
                                 lapack_complex_double* b, lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_zhetrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zhetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zhetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,8 +75,8 @@ lapack_int LAPACKE_zhetrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhetrs( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                        &info );
@@ -84,18 +84,18 @@ lapack_int LAPACKE_zhetrs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhetrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhetrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhetrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhfrk.c b/LAPACKE/src/lapacke_zhfrk.c
index 6db0dbc29e..16f40a14ff 100644
--- a/LAPACKE/src/lapacke_zhfrk.c
+++ b/LAPACKE/src/lapacke_zhfrk.c
@@ -32,35 +32,35 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhfrk( int matrix_layout, char transr, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_zhfrk)( int matrix_layout, char transr, char uplo, char trans,
                           lapack_int n, lapack_int k, double alpha,
                           const lapack_complex_double* a, lapack_int lda,
                           double beta, lapack_complex_double* c )
 {
     lapack_int ka, na;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhfrk", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhfrk", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        ka = LAPACKE_lsame( trans, 'n' ) ? k : n;
-        na = LAPACKE_lsame( trans, 'n' ) ? n : k;
-        if( LAPACKE_zge_nancheck( matrix_layout, na, ka, a, lda ) ) {
+        ka = API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) ? k : n;
+        na = API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) ? n : k;
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, na, ka, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_d_nancheck( 1, &alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &alpha, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &beta, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &beta, 1 ) ) {
             return -10;
         }
-        if( LAPACKE_zpf_nancheck( n, c ) ) {
+        if( API_SUFFIX(LAPACKE_zpf_nancheck)( n, c ) ) {
             return -11;
         }
     }
 #endif
-    return LAPACKE_zhfrk_work( matrix_layout, transr, uplo, trans, n, k, alpha,
+    return API_SUFFIX(LAPACKE_zhfrk_work)( matrix_layout, transr, uplo, trans, n, k, alpha,
                                a, lda, beta, c );
 }
diff --git a/LAPACKE/src/lapacke_zhfrk_work.c b/LAPACKE/src/lapacke_zhfrk_work.c
index e308eba1e0..2971d6a6a5 100644
--- a/LAPACKE/src/lapacke_zhfrk_work.c
+++ b/LAPACKE/src/lapacke_zhfrk_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhfrk_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhfrk_work)( int matrix_layout, char transr, char uplo,
                                char trans, lapack_int n, lapack_int k,
                                double alpha, const lapack_complex_double* a,
                                lapack_int lda, double beta,
@@ -49,13 +49,13 @@ lapack_int LAPACKE_zhfrk_work( int matrix_layout, char transr, char uplo,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        na = LAPACKE_lsame( trans, 'n' ) ? n : k;
-        ka = LAPACKE_lsame( trans, 'n' ) ? k : n;
+        na = API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) ? n : k;
+        ka = API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) ? k : n;
         lda_t = MAX(1,na);
         /* Check leading dimension(s) */
         if( lda < ka ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zhfrk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhfrk_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -73,25 +73,25 @@ lapack_int LAPACKE_zhfrk_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, na, ka, a, lda, a_t, lda_t );
-        LAPACKE_zpf_trans( matrix_layout, transr, uplo, n, c, c_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, na, ka, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zpf_trans)( matrix_layout, transr, uplo, n, c, c_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhfrk( &transr, &uplo, &trans, &n, &k, &alpha, a_t, &lda_t,
                       &beta, c_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_zpf_trans( LAPACK_COL_MAJOR, transr, uplo, n, c_t, c );
+        API_SUFFIX(LAPACKE_zpf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, c_t, c );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhfrk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhfrk_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhfrk_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhfrk_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhgeqz.c b/LAPACKE/src/lapacke_zhgeqz.c
index 7737253f41..df5ab32730 100644
--- a/LAPACKE/src/lapacke_zhgeqz.c
+++ b/LAPACKE/src/lapacke_zhgeqz.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhgeqz( int matrix_layout, char job, char compq, char compz,
+lapack_int API_SUFFIX(LAPACKE_zhgeqz)( int matrix_layout, char job, char compq, char compz,
                            lapack_int n, lapack_int ilo, lapack_int ihi,
                            lapack_complex_double* h, lapack_int ldh,
                            lapack_complex_double* t, lapack_int ldt,
@@ -47,25 +47,25 @@ lapack_int LAPACKE_zhgeqz( int matrix_layout, char job, char compq, char compz,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhgeqz", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhgeqz", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, h, ldh ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, h, ldh ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -14;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -16;
             }
         }
@@ -78,7 +78,7 @@ lapack_int LAPACKE_zhgeqz( int matrix_layout, char job, char compq, char compz,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhgeqz_work( matrix_layout, job, compq, compz, n, ilo, ihi, h,
+    info = API_SUFFIX(LAPACKE_zhgeqz_work)( matrix_layout, job, compq, compz, n, ilo, ihi, h,
                                 ldh, t, ldt, alpha, beta, q, ldq, z, ldz,
                                 &work_query, lwork, rwork );
     if( info != 0 ) {
@@ -93,7 +93,7 @@ lapack_int LAPACKE_zhgeqz( int matrix_layout, char job, char compq, char compz,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhgeqz_work( matrix_layout, job, compq, compz, n, ilo, ihi, h,
+    info = API_SUFFIX(LAPACKE_zhgeqz_work)( matrix_layout, job, compq, compz, n, ilo, ihi, h,
                                 ldh, t, ldt, alpha, beta, q, ldq, z, ldz, work,
                                 lwork, rwork );
     /* Release memory and exit */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_zhgeqz( int matrix_layout, char job, char compq, char compz,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhgeqz", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhgeqz", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhgeqz_work.c b/LAPACKE/src/lapacke_zhgeqz_work.c
index 867e458a72..26defa0725 100644
--- a/LAPACKE/src/lapacke_zhgeqz_work.c
+++ b/LAPACKE/src/lapacke_zhgeqz_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhgeqz_work( int matrix_layout, char job, char compq,
+lapack_int API_SUFFIX(LAPACKE_zhgeqz_work)( int matrix_layout, char job, char compq,
                                 char compz, lapack_int n, lapack_int ilo,
                                 lapack_int ihi, lapack_complex_double* h,
                                 lapack_int ldh, lapack_complex_double* t,
@@ -64,22 +64,22 @@ lapack_int LAPACKE_zhgeqz_work( int matrix_layout, char job, char compq,
         /* Check leading dimension(s) */
         if( ldh < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zhgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhgeqz_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_zhgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhgeqz_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zhgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhgeqz_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_zhgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhgeqz_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_zhgeqz_work( int matrix_layout, char job, char compq,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             q_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldq_t * MAX(1,n) );
@@ -111,7 +111,7 @@ lapack_int LAPACKE_zhgeqz_work( int matrix_layout, char job, char compq,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,n) );
@@ -121,13 +121,13 @@ lapack_int LAPACKE_zhgeqz_work( int matrix_layout, char job, char compq,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, h, ldh, h_t, ldh_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, h, ldh, h_t, ldh_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_zhgeqz( &job, &compq, &compz, &n, &ilo, &ihi, h_t, &ldh_t, t_t,
@@ -137,20 +137,20 @@ lapack_int LAPACKE_zhgeqz_work( int matrix_layout, char job, char compq,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, h_t, ldh_t, h, ldh );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, h_t, ldh_t, h, ldh );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( compq, 'i' ) || LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_2:
@@ -159,11 +159,11 @@ lapack_int LAPACKE_zhgeqz_work( int matrix_layout, char job, char compq,
         LAPACKE_free( h_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhgeqz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhgeqz_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhgeqz_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhgeqz_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpcon.c b/LAPACKE/src/lapacke_zhpcon.c
index 636509f4a2..ec80aac186 100644
--- a/LAPACKE/src/lapacke_zhpcon.c
+++ b/LAPACKE/src/lapacke_zhpcon.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpcon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhpcon)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_double* ap,
                            const lapack_int* ipiv, double anorm, double* rcond )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_zhp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
@@ -61,13 +61,13 @@ lapack_int LAPACKE_zhpcon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhpcon_work( matrix_layout, uplo, n, ap, ipiv, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_zhpcon_work)( matrix_layout, uplo, n, ap, ipiv, anorm, rcond,
                                 work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpcon_work.c b/LAPACKE/src/lapacke_zhpcon_work.c
index 5578f9019c..fd3f8f0894 100644
--- a/LAPACKE/src/lapacke_zhpcon_work.c
+++ b/LAPACKE/src/lapacke_zhpcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpcon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhpcon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_double* ap,
                                 const lapack_int* ipiv, double anorm,
                                 double* rcond, lapack_complex_double* work )
@@ -55,7 +55,7 @@ lapack_int LAPACKE_zhpcon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhpcon( &uplo, &n, ap_t, ipiv, &anorm, rcond, work, &info );
         if( info < 0 ) {
@@ -65,11 +65,11 @@ lapack_int LAPACKE_zhpcon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhpcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhpcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpev.c b/LAPACKE/src/lapacke_zhpev.c
index 003071d667..dee3cbe66c 100644
--- a/LAPACKE/src/lapacke_zhpev.c
+++ b/LAPACKE/src/lapacke_zhpev.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpev( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhpev)( int matrix_layout, char jobz, char uplo, lapack_int n,
                           lapack_complex_double* ap, double* w,
                           lapack_complex_double* z, lapack_int ldz )
 {
@@ -40,13 +40,13 @@ lapack_int LAPACKE_zhpev( int matrix_layout, char jobz, char uplo, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpev", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpev", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, ap ) ) {
             return -5;
         }
     }
@@ -64,7 +64,7 @@ lapack_int LAPACKE_zhpev( int matrix_layout, char jobz, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhpev_work( matrix_layout, jobz, uplo, n, ap, w, z, ldz, work,
+    info = API_SUFFIX(LAPACKE_zhpev_work)( matrix_layout, jobz, uplo, n, ap, w, z, ldz, work,
                                rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -72,7 +72,7 @@ lapack_int LAPACKE_zhpev( int matrix_layout, char jobz, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpev", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpev", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpev_work.c b/LAPACKE/src/lapacke_zhpev_work.c
index 9cca2e602b..cc44b1eb65 100644
--- a/LAPACKE/src/lapacke_zhpev_work.c
+++ b/LAPACKE/src/lapacke_zhpev_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpev_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhpev_work)( int matrix_layout, char jobz, char uplo,
                                lapack_int n, lapack_complex_double* ap,
                                double* w, lapack_complex_double* z,
                                lapack_int ldz, lapack_complex_double* work,
@@ -52,11 +52,11 @@ lapack_int LAPACKE_zhpev_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zhpev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpev_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,n) );
@@ -73,7 +73,7 @@ lapack_int LAPACKE_zhpev_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhpev( &jobz, &uplo, &n, ap_t, w, z_t, &ldz_t, work, rwork,
                       &info );
@@ -81,23 +81,23 @@ lapack_int LAPACKE_zhpev_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
-        LAPACKE_zhp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zhp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhpev_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpev_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhpev_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpev_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpevd.c b/LAPACKE/src/lapacke_zhpevd.c
index 742ca5f285..53f6ae4414 100644
--- a/LAPACKE/src/lapacke_zhpevd.c
+++ b/LAPACKE/src/lapacke_zhpevd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpevd( int matrix_layout, char jobz, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhpevd)( int matrix_layout, char jobz, char uplo, lapack_int n,
                            lapack_complex_double* ap, double* w,
                            lapack_complex_double* z, lapack_int ldz )
 {
@@ -47,19 +47,19 @@ lapack_int LAPACKE_zhpevd( int matrix_layout, char jobz, char uplo, lapack_int n
     double rwork_query;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpevd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpevd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, ap ) ) {
             return -5;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhpevd_work( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
+    info = API_SUFFIX(LAPACKE_zhpevd_work)( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
                                 &work_query, lwork, &rwork_query, lrwork,
                                 &iwork_query, liwork );
     if( info != 0 ) {
@@ -86,7 +86,7 @@ lapack_int LAPACKE_zhpevd( int matrix_layout, char jobz, char uplo, lapack_int n
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhpevd_work( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
+    info = API_SUFFIX(LAPACKE_zhpevd_work)( matrix_layout, jobz, uplo, n, ap, w, z, ldz,
                                 work, lwork, rwork, lrwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -96,7 +96,7 @@ lapack_int LAPACKE_zhpevd( int matrix_layout, char jobz, char uplo, lapack_int n
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpevd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpevd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpevd_work.c b/LAPACKE/src/lapacke_zhpevd_work.c
index 9facb86cec..42c690df3f 100644
--- a/LAPACKE/src/lapacke_zhpevd_work.c
+++ b/LAPACKE/src/lapacke_zhpevd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpevd_work( int matrix_layout, char jobz, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhpevd_work)( int matrix_layout, char jobz, char uplo,
                                 lapack_int n, lapack_complex_double* ap,
                                 double* w, lapack_complex_double* z,
                                 lapack_int ldz, lapack_complex_double* work,
@@ -55,7 +55,7 @@ lapack_int LAPACKE_zhpevd_work( int matrix_layout, char jobz, char uplo,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zhpevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpevd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -65,7 +65,7 @@ lapack_int LAPACKE_zhpevd_work( int matrix_layout, char jobz, char uplo,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,n) );
@@ -82,7 +82,7 @@ lapack_int LAPACKE_zhpevd_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhpevd( &jobz, &uplo, &n, ap_t, w, z_t, &ldz_t, work, &lwork,
                        rwork, &lrwork, iwork, &liwork, &info );
@@ -90,23 +90,23 @@ lapack_int LAPACKE_zhpevd_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
-        LAPACKE_zhp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zhp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhpevd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpevd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhpevd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpevd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpevx.c b/LAPACKE/src/lapacke_zhpevx.c
index 2ab91431b2..50aa0ded63 100644
--- a/LAPACKE/src/lapacke_zhpevx.c
+++ b/LAPACKE/src/lapacke_zhpevx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpevx( int matrix_layout, char jobz, char range, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhpevx)( int matrix_layout, char jobz, char range, char uplo,
                            lapack_int n, lapack_complex_double* ap, double vl,
                            double vu, lapack_int il, lapack_int iu,
                            double abstol, lapack_int* m, double* w,
@@ -44,25 +44,25 @@ lapack_int LAPACKE_zhpevx( int matrix_layout, char jobz, char range, char uplo,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpevx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpevx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_zhp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -8;
             }
         }
@@ -86,7 +86,7 @@ lapack_int LAPACKE_zhpevx( int matrix_layout, char jobz, char range, char uplo,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhpevx_work( matrix_layout, jobz, range, uplo, n, ap, vl, vu,
+    info = API_SUFFIX(LAPACKE_zhpevx_work)( matrix_layout, jobz, range, uplo, n, ap, vl, vu,
                                 il, iu, abstol, m, w, z, ldz, work, rwork,
                                 iwork, ifail );
     /* Release memory and exit */
@@ -97,7 +97,7 @@ lapack_int LAPACKE_zhpevx( int matrix_layout, char jobz, char range, char uplo,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpevx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpevx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpevx_work.c b/LAPACKE/src/lapacke_zhpevx_work.c
index c5890175c0..15cdd218bc 100644
--- a/LAPACKE/src/lapacke_zhpevx_work.c
+++ b/LAPACKE/src/lapacke_zhpevx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpevx_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_zhpevx_work)( int matrix_layout, char jobz, char range,
                                 char uplo, lapack_int n,
                                 lapack_complex_double* ap, double vl, double vu,
                                 lapack_int il, lapack_int iu, double abstol,
@@ -51,20 +51,20 @@ lapack_int LAPACKE_zhpevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldz_t = MAX(1,n);
         lapack_complex_double* z_t = NULL;
         lapack_complex_double* ap_t = NULL;
         /* Check leading dimension(s) */
         if( ldz < ncols_z ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_zhpevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpevx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -81,7 +81,7 @@ lapack_int LAPACKE_zhpevx_work( int matrix_layout, char jobz, char range,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhpevx( &jobz, &range, &uplo, &n, ap_t, &vl, &vu, &il, &iu,
                        &abstol, m, w, z_t, &ldz_t, work, rwork, iwork, ifail,
@@ -90,24 +90,24 @@ lapack_int LAPACKE_zhpevx_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
-        LAPACKE_zhp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zhp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhpevx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpevx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhpevx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpevx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpgst.c b/LAPACKE/src/lapacke_zhpgst.c
index b5b80d869c..d2c3e78bd9 100644
--- a/LAPACKE/src/lapacke_zhpgst.c
+++ b/LAPACKE/src/lapacke_zhpgst.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpgst( int matrix_layout, lapack_int itype, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhpgst)( int matrix_layout, lapack_int itype, char uplo,
                            lapack_int n, lapack_complex_double* ap,
                            const lapack_complex_double* bp )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpgst", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgst", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_zhp_nancheck( n, bp ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, bp ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_zhpgst_work( matrix_layout, itype, uplo, n, ap, bp );
+    return API_SUFFIX(LAPACKE_zhpgst_work)( matrix_layout, itype, uplo, n, ap, bp );
 }
diff --git a/LAPACKE/src/lapacke_zhpgst_work.c b/LAPACKE/src/lapacke_zhpgst_work.c
index d2d52a0b25..dafce7408c 100644
--- a/LAPACKE/src/lapacke_zhpgst_work.c
+++ b/LAPACKE/src/lapacke_zhpgst_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpgst_work( int matrix_layout, lapack_int itype, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhpgst_work)( int matrix_layout, lapack_int itype, char uplo,
                                 lapack_int n, lapack_complex_double* ap,
                                 const lapack_complex_double* bp )
 {
@@ -62,26 +62,26 @@ lapack_int LAPACKE_zhpgst_work( int matrix_layout, lapack_int itype, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, bp, bp_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, bp, bp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhpgst( &itype, &uplo, &n, ap_t, bp_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zhp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( bp_t );
 exit_level_1:
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhpgst_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgst_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhpgst_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgst_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpgv.c b/LAPACKE/src/lapacke_zhpgv.c
index 128b7b28e3..f762dd1056 100644
--- a/LAPACKE/src/lapacke_zhpgv.c
+++ b/LAPACKE/src/lapacke_zhpgv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpgv( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_zhpgv)( int matrix_layout, lapack_int itype, char jobz,
                           char uplo, lapack_int n, lapack_complex_double* ap,
                           lapack_complex_double* bp, double* w,
                           lapack_complex_double* z, lapack_int ldz )
@@ -41,16 +41,16 @@ lapack_int LAPACKE_zhpgv( int matrix_layout, lapack_int itype, char jobz,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpgv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_zhp_nancheck( n, bp ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, bp ) ) {
             return -7;
         }
     }
@@ -68,7 +68,7 @@ lapack_int LAPACKE_zhpgv( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhpgv_work( matrix_layout, itype, jobz, uplo, n, ap, bp, w, z,
+    info = API_SUFFIX(LAPACKE_zhpgv_work)( matrix_layout, itype, jobz, uplo, n, ap, bp, w, z,
                                ldz, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -76,7 +76,7 @@ lapack_int LAPACKE_zhpgv( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpgv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpgv_work.c b/LAPACKE/src/lapacke_zhpgv_work.c
index e97bdadb0f..4064d312b1 100644
--- a/LAPACKE/src/lapacke_zhpgv_work.c
+++ b/LAPACKE/src/lapacke_zhpgv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpgv_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_zhpgv_work)( int matrix_layout, lapack_int itype, char jobz,
                                char uplo, lapack_int n,
                                lapack_complex_double* ap,
                                lapack_complex_double* bp, double* w,
@@ -55,11 +55,11 @@ lapack_int LAPACKE_zhpgv_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zhpgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,n) );
@@ -83,8 +83,8 @@ lapack_int LAPACKE_zhpgv_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, bp, bp_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, bp, bp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhpgv( &itype, &jobz, &uplo, &n, ap_t, bp_t, w, z_t, &ldz_t,
                       work, rwork, &info );
@@ -92,26 +92,26 @@ lapack_int LAPACKE_zhpgv_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
-        LAPACKE_zhp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
-        LAPACKE_zhp_trans( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
+        API_SUFFIX(LAPACKE_zhp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zhp_trans)( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
         /* Release memory and exit */
         LAPACKE_free( bp_t );
 exit_level_2:
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhpgv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhpgv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpgvd.c b/LAPACKE/src/lapacke_zhpgvd.c
index cb90e86cf7..ac35a46aba 100644
--- a/LAPACKE/src/lapacke_zhpgvd.c
+++ b/LAPACKE/src/lapacke_zhpgvd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpgvd( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_zhpgvd)( int matrix_layout, lapack_int itype, char jobz,
                            char uplo, lapack_int n, lapack_complex_double* ap,
                            lapack_complex_double* bp, double* w,
                            lapack_complex_double* z, lapack_int ldz )
@@ -48,22 +48,22 @@ lapack_int LAPACKE_zhpgvd( int matrix_layout, lapack_int itype, char jobz,
     double rwork_query;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpgvd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgvd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_zhp_nancheck( n, bp ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, bp ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhpgvd_work( matrix_layout, itype, jobz, uplo, n, ap, bp, w,
+    info = API_SUFFIX(LAPACKE_zhpgvd_work)( matrix_layout, itype, jobz, uplo, n, ap, bp, w,
                                 z, ldz, &work_query, lwork, &rwork_query,
                                 lrwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -90,7 +90,7 @@ lapack_int LAPACKE_zhpgvd( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhpgvd_work( matrix_layout, itype, jobz, uplo, n, ap, bp, w,
+    info = API_SUFFIX(LAPACKE_zhpgvd_work)( matrix_layout, itype, jobz, uplo, n, ap, bp, w,
                                 z, ldz, work, lwork, rwork, lrwork, iwork,
                                 liwork );
     /* Release memory and exit */
@@ -101,7 +101,7 @@ lapack_int LAPACKE_zhpgvd( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpgvd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgvd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpgvd_work.c b/LAPACKE/src/lapacke_zhpgvd_work.c
index df0fdcc930..ccc8df1dd2 100644
--- a/LAPACKE/src/lapacke_zhpgvd_work.c
+++ b/LAPACKE/src/lapacke_zhpgvd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpgvd_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_zhpgvd_work)( int matrix_layout, lapack_int itype, char jobz,
                                 char uplo, lapack_int n,
                                 lapack_complex_double* ap,
                                 lapack_complex_double* bp, double* w,
@@ -57,7 +57,7 @@ lapack_int LAPACKE_zhpgvd_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zhpgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgvd_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,7 +67,7 @@ lapack_int LAPACKE_zhpgvd_work( int matrix_layout, lapack_int itype, char jobz,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,n) );
@@ -91,8 +91,8 @@ lapack_int LAPACKE_zhpgvd_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, bp, bp_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, bp, bp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhpgvd( &itype, &jobz, &uplo, &n, ap_t, bp_t, w, z_t, &ldz_t,
                        work, &lwork, rwork, &lrwork, iwork, &liwork, &info );
@@ -100,26 +100,26 @@ lapack_int LAPACKE_zhpgvd_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
-        LAPACKE_zhp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
-        LAPACKE_zhp_trans( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
+        API_SUFFIX(LAPACKE_zhp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zhp_trans)( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
         /* Release memory and exit */
         LAPACKE_free( bp_t );
 exit_level_2:
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhpgvd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgvd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhpgvd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgvd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpgvx.c b/LAPACKE/src/lapacke_zhpgvx.c
index fd2b6b69cc..efec2e91d6 100644
--- a/LAPACKE/src/lapacke_zhpgvx.c
+++ b/LAPACKE/src/lapacke_zhpgvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpgvx( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_zhpgvx)( int matrix_layout, lapack_int itype, char jobz,
                            char range, char uplo, lapack_int n,
                            lapack_complex_double* ap, lapack_complex_double* bp,
                            double vl, double vu, lapack_int il, lapack_int iu,
@@ -45,28 +45,28 @@ lapack_int LAPACKE_zhpgvx( int matrix_layout, lapack_int itype, char jobz,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpgvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -13;
         }
-        if( LAPACKE_zhp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, ap ) ) {
             return -7;
         }
-        if( LAPACKE_zhp_nancheck( n, bp ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, bp ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -9;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -10;
             }
         }
@@ -90,7 +90,7 @@ lapack_int LAPACKE_zhpgvx( int matrix_layout, lapack_int itype, char jobz,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhpgvx_work( matrix_layout, itype, jobz, range, uplo, n, ap,
+    info = API_SUFFIX(LAPACKE_zhpgvx_work)( matrix_layout, itype, jobz, range, uplo, n, ap,
                                 bp, vl, vu, il, iu, abstol, m, w, z, ldz, work,
                                 rwork, iwork, ifail );
     /* Release memory and exit */
@@ -101,7 +101,7 @@ lapack_int LAPACKE_zhpgvx( int matrix_layout, lapack_int itype, char jobz,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpgvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpgvx_work.c b/LAPACKE/src/lapacke_zhpgvx_work.c
index 2888b4723c..73c210b240 100644
--- a/LAPACKE/src/lapacke_zhpgvx_work.c
+++ b/LAPACKE/src/lapacke_zhpgvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpgvx_work( int matrix_layout, lapack_int itype, char jobz,
+lapack_int API_SUFFIX(LAPACKE_zhpgvx_work)( int matrix_layout, lapack_int itype, char jobz,
                                 char range, char uplo, lapack_int n,
                                 lapack_complex_double* ap,
                                 lapack_complex_double* bp, double vl, double vu,
@@ -52,9 +52,9 @@ lapack_int LAPACKE_zhpgvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int ncols_z = ( LAPACKE_lsame( range, 'a' ) ||
-                             LAPACKE_lsame( range, 'v' ) ) ? n :
-                             ( LAPACKE_lsame( range, 'i' ) ? (iu-il+1) : 1);
+        lapack_int ncols_z = ( API_SUFFIX(LAPACKE_lsame)( range, 'a' ) ||
+                             API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( range, 'i' ) ? (iu-il+1) : 1);
         lapack_int ldz_t = MAX(1,n);
         lapack_complex_double* z_t = NULL;
         lapack_complex_double* ap_t = NULL;
@@ -62,11 +62,11 @@ lapack_int LAPACKE_zhpgvx_work( int matrix_layout, lapack_int itype, char jobz,
         /* Check leading dimension(s) */
         if( ldz < ncols_z ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_zhpgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,ncols_z) );
@@ -90,8 +90,8 @@ lapack_int LAPACKE_zhpgvx_work( int matrix_layout, lapack_int itype, char jobz,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, bp, bp_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, bp, bp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhpgvx( &itype, &jobz, &range, &uplo, &n, ap_t, bp_t, &vl, &vu,
                        &il, &iu, &abstol, m, w, z_t, &ldz_t, work, rwork, iwork,
@@ -100,27 +100,27 @@ lapack_int LAPACKE_zhpgvx_work( int matrix_layout, lapack_int itype, char jobz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, ncols_z, z_t, ldz_t, z,
                                ldz );
         }
-        LAPACKE_zhp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
-        LAPACKE_zhp_trans( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
+        API_SUFFIX(LAPACKE_zhp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zhp_trans)( LAPACK_COL_MAJOR, uplo, n, bp_t, bp );
         /* Release memory and exit */
         LAPACKE_free( bp_t );
 exit_level_2:
         LAPACKE_free( ap_t );
 exit_level_1:
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhpgvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhpgvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpgvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhprfs.c b/LAPACKE/src/lapacke_zhprfs.c
index 412dd2f9c0..3f3a098283 100644
--- a/LAPACKE/src/lapacke_zhprfs.c
+++ b/LAPACKE/src/lapacke_zhprfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhprfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhprfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* ap,
                            const lapack_complex_double* afp,
                            const lapack_int* ipiv,
@@ -44,22 +44,22 @@ lapack_int LAPACKE_zhprfs( int matrix_layout, char uplo, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhprfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhprfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, afp ) ) {
             return -6;
         }
-        if( LAPACKE_zhp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -10;
         }
     }
@@ -77,7 +77,7 @@ lapack_int LAPACKE_zhprfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhprfs_work( matrix_layout, uplo, n, nrhs, ap, afp, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zhprfs_work)( matrix_layout, uplo, n, nrhs, ap, afp, ipiv, b,
                                 ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -85,7 +85,7 @@ lapack_int LAPACKE_zhprfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhprfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhprfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhprfs_work.c b/LAPACKE/src/lapacke_zhprfs_work.c
index bb527472a2..b4ac0f42c8 100644
--- a/LAPACKE/src/lapacke_zhprfs_work.c
+++ b/LAPACKE/src/lapacke_zhprfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhprfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhprfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs,
                                 const lapack_complex_double* ap,
                                 const lapack_complex_double* afp,
@@ -60,12 +60,12 @@ lapack_int LAPACKE_zhprfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zhprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhprfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zhprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhprfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -98,10 +98,10 @@ lapack_int LAPACKE_zhprfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, afp, afp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhprfs( &uplo, &n, &nrhs, ap_t, afp_t, ipiv, b_t, &ldb_t, x_t,
                        &ldx_t, ferr, berr, work, rwork, &info );
@@ -109,7 +109,7 @@ lapack_int LAPACKE_zhprfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( afp_t );
 exit_level_3:
@@ -120,11 +120,11 @@ lapack_int LAPACKE_zhprfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhprfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhprfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhprfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpsv.c b/LAPACKE/src/lapacke_zhpsv.c
index 1318212094..63e8bcc373 100644
--- a/LAPACKE/src/lapacke_zhpsv.c
+++ b/LAPACKE/src/lapacke_zhpsv.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpsv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhpsv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_double* ap,
                           lapack_int* ipiv, lapack_complex_double* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_zhpsv_work( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
+    return API_SUFFIX(LAPACKE_zhpsv_work)( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zhpsv_work.c b/LAPACKE/src/lapacke_zhpsv_work.c
index 3b4a880ec3..92ffdcad46 100644
--- a/LAPACKE/src/lapacke_zhpsv_work.c
+++ b/LAPACKE/src/lapacke_zhpsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpsv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhpsv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_double* ap,
                                lapack_int* ipiv, lapack_complex_double* b,
                                lapack_int ldb )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zhpsv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zhpsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,27 +70,27 @@ lapack_int LAPACKE_zhpsv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhpsv( &uplo, &n, &nrhs, ap_t, ipiv, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_zhp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zhp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhpsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhpsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpsvx.c b/LAPACKE/src/lapacke_zhpsvx.c
index aa4bd89d8f..ebda9a1f93 100644
--- a/LAPACKE/src/lapacke_zhpsvx.c
+++ b/LAPACKE/src/lapacke_zhpsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpsvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhpsvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* ap,
                            lapack_complex_double* afp, lapack_int* ipiv,
                            const lapack_complex_double* b, lapack_int ldb,
@@ -43,21 +43,21 @@ lapack_int LAPACKE_zhpsvx( int matrix_layout, char fact, char uplo, lapack_int n
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_zhp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, afp ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_zhp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
@@ -75,7 +75,7 @@ lapack_int LAPACKE_zhpsvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhpsvx_work( matrix_layout, fact, uplo, n, nrhs, ap, afp,
+    info = API_SUFFIX(LAPACKE_zhpsvx_work)( matrix_layout, fact, uplo, n, nrhs, ap, afp,
                                 ipiv, b, ldb, x, ldx, rcond, ferr, berr, work,
                                 rwork );
     /* Release memory and exit */
@@ -84,7 +84,7 @@ lapack_int LAPACKE_zhpsvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhpsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhpsvx_work.c b/LAPACKE/src/lapacke_zhpsvx_work.c
index 77afd7ea17..17b283e6bf 100644
--- a/LAPACKE/src/lapacke_zhpsvx_work.c
+++ b/LAPACKE/src/lapacke_zhpsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhpsvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zhpsvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs,
                                 const lapack_complex_double* ap,
                                 lapack_complex_double* afp, lapack_int* ipiv,
@@ -59,12 +59,12 @@ lapack_int LAPACKE_zhpsvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zhpsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zhpsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -97,10 +97,10 @@ lapack_int LAPACKE_zhpsvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, ap, ap_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_zhp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, afp, afp_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_zhpsvx( &fact, &uplo, &n, &nrhs, ap_t, afp_t, ipiv, b_t, &ldb_t,
@@ -109,9 +109,9 @@ lapack_int LAPACKE_zhpsvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        if( LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_zhp_trans( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_zhp_trans)( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
         }
         /* Release memory and exit */
         LAPACKE_free( afp_t );
@@ -123,11 +123,11 @@ lapack_int LAPACKE_zhpsvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhpsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhpsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhpsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhptrd.c b/LAPACKE/src/lapacke_zhptrd.c
index a31a3b74cf..bdac9da9cf 100644
--- a/LAPACKE/src/lapacke_zhptrd.c
+++ b/LAPACKE/src/lapacke_zhptrd.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhptrd( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhptrd)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* ap, double* d, double* e,
                            lapack_complex_double* tau )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhptrd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhptrd", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zhptrd_work( matrix_layout, uplo, n, ap, d, e, tau );
+    return API_SUFFIX(LAPACKE_zhptrd_work)( matrix_layout, uplo, n, ap, d, e, tau );
 }
diff --git a/LAPACKE/src/lapacke_zhptrd_work.c b/LAPACKE/src/lapacke_zhptrd_work.c
index 05fd25699a..36b7622115 100644
--- a/LAPACKE/src/lapacke_zhptrd_work.c
+++ b/LAPACKE/src/lapacke_zhptrd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhptrd_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhptrd_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* ap, double* d, double* e,
                                 lapack_complex_double* tau )
 {
@@ -54,23 +54,23 @@ lapack_int LAPACKE_zhptrd_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhptrd( &uplo, &n, ap_t, d, e, tau, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zhp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhptrd_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhptrd_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhptrd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhptrd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhptrf.c b/LAPACKE/src/lapacke_zhptrf.c
index 0716852122..9676d41a3a 100644
--- a/LAPACKE/src/lapacke_zhptrf.c
+++ b/LAPACKE/src/lapacke_zhptrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhptrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhptrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* ap, lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhptrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhptrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zhptrf_work( matrix_layout, uplo, n, ap, ipiv );
+    return API_SUFFIX(LAPACKE_zhptrf_work)( matrix_layout, uplo, n, ap, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_zhptrf_work.c b/LAPACKE/src/lapacke_zhptrf_work.c
index c48c34ab80..a00b655427 100644
--- a/LAPACKE/src/lapacke_zhptrf_work.c
+++ b/LAPACKE/src/lapacke_zhptrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhptrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhptrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* ap, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -53,23 +53,23 @@ lapack_int LAPACKE_zhptrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhptrf( &uplo, &n, ap_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zhp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhptrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhptrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhptrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhptrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhptri.c b/LAPACKE/src/lapacke_zhptri.c
index 1acd04c64d..c77476c32d 100644
--- a/LAPACKE/src/lapacke_zhptri.c
+++ b/LAPACKE/src/lapacke_zhptri.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhptri( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhptri)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* ap, const lapack_int* ipiv )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhptri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhptri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
@@ -57,12 +57,12 @@ lapack_int LAPACKE_zhptri( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhptri_work( matrix_layout, uplo, n, ap, ipiv, work );
+    info = API_SUFFIX(LAPACKE_zhptri_work)( matrix_layout, uplo, n, ap, ipiv, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhptri", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhptri", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhptri_work.c b/LAPACKE/src/lapacke_zhptri_work.c
index 394ad141b1..0704df2173 100644
--- a/LAPACKE/src/lapacke_zhptri_work.c
+++ b/LAPACKE/src/lapacke_zhptri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhptri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhptri_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* ap,
                                 const lapack_int* ipiv,
                                 lapack_complex_double* work )
@@ -55,23 +55,23 @@ lapack_int LAPACKE_zhptri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhptri( &uplo, &n, ap_t, ipiv, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zhp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zhp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhptri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhptri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhptri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhptri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhptrs.c b/LAPACKE/src/lapacke_zhptrs.c
index b75e45e3bb..e1339188d9 100644
--- a/LAPACKE/src/lapacke_zhptrs.c
+++ b/LAPACKE/src/lapacke_zhptrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhptrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhptrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* ap,
                            const lapack_int* ipiv, lapack_complex_double* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhptrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhptrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zhp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_zhptrs_work( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
+    return API_SUFFIX(LAPACKE_zhptrs_work)( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zhptrs_work.c b/LAPACKE/src/lapacke_zhptrs_work.c
index eb085ba7e3..c0d034e65e 100644
--- a/LAPACKE/src/lapacke_zhptrs_work.c
+++ b/LAPACKE/src/lapacke_zhptrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhptrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhptrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs,
                                 const lapack_complex_double* ap,
                                 const lapack_int* ipiv,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_zhptrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zhptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhptrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,26 +71,26 @@ lapack_int LAPACKE_zhptrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zhp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zhp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zhptrs( &uplo, &n, &nrhs, ap_t, ipiv, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhptrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhptrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhptrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhsein.c b/LAPACKE/src/lapacke_zhsein.c
index f64e0ea675..218876e6da 100644
--- a/LAPACKE/src/lapacke_zhsein.c
+++ b/LAPACKE/src/lapacke_zhsein.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhsein( int matrix_layout, char job, char eigsrc, char initv,
+lapack_int API_SUFFIX(LAPACKE_zhsein)( int matrix_layout, char job, char eigsrc, char initv,
                            const lapack_logical* select, lapack_int n,
                            const lapack_complex_double* h, lapack_int ldh,
                            lapack_complex_double* w, lapack_complex_double* vl,
@@ -44,26 +44,26 @@ lapack_int LAPACKE_zhsein( int matrix_layout, char job, char eigsrc, char initv,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhsein", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhsein", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, h, ldh ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, h, ldh ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'l' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'l' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'r' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -12;
             }
         }
-        if( LAPACKE_z_nancheck( n, w, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n, w, 1 ) ) {
             return -9;
         }
     }
@@ -81,7 +81,7 @@ lapack_int LAPACKE_zhsein( int matrix_layout, char job, char eigsrc, char initv,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhsein_work( matrix_layout, job, eigsrc, initv, select, n, h,
+    info = API_SUFFIX(LAPACKE_zhsein_work)( matrix_layout, job, eigsrc, initv, select, n, h,
                                 ldh, w, vl, ldvl, vr, ldvr, mm, m, work, rwork,
                                 ifaill, ifailr );
     /* Release memory and exit */
@@ -90,7 +90,7 @@ lapack_int LAPACKE_zhsein( int matrix_layout, char job, char eigsrc, char initv,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhsein", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhsein", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhsein_work.c b/LAPACKE/src/lapacke_zhsein_work.c
index 37258d3517..68e2996f48 100644
--- a/LAPACKE/src/lapacke_zhsein_work.c
+++ b/LAPACKE/src/lapacke_zhsein_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhsein_work( int matrix_layout, char job, char eigsrc,
+lapack_int API_SUFFIX(LAPACKE_zhsein_work)( int matrix_layout, char job, char eigsrc,
                                 char initv, const lapack_logical* select,
                                 lapack_int n, const lapack_complex_double* h,
                                 lapack_int ldh, lapack_complex_double* w,
@@ -60,17 +60,17 @@ lapack_int LAPACKE_zhsein_work( int matrix_layout, char job, char eigsrc,
         /* Check leading dimension(s) */
         if( ldh < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zhsein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhsein_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zhsein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhsein_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zhsein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhsein_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -80,7 +80,7 @@ lapack_int LAPACKE_zhsein_work( int matrix_layout, char job, char eigsrc,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'l' ) ) {
             vl_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvl_t * MAX(1,mm) );
@@ -89,7 +89,7 @@ lapack_int LAPACKE_zhsein_work( int matrix_layout, char job, char eigsrc,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'r' ) ) {
             vr_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvr_t * MAX(1,mm) );
@@ -99,14 +99,14 @@ lapack_int LAPACKE_zhsein_work( int matrix_layout, char job, char eigsrc,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, h, ldh, h_t, ldh_t );
-        if( ( LAPACKE_lsame( job, 'l' ) || LAPACKE_lsame( job, 'b' ) ) &&
-            LAPACKE_lsame( initv, 'v' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, h, ldh, h_t, ldh_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( job, 'l' ) || API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( initv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( ( LAPACKE_lsame( job, 'r' ) || LAPACKE_lsame( job, 'b' ) ) &&
-            LAPACKE_lsame( initv, 'v' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( job, 'r' ) || API_SUFFIX(LAPACKE_lsame)( job, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( initv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_zhsein( &job, &eigsrc, &initv, select, &n, h_t, &ldh_t, w, vl_t,
@@ -116,31 +116,31 @@ lapack_int LAPACKE_zhsein_work( int matrix_layout, char job, char eigsrc,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'l' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'l' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
                                ldvl );
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'r' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'r' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
                                ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'r' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'l' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( h_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhsein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhsein_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhsein_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhsein_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhseqr.c b/LAPACKE/src/lapacke_zhseqr.c
index 64dbbb5e63..489b0b3f39 100644
--- a/LAPACKE/src/lapacke_zhseqr.c
+++ b/LAPACKE/src/lapacke_zhseqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhseqr( int matrix_layout, char job, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zhseqr)( int matrix_layout, char job, char compz, lapack_int n,
                            lapack_int ilo, lapack_int ihi,
                            lapack_complex_double* h, lapack_int ldh,
                            lapack_complex_double* w, lapack_complex_double* z,
@@ -43,24 +43,24 @@ lapack_int LAPACKE_zhseqr( int matrix_layout, char job, char compz, lapack_int n
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zhseqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhseqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, h, ldh ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, h, ldh ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -10;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zhseqr_work( matrix_layout, job, compz, n, ilo, ihi, h, ldh,
+    info = API_SUFFIX(LAPACKE_zhseqr_work)( matrix_layout, job, compz, n, ilo, ihi, h, ldh,
                                 w, z, ldz, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -74,13 +74,13 @@ lapack_int LAPACKE_zhseqr( int matrix_layout, char job, char compz, lapack_int n
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zhseqr_work( matrix_layout, job, compz, n, ilo, ihi, h, ldh,
+    info = API_SUFFIX(LAPACKE_zhseqr_work)( matrix_layout, job, compz, n, ilo, ihi, h, ldh,
                                 w, z, ldz, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zhseqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhseqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zhseqr_work.c b/LAPACKE/src/lapacke_zhseqr_work.c
index 05c33615eb..1944b80595 100644
--- a/LAPACKE/src/lapacke_zhseqr_work.c
+++ b/LAPACKE/src/lapacke_zhseqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zhseqr_work( int matrix_layout, char job, char compz,
+lapack_int API_SUFFIX(LAPACKE_zhseqr_work)( int matrix_layout, char job, char compz,
                                 lapack_int n, lapack_int ilo, lapack_int ihi,
                                 lapack_complex_double* h, lapack_int ldh,
                                 lapack_complex_double* w,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_zhseqr_work( int matrix_layout, char job, char compz,
         /* Check leading dimension(s) */
         if( ldh < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zhseqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhseqr_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zhseqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhseqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -76,7 +76,7 @@ lapack_int LAPACKE_zhseqr_work( int matrix_layout, char job, char compz,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,n) );
@@ -86,9 +86,9 @@ lapack_int LAPACKE_zhseqr_work( int matrix_layout, char job, char compz,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, h, ldh, h_t, ldh_t );
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, h, ldh, h_t, ldh_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_zhseqr( &job, &compz, &n, &ilo, &ihi, h_t, &ldh_t, w, z_t,
@@ -97,23 +97,23 @@ lapack_int LAPACKE_zhseqr_work( int matrix_layout, char job, char compz,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, h_t, ldh_t, h, ldh );
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, h_t, ldh_t, h, ldh );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_1:
         LAPACKE_free( h_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zhseqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhseqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zhseqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zhseqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlacgv.c b/LAPACKE/src/lapacke_zlacgv.c
index cbfa99f51f..d9b937e4b1 100644
--- a/LAPACKE/src/lapacke_zlacgv.c
+++ b/LAPACKE/src/lapacke_zlacgv.c
@@ -32,16 +32,16 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlacgv( lapack_int n, lapack_complex_double* x,
+lapack_int API_SUFFIX(LAPACKE_zlacgv)( lapack_int n, lapack_complex_double* x,
                            lapack_int incx )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_z_nancheck( n, x, incx ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n, x, incx ) ) {
             return -2;
         }
     }
 #endif
-    return LAPACKE_zlacgv_work( n, x, incx );
+    return API_SUFFIX(LAPACKE_zlacgv_work)( n, x, incx );
 }
diff --git a/LAPACKE/src/lapacke_zlacgv_work.c b/LAPACKE/src/lapacke_zlacgv_work.c
index c4dbd02b61..7a727af286 100644
--- a/LAPACKE/src/lapacke_zlacgv_work.c
+++ b/LAPACKE/src/lapacke_zlacgv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlacgv_work( lapack_int n, lapack_complex_double* x,
+lapack_int API_SUFFIX(LAPACKE_zlacgv_work)( lapack_int n, lapack_complex_double* x,
                                 lapack_int incx )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_zlacn2.c b/LAPACKE/src/lapacke_zlacn2.c
index 38a5bb4a41..a086f24563 100644
--- a/LAPACKE/src/lapacke_zlacn2.c
+++ b/LAPACKE/src/lapacke_zlacn2.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlacn2( lapack_int n, lapack_complex_double* v,
+lapack_int API_SUFFIX(LAPACKE_zlacn2)( lapack_int n, lapack_complex_double* v,
                            lapack_complex_double* x,
                            double* est, lapack_int* kase, lapack_int* isave )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, est, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, est, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_z_nancheck( n, x, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n, x, 1 ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_zlacn2_work( n, v, x, est, kase, isave );
+    return API_SUFFIX(LAPACKE_zlacn2_work)( n, v, x, est, kase, isave );
 }
diff --git a/LAPACKE/src/lapacke_zlacn2_work.c b/LAPACKE/src/lapacke_zlacn2_work.c
index 820e88a15d..cb24ad0aba 100644
--- a/LAPACKE/src/lapacke_zlacn2_work.c
+++ b/LAPACKE/src/lapacke_zlacn2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlacn2_work( lapack_int n, lapack_complex_double* v,
+lapack_int API_SUFFIX(LAPACKE_zlacn2_work)( lapack_int n, lapack_complex_double* v,
                                 lapack_complex_double* x,
                                 double* est, lapack_int* kase,
                                 lapack_int* isave )
diff --git a/LAPACKE/src/lapacke_zlacp2.c b/LAPACKE/src/lapacke_zlacp2.c
index 1c76b70f69..fb0f13ab52 100644
--- a/LAPACKE/src/lapacke_zlacp2.c
+++ b/LAPACKE/src/lapacke_zlacp2.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlacp2( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zlacp2)( int matrix_layout, char uplo, lapack_int m,
                            lapack_int n, const double* a, lapack_int lda,
                            lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlacp2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlacp2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_zlacp2_work( matrix_layout, uplo, m, n, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_zlacp2_work)( matrix_layout, uplo, m, n, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zlacp2_work.c b/LAPACKE/src/lapacke_zlacp2_work.c
index f5b3a229ae..790b762fde 100644
--- a/LAPACKE/src/lapacke_zlacp2_work.c
+++ b/LAPACKE/src/lapacke_zlacp2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlacp2_work( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zlacp2_work)( int matrix_layout, char uplo, lapack_int m,
                                 lapack_int n, const double* a, lapack_int lda,
                                 lapack_complex_double* b, lapack_int ldb )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_zlacp2_work( int matrix_layout, char uplo, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zlacp2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlacp2_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zlacp2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlacp2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -72,23 +72,23 @@ lapack_int LAPACKE_zlacp2_work( int matrix_layout, char uplo, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zlacp2( &uplo, &m, &n, a_t, &lda_t, b_t, &ldb_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlacp2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlacp2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlacp2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlacp2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlacpy.c b/LAPACKE/src/lapacke_zlacpy.c
index 4e77c110c7..71ce082ecb 100644
--- a/LAPACKE/src/lapacke_zlacpy.c
+++ b/LAPACKE/src/lapacke_zlacpy.c
@@ -32,22 +32,22 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlacpy( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zlacpy)( int matrix_layout, char uplo, lapack_int m,
                            lapack_int n, const lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlacpy", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlacpy", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_zlacpy_work( matrix_layout, uplo, m, n, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_zlacpy_work)( matrix_layout, uplo, m, n, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zlacpy_work.c b/LAPACKE/src/lapacke_zlacpy_work.c
index e61bed6da6..e3bb79c9f1 100644
--- a/LAPACKE/src/lapacke_zlacpy_work.c
+++ b/LAPACKE/src/lapacke_zlacpy_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlacpy_work( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zlacpy_work)( int matrix_layout, char uplo, lapack_int m,
                                 lapack_int n, const lapack_complex_double* a,
                                 lapack_int lda, lapack_complex_double* b,
                                 lapack_int ldb )
@@ -49,12 +49,12 @@ lapack_int LAPACKE_zlacpy_work( int matrix_layout, char uplo, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zlacpy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlacpy_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zlacpy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlacpy_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,23 +71,23 @@ lapack_int LAPACKE_zlacpy_work( int matrix_layout, char uplo, lapack_int m,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zlacpy( &uplo, &m, &n, a_t, &lda_t, b_t, &ldb_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlacpy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlacpy_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlacpy_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlacpy_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlacrm.c b/LAPACKE/src/lapacke_zlacrm.c
index 974fc07cdf..4a029f9814 100644
--- a/LAPACKE/src/lapacke_zlacrm.c
+++ b/LAPACKE/src/lapacke_zlacrm.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlacrm(int matrix_layout, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zlacrm)(int matrix_layout, lapack_int m,
                            lapack_int n, const lapack_complex_double* a,
                            lapack_int lda, const double* b, lapack_int ldb,
                            lapack_complex_double* c, lapack_int ldc)
@@ -41,16 +41,16 @@ lapack_int LAPACKE_zlacrm(int matrix_layout, lapack_int m,
     double* rwork = NULL;
 
     if (matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR) {
-        LAPACKE_xerbla("LAPACKE_zlacrm", -1);
+        API_SUFFIX(LAPACKE_xerbla)("LAPACKE_zlacrm", -1);
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if ( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_dge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -6;
         }
     }
@@ -63,13 +63,13 @@ lapack_int LAPACKE_zlacrm(int matrix_layout, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zlacrm_work(matrix_layout, m, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_zlacrm_work)(matrix_layout, m, n, a, lda, b, ldb,
                                 c, ldc, rwork);
     /* Release memory and exit */
     LAPACKE_free(rwork);
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zlacrm", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlacrm", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlacrm_work.c b/LAPACKE/src/lapacke_zlacrm_work.c
index ed110cd72b..295fa9aefa 100644
--- a/LAPACKE/src/lapacke_zlacrm_work.c
+++ b/LAPACKE/src/lapacke_zlacrm_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlacrm_work(int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zlacrm_work)(int matrix_layout, lapack_int m, lapack_int n,
                                 const lapack_complex_double* a, lapack_int lda,
                                 const double* b, lapack_int ldb,
                                 lapack_complex_double* c, lapack_int ldc,
@@ -52,17 +52,17 @@ lapack_int LAPACKE_zlacrm_work(int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zlacrm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlacrm_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zlacrm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlacrm_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zlacrm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlacrm_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -85,12 +85,12 @@ lapack_int LAPACKE_zlacrm_work(int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans(matrix_layout, m, n, a, lda, a_t, lda_t);
-        LAPACKE_dge_trans(matrix_layout, n, n, b, ldb, b_t, ldb_t);
+        API_SUFFIX(LAPACKE_zge_trans)(matrix_layout, m, n, a, lda, a_t, lda_t);
+        API_SUFFIX(LAPACKE_dge_trans)(matrix_layout, n, n, b, ldb, b_t, ldb_t);
         /* Call LAPACK function */
         LAPACK_zlacrm(&m, &n, a_t, &lda_t, b_t, &ldb_t, c_t, &ldc_t, rwork);
         /* Transpose output matrices */
-        LAPACKE_zge_trans(LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc);
+        API_SUFFIX(LAPACKE_zge_trans)(LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc);
         /* Release memory and exit */
         LAPACKE_free(c_t);
 exit_level_2:
@@ -99,11 +99,11 @@ lapack_int LAPACKE_zlacrm_work(int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free(a_t);
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlacrm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlacrm_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla("LAPACKE_zlacrm_work", -1);
+        API_SUFFIX(LAPACKE_xerbla)("LAPACKE_zlacrm_work", -1);
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlag2c.c b/LAPACKE/src/lapacke_zlag2c.c
index 56220d44f4..4235b21fbb 100644
--- a/LAPACKE/src/lapacke_zlag2c.c
+++ b/LAPACKE/src/lapacke_zlag2c.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlag2c( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zlag2c)( int matrix_layout, lapack_int m, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda,
                            lapack_complex_float* sa, lapack_int ldsa )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlag2c", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlag2c", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zlag2c_work( matrix_layout, m, n, a, lda, sa, ldsa );
+    return API_SUFFIX(LAPACKE_zlag2c_work)( matrix_layout, m, n, a, lda, sa, ldsa );
 }
diff --git a/LAPACKE/src/lapacke_zlag2c_work.c b/LAPACKE/src/lapacke_zlag2c_work.c
index da5dd512c9..a294cfb96f 100644
--- a/LAPACKE/src/lapacke_zlag2c_work.c
+++ b/LAPACKE/src/lapacke_zlag2c_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlag2c_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zlag2c_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 const lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_float* sa, lapack_int ldsa )
 {
@@ -51,12 +51,12 @@ lapack_int LAPACKE_zlag2c_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zlag2c_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlag2c_work", info );
             return info;
         }
         if( ldsa < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zlag2c_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlag2c_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -73,25 +73,25 @@ lapack_int LAPACKE_zlag2c_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zlag2c( &m, &n, a_t, &lda_t, sa_t, &ldsa_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, sa_t, ldsa_t, sa, ldsa );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, m, n, sa_t, ldsa_t, sa, ldsa );
         /* Release memory and exit */
         LAPACKE_free( sa_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlag2c_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlag2c_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlag2c_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlag2c_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlagge.c b/LAPACKE/src/lapacke_zlagge.c
index b7c5554f20..657e364c08 100644
--- a/LAPACKE/src/lapacke_zlagge.c
+++ b/LAPACKE/src/lapacke_zlagge.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlagge( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zlagge)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int kl, lapack_int ku, const double* d,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_int* iseed )
@@ -40,13 +40,13 @@ lapack_int LAPACKE_zlagge( int matrix_layout, lapack_int m, lapack_int n,
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlagge", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlagge", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( MIN(m,n), d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( MIN(m,n), d, 1 ) ) {
             return -6;
         }
     }
@@ -59,13 +59,13 @@ lapack_int LAPACKE_zlagge( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zlagge_work( matrix_layout, m, n, kl, ku, d, a, lda, iseed,
+    info = API_SUFFIX(LAPACKE_zlagge_work)( matrix_layout, m, n, kl, ku, d, a, lda, iseed,
                                 work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zlagge", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlagge", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlagge_work.c b/LAPACKE/src/lapacke_zlagge_work.c
index 92583bb639..b7ab378211 100644
--- a/LAPACKE/src/lapacke_zlagge_work.c
+++ b/LAPACKE/src/lapacke_zlagge_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlagge_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zlagge_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int kl, lapack_int ku, const double* d,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_int* iseed, lapack_complex_double* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zlagge_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zlagge_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlagge_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,16 +66,16 @@ lapack_int LAPACKE_zlagge_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlagge_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlagge_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlagge_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlagge_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlaghe.c b/LAPACKE/src/lapacke_zlaghe.c
index 74b5925d96..484e059914 100644
--- a/LAPACKE/src/lapacke_zlaghe.c
+++ b/LAPACKE/src/lapacke_zlaghe.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlaghe( int matrix_layout, lapack_int n, lapack_int k,
+lapack_int API_SUFFIX(LAPACKE_zlaghe)( int matrix_layout, lapack_int n, lapack_int k,
                            const double* d, lapack_complex_double* a,
                            lapack_int lda, lapack_int* iseed )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlaghe", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlaghe", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -4;
         }
     }
@@ -58,12 +58,12 @@ lapack_int LAPACKE_zlaghe( int matrix_layout, lapack_int n, lapack_int k,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zlaghe_work( matrix_layout, n, k, d, a, lda, iseed, work );
+    info = API_SUFFIX(LAPACKE_zlaghe_work)( matrix_layout, n, k, d, a, lda, iseed, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zlaghe", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlaghe", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlaghe_work.c b/LAPACKE/src/lapacke_zlaghe_work.c
index 0bc1ac22ec..38b855c61b 100644
--- a/LAPACKE/src/lapacke_zlaghe_work.c
+++ b/LAPACKE/src/lapacke_zlaghe_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlaghe_work( int matrix_layout, lapack_int n, lapack_int k,
+lapack_int API_SUFFIX(LAPACKE_zlaghe_work)( int matrix_layout, lapack_int n, lapack_int k,
                                 const double* d, lapack_complex_double* a,
                                 lapack_int lda, lapack_int* iseed,
                                 lapack_complex_double* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zlaghe_work( int matrix_layout, lapack_int n, lapack_int k,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zlaghe_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlaghe_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,16 +66,16 @@ lapack_int LAPACKE_zlaghe_work( int matrix_layout, lapack_int n, lapack_int k,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlaghe_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlaghe_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlaghe_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlaghe_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlagsy.c b/LAPACKE/src/lapacke_zlagsy.c
index 0f6f700648..ed652946ef 100644
--- a/LAPACKE/src/lapacke_zlagsy.c
+++ b/LAPACKE/src/lapacke_zlagsy.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlagsy( int matrix_layout, lapack_int n, lapack_int k,
+lapack_int API_SUFFIX(LAPACKE_zlagsy)( int matrix_layout, lapack_int n, lapack_int k,
                            const double* d, lapack_complex_double* a,
                            lapack_int lda, lapack_int* iseed )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlagsy", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlagsy", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -4;
         }
     }
@@ -58,12 +58,12 @@ lapack_int LAPACKE_zlagsy( int matrix_layout, lapack_int n, lapack_int k,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zlagsy_work( matrix_layout, n, k, d, a, lda, iseed, work );
+    info = API_SUFFIX(LAPACKE_zlagsy_work)( matrix_layout, n, k, d, a, lda, iseed, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zlagsy", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlagsy", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlagsy_work.c b/LAPACKE/src/lapacke_zlagsy_work.c
index 9fbe94f7f7..d980fc3c2a 100644
--- a/LAPACKE/src/lapacke_zlagsy_work.c
+++ b/LAPACKE/src/lapacke_zlagsy_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlagsy_work( int matrix_layout, lapack_int n, lapack_int k,
+lapack_int API_SUFFIX(LAPACKE_zlagsy_work)( int matrix_layout, lapack_int n, lapack_int k,
                                 const double* d, lapack_complex_double* a,
                                 lapack_int lda, lapack_int* iseed,
                                 lapack_complex_double* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zlagsy_work( int matrix_layout, lapack_int n, lapack_int k,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zlagsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlagsy_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,16 +66,16 @@ lapack_int LAPACKE_zlagsy_work( int matrix_layout, lapack_int n, lapack_int k,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlagsy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlagsy_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlagsy_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlagsy_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlangb.c b/LAPACKE/src/lapacke_zlangb.c
new file mode 100644
index 0000000000..ccc8eb4b5b
--- /dev/null
+++ b/LAPACKE/src/lapacke_zlangb.c
@@ -0,0 +1,73 @@
+/*****************************************************************************
+  Copyright (c) 2022, 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 zlangb
+* Author: Simon Märtens
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+double API_SUFFIX(LAPACKE_zlangb)( int matrix_layout, char norm, lapack_int n,
+                       lapack_int kl, lapack_int ku,
+                       const lapack_complex_double* ab, lapack_int ldab )
+{
+    lapack_int info = 0;
+    double res = 0.;
+    double* work = NULL;
+    if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlangb", -1 );
+        return -1;
+    }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+    if( LAPACKE_get_nancheck() ) {
+        /* Optionally check input matrices for NaNs */
+        if( API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, kl, ku, ab, ldab ) ) {
+            return -6;
+        }
+    }
+#endif
+    /* Allocate memory for working array(s) */
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
+        work = (double*)LAPACKE_malloc( sizeof(double) * MAX(1,n) );
+        if( work == NULL ) {
+            info = LAPACK_WORK_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+    }
+    /* Call middle-level interface */
+    res = API_SUFFIX(LAPACKE_zlangb_work)( matrix_layout, norm, n, kl, ku, ab, ldab, work );
+    /* Release memory and exit */
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
+        LAPACKE_free( work );
+    }
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlangb", info );
+    }
+    return res;
+}
diff --git a/LAPACKE/src/lapacke_zlangb_work.c b/LAPACKE/src/lapacke_zlangb_work.c
new file mode 100644
index 0000000000..6b491ef0db
--- /dev/null
+++ b/LAPACKE/src/lapacke_zlangb_work.c
@@ -0,0 +1,84 @@
+/*****************************************************************************
+  Copyright (c) 2022, 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 zlangb
+* Author: Simon Märtens
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+double API_SUFFIX(LAPACKE_zlangb_work)( int matrix_layout, char norm, lapack_int n,
+                            lapack_int kl, lapack_int ku,
+                            const lapack_complex_double* ab, lapack_int ldab,
+                            double* work )
+{
+    lapack_int info = 0;
+    double res = 0.;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        res = LAPACK_zlangb( &norm, &n, &kl, &ku, ab, &ldab, work );
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        char norm_lapack;
+        double* work_lapack = NULL;
+        /* Check leading dimension(s) */
+        if( ldab < kl+ku+1 ) {
+            info = -7;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlangb_work", info );
+            return info;
+        }
+        if( API_SUFFIX(LAPACKE_lsame)( norm, '1' ) || API_SUFFIX(LAPACKE_lsame)( norm, 'o' ) ) {
+            norm_lapack = 'i';
+        } else if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
+            norm_lapack = '1';
+        } else {
+            norm_lapack = norm;
+        }
+        /* Allocate memory for work array(s) */
+        if( API_SUFFIX(LAPACKE_lsame)( norm_lapack, 'i' ) ) {
+            work_lapack = (double*)LAPACKE_malloc( sizeof(double) * MAX(1,n) );
+            if( work_lapack == NULL ) {
+                info = LAPACK_WORK_MEMORY_ERROR;
+                goto exit_level_0;
+            }
+        }
+        /* Call LAPACK function */
+        res = LAPACK_zlangb( &norm, &n, &ku, &kl, ab, &ldab, work );
+        /* Release memory and exit */
+        if( work_lapack ) {
+            LAPACKE_free( work_lapack );
+        }
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlangb_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlangb_work", info );
+    }
+    return res;
+}
diff --git a/LAPACKE/src/lapacke_zlange.c b/LAPACKE/src/lapacke_zlange.c
index 75b76b00ee..5d18349e57 100644
--- a/LAPACKE/src/lapacke_zlange.c
+++ b/LAPACKE/src/lapacke_zlange.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_zlange( int matrix_layout, char norm, lapack_int m,
+double API_SUFFIX(LAPACKE_zlange)( int matrix_layout, char norm, lapack_int m,
                            lapack_int n, const lapack_complex_double* a,
                            lapack_int lda )
 {
@@ -40,19 +40,19 @@ double LAPACKE_zlange( int matrix_layout, char norm, lapack_int m,
     double res = 0.;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlange", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlange", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( norm, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
         work = (double*)LAPACKE_malloc( sizeof(double) * MAX(1,m) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -60,14 +60,14 @@ double LAPACKE_zlange( int matrix_layout, char norm, lapack_int m,
         }
     }
     /* Call middle-level interface */
-    res = LAPACKE_zlange_work( matrix_layout, norm, m, n, a, lda, work );
+    res = API_SUFFIX(LAPACKE_zlange_work)( matrix_layout, norm, m, n, a, lda, work );
     /* Release memory and exit */
-    if( LAPACKE_lsame( norm, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
         LAPACKE_free( work );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zlange", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlange", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_zlange_work.c b/LAPACKE/src/lapacke_zlange_work.c
index 217ae074c8..cb4292dbd6 100644
--- a/LAPACKE/src/lapacke_zlange_work.c
+++ b/LAPACKE/src/lapacke_zlange_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_zlange_work( int matrix_layout, char norm, lapack_int m,
+double API_SUFFIX(LAPACKE_zlange_work)( int matrix_layout, char norm, lapack_int m,
                                 lapack_int n, const lapack_complex_double* a,
                                 lapack_int lda, double* work )
 {
@@ -47,18 +47,18 @@ double LAPACKE_zlange_work( int matrix_layout, char norm, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zlange_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlange_work", info );
             return info;
         }
-        if( LAPACKE_lsame( norm, '1' ) || LAPACKE_lsame( norm, 'o' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( norm, '1' ) || API_SUFFIX(LAPACKE_lsame)( norm, 'o' ) ) {
             norm_lapack = 'i';
-        } else if( LAPACKE_lsame( norm, 'i' ) ) {
+        } else if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
             norm_lapack = '1';
         } else {
             norm_lapack = norm;
         }
         /* Allocate memory for work array(s) */
-        if( LAPACKE_lsame( norm_lapack, 'i' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( norm_lapack, 'i' ) ) {
             work_lapack = (double*)LAPACKE_malloc( sizeof(double) * MAX(1,n) );
             if( work_lapack == NULL ) {
                 info = LAPACK_WORK_MEMORY_ERROR;
@@ -73,11 +73,11 @@ double LAPACKE_zlange_work( int matrix_layout, char norm, lapack_int m,
         }
 exit_level_0:
         if( info == LAPACK_WORK_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlange_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlange_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlange_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlange_work", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_zlanhe.c b/LAPACKE/src/lapacke_zlanhe.c
index 78468e5e12..b82375be48 100644
--- a/LAPACKE/src/lapacke_zlanhe.c
+++ b/LAPACKE/src/lapacke_zlanhe.c
@@ -32,27 +32,27 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_zlanhe( int matrix_layout, char norm, char uplo, lapack_int n,
+double API_SUFFIX(LAPACKE_zlanhe)( int matrix_layout, char norm, char uplo, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda )
 {
     lapack_int info = 0;
     double res = 0.;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlanhe", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlanhe", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( norm, 'i' ) || LAPACKE_lsame( norm, '1' ) ||
-        LAPACKE_lsame( norm, 'O' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) || API_SUFFIX(LAPACKE_lsame)( norm, '1' ) ||
+        API_SUFFIX(LAPACKE_lsame)( norm, 'O' ) ) {
         work = (double*)LAPACKE_malloc( sizeof(double) * MAX(1,n) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -60,15 +60,15 @@ double LAPACKE_zlanhe( int matrix_layout, char norm, char uplo, lapack_int n,
         }
     }
     /* Call middle-level interface */
-    res = LAPACKE_zlanhe_work( matrix_layout, norm, uplo, n, a, lda, work );
+    res = API_SUFFIX(LAPACKE_zlanhe_work)( matrix_layout, norm, uplo, n, a, lda, work );
     /* Release memory and exit */
-    if( LAPACKE_lsame( norm, 'i' ) || LAPACKE_lsame( norm, '1' ) ||
-        LAPACKE_lsame( norm, 'O' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) || API_SUFFIX(LAPACKE_lsame)( norm, '1' ) ||
+        API_SUFFIX(LAPACKE_lsame)( norm, 'O' ) ) {
         LAPACKE_free( work );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zlanhe", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlanhe", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_zlanhe_work.c b/LAPACKE/src/lapacke_zlanhe_work.c
index 899f3b13a8..d81617a9b4 100644
--- a/LAPACKE/src/lapacke_zlanhe_work.c
+++ b/LAPACKE/src/lapacke_zlanhe_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_zlanhe_work( int matrix_layout, char norm, char uplo,
+double API_SUFFIX(LAPACKE_zlanhe_work)( int matrix_layout, char norm, char uplo,
                                 lapack_int n, const lapack_complex_double* a,
                                 lapack_int lda, double* work )
 {
@@ -50,7 +50,7 @@ double LAPACKE_zlanhe_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zlanhe_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlanhe_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ double LAPACKE_zlanhe_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zhe_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zhe_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         res = LAPACK_zlanhe( &norm, &uplo, &n, a_t, &lda_t, work );
         info = 0;  /* LAPACK call is ok! */
@@ -69,11 +69,11 @@ double LAPACKE_zlanhe_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlanhe_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlanhe_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlanhe_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlanhe_work", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_zlansy.c b/LAPACKE/src/lapacke_zlansy.c
index c7f878a90f..b620da70af 100644
--- a/LAPACKE/src/lapacke_zlansy.c
+++ b/LAPACKE/src/lapacke_zlansy.c
@@ -32,27 +32,27 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_zlansy( int matrix_layout, char norm, char uplo, lapack_int n,
+double API_SUFFIX(LAPACKE_zlansy)( int matrix_layout, char norm, char uplo, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda )
 {
     lapack_int info = 0;
     double res = 0.;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlansy", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlansy", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( norm, 'i' ) || LAPACKE_lsame( norm, '1' ) ||
-        LAPACKE_lsame( norm, 'O' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) || API_SUFFIX(LAPACKE_lsame)( norm, '1' ) ||
+        API_SUFFIX(LAPACKE_lsame)( norm, 'O' ) ) {
         work = (double*)LAPACKE_malloc( sizeof(double) * MAX(1,n) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -60,15 +60,15 @@ double LAPACKE_zlansy( int matrix_layout, char norm, char uplo, lapack_int n,
         }
     }
     /* Call middle-level interface */
-    res = LAPACKE_zlansy_work( matrix_layout, norm, uplo, n, a, lda, work );
+    res = API_SUFFIX(LAPACKE_zlansy_work)( matrix_layout, norm, uplo, n, a, lda, work );
     /* Release memory and exit */
-    if( LAPACKE_lsame( norm, 'i' ) || LAPACKE_lsame( norm, '1' ) ||
-        LAPACKE_lsame( norm, 'O' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) || API_SUFFIX(LAPACKE_lsame)( norm, '1' ) ||
+        API_SUFFIX(LAPACKE_lsame)( norm, 'O' ) ) {
         LAPACKE_free( work );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zlansy", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlansy", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_zlansy_work.c b/LAPACKE/src/lapacke_zlansy_work.c
index 4e05b0fae1..7b66c0f23d 100644
--- a/LAPACKE/src/lapacke_zlansy_work.c
+++ b/LAPACKE/src/lapacke_zlansy_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_zlansy_work( int matrix_layout, char norm, char uplo,
+double API_SUFFIX(LAPACKE_zlansy_work)( int matrix_layout, char norm, char uplo,
                                 lapack_int n, const lapack_complex_double* a,
                                 lapack_int lda, double* work )
 {
@@ -50,7 +50,7 @@ double LAPACKE_zlansy_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zlansy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlansy_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ double LAPACKE_zlansy_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         res = LAPACK_zlansy( &norm, &uplo, &n, a_t, &lda_t, work );
         info = 0;  /* LAPACK call is ok! */
@@ -69,11 +69,11 @@ double LAPACKE_zlansy_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlansy_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlansy_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlansy_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlansy_work", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_zlantr.c b/LAPACKE/src/lapacke_zlantr.c
index f6656d84da..73607a0959 100644
--- a/LAPACKE/src/lapacke_zlantr.c
+++ b/LAPACKE/src/lapacke_zlantr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_zlantr( int matrix_layout, char norm, char uplo, char diag,
+double API_SUFFIX(LAPACKE_zlantr)( int matrix_layout, char norm, char uplo, char diag,
                            lapack_int m, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda )
 {
@@ -40,19 +40,19 @@ double LAPACKE_zlantr( int matrix_layout, char norm, char uplo, char diag,
     double res = 0.;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlantr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlantr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ztr_nancheck( matrix_layout, uplo, diag, MIN(m,n), a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ztz_nancheck)( matrix_layout, 'f', uplo, diag, m, n, a, lda ) ) {
             return -7;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( norm, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
         work = (double*)LAPACKE_malloc( sizeof(double) * MAX(1,MAX(m,n)) );
         if( work == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -60,15 +60,15 @@ double LAPACKE_zlantr( int matrix_layout, char norm, char uplo, char diag,
         }
     }
     /* Call middle-level interface */
-    res = LAPACKE_zlantr_work( matrix_layout, norm, uplo, diag, m, n, a, lda,
+    res = API_SUFFIX(LAPACKE_zlantr_work)( matrix_layout, norm, uplo, diag, m, n, a, lda,
                                 work );
     /* Release memory and exit */
-    if( LAPACKE_lsame( norm, 'i' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
         LAPACKE_free( work );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zlantr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlantr", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_zlantr_work.c b/LAPACKE/src/lapacke_zlantr_work.c
index f57911967e..b063492970 100644
--- a/LAPACKE/src/lapacke_zlantr_work.c
+++ b/LAPACKE/src/lapacke_zlantr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-double LAPACKE_zlantr_work( int matrix_layout, char norm, char uplo,
+double API_SUFFIX(LAPACKE_zlantr_work)( int matrix_layout, char norm, char uplo,
                                 char diag, lapack_int m, lapack_int n,
                                 const lapack_complex_double* a, lapack_int lda,
                                 double* work )
@@ -49,23 +49,23 @@ double LAPACKE_zlantr_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zlantr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlantr_work", info );
             return info;
         }
-        if( LAPACKE_lsame( norm, '1' ) || LAPACKE_lsame( norm, 'o' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( norm, '1' ) || API_SUFFIX(LAPACKE_lsame)( norm, 'o' ) ) {
             norm_lapack = 'i';
-        } else if( LAPACKE_lsame( norm, 'i' ) ) {
+        } else if( API_SUFFIX(LAPACKE_lsame)( norm, 'i' ) ) {
             norm_lapack = '1';
         } else {
             norm_lapack = norm;
         }
-        if( LAPACKE_lsame( uplo, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
             uplo_lapack = 'l';
         } else {
             uplo_lapack = 'u';
         }
         /* Allocate memory for work array(s) */
-        if( LAPACKE_lsame( norm_lapack, 'i' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( norm_lapack, 'i' ) ) {
             work_lapack = (double*)LAPACKE_malloc( sizeof(double) * MAX(1,n) );
             if( work_lapack == NULL ) {
                 info = LAPACK_WORK_MEMORY_ERROR;
@@ -80,11 +80,11 @@ double LAPACKE_zlantr_work( int matrix_layout, char norm, char uplo,
         }
 exit_level_0:
         if( info == LAPACK_WORK_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlantr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlantr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlantr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlantr_work", info );
     }
     return res;
 }
diff --git a/LAPACKE/src/lapacke_zlapmr.c b/LAPACKE/src/lapacke_zlapmr.c
index 35086aa926..3edf7b9e0f 100644
--- a/LAPACKE/src/lapacke_zlapmr.c
+++ b/LAPACKE/src/lapacke_zlapmr.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlapmr( int matrix_layout, lapack_logical forwrd,
+lapack_int API_SUFFIX(LAPACKE_zlapmr)( int matrix_layout, lapack_logical forwrd,
                            lapack_int m, lapack_int n, lapack_complex_double* x,
                            lapack_int ldx, lapack_int* k )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlapmr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlapmr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, x, ldx ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_zlapmr_work( matrix_layout, forwrd, m, n, x, ldx, k );
+    return API_SUFFIX(LAPACKE_zlapmr_work)( matrix_layout, forwrd, m, n, x, ldx, k );
 }
diff --git a/LAPACKE/src/lapacke_zlapmr_work.c b/LAPACKE/src/lapacke_zlapmr_work.c
index 909065eb33..ff401306a2 100644
--- a/LAPACKE/src/lapacke_zlapmr_work.c
+++ b/LAPACKE/src/lapacke_zlapmr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlapmr_work( int matrix_layout, lapack_logical forwrd,
+lapack_int API_SUFFIX(LAPACKE_zlapmr_work)( int matrix_layout, lapack_logical forwrd,
                                 lapack_int m, lapack_int n,
                                 lapack_complex_double* x, lapack_int ldx,
                                 lapack_int* k )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zlapmr_work( int matrix_layout, lapack_logical forwrd,
         /* Check leading dimension(s) */
         if( ldx < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zlapmr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlapmr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,21 +61,21 @@ lapack_int LAPACKE_zlapmr_work( int matrix_layout, lapack_logical forwrd,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zlapmr( &forwrd, &m, &n, x_t, &ldx_t, k );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlapmr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlapmr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlapmr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlapmr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlapmt.c b/LAPACKE/src/lapacke_zlapmt.c
index 95e3b42f4e..983bc08c3f 100644
--- a/LAPACKE/src/lapacke_zlapmt.c
+++ b/LAPACKE/src/lapacke_zlapmt.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlapmt( int matrix_layout, lapack_logical forwrd,
+lapack_int API_SUFFIX(LAPACKE_zlapmt)( int matrix_layout, lapack_logical forwrd,
                            lapack_int m, lapack_int n, lapack_complex_double* x,
                            lapack_int ldx, lapack_int* k )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlapmt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlapmt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, x, ldx ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_zlapmt_work( matrix_layout, forwrd, m, n, x, ldx, k );
+    return API_SUFFIX(LAPACKE_zlapmt_work)( matrix_layout, forwrd, m, n, x, ldx, k );
 }
diff --git a/LAPACKE/src/lapacke_zlapmt_work.c b/LAPACKE/src/lapacke_zlapmt_work.c
index 70f604741a..73b804114e 100644
--- a/LAPACKE/src/lapacke_zlapmt_work.c
+++ b/LAPACKE/src/lapacke_zlapmt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlapmt_work( int matrix_layout, lapack_logical forwrd,
+lapack_int API_SUFFIX(LAPACKE_zlapmt_work)( int matrix_layout, lapack_logical forwrd,
                                 lapack_int m, lapack_int n,
                                 lapack_complex_double* x, lapack_int ldx,
                                 lapack_int* k )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zlapmt_work( int matrix_layout, lapack_logical forwrd,
         /* Check leading dimension(s) */
         if( ldx < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zlapmt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlapmt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,21 +61,21 @@ lapack_int LAPACKE_zlapmt_work( int matrix_layout, lapack_logical forwrd,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zlapmt( &forwrd, &m, &n, x_t, &ldx_t, k );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlapmt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlapmt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlapmt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlapmt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlarcm.c b/LAPACKE/src/lapacke_zlarcm.c
index c8ca160594..942524132d 100644
--- a/LAPACKE/src/lapacke_zlarcm.c
+++ b/LAPACKE/src/lapacke_zlarcm.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlarcm(int matrix_layout, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zlarcm)(int matrix_layout, lapack_int m,
                            lapack_int n, const double* a, lapack_int lda,
                            const lapack_complex_double* b, lapack_int ldb,
                            lapack_complex_double* c, lapack_int ldc)
@@ -41,16 +41,16 @@ lapack_int LAPACKE_zlarcm(int matrix_layout, lapack_int m,
     double* rwork = NULL;
 
     if (matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR) {
-        LAPACKE_xerbla("LAPACKE_zlarcm", -1);
+        API_SUFFIX(LAPACKE_xerbla)("LAPACKE_zlarcm", -1);
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if ( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_dge_nancheck( matrix_layout, m, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, m, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -6;
         }
     }
@@ -63,13 +63,13 @@ lapack_int LAPACKE_zlarcm(int matrix_layout, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zlarcm_work(matrix_layout, m, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_zlarcm_work)(matrix_layout, m, n, a, lda, b, ldb,
                                 c, ldc, rwork);
     /* Release memory and exit */
     LAPACKE_free(rwork);
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zlarcm", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarcm", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlarcm_work.c b/LAPACKE/src/lapacke_zlarcm_work.c
index d4e31299ea..8f919ead97 100644
--- a/LAPACKE/src/lapacke_zlarcm_work.c
+++ b/LAPACKE/src/lapacke_zlarcm_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlarcm_work(int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zlarcm_work)(int matrix_layout, lapack_int m, lapack_int n,
                                 const double* a, lapack_int lda,
                                 const lapack_complex_double* b, lapack_int ldb,
                                 lapack_complex_double* c, lapack_int ldc,
@@ -52,17 +52,17 @@ lapack_int LAPACKE_zlarcm_work(int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zlarcm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarcm_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zlarcm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarcm_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zlarcm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarcm_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -85,12 +85,12 @@ lapack_int LAPACKE_zlarcm_work(int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_dge_trans(matrix_layout, m, m, a, lda, a_t, lda_t);
-        LAPACKE_zge_trans(matrix_layout, m, n, b, ldb, b_t, ldb_t);
+        API_SUFFIX(LAPACKE_dge_trans)(matrix_layout, m, m, a, lda, a_t, lda_t);
+        API_SUFFIX(LAPACKE_zge_trans)(matrix_layout, m, n, b, ldb, b_t, ldb_t);
         /* Call LAPACK function */
         LAPACK_zlarcm(&m, &n, a_t, &lda_t, b_t, &ldb_t, c_t, &ldc_t, rwork);
         /* Transpose output matrices */
-        LAPACKE_zge_trans(LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc);
+        API_SUFFIX(LAPACKE_zge_trans)(LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc);
         /* Release memory and exit */
         LAPACKE_free(c_t);
 exit_level_2:
@@ -99,11 +99,11 @@ lapack_int LAPACKE_zlarcm_work(int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free(a_t);
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlarcm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarcm_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla("LAPACKE_zlarcm_work", -1);
+        API_SUFFIX(LAPACKE_xerbla)("LAPACKE_zlarcm_work", -1);
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlarfb.c b/LAPACKE/src/lapacke_zlarfb.c
index 7cd23dde8f..722759d45c 100644
--- a/LAPACKE/src/lapacke_zlarfb.c
+++ b/LAPACKE/src/lapacke_zlarfb.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlarfb( int matrix_layout, char side, char trans, char direct,
+lapack_int API_SUFFIX(LAPACKE_zlarfb)( int matrix_layout, char side, char trans, char direct,
                            char storev, lapack_int m, lapack_int n,
                            lapack_int k, const lapack_complex_double* v,
                            lapack_int ldv, const lapack_complex_double* t,
@@ -42,73 +42,43 @@ lapack_int LAPACKE_zlarfb( int matrix_layout, char side, char trans, char direct
     lapack_int info = 0;
     lapack_int ldwork;
     lapack_complex_double* work = NULL;
-    lapack_int ncols_v, nrows_v;
+    lapack_int nrows_v, ncols_v;
+    lapack_logical left, col, forward;
+    char uplo;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlarfb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarfb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        lapack_int lrv, lcv;  /* row, column stride */
-        if( matrix_layout == LAPACK_COL_MAJOR ) {
-            lrv = 1;
-            lcv = ldv;
-        } else {
-            lrv = ldv;
-            lcv = 1;
-        }
-        ncols_v =     LAPACKE_lsame( storev, 'c' ) ? k :
-                  ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'l' ) ) ? m :
-                  ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'r' ) ) ? n : 1) );
+        left = API_SUFFIX(LAPACKE_lsame)( side, 'l' );
+        col = API_SUFFIX(LAPACKE_lsame)( storev, 'c' );
+        forward = API_SUFFIX(LAPACKE_lsame)( direct, 'f' );
 
-        nrows_v =   ( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( side, 'l' ) ) ? m :
-                  ( ( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( side, 'r' ) ) ? n :
-                    ( LAPACKE_lsame( storev, 'r' ) ? k : 1) );
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, c, ldc ) ) {
-            return -13;
+        nrows_v = ( col && left ) ? m : ( ( col && !left ) ? n : ( !col ? k : 1) );
+        ncols_v = ( !col && left ) ? m : ( ( !col && !left ) ? n : ( col ? k : 1 ) );
+        uplo = ( ( forward && col ) || !( forward || col ) ) ? 'l' : 'u';
+
+        if( ( col && k > nrows_v ) || ( !col && k > ncols_v ) ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarfb", -8 );
+            return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, k, k, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_ztz_nancheck)( matrix_layout, direct, uplo, 'u',
+                                  nrows_v, ncols_v, v, ldv ) ) {
+            return -9;
+        }
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, k, k, t, ldt ) ) {
             return -11;
         }
-        if( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( direct, 'f' ) ) {
-            if( LAPACKE_ztr_nancheck( matrix_layout, 'l', 'u', k, v, ldv ) )
-                return -9;
-            if( LAPACKE_zge_nancheck( matrix_layout, nrows_v-k, ncols_v,
-                                      &v[k*lrv], ldv ) )
-                return -9;
-        } else if( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( direct, 'b' ) ) {
-            if( k > nrows_v ) {
-                LAPACKE_xerbla( "LAPACKE_zlarfb", -8 );
-                return -8;
-            }
-            if( LAPACKE_ztr_nancheck( matrix_layout, 'u', 'u', k,
-                                      &v[(nrows_v-k)*lrv], ldv ) )
-                return -9;
-            if( LAPACKE_zge_nancheck( matrix_layout, nrows_v-k, ncols_v, v, ldv ) )
-                return -9;
-        } else if( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( direct, 'f' ) ) {
-            if( LAPACKE_ztr_nancheck( matrix_layout, 'u', 'u', k, v, ldv ) )
-                return -9;
-            if( LAPACKE_zge_nancheck( matrix_layout, nrows_v, ncols_v-k,
-                                      &v[k*lrv], ldv ) )
-                return -9;
-        } else if( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( direct, 'b' ) ) {
-            if( k > ncols_v ) {
-                LAPACKE_xerbla( "LAPACKE_zlarfb", -8 );
-                return -8;
-            }
-            if( LAPACKE_ztr_nancheck( matrix_layout, 'l', 'u', k,
-                                      &v[(ncols_v-k)*lcv], ldv ) )
-                return -9;
-            if( LAPACKE_zge_nancheck( matrix_layout, nrows_v, ncols_v-k, v, ldv ) )
-                return -9;
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
+            return -13;
         }
     }
 #endif
-    if( LAPACKE_lsame( side, 'l' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
         ldwork = n;
-    } else if( LAPACKE_lsame( side, 'r' ) ) {
+    } else if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
         ldwork = m;
     } else {
         ldwork = 1;
@@ -121,13 +91,13 @@ lapack_int LAPACKE_zlarfb( int matrix_layout, char side, char trans, char direct
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zlarfb_work( matrix_layout, side, trans, direct, storev, m, n,
+    info = API_SUFFIX(LAPACKE_zlarfb_work)( matrix_layout, side, trans, direct, storev, m, n,
                                 k, v, ldv, t, ldt, c, ldc, work, ldwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zlarfb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarfb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlarfb_work.c b/LAPACKE/src/lapacke_zlarfb_work.c
index 1b4f892a17..89c5b73867 100644
--- a/LAPACKE/src/lapacke_zlarfb_work.c
+++ b/LAPACKE/src/lapacke_zlarfb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlarfb_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zlarfb_work)( int matrix_layout, char side, char trans,
                                 char direct, char storev, lapack_int m,
                                 lapack_int n, lapack_int k,
                                 const lapack_complex_double* v, lapack_int ldv,
@@ -42,6 +42,8 @@ lapack_int LAPACKE_zlarfb_work( int matrix_layout, char side, char trans,
 {
     lapack_int info = 0;
     lapack_int nrows_v, ncols_v;
+    lapack_logical left, col, forward;
+    char uplo;
     lapack_int ldc_t, ldt_t, ldv_t;
     lapack_complex_double *v_t = NULL, *t_t = NULL, *c_t = NULL;
     if( matrix_layout == LAPACK_COL_MAJOR ) {
@@ -52,33 +54,36 @@ lapack_int LAPACKE_zlarfb_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        nrows_v = ( LAPACKE_lsame( storev, 'c' ) &&
-                             LAPACKE_lsame( side, 'l' ) ) ? m :
-                             ( ( LAPACKE_lsame( storev, 'c' ) &&
-                             LAPACKE_lsame( side, 'r' ) ) ? n :
-                             ( LAPACKE_lsame( storev, 'r' ) ? k : 1) );
-        ncols_v = LAPACKE_lsame( storev, 'c' ) ? k :
-                             ( ( LAPACKE_lsame( storev, 'r' ) &&
-                             LAPACKE_lsame( side, 'l' ) ) ? m :
-                             ( ( LAPACKE_lsame( storev, 'r' ) &&
-                             LAPACKE_lsame( side, 'r' ) ) ? n : 1) );
+        left = API_SUFFIX(LAPACKE_lsame)( side, 'l' );
+        col = API_SUFFIX(LAPACKE_lsame)( storev, 'c' );
+        forward = API_SUFFIX(LAPACKE_lsame)( direct, 'f' );
+
+        nrows_v = ( col && left ) ? m : ( ( col && !left ) ? n : ( !col ? k : 1) );
+        ncols_v = ( !col && left ) ? m : ( ( !col && !left ) ? n : ( col ? k : 1 ) );
+        uplo = ( ( forward && col ) || !( forward || col ) ) ? 'l' : 'u';
+
         ldc_t = MAX(1,m);
         ldt_t = MAX(1,k);
         ldv_t = MAX(1,nrows_v);
         /* Check leading dimension(s) */
         if( ldc < n ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_zlarfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarfb_work", info );
             return info;
         }
         if( ldt < k ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zlarfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarfb_work", info );
             return info;
         }
         if( ldv < ncols_v ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zlarfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarfb_work", info );
+            return info;
+        }
+        if( ( col && k > nrows_v ) || ( !col && k > ncols_v ) ) {
+            info = -8;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarfb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -102,44 +107,16 @@ lapack_int LAPACKE_zlarfb_work( int matrix_layout, char side, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( direct, 'f' ) ) {
-            LAPACKE_ztr_trans( matrix_layout, 'l', 'u', k, v, ldv, v_t, ldv_t );
-            LAPACKE_zge_trans( matrix_layout, nrows_v-k, ncols_v, &v[k*ldv], ldv,
-                               &v_t[k], ldv_t );
-        } else if( LAPACKE_lsame( storev, 'c' ) &&
-                   LAPACKE_lsame( direct, 'b' ) ) {
-            if( k > nrows_v ) {
-                LAPACKE_xerbla( "LAPACKE_zlarfb_work", -8 );
-                return -8;
-            }
-            LAPACKE_ztr_trans( matrix_layout, 'u', 'u', k, &v[(nrows_v-k)*ldv],
-                               ldv, &v_t[nrows_v-k], ldv_t );
-            LAPACKE_zge_trans( matrix_layout, nrows_v-k, ncols_v, v, ldv, v_t,
-                               ldv_t );
-        } else if( LAPACKE_lsame( storev, 'r' ) &&
-                   LAPACKE_lsame( direct, 'f' ) ) {
-            LAPACKE_ztr_trans( matrix_layout, 'u', 'u', k, v, ldv, v_t, ldv_t );
-            LAPACKE_zge_trans( matrix_layout, nrows_v, ncols_v-k, &v[k], ldv,
-                               &v_t[k*ldv_t], ldv_t );
-        } else if( LAPACKE_lsame( storev, 'r' ) &&
-                   LAPACKE_lsame( direct, 'b' ) ) {
-            if( k > ncols_v ) {
-                LAPACKE_xerbla( "LAPACKE_zlarfb_work", -8 );
-                return -8;
-            }
-            LAPACKE_ztr_trans( matrix_layout, 'l', 'u', k, &v[ncols_v-k], ldv,
-                               &v_t[(ncols_v-k)*ldv_t], ldv_t );
-            LAPACKE_zge_trans( matrix_layout, nrows_v, ncols_v-k, v, ldv, v_t,
-                               ldv_t );
-        }
-        LAPACKE_zge_trans( matrix_layout, k, k, t, ldt, t_t, ldt_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_ztz_trans)( matrix_layout, direct, uplo, 'u', nrows_v, ncols_v,
+                           v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, k, k, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zlarfb( &side, &trans, &direct, &storev, &m, &n, &k, v_t, &ldv_t,
                        t_t, &ldt_t, c_t, &ldc_t, work, &ldwork );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_2:
@@ -148,11 +125,11 @@ lapack_int LAPACKE_zlarfb_work( int matrix_layout, char side, char trans,
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlarfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarfb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlarfb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarfb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlarfg.c b/LAPACKE/src/lapacke_zlarfg.c
index 4b96733df3..6e300379ae 100644
--- a/LAPACKE/src/lapacke_zlarfg.c
+++ b/LAPACKE/src/lapacke_zlarfg.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlarfg( lapack_int n, lapack_complex_double* alpha,
+lapack_int API_SUFFIX(LAPACKE_zlarfg)( lapack_int n, lapack_complex_double* alpha,
                            lapack_complex_double* x, lapack_int incx,
                            lapack_complex_double* tau )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_z_nancheck( 1, alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( 1, alpha, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_z_nancheck( n-1, x, incx ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, x, incx ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_zlarfg_work( n, alpha, x, incx, tau );
+    return API_SUFFIX(LAPACKE_zlarfg_work)( n, alpha, x, incx, tau );
 }
diff --git a/LAPACKE/src/lapacke_zlarfg_work.c b/LAPACKE/src/lapacke_zlarfg_work.c
index 2d1e7ae27a..b16c0dbe5c 100644
--- a/LAPACKE/src/lapacke_zlarfg_work.c
+++ b/LAPACKE/src/lapacke_zlarfg_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlarfg_work( lapack_int n, lapack_complex_double* alpha,
+lapack_int API_SUFFIX(LAPACKE_zlarfg_work)( lapack_int n, lapack_complex_double* alpha,
                                 lapack_complex_double* x, lapack_int incx,
                                 lapack_complex_double* tau )
 {
diff --git a/LAPACKE/src/lapacke_zlarft.c b/LAPACKE/src/lapacke_zlarft.c
index d99a8c8f80..ec52b5c704 100644
--- a/LAPACKE/src/lapacke_zlarft.c
+++ b/LAPACKE/src/lapacke_zlarft.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlarft( int matrix_layout, char direct, char storev,
+lapack_int API_SUFFIX(LAPACKE_zlarft)( int matrix_layout, char direct, char storev,
                            lapack_int n, lapack_int k,
                            const lapack_complex_double* v, lapack_int ldv,
                            const lapack_complex_double* tau,
@@ -40,24 +40,24 @@ lapack_int LAPACKE_zlarft( int matrix_layout, char direct, char storev,
 {
     lapack_int ncols_v, nrows_v;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlarft", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarft", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        ncols_v = LAPACKE_lsame( storev, 'c' ) ? k :
-                             ( LAPACKE_lsame( storev, 'r' ) ? n : 1);
-        nrows_v = LAPACKE_lsame( storev, 'c' ) ? n :
-                             ( LAPACKE_lsame( storev, 'r' ) ? k : 1);
-        if( LAPACKE_z_nancheck( k, tau, 1 ) ) {
+        ncols_v = API_SUFFIX(LAPACKE_lsame)( storev, 'c' ) ? k :
+                             ( API_SUFFIX(LAPACKE_lsame)( storev, 'r' ) ? n : 1);
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( storev, 'c' ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( storev, 'r' ) ? k : 1);
+        if( API_SUFFIX(LAPACKE_z_nancheck)( k, tau, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, nrows_v, ncols_v, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, nrows_v, ncols_v, v, ldv ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_zlarft_work( matrix_layout, direct, storev, n, k, v, ldv, tau,
+    return API_SUFFIX(LAPACKE_zlarft_work)( matrix_layout, direct, storev, n, k, v, ldv, tau,
                                 t, ldt );
 }
diff --git a/LAPACKE/src/lapacke_zlarft_work.c b/LAPACKE/src/lapacke_zlarft_work.c
index b352b6aaf3..37280cf042 100644
--- a/LAPACKE/src/lapacke_zlarft_work.c
+++ b/LAPACKE/src/lapacke_zlarft_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlarft_work( int matrix_layout, char direct, char storev,
+lapack_int API_SUFFIX(LAPACKE_zlarft_work)( int matrix_layout, char direct, char storev,
                                 lapack_int n, lapack_int k,
                                 const lapack_complex_double* v, lapack_int ldv,
                                 const lapack_complex_double* tau,
@@ -49,21 +49,21 @@ lapack_int LAPACKE_zlarft_work( int matrix_layout, char direct, char storev,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        nrows_v = LAPACKE_lsame( storev, 'c' ) ? n :
-                             ( LAPACKE_lsame( storev, 'r' ) ? k : 1);
-        ncols_v = LAPACKE_lsame( storev, 'c' ) ? k :
-                             ( LAPACKE_lsame( storev, 'r' ) ? n : 1);
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( storev, 'c' ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( storev, 'r' ) ? k : 1);
+        ncols_v = API_SUFFIX(LAPACKE_lsame)( storev, 'c' ) ? k :
+                             ( API_SUFFIX(LAPACKE_lsame)( storev, 'r' ) ? n : 1);
         ldt_t = MAX(1,k);
         ldv_t = MAX(1,nrows_v);
         /* Check leading dimension(s) */
         if( ldt < k ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zlarft_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarft_work", info );
             return info;
         }
         if( ldv < ncols_v ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zlarft_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarft_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -81,24 +81,24 @@ lapack_int LAPACKE_zlarft_work( int matrix_layout, char direct, char storev,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, nrows_v, ncols_v, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, nrows_v, ncols_v, v, ldv, v_t, ldv_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zlarft( &direct, &storev, &n, &k, v_t, &ldv_t, tau, t_t,
                        &ldt_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, k, k, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, k, k, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlarft_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarft_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlarft_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarft_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlarfx.c b/LAPACKE/src/lapacke_zlarfx.c
index 489eb623be..984c4c95c8 100644
--- a/LAPACKE/src/lapacke_zlarfx.c
+++ b/LAPACKE/src/lapacke_zlarfx.c
@@ -32,31 +32,31 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlarfx( int matrix_layout, char side, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zlarfx)( int matrix_layout, char side, lapack_int m,
                            lapack_int n, const lapack_complex_double* v,
                            lapack_complex_double tau, lapack_complex_double* c,
                            lapack_int ldc, lapack_complex_double* work )
 {
     lapack_int lv;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlarfx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarfx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -7;
         }
-        if( LAPACKE_z_nancheck( 1, &tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( 1, &tau, 1 ) ) {
             return -6;
         }
-        lv = (LAPACKE_lsame( side, 'l' ) ? m : n);
-        if( LAPACKE_z_nancheck( lv, v, 1 ) ) {
+        lv = (API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n);
+        if( API_SUFFIX(LAPACKE_z_nancheck)( lv, v, 1 ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_zlarfx_work( matrix_layout, side, m, n, v, tau, c, ldc,
+    return API_SUFFIX(LAPACKE_zlarfx_work)( matrix_layout, side, m, n, v, tau, c, ldc,
                                 work );
 }
diff --git a/LAPACKE/src/lapacke_zlarfx_work.c b/LAPACKE/src/lapacke_zlarfx_work.c
index 18f2a0646f..56ce2cfdaa 100644
--- a/LAPACKE/src/lapacke_zlarfx_work.c
+++ b/LAPACKE/src/lapacke_zlarfx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlarfx_work( int matrix_layout, char side, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zlarfx_work)( int matrix_layout, char side, lapack_int m,
                                 lapack_int n, const lapack_complex_double* v,
                                 lapack_complex_double tau,
                                 lapack_complex_double* c, lapack_int ldc,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zlarfx_work( int matrix_layout, char side, lapack_int m,
         /* Check leading dimension(s) */
         if( ldc < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zlarfx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarfx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -62,21 +62,21 @@ lapack_int LAPACKE_zlarfx_work( int matrix_layout, char side, lapack_int m,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zlarfx( &side, &m, &n, v, &tau, c_t, &ldc_t, work );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlarfx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarfx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlarfx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlarfx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlarnv.c b/LAPACKE/src/lapacke_zlarnv.c
index 377e83f971..599a246565 100644
--- a/LAPACKE/src/lapacke_zlarnv.c
+++ b/LAPACKE/src/lapacke_zlarnv.c
@@ -32,8 +32,8 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlarnv( lapack_int idist, lapack_int* iseed, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zlarnv)( lapack_int idist, lapack_int* iseed, lapack_int n,
                            lapack_complex_double* x )
 {
-    return LAPACKE_zlarnv_work( idist, iseed, n, x );
+    return API_SUFFIX(LAPACKE_zlarnv_work)( idist, iseed, n, x );
 }
diff --git a/LAPACKE/src/lapacke_zlarnv_work.c b/LAPACKE/src/lapacke_zlarnv_work.c
index 6912d591fe..ab57ccc293 100644
--- a/LAPACKE/src/lapacke_zlarnv_work.c
+++ b/LAPACKE/src/lapacke_zlarnv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlarnv_work( lapack_int idist, lapack_int* iseed,
+lapack_int API_SUFFIX(LAPACKE_zlarnv_work)( lapack_int idist, lapack_int* iseed,
                                 lapack_int n, lapack_complex_double* x )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_zlascl.c b/LAPACKE/src/lapacke_zlascl.c
index 9f18448c0c..fb25dd173d 100644
--- a/LAPACKE/src/lapacke_zlascl.c
+++ b/LAPACKE/src/lapacke_zlascl.c
@@ -32,13 +32,13 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlascl( int matrix_layout, char type, lapack_int kl,
+lapack_int API_SUFFIX(LAPACKE_zlascl)( int matrix_layout, char type, lapack_int kl,
                            lapack_int ku, double cfrom, double cto,
                            lapack_int m, lapack_int n, lapack_complex_double* a,
                            lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlascl", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlascl", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
@@ -46,68 +46,68 @@ lapack_int LAPACKE_zlascl( int matrix_layout, char type, lapack_int kl,
         /* Optionally check input matrices for NaNs */
         switch (type) {
         case 'G':
-            if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
                 return -9;
             }
             break;
         case 'L':
             // TYPE = 'L' - lower triangle of general matrix
             if( matrix_layout == LAPACK_COL_MAJOR &&
-                LAPACKE_zgb_nancheck( matrix_layout, m, n, m-1, 0, a, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, m, n, m-1, 0, a, lda+1 ) ) {
                 return -9;
             }
             if( matrix_layout == LAPACK_ROW_MAJOR &&
-                LAPACKE_zgb_nancheck( LAPACK_COL_MAJOR, n, m, 0, m-1, a-m+1, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_zgb_nancheck)( LAPACK_COL_MAJOR, n, m, 0, m-1, a-m+1, lda+1 ) ) {
                 return -9;
             }
             break;
         case 'U':
             // TYPE = 'U' - upper triangle of general matrix
             if( matrix_layout == LAPACK_COL_MAJOR &&
-                LAPACKE_zgb_nancheck( matrix_layout, m, n, 0, n-1, a-n+1, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, m, n, 0, n-1, a-n+1, lda+1 ) ) {
                 return -9;
             }
             if( matrix_layout == LAPACK_ROW_MAJOR &&
-                LAPACKE_zgb_nancheck( LAPACK_COL_MAJOR, n, m, n-1, 0, a, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_zgb_nancheck)( LAPACK_COL_MAJOR, n, m, n-1, 0, a, lda+1 ) ) {
                 return -9;
             }
             break;
         case 'H':
             // TYPE = 'H' - part of upper Hessenberg matrix in general matrix
             if( matrix_layout == LAPACK_COL_MAJOR &&
-                LAPACKE_zgb_nancheck( matrix_layout, m, n, 1, n-1, a-n+1, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, m, n, 1, n-1, a-n+1, lda+1 ) ) {
                 return -9;
             }
             if( matrix_layout == LAPACK_ROW_MAJOR &&
-                LAPACKE_zgb_nancheck( LAPACK_COL_MAJOR, n, m, n-1, 1, a-1, lda+1 ) ) {
+                API_SUFFIX(LAPACKE_zgb_nancheck)( LAPACK_COL_MAJOR, n, m, n-1, 1, a-1, lda+1 ) ) {
                 return -9;
             }
             break;
         case 'B':
             // TYPE = 'B' - lower part of symmetric band matrix (assume m==n)
-            if( LAPACKE_zhb_nancheck( matrix_layout, 'L', n, kl, a, lda ) ) {
+            if( API_SUFFIX(LAPACKE_zhb_nancheck)( matrix_layout, 'L', n, kl, a, lda ) ) {
                 return -9;
             }
             break;
         case 'Q':
             // TYPE = 'Q' - upper part of symmetric band matrix (assume m==n)
-            if( LAPACKE_zhb_nancheck( matrix_layout, 'U', n, ku, a, lda ) ) {
+            if( API_SUFFIX(LAPACKE_zhb_nancheck)( matrix_layout, 'U', n, ku, a, lda ) ) {
                 return -9;
             }
             break;
         case 'Z':
             // TYPE = 'Z' -  band matrix laid out for ?GBTRF
             if( matrix_layout == LAPACK_COL_MAJOR &&
-                LAPACKE_zgb_nancheck( matrix_layout, m, n, kl, ku, a+kl, lda ) ) {
+                API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, m, n, kl, ku, a+kl, lda ) ) {
                 return -9;
             }
             if( matrix_layout == LAPACK_ROW_MAJOR &&
-                LAPACKE_zgb_nancheck( matrix_layout, m, n, kl, ku, a+lda*kl, lda ) ) {
+                API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, m, n, kl, ku, a+lda*kl, lda ) ) {
                 return -9;
             }
             break;
         }
     }
 #endif
-    return LAPACKE_zlascl_work( matrix_layout, type, kl, ku, cfrom, cto, m,  n, a, lda );
+    return API_SUFFIX(LAPACKE_zlascl_work)( matrix_layout, type, kl, ku, cfrom, cto, m,  n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_zlascl_work.c b/LAPACKE/src/lapacke_zlascl_work.c
index 631c0df46d..0c19f5108e 100644
--- a/LAPACKE/src/lapacke_zlascl_work.c
+++ b/LAPACKE/src/lapacke_zlascl_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlascl_work( int matrix_layout, char type, lapack_int kl,
+lapack_int API_SUFFIX(LAPACKE_zlascl_work)( int matrix_layout, char type, lapack_int kl,
                            lapack_int ku, double cfrom, double cto,
                            lapack_int m, lapack_int n, lapack_complex_double* a,
                            lapack_int lda )
@@ -45,15 +45,15 @@ lapack_int LAPACKE_zlascl_work( int matrix_layout, char type, lapack_int kl,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nrows_a = LAPACKE_lsame(type, 'b') ? kl + 1 :
-                             LAPACKE_lsame(type, 'q') ? ku + 1 :
-                             LAPACKE_lsame(type, 'z') ? 2 * kl + ku + 1 : m;
+        lapack_int nrows_a = API_SUFFIX(LAPACKE_lsame)(type, 'b') ? kl + 1 :
+                             API_SUFFIX(LAPACKE_lsame)(type, 'q') ? ku + 1 :
+                             API_SUFFIX(LAPACKE_lsame)(type, 'z') ? 2 * kl + ku + 1 : m;
         lapack_int lda_t = MAX(1,nrows_a);
         lapack_complex_double* a_t = NULL;
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zlascl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlascl_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -64,23 +64,23 @@ lapack_int LAPACKE_zlascl_work( int matrix_layout, char type, lapack_int kl,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, nrows_a, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, nrows_a, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zlascl( &type, &kl, &ku, &cfrom, &cto, &m, &n, a_t, &lda_t, &info);
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_a, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrows_a, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlascl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlascl_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlascl_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlascl_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlaset.c b/LAPACKE/src/lapacke_zlaset.c
index e0973be12c..80f426ce2d 100644
--- a/LAPACKE/src/lapacke_zlaset.c
+++ b/LAPACKE/src/lapacke_zlaset.c
@@ -32,14 +32,14 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlaset( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zlaset)( int matrix_layout, char uplo, lapack_int m,
                            lapack_int n, lapack_complex_double alpha,
                            lapack_complex_double beta, lapack_complex_double* a,
                            lapack_int lda )
 {
 
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlaset", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlaset", -1 );
         return -1;
     }
 
@@ -52,14 +52,14 @@ lapack_int LAPACKE_zlaset( int matrix_layout, char uplo, lapack_int m,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_z_nancheck( 1, &alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( 1, &alpha, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_z_nancheck( 1, &beta, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( 1, &beta, 1 ) ) {
             return -6;
         }
     }
 #endif
 
-    return LAPACKE_zlaset_work( matrix_layout, uplo, m, n, alpha, beta, a, lda );
+    return API_SUFFIX(LAPACKE_zlaset_work)( matrix_layout, uplo, m, n, alpha, beta, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_zlaset_work.c b/LAPACKE/src/lapacke_zlaset_work.c
index 62b6b59a11..b6e2027cb3 100644
--- a/LAPACKE/src/lapacke_zlaset_work.c
+++ b/LAPACKE/src/lapacke_zlaset_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlaset_work( int matrix_layout, char uplo, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zlaset_work)( int matrix_layout, char uplo, lapack_int m,
                                 lapack_int n, lapack_complex_double alpha,
                                 lapack_complex_double beta,
                                 lapack_complex_double* a, lapack_int lda )
@@ -47,7 +47,7 @@ lapack_int LAPACKE_zlaset_work( int matrix_layout, char uplo, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zlaset_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlaset_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -58,21 +58,21 @@ lapack_int LAPACKE_zlaset_work( int matrix_layout, char uplo, lapack_int m,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zlaset( &uplo, &m, &n, &alpha, &beta, a_t, &lda_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlaset_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlaset_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlaset_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlaset_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlassq.c b/LAPACKE/src/lapacke_zlassq.c
index 3b68d12ccc..f4d2aa6c08 100644
--- a/LAPACKE/src/lapacke_zlassq.c
+++ b/LAPACKE/src/lapacke_zlassq.c
@@ -32,22 +32,22 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlassq( lapack_int n, lapack_complex_double* x,
+lapack_int API_SUFFIX(LAPACKE_zlassq)( lapack_int n, const lapack_complex_double* x,
                            lapack_int incx, double* scale, double* sumsq )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input vector `x` and in/out scalars `scale` and `sumsq` for NaNs */
-        if( LAPACKE_z_nancheck( n, x, incx ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n, x, incx ) ) {
             return -2;
         }
-        if( LAPACKE_d_nancheck( 1, scale, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, scale, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( 1, sumsq, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, sumsq, 1 ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_zlassq_work( n, x, incx, scale, sumsq );
+    return API_SUFFIX(LAPACKE_zlassq_work)( n, x, incx, scale, sumsq );
 }
diff --git a/LAPACKE/src/lapacke_zlassq_work.c b/LAPACKE/src/lapacke_zlassq_work.c
index 625844de72..c425a291b6 100644
--- a/LAPACKE/src/lapacke_zlassq_work.c
+++ b/LAPACKE/src/lapacke_zlassq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlassq_work( lapack_int n, lapack_complex_double* x,
+lapack_int API_SUFFIX(LAPACKE_zlassq_work)( lapack_int n, const lapack_complex_double* x,
                                 lapack_int incx, double* scale, double* sumsq )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_zlaswp.c b/LAPACKE/src/lapacke_zlaswp.c
index e166400b01..654400edbd 100644
--- a/LAPACKE/src/lapacke_zlaswp.c
+++ b/LAPACKE/src/lapacke_zlaswp.c
@@ -32,13 +32,13 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlaswp( int matrix_layout, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zlaswp)( int matrix_layout, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_int k1, lapack_int k2, const lapack_int* ipiv,
                            lapack_int incx )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlaswp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlaswp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
@@ -48,15 +48,15 @@ lapack_int LAPACKE_zlaswp( int matrix_layout, lapack_int n,
     *      Disable the check as is below, the check below was checking for NaN
     *      from lda to n since there is no (obvious) way to knowing m. This is not
     *      a good idea. We could get a lower bound of m by scanning from ipiv. Or
-    *      we could pass on the NaN check to LAPACKE_dlaswp_work. For now disable
+    *      we could pass on the NaN check to API_SUFFIX(LAPACKE_dlaswp_work). For now disable
     *      the buggy Nan check.
     *      See forum: http://icl.cs.utk.edu/lapack-forum/viewtopic.php?t=4827
     *****************************************************************************/
-    /*  if( LAPACKE_zge_nancheck( matrix_layout, lda, n, a, lda ) ) {
+    /*  if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, lda, n, a, lda ) ) {
     *       return -3;
     *   }
     */
     }
 #endif
-    return LAPACKE_zlaswp_work( matrix_layout, n, a, lda, k1, k2, ipiv, incx );
+    return API_SUFFIX(LAPACKE_zlaswp_work)( matrix_layout, n, a, lda, k1, k2, ipiv, incx );
 }
diff --git a/LAPACKE/src/lapacke_zlaswp_work.c b/LAPACKE/src/lapacke_zlaswp_work.c
index 573fe9e9b5..76d21b33d2 100644
--- a/LAPACKE/src/lapacke_zlaswp_work.c
+++ b/LAPACKE/src/lapacke_zlaswp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlaswp_work( int matrix_layout, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zlaswp_work)( int matrix_layout, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_int k1, lapack_int k2,
                                 const lapack_int* ipiv, lapack_int incx )
@@ -54,7 +54,7 @@ lapack_int LAPACKE_zlaswp_work( int matrix_layout, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -4;
-            LAPACKE_xerbla( "LAPACKE_zlaswp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlaswp_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -65,21 +65,21 @@ lapack_int LAPACKE_zlaswp_work( int matrix_layout, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, lda_t, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, lda_t, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zlaswp( &n, a_t, &lda_t, &k1, &k2, ipiv, &incx );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, lda_t, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, lda_t, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlaswp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlaswp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlaswp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlaswp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlatms.c b/LAPACKE/src/lapacke_zlatms.c
index c5fc346b67..5fa3d0dc4c 100644
--- a/LAPACKE/src/lapacke_zlatms.c
+++ b/LAPACKE/src/lapacke_zlatms.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlatms( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zlatms)( int matrix_layout, lapack_int m, lapack_int n,
                            char dist, lapack_int* iseed, char sym, double* d,
                            lapack_int mode, double cond, double dmax,
                            lapack_int kl, lapack_int ku, char pack,
@@ -41,22 +41,22 @@ lapack_int LAPACKE_zlatms( int matrix_layout, lapack_int m, lapack_int n,
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlatms", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlatms", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -14;
         }
-        if( LAPACKE_d_nancheck( 1, &cond, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &cond, 1 ) ) {
             return -9;
         }
-        if( LAPACKE_d_nancheck( MIN(n,m), d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( MIN(n,m), d, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &dmax, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &dmax, 1 ) ) {
             return -10;
         }
     }
@@ -69,13 +69,13 @@ lapack_int LAPACKE_zlatms( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zlatms_work( matrix_layout, m, n, dist, iseed, sym, d, mode,
+    info = API_SUFFIX(LAPACKE_zlatms_work)( matrix_layout, m, n, dist, iseed, sym, d, mode,
                                 cond, dmax, kl, ku, pack, a, lda, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zlatms", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlatms", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlatms_work.c b/LAPACKE/src/lapacke_zlatms_work.c
index 1677896bee..0576a1aaf2 100644
--- a/LAPACKE/src/lapacke_zlatms_work.c
+++ b/LAPACKE/src/lapacke_zlatms_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlatms_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zlatms_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 char dist, lapack_int* iseed, char sym,
                                 double* d, lapack_int mode, double cond,
                                 double dmax, lapack_int kl, lapack_int ku,
@@ -53,7 +53,7 @@ lapack_int LAPACKE_zlatms_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_zlatms_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlatms_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -64,7 +64,7 @@ lapack_int LAPACKE_zlatms_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zlatms( &m, &n, &dist, iseed, &sym, d, &mode, &cond, &dmax, &kl,
                        &ku, &pack, a_t, &lda_t, work, &info );
@@ -72,16 +72,16 @@ lapack_int LAPACKE_zlatms_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlatms_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlatms_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlatms_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlatms_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zlauum.c b/LAPACKE/src/lapacke_zlauum.c
index 3f081f3c7a..2bbef1365e 100644
--- a/LAPACKE/src/lapacke_zlauum.c
+++ b/LAPACKE/src/lapacke_zlauum.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlauum( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zlauum)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zlauum", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlauum", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zlauum_work( matrix_layout, uplo, n, a, lda );
+    return API_SUFFIX(LAPACKE_zlauum_work)( matrix_layout, uplo, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_zlauum_work.c b/LAPACKE/src/lapacke_zlauum_work.c
index c4e64dfaa7..16d38dd7ac 100644
--- a/LAPACKE/src/lapacke_zlauum_work.c
+++ b/LAPACKE/src/lapacke_zlauum_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zlauum_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zlauum_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_zlauum_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zlauum_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlauum_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_zlauum_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zlauum( &uplo, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zlauum_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlauum_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zlauum_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zlauum_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpbcon.c b/LAPACKE/src/lapacke_zpbcon.c
index fe6f218fdb..3d709fb6fd 100644
--- a/LAPACKE/src/lapacke_zpbcon.c
+++ b/LAPACKE/src/lapacke_zpbcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpbcon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpbcon)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, const lapack_complex_double* ab,
                            lapack_int ldab, double anorm, double* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_zpbcon( int matrix_layout, char uplo, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpbcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -7;
         }
     }
@@ -67,7 +67,7 @@ lapack_int LAPACKE_zpbcon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zpbcon_work( matrix_layout, uplo, n, kd, ab, ldab, anorm,
+    info = API_SUFFIX(LAPACKE_zpbcon_work)( matrix_layout, uplo, n, kd, ab, ldab, anorm,
                                 rcond, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -75,7 +75,7 @@ lapack_int LAPACKE_zpbcon( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zpbcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpbcon_work.c b/LAPACKE/src/lapacke_zpbcon_work.c
index 8d05985a52..2df50ba9fd 100644
--- a/LAPACKE/src/lapacke_zpbcon_work.c
+++ b/LAPACKE/src/lapacke_zpbcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpbcon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpbcon_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, const lapack_complex_double* ab,
                                 lapack_int ldab, double anorm, double* rcond,
                                 lapack_complex_double* work, double* rwork )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zpbcon_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zpbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbcon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -62,7 +62,7 @@ lapack_int LAPACKE_zpbcon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpbcon( &uplo, &n, &kd, ab_t, &ldab_t, &anorm, rcond, work,
                        rwork, &info );
@@ -73,11 +73,11 @@ lapack_int LAPACKE_zpbcon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpbcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpbequ.c b/LAPACKE/src/lapacke_zpbequ.c
index eceb7071d6..fc0a27bd53 100644
--- a/LAPACKE/src/lapacke_zpbequ.c
+++ b/LAPACKE/src/lapacke_zpbequ.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpbequ( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpbequ)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, const lapack_complex_double* ab,
                            lapack_int ldab, double* s, double* scond,
                            double* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpbequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_zpbequ_work( matrix_layout, uplo, n, kd, ab, ldab, s, scond,
+    return API_SUFFIX(LAPACKE_zpbequ_work)( matrix_layout, uplo, n, kd, ab, ldab, s, scond,
                                 amax );
 }
diff --git a/LAPACKE/src/lapacke_zpbequ_work.c b/LAPACKE/src/lapacke_zpbequ_work.c
index 59d9449fe6..fbf1256501 100644
--- a/LAPACKE/src/lapacke_zpbequ_work.c
+++ b/LAPACKE/src/lapacke_zpbequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpbequ_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpbequ_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, const lapack_complex_double* ab,
                                 lapack_int ldab, double* s, double* scond,
                                 double* amax )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zpbequ_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zpbequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbequ_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_zpbequ_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpbequ( &uplo, &n, &kd, ab_t, &ldab_t, s, scond, amax, &info );
         if( info < 0 ) {
@@ -71,11 +71,11 @@ lapack_int LAPACKE_zpbequ_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpbequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpbequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpbrfs.c b/LAPACKE/src/lapacke_zpbrfs.c
index d6702ab239..1b456a8d7b 100644
--- a/LAPACKE/src/lapacke_zpbrfs.c
+++ b/LAPACKE/src/lapacke_zpbrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpbrfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpbrfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, lapack_int nrhs,
                            const lapack_complex_double* ab, lapack_int ldab,
                            const lapack_complex_double* afb, lapack_int ldafb,
@@ -44,22 +44,22 @@ lapack_int LAPACKE_zpbrfs( int matrix_layout, char uplo, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpbrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_zpb_nancheck( matrix_layout, uplo, n, kd, afb, ldafb ) ) {
+        if( API_SUFFIX(LAPACKE_zpb_nancheck)( matrix_layout, uplo, n, kd, afb, ldafb ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -77,7 +77,7 @@ lapack_int LAPACKE_zpbrfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zpbrfs_work( matrix_layout, uplo, n, kd, nrhs, ab, ldab, afb,
+    info = API_SUFFIX(LAPACKE_zpbrfs_work)( matrix_layout, uplo, n, kd, nrhs, ab, ldab, afb,
                                 ldafb, b, ldb, x, ldx, ferr, berr, work,
                                 rwork );
     /* Release memory and exit */
@@ -86,7 +86,7 @@ lapack_int LAPACKE_zpbrfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zpbrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpbrfs_work.c b/LAPACKE/src/lapacke_zpbrfs_work.c
index f5539608e2..2cc2cddaea 100644
--- a/LAPACKE/src/lapacke_zpbrfs_work.c
+++ b/LAPACKE/src/lapacke_zpbrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpbrfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpbrfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, lapack_int nrhs,
                                 const lapack_complex_double* ab,
                                 lapack_int ldab,
@@ -63,22 +63,22 @@ lapack_int LAPACKE_zpbrfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zpbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbrfs_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zpbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zpbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zpbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -110,11 +110,11 @@ lapack_int LAPACKE_zpbrfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        LAPACKE_zpb_trans( matrix_layout, uplo, n, kd, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_zpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zpb_trans)( matrix_layout, uplo, n, kd, afb, ldafb, afb_t,
                            ldafb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpbrfs( &uplo, &n, &kd, &nrhs, ab_t, &ldab_t, afb_t, &ldafb_t,
                        b_t, &ldb_t, x_t, &ldx_t, ferr, berr, work, rwork,
@@ -123,7 +123,7 @@ lapack_int LAPACKE_zpbrfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -134,11 +134,11 @@ lapack_int LAPACKE_zpbrfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpbrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpbstf.c b/LAPACKE/src/lapacke_zpbstf.c
index 32d199b8ff..93fd39b09a 100644
--- a/LAPACKE/src/lapacke_zpbstf.c
+++ b/LAPACKE/src/lapacke_zpbstf.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpbstf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpbstf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kb, lapack_complex_double* bb,
                            lapack_int ldbb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpbstf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbstf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpb_nancheck( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
+        if( API_SUFFIX(LAPACKE_zpb_nancheck)( matrix_layout, uplo, n, kb, bb, ldbb ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_zpbstf_work( matrix_layout, uplo, n, kb, bb, ldbb );
+    return API_SUFFIX(LAPACKE_zpbstf_work)( matrix_layout, uplo, n, kb, bb, ldbb );
 }
diff --git a/LAPACKE/src/lapacke_zpbstf_work.c b/LAPACKE/src/lapacke_zpbstf_work.c
index 50a951a5f5..8b77947b8f 100644
--- a/LAPACKE/src/lapacke_zpbstf_work.c
+++ b/LAPACKE/src/lapacke_zpbstf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpbstf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpbstf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kb, lapack_complex_double* bb,
                                 lapack_int ldbb )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_zpbstf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldbb < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zpbstf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbstf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,24 +60,24 @@ lapack_int LAPACKE_zpbstf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zpb_trans( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
+        API_SUFFIX(LAPACKE_zpb_trans)( matrix_layout, uplo, n, kb, bb, ldbb, bb_t, ldbb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpbstf( &uplo, &n, &kb, bb_t, &ldbb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zpb_trans( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
+        API_SUFFIX(LAPACKE_zpb_trans)( LAPACK_COL_MAJOR, uplo, n, kb, bb_t, ldbb_t, bb,
                            ldbb );
         /* Release memory and exit */
         LAPACKE_free( bb_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpbstf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbstf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpbstf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbstf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpbsv.c b/LAPACKE/src/lapacke_zpbsv.c
index 681f01cdfc..5f673fa44d 100644
--- a/LAPACKE/src/lapacke_zpbsv.c
+++ b/LAPACKE/src/lapacke_zpbsv.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpbsv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpbsv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int kd, lapack_int nrhs,
                           lapack_complex_double* ab, lapack_int ldab,
                           lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpbsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_zpbsv_work( matrix_layout, uplo, n, kd, nrhs, ab, ldab, b,
+    return API_SUFFIX(LAPACKE_zpbsv_work)( matrix_layout, uplo, n, kd, nrhs, ab, ldab, b,
                                ldb );
 }
diff --git a/LAPACKE/src/lapacke_zpbsv_work.c b/LAPACKE/src/lapacke_zpbsv_work.c
index 4625c0e88a..c8ca2d22b2 100644
--- a/LAPACKE/src/lapacke_zpbsv_work.c
+++ b/LAPACKE/src/lapacke_zpbsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpbsv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpbsv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int kd, lapack_int nrhs,
                                lapack_complex_double* ab, lapack_int ldab,
                                lapack_complex_double* b, lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_zpbsv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zpbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbsv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zpbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,8 +75,8 @@ lapack_int LAPACKE_zpbsv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpbsv( &uplo, &n, &kd, &nrhs, ab_t, &ldab_t, b_t, &ldb_t,
                       &info );
@@ -84,20 +84,20 @@ lapack_int LAPACKE_zpbsv_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zpb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_zpb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpbsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpbsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpbsvx.c b/LAPACKE/src/lapacke_zpbsvx.c
index ee5549f657..a1a5be262c 100644
--- a/LAPACKE/src/lapacke_zpbsvx.c
+++ b/LAPACKE/src/lapacke_zpbsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpbsvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpbsvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int kd, lapack_int nrhs,
                            lapack_complex_double* ab, lapack_int ldab,
                            lapack_complex_double* afb, lapack_int ldafb,
@@ -45,25 +45,25 @@ lapack_int LAPACKE_zpbsvx( int matrix_layout, char fact, char uplo, lapack_int n
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpbsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -7;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_zpb_nancheck( matrix_layout, uplo, n, kd, afb, ldafb ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_zpb_nancheck)( matrix_layout, uplo, n, kd, afb, ldafb ) ) {
                 return -9;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            if( LAPACKE_d_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, s, 1 ) ) {
                 return -12;
             }
         }
@@ -82,7 +82,7 @@ lapack_int LAPACKE_zpbsvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zpbsvx_work( matrix_layout, fact, uplo, n, kd, nrhs, ab, ldab,
+    info = API_SUFFIX(LAPACKE_zpbsvx_work)( matrix_layout, fact, uplo, n, kd, nrhs, ab, ldab,
                                 afb, ldafb, equed, s, b, ldb, x, ldx, rcond,
                                 ferr, berr, work, rwork );
     /* Release memory and exit */
@@ -91,7 +91,7 @@ lapack_int LAPACKE_zpbsvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zpbsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpbsvx_work.c b/LAPACKE/src/lapacke_zpbsvx_work.c
index 946f914b46..e382e7022c 100644
--- a/LAPACKE/src/lapacke_zpbsvx_work.c
+++ b/LAPACKE/src/lapacke_zpbsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpbsvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zpbsvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int kd, lapack_int nrhs,
                                 lapack_complex_double* ab, lapack_int ldab,
                                 lapack_complex_double* afb, lapack_int ldafb,
@@ -63,22 +63,22 @@ lapack_int LAPACKE_zpbsvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zpbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbsvx_work", info );
             return info;
         }
         if( ldafb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zpbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbsvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_zpbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_zpbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -110,12 +110,12 @@ lapack_int LAPACKE_zpbsvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_zpb_trans( matrix_layout, uplo, n, kd, afb, ldafb, afb_t,
+        API_SUFFIX(LAPACKE_zpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_zpb_trans)( matrix_layout, uplo, n, kd, afb, ldafb, afb_t,
                                ldafb_t );
         }
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpbsvx( &fact, &uplo, &n, &kd, &nrhs, ab_t, &ldab_t, afb_t,
                        &ldafb_t, equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond,
@@ -124,16 +124,16 @@ lapack_int LAPACKE_zpbsvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_zpb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_zpb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                                ldab );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_zpb_trans( LAPACK_COL_MAJOR, uplo, n, kd, afb_t, ldafb_t,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_zpb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, afb_t, ldafb_t,
                                afb, ldafb );
         }
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -144,11 +144,11 @@ lapack_int LAPACKE_zpbsvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpbsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpbsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpbtrf.c b/LAPACKE/src/lapacke_zpbtrf.c
index 964968e527..825c59cc7e 100644
--- a/LAPACKE/src/lapacke_zpbtrf.c
+++ b/LAPACKE/src/lapacke_zpbtrf.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpbtrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpbtrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, lapack_complex_double* ab,
                            lapack_int ldab )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpbtrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbtrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_zpbtrf_work( matrix_layout, uplo, n, kd, ab, ldab );
+    return API_SUFFIX(LAPACKE_zpbtrf_work)( matrix_layout, uplo, n, kd, ab, ldab );
 }
diff --git a/LAPACKE/src/lapacke_zpbtrf_work.c b/LAPACKE/src/lapacke_zpbtrf_work.c
index 8d47cdb9db..95713cab0c 100644
--- a/LAPACKE/src/lapacke_zpbtrf_work.c
+++ b/LAPACKE/src/lapacke_zpbtrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpbtrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpbtrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, lapack_complex_double* ab,
                                 lapack_int ldab )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_zpbtrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zpbtrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbtrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,24 +60,24 @@ lapack_int LAPACKE_zpbtrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpbtrf( &uplo, &n, &kd, ab_t, &ldab_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zpb_trans( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
+        API_SUFFIX(LAPACKE_zpb_trans)( LAPACK_COL_MAJOR, uplo, n, kd, ab_t, ldab_t, ab,
                            ldab );
         /* Release memory and exit */
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpbtrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbtrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpbtrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbtrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpbtrs.c b/LAPACKE/src/lapacke_zpbtrs.c
index 8c9cda0895..0ccc7a8b00 100644
--- a/LAPACKE/src/lapacke_zpbtrs.c
+++ b/LAPACKE/src/lapacke_zpbtrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpbtrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpbtrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int kd, lapack_int nrhs,
                            const lapack_complex_double* ab, lapack_int ldab,
                            lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpbtrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbtrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpb_nancheck( matrix_layout, uplo, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_zpb_nancheck)( matrix_layout, uplo, n, kd, ab, ldab ) ) {
             return -6;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_zpbtrs_work( matrix_layout, uplo, n, kd, nrhs, ab, ldab, b,
+    return API_SUFFIX(LAPACKE_zpbtrs_work)( matrix_layout, uplo, n, kd, nrhs, ab, ldab, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_zpbtrs_work.c b/LAPACKE/src/lapacke_zpbtrs_work.c
index ebd9943a12..101966b1bf 100644
--- a/LAPACKE/src/lapacke_zpbtrs_work.c
+++ b/LAPACKE/src/lapacke_zpbtrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpbtrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpbtrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int kd, lapack_int nrhs,
                                 const lapack_complex_double* ab,
                                 lapack_int ldab, lapack_complex_double* b,
@@ -53,12 +53,12 @@ lapack_int LAPACKE_zpbtrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zpbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbtrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zpbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbtrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -76,8 +76,8 @@ lapack_int LAPACKE_zpbtrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zpb_trans( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zpb_trans)( matrix_layout, uplo, n, kd, ab, ldab, ab_t, ldab_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpbtrs( &uplo, &n, &kd, &nrhs, ab_t, &ldab_t, b_t, &ldb_t,
                        &info );
@@ -85,18 +85,18 @@ lapack_int LAPACKE_zpbtrs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbtrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpbtrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpbtrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpftrf.c b/LAPACKE/src/lapacke_zpftrf.c
index 4fd8523d72..4503697f89 100644
--- a/LAPACKE/src/lapacke_zpftrf.c
+++ b/LAPACKE/src/lapacke_zpftrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpftrf( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zpftrf)( int matrix_layout, char transr, char uplo,
                            lapack_int n, lapack_complex_double* a )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpftrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpftrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpf_nancheck( n, a ) ) {
+        if( API_SUFFIX(LAPACKE_zpf_nancheck)( n, a ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_zpftrf_work( matrix_layout, transr, uplo, n, a );
+    return API_SUFFIX(LAPACKE_zpftrf_work)( matrix_layout, transr, uplo, n, a );
 }
diff --git a/LAPACKE/src/lapacke_zpftrf_work.c b/LAPACKE/src/lapacke_zpftrf_work.c
index 489da172c0..efc780cc47 100644
--- a/LAPACKE/src/lapacke_zpftrf_work.c
+++ b/LAPACKE/src/lapacke_zpftrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpftrf_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zpftrf_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, lapack_complex_double* a )
 {
     lapack_int info = 0;
@@ -53,23 +53,23 @@ lapack_int LAPACKE_zpftrf_work( int matrix_layout, char transr, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zpf_trans( matrix_layout, transr, uplo, n, a, a_t );
+        API_SUFFIX(LAPACKE_zpf_trans)( matrix_layout, transr, uplo, n, a, a_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpftrf( &transr, &uplo, &n, a_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zpf_trans( LAPACK_COL_MAJOR, transr, uplo, n, a_t, a );
+        API_SUFFIX(LAPACKE_zpf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, a_t, a );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpftrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpftrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpftrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpftrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpftri.c b/LAPACKE/src/lapacke_zpftri.c
index 6e814d7d3e..d57b698f50 100644
--- a/LAPACKE/src/lapacke_zpftri.c
+++ b/LAPACKE/src/lapacke_zpftri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpftri( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zpftri)( int matrix_layout, char transr, char uplo,
                            lapack_int n, lapack_complex_double* a )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpftri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpftri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpf_nancheck( n, a ) ) {
+        if( API_SUFFIX(LAPACKE_zpf_nancheck)( n, a ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_zpftri_work( matrix_layout, transr, uplo, n, a );
+    return API_SUFFIX(LAPACKE_zpftri_work)( matrix_layout, transr, uplo, n, a );
 }
diff --git a/LAPACKE/src/lapacke_zpftri_work.c b/LAPACKE/src/lapacke_zpftri_work.c
index c4bc00b8de..f7038632dc 100644
--- a/LAPACKE/src/lapacke_zpftri_work.c
+++ b/LAPACKE/src/lapacke_zpftri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpftri_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zpftri_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, lapack_complex_double* a )
 {
     lapack_int info = 0;
@@ -53,23 +53,23 @@ lapack_int LAPACKE_zpftri_work( int matrix_layout, char transr, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zpf_trans( matrix_layout, transr, uplo, n, a, a_t );
+        API_SUFFIX(LAPACKE_zpf_trans)( matrix_layout, transr, uplo, n, a, a_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpftri( &transr, &uplo, &n, a_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zpf_trans( LAPACK_COL_MAJOR, transr, uplo, n, a_t, a );
+        API_SUFFIX(LAPACKE_zpf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, a_t, a );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpftri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpftri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpftri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpftri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpftrs.c b/LAPACKE/src/lapacke_zpftrs.c
index 824aab248f..42d0324dd9 100644
--- a/LAPACKE/src/lapacke_zpftrs.c
+++ b/LAPACKE/src/lapacke_zpftrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpftrs( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zpftrs)( int matrix_layout, char transr, char uplo,
                            lapack_int n, lapack_int nrhs,
                            const lapack_complex_double* a,
                            lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpftrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpftrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpf_nancheck( n, a ) ) {
+        if( API_SUFFIX(LAPACKE_zpf_nancheck)( n, a ) ) {
             return -6;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_zpftrs_work( matrix_layout, transr, uplo, n, nrhs, a, b,
+    return API_SUFFIX(LAPACKE_zpftrs_work)( matrix_layout, transr, uplo, n, nrhs, a, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_zpftrs_work.c b/LAPACKE/src/lapacke_zpftrs_work.c
index 5aaf0f5c1c..422d4801a4 100644
--- a/LAPACKE/src/lapacke_zpftrs_work.c
+++ b/LAPACKE/src/lapacke_zpftrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpftrs_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zpftrs_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, lapack_int nrhs,
                                 const lapack_complex_double* a,
                                 lapack_complex_double* b, lapack_int ldb )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zpftrs_work( int matrix_layout, char transr, char uplo,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zpftrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpftrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,26 +70,26 @@ lapack_int LAPACKE_zpftrs_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zpf_trans( matrix_layout, transr, uplo, n, a, a_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zpf_trans)( matrix_layout, transr, uplo, n, a, a_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpftrs( &transr, &uplo, &n, &nrhs, a_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpftrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpftrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpftrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpftrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpocon.c b/LAPACKE/src/lapacke_zpocon.c
index fb676a767f..cba501bda9 100644
--- a/LAPACKE/src/lapacke_zpocon.c
+++ b/LAPACKE/src/lapacke_zpocon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpocon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpocon)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda,
                            double anorm, double* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_zpocon( int matrix_layout, char uplo, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpocon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpocon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -6;
         }
     }
@@ -67,7 +67,7 @@ lapack_int LAPACKE_zpocon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zpocon_work( matrix_layout, uplo, n, a, lda, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_zpocon_work)( matrix_layout, uplo, n, a, lda, anorm, rcond,
                                 work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -75,7 +75,7 @@ lapack_int LAPACKE_zpocon( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zpocon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpocon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpocon_work.c b/LAPACKE/src/lapacke_zpocon_work.c
index 558b99d039..09f528bd6e 100644
--- a/LAPACKE/src/lapacke_zpocon_work.c
+++ b/LAPACKE/src/lapacke_zpocon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpocon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpocon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_double* a, lapack_int lda,
                                 double anorm, double* rcond,
                                 lapack_complex_double* work, double* rwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zpocon_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zpocon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpocon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_zpocon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpocon( &uplo, &n, a_t, &lda_t, &anorm, rcond, work, rwork,
                        &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_zpocon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpocon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpocon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpocon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpocon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpoequ.c b/LAPACKE/src/lapacke_zpoequ.c
index 4fc645abe6..07ce40f177 100644
--- a/LAPACKE/src/lapacke_zpoequ.c
+++ b/LAPACKE/src/lapacke_zpoequ.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpoequ( int matrix_layout, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpoequ)( int matrix_layout, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda,
                            double* s, double* scond, double* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpoequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpoequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_zpoequ_work( matrix_layout, n, a, lda, s, scond, amax );
+    return API_SUFFIX(LAPACKE_zpoequ_work)( matrix_layout, n, a, lda, s, scond, amax );
 }
diff --git a/LAPACKE/src/lapacke_zpoequ_work.c b/LAPACKE/src/lapacke_zpoequ_work.c
index b1daf19216..2bb8f177fd 100644
--- a/LAPACKE/src/lapacke_zpoequ_work.c
+++ b/LAPACKE/src/lapacke_zpoequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpoequ_work( int matrix_layout, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpoequ_work)( int matrix_layout, lapack_int n,
                                 const lapack_complex_double* a, lapack_int lda,
                                 double* s, double* scond, double* amax )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_zpoequ_work( int matrix_layout, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -4;
-            LAPACKE_xerbla( "LAPACKE_zpoequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpoequ_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,7 +60,7 @@ lapack_int LAPACKE_zpoequ_work( int matrix_layout, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpoequ( &n, a_t, &lda_t, s, scond, amax, &info );
         if( info < 0 ) {
@@ -70,11 +70,11 @@ lapack_int LAPACKE_zpoequ_work( int matrix_layout, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpoequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpoequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpoequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpoequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpoequb.c b/LAPACKE/src/lapacke_zpoequb.c
index bacffa4bc8..84e0fc025f 100644
--- a/LAPACKE/src/lapacke_zpoequb.c
+++ b/LAPACKE/src/lapacke_zpoequb.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpoequb( int matrix_layout, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpoequb)( int matrix_layout, lapack_int n,
                             const lapack_complex_double* a, lapack_int lda,
                             double* s, double* scond, double* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpoequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpoequb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_zpoequb_work( matrix_layout, n, a, lda, s, scond, amax );
+    return API_SUFFIX(LAPACKE_zpoequb_work)( matrix_layout, n, a, lda, s, scond, amax );
 }
diff --git a/LAPACKE/src/lapacke_zpoequb_work.c b/LAPACKE/src/lapacke_zpoequb_work.c
index a7c68feffb..1355a0e203 100644
--- a/LAPACKE/src/lapacke_zpoequb_work.c
+++ b/LAPACKE/src/lapacke_zpoequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpoequb_work( int matrix_layout, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpoequb_work)( int matrix_layout, lapack_int n,
                                  const lapack_complex_double* a, lapack_int lda,
                                  double* s, double* scond, double* amax )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_zpoequb_work( int matrix_layout, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -4;
-            LAPACKE_xerbla( "LAPACKE_zpoequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpoequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,7 +60,7 @@ lapack_int LAPACKE_zpoequb_work( int matrix_layout, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpoequb( &n, a_t, &lda_t, s, scond, amax, &info );
         if( info < 0 ) {
@@ -70,11 +70,11 @@ lapack_int LAPACKE_zpoequb_work( int matrix_layout, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpoequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpoequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpoequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpoequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zporfs.c b/LAPACKE/src/lapacke_zporfs.c
index abcb405dbd..df6f7b490e 100644
--- a/LAPACKE/src/lapacke_zporfs.c
+++ b/LAPACKE/src/lapacke_zporfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zporfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zporfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* a,
                            lapack_int lda, const lapack_complex_double* af,
                            lapack_int ldaf, const lapack_complex_double* b,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_zporfs( int matrix_layout, char uplo, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zporfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zporfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zpo_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_zpo_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -11;
         }
     }
@@ -76,7 +76,7 @@ lapack_int LAPACKE_zporfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zporfs_work( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
+    info = API_SUFFIX(LAPACKE_zporfs_work)( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
                                 b, ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -84,7 +84,7 @@ lapack_int LAPACKE_zporfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zporfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zporfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zporfs_work.c b/LAPACKE/src/lapacke_zporfs_work.c
index 4717b5ba38..ac1bcb7a82 100644
--- a/LAPACKE/src/lapacke_zporfs_work.c
+++ b/LAPACKE/src/lapacke_zporfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zporfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zporfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_double* a,
                                 lapack_int lda, const lapack_complex_double* af,
                                 lapack_int ldaf, const lapack_complex_double* b,
@@ -60,22 +60,22 @@ lapack_int LAPACKE_zporfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zporfs_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zporfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zporfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zporfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -106,10 +106,10 @@ lapack_int LAPACKE_zporfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zpo_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zpo_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zporfs( &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, rwork, &info );
@@ -117,7 +117,7 @@ lapack_int LAPACKE_zporfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -128,11 +128,11 @@ lapack_int LAPACKE_zporfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zporfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zporfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zporfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zporfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zporfsx.c b/LAPACKE/src/lapacke_zporfsx.c
index d27145f371..5f253a4296 100644
--- a/LAPACKE/src/lapacke_zporfsx.c
+++ b/LAPACKE/src/lapacke_zporfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zporfsx( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_zporfsx)( int matrix_layout, char uplo, char equed,
                             lapack_int n, lapack_int nrhs,
                             const lapack_complex_double* a, lapack_int lda,
                             const lapack_complex_double* af, lapack_int ldaf,
@@ -47,32 +47,32 @@ lapack_int LAPACKE_zporfsx( int matrix_layout, char uplo, char equed,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zporfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zporfsx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -21;
             }
         }
-        if( LAPACKE_lsame( equed, 'y' ) ) {
-            if( LAPACKE_d_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, s, 1 ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -13;
         }
     }
@@ -90,7 +90,7 @@ lapack_int LAPACKE_zporfsx( int matrix_layout, char uplo, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zporfsx_work( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_zporfsx_work)( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
                                  ldaf, s, b, ldb, x, ldx, rcond, berr,
                                  n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, rwork );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_zporfsx( int matrix_layout, char uplo, char equed,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zporfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zporfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zporfsx_work.c b/LAPACKE/src/lapacke_zporfsx_work.c
index f6f4a606cb..f71cf47fdb 100644
--- a/LAPACKE/src/lapacke_zporfsx_work.c
+++ b/LAPACKE/src/lapacke_zporfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zporfsx_work( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_zporfsx_work)( int matrix_layout, char uplo, char equed,
                                  lapack_int n, lapack_int nrhs,
                                  const lapack_complex_double* a, lapack_int lda,
                                  const lapack_complex_double* af,
@@ -68,22 +68,22 @@ lapack_int LAPACKE_zporfsx_work( int matrix_layout, char uplo, char equed,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zporfsx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zporfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zporfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_zporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zporfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -126,10 +126,10 @@ lapack_int LAPACKE_zporfsx_work( int matrix_layout, char uplo, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zporfsx( &uplo, &equed, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, s,
                         b_t, &ldb_t, x_t, &ldx_t, rcond, berr, &n_err_bnds,
@@ -139,10 +139,10 @@ lapack_int LAPACKE_zporfsx_work( int matrix_layout, char uplo, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -158,11 +158,11 @@ lapack_int LAPACKE_zporfsx_work( int matrix_layout, char uplo, char equed,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zporfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zporfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zporfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zporfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zposv.c b/LAPACKE/src/lapacke_zposv.c
index 5f52c3fff6..d3e5ffe922 100644
--- a/LAPACKE/src/lapacke_zposv.c
+++ b/LAPACKE/src/lapacke_zposv.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zposv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zposv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_double* a,
                           lapack_int lda, lapack_complex_double* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zposv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_zposv_work( matrix_layout, uplo, n, nrhs, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_zposv_work)( matrix_layout, uplo, n, nrhs, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zposv_work.c b/LAPACKE/src/lapacke_zposv_work.c
index 350cf575c0..b990b5f1b2 100644
--- a/LAPACKE/src/lapacke_zposv_work.c
+++ b/LAPACKE/src/lapacke_zposv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zposv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zposv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_double* a,
                                lapack_int lda, lapack_complex_double* b,
                                lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_zposv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,27 +75,27 @@ lapack_int LAPACKE_zposv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zposv( &uplo, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zposv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zposv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zposvx.c b/LAPACKE/src/lapacke_zposvx.c
index 256b116322..9cf2519d03 100644
--- a/LAPACKE/src/lapacke_zposvx.c
+++ b/LAPACKE/src/lapacke_zposvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zposvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zposvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* af,
                            lapack_int ldaf, char* equed, double* s,
@@ -44,25 +44,25 @@ lapack_int LAPACKE_zposvx( int matrix_layout, char fact, char uplo, lapack_int n
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zposvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_zpo_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_zpo_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            if( LAPACKE_d_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, s, 1 ) ) {
                 return -11;
             }
         }
@@ -81,7 +81,7 @@ lapack_int LAPACKE_zposvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zposvx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_zposvx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                 ldaf, equed, s, b, ldb, x, ldx, rcond, ferr,
                                 berr, work, rwork );
     /* Release memory and exit */
@@ -90,7 +90,7 @@ lapack_int LAPACKE_zposvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zposvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zposvx_work.c b/LAPACKE/src/lapacke_zposvx_work.c
index 227109c102..e1b6b580d6 100644
--- a/LAPACKE/src/lapacke_zposvx_work.c
+++ b/LAPACKE/src/lapacke_zposvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zposvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zposvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* af, lapack_int ldaf,
@@ -62,22 +62,22 @@ lapack_int LAPACKE_zposvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposvx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_zposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -108,11 +108,11 @@ lapack_int LAPACKE_zposvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_zpo_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_zpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_zpo_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zposvx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                        equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr, berr,
@@ -121,15 +121,15 @@ lapack_int LAPACKE_zposvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_zpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_zpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_zpo_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_zpo_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -140,11 +140,11 @@ lapack_int LAPACKE_zposvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zposvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zposvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zposvxx.c b/LAPACKE/src/lapacke_zposvxx.c
index 842dbf4ba0..8d5c3d7019 100644
--- a/LAPACKE/src/lapacke_zposvxx.c
+++ b/LAPACKE/src/lapacke_zposvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zposvxx( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zposvxx)( int matrix_layout, char fact, char uplo,
                             lapack_int n, lapack_int nrhs,
                             lapack_complex_double* a, lapack_int lda,
                             lapack_complex_double* af, lapack_int ldaf,
@@ -47,30 +47,30 @@ lapack_int LAPACKE_zposvxx( int matrix_layout, char fact, char uplo,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zposvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposvxx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_zpo_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_zpo_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -23;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            if( LAPACKE_d_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, s, 1 ) ) {
                 return -11;
             }
         }
@@ -89,7 +89,7 @@ lapack_int LAPACKE_zposvxx( int matrix_layout, char fact, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zposvxx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_zposvxx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                  ldaf, equed, s, b, ldb, x, ldx, rcond, rpvgrw,
                                  berr, n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, rwork );
@@ -99,7 +99,7 @@ lapack_int LAPACKE_zposvxx( int matrix_layout, char fact, char uplo,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zposvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zposvxx_work.c b/LAPACKE/src/lapacke_zposvxx_work.c
index 1b2d3df52b..4c932b45dc 100644
--- a/LAPACKE/src/lapacke_zposvxx_work.c
+++ b/LAPACKE/src/lapacke_zposvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zposvxx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zposvxx_work)( int matrix_layout, char fact, char uplo,
                                  lapack_int n, lapack_int nrhs,
                                  lapack_complex_double* a, lapack_int lda,
                                  lapack_complex_double* af, lapack_int ldaf,
@@ -69,22 +69,22 @@ lapack_int LAPACKE_zposvxx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposvxx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_zposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -127,11 +127,11 @@ lapack_int LAPACKE_zposvxx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_zpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_zpo_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_zpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_zpo_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zposvxx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond, rpvgrw, berr,
@@ -141,18 +141,18 @@ lapack_int LAPACKE_zposvxx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_zpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_zpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_zpo_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_zpo_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -168,11 +168,11 @@ lapack_int LAPACKE_zposvxx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zposvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zposvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zposvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpotrf.c b/LAPACKE/src/lapacke_zpotrf.c
index eef672e917..0e100c62a9 100644
--- a/LAPACKE/src/lapacke_zpotrf.c
+++ b/LAPACKE/src/lapacke_zpotrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpotrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpotrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpotrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpotrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zpotrf_work( matrix_layout, uplo, n, a, lda );
+    return API_SUFFIX(LAPACKE_zpotrf_work)( matrix_layout, uplo, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_zpotrf2.c b/LAPACKE/src/lapacke_zpotrf2.c
index 0aee853387..aaec221d46 100644
--- a/LAPACKE/src/lapacke_zpotrf2.c
+++ b/LAPACKE/src/lapacke_zpotrf2.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpotrf2( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpotrf2)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpotrf2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpotrf2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zpotrf2_work( matrix_layout, uplo, n, a, lda );
+    return API_SUFFIX(LAPACKE_zpotrf2_work)( matrix_layout, uplo, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_zpotrf2_work.c b/LAPACKE/src/lapacke_zpotrf2_work.c
index e0cf84abe0..60300e5fc6 100644
--- a/LAPACKE/src/lapacke_zpotrf2_work.c
+++ b/LAPACKE/src/lapacke_zpotrf2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpotrf2_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpotrf2_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_zpotrf2_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zpotrf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpotrf2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_zpotrf2_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpotrf2( &uplo, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpotrf2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpotrf2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpotrf2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpotrf2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpotrf_work.c b/LAPACKE/src/lapacke_zpotrf_work.c
index 1d4c6990cd..a490213a9a 100644
--- a/LAPACKE/src/lapacke_zpotrf_work.c
+++ b/LAPACKE/src/lapacke_zpotrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpotrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpotrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_zpotrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zpotrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpotrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_zpotrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpotrf( &uplo, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpotrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpotrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpotrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpotrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpotri.c b/LAPACKE/src/lapacke_zpotri.c
index 05ff05eeb2..9af91455a4 100644
--- a/LAPACKE/src/lapacke_zpotri.c
+++ b/LAPACKE/src/lapacke_zpotri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpotri( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpotri)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpotri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpotri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zpotri_work( matrix_layout, uplo, n, a, lda );
+    return API_SUFFIX(LAPACKE_zpotri_work)( matrix_layout, uplo, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_zpotri_work.c b/LAPACKE/src/lapacke_zpotri_work.c
index fe30a7d3cf..f98a8467f2 100644
--- a/LAPACKE/src/lapacke_zpotri_work.c
+++ b/LAPACKE/src/lapacke_zpotri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpotri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpotri_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda )
 {
     lapack_int info = 0;
@@ -48,7 +48,7 @@ lapack_int LAPACKE_zpotri_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zpotri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpotri_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -59,23 +59,23 @@ lapack_int LAPACKE_zpotri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpotri( &uplo, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpotri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpotri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpotri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpotri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpotrs.c b/LAPACKE/src/lapacke_zpotrs.c
index 797153256d..a2a8628348 100644
--- a/LAPACKE/src/lapacke_zpotrs.c
+++ b/LAPACKE/src/lapacke_zpotrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpotrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpotrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpotrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpotrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_zpotrs_work( matrix_layout, uplo, n, nrhs, a, lda, b, ldb );
+    return API_SUFFIX(LAPACKE_zpotrs_work)( matrix_layout, uplo, n, nrhs, a, lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zpotrs_work.c b/LAPACKE/src/lapacke_zpotrs_work.c
index abfbf98ea6..d6e43a69c4 100644
--- a/LAPACKE/src/lapacke_zpotrs_work.c
+++ b/LAPACKE/src/lapacke_zpotrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpotrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpotrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_double* a,
                                 lapack_int lda, lapack_complex_double* b,
                                 lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_zpotrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zpotrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpotrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zpotrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpotrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,26 +75,26 @@ lapack_int LAPACKE_zpotrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpotrs( &uplo, &n, &nrhs, a_t, &lda_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpotrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpotrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpotrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpotrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zppcon.c b/LAPACKE/src/lapacke_zppcon.c
index 285be70c30..4aba6651c3 100644
--- a/LAPACKE/src/lapacke_zppcon.c
+++ b/LAPACKE/src/lapacke_zppcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zppcon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zppcon)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_double* ap, double anorm,
                            double* rcond )
 {
@@ -40,16 +40,16 @@ lapack_int LAPACKE_zppcon( int matrix_layout, char uplo, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zppcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zppcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_zpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zpp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
@@ -67,7 +67,7 @@ lapack_int LAPACKE_zppcon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zppcon_work( matrix_layout, uplo, n, ap, anorm, rcond, work,
+    info = API_SUFFIX(LAPACKE_zppcon_work)( matrix_layout, uplo, n, ap, anorm, rcond, work,
                                 rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -75,7 +75,7 @@ lapack_int LAPACKE_zppcon( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zppcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zppcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zppcon_work.c b/LAPACKE/src/lapacke_zppcon_work.c
index eb4d7856bd..390feff62a 100644
--- a/LAPACKE/src/lapacke_zppcon_work.c
+++ b/LAPACKE/src/lapacke_zppcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zppcon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zppcon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_double* ap, double anorm,
                                 double* rcond, lapack_complex_double* work,
                                 double* rwork )
@@ -55,7 +55,7 @@ lapack_int LAPACKE_zppcon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zppcon( &uplo, &n, ap_t, &anorm, rcond, work, rwork, &info );
         if( info < 0 ) {
@@ -65,11 +65,11 @@ lapack_int LAPACKE_zppcon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zppcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zppcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zppcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zppcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zppequ.c b/LAPACKE/src/lapacke_zppequ.c
index 1e333d5d59..1a31f832b0 100644
--- a/LAPACKE/src/lapacke_zppequ.c
+++ b/LAPACKE/src/lapacke_zppequ.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zppequ( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zppequ)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_double* ap, double* s,
                            double* scond, double* amax )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zppequ", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zppequ", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zpp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zppequ_work( matrix_layout, uplo, n, ap, s, scond, amax );
+    return API_SUFFIX(LAPACKE_zppequ_work)( matrix_layout, uplo, n, ap, s, scond, amax );
 }
diff --git a/LAPACKE/src/lapacke_zppequ_work.c b/LAPACKE/src/lapacke_zppequ_work.c
index bf14edd174..e4398b4e28 100644
--- a/LAPACKE/src/lapacke_zppequ_work.c
+++ b/LAPACKE/src/lapacke_zppequ_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zppequ_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zppequ_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_double* ap, double* s,
                                 double* scond, double* amax )
 {
@@ -54,7 +54,7 @@ lapack_int LAPACKE_zppequ_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zppequ( &uplo, &n, ap_t, s, scond, amax, &info );
         if( info < 0 ) {
@@ -64,11 +64,11 @@ lapack_int LAPACKE_zppequ_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zppequ_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zppequ_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zppequ_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zppequ_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpprfs.c b/LAPACKE/src/lapacke_zpprfs.c
index 11f501b041..c8b891f87b 100644
--- a/LAPACKE/src/lapacke_zpprfs.c
+++ b/LAPACKE/src/lapacke_zpprfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpprfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpprfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* ap,
                            const lapack_complex_double* afp,
                            const lapack_complex_double* b, lapack_int ldb,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_zpprfs( int matrix_layout, char uplo, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpprfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpprfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_zpp_nancheck)( n, afp ) ) {
             return -6;
         }
-        if( LAPACKE_zpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zpp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -9;
         }
     }
@@ -76,7 +76,7 @@ lapack_int LAPACKE_zpprfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zpprfs_work( matrix_layout, uplo, n, nrhs, ap, afp, b, ldb, x,
+    info = API_SUFFIX(LAPACKE_zpprfs_work)( matrix_layout, uplo, n, nrhs, ap, afp, b, ldb, x,
                                 ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -84,7 +84,7 @@ lapack_int LAPACKE_zpprfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zpprfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpprfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpprfs_work.c b/LAPACKE/src/lapacke_zpprfs_work.c
index 1393d5d0ef..4709ae68a5 100644
--- a/LAPACKE/src/lapacke_zpprfs_work.c
+++ b/LAPACKE/src/lapacke_zpprfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpprfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpprfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs,
                                 const lapack_complex_double* ap,
                                 const lapack_complex_double* afp,
@@ -59,12 +59,12 @@ lapack_int LAPACKE_zpprfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zpprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpprfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zpprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpprfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -97,10 +97,10 @@ lapack_int LAPACKE_zpprfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
-        LAPACKE_zpp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_zpp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zpp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zpp_trans)( matrix_layout, uplo, n, afp, afp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpprfs( &uplo, &n, &nrhs, ap_t, afp_t, b_t, &ldb_t, x_t, &ldx_t,
                        ferr, berr, work, rwork, &info );
@@ -108,7 +108,7 @@ lapack_int LAPACKE_zpprfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( afp_t );
 exit_level_3:
@@ -119,11 +119,11 @@ lapack_int LAPACKE_zpprfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpprfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpprfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpprfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zppsv.c b/LAPACKE/src/lapacke_zppsv.c
index c4073fe792..e299106864 100644
--- a/LAPACKE/src/lapacke_zppsv.c
+++ b/LAPACKE/src/lapacke_zppsv.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zppsv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zppsv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_double* ap,
                           lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zppsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zppsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zpp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_zppsv_work( matrix_layout, uplo, n, nrhs, ap, b, ldb );
+    return API_SUFFIX(LAPACKE_zppsv_work)( matrix_layout, uplo, n, nrhs, ap, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zppsv_work.c b/LAPACKE/src/lapacke_zppsv_work.c
index 93e740ae33..1a67f1da23 100644
--- a/LAPACKE/src/lapacke_zppsv_work.c
+++ b/LAPACKE/src/lapacke_zppsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zppsv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zppsv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_double* ap,
                                lapack_complex_double* b, lapack_int ldb )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zppsv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zppsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zppsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -69,27 +69,27 @@ lapack_int LAPACKE_zppsv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zppsv( &uplo, &n, &nrhs, ap_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_zpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zppsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zppsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zppsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zppsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zppsvx.c b/LAPACKE/src/lapacke_zppsvx.c
index 0bf8297526..0842f30249 100644
--- a/LAPACKE/src/lapacke_zppsvx.c
+++ b/LAPACKE/src/lapacke_zppsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zppsvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zppsvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, lapack_complex_double* ap,
                            lapack_complex_double* afp, char* equed, double* s,
                            lapack_complex_double* b, lapack_int ldb,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_zppsvx( int matrix_layout, char fact, char uplo, lapack_int n
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zppsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zppsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_zpp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_zpp_nancheck)( n, afp ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_zpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zpp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            if( LAPACKE_d_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, s, 1 ) ) {
                 return -9;
             }
         }
@@ -80,7 +80,7 @@ lapack_int LAPACKE_zppsvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zppsvx_work( matrix_layout, fact, uplo, n, nrhs, ap, afp,
+    info = API_SUFFIX(LAPACKE_zppsvx_work)( matrix_layout, fact, uplo, n, nrhs, ap, afp,
                                 equed, s, b, ldb, x, ldx, rcond, ferr, berr,
                                 work, rwork );
     /* Release memory and exit */
@@ -89,7 +89,7 @@ lapack_int LAPACKE_zppsvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zppsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zppsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zppsvx_work.c b/LAPACKE/src/lapacke_zppsvx_work.c
index 2ef652358b..437cc90d20 100644
--- a/LAPACKE/src/lapacke_zppsvx_work.c
+++ b/LAPACKE/src/lapacke_zppsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zppsvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zppsvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs,
                                 lapack_complex_double* ap,
                                 lapack_complex_double* afp, char* equed,
@@ -60,12 +60,12 @@ lapack_int LAPACKE_zppsvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zppsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zppsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zppsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zppsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -98,10 +98,10 @@ lapack_int LAPACKE_zppsvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zpp_trans( matrix_layout, uplo, n, ap, ap_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_zpp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zpp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_zpp_trans)( matrix_layout, uplo, n, afp, afp_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_zppsvx( &fact, &uplo, &n, &nrhs, ap_t, afp_t, equed, s, b_t,
@@ -111,13 +111,13 @@ lapack_int LAPACKE_zppsvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_zpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_zpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_zpp_trans( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_zpp_trans)( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
         }
         /* Release memory and exit */
         LAPACKE_free( afp_t );
@@ -129,11 +129,11 @@ lapack_int LAPACKE_zppsvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zppsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zppsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zppsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zppsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpptrf.c b/LAPACKE/src/lapacke_zpptrf.c
index abe8ae40b4..c8c53ef6ba 100644
--- a/LAPACKE/src/lapacke_zpptrf.c
+++ b/LAPACKE/src/lapacke_zpptrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpptrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpptrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpptrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpptrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zpp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zpptrf_work( matrix_layout, uplo, n, ap );
+    return API_SUFFIX(LAPACKE_zpptrf_work)( matrix_layout, uplo, n, ap );
 }
diff --git a/LAPACKE/src/lapacke_zpptrf_work.c b/LAPACKE/src/lapacke_zpptrf_work.c
index 1d6ae2bb1d..504fe22963 100644
--- a/LAPACKE/src/lapacke_zpptrf_work.c
+++ b/LAPACKE/src/lapacke_zpptrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpptrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpptrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* ap )
 {
     lapack_int info = 0;
@@ -53,23 +53,23 @@ lapack_int LAPACKE_zpptrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpptrf( &uplo, &n, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpptrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpptrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpptrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpptrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpptri.c b/LAPACKE/src/lapacke_zpptri.c
index 6e992e5219..1855c0d9f1 100644
--- a/LAPACKE/src/lapacke_zpptri.c
+++ b/LAPACKE/src/lapacke_zpptri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpptri( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpptri)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpptri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpptri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zpp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zpptri_work( matrix_layout, uplo, n, ap );
+    return API_SUFFIX(LAPACKE_zpptri_work)( matrix_layout, uplo, n, ap );
 }
diff --git a/LAPACKE/src/lapacke_zpptri_work.c b/LAPACKE/src/lapacke_zpptri_work.c
index 991d6357b3..9e7b8a6c9e 100644
--- a/LAPACKE/src/lapacke_zpptri_work.c
+++ b/LAPACKE/src/lapacke_zpptri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpptri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpptri_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* ap )
 {
     lapack_int info = 0;
@@ -53,23 +53,23 @@ lapack_int LAPACKE_zpptri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpptri( &uplo, &n, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpptri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpptri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpptri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpptri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpptrs.c b/LAPACKE/src/lapacke_zpptrs.c
index c379b51efa..61c9489529 100644
--- a/LAPACKE/src/lapacke_zpptrs.c
+++ b/LAPACKE/src/lapacke_zpptrs.c
@@ -32,24 +32,24 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpptrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpptrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* ap,
                            lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpptrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpptrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zpp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_zpptrs_work( matrix_layout, uplo, n, nrhs, ap, b, ldb );
+    return API_SUFFIX(LAPACKE_zpptrs_work)( matrix_layout, uplo, n, nrhs, ap, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zpptrs_work.c b/LAPACKE/src/lapacke_zpptrs_work.c
index 867417cd44..24aac47e5c 100644
--- a/LAPACKE/src/lapacke_zpptrs_work.c
+++ b/LAPACKE/src/lapacke_zpptrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpptrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpptrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs,
                                 const lapack_complex_double* ap,
                                 lapack_complex_double* b, lapack_int ldb )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zpptrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zpptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpptrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,26 +70,26 @@ lapack_int LAPACKE_zpptrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpptrs( &uplo, &n, &nrhs, ap_t, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpptrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpptrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpptrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpstrf.c b/LAPACKE/src/lapacke_zpstrf.c
index dac94f5e50..777d99a518 100644
--- a/LAPACKE/src/lapacke_zpstrf.c
+++ b/LAPACKE/src/lapacke_zpstrf.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpstrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpstrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_int* piv, lapack_int* rank, double tol )
 {
     lapack_int info = 0;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpstrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpstrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpo_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zpo_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( 1, &tol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &tol, 1 ) ) {
             return -8;
         }
     }
@@ -60,13 +60,13 @@ lapack_int LAPACKE_zpstrf( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zpstrf_work( matrix_layout, uplo, n, a, lda, piv, rank, tol,
+    info = API_SUFFIX(LAPACKE_zpstrf_work)( matrix_layout, uplo, n, a, lda, piv, rank, tol,
                                 work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zpstrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpstrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpstrf_work.c b/LAPACKE/src/lapacke_zpstrf_work.c
index a79a19d4ff..e9f76b5a4c 100644
--- a/LAPACKE/src/lapacke_zpstrf_work.c
+++ b/LAPACKE/src/lapacke_zpstrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpstrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpstrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_int* piv, lapack_int* rank, double tol,
                                 double* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zpstrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zpstrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpstrf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_zpstrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zpo_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zpo_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpstrf( &uplo, &n, a_t, &lda_t, piv, rank, &tol, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zpo_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zpo_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpstrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpstrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpstrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpstrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zptcon.c b/LAPACKE/src/lapacke_zptcon.c
index f3b72dea05..e54caa0b93 100644
--- a/LAPACKE/src/lapacke_zptcon.c
+++ b/LAPACKE/src/lapacke_zptcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zptcon( lapack_int n, const double* d,
+lapack_int API_SUFFIX(LAPACKE_zptcon)( lapack_int n, const double* d,
                            const lapack_complex_double* e, double anorm,
                            double* rcond )
 {
@@ -41,13 +41,13 @@ lapack_int LAPACKE_zptcon( lapack_int n, const double* d,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_z_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, e, 1 ) ) {
             return -3;
         }
     }
@@ -59,12 +59,12 @@ lapack_int LAPACKE_zptcon( lapack_int n, const double* d,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zptcon_work( n, d, e, anorm, rcond, work );
+    info = API_SUFFIX(LAPACKE_zptcon_work)( n, d, e, anorm, rcond, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zptcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zptcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zptcon_work.c b/LAPACKE/src/lapacke_zptcon_work.c
index 6638cdc441..cdd84c0e5c 100644
--- a/LAPACKE/src/lapacke_zptcon_work.c
+++ b/LAPACKE/src/lapacke_zptcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zptcon_work( lapack_int n, const double* d,
+lapack_int API_SUFFIX(LAPACKE_zptcon_work)( lapack_int n, const double* d,
                                 const lapack_complex_double* e, double anorm,
                                 double* rcond, double* work )
 {
diff --git a/LAPACKE/src/lapacke_zpteqr.c b/LAPACKE/src/lapacke_zpteqr.c
index ac55c13099..1195a4b171 100644
--- a/LAPACKE/src/lapacke_zpteqr.c
+++ b/LAPACKE/src/lapacke_zpteqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpteqr( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpteqr)( int matrix_layout, char compz, lapack_int n,
                            double* d, double* e, lapack_complex_double* z,
                            lapack_int ldz )
 {
@@ -41,27 +41,27 @@ lapack_int LAPACKE_zpteqr( int matrix_layout, char compz, lapack_int n,
     lapack_int lwork;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpteqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpteqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -6;
             }
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( compz, 'n' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'n' ) ) {
         lwork = 1;
     } else {
         lwork = MAX(1,4*n-4);
@@ -73,12 +73,12 @@ lapack_int LAPACKE_zpteqr( int matrix_layout, char compz, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zpteqr_work( matrix_layout, compz, n, d, e, z, ldz, work );
+    info = API_SUFFIX(LAPACKE_zpteqr_work)( matrix_layout, compz, n, d, e, z, ldz, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zpteqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpteqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpteqr_work.c b/LAPACKE/src/lapacke_zpteqr_work.c
index 47bae4e796..4c8d2124e5 100644
--- a/LAPACKE/src/lapacke_zpteqr_work.c
+++ b/LAPACKE/src/lapacke_zpteqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpteqr_work( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpteqr_work)( int matrix_layout, char compz, lapack_int n,
                                 double* d, double* e, lapack_complex_double* z,
                                 lapack_int ldz, double* work )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_zpteqr_work( int matrix_layout, char compz, lapack_int n,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zpteqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpteqr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,8 +60,8 @@ lapack_int LAPACKE_zpteqr_work( int matrix_layout, char compz, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_zpteqr( &compz, &n, d, e, z_t, &ldz_t, work, &info );
@@ -69,16 +69,16 @@ lapack_int LAPACKE_zpteqr_work( int matrix_layout, char compz, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         /* Release memory and exit */
         LAPACKE_free( z_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpteqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpteqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpteqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpteqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zptrfs.c b/LAPACKE/src/lapacke_zptrfs.c
index 5e05c1b58c..cd243bbf1b 100644
--- a/LAPACKE/src/lapacke_zptrfs.c
+++ b/LAPACKE/src/lapacke_zptrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zptrfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zptrfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const double* d,
                            const lapack_complex_double* e, const double* df,
                            const lapack_complex_double* ef,
@@ -44,28 +44,28 @@ lapack_int LAPACKE_zptrfs( int matrix_layout, char uplo, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zptrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zptrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( n, df, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, df, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_z_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_z_nancheck( n-1, ef, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, ef, 1 ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -11;
         }
     }
@@ -83,7 +83,7 @@ lapack_int LAPACKE_zptrfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zptrfs_work( matrix_layout, uplo, n, nrhs, d, e, df, ef, b,
+    info = API_SUFFIX(LAPACKE_zptrfs_work)( matrix_layout, uplo, n, nrhs, d, e, df, ef, b,
                                 ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -91,7 +91,7 @@ lapack_int LAPACKE_zptrfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zptrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zptrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zptrfs_work.c b/LAPACKE/src/lapacke_zptrfs_work.c
index 29a561f87b..ca5b882fcd 100644
--- a/LAPACKE/src/lapacke_zptrfs_work.c
+++ b/LAPACKE/src/lapacke_zptrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zptrfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zptrfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const double* d,
                                 const lapack_complex_double* e,
                                 const double* df,
@@ -58,12 +58,12 @@ lapack_int LAPACKE_zptrfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zptrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zptrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zptrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zptrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -82,8 +82,8 @@ lapack_int LAPACKE_zptrfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zptrfs( &uplo, &n, &nrhs, d, e, df, ef, b_t, &ldb_t, x_t, &ldx_t,
                        ferr, berr, work, rwork, &info );
@@ -91,18 +91,18 @@ lapack_int LAPACKE_zptrfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zptrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zptrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zptrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zptrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zptsv.c b/LAPACKE/src/lapacke_zptsv.c
index 4de2c96241..136e6c7fdd 100644
--- a/LAPACKE/src/lapacke_zptsv.c
+++ b/LAPACKE/src/lapacke_zptsv.c
@@ -32,27 +32,27 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zptsv( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_zptsv)( int matrix_layout, lapack_int n, lapack_int nrhs,
                           double* d, lapack_complex_double* e,
                           lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zptsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zptsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_z_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_zptsv_work( matrix_layout, n, nrhs, d, e, b, ldb );
+    return API_SUFFIX(LAPACKE_zptsv_work)( matrix_layout, n, nrhs, d, e, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zptsv_work.c b/LAPACKE/src/lapacke_zptsv_work.c
index d530af267a..ab3ee730ce 100644
--- a/LAPACKE/src/lapacke_zptsv_work.c
+++ b/LAPACKE/src/lapacke_zptsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zptsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
+lapack_int API_SUFFIX(LAPACKE_zptsv_work)( int matrix_layout, lapack_int n, lapack_int nrhs,
                                double* d, lapack_complex_double* e,
                                lapack_complex_double* b, lapack_int ldb )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_zptsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zptsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zptsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_zptsv_work( int matrix_layout, lapack_int n, lapack_int nrhs,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zptsv( &n, &nrhs, d, e, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zptsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zptsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zptsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zptsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zptsvx.c b/LAPACKE/src/lapacke_zptsvx.c
index cbdf9ac763..875d23b63d 100644
--- a/LAPACKE/src/lapacke_zptsvx.c
+++ b/LAPACKE/src/lapacke_zptsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zptsvx( int matrix_layout, char fact, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zptsvx)( int matrix_layout, char fact, lapack_int n,
                            lapack_int nrhs, const double* d,
                            const lapack_complex_double* e, double* df,
                            lapack_complex_double* ef,
@@ -44,28 +44,28 @@ lapack_int LAPACKE_zptsvx( int matrix_layout, char fact, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zptsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zptsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_d_nancheck( n, df, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, df, 1 ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_z_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_z_nancheck( n-1, ef, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, ef, 1 ) ) {
                 return -8;
             }
         }
@@ -84,7 +84,7 @@ lapack_int LAPACKE_zptsvx( int matrix_layout, char fact, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zptsvx_work( matrix_layout, fact, n, nrhs, d, e, df, ef, b,
+    info = API_SUFFIX(LAPACKE_zptsvx_work)( matrix_layout, fact, n, nrhs, d, e, df, ef, b,
                                 ldb, x, ldx, rcond, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -92,7 +92,7 @@ lapack_int LAPACKE_zptsvx( int matrix_layout, char fact, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zptsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zptsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zptsvx_work.c b/LAPACKE/src/lapacke_zptsvx_work.c
index ac1354097f..b4a16f35d3 100644
--- a/LAPACKE/src/lapacke_zptsvx_work.c
+++ b/LAPACKE/src/lapacke_zptsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zptsvx_work( int matrix_layout, char fact, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zptsvx_work)( int matrix_layout, char fact, lapack_int n,
                                 lapack_int nrhs, const double* d,
                                 const lapack_complex_double* e, double* df,
                                 lapack_complex_double* ef,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_zptsvx_work( int matrix_layout, char fact, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zptsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zptsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zptsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zptsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -81,7 +81,7 @@ lapack_int LAPACKE_zptsvx_work( int matrix_layout, char fact, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zptsvx( &fact, &n, &nrhs, d, e, df, ef, b_t, &ldb_t, x_t, &ldx_t,
                        rcond, ferr, berr, work, rwork, &info );
@@ -89,18 +89,18 @@ lapack_int LAPACKE_zptsvx_work( int matrix_layout, char fact, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zptsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zptsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zptsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zptsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zpttrf.c b/LAPACKE/src/lapacke_zpttrf.c
index 7b9d45494e..2e02ac63c3 100644
--- a/LAPACKE/src/lapacke_zpttrf.c
+++ b/LAPACKE/src/lapacke_zpttrf.c
@@ -32,18 +32,18 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpttrf( lapack_int n, double* d, lapack_complex_double* e )
+lapack_int API_SUFFIX(LAPACKE_zpttrf)( lapack_int n, double* d, lapack_complex_double* e )
 {
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -2;
         }
-        if( LAPACKE_z_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, e, 1 ) ) {
             return -3;
         }
     }
 #endif
-    return LAPACKE_zpttrf_work( n, d, e );
+    return API_SUFFIX(LAPACKE_zpttrf_work)( n, d, e );
 }
diff --git a/LAPACKE/src/lapacke_zpttrf_work.c b/LAPACKE/src/lapacke_zpttrf_work.c
index faf867a4eb..089e3db77b 100644
--- a/LAPACKE/src/lapacke_zpttrf_work.c
+++ b/LAPACKE/src/lapacke_zpttrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpttrf_work( lapack_int n, double* d,
+lapack_int API_SUFFIX(LAPACKE_zpttrf_work)( lapack_int n, double* d,
                                 lapack_complex_double* e )
 {
     lapack_int info = 0;
diff --git a/LAPACKE/src/lapacke_zpttrs.c b/LAPACKE/src/lapacke_zpttrs.c
index 14a42672b0..a307f27649 100644
--- a/LAPACKE/src/lapacke_zpttrs.c
+++ b/LAPACKE/src/lapacke_zpttrs.c
@@ -32,28 +32,28 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpttrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpttrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const double* d,
                            const lapack_complex_double* e,
                            lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zpttrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpttrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_z_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_zpttrs_work( matrix_layout, uplo, n, nrhs, d, e, b, ldb );
+    return API_SUFFIX(LAPACKE_zpttrs_work)( matrix_layout, uplo, n, nrhs, d, e, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zpttrs_work.c b/LAPACKE/src/lapacke_zpttrs_work.c
index 5a7c2650fb..ba8d1cda97 100644
--- a/LAPACKE/src/lapacke_zpttrs_work.c
+++ b/LAPACKE/src/lapacke_zpttrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zpttrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zpttrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const double* d,
                                 const lapack_complex_double* e,
                                 lapack_complex_double* b, lapack_int ldb )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zpttrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zpttrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpttrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -62,23 +62,23 @@ lapack_int LAPACKE_zpttrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zpttrs( &uplo, &n, &nrhs, d, e, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zpttrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpttrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zpttrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zpttrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zspcon.c b/LAPACKE/src/lapacke_zspcon.c
index 25c2a1f587..7f438b07f1 100644
--- a/LAPACKE/src/lapacke_zspcon.c
+++ b/LAPACKE/src/lapacke_zspcon.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zspcon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zspcon)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_double* ap,
                            const lapack_int* ipiv, double anorm, double* rcond )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zspcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zspcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_zsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zsp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
@@ -61,13 +61,13 @@ lapack_int LAPACKE_zspcon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zspcon_work( matrix_layout, uplo, n, ap, ipiv, anorm, rcond,
+    info = API_SUFFIX(LAPACKE_zspcon_work)( matrix_layout, uplo, n, ap, ipiv, anorm, rcond,
                                 work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zspcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zspcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zspcon_work.c b/LAPACKE/src/lapacke_zspcon_work.c
index 8cb520cf36..8801ee9a2c 100644
--- a/LAPACKE/src/lapacke_zspcon_work.c
+++ b/LAPACKE/src/lapacke_zspcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zspcon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zspcon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_double* ap,
                                 const lapack_int* ipiv, double anorm,
                                 double* rcond, lapack_complex_double* work )
@@ -55,7 +55,7 @@ lapack_int LAPACKE_zspcon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zsp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zspcon( &uplo, &n, ap_t, ipiv, &anorm, rcond, work, &info );
         if( info < 0 ) {
@@ -65,11 +65,11 @@ lapack_int LAPACKE_zspcon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zspcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zspcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zspcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zspcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsprfs.c b/LAPACKE/src/lapacke_zsprfs.c
index 0f55ffa57c..b92b61fc96 100644
--- a/LAPACKE/src/lapacke_zsprfs.c
+++ b/LAPACKE/src/lapacke_zsprfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsprfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsprfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* ap,
                            const lapack_complex_double* afp,
                            const lapack_int* ipiv,
@@ -44,22 +44,22 @@ lapack_int LAPACKE_zsprfs( int matrix_layout, char uplo, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsprfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsprfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_zsp_nancheck)( n, afp ) ) {
             return -6;
         }
-        if( LAPACKE_zsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zsp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -10;
         }
     }
@@ -77,7 +77,7 @@ lapack_int LAPACKE_zsprfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsprfs_work( matrix_layout, uplo, n, nrhs, ap, afp, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zsprfs_work)( matrix_layout, uplo, n, nrhs, ap, afp, ipiv, b,
                                 ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -85,7 +85,7 @@ lapack_int LAPACKE_zsprfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsprfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsprfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsprfs_work.c b/LAPACKE/src/lapacke_zsprfs_work.c
index 633aed68f2..23bd66dded 100644
--- a/LAPACKE/src/lapacke_zsprfs_work.c
+++ b/LAPACKE/src/lapacke_zsprfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsprfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsprfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs,
                                 const lapack_complex_double* ap,
                                 const lapack_complex_double* afp,
@@ -60,12 +60,12 @@ lapack_int LAPACKE_zsprfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zsprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsprfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zsprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsprfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -98,10 +98,10 @@ lapack_int LAPACKE_zsprfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
-        LAPACKE_zsp_trans( matrix_layout, uplo, n, ap, ap_t );
-        LAPACKE_zsp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zsp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zsp_trans)( matrix_layout, uplo, n, afp, afp_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsprfs( &uplo, &n, &nrhs, ap_t, afp_t, ipiv, b_t, &ldb_t, x_t,
                        &ldx_t, ferr, berr, work, rwork, &info );
@@ -109,7 +109,7 @@ lapack_int LAPACKE_zsprfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( afp_t );
 exit_level_3:
@@ -120,11 +120,11 @@ lapack_int LAPACKE_zsprfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsprfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsprfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsprfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zspsv.c b/LAPACKE/src/lapacke_zspsv.c
index 89cf95ccfa..03a3ea3f34 100644
--- a/LAPACKE/src/lapacke_zspsv.c
+++ b/LAPACKE/src/lapacke_zspsv.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zspsv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zspsv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_double* ap,
                           lapack_int* ipiv, lapack_complex_double* b,
                           lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zspsv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zspsv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zsp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_zspsv_work( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
+    return API_SUFFIX(LAPACKE_zspsv_work)( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zspsv_work.c b/LAPACKE/src/lapacke_zspsv_work.c
index 819f2b665e..79706bee9e 100644
--- a/LAPACKE/src/lapacke_zspsv_work.c
+++ b/LAPACKE/src/lapacke_zspsv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zspsv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zspsv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_double* ap,
                                lapack_int* ipiv, lapack_complex_double* b,
                                lapack_int ldb )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zspsv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zspsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zspsv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,27 +70,27 @@ lapack_int LAPACKE_zspsv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zsp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zsp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zspsv( &uplo, &n, &nrhs, ap_t, ipiv, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
-        LAPACKE_zsp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zsp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zspsv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zspsv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zspsv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zspsv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zspsvx.c b/LAPACKE/src/lapacke_zspsvx.c
index 025a121962..33a2721b0a 100644
--- a/LAPACKE/src/lapacke_zspsvx.c
+++ b/LAPACKE/src/lapacke_zspsvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zspsvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zspsvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* ap,
                            lapack_complex_double* afp, lapack_int* ipiv,
                            const lapack_complex_double* b, lapack_int ldb,
@@ -43,21 +43,21 @@ lapack_int LAPACKE_zspsvx( int matrix_layout, char fact, char uplo, lapack_int n
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zspsvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zspsvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_zsp_nancheck( n, afp ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_zsp_nancheck)( n, afp ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_zsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zsp_nancheck)( n, ap ) ) {
             return -6;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
@@ -75,7 +75,7 @@ lapack_int LAPACKE_zspsvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zspsvx_work( matrix_layout, fact, uplo, n, nrhs, ap, afp,
+    info = API_SUFFIX(LAPACKE_zspsvx_work)( matrix_layout, fact, uplo, n, nrhs, ap, afp,
                                 ipiv, b, ldb, x, ldx, rcond, ferr, berr, work,
                                 rwork );
     /* Release memory and exit */
@@ -84,7 +84,7 @@ lapack_int LAPACKE_zspsvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zspsvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zspsvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zspsvx_work.c b/LAPACKE/src/lapacke_zspsvx_work.c
index 4f986f58fd..5c034d66d7 100644
--- a/LAPACKE/src/lapacke_zspsvx_work.c
+++ b/LAPACKE/src/lapacke_zspsvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zspsvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zspsvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs,
                                 const lapack_complex_double* ap,
                                 lapack_complex_double* afp, lapack_int* ipiv,
@@ -59,12 +59,12 @@ lapack_int LAPACKE_zspsvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zspsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zspsvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zspsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zspsvx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -97,10 +97,10 @@ lapack_int LAPACKE_zspsvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zsp_trans( matrix_layout, uplo, n, ap, ap_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_zsp_trans( matrix_layout, uplo, n, afp, afp_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zsp_trans)( matrix_layout, uplo, n, ap, ap_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_zsp_trans)( matrix_layout, uplo, n, afp, afp_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_zspsvx( &fact, &uplo, &n, &nrhs, ap_t, afp_t, ipiv, b_t, &ldb_t,
@@ -109,9 +109,9 @@ lapack_int LAPACKE_zspsvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        if( LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_zsp_trans( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_zsp_trans)( LAPACK_COL_MAJOR, uplo, n, afp_t, afp );
         }
         /* Release memory and exit */
         LAPACKE_free( afp_t );
@@ -123,11 +123,11 @@ lapack_int LAPACKE_zspsvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zspsvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zspsvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zspsvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zspsvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsptrf.c b/LAPACKE/src/lapacke_zsptrf.c
index 70356d3410..1fcf9e4fcf 100644
--- a/LAPACKE/src/lapacke_zsptrf.c
+++ b/LAPACKE/src/lapacke_zsptrf.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsptrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsptrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* ap, lapack_int* ipiv )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsptrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsptrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zsp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zsptrf_work( matrix_layout, uplo, n, ap, ipiv );
+    return API_SUFFIX(LAPACKE_zsptrf_work)( matrix_layout, uplo, n, ap, ipiv );
 }
diff --git a/LAPACKE/src/lapacke_zsptrf_work.c b/LAPACKE/src/lapacke_zsptrf_work.c
index 3823e89427..c8ae5ba91c 100644
--- a/LAPACKE/src/lapacke_zsptrf_work.c
+++ b/LAPACKE/src/lapacke_zsptrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsptrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsptrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* ap, lapack_int* ipiv )
 {
     lapack_int info = 0;
@@ -53,23 +53,23 @@ lapack_int LAPACKE_zsptrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zsp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsptrf( &uplo, &n, ap_t, ipiv, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zsp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsptrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsptrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsptrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsptrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsptri.c b/LAPACKE/src/lapacke_zsptri.c
index 7bb4734532..022c4a7ec8 100644
--- a/LAPACKE/src/lapacke_zsptri.c
+++ b/LAPACKE/src/lapacke_zsptri.c
@@ -32,19 +32,19 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsptri( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsptri)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* ap, const lapack_int* ipiv )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsptri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsptri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zsp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
@@ -57,12 +57,12 @@ lapack_int LAPACKE_zsptri( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsptri_work( matrix_layout, uplo, n, ap, ipiv, work );
+    info = API_SUFFIX(LAPACKE_zsptri_work)( matrix_layout, uplo, n, ap, ipiv, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsptri", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsptri", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsptri_work.c b/LAPACKE/src/lapacke_zsptri_work.c
index 231026ad77..04f731c475 100644
--- a/LAPACKE/src/lapacke_zsptri_work.c
+++ b/LAPACKE/src/lapacke_zsptri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsptri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsptri_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* ap,
                                 const lapack_int* ipiv,
                                 lapack_complex_double* work )
@@ -55,23 +55,23 @@ lapack_int LAPACKE_zsptri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zsp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsptri( &uplo, &n, ap_t, ipiv, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zsp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsptri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsptri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsptri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsptri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsptrs.c b/LAPACKE/src/lapacke_zsptrs.c
index 5e99f48d96..7b55aeaf67 100644
--- a/LAPACKE/src/lapacke_zsptrs.c
+++ b/LAPACKE/src/lapacke_zsptrs.c
@@ -32,25 +32,25 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsptrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsptrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* ap,
                            const lapack_int* ipiv, lapack_complex_double* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsptrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsptrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zsp_nancheck)( n, ap ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -7;
         }
     }
 #endif
-    return LAPACKE_zsptrs_work( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
+    return API_SUFFIX(LAPACKE_zsptrs_work)( matrix_layout, uplo, n, nrhs, ap, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zsptrs_work.c b/LAPACKE/src/lapacke_zsptrs_work.c
index 9bea788d3d..166b6989b5 100644
--- a/LAPACKE/src/lapacke_zsptrs_work.c
+++ b/LAPACKE/src/lapacke_zsptrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsptrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsptrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs,
                                 const lapack_complex_double* ap,
                                 const lapack_int* ipiv,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_zsptrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zsptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsptrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,26 +71,26 @@ lapack_int LAPACKE_zsptrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zsp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zsp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsptrs( &uplo, &n, &nrhs, ap_t, ipiv, b_t, &ldb_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsptrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsptrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsptrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zstedc.c b/LAPACKE/src/lapacke_zstedc.c
index 29f2ca56cc..3e056521c4 100644
--- a/LAPACKE/src/lapacke_zstedc.c
+++ b/LAPACKE/src/lapacke_zstedc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zstedc( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zstedc)( int matrix_layout, char compz, lapack_int n,
                            double* d, double* e, lapack_complex_double* z,
                            lapack_int ldz )
 {
@@ -47,27 +47,27 @@ lapack_int LAPACKE_zstedc( int matrix_layout, char compz, lapack_int n,
     double rwork_query;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zstedc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstedc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -6;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zstedc_work( matrix_layout, compz, n, d, e, z, ldz,
+    info = API_SUFFIX(LAPACKE_zstedc_work)( matrix_layout, compz, n, d, e, z, ldz,
                                 &work_query, lwork, &rwork_query, lrwork,
                                 &iwork_query, liwork );
     if( info != 0 ) {
@@ -94,7 +94,7 @@ lapack_int LAPACKE_zstedc( int matrix_layout, char compz, lapack_int n,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zstedc_work( matrix_layout, compz, n, d, e, z, ldz, work,
+    info = API_SUFFIX(LAPACKE_zstedc_work)( matrix_layout, compz, n, d, e, z, ldz, work,
                                 lwork, rwork, lrwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -104,7 +104,7 @@ lapack_int LAPACKE_zstedc( int matrix_layout, char compz, lapack_int n,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zstedc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstedc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zstedc_work.c b/LAPACKE/src/lapacke_zstedc_work.c
index 3c6a07f19f..a12e9b6ddb 100644
--- a/LAPACKE/src/lapacke_zstedc_work.c
+++ b/LAPACKE/src/lapacke_zstedc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zstedc_work( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zstedc_work)( int matrix_layout, char compz, lapack_int n,
                                 double* d, double* e, lapack_complex_double* z,
                                 lapack_int ldz, lapack_complex_double* work,
                                 lapack_int lwork, double* rwork,
@@ -53,7 +53,7 @@ lapack_int LAPACKE_zstedc_work( int matrix_layout, char compz, lapack_int n,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zstedc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstedc_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -63,7 +63,7 @@ lapack_int LAPACKE_zstedc_work( int matrix_layout, char compz, lapack_int n,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,n) );
@@ -73,8 +73,8 @@ lapack_int LAPACKE_zstedc_work( int matrix_layout, char compz, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_zstedc( &compz, &n, d, e, z_t, &ldz_t, work, &lwork, rwork,
@@ -83,20 +83,20 @@ lapack_int LAPACKE_zstedc_work( int matrix_layout, char compz, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zstedc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstedc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zstedc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstedc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zstegr.c b/LAPACKE/src/lapacke_zstegr.c
index d744040441..7b124b7749 100644
--- a/LAPACKE/src/lapacke_zstegr.c
+++ b/LAPACKE/src/lapacke_zstegr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zstegr( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_zstegr)( int matrix_layout, char jobz, char range,
                            lapack_int n, double* d, double* e, double vl,
                            double vu, lapack_int il, lapack_int iu,
                            double abstol, lapack_int* m, double* w,
@@ -47,35 +47,35 @@ lapack_int LAPACKE_zstegr( int matrix_layout, char jobz, char range,
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zstegr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstegr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( 1, &abstol, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &abstol, 1 ) ) {
             return -11;
         }
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
                 return -7;
             }
         }
-        if( LAPACKE_lsame( range, 'v' ) ) {
-            if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( range, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
                 return -8;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zstegr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_zstegr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, abstol, m, w, z, ldz, isuppz, &work_query,
                                 lwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -95,7 +95,7 @@ lapack_int LAPACKE_zstegr( int matrix_layout, char jobz, char range,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zstegr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_zstegr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, abstol, m, w, z, ldz, isuppz, work, lwork,
                                 iwork, liwork );
     /* Release memory and exit */
@@ -104,7 +104,7 @@ lapack_int LAPACKE_zstegr( int matrix_layout, char jobz, char range,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zstegr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstegr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zstegr_work.c b/LAPACKE/src/lapacke_zstegr_work.c
index a2de0f62b7..ca1d1d5044 100644
--- a/LAPACKE/src/lapacke_zstegr_work.c
+++ b/LAPACKE/src/lapacke_zstegr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zstegr_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_zstegr_work)( int matrix_layout, char jobz, char range,
                                 lapack_int n, double* d, double* e, double vl,
                                 double vu, lapack_int il, lapack_int iu,
                                 double abstol, lapack_int* m, double* w,
@@ -54,9 +54,9 @@ lapack_int LAPACKE_zstegr_work( int matrix_layout, char jobz, char range,
         lapack_int ldz_t = MAX(1,n);
         lapack_complex_double* z_t = NULL;
         /* Check leading dimension(s) */
-        if( ( LAPACKE_lsame( jobz, 'v' ) && ( ldz < ldz_t )  ) || ( ldz < 1 ) ) {
+        if( ( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) && ( ldz < ldz_t )  ) || ( ldz < 1 ) ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_zstegr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstegr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,7 +67,7 @@ lapack_int LAPACKE_zstegr_work( int matrix_layout, char jobz, char range,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             /* Let be always 'n' instead of 'm' */
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
@@ -85,20 +85,20 @@ lapack_int LAPACKE_zstegr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, *m, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, *m, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zstegr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstegr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zstegr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstegr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zstein.c b/LAPACKE/src/lapacke_zstein.c
index ccad9fc385..2100e834a0 100644
--- a/LAPACKE/src/lapacke_zstein.c
+++ b/LAPACKE/src/lapacke_zstein.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zstein( int matrix_layout, lapack_int n, const double* d,
+lapack_int API_SUFFIX(LAPACKE_zstein)( int matrix_layout, lapack_int n, const double* d,
                            const double* e, lapack_int m, const double* w,
                            const lapack_int* iblock, const lapack_int* isplit,
                            lapack_complex_double* z, lapack_int ldz,
@@ -42,19 +42,19 @@ lapack_int LAPACKE_zstein( int matrix_layout, lapack_int n, const double* d,
     lapack_int* iwork = NULL;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zstein", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstein", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -3;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n, w, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, w, 1 ) ) {
             return -6;
         }
     }
@@ -71,7 +71,7 @@ lapack_int LAPACKE_zstein( int matrix_layout, lapack_int n, const double* d,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zstein_work( matrix_layout, n, d, e, m, w, iblock, isplit, z,
+    info = API_SUFFIX(LAPACKE_zstein_work)( matrix_layout, n, d, e, m, w, iblock, isplit, z,
                                 ldz, work, iwork, ifailv );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -79,7 +79,7 @@ lapack_int LAPACKE_zstein( int matrix_layout, lapack_int n, const double* d,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zstein", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstein", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zstein_work.c b/LAPACKE/src/lapacke_zstein_work.c
index c651215767..e2fcae42c5 100644
--- a/LAPACKE/src/lapacke_zstein_work.c
+++ b/LAPACKE/src/lapacke_zstein_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zstein_work( int matrix_layout, lapack_int n, const double* d,
+lapack_int API_SUFFIX(LAPACKE_zstein_work)( int matrix_layout, lapack_int n, const double* d,
                                 const double* e, lapack_int m, const double* w,
                                 const lapack_int* iblock,
                                 const lapack_int* isplit,
@@ -54,7 +54,7 @@ lapack_int LAPACKE_zstein_work( int matrix_layout, lapack_int n, const double* d
         /* Check leading dimension(s) */
         if( ldz < m ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zstein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstein_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -71,16 +71,16 @@ lapack_int LAPACKE_zstein_work( int matrix_layout, lapack_int n, const double* d
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, m, z_t, ldz_t, z, ldz );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, m, z_t, ldz_t, z, ldz );
         /* Release memory and exit */
         LAPACKE_free( z_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zstein_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstein_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zstein_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstein_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zstemr.c b/LAPACKE/src/lapacke_zstemr.c
index d64fb290cb..c068168092 100644
--- a/LAPACKE/src/lapacke_zstemr.c
+++ b/LAPACKE/src/lapacke_zstemr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zstemr( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_zstemr)( int matrix_layout, char jobz, char range,
                            lapack_int n, double* d, double* e, double vl,
                            double vu, lapack_int il, lapack_int iu,
                            lapack_int* m, double* w, lapack_complex_double* z,
@@ -47,28 +47,28 @@ lapack_int LAPACKE_zstemr( int matrix_layout, char jobz, char range,
     lapack_int iwork_query;
     double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zstemr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstemr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( 1, &vl, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vl, 1 ) ) {
             return -7;
         }
-        if( LAPACKE_d_nancheck( 1, &vu, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &vu, 1 ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zstemr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_zstemr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, m, w, z, ldz, nzc, isuppz, tryrac,
                                 &work_query, lwork, &iwork_query, liwork );
     if( info != 0 ) {
@@ -88,7 +88,7 @@ lapack_int LAPACKE_zstemr( int matrix_layout, char jobz, char range,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zstemr_work( matrix_layout, jobz, range, n, d, e, vl, vu, il,
+    info = API_SUFFIX(LAPACKE_zstemr_work)( matrix_layout, jobz, range, n, d, e, vl, vu, il,
                                 iu, m, w, z, ldz, nzc, isuppz, tryrac, work,
                                 lwork, iwork, liwork );
     /* Release memory and exit */
@@ -97,7 +97,7 @@ lapack_int LAPACKE_zstemr( int matrix_layout, char jobz, char range,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zstemr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstemr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zstemr_work.c b/LAPACKE/src/lapacke_zstemr_work.c
index b87018178b..eb4dee7cf3 100644
--- a/LAPACKE/src/lapacke_zstemr_work.c
+++ b/LAPACKE/src/lapacke_zstemr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zstemr_work( int matrix_layout, char jobz, char range,
+lapack_int API_SUFFIX(LAPACKE_zstemr_work)( int matrix_layout, char jobz, char range,
                                 lapack_int n, double* d, double* e, double vl,
                                 double vu, lapack_int il, lapack_int iu,
                                 lapack_int* m, double* w,
@@ -55,9 +55,9 @@ lapack_int LAPACKE_zstemr_work( int matrix_layout, char jobz, char range,
         lapack_int ldz_t = MAX(1,n);
         lapack_complex_double* z_t = NULL;
         /* Check leading dimension(s) */
-        if( ldz < 1 || ( LAPACKE_lsame( jobz, 'v' ) && ldz < n ) ) {
+        if( ldz < 1 || ( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) && ldz < n ) ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_zstemr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstemr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -68,7 +68,7 @@ lapack_int LAPACKE_zstemr_work( int matrix_layout, char jobz, char range,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,n) );
@@ -85,20 +85,20 @@ lapack_int LAPACKE_zstemr_work( int matrix_layout, char jobz, char range,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zstemr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstemr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zstemr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zstemr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsteqr.c b/LAPACKE/src/lapacke_zsteqr.c
index 0337fe5ab9..8599a898b5 100644
--- a/LAPACKE/src/lapacke_zsteqr.c
+++ b/LAPACKE/src/lapacke_zsteqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsteqr( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsteqr)( int matrix_layout, char compz, lapack_int n,
                            double* d, double* e, lapack_complex_double* z,
                            lapack_int ldz )
 {
@@ -41,27 +41,27 @@ lapack_int LAPACKE_zsteqr( int matrix_layout, char compz, lapack_int n,
     lapack_int lwork;
     double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsteqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsteqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_d_nancheck( n, d, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n, d, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( n-1, e, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 ) ) {
             return -5;
         }
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -6;
             }
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( compz, 'n' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( compz, 'n' ) ) {
         lwork = 1;
     } else {
         lwork = MAX(1,2*n-2);
@@ -73,12 +73,12 @@ lapack_int LAPACKE_zsteqr( int matrix_layout, char compz, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsteqr_work( matrix_layout, compz, n, d, e, z, ldz, work );
+    info = API_SUFFIX(LAPACKE_zsteqr_work)( matrix_layout, compz, n, d, e, z, ldz, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsteqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsteqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsteqr_work.c b/LAPACKE/src/lapacke_zsteqr_work.c
index b4db37210e..c9dc772e42 100644
--- a/LAPACKE/src/lapacke_zsteqr_work.c
+++ b/LAPACKE/src/lapacke_zsteqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsteqr_work( int matrix_layout, char compz, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsteqr_work)( int matrix_layout, char compz, lapack_int n,
                                 double* d, double* e, lapack_complex_double* z,
                                 lapack_int ldz, double* work )
 {
@@ -49,11 +49,11 @@ lapack_int LAPACKE_zsteqr_work( int matrix_layout, char compz, lapack_int n,
         /* Check leading dimension(s) */
         if( ldz < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zsteqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsteqr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             z_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldz_t * MAX(1,n) );
@@ -63,8 +63,8 @@ lapack_int LAPACKE_zsteqr_work( int matrix_layout, char compz, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        if( LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_zsteqr( &compz, &n, d, e, z_t, &ldz_t, work, &info );
@@ -72,20 +72,20 @@ lapack_int LAPACKE_zsteqr_work( int matrix_layout, char compz, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compz, 'i' ) || LAPACKE_lsame( compz, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compz, 'i' ) || API_SUFFIX(LAPACKE_lsame)( compz, 'v' ) ) {
             LAPACKE_free( z_t );
         }
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsteqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsteqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsteqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsteqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsycon.c b/LAPACKE/src/lapacke_zsycon.c
index 22c07e9de3..e0966f4521 100644
--- a/LAPACKE/src/lapacke_zsycon.c
+++ b/LAPACKE/src/lapacke_zsycon.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsycon( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsycon)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda,
                            const lapack_int* ipiv, double anorm, double* rcond )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsycon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsycon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -7;
         }
     }
@@ -61,13 +61,13 @@ lapack_int LAPACKE_zsycon( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsycon_work( matrix_layout, uplo, n, a, lda, ipiv, anorm,
+    info = API_SUFFIX(LAPACKE_zsycon_work)( matrix_layout, uplo, n, a, lda, ipiv, anorm,
                                 rcond, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsycon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsycon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsycon_3.c b/LAPACKE/src/lapacke_zsycon_3.c
index c7d22234db..b144a90863 100644
--- a/LAPACKE/src/lapacke_zsycon_3.c
+++ b/LAPACKE/src/lapacke_zsycon_3.c
@@ -32,28 +32,28 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsycon_3( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsycon_3)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda,
                            const lapack_complex_double* e,
                            const lapack_int* ipiv, double anorm, double* rcond )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
-    lapack_int e_start = LAPACKE_lsame( uplo, 'U' ) ? 1 : 0;
+    lapack_int e_start = API_SUFFIX(LAPACKE_lsame)( uplo, 'U' ) ? 1 : 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsycon_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsycon_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_z_nancheck( n-1, e + e_start, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, e + e_start, 1 ) ) {
             return -6;
         }
-        if( LAPACKE_d_nancheck( 1, &anorm, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &anorm, 1 ) ) {
             return -8;
         }
     }
@@ -66,13 +66,13 @@ lapack_int LAPACKE_zsycon_3( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsycon_3_work( matrix_layout, uplo, n, a, lda, e, ipiv, anorm,
+    info = API_SUFFIX(LAPACKE_zsycon_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv, anorm,
                                 rcond, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsycon_3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsycon_3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsycon_3_work.c b/LAPACKE/src/lapacke_zsycon_3_work.c
index 7dbf7f9a99..5911a1e277 100644
--- a/LAPACKE/src/lapacke_zsycon_3_work.c
+++ b/LAPACKE/src/lapacke_zsycon_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsycon_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsycon_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_double* a, lapack_int lda,
                                 const lapack_complex_double* e,
                                 const lapack_int* ipiv, double anorm,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zsycon_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zsycon_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsycon_3_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -62,7 +62,7 @@ lapack_int LAPACKE_zsycon_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsycon_3( &uplo, &n, a_t, &lda_t, e, ipiv, &anorm, rcond, work,
                        &info );
@@ -73,11 +73,11 @@ lapack_int LAPACKE_zsycon_3_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsycon_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsycon_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsycon_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsycon_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsycon_work.c b/LAPACKE/src/lapacke_zsycon_work.c
index 1a2c7b4c2f..947fbe369e 100644
--- a/LAPACKE/src/lapacke_zsycon_work.c
+++ b/LAPACKE/src/lapacke_zsycon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsycon_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsycon_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_double* a, lapack_int lda,
                                 const lapack_int* ipiv, double anorm,
                                 double* rcond, lapack_complex_double* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zsycon_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zsycon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsycon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_zsycon_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsycon( &uplo, &n, a_t, &lda_t, ipiv, &anorm, rcond, work,
                        &info );
@@ -72,11 +72,11 @@ lapack_int LAPACKE_zsycon_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsycon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsycon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsycon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsycon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsyconv.c b/LAPACKE/src/lapacke_zsyconv.c
index 58856b9584..6fc7989eb0 100644
--- a/LAPACKE/src/lapacke_zsyconv.c
+++ b/LAPACKE/src/lapacke_zsyconv.c
@@ -32,23 +32,23 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsyconv( int matrix_layout, char uplo, char way, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsyconv)( int matrix_layout, char uplo, char way, lapack_int n,
                             lapack_complex_double* a, lapack_int lda,
                             const lapack_int* ipiv,
                             lapack_complex_double* e )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsyconv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyconv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
     /* Call middle-level interface */
-    return LAPACKE_zsyconv_work( matrix_layout, uplo, way, n, a, lda, ipiv, e );
+    return API_SUFFIX(LAPACKE_zsyconv_work)( matrix_layout, uplo, way, n, a, lda, ipiv, e );
 }
diff --git a/LAPACKE/src/lapacke_zsyconv_work.c b/LAPACKE/src/lapacke_zsyconv_work.c
index 776e834872..b97a8b430e 100644
--- a/LAPACKE/src/lapacke_zsyconv_work.c
+++ b/LAPACKE/src/lapacke_zsyconv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsyconv_work( int matrix_layout, char uplo, char way,
+lapack_int API_SUFFIX(LAPACKE_zsyconv_work)( int matrix_layout, char uplo, char way,
                                  lapack_int n, lapack_complex_double* a,
                                  lapack_int lda, const lapack_int* ipiv,
                                  lapack_complex_double* e )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zsyconv_work( int matrix_layout, char uplo, char way,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zsyconv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyconv_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_zsyconv_work( int matrix_layout, char uplo, char way,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, lda, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, lda, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsyconv( &uplo, &way, &n, a_t, &lda_t, ipiv, e, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, lda, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, lda, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsyconv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyconv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsyconv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyconv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsyequb.c b/LAPACKE/src/lapacke_zsyequb.c
index 5d8d109652..7c3bacedee 100644
--- a/LAPACKE/src/lapacke_zsyequb.c
+++ b/LAPACKE/src/lapacke_zsyequb.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsyequb( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsyequb)( int matrix_layout, char uplo, lapack_int n,
                             const lapack_complex_double* a, lapack_int lda,
                             double* s, double* scond, double* amax )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsyequb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyequb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -58,13 +58,13 @@ lapack_int LAPACKE_zsyequb( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsyequb_work( matrix_layout, uplo, n, a, lda, s, scond, amax,
+    info = API_SUFFIX(LAPACKE_zsyequb_work)( matrix_layout, uplo, n, a, lda, s, scond, amax,
                                  work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsyequb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyequb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsyequb_work.c b/LAPACKE/src/lapacke_zsyequb_work.c
index c306735287..d26fec8c05 100644
--- a/LAPACKE/src/lapacke_zsyequb_work.c
+++ b/LAPACKE/src/lapacke_zsyequb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsyequb_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsyequb_work)( int matrix_layout, char uplo, lapack_int n,
                                  const lapack_complex_double* a, lapack_int lda,
                                  double* s, double* scond, double* amax,
                                  lapack_complex_double* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zsyequb_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zsyequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyequb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,7 +61,7 @@ lapack_int LAPACKE_zsyequb_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsyequb( &uplo, &n, a_t, &lda_t, s, scond, amax, work, &info );
         if( info < 0 ) {
@@ -71,11 +71,11 @@ lapack_int LAPACKE_zsyequb_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsyequb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyequb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsyequb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyequb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsyr.c b/LAPACKE/src/lapacke_zsyr.c
index c4bbe51c96..3703e60cd3 100644
--- a/LAPACKE/src/lapacke_zsyr.c
+++ b/LAPACKE/src/lapacke_zsyr.c
@@ -32,29 +32,29 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsyr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsyr)( int matrix_layout, char uplo, lapack_int n,
                              lapack_complex_double alpha,
                              const lapack_complex_double* x, lapack_int incx,
                              lapack_complex_double* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsyr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_z_nancheck( 1, &alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( 1, &alpha, 1 ) ) {
             return -4;
         }
-        if( LAPACKE_z_nancheck( n, x, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n, x, 1 ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_zsyr_work( matrix_layout, uplo, n, alpha, x, incx, a,
+    return API_SUFFIX(LAPACKE_zsyr_work)( matrix_layout, uplo, n, alpha, x, incx, a,
                                   lda );
 }
diff --git a/LAPACKE/src/lapacke_zsyr_work.c b/LAPACKE/src/lapacke_zsyr_work.c
index 743db8fb89..118e0a5ba1 100644
--- a/LAPACKE/src/lapacke_zsyr_work.c
+++ b/LAPACKE/src/lapacke_zsyr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsyr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsyr_work)( int matrix_layout, char uplo, lapack_int n,
                                   lapack_complex_double alpha,
                                   const lapack_complex_double* x,
                                   lapack_int incx, lapack_complex_double* a,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zsyr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zsyr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -62,21 +62,21 @@ lapack_int LAPACKE_zsyr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsyr( &uplo, &n, &alpha, x, &incx, a_t, &lda_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsyr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsyr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsyrfs.c b/LAPACKE/src/lapacke_zsyrfs.c
index 60cb9176ab..caa47b6413 100644
--- a/LAPACKE/src/lapacke_zsyrfs.c
+++ b/LAPACKE/src/lapacke_zsyrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsyrfs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsyrfs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* a,
                            lapack_int lda, const lapack_complex_double* af,
                            lapack_int ldaf, const lapack_int* ipiv,
@@ -44,22 +44,22 @@ lapack_int LAPACKE_zsyrfs( int matrix_layout, char uplo, lapack_int n,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsyrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -77,7 +77,7 @@ lapack_int LAPACKE_zsyrfs( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsyrfs_work( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
+    info = API_SUFFIX(LAPACKE_zsyrfs_work)( matrix_layout, uplo, n, nrhs, a, lda, af, ldaf,
                                 ipiv, b, ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -85,7 +85,7 @@ lapack_int LAPACKE_zsyrfs( int matrix_layout, char uplo, lapack_int n,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsyrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsyrfs_work.c b/LAPACKE/src/lapacke_zsyrfs_work.c
index daf6cca028..6d530132ac 100644
--- a/LAPACKE/src/lapacke_zsyrfs_work.c
+++ b/LAPACKE/src/lapacke_zsyrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsyrfs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsyrfs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_double* a,
                                 lapack_int lda, const lapack_complex_double* af,
                                 lapack_int ldaf, const lapack_int* ipiv,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_zsyrfs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zsyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyrfs_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zsyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zsyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zsyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -107,10 +107,10 @@ lapack_int LAPACKE_zsyrfs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsyrfs( &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t, ipiv, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, rwork, &info );
@@ -118,7 +118,7 @@ lapack_int LAPACKE_zsyrfs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -129,11 +129,11 @@ lapack_int LAPACKE_zsyrfs_work( int matrix_layout, char uplo, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsyrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsyrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsyrfsx.c b/LAPACKE/src/lapacke_zsyrfsx.c
index 13479d7323..78092e0e81 100644
--- a/LAPACKE/src/lapacke_zsyrfsx.c
+++ b/LAPACKE/src/lapacke_zsyrfsx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsyrfsx( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_zsyrfsx)( int matrix_layout, char uplo, char equed,
                             lapack_int n, lapack_int nrhs,
                             const lapack_complex_double* a, lapack_int lda,
                             const lapack_complex_double* af, lapack_int ldaf,
@@ -47,32 +47,32 @@ lapack_int LAPACKE_zsyrfsx( int matrix_layout, char uplo, char equed,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsyrfsx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyrfsx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -12;
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -22;
             }
         }
-        if( LAPACKE_lsame( equed, 'y' ) ) {
-            if( LAPACKE_d_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( equed, 'y' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, s, 1 ) ) {
                 return -11;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -14;
         }
     }
@@ -90,7 +90,7 @@ lapack_int LAPACKE_zsyrfsx( int matrix_layout, char uplo, char equed,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsyrfsx_work( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_zsyrfsx_work)( matrix_layout, uplo, equed, n, nrhs, a, lda, af,
                                  ldaf, ipiv, s, b, ldb, x, ldx, rcond, berr,
                                  n_err_bnds, err_bnds_norm, err_bnds_comp,
                                  nparams, params, work, rwork );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_zsyrfsx( int matrix_layout, char uplo, char equed,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsyrfsx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyrfsx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsyrfsx_work.c b/LAPACKE/src/lapacke_zsyrfsx_work.c
index 8d47f5cefa..d3113fcb69 100644
--- a/LAPACKE/src/lapacke_zsyrfsx_work.c
+++ b/LAPACKE/src/lapacke_zsyrfsx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsyrfsx_work( int matrix_layout, char uplo, char equed,
+lapack_int API_SUFFIX(LAPACKE_zsyrfsx_work)( int matrix_layout, char uplo, char equed,
                                  lapack_int n, lapack_int nrhs,
                                  const lapack_complex_double* a, lapack_int lda,
                                  const lapack_complex_double* af,
@@ -70,22 +70,22 @@ lapack_int LAPACKE_zsyrfsx_work( int matrix_layout, char uplo, char equed,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zsyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyrfsx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zsyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyrfsx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_zsyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyrfsx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_zsyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyrfsx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -128,10 +128,10 @@ lapack_int LAPACKE_zsyrfsx_work( int matrix_layout, char uplo, char equed,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsyrfsx( &uplo, &equed, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, s, b_t, &ldb_t, x_t, &ldx_t, rcond, berr,
@@ -141,10 +141,10 @@ lapack_int LAPACKE_zsyrfsx_work( int matrix_layout, char uplo, char equed,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, nrhs );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, nrhs );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -160,11 +160,11 @@ lapack_int LAPACKE_zsyrfsx_work( int matrix_layout, char uplo, char equed,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsyrfsx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyrfsx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsyrfsx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyrfsx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsysv.c b/LAPACKE/src/lapacke_zsysv.c
index 71ef168a83..88fbc23442 100644
--- a/LAPACKE/src/lapacke_zsysv.c
+++ b/LAPACKE/src/lapacke_zsysv.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsysv( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsysv)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_double* a,
                           lapack_int lda, lapack_int* ipiv,
                           lapack_complex_double* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_zsysv( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsysv", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zsysv_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zsysv_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_zsysv( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsysv_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zsysv_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsysv", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsysv_aa.c b/LAPACKE/src/lapacke_zsysv_aa.c
index ac9a75c2a4..eb605401e5 100644
--- a/LAPACKE/src/lapacke_zsysv_aa.c
+++ b/LAPACKE/src/lapacke_zsysv_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsysv_aa( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsysv_aa)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_double* a,
                           lapack_int lda, lapack_int* ipiv,
                           lapack_complex_double* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_zsysv_aa( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsysv_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zsysv_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zsysv_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_zsysv_aa( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsysv_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zsysv_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsysv_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsysv_aa_2stage.c b/LAPACKE/src/lapacke_zsysv_aa_2stage.c
index 05ee3f0189..debdd9e944 100644
--- a/LAPACKE/src/lapacke_zsysv_aa_2stage.c
+++ b/LAPACKE/src/lapacke_zsysv_aa_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsysv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsysv_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_double* a, lapack_int lda,
                           lapack_complex_double* tb, lapack_int ltb, lapack_int* ipiv, 
                           lapack_int* ipiv2, lapack_complex_double* b, lapack_int ldb )
@@ -42,25 +42,25 @@ lapack_int LAPACKE_zsysv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsysv_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zsysv_aa_2stage_work( matrix_layout, uplo, n, nrhs, 
+    info = API_SUFFIX(LAPACKE_zsysv_aa_2stage_work)( matrix_layout, uplo, n, nrhs, 
     						   a, lda, tb, ltb, ipiv, ipiv2, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
@@ -75,14 +75,14 @@ lapack_int LAPACKE_zsysv_aa_2stage( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsysv_aa_2stage_work( matrix_layout, uplo, n, nrhs,
+    info = API_SUFFIX(LAPACKE_zsysv_aa_2stage_work)( matrix_layout, uplo, n, nrhs,
                                a, lda, tb, ltb, ipiv, ipiv2, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsysv_aa_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_aa_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsysv_aa_2stage_work.c b/LAPACKE/src/lapacke_zsysv_aa_2stage_work.c
index 37e8d6c254..acf3c2dd36 100644
--- a/LAPACKE/src/lapacke_zsysv_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_zsysv_aa_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsysv_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsysv_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_double* a, lapack_int lda,
                                lapack_complex_double* tb, lapack_int ltb, lapack_int* ipiv, 
                                lapack_int* ipiv2, lapack_complex_double* b, lapack_int ldb,
@@ -56,17 +56,17 @@ lapack_int LAPACKE_zsysv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zsysv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zsysv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_aa_2stage_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zsysv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_aa_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -93,8 +93,8 @@ lapack_int LAPACKE_zsysv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsysv_aa_2stage( &uplo, &n, &nrhs, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, b_t, &ldb_t, work,
@@ -103,8 +103,8 @@ lapack_int LAPACKE_zsysv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_2:
@@ -113,11 +113,11 @@ lapack_int LAPACKE_zsysv_aa_2stage_work( int matrix_layout, char uplo, lapack_in
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsysv_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsysv_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsysv_aa_work.c b/LAPACKE/src/lapacke_zsysv_aa_work.c
index 637f6033ea..64a430a883 100644
--- a/LAPACKE/src/lapacke_zsysv_aa_work.c
+++ b/LAPACKE/src/lapacke_zsysv_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsysv_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsysv_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_double* a,
                                lapack_int lda, lapack_int* ipiv,
                                lapack_complex_double* b, lapack_int ldb,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_zsysv_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zsysv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_aa_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zsysv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_aa_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_zsysv_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsysv_aa( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -92,19 +92,19 @@ lapack_int LAPACKE_zsysv_aa_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsysv_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsysv_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsysv_rk.c b/LAPACKE/src/lapacke_zsysv_rk.c
index 137a3d26a5..1b5650b155 100644
--- a/LAPACKE/src/lapacke_zsysv_rk.c
+++ b/LAPACKE/src/lapacke_zsysv_rk.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsysv_rk( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsysv_rk)( int matrix_layout, char uplo, lapack_int n,
                           lapack_int nrhs, lapack_complex_double* a,
                           lapack_int lda, lapack_complex_double* e, lapack_int* ipiv,
                           lapack_complex_double* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_zsysv_rk( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsysv_rk", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_rk", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zsysv_rk_work( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zsysv_rk_work)( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
                                ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_zsysv_rk( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsysv_rk_work( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zsysv_rk_work)( matrix_layout, uplo, n, nrhs, a, lda, e, ipiv, b,
                                ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsysv_rk", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_rk", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsysv_rk_work.c b/LAPACKE/src/lapacke_zsysv_rk_work.c
index 349388a591..55f295d3f8 100644
--- a/LAPACKE/src/lapacke_zsysv_rk_work.c
+++ b/LAPACKE/src/lapacke_zsysv_rk_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsysv_rk_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsysv_rk_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_double* a,
                                lapack_int lda, lapack_complex_double* e,
                                lapack_int* ipiv,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_zsysv_rk_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zsysv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_rk_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zsysv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_rk_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_zsysv_rk_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsysv_rk( &uplo, &n, &nrhs, a_t, &lda_t, e, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -93,19 +93,19 @@ lapack_int LAPACKE_zsysv_rk_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsysv_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_rk_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsysv_rk_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_rk_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsysv_rook.c b/LAPACKE/src/lapacke_zsysv_rook.c
index e24d53395b..0bdc4fb362 100644
--- a/LAPACKE/src/lapacke_zsysv_rook.c
+++ b/LAPACKE/src/lapacke_zsysv_rook.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsysv_rook( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsysv_rook)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_double* a,
                                lapack_int lda, lapack_int* ipiv,
                                lapack_complex_double* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_zsysv_rook( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsysv_rook", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_rook", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zsysv_rook_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_zsysv_rook_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv,
                                     b, ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_zsysv_rook( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsysv_rook_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_zsysv_rook_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv,
                                     b, ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsysv_rook", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_rook", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsysv_rook_work.c b/LAPACKE/src/lapacke_zsysv_rook_work.c
index b383ec4670..f1b3f4ba10 100644
--- a/LAPACKE/src/lapacke_zsysv_rook_work.c
+++ b/LAPACKE/src/lapacke_zsysv_rook_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsysv_rook_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsysv_rook_work)( int matrix_layout, char uplo, lapack_int n,
                                     lapack_int nrhs, lapack_complex_double* a,
                                     lapack_int lda, lapack_int* ipiv,
                                     lapack_complex_double* b, lapack_int ldb,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_zsysv_rook_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zsysv_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_rook_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zsysv_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_rook_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_zsysv_rook_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsysv_rook( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                            work, &lwork, &info );
@@ -93,19 +93,19 @@ lapack_int LAPACKE_zsysv_rook_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsysv_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_rook_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsysv_rook_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_rook_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsysv_work.c b/LAPACKE/src/lapacke_zsysv_work.c
index eece455ce9..bb371d8ac7 100644
--- a/LAPACKE/src/lapacke_zsysv_work.c
+++ b/LAPACKE/src/lapacke_zsysv_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsysv_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsysv_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_int nrhs, lapack_complex_double* a,
                                lapack_int lda, lapack_int* ipiv,
                                lapack_complex_double* b, lapack_int ldb,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_zsysv_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zsysv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zsysv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_zsysv_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsysv( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                       &lwork, &info );
@@ -92,19 +92,19 @@ lapack_int LAPACKE_zsysv_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsysv_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsysv_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysv_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsysvx.c b/LAPACKE/src/lapacke_zsysvx.c
index abff21f160..050795b809 100644
--- a/LAPACKE/src/lapacke_zsysvx.c
+++ b/LAPACKE/src/lapacke_zsysvx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsysvx( int matrix_layout, char fact, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsysvx)( int matrix_layout, char fact, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* af,
                            lapack_int ldaf, lapack_int* ipiv,
@@ -46,21 +46,21 @@ lapack_int LAPACKE_zsysvx( int matrix_layout, char fact, char uplo, lapack_int n
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsysvx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysvx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
@@ -72,7 +72,7 @@ lapack_int LAPACKE_zsysvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zsysvx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_zsysvx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                 ldaf, ipiv, b, ldb, x, ldx, rcond, ferr, berr,
                                 &work_query, lwork, rwork );
     if( info != 0 ) {
@@ -87,7 +87,7 @@ lapack_int LAPACKE_zsysvx( int matrix_layout, char fact, char uplo, lapack_int n
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsysvx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_zsysvx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                 ldaf, ipiv, b, ldb, x, ldx, rcond, ferr, berr,
                                 work, lwork, rwork );
     /* Release memory and exit */
@@ -96,7 +96,7 @@ lapack_int LAPACKE_zsysvx( int matrix_layout, char fact, char uplo, lapack_int n
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsysvx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysvx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsysvx_work.c b/LAPACKE/src/lapacke_zsysvx_work.c
index 44e88b13bb..7c5141723b 100644
--- a/LAPACKE/src/lapacke_zsysvx_work.c
+++ b/LAPACKE/src/lapacke_zsysvx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsysvx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zsysvx_work)( int matrix_layout, char fact, char uplo,
                                 lapack_int n, lapack_int nrhs,
                                 const lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* af, lapack_int ldaf,
@@ -64,22 +64,22 @@ lapack_int LAPACKE_zsysvx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zsysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysvx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zsysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysvx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zsysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysvx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_zsysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysvx_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -117,11 +117,11 @@ lapack_int LAPACKE_zsysvx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_zsy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsysvx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                        ipiv, b_t, &ldb_t, x_t, &ldx_t, rcond, ferr, berr, work,
@@ -130,11 +130,11 @@ lapack_int LAPACKE_zsysvx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
         /* Release memory and exit */
         LAPACKE_free( x_t );
 exit_level_3:
@@ -145,11 +145,11 @@ lapack_int LAPACKE_zsysvx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsysvx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysvx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsysvx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysvx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsysvxx.c b/LAPACKE/src/lapacke_zsysvxx.c
index a39552e661..ad80139cd5 100644
--- a/LAPACKE/src/lapacke_zsysvxx.c
+++ b/LAPACKE/src/lapacke_zsysvxx.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsysvxx( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zsysvxx)( int matrix_layout, char fact, char uplo,
                             lapack_int n, lapack_int nrhs,
                             lapack_complex_double* a, lapack_int lda,
                             lapack_complex_double* af, lapack_int ldaf,
@@ -48,30 +48,30 @@ lapack_int LAPACKE_zsysvxx( int matrix_layout, char fact, char uplo,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsysvxx", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysvxx", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, af, ldaf ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, af, ldaf ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -13;
         }
         if( nparams>0 ) {
-            if( LAPACKE_d_nancheck( nparams, params, 1 ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( nparams, params, 1 ) ) {
                 return -24;
             }
         }
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            if( LAPACKE_d_nancheck( n, s, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            if( API_SUFFIX(LAPACKE_d_nancheck)( n, s, 1 ) ) {
                 return -12;
             }
         }
@@ -90,7 +90,7 @@ lapack_int LAPACKE_zsysvxx( int matrix_layout, char fact, char uplo,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsysvxx_work( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
+    info = API_SUFFIX(LAPACKE_zsysvxx_work)( matrix_layout, fact, uplo, n, nrhs, a, lda, af,
                                  ldaf, ipiv, equed, s, b, ldb, x, ldx, rcond,
                                  rpvgrw, berr, n_err_bnds, err_bnds_norm,
                                  err_bnds_comp, nparams, params, work, rwork );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_zsysvxx( int matrix_layout, char fact, char uplo,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsysvxx", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysvxx", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsysvxx_work.c b/LAPACKE/src/lapacke_zsysvxx_work.c
index 31730a3431..8c168b4f4e 100644
--- a/LAPACKE/src/lapacke_zsysvxx_work.c
+++ b/LAPACKE/src/lapacke_zsysvxx_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsysvxx_work( int matrix_layout, char fact, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zsysvxx_work)( int matrix_layout, char fact, char uplo,
                                  lapack_int n, lapack_int nrhs,
                                  lapack_complex_double* a, lapack_int lda,
                                  lapack_complex_double* af, lapack_int ldaf,
@@ -69,22 +69,22 @@ lapack_int LAPACKE_zsysvxx_work( int matrix_layout, char fact, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zsysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysvxx_work", info );
             return info;
         }
         if( ldaf < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zsysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysvxx_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_zsysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysvxx_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_zsysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysvxx_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -127,11 +127,11 @@ lapack_int LAPACKE_zsysvxx_work( int matrix_layout, char fact, char uplo,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        if( LAPACKE_lsame( fact, 'f' ) ) {
-            LAPACKE_zsy_trans( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) ) {
+            API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, af, ldaf, af_t, ldaf_t );
         }
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsysvxx( &fact, &uplo, &n, &nrhs, a_t, &lda_t, af_t, &ldaf_t,
                         ipiv, equed, s, b_t, &ldb_t, x_t, &ldx_t, rcond, rpvgrw,
@@ -141,20 +141,20 @@ lapack_int LAPACKE_zsysvxx_work( int matrix_layout, char fact, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( fact, 'e' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         }
-        if( LAPACKE_lsame( fact, 'e' ) || LAPACKE_lsame( fact, 'n' ) ) {
-            LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'e' ) || API_SUFFIX(LAPACKE_lsame)( fact, 'n' ) ) {
+            API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, af_t, ldaf_t, af,
                                ldaf );
         }
-        if( LAPACKE_lsame( fact, 'f' ) && LAPACKE_lsame( *equed, 'y' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( fact, 'f' ) && API_SUFFIX(LAPACKE_lsame)( *equed, 'y' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         }
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, x_t, ldx_t, x, ldx );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_norm_t,
                            nrhs, err_bnds_norm, n_err_bnds );
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, nrhs, n_err_bnds, err_bnds_comp_t,
                            nrhs, err_bnds_comp, n_err_bnds );
         /* Release memory and exit */
         LAPACKE_free( err_bnds_comp_t );
@@ -170,11 +170,11 @@ lapack_int LAPACKE_zsysvxx_work( int matrix_layout, char fact, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsysvxx_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysvxx_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsysvxx_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsysvxx_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsyswapr.c b/LAPACKE/src/lapacke_zsyswapr.c
index 1af377bca0..874cea7de4 100644
--- a/LAPACKE/src/lapacke_zsyswapr.c
+++ b/LAPACKE/src/lapacke_zsyswapr.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsyswapr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsyswapr)( int matrix_layout, char uplo, lapack_int n,
                              lapack_complex_double* a, lapack_int lda,
                              lapack_int i1, lapack_int i2 )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsyswapr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyswapr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_zsyswapr_work( matrix_layout, uplo, n, a, lda, i1, i2 );
+    return API_SUFFIX(LAPACKE_zsyswapr_work)( matrix_layout, uplo, n, a, lda, i1, i2 );
 }
diff --git a/LAPACKE/src/lapacke_zsyswapr_work.c b/LAPACKE/src/lapacke_zsyswapr_work.c
index 22a5984bbb..b81e8ec4c5 100644
--- a/LAPACKE/src/lapacke_zsyswapr_work.c
+++ b/LAPACKE/src/lapacke_zsyswapr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsyswapr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsyswapr_work)( int matrix_layout, char uplo, lapack_int n,
                                   lapack_complex_double* a, lapack_int lda,
                                   lapack_int i1, lapack_int i2 )
 {
@@ -54,21 +54,21 @@ lapack_int LAPACKE_zsyswapr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsyswapr( &uplo, &n, a_t, &lda_t, &i1, &i2 );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsyswapr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyswapr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsyswapr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsyswapr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrf.c b/LAPACKE/src/lapacke_zsytrf.c
index daf980366e..fef1732095 100644
--- a/LAPACKE/src/lapacke_zsytrf.c
+++ b/LAPACKE/src/lapacke_zsytrf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrf)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zsytrf( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zsytrf_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_zsytrf_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_zsytrf( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsytrf_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_zsytrf_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrf_aa.c b/LAPACKE/src/lapacke_zsytrf_aa.c
index aab51a50f7..c87ff57b09 100644
--- a/LAPACKE/src/lapacke_zsytrf_aa.c
+++ b/LAPACKE/src/lapacke_zsytrf_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrf_aa( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrf_aa)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zsytrf_aa( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrf_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zsytrf_aa_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_zsytrf_aa_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_zsytrf_aa( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsytrf_aa_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_zsytrf_aa_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrf_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrf_aa_2stage.c b/LAPACKE/src/lapacke_zsytrf_aa_2stage.c
index 4e61bdee6a..1b6a1bf79c 100644
--- a/LAPACKE/src/lapacke_zsytrf_aa_2stage.c
+++ b/LAPACKE/src/lapacke_zsytrf_aa_2stage.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrf_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
                           lapack_complex_double* a, lapack_int lda,
                           lapack_complex_double* tb, lapack_int ltb, lapack_int* ipiv, 
                           lapack_int* ipiv2 )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_zsytrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrf_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zsytrf_aa_2stage_work( matrix_layout, uplo, n,
+    info = API_SUFFIX(LAPACKE_zsytrf_aa_2stage_work)( matrix_layout, uplo, n,
     						   a, lda, tb, ltb, ipiv, ipiv2,
                                &work_query, lwork );
     if( info != 0 ) {
@@ -72,14 +72,14 @@ lapack_int LAPACKE_zsytrf_aa_2stage( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsytrf_aa_2stage_work( matrix_layout, uplo, n,
+    info = API_SUFFIX(LAPACKE_zsytrf_aa_2stage_work)( matrix_layout, uplo, n,
                                a, lda, tb, ltb, ipiv, ipiv2,
                                work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrf_aa_2stage", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_aa_2stage", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrf_aa_2stage_work.c b/LAPACKE/src/lapacke_zsytrf_aa_2stage_work.c
index 386a50ac1e..fe8baa4fd4 100644
--- a/LAPACKE/src/lapacke_zsytrf_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_zsytrf_aa_2stage_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrf_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrf_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
                                lapack_complex_double* a, lapack_int lda,
                                lapack_complex_double* tb, lapack_int ltb, 
                                lapack_int* ipiv, lapack_int* ipiv2,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_zsytrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zsytrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zsytrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_aa_2stage_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -81,7 +81,7 @@ lapack_int LAPACKE_zsytrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsytrf_aa_2stage( &uplo, &n, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, work,
@@ -90,18 +90,18 @@ lapack_int LAPACKE_zsytrf_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( tb_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsytrf_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsytrf_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrf_aa_work.c b/LAPACKE/src/lapacke_zsytrf_aa_work.c
index 7f09d29da2..699c46cf38 100644
--- a/LAPACKE/src/lapacke_zsytrf_aa_work.c
+++ b/LAPACKE/src/lapacke_zsytrf_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrf_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrf_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_int* ipiv, lapack_complex_double* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zsytrf_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zsytrf_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_aa_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zsytrf_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsytrf_aa( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsytrf_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsytrf_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrf_rk.c b/LAPACKE/src/lapacke_zsytrf_rk.c
index f7a2afca80..faecb28096 100644
--- a/LAPACKE/src/lapacke_zsytrf_rk.c
+++ b/LAPACKE/src/lapacke_zsytrf_rk.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrf_rk( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrf_rk)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* e, lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zsytrf_rk( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrf_rk", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_rk", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zsytrf_rk_work( matrix_layout, uplo, n, a, lda, e, ipiv,
+    info = API_SUFFIX(LAPACKE_zsytrf_rk_work)( matrix_layout, uplo, n, a, lda, e, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_zsytrf_rk( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsytrf_rk_work( matrix_layout, uplo, n, a, lda, e, ipiv, work,
+    info = API_SUFFIX(LAPACKE_zsytrf_rk_work)( matrix_layout, uplo, n, a, lda, e, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrf_rk", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_rk", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrf_rk_work.c b/LAPACKE/src/lapacke_zsytrf_rk_work.c
index f9ce392062..0e1eaab3c7 100644
--- a/LAPACKE/src/lapacke_zsytrf_rk_work.c
+++ b/LAPACKE/src/lapacke_zsytrf_rk_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrf_rk_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrf_rk_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* e, lapack_int* ipiv, lapack_complex_double* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zsytrf_rk_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zsytrf_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_rk_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zsytrf_rk_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsytrf_rk( &uplo, &n, a_t, &lda_t, e, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsytrf_rk_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_rk_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsytrf_rk_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_rk_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrf_rook.c b/LAPACKE/src/lapacke_zsytrf_rook.c
index 7af47a0be6..9b6e5f3bc6 100644
--- a/LAPACKE/src/lapacke_zsytrf_rook.c
+++ b/LAPACKE/src/lapacke_zsytrf_rook.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrf_rook( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrf_rook)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zsytrf_rook( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrf_rook", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_rook", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zsytrf_rook_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_zsytrf_rook_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_zsytrf_rook( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsytrf_rook_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_zsytrf_rook_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrf_rook", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_rook", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrf_rook_work.c b/LAPACKE/src/lapacke_zsytrf_rook_work.c
index f9af65ca6c..cdcb05f338 100644
--- a/LAPACKE/src/lapacke_zsytrf_rook_work.c
+++ b/LAPACKE/src/lapacke_zsytrf_rook_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrf_rook_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrf_rook_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_int* ipiv, lapack_complex_double* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zsytrf_rook_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zsytrf_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_rook_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zsytrf_rook_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsytrf_rook( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsytrf_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_rook_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsytrf_rook_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_rook_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrf_work.c b/LAPACKE/src/lapacke_zsytrf_work.c
index 273adbd570..2e1c41e2b7 100644
--- a/LAPACKE/src/lapacke_zsytrf_work.c
+++ b/LAPACKE/src/lapacke_zsytrf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrf_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrf_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_int* ipiv, lapack_complex_double* work,
                                 lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zsytrf_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zsytrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zsytrf_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsytrf( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsytrf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsytrf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytri.c b/LAPACKE/src/lapacke_zsytri.c
index c9f6341938..44adb66caf 100644
--- a/LAPACKE/src/lapacke_zsytri.c
+++ b/LAPACKE/src/lapacke_zsytri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytri( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytri)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            const lapack_int* ipiv )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -58,12 +58,12 @@ lapack_int LAPACKE_zsytri( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsytri_work( matrix_layout, uplo, n, a, lda, ipiv, work );
+    info = API_SUFFIX(LAPACKE_zsytri_work)( matrix_layout, uplo, n, a, lda, ipiv, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytri", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytri2.c b/LAPACKE/src/lapacke_zsytri2.c
index 4672151997..6f87982e92 100644
--- a/LAPACKE/src/lapacke_zsytri2.c
+++ b/LAPACKE/src/lapacke_zsytri2.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytri2( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytri2)( int matrix_layout, char uplo, lapack_int n,
                             lapack_complex_double* a, lapack_int lda,
                             const lapack_int* ipiv )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_zsytri2( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytri2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zsytri2_work( matrix_layout, uplo, n, a, lda, ipiv,
+    info = API_SUFFIX(LAPACKE_zsytri2_work)( matrix_layout, uplo, n, a, lda, ipiv,
                                  &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,13 +67,13 @@ lapack_int LAPACKE_zsytri2( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsytri2_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_zsytri2_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                  lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytri2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytri2_work.c b/LAPACKE/src/lapacke_zsytri2_work.c
index b22d41edb6..22a072d0b7 100644
--- a/LAPACKE/src/lapacke_zsytri2_work.c
+++ b/LAPACKE/src/lapacke_zsytri2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytri2_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytri2_work)( int matrix_layout, char uplo, lapack_int n,
                                  lapack_complex_double* a, lapack_int lda,
                                  const lapack_int* ipiv,
                                  lapack_complex_double* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zsytri2_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zsytri2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri2_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zsytri2_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsytri2( &uplo, &n, a_t, &lda_t, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsytri2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsytri2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytri2x.c b/LAPACKE/src/lapacke_zsytri2x.c
index e510790b0c..b181e913bf 100644
--- a/LAPACKE/src/lapacke_zsytri2x.c
+++ b/LAPACKE/src/lapacke_zsytri2x.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytri2x( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytri2x)( int matrix_layout, char uplo, lapack_int n,
                              lapack_complex_double* a, lapack_int lda,
                              const lapack_int* ipiv, lapack_int nb )
 {
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytri2x", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri2x", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
     }
@@ -58,13 +58,13 @@ lapack_int LAPACKE_zsytri2x( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsytri2x_work( matrix_layout, uplo, n, a, lda, ipiv, work,
+    info = API_SUFFIX(LAPACKE_zsytri2x_work)( matrix_layout, uplo, n, a, lda, ipiv, work,
                                   nb );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytri2x", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri2x", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytri2x_work.c b/LAPACKE/src/lapacke_zsytri2x_work.c
index c7b6727090..fd8e00c804 100644
--- a/LAPACKE/src/lapacke_zsytri2x_work.c
+++ b/LAPACKE/src/lapacke_zsytri2x_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytri2x_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytri2x_work)( int matrix_layout, char uplo, lapack_int n,
                                   lapack_complex_double* a, lapack_int lda,
                                   const lapack_int* ipiv,
                                   lapack_complex_double* work, lapack_int nb )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zsytri2x_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zsytri2x_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri2x_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_zsytri2x_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsytri2x( &uplo, &n, a_t, &lda_t, ipiv, work, &nb, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsytri2x_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri2x_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsytri2x_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri2x_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytri_3.c b/LAPACKE/src/lapacke_zsytri_3.c
index 2a9f1bb798..23426041fa 100644
--- a/LAPACKE/src/lapacke_zsytri_3.c
+++ b/LAPACKE/src/lapacke_zsytri_3.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytri_3( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytri_3)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            const lapack_complex_double* e, const lapack_int* ipiv )
 {
@@ -40,24 +40,24 @@ lapack_int LAPACKE_zsytri_3( int matrix_layout, char uplo, lapack_int n,
     lapack_int lwork = -1;
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
-    lapack_int e_start = LAPACKE_lsame( uplo, 'U' ) ? 1 : 0;
+    lapack_int e_start = API_SUFFIX(LAPACKE_lsame)( uplo, 'U' ) ? 1 : 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytri_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_z_nancheck( n-1, e + e_start, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, e + e_start, 1 ) ) {
             return -6;
         }
     }
 #endif
      /* Query optimal working array(s) size */
-    info = LAPACKE_zsytri_3_work( matrix_layout, uplo, n, a, lda, e, ipiv,
+    info = API_SUFFIX(LAPACKE_zsytri_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,12 +71,12 @@ lapack_int LAPACKE_zsytri_3( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsytri_3_work( matrix_layout, uplo, n, a, lda, e, ipiv, work, lwork );
+    info = API_SUFFIX(LAPACKE_zsytri_3_work)( matrix_layout, uplo, n, a, lda, e, ipiv, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytri_3", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri_3", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytri_3_work.c b/LAPACKE/src/lapacke_zsytri_3_work.c
index 02caa21bda..a30cc6e740 100644
--- a/LAPACKE/src/lapacke_zsytri_3_work.c
+++ b/LAPACKE/src/lapacke_zsytri_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytri_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytri_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 const lapack_complex_double* e, const lapack_int* ipiv,
                                 lapack_complex_double* work, lapack_int lwork)
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zsytri_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zsytri_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri_3_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zsytri_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsytri_3( &uplo, &n, a_t, &lda_t, e, ipiv, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsytri_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsytri_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytri_work.c b/LAPACKE/src/lapacke_zsytri_work.c
index 2f869b9429..b9012ac791 100644
--- a/LAPACKE/src/lapacke_zsytri_work.c
+++ b/LAPACKE/src/lapacke_zsytri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytri_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytri_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 const lapack_int* ipiv,
                                 lapack_complex_double* work )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zsytri_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zsytri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -61,23 +61,23 @@ lapack_int LAPACKE_zsytri_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsytri( &uplo, &n, a_t, &lda_t, ipiv, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zsy_trans)( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsytri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsytri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrs.c b/LAPACKE/src/lapacke_zsytrs.c
index d6fff75dae..ef82e58ebc 100644
--- a/LAPACKE/src/lapacke_zsytrs.c
+++ b/LAPACKE/src/lapacke_zsytrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrs( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrs)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* a,
                            lapack_int lda, const lapack_int* ipiv,
                            lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_zsytrs_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    return API_SUFFIX(LAPACKE_zsytrs_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_zsytrs2.c b/LAPACKE/src/lapacke_zsytrs2.c
index f1999d368e..4c5aac092b 100644
--- a/LAPACKE/src/lapacke_zsytrs2.c
+++ b/LAPACKE/src/lapacke_zsytrs2.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrs2( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrs2)( int matrix_layout, char uplo, lapack_int n,
                             lapack_int nrhs, const lapack_complex_double* a,
                             lapack_int lda, const lapack_int* ipiv,
                             lapack_complex_double* b, lapack_int ldb )
@@ -40,16 +40,16 @@ lapack_int LAPACKE_zsytrs2( int matrix_layout, char uplo, lapack_int n,
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrs2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
@@ -62,13 +62,13 @@ lapack_int LAPACKE_zsytrs2( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsytrs2_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zsytrs2_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrs2", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs2", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrs2_work.c b/LAPACKE/src/lapacke_zsytrs2_work.c
index c12c50fd8c..28b2419e7d 100644
--- a/LAPACKE/src/lapacke_zsytrs2_work.c
+++ b/LAPACKE/src/lapacke_zsytrs2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrs2_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrs2_work)( int matrix_layout, char uplo, lapack_int n,
                                  lapack_int nrhs,
                                  const lapack_complex_double* a, lapack_int lda,
                                  const lapack_int* ipiv,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_zsytrs2_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zsytrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs2_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zsytrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -77,8 +77,8 @@ lapack_int LAPACKE_zsytrs2_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsytrs2( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                         &info );
@@ -86,18 +86,18 @@ lapack_int LAPACKE_zsytrs2_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsytrs2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsytrs2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrs_3.c b/LAPACKE/src/lapacke_zsytrs_3.c
index cce73232a6..fe3ec24567 100644
--- a/LAPACKE/src/lapacke_zsytrs_3.c
+++ b/LAPACKE/src/lapacke_zsytrs_3.c
@@ -32,30 +32,30 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrs_3( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrs_3)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* a,
                            lapack_int lda, const lapack_complex_double* e,
                            const lapack_int* ipiv, lapack_complex_double* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrs_3", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_3", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_z_nancheck( n, e ,1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n, e ,1 ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_zsytrs_3_work( matrix_layout, uplo, n, nrhs, a, lda,
+    return API_SUFFIX(LAPACKE_zsytrs_3_work)( matrix_layout, uplo, n, nrhs, a, lda,
                                   e, ipiv, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_zsytrs_3_work.c b/LAPACKE/src/lapacke_zsytrs_3_work.c
index 60c6390836..07d3a36069 100644
--- a/LAPACKE/src/lapacke_zsytrs_3_work.c
+++ b/LAPACKE/src/lapacke_zsytrs_3_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrs_3_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrs_3_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_double* a,
                                 lapack_int lda, const lapack_complex_double* e,
                                 const lapack_int* ipiv,
@@ -53,12 +53,12 @@ lapack_int LAPACKE_zsytrs_3_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zsytrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_3_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zsytrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_3_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -76,8 +76,8 @@ lapack_int LAPACKE_zsytrs_3_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsytrs_3( &uplo, &n, &nrhs, a_t, &lda_t, e, ipiv, b_t, &ldb_t,
                        &info );
@@ -85,18 +85,18 @@ lapack_int LAPACKE_zsytrs_3_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsytrs_3_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_3_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsytrs_3_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_3_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrs_aa.c b/LAPACKE/src/lapacke_zsytrs_aa.c
index 617dcc1f7b..64da43a30d 100644
--- a/LAPACKE/src/lapacke_zsytrs_aa.c
+++ b/LAPACKE/src/lapacke_zsytrs_aa.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrs_aa( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrs_aa)( int matrix_layout, char uplo, lapack_int n,
                             lapack_int nrhs, const lapack_complex_double* a,
                             lapack_int lda, const lapack_int* ipiv,
                             lapack_complex_double* b, lapack_int ldb )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_zsytrs_aa( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrs_aa", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_aa", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zsytrs_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zsytrs_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_zsytrs_aa( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zsytrs_aa_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    info = API_SUFFIX(LAPACKE_zsytrs_aa_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                  ldb, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrs_aa", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_aa", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrs_aa_2stage.c b/LAPACKE/src/lapacke_zsytrs_aa_2stage.c
index c62e2893b4..0ce3aef6ee 100644
--- a/LAPACKE/src/lapacke_zsytrs_aa_2stage.c
+++ b/LAPACKE/src/lapacke_zsytrs_aa_2stage.c
@@ -32,32 +32,32 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrs_aa_2stage( int matrix_layout, char uplo, lapack_int n,
-                          lapack_int nrhs, lapack_complex_double* a, lapack_int lda,
-                          lapack_complex_double* tb, lapack_int ltb, lapack_int* ipiv, 
-                          lapack_int* ipiv2, lapack_complex_double* b, lapack_int ldb )
+lapack_int API_SUFFIX(LAPACKE_zsytrs_aa_2stage)( int matrix_layout, char uplo, lapack_int n,
+                          lapack_int nrhs, const lapack_complex_double* a, lapack_int lda,
+                          lapack_complex_double* tb, lapack_int ltb, const lapack_int* ipiv, 
+                          const lapack_int* ipiv2, lapack_complex_double* b, lapack_int ldb )
 {
     lapack_int info = 0;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrs_aa_2stage", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_aa_2stage", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, 4*n, 1, tb, ltb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, 4*n, 1, tb, ltb ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -11;
         }
     }
 #endif
     /* Call middle-level interface */
-    info = LAPACKE_zsytrs_aa_2stage_work( matrix_layout, uplo, n, nrhs,
+    info = API_SUFFIX(LAPACKE_zsytrs_aa_2stage_work)( matrix_layout, uplo, n, nrhs,
                                a, lda, tb, ltb, ipiv, ipiv2, b,
                                ldb );
     return info;
diff --git a/LAPACKE/src/lapacke_zsytrs_aa_2stage_work.c b/LAPACKE/src/lapacke_zsytrs_aa_2stage_work.c
index a46fd59e85..f797bfe985 100644
--- a/LAPACKE/src/lapacke_zsytrs_aa_2stage_work.c
+++ b/LAPACKE/src/lapacke_zsytrs_aa_2stage_work.c
@@ -32,10 +32,10 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_int n,
-                               lapack_int nrhs, lapack_complex_double* a, lapack_int lda,
-                               lapack_complex_double* tb, lapack_int ltb, lapack_int* ipiv, 
-                               lapack_int* ipiv2, lapack_complex_double* b, lapack_int ldb )
+lapack_int API_SUFFIX(LAPACKE_zsytrs_aa_2stage_work)( int matrix_layout, char uplo, lapack_int n,
+                               lapack_int nrhs, const lapack_complex_double* a, lapack_int lda,
+                               lapack_complex_double* tb, lapack_int ltb, const lapack_int* ipiv, 
+                               const lapack_int* ipiv2, lapack_complex_double* b, lapack_int ldb )
 {
     lapack_int info = 0;
     if( matrix_layout == LAPACK_COL_MAJOR ) {
@@ -54,17 +54,17 @@ lapack_int LAPACKE_zsytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zsytrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_aa_2stage_work", info );
             return info;
         }
         if( ltb < 4*n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zsytrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_aa_2stage_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zsytrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_aa_2stage_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_zsytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsytrs_aa_2stage( &uplo, &n, &nrhs, a_t, &lda_t, 
         			  tb_t, &ltb, ipiv, ipiv2, b_t, &ldb_t, &info );
@@ -93,8 +93,7 @@ lapack_int LAPACKE_zsytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_2:
@@ -103,11 +102,11 @@ lapack_int LAPACKE_zsytrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsytrs_aa_2stage_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_aa_2stage_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsytrs_aa_2stage_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_aa_2stage_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrs_aa_work.c b/LAPACKE/src/lapacke_zsytrs_aa_work.c
index 48b2f45acc..cacc55894c 100644
--- a/LAPACKE/src/lapacke_zsytrs_aa_work.c
+++ b/LAPACKE/src/lapacke_zsytrs_aa_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrs_aa_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrs_aa_work)( int matrix_layout, char uplo, lapack_int n,
                                  lapack_int nrhs,
                                  const lapack_complex_double* a, lapack_int lda,
                                  const lapack_int* ipiv,
@@ -54,12 +54,12 @@ lapack_int LAPACKE_zsytrs_aa_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zsytrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_aa_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zsytrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_aa_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -77,8 +77,8 @@ lapack_int LAPACKE_zsytrs_aa_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsytrs_aa( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t, work,
                         &lwork, &info );
@@ -86,18 +86,18 @@ lapack_int LAPACKE_zsytrs_aa_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsytrs_aa_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_aa_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsytrs_aa_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_aa_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrs_rook.c b/LAPACKE/src/lapacke_zsytrs_rook.c
index bb76714777..3da6471f66 100644
--- a/LAPACKE/src/lapacke_zsytrs_rook.c
+++ b/LAPACKE/src/lapacke_zsytrs_rook.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrs_rook( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrs_rook)( int matrix_layout, char uplo, lapack_int n,
                            lapack_int nrhs, const lapack_complex_double* a,
                            lapack_int lda, const lapack_int* ipiv,
                            lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zsytrs_rook", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_rook", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zsy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zsy_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_zsytrs_rook_work( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
+    return API_SUFFIX(LAPACKE_zsytrs_rook_work)( matrix_layout, uplo, n, nrhs, a, lda, ipiv, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_zsytrs_rook_work.c b/LAPACKE/src/lapacke_zsytrs_rook_work.c
index 871b7df020..a23165d0d8 100644
--- a/LAPACKE/src/lapacke_zsytrs_rook_work.c
+++ b/LAPACKE/src/lapacke_zsytrs_rook_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrs_rook_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrs_rook_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_double* a,
                                 lapack_int lda, const lapack_int* ipiv,
                                 lapack_complex_double* b, lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_zsytrs_rook_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zsytrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_rook_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zsytrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_rook_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,8 +75,8 @@ lapack_int LAPACKE_zsytrs_rook_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsytrs_rook( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                        &info );
@@ -84,18 +84,18 @@ lapack_int LAPACKE_zsytrs_rook_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsytrs_rook_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_rook_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsytrs_rook_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_rook_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zsytrs_work.c b/LAPACKE/src/lapacke_zsytrs_work.c
index 8500ab13f6..9fdec7e67d 100644
--- a/LAPACKE/src/lapacke_zsytrs_work.c
+++ b/LAPACKE/src/lapacke_zsytrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zsytrs_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zsytrs_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_int nrhs, const lapack_complex_double* a,
                                 lapack_int lda, const lapack_int* ipiv,
                                 lapack_complex_double* b, lapack_int ldb )
@@ -52,12 +52,12 @@ lapack_int LAPACKE_zsytrs_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zsytrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zsytrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -75,8 +75,8 @@ lapack_int LAPACKE_zsytrs_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zsy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zsy_trans)( matrix_layout, uplo, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zsytrs( &uplo, &n, &nrhs, a_t, &lda_t, ipiv, b_t, &ldb_t,
                        &info );
@@ -84,18 +84,18 @@ lapack_int LAPACKE_zsytrs_work( int matrix_layout, char uplo, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zsytrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zsytrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zsytrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztbcon.c b/LAPACKE/src/lapacke_ztbcon.c
index 28a25e1a80..57fcbad616 100644
--- a/LAPACKE/src/lapacke_ztbcon.c
+++ b/LAPACKE/src/lapacke_ztbcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztbcon( int matrix_layout, char norm, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_ztbcon)( int matrix_layout, char norm, char uplo, char diag,
                            lapack_int n, lapack_int kd,
                            const lapack_complex_double* ab, lapack_int ldab,
                            double* rcond )
@@ -41,13 +41,13 @@ lapack_int LAPACKE_ztbcon( int matrix_layout, char norm, char uplo, char diag,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztbcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztbcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ztb_nancheck( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_ztb_nancheck)( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
             return -7;
         }
     }
@@ -65,7 +65,7 @@ lapack_int LAPACKE_ztbcon( int matrix_layout, char norm, char uplo, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztbcon_work( matrix_layout, norm, uplo, diag, n, kd, ab, ldab,
+    info = API_SUFFIX(LAPACKE_ztbcon_work)( matrix_layout, norm, uplo, diag, n, kd, ab, ldab,
                                 rcond, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -73,7 +73,7 @@ lapack_int LAPACKE_ztbcon( int matrix_layout, char norm, char uplo, char diag,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztbcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztbcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztbcon_work.c b/LAPACKE/src/lapacke_ztbcon_work.c
index e2225fa3ec..f2869207b2 100644
--- a/LAPACKE/src/lapacke_ztbcon_work.c
+++ b/LAPACKE/src/lapacke_ztbcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztbcon_work( int matrix_layout, char norm, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ztbcon_work)( int matrix_layout, char norm, char uplo,
                                 char diag, lapack_int n, lapack_int kd,
                                 const lapack_complex_double* ab,
                                 lapack_int ldab, double* rcond,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_ztbcon_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ztbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztbcon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,7 +63,7 @@ lapack_int LAPACKE_ztbcon_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ztb_trans( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_ztb_trans)( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
                            ldab_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztbcon( &norm, &uplo, &diag, &n, &kd, ab_t, &ldab_t, rcond, work,
@@ -75,11 +75,11 @@ lapack_int LAPACKE_ztbcon_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztbcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztbcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztbcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztbcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztbrfs.c b/LAPACKE/src/lapacke_ztbrfs.c
index a42bd1c083..de53f32763 100644
--- a/LAPACKE/src/lapacke_ztbrfs.c
+++ b/LAPACKE/src/lapacke_ztbrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztbrfs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_ztbrfs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int kd, lapack_int nrhs,
                            const lapack_complex_double* ab, lapack_int ldab,
                            const lapack_complex_double* b, lapack_int ldb,
@@ -43,19 +43,19 @@ lapack_int LAPACKE_ztbrfs( int matrix_layout, char uplo, char trans, char diag,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztbrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztbrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ztb_nancheck( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_ztb_nancheck)( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -12;
         }
     }
@@ -73,7 +73,7 @@ lapack_int LAPACKE_ztbrfs( int matrix_layout, char uplo, char trans, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztbrfs_work( matrix_layout, uplo, trans, diag, n, kd, nrhs,
+    info = API_SUFFIX(LAPACKE_ztbrfs_work)( matrix_layout, uplo, trans, diag, n, kd, nrhs,
                                 ab, ldab, b, ldb, x, ldx, ferr, berr, work,
                                 rwork );
     /* Release memory and exit */
@@ -82,7 +82,7 @@ lapack_int LAPACKE_ztbrfs( int matrix_layout, char uplo, char trans, char diag,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztbrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztbrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztbrfs_work.c b/LAPACKE/src/lapacke_ztbrfs_work.c
index 2eb7d602bd..396ab1f372 100644
--- a/LAPACKE/src/lapacke_ztbrfs_work.c
+++ b/LAPACKE/src/lapacke_ztbrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztbrfs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_ztbrfs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int kd,
                                 lapack_int nrhs,
                                 const lapack_complex_double* ab,
@@ -59,17 +59,17 @@ lapack_int LAPACKE_ztbrfs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ztbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztbrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ztbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztbrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_ztbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztbrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -94,10 +94,10 @@ lapack_int LAPACKE_ztbrfs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_ztb_trans( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_ztb_trans)( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
                            ldab_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztbrfs( &uplo, &trans, &diag, &n, &kd, &nrhs, ab_t, &ldab_t, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, rwork, &info );
@@ -112,11 +112,11 @@ lapack_int LAPACKE_ztbrfs_work( int matrix_layout, char uplo, char trans,
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztbrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztbrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztbrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztbrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztbtrs.c b/LAPACKE/src/lapacke_ztbtrs.c
index 6d587c996b..1b1c7add02 100644
--- a/LAPACKE/src/lapacke_ztbtrs.c
+++ b/LAPACKE/src/lapacke_ztbtrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztbtrs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_ztbtrs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int kd, lapack_int nrhs,
                            const lapack_complex_double* ab, lapack_int ldab,
                            lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztbtrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztbtrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ztb_nancheck( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
+        if( API_SUFFIX(LAPACKE_ztb_nancheck)( matrix_layout, uplo, diag, n, kd, ab, ldab ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -10;
         }
     }
 #endif
-    return LAPACKE_ztbtrs_work( matrix_layout, uplo, trans, diag, n, kd, nrhs,
+    return API_SUFFIX(LAPACKE_ztbtrs_work)( matrix_layout, uplo, trans, diag, n, kd, nrhs,
                                 ab, ldab, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_ztbtrs_work.c b/LAPACKE/src/lapacke_ztbtrs_work.c
index fd157c8132..b9ef913dfa 100644
--- a/LAPACKE/src/lapacke_ztbtrs_work.c
+++ b/LAPACKE/src/lapacke_ztbtrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztbtrs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_ztbtrs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int kd,
                                 lapack_int nrhs,
                                 const lapack_complex_double* ab,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_ztbtrs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( ldab < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ztbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztbtrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ztbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztbtrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -78,9 +78,9 @@ lapack_int LAPACKE_ztbtrs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ztb_trans( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
+        API_SUFFIX(LAPACKE_ztb_trans)( matrix_layout, uplo, diag, n, kd, ab, ldab, ab_t,
                            ldab_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztbtrs( &uplo, &trans, &diag, &n, &kd, &nrhs, ab_t, &ldab_t, b_t,
                        &ldb_t, &info );
@@ -88,18 +88,18 @@ lapack_int LAPACKE_ztbtrs_work( int matrix_layout, char uplo, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( ab_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztbtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztbtrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztbtrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztbtrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztfsm.c b/LAPACKE/src/lapacke_ztfsm.c
index e05579d220..bde4b044b6 100644
--- a/LAPACKE/src/lapacke_ztfsm.c
+++ b/LAPACKE/src/lapacke_ztfsm.c
@@ -32,34 +32,36 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztfsm( int matrix_layout, char transr, char side, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ztfsm)( int matrix_layout, char transr, char side, char uplo,
                           char trans, char diag, lapack_int m, lapack_int n,
                           lapack_complex_double alpha,
                           const lapack_complex_double* a,
                           lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztfsm", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztfsm", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
+        lapack_int mn = m;
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
         /* Optionally check input matrices for NaNs */
         if( IS_Z_NONZERO(alpha) ) {
-            if( LAPACKE_ztf_nancheck( matrix_layout, transr, uplo, diag, n, a ) ) {
+            if( API_SUFFIX(LAPACKE_ztf_nancheck)( matrix_layout, transr, uplo, diag, mn, a ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_z_nancheck( 1, &alpha, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( 1, &alpha, 1 ) ) {
             return -9;
         }
         if( IS_Z_NONZERO(alpha) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
                 return -11;
             }
         }
     }
 #endif
-    return LAPACKE_ztfsm_work( matrix_layout, transr, side, uplo, trans, diag, m,
+    return API_SUFFIX(LAPACKE_ztfsm_work)( matrix_layout, transr, side, uplo, trans, diag, m,
                                n, alpha, a, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_ztfsm_work.c b/LAPACKE/src/lapacke_ztfsm_work.c
index d8962f8f49..d1d139f028 100644
--- a/LAPACKE/src/lapacke_ztfsm_work.c
+++ b/LAPACKE/src/lapacke_ztfsm_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztfsm_work( int matrix_layout, char transr, char side,
+lapack_int API_SUFFIX(LAPACKE_ztfsm_work)( int matrix_layout, char transr, char side,
                                char uplo, char trans, char diag, lapack_int m,
                                lapack_int n, lapack_complex_double alpha,
                                const lapack_complex_double* a,
@@ -48,12 +48,14 @@ lapack_int LAPACKE_ztfsm_work( int matrix_layout, char transr, char side,
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
         lapack_int ldb_t = MAX(1,m);
+        lapack_int mn = m;
         lapack_complex_double* b_t = NULL;
         lapack_complex_double* a_t = NULL;
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
         /* Check leading dimension(s) */
-        if( ldb < n ) {
+        if( ldb < m ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_ztfsm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztfsm_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -66,7 +68,7 @@ lapack_int LAPACKE_ztfsm_work( int matrix_layout, char transr, char side,
         if( IS_Z_NONZERO(alpha) ) {
             a_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
-                                ( MAX(1,n) * MAX(2,n+1) ) / 2 );
+                                ( MAX(1,mn) * MAX(2,mn+1) ) / 2 );
             if( a_t == NULL ) {
                 info = LAPACK_TRANSPOSE_MEMORY_ERROR;
                 goto exit_level_1;
@@ -74,17 +76,17 @@ lapack_int LAPACKE_ztfsm_work( int matrix_layout, char transr, char side,
         }
         /* Transpose input matrices */
         if( IS_Z_NONZERO(alpha) ) {
-            LAPACKE_zge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
         }
         if( IS_Z_NONZERO(alpha) ) {
-            LAPACKE_ztf_trans( matrix_layout, transr, uplo, diag, n, a, a_t );
+            API_SUFFIX(LAPACKE_ztf_trans)( matrix_layout, transr, uplo, diag, mn, a, a_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ztfsm( &transr, &side, &uplo, &trans, &diag, &m, &n, &alpha, a_t,
                       b_t, &ldb_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         if( IS_Z_NONZERO(alpha) ) {
             LAPACKE_free( a_t );
@@ -93,11 +95,11 @@ lapack_int LAPACKE_ztfsm_work( int matrix_layout, char transr, char side,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztfsm_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztfsm_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztfsm_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztfsm_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztftri.c b/LAPACKE/src/lapacke_ztftri.c
index 69f1d5eea4..d66d0fad67 100644
--- a/LAPACKE/src/lapacke_ztftri.c
+++ b/LAPACKE/src/lapacke_ztftri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztftri( int matrix_layout, char transr, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_ztftri)( int matrix_layout, char transr, char uplo, char diag,
                            lapack_int n, lapack_complex_double* a )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztftri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztftri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ztf_nancheck( matrix_layout, transr, uplo, diag, n, a ) ) {
+        if( API_SUFFIX(LAPACKE_ztf_nancheck)( matrix_layout, transr, uplo, diag, n, a ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_ztftri_work( matrix_layout, transr, uplo, diag, n, a );
+    return API_SUFFIX(LAPACKE_ztftri_work)( matrix_layout, transr, uplo, diag, n, a );
 }
diff --git a/LAPACKE/src/lapacke_ztftri_work.c b/LAPACKE/src/lapacke_ztftri_work.c
index 314717c502..3f4f40948a 100644
--- a/LAPACKE/src/lapacke_ztftri_work.c
+++ b/LAPACKE/src/lapacke_ztftri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztftri_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ztftri_work)( int matrix_layout, char transr, char uplo,
                                 char diag, lapack_int n,
                                 lapack_complex_double* a )
 {
@@ -54,23 +54,23 @@ lapack_int LAPACKE_ztftri_work( int matrix_layout, char transr, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ztf_trans( matrix_layout, transr, uplo, diag, n, a, a_t );
+        API_SUFFIX(LAPACKE_ztf_trans)( matrix_layout, transr, uplo, diag, n, a, a_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztftri( &transr, &uplo, &diag, &n, a_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ztf_trans( LAPACK_COL_MAJOR, transr, uplo, diag, n, a_t, a );
+        API_SUFFIX(LAPACKE_ztf_trans)( LAPACK_COL_MAJOR, transr, uplo, diag, n, a_t, a );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztftri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztftri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztftri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztftri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztfttp.c b/LAPACKE/src/lapacke_ztfttp.c
index 06142e1f82..8a3a4bb0d8 100644
--- a/LAPACKE/src/lapacke_ztfttp.c
+++ b/LAPACKE/src/lapacke_ztfttp.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztfttp( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ztfttp)( int matrix_layout, char transr, char uplo,
                            lapack_int n, const lapack_complex_double* arf,
                            lapack_complex_double* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztfttp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztfttp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpf_nancheck( n, arf ) ) {
+        if( API_SUFFIX(LAPACKE_zpf_nancheck)( n, arf ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_ztfttp_work( matrix_layout, transr, uplo, n, arf, ap );
+    return API_SUFFIX(LAPACKE_ztfttp_work)( matrix_layout, transr, uplo, n, arf, ap );
 }
diff --git a/LAPACKE/src/lapacke_ztfttp_work.c b/LAPACKE/src/lapacke_ztfttp_work.c
index 935b0e1d88..2d7824b2fa 100644
--- a/LAPACKE/src/lapacke_ztfttp_work.c
+++ b/LAPACKE/src/lapacke_ztfttp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztfttp_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ztfttp_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, const lapack_complex_double* arf,
                                 lapack_complex_double* ap )
 {
@@ -62,25 +62,25 @@ lapack_int LAPACKE_ztfttp_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zpf_trans( matrix_layout, transr, uplo, n, arf, arf_t );
+        API_SUFFIX(LAPACKE_zpf_trans)( matrix_layout, transr, uplo, n, arf, arf_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztfttp( &transr, &uplo, &n, arf_t, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( arf_t );
 exit_level_1:
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztfttp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztfttp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztfttp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztfttp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztfttr.c b/LAPACKE/src/lapacke_ztfttr.c
index e896dd0fa0..b2720956c7 100644
--- a/LAPACKE/src/lapacke_ztfttr.c
+++ b/LAPACKE/src/lapacke_ztfttr.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztfttr( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ztfttr)( int matrix_layout, char transr, char uplo,
                            lapack_int n, const lapack_complex_double* arf,
                            lapack_complex_double* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztfttr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztfttr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpf_nancheck( n, arf ) ) {
+        if( API_SUFFIX(LAPACKE_zpf_nancheck)( n, arf ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_ztfttr_work( matrix_layout, transr, uplo, n, arf, a, lda );
+    return API_SUFFIX(LAPACKE_ztfttr_work)( matrix_layout, transr, uplo, n, arf, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_ztfttr_work.c b/LAPACKE/src/lapacke_ztfttr_work.c
index 6314538530..90fe9b5a74 100644
--- a/LAPACKE/src/lapacke_ztfttr_work.c
+++ b/LAPACKE/src/lapacke_ztfttr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztfttr_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ztfttr_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, const lapack_complex_double* arf,
                                 lapack_complex_double* a, lapack_int lda )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_ztfttr_work( int matrix_layout, char transr, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ztfttr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztfttr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -68,25 +68,25 @@ lapack_int LAPACKE_ztfttr_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zpf_trans( matrix_layout, transr, uplo, n, arf, arf_t );
+        API_SUFFIX(LAPACKE_zpf_trans)( matrix_layout, transr, uplo, n, arf, arf_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztfttr( &transr, &uplo, &n, arf_t, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( arf_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztfttr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztfttr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztfttr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztfttr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztgevc.c b/LAPACKE/src/lapacke_ztgevc.c
index 574b8b461e..fc9ce425ae 100644
--- a/LAPACKE/src/lapacke_ztgevc.c
+++ b/LAPACKE/src/lapacke_ztgevc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztgevc( int matrix_layout, char side, char howmny,
+lapack_int API_SUFFIX(LAPACKE_ztgevc)( int matrix_layout, char side, char howmny,
                            const lapack_logical* select, lapack_int n,
                            const lapack_complex_double* s, lapack_int lds,
                            const lapack_complex_double* p, lapack_int ldp,
@@ -44,25 +44,25 @@ lapack_int LAPACKE_ztgevc( int matrix_layout, char side, char howmny,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztgevc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgevc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, p, ldp ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, p, ldp ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, s, lds ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, s, lds ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -12;
             }
         }
@@ -81,7 +81,7 @@ lapack_int LAPACKE_ztgevc( int matrix_layout, char side, char howmny,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztgevc_work( matrix_layout, side, howmny, select, n, s, lds,
+    info = API_SUFFIX(LAPACKE_ztgevc_work)( matrix_layout, side, howmny, select, n, s, lds,
                                 p, ldp, vl, ldvl, vr, ldvr, mm, m, work,
                                 rwork );
     /* Release memory and exit */
@@ -90,7 +90,7 @@ lapack_int LAPACKE_ztgevc( int matrix_layout, char side, char howmny,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztgevc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgevc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztgevc_work.c b/LAPACKE/src/lapacke_ztgevc_work.c
index b066714294..3855883e47 100644
--- a/LAPACKE/src/lapacke_ztgevc_work.c
+++ b/LAPACKE/src/lapacke_ztgevc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztgevc_work( int matrix_layout, char side, char howmny,
+lapack_int API_SUFFIX(LAPACKE_ztgevc_work)( int matrix_layout, char side, char howmny,
                                 const lapack_logical* select, lapack_int n,
                                 const lapack_complex_double* s, lapack_int lds,
                                 const lapack_complex_double* p, lapack_int ldp,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_ztgevc_work( int matrix_layout, char side, char howmny,
         /* Check leading dimension(s) */
         if( ldp < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ztgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgevc_work", info );
             return info;
         }
         if( lds < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ztgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgevc_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ztgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgevc_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_ztgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgevc_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -92,7 +92,7 @@ lapack_int LAPACKE_ztgevc_work( int matrix_layout, char side, char howmny,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             vl_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvl_t * MAX(1,mm) );
@@ -101,7 +101,7 @@ lapack_int LAPACKE_ztgevc_work( int matrix_layout, char side, char howmny,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
             vr_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvr_t * MAX(1,mm) );
@@ -111,15 +111,15 @@ lapack_int LAPACKE_ztgevc_work( int matrix_layout, char side, char howmny,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, s, lds, s_t, lds_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, p, ldp, p_t, ldp_t );
-        if( ( LAPACKE_lsame( side, 'l' ) || LAPACKE_lsame( side, 'b' ) ) &&
-            LAPACKE_lsame( howmny, 'b' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, s, lds, s_t, lds_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, p, ldp, p_t, ldp_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) || API_SUFFIX(LAPACKE_lsame)( side, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( howmny, 'b' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( ( LAPACKE_lsame( side, 'r' ) || LAPACKE_lsame( side, 'b' ) ) &&
-            LAPACKE_lsame( howmny, 'b' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) || API_SUFFIX(LAPACKE_lsame)( side, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( howmny, 'b' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ztgevc( &side, &howmny, select, &n, s_t, &lds_t, p_t, &ldp_t,
@@ -129,20 +129,20 @@ lapack_int LAPACKE_ztgevc_work( int matrix_layout, char side, char howmny,
             info = info - 1;
         }
         /* Transpose output matrices */
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
                                ldvl );
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
                                ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -151,11 +151,11 @@ lapack_int LAPACKE_ztgevc_work( int matrix_layout, char side, char howmny,
         LAPACKE_free( s_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztgevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgevc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztgevc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgevc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztgexc.c b/LAPACKE/src/lapacke_ztgexc.c
index 56d7d861e7..1782cf4706 100644
--- a/LAPACKE/src/lapacke_ztgexc.c
+++ b/LAPACKE/src/lapacke_ztgexc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztgexc( int matrix_layout, lapack_logical wantq,
+lapack_int API_SUFFIX(LAPACKE_ztgexc)( int matrix_layout, lapack_logical wantq,
                            lapack_logical wantz, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* b, lapack_int ldb,
@@ -41,30 +41,30 @@ lapack_int LAPACKE_ztgexc( int matrix_layout, lapack_logical wantq,
                            lapack_int ifst, lapack_int ilst )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztgexc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgexc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -7;
         }
         if( wantq ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -9;
             }
         }
         if( wantz ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -11;
             }
         }
     }
 #endif
-    return LAPACKE_ztgexc_work( matrix_layout, wantq, wantz, n, a, lda, b, ldb,
+    return API_SUFFIX(LAPACKE_ztgexc_work)( matrix_layout, wantq, wantz, n, a, lda, b, ldb,
                                 q, ldq, z, ldz, ifst, ilst );
 }
diff --git a/LAPACKE/src/lapacke_ztgexc_work.c b/LAPACKE/src/lapacke_ztgexc_work.c
index 333e1d3f89..021fd0b2f3 100644
--- a/LAPACKE/src/lapacke_ztgexc_work.c
+++ b/LAPACKE/src/lapacke_ztgexc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztgexc_work( int matrix_layout, lapack_logical wantq,
+lapack_int API_SUFFIX(LAPACKE_ztgexc_work)( int matrix_layout, lapack_logical wantq,
                                 lapack_logical wantz, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* b, lapack_int ldb,
@@ -60,22 +60,22 @@ lapack_int LAPACKE_ztgexc_work( int matrix_layout, lapack_logical wantq,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ztgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgexc_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ztgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgexc_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ztgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgexc_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_ztgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgexc_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -110,13 +110,13 @@ lapack_int LAPACKE_ztgexc_work( int matrix_layout, lapack_logical wantq,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         if( wantq ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         if( wantz ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ztgexc( &wantq, &wantz, &n, a_t, &lda_t, b_t, &ldb_t, q_t,
@@ -125,13 +125,13 @@ lapack_int LAPACKE_ztgexc_work( int matrix_layout, lapack_logical wantq,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         if( wantq ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         if( wantz ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
         if( wantz ) {
@@ -147,11 +147,11 @@ lapack_int LAPACKE_ztgexc_work( int matrix_layout, lapack_logical wantq,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztgexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgexc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztgexc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgexc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztgsen.c b/LAPACKE/src/lapacke_ztgsen.c
index 8c86d5e00e..7ce499a763 100644
--- a/LAPACKE/src/lapacke_ztgsen.c
+++ b/LAPACKE/src/lapacke_ztgsen.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztgsen( int matrix_layout, lapack_int ijob,
+lapack_int API_SUFFIX(LAPACKE_ztgsen)( int matrix_layout, lapack_int ijob,
                            lapack_logical wantq, lapack_logical wantz,
                            const lapack_logical* select, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
@@ -51,32 +51,32 @@ lapack_int LAPACKE_ztgsen( int matrix_layout, lapack_int ijob,
     lapack_int iwork_query;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztgsen", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsen", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
         if( wantq ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -13;
             }
         }
         if( wantz ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, z, ldz ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, z, ldz ) ) {
                 return -15;
             }
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ztgsen_work( matrix_layout, ijob, wantq, wantz, select, n, a,
+    info = API_SUFFIX(LAPACKE_ztgsen_work)( matrix_layout, ijob, wantq, wantz, select, n, a,
                                 lda, b, ldb, alpha, beta, q, ldq, z, ldz, m, pl,
                                 pr, dif, &work_query, lwork, &iwork_query,
                                 liwork );
@@ -86,12 +86,10 @@ lapack_int LAPACKE_ztgsen( int matrix_layout, lapack_int ijob,
     liwork = iwork_query;
     lwork = LAPACK_Z2INT( work_query );
     /* Allocate memory for work arrays */
-    if( ijob != 0 ) {
-        iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
-        if( iwork == NULL ) {
-            info = LAPACK_WORK_MEMORY_ERROR;
-            goto exit_level_0;
-        }
+    iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
+    if( iwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
     }
     work = (lapack_complex_double*)
         LAPACKE_malloc( sizeof(lapack_complex_double) * lwork );
@@ -100,18 +98,16 @@ lapack_int LAPACKE_ztgsen( int matrix_layout, lapack_int ijob,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztgsen_work( matrix_layout, ijob, wantq, wantz, select, n, a,
+    info = API_SUFFIX(LAPACKE_ztgsen_work)( matrix_layout, ijob, wantq, wantz, select, n, a,
                                 lda, b, ldb, alpha, beta, q, ldq, z, ldz, m, pl,
                                 pr, dif, work, lwork, iwork, liwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_1:
-    if( ijob != 0 ) {
-        LAPACKE_free( iwork );
-    }
+    LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztgsen", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsen", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztgsen_work.c b/LAPACKE/src/lapacke_ztgsen_work.c
index ffdcb1d11d..d70332be55 100644
--- a/LAPACKE/src/lapacke_ztgsen_work.c
+++ b/LAPACKE/src/lapacke_ztgsen_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztgsen_work( int matrix_layout, lapack_int ijob,
+lapack_int API_SUFFIX(LAPACKE_ztgsen_work)( int matrix_layout, lapack_int ijob,
                                 lapack_logical wantq, lapack_logical wantz,
                                 const lapack_logical* select, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
@@ -67,22 +67,22 @@ lapack_int LAPACKE_ztgsen_work( int matrix_layout, lapack_int ijob,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ztgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsen_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ztgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsen_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_ztgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsen_work", info );
             return info;
         }
         if( ldz < n ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_ztgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsen_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -124,13 +124,13 @@ lapack_int LAPACKE_ztgsen_work( int matrix_layout, lapack_int ijob,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
         if( wantq ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         if( wantz ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, z, ldz, z_t, ldz_t );
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, z, ldz, z_t, ldz_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ztgsen( &ijob, &wantq, &wantz, select, &n, a_t, &lda_t, b_t,
@@ -140,13 +140,13 @@ lapack_int LAPACKE_ztgsen_work( int matrix_layout, lapack_int ijob,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, b_t, ldb_t, b, ldb );
         if( wantq ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         if( wantz ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, z_t, ldz_t, z, ldz );
         }
         /* Release memory and exit */
         if( wantz ) {
@@ -162,11 +162,11 @@ lapack_int LAPACKE_ztgsen_work( int matrix_layout, lapack_int ijob,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztgsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsen_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztgsen_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsen_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztgsja.c b/LAPACKE/src/lapacke_ztgsja.c
index 61f83e283a..9554b36d50 100644
--- a/LAPACKE/src/lapacke_ztgsja.c
+++ b/LAPACKE/src/lapacke_ztgsja.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztgsja( int matrix_layout, char jobu, char jobv, char jobq,
+lapack_int API_SUFFIX(LAPACKE_ztgsja)( int matrix_layout, char jobu, char jobv, char jobq,
                            lapack_int m, lapack_int p, lapack_int n,
                            lapack_int k, lapack_int l, lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* b,
@@ -46,36 +46,36 @@ lapack_int LAPACKE_ztgsja( int matrix_layout, char jobu, char jobv, char jobq,
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztgsja", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsja", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -10;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, p, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, p, n, b, ldb ) ) {
             return -12;
         }
-        if( LAPACKE_lsame( jobq, 'i' ) || LAPACKE_lsame( jobq, 'q' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -22;
             }
         }
-        if( LAPACKE_d_nancheck( 1, &tola, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &tola, 1 ) ) {
             return -14;
         }
-        if( LAPACKE_d_nancheck( 1, &tolb, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_d_nancheck)( 1, &tolb, 1 ) ) {
             return -15;
         }
-        if( LAPACKE_lsame( jobu, 'i' ) || LAPACKE_lsame( jobu, 'u' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, m, m, u, ldu ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, m, u, ldu ) ) {
                 return -18;
             }
         }
-        if( LAPACKE_lsame( jobv, 'i' ) || LAPACKE_lsame( jobv, 'v' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, p, p, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, p, p, v, ldv ) ) {
                 return -20;
             }
         }
@@ -89,14 +89,14 @@ lapack_int LAPACKE_ztgsja( int matrix_layout, char jobu, char jobv, char jobq,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztgsja_work( matrix_layout, jobu, jobv, jobq, m, p, n, k, l,
+    info = API_SUFFIX(LAPACKE_ztgsja_work)( matrix_layout, jobu, jobv, jobq, m, p, n, k, l,
                                 a, lda, b, ldb, tola, tolb, alpha, beta, u, ldu,
                                 v, ldv, q, ldq, work, ncycle );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztgsja", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsja", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztgsja_work.c b/LAPACKE/src/lapacke_ztgsja_work.c
index 6ae35663aa..e012a3a12b 100644
--- a/LAPACKE/src/lapacke_ztgsja_work.c
+++ b/LAPACKE/src/lapacke_ztgsja_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztgsja_work( int matrix_layout, char jobu, char jobv,
+lapack_int API_SUFFIX(LAPACKE_ztgsja_work)( int matrix_layout, char jobu, char jobv,
                                 char jobq, lapack_int m, lapack_int p,
                                 lapack_int n, lapack_int k, lapack_int l,
                                 lapack_complex_double* a, lapack_int lda,
@@ -67,27 +67,27 @@ lapack_int LAPACKE_ztgsja_work( int matrix_layout, char jobu, char jobv,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ztgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsja_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_ztgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsja_work", info );
             return info;
         }
         if( ldq < n ) {
             info = -23;
-            LAPACKE_xerbla( "LAPACKE_ztgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsja_work", info );
             return info;
         }
         if( ldu < m ) {
             info = -19;
-            LAPACKE_xerbla( "LAPACKE_ztgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsja_work", info );
             return info;
         }
         if( ldv < p ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_ztgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsja_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -103,7 +103,7 @@ lapack_int LAPACKE_ztgsja_work( int matrix_layout, char jobu, char jobv,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu, 'i' ) || LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             u_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldu_t * MAX(1,m) );
@@ -112,7 +112,7 @@ lapack_int LAPACKE_ztgsja_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobv, 'i' ) || LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             v_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldv_t * MAX(1,p) );
@@ -121,7 +121,7 @@ lapack_int LAPACKE_ztgsja_work( int matrix_layout, char jobu, char jobv,
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobq, 'i' ) || LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             q_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldq_t * MAX(1,n) );
@@ -131,16 +131,16 @@ lapack_int LAPACKE_ztgsja_work( int matrix_layout, char jobu, char jobv,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, p, n, b, ldb, b_t, ldb_t );
-        if( LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_zge_trans( matrix_layout, m, m, u, ldu, u_t, ldu_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, p, n, b, ldb, b_t, ldb_t );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, m, u, ldu, u_t, ldu_t );
         }
-        if( LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_zge_trans( matrix_layout, p, p, v, ldv, v_t, ldv_t );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, p, p, v, ldv, v_t, ldv_t );
         }
-        if( LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ztgsja( &jobu, &jobv, &jobq, &m, &p, &n, &k, &l, a_t, &lda_t,
@@ -150,27 +150,27 @@ lapack_int LAPACKE_ztgsja_work( int matrix_layout, char jobu, char jobv,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
-        if( LAPACKE_lsame( jobu, 'i' ) || LAPACKE_lsame( jobu, 'u' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, p, n, b_t, ldb_t, b, ldb );
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, m, u_t, ldu_t, u, ldu );
         }
-        if( LAPACKE_lsame( jobv, 'i' ) || LAPACKE_lsame( jobv, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, p, p, v_t, ldv_t, v, ldv );
         }
-        if( LAPACKE_lsame( jobq, 'i' ) || LAPACKE_lsame( jobq, 'q' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobq, 'i' ) || LAPACKE_lsame( jobq, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobq, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobq, 'q' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobv, 'i' ) || LAPACKE_lsame( jobv, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobv, 'v' ) ) {
             LAPACKE_free( v_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu, 'i' ) || LAPACKE_lsame( jobu, 'u' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu, 'i' ) || API_SUFFIX(LAPACKE_lsame)( jobu, 'u' ) ) {
             LAPACKE_free( u_t );
         }
 exit_level_2:
@@ -179,11 +179,11 @@ lapack_int LAPACKE_ztgsja_work( int matrix_layout, char jobu, char jobv,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztgsja_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsja_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztgsja_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsja_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztgsna.c b/LAPACKE/src/lapacke_ztgsna.c
index d1c01a0686..d28e9cb5af 100644
--- a/LAPACKE/src/lapacke_ztgsna.c
+++ b/LAPACKE/src/lapacke_ztgsna.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztgsna( int matrix_layout, char job, char howmny,
+lapack_int API_SUFFIX(LAPACKE_ztgsna)( int matrix_layout, char job, char howmny,
                            const lapack_logical* select, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda,
                            const lapack_complex_double* b, lapack_int ldb,
@@ -47,32 +47,32 @@ lapack_int LAPACKE_ztgsna( int matrix_layout, char job, char howmny,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztgsna", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsna", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -10;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -12;
             }
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * MAX(1,n+2) );
         if( iwork == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
@@ -80,7 +80,7 @@ lapack_int LAPACKE_ztgsna( int matrix_layout, char job, char howmny,
         }
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_ztgsna_work( matrix_layout, job, howmny, select, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_ztgsna_work)( matrix_layout, job, howmny, select, n, a, lda, b,
                                 ldb, vl, ldvl, vr, ldvr, s, dif, mm, m,
                                 &work_query, lwork, iwork );
     if( info != 0 ) {
@@ -88,7 +88,7 @@ lapack_int LAPACKE_ztgsna( int matrix_layout, char job, char howmny,
     }
     lwork = LAPACK_Z2INT( work_query );
     /* Allocate memory for work arrays */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         work = (lapack_complex_double*)
             LAPACKE_malloc( sizeof(lapack_complex_double) * lwork );
         if( work == NULL ) {
@@ -97,20 +97,20 @@ lapack_int LAPACKE_ztgsna( int matrix_layout, char job, char howmny,
         }
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztgsna_work( matrix_layout, job, howmny, select, n, a, lda, b,
+    info = API_SUFFIX(LAPACKE_ztgsna_work)( matrix_layout, job, howmny, select, n, a, lda, b,
                                 ldb, vl, ldvl, vr, ldvr, s, dif, mm, m, work,
                                 lwork, iwork );
     /* Release memory and exit */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( work );
     }
 exit_level_1:
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( iwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztgsna", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsna", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztgsna_work.c b/LAPACKE/src/lapacke_ztgsna_work.c
index 4ef9e3f6b9..86c1d25db6 100644
--- a/LAPACKE/src/lapacke_ztgsna_work.c
+++ b/LAPACKE/src/lapacke_ztgsna_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztgsna_work( int matrix_layout, char job, char howmny,
+lapack_int API_SUFFIX(LAPACKE_ztgsna_work)( int matrix_layout, char job, char howmny,
                                 const lapack_logical* select, lapack_int n,
                                 const lapack_complex_double* a, lapack_int lda,
                                 const lapack_complex_double* b, lapack_int ldb,
@@ -64,22 +64,22 @@ lapack_int LAPACKE_ztgsna_work( int matrix_layout, char job, char howmny,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ztgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsna_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ztgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsna_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ztgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsna_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_ztgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsna_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -102,7 +102,7 @@ lapack_int LAPACKE_ztgsna_work( int matrix_layout, char job, char howmny,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             vl_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvl_t * MAX(1,mm) );
@@ -111,7 +111,7 @@ lapack_int LAPACKE_ztgsna_work( int matrix_layout, char job, char howmny,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             vr_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvr_t * MAX(1,mm) );
@@ -121,13 +121,13 @@ lapack_int LAPACKE_ztgsna_work( int matrix_layout, char job, char howmny,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ztgsna( &job, &howmny, select, &n, a_t, &lda_t, b_t, &ldb_t,
@@ -137,11 +137,11 @@ lapack_int LAPACKE_ztgsna_work( int matrix_layout, char job, char howmny,
             info = info - 1;
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_2:
@@ -150,11 +150,11 @@ lapack_int LAPACKE_ztgsna_work( int matrix_layout, char job, char howmny,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztgsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsna_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztgsna_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsna_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztgsyl.c b/LAPACKE/src/lapacke_ztgsyl.c
index 944a0228dd..ab0ef7ae42 100644
--- a/LAPACKE/src/lapacke_ztgsyl.c
+++ b/LAPACKE/src/lapacke_ztgsyl.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztgsyl( int matrix_layout, char trans, lapack_int ijob,
+lapack_int API_SUFFIX(LAPACKE_ztgsyl)( int matrix_layout, char trans, lapack_int ijob,
                            lapack_int m, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda,
                            const lapack_complex_double* b, lapack_int ldb,
@@ -48,28 +48,28 @@ lapack_int LAPACKE_ztgsyl( int matrix_layout, char trans, lapack_int ijob,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztgsyl", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsyl", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, m, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, m, d, ldd ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, m, d, ldd ) ) {
             return -12;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, e, lde ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, e, lde ) ) {
             return -14;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, f, ldf ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, f, ldf ) ) {
             return -16;
         }
     }
@@ -81,7 +81,7 @@ lapack_int LAPACKE_ztgsyl( int matrix_layout, char trans, lapack_int ijob,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_ztgsyl_work( matrix_layout, trans, ijob, m, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_ztgsyl_work)( matrix_layout, trans, ijob, m, n, a, lda, b, ldb,
                                 c, ldc, d, ldd, e, lde, f, ldf, scale, dif,
                                 &work_query, lwork, iwork );
     if( info != 0 ) {
@@ -96,7 +96,7 @@ lapack_int LAPACKE_ztgsyl( int matrix_layout, char trans, lapack_int ijob,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztgsyl_work( matrix_layout, trans, ijob, m, n, a, lda, b, ldb,
+    info = API_SUFFIX(LAPACKE_ztgsyl_work)( matrix_layout, trans, ijob, m, n, a, lda, b, ldb,
                                 c, ldc, d, ldd, e, lde, f, ldf, scale, dif,
                                 work, lwork, iwork );
     /* Release memory and exit */
@@ -105,7 +105,7 @@ lapack_int LAPACKE_ztgsyl( int matrix_layout, char trans, lapack_int ijob,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztgsyl", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsyl", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztgsyl_work.c b/LAPACKE/src/lapacke_ztgsyl_work.c
index 5cf44e41e2..b6142a7723 100644
--- a/LAPACKE/src/lapacke_ztgsyl_work.c
+++ b/LAPACKE/src/lapacke_ztgsyl_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztgsyl_work( int matrix_layout, char trans, lapack_int ijob,
+lapack_int API_SUFFIX(LAPACKE_ztgsyl_work)( int matrix_layout, char trans, lapack_int ijob,
                                 lapack_int m, lapack_int n,
                                 const lapack_complex_double* a, lapack_int lda,
                                 const lapack_complex_double* b, lapack_int ldb,
@@ -69,32 +69,32 @@ lapack_int LAPACKE_ztgsyl_work( int matrix_layout, char trans, lapack_int ijob,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ztgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsyl_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ztgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsyl_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ztgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsyl_work", info );
             return info;
         }
         if( ldd < m ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_ztgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsyl_work", info );
             return info;
         }
         if( lde < n ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_ztgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsyl_work", info );
             return info;
         }
         if( ldf < n ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_ztgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsyl_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -142,12 +142,12 @@ lapack_int LAPACKE_ztgsyl_work( int matrix_layout, char trans, lapack_int ijob,
             goto exit_level_5;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, m, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
-        LAPACKE_zge_trans( matrix_layout, m, m, d, ldd, d_t, ldd_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, e, lde, e_t, lde_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, f, ldf, f_t, ldf_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, m, d, ldd, d_t, ldd_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, e, lde, e_t, lde_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, f, ldf, f_t, ldf_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztgsyl( &trans, &ijob, &m, &n, a_t, &lda_t, b_t, &ldb_t, c_t,
                        &ldc_t, d_t, &ldd_t, e_t, &lde_t, f_t, &ldf_t, scale,
@@ -156,8 +156,8 @@ lapack_int LAPACKE_ztgsyl_work( int matrix_layout, char trans, lapack_int ijob,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, f_t, ldf_t, f, ldf );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, f_t, ldf_t, f, ldf );
         /* Release memory and exit */
         LAPACKE_free( f_t );
 exit_level_5:
@@ -172,11 +172,11 @@ lapack_int LAPACKE_ztgsyl_work( int matrix_layout, char trans, lapack_int ijob,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztgsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsyl_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztgsyl_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztgsyl_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztpcon.c b/LAPACKE/src/lapacke_ztpcon.c
index 54b4cdecc4..c2dafeb95a 100644
--- a/LAPACKE/src/lapacke_ztpcon.c
+++ b/LAPACKE/src/lapacke_ztpcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztpcon( int matrix_layout, char norm, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_ztpcon)( int matrix_layout, char norm, char uplo, char diag,
                            lapack_int n, const lapack_complex_double* ap,
                            double* rcond )
 {
@@ -40,13 +40,13 @@ lapack_int LAPACKE_ztpcon( int matrix_layout, char norm, char uplo, char diag,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztpcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ztp_nancheck( matrix_layout, uplo, diag, n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ztp_nancheck)( matrix_layout, uplo, diag, n, ap ) ) {
             return -6;
         }
     }
@@ -64,7 +64,7 @@ lapack_int LAPACKE_ztpcon( int matrix_layout, char norm, char uplo, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztpcon_work( matrix_layout, norm, uplo, diag, n, ap, rcond,
+    info = API_SUFFIX(LAPACKE_ztpcon_work)( matrix_layout, norm, uplo, diag, n, ap, rcond,
                                 work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -72,7 +72,7 @@ lapack_int LAPACKE_ztpcon( int matrix_layout, char norm, char uplo, char diag,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztpcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztpcon_work.c b/LAPACKE/src/lapacke_ztpcon_work.c
index 6c1baefbef..036f1c2307 100644
--- a/LAPACKE/src/lapacke_ztpcon_work.c
+++ b/LAPACKE/src/lapacke_ztpcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztpcon_work( int matrix_layout, char norm, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ztpcon_work)( int matrix_layout, char norm, char uplo,
                                 char diag, lapack_int n,
                                 const lapack_complex_double* ap, double* rcond,
                                 lapack_complex_double* work, double* rwork )
@@ -55,7 +55,7 @@ lapack_int LAPACKE_ztpcon_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ztp_trans( matrix_layout, uplo, diag, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_ztp_trans)( matrix_layout, uplo, diag, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztpcon( &norm, &uplo, &diag, &n, ap_t, rcond, work, rwork,
                        &info );
@@ -66,11 +66,11 @@ lapack_int LAPACKE_ztpcon_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztpcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztpcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztpmqrt.c b/LAPACKE/src/lapacke_ztpmqrt.c
index e39995e751..cc32a12f52 100644
--- a/LAPACKE/src/lapacke_ztpmqrt.c
+++ b/LAPACKE/src/lapacke_ztpmqrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztpmqrt( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_ztpmqrt)( int matrix_layout, char side, char trans,
                             lapack_int m, lapack_int n, lapack_int k,
                             lapack_int l, lapack_int nb,
                             const lapack_complex_double* v, lapack_int ldv,
@@ -46,35 +46,35 @@ lapack_int LAPACKE_ztpmqrt( int matrix_layout, char side, char trans,
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztpmqrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpmqrt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        ncols_a = LAPACKE_lsame( side, 'L' ) ? n :
-                             ( LAPACKE_lsame( side, 'R' ) ? k : 0 );
-        nrows_a = LAPACKE_lsame( side, 'L' ) ? k :
-                             ( LAPACKE_lsame( side, 'R' ) ? m : 0 );
-        nrows_v = LAPACKE_lsame( side, 'L' ) ? m :
-                             ( LAPACKE_lsame( side, 'R' ) ? n : 0 );
-        if( LAPACKE_zge_nancheck( matrix_layout, nrows_a, ncols_a, a, lda ) ) {
+        ncols_a = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? n :
+                             ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? k : 0 );
+        nrows_a = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? k :
+                             ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? m : 0 );
+        nrows_v = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? m :
+                             ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? n : 0 );
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, nrows_a, ncols_a, a, lda ) ) {
             return -13;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -15;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, nb, k, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, nb, k, t, ldt ) ) {
             return -11;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, nrows_v, k, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, nrows_v, k, v, ldv ) ) {
             return -9;
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    lwork = LAPACKE_lsame( side, 'L' ) ? MAX(1,nb) * MAX(1,n) :
-                       ( LAPACKE_lsame( side, 'R' ) ? MAX(1,m) * MAX(1,nb) : 0 );
+    lwork = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? MAX(1,nb) * MAX(1,n) :
+                       ( API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? MAX(1,m) * MAX(1,nb) : 0 );
     work = (lapack_complex_double*)
         LAPACKE_malloc( sizeof(lapack_complex_double) * lwork );
     if( work == NULL ) {
@@ -82,13 +82,13 @@ lapack_int LAPACKE_ztpmqrt( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztpmqrt_work( matrix_layout, side, trans, m, n, k, l, nb, v,
+    info = API_SUFFIX(LAPACKE_ztpmqrt_work)( matrix_layout, side, trans, m, n, k, l, nb, v,
                                  ldv, t, ldt, a, lda, b, ldb, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztpmqrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpmqrt", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztpmqrt_work.c b/LAPACKE/src/lapacke_ztpmqrt_work.c
index 643ae1d9d5..82d8de96b5 100644
--- a/LAPACKE/src/lapacke_ztpmqrt_work.c
+++ b/LAPACKE/src/lapacke_ztpmqrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztpmqrt_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_ztpmqrt_work)( int matrix_layout, char side, char trans,
                                  lapack_int m, lapack_int n, lapack_int k,
                                  lapack_int l, lapack_int nb,
                                  const lapack_complex_double* v, lapack_int ldv,
@@ -50,33 +50,41 @@ lapack_int LAPACKE_ztpmqrt_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int lda_t = MAX(1,k);
+        lapack_int nrowsA, ncolsA, nrowsV;
+        if      ( API_SUFFIX(LAPACKE_lsame)(side, 'l') ) { nrowsA = k; ncolsA = n; nrowsV = m; }
+        else if ( API_SUFFIX(LAPACKE_lsame)(side, 'r') ) { nrowsA = m; ncolsA = k; nrowsV = n; }
+        else {
+            info = -2;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpmqrt_work", info );
+            return info;
+        }
+        lapack_int lda_t = MAX(1,nrowsA);
         lapack_int ldb_t = MAX(1,m);
-        lapack_int ldt_t = MAX(1,ldt);
-        lapack_int ldv_t = MAX(1,ldv);
+        lapack_int ldt_t = MAX(1,nb);
+        lapack_int ldv_t = MAX(1,nrowsV);
         lapack_complex_double* v_t = NULL;
         lapack_complex_double* t_t = NULL;
         lapack_complex_double* a_t = NULL;
         lapack_complex_double* b_t = NULL;
         /* Check leading dimension(s) */
-        if( lda < m ) {
+        if( lda < ncolsA ) {
             info = -14;
-            LAPACKE_xerbla( "LAPACKE_ztpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpmqrt_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_ztpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpmqrt_work", info );
             return info;
         }
-        if( ldt < nb ) {
+        if( ldt < k ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_ztpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpmqrt_work", info );
             return info;
         }
         if( ldv < k ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ztpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpmqrt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -87,13 +95,13 @@ lapack_int LAPACKE_ztpmqrt_work( int matrix_layout, char side, char trans,
             goto exit_level_0;
         }
         t_t = (lapack_complex_double*)
-            LAPACKE_malloc( sizeof(lapack_complex_double) * ldt_t * MAX(1,nb) );
+            LAPACKE_malloc( sizeof(lapack_complex_double) * ldt_t * MAX(1,k) );
         if( t_t == NULL ) {
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
         a_t = (lapack_complex_double*)
-            LAPACKE_malloc( sizeof(lapack_complex_double) * lda_t * MAX(1,m) );
+            LAPACKE_malloc( sizeof(lapack_complex_double) * lda_t * MAX(1,ncolsA) );
         if( a_t == NULL ) {
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_2;
@@ -105,10 +113,10 @@ lapack_int LAPACKE_ztpmqrt_work( int matrix_layout, char side, char trans,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
-        LAPACKE_zge_trans( matrix_layout, ldt, nb, t, ldt, t_t, ldt_t );
-        LAPACKE_zge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_ROW_MAJOR, nrowsV, k, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_ROW_MAJOR, nb, k, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_ROW_MAJOR, nrowsA, ncolsA, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_ROW_MAJOR, m, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztpmqrt( &side, &trans, &m, &n, &k, &l, &nb, v_t, &ldv_t, t_t,
                         &ldt_t, a_t, &lda_t, b_t, &ldb_t, work, &info );
@@ -116,8 +124,8 @@ lapack_int LAPACKE_ztpmqrt_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, k, m, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrowsA, ncolsA, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_3:
@@ -128,11 +136,11 @@ lapack_int LAPACKE_ztpmqrt_work( int matrix_layout, char side, char trans,
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztpmqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpmqrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztpmqrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpmqrt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztpqrt.c b/LAPACKE/src/lapacke_ztpqrt.c
index f13112b2c7..9aa6860bd9 100644
--- a/LAPACKE/src/lapacke_ztpqrt.c
+++ b/LAPACKE/src/lapacke_ztpqrt.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztpqrt( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ztpqrt)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int l, lapack_int nb,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* b, lapack_int ldb,
@@ -41,16 +41,16 @@ lapack_int LAPACKE_ztpqrt( int matrix_layout, lapack_int m, lapack_int n,
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztpqrt", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpqrt", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -8;
         }
     }
@@ -63,13 +63,13 @@ lapack_int LAPACKE_ztpqrt( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztpqrt_work( matrix_layout, m, n, l, nb, a, lda, b, ldb, t,
+    info = API_SUFFIX(LAPACKE_ztpqrt_work)( matrix_layout, m, n, l, nb, a, lda, b, ldb, t,
                                 ldt, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztpqrt", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpqrt", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztpqrt2.c b/LAPACKE/src/lapacke_ztpqrt2.c
index 82208f0fbc..1b68b7ec85 100644
--- a/LAPACKE/src/lapacke_ztpqrt2.c
+++ b/LAPACKE/src/lapacke_ztpqrt2.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztpqrt2( int matrix_layout,
+lapack_int API_SUFFIX(LAPACKE_ztpqrt2)( int matrix_layout,
                             lapack_int m, lapack_int n, lapack_int l,
                             lapack_complex_double* a, lapack_int lda,
                             lapack_complex_double* b, lapack_int ldb,
                             lapack_complex_double* t, lapack_int ldt )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztpqrt2", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpqrt2", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -6;
         }
     }
 #endif
-    return LAPACKE_ztpqrt2_work( matrix_layout, m, n, l, a, lda, b, ldb, t, ldt );
+    return API_SUFFIX(LAPACKE_ztpqrt2_work)( matrix_layout, m, n, l, a, lda, b, ldb, t, ldt );
 }
diff --git a/LAPACKE/src/lapacke_ztpqrt2_work.c b/LAPACKE/src/lapacke_ztpqrt2_work.c
index 7a7db867f9..37c0d7d033 100644
--- a/LAPACKE/src/lapacke_ztpqrt2_work.c
+++ b/LAPACKE/src/lapacke_ztpqrt2_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztpqrt2_work( int matrix_layout,
+lapack_int API_SUFFIX(LAPACKE_ztpqrt2_work)( int matrix_layout,
                                  lapack_int m, lapack_int n, lapack_int l,
                                  lapack_complex_double* a, lapack_int lda,
                                  lapack_complex_double* b, lapack_int ldb,
@@ -55,17 +55,17 @@ lapack_int LAPACKE_ztpqrt2_work( int matrix_layout,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ztpqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpqrt2_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ztpqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpqrt2_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ztpqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpqrt2_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -88,17 +88,17 @@ lapack_int LAPACKE_ztpqrt2_work( int matrix_layout,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztpqrt2( &m, &n, &l, a_t, &lda_t, b_t, &ldb_t, t_t, &ldt_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_2:
@@ -107,11 +107,11 @@ lapack_int LAPACKE_ztpqrt2_work( int matrix_layout,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztpqrt2_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpqrt2_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztpqrt2_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpqrt2_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztpqrt_work.c b/LAPACKE/src/lapacke_ztpqrt_work.c
index 0ae35cd584..dbee38dfcf 100644
--- a/LAPACKE/src/lapacke_ztpqrt_work.c
+++ b/LAPACKE/src/lapacke_ztpqrt_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ztpqrt_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int l, lapack_int nb,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* b, lapack_int ldb,
@@ -57,17 +57,17 @@ lapack_int LAPACKE_ztpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ztpqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpqrt_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ztpqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpqrt_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ztpqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpqrt_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -90,8 +90,8 @@ lapack_int LAPACKE_ztpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztpqrt( &m, &n, &l, &nb, a_t, &lda_t, b_t, &ldb_t, t_t, &ldt_t,
                        work, &info );
@@ -99,9 +99,9 @@ lapack_int LAPACKE_ztpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, nb, n, t_t, ldt_t, t, ldt );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nb, n, t_t, ldt_t, t, ldt );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_2:
@@ -110,11 +110,11 @@ lapack_int LAPACKE_ztpqrt_work( int matrix_layout, lapack_int m, lapack_int n,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztpqrt_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpqrt_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztpqrt_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpqrt_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztprfb.c b/LAPACKE/src/lapacke_ztprfb.c
index a1ddaa4012..6fbecec3d0 100644
--- a/LAPACKE/src/lapacke_ztprfb.c
+++ b/LAPACKE/src/lapacke_ztprfb.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztprfb( int matrix_layout, char side, char trans, char direct,
+lapack_int API_SUFFIX(LAPACKE_ztprfb)( int matrix_layout, char side, char trans, char direct,
                            char storev, lapack_int m, lapack_int n,
                            lapack_int k, lapack_int l,
                            const lapack_complex_double* v, lapack_int ldv,
@@ -46,7 +46,7 @@ lapack_int LAPACKE_ztprfb( int matrix_layout, char side, char trans, char direct
     lapack_int work_size;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztprfb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztprfb", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
@@ -61,32 +61,32 @@ lapack_int LAPACKE_ztprfb( int matrix_layout, char side, char trans, char direct
          *   or m-by-k (right)
          * B is m-by-n
          */
-        if( LAPACKE_lsame( storev, 'C' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( storev, 'C' ) ) {
             ncols_v = k;
-            nrows_v = LAPACKE_lsame( side, 'L' ) ? m :
-                      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;
+            nrows_v = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? m :
+                      API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? n : 0;
+        } else if( API_SUFFIX(LAPACKE_lsame)( storev, 'R' ) ) {
+            ncols_v = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? m :
+                      API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? n : 0;
             nrows_v = k;
         } else {
             ncols_v = 0;
             nrows_v = 0;
         }
-        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_zge_nancheck( matrix_layout, ncols_a, nrows_a, a, lda ) ) {
+        nrows_a = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? k :
+                  API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? m : 0;
+        ncols_a = API_SUFFIX(LAPACKE_lsame)( side, 'L' ) ? n :
+                  API_SUFFIX(LAPACKE_lsame)( side, 'R' ) ? k : 0;
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, ncols_a, nrows_a, a, lda ) ) {
             return -14;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, b, ldb ) ) {
             return -16;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, k, k, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, k, k, t, ldt ) ) {
             return -12;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, nrows_v, ncols_v, v, ldv ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, nrows_v, ncols_v, v, ldv ) ) {
             return -10;
         }
     }
@@ -107,14 +107,14 @@ lapack_int LAPACKE_ztprfb( int matrix_layout, char side, char trans, char direct
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztprfb_work( matrix_layout, side, trans, direct, storev, m, n,
+    info = API_SUFFIX(LAPACKE_ztprfb_work)( matrix_layout, side, trans, direct, storev, m, n,
                                 k, l, v, ldv, t, ldt, a, lda, b, ldb, work,
                                 ldwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztprfb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztprfb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztprfb_work.c b/LAPACKE/src/lapacke_ztprfb_work.c
index 36944bbed2..03fe04f9da 100644
--- a/LAPACKE/src/lapacke_ztprfb_work.c
+++ b/LAPACKE/src/lapacke_ztprfb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztprfb_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_ztprfb_work)( int matrix_layout, char side, char trans,
                                 char direct, char storev, lapack_int m,
                                 lapack_int n, lapack_int k, lapack_int l,
                                 const lapack_complex_double* v, lapack_int ldv,
@@ -61,22 +61,22 @@ lapack_int LAPACKE_ztprfb_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -15;
-            LAPACKE_xerbla( "LAPACKE_ztprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztprfb_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -17;
-            LAPACKE_xerbla( "LAPACKE_ztprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztprfb_work", info );
             return info;
         }
         if( ldt < k ) {
             info = -13;
-            LAPACKE_xerbla( "LAPACKE_ztprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztprfb_work", info );
             return info;
         }
         if( ldv < k ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ztprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztprfb_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -105,18 +105,18 @@ lapack_int LAPACKE_ztprfb_work( int matrix_layout, char side, char trans,
             goto exit_level_3;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
-        LAPACKE_zge_trans( matrix_layout, ldt, k, t, ldt, t_t, ldt_t );
-        LAPACKE_zge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, ldv, k, v, ldv, v_t, ldv_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, ldt, k, t, ldt, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, k, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztprfb( &side, &trans, &direct, &storev, &m, &n, &k, &l, v_t,
                        &ldv_t, t_t, &ldt_t, a_t, &lda_t, b_t, &ldb_t, work,
                        &ldwork );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, k, m, a_t, lda_t, a, lda );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, k, m, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_3:
@@ -127,11 +127,11 @@ lapack_int LAPACKE_ztprfb_work( int matrix_layout, char side, char trans,
         LAPACKE_free( v_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztprfb_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztprfb_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztprfb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztprfb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztprfs.c b/LAPACKE/src/lapacke_ztprfs.c
index bf299ee943..97a8d76676 100644
--- a/LAPACKE/src/lapacke_ztprfs.c
+++ b/LAPACKE/src/lapacke_ztprfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztprfs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_ztprfs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int nrhs,
                            const lapack_complex_double* ap,
                            const lapack_complex_double* b, lapack_int ldb,
@@ -43,19 +43,19 @@ lapack_int LAPACKE_ztprfs( int matrix_layout, char uplo, char trans, char diag,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztprfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztprfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ztp_nancheck( matrix_layout, uplo, diag, n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ztp_nancheck)( matrix_layout, uplo, diag, n, ap ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -10;
         }
     }
@@ -73,7 +73,7 @@ lapack_int LAPACKE_ztprfs( int matrix_layout, char uplo, char trans, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztprfs_work( matrix_layout, uplo, trans, diag, n, nrhs, ap, b,
+    info = API_SUFFIX(LAPACKE_ztprfs_work)( matrix_layout, uplo, trans, diag, n, nrhs, ap, b,
                                 ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -81,7 +81,7 @@ lapack_int LAPACKE_ztprfs( int matrix_layout, char uplo, char trans, char diag,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztprfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztprfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztprfs_work.c b/LAPACKE/src/lapacke_ztprfs_work.c
index c650c3c47d..e6ff80fce2 100644
--- a/LAPACKE/src/lapacke_ztprfs_work.c
+++ b/LAPACKE/src/lapacke_ztprfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztprfs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_ztprfs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int nrhs,
                                 const lapack_complex_double* ap,
                                 const lapack_complex_double* b, lapack_int ldb,
@@ -57,12 +57,12 @@ lapack_int LAPACKE_ztprfs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ztprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztprfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ztprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztprfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -88,9 +88,9 @@ lapack_int LAPACKE_ztprfs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
-        LAPACKE_ztp_trans( matrix_layout, uplo, diag, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_ztp_trans)( matrix_layout, uplo, diag, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztprfs( &uplo, &trans, &diag, &n, &nrhs, ap_t, b_t, &ldb_t, x_t,
                        &ldx_t, ferr, berr, work, rwork, &info );
@@ -105,11 +105,11 @@ lapack_int LAPACKE_ztprfs_work( int matrix_layout, char uplo, char trans,
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztprfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztprfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztprfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztprfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztptri.c b/LAPACKE/src/lapacke_ztptri.c
index fefcb2cafb..518247579e 100644
--- a/LAPACKE/src/lapacke_ztptri.c
+++ b/LAPACKE/src/lapacke_ztptri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztptri( int matrix_layout, char uplo, char diag, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ztptri)( int matrix_layout, char uplo, char diag, lapack_int n,
                            lapack_complex_double* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztptri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztptri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ztp_nancheck( matrix_layout, uplo, diag, n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ztp_nancheck)( matrix_layout, uplo, diag, n, ap ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_ztptri_work( matrix_layout, uplo, diag, n, ap );
+    return API_SUFFIX(LAPACKE_ztptri_work)( matrix_layout, uplo, diag, n, ap );
 }
diff --git a/LAPACKE/src/lapacke_ztptri_work.c b/LAPACKE/src/lapacke_ztptri_work.c
index e72d847d24..adc9065be9 100644
--- a/LAPACKE/src/lapacke_ztptri_work.c
+++ b/LAPACKE/src/lapacke_ztptri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztptri_work( int matrix_layout, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_ztptri_work)( int matrix_layout, char uplo, char diag,
                                 lapack_int n, lapack_complex_double* ap )
 {
     lapack_int info = 0;
@@ -53,23 +53,23 @@ lapack_int LAPACKE_ztptri_work( int matrix_layout, char uplo, char diag,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ztp_trans( matrix_layout, uplo, diag, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_ztp_trans)( matrix_layout, uplo, diag, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztptri( &uplo, &diag, &n, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ztp_trans( LAPACK_COL_MAJOR, uplo, diag, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_ztp_trans)( LAPACK_COL_MAJOR, uplo, diag, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztptri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztptri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztptri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztptri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztptrs.c b/LAPACKE/src/lapacke_ztptrs.c
index bd69e98aaf..ce09d5e1d4 100644
--- a/LAPACKE/src/lapacke_ztptrs.c
+++ b/LAPACKE/src/lapacke_ztptrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztptrs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_ztptrs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int nrhs,
                            const lapack_complex_double* ap,
                            lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztptrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztptrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ztp_nancheck( matrix_layout, uplo, diag, n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_ztp_nancheck)( matrix_layout, uplo, diag, n, ap ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -8;
         }
     }
 #endif
-    return LAPACKE_ztptrs_work( matrix_layout, uplo, trans, diag, n, nrhs, ap, b,
+    return API_SUFFIX(LAPACKE_ztptrs_work)( matrix_layout, uplo, trans, diag, n, nrhs, ap, b,
                                 ldb );
 }
diff --git a/LAPACKE/src/lapacke_ztptrs_work.c b/LAPACKE/src/lapacke_ztptrs_work.c
index 8dc2258320..5d6a4e17a3 100644
--- a/LAPACKE/src/lapacke_ztptrs_work.c
+++ b/LAPACKE/src/lapacke_ztptrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztptrs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_ztptrs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int nrhs,
                                 const lapack_complex_double* ap,
                                 lapack_complex_double* b, lapack_int ldb )
@@ -51,7 +51,7 @@ lapack_int LAPACKE_ztptrs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( ldb < nrhs ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ztptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztptrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,8 +70,8 @@ lapack_int LAPACKE_ztptrs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_ztp_trans( matrix_layout, uplo, diag, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ztp_trans)( matrix_layout, uplo, diag, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztptrs( &uplo, &trans, &diag, &n, &nrhs, ap_t, b_t, &ldb_t,
                        &info );
@@ -79,18 +79,18 @@ lapack_int LAPACKE_ztptrs_work( int matrix_layout, char uplo, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( b_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztptrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztptrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztptrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztptrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztpttf.c b/LAPACKE/src/lapacke_ztpttf.c
index 248985d0d8..6b1490e471 100644
--- a/LAPACKE/src/lapacke_ztpttf.c
+++ b/LAPACKE/src/lapacke_ztpttf.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztpttf( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ztpttf)( int matrix_layout, char transr, char uplo,
                            lapack_int n, const lapack_complex_double* ap,
                            lapack_complex_double* arf )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztpttf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpttf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zpp_nancheck)( n, ap ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_ztpttf_work( matrix_layout, transr, uplo, n, ap, arf );
+    return API_SUFFIX(LAPACKE_ztpttf_work)( matrix_layout, transr, uplo, n, ap, arf );
 }
diff --git a/LAPACKE/src/lapacke_ztpttf_work.c b/LAPACKE/src/lapacke_ztpttf_work.c
index 4df8d567a2..011c38954b 100644
--- a/LAPACKE/src/lapacke_ztpttf_work.c
+++ b/LAPACKE/src/lapacke_ztpttf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztpttf_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ztpttf_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, const lapack_complex_double* ap,
                                 lapack_complex_double* arf )
 {
@@ -62,25 +62,25 @@ lapack_int LAPACKE_ztpttf_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztpttf( &transr, &uplo, &n, ap_t, arf_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zpf_trans( LAPACK_COL_MAJOR, transr, uplo, n, arf_t, arf );
+        API_SUFFIX(LAPACKE_zpf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, arf_t, arf );
         /* Release memory and exit */
         LAPACKE_free( arf_t );
 exit_level_1:
         LAPACKE_free( ap_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztpttf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpttf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztpttf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpttf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztpttr.c b/LAPACKE/src/lapacke_ztpttr.c
index bd3a3235ae..c38d1204e3 100644
--- a/LAPACKE/src/lapacke_ztpttr.c
+++ b/LAPACKE/src/lapacke_ztpttr.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztpttr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ztpttr)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_double* ap,
                            lapack_complex_double* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztpttr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpttr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zpp_nancheck)( n, ap ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_ztpttr_work( matrix_layout, uplo, n, ap, a, lda );
+    return API_SUFFIX(LAPACKE_ztpttr_work)( matrix_layout, uplo, n, ap, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_ztpttr_work.c b/LAPACKE/src/lapacke_ztpttr_work.c
index 66ecd0b52c..472f3f2958 100644
--- a/LAPACKE/src/lapacke_ztpttr_work.c
+++ b/LAPACKE/src/lapacke_ztpttr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztpttr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ztpttr_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_double* ap,
                                 lapack_complex_double* a, lapack_int lda )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_ztpttr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ztpttr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpttr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -68,25 +68,25 @@ lapack_int LAPACKE_ztpttr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztpttr( &uplo, &n, ap_t, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztpttr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpttr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztpttr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpttr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztrcon.c b/LAPACKE/src/lapacke_ztrcon.c
index 39f8d2312d..eac3bda4f6 100644
--- a/LAPACKE/src/lapacke_ztrcon.c
+++ b/LAPACKE/src/lapacke_ztrcon.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrcon( int matrix_layout, char norm, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_ztrcon)( int matrix_layout, char norm, char uplo, char diag,
                            lapack_int n, const lapack_complex_double* a,
                            lapack_int lda, double* rcond )
 {
@@ -40,13 +40,13 @@ lapack_int LAPACKE_ztrcon( int matrix_layout, char norm, char uplo, char diag,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztrcon", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrcon", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ztr_nancheck( matrix_layout, uplo, diag, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ztr_nancheck)( matrix_layout, uplo, diag, n, a, lda ) ) {
             return -6;
         }
     }
@@ -64,7 +64,7 @@ lapack_int LAPACKE_ztrcon( int matrix_layout, char norm, char uplo, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztrcon_work( matrix_layout, norm, uplo, diag, n, a, lda,
+    info = API_SUFFIX(LAPACKE_ztrcon_work)( matrix_layout, norm, uplo, diag, n, a, lda,
                                 rcond, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -72,7 +72,7 @@ lapack_int LAPACKE_ztrcon( int matrix_layout, char norm, char uplo, char diag,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztrcon", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrcon", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztrcon_work.c b/LAPACKE/src/lapacke_ztrcon_work.c
index 08188d8790..969f8a8536 100644
--- a/LAPACKE/src/lapacke_ztrcon_work.c
+++ b/LAPACKE/src/lapacke_ztrcon_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrcon_work( int matrix_layout, char norm, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ztrcon_work)( int matrix_layout, char norm, char uplo,
                                 char diag, lapack_int n,
                                 const lapack_complex_double* a, lapack_int lda,
                                 double* rcond, lapack_complex_double* work,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_ztrcon_work( int matrix_layout, char norm, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ztrcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrcon_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -63,7 +63,7 @@ lapack_int LAPACKE_ztrcon_work( int matrix_layout, char norm, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ztr_trans( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ztr_trans)( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztrcon( &norm, &uplo, &diag, &n, a_t, &lda_t, rcond, work, rwork,
                        &info );
@@ -74,11 +74,11 @@ lapack_int LAPACKE_ztrcon_work( int matrix_layout, char norm, char uplo,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztrcon_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrcon_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztrcon_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrcon_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztrevc.c b/LAPACKE/src/lapacke_ztrevc.c
index 185ed8854b..da9d0bd0d6 100644
--- a/LAPACKE/src/lapacke_ztrevc.c
+++ b/LAPACKE/src/lapacke_ztrevc.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrevc( int matrix_layout, char side, char howmny,
+lapack_int API_SUFFIX(LAPACKE_ztrevc)( int matrix_layout, char side, char howmny,
                            const lapack_logical* select, lapack_int n,
                            lapack_complex_double* t, lapack_int ldt,
                            lapack_complex_double* vl, lapack_int ldvl,
@@ -43,22 +43,22 @@ lapack_int LAPACKE_ztrevc( int matrix_layout, char side, char howmny,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztrevc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrevc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -10;
             }
         }
@@ -77,7 +77,7 @@ lapack_int LAPACKE_ztrevc( int matrix_layout, char side, char howmny,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztrevc_work( matrix_layout, side, howmny, select, n, t, ldt,
+    info = API_SUFFIX(LAPACKE_ztrevc_work)( matrix_layout, side, howmny, select, n, t, ldt,
                                 vl, ldvl, vr, ldvr, mm, m, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -85,7 +85,7 @@ lapack_int LAPACKE_ztrevc( int matrix_layout, char side, char howmny,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztrevc", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrevc", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztrevc_work.c b/LAPACKE/src/lapacke_ztrevc_work.c
index 818658fe02..3c88602000 100644
--- a/LAPACKE/src/lapacke_ztrevc_work.c
+++ b/LAPACKE/src/lapacke_ztrevc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrevc_work( int matrix_layout, char side, char howmny,
+lapack_int API_SUFFIX(LAPACKE_ztrevc_work)( int matrix_layout, char side, char howmny,
                                 const lapack_logical* select, lapack_int n,
                                 lapack_complex_double* t, lapack_int ldt,
                                 lapack_complex_double* vl, lapack_int ldvl,
@@ -58,17 +58,17 @@ lapack_int LAPACKE_ztrevc_work( int matrix_layout, char side, char howmny,
         /* Check leading dimension(s) */
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ztrevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrevc_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ztrevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrevc_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ztrevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrevc_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -78,7 +78,7 @@ lapack_int LAPACKE_ztrevc_work( int matrix_layout, char side, char howmny,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             vl_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvl_t * MAX(1,mm) );
@@ -87,7 +87,7 @@ lapack_int LAPACKE_ztrevc_work( int matrix_layout, char side, char howmny,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
             vr_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvr_t * MAX(1,mm) );
@@ -97,14 +97,14 @@ lapack_int LAPACKE_ztrevc_work( int matrix_layout, char side, char howmny,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( ( LAPACKE_lsame( side, 'l' ) || LAPACKE_lsame( side, 'b' ) ) &&
-            LAPACKE_lsame( howmny, 'b' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) || API_SUFFIX(LAPACKE_lsame)( side, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( howmny, 'b' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( ( LAPACKE_lsame( side, 'r' ) || LAPACKE_lsame( side, 'b' ) ) &&
-            LAPACKE_lsame( howmny, 'b' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( ( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) || API_SUFFIX(LAPACKE_lsame)( side, 'b' ) ) &&
+            API_SUFFIX(LAPACKE_lsame)( howmny, 'b' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ztrevc( &side, &howmny, select, &n, t_t, &ldt_t, vl_t, &ldvl_t,
@@ -113,32 +113,32 @@ lapack_int LAPACKE_ztrevc_work( int matrix_layout, char side, char howmny,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, mm, vl_t, ldvl_t, vl,
                                ldvl );
         }
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, mm, vr_t, ldvr_t, vr,
                                ldvr );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'r' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( side, 'b' ) || LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'b' ) || API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( t_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztrevc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrevc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztrevc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrevc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztrexc.c b/LAPACKE/src/lapacke_ztrexc.c
index 29b786a6b9..5c7358843e 100644
--- a/LAPACKE/src/lapacke_ztrexc.c
+++ b/LAPACKE/src/lapacke_ztrexc.c
@@ -32,28 +32,28 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrexc( int matrix_layout, char compq, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ztrexc)( int matrix_layout, char compq, lapack_int n,
                            lapack_complex_double* t, lapack_int ldt,
                            lapack_complex_double* q, lapack_int ldq,
                            lapack_int ifst, lapack_int ilst )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztrexc", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrexc", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -6;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_ztrexc_work( matrix_layout, compq, n, t, ldt, q, ldq, ifst,
+    return API_SUFFIX(LAPACKE_ztrexc_work)( matrix_layout, compq, n, t, ldt, q, ldq, ifst,
                                 ilst );
 }
diff --git a/LAPACKE/src/lapacke_ztrexc_work.c b/LAPACKE/src/lapacke_ztrexc_work.c
index 86647ede2d..c443fece72 100644
--- a/LAPACKE/src/lapacke_ztrexc_work.c
+++ b/LAPACKE/src/lapacke_ztrexc_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrexc_work( int matrix_layout, char compq, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ztrexc_work)( int matrix_layout, char compq, lapack_int n,
                                 lapack_complex_double* t, lapack_int ldt,
                                 lapack_complex_double* q, lapack_int ldq,
                                 lapack_int ifst, lapack_int ilst )
@@ -50,14 +50,14 @@ lapack_int LAPACKE_ztrexc_work( int matrix_layout, char compq, lapack_int n,
         lapack_complex_double* t_t = NULL;
         lapack_complex_double* q_t = NULL;
         /* Check leading dimension(s) */
-        if( ldq < n && LAPACKE_lsame( compq, 'v' ) ) {
+        if( ldq < n && API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ztrexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrexc_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ztrexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrexc_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -67,7 +67,7 @@ lapack_int LAPACKE_ztrexc_work( int matrix_layout, char compq, lapack_int n,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             q_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldq_t * MAX(1,n) );
@@ -77,9 +77,9 @@ lapack_int LAPACKE_ztrexc_work( int matrix_layout, char compq, lapack_int n,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ztrexc( &compq, &n, t_t, &ldt_t, q_t, &ldq_t, &ifst, &ilst,
@@ -88,23 +88,23 @@ lapack_int LAPACKE_ztrexc_work( int matrix_layout, char compq, lapack_int n,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( t_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztrexc_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrexc_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztrexc_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrexc_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztrrfs.c b/LAPACKE/src/lapacke_ztrrfs.c
index e1da3828a0..fce1cb0cbf 100644
--- a/LAPACKE/src/lapacke_ztrrfs.c
+++ b/LAPACKE/src/lapacke_ztrrfs.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrrfs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_ztrrfs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int nrhs,
                            const lapack_complex_double* a, lapack_int lda,
                            const lapack_complex_double* b, lapack_int ldb,
@@ -43,19 +43,19 @@ lapack_int LAPACKE_ztrrfs( int matrix_layout, char uplo, char trans, char diag,
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztrrfs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrrfs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ztr_nancheck( matrix_layout, uplo, diag, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ztr_nancheck)( matrix_layout, uplo, diag, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, x, ldx ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, x, ldx ) ) {
             return -11;
         }
     }
@@ -73,7 +73,7 @@ lapack_int LAPACKE_ztrrfs( int matrix_layout, char uplo, char trans, char diag,
         goto exit_level_1;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztrrfs_work( matrix_layout, uplo, trans, diag, n, nrhs, a,
+    info = API_SUFFIX(LAPACKE_ztrrfs_work)( matrix_layout, uplo, trans, diag, n, nrhs, a,
                                 lda, b, ldb, x, ldx, ferr, berr, work, rwork );
     /* Release memory and exit */
     LAPACKE_free( work );
@@ -81,7 +81,7 @@ lapack_int LAPACKE_ztrrfs( int matrix_layout, char uplo, char trans, char diag,
     LAPACKE_free( rwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztrrfs", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrrfs", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztrrfs_work.c b/LAPACKE/src/lapacke_ztrrfs_work.c
index f84a27be6c..8e1c4bb076 100644
--- a/LAPACKE/src/lapacke_ztrrfs_work.c
+++ b/LAPACKE/src/lapacke_ztrrfs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrrfs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_ztrrfs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int nrhs,
                                 const lapack_complex_double* a, lapack_int lda,
                                 const lapack_complex_double* b, lapack_int ldb,
@@ -58,17 +58,17 @@ lapack_int LAPACKE_ztrrfs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ztrrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrrfs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ztrrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrrfs_work", info );
             return info;
         }
         if( ldx < nrhs ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_ztrrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrrfs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -93,9 +93,9 @@ lapack_int LAPACKE_ztrrfs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_ztr_trans( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
+        API_SUFFIX(LAPACKE_ztr_trans)( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, x, ldx, x_t, ldx_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztrrfs( &uplo, &trans, &diag, &n, &nrhs, a_t, &lda_t, b_t,
                        &ldb_t, x_t, &ldx_t, ferr, berr, work, rwork, &info );
@@ -110,11 +110,11 @@ lapack_int LAPACKE_ztrrfs_work( int matrix_layout, char uplo, char trans,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztrrfs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrrfs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztrrfs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrrfs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztrsen.c b/LAPACKE/src/lapacke_ztrsen.c
index 0846ef6946..957b936465 100644
--- a/LAPACKE/src/lapacke_ztrsen.c
+++ b/LAPACKE/src/lapacke_ztrsen.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrsen( int matrix_layout, char job, char compq,
+lapack_int API_SUFFIX(LAPACKE_ztrsen)( int matrix_layout, char job, char compq,
                            const lapack_logical* select, lapack_int n,
                            lapack_complex_double* t, lapack_int ldt,
                            lapack_complex_double* q, lapack_int ldq,
@@ -44,24 +44,24 @@ lapack_int LAPACKE_ztrsen( int matrix_layout, char job, char compq,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztrsen", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsen", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, n, q, ldq ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, q, ldq ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ztrsen_work( matrix_layout, job, compq, select, n, t, ldt, q,
+    info = API_SUFFIX(LAPACKE_ztrsen_work)( matrix_layout, job, compq, select, n, t, ldt, q,
                                 ldq, w, m, s, sep, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_ztrsen( int matrix_layout, char job, char compq,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztrsen_work( matrix_layout, job, compq, select, n, t, ldt, q,
+    info = API_SUFFIX(LAPACKE_ztrsen_work)( matrix_layout, job, compq, select, n, t, ldt, q,
                                 ldq, w, m, s, sep, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztrsen", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsen", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztrsen_work.c b/LAPACKE/src/lapacke_ztrsen_work.c
index 55dcee4877..8aaddab46c 100644
--- a/LAPACKE/src/lapacke_ztrsen_work.c
+++ b/LAPACKE/src/lapacke_ztrsen_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrsen_work( int matrix_layout, char job, char compq,
+lapack_int API_SUFFIX(LAPACKE_ztrsen_work)( int matrix_layout, char job, char compq,
                                 const lapack_logical* select, lapack_int n,
                                 lapack_complex_double* t, lapack_int ldt,
                                 lapack_complex_double* q, lapack_int ldq,
@@ -56,12 +56,12 @@ lapack_int LAPACKE_ztrsen_work( int matrix_layout, char job, char compq,
         /* Check leading dimension(s) */
         if( ldq < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ztrsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsen_work", info );
             return info;
         }
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ztrsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsen_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -77,7 +77,7 @@ lapack_int LAPACKE_ztrsen_work( int matrix_layout, char job, char compq,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             q_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldq_t * MAX(1,n) );
@@ -87,9 +87,9 @@ lapack_int LAPACKE_ztrsen_work( int matrix_layout, char job, char compq,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, n, q, ldq, q_t, ldq_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, q, ldq, q_t, ldq_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ztrsen( &job, &compq, select, &n, t_t, &ldt_t, q_t, &ldq_t, w, m,
@@ -98,23 +98,23 @@ lapack_int LAPACKE_ztrsen_work( int matrix_layout, char job, char compq,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
-        if( LAPACKE_lsame( compq, 'v' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, t_t, ldt_t, t, ldt );
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( compq, 'v' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( compq, 'v' ) ) {
             LAPACKE_free( q_t );
         }
 exit_level_1:
         LAPACKE_free( t_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztrsen_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsen_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztrsen_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsen_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztrsna.c b/LAPACKE/src/lapacke_ztrsna.c
index cf08c44d06..388e7e2a6a 100644
--- a/LAPACKE/src/lapacke_ztrsna.c
+++ b/LAPACKE/src/lapacke_ztrsna.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrsna( int matrix_layout, char job, char howmny,
+lapack_int API_SUFFIX(LAPACKE_ztrsna)( int matrix_layout, char job, char howmny,
                            const lapack_logical* select, lapack_int n,
                            const lapack_complex_double* t, lapack_int ldt,
                            const lapack_complex_double* vl, lapack_int ldvl,
@@ -41,40 +41,40 @@ lapack_int LAPACKE_ztrsna( int matrix_layout, char job, char howmny,
                            lapack_int* m )
 {
     lapack_int info = 0;
-    lapack_int ldwork =  LAPACKE_lsame( job, 'e' ) ? 1 : MAX(1,n) ;
+    lapack_int ldwork =  API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ? 1 : MAX(1,n) ;
     double* rwork = NULL;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztrsna", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsna", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, t, ldt ) ) {
             return -6;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, mm, vl, ldvl ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, mm, vl, ldvl ) ) {
                 return -8;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            if( LAPACKE_zge_nancheck( matrix_layout, n, mm, vr, ldvr ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, mm, vr, ldvr ) ) {
                 return -10;
             }
         }
     }
 #endif
     /* Allocate memory for working array(s) */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         rwork = (double*)LAPACKE_malloc( sizeof(double) * MAX(1,n) );
         if( rwork == NULL ) {
             info = LAPACK_WORK_MEMORY_ERROR;
             goto exit_level_0;
         }
     }
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         work = (lapack_complex_double*)
             LAPACKE_malloc( sizeof(lapack_complex_double) *
                             ldwork * MAX(1,n+6) );
@@ -84,20 +84,20 @@ lapack_int LAPACKE_ztrsna( int matrix_layout, char job, char howmny,
         }
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztrsna_work( matrix_layout, job, howmny, select, n, t, ldt,
+    info = API_SUFFIX(LAPACKE_ztrsna_work)( matrix_layout, job, howmny, select, n, t, ldt,
                                 vl, ldvl, vr, ldvr, s, sep, mm, m, work, ldwork,
                                 rwork );
     /* Release memory and exit */
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( work );
     }
 exit_level_1:
-    if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'v' ) ) {
         LAPACKE_free( rwork );
     }
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztrsna", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsna", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztrsna_work.c b/LAPACKE/src/lapacke_ztrsna_work.c
index 1f0717df86..26b9ca8c10 100644
--- a/LAPACKE/src/lapacke_ztrsna_work.c
+++ b/LAPACKE/src/lapacke_ztrsna_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrsna_work( int matrix_layout, char job, char howmny,
+lapack_int API_SUFFIX(LAPACKE_ztrsna_work)( int matrix_layout, char job, char howmny,
                                 const lapack_logical* select, lapack_int n,
                                 const lapack_complex_double* t, lapack_int ldt,
                                 const lapack_complex_double* vl,
@@ -61,17 +61,17 @@ lapack_int LAPACKE_ztrsna_work( int matrix_layout, char job, char howmny,
         /* Check leading dimension(s) */
         if( ldt < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_ztrsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsna_work", info );
             return info;
         }
         if( ldvl < mm ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_ztrsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsna_work", info );
             return info;
         }
         if( ldvr < mm ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_ztrsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsna_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -81,7 +81,7 @@ lapack_int LAPACKE_ztrsna_work( int matrix_layout, char job, char howmny,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             vl_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvl_t * MAX(1,mm) );
@@ -90,7 +90,7 @@ lapack_int LAPACKE_ztrsna_work( int matrix_layout, char job, char howmny,
                 goto exit_level_1;
             }
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             vr_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) *
                                 ldvr_t * MAX(1,mm) );
@@ -100,12 +100,12 @@ lapack_int LAPACKE_ztrsna_work( int matrix_layout, char job, char howmny,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, t, ldt, t_t, ldt_t );
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, t, ldt, t_t, ldt_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, mm, vl, ldvl, vl_t, ldvl_t );
         }
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
-            LAPACKE_zge_trans( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, mm, vr, ldvr, vr_t, ldvr_t );
         }
         /* Call LAPACK function and adjust info */
         LAPACK_ztrsna( &job, &howmny, select, &n, t_t, &ldt_t, vl_t, &ldvl_t,
@@ -115,22 +115,22 @@ lapack_int LAPACKE_ztrsna_work( int matrix_layout, char job, char howmny,
             info = info - 1;
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             LAPACKE_free( vr_t );
         }
 exit_level_2:
-        if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'e' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( job, 'b' ) || API_SUFFIX(LAPACKE_lsame)( job, 'e' ) ) {
             LAPACKE_free( vl_t );
         }
 exit_level_1:
         LAPACKE_free( t_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztrsna_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsna_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztrsna_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsna_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztrsyl.c b/LAPACKE/src/lapacke_ztrsyl.c
index fe882e756b..b987a82e5f 100644
--- a/LAPACKE/src/lapacke_ztrsyl.c
+++ b/LAPACKE/src/lapacke_ztrsyl.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrsyl( int matrix_layout, char trana, char tranb,
+lapack_int API_SUFFIX(LAPACKE_ztrsyl)( int matrix_layout, char trana, char tranb,
                            lapack_int isgn, lapack_int m, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda,
                            const lapack_complex_double* b, lapack_int ldb,
@@ -40,23 +40,23 @@ lapack_int LAPACKE_ztrsyl( int matrix_layout, char trana, char tranb,
                            double* scale )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztrsyl", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsyl", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, m, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
             return -9;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -11;
         }
     }
 #endif
-    return LAPACKE_ztrsyl_work( matrix_layout, trana, tranb, isgn, m, n, a, lda,
+    return API_SUFFIX(LAPACKE_ztrsyl_work)( matrix_layout, trana, tranb, isgn, m, n, a, lda,
                                 b, ldb, c, ldc, scale );
 }
diff --git a/LAPACKE/src/lapacke_ztrsyl3.c b/LAPACKE/src/lapacke_ztrsyl3.c
new file mode 100644
index 0000000000..3447f321f2
--- /dev/null
+++ b/LAPACKE/src/lapacke_ztrsyl3.c
@@ -0,0 +1,56 @@
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_ztrsyl3)( int matrix_layout, char trana, char tranb,
+                            lapack_int isgn, lapack_int m, lapack_int n,
+                            const lapack_complex_double* a, lapack_int lda,
+                            const lapack_complex_double* b, lapack_int ldb,
+                            lapack_complex_double* c, lapack_int ldc,
+                            double* scale )
+{
+    lapack_int info = 0;
+    double swork_query[2];
+    double* swork = NULL;
+    lapack_int ldswork = -1;
+    lapack_int swork_size = -1;
+    if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsyl3", -1 );
+        return -1;
+    }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+    if( LAPACKE_get_nancheck() ) {
+        /* Optionally check input matrices for NaNs */
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, m, a, lda ) ) {
+            return -7;
+        }
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, b, ldb ) ) {
+            return -9;
+        }
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
+            return -11;
+        }
+    }
+#endif
+    /* Query optimal working array sizes */
+    info = API_SUFFIX(LAPACKE_ztrsyl3_work)( matrix_layout, trana, tranb, isgn, m, n, a, lda,
+                                 b, ldb, c, ldc, scale, swork_query, ldswork );
+    if( info != 0 ) {
+        goto exit_level_0;
+    }
+    ldswork = swork_query[0];
+    swork_size = ldswork * swork_query[1];
+    swork = (double*)LAPACKE_malloc( sizeof(double) * swork_size);
+    if( swork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
+    }
+    /* Call middle-level interface */
+    info = API_SUFFIX(LAPACKE_ztrsyl3_work)( matrix_layout, trana, tranb, isgn, m, n, a,
+                                 lda, b, ldb, c, ldc, scale, swork, ldswork );
+    /* Release memory and exit */
+    LAPACKE_free( swork );
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsyl3", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_ztrsyl3_work.c b/LAPACKE/src/lapacke_ztrsyl3_work.c
new file mode 100644
index 0000000000..c4bb2379d8
--- /dev/null
+++ b/LAPACKE/src/lapacke_ztrsyl3_work.c
@@ -0,0 +1,88 @@
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_ztrsyl3_work)( int matrix_layout, char trana, char tranb,
+                                 lapack_int isgn, lapack_int m, lapack_int n,
+                                 const lapack_complex_double* a, lapack_int lda,
+                                 const lapack_complex_double* b, lapack_int ldb,
+                                 lapack_complex_double* c, lapack_int ldc,
+                                 double* scale, double* swork,
+                                 lapack_int ldswork )
+{
+    lapack_int info = 0;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        LAPACK_ztrsyl3( &trana, &tranb, &isgn, &m, &n, a, &lda, b, &ldb, c, &ldc,
+                        scale, swork, &ldswork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        lapack_int lda_t = MAX(1,m);
+        lapack_int ldb_t = MAX(1,n);
+        lapack_int ldc_t = MAX(1,m);
+        lapack_complex_double* a_t = NULL;
+        lapack_complex_double* b_t = NULL;
+        lapack_complex_double* c_t = NULL;
+        /* Check leading dimension(s) */
+        if( lda < m ) {
+            info = -8;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsyl3_work", info );
+            return info;
+        }
+        if( ldb < n ) {
+            info = -10;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsyl3_work", info );
+            return info;
+        }
+        if( ldc < n ) {
+            info = -12;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsyl3_work", info );
+            return info;
+        }
+        /* Allocate memory for temporary array(s) */
+        a_t = (lapack_complex_double*)
+            LAPACKE_malloc( sizeof(lapack_complex_double) * lda_t * MAX(1,m) );
+        if( a_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+        b_t = (lapack_complex_double*)
+            LAPACKE_malloc( sizeof(lapack_complex_double) * ldb_t * MAX(1,n) );
+        if( b_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_1;
+        }
+        c_t = (lapack_complex_double*)
+            LAPACKE_malloc( sizeof(lapack_complex_double) * ldc_t * MAX(1,n) );
+        if( c_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_2;
+        }
+        /* Transpose input matrices */
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        /* Call LAPACK function and adjust info */
+        LAPACK_ztrsyl3( &trana, &tranb, &isgn, &m, &n, a_t, &lda_t, b_t, &ldb_t,
+                        c_t, &ldc_t, scale, swork, &ldswork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+        /* Transpose output matrices */
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        /* Release memory and exit */
+        LAPACKE_free( c_t );
+exit_level_2:
+        LAPACKE_free( b_t );
+exit_level_1:
+        LAPACKE_free( a_t );
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsyl3_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsyl3_work", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_ztrsyl_work.c b/LAPACKE/src/lapacke_ztrsyl_work.c
index 4b0813aaeb..3613cf8b5c 100644
--- a/LAPACKE/src/lapacke_ztrsyl_work.c
+++ b/LAPACKE/src/lapacke_ztrsyl_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrsyl_work( int matrix_layout, char trana, char tranb,
+lapack_int API_SUFFIX(LAPACKE_ztrsyl_work)( int matrix_layout, char trana, char tranb,
                                 lapack_int isgn, lapack_int m, lapack_int n,
                                 const lapack_complex_double* a, lapack_int lda,
                                 const lapack_complex_double* b, lapack_int ldb,
@@ -57,17 +57,17 @@ lapack_int LAPACKE_ztrsyl_work( int matrix_layout, char trana, char tranb,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ztrsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsyl_work", info );
             return info;
         }
         if( ldb < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ztrsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsyl_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_ztrsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsyl_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -90,9 +90,9 @@ lapack_int LAPACKE_ztrsyl_work( int matrix_layout, char trana, char tranb,
             goto exit_level_2;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, m, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, n, b, ldb, b_t, ldb_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztrsyl( &trana, &tranb, &isgn, &m, &n, a_t, &lda_t, b_t, &ldb_t,
                        c_t, &ldc_t, scale, &info );
@@ -100,7 +100,7 @@ lapack_int LAPACKE_ztrsyl_work( int matrix_layout, char trana, char tranb,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_2:
@@ -109,11 +109,11 @@ lapack_int LAPACKE_ztrsyl_work( int matrix_layout, char trana, char tranb,
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztrsyl_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsyl_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztrsyl_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrsyl_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztrtri.c b/LAPACKE/src/lapacke_ztrtri.c
index 94f8ef7289..65fdd3e121 100644
--- a/LAPACKE/src/lapacke_ztrtri.c
+++ b/LAPACKE/src/lapacke_ztrtri.c
@@ -32,20 +32,20 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrtri( int matrix_layout, char uplo, char diag, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ztrtri)( int matrix_layout, char uplo, char diag, lapack_int n,
                            lapack_complex_double* a, lapack_int lda )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztrtri", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrtri", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ztr_nancheck( matrix_layout, uplo, diag, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ztr_nancheck)( matrix_layout, uplo, diag, n, a, lda ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_ztrtri_work( matrix_layout, uplo, diag, n, a, lda );
+    return API_SUFFIX(LAPACKE_ztrtri_work)( matrix_layout, uplo, diag, n, a, lda );
 }
diff --git a/LAPACKE/src/lapacke_ztrtri_work.c b/LAPACKE/src/lapacke_ztrtri_work.c
index d3963e6c11..8bca966a28 100644
--- a/LAPACKE/src/lapacke_ztrtri_work.c
+++ b/LAPACKE/src/lapacke_ztrtri_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrtri_work( int matrix_layout, char uplo, char diag,
+lapack_int API_SUFFIX(LAPACKE_ztrtri_work)( int matrix_layout, char uplo, char diag,
                                 lapack_int n, lapack_complex_double* a,
                                 lapack_int lda )
 {
@@ -49,7 +49,7 @@ lapack_int LAPACKE_ztrtri_work( int matrix_layout, char uplo, char diag,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ztrtri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrtri_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -60,24 +60,24 @@ lapack_int LAPACKE_ztrtri_work( int matrix_layout, char uplo, char diag,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_ztr_trans( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_ztr_trans)( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztrtri( &uplo, &diag, &n, a_t, &lda_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_ztr_trans( LAPACK_COL_MAJOR, uplo, diag, n, a_t, lda_t, a,
+        API_SUFFIX(LAPACKE_ztr_trans)( LAPACK_COL_MAJOR, uplo, diag, n, a_t, lda_t, a,
                            lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztrtri_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrtri_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztrtri_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrtri_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztrtrs.c b/LAPACKE/src/lapacke_ztrtrs.c
index 0a8477f273..69049e9990 100644
--- a/LAPACKE/src/lapacke_ztrtrs.c
+++ b/LAPACKE/src/lapacke_ztrtrs.c
@@ -32,26 +32,26 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrtrs( int matrix_layout, char uplo, char trans, char diag,
+lapack_int API_SUFFIX(LAPACKE_ztrtrs)( int matrix_layout, char uplo, char trans, char diag,
                            lapack_int n, lapack_int nrhs,
                            const lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* b, lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztrtrs", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrtrs", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ztr_nancheck( matrix_layout, uplo, diag, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ztr_nancheck)( matrix_layout, uplo, diag, n, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, n, nrhs, b, ldb ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, nrhs, b, ldb ) ) {
             return -9;
         }
     }
 #endif
-    return LAPACKE_ztrtrs_work( matrix_layout, uplo, trans, diag, n, nrhs, a,
+    return API_SUFFIX(LAPACKE_ztrtrs_work)( matrix_layout, uplo, trans, diag, n, nrhs, a,
                                 lda, b, ldb );
 }
diff --git a/LAPACKE/src/lapacke_ztrtrs_work.c b/LAPACKE/src/lapacke_ztrtrs_work.c
index 7a5ec17f3a..f962dec8ac 100644
--- a/LAPACKE/src/lapacke_ztrtrs_work.c
+++ b/LAPACKE/src/lapacke_ztrtrs_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrtrs_work( int matrix_layout, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_ztrtrs_work)( int matrix_layout, char uplo, char trans,
                                 char diag, lapack_int n, lapack_int nrhs,
                                 const lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* b, lapack_int ldb )
@@ -53,12 +53,12 @@ lapack_int LAPACKE_ztrtrs_work( int matrix_layout, char uplo, char trans,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_ztrtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrtrs_work", info );
             return info;
         }
         if( ldb < nrhs ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_ztrtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrtrs_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -76,8 +76,8 @@ lapack_int LAPACKE_ztrtrs_work( int matrix_layout, char uplo, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_ztr_trans( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
+        API_SUFFIX(LAPACKE_ztr_trans)( matrix_layout, uplo, diag, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, nrhs, b, ldb, b_t, ldb_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztrtrs( &uplo, &trans, &diag, &n, &nrhs, a_t, &lda_t, b_t,
                        &ldb_t, &info );
@@ -85,18 +85,18 @@ lapack_int LAPACKE_ztrtrs_work( int matrix_layout, char uplo, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, nrhs, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         LAPACKE_free( b_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztrtrs_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrtrs_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztrtrs_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrtrs_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztrttf.c b/LAPACKE/src/lapacke_ztrttf.c
index 22bb9b0f6a..ae0436a3fc 100644
--- a/LAPACKE/src/lapacke_ztrttf.c
+++ b/LAPACKE/src/lapacke_ztrttf.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrttf( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ztrttf)( int matrix_layout, char transr, char uplo,
                            lapack_int n, const lapack_complex_double* a,
                            lapack_int lda, lapack_complex_double* arf )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztrttf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrttf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ztr_nancheck( matrix_layout, uplo, 'n', n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ztr_nancheck)( matrix_layout, uplo, 'n', n, a, lda ) ) {
             return -5;
         }
     }
 #endif
-    return LAPACKE_ztrttf_work( matrix_layout, transr, uplo, n, a, lda, arf );
+    return API_SUFFIX(LAPACKE_ztrttf_work)( matrix_layout, transr, uplo, n, a, lda, arf );
 }
diff --git a/LAPACKE/src/lapacke_ztrttf_work.c b/LAPACKE/src/lapacke_ztrttf_work.c
index 5512a3d9c4..bac5999d09 100644
--- a/LAPACKE/src/lapacke_ztrttf_work.c
+++ b/LAPACKE/src/lapacke_ztrttf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrttf_work( int matrix_layout, char transr, char uplo,
+lapack_int API_SUFFIX(LAPACKE_ztrttf_work)( int matrix_layout, char transr, char uplo,
                                 lapack_int n, const lapack_complex_double* a,
                                 lapack_int lda, lapack_complex_double* arf )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_ztrttf_work( int matrix_layout, char transr, char uplo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_ztrttf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrttf_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -68,25 +68,25 @@ lapack_int LAPACKE_ztrttf_work( int matrix_layout, char transr, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztrttf( &transr, &uplo, &n, a_t, &lda_t, arf_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zpf_trans( LAPACK_COL_MAJOR, transr, uplo, n, arf_t, arf );
+        API_SUFFIX(LAPACKE_zpf_trans)( LAPACK_COL_MAJOR, transr, uplo, n, arf_t, arf );
         /* Release memory and exit */
         LAPACKE_free( arf_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztrttf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrttf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztrttf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrttf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztrttp.c b/LAPACKE/src/lapacke_ztrttp.c
index 6c1239e94b..d0bccd0069 100644
--- a/LAPACKE/src/lapacke_ztrttp.c
+++ b/LAPACKE/src/lapacke_ztrttp.c
@@ -32,21 +32,21 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrttp( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ztrttp)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* ap )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztrttp", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrttp", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_ztr_nancheck( matrix_layout, uplo, 'n', n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_ztr_nancheck)( matrix_layout, uplo, 'n', n, a, lda ) ) {
             return -4;
         }
     }
 #endif
-    return LAPACKE_ztrttp_work( matrix_layout, uplo, n, a, lda, ap );
+    return API_SUFFIX(LAPACKE_ztrttp_work)( matrix_layout, uplo, n, a, lda, ap );
 }
diff --git a/LAPACKE/src/lapacke_ztrttp_work.c b/LAPACKE/src/lapacke_ztrttp_work.c
index b8488217de..25e71776b9 100644
--- a/LAPACKE/src/lapacke_ztrttp_work.c
+++ b/LAPACKE/src/lapacke_ztrttp_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztrttp_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ztrttp_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* ap )
 {
@@ -50,7 +50,7 @@ lapack_int LAPACKE_ztrttp_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ztrttp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrttp_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -68,25 +68,25 @@ lapack_int LAPACKE_ztrttp_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztrttp( &uplo, &n, a_t, &lda_t, ap_t, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zpp_trans( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
+        API_SUFFIX(LAPACKE_zpp_trans)( LAPACK_COL_MAJOR, uplo, n, ap_t, ap );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztrttp_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrttp_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztrttp_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztrttp_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztzrzf.c b/LAPACKE/src/lapacke_ztzrzf.c
index a5ea5a27c1..5738b0b479 100644
--- a/LAPACKE/src/lapacke_ztzrzf.c
+++ b/LAPACKE/src/lapacke_ztzrzf.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztzrzf( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ztzrzf)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            lapack_complex_double* tau )
 {
@@ -41,19 +41,19 @@ lapack_int LAPACKE_ztzrzf( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_ztzrzf", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztzrzf", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -4;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_ztzrzf_work( matrix_layout, m, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_ztzrzf_work)( matrix_layout, m, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -67,12 +67,12 @@ lapack_int LAPACKE_ztzrzf( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_ztzrzf_work( matrix_layout, m, n, a, lda, tau, work, lwork );
+    info = API_SUFFIX(LAPACKE_ztzrzf_work)( matrix_layout, m, n, a, lda, tau, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_ztzrzf", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztzrzf", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_ztzrzf_work.c b/LAPACKE/src/lapacke_ztzrzf_work.c
index 5a76dfc1fa..23f6b9173f 100644
--- a/LAPACKE/src/lapacke_ztzrzf_work.c
+++ b/LAPACKE/src/lapacke_ztzrzf_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_ztzrzf_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_ztzrzf_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 lapack_complex_double* tau,
                                 lapack_complex_double* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_ztzrzf_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_ztzrzf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztzrzf_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_ztzrzf_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_ztzrzf( &m, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_ztzrzf_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztzrzf_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_ztzrzf_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztzrzf_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunbdb.c b/LAPACKE/src/lapacke_zunbdb.c
index 4d6cb8faf6..d840c1ed7d 100644
--- a/LAPACKE/src/lapacke_zunbdb.c
+++ b/LAPACKE/src/lapacke_zunbdb.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunbdb( int matrix_layout, char trans, char signs,
+lapack_int API_SUFFIX(LAPACKE_zunbdb)( int matrix_layout, char trans, char signs,
                            lapack_int m, lapack_int p, lapack_int q,
                            lapack_complex_double* x11, lapack_int ldx11,
                            lapack_complex_double* x12, lapack_int ldx12,
@@ -50,10 +50,10 @@ lapack_int LAPACKE_zunbdb( int matrix_layout, char trans, char signs,
     lapack_complex_double work_query;
     int lapack_layout;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zunbdb", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunbdb", -1 );
         return -1;
     }
-    if( LAPACKE_lsame( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+    if( API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
         lapack_layout = LAPACK_COL_MAJOR;
     } else {
         lapack_layout = LAPACK_ROW_MAJOR;
@@ -61,22 +61,22 @@ lapack_int LAPACKE_zunbdb( int matrix_layout, char trans, char signs,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( lapack_layout, p, q, x11, ldx11 ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( lapack_layout, p, q, x11, ldx11 ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( lapack_layout, p, m-q, x12, ldx12 ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( lapack_layout, p, m-q, x12, ldx12 ) ) {
             return -9;
         }
-        if( LAPACKE_zge_nancheck( lapack_layout, m-p, q, x21, ldx21 ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( lapack_layout, m-p, q, x21, ldx21 ) ) {
             return -11;
         }
-        if( LAPACKE_zge_nancheck( lapack_layout, m-p, m-q, x22, ldx22 ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( lapack_layout, m-p, m-q, x22, ldx22 ) ) {
             return -13;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zunbdb_work( matrix_layout, trans, signs, m, p, q, x11, ldx11,
+    info = API_SUFFIX(LAPACKE_zunbdb_work)( matrix_layout, trans, signs, m, p, q, x11, ldx11,
                                 x12, ldx12, x21, ldx21, x22, ldx22, theta, phi,
                                 taup1, taup2, tauq1, tauq2, &work_query,
                                 lwork );
@@ -92,14 +92,14 @@ lapack_int LAPACKE_zunbdb( int matrix_layout, char trans, char signs,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zunbdb_work( matrix_layout, trans, signs, m, p, q, x11, ldx11,
+    info = API_SUFFIX(LAPACKE_zunbdb_work)( matrix_layout, trans, signs, m, p, q, x11, ldx11,
                                 x12, ldx12, x21, ldx21, x22, ldx22, theta, phi,
                                 taup1, taup2, tauq1, tauq2, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zunbdb", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunbdb", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunbdb_work.c b/LAPACKE/src/lapacke_zunbdb_work.c
index 94fc92d38e..57964443ac 100644
--- a/LAPACKE/src/lapacke_zunbdb_work.c
+++ b/LAPACKE/src/lapacke_zunbdb_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunbdb_work( int matrix_layout, char trans, char signs,
+lapack_int API_SUFFIX(LAPACKE_zunbdb_work)( int matrix_layout, char trans, char signs,
                                 lapack_int m, lapack_int p, lapack_int q,
                                 lapack_complex_double* x11, lapack_int ldx11,
                                 lapack_complex_double* x12, lapack_int ldx12,
@@ -63,7 +63,7 @@ lapack_int LAPACKE_zunbdb_work( int matrix_layout, char trans, char signs,
     if( matrix_layout == LAPACK_COL_MAJOR ||
         matrix_layout == LAPACK_ROW_MAJOR ) {
         char ltrans;
-        if( !LAPACKE_lsame( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+        if( !API_SUFFIX(LAPACKE_lsame)( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
             ltrans = 'n';
         } else {
             ltrans = 't';
@@ -77,7 +77,7 @@ lapack_int LAPACKE_zunbdb_work( int matrix_layout, char trans, char signs,
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zunbdb_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunbdb_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zuncsd.c b/LAPACKE/src/lapacke_zuncsd.c
index a423e91357..1c77e7f0a8 100644
--- a/LAPACKE/src/lapacke_zuncsd.c
+++ b/LAPACKE/src/lapacke_zuncsd.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zuncsd( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_zuncsd)( int matrix_layout, char jobu1, char jobu2,
                            char jobv1t, char jobv2t, char trans, char signs,
                            lapack_int m, lapack_int p, lapack_int q,
                            lapack_complex_double* x11, lapack_int ldx11,
@@ -55,10 +55,10 @@ lapack_int LAPACKE_zuncsd( int matrix_layout, char jobu1, char jobu2,
     lapack_complex_double work_query;
     int lapack_layout;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zuncsd", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zuncsd", -1 );
         return -1;
     }
-    if( LAPACKE_lsame( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+    if( API_SUFFIX(LAPACKE_lsame)( trans, 'n' ) && matrix_layout == LAPACK_COL_MAJOR ) {
         lapack_layout = LAPACK_COL_MAJOR;
     } else {
         lapack_layout = LAPACK_ROW_MAJOR;
@@ -66,16 +66,16 @@ lapack_int LAPACKE_zuncsd( int matrix_layout, char jobu1, char jobu2,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( lapack_layout, p, q, x11, ldx11 ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( lapack_layout, p, q, x11, ldx11 ) ) {
             return -11;
         }
-        if( LAPACKE_zge_nancheck( lapack_layout, p, m-q, x12, ldx12 ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( lapack_layout, p, m-q, x12, ldx12 ) ) {
             return -13;
         }
-        if( LAPACKE_zge_nancheck( lapack_layout, m-p, q, x21, ldx21 ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( lapack_layout, m-p, q, x21, ldx21 ) ) {
             return -15;
         }
-        if( LAPACKE_zge_nancheck( lapack_layout, m-p, m-q, x22, ldx22 ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( lapack_layout, m-p, m-q, x22, ldx22 ) ) {
             return -17;
         }
     }
@@ -87,7 +87,7 @@ lapack_int LAPACKE_zuncsd( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zuncsd_work( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
+    info = API_SUFFIX(LAPACKE_zuncsd_work)( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
                                 trans, signs, m, p, q, x11, ldx11, x12, ldx12,
                                 x21, ldx21, x22, ldx22, theta, u1, ldu1, u2,
                                 ldu2, v1t, ldv1t, v2t, ldv2t, &work_query,
@@ -110,7 +110,7 @@ lapack_int LAPACKE_zuncsd( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zuncsd_work( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
+    info = API_SUFFIX(LAPACKE_zuncsd_work)( matrix_layout, jobu1, jobu2, jobv1t, jobv2t,
                                 trans, signs, m, p, q, x11, ldx11, x12, ldx12,
                                 x21, ldx21, x22, ldx22, theta, u1, ldu1, u2,
                                 ldu2, v1t, ldv1t, v2t, ldv2t, work, lwork,
@@ -123,7 +123,7 @@ lapack_int LAPACKE_zuncsd( int matrix_layout, char jobu1, char jobu2,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zuncsd", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zuncsd", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zuncsd2by1.c b/LAPACKE/src/lapacke_zuncsd2by1.c
index 321b5af49b..39a77a26e2 100644
--- a/LAPACKE/src/lapacke_zuncsd2by1.c
+++ b/LAPACKE/src/lapacke_zuncsd2by1.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zuncsd2by1( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_zuncsd2by1)( int matrix_layout, char jobu1, char jobu2,
                            char jobv1t, lapack_int m, lapack_int p, lapack_int q,
                            lapack_complex_double* x11, lapack_int ldx11,
                            lapack_complex_double* x21, lapack_int ldx21,
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zuncsd2by1( int matrix_layout, char jobu1, char jobu2,
     lapack_complex_double work_query;
     lapack_int nrows_x11, nrows_x21;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zuncsd2by1", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zuncsd2by1", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
@@ -58,11 +58,11 @@ lapack_int LAPACKE_zuncsd2by1( int matrix_layout, char jobu1, char jobu2,
         /* Optionally check input matrices for NaNs */
         nrows_x11 = p;
         nrows_x21 = m-p;
-        if( LAPACKE_zge_nancheck( matrix_layout, nrows_x11, q, x11, ldx11 ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, nrows_x11, q, x11, ldx11 ) ) {
             return -8;
         }
  
-        if( LAPACKE_zge_nancheck( matrix_layout, nrows_x21, q, x21, ldx21 ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, nrows_x21, q, x21, ldx21 ) ) {
             return -9;
         }
     }
@@ -74,7 +74,7 @@ lapack_int LAPACKE_zuncsd2by1( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_0;
     }
     /* Query optimal working array(s) size */
-    info = LAPACKE_zuncsd2by1_work( matrix_layout, jobu1, jobu2, jobv1t, m, p, q,
+    info = API_SUFFIX(LAPACKE_zuncsd2by1_work)( matrix_layout, jobu1, jobu2, jobv1t, m, p, q,
                                 x11, ldx11, x21, ldx21, theta, u1, ldu1, u2,
                                 ldu2, v1t, ldv1t, &work_query,
                                 lwork, &rwork_query, lrwork, iwork );
@@ -95,7 +95,7 @@ lapack_int LAPACKE_zuncsd2by1( int matrix_layout, char jobu1, char jobu2,
         goto exit_level_2;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zuncsd2by1_work( matrix_layout, jobu1, jobu2, jobv1t, m, p, q,
+    info = API_SUFFIX(LAPACKE_zuncsd2by1_work)( matrix_layout, jobu1, jobu2, jobv1t, m, p, q,
                                 x11, ldx11, x21, ldx21, theta, u1, ldu1, u2,
                                 ldu2, v1t, ldv1t, work, lwork, rwork, lrwork, iwork );
     /* Release memory and exit */
@@ -106,7 +106,7 @@ lapack_int LAPACKE_zuncsd2by1( int matrix_layout, char jobu1, char jobu2,
     LAPACKE_free( iwork );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zuncsd2by1", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zuncsd2by1", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zuncsd2by1_work.c b/LAPACKE/src/lapacke_zuncsd2by1_work.c
index 72f1454ff7..48917aad07 100644
--- a/LAPACKE/src/lapacke_zuncsd2by1_work.c
+++ b/LAPACKE/src/lapacke_zuncsd2by1_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_zuncsd2by1_work)( int matrix_layout, char jobu1, char jobu2,
                                 char jobv1t, lapack_int m, lapack_int p,
                                 lapack_int q, lapack_complex_double* x11, lapack_int ldx11,
                                 lapack_complex_double* x21, lapack_int ldx21,
@@ -56,9 +56,9 @@ lapack_int LAPACKE_zuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
         lapack_int nrows_x11 = p;
         lapack_int nrows_x21 = m-p;
-        lapack_int nrows_u1 = ( LAPACKE_lsame( jobu1, 'y' ) ? p : 1);
-        lapack_int nrows_u2 = ( LAPACKE_lsame( jobu2, 'y' ) ? m-p : 1);
-        lapack_int nrows_v1t = ( LAPACKE_lsame( jobv1t, 'y' ) ? q : 1);
+        lapack_int nrows_u1 = ( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ? p : 1);
+        lapack_int nrows_u2 = ( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ? m-p : 1);
+        lapack_int nrows_v1t = ( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ? q : 1);
         lapack_int ldu1_t = MAX(1,nrows_u1);
         lapack_int ldu2_t = MAX(1,nrows_u2);
         lapack_int ldv1t_t = MAX(1,nrows_v1t);
@@ -72,27 +72,27 @@ lapack_int LAPACKE_zuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
         /* Check leading dimension(s) */
         if( ldu1 < p ) {
             info = -21;
-            LAPACKE_xerbla( "LAPACKE_zuncsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zuncsd2by1_work", info );
             return info;
         }
         if( ldu2 < m-p ) {
             info = -23;
-            LAPACKE_xerbla( "LAPACKE_zuncsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zuncsd2by1_work", info );
             return info;
         }
         if( ldv1t < q ) {
             info = -25;
-            LAPACKE_xerbla( "LAPACKE_zuncsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zuncsd2by1_work", info );
             return info;
         }
         if( ldx11 < q ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zuncsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zuncsd2by1_work", info );
             return info;
         }
         if( ldx21 < q ) {
             info = -16;
-            LAPACKE_xerbla( "LAPACKE_zuncsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zuncsd2by1_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -114,7 +114,7 @@ lapack_int LAPACKE_zuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_1;
         }
-        if( LAPACKE_lsame( jobu1, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ) {
             u1_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) * ldu1_t * MAX(1,p) );
             if( u1_t == NULL ) {
@@ -122,7 +122,7 @@ lapack_int LAPACKE_zuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
                 goto exit_level_2;
             }
         }
-        if( LAPACKE_lsame( jobu2, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ) {
             u2_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) * ldu2_t * MAX(1,m-p) );
             if( u2_t == NULL ) {
@@ -130,7 +130,7 @@ lapack_int LAPACKE_zuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
                 goto exit_level_3;
             }
         }
-        if( LAPACKE_lsame( jobv1t, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ) {
             v1t_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) * ldv1t_t * MAX(1,q) );
             if( v1t_t == NULL ) {
@@ -139,9 +139,9 @@ lapack_int LAPACKE_zuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
             }
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, nrows_x11, q, x11, ldx11, x11_t,
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, nrows_x11, q, x11, ldx11, x11_t,
                            ldx11_t );
-        LAPACKE_zge_trans( matrix_layout, nrows_x21, q, x21, ldx21, x21_t,
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, nrows_x21, q, x21, ldx21, x21_t,
                            ldx21_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zuncsd2by1( &jobu1, &jobu2, &jobv1t, &m, &p,
@@ -152,32 +152,32 @@ lapack_int LAPACKE_zuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_x11, q, x11_t, ldx11_t, x11,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrows_x11, q, x11_t, ldx11_t, x11,
                            ldx11 );
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_x21, q, x21_t, ldx21_t, x21,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrows_x21, q, x21_t, ldx21_t, x21,
                            ldx21 );
-        if( LAPACKE_lsame( jobu1, 'y' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_u1, p, u1_t, ldu1_t, u1,
+        if( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrows_u1, p, u1_t, ldu1_t, u1,
                                ldu1 );
         }
-        if( LAPACKE_lsame( jobu2, 'y' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_u2, m-p, u2_t, ldu2_t,
+        if( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrows_u2, m-p, u2_t, ldu2_t,
                                u2, ldu2 );
         }
-        if( LAPACKE_lsame( jobv1t, 'y' ) ) {
-            LAPACKE_zge_trans( LAPACK_COL_MAJOR, nrows_v1t, q, v1t_t, ldv1t_t,
+        if( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ) {
+            API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, nrows_v1t, q, v1t_t, ldv1t_t,
                                v1t, ldv1t );
         }
         /* Release memory and exit */
-        if( LAPACKE_lsame( jobv1t, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobv1t, 'y' ) ) {
             LAPACKE_free( v1t_t );
         }
 exit_level_4:
-        if( LAPACKE_lsame( jobu2, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu2, 'y' ) ) {
             LAPACKE_free( u2_t );
         }
 exit_level_3:
-        if( LAPACKE_lsame( jobu1, 'y' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( jobu1, 'y' ) ) {
             LAPACKE_free( u1_t );
         }
 exit_level_2:
@@ -186,11 +186,11 @@ lapack_int LAPACKE_zuncsd2by1_work( int matrix_layout, char jobu1, char jobu2,
         LAPACKE_free( x11_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zuncsd2by1_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zuncsd2by1_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zuncsd2by1_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zuncsd2by1_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zuncsd_work.c b/LAPACKE/src/lapacke_zuncsd_work.c
index aa74cd5d8b..407fbe2854 100644
--- a/LAPACKE/src/lapacke_zuncsd_work.c
+++ b/LAPACKE/src/lapacke_zuncsd_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zuncsd_work( int matrix_layout, char jobu1, char jobu2,
+lapack_int API_SUFFIX(LAPACKE_zuncsd_work)( int matrix_layout, char jobu1, char jobu2,
                                 char jobv1t, char jobv2t, char trans,
                                 char signs, lapack_int m, lapack_int p,
                                 lapack_int q, lapack_complex_double* x11,
@@ -66,7 +66,7 @@ lapack_int LAPACKE_zuncsd_work( int matrix_layout, char jobu1, char jobu2,
     if( matrix_layout == LAPACK_COL_MAJOR ||
         matrix_layout == LAPACK_ROW_MAJOR ) {
         char ltrans;
-        if( !LAPACKE_lsame( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
+        if( !API_SUFFIX(LAPACKE_lsame)( trans, 't' ) && matrix_layout == LAPACK_COL_MAJOR ) {
             ltrans = 'n';
         } else {
             ltrans = 't';
@@ -81,7 +81,7 @@ lapack_int LAPACKE_zuncsd_work( int matrix_layout, char jobu1, char jobu2,
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zuncsd_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zuncsd_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zungbr.c b/LAPACKE/src/lapacke_zungbr.c
index a06b892679..4af00073df 100644
--- a/LAPACKE/src/lapacke_zungbr.c
+++ b/LAPACKE/src/lapacke_zungbr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zungbr( int matrix_layout, char vect, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zungbr)( int matrix_layout, char vect, lapack_int m,
                            lapack_int n, lapack_int k, lapack_complex_double* a,
                            lapack_int lda, const lapack_complex_double* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_zungbr( int matrix_layout, char vect, lapack_int m,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zungbr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungbr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_z_nancheck( MIN(m,k), tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( MIN(m,k), tau, 1 ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zungbr_work( matrix_layout, vect, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_zungbr_work)( matrix_layout, vect, m, n, k, a, lda, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_zungbr( int matrix_layout, char vect, lapack_int m,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zungbr_work( matrix_layout, vect, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_zungbr_work)( matrix_layout, vect, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zungbr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungbr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zungbr_work.c b/LAPACKE/src/lapacke_zungbr_work.c
index e7b1a18fe4..6b82d1dc9c 100644
--- a/LAPACKE/src/lapacke_zungbr_work.c
+++ b/LAPACKE/src/lapacke_zungbr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zungbr_work( int matrix_layout, char vect, lapack_int m,
+lapack_int API_SUFFIX(LAPACKE_zungbr_work)( int matrix_layout, char vect, lapack_int m,
                                 lapack_int n, lapack_int k,
                                 lapack_complex_double* a, lapack_int lda,
                                 const lapack_complex_double* tau,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zungbr_work( int matrix_layout, char vect, lapack_int m,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zungbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungbr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -68,7 +68,7 @@ lapack_int LAPACKE_zungbr_work( int matrix_layout, char vect, lapack_int m,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zungbr( &vect, &m, &n, &k, a_t, &lda_t, tau, work, &lwork,
                        &info );
@@ -76,16 +76,16 @@ lapack_int LAPACKE_zungbr_work( int matrix_layout, char vect, lapack_int m,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zungbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungbr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zungbr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungbr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunghr.c b/LAPACKE/src/lapacke_zunghr.c
index 276b263aa9..7e0f9859f4 100644
--- a/LAPACKE/src/lapacke_zunghr.c
+++ b/LAPACKE/src/lapacke_zunghr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunghr( int matrix_layout, lapack_int n, lapack_int ilo,
+lapack_int API_SUFFIX(LAPACKE_zunghr)( int matrix_layout, lapack_int n, lapack_int ilo,
                            lapack_int ihi, lapack_complex_double* a,
                            lapack_int lda, const lapack_complex_double* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_zunghr( int matrix_layout, lapack_int n, lapack_int ilo,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zunghr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunghr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, n, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_z_nancheck( n-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zunghr_work( matrix_layout, n, ilo, ihi, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_zunghr_work)( matrix_layout, n, ilo, ihi, a, lda, tau,
                                 &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_zunghr( int matrix_layout, lapack_int n, lapack_int ilo,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zunghr_work( matrix_layout, n, ilo, ihi, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_zunghr_work)( matrix_layout, n, ilo, ihi, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zunghr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunghr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunghr_work.c b/LAPACKE/src/lapacke_zunghr_work.c
index 6f91e4ee67..ca11abb982 100644
--- a/LAPACKE/src/lapacke_zunghr_work.c
+++ b/LAPACKE/src/lapacke_zunghr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunghr_work( int matrix_layout, lapack_int n, lapack_int ilo,
+lapack_int API_SUFFIX(LAPACKE_zunghr_work)( int matrix_layout, lapack_int n, lapack_int ilo,
                                 lapack_int ihi, lapack_complex_double* a,
                                 lapack_int lda,
                                 const lapack_complex_double* tau,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zunghr_work( int matrix_layout, lapack_int n, lapack_int ilo,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zunghr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunghr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -68,23 +68,23 @@ lapack_int LAPACKE_zunghr_work( int matrix_layout, lapack_int n, lapack_int ilo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zunghr( &n, &ilo, &ihi, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zunghr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunghr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zunghr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunghr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunglq.c b/LAPACKE/src/lapacke_zunglq.c
index d42d1a2786..8ececc168a 100644
--- a/LAPACKE/src/lapacke_zunglq.c
+++ b/LAPACKE/src/lapacke_zunglq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunglq( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zunglq)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int k, lapack_complex_double* a,
                            lapack_int lda, const lapack_complex_double* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_zunglq( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zunglq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunglq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_z_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( k, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zunglq_work( matrix_layout, m, n, k, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_zunglq_work)( matrix_layout, m, n, k, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_zunglq( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zunglq_work( matrix_layout, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_zunglq_work)( matrix_layout, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zunglq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunglq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunglq_work.c b/LAPACKE/src/lapacke_zunglq_work.c
index 5e57d6accd..d7e8d0d862 100644
--- a/LAPACKE/src/lapacke_zunglq_work.c
+++ b/LAPACKE/src/lapacke_zunglq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunglq_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zunglq_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int k, lapack_complex_double* a,
                                 lapack_int lda,
                                 const lapack_complex_double* tau,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zunglq_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zunglq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunglq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,23 +67,23 @@ lapack_int LAPACKE_zunglq_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zunglq( &m, &n, &k, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zunglq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunglq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zunglq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunglq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zungql.c b/LAPACKE/src/lapacke_zungql.c
index 516d2b2219..c013d7f0a8 100644
--- a/LAPACKE/src/lapacke_zungql.c
+++ b/LAPACKE/src/lapacke_zungql.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zungql( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zungql)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int k, lapack_complex_double* a,
                            lapack_int lda, const lapack_complex_double* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_zungql( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zungql", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungql", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_z_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( k, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zungql_work( matrix_layout, m, n, k, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_zungql_work)( matrix_layout, m, n, k, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_zungql( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zungql_work( matrix_layout, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_zungql_work)( matrix_layout, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zungql", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungql", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zungql_work.c b/LAPACKE/src/lapacke_zungql_work.c
index 61ab14ce5c..318c91ecd0 100644
--- a/LAPACKE/src/lapacke_zungql_work.c
+++ b/LAPACKE/src/lapacke_zungql_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zungql_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zungql_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int k, lapack_complex_double* a,
                                 lapack_int lda,
                                 const lapack_complex_double* tau,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zungql_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zungql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungql_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,23 +67,23 @@ lapack_int LAPACKE_zungql_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zungql( &m, &n, &k, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zungql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungql_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zungql_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungql_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zungqr.c b/LAPACKE/src/lapacke_zungqr.c
index 8aeedc4026..0ecc5f9d6a 100644
--- a/LAPACKE/src/lapacke_zungqr.c
+++ b/LAPACKE/src/lapacke_zungqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zungqr( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zungqr)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int k, lapack_complex_double* a,
                            lapack_int lda, const lapack_complex_double* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_zungqr( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zungqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_z_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( k, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zungqr_work( matrix_layout, m, n, k, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_zungqr_work)( matrix_layout, m, n, k, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_zungqr( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zungqr_work( matrix_layout, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_zungqr_work)( matrix_layout, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zungqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zungqr_work.c b/LAPACKE/src/lapacke_zungqr_work.c
index f50c0b15b0..202397b66f 100644
--- a/LAPACKE/src/lapacke_zungqr_work.c
+++ b/LAPACKE/src/lapacke_zungqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zungqr_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zungqr_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int k, lapack_complex_double* a,
                                 lapack_int lda,
                                 const lapack_complex_double* tau,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zungqr_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zungqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,23 +67,23 @@ lapack_int LAPACKE_zungqr_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zungqr( &m, &n, &k, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zungqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zungqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zungrq.c b/LAPACKE/src/lapacke_zungrq.c
index 7b8a3eca5a..235f5a9b8b 100644
--- a/LAPACKE/src/lapacke_zungrq.c
+++ b/LAPACKE/src/lapacke_zungrq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zungrq( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zungrq)( int matrix_layout, lapack_int m, lapack_int n,
                            lapack_int k, lapack_complex_double* a,
                            lapack_int lda, const lapack_complex_double* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_zungrq( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zungrq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungrq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -5;
         }
-        if( LAPACKE_z_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( k, tau, 1 ) ) {
             return -7;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zungrq_work( matrix_layout, m, n, k, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_zungrq_work)( matrix_layout, m, n, k, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_zungrq( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zungrq_work( matrix_layout, m, n, k, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_zungrq_work)( matrix_layout, m, n, k, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zungrq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungrq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zungrq_work.c b/LAPACKE/src/lapacke_zungrq_work.c
index 6c5856d738..352835ed18 100644
--- a/LAPACKE/src/lapacke_zungrq_work.c
+++ b/LAPACKE/src/lapacke_zungrq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zungrq_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zungrq_work)( int matrix_layout, lapack_int m, lapack_int n,
                                 lapack_int k, lapack_complex_double* a,
                                 lapack_int lda,
                                 const lapack_complex_double* tau,
@@ -51,7 +51,7 @@ lapack_int LAPACKE_zungrq_work( int matrix_layout, lapack_int m, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -6;
-            LAPACKE_xerbla( "LAPACKE_zungrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungrq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -67,23 +67,23 @@ lapack_int LAPACKE_zungrq_work( int matrix_layout, lapack_int m, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zungrq( &m, &n, &k, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zungrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungrq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zungrq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungrq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zungtr.c b/LAPACKE/src/lapacke_zungtr.c
index 9b57692257..69da63e734 100644
--- a/LAPACKE/src/lapacke_zungtr.c
+++ b/LAPACKE/src/lapacke_zungtr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zungtr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zungtr)( int matrix_layout, char uplo, lapack_int n,
                            lapack_complex_double* a, lapack_int lda,
                            const lapack_complex_double* tau )
 {
@@ -41,22 +41,22 @@ lapack_int LAPACKE_zungtr( int matrix_layout, char uplo, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zungtr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungtr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zhe_nancheck( matrix_layout, uplo, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zhe_nancheck)( matrix_layout, uplo, n, a, lda ) ) {
             return -4;
         }
-        if( LAPACKE_z_nancheck( n-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, tau, 1 ) ) {
             return -6;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zungtr_work( matrix_layout, uplo, n, a, lda, tau, &work_query,
+    info = API_SUFFIX(LAPACKE_zungtr_work)( matrix_layout, uplo, n, a, lda, tau, &work_query,
                                 lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -70,13 +70,13 @@ lapack_int LAPACKE_zungtr( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zungtr_work( matrix_layout, uplo, n, a, lda, tau, work,
+    info = API_SUFFIX(LAPACKE_zungtr_work)( matrix_layout, uplo, n, a, lda, tau, work,
                                 lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zungtr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungtr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zungtr_work.c b/LAPACKE/src/lapacke_zungtr_work.c
index 0ddb09fba9..f4a876f686 100644
--- a/LAPACKE/src/lapacke_zungtr_work.c
+++ b/LAPACKE/src/lapacke_zungtr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zungtr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zungtr_work)( int matrix_layout, char uplo, lapack_int n,
                                 lapack_complex_double* a, lapack_int lda,
                                 const lapack_complex_double* tau,
                                 lapack_complex_double* work, lapack_int lwork )
@@ -50,7 +50,7 @@ lapack_int LAPACKE_zungtr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -5;
-            LAPACKE_xerbla( "LAPACKE_zungtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungtr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -66,23 +66,23 @@ lapack_int LAPACKE_zungtr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, n, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zungtr( &uplo, &n, a_t, &lda_t, tau, work, &lwork, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zungtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungtr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zungtr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungtr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zungtsqr_row.c b/LAPACKE/src/lapacke_zungtsqr_row.c
index 71418fb849..55a85364b9 100644
--- a/LAPACKE/src/lapacke_zungtsqr_row.c
+++ b/LAPACKE/src/lapacke_zungtsqr_row.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zungtsqr_row( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zungtsqr_row)( int matrix_layout, lapack_int m, lapack_int n,
                                  lapack_int mb, lapack_int nb,
                                  lapack_complex_double* a, lapack_int lda,
                                  const lapack_complex_double* t, lapack_int ldt )
@@ -42,22 +42,22 @@ lapack_int LAPACKE_zungtsqr_row( int matrix_layout, lapack_int m, lapack_int n,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zungtsqr_row", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungtsqr_row", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
             return -6;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, nb, n, t, ldt ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, nb, n, t, ldt ) ) {
             return -8;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zungtsqr_row_work( matrix_layout, m, n, mb, nb,
+    info = API_SUFFIX(LAPACKE_zungtsqr_row_work)( matrix_layout, m, n, mb, nb,
                                       a, lda, t, ldt, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -71,13 +71,13 @@ lapack_int LAPACKE_zungtsqr_row( int matrix_layout, lapack_int m, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zungtsqr_row_work( matrix_layout, m, n, mb, nb,
+    info = API_SUFFIX(LAPACKE_zungtsqr_row_work)( matrix_layout, m, n, mb, nb,
                                       a, lda, t, ldt, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zungtsqr_row", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungtsqr_row", info );
     }
     return info;
 }
\ No newline at end of file
diff --git a/LAPACKE/src/lapacke_zungtsqr_row_work.c b/LAPACKE/src/lapacke_zungtsqr_row_work.c
index 9098558640..33850cd5c1 100644
--- a/LAPACKE/src/lapacke_zungtsqr_row_work.c
+++ b/LAPACKE/src/lapacke_zungtsqr_row_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zungtsqr_row_work( int matrix_layout, lapack_int m, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zungtsqr_row_work)( int matrix_layout, lapack_int m, lapack_int n,
                                       lapack_int mb, lapack_int nb,
                                       lapack_complex_double* a, lapack_int lda,
                                       const lapack_complex_double* t, lapack_int ldt,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_zungtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zungtsqr_row_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungtsqr_row_work", info );
             return info;
         }
         lapack_int ldt_t = MAX(1,nb);
@@ -60,7 +60,7 @@ lapack_int LAPACKE_zungtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
         /* Check leading dimension(s) */
         if( ldt < n ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zungtsqr_row_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungtsqr_row_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_zungtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, nb, n, a, lda, t_t, ldt_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, nb, n, a, lda, t_t, ldt_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zungtsqr_row( &m, &n, &mb, &nb, a_t, &lda_t, t_t, &ldt_t,
                              work, &lwork, &info );
@@ -92,18 +92,18 @@ lapack_int LAPACKE_zungtsqr_row_work( int matrix_layout, lapack_int m, lapack_in
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( t_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zungtsqr_row_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungtsqr_row_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zungtsqr_row_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zungtsqr_row_work", info );
     }
     return info;
 }
\ No newline at end of file
diff --git a/LAPACKE/src/lapacke_zunhr_col.c b/LAPACKE/src/lapacke_zunhr_col.c
new file mode 100644
index 0000000000..1f2a0f25eb
--- /dev/null
+++ b/LAPACKE/src/lapacke_zunhr_col.c
@@ -0,0 +1,24 @@
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_zunhr_col)( int matrix_layout, lapack_int m, lapack_int n,
+                              lapack_int nb, lapack_complex_double* a,
+                              lapack_int lda, lapack_complex_double* t,
+                              lapack_int ldt, lapack_complex_double* d)
+{
+  lapack_int info = 0;
+  if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+    API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunhr_col", -1 );
+    return -1;
+  }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+  if( LAPACKE_get_nancheck() ) {
+    /* Optionally check input matrices for NaNs */
+    if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda ) ) {
+      return -5;
+    }
+  }
+#endif
+  /* Call middle-level interface */
+  info = API_SUFFIX(LAPACKE_zunhr_col_work)( matrix_layout, m, n, nb, a, lda, t, ldt, d );
+  return info;
+}
diff --git a/LAPACKE/src/lapacke_zunhr_col_work.c b/LAPACKE/src/lapacke_zunhr_col_work.c
new file mode 100644
index 0000000000..f374f2431a
--- /dev/null
+++ b/LAPACKE/src/lapacke_zunhr_col_work.c
@@ -0,0 +1,69 @@
+#include "lapacke_utils.h"
+
+lapack_int API_SUFFIX(LAPACKE_zunhr_col_work)( int matrix_layout, lapack_int m, lapack_int n,
+                                   lapack_int nb, lapack_complex_double* a,
+                                   lapack_int lda, lapack_complex_double* t,
+                                   lapack_int ldt, lapack_complex_double* d )
+{
+    lapack_int info = 0;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        LAPACK_zunhr_col( &m, &n, &nb, a, &lda, t, &ldt, d, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        lapack_int lda_t = MAX(1,m);
+        lapack_int ldt_t = MAX(1,MIN(nb,n));
+        lapack_complex_double* a_t = NULL;
+        lapack_complex_double* t_t = NULL;
+        /* Check leading dimension(s) */
+        if( lda < n ) {
+            info = -6;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunhr_col_work", info );
+            return info;
+        }
+        if( ldt < n ) {
+            info = -8;
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunhr_col_work", info );
+            return info;
+        }
+        /* Allocate memory for temporary array(s) */
+        a_t = (lapack_complex_double*)
+            LAPACKE_malloc( sizeof(lapack_complex_double) * lda_t * MAX(1,n) );
+        if( a_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+        t_t = (lapack_complex_double*)
+            LAPACKE_malloc( sizeof(lapack_complex_double) *
+                            ldt_t * MAX(1,n) );
+        if( t_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_1;
+        }
+        /* Transpose input matrices */
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, a, lda, a_t, lda_t );
+        /* Call LAPACK function and adjust info */
+        LAPACK_zunhr_col( &m, &n, &nb, a_t, &lda_t, t_t, &ldt_t, d, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+        /* Transpose output matrices */
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, ldt, n, t_t, ldt_t, t,
+                           ldt );
+        /* Release memory and exit */
+        LAPACKE_free( t_t );
+exit_level_1:
+        LAPACKE_free( a_t );
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunhr_col_work", info );
+        }
+    } else {
+        info = -1;
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunhr_col_work", info );
+    }
+    return info;
+}
diff --git a/LAPACKE/src/lapacke_zunmbr.c b/LAPACKE/src/lapacke_zunmbr.c
index 64c68b29c2..edcdc3b29d 100644
--- a/LAPACKE/src/lapacke_zunmbr.c
+++ b/LAPACKE/src/lapacke_zunmbr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunmbr( int matrix_layout, char vect, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zunmbr)( int matrix_layout, char vect, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const lapack_complex_double* a, lapack_int lda,
                            const lapack_complex_double* tau,
@@ -44,27 +44,27 @@ lapack_int LAPACKE_zunmbr( int matrix_layout, char vect, char side, char trans,
     lapack_complex_double work_query;
     lapack_int nq, r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zunmbr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmbr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        nq = LAPACKE_lsame( side, 'l' ) ? m : n;
-        r = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k);
-        if( LAPACKE_zge_nancheck( matrix_layout, r, MIN(nq,k), a, lda ) ) {
+        nq = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ? nq : MIN(nq,k);
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, r, MIN(nq,k), a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -11;
         }
-        if( LAPACKE_z_nancheck( MIN(nq,k), tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( MIN(nq,k), tau, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zunmbr_work( matrix_layout, vect, side, trans, m, n, k, a,
+    info = API_SUFFIX(LAPACKE_zunmbr_work)( matrix_layout, vect, side, trans, m, n, k, a,
                                 lda, tau, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -78,13 +78,13 @@ lapack_int LAPACKE_zunmbr( int matrix_layout, char vect, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zunmbr_work( matrix_layout, vect, side, trans, m, n, k, a,
+    info = API_SUFFIX(LAPACKE_zunmbr_work)( matrix_layout, vect, side, trans, m, n, k, a,
                                 lda, tau, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zunmbr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmbr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunmbr_work.c b/LAPACKE/src/lapacke_zunmbr_work.c
index b11d67ffbc..c62dbfe61e 100644
--- a/LAPACKE/src/lapacke_zunmbr_work.c
+++ b/LAPACKE/src/lapacke_zunmbr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunmbr_work( int matrix_layout, char vect, char side,
+lapack_int API_SUFFIX(LAPACKE_zunmbr_work)( int matrix_layout, char vect, char side,
                                 char trans, lapack_int m, lapack_int n,
                                 lapack_int k, const lapack_complex_double* a,
                                 lapack_int lda,
@@ -49,8 +49,8 @@ lapack_int LAPACKE_zunmbr_work( int matrix_layout, char vect, char side,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int nq = LAPACKE_lsame( side, 'l' ) ? m : n;
-        lapack_int r = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k);
+        lapack_int nq = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ? nq : MIN(nq,k);
         lapack_int lda_t = MAX(1,r);
         lapack_int ldc_t = MAX(1,m);
         lapack_complex_double* a_t = NULL;
@@ -58,12 +58,12 @@ lapack_int LAPACKE_zunmbr_work( int matrix_layout, char vect, char side,
         /* Check leading dimension(s) */
         if( lda < MIN(nq,k) ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zunmbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmbr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zunmbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmbr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -73,7 +73,7 @@ lapack_int LAPACKE_zunmbr_work( int matrix_layout, char vect, char side,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( vect, 'q' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( vect, 'q' ) ) {
           a_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * lda_t * MAX(1,k) );
         } else {
           a_t = (lapack_complex_double*)LAPACKE_malloc( sizeof(lapack_complex_double) * lda_t * MAX(1,nq) );
@@ -89,8 +89,8 @@ lapack_int LAPACKE_zunmbr_work( int matrix_layout, char vect, char side,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, r, MIN(nq,k), a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, r, MIN(nq,k), a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zunmbr( &vect, &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t,
                        &ldc_t, work, &lwork, &info );
@@ -98,18 +98,18 @@ lapack_int LAPACKE_zunmbr_work( int matrix_layout, char vect, char side,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zunmbr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmbr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zunmbr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmbr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunmhr.c b/LAPACKE/src/lapacke_zunmhr.c
index f928b6c2ec..4c03b446ef 100644
--- a/LAPACKE/src/lapacke_zunmhr.c
+++ b/LAPACKE/src/lapacke_zunmhr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunmhr( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zunmhr)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int ilo,
                            lapack_int ihi, const lapack_complex_double* a,
                            lapack_int lda, const lapack_complex_double* tau,
@@ -44,26 +44,26 @@ lapack_int LAPACKE_zunmhr( int matrix_layout, char side, char trans,
     lapack_complex_double work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zunmhr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmhr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_zge_nancheck( matrix_layout, r, r, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, r, r, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -11;
         }
-        if( LAPACKE_z_nancheck( r-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( r-1, tau, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zunmhr_work( matrix_layout, side, trans, m, n, ilo, ihi, a,
+    info = API_SUFFIX(LAPACKE_zunmhr_work)( matrix_layout, side, trans, m, n, ilo, ihi, a,
                                 lda, tau, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -77,13 +77,13 @@ lapack_int LAPACKE_zunmhr( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zunmhr_work( matrix_layout, side, trans, m, n, ilo, ihi, a,
+    info = API_SUFFIX(LAPACKE_zunmhr_work)( matrix_layout, side, trans, m, n, ilo, ihi, a,
                                 lda, tau, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zunmhr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmhr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunmhr_work.c b/LAPACKE/src/lapacke_zunmhr_work.c
index 098473d125..81e546d012 100644
--- a/LAPACKE/src/lapacke_zunmhr_work.c
+++ b/LAPACKE/src/lapacke_zunmhr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunmhr_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zunmhr_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int ilo,
                                 lapack_int ihi, const lapack_complex_double* a,
                                 lapack_int lda,
@@ -49,7 +49,7 @@ lapack_int LAPACKE_zunmhr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lapack_int lda_t = MAX(1,r);
         lapack_int ldc_t = MAX(1,m);
         lapack_complex_double* a_t = NULL;
@@ -57,12 +57,12 @@ lapack_int LAPACKE_zunmhr_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < r ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zunmhr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmhr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zunmhr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmhr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -85,8 +85,8 @@ lapack_int LAPACKE_zunmhr_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, r, r, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, r, r, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zunmhr( &side, &trans, &m, &n, &ilo, &ihi, a_t, &lda_t, tau, c_t,
                        &ldc_t, work, &lwork, &info );
@@ -94,18 +94,18 @@ lapack_int LAPACKE_zunmhr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zunmhr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmhr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zunmhr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmhr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunmlq.c b/LAPACKE/src/lapacke_zunmlq.c
index 06b10389c1..42b78cac54 100644
--- a/LAPACKE/src/lapacke_zunmlq.c
+++ b/LAPACKE/src/lapacke_zunmlq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunmlq( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zunmlq)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const lapack_complex_double* a, lapack_int lda,
                            const lapack_complex_double* tau,
@@ -43,25 +43,26 @@ lapack_int LAPACKE_zunmlq( int matrix_layout, char side, char trans,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zunmlq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmlq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, k, m, a, lda ) ) {
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, k, r, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_z_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( k, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zunmlq_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_zunmlq_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +76,13 @@ lapack_int LAPACKE_zunmlq( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zunmlq_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_zunmlq_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zunmlq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmlq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunmlq_work.c b/LAPACKE/src/lapacke_zunmlq_work.c
index e82e7e3c68..90853a031a 100644
--- a/LAPACKE/src/lapacke_zunmlq_work.c
+++ b/LAPACKE/src/lapacke_zunmlq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunmlq_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zunmlq_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const lapack_complex_double* a, lapack_int lda,
                                 const lapack_complex_double* tau,
@@ -49,7 +49,7 @@ lapack_int LAPACKE_zunmlq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lapack_int lda_t = MAX(1,k);
         lapack_int ldc_t = MAX(1,m);
         lapack_complex_double* a_t = NULL;
@@ -57,12 +57,12 @@ lapack_int LAPACKE_zunmlq_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < r ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zunmlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmlq_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zunmlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmlq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -72,7 +72,7 @@ lapack_int LAPACKE_zunmlq_work( int matrix_layout, char side, char trans,
             return (info < 0) ? (info - 1) : info;
         }
         /* Allocate memory for temporary array(s) */
-        if( LAPACKE_lsame( side, 'l' ) ) {
+        if( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
             a_t = (lapack_complex_double*)
                 LAPACKE_malloc( sizeof(lapack_complex_double) * lda_t * MAX(1,m) );
         } else {
@@ -90,8 +90,8 @@ lapack_int LAPACKE_zunmlq_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, k, r, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zunmlq( &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t, &ldc_t,
                        work, &lwork, &info );
@@ -99,18 +99,18 @@ lapack_int LAPACKE_zunmlq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zunmlq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmlq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zunmlq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmlq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunmql.c b/LAPACKE/src/lapacke_zunmql.c
index 3cf4ace236..dce3459532 100644
--- a/LAPACKE/src/lapacke_zunmql.c
+++ b/LAPACKE/src/lapacke_zunmql.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunmql( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zunmql)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const lapack_complex_double* a, lapack_int lda,
                            const lapack_complex_double* tau,
@@ -44,26 +44,26 @@ lapack_int LAPACKE_zunmql( int matrix_layout, char side, char trans,
     lapack_int r;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zunmql", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmql", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_zge_nancheck( matrix_layout, r, k, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, r, k, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_z_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( k, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zunmql_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_zunmql_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -77,13 +77,13 @@ lapack_int LAPACKE_zunmql( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zunmql_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_zunmql_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zunmql", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmql", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunmql_work.c b/LAPACKE/src/lapacke_zunmql_work.c
index d0f155d947..937b9a84dc 100644
--- a/LAPACKE/src/lapacke_zunmql_work.c
+++ b/LAPACKE/src/lapacke_zunmql_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunmql_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zunmql_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const lapack_complex_double* a, lapack_int lda,
                                 const lapack_complex_double* tau,
@@ -48,7 +48,7 @@ lapack_int LAPACKE_zunmql_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lapack_int lda_t = MAX(1,r);
         lapack_int ldc_t = MAX(1,m);
         lapack_complex_double* a_t = NULL;
@@ -56,12 +56,12 @@ lapack_int LAPACKE_zunmql_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < k ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zunmql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmql_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zunmql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmql_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_zunmql_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, r, k, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, r, k, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zunmql( &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t, &ldc_t,
                        work, &lwork, &info );
@@ -93,18 +93,18 @@ lapack_int LAPACKE_zunmql_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zunmql_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmql_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zunmql_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmql_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunmqr.c b/LAPACKE/src/lapacke_zunmqr.c
index 7ba58eb143..95d70c49f8 100644
--- a/LAPACKE/src/lapacke_zunmqr.c
+++ b/LAPACKE/src/lapacke_zunmqr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunmqr( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zunmqr)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const lapack_complex_double* a, lapack_int lda,
                            const lapack_complex_double* tau,
@@ -44,26 +44,26 @@ lapack_int LAPACKE_zunmqr( int matrix_layout, char side, char trans,
     lapack_complex_double work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zunmqr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmqr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_zge_nancheck( matrix_layout, r, k, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, r, k, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_z_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( k, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zunmqr_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_zunmqr_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -77,13 +77,13 @@ lapack_int LAPACKE_zunmqr( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zunmqr_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_zunmqr_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zunmqr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmqr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunmqr_work.c b/LAPACKE/src/lapacke_zunmqr_work.c
index 4a8fbbae3a..44a397c2a1 100644
--- a/LAPACKE/src/lapacke_zunmqr_work.c
+++ b/LAPACKE/src/lapacke_zunmqr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunmqr_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zunmqr_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const lapack_complex_double* a, lapack_int lda,
                                 const lapack_complex_double* tau,
@@ -48,7 +48,7 @@ lapack_int LAPACKE_zunmqr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lapack_int lda_t = MAX(1,r);
         lapack_int ldc_t = MAX(1,m);
         lapack_complex_double* a_t = NULL;
@@ -56,12 +56,12 @@ lapack_int LAPACKE_zunmqr_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < k ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zunmqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmqr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zunmqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmqr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_zunmqr_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, r, k, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, r, k, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zunmqr( &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t, &ldc_t,
                        work, &lwork, &info );
@@ -93,18 +93,18 @@ lapack_int LAPACKE_zunmqr_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zunmqr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmqr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zunmqr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmqr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunmrq.c b/LAPACKE/src/lapacke_zunmrq.c
index 8426d3b4eb..8d7a0648e6 100644
--- a/LAPACKE/src/lapacke_zunmrq.c
+++ b/LAPACKE/src/lapacke_zunmrq.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunmrq( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zunmrq)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            const lapack_complex_double* a, lapack_int lda,
                            const lapack_complex_double* tau,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_zunmrq( int matrix_layout, char side, char trans,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zunmrq", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmrq", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, k, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, k, m, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_z_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( k, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zunmrq_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_zunmrq_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_zunmrq( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zunmrq_work( matrix_layout, side, trans, m, n, k, a, lda, tau,
+    info = API_SUFFIX(LAPACKE_zunmrq_work)( matrix_layout, side, trans, m, n, k, a, lda, tau,
                                 c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zunmrq", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmrq", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunmrq_work.c b/LAPACKE/src/lapacke_zunmrq_work.c
index f3ae975603..fc43fa1d9b 100644
--- a/LAPACKE/src/lapacke_zunmrq_work.c
+++ b/LAPACKE/src/lapacke_zunmrq_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunmrq_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zunmrq_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 const lapack_complex_double* a, lapack_int lda,
                                 const lapack_complex_double* tau,
@@ -55,12 +55,12 @@ lapack_int LAPACKE_zunmrq_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zunmrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmrq_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zunmrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmrq_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -83,8 +83,8 @@ lapack_int LAPACKE_zunmrq_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, k, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zunmrq( &side, &trans, &m, &n, &k, a_t, &lda_t, tau, c_t, &ldc_t,
                        work, &lwork, &info );
@@ -92,18 +92,18 @@ lapack_int LAPACKE_zunmrq_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zunmrq_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmrq_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zunmrq_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmrq_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunmrz.c b/LAPACKE/src/lapacke_zunmrz.c
index f95f27e2cb..f9c9c2c827 100644
--- a/LAPACKE/src/lapacke_zunmrz.c
+++ b/LAPACKE/src/lapacke_zunmrz.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunmrz( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zunmrz)( int matrix_layout, char side, char trans,
                            lapack_int m, lapack_int n, lapack_int k,
                            lapack_int l, const lapack_complex_double* a,
                            lapack_int lda, const lapack_complex_double* tau,
@@ -43,25 +43,25 @@ lapack_int LAPACKE_zunmrz( int matrix_layout, char side, char trans,
     lapack_complex_double* work = NULL;
     lapack_complex_double work_query;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zunmrz", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmrz", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zge_nancheck( matrix_layout, k, m, a, lda ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, k, m, a, lda ) ) {
             return -8;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -11;
         }
-        if( LAPACKE_z_nancheck( k, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( k, tau, 1 ) ) {
             return -10;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zunmrz_work( matrix_layout, side, trans, m, n, k, l, a, lda,
+    info = API_SUFFIX(LAPACKE_zunmrz_work)( matrix_layout, side, trans, m, n, k, l, a, lda,
                                 tau, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -75,13 +75,13 @@ lapack_int LAPACKE_zunmrz( int matrix_layout, char side, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zunmrz_work( matrix_layout, side, trans, m, n, k, l, a, lda,
+    info = API_SUFFIX(LAPACKE_zunmrz_work)( matrix_layout, side, trans, m, n, k, l, a, lda,
                                 tau, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zunmrz", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmrz", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunmrz_work.c b/LAPACKE/src/lapacke_zunmrz_work.c
index be1cc73e13..eefa205a2c 100644
--- a/LAPACKE/src/lapacke_zunmrz_work.c
+++ b/LAPACKE/src/lapacke_zunmrz_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunmrz_work( int matrix_layout, char side, char trans,
+lapack_int API_SUFFIX(LAPACKE_zunmrz_work)( int matrix_layout, char side, char trans,
                                 lapack_int m, lapack_int n, lapack_int k,
                                 lapack_int l, const lapack_complex_double* a,
                                 lapack_int lda,
@@ -56,12 +56,12 @@ lapack_int LAPACKE_zunmrz_work( int matrix_layout, char side, char trans,
         /* Check leading dimension(s) */
         if( lda < m ) {
             info = -9;
-            LAPACKE_xerbla( "LAPACKE_zunmrz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmrz_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -12;
-            LAPACKE_xerbla( "LAPACKE_zunmrz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmrz_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_zunmrz_work( int matrix_layout, char side, char trans,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, k, m, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, k, m, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zunmrz( &side, &trans, &m, &n, &k, &l, a_t, &lda_t, tau, c_t,
                        &ldc_t, work, &lwork, &info );
@@ -93,18 +93,18 @@ lapack_int LAPACKE_zunmrz_work( int matrix_layout, char side, char trans,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zunmrz_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmrz_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zunmrz_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmrz_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunmtr.c b/LAPACKE/src/lapacke_zunmtr.c
index 90afb42dd1..3fc4132a36 100644
--- a/LAPACKE/src/lapacke_zunmtr.c
+++ b/LAPACKE/src/lapacke_zunmtr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunmtr( int matrix_layout, char side, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_zunmtr)( int matrix_layout, char side, char uplo, char trans,
                            lapack_int m, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda,
                            const lapack_complex_double* tau,
@@ -44,26 +44,26 @@ lapack_int LAPACKE_zunmtr( int matrix_layout, char side, char uplo, char trans,
     lapack_complex_double work_query;
     lapack_int r;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zunmtr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmtr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_zge_nancheck( matrix_layout, r, r, a, lda ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, r, r, a, lda ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -10;
         }
-        if( LAPACKE_z_nancheck( r-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( r-1, tau, 1 ) ) {
             return -9;
         }
     }
 #endif
     /* Query optimal working array(s) size */
-    info = LAPACKE_zunmtr_work( matrix_layout, side, uplo, trans, m, n, a, lda,
+    info = API_SUFFIX(LAPACKE_zunmtr_work)( matrix_layout, side, uplo, trans, m, n, a, lda,
                                 tau, c, ldc, &work_query, lwork );
     if( info != 0 ) {
         goto exit_level_0;
@@ -77,13 +77,13 @@ lapack_int LAPACKE_zunmtr( int matrix_layout, char side, char uplo, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zunmtr_work( matrix_layout, side, uplo, trans, m, n, a, lda,
+    info = API_SUFFIX(LAPACKE_zunmtr_work)( matrix_layout, side, uplo, trans, m, n, a, lda,
                                 tau, c, ldc, work, lwork );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zunmtr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmtr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zunmtr_work.c b/LAPACKE/src/lapacke_zunmtr_work.c
index 41e1f26ce6..dd32ec7660 100644
--- a/LAPACKE/src/lapacke_zunmtr_work.c
+++ b/LAPACKE/src/lapacke_zunmtr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zunmtr_work( int matrix_layout, char side, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zunmtr_work)( int matrix_layout, char side, char uplo,
                                 char trans, lapack_int m, lapack_int n,
                                 const lapack_complex_double* a, lapack_int lda,
                                 const lapack_complex_double* tau,
@@ -48,7 +48,7 @@ lapack_int LAPACKE_zunmtr_work( int matrix_layout, char side, char uplo,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lapack_int lda_t = MAX(1,r);
         lapack_int ldc_t = MAX(1,m);
         lapack_complex_double* a_t = NULL;
@@ -56,12 +56,12 @@ lapack_int LAPACKE_zunmtr_work( int matrix_layout, char side, char uplo,
         /* Check leading dimension(s) */
         if( lda < r ) {
             info = -8;
-            LAPACKE_xerbla( "LAPACKE_zunmtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmtr_work", info );
             return info;
         }
         if( ldc < n ) {
             info = -11;
-            LAPACKE_xerbla( "LAPACKE_zunmtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmtr_work", info );
             return info;
         }
         /* Query optimal working array(s) size if requested */
@@ -84,8 +84,8 @@ lapack_int LAPACKE_zunmtr_work( int matrix_layout, char side, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, r, r, a, lda, a_t, lda_t );
-        LAPACKE_zge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, r, r, a, lda, a_t, lda_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zunmtr( &side, &uplo, &trans, &m, &n, a_t, &lda_t, tau, c_t,
                        &ldc_t, work, &lwork, &info );
@@ -93,18 +93,18 @@ lapack_int LAPACKE_zunmtr_work( int matrix_layout, char side, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( c_t );
 exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zunmtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmtr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zunmtr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zunmtr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zupgtr.c b/LAPACKE/src/lapacke_zupgtr.c
index 5c698bfd97..b8edcdcdbc 100644
--- a/LAPACKE/src/lapacke_zupgtr.c
+++ b/LAPACKE/src/lapacke_zupgtr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zupgtr( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zupgtr)( int matrix_layout, char uplo, lapack_int n,
                            const lapack_complex_double* ap,
                            const lapack_complex_double* tau,
                            lapack_complex_double* q, lapack_int ldq )
@@ -40,16 +40,16 @@ lapack_int LAPACKE_zupgtr( int matrix_layout, char uplo, lapack_int n,
     lapack_int info = 0;
     lapack_complex_double* work = NULL;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zupgtr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zupgtr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_zpp_nancheck( n, ap ) ) {
+        if( API_SUFFIX(LAPACKE_zpp_nancheck)( n, ap ) ) {
             return -4;
         }
-        if( LAPACKE_z_nancheck( n-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( n-1, tau, 1 ) ) {
             return -5;
         }
     }
@@ -62,12 +62,12 @@ lapack_int LAPACKE_zupgtr( int matrix_layout, char uplo, lapack_int n,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zupgtr_work( matrix_layout, uplo, n, ap, tau, q, ldq, work );
+    info = API_SUFFIX(LAPACKE_zupgtr_work)( matrix_layout, uplo, n, ap, tau, q, ldq, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zupgtr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zupgtr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zupgtr_work.c b/LAPACKE/src/lapacke_zupgtr_work.c
index 52f169df3a..4b80bd3d3a 100644
--- a/LAPACKE/src/lapacke_zupgtr_work.c
+++ b/LAPACKE/src/lapacke_zupgtr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zupgtr_work( int matrix_layout, char uplo, lapack_int n,
+lapack_int API_SUFFIX(LAPACKE_zupgtr_work)( int matrix_layout, char uplo, lapack_int n,
                                 const lapack_complex_double* ap,
                                 const lapack_complex_double* tau,
                                 lapack_complex_double* q, lapack_int ldq,
@@ -52,7 +52,7 @@ lapack_int LAPACKE_zupgtr_work( int matrix_layout, char uplo, lapack_int n,
         /* Check leading dimension(s) */
         if( ldq < n ) {
             info = -7;
-            LAPACKE_xerbla( "LAPACKE_zupgtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zupgtr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -70,25 +70,25 @@ lapack_int LAPACKE_zupgtr_work( int matrix_layout, char uplo, lapack_int n,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zpp_trans( matrix_layout, uplo, n, ap, ap_t );
+        API_SUFFIX(LAPACKE_zpp_trans)( matrix_layout, uplo, n, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zupgtr( &uplo, &n, ap_t, tau, q_t, &ldq_t, work, &info );
         if( info < 0 ) {
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, n, n, q_t, ldq_t, q, ldq );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( q_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zupgtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zupgtr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zupgtr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zupgtr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zupmtr.c b/LAPACKE/src/lapacke_zupmtr.c
index 2f4cceeaa2..4302b899ec 100644
--- a/LAPACKE/src/lapacke_zupmtr.c
+++ b/LAPACKE/src/lapacke_zupmtr.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zupmtr( int matrix_layout, char side, char uplo, char trans,
+lapack_int API_SUFFIX(LAPACKE_zupmtr)( int matrix_layout, char side, char uplo, char trans,
                            lapack_int m, lapack_int n,
                            const lapack_complex_double* ap,
                            const lapack_complex_double* tau,
@@ -44,28 +44,28 @@ lapack_int LAPACKE_zupmtr( int matrix_layout, char side, char uplo, char trans,
     lapack_complex_double* work = NULL;
     lapack_int r ;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
-        LAPACKE_xerbla( "LAPACKE_zupmtr", -1 );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zupmtr", -1 );
         return -1;
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        r = LAPACKE_lsame( side, 'l' ) ? m : n;
-        if( LAPACKE_zpp_nancheck( r, ap ) ) {
+        r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
+        if( API_SUFFIX(LAPACKE_zpp_nancheck)( r, ap ) ) {
             return -7;
         }
-        if( LAPACKE_zge_nancheck( matrix_layout, m, n, c, ldc ) ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, c, ldc ) ) {
             return -9;
         }
-        if( LAPACKE_z_nancheck( r-1, tau, 1 ) ) {
+        if( API_SUFFIX(LAPACKE_z_nancheck)( r-1, tau, 1 ) ) {
             return -8;
         }
     }
 #endif
     /* Additional scalars initializations for work arrays */
-    if( LAPACKE_lsame( side, 'l' ) ) {
+    if( API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ) {
         lwork = MAX(1,n);
-    } else if( LAPACKE_lsame( side, 'r' ) ) {
+    } else if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) {
         lwork = MAX(1,m);
     } else {
         lwork = 1; /* Any value */
@@ -78,13 +78,13 @@ lapack_int LAPACKE_zupmtr( int matrix_layout, char side, char uplo, char trans,
         goto exit_level_0;
     }
     /* Call middle-level interface */
-    info = LAPACKE_zupmtr_work( matrix_layout, side, uplo, trans, m, n, ap, tau,
+    info = API_SUFFIX(LAPACKE_zupmtr_work)( matrix_layout, side, uplo, trans, m, n, ap, tau,
                                 c, ldc, work );
     /* Release memory and exit */
     LAPACKE_free( work );
 exit_level_0:
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
-        LAPACKE_xerbla( "LAPACKE_zupmtr", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zupmtr", info );
     }
     return info;
 }
diff --git a/LAPACKE/src/lapacke_zupmtr_work.c b/LAPACKE/src/lapacke_zupmtr_work.c
index 6b623889bc..f0e7724883 100644
--- a/LAPACKE/src/lapacke_zupmtr_work.c
+++ b/LAPACKE/src/lapacke_zupmtr_work.c
@@ -32,7 +32,7 @@
 
 #include "lapacke_utils.h"
 
-lapack_int LAPACKE_zupmtr_work( int matrix_layout, char side, char uplo,
+lapack_int API_SUFFIX(LAPACKE_zupmtr_work)( int matrix_layout, char side, char uplo,
                                 char trans, lapack_int m, lapack_int n,
                                 const lapack_complex_double* ap,
                                 const lapack_complex_double* tau,
@@ -48,14 +48,14 @@ lapack_int LAPACKE_zupmtr_work( int matrix_layout, char side, char uplo,
             info = info - 1;
         }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
-        lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n;
+        lapack_int r = API_SUFFIX(LAPACKE_lsame)( side, 'l' ) ? m : n;
         lapack_int ldc_t = MAX(1,m);
         lapack_complex_double* c_t = NULL;
         lapack_complex_double* ap_t = NULL;
         /* Check leading dimension(s) */
         if( ldc < n ) {
             info = -10;
-            LAPACKE_xerbla( "LAPACKE_zupmtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zupmtr_work", info );
             return info;
         }
         /* Allocate memory for temporary array(s) */
@@ -73,8 +73,8 @@ lapack_int LAPACKE_zupmtr_work( int matrix_layout, char side, char uplo,
             goto exit_level_1;
         }
         /* Transpose input matrices */
-        LAPACKE_zge_trans( matrix_layout, m, n, c, ldc, c_t, ldc_t );
-        LAPACKE_zpp_trans( matrix_layout, uplo, r, ap, ap_t );
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, c, ldc, c_t, ldc_t );
+        API_SUFFIX(LAPACKE_zpp_trans)( matrix_layout, uplo, r, ap, ap_t );
         /* Call LAPACK function and adjust info */
         LAPACK_zupmtr( &side, &uplo, &trans, &m, &n, ap_t, tau, c_t, &ldc_t,
                        work, &info );
@@ -82,18 +82,18 @@ lapack_int LAPACKE_zupmtr_work( int matrix_layout, char side, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, c_t, ldc_t, c, ldc );
         /* Release memory and exit */
         LAPACKE_free( ap_t );
 exit_level_1:
         LAPACKE_free( c_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
-            LAPACKE_xerbla( "LAPACKE_zupmtr_work", info );
+            API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zupmtr_work", info );
         }
     } else {
         info = -1;
-        LAPACKE_xerbla( "LAPACKE_zupmtr_work", info );
+        API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_zupmtr_work", info );
     }
     return info;
 }
diff --git a/LAPACKE/utils/CMakeLists.txt b/LAPACKE/utils/CMakeLists.txt
index dd36ee33e7..dfb9aa3702 100644
--- a/LAPACKE/utils/CMakeLists.txt
+++ b/LAPACKE/utils/CMakeLists.txt
@@ -1,39 +1,46 @@
 set(UTILS
-lapacke_c_nancheck.c            lapacke_ctr_trans.c             lapacke_make_complex_float.c    lapacke_zgb_nancheck.c
-lapacke_cgb_nancheck.c          lapacke_d_nancheck.c            lapacke_s_nancheck.c            lapacke_zgb_trans.c
-lapacke_cgb_trans.c             lapacke_dgb_nancheck.c          lapacke_sgb_nancheck.c          lapacke_zge_nancheck.c
-lapacke_cge_nancheck.c          lapacke_dgb_trans.c             lapacke_sgb_trans.c             lapacke_zge_trans.c
-lapacke_cge_trans.c             lapacke_dge_nancheck.c          lapacke_sge_nancheck.c          lapacke_zgg_nancheck.c
-lapacke_cgg_nancheck.c          lapacke_dge_trans.c             lapacke_sge_trans.c             lapacke_zgg_trans.c
-lapacke_cgg_trans.c             lapacke_dgg_nancheck.c          lapacke_sgg_nancheck.c          lapacke_zgt_nancheck.c
-lapacke_cgt_nancheck.c          lapacke_dgg_trans.c             lapacke_sgg_trans.c             lapacke_zhb_nancheck.c
-lapacke_chb_nancheck.c          lapacke_dgt_nancheck.c          lapacke_sgt_nancheck.c          lapacke_zhb_trans.c
-lapacke_chb_trans.c             lapacke_dhs_nancheck.c          lapacke_shs_nancheck.c          lapacke_zhe_nancheck.c
-lapacke_che_nancheck.c          lapacke_dhs_trans.c             lapacke_shs_trans.c             lapacke_zhe_trans.c
-lapacke_che_trans.c             lapacke_dpb_nancheck.c          lapacke_spb_nancheck.c          lapacke_zhp_nancheck.c
-lapacke_chp_nancheck.c          lapacke_dpb_trans.c             lapacke_spb_trans.c             lapacke_zhp_trans.c
-lapacke_chp_trans.c             lapacke_dpf_nancheck.c          lapacke_spf_nancheck.c          lapacke_zhs_nancheck.c
-lapacke_chs_nancheck.c          lapacke_dpf_trans.c             lapacke_spf_trans.c             lapacke_zhs_trans.c
-lapacke_chs_trans.c             lapacke_dpo_nancheck.c          lapacke_spo_nancheck.c          lapacke_zpb_nancheck.c
-lapacke_cpb_nancheck.c          lapacke_dpo_trans.c             lapacke_spo_trans.c             lapacke_zpb_trans.c
-lapacke_cpb_trans.c             lapacke_dpp_nancheck.c          lapacke_spp_nancheck.c          lapacke_zpf_nancheck.c
-lapacke_cpf_nancheck.c          lapacke_dpp_trans.c             lapacke_spp_trans.c             lapacke_zpf_trans.c
-lapacke_cpf_trans.c             lapacke_dpt_nancheck.c          lapacke_spt_nancheck.c          lapacke_zpo_nancheck.c
-lapacke_cpo_nancheck.c          lapacke_dsb_nancheck.c          lapacke_ssb_nancheck.c          lapacke_zpo_trans.c
-lapacke_cpo_trans.c             lapacke_dsb_trans.c             lapacke_ssb_trans.c             lapacke_zpp_nancheck.c
-lapacke_cpp_nancheck.c          lapacke_dsp_nancheck.c          lapacke_ssp_nancheck.c          lapacke_zpp_trans.c
-lapacke_cpp_trans.c             lapacke_dsp_trans.c             lapacke_ssp_trans.c             lapacke_zpt_nancheck.c
-lapacke_cpt_nancheck.c          lapacke_dst_nancheck.c          lapacke_sst_nancheck.c          lapacke_zsp_nancheck.c
-lapacke_csp_nancheck.c          lapacke_dsy_nancheck.c          lapacke_ssy_nancheck.c          lapacke_zsp_trans.c
-lapacke_csp_trans.c             lapacke_dsy_trans.c             lapacke_ssy_trans.c             lapacke_zst_nancheck.c
-lapacke_cst_nancheck.c          lapacke_dtb_nancheck.c          lapacke_stb_nancheck.c          lapacke_zsy_nancheck.c
-lapacke_csy_nancheck.c          lapacke_dtb_trans.c             lapacke_stb_trans.c             lapacke_zsy_trans.c
-lapacke_csy_trans.c             lapacke_dtf_nancheck.c          lapacke_stf_nancheck.c          lapacke_ztb_nancheck.c
-lapacke_ctb_nancheck.c          lapacke_dtf_trans.c             lapacke_stf_trans.c             lapacke_ztb_trans.c
-lapacke_ctb_trans.c             lapacke_dtp_nancheck.c          lapacke_stp_nancheck.c          lapacke_ztf_nancheck.c
-lapacke_ctf_nancheck.c          lapacke_dtp_trans.c             lapacke_stp_trans.c             lapacke_ztf_trans.c
-lapacke_ctf_trans.c             lapacke_dtr_nancheck.c          lapacke_str_nancheck.c          lapacke_ztp_nancheck.c
-lapacke_ctp_nancheck.c          lapacke_dtr_trans.c             lapacke_str_trans.c             lapacke_ztp_trans.c
-lapacke_ctp_trans.c             lapacke_lsame.c                 lapacke_xerbla.c                lapacke_ztr_nancheck.c
-lapacke_ctr_nancheck.c          lapacke_make_complex_double.c   lapacke_z_nancheck.c            lapacke_ztr_trans.c
+lapacke_c_nancheck.c          lapacke_d_nancheck.c          lapacke_s_nancheck.c          lapacke_z_nancheck.c
+lapacke_cgb_nancheck.c        lapacke_dgb_nancheck.c        lapacke_sgb_nancheck.c        lapacke_zgb_trans.c
+lapacke_cgb_trans.c           lapacke_dgb_trans.c           lapacke_sgb_trans.c           lapacke_zgb_nancheck.c
+lapacke_cge_nancheck.c        lapacke_dge_nancheck.c        lapacke_sge_nancheck.c        lapacke_zge_nancheck.c
+lapacke_cge_trans.c           lapacke_dge_trans.c           lapacke_sge_trans.c           lapacke_zge_trans.c
+lapacke_cgg_nancheck.c        lapacke_dgg_nancheck.c        lapacke_sgg_nancheck.c        lapacke_zgg_nancheck.c
+lapacke_cgg_trans.c           lapacke_dgg_trans.c           lapacke_sgg_trans.c           lapacke_zgg_trans.c
+lapacke_cgt_nancheck.c        lapacke_dgt_nancheck.c        lapacke_sgt_nancheck.c        lapacke_zgt_nancheck.c
+lapacke_chb_nancheck.c        lapacke_dsb_nancheck.c        lapacke_ssb_nancheck.c        lapacke_zhb_nancheck.c
+lapacke_chb_trans.c           lapacke_dsb_trans.c           lapacke_ssb_trans.c           lapacke_zhb_trans.c
+lapacke_che_nancheck.c                                                                    lapacke_zhe_nancheck.c
+lapacke_che_trans.c                                                                       lapacke_zhe_trans.c
+lapacke_chp_nancheck.c                                                                    lapacke_zhp_nancheck.c
+lapacke_chp_trans.c                                                                       lapacke_zhp_trans.c
+lapacke_chs_nancheck.c        lapacke_dhs_nancheck.c        lapacke_shs_nancheck.c        lapacke_zhs_nancheck.c
+lapacke_chs_trans.c           lapacke_dhs_trans.c           lapacke_shs_trans.c           lapacke_zhs_trans.c
+lapacke_cpb_nancheck.c        lapacke_dpb_nancheck.c        lapacke_spb_nancheck.c        lapacke_zpb_nancheck.c
+lapacke_cpb_trans.c           lapacke_dpb_trans.c           lapacke_spb_trans.c           lapacke_zpb_trans.c
+lapacke_cpf_nancheck.c        lapacke_dpf_nancheck.c        lapacke_spf_nancheck.c        lapacke_zpf_nancheck.c
+lapacke_cpf_trans.c           lapacke_dpf_trans.c           lapacke_spf_trans.c           lapacke_zpf_trans.c
+lapacke_cpo_nancheck.c        lapacke_dpo_nancheck.c        lapacke_spo_nancheck.c        lapacke_zpo_nancheck.c
+lapacke_cpo_trans.c           lapacke_dpo_trans.c           lapacke_spo_trans.c           lapacke_zpo_trans.c
+lapacke_cpp_nancheck.c        lapacke_dpp_nancheck.c        lapacke_spp_nancheck.c        lapacke_zpp_nancheck.c
+lapacke_cpp_trans.c           lapacke_dpp_trans.c           lapacke_spp_trans.c           lapacke_zpp_trans.c
+lapacke_cpt_nancheck.c        lapacke_dpt_nancheck.c        lapacke_spt_nancheck.c        lapacke_zpt_nancheck.c
+lapacke_csp_nancheck.c        lapacke_dsp_nancheck.c        lapacke_ssp_nancheck.c        lapacke_zsp_nancheck.c
+lapacke_csp_trans.c           lapacke_dsp_trans.c           lapacke_ssp_trans.c           lapacke_zsp_trans.c
+lapacke_cst_nancheck.c        lapacke_dst_nancheck.c        lapacke_sst_nancheck.c        lapacke_zst_nancheck.c
+lapacke_csy_nancheck.c        lapacke_dsy_nancheck.c        lapacke_ssy_nancheck.c        lapacke_zsy_nancheck.c
+lapacke_csy_trans.c           lapacke_dsy_trans.c           lapacke_ssy_trans.c           lapacke_zsy_trans.c
+lapacke_ctb_nancheck.c        lapacke_dtb_nancheck.c        lapacke_stb_nancheck.c        lapacke_ztb_nancheck.c
+lapacke_ctb_trans.c           lapacke_dtb_trans.c           lapacke_stb_trans.c           lapacke_ztb_trans.c
+lapacke_ctf_nancheck.c        lapacke_dtf_nancheck.c        lapacke_stf_nancheck.c        lapacke_ztf_nancheck.c
+lapacke_ctf_trans.c           lapacke_dtf_trans.c           lapacke_stf_trans.c           lapacke_ztf_trans.c
+lapacke_ctp_nancheck.c        lapacke_dtp_nancheck.c        lapacke_stp_nancheck.c        lapacke_ztp_nancheck.c
+lapacke_ctp_trans.c           lapacke_dtp_trans.c           lapacke_stp_trans.c           lapacke_ztp_trans.c
+lapacke_ctr_nancheck.c        lapacke_dtr_nancheck.c        lapacke_str_nancheck.c        lapacke_ztr_nancheck.c
+lapacke_ctr_trans.c           lapacke_dtr_trans.c           lapacke_str_trans.c           lapacke_ztr_trans.c
+lapacke_ctz_nancheck.c        lapacke_dtz_nancheck.c        lapacke_stz_nancheck.c        lapacke_ztz_nancheck.c
+lapacke_ctz_trans.c           lapacke_dtz_trans.c           lapacke_stz_trans.c           lapacke_ztz_trans.c
+
+lapacke_make_complex_float.c                                                              lapacke_make_complex_double.c
+lapacke_lsame.c
+lapacke_xerbla.c
 )
diff --git a/LAPACKE/utils/Makefile b/LAPACKE/utils/Makefile
index adc5736507..a1f8631071 100644
--- a/LAPACKE/utils/Makefile
+++ b/LAPACKE/utils/Makefile
@@ -76,6 +76,8 @@ OBJ = lapacke_cgb_nancheck.o \
       lapacke_ctp_trans.o \
       lapacke_ctr_nancheck.o \
       lapacke_ctr_trans.o \
+      lapacke_ctz_nancheck.o \
+      lapacke_ctz_trans.o \
       lapacke_dgb_nancheck.o \
       lapacke_dgb_trans.o \
       lapacke_dge_nancheck.o \
@@ -110,6 +112,8 @@ OBJ = lapacke_cgb_nancheck.o \
       lapacke_dtp_trans.o \
       lapacke_dtr_nancheck.o \
       lapacke_dtr_trans.o \
+      lapacke_dtz_nancheck.o \
+      lapacke_dtz_trans.o \
       lapacke_lsame.o \
       lapacke_sgb_nancheck.o \
       lapacke_sgb_trans.o \
@@ -145,6 +149,8 @@ OBJ = lapacke_cgb_nancheck.o \
       lapacke_stp_trans.o \
       lapacke_str_nancheck.o \
       lapacke_str_trans.o \
+      lapacke_stz_nancheck.o \
+      lapacke_stz_trans.o \
       lapacke_xerbla.o \
       lapacke_zgb_nancheck.o \
       lapacke_zgb_trans.o \
@@ -184,6 +190,8 @@ OBJ = lapacke_cgb_nancheck.o \
       lapacke_ztp_trans.o \
       lapacke_ztr_nancheck.o \
       lapacke_ztr_trans.o \
+      lapacke_ztz_nancheck.o \
+      lapacke_ztz_trans.o \
       lapacke_make_complex_float.o \
       lapacke_make_complex_double.o
 
diff --git a/LAPACKE/utils/lapacke_c_nancheck.c b/LAPACKE/utils/lapacke_c_nancheck.c
index 82a4242395..d635fd5bfe 100644
--- a/LAPACKE/utils/lapacke_c_nancheck.c
+++ b/LAPACKE/utils/lapacke_c_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a vector for NaN entries. */
 
-lapack_logical LAPACKE_c_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_c_nancheck)( lapack_int n,
                                     const lapack_complex_float *x,
                                     lapack_int incx )
 {
diff --git a/LAPACKE/utils/lapacke_cgb_nancheck.c b/LAPACKE/utils/lapacke_cgb_nancheck.c
index 0c35bd67bb..0b6bc0d2c3 100644
--- a/LAPACKE/utils/lapacke_cgb_nancheck.c
+++ b/LAPACKE/utils/lapacke_cgb_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_cgb_nancheck( int matrix_layout, lapack_int m,
+lapack_logical API_SUFFIX(LAPACKE_cgb_nancheck)( int matrix_layout, lapack_int m,
                                       lapack_int n, lapack_int kl,
                                       lapack_int ku,
                                       const lapack_complex_float *ab,
diff --git a/LAPACKE/utils/lapacke_cgb_trans.c b/LAPACKE/utils/lapacke_cgb_trans.c
index 2adf71493a..bd450d8d0e 100644
--- a/LAPACKE/utils/lapacke_cgb_trans.c
+++ b/LAPACKE/utils/lapacke_cgb_trans.c
@@ -36,7 +36,7 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_cgb_trans( int matrix_layout, lapack_int m, lapack_int n,
+void API_SUFFIX(LAPACKE_cgb_trans)( int matrix_layout, lapack_int m, lapack_int n,
                         lapack_int kl, lapack_int ku,
                         const lapack_complex_float *in, lapack_int ldin,
                         lapack_complex_float *out, lapack_int ldout )
@@ -54,7 +54,7 @@ void LAPACKE_cgb_trans( int matrix_layout, lapack_int m, lapack_int n,
         }
     } else if ( matrix_layout == LAPACK_ROW_MAJOR ) {
         /* TODO: interchange loops for performance.
-         * This is just reference impemeltation.
+         * This is just reference implementation.
          */
         for( j = 0; j < MIN( n, ldin ); j++ ) {
             for( i = MAX( ku-j, 0 ); i < MIN3( ldout, m+ku-j, kl+ku+1 );
diff --git a/LAPACKE/utils/lapacke_cge_nancheck.c b/LAPACKE/utils/lapacke_cge_nancheck.c
index 18e194d3a1..94cb051e0d 100644
--- a/LAPACKE/utils/lapacke_cge_nancheck.c
+++ b/LAPACKE/utils/lapacke_cge_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_cge_nancheck( int matrix_layout, lapack_int m,
+lapack_logical API_SUFFIX(LAPACKE_cge_nancheck)( int matrix_layout, lapack_int m,
                                       lapack_int n,
                                       const lapack_complex_float *a,
                                       lapack_int lda )
diff --git a/LAPACKE/utils/lapacke_cge_trans.c b/LAPACKE/utils/lapacke_cge_trans.c
index 0d44ad59d1..3b2f53356c 100644
--- a/LAPACKE/utils/lapacke_cge_trans.c
+++ b/LAPACKE/utils/lapacke_cge_trans.c
@@ -36,7 +36,7 @@
  * layout or vice versa.
  */
 
-void LAPACKE_cge_trans( int matrix_layout, lapack_int m, lapack_int n,
+void API_SUFFIX(LAPACKE_cge_trans)( int matrix_layout, lapack_int m, lapack_int n,
                         const lapack_complex_float* in, lapack_int ldin,
                         lapack_complex_float* out, lapack_int ldout )
 {
diff --git a/LAPACKE/utils/lapacke_cgg_nancheck.c b/LAPACKE/utils/lapacke_cgg_nancheck.c
index 371135ac7c..5750614875 100644
--- a/LAPACKE/utils/lapacke_cgg_nancheck.c
+++ b/LAPACKE/utils/lapacke_cgg_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_cgg_nancheck( int matrix_layout, lapack_int m,
+lapack_logical API_SUFFIX(LAPACKE_cgg_nancheck)( int matrix_layout, lapack_int m,
                                       lapack_int n,
                                       const lapack_complex_float *a,
                                       lapack_int lda )
 {
-    return LAPACKE_cge_nancheck( matrix_layout, m, n, a, lda );
+    return API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, m, n, a, lda );
 }
diff --git a/LAPACKE/utils/lapacke_cgg_trans.c b/LAPACKE/utils/lapacke_cgg_trans.c
index 678a482dfc..e1214b5f78 100644
--- a/LAPACKE/utils/lapacke_cgg_trans.c
+++ b/LAPACKE/utils/lapacke_cgg_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_cgg_trans( int matrix_layout, lapack_int m, lapack_int n,
+void API_SUFFIX(LAPACKE_cgg_trans)( int matrix_layout, lapack_int m, lapack_int n,
                         const lapack_complex_float* in, lapack_int ldin,
                         lapack_complex_float* out, lapack_int ldout )
 {
-    LAPACKE_cge_trans( matrix_layout, m, n, in, ldin, out, ldout );
+    API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, m, n, in, ldin, out, ldout );
 }
diff --git a/LAPACKE/utils/lapacke_cgt_nancheck.c b/LAPACKE/utils/lapacke_cgt_nancheck.c
index ea73848f3e..c07b815b3d 100644
--- a/LAPACKE/utils/lapacke_cgt_nancheck.c
+++ b/LAPACKE/utils/lapacke_cgt_nancheck.c
@@ -33,12 +33,12 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_cgt_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_cgt_nancheck)( lapack_int n,
                                       const lapack_complex_float *dl,
                                       const lapack_complex_float *d,
                                       const lapack_complex_float *du )
 {
-    return LAPACKE_c_nancheck( n-1, dl, 1 )
-        || LAPACKE_c_nancheck( n  , d,  1 )
-        || LAPACKE_c_nancheck( n-1, du, 1 );
+    return API_SUFFIX(LAPACKE_c_nancheck)( n-1, dl, 1 )
+        || API_SUFFIX(LAPACKE_c_nancheck)( n  , d,  1 )
+        || API_SUFFIX(LAPACKE_c_nancheck)( n-1, du, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_chb_nancheck.c b/LAPACKE/utils/lapacke_chb_nancheck.c
index 2c6211147f..6757d8ab95 100644
--- a/LAPACKE/utils/lapacke_chb_nancheck.c
+++ b/LAPACKE/utils/lapacke_chb_nancheck.c
@@ -33,15 +33,15 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_chb_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_chb_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n, lapack_int kd,
                                       const lapack_complex_float* ab,
                                       lapack_int ldab )
 {
-    if( LAPACKE_lsame( uplo, 'u' ) ) {
-        return LAPACKE_cgb_nancheck( matrix_layout, n, n, 0, kd, ab, ldab );
-    } else if( LAPACKE_lsame( uplo, 'l' ) ) {
-        return LAPACKE_cgb_nancheck( matrix_layout, n, n, kd, 0, ab, ldab );
+    if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
+        return API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, 0, kd, ab, ldab );
+    } else if( API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) {
+        return API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, kd, 0, ab, ldab );
     }
     return (lapack_logical) 0;
 }
diff --git a/LAPACKE/utils/lapacke_chb_trans.c b/LAPACKE/utils/lapacke_chb_trans.c
index 00175027d5..855cb03de8 100644
--- a/LAPACKE/utils/lapacke_chb_trans.c
+++ b/LAPACKE/utils/lapacke_chb_trans.c
@@ -36,14 +36,14 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_chb_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_chb_trans)( int matrix_layout, char uplo, lapack_int n,
                         lapack_int kd,
                         const lapack_complex_float *in, lapack_int ldin,
                         lapack_complex_float *out, lapack_int ldout )
 {
-    if( LAPACKE_lsame( uplo, 'u' ) ) {
-        LAPACKE_cgb_trans( matrix_layout, n, n, 0, kd, in, ldin, out, ldout );
-    } else if( LAPACKE_lsame( uplo, 'l' ) ) {
-        LAPACKE_cgb_trans( matrix_layout, n, n, kd, 0, in, ldin, out, ldout );
+    if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
+        API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n, n, 0, kd, in, ldin, out, ldout );
+    } else if( API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) {
+        API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n, n, kd, 0, in, ldin, out, ldout );
     }
 }
diff --git a/LAPACKE/utils/lapacke_che_nancheck.c b/LAPACKE/utils/lapacke_che_nancheck.c
index 6e652b71d1..ebd62584e4 100644
--- a/LAPACKE/utils/lapacke_che_nancheck.c
+++ b/LAPACKE/utils/lapacke_che_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_che_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_che_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n,
                                       const lapack_complex_float *a,
                                       lapack_int lda )
 {
-    return LAPACKE_ctr_nancheck( matrix_layout, uplo, 'n', n, a, lda );
+    return API_SUFFIX(LAPACKE_ctr_nancheck)( matrix_layout, uplo, 'n', n, a, lda );
 }
diff --git a/LAPACKE/utils/lapacke_che_trans.c b/LAPACKE/utils/lapacke_che_trans.c
index a6a96f7efb..4ee91bd40f 100644
--- a/LAPACKE/utils/lapacke_che_trans.c
+++ b/LAPACKE/utils/lapacke_che_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_che_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_che_trans)( int matrix_layout, char uplo, lapack_int n,
                         const lapack_complex_float *in, lapack_int ldin,
                         lapack_complex_float *out, lapack_int ldout )
 {
-    LAPACKE_ctr_trans( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
+    API_SUFFIX(LAPACKE_ctr_trans)( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
 }
diff --git a/LAPACKE/utils/lapacke_chp_nancheck.c b/LAPACKE/utils/lapacke_chp_nancheck.c
index 0d74cbf08f..ba24f2a1b4 100644
--- a/LAPACKE/utils/lapacke_chp_nancheck.c
+++ b/LAPACKE/utils/lapacke_chp_nancheck.c
@@ -36,9 +36,9 @@
  * check 1d array for NaNs. It doesn't depend upon uplo or matrix_layout.
  */
 
-lapack_logical LAPACKE_chp_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_chp_nancheck)( lapack_int n,
                                       const lapack_complex_float *ap )
 {
     lapack_int len = n*(n+1)/2;
-    return LAPACKE_c_nancheck( len, ap, 1 );
+    return API_SUFFIX(LAPACKE_c_nancheck)( len, ap, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_chp_trans.c b/LAPACKE/utils/lapacke_chp_trans.c
index 2ab59b1126..0c6e883993 100644
--- a/LAPACKE/utils/lapacke_chp_trans.c
+++ b/LAPACKE/utils/lapacke_chp_trans.c
@@ -36,9 +36,9 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_chp_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_chp_trans)( int matrix_layout, char uplo, lapack_int n,
                         const lapack_complex_float *in,
                         lapack_complex_float *out )
 {
-    LAPACKE_ctp_trans( matrix_layout, uplo, 'n', n, in, out );
+    API_SUFFIX(LAPACKE_ctp_trans)( matrix_layout, uplo, 'n', n, in, out );
 }
diff --git a/LAPACKE/utils/lapacke_chs_nancheck.c b/LAPACKE/utils/lapacke_chs_nancheck.c
index f0756bfb95..00fd19ceb2 100644
--- a/LAPACKE/utils/lapacke_chs_nancheck.c
+++ b/LAPACKE/utils/lapacke_chs_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_chs_nancheck( int matrix_layout, lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_chs_nancheck)( int matrix_layout, lapack_int n,
                                       const lapack_complex_float *a,
                                       lapack_int lda )
 {
@@ -43,14 +43,14 @@ lapack_logical LAPACKE_chs_nancheck( int matrix_layout, lapack_int n,
 
     /* Check subdiagonal first */
     if( matrix_layout == LAPACK_COL_MAJOR ) {
-        subdiag_nans = LAPACKE_c_nancheck( n-1, &a[1], lda+1 );
+        subdiag_nans = API_SUFFIX(LAPACKE_c_nancheck)( n-1, &a[1], lda+1 );
     } else if ( matrix_layout == LAPACK_ROW_MAJOR ) {
-        subdiag_nans = LAPACKE_c_nancheck( n-1, &a[lda], lda+1 );
+        subdiag_nans = API_SUFFIX(LAPACKE_c_nancheck)( n-1, &a[lda], lda+1 );
     } else {
         return (lapack_logical) 0;
     }
 
     /* Check upper triangular if subdiagonal has no NaNs. */
-    return subdiag_nans || LAPACKE_ctr_nancheck( matrix_layout, 'u', 'n',
+    return subdiag_nans || API_SUFFIX(LAPACKE_ctr_nancheck)( matrix_layout, 'u', 'n',
                                                  n, a, lda);
 }
diff --git a/LAPACKE/utils/lapacke_chs_trans.c b/LAPACKE/utils/lapacke_chs_trans.c
index eff8c8c4ea..4d81dd9346 100644
--- a/LAPACKE/utils/lapacke_chs_trans.c
+++ b/LAPACKE/utils/lapacke_chs_trans.c
@@ -36,7 +36,7 @@
  * layout or vice versa.
  */
 
-void LAPACKE_chs_trans( int matrix_layout, lapack_int n,
+void API_SUFFIX(LAPACKE_chs_trans)( int matrix_layout, lapack_int n,
                         const lapack_complex_float *in, lapack_int ldin,
                         lapack_complex_float *out, lapack_int ldout )
 {
@@ -44,15 +44,15 @@ void LAPACKE_chs_trans( int matrix_layout, lapack_int n,
 
     /* Convert subdiagonal first */
     if( matrix_layout == LAPACK_COL_MAJOR ) {
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, 1, n-1, &in[1], ldin+1,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, 1, n-1, &in[1], ldin+1,
                            &out[ldout], ldout+1 );
     } else if ( matrix_layout == LAPACK_ROW_MAJOR ) {
-        LAPACKE_cge_trans( LAPACK_ROW_MAJOR, n-1, 1, &in[ldin], ldin+1,
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_ROW_MAJOR, n-1, 1, &in[ldin], ldin+1,
                            &out[1], ldout+1 );
     } else {
         return;
     }
 
     /* Convert upper triangular. */
-    LAPACKE_ctr_trans( matrix_layout, 'u', 'n', n, in, ldin, out, ldout);
+    API_SUFFIX(LAPACKE_ctr_trans)( matrix_layout, 'u', 'n', n, in, ldin, out, ldout);
 }
diff --git a/LAPACKE/utils/lapacke_cpb_nancheck.c b/LAPACKE/utils/lapacke_cpb_nancheck.c
index 5fea7377ac..b99f87eef3 100644
--- a/LAPACKE/utils/lapacke_cpb_nancheck.c
+++ b/LAPACKE/utils/lapacke_cpb_nancheck.c
@@ -33,15 +33,15 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_cpb_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_cpb_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n, lapack_int kd,
                                       const lapack_complex_float* ab,
                                       lapack_int ldab )
 {
-    if( LAPACKE_lsame( uplo, 'u' ) ) {
-        return LAPACKE_cgb_nancheck( matrix_layout, n, n, 0, kd, ab, ldab );
-    } else if( LAPACKE_lsame( uplo, 'l' ) ) {
-        return LAPACKE_cgb_nancheck( matrix_layout, n, n, kd, 0, ab, ldab );
+    if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
+        return API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, 0, kd, ab, ldab );
+    } else if( API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) {
+        return API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, kd, 0, ab, ldab );
     }
     return (lapack_logical) 0;
 }
diff --git a/LAPACKE/utils/lapacke_cpb_trans.c b/LAPACKE/utils/lapacke_cpb_trans.c
index 99e3960fa5..e117c8e2a0 100644
--- a/LAPACKE/utils/lapacke_cpb_trans.c
+++ b/LAPACKE/utils/lapacke_cpb_trans.c
@@ -36,14 +36,14 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_cpb_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_cpb_trans)( int matrix_layout, char uplo, lapack_int n,
                         lapack_int kd,
                         const lapack_complex_float *in, lapack_int ldin,
                         lapack_complex_float *out, lapack_int ldout )
 {
-    if( LAPACKE_lsame( uplo, 'u' ) ) {
-        LAPACKE_cgb_trans( matrix_layout, n, n, 0, kd, in, ldin, out, ldout );
-    } else if( LAPACKE_lsame( uplo, 'l' ) ) {
-        LAPACKE_cgb_trans( matrix_layout, n, n, kd, 0, in, ldin, out, ldout );
+    if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
+        API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n, n, 0, kd, in, ldin, out, ldout );
+    } else if( API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) {
+        API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n, n, kd, 0, in, ldin, out, ldout );
     }
 }
diff --git a/LAPACKE/utils/lapacke_cpf_nancheck.c b/LAPACKE/utils/lapacke_cpf_nancheck.c
index 551b96966e..ae9eb67e75 100644
--- a/LAPACKE/utils/lapacke_cpf_nancheck.c
+++ b/LAPACKE/utils/lapacke_cpf_nancheck.c
@@ -37,9 +37,9 @@
  * matrix_layout.
  */
 
-lapack_logical LAPACKE_cpf_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_cpf_nancheck)( lapack_int n,
                                       const lapack_complex_float *a )
 {
     lapack_int len = n*(n+1)/2;
-    return LAPACKE_c_nancheck( len, a, 1 );
+    return API_SUFFIX(LAPACKE_c_nancheck)( len, a, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_cpf_trans.c b/LAPACKE/utils/lapacke_cpf_trans.c
index df397c0f6a..d6eb8b75eb 100644
--- a/LAPACKE/utils/lapacke_cpf_trans.c
+++ b/LAPACKE/utils/lapacke_cpf_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_cpf_trans( int matrix_layout, char transr, char uplo,
+void API_SUFFIX(LAPACKE_cpf_trans)( int matrix_layout, char transr, char uplo,
                         lapack_int n, const lapack_complex_float *in,
                         lapack_complex_float *out )
 {
-    LAPACKE_ctf_trans( matrix_layout, transr, uplo, 'n', n, in, out );
+    API_SUFFIX(LAPACKE_ctf_trans)( matrix_layout, transr, uplo, 'n', n, in, out );
 }
diff --git a/LAPACKE/utils/lapacke_cpo_nancheck.c b/LAPACKE/utils/lapacke_cpo_nancheck.c
index 62091f36b6..c8ff502db1 100644
--- a/LAPACKE/utils/lapacke_cpo_nancheck.c
+++ b/LAPACKE/utils/lapacke_cpo_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_cpo_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_cpo_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n,
                                       const lapack_complex_float *a,
                                       lapack_int lda )
 {
-    return LAPACKE_ctr_nancheck( matrix_layout, uplo, 'n', n, a, lda );
+    return API_SUFFIX(LAPACKE_ctr_nancheck)( matrix_layout, uplo, 'n', n, a, lda );
 }
diff --git a/LAPACKE/utils/lapacke_cpo_trans.c b/LAPACKE/utils/lapacke_cpo_trans.c
index 7b4f2a23f8..5c9714e160 100644
--- a/LAPACKE/utils/lapacke_cpo_trans.c
+++ b/LAPACKE/utils/lapacke_cpo_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_cpo_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_cpo_trans)( int matrix_layout, char uplo, lapack_int n,
                         const lapack_complex_float *in, lapack_int ldin,
                         lapack_complex_float *out, lapack_int ldout )
 {
-    LAPACKE_ctr_trans( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
+    API_SUFFIX(LAPACKE_ctr_trans)( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
 }
diff --git a/LAPACKE/utils/lapacke_cpp_nancheck.c b/LAPACKE/utils/lapacke_cpp_nancheck.c
index bc6d10442a..287b8f67f3 100644
--- a/LAPACKE/utils/lapacke_cpp_nancheck.c
+++ b/LAPACKE/utils/lapacke_cpp_nancheck.c
@@ -36,9 +36,9 @@
  * check 1d array for NaNs. It doesn't depend upon uplo or matrix_layout.
  */
 
-lapack_logical LAPACKE_cpp_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_cpp_nancheck)( lapack_int n,
                                       const lapack_complex_float *ap )
 {
     lapack_int len = n*(n+1)/2;
-    return LAPACKE_c_nancheck( len, ap, 1 );
+    return API_SUFFIX(LAPACKE_c_nancheck)( len, ap, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_cpp_trans.c b/LAPACKE/utils/lapacke_cpp_trans.c
index 6408b93a86..e36baa3a38 100644
--- a/LAPACKE/utils/lapacke_cpp_trans.c
+++ b/LAPACKE/utils/lapacke_cpp_trans.c
@@ -36,9 +36,9 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_cpp_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_cpp_trans)( int matrix_layout, char uplo, lapack_int n,
                         const lapack_complex_float *in,
                         lapack_complex_float *out )
 {
-    LAPACKE_ctp_trans( matrix_layout, uplo, 'n', n, in, out );
+    API_SUFFIX(LAPACKE_ctp_trans)( matrix_layout, uplo, 'n', n, in, out );
 }
diff --git a/LAPACKE/utils/lapacke_cpt_nancheck.c b/LAPACKE/utils/lapacke_cpt_nancheck.c
index f0c445c9e3..3596b49a83 100644
--- a/LAPACKE/utils/lapacke_cpt_nancheck.c
+++ b/LAPACKE/utils/lapacke_cpt_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_cpt_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_cpt_nancheck)( lapack_int n,
                                       const float *d,
                                       const lapack_complex_float *e )
 {
-    return LAPACKE_s_nancheck( n,   d, 1 )
-        || LAPACKE_c_nancheck( n-1, e, 1 );
+    return API_SUFFIX(LAPACKE_s_nancheck)( n,   d, 1 )
+        || API_SUFFIX(LAPACKE_c_nancheck)( n-1, e, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_csp_nancheck.c b/LAPACKE/utils/lapacke_csp_nancheck.c
index 8664be84b9..d6f840729c 100644
--- a/LAPACKE/utils/lapacke_csp_nancheck.c
+++ b/LAPACKE/utils/lapacke_csp_nancheck.c
@@ -36,9 +36,9 @@
  * check 1d array for NaNs. It doesn't depend upon uplo or matrix_layout.
  */
 
-lapack_logical LAPACKE_csp_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_csp_nancheck)( lapack_int n,
                                       const lapack_complex_float *ap )
 {
     lapack_int len = n*(n+1)/2;
-    return LAPACKE_c_nancheck( len, ap, 1 );
+    return API_SUFFIX(LAPACKE_c_nancheck)( len, ap, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_csp_trans.c b/LAPACKE/utils/lapacke_csp_trans.c
index db1ff915d0..2530173b94 100644
--- a/LAPACKE/utils/lapacke_csp_trans.c
+++ b/LAPACKE/utils/lapacke_csp_trans.c
@@ -36,9 +36,9 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_csp_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_csp_trans)( int matrix_layout, char uplo, lapack_int n,
                         const lapack_complex_float *in,
                         lapack_complex_float *out )
 {
-    LAPACKE_ctp_trans( matrix_layout, uplo, 'n', n, in, out );
+    API_SUFFIX(LAPACKE_ctp_trans)( matrix_layout, uplo, 'n', n, in, out );
 }
diff --git a/LAPACKE/utils/lapacke_cst_nancheck.c b/LAPACKE/utils/lapacke_cst_nancheck.c
index 831421dbc2..20baae7b11 100644
--- a/LAPACKE/utils/lapacke_cst_nancheck.c
+++ b/LAPACKE/utils/lapacke_cst_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_cst_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_cst_nancheck)( lapack_int n,
                                       const lapack_complex_float *d,
                                       const lapack_complex_float *e )
 {
-    return LAPACKE_c_nancheck( n,   d, 1 )
-        || LAPACKE_c_nancheck( n-1, e, 1 );
+    return API_SUFFIX(LAPACKE_c_nancheck)( n,   d, 1 )
+        || API_SUFFIX(LAPACKE_c_nancheck)( n-1, e, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_csy_nancheck.c b/LAPACKE/utils/lapacke_csy_nancheck.c
index aedb04734e..b7fbcc667f 100644
--- a/LAPACKE/utils/lapacke_csy_nancheck.c
+++ b/LAPACKE/utils/lapacke_csy_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_csy_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_csy_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n,
                                       const lapack_complex_float *a,
                                       lapack_int lda )
 {
-    return LAPACKE_ctr_nancheck( matrix_layout, uplo, 'n', n, a, lda );
+    return API_SUFFIX(LAPACKE_ctr_nancheck)( matrix_layout, uplo, 'n', n, a, lda );
 }
diff --git a/LAPACKE/utils/lapacke_csy_trans.c b/LAPACKE/utils/lapacke_csy_trans.c
index 48ee3187ce..871533d478 100644
--- a/LAPACKE/utils/lapacke_csy_trans.c
+++ b/LAPACKE/utils/lapacke_csy_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_csy_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_csy_trans)( int matrix_layout, char uplo, lapack_int n,
                         const lapack_complex_float *in, lapack_int ldin,
                         lapack_complex_float *out, lapack_int ldout )
 {
-    LAPACKE_ctr_trans( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
+    API_SUFFIX(LAPACKE_ctr_trans)( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
 }
diff --git a/LAPACKE/utils/lapacke_ctb_nancheck.c b/LAPACKE/utils/lapacke_ctb_nancheck.c
index 9647d3b655..28a5da436a 100644
--- a/LAPACKE/utils/lapacke_ctb_nancheck.c
+++ b/LAPACKE/utils/lapacke_ctb_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_ctb_nancheck( int matrix_layout, char uplo, char diag,
+lapack_logical API_SUFFIX(LAPACKE_ctb_nancheck)( int matrix_layout, char uplo, char diag,
                                       lapack_int n, lapack_int kd,
                                       const lapack_complex_float* ab,
                                       lapack_int ldab )
@@ -43,12 +43,12 @@ lapack_logical LAPACKE_ctb_nancheck( int matrix_layout, char uplo, char diag,
     if( ab == NULL ) return (lapack_logical) 0;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    upper  = LAPACKE_lsame( uplo, 'u' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    upper  = API_SUFFIX(LAPACKE_lsame)( uplo, 'u' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !upper  && !LAPACKE_lsame( uplo, 'l' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !upper  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return (lapack_logical) 0;
     }
@@ -57,27 +57,27 @@ lapack_logical LAPACKE_ctb_nancheck( int matrix_layout, char uplo, char diag,
         /* Unit case, diagonal should be excluded from the check for NaN. */
         if( colmaj ) {
             if( upper ) {
-                return LAPACKE_cgb_nancheck( matrix_layout, n-1, n-1, 0, kd-1,
+                return API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n-1, n-1, 0, kd-1,
                                              &ab[ldab], ldab );
             } else {
-                return LAPACKE_cgb_nancheck( matrix_layout, n-1, n-1, kd-1, 0,
+                return API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n-1, n-1, kd-1, 0,
                                              &ab[1], ldab );
             }
         } else {
             if( upper ) {
-                return LAPACKE_cgb_nancheck( matrix_layout, n-1, n-1, 0, kd-1,
+                return API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n-1, n-1, 0, kd-1,
                                              &ab[1], ldab );
             } else {
-                return LAPACKE_cgb_nancheck( matrix_layout, n-1, n-1, kd-1, 0,
+                return API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n-1, n-1, kd-1, 0,
                                              &ab[ldab], ldab );
             }
         }
     } else {
         /* Non-unit case */
         if( upper ) {
-            return LAPACKE_cgb_nancheck( matrix_layout, n, n, 0, kd, ab, ldab );
+            return API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, 0, kd, ab, ldab );
         } else {
-            return LAPACKE_cgb_nancheck( matrix_layout, n, n, kd, 0, ab, ldab );
+            return API_SUFFIX(LAPACKE_cgb_nancheck)( matrix_layout, n, n, kd, 0, ab, ldab );
         }
     }
 }
diff --git a/LAPACKE/utils/lapacke_ctb_trans.c b/LAPACKE/utils/lapacke_ctb_trans.c
index c266e3ea62..d3a2660314 100644
--- a/LAPACKE/utils/lapacke_ctb_trans.c
+++ b/LAPACKE/utils/lapacke_ctb_trans.c
@@ -36,7 +36,7 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_ctb_trans( int matrix_layout, char uplo, char diag,
+void API_SUFFIX(LAPACKE_ctb_trans)( int matrix_layout, char uplo, char diag,
                         lapack_int n, lapack_int kd,
                         const lapack_complex_float *in, lapack_int ldin,
                         lapack_complex_float *out, lapack_int ldout )
@@ -46,12 +46,12 @@ void LAPACKE_ctb_trans( int matrix_layout, char uplo, char diag,
     if( in == NULL || out == NULL ) return;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    upper  = LAPACKE_lsame( uplo, 'u' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    upper  = API_SUFFIX(LAPACKE_lsame)( uplo, 'u' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !upper  && !LAPACKE_lsame( uplo, 'l' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !upper  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return;
     }
@@ -60,28 +60,28 @@ void LAPACKE_ctb_trans( int matrix_layout, char uplo, char diag,
         /* Unit case, diagonal excluded from transposition */
         if( colmaj ) {
             if( upper ) {
-                LAPACKE_cgb_trans( matrix_layout, n-1, n-1, 0, kd-1,
+                API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n-1, n-1, 0, kd-1,
                                    &in[ldin], ldin, &out[1], ldout );
             } else {
-                LAPACKE_cgb_trans( matrix_layout, n-1, n-1, kd-1, 0,
+                API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n-1, n-1, kd-1, 0,
                                    &in[1], ldin, &out[ldout], ldout );
             }
         } else {
             if( upper ) {
-                LAPACKE_cgb_trans( matrix_layout, n-1, n-1, 0, kd-1,
+                API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n-1, n-1, 0, kd-1,
                                    &in[1], ldin, &out[ldout], ldout );
             } else {
-                LAPACKE_cgb_trans( matrix_layout, n-1, n-1, kd-1, 0,
+                API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n-1, n-1, kd-1, 0,
                                    &in[ldin], ldin, &out[1], ldout );
             }
         }
     } else {
         /* Non-unit case */
         if( upper ) {
-            LAPACKE_cgb_trans( matrix_layout, n, n, 0, kd, in, ldin, out,
+            API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n, n, 0, kd, in, ldin, out,
                                ldout );
         } else {
-            LAPACKE_cgb_trans( matrix_layout, n, n, kd, 0, in, ldin, out,
+            API_SUFFIX(LAPACKE_cgb_trans)( matrix_layout, n, n, kd, 0, in, ldin, out,
                                ldout );
         }
     }
diff --git a/LAPACKE/utils/lapacke_ctf_nancheck.c b/LAPACKE/utils/lapacke_ctf_nancheck.c
index e08f51175a..193e96f546 100644
--- a/LAPACKE/utils/lapacke_ctf_nancheck.c
+++ b/LAPACKE/utils/lapacke_ctf_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_ctf_nancheck( int matrix_layout, char transr,
+lapack_logical API_SUFFIX(LAPACKE_ctf_nancheck)( int matrix_layout, char transr,
                                       char uplo, char diag,
                                       lapack_int n,
                                       const lapack_complex_float *a )
@@ -45,15 +45,15 @@ lapack_logical LAPACKE_ctf_nancheck( int matrix_layout, char transr,
     if( a == NULL ) return (lapack_logical) 0;
 
     rowmaj = (matrix_layout == LAPACK_ROW_MAJOR);
-    ntr    = LAPACKE_lsame( transr, 'n' );
-    lower  = LAPACKE_lsame( uplo,   'l' );
-    unit   = LAPACKE_lsame( diag,   'u' );
+    ntr    = API_SUFFIX(LAPACKE_lsame)( transr, 'n' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo,   'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag,   'u' );
 
     if( ( !rowmaj && ( matrix_layout != LAPACK_COL_MAJOR ) ) ||
-        ( !ntr    && !LAPACKE_lsame( transr, 't' )
-                  && !LAPACKE_lsame( transr, 'c' ) ) ||
-        ( !lower  && !LAPACKE_lsame( uplo,   'u' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag,   'n' ) ) ) {
+        ( !ntr    && !API_SUFFIX(LAPACKE_lsame)( transr, 't' )
+                  && !API_SUFFIX(LAPACKE_lsame)( transr, 'c' ) ) ||
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo,   'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag,   'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return (lapack_logical) 0;
     }
@@ -75,36 +75,36 @@ lapack_logical LAPACKE_ctf_nancheck( int matrix_layout, char transr,
             if( ( rowmaj || ntr ) && !( rowmaj && ntr ) ) {
                 /* N is odd and ( TRANSR = 'N' .XOR. ROWMAJOR) */
                 if( lower ) {
-                    return LAPACKE_ctr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                    return API_SUFFIX(LAPACKE_ctr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  n1, &a[0], n )
-                        || LAPACKE_cge_nancheck( LAPACK_ROW_MAJOR, n2, n1,
+                        || API_SUFFIX(LAPACKE_cge_nancheck)( LAPACK_ROW_MAJOR, n2, n1,
                                                  &a[n1], n )
-                        || LAPACKE_ctr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                        || API_SUFFIX(LAPACKE_ctr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  n2, &a[n], n );
                 } else {
-                    return LAPACKE_ctr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                    return API_SUFFIX(LAPACKE_ctr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  n1, &a[n2], n )
-                        || LAPACKE_cge_nancheck( LAPACK_ROW_MAJOR, n1, n2,
+                        || API_SUFFIX(LAPACKE_cge_nancheck)( LAPACK_ROW_MAJOR, n1, n2,
                                                  &a[0], n )
-                        || LAPACKE_ctr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                        || API_SUFFIX(LAPACKE_ctr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  n2, &a[n1], n );
                 }
             } else {
                 /* N is odd and
                    ( ( TRANSR = 'C' || TRANSR = 'T' ) .XOR. COLMAJOR ) */
                 if( lower ) {
-                    return LAPACKE_ctr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                    return API_SUFFIX(LAPACKE_ctr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  n1, &a[0], n1 )
-                        || LAPACKE_cge_nancheck( LAPACK_ROW_MAJOR, n1, n2,
+                        || API_SUFFIX(LAPACKE_cge_nancheck)( LAPACK_ROW_MAJOR, n1, n2,
                                                  &a[1], n1 )
-                        || LAPACKE_ctr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                        || API_SUFFIX(LAPACKE_ctr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  n2, &a[1], n1 );
                 } else {
-                    return LAPACKE_ctr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                    return API_SUFFIX(LAPACKE_ctr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  n1, &a[(size_t)n2*n2], n2 )
-                        || LAPACKE_cge_nancheck( LAPACK_ROW_MAJOR, n2, n1,
+                        || API_SUFFIX(LAPACKE_cge_nancheck)( LAPACK_ROW_MAJOR, n2, n1,
                                                  &a[0], n2 )
-                        || LAPACKE_ctr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                        || API_SUFFIX(LAPACKE_ctr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  n2, &a[(size_t)n1*n2], n2 );
                 }
             }
@@ -114,36 +114,36 @@ lapack_logical LAPACKE_ctf_nancheck( int matrix_layout, char transr,
             if( ( rowmaj || ntr ) && !( rowmaj && ntr ) ) {
                 /* N is even and ( TRANSR = 'N' .XOR. ROWMAJOR) */
                 if( lower ) {
-                    return LAPACKE_ctr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                    return API_SUFFIX(LAPACKE_ctr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  k, &a[1], n+1 )
-                        || LAPACKE_cge_nancheck( LAPACK_ROW_MAJOR, k, k,
+                        || API_SUFFIX(LAPACKE_cge_nancheck)( LAPACK_ROW_MAJOR, k, k,
                                                  &a[k+1], n+1 )
-                        || LAPACKE_ctr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                        || API_SUFFIX(LAPACKE_ctr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  k, &a[0], n+1 );
                 } else {
-                    return LAPACKE_ctr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                    return API_SUFFIX(LAPACKE_ctr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  k, &a[k+1], n+1 )
-                        || LAPACKE_cge_nancheck( LAPACK_ROW_MAJOR, k, k,
+                        || API_SUFFIX(LAPACKE_cge_nancheck)( LAPACK_ROW_MAJOR, k, k,
                                                  &a[0], n+1 )
-                        || LAPACKE_ctr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                        || API_SUFFIX(LAPACKE_ctr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  k, &a[k], n+1 );
                 }
             } else {
                 /* N is even and
                    ( ( TRANSR = 'C' || TRANSR = 'T' ) .XOR. COLMAJOR ) */
                 if( lower ) {
-                    return LAPACKE_ctr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                    return API_SUFFIX(LAPACKE_ctr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  k, &a[k], k )
-                        || LAPACKE_cge_nancheck( LAPACK_ROW_MAJOR, k, k,
+                        || API_SUFFIX(LAPACKE_cge_nancheck)( LAPACK_ROW_MAJOR, k, k,
                                                  &a[(size_t)k*(k+1)], k )
-                        || LAPACKE_ctr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                        || API_SUFFIX(LAPACKE_ctr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  k, &a[0], k );
                 } else {
-                    return LAPACKE_ctr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                    return API_SUFFIX(LAPACKE_ctr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  k, &a[(size_t)k*(k+1)], k )
-                        || LAPACKE_cge_nancheck( LAPACK_ROW_MAJOR, k, k,
+                        || API_SUFFIX(LAPACKE_cge_nancheck)( LAPACK_ROW_MAJOR, k, k,
                                                  &a[0], k )
-                        || LAPACKE_ctr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                        || API_SUFFIX(LAPACKE_ctr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  k, &a[(size_t)k*k], k );
                 }
             }
@@ -151,6 +151,6 @@ lapack_logical LAPACKE_ctf_nancheck( int matrix_layout, char transr,
     } else {
         /* Non-unit case - just check whole array for NaNs. */
         len = n*(n+1)/2;
-        return LAPACKE_cge_nancheck( LAPACK_COL_MAJOR, len, 1, a, len );
+        return API_SUFFIX(LAPACKE_cge_nancheck)( LAPACK_COL_MAJOR, len, 1, a, len );
     }
 }
diff --git a/LAPACKE/utils/lapacke_ctf_trans.c b/LAPACKE/utils/lapacke_ctf_trans.c
index e0c88dde0f..c4b431f0b5 100644
--- a/LAPACKE/utils/lapacke_ctf_trans.c
+++ b/LAPACKE/utils/lapacke_ctf_trans.c
@@ -37,7 +37,7 @@
  * This functions does copy diagonal for both unit and non-unit cases.
  */
 
-void LAPACKE_ctf_trans( int matrix_layout, char transr, char uplo, char diag,
+void API_SUFFIX(LAPACKE_ctf_trans)( int matrix_layout, char transr, char uplo, char diag,
                         lapack_int n, const lapack_complex_float *in,
                         lapack_complex_float *out )
 {
@@ -47,15 +47,15 @@ void LAPACKE_ctf_trans( int matrix_layout, char transr, char uplo, char diag,
     if( in == NULL || out == NULL ) return ;
 
     rowmaj = (matrix_layout == LAPACK_ROW_MAJOR);
-    ntr    = LAPACKE_lsame( transr, 'n' );
-    lower  = LAPACKE_lsame( uplo,   'l' );
-    unit   = LAPACKE_lsame( diag,   'u' );
+    ntr    = API_SUFFIX(LAPACKE_lsame)( transr, 'n' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo,   'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag,   'u' );
 
     if( ( !rowmaj && ( matrix_layout != LAPACK_COL_MAJOR ) ) ||
-        ( !ntr    && !LAPACKE_lsame( transr, 't' ) &&
-                     !LAPACKE_lsame( transr, 'c' ) ) ||
-        ( !lower  && !LAPACKE_lsame( uplo,   'u' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag,   'n' ) ) ) {
+        ( !ntr    && !API_SUFFIX(LAPACKE_lsame)( transr, 't' ) &&
+                     !API_SUFFIX(LAPACKE_lsame)( transr, 'c' ) ) ||
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo,   'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag,   'n' ) ) ) {
         /* Just exit if input parameters are wrong */
         return;
     }
@@ -81,8 +81,8 @@ void LAPACKE_ctf_trans( int matrix_layout, char transr, char uplo, char diag,
 
     /* Perform conversion: */
     if( rowmaj ) {
-        LAPACKE_cge_trans( LAPACK_ROW_MAJOR, row, col, in, col, out, row );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_ROW_MAJOR, row, col, in, col, out, row );
     } else {
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, row, col, in, row, out, col );
+        API_SUFFIX(LAPACKE_cge_trans)( LAPACK_COL_MAJOR, row, col, in, row, out, col );
     }
 }
diff --git a/LAPACKE/utils/lapacke_ctp_nancheck.c b/LAPACKE/utils/lapacke_ctp_nancheck.c
index 30c8a93984..eb245ff511 100644
--- a/LAPACKE/utils/lapacke_ctp_nancheck.c
+++ b/LAPACKE/utils/lapacke_ctp_nancheck.c
@@ -36,7 +36,7 @@
  * check 1d array for NaNs. It doesn't depend upon uplo or matrix_layout.
  */
 
-lapack_logical LAPACKE_ctp_nancheck( int matrix_layout, char uplo, char diag,
+lapack_logical API_SUFFIX(LAPACKE_ctp_nancheck)( int matrix_layout, char uplo, char diag,
                                       lapack_int n,
                                       const lapack_complex_float *ap )
 {
@@ -46,12 +46,12 @@ lapack_logical LAPACKE_ctp_nancheck( int matrix_layout, char uplo, char diag,
     if( ap == NULL ) return (lapack_logical) 0;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    upper  = LAPACKE_lsame( uplo, 'u' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    upper  = API_SUFFIX(LAPACKE_lsame)( uplo, 'u' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !upper  && !LAPACKE_lsame( uplo, 'l' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !upper  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return (lapack_logical) 0;
     }
@@ -65,11 +65,11 @@ lapack_logical LAPACKE_ctp_nancheck( int matrix_layout, char uplo, char diag,
          */
         if( ( colmaj || upper ) && !( colmaj && upper ) ) {
             for( i = 1; i < n; i++ )
-                if( LAPACKE_c_nancheck( i, &ap[ ((size_t)i+1)*i/2 ], 1 ) )
+                if( API_SUFFIX(LAPACKE_c_nancheck)( i, &ap[ ((size_t)i+1)*i/2 ], 1 ) )
                     return (lapack_logical) 1;
         } else {
             for( i = 0; i < n-1; i++ )
-                if( LAPACKE_c_nancheck( n-i-1,
+                if( API_SUFFIX(LAPACKE_c_nancheck)( n-i-1,
                     &ap[ (size_t)i+1 + i*((size_t)2*n-i+1)/2 ], 1 ) )
                     return (lapack_logical) 1;
         }
@@ -77,6 +77,6 @@ lapack_logical LAPACKE_ctp_nancheck( int matrix_layout, char uplo, char diag,
     } else {
         /* Non-unit case - just check whole array for NaNs. */
         len = n*(n+1)/2;
-        return LAPACKE_c_nancheck( len, ap, 1 );
+        return API_SUFFIX(LAPACKE_c_nancheck)( len, ap, 1 );
     }
 }
diff --git a/LAPACKE/utils/lapacke_ctp_trans.c b/LAPACKE/utils/lapacke_ctp_trans.c
index 2141a6c61d..8cb373847d 100644
--- a/LAPACKE/utils/lapacke_ctp_trans.c
+++ b/LAPACKE/utils/lapacke_ctp_trans.c
@@ -36,7 +36,7 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_ctp_trans( int matrix_layout, char uplo, char diag,
+void API_SUFFIX(LAPACKE_ctp_trans)( int matrix_layout, char uplo, char diag,
                         lapack_int n, const lapack_complex_float *in,
                         lapack_complex_float *out )
 {
@@ -46,12 +46,12 @@ void LAPACKE_ctp_trans( int matrix_layout, char uplo, char diag,
     if( in == NULL || out == NULL ) return ;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    upper  = LAPACKE_lsame( uplo, 'u' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    upper  = API_SUFFIX(LAPACKE_lsame)( uplo, 'u' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !upper  && !LAPACKE_lsame( uplo, 'l' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !upper  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return;
     }
diff --git a/LAPACKE/utils/lapacke_ctr_nancheck.c b/LAPACKE/utils/lapacke_ctr_nancheck.c
index 4bc96ed4cb..c21adfdce7 100644
--- a/LAPACKE/utils/lapacke_ctr_nancheck.c
+++ b/LAPACKE/utils/lapacke_ctr_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_ctr_nancheck( int matrix_layout, char uplo, char diag,
+lapack_logical API_SUFFIX(LAPACKE_ctr_nancheck)( int matrix_layout, char uplo, char diag,
                                       lapack_int n,
                                       const lapack_complex_float *a,
                                       lapack_int lda )
@@ -44,12 +44,12 @@ lapack_logical LAPACKE_ctr_nancheck( int matrix_layout, char uplo, char diag,
     if( a == NULL ) return (lapack_logical) 0;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    lower  = LAPACKE_lsame( uplo, 'l' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo, 'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !lower  && !LAPACKE_lsame( uplo, 'u' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return (lapack_logical) 0;
     }
diff --git a/LAPACKE/utils/lapacke_ctr_trans.c b/LAPACKE/utils/lapacke_ctr_trans.c
index a57c0562f4..7022f74dea 100644
--- a/LAPACKE/utils/lapacke_ctr_trans.c
+++ b/LAPACKE/utils/lapacke_ctr_trans.c
@@ -36,7 +36,7 @@
  * layout or vice versa.
  */
 
-void LAPACKE_ctr_trans( int matrix_layout, char uplo, char diag, lapack_int n,
+void API_SUFFIX(LAPACKE_ctr_trans)( int matrix_layout, char uplo, char diag, lapack_int n,
                         const lapack_complex_float *in, lapack_int ldin,
                         lapack_complex_float *out, lapack_int ldout )
 {
@@ -46,12 +46,12 @@ void LAPACKE_ctr_trans( int matrix_layout, char uplo, char diag, lapack_int n,
     if( in == NULL || out == NULL ) return ;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    lower  = LAPACKE_lsame( uplo, 'l' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo, 'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !lower  && !LAPACKE_lsame( uplo, 'u' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return;
     }
diff --git a/LAPACKE/utils/lapacke_ctz_nancheck.c b/LAPACKE/utils/lapacke_ctz_nancheck.c
new file mode 100644
index 0000000000..91f759b46c
--- /dev/null
+++ b/LAPACKE/utils/lapacke_ctz_nancheck.c
@@ -0,0 +1,144 @@
+/*****************************************************************************
+  Copyright (c) 2022, 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 C interface to LAPACK utility function
+* Author: Simon Märtens
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+/*****************************************************************************
+  Check a trapezoidal matrix for NaN entries. The shape of the trapezoidal
+  matrix is determined by the arguments `direct` and `uplo`. `Direct` chooses
+  the diagonal which shall be considered and `uplo` tells us whether we use the
+  upper or lower part of the matrix with respect to the chosen diagonal.
+
+      Diagonals 'F' (front / forward) and 'B' (back / backward):
+
+        A = ( F       )           A = ( F     B       )
+            (    F    )               (    F     B    )
+            ( B     F )               (       F     B )
+            (    B    )
+            (       B )
+
+      direct = 'F', uplo = 'L':
+
+        A = ( *       )           A = ( *             )
+            ( *  *    )               ( *  *          )
+            ( *  *  * )               ( *  *  *       )
+            ( *  *  * )
+            ( *  *  * )
+
+      direct = 'F', uplo = 'U':
+
+        A = ( *  *  * )           A = ( *  *  *  *  * )
+            (    *  * )               (    *  *  *  * )
+            (       * )               (       *  *  * )
+            (         )
+            (         )
+
+      direct = 'B', uplo = 'L':
+
+        A = (         )           A = ( *  *  *       )
+            (         )               ( *  *  *  *    )
+            ( *       )               ( *  *  *  *  * )
+            ( *  *    )
+            ( *  *  * )
+
+      direct = 'B', uplo = 'U':
+
+        A = ( *  *  * )           A = (       *  *  * )
+            ( *  *  * )               (          *  * )
+            ( *  *  * )               (             * )
+            (    *  * )
+            (       * )
+
+*****************************************************************************/
+
+lapack_logical API_SUFFIX(LAPACKE_ctz_nancheck)( int matrix_layout, char direct, char uplo,
+                                     char diag, lapack_int m, lapack_int n,
+                                     const lapack_complex_float *a,
+                                     lapack_int lda )
+{
+    lapack_logical colmaj, front, lower, unit;
+
+    if( a == NULL ) return (lapack_logical) 0;
+
+    colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
+    front  = API_SUFFIX(LAPACKE_lsame)( direct, 'f' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo, 'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
+
+    if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
+        ( !front  && !API_SUFFIX(LAPACKE_lsame)( direct, 'b' ) ) ||
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
+        /* Just exit if any of input parameters are wrong */
+        return (lapack_logical) 0;
+    }
+
+    /* Initial offsets and sizes of triangular and rectangular parts */
+    lapack_int tri_offset = 0;
+    lapack_int tri_n = MIN(m,n);
+    lapack_int rect_offset = -1;
+    lapack_int rect_m = ( m > n ) ? m - n : m;
+    lapack_int rect_n = ( n > m ) ? n - m : n;
+
+    /* Fix offsets depending on the shape of the matrix */
+    if( front ) {
+        if( lower && m > n ) {
+            rect_offset = tri_n * ( !colmaj ? lda : 1 );
+        } else if( !lower && n > m ) {
+            rect_offset = tri_n * ( colmaj ? lda : 1 );
+        }
+    } else {
+        if( m > n ) {
+            tri_offset = rect_m * ( !colmaj ? lda : 1 );
+            if( !lower ) {
+                rect_offset = 0;
+            }
+        } else if( n > m ) {
+            tri_offset = rect_n * ( colmaj ? lda : 1 );
+            if( lower ) {
+                rect_offset = 0;
+            }
+        }
+    }
+
+    /* Check rectangular part */
+    if( rect_offset >= 0 ) {
+        if( API_SUFFIX(LAPACKE_cge_nancheck)( matrix_layout, rect_m, rect_n,
+                                  &a[rect_offset], lda) ) {
+            return (lapack_logical) 1;
+        }
+    }
+
+    /* Check triangular part */
+    return API_SUFFIX(LAPACKE_ctr_nancheck)( matrix_layout, uplo, diag, tri_n,
+                                 &a[tri_offset], lda );
+}
diff --git a/LAPACKE/utils/lapacke_ctz_trans.c b/LAPACKE/utils/lapacke_ctz_trans.c
new file mode 100644
index 0000000000..83f7b61cb8
--- /dev/null
+++ b/LAPACKE/utils/lapacke_ctz_trans.c
@@ -0,0 +1,153 @@
+/*****************************************************************************
+  Copyright (c) 2022, 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 C interface to LAPACK utility function
+* Author: Simon Märtens
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+/*****************************************************************************
+  Converts input triangular matrix from row-major(C) to column-major(Fortran)
+  layout or vice versa. The shape of the trapezoidal matrix is determined by
+  the arguments `direct` and `uplo`. `Direct` chooses the diagonal which shall
+  be considered and `uplo` tells us whether we use the upper or lower part of
+  the matrix with respect to the chosen diagonal.
+
+      Diagonals 'F' (front / forward) and 'B' (back / backward):
+
+        A = ( F       )           A = ( F     B       )
+            (    F    )               (    F     B    )
+            ( B     F )               (       F     B )
+            (    B    )
+            (       B )
+
+      direct = 'F', uplo = 'L':
+
+        A = ( *       )           A = ( *             )
+            ( *  *    )               ( *  *          )
+            ( *  *  * )               ( *  *  *       )
+            ( *  *  * )
+            ( *  *  * )
+
+      direct = 'F', uplo = 'U':
+
+        A = ( *  *  * )           A = ( *  *  *  *  * )
+            (    *  * )               (    *  *  *  * )
+            (       * )               (       *  *  * )
+            (         )
+            (         )
+
+      direct = 'B', uplo = 'L':
+
+        A = (         )           A = ( *  *  *       )
+            (         )               ( *  *  *  *    )
+            ( *       )               ( *  *  *  *  * )
+            ( *  *    )
+            ( *  *  * )
+
+      direct = 'B', uplo = 'U':
+
+        A = ( *  *  * )           A = (       *  *  * )
+            ( *  *  * )               (          *  * )
+            ( *  *  * )               (             * )
+            (    *  * )
+            (       * )
+
+*****************************************************************************/
+
+void API_SUFFIX(LAPACKE_ctz_trans)( int matrix_layout, char direct, char uplo,
+                        char diag, lapack_int m, lapack_int n,
+                        const lapack_complex_float *in, lapack_int ldin,
+                        lapack_complex_float *out, lapack_int ldout )
+{
+    lapack_logical colmaj, front, lower, unit;
+
+    if( in == NULL || out == NULL ) return ;
+
+    colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
+    front  = API_SUFFIX(LAPACKE_lsame)( direct, 'f' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo, 'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
+
+    if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
+        ( !front  && !API_SUFFIX(LAPACKE_lsame)( direct, 'b' ) ) ||
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
+        /* Just exit if any of input parameters are wrong */
+        return;
+    }
+
+    /* Initial offsets and sizes of triangular and rectangular parts */
+    lapack_int tri_in_offset = 0;
+    lapack_int tri_out_offset = 0;
+    lapack_int tri_n = MIN(m,n);
+    lapack_int rect_in_offset = -1;
+    lapack_int rect_out_offset = -1;
+    lapack_int rect_m = ( m > n ) ? m - n : m;
+    lapack_int rect_n = ( n > m ) ? n - m : n;
+
+    /* Fix offsets depending on the shape of the matrix */
+    if( front ) {
+        if( lower && m > n ) {
+            rect_in_offset = tri_n * ( !colmaj ? ldin : 1 );
+            rect_out_offset = tri_n * ( colmaj ? ldout : 1 );
+        } else if( !lower && n > m ) {
+            rect_in_offset = tri_n * ( colmaj ? ldin : 1 );
+            rect_out_offset = tri_n * ( !colmaj ? ldout : 1 );
+        }
+    } else {
+        if( m > n ) {
+            tri_in_offset = rect_m * ( !colmaj ? ldin : 1 );
+            tri_out_offset = rect_m * ( colmaj ? ldout : 1 );
+            if( !lower ) {
+                rect_in_offset = 0;
+                rect_out_offset = 0;
+            }
+        } else if( n > m ) {
+            tri_in_offset = rect_n * ( colmaj ? ldin : 1 );
+            tri_out_offset = rect_n * ( !colmaj ? ldout : 1 );
+            if( lower ) {
+                rect_in_offset = 0;
+                rect_out_offset = 0;
+            }
+        }
+    }
+
+    /* Copy & transpose rectangular part */
+    if( rect_in_offset >= 0 && rect_out_offset >= 0 ) {
+        API_SUFFIX(LAPACKE_cge_trans)( matrix_layout, rect_m, rect_n,
+                           &in[rect_in_offset], ldin,
+                           &out[rect_out_offset], ldout );
+    }
+
+    /* Copy & transpose triangular part */
+    API_SUFFIX(LAPACKE_ctr_trans)( matrix_layout, uplo, diag, tri_n,
+                       &in[tri_in_offset], ldin,
+                       &out[tri_out_offset], ldout );
+}
diff --git a/LAPACKE/utils/lapacke_d_nancheck.c b/LAPACKE/utils/lapacke_d_nancheck.c
index 328939b448..0ae9ea220e 100644
--- a/LAPACKE/utils/lapacke_d_nancheck.c
+++ b/LAPACKE/utils/lapacke_d_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a vector for NaN entries. */
 
-lapack_logical LAPACKE_d_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_d_nancheck)( lapack_int n,
                                     const double *x,
                                     lapack_int incx )
 {
diff --git a/LAPACKE/utils/lapacke_dgb_nancheck.c b/LAPACKE/utils/lapacke_dgb_nancheck.c
index 4f3e039c1e..5ec877e51f 100644
--- a/LAPACKE/utils/lapacke_dgb_nancheck.c
+++ b/LAPACKE/utils/lapacke_dgb_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_dgb_nancheck( int matrix_layout, lapack_int m,
+lapack_logical API_SUFFIX(LAPACKE_dgb_nancheck)( int matrix_layout, lapack_int m,
                                       lapack_int n, lapack_int kl,
                                       lapack_int ku,
                                       const double *ab,
diff --git a/LAPACKE/utils/lapacke_dgb_trans.c b/LAPACKE/utils/lapacke_dgb_trans.c
index 6624936a62..2bd6da1b88 100644
--- a/LAPACKE/utils/lapacke_dgb_trans.c
+++ b/LAPACKE/utils/lapacke_dgb_trans.c
@@ -36,7 +36,7 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_dgb_trans( int matrix_layout, lapack_int m, lapack_int n,
+void API_SUFFIX(LAPACKE_dgb_trans)( int matrix_layout, lapack_int m, lapack_int n,
                         lapack_int kl, lapack_int ku,
                         const double *in, lapack_int ldin,
                         double *out, lapack_int ldout )
@@ -54,7 +54,7 @@ void LAPACKE_dgb_trans( int matrix_layout, lapack_int m, lapack_int n,
         }
     } else if ( matrix_layout == LAPACK_ROW_MAJOR ) {
         /* TODO: interchange loops for performance.
-         * This is just reference impemeltation.
+         * This is just reference implementation.
          */
         for( j = 0; j < MIN( n, ldin ); j++ ) {
             for( i = MAX( ku-j, 0 ); i < MIN3( ldout, m+ku-j, kl+ku+1 );
diff --git a/LAPACKE/utils/lapacke_dge_nancheck.c b/LAPACKE/utils/lapacke_dge_nancheck.c
index 47d7d5db8c..c47fc5b9de 100644
--- a/LAPACKE/utils/lapacke_dge_nancheck.c
+++ b/LAPACKE/utils/lapacke_dge_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_dge_nancheck( int matrix_layout, lapack_int m,
+lapack_logical API_SUFFIX(LAPACKE_dge_nancheck)( int matrix_layout, lapack_int m,
                                       lapack_int n,
                                       const double *a,
                                       lapack_int lda )
diff --git a/LAPACKE/utils/lapacke_dge_trans.c b/LAPACKE/utils/lapacke_dge_trans.c
index ac9d5e47eb..c9c8ced9c2 100644
--- a/LAPACKE/utils/lapacke_dge_trans.c
+++ b/LAPACKE/utils/lapacke_dge_trans.c
@@ -36,7 +36,7 @@
  * layout or vice versa.
  */
 
-void LAPACKE_dge_trans( int matrix_layout, lapack_int m, lapack_int n,
+void API_SUFFIX(LAPACKE_dge_trans)( int matrix_layout, lapack_int m, lapack_int n,
                         const double* in, lapack_int ldin,
                         double* out, lapack_int ldout )
 {
diff --git a/LAPACKE/utils/lapacke_dgg_nancheck.c b/LAPACKE/utils/lapacke_dgg_nancheck.c
index f70fae5853..524c59cb10 100644
--- a/LAPACKE/utils/lapacke_dgg_nancheck.c
+++ b/LAPACKE/utils/lapacke_dgg_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_dgg_nancheck( int matrix_layout, lapack_int m,
+lapack_logical API_SUFFIX(LAPACKE_dgg_nancheck)( int matrix_layout, lapack_int m,
                                       lapack_int n,
                                       const double *a,
                                       lapack_int lda )
 {
-    return LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda );
+    return API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, m, n, a, lda );
 }
diff --git a/LAPACKE/utils/lapacke_dgg_trans.c b/LAPACKE/utils/lapacke_dgg_trans.c
index 117ffa416b..2c7dbec86e 100644
--- a/LAPACKE/utils/lapacke_dgg_trans.c
+++ b/LAPACKE/utils/lapacke_dgg_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_dgg_trans( int matrix_layout, lapack_int m, lapack_int n,
+void API_SUFFIX(LAPACKE_dgg_trans)( int matrix_layout, lapack_int m, lapack_int n,
                         const double* in, lapack_int ldin,
                         double* out, lapack_int ldout )
 {
-    LAPACKE_dge_trans( matrix_layout, m, n, in, ldin, out, ldout );
+    API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, m, n, in, ldin, out, ldout );
 }
diff --git a/LAPACKE/utils/lapacke_dgt_nancheck.c b/LAPACKE/utils/lapacke_dgt_nancheck.c
index 8d42c5738d..d6e9b1add5 100644
--- a/LAPACKE/utils/lapacke_dgt_nancheck.c
+++ b/LAPACKE/utils/lapacke_dgt_nancheck.c
@@ -33,12 +33,12 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_dgt_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_dgt_nancheck)( lapack_int n,
                                       const double *dl,
                                       const double *d,
                                       const double *du )
 {
-    return LAPACKE_d_nancheck( n-1, dl, 1 )
-        || LAPACKE_d_nancheck( n  , d,  1 )
-        || LAPACKE_d_nancheck( n-1, du, 1 );
+    return API_SUFFIX(LAPACKE_d_nancheck)( n-1, dl, 1 )
+        || API_SUFFIX(LAPACKE_d_nancheck)( n  , d,  1 )
+        || API_SUFFIX(LAPACKE_d_nancheck)( n-1, du, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_dhs_nancheck.c b/LAPACKE/utils/lapacke_dhs_nancheck.c
index 6dc087cbe6..1b14cb03d5 100644
--- a/LAPACKE/utils/lapacke_dhs_nancheck.c
+++ b/LAPACKE/utils/lapacke_dhs_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_dhs_nancheck( int matrix_layout, lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_dhs_nancheck)( int matrix_layout, lapack_int n,
                                       const double *a,
                                       lapack_int lda )
 {
@@ -43,14 +43,14 @@ lapack_logical LAPACKE_dhs_nancheck( int matrix_layout, lapack_int n,
 
     /* Check subdiagonal first */
     if( matrix_layout == LAPACK_COL_MAJOR ) {
-        subdiag_nans = LAPACKE_d_nancheck( n-1, &a[1], lda+1 );
+        subdiag_nans = API_SUFFIX(LAPACKE_d_nancheck)( n-1, &a[1], lda+1 );
     } else if ( matrix_layout == LAPACK_ROW_MAJOR ) {
-        subdiag_nans = LAPACKE_d_nancheck( n-1, &a[lda], lda+1 );
+        subdiag_nans = API_SUFFIX(LAPACKE_d_nancheck)( n-1, &a[lda], lda+1 );
     } else {
         return (lapack_logical) 0;
     }
 
     /* Check upper triangular if subdiagonal has no NaNs. */
-    return subdiag_nans || LAPACKE_dtr_nancheck( matrix_layout, 'u', 'n',
+    return subdiag_nans || API_SUFFIX(LAPACKE_dtr_nancheck)( matrix_layout, 'u', 'n',
                                                  n, a, lda);
 }
diff --git a/LAPACKE/utils/lapacke_dhs_trans.c b/LAPACKE/utils/lapacke_dhs_trans.c
index 6d6fbeb9db..1c758bf298 100644
--- a/LAPACKE/utils/lapacke_dhs_trans.c
+++ b/LAPACKE/utils/lapacke_dhs_trans.c
@@ -36,7 +36,7 @@
  * layout or vice versa.
  */
 
-void LAPACKE_dhs_trans( int matrix_layout, lapack_int n,
+void API_SUFFIX(LAPACKE_dhs_trans)( int matrix_layout, lapack_int n,
                         const double *in, lapack_int ldin,
                         double *out, lapack_int ldout )
 {
@@ -44,15 +44,15 @@ void LAPACKE_dhs_trans( int matrix_layout, lapack_int n,
 
     /* Convert subdiagonal first */
     if( matrix_layout == LAPACK_COL_MAJOR ) {
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, 1, n-1, &in[1], ldin+1,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, 1, n-1, &in[1], ldin+1,
                            &out[ldout], ldout+1 );
     } else if ( matrix_layout == LAPACK_ROW_MAJOR ) {
-        LAPACKE_dge_trans( LAPACK_ROW_MAJOR, n-1, 1, &in[ldin], ldin+1,
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_ROW_MAJOR, n-1, 1, &in[ldin], ldin+1,
                            &out[1], ldout+1 );
     } else {
         return;
     }
 
     /* Convert upper triangular. */
-    LAPACKE_dtr_trans( matrix_layout, 'u', 'n', n, in, ldin, out, ldout);
+    API_SUFFIX(LAPACKE_dtr_trans)( matrix_layout, 'u', 'n', n, in, ldin, out, ldout);
 }
diff --git a/LAPACKE/utils/lapacke_dpb_nancheck.c b/LAPACKE/utils/lapacke_dpb_nancheck.c
index 0ea19feeb1..ef7f480049 100644
--- a/LAPACKE/utils/lapacke_dpb_nancheck.c
+++ b/LAPACKE/utils/lapacke_dpb_nancheck.c
@@ -33,15 +33,15 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_dpb_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_dpb_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n, lapack_int kd,
                                       const double* ab,
                                       lapack_int ldab )
 {
-    if( LAPACKE_lsame( uplo, 'u' ) ) {
-        return LAPACKE_dgb_nancheck( matrix_layout, n, n, 0, kd, ab, ldab );
-    } else if( LAPACKE_lsame( uplo, 'l' ) ) {
-        return LAPACKE_dgb_nancheck( matrix_layout, n, n, kd, 0, ab, ldab );
+    if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
+        return API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, 0, kd, ab, ldab );
+    } else if( API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) {
+        return API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, kd, 0, ab, ldab );
     }
     return (lapack_logical) 0;
 }
diff --git a/LAPACKE/utils/lapacke_dpb_trans.c b/LAPACKE/utils/lapacke_dpb_trans.c
index 88b9bebfa0..cfe63b6b92 100644
--- a/LAPACKE/utils/lapacke_dpb_trans.c
+++ b/LAPACKE/utils/lapacke_dpb_trans.c
@@ -36,14 +36,14 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_dpb_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_dpb_trans)( int matrix_layout, char uplo, lapack_int n,
                         lapack_int kd,
                         const double *in, lapack_int ldin,
                         double *out, lapack_int ldout )
 {
-    if( LAPACKE_lsame( uplo, 'u' ) ) {
-        LAPACKE_dgb_trans( matrix_layout, n, n, 0, kd, in, ldin, out, ldout );
-    } else if( LAPACKE_lsame( uplo, 'l' ) ) {
-        LAPACKE_dgb_trans( matrix_layout, n, n, kd, 0, in, ldin, out, ldout );
+    if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
+        API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n, n, 0, kd, in, ldin, out, ldout );
+    } else if( API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) {
+        API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n, n, kd, 0, in, ldin, out, ldout );
     }
 }
diff --git a/LAPACKE/utils/lapacke_dpf_nancheck.c b/LAPACKE/utils/lapacke_dpf_nancheck.c
index cb36afc17c..62561b85b5 100644
--- a/LAPACKE/utils/lapacke_dpf_nancheck.c
+++ b/LAPACKE/utils/lapacke_dpf_nancheck.c
@@ -37,9 +37,9 @@
  * matrix_layout.
  */
 
-lapack_logical LAPACKE_dpf_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_dpf_nancheck)( lapack_int n,
                                       const double *a )
 {
     lapack_int len = n*(n+1)/2;
-    return LAPACKE_d_nancheck( len, a, 1 );
+    return API_SUFFIX(LAPACKE_d_nancheck)( len, a, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_dpf_trans.c b/LAPACKE/utils/lapacke_dpf_trans.c
index 4ba320ecd1..5f059fa435 100644
--- a/LAPACKE/utils/lapacke_dpf_trans.c
+++ b/LAPACKE/utils/lapacke_dpf_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_dpf_trans( int matrix_layout, char transr, char uplo,
+void API_SUFFIX(LAPACKE_dpf_trans)( int matrix_layout, char transr, char uplo,
                         lapack_int n, const double *in,
                         double *out )
 {
-    LAPACKE_dtf_trans( matrix_layout, transr, uplo, 'n', n, in, out );
+    API_SUFFIX(LAPACKE_dtf_trans)( matrix_layout, transr, uplo, 'n', n, in, out );
 }
diff --git a/LAPACKE/utils/lapacke_dpo_nancheck.c b/LAPACKE/utils/lapacke_dpo_nancheck.c
index 2faacbb708..6e59f17507 100644
--- a/LAPACKE/utils/lapacke_dpo_nancheck.c
+++ b/LAPACKE/utils/lapacke_dpo_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_dpo_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_dpo_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n,
                                       const double *a,
                                       lapack_int lda )
 {
-    return LAPACKE_dtr_nancheck( matrix_layout, uplo, 'n', n, a, lda );
+    return API_SUFFIX(LAPACKE_dtr_nancheck)( matrix_layout, uplo, 'n', n, a, lda );
 }
diff --git a/LAPACKE/utils/lapacke_dpo_trans.c b/LAPACKE/utils/lapacke_dpo_trans.c
index f2de7eaa15..1cfb253957 100644
--- a/LAPACKE/utils/lapacke_dpo_trans.c
+++ b/LAPACKE/utils/lapacke_dpo_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_dpo_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_dpo_trans)( int matrix_layout, char uplo, lapack_int n,
                         const double *in, lapack_int ldin,
                         double *out, lapack_int ldout )
 {
-    LAPACKE_dtr_trans( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
+    API_SUFFIX(LAPACKE_dtr_trans)( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
 }
diff --git a/LAPACKE/utils/lapacke_dpp_nancheck.c b/LAPACKE/utils/lapacke_dpp_nancheck.c
index 6e2182e1f0..a94473a40e 100644
--- a/LAPACKE/utils/lapacke_dpp_nancheck.c
+++ b/LAPACKE/utils/lapacke_dpp_nancheck.c
@@ -36,9 +36,9 @@
  * check 1d array for NaNs. It doesn't depend upon uplo or matrix_layout.
  */
 
-lapack_logical LAPACKE_dpp_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_dpp_nancheck)( lapack_int n,
                                       const double *ap )
 {
     lapack_int len = n*(n+1)/2;
-    return LAPACKE_d_nancheck( len, ap, 1 );
+    return API_SUFFIX(LAPACKE_d_nancheck)( len, ap, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_dpp_trans.c b/LAPACKE/utils/lapacke_dpp_trans.c
index 43de0bd466..6d97487d44 100644
--- a/LAPACKE/utils/lapacke_dpp_trans.c
+++ b/LAPACKE/utils/lapacke_dpp_trans.c
@@ -36,9 +36,9 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_dpp_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_dpp_trans)( int matrix_layout, char uplo, lapack_int n,
                         const double *in,
                         double *out )
 {
-    LAPACKE_dtp_trans( matrix_layout, uplo, 'n', n, in, out );
+    API_SUFFIX(LAPACKE_dtp_trans)( matrix_layout, uplo, 'n', n, in, out );
 }
diff --git a/LAPACKE/utils/lapacke_dpt_nancheck.c b/LAPACKE/utils/lapacke_dpt_nancheck.c
index 887db5cf85..cd88b04150 100644
--- a/LAPACKE/utils/lapacke_dpt_nancheck.c
+++ b/LAPACKE/utils/lapacke_dpt_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_dpt_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_dpt_nancheck)( lapack_int n,
                                       const double *d,
                                       const double *e )
 {
-    return LAPACKE_d_nancheck( n,   d, 1 )
-        || LAPACKE_d_nancheck( n-1, e, 1 );
+    return API_SUFFIX(LAPACKE_d_nancheck)( n,   d, 1 )
+        || API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_dsb_nancheck.c b/LAPACKE/utils/lapacke_dsb_nancheck.c
index 8de1aa088a..76b329aa29 100644
--- a/LAPACKE/utils/lapacke_dsb_nancheck.c
+++ b/LAPACKE/utils/lapacke_dsb_nancheck.c
@@ -33,15 +33,15 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_dsb_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_dsb_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n, lapack_int kd,
                                       const double* ab,
                                       lapack_int ldab )
 {
-    if( LAPACKE_lsame( uplo, 'u' ) ) {
-        return LAPACKE_dgb_nancheck( matrix_layout, n, n, 0, kd, ab, ldab );
-    } else if( LAPACKE_lsame( uplo, 'l' ) ) {
-        return LAPACKE_dgb_nancheck( matrix_layout, n, n, kd, 0, ab, ldab );
+    if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
+        return API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, 0, kd, ab, ldab );
+    } else if( API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) {
+        return API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, kd, 0, ab, ldab );
     }
     return (lapack_logical) 0;
 }
diff --git a/LAPACKE/utils/lapacke_dsb_trans.c b/LAPACKE/utils/lapacke_dsb_trans.c
index db2994e0c3..183a953223 100644
--- a/LAPACKE/utils/lapacke_dsb_trans.c
+++ b/LAPACKE/utils/lapacke_dsb_trans.c
@@ -36,14 +36,14 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_dsb_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_dsb_trans)( int matrix_layout, char uplo, lapack_int n,
                         lapack_int kd,
                         const double *in, lapack_int ldin,
                         double *out, lapack_int ldout )
 {
-    if( LAPACKE_lsame( uplo, 'u' ) ) {
-        LAPACKE_dgb_trans( matrix_layout, n, n, 0, kd, in, ldin, out, ldout );
-    } else if( LAPACKE_lsame( uplo, 'l' ) ) {
-        LAPACKE_dgb_trans( matrix_layout, n, n, kd, 0, in, ldin, out, ldout );
+    if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
+        API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n, n, 0, kd, in, ldin, out, ldout );
+    } else if( API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) {
+        API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n, n, kd, 0, in, ldin, out, ldout );
     }
 }
diff --git a/LAPACKE/utils/lapacke_dsp_nancheck.c b/LAPACKE/utils/lapacke_dsp_nancheck.c
index ba9e6a0ace..19b37b7aa6 100644
--- a/LAPACKE/utils/lapacke_dsp_nancheck.c
+++ b/LAPACKE/utils/lapacke_dsp_nancheck.c
@@ -36,9 +36,9 @@
  * check 1d array for NaNs. It doesn't depend upon uplo or matrix_layout.
  */
 
-lapack_logical LAPACKE_dsp_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_dsp_nancheck)( lapack_int n,
                                       const double *ap )
 {
     lapack_int len = n*(n+1)/2;
-    return LAPACKE_d_nancheck( len, ap, 1 );
+    return API_SUFFIX(LAPACKE_d_nancheck)( len, ap, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_dsp_trans.c b/LAPACKE/utils/lapacke_dsp_trans.c
index 3a73a691cb..b37e7d98b8 100644
--- a/LAPACKE/utils/lapacke_dsp_trans.c
+++ b/LAPACKE/utils/lapacke_dsp_trans.c
@@ -36,9 +36,9 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_dsp_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_dsp_trans)( int matrix_layout, char uplo, lapack_int n,
                         const double *in,
                         double *out )
 {
-    LAPACKE_dtp_trans( matrix_layout, uplo, 'n', n, in, out );
+    API_SUFFIX(LAPACKE_dtp_trans)( matrix_layout, uplo, 'n', n, in, out );
 }
diff --git a/LAPACKE/utils/lapacke_dst_nancheck.c b/LAPACKE/utils/lapacke_dst_nancheck.c
index f306606fad..9b5707bc88 100644
--- a/LAPACKE/utils/lapacke_dst_nancheck.c
+++ b/LAPACKE/utils/lapacke_dst_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_dst_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_dst_nancheck)( lapack_int n,
                                       const double *d,
                                       const double *e )
 {
-    return LAPACKE_d_nancheck( n,   d, 1 )
-        || LAPACKE_d_nancheck( n-1, e, 1 );
+    return API_SUFFIX(LAPACKE_d_nancheck)( n,   d, 1 )
+        || API_SUFFIX(LAPACKE_d_nancheck)( n-1, e, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_dsy_nancheck.c b/LAPACKE/utils/lapacke_dsy_nancheck.c
index c9d78b9217..90f3d5c6e3 100644
--- a/LAPACKE/utils/lapacke_dsy_nancheck.c
+++ b/LAPACKE/utils/lapacke_dsy_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_dsy_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_dsy_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n,
                                       const double *a,
                                       lapack_int lda )
 {
-    return LAPACKE_dtr_nancheck( matrix_layout, uplo, 'n', n, a, lda );
+    return API_SUFFIX(LAPACKE_dtr_nancheck)( matrix_layout, uplo, 'n', n, a, lda );
 }
diff --git a/LAPACKE/utils/lapacke_dsy_trans.c b/LAPACKE/utils/lapacke_dsy_trans.c
index 697e2048f7..4f9a364be1 100644
--- a/LAPACKE/utils/lapacke_dsy_trans.c
+++ b/LAPACKE/utils/lapacke_dsy_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_dsy_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_dsy_trans)( int matrix_layout, char uplo, lapack_int n,
                         const double *in, lapack_int ldin,
                         double *out, lapack_int ldout )
 {
-    LAPACKE_dtr_trans( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
+    API_SUFFIX(LAPACKE_dtr_trans)( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
 }
diff --git a/LAPACKE/utils/lapacke_dtb_nancheck.c b/LAPACKE/utils/lapacke_dtb_nancheck.c
index 57912510cd..088b581ab4 100644
--- a/LAPACKE/utils/lapacke_dtb_nancheck.c
+++ b/LAPACKE/utils/lapacke_dtb_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_dtb_nancheck( int matrix_layout, char uplo, char diag,
+lapack_logical API_SUFFIX(LAPACKE_dtb_nancheck)( int matrix_layout, char uplo, char diag,
                                       lapack_int n, lapack_int kd,
                                       const double* ab,
                                       lapack_int ldab )
@@ -43,12 +43,12 @@ lapack_logical LAPACKE_dtb_nancheck( int matrix_layout, char uplo, char diag,
     if( ab == NULL ) return (lapack_logical) 0;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    upper  = LAPACKE_lsame( uplo, 'u' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    upper  = API_SUFFIX(LAPACKE_lsame)( uplo, 'u' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !upper  && !LAPACKE_lsame( uplo, 'l' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !upper  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return (lapack_logical) 0;
     }
@@ -57,27 +57,27 @@ lapack_logical LAPACKE_dtb_nancheck( int matrix_layout, char uplo, char diag,
         /* Unit case, diagonal should be excluded from the check for NaN. */
         if( colmaj ) {
             if( upper ) {
-                return LAPACKE_dgb_nancheck( matrix_layout, n-1, n-1, 0, kd-1,
+                return API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n-1, n-1, 0, kd-1,
                                              &ab[ldab], ldab );
             } else {
-                return LAPACKE_dgb_nancheck( matrix_layout, n-1, n-1, kd-1, 0,
+                return API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n-1, n-1, kd-1, 0,
                                              &ab[1], ldab );
             }
         } else {
             if( upper ) {
-                return LAPACKE_dgb_nancheck( matrix_layout, n-1, n-1, 0, kd-1,
+                return API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n-1, n-1, 0, kd-1,
                                              &ab[1], ldab );
             } else {
-                return LAPACKE_dgb_nancheck( matrix_layout, n-1, n-1, kd-1, 0,
+                return API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n-1, n-1, kd-1, 0,
                                              &ab[ldab], ldab );
             }
         }
     } else {
         /* Non-unit case */
         if( upper ) {
-            return LAPACKE_dgb_nancheck( matrix_layout, n, n, 0, kd, ab, ldab );
+            return API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, 0, kd, ab, ldab );
         } else {
-            return LAPACKE_dgb_nancheck( matrix_layout, n, n, kd, 0, ab, ldab );
+            return API_SUFFIX(LAPACKE_dgb_nancheck)( matrix_layout, n, n, kd, 0, ab, ldab );
         }
     }
 }
diff --git a/LAPACKE/utils/lapacke_dtb_trans.c b/LAPACKE/utils/lapacke_dtb_trans.c
index 54199debca..0071cc7f79 100644
--- a/LAPACKE/utils/lapacke_dtb_trans.c
+++ b/LAPACKE/utils/lapacke_dtb_trans.c
@@ -36,7 +36,7 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_dtb_trans( int matrix_layout, char uplo, char diag,
+void API_SUFFIX(LAPACKE_dtb_trans)( int matrix_layout, char uplo, char diag,
                         lapack_int n, lapack_int kd,
                         const double *in, lapack_int ldin,
                         double *out, lapack_int ldout )
@@ -46,12 +46,12 @@ void LAPACKE_dtb_trans( int matrix_layout, char uplo, char diag,
     if( in == NULL || out == NULL ) return;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    upper  = LAPACKE_lsame( uplo, 'u' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    upper  = API_SUFFIX(LAPACKE_lsame)( uplo, 'u' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !upper  && !LAPACKE_lsame( uplo, 'l' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !upper  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return;
     }
@@ -60,28 +60,28 @@ void LAPACKE_dtb_trans( int matrix_layout, char uplo, char diag,
         /* Unit case, diagonal excluded from transposition */
         if( colmaj ) {
             if( upper ) {
-                LAPACKE_dgb_trans( matrix_layout, n-1, n-1, 0, kd-1,
+                API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n-1, n-1, 0, kd-1,
                                    &in[ldin], ldin, &out[1], ldout );
             } else {
-                LAPACKE_dgb_trans( matrix_layout, n-1, n-1, kd-1, 0,
+                API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n-1, n-1, kd-1, 0,
                                    &in[1], ldin, &out[ldout], ldout );
             }
         } else {
             if( upper ) {
-                LAPACKE_dgb_trans( matrix_layout, n-1, n-1, 0, kd-1,
+                API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n-1, n-1, 0, kd-1,
                                    &in[1], ldin, &out[ldout], ldout );
             } else {
-                LAPACKE_dgb_trans( matrix_layout, n-1, n-1, kd-1, 0,
+                API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n-1, n-1, kd-1, 0,
                                    &in[ldin], ldin, &out[1], ldout );
             }
         }
     } else {
         /* Non-unit case */
         if( upper ) {
-            LAPACKE_dgb_trans( matrix_layout, n, n, 0, kd, in, ldin, out,
+            API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n, n, 0, kd, in, ldin, out,
                                ldout );
         } else {
-            LAPACKE_dgb_trans( matrix_layout, n, n, kd, 0, in, ldin, out,
+            API_SUFFIX(LAPACKE_dgb_trans)( matrix_layout, n, n, kd, 0, in, ldin, out,
                                ldout );
         }
     }
diff --git a/LAPACKE/utils/lapacke_dtf_nancheck.c b/LAPACKE/utils/lapacke_dtf_nancheck.c
index 0aae448374..23ebc7b357 100644
--- a/LAPACKE/utils/lapacke_dtf_nancheck.c
+++ b/LAPACKE/utils/lapacke_dtf_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_dtf_nancheck( int matrix_layout, char transr,
+lapack_logical API_SUFFIX(LAPACKE_dtf_nancheck)( int matrix_layout, char transr,
                                       char uplo, char diag,
                                       lapack_int n,
                                       const double *a )
@@ -45,15 +45,15 @@ lapack_logical LAPACKE_dtf_nancheck( int matrix_layout, char transr,
     if( a == NULL ) return (lapack_logical) 0;
 
     rowmaj = (matrix_layout == LAPACK_ROW_MAJOR);
-    ntr    = LAPACKE_lsame( transr, 'n' );
-    lower  = LAPACKE_lsame( uplo,   'l' );
-    unit   = LAPACKE_lsame( diag,   'u' );
+    ntr    = API_SUFFIX(LAPACKE_lsame)( transr, 'n' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo,   'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag,   'u' );
 
     if( ( !rowmaj && ( matrix_layout != LAPACK_COL_MAJOR ) ) ||
-        ( !ntr    && !LAPACKE_lsame( transr, 't' )
-                  && !LAPACKE_lsame( transr, 'c' ) ) ||
-        ( !lower  && !LAPACKE_lsame( uplo,   'u' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag,   'n' ) ) ) {
+        ( !ntr    && !API_SUFFIX(LAPACKE_lsame)( transr, 't' )
+                  && !API_SUFFIX(LAPACKE_lsame)( transr, 'c' ) ) ||
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo,   'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag,   'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return (lapack_logical) 0;
     }
@@ -75,36 +75,36 @@ lapack_logical LAPACKE_dtf_nancheck( int matrix_layout, char transr,
             if( ( rowmaj || ntr ) && !( rowmaj && ntr ) ) {
                 /* N is odd and ( TRANSR = 'N' .XOR. ROWMAJOR) */
                 if( lower ) {
-                    return LAPACKE_dtr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                    return API_SUFFIX(LAPACKE_dtr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  n1, &a[0], n )
-                        || LAPACKE_dge_nancheck( LAPACK_ROW_MAJOR, n2, n1,
+                        || API_SUFFIX(LAPACKE_dge_nancheck)( LAPACK_ROW_MAJOR, n2, n1,
                                                  &a[n1], n )
-                        || LAPACKE_dtr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                        || API_SUFFIX(LAPACKE_dtr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  n2, &a[n], n );
                 } else {
-                    return LAPACKE_dtr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                    return API_SUFFIX(LAPACKE_dtr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  n1, &a[n2], n )
-                        || LAPACKE_dge_nancheck( LAPACK_ROW_MAJOR, n1, n2,
+                        || API_SUFFIX(LAPACKE_dge_nancheck)( LAPACK_ROW_MAJOR, n1, n2,
                                                  &a[0], n )
-                        || LAPACKE_dtr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                        || API_SUFFIX(LAPACKE_dtr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  n2, &a[n1], n );
                 }
             } else {
                 /* N is odd and
                    ( ( TRANSR = 'C' || TRANSR = 'T' ) .XOR. COLMAJOR ) */
                 if( lower ) {
-                    return LAPACKE_dtr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                    return API_SUFFIX(LAPACKE_dtr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  n1, &a[0], n1 )
-                        || LAPACKE_dge_nancheck( LAPACK_ROW_MAJOR, n1, n2,
+                        || API_SUFFIX(LAPACKE_dge_nancheck)( LAPACK_ROW_MAJOR, n1, n2,
                                                  &a[1], n1 )
-                        || LAPACKE_dtr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                        || API_SUFFIX(LAPACKE_dtr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  n2, &a[1], n1 );
                 } else {
-                    return LAPACKE_dtr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                    return API_SUFFIX(LAPACKE_dtr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  n1, &a[(size_t)n2*n2], n2 )
-                        || LAPACKE_dge_nancheck( LAPACK_ROW_MAJOR, n2, n1,
+                        || API_SUFFIX(LAPACKE_dge_nancheck)( LAPACK_ROW_MAJOR, n2, n1,
                                                  &a[0], n2 )
-                        || LAPACKE_dtr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                        || API_SUFFIX(LAPACKE_dtr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  n2, &a[(size_t)n1*n2], n2 );
                 }
             }
@@ -114,36 +114,36 @@ lapack_logical LAPACKE_dtf_nancheck( int matrix_layout, char transr,
             if( ( rowmaj || ntr ) && !( rowmaj && ntr ) ) {
                 /* N is even and ( TRANSR = 'N' .XOR. ROWMAJOR) */
                 if( lower ) {
-                    return LAPACKE_dtr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                    return API_SUFFIX(LAPACKE_dtr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  k, &a[1], n+1 )
-                        || LAPACKE_dge_nancheck( LAPACK_ROW_MAJOR, k, k,
+                        || API_SUFFIX(LAPACKE_dge_nancheck)( LAPACK_ROW_MAJOR, k, k,
                                                  &a[k+1], n+1 )
-                        || LAPACKE_dtr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                        || API_SUFFIX(LAPACKE_dtr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  k, &a[0], n+1 );
                 } else {
-                    return LAPACKE_dtr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                    return API_SUFFIX(LAPACKE_dtr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  k, &a[k+1], n+1 )
-                        || LAPACKE_dge_nancheck( LAPACK_ROW_MAJOR, k, k,
+                        || API_SUFFIX(LAPACKE_dge_nancheck)( LAPACK_ROW_MAJOR, k, k,
                                                  &a[0], n+1 )
-                        || LAPACKE_dtr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                        || API_SUFFIX(LAPACKE_dtr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  k, &a[k], n+1 );
                 }
             } else {
                 /* N is even and
                    ( ( TRANSR = 'C' || TRANSR = 'T' ) .XOR. COLMAJOR ) */
                 if( lower ) {
-                    return LAPACKE_dtr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                    return API_SUFFIX(LAPACKE_dtr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  k, &a[k], k )
-                        || LAPACKE_dge_nancheck( LAPACK_ROW_MAJOR, k, k,
+                        || API_SUFFIX(LAPACKE_dge_nancheck)( LAPACK_ROW_MAJOR, k, k,
                                                  &a[(size_t)k*(k+1)], k )
-                        || LAPACKE_dtr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                        || API_SUFFIX(LAPACKE_dtr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  k, &a[0], k );
                 } else {
-                    return LAPACKE_dtr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                    return API_SUFFIX(LAPACKE_dtr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  k, &a[(size_t)k*(k+1)], k )
-                        || LAPACKE_dge_nancheck( LAPACK_ROW_MAJOR, k, k,
+                        || API_SUFFIX(LAPACKE_dge_nancheck)( LAPACK_ROW_MAJOR, k, k,
                                                  &a[0], k )
-                        || LAPACKE_dtr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                        || API_SUFFIX(LAPACKE_dtr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  k, &a[(size_t)k*k], k );
                 }
             }
@@ -151,6 +151,6 @@ lapack_logical LAPACKE_dtf_nancheck( int matrix_layout, char transr,
     } else {
         /* Non-unit case - just check whole array for NaNs. */
         len = n*(n+1)/2;
-        return LAPACKE_dge_nancheck( LAPACK_COL_MAJOR, len, 1, a, len );
+        return API_SUFFIX(LAPACKE_dge_nancheck)( LAPACK_COL_MAJOR, len, 1, a, len );
     }
 }
diff --git a/LAPACKE/utils/lapacke_dtf_trans.c b/LAPACKE/utils/lapacke_dtf_trans.c
index 24ef7f5ab8..7a183cdd21 100644
--- a/LAPACKE/utils/lapacke_dtf_trans.c
+++ b/LAPACKE/utils/lapacke_dtf_trans.c
@@ -37,7 +37,7 @@
  * This functions does copy diagonal for both unit and non-unit cases.
  */
 
-void LAPACKE_dtf_trans( int matrix_layout, char transr, char uplo, char diag,
+void API_SUFFIX(LAPACKE_dtf_trans)( int matrix_layout, char transr, char uplo, char diag,
                         lapack_int n, const double *in,
                         double *out )
 {
@@ -47,15 +47,15 @@ void LAPACKE_dtf_trans( int matrix_layout, char transr, char uplo, char diag,
     if( in == NULL || out == NULL ) return ;
 
     rowmaj = (matrix_layout == LAPACK_ROW_MAJOR);
-    ntr    = LAPACKE_lsame( transr, 'n' );
-    lower  = LAPACKE_lsame( uplo,   'l' );
-    unit   = LAPACKE_lsame( diag,   'u' );
+    ntr    = API_SUFFIX(LAPACKE_lsame)( transr, 'n' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo,   'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag,   'u' );
 
     if( ( !rowmaj && ( matrix_layout != LAPACK_COL_MAJOR ) ) ||
-        ( !ntr    && !LAPACKE_lsame( transr, 't' ) &&
-                     !LAPACKE_lsame( transr, 'c' ) ) ||
-        ( !lower  && !LAPACKE_lsame( uplo,   'u' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag,   'n' ) ) ) {
+        ( !ntr    && !API_SUFFIX(LAPACKE_lsame)( transr, 't' ) &&
+                     !API_SUFFIX(LAPACKE_lsame)( transr, 'c' ) ) ||
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo,   'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag,   'n' ) ) ) {
         /* Just exit if input parameters are wrong */
         return;
     }
@@ -81,8 +81,8 @@ void LAPACKE_dtf_trans( int matrix_layout, char transr, char uplo, char diag,
 
     /* Perform conversion: */
     if( rowmaj ) {
-        LAPACKE_dge_trans( LAPACK_ROW_MAJOR, row, col, in, col, out, row );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_ROW_MAJOR, row, col, in, col, out, row );
     } else {
-        LAPACKE_dge_trans( LAPACK_COL_MAJOR, row, col, in, row, out, col );
+        API_SUFFIX(LAPACKE_dge_trans)( LAPACK_COL_MAJOR, row, col, in, row, out, col );
     }
 }
diff --git a/LAPACKE/utils/lapacke_dtp_nancheck.c b/LAPACKE/utils/lapacke_dtp_nancheck.c
index d8b5eabbba..804e6057fc 100644
--- a/LAPACKE/utils/lapacke_dtp_nancheck.c
+++ b/LAPACKE/utils/lapacke_dtp_nancheck.c
@@ -36,7 +36,7 @@
  * check 1d array for NaNs. It doesn't depend upon uplo or matrix_layout.
  */
 
-lapack_logical LAPACKE_dtp_nancheck( int matrix_layout, char uplo, char diag,
+lapack_logical API_SUFFIX(LAPACKE_dtp_nancheck)( int matrix_layout, char uplo, char diag,
                                       lapack_int n,
                                       const double *ap )
 {
@@ -46,12 +46,12 @@ lapack_logical LAPACKE_dtp_nancheck( int matrix_layout, char uplo, char diag,
     if( ap == NULL ) return (lapack_logical) 0;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    upper  = LAPACKE_lsame( uplo, 'u' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    upper  = API_SUFFIX(LAPACKE_lsame)( uplo, 'u' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !upper  && !LAPACKE_lsame( uplo, 'l' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !upper  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return (lapack_logical) 0;
     }
@@ -65,11 +65,11 @@ lapack_logical LAPACKE_dtp_nancheck( int matrix_layout, char uplo, char diag,
          */
         if( ( colmaj || upper ) && !( colmaj && upper ) ) {
             for( i = 1; i < n; i++ )
-                if( LAPACKE_d_nancheck( i, &ap[ ((size_t)i+1)*i/2 ], 1 ) )
+                if( API_SUFFIX(LAPACKE_d_nancheck)( i, &ap[ ((size_t)i+1)*i/2 ], 1 ) )
                     return (lapack_logical) 1;
         } else {
             for( i = 0; i < n-1; i++ )
-                if( LAPACKE_d_nancheck( n-i-1,
+                if( API_SUFFIX(LAPACKE_d_nancheck)( n-i-1,
                     &ap[ (size_t)i+1 + i*((size_t)2*n-i+1)/2 ], 1 ) )
                     return (lapack_logical) 1;
         }
@@ -77,6 +77,6 @@ lapack_logical LAPACKE_dtp_nancheck( int matrix_layout, char uplo, char diag,
     } else {
         /* Non-unit case - just check whole array for NaNs. */
         len = n*(n+1)/2;
-        return LAPACKE_d_nancheck( len, ap, 1 );
+        return API_SUFFIX(LAPACKE_d_nancheck)( len, ap, 1 );
     }
 }
diff --git a/LAPACKE/utils/lapacke_dtp_trans.c b/LAPACKE/utils/lapacke_dtp_trans.c
index dc8e03242e..c0d3102286 100644
--- a/LAPACKE/utils/lapacke_dtp_trans.c
+++ b/LAPACKE/utils/lapacke_dtp_trans.c
@@ -36,7 +36,7 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_dtp_trans( int matrix_layout, char uplo, char diag,
+void API_SUFFIX(LAPACKE_dtp_trans)( int matrix_layout, char uplo, char diag,
                         lapack_int n, const double *in,
                         double *out )
 {
@@ -46,12 +46,12 @@ void LAPACKE_dtp_trans( int matrix_layout, char uplo, char diag,
     if( in == NULL || out == NULL ) return ;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    upper  = LAPACKE_lsame( uplo, 'u' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    upper  = API_SUFFIX(LAPACKE_lsame)( uplo, 'u' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !upper  && !LAPACKE_lsame( uplo, 'l' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !upper  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return;
     }
diff --git a/LAPACKE/utils/lapacke_dtr_nancheck.c b/LAPACKE/utils/lapacke_dtr_nancheck.c
index 93fe775d38..8696804bfe 100644
--- a/LAPACKE/utils/lapacke_dtr_nancheck.c
+++ b/LAPACKE/utils/lapacke_dtr_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_dtr_nancheck( int matrix_layout, char uplo, char diag,
+lapack_logical API_SUFFIX(LAPACKE_dtr_nancheck)( int matrix_layout, char uplo, char diag,
                                       lapack_int n,
                                       const double *a,
                                       lapack_int lda )
@@ -44,12 +44,12 @@ lapack_logical LAPACKE_dtr_nancheck( int matrix_layout, char uplo, char diag,
     if( a == NULL ) return (lapack_logical) 0;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    lower  = LAPACKE_lsame( uplo, 'l' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo, 'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !lower  && !LAPACKE_lsame( uplo, 'u' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return (lapack_logical) 0;
     }
diff --git a/LAPACKE/utils/lapacke_dtr_trans.c b/LAPACKE/utils/lapacke_dtr_trans.c
index f378b8503d..bef80ba556 100644
--- a/LAPACKE/utils/lapacke_dtr_trans.c
+++ b/LAPACKE/utils/lapacke_dtr_trans.c
@@ -36,7 +36,7 @@
  * layout or vice versa.
  */
 
-void LAPACKE_dtr_trans( int matrix_layout, char uplo, char diag, lapack_int n,
+void API_SUFFIX(LAPACKE_dtr_trans)( int matrix_layout, char uplo, char diag, lapack_int n,
                         const double *in, lapack_int ldin,
                         double *out, lapack_int ldout )
 {
@@ -46,12 +46,12 @@ void LAPACKE_dtr_trans( int matrix_layout, char uplo, char diag, lapack_int n,
     if( in == NULL || out == NULL ) return ;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    lower  = LAPACKE_lsame( uplo, 'l' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo, 'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !lower  && !LAPACKE_lsame( uplo, 'u' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return;
     }
diff --git a/LAPACKE/utils/lapacke_dtz_nancheck.c b/LAPACKE/utils/lapacke_dtz_nancheck.c
new file mode 100644
index 0000000000..b3e6c0f646
--- /dev/null
+++ b/LAPACKE/utils/lapacke_dtz_nancheck.c
@@ -0,0 +1,143 @@
+/*****************************************************************************
+  Copyright (c) 2022, 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 C interface to LAPACK utility function
+* Author: Simon Märtens
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+/*****************************************************************************
+  Check a trapezoidal matrix for NaN entries. The shape of the trapezoidal
+  matrix is determined by the arguments `direct` and `uplo`. `Direct` chooses
+  the diagonal which shall be considered and `uplo` tells us whether we use the
+  upper or lower part of the matrix with respect to the chosen diagonal.
+
+      Diagonals 'F' (front / forward) and 'B' (back / backward):
+
+        A = ( F       )           A = ( F     B       )
+            (    F    )               (    F     B    )
+            ( B     F )               (       F     B )
+            (    B    )
+            (       B )
+
+      direct = 'F', uplo = 'L':
+
+        A = ( *       )           A = ( *             )
+            ( *  *    )               ( *  *          )
+            ( *  *  * )               ( *  *  *       )
+            ( *  *  * )
+            ( *  *  * )
+
+      direct = 'F', uplo = 'U':
+
+        A = ( *  *  * )           A = ( *  *  *  *  * )
+            (    *  * )               (    *  *  *  * )
+            (       * )               (       *  *  * )
+            (         )
+            (         )
+
+      direct = 'B', uplo = 'L':
+
+        A = (         )           A = ( *  *  *       )
+            (         )               ( *  *  *  *    )
+            ( *       )               ( *  *  *  *  * )
+            ( *  *    )
+            ( *  *  * )
+
+      direct = 'B', uplo = 'U':
+
+        A = ( *  *  * )           A = (       *  *  * )
+            ( *  *  * )               (          *  * )
+            ( *  *  * )               (             * )
+            (    *  * )
+            (       * )
+
+*****************************************************************************/
+
+lapack_logical API_SUFFIX(LAPACKE_dtz_nancheck)( int matrix_layout, char direct, char uplo,
+                                     char diag, lapack_int m, lapack_int n,
+                                     const double *a, lapack_int lda )
+{
+    lapack_logical colmaj, front, lower, unit;
+
+    if( a == NULL ) return (lapack_logical) 0;
+
+    colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
+    front  = API_SUFFIX(LAPACKE_lsame)( direct, 'f' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo, 'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
+
+    if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
+        ( !front  && !API_SUFFIX(LAPACKE_lsame)( direct, 'b' ) ) ||
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
+        /* Just exit if any of input parameters are wrong */
+        return (lapack_logical) 0;
+    }
+
+    /* Initial offsets and sizes of triangular and rectangular parts */
+    lapack_int tri_offset = 0;
+    lapack_int tri_n = MIN(m,n);
+    lapack_int rect_offset = -1;
+    lapack_int rect_m = ( m > n ) ? m - n : m;
+    lapack_int rect_n = ( n > m ) ? n - m : n;
+
+    /* Fix offsets depending on the shape of the matrix */
+    if( front ) {
+        if( lower && m > n ) {
+            rect_offset = tri_n * ( !colmaj ? lda : 1 );
+        } else if( !lower && n > m ) {
+            rect_offset = tri_n * ( colmaj ? lda : 1 );
+        }
+    } else {
+        if( m > n ) {
+            tri_offset = rect_m * ( !colmaj ? lda : 1 );
+            if( !lower ) {
+                rect_offset = 0;
+            }
+        } else if( n > m ) {
+            tri_offset = rect_n * ( colmaj ? lda : 1 );
+            if( lower ) {
+                rect_offset = 0;
+            }
+        }
+    }
+
+    /* Check rectangular part */
+    if( rect_offset >= 0 ) {
+        if( API_SUFFIX(LAPACKE_dge_nancheck)( matrix_layout, rect_m, rect_n,
+                                  &a[rect_offset], lda ) ) {
+            return (lapack_logical) 1;
+        }
+    }
+
+    /* Check triangular part */
+    return API_SUFFIX(LAPACKE_dtr_nancheck)( matrix_layout, uplo, diag, tri_n,
+                                 &a[tri_offset], lda );
+}
diff --git a/LAPACKE/utils/lapacke_dtz_trans.c b/LAPACKE/utils/lapacke_dtz_trans.c
new file mode 100644
index 0000000000..d0f583fc8c
--- /dev/null
+++ b/LAPACKE/utils/lapacke_dtz_trans.c
@@ -0,0 +1,153 @@
+/*****************************************************************************
+  Copyright (c) 2022, 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 C interface to LAPACK utility function
+* Author: Simon Märtens
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+/*****************************************************************************
+  Converts input triangular matrix from row-major(C) to column-major(Fortran)
+  layout or vice versa. The shape of the trapezoidal matrix is determined by
+  the arguments `direct` and `uplo`. `Direct` chooses the diagonal which shall
+  be considered and `uplo` tells us whether we use the upper or lower part of
+  the matrix with respect to the chosen diagonal.
+
+      Diagonals 'F' (front / forward) and 'B' (back / backward):
+
+        A = ( F       )           A = ( F     B       )
+            (    F    )               (    F     B    )
+            ( B     F )               (       F     B )
+            (    B    )
+            (       B )
+
+      direct = 'F', uplo = 'L':
+
+        A = ( *       )           A = ( *             )
+            ( *  *    )               ( *  *          )
+            ( *  *  * )               ( *  *  *       )
+            ( *  *  * )
+            ( *  *  * )
+
+      direct = 'F', uplo = 'U':
+
+        A = ( *  *  * )           A = ( *  *  *  *  * )
+            (    *  * )               (    *  *  *  * )
+            (       * )               (       *  *  * )
+            (         )
+            (         )
+
+      direct = 'B', uplo = 'L':
+
+        A = (         )           A = ( *  *  *       )
+            (         )               ( *  *  *  *    )
+            ( *       )               ( *  *  *  *  * )
+            ( *  *    )
+            ( *  *  * )
+
+      direct = 'B', uplo = 'U':
+
+        A = ( *  *  * )           A = (       *  *  * )
+            ( *  *  * )               (          *  * )
+            ( *  *  * )               (             * )
+            (    *  * )
+            (       * )
+
+*****************************************************************************/
+
+void API_SUFFIX(LAPACKE_dtz_trans)( int matrix_layout, char direct, char uplo,
+                        char diag, lapack_int m, lapack_int n,
+                        const double *in, lapack_int ldin,
+                        double *out, lapack_int ldout )
+{
+    lapack_logical colmaj, front, lower, unit;
+
+    if( in == NULL || out == NULL ) return ;
+
+    colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
+    front  = API_SUFFIX(LAPACKE_lsame)( direct, 'f' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo, 'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
+
+    if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
+        ( !front  && !API_SUFFIX(LAPACKE_lsame)( direct, 'b' ) ) ||
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
+        /* Just exit if any of input parameters are wrong */
+        return;
+    }
+
+    /* Initial offsets and sizes of triangular and rectangular parts */
+    lapack_int tri_in_offset = 0;
+    lapack_int tri_out_offset = 0;
+    lapack_int tri_n = MIN(m,n);
+    lapack_int rect_in_offset = -1;
+    lapack_int rect_out_offset = -1;
+    lapack_int rect_m = ( m > n ) ? m - n : m;
+    lapack_int rect_n = ( n > m ) ? n - m : n;
+
+    /* Fix offsets depending on the shape of the matrix */
+    if( front ) {
+        if( lower && m > n ) {
+            rect_in_offset = tri_n * ( !colmaj ? ldin : 1 );
+            rect_out_offset = tri_n * ( colmaj ? ldout : 1 );
+        } else if( !lower && n > m ) {
+            rect_in_offset = tri_n * ( colmaj ? ldin : 1 );
+            rect_out_offset = tri_n * ( !colmaj ? ldout : 1 );
+        }
+    } else {
+        if( m > n ) {
+            tri_in_offset = rect_m * ( !colmaj ? ldin : 1 );
+            tri_out_offset = rect_m * ( colmaj ? ldout : 1 );
+            if( !lower ) {
+                rect_in_offset = 0;
+                rect_out_offset = 0;
+            }
+        } else if( n > m ) {
+            tri_in_offset = rect_n * ( colmaj ? ldin : 1 );
+            tri_out_offset = rect_n * ( !colmaj ? ldout : 1 );
+            if( lower ) {
+                rect_in_offset = 0;
+                rect_out_offset = 0;
+            }
+        }
+    }
+
+    /* Copy & transpose rectangular part */
+    if( rect_in_offset >= 0 && rect_out_offset >= 0 ) {
+        API_SUFFIX(LAPACKE_dge_trans)( matrix_layout, rect_m, rect_n,
+                           &in[rect_in_offset], ldin,
+                           &out[rect_out_offset], ldout );
+    }
+
+    /* Copy & transpose triangular part */
+    API_SUFFIX(LAPACKE_dtr_trans)( matrix_layout, uplo, diag, tri_n,
+                       &in[tri_in_offset], ldin,
+                       &out[tri_out_offset], ldout );
+}
diff --git a/LAPACKE/utils/lapacke_lsame.c b/LAPACKE/utils/lapacke_lsame.c
index e4592ce114..f86845e2a0 100644
--- a/LAPACKE/utils/lapacke_lsame.c
+++ b/LAPACKE/utils/lapacke_lsame.c
@@ -32,9 +32,9 @@
 
 #include "lapacke_utils.h"
 
-lapack_logical LAPACKE_lsame( char ca,  char cb )
+lapack_logical API_SUFFIX(LAPACKE_lsame)( char ca,  char cb )
 {
-    return (lapack_logical) LAPACK_lsame( &ca, &cb, 1, 1 );
+    return (lapack_logical) LAPACK_lsame( &ca, &cb );
 }
 
 
diff --git a/LAPACKE/utils/lapacke_make_complex_double.c b/LAPACKE/utils/lapacke_make_complex_double.c
index f6fb74b18f..da59ce5d12 100644
--- a/LAPACKE/utils/lapacke_make_complex_double.c
+++ b/LAPACKE/utils/lapacke_make_complex_double.c
@@ -43,6 +43,8 @@ lapack_complex_double lapack_make_complex_double( double re, double im ) {
     z = re + im * I;
 #elif defined(LAPACK_COMPLEX_CPP)
     z = std::complex<double>(re,im);
+#elif _MSC_VER
+    z = _Cbuild(re, im);
 #else /* C99 is default */
     z = re + im*I;
 #endif
diff --git a/LAPACKE/utils/lapacke_make_complex_float.c b/LAPACKE/utils/lapacke_make_complex_float.c
index c04eb084cd..580b068376 100644
--- a/LAPACKE/utils/lapacke_make_complex_float.c
+++ b/LAPACKE/utils/lapacke_make_complex_float.c
@@ -43,6 +43,8 @@ lapack_complex_float lapack_make_complex_float( float re, float im ) {
     z = re + im * I;
 #elif defined(LAPACK_COMPLEX_CPP)
     z = std::complex<float>(re,im);
+#elif _MSC_VER
+    z = _FCbuild(re, im);
 #else /* C99 is default */
     z = re + im*I;
 #endif
diff --git a/LAPACKE/utils/lapacke_s_nancheck.c b/LAPACKE/utils/lapacke_s_nancheck.c
index 6abc907e2e..8913630049 100644
--- a/LAPACKE/utils/lapacke_s_nancheck.c
+++ b/LAPACKE/utils/lapacke_s_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a vector for NaN entries. */
 
-lapack_logical LAPACKE_s_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_s_nancheck)( lapack_int n,
                                     const float *x,
                                     lapack_int incx )
 {
diff --git a/LAPACKE/utils/lapacke_sgb_nancheck.c b/LAPACKE/utils/lapacke_sgb_nancheck.c
index a1f3aa97b9..e6839a98c5 100644
--- a/LAPACKE/utils/lapacke_sgb_nancheck.c
+++ b/LAPACKE/utils/lapacke_sgb_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_sgb_nancheck( int matrix_layout, lapack_int m,
+lapack_logical API_SUFFIX(LAPACKE_sgb_nancheck)( int matrix_layout, lapack_int m,
                                       lapack_int n, lapack_int kl,
                                       lapack_int ku,
                                       const float *ab,
diff --git a/LAPACKE/utils/lapacke_sgb_trans.c b/LAPACKE/utils/lapacke_sgb_trans.c
index 046fdb9ca9..7c8e006a68 100644
--- a/LAPACKE/utils/lapacke_sgb_trans.c
+++ b/LAPACKE/utils/lapacke_sgb_trans.c
@@ -36,7 +36,7 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_sgb_trans( int matrix_layout, lapack_int m, lapack_int n,
+void API_SUFFIX(LAPACKE_sgb_trans)( int matrix_layout, lapack_int m, lapack_int n,
                         lapack_int kl, lapack_int ku,
                         const float *in, lapack_int ldin,
                         float *out, lapack_int ldout )
@@ -54,7 +54,7 @@ void LAPACKE_sgb_trans( int matrix_layout, lapack_int m, lapack_int n,
         }
     } else if ( matrix_layout == LAPACK_ROW_MAJOR ) {
         /* TODO: interchange loops for performance.
-         * This is just reference impemeltation.
+         * This is just reference implementation.
          */
         for( j = 0; j < MIN( n, ldin ); j++ ) {
             for( i = MAX( ku-j, 0 ); i < MIN3( ldout, m+ku-j, kl+ku+1 );
diff --git a/LAPACKE/utils/lapacke_sge_nancheck.c b/LAPACKE/utils/lapacke_sge_nancheck.c
index e15d087dba..184a608920 100644
--- a/LAPACKE/utils/lapacke_sge_nancheck.c
+++ b/LAPACKE/utils/lapacke_sge_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_sge_nancheck( int matrix_layout, lapack_int m,
+lapack_logical API_SUFFIX(LAPACKE_sge_nancheck)( int matrix_layout, lapack_int m,
                                       lapack_int n,
                                       const float *a,
                                       lapack_int lda )
diff --git a/LAPACKE/utils/lapacke_sge_trans.c b/LAPACKE/utils/lapacke_sge_trans.c
index 21199e4d50..68f03cd9b4 100644
--- a/LAPACKE/utils/lapacke_sge_trans.c
+++ b/LAPACKE/utils/lapacke_sge_trans.c
@@ -36,7 +36,7 @@
  * layout or vice versa.
  */
 
-void LAPACKE_sge_trans( int matrix_layout, lapack_int m, lapack_int n,
+void API_SUFFIX(LAPACKE_sge_trans)( int matrix_layout, lapack_int m, lapack_int n,
                         const float* in, lapack_int ldin,
                         float* out, lapack_int ldout )
 {
diff --git a/LAPACKE/utils/lapacke_sgg_nancheck.c b/LAPACKE/utils/lapacke_sgg_nancheck.c
index 382c448c96..ce0ce19100 100644
--- a/LAPACKE/utils/lapacke_sgg_nancheck.c
+++ b/LAPACKE/utils/lapacke_sgg_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_sgg_nancheck( int matrix_layout, lapack_int m,
+lapack_logical API_SUFFIX(LAPACKE_sgg_nancheck)( int matrix_layout, lapack_int m,
                                       lapack_int n,
                                       const float *a,
                                       lapack_int lda )
 {
-    return LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda );
+    return API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, m, n, a, lda );
 }
diff --git a/LAPACKE/utils/lapacke_sgg_trans.c b/LAPACKE/utils/lapacke_sgg_trans.c
index 3d9d0d22fc..f758d20047 100644
--- a/LAPACKE/utils/lapacke_sgg_trans.c
+++ b/LAPACKE/utils/lapacke_sgg_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_sgg_trans( int matrix_layout, lapack_int m, lapack_int n,
+void API_SUFFIX(LAPACKE_sgg_trans)( int matrix_layout, lapack_int m, lapack_int n,
                         const float* in, lapack_int ldin,
                         float* out, lapack_int ldout )
 {
-    LAPACKE_sge_trans( matrix_layout, m, n, in, ldin, out, ldout );
+    API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, m, n, in, ldin, out, ldout );
 }
diff --git a/LAPACKE/utils/lapacke_sgt_nancheck.c b/LAPACKE/utils/lapacke_sgt_nancheck.c
index 71ebfd7aa9..ce35eae207 100644
--- a/LAPACKE/utils/lapacke_sgt_nancheck.c
+++ b/LAPACKE/utils/lapacke_sgt_nancheck.c
@@ -33,12 +33,12 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_sgt_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_sgt_nancheck)( lapack_int n,
                                       const float *dl,
                                       const float *d,
                                       const float *du )
 {
-    return LAPACKE_s_nancheck( n-1, dl, 1 )
-        || LAPACKE_s_nancheck( n  , d,  1 )
-        || LAPACKE_s_nancheck( n-1, du, 1 );
+    return API_SUFFIX(LAPACKE_s_nancheck)( n-1, dl, 1 )
+        || API_SUFFIX(LAPACKE_s_nancheck)( n  , d,  1 )
+        || API_SUFFIX(LAPACKE_s_nancheck)( n-1, du, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_shs_nancheck.c b/LAPACKE/utils/lapacke_shs_nancheck.c
index 400c3f2ef0..af31f2093b 100644
--- a/LAPACKE/utils/lapacke_shs_nancheck.c
+++ b/LAPACKE/utils/lapacke_shs_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_shs_nancheck( int matrix_layout, lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_shs_nancheck)( int matrix_layout, lapack_int n,
                                       const float *a,
                                       lapack_int lda )
 {
@@ -43,14 +43,14 @@ lapack_logical LAPACKE_shs_nancheck( int matrix_layout, lapack_int n,
 
     /* Check subdiagonal first */
     if( matrix_layout == LAPACK_COL_MAJOR ) {
-        subdiag_nans = LAPACKE_s_nancheck( n-1, &a[1], lda+1 );
+        subdiag_nans = API_SUFFIX(LAPACKE_s_nancheck)( n-1, &a[1], lda+1 );
     } else if ( matrix_layout == LAPACK_ROW_MAJOR ) {
-        subdiag_nans = LAPACKE_s_nancheck( n-1, &a[lda], lda+1 );
+        subdiag_nans = API_SUFFIX(LAPACKE_s_nancheck)( n-1, &a[lda], lda+1 );
     } else {
         return (lapack_logical) 0;
     }
 
     /* Check upper triangular if subdiagonal has no NaNs. */
-    return subdiag_nans || LAPACKE_str_nancheck( matrix_layout, 'u', 'n',
+    return subdiag_nans || API_SUFFIX(LAPACKE_str_nancheck)( matrix_layout, 'u', 'n',
                                                  n, a, lda);
 }
diff --git a/LAPACKE/utils/lapacke_shs_trans.c b/LAPACKE/utils/lapacke_shs_trans.c
index 00e7fa80da..6c23733c39 100644
--- a/LAPACKE/utils/lapacke_shs_trans.c
+++ b/LAPACKE/utils/lapacke_shs_trans.c
@@ -36,7 +36,7 @@
  * layout or vice versa.
  */
 
-void LAPACKE_shs_trans( int matrix_layout, lapack_int n,
+void API_SUFFIX(LAPACKE_shs_trans)( int matrix_layout, lapack_int n,
                         const float *in, lapack_int ldin,
                         float *out, lapack_int ldout )
 {
@@ -44,15 +44,15 @@ void LAPACKE_shs_trans( int matrix_layout, lapack_int n,
 
     /* Convert subdiagonal first */
     if( matrix_layout == LAPACK_COL_MAJOR ) {
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, 1, n-1, &in[1], ldin+1,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, 1, n-1, &in[1], ldin+1,
                            &out[ldout], ldout+1 );
     } else if ( matrix_layout == LAPACK_ROW_MAJOR ) {
-        LAPACKE_sge_trans( LAPACK_ROW_MAJOR, n-1, 1, &in[ldin], ldin+1,
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_ROW_MAJOR, n-1, 1, &in[ldin], ldin+1,
                            &out[1], ldout+1 );
     } else {
         return;
     }
 
     /* Convert upper triangular. */
-    LAPACKE_str_trans( matrix_layout, 'u', 'n', n, in, ldin, out, ldout);
+    API_SUFFIX(LAPACKE_str_trans)( matrix_layout, 'u', 'n', n, in, ldin, out, ldout);
 }
diff --git a/LAPACKE/utils/lapacke_spb_nancheck.c b/LAPACKE/utils/lapacke_spb_nancheck.c
index 0ea931cf8b..896508a667 100644
--- a/LAPACKE/utils/lapacke_spb_nancheck.c
+++ b/LAPACKE/utils/lapacke_spb_nancheck.c
@@ -33,15 +33,15 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_spb_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_spb_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n, lapack_int kd,
                                       const float* ab,
                                       lapack_int ldab )
 {
-    if( LAPACKE_lsame( uplo, 'u' ) ) {
-        return LAPACKE_sgb_nancheck( matrix_layout, n, n, 0, kd, ab, ldab );
-    } else if( LAPACKE_lsame( uplo, 'l' ) ) {
-        return LAPACKE_sgb_nancheck( matrix_layout, n, n, kd, 0, ab, ldab );
+    if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
+        return API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, 0, kd, ab, ldab );
+    } else if( API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) {
+        return API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, kd, 0, ab, ldab );
     }
     return (lapack_logical) 0;
 }
diff --git a/LAPACKE/utils/lapacke_spb_trans.c b/LAPACKE/utils/lapacke_spb_trans.c
index 7b329cd0fd..91efdc9ed7 100644
--- a/LAPACKE/utils/lapacke_spb_trans.c
+++ b/LAPACKE/utils/lapacke_spb_trans.c
@@ -36,14 +36,14 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_spb_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_spb_trans)( int matrix_layout, char uplo, lapack_int n,
                         lapack_int kd,
                         const float *in, lapack_int ldin,
                         float *out, lapack_int ldout )
 {
-    if( LAPACKE_lsame( uplo, 'u' ) ) {
-        LAPACKE_sgb_trans( matrix_layout, n, n, 0, kd, in, ldin, out, ldout );
-    } else if( LAPACKE_lsame( uplo, 'l' ) ) {
-        LAPACKE_sgb_trans( matrix_layout, n, n, kd, 0, in, ldin, out, ldout );
+    if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
+        API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n, n, 0, kd, in, ldin, out, ldout );
+    } else if( API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) {
+        API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n, n, kd, 0, in, ldin, out, ldout );
     }
 }
diff --git a/LAPACKE/utils/lapacke_spf_nancheck.c b/LAPACKE/utils/lapacke_spf_nancheck.c
index 5499e150cc..2787aa7f33 100644
--- a/LAPACKE/utils/lapacke_spf_nancheck.c
+++ b/LAPACKE/utils/lapacke_spf_nancheck.c
@@ -37,9 +37,9 @@
  * matrix_layout.
  */
 
-lapack_logical LAPACKE_spf_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_spf_nancheck)( lapack_int n,
                                       const float *a )
 {
     lapack_int len = n*(n+1)/2;
-    return LAPACKE_s_nancheck( len, a, 1 );
+    return API_SUFFIX(LAPACKE_s_nancheck)( len, a, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_spf_trans.c b/LAPACKE/utils/lapacke_spf_trans.c
index 13458cb428..285d4360a3 100644
--- a/LAPACKE/utils/lapacke_spf_trans.c
+++ b/LAPACKE/utils/lapacke_spf_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_spf_trans( int matrix_layout, char transr, char uplo,
+void API_SUFFIX(LAPACKE_spf_trans)( int matrix_layout, char transr, char uplo,
                         lapack_int n, const float *in,
                         float *out )
 {
-    LAPACKE_stf_trans( matrix_layout, transr, uplo, 'n', n, in, out );
+    API_SUFFIX(LAPACKE_stf_trans)( matrix_layout, transr, uplo, 'n', n, in, out );
 }
diff --git a/LAPACKE/utils/lapacke_spo_nancheck.c b/LAPACKE/utils/lapacke_spo_nancheck.c
index 5b0734e730..e5c1d93ec0 100644
--- a/LAPACKE/utils/lapacke_spo_nancheck.c
+++ b/LAPACKE/utils/lapacke_spo_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_spo_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_spo_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n,
                                       const float *a,
                                       lapack_int lda )
 {
-    return LAPACKE_str_nancheck( matrix_layout, uplo, 'n', n, a, lda );
+    return API_SUFFIX(LAPACKE_str_nancheck)( matrix_layout, uplo, 'n', n, a, lda );
 }
diff --git a/LAPACKE/utils/lapacke_spo_trans.c b/LAPACKE/utils/lapacke_spo_trans.c
index f99e661afe..fe9ca777ef 100644
--- a/LAPACKE/utils/lapacke_spo_trans.c
+++ b/LAPACKE/utils/lapacke_spo_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_spo_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_spo_trans)( int matrix_layout, char uplo, lapack_int n,
                         const float *in, lapack_int ldin,
                         float *out, lapack_int ldout )
 {
-    LAPACKE_str_trans( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
+    API_SUFFIX(LAPACKE_str_trans)( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
 }
diff --git a/LAPACKE/utils/lapacke_spp_nancheck.c b/LAPACKE/utils/lapacke_spp_nancheck.c
index ff83c22755..f9fd816aed 100644
--- a/LAPACKE/utils/lapacke_spp_nancheck.c
+++ b/LAPACKE/utils/lapacke_spp_nancheck.c
@@ -36,9 +36,9 @@
  * check 1d array for NaNs. It doesn't depend upon uplo or matrix_layout.
  */
 
-lapack_logical LAPACKE_spp_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_spp_nancheck)( lapack_int n,
                                       const float *ap )
 {
     lapack_int len = n*(n+1)/2;
-    return LAPACKE_s_nancheck( len, ap, 1 );
+    return API_SUFFIX(LAPACKE_s_nancheck)( len, ap, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_spp_trans.c b/LAPACKE/utils/lapacke_spp_trans.c
index a382fe6e8a..d8c73608cb 100644
--- a/LAPACKE/utils/lapacke_spp_trans.c
+++ b/LAPACKE/utils/lapacke_spp_trans.c
@@ -36,9 +36,9 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_spp_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_spp_trans)( int matrix_layout, char uplo, lapack_int n,
                         const float *in,
                         float *out )
 {
-    LAPACKE_stp_trans( matrix_layout, uplo, 'n', n, in, out );
+    API_SUFFIX(LAPACKE_stp_trans)( matrix_layout, uplo, 'n', n, in, out );
 }
diff --git a/LAPACKE/utils/lapacke_spt_nancheck.c b/LAPACKE/utils/lapacke_spt_nancheck.c
index aa4d0b8c5e..54b627e2f4 100644
--- a/LAPACKE/utils/lapacke_spt_nancheck.c
+++ b/LAPACKE/utils/lapacke_spt_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_spt_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_spt_nancheck)( lapack_int n,
                                       const float *d,
                                       const float *e )
 {
-    return LAPACKE_s_nancheck( n,   d, 1 )
-        || LAPACKE_s_nancheck( n-1, e, 1 );
+    return API_SUFFIX(LAPACKE_s_nancheck)( n,   d, 1 )
+        || API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_ssb_nancheck.c b/LAPACKE/utils/lapacke_ssb_nancheck.c
index 4a8edf156c..f2f3da52cd 100644
--- a/LAPACKE/utils/lapacke_ssb_nancheck.c
+++ b/LAPACKE/utils/lapacke_ssb_nancheck.c
@@ -33,15 +33,15 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_ssb_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_ssb_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n, lapack_int kd,
                                       const float* ab,
                                       lapack_int ldab )
 {
-    if( LAPACKE_lsame( uplo, 'u' ) ) {
-        return LAPACKE_sgb_nancheck( matrix_layout, n, n, 0, kd, ab, ldab );
-    } else if( LAPACKE_lsame( uplo, 'l' ) ) {
-        return LAPACKE_sgb_nancheck( matrix_layout, n, n, kd, 0, ab, ldab );
+    if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
+        return API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, 0, kd, ab, ldab );
+    } else if( API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) {
+        return API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, kd, 0, ab, ldab );
     }
     return (lapack_logical) 0;
 }
diff --git a/LAPACKE/utils/lapacke_ssb_trans.c b/LAPACKE/utils/lapacke_ssb_trans.c
index b11b513ce8..b6565dc27b 100644
--- a/LAPACKE/utils/lapacke_ssb_trans.c
+++ b/LAPACKE/utils/lapacke_ssb_trans.c
@@ -36,14 +36,14 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_ssb_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_ssb_trans)( int matrix_layout, char uplo, lapack_int n,
                         lapack_int kd,
                         const float *in, lapack_int ldin,
                         float *out, lapack_int ldout )
 {
-    if( LAPACKE_lsame( uplo, 'u' ) ) {
-        LAPACKE_sgb_trans( matrix_layout, n, n, 0, kd, in, ldin, out, ldout );
-    } else if( LAPACKE_lsame( uplo, 'l' ) ) {
-        LAPACKE_sgb_trans( matrix_layout, n, n, kd, 0, in, ldin, out, ldout );
+    if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
+        API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n, n, 0, kd, in, ldin, out, ldout );
+    } else if( API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) {
+        API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n, n, kd, 0, in, ldin, out, ldout );
     }
 }
diff --git a/LAPACKE/utils/lapacke_ssp_nancheck.c b/LAPACKE/utils/lapacke_ssp_nancheck.c
index 94e5338771..37bbc475e1 100644
--- a/LAPACKE/utils/lapacke_ssp_nancheck.c
+++ b/LAPACKE/utils/lapacke_ssp_nancheck.c
@@ -36,9 +36,9 @@
  * check 1d array for NaNs. It doesn't depend upon uplo or matrix_layout.
  */
 
-lapack_logical LAPACKE_ssp_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_ssp_nancheck)( lapack_int n,
                                       const float *ap )
 {
     lapack_int len = n*(n+1)/2;
-    return LAPACKE_s_nancheck( len, ap, 1 );
+    return API_SUFFIX(LAPACKE_s_nancheck)( len, ap, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_ssp_trans.c b/LAPACKE/utils/lapacke_ssp_trans.c
index 1737f33381..f677ec214f 100644
--- a/LAPACKE/utils/lapacke_ssp_trans.c
+++ b/LAPACKE/utils/lapacke_ssp_trans.c
@@ -36,10 +36,10 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_ssp_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_ssp_trans)( int matrix_layout, char uplo, lapack_int n,
                         const float *in,
                         float *out )
 {
-    LAPACKE_stp_trans( matrix_layout, uplo, 'n', n, in, out );
+    API_SUFFIX(LAPACKE_stp_trans)( matrix_layout, uplo, 'n', n, in, out );
 }
 
diff --git a/LAPACKE/utils/lapacke_sst_nancheck.c b/LAPACKE/utils/lapacke_sst_nancheck.c
index 3372a36095..31c6079de3 100644
--- a/LAPACKE/utils/lapacke_sst_nancheck.c
+++ b/LAPACKE/utils/lapacke_sst_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_sst_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_sst_nancheck)( lapack_int n,
                                       const float *d,
                                       const float *e )
 {
-    return LAPACKE_s_nancheck( n,   d, 1 )
-        || LAPACKE_s_nancheck( n-1, e, 1 );
+    return API_SUFFIX(LAPACKE_s_nancheck)( n,   d, 1 )
+        || API_SUFFIX(LAPACKE_s_nancheck)( n-1, e, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_ssy_nancheck.c b/LAPACKE/utils/lapacke_ssy_nancheck.c
index ed6ac60ea5..ab0426b0e7 100644
--- a/LAPACKE/utils/lapacke_ssy_nancheck.c
+++ b/LAPACKE/utils/lapacke_ssy_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_ssy_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_ssy_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n,
                                       const float *a,
                                       lapack_int lda )
 {
-    return LAPACKE_str_nancheck( matrix_layout, uplo, 'n', n, a, lda );
+    return API_SUFFIX(LAPACKE_str_nancheck)( matrix_layout, uplo, 'n', n, a, lda );
 }
diff --git a/LAPACKE/utils/lapacke_ssy_trans.c b/LAPACKE/utils/lapacke_ssy_trans.c
index a9122b685d..59e3847170 100644
--- a/LAPACKE/utils/lapacke_ssy_trans.c
+++ b/LAPACKE/utils/lapacke_ssy_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_ssy_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_ssy_trans)( int matrix_layout, char uplo, lapack_int n,
                         const float *in, lapack_int ldin,
                         float *out, lapack_int ldout )
 {
-    LAPACKE_str_trans( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
+    API_SUFFIX(LAPACKE_str_trans)( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
 }
diff --git a/LAPACKE/utils/lapacke_stb_nancheck.c b/LAPACKE/utils/lapacke_stb_nancheck.c
index e1910162a5..cd7925eb7e 100644
--- a/LAPACKE/utils/lapacke_stb_nancheck.c
+++ b/LAPACKE/utils/lapacke_stb_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_stb_nancheck( int matrix_layout, char uplo, char diag,
+lapack_logical API_SUFFIX(LAPACKE_stb_nancheck)( int matrix_layout, char uplo, char diag,
                                       lapack_int n, lapack_int kd,
                                       const float* ab,
                                       lapack_int ldab )
@@ -43,12 +43,12 @@ lapack_logical LAPACKE_stb_nancheck( int matrix_layout, char uplo, char diag,
     if( ab == NULL ) return (lapack_logical) 0;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    upper  = LAPACKE_lsame( uplo, 'u' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    upper  = API_SUFFIX(LAPACKE_lsame)( uplo, 'u' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !upper  && !LAPACKE_lsame( uplo, 'l' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !upper  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return (lapack_logical) 0;
     }
@@ -57,27 +57,27 @@ lapack_logical LAPACKE_stb_nancheck( int matrix_layout, char uplo, char diag,
         /* Unit case, diagonal should be excluded from the check for NaN. */
         if( colmaj ) {
             if( upper ) {
-                return LAPACKE_sgb_nancheck( matrix_layout, n-1, n-1, 0, kd-1,
+                return API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n-1, n-1, 0, kd-1,
                                              &ab[ldab], ldab );
             } else {
-                return LAPACKE_sgb_nancheck( matrix_layout, n-1, n-1, kd-1, 0,
+                return API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n-1, n-1, kd-1, 0,
                                              &ab[1], ldab );
             }
         } else {
             if( upper ) {
-                return LAPACKE_sgb_nancheck( matrix_layout, n-1, n-1, 0, kd-1,
+                return API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n-1, n-1, 0, kd-1,
                                              &ab[1], ldab );
             } else {
-                return LAPACKE_sgb_nancheck( matrix_layout, n-1, n-1, kd-1, 0,
+                return API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n-1, n-1, kd-1, 0,
                                              &ab[ldab], ldab );
             }
         }
     } else {
         /* Non-unit case */
         if( upper ) {
-            return LAPACKE_sgb_nancheck( matrix_layout, n, n, 0, kd, ab, ldab );
+            return API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, 0, kd, ab, ldab );
         } else {
-            return LAPACKE_sgb_nancheck( matrix_layout, n, n, kd, 0, ab, ldab );
+            return API_SUFFIX(LAPACKE_sgb_nancheck)( matrix_layout, n, n, kd, 0, ab, ldab );
         }
     }
 }
diff --git a/LAPACKE/utils/lapacke_stb_trans.c b/LAPACKE/utils/lapacke_stb_trans.c
index f915cc752f..fa8d2cf73b 100644
--- a/LAPACKE/utils/lapacke_stb_trans.c
+++ b/LAPACKE/utils/lapacke_stb_trans.c
@@ -36,7 +36,7 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_stb_trans( int matrix_layout, char uplo, char diag,
+void API_SUFFIX(LAPACKE_stb_trans)( int matrix_layout, char uplo, char diag,
                         lapack_int n, lapack_int kd,
                         const float *in, lapack_int ldin,
                         float *out, lapack_int ldout )
@@ -46,12 +46,12 @@ void LAPACKE_stb_trans( int matrix_layout, char uplo, char diag,
     if( in == NULL || out == NULL ) return;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    upper  = LAPACKE_lsame( uplo, 'u' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    upper  = API_SUFFIX(LAPACKE_lsame)( uplo, 'u' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !upper  && !LAPACKE_lsame( uplo, 'l' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !upper  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return;
     }
@@ -60,28 +60,28 @@ void LAPACKE_stb_trans( int matrix_layout, char uplo, char diag,
         /* Unit case, diagonal excluded from transposition */
         if( colmaj ) {
             if( upper ) {
-                LAPACKE_sgb_trans( matrix_layout, n-1, n-1, 0, kd-1,
+                API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n-1, n-1, 0, kd-1,
                                    &in[ldin], ldin, &out[1], ldout );
             } else {
-                LAPACKE_sgb_trans( matrix_layout, n-1, n-1, kd-1, 0,
+                API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n-1, n-1, kd-1, 0,
                                    &in[1], ldin, &out[ldout], ldout );
             }
         } else {
             if( upper ) {
-                LAPACKE_sgb_trans( matrix_layout, n-1, n-1, 0, kd-1,
+                API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n-1, n-1, 0, kd-1,
                                    &in[1], ldin, &out[ldout], ldout );
             } else {
-                LAPACKE_sgb_trans( matrix_layout, n-1, n-1, kd-1, 0,
+                API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n-1, n-1, kd-1, 0,
                                    &in[ldin], ldin, &out[1], ldout );
             }
         }
     } else {
         /* Non-unit case */
         if( upper ) {
-            LAPACKE_sgb_trans( matrix_layout, n, n, 0, kd, in, ldin, out,
+            API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n, n, 0, kd, in, ldin, out,
                                ldout );
         } else {
-            LAPACKE_sgb_trans( matrix_layout, n, n, kd, 0, in, ldin, out,
+            API_SUFFIX(LAPACKE_sgb_trans)( matrix_layout, n, n, kd, 0, in, ldin, out,
                                ldout );
         }
     }
diff --git a/LAPACKE/utils/lapacke_stf_nancheck.c b/LAPACKE/utils/lapacke_stf_nancheck.c
index 95128c0e7a..a9d4d7e4d1 100644
--- a/LAPACKE/utils/lapacke_stf_nancheck.c
+++ b/LAPACKE/utils/lapacke_stf_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_stf_nancheck( int matrix_layout, char transr,
+lapack_logical API_SUFFIX(LAPACKE_stf_nancheck)( int matrix_layout, char transr,
                                       char uplo, char diag,
                                       lapack_int n,
                                       const float *a )
@@ -45,15 +45,15 @@ lapack_logical LAPACKE_stf_nancheck( int matrix_layout, char transr,
     if( a == NULL ) return (lapack_logical) 0;
 
     rowmaj = (matrix_layout == LAPACK_ROW_MAJOR);
-    ntr    = LAPACKE_lsame( transr, 'n' );
-    lower  = LAPACKE_lsame( uplo,   'l' );
-    unit   = LAPACKE_lsame( diag,   'u' );
+    ntr    = API_SUFFIX(LAPACKE_lsame)( transr, 'n' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo,   'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag,   'u' );
 
     if( ( !rowmaj && ( matrix_layout != LAPACK_COL_MAJOR ) ) ||
-        ( !ntr    && !LAPACKE_lsame( transr, 't' )
-                  && !LAPACKE_lsame( transr, 'c' ) ) ||
-        ( !lower  && !LAPACKE_lsame( uplo,   'u' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag,   'n' ) ) ) {
+        ( !ntr    && !API_SUFFIX(LAPACKE_lsame)( transr, 't' )
+                  && !API_SUFFIX(LAPACKE_lsame)( transr, 'c' ) ) ||
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo,   'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag,   'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return (lapack_logical) 0;
     }
@@ -75,36 +75,36 @@ lapack_logical LAPACKE_stf_nancheck( int matrix_layout, char transr,
             if( ( rowmaj || ntr ) && !( rowmaj && ntr ) ) {
                 /* N is odd and ( TRANSR = 'N' .XOR. ROWMAJOR) */
                 if( lower ) {
-                    return LAPACKE_str_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                    return API_SUFFIX(LAPACKE_str_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  n1, &a[0], n )
-                        || LAPACKE_sge_nancheck( LAPACK_ROW_MAJOR, n2, n1,
+                        || API_SUFFIX(LAPACKE_sge_nancheck)( LAPACK_ROW_MAJOR, n2, n1,
                                                  &a[n1], n )
-                        || LAPACKE_str_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                        || API_SUFFIX(LAPACKE_str_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  n2, &a[n], n );
                 } else {
-                    return LAPACKE_str_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                    return API_SUFFIX(LAPACKE_str_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  n1, &a[n2], n )
-                        || LAPACKE_sge_nancheck( LAPACK_ROW_MAJOR, n1, n2,
+                        || API_SUFFIX(LAPACKE_sge_nancheck)( LAPACK_ROW_MAJOR, n1, n2,
                                                  &a[0], n )
-                        || LAPACKE_str_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                        || API_SUFFIX(LAPACKE_str_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  n2, &a[n1], n );
                 }
             } else {
                 /* N is odd and
                    ( ( TRANSR = 'C' || TRANSR = 'T' ) .XOR. COLMAJOR ) */
                 if( lower ) {
-                    return LAPACKE_str_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                    return API_SUFFIX(LAPACKE_str_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  n1, &a[0], n1 )
-                        || LAPACKE_sge_nancheck( LAPACK_ROW_MAJOR, n1, n2,
+                        || API_SUFFIX(LAPACKE_sge_nancheck)( LAPACK_ROW_MAJOR, n1, n2,
                                                  &a[1], n1 )
-                        || LAPACKE_str_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                        || API_SUFFIX(LAPACKE_str_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  n2, &a[1], n1 );
                 } else {
-                    return LAPACKE_str_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                    return API_SUFFIX(LAPACKE_str_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  n1, &a[(size_t)n2*n2], n2 )
-                        || LAPACKE_sge_nancheck( LAPACK_ROW_MAJOR, n2, n1,
+                        || API_SUFFIX(LAPACKE_sge_nancheck)( LAPACK_ROW_MAJOR, n2, n1,
                                                  &a[0], n2 )
-                        || LAPACKE_str_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                        || API_SUFFIX(LAPACKE_str_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  n2, &a[(size_t)n1*n2], n2 );
                 }
             }
@@ -114,18 +114,18 @@ lapack_logical LAPACKE_stf_nancheck( int matrix_layout, char transr,
             if( ( rowmaj || ntr ) && !( rowmaj && ntr ) ) {
                 /* N is even and ( TRANSR = 'N' .XOR. ROWMAJOR) */
                 if( lower ) {
-                    return LAPACKE_str_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                    return API_SUFFIX(LAPACKE_str_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  k, &a[1], n+1 )
-                        || LAPACKE_sge_nancheck( LAPACK_ROW_MAJOR, k, k,
+                        || API_SUFFIX(LAPACKE_sge_nancheck)( LAPACK_ROW_MAJOR, k, k,
                                                  &a[k+1], n+1 )
-                        || LAPACKE_str_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                        || API_SUFFIX(LAPACKE_str_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  k, &a[0], n+1 );
                 } else {
-                    return LAPACKE_str_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                    return API_SUFFIX(LAPACKE_str_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  k, &a[k+1], n+1 )
-                        || LAPACKE_sge_nancheck( LAPACK_ROW_MAJOR, k, k,
+                        || API_SUFFIX(LAPACKE_sge_nancheck)( LAPACK_ROW_MAJOR, k, k,
                                                  &a[0], n+1 )
-                        || LAPACKE_str_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                        || API_SUFFIX(LAPACKE_str_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  k, &a[k], n+1 );
                 }
             } else {
@@ -133,18 +133,18 @@ lapack_logical LAPACKE_stf_nancheck( int matrix_layout, char transr,
                  * ( ( TRANSR = 'C' || TRANSR = 'T' ) .XOR. COLMAJOR )
                  */
                 if( lower ) {
-                    return LAPACKE_str_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                    return API_SUFFIX(LAPACKE_str_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  k, &a[k], k )
-                        || LAPACKE_sge_nancheck( LAPACK_ROW_MAJOR, k, k,
+                        || API_SUFFIX(LAPACKE_sge_nancheck)( LAPACK_ROW_MAJOR, k, k,
                                                  &a[(size_t)k*(k+1)], k )
-                        || LAPACKE_str_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                        || API_SUFFIX(LAPACKE_str_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  k, &a[0], k );
                 } else {
-                    return LAPACKE_str_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                    return API_SUFFIX(LAPACKE_str_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  k, &a[(size_t)k*(k+1)], k )
-                        || LAPACKE_sge_nancheck( LAPACK_ROW_MAJOR, k, k,
+                        || API_SUFFIX(LAPACKE_sge_nancheck)( LAPACK_ROW_MAJOR, k, k,
                                                  &a[0], k )
-                        || LAPACKE_str_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                        || API_SUFFIX(LAPACKE_str_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  k, &a[(size_t)k*k], k );
                 }
             }
@@ -152,6 +152,6 @@ lapack_logical LAPACKE_stf_nancheck( int matrix_layout, char transr,
     } else {
         /* Non-unit case - just check whole array for NaNs. */
         len = n*(n+1)/2;
-        return LAPACKE_sge_nancheck( LAPACK_COL_MAJOR, len, 1, a, len );
+        return API_SUFFIX(LAPACKE_sge_nancheck)( LAPACK_COL_MAJOR, len, 1, a, len );
     }
 }
diff --git a/LAPACKE/utils/lapacke_stf_trans.c b/LAPACKE/utils/lapacke_stf_trans.c
index 6d737e2c9b..aa3795ca6e 100644
--- a/LAPACKE/utils/lapacke_stf_trans.c
+++ b/LAPACKE/utils/lapacke_stf_trans.c
@@ -37,7 +37,7 @@
  * This functions does copy diagonal for both unit and non-unit cases.
  */
 
-void LAPACKE_stf_trans( int matrix_layout, char transr, char uplo, char diag,
+void API_SUFFIX(LAPACKE_stf_trans)( int matrix_layout, char transr, char uplo, char diag,
                         lapack_int n, const float *in,
                         float *out )
 {
@@ -47,15 +47,15 @@ void LAPACKE_stf_trans( int matrix_layout, char transr, char uplo, char diag,
     if( in == NULL || out == NULL ) return ;
 
     rowmaj = (matrix_layout == LAPACK_ROW_MAJOR);
-    ntr    = LAPACKE_lsame( transr, 'n' );
-    lower  = LAPACKE_lsame( uplo,   'l' );
-    unit   = LAPACKE_lsame( diag,   'u' );
+    ntr    = API_SUFFIX(LAPACKE_lsame)( transr, 'n' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo,   'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag,   'u' );
 
     if( ( !rowmaj && ( matrix_layout != LAPACK_COL_MAJOR ) ) ||
-        ( !ntr    && !LAPACKE_lsame( transr, 't' ) &&
-                     !LAPACKE_lsame( transr, 'c' ) ) ||
-        ( !lower  && !LAPACKE_lsame( uplo,   'u' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag,   'n' ) ) ) {
+        ( !ntr    && !API_SUFFIX(LAPACKE_lsame)( transr, 't' ) &&
+                     !API_SUFFIX(LAPACKE_lsame)( transr, 'c' ) ) ||
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo,   'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag,   'n' ) ) ) {
         /* Just exit if input parameters are wrong */
         return;
     }
@@ -81,8 +81,8 @@ void LAPACKE_stf_trans( int matrix_layout, char transr, char uplo, char diag,
 
     /* Perform conversion: */
     if( rowmaj ) {
-        LAPACKE_sge_trans( LAPACK_ROW_MAJOR, row, col, in, col, out, row );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_ROW_MAJOR, row, col, in, col, out, row );
     } else {
-        LAPACKE_sge_trans( LAPACK_COL_MAJOR, row, col, in, row, out, col );
+        API_SUFFIX(LAPACKE_sge_trans)( LAPACK_COL_MAJOR, row, col, in, row, out, col );
     }
 }
diff --git a/LAPACKE/utils/lapacke_stp_nancheck.c b/LAPACKE/utils/lapacke_stp_nancheck.c
index 6c16368d56..105be69e18 100644
--- a/LAPACKE/utils/lapacke_stp_nancheck.c
+++ b/LAPACKE/utils/lapacke_stp_nancheck.c
@@ -36,7 +36,7 @@
  * check 1d array for NaNs. It doesn't depend upon uplo or matrix_layout.
  */
 
-lapack_logical LAPACKE_stp_nancheck( int matrix_layout, char uplo, char diag,
+lapack_logical API_SUFFIX(LAPACKE_stp_nancheck)( int matrix_layout, char uplo, char diag,
                                       lapack_int n,
                                       const float *ap )
 {
@@ -46,12 +46,12 @@ lapack_logical LAPACKE_stp_nancheck( int matrix_layout, char uplo, char diag,
     if( ap == NULL ) return (lapack_logical) 0;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    upper  = LAPACKE_lsame( uplo, 'u' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    upper  = API_SUFFIX(LAPACKE_lsame)( uplo, 'u' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !upper  && !LAPACKE_lsame( uplo, 'l' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !upper  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return (lapack_logical) 0;
     }
@@ -65,11 +65,11 @@ lapack_logical LAPACKE_stp_nancheck( int matrix_layout, char uplo, char diag,
          */
         if( ( colmaj || upper ) && !( colmaj && upper ) ) {
             for( i = 1; i < n; i++ )
-                if( LAPACKE_s_nancheck( i, &ap[ ((size_t)i+1)*i/2 ], 1 ) )
+                if( API_SUFFIX(LAPACKE_s_nancheck)( i, &ap[ ((size_t)i+1)*i/2 ], 1 ) )
                     return (lapack_logical) 1;
         } else {
             for( i = 0; i < n-1; i++ )
-                if( LAPACKE_s_nancheck( n-i-1,
+                if( API_SUFFIX(LAPACKE_s_nancheck)( n-i-1,
                     &ap[ (size_t)i+1 + i*((size_t)2*n-i+1)/2 ], 1 ) )
                     return (lapack_logical) 1;
         }
@@ -77,6 +77,6 @@ lapack_logical LAPACKE_stp_nancheck( int matrix_layout, char uplo, char diag,
     } else {
         /* Non-unit case - just check whole array for NaNs. */
         len = n*(n+1)/2;
-        return LAPACKE_s_nancheck( len, ap, 1 );
+        return API_SUFFIX(LAPACKE_s_nancheck)( len, ap, 1 );
     }
 }
diff --git a/LAPACKE/utils/lapacke_stp_trans.c b/LAPACKE/utils/lapacke_stp_trans.c
index 5c74724e8c..f9e6b29301 100644
--- a/LAPACKE/utils/lapacke_stp_trans.c
+++ b/LAPACKE/utils/lapacke_stp_trans.c
@@ -36,7 +36,7 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_stp_trans( int matrix_layout, char uplo, char diag,
+void API_SUFFIX(LAPACKE_stp_trans)( int matrix_layout, char uplo, char diag,
                         lapack_int n, const float *in,
                         float *out )
 {
@@ -46,12 +46,12 @@ void LAPACKE_stp_trans( int matrix_layout, char uplo, char diag,
     if( in == NULL || out == NULL ) return ;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    upper  = LAPACKE_lsame( uplo, 'u' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    upper  = API_SUFFIX(LAPACKE_lsame)( uplo, 'u' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !upper  && !LAPACKE_lsame( uplo, 'l' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !upper  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return;
     }
diff --git a/LAPACKE/utils/lapacke_str_nancheck.c b/LAPACKE/utils/lapacke_str_nancheck.c
index df5c7dd5a6..fbcaa2f627 100644
--- a/LAPACKE/utils/lapacke_str_nancheck.c
+++ b/LAPACKE/utils/lapacke_str_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_str_nancheck( int matrix_layout, char uplo, char diag,
+lapack_logical API_SUFFIX(LAPACKE_str_nancheck)( int matrix_layout, char uplo, char diag,
                                       lapack_int n,
                                       const float *a,
                                       lapack_int lda )
@@ -44,12 +44,12 @@ lapack_logical LAPACKE_str_nancheck( int matrix_layout, char uplo, char diag,
     if( a == NULL ) return (lapack_logical) 0;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    lower  = LAPACKE_lsame( uplo, 'l' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo, 'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !lower  && !LAPACKE_lsame( uplo, 'u' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return (lapack_logical) 0;
     }
diff --git a/LAPACKE/utils/lapacke_str_trans.c b/LAPACKE/utils/lapacke_str_trans.c
index 4416572e6d..d33e175015 100644
--- a/LAPACKE/utils/lapacke_str_trans.c
+++ b/LAPACKE/utils/lapacke_str_trans.c
@@ -36,7 +36,7 @@
  * layout or vice versa.
  */
 
-void LAPACKE_str_trans( int matrix_layout, char uplo, char diag, lapack_int n,
+void API_SUFFIX(LAPACKE_str_trans)( int matrix_layout, char uplo, char diag, lapack_int n,
                         const float *in, lapack_int ldin,
                         float *out, lapack_int ldout )
 {
@@ -46,12 +46,12 @@ void LAPACKE_str_trans( int matrix_layout, char uplo, char diag, lapack_int n,
     if( in == NULL || out == NULL ) return ;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    lower  = LAPACKE_lsame( uplo, 'l' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo, 'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !lower  && !LAPACKE_lsame( uplo, 'u' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return;
     }
diff --git a/LAPACKE/utils/lapacke_stz_nancheck.c b/LAPACKE/utils/lapacke_stz_nancheck.c
new file mode 100644
index 0000000000..903eef9b5d
--- /dev/null
+++ b/LAPACKE/utils/lapacke_stz_nancheck.c
@@ -0,0 +1,143 @@
+/*****************************************************************************
+  Copyright (c) 2022, 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 C interface to LAPACK utility function
+* Author: Simon Märtens
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+/*****************************************************************************
+  Check a trapezoidal matrix for NaN entries. The shape of the trapezoidal
+  matrix is determined by the arguments `direct` and `uplo`. `Direct` chooses
+  the diagonal which shall be considered and `uplo` tells us whether we use the
+  upper or lower part of the matrix with respect to the chosen diagonal.
+
+      Diagonals 'F' (front / forward) and 'B' (back / backward):
+
+        A = ( F       )           A = ( F     B       )
+            (    F    )               (    F     B    )
+            ( B     F )               (       F     B )
+            (    B    )
+            (       B )
+
+      direct = 'F', uplo = 'L':
+
+        A = ( *       )           A = ( *             )
+            ( *  *    )               ( *  *          )
+            ( *  *  * )               ( *  *  *       )
+            ( *  *  * )
+            ( *  *  * )
+
+      direct = 'F', uplo = 'U':
+
+        A = ( *  *  * )           A = ( *  *  *  *  * )
+            (    *  * )               (    *  *  *  * )
+            (       * )               (       *  *  * )
+            (         )
+            (         )
+
+      direct = 'B', uplo = 'L':
+
+        A = (         )           A = ( *  *  *       )
+            (         )               ( *  *  *  *    )
+            ( *       )               ( *  *  *  *  * )
+            ( *  *    )
+            ( *  *  * )
+
+      direct = 'B', uplo = 'U':
+
+        A = ( *  *  * )           A = (       *  *  * )
+            ( *  *  * )               (          *  * )
+            ( *  *  * )               (             * )
+            (    *  * )
+            (       * )
+
+*****************************************************************************/
+
+lapack_logical API_SUFFIX(LAPACKE_stz_nancheck)( int matrix_layout, char direct, char uplo,
+                                     char diag, lapack_int m, lapack_int n,
+                                     const float *a, lapack_int lda )
+{
+    lapack_logical colmaj, front, lower, unit;
+
+    if( a == NULL ) return (lapack_logical) 0;
+
+    colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
+    front  = API_SUFFIX(LAPACKE_lsame)( direct, 'f' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo, 'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
+
+    if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
+        ( !front  && !API_SUFFIX(LAPACKE_lsame)( direct, 'b' ) ) ||
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
+        /* Just exit if any of input parameters are wrong */
+        return (lapack_logical) 0;
+    }
+
+    /* Initial offsets and sizes of triangular and rectangular parts */
+    lapack_int tri_offset = 0;
+    lapack_int tri_n = MIN(m,n);
+    lapack_int rect_offset = -1;
+    lapack_int rect_m = ( m > n ) ? m - n : m;
+    lapack_int rect_n = ( n > m ) ? n - m : n;
+
+    /* Fix offsets depending on the shape of the matrix */
+    if( front ) {
+        if( lower && m > n ) {
+            rect_offset = tri_n * ( !colmaj ? lda : 1 );
+        } else if( !lower && n > m ) {
+            rect_offset = tri_n * ( colmaj ? lda : 1 );
+        }
+    } else {
+        if( m > n ) {
+            tri_offset = rect_m * ( !colmaj ? lda : 1 );
+            if( !lower ) {
+                rect_offset = 0;
+            }
+        } else if( n > m ) {
+            tri_offset = rect_n * ( colmaj ? lda : 1 );
+            if( lower ) {
+                rect_offset = 0;
+            }
+        }
+    }
+
+    /* Check rectangular part */
+    if( rect_offset >= 0 ) {
+        if( API_SUFFIX(LAPACKE_sge_nancheck)( matrix_layout, rect_m, rect_n,
+                                  &a[rect_offset], lda) ) {
+            return (lapack_logical) 1;
+        }
+    }
+
+    /* Check triangular part */
+    return API_SUFFIX(LAPACKE_str_nancheck)( matrix_layout, uplo, diag, tri_n,
+                                 &a[tri_offset], lda );
+}
diff --git a/LAPACKE/utils/lapacke_stz_trans.c b/LAPACKE/utils/lapacke_stz_trans.c
new file mode 100644
index 0000000000..5e55c39eef
--- /dev/null
+++ b/LAPACKE/utils/lapacke_stz_trans.c
@@ -0,0 +1,153 @@
+/*****************************************************************************
+  Copyright (c) 2022, 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 C interface to LAPACK utility function
+* Author: Simon Märtens
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+/*****************************************************************************
+  Converts input triangular matrix from row-major(C) to column-major(Fortran)
+  layout or vice versa. The shape of the trapezoidal matrix is determined by
+  the arguments `direct` and `uplo`. `Direct` chooses the diagonal which shall
+  be considered and `uplo` tells us whether we use the upper or lower part of
+  the matrix with respect to the chosen diagonal.
+
+      Diagonals 'F' (front / forward) and 'B' (back / backward):
+
+        A = ( F       )           A = ( F     B       )
+            (    F    )               (    F     B    )
+            ( B     F )               (       F     B )
+            (    B    )
+            (       B )
+
+      direct = 'F', uplo = 'L':
+
+        A = ( *       )           A = ( *             )
+            ( *  *    )               ( *  *          )
+            ( *  *  * )               ( *  *  *       )
+            ( *  *  * )
+            ( *  *  * )
+
+      direct = 'F', uplo = 'U':
+
+        A = ( *  *  * )           A = ( *  *  *  *  * )
+            (    *  * )               (    *  *  *  * )
+            (       * )               (       *  *  * )
+            (         )
+            (         )
+
+      direct = 'B', uplo = 'L':
+
+        A = (         )           A = ( *  *  *       )
+            (         )               ( *  *  *  *    )
+            ( *       )               ( *  *  *  *  * )
+            ( *  *    )
+            ( *  *  * )
+
+      direct = 'B', uplo = 'U':
+
+        A = ( *  *  * )           A = (       *  *  * )
+            ( *  *  * )               (          *  * )
+            ( *  *  * )               (             * )
+            (    *  * )
+            (       * )
+
+*****************************************************************************/
+
+void API_SUFFIX(LAPACKE_stz_trans)( int matrix_layout, char direct, char uplo,
+                        char diag, lapack_int m, lapack_int n,
+                        const float *in, lapack_int ldin,
+                        float *out, lapack_int ldout )
+{
+    lapack_logical colmaj, front, lower, unit;
+
+    if( in == NULL || out == NULL ) return ;
+
+    colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
+    front  = API_SUFFIX(LAPACKE_lsame)( direct, 'f' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo, 'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
+
+    if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
+        ( !front  && !API_SUFFIX(LAPACKE_lsame)( direct, 'b' ) ) ||
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
+        /* Just exit if any of input parameters are wrong */
+        return;
+    }
+
+    /* Initial offsets and sizes of triangular and rectangular parts */
+    lapack_int tri_in_offset = 0;
+    lapack_int tri_out_offset = 0;
+    lapack_int tri_n = MIN(m,n);
+    lapack_int rect_in_offset = -1;
+    lapack_int rect_out_offset = -1;
+    lapack_int rect_m = ( m > n ) ? m - n : m;
+    lapack_int rect_n = ( n > m ) ? n - m : n;
+
+    /* Fix offsets depending on the shape of the matrix */
+    if( front ) {
+        if( lower && m > n ) {
+            rect_in_offset = tri_n * ( !colmaj ? ldin : 1 );
+            rect_out_offset = tri_n * ( colmaj ? ldout : 1 );
+        } else if( !lower && n > m ) {
+            rect_in_offset = tri_n * ( colmaj ? ldin : 1 );
+            rect_out_offset = tri_n * ( !colmaj ? ldout : 1 );
+        }
+    } else {
+        if( m > n ) {
+            tri_in_offset = rect_m * ( !colmaj ? ldin : 1 );
+            tri_out_offset = rect_m * ( colmaj ? ldout : 1 );
+            if( !lower ) {
+                rect_in_offset = 0;
+                rect_out_offset = 0;
+            }
+        } else if( n > m ) {
+            tri_in_offset = rect_n * ( colmaj ? ldin : 1 );
+            tri_out_offset = rect_n * ( !colmaj ? ldout : 1 );
+            if( lower ) {
+                rect_in_offset = 0;
+                rect_out_offset = 0;
+            }
+        }
+    }
+
+    /* Copy & transpose rectangular part */
+    if( rect_in_offset >= 0 && rect_out_offset >= 0 ) {
+        API_SUFFIX(LAPACKE_sge_trans)( matrix_layout, rect_m, rect_n,
+                           &in[rect_in_offset], ldin,
+                           &out[rect_out_offset], ldout );
+    }
+
+    /* Copy & transpose triangular part */
+    API_SUFFIX(LAPACKE_str_trans)( matrix_layout, uplo, diag, tri_n,
+                       &in[tri_in_offset], ldin,
+                       &out[tri_out_offset], ldout );
+}
diff --git a/LAPACKE/utils/lapacke_xerbla.c b/LAPACKE/utils/lapacke_xerbla.c
index 8ce4b8e081..a70dd0a1d1 100644
--- a/LAPACKE/utils/lapacke_xerbla.c
+++ b/LAPACKE/utils/lapacke_xerbla.c
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include "lapacke_utils.h"
 
-void LAPACKE_xerbla( const char *name, lapack_int info )
+void API_SUFFIX(LAPACKE_xerbla)( const char *name, lapack_int info )
 {
     if( info == LAPACK_WORK_MEMORY_ERROR ) {
         printf( "Not enough memory to allocate work array in %s\n", name );
diff --git a/LAPACKE/utils/lapacke_z_nancheck.c b/LAPACKE/utils/lapacke_z_nancheck.c
index ce6b18e630..c983876cfb 100644
--- a/LAPACKE/utils/lapacke_z_nancheck.c
+++ b/LAPACKE/utils/lapacke_z_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a vector for NaN entries. */
 
-lapack_logical LAPACKE_z_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_z_nancheck)( lapack_int n,
                                     const lapack_complex_double *x,
                                     lapack_int incx )
 {
diff --git a/LAPACKE/utils/lapacke_zgb_nancheck.c b/LAPACKE/utils/lapacke_zgb_nancheck.c
index 5d98cd5881..5c3673b357 100644
--- a/LAPACKE/utils/lapacke_zgb_nancheck.c
+++ b/LAPACKE/utils/lapacke_zgb_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_zgb_nancheck( int matrix_layout, lapack_int m,
+lapack_logical API_SUFFIX(LAPACKE_zgb_nancheck)( int matrix_layout, lapack_int m,
                                       lapack_int n, lapack_int kl,
                                       lapack_int ku,
                                       const lapack_complex_double *ab,
diff --git a/LAPACKE/utils/lapacke_zgb_trans.c b/LAPACKE/utils/lapacke_zgb_trans.c
index 32a9de3795..6bfc7a5cb9 100644
--- a/LAPACKE/utils/lapacke_zgb_trans.c
+++ b/LAPACKE/utils/lapacke_zgb_trans.c
@@ -36,7 +36,7 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_zgb_trans( int matrix_layout, lapack_int m, lapack_int n,
+void API_SUFFIX(LAPACKE_zgb_trans)( int matrix_layout, lapack_int m, lapack_int n,
                         lapack_int kl, lapack_int ku,
                         const lapack_complex_double *in, lapack_int ldin,
                         lapack_complex_double *out, lapack_int ldout )
@@ -54,7 +54,7 @@ void LAPACKE_zgb_trans( int matrix_layout, lapack_int m, lapack_int n,
         }
     } else if ( matrix_layout == LAPACK_ROW_MAJOR ) {
         /* TODO: interchange loops for performance.
-         * This is just reference impemeltation
+         * This is just reference implementation
          */
         for( j = 0; j < MIN( n, ldin ); j++ ) {
             for( i = MAX( ku-j, 0 ); i < MIN3( ldout, m+ku-j, kl+ku+1 );
diff --git a/LAPACKE/utils/lapacke_zge_nancheck.c b/LAPACKE/utils/lapacke_zge_nancheck.c
index 9fa7fc61ca..efbbca29a6 100644
--- a/LAPACKE/utils/lapacke_zge_nancheck.c
+++ b/LAPACKE/utils/lapacke_zge_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_zge_nancheck( int matrix_layout, lapack_int m,
+lapack_logical API_SUFFIX(LAPACKE_zge_nancheck)( int matrix_layout, lapack_int m,
                                       lapack_int n,
                                       const lapack_complex_double *a,
                                       lapack_int lda )
diff --git a/LAPACKE/utils/lapacke_zge_trans.c b/LAPACKE/utils/lapacke_zge_trans.c
index bc4d96255f..b5248780ff 100644
--- a/LAPACKE/utils/lapacke_zge_trans.c
+++ b/LAPACKE/utils/lapacke_zge_trans.c
@@ -36,7 +36,7 @@
  * layout or vice versa.
  */
 
-void LAPACKE_zge_trans( int matrix_layout, lapack_int m, lapack_int n,
+void API_SUFFIX(LAPACKE_zge_trans)( int matrix_layout, lapack_int m, lapack_int n,
                         const lapack_complex_double* in, lapack_int ldin,
                         lapack_complex_double* out, lapack_int ldout )
 {
diff --git a/LAPACKE/utils/lapacke_zgg_nancheck.c b/LAPACKE/utils/lapacke_zgg_nancheck.c
index 2ecf90613d..6aa7f270e7 100644
--- a/LAPACKE/utils/lapacke_zgg_nancheck.c
+++ b/LAPACKE/utils/lapacke_zgg_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_zgg_nancheck( int matrix_layout, lapack_int m,
+lapack_logical API_SUFFIX(LAPACKE_zgg_nancheck)( int matrix_layout, lapack_int m,
                                       lapack_int n,
                                       const lapack_complex_double *a,
                                       lapack_int lda )
 {
-    return LAPACKE_zge_nancheck( matrix_layout, m, n, a, lda );
+    return API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, m, n, a, lda );
 }
diff --git a/LAPACKE/utils/lapacke_zgg_trans.c b/LAPACKE/utils/lapacke_zgg_trans.c
index 3596f3b164..d7dcdccd5d 100644
--- a/LAPACKE/utils/lapacke_zgg_trans.c
+++ b/LAPACKE/utils/lapacke_zgg_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_zgg_trans( int matrix_layout, lapack_int m, lapack_int n,
+void API_SUFFIX(LAPACKE_zgg_trans)( int matrix_layout, lapack_int m, lapack_int n,
                         const lapack_complex_double* in, lapack_int ldin,
                         lapack_complex_double* out, lapack_int ldout )
 {
-    LAPACKE_zge_trans( matrix_layout, m, n, in, ldin, out, ldout );
+    API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, m, n, in, ldin, out, ldout );
 }
diff --git a/LAPACKE/utils/lapacke_zgt_nancheck.c b/LAPACKE/utils/lapacke_zgt_nancheck.c
index 6a434bd59d..c6285f64ea 100644
--- a/LAPACKE/utils/lapacke_zgt_nancheck.c
+++ b/LAPACKE/utils/lapacke_zgt_nancheck.c
@@ -33,12 +33,12 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_zgt_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_zgt_nancheck)( lapack_int n,
                                       const lapack_complex_double *dl,
                                       const lapack_complex_double *d,
                                       const lapack_complex_double *du )
 {
-    return LAPACKE_z_nancheck( n-1, dl, 1 )
-        || LAPACKE_z_nancheck( n  , d,  1 )
-        || LAPACKE_z_nancheck( n-1, du, 1 );
+    return API_SUFFIX(LAPACKE_z_nancheck)( n-1, dl, 1 )
+        || API_SUFFIX(LAPACKE_z_nancheck)( n  , d,  1 )
+        || API_SUFFIX(LAPACKE_z_nancheck)( n-1, du, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_zhb_nancheck.c b/LAPACKE/utils/lapacke_zhb_nancheck.c
index 23e0971793..d6ac42d8d2 100644
--- a/LAPACKE/utils/lapacke_zhb_nancheck.c
+++ b/LAPACKE/utils/lapacke_zhb_nancheck.c
@@ -33,15 +33,15 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_zhb_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_zhb_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n, lapack_int kd,
                                       const lapack_complex_double* ab,
                                       lapack_int ldab )
 {
-    if( LAPACKE_lsame( uplo, 'u' ) ) {
-        return LAPACKE_zgb_nancheck( matrix_layout, n, n, 0, kd, ab, ldab );
-    } else if( LAPACKE_lsame( uplo, 'l' ) ) {
-        return LAPACKE_zgb_nancheck( matrix_layout, n, n, kd, 0, ab, ldab );
+    if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
+        return API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, 0, kd, ab, ldab );
+    } else if( API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) {
+        return API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, kd, 0, ab, ldab );
     }
     return (lapack_logical) 0;
 }
diff --git a/LAPACKE/utils/lapacke_zhb_trans.c b/LAPACKE/utils/lapacke_zhb_trans.c
index 6bab305b9a..e77b95a155 100644
--- a/LAPACKE/utils/lapacke_zhb_trans.c
+++ b/LAPACKE/utils/lapacke_zhb_trans.c
@@ -36,14 +36,14 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_zhb_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_zhb_trans)( int matrix_layout, char uplo, lapack_int n,
                         lapack_int kd,
                         const lapack_complex_double *in, lapack_int ldin,
                         lapack_complex_double *out, lapack_int ldout )
 {
-    if( LAPACKE_lsame( uplo, 'u' ) ) {
-        LAPACKE_zgb_trans( matrix_layout, n, n, 0, kd, in, ldin, out, ldout );
-    } else if( LAPACKE_lsame( uplo, 'l' ) ) {
-        LAPACKE_zgb_trans( matrix_layout, n, n, kd, 0, in, ldin, out, ldout );
+    if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
+        API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n, n, 0, kd, in, ldin, out, ldout );
+    } else if( API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) {
+        API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n, n, kd, 0, in, ldin, out, ldout );
     }
 }
diff --git a/LAPACKE/utils/lapacke_zhe_nancheck.c b/LAPACKE/utils/lapacke_zhe_nancheck.c
index d0fe8e1682..a8da25f09f 100644
--- a/LAPACKE/utils/lapacke_zhe_nancheck.c
+++ b/LAPACKE/utils/lapacke_zhe_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_zhe_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_zhe_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n,
                                       const lapack_complex_double *a,
                                       lapack_int lda )
 {
-    return LAPACKE_ztr_nancheck( matrix_layout, uplo, 'n', n, a, lda );
+    return API_SUFFIX(LAPACKE_ztr_nancheck)( matrix_layout, uplo, 'n', n, a, lda );
 }
diff --git a/LAPACKE/utils/lapacke_zhe_trans.c b/LAPACKE/utils/lapacke_zhe_trans.c
index d7fd00f6ff..dcb8c77ca6 100644
--- a/LAPACKE/utils/lapacke_zhe_trans.c
+++ b/LAPACKE/utils/lapacke_zhe_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_zhe_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_zhe_trans)( int matrix_layout, char uplo, lapack_int n,
                         const lapack_complex_double *in, lapack_int ldin,
                         lapack_complex_double *out, lapack_int ldout )
 {
-    LAPACKE_ztr_trans( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
+    API_SUFFIX(LAPACKE_ztr_trans)( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
 }
diff --git a/LAPACKE/utils/lapacke_zhp_nancheck.c b/LAPACKE/utils/lapacke_zhp_nancheck.c
index 1cfbd7e546..152a1bf568 100644
--- a/LAPACKE/utils/lapacke_zhp_nancheck.c
+++ b/LAPACKE/utils/lapacke_zhp_nancheck.c
@@ -36,9 +36,9 @@
  * check 1d array for NaNs. It doesn't depend upon uplo or matrix_layout.
  */
 
-lapack_logical LAPACKE_zhp_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_zhp_nancheck)( lapack_int n,
                                       const lapack_complex_double *ap )
 {
     lapack_int len = n*(n+1)/2;
-    return LAPACKE_z_nancheck( len, ap, 1 );
+    return API_SUFFIX(LAPACKE_z_nancheck)( len, ap, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_zhp_trans.c b/LAPACKE/utils/lapacke_zhp_trans.c
index b61b1b3ba0..118ad1059f 100644
--- a/LAPACKE/utils/lapacke_zhp_trans.c
+++ b/LAPACKE/utils/lapacke_zhp_trans.c
@@ -36,9 +36,9 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_zhp_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_zhp_trans)( int matrix_layout, char uplo, lapack_int n,
                         const lapack_complex_double *in,
                         lapack_complex_double *out )
 {
-    LAPACKE_ztp_trans( matrix_layout, uplo, 'n', n, in, out );
+    API_SUFFIX(LAPACKE_ztp_trans)( matrix_layout, uplo, 'n', n, in, out );
 }
diff --git a/LAPACKE/utils/lapacke_zhs_nancheck.c b/LAPACKE/utils/lapacke_zhs_nancheck.c
index 7283af0314..2b007a01c4 100644
--- a/LAPACKE/utils/lapacke_zhs_nancheck.c
+++ b/LAPACKE/utils/lapacke_zhs_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_zhs_nancheck( int matrix_layout, lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_zhs_nancheck)( int matrix_layout, lapack_int n,
                                       const lapack_complex_double *a,
                                       lapack_int lda )
 {
@@ -43,14 +43,14 @@ lapack_logical LAPACKE_zhs_nancheck( int matrix_layout, lapack_int n,
 
     /* Check subdiagonal first */
     if( matrix_layout == LAPACK_COL_MAJOR ) {
-        subdiag_nans = LAPACKE_z_nancheck( n-1, &a[1], lda+1 );
+        subdiag_nans = API_SUFFIX(LAPACKE_z_nancheck)( n-1, &a[1], lda+1 );
     } else if ( matrix_layout == LAPACK_ROW_MAJOR ) {
-        subdiag_nans = LAPACKE_z_nancheck( n-1, &a[lda], lda+1 );
+        subdiag_nans = API_SUFFIX(LAPACKE_z_nancheck)( n-1, &a[lda], lda+1 );
     } else {
         return (lapack_logical) 0;
     }
 
     /* Check upper triangular if subdiagonal has no NaNs. */
-    return subdiag_nans || LAPACKE_ztr_nancheck( matrix_layout, 'u', 'n',
+    return subdiag_nans || API_SUFFIX(LAPACKE_ztr_nancheck)( matrix_layout, 'u', 'n',
                                                  n, a, lda);
 }
diff --git a/LAPACKE/utils/lapacke_zhs_trans.c b/LAPACKE/utils/lapacke_zhs_trans.c
index 44a2d976a4..6e0a454a65 100644
--- a/LAPACKE/utils/lapacke_zhs_trans.c
+++ b/LAPACKE/utils/lapacke_zhs_trans.c
@@ -36,7 +36,7 @@
  * layout or vice versa.
  */
 
-void LAPACKE_zhs_trans( int matrix_layout, lapack_int n,
+void API_SUFFIX(LAPACKE_zhs_trans)( int matrix_layout, lapack_int n,
                         const lapack_complex_double *in, lapack_int ldin,
                         lapack_complex_double *out, lapack_int ldout )
 {
@@ -44,15 +44,15 @@ void LAPACKE_zhs_trans( int matrix_layout, lapack_int n,
 
     /* Convert subdiagonal first */
     if( matrix_layout == LAPACK_COL_MAJOR ) {
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, 1, n-1, &in[1], ldin+1,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, 1, n-1, &in[1], ldin+1,
                            &out[ldout], ldout+1 );
     } else if ( matrix_layout == LAPACK_ROW_MAJOR ) {
-        LAPACKE_zge_trans( LAPACK_ROW_MAJOR, n-1, 1, &in[ldin], ldin+1,
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_ROW_MAJOR, n-1, 1, &in[ldin], ldin+1,
                            &out[1], ldout+1 );
     } else {
         return;
     }
 
     /* Convert upper triangular. */
-    LAPACKE_ztr_trans( matrix_layout, 'u', 'n', n, in, ldin, out, ldout);
+    API_SUFFIX(LAPACKE_ztr_trans)( matrix_layout, 'u', 'n', n, in, ldin, out, ldout);
 }
diff --git a/LAPACKE/utils/lapacke_zpb_nancheck.c b/LAPACKE/utils/lapacke_zpb_nancheck.c
index 521eed9593..2fc53123c7 100644
--- a/LAPACKE/utils/lapacke_zpb_nancheck.c
+++ b/LAPACKE/utils/lapacke_zpb_nancheck.c
@@ -33,15 +33,15 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_zpb_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_zpb_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n, lapack_int kd,
                                       const lapack_complex_double* ab,
                                       lapack_int ldab )
 {
-    if( LAPACKE_lsame( uplo, 'u' ) ) {
-        return LAPACKE_zgb_nancheck( matrix_layout, n, n, 0, kd, ab, ldab );
-    } else if( LAPACKE_lsame( uplo, 'l' ) ) {
-        return LAPACKE_zgb_nancheck( matrix_layout, n, n, kd, 0, ab, ldab );
+    if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
+        return API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, 0, kd, ab, ldab );
+    } else if( API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) {
+        return API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, kd, 0, ab, ldab );
     }
     return (lapack_logical) 0;
 }
diff --git a/LAPACKE/utils/lapacke_zpb_trans.c b/LAPACKE/utils/lapacke_zpb_trans.c
index 5afb4071ee..708173737b 100644
--- a/LAPACKE/utils/lapacke_zpb_trans.c
+++ b/LAPACKE/utils/lapacke_zpb_trans.c
@@ -36,14 +36,14 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_zpb_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_zpb_trans)( int matrix_layout, char uplo, lapack_int n,
                         lapack_int kd,
                         const lapack_complex_double *in, lapack_int ldin,
                         lapack_complex_double *out, lapack_int ldout )
 {
-    if( LAPACKE_lsame( uplo, 'u' ) ) {
-        LAPACKE_zgb_trans( matrix_layout, n, n, 0, kd, in, ldin, out, ldout );
-    } else if( LAPACKE_lsame( uplo, 'l' ) ) {
-        LAPACKE_zgb_trans( matrix_layout, n, n, kd, 0, in, ldin, out, ldout );
+    if( API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) {
+        API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n, n, 0, kd, in, ldin, out, ldout );
+    } else if( API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) {
+        API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n, n, kd, 0, in, ldin, out, ldout );
     }
 }
diff --git a/LAPACKE/utils/lapacke_zpf_nancheck.c b/LAPACKE/utils/lapacke_zpf_nancheck.c
index 6ec322af0b..04c46f8ead 100644
--- a/LAPACKE/utils/lapacke_zpf_nancheck.c
+++ b/LAPACKE/utils/lapacke_zpf_nancheck.c
@@ -37,9 +37,9 @@
  * matrix_layout.
  */
 
-lapack_logical LAPACKE_zpf_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_zpf_nancheck)( lapack_int n,
                                       const lapack_complex_double *a )
 {
     lapack_int len = n*(n+1)/2;
-    return LAPACKE_z_nancheck( len, a, 1 );
+    return API_SUFFIX(LAPACKE_z_nancheck)( len, a, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_zpf_trans.c b/LAPACKE/utils/lapacke_zpf_trans.c
index 2cc41bff2c..c1830f6128 100644
--- a/LAPACKE/utils/lapacke_zpf_trans.c
+++ b/LAPACKE/utils/lapacke_zpf_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_zpf_trans( int matrix_layout, char transr, char uplo,
+void API_SUFFIX(LAPACKE_zpf_trans)( int matrix_layout, char transr, char uplo,
                         lapack_int n, const lapack_complex_double *in,
                         lapack_complex_double *out )
 {
-    LAPACKE_ztf_trans( matrix_layout, transr, uplo, 'n', n, in, out );
+    API_SUFFIX(LAPACKE_ztf_trans)( matrix_layout, transr, uplo, 'n', n, in, out );
 }
diff --git a/LAPACKE/utils/lapacke_zpo_nancheck.c b/LAPACKE/utils/lapacke_zpo_nancheck.c
index 61eb46da57..66740ae874 100644
--- a/LAPACKE/utils/lapacke_zpo_nancheck.c
+++ b/LAPACKE/utils/lapacke_zpo_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_zpo_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_zpo_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n,
                                       const lapack_complex_double *a,
                                       lapack_int lda )
 {
-    return LAPACKE_ztr_nancheck( matrix_layout, uplo, 'n', n, a, lda );
+    return API_SUFFIX(LAPACKE_ztr_nancheck)( matrix_layout, uplo, 'n', n, a, lda );
 }
diff --git a/LAPACKE/utils/lapacke_zpo_trans.c b/LAPACKE/utils/lapacke_zpo_trans.c
index 70d7a845a5..88d05081bc 100644
--- a/LAPACKE/utils/lapacke_zpo_trans.c
+++ b/LAPACKE/utils/lapacke_zpo_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_zpo_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_zpo_trans)( int matrix_layout, char uplo, lapack_int n,
                         const lapack_complex_double *in, lapack_int ldin,
                         lapack_complex_double *out, lapack_int ldout )
 {
-    LAPACKE_ztr_trans( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
+    API_SUFFIX(LAPACKE_ztr_trans)( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
 }
diff --git a/LAPACKE/utils/lapacke_zpp_nancheck.c b/LAPACKE/utils/lapacke_zpp_nancheck.c
index f2982a855d..ce4446a645 100644
--- a/LAPACKE/utils/lapacke_zpp_nancheck.c
+++ b/LAPACKE/utils/lapacke_zpp_nancheck.c
@@ -36,9 +36,9 @@
  * check 1d array for NaNs. It doesn't depend upon uplo or matrix_layout.
  */
 
-lapack_logical LAPACKE_zpp_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_zpp_nancheck)( lapack_int n,
                                       const lapack_complex_double *ap )
 {
     lapack_int len = n*(n+1)/2;
-    return LAPACKE_z_nancheck( len, ap, 1 );
+    return API_SUFFIX(LAPACKE_z_nancheck)( len, ap, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_zpp_trans.c b/LAPACKE/utils/lapacke_zpp_trans.c
index 1cae636374..e1853dd917 100644
--- a/LAPACKE/utils/lapacke_zpp_trans.c
+++ b/LAPACKE/utils/lapacke_zpp_trans.c
@@ -36,9 +36,9 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_zpp_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_zpp_trans)( int matrix_layout, char uplo, lapack_int n,
                         const lapack_complex_double *in,
                         lapack_complex_double *out )
 {
-    LAPACKE_ztp_trans( matrix_layout, uplo, 'n', n, in, out );
+    API_SUFFIX(LAPACKE_ztp_trans)( matrix_layout, uplo, 'n', n, in, out );
 }
diff --git a/LAPACKE/utils/lapacke_zpt_nancheck.c b/LAPACKE/utils/lapacke_zpt_nancheck.c
index 3e09ee0bd2..c9b27924d0 100644
--- a/LAPACKE/utils/lapacke_zpt_nancheck.c
+++ b/LAPACKE/utils/lapacke_zpt_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_zpt_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_zpt_nancheck)( lapack_int n,
                                       const double *d,
                                       const lapack_complex_double *e )
 {
-    return LAPACKE_d_nancheck( n,   d, 1 )
-        || LAPACKE_z_nancheck( n-1, e, 1 );
+    return API_SUFFIX(LAPACKE_d_nancheck)( n,   d, 1 )
+        || API_SUFFIX(LAPACKE_z_nancheck)( n-1, e, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_zsp_nancheck.c b/LAPACKE/utils/lapacke_zsp_nancheck.c
index edc59029fa..648269757e 100644
--- a/LAPACKE/utils/lapacke_zsp_nancheck.c
+++ b/LAPACKE/utils/lapacke_zsp_nancheck.c
@@ -36,9 +36,9 @@
  * check 1d array for NaNs. It doesn't depend upon uplo or matrix_layout.
  */
 
-lapack_logical LAPACKE_zsp_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_zsp_nancheck)( lapack_int n,
                                       const lapack_complex_double *ap )
 {
     lapack_int len = n*(n+1)/2;
-    return LAPACKE_z_nancheck( len, ap, 1 );
+    return API_SUFFIX(LAPACKE_z_nancheck)( len, ap, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_zsp_trans.c b/LAPACKE/utils/lapacke_zsp_trans.c
index a445a6016b..74ba2a7595 100644
--- a/LAPACKE/utils/lapacke_zsp_trans.c
+++ b/LAPACKE/utils/lapacke_zsp_trans.c
@@ -36,9 +36,9 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_zsp_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_zsp_trans)( int matrix_layout, char uplo, lapack_int n,
                         const lapack_complex_double *in,
                         lapack_complex_double *out )
 {
-    LAPACKE_ztp_trans( matrix_layout, uplo, 'n', n, in, out );
+    API_SUFFIX(LAPACKE_ztp_trans)( matrix_layout, uplo, 'n', n, in, out );
 }
diff --git a/LAPACKE/utils/lapacke_zst_nancheck.c b/LAPACKE/utils/lapacke_zst_nancheck.c
index 7775a1a2dc..2b8f40bf9b 100644
--- a/LAPACKE/utils/lapacke_zst_nancheck.c
+++ b/LAPACKE/utils/lapacke_zst_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_zst_nancheck( lapack_int n,
+lapack_logical API_SUFFIX(LAPACKE_zst_nancheck)( lapack_int n,
                                       const lapack_complex_double *d,
                                       const lapack_complex_double *e )
 {
-    return LAPACKE_z_nancheck( n,   d, 1 )
-        || LAPACKE_z_nancheck( n-1, e, 1 );
+    return API_SUFFIX(LAPACKE_z_nancheck)( n,   d, 1 )
+        || API_SUFFIX(LAPACKE_z_nancheck)( n-1, e, 1 );
 }
diff --git a/LAPACKE/utils/lapacke_zsy_nancheck.c b/LAPACKE/utils/lapacke_zsy_nancheck.c
index 57deee0d03..812b043707 100644
--- a/LAPACKE/utils/lapacke_zsy_nancheck.c
+++ b/LAPACKE/utils/lapacke_zsy_nancheck.c
@@ -33,10 +33,10 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_zsy_nancheck( int matrix_layout, char uplo,
+lapack_logical API_SUFFIX(LAPACKE_zsy_nancheck)( int matrix_layout, char uplo,
                                       lapack_int n,
                                       const lapack_complex_double *a,
                                       lapack_int lda )
 {
-    return LAPACKE_ztr_nancheck( matrix_layout, uplo, 'n', n, a, lda );
+    return API_SUFFIX(LAPACKE_ztr_nancheck)( matrix_layout, uplo, 'n', n, a, lda );
 }
diff --git a/LAPACKE/utils/lapacke_zsy_trans.c b/LAPACKE/utils/lapacke_zsy_trans.c
index 341fda7316..4eaefd33ca 100644
--- a/LAPACKE/utils/lapacke_zsy_trans.c
+++ b/LAPACKE/utils/lapacke_zsy_trans.c
@@ -36,9 +36,9 @@
  * layout or vice versa.
  */
 
-void LAPACKE_zsy_trans( int matrix_layout, char uplo, lapack_int n,
+void API_SUFFIX(LAPACKE_zsy_trans)( int matrix_layout, char uplo, lapack_int n,
                         const lapack_complex_double *in, lapack_int ldin,
                         lapack_complex_double *out, lapack_int ldout )
 {
-    LAPACKE_ztr_trans( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
+    API_SUFFIX(LAPACKE_ztr_trans)( matrix_layout, uplo, 'n', n, in, ldin, out, ldout );
 }
diff --git a/LAPACKE/utils/lapacke_ztb_nancheck.c b/LAPACKE/utils/lapacke_ztb_nancheck.c
index 0c2c809b87..23dbb14d09 100644
--- a/LAPACKE/utils/lapacke_ztb_nancheck.c
+++ b/LAPACKE/utils/lapacke_ztb_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_ztb_nancheck( int matrix_layout, char uplo, char diag,
+lapack_logical API_SUFFIX(LAPACKE_ztb_nancheck)( int matrix_layout, char uplo, char diag,
                                       lapack_int n, lapack_int kd,
                                       const lapack_complex_double* ab,
                                       lapack_int ldab )
@@ -43,12 +43,12 @@ lapack_logical LAPACKE_ztb_nancheck( int matrix_layout, char uplo, char diag,
     if( ab == NULL ) return (lapack_logical) 0;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    upper  = LAPACKE_lsame( uplo, 'u' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    upper  = API_SUFFIX(LAPACKE_lsame)( uplo, 'u' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !upper  && !LAPACKE_lsame( uplo, 'l' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !upper  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return (lapack_logical) 0;
     }
@@ -57,27 +57,27 @@ lapack_logical LAPACKE_ztb_nancheck( int matrix_layout, char uplo, char diag,
         /* Unit case, diagonal should be excluded from the check for NaN. */
         if( colmaj ) {
             if( upper ) {
-                return LAPACKE_zgb_nancheck( matrix_layout, n-1, n-1, 0, kd-1,
+                return API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n-1, n-1, 0, kd-1,
                                              &ab[ldab], ldab );
             } else {
-                return LAPACKE_zgb_nancheck( matrix_layout, n-1, n-1, kd-1, 0,
+                return API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n-1, n-1, kd-1, 0,
                                              &ab[1], ldab );
             }
         } else {
             if( upper ) {
-                return LAPACKE_zgb_nancheck( matrix_layout, n-1, n-1, 0, kd-1,
+                return API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n-1, n-1, 0, kd-1,
                                              &ab[1], ldab );
             } else {
-                return LAPACKE_zgb_nancheck( matrix_layout, n-1, n-1, kd-1, 0,
+                return API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n-1, n-1, kd-1, 0,
                                              &ab[ldab], ldab );
             }
         }
     } else {
         /* Non-unit case */
         if( upper ) {
-            return LAPACKE_zgb_nancheck( matrix_layout, n, n, 0, kd, ab, ldab );
+            return API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, 0, kd, ab, ldab );
         } else {
-            return LAPACKE_zgb_nancheck( matrix_layout, n, n, kd, 0, ab, ldab );
+            return API_SUFFIX(LAPACKE_zgb_nancheck)( matrix_layout, n, n, kd, 0, ab, ldab );
         }
     }
 }
diff --git a/LAPACKE/utils/lapacke_ztb_trans.c b/LAPACKE/utils/lapacke_ztb_trans.c
index 063f145404..5a300153ae 100644
--- a/LAPACKE/utils/lapacke_ztb_trans.c
+++ b/LAPACKE/utils/lapacke_ztb_trans.c
@@ -36,7 +36,7 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_ztb_trans( int matrix_layout, char uplo, char diag,
+void API_SUFFIX(LAPACKE_ztb_trans)( int matrix_layout, char uplo, char diag,
                         lapack_int n, lapack_int kd,
                         const lapack_complex_double *in, lapack_int ldin,
                         lapack_complex_double *out, lapack_int ldout )
@@ -46,12 +46,12 @@ void LAPACKE_ztb_trans( int matrix_layout, char uplo, char diag,
     if( in == NULL || out == NULL ) return;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    upper  = LAPACKE_lsame( uplo, 'u' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    upper  = API_SUFFIX(LAPACKE_lsame)( uplo, 'u' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !upper  && !LAPACKE_lsame( uplo, 'l' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !upper  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return;
     }
@@ -60,28 +60,28 @@ void LAPACKE_ztb_trans( int matrix_layout, char uplo, char diag,
         /* Unit case, diagonal excluded from transposition */
         if( colmaj ) {
             if( upper ) {
-                LAPACKE_zgb_trans( matrix_layout, n-1, n-1, 0, kd-1,
+                API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n-1, n-1, 0, kd-1,
                                    &in[ldin], ldin, &out[1], ldout );
             } else {
-                LAPACKE_zgb_trans( matrix_layout, n-1, n-1, kd-1, 0,
+                API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n-1, n-1, kd-1, 0,
                                    &in[1], ldin, &out[ldout], ldout );
             }
         } else {
             if( upper ) {
-                LAPACKE_zgb_trans( matrix_layout, n-1, n-1, 0, kd-1,
+                API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n-1, n-1, 0, kd-1,
                                    &in[1], ldin, &out[ldout], ldout );
             } else {
-                LAPACKE_zgb_trans( matrix_layout, n-1, n-1, kd-1, 0,
+                API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n-1, n-1, kd-1, 0,
                                    &in[ldin], ldin, &out[1], ldout );
             }
         }
     } else {
         /* Non-unit case */
         if( upper ) {
-            LAPACKE_zgb_trans( matrix_layout, n, n, 0, kd, in, ldin, out,
+            API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n, n, 0, kd, in, ldin, out,
                                ldout );
         } else {
-            LAPACKE_zgb_trans( matrix_layout, n, n, kd, 0, in, ldin, out,
+            API_SUFFIX(LAPACKE_zgb_trans)( matrix_layout, n, n, kd, 0, in, ldin, out,
                                ldout );
         }
     }
diff --git a/LAPACKE/utils/lapacke_ztf_nancheck.c b/LAPACKE/utils/lapacke_ztf_nancheck.c
index 2cfa86bf1c..d43e986350 100644
--- a/LAPACKE/utils/lapacke_ztf_nancheck.c
+++ b/LAPACKE/utils/lapacke_ztf_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_ztf_nancheck( int matrix_layout, char transr,
+lapack_logical API_SUFFIX(LAPACKE_ztf_nancheck)( int matrix_layout, char transr,
                                       char uplo, char diag,
                                       lapack_int n,
                                       const lapack_complex_double *a )
@@ -45,15 +45,15 @@ lapack_logical LAPACKE_ztf_nancheck( int matrix_layout, char transr,
     if( a == NULL ) return (lapack_logical) 0;
 
     rowmaj = (matrix_layout == LAPACK_ROW_MAJOR);
-    ntr    = LAPACKE_lsame( transr, 'n' );
-    lower  = LAPACKE_lsame( uplo,   'l' );
-    unit   = LAPACKE_lsame( diag,   'u' );
+    ntr    = API_SUFFIX(LAPACKE_lsame)( transr, 'n' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo,   'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag,   'u' );
 
     if( ( !rowmaj && ( matrix_layout != LAPACK_COL_MAJOR ) ) ||
-        ( !ntr    && !LAPACKE_lsame( transr, 't' )
-                  && !LAPACKE_lsame( transr, 'c' ) ) ||
-        ( !lower  && !LAPACKE_lsame( uplo,   'u' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag,   'n' ) ) ) {
+        ( !ntr    && !API_SUFFIX(LAPACKE_lsame)( transr, 't' )
+                  && !API_SUFFIX(LAPACKE_lsame)( transr, 'c' ) ) ||
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo,   'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag,   'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return (lapack_logical) 0;
     }
@@ -75,18 +75,18 @@ lapack_logical LAPACKE_ztf_nancheck( int matrix_layout, char transr,
             if( ( rowmaj || ntr ) && !( rowmaj && ntr ) ) {
                 /* N is odd and ( TRANSR = 'N' .XOR. ROWMAJOR) */
                 if( lower ) {
-                    return LAPACKE_ztr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                    return API_SUFFIX(LAPACKE_ztr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  n1, &a[0], n )
-                        || LAPACKE_zge_nancheck( LAPACK_ROW_MAJOR, n2, n1,
+                        || API_SUFFIX(LAPACKE_zge_nancheck)( LAPACK_ROW_MAJOR, n2, n1,
                                                  &a[n1], n )
-                        || LAPACKE_ztr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                        || API_SUFFIX(LAPACKE_ztr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  n2, &a[n], n );
                 } else {
-                    return LAPACKE_ztr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                    return API_SUFFIX(LAPACKE_ztr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  n1, &a[n2], n )
-                        || LAPACKE_zge_nancheck( LAPACK_ROW_MAJOR, n1, n2,
+                        || API_SUFFIX(LAPACKE_zge_nancheck)( LAPACK_ROW_MAJOR, n1, n2,
                                                  &a[0], n )
-                        || LAPACKE_ztr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                        || API_SUFFIX(LAPACKE_ztr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  n2, &a[n1], n );
                 }
             } else {
@@ -94,18 +94,18 @@ lapack_logical LAPACKE_ztf_nancheck( int matrix_layout, char transr,
                  * ( ( TRANSR = 'C' || TRANSR = 'T' ) .XOR. COLMAJOR )
                  */
                 if( lower ) {
-                    return LAPACKE_ztr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                    return API_SUFFIX(LAPACKE_ztr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  n1, &a[0], n1 )
-                        || LAPACKE_zge_nancheck( LAPACK_ROW_MAJOR, n1, n2,
+                        || API_SUFFIX(LAPACKE_zge_nancheck)( LAPACK_ROW_MAJOR, n1, n2,
                                                  &a[1], n1 )
-                        || LAPACKE_ztr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                        || API_SUFFIX(LAPACKE_ztr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  n2, &a[1], n1 );
                 } else {
-                    return LAPACKE_ztr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                    return API_SUFFIX(LAPACKE_ztr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  n1, &a[(size_t)n2*n2], n2 )
-                        || LAPACKE_zge_nancheck( LAPACK_ROW_MAJOR, n2, n1,
+                        || API_SUFFIX(LAPACKE_zge_nancheck)( LAPACK_ROW_MAJOR, n2, n1,
                                                  &a[0], n2 )
-                        || LAPACKE_ztr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                        || API_SUFFIX(LAPACKE_ztr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  n2, &a[(size_t)n1*n2], n2 );
                 }
             }
@@ -115,36 +115,36 @@ lapack_logical LAPACKE_ztf_nancheck( int matrix_layout, char transr,
             if( ( rowmaj || ntr ) && !( rowmaj && ntr ) ) {
                 /* N is even and ( TRANSR = 'N' .XOR. ROWMAJOR) */
                 if( lower ) {
-                    return LAPACKE_ztr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                    return API_SUFFIX(LAPACKE_ztr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  k, &a[1], n+1 )
-                        || LAPACKE_zge_nancheck( LAPACK_ROW_MAJOR, k, k,
+                        || API_SUFFIX(LAPACKE_zge_nancheck)( LAPACK_ROW_MAJOR, k, k,
                                                  &a[k+1], n+1 )
-                        || LAPACKE_ztr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                        || API_SUFFIX(LAPACKE_ztr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  k, &a[0], n+1 );
                 } else {
-                    return LAPACKE_ztr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                    return API_SUFFIX(LAPACKE_ztr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  k, &a[k+1], n+1 )
-                        || LAPACKE_zge_nancheck( LAPACK_ROW_MAJOR, k, k,
+                        || API_SUFFIX(LAPACKE_zge_nancheck)( LAPACK_ROW_MAJOR, k, k,
                                                  &a[0], n+1 )
-                        || LAPACKE_ztr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                        || API_SUFFIX(LAPACKE_ztr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  k, &a[k], n+1 );
                 }
             } else {
                 /* N is even and
                    ( ( TRANSR = 'C' || TRANSR = 'T' ) .XOR. COLMAJOR ) */
                 if( lower ) {
-                    return LAPACKE_ztr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                    return API_SUFFIX(LAPACKE_ztr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  k, &a[k], k )
-                        || LAPACKE_zge_nancheck( LAPACK_ROW_MAJOR, k, k,
+                        || API_SUFFIX(LAPACKE_zge_nancheck)( LAPACK_ROW_MAJOR, k, k,
                                                  &a[(size_t)k*(k+1)], k )
-                        || LAPACKE_ztr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                        || API_SUFFIX(LAPACKE_ztr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  k, &a[0], k );
                 } else {
-                    return LAPACKE_ztr_nancheck( LAPACK_ROW_MAJOR, 'u', 'u',
+                    return API_SUFFIX(LAPACKE_ztr_nancheck)( LAPACK_ROW_MAJOR, 'u', 'u',
                                                  k, &a[(size_t)k*(k+1)], k )
-                        || LAPACKE_zge_nancheck( LAPACK_ROW_MAJOR, k, k,
+                        || API_SUFFIX(LAPACKE_zge_nancheck)( LAPACK_ROW_MAJOR, k, k,
                                                  &a[0], k )
-                        || LAPACKE_ztr_nancheck( LAPACK_ROW_MAJOR, 'l', 'u',
+                        || API_SUFFIX(LAPACKE_ztr_nancheck)( LAPACK_ROW_MAJOR, 'l', 'u',
                                                  k, &a[(size_t)k*k], k );
                 }
             }
@@ -152,6 +152,6 @@ lapack_logical LAPACKE_ztf_nancheck( int matrix_layout, char transr,
     } else {
         /* Non-unit case - just check whole array for NaNs. */
         len = n*(n+1)/2;
-        return LAPACKE_zge_nancheck( LAPACK_COL_MAJOR, len, 1, a, len );
+        return API_SUFFIX(LAPACKE_zge_nancheck)( LAPACK_COL_MAJOR, len, 1, a, len );
     }
 }
diff --git a/LAPACKE/utils/lapacke_ztf_trans.c b/LAPACKE/utils/lapacke_ztf_trans.c
index 6bc6fcc48d..8a8bf64884 100644
--- a/LAPACKE/utils/lapacke_ztf_trans.c
+++ b/LAPACKE/utils/lapacke_ztf_trans.c
@@ -37,7 +37,7 @@
  * This functions does copy diagonal for both unit and non-unit cases.
  */
 
-void LAPACKE_ztf_trans( int matrix_layout, char transr, char uplo, char diag,
+void API_SUFFIX(LAPACKE_ztf_trans)( int matrix_layout, char transr, char uplo, char diag,
                         lapack_int n, const lapack_complex_double *in,
                         lapack_complex_double *out )
 {
@@ -47,15 +47,15 @@ void LAPACKE_ztf_trans( int matrix_layout, char transr, char uplo, char diag,
     if( in == NULL || out == NULL ) return ;
 
     rowmaj = (matrix_layout == LAPACK_ROW_MAJOR);
-    ntr    = LAPACKE_lsame( transr, 'n' );
-    lower  = LAPACKE_lsame( uplo,   'l' );
-    unit   = LAPACKE_lsame( diag,   'u' );
+    ntr    = API_SUFFIX(LAPACKE_lsame)( transr, 'n' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo,   'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag,   'u' );
 
     if( ( !rowmaj && ( matrix_layout != LAPACK_COL_MAJOR ) ) ||
-        ( !ntr    && !LAPACKE_lsame( transr, 't' ) &&
-                     !LAPACKE_lsame( transr, 'c' ) ) ||
-        ( !lower  && !LAPACKE_lsame( uplo,   'u' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag,   'n' ) ) ) {
+        ( !ntr    && !API_SUFFIX(LAPACKE_lsame)( transr, 't' ) &&
+                     !API_SUFFIX(LAPACKE_lsame)( transr, 'c' ) ) ||
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo,   'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag,   'n' ) ) ) {
         /* Just exit if input parameters are wrong */
         return;
     }
@@ -81,8 +81,8 @@ void LAPACKE_ztf_trans( int matrix_layout, char transr, char uplo, char diag,
 
     /* Perform conversion: */
     if( rowmaj ) {
-        LAPACKE_zge_trans( LAPACK_ROW_MAJOR, row, col, in, col, out, row );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_ROW_MAJOR, row, col, in, col, out, row );
     } else {
-        LAPACKE_zge_trans( LAPACK_COL_MAJOR, row, col, in, row, out, col );
+        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, row, col, in, row, out, col );
     }
 }
diff --git a/LAPACKE/utils/lapacke_ztp_nancheck.c b/LAPACKE/utils/lapacke_ztp_nancheck.c
index dc347eaa5a..cd56224d88 100644
--- a/LAPACKE/utils/lapacke_ztp_nancheck.c
+++ b/LAPACKE/utils/lapacke_ztp_nancheck.c
@@ -36,7 +36,7 @@
  * check 1d array for NaNs. It doesn't depend upon uplo or matrix_layout.
  */
 
-lapack_logical LAPACKE_ztp_nancheck( int matrix_layout, char uplo, char diag,
+lapack_logical API_SUFFIX(LAPACKE_ztp_nancheck)( int matrix_layout, char uplo, char diag,
                                       lapack_int n,
                                       const lapack_complex_double *ap )
 {
@@ -46,12 +46,12 @@ lapack_logical LAPACKE_ztp_nancheck( int matrix_layout, char uplo, char diag,
     if( ap == NULL ) return (lapack_logical) 0;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    upper  = LAPACKE_lsame( uplo, 'u' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    upper  = API_SUFFIX(LAPACKE_lsame)( uplo, 'u' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !upper  && !LAPACKE_lsame( uplo, 'l' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !upper  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return (lapack_logical) 0;
     }
@@ -65,11 +65,11 @@ lapack_logical LAPACKE_ztp_nancheck( int matrix_layout, char uplo, char diag,
          */
         if( ( colmaj || upper ) && !( colmaj && upper ) ) {
             for( i = 1; i < n; i++ )
-                if( LAPACKE_z_nancheck( i, &ap[ ((size_t)i+1)*i/2 ], 1 ) )
+                if( API_SUFFIX(LAPACKE_z_nancheck)( i, &ap[ ((size_t)i+1)*i/2 ], 1 ) )
                     return (lapack_logical) 1;
         } else {
             for( i = 0; i < n-1; i++ )
-                if( LAPACKE_z_nancheck( n-i-1,
+                if( API_SUFFIX(LAPACKE_z_nancheck)( n-i-1,
                     &ap[ (size_t)i+1 + i*((size_t)2*n-i+1)/2 ], 1 ) )
                     return (lapack_logical) 1;
         }
@@ -77,6 +77,6 @@ lapack_logical LAPACKE_ztp_nancheck( int matrix_layout, char uplo, char diag,
     } else {
         /* Non-unit case - just check whole array for NaNs. */
         len = n*(n+1)/2;
-        return LAPACKE_z_nancheck( len, ap, 1 );
+        return API_SUFFIX(LAPACKE_z_nancheck)( len, ap, 1 );
     }
 }
diff --git a/LAPACKE/utils/lapacke_ztp_trans.c b/LAPACKE/utils/lapacke_ztp_trans.c
index 47b4851b65..ea19b6585c 100644
--- a/LAPACKE/utils/lapacke_ztp_trans.c
+++ b/LAPACKE/utils/lapacke_ztp_trans.c
@@ -36,7 +36,7 @@
  * column-major(Fortran) layout or vice versa.
  */
 
-void LAPACKE_ztp_trans( int matrix_layout, char uplo, char diag,
+void API_SUFFIX(LAPACKE_ztp_trans)( int matrix_layout, char uplo, char diag,
                         lapack_int n, const lapack_complex_double *in,
                         lapack_complex_double *out )
 {
@@ -46,12 +46,12 @@ void LAPACKE_ztp_trans( int matrix_layout, char uplo, char diag,
     if( in == NULL || out == NULL ) return ;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    upper  = LAPACKE_lsame( uplo, 'u' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    upper  = API_SUFFIX(LAPACKE_lsame)( uplo, 'u' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !upper  && !LAPACKE_lsame( uplo, 'l' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !upper  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'l' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return;
     }
diff --git a/LAPACKE/utils/lapacke_ztr_nancheck.c b/LAPACKE/utils/lapacke_ztr_nancheck.c
index 7058a33ed6..5c870a6461 100644
--- a/LAPACKE/utils/lapacke_ztr_nancheck.c
+++ b/LAPACKE/utils/lapacke_ztr_nancheck.c
@@ -33,7 +33,7 @@
 
 /* Check a matrix for NaN entries. */
 
-lapack_logical LAPACKE_ztr_nancheck( int matrix_layout, char uplo, char diag,
+lapack_logical API_SUFFIX(LAPACKE_ztr_nancheck)( int matrix_layout, char uplo, char diag,
                                       lapack_int n,
                                       const lapack_complex_double *a,
                                       lapack_int lda )
@@ -44,12 +44,12 @@ lapack_logical LAPACKE_ztr_nancheck( int matrix_layout, char uplo, char diag,
     if( a == NULL ) return (lapack_logical) 0;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    lower  = LAPACKE_lsame( uplo, 'l' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo, 'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !lower  && !LAPACKE_lsame( uplo, 'u' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return (lapack_logical) 0;
     }
diff --git a/LAPACKE/utils/lapacke_ztr_trans.c b/LAPACKE/utils/lapacke_ztr_trans.c
index e3042bfa52..f126000b03 100644
--- a/LAPACKE/utils/lapacke_ztr_trans.c
+++ b/LAPACKE/utils/lapacke_ztr_trans.c
@@ -36,7 +36,7 @@
  * layout or vice versa.
  */
 
-void LAPACKE_ztr_trans( int matrix_layout, char uplo, char diag, lapack_int n,
+void API_SUFFIX(LAPACKE_ztr_trans)( int matrix_layout, char uplo, char diag, lapack_int n,
                         const lapack_complex_double *in, lapack_int ldin,
                         lapack_complex_double *out, lapack_int ldout )
 {
@@ -46,12 +46,12 @@ void LAPACKE_ztr_trans( int matrix_layout, char uplo, char diag, lapack_int n,
     if( in == NULL || out == NULL ) return ;
 
     colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
-    lower  = LAPACKE_lsame( uplo, 'l' );
-    unit   = LAPACKE_lsame( diag, 'u' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo, 'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
 
     if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
-        ( !lower  && !LAPACKE_lsame( uplo, 'u' ) ) ||
-        ( !unit   && !LAPACKE_lsame( diag, 'n' ) ) ) {
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
         /* Just exit if any of input parameters are wrong */
         return;
     }
diff --git a/LAPACKE/utils/lapacke_ztz_nancheck.c b/LAPACKE/utils/lapacke_ztz_nancheck.c
new file mode 100644
index 0000000000..f316cf13d4
--- /dev/null
+++ b/LAPACKE/utils/lapacke_ztz_nancheck.c
@@ -0,0 +1,144 @@
+/*****************************************************************************
+  Copyright (c) 2022, 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 C interface to LAPACK utility function
+* Author: Simon Märtens
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+/*****************************************************************************
+  Check a trapezoidal matrix for NaN entries. The shape of the trapezoidal
+  matrix is determined by the arguments `direct` and `uplo`. `Direct` chooses
+  the diagonal which shall be considered and `uplo` tells us whether we use the
+  upper or lower part of the matrix with respect to the chosen diagonal.
+
+      Diagonals 'F' (front / forward) and 'B' (back / backward):
+
+        A = ( F       )           A = ( F     B       )
+            (    F    )               (    F     B    )
+            ( B     F )               (       F     B )
+            (    B    )
+            (       B )
+
+      direct = 'F', uplo = 'L':
+
+        A = ( *       )           A = ( *             )
+            ( *  *    )               ( *  *          )
+            ( *  *  * )               ( *  *  *       )
+            ( *  *  * )
+            ( *  *  * )
+
+      direct = 'F', uplo = 'U':
+
+        A = ( *  *  * )           A = ( *  *  *  *  * )
+            (    *  * )               (    *  *  *  * )
+            (       * )               (       *  *  * )
+            (         )
+            (         )
+
+      direct = 'B', uplo = 'L':
+
+        A = (         )           A = ( *  *  *       )
+            (         )               ( *  *  *  *    )
+            ( *       )               ( *  *  *  *  * )
+            ( *  *    )
+            ( *  *  * )
+
+      direct = 'B', uplo = 'U':
+
+        A = ( *  *  * )           A = (       *  *  * )
+            ( *  *  * )               (          *  * )
+            ( *  *  * )               (             * )
+            (    *  * )
+            (       * )
+
+*****************************************************************************/
+
+lapack_logical API_SUFFIX(LAPACKE_ztz_nancheck)( int matrix_layout, char direct, char uplo,
+                                     char diag, lapack_int m, lapack_int n,
+                                     const lapack_complex_double *a,
+                                     lapack_int lda )
+{
+    lapack_logical colmaj, front, lower, unit;
+
+    if( a == NULL ) return (lapack_logical) 0;
+
+    colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
+    front  = API_SUFFIX(LAPACKE_lsame)( direct, 'f' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo, 'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
+
+    if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
+        ( !front  && !API_SUFFIX(LAPACKE_lsame)( direct, 'b' ) ) ||
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
+        /* Just exit if any of input parameters are wrong */
+        return (lapack_logical) 0;
+    }
+
+    /* Initial offsets and sizes of triangular and rectangular parts */
+    lapack_int tri_offset = 0;
+    lapack_int tri_n = MIN(m,n);
+    lapack_int rect_offset = -1;
+    lapack_int rect_m = ( m > n ) ? m - n : m;
+    lapack_int rect_n = ( n > m ) ? n - m : n;
+
+    /* Fix offsets depending on the shape of the matrix */
+    if( front ) {
+        if( lower && m > n ) {
+            rect_offset = tri_n * ( !colmaj ? lda : 1 );
+        } else if( !lower && n > m ) {
+            rect_offset = tri_n * ( colmaj ? lda : 1 );
+        }
+    } else {
+        if( m > n ) {
+            tri_offset = rect_m * ( !colmaj ? lda : 1 );
+            if( !lower ) {
+                rect_offset = 0;
+            }
+        } else if( n > m ) {
+            tri_offset = rect_n * ( colmaj ? lda : 1 );
+            if( lower ) {
+                rect_offset = 0;
+            }
+        }
+    }
+
+    /* Check rectangular part */
+    if( rect_offset >= 0 ) {
+        if( API_SUFFIX(LAPACKE_zge_nancheck)( matrix_layout, rect_m, rect_n,
+                                  &a[rect_offset], lda) ) {
+            return (lapack_logical) 1;
+        }
+    }
+
+    /* Check triangular part */
+    return API_SUFFIX(LAPACKE_ztr_nancheck)( matrix_layout, uplo, diag, tri_n,
+                                 &a[tri_offset], lda );
+}
diff --git a/LAPACKE/utils/lapacke_ztz_trans.c b/LAPACKE/utils/lapacke_ztz_trans.c
new file mode 100644
index 0000000000..1bb141b477
--- /dev/null
+++ b/LAPACKE/utils/lapacke_ztz_trans.c
@@ -0,0 +1,153 @@
+/*****************************************************************************
+  Copyright (c) 2022, 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 C interface to LAPACK utility function
+* Author: Simon Märtens
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+/*****************************************************************************
+  Converts input triangular matrix from row-major(C) to column-major(Fortran)
+  layout or vice versa. The shape of the trapezoidal matrix is determined by
+  the arguments `direct` and `uplo`. `Direct` chooses the diagonal which shall
+  be considered and `uplo` tells us whether we use the upper or lower part of
+  the matrix with respect to the chosen diagonal.
+
+      Diagonals 'F' (front / forward) and 'B' (back / backward):
+
+        A = ( F       )           A = ( F     B       )
+            (    F    )               (    F     B    )
+            ( B     F )               (       F     B )
+            (    B    )
+            (       B )
+
+      direct = 'F', uplo = 'L':
+
+        A = ( *       )           A = ( *             )
+            ( *  *    )               ( *  *          )
+            ( *  *  * )               ( *  *  *       )
+            ( *  *  * )
+            ( *  *  * )
+
+      direct = 'F', uplo = 'U':
+
+        A = ( *  *  * )           A = ( *  *  *  *  * )
+            (    *  * )               (    *  *  *  * )
+            (       * )               (       *  *  * )
+            (         )
+            (         )
+
+      direct = 'B', uplo = 'L':
+
+        A = (         )           A = ( *  *  *       )
+            (         )               ( *  *  *  *    )
+            ( *       )               ( *  *  *  *  * )
+            ( *  *    )
+            ( *  *  * )
+
+      direct = 'B', uplo = 'U':
+
+        A = ( *  *  * )           A = (       *  *  * )
+            ( *  *  * )               (          *  * )
+            ( *  *  * )               (             * )
+            (    *  * )
+            (       * )
+
+*****************************************************************************/
+
+void API_SUFFIX(LAPACKE_ztz_trans)( int matrix_layout, char direct, char uplo,
+                        char diag, lapack_int m, lapack_int n,
+                        const lapack_complex_double *in, lapack_int ldin,
+                        lapack_complex_double *out, lapack_int ldout )
+{
+    lapack_logical colmaj, front, lower, unit;
+
+    if( in == NULL || out == NULL ) return ;
+
+    colmaj = ( matrix_layout == LAPACK_COL_MAJOR );
+    front  = API_SUFFIX(LAPACKE_lsame)( direct, 'f' );
+    lower  = API_SUFFIX(LAPACKE_lsame)( uplo, 'l' );
+    unit   = API_SUFFIX(LAPACKE_lsame)( diag, 'u' );
+
+    if( ( !colmaj && ( matrix_layout != LAPACK_ROW_MAJOR ) ) ||
+        ( !front  && !API_SUFFIX(LAPACKE_lsame)( direct, 'b' ) ) ||
+        ( !lower  && !API_SUFFIX(LAPACKE_lsame)( uplo, 'u' ) ) ||
+        ( !unit   && !API_SUFFIX(LAPACKE_lsame)( diag, 'n' ) ) ) {
+        /* Just exit if any of input parameters are wrong */
+        return;
+    }
+
+    /* Initial offsets and sizes of triangular and rectangular parts */
+    lapack_int tri_in_offset = 0;
+    lapack_int tri_out_offset = 0;
+    lapack_int tri_n = MIN(m,n);
+    lapack_int rect_in_offset = -1;
+    lapack_int rect_out_offset = -1;
+    lapack_int rect_m = ( m > n ) ? m - n : m;
+    lapack_int rect_n = ( n > m ) ? n - m : n;
+
+    /* Fix offsets depending on the shape of the matrix */
+    if( front ) {
+        if( lower && m > n ) {
+            rect_in_offset = tri_n * ( !colmaj ? ldin : 1 );
+            rect_out_offset = tri_n * ( colmaj ? ldout : 1 );
+        } else if( !lower && n > m ) {
+            rect_in_offset = tri_n * ( colmaj ? ldin : 1 );
+            rect_out_offset = tri_n * ( !colmaj ? ldout : 1 );
+        }
+    } else {
+        if( m > n ) {
+            tri_in_offset = rect_m * ( !colmaj ? ldin : 1 );
+            tri_out_offset = rect_m * ( colmaj ? ldout : 1 );
+            if( !lower ) {
+                rect_in_offset = 0;
+                rect_out_offset = 0;
+            }
+        } else if( n > m ) {
+            tri_in_offset = rect_n * ( colmaj ? ldin : 1 );
+            tri_out_offset = rect_n * ( !colmaj ? ldout : 1 );
+            if( lower ) {
+                rect_in_offset = 0;
+                rect_out_offset = 0;
+            }
+        }
+    }
+
+    /* Copy & transpose rectangular part */
+    if( rect_in_offset >= 0 && rect_out_offset >= 0 ) {
+        API_SUFFIX(LAPACKE_zge_trans)( matrix_layout, rect_m, rect_n,
+                           &in[rect_in_offset], ldin,
+                           &out[rect_out_offset], ldout );
+    }
+
+    /* Copy & transpose triangular part */
+    API_SUFFIX(LAPACKE_ztr_trans)( matrix_layout, uplo, diag, tri_n,
+                       &in[tri_in_offset], ldin,
+                       &out[tri_out_offset], ldout );
+}
diff --git a/LICENSE b/LICENSE
index 525d6e35f4..8d59524fac 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,9 +1,9 @@
-Copyright (c) 1992-2021 The University of Tennessee and The University
+Copyright (c) 1992-2025 The University of Tennessee and The University
                         of Tennessee Research Foundation.  All rights
                         reserved.
-Copyright (c) 2000-2021 The University of California Berkeley. All
+Copyright (c) 2000-2025 The University of California Berkeley. All
                         rights reserved.
-Copyright (c) 2006-2021 The University of Colorado Denver.  All rights
+Copyright (c) 2006-2025 The University of Colorado Denver.  All rights
                         reserved.
 
 $COPYRIGHT$
diff --git a/Makefile b/Makefile
index 28ef97d8e3..b04bfbc930 100644
--- a/Makefile
+++ b/Makefile
@@ -115,25 +115,35 @@ cblas_example: cblaslib blaslib
 lapacke_example: lapackelib lapacklib blaslib
 	$(MAKE) -C LAPACKE lapacke_example
 
+# doxygen 1.9.7 converts --- to &mdash; but than has a bug that
+# encodes that as &amp;mdash; on some pages. Use perl to fix it.
 .PHONY: html
 html:
-	@echo "LAPACK HTML PAGES GENERATION with Doxygen"
-	( cat DOCS/Doxyfile ; echo "OUTPUT_DIRECTORY=$(DOCSDIR)" ) | doxygen -
+	@echo "LAPACK HTML page generation with Doxygen"
+	(cat DOCS/Doxyfile; \
+	    echo "OUTPUT_DIRECTORY=$(DOCSDIR)") | doxygen -
+	grep '&amp;mdash' -r $(DOCSDIR)/explore-html -l | xargs perl -pi -e 's/&amp;mdash;/&mdash;/g'
 	@echo "=================="
-	@echo "LAPACK HTML PAGES GENERATED in DOCS/explore-html"
-	@echo "Usage: open DOCS/explore-html/index.html"
+	@echo "LAPACK HTML pages generated in $(DOCSDIR)/explore-html"
+	@echo "Usage: open $(DOCSDIR)/explore-html/index.html"
 	@echo "Online version available at http://www.netlib.org/lapack/explore-html/"
 	@echo "=================="
 
+# Use same Doxyfile for man, and override the few options that change.
 .PHONY: man
 man:
-	@echo "LAPACK MAN PAGES GENERATION with Doxygen"
-	@echo "OUTPUT_DIRECTORY=$(DOCSDIR)"
-	( cat DOCS/Doxyfile_man ; echo "OUTPUT_DIRECTORY=$(DOCSDIR)" ) | doxygen -
+	@echo "LAPACK man page generation with Doxygen"
+	(cat DOCS/Doxyfile; \
+	    echo "OUTPUT_DIRECTORY = $(DOCSDIR)"; \
+	    echo "GENERATE_HTML    = NO"; \
+	    echo "GENERATE_MAN     = YES"; \
+	    echo "CALL_GRAPH       = NO"; \
+	    echo "CALLER_GRAPH     = NO"; \
+	    echo "INLINE_SOURCES   = NO") | doxygen -
 	@echo "=================="
-	@echo "LAPACK MAN PAGES GENERATED in DOCS/man"
+	@echo "LAPACK man pages generated in DOCS/man"
 	@echo "Set your MANPATH env variable accordingly"
-	@echo "Usage: man dgetrf.f"
+	@echo "Usage: man dgetrf"
 	@echo "=================="
 
 .PHONY: clean cleanobj cleanlib cleanexe cleantest
diff --git a/README.md b/README.md
index 009293fc83..cfd714e3d6 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 [![Appveyor](https://ci.appveyor.com/api/projects/status/bh38iin398msrbtr?svg=true)](https://ci.appveyor.com/project/langou/lapack/)
 [![codecov](https://codecov.io/gh/Reference-LAPACK/lapack/branch/master/graph/badge.svg)](https://codecov.io/gh/Reference-LAPACK/lapack)
 [![Packaging status](https://repology.org/badge/tiny-repos/lapack.svg)](https://repology.org/metapackage/lapack/versions)
-
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/Reference-LAPACK/lapack/badge)](https://securityscorecards.dev/viewer/?uri=github.com/Reference-LAPACK/lapack)
 
 * VERSION 1.0   :  February 29, 1992
 * VERSION 1.0a  :  June 30, 1992
@@ -35,6 +35,10 @@
 * VERSION 3.9.0 : November 2019
 * VERSION 3.9.1 : April 2021
 * VERSION 3.10.0 : June 2021
+* VERSION 3.10.1 : April 2022
+* VERSION 3.11.0 : November 2022
+* VERSION 3.12.0 : November 2023
+* VERSION 3.12.1 : January 2025
 
 LAPACK is a library of Fortran subroutines for solving the most commonly
 occurring problems in numerical linear algebra.
@@ -76,10 +80,18 @@ CBLAS, a C interface to the BLAS, and (5) LAPACKE, a C interface to LAPACK.
    ```sh
    mkdir build
    cd build
-   cmake -DCMAKE_INSTALL_LIBDIR=$HOME/.local/lapack ..
+   cmake -DCMAKE_INSTALL_PREFIX=$HOME/.local/lapack ..
    cmake --build . -j --target install
    ```
-
+ - LAPACK can be built and installed using [vcpkg](https://github.com/Microsoft/vcpkg/) dependency manager:
+   ```sh
+   git clone https://github.com/Microsoft/vcpkg.git
+   cd vcpkg
+   ./bootstrap-vcpkg.sh  # ./bootstrap-vcpkg.bat for Windows
+   ./vcpkg integrate install
+   ./vcpkg install lapack
+   ```
+   The lapack port in vcpkg is kept up to date by Microsoft team members and community contributors. If the version is out of date, please [create an issue or pull request](https://github.com/Microsoft/vcpkg) on the vcpkg repository.
 
 ## User Support
 
@@ -96,8 +108,8 @@ Please see as well the [GitHub issue tracker](https://github.com/Reference-LAPAC
 For further information on LAPACK please read our [FAQ](http://www.netlib.org/lapack/faq.html)
 and [Users' Guide](http://www.netlib.org/lapack/lug/lapack_lug.html).
 A [user forum](http://icl.cs.utk.edu/lapack-forum/) and specific information for
-[running LAPACK under Windows](http://icl.cs.utk.edu/lapack-for-windows/lapack/).
-is also available to help you with the LAPACK library.
+[running LAPACK under Windows](http://icl.cs.utk.edu/lapack-for-windows/lapack/)
+are also available to help you with the LAPACK library.
 
 
 ## Testing
diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
index ada0325f93..bfe7475638 100644
--- a/SRC/CMakeLists.txt
+++ b/SRC/CMakeLists.txt
@@ -2,6 +2,7 @@
 #  This is the makefile to create a library for LAPACK.
 #  The files are organized as follows:
 
+#       ALLMOD  -- Part of ALLAUX
 #       ALLAUX  -- Auxiliary routines called from all precisions
 #       SCLAUX  -- Auxiliary routines called from single precision
 #       DZLAUX  -- Auxiliary routines called from double precision
@@ -35,14 +36,17 @@
 #
 #######################################################################
 
+set(CONSTMOD la_constants.f90)
+
+set(NANMOD la_xisnan.F90)
+
 set(ALLAUX ilaenv.f ilaenv2stage.f ieeeck.f lsamen.f iparmq.f iparam2stage.F
-   ilaprec.f ilatrans.f ilauplo.f iladiag.f chla_transtype.f la_xisnan.F90
+   ilaprec.f ilatrans.f ilauplo.f iladiag.f chla_transtype.f
    ../INSTALL/ilaver.f ../INSTALL/lsame.f xerbla.f xerbla_array.f
    ../INSTALL/slamch.f)
 
 set(SCLAUX
-   la_constants.f90
-   sbdsdc.f
+   sbdsvdx.f sbdsdc.f
    sbdsqr.f sdisna.f slabad.f slacpy.f sladiv.f slae2.f  slaebz.f
    slaed0.f slaed1.f slaed2.f slaed3.f slaed4.f slaed5.f slaed6.f
    slaed7.f slaed8.f slaed9.f slaeda.f slaev2.f slagtf.f
@@ -55,14 +59,15 @@ set(SCLAUX
    slasd7.f slasd8.f slasda.f slasdq.f slasdt.f
    slaset.f slasq1.f slasq2.f slasq3.f slasq4.f slasq5.f slasq6.f
    slasr.f  slasrt.f slassq.f90 slasv2.f spttrf.f sstebz.f sstedc.f
-   ssteqr.f ssterf.f slaisnan.f sisnan.f
+   sstein.f ssteqr.f ssterf.f sstevx.f
    slartgp.f slartgs.f ../INSTALL/sroundup_lwork.f
    ${SECOND_SRC})
 
 set(DZLAUX
-   la_constants.f90
-   dbdsdc.f
-   dbdsqr.f ddisna.f dlabad.f dlacpy.f dladiv.f dlae2.f  dlaebz.f
+   dbdsdc.f dbdsvdx.f
+   dbdsqr.f ddisna.f
+   disnan.f
+   dlabad.f dlacpy.f dladiv.f dlae2.f  dlaebz.f
    dlaed0.f dlaed1.f dlaed2.f dlaed3.f dlaed4.f dlaed5.f dlaed6.f
    dlaed7.f dlaed8.f dlaed9.f dlaeda.f dlaev2.f dlagtf.f
    dlagts.f dlamrg.f dlanst.f
@@ -73,20 +78,21 @@ set(DZLAUX
    dlasd0.f dlasd1.f dlasd2.f dlasd3.f dlasd4.f dlasd5.f dlasd6.f
    dlasd7.f dlasd8.f dlasda.f dlasdq.f dlasdt.f
    dlaset.f dlasq1.f dlasq2.f dlasq3.f dlasq4.f dlasq5.f dlasq6.f
-   dlasr.f  dlasrt.f dlassq.f90 dlasv2.f dpttrf.f dstebz.f dstedc.f
-   dsteqr.f dsterf.f dlaisnan.f disnan.f
+   dlasr.f  dlasrt.f dlassq.f90 dlasv2.f dlaisnan.f
+   dpttrf.f
+   dstebz.f dstedc.f dstein.f dsteqr.f dsterf.f dstevx.f
    dlartgp.f dlartgs.f ../INSTALL/droundup_lwork.f
    ../INSTALL/dlamch.f ${DSECOND_SRC})
 
 set(SLASRC
-   sbdsvdx.f sgbbrd.f sgbcon.f sgbequ.f sgbrfs.f sgbsv.f
+   sgbbrd.f sgbcon.f sgbequ.f sgbrfs.f sgbsv.f
    sgbsvx.f sgbtf2.f sgbtrf.f sgbtrs.f sgebak.f sgebal.f sgebd2.f
    sgebrd.f sgecon.f sgeequ.f sgees.f  sgeesx.f sgeev.f  sgeevx.f
    sgehd2.f sgehrd.f sgelq2.f sgelqf.f
-   sgels.f  sgelsd.f sgelss.f sgelsy.f sgeql2.f sgeqlf.f
-   sgeqp3.f sgeqr2.f sgeqr2p.f sgeqrf.f sgeqrfp.f sgerfs.f sgerq2.f sgerqf.f
+   sgels.f  sgelst.f  sgelsd.f sgelss.f sgelsy.f sgeql2.f sgeqlf.f
+   sgeqp3.f sgeqp3rk.f sgeqr2.f sgeqr2p.f sgeqrf.f sgeqrfp.f sgerfs.f sgerq2.f sgerqf.f
    sgesc2.f sgesdd.f sgesv.f  sgesvd.f sgesvdx.f sgesvx.f sgetc2.f sgetf2.f
-   sgetrf2.f sgetri.f
+   sgetri.f
    sggbak.f sggbal.f
    sgges.f  sgges3.f sggesx.f sggev.f  sggev3.f sggevx.f
    sggglm.f sgghrd.f sgghd3.f sgglse.f sggqrf.f
@@ -99,14 +105,14 @@ set(SLASRC
    slangb.f slange.f slangt.f slanhs.f slansb.f slansp.f
    slansy.f slantb.f slantp.f slantr.f slanv2.f
    slapll.f slapmt.f
-   slaqgb.f slaqge.f slaqp2.f slaqps.f slaqsb.f slaqsp.f slaqsy.f
+   slaqgb.f slaqge.f slaqp2.f slaqps.f slaqp2rk.f slaqp3rk.f slaqsb.f slaqsp.f slaqsy.f
    slaqr0.f slaqr1.f slaqr2.f slaqr3.f slaqr4.f slaqr5.f
    slaqtr.f slar1v.f slar2v.f ilaslr.f ilaslc.f
-   slarf.f  slarfb.f slarfb_gett.f slarfg.f slarfgp.f slarft.f slarfx.f slarfy.f slargv.f
-   slarrv.f slartv.f
-   slarz.f  slarzb.f slarzt.f slaswp.f slasy2.f 
+   slarf.f  slarf1f.f slarf1l.f slarfb.f slarfb_gett.f slarfg.f slarfgp.f slarft.f slarft_lvl2.f slarfx.f slarfy.f
+   slargv.f slarmm.f slarrv.f slartv.f
+   slarz.f  slarzb.f slarzt.f slasy2.f
    slasyf.f slasyf_rook.f slasyf_rk.f slasyf_aa.f
-   slatbs.f slatdf.f slatps.f slatrd.f slatrs.f slatrz.f
+   slatbs.f slatdf.f slatps.f slatrd.f slatrs.f slatrs3.f slatrz.f
    slauu2.f slauum.f sopgtr.f sopmtr.f sorg2l.f sorg2r.f
    sorgbr.f sorghr.f sorgl2.f sorglq.f sorgql.f sorgqr.f sorgr2.f
    sorgrq.f sorgtr.f sorgtsqr.f sorgtsqr_row.f sorm2l.f sorm2r.f sorm22.f
@@ -114,15 +120,15 @@ set(SLASRC
    sormr3.f sormrq.f sormrz.f sormtr.f spbcon.f spbequ.f spbrfs.f
    spbstf.f spbsv.f  spbsvx.f
    spbtf2.f spbtrf.f spbtrs.f spocon.f spoequ.f sporfs.f sposv.f
-   sposvx.f spotf2.f spotrf2.f spotri.f spstrf.f spstf2.f
+   sposvx.f spotf2.f spotri.f spstrf.f spstf2.f
    sppcon.f sppequ.f
    spprfs.f sppsv.f  sppsvx.f spptrf.f spptri.f spptrs.f sptcon.f
    spteqr.f sptrfs.f sptsv.f  sptsvx.f spttrs.f sptts2.f srscl.f
    ssbev.f  ssbevd.f ssbevx.f ssbgst.f ssbgv.f  ssbgvd.f ssbgvx.f
    ssbtrd.f sspcon.f sspev.f  sspevd.f sspevx.f sspgst.f
    sspgv.f  sspgvd.f sspgvx.f ssprfs.f sspsv.f  sspsvx.f ssptrd.f
-   ssptrf.f ssptri.f ssptrs.f sstegr.f sstein.f sstev.f  sstevd.f sstevr.f
-   sstevx.f ssycon.f ssyev.f  ssyevd.f ssyevr.f ssyevx.f ssygs2.f
+   ssptrf.f ssptri.f ssptrs.f sstegr.f sstev.f  sstevd.f sstevr.f
+   ssycon.f ssyev.f  ssyevd.f ssyevr.f ssyevx.f ssygs2.f
    ssygst.f ssygv.f  ssygvd.f ssygvx.f ssyrfs.f ssysv.f  ssysvx.f
    ssytd2.f ssytf2.f ssytrd.f ssytrf.f ssytri.f ssytri2.f ssytri2x.f
    ssyswapr.f ssytrs.f ssytrs2.f
@@ -138,7 +144,7 @@ set(SLASRC
    stgsja.f stgsna.f stgsy2.f stgsyl.f stpcon.f stprfs.f stptri.f
    stptrs.f
    strcon.f strevc.f strevc3.f strexc.f strrfs.f strsen.f strsna.f strsyl.f
-   strti2.f strtri.f strtrs.f stzrzf.f sstemr.f
+   strsyl3.f strti2.f strtri.f strtrs.f stzrzf.f sstemr.f
    slansf.f spftrf.f spftri.f spftrs.f ssfrk.f stfsm.f stftri.f stfttp.f
    stfttr.f stpttf.f stpttr.f strttf.f strttp.f
    sgejsv.f sgesvj.f sgsvj0.f sgsvj1.f
@@ -155,9 +161,11 @@ set(SLASRC
    ssytrd_2stage.f ssytrd_sy2sb.f ssytrd_sb2st.F ssb2st_kernels.f
    ssyevd_2stage.f ssyev_2stage.f ssyevx_2stage.f ssyevr_2stage.f
    ssbev_2stage.f ssbevx_2stage.f ssbevd_2stage.f ssygv_2stage.f
-   sgesvdq.f)
+   sgesvdq.f sgedmd.f90 sgedmdq.f90)
 
-set(DSLASRC spotrs.f sgetrs.f spotrf.f sgetrf.f)
+set(DSLASRC
+    sgetrf.f sgetrf2.f sgetrs.f sisnan.f slaisnan.f slaswp.f spotrf.f spotrf2.f
+    spotrs.f)
 
 set(SXLASRC sgesvxx.f sgerfsx.f sla_gerfsx_extended.f sla_geamv.f
    sla_gercond.f sla_gerpvgrw.f ssysvxx.f ssyrfsx.f
@@ -172,7 +180,8 @@ set(CLASRC
    cgbtf2.f cgbtrf.f cgbtrs.f cgebak.f cgebal.f cgebd2.f cgebrd.f
    cgecon.f cgeequ.f cgees.f  cgeesx.f cgeev.f  cgeevx.f
    cgehd2.f cgehrd.f cgelq2.f cgelqf.f
-   cgels.f  cgelsd.f cgelss.f cgelsy.f cgeql2.f cgeqlf.f cgeqp3.f
+   cgels.f  cgelst.f cgelsd.f cgelss.f cgelsy.f cgeql2.f cgeqlf.f
+   cgeqp3.f cgeqp3rk.f
    cgeqr2.f cgeqr2p.f cgeqrf.f cgeqrfp.f cgerfs.f cgerq2.f cgerqf.f
    cgesc2.f cgesdd.f cgesv.f  cgesvd.f cgesvdx.f
    cgesvj.f cgejsv.f cgsvj0.f cgsvj1.f
@@ -208,21 +217,21 @@ set(CLASRC
    clanhb.f clanhe.f
    clanhp.f clanhs.f clanht.f clansb.f clansp.f clansy.f clantb.f
    clantp.f clantr.f clapll.f clapmt.f clarcm.f claqgb.f claqge.f
-   claqhb.f claqhe.f claqhp.f claqp2.f claqps.f claqsb.f
+   claqhb.f claqhe.f claqhp.f claqp2.f claqps.f claqp2rk.f claqp3rk.f claqsb.f
    claqr0.f claqr1.f claqr2.f claqr3.f claqr4.f claqr5.f
    claqsp.f claqsy.f clar1v.f clar2v.f ilaclr.f ilaclc.f
-   clarf.f  clarfb.f clarfb_gett.f clarfg.f clarfgp.f clarft.f
+   clarf.f  clarf1f.f clarf1l.f clarfb.f clarfb_gett.f clarfg.f clarfgp.f clarft.f clarft_lvl2.f
    clarfx.f clarfy.f clargv.f clarnv.f clarrv.f clartg.f90 clartv.f
    clarz.f  clarzb.f clarzt.f clascl.f claset.f clasr.f  classq.f90
    claswp.f clasyf.f clasyf_rook.f clasyf_rk.f clasyf_aa.f
-   clatbs.f clatdf.f clatps.f clatrd.f clatrs.f clatrz.f
+   clatbs.f clatdf.f clatps.f clatrd.f clatrs.f clatrs3.f clatrz.f
    clauu2.f clauum.f cpbcon.f cpbequ.f cpbrfs.f cpbstf.f cpbsv.f
    cpbsvx.f cpbtf2.f cpbtrf.f cpbtrs.f cpocon.f cpoequ.f cporfs.f
    cposv.f  cposvx.f cpotf2.f cpotrf2.f cpotri.f cpstrf.f cpstf2.f
    cppcon.f cppequ.f cpprfs.f cppsv.f  cppsvx.f cpptrf.f cpptri.f cpptrs.f
    cptcon.f cpteqr.f cptrfs.f cptsv.f  cptsvx.f cpttrf.f cpttrs.f cptts2.f
    crot.f   cspcon.f cspmv.f  cspr.f   csprfs.f cspsv.f
-   cspsvx.f csptrf.f csptri.f csptrs.f csrscl.f cstedc.f
+   cspsvx.f csptrf.f csptri.f csptrs.f csrscl.f crscl.f cstedc.f
    cstegr.f cstein.f csteqr.f csycon.f csymv.f
    csyr.f   csyrfs.f csysv.f  csysvx.f csytf2.f csytrf.f csytri.f
    csytri2.f csytri2x.f csyswapr.f
@@ -237,7 +246,7 @@ set(CLASRC
    ctgexc.f ctgsen.f ctgsja.f ctgsna.f ctgsy2.f ctgsyl.f ctpcon.f
    ctprfs.f ctptri.f
    ctptrs.f ctrcon.f ctrevc.f ctrevc3.f ctrexc.f ctrrfs.f ctrsen.f ctrsna.f
-   ctrsyl.f ctrti2.f ctrtri.f ctrtrs.f ctzrzf.f cung2l.f cung2r.f
+   ctrsyl.f ctrsyl3.f ctrti2.f ctrtri.f ctrtrs.f ctzrzf.f cung2l.f cung2r.f
    cungbr.f cunghr.f cungl2.f cunglq.f cungql.f cungqr.f cungr2.f
    cungrq.f cungtr.f cungtsqr.f cungtsqr_row.f cunm2l.f cunm2r.f cunmbr.f cunmhr.f cunml2.f cunm22.f
    cunmlq.f cunmql.f cunmqr.f cunmr2.f cunmr3.f cunmrq.f cunmrz.f
@@ -257,7 +266,7 @@ set(CLASRC
    chetrd_2stage.f chetrd_he2hb.f chetrd_hb2st.F chb2st_kernels.f
    cheevd_2stage.f cheev_2stage.f cheevx_2stage.f cheevr_2stage.f
    chbev_2stage.f chbevx_2stage.f chbevd_2stage.f chegv_2stage.f
-   cgesvdq.f)
+   cgesvdq.f cgedmd.f90 cgedmdq.f90)
 
 set(CXLASRC cgesvxx.f cgerfsx.f cla_gerfsx_extended.f cla_geamv.f
    cla_gercond_c.f cla_gercond_x.f cla_gerpvgrw.f
@@ -271,15 +280,18 @@ set(CXLASRC cgesvxx.f cgerfsx.f cla_gerfsx_extended.f cla_geamv.f
    cla_hercond_c.f cla_hercond_x.f cla_herpvgrw.f
    cla_lin_berr.f clarscl2.f clascl2.f cla_wwaddw.f)
 
-set(ZCLASRC cpotrs.f cgetrs.f cpotrf.f cgetrf.f)
+set(ZCLASRC
+    cgetrf.f cgetrf2.f cgetrs.f claswp.f cpotrf.f cpotrf2.f cpotrs.f cgetrs.f
+    cpotrf.f cgetrf.f
+    sisnan.f slaisnan.f)
 
 set(DLASRC
    dbdsvdx.f dgbbrd.f dgbcon.f dgbequ.f dgbrfs.f dgbsv.f
    dgbsvx.f dgbtf2.f dgbtrf.f dgbtrs.f dgebak.f dgebal.f dgebd2.f
    dgebrd.f dgecon.f dgeequ.f dgees.f  dgeesx.f dgeev.f  dgeevx.f
    dgehd2.f dgehrd.f dgelq2.f dgelqf.f
-   dgels.f  dgelsd.f dgelss.f dgelsy.f dgeql2.f dgeqlf.f
-   dgeqp3.f dgeqr2.f dgeqr2p.f dgeqrf.f dgeqrfp.f dgerfs.f dgerq2.f dgerqf.f
+   dgels.f  dgelst.f dgelsd.f dgelss.f dgelsy.f dgeql2.f dgeqlf.f
+   dgeqp3.f dgeqp3rk.f dgeqr2.f dgeqr2p.f dgeqrf.f dgeqrfp.f dgerfs.f dgerq2.f dgerqf.f
    dgesc2.f dgesdd.f dgesv.f  dgesvd.f dgesvdx.f dgesvx.f dgetc2.f dgetf2.f
    dgetrf.f dgetrf2.f dgetri.f
    dgetrs.f dggbak.f dggbal.f
@@ -294,14 +306,14 @@ set(DLASRC
    dlangb.f dlange.f dlangt.f dlanhs.f dlansb.f dlansp.f
    dlansy.f dlantb.f dlantp.f dlantr.f dlanv2.f
    dlapll.f dlapmt.f
-   dlaqgb.f dlaqge.f dlaqp2.f dlaqps.f dlaqsb.f dlaqsp.f dlaqsy.f
+   dlaqgb.f dlaqge.f dlaqp2.f dlaqps.f dlaqp2rk.f dlaqp3rk.f dlaqsb.f dlaqsp.f dlaqsy.f
    dlaqr0.f dlaqr1.f dlaqr2.f dlaqr3.f dlaqr4.f dlaqr5.f
    dlaqtr.f dlar1v.f dlar2v.f iladlr.f iladlc.f
-   dlarf.f  dlarfb.f dlarfb_gett.f dlarfg.f dlarfgp.f dlarft.f dlarfx.f dlarfy.f
-   dlargv.f dlarrv.f dlartv.f
-   dlarz.f  dlarzb.f dlarzt.f dlaswp.f dlasy2.f 
+   dlarf.f  dlarfb.f dlarfb_gett.f dlarfg.f dlarfgp.f dlarft.f dlarft_lvl2.f dlarfx.f dlarfy.f dlarf1f.f dlarf1l.f
+   dlargv.f dlarmm.f dlarrv.f dlartv.f
+   dlarz.f  dlarzb.f dlarzt.f dlaswp.f dlasy2.f
    dlasyf.f dlasyf_rook.f dlasyf_rk.f dlasyf_aa.f
-   dlatbs.f dlatdf.f dlatps.f dlatrd.f dlatrs.f dlatrz.f dlauu2.f
+   dlatbs.f dlatdf.f dlatps.f dlatrd.f dlatrs.f dlatrs3.f dlatrz.f dlauu2.f
    dlauum.f dopgtr.f dopmtr.f dorg2l.f dorg2r.f
    dorgbr.f dorghr.f dorgl2.f dorglq.f dorgql.f dorgqr.f dorgr2.f
    dorgrq.f dorgtr.f dorgtsqr.f dorgtsqr_row.f dorm2l.f dorm2r.f dorm22.f
@@ -316,8 +328,8 @@ set(DLASRC
    dsbev.f  dsbevd.f dsbevx.f dsbgst.f dsbgv.f  dsbgvd.f dsbgvx.f
    dsbtrd.f dspcon.f dspev.f  dspevd.f dspevx.f dspgst.f
    dspgv.f  dspgvd.f dspgvx.f dsprfs.f dspsv.f  dspsvx.f dsptrd.f
-   dsptrf.f dsptri.f dsptrs.f dstegr.f dstein.f dstev.f  dstevd.f dstevr.f
-   dstevx.f dsycon.f dsyev.f  dsyevd.f dsyevr.f
+   dsptrf.f dsptri.f dsptrs.f dstegr.f dstev.f  dstevd.f dstevr.f
+   dsycon.f dsyev.f  dsyevd.f dsyevr.f
    dsyevx.f dsygs2.f dsygst.f dsygv.f  dsygvd.f dsygvx.f dsyrfs.f
    dsysv.f  dsysvx.f
    dsytd2.f dsytf2.f dsytrd.f dsytrf.f dsytri.f dsytrs.f dsytrs2.f
@@ -334,7 +346,7 @@ set(DLASRC
    dtgsja.f dtgsna.f dtgsy2.f dtgsyl.f dtpcon.f dtprfs.f dtptri.f
    dtptrs.f
    dtrcon.f dtrevc.f dtrevc3.f dtrexc.f dtrrfs.f dtrsen.f dtrsna.f dtrsyl.f
-   dtrti2.f dtrtri.f dtrtrs.f dtzrzf.f dstemr.f
+   dtrsyl3.f dtrti2.f dtrtri.f dtrtrs.f dtzrzf.f dstemr.f
    dsgesv.f dsposv.f dlag2s.f slag2d.f dlat2s.f
    dlansf.f dpftrf.f dpftri.f dpftrs.f dsfrk.f dtfsm.f dtftri.f dtfttp.f
    dtfttr.f dtpttf.f dtpttr.f dtrttf.f dtrttp.f
@@ -352,7 +364,7 @@ set(DLASRC
    dsytrd_2stage.f dsytrd_sy2sb.f dsytrd_sb2st.F dsb2st_kernels.f
    dsyevd_2stage.f dsyev_2stage.f dsyevx_2stage.f dsyevr_2stage.f
    dsbev_2stage.f dsbevx_2stage.f dsbevd_2stage.f dsygv_2stage.f
-   dgesvdq.f)
+   dgesvdq.f dgedmd.f90 dgedmdq.f90)
 
 set(DXLASRC dgesvxx.f dgerfsx.f dla_gerfsx_extended.f dla_geamv.f
    dla_gercond.f dla_gerpvgrw.f dsysvxx.f dsyrfsx.f
@@ -367,7 +379,8 @@ set(ZLASRC
    zgbtf2.f zgbtrf.f zgbtrs.f zgebak.f zgebal.f zgebd2.f zgebrd.f
    zgecon.f zgeequ.f zgees.f  zgeesx.f zgeev.f  zgeevx.f
    zgehd2.f zgehrd.f zgelq2.f zgelqf.f
-   zgels.f  zgelsd.f zgelss.f zgelsy.f zgeql2.f zgeqlf.f zgeqp3.f
+   zgels.f zgelst.f zgelsd.f zgelss.f zgelsy.f zgeql2.f zgeqlf.f
+   zgeqp3.f zgeqp3rk.f
    zgeqr2.f zgeqr2p.f zgeqrf.f zgeqrfp.f zgerfs.f zgerq2.f zgerqf.f
    zgesc2.f zgesdd.f zgesv.f  zgesvd.f zgesvdx.f zgesvx.f
    zgesvj.f zgejsv.f zgsvj0.f zgsvj1.f
@@ -404,22 +417,22 @@ set(ZLASRC
    zlanhe.f
    zlanhp.f zlanhs.f zlanht.f zlansb.f zlansp.f zlansy.f zlantb.f
    zlantp.f zlantr.f zlapll.f zlapmt.f zlaqgb.f zlaqge.f
-   zlaqhb.f zlaqhe.f zlaqhp.f zlaqp2.f zlaqps.f zlaqsb.f
+   zlaqhb.f zlaqhe.f zlaqhp.f zlaqp2.f zlaqps.f zlaqp2rk.f zlaqp3rk.f zlaqsb.f
    zlaqr0.f zlaqr1.f zlaqr2.f zlaqr3.f zlaqr4.f zlaqr5.f
    zlaqsp.f zlaqsy.f zlar1v.f zlar2v.f ilazlr.f ilazlc.f
-   zlarcm.f zlarf.f  zlarfb.f zlarfb_gett.f
-   zlarfg.f zlarfgp.f zlarft.f
+   zlarcm.f zlarf.f  zlarfb.f zlarfb_gett.f zlarf1f.f zlarf1l.f
+   zlarfg.f zlarfgp.f zlarft.f zlarft_lvl2.f
    zlarfx.f zlarfy.f zlargv.f zlarnv.f zlarrv.f zlartg.f90 zlartv.f
    zlarz.f  zlarzb.f zlarzt.f zlascl.f zlaset.f zlasr.f
    zlassq.f90 zlaswp.f zlasyf.f zlasyf_rook.f zlasyf_rk.f zlasyf_aa.f
-   zlatbs.f zlatdf.f zlatps.f zlatrd.f zlatrs.f zlatrz.f zlauu2.f
+   zlatbs.f zlatdf.f zlatps.f zlatrd.f zlatrs.f zlatrs3.f zlatrz.f zlauu2.f
    zlauum.f zpbcon.f zpbequ.f zpbrfs.f zpbstf.f zpbsv.f
    zpbsvx.f zpbtf2.f zpbtrf.f zpbtrs.f zpocon.f zpoequ.f zporfs.f
    zposv.f  zposvx.f zpotf2.f zpotrf.f zpotrf2.f zpotri.f zpotrs.f zpstrf.f zpstf2.f
    zppcon.f zppequ.f zpprfs.f zppsv.f  zppsvx.f zpptrf.f zpptri.f zpptrs.f
    zptcon.f zpteqr.f zptrfs.f zptsv.f  zptsvx.f zpttrf.f zpttrs.f zptts2.f
    zrot.f   zspcon.f zspmv.f  zspr.f   zsprfs.f zspsv.f
-   zspsvx.f zsptrf.f zsptri.f zsptrs.f zdrscl.f zstedc.f
+   zspsvx.f zsptrf.f zsptri.f zsptrs.f zdrscl.f zrscl.f zstedc.f
    zstegr.f zstein.f zsteqr.f zsycon.f zsymv.f
    zsyr.f   zsyrfs.f zsysv.f  zsysvx.f zsytf2.f zsytrf.f zsytri.f
    zsytri2.f zsytri2x.f zsyswapr.f
@@ -434,7 +447,7 @@ set(ZLASRC
    ztgexc.f ztgsen.f ztgsja.f ztgsna.f ztgsy2.f ztgsyl.f ztpcon.f
    ztprfs.f ztptri.f
    ztptrs.f ztrcon.f ztrevc.f ztrevc3.f ztrexc.f ztrrfs.f ztrsen.f ztrsna.f
-   ztrsyl.f ztrti2.f ztrtri.f ztrtrs.f ztzrzf.f zung2l.f
+   ztrsyl.f ztrsyl3.f ztrti2.f ztrtri.f ztrtrs.f ztzrzf.f zung2l.f
    zung2r.f zungbr.f zunghr.f zungl2.f zunglq.f zungql.f zungqr.f zungr2.f
    zungrq.f zungtr.f zungtsqr.f zungtsqr_row.f zunm2l.f zunm2r.f zunmbr.f zunmhr.f zunml2.f zunm22.f
    zunmlq.f zunmql.f zunmqr.f zunmr2.f zunmr3.f zunmrq.f zunmrz.f
@@ -456,7 +469,7 @@ set(ZLASRC
    zhetrd_2stage.f zhetrd_he2hb.f zhetrd_hb2st.F zhb2st_kernels.f
    zheevd_2stage.f zheev_2stage.f zheevx_2stage.f zheevr_2stage.f
    zhbev_2stage.f zhbevx_2stage.f zhbevd_2stage.f zhegv_2stage.f
-   zgesvdq.f)
+   zgesvdq.f zgedmd.f90 zgedmdq.f90)
 
 set(ZXLASRC zgesvxx.f zgerfsx.f zla_gerfsx_extended.f zla_geamv.f
    zla_gercond_c.f zla_gercond_x.f zla_gerpvgrw.f zsysvxx.f zsyrfsx.f
@@ -469,17 +482,17 @@ set(ZXLASRC zgesvxx.f zgerfsx.f zla_gerfsx_extended.f zla_geamv.f
    zla_lin_berr.f zlarscl2.f zlascl2.f zla_wwaddw.f)
 
 if(BUILD_DEPRECATED)
-  list(APPEND SLASRC DEPRECATED/sgegs.f DEPRECATED/sgegv.f
-    DEPRECATED/sgeqpf.f DEPRECATED/sgelsx.f DEPRECATED/sggsvd.f
+  list(APPEND SLASRC DEPRECATED/sgegs.f DEPRECATED/sgegv.f DEPRECATED/sgelqs.f
+    DEPRECATED/sgelsx.f DEPRECATED/sgeqpf.f DEPRECATED/sgeqrs.f DEPRECATED/sggsvd.f
     DEPRECATED/sggsvp.f DEPRECATED/slahrd.f DEPRECATED/slatzm.f DEPRECATED/stzrqf.f)
-  list(APPEND DLASRC DEPRECATED/dgegs.f DEPRECATED/dgegv.f
-    DEPRECATED/dgeqpf.f DEPRECATED/dgelsx.f DEPRECATED/dggsvd.f
+  list(APPEND DLASRC DEPRECATED/dgegs.f DEPRECATED/dgegv.f DEPRECATED/dgelqs.f
+    DEPRECATED/dgelsx.f DEPRECATED/dgeqpf.f DEPRECATED/dgeqrs.f DEPRECATED/dggsvd.f
     DEPRECATED/dggsvp.f DEPRECATED/dlahrd.f DEPRECATED/dlatzm.f DEPRECATED/dtzrqf.f)
-  list(APPEND CLASRC DEPRECATED/cgegs.f DEPRECATED/cgegv.f
-    DEPRECATED/cgeqpf.f DEPRECATED/cgelsx.f DEPRECATED/cggsvd.f
+  list(APPEND CLASRC DEPRECATED/cgegs.f DEPRECATED/cgegv.f DEPRECATED/cgelqs.f
+    DEPRECATED/cgelsx.f DEPRECATED/cgeqpf.f DEPRECATED/cgeqrs.f DEPRECATED/cggsvd.f
     DEPRECATED/cggsvp.f DEPRECATED/clahrd.f DEPRECATED/clatzm.f DEPRECATED/ctzrqf.f)
-  list(APPEND ZLASRC DEPRECATED/zgegs.f DEPRECATED/zgegv.f
-    DEPRECATED/zgeqpf.f DEPRECATED/zgelsx.f DEPRECATED/zggsvd.f
+  list(APPEND ZLASRC DEPRECATED/zgegs.f DEPRECATED/zgegv.f DEPRECATED/zgelqs.f
+    DEPRECATED/zgelsx.f DEPRECATED/zgeqpf.f DEPRECATED/zgeqrs.f DEPRECATED/zggsvd.f
     DEPRECATED/zggsvp.f DEPRECATED/zlahrd.f DEPRECATED/zlatzm.f DEPRECATED/ztzrqf.f)
 endif()
 
@@ -506,13 +519,75 @@ if(BUILD_COMPLEX16)
 endif()
 list(REMOVE_DUPLICATES SOURCES)
 
-add_library(${LAPACKLIB} ${SOURCES})
+# Use special target for MOD files to guarantee they are built before
+# any other files that depend on them
+add_library(const_mod_file OBJECT ${CONSTMOD})
+set_target_properties(
+  const_mod_file PROPERTIES
+  POSITION_INDEPENDENT_CODE ON
+  Fortran_PREPROCESS ON
+  )
+
+add_library(mod_files OBJECT ${NANMOD} $<TARGET_OBJECTS:const_mod_file>)
+set_target_properties(
+  mod_files PROPERTIES
+  POSITION_INDEPENDENT_CODE ON
+  Fortran_PREPROCESS ON
+  )
+
+add_library(${LAPACKLIB}_obj OBJECT ${SOURCES})
+target_link_libraries(${LAPACKLIB}_obj mod_files)
+set_target_properties(
+  ${LAPACKLIB}_obj PROPERTIES
+  POSITION_INDEPENDENT_CODE ON
+  Fortran_PREPROCESS ON
+  )
+
+if(BUILD_INDEX64_EXT_API)
+  if(NOT CMAKE_Fortran_COMPILER_ID MATCHES ${INDEX64_EXT_API_COMPILERS})
+    message(STATUS "Build Index-64 API as extended API with _64 suffix: skipped (unsupported Fortran compiler)")
+    # Disable extended API for LAPACK and LAPACKE as it depends on LAPACK build.
+    set(BUILD_INDEX64_EXT_API OFF)
+    set(BUILD_INDEX64_EXT_API OFF PARENT_SCOPE)
+  else()
+    cmake_minimum_required(VERSION 3.18)
+    set(SOURCES_64)
+    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}_64_obj)
+    file(COPY ${SOURCES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}_64_obj)
+    file(GLOB SOURCES_64 ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}_64_obj/*.*)
+    list(REMOVE_ITEM SOURCES_64 la_xisnan.F90)
+    foreach(F IN LISTS SOURCES_64)
+      set(FFILE "")
+      file(READ ${F} FFILE)
+      file(WRITE ${F} "#include \"lapack_64.h\"\n")
+      file(APPEND ${F} "${FFILE}")
+    endforeach()
+    file(COPY lapack_64.h DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}_64_obj)
+    add_library(${LAPACKLIB}_64_obj OBJECT ${SOURCES_64})
+    target_link_libraries(${LAPACKLIB}_64_obj mod_files)
+    target_compile_options(${LAPACKLIB}_64_obj PRIVATE ${FOPT_ILP64} -DLAPACK_64)
+    set_target_properties(
+      ${LAPACKLIB}_64_obj PROPERTIES
+      POSITION_INDEPENDENT_CODE ON
+      Fortran_PREPROCESS ON
+    )
+  endif()
+endif()
+
+add_library(${LAPACKLIB}
+  $<TARGET_OBJECTS:mod_files>
+  $<TARGET_OBJECTS:${LAPACKLIB}_obj>
+  $<$<BOOL:${BUILD_INDEX64_EXT_API}>: $<TARGET_OBJECTS:${LAPACKLIB}_64_obj>>)
 set_target_properties(
   ${LAPACKLIB} PROPERTIES
   VERSION ${LAPACK_VERSION}
   SOVERSION ${LAPACK_MAJOR_VERSION}
   )
 
+if( TEST_FORTRAN_COMPILER )
+  add_dependencies( ${LAPACKLIB} run_test_zcomplexabs run_test_zcomplexdiv run_test_zcomplexmult run_test_zminMax )
+endif()
+
 if(USE_XBLAS)
   target_link_libraries(${LAPACKLIB} PRIVATE ${XBLAS_LIBRARY})
 endif()
@@ -520,7 +595,7 @@ target_link_libraries(${LAPACKLIB} PRIVATE ${BLAS_LIBRARIES})
 
 if(_is_coverage_build)
   target_link_libraries(${LAPACKLIB} PRIVATE gcov)
-  add_coverage(${LAPACKLIB})
+  add_coverage(${LAPACKLIB}_obj)
 endif()
 
 lapack_install_library(${LAPACKLIB})
diff --git a/SRC/DEPRECATED/cgegs.f b/SRC/DEPRECATED/cgegs.f
index 1f0791a207..213e19fef0 100644
--- a/SRC/DEPRECATED/cgegs.f
+++ b/SRC/DEPRECATED/cgegs.f
@@ -1,11 +1,10 @@
-*> \brief <b> CGEEVX computes the eigenvalues and, optionally, the left and/or right eigenvectors for GE matrices</b>
+*> \brief <b> CGEGS computes the eigenvalues, Schur form, and, optionally, the left and or/right Schur vectors of a complex matrix pair (A,B)</b>
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEGS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgegs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgegs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -219,9 +217,9 @@
 *> \ingroup complexGEeigen
 *
 *  =====================================================================
-      SUBROUTINE CGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHA, BETA,
-     $                  VSL, LDVSL, VSR, LDVSR, WORK, LWORK, RWORK,
-     $                  INFO )
+      SUBROUTINE CGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHA,
+     $                  BETA, VSL, LDVSL, VSR, LDVSR, WORK, LWORK,
+     $                  RWORK, INFO )
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -360,7 +358,8 @@ SUBROUTINE CGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHA, BETA,
       END IF
 *
       IF( ILASCL ) THEN
-         CALL CLASCL( 'G', -1, -1, ANRM, ANRMTO, N, N, A, LDA, IINFO )
+         CALL CLASCL( 'G', -1, -1, ANRM, ANRMTO, N, N, A, LDA,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
@@ -380,7 +379,8 @@ SUBROUTINE CGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHA, BETA,
       END IF
 *
       IF( ILBSCL ) THEN
-         CALL CLASCL( 'G', -1, -1, BNRM, BNRMTO, N, N, B, LDB, IINFO )
+         CALL CLASCL( 'G', -1, -1, BNRM, BNRMTO, N, N, B, LDB,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
@@ -493,12 +493,14 @@ SUBROUTINE CGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHA, BETA,
 *     Undo scaling
 *
       IF( ILASCL ) THEN
-         CALL CLASCL( 'U', -1, -1, ANRMTO, ANRM, N, N, A, LDA, IINFO )
+         CALL CLASCL( 'U', -1, -1, ANRMTO, ANRM, N, N, A, LDA,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
          END IF
-         CALL CLASCL( 'G', -1, -1, ANRMTO, ANRM, N, 1, ALPHA, N, IINFO )
+         CALL CLASCL( 'G', -1, -1, ANRMTO, ANRM, N, 1, ALPHA, N,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
@@ -506,12 +508,14 @@ SUBROUTINE CGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHA, BETA,
       END IF
 *
       IF( ILBSCL ) THEN
-         CALL CLASCL( 'U', -1, -1, BNRMTO, BNRM, N, N, B, LDB, IINFO )
+         CALL CLASCL( 'U', -1, -1, BNRMTO, BNRM, N, N, B, LDB,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
          END IF
-         CALL CLASCL( 'G', -1, -1, BNRMTO, BNRM, N, 1, BETA, N, IINFO )
+         CALL CLASCL( 'G', -1, -1, BNRMTO, BNRM, N, 1, BETA, N,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
diff --git a/SRC/DEPRECATED/cgegv.f b/SRC/DEPRECATED/cgegv.f
index ba810ddefb..4adeeb9d5d 100644
--- a/SRC/DEPRECATED/cgegv.f
+++ b/SRC/DEPRECATED/cgegv.f
@@ -1,11 +1,10 @@
-*> \brief <b> CGEEVX computes the eigenvalues and, optionally, the left and/or right eigenvectors for GE matrices</b>
+*> \brief <b> CGEGV computes the eigenvalues and, optionally, the left and/or right eigenvectors of a complex matrix pair (A,B).</b>
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgegv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgegv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
diff --git a/TESTING/LIN/cgelqs.f b/SRC/DEPRECATED/cgelqs.f
similarity index 98%
rename from TESTING/LIN/cgelqs.f
rename to SRC/DEPRECATED/cgelqs.f
index 47e17a5830..aba3632a74 100644
--- a/TESTING/LIN/cgelqs.f
+++ b/SRC/DEPRECATED/cgelqs.f
@@ -16,7 +16,7 @@
 *       ..
 *       .. Array Arguments ..
 *       COMPLEX            A( LDA, * ), B( LDB, * ), TAU( * ),
-*      $                   WORK( LWORK )
+*      $                   WORK( * )
 *       ..
 *
 *
@@ -128,7 +128,7 @@ SUBROUTINE CGELQS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
 *     ..
 *     .. Array Arguments ..
       COMPLEX            A( LDA, * ), B( LDB, * ), TAU( * ),
-     $                   WORK( LWORK )
+     $                   WORK( * )
 *     ..
 *
 *  =====================================================================
diff --git a/SRC/DEPRECATED/cgelsx.f b/SRC/DEPRECATED/cgelsx.f
index a5c7c9ed89..f33fbae6ae 100644
--- a/SRC/DEPRECATED/cgelsx.f
+++ b/SRC/DEPRECATED/cgelsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGELSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgelsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgelsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -179,8 +177,8 @@
 *> \ingroup complexGEsolve
 *
 *  =====================================================================
-      SUBROUTINE CGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
-     $                   WORK, RWORK, INFO )
+      SUBROUTINE CGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND,
+     $                   RANK, WORK, RWORK, INFO )
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -216,7 +214,7 @@ SUBROUTINE CGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CGEQPF, CLAIC1, CLASCL, CLASET, CLATZM, CTRSM,
-     $                   CTZRQF, CUNM2R, SLABAD, XERBLA
+     $                   CTZRQF, CUNM2R, XERBLA
 *     ..
 *     .. External Functions ..
       REAL               CLANGE, SLAMCH
@@ -262,7 +260,6 @@ SUBROUTINE CGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
       SMLNUM = SLAMCH( 'S' ) / SLAMCH( 'P' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A, B if max elements outside range [SMLNUM,BIGNUM]
 *
@@ -295,13 +292,15 @@ SUBROUTINE CGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
 *        Scale matrix norm up to SMLNUM
 *
-         CALL CLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 1
       ELSE IF( BNRM.GT.BIGNUM ) THEN
 *
 *        Scale matrix norm down to BIGNUM
 *
-         CALL CLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 2
       END IF
 *
@@ -363,8 +362,8 @@ SUBROUTINE CGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
 *     B(1:M,1:NRHS) := Q**H * B(1:M,1:NRHS)
 *
-      CALL CUNM2R( 'Left', 'Conjugate transpose', M, NRHS, MN, A, LDA,
-     $             WORK( 1 ), B, LDB, WORK( 2*MN+1 ), INFO )
+      CALL CUNM2R( 'Left', 'Conjugate transpose', M, NRHS, MN, A,
+     $             LDA, WORK( 1 ), B, LDB, WORK( 2*MN+1 ), INFO )
 *
 *     workspace NRHS
 *
@@ -421,18 +420,22 @@ SUBROUTINE CGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *     Undo scaling
 *
       IF( IASCL.EQ.1 ) THEN
-         CALL CLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL CLASCL( 'U', 0, 0, SMLNUM, ANRM, RANK, RANK, A, LDA,
      $                INFO )
       ELSE IF( IASCL.EQ.2 ) THEN
-         CALL CLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL CLASCL( 'U', 0, 0, BIGNUM, ANRM, RANK, RANK, A, LDA,
      $                INFO )
       END IF
       IF( IBSCL.EQ.1 ) THEN
-         CALL CLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL CLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       END IF
 *
   100 CONTINUE
diff --git a/SRC/DEPRECATED/cgeqpf.f b/SRC/DEPRECATED/cgeqpf.f
index 8593ce33b8..a741071634 100644
--- a/SRC/DEPRECATED/cgeqpf.f
+++ b/SRC/DEPRECATED/cgeqpf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEQPF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgeqpf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgeqpf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
diff --git a/TESTING/LIN/cgeqrs.f b/SRC/DEPRECATED/cgeqrs.f
similarity index 98%
rename from TESTING/LIN/cgeqrs.f
rename to SRC/DEPRECATED/cgeqrs.f
index 13ac7f74fd..9d0527283d 100644
--- a/TESTING/LIN/cgeqrs.f
+++ b/SRC/DEPRECATED/cgeqrs.f
@@ -16,7 +16,7 @@
 *       ..
 *       .. Array Arguments ..
 *       COMPLEX            A( LDA, * ), B( LDB, * ), TAU( * ),
-*      $                   WORK( LWORK )
+*      $                   WORK( * )
 *       ..
 *
 *
@@ -128,7 +128,7 @@ SUBROUTINE CGEQRS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
 *     ..
 *     .. Array Arguments ..
       COMPLEX            A( LDA, * ), B( LDB, * ), TAU( * ),
-     $                   WORK( LWORK )
+     $                   WORK( * )
 *     ..
 *
 *  =====================================================================
diff --git a/SRC/DEPRECATED/cggsvd.f b/SRC/DEPRECATED/cggsvd.f
index e6fdb47e5c..6a9ea97231 100644
--- a/SRC/DEPRECATED/cggsvd.f
+++ b/SRC/DEPRECATED/cggsvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGSVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cggsvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cggsvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> In particular, if B is an N-by-N nonsingular matrix, then the GSVD of
 *> A and B implicitly gives the SVD of A*inv(B):
 *>                      A*inv(B) = U*(D1*inv(D2))*V**H.
-*> If ( A**H,B**H)**H has orthnormal columns, then the GSVD of A and B is also
+*> If ( A**H,B**H)**H has orthonormal columns, then the GSVD of A and B is also
 *> equal to the CS decomposition of A and B. Furthermore, the GSVD can
 *> be used to derive the solution of the eigenvalue problem:
 *>                      A**H*A x = lambda* B**H*B x.
diff --git a/SRC/DEPRECATED/cggsvp.f b/SRC/DEPRECATED/cggsvp.f
index 0c60077fff..9d6a183ac7 100644
--- a/SRC/DEPRECATED/cggsvp.f
+++ b/SRC/DEPRECATED/cggsvp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGSVP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cggsvp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cggsvp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -246,7 +244,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup ggsvp
 *
 *> \par Further Details:
 *  =====================
@@ -382,7 +380,8 @@ SUBROUTINE CGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
    30    CONTINUE
    40 CONTINUE
       IF( P.GT.L )
-     $   CALL CLASET( 'Full', P-L, N, CZERO, CZERO, B( L+1, 1 ), LDB )
+     $   CALL CLASET( 'Full', P-L, N, CZERO, CZERO, B( L+1, 1 ),
+     $                LDB )
 *
       IF( WANTQ ) THEN
 *
@@ -400,8 +399,8 @@ SUBROUTINE CGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *        Update A := A*Z**H
 *
-         CALL CUNMR2( 'Right', 'Conjugate transpose', M, N, L, B, LDB,
-     $                TAU, A, LDA, WORK, INFO )
+         CALL CUNMR2( 'Right', 'Conjugate transpose', M, N, L, B,
+     $                LDB, TAU, A, LDA, WORK, INFO )
          IF( WANTQ ) THEN
 *
 *           Update Q := Q*Z**H
@@ -444,8 +443,9 @@ SUBROUTINE CGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *     Update A12 := U**H*A12, where A12 = A( 1:M, N-L+1:N )
 *
-      CALL CUNM2R( 'Left', 'Conjugate transpose', M, L, MIN( M, N-L ),
-     $             A, LDA, TAU, A( 1, N-L+1 ), LDA, WORK, INFO )
+      CALL CUNM2R( 'Left', 'Conjugate transpose', M, L,
+     $             MIN( M, N-L ), A, LDA, TAU, A( 1, N-L+1 ), LDA, WORK,
+     $             INFO )
 *
       IF( WANTU ) THEN
 *
@@ -453,8 +453,8 @@ SUBROUTINE CGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
          CALL CLASET( 'Full', M, M, CZERO, CZERO, U, LDU )
          IF( M.GT.1 )
-     $      CALL CLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA, U( 2, 1 ),
-     $                   LDU )
+     $      CALL CLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA,
+     $                   U( 2, 1 ), LDU )
          CALL CUNG2R( M, M, MIN( M, N-L ), U, LDU, TAU, WORK, INFO )
       END IF
 *
@@ -474,7 +474,8 @@ SUBROUTINE CGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
    90    CONTINUE
   100 CONTINUE
       IF( M.GT.K )
-     $   CALL CLASET( 'Full', M-K, N-L, CZERO, CZERO, A( K+1, 1 ), LDA )
+     $   CALL CLASET( 'Full', M-K, N-L, CZERO, CZERO, A( K+1, 1 ),
+     $                LDA )
 *
       IF( N-L.GT.K ) THEN
 *
@@ -486,8 +487,8 @@ SUBROUTINE CGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update Q( 1:N,1:N-L ) = Q( 1:N,1:N-L )*Z1**H
 *
-            CALL CUNMR2( 'Right', 'Conjugate transpose', N, N-L, K, A,
-     $                   LDA, TAU, Q, LDQ, WORK, INFO )
+            CALL CUNMR2( 'Right', 'Conjugate transpose', N, N-L, K,
+     $                   A, LDA, TAU, Q, LDQ, WORK, INFO )
          END IF
 *
 *        Clean up A
@@ -511,9 +512,9 @@ SUBROUTINE CGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update U(:,K+1:M) := U(:,K+1:M)*U1
 *
-            CALL CUNM2R( 'Right', 'No transpose', M, M-K, MIN( M-K, L ),
-     $                   A( K+1, N-L+1 ), LDA, TAU, U( 1, K+1 ), LDU,
-     $                   WORK, INFO )
+            CALL CUNM2R( 'Right', 'No transpose', M, M-K,
+     $                   MIN( M-K, L ), A( K+1, N-L+1 ), LDA, TAU,
+     $                   U( 1, K+1 ), LDU, WORK, INFO )
          END IF
 *
 *        Clean up
diff --git a/SRC/DEPRECATED/clahrd.f b/SRC/DEPRECATED/clahrd.f
index b209929ab6..3cfaabd431 100644
--- a/SRC/DEPRECATED/clahrd.f
+++ b/SRC/DEPRECATED/clahrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAHRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clahrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clahrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,7 +120,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lahrd
 *
 *> \par Further Details:
 *  =====================
@@ -236,13 +234,14 @@ SUBROUTINE CLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *
 *           w := T**H *w
 *
-            CALL CTRMV( 'Upper', 'Conjugate transpose', 'Non-unit', I-1,
-     $                  T, LDT, T( 1, NB ), 1 )
+            CALL CTRMV( 'Upper', 'Conjugate transpose', 'Non-unit',
+     $                  I-1, T, LDT, T( 1, NB ), 1 )
 *
 *           b2 := b2 - V2*w
 *
-            CALL CGEMV( 'No transpose', N-K-I+1, I-1, -ONE, A( K+I, 1 ),
-     $                  LDA, T( 1, NB ), 1, ONE, A( K+I, I ), 1 )
+            CALL CGEMV( 'No transpose', N-K-I+1, I-1, -ONE,
+     $                  A( K+I, 1 ), LDA, T( 1, NB ), 1, ONE,
+     $                  A( K+I, I ), 1 )
 *
 *           b1 := b1 - V1*w
 *
@@ -263,20 +262,20 @@ SUBROUTINE CLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *
 *        Compute  Y(1:n,i)
 *
-         CALL CGEMV( 'No transpose', N, N-K-I+1, ONE, A( 1, I+1 ), LDA,
-     $               A( K+I, I ), 1, ZERO, Y( 1, I ), 1 )
+         CALL CGEMV( 'No transpose', N, N-K-I+1, ONE, A( 1, I+1 ),
+     $               LDA, A( K+I, I ), 1, ZERO, Y( 1, I ), 1 )
          CALL CGEMV( 'Conjugate transpose', N-K-I+1, I-1, ONE,
      $               A( K+I, 1 ), LDA, A( K+I, I ), 1, ZERO, T( 1, I ),
      $               1 )
-         CALL CGEMV( 'No transpose', N, I-1, -ONE, Y, LDY, T( 1, I ), 1,
-     $               ONE, Y( 1, I ), 1 )
+         CALL CGEMV( 'No transpose', N, I-1, -ONE, Y, LDY,
+     $               T( 1, I ), 1, ONE, Y( 1, I ), 1 )
          CALL CSCAL( N, TAU( I ), Y( 1, I ), 1 )
 *
 *        Compute T(1:i,i)
 *
          CALL CSCAL( I-1, -TAU( I ), T( 1, I ), 1 )
-         CALL CTRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T, LDT,
-     $               T( 1, I ), 1 )
+         CALL CTRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T,
+     $               LDT, T( 1, I ), 1 )
          T( I, I ) = TAU( I )
 *
    10 CONTINUE
diff --git a/SRC/DEPRECATED/clatzm.f b/SRC/DEPRECATED/clatzm.f
index 8e333cc172..d5bc9925e6 100644
--- a/SRC/DEPRECATED/clatzm.f
+++ b/SRC/DEPRECATED/clatzm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLATZM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clatzm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clatzm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -145,10 +143,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup latzm
 *
 *  =====================================================================
-      SUBROUTINE CLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC, WORK )
+      SUBROUTINE CLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC,
+     $                   WORK )
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -206,8 +205,8 @@ SUBROUTINE CLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC, WORK )
 *        w := C1 + C2 * v
 *
          CALL CCOPY( M, C1, 1, WORK, 1 )
-         CALL CGEMV( 'No transpose', M, N-1, ONE, C2, LDC, V, INCV, ONE,
-     $               WORK, 1 )
+         CALL CGEMV( 'No transpose', M, N-1, ONE, C2, LDC, V, INCV,
+     $               ONE, WORK, 1 )
 *
 *        [ C1, C2 ] := [ C1, C2 ] - tau* w * [ 1 , v**H]
 *
diff --git a/SRC/DEPRECATED/ctzrqf.f b/SRC/DEPRECATED/ctzrqf.f
index ed1f67d247..168b143464 100644
--- a/SRC/DEPRECATED/ctzrqf.f
+++ b/SRC/DEPRECATED/ctzrqf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTZRQF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctzrqf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctzrqf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -99,7 +97,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tzrqf
 *
 *> \par Further Details:
 *  =====================
@@ -217,14 +215,15 @@ SUBROUTINE CTZRQF( M, N, A, LDA, TAU, INFO )
 *
 *              Form   w = a( k ) + B*z( k )  in TAU.
 *
-               CALL CGEMV( 'No transpose', K-1, N-M, CONE, A( 1, M1 ),
-     $                     LDA, A( K, M1 ), LDA, CONE, TAU, 1 )
+               CALL CGEMV( 'No transpose', K-1, N-M, CONE,
+     $                     A( 1, M1 ), LDA, A( K, M1 ), LDA, CONE,
+     $                     TAU, 1 )
 *
 *              Now form  a( k ) := a( k ) - conjg(tau)*w
 *              and       B      := B      - conjg(tau)*w*z( k )**H.
 *
-               CALL CAXPY( K-1, -CONJG( TAU( K ) ), TAU, 1, A( 1, K ),
-     $                     1 )
+               CALL CAXPY( K-1, -CONJG( TAU( K ) ), TAU, 1,
+     $                     A( 1, K ), 1 )
                CALL CGERC( K-1, N-M, -CONJG( TAU( K ) ), TAU, 1,
      $                     A( K, M1 ), LDA, A( 1, M1 ), LDA )
             END IF
diff --git a/SRC/DEPRECATED/dgegs.f b/SRC/DEPRECATED/dgegs.f
index 0ac0112c2d..5e4757e13a 100644
--- a/SRC/DEPRECATED/dgegs.f
+++ b/SRC/DEPRECATED/dgegs.f
@@ -1,11 +1,10 @@
-*> \brief <b> DGEEVX computes the eigenvalues and, optionally, the left and/or right eigenvectors for GE matrices</b>
+*> \brief <b> DGEGS computes the eigenvalues, real Schur form, and, optionally, the left and/or right Schur vectors of a real matrix pair (A,B)</b>
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEGS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgegs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgegs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -358,7 +356,8 @@ SUBROUTINE DGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHAR,
       END IF
 *
       IF( ILASCL ) THEN
-         CALL DLASCL( 'G', -1, -1, ANRM, ANRMTO, N, N, A, LDA, IINFO )
+         CALL DLASCL( 'G', -1, -1, ANRM, ANRMTO, N, N, A, LDA,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
@@ -378,7 +377,8 @@ SUBROUTINE DGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHAR,
       END IF
 *
       IF( ILBSCL ) THEN
-         CALL DLASCL( 'G', -1, -1, BNRM, BNRMTO, N, N, B, LDB, IINFO )
+         CALL DLASCL( 'G', -1, -1, BNRM, BNRMTO, N, N, B, LDB,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
@@ -496,7 +496,8 @@ SUBROUTINE DGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHAR,
 *     Undo scaling
 *
       IF( ILASCL ) THEN
-         CALL DLASCL( 'H', -1, -1, ANRMTO, ANRM, N, N, A, LDA, IINFO )
+         CALL DLASCL( 'H', -1, -1, ANRMTO, ANRM, N, N, A, LDA,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
@@ -516,12 +517,14 @@ SUBROUTINE DGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHAR,
       END IF
 *
       IF( ILBSCL ) THEN
-         CALL DLASCL( 'U', -1, -1, BNRMTO, BNRM, N, N, B, LDB, IINFO )
+         CALL DLASCL( 'U', -1, -1, BNRMTO, BNRM, N, N, B, LDB,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
          END IF
-         CALL DLASCL( 'G', -1, -1, BNRMTO, BNRM, N, 1, BETA, N, IINFO )
+         CALL DLASCL( 'G', -1, -1, BNRMTO, BNRM, N, 1, BETA, N,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
diff --git a/SRC/DEPRECATED/dgegv.f b/SRC/DEPRECATED/dgegv.f
index 7e81c85a9a..8a5fe68037 100644
--- a/SRC/DEPRECATED/dgegv.f
+++ b/SRC/DEPRECATED/dgegv.f
@@ -1,11 +1,10 @@
-*> \brief <b> DGEEVX computes the eigenvalues and, optionally, the left and/or right eigenvectors for GE matrices</b>
+*> \brief <b> DGEGV computes the eigenvalues and, optionally, the left and/or right eigenvectors of a real matrix pair (A,B).</b>
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgegv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgegv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -301,8 +299,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DGEGV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
-     $                  BETA, VL, LDVL, VR, LDVR, WORK, LWORK, INFO )
+      SUBROUTINE DGEGV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
+     $                  ALPHAI, BETA, VL, LDVL, VR, LDVR, WORK, LWORK,
+     $                  INFO )
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dgelqs.f b/SRC/DEPRECATED/dgelqs.f
similarity index 95%
rename from TESTING/LIN/dgelqs.f
rename to SRC/DEPRECATED/dgelqs.f
index ecbb5893c3..1bab678901 100644
--- a/TESTING/LIN/dgelqs.f
+++ b/SRC/DEPRECATED/dgelqs.f
@@ -16,7 +16,7 @@
 *       ..
 *       .. Array Arguments ..
 *       DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), TAU( * ),
-*      $                   WORK( LWORK )
+*      $                   WORK( * )
 *       ..
 *
 *
@@ -128,7 +128,7 @@ SUBROUTINE DGELQS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
 *     ..
 *     .. Array Arguments ..
       DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), TAU( * ),
-     $                   WORK( LWORK )
+     $                   WORK( * )
 *     ..
 *
 *  =====================================================================
@@ -174,18 +174,19 @@ SUBROUTINE DGELQS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
 *
 *     Solve L*X = B(1:m,:)
 *
-      CALL DTRSM( 'Left', 'Lower', 'No transpose', 'Non-unit', M, NRHS,
-     $            ONE, A, LDA, B, LDB )
+      CALL DTRSM( 'Left', 'Lower', 'No transpose', 'Non-unit', M,
+     $            NRHS, ONE, A, LDA, B, LDB )
 *
 *     Set B(m+1:n,:) to zero
 *
       IF( M.LT.N )
-     $   CALL DLASET( 'Full', N-M, NRHS, ZERO, ZERO, B( M+1, 1 ), LDB )
+     $   CALL DLASET( 'Full', N-M, NRHS, ZERO, ZERO, B( M+1, 1 ),
+     $                LDB )
 *
 *     B := Q' * B
 *
-      CALL DORMLQ( 'Left', 'Transpose', N, NRHS, M, A, LDA, TAU, B, LDB,
-     $             WORK, LWORK, INFO )
+      CALL DORMLQ( 'Left', 'Transpose', N, NRHS, M, A, LDA, TAU, B,
+     $             LDB, WORK, LWORK, INFO )
 *
       RETURN
 *
diff --git a/SRC/DEPRECATED/dgelsx.f b/SRC/DEPRECATED/dgelsx.f
index 395fcb0d14..6f5d5a0f70 100644
--- a/SRC/DEPRECATED/dgelsx.f
+++ b/SRC/DEPRECATED/dgelsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGELSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgelsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgelsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -173,8 +171,8 @@
 *> \ingroup doubleGEsolve
 *
 *  =====================================================================
-      SUBROUTINE DGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
-     $                   WORK, INFO )
+      SUBROUTINE DGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND,
+     $                   RANK, WORK, INFO )
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -251,7 +249,6 @@ SUBROUTINE DGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
       SMLNUM = DLAMCH( 'S' ) / DLAMCH( 'P' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A, B if max elements outside range [SMLNUM,BIGNUM]
 *
@@ -284,20 +281,23 @@ SUBROUTINE DGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
 *        Scale matrix norm up to SMLNUM
 *
-         CALL DLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 1
       ELSE IF( BNRM.GT.BIGNUM ) THEN
 *
 *        Scale matrix norm down to BIGNUM
 *
-         CALL DLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 2
       END IF
 *
 *     Compute QR factorization with column pivoting of A:
 *        A * P = Q * R
 *
-      CALL DGEQPF( M, N, A, LDA, JPVT, WORK( 1 ), WORK( MN+1 ), INFO )
+      CALL DGEQPF( M, N, A, LDA, JPVT, WORK( 1 ), WORK( MN+1 ),
+     $             INFO )
 *
 *     workspace 3*N. Details of Householder rotations stored
 *     in WORK(1:MN).
@@ -351,8 +351,8 @@ SUBROUTINE DGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
 *     B(1:M,1:NRHS) := Q**T * B(1:M,1:NRHS)
 *
-      CALL DORM2R( 'Left', 'Transpose', M, NRHS, MN, A, LDA, WORK( 1 ),
-     $             B, LDB, WORK( 2*MN+1 ), INFO )
+      CALL DORM2R( 'Left', 'Transpose', M, NRHS, MN, A, LDA,
+     $             WORK( 1 ), B, LDB, WORK( 2*MN+1 ), INFO )
 *
 *     workspace NRHS
 *
@@ -409,18 +409,22 @@ SUBROUTINE DGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *     Undo scaling
 *
       IF( IASCL.EQ.1 ) THEN
-         CALL DLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL DLASCL( 'U', 0, 0, SMLNUM, ANRM, RANK, RANK, A, LDA,
      $                INFO )
       ELSE IF( IASCL.EQ.2 ) THEN
-         CALL DLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL DLASCL( 'U', 0, 0, BIGNUM, ANRM, RANK, RANK, A, LDA,
      $                INFO )
       END IF
       IF( IBSCL.EQ.1 ) THEN
-         CALL DLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL DLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       END IF
 *
   100 CONTINUE
diff --git a/SRC/DEPRECATED/dgeqpf.f b/SRC/DEPRECATED/dgeqpf.f
index 69f9542acb..beb9c8896a 100644
--- a/SRC/DEPRECATED/dgeqpf.f
+++ b/SRC/DEPRECATED/dgeqpf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEQPF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeqpf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeqpf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -218,8 +216,8 @@ SUBROUTINE DGEQPF( M, N, A, LDA, JPVT, TAU, WORK, INFO )
          MA = MIN( ITEMP, M )
          CALL DGEQR2( M, MA, A, LDA, TAU, WORK, INFO )
          IF( MA.LT.N ) THEN
-            CALL DORM2R( 'Left', 'Transpose', M, N-MA, MA, A, LDA, TAU,
-     $                   A( 1, MA+1 ), LDA, WORK, INFO )
+            CALL DORM2R( 'Left', 'Transpose', M, N-MA, MA, A, LDA,
+     $                   TAU, A( 1, MA+1 ), LDA, WORK, INFO )
          END IF
       END IF
 *
@@ -253,7 +251,8 @@ SUBROUTINE DGEQPF( M, N, A, LDA, JPVT, TAU, WORK, INFO )
 *           Generate elementary reflector H(i)
 *
             IF( I.LT.M ) THEN
-               CALL DLARFG( M-I+1, A( I, I ), A( I+1, I ), 1, TAU( I ) )
+               CALL DLARFG( M-I+1, A( I, I ), A( I+1, I ), 1,
+     $                      TAU( I ) )
             ELSE
                CALL DLARFG( 1, A( M, M ), A( M, M ), 1, TAU( M ) )
             END IF
@@ -264,8 +263,8 @@ SUBROUTINE DGEQPF( M, N, A, LDA, JPVT, TAU, WORK, INFO )
 *
                AII = A( I, I )
                A( I, I ) = ONE
-               CALL DLARF( 'LEFT', M-I+1, N-I, A( I, I ), 1, TAU( I ),
-     $                     A( I, I+1 ), LDA, WORK( 2*N+1 ) )
+               CALL DLARF( 'LEFT', M-I+1, N-I, A( I, I ), 1,
+     $                     TAU( I ), A( I, I+1 ), LDA, WORK( 2*N+1 ) )
                A( I, I ) = AII
             END IF
 *
diff --git a/TESTING/LIN/dgeqrs.f b/SRC/DEPRECATED/dgeqrs.f
similarity index 98%
rename from TESTING/LIN/dgeqrs.f
rename to SRC/DEPRECATED/dgeqrs.f
index bfb7bd8bb8..e3e6c4048e 100644
--- a/TESTING/LIN/dgeqrs.f
+++ b/SRC/DEPRECATED/dgeqrs.f
@@ -16,7 +16,7 @@
 *       ..
 *       .. Array Arguments ..
 *       DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), TAU( * ),
-*      $                   WORK( LWORK )
+*      $                   WORK( * )
 *       ..
 *
 *
@@ -128,7 +128,7 @@ SUBROUTINE DGEQRS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
 *     ..
 *     .. Array Arguments ..
       DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), TAU( * ),
-     $                   WORK( LWORK )
+     $                   WORK( * )
 *     ..
 *
 *  =====================================================================
diff --git a/SRC/DEPRECATED/dggsvd.f b/SRC/DEPRECATED/dggsvd.f
index 4f439eb6a9..cc972cdc49 100644
--- a/SRC/DEPRECATED/dggsvd.f
+++ b/SRC/DEPRECATED/dggsvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGSVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dggsvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dggsvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
diff --git a/SRC/DEPRECATED/dggsvp.f b/SRC/DEPRECATED/dggsvp.f
index 87a2fd670c..e89b5324aa 100644
--- a/SRC/DEPRECATED/dggsvp.f
+++ b/SRC/DEPRECATED/dggsvp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGSVP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dggsvp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dggsvp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -392,8 +390,8 @@ SUBROUTINE DGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update Q := Q*Z**T
 *
-            CALL DORMR2( 'Right', 'Transpose', N, N, L, B, LDB, TAU, Q,
-     $                   LDQ, WORK, INFO )
+            CALL DORMR2( 'Right', 'Transpose', N, N, L, B, LDB, TAU,
+     $                   Q, LDQ, WORK, INFO )
          END IF
 *
 *        Clean up B
@@ -439,9 +437,10 @@ SUBROUTINE DGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
          CALL DLASET( 'Full', M, M, ZERO, ZERO, U, LDU )
          IF( M.GT.1 )
-     $      CALL DLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA, U( 2, 1 ),
-     $                   LDU )
-         CALL DORG2R( M, M, MIN( M, N-L ), U, LDU, TAU, WORK, INFO )
+     $      CALL DLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA,
+     $                   U( 2, 1 ), LDU )
+         CALL DORG2R( M, M, MIN( M, N-L ), U, LDU, TAU, WORK,
+     $                INFO )
       END IF
 *
       IF( WANTQ ) THEN
@@ -460,7 +459,8 @@ SUBROUTINE DGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
    90    CONTINUE
   100 CONTINUE
       IF( M.GT.K )
-     $   CALL DLASET( 'Full', M-K, N-L, ZERO, ZERO, A( K+1, 1 ), LDA )
+     $   CALL DLASET( 'Full', M-K, N-L, ZERO, ZERO, A( K+1, 1 ),
+     $                LDA )
 *
       IF( N-L.GT.K ) THEN
 *
@@ -472,8 +472,8 @@ SUBROUTINE DGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update Q( 1:N,1:N-L ) = Q( 1:N,1:N-L )*Z1**T
 *
-            CALL DORMR2( 'Right', 'Transpose', N, N-L, K, A, LDA, TAU,
-     $                   Q, LDQ, WORK, INFO )
+            CALL DORMR2( 'Right', 'Transpose', N, N-L, K, A, LDA,
+     $                   TAU, Q, LDQ, WORK, INFO )
          END IF
 *
 *        Clean up A
@@ -497,9 +497,9 @@ SUBROUTINE DGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update U(:,K+1:M) := U(:,K+1:M)*U1
 *
-            CALL DORM2R( 'Right', 'No transpose', M, M-K, MIN( M-K, L ),
-     $                   A( K+1, N-L+1 ), LDA, TAU, U( 1, K+1 ), LDU,
-     $                   WORK, INFO )
+            CALL DORM2R( 'Right', 'No transpose', M, M-K,
+     $                   MIN( M-K, L ), A( K+1, N-L+1 ), LDA, TAU,
+     $                   U( 1, K+1 ), LDU, WORK, INFO )
          END IF
 *
 *        Clean up
diff --git a/SRC/DEPRECATED/dlahrd.f b/SRC/DEPRECATED/dlahrd.f
index 24ddf51cc9..475e3b3e89 100644
--- a/SRC/DEPRECATED/dlahrd.f
+++ b/SRC/DEPRECATED/dlahrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAHRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlahrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlahrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,7 +120,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lahrd
 *
 *> \par Further Details:
 *  =====================
@@ -221,8 +219,8 @@ SUBROUTINE DLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *           w := V1**T * b1
 *
             CALL DCOPY( I-1, A( K+1, I ), 1, T( 1, NB ), 1 )
-            CALL DTRMV( 'Lower', 'Transpose', 'Unit', I-1, A( K+1, 1 ),
-     $                  LDA, T( 1, NB ), 1 )
+            CALL DTRMV( 'Lower', 'Transpose', 'Unit', I-1,
+     $                  A( K+1, 1 ), LDA, T( 1, NB ), 1 )
 *
 *           w := w + V2**T *b2
 *
@@ -231,13 +229,14 @@ SUBROUTINE DLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *
 *           w := T**T *w
 *
-            CALL DTRMV( 'Upper', 'Transpose', 'Non-unit', I-1, T, LDT,
-     $                  T( 1, NB ), 1 )
+            CALL DTRMV( 'Upper', 'Transpose', 'Non-unit', I-1,
+     $                  T, LDT, T( 1, NB ), 1 )
 *
 *           b2 := b2 - V2*w
 *
-            CALL DGEMV( 'No transpose', N-K-I+1, I-1, -ONE, A( K+I, 1 ),
-     $                  LDA, T( 1, NB ), 1, ONE, A( K+I, I ), 1 )
+            CALL DGEMV( 'No transpose', N-K-I+1, I-1, -ONE,
+     $                  A( K+I, 1 ), LDA, T( 1, NB ), 1, ONE,
+     $                  A( K+I, I ), 1 )
 *
 *           b1 := b1 - V1*w
 *
@@ -258,19 +257,19 @@ SUBROUTINE DLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *
 *        Compute  Y(1:n,i)
 *
-         CALL DGEMV( 'No transpose', N, N-K-I+1, ONE, A( 1, I+1 ), LDA,
-     $               A( K+I, I ), 1, ZERO, Y( 1, I ), 1 )
-         CALL DGEMV( 'Transpose', N-K-I+1, I-1, ONE, A( K+I, 1 ), LDA,
-     $               A( K+I, I ), 1, ZERO, T( 1, I ), 1 )
-         CALL DGEMV( 'No transpose', N, I-1, -ONE, Y, LDY, T( 1, I ), 1,
-     $               ONE, Y( 1, I ), 1 )
+         CALL DGEMV( 'No transpose', N, N-K-I+1, ONE, A( 1, I+1 ),
+     $               LDA, A( K+I, I ), 1, ZERO, Y( 1, I ), 1 )
+         CALL DGEMV( 'Transpose', N-K-I+1, I-1, ONE, A( K+I, 1 ),
+     $               LDA, A( K+I, I ), 1, ZERO, T( 1, I ), 1 )
+         CALL DGEMV( 'No transpose', N, I-1, -ONE, Y, LDY, T( 1, I ),
+     $               1, ONE, Y( 1, I ), 1 )
          CALL DSCAL( N, TAU( I ), Y( 1, I ), 1 )
 *
 *        Compute T(1:i,i)
 *
          CALL DSCAL( I-1, -TAU( I ), T( 1, I ), 1 )
-         CALL DTRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T, LDT,
-     $               T( 1, I ), 1 )
+         CALL DTRMV( 'Upper', 'No transpose', 'Non-unit', I-1,
+     $               T, LDT, T( 1, I ), 1 )
          T( I, I ) = TAU( I )
 *
    10 CONTINUE
diff --git a/SRC/DEPRECATED/dlatzm.f b/SRC/DEPRECATED/dlatzm.f
index 1e8cc9f57f..3ca9320789 100644
--- a/SRC/DEPRECATED/dlatzm.f
+++ b/SRC/DEPRECATED/dlatzm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLATZM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlatzm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlatzm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -147,7 +145,8 @@
 *> \ingroup doubleOTHERcomputational
 *
 *  =====================================================================
-      SUBROUTINE DLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC, WORK )
+      SUBROUTINE DLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC,
+     $                   WORK )
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -202,8 +201,8 @@ SUBROUTINE DLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC, WORK )
 *        w := C1 + C2 * v
 *
          CALL DCOPY( M, C1, 1, WORK, 1 )
-         CALL DGEMV( 'No transpose', M, N-1, ONE, C2, LDC, V, INCV, ONE,
-     $               WORK, 1 )
+         CALL DGEMV( 'No transpose', M, N-1, ONE, C2, LDC, V, INCV,
+     $               ONE, WORK, 1 )
 *
 *        [ C1, C2 ] := [ C1, C2 ] - tau* w * [ 1 , v**T]
 *
diff --git a/SRC/DEPRECATED/dtzrqf.f b/SRC/DEPRECATED/dtzrqf.f
index efd7c2497a..1473ea4ac2 100644
--- a/SRC/DEPRECATED/dtzrqf.f
+++ b/SRC/DEPRECATED/dtzrqf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTZRQF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtzrqf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtzrqf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -194,7 +192,8 @@ SUBROUTINE DTZRQF( M, N, A, LDA, TAU, INFO )
 *           Use a Householder reflection to zero the kth row of A.
 *           First set up the reflection.
 *
-            CALL DLARFG( N-M+1, A( K, K ), A( K, M1 ), LDA, TAU( K ) )
+            CALL DLARFG( N-M+1, A( K, K ), A( K, M1 ), LDA,
+     $                   TAU( K ) )
 *
             IF( ( TAU( K ).NE.ZERO ) .AND. ( K.GT.1 ) ) THEN
 *
@@ -216,8 +215,8 @@ SUBROUTINE DTZRQF( M, N, A, LDA, TAU, INFO )
 *              and       B      := B      - tau*w*z( k )**T.
 *
                CALL DAXPY( K-1, -TAU( K ), TAU, 1, A( 1, K ), 1 )
-               CALL DGER( K-1, N-M, -TAU( K ), TAU, 1, A( K, M1 ), LDA,
-     $                    A( 1, M1 ), LDA )
+               CALL DGER( K-1, N-M, -TAU( K ), TAU, 1, A( K, M1 ),
+     $                    LDA, A( 1, M1 ), LDA )
             END IF
    20    CONTINUE
       END IF
diff --git a/SRC/DEPRECATED/sgegs.f b/SRC/DEPRECATED/sgegs.f
index 2ed9ad942c..4afaafe2cc 100644
--- a/SRC/DEPRECATED/sgegs.f
+++ b/SRC/DEPRECATED/sgegs.f
@@ -1,11 +1,10 @@
-*> \brief <b> SGEGS computes the eigenvalues and, optionally, the left and/or right eigenvectors for GE matrices</b>
+*> \brief <b> SGEGS computes the eigenvalues, real Schur form, and, optionally, the left and/or right Schur vectors of a real matrix pair (A,B)</b>
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEGS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgegs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgegs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -358,7 +356,8 @@ SUBROUTINE SGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHAR,
       END IF
 *
       IF( ILASCL ) THEN
-         CALL SLASCL( 'G', -1, -1, ANRM, ANRMTO, N, N, A, LDA, IINFO )
+         CALL SLASCL( 'G', -1, -1, ANRM, ANRMTO, N, N, A, LDA,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
@@ -378,7 +377,8 @@ SUBROUTINE SGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHAR,
       END IF
 *
       IF( ILBSCL ) THEN
-         CALL SLASCL( 'G', -1, -1, BNRM, BNRMTO, N, N, B, LDB, IINFO )
+         CALL SLASCL( 'G', -1, -1, BNRM, BNRMTO, N, N, B, LDB,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
@@ -496,7 +496,8 @@ SUBROUTINE SGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHAR,
 *     Undo scaling
 *
       IF( ILASCL ) THEN
-         CALL SLASCL( 'H', -1, -1, ANRMTO, ANRM, N, N, A, LDA, IINFO )
+         CALL SLASCL( 'H', -1, -1, ANRMTO, ANRM, N, N, A, LDA,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
@@ -516,12 +517,14 @@ SUBROUTINE SGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHAR,
       END IF
 *
       IF( ILBSCL ) THEN
-         CALL SLASCL( 'U', -1, -1, BNRMTO, BNRM, N, N, B, LDB, IINFO )
+         CALL SLASCL( 'U', -1, -1, BNRMTO, BNRM, N, N, B, LDB,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
          END IF
-         CALL SLASCL( 'G', -1, -1, BNRMTO, BNRM, N, 1, BETA, N, IINFO )
+         CALL SLASCL( 'G', -1, -1, BNRMTO, BNRM, N, 1, BETA, N,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
diff --git a/SRC/DEPRECATED/sgegv.f b/SRC/DEPRECATED/sgegv.f
index 7a179a4993..9ea97bacc5 100644
--- a/SRC/DEPRECATED/sgegv.f
+++ b/SRC/DEPRECATED/sgegv.f
@@ -1,11 +1,10 @@
-*> \brief <b> SGEEVX computes the eigenvalues and, optionally, the left and/or right eigenvectors for GE matrices</b>
+*> \brief <b> SGEGV computes the eigenvalues and, optionally, the left and/or right eigenvectors of a real matrix pair (A,B).</b>
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgegv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgegv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -301,8 +299,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SGEGV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
-     $                  BETA, VL, LDVL, VR, LDVR, WORK, LWORK, INFO )
+      SUBROUTINE SGEGV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
+     $                  ALPHAI, BETA, VL, LDVL, VR, LDVR, WORK, LWORK,
+     $                  INFO )
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sgelqs.f b/SRC/DEPRECATED/sgelqs.f
similarity index 95%
rename from TESTING/LIN/sgelqs.f
rename to SRC/DEPRECATED/sgelqs.f
index 83afb4690b..2b1dd44b71 100644
--- a/TESTING/LIN/sgelqs.f
+++ b/SRC/DEPRECATED/sgelqs.f
@@ -16,7 +16,7 @@
 *       ..
 *       .. Array Arguments ..
 *       REAL               A( LDA, * ), B( LDB, * ), TAU( * ),
-*      $                   WORK( LWORK )
+*      $                   WORK( * )
 *       ..
 *
 *
@@ -128,7 +128,7 @@ SUBROUTINE SGELQS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
 *     ..
 *     .. Array Arguments ..
       REAL               A( LDA, * ), B( LDB, * ), TAU( * ),
-     $                   WORK( LWORK )
+     $                   WORK( * )
 *     ..
 *
 *  =====================================================================
@@ -174,18 +174,19 @@ SUBROUTINE SGELQS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
 *
 *     Solve L*X = B(1:m,:)
 *
-      CALL STRSM( 'Left', 'Lower', 'No transpose', 'Non-unit', M, NRHS,
-     $            ONE, A, LDA, B, LDB )
+      CALL STRSM( 'Left', 'Lower', 'No transpose', 'Non-unit', M,
+     $            NRHS, ONE, A, LDA, B, LDB )
 *
 *     Set B(m+1:n,:) to zero
 *
       IF( M.LT.N )
-     $   CALL SLASET( 'Full', N-M, NRHS, ZERO, ZERO, B( M+1, 1 ), LDB )
+     $   CALL SLASET( 'Full', N-M, NRHS, ZERO, ZERO, B( M+1, 1 ),
+     $                LDB )
 *
 *     B := Q' * B
 *
-      CALL SORMLQ( 'Left', 'Transpose', N, NRHS, M, A, LDA, TAU, B, LDB,
-     $             WORK, LWORK, INFO )
+      CALL SORMLQ( 'Left', 'Transpose', N, NRHS, M, A, LDA, TAU, B,
+     $             LDB, WORK, LWORK, INFO )
 *
       RETURN
 *
diff --git a/SRC/DEPRECATED/sgelsx.f b/SRC/DEPRECATED/sgelsx.f
index 8760a02a6f..0ee9294a14 100644
--- a/SRC/DEPRECATED/sgelsx.f
+++ b/SRC/DEPRECATED/sgelsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGELSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgelsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgelsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -173,8 +171,8 @@
 *> \ingroup realGEsolve
 *
 *  =====================================================================
-      SUBROUTINE SGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
-     $                   WORK, INFO )
+      SUBROUTINE SGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND,
+     $                   RANK, WORK, INFO )
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -208,7 +206,7 @@ SUBROUTINE SGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
       EXTERNAL           SLAMCH, SLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEQPF, SLABAD, SLAIC1, SLASCL, SLASET, SLATZM,
+      EXTERNAL           SGEQPF, SLAIC1, SLASCL, SLASET, SLATZM,
      $                   SORM2R, STRSM, STZRQF, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -251,7 +249,6 @@ SUBROUTINE SGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
       SMLNUM = SLAMCH( 'S' ) / SLAMCH( 'P' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A, B if max elements outside range [SMLNUM,BIGNUM]
 *
@@ -284,20 +281,23 @@ SUBROUTINE SGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
 *        Scale matrix norm up to SMLNUM
 *
-         CALL SLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 1
       ELSE IF( BNRM.GT.BIGNUM ) THEN
 *
 *        Scale matrix norm down to BIGNUM
 *
-         CALL SLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 2
       END IF
 *
 *     Compute QR factorization with column pivoting of A:
 *        A * P = Q * R
 *
-      CALL SGEQPF( M, N, A, LDA, JPVT, WORK( 1 ), WORK( MN+1 ), INFO )
+      CALL SGEQPF( M, N, A, LDA, JPVT, WORK( 1 ), WORK( MN+1 ),
+     $             INFO )
 *
 *     workspace 3*N. Details of Householder rotations stored
 *     in WORK(1:MN).
@@ -351,15 +351,15 @@ SUBROUTINE SGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
 *     B(1:M,1:NRHS) := Q**T * B(1:M,1:NRHS)
 *
-      CALL SORM2R( 'Left', 'Transpose', M, NRHS, MN, A, LDA, WORK( 1 ),
-     $             B, LDB, WORK( 2*MN+1 ), INFO )
+      CALL SORM2R( 'Left', 'Transpose', M, NRHS, MN, A, LDA,
+     $             WORK( 1 ), B, LDB, WORK( 2*MN+1 ), INFO )
 *
 *     workspace NRHS
 *
 *     B(1:RANK,1:NRHS) := inv(T11) * B(1:RANK,1:NRHS)
 *
-      CALL STRSM( 'Left', 'Upper', 'No transpose', 'Non-unit', RANK,
-     $            NRHS, ONE, A, LDA, B, LDB )
+      CALL STRSM( 'Left', 'Upper', 'No transpose', 'Non-unit',
+     $            RANK, NRHS, ONE, A, LDA, B, LDB )
 *
       DO 40 I = RANK + 1, N
          DO 30 J = 1, NRHS
@@ -409,18 +409,22 @@ SUBROUTINE SGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *     Undo scaling
 *
       IF( IASCL.EQ.1 ) THEN
-         CALL SLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL SLASCL( 'U', 0, 0, SMLNUM, ANRM, RANK, RANK, A, LDA,
      $                INFO )
       ELSE IF( IASCL.EQ.2 ) THEN
-         CALL SLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL SLASCL( 'U', 0, 0, BIGNUM, ANRM, RANK, RANK, A, LDA,
      $                INFO )
       END IF
       IF( IBSCL.EQ.1 ) THEN
-         CALL SLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL SLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       END IF
 *
   100 CONTINUE
diff --git a/SRC/DEPRECATED/sgeqpf.f b/SRC/DEPRECATED/sgeqpf.f
index f5a2494691..8e40b39dc3 100644
--- a/SRC/DEPRECATED/sgeqpf.f
+++ b/SRC/DEPRECATED/sgeqpf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEQPF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgeqpf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgeqpf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -218,8 +216,8 @@ SUBROUTINE SGEQPF( M, N, A, LDA, JPVT, TAU, WORK, INFO )
          MA = MIN( ITEMP, M )
          CALL SGEQR2( M, MA, A, LDA, TAU, WORK, INFO )
          IF( MA.LT.N ) THEN
-            CALL SORM2R( 'Left', 'Transpose', M, N-MA, MA, A, LDA, TAU,
-     $                   A( 1, MA+1 ), LDA, WORK, INFO )
+            CALL SORM2R( 'Left', 'Transpose', M, N-MA, MA, A, LDA,
+     $                   TAU, A( 1, MA+1 ), LDA, WORK, INFO )
          END IF
       END IF
 *
@@ -253,7 +251,8 @@ SUBROUTINE SGEQPF( M, N, A, LDA, JPVT, TAU, WORK, INFO )
 *           Generate elementary reflector H(i)
 *
             IF( I.LT.M ) THEN
-               CALL SLARFG( M-I+1, A( I, I ), A( I+1, I ), 1, TAU( I ) )
+               CALL SLARFG( M-I+1, A( I, I ), A( I+1, I ), 1,
+     $                      TAU( I ) )
             ELSE
                CALL SLARFG( 1, A( M, M ), A( M, M ), 1, TAU( M ) )
             END IF
@@ -264,8 +263,8 @@ SUBROUTINE SGEQPF( M, N, A, LDA, JPVT, TAU, WORK, INFO )
 *
                AII = A( I, I )
                A( I, I ) = ONE
-               CALL SLARF( 'LEFT', M-I+1, N-I, A( I, I ), 1, TAU( I ),
-     $                     A( I, I+1 ), LDA, WORK( 2*N+1 ) )
+               CALL SLARF( 'LEFT', M-I+1, N-I, A( I, I ), 1,
+     $                     TAU( I ), A( I, I+1 ), LDA, WORK( 2*N+1 ) )
                A( I, I ) = AII
             END IF
 *
diff --git a/TESTING/LIN/sgeqrs.f b/SRC/DEPRECATED/sgeqrs.f
similarity index 98%
rename from TESTING/LIN/sgeqrs.f
rename to SRC/DEPRECATED/sgeqrs.f
index ed11489104..bdbad5dcb4 100644
--- a/TESTING/LIN/sgeqrs.f
+++ b/SRC/DEPRECATED/sgeqrs.f
@@ -16,7 +16,7 @@
 *       ..
 *       .. Array Arguments ..
 *       REAL               A( LDA, * ), B( LDB, * ), TAU( * ),
-*      $                   WORK( LWORK )
+*      $                   WORK( * )
 *       ..
 *
 *
@@ -128,7 +128,7 @@ SUBROUTINE SGEQRS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
 *     ..
 *     .. Array Arguments ..
       REAL               A( LDA, * ), B( LDB, * ), TAU( * ),
-     $                   WORK( LWORK )
+     $                   WORK( * )
 *     ..
 *
 *  =====================================================================
diff --git a/SRC/DEPRECATED/sggsvd.f b/SRC/DEPRECATED/sggsvd.f
index 7bc1b929e5..09d9759255 100644
--- a/SRC/DEPRECATED/sggsvd.f
+++ b/SRC/DEPRECATED/sggsvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGSVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sggsvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sggsvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
diff --git a/SRC/DEPRECATED/sggsvp.f b/SRC/DEPRECATED/sggsvp.f
index 4ecebdf14e..086d60291a 100644
--- a/SRC/DEPRECATED/sggsvp.f
+++ b/SRC/DEPRECATED/sggsvp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGSVP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sggsvp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sggsvp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -392,8 +390,8 @@ SUBROUTINE SGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update Q := Q*Z**T
 *
-            CALL SORMR2( 'Right', 'Transpose', N, N, L, B, LDB, TAU, Q,
-     $                   LDQ, WORK, INFO )
+            CALL SORMR2( 'Right', 'Transpose', N, N, L, B, LDB, TAU,
+     $                   Q, LDQ, WORK, INFO )
          END IF
 *
 *        Clean up B
@@ -439,8 +437,8 @@ SUBROUTINE SGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
          CALL SLASET( 'Full', M, M, ZERO, ZERO, U, LDU )
          IF( M.GT.1 )
-     $      CALL SLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA, U( 2, 1 ),
-     $                   LDU )
+     $      CALL SLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA,
+     $                   U( 2, 1 ), LDU )
          CALL SORG2R( M, M, MIN( M, N-L ), U, LDU, TAU, WORK, INFO )
       END IF
 *
@@ -460,7 +458,8 @@ SUBROUTINE SGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
    90    CONTINUE
   100 CONTINUE
       IF( M.GT.K )
-     $   CALL SLASET( 'Full', M-K, N-L, ZERO, ZERO, A( K+1, 1 ), LDA )
+     $   CALL SLASET( 'Full', M-K, N-L, ZERO, ZERO, A( K+1, 1 ),
+     $                LDA )
 *
       IF( N-L.GT.K ) THEN
 *
@@ -472,8 +471,8 @@ SUBROUTINE SGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update Q( 1:N,1:N-L ) = Q( 1:N,1:N-L )*Z1**T
 *
-            CALL SORMR2( 'Right', 'Transpose', N, N-L, K, A, LDA, TAU,
-     $                   Q, LDQ, WORK, INFO )
+            CALL SORMR2( 'Right', 'Transpose', N, N-L, K, A, LDA,
+     $                   TAU, Q, LDQ, WORK, INFO )
          END IF
 *
 *        Clean up A
@@ -497,9 +496,9 @@ SUBROUTINE SGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update U(:,K+1:M) := U(:,K+1:M)*U1
 *
-            CALL SORM2R( 'Right', 'No transpose', M, M-K, MIN( M-K, L ),
-     $                   A( K+1, N-L+1 ), LDA, TAU, U( 1, K+1 ), LDU,
-     $                   WORK, INFO )
+            CALL SORM2R( 'Right', 'No transpose', M, M-K,
+     $                   MIN( M-K, L ), A( K+1, N-L+1 ), LDA, TAU,
+     $                   U( 1, K+1 ), LDU, WORK, INFO )
          END IF
 *
 *        Clean up
diff --git a/SRC/DEPRECATED/slahrd.f b/SRC/DEPRECATED/slahrd.f
index 9e001c740b..6a36ca72f5 100644
--- a/SRC/DEPRECATED/slahrd.f
+++ b/SRC/DEPRECATED/slahrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAHRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slahrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slahrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,7 +120,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lahrd
 *
 *> \par Further Details:
 *  =====================
@@ -221,8 +219,8 @@ SUBROUTINE SLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *           w := V1**T * b1
 *
             CALL SCOPY( I-1, A( K+1, I ), 1, T( 1, NB ), 1 )
-            CALL STRMV( 'Lower', 'Transpose', 'Unit', I-1, A( K+1, 1 ),
-     $                  LDA, T( 1, NB ), 1 )
+            CALL STRMV( 'Lower', 'Transpose', 'Unit', I-1,
+     $                  A( K+1, 1 ), LDA, T( 1, NB ), 1 )
 *
 *           w := w + V2**T *b2
 *
@@ -231,13 +229,14 @@ SUBROUTINE SLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *
 *           w := T**T *w
 *
-            CALL STRMV( 'Upper', 'Transpose', 'Non-unit', I-1, T, LDT,
-     $                  T( 1, NB ), 1 )
+            CALL STRMV( 'Upper', 'Transpose', 'Non-unit', I-1, T,
+     $                  LDT, T( 1, NB ), 1 )
 *
 *           b2 := b2 - V2*w
 *
-            CALL SGEMV( 'No transpose', N-K-I+1, I-1, -ONE, A( K+I, 1 ),
-     $                  LDA, T( 1, NB ), 1, ONE, A( K+I, I ), 1 )
+            CALL SGEMV( 'No transpose', N-K-I+1, I-1, -ONE,
+     $                  A( K+I, 1 ), LDA, T( 1, NB ), 1, ONE,
+     $                  A( K+I, I ), 1 )
 *
 *           b1 := b1 - V1*w
 *
@@ -251,26 +250,26 @@ SUBROUTINE SLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *        Generate the elementary reflector H(i) to annihilate
 *        A(k+i+1:n,i)
 *
-         CALL SLARFG( N-K-I+1, A( K+I, I ), A( MIN( K+I+1, N ), I ), 1,
-     $                TAU( I ) )
+         CALL SLARFG( N-K-I+1, A( K+I, I ), A( MIN( K+I+1, N ), I ),
+     $                1, TAU( I ) )
          EI = A( K+I, I )
          A( K+I, I ) = ONE
 *
 *        Compute  Y(1:n,i)
 *
-         CALL SGEMV( 'No transpose', N, N-K-I+1, ONE, A( 1, I+1 ), LDA,
-     $               A( K+I, I ), 1, ZERO, Y( 1, I ), 1 )
-         CALL SGEMV( 'Transpose', N-K-I+1, I-1, ONE, A( K+I, 1 ), LDA,
-     $               A( K+I, I ), 1, ZERO, T( 1, I ), 1 )
-         CALL SGEMV( 'No transpose', N, I-1, -ONE, Y, LDY, T( 1, I ), 1,
-     $               ONE, Y( 1, I ), 1 )
+         CALL SGEMV( 'No transpose', N, N-K-I+1, ONE, A( 1, I+1 ),
+     $               LDA, A( K+I, I ), 1, ZERO, Y( 1, I ), 1 )
+         CALL SGEMV( 'Transpose', N-K-I+1, I-1, ONE, A( K+I, 1 ),
+     $               LDA, A( K+I, I ), 1, ZERO, T( 1, I ), 1 )
+         CALL SGEMV( 'No transpose', N, I-1, -ONE, Y, LDY, T( 1, I ),
+     $               1, ONE, Y( 1, I ), 1 )
          CALL SSCAL( N, TAU( I ), Y( 1, I ), 1 )
 *
 *        Compute T(1:i,i)
 *
          CALL SSCAL( I-1, -TAU( I ), T( 1, I ), 1 )
-         CALL STRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T, LDT,
-     $               T( 1, I ), 1 )
+         CALL STRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T,
+     $               LDT, T( 1, I ), 1 )
          T( I, I ) = TAU( I )
 *
    10 CONTINUE
diff --git a/SRC/DEPRECATED/slatzm.f b/SRC/DEPRECATED/slatzm.f
index bb24c281ba..31510411f0 100644
--- a/SRC/DEPRECATED/slatzm.f
+++ b/SRC/DEPRECATED/slatzm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLATZM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slatzm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slatzm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -147,7 +145,8 @@
 *> \ingroup realOTHERcomputational
 *
 *  =====================================================================
-      SUBROUTINE SLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC, WORK )
+      SUBROUTINE SLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC,
+     $                   WORK )
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -202,8 +201,8 @@ SUBROUTINE SLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC, WORK )
 *        w := C1 + C2 * v
 *
          CALL SCOPY( M, C1, 1, WORK, 1 )
-         CALL SGEMV( 'No transpose', M, N-1, ONE, C2, LDC, V, INCV, ONE,
-     $               WORK, 1 )
+         CALL SGEMV( 'No transpose', M, N-1, ONE, C2, LDC, V, INCV,
+     $               ONE, WORK, 1 )
 *
 *        [ C1, C2 ] := [ C1, C2 ] - tau* w * [ 1 , v**T]
 *
diff --git a/SRC/DEPRECATED/stzrqf.f b/SRC/DEPRECATED/stzrqf.f
index c2f55f367c..a1ff7f5aec 100644
--- a/SRC/DEPRECATED/stzrqf.f
+++ b/SRC/DEPRECATED/stzrqf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STZRQF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stzrqf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stzrqf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -194,7 +192,8 @@ SUBROUTINE STZRQF( M, N, A, LDA, TAU, INFO )
 *           Use a Householder reflection to zero the kth row of A.
 *           First set up the reflection.
 *
-            CALL SLARFG( N-M+1, A( K, K ), A( K, M1 ), LDA, TAU( K ) )
+            CALL SLARFG( N-M+1, A( K, K ), A( K, M1 ), LDA,
+     $                   TAU( K ) )
 *
             IF( ( TAU( K ).NE.ZERO ) .AND. ( K.GT.1 ) ) THEN
 *
@@ -216,8 +215,8 @@ SUBROUTINE STZRQF( M, N, A, LDA, TAU, INFO )
 *              and       B      := B      - tau*w*z( k )**T.
 *
                CALL SAXPY( K-1, -TAU( K ), TAU, 1, A( 1, K ), 1 )
-               CALL SGER( K-1, N-M, -TAU( K ), TAU, 1, A( K, M1 ), LDA,
-     $                    A( 1, M1 ), LDA )
+               CALL SGER( K-1, N-M, -TAU( K ), TAU, 1, A( K, M1 ),
+     $                    LDA, A( 1, M1 ), LDA )
             END IF
    20    CONTINUE
       END IF
diff --git a/SRC/DEPRECATED/zgegs.f b/SRC/DEPRECATED/zgegs.f
index c5cdd26e5e..67c6175c62 100644
--- a/SRC/DEPRECATED/zgegs.f
+++ b/SRC/DEPRECATED/zgegs.f
@@ -1,11 +1,10 @@
-*> \brief <b> ZGEEVX computes the eigenvalues and, optionally, the left and/or right eigenvectors for GE matrices</b>
+*> \brief <b> ZGEGS computes the eigenvalues, Schur form, and, optionally, the left and or/right Schur vectors of a complex matrix pair (A,B)</b>
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEGS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgegs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgegs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -219,9 +217,9 @@
 *> \ingroup complex16GEeigen
 *
 *  =====================================================================
-      SUBROUTINE ZGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHA, BETA,
-     $                  VSL, LDVSL, VSR, LDVSR, WORK, LWORK, RWORK,
-     $                  INFO )
+      SUBROUTINE ZGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHA,
+     $                  BETA, VSL, LDVSL, VSR, LDVSR, WORK, LWORK,
+     $                  RWORK, INFO )
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -360,7 +358,8 @@ SUBROUTINE ZGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHA, BETA,
       END IF
 *
       IF( ILASCL ) THEN
-         CALL ZLASCL( 'G', -1, -1, ANRM, ANRMTO, N, N, A, LDA, IINFO )
+         CALL ZLASCL( 'G', -1, -1, ANRM, ANRMTO, N, N, A, LDA,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
@@ -380,7 +379,8 @@ SUBROUTINE ZGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHA, BETA,
       END IF
 *
       IF( ILBSCL ) THEN
-         CALL ZLASCL( 'G', -1, -1, BNRM, BNRMTO, N, N, B, LDB, IINFO )
+         CALL ZLASCL( 'G', -1, -1, BNRM, BNRMTO, N, N, B, LDB,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
@@ -493,12 +493,14 @@ SUBROUTINE ZGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHA, BETA,
 *     Undo scaling
 *
       IF( ILASCL ) THEN
-         CALL ZLASCL( 'U', -1, -1, ANRMTO, ANRM, N, N, A, LDA, IINFO )
+         CALL ZLASCL( 'U', -1, -1, ANRMTO, ANRM, N, N, A, LDA,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
          END IF
-         CALL ZLASCL( 'G', -1, -1, ANRMTO, ANRM, N, 1, ALPHA, N, IINFO )
+         CALL ZLASCL( 'G', -1, -1, ANRMTO, ANRM, N, 1, ALPHA, N,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
@@ -506,12 +508,14 @@ SUBROUTINE ZGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHA, BETA,
       END IF
 *
       IF( ILBSCL ) THEN
-         CALL ZLASCL( 'U', -1, -1, BNRMTO, BNRM, N, N, B, LDB, IINFO )
+         CALL ZLASCL( 'U', -1, -1, BNRMTO, BNRM, N, N, B, LDB,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
          END IF
-         CALL ZLASCL( 'G', -1, -1, BNRMTO, BNRM, N, 1, BETA, N, IINFO )
+         CALL ZLASCL( 'G', -1, -1, BNRMTO, BNRM, N, 1, BETA, N,
+     $                IINFO )
          IF( IINFO.NE.0 ) THEN
             INFO = N + 9
             RETURN
diff --git a/SRC/DEPRECATED/zgegv.f b/SRC/DEPRECATED/zgegv.f
index aa4ab3f713..b8769f61a6 100644
--- a/SRC/DEPRECATED/zgegv.f
+++ b/SRC/DEPRECATED/zgegv.f
@@ -1,11 +1,10 @@
-*> \brief <b> ZGEEVX computes the eigenvalues and, optionally, the left and/or right eigenvectors for GE matrices</b>
+*> \brief <b> ZGEGV computes the eigenvalues and, optionally, the left and/or right eigenvectors of a complex matrix pair (A,B).</b>
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgegv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgegv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
diff --git a/TESTING/LIN/zgelqs.f b/SRC/DEPRECATED/zgelqs.f
similarity index 98%
rename from TESTING/LIN/zgelqs.f
rename to SRC/DEPRECATED/zgelqs.f
index 5f629f8c7e..772165dfd9 100644
--- a/TESTING/LIN/zgelqs.f
+++ b/SRC/DEPRECATED/zgelqs.f
@@ -16,7 +16,7 @@
 *       ..
 *       .. Array Arguments ..
 *       COMPLEX*16         A( LDA, * ), B( LDB, * ), TAU( * ),
-*      $                   WORK( LWORK )
+*      $                   WORK( * )
 *       ..
 *
 *
@@ -128,7 +128,7 @@ SUBROUTINE ZGELQS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
 *     ..
 *     .. Array Arguments ..
       COMPLEX*16         A( LDA, * ), B( LDB, * ), TAU( * ),
-     $                   WORK( LWORK )
+     $                   WORK( * )
 *     ..
 *
 *  =====================================================================
diff --git a/SRC/DEPRECATED/zgelsx.f b/SRC/DEPRECATED/zgelsx.f
index 0482b401df..dc324831f2 100644
--- a/SRC/DEPRECATED/zgelsx.f
+++ b/SRC/DEPRECATED/zgelsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGELSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgelsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgelsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -179,8 +177,8 @@
 *> \ingroup complex16GEsolve
 *
 *  =====================================================================
-      SUBROUTINE ZGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
-     $                   WORK, RWORK, INFO )
+      SUBROUTINE ZGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND,
+     $                   RANK, WORK, RWORK, INFO )
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -262,7 +260,6 @@ SUBROUTINE ZGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
       SMLNUM = DLAMCH( 'S' ) / DLAMCH( 'P' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A, B if max elements outside range [SMLNUM,BIGNUM]
 *
@@ -295,21 +292,23 @@ SUBROUTINE ZGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
 *        Scale matrix norm up to SMLNUM
 *
-         CALL ZLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 1
       ELSE IF( BNRM.GT.BIGNUM ) THEN
 *
 *        Scale matrix norm down to BIGNUM
 *
-         CALL ZLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 2
       END IF
 *
 *     Compute QR factorization with column pivoting of A:
 *        A * P = Q * R
 *
-      CALL ZGEQPF( M, N, A, LDA, JPVT, WORK( 1 ), WORK( MN+1 ), RWORK,
-     $             INFO )
+      CALL ZGEQPF( M, N, A, LDA, JPVT, WORK( 1 ), WORK( MN+1 ),
+     $             RWORK, INFO )
 *
 *     complex workspace MN+N. Real workspace 2*N. Details of Householder
 *     rotations stored in WORK(1:MN).
@@ -363,8 +362,8 @@ SUBROUTINE ZGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
 *     B(1:M,1:NRHS) := Q**H * B(1:M,1:NRHS)
 *
-      CALL ZUNM2R( 'Left', 'Conjugate transpose', M, NRHS, MN, A, LDA,
-     $             WORK( 1 ), B, LDB, WORK( 2*MN+1 ), INFO )
+      CALL ZUNM2R( 'Left', 'Conjugate transpose', M, NRHS, MN, A,
+     $             LDA, WORK( 1 ), B, LDB, WORK( 2*MN+1 ), INFO )
 *
 *     workspace NRHS
 *
@@ -383,8 +382,8 @@ SUBROUTINE ZGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
       IF( RANK.LT.N ) THEN
          DO 50 I = 1, RANK
-            CALL ZLATZM( 'Left', N-RANK+1, NRHS, A( I, RANK+1 ), LDA,
-     $                   DCONJG( WORK( MN+I ) ), B( I, 1 ),
+            CALL ZLATZM( 'Left', N-RANK+1, NRHS, A( I, RANK+1 ),
+     $                   LDA, DCONJG( WORK( MN+I ) ), B( I, 1 ),
      $                   B( RANK+1, 1 ), LDB, WORK( 2*MN+1 ) )
    50    CONTINUE
       END IF
@@ -421,18 +420,22 @@ SUBROUTINE ZGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *     Undo scaling
 *
       IF( IASCL.EQ.1 ) THEN
-         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL ZLASCL( 'U', 0, 0, SMLNUM, ANRM, RANK, RANK, A, LDA,
      $                INFO )
       ELSE IF( IASCL.EQ.2 ) THEN
-         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL ZLASCL( 'U', 0, 0, BIGNUM, ANRM, RANK, RANK, A, LDA,
      $                INFO )
       END IF
       IF( IBSCL.EQ.1 ) THEN
-         CALL ZLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL ZLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       END IF
 *
   100 CONTINUE
diff --git a/SRC/DEPRECATED/zgeqpf.f b/SRC/DEPRECATED/zgeqpf.f
index 3eba142c5c..93c2790531 100644
--- a/SRC/DEPRECATED/zgeqpf.f
+++ b/SRC/DEPRECATED/zgeqpf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEQPF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeqpf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeqpf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
diff --git a/TESTING/LIN/zgeqrs.f b/SRC/DEPRECATED/zgeqrs.f
similarity index 98%
rename from TESTING/LIN/zgeqrs.f
rename to SRC/DEPRECATED/zgeqrs.f
index 6583e38591..cc33a45fc1 100644
--- a/TESTING/LIN/zgeqrs.f
+++ b/SRC/DEPRECATED/zgeqrs.f
@@ -16,7 +16,7 @@
 *       ..
 *       .. Array Arguments ..
 *       COMPLEX*16         A( LDA, * ), B( LDB, * ), TAU( * ),
-*      $                   WORK( LWORK )
+*      $                   WORK( * )
 *       ..
 *
 *
@@ -128,7 +128,7 @@ SUBROUTINE ZGEQRS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
 *     ..
 *     .. Array Arguments ..
       COMPLEX*16         A( LDA, * ), B( LDB, * ), TAU( * ),
-     $                   WORK( LWORK )
+     $                   WORK( * )
 *     ..
 *
 *  =====================================================================
diff --git a/SRC/DEPRECATED/zggsvd.f b/SRC/DEPRECATED/zggsvd.f
index c0b9247a61..af9874067a 100644
--- a/SRC/DEPRECATED/zggsvd.f
+++ b/SRC/DEPRECATED/zggsvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGSVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zggsvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zggsvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,7 +104,7 @@
 *> In particular, if B is an N-by-N nonsingular matrix, then the GSVD of
 *> A and B implicitly gives the SVD of A*inv(B):
 *>                      A*inv(B) = U*(D1*inv(D2))*V**H.
-*> If ( A**H,B**H)**H has orthnormal columns, then the GSVD of A and B is also
+*> If ( A**H,B**H)**H has orthonormal columns, then the GSVD of A and B is also
 *> equal to the CS decomposition of A and B. Furthermore, the GSVD can
 *> be used to derive the solution of the eigenvalue problem:
 *>                      A**H*A x = lambda* B**H*B x.
diff --git a/SRC/DEPRECATED/zggsvp.f b/SRC/DEPRECATED/zggsvp.f
index 9468bea062..2a5a5c7e29 100644
--- a/SRC/DEPRECATED/zggsvp.f
+++ b/SRC/DEPRECATED/zggsvp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGSVP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zggsvp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zggsvp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -246,7 +244,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup ggsvp
 *
 *> \par Further Details:
 *  =====================
@@ -385,7 +383,8 @@ SUBROUTINE ZGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
    30    CONTINUE
    40 CONTINUE
       IF( P.GT.L )
-     $   CALL ZLASET( 'Full', P-L, N, CZERO, CZERO, B( L+1, 1 ), LDB )
+     $   CALL ZLASET( 'Full', P-L, N, CZERO, CZERO, B( L+1, 1 ),
+     $                LDB )
 *
       IF( WANTQ ) THEN
 *
@@ -403,8 +402,8 @@ SUBROUTINE ZGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *        Update A := A*Z**H
 *
-         CALL ZUNMR2( 'Right', 'Conjugate transpose', M, N, L, B, LDB,
-     $                TAU, A, LDA, WORK, INFO )
+         CALL ZUNMR2( 'Right', 'Conjugate transpose', M, N, L, B,
+     $                LDB, TAU, A, LDA, WORK, INFO )
          IF( WANTQ ) THEN
 *
 *           Update Q := Q*Z**H
@@ -447,8 +446,9 @@ SUBROUTINE ZGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *     Update A12 := U**H*A12, where A12 = A( 1:M, N-L+1:N )
 *
-      CALL ZUNM2R( 'Left', 'Conjugate transpose', M, L, MIN( M, N-L ),
-     $             A, LDA, TAU, A( 1, N-L+1 ), LDA, WORK, INFO )
+      CALL ZUNM2R( 'Left', 'Conjugate transpose', M, L,
+     $             MIN( M, N-L ), A, LDA, TAU, A( 1, N-L+1 ), LDA,
+     $             WORK, INFO )
 *
       IF( WANTU ) THEN
 *
@@ -456,9 +456,10 @@ SUBROUTINE ZGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
          CALL ZLASET( 'Full', M, M, CZERO, CZERO, U, LDU )
          IF( M.GT.1 )
-     $      CALL ZLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA, U( 2, 1 ),
-     $                   LDU )
-         CALL ZUNG2R( M, M, MIN( M, N-L ), U, LDU, TAU, WORK, INFO )
+     $      CALL ZLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA,
+     $                   U( 2, 1 ), LDU )
+         CALL ZUNG2R( M, M, MIN( M, N-L ), U, LDU, TAU, WORK,
+     $                INFO )
       END IF
 *
       IF( WANTQ ) THEN
@@ -477,7 +478,8 @@ SUBROUTINE ZGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
    90    CONTINUE
   100 CONTINUE
       IF( M.GT.K )
-     $   CALL ZLASET( 'Full', M-K, N-L, CZERO, CZERO, A( K+1, 1 ), LDA )
+     $   CALL ZLASET( 'Full', M-K, N-L, CZERO, CZERO, A( K+1, 1 ),
+     $                LDA )
 *
       IF( N-L.GT.K ) THEN
 *
@@ -489,8 +491,8 @@ SUBROUTINE ZGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update Q( 1:N,1:N-L ) = Q( 1:N,1:N-L )*Z1**H
 *
-            CALL ZUNMR2( 'Right', 'Conjugate transpose', N, N-L, K, A,
-     $                   LDA, TAU, Q, LDQ, WORK, INFO )
+            CALL ZUNMR2( 'Right', 'Conjugate transpose', N, N-L, K,
+     $                   A, LDA, TAU, Q, LDQ, WORK, INFO )
          END IF
 *
 *        Clean up A
@@ -514,9 +516,9 @@ SUBROUTINE ZGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update U(:,K+1:M) := U(:,K+1:M)*U1
 *
-            CALL ZUNM2R( 'Right', 'No transpose', M, M-K, MIN( M-K, L ),
-     $                   A( K+1, N-L+1 ), LDA, TAU, U( 1, K+1 ), LDU,
-     $                   WORK, INFO )
+            CALL ZUNM2R( 'Right', 'No transpose', M, M-K,
+     $                   MIN( M-K, L ), A( K+1, N-L+1 ), LDA, TAU,
+     $                   U( 1, K+1 ), LDU, WORK, INFO )
          END IF
 *
 *        Clean up
diff --git a/SRC/DEPRECATED/zlahrd.f b/SRC/DEPRECATED/zlahrd.f
index 1690bd5b57..7d127da2ae 100644
--- a/SRC/DEPRECATED/zlahrd.f
+++ b/SRC/DEPRECATED/zlahrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAHRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlahrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlahrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,7 +120,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lahrd
 *
 *> \par Further Details:
 *  =====================
@@ -236,13 +234,14 @@ SUBROUTINE ZLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *
 *           w := T**H *w
 *
-            CALL ZTRMV( 'Upper', 'Conjugate transpose', 'Non-unit', I-1,
-     $                  T, LDT, T( 1, NB ), 1 )
+            CALL ZTRMV( 'Upper', 'Conjugate transpose', 'Non-unit',
+     $                  I-1, T, LDT, T( 1, NB ), 1 )
 *
 *           b2 := b2 - V2*w
 *
-            CALL ZGEMV( 'No transpose', N-K-I+1, I-1, -ONE, A( K+I, 1 ),
-     $                  LDA, T( 1, NB ), 1, ONE, A( K+I, I ), 1 )
+            CALL ZGEMV( 'No transpose', N-K-I+1, I-1, -ONE,
+     $                  A( K+I, 1 ), LDA, T( 1, NB ), 1, ONE,
+     $                  A( K+I, I ), 1 )
 *
 *           b1 := b1 - V1*w
 *
@@ -263,20 +262,20 @@ SUBROUTINE ZLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *
 *        Compute  Y(1:n,i)
 *
-         CALL ZGEMV( 'No transpose', N, N-K-I+1, ONE, A( 1, I+1 ), LDA,
-     $               A( K+I, I ), 1, ZERO, Y( 1, I ), 1 )
+         CALL ZGEMV( 'No transpose', N, N-K-I+1, ONE, A( 1, I+1 ),
+     $               LDA, A( K+I, I ), 1, ZERO, Y( 1, I ), 1 )
          CALL ZGEMV( 'Conjugate transpose', N-K-I+1, I-1, ONE,
      $               A( K+I, 1 ), LDA, A( K+I, I ), 1, ZERO, T( 1, I ),
      $               1 )
-         CALL ZGEMV( 'No transpose', N, I-1, -ONE, Y, LDY, T( 1, I ), 1,
-     $               ONE, Y( 1, I ), 1 )
+         CALL ZGEMV( 'No transpose', N, I-1, -ONE, Y, LDY, T( 1, I ),
+     $               1, ONE, Y( 1, I ), 1 )
          CALL ZSCAL( N, TAU( I ), Y( 1, I ), 1 )
 *
 *        Compute T(1:i,i)
 *
          CALL ZSCAL( I-1, -TAU( I ), T( 1, I ), 1 )
-         CALL ZTRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T, LDT,
-     $               T( 1, I ), 1 )
+         CALL ZTRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T, 
+     $               LDT, T( 1, I ), 1 )
          T( I, I ) = TAU( I )
 *
    10 CONTINUE
diff --git a/SRC/DEPRECATED/zlatzm.f b/SRC/DEPRECATED/zlatzm.f
index 8b93c5a7b3..7abed9ca16 100644
--- a/SRC/DEPRECATED/zlatzm.f
+++ b/SRC/DEPRECATED/zlatzm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLATZM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlatzm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlatzm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -145,10 +143,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup latzm
 *
 *  =====================================================================
-      SUBROUTINE ZLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC, WORK )
+      SUBROUTINE ZLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC,
+     $                   WORK )
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -206,8 +205,8 @@ SUBROUTINE ZLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC, WORK )
 *        w := C1 + C2 * v
 *
          CALL ZCOPY( M, C1, 1, WORK, 1 )
-         CALL ZGEMV( 'No transpose', M, N-1, ONE, C2, LDC, V, INCV, ONE,
-     $               WORK, 1 )
+         CALL ZGEMV( 'No transpose', M, N-1, ONE, C2, LDC, V, INCV,
+     $               ONE, WORK, 1 )
 *
 *        [ C1, C2 ] := [ C1, C2 ] - tau* w * [ 1 , v**H]
 *
diff --git a/SRC/DEPRECATED/ztzrqf.f b/SRC/DEPRECATED/ztzrqf.f
index d3c356dcb9..497739a1bc 100644
--- a/SRC/DEPRECATED/ztzrqf.f
+++ b/SRC/DEPRECATED/ztzrqf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTZRQF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztzrqf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztzrqf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -99,7 +97,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tzrqf
 *
 *> \par Further Details:
 *  =====================
@@ -217,14 +215,15 @@ SUBROUTINE ZTZRQF( M, N, A, LDA, TAU, INFO )
 *
 *              Form   w = a( k ) + B*z( k )  in TAU.
 *
-               CALL ZGEMV( 'No transpose', K-1, N-M, CONE, A( 1, M1 ),
-     $                     LDA, A( K, M1 ), LDA, CONE, TAU, 1 )
+               CALL ZGEMV( 'No transpose', K-1, N-M, CONE,
+     $                     A( 1, M1 ), LDA, A( K, M1 ), LDA, CONE, TAU,
+     $                     1 )
 *
 *              Now form  a( k ) := a( k ) - conjg(tau)*w
 *              and       B      := B      - conjg(tau)*w*z( k )**H.
 *
-               CALL ZAXPY( K-1, -DCONJG( TAU( K ) ), TAU, 1, A( 1, K ),
-     $                     1 )
+               CALL ZAXPY( K-1, -DCONJG( TAU( K ) ), TAU, 1,
+     $                     A( 1, K ), 1 )
                CALL ZGERC( K-1, N-M, -DCONJG( TAU( K ) ), TAU, 1,
      $                     A( K, M1 ), LDA, A( 1, M1 ), LDA )
             END IF
diff --git a/SRC/Makefile b/SRC/Makefile
index b05c81fddd..13e47020df 100644
--- a/SRC/Makefile
+++ b/SRC/Makefile
@@ -118,8 +118,8 @@ SLASRC = \
    sgbsvx.o sgbtf2.o sgbtrf.o sgbtrs.o sgebak.o sgebal.o sgebd2.o \
    sgebrd.o sgecon.o sgeequ.o sgees.o  sgeesx.o sgeev.o  sgeevx.o \
    sgehd2.o sgehrd.o sgelq2.o sgelqf.o \
-   sgels.o  sgelsd.o sgelss.o sgelsy.o sgeql2.o sgeqlf.o \
-   sgeqp3.o sgeqr2.o sgeqr2p.o sgeqrf.o sgeqrfp.o sgerfs.o \
+   sgels.o  sgelst.o sgelsd.o sgelss.o sgelsy.o sgeql2.o sgeqlf.o \
+   sgeqp3.o sgeqp3rk.o sgeqr2.o sgeqr2p.o sgeqrf.o sgeqrfp.o sgerfs.o \
    sgerq2.o sgerqf.o sgesc2.o sgesdd.o sgesv.o  sgesvd.o sgesvdx.o sgesvx.o \
    sgetc2.o sgetf2.o sgetri.o \
    sggbak.o sggbal.o sgges.o  sgges3.o sggesx.o \
@@ -134,14 +134,14 @@ SLASRC = \
    slangb.o slange.o slangt.o slanhs.o slansb.o slansp.o \
    slansy.o slantb.o slantp.o slantr.o slanv2.o \
    slapll.o slapmt.o \
-   slaqgb.o slaqge.o slaqp2.o slaqps.o slaqsb.o slaqsp.o slaqsy.o \
+   slaqgb.o slaqge.o slaqp2.o slaqps.o slaqp2rk.o slaqp3rk.o slaqsb.o slaqsp.o slaqsy.o \
    slaqr0.o slaqr1.o slaqr2.o slaqr3.o slaqr4.o slaqr5.o \
    slaqtr.o slar1v.o slar2v.o ilaslr.o ilaslc.o \
-   slarf.o  slarfb.o slarfb_gett.o slarfg.o slarfgp.o slarft.o slarfx.o slarfy.o slargv.o \
-   slarrv.o slartv.o \
+   slarf.o  slarf1f.o slarf1l.o slarfb.o slarfb_gett.o slarfg.o slarfgp.o slarft.o slarft_lvl2.o slarfx.o slarfy.o \
+   slargv.o slarmm.o slarrv.o slartv.o \
    slarz.o  slarzb.o slarzt.o slaswp.o slasy2.o slasyf.o slasyf_rook.o \
    slasyf_rk.o \
-   slatbs.o slatdf.o slatps.o slatrd.o slatrs.o slatrz.o \
+   slatbs.o slatdf.o slatps.o slatrd.o slatrs.o slatrs3.o slatrz.o \
    slauu2.o slauum.o sopgtr.o sopmtr.o sorg2l.o sorg2r.o \
    sorgbr.o sorghr.o sorgl2.o sorglq.o sorgql.o sorgqr.o sorgr2.o \
    sorgrq.o sorgtr.o sorgtsqr.o sorgtsqr_row.o sorm2l.o sorm2r.o sorm22.o \
@@ -174,7 +174,7 @@ SLASRC = \
    stgsja.o stgsna.o stgsy2.o stgsyl.o stpcon.o stprfs.o stptri.o \
    stptrs.o \
    strcon.o strevc.o strevc3.o strexc.o strrfs.o strsen.o strsna.o strsyl.o \
-   strti2.o strtri.o strtrs.o stzrzf.o sstemr.o \
+   strsyl3.o strti2.o strtri.o strtrs.o stzrzf.o sstemr.o \
    slansf.o spftrf.o spftri.o spftrs.o ssfrk.o stfsm.o stftri.o stfttp.o \
    stfttr.o stpttf.o stpttr.o strttf.o strttp.o \
    sgejsv.o sgesvj.o sgsvj0.o sgsvj1.o \
@@ -191,7 +191,7 @@ SLASRC = \
    ssytrd_2stage.o ssytrd_sy2sb.o ssytrd_sb2st.o ssb2st_kernels.o \
    ssyevd_2stage.o ssyev_2stage.o ssyevx_2stage.o ssyevr_2stage.o \
    ssbev_2stage.o ssbevx_2stage.o ssbevd_2stage.o ssygv_2stage.o \
-   sgesvdq.o
+   sgesvdq.o sgedmd.o sgedmdq.o
 
 DSLASRC = spotrs.o sgetrs.o spotrf.o sgetrf.o
 
@@ -211,8 +211,8 @@ CLASRC = \
    cgbtf2.o cgbtrf.o cgbtrs.o cgebak.o cgebal.o cgebd2.o cgebrd.o \
    cgecon.o cgeequ.o cgees.o  cgeesx.o cgeev.o  cgeevx.o \
    cgehd2.o cgehrd.o cgelq2.o cgelqf.o \
-   cgels.o  cgelsd.o cgelss.o cgelsy.o cgeql2.o cgeqlf.o cgeqp3.o \
-   cgeqr2.o cgeqr2p.o cgeqrf.o cgeqrfp.o cgerfs.o \
+   cgels.o  cgelst.o cgelsd.o cgelss.o cgelsy.o cgeql2.o cgeqlf.o \
+   cgeqp3.o cgeqp3rk.o cgeqr2.o cgeqr2p.o cgeqrf.o cgeqrfp.o cgerfs.o \
    cgerq2.o cgerqf.o cgesc2.o cgesdd.o cgesv.o  cgesvd.o  cgesvdx.o \
    cgesvj.o cgejsv.o cgsvj0.o cgsvj1.o \
    cgesvx.o cgetc2.o cgetf2.o cgetri.o \
@@ -246,21 +246,21 @@ CLASRC = \
    clanhb.o clanhe.o \
    clanhp.o clanhs.o clanht.o clansb.o clansp.o clansy.o clantb.o \
    clantp.o clantr.o clapll.o clapmt.o clarcm.o claqgb.o claqge.o \
-   claqhb.o claqhe.o claqhp.o claqp2.o claqps.o claqsb.o \
+   claqhb.o claqhe.o claqhp.o claqp2.o claqps.o claqp2rk.o claqp3rk.o claqsb.o \
    claqr0.o claqr1.o claqr2.o claqr3.o claqr4.o claqr5.o \
    claqsp.o claqsy.o clar1v.o clar2v.o ilaclr.o ilaclc.o \
-   clarf.o  clarfb.o clarfb_gett.o clarfg.o clarft.o clarfgp.o \
+   clarf.o  clarf1f.o clarf1l.o clarfb.o clarfb_gett.o clarfg.o clarft.o clarft_lvl2.o clarfgp.o \
    clarfx.o clarfy.o clargv.o clarnv.o clarrv.o clartg.o clartv.o \
    clarz.o  clarzb.o clarzt.o clascl.o claset.o clasr.o  classq.o \
    claswp.o clasyf.o clasyf_rook.o clasyf_rk.o clasyf_aa.o \
-   clatbs.o clatdf.o clatps.o clatrd.o clatrs.o clatrz.o \
+   clatbs.o clatdf.o clatps.o clatrd.o clatrs.o clatrs3.o clatrz.o \
    clauu2.o clauum.o cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o \
    cpbsvx.o cpbtf2.o cpbtrf.o cpbtrs.o cpocon.o cpoequ.o cporfs.o \
    cposv.o  cposvx.o cpotf2.o cpotri.o cpstrf.o cpstf2.o \
    cppcon.o cppequ.o cpprfs.o cppsv.o  cppsvx.o cpptrf.o cpptri.o cpptrs.o \
    cptcon.o cpteqr.o cptrfs.o cptsv.o  cptsvx.o cpttrf.o cpttrs.o cptts2.o \
    crot.o   cspcon.o cspmv.o  cspr.o   csprfs.o cspsv.o \
-   cspsvx.o csptrf.o csptri.o csptrs.o csrscl.o cstedc.o \
+   cspsvx.o csptrf.o csptri.o csptrs.o csrscl.o crscl.o cstedc.o \
    cstegr.o cstein.o csteqr.o \
    csycon.o csymv.o \
    csyr.o csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o csytri.o csytri2.o csytri2x.o \
@@ -275,7 +275,7 @@ CLASRC = \
    ctgexc.o ctgsen.o ctgsja.o ctgsna.o ctgsy2.o ctgsyl.o ctpcon.o \
    ctprfs.o ctptri.o \
    ctptrs.o ctrcon.o ctrevc.o ctrevc3.o ctrexc.o ctrrfs.o ctrsen.o ctrsna.o \
-   ctrsyl.o ctrti2.o ctrtri.o ctrtrs.o ctzrzf.o cung2l.o cung2r.o \
+   ctrsyl.o ctrsyl3.o ctrti2.o ctrtri.o ctrtrs.o ctzrzf.o cung2l.o cung2r.o \
    cungbr.o cunghr.o cungl2.o cunglq.o cungql.o cungqr.o cungr2.o \
    cungrq.o cungtr.o cungtsqr.o cungtsqr_row.o cunm2l.o cunm2r.o cunmbr.o cunmhr.o cunml2.o cunm22.o \
    cunmlq.o cunmql.o cunmqr.o cunmr2.o cunmr3.o cunmrq.o cunmrz.o \
@@ -295,7 +295,7 @@ CLASRC = \
    chetrd_2stage.o chetrd_he2hb.o chetrd_hb2st.o chb2st_kernels.o \
    cheevd_2stage.o cheev_2stage.o cheevx_2stage.o cheevr_2stage.o \
    chbev_2stage.o chbevx_2stage.o chbevd_2stage.o chegv_2stage.o \
-   cgesvdq.o
+   cgesvdq.o cgedmd.o cgedmdq.o
 
 ifdef USEXBLAS
 CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o \
@@ -320,8 +320,8 @@ DLASRC = \
    dgbsvx.o dgbtf2.o dgbtrf.o dgbtrs.o dgebak.o dgebal.o dgebd2.o \
    dgebrd.o dgecon.o dgeequ.o dgees.o  dgeesx.o dgeev.o  dgeevx.o \
    dgehd2.o dgehrd.o dgelq2.o dgelqf.o \
-   dgels.o  dgelsd.o dgelss.o dgelsy.o dgeql2.o dgeqlf.o \
-   dgeqp3.o dgeqr2.o dgeqr2p.o dgeqrf.o dgeqrfp.o dgerfs.o \
+   dgels.o  dgelst.o dgelsd.o dgelss.o dgelsy.o dgeql2.o dgeqlf.o \
+   dgeqp3.o dgeqp3rk.o dgeqr2.o dgeqr2p.o dgeqrf.o dgeqrfp.o dgerfs.o \
    dgerq2.o dgerqf.o dgesc2.o dgesdd.o dgesv.o  dgesvd.o dgesvdx.o dgesvx.o \
    dgetc2.o dgetf2.o dgetrf.o dgetri.o \
    dgetrs.o dggbak.o dggbal.o dgges.o  dgges3.o dggesx.o \
@@ -336,14 +336,14 @@ DLASRC = \
    dlangb.o dlange.o dlangt.o dlanhs.o dlansb.o dlansp.o \
    dlansy.o dlantb.o dlantp.o dlantr.o dlanv2.o \
    dlapll.o dlapmt.o \
-   dlaqgb.o dlaqge.o dlaqp2.o dlaqps.o dlaqsb.o dlaqsp.o dlaqsy.o \
+   dlaqgb.o dlaqge.o dlaqp2.o dlaqps.o dlaqp2rk.o dlaqp3rk.o dlaqsb.o dlaqsp.o dlaqsy.o \
    dlaqr0.o dlaqr1.o dlaqr2.o dlaqr3.o dlaqr4.o dlaqr5.o \
    dlaqtr.o dlar1v.o dlar2v.o iladlr.o iladlc.o \
-   dlarf.o  dlarfb.o dlarfb_gett.o dlarfg.o dlarfgp.o dlarft.o dlarfx.o dlarfy.o \
-   dlargv.o dlarrv.o dlartv.o \
+   dlarf.o  dlarfb.o dlarfb_gett.o dlarfg.o dlarfgp.o dlarft.o dlarft_lvl2.o dlarfx.o dlarfy.o dlarf1f.o dlarf1l.o\
+   dlargv.o dlarmm.o dlarrv.o dlartv.o \
    dlarz.o  dlarzb.o dlarzt.o dlaswp.o dlasy2.o \
    dlasyf.o dlasyf_rook.o dlasyf_rk.o \
-   dlatbs.o dlatdf.o dlatps.o dlatrd.o dlatrs.o dlatrz.o dlauu2.o \
+   dlatbs.o dlatdf.o dlatps.o dlatrd.o dlatrs.o dlatrs3.o dlatrz.o dlauu2.o \
    dlauum.o dopgtr.o dopmtr.o dorg2l.o dorg2r.o \
    dorgbr.o dorghr.o dorgl2.o dorglq.o dorgql.o dorgqr.o dorgr2.o \
    dorgrq.o dorgtr.o dorgtsqr.o dorgtsqr_row.o dorm2l.o dorm2r.o dorm22.o \
@@ -376,7 +376,7 @@ DLASRC = \
    dtgsja.o dtgsna.o dtgsy2.o dtgsyl.o dtpcon.o dtprfs.o dtptri.o \
    dtptrs.o \
    dtrcon.o dtrevc.o dtrevc3.o dtrexc.o dtrrfs.o dtrsen.o dtrsna.o dtrsyl.o \
-   dtrti2.o dtrtri.o dtrtrs.o dtzrzf.o dstemr.o \
+   dtrsyl3.o dtrti2.o dtrtri.o dtrtrs.o dtzrzf.o dstemr.o \
    dsgesv.o dsposv.o dlag2s.o slag2d.o dlat2s.o \
    dlansf.o dpftrf.o dpftri.o dpftrs.o dsfrk.o dtfsm.o dtftri.o dtfttp.o \
    dtfttr.o dtpttf.o dtpttr.o dtrttf.o dtrttp.o \
@@ -394,7 +394,7 @@ DLASRC = \
    dsytrd_2stage.o dsytrd_sy2sb.o dsytrd_sb2st.o dsb2st_kernels.o \
    dsyevd_2stage.o dsyev_2stage.o dsyevx_2stage.o dsyevr_2stage.o \
    dsbev_2stage.o dsbevx_2stage.o dsbevd_2stage.o dsygv_2stage.o \
-   dgesvdq.o
+   dgesvdq.o dgedmd.o dgedmdq.o
 
 ifdef USEXBLAS
 DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o \
@@ -412,7 +412,8 @@ ZLASRC = \
    zgbtf2.o zgbtrf.o zgbtrs.o zgebak.o zgebal.o zgebd2.o zgebrd.o \
    zgecon.o zgeequ.o zgees.o  zgeesx.o zgeev.o  zgeevx.o \
    zgehd2.o zgehrd.o zgelq2.o zgelqf.o \
-   zgels.o  zgelsd.o zgelss.o zgelsy.o zgeql2.o zgeqlf.o zgeqp3.o \
+   zgels.o zgelst.o zgelsd.o zgelss.o zgelsy.o zgeql2.o zgeqlf.o \
+   zgeqp3.o zgeqp3rk.o \
    zgeqr2.o zgeqr2p.o zgeqrf.o zgeqrfp.o zgerfs.o zgerq2.o zgerqf.o \
    zgesc2.o zgesdd.o zgesv.o  zgesvd.o zgesvdx.o \
    zgesvj.o zgejsv.o zgsvj0.o zgsvj1.o \
@@ -449,22 +450,22 @@ ZLASRC = \
    zlanhe.o \
    zlanhp.o zlanhs.o zlanht.o zlansb.o zlansp.o zlansy.o zlantb.o \
    zlantp.o zlantr.o zlapll.o zlapmt.o zlaqgb.o zlaqge.o \
-   zlaqhb.o zlaqhe.o zlaqhp.o zlaqp2.o zlaqps.o zlaqsb.o \
+   zlaqhb.o zlaqhe.o zlaqhp.o zlaqp2.o zlaqps.o zlaqp2rk.o zlaqp3rk.o zlaqsb.o \
    zlaqr0.o zlaqr1.o zlaqr2.o zlaqr3.o zlaqr4.o zlaqr5.o \
    zlaqsp.o zlaqsy.o zlar1v.o zlar2v.o ilazlr.o ilazlc.o \
-   zlarcm.o zlarf.o  zlarfb.o zlarfb_gett.o \
-   zlarfg.o zlarft.o zlarfgp.o \
+   zlarcm.o zlarf.o  zlarfb.o zlarfb_gett.o zlarf1f.o zlarf1l.o \
+   zlarfg.o zlarft.o zlarft_lvl2.o zlarfgp.o \
    zlarfx.o zlarfy.o zlargv.o zlarnv.o zlarrv.o zlartg.o zlartv.o \
    zlarz.o  zlarzb.o zlarzt.o zlascl.o zlaset.o zlasr.o \
    zlassq.o zlaswp.o zlasyf.o zlasyf_rook.o zlasyf_rk.o zlasyf_aa.o \
-   zlatbs.o zlatdf.o zlatps.o zlatrd.o zlatrs.o zlatrz.o zlauu2.o \
+   zlatbs.o zlatdf.o zlatps.o zlatrd.o zlatrs.o zlatrs3.o zlatrz.o zlauu2.o \
    zlauum.o zpbcon.o zpbequ.o zpbrfs.o zpbstf.o zpbsv.o \
    zpbsvx.o zpbtf2.o zpbtrf.o zpbtrs.o zpocon.o zpoequ.o zporfs.o \
    zposv.o  zposvx.o zpotf2.o zpotrf.o zpotri.o zpotrs.o zpstrf.o zpstf2.o \
    zppcon.o zppequ.o zpprfs.o zppsv.o  zppsvx.o zpptrf.o zpptri.o zpptrs.o \
    zptcon.o zpteqr.o zptrfs.o zptsv.o  zptsvx.o zpttrf.o zpttrs.o zptts2.o \
    zrot.o   zspcon.o zspmv.o  zspr.o   zsprfs.o zspsv.o \
-   zspsvx.o zsptrf.o zsptri.o zsptrs.o zdrscl.o zstedc.o \
+   zspsvx.o zsptrf.o zsptri.o zsptrs.o zdrscl.o zrscl.o zstedc.o \
    zstegr.o zstein.o zsteqr.o \
    zsycon.o zsymv.o \
    zsyr.o zsyrfs.o zsysv.o zsysvx.o zsytf2.o zsytrf.o zsytri.o zsytri2.o zsytri2x.o \
@@ -479,7 +480,7 @@ ZLASRC = \
    ztgexc.o ztgsen.o ztgsja.o ztgsna.o ztgsy2.o ztgsyl.o ztpcon.o \
    ztprfs.o ztptri.o \
    ztptrs.o ztrcon.o ztrevc.o ztrevc3.o ztrexc.o ztrrfs.o ztrsen.o ztrsna.o \
-   ztrsyl.o ztrti2.o ztrtri.o ztrtrs.o ztzrzf.o zung2l.o \
+   ztrsyl.o ztrsyl3.o ztrti2.o ztrtri.o ztrtrs.o ztzrzf.o zung2l.o \
    zung2r.o zungbr.o zunghr.o zungl2.o zunglq.o zungql.o zungqr.o zungr2.o \
    zungrq.o zungtr.o zungtsqr.o zungtsqr_row.o zunm2l.o zunm2r.o zunmbr.o zunmhr.o zunml2.o zunm22.o \
    zunmlq.o zunmql.o zunmqr.o zunmr2.o zunmr3.o zunmrq.o zunmrz.o \
@@ -501,7 +502,7 @@ ZLASRC = \
    zhetrd_2stage.o zhetrd_he2hb.o zhetrd_hb2st.o zhb2st_kernels.o \
    zheevd_2stage.o zheev_2stage.o zheevx_2stage.o zheevr_2stage.o \
    zhbev_2stage.o zhbevx_2stage.o zhbevd_2stage.o zhegv_2stage.o \
-   zgesvdq.o
+   zgesvdq.o zgedmd.o zgedmdq.o
 
 ifdef USEXBLAS
 ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o \
@@ -515,18 +516,22 @@ ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o \
    zla_lin_berr.o zlarscl2.o zlascl2.o zla_wwaddw.o
 endif
 
-DEPRECSRC = DEPRECATED/cgegs.o DEPRECATED/cgegv.o DEPRECATED/cgelsx.o \
-   DEPRECATED/cgeqpf.o DEPRECATED/cggsvd.o DEPRECATED/cggsvp.o \
-   DEPRECATED/clahrd.o DEPRECATED/clatzm.o DEPRECATED/ctzrqf.o \
-   DEPRECATED/dgegs.o  DEPRECATED/dgegv.o  DEPRECATED/dgelsx.o \
-   DEPRECATED/dgeqpf.o DEPRECATED/dggsvd.o DEPRECATED/dggsvp.o \
-   DEPRECATED/dlahrd.o DEPRECATED/dlatzm.o DEPRECATED/dtzrqf.o \
-   DEPRECATED/sgegs.o  DEPRECATED/sgegv.o  DEPRECATED/sgelsx.o \
-   DEPRECATED/sgeqpf.o DEPRECATED/sggsvd.o DEPRECATED/sggsvp.o \
-   DEPRECATED/slahrd.o DEPRECATED/slatzm.o DEPRECATED/stzrqf.o \
-   DEPRECATED/zgegs.o  DEPRECATED/zgegv.o  DEPRECATED/zgelsx.o \
-   DEPRECATED/zgeqpf.o DEPRECATED/zggsvd.o DEPRECATED/zggsvp.o \
-   DEPRECATED/zlahrd.o DEPRECATED/zlatzm.o DEPRECATED/ztzrqf.o
+DEPRECSRC = DEPRECATED/cgegs.o DEPRECATED/cgegv.o DEPRECATED/cgelqs.o \
+   DEPRECATED/cgelsx.o DEPRECATED/cgeqpf.o DEPRECATED/cgeqrs.o \
+   DEPRECATED/cggsvd.o DEPRECATED/cggsvp.o DEPRECATED/clahrd.o \
+   DEPRECATED/clatzm.o DEPRECATED/ctzrqf.o \
+   DEPRECATED/dgegs.o  DEPRECATED/dgegv.o  DEPRECATED/dgelqs.o \
+   DEPRECATED/dgelsx.o DEPRECATED/dgeqpf.o DEPRECATED/dgeqrs.o \
+   DEPRECATED/dggsvd.o DEPRECATED/dggsvp.o DEPRECATED/dlahrd.o \
+   DEPRECATED/dlatzm.o DEPRECATED/dtzrqf.o \
+   DEPRECATED/sgegs.o  DEPRECATED/sgegv.o  DEPRECATED/sgelqs.o \
+   DEPRECATED/sgelsx.o DEPRECATED/sgeqpf.o DEPRECATED/sgeqrs.o \
+   DEPRECATED/sggsvd.o DEPRECATED/sggsvp.o DEPRECATED/slahrd.o \
+   DEPRECATED/slatzm.o DEPRECATED/stzrqf.o \
+   DEPRECATED/zgegs.o  DEPRECATED/zgegv.o  DEPRECATED/zgelqs.o \
+   DEPRECATED/zgelsx.o DEPRECATED/zgeqpf.o DEPRECATED/zgeqrs.o \
+   DEPRECATED/zggsvd.o DEPRECATED/zggsvp.o DEPRECATED/zlahrd.o \
+   DEPRECATED/zlatzm.o DEPRECATED/ztzrqf.o
 
 ALLOBJ = $(SLASRC) $(DLASRC) $(DSLASRC) $(CLASRC) $(ZLASRC) $(ZCLASRC) \
    $(SCLAUX) $(DZLAUX) $(ALLAUX)
diff --git a/SRC/VARIANTS/Makefile b/SRC/VARIANTS/Makefile
index 25d8ee1751..0fd8ebf736 100644
--- a/SRC/VARIANTS/Makefile
+++ b/SRC/VARIANTS/Makefile
@@ -28,8 +28,7 @@ LULL = lu/LL/cgetrf.o lu/LL/dgetrf.o lu/LL/sgetrf.o lu/LL/zgetrf.o
 
 LUREC = lu/REC/cgetrf.o lu/REC/dgetrf.o lu/REC/sgetrf.o lu/REC/zgetrf.o
 
-QRLL = qr/LL/cgeqrf.o qr/LL/dgeqrf.o qr/LL/sgeqrf.o qr/LL/zgeqrf.o qr/LL/sceil.o
-
+QRLL = qr/LL/cgeqrf.o qr/LL/dgeqrf.o qr/LL/sgeqrf.o qr/LL/zgeqrf.o
 
 .PHONY: all
 all: cholrl.a choltop.a lucr.a lull.a lurec.a qrll.a
diff --git a/SRC/VARIANTS/README b/SRC/VARIANTS/README
index ef7626debe..217cfa3e01 100644
--- a/SRC/VARIANTS/README
+++ b/SRC/VARIANTS/README
@@ -23,6 +23,7 @@ This directory contains several variants of LAPACK routines in single/double/com
 	- [sdcz]geqrf with QR Left Looking Level 3 BLAS version algorithm [2]- Directory: SRC/VARIANTS/qr/LL
 	- [sdcz]potrf with Cholesky Right Looking Level 3 BLAS version algorithm [2]- Directory: SRC/VARIANTS/cholesky/RL
 	- [sdcz]potrf with Cholesky Top Level 3 BLAS version algorithm [2]- Directory: SRC/VARIANTS/cholesky/TOP
+	- [sdcz]larft using a Left Looking Level 2 BLAS version algorithm - Directory: SRC/VARIANTS/larft/LL-LVL2
 
 References:For a more detailed description please refer to
 	- [1] Toledo, S. 1997. Locality of Reference in LU Decomposition with Partial Pivoting. SIAM J. Matrix Anal. Appl. 18, 4 (Oct. 1997),
@@ -44,6 +45,7 @@ Corresponding libraries created in SRC/VARIANTS:
 	- QR Left Looking : qrll.a
 	- Cholesky Right Looking : cholrl.a
 	- Cholesky Top : choltop.a
+	- LARFT Level 2: larftl2.a
 
 
 ===========
diff --git a/SRC/VARIANTS/cholesky/RL/cpotrf.f b/SRC/VARIANTS/cholesky/RL/cpotrf.f
index 16d250c3ff..99b509b475 100644
--- a/SRC/VARIANTS/cholesky/RL/cpotrf.f
+++ b/SRC/VARIANTS/cholesky/RL/cpotrf.f
@@ -24,7 +24,7 @@
 C>\details \b Purpose:
 C>\verbatim
 C>
-C> CPOTRF computes the Cholesky factorization of a real Hermitian
+C> CPOTRF computes the Cholesky factorization of a complex Hermitian
 C> positive definite matrix A.
 C>
 C> The factorization has the form
@@ -79,8 +79,8 @@
 C>          INFO is INTEGER
 C>          = 0:  successful exit
 C>          < 0:  if INFO = -i, the i-th argument had an illegal value
-C>          > 0:  if INFO = i, the leading minor of order i is not
-C>                positive definite, and the factorization could not be
+C>          > 0:  if INFO = i, the leading principal minor of order i
+C>                is not positive, and the factorization could not be
 C>                completed.
 C> \endverbatim
 C>
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE CPOTRF ( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -129,7 +130,7 @@ SUBROUTINE CPOTRF ( UPLO, N, A, LDA, INFO )
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMM, CPOTF2, CHERK, CTRSM, XERBLA
+      EXTERNAL           CGEMM, CHERK, CPOTRF2, CTRSM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -164,7 +165,7 @@ SUBROUTINE CPOTRF ( UPLO, N, A, LDA, INFO )
 *
 *        Use unblocked code.
 *
-         CALL CPOTF2( UPLO, N, A, LDA, INFO )
+         CALL CPOTRF2( UPLO, N, A, LDA, INFO )
       ELSE
 *
 *        Use blocked code.
@@ -180,7 +181,7 @@ SUBROUTINE CPOTRF ( UPLO, N, A, LDA, INFO )
 *
                JB = MIN( NB, N-J+1 )
 
-               CALL CPOTF2( 'Upper', JB, A( J, J ), LDA, INFO )
+               CALL CPOTRF2( 'Upper', JB, A( J, J ), LDA, INFO )
 
                IF( INFO.NE.0 )
      $            GO TO 30
@@ -209,7 +210,7 @@ SUBROUTINE CPOTRF ( UPLO, N, A, LDA, INFO )
 *
                JB = MIN( NB, N-J+1 )
 
-               CALL CPOTF2( 'Lower', JB, A( J, J ), LDA, INFO )
+               CALL CPOTRF2( 'Lower', JB, A( J, J ), LDA, INFO )
 
                IF( INFO.NE.0 )
      $            GO TO 30
diff --git a/SRC/VARIANTS/cholesky/RL/dpotrf.f b/SRC/VARIANTS/cholesky/RL/dpotrf.f
index 1575bd95ca..e1de96d9ad 100644
--- a/SRC/VARIANTS/cholesky/RL/dpotrf.f
+++ b/SRC/VARIANTS/cholesky/RL/dpotrf.f
@@ -79,8 +79,8 @@
 C>          INFO is INTEGER
 C>          = 0:  successful exit
 C>          < 0:  if INFO = -i, the i-th argument had an illegal value
-C>          > 0:  if INFO = i, the leading minor of order i is not
-C>                positive definite, and the factorization could not be
+C>          > 0:  if INFO = i, the leading principal minor of order i
+C>                is not positive, and the factorization could not be
 C>                completed.
 C> \endverbatim
 C>
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE DPOTRF ( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -128,7 +129,7 @@ SUBROUTINE DPOTRF ( UPLO, N, A, LDA, INFO )
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DPOTF2, DSYRK, DTRSM, XERBLA
+      EXTERNAL           DGEMM, DPOTRF2, DSYRK, DTRSM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -163,7 +164,7 @@ SUBROUTINE DPOTRF ( UPLO, N, A, LDA, INFO )
 *
 *        Use unblocked code.
 *
-         CALL DPOTF2( UPLO, N, A, LDA, INFO )
+         CALL DPOTRF2( UPLO, N, A, LDA, INFO )
       ELSE
 *
 *        Use blocked code.
@@ -179,7 +180,7 @@ SUBROUTINE DPOTRF ( UPLO, N, A, LDA, INFO )
 *
                JB = MIN( NB, N-J+1 )
 
-               CALL DPOTF2( 'Upper', JB, A( J, J ), LDA, INFO )
+               CALL DPOTRF2( 'Upper', JB, A( J, J ), LDA, INFO )
 
                IF( INFO.NE.0 )
      $            GO TO 30
@@ -208,7 +209,7 @@ SUBROUTINE DPOTRF ( UPLO, N, A, LDA, INFO )
 *
                JB = MIN( NB, N-J+1 )
 
-               CALL DPOTF2( 'Lower', JB, A( J, J ), LDA, INFO )
+               CALL DPOTRF2( 'Lower', JB, A( J, J ), LDA, INFO )
 
                IF( INFO.NE.0 )
      $            GO TO 30
diff --git a/SRC/VARIANTS/cholesky/RL/spotrf.f b/SRC/VARIANTS/cholesky/RL/spotrf.f
index 67ebae3351..b739f622ca 100644
--- a/SRC/VARIANTS/cholesky/RL/spotrf.f
+++ b/SRC/VARIANTS/cholesky/RL/spotrf.f
@@ -79,8 +79,8 @@
 C>          INFO is INTEGER
 C>          = 0:  successful exit
 C>          < 0:  if INFO = -i, the i-th argument had an illegal value
-C>          > 0:  if INFO = i, the leading minor of order i is not
-C>                positive definite, and the factorization could not be
+C>          > 0:  if INFO = i, the leading principal minor of order i
+C>                is not positive, and the factorization could not be
 C>                completed.
 C> \endverbatim
 C>
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE SPOTRF ( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -128,7 +129,7 @@ SUBROUTINE SPOTRF ( UPLO, N, A, LDA, INFO )
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMM, SPOTF2, SSYRK, STRSM, XERBLA
+      EXTERNAL           SGEMM, SPOTRF2, SSYRK, STRSM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -163,7 +164,7 @@ SUBROUTINE SPOTRF ( UPLO, N, A, LDA, INFO )
 *
 *        Use unblocked code.
 *
-         CALL SPOTF2( UPLO, N, A, LDA, INFO )
+         CALL SPOTRF2( UPLO, N, A, LDA, INFO )
       ELSE
 *
 *        Use blocked code.
@@ -179,7 +180,7 @@ SUBROUTINE SPOTRF ( UPLO, N, A, LDA, INFO )
 *
                JB = MIN( NB, N-J+1 )
 
-               CALL SPOTF2( 'Upper', JB, A( J, J ), LDA, INFO )
+               CALL SPOTRF2( 'Upper', JB, A( J, J ), LDA, INFO )
 
                IF( INFO.NE.0 )
      $            GO TO 30
@@ -208,7 +209,7 @@ SUBROUTINE SPOTRF ( UPLO, N, A, LDA, INFO )
 *
                JB = MIN( NB, N-J+1 )
 
-               CALL SPOTF2( 'Lower', JB, A( J, J ), LDA, INFO )
+               CALL SPOTRF2( 'Lower', JB, A( J, J ), LDA, INFO )
 
                IF( INFO.NE.0 )
      $            GO TO 30
diff --git a/SRC/VARIANTS/cholesky/RL/zpotrf.f b/SRC/VARIANTS/cholesky/RL/zpotrf.f
index 76d8bab610..1642a47977 100644
--- a/SRC/VARIANTS/cholesky/RL/zpotrf.f
+++ b/SRC/VARIANTS/cholesky/RL/zpotrf.f
@@ -24,7 +24,7 @@
 C>\details \b Purpose:
 C>\verbatim
 C>
-C> ZPOTRF computes the Cholesky factorization of a real Hermitian
+C> ZPOTRF computes the Cholesky factorization of a complex Hermitian
 C> positive definite matrix A.
 C>
 C> The factorization has the form
@@ -79,8 +79,8 @@
 C>          INFO is INTEGER
 C>          = 0:  successful exit
 C>          < 0:  if INFO = -i, the i-th argument had an illegal value
-C>          > 0:  if INFO = i, the leading minor of order i is not
-C>                positive definite, and the factorization could not be
+C>          > 0:  if INFO = i, the leading principal minor of order i
+C>                is not positive, and the factorization could not be
 C>                completed.
 C> \endverbatim
 C>
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZPOTRF ( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -129,7 +130,7 @@ SUBROUTINE ZPOTRF ( UPLO, N, A, LDA, INFO )
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZGEMM, ZPOTF2, ZHERK, ZTRSM, XERBLA
+      EXTERNAL           XERBLA, ZGEMM, ZHERK, ZPOTRF2, ZTRSM
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -164,7 +165,7 @@ SUBROUTINE ZPOTRF ( UPLO, N, A, LDA, INFO )
 *
 *        Use unblocked code.
 *
-         CALL ZPOTF2( UPLO, N, A, LDA, INFO )
+         CALL ZPOTRF2( UPLO, N, A, LDA, INFO )
       ELSE
 *
 *        Use blocked code.
@@ -180,7 +181,7 @@ SUBROUTINE ZPOTRF ( UPLO, N, A, LDA, INFO )
 *
                JB = MIN( NB, N-J+1 )
 
-               CALL ZPOTF2( 'Upper', JB, A( J, J ), LDA, INFO )
+               CALL ZPOTRF2( 'Upper', JB, A( J, J ), LDA, INFO )
 
                IF( INFO.NE.0 )
      $            GO TO 30
@@ -209,7 +210,7 @@ SUBROUTINE ZPOTRF ( UPLO, N, A, LDA, INFO )
 *
                JB = MIN( NB, N-J+1 )
 
-               CALL ZPOTF2( 'Lower', JB, A( J, J ), LDA, INFO )
+               CALL ZPOTRF2( 'Lower', JB, A( J, J ), LDA, INFO )
 
                IF( INFO.NE.0 )
      $            GO TO 30
diff --git a/SRC/VARIANTS/cholesky/TOP/cpotrf.f b/SRC/VARIANTS/cholesky/TOP/cpotrf.f
index d6149c08f0..a69779fced 100644
--- a/SRC/VARIANTS/cholesky/TOP/cpotrf.f
+++ b/SRC/VARIANTS/cholesky/TOP/cpotrf.f
@@ -24,7 +24,7 @@
 C>\details \b Purpose:
 C>\verbatim
 C>
-C> CPOTRF computes the Cholesky factorization of a real symmetric
+C> CPOTRF computes the Cholesky factorization of a complex Hermitian
 C> positive definite matrix A.
 C>
 C> The factorization has the form
@@ -55,7 +55,7 @@
 C> \param[in,out] A
 C> \verbatim
 C>          A is COMPLEX array, dimension (LDA,N)
-C>          On entry, the symmetric matrix A.  If UPLO = 'U', the leading
+C>          On entry, the Hermitian matrix A.  If UPLO = 'U', the leading
 C>          N-by-N upper triangular part of A contains the upper
 C>          triangular part of the matrix A, and the strictly lower
 C>          triangular part of A is not referenced.  If UPLO = 'L', the
@@ -79,8 +79,8 @@
 C>          INFO is INTEGER
 C>          = 0:  successful exit
 C>          < 0:  if INFO = -i, the i-th argument had an illegal value
-C>          > 0:  if INFO = i, the leading minor of order i is not
-C>                positive definite, and the factorization could not be
+C>          > 0:  if INFO = i, the leading principal minor of order i
+C>                is not positive, and the factorization could not be
 C>                completed.
 C> \endverbatim
 C>
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE CPOTRF ( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -129,7 +130,7 @@ SUBROUTINE CPOTRF ( UPLO, N, A, LDA, INFO )
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMM, CPOTF2, CHERK, CTRSM, XERBLA
+      EXTERNAL           CGEMM, CHERK, CPOTRF2, CTRSM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -164,7 +165,7 @@ SUBROUTINE CPOTRF ( UPLO, N, A, LDA, INFO )
 *
 *        Use unblocked code.
 *
-         CALL CPOTF2( UPLO, N, A, LDA, INFO )
+         CALL CPOTRF2( UPLO, N, A, LDA, INFO )
       ELSE
 *
 *        Use blocked code.
@@ -189,7 +190,7 @@ SUBROUTINE CPOTRF ( UPLO, N, A, LDA, INFO )
 *              Update and factorize the current diagonal block and test
 *              for non-positive-definiteness.
 *
-               CALL CPOTF2( 'Upper', JB, A( J, J ), LDA, INFO )
+               CALL CPOTRF2( 'Upper', JB, A( J, J ), LDA, INFO )
                IF( INFO.NE.0 )
      $            GO TO 30
 
@@ -216,7 +217,7 @@ SUBROUTINE CPOTRF ( UPLO, N, A, LDA, INFO )
 *              Update and factorize the current diagonal block and test
 *              for non-positive-definiteness.
 *
-               CALL CPOTF2( 'Lower', JB, A( J, J ), LDA, INFO )
+               CALL CPOTRF2( 'Lower', JB, A( J, J ), LDA, INFO )
                IF( INFO.NE.0 )
      $            GO TO 30
 
diff --git a/SRC/VARIANTS/cholesky/TOP/dpotrf.f b/SRC/VARIANTS/cholesky/TOP/dpotrf.f
index e49200ea5a..e992c8cfba 100644
--- a/SRC/VARIANTS/cholesky/TOP/dpotrf.f
+++ b/SRC/VARIANTS/cholesky/TOP/dpotrf.f
@@ -79,8 +79,8 @@
 C>          INFO is INTEGER
 C>          = 0:  successful exit
 C>          < 0:  if INFO = -i, the i-th argument had an illegal value
-C>          > 0:  if INFO = i, the leading minor of order i is not
-C>                positive definite, and the factorization could not be
+C>          > 0:  if INFO = i, the leading principal minor of order i
+C>                is not positive, and the factorization could not be
 C>                completed.
 C> \endverbatim
 C>
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE DPOTRF ( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -128,7 +129,7 @@ SUBROUTINE DPOTRF ( UPLO, N, A, LDA, INFO )
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DPOTF2, DSYRK, DTRSM, XERBLA
+      EXTERNAL           DGEMM, DPOTRF2, DSYRK, DTRSM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -163,7 +164,7 @@ SUBROUTINE DPOTRF ( UPLO, N, A, LDA, INFO )
 *
 *        Use unblocked code.
 *
-         CALL DPOTF2( UPLO, N, A, LDA, INFO )
+         CALL DPOTRF2( UPLO, N, A, LDA, INFO )
       ELSE
 *
 *        Use blocked code.
@@ -189,7 +190,7 @@ SUBROUTINE DPOTRF ( UPLO, N, A, LDA, INFO )
 *              Update and factorize the current diagonal block and test
 *              for non-positive-definiteness.
 *
-               CALL DPOTF2( 'Upper', JB, A( J, J ), LDA, INFO )
+               CALL DPOTRF2( 'Upper', JB, A( J, J ), LDA, INFO )
                IF( INFO.NE.0 )
      $            GO TO 30
 
@@ -217,7 +218,7 @@ SUBROUTINE DPOTRF ( UPLO, N, A, LDA, INFO )
 *              Update and factorize the current diagonal block and test
 *              for non-positive-definiteness.
 *
-               CALL DPOTF2( 'Lower', JB, A( J, J ), LDA, INFO )
+               CALL DPOTRF2( 'Lower', JB, A( J, J ), LDA, INFO )
                IF( INFO.NE.0 )
      $            GO TO 30
 
diff --git a/SRC/VARIANTS/cholesky/TOP/spotrf.f b/SRC/VARIANTS/cholesky/TOP/spotrf.f
index 65895502b4..5df525a528 100644
--- a/SRC/VARIANTS/cholesky/TOP/spotrf.f
+++ b/SRC/VARIANTS/cholesky/TOP/spotrf.f
@@ -79,8 +79,8 @@
 C>          INFO is INTEGER
 C>          = 0:  successful exit
 C>          < 0:  if INFO = -i, the i-th argument had an illegal value
-C>          > 0:  if INFO = i, the leading minor of order i is not
-C>                positive definite, and the factorization could not be
+C>          > 0:  if INFO = i, the leading principal minor of order i
+C>                is not positive, and the factorization could not be
 C>                completed.
 C> \endverbatim
 C>
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE SPOTRF ( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -128,7 +129,7 @@ SUBROUTINE SPOTRF ( UPLO, N, A, LDA, INFO )
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMM, SPOTF2, SSYRK, STRSM, XERBLA
+      EXTERNAL           SGEMM, SPOTRF2, SSYRK, STRSM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -163,7 +164,7 @@ SUBROUTINE SPOTRF ( UPLO, N, A, LDA, INFO )
 *
 *        Use unblocked code.
 *
-         CALL SPOTF2( UPLO, N, A, LDA, INFO )
+         CALL SPOTRF2( UPLO, N, A, LDA, INFO )
       ELSE
 *
 *        Use blocked code.
@@ -189,7 +190,7 @@ SUBROUTINE SPOTRF ( UPLO, N, A, LDA, INFO )
 *              Update and factorize the current diagonal block and test
 *              for non-positive-definiteness.
 *
-               CALL SPOTF2( 'Upper', JB, A( J, J ), LDA, INFO )
+               CALL SPOTRF2( 'Upper', JB, A( J, J ), LDA, INFO )
                IF( INFO.NE.0 )
      $            GO TO 30
 
@@ -216,7 +217,7 @@ SUBROUTINE SPOTRF ( UPLO, N, A, LDA, INFO )
 *              Update and factorize the current diagonal block and test
 *              for non-positive-definiteness.
 *
-               CALL SPOTF2( 'Lower', JB, A( J, J ), LDA, INFO )
+               CALL SPOTRF2( 'Lower', JB, A( J, J ), LDA, INFO )
                IF( INFO.NE.0 )
      $            GO TO 30
 
diff --git a/SRC/VARIANTS/cholesky/TOP/zpotrf.f b/SRC/VARIANTS/cholesky/TOP/zpotrf.f
index f8b9e253cc..ff0c07bd5e 100644
--- a/SRC/VARIANTS/cholesky/TOP/zpotrf.f
+++ b/SRC/VARIANTS/cholesky/TOP/zpotrf.f
@@ -24,7 +24,7 @@
 C>\details \b Purpose:
 C>\verbatim
 C>
-C> ZPOTRF computes the Cholesky factorization of a real symmetric
+C> ZPOTRF computes the Cholesky factorization of a complex Hermitian
 C> positive definite matrix A.
 C>
 C> The factorization has the form
@@ -55,7 +55,7 @@
 C> \param[in,out] A
 C> \verbatim
 C>          A is COMPLEX*16 array, dimension (LDA,N)
-C>          On entry, the symmetric matrix A.  If UPLO = 'U', the leading
+C>          On entry, the Hermitian matrix A.  If UPLO = 'U', the leading
 C>          N-by-N upper triangular part of A contains the upper
 C>          triangular part of the matrix A, and the strictly lower
 C>          triangular part of A is not referenced.  If UPLO = 'L', the
@@ -79,8 +79,8 @@
 C>          INFO is INTEGER
 C>          = 0:  successful exit
 C>          < 0:  if INFO = -i, the i-th argument had an illegal value
-C>          > 0:  if INFO = i, the leading minor of order i is not
-C>                positive definite, and the factorization could not be
+C>          > 0:  if INFO = i, the leading principal minor of order i
+C>                is not positive, and the factorization could not be
 C>                completed.
 C> \endverbatim
 C>
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZPOTRF ( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -129,7 +130,7 @@ SUBROUTINE ZPOTRF ( UPLO, N, A, LDA, INFO )
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZGEMM, ZPOTF2, ZHERK, ZTRSM, XERBLA
+      EXTERNAL           XERBLA, ZGEMM, ZHERK, ZPOTRF2, ZTRSM
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -164,7 +165,7 @@ SUBROUTINE ZPOTRF ( UPLO, N, A, LDA, INFO )
 *
 *        Use unblocked code.
 *
-         CALL ZPOTF2( UPLO, N, A, LDA, INFO )
+         CALL ZPOTRF2( UPLO, N, A, LDA, INFO )
       ELSE
 *
 *        Use blocked code.
@@ -189,7 +190,7 @@ SUBROUTINE ZPOTRF ( UPLO, N, A, LDA, INFO )
 *              Update and factorize the current diagonal block and test
 *              for non-positive-definiteness.
 *
-               CALL ZPOTF2( 'Upper', JB, A( J, J ), LDA, INFO )
+               CALL ZPOTRF2( 'Upper', JB, A( J, J ), LDA, INFO )
                IF( INFO.NE.0 )
      $            GO TO 30
 
@@ -216,7 +217,7 @@ SUBROUTINE ZPOTRF ( UPLO, N, A, LDA, INFO )
 *              Update and factorize the current diagonal block and test
 *              for non-positive-definiteness.
 *
-               CALL ZPOTF2( 'Lower', JB, A( J, J ), LDA, INFO )
+               CALL ZPOTRF2( 'Lower', JB, A( J, J ), LDA, INFO )
                IF( INFO.NE.0 )
      $            GO TO 30
 
diff --git a/SRC/VARIANTS/larft/LL-LVL2/clarft.f b/SRC/VARIANTS/larft/LL-LVL2/clarft.f
new file mode 100644
index 0000000000..527b970d9d
--- /dev/null
+++ b/SRC/VARIANTS/larft/LL-LVL2/clarft.f
@@ -0,0 +1,328 @@
+*> \brief \b CLARFT_LVL2: Level 2 BLAS version for terminating case of CLARFT
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download CLARFT_LVL2 + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarft.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/clarft.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarft.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE CLARFT_LVL2( DIRECT, STOREV, N, K, V, LDV, TAU,
+*                    T, LDT )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          DIRECT, STOREV
+*       INTEGER            K, LDT, LDV, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX            T( LDT, * ), TAU( * ), V( LDV, * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> CLARFT_LVL2 forms the triangular factor T of a complex block reflector H
+*> of order n, which is defined as a product of k elementary reflectors.
+*>
+*> If DIRECT = 'F', H = H(1) H(2) . . . H(k) and T is upper triangular;
+*>
+*> If DIRECT = 'B', H = H(k) . . . H(2) H(1) and T is lower triangular.
+*>
+*> If STOREV = 'C', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th column of the array V, and
+*>
+*>    H  =  I - V * T * V**H
+*>
+*> If STOREV = 'R', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th row of the array V, and
+*>
+*>    H  =  I - V**H * T * V
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] DIRECT
+*> \verbatim
+*>          DIRECT is CHARACTER*1
+*>          Specifies the order in which the elementary reflectors are
+*>          multiplied to form the block reflector:
+*>          = 'F': H = H(1) H(2) . . . H(k) (Forward)
+*>          = 'B': H = H(k) . . . H(2) H(1) (Backward)
+*> \endverbatim
+*>
+*> \param[in] STOREV
+*> \verbatim
+*>          STOREV is CHARACTER*1
+*>          Specifies how the vectors which define the elementary
+*>          reflectors are stored (see also Further Details):
+*>          = 'C': columnwise
+*>          = 'R': rowwise
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the block reflector H. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The order of the triangular factor T (= the number of
+*>          elementary reflectors). K >= 1.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is COMPLEX array, dimension
+*>                               (LDV,K) if STOREV = 'C'
+*>                               (LDV,N) if STOREV = 'R'
+*>          The matrix V. See further details.
+*> \endverbatim
+*>
+*> \param[in] LDV
+*> \verbatim
+*>          LDV is INTEGER
+*>          The leading dimension of the array V.
+*>          If STOREV = 'C', LDV >= max(1,N); if STOREV = 'R', LDV >= K.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i).
+*> \endverbatim
+*>
+*> \param[out] T
+*> \verbatim
+*>          T is COMPLEX array, dimension (LDT,K)
+*>          The k by k triangular factor T of the block reflector.
+*>          If DIRECT = 'F', T is upper triangular; if DIRECT = 'B', T is
+*>          lower triangular. The rest of the array is not used.
+*> \endverbatim
+*>
+*> \param[in] LDT
+*> \verbatim
+*>          LDT is INTEGER
+*>          The leading dimension of the array T. LDT >= K.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup larft
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The shape of the matrix V and the storage of the vectors which define
+*>  the H(i) is best illustrated by the following example with n = 5 and
+*>  k = 3. The elements equal to 1 are not stored.
+*>
+*>  DIRECT = 'F' and STOREV = 'C':         DIRECT = 'F' and STOREV = 'R':
+*>
+*>               V = (  1       )                 V = (  1 v1 v1 v1 v1 )
+*>                   ( v1  1    )                     (     1 v2 v2 v2 )
+*>                   ( v1 v2  1 )                     (        1 v3 v3 )
+*>                   ( v1 v2 v3 )
+*>                   ( v1 v2 v3 )
+*>
+*>  DIRECT = 'B' and STOREV = 'C':         DIRECT = 'B' and STOREV = 'R':
+*>
+*>               V = ( v1 v2 v3 )                 V = ( v1 v1  1       )
+*>                   ( v1 v2 v3 )                     ( v2 v2 v2  1    )
+*>                   (  1 v2 v3 )                     ( v3 v3 v3 v3  1 )
+*>                   (     1 v3 )
+*>                   (        1 )
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE CLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          DIRECT, STOREV
+      INTEGER            K, LDT, LDV, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX            T( LDT, * ), TAU( * ), V( LDV, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      COMPLEX            ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0E+0, 0.0E+0 ),
+     $                   ZERO = ( 0.0E+0, 0.0E+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J, PREVLASTV, LASTV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           CGEMM, CGEMV, CTRMV
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+*
+      IF( LSAME( DIRECT, 'F' ) ) THEN
+         PREVLASTV = N
+         DO I = 1, K
+            PREVLASTV = MAX( PREVLASTV, I )
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = 1, I
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( LSAME( STOREV, 'C' ) ) THEN
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( LASTV, I ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * CONJG( V( I , J ) )
+                  END DO
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(i:j,1:i-1)**H * V(i:j,i)
+*
+                  CALL CGEMV( 'Conjugate transpose', J-I, I-1,
+     $                        -TAU( I ), V( I+1, 1 ), LDV,
+     $                        V( I+1, I ), 1,
+     $                        ONE, T( 1, I ), 1 )
+               ELSE
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( I, LASTV ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * V( J , I )
+                  END DO
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(1:i-1,i:j) * V(i,i:j)**H
+*
+                  CALL CGEMM( 'N', 'C', I-1, 1, J-I, -TAU( I ),
+     $                        V( 1, I+1 ), LDV, V( I, I+1 ), LDV,
+     $                        ONE, T( 1, I ), LDT )
+               END IF
+*
+*              T(1:i-1,i) := T(1:i-1,1:i-1) * T(1:i-1,i)
+*
+               CALL CTRMV( 'Upper', 'No transpose', 'Non-unit', I-1,
+     $                     T,
+     $                     LDT, T( 1, I ), 1 )
+               T( I, I ) = TAU( I )
+               IF( I.GT.1 ) THEN
+                  PREVLASTV = MAX( PREVLASTV, LASTV )
+               ELSE
+                  PREVLASTV = LASTV
+               END IF
+            END IF
+         END DO
+      ELSE
+         PREVLASTV = 1
+         DO I = K, 1, -1
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = I, K
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( I.LT.K ) THEN
+                  IF( LSAME( STOREV, 'C' ) ) THEN
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( LASTV, I ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * CONJG( V( N-K+I , J ) )
+                     END DO
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(j:n-k+i,i+1:k)**H * V(j:n-k+i,i)
+*
+                     CALL CGEMV( 'Conjugate transpose', N-K+I-J, K-I,
+     $                           -TAU( I ), V( J, I+1 ), LDV, V( J, I ),
+     $                           1, ONE, T( I+1, I ), 1 )
+                  ELSE
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( I, LASTV ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * V( J, N-K+I )
+                     END DO
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(i+1:k,j:n-k+i) * V(i,j:n-k+i)**H
+*
+                     CALL CGEMM( 'N', 'C', K-I, 1, N-K+I-J,
+     $                           -TAU( I ),
+     $                           V( I+1, J ), LDV, V( I, J ), LDV,
+     $                           ONE, T( I+1, I ), LDT )
+                  END IF
+*
+*                 T(i+1:k,i) := T(i+1:k,i+1:k) * T(i+1:k,i)
+*
+                  CALL CTRMV( 'Lower', 'No transpose', 'Non-unit',
+     $                        K-I,
+     $                        T( I+1, I+1 ), LDT, T( I+1, I ), 1 )
+                  IF( I.GT.1 ) THEN
+                     PREVLASTV = MIN( PREVLASTV, LASTV )
+                  ELSE
+                     PREVLASTV = LASTV
+                  END IF
+               END IF
+               T( I, I ) = TAU( I )
+            END IF
+         END DO
+      END IF
+      RETURN
+*
+*     End of CLARFT_LVL2
+*
+      END
diff --git a/SRC/VARIANTS/larft/LL-LVL2/dlarft.f b/SRC/VARIANTS/larft/LL-LVL2/dlarft.f
new file mode 100644
index 0000000000..6437e31dc9
--- /dev/null
+++ b/SRC/VARIANTS/larft/LL-LVL2/dlarft.f
@@ -0,0 +1,326 @@
+*> \brief \b DLARFT_LVL2: Level 2 BLAS version for terminating case of DLARFT.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download DLARFT_LVL2 + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarft.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dlarft.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarft.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DLARFT_LVL2( DIRECT, STOREV, N, K, V, LDV, TAU,
+*                    T, LDT )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          DIRECT, STOREV
+*       INTEGER            K, LDT, LDV, N
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   T( LDT, * ), TAU( * ), V( LDV, * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> DLARFT_LVL2 forms the triangular factor T of a real block reflector H
+*> of order n, which is defined as a product of k elementary reflectors.
+*>
+*> If DIRECT = 'F', H = H(1) H(2) . . . H(k) and T is upper triangular;
+*>
+*> If DIRECT = 'B', H = H(k) . . . H(2) H(1) and T is lower triangular.
+*>
+*> If STOREV = 'C', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th column of the array V, and
+*>
+*>    H  =  I - V * T * V**T
+*>
+*> If STOREV = 'R', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th row of the array V, and
+*>
+*>    H  =  I - V**T * T * V
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] DIRECT
+*> \verbatim
+*>          DIRECT is CHARACTER*1
+*>          Specifies the order in which the elementary reflectors are
+*>          multiplied to form the block reflector:
+*>          = 'F': H = H(1) H(2) . . . H(k) (Forward)
+*>          = 'B': H = H(k) . . . H(2) H(1) (Backward)
+*> \endverbatim
+*>
+*> \param[in] STOREV
+*> \verbatim
+*>          STOREV is CHARACTER*1
+*>          Specifies how the vectors which define the elementary
+*>          reflectors are stored (see also Further Details):
+*>          = 'C': columnwise
+*>          = 'R': rowwise
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the block reflector H. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The order of the triangular factor T (= the number of
+*>          elementary reflectors). K >= 1.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is DOUBLE PRECISION array, dimension
+*>                               (LDV,K) if STOREV = 'C'
+*>                               (LDV,N) if STOREV = 'R'
+*>          The matrix V. See further details.
+*> \endverbatim
+*>
+*> \param[in] LDV
+*> \verbatim
+*>          LDV is INTEGER
+*>          The leading dimension of the array V.
+*>          If STOREV = 'C', LDV >= max(1,N); if STOREV = 'R', LDV >= K.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is DOUBLE PRECISION array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i).
+*> \endverbatim
+*>
+*> \param[out] T
+*> \verbatim
+*>          T is DOUBLE PRECISION array, dimension (LDT,K)
+*>          The k by k triangular factor T of the block reflector.
+*>          If DIRECT = 'F', T is upper triangular; if DIRECT = 'B', T is
+*>          lower triangular. The rest of the array is not used.
+*> \endverbatim
+*>
+*> \param[in] LDT
+*> \verbatim
+*>          LDT is INTEGER
+*>          The leading dimension of the array T. LDT >= K.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup larft
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The shape of the matrix V and the storage of the vectors which define
+*>  the H(i) is best illustrated by the following example with n = 5 and
+*>  k = 3. The elements equal to 1 are not stored.
+*>
+*>  DIRECT = 'F' and STOREV = 'C':         DIRECT = 'F' and STOREV = 'R':
+*>
+*>               V = (  1       )                 V = (  1 v1 v1 v1 v1 )
+*>                   ( v1  1    )                     (     1 v2 v2 v2 )
+*>                   ( v1 v2  1 )                     (        1 v3 v3 )
+*>                   ( v1 v2 v3 )
+*>                   ( v1 v2 v3 )
+*>
+*>  DIRECT = 'B' and STOREV = 'C':         DIRECT = 'B' and STOREV = 'R':
+*>
+*>               V = ( v1 v2 v3 )                 V = ( v1 v1  1       )
+*>                   ( v1 v2 v3 )                     ( v2 v2 v2  1    )
+*>                   (  1 v2 v3 )                     ( v3 v3 v3 v3  1 )
+*>                   (     1 v3 )
+*>                   (        1 )
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE DLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          DIRECT, STOREV
+      INTEGER            K, LDT, LDV, N
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   T( LDT, * ), TAU( * ), V( LDV, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J, PREVLASTV, LASTV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DGEMV, DTRMV
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+*
+      IF( LSAME( DIRECT, 'F' ) ) THEN
+         PREVLASTV = N
+         DO I = 1, K
+            PREVLASTV = MAX( I, PREVLASTV )
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = 1, I
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( LSAME( STOREV, 'C' ) ) THEN
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( LASTV, I ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * V( I , J )
+                  END DO
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(i:j,1:i-1)**T * V(i:j,i)
+*
+                  CALL DGEMV( 'Transpose', J-I, I-1, -TAU( I ),
+     $                        V( I+1, 1 ), LDV, V( I+1, I ), 1, ONE,
+     $                        T( 1, I ), 1 )
+               ELSE
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( I, LASTV ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * V( J , I )
+                  END DO
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(1:i-1,i:j) * V(i,i:j)**T
+*
+                  CALL DGEMV( 'No transpose', I-1, J-I, -TAU( I ),
+     $                        V( 1, I+1 ), LDV, V( I, I+1 ), LDV, ONE,
+     $                        T( 1, I ), 1 )
+               END IF
+*
+*              T(1:i-1,i) := T(1:i-1,1:i-1) * T(1:i-1,i)
+*
+               CALL DTRMV( 'Upper', 'No transpose', 'Non-unit', I-1,
+     $                     T,
+     $                     LDT, T( 1, I ), 1 )
+               T( I, I ) = TAU( I )
+               IF( I.GT.1 ) THEN
+                  PREVLASTV = MAX( PREVLASTV, LASTV )
+               ELSE
+                  PREVLASTV = LASTV
+               END IF
+            END IF
+         END DO
+      ELSE
+         PREVLASTV = 1
+         DO I = K, 1, -1
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = I, K
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( I.LT.K ) THEN
+                  IF( LSAME( STOREV, 'C' ) ) THEN
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( LASTV, I ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * V( N-K+I , J )
+                     END DO
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(j:n-k+i,i+1:k)**T * V(j:n-k+i,i)
+*
+                     CALL DGEMV( 'Transpose', N-K+I-J, K-I,
+     $                           -TAU( I ),
+     $                           V( J, I+1 ), LDV, V( J, I ), 1, ONE,
+     $                           T( I+1, I ), 1 )
+                  ELSE
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( I, LASTV ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * V( J, N-K+I )
+                     END DO
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(i+1:k,j:n-k+i) * V(i,j:n-k+i)**T
+*
+                     CALL DGEMV( 'No transpose', K-I, N-K+I-J,
+     $                    -TAU( I ), V( I+1, J ), LDV, V( I, J ), LDV,
+     $                    ONE, T( I+1, I ), 1 )
+                  END IF
+*
+*                 T(i+1:k,i) := T(i+1:k,i+1:k) * T(i+1:k,i)
+*
+                  CALL DTRMV( 'Lower', 'No transpose', 'Non-unit',
+     $                        K-I,
+     $                        T( I+1, I+1 ), LDT, T( I+1, I ), 1 )
+                  IF( I.GT.1 ) THEN
+                     PREVLASTV = MIN( PREVLASTV, LASTV )
+                  ELSE
+                     PREVLASTV = LASTV
+                  END IF
+               END IF
+               T( I, I ) = TAU( I )
+            END IF
+         END DO
+      END IF
+      RETURN
+*
+*     End of DLARFT_LVL2
+*
+      END
diff --git a/SRC/VARIANTS/larft/LL-LVL2/slarft.f b/SRC/VARIANTS/larft/LL-LVL2/slarft.f
new file mode 100644
index 0000000000..ffabdd16c7
--- /dev/null
+++ b/SRC/VARIANTS/larft/LL-LVL2/slarft.f
@@ -0,0 +1,326 @@
+*> \brief \b SLARFT_LVL2: Level 2 BLAS version for terminating case of SLARFT.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download SLARFT_LVL2 + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarft.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/slarft.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarft.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE SLARFT_LVL2( DIRECT, STOREV, N, K, V, LDV, TAU,
+*                    T, LDT )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          DIRECT, STOREV
+*       INTEGER            K, LDT, LDV, N
+*       ..
+*       .. Array Arguments ..
+*       REAL               T( LDT, * ), TAU( * ), V( LDV, * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> SLARFT_LVL2 forms the triangular factor T of a real block reflector H
+*> of order n, which is defined as a product of k elementary reflectors.
+*>
+*> If DIRECT = 'F', H = H(1) H(2) . . . H(k) and T is upper triangular;
+*>
+*> If DIRECT = 'B', H = H(k) . . . H(2) H(1) and T is lower triangular.
+*>
+*> If STOREV = 'C', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th column of the array V, and
+*>
+*>    H  =  I - V * T * V**T
+*>
+*> If STOREV = 'R', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th row of the array V, and
+*>
+*>    H  =  I - V**T * T * V
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] DIRECT
+*> \verbatim
+*>          DIRECT is CHARACTER*1
+*>          Specifies the order in which the elementary reflectors are
+*>          multiplied to form the block reflector:
+*>          = 'F': H = H(1) H(2) . . . H(k) (Forward)
+*>          = 'B': H = H(k) . . . H(2) H(1) (Backward)
+*> \endverbatim
+*>
+*> \param[in] STOREV
+*> \verbatim
+*>          STOREV is CHARACTER*1
+*>          Specifies how the vectors which define the elementary
+*>          reflectors are stored (see also Further Details):
+*>          = 'C': columnwise
+*>          = 'R': rowwise
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the block reflector H. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The order of the triangular factor T (= the number of
+*>          elementary reflectors). K >= 1.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is REAL array, dimension
+*>                               (LDV,K) if STOREV = 'C'
+*>                               (LDV,N) if STOREV = 'R'
+*>          The matrix V. See further details.
+*> \endverbatim
+*>
+*> \param[in] LDV
+*> \verbatim
+*>          LDV is INTEGER
+*>          The leading dimension of the array V.
+*>          If STOREV = 'C', LDV >= max(1,N); if STOREV = 'R', LDV >= K.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is REAL array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i).
+*> \endverbatim
+*>
+*> \param[out] T
+*> \verbatim
+*>          T is REAL array, dimension (LDT,K)
+*>          The k by k triangular factor T of the block reflector.
+*>          If DIRECT = 'F', T is upper triangular; if DIRECT = 'B', T is
+*>          lower triangular. The rest of the array is not used.
+*> \endverbatim
+*>
+*> \param[in] LDT
+*> \verbatim
+*>          LDT is INTEGER
+*>          The leading dimension of the array T. LDT >= K.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup larft
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The shape of the matrix V and the storage of the vectors which define
+*>  the H(i) is best illustrated by the following example with n = 5 and
+*>  k = 3. The elements equal to 1 are not stored.
+*>
+*>  DIRECT = 'F' and STOREV = 'C':         DIRECT = 'F' and STOREV = 'R':
+*>
+*>               V = (  1       )                 V = (  1 v1 v1 v1 v1 )
+*>                   ( v1  1    )                     (     1 v2 v2 v2 )
+*>                   ( v1 v2  1 )                     (        1 v3 v3 )
+*>                   ( v1 v2 v3 )
+*>                   ( v1 v2 v3 )
+*>
+*>  DIRECT = 'B' and STOREV = 'C':         DIRECT = 'B' and STOREV = 'R':
+*>
+*>               V = ( v1 v2 v3 )                 V = ( v1 v1  1       )
+*>                   ( v1 v2 v3 )                     ( v2 v2 v2  1    )
+*>                   (  1 v2 v3 )                     ( v3 v3 v3 v3  1 )
+*>                   (     1 v3 )
+*>                   (        1 )
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE SLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          DIRECT, STOREV
+      INTEGER            K, LDT, LDV, N
+*     ..
+*     .. Array Arguments ..
+      REAL               T( LDT, * ), TAU( * ), V( LDV, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      REAL               ONE, ZERO
+      PARAMETER          ( ONE = 1.0E+0, ZERO = 0.0E+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J, PREVLASTV, LASTV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           SGEMV, STRMV
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+*
+      IF( LSAME( DIRECT, 'F' ) ) THEN
+         PREVLASTV = N
+         DO I = 1, K
+            PREVLASTV = MAX( I, PREVLASTV )
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = 1, I
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( LSAME( STOREV, 'C' ) ) THEN
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( LASTV, I ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * V( I , J )
+                  END DO
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(i:j,1:i-1)**T * V(i:j,i)
+*
+                  CALL SGEMV( 'Transpose', J-I, I-1, -TAU( I ),
+     $                        V( I+1, 1 ), LDV, V( I+1, I ), 1, ONE,
+     $                        T( 1, I ), 1 )
+               ELSE
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( I, LASTV ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * V( J , I )
+                  END DO
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(1:i-1,i:j) * V(i,i:j)**T
+*
+                  CALL SGEMV( 'No transpose', I-1, J-I, -TAU( I ),
+     $                        V( 1, I+1 ), LDV, V( I, I+1 ), LDV,
+     $                        ONE, T( 1, I ), 1 )
+               END IF
+*
+*              T(1:i-1,i) := T(1:i-1,1:i-1) * T(1:i-1,i)
+*
+               CALL STRMV( 'Upper', 'No transpose', 'Non-unit', I-1,
+     $                     T,
+     $                     LDT, T( 1, I ), 1 )
+               T( I, I ) = TAU( I )
+               IF( I.GT.1 ) THEN
+                  PREVLASTV = MAX( PREVLASTV, LASTV )
+               ELSE
+                  PREVLASTV = LASTV
+               END IF
+            END IF
+         END DO
+      ELSE
+         PREVLASTV = 1
+         DO I = K, 1, -1
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = I, K
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( I.LT.K ) THEN
+                  IF( LSAME( STOREV, 'C' ) ) THEN
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( LASTV, I ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * V( N-K+I , J )
+                     END DO
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(j:n-k+i,i+1:k)**T * V(j:n-k+i,i)
+*
+                     CALL SGEMV( 'Transpose', N-K+I-J, K-I,
+     $                           -TAU( I ),
+     $                           V( J, I+1 ), LDV, V( J, I ), 1, ONE,
+     $                           T( I+1, I ), 1 )
+                  ELSE
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( I, LASTV ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * V( J, N-K+I )
+                     END DO
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(i+1:k,j:n-k+i) * V(i,j:n-k+i)**T
+*
+                     CALL SGEMV( 'No transpose', K-I, N-K+I-J,
+     $                    -TAU( I ), V( I+1, J ), LDV, V( I, J ), LDV,
+     $                    ONE, T( I+1, I ), 1 )
+                  END IF
+*
+*                 T(i+1:k,i) := T(i+1:k,i+1:k) * T(i+1:k,i)
+*
+                  CALL STRMV( 'Lower', 'No transpose', 'Non-unit',
+     $                        K-I,
+     $                        T( I+1, I+1 ), LDT, T( I+1, I ), 1 )
+                  IF( I.GT.1 ) THEN
+                     PREVLASTV = MIN( PREVLASTV, LASTV )
+                  ELSE
+                     PREVLASTV = LASTV
+                  END IF
+               END IF
+               T( I, I ) = TAU( I )
+            END IF
+         END DO
+      END IF
+      RETURN
+*
+*     End of SLARFT_LVL2
+*
+      END
diff --git a/SRC/VARIANTS/larft/LL-LVL2/zlarft.f b/SRC/VARIANTS/larft/LL-LVL2/zlarft.f
new file mode 100644
index 0000000000..a2e0abc7bc
--- /dev/null
+++ b/SRC/VARIANTS/larft/LL-LVL2/zlarft.f
@@ -0,0 +1,327 @@
+*> \brief \b ZLARFT_LVL2: Level 2 BLAS version for terminating case of ZLARFT.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download ZLARFT_LVL2 + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarft.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlarft.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarft.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLARFT_LVL2( DIRECT, STOREV, N, K, V, LDV, TAU,
+*                    T, LDT )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          DIRECT, STOREV
+*       INTEGER            K, LDT, LDV, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         T( LDT, * ), TAU( * ), V( LDV, * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLARFT_LVL2 forms the triangular factor T of a complex block reflector H
+*> of order n, which is defined as a product of k elementary reflectors.
+*>
+*> If DIRECT = 'F', H = H(1) H(2) . . . H(k) and T is upper triangular;
+*>
+*> If DIRECT = 'B', H = H(k) . . . H(2) H(1) and T is lower triangular.
+*>
+*> If STOREV = 'C', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th column of the array V, and
+*>
+*>    H  =  I - V * T * V**H
+*>
+*> If STOREV = 'R', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th row of the array V, and
+*>
+*>    H  =  I - V**H * T * V
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] DIRECT
+*> \verbatim
+*>          DIRECT is CHARACTER*1
+*>          Specifies the order in which the elementary reflectors are
+*>          multiplied to form the block reflector:
+*>          = 'F': H = H(1) H(2) . . . H(k) (Forward)
+*>          = 'B': H = H(k) . . . H(2) H(1) (Backward)
+*> \endverbatim
+*>
+*> \param[in] STOREV
+*> \verbatim
+*>          STOREV is CHARACTER*1
+*>          Specifies how the vectors which define the elementary
+*>          reflectors are stored (see also Further Details):
+*>          = 'C': columnwise
+*>          = 'R': rowwise
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the block reflector H. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The order of the triangular factor T (= the number of
+*>          elementary reflectors). K >= 1.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is COMPLEX*16 array, dimension
+*>                               (LDV,K) if STOREV = 'C'
+*>                               (LDV,N) if STOREV = 'R'
+*>          The matrix V. See further details.
+*> \endverbatim
+*>
+*> \param[in] LDV
+*> \verbatim
+*>          LDV is INTEGER
+*>          The leading dimension of the array V.
+*>          If STOREV = 'C', LDV >= max(1,N); if STOREV = 'R', LDV >= K.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i).
+*> \endverbatim
+*>
+*> \param[out] T
+*> \verbatim
+*>          T is COMPLEX*16 array, dimension (LDT,K)
+*>          The k by k triangular factor T of the block reflector.
+*>          If DIRECT = 'F', T is upper triangular; if DIRECT = 'B', T is
+*>          lower triangular. The rest of the array is not used.
+*> \endverbatim
+*>
+*> \param[in] LDT
+*> \verbatim
+*>          LDT is INTEGER
+*>          The leading dimension of the array T. LDT >= K.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup larft
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The shape of the matrix V and the storage of the vectors which define
+*>  the H(i) is best illustrated by the following example with n = 5 and
+*>  k = 3. The elements equal to 1 are not stored.
+*>
+*>  DIRECT = 'F' and STOREV = 'C':         DIRECT = 'F' and STOREV = 'R':
+*>
+*>               V = (  1       )                 V = (  1 v1 v1 v1 v1 )
+*>                   ( v1  1    )                     (     1 v2 v2 v2 )
+*>                   ( v1 v2  1 )                     (        1 v3 v3 )
+*>                   ( v1 v2 v3 )
+*>                   ( v1 v2 v3 )
+*>
+*>  DIRECT = 'B' and STOREV = 'C':         DIRECT = 'B' and STOREV = 'R':
+*>
+*>               V = ( v1 v2 v3 )                 V = ( v1 v1  1       )
+*>                   ( v1 v2 v3 )                     ( v2 v2 v2  1    )
+*>                   (  1 v2 v3 )                     ( v3 v3 v3 v3  1 )
+*>                   (     1 v3 )
+*>                   (        1 )
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE ZLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          DIRECT, STOREV
+      INTEGER            K, LDT, LDV, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         T( LDT, * ), TAU( * ), V( LDV, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      COMPLEX*16         ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
+     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J, PREVLASTV, LASTV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZGEMV, ZTRMV, ZGEMM
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+*
+      IF( LSAME( DIRECT, 'F' ) ) THEN
+         PREVLASTV = N
+         DO I = 1, K
+            PREVLASTV = MAX( PREVLASTV, I )
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = 1, I
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( LSAME( STOREV, 'C' ) ) THEN
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( LASTV, I ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * CONJG( V( I , J ) )
+                  END DO
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(i:j,1:i-1)**H * V(i:j,i)
+*
+                  CALL ZGEMV( 'Conjugate transpose', J-I, I-1,
+     $                        -TAU( I ), V( I+1, 1 ), LDV,
+     $                        V( I+1, I ), 1, ONE, T( 1, I ), 1 )
+               ELSE
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( I, LASTV ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * V( J , I )
+                  END DO
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(1:i-1,i:j) * V(i,i:j)**H
+*
+                  CALL ZGEMM( 'N', 'C', I-1, 1, J-I, -TAU( I ),
+     $                        V( 1, I+1 ), LDV, V( I, I+1 ), LDV,
+     $                        ONE, T( 1, I ), LDT )
+               END IF
+*
+*              T(1:i-1,i) := T(1:i-1,1:i-1) * T(1:i-1,i)
+*
+               CALL ZTRMV( 'Upper', 'No transpose', 'Non-unit', I-1,
+     $                     T,
+     $                     LDT, T( 1, I ), 1 )
+               T( I, I ) = TAU( I )
+               IF( I.GT.1 ) THEN
+                  PREVLASTV = MAX( PREVLASTV, LASTV )
+               ELSE
+                  PREVLASTV = LASTV
+               END IF
+             END IF
+         END DO
+      ELSE
+         PREVLASTV = 1
+         DO I = K, 1, -1
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = I, K
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( I.LT.K ) THEN
+                  IF( LSAME( STOREV, 'C' ) ) THEN
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( LASTV, I ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * CONJG( V( N-K+I , J ) )
+                     END DO
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(j:n-k+i,i+1:k)**H * V(j:n-k+i,i)
+*
+                     CALL ZGEMV( 'Conjugate transpose', N-K+I-J, K-I,
+     $                           -TAU( I ), V( J, I+1 ), LDV, V( J, I ),
+     $                           1, ONE, T( I+1, I ), 1 )
+                  ELSE
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( I, LASTV ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * V( J, N-K+I )
+                     END DO
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(i+1:k,j:n-k+i) * V(i,j:n-k+i)**H
+*
+                     CALL ZGEMM( 'N', 'C', K-I, 1, N-K+I-J,
+     $                           -TAU( I ),
+     $                           V( I+1, J ), LDV, V( I, J ), LDV,
+     $                           ONE, T( I+1, I ), LDT )
+                  END IF
+*
+*                 T(i+1:k,i) := T(i+1:k,i+1:k) * T(i+1:k,i)
+*
+                  CALL ZTRMV( 'Lower', 'No transpose', 'Non-unit',
+     $                        K-I,
+     $                        T( I+1, I+1 ), LDT, T( I+1, I ), 1 )
+                  IF( I.GT.1 ) THEN
+                     PREVLASTV = MIN( PREVLASTV, LASTV )
+                  ELSE
+                     PREVLASTV = LASTV
+                  END IF
+               END IF
+               T( I, I ) = TAU( I )
+            END IF
+         END DO
+      END IF
+      RETURN
+*
+*     End of ZLARFT_LVL2
+*
+      END
diff --git a/SRC/VARIANTS/lu/CR/cgetrf.f b/SRC/VARIANTS/lu/CR/cgetrf.f
index e78442914e..2136fa347e 100644
--- a/SRC/VARIANTS/lu/CR/cgetrf.f
+++ b/SRC/VARIANTS/lu/CR/cgetrf.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE CGETRF ( M, N, A, LDA, IPIV, INFO)
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/VARIANTS/lu/CR/dgetrf.f b/SRC/VARIANTS/lu/CR/dgetrf.f
index 9bccb19bc8..e28481a729 100644
--- a/SRC/VARIANTS/lu/CR/dgetrf.f
+++ b/SRC/VARIANTS/lu/CR/dgetrf.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE DGETRF ( M, N, A, LDA, IPIV, INFO)
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/VARIANTS/lu/CR/sgetrf.f b/SRC/VARIANTS/lu/CR/sgetrf.f
index c12dd38f94..e1d828c971 100644
--- a/SRC/VARIANTS/lu/CR/sgetrf.f
+++ b/SRC/VARIANTS/lu/CR/sgetrf.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE SGETRF ( M, N, A, LDA, IPIV, INFO)
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/VARIANTS/lu/CR/zgetrf.f b/SRC/VARIANTS/lu/CR/zgetrf.f
index 75b26586da..cb85189c42 100644
--- a/SRC/VARIANTS/lu/CR/zgetrf.f
+++ b/SRC/VARIANTS/lu/CR/zgetrf.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZGETRF ( M, N, A, LDA, IPIV, INFO)
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/VARIANTS/lu/LL/cgetrf.f b/SRC/VARIANTS/lu/LL/cgetrf.f
index 67902e5688..f35ac5fc9b 100644
--- a/SRC/VARIANTS/lu/LL/cgetrf.f
+++ b/SRC/VARIANTS/lu/LL/cgetrf.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE CGETRF ( M, N, A, LDA, IPIV, INFO)
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/VARIANTS/lu/LL/dgetrf.f b/SRC/VARIANTS/lu/LL/dgetrf.f
index 5f77b919ee..21e7a26bf4 100644
--- a/SRC/VARIANTS/lu/LL/dgetrf.f
+++ b/SRC/VARIANTS/lu/LL/dgetrf.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE DGETRF ( M, N, A, LDA, IPIV, INFO)
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/VARIANTS/lu/LL/sgetrf.f b/SRC/VARIANTS/lu/LL/sgetrf.f
index 2d47969032..cc6a0576ed 100644
--- a/SRC/VARIANTS/lu/LL/sgetrf.f
+++ b/SRC/VARIANTS/lu/LL/sgetrf.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE SGETRF ( M, N, A, LDA, IPIV, INFO)
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/VARIANTS/lu/LL/zgetrf.f b/SRC/VARIANTS/lu/LL/zgetrf.f
index 85db51b845..ead3b03699 100644
--- a/SRC/VARIANTS/lu/LL/zgetrf.f
+++ b/SRC/VARIANTS/lu/LL/zgetrf.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZGETRF ( M, N, A, LDA, IPIV, INFO)
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/VARIANTS/lu/REC/cgetrf.f b/SRC/VARIANTS/lu/REC/cgetrf.f
index a8fe3fb28f..3ae5ccbf18 100644
--- a/SRC/VARIANTS/lu/REC/cgetrf.f
+++ b/SRC/VARIANTS/lu/REC/cgetrf.f
@@ -133,8 +133,9 @@
 *
 *  =====================================================================
       SUBROUTINE CGETRF( M, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
-*  -- LAPACK computational routine (version 3.X) --
+*  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
diff --git a/SRC/VARIANTS/lu/REC/dgetrf.f b/SRC/VARIANTS/lu/REC/dgetrf.f
index 5c79747d22..7e10b8d81d 100644
--- a/SRC/VARIANTS/lu/REC/dgetrf.f
+++ b/SRC/VARIANTS/lu/REC/dgetrf.f
@@ -133,8 +133,9 @@
 *
 *  =====================================================================
       SUBROUTINE DGETRF( M, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
-*  -- LAPACK computational routine (version 3.X) --
+*  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
diff --git a/SRC/VARIANTS/lu/REC/sgetrf.f b/SRC/VARIANTS/lu/REC/sgetrf.f
index 3c045e576a..0dc562b951 100644
--- a/SRC/VARIANTS/lu/REC/sgetrf.f
+++ b/SRC/VARIANTS/lu/REC/sgetrf.f
@@ -133,8 +133,9 @@
 *
 *  =====================================================================
       SUBROUTINE SGETRF( M, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
-*  -- LAPACK computational routine (version 3.X) --
+*  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
diff --git a/SRC/VARIANTS/lu/REC/zgetrf.f b/SRC/VARIANTS/lu/REC/zgetrf.f
index 0484eb89aa..3cdb6b1658 100644
--- a/SRC/VARIANTS/lu/REC/zgetrf.f
+++ b/SRC/VARIANTS/lu/REC/zgetrf.f
@@ -133,8 +133,9 @@
 *
 *  =====================================================================
       SUBROUTINE ZGETRF( M, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
-*  -- LAPACK computational routine (version 3.X) --
+*  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
diff --git a/SRC/VARIANTS/qr/LL/cgeqrf.f b/SRC/VARIANTS/qr/LL/cgeqrf.f
index 369ed19833..5fb4ab8b39 100644
--- a/SRC/VARIANTS/qr/LL/cgeqrf.f
+++ b/SRC/VARIANTS/qr/LL/cgeqrf.f
@@ -23,7 +23,7 @@
 C>\details \b Purpose:
 C>\verbatim
 C>
-C> CGEQRF computes a QR factorization of a real M-by-N matrix A:
+C> CGEQRF computes a QR factorization of a complex M-by-N matrix A:
 C> A = Q * R.
 C>
 C> This is the left-looking Level 3 BLAS version of the algorithm.
@@ -81,7 +81,8 @@
 C>          LWORK is INTEGER
 C> \endverbatim
 C> \verbatim
-C>          The dimension of the array WORK. The dimension can be divided into three parts.
+C>          The dimension of the array WORK. LWORK >= 1 if MIN(M,N) = 0,
+C>          otherwise the dimension can be divided into three parts.
 C> \endverbatim
 C> \verbatim
 C>          1) The part for the triangular factor T. If the very last T is not bigger
@@ -148,6 +149,7 @@
 C>
 *  =====================================================================
       SUBROUTINE CGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,12 +173,12 @@ SUBROUTINE CGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
       EXTERNAL           CGEQR2, CLARFB, CLARFT, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
+      INTRINSIC          CEILING, MAX, MIN, REAL
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      REAL               SCEIL
-      EXTERNAL           ILAENV, SCEIL
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 
@@ -204,28 +206,34 @@ SUBROUTINE CGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *     So here 4 x 4 is the last T stored in the workspace
 *
-      NT = K-SCEIL(REAL(K-NX)/REAL(NB))*NB
+      NT = K-CEILING(REAL(K-NX)/REAL(NB))*NB
 
 *
 *     optimal workspace = space for dlarfb + space for normal T's + space for the last T
 *
       LLWORK = MAX (MAX((N-M)*K, (N-M)*NB), MAX(K*NB, NB*NB))
-      LLWORK = SCEIL(REAL(LLWORK)/REAL(NB))
+      LLWORK = CEILING(REAL(LLWORK)/REAL(NB))
 
-      IF ( NT.GT.NB ) THEN
+      IF( K.EQ.0 ) THEN
+
+         LBWORK = 0
+         LWKOPT = 1
+         WORK( 1 ) = LWKOPT
+
+      ELSE IF ( NT.GT.NB ) THEN
 
           LBWORK = K-NT
 *
 *         Optimal workspace for dlarfb = MAX(1,N)*NT
 *
           LWKOPT = (LBWORK+LLWORK)*NB
-          WORK( 1 ) = (LWKOPT+NT*NT)
+          WORK( 1 ) = SROUNDUP_LWORK(LWKOPT+NT*NT)
 
       ELSE
 
-          LBWORK = SCEIL(REAL(K)/REAL(NB))*NB
+          LBWORK = CEILING(REAL(K)/REAL(NB))*NB
           LWKOPT = (LBWORK+LLWORK-NB)*NB
-          WORK( 1 ) = LWKOPT
+          WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 
       END IF
 
@@ -239,8 +247,9 @@ SUBROUTINE CGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
-         INFO = -7
+      ELSE IF ( .NOT.LQUERY ) THEN
+         IF( LWORK.LE.0 .OR. ( M.GT.0 .AND. LWORK.LT.MAX( 1, N ) ) )
+     $      INFO = -7
       END IF
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'CGEQRF', -INFO )
@@ -252,7 +261,6 @@ SUBROUTINE CGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     Quick return if possible
 *
       IF( K.EQ.0 ) THEN
-         WORK( 1 ) = 1
          RETURN
       END IF
 *
@@ -407,7 +415,7 @@ SUBROUTINE CGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 
       END IF
 
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK(IWS)
       RETURN
 *
 *     End of CGEQRF
diff --git a/SRC/VARIANTS/qr/LL/dgeqrf.f b/SRC/VARIANTS/qr/LL/dgeqrf.f
index be5720f4f6..0d157bdddd 100644
--- a/SRC/VARIANTS/qr/LL/dgeqrf.f
+++ b/SRC/VARIANTS/qr/LL/dgeqrf.f
@@ -81,7 +81,8 @@
 C>          LWORK is INTEGER
 C> \endverbatim
 C> \verbatim
-C>          The dimension of the array WORK. The dimension can be divided into three parts.
+C>          The dimension of the array WORK. LWORK >= 1 if MIN(M,N) = 0,
+C>          otherwise the dimension can be divided into three parts.
 C> \endverbatim
 C> \verbatim
 C>          1) The part for the triangular factor T. If the very last T is not bigger
@@ -148,6 +149,7 @@
 C>
 *  =====================================================================
       SUBROUTINE DGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,12 +173,12 @@ SUBROUTINE DGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
       EXTERNAL           DGEQR2, DLARFB, DLARFT, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
+      INTRINSIC          CEILING, MAX, MIN, REAL
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      REAL               SCEIL
-      EXTERNAL           ILAENV, SCEIL
+      DOUBLE PRECISION   DROUNDUP_LWORK
+      EXTERNAL           ILAENV, DROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 
@@ -204,28 +206,34 @@ SUBROUTINE DGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *     So here 4 x 4 is the last T stored in the workspace
 *
-      NT = K-SCEIL(REAL(K-NX)/REAL(NB))*NB
+      NT = K-CEILING(REAL(K-NX)/REAL(NB))*NB
 
 *
 *     optimal workspace = space for dlarfb + space for normal T's + space for the last T
 *
       LLWORK = MAX (MAX((N-M)*K, (N-M)*NB), MAX(K*NB, NB*NB))
-      LLWORK = SCEIL(REAL(LLWORK)/REAL(NB))
+      LLWORK = CEILING(REAL(LLWORK)/REAL(NB))
 
-      IF ( NT.GT.NB ) THEN
+      IF( K.EQ.0 ) THEN
+
+         LBWORK = 0
+         LWKOPT = 1
+         WORK( 1 ) = LWKOPT
+
+      ELSE IF ( NT.GT.NB ) THEN
 
           LBWORK = K-NT
 *
 *         Optimal workspace for dlarfb = MAX(1,N)*NT
 *
           LWKOPT = (LBWORK+LLWORK)*NB
-          WORK( 1 ) = (LWKOPT+NT*NT)
+          WORK( 1 ) = DROUNDUP_LWORK(LWKOPT+NT*NT)
 
       ELSE
 
-          LBWORK = SCEIL(REAL(K)/REAL(NB))*NB
+          LBWORK = CEILING(REAL(K)/REAL(NB))*NB
           LWKOPT = (LBWORK+LLWORK-NB)*NB
-          WORK( 1 ) = LWKOPT
+          WORK( 1 ) = DROUNDUP_LWORK(LWKOPT)
 
       END IF
 
@@ -239,8 +247,9 @@ SUBROUTINE DGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
-         INFO = -7
+      ELSE IF ( .NOT.LQUERY ) THEN
+         IF( LWORK.LE.0 .OR. ( M.GT.0 .AND. LWORK.LT.MAX( 1, N ) ) )
+     $      INFO = -7
       END IF
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'DGEQRF', -INFO )
@@ -252,7 +261,6 @@ SUBROUTINE DGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     Quick return if possible
 *
       IF( K.EQ.0 ) THEN
-         WORK( 1 ) = 1
          RETURN
       END IF
 *
@@ -407,7 +415,7 @@ SUBROUTINE DGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 
       END IF
 
-      WORK( 1 ) = IWS
+      WORK( 1 ) = DROUNDUP_LWORK(IWS)
       RETURN
 *
 *     End of DGEQRF
diff --git a/SRC/VARIANTS/qr/LL/sceil.f b/SRC/VARIANTS/qr/LL/sceil.f
deleted file mode 100644
index a007360ba6..0000000000
--- a/SRC/VARIANTS/qr/LL/sceil.f
+++ /dev/null
@@ -1,86 +0,0 @@
-C> \brief \b SCEIL
-*
-*  =========== DOCUMENTATION ===========
-*
-* Online html documentation available at
-*            http://www.netlib.org/lapack/explore-html/
-*
-*  Definition:
-*  ===========
-*
-*       REAL FUNCTION SCEIL( A )
-*
-*       .. Scalar Arguments ..
-*       REAL A
-*       ..
-*
-*    =====================================================================
-*
-*       .. Intrinsic Functions ..
-* 	      INTRINSIC          INT
-*       ..
-*       .. Executable Statements ..*
-*
-*       IF (A-INT(A).EQ.0) THEN
-*           SCEIL = A
-*       ELSE IF (A.GT.0) THEN
-*           SCEIL = INT(A)+1;
-*       ELSE
-*           SCEIL = INT(A)
-*       END IF
-*
-*       RETURN
-*
-*       END
-*  Purpose
-*  =======
-*
-C>\details \b Purpose:
-C>\verbatim
-C>\endverbatim
-*
-*  Arguments:
-*  ==========
-*
-*
-*  Authors:
-*  ========
-*
-C> \author Univ. of Tennessee
-C> \author Univ. of California Berkeley
-C> \author Univ. of Colorado Denver
-C> \author NAG Ltd.
-*
-C> \date December 2016
-*
-C> \ingroup variantsOTHERcomputational
-*
-*  =====================================================================
-      REAL FUNCTION SCEIL( A )
-*
-*  -- LAPACK computational routine --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*
-*     .. Scalar Arguments ..*
-      REAL A
-*     ..
-*
-*  =====================================================================
-*
-*     .. Intrinsic Functions ..
-	      INTRINSIC          INT
-*     ..
-*     .. Executable Statements ..*
-*
-      IF (A-INT(A).EQ.0) THEN
-          SCEIL = A
-      ELSE IF (A.GT.0) THEN
-          SCEIL = INT(A)+1;
-      ELSE
-          SCEIL = INT(A)
-      END IF
-
-      RETURN
-*
-      END
diff --git a/SRC/VARIANTS/qr/LL/sgeqrf.f b/SRC/VARIANTS/qr/LL/sgeqrf.f
index bff9732144..13663f4a9f 100644
--- a/SRC/VARIANTS/qr/LL/sgeqrf.f
+++ b/SRC/VARIANTS/qr/LL/sgeqrf.f
@@ -81,7 +81,8 @@
 C>          LWORK is INTEGER
 C> \endverbatim
 C> \verbatim
-C>          The dimension of the array WORK. The dimension can be divided into three parts.
+C>          The dimension of the array WORK. LWORK >= 1 if MIN(M,N) = 0,
+C>          otherwise the dimension can be divided into three parts.
 C> \endverbatim
 C> \verbatim
 C>          1) The part for the triangular factor T. If the very last T is not bigger
@@ -148,6 +149,7 @@
 C>
 *  =====================================================================
       SUBROUTINE SGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,12 +173,12 @@ SUBROUTINE SGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
       EXTERNAL           SGEQR2, SLARFB, SLARFT, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
+      INTRINSIC          CEILING, MAX, MIN, REAL
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      REAL               SCEIL
-      EXTERNAL           ILAENV, SCEIL
+      DOUBLE PRECISION   DROUNDUP_LWORK
+      EXTERNAL           ILAENV, DROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 
@@ -204,28 +206,34 @@ SUBROUTINE SGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *     So here 4 x 4 is the last T stored in the workspace
 *
-      NT = K-SCEIL(REAL(K-NX)/REAL(NB))*NB
+      NT = K-CEILING(REAL(K-NX)/REAL(NB))*NB
 
 *
 *     optimal workspace = space for dlarfb + space for normal T's + space for the last T
 *
       LLWORK = MAX (MAX((N-M)*K, (N-M)*NB), MAX(K*NB, NB*NB))
-      LLWORK = SCEIL(REAL(LLWORK)/REAL(NB))
+      LLWORK = CEILING(REAL(LLWORK)/REAL(NB))
 
-      IF ( NT.GT.NB ) THEN
+      IF( K.EQ.0 ) THEN
+
+         LBWORK = 0
+         LWKOPT = 1
+         WORK( 1 ) = LWKOPT
+
+      ELSE IF ( NT.GT.NB ) THEN
 
           LBWORK = K-NT
 *
 *         Optimal workspace for dlarfb = MAX(1,N)*NT
 *
           LWKOPT = (LBWORK+LLWORK)*NB
-          WORK( 1 ) = (LWKOPT+NT*NT)
+          WORK( 1 ) = DROUNDUP_LWORK(LWKOPT+NT*NT)
 
       ELSE
 
-          LBWORK = SCEIL(REAL(K)/REAL(NB))*NB
+          LBWORK = CEILING(REAL(K)/REAL(NB))*NB
           LWKOPT = (LBWORK+LLWORK-NB)*NB
-          WORK( 1 ) = LWKOPT
+          WORK( 1 ) = DROUNDUP_LWORK(LWKOPT)
 
       END IF
 
@@ -239,8 +247,9 @@ SUBROUTINE SGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
-         INFO = -7
+      ELSE IF ( .NOT.LQUERY ) THEN
+         IF( LWORK.LE.0 .OR. ( M.GT.0 .AND. LWORK.LT.MAX( 1, N ) ) )
+     $      INFO = -7
       END IF
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'SGEQRF', -INFO )
@@ -252,7 +261,6 @@ SUBROUTINE SGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     Quick return if possible
 *
       IF( K.EQ.0 ) THEN
-         WORK( 1 ) = 1
          RETURN
       END IF
 *
@@ -407,7 +415,7 @@ SUBROUTINE SGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 
       END IF
 
-      WORK( 1 ) = IWS
+      WORK( 1 ) = DROUNDUP_LWORK(IWS)
       RETURN
 *
 *     End of SGEQRF
diff --git a/SRC/VARIANTS/qr/LL/zgeqrf.f b/SRC/VARIANTS/qr/LL/zgeqrf.f
index 79e86b41bb..9be8bead34 100644
--- a/SRC/VARIANTS/qr/LL/zgeqrf.f
+++ b/SRC/VARIANTS/qr/LL/zgeqrf.f
@@ -23,7 +23,7 @@
 C>\details \b Purpose:
 C>\verbatim
 C>
-C> ZGEQRF computes a QR factorization of a real M-by-N matrix A:
+C> ZGEQRF computes a QR factorization of a complex M-by-N matrix A:
 C> A = Q * R.
 C>
 C> This is the left-looking Level 3 BLAS version of the algorithm.
@@ -81,7 +81,8 @@
 C>          LWORK is INTEGER
 C> \endverbatim
 C> \verbatim
-C>          The dimension of the array WORK. The dimension can be divided into three parts.
+C>          The dimension of the array WORK. LWORK >= 1 if MIN(M,N) = 0,
+C>          otherwise the dimension can be divided into three parts.
 C> \endverbatim
 C> \verbatim
 C>          1) The part for the triangular factor T. If the very last T is not bigger
@@ -148,6 +149,7 @@
 C>
 *  =====================================================================
       SUBROUTINE ZGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,12 +173,12 @@ SUBROUTINE ZGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
       EXTERNAL           ZGEQR2, ZLARFB, ZLARFT, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
+      INTRINSIC          CEILING, MAX, MIN, REAL
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      REAL               SCEIL
-      EXTERNAL           ILAENV, SCEIL
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 
@@ -204,28 +206,34 @@ SUBROUTINE ZGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *     So here 4 x 4 is the last T stored in the workspace
 *
-      NT = K-SCEIL(REAL(K-NX)/REAL(NB))*NB
+      NT = K-CEILING(REAL(K-NX)/REAL(NB))*NB
 
 *
 *     optimal workspace = space for dlarfb + space for normal T's + space for the last T
 *
       LLWORK = MAX (MAX((N-M)*K, (N-M)*NB), MAX(K*NB, NB*NB))
-      LLWORK = SCEIL(REAL(LLWORK)/REAL(NB))
+      LLWORK = CEILING(REAL(LLWORK)/REAL(NB))
 
-      IF ( NT.GT.NB ) THEN
+      IF( K.EQ.0 ) THEN
+
+         LBWORK = 0
+         LWKOPT = 1
+         WORK( 1 ) = LWKOPT
+
+      ELSE IF ( NT.GT.NB ) THEN
 
           LBWORK = K-NT
 *
 *         Optimal workspace for dlarfb = MAX(1,N)*NT
 *
           LWKOPT = (LBWORK+LLWORK)*NB
-          WORK( 1 ) = (LWKOPT+NT*NT)
+          WORK( 1 ) = SROUNDUP_LWORK(LWKOPT+NT*NT)
 
       ELSE
 
-          LBWORK = SCEIL(REAL(K)/REAL(NB))*NB
+          LBWORK = CEILING(REAL(K)/REAL(NB))*NB
           LWKOPT = (LBWORK+LLWORK-NB)*NB
-          WORK( 1 ) = LWKOPT
+          WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 
       END IF
 
@@ -239,8 +247,9 @@ SUBROUTINE ZGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
-         INFO = -7
+      ELSE IF ( .NOT.LQUERY ) THEN
+         IF( LWORK.LE.0 .OR. ( M.GT.0 .AND. LWORK.LT.MAX( 1, N ) ) )
+     $      INFO = -7
       END IF
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'ZGEQRF', -INFO )
@@ -252,7 +261,6 @@ SUBROUTINE ZGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     Quick return if possible
 *
       IF( K.EQ.0 ) THEN
-         WORK( 1 ) = 1
          RETURN
       END IF
 *
@@ -407,7 +415,7 @@ SUBROUTINE ZGEQRF ( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 
       END IF
 
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK(IWS)
       RETURN
 *
 *     End of ZGEQRF
diff --git a/SRC/cbbcsd.f b/SRC/cbbcsd.f
index 1cd1ffbf16..848e4dabf1 100644
--- a/SRC/cbbcsd.f
+++ b/SRC/cbbcsd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CBBCSD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cbbcsd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cbbcsd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -322,13 +320,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup bbcsd
 *
 *  =====================================================================
-      SUBROUTINE CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
+      SUBROUTINE CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P,
+     $                   Q,
      $                   THETA, PHI, U1, LDU1, U2, LDU2, V1T, LDV1T,
      $                   V2T, LDV2T, B11D, B11E, B12D, B12E, B21D, B21E,
      $                   B22D, B22E, RWORK, LRWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -372,7 +372,8 @@ SUBROUTINE CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
      $                   UNFL, X1, X2, Y1, Y2
 *
 *     .. External Subroutines ..
-      EXTERNAL           CLASR, CSCAL, CSWAP, SLARTGP, SLARTGS, SLAS2,
+      EXTERNAL           CLASR, CSCAL, CSWAP, SLARTGP, SLARTGS,
+     $                   SLAS2,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
@@ -417,7 +418,7 @@ SUBROUTINE CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
 *
       IF( INFO .EQ. 0 .AND. Q .EQ. 0 ) THEN
          LRWORKMIN = 1
-         RWORK(1) = LRWORKMIN
+         RWORK(1) = REAL( LRWORKMIN )
          RETURN
       END IF
 *
@@ -434,7 +435,7 @@ SUBROUTINE CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
          IV2TSN = IV2TCS + Q
          LRWORKOPT = IV2TSN + Q - 1
          LRWORKMIN = LRWORKOPT
-         RWORK(1) = LRWORKOPT
+         RWORK(1) = REAL( LRWORKOPT )
          IF( LRWORK .LT. LRWORKMIN .AND. .NOT. LQUERY ) THEN
             INFO = -28
          END IF
@@ -453,7 +454,7 @@ SUBROUTINE CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
       UNFL = SLAMCH( 'Safe minimum' )
       TOLMUL = MAX( TEN, MIN( HUNDRED, EPS**MEIGHTH ) )
       TOL = TOLMUL*EPS
-      THRESH = MAX( TOL, MAXITR*Q*Q*UNFL )
+      THRESH = MAX( TOL, REAL( MAXITR*Q*Q )*UNFL )
 *
 *     Test for negligible sines or cosines
 *
@@ -559,9 +560,11 @@ SUBROUTINE CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
 *
 *           Compute shifts for B11 and B21 and use the lesser
 *
-            CALL SLAS2( B11D(IMAX-1), B11E(IMAX-1), B11D(IMAX), SIGMA11,
+            CALL SLAS2( B11D(IMAX-1), B11E(IMAX-1), B11D(IMAX),
+     $                  SIGMA11,
      $                  DUMMY )
-            CALL SLAS2( B21D(IMAX-1), B21E(IMAX-1), B21D(IMAX), SIGMA21,
+            CALL SLAS2( B21D(IMAX-1), B21E(IMAX-1), B21D(IMAX),
+     $                  SIGMA21,
      $                  DUMMY )
 *
             IF( SIGMA11 .LE. SIGMA21 ) THEN
@@ -718,10 +721,12 @@ SUBROUTINE CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
                CALL SLARTGP( Y2, Y1, RWORK(IV2TSN+I-1-1),
      $                       RWORK(IV2TCS+I-1-1), R )
             ELSE IF( .NOT. RESTART12 .AND. RESTART22 ) THEN
-               CALL SLARTGP( B12BULGE, B12D(I-1), RWORK(IV2TSN+I-1-1),
+               CALL SLARTGP( B12BULGE, B12D(I-1),
+     $                       RWORK(IV2TSN+I-1-1),
      $                       RWORK(IV2TCS+I-1-1), R )
             ELSE IF( RESTART12 .AND. .NOT. RESTART22 ) THEN
-               CALL SLARTGP( B22BULGE, B22D(I-1), RWORK(IV2TSN+I-1-1),
+               CALL SLARTGP( B22BULGE, B22D(I-1),
+     $                       RWORK(IV2TSN+I-1-1),
      $                       RWORK(IV2TCS+I-1-1), R )
             ELSE IF( NU .LT. MU ) THEN
                CALL SLARTGS( B12E(I-1), B12D(I), NU,
@@ -780,7 +785,8 @@ SUBROUTINE CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
 *           chasing by applying the original shift again.
 *
             IF( .NOT. RESTART11 .AND. .NOT. RESTART12 ) THEN
-               CALL SLARTGP( X2, X1, RWORK(IU1SN+I-1), RWORK(IU1CS+I-1),
+               CALL SLARTGP( X2, X1, RWORK(IU1SN+I-1),
+     $                       RWORK(IU1CS+I-1),
      $                       R )
             ELSE IF( .NOT. RESTART11 .AND. RESTART12 ) THEN
                CALL SLARTGP( B11BULGE, B11D(I), RWORK(IU1SN+I-1),
@@ -789,14 +795,16 @@ SUBROUTINE CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
                CALL SLARTGP( B12BULGE, B12E(I-1), RWORK(IU1SN+I-1),
      $                       RWORK(IU1CS+I-1), R )
             ELSE IF( MU .LE. NU ) THEN
-               CALL SLARTGS( B11E(I), B11D(I+1), MU, RWORK(IU1CS+I-1),
+               CALL SLARTGS( B11E(I), B11D(I+1), MU,
+     $                       RWORK(IU1CS+I-1),
      $                       RWORK(IU1SN+I-1) )
             ELSE
                CALL SLARTGS( B12D(I), B12E(I), NU, RWORK(IU1CS+I-1),
      $                       RWORK(IU1SN+I-1) )
             END IF
             IF( .NOT. RESTART21 .AND. .NOT. RESTART22 ) THEN
-               CALL SLARTGP( Y2, Y1, RWORK(IU2SN+I-1), RWORK(IU2CS+I-1),
+               CALL SLARTGP( Y2, Y1, RWORK(IU2SN+I-1),
+     $                       RWORK(IU2CS+I-1),
      $                       R )
             ELSE IF( .NOT. RESTART21 .AND. RESTART22 ) THEN
                CALL SLARTGP( B21BULGE, B21D(I), RWORK(IU2SN+I-1),
@@ -805,7 +813,8 @@ SUBROUTINE CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
                CALL SLARTGP( B22BULGE, B22E(I-1), RWORK(IU2SN+I-1),
      $                       RWORK(IU2CS+I-1), R )
             ELSE IF( NU .LT. MU ) THEN
-               CALL SLARTGS( B21E(I), B21E(I+1), NU, RWORK(IU2CS+I-1),
+               CALL SLARTGS( B21E(I), B21E(I+1), NU,
+     $                       RWORK(IU2CS+I-1),
      $                       RWORK(IU2SN+I-1) )
             ELSE
                CALL SLARTGS( B22D(I), B22E(I), MU, RWORK(IU2CS+I-1),
@@ -991,7 +1000,8 @@ SUBROUTINE CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
          IF( B12D(IMAX)+B22D(IMAX) .LT. 0 ) THEN
             IF( WANTV2T ) THEN
                IF( COLMAJOR ) THEN
-                  CALL CSCAL( M-Q, NEGONECOMPLEX, V2T(IMAX,1), LDV2T )
+                  CALL CSCAL( M-Q, NEGONECOMPLEX, V2T(IMAX,1),
+     $                        LDV2T )
                ELSE
                   CALL CSCAL( M-Q, NEGONECOMPLEX, V2T(1,IMAX), 1 )
                END IF
@@ -1058,7 +1068,8 @@ SUBROUTINE CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
                IF( WANTU2 )
      $            CALL CSWAP( M-P, U2(1,I), 1, U2(1,MINI), 1 )
                IF( WANTV1T )
-     $            CALL CSWAP( Q, V1T(I,1), LDV1T, V1T(MINI,1), LDV1T )
+     $            CALL CSWAP( Q, V1T(I,1), LDV1T, V1T(MINI,1),
+     $                        LDV1T )
                IF( WANTV2T )
      $            CALL CSWAP( M-Q, V2T(I,1), LDV2T, V2T(MINI,1),
      $               LDV2T )
diff --git a/SRC/cbdsqr.f b/SRC/cbdsqr.f
index 1d7c4e09dd..4e08891309 100644
--- a/SRC/cbdsqr.f
+++ b/SRC/cbdsqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CBDSQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cbdsqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cbdsqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -166,7 +164,9 @@
 *>
 *> \param[out] RWORK
 *> \verbatim
-*>          RWORK is REAL array, dimension (4*N)
+*>          RWORK is REAL array, dimension (LRWORK)
+*>          LRWORK = 4*N, if NCVT = NRU = NCC = 0, and
+*>          LRWORK = 4*(N-1), otherwise
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -204,6 +204,17 @@
 *>          algorithm through its inner loop. The algorithms stops
 *>          (and so fails to converge) if the number of passes
 *>          through the inner loop exceeds MAXITR*N**2.
+*>
+*> \endverbatim
+*
+*> \par Note:
+*  ===========
+*>
+*> \verbatim
+*>  Bug report from Cezary Dendek.
+*>  On November 3rd 2023, the INTEGER variable MAXIT = MAXITR*N**2 is
+*>  removed since it can overflow pretty easily (for N larger or equal
+*>  than 18,919). We instead use MAXITDIVN = MAXITR*N.
 *> \endverbatim
 *
 *  Authors:
@@ -214,11 +225,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup bdsqr
 *
 *  =====================================================================
       SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $                   LDU, C, LDC, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -255,11 +267,11 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LOWER, ROTATE
-      INTEGER            I, IDIR, ISUB, ITER, J, LL, LLL, M, MAXIT, NM1,
-     $                   NM12, NM13, OLDLL, OLDM
+      INTEGER            I, IDIR, ISUB, ITER, ITERDIVN, J, LL, LLL, M,
+     $                   MAXITDIVN, NM1, NM12, NM13, OLDLL, OLDM
       REAL               ABSE, ABSS, COSL, COSR, CS, EPS, F, G, H, MU,
      $                   OLDCS, OLDSN, R, SHIFT, SIGMN, SIGMX, SINL,
-     $                   SINR, SLL, SMAX, SMIN, SMINL, SMINOA,
+     $                   SINR, SLL, SMAX, SMIN, SMINOA,
      $                   SN, THRESH, TOL, TOLMUL, UNFL
 *     ..
 *     .. External Functions ..
@@ -268,7 +280,8 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
       EXTERNAL           LSAME, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLASR, CSROT, CSSCAL, CSWAP, SLARTG, SLAS2,
+      EXTERNAL           CLASR, CSROT, CSSCAL, CSWAP, SLARTG,
+     $                   SLAS2,
      $                   SLASQ1, SLASV2, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -349,10 +362,12 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *        Update singular vectors if desired
 *
          IF( NRU.GT.0 )
-     $      CALL CLASR( 'R', 'V', 'F', NRU, N, RWORK( 1 ), RWORK( N ),
+     $      CALL CLASR( 'R', 'V', 'F', NRU, N, RWORK( 1 ),
+     $                  RWORK( N ),
      $                  U, LDU )
          IF( NCC.GT.0 )
-     $      CALL CLASR( 'L', 'V', 'F', N, NCC, RWORK( 1 ), RWORK( N ),
+     $      CALL CLASR( 'L', 'V', 'F', N, NCC, RWORK( 1 ),
+     $                  RWORK( N ),
      $                  C, LDC )
       END IF
 *
@@ -372,7 +387,7 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
       DO 30 I = 1, N - 1
          SMAX = MAX( SMAX, ABS( E( I ) ) )
    30 CONTINUE
-      SMINL = ZERO
+      SMIN = ZERO
       IF( TOL.GE.ZERO ) THEN
 *
 *        Relative accuracy desired
@@ -389,20 +404,23 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
    40    CONTINUE
    50    CONTINUE
          SMINOA = SMINOA / SQRT( REAL( N ) )
-         THRESH = MAX( TOL*SMINOA, MAXITR*N*N*UNFL )
+         THRESH = MAX( TOL*SMINOA,
+     $                 REAL(MAXITR)*(REAL(N)*(REAL(N)*UNFL)) )
       ELSE
 *
 *        Absolute accuracy desired
 *
-         THRESH = MAX( ABS( TOL )*SMAX, MAXITR*N*N*UNFL )
+         THRESH = MAX( ABS( TOL )*SMAX,
+     $                 REAL(MAXITR)*(REAL(N)*(REAL(N)*UNFL)) )
       END IF
 *
 *     Prepare for main iteration loop for the singular values
 *     (MAXIT is the maximum number of passes through the inner
 *     loop permitted before nonconvergence signalled.)
 *
-      MAXIT = MAXITR*N*N
-      ITER = 0
+      MAXITDIVN = MAXITR*N
+      ITERDIVN = 0
+      ITER = -1
       OLDLL = -1
       OLDM = -1
 *
@@ -418,15 +436,18 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *
       IF( M.LE.1 )
      $   GO TO 160
-      IF( ITER.GT.MAXIT )
-     $   GO TO 200
+      IF( ITER.GE.N ) THEN
+         ITER = ITER - N
+         ITERDIVN = ITERDIVN + 1
+         IF( ITERDIVN.GE.MAXITDIVN )
+     $      GO TO 200
+      END IF
 *
 *     Find diagonal block of matrix to work on
 *
       IF( TOL.LT.ZERO .AND. ABS( D( M ) ).LE.THRESH )
      $   D( M ) = ZERO
       SMAX = ABS( D( M ) )
-      SMIN = SMAX
       DO 70 LLL = 1, M - 1
          LL = M - LLL
          ABSS = ABS( D( LL ) )
@@ -435,7 +456,6 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $      D( LL ) = ZERO
          IF( ABSE.LE.THRESH )
      $      GO TO 80
-         SMIN = MIN( SMIN, ABSS )
          SMAX = MAX( SMAX, ABSS, ABSE )
    70 CONTINUE
       LL = 0
@@ -473,7 +493,8 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $      CALL CSROT( NCVT, VT( M-1, 1 ), LDVT, VT( M, 1 ), LDVT,
      $                  COSR, SINR )
          IF( NRU.GT.0 )
-     $      CALL CSROT( NRU, U( 1, M-1 ), 1, U( 1, M ), 1, COSL, SINL )
+     $      CALL CSROT( NRU, U( 1, M-1 ), 1, U( 1, M ), 1, COSL,
+     $                  SINL )
          IF( NCC.GT.0 )
      $      CALL CSROT( NCC, C( M-1, 1 ), LDC, C( M, 1 ), LDC, COSL,
      $                  SINL )
@@ -517,14 +538,14 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *           apply convergence criterion forward
 *
             MU = ABS( D( LL ) )
-            SMINL = MU
+            SMIN = MU
             DO 100 LLL = LL, M - 1
                IF( ABS( E( LLL ) ).LE.TOL*MU ) THEN
                   E( LLL ) = ZERO
                   GO TO 60
                END IF
                MU = ABS( D( LLL+1 ) )*( MU / ( MU+ABS( E( LLL ) ) ) )
-               SMINL = MIN( SMINL, MU )
+               SMIN = MIN( SMIN, MU )
   100       CONTINUE
          END IF
 *
@@ -545,14 +566,14 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *           apply convergence criterion backward
 *
             MU = ABS( D( M ) )
-            SMINL = MU
+            SMIN = MU
             DO 110 LLL = M - 1, LL, -1
                IF( ABS( E( LLL ) ).LE.TOL*MU ) THEN
                   E( LLL ) = ZERO
                   GO TO 60
                END IF
                MU = ABS( D( LLL ) )*( MU / ( MU+ABS( E( LLL ) ) ) )
-               SMINL = MIN( SMINL, MU )
+               SMIN = MIN( SMIN, MU )
   110       CONTINUE
          END IF
       END IF
@@ -562,7 +583,7 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *     Compute shift.  First, test if shifting would ruin relative
 *     accuracy, and if so set the shift to zero.
 *
-      IF( TOL.GE.ZERO .AND. N*TOL*( SMINL / SMAX ).LE.
+      IF( TOL.GE.ZERO .AND. REAL( N )*TOL*( SMIN / SMAX ).LE.
      $    MAX( EPS, HNDRTH*TOL ) ) THEN
 *
 *        Use a zero shift to avoid loss of relative accuracy
@@ -606,7 +627,8 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
                CALL SLARTG( D( I )*CS, E( I ), CS, SN, R )
                IF( I.GT.LL )
      $            E( I-1 ) = OLDSN*R
-               CALL SLARTG( OLDCS*R, D( I+1 )*SN, OLDCS, OLDSN, D( I ) )
+               CALL SLARTG( OLDCS*R, D( I+1 )*SN, OLDCS, OLDSN,
+     $                      D( I ) )
                RWORK( I-LL+1 ) = CS
                RWORK( I-LL+1+NM1 ) = SN
                RWORK( I-LL+1+NM12 ) = OLDCS
@@ -622,10 +644,12 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $         CALL CLASR( 'L', 'V', 'F', M-LL+1, NCVT, RWORK( 1 ),
      $                     RWORK( N ), VT( LL, 1 ), LDVT )
             IF( NRU.GT.0 )
-     $         CALL CLASR( 'R', 'V', 'F', NRU, M-LL+1, RWORK( NM12+1 ),
+     $         CALL CLASR( 'R', 'V', 'F', NRU, M-LL+1,
+     $                     RWORK( NM12+1 ),
      $                     RWORK( NM13+1 ), U( 1, LL ), LDU )
             IF( NCC.GT.0 )
-     $         CALL CLASR( 'L', 'V', 'F', M-LL+1, NCC, RWORK( NM12+1 ),
+     $         CALL CLASR( 'L', 'V', 'F', M-LL+1, NCC,
+     $                     RWORK( NM12+1 ),
      $                     RWORK( NM13+1 ), C( LL, 1 ), LDC )
 *
 *           Test convergence
@@ -644,7 +668,8 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
                CALL SLARTG( D( I )*CS, E( I-1 ), CS, SN, R )
                IF( I.LT.M )
      $            E( I ) = OLDSN*R
-               CALL SLARTG( OLDCS*R, D( I-1 )*SN, OLDCS, OLDSN, D( I ) )
+               CALL SLARTG( OLDCS*R, D( I-1 )*SN, OLDCS, OLDSN,
+     $                      D( I ) )
                RWORK( I-LL ) = CS
                RWORK( I-LL+NM1 ) = -SN
                RWORK( I-LL+NM12 ) = OLDCS
@@ -657,7 +682,8 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *           Update singular vectors
 *
             IF( NCVT.GT.0 )
-     $         CALL CLASR( 'L', 'V', 'B', M-LL+1, NCVT, RWORK( NM12+1 ),
+     $         CALL CLASR( 'L', 'V', 'B', M-LL+1, NCVT,
+     $                     RWORK( NM12+1 ),
      $                     RWORK( NM13+1 ), VT( LL, 1 ), LDVT )
             IF( NRU.GT.0 )
      $         CALL CLASR( 'R', 'V', 'B', NRU, M-LL+1, RWORK( 1 ),
@@ -712,10 +738,12 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $         CALL CLASR( 'L', 'V', 'F', M-LL+1, NCVT, RWORK( 1 ),
      $                     RWORK( N ), VT( LL, 1 ), LDVT )
             IF( NRU.GT.0 )
-     $         CALL CLASR( 'R', 'V', 'F', NRU, M-LL+1, RWORK( NM12+1 ),
+     $         CALL CLASR( 'R', 'V', 'F', NRU, M-LL+1,
+     $                     RWORK( NM12+1 ),
      $                     RWORK( NM13+1 ), U( 1, LL ), LDU )
             IF( NCC.GT.0 )
-     $         CALL CLASR( 'L', 'V', 'F', M-LL+1, NCC, RWORK( NM12+1 ),
+     $         CALL CLASR( 'L', 'V', 'F', M-LL+1, NCC,
+     $                     RWORK( NM12+1 ),
      $                     RWORK( NM13+1 ), C( LL, 1 ), LDC )
 *
 *           Test convergence
@@ -762,7 +790,8 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *           Update singular vectors if desired
 *
             IF( NCVT.GT.0 )
-     $         CALL CLASR( 'L', 'V', 'B', M-LL+1, NCVT, RWORK( NM12+1 ),
+     $         CALL CLASR( 'L', 'V', 'B', M-LL+1, NCVT,
+     $                     RWORK( NM12+1 ),
      $                     RWORK( NM13+1 ), VT( LL, 1 ), LDVT )
             IF( NRU.GT.0 )
      $         CALL CLASR( 'R', 'V', 'B', NRU, M-LL+1, RWORK( 1 ),
@@ -781,6 +810,12 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *
   160 CONTINUE
       DO 170 I = 1, N
+         IF( D( I ).EQ.ZERO ) THEN
+*
+*           Avoid -ZERO
+*
+            D( I ) = ZERO
+         END IF
          IF( D( I ).LT.ZERO ) THEN
             D( I ) = -D( I )
 *
@@ -818,7 +853,8 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
             IF( NRU.GT.0 )
      $         CALL CSWAP( NRU, U( 1, ISUB ), 1, U( 1, N+1-I ), 1 )
             IF( NCC.GT.0 )
-     $         CALL CSWAP( NCC, C( ISUB, 1 ), LDC, C( N+1-I, 1 ), LDC )
+     $         CALL CSWAP( NCC, C( ISUB, 1 ), LDC, C( N+1-I, 1 ),
+     $                     LDC )
          END IF
   190 CONTINUE
       GO TO 220
diff --git a/SRC/cgbbrd.f b/SRC/cgbbrd.f
index 7bac090e96..07941db5a6 100644
--- a/SRC/cgbbrd.f
+++ b/SRC/cgbbrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGBBRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgbbrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgbbrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -185,11 +183,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBcomputational
+*> \ingroup gbbrd
 *
 *  =====================================================================
       SUBROUTINE CGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
      $                   LDQ, PT, LDPT, C, LDC, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -222,7 +221,8 @@ SUBROUTINE CGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
       COMPLEX            RA, RB, RS, T
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLARGV, CLARTG, CLARTV, CLASET, CROT, CSCAL,
+      EXTERNAL           CLARGV, CLARTG, CLARTV, CLASET, CROT,
+     $                   CSCAL,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -242,7 +242,9 @@ SUBROUTINE CGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
       WANTC = NCC.GT.0
       KLU1 = KL + KU + 1
       INFO = 0
-      IF( .NOT.WANTQ .AND. .NOT.WANTPT .AND. .NOT.LSAME( VECT, 'N' ) )
+      IF( .NOT.WANTQ .AND.
+     $    .NOT.WANTPT .AND.
+     $    .NOT.LSAME( VECT, 'N' ) )
      $     THEN
          INFO = -1
       ELSE IF( M.LT.0 ) THEN
@@ -338,7 +340,8 @@ SUBROUTINE CGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
                      NRT = NR
                   END IF
                   IF( NRT.GT.0 )
-     $               CALL CLARTV( NRT, AB( KLU1-L, J1-KLM+L-1 ), INCA,
+     $               CALL CLARTV( NRT, AB( KLU1-L, J1-KLM+L-1 ),
+     $                            INCA,
      $                            AB( KLU1-L+1, J1-KLM+L-1 ), INCA,
      $                            RWORK( J1 ), WORK( J1 ), KB1 )
    10          CONTINUE
@@ -377,7 +380,8 @@ SUBROUTINE CGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
 *                 apply plane rotations to C
 *
                   DO 30 J = J1, J2, KB1
-                     CALL CROT( NCC, C( J-1, 1 ), LDC, C( J, 1 ), LDC,
+                     CALL CROT( NCC, C( J-1, 1 ), LDC, C( J, 1 ),
+     $                          LDC,
      $                          RWORK( J ), WORK( J ) )
    30             CONTINUE
                END IF
diff --git a/SRC/cgbcon.f b/SRC/cgbcon.f
index 4578424586..19eb0fdfd0 100644
--- a/SRC/cgbcon.f
+++ b/SRC/cgbcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGBCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgbcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgbcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -139,11 +137,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBcomputational
+*> \ingroup gbcon
 *
 *  =====================================================================
-      SUBROUTINE CGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM, RCOND,
+      SUBROUTINE CGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM,
+     $                   RCOND,
      $                   WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -184,7 +184,8 @@ SUBROUTINE CGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM, RCOND,
       EXTERNAL           LSAME, ICAMAX, SLAMCH, CDOTC
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CLACN2, CLATBS, CSRSCL, XERBLA
+      EXTERNAL           CAXPY, CLACN2, CLATBS, CSRSCL,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MIN, REAL
@@ -259,13 +260,15 @@ SUBROUTINE CGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM, RCOND,
                      WORK( JP ) = WORK( J )
                      WORK( J ) = T
                   END IF
-                  CALL CAXPY( LM, -T, AB( KD+1, J ), 1, WORK( J+1 ), 1 )
+                  CALL CAXPY( LM, -T, AB( KD+1, J ), 1, WORK( J+1 ),
+     $                        1 )
    20          CONTINUE
             END IF
 *
 *           Multiply by inv(U).
 *
-            CALL CLATBS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL CLATBS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   KL+KU, AB, LDAB, WORK, SCALE, RWORK, INFO )
          ELSE
 *
@@ -280,7 +283,8 @@ SUBROUTINE CGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM, RCOND,
             IF( LNOTI ) THEN
                DO 30 J = N - 1, 1, -1
                   LM = MIN( KL, N-J )
-                  WORK( J ) = WORK( J ) - CDOTC( LM, AB( KD+1, J ), 1,
+                  WORK( J ) = WORK( J ) - CDOTC( LM, AB( KD+1, J ),
+     $                  1,
      $                        WORK( J+1 ), 1 )
                   JP = IPIV( J )
                   IF( JP.NE.J ) THEN
diff --git a/SRC/cgbequ.f b/SRC/cgbequ.f
index b52043dee3..3f29d7a3f3 100644
--- a/SRC/cgbequ.f
+++ b/SRC/cgbequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGBEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgbequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgbequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -146,11 +144,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBcomputational
+*> \ingroup gbequ
 *
 *  =====================================================================
-      SUBROUTINE CGBEQU( M, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+      SUBROUTINE CGBEQU( M, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                   COLCND,
      $                   AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cgbequb.f b/SRC/cgbequb.f
index 788fb378fe..40e7ed5b30 100644
--- a/SRC/cgbequb.f
+++ b/SRC/cgbequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGBEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgbequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgbequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -153,11 +151,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBcomputational
+*> \ingroup gbequb
 *
 *  =====================================================================
-      SUBROUTINE CGBEQUB( M, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+      SUBROUTINE CGBEQUB( M, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                    COLCND,
      $                    AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cgbrfs.f b/SRC/cgbrfs.f
index 72c70349fa..a17883fce9 100644
--- a/SRC/cgbrfs.f
+++ b/SRC/cgbrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGBRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgbrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgbrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -197,12 +195,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBcomputational
+*> \ingroup gbrfs
 *
 *  =====================================================================
-      SUBROUTINE CGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
+      SUBROUTINE CGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
+     $                   LDAFB,
      $                   IPIV, B, LDB, X, LDX, FERR, BERR, WORK, RWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -244,7 +244,8 @@ SUBROUTINE CGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CGBMV, CGBTRS, CLACN2, XERBLA
+      EXTERNAL           CAXPY, CCOPY, CGBMV, CGBTRS, CLACN2,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MAX, MIN, REAL
@@ -314,7 +315,7 @@ SUBROUTINE CGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
       NZ = MIN( KL+KU+2, N+1 )
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -331,7 +332,8 @@ SUBROUTINE CGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
 *        where op(A) = A, A**T, or A**H, depending on TRANS.
 *
          CALL CCOPY( N, B( 1, J ), 1, WORK, 1 )
-         CALL CGBMV( TRANS, N, N, KL, KU, -CONE, AB, LDAB, X( 1, J ), 1,
+         CALL CGBMV( TRANS, N, N, KL, KU, -CONE, AB, LDAB, X( 1, J ),
+     $               1,
      $               CONE, WORK, 1 )
 *
 *        Compute componentwise relative backward error from formula
@@ -389,7 +391,8 @@ SUBROUTINE CGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
 *
 *           Update solution and try again.
 *
-            CALL CGBTRS( TRANS, N, KL, KU, 1, AFB, LDAFB, IPIV, WORK, N,
+            CALL CGBTRS( TRANS, N, KL, KU, 1, AFB, LDAFB, IPIV, WORK,
+     $                   N,
      $                   INFO )
             CALL CAXPY( N, CONE, WORK, 1, X( 1, J ), 1 )
             LSTRES = BERR( J )
@@ -421,10 +424,11 @@ SUBROUTINE CGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
 *
          DO 90 I = 1, N
             IF( RWORK( I ).GT.SAFE2 ) THEN
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I )
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I )
             ELSE
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I ) +
-     $                      SAFE1
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I ) + SAFE1
             END IF
    90    CONTINUE
 *
diff --git a/SRC/cgbrfsx.f b/SRC/cgbrfsx.f
index 1587d21f6e..ab142be46d 100644
--- a/SRC/cgbrfsx.f
+++ b/SRC/cgbrfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGBRFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgbrfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgbrfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -429,14 +427,16 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBcomputational
+*> \ingroup gbrfsx
 *
 *  =====================================================================
-      SUBROUTINE CGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
+      SUBROUTINE CGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB,
+     $                    AFB,
      $                    LDAFB, IPIV, R, C, B, LDB, X, LDX, RCOND,
      $                    BERR, N_ERR_BNDS, ERR_BNDS_NORM,
      $                    ERR_BNDS_COMP, NPARAMS, PARAMS, WORK, RWORK,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -496,7 +496,8 @@ SUBROUTINE CGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
 *     ..
 *     .. External Functions ..
       EXTERNAL           LSAME, ILATRANS, ILAPREC
-      EXTERNAL           SLAMCH, CLANGB, CLA_GBRCOND_X, CLA_GBRCOND_C
+      EXTERNAL           SLAMCH, CLANGB, CLA_GBRCOND_X,
+     $                   CLA_GBRCOND_C
       REAL               SLAMCH, CLANGB, CLA_GBRCOND_X, CLA_GBRCOND_C
       LOGICAL            LSAME
       INTEGER            ILATRANS, ILAPREC
@@ -643,7 +644,8 @@ SUBROUTINE CGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
          PREC_TYPE = ILAPREC( 'D' )
 
          IF ( NOTRAN ) THEN
-            CALL CLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE,  N, KL, KU,
+            CALL CLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE,  N, KL,
+     $                                KU,
      $           NRHS, AB, LDAB, AFB, LDAFB, IPIV, COLEQU, C, B,
      $           LDB, X, LDX, BERR, N_NORMS, ERR_BNDS_NORM,
      $           ERR_BNDS_COMP, WORK, RWORK, WORK(N+1),
@@ -651,7 +653,8 @@ SUBROUTINE CGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
      $           RCOND, ITHRESH, RTHRESH, UNSTABLE_THRESH, IGNORE_CWISE,
      $           INFO )
          ELSE
-            CALL CLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE,  N, KL, KU,
+            CALL CLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE,  N, KL,
+     $                                KU,
      $           NRHS, AB, LDAB, AFB, LDAFB, IPIV, ROWEQU, R, B,
      $           LDB, X, LDX, BERR, N_NORMS, ERR_BNDS_NORM,
      $           ERR_BNDS_COMP, WORK, RWORK, WORK(N+1),
@@ -667,13 +670,16 @@ SUBROUTINE CGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
 *     Compute scaled normwise condition number cond(A*C).
 *
          IF ( COLEQU .AND. NOTRAN ) THEN
-            RCOND_TMP = CLA_GBRCOND_C( TRANS, N, KL, KU, AB, LDAB, AFB,
+            RCOND_TMP = CLA_GBRCOND_C( TRANS, N, KL, KU, AB, LDAB,
+     $                                 AFB,
      $           LDAFB, IPIV, C, .TRUE., INFO, WORK, RWORK )
          ELSE IF ( ROWEQU .AND. .NOT. NOTRAN ) THEN
-            RCOND_TMP = CLA_GBRCOND_C( TRANS, N, KL, KU, AB, LDAB, AFB,
+            RCOND_TMP = CLA_GBRCOND_C( TRANS, N, KL, KU, AB, LDAB,
+     $                                 AFB,
      $           LDAFB, IPIV, R, .TRUE., INFO, WORK, RWORK )
          ELSE
-            RCOND_TMP = CLA_GBRCOND_C( TRANS, N, KL, KU, AB, LDAB, AFB,
+            RCOND_TMP = CLA_GBRCOND_C( TRANS, N, KL, KU, AB, LDAB,
+     $                                 AFB,
      $           LDAFB, IPIV, C, .FALSE., INFO, WORK, RWORK )
          END IF
          DO J = 1, NRHS
diff --git a/SRC/cgbsv.f b/SRC/cgbsv.f
index 049d6eeab4..55073706d1 100644
--- a/SRC/cgbsv.f
+++ b/SRC/cgbsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGBSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgbsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgbsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,7 +131,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBsolve
+*> \ingroup gbsv
 *
 *> \par Further Details:
 *  =====================
@@ -158,7 +156,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CGBSV( N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB, INFO )
+      SUBROUTINE CGBSV( N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
+     $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -210,7 +210,8 @@ SUBROUTINE CGBSV( N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB, INFO )
 *
 *        Solve the system A*X = B, overwriting B with X.
 *
-         CALL CGBTRS( 'No transpose', N, KL, KU, NRHS, AB, LDAB, IPIV,
+         CALL CGBTRS( 'No transpose', N, KL, KU, NRHS, AB, LDAB,
+     $                IPIV,
      $                B, LDB, INFO )
       END IF
       RETURN
diff --git a/SRC/cgbsvx.f b/SRC/cgbsvx.f
index 7b6770d20d..f4d5358349 100644
--- a/SRC/cgbsvx.f
+++ b/SRC/cgbsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGBSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgbsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgbsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -322,7 +320,7 @@
 *>
 *> \param[out] RWORK
 *> \verbatim
-*>          RWORK is REAL array, dimension (N)
+*>          RWORK is REAL array, dimension (MAX(1,N))
 *>          On exit, RWORK(1) contains the reciprocal pivot growth
 *>          factor norm(A)/norm(U). The "max absolute element" norm is
 *>          used. If RWORK(1) is much less than 1, then the stability
@@ -361,12 +359,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBsolve
+*> \ingroup gbsvx
 *
 *  =====================================================================
       SUBROUTINE CGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
      $                   LDAFB, IPIV, EQUED, R, C, B, LDB, X, LDX,
      $                   RCOND, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -407,7 +406,8 @@ SUBROUTINE CGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
       EXTERNAL           LSAME, CLANGB, CLANTB, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CGBCON, CGBEQU, CGBRFS, CGBTRF, CGBTRS,
+      EXTERNAL           CCOPY, CGBCON, CGBEQU, CGBRFS, CGBTRF,
+     $                   CGBTRS,
      $                   CLACPY, CLAQGB, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -432,7 +432,9 @@ SUBROUTINE CGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
       ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
@@ -508,7 +510,8 @@ SUBROUTINE CGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *
 *           Equilibrate the matrix.
 *
-            CALL CLAQGB( N, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+            CALL CLAQGB( N, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                   COLCND,
      $                   AMAX, EQUED )
             ROWEQU = LSAME( EQUED, 'R' ) .OR. LSAME( EQUED, 'B' )
             COLEQU = LSAME( EQUED, 'C' ) .OR. LSAME( EQUED, 'B' )
@@ -559,7 +562,8 @@ SUBROUTINE CGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
                   ANORM = MAX( ANORM, ABS( AB( I, J ) ) )
    80          CONTINUE
    90       CONTINUE
-            RPVGRW = CLANTB( 'M', 'U', 'N', INFO, MIN( INFO-1, KL+KU ),
+            RPVGRW = CLANTB( 'M', 'U', 'N', INFO, MIN( INFO-1,
+     $                       KL+KU ),
      $                       AFB( MAX( 1, KL+KU+2-INFO ), 1 ), LDAFB,
      $                       RWORK )
             IF( RPVGRW.EQ.ZERO ) THEN
@@ -603,7 +607,8 @@ SUBROUTINE CGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *     Use iterative refinement to improve the computed solution and
 *     compute error bounds and backward error estimates for it.
 *
-      CALL CGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB, IPIV,
+      CALL CGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
+     $             IPIV,
      $             B, LDB, X, LDX, FERR, BERR, WORK, RWORK, INFO )
 *
 *     Transform the solution matrix X to a solution of the original
diff --git a/SRC/cgbsvxx.f b/SRC/cgbsvxx.f
index 9396fa0112..73b3e3ba68 100644
--- a/SRC/cgbsvxx.f
+++ b/SRC/cgbsvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGBSVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgbsvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgbsvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -552,14 +550,16 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBsolve
+*> \ingroup gbsvxx
 *
 *  =====================================================================
-      SUBROUTINE CGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
+      SUBROUTINE CGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB,
+     $                    AFB,
      $                    LDAFB, IPIV, EQUED, R, C, B, LDB, X, LDX,
      $                    RCOND, RPVGRW, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -606,7 +606,8 @@ SUBROUTINE CGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
       REAL               SLAMCH, CLA_GBRPVGRW
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGBEQUB, CGBTRF, CGBTRS, CLACPY, CLAQGB,
+      EXTERNAL           CGBEQUB, CGBTRF, CGBTRS, CLACPY,
+     $                   CLAQGB,
      $                   XERBLA, CLASCL2, CGBRFSX
 *     ..
 *     .. Intrinsic Functions ..
@@ -713,7 +714,8 @@ SUBROUTINE CGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *
 *     Equilibrate the matrix.
 *
-            CALL CLAQGB( N, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+            CALL CLAQGB( N, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                   COLCND,
      $           AMAX, EQUED )
             ROWEQU = LSAME( EQUED, 'R' ) .OR. LSAME( EQUED, 'B' )
             COLEQU = LSAME( EQUED, 'C' ) .OR. LSAME( EQUED, 'B' )
@@ -779,7 +781,8 @@ SUBROUTINE CGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *     Use iterative refinement to improve the computed solution and
 *     compute error bounds and backward error estimates for it.
 *
-      CALL CGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
+      CALL CGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
+     $              LDAFB,
      $     IPIV, R, C, B, LDB, X, LDX, RCOND, BERR,
      $     N_ERR_BNDS, ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $     WORK, RWORK, INFO )
diff --git a/SRC/cgbtf2.f b/SRC/cgbtf2.f
index 8c58d6e118..b93a1c3986 100644
--- a/SRC/cgbtf2.f
+++ b/SRC/cgbtf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGBTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgbtf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgbtf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,7 +113,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBcomputational
+*> \ingroup gbtf2
 *
 *> \par Further Details:
 *  =====================
@@ -142,6 +140,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGBTF2( M, N, KL, KU, AB, LDAB, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -249,7 +248,8 @@ SUBROUTINE CGBTF2( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *              Compute multipliers.
 *
-               CALL CSCAL( KM, ONE / AB( KV+1, J ), AB( KV+2, J ), 1 )
+               CALL CSCAL( KM, ONE / AB( KV+1, J ), AB( KV+2, J ),
+     $                     1 )
 *
 *              Update trailing submatrix within the band.
 *
diff --git a/SRC/cgbtrf.f b/SRC/cgbtrf.f
index 8533e0061d..4f0da00cc3 100644
--- a/SRC/cgbtrf.f
+++ b/SRC/cgbtrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGBTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgbtrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgbtrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,7 +113,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBcomputational
+*> \ingroup gbtrf
 *
 *> \par Further Details:
 *  =====================
@@ -141,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -177,7 +176,8 @@ SUBROUTINE CGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
       EXTERNAL           ICAMAX, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CGBTF2, CGEMM, CGERU, CLASWP, CSCAL,
+      EXTERNAL           CCOPY, CGBTF2, CGEMM, CGERU, CLASWP,
+     $                   CSCAL,
      $                   CSWAP, CTRSM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -325,7 +325,8 @@ SUBROUTINE CGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                 Compute multipliers
 *
-                  CALL CSCAL( KM, ONE / AB( KV+1, JJ ), AB( KV+2, JJ ),
+                  CALL CSCAL( KM, ONE / AB( KV+1, JJ ), AB( KV+2,
+     $                        JJ ),
      $                        1 )
 *
 *                 Update trailing submatrix within the band and within
@@ -394,7 +395,8 @@ SUBROUTINE CGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                 Update A12
 *
-                  CALL CTRSM( 'Left', 'Lower', 'No transpose', 'Unit',
+                  CALL CTRSM( 'Left', 'Lower', 'No transpose',
+     $                        'Unit',
      $                        JB, J2, ONE, AB( KV+1, J ), LDAB-1,
      $                        AB( KV+1-JB, J+JB ), LDAB-1 )
 *
@@ -402,7 +404,8 @@ SUBROUTINE CGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                    Update A22
 *
-                     CALL CGEMM( 'No transpose', 'No transpose', I2, J2,
+                     CALL CGEMM( 'No transpose', 'No transpose', I2,
+     $                           J2,
      $                           JB, -ONE, AB( KV+1+JB, J ), LDAB-1,
      $                           AB( KV+1-JB, J+JB ), LDAB-1, ONE,
      $                           AB( KV+1, J+JB ), LDAB-1 )
@@ -412,7 +415,8 @@ SUBROUTINE CGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                    Update A32
 *
-                     CALL CGEMM( 'No transpose', 'No transpose', I3, J2,
+                     CALL CGEMM( 'No transpose', 'No transpose', I3,
+     $                           J2,
      $                           JB, -ONE, WORK31, LDWORK,
      $                           AB( KV+1-JB, J+JB ), LDAB-1, ONE,
      $                           AB( KV+KL+1-JB, J+JB ), LDAB-1 )
@@ -432,7 +436,8 @@ SUBROUTINE CGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                 Update A13 in the work array
 *
-                  CALL CTRSM( 'Left', 'Lower', 'No transpose', 'Unit',
+                  CALL CTRSM( 'Left', 'Lower', 'No transpose',
+     $                        'Unit',
      $                        JB, J3, ONE, AB( KV+1, J ), LDAB-1,
      $                        WORK13, LDWORK )
 *
@@ -440,7 +445,8 @@ SUBROUTINE CGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                    Update A23
 *
-                     CALL CGEMM( 'No transpose', 'No transpose', I2, J3,
+                     CALL CGEMM( 'No transpose', 'No transpose', I2,
+     $                           J3,
      $                           JB, -ONE, AB( KV+1+JB, J ), LDAB-1,
      $                           WORK13, LDWORK, ONE, AB( 1+JB, J+KV ),
      $                           LDAB-1 )
@@ -450,7 +456,8 @@ SUBROUTINE CGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                    Update A33
 *
-                     CALL CGEMM( 'No transpose', 'No transpose', I3, J3,
+                     CALL CGEMM( 'No transpose', 'No transpose', I3,
+     $                           J3,
      $                           JB, -ONE, WORK31, LDWORK, WORK13,
      $                           LDWORK, ONE, AB( 1+KL, J+KV ), LDAB-1 )
                   END IF
diff --git a/SRC/cgbtrs.f b/SRC/cgbtrs.f
index 362e0a4c98..d0e3810c71 100644
--- a/SRC/cgbtrs.f
+++ b/SRC/cgbtrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGBTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgbtrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgbtrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,11 +128,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBcomputational
+*> \ingroup gbtrs
 *
 *  =====================================================================
-      SUBROUTINE CGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
+      SUBROUTINE CGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B,
+     $                   LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -164,7 +164,8 @@ SUBROUTINE CGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMV, CGERU, CLACGV, CSWAP, CTBSV, XERBLA
+      EXTERNAL           CGEMV, CGERU, CLACGV, CSWAP, CTBSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -221,7 +222,8 @@ SUBROUTINE CGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
                L = IPIV( J )
                IF( L.NE.J )
      $            CALL CSWAP( NRHS, B( L, 1 ), LDB, B( J, 1 ), LDB )
-               CALL CGERU( LM, NRHS, -ONE, AB( KD+1, J ), 1, B( J, 1 ),
+               CALL CGERU( LM, NRHS, -ONE, AB( KD+1, J ), 1, B( J,
+     $                     1 ),
      $                     LDB, B( J+1, 1 ), LDB )
    10       CONTINUE
          END IF
@@ -230,7 +232,8 @@ SUBROUTINE CGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
 *
 *           Solve U*X = B, overwriting B with X.
 *
-            CALL CTBSV( 'Upper', 'No transpose', 'Non-unit', N, KL+KU,
+            CALL CTBSV( 'Upper', 'No transpose', 'Non-unit', N,
+     $                  KL+KU,
      $                  AB, LDAB, B( 1, I ), 1 )
    20    CONTINUE
 *
@@ -242,7 +245,8 @@ SUBROUTINE CGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
 *
 *           Solve U**T * X = B, overwriting B with X.
 *
-            CALL CTBSV( 'Upper', 'Transpose', 'Non-unit', N, KL+KU, AB,
+            CALL CTBSV( 'Upper', 'Transpose', 'Non-unit', N, KL+KU,
+     $                  AB,
      $                  LDAB, B( 1, I ), 1 )
    30    CONTINUE
 *
@@ -267,7 +271,8 @@ SUBROUTINE CGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
 *
 *           Solve U**H * X = B, overwriting B with X.
 *
-            CALL CTBSV( 'Upper', 'Conjugate transpose', 'Non-unit', N,
+            CALL CTBSV( 'Upper', 'Conjugate transpose', 'Non-unit',
+     $                  N,
      $                  KL+KU, AB, LDAB, B( 1, I ), 1 )
    50    CONTINUE
 *
diff --git a/SRC/cgebak.f b/SRC/cgebak.f
index 201dbfcec4..3b7538c824 100644
--- a/SRC/cgebak.f
+++ b/SRC/cgebak.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEBAK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgebak.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgebak.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,11 +121,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup gebak
 *
 *  =====================================================================
       SUBROUTINE CGEBAK( JOB, SIDE, N, ILO, IHI, SCALE, M, V, LDV,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,8 +170,10 @@ SUBROUTINE CGEBAK( JOB, SIDE, N, ILO, IHI, SCALE, M, V, LDV,
       LEFTV = LSAME( SIDE, 'L' )
 *
       INFO = 0
-      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
-     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+      IF( .NOT.LSAME( JOB, 'N' ) .AND.
+     $    .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND.
+     $                .NOT.LSAME( JOB, 'B' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.RIGHTV .AND. .NOT.LEFTV ) THEN
          INFO = -2
@@ -238,7 +239,7 @@ SUBROUTINE CGEBAK( JOB, SIDE, N, ILO, IHI, SCALE, M, V, LDV,
      $            GO TO 40
                IF( I.LT.ILO )
      $            I = ILO - II
-               K = SCALE( I )
+               K = INT( SCALE( I ) )
                IF( K.EQ.I )
      $            GO TO 40
                CALL CSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
@@ -252,7 +253,7 @@ SUBROUTINE CGEBAK( JOB, SIDE, N, ILO, IHI, SCALE, M, V, LDV,
      $            GO TO 50
                IF( I.LT.ILO )
      $            I = ILO - II
-               K = SCALE( I )
+               K = INT( SCALE( I ) )
                IF( K.EQ.I )
      $            GO TO 50
                CALL CSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
diff --git a/SRC/cgebal.f b/SRC/cgebal.f
index 5d1ebb026e..4ffdf2f884 100644
--- a/SRC/cgebal.f
+++ b/SRC/cgebal.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEBAL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgebal.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgebal.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -85,6 +83,7 @@
 *> \verbatim
 *>          ILO is INTEGER
 *> \endverbatim
+*>
 *> \param[out] IHI
 *> \verbatim
 *>          IHI is INTEGER
@@ -122,7 +121,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup gebal
 *
 *> \par Further Details:
 *  =====================
@@ -154,10 +153,14 @@
 *>
 *>  Modified by Tzu-Yi Chen, Computer Science Division, University of
 *>    California at Berkeley, USA
+*>
+*>  Refactored by Evert Provoost, Department of Computer Science,
+*>    KU Leuven, Belgium
 *> \endverbatim
 *>
 *  =====================================================================
       SUBROUTINE CGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,8 +186,8 @@ SUBROUTINE CGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
       PARAMETER          ( FACTOR = 0.95E+0 )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            NOCONV
-      INTEGER            I, ICA, IEXC, IRA, J, K, L, M
+      LOGICAL            NOCONV, CANSWAP
+      INTEGER            I, ICA, IRA, J, K, L
       REAL               C, CA, F, G, R, RA, S, SFMAX1, SFMAX2, SFMIN1,
      $                   SFMIN2
 *     ..
@@ -192,19 +195,22 @@ SUBROUTINE CGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
       LOGICAL            SISNAN, LSAME
       INTEGER            ICAMAX
       REAL               SLAMCH, SCNRM2
-      EXTERNAL           SISNAN, LSAME, ICAMAX, SLAMCH, SCNRM2
+      EXTERNAL           SISNAN, LSAME, ICAMAX, SLAMCH,
+     $                   SCNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CSSCAL, CSWAP, XERBLA
+      EXTERNAL           XERBLA, CSSCAL, CSWAP
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          ABS, AIMAG, MAX, MIN, REAL
+      INTRINSIC          ABS, REAL, AIMAG, MAX, MIN
 *
 *     Test the input parameters
 *
       INFO = 0
-      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
-     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+      IF( .NOT.LSAME( JOB, 'N' ) .AND.
+     $    .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND.
+     $                .NOT.LSAME( JOB, 'B' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -216,176 +222,196 @@ SUBROUTINE CGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
          RETURN
       END IF
 *
-      K = 1
-      L = N
+*     Quick returns.
 *
-      IF( N.EQ.0 )
-     $   GO TO 210
+      IF( N.EQ.0 ) THEN
+         ILO = 1
+         IHI = 0
+         RETURN
+      END IF
 *
       IF( LSAME( JOB, 'N' ) ) THEN
-         DO 10 I = 1, N
+         DO I = 1, N
             SCALE( I ) = ONE
-   10    CONTINUE
-         GO TO 210
+         END DO
+         ILO = 1
+         IHI = N
+         RETURN
       END IF
 *
-      IF( LSAME( JOB, 'S' ) )
-     $   GO TO 120
-*
-*     Permutation to isolate eigenvalues if possible
-*
-      GO TO 50
-*
-*     Row and column exchange.
-*
-   20 CONTINUE
-      SCALE( M ) = J
-      IF( J.EQ.M )
-     $   GO TO 30
-*
-      CALL CSWAP( L, A( 1, J ), 1, A( 1, M ), 1 )
-      CALL CSWAP( N-K+1, A( J, K ), LDA, A( M, K ), LDA )
-*
-   30 CONTINUE
-      GO TO ( 40, 80 )IEXC
-*
-*     Search for rows isolating an eigenvalue and push them down.
-*
-   40 CONTINUE
-      IF( L.EQ.1 )
-     $   GO TO 210
-      L = L - 1
-*
-   50 CONTINUE
-      DO 70 J = L, 1, -1
+*     Permutation to isolate eigenvalues if possible.
 *
-         DO 60 I = 1, L
-            IF( I.EQ.J )
-     $         GO TO 60
-            IF( REAL( A( J, I ) ).NE.ZERO .OR. AIMAG( A( J, I ) ).NE.
-     $          ZERO )GO TO 70
-   60    CONTINUE
-*
-         M = L
-         IEXC = 1
-         GO TO 20
-   70 CONTINUE
-*
-      GO TO 90
+      K = 1
+      L = N
 *
-*     Search for columns isolating an eigenvalue and push them left.
+      IF( .NOT.LSAME( JOB, 'S' ) ) THEN
 *
-   80 CONTINUE
-      K = K + 1
+*        Row and column exchange.
 *
-   90 CONTINUE
-      DO 110 J = K, L
+         NOCONV = .TRUE.
+         DO WHILE( NOCONV )
+*
+*           Search for rows isolating an eigenvalue and push them down.
+*
+            NOCONV = .FALSE.
+            DO I = L, 1, -1
+               CANSWAP = .TRUE.
+               DO J = 1, L
+                  IF( I.NE.J .AND. ( REAL( A( I, J ) ).NE.ZERO .OR.
+     $                AIMAG( A( I, J ) ).NE.ZERO ) ) THEN
+                     CANSWAP = .FALSE.
+                     EXIT
+                  END IF
+               END DO
+*
+               IF( CANSWAP ) THEN
+                  SCALE( L ) = REAL( I )
+                  IF( I.NE.L ) THEN
+                     CALL CSWAP( L, A( 1, I ), 1, A( 1, L ), 1 )
+                     CALL CSWAP( N-K+1, A( I, K ), LDA, A( L, K ),
+     $                           LDA )
+                  END IF
+                  NOCONV = .TRUE.
+*
+                  IF( L.EQ.1 ) THEN
+                     ILO = 1
+                     IHI = 1
+                     RETURN
+                  END IF
+*
+                  L = L - 1
+               END IF
+            END DO
+*
+         END DO
+
+         NOCONV = .TRUE.
+         DO WHILE( NOCONV )
+*
+*           Search for columns isolating an eigenvalue and push them left.
+*
+            NOCONV = .FALSE.
+            DO J = K, L
+               CANSWAP = .TRUE.
+               DO I = K, L
+                  IF( I.NE.J .AND. ( REAL( A( I, J ) ).NE.ZERO .OR.
+     $                AIMAG( A( I, J ) ).NE.ZERO ) ) THEN
+                     CANSWAP = .FALSE.
+                     EXIT
+                  END IF
+               END DO
+*
+               IF( CANSWAP ) THEN
+                  SCALE( K ) = REAL( J )
+                  IF( J.NE.K ) THEN
+                     CALL CSWAP( L, A( 1, J ), 1, A( 1, K ), 1 )
+                     CALL CSWAP( N-K+1, A( J, K ), LDA, A( K, K ),
+     $                           LDA )
+                  END IF
+                  NOCONV = .TRUE.
+*
+                  K = K + 1
+               END IF
+            END DO
+*
+         END DO
 *
-         DO 100 I = K, L
-            IF( I.EQ.J )
-     $         GO TO 100
-            IF( REAL( A( I, J ) ).NE.ZERO .OR. AIMAG( A( I, J ) ).NE.
-     $          ZERO )GO TO 110
-  100    CONTINUE
+      END IF
 *
-         M = K
-         IEXC = 2
-         GO TO 20
-  110 CONTINUE
+*     Initialize SCALE for non-permuted submatrix.
 *
-  120 CONTINUE
-      DO 130 I = K, L
+      DO I = K, L
          SCALE( I ) = ONE
-  130 CONTINUE
+      END DO
 *
-      IF( LSAME( JOB, 'P' ) )
-     $   GO TO 210
+*     If we only had to permute, we are done.
+*
+      IF( LSAME( JOB, 'P' ) ) THEN
+         ILO = K
+         IHI = L
+         RETURN
+      END IF
 *
 *     Balance the submatrix in rows K to L.
 *
-*     Iterative loop for norm reduction
+*     Iterative loop for norm reduction.
 *
       SFMIN1 = SLAMCH( 'S' ) / SLAMCH( 'P' )
       SFMAX1 = ONE / SFMIN1
       SFMIN2 = SFMIN1*SCLFAC
       SFMAX2 = ONE / SFMIN2
-  140 CONTINUE
-      NOCONV = .FALSE.
-*
-      DO 200 I = K, L
-*
-         C = SCNRM2( L-K+1, A( K, I ), 1 )
-         R = SCNRM2( L-K+1, A( I , K ), LDA )
-         ICA = ICAMAX( L, A( 1, I ), 1 )
-         CA = ABS( A( ICA, I ) )
-         IRA = ICAMAX( N-K+1, A( I, K ), LDA )
-         RA = ABS( A( I, IRA+K-1 ) )
-*
-*        Guard against zero C or R due to underflow.
-*
-         IF( C.EQ.ZERO .OR. R.EQ.ZERO )
-     $      GO TO 200
-         G = R / SCLFAC
-         F = ONE
-         S = C + R
-  160    CONTINUE
-         IF( C.GE.G .OR. MAX( F, C, CA ).GE.SFMAX2 .OR.
-     $       MIN( R, G, RA ).LE.SFMIN2 )GO TO 170
-            IF( SISNAN( C+F+CA+R+G+RA ) ) THEN
 *
-*           Exit if NaN to avoid infinite loop
+      NOCONV = .TRUE.
+      DO WHILE( NOCONV )
+         NOCONV = .FALSE.
 *
-            INFO = -3
-            CALL XERBLA( 'CGEBAL', -INFO )
-            RETURN
-         END IF
-         F = F*SCLFAC
-         C = C*SCLFAC
-         CA = CA*SCLFAC
-         R = R / SCLFAC
-         G = G / SCLFAC
-         RA = RA / SCLFAC
-         GO TO 160
-*
-  170    CONTINUE
-         G = C / SCLFAC
-  180    CONTINUE
-         IF( G.LT.R .OR. MAX( R, RA ).GE.SFMAX2 .OR.
-     $       MIN( F, C, G, CA ).LE.SFMIN2 )GO TO 190
-         F = F / SCLFAC
-         C = C / SCLFAC
-         G = G / SCLFAC
-         CA = CA / SCLFAC
-         R = R*SCLFAC
-         RA = RA*SCLFAC
-         GO TO 180
-*
-*        Now balance.
-*
-  190    CONTINUE
-         IF( ( C+R ).GE.FACTOR*S )
-     $      GO TO 200
-         IF( F.LT.ONE .AND. SCALE( I ).LT.ONE ) THEN
-            IF( F*SCALE( I ).LE.SFMIN1 )
-     $         GO TO 200
-         END IF
-         IF( F.GT.ONE .AND. SCALE( I ).GT.ONE ) THEN
-            IF( SCALE( I ).GE.SFMAX1 / F )
-     $         GO TO 200
-         END IF
-         G = ONE / F
-         SCALE( I ) = SCALE( I )*F
-         NOCONV = .TRUE.
+         DO I = K, L
 *
-         CALL CSSCAL( N-K+1, G, A( I, K ), LDA )
-         CALL CSSCAL( L, F, A( 1, I ), 1 )
+            C = SCNRM2( L-K+1, A( K, I ), 1 )
+            R = SCNRM2( L-K+1, A( I, K ), LDA )
+            ICA = ICAMAX( L, A( 1, I ), 1 )
+            CA = ABS( A( ICA, I ) )
+            IRA = ICAMAX( N-K+1, A( I, K ), LDA )
+            RA = ABS( A( I, IRA+K-1 ) )
 *
-  200 CONTINUE
+*           Guard against zero C or R due to underflow.
+*
+            IF( C.EQ.ZERO .OR. R.EQ.ZERO ) CYCLE
+*
+*           Exit if NaN to avoid infinite loop
 *
-      IF( NOCONV )
-     $   GO TO 140
+            IF( SISNAN( C+CA+R+RA ) ) THEN
+               INFO = -3
+               CALL XERBLA( 'CGEBAL', -INFO )
+               RETURN
+            END IF
+*
+            G = R / SCLFAC
+            F = ONE
+            S = C + R
+*
+            DO WHILE( C.LT.G .AND. MAX( F, C, CA ).LT.SFMAX2 .AND.
+     $                MIN( R, G, RA ).GT.SFMIN2 )
+               F = F*SCLFAC
+               C = C*SCLFAC
+               CA = CA*SCLFAC
+               R = R / SCLFAC
+               G = G / SCLFAC
+               RA = RA / SCLFAC
+            END DO
+*
+            G = C / SCLFAC
+*
+            DO WHILE( G.GE.R .AND. MAX( R, RA ).LT.SFMAX2 .AND.
+     $                MIN( F, C, G, CA ).GT.SFMIN2 )
+               F = F / SCLFAC
+               C = C / SCLFAC
+               G = G / SCLFAC
+               CA = CA / SCLFAC
+               R = R*SCLFAC
+               RA = RA*SCLFAC
+            END DO
+*
+*           Now balance.
+*
+            IF( ( C+R ).GE.FACTOR*S ) CYCLE
+            IF( F.LT.ONE .AND. SCALE( I ).LT.ONE ) THEN
+               IF( F*SCALE( I ).LE.SFMIN1 ) CYCLE
+            END IF
+            IF( F.GT.ONE .AND. SCALE( I ).GT.ONE ) THEN
+               IF( SCALE( I ).GE.SFMAX1 / F ) CYCLE
+            END IF
+            G = ONE / F
+            SCALE( I ) = SCALE( I )*F
+            NOCONV = .TRUE.
+*
+            CALL CSSCAL( N-K+1, G, A( I, K ), LDA )
+            CALL CSSCAL( L, F, A( 1, I ), 1 )
+*
+         END DO
+*
+      END DO
 *
-  210 CONTINUE
       ILO = K
       IHI = L
 *
diff --git a/SRC/cgebd2.f b/SRC/cgebd2.f
index db949f90cf..b9be813007 100644
--- a/SRC/cgebd2.f
+++ b/SRC/cgebd2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEBD2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgebd2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgebd2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup gebd2
 * @precisions normal c -> s d z
 *
 *> \par Further Details:
@@ -187,6 +185,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -203,16 +202,15 @@ SUBROUTINE CGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
 *  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX            ZERO, ONE
-      PARAMETER          ( ZERO = ( 0.0E+0, 0.0E+0 ),
-     $                   ONE = ( 1.0E+0, 0.0E+0 ) )
+      COMPLEX            ZERO
+      PARAMETER          ( ZERO = ( 0.0E+0, 0.0E+0 ) )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I
       COMPLEX            ALPHA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLACGV, CLARF, CLARFG, XERBLA
+      EXTERNAL           CLACGV, CLARF1F, CLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CONJG, MAX, MIN
@@ -246,13 +244,13 @@ SUBROUTINE CGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
             CALL CLARFG( M-I+1, ALPHA, A( MIN( I+1, M ), I ), 1,
      $                   TAUQ( I ) )
             D( I ) = REAL( ALPHA )
-            A( I, I ) = ONE
 *
 *           Apply H(i)**H to A(i:m,i+1:n) from the left
 *
             IF( I.LT.N )
-     $         CALL CLARF( 'Left', M-I+1, N-I, A( I, I ), 1,
-     $                     CONJG( TAUQ( I ) ), A( I, I+1 ), LDA, WORK )
+     $         CALL CLARF1F( 'Left', M-I+1, N-I, A( I, I ), 1,
+     $                       CONJG( TAUQ( I ) ), A( I, I+1 ), LDA,
+     $                       WORK )
             A( I, I ) = D( I )
 *
             IF( I.LT.N ) THEN
@@ -265,12 +263,11 @@ SUBROUTINE CGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
                CALL CLARFG( N-I, ALPHA, A( I, MIN( I+2, N ) ),
      $                      LDA, TAUP( I ) )
                E( I ) = REAL( ALPHA )
-               A( I, I+1 ) = ONE
 *
 *              Apply G(i) to A(i+1:m,i+1:n) from the right
 *
-               CALL CLARF( 'Right', M-I, N-I, A( I, I+1 ), LDA,
-     $                     TAUP( I ), A( I+1, I+1 ), LDA, WORK )
+               CALL CLARF1F( 'Right', M-I, N-I, A( I, I+1 ), LDA,
+     $                       TAUP( I ), A( I+1, I+1 ), LDA, WORK )
                CALL CLACGV( N-I, A( I, I+1 ), LDA )
                A( I, I+1 ) = E( I )
             ELSE
@@ -290,13 +287,12 @@ SUBROUTINE CGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
             CALL CLARFG( N-I+1, ALPHA, A( I, MIN( I+1, N ) ), LDA,
      $                   TAUP( I ) )
             D( I ) = REAL( ALPHA )
-            A( I, I ) = ONE
 *
 *           Apply G(i) to A(i+1:m,i:n) from the right
 *
             IF( I.LT.M )
-     $         CALL CLARF( 'Right', M-I, N-I+1, A( I, I ), LDA,
-     $                     TAUP( I ), A( I+1, I ), LDA, WORK )
+     $         CALL CLARF1F( 'Right', M-I, N-I+1, A( I, I ), LDA,
+     $                       TAUP( I ), A( I+1, I ), LDA, WORK )
             CALL CLACGV( N-I+1, A( I, I ), LDA )
             A( I, I ) = D( I )
 *
@@ -309,13 +305,12 @@ SUBROUTINE CGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
                CALL CLARFG( M-I, ALPHA, A( MIN( I+2, M ), I ), 1,
      $                      TAUQ( I ) )
                E( I ) = REAL( ALPHA )
-               A( I+1, I ) = ONE
 *
 *              Apply H(i)**H to A(i+1:m,i+1:n) from the left
 *
-               CALL CLARF( 'Left', M-I, N-I, A( I+1, I ), 1,
-     $                     CONJG( TAUQ( I ) ), A( I+1, I+1 ), LDA,
-     $                     WORK )
+               CALL CLARF1F( 'Left', M-I, N-I, A( I+1, I ), 1,
+     $                       CONJG( TAUQ( I ) ), A( I+1, I+1 ), LDA,
+     $                       WORK )
                A( I+1, I ) = E( I )
             ELSE
                TAUQ( I ) = ZERO
diff --git a/SRC/cgebrd.f b/SRC/cgebrd.f
index 5687161a50..4d61a5be37 100644
--- a/SRC/cgebrd.f
+++ b/SRC/cgebrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEBRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgebrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgebrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,7 +121,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of the array WORK.  LWORK >= max(1,M,N).
+*>          The length of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= MAX(M,N), otherwise.
 *>          For optimum performance LWORK >= (M+N)*NB, where NB
 *>          is the optimal blocksize.
 *>
@@ -148,7 +147,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup gebrd
 *
 *> \par Further Details:
 *  =====================
@@ -203,6 +202,7 @@
 *  =====================================================================
       SUBROUTINE CGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -225,8 +225,8 @@ SUBROUTINE CGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY
-      INTEGER            I, IINFO, J, LDWRKX, LDWRKY, LWKOPT, MINMN, NB,
-     $                   NBMIN, NX, WS
+      INTEGER            I, IINFO, J, LDWRKX, LDWRKY, LWKMIN, LWKOPT,
+     $                   MINMN, NB, NBMIN, NX, WS
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CGEBD2, CGEMM, CLABRD, XERBLA
@@ -236,16 +236,24 @@ SUBROUTINE CGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input parameters
 *
       INFO = 0
-      NB = MAX( 1, ILAENV( 1, 'CGEBRD', ' ', M, N, -1, -1 ) )
-      LWKOPT = ( M+N )*NB
-      WORK( 1 ) = REAL( LWKOPT )
+      MINMN = MIN( M, N )
+      IF( MINMN.EQ.0 ) THEN
+         LWKMIN = 1
+         LWKOPT = 1
+      ELSE
+         LWKMIN = MAX( M, N )
+         NB = MAX( 1, ILAENV( 1, 'CGEBRD', ' ', M, N, -1, -1 ) )
+         LWKOPT = ( M+N )*NB
+      END IF
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -253,7 +261,7 @@ SUBROUTINE CGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, M, N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -10
       END IF
       IF( INFO.LT.0 ) THEN
@@ -265,7 +273,6 @@ SUBROUTINE CGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *
 *     Quick return if possible
 *
-      MINMN = MIN( M, N )
       IF( MINMN.EQ.0 ) THEN
          WORK( 1 ) = 1
          RETURN
@@ -284,7 +291,7 @@ SUBROUTINE CGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *        Determine when to switch from blocked to unblocked code.
 *
          IF( NX.LT.MINMN ) THEN
-            WS = ( M+N )*NB
+            WS = LWKOPT
             IF( LWORK.LT.WS ) THEN
 *
 *              Not enough work space for the optimal NB, consider using
@@ -309,7 +316,8 @@ SUBROUTINE CGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *        the matrices X and Y which are needed to update the unreduced
 *        part of the matrix
 *
-         CALL CLABRD( M-I+1, N-I+1, NB, A( I, I ), LDA, D( I ), E( I ),
+         CALL CLABRD( M-I+1, N-I+1, NB, A( I, I ), LDA, D( I ),
+     $                E( I ),
      $                TAUQ( I ), TAUP( I ), WORK, LDWRKX,
      $                WORK( LDWRKX*NB+1 ), LDWRKY )
 *
@@ -320,7 +328,8 @@ SUBROUTINE CGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
      $               N-I-NB+1, NB, -ONE, A( I+NB, I ), LDA,
      $               WORK( LDWRKX*NB+NB+1 ), LDWRKY, ONE,
      $               A( I+NB, I+NB ), LDA )
-         CALL CGEMM( 'No transpose', 'No transpose', M-I-NB+1, N-I-NB+1,
+         CALL CGEMM( 'No transpose', 'No transpose', M-I-NB+1,
+     $               N-I-NB+1,
      $               NB, -ONE, WORK( NB+1 ), LDWRKX, A( I, I+NB ), LDA,
      $               ONE, A( I+NB, I+NB ), LDA )
 *
@@ -343,7 +352,7 @@ SUBROUTINE CGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *
       CALL CGEBD2( M-I+1, N-I+1, A( I, I ), LDA, D( I ), E( I ),
      $             TAUQ( I ), TAUP( I ), WORK, IINFO )
-      WORK( 1 ) = WS
+      WORK( 1 ) = SROUNDUP_LWORK( WS )
       RETURN
 *
 *     End of CGEBRD
diff --git a/SRC/cgecon.f b/SRC/cgecon.f
index 48f409b680..cad4e8bb8c 100644
--- a/SRC/cgecon.f
+++ b/SRC/cgecon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGECON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgecon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgecon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -105,7 +103,15 @@
 *> \verbatim
 *>          INFO is INTEGER
 *>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>                NaNs are illegal values for ANORM, and they propagate to
+*>                the output parameter RCOND.
+*>                Infinity is illegal for ANORM, and it propagates to the output
+*>                parameter RCOND as 0.
+*>          = 1:  if RCOND = NaN, or
+*>                   RCOND = Inf, or
+*>                   the computed norm of the inverse of A is 0.
+*>                In the latter, RCOND = 0 is returned.
 *> \endverbatim
 *
 *  Authors:
@@ -116,11 +122,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup gecon
 *
 *  =====================================================================
       SUBROUTINE CGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -146,17 +153,17 @@ SUBROUTINE CGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
       LOGICAL            ONENRM
       CHARACTER          NORMIN
       INTEGER            IX, KASE, KASE1
-      REAL               AINVNM, SCALE, SL, SMLNUM, SU
+      REAL               AINVNM, SCALE, SL, SMLNUM, SU, HUGEVAL
       COMPLEX            ZDUM
 *     ..
 *     .. Local Arrays ..
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Functions ..
-      LOGICAL            LSAME
+      LOGICAL            LSAME, SISNAN
       INTEGER            ICAMAX
       REAL               SLAMCH
-      EXTERNAL           LSAME, ICAMAX, SLAMCH
+      EXTERNAL           LSAME, ICAMAX, SLAMCH, SISNAN
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CLACN2, CLATRS, CSRSCL, XERBLA
@@ -171,6 +178,8 @@ SUBROUTINE CGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
       CABS1( ZDUM ) = ABS( REAL( ZDUM ) ) + ABS( AIMAG( ZDUM ) )
 *     ..
 *     .. Executable Statements ..
+*
+      HUGEVAL = SLAMCH( 'Overflow' )
 *
 *     Test the input parameters.
 *
@@ -198,6 +207,13 @@ SUBROUTINE CGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
          RETURN
       ELSE IF( ANORM.EQ.ZERO ) THEN
          RETURN
+      ELSE IF( SISNAN( ANORM ) ) THEN
+         RCOND = ANORM
+         INFO = -5
+         RETURN
+      ELSE IF( ANORM.GT.HUGEVAL ) THEN
+         INFO = -5
+         RETURN
       END IF
 *
       SMLNUM = SLAMCH( 'Safe minimum' )
@@ -219,12 +235,14 @@ SUBROUTINE CGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
 *
 *           Multiply by inv(L).
 *
-            CALL CLATRS( 'Lower', 'No transpose', 'Unit', NORMIN, N, A,
+            CALL CLATRS( 'Lower', 'No transpose', 'Unit', NORMIN, N,
+     $                   A,
      $                   LDA, WORK, SL, RWORK, INFO )
 *
 *           Multiply by inv(U).
 *
-            CALL CLATRS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL CLATRS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   A, LDA, WORK, SU, RWORK( N+1 ), INFO )
          ELSE
 *
@@ -236,7 +254,8 @@ SUBROUTINE CGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
 *
 *           Multiply by inv(L**H).
 *
-            CALL CLATRS( 'Lower', 'Conjugate transpose', 'Unit', NORMIN,
+            CALL CLATRS( 'Lower', 'Conjugate transpose', 'Unit',
+     $                   NORMIN,
      $                   N, A, LDA, WORK, SL, RWORK, INFO )
          END IF
 *
@@ -255,8 +274,17 @@ SUBROUTINE CGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
 *
 *     Compute the estimate of the reciprocal condition number.
 *
-      IF( AINVNM.NE.ZERO )
-     $   RCOND = ( ONE / AINVNM ) / ANORM
+      IF( AINVNM.NE.ZERO ) THEN
+         RCOND = ( ONE / AINVNM ) / ANORM
+      ELSE
+         INFO = 1
+         RETURN
+      END IF
+*
+*     Check for NaNs and Infs
+*
+      IF( SISNAN( RCOND ) .OR. RCOND.GT.HUGEVAL )
+     $   INFO = 1
 *
    20 CONTINUE
       RETURN
diff --git a/SRC/cgedmd.f90 b/SRC/cgedmd.f90
new file mode 100644
index 0000000000..9cc23e81e0
--- /dev/null
+++ b/SRC/cgedmd.f90
@@ -0,0 +1,1150 @@
+!> \brief \b CGEDMD computes the Dynamic Mode Decomposition (DMD) for a pair of data snapshot matrices.
+!
+!  =========== DOCUMENTATION ===========
+!
+!  Definition:
+!  ===========
+!
+!     SUBROUTINE CGEDMD( JOBS, JOBZ, JOBR, JOBF,  WHTSVD,   &
+!                        M, N, X, LDX, Y, LDY, NRNK, TOL,   &
+!                        K, EIGS, Z, LDZ, RES, B,    LDB,   &
+!                        W, LDW,  S, LDS, ZWORK,  LZWORK,   &
+!                        RWORK, LRWORK, IWORK, LIWORK, INFO )
+!.....
+!     USE, INTRINSIC :: iso_fortran_env, only: real32
+!     IMPLICIT NONE
+!     INTEGER, PARAMETER :: WP = real32
+!
+!.....
+!     Scalar arguments
+!     CHARACTER, INTENT(IN)   :: JOBS,   JOBZ,  JOBR,  JOBF
+!     INTEGER,   INTENT(IN)   :: WHTSVD, M, N,   LDX,  LDY, &
+!                                NRNK, LDZ, LDB, LDW,  LDS, &
+!                                LIWORK, LRWORK, LZWORK
+!     INTEGER,       INTENT(OUT)  :: K, INFO
+!     REAL(KIND=WP), INTENT(IN)   ::    TOL
+!     Array arguments
+!     COMPLEX(KIND=WP), INTENT(INOUT) :: X(LDX,*), Y(LDY,*)
+!     COMPLEX(KIND=WP), INTENT(OUT)   :: Z(LDZ,*), B(LDB,*), &
+!                                        W(LDW,*), S(LDS,*)
+!     COMPLEX(KIND=WP), INTENT(OUT)   :: EIGS(*)
+!     COMPLEX(KIND=WP), INTENT(OUT)   :: ZWORK(*)
+!     REAL(KIND=WP),    INTENT(OUT)   :: RES(*)
+!     REAL(KIND=WP),    INTENT(OUT)   :: RWORK(*)
+!     INTEGER,          INTENT(OUT)   :: IWORK(*)
+!
+!............................................................
+!>    \par Purpose:
+!     =============
+!>    \verbatim
+!>    CGEDMD computes the Dynamic Mode Decomposition (DMD) for
+!>    a pair of data snapshot matrices. For the input matrices
+!>    X and Y such that Y = A*X with an unaccessible matrix
+!>    A, CGEDMD computes a certain number of Ritz pairs of A using
+!>    the standard Rayleigh-Ritz extraction from a subspace of
+!>    range(X) that is determined using the leading left singular
+!>    vectors of X. Optionally, CGEDMD returns the residuals
+!>    of the computed Ritz pairs, the information needed for
+!>    a refinement of the Ritz vectors, or the eigenvectors of
+!>    the Exact DMD.
+!>    For further details see the references listed
+!>    below. For more details of the implementation see [3].
+!>    \endverbatim
+!............................................................
+!>    \par References:
+!     ================
+!>    \verbatim
+!>    [1] P. Schmid: Dynamic mode decomposition of numerical
+!>        and experimental data,
+!>        Journal of Fluid Mechanics 656, 5-28, 2010.
+!>    [2] Z. Drmac, I. Mezic, R. Mohr: Data driven modal
+!>        decompositions: analysis and enhancements,
+!>        SIAM J. on Sci. Comp. 40 (4), A2253-A2285, 2018.
+!>    [3] Z. Drmac: A LAPACK implementation of the Dynamic
+!>        Mode Decomposition I. Technical report. AIMDyn Inc.
+!>        and LAPACK Working Note 298.
+!>    [4] J. Tu, C. W. Rowley, D. M. Luchtenburg, S. L.
+!>        Brunton, N. Kutz: On Dynamic Mode Decomposition:
+!>        Theory and Applications, Journal of Computational
+!>        Dynamics 1(2), 391 -421, 2014.
+!>    \endverbatim
+!......................................................................
+!>    \par Developed and supported by:
+!     ================================
+!>    \verbatim
+!>    Developed and coded by Zlatko Drmac, Faculty of Science,
+!>    University of Zagreb;  drmac@math.hr
+!>    In cooperation with
+!>    AIMdyn Inc., Santa Barbara, CA.
+!>    and supported by
+!>    - DARPA SBIR project "Koopman Operator-Based Forecasting
+!>    for Nonstationary Processes from Near-Term, Limited
+!>    Observational Data" Contract No: W31P4Q-21-C-0007
+!>    - DARPA PAI project "Physics-Informed Machine Learning
+!>    Methodologies" Contract No: HR0011-18-9-0033
+!>    - DARPA MoDyL project "A Data-Driven, Operator-Theoretic
+!>    Framework for Space-Time Analysis of Process Dynamics"
+!>    Contract No: HR0011-16-C-0116
+!>    Any opinions, findings and conclusions or recommendations
+!>    expressed in this material are those of the author and
+!>    do not necessarily reflect the views of the DARPA SBIR
+!>    Program Office
+!>    \endverbatim
+!......................................................................
+!>    \par Distribution Statement A:
+!     ==============================
+!>    \verbatim
+!>    Approved for Public Release, Distribution Unlimited.
+!>    Cleared by DARPA on September 29, 2022
+!>    \endverbatim
+!......................................................................
+!     Arguments
+!     =========
+!
+!>    \param[in] JOBS
+!>    \verbatim
+!>    JOBS (input) CHARACTER*1
+!>    Determines whether the initial data snapshots are scaled
+!>    by a diagonal matrix.
+!>    'S' :: The data snapshots matrices X and Y are multiplied
+!>           with a diagonal matrix D so that X*D has unit
+!>           nonzero columns (in the Euclidean 2-norm)
+!>    'C' :: The snapshots are scaled as with the 'S' option.
+!>           If it is found that an i-th column of X is zero
+!>           vector and the corresponding i-th column of Y is
+!>           non-zero, then the i-th column of Y is set to
+!>           zero and a warning flag is raised.
+!>    'Y' :: The data snapshots matrices X and Y are multiplied
+!>           by a diagonal matrix D so that Y*D has unit
+!>           nonzero columns (in the Euclidean 2-norm)
+!>    'N' :: No data scaling.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBZ
+!>    \verbatim
+!>    JOBZ (input) CHARACTER*1
+!>    Determines whether the eigenvectors (Koopman modes) will
+!>    be computed.
+!>    'V' :: The eigenvectors (Koopman modes) will be computed
+!>           and returned in the matrix Z.
+!>           See the description of Z.
+!>    'F' :: The eigenvectors (Koopman modes) will be returned
+!>           in factored form as the product X(:,1:K)*W, where X
+!>           contains a POD basis (leading left singular vectors
+!>           of the data matrix X) and W contains the eigenvectors
+!>           of the corresponding Rayleigh quotient.
+!>           See the descriptions of K, X, W, Z.
+!>    'N' :: The eigenvectors are not computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBR
+!>    \verbatim
+!>    JOBR (input) CHARACTER*1
+!>    Determines whether to compute the residuals.
+!>    'R' :: The residuals for the computed eigenpairs will be
+!>           computed and stored in the array RES.
+!>           See the description of RES.
+!>           For this option to be legal, JOBZ must be 'V'.
+!>    'N' :: The residuals are not computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBF
+!>    \verbatim
+!>    JOBF (input) CHARACTER*1
+!>    Specifies whether to store information needed for post-
+!>    processing (e.g. computing refined Ritz vectors)
+!>    'R' :: The matrix needed for the refinement of the Ritz
+!>           vectors is computed and stored in the array B.
+!>           See the description of B.
+!>    'E' :: The unscaled eigenvectors of the Exact DMD are
+!>           computed and returned in the array B. See the
+!>           description of B.
+!>    'N' :: No eigenvector refinement data is computed.
+!>    \endverbatim
+!.....
+!>    \param[in] WHTSVD
+!>    \verbatim
+!>    WHTSVD (input) INTEGER, WHSTVD in { 1, 2, 3, 4 }
+!>    Allows for a selection of the SVD algorithm from the
+!>    LAPACK library.
+!>    1 :: CGESVD (the QR SVD algorithm)
+!>    2 :: CGESDD (the Divide and Conquer algorithm; if enough
+!>         workspace available, this is the fastest option)
+!>    3 :: CGESVDQ (the preconditioned QR SVD  ; this and 4
+!>         are the most accurate options)
+!>    4 :: CGEJSV (the preconditioned Jacobi SVD; this and 3
+!>         are the most accurate options)
+!>    For the four methods above, a significant difference in
+!>    the accuracy of small singular values is possible if
+!>    the snapshots vary in norm so that X is severely
+!>    ill-conditioned. If small (smaller than EPS*||X||)
+!>    singular values are of interest and JOBS=='N',  then
+!>    the options (3, 4) give the most accurate results, where
+!>    the option 4 is slightly better and with stronger
+!>    theoretical background.
+!>    If JOBS=='S', i.e. the columns of X will be normalized,
+!>    then all methods give nearly equally accurate results.
+!>    \endverbatim
+!.....
+!>    \param[in] M
+!>    \verbatim
+!>    M (input) INTEGER, M>= 0
+!>    The state space dimension (the row dimension of X, Y).
+!>    \endverbatim
+!.....
+!>    \param[in] N
+!>    \verbatim
+!>    N (input) INTEGER, 0 <= N <= M
+!>    The number of data snapshot pairs
+!>    (the number of columns of X and Y).
+!>    \endverbatim
+!.....
+!>    \param[in,out] X
+!>    \verbatim
+!>    X (input/output) COMPLEX(KIND=WP) M-by-N array
+!>    > On entry, X contains the data snapshot matrix X. It is
+!>    assumed that the column norms of X are in the range of
+!>    the normalized floating point numbers.
+!>    < On exit, the leading K columns of X contain a POD basis,
+!>    i.e. the leading K left singular vectors of the input
+!>    data matrix X, U(:,1:K). All N columns of X contain all
+!>    left singular vectors of the input matrix X.
+!>    See the descriptions of K, Z and W.
+!>    \endverbatim
+!.....
+!>    \param[in] LDX
+!>    \verbatim
+!>    LDX (input) INTEGER, LDX >= M
+!>    The leading dimension of the array X.
+!>    \endverbatim
+!.....
+!>    \param[in,out] Y
+!>    \verbatim
+!>    Y (input/workspace/output) COMPLEX(KIND=WP) M-by-N array
+!>    > On entry, Y contains the data snapshot matrix Y
+!>    < On exit,
+!>    If JOBR == 'R', the leading K columns of Y  contain
+!>    the residual vectors for the computed Ritz pairs.
+!>    See the description of RES.
+!>    If JOBR == 'N', Y contains the original input data,
+!>                    scaled according to the value of JOBS.
+!>    \endverbatim
+!.....
+!>    \param[in] LDY
+!>    \verbatim
+!>    LDY (input) INTEGER , LDY >= M
+!>    The leading dimension of the array Y.
+!>    \endverbatim
+!.....
+!>    \param[in] NRNK
+!>    \verbatim
+!>    NRNK (input) INTEGER
+!>    Determines the mode how to compute the numerical rank,
+!>    i.e. how to truncate small singular values of the input
+!>    matrix X. On input, if
+!>    NRNK = -1 :: i-th singular value sigma(i) is truncated
+!>                 if sigma(i) <= TOL*sigma(1)
+!>                 This option is recommended.
+!>    NRNK = -2 :: i-th singular value sigma(i) is truncated
+!>                 if sigma(i) <= TOL*sigma(i-1)
+!>                 This option is included for R&D purposes.
+!>                 It requires highly accurate SVD, which
+!>                 may not be feasible.
+!>    The numerical rank can be enforced by using positive
+!>    value of NRNK as follows:
+!>    0 < NRNK <= N :: at most NRNK largest singular values
+!>    will be used. If the number of the computed nonzero
+!>    singular values is less than NRNK, then only those
+!>    nonzero values will be used and the actually used
+!>    dimension is less than NRNK. The actual number of
+!>    the nonzero singular values is returned in the variable
+!>    K. See the descriptions of TOL and  K.
+!>    \endverbatim
+!.....
+!>    \param[in] TOL
+!>    \verbatim
+!>    TOL (input) REAL(KIND=WP), 0 <= TOL < 1
+!>    The tolerance for truncating small singular values.
+!>    See the description of NRNK.
+!>    \endverbatim
+!.....
+!>    \param[out] K
+!>    \verbatim
+!>    K (output) INTEGER,  0 <= K <= N
+!>    The dimension of the POD basis for the data snapshot
+!>    matrix X and the number of the computed Ritz pairs.
+!>    The value of K is determined according to the rule set
+!>    by the parameters NRNK and TOL.
+!>    See the descriptions of NRNK and TOL.
+!>    \endverbatim
+!.....
+!>    \param[out] EIGS
+!>    \verbatim
+!>    EIGS (output) COMPLEX(KIND=WP) N-by-1 array
+!>    The leading K (K<=N) entries of EIGS contain
+!>    the computed eigenvalues (Ritz values).
+!>    See the descriptions of K, and Z.
+!>    \endverbatim
+!.....
+!>    \param[out] Z
+!>    \verbatim
+!>    Z (workspace/output) COMPLEX(KIND=WP)  M-by-N array
+!>    If JOBZ =='V' then Z contains the  Ritz vectors.  Z(:,i)
+!>    is an eigenvector of the i-th Ritz value; ||Z(:,i)||_2=1.
+!>    If JOBZ == 'F', then the Z(:,i)'s are given implicitly as
+!>    the columns of X(:,1:K)*W(1:K,1:K), i.e. X(:,1:K)*W(:,i)
+!>    is an eigenvector corresponding to EIGS(i). The columns
+!>    of W(1:k,1:K) are the computed eigenvectors of the
+!>    K-by-K Rayleigh quotient.
+!>    See the descriptions of EIGS, X and W.
+!>    \endverbatim
+!.....
+!>    \param[in] LDZ
+!>    \verbatim
+!>    LDZ (input) INTEGER , LDZ >= M
+!>    The leading dimension of the array Z.
+!>    \endverbatim
+!.....
+!>    \param[out] RES
+!>    \verbatim
+!>    RES (output) REAL(KIND=WP) N-by-1 array
+!>    RES(1:K) contains the residuals for the K computed
+!>    Ritz pairs,
+!>    RES(i) = || A * Z(:,i) - EIGS(i)*Z(:,i))||_2.
+!>    See the description of EIGS and Z.
+!>    \endverbatim
+!.....
+!>    \param[out] B
+!>    \verbatim
+!>    B (output) COMPLEX(KIND=WP)  M-by-N array.
+!>    IF JOBF =='R', B(1:M,1:K) contains A*U(:,1:K), and can
+!>    be used for computing the refined vectors; see further
+!>    details in the provided references.
+!>    If JOBF == 'E', B(1:M,1:K) contains
+!>    A*U(:,1:K)*W(1:K,1:K), which are the vectors from the
+!>    Exact DMD, up to scaling by the inverse eigenvalues.
+!>    If JOBF =='N', then B is not referenced.
+!>    See the descriptions of X, W, K.
+!>    \endverbatim
+!.....
+!>    \param[in] LDB
+!>    \verbatim
+!>    LDB (input) INTEGER, LDB >= M
+!>    The leading dimension of the array B.
+!>    \endverbatim
+!.....
+!>    \param[out] W
+!>    \verbatim
+!>    W (workspace/output) COMPLEX(KIND=WP) N-by-N array
+!>    On exit, W(1:K,1:K) contains the K computed
+!>    eigenvectors of the matrix Rayleigh quotient.
+!>    The Ritz vectors (returned in Z) are the
+!>    product of X (containing a POD basis for the input
+!>    matrix X) and W. See the descriptions of K, S, X and Z.
+!>    W is also used as a workspace to temporarily store the
+!>    right singular vectors of X.
+!>    \endverbatim
+!.....
+!>    \param[in] LDW
+!>    \verbatim
+!>    LDW (input) INTEGER, LDW >= N
+!>    The leading dimension of the array W.
+!>    \endverbatim
+!.....
+!>    \param[out] S
+!>    \verbatim
+!>    S (workspace/output) COMPLEX(KIND=WP) N-by-N array
+!>    The array S(1:K,1:K) is used for the matrix Rayleigh
+!>    quotient. This content is overwritten during
+!>    the eigenvalue decomposition by CGEEV.
+!>    See the description of K.
+!>    \endverbatim
+!.....
+!>    \param[in] LDS
+!>    \verbatim
+!>    LDS (input) INTEGER, LDS >= N
+!>    The leading dimension of the array S.
+!>    \endverbatim
+!.....
+!>    \param[out] ZWORK
+!>    \verbatim
+!>    ZWORK (workspace/output) COMPLEX(KIND=WP) LZWORK-by-1 array
+!>    ZWORK is used as complex workspace in the complex SVD, as
+!>    specified by WHTSVD (1,2, 3 or 4) and for CGEEV for computing
+!>    the eigenvalues of a Rayleigh quotient.
+!>    If the call to CGEDMD is only workspace query, then
+!>    ZWORK(1) contains the minimal complex workspace length and
+!>    ZWORK(2) is the optimal complex workspace length.
+!>    Hence, the length of work is at least 2.
+!>    See the description of LZWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LZWORK
+!>    \verbatim
+!>    LZWORK (input) INTEGER
+!>    The minimal length of the workspace vector ZWORK.
+!>    LZWORK is calculated as MAX(LZWORK_SVD, LZWORK_CGEEV),
+!>    where LZWORK_CGEEV = MAX( 1, 2*N )  and the minimal
+!>    LZWORK_SVD is calculated as follows
+!>    If WHTSVD == 1 :: CGESVD ::
+!>       LZWORK_SVD = MAX(1,2*MIN(M,N)+MAX(M,N))
+!>    If WHTSVD == 2 :: CGESDD ::
+!>       LZWORK_SVD = 2*MIN(M,N)*MIN(M,N)+2*MIN(M,N)+MAX(M,N)
+!>    If WHTSVD == 3 :: CGESVDQ ::
+!>       LZWORK_SVD = obtainable by a query
+!>    If WHTSVD == 4 :: CGEJSV ::
+!>       LZWORK_SVD = obtainable by a query
+!>    If on entry LZWORK = -1, then a workspace query is
+!>    assumed and the procedure only computes the minimal
+!>    and the optimal workspace lengths and returns them in
+!>    LZWORK(1) and LZWORK(2), respectively.
+!>    \endverbatim
+!.....
+!>    \param[out] RWORK
+!>    \verbatim
+!>    RWORK (workspace/output) REAL(KIND=WP) LRWORK-by-1 array
+!>    On exit, RWORK(1:N) contains the singular values of
+!>    X (for JOBS=='N') or column scaled X (JOBS=='S', 'C').
+!>    If WHTSVD==4, then RWORK(N+1) and RWORK(N+2) contain
+!>    scaling factor RWORK(N+2)/RWORK(N+1) used to scale X
+!>    and Y to avoid overflow in the SVD of X.
+!>    This may be of interest if the scaling option is off
+!>    and as many as possible smallest eigenvalues are
+!>    desired to the highest feasible accuracy.
+!>    If the call to CGEDMD is only workspace query, then
+!>    RWORK(1) contains the minimal workspace length.
+!>    See the description of LRWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LRWORK
+!>    \verbatim
+!>    LRWORK (input) INTEGER
+!>    The minimal length of the workspace vector RWORK.
+!>    LRWORK is calculated as follows:
+!>    LRWORK = MAX(1, N+LRWORK_SVD,N+LRWORK_CGEEV), where
+!>    LRWORK_CGEEV = MAX(1,2*N) and RWORK_SVD is the real workspace
+!>    for the SVD subroutine determined by the input parameter
+!>    WHTSVD.
+!>    If WHTSVD == 1 :: CGESVD ::
+!>       LRWORK_SVD = 5*MIN(M,N)
+!>    If WHTSVD == 2 :: CGESDD ::
+!>       LRWORK_SVD =  MAX(5*MIN(M,N)*MIN(M,N)+7*MIN(M,N),
+!>       2*MAX(M,N)*MIN(M,N)+2*MIN(M,N)*MIN(M,N)+MIN(M,N) ) )
+!>    If WHTSVD == 3 :: CGESVDQ ::
+!>       LRWORK_SVD = obtainable by a query
+!>    If WHTSVD == 4 :: CGEJSV ::
+!>       LRWORK_SVD = obtainable by a query
+!>    If on entry LRWORK = -1, then a workspace query is
+!>    assumed and the procedure only computes the minimal
+!>    real workspace length and returns it in RWORK(1).
+!>    \endverbatim
+!.....
+!>    \param[out] IWORK
+!>    \verbatim
+!>    IWORK (workspace/output) INTEGER LIWORK-by-1 array
+!>    Workspace that is required only if WHTSVD equals
+!>    2 , 3 or 4. (See the description of WHTSVD).
+!>    If on entry LWORK =-1 or LIWORK=-1, then the
+!>    minimal length of IWORK is computed and returned in
+!>    IWORK(1). See the description of LIWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LIWORK
+!>    \verbatim
+!>    LIWORK (input) INTEGER
+!>    The minimal length of the workspace vector IWORK.
+!>    If WHTSVD == 1, then only IWORK(1) is used; LIWORK >=1
+!>    If WHTSVD == 2, then LIWORK >= MAX(1,8*MIN(M,N))
+!>    If WHTSVD == 3, then LIWORK >= MAX(1,M+N-1)
+!>    If WHTSVD == 4, then LIWORK >= MAX(3,M+3*N)
+!>    If on entry LIWORK = -1, then a workspace query is
+!>    assumed and the procedure only computes the minimal
+!>    and the optimal workspace lengths for  ZWORK, RWORK and
+!>    IWORK. See the descriptions of ZWORK, RWORK and IWORK.
+!>    \endverbatim
+!.....
+!>    \param[out] INFO
+!>    \verbatim
+!>    INFO (output) INTEGER
+!>    -i < 0 :: On entry, the i-th argument had an
+!>              illegal value
+!>       = 0 :: Successful return.
+!>       = 1 :: Void input. Quick exit (M=0 or N=0).
+!>       = 2 :: The SVD computation of X did not converge.
+!>              Suggestion: Check the input data and/or
+!>              repeat with different WHTSVD.
+!>       = 3 :: The computation of the eigenvalues did not
+!>              converge.
+!>       = 4 :: If data scaling was requested on input and
+!>              the procedure found inconsistency in the data
+!>              such that for some column index i,
+!>              X(:,i) = 0 but Y(:,i) /= 0, then Y(:,i) is set
+!>              to zero if JOBS=='C'. The computation proceeds
+!>              with original or modified data and warning
+!>              flag is set with INFO=4.
+!>    \endverbatim
+!
+!  Authors:
+!  ========
+!
+!> \author Zlatko Drmac
+!
+!> \ingroup gedmd
+!
+!.............................................................
+!.............................................................
+      SUBROUTINE CGEDMD( JOBS, JOBZ, JOBR, JOBF,  WHTSVD,   &
+                         M, N, X, LDX, Y, LDY, NRNK, TOL,   &
+                         K, EIGS, Z, LDZ, RES, B,    LDB,   &
+                         W, LDW,  S, LDS, ZWORK,  LZWORK,   &
+                         RWORK, LRWORK, IWORK, LIWORK, INFO )
+!
+!  -- LAPACK driver routine                                           --
+!
+!  -- LAPACK is a software package provided by University of          --
+!  -- Tennessee, University of California Berkeley, University of     --
+!  -- Colorado Denver and NAG Ltd..                                   --
+!
+!.....
+      USE, INTRINSIC :: iso_fortran_env, only: real32
+      IMPLICIT NONE
+      INTEGER, PARAMETER :: WP = real32
+!
+!     Scalar arguments
+!     ~~~~~~~~~~~~~~~~
+      CHARACTER, INTENT(IN)   :: JOBS,   JOBZ,  JOBR,  JOBF
+      INTEGER,   INTENT(IN)   :: WHTSVD, M, N,   LDX,  LDY, &
+                                 NRNK, LDZ, LDB, LDW,  LDS, &
+                                 LIWORK, LRWORK, LZWORK
+      INTEGER,       INTENT(OUT)  :: K, INFO
+      REAL(KIND=WP), INTENT(IN)   ::    TOL
+!
+!     Array arguments
+!     ~~~~~~~~~~~~~~~
+      COMPLEX(KIND=WP), INTENT(INOUT) :: X(LDX,*), Y(LDY,*)
+      COMPLEX(KIND=WP), INTENT(OUT)   :: Z(LDZ,*), B(LDB,*), &
+                                         W(LDW,*), S(LDS,*)
+      COMPLEX(KIND=WP), INTENT(OUT)   :: EIGS(*)
+      COMPLEX(KIND=WP), INTENT(OUT)   :: ZWORK(*)
+      REAL(KIND=WP),    INTENT(OUT)   :: RES(*)
+      REAL(KIND=WP),    INTENT(OUT)   :: RWORK(*)
+      INTEGER,          INTENT(OUT)   :: IWORK(*)
+!
+!     Parameters
+!     ~~~~~~~~~~
+      REAL(KIND=WP), PARAMETER ::  ONE = 1.0_WP
+      REAL(KIND=WP), PARAMETER :: ZERO = 0.0_WP
+      COMPLEX(KIND=WP), PARAMETER ::  ZONE = ( 1.0_WP, 0.0_WP )
+      COMPLEX(KIND=WP), PARAMETER :: ZZERO = ( 0.0_WP, 0.0_WP )
+!
+!     Local scalars
+!     ~~~~~~~~~~~~~
+      REAL(KIND=WP) :: OFL,   ROOTSC, SCALE,  SMALL,   &
+                       SSUM,  XSCL1,  XSCL2
+      INTEGER       ::  i,  j, IMINWR,  INFO1, INFO2,   &
+                        LWRKEV, LWRSDD, LWRSVD, LWRSVJ, &
+                       LWRSVQ, MLWORK, MWRKEV, MWRSDD, &
+                       MWRSVD, MWRSVJ, MWRSVQ, NUMRNK, &
+                       OLWORK, MLRWRK
+      LOGICAL       ::  BADXY, LQUERY, SCCOLX, SCCOLY, &
+                        WNTEX, WNTREF, WNTRES, WNTVEC
+      CHARACTER     ::  JOBZL, T_OR_N
+      CHARACTER     ::  JSVOPT
+!
+!     Local arrays
+!     ~~~~~~~~~~~~
+      REAL(KIND=WP) :: RDUMMY(2)
+!
+!     External functions (BLAS and LAPACK)
+!     ~~~~~~~~~~~~~~~~~
+      REAL(KIND=WP) CLANGE, SLAMCH, SCNRM2
+      EXTERNAL      CLANGE, SLAMCH, SCNRM2, ICAMAX
+      INTEGER                               ICAMAX
+      LOGICAL       SISNAN, LSAME
+      EXTERNAL      SISNAN, LSAME
+!
+!     External subroutines (BLAS and LAPACK)
+!     ~~~~~~~~~~~~~~~~~~~~
+      EXTERNAL      CAXPY,  CGEMM,  CSSCAL
+      EXTERNAL      CGEEV,  CGEJSV, CGESDD, CGESVD, CGESVDQ, &
+                    CLACPY, CLASCL, CLASSQ, XERBLA
+!
+!     Intrinsic functions
+!     ~~~~~~~~~~~~~~~~~~~
+      INTRINSIC     FLOAT, INT, MAX, SQRT
+!............................................................
+!
+!    Test the input arguments
+!
+      WNTRES = LSAME(JOBR,'R')
+      SCCOLX = LSAME(JOBS,'S') .OR. LSAME(JOBS,'C')
+      SCCOLY = LSAME(JOBS,'Y')
+      WNTVEC = LSAME(JOBZ,'V')
+      WNTREF = LSAME(JOBF,'R')
+      WNTEX  = LSAME(JOBF,'E')
+      INFO   = 0
+      LQUERY = ( ( LZWORK == -1 ) .OR. ( LIWORK == -1 ) &
+                                  .OR. ( LRWORK == -1 ) )
+!
+      IF ( .NOT. (SCCOLX .OR. SCCOLY .OR. &
+                                  LSAME(JOBS,'N')) )   THEN
+          INFO = -1
+      ELSE IF ( .NOT. (WNTVEC .OR. LSAME(JOBZ,'N')        &
+                              .OR. LSAME(JOBZ,'F')) )  THEN
+          INFO = -2
+      ELSE IF ( .NOT. (WNTRES .OR. LSAME(JOBR,'N')) .OR.  &
+                ( WNTRES .AND. (.NOT.WNTVEC) ) )       THEN
+          INFO = -3
+      ELSE IF ( .NOT. (WNTREF .OR. WNTEX .OR.             &
+                LSAME(JOBF,'N') ) )                    THEN
+          INFO = -4
+      ELSE IF ( .NOT.((WHTSVD == 1) .OR. (WHTSVD == 2) .OR.  &
+                      (WHTSVD == 3) .OR. (WHTSVD == 4) )) THEN
+          INFO = -5
+      ELSE IF ( M < 0 )   THEN
+          INFO = -6
+      ELSE IF ( ( N < 0 ) .OR. ( N > M ) ) THEN
+          INFO = -7
+      ELSE IF ( LDX < M ) THEN
+          INFO = -9
+      ELSE IF ( LDY < M ) THEN
+          INFO = -11
+      ELSE IF ( .NOT. (( NRNK == -2).OR.(NRNK == -1).OR. &
+                ((NRNK >= 1).AND.(NRNK <=N ))) )      THEN
+          INFO = -12
+      ELSE IF ( ( TOL < ZERO ) .OR. ( TOL >= ONE ) )  THEN
+          INFO = -13
+      ELSE IF ( LDZ < M ) THEN
+          INFO = -17
+      ELSE IF ( (WNTREF .OR. WNTEX ) .AND. ( LDB < M ) ) THEN
+          INFO = -20
+      ELSE IF ( LDW < N ) THEN
+          INFO = -22
+      ELSE IF ( LDS < N ) THEN
+          INFO = -24
+      END IF
+!
+      IF ( INFO == 0 ) THEN
+          ! Compute the minimal and the optimal workspace
+          ! requirements. Simulate running the code and
+          ! determine minimal and optimal sizes of the
+          ! workspace at any moment of the run.
+         IF ( N == 0 ) THEN
+             ! Quick return. All output except K is void.
+             ! INFO=1 signals the void input.
+             ! In case of a workspace query, the default
+             ! minimal workspace lengths are returned.
+            IF ( LQUERY ) THEN
+                IWORK(1) = 1
+                RWORK(1) = 1
+                ZWORK(1) = 2
+                ZWORK(2) = 2
+            ELSE
+               K   =  0
+            END IF
+            INFO = 1
+            RETURN
+         END IF
+
+         IMINWR = 1
+         MLRWRK = MAX(1,N)
+         MLWORK = 2
+         OLWORK = 2
+         SELECT CASE ( WHTSVD )
+         CASE (1)
+             ! The following is specified as the minimal
+             ! length of WORK in the definition of CGESVD:
+             ! MWRSVD = MAX(1,2*MIN(M,N)+MAX(M,N))
+             MWRSVD = MAX(1,2*MIN(M,N)+MAX(M,N))
+             MLWORK = MAX(MLWORK,MWRSVD)
+             MLRWRK = MAX(MLRWRK,N + 5*MIN(M,N))
+             IF ( LQUERY ) THEN
+                CALL CGESVD( 'O', 'S', M, N, X, LDX, RWORK, &
+                     B, LDB, W, LDW, ZWORK, -1, RDUMMY, INFO1 )
+                LWRSVD = INT( ZWORK(1) )
+                OLWORK = MAX(OLWORK,LWRSVD)
+             END IF
+         CASE (2)
+             ! The following is specified as the minimal
+             ! length of WORK in the definition of CGESDD:
+             ! MWRSDD = 2*min(M,N)*min(M,N)+2*min(M,N)+max(M,N).
+             ! RWORK length: 5*MIN(M,N)*MIN(M,N)+7*MIN(M,N)
+             ! In LAPACK 3.10.1 RWORK is defined differently.
+             ! Below we take max over the two versions.
+             ! IMINWR = 8*MIN(M,N)
+             MWRSDD = 2*MIN(M,N)*MIN(M,N)+2*MIN(M,N)+MAX(M,N)
+             MLWORK = MAX(MLWORK,MWRSDD)
+             IMINWR = 8*MIN(M,N)
+             MLRWRK = MAX( MLRWRK,  N +                    &
+                      MAX( 5*MIN(M,N)*MIN(M,N)+7*MIN(M,N), &
+                           5*MIN(M,N)*MIN(M,N)+5*MIN(M,N), &
+                           2*MAX(M,N)*MIN(M,N)+            &
+                           2*MIN(M,N)*MIN(M,N)+MIN(M,N) ) )
+             IF ( LQUERY ) THEN
+                CALL CGESDD( 'O', M, N, X, LDX, RWORK, B,     &
+                     LDB, W, LDW, ZWORK, -1, RDUMMY, IWORK, INFO1 )
+                LWRSDD = MAX(MWRSDD,INT( ZWORK(1) ))
+                OLWORK = MAX(OLWORK,LWRSDD)
+             END IF
+         CASE (3)
+             CALL CGESVDQ( 'H', 'P', 'N', 'R', 'R', M, N, &
+                  X, LDX, RWORK, Z, LDZ, W, LDW, NUMRNK,  &
+                  IWORK, -1, ZWORK, -1, RDUMMY, -1, INFO1 )
+             IMINWR = IWORK(1)
+             MWRSVQ = INT(ZWORK(2))
+             MLWORK = MAX(MLWORK,MWRSVQ)
+             MLRWRK = MAX(MLRWRK,N + INT(RDUMMY(1)))
+             IF ( LQUERY ) THEN
+                LWRSVQ = INT(ZWORK(1))
+                OLWORK = MAX(OLWORK,LWRSVQ)
+             END IF
+         CASE (4)
+             JSVOPT = 'J'
+             CALL CGEJSV( 'F', 'U', JSVOPT, 'N', 'N', 'P', M, &
+                   N, X, LDX, RWORK, Z, LDZ, W, LDW,       &
+                   ZWORK, -1, RDUMMY, -1, IWORK, INFO1 )
+             IMINWR = IWORK(1)
+             MWRSVJ = INT(ZWORK(2))
+             MLWORK = MAX(MLWORK,MWRSVJ)
+             MLRWRK = MAX(MLRWRK,N + MAX(7,INT(RDUMMY(1))))
+             IF ( LQUERY ) THEN
+                LWRSVJ = INT(ZWORK(1))
+                OLWORK = MAX(OLWORK,LWRSVJ)
+             END IF
+         END SELECT
+         IF ( WNTVEC .OR. WNTEX .OR. LSAME(JOBZ,'F') ) THEN
+             JOBZL = 'V'
+         ELSE
+             JOBZL = 'N'
+         END IF
+         ! Workspace calculation to the CGEEV call
+         MWRKEV = MAX( 1, 2*N )
+         MLWORK = MAX(MLWORK,MWRKEV)
+         MLRWRK = MAX(MLRWRK,N+2*N)
+         IF ( LQUERY ) THEN
+             CALL CGEEV( 'N', JOBZL, N, S, LDS, EIGS, &
+              W, LDW, W, LDW, ZWORK, -1, RWORK, INFO1 ) ! LAPACK CALL
+                LWRKEV = INT(ZWORK(1))
+                OLWORK = MAX( OLWORK, LWRKEV )
+                OLWORK = MAX( 2, OLWORK )
+         END IF
+!
+         IF ( LIWORK < IMINWR .AND. (.NOT.LQUERY) ) INFO = -30
+         IF ( LRWORK < MLRWRK .AND. (.NOT.LQUERY) ) INFO = -28
+         IF ( LZWORK < MLWORK .AND. (.NOT.LQUERY) ) INFO = -26
+
+      END IF
+!
+      IF( INFO /= 0 ) THEN
+         CALL XERBLA( 'CGEDMD', -INFO )
+         RETURN
+      ELSE IF ( LQUERY ) THEN
+!     Return minimal and optimal workspace sizes
+          IWORK(1) = IMINWR
+          RWORK(1) = REAL(MLRWRK)
+          ZWORK(1) = CMPLX(MLWORK)
+          ZWORK(2) = CMPLX(OLWORK)
+          RETURN
+      END IF
+!............................................................
+!
+      OFL   = SLAMCH('O')*SLAMCH('P')
+      SMALL = SLAMCH('S')
+      BADXY = .FALSE.
+!
+!     <1> Optional scaling of the snapshots (columns of X, Y)
+!     ==========================================================
+      IF ( SCCOLX ) THEN
+          ! The columns of X will be normalized.
+          ! To prevent overflows, the column norms of X are
+          ! carefully computed using CLASSQ.
+          K = 0
+          DO i = 1, N
+            !WORK(i) = SCNRM2( M, X(1,i), 1 )
+            SSUM  = ONE
+            SCALE = ZERO
+            CALL CLASSQ( M, X(1,i), 1, SCALE, SSUM )
+            IF ( SISNAN(SCALE) .OR. SISNAN(SSUM) ) THEN
+                K    =  0
+                INFO = -8
+                CALL XERBLA('CGEDMD',-INFO)
+            END IF
+            IF ( (SCALE /= ZERO) .AND. (SSUM /= ZERO) ) THEN
+               ROOTSC = SQRT(SSUM)
+               IF ( SCALE .GE. (OFL / ROOTSC) ) THEN
+!                 Norm of X(:,i) overflows. First, X(:,i)
+!                 is scaled by
+!                 ( ONE / ROOTSC ) / SCALE = 1/||X(:,i)||_2.
+!                 Next, the norm of X(:,i) is stored without
+!                 overflow as WORK(i) = - SCALE * (ROOTSC/M),
+!                 the minus sign indicating the 1/M factor.
+!                 Scaling is performed without overflow, and
+!                 underflow may occur in the smallest entries
+!                 of X(:,i). The relative backward and forward
+!                 errors are small in the ell_2 norm.
+                  CALL CLASCL( 'G', 0, 0, SCALE, ONE/ROOTSC, &
+                               M, 1, X(1,i), LDX, INFO2 )
+                  RWORK(i) = - SCALE * ( ROOTSC / FLOAT(M) )
+               ELSE
+!                 X(:,i) will be scaled to unit 2-norm
+                  RWORK(i) =   SCALE * ROOTSC
+                  CALL CLASCL( 'G',0, 0, RWORK(i), ONE, M, 1, &
+                               X(1,i), LDX, INFO2 )             ! LAPACK CALL
+!                 X(1:M,i) = (ONE/RWORK(i)) * X(1:M,i)          ! INTRINSIC
+               END IF
+            ELSE
+               RWORK(i) = ZERO
+               K = K + 1
+            END IF
+          END DO
+          IF ( K == N ) THEN
+          ! All columns of X are zero. Return error code -8.
+          ! (the 8th input variable had an illegal value)
+          K = 0
+          INFO = -8
+          CALL XERBLA('CGEDMD',-INFO)
+          RETURN
+          END IF
+          DO i = 1, N
+!           Now, apply the same scaling to the columns of Y.
+            IF ( RWORK(i) >  ZERO ) THEN
+                CALL CSSCAL( M, ONE/RWORK(i), Y(1,i), 1 ) ! BLAS CALL
+!               Y(1:M,i) = (ONE/RWORK(i)) * Y(1:M,i)      ! INTRINSIC
+            ELSE IF ( RWORK(i) < ZERO ) THEN
+                CALL CLASCL( 'G', 0, 0, -RWORK(i),          &
+                     ONE/FLOAT(M), M, 1, Y(1,i), LDY, INFO2 ) ! LAPACK CALL
+            ELSE IF ( ABS(Y(ICAMAX(M, Y(1,i),1),i ))  &
+                                            /= ZERO ) THEN
+!               X(:,i) is zero vector. For consistency,
+!               Y(:,i) should also be zero. If Y(:,i) is not
+!               zero, then the data might be inconsistent or
+!               corrupted. If JOBS == 'C', Y(:,i) is set to
+!               zero and a warning flag is raised.
+!               The computation continues but the
+!               situation will be reported in the output.
+                BADXY = .TRUE.
+                IF ( LSAME(JOBS,'C')) &
+                CALL CSSCAL( M, ZERO, Y(1,i), 1 )  ! BLAS CALL
+            END IF
+          END DO
+      END IF
+  !
+      IF ( SCCOLY ) THEN
+          ! The columns of Y will be normalized.
+          ! To prevent overflows, the column norms of Y are
+          ! carefully computed using CLASSQ.
+          DO i = 1, N
+            !RWORK(i) = SCNRM2( M, Y(1,i), 1 )
+            SSUM  = ONE
+            SCALE = ZERO
+            CALL CLASSQ( M, Y(1,i), 1, SCALE, SSUM )
+            IF ( SISNAN(SCALE) .OR. SISNAN(SSUM) ) THEN
+                K    =  0
+                INFO = -10
+                CALL XERBLA('CGEDMD',-INFO)
+            END IF
+            IF ( SCALE /= ZERO  .AND. (SSUM /= ZERO) ) THEN
+               ROOTSC = SQRT(SSUM)
+               IF ( SCALE .GE. (OFL / ROOTSC) ) THEN
+!                 Norm of Y(:,i) overflows. First, Y(:,i)
+!                 is scaled by
+!                 ( ONE / ROOTSC ) / SCALE = 1/||Y(:,i)||_2.
+!                 Next, the norm of Y(:,i) is stored without
+!                 overflow as RWORK(i) = - SCALE * (ROOTSC/M),
+!                 the minus sign indicating the 1/M factor.
+!                 Scaling is performed without overflow, and
+!                 underflow may occur in the smallest entries
+!                 of Y(:,i). The relative backward and forward
+!                 errors are small in the ell_2 norm.
+                  CALL CLASCL( 'G', 0, 0, SCALE, ONE/ROOTSC, &
+                               M, 1, Y(1,i), LDY, INFO2 )
+                  RWORK(i) = - SCALE * ( ROOTSC / FLOAT(M) )
+               ELSE
+!                 Y(:,i) will be scaled to unit 2-norm
+                  RWORK(i) =   SCALE * ROOTSC
+                  CALL CLASCL( 'G',0, 0, RWORK(i), ONE, M, 1, &
+                               Y(1,i), LDY, INFO2 )              ! LAPACK CALL
+!                 Y(1:M,i) = (ONE/RWORK(i)) * Y(1:M,i)          ! INTRINSIC
+               END IF
+            ELSE
+               RWORK(i) = ZERO
+            END IF
+         END DO
+         DO i = 1, N
+!           Now, apply the same scaling to the columns of X.
+            IF ( RWORK(i) >  ZERO ) THEN
+                CALL CSSCAL( M, ONE/RWORK(i), X(1,i), 1 )  ! BLAS CALL
+!               X(1:M,i) = (ONE/RWORK(i)) * X(1:M,i)      ! INTRINSIC
+            ELSE IF ( RWORK(i) < ZERO ) THEN
+                CALL CLASCL( 'G', 0, 0, -RWORK(i),          &
+                     ONE/FLOAT(M), M, 1, X(1,i), LDX, INFO2 ) ! LAPACK CALL
+            ELSE IF ( ABS(X(ICAMAX(M, X(1,i),1),i ))  &
+                                           /= ZERO ) THEN
+!               Y(:,i) is zero vector.  If X(:,i) is not
+!               zero, then a warning flag is raised.
+!               The computation continues but the
+!               situation will be reported in the output.
+                BADXY = .TRUE.
+            END IF
+         END DO
+       END IF
+!
+!     <2> SVD of the data snapshot matrix X.
+!     =====================================
+!     The left singular vectors are stored in the array X.
+!     The right singular vectors are in the array W.
+!     The array W will later on contain the eigenvectors
+!     of a Rayleigh quotient.
+      NUMRNK = N
+      SELECT CASE ( WHTSVD )
+         CASE (1)
+             CALL CGESVD( 'O', 'S', M, N, X, LDX, RWORK, B, &
+                  LDB, W, LDW, ZWORK, LZWORK,  RWORK(N+1), INFO1 ) ! LAPACK CALL
+             T_OR_N = 'C'
+         CASE (2)
+            CALL CGESDD( 'O', M, N, X, LDX, RWORK, B, LDB, W, &
+                 LDW, ZWORK, LZWORK, RWORK(N+1), IWORK, INFO1 )   ! LAPACK CALL
+            T_OR_N = 'C'
+         CASE (3)
+              CALL CGESVDQ( 'H', 'P', 'N', 'R', 'R', M, N, &
+                   X, LDX, RWORK, Z, LDZ, W, LDW, &
+                   NUMRNK, IWORK, LIWORK, ZWORK,     &
+                   LZWORK, RWORK(N+1), LRWORK-N, INFO1)     ! LAPACK CALL
+              CALL CLACPY( 'A', M, NUMRNK, Z, LDZ, X, LDX )   ! LAPACK CALL
+         T_OR_N = 'C'
+         CASE (4)
+              CALL CGEJSV( 'F', 'U', JSVOPT, 'N', 'N', 'P', M, &
+                   N, X, LDX, RWORK, Z, LDZ, W, LDW, &
+                   ZWORK, LZWORK, RWORK(N+1), LRWORK-N, IWORK, INFO1 )    ! LAPACK CALL
+              CALL CLACPY( 'A', M, N, Z, LDZ, X, LDX )   ! LAPACK CALL
+              T_OR_N = 'N'
+              XSCL1 = RWORK(N+1)
+              XSCL2 = RWORK(N+2)
+              IF ( XSCL1 /=  XSCL2 ) THEN
+                 ! This is an exceptional situation. If the
+                 ! data matrices are not scaled and the
+                 ! largest singular value of X overflows.
+                 ! In that case CGEJSV can return the SVD
+                 ! in scaled form. The scaling factor can be used
+                 ! to rescale the data (X and Y).
+                 CALL CLASCL( 'G', 0, 0, XSCL1, XSCL2, M, N, Y, LDY, INFO2  )
+              END IF
+      END SELECT
+!
+      IF ( INFO1 > 0 ) THEN
+         ! The SVD selected subroutine did not converge.
+         ! Return with an error code.
+         INFO = 2
+         RETURN
+      END IF
+!
+      IF ( RWORK(1) == ZERO ) THEN
+          ! The largest computed singular value of (scaled)
+          ! X is zero. Return error code -8
+          ! (the 8th input variable had an illegal value).
+          K = 0
+          INFO = -8
+          CALL XERBLA('CGEDMD',-INFO)
+          RETURN
+      END IF
+!
+      !<3> Determine the numerical rank of the data
+      !    snapshots matrix X. This depends on the
+      !    parameters NRNK and TOL.
+
+      SELECT CASE ( NRNK )
+          CASE ( -1 )
+               K = 1
+               DO i = 2, NUMRNK
+                 IF ( ( RWORK(i) <= RWORK(1)*TOL ) .OR. &
+                      ( RWORK(i) <= SMALL ) ) EXIT
+                 K = K + 1
+               END DO
+          CASE ( -2 )
+               K = 1
+               DO i = 1, NUMRNK-1
+                 IF ( ( RWORK(i+1) <= RWORK(i)*TOL  ) .OR. &
+                      ( RWORK(i) <= SMALL ) ) EXIT
+                 K = K + 1
+               END DO
+          CASE DEFAULT
+               K = 1
+               DO i = 2, NRNK
+                  IF ( RWORK(i) <= SMALL ) EXIT
+                  K = K + 1
+               END DO
+          END SELECT
+      !   Now, U = X(1:M,1:K) is the SVD/POD basis for the
+      !   snapshot data in the input matrix X.
+
+      !<4> Compute the Rayleigh quotient S = U^H * A * U.
+      !    Depending on the requested outputs, the computation
+      !    is organized to compute additional auxiliary
+      !    matrices (for the residuals and refinements).
+      !
+      !    In all formulas below, we need V_k*Sigma_k^(-1)
+      !    where either V_k is in W(1:N,1:K), or V_k^H is in
+      !    W(1:K,1:N). Here Sigma_k=diag(WORK(1:K)).
+      IF ( LSAME(T_OR_N, 'N') ) THEN
+          DO i = 1, K
+           CALL CSSCAL( N, ONE/RWORK(i), W(1,i), 1 )   ! BLAS CALL
+           ! W(1:N,i) = (ONE/RWORK(i)) * W(1:N,i)      ! INTRINSIC
+          END DO
+      ELSE
+          ! This non-unit stride access is due to the fact
+          ! that CGESVD, CGESVDQ and CGESDD return the
+          ! adjoint matrix of the right singular vectors.
+          !DO i = 1, K
+          ! CALL DSCAL( N, ONE/RWORK(i), W(i,1), LDW )  ! BLAS CALL
+          ! ! W(i,1:N) = (ONE/RWORK(i)) * W(i,1:N)      ! INTRINSIC
+          !END DO
+          DO i = 1, K
+              RWORK(N+i) = ONE/RWORK(i)
+          END DO
+          DO j = 1, N
+             DO i = 1, K
+                 W(i,j) = CMPLX(RWORK(N+i),ZERO,KIND=WP)*W(i,j)
+             END DO
+          END DO
+      END IF
+!
+      IF ( WNTREF ) THEN
+         !
+         ! Need A*U(:,1:K)=Y*V_k*inv(diag(WORK(1:K)))
+         ! for computing the refined Ritz vectors
+         ! (optionally, outside CGEDMD).
+          CALL CGEMM( 'N', T_OR_N, M, K, N, ZONE, Y, LDY, W, &
+                      LDW, ZZERO, Z, LDZ )                       ! BLAS CALL
+          ! Z(1:M,1:K)=MATMUL(Y(1:M,1:N),TRANSPOSE(W(1:K,1:N)))  ! INTRINSIC, for T_OR_N=='T'
+          ! Z(1:M,1:K)=MATMUL(Y(1:M,1:N),W(1:N,1:K))             ! INTRINSIC, for T_OR_N=='N'
+          !
+          ! At this point Z contains
+          ! A * U(:,1:K) = Y * V_k * Sigma_k^(-1), and
+          ! this is needed for computing the residuals.
+          ! This matrix is  returned in the array B and
+          ! it can be used to compute refined Ritz vectors.
+          CALL CLACPY( 'A', M, K, Z, LDZ, B, LDB )   ! BLAS CALL
+          ! B(1:M,1:K) = Z(1:M,1:K)                  ! INTRINSIC
+
+          CALL CGEMM( 'C', 'N', K, K, M, ZONE, X, LDX, Z, &
+                      LDZ, ZZERO, S, LDS )                       ! BLAS CALL
+          ! S(1:K,1:K) = MATMUL(TANSPOSE(X(1:M,1:K)),Z(1:M,1:K)) ! INTRINSIC
+          ! At this point S = U^H * A * U is the Rayleigh quotient.
+      ELSE
+        ! A * U(:,1:K) is not explicitly needed and the
+        ! computation is organized differently. The Rayleigh
+        ! quotient is computed more efficiently.
+        CALL CGEMM( 'C', 'N', K, N, M, ZONE, X, LDX, Y, LDY, &
+                   ZZERO, Z, LDZ )                                  ! BLAS CALL
+        ! Z(1:K,1:N) = MATMUL( TRANSPOSE(X(1:M,1:K)), Y(1:M,1:N) )  ! INTRINSIC
+        !
+        CALL CGEMM( 'N', T_OR_N, K, K, N, ZONE, Z, LDZ, W, &
+                    LDW, ZZERO, S, LDS )                        ! BLAS CALL
+        ! S(1:K,1:K) = MATMUL(Z(1:K,1:N),TRANSPOSE(W(1:K,1:N))) ! INTRINSIC, for T_OR_N=='T'
+        ! S(1:K,1:K) = MATMUL(Z(1:K,1:N),(W(1:N,1:K)))          ! INTRINSIC, for T_OR_N=='N'
+        ! At this point S = U^H * A * U is the Rayleigh quotient.
+        ! If the residuals are requested, save scaled V_k into Z.
+        ! Recall that V_k or V_k^H is stored in W.
+        IF ( WNTRES .OR. WNTEX ) THEN
+          IF ( LSAME(T_OR_N, 'N') ) THEN
+              CALL CLACPY( 'A', N, K, W, LDW, Z, LDZ )
+          ELSE
+              CALL CLACPY( 'A', K, N, W, LDW, Z, LDZ )
+          END IF
+        END IF
+      END IF
+!
+      !<5> Compute the Ritz values and (if requested) the
+      !   right eigenvectors of the Rayleigh quotient.
+      !
+      CALL CGEEV( 'N', JOBZL, K, S, LDS, EIGS, W, &
+           LDW, W, LDW, ZWORK, LZWORK, RWORK(N+1), INFO1 )  ! LAPACK CALL
+      !
+      ! W(1:K,1:K) contains the eigenvectors of the Rayleigh
+      ! quotient.  See the description of Z.
+      ! Also, see the description of CGEEV.
+      IF ( INFO1 > 0 ) THEN
+         ! CGEEV failed to compute the eigenvalues and
+         ! eigenvectors of the Rayleigh quotient.
+         INFO = 3
+         RETURN
+      END IF
+!
+      ! <6> Compute the eigenvectors (if requested) and,
+      ! the residuals (if requested).
+      !
+      IF ( WNTVEC .OR. WNTEX ) THEN
+          IF ( WNTRES ) THEN
+              IF ( WNTREF ) THEN
+                ! Here, if the refinement is requested, we have
+                ! A*U(:,1:K) already computed and stored in Z.
+                ! For the residuals, need Y = A * U(:,1;K) * W.
+                CALL CGEMM( 'N', 'N', M, K, K, ZONE, Z, LDZ, W, &
+                           LDW, ZZERO, Y, LDY )              ! BLAS CALL
+                ! Y(1:M,1:K) = Z(1:M,1:K) * W(1:K,1:K)       ! INTRINSIC
+                ! This frees Z; Y contains A * U(:,1:K) * W.
+              ELSE
+                ! Compute S = V_k * Sigma_k^(-1) * W, where
+                ! V_k * Sigma_k^(-1) (or its adjoint) is stored in Z
+                CALL CGEMM( T_OR_N, 'N', N, K, K, ZONE, Z, LDZ, &
+                           W, LDW, ZZERO, S, LDS)
+                ! Then, compute Z = Y * S =
+                ! = Y * V_k * Sigma_k^(-1) * W(1:K,1:K) =
+                ! = A * U(:,1:K) * W(1:K,1:K)
+                CALL CGEMM( 'N', 'N', M, K, N, ZONE, Y, LDY, S, &
+                           LDS, ZZERO, Z, LDZ)
+                ! Save a copy of Z into Y and free Z for holding
+                ! the Ritz vectors.
+                CALL CLACPY( 'A', M, K, Z, LDZ, Y, LDY )
+                IF ( WNTEX ) CALL CLACPY( 'A', M, K, Z, LDZ, B, LDB )
+              END IF
+          ELSE IF ( WNTEX ) THEN
+              ! Compute S = V_k * Sigma_k^(-1) * W, where
+                ! V_k * Sigma_k^(-1) is stored in Z
+                CALL CGEMM( T_OR_N, 'N', N, K, K, ZONE, Z, LDZ, &
+                           W, LDW, ZZERO, S, LDS)
+                ! Then, compute Z = Y * S =
+                ! = Y * V_k * Sigma_k^(-1) * W(1:K,1:K) =
+                ! = A * U(:,1:K) * W(1:K,1:K)
+                CALL CGEMM( 'N', 'N', M, K, N, ZONE, Y, LDY, S, &
+                           LDS, ZZERO, B, LDB)
+                ! The above call replaces the following two calls
+                ! that were used in the developing-testing phase.
+                ! CALL CGEMM( 'N', 'N', M, K, N, ZONE, Y, LDY, S, &
+                !           LDS, ZZERO, Z, LDZ)
+                ! Save a copy of Z into Y and free Z for holding
+                ! the Ritz vectors.
+                ! CALL CLACPY( 'A', M, K, Z, LDZ, B, LDB )
+          END IF
+!
+          ! Compute the Ritz vectors
+          IF ( WNTVEC ) CALL CGEMM( 'N', 'N', M, K, K, ZONE, X, LDX, W, LDW, &
+                       ZZERO, Z, LDZ )                          ! BLAS CALL
+          ! Z(1:M,1:K) = MATMUL(X(1:M,1:K), W(1:K,1:K))         ! INTRINSIC
+!
+          IF ( WNTRES ) THEN
+             DO i = 1, K
+                CALL CAXPY( M, -EIGS(i), Z(1,i), 1, Y(1,i), 1 )       ! BLAS CALL
+                ! Y(1:M,i) = Y(1:M,i) - EIGS(i) * Z(1:M,i)            ! INTRINSIC
+                RES(i) = SCNRM2( M, Y(1,i), 1)                        ! BLAS CALL
+             END DO
+          END IF
+      END IF
+!
+      IF ( WHTSVD == 4 ) THEN
+          RWORK(N+1) = XSCL1
+          RWORK(N+2) = XSCL2
+      END IF
+!
+!     Successful exit.
+      IF ( .NOT. BADXY ) THEN
+         INFO = 0
+      ELSE
+         ! A warning on possible data inconsistency.
+         ! This should be a rare event.
+         INFO = 4
+      END IF
+!............................................................
+      RETURN
+!     ......
+      END SUBROUTINE CGEDMD
diff --git a/SRC/cgedmdq.f90 b/SRC/cgedmdq.f90
new file mode 100644
index 0000000000..0f296963c3
--- /dev/null
+++ b/SRC/cgedmdq.f90
@@ -0,0 +1,852 @@
+!> \brief \b CGEDMDQ computes the Dynamic Mode Decomposition (DMD) for a pair of data snapshot matrices.
+!
+!  =========== DOCUMENTATION ===========
+!
+!  Definition:
+!  ===========
+!
+!     SUBROUTINE CGEDMDQ( JOBS,  JOBZ, JOBR, JOBQ, JOBT, JOBF,   &
+!                   WHTSVD,   M, N, F, LDF,  X, LDX,  Y,   &
+!                   LDY,   NRNK,  TOL,   K,  EIGS,         &
+!                   Z, LDZ, RES,  B,     LDB,   V, LDV,    &
+!                   S, LDS, ZWORK, LZWORK, WORK,  LWORK,   &
+!                   IWORK, LIWORK, INFO )
+!.....
+!     USE, INTRINSIC :: iso_fortran_env, only: real32
+!     IMPLICIT NONE
+!     INTEGER, PARAMETER :: WP = real32
+!.....
+!     Scalar arguments
+!     CHARACTER, INTENT(IN)  :: JOBS, JOBZ, JOBR, JOBQ,    &
+!                               JOBT, JOBF
+!     INTEGER,   INTENT(IN)  :: WHTSVD, M, N,   LDF, LDX,  &
+!                               LDY, NRNK, LDZ, LDB, LDV,  &
+!                               LDS, LZWORK,  LWORK, LIWORK
+!     INTEGER,   INTENT(OUT) :: INFO,   K
+!     REAL(KIND=WP), INTENT(IN)    ::   TOL
+!     Array arguments
+!     COMPLEX(KIND=WP), INTENT(INOUT) :: F(LDF,*)
+!     COMPLEX(KIND=WP), INTENT(OUT)   :: X(LDX,*), Y(LDY,*), &
+!                                        Z(LDZ,*), B(LDB,*), &
+!                                        V(LDV,*), S(LDS,*)
+!     COMPLEX(KIND=WP), INTENT(OUT)   :: EIGS(*)
+!     COMPLEX(KIND=WP), INTENT(OUT)   :: ZWORK(*)
+!     REAL(KIND=WP), INTENT(OUT)   :: RES(*)
+!     REAL(KIND=WP), INTENT(OUT)   :: WORK(*)
+!     INTEGER,       INTENT(OUT)   :: IWORK(*)
+!
+!............................................................
+!>    \par Purpose:
+!     =============
+!>    \verbatim
+!>    CGEDMDQ computes the Dynamic Mode Decomposition (DMD) for
+!>    a pair of data snapshot matrices, using a QR factorization
+!>    based compression of the data. For the input matrices
+!>    X and Y such that Y = A*X with an unaccessible matrix
+!>    A, CGEDMDQ computes a certain number of Ritz pairs of A using
+!>    the standard Rayleigh-Ritz extraction from a subspace of
+!>    range(X) that is determined using the leading left singular
+!>    vectors of X. Optionally, CGEDMDQ returns the residuals
+!>    of the computed Ritz pairs, the information needed for
+!>    a refinement of the Ritz vectors, or the eigenvectors of
+!>    the Exact DMD.
+!>    For further details see the references listed
+!>    below. For more details of the implementation see [3].
+!>    \endverbatim
+!............................................................
+!>    \par References:
+!     ================
+!>    \verbatim
+!>    [1] P. Schmid: Dynamic mode decomposition of numerical
+!>        and experimental data,
+!>        Journal of Fluid Mechanics 656, 5-28, 2010.
+!>    [2] Z. Drmac, I. Mezic, R. Mohr: Data driven modal
+!>        decompositions: analysis and enhancements,
+!>        SIAM J. on Sci. Comp. 40 (4), A2253-A2285, 2018.
+!>    [3] Z. Drmac: A LAPACK implementation of the Dynamic
+!>        Mode Decomposition I. Technical report. AIMDyn Inc.
+!>        and LAPACK Working Note 298.
+!>    [4] J. Tu, C. W. Rowley, D. M. Luchtenburg, S. L.
+!>        Brunton, N. Kutz: On Dynamic Mode Decomposition:
+!>        Theory and Applications, Journal of Computational
+!>        Dynamics 1(2), 391 -421, 2014.
+!>    \endverbatim
+!......................................................................
+!>    \par Developed and supported by:
+!     ================================
+!>    \verbatim
+!>    Developed and coded by Zlatko Drmac, Faculty of Science,
+!>    University of Zagreb;  drmac@math.hr
+!>    In cooperation with
+!>    AIMdyn Inc., Santa Barbara, CA.
+!>    and supported by
+!>    - DARPA SBIR project "Koopman Operator-Based Forecasting
+!>    for Nonstationary Processes from Near-Term, Limited
+!>    Observational Data" Contract No: W31P4Q-21-C-0007
+!>    - DARPA PAI project "Physics-Informed Machine Learning
+!>    Methodologies" Contract No: HR0011-18-9-0033
+!>    - DARPA MoDyL project "A Data-Driven, Operator-Theoretic
+!>    Framework for Space-Time Analysis of Process Dynamics"
+!>    Contract No: HR0011-16-C-0116
+!>    Any opinions, findings and conclusions or recommendations
+!>    expressed in this material are those of the author and
+!>    do not necessarily reflect the views of the DARPA SBIR
+!>    Program Office.
+!>    \endverbatim
+!......................................................................
+!>    \par Developed and supported by:
+!     ================================
+!>    \verbatim
+!>    Approved for Public Release, Distribution Unlimited.
+!>    Cleared by DARPA on September 29, 2022
+!>    \endverbatim
+!......................................................................
+!     Arguments
+!     =========
+!
+!>    \param[in] JOBS
+!>    \verbatim
+!>    JOBS (input) CHARACTER*1
+!>    Determines whether the initial data snapshots are scaled
+!>    by a diagonal matrix. The data snapshots are the columns
+!>    of F. The leading N-1 columns of F are denoted X and the
+!>    trailing N-1 columns are denoted Y.
+!>    'S' :: The data snapshots matrices X and Y are multiplied
+!>           with a diagonal matrix D so that X*D has unit
+!>           nonzero columns (in the Euclidean 2-norm)
+!>    'C' :: The snapshots are scaled as with the 'S' option.
+!>           If it is found that an i-th column of X is zero
+!>           vector and the corresponding i-th column of Y is
+!>           non-zero, then the i-th column of Y is set to
+!>           zero and a warning flag is raised.
+!>    'Y' :: The data snapshots matrices X and Y are multiplied
+!>           by a diagonal matrix D so that Y*D has unit
+!>           nonzero columns (in the Euclidean 2-norm)
+!>    'N' :: No data scaling.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBZ
+!>    \verbatim
+!>    JOBZ (input) CHARACTER*1
+!>    Determines whether the eigenvectors (Koopman modes) will
+!>    be computed.
+!>    'V' :: The eigenvectors (Koopman modes) will be computed
+!>           and returned in the matrix Z.
+!>           See the description of Z.
+!>    'F' :: The eigenvectors (Koopman modes) will be returned
+!>           in factored form as the product Z*V, where Z
+!>           is orthonormal and V contains the eigenvectors
+!>           of the corresponding Rayleigh quotient.
+!>           See the descriptions of F, V, Z.
+!>    'Q' :: The eigenvectors (Koopman modes) will be returned
+!>           in factored form as the product Q*Z, where Z
+!>           contains the eigenvectors of the compression of the
+!>           underlying discretised operator onto the span of
+!>           the data snapshots. See the descriptions of F, V, Z.
+!>           Q is from the inital QR facorization.
+!>    'N' :: The eigenvectors are not computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBR
+!>    \verbatim
+!>    JOBR (input) CHARACTER*1
+!>    Determines whether to compute the residuals.
+!>    'R' :: The residuals for the computed eigenpairs will
+!>           be computed and stored in the array RES.
+!>           See the description of RES.
+!>           For this option to be legal, JOBZ must be 'V'.
+!>    'N' :: The residuals are not computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBQ
+!>    \verbatim
+!>    JOBQ (input) CHARACTER*1
+!>    Specifies whether to explicitly compute and return the
+!>    unitary matrix from the QR factorization.
+!>    'Q' :: The matrix Q of the QR factorization of the data
+!>           snapshot matrix is computed and stored in the
+!>           array F. See the description of F.
+!>    'N' :: The matrix Q is not explicitly computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBT
+!>    \verbatim
+!>    JOBT (input) CHARACTER*1
+!>    Specifies whether to return the upper triangular factor
+!>    from the QR factorization.
+!>    'R' :: The matrix R of the QR factorization of the data
+!>           snapshot matrix F is returned in the array Y.
+!>           See the description of Y and Further details.
+!>    'N' :: The matrix R is not returned.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBF
+!>    \verbatim
+!>    JOBF (input) CHARACTER*1
+!>    Specifies whether to store information needed for post-
+!>    processing (e.g. computing refined Ritz vectors)
+!>    'R' :: The matrix needed for the refinement of the Ritz
+!>           vectors is computed and stored in the array B.
+!>           See the description of B.
+!>    'E' :: The unscaled eigenvectors of the Exact DMD are
+!>           computed and returned in the array B. See the
+!>           description of B.
+!>    'N' :: No eigenvector refinement data is computed.
+!>    To be useful on exit, this option needs JOBQ='Q'.
+!>    \endverbatim
+!.....
+!>    \param[in] WHTSVD
+!>    \verbatim
+!>    WHTSVD (input) INTEGER, WHSTVD in { 1, 2, 3, 4 }
+!>    Allows for a selection of the SVD algorithm from the
+!>    LAPACK library.
+!>    1 :: CGESVD (the QR SVD algorithm)
+!>    2 :: CGESDD (the Divide and Conquer algorithm; if enough
+!>         workspace available, this is the fastest option)
+!>    3 :: CGESVDQ (the preconditioned QR SVD  ; this and 4
+!>         are the most accurate options)
+!>    4 :: CGEJSV (the preconditioned Jacobi SVD; this and 3
+!>         are the most accurate options)
+!>    For the four methods above, a significant difference in
+!>    the accuracy of small singular values is possible if
+!>    the snapshots vary in norm so that X is severely
+!>    ill-conditioned. If small (smaller than EPS*||X||)
+!>    singular values are of interest and JOBS=='N',  then
+!>    the options (3, 4) give the most accurate results, where
+!>    the option 4 is slightly better and with stronger
+!>    theoretical background.
+!>    If JOBS=='S', i.e. the columns of X will be normalized,
+!>    then all methods give nearly equally accurate results.
+!>    \endverbatim
+!.....
+!>    \param[in] M
+!>    \verbatim
+!>    M (input) INTEGER, M >= 0
+!>    The state space dimension (the number of rows of F).
+!>    \endverbatim
+!.....
+!>    \param[in] N
+!>    \verbatim
+!>    N (input) INTEGER, 0 <= N <= M
+!>    The number of data snapshots from a single trajectory,
+!>    taken at equidistant discrete times. This is the
+!>    number of columns of F.
+!>    \endverbatim
+!.....
+!>    \param[in,out] F
+!>    \verbatim
+!>    F (input/output) COMPLEX(KIND=WP) M-by-N array
+!>    > On entry,
+!>    the columns of F are the sequence of data snapshots
+!>    from a single trajectory, taken at equidistant discrete
+!>    times. It is assumed that the column norms of F are
+!>    in the range of the normalized floating point numbers.
+!>    < On exit,
+!>    If JOBQ == 'Q', the array F contains the orthogonal
+!>    matrix/factor of the QR factorization of the initial
+!>    data snapshots matrix F. See the description of JOBQ.
+!>    If JOBQ == 'N', the entries in F strictly below the main
+!>    diagonal contain, column-wise, the information on the
+!>    Householder vectors, as returned by CGEQRF. The
+!>    remaining information to restore the orthogonal matrix
+!>    of the initial QR factorization is stored in ZWORK(1:MIN(M,N)).
+!>    See the description of ZWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LDF
+!>    \verbatim
+!>    LDF (input) INTEGER, LDF >= M
+!>    The leading dimension of the array F.
+!>    \endverbatim
+!.....
+!>    \param[in,out] X
+!>    \verbatim
+!>    X (workspace/output) COMPLEX(KIND=WP) MIN(M,N)-by-(N-1) array
+!>    X is used as workspace to hold representations of the
+!>    leading N-1 snapshots in the orthonormal basis computed
+!>    in the QR factorization of F.
+!>    On exit, the leading K columns of X contain the leading
+!>    K left singular vectors of the above described content
+!>    of X. To lift them to the space of the left singular
+!>    vectors U(:,1:K) of the input data, pre-multiply with the
+!>    Q factor from the initial QR factorization.
+!>    See the descriptions of F, K, V  and Z.
+!>    \endverbatim
+!.....
+!>    \param[in] LDX
+!>    \verbatim
+!>    LDX (input) INTEGER, LDX >= N
+!>    The leading dimension of the array X.
+!>    \endverbatim
+!.....
+!>    \param[in,out] Y
+!>    \verbatim
+!>    Y (workspace/output) COMPLEX(KIND=WP) MIN(M,N)-by-(N) array
+!>    Y is used as workspace to hold representations of the
+!>    trailing N-1 snapshots in the orthonormal basis computed
+!>    in the QR factorization of F.
+!>    On exit,
+!>    If JOBT == 'R', Y contains the MIN(M,N)-by-N upper
+!>    triangular factor from the QR factorization of the data
+!>    snapshot matrix F.
+!>    \endverbatim
+!.....
+!>    \param[in] LDY
+!>    \verbatim
+!>    LDY (input) INTEGER , LDY >= N
+!>    The leading dimension of the array Y.
+!>    \endverbatim
+!.....
+!>    \param[in] NRNK
+!>    \verbatim
+!>    NRNK (input) INTEGER
+!>    Determines the mode how to compute the numerical rank,
+!>    i.e. how to truncate small singular values of the input
+!>    matrix X. On input, if
+!>    NRNK = -1 :: i-th singular value sigma(i) is truncated
+!>                 if sigma(i) <= TOL*sigma(1)
+!>                 This option is recommended.
+!>    NRNK = -2 :: i-th singular value sigma(i) is truncated
+!>                 if sigma(i) <= TOL*sigma(i-1)
+!>                 This option is included for R&D purposes.
+!>                 It requires highly accurate SVD, which
+!>                 may not be feasible.
+!>    The numerical rank can be enforced by using positive
+!>    value of NRNK as follows:
+!>    0 < NRNK <= N-1 :: at most NRNK largest singular values
+!>    will be used. If the number of the computed nonzero
+!>    singular values is less than NRNK, then only those
+!>    nonzero values will be used and the actually used
+!>    dimension is less than NRNK. The actual number of
+!>    the nonzero singular values is returned in the variable
+!>    K. See the description of K.
+!>    \endverbatim
+!.....
+!>    \param[in] TOL
+!>    \verbatim
+!>    TOL (input) REAL(KIND=WP), 0 <= TOL < 1
+!>    The tolerance for truncating small singular values.
+!>    See the description of NRNK.
+!>    \endverbatim
+!.....
+!>    \param[out] K
+!>    \verbatim
+!>    K (output) INTEGER,  0 <= K <= N
+!>    The dimension of the SVD/POD basis for the leading N-1
+!>    data snapshots (columns of F) and the number of the
+!>    computed Ritz pairs. The value of K is determined
+!>    according to the rule set by the parameters NRNK and
+!>    TOL. See the descriptions of NRNK and TOL.
+!>    \endverbatim
+!.....
+!>    \param[out] EIGS
+!>    \verbatim
+!>    EIGS (output) COMPLEX(KIND=WP) (N-1)-by-1 array
+!>    The leading K (K<=N-1) entries of EIGS contain
+!>    the computed eigenvalues (Ritz values).
+!>    See the descriptions of K, and Z.
+!>    \endverbatim
+!.....
+!>    \param[out] Z
+!>    \verbatim
+!>    Z (workspace/output) COMPLEX(KIND=WP)  M-by-(N-1) array
+!>    If JOBZ =='V' then Z contains the Ritz vectors. Z(:,i)
+!>    is an eigenvector of the i-th Ritz value; ||Z(:,i)||_2=1.
+!>    If JOBZ == 'F', then the Z(:,i)'s are given implicitly as
+!>    Z*V, where Z contains orthonormal matrix (the product of
+!>    Q from the initial QR factorization and the SVD/POD_basis
+!>    returned by CGEDMD in X) and the second factor (the
+!>    eigenvectors of the Rayleigh quotient) is in the array V,
+!>    as returned by CGEDMD. That is,  X(:,1:K)*V(:,i)
+!>    is an eigenvector corresponding to EIGS(i). The columns
+!>    of V(1:K,1:K) are the computed eigenvectors of the
+!>    K-by-K Rayleigh quotient.
+!>    See the descriptions of EIGS, X and V.
+!>    \endverbatim
+!.....
+!>    \param[in] LDZ
+!>    \verbatim
+!>    LDZ (input) INTEGER , LDZ >= M
+!>    The leading dimension of the array Z.
+!>    \endverbatim
+!.....
+!>    \param[out] RES
+!>    \verbatim
+!>    RES (output) REAL(KIND=WP) (N-1)-by-1 array
+!>    RES(1:K) contains the residuals for the K computed
+!>    Ritz pairs,
+!>    RES(i) = || A * Z(:,i) - EIGS(i)*Z(:,i))||_2.
+!>    See the description of EIGS and Z.
+!>    \endverbatim
+!.....
+!>    \param[out] B
+!>    \verbatim
+!>    B (output) COMPLEX(KIND=WP)  MIN(M,N)-by-(N-1) array.
+!>    IF JOBF =='R', B(1:N,1:K) contains A*U(:,1:K), and can
+!>    be used for computing the refined vectors; see further
+!>    details in the provided references.
+!>    If JOBF == 'E', B(1:N,1;K) contains
+!>    A*U(:,1:K)*W(1:K,1:K), which are the vectors from the
+!>    Exact DMD, up to scaling by the inverse eigenvalues.
+!>    In both cases, the content of B can be lifted to the
+!>    original dimension of the input data by pre-multiplying
+!>    with the Q factor from the initial QR factorization.
+!>    Here A denotes a compression of the underlying operator.
+!>    See the descriptions of F and X.
+!>    If JOBF =='N', then B is not referenced.
+!>    \endverbatim
+!.....
+!>    \param[in] LDB
+!>    \verbatim
+!>    LDB (input) INTEGER, LDB >= MIN(M,N)
+!>    The leading dimension of the array B.
+!>    \endverbatim
+!.....
+!>    \param[out] V
+!>    \verbatim
+!>    V (workspace/output) COMPLEX(KIND=WP) (N-1)-by-(N-1) array
+!>    On exit, V(1:K,1:K) V contains the K eigenvectors of
+!>    the Rayleigh quotient. The Ritz vectors
+!>    (returned in Z) are the product of Q from the initial QR
+!>    factorization (see the description of F) X (see the
+!>    description of X) and V.
+!>    \endverbatim
+!.....
+!>    \param[in] LDV
+!>    \verbatim
+!>    LDV (input) INTEGER, LDV >= N-1
+!>    The leading dimension of the array V.
+!>    \endverbatim
+!.....
+!>    \param[out] S
+!>    \verbatim
+!>    S (output) COMPLEX(KIND=WP) (N-1)-by-(N-1) array
+!>    The array S(1:K,1:K) is used for the matrix Rayleigh
+!>    quotient. This content is overwritten during
+!>    the eigenvalue decomposition by CGEEV.
+!>    See the description of K.
+!>    \endverbatim
+!.....
+!>    \param[in] LDS
+!>    \verbatim
+!>    LDS (input) INTEGER, LDS >= N-1
+!>    The leading dimension of the array S.
+!>    \endverbatim
+!.....
+!>    \param[out] ZWORK
+!>    \verbatim
+!>    ZWORK (workspace/output) COMPLEX(KIND=WP) LWORK-by-1 array
+!>    On exit,
+!>    ZWORK(1:MIN(M,N)) contains the scalar factors of the
+!>    elementary reflectors as returned by CGEQRF of the
+!>    M-by-N input matrix F.
+!>    If the call to CGEDMDQ is only workspace query, then
+!>    ZWORK(1) contains the minimal complex workspace length and
+!>    ZWORK(2) is the optimal complex workspace length.
+!>    Hence, the length of work is at least 2.
+!>    See the description of LZWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LZWORK
+!>    \verbatim
+!>    LZWORK (input) INTEGER
+!>    The minimal length of the  workspace vector ZWORK.
+!>    LZWORK is calculated as follows:
+!>    Let MLWQR  = N (minimal workspace for CGEQRF[M,N])
+!>        MLWDMD = minimal workspace for CGEDMD (see the
+!>                 description of LWORK in CGEDMD)
+!>        MLWMQR = N (minimal workspace for
+!>                   ZUNMQR['L','N',M,N,N])
+!>        MLWGQR = N (minimal workspace for ZUNGQR[M,N,N])
+!>        MINMN  = MIN(M,N)
+!>    Then
+!>    LZWORK = MAX(2, MIN(M,N)+MLWQR, MINMN+MLWDMD)
+!>    is further updated as follows:
+!>       if   JOBZ == 'V' or JOBZ == 'F' THEN
+!>            LZWORK = MAX( LZWORK, MINMN+MLWMQR )
+!>       if   JOBQ == 'Q' THEN
+!>            LZWORK = MAX( ZLWORK, MINMN+MLWGQR)
+!>    \endverbatim
+!.....
+!>    \param[out] WORK
+!>    \verbatim
+!>    WORK (workspace/output) REAL(KIND=WP) LWORK-by-1 array
+!>    On exit,
+!>    WORK(1:N-1) contains the singular values of
+!>    the input submatrix F(1:M,1:N-1).
+!>    If the call to CGEDMDQ is only workspace query, then
+!>    WORK(1) contains the minimal workspace length and
+!>    WORK(2) is the optimal workspace length. hence, the
+!>    length of work is at least 2.
+!>    See the description of LWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LWORK
+!>    \verbatim
+!>    LWORK (input) INTEGER
+!>    The minimal length of the  workspace vector WORK.
+!>    LWORK is the same as in CGEDMD, because in CGEDMDQ
+!>    only CGEDMD requires real workspace for snapshots
+!>    of dimensions MIN(M,N)-by-(N-1).
+!>    If on entry LWORK = -1, then a workspace query is
+!>    assumed and the procedure only computes the minimal
+!>    and the optimal workspace lengths for both WORK and
+!>    IWORK. See the descriptions of WORK and IWORK.
+!>    \endverbatim
+!.....
+!>    \param[out] IWORK
+!>    \verbatim
+!>    IWORK (workspace/output) INTEGER LIWORK-by-1 array
+!>    Workspace that is required only if WHTSVD equals
+!>    2 , 3 or 4. (See the description of WHTSVD).
+!>    If on entry LWORK =-1 or LIWORK=-1, then the
+!>    minimal length of IWORK is computed and returned in
+!>    IWORK(1). See the description of LIWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LIWORK
+!>    \verbatim
+!>    LIWORK (input) INTEGER
+!>    The minimal length of the workspace vector IWORK.
+!>    If WHTSVD == 1, then only IWORK(1) is used; LIWORK >=1
+!>    Let M1=MIN(M,N), N1=N-1. Then
+!>    If WHTSVD == 2, then LIWORK >= MAX(1,8*MIN(M,N))
+!>    If WHTSVD == 3, then LIWORK >= MAX(1,M+N-1)
+!>    If WHTSVD == 4, then LIWORK >= MAX(3,M+3*N)
+!>    If on entry LIWORK = -1, then a workspace query is
+!>    assumed and the procedure only computes the minimal
+!>    and the optimal workspace lengths for both WORK and
+!>    IWORK. See the descriptions of WORK and IWORK.
+!>    \endverbatim
+!.....
+!>    \param[out] INFO
+!>    \verbatim
+!>    INFO (output) INTEGER
+!>    -i < 0 :: On entry, the i-th argument had an
+!>              illegal value
+!>       = 0 :: Successful return.
+!>       = 1 :: Void input. Quick exit (M=0 or N=0).
+!>       = 2 :: The SVD computation of X did not converge.
+!>              Suggestion: Check the input data and/or
+!>              repeat with different WHTSVD.
+!>       = 3 :: The computation of the eigenvalues did not
+!>              converge.
+!>       = 4 :: If data scaling was requested on input and
+!>              the procedure found inconsistency in the data
+!>              such that for some column index i,
+!>              X(:,i) = 0 but Y(:,i) /= 0, then Y(:,i) is set
+!>              to zero if JOBS=='C'. The computation proceeds
+!>              with original or modified data and warning
+!>              flag is set with INFO=4.
+!>    \endverbatim
+!
+!  Authors:
+!  ========
+!
+!> \author Zlatko Drmac
+!
+!> \ingroup gedmd
+!
+!.............................................................
+!.............................................................
+SUBROUTINE CGEDMDQ( JOBS,  JOBZ, JOBR, JOBQ, JOBT, JOBF,   &
+                    WHTSVD,   M, N, F, LDF,  X, LDX,  Y,   &
+                    LDY,   NRNK,  TOL,   K,  EIGS,         &
+                    Z, LDZ, RES,  B,     LDB,   V, LDV,    &
+                    S, LDS, ZWORK, LZWORK, WORK,  LWORK,   &
+                    IWORK, LIWORK, INFO )
+!
+!  -- LAPACK driver routine                                           --
+!
+!  -- LAPACK is a software package provided by University of          --
+!  -- Tennessee, University of California Berkeley, University of     --
+!  -- Colorado Denver and NAG Ltd..                                   --
+!
+!.....
+      USE, INTRINSIC :: iso_fortran_env, only: real32
+      IMPLICIT NONE
+      INTEGER, PARAMETER :: WP = real32
+!
+!     Scalar arguments
+!     ~~~~~~~~~~~~~~~~
+      CHARACTER, INTENT(IN)  :: JOBS, JOBZ, JOBR, JOBQ,    &
+                                JOBT, JOBF
+      INTEGER,   INTENT(IN)  :: WHTSVD, M, N,   LDF, LDX,  &
+                                LDY, NRNK, LDZ, LDB, LDV,  &
+                                LDS, LZWORK,  LWORK, LIWORK
+      INTEGER,   INTENT(OUT) :: INFO,   K
+      REAL(KIND=WP), INTENT(IN)    ::   TOL
+!
+!     Array arguments
+!     ~~~~~~~~~~~~~~~
+      COMPLEX(KIND=WP), INTENT(INOUT) :: F(LDF,*)
+      COMPLEX(KIND=WP), INTENT(OUT)   :: X(LDX,*), Y(LDY,*), &
+                                         Z(LDZ,*), B(LDB,*), &
+                                         V(LDV,*), S(LDS,*)
+      COMPLEX(KIND=WP), INTENT(OUT)   :: EIGS(*)
+      COMPLEX(KIND=WP), INTENT(OUT)   :: ZWORK(*)
+      REAL(KIND=WP), INTENT(OUT)   :: RES(*)
+      REAL(KIND=WP), INTENT(OUT)   :: WORK(*)
+      INTEGER,       INTENT(OUT)   :: IWORK(*)
+!
+!     Parameters
+!     ~~~~~~~~~~
+      REAL(KIND=WP), PARAMETER ::  ONE = 1.0_WP
+      REAL(KIND=WP), PARAMETER :: ZERO = 0.0_WP
+!     COMPLEX(KIND=WP), PARAMETER ::  ZONE = ( 1.0_WP, 0.0_WP )
+      COMPLEX(KIND=WP), PARAMETER :: ZZERO = ( 0.0_WP, 0.0_WP )
+!
+!     Local scalars
+!     ~~~~~~~~~~~~~
+      INTEGER           :: IMINWR, INFO1,  MINMN, MLRWRK,   &
+                           MLWDMD, MLWGQR, MLWMQR, MLWORK,  &
+                           MLWQR,  OLWDMD, OLWGQR, OLWMQR,  &
+                           OLWORK, OLWQR
+      LOGICAL           :: LQUERY, SCCOLX, SCCOLY, WANTQ,  &
+                           WNTTRF, WNTRES, WNTVEC, WNTVCF, &
+                           WNTVCQ, WNTREF, WNTEX
+      CHARACTER(LEN=1)  :: JOBVL
+!
+!     External functions (BLAS and LAPACK)
+!     ~~~~~~~~~~~~~~~~~
+      LOGICAL       LSAME
+      EXTERNAL      LSAME
+!
+!     External subroutines (BLAS and LAPACK)
+!     ~~~~~~~~~~~~~~~~~~~~
+      EXTERNAL      CGEDMD, CGEQRF, CLACPY, CLASET, CUNGQR, &
+                    CUNMQR, XERBLA
+!
+!     Intrinsic functions
+!     ~~~~~~~~~~~~~~~~~~~
+      INTRINSIC      MAX, MIN, INT
+!..........................................................
+!
+!     Test the input arguments
+      WNTRES = LSAME(JOBR,'R')
+      SCCOLX = LSAME(JOBS,'S') .OR. LSAME( JOBS, 'C' )
+      SCCOLY = LSAME(JOBS,'Y')
+      WNTVEC = LSAME(JOBZ,'V')
+      WNTVCF = LSAME(JOBZ,'F')
+      WNTVCQ = LSAME(JOBZ,'Q')
+      WNTREF = LSAME(JOBF,'R')
+      WNTEX  = LSAME(JOBF,'E')
+      WANTQ  = LSAME(JOBQ,'Q')
+      WNTTRF = LSAME(JOBT,'R')
+      MINMN  = MIN(M,N)
+      INFO = 0
+      LQUERY = ( ( LWORK == -1 ) .OR. ( LIWORK == -1 ) )
+!
+      IF ( .NOT. (SCCOLX .OR. SCCOLY .OR.                &
+                                  LSAME(JOBS,'N')) )  THEN
+          INFO = -1
+      ELSE IF ( .NOT. (WNTVEC .OR. WNTVCF .OR. WNTVCQ       &
+                              .OR. LSAME(JOBZ,'N')) ) THEN
+          INFO = -2
+      ELSE IF ( .NOT. (WNTRES .OR. LSAME(JOBR,'N')) .OR.    &
+          ( WNTRES .AND. LSAME(JOBZ,'N') ) ) THEN
+          INFO = -3
+      ELSE IF ( .NOT. (WANTQ .OR. LSAME(JOBQ,'N')) ) THEN
+           INFO = -4
+      ELSE IF ( .NOT. ( WNTTRF .OR. LSAME(JOBT,'N') ) )  THEN
+          INFO = -5
+       ELSE IF ( .NOT. (WNTREF .OR. WNTEX .OR.             &
+                LSAME(JOBF,'N') ) )                     THEN
+          INFO = -6
+      ELSE IF ( .NOT. ((WHTSVD == 1).OR.(WHTSVD == 2).OR.   &
+                       (WHTSVD == 3).OR.(WHTSVD == 4)) ) THEN
+          INFO = -7
+      ELSE IF ( M < 0 ) THEN
+          INFO = -8
+      ELSE IF ( ( N < 0 ) .OR. ( N > M+1 ) ) THEN
+          INFO = -9
+      ELSE IF ( LDF < M ) THEN
+          INFO = -11
+      ELSE IF ( LDX < MINMN ) THEN
+          INFO = -13
+      ELSE IF ( LDY < MINMN ) THEN
+          INFO = -15
+      ELSE IF ( .NOT. (( NRNK == -2).OR.(NRNK == -1).OR.    &
+                       ((NRNK >= 1).AND.(NRNK <=N ))) )  THEN
+          INFO = -16
+      ELSE IF ( ( TOL < ZERO ) .OR. ( TOL >= ONE ) ) THEN
+          INFO = -17
+      ELSE IF ( LDZ < M ) THEN
+          INFO = -21
+      ELSE IF ( (WNTREF.OR.WNTEX ).AND.( LDB < MINMN ) ) THEN
+          INFO = -24
+      ELSE IF ( LDV < N-1 ) THEN
+          INFO = -26
+      ELSE IF ( LDS < N-1 ) THEN
+          INFO = -28
+      END IF
+!
+      IF ( WNTVEC .OR. WNTVCF .OR. WNTVCQ ) THEN
+          JOBVL = 'V'
+      ELSE
+          JOBVL = 'N'
+      END IF
+      IF ( INFO == 0 ) THEN
+          ! Compute the minimal and the optimal workspace
+          ! requirements. Simulate running the code and
+          ! determine minimal and optimal sizes of the
+          ! workspace at any moment of the run.
+         IF ( ( N == 0 ) .OR. ( N == 1 ) ) THEN
+             ! All output except K is void. INFO=1 signals
+             ! the void input. In case of a workspace query,
+             ! the minimal workspace lengths are returned.
+            IF ( LQUERY ) THEN
+               IWORK(1) = 1
+                WORK(1) = 2
+                WORK(2) = 2
+            ELSE
+               K = 0
+            END IF
+            INFO = 1
+            RETURN
+         END IF
+
+         MLRWRK = 2
+         MLWORK = 2
+         OLWORK = 2
+         IMINWR = 1
+         MLWQR  = MAX(1,N)  ! Minimal workspace length for CGEQRF.
+         MLWORK = MAX(MLWORK,MINMN + MLWQR)
+
+         IF ( LQUERY ) THEN
+             CALL CGEQRF( M, N, F, LDF, ZWORK, ZWORK, -1, &
+                          INFO1 )
+             OLWQR  = INT(ZWORK(1))
+             OLWORK = MAX(OLWORK,MINMN + OLWQR)
+         END IF
+         CALL CGEDMD( JOBS, JOBVL, JOBR, JOBF, WHTSVD, MINMN,&
+                      N-1, X, LDX, Y, LDY, NRNK, TOL, K,     &
+                      EIGS, Z, LDZ, RES,  B, LDB, V, LDV,    &
+                      S, LDS, ZWORK, LZWORK, WORK, -1, IWORK,&
+                      LIWORK, INFO1 )
+         MLWDMD = INT(ZWORK(1))
+         MLWORK = MAX(MLWORK, MINMN + MLWDMD)
+         MLRWRK = MAX(MLRWRK, INT(WORK(1)))
+         IMINWR = MAX(IMINWR, IWORK(1))
+         IF ( LQUERY ) THEN
+             OLWDMD = INT(ZWORK(2))
+             OLWORK = MAX(OLWORK, MINMN+OLWDMD)
+         END IF
+         IF ( WNTVEC .OR. WNTVCF ) THEN
+            MLWMQR = MAX(1,N)
+            MLWORK = MAX(MLWORK, MINMN+MLWMQR)
+            IF ( LQUERY ) THEN
+               CALL CUNMQR( 'L','N', M, N, MINMN, F, LDF,  &
+                            ZWORK, Z, LDZ, ZWORK, -1, INFO1 )
+               OLWMQR = INT(ZWORK(1))
+               OLWORK = MAX(OLWORK, MINMN+OLWMQR)
+            END IF
+         END IF
+         IF ( WANTQ ) THEN
+            MLWGQR = MAX(1,N)
+            MLWORK = MAX(MLWORK, MINMN+MLWGQR)
+            IF ( LQUERY ) THEN
+                CALL CUNGQR( M, MINMN, MINMN, F, LDF, ZWORK, &
+                             ZWORK, -1, INFO1 )
+                OLWGQR = INT(ZWORK(1))
+                OLWORK = MAX(OLWORK, MINMN+OLWGQR)
+            END IF
+         END IF
+         IF ( LIWORK < IMINWR .AND. (.NOT.LQUERY) ) INFO = -34
+         IF ( LWORK  < MLRWRK .AND. (.NOT.LQUERY) ) INFO = -32
+         IF ( LZWORK < MLWORK .AND. (.NOT.LQUERY) ) INFO = -30
+      END IF
+      IF( INFO /= 0 ) THEN
+         CALL XERBLA( 'CGEDMDQ', -INFO )
+         RETURN
+      ELSE IF ( LQUERY ) THEN
+!     Return minimal and optimal workspace sizes
+          IWORK(1) = IMINWR
+          ZWORK(1) = CMPLX(MLWORK)
+          ZWORK(2) = CMPLX(OLWORK)
+          WORK(1)  = REAL(MLRWRK)
+          WORK(2)  = REAL(MLRWRK)
+          RETURN
+      END IF
+!.....
+!     Initial QR factorization that is used to represent the
+!     snapshots as elements of lower dimensional subspace.
+!     For large scale computation with M >>N , at this place
+!     one can use an out of core QRF.
+!
+      CALL CGEQRF( M, N, F, LDF, ZWORK,                &
+                   ZWORK(MINMN+1), LZWORK-MINMN, INFO1 )
+!
+!     Define X and Y as the snapshots representations in the
+!     orthogonal basis computed in the QR factorization.
+!     X corresponds to the leading N-1 and Y to the trailing
+!     N-1 snapshots.
+      CALL CLASET( 'L', MINMN, N-1, ZZERO,  ZZERO, X, LDX )
+      CALL CLACPY( 'U', MINMN, N-1, F,      LDF, X, LDX )
+      CALL CLACPY( 'A', MINMN, N-1, F(1,2), LDF, Y, LDY )
+      IF ( M >= 3 ) THEN
+          CALL CLASET( 'L', MINMN-2, N-2, ZZERO,  ZZERO, &
+                       Y(3,1), LDY )
+      END IF
+!
+!     Compute the DMD of the projected snapshot pairs (X,Y)
+      CALL CGEDMD( JOBS, JOBVL, JOBR, JOBF, WHTSVD, MINMN, &
+                  N-1,  X, LDX, Y, LDY, NRNK,   TOL, K,    &
+                  EIGS, Z, LDZ, RES, B,  LDB,   V, LDV,    &
+                  S, LDS, ZWORK(MINMN+1), LZWORK-MINMN,    &
+                  WORK,   LWORK, IWORK, LIWORK, INFO1 )
+      IF ( INFO1 == 2 .OR. INFO1 == 3 ) THEN
+          ! Return with error code. See CGEDMD for details.
+          INFO = INFO1
+          RETURN
+      ELSE
+          INFO = INFO1
+      END IF
+!
+!     The Ritz vectors (Koopman modes) can be explicitly
+!     formed or returned in factored form.
+      IF ( WNTVEC ) THEN
+        ! Compute the eigenvectors explicitly.
+        IF ( M > MINMN ) CALL CLASET( 'A', M-MINMN, K, ZZERO, &
+                                     ZZERO, Z(MINMN+1,1), LDZ )
+        CALL CUNMQR( 'L','N', M, K, MINMN, F, LDF, ZWORK, Z,  &
+             LDZ, ZWORK(MINMN+1), LZWORK-MINMN, INFO1 )
+      ELSE IF ( WNTVCF ) THEN
+        !   Return the Ritz vectors (eigenvectors) in factored
+        !   form Z*V, where Z contains orthonormal matrix (the
+        !   product of Q from the initial QR factorization and
+        !   the SVD/POD_basis returned by CGEDMD in X) and the
+        !   second factor (the eigenvectors of the Rayleigh
+        !   quotient) is in the array V, as returned by CGEDMD.
+        CALL CLACPY( 'A', N, K, X, LDX, Z, LDZ )
+        IF ( M > N ) CALL CLASET( 'A', M-N, K, ZZERO, ZZERO, &
+                                 Z(N+1,1), LDZ )
+        CALL CUNMQR( 'L','N', M, K, MINMN, F, LDF, ZWORK, Z, &
+                    LDZ, ZWORK(MINMN+1), LZWORK-MINMN, INFO1 )
+      END IF
+!
+!     Some optional output variables:
+!
+!     The upper triangular factor R in the initial QR
+!     factorization is optionally returned in the array Y.
+!     This is useful if this call to CGEDMDQ is to be
+
+!     followed by a streaming DMD that is implemented in a
+!     QR compressed form.
+      IF ( WNTTRF ) THEN ! Return the upper triangular R in Y
+         CALL CLASET( 'A', MINMN, N, ZZERO,  ZZERO, Y, LDY )
+         CALL CLACPY( 'U', MINMN, N, F, LDF,        Y, LDY )
+      END IF
+!
+!     The orthonormal/unitary factor Q in the initial QR
+!     factorization is optionally returned in the array F.
+!     Same as with the triangular factor above, this is
+!     useful in a streaming DMD.
+      IF ( WANTQ ) THEN                   ! Q overwrites F
+         CALL CUNGQR( M, MINMN, MINMN, F, LDF, ZWORK,     &
+                      ZWORK(MINMN+1), LZWORK-MINMN, INFO1 )
+      END IF
+!
+      RETURN
+!
+      END SUBROUTINE CGEDMDQ
diff --git a/SRC/cgeequ.f b/SRC/cgeequ.f
index 40b022fab3..3b98ba4d0b 100644
--- a/SRC/cgeequ.f
+++ b/SRC/cgeequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgeequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgeequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,11 +130,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup geequ
 *
 *  =====================================================================
       SUBROUTINE CGEEQU( M, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cgeequb.f b/SRC/cgeequb.f
index 4beffcc849..2f757a6f95 100644
--- a/SRC/cgeequb.f
+++ b/SRC/cgeequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgeequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgeequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -139,11 +137,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup geequb
 *
 *  =====================================================================
       SUBROUTINE CGEEQUB( M, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cgees.f b/SRC/cgees.f
index 359fa2afec..36269985e1 100644
--- a/SRC/cgees.f
+++ b/SRC/cgees.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEES + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgees.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgees.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -189,11 +187,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEeigen
+*> \ingroup gees
 *
 *  =====================================================================
       SUBROUTINE CGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
      $                  LDVS, WORK, LWORK, RWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -229,14 +228,16 @@ SUBROUTINE CGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
       REAL               DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CGEBAK, CGEBAL, CGEHRD, CHSEQR, CLACPY,
-     $                   CLASCL, CTRSEN, CUNGHR, SLABAD, XERBLA
+      EXTERNAL           CCOPY, CGEBAK, CGEBAL, CGEHRD, CHSEQR,
+     $                   CLACPY,
+     $                   CLASCL, CTRSEN, CUNGHR, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               CLANGE, SLAMCH
-      EXTERNAL           LSAME, ILAENV, CLANGE, SLAMCH
+      REAL               CLANGE, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, CLANGE,
+     $                   SLAMCH, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
@@ -251,7 +252,8 @@ SUBROUTINE CGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
       WANTST = LSAME( SORT, 'S' )
       IF( ( .NOT.WANTVS ) .AND. ( .NOT.LSAME( JOBVS, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
          INFO = -4
@@ -282,17 +284,18 @@ SUBROUTINE CGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
 *
             CALL CHSEQR( 'S', JOBVS, N, 1, N, A, LDA, W, VS, LDVS,
      $             WORK, -1, IEVAL )
-            HSWORK = REAL( WORK( 1 ) )
+            HSWORK = INT( WORK( 1 ) )
 *
             IF( .NOT.WANTVS ) THEN
                MAXWRK = MAX( MAXWRK, HSWORK )
             ELSE
-               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1, 'CUNGHR',
+               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1,
+     $                       'CUNGHR',
      $                       ' ', N, 1, N, -1 ) )
                MAXWRK = MAX( MAXWRK, HSWORK )
             END IF
          END IF
-         WORK( 1 ) = MAXWRK
+         WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
             INFO = -12
@@ -318,7 +321,6 @@ SUBROUTINE CGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -362,7 +364,8 @@ SUBROUTINE CGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
 *        (CWorkspace: need 2*N-1, prefer N+(N-1)*NB)
 *        (RWorkspace: none)
 *
-         CALL CUNGHR( N, ILO, IHI, VS, LDVS, WORK( ITAU ), WORK( IWRK ),
+         CALL CUNGHR( N, ILO, IHI, VS, LDVS, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
       END IF
 *
@@ -391,7 +394,8 @@ SUBROUTINE CGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
 *        (CWorkspace: none)
 *        (RWorkspace: none)
 *
-         CALL CTRSEN( 'N', JOBVS, BWORK, N, A, LDA, VS, LDVS, W, SDIM,
+         CALL CTRSEN( 'N', JOBVS, BWORK, N, A, LDA, VS, LDVS, W,
+     $                SDIM,
      $                S, SEP, WORK( IWRK ), LWORK-IWRK+1, ICOND )
       END IF
 *
@@ -401,7 +405,8 @@ SUBROUTINE CGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
 *        (CWorkspace: none)
 *        (RWorkspace: need N)
 *
-         CALL CGEBAK( 'P', 'R', N, ILO, IHI, RWORK( IBAL ), N, VS, LDVS,
+         CALL CGEBAK( 'P', 'R', N, ILO, IHI, RWORK( IBAL ), N, VS,
+     $                LDVS,
      $                IERR )
       END IF
 *
@@ -413,7 +418,7 @@ SUBROUTINE CGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
          CALL CCOPY( N, A, LDA+1, W, 1 )
       END IF
 *
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
       RETURN
 *
 *     End of CGEES
diff --git a/SRC/cgeesx.f b/SRC/cgeesx.f
index 1113563ba2..fd717973fb 100644
--- a/SRC/cgeesx.f
+++ b/SRC/cgeesx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEESX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgeesx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgeesx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -230,12 +228,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEeigen
+*> \ingroup geesx
 *
 *  =====================================================================
-      SUBROUTINE CGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
+      SUBROUTINE CGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
+     $                   W,
      $                   VS, LDVS, RCONDE, RCONDV, WORK, LWORK, RWORK,
      $                   BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -273,14 +273,16 @@ SUBROUTINE CGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
       REAL               DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CGEBAK, CGEBAL, CGEHRD, CHSEQR, CLACPY,
-     $                   CLASCL, CTRSEN, CUNGHR, SLABAD, SLASCL, XERBLA
+      EXTERNAL           CCOPY, CGEBAK, CGEBAL, CGEHRD, CHSEQR,
+     $                   CLACPY,
+     $                   CLASCL, CTRSEN, CUNGHR, SLASCL, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               CLANGE, SLAMCH
-      EXTERNAL           LSAME, ILAENV, CLANGE, SLAMCH
+      REAL               CLANGE, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, CLANGE, SLAMCH,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
@@ -300,7 +302,8 @@ SUBROUTINE CGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
 *
       IF( ( .NOT.WANTVS ) .AND. ( .NOT.LSAME( JOBVS, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -2
       ELSE IF( .NOT.( WANTSN .OR. WANTSE .OR. WANTSV .OR. WANTSB ) .OR.
      $         ( .NOT.WANTST .AND. .NOT.WANTSN ) ) THEN
@@ -337,12 +340,13 @@ SUBROUTINE CGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
 *
             CALL CHSEQR( 'S', JOBVS, N, 1, N, A, LDA, W, VS, LDVS,
      $             WORK, -1, IEVAL )
-            HSWORK = REAL( WORK( 1 ) )
+            HSWORK = INT( WORK( 1 ) )
 *
             IF( .NOT.WANTVS ) THEN
                MAXWRK = MAX( MAXWRK, HSWORK )
             ELSE
-               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1, 'CUNGHR',
+               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1,
+     $                       'CUNGHR',
      $                       ' ', N, 1, N, -1 ) )
                MAXWRK = MAX( MAXWRK, HSWORK )
             END IF
@@ -350,7 +354,7 @@ SUBROUTINE CGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
             IF( .NOT.WANTSN )
      $         LWRK = MAX( LWRK, ( N*N )/2 )
          END IF
-         WORK( 1 ) = LWRK
+         WORK( 1 ) = SROUNDUP_LWORK(LWRK)
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
             INFO = -15
@@ -376,7 +380,6 @@ SUBROUTINE CGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -421,7 +424,8 @@ SUBROUTINE CGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
 *        (CWorkspace: need 2*N-1, prefer N+(N-1)*NB)
 *        (RWorkspace: none)
 *
-         CALL CUNGHR( N, ILO, IHI, VS, LDVS, WORK( ITAU ), WORK( IWRK ),
+         CALL CUNGHR( N, ILO, IHI, VS, LDVS, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
       END IF
 *
@@ -452,7 +456,8 @@ SUBROUTINE CGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
 *                     otherwise, need none )
 *        (RWorkspace: none)
 *
-         CALL CTRSEN( SENSE, JOBVS, BWORK, N, A, LDA, VS, LDVS, W, SDIM,
+         CALL CTRSEN( SENSE, JOBVS, BWORK, N, A, LDA, VS, LDVS, W,
+     $                SDIM,
      $                RCONDE, RCONDV, WORK( IWRK ), LWORK-IWRK+1,
      $                ICOND )
          IF( .NOT.WANTSN )
@@ -471,7 +476,8 @@ SUBROUTINE CGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
 *        (CWorkspace: none)
 *        (RWorkspace: need N)
 *
-         CALL CGEBAK( 'P', 'R', N, ILO, IHI, RWORK( IBAL ), N, VS, LDVS,
+         CALL CGEBAK( 'P', 'R', N, ILO, IHI, RWORK( IBAL ), N, VS,
+     $                LDVS,
      $                IERR )
       END IF
 *
@@ -483,12 +489,13 @@ SUBROUTINE CGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
          CALL CCOPY( N, A, LDA+1, W, 1 )
          IF( ( WANTSV .OR. WANTSB ) .AND. INFO.EQ.0 ) THEN
             DUM( 1 ) = RCONDV
-            CALL SLASCL( 'G', 0, 0, CSCALE, ANRM, 1, 1, DUM, 1, IERR )
+            CALL SLASCL( 'G', 0, 0, CSCALE, ANRM, 1, 1, DUM, 1,
+     $                   IERR )
             RCONDV = DUM( 1 )
          END IF
       END IF
 *
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
       RETURN
 *
 *     End of CGEESX
diff --git a/SRC/cgeev.f b/SRC/cgeev.f
index a77525ef84..b9a7f14143 100644
--- a/SRC/cgeev.f
+++ b/SRC/cgeev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgeev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgeev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -172,10 +170,11 @@
 *
 *  @generated from zgeev.f, fortran z -> c, Tue Apr 19 01:47:44 2016
 *
-*> \ingroup complexGEeigen
+*> \ingroup geev
 *
 *  =====================================================================
-      SUBROUTINE CGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
+      SUBROUTINE CGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR,
+     $                  LDVR,
      $                  WORK, LWORK, RWORK, INFO )
       implicit none
 *
@@ -212,14 +211,19 @@ SUBROUTINE CGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
       REAL   DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLABAD, XERBLA, CSSCAL, CGEBAK, CGEBAL, CGEHRD,
-     $                   CHSEQR, CLACPY, CLASCL, CSCAL, CTREVC3, CUNGHR
+      EXTERNAL           XERBLA, CSSCAL, CGEBAK,
+     $                   CGEBAL, CGEHRD, CHSEQR,
+     $                   CLACPY, CLASCL, CSCAL,
+     $                   CTREVC3, CUNGHR
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ISAMAX, ILAENV
-      REAL   SLAMCH, SCNRM2, CLANGE
-      EXTERNAL           LSAME, ISAMAX, ILAENV, SLAMCH, SCNRM2, CLANGE
+      REAL               SLAMCH, SCNRM2, CLANGE,
+     $                   SROUNDUP_LWORK
+      EXTERNAL           LSAME, ISAMAX, ILAENV,
+     $                   SLAMCH, SCNRM2, CLANGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          REAL, CMPLX, CONJG, AIMAG, MAX, SQRT
@@ -234,7 +238,8 @@ SUBROUTINE CGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
       WANTVR = LSAME( JOBVR, 'V' )
       IF( ( .NOT.WANTVL ) .AND. ( .NOT.LSAME( JOBVL, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( ( .NOT.WANTVR ) .AND. ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTVR ) .AND.
+     $         ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
          INFO = -3
@@ -265,7 +270,8 @@ SUBROUTINE CGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
             MAXWRK = N + N*ILAENV( 1, 'CGEHRD', ' ', N, 1, N, 0 )
             MINWRK = 2*N
             IF( WANTVL ) THEN
-               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1, 'CUNGHR',
+               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1,
+     $                       'CUNGHR',
      $                       ' ', N, 1, N, -1 ) )
                CALL CTREVC3( 'L', 'B', SELECT, N, A, LDA,
      $                       VL, LDVL, VR, LDVR,
@@ -275,7 +281,8 @@ SUBROUTINE CGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
                CALL CHSEQR( 'S', 'V', N, 1, N, A, LDA, W, VL, LDVL,
      $                      WORK, -1, INFO )
             ELSE IF( WANTVR ) THEN
-               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1, 'CUNGHR',
+               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1,
+     $                       'CUNGHR',
      $                       ' ', N, 1, N, -1 ) )
                CALL CTREVC3( 'R', 'B', SELECT, N, A, LDA,
      $                       VL, LDVL, VR, LDVR,
@@ -291,7 +298,7 @@ SUBROUTINE CGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
             HSWORK = INT( WORK(1) )
             MAXWRK = MAX( MAXWRK, HSWORK, MINWRK )
          END IF
-         WORK( 1 ) = MAXWRK
+         WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
             INFO = -12
@@ -315,7 +322,6 @@ SUBROUTINE CGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -361,7 +367,8 @@ SUBROUTINE CGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
 *        (CWorkspace: need 2*N-1, prefer N+(N-1)*NB)
 *        (RWorkspace: none)
 *
-         CALL CUNGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ), WORK( IWRK ),
+         CALL CUNGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
 *
 *        Perform QR iteration, accumulating Schur vectors in VL
@@ -393,7 +400,8 @@ SUBROUTINE CGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
 *        (CWorkspace: need 2*N-1, prefer N+(N-1)*NB)
 *        (RWorkspace: none)
 *
-         CALL CUNGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ), WORK( IWRK ),
+         CALL CUNGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
 *
 *        Perform QR iteration, accumulating Schur vectors in VR
@@ -427,7 +435,8 @@ SUBROUTINE CGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
 *        (RWorkspace: need 2*N)
 *
          IRWORK = IBAL + N
-         CALL CTREVC3( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR, LDVR,
+         CALL CTREVC3( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR,
+     $                 LDVR,
      $                 N, NOUT, WORK( IWRK ), LWORK-IWRK+1,
      $                 RWORK( IRWORK ), N, IERR )
       END IF
@@ -438,7 +447,8 @@ SUBROUTINE CGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
 *        (CWorkspace: none)
 *        (RWorkspace: need N)
 *
-         CALL CGEBAK( 'B', 'L', N, ILO, IHI, RWORK( IBAL ), N, VL, LDVL,
+         CALL CGEBAK( 'B', 'L', N, ILO, IHI, RWORK( IBAL ), N, VL,
+     $                LDVL,
      $                IERR )
 *
 *        Normalize left eigenvectors and make largest component real
@@ -463,7 +473,8 @@ SUBROUTINE CGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
 *        (CWorkspace: none)
 *        (RWorkspace: need N)
 *
-         CALL CGEBAK( 'B', 'R', N, ILO, IHI, RWORK( IBAL ), N, VR, LDVR,
+         CALL CGEBAK( 'B', 'R', N, ILO, IHI, RWORK( IBAL ), N, VR,
+     $                LDVR,
      $                IERR )
 *
 *        Normalize right eigenvectors and make largest component real
@@ -486,14 +497,16 @@ SUBROUTINE CGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
 *
    50 CONTINUE
       IF( SCALEA ) THEN
-         CALL CLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1, W( INFO+1 ),
+         CALL CLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1,
+     $                W( INFO+1 ),
      $                MAX( N-INFO, 1 ), IERR )
          IF( INFO.GT.0 ) THEN
-            CALL CLASCL( 'G', 0, 0, CSCALE, ANRM, ILO-1, 1, W, N, IERR )
+            CALL CLASCL( 'G', 0, 0, CSCALE, ANRM, ILO-1, 1, W, N,
+     $                   IERR )
          END IF
       END IF
 *
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
       RETURN
 *
 *     End of CGEEV
diff --git a/SRC/cgeevx.f b/SRC/cgeevx.f
index 2388f5accf..7c3be73232 100644
--- a/SRC/cgeevx.f
+++ b/SRC/cgeevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgeevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgeevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -279,10 +277,11 @@
 *
 *  @generated from zgeevx.f, fortran z -> c, Tue Apr 19 01:47:44 2016
 *
-*> \ingroup complexGEeigen
+*> \ingroup geevx
 *
 *  =====================================================================
-      SUBROUTINE CGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
+      SUBROUTINE CGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W,
+     $                   VL,
      $                   LDVL, VR, LDVR, ILO, IHI, SCALE, ABNRM, RCONDE,
      $                   RCONDV, WORK, LWORK, RWORK, INFO )
       implicit none
@@ -323,15 +322,20 @@ SUBROUTINE CGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
       REAL   DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLABAD, SLASCL, XERBLA, CSSCAL, CGEBAK, CGEBAL,
-     $                   CGEHRD, CHSEQR, CLACPY, CLASCL, CSCAL, CTREVC3,
-     $                   CTRSNA, CUNGHR
+      EXTERNAL           SLASCL, XERBLA, CSSCAL,
+     $                   CGEBAK, CGEBAL, CGEHRD,
+     $                   CHSEQR, CLACPY, CLASCL,
+     $                   CSCAL, CTREVC3, CTRSNA,
+     $                   CUNGHR
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ISAMAX, ILAENV
-      REAL   SLAMCH, SCNRM2, CLANGE
-      EXTERNAL           LSAME, ISAMAX, ILAENV, SLAMCH, SCNRM2, CLANGE
+      REAL               SLAMCH, SCNRM2, CLANGE,
+     $                   SROUNDUP_LWORK
+      EXTERNAL           LSAME, ISAMAX, ILAENV,
+     $                   SLAMCH, SCNRM2, CLANGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          REAL, CMPLX, CONJG, AIMAG, MAX, SQRT
@@ -348,12 +352,15 @@ SUBROUTINE CGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
       WNTSNE = LSAME( SENSE, 'E' )
       WNTSNV = LSAME( SENSE, 'V' )
       WNTSNB = LSAME( SENSE, 'B' )
-      IF( .NOT.( LSAME( BALANC, 'N' ) .OR. LSAME( BALANC, 'S' ) .OR.
+      IF( .NOT.( LSAME( BALANC, 'N' ) .OR.
+     $    LSAME( BALANC, 'S' ) .OR.
      $    LSAME( BALANC, 'P' ) .OR. LSAME( BALANC, 'B' ) ) ) THEN
          INFO = -1
-      ELSE IF( ( .NOT.WANTVL ) .AND. ( .NOT.LSAME( JOBVL, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTVL ) .AND.
+     $         ( .NOT.LSAME( JOBVL, 'N' ) ) ) THEN
          INFO = -2
-      ELSE IF( ( .NOT.WANTVR ) .AND. ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTVR ) .AND.
+     $         ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( .NOT.( WNTSNN .OR. WNTSNE .OR. WNTSNB .OR. WNTSNV ) .OR.
      $         ( ( WNTSNE .OR. WNTSNB ) .AND. .NOT.( WANTVL .AND.
@@ -405,10 +412,12 @@ SUBROUTINE CGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
      $                WORK, -1, INFO )
             ELSE
                IF( WNTSNN ) THEN
-                  CALL CHSEQR( 'E', 'N', N, 1, N, A, LDA, W, VR, LDVR,
+                  CALL CHSEQR( 'E', 'N', N, 1, N, A, LDA, W, VR,
+     $                         LDVR,
      $                WORK, -1, INFO )
                ELSE
-                  CALL CHSEQR( 'S', 'N', N, 1, N, A, LDA, W, VR, LDVR,
+                  CALL CHSEQR( 'S', 'N', N, 1, N, A, LDA, W, VR,
+     $                         LDVR,
      $                WORK, -1, INFO )
                END IF
             END IF
@@ -426,7 +435,8 @@ SUBROUTINE CGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
                IF( .NOT.( WNTSNN .OR. WNTSNE ) )
      $            MINWRK = MAX( MINWRK, N*N + 2*N )
                MAXWRK = MAX( MAXWRK, HSWORK )
-               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1, 'CUNGHR',
+               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1,
+     $                       'CUNGHR',
      $                       ' ', N, 1, N, -1 ) )
                IF( .NOT.( WNTSNN .OR. WNTSNE ) )
      $            MAXWRK = MAX( MAXWRK, N*N + 2*N )
@@ -434,7 +444,7 @@ SUBROUTINE CGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
             END IF
             MAXWRK = MAX( MAXWRK, MINWRK )
          END IF
-         WORK( 1 ) = MAXWRK
+         WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
             INFO = -20
@@ -458,7 +468,6 @@ SUBROUTINE CGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -508,7 +517,8 @@ SUBROUTINE CGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
 *        (CWorkspace: need 2*N-1, prefer N+(N-1)*NB)
 *        (RWorkspace: none)
 *
-         CALL CUNGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ), WORK( IWRK ),
+         CALL CUNGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
 *
 *        Perform QR iteration, accumulating Schur vectors in VL
@@ -540,7 +550,8 @@ SUBROUTINE CGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
 *        (CWorkspace: need 2*N-1, prefer N+(N-1)*NB)
 *        (RWorkspace: none)
 *
-         CALL CUNGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ), WORK( IWRK ),
+         CALL CUNGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
 *
 *        Perform QR iteration, accumulating Schur vectors in VR
@@ -581,7 +592,8 @@ SUBROUTINE CGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
 *        (CWorkspace: need 2*N, prefer N + 2*N*NB)
 *        (RWorkspace: need N)
 *
-         CALL CTREVC3( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR, LDVR,
+         CALL CTREVC3( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR,
+     $                 LDVR,
      $                 N, NOUT, WORK( IWRK ), LWORK-IWRK+1,
      $                 RWORK, N, IERR )
       END IF
@@ -591,7 +603,8 @@ SUBROUTINE CGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
 *     (RWorkspace: need 2*N unless SENSE = 'E')
 *
       IF( .NOT.WNTSNN ) THEN
-         CALL CTRSNA( SENSE, 'A', SELECT, N, A, LDA, VL, LDVL, VR, LDVR,
+         CALL CTRSNA( SENSE, 'A', SELECT, N, A, LDA, VL, LDVL, VR,
+     $                LDVR,
      $                RCONDE, RCONDV, N, NOUT, WORK( IWRK ), N, RWORK,
      $                ICOND )
       END IF
@@ -646,18 +659,20 @@ SUBROUTINE CGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
 *
    50 CONTINUE
       IF( SCALEA ) THEN
-         CALL CLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1, W( INFO+1 ),
+         CALL CLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1,
+     $                W( INFO+1 ),
      $                MAX( N-INFO, 1 ), IERR )
          IF( INFO.EQ.0 ) THEN
             IF( ( WNTSNV .OR. WNTSNB ) .AND. ICOND.EQ.0 )
      $         CALL SLASCL( 'G', 0, 0, CSCALE, ANRM, N, 1, RCONDV, N,
      $                      IERR )
          ELSE
-            CALL CLASCL( 'G', 0, 0, CSCALE, ANRM, ILO-1, 1, W, N, IERR )
+            CALL CLASCL( 'G', 0, 0, CSCALE, ANRM, ILO-1, 1, W, N,
+     $                   IERR )
          END IF
       END IF
 *
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
       RETURN
 *
 *     End of CGEEVX
diff --git a/SRC/cgehd2.f b/SRC/cgehd2.f
index d8b40b180c..4a5400667f 100644
--- a/SRC/cgehd2.f
+++ b/SRC/cgehd2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEHD2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgehd2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgehd2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,7 +104,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup gehd2
 *
 *> \par Further Details:
 *  =====================
@@ -146,6 +144,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGEHD2( N, ILO, IHI, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -160,16 +159,11 @@ SUBROUTINE CGEHD2( N, ILO, IHI, A, LDA, TAU, WORK, INFO )
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      COMPLEX            ONE
-      PARAMETER          ( ONE = ( 1.0E+0, 0.0E+0 ) )
-*     ..
 *     .. Local Scalars ..
       INTEGER            I
-      COMPLEX            ALPHA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLARF, CLARFG, XERBLA
+      EXTERNAL           CLARF1F, CLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CONJG, MAX, MIN
@@ -197,21 +191,19 @@ SUBROUTINE CGEHD2( N, ILO, IHI, A, LDA, TAU, WORK, INFO )
 *
 *        Compute elementary reflector H(i) to annihilate A(i+2:ihi,i)
 *
-         ALPHA = A( I+1, I )
-         CALL CLARFG( IHI-I, ALPHA, A( MIN( I+2, N ), I ), 1, TAU( I ) )
-         A( I+1, I ) = ONE
+         CALL CLARFG( IHI-I, A( I+1, I ), A( MIN( I+2, N ), I ), 1,
+     $                TAU( I ) )
 *
 *        Apply H(i) to A(1:ihi,i+1:ihi) from the right
 *
-         CALL CLARF( 'Right', IHI, IHI-I, A( I+1, I ), 1, TAU( I ),
-     $               A( 1, I+1 ), LDA, WORK )
+         CALL CLARF1F( 'Right', IHI, IHI-I, A( I+1, I ), 1, TAU( I ),
+     $                 A( 1, I+1 ), LDA, WORK )
 *
 *        Apply H(i)**H to A(i+1:ihi,i+1:n) from the left
 *
-         CALL CLARF( 'Left', IHI-I, N-I, A( I+1, I ), 1,
-     $               CONJG( TAU( I ) ), A( I+1, I+1 ), LDA, WORK )
+         CALL CLARF1F( 'Left', IHI-I, N-I, A( I+1, I ), 1,
+     $                 CONJG( TAU( I ) ), A( I+1, I+1 ), LDA, WORK )
 *
-         A( I+1, I ) = ALPHA
    10 CONTINUE
 *
       RETURN
diff --git a/SRC/cgehrd.f b/SRC/cgehrd.f
index d9c0502675..3a01ef08ef 100644
--- a/SRC/cgehrd.f
+++ b/SRC/cgehrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEHRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgehrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgehrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -89,7 +87,7 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX array, dimension (LWORK)
+*>          WORK is COMPLEX array, dimension (MAX(1,LWORK))
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
@@ -120,7 +118,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup gehrd
 *
 *> \par Further Details:
 *  =====================
@@ -163,7 +161,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE CGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -193,7 +193,8 @@ SUBROUTINE CGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
       COMPLEX            EI
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CGEHD2, CGEMM, CLAHR2, CLARFB, CTRMM,
+      EXTERNAL           CAXPY, CGEHD2, CGEMM, CLAHR2, CLARFB,
+     $                   CTRMM,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -201,7 +202,8 @@ SUBROUTINE CGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -221,13 +223,19 @@ SUBROUTINE CGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -8
       END IF
 *
+      NH = IHI - ILO + 1
       IF( INFO.EQ.0 ) THEN
 *
 *        Compute the workspace requirements
 *
-         NB = MIN( NBMAX, ILAENV( 1, 'CGEHRD', ' ', N, ILO, IHI, -1 ) )
-         LWKOPT = N*NB + TSIZE
-         WORK( 1 ) = LWKOPT
+         IF( NH.LE.1 ) THEN
+            LWKOPT = 1
+         ELSE
+            NB = MIN( NBMAX, ILAENV( 1, 'CGEHRD', ' ', N, ILO, IHI,
+     $                              -1 ) )
+            LWKOPT = N*NB + TSIZE
+         END IF
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -248,7 +256,6 @@ SUBROUTINE CGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *     Quick return if possible
 *
-      NH = IHI - ILO + 1
       IF( NH.LE.1 ) THEN
          WORK( 1 ) = 1
          RETURN
@@ -268,7 +275,7 @@ SUBROUTINE CGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *           Determine if workspace is large enough for blocked code
 *
-            IF( LWORK.LT.N*NB+TSIZE ) THEN
+            IF( LWORK.LT.LWKOPT ) THEN
 *
 *              Not enough workspace to use optimal NB:  determine the
 *              minimum value of NB, and reduce NB or force use of
@@ -344,7 +351,8 @@ SUBROUTINE CGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *     Use unblocked code to reduce the rest of the matrix
 *
       CALL CGEHD2( N, I, IHI, A, LDA, TAU, WORK, IINFO )
-      WORK( 1 ) = LWKOPT
+*
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       RETURN
 *
diff --git a/SRC/cgejsv.f b/SRC/cgejsv.f
index 25ab813028..ad37a587c6 100644
--- a/SRC/cgejsv.f
+++ b/SRC/cgejsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEJSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgejsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgejsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -21,9 +19,9 @@
 *     SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *                         M, N, A, LDA, SVA, U, LDU, V, LDV,
 *                         CWORK, LWORK, RWORK, LRWORK, IWORK, INFO )
+*     IMPLICIT NONE
 *
 *     .. Scalar Arguments ..
-*     IMPLICIT    NONE
 *     INTEGER     INFO, LDA, LDU, LDV, LWORK, M, N
 *     ..
 *     .. Array Arguments ..
@@ -52,10 +50,10 @@
 *> are computed and stored in the arrays U and V, respectively. The diagonal
 *> of [SIGMA] is computed and stored in the array SVA.
 *> \endverbatim
-*>
-*>  Arguments:
-*>  ==========
-*>
+*
+*  Arguments:
+*  ==========
+*
 *> \param[in] JOBA
 *> \verbatim
 *>          JOBA is CHARACTER*1
@@ -151,7 +149,7 @@
 *>         transposed A if A^* seems to be better with respect to convergence.
 *>         If the matrix is not square, JOBT is ignored.
 *>         The decision is based on two values of entropy over the adjoint
-*>         orbit of A^* * A. See the descriptions of WORK(6) and WORK(7).
+*>         orbit of A^* * A. See the descriptions of RWORK(6) and RWORK(7).
 *>       = 'T': transpose if entropy test indicates possibly faster
 *>         convergence of Jacobi process if A^* is taken as input. If A is
 *>         replaced with A^*, then the row pivoting is included automatically.
@@ -209,11 +207,11 @@
 *> \verbatim
 *>          SVA is REAL array, dimension (N)
 *>          On exit,
-*>          - For WORK(1)/WORK(2) = ONE: The singular values of A. During the
-*>            computation SVA contains Euclidean column norms of the
+*>          - For RWORK(1)/RWORK(2) = ONE: The singular values of A. During
+*>            the computation SVA contains Euclidean column norms of the
 *>            iterated matrices in the array A.
-*>          - For WORK(1) .NE. WORK(2): The singular values of A are
-*>            (WORK(1)/WORK(2)) * SVA(1:N). This factored form is used if
+*>          - For RWORK(1) .NE. RWORK(2): The singular values of A are
+*>            (RWORK(1)/RWORK(2)) * SVA(1:N). This factored form is used if
 *>            sigma_max(A) overflows or if small singular values have been
 *>            saved from underflow by scaling the input matrix A.
 *>          - If JOBR='R' then some of the singular values may be returned
@@ -252,7 +250,7 @@
 *>          If JOBV = 'V', 'J' then V contains on exit the N-by-N matrix of
 *>                         the right singular vectors;
 *>          If JOBV = 'W', AND (JOBU = 'U' AND JOBT = 'T' AND M = N),
-*>                         then V is used as workspace if the pprocedure
+*>                         then V is used as workspace if the procedure
 *>                         replaces A with A^*. In that case, [U] is computed
 *>                         in V as right singular vectors of A^* and then
 *>                         copied back to the U array. This 'W' option is just
@@ -304,7 +302,7 @@
 *>            -> the minimal requirement is LWORK >= 3*N.
 *>            -> For optimal performance, 
 *>               LWORK >= max(N+(N+1)*NB, 2*N+N*NB)=2*N+N*NB,
-*>               where NB is the optimal block size for CGEQP3, CGEQRF, CGELQ,
+*>               where NB is the optimal block size for CGEQP3, CGEQRF, CGELQF,
 *>               CUNMLQ. In general, the optimal length LWORK is computed as
 *>               LWORK >= max(N+LWORK(CGEQP3), N+LWORK(CGESVJ),
 *>                       N+LWORK(CGELQF), 2*N+LWORK(CGEQRF), N+LWORK(CUNMLQ)).
@@ -313,7 +311,7 @@
 *>            -> the minimal requirement is LWORK >= 3*N.      
 *>            -> For optimal performance, 
 *>               LWORK >= max(N+(N+1)*NB, 2*N,2*N+N*NB)=2*N+N*NB,
-*>               where NB is the optimal block size for CGEQP3, CGEQRF, CGELQ,
+*>               where NB is the optimal block size for CGEQP3, CGEQRF, CGELQF,
 *>               CUNMLQ. In general, the optimal length LWORK is computed as
 *>               LWORK >= max(N+LWORK(CGEQP3), LWORK(CPOCON), N+LWORK(CGESVJ),
 *>                       N+LWORK(CGELQF), 2*N+LWORK(CGEQRF), N+LWORK(CUNMLQ)).   
@@ -350,7 +348,7 @@
 *>
 *> \param[out] RWORK
 *> \verbatim
-*>          RWORK is REAL array, dimension (MAX(7,LWORK))
+*>          RWORK is REAL array, dimension (MAX(7,LRWORK))
 *>          On exit,
 *>          RWORK(1) = Determines the scaling factor SCALE = RWORK(2) / RWORK(1)
 *>                    such that SCALE*SVA(1:N) are the computed singular values
@@ -484,7 +482,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEsing
+*> \ingroup gejsv
 *
 *> \par Further Details:
 *  =====================
@@ -565,13 +563,13 @@
       SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
      $                   M, N, A, LDA, SVA, U, LDU, V, LDV,
      $                   CWORK, LWORK, RWORK, LRWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
 *     .. Scalar Arguments ..
-      IMPLICIT    NONE
       INTEGER     INFO, LDA, LDU, LDV, LWORK, LRWORK, M, N
 *     ..
 *     .. Array Arguments ..
@@ -620,10 +618,10 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
       EXTERNAL  ISAMAX, ICAMAX, LSAME, SLAMCH, SCNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL  SLASSQ, CCOPY,  CGELQF, CGEQP3, CGEQRF, CLACPY, CLAPMR,
-     $          CLASCL, SLASCL, CLASET, CLASSQ, CLASWP, CUNGQR, CUNMLQ,
-     $          CUNMQR, CPOCON, SSCAL,  CSSCAL, CSWAP,  CTRSM,  CLACGV,
-     $          XERBLA
+      EXTERNAL  SLASSQ, CCOPY,  CGELQF, CGEQP3, CGEQRF, CLACPY,
+     $          CLAPMR, CLASCL, SLASCL, CLASET, CLASSQ, CLASWP,
+     $          CUNGQR, CUNMLQ, CUNMQR, CPOCON, SSCAL,  CSSCAL,
+     $          CSWAP,  CTRSM,  CLACGV, XERBLA
 *
       EXTERNAL  CGESVJ
 *     ..
@@ -655,7 +653,8 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
          INFO = - 3
       ELSE IF ( .NOT. ( L2KILL .OR. DEFR ) )    THEN
          INFO = - 4
-      ELSE IF ( .NOT. ( LSAME(JOBT,'T') .OR. LSAME(JOBT,'N') ) ) THEN
+      ELSE IF ( .NOT. ( LSAME(JOBT,'T') .OR.
+     $          LSAME(JOBT,'N') ) ) THEN
          INFO = - 5
       ELSE IF ( .NOT. ( L2PERT .OR. LSAME( JOBP, 'N' ) ) ) THEN
          INFO = - 6
@@ -704,11 +703,11 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
           IF ( LQUERY ) THEN 
               CALL CGEQP3( M, N, A, LDA, IWORK, CDUMMY, CDUMMY, -1, 
      $             RDUMMY, IERR )
-              LWRK_CGEQP3 = REAL( CDUMMY(1) )
+              LWRK_CGEQP3 = INT( CDUMMY(1) )
               CALL CGEQRF( N, N, A, LDA, CDUMMY, CDUMMY,-1, IERR )
-              LWRK_CGEQRF = REAL( CDUMMY(1) )
+              LWRK_CGEQRF = INT( CDUMMY(1) )
               CALL CGELQF( N, N, A, LDA, CDUMMY, CDUMMY,-1, IERR )
-              LWRK_CGELQF = REAL( CDUMMY(1) )
+              LWRK_CGELQF = INT( CDUMMY(1) )
           END IF
           MINWRK  = 2
           OPTWRK  = 2
@@ -722,9 +721,10 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                   MINWRK = MAX( N+LWQP3, N+LWQRF, LWSVDJ )
               END IF
               IF ( LQUERY ) THEN 
-                  CALL CGESVJ( 'L', 'N', 'N', N, N, A, LDA, SVA, N, V, 
+                  CALL CGESVJ( 'L', 'N', 'N', N, N, A, LDA, SVA, N,
+     $                         V,
      $                 LDV, CDUMMY, -1, RDUMMY, -1, IERR )
-                  LWRK_CGESVJ = REAL( CDUMMY(1) )
+                  LWRK_CGESVJ = INT( CDUMMY(1) )
                   IF ( ERREST ) THEN 
                       OPTWRK = MAX( N+LWRK_CGEQP3, N**2+LWCON, 
      $                              N+LWRK_CGEQRF, LWRK_CGESVJ )
@@ -760,10 +760,10 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
              IF ( LQUERY ) THEN
                  CALL CGESVJ( 'L', 'U', 'N', N,N, U, LDU, SVA, N, A,
      $                LDA, CDUMMY, -1, RDUMMY, -1, IERR )
-                 LWRK_CGESVJ = REAL( CDUMMY(1) )
+                 LWRK_CGESVJ = INT( CDUMMY(1) )
                  CALL CUNMLQ( 'L', 'C', N, N, N, A, LDA, CDUMMY,
      $                V, LDV, CDUMMY, -1, IERR )
-                 LWRK_CUNMLQ = REAL( CDUMMY(1) )
+                 LWRK_CUNMLQ = INT( CDUMMY(1) )
                  IF ( ERREST ) THEN 
                  OPTWRK = MAX( N+LWRK_CGEQP3, LWCON, LWRK_CGESVJ, 
      $                         N+LWRK_CGELQF, 2*N+LWRK_CGEQRF,
@@ -799,10 +799,10 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
              IF ( LQUERY ) THEN
                  CALL CGESVJ( 'L', 'U', 'N', N,N, U, LDU, SVA, N, A,
      $                LDA, CDUMMY, -1, RDUMMY, -1, IERR )
-                 LWRK_CGESVJ = REAL( CDUMMY(1) )
+                 LWRK_CGESVJ = INT( CDUMMY(1) )
                  CALL CUNMQR( 'L', 'N', M, N, N, A, LDA, CDUMMY, U,
      $               LDU, CDUMMY, -1, IERR )
-                 LWRK_CUNMQRM = REAL( CDUMMY(1) )
+                 LWRK_CUNMQRM = INT( CDUMMY(1) )
                  IF ( ERREST ) THEN
                  OPTWRK = N + MAX( LWRK_CGEQP3, LWCON, N+LWRK_CGEQRF,
      $                             LWRK_CGESVJ, LWRK_CUNMQRM )
@@ -861,26 +861,27 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
              IF ( LQUERY ) THEN
                  CALL CUNMQR( 'L', 'N', M, N, N, A, LDA, CDUMMY, U,
      $                LDU, CDUMMY, -1, IERR )
-                 LWRK_CUNMQRM = REAL( CDUMMY(1) )
+                 LWRK_CUNMQRM = INT( CDUMMY(1) )
                  CALL CUNMQR( 'L', 'N', N, N, N, A, LDA, CDUMMY, U,
      $                LDU, CDUMMY, -1, IERR )
-                 LWRK_CUNMQR = REAL( CDUMMY(1) )
+                 LWRK_CUNMQR = INT( CDUMMY(1) )
                  IF ( .NOT. JRACC ) THEN
-                     CALL CGEQP3( N,N, A, LDA, IWORK, CDUMMY,CDUMMY, -1,
+                     CALL CGEQP3( N,N, A, LDA, IWORK, CDUMMY,CDUMMY,
+     $                            -1,
      $                    RDUMMY, IERR )
-                     LWRK_CGEQP3N = REAL( CDUMMY(1) )
+                     LWRK_CGEQP3N = INT( CDUMMY(1) )
                      CALL CGESVJ( 'L', 'U', 'N', N, N, U, LDU, SVA,
      $                    N, V, LDV, CDUMMY, -1, RDUMMY, -1, IERR )
-                     LWRK_CGESVJ = REAL( CDUMMY(1) )
+                     LWRK_CGESVJ = INT( CDUMMY(1) )
                      CALL CGESVJ( 'U', 'U', 'N', N, N, U, LDU, SVA,
      $                    N, V, LDV, CDUMMY, -1, RDUMMY, -1, IERR )
-                     LWRK_CGESVJU = REAL( CDUMMY(1) )
+                     LWRK_CGESVJU = INT( CDUMMY(1) )
                      CALL CGESVJ( 'L', 'U', 'V', N, N, U, LDU, SVA,
      $                    N, V, LDV, CDUMMY, -1, RDUMMY, -1, IERR )
-                     LWRK_CGESVJV = REAL( CDUMMY(1) )
+                     LWRK_CGESVJV = INT( CDUMMY(1) )
                      CALL CUNMLQ( 'L', 'C', N, N, N, A, LDA, CDUMMY,
      $                    V, LDV, CDUMMY, -1, IERR )
-                     LWRK_CUNMLQ = REAL( CDUMMY(1) )
+                     LWRK_CUNMLQ = INT( CDUMMY(1) )
                      IF ( ERREST ) THEN 
                        OPTWRK = MAX( N+LWRK_CGEQP3, N+LWCON, 
      $                          2*N+N**2+LWCON, 2*N+LWRK_CGEQRF, 
@@ -909,13 +910,15 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                  ELSE
                      CALL CGESVJ( 'L', 'U', 'V', N, N, U, LDU, SVA,
      $                    N, V, LDV, CDUMMY, -1, RDUMMY, -1, IERR )
-                     LWRK_CGESVJV = REAL( CDUMMY(1) )
-                     CALL CUNMQR( 'L', 'N', N, N, N, CDUMMY, N, CDUMMY,
+                     LWRK_CGESVJV = INT( CDUMMY(1) )
+                     CALL CUNMQR( 'L', 'N', N, N, N, CDUMMY, N,
+     $                            CDUMMY,
      $                    V, LDV, CDUMMY, -1, IERR )
-                     LWRK_CUNMQR = REAL( CDUMMY(1) )
-                     CALL CUNMQR( 'L', 'N', M, N, N, A, LDA, CDUMMY, U,
+                     LWRK_CUNMQR = INT( CDUMMY(1) )
+                     CALL CUNMQR( 'L', 'N', M, N, N, A, LDA, CDUMMY,
+     $                            U,
      $                    LDU, CDUMMY, -1, IERR )
-                     LWRK_CUNMQRM = REAL( CDUMMY(1) )
+                     LWRK_CUNMQRM = INT( CDUMMY(1) )
                      IF ( ERREST ) THEN 
                         OPTWRK = MAX( N+LWRK_CGEQP3, N+LWCON,   
      $                           2*N+LWRK_CGEQRF, 2*N+N**2,  
@@ -946,9 +949,9 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
          CALL XERBLA( 'CGEJSV', - INFO )
          RETURN
       ELSE IF ( LQUERY ) THEN
-          CWORK(1) = OPTWRK
-          CWORK(2) = MINWRK
-          RWORK(1) = MINRWRK
+          CWORK(1) = CMPLX( OPTWRK )
+          CWORK(2) = CMPLX( MINWRK )
+          RWORK(1) = REAL( MINRWRK )
           IWORK(1) = MAX( 4, MINIWRK )
           RETURN   
       END IF
@@ -1061,8 +1064,10 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
             CALL CLACPY( 'A', M, 1, A, LDA, U, LDU )
 *           computing all M left singular vectors of the M x 1 matrix
             IF ( N1 .NE. N  ) THEN
-              CALL CGEQRF( M, N, U,LDU, CWORK, CWORK(N+1),LWORK-N,IERR )
-              CALL CUNGQR( M,N1,1, U,LDU,CWORK,CWORK(N+1),LWORK-N,IERR )
+              CALL CGEQRF( M, N, U,LDU, CWORK, CWORK(N+1),LWORK-N,
+     $                     IERR )
+              CALL CUNGQR( M,N1,1, U,LDU,CWORK,CWORK(N+1),LWORK-N,
+     $                     IERR )
               CALL CCOPY( M, A(1,1), 1, U(1,1), 1 )
             END IF
          END IF
@@ -1493,7 +1498,8 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *
 *            .. second preconditioning using the QR factorization
 *
-            CALL CGEQRF( N,NR, A,LDA, CWORK, CWORK(N+1),LWORK-N, IERR )
+            CALL CGEQRF( N,NR, A,LDA, CWORK, CWORK(N+1),LWORK-N,
+     $                   IERR )
 *
 *           .. and transpose upper to lower triangular
             DO 1948 p = 1, NR - 1
@@ -1520,7 +1526,8 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
  1949             CONTINUE
  1947          CONTINUE
             ELSE
-               CALL CLASET( 'U', NR-1, NR-1, CZERO, CZERO, A(1,2), LDA )
+               CALL CLASET( 'U', NR-1, NR-1, CZERO, CZERO, A(1,2),
+     $                      LDA )
             END IF
 *
 *           .. and one-sided Jacobi rotations are started on a lower
@@ -1560,7 +1567,8 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *        accumulated product of Jacobi rotations, three are perfect )
 *
             CALL CLASET( 'L', NR-1,NR-1, CZERO, CZERO, A(2,1), LDA )
-            CALL CGELQF( NR,N, A, LDA, CWORK, CWORK(N+1), LWORK-N, IERR)
+            CALL CGELQF( NR,N, A, LDA, CWORK, CWORK(N+1), LWORK-N,
+     $                   IERR)
             CALL CLACPY( 'L', NR, NR, A, LDA, V, LDV )
             CALL CLASET( 'U', NR-1,NR-1, CZERO, CZERO, V(1,2), LDV )
             CALL CGEQRF( NR, NR, V, LDV, CWORK(N+1), CWORK(2*N+1),
@@ -1576,9 +1584,12 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
             SCALEM  = RWORK(1)
             NUMRANK = NINT(RWORK(2))
             IF ( NR .LT. N ) THEN
-               CALL CLASET( 'A',N-NR, NR, CZERO,CZERO, V(NR+1,1),  LDV )
-               CALL CLASET( 'A',NR, N-NR, CZERO,CZERO, V(1,NR+1),  LDV )
-               CALL CLASET( 'A',N-NR,N-NR,CZERO,CONE, V(NR+1,NR+1),LDV )
+               CALL CLASET( 'A',N-NR, NR, CZERO,CZERO, V(NR+1,1),
+     $                      LDV )
+               CALL CLASET( 'A',NR, N-NR, CZERO,CZERO, V(1,NR+1),
+     $                      LDV )
+               CALL CLASET( 'A',N-NR,N-NR,CZERO,CONE, V(NR+1,NR+1),
+     $                      LDV )
             END IF
 *
          CALL CUNMLQ( 'L', 'C', N, N, NR, A, LDA, CWORK,
@@ -1633,10 +1644,13 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
          NUMRANK = NINT(RWORK(2))
 *
          IF ( NR .LT. M ) THEN
-            CALL CLASET( 'A',  M-NR, NR,CZERO, CZERO, U(NR+1,1), LDU )
+            CALL CLASET( 'A',  M-NR, NR,CZERO, CZERO, U(NR+1,1),
+     $                   LDU )
             IF ( NR .LT. N1 ) THEN
-               CALL CLASET( 'A',NR, N1-NR, CZERO, CZERO, U(1,NR+1),LDU )
-               CALL CLASET( 'A',M-NR,N1-NR,CZERO,CONE,U(NR+1,NR+1),LDU )
+               CALL CLASET( 'A',NR, N1-NR, CZERO, CZERO, U(1,NR+1),
+     $                      LDU )
+               CALL CLASET( 'A',M-NR,N1-NR,CZERO,CONE,U(NR+1,NR+1),
+     $                      LDU )
             END IF
          END IF
 *
@@ -1700,7 +1714,8 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
  2968             CONTINUE
  2969          CONTINUE
             ELSE
-               CALL CLASET( 'U', NR-1, NR-1, CZERO, CZERO, V(1,2), LDV )
+               CALL CLASET( 'U', NR-1, NR-1, CZERO, CZERO, V(1,2),
+     $                      LDV )
             END IF
 *
 *           Estimate the row scaled condition number of R1
@@ -1809,7 +1824,8 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                CALL CLACPY( 'L',NR,NR,V,LDV,CWORK(2*N+N*NR+NR+1),NR )
                DO 4950 p = 1, NR
                   TEMP1 = SCNRM2( p, CWORK(2*N+N*NR+NR+p), NR )
-                  CALL CSSCAL( p, ONE/TEMP1, CWORK(2*N+N*NR+NR+p), NR )
+                  CALL CSSCAL( p, ONE/TEMP1, CWORK(2*N+N*NR+NR+p),
+     $                         NR )
  4950          CONTINUE
                CALL CPOCON( 'L',NR,CWORK(2*N+N*NR+NR+1),NR,ONE,TEMP1,
      $              CWORK(2*N+N*NR+NR+NR*NR+1),RWORK,IERR )
@@ -1819,7 +1835,7 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                IF ( CONDR2 .GE. COND_OK ) THEN
 *                 .. save the Householder vectors used for Q3
 *                 (this overwrites the copy of R2, as it will not be
-*                 needed in this branch, but it does not overwritte the
+*                 needed in this branch, but it does not overwrite the
 *                 Huseholder vectors of Q2.).
                   CALL CLACPY( 'U', NR, NR, V, LDV, CWORK(2*N+1), N )
 *                 .. and the rest of the information on Q3 is in
@@ -1838,11 +1854,12 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
  4969             CONTINUE
  4968          CONTINUE
             ELSE
-               CALL CLASET( 'U', NR-1,NR-1, CZERO,CZERO, V(1,2), LDV )
+               CALL CLASET( 'U', NR-1,NR-1, CZERO,CZERO, V(1,2),
+     $                      LDV )
             END IF
 *
 *        Second preconditioning finished; continue with Jacobi SVD
-*        The input matrix is lower trinagular.
+*        The input matrix is lower triangular.
 *
 *        Recover the right singular vectors as solution of a well
 *        conditioned triangular matrix equation.
@@ -1866,7 +1883,8 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *                 equation is Q2*V2 = the product of the Jacobi rotations
 *                 used in CGESVJ, premultiplied with the orthogonal matrix
 *                 from the second QR factorization.
-                  CALL CTRSM('L','U','N','N', NR,NR,CONE, A,LDA, V,LDV)
+                  CALL CTRSM('L','U','N','N', NR,NR,CONE, A,LDA, V,
+     $                        LDV)
                ELSE
 *                 .. R1 is well conditioned, but non-square. Adjoint of R2
 *                 is inverted to get the product of the Jacobi rotations
@@ -1877,19 +1895,22 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                   IF ( NR .LT. N ) THEN
                   CALL CLASET('A',N-NR,NR,CZERO,CZERO,V(NR+1,1),LDV)
                   CALL CLASET('A',NR,N-NR,CZERO,CZERO,V(1,NR+1),LDV)
-                  CALL CLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),LDV)
+                  CALL CLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),
+     $                         LDV)
                   END IF
-                  CALL CUNMQR('L','N',N,N,NR,CWORK(2*N+1),N,CWORK(N+1),
+                  CALL CUNMQR('L','N',N,N,NR,CWORK(2*N+1),N,
+     $                         CWORK(N+1),
      $                V,LDV,CWORK(2*N+N*NR+NR+1),LWORK-2*N-N*NR-NR,IERR)
                END IF
 *
             ELSE IF ( CONDR2 .LT. COND_OK ) THEN
 *
 *              The matrix R2 is inverted. The solution of the matrix equation
-*              is Q3^* * V3 = the product of the Jacobi rotations (appplied to
+*              is Q3^* * V3 = the product of the Jacobi rotations (applied to
 *              the lower triangular L3 from the LQ factorization of
 *              R2=L3*Q3), pre-multiplied with the transposed Q3.
-               CALL CGESVJ( 'L', 'U', 'N', NR, NR, V, LDV, SVA, NR, U,
+               CALL CGESVJ( 'L', 'U', 'N', NR, NR, V, LDV, SVA, NR,
+     $                      U,
      $              LDU, CWORK(2*N+N*NR+NR+1), LWORK-2*N-N*NR-NR,
      $              RWORK, LRWORK, INFO )
                SCALEM  = RWORK(1)
@@ -1910,9 +1931,12 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
  874              CONTINUE
  873           CONTINUE
                IF ( NR .LT. N ) THEN
-                  CALL CLASET( 'A',N-NR,NR,CZERO,CZERO,V(NR+1,1),LDV )
-                  CALL CLASET( 'A',NR,N-NR,CZERO,CZERO,V(1,NR+1),LDV )
-                  CALL CLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),LDV)
+                  CALL CLASET( 'A',N-NR,NR,CZERO,CZERO,V(NR+1,1),
+     $                         LDV )
+                  CALL CLASET( 'A',NR,N-NR,CZERO,CZERO,V(1,NR+1),
+     $                         LDV )
+                  CALL CLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),
+     $                         LDV)
                END IF
                CALL CUNMQR( 'L','N',N,N,NR,CWORK(2*N+1),N,CWORK(N+1),
      $              V,LDV,CWORK(2*N+N*NR+NR+1),LWORK-2*N-N*NR-NR,IERR )
@@ -1928,15 +1952,19 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *              defense ensures that CGEJSV completes the task.
 *              Compute the full SVD of L3 using CGESVJ with explicit
 *              accumulation of Jacobi rotations.
-               CALL CGESVJ( 'L', 'U', 'V', NR, NR, V, LDV, SVA, NR, U,
+               CALL CGESVJ( 'L', 'U', 'V', NR, NR, V, LDV, SVA, NR,
+     $                      U,
      $              LDU, CWORK(2*N+N*NR+NR+1), LWORK-2*N-N*NR-NR,
      $                         RWORK, LRWORK, INFO )
                SCALEM  = RWORK(1)
                NUMRANK = NINT(RWORK(2))
                IF ( NR .LT. N ) THEN
-                  CALL CLASET( 'A',N-NR,NR,CZERO,CZERO,V(NR+1,1),LDV )
-                  CALL CLASET( 'A',NR,N-NR,CZERO,CZERO,V(1,NR+1),LDV )
-                  CALL CLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),LDV)
+                  CALL CLASET( 'A',N-NR,NR,CZERO,CZERO,V(NR+1,1),
+     $                         LDV )
+                  CALL CLASET( 'A',NR,N-NR,CZERO,CZERO,V(1,NR+1),
+     $                         LDV )
+                  CALL CLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),
+     $                         LDV)
                END IF
                CALL CUNMQR( 'L','N',N,N,NR,CWORK(2*N+1),N,CWORK(N+1),
      $              V,LDV,CWORK(2*N+N*NR+NR+1),LWORK-2*N-N*NR-NR,IERR )
@@ -1974,7 +2002,8 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *           At this moment, V contains the right singular vectors of A.
 *           Next, assemble the left singular vector matrix U (M x N).
             IF ( NR .LT. M ) THEN
-               CALL CLASET('A', M-NR, NR, CZERO, CZERO, U(NR+1,1), LDU)
+               CALL CLASET('A', M-NR, NR, CZERO, CZERO, U(NR+1,1),
+     $                      LDU)
                IF ( NR .LT. N1 ) THEN
                   CALL CLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),LDU)
                   CALL CLASET('A',M-NR,N1-NR,CZERO,CONE,
@@ -2048,10 +2077,13 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *           Assemble the left singular vector matrix U (M x N).
 *
             IF ( N .LT. M ) THEN
-               CALL CLASET( 'A',  M-N, N, CZERO, CZERO, U(N+1,1), LDU )
+               CALL CLASET( 'A',  M-N, N, CZERO, CZERO, U(N+1,1),
+     $                      LDU )
                IF ( N .LT. N1 ) THEN
-                  CALL CLASET('A',N,  N1-N, CZERO, CZERO,  U(1,N+1),LDU)
-                  CALL CLASET( 'A',M-N,N1-N, CZERO, CONE,U(N+1,N+1),LDU)
+                  CALL CLASET('A',N,  N1-N, CZERO, CZERO,  U(1,N+1),
+     $                         LDU)
+                  CALL CLASET( 'A',M-N,N1-N, CZERO, CONE,U(N+1,N+1),
+     $                         LDU)
                END IF
             END IF
             CALL CUNMQR( 'L', 'N', M, N1, N, A, LDA, CWORK, U,
@@ -2163,10 +2195,13 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *           Next, assemble the left singular vector matrix U (M x N).
 *
          IF ( NR .LT. M ) THEN
-            CALL CLASET( 'A',  M-NR, NR, CZERO, CZERO, U(NR+1,1), LDU )
+            CALL CLASET( 'A',  M-NR, NR, CZERO, CZERO, U(NR+1,1),
+     $                   LDU )
             IF ( NR .LT. N1 ) THEN
-               CALL CLASET('A',NR,  N1-NR, CZERO, CZERO,  U(1,NR+1),LDU)
-               CALL CLASET('A',M-NR,N1-NR, CZERO, CONE,U(NR+1,NR+1),LDU)
+               CALL CLASET('A',NR,  N1-NR, CZERO, CZERO,  U(1,NR+1),
+     $                      LDU)
+               CALL CLASET('A',M-NR,N1-NR, CZERO, CONE,U(NR+1,NR+1),
+     $                      LDU)
             END IF
          END IF
 *
@@ -2191,7 +2226,8 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *     Undo scaling, if necessary (and possible)
 *
       IF ( USCAL2 .LE. (BIG/SVA(1))*USCAL1 ) THEN
-         CALL SLASCL( 'G', 0, 0, USCAL1, USCAL2, NR, 1, SVA, N, IERR )
+         CALL SLASCL( 'G', 0, 0, USCAL1, USCAL2, NR, 1, SVA, N,
+     $                IERR )
          USCAL1 = ONE
          USCAL2 = ONE
       END IF
diff --git a/SRC/cgelq.f b/SRC/cgelq.f
index d66033166d..5a92164b7e 100644
--- a/SRC/cgelq.f
+++ b/SRC/cgelq.f
@@ -98,7 +98,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1 or -2, then a workspace query is assumed. The routine
 *>          only calculates the sizes of the T and WORK arrays, returns these
 *>          values as the first entries of the T and WORK arrays, and no error
@@ -166,9 +166,12 @@
 *>  the LQ factorization.
 *> \endverbatim
 *>
+*> \ingroup gelq
+*>
 *  =====================================================================
       SUBROUTINE CGELQ( M, N, A, LDA, T, TSIZE, WORK, LWORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,7 +193,8 @@ SUBROUTINE CGELQ( M, N, A, LDA, T, TSIZE, WORK, LWORK,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CGELQT, CLASWLQ, XERBLA
@@ -285,16 +289,16 @@ SUBROUTINE CGELQ( M, N, A, LDA, T, TSIZE, WORK, LWORK,
 *
       IF( INFO.EQ.0 ) THEN
         IF( MINT ) THEN
-          T( 1 ) = MINTSZ
+          T( 1 ) = CMPLX( MINTSZ )
         ELSE
-          T( 1 ) = MB*M*NBLCKS + 5
+          T( 1 ) = CMPLX( MB*M*NBLCKS + 5 )
         END IF
-        T( 2 ) = MB
-        T( 3 ) = NB
+        T( 2 ) = CMPLX( MB )
+        T( 3 ) = CMPLX( NB )
         IF( MINW ) THEN
-          WORK( 1 ) = LWMIN
+          WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
         ELSE
-          WORK( 1 ) = LWREQ
+          WORK( 1 ) = SROUNDUP_LWORK( LWREQ )
         END IF
       END IF
       IF( INFO.NE.0 ) THEN
@@ -319,7 +323,7 @@ SUBROUTINE CGELQ( M, N, A, LDA, T, TSIZE, WORK, LWORK,
      $                LWORK, INFO )
       END IF
 *
-      WORK( 1 ) = LWREQ
+      WORK( 1 ) = SROUNDUP_LWORK( LWREQ )
 *
       RETURN
 *
diff --git a/SRC/cgelq2.f b/SRC/cgelq2.f
index 0ea4a7200f..97bc676b17 100644
--- a/SRC/cgelq2.f
+++ b/SRC/cgelq2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGELQ2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgelq2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgelq2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -104,7 +102,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup gelq2
 *
 *> \par Further Details:
 *  =====================
@@ -126,6 +124,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGELQ2( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -140,16 +139,11 @@ SUBROUTINE CGELQ2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      COMPLEX            ONE
-      PARAMETER          ( ONE = ( 1.0E+0, 0.0E+0 ) )
-*     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      COMPLEX            ALPHA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLACGV, CLARF, CLARFG, XERBLA
+      EXTERNAL           CLACGV, CLARF1F, CLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -178,18 +172,15 @@ SUBROUTINE CGELQ2( M, N, A, LDA, TAU, WORK, INFO )
 *        Generate elementary reflector H(i) to annihilate A(i,i+1:n)
 *
          CALL CLACGV( N-I+1, A( I, I ), LDA )
-         ALPHA = A( I, I )
-         CALL CLARFG( N-I+1, ALPHA, A( I, MIN( I+1, N ) ), LDA,
+         CALL CLARFG( N-I+1, A( I, I ), A( I, MIN( I+1, N ) ), LDA,
      $                TAU( I ) )
          IF( I.LT.M ) THEN
 *
 *           Apply H(i) to A(i+1:m,i:n) from the right
 *
-            A( I, I ) = ONE
-            CALL CLARF( 'Right', M-I, N-I+1, A( I, I ), LDA, TAU( I ),
-     $                  A( I+1, I ), LDA, WORK )
+            CALL CLARF1F( 'Right', M-I, N-I+1, A( I, I ), LDA,
+     $                    TAU( I ), A( I+1, I ), LDA, WORK )
          END IF
-         A( I, I ) = ALPHA
          CALL CLACGV( N-I+1, A( I, I ), LDA )
    10 CONTINUE
       RETURN
diff --git a/SRC/cgelqf.f b/SRC/cgelqf.f
index 37ef13a276..0bbc534f7c 100644
--- a/SRC/cgelqf.f
+++ b/SRC/cgelqf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGELQF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgelqf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgelqf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -93,7 +91,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,M).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= M, otherwise.
 *>          For optimum performance LWORK >= M*NB, where NB is the
 *>          optimal blocksize.
 *>
@@ -118,7 +117,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup gelqf
 *
 *> \par Further Details:
 *  =====================
@@ -140,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -167,16 +167,16 @@ SUBROUTINE CGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input arguments
 *
       INFO = 0
+      K = MIN( M, N )
       NB = ILAENV( 1, 'CGELQF', ' ', M, N, -1, -1 )
-      LWKOPT = M*NB
-      WORK( 1 ) = LWKOPT
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -184,19 +184,25 @@ SUBROUTINE CGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, M ) .AND. .NOT.LQUERY ) THEN
-         INFO = -7
+      ELSE IF( .NOT.LQUERY ) THEN
+         IF( LWORK.LE.0 .OR. ( N.GT.0 .AND. LWORK.LT.MAX( 1, M ) ) )
+     $      INFO = -7
       END IF
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'CGELQF', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
+         IF( K.EQ.0 ) THEN
+            LWKOPT = 1
+         ELSE
+            LWKOPT = M*NB
+         END IF
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      K = MIN( M, N )
       IF( K.EQ.0 ) THEN
          WORK( 1 ) = 1
          RETURN
@@ -245,7 +251,8 @@ SUBROUTINE CGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *              Form the triangular factor of the block reflector
 *              H = H(i) H(i+1) . . . H(i+ib-1)
 *
-               CALL CLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I, I ),
+               CALL CLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I,
+     $                      I ),
      $                      LDA, TAU( I ), WORK, LDWORK )
 *
 *              Apply H to A(i+ib:m,i:n) from the right
@@ -266,7 +273,7 @@ SUBROUTINE CGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
      $   CALL CGELQ2( M-I+1, N-I+1, A( I, I ), LDA, TAU( I ), WORK,
      $                IINFO )
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK( IWS )
       RETURN
 *
 *     End of CGELQF
diff --git a/SRC/cgelqt.f b/SRC/cgelqt.f
index 3a66dc0cab..1e2cc235ae 100644
--- a/SRC/cgelqt.f
+++ b/SRC/cgelqt.f
@@ -40,7 +40,7 @@
 *> \param[in] MB
 *> \verbatim
 *>          MB is INTEGER
-*>          The block size to be used in the blocked QR.  MIN(M,N) >= MB >= 1.
+*>          The block size to be used in the blocked LQ.  MIN(M,N) >= MB >= 1.
 *> \endverbatim
 *>
 *> \param[in,out] A
@@ -75,7 +75,10 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX array, dimension (MB*N)
+*>          WORK is COMPLEX array, dimension (MB*M).
+*>          Note: A smaller workspace of MB*(M-MB) may also be sufficient, but
+*>          that is yet to be proven. MB*M is a conservative estimate and the
+*>          recommended value to use.
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -93,7 +96,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gelqt
 *
 *> \par Further Details:
 *  =====================
@@ -101,7 +104,7 @@
 *> \verbatim
 *>
 *>  The matrix V stores the elementary reflectors H(i) in the i-th row
-*>  above the diagonal. For example, if M=5 and N=3, the matrix V is
+*>  above the diagonal. For example, if M=3 and N=5, the matrix V is
 *>
 *>               V = (  1  v1 v1 v1 v1 )
 *>                   (     1  v2 v2 v2 )
@@ -121,6 +124,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGELQT( M, N, MB, A, LDA, T, LDT, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cgelqt3.f b/SRC/cgelqt3.f
index 1dfbd3f2b1..c8c69202a4 100644
--- a/SRC/cgelqt3.f
+++ b/SRC/cgelqt3.f
@@ -85,7 +85,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gelqt3
 *
 *> \par Further Details:
 *  =====================
@@ -113,6 +113,7 @@
 *>
 *  =====================================================================
       RECURSIVE SUBROUTINE CGELQT3( M, N, A, LDA, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -159,7 +160,8 @@ RECURSIVE SUBROUTINE CGELQT3( M, N, A, LDA, T, LDT, INFO )
 *
 *        Compute Householder transform when M=1
 *
-         CALL CLARFG( N, A, A( 1, MIN( 2, N ) ), LDA, T )
+         CALL CLARFG( N, A( 1, 1 ), A( 1, MIN( 2, N ) ), LDA,
+     &                T( 1, 1 ) )
          T(1,1)=CONJG(T(1,1))
 *
       ELSE
diff --git a/SRC/cgels.f b/SRC/cgels.f
index fd98873406..39d94946c2 100644
--- a/SRC/cgels.f
+++ b/SRC/cgels.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGELS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgels.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgels.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,17 @@
 *>
 *> CGELS solves overdetermined or underdetermined complex linear systems
 *> involving an M-by-N matrix A, or its conjugate-transpose, using a QR
-*> or LQ factorization of A.  It is assumed that A has full rank.
+*> or LQ factorization of A.
+*>
+*> It is assumed that A has full rank, and only a rudimentary protection
+*> against rank-deficient matrices is provided. This subroutine only detects
+*> exact rank-deficiency, where a diagonal element of the triangular factor
+*> of A is exactly zero.
+*>
+*> It is conceivable for one (or more) of the diagonal elements of the triangular
+*> factor of A to be subnormally tiny numbers without this subroutine signalling
+*> an error. The solutions computed for such almost-rank-deficient matrices may
+*> be less accurate due to a loss of numerical precision.
 *>
 *> The following options are provided:
 *>
@@ -161,7 +169,7 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO =  i, the i-th diagonal element of the
-*>                triangular factor of A is zero, so that A does not have
+*>                triangular factor of A is exactly zero, so that A does not have
 *>                full rank; the least squares solution could not be
 *>                computed.
 *> \endverbatim
@@ -174,11 +182,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEsolve
+*> \ingroup gels
 *
 *  =====================================================================
-      SUBROUTINE CGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
+      SUBROUTINE CGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK,
+     $                  LWORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -215,8 +225,9 @@ SUBROUTINE CGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
       EXTERNAL           LSAME, ILAENV, CLANGE, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGELQF, CGEQRF, CLASCL, CLASET, CTRTRS, CUNMLQ,
-     $                   CUNMQR, SLABAD, XERBLA
+      EXTERNAL           CGELQF, CGEQRF, CLASCL, CLASET, CTRTRS,
+     $                   CUNMLQ,
+     $                   CUNMQR, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN, REAL
@@ -228,7 +239,8 @@ SUBROUTINE CGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
       INFO = 0
       MN = MIN( M, N )
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.( LSAME( TRANS, 'N' ) .OR. LSAME( TRANS, 'C' ) ) ) THEN
+      IF( .NOT.( LSAME( TRANS, 'N' ) .OR.
+     $    LSAME( TRANS, 'C' ) ) ) THEN
          INFO = -1
       ELSE IF( M.LT.0 ) THEN
          INFO = -2
@@ -288,7 +300,8 @@ SUBROUTINE CGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *     Quick return if possible
 *
       IF( MIN( M, N, NRHS ).EQ.0 ) THEN
-         CALL CLASET( 'Full', MAX( M, N ), NRHS, CZERO, CZERO, B, LDB )
+         CALL CLASET( 'Full', MAX( M, N ), NRHS, CZERO, CZERO, B,
+     $                LDB )
          RETURN
       END IF
 *
@@ -296,7 +309,6 @@ SUBROUTINE CGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
       SMLNUM = SLAMCH( 'S' ) / SLAMCH( 'P' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A, B if max element outside range [SMLNUM,BIGNUM]
 *
@@ -347,7 +359,8 @@ SUBROUTINE CGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *        compute QR factorization of A
 *
-         CALL CGEQRF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ), LWORK-MN,
+         CALL CGEQRF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ),
+     $                LWORK-MN,
      $                INFO )
 *
 *        workspace at least N, optimally N*NB
@@ -358,7 +371,8 @@ SUBROUTINE CGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *           B(1:M,1:NRHS) := Q**H * B(1:M,1:NRHS)
 *
-            CALL CUNMQR( 'Left', 'Conjugate transpose', M, NRHS, N, A,
+            CALL CUNMQR( 'Left', 'Conjugate transpose', M, NRHS, N,
+     $                   A,
      $                   LDA, WORK( 1 ), B, LDB, WORK( MN+1 ), LWORK-MN,
      $                   INFO )
 *
@@ -366,7 +380,8 @@ SUBROUTINE CGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *           B(1:N,1:NRHS) := inv(R) * B(1:N,1:NRHS)
 *
-            CALL CTRTRS( 'Upper', 'No transpose', 'Non-unit', N, NRHS,
+            CALL CTRTRS( 'Upper', 'No transpose', 'Non-unit', N,
+     $                   NRHS,
      $                   A, LDA, B, LDB, INFO )
 *
             IF( INFO.GT.0 ) THEN
@@ -412,7 +427,8 @@ SUBROUTINE CGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *        Compute LQ factorization of A
 *
-         CALL CGELQF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ), LWORK-MN,
+         CALL CGELQF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ),
+     $                LWORK-MN,
      $                INFO )
 *
 *        workspace at least M, optimally M*NB.
@@ -423,7 +439,8 @@ SUBROUTINE CGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *           B(1:M,1:NRHS) := inv(L) * B(1:M,1:NRHS)
 *
-            CALL CTRTRS( 'Lower', 'No transpose', 'Non-unit', M, NRHS,
+            CALL CTRTRS( 'Lower', 'No transpose', 'Non-unit', M,
+     $                   NRHS,
      $                   A, LDA, B, LDB, INFO )
 *
             IF( INFO.GT.0 ) THEN
@@ -440,7 +457,8 @@ SUBROUTINE CGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *           B(1:N,1:NRHS) := Q(1:N,:)**H * B(1:M,1:NRHS)
 *
-            CALL CUNMLQ( 'Left', 'Conjugate transpose', N, NRHS, M, A,
+            CALL CUNMLQ( 'Left', 'Conjugate transpose', N, NRHS, M,
+     $                   A,
      $                   LDA, WORK( 1 ), B, LDB, WORK( MN+1 ), LWORK-MN,
      $                   INFO )
 *
diff --git a/SRC/cgelsd.f b/SRC/cgelsd.f
index fce4ca6e29..11ab07ac26 100644
--- a/SRC/cgelsd.f
+++ b/SRC/cgelsd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGELSD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgelsd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgelsd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -60,12 +58,6 @@
 *> singular values which are less than RCOND times the largest singular
 *> value.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -210,7 +202,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEsolve
+*> \ingroup gelsd
 *
 *> \par Contributors:
 *  ==================
@@ -222,6 +214,7 @@
 *  =====================================================================
       SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
      $                   WORK, LWORK, RWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -255,13 +248,14 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *     .. External Subroutines ..
       EXTERNAL           CGEBRD, CGELQF, CGEQRF, CLACPY,
      $                   CLALSD, CLASCL, CLASET, CUNMBR,
-     $                   CUNMLQ, CUNMQR, SLABAD, SLASCL,
+     $                   CUNMLQ, CUNMQR, SLASCL,
      $                   SLASET, XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      REAL               CLANGE, SLAMCH
-      EXTERNAL           CLANGE, SLAMCH, ILAENV
+      REAL               CLANGE, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           CLANGE, SLAMCH, ILAENV,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          INT, LOG, MAX, MIN, REAL
@@ -311,9 +305,11 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *                        columns.
 *
                MM = N
-               MAXWRK = MAX( MAXWRK, N*ILAENV( 1, 'CGEQRF', ' ', M, N,
+               MAXWRK = MAX( MAXWRK, N*ILAENV( 1, 'CGEQRF', ' ', M,
+     $                       N,
      $                       -1, -1 ) )
-               MAXWRK = MAX( MAXWRK, NRHS*ILAENV( 1, 'CUNMQR', 'LC', M,
+               MAXWRK = MAX( MAXWRK, NRHS*ILAENV( 1, 'CUNMQR', 'LC',
+     $                       M,
      $                       NRHS, N, -1 ) )
             END IF
             IF( M.GE.N ) THEN
@@ -345,7 +341,8 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
      $                          'CGEBRD', ' ', M, M, -1, -1 ) )
                   MAXWRK = MAX( MAXWRK, M*M + 4*M + NRHS*ILAENV( 1,
      $                          'CUNMBR', 'QLC', M, NRHS, M, -1 ) )
-                  MAXWRK = MAX( MAXWRK, M*M + 4*M + ( M - 1 )*ILAENV( 1,
+                  MAXWRK = MAX( MAXWRK,
+     $                          M*M + 4*M + ( M - 1 )*ILAENV( 1,
      $                          'CUNMLQ', 'LC', N, NRHS, M, -1 ) )
                   IF( NRHS.GT.1 ) THEN
                      MAXWRK = MAX( MAXWRK, M*M + M + M*NRHS )
@@ -361,9 +358,11 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *                 Path 2 - underdetermined.
 *
-                  MAXWRK = 2*M + ( N + M )*ILAENV( 1, 'CGEBRD', ' ', M,
+                  MAXWRK = 2*M + ( N + M )*ILAENV( 1, 'CGEBRD', ' ',
+     $                             M,
      $                     N, -1, -1 )
-                  MAXWRK = MAX( MAXWRK, 2*M + NRHS*ILAENV( 1, 'CUNMBR',
+                  MAXWRK = MAX( MAXWRK, 2*M + NRHS*ILAENV( 1,
+     $                          'CUNMBR',
      $                          'QLC', M, NRHS, M, -1 ) )
                   MAXWRK = MAX( MAXWRK, 2*M + M*ILAENV( 1, 'CUNMBR',
      $                          'PLN', N, NRHS, M, -1 ) )
@@ -373,9 +372,9 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
             END IF
          END IF
          MINWRK = MIN( MINWRK, MAXWRK )
-         WORK( 1 ) = MAXWRK
+         WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
          IWORK( 1 ) = LIWORK
-         RWORK( 1 ) = LRWORK
+         RWORK( 1 ) = REAL( LRWORK )
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
             INFO = -12
@@ -402,7 +401,6 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
       SFMIN = SLAMCH( 'S' )
       SMLNUM = SFMIN / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A if max entry outside range [SMLNUM,BIGNUM].
 *
@@ -438,20 +436,23 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *        Scale matrix norm up to SMLNUM.
 *
-         CALL CLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 1
       ELSE IF( BNRM.GT.BIGNUM ) THEN
 *
 *        Scale matrix norm down to BIGNUM.
 *
-         CALL CLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 2
       END IF
 *
 *     If M < N make sure B(M+1:N,:) = 0
 *
       IF( M.LT.N )
-     $   CALL CLASET( 'F', N-M, NRHS, CZERO, CZERO, B( M+1, 1 ), LDB )
+     $   CALL CLASET( 'F', N-M, NRHS, CZERO, CZERO, B( M+1, 1 ),
+     $                LDB )
 *
 *     Overdetermined case.
 *
@@ -479,7 +480,8 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *           (RWorkspace: need N)
 *           (CWorkspace: need NRHS, prefer NRHS*NB)
 *
-            CALL CUNMQR( 'L', 'C', M, NRHS, N, A, LDA, WORK( ITAU ), B,
+            CALL CUNMQR( 'L', 'C', M, NRHS, N, A, LDA, WORK( ITAU ),
+     $                   B,
      $                   LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
 *           Zero out below R.
@@ -507,7 +509,8 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        Multiply B by transpose of left bidiagonalizing vectors of R.
 *        (CWorkspace: need 2*N+NRHS, prefer 2*N+NRHS*NB)
 *
-         CALL CUNMBR( 'Q', 'L', 'C', MM, NRHS, N, A, LDA, WORK( ITAUQ ),
+         CALL CUNMBR( 'Q', 'L', 'C', MM, NRHS, N, A, LDA,
+     $                WORK( ITAUQ ),
      $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
 *        Solve the bidiagonal least squares problem.
@@ -521,7 +524,8 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *        Multiply B by right bidiagonalizing vectors of R.
 *
-         CALL CUNMBR( 'P', 'L', 'N', N, NRHS, N, A, LDA, WORK( ITAUP ),
+         CALL CUNMBR( 'P', 'L', 'N', N, NRHS, N, A, LDA,
+     $                WORK( ITAUP ),
      $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
       ELSE IF( N.GE.MNTHR .AND. LWORK.GE.4*M+M*M+
@@ -586,7 +590,8 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *        Zero out below first M rows of B.
 *
-         CALL CLASET( 'F', N-M, NRHS, CZERO, CZERO, B( M+1, 1 ), LDB )
+         CALL CLASET( 'F', N-M, NRHS, CZERO, CZERO, B( M+1, 1 ),
+     $                LDB )
          NWORK = ITAU + M
 *
 *        Multiply transpose(Q) by B.
@@ -616,7 +621,8 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        Multiply B by transpose of left bidiagonalizing vectors.
 *        (CWorkspace: need 2*M+NRHS, prefer 2*M+NRHS*NB)
 *
-         CALL CUNMBR( 'Q', 'L', 'C', M, NRHS, N, A, LDA, WORK( ITAUQ ),
+         CALL CUNMBR( 'Q', 'L', 'C', M, NRHS, N, A, LDA,
+     $                WORK( ITAUQ ),
      $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
 *        Solve the bidiagonal least squares problem.
@@ -630,7 +636,8 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *        Multiply B by right bidiagonalizing vectors of A.
 *
-         CALL CUNMBR( 'P', 'L', 'N', N, NRHS, M, A, LDA, WORK( ITAUP ),
+         CALL CUNMBR( 'P', 'L', 'N', N, NRHS, M, A, LDA,
+     $                WORK( ITAUP ),
      $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
       END IF
@@ -638,24 +645,28 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *     Undo scaling.
 *
       IF( IASCL.EQ.1 ) THEN
-         CALL CLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL SLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN, 1, S, MINMN,
      $                INFO )
       ELSE IF( IASCL.EQ.2 ) THEN
-         CALL CLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL SLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN, 1, S, MINMN,
      $                INFO )
       END IF
       IF( IBSCL.EQ.1 ) THEN
-         CALL CLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL CLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       END IF
 *
    10 CONTINUE
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
       IWORK( 1 ) = LIWORK
-      RWORK( 1 ) = LRWORK
+      RWORK( 1 ) = REAL( LRWORK )
       RETURN
 *
 *     End of CGELSD
diff --git a/SRC/cgelss.f b/SRC/cgelss.f
index 04defbb2e4..fbadfa09e5 100644
--- a/SRC/cgelss.f
+++ b/SRC/cgelss.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGELSS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgelss.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgelss.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -170,11 +168,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEsolve
+*> \ingroup gelss
 *
 *  =====================================================================
       SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
      $                   WORK, LWORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -212,15 +211,16 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
       COMPLEX            DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CBDSQR, CCOPY, CGEBRD, CGELQF, CGEMM, CGEMV,
+      EXTERNAL           CBDSQR, CCOPY, CGEBRD, CGELQF, CGEMM,
+     $                   CGEMV,
      $                   CGEQRF, CLACPY, CLASCL, CLASET, CSRSCL, CUNGBR,
-     $                   CUNMBR, CUNMLQ, CUNMQR, SLABAD, SLASCL, SLASET,
-     $                   XERBLA
+     $                   CUNMBR, CUNMLQ, CUNMQR, SLASCL, SLASET, XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      REAL               CLANGE, SLAMCH
-      EXTERNAL           ILAENV, CLANGE, SLAMCH
+      REAL               CLANGE, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           ILAENV, CLANGE, SLAMCH,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -266,15 +266,17 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *              Compute space needed for CGEQRF
                CALL CGEQRF( M, N, A, LDA, DUM(1), DUM(1), -1, INFO )
-               LWORK_CGEQRF = REAL( DUM(1) )
+               LWORK_CGEQRF = INT( DUM(1) )
 *              Compute space needed for CUNMQR
                CALL CUNMQR( 'L', 'C', M, NRHS, N, A, LDA, DUM(1), B,
      $                   LDB, DUM(1), -1, INFO )
-               LWORK_CUNMQR = REAL( DUM(1) )
+               LWORK_CUNMQR = INT( DUM(1) )
                MM = N
-               MAXWRK = MAX( MAXWRK, N + N*ILAENV( 1, 'CGEQRF', ' ', M,
+               MAXWRK = MAX( MAXWRK, N + N*ILAENV( 1, 'CGEQRF', ' ',
+     $                       M,
      $                       N, -1, -1 ) )
-               MAXWRK = MAX( MAXWRK, N + NRHS*ILAENV( 1, 'CUNMQR', 'LC',
+               MAXWRK = MAX( MAXWRK, N + NRHS*ILAENV( 1, 'CUNMQR',
+     $                       'LC',
      $                       M, NRHS, N, -1 ) )
             END IF
             IF( M.GE.N ) THEN
@@ -282,17 +284,19 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *              Path 1 - overdetermined or exactly determined
 *
 *              Compute space needed for CGEBRD
-               CALL CGEBRD( MM, N, A, LDA, S, S, DUM(1), DUM(1), DUM(1),
+               CALL CGEBRD( MM, N, A, LDA, S, S, DUM(1), DUM(1),
+     $                      DUM(1),
      $                      -1, INFO )
-               LWORK_CGEBRD = REAL( DUM(1) )
+               LWORK_CGEBRD = INT( DUM(1) )
 *              Compute space needed for CUNMBR
-               CALL CUNMBR( 'Q', 'L', 'C', MM, NRHS, N, A, LDA, DUM(1),
+               CALL CUNMBR( 'Q', 'L', 'C', MM, NRHS, N, A, LDA,
+     $                      DUM(1),
      $                B, LDB, DUM(1), -1, INFO )
-               LWORK_CUNMBR = REAL( DUM(1) )
+               LWORK_CUNMBR = INT( DUM(1) )
 *              Compute space needed for CUNGBR
                CALL CUNGBR( 'P', N, N, N, A, LDA, DUM(1),
      $                   DUM(1), -1, INFO )
-               LWORK_CUNGBR = REAL( DUM(1) )
+               LWORK_CUNGBR = INT( DUM(1) )
 *              Compute total workspace needed
                MAXWRK = MAX( MAXWRK, 2*N + LWORK_CGEBRD )
                MAXWRK = MAX( MAXWRK, 2*N + LWORK_CUNMBR )
@@ -310,23 +314,23 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *                 Compute space needed for CGELQF
                   CALL CGELQF( M, N, A, LDA, DUM(1), DUM(1),
      $                -1, INFO )
-                  LWORK_CGELQF = REAL( DUM(1) )
+                  LWORK_CGELQF = INT( DUM(1) )
 *                 Compute space needed for CGEBRD
                   CALL CGEBRD( M, M, A, LDA, S, S, DUM(1), DUM(1),
      $                         DUM(1), -1, INFO )
-                  LWORK_CGEBRD = REAL( DUM(1) )
+                  LWORK_CGEBRD = INT( DUM(1) )
 *                 Compute space needed for CUNMBR
                   CALL CUNMBR( 'Q', 'L', 'C', M, NRHS, N, A, LDA,
      $                DUM(1), B, LDB, DUM(1), -1, INFO )
-                  LWORK_CUNMBR = REAL( DUM(1) )
+                  LWORK_CUNMBR = INT( DUM(1) )
 *                 Compute space needed for CUNGBR
                   CALL CUNGBR( 'P', M, M, M, A, LDA, DUM(1),
      $                   DUM(1), -1, INFO )
-                  LWORK_CUNGBR = REAL( DUM(1) )
+                  LWORK_CUNGBR = INT( DUM(1) )
 *                 Compute space needed for CUNMLQ
                   CALL CUNMLQ( 'L', 'C', N, NRHS, M, A, LDA, DUM(1),
      $                 B, LDB, DUM(1), -1, INFO )
-                  LWORK_CUNMLQ = REAL( DUM(1) )
+                  LWORK_CUNMLQ = INT( DUM(1) )
 *                 Compute total workspace needed
                   MAXWRK = M + LWORK_CGELQF
                   MAXWRK = MAX( MAXWRK, 3*M + M*M + LWORK_CGEBRD )
@@ -345,15 +349,15 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *                 Compute space needed for CGEBRD
                   CALL CGEBRD( M, N, A, LDA, S, S, DUM(1), DUM(1),
      $                         DUM(1), -1, INFO )
-                  LWORK_CGEBRD = REAL( DUM(1) )
+                  LWORK_CGEBRD = INT( DUM(1) )
 *                 Compute space needed for CUNMBR
                   CALL CUNMBR( 'Q', 'L', 'C', M, NRHS, M, A, LDA,
      $                DUM(1), B, LDB, DUM(1), -1, INFO )
-                  LWORK_CUNMBR = REAL( DUM(1) )
+                  LWORK_CUNMBR = INT( DUM(1) )
 *                 Compute space needed for CUNGBR
                   CALL CUNGBR( 'P', M, N, M, A, LDA, DUM(1),
      $                   DUM(1), -1, INFO )
-                  LWORK_CUNGBR = REAL( DUM(1) )
+                  LWORK_CUNGBR = INT( DUM(1) )
                   MAXWRK = 2*M + LWORK_CGEBRD
                   MAXWRK = MAX( MAXWRK, 2*M + LWORK_CUNMBR )
                   MAXWRK = MAX( MAXWRK, 2*M + LWORK_CUNGBR )
@@ -362,7 +366,7 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
             END IF
             MAXWRK = MAX( MINWRK, MAXWRK )
          END IF
-         WORK( 1 ) = MAXWRK
+         WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY )
      $      INFO = -12
@@ -388,7 +392,6 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
       SFMIN = SLAMCH( 'S' )
       SMLNUM = SFMIN / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A if max element outside range [SMLNUM,BIGNUM]
 *
@@ -424,13 +427,15 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *        Scale matrix norm up to SMLNUM
 *
-         CALL CLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 1
       ELSE IF( BNRM.GT.BIGNUM ) THEN
 *
 *        Scale matrix norm down to BIGNUM
 *
-         CALL CLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 2
       END IF
 *
@@ -460,7 +465,8 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *           (CWorkspace: need N+NRHS, prefer N+NRHS*NB)
 *           (RWorkspace: none)
 *
-            CALL CUNMQR( 'L', 'C', M, NRHS, N, A, LDA, WORK( ITAU ), B,
+            CALL CUNMQR( 'L', 'C', M, NRHS, N, A, LDA, WORK( ITAU ),
+     $                   B,
      $                   LDB, WORK( IWORK ), LWORK-IWORK+1, INFO )
 *
 *           Zero out below R
@@ -487,7 +493,8 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (CWorkspace: need 2*N+NRHS, prefer 2*N+NRHS*NB)
 *        (RWorkspace: none)
 *
-         CALL CUNMBR( 'Q', 'L', 'C', MM, NRHS, N, A, LDA, WORK( ITAUQ ),
+         CALL CUNMBR( 'Q', 'L', 'C', MM, NRHS, N, A, LDA,
+     $                WORK( ITAUQ ),
      $                B, LDB, WORK( IWORK ), LWORK-IWORK+1, INFO )
 *
 *        Generate right bidiagonalizing vectors of R in A
@@ -504,7 +511,8 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (CWorkspace: none)
 *        (RWorkspace: need BDSPAC)
 *
-         CALL CBDSQR( 'U', N, N, 0, NRHS, S, RWORK( IE ), A, LDA, DUM,
+         CALL CBDSQR( 'U', N, N, 0, NRHS, S, RWORK( IE ), A, LDA,
+     $                DUM,
      $                1, B, LDB, RWORK( IRWORK ), INFO )
          IF( INFO.NE.0 )
      $      GO TO 70
@@ -520,7 +528,8 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
                CALL CSRSCL( NRHS, S( I ), B( I, 1 ), LDB )
                RANK = RANK + 1
             ELSE
-               CALL CLASET( 'F', 1, NRHS, CZERO, CZERO, B( I, 1 ), LDB )
+               CALL CLASET( 'F', 1, NRHS, CZERO, CZERO, B( I, 1 ),
+     $                      LDB )
             END IF
    10    CONTINUE
 *
@@ -536,12 +545,14 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
             CHUNK = LWORK / N
             DO 20 I = 1, NRHS, CHUNK
                BL = MIN( NRHS-I+1, CHUNK )
-               CALL CGEMM( 'C', 'N', N, BL, N, CONE, A, LDA, B( 1, I ),
+               CALL CGEMM( 'C', 'N', N, BL, N, CONE, A, LDA, B( 1,
+     $                     I ),
      $                     LDB, CZERO, WORK, N )
                CALL CLACPY( 'G', N, BL, WORK, N, B( 1, I ), LDB )
    20       CONTINUE
-         ELSE
-            CALL CGEMV( 'C', N, N, CONE, A, LDA, B, 1, CZERO, WORK, 1 )
+         ELSE IF( NRHS.EQ.1 ) THEN
+            CALL CGEMV( 'C', N, N, CONE, A, LDA, B, 1, CZERO, WORK,
+     $                  1 )
             CALL CCOPY( N, WORK, 1, B, 1 )
          END IF
 *
@@ -597,7 +608,8 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (CWorkspace: need M*M+4*M-1, prefer M*M+3*M+(M-1)*NB)
 *        (RWorkspace: none)
 *
-         CALL CUNGBR( 'P', M, M, M, WORK( IL ), LDWORK, WORK( ITAUP ),
+         CALL CUNGBR( 'P', M, M, M, WORK( IL ), LDWORK,
+     $                WORK( ITAUP ),
      $                WORK( IWORK ), LWORK-IWORK+1, INFO )
          IRWORK = IE + M
 *
@@ -623,7 +635,8 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
                CALL CSRSCL( NRHS, S( I ), B( I, 1 ), LDB )
                RANK = RANK + 1
             ELSE
-               CALL CLASET( 'F', 1, NRHS, CZERO, CZERO, B( I, 1 ), LDB )
+               CALL CLASET( 'F', 1, NRHS, CZERO, CZERO, B( I, 1 ),
+     $                      LDB )
             END IF
    30    CONTINUE
          IWORK = IL + M*LDWORK
@@ -633,27 +646,30 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (RWorkspace: none)
 *
          IF( LWORK.GE.LDB*NRHS+IWORK-1 .AND. NRHS.GT.1 ) THEN
-            CALL CGEMM( 'C', 'N', M, NRHS, M, CONE, WORK( IL ), LDWORK,
+            CALL CGEMM( 'C', 'N', M, NRHS, M, CONE, WORK( IL ),
+     $                  LDWORK,
      $                  B, LDB, CZERO, WORK( IWORK ), LDB )
             CALL CLACPY( 'G', M, NRHS, WORK( IWORK ), LDB, B, LDB )
          ELSE IF( NRHS.GT.1 ) THEN
             CHUNK = ( LWORK-IWORK+1 ) / M
             DO 40 I = 1, NRHS, CHUNK
                BL = MIN( NRHS-I+1, CHUNK )
-               CALL CGEMM( 'C', 'N', M, BL, M, CONE, WORK( IL ), LDWORK,
+               CALL CGEMM( 'C', 'N', M, BL, M, CONE, WORK( IL ),
+     $                     LDWORK,
      $                     B( 1, I ), LDB, CZERO, WORK( IWORK ), M )
                CALL CLACPY( 'G', M, BL, WORK( IWORK ), M, B( 1, I ),
      $                      LDB )
    40       CONTINUE
-         ELSE
-            CALL CGEMV( 'C', M, M, CONE, WORK( IL ), LDWORK, B( 1, 1 ),
-     $                  1, CZERO, WORK( IWORK ), 1 )
+         ELSE IF( NRHS.EQ.1 ) THEN
+            CALL CGEMV( 'C', M, M, CONE, WORK( IL ), LDWORK, B( 1,
+     $                  1 ), 1, CZERO, WORK( IWORK ), 1 )
             CALL CCOPY( M, WORK( IWORK ), 1, B( 1, 1 ), 1 )
          END IF
 *
 *        Zero out below first M rows of B
 *
-         CALL CLASET( 'F', N-M, NRHS, CZERO, CZERO, B( M+1, 1 ), LDB )
+         CALL CLASET( 'F', N-M, NRHS, CZERO, CZERO, B( M+1, 1 ),
+     $                LDB )
          IWORK = ITAU + M
 *
 *        Multiply transpose(Q) by B
@@ -684,7 +700,8 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (CWorkspace: need 2*M+NRHS, prefer 2*M+NRHS*NB)
 *        (RWorkspace: none)
 *
-         CALL CUNMBR( 'Q', 'L', 'C', M, NRHS, N, A, LDA, WORK( ITAUQ ),
+         CALL CUNMBR( 'Q', 'L', 'C', M, NRHS, N, A, LDA,
+     $                WORK( ITAUQ ),
      $                B, LDB, WORK( IWORK ), LWORK-IWORK+1, INFO )
 *
 *        Generate right bidiagonalizing vectors in A
@@ -701,7 +718,8 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (CWorkspace: none)
 *        (RWorkspace: need BDSPAC)
 *
-         CALL CBDSQR( 'L', M, N, 0, NRHS, S, RWORK( IE ), A, LDA, DUM,
+         CALL CBDSQR( 'L', M, N, 0, NRHS, S, RWORK( IE ), A, LDA,
+     $                DUM,
      $                1, B, LDB, RWORK( IRWORK ), INFO )
          IF( INFO.NE.0 )
      $      GO TO 70
@@ -717,7 +735,8 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
                CALL CSRSCL( NRHS, S( I ), B( I, 1 ), LDB )
                RANK = RANK + 1
             ELSE
-               CALL CLASET( 'F', 1, NRHS, CZERO, CZERO, B( I, 1 ), LDB )
+               CALL CLASET( 'F', 1, NRHS, CZERO, CZERO, B( I, 1 ),
+     $                      LDB )
             END IF
    50    CONTINUE
 *
@@ -733,12 +752,14 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
             CHUNK = LWORK / N
             DO 60 I = 1, NRHS, CHUNK
                BL = MIN( NRHS-I+1, CHUNK )
-               CALL CGEMM( 'C', 'N', N, BL, M, CONE, A, LDA, B( 1, I ),
+               CALL CGEMM( 'C', 'N', N, BL, M, CONE, A, LDA, B( 1,
+     $                     I ),
      $                     LDB, CZERO, WORK, N )
                CALL CLACPY( 'F', N, BL, WORK, N, B( 1, I ), LDB )
    60       CONTINUE
-         ELSE
-            CALL CGEMV( 'C', M, N, CONE, A, LDA, B, 1, CZERO, WORK, 1 )
+         ELSE IF( NRHS.EQ.1 ) THEN
+            CALL CGEMV( 'C', M, N, CONE, A, LDA, B, 1, CZERO, WORK,
+     $                  1 )
             CALL CCOPY( N, WORK, 1, B, 1 )
          END IF
       END IF
@@ -746,21 +767,25 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *     Undo scaling
 *
       IF( IASCL.EQ.1 ) THEN
-         CALL CLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL SLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN, 1, S, MINMN,
      $                INFO )
       ELSE IF( IASCL.EQ.2 ) THEN
-         CALL CLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL SLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN, 1, S, MINMN,
      $                INFO )
       END IF
       IF( IBSCL.EQ.1 ) THEN
-         CALL CLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL CLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       END IF
    70 CONTINUE
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
       RETURN
 *
 *     End of CGELSS
diff --git a/SRC/cgelst.f b/SRC/cgelst.f
new file mode 100644
index 0000000000..6a938ec09a
--- /dev/null
+++ b/SRC/cgelst.f
@@ -0,0 +1,549 @@
+*> \brief <b> CGELST solves overdetermined or underdetermined systems for GE matrices using QR or LQ factorization with compact WY representation of Q.</b>
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download CGELST + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgelst.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/cgelst.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgelst.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE CGELST( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
+*                          INFO )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          TRANS
+*       INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX            A( LDA, * ), B( LDB, * ), WORK( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> CGELST solves overdetermined or underdetermined real linear systems
+*> involving an M-by-N matrix A, or its conjugate-transpose, using a QR
+*> or LQ factorization of A with compact WY representation of Q.
+*>
+*> It is assumed that A has full rank, and only a rudimentary protection
+*> against rank-deficient matrices is provided. This subroutine only detects
+*> exact rank-deficiency, where a diagonal element of the triangular factor
+*> of A is exactly zero.
+*>
+*> It is conceivable for one (or more) of the diagonal elements of the triangular
+*> factor of A to be subnormally tiny numbers without this subroutine signalling
+*> an error. The solutions computed for such almost-rank-deficient matrices may
+*> be less accurate due to a loss of numerical precision.
+*>
+*> The following options are provided:
+*>
+*> 1. If TRANS = 'N' and m >= n:  find the least squares solution of
+*>    an overdetermined system, i.e., solve the least squares problem
+*>                 minimize || B - A*X ||.
+*>
+*> 2. If TRANS = 'N' and m < n:  find the minimum norm solution of
+*>    an underdetermined system A * X = B.
+*>
+*> 3. If TRANS = 'C' and m >= n:  find the minimum norm solution of
+*>    an underdetermined system A**T * X = B.
+*>
+*> 4. If TRANS = 'C' and m < n:  find the least squares solution of
+*>    an overdetermined system, i.e., solve the least squares problem
+*>                 minimize || B - A**T * X ||.
+*>
+*> Several right hand side vectors b and solution vectors x can be
+*> handled in a single call; they are stored as the columns of the
+*> M-by-NRHS right hand side matrix B and the N-by-NRHS solution
+*> matrix X.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] TRANS
+*> \verbatim
+*>          TRANS is CHARACTER*1
+*>          = 'N': the linear system involves A;
+*>          = 'C': the linear system involves A**H.
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of
+*>          columns of the matrices B and X. NRHS >=0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX array, dimension (LDA,N)
+*>          On entry, the M-by-N matrix A.
+*>          On exit,
+*>            if M >= N, A is overwritten by details of its QR
+*>                       factorization as returned by CGEQRT;
+*>            if M <  N, A is overwritten by details of its LQ
+*>                       factorization as returned by CGELQT.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in,out] B
+*> \verbatim
+*>          B is COMPLEX array, dimension (LDB,NRHS)
+*>          On entry, the matrix B of right hand side vectors, stored
+*>          columnwise; B is M-by-NRHS if TRANS = 'N', or N-by-NRHS
+*>          if TRANS = 'C'.
+*>          On exit, if INFO = 0, B is overwritten by the solution
+*>          vectors, stored columnwise:
+*>          if TRANS = 'N' and m >= n, rows 1 to n of B contain the least
+*>          squares solution vectors; the residual sum of squares for the
+*>          solution in each column is given by the sum of squares of
+*>          modulus of elements N+1 to M in that column;
+*>          if TRANS = 'N' and m < n, rows 1 to N of B contain the
+*>          minimum norm solution vectors;
+*>          if TRANS = 'C' and m >= n, rows 1 to M of B contain the
+*>          minimum norm solution vectors;
+*>          if TRANS = 'C' and m < n, rows 1 to M of B contain the
+*>          least squares solution vectors; the residual sum of squares
+*>          for the solution in each column is given by the sum of
+*>          squares of the modulus of elements M+1 to N in that column.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= MAX(1,M,N).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          LWORK >= max( 1, MN + max( MN, NRHS ) ).
+*>          For optimal performance,
+*>          LWORK >= max( 1, (MN + max( MN, NRHS ))*NB ).
+*>          where MN = min(M,N) and NB is the optimum block size.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO =  i, the i-th diagonal element of the
+*>                triangular factor of A is exactly zero, so that A does not have
+*>                full rank; the least squares solution could not be
+*>                computed.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup gelst
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
+*>
+*>  November 2022,  Igor Kozachenko,
+*>                  Computer Science Division,
+*>                  University of California, Berkeley
+*> \endverbatim
+*
+*  =====================================================================
+      SUBROUTINE CGELST( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK,
+     $                   LWORK,
+     $                   INFO )
+      IMPLICIT NONE
+*
+*  -- LAPACK driver routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          TRANS
+      INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS
+*     ..
+*     .. Array Arguments ..
+      COMPLEX            A( LDA, * ), B( LDB, * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      REAL               ZERO, ONE
+      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0 )
+      COMPLEX            CZERO
+      PARAMETER          ( CZERO = ( 0.0E+0, 0.0E+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY, TPSD
+      INTEGER            BROW, I, IASCL, IBSCL, J, LWOPT, MN, MNNRHS,
+     $                   NB, NBMIN, SCLLEN
+      REAL               ANRM, BIGNUM, BNRM, SMLNUM
+*     ..
+*     .. Local Arrays ..
+      REAL               RWORK( 1 )
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      REAL               SLAMCH, CLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SLAMCH, CLANGE,
+     $                   SROUNDUP_LWORK
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           CGELQT, CGEQRT, CGEMLQT, CGEMQRT,
+     $                   CLASCL, CLASET, CTRTRS, XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input arguments.
+*
+      INFO = 0
+      MN = MIN( M, N )
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( .NOT.( LSAME( TRANS, 'N' ) .OR.
+     $    LSAME( TRANS, 'C' ) ) ) THEN
+         INFO = -1
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -6
+      ELSE IF( LDB.LT.MAX( 1, M, N ) ) THEN
+         INFO = -8
+      ELSE IF( LWORK.LT.MAX( 1, MN+MAX( MN, NRHS ) ) .AND. .NOT.LQUERY )
+     $          THEN
+         INFO = -10
+      END IF
+*
+*     Figure out optimal block size and optimal workspace size
+*
+      IF( INFO.EQ.0 .OR. INFO.EQ.-10 ) THEN
+*
+         TPSD = .TRUE.
+         IF( LSAME( TRANS, 'N' ) )
+     $      TPSD = .FALSE.
+*
+         NB = ILAENV( 1, 'CGELST', ' ', M, N, -1, -1 )
+*
+         MNNRHS = MAX( MN, NRHS )
+         LWOPT = MAX( 1, (MN+MNNRHS)*NB )
+         WORK( 1 ) = SROUNDUP_LWORK( LWOPT )
+*
+      END IF
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'CGELST ', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( MIN( M, N, NRHS ).EQ.0 ) THEN
+         CALL CLASET( 'Full', MAX( M, N ), NRHS, CZERO, CZERO,
+     $                 B, LDB )
+         WORK( 1 ) = SROUNDUP_LWORK( LWOPT )
+         RETURN
+      END IF
+*
+*     *GEQRT and *GELQT routines cannot accept NB larger than min(M,N)
+*
+      IF( NB.GT.MN ) NB = MN
+*
+*     Determine the block size from the supplied LWORK
+*     ( at this stage we know that LWORK >= (minimum required workspace,
+*     but it may be less than optimal)
+*
+      NB = MIN( NB, LWORK/( MN + MNNRHS ) )
+*
+*     The minimum value of NB, when blocked code is used
+*
+      NBMIN = MAX( 2, ILAENV( 2, 'CGELST', ' ', M, N, -1, -1 ) )
+*
+      IF( NB.LT.NBMIN ) THEN
+         NB = 1
+      END IF
+*
+*     Get machine parameters
+*
+      SMLNUM = SLAMCH( 'S' ) / SLAMCH( 'P' )
+      BIGNUM = ONE / SMLNUM
+*
+*     Scale A, B if max element outside range [SMLNUM,BIGNUM]
+*
+      ANRM = CLANGE( 'M', M, N, A, LDA, RWORK )
+      IASCL = 0
+      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
+*
+*        Scale matrix norm up to SMLNUM
+*
+         CALL CLASCL( 'G', 0, 0, ANRM, SMLNUM, M, N, A, LDA, INFO )
+         IASCL = 1
+      ELSE IF( ANRM.GT.BIGNUM ) THEN
+*
+*        Scale matrix norm down to BIGNUM
+*
+         CALL CLASCL( 'G', 0, 0, ANRM, BIGNUM, M, N, A, LDA, INFO )
+         IASCL = 2
+      ELSE IF( ANRM.EQ.ZERO ) THEN
+*
+*        Matrix all zero. Return zero solution.
+*
+         CALL CLASET( 'Full', MAX( M, N ), NRHS, CZERO, CZERO,
+     $                B, LDB )
+         WORK( 1 ) = SROUNDUP_LWORK( LWOPT )
+         RETURN
+      END IF
+*
+      BROW = M
+      IF( TPSD )
+     $   BROW = N
+      BNRM = CLANGE( 'M', BROW, NRHS, B, LDB, RWORK )
+      IBSCL = 0
+      IF( BNRM.GT.ZERO .AND. BNRM.LT.SMLNUM ) THEN
+*
+*        Scale matrix norm up to SMLNUM
+*
+         CALL CLASCL( 'G', 0, 0, BNRM, SMLNUM, BROW, NRHS, B, LDB,
+     $                INFO )
+         IBSCL = 1
+      ELSE IF( BNRM.GT.BIGNUM ) THEN
+*
+*        Scale matrix norm down to BIGNUM
+*
+         CALL CLASCL( 'G', 0, 0, BNRM, BIGNUM, BROW, NRHS, B, LDB,
+     $                INFO )
+         IBSCL = 2
+      END IF
+*
+      IF( M.GE.N ) THEN
+*
+*        M > N:
+*        Compute the blocked QR factorization of A,
+*        using the compact WY representation of Q,
+*        workspace at least N, optimally N*NB.
+*
+         CALL CGEQRT( M, N, NB, A, LDA, WORK( 1 ), NB,
+     $                WORK( MN*NB+1 ), INFO )
+*
+         IF( .NOT.TPSD ) THEN
+*
+*           M > N, A is not transposed:
+*           Overdetermined system of equations,
+*           least-squares problem, min || A * X - B ||.
+*
+*           Compute B(1:M,1:NRHS) := Q**T * B(1:M,1:NRHS),
+*           using the compact WY representation of Q,
+*           workspace at least NRHS, optimally NRHS*NB.
+*
+            CALL CGEMQRT( 'Left', 'Conjugate transpose', M, NRHS, N,
+     $                    NB,
+     $                    A, LDA, WORK( 1 ), NB, B, LDB,
+     $                    WORK( MN*NB+1 ), INFO )
+*
+*           Compute B(1:N,1:NRHS) := inv(R) * B(1:N,1:NRHS)
+*
+            CALL CTRTRS( 'Upper', 'No transpose', 'Non-unit', N,
+     $                   NRHS,
+     $                   A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
+*
+            SCLLEN = N
+*
+         ELSE
+*
+*           M > N, A is transposed:
+*           Underdetermined system of equations,
+*           minimum norm solution of A**T * X = B.
+*
+*           Compute B := inv(R**T) * B in two row blocks of B.
+*
+*           Block 1: B(1:N,1:NRHS) := inv(R**T) * B(1:N,1:NRHS)
+*
+            CALL CTRTRS( 'Upper', 'Conjugate transpose', 'Non-unit',
+     $                   N, NRHS, A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
+*
+*           Block 2: Zero out all rows below the N-th row in B:
+*           B(N+1:M,1:NRHS) = ZERO
+*
+            DO  J = 1, NRHS
+               DO I = N + 1, M
+                  B( I, J ) = ZERO
+               END DO
+            END DO
+*
+*           Compute B(1:M,1:NRHS) := Q(1:N,:) * B(1:N,1:NRHS),
+*           using the compact WY representation of Q,
+*           workspace at least NRHS, optimally NRHS*NB.
+*
+            CALL CGEMQRT( 'Left', 'No transpose', M, NRHS, N, NB,
+     $                    A, LDA, WORK( 1 ), NB, B, LDB,
+     $                    WORK( MN*NB+1 ), INFO )
+*
+            SCLLEN = M
+*
+         END IF
+*
+      ELSE
+*
+*        M < N:
+*        Compute the blocked LQ factorization of A,
+*        using the compact WY representation of Q,
+*        workspace at least M, optimally M*NB.
+*
+         CALL CGELQT( M, N, NB, A, LDA, WORK( 1 ), NB,
+     $                WORK( MN*NB+1 ), INFO )
+*
+         IF( .NOT.TPSD ) THEN
+*
+*           M < N, A is not transposed:
+*           Underdetermined system of equations,
+*           minimum norm solution of A * X = B.
+*
+*           Compute B := inv(L) * B in two row blocks of B.
+*
+*           Block 1: B(1:M,1:NRHS) := inv(L) * B(1:M,1:NRHS)
+*
+            CALL CTRTRS( 'Lower', 'No transpose', 'Non-unit', M,
+     $                   NRHS,
+     $                   A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
+*
+*           Block 2: Zero out all rows below the M-th row in B:
+*           B(M+1:N,1:NRHS) = ZERO
+*
+            DO J = 1, NRHS
+               DO I = M + 1, N
+                  B( I, J ) = ZERO
+               END DO
+            END DO
+*
+*           Compute B(1:N,1:NRHS) := Q(1:N,:)**T * B(1:M,1:NRHS),
+*           using the compact WY representation of Q,
+*           workspace at least NRHS, optimally NRHS*NB.
+*
+            CALL CGEMLQT( 'Left', 'Conjugate transpose', N, NRHS, M,
+     $                    NB,
+     $                   A, LDA, WORK( 1 ), NB, B, LDB,
+     $                   WORK( MN*NB+1 ), INFO )
+*
+            SCLLEN = N
+*
+         ELSE
+*
+*           M < N, A is transposed:
+*           Overdetermined system of equations,
+*           least-squares problem, min || A**T * X - B ||.
+*
+*           Compute B(1:N,1:NRHS) := Q * B(1:N,1:NRHS),
+*           using the compact WY representation of Q,
+*           workspace at least NRHS, optimally NRHS*NB.
+*
+            CALL CGEMLQT( 'Left', 'No transpose', N, NRHS, M, NB,
+     $                    A, LDA, WORK( 1 ), NB, B, LDB,
+     $                    WORK( MN*NB+1), INFO )
+*
+*           Compute B(1:M,1:NRHS) := inv(L**T) * B(1:M,1:NRHS)
+*
+            CALL CTRTRS( 'Lower', 'Conjugate transpose', 'Non-unit',
+     $                   M, NRHS, A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
+*
+            SCLLEN = M
+*
+         END IF
+*
+      END IF
+*
+*     Undo scaling
+*
+      IF( IASCL.EQ.1 ) THEN
+         CALL CLASCL( 'G', 0, 0, ANRM, SMLNUM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      ELSE IF( IASCL.EQ.2 ) THEN
+         CALL CLASCL( 'G', 0, 0, ANRM, BIGNUM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      END IF
+      IF( IBSCL.EQ.1 ) THEN
+         CALL CLASCL( 'G', 0, 0, SMLNUM, BNRM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      ELSE IF( IBSCL.EQ.2 ) THEN
+         CALL CLASCL( 'G', 0, 0, BIGNUM, BNRM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      END IF
+*
+      WORK( 1 ) = SROUNDUP_LWORK( LWOPT )
+*
+      RETURN
+*
+*     End of CGELST
+*
+      END
diff --git a/SRC/cgelsy.f b/SRC/cgelsy.f
index 67140f1913..557742a9c1 100644
--- a/SRC/cgelsy.f
+++ b/SRC/cgelsy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGELSY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgelsy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgelsy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -116,6 +114,7 @@
 *>          B is COMPLEX array, dimension (LDB,NRHS)
 *>          On entry, the M-by-NRHS right hand side matrix B.
 *>          On exit, the N-by-NRHS solution matrix X.
+*>          If M = 0 or N = 0, B is not referenced.
 *> \endverbatim
 *>
 *> \param[in] LDB
@@ -148,6 +147,7 @@
 *>          The effective rank of A, i.e., the order of the submatrix
 *>          R11.  This is the same as the order of the submatrix T11
 *>          in the complete orthogonal factorization of A.
+*>          If NRHS = 0, RANK = 0 on output.
 *> \endverbatim
 *>
 *> \param[out] WORK
@@ -195,7 +195,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEsolve
+*> \ingroup gelsy
 *
 *> \par Contributors:
 *  ==================
@@ -205,8 +205,10 @@
 *>    G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain \n
 *>
 *  =====================================================================
-      SUBROUTINE CGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
+      SUBROUTINE CGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND,
+     $                   RANK,
      $                   WORK, LWORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -242,8 +244,9 @@ SUBROUTINE CGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
       COMPLEX            C1, C2, S1, S2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CGEQP3, CLAIC1, CLASCL, CLASET, CTRSM,
-     $                   CTZRZF, CUNMQR, CUNMRZ, SLABAD, XERBLA
+      EXTERNAL           CCOPY, CGEQP3, CLAIC1, CLASCL, CLASET,
+     $                   CTRSM,
+     $                   CTZRZF, CUNMQR, CUNMRZ, XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
@@ -303,7 +306,6 @@ SUBROUTINE CGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
       SMLNUM = SLAMCH( 'S' ) / SLAMCH( 'P' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A, B if max entries outside range [SMLNUM,BIGNUM]
 *
@@ -336,13 +338,15 @@ SUBROUTINE CGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
 *        Scale matrix norm up to SMLNUM
 *
-         CALL CLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 1
       ELSE IF( BNRM.GT.BIGNUM ) THEN
 *
 *        Scale matrix norm down to BIGNUM
 *
-         CALL CLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 2
       END IF
 *
@@ -351,7 +355,7 @@ SUBROUTINE CGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
       CALL CGEQP3( M, N, A, LDA, JPVT, WORK( 1 ), WORK( MN+1 ),
      $             LWORK-MN, RWORK, INFO )
-      WSIZE = MN + REAL( WORK( MN+1 ) )
+      WSIZE = REAL( MN ) + REAL( WORK( MN+1 ) )
 *
 *     complex workspace: MN+NB*(N+1). real workspace 2*N.
 *     Details of Householder rotations stored in WORK(1:MN).
@@ -409,9 +413,10 @@ SUBROUTINE CGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
 *     B(1:M,1:NRHS) := Q**H * B(1:M,1:NRHS)
 *
-      CALL CUNMQR( 'Left', 'Conjugate transpose', M, NRHS, MN, A, LDA,
+      CALL CUNMQR( 'Left', 'Conjugate transpose', M, NRHS, MN, A,
+     $             LDA,
      $             WORK( 1 ), B, LDB, WORK( 2*MN+1 ), LWORK-2*MN, INFO )
-      WSIZE = MAX( WSIZE, 2*MN+REAL( WORK( 2*MN+1 ) ) )
+      WSIZE = MAX( WSIZE, REAL( 2*MN )+REAL( WORK( 2*MN+1 ) ) )
 *
 *     complex workspace: 2*MN+NB*NRHS.
 *
@@ -450,18 +455,22 @@ SUBROUTINE CGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *     Undo scaling
 *
       IF( IASCL.EQ.1 ) THEN
-         CALL CLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL CLASCL( 'U', 0, 0, SMLNUM, ANRM, RANK, RANK, A, LDA,
      $                INFO )
       ELSE IF( IASCL.EQ.2 ) THEN
-         CALL CLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL CLASCL( 'U', 0, 0, BIGNUM, ANRM, RANK, RANK, A, LDA,
      $                INFO )
       END IF
       IF( IBSCL.EQ.1 ) THEN
-         CALL CLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL CLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL CLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       END IF
 *
    70 CONTINUE
diff --git a/SRC/cgemlq.f b/SRC/cgemlq.f
index e0cf78bc0f..d2754c768a 100644
--- a/SRC/cgemlq.f
+++ b/SRC/cgemlq.f
@@ -110,16 +110,17 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) COMPLEX array, dimension (MAX(1,LWORK))
+*>          (workspace) COMPLEX array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1, then a workspace query is assumed. The routine
 *>          only calculates the size of the WORK array, returns this
-*>          value as WORK(1), and no error message related to WORK 
+*>          value as WORK(1), and no error message related to WORK
 *>          is issued by XERBLA.
 *> \endverbatim
 *>
@@ -143,7 +144,7 @@
 *>
 *> \verbatim
 *>
-*> These details are particular for this LAPACK implementation. Users should not 
+*> These details are particular for this LAPACK implementation. Users should not
 *> take them for granted. These details may change in the future, and are not likely
 *> true for another LAPACK implementation. These details are relevant if one wants
 *> to try to understand the code. They are not part of the interface.
@@ -159,14 +160,17 @@
 *>  block sizes MB and NB returned by ILAENV, CGELQ will use either
 *>  CLASWLQ (if the matrix is wide-and-short) or CGELQT to compute
 *>  the LQ factorization.
-*>  This version of CGEMLQ will use either CLAMSWLQ or CGEMLQT to 
+*>  This version of CGEMLQ will use either CLAMSWLQ or CGEMLQT to
 *>  multiply matrix Q by another matrix.
 *>  Further Details in CLAMSWLQ or CGEMLQT.
 *> \endverbatim
 *>
+*> \ingroup gemlq
+*>
 *  =====================================================================
       SUBROUTINE CGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
      $                   C, LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -185,11 +189,12 @@ SUBROUTINE CGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER            MB, NB, LW, NBLCKS, MN
+      INTEGER            MB, NB, LW, NBLCKS, MN, MINMNK, LWMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CLAMSWLQ, CGEMLQT, XERBLA
@@ -201,7 +206,7 @@ SUBROUTINE CGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *
 *     Test the input arguments
 *
-      LQUERY  = LWORK.EQ.-1
+      LQUERY  = ( LWORK.EQ.-1 )
       NOTRAN  = LSAME( TRANS, 'N' )
       TRAN    = LSAME( TRANS, 'C' )
       LEFT    = LSAME( SIDE, 'L' )
@@ -216,6 +221,13 @@ SUBROUTINE CGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
         LW = M * MB
         MN = N
       END IF
+*
+      MINMNK = MIN( M, N, K )
+      IF( MINMNK.EQ.0 ) THEN
+         LWMIN = 1
+      ELSE
+         LWMIN = MAX( 1, LW )
+      END IF
 *
       IF( ( NB.GT.K ) .AND. ( MN.GT.K ) ) THEN
         IF( MOD( MN - K, NB - K ) .EQ. 0 ) THEN
@@ -244,12 +256,12 @@ SUBROUTINE CGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
         INFO = -9
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
         INFO = -11
-      ELSE IF( ( LWORK.LT.MAX( 1, LW ) ) .AND. ( .NOT.LQUERY ) ) THEN
+      ELSE IF( ( LWORK.LT.LWMIN ) .AND. ( .NOT.LQUERY ) ) THEN
         INFO = -13
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-        WORK( 1 ) = REAL( LW )
+        WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -261,7 +273,7 @@ SUBROUTINE CGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *
 *     Quick return if possible
 *
-      IF( MIN( M, N, K ).EQ.0 ) THEN
+      IF( MINMNK.EQ.0 ) THEN
         RETURN
       END IF
 *
@@ -274,7 +286,7 @@ SUBROUTINE CGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
      $                 MB, C, LDC, WORK, LWORK, INFO )
       END IF
 *
-      WORK( 1 ) = REAL( LW )
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
 *
       RETURN
 *
diff --git a/SRC/cgemlqt.f b/SRC/cgemlqt.f
index a8ecd9a9d1..32718d14f6 100644
--- a/SRC/cgemlqt.f
+++ b/SRC/cgemlqt.f
@@ -20,13 +20,13 @@
 *>
 *> \verbatim
 *>
-*> CGEMLQT overwrites the general real M-by-N matrix C with
+*> CGEMLQT overwrites the general complex M-by-N matrix C with
 *>
 *>                 SIDE = 'L'     SIDE = 'R'
 *> TRANS = 'N':      Q C            C Q
 *> TRANS = 'C':   Q**H C            C Q**H
 *>
-*> where Q is a complex orthogonal matrix defined as the product of K
+*> where Q is a complex unitary matrix defined as the product of K
 *> elementary reflectors:
 *>
 *>       Q = H(1) H(2) . . . H(K) = I - V T V**H
@@ -145,11 +145,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gemlqt
 *
 *  =====================================================================
       SUBROUTINE CGEMLQT( SIDE, TRANS, M, N, K, MB, V, LDV, T, LDT,
      $                   C, LDC, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -168,7 +169,7 @@ SUBROUTINE CGEMLQT( SIDE, TRANS, M, N, K, MB, V, LDV, T, LDT,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, RIGHT, TRAN, NOTRAN
-      INTEGER            I, IB, LDWORK, KF
+      INTEGER            I, IB, LDWORK, KF, Q
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -192,8 +193,10 @@ SUBROUTINE CGEMLQT( SIDE, TRANS, M, N, K, MB, V, LDV, T, LDT,
 *
       IF( LEFT ) THEN
          LDWORK = MAX( 1, N )
+         Q = M
       ELSE IF ( RIGHT ) THEN
          LDWORK = MAX( 1, M )
+         Q = N
       END IF
       IF( .NOT.LEFT .AND. .NOT.RIGHT ) THEN
          INFO = -1
@@ -203,7 +206,7 @@ SUBROUTINE CGEMLQT( SIDE, TRANS, M, N, K, MB, V, LDV, T, LDT,
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
          INFO = -4
-      ELSE IF( K.LT.0) THEN
+      ELSE IF( K.LT.0 .OR. K.GT.Q ) THEN
          INFO = -5
       ELSE IF( MB.LT.1 .OR. (MB.GT.K .AND. K.GT.0)) THEN
          INFO = -6
diff --git a/SRC/cgemqr.f b/SRC/cgemqr.f
index ea9de146e5..271a942737 100644
--- a/SRC/cgemqr.f
+++ b/SRC/cgemqr.f
@@ -111,16 +111,17 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) COMPLEX array, dimension (MAX(1,LWORK))
+*>          (workspace) COMPLEX array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1, then a workspace query is assumed. The routine
 *>          only calculates the size of the WORK array, returns this
-*>          value as WORK(1), and no error message related to WORK 
+*>          value as WORK(1), and no error message related to WORK
 *>          is issued by XERBLA.
 *> \endverbatim
 *>
@@ -144,7 +145,7 @@
 *>
 *> \verbatim
 *>
-*> These details are particular for this LAPACK implementation. Users should not 
+*> These details are particular for this LAPACK implementation. Users should not
 *> take them for granted. These details may change in the future, and are not likely
 *> true for another LAPACK implementation. These details are relevant if one wants
 *> to try to understand the code. They are not part of the interface.
@@ -166,9 +167,12 @@
 *>
 *> \endverbatim
 *>
+*> \ingroup gemqr
+*>
 *  =====================================================================
       SUBROUTINE CGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
      $                   C, LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -187,11 +191,12 @@ SUBROUTINE CGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER            MB, NB, LW, NBLCKS, MN
+      INTEGER            MB, NB, LW, NBLCKS, MN, MINMNK, LWMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CGEMQRT, CLAMTSQR, XERBLA
@@ -203,7 +208,7 @@ SUBROUTINE CGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *
 *     Test the input arguments
 *
-      LQUERY  = LWORK.EQ.-1
+      LQUERY  = ( LWORK.EQ.-1 )
       NOTRAN  = LSAME( TRANS, 'N' )
       TRAN    = LSAME( TRANS, 'C' )
       LEFT    = LSAME( SIDE, 'L' )
@@ -218,6 +223,13 @@ SUBROUTINE CGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
         LW = MB * NB
         MN = N
       END IF
+*
+      MINMNK = MIN( M, N, K )
+      IF( MINMNK.EQ.0 ) THEN
+         LWMIN = 1
+      ELSE
+         LWMIN = MAX( 1, LW )
+      END IF
 *
       IF( ( MB.GT.K ) .AND. ( MN.GT.K ) ) THEN
         IF( MOD( MN - K, MB - K ).EQ.0 ) THEN
@@ -251,7 +263,7 @@ SUBROUTINE CGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-        WORK( 1 ) = LW
+        WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -263,7 +275,7 @@ SUBROUTINE CGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *
 *     Quick return if possible
 *
-      IF( MIN( M, N, K ).EQ.0 ) THEN
+      IF( MINMNK.EQ.0 ) THEN
         RETURN
       END IF
 *
@@ -276,7 +288,7 @@ SUBROUTINE CGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
      $                 NB, C, LDC, WORK, LWORK, INFO )
       END IF
 *
-      WORK( 1 ) = LW
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
 *
       RETURN
 *
diff --git a/SRC/cgemqrt.f b/SRC/cgemqrt.f
index 36fa333aa5..b93c09feb1 100644
--- a/SRC/cgemqrt.f
+++ b/SRC/cgemqrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEMQRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgemqrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgemqrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,11 +158,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup gemqrt
 *
 *  =====================================================================
       SUBROUTINE CGEMQRT( SIDE, TRANS, M, N, K, NB, V, LDV, T, LDT,
      $                   C, LDC, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cgeql2.f b/SRC/cgeql2.f
index 41a5f9e049..a089d267ac 100644
--- a/SRC/cgeql2.f
+++ b/SRC/cgeql2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEQL2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgeql2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgeql2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,7 +96,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup geql2
 *
 *> \par Further Details:
 *  =====================
@@ -120,6 +118,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGEQL2( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -134,16 +133,11 @@ SUBROUTINE CGEQL2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      COMPLEX            ONE
-      PARAMETER          ( ONE = ( 1.0E+0, 0.0E+0 ) )
-*     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      COMPLEX            ALPHA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLARF, CLARFG, XERBLA
+      EXTERNAL           CLARF1L, CLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CONJG, MAX, MIN
@@ -172,15 +166,13 @@ SUBROUTINE CGEQL2( M, N, A, LDA, TAU, WORK, INFO )
 *        Generate elementary reflector H(i) to annihilate
 *        A(1:m-k+i-1,n-k+i)
 *
-         ALPHA = A( M-K+I, N-K+I )
-         CALL CLARFG( M-K+I, ALPHA, A( 1, N-K+I ), 1, TAU( I ) )
+         CALL CLARFG( M-K+I, A( M-K+I, N-K+I ), A( 1, N-K+I ), 1,
+     $                TAU( I ) )
 *
 *        Apply H(i)**H to A(1:m-k+i,1:n-k+i-1) from the left
 *
-         A( M-K+I, N-K+I ) = ONE
-         CALL CLARF( 'Left', M-K+I, N-K+I-1, A( 1, N-K+I ), 1,
-     $               CONJG( TAU( I ) ), A, LDA, WORK )
-         A( M-K+I, N-K+I ) = ALPHA
+         CALL CLARF1L( 'Left', M-K+I, N-K+I-1, A( 1, N-K+I ), 1,
+     $                 CONJG( TAU( I ) ), A, LDA, WORK )
    10 CONTINUE
       RETURN
 *
diff --git a/SRC/cgeqlf.f b/SRC/cgeqlf.f
index d2c11c2697..d0748cfba6 100644
--- a/SRC/cgeqlf.f
+++ b/SRC/cgeqlf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEQLF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgeqlf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgeqlf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,7 +86,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,N).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= N, otherwise.
 *>          For optimum performance LWORK >= N*NB, where NB is
 *>          the optimal blocksize.
 *>
@@ -113,7 +112,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup geqlf
 *
 *> \par Further Details:
 *  =====================
@@ -135,6 +134,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -162,7 +162,8 @@ SUBROUTINE CGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -186,10 +187,11 @@ SUBROUTINE CGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
             NB = ILAENV( 1, 'CGEQLF', ' ', M, N, -1, -1 )
             LWKOPT = N*NB
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
-         IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
-            INFO = -7
+         IF( .NOT.LQUERY ) THEN
+            IF( LWORK.LE.0 .OR. ( M.GT.0 .AND. LWORK.LT.MAX( 1, N ) ) )
+     $         INFO = -7
          END IF
       END IF
 *
@@ -246,7 +248,8 @@ SUBROUTINE CGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *           Compute the QL factorization of the current block
 *           A(1:m-k+i+ib-1,n-k+i:n-k+i+ib-1)
 *
-            CALL CGEQL2( M-K+I+IB-1, IB, A( 1, N-K+I ), LDA, TAU( I ),
+            CALL CGEQL2( M-K+I+IB-1, IB, A( 1, N-K+I ), LDA,
+     $                   TAU( I ),
      $                   WORK, IINFO )
             IF( N-K+I.GT.1 ) THEN
 *
@@ -258,7 +261,8 @@ SUBROUTINE CGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *              Apply H**H to A(1:m-k+i+ib-1,1:n-k+i-1) from the left
 *
-               CALL CLARFB( 'Left', 'Conjugate transpose', 'Backward',
+               CALL CLARFB( 'Left', 'Conjugate transpose',
+     $                      'Backward',
      $                      'Columnwise', M-K+I+IB-1, N-K+I-1, IB,
      $                      A( 1, N-K+I ), LDA, WORK, LDWORK, A, LDA,
      $                      WORK( IB+1 ), LDWORK )
@@ -276,7 +280,7 @@ SUBROUTINE CGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
       IF( MU.GT.0 .AND. NU.GT.0 )
      $   CALL CGEQL2( MU, NU, A, LDA, TAU, WORK, IINFO )
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK( IWS )
       RETURN
 *
 *     End of CGEQLF
diff --git a/SRC/cgeqp3.f b/SRC/cgeqp3.f
index 402cf21f2d..e3193ca77a 100644
--- a/SRC/cgeqp3.f
+++ b/SRC/cgeqp3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEQP3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgeqp3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgeqp3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,7 +125,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup geqp3
 *
 *> \par Further Details:
 *  =====================
@@ -156,6 +154,7 @@
 *  =====================================================================
       SUBROUTINE CGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, RWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -182,7 +181,8 @@ SUBROUTINE CGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, RWORK,
      $                   NBMIN, NFXD, NX, SM, SMINMN, SN, TOPBMN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEQRF, CLAQP2, CLAQPS, CSWAP, CUNMQR, XERBLA
+      EXTERNAL           CGEQRF, CLAQP2, CLAQPS, CSWAP, CUNMQR,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
@@ -265,7 +265,8 @@ SUBROUTINE CGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, RWORK,
 *CC         CALL CUNM2R( 'Left', 'Conjugate Transpose', M, N-NA,
 *CC  $                   NA, A, LDA, TAU, A( 1, NA+1 ), LDA, WORK,
 *CC  $                   INFO )
-            CALL CUNMQR( 'Left', 'Conjugate Transpose', M, N-NA, NA, A,
+            CALL CUNMQR( 'Left', 'Conjugate Transpose', M, N-NA, NA,
+     $                   A,
      $                   LDA, TAU, A( 1, NA+1 ), LDA, WORK, LWORK,
      $                   INFO )
             IWS = MAX( IWS, INT( WORK( 1 ) ) )
@@ -307,7 +308,8 @@ SUBROUTINE CGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, RWORK,
 *                 determine the minimum value of NB.
 *
                   NB = LWORK / ( SN+1 )
-                  NBMIN = MAX( 2, ILAENV( INBMIN, 'CGEQRF', ' ', SM, SN,
+                  NBMIN = MAX( 2, ILAENV( INBMIN, 'CGEQRF', ' ', SM,
+     $                         SN,
      $                    -1, -1 ) )
 *
 *
diff --git a/SRC/cgeqp3rk.f b/SRC/cgeqp3rk.f
new file mode 100644
index 0000000000..2fda980adc
--- /dev/null
+++ b/SRC/cgeqp3rk.f
@@ -0,0 +1,1085 @@
+*> \brief \b CGEQP3RK computes a truncated Householder QR factorization with column pivoting of a complex m-by-n matrix A by using Level 3 BLAS and overwrites m-by-nrhs matrix B with Q**H * B.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download CGEQP3RK + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgeqp3rk.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/cgeqp3rk.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgeqp3rk.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE CGEQP3RK( M, N, NRHS, KMAX, ABSTOL, RELTOL, A, LDA,
+*      $                     K, MAXC2NRMK, RELMAXC2NRMK, JPIV, TAU,
+*      $                     WORK, LWORK, RWORK, IWORK, INFO )
+*       IMPLICIT NONE
+*
+*      .. Scalar Arguments ..
+*       INTEGER            INFO, K, KMAX, LDA, LWORK, M, N, NRHS
+*       REAL               ABSTOL, MAXC2NRMK, RELMAXC2NRMK, RELTOL
+*      ..
+*      .. Array Arguments ..
+*       INTEGER            IWORK( * ), JPIV( * )
+*       REAL               RWORK( * )
+*       COMPLEX            A( LDA, * ), TAU( * ), WORK( * )
+*      ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> CGEQP3RK performs two tasks simultaneously:
+*>
+*> Task 1: The routine computes a truncated (rank K) or full rank
+*> Householder QR factorization with column pivoting of a complex
+*> M-by-N matrix A using Level 3 BLAS. K is the number of columns
+*> that were factorized, i.e. factorization rank of the
+*> factor R, K <= min(M,N).
+*>
+*>  A * P(K) = Q(K) * R(K)  =
+*>
+*>        = Q(K) * ( R11(K) R12(K) ) = Q(K) * (   R(K)_approx    )
+*>                 ( 0      R22(K) )          ( 0  R(K)_residual ),
+*>
+*> where:
+*>
+*>  P(K)            is an N-by-N permutation matrix;
+*>  Q(K)            is an M-by-M unitary matrix;
+*>  R(K)_approx   = ( R11(K), R12(K) ) is a rank K approximation of the
+*>                    full rank factor R with K-by-K upper-triangular
+*>                    R11(K) and K-by-N rectangular R12(K). The diagonal
+*>                    entries of R11(K) appear in non-increasing order
+*>                    of absolute value, and absolute values of all of
+*>                    them exceed the maximum column 2-norm of R22(K)
+*>                    up to roundoff error.
+*>  R(K)_residual = R22(K) is the residual of a rank K approximation
+*>                    of the full rank factor R. It is a
+*>                    an (M-K)-by-(N-K) rectangular matrix;
+*>  0               is a an (M-K)-by-K zero matrix.
+*>
+*> Task 2: At the same time, the routine overwrites a complex M-by-NRHS
+*> matrix B with  Q(K)**H * B  using Level 3 BLAS.
+*>
+*> =====================================================================
+*>
+*> The matrices A and B are stored on input in the array A as
+*> the left and right blocks A(1:M,1:N) and A(1:M, N+1:N+NRHS)
+*> respectively.
+*>
+*>                                  N     NRHS
+*>             array_A   =   M  [ mat_A, mat_B ]
+*>
+*> The truncation criteria (i.e. when to stop the factorization)
+*> can be any of the following:
+*>
+*>   1) The input parameter KMAX, the maximum number of columns
+*>      KMAX to factorize, i.e. the factorization rank is limited
+*>      to KMAX. If KMAX >= min(M,N), the criterion is not used.
+*>
+*>   2) The input parameter ABSTOL, the absolute tolerance for
+*>      the maximum column 2-norm of the residual matrix R22(K). This
+*>      means that the factorization stops if this norm is less or
+*>      equal to ABSTOL. If ABSTOL < 0.0, the criterion is not used.
+*>
+*>   3) The input parameter RELTOL, the tolerance for the maximum
+*>      column 2-norm matrix of the residual matrix R22(K) divided
+*>      by the maximum column 2-norm of the original matrix A, which
+*>      is equal to abs(R(1,1)). This means that the factorization stops
+*>      when the ratio of the maximum column 2-norm of R22(K) to
+*>      the maximum column 2-norm of A is less than or equal to RELTOL.
+*>      If RELTOL < 0.0, the criterion is not used.
+*>
+*>   4) In case both stopping criteria ABSTOL or RELTOL are not used,
+*>      and when the residual matrix R22(K) is a zero matrix in some
+*>      factorization step K. ( This stopping criterion is implicit. )
+*>
+*>  The algorithm stops when any of these conditions is first
+*>  satisfied, otherwise the whole matrix A is factorized.
+*>
+*>  To factorize the whole matrix A, use the values
+*>  KMAX >= min(M,N), ABSTOL < 0.0 and RELTOL < 0.0.
+*>
+*>  The routine returns:
+*>     a) Q(K), R(K)_approx = ( R11(K), R12(K) ),
+*>        R(K)_residual = R22(K), P(K), i.e. the resulting matrices
+*>        of the factorization; P(K) is represented by JPIV,
+*>        ( if K = min(M,N), R(K)_approx is the full factor R,
+*>        and there is no residual matrix R(K)_residual);
+*>     b) K, the number of columns that were factorized,
+*>        i.e. factorization rank;
+*>     c) MAXC2NRMK, the maximum column 2-norm of the residual
+*>        matrix R(K)_residual = R22(K),
+*>        ( if K = min(M,N), MAXC2NRMK = 0.0 );
+*>     d) RELMAXC2NRMK equals MAXC2NRMK divided by MAXC2NRM, the maximum
+*>        column 2-norm of the original matrix A, which is equal
+*>        to abs(R(1,1)), ( if K = min(M,N), RELMAXC2NRMK = 0.0 );
+*>     e) Q(K)**H * B, the matrix B with the unitary
+*>        transformation Q(K)**H applied on the left.
+*>
+*> The N-by-N permutation matrix P(K) is stored in a compact form in
+*> the integer array JPIV. For 1 <= j <= N, column j
+*> of the matrix A was interchanged with column JPIV(j).
+*>
+*> The M-by-M unitary matrix Q is represented as a product
+*> of elementary Householder reflectors
+*>
+*>     Q(K) = H(1) *  H(2) * . . . * H(K),
+*>
+*> where K is the number of columns that were factorized.
+*>
+*> Each H(j) has the form
+*>
+*>     H(j) = I - tau * v * v**H,
+*>
+*> where 1 <= j <= K and
+*>   I    is an M-by-M identity matrix,
+*>   tau  is a complex scalar,
+*>   v    is a complex vector with v(1:j-1) = 0 and v(j) = 1.
+*>
+*> v(j+1:M) is stored on exit in A(j+1:M,j) and tau in TAU(j).
+*>
+*> See the Further Details section for more information.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e. the number of
+*>          columns of the matrix B. NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] KMAX
+*> \verbatim
+*>          KMAX is INTEGER
+*>
+*>          The first factorization stopping criterion. KMAX >= 0.
+*>
+*>          The maximum number of columns of the matrix A to factorize,
+*>          i.e. the maximum factorization rank.
+*>
+*>          a) If KMAX >= min(M,N), then this stopping criterion
+*>                is not used, the routine factorizes columns
+*>                depending on ABSTOL and RELTOL.
+*>
+*>          b) If KMAX = 0, then this stopping criterion is
+*>                satisfied on input and the routine exits immediately.
+*>                This means that the factorization is not performed,
+*>                the matrices A and B are not modified, and
+*>                the matrix A is itself the residual.
+*> \endverbatim
+*>
+*> \param[in] ABSTOL
+*> \verbatim
+*>          ABSTOL is REAL
+*>
+*>          The second factorization stopping criterion, cannot be NaN.
+*>
+*>          The absolute tolerance (stopping threshold) for
+*>          maximum column 2-norm of the residual matrix R22(K).
+*>          The algorithm converges (stops the factorization) when
+*>          the maximum column 2-norm of the residual matrix R22(K)
+*>          is less than or equal to ABSTOL. Let SAFMIN = DLAMCH('S').
+*>
+*>          a) If ABSTOL is NaN, then no computation is performed
+*>                and an error message ( INFO = -5 ) is issued
+*>                by XERBLA.
+*>
+*>          b) If ABSTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on KMAX and RELTOL.
+*>                This includes the case ABSTOL = -Inf.
+*>
+*>          c) If 0.0 <= ABSTOL < 2*SAFMIN, then ABSTOL = 2*SAFMIN
+*>                is used. This includes the case ABSTOL = -0.0.
+*>
+*>          d) If 2*SAFMIN <= ABSTOL then the input value
+*>                of ABSTOL is used.
+*>
+*>          Let MAXC2NRM be the maximum column 2-norm of the
+*>          whole original matrix A.
+*>          If ABSTOL chosen above is >= MAXC2NRM, then this
+*>          stopping criterion is satisfied on input and routine exits
+*>          immediately after MAXC2NRM is computed. The routine
+*>          returns MAXC2NRM in MAXC2NORMK,
+*>          and 1.0 in RELMAXC2NORMK.
+*>          This includes the case ABSTOL = +Inf. This means that the
+*>          factorization is not performed, the matrices A and B are not
+*>          modified, and the matrix A is itself the residual.
+*> \endverbatim
+*>
+*> \param[in] RELTOL
+*> \verbatim
+*>          RELTOL is REAL
+*>
+*>          The third factorization stopping criterion, cannot be NaN.
+*>
+*>          The tolerance (stopping threshold) for the ratio
+*>          abs(R(K+1,K+1))/abs(R(1,1)) of the maximum column 2-norm of
+*>          the residual matrix R22(K) to the maximum column 2-norm of
+*>          the original matrix A. The algorithm converges (stops the
+*>          factorization), when abs(R(K+1,K+1))/abs(R(1,1)) A is less
+*>          than or equal to RELTOL. Let EPS = DLAMCH('E').
+*>
+*>          a) If RELTOL is NaN, then no computation is performed
+*>                and an error message ( INFO = -6 ) is issued
+*>                by XERBLA.
+*>
+*>          b) If RELTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on KMAX and ABSTOL.
+*>                This includes the case RELTOL = -Inf.
+*>
+*>          c) If 0.0 <= RELTOL < EPS, then RELTOL = EPS is used.
+*>                This includes the case RELTOL = -0.0.
+*>
+*>          d) If EPS <= RELTOL then the input value of RELTOL
+*>                is used.
+*>
+*>          Let MAXC2NRM be the maximum column 2-norm of the
+*>          whole original matrix A.
+*>          If RELTOL chosen above is >= 1.0, then this stopping
+*>          criterion is satisfied on input and routine exits
+*>          immediately after MAXC2NRM is computed.
+*>          The routine returns MAXC2NRM in MAXC2NORMK,
+*>          and 1.0 in RELMAXC2NORMK.
+*>          This includes the case RELTOL = +Inf. This means that the
+*>          factorization is not performed, the matrices A and B are not
+*>          modified, and the matrix A is itself the residual.
+*>
+*>          NOTE: We recommend that RELTOL satisfy
+*>                min( 10*max(M,N)*EPS, sqrt(EPS) ) <= RELTOL
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX array, dimension (LDA,N+NRHS)
+*>
+*>          On entry:
+*>
+*>          a) The subarray A(1:M,1:N) contains the M-by-N matrix A.
+*>          b) The subarray A(1:M,N+1:N+NRHS) contains the M-by-NRHS
+*>             matrix B.
+*>
+*>                                  N     NRHS
+*>              array_A   =   M  [ mat_A, mat_B ]
+*>
+*>          On exit:
+*>
+*>          a) The subarray A(1:M,1:N) contains parts of the factors
+*>             of the matrix A:
+*>
+*>            1) If K = 0, A(1:M,1:N) contains the original matrix A.
+*>            2) If K > 0, A(1:M,1:N) contains parts of the
+*>            factors:
+*>
+*>              1. The elements below the diagonal of the subarray
+*>                 A(1:M,1:K) together with TAU(1:K) represent the
+*>                 unitary matrix Q(K) as a product of K Householder
+*>                 elementary reflectors.
+*>
+*>              2. The elements on and above the diagonal of
+*>                 the subarray A(1:K,1:N) contain K-by-N
+*>                 upper-trapezoidal matrix
+*>                 R(K)_approx = ( R11(K), R12(K) ).
+*>                 NOTE: If K=min(M,N), i.e. full rank factorization,
+*>                       then R_approx(K) is the full factor R which
+*>                       is upper-trapezoidal. If, in addition, M>=N,
+*>                       then R is upper-triangular.
+*>
+*>              3. The subarray A(K+1:M,K+1:N) contains (M-K)-by-(N-K)
+*>                 rectangular matrix R(K)_residual = R22(K).
+*>
+*>          b) If NRHS > 0, the subarray A(1:M,N+1:N+NRHS) contains
+*>             the M-by-NRHS product Q(K)**H * B.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*>          This is the leading dimension for both matrices, A and B.
+*> \endverbatim
+*>
+*> \param[out] K
+*> \verbatim
+*>          K is INTEGER
+*>          Factorization rank of the matrix A, i.e. the rank of
+*>          the factor R, which is the same as the number of non-zero
+*>          rows of the factor R. 0 <= K <= min(M,KMAX,N).
+*>
+*>          K also represents the number of non-zero Householder
+*>          vectors.
+*>
+*>          NOTE: If K = 0, a) the arrays A and B are not modified;
+*>                          b) the array TAU(1:min(M,N)) is set to ZERO,
+*>                             if the matrix A does not contain NaN,
+*>                             otherwise the elements TAU(1:min(M,N))
+*>                             are undefined;
+*>                          c) the elements of the array JPIV are set
+*>                             as follows: for j = 1:N, JPIV(j) = j.
+*> \endverbatim
+*>
+*> \param[out] MAXC2NRMK
+*> \verbatim
+*>          MAXC2NRMK is REAL
+*>          The maximum column 2-norm of the residual matrix R22(K),
+*>          when the factorization stopped at rank K. MAXC2NRMK >= 0.
+*>
+*>          a) If K = 0, i.e. the factorization was not performed,
+*>             the matrix A was not modified and is itself a residual
+*>             matrix, then MAXC2NRMK equals the maximum column 2-norm
+*>             of the original matrix A.
+*>
+*>          b) If 0 < K < min(M,N), then MAXC2NRMK is returned.
+*>
+*>          c) If K = min(M,N), i.e. the whole matrix A was
+*>             factorized and there is no residual matrix,
+*>             then MAXC2NRMK = 0.0.
+*>
+*>          NOTE: MAXC2NRMK in the factorization step K would equal
+*>                R(K+1,K+1) in the next factorization step K+1.
+*> \endverbatim
+*>
+*> \param[out] RELMAXC2NRMK
+*> \verbatim
+*>          RELMAXC2NRMK is REAL
+*>          The ratio MAXC2NRMK / MAXC2NRM of the maximum column
+*>          2-norm of the residual matrix R22(K) (when the factorization
+*>          stopped at rank K) to the maximum column 2-norm of the
+*>          whole original matrix A. RELMAXC2NRMK >= 0.
+*>
+*>          a) If K = 0, i.e. the factorization was not performed,
+*>             the matrix A was not modified and is itself a residual
+*>             matrix, then RELMAXC2NRMK = 1.0.
+*>
+*>          b) If 0 < K < min(M,N), then
+*>                RELMAXC2NRMK = MAXC2NRMK / MAXC2NRM is returned.
+*>
+*>          c) If K = min(M,N), i.e. the whole matrix A was
+*>             factorized and there is no residual matrix,
+*>             then RELMAXC2NRMK = 0.0.
+*>
+*>         NOTE: RELMAXC2NRMK in the factorization step K would equal
+*>               abs(R(K+1,K+1))/abs(R(1,1)) in the next factorization
+*>               step K+1.
+*> \endverbatim
+*>
+*> \param[out] JPIV
+*> \verbatim
+*>          JPIV is INTEGER array, dimension (N)
+*>          Column pivot indices. For 1 <= j <= N, column j
+*>          of the matrix A was interchanged with column JPIV(j).
+*>
+*>          The elements of the array JPIV(1:N) are always set
+*>          by the routine, for example, even  when no columns
+*>          were factorized, i.e. when K = 0, the elements are
+*>          set as JPIV(j) = j for j = 1:N.
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is COMPLEX array, dimension (min(M,N))
+*>          The scalar factors of the elementary reflectors.
+*>
+*>          If 0 < K <= min(M,N), only the elements TAU(1:K) of
+*>          the array TAU are modified by the factorization.
+*>          After the factorization computed, if no NaN was found
+*>          during the factorization, the remaining elements
+*>          TAU(K+1:min(M,N)) are set to zero, otherwise the
+*>          elements TAU(K+1:min(M,N)) are not set and therefore
+*>          undefined.
+*>          ( If K = 0, all elements of TAU are set to zero, if
+*>          the matrix A does not contain NaN. )
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and
+*>          LWORK >= N+NRHS-1, otherwise.
+*>          For optimal performance LWORK >= NB*( N+NRHS+1 ),
+*>          where NB is the optimal block size for CGEQP3RK returned
+*>          by ILAENV. Minimal block size MINNB=2.
+*>
+*>          NOTE: The decision, whether to use unblocked BLAS 2
+*>          or blocked BLAS 3 code is based not only on the dimension
+*>          LWORK of the availbale workspace WORK, but also also on the
+*>          matrix A dimension N via crossover point NX returned
+*>          by ILAENV. (For N less than NX, unblocked code should be
+*>          used.)
+*>
+*>          If LWORK = -1, then a workspace query is assumed;
+*>          the routine only calculates the optimal size of the WORK
+*>          array, returns this value as the first entry of the WORK
+*>          array, and no error message related to LWORK is issued
+*>          by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is REAL array, dimension (2*N)
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (N-1).
+*>          Is a work array. ( IWORK is used to store indices
+*>          of "bad" columns for norm downdating in the residual
+*>          matrix in the blocked step auxiliary subroutine CLAQP3RK ).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          1) INFO = 0: successful exit.
+*>          2) INFO < 0: if INFO = -i, the i-th argument had an
+*>                       illegal value.
+*>          3) If INFO = j_1, where 1 <= j_1 <= N, then NaN was
+*>             detected and the routine stops the computation.
+*>             The j_1-th column of the matrix A or the j_1-th
+*>             element of array TAU contains the first occurrence
+*>             of NaN in the factorization step K+1 ( when K columns
+*>             have been factorized ).
+*>
+*>             On exit:
+*>             K                  is set to the number of
+*>                                   factorized columns without
+*>                                   exception.
+*>             MAXC2NRMK          is set to NaN.
+*>             RELMAXC2NRMK       is set to NaN.
+*>             TAU(K+1:min(M,N))  is not set and contains undefined
+*>                                   elements. If j_1=K+1, TAU(K+1)
+*>                                   may contain NaN.
+*>          4) If INFO = j_2, where N+1 <= j_2 <= 2*N, then no NaN
+*>             was detected, but +Inf (or -Inf) was detected and
+*>             the routine continues the computation until completion.
+*>             The (j_2-N)-th column of the matrix A contains the first
+*>             occurrence of +Inf (or -Inf) in the factorization
+*>             step K+1 ( when K columns have been factorized ).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup geqp3rk
+*
+*> \par Further Details:
+*  =====================
+*
+*> \verbatim
+*> CGEQP3RK is based on the same BLAS3 Householder QR factorization
+*> algorithm with column pivoting as in CGEQP3 routine which uses
+*> CLARFG routine to generate Householder reflectors
+*> for QR factorization.
+*>
+*> We can also write:
+*>
+*>   A = A_approx(K) + A_residual(K)
+*>
+*> The low rank approximation matrix A(K)_approx from
+*> the truncated QR factorization of rank K of the matrix A is:
+*>
+*>   A(K)_approx = Q(K) * ( R(K)_approx ) * P(K)**T
+*>                        (     0     0 )
+*>
+*>               = Q(K) * ( R11(K) R12(K) ) * P(K)**T
+*>                        (      0      0 )
+*>
+*> The residual A_residual(K) of the matrix A is:
+*>
+*>   A_residual(K) = Q(K) * ( 0              0 ) * P(K)**T =
+*>                          ( 0  R(K)_residual )
+*>
+*>                 = Q(K) * ( 0        0 ) * P(K)**T
+*>                          ( 0   R22(K) )
+*>
+*> The truncated (rank K) factorization guarantees that
+*> the maximum column 2-norm of A_residual(K) is less than
+*> or equal to MAXC2NRMK up to roundoff error.
+*>
+*> NOTE: An approximation of the null vectors
+*>       of A can be easily computed from R11(K)
+*>       and R12(K):
+*>
+*>       Null( A(K) )_approx = P * ( inv(R11(K)) * R12(K) )
+*>                                 (         -I           )
+*>
+*> \endverbatim
+*
+*> \par References:
+*  ================
+*> [1] A Level 3 BLAS QR factorization algorithm with column pivoting developed in 1996.
+*> G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain.
+*> X. Sun, Computer Science Dept., Duke University, USA.
+*> C. H. Bischof, Math. and Comp. Sci. Div., Argonne National Lab, USA.
+*> A BLAS-3 version of the QR factorization with column pivoting.
+*> LAPACK Working Note 114
+*> <a href="https://www.netlib.org/lapack/lawnspdf/lawn114.pdf">https://www.netlib.org/lapack/lawnspdf/lawn114.pdf</a>
+*> and in
+*> SIAM J. Sci. Comput., 19(5):1486-1494, Sept. 1998.
+*> <a href="https://doi.org/10.1137/S1064827595296732">https://doi.org/10.1137/S1064827595296732</a>
+*>
+*> [2] A partial column norm updating strategy developed in 2006.
+*> Z. Drmac and Z. Bujanovic, Dept. of Math., University of Zagreb, Croatia.
+*> On the failure of rank revealing QR factorization software – a case study.
+*> LAPACK Working Note 176.
+*> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">http://www.netlib.org/lapack/lawnspdf/lawn176.pdf</a>
+*> and in
+*> ACM Trans. Math. Softw. 35, 2, Article 12 (July 2008), 28 pages.
+*> <a href="https://doi.org/10.1145/1377612.1377616">https://doi.org/10.1145/1377612.1377616</a>
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
+*>
+*>  November  2023, Igor Kozachenko, James Demmel,
+*>                  EECS Department,
+*>                  University of California, Berkeley, USA.
+*>
+*> \endverbatim
+*
+*  =====================================================================
+      SUBROUTINE CGEQP3RK( M, N, NRHS, KMAX, ABSTOL, RELTOL, A, LDA,
+     $                     K, MAXC2NRMK, RELMAXC2NRMK, JPIV, TAU,
+     $                     WORK, LWORK, RWORK, IWORK, INFO )
+      IMPLICIT NONE
+*
+*  -- LAPACK computational routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            INFO, K, KF, KMAX, LDA, LWORK, M, N, NRHS
+      REAL               ABSTOL,  MAXC2NRMK, RELMAXC2NRMK, RELTOL
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IWORK( * ), JPIV( * )
+      REAL               RWORK( * )
+      COMPLEX            A( LDA, * ), TAU( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      INTEGER            INB, INBMIN, IXOVER
+      PARAMETER          ( INB = 1, INBMIN = 2, IXOVER = 3 )
+      REAL               ZERO, ONE, TWO
+      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0, TWO = 2.0E+0 )
+      COMPLEX            CZERO
+      PARAMETER          ( CZERO = ( 0.0E+0, 0.0E+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY, DONE
+      INTEGER            IINFO, IOFFSET, IWS, J, JB, JBF, JMAXB, JMAX,
+     $                   JMAXC2NRM, KP1, LWKOPT, MINMN, N_SUB, NB,
+     $                   NBMIN, NX
+      REAL               EPS, HUGEVAL, MAXC2NRM, SAFMIN
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           CLAQP2RK, CLAQP3RK, XERBLA
+*     ..
+*     .. External Functions ..
+      LOGICAL            SISNAN
+      INTEGER            ISAMAX, ILAENV
+      REAL               SLAMCH, SCNRM2, SROUNDUP_LWORK
+      EXTERNAL           SISNAN, SLAMCH, SCNRM2, ISAMAX, ILAENV,
+     $                   SROUNDUP_LWORK
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          CMPLX, MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Test input arguments
+*     ====================
+*
+      INFO = 0
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( KMAX.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( SISNAN( ABSTOL ) ) THEN
+         INFO = -5
+      ELSE IF( SISNAN( RELTOL ) ) THEN
+         INFO = -6
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -8
+      END IF
+*
+*     If the input parameters M, N, NRHS, KMAX, LDA are valid:
+*       a) Test the input workspace size LWORK for the minimum
+*          size requirement IWS.
+*       b) Determine the optimal block size NB and optimal
+*          workspace size LWKOPT to be returned in WORK(1)
+*          in case of (1) LWORK < IWS, (2) LQUERY = .TRUE.,
+*          (3) when routine exits.
+*     Here, IWS is the miminum workspace required for unblocked
+*     code.
+*
+      IF( INFO.EQ.0 ) THEN
+         MINMN = MIN( M, N )
+         IF( MINMN.EQ.0 ) THEN
+            IWS = 1
+            LWKOPT = 1
+         ELSE
+*
+*           Minimal workspace size in case of using only unblocked
+*           BLAS 2 code in CLAQP2RK.
+*           1) CLAQP2RK: N+NRHS-1 to use in WORK array that is used
+*              in CLARF1F subroutine inside CLAQP2RK to apply an
+*              elementary reflector from the left.
+*           TOTAL_WORK_SIZE = 3*N + NRHS - 1
+*
+            IWS = N + NRHS - 1
+*
+*           Assign to NB optimal block size.
+*
+            NB = ILAENV( INB, 'CGEQP3RK', ' ', M, N, -1, -1 )
+*
+*           A formula for the optimal workspace size in case of using
+*           both unblocked BLAS 2 in CLAQP2RK and blocked BLAS 3 code
+*           in CLAQP3RK.
+*           1) CGEQP3RK, CLAQP2RK, CLAQP3RK: 2*N to store full and
+*              partial column 2-norms.
+*           2) CLAQP2RK: N+NRHS-1 to use in WORK array that is used
+*              in CLARF1F subroutine to apply an elementary reflector
+*              from the left.
+*           3) CLAQP3RK: NB*(N+NRHS) to use in the work array F that
+*              is used to apply a block reflector from
+*              the left.
+*           4) CLAQP3RK: NB to use in the auxilixary array AUX.
+*           Sizes (2) and ((3) + (4)) should intersect, therefore
+*           TOTAL_WORK_SIZE = 2*N + NB*( N+NRHS+1 ), given NBMIN=2.
+*
+            LWKOPT = 2*N + NB*( N+NRHS+1 )
+         END IF
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+*
+         IF( ( LWORK.LT.IWS ) .AND. .NOT.LQUERY ) THEN
+            INFO = -15
+         END IF
+      END IF
+*
+*      NOTE: The optimal workspace size is returned in WORK(1), if
+*            the input parameters M, N, NRHS, KMAX, LDA are valid.
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'CGEQP3RK', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible for M=0 or N=0.
+*
+      IF( MINMN.EQ.0 ) THEN
+         K = 0
+         MAXC2NRMK = ZERO
+         RELMAXC2NRMK = ZERO
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+         RETURN
+      END IF
+*
+*     ==================================================================
+*
+*     Initialize column pivot array JPIV.
+*
+      DO J = 1, N
+         JPIV( J ) = J
+      END DO
+*
+*     ==================================================================
+*
+*     Initialize storage for partial and exact column 2-norms.
+*     a) The elements WORK(1:N) are used to store partial column
+*        2-norms of the matrix A, and may decrease in each computation
+*        step; initialize to the values of complete columns 2-norms.
+*     b) The elements WORK(N+1:2*N) are used to store complete column
+*        2-norms of the matrix A, they are not changed during the
+*        computation; initialize the values of complete columns 2-norms.
+*
+      DO J = 1, N
+         RWORK( J ) = SCNRM2( M, A( 1, J ), 1 )
+         RWORK( N+J ) = RWORK( J )
+      END DO
+*
+*     ==================================================================
+*
+*     Compute the pivot column index and the maximum column 2-norm
+*     for the whole original matrix stored in A(1:M,1:N).
+*
+      KP1 = ISAMAX( N, RWORK( 1 ), 1 )
+      MAXC2NRM = RWORK( KP1 )
+*
+*     ==================================================================.
+*
+      IF( SISNAN( MAXC2NRM ) ) THEN
+*
+*        Check if the matrix A contains NaN, set INFO parameter
+*        to the column number where the first NaN is found and return
+*        from the routine.
+*
+         K = 0
+         INFO = KP1
+*
+*        Set MAXC2NRMK and  RELMAXC2NRMK to NaN.
+*
+         MAXC2NRMK = MAXC2NRM
+         RELMAXC2NRMK = MAXC2NRM
+*
+*        Array TAU is not set and contains undefined elements.
+*
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+         RETURN
+      END IF
+*
+*     ===================================================================
+*
+      IF( MAXC2NRM.EQ.ZERO ) THEN
+*
+*        Check is the matrix A is a zero matrix, set array TAU and
+*        return from the routine.
+*
+         K = 0
+         MAXC2NRMK = ZERO
+         RELMAXC2NRMK = ZERO
+*
+         DO J = 1, MINMN
+            TAU( J ) = CZERO
+         END DO
+*
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+         RETURN
+*
+      END IF
+*
+*     ===================================================================
+*
+      HUGEVAL = SLAMCH( 'Overflow' )
+*
+      IF( MAXC2NRM.GT.HUGEVAL ) THEN
+*
+*        Check if the matrix A contains +Inf or -Inf, set INFO parameter
+*        to the column number, where the first +/-Inf  is found plus N,
+*        and continue the computation.
+*
+         INFO = N + KP1
+*
+      END IF
+*
+*     ==================================================================
+*
+*     Quick return if possible for the case when the first
+*     stopping criterion is satisfied, i.e. KMAX = 0.
+*
+      IF( KMAX.EQ.0 ) THEN
+         K = 0
+         MAXC2NRMK = MAXC2NRM
+         RELMAXC2NRMK = ONE
+         DO J = 1, MINMN
+            TAU( J ) = CZERO
+         END DO
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+         RETURN
+      END IF
+*
+*     ==================================================================
+*
+      EPS = SLAMCH('Epsilon')
+*
+*     Adjust ABSTOL
+*
+      IF( ABSTOL.GE.ZERO ) THEN
+         SAFMIN = SLAMCH('Safe minimum')
+         ABSTOL = MAX( ABSTOL, TWO*SAFMIN )
+      END IF
+*
+*     Adjust RELTOL
+*
+      IF( RELTOL.GE.ZERO ) THEN
+         RELTOL = MAX( RELTOL, EPS )
+      END IF
+*
+*     ===================================================================
+*
+*     JMAX is the maximum index of the column to be factorized,
+*     which is also limited by the first stopping criterion KMAX.
+*
+      JMAX = MIN( KMAX, MINMN )
+*
+*     ===================================================================
+*
+*     Quick return if possible for the case when the second or third
+*     stopping criterion for the whole original matrix is satified,
+*     i.e. MAXC2NRM <= ABSTOL or RELMAXC2NRM <= RELTOL
+*     (which is ONE <= RELTOL).
+*
+      IF( MAXC2NRM.LE.ABSTOL .OR. ONE.LE.RELTOL ) THEN
+*
+         K = 0
+         MAXC2NRMK = MAXC2NRM
+         RELMAXC2NRMK = ONE
+*
+         DO J = 1, MINMN
+            TAU( J ) = CZERO
+         END DO
+*
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+         RETURN
+      END IF
+*
+*     ==================================================================
+*     Factorize columns
+*     ==================================================================
+*
+*     Determine the block size.
+*
+      NBMIN = 2
+      NX = 0
+*
+      IF( ( NB.GT.1 ) .AND. ( NB.LT.MINMN ) ) THEN
+*
+*        Determine when to cross over from blocked to unblocked code.
+*        (for N less than NX, unblocked code should be used).
+*
+         NX = MAX( 0, ILAENV( IXOVER, 'CGEQP3RK', ' ', M, N, -1,
+     $                        -1 ) )
+*
+         IF( NX.LT.MINMN ) THEN
+*
+*           Determine if workspace is large enough for blocked code.
+*
+            IF( LWORK.LT.LWKOPT ) THEN
+*
+*              Not enough workspace to use optimal block size that
+*              is currently stored in NB.
+*              Reduce NB and determine the minimum value of NB.
+*
+               NB = ( LWORK-2*N ) / ( N+1 )
+               NBMIN = MAX( 2, ILAENV( INBMIN, 'CGEQP3RK', ' ', M, N,
+     $                 -1, -1 ) )
+*
+            END IF
+         END IF
+      END IF
+*
+*     ==================================================================
+*
+*     DONE is the boolean flag to rerpresent the case when the
+*     factorization completed in the block factorization routine,
+*     before the end of the block.
+*
+      DONE = .FALSE.
+*
+*     J is the column index.
+*
+      J = 1
+*
+*     (1) Use blocked code initially.
+*
+*     JMAXB is the maximum column index of the block, when the
+*     blocked code is used, is also limited by the first stopping
+*     criterion KMAX.
+*
+      JMAXB = MIN( KMAX, MINMN - NX )
+*
+      IF( NB.GE.NBMIN .AND. NB.LT.JMAX .AND. JMAXB.GT.0 ) THEN
+*
+*        Loop over the column blocks of the matrix A(1:M,1:JMAXB). Here:
+*        J   is the column index of a column block;
+*        JB  is the column block size to pass to block factorization
+*            routine in a loop step;
+*        JBF is the number of columns that were actually factorized
+*            that was returned by the block factorization routine
+*            in a loop step, JBF <= JB;
+*        N_SUB is the number of columns in the submatrix;
+*        IOFFSET is the number of rows that should not be factorized.
+*
+         DO WHILE( J.LE.JMAXB )
+*
+            JB = MIN( NB, JMAXB-J+1 )
+            N_SUB = N-J+1
+            IOFFSET = J-1
+*
+*           Factorize JB columns among the columns A(J:N).
+*
+            CALL CLAQP3RK( M, N_SUB, NRHS, IOFFSET, JB, ABSTOL,
+     $                     RELTOL, KP1, MAXC2NRM, A( 1, J ), LDA,
+     $                     DONE, JBF, MAXC2NRMK, RELMAXC2NRMK,
+     $                     JPIV( J ), TAU( J ),
+     $                     RWORK( J ), RWORK( N+J ),
+     $                     WORK( 1 ), WORK( JB+1 ),
+     $                     N+NRHS-J+1, IWORK, IINFO )
+*
+*           Set INFO on the first occurence of Inf.
+*
+            IF( IINFO.GT.N_SUB .AND. INFO.EQ.0 ) THEN
+               INFO = 2*IOFFSET + IINFO
+            END IF
+*
+            IF( DONE ) THEN
+*
+*              Either the submatrix is zero before the end of the
+*              column block, or ABSTOL or RELTOL criterion is
+*              satisfied before the end of the column block, we can
+*              return from the routine. Perform the following before
+*              returning:
+*                a) Set the number of factorized columns K,
+*                   K = IOFFSET + JBF from the last call of blocked
+*                   routine.
+*                NOTE: 1) MAXC2NRMK and RELMAXC2NRMK are returned
+*                         by the block factorization routine;
+*                      2) The remaining TAUs are set to ZERO by the
+*                         block factorization routine.
+*
+               K = IOFFSET + JBF
+*
+*              Set INFO on the first occurrence of NaN, NaN takes
+*              prcedence over Inf.
+*
+               IF( IINFO.LE.N_SUB .AND. IINFO.GT.0 ) THEN
+                  INFO = IOFFSET + IINFO
+               END IF
+*
+*              Return from the routine.
+*
+               WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+*
+               RETURN
+*
+            END IF
+*
+            J = J + JBF
+*
+         END DO
+*
+      END IF
+*
+*     Use unblocked code to factor the last or only block.
+*     J = JMAX+1 means we factorized the maximum possible number of
+*     columns, that is in ELSE clause we need to compute
+*     the MAXC2NORM and RELMAXC2NORM to return after we processed
+*     the blocks.
+*
+      IF( J.LE.JMAX ) THEN
+*
+*        N_SUB is the number of columns in the submatrix;
+*        IOFFSET is the number of rows that should not be factorized.
+*
+         N_SUB = N-J+1
+         IOFFSET = J-1
+*
+         CALL CLAQP2RK( M, N_SUB, NRHS, IOFFSET, JMAX-J+1,
+     $                  ABSTOL, RELTOL, KP1, MAXC2NRM, A( 1, J ), LDA,
+     $                  KF, MAXC2NRMK, RELMAXC2NRMK, JPIV( J ),
+     $                  TAU( J ), RWORK( J ), RWORK( N+J ),
+     $                  WORK( 1 ), IINFO )
+*
+*        ABSTOL or RELTOL criterion is satisfied when the number of
+*        the factorized columns KF is smaller then the  number
+*        of columns JMAX-J+1 supplied to be factorized by the
+*        unblocked routine, we can return from
+*        the routine. Perform the following before returning:
+*           a) Set the number of factorized columns K,
+*           b) MAXC2NRMK and RELMAXC2NRMK are returned by the
+*              unblocked factorization routine above.
+*
+         K = J - 1 + KF
+*
+*        Set INFO on the first exception occurence.
+*
+*        Set INFO on the first exception occurence of Inf or NaN,
+*        (NaN takes precedence over Inf).
+*
+         IF( IINFO.GT.N_SUB .AND. INFO.EQ.0 ) THEN
+            INFO = 2*IOFFSET + IINFO
+         ELSE IF( IINFO.LE.N_SUB .AND. IINFO.GT.0 ) THEN
+            INFO = IOFFSET + IINFO
+         END IF
+*
+      ELSE
+*
+*        Compute the return values for blocked code.
+*
+*        Set the number of factorized columns if the unblocked routine
+*        was not called.
+*
+            K = JMAX
+*
+*        If there exits a residual matrix after the blocked code:
+*           1) compute the values of MAXC2NRMK, RELMAXC2NRMK of the
+*              residual matrix, otherwise set them to ZERO;
+*           2) Set TAU(K+1:MINMN) to ZERO.
+*
+         IF( K.LT.MINMN ) THEN
+            JMAXC2NRM = K + ISAMAX( N-K, RWORK( K+1 ), 1 )
+            MAXC2NRMK = RWORK( JMAXC2NRM )
+            IF( K.EQ.0 ) THEN
+               RELMAXC2NRMK = ONE
+            ELSE
+               RELMAXC2NRMK = MAXC2NRMK / MAXC2NRM
+            END IF
+*
+            DO J = K + 1, MINMN
+               TAU( J ) = CZERO
+            END DO
+*
+         ELSE
+            MAXC2NRMK = ZERO
+            RELMAXC2NRMK = ZERO
+*
+         END IF
+*
+*     END IF( J.LE.JMAX ) THEN
+*
+      END IF
+*
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+*
+      RETURN
+*
+*     End of CGEQP3RK
+*
+      END
diff --git a/SRC/cgeqr.f b/SRC/cgeqr.f
index d10e3da65f..bb7d0a7b27 100644
--- a/SRC/cgeqr.f
+++ b/SRC/cgeqr.f
@@ -99,7 +99,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1 or -2, then a workspace query is assumed. The routine
 *>          only calculates the sizes of the T and WORK arrays, returns these
 *>          values as the first entries of the T and WORK arrays, and no error
@@ -168,9 +168,12 @@
 *>
 *> \endverbatim
 *>
+*> \ingroup geqr
+*>
 *  =====================================================================
       SUBROUTINE CGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,11 +191,12 @@ SUBROUTINE CGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, LMINWS, MINT, MINW
-      INTEGER            MB, NB, MINTSZ, NBLCKS
+      INTEGER            MB, NB, MINTSZ, NBLCKS, LWMIN, LWREQ
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CLATSQR, CGEQRT, XERBLA
@@ -244,8 +248,10 @@ SUBROUTINE CGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
 *
 *     Determine if the workspace size satisfies minimal size
 *
+      LWMIN = MAX( 1, N )
+      LWREQ = MAX( 1, N*NB )
       LMINWS = .FALSE.
-      IF( ( TSIZE.LT.MAX( 1, NB*N*NBLCKS + 5 ) .OR. LWORK.LT.NB*N )
+      IF( ( TSIZE.LT.MAX( 1, NB*N*NBLCKS + 5 ) .OR. LWORK.LT.LWREQ )
      $    .AND. ( LWORK.GE.N ) .AND. ( TSIZE.GE.MINTSZ )
      $    .AND. ( .NOT.LQUERY ) ) THEN
         IF( TSIZE.LT.MAX( 1, NB*N*NBLCKS + 5 ) ) THEN
@@ -253,7 +259,7 @@ SUBROUTINE CGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
           NB = 1
           MB = M
         END IF
-        IF( LWORK.LT.NB*N ) THEN
+        IF( LWORK.LT.LWREQ ) THEN
           LMINWS = .TRUE.
           NB = 1
         END IF
@@ -268,23 +274,23 @@ SUBROUTINE CGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
       ELSE IF( TSIZE.LT.MAX( 1, NB*N*NBLCKS + 5 )
      $   .AND. ( .NOT.LQUERY ) .AND. ( .NOT.LMINWS ) ) THEN
         INFO = -6
-      ELSE IF( ( LWORK.LT.MAX( 1, N*NB ) ) .AND. ( .NOT.LQUERY )
+      ELSE IF( ( LWORK.LT.LWREQ ) .AND. ( .NOT.LQUERY )
      $   .AND. ( .NOT.LMINWS ) ) THEN
         INFO = -8
       END IF
 *
       IF( INFO.EQ.0 ) THEN
         IF( MINT ) THEN
-          T( 1 ) = MINTSZ
+          T( 1 ) = CMPLX( MINTSZ )
         ELSE
-          T( 1 ) = NB*N*NBLCKS + 5
+          T( 1 ) = CMPLX( NB*N*NBLCKS + 5 )
         END IF
-        T( 2 ) = MB
-        T( 3 ) = NB
+        T( 2 ) = CMPLX( MB )
+        T( 3 ) = CMPLX( NB )
         IF( MINW ) THEN
-          WORK( 1 ) = MAX( 1, N )
+          WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
         ELSE
-          WORK( 1 ) = MAX( 1, NB*N )
+          WORK( 1 ) = SROUNDUP_LWORK( LWREQ )
         END IF
       END IF
       IF( INFO.NE.0 ) THEN
@@ -309,7 +315,7 @@ SUBROUTINE CGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
      $                LWORK, INFO )
       END IF
 *
-      WORK( 1 ) = MAX( 1, NB*N )
+      WORK( 1 ) = SROUNDUP_LWORK( LWREQ )
 *
       RETURN
 *
diff --git a/SRC/cgeqr2.f b/SRC/cgeqr2.f
index b0b346b2db..775d33c515 100644
--- a/SRC/cgeqr2.f
+++ b/SRC/cgeqr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEQR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgeqr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgeqr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -105,7 +103,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup geqr2
 *
 *> \par Further Details:
 *  =====================
@@ -127,6 +125,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGEQR2( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -141,16 +140,11 @@ SUBROUTINE CGEQR2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      COMPLEX            ONE
-      PARAMETER          ( ONE = ( 1.0E+0, 0.0E+0 ) )
-*     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      COMPLEX            ALPHA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLARF, CLARFG, XERBLA
+      EXTERNAL           CLARF1F, CLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CONJG, MAX, MIN
@@ -184,11 +178,8 @@ SUBROUTINE CGEQR2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *           Apply H(i)**H to A(i:m,i+1:n) from the left
 *
-            ALPHA = A( I, I )
-            A( I, I ) = ONE
-            CALL CLARF( 'Left', M-I+1, N-I, A( I, I ), 1,
-     $                  CONJG( TAU( I ) ), A( I, I+1 ), LDA, WORK )
-            A( I, I ) = ALPHA
+            CALL CLARF1F( 'Left', M-I+1, N-I, A( I, I ), 1,
+     $                    CONJG( TAU( I ) ), A( I, I+1 ), LDA, WORK )
          END IF
    10 CONTINUE
       RETURN
diff --git a/SRC/cgeqr2p.f b/SRC/cgeqr2p.f
index 7be7e7a1c9..72e3945780 100644
--- a/SRC/cgeqr2p.f
+++ b/SRC/cgeqr2p.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEQR2P + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgeqr2p.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgeqr2p.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup geqr2p
 *
 *> \par Further Details:
 *  =====================
@@ -131,6 +129,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGEQR2P( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -145,16 +144,11 @@ SUBROUTINE CGEQR2P( M, N, A, LDA, TAU, WORK, INFO )
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      COMPLEX            ONE
-      PARAMETER          ( ONE = ( 1.0E+0, 0.0E+0 ) )
-*     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      COMPLEX            ALPHA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLARF, CLARFGP, XERBLA
+      EXTERNAL           CLARF1F, CLARFGP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CONJG, MAX, MIN
@@ -188,11 +182,8 @@ SUBROUTINE CGEQR2P( M, N, A, LDA, TAU, WORK, INFO )
 *
 *           Apply H(i)**H to A(i:m,i+1:n) from the left
 *
-            ALPHA = A( I, I )
-            A( I, I ) = ONE
-            CALL CLARF( 'Left', M-I+1, N-I, A( I, I ), 1,
-     $                  CONJG( TAU( I ) ), A( I, I+1 ), LDA, WORK )
-            A( I, I ) = ALPHA
+            CALL CLARF1F( 'Left', M-I+1, N-I, A( I, I ), 1,
+     $                    CONJG( TAU( I ) ), A( I, I+1 ), LDA, WORK )
          END IF
    10 CONTINUE
       RETURN
diff --git a/SRC/cgeqrf.f b/SRC/cgeqrf.f
index 4b75edea0d..f7421385b6 100644
--- a/SRC/cgeqrf.f
+++ b/SRC/cgeqrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEQRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgeqrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgeqrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,7 +93,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,N).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= N, otherwise.
 *>          For optimum performance LWORK >= N*NB, where NB is
 *>          the optimal blocksize.
 *>
@@ -120,7 +119,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup geqrf
 *
 *> \par Further Details:
 *  =====================
@@ -142,6 +141,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -169,16 +169,16 @@ SUBROUTINE CGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input arguments
 *
+      K = MIN( M, N )
       INFO = 0
       NB = ILAENV( 1, 'CGEQRF', ' ', M, N, -1, -1 )
-      LWKOPT = N*NB
-      WORK( 1 ) = LWKOPT
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -186,19 +186,25 @@ SUBROUTINE CGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
-         INFO = -7
+      ELSE IF( .NOT.LQUERY ) THEN
+         IF( LWORK.LE.0 .OR. ( M.GT.0 .AND. LWORK.LT.MAX( 1, N ) ) )
+     $      INFO = -7
       END IF
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'CGEQRF', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
+         IF( K.EQ.0 ) THEN
+            LWKOPT = 1
+         ELSE
+            LWKOPT = N*NB
+         END IF
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      K = MIN( M, N )
       IF( K.EQ.0 ) THEN
          WORK( 1 ) = 1
          RETURN
@@ -268,7 +274,7 @@ SUBROUTINE CGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
      $   CALL CGEQR2( M-I+1, N-I+1, A( I, I ), LDA, TAU( I ), WORK,
      $                IINFO )
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK(IWS)
       RETURN
 *
 *     End of CGEQRF
diff --git a/SRC/cgeqrfp.f b/SRC/cgeqrfp.f
index 995404f43e..3873bb3ad0 100644
--- a/SRC/cgeqrfp.f
+++ b/SRC/cgeqrfp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEQRFP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgeqrfp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgeqrfp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,7 +95,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,N).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= N, otherwise.
 *>          For optimum performance LWORK >= N*NB, where NB is
 *>          the optimal blocksize.
 *>
@@ -122,7 +121,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup geqrfp
 *
 *> \par Further Details:
 *  =====================
@@ -146,6 +145,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -162,8 +162,8 @@ SUBROUTINE CGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *     .. Local Scalars ..
       LOGICAL            LQUERY
-      INTEGER            I, IB, IINFO, IWS, K, LDWORK, LWKOPT, NB,
-     $                   NBMIN, NX
+      INTEGER            I, IB, IINFO, IWS, K, LDWORK, LWKMIN, LWKOPT,
+     $                   NB, NBMIN, NX
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CGEQR2P, CLARFB, CLARFT, XERBLA
@@ -173,7 +173,8 @@ SUBROUTINE CGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -181,8 +182,16 @@ SUBROUTINE CGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
       INFO = 0
       NB = ILAENV( 1, 'CGEQRF', ' ', M, N, -1, -1 )
-      LWKOPT = N*NB
-      WORK( 1 ) = LWKOPT
+      K = MIN( M, N )
+      IF( K.EQ.0 ) THEN
+         LWKMIN = 1
+         LWKOPT = 1
+      ELSE
+         LWKMIN = N
+         LWKOPT = N*NB
+      END IF
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+*
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -190,7 +199,7 @@ SUBROUTINE CGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -7
       END IF
       IF( INFO.NE.0 ) THEN
@@ -202,7 +211,6 @@ SUBROUTINE CGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *     Quick return if possible
 *
-      K = MIN( M, N )
       IF( K.EQ.0 ) THEN
          WORK( 1 ) = 1
          RETURN
@@ -210,7 +218,7 @@ SUBROUTINE CGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
       NBMIN = 2
       NX = 0
-      IWS = N
+      IWS = LWKMIN
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
 *
 *        Determine when to cross over from blocked to unblocked code.
@@ -272,7 +280,7 @@ SUBROUTINE CGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
      $   CALL CGEQR2P( M-I+1, N-I+1, A( I, I ), LDA, TAU( I ), WORK,
      $                IINFO )
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK( IWS )
       RETURN
 *
 *     End of CGEQRFP
diff --git a/SRC/cgeqrt.f b/SRC/cgeqrt.f
index c5eeddf7da..65c0e634cf 100644
--- a/SRC/cgeqrt.f
+++ b/SRC/cgeqrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEQRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgeqrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgeqrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,7 +106,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup geqrt
 *
 *> \par Further Details:
 *  =====================
@@ -138,6 +136,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGEQRT( M, N, NB, A, LDA, T, LDT, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -195,9 +194,11 @@ SUBROUTINE CGEQRT( M, N, NB, A, LDA, T, LDT, WORK, INFO )
 *     Compute the QR factorization of the current block A(I:M,I:I+IB-1)
 *
          IF( USE_RECURSIVE_QR ) THEN
-            CALL CGEQRT3( M-I+1, IB, A(I,I), LDA, T(1,I), LDT, IINFO )
+            CALL CGEQRT3( M-I+1, IB, A(I,I), LDA, T(1,I), LDT,
+     $                    IINFO )
          ELSE
-            CALL CGEQRT2( M-I+1, IB, A(I,I), LDA, T(1,I), LDT, IINFO )
+            CALL CGEQRT2( M-I+1, IB, A(I,I), LDA, T(1,I), LDT,
+     $                    IINFO )
          END IF
          IF( I+IB.LE.N ) THEN
 *
diff --git a/SRC/cgeqrt2.f b/SRC/cgeqrt2.f
index c48d8eaae5..45acfe5203 100644
--- a/SRC/cgeqrt2.f
+++ b/SRC/cgeqrt2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEQRT2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgeqrt2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgeqrt2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,7 +95,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup geqrt2
 *
 *> \par Further Details:
 *  =====================
@@ -124,6 +122,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGEQRT2( M, N, A, LDA, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -154,10 +153,10 @@ SUBROUTINE CGEQRT2( M, N, A, LDA, T, LDT, INFO )
 *     Test the input arguments
 *
       INFO = 0
-      IF( M.LT.0 ) THEN
-         INFO = -1
-      ELSE IF( N.LT.0 ) THEN
+      IF( N.LT.0 ) THEN
          INFO = -2
+      ELSE IF( M.LT.N ) THEN
+         INFO = -1
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
       ELSE IF( LDT.LT.MAX( 1, N ) ) THEN
diff --git a/SRC/cgeqrt3.f b/SRC/cgeqrt3.f
index f62aee4b50..53b23b4d5b 100644
--- a/SRC/cgeqrt3.f
+++ b/SRC/cgeqrt3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGEQRT3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgeqrt3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgeqrt3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -100,7 +98,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup geqrt3
 *
 *> \par Further Details:
 *  =====================
@@ -129,6 +127,7 @@
 *>
 *  =====================================================================
       RECURSIVE SUBROUTINE CGEQRT3( M, N, A, LDA, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cgerfs.f b/SRC/cgerfs.f
index 6026c4bee9..918d422a0f 100644
--- a/SRC/cgerfs.f
+++ b/SRC/cgerfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGERFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgerfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgerfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -178,11 +176,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup gerfs
 *
 *  =====================================================================
-      SUBROUTINE CGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
+      SUBROUTINE CGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
+     $                   LDB,
      $                   X, LDX, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -229,7 +229,8 @@ SUBROUTINE CGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
       EXTERNAL           LSAME, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CGEMV, CGETRS, CLACN2, XERBLA
+      EXTERNAL           CAXPY, CCOPY, CGEMV, CGETRS, CLACN2,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MAX, REAL
@@ -290,7 +291,7 @@ SUBROUTINE CGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
       NZ = N + 1
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -307,7 +308,8 @@ SUBROUTINE CGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
 *        where op(A) = A, A**T, or A**H, depending on TRANS.
 *
          CALL CCOPY( N, B( 1, J ), 1, WORK, 1 )
-         CALL CGEMV( TRANS, N, N, -ONE, A, LDA, X( 1, J ), 1, ONE, WORK,
+         CALL CGEMV( TRANS, N, N, -ONE, A, LDA, X( 1, J ), 1, ONE,
+     $               WORK,
      $               1 )
 *
 *        Compute componentwise relative backward error from formula
@@ -394,10 +396,11 @@ SUBROUTINE CGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
 *
          DO 90 I = 1, N
             IF( RWORK( I ).GT.SAFE2 ) THEN
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I )
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I )
             ELSE
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I ) +
-     $                      SAFE1
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I ) + SAFE1
             END IF
    90    CONTINUE
 *
diff --git a/SRC/cgerfsx.f b/SRC/cgerfsx.f
index d6682654fa..e707e9cf22 100644
--- a/SRC/cgerfsx.f
+++ b/SRC/cgerfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGERFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgerfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgerfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -404,13 +402,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup gerfsx
 *
 *  =====================================================================
-      SUBROUTINE CGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE CGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    R, C, B, LDB, X, LDX, RCOND, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -473,7 +473,8 @@ SUBROUTINE CGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *     ..
 *     .. External Functions ..
       EXTERNAL           LSAME, ILATRANS, ILAPREC
-      EXTERNAL           SLAMCH, CLANGE, CLA_GERCOND_X, CLA_GERCOND_C
+      EXTERNAL           SLAMCH, CLANGE, CLA_GERCOND_X,
+     $                   CLA_GERCOND_C
       REAL               SLAMCH, CLANGE, CLA_GERCOND_X, CLA_GERCOND_C
       LOGICAL            LSAME
       INTEGER            ILATRANS, ILAPREC
@@ -606,7 +607,8 @@ SUBROUTINE CGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
          NORM = '1'
       END IF
       ANORM = CLANGE( NORM, N, N, A, LDA, RWORK )
-      CALL CGECON( NORM, N, AF, LDAF, ANORM, RCOND, WORK, RWORK, INFO )
+      CALL CGECON( NORM, N, AF, LDAF, ANORM, RCOND, WORK, RWORK,
+     $             INFO )
 *
 *     Perform refinement on each right-hand side
 *
@@ -639,13 +641,16 @@ SUBROUTINE CGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *     Compute scaled normwise condition number cond(A*C).
 *
          IF ( COLEQU .AND. NOTRAN ) THEN
-            RCOND_TMP = CLA_GERCOND_C( TRANS, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = CLA_GERCOND_C( TRANS, N, A, LDA, AF, LDAF,
+     $                                 IPIV,
      $           C, .TRUE., INFO, WORK, RWORK )
          ELSE IF ( ROWEQU .AND. .NOT. NOTRAN ) THEN
-            RCOND_TMP = CLA_GERCOND_C( TRANS, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = CLA_GERCOND_C( TRANS, N, A, LDA, AF, LDAF,
+     $                                 IPIV,
      $           R, .TRUE., INFO, WORK, RWORK )
          ELSE
-            RCOND_TMP = CLA_GERCOND_C( TRANS, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = CLA_GERCOND_C( TRANS, N, A, LDA, AF, LDAF,
+     $                                 IPIV,
      $           C, .FALSE., INFO, WORK, RWORK )
          END IF
          DO J = 1, NRHS
diff --git a/SRC/cgerq2.f b/SRC/cgerq2.f
index a2cf5cf696..3b8a959387 100644
--- a/SRC/cgerq2.f
+++ b/SRC/cgerq2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGERQ2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgerq2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgerq2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,7 +96,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup gerq2
 *
 *> \par Further Details:
 *  =====================
@@ -120,6 +118,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGERQ2( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -134,16 +133,11 @@ SUBROUTINE CGERQ2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      COMPLEX            ONE
-      PARAMETER          ( ONE = ( 1.0E+0, 0.0E+0 ) )
-*     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      COMPLEX            ALPHA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLACGV, CLARF, CLARFG, XERBLA
+      EXTERNAL           CLACGV, CLARF1L, CLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -173,16 +167,13 @@ SUBROUTINE CGERQ2( M, N, A, LDA, TAU, WORK, INFO )
 *        A(m-k+i,1:n-k+i-1)
 *
          CALL CLACGV( N-K+I, A( M-K+I, 1 ), LDA )
-         ALPHA = A( M-K+I, N-K+I )
-         CALL CLARFG( N-K+I, ALPHA, A( M-K+I, 1 ), LDA,
+         CALL CLARFG( N-K+I, A( M-K+I, N-K+I ), A( M-K+I, 1 ), LDA,
      $                TAU( I ) )
 *
 *        Apply H(i) to A(1:m-k+i-1,1:n-k+i) from the right
 *
-         A( M-K+I, N-K+I ) = ONE
-         CALL CLARF( 'Right', M-K+I-1, N-K+I, A( M-K+I, 1 ), LDA,
-     $               TAU( I ), A, LDA, WORK )
-         A( M-K+I, N-K+I ) = ALPHA
+         CALL CLARF1L( 'Right', M-K+I-1, N-K+I, A( M-K+I, 1 ), LDA,
+     $                 TAU( I ), A, LDA, WORK )
          CALL CLACGV( N-K+I-1, A( M-K+I, 1 ), LDA )
    10 CONTINUE
       RETURN
diff --git a/SRC/cgerqf.f b/SRC/cgerqf.f
index 2df1936205..bf7f7c52b8 100644
--- a/SRC/cgerqf.f
+++ b/SRC/cgerqf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGERQF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgerqf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgerqf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,7 +86,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,M).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= M, otherwise.
 *>          For optimum performance LWORK >= M*NB, where NB is
 *>          the optimal blocksize.
 *>
@@ -113,7 +112,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup gerqf
 *
 *> \par Further Details:
 *  =====================
@@ -135,6 +134,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CGERQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -162,7 +162,8 @@ SUBROUTINE CGERQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -186,10 +187,11 @@ SUBROUTINE CGERQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
             NB = ILAENV( 1, 'CGERQF', ' ', M, N, -1, -1 )
             LWKOPT = M*NB
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
-         IF( LWORK.LT.MAX( 1, M ) .AND. .NOT.LQUERY ) THEN
-            INFO = -7
+         IF ( .NOT.LQUERY ) THEN
+            IF( LWORK.LE.0 .OR. ( N.GT.0 .AND. LWORK.LT.MAX( 1, M ) ) )
+     $         INFO = -7
          END IF
       END IF
 *
@@ -246,7 +248,8 @@ SUBROUTINE CGERQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *           Compute the RQ factorization of the current block
 *           A(m-k+i:m-k+i+ib-1,1:n-k+i+ib-1)
 *
-            CALL CGERQ2( IB, N-K+I+IB-1, A( M-K+I, 1 ), LDA, TAU( I ),
+            CALL CGERQ2( IB, N-K+I+IB-1, A( M-K+I, 1 ), LDA,
+     $                   TAU( I ),
      $                   WORK, IINFO )
             IF( M-K+I.GT.1 ) THEN
 *
@@ -276,7 +279,7 @@ SUBROUTINE CGERQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
       IF( MU.GT.0 .AND. NU.GT.0 )
      $   CALL CGERQ2( MU, NU, A, LDA, TAU, WORK, IINFO )
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK(IWS)
       RETURN
 *
 *     End of CGERQF
diff --git a/SRC/cgesc2.f b/SRC/cgesc2.f
index 129e498d9e..79d0d23d84 100644
--- a/SRC/cgesc2.f
+++ b/SRC/cgesc2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGESC2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgesc2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgesc2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,7 +100,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEauxiliary
+*> \ingroup gesc2
 *
 *> \par Contributors:
 *  ==================
@@ -112,6 +110,7 @@
 *
 *  =====================================================================
       SUBROUTINE CGESC2( N, A, LDA, RHS, IPIV, JPIV, SCALE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -138,7 +137,7 @@ SUBROUTINE CGESC2( N, A, LDA, RHS, IPIV, JPIV, SCALE )
       COMPLEX            TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLASWP, CSCAL, SLABAD
+      EXTERNAL           CLASWP, CSCAL
 *     ..
 *     .. External Functions ..
       INTEGER            ICAMAX
@@ -155,7 +154,6 @@ SUBROUTINE CGESC2( N, A, LDA, RHS, IPIV, JPIV, SCALE )
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Apply permutations IPIV to RHS
 *
diff --git a/SRC/cgesdd.f b/SRC/cgesdd.f
index 12194dc7f6..b7adcd7b69 100644
--- a/SRC/cgesdd.f
+++ b/SRC/cgesdd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGESDD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgesdd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgesdd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -53,12 +51,6 @@
 *>
 *> Note that the routine returns VT = V**H, not V.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -213,7 +205,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEsing
+*> \ingroup gesdd
 *
 *> \par Contributors:
 *  ==================
@@ -274,7 +266,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
       COMPLEX            CDUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEBRD, CGELQF, CGEMM, CGEQRF, CLACP2, CLACPY,
+      EXTERNAL           CGEBRD, CGELQF, CGEMM, CGEQRF, CLACP2,
+     $                   CLACPY,
      $                   CLACRM, CLARCM, CLASCL, CLASET, CUNGBR, CUNGLQ,
      $                   CUNGQR, CUNMBR, SBDSDC, SLASCL, XERBLA
 *     ..
@@ -293,8 +286,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
       INFO   = 0
       MINMN  = MIN( M, N )
-      MNTHR1 = INT( MINMN*17.0E0 / 9.0E0 )
-      MNTHR2 = INT( MINMN*5.0E0 / 3.0E0 )
+      MNTHR1 = INT( REAL( MINMN )*17.0E0 / 9.0E0 )
+      MNTHR2 = INT( REAL( MINMN )*5.0E0 / 3.0E0 )
       WNTQA  = LSAME( JOBZ, 'A' )
       WNTQS  = LSAME( JOBZ, 'S' )
       WNTQAS = WNTQA .OR. WNTQS
@@ -349,7 +342,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
      $                   CDUM(1), CDUM(1), -1, IERR )
             LWORK_CGEBRD_NN = INT( CDUM(1) )
 *
-            CALL CGEQRF( M, N, CDUM(1), M, CDUM(1), CDUM(1), -1, IERR )
+            CALL CGEQRF( M, N, CDUM(1), M, CDUM(1), CDUM(1), -1,
+     $                   IERR )
             LWORK_CGEQRF_MN = INT( CDUM(1) )
 *
             CALL CUNGBR( 'P', N, N, N, CDUM(1), N, CDUM(1), CDUM(1),
@@ -490,7 +484,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
      $                   CDUM(1), CDUM(1), -1, IERR )
             LWORK_CGEBRD_MM = INT( CDUM(1) )
 *
-            CALL CGELQF( M, N, CDUM(1), M, CDUM(1), CDUM(1), -1, IERR )
+            CALL CGELQF( M, N, CDUM(1), M, CDUM(1), CDUM(1), -1,
+     $                   IERR )
             LWORK_CGELQF_MN = INT( CDUM(1) )
 *
             CALL CUNGBR( 'P', M, N, M, CDUM(1), M, CDUM(1), CDUM(1),
@@ -680,7 +675,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer N [tau] + N*NB [work]
 *              RWorkspace: need   0
 *
-               CALL CGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL CGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
 *              Zero out below R
@@ -697,7 +693,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer 2*N [tauq, taup] + 2*N*NB [work]
 *              RWorkspace: need   N [e]
 *
-               CALL CGEBRD( N, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+               CALL CGEBRD( N, N, A, LDA, S, RWORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
      $                      IERR )
                NRWORK = IE + N
@@ -737,13 +734,15 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer N*N [U] + N*N [R] + N [tau] + N*NB [work]
 *              RWorkspace: need   0
 *
-               CALL CGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL CGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
 *              Copy R to WORK( IR ), zeroing out below it
 *
                CALL CLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
-               CALL CLASET( 'L', N-1, N-1, CZERO, CZERO, WORK( IR+1 ),
+               CALL CLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                      WORK( IR+1 ),
      $                      LDWRKR )
 *
 *              Generate Q in A
@@ -776,7 +775,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = IE + N
                IRVT = IRU + N*N
                NRWORK = IRVT + N*N
-               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -788,7 +788,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                CALL CLACP2( 'F', N, N, RWORK( IRU ), N, WORK( IU ),
      $                      LDWRKU )
-               CALL CUNMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ), LDWRKR,
+               CALL CUNMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ),
+     $                      LDWRKR,
      $                      WORK( ITAUQ ), WORK( IU ), LDWRKU,
      $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
@@ -799,7 +800,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              RWorkspace: need   0
 *
                CALL CLACP2( 'F', N, N, RWORK( IRVT ), N, VT, LDVT )
-               CALL CUNMBR( 'P', 'R', 'C', N, N, N, WORK( IR ), LDWRKR,
+               CALL CUNMBR( 'P', 'R', 'C', N, N, N, WORK( IR ),
+     $                      LDWRKR,
      $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
@@ -837,13 +839,15 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer N*N [R] + N [tau] + N*NB [work]
 *              RWorkspace: need   0
 *
-               CALL CGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL CGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
 *              Copy R to WORK(IR), zeroing out below it
 *
                CALL CLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
-               CALL CLASET( 'L', N-1, N-1, CZERO, CZERO, WORK( IR+1 ),
+               CALL CLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                      WORK( IR+1 ),
      $                      LDWRKR )
 *
 *              Generate Q in A
@@ -876,7 +880,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = IE + N
                IRVT = IRU + N*N
                NRWORK = IRVT + N*N
-               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -887,7 +892,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              RWorkspace: need   0
 *
                CALL CLACP2( 'F', N, N, RWORK( IRU ), N, U, LDU )
-               CALL CUNMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ), LDWRKR,
+               CALL CUNMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ),
+     $                      LDWRKR,
      $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
@@ -898,7 +904,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              RWorkspace: need   0
 *
                CALL CLACP2( 'F', N, N, RWORK( IRVT ), N, VT, LDVT )
-               CALL CUNMBR( 'P', 'R', 'C', N, N, N, WORK( IR ), LDWRKR,
+               CALL CUNMBR( 'P', 'R', 'C', N, N, N, WORK( IR ),
+     $                      LDWRKR,
      $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
@@ -908,7 +915,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              RWorkspace: need   0
 *
                CALL CLACPY( 'F', N, N, U, LDU, WORK( IR ), LDWRKR )
-               CALL CGEMM( 'N', 'N', M, N, N, CONE, A, LDA, WORK( IR ),
+               CALL CGEMM( 'N', 'N', M, N, N, CONE, A, LDA,
+     $                     WORK( IR ),
      $                     LDWRKR, CZERO, U, LDU )
 *
             ELSE IF( WNTQA ) THEN
@@ -930,7 +938,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer N*N [U] + N [tau] + N*NB [work]
 *              RWorkspace: need   0
 *
-               CALL CGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL CGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
                CALL CLACPY( 'L', M, N, A, LDA, U, LDU )
 *
@@ -956,7 +965,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer N*N [U] + 2*N [tauq, taup] + 2*N*NB [work]
 *              RWorkspace: need   N [e]
 *
-               CALL CGEBRD( N, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+               CALL CGEBRD( N, N, A, LDA, S, RWORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
      $                      IERR )
                IRU = IE + N
@@ -969,7 +979,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: need   0
 *              RWorkspace: need   N [e] + N*N [RU] + N*N [RVT] + BDSPAC
 *
-               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1001,7 +1012,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: need   N*N [U]
 *              RWorkspace: need   0
 *
-               CALL CGEMM( 'N', 'N', M, N, N, CONE, U, LDU, WORK( IU ),
+               CALL CGEMM( 'N', 'N', M, N, N, CONE, U, LDU,
+     $                     WORK( IU ),
      $                     LDWRKU, CZERO, A, LDA )
 *
 *              Copy left singular vectors of A from A to U
@@ -1039,7 +1051,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: need   0
 *              RWorkspace: need   N [e] + BDSPAC
 *
-               CALL SBDSDC( 'U', 'N', N, S, RWORK( IE ), DUM, 1,DUM,1,
+               CALL SBDSDC( 'U', 'N', N, S, RWORK( IE ), DUM, 1,DUM,
+     $                      1,
      $                      DUM, IDUM, RWORK( NRWORK ), IWORK, INFO )
             ELSE IF( WNTQO ) THEN
                IU = NWORK
@@ -1084,7 +1097,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: need   0
 *              RWorkspace: need   N [e] + N*N [RU] + N*N [RVT] + BDSPAC
 *
-               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1107,7 +1121,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                NRWORK = IRVT
                DO 20 I = 1, M, LDWRKU
                   CHUNK = MIN( M-I+1, LDWRKU )
-                  CALL CLACRM( CHUNK, N, A( I, 1 ), LDA, RWORK( IRU ),
+                  CALL CLACRM( CHUNK, N, A( I, 1 ), LDA,
+     $                         RWORK( IRU ),
      $                         N, WORK( IU ), LDWRKU, RWORK( NRWORK ) )
                   CALL CLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
      $                         A( I, 1 ), LDA )
@@ -1143,7 +1158,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = NRWORK
                IRVT = IRU + N*N
                NRWORK = IRVT + N*N
-               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1195,7 +1211,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = NRWORK
                IRVT = IRU + N*N
                NRWORK = IRVT + N*N
-               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1275,7 +1292,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: need   0
 *              RWorkspace: need   N [e] + N*N [RU] + N*N [RVT] + BDSPAC
 *
-               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1302,12 +1320,14 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                   CALL CLASET( 'F', M, N, CZERO, CZERO, WORK( IU ),
      $                         LDWRKU )
-                  CALL CLACP2( 'F', N, N, RWORK( IRU ), N, WORK( IU ),
+                  CALL CLACP2( 'F', N, N, RWORK( IRU ), N,
+     $                         WORK( IU ),
      $                         LDWRKU )
                   CALL CUNMBR( 'Q', 'L', 'N', M, N, N, A, LDA,
      $                         WORK( ITAUQ ), WORK( IU ), LDWRKU,
      $                         WORK( NWORK ), LWORK-NWORK+1, IERR )
-                  CALL CLACPY( 'F', M, N, WORK( IU ), LDWRKU, A, LDA )
+                  CALL CLACPY( 'F', M, N, WORK( IU ), LDWRKU, A,
+     $                         LDA )
                ELSE
 *
 *                 Path 6o-slow
@@ -1349,7 +1369,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = NRWORK
                IRVT = IRU + N*N
                NRWORK = IRVT + N*N
-               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1387,7 +1408,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = NRWORK
                IRVT = IRU + N*N
                NRWORK = IRVT + N*N
-               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1445,7 +1467,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer M [tau] + M*NB [work]
 *              RWorkspace: need   0
 *
-               CALL CGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL CGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
 *              Zero out above L
@@ -1462,7 +1485,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer 2*M [tauq, taup] + 2*M*NB [work]
 *              RWorkspace: need   M [e]
 *
-               CALL CGEBRD( M, M, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+               CALL CGEBRD( M, M, A, LDA, S, RWORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
      $                      IERR )
                NRWORK = IE + M
@@ -1507,7 +1531,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer M*M [VT] + M*M [L] + M [tau] + M*NB [work]
 *              RWorkspace: need   0
 *
-               CALL CGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL CGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
 *              Copy L to WORK(IL), zeroing about above it
@@ -1546,7 +1571,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = IE + M
                IRVT = IRU + M*M
                NRWORK = IRVT + M*M
-               CALL SBDSDC( 'U', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'U', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1557,7 +1583,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              RWorkspace: need   0
 *
                CALL CLACP2( 'F', M, M, RWORK( IRU ), M, U, LDU )
-               CALL CUNMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ), LDWRKL,
+               CALL CUNMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ),
+     $                      LDWRKL,
      $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
@@ -1569,7 +1596,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                CALL CLACP2( 'F', M, M, RWORK( IRVT ), M, WORK( IVT ),
      $                      LDWKVT )
-               CALL CUNMBR( 'P', 'R', 'C', M, M, M, WORK( IL ), LDWRKL,
+               CALL CUNMBR( 'P', 'R', 'C', M, M, M, WORK( IL ),
+     $                      LDWRKL,
      $                      WORK( ITAUP ), WORK( IVT ), LDWKVT,
      $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
@@ -1581,7 +1609,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                DO 40 I = 1, N, CHUNK
                   BLK = MIN( N-I+1, CHUNK )
-                  CALL CGEMM( 'N', 'N', M, BLK, M, CONE, WORK( IVT ), M,
+                  CALL CGEMM( 'N', 'N', M, BLK, M, CONE, WORK( IVT ),
+     $                        M,
      $                        A( 1, I ), LDA, CZERO, WORK( IL ),
      $                        LDWRKL )
                   CALL CLACPY( 'F', M, BLK, WORK( IL ), LDWRKL,
@@ -1607,7 +1636,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer M*M [L] + M [tau] + M*NB [work]
 *              RWorkspace: need   0
 *
-               CALL CGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL CGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
 *              Copy L to WORK(IL), zeroing out above it
@@ -1646,7 +1676,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = IE + M
                IRVT = IRU + M*M
                NRWORK = IRVT + M*M
-               CALL SBDSDC( 'U', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'U', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1657,7 +1688,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              RWorkspace: need   0
 *
                CALL CLACP2( 'F', M, M, RWORK( IRU ), M, U, LDU )
-               CALL CUNMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ), LDWRKL,
+               CALL CUNMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ),
+     $                      LDWRKL,
      $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
@@ -1668,7 +1700,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              RWorkspace: need   0
 *
                CALL CLACP2( 'F', M, M, RWORK( IRVT ), M, VT, LDVT )
-               CALL CUNMBR( 'P', 'R', 'C', M, M, M, WORK( IL ), LDWRKL,
+               CALL CUNMBR( 'P', 'R', 'C', M, M, M, WORK( IL ),
+     $                      LDWRKL,
      $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
@@ -1678,7 +1711,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              RWorkspace: need   0
 *
                CALL CLACPY( 'F', M, M, VT, LDVT, WORK( IL ), LDWRKL )
-               CALL CGEMM( 'N', 'N', M, N, M, CONE, WORK( IL ), LDWRKL,
+               CALL CGEMM( 'N', 'N', M, N, M, CONE, WORK( IL ),
+     $                     LDWRKL,
      $                     A, LDA, CZERO, VT, LDVT )
 *
             ELSE IF( WNTQA ) THEN
@@ -1700,7 +1734,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer M*M [VT] + M [tau] + M*NB [work]
 *              RWorkspace: need   0
 *
-               CALL CGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL CGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
                CALL CLACPY( 'U', M, N, A, LDA, VT, LDVT )
 *
@@ -1726,7 +1761,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer M*M [VT] + 2*M [tauq, taup] + 2*M*NB [work]
 *              RWorkspace: need   M [e]
 *
-               CALL CGEBRD( M, M, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+               CALL CGEBRD( M, M, A, LDA, S, RWORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
      $                      IERR )
 *
@@ -1739,7 +1775,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = IE + M
                IRVT = IRU + M*M
                NRWORK = IRVT + M*M
-               CALL SBDSDC( 'U', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'U', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1771,7 +1808,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: need   M*M [VT]
 *              RWorkspace: need   0
 *
-               CALL CGEMM( 'N', 'N', M, N, M, CONE, WORK( IVT ), LDWKVT,
+               CALL CGEMM( 'N', 'N', M, N, M, CONE, WORK( IVT ),
+     $                     LDWKVT,
      $                     VT, LDVT, CZERO, A, LDA )
 *
 *              Copy right singular vectors of A from A to VT
@@ -1857,7 +1895,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: need   0
 *              RWorkspace: need   M [e] + M*M [RVT] + M*M [RU] + BDSPAC
 *
-               CALL SBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'L', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1866,7 +1905,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: need   2*M [tauq, taup] + M*M [VT]
 *              RWorkspace: need   M [e] + M*M [RVT] + M*M [RU] + 2*M*M [rwork]
 *
-               CALL CLACRM( M, M, U, LDU, RWORK( IRU ), M, WORK( IVT ),
+               CALL CLACRM( M, M, U, LDU, RWORK( IRU ), M,
+     $                      WORK( IVT ),
      $                      LDWKVT, RWORK( NRWORK ) )
                CALL CLACPY( 'F', M, M, WORK( IVT ), LDWKVT, U, LDU )
 *
@@ -1880,7 +1920,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                NRWORK = IRU
                DO 50 I = 1, N, CHUNK
                   BLK = MIN( N-I+1, CHUNK )
-                  CALL CLARCM( M, BLK, RWORK( IRVT ), M, A( 1, I ), LDA,
+                  CALL CLARCM( M, BLK, RWORK( IRVT ), M, A( 1, I ),
+     $                         LDA,
      $                         WORK( IVT ), LDWKVT, RWORK( NRWORK ) )
                   CALL CLACPY( 'F', M, BLK, WORK( IVT ), LDWKVT,
      $                         A( 1, I ), LDA )
@@ -1915,7 +1956,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRVT = NRWORK
                IRU = IRVT + M*M
                NRWORK = IRU + M*M
-               CALL SBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'L', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1967,7 +2009,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRVT = NRWORK
                IRU = IRVT + M*M
                NRWORK = IRU + M*M
-               CALL SBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'L', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -2050,7 +2093,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRVT = NRWORK
                IRU = IRVT + M*M
                NRWORK = IRU + M*M
-               CALL SBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'L', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -2075,12 +2119,14 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 CWorkspace: prefer 2*M [tauq, taup] + M*N [VT] + M*NB [work]
 *                 RWorkspace: need   M [e] + M*M [RVT]
 *
-                  CALL CLACP2( 'F', M, M, RWORK( IRVT ), M, WORK( IVT ),
+                  CALL CLACP2( 'F', M, M, RWORK( IRVT ), M,
+     $                         WORK( IVT ),
      $                         LDWKVT )
                   CALL CUNMBR( 'P', 'R', 'C', M, N, M, A, LDA,
      $                         WORK( ITAUP ), WORK( IVT ), LDWKVT,
      $                         WORK( NWORK ), LWORK-NWORK+1, IERR )
-                  CALL CLACPY( 'F', M, N, WORK( IVT ), LDWKVT, A, LDA )
+                  CALL CLACPY( 'F', M, N, WORK( IVT ), LDWKVT, A,
+     $                         LDA )
                ELSE
 *
 *                 Path 6to-slow
@@ -2102,7 +2148,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                   NRWORK = IRU
                   DO 60 I = 1, N, CHUNK
                      BLK = MIN( N-I+1, CHUNK )
-                     CALL CLARCM( M, BLK, RWORK( IRVT ), M, A( 1, I ),
+                     CALL CLARCM( M, BLK, RWORK( IRVT ), M, A( 1,
+     $                            I ),
      $                            LDA, WORK( IVT ), LDWKVT,
      $                            RWORK( NRWORK ) )
                      CALL CLACPY( 'F', M, BLK, WORK( IVT ), LDWKVT,
@@ -2121,7 +2168,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRVT = NRWORK
                IRU = IRVT + M*M
                NRWORK = IRU + M*M
-               CALL SBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'L', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -2160,7 +2208,8 @@ SUBROUTINE CGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = IRVT + M*M
                NRWORK = IRU + M*M
 *
-               CALL SBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL SBDSDC( 'L', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
diff --git a/SRC/cgesv.f b/SRC/cgesv.f
index d18ed03758..06342380bc 100644
--- a/SRC/cgesv.f
+++ b/SRC/cgesv.f
@@ -1,3 +1,5 @@
+*> \addtogroup gesv
+*>
 *> \brief <b> CGESV computes the solution to system of linear equations A * X = B for GE matrices (simple driver) </b>
 *
 *  =========== DOCUMENTATION ===========
@@ -5,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGESV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgesv.f">
 *> [TGZ]</a>
@@ -13,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgesv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,10 +115,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEsolve
+*> \ingroup gesv
 *
 *  =====================================================================
       SUBROUTINE CGESV( N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cgesvd.f b/SRC/cgesvd.f
index 239b134315..656e3dfe3c 100644
--- a/SRC/cgesvd.f
+++ b/SRC/cgesvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGESVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgesvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgesvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -206,11 +204,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEsing
+*> \ingroup gesvd
 *
 *  =====================================================================
-      SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
+      SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT,
+     $                   LDVT,
      $                   WORK, LWORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -252,15 +252,17 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
       COMPLEX            CDUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CBDSQR, CGEBRD, CGELQF, CGEMM, CGEQRF, CLACPY,
+      EXTERNAL           CBDSQR, CGEBRD, CGELQF, CGEMM, CGEQRF,
+     $                   CLACPY,
      $                   CLASCL, CLASET, CUNGBR, CUNGLQ, CUNGQR, CUNMBR,
      $                   SLASCL, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               CLANGE, SLAMCH
-      EXTERNAL           LSAME, ILAENV, CLANGE, SLAMCH
+      REAL               CLANGE, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, CLANGE, SLAMCH,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN, SQRT
@@ -321,9 +323,11 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
             CALL CGEQRF( M, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
             LWORK_CGEQRF = INT( CDUM(1) )
 *           Compute space needed for CUNGQR
-            CALL CUNGQR( M, N, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
+            CALL CUNGQR( M, N, N, A, LDA, CDUM(1), CDUM(1), -1,
+     $                   IERR )
             LWORK_CUNGQR_N = INT( CDUM(1) )
-            CALL CUNGQR( M, M, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
+            CALL CUNGQR( M, M, N, A, LDA, CDUM(1), CDUM(1), -1,
+     $                   IERR )
             LWORK_CUNGQR_M = INT( CDUM(1) )
 *           Compute space needed for CGEBRD
             CALL CGEBRD( N, N, A, LDA, S, DUM(1), CDUM(1),
@@ -474,7 +478,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
             CALL CUNGLQ( N, N, M, CDUM(1), N, CDUM(1), CDUM(1), -1,
      $                   IERR )
             LWORK_CUNGLQ_N = INT( CDUM(1) )
-            CALL CUNGLQ( M, N, M, A, LDA, CDUM(1), CDUM(1), -1, IERR )
+            CALL CUNGLQ( M, N, M, A, LDA, CDUM(1), CDUM(1), -1,
+     $                   IERR )
             LWORK_CUNGLQ_M = INT( CDUM(1) )
 *           Compute space needed for CGEBRD
             CALL CGEBRD( M, M, A, LDA, S, DUM(1), CDUM(1),
@@ -615,7 +620,7 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
             END IF
          END IF
          MAXWRK = MAX( MINWRK, MAXWRK )
-         WORK( 1 ) = MAXWRK
+         WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
             INFO = -13
@@ -673,13 +678,15 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              (CWorkspace: need 2*N, prefer N+N*NB)
 *              (RWorkspace: need 0)
 *
-               CALL CGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( IWORK ),
+               CALL CGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( IWORK ),
      $                      LWORK-IWORK+1, IERR )
 *
 *              Zero out below R
 *
                IF( N .GT. 1 ) THEN
-                  CALL CLASET( 'L', N-1, N-1, CZERO, CZERO, A( 2, 1 ),
+                  CALL CLASET( 'L', N-1, N-1, CZERO, CZERO, A( 2,
+     $                         1 ),
      $                         LDA )
                END IF
                IE = 1
@@ -691,7 +698,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
 *              (RWorkspace: need N)
 *
-               CALL CGEBRD( N, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+               CALL CGEBRD( N, N, A, LDA, S, RWORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( IWORK ), LWORK-IWORK+1,
      $                      IERR )
                NCVT = 0
@@ -712,7 +720,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              (CWorkspace: 0)
 *              (RWorkspace: need BDSPAC)
 *
-               CALL CBDSQR( 'U', N, NCVT, 0, 0, S, RWORK( IE ), A, LDA,
+               CALL CBDSQR( 'U', N, NCVT, 0, 0, S, RWORK( IE ), A,
+     $                      LDA,
      $                      CDUM, 1, CDUM, 1, RWORK( IRWORK ), INFO )
 *
 *              If right singular vectors desired in VT, copy them there
@@ -762,7 +771,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
 *                 Copy R to WORK(IR) and zero out below it
 *
-                  CALL CLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
+                  CALL CLACPY( 'U', N, N, A, LDA, WORK( IR ),
+     $                         LDWRKR )
                   CALL CLASET( 'L', N-1, N-1, CZERO, CZERO,
      $                         WORK( IR+1 ), LDWRKR )
 *
@@ -781,7 +791,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 (CWorkspace: need N*N+3*N, prefer N*N+2*N+2*N*NB)
 *                 (RWorkspace: need N)
 *
-                  CALL CGEBRD( N, N, WORK( IR ), LDWRKR, S, RWORK( IE ),
+                  CALL CGEBRD( N, N, WORK( IR ), LDWRKR, S,
+     $                         RWORK( IE ),
      $                         WORK( ITAUQ ), WORK( ITAUP ),
      $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
@@ -799,7 +810,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 (CWorkspace: need N*N)
 *                 (RWorkspace: need BDSPAC)
 *
-                  CALL CBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ), CDUM, 1,
+                  CALL CBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ), CDUM,
+     $                         1,
      $                         WORK( IR ), LDWRKR, CDUM, 1,
      $                         RWORK( IRWORK ), INFO )
                   IU = ITAUQ
@@ -811,7 +823,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                   DO 10 I = 1, M, LDWRKU
                      CHUNK = MIN( M-I+1, LDWRKU )
-                     CALL CGEMM( 'N', 'N', CHUNK, N, N, CONE, A( I, 1 ),
+                     CALL CGEMM( 'N', 'N', CHUNK, N, N, CONE, A( I,
+     $                           1 ),
      $                           LDA, WORK( IR ), LDWRKR, CZERO,
      $                           WORK( IU ), LDWRKU )
                      CALL CLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
@@ -848,7 +861,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 (CWorkspace: need 0)
 *                 (RWorkspace: need BDSPAC)
 *
-                  CALL CBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ), CDUM, 1,
+                  CALL CBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ), CDUM,
+     $                         1,
      $                         A, LDA, CDUM, 1, RWORK( IRWORK ), INFO )
 *
                END IF
@@ -918,7 +932,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
                   CALL CGEBRD( N, N, VT, LDVT, S, RWORK( IE ),
      $                         WORK( ITAUQ ), WORK( ITAUP ),
      $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  CALL CLACPY( 'L', N, N, VT, LDVT, WORK( IR ), LDWRKR )
+                  CALL CLACPY( 'L', N, N, VT, LDVT, WORK( IR ),
+     $                         LDWRKR )
 *
 *                 Generate left vectors bidiagonalizing R in WORK(IR)
 *                 (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
@@ -954,7 +969,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                   DO 20 I = 1, M, LDWRKU
                      CHUNK = MIN( M-I+1, LDWRKU )
-                     CALL CGEMM( 'N', 'N', CHUNK, N, N, CONE, A( I, 1 ),
+                     CALL CGEMM( 'N', 'N', CHUNK, N, N, CONE, A( I,
+     $                           1 ),
      $                           LDA, WORK( IR ), LDWRKR, CZERO,
      $                           WORK( IU ), LDWRKU )
                      CALL CLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
@@ -1104,7 +1120,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: need N*N)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL CBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ), CDUM,
+                     CALL CBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ),
+     $                            CDUM,
      $                            1, WORK( IR ), LDWRKR, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -1171,7 +1188,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL CBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ), CDUM,
+                     CALL CBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ),
+     $                            CDUM,
      $                            1, U, LDU, CDUM, 1, RWORK( IRWORK ),
      $                            INFO )
 *
@@ -1348,7 +1366,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL CUNGBR( 'P', N, N, N, A, LDA, WORK( ITAUP ),
+                     CALL CUNGBR( 'P', N, N, N, A, LDA,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + N
 *
@@ -1439,7 +1458,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                                 prefer N*N+2*N+(N-1)*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL CUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+                     CALL CUNGBR( 'P', N, N, N, VT, LDVT,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + N
 *
@@ -1449,7 +1469,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: need N*N)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL CBDSQR( 'U', N, N, N, 0, S, RWORK( IE ), VT,
+                     CALL CBDSQR( 'U', N, N, N, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, WORK( IU ), LDWRKU, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -1515,7 +1536,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL CUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+                     CALL CUNGBR( 'P', N, N, N, VT, LDVT,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + N
 *
@@ -1525,7 +1547,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL CBDSQR( 'U', N, N, M, 0, S, RWORK( IE ), VT,
+                     CALL CBDSQR( 'U', N, N, M, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, U, LDU, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -1609,7 +1632,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: need N*N)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL CBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ), CDUM,
+                     CALL CBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ),
+     $                            CDUM,
      $                            1, WORK( IR ), LDWRKR, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -1681,7 +1705,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL CBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ), CDUM,
+                     CALL CBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ),
+     $                            CDUM,
      $                            1, U, LDU, CDUM, 1, RWORK( IRWORK ),
      $                            INFO )
 *
@@ -1862,7 +1887,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL CUNGBR( 'P', N, N, N, A, LDA, WORK( ITAUP ),
+                     CALL CUNGBR( 'P', N, N, N, A, LDA,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + N
 *
@@ -1954,7 +1980,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                                 prefer N*N+2*N+(N-1)*NB)
 *                    (RWorkspace: need   0)
 *
-                     CALL CUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+                     CALL CUNGBR( 'P', N, N, N, VT, LDVT,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + N
 *
@@ -1964,7 +1991,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: need N*N)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL CBDSQR( 'U', N, N, N, 0, S, RWORK( IE ), VT,
+                     CALL CBDSQR( 'U', N, N, N, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, WORK( IU ), LDWRKU, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -2034,7 +2062,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL CUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+                     CALL CUNGBR( 'P', N, N, N, VT, LDVT,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + N
 *
@@ -2044,7 +2073,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL CBDSQR( 'U', N, N, M, 0, S, RWORK( IE ), VT,
+                     CALL CBDSQR( 'U', N, N, M, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, U, LDU, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -2185,7 +2215,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              (CWorkspace: need 2*M, prefer M+M*NB)
 *              (RWorkspace: 0)
 *
-               CALL CGELQF( M, N, A, LDA, WORK( ITAU ), WORK( IWORK ),
+               CALL CGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( IWORK ),
      $                      LWORK-IWORK+1, IERR )
 *
 *              Zero out above L
@@ -2201,7 +2232,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
 *              (RWorkspace: need M)
 *
-               CALL CGEBRD( M, M, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+               CALL CGEBRD( M, M, A, LDA, S, RWORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( IWORK ), LWORK-IWORK+1,
      $                      IERR )
                IF( WNTUO .OR. WNTUAS ) THEN
@@ -2223,7 +2255,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              (CWorkspace: 0)
 *              (RWorkspace: need BDSPAC)
 *
-               CALL CBDSQR( 'U', M, 0, NRU, 0, S, RWORK( IE ), CDUM, 1,
+               CALL CBDSQR( 'U', M, 0, NRU, 0, S, RWORK( IE ), CDUM,
+     $                      1,
      $                      A, LDA, CDUM, 1, RWORK( IRWORK ), INFO )
 *
 *              If left singular vectors desired in U, copy them there
@@ -2276,7 +2309,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
 *                 Copy L to WORK(IR) and zero out above it
 *
-                  CALL CLACPY( 'L', M, M, A, LDA, WORK( IR ), LDWRKR )
+                  CALL CLACPY( 'L', M, M, A, LDA, WORK( IR ),
+     $                         LDWRKR )
                   CALL CLASET( 'U', M-1, M-1, CZERO, CZERO,
      $                         WORK( IR+LDWRKR ), LDWRKR )
 *
@@ -2295,7 +2329,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
 *                 (RWorkspace: need M)
 *
-                  CALL CGEBRD( M, M, WORK( IR ), LDWRKR, S, RWORK( IE ),
+                  CALL CGEBRD( M, M, WORK( IR ), LDWRKR, S,
+     $                         RWORK( IE ),
      $                         WORK( ITAUQ ), WORK( ITAUP ),
      $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
@@ -2325,7 +2360,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                   DO 30 I = 1, N, CHUNK
                      BLK = MIN( N-I+1, CHUNK )
-                     CALL CGEMM( 'N', 'N', M, BLK, M, CONE, WORK( IR ),
+                     CALL CGEMM( 'N', 'N', M, BLK, M, CONE,
+     $                           WORK( IR ),
      $                           LDWRKR, A( 1, I ), LDA, CZERO,
      $                           WORK( IU ), LDWRKU )
                      CALL CLACPY( 'F', M, BLK, WORK( IU ), LDWRKU,
@@ -2362,7 +2398,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 (CWorkspace: 0)
 *                 (RWorkspace: need BDSPAC)
 *
-                  CALL CBDSQR( 'L', M, N, 0, 0, S, RWORK( IE ), A, LDA,
+                  CALL CBDSQR( 'L', M, N, 0, 0, S, RWORK( IE ), A,
+     $                         LDA,
      $                         CDUM, 1, CDUM, 1, RWORK( IRWORK ), INFO )
 *
                END IF
@@ -2413,7 +2450,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 Copy L to U, zeroing about above it
 *
                   CALL CLACPY( 'L', M, M, A, LDA, U, LDU )
-                  CALL CLASET( 'U', M-1, M-1, CZERO, CZERO, U( 1, 2 ),
+                  CALL CLASET( 'U', M-1, M-1, CZERO, CZERO, U( 1,
+     $                         2 ),
      $                         LDU )
 *
 *                 Generate Q in A
@@ -2434,7 +2472,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
                   CALL CGEBRD( M, M, U, LDU, S, RWORK( IE ),
      $                         WORK( ITAUQ ), WORK( ITAUP ),
      $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  CALL CLACPY( 'U', M, M, U, LDU, WORK( IR ), LDWRKR )
+                  CALL CLACPY( 'U', M, M, U, LDU, WORK( IR ),
+     $                         LDWRKR )
 *
 *                 Generate right vectors bidiagonalizing L in WORK(IR)
 *                 (CWorkspace: need M*M+3*M-1, prefer M*M+2*M+(M-1)*NB)
@@ -2470,7 +2509,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                   DO 40 I = 1, N, CHUNK
                      BLK = MIN( N-I+1, CHUNK )
-                     CALL CGEMM( 'N', 'N', M, BLK, M, CONE, WORK( IR ),
+                     CALL CGEMM( 'N', 'N', M, BLK, M, CONE,
+     $                           WORK( IR ),
      $                           LDWRKR, A( 1, I ), LDA, CZERO,
      $                           WORK( IU ), LDWRKU )
                      CALL CLACPY( 'F', M, BLK, WORK( IU ), LDWRKU,
@@ -2494,7 +2534,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 Copy L to U, zeroing out above it
 *
                   CALL CLACPY( 'L', M, M, A, LDA, U, LDU )
-                  CALL CLASET( 'U', M-1, M-1, CZERO, CZERO, U( 1, 2 ),
+                  CALL CLASET( 'U', M-1, M-1, CZERO, CZERO, U( 1,
+     $                         2 ),
      $                         LDU )
 *
 *                 Generate Q in A
@@ -2538,7 +2579,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 (CWorkspace: 0)
 *                 (RWorkspace: need BDSPAC)
 *
-                  CALL CBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), A, LDA,
+                  CALL CBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), A,
+     $                         LDA,
      $                         U, LDU, CDUM, 1, RWORK( IRWORK ), INFO )
 *
                END IF
@@ -2687,7 +2729,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL CBDSQR( 'U', M, N, 0, 0, S, RWORK( IE ), VT,
+                     CALL CBDSQR( 'U', M, N, 0, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, CDUM, 1, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -2862,7 +2905,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: need 3*M, prefer 2*M+M*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL CUNGBR( 'Q', M, M, M, A, LDA, WORK( ITAUQ ),
+                     CALL CUNGBR( 'Q', M, M, M, A, LDA,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + M
 *
@@ -2872,7 +2916,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL CBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), VT,
+                     CALL CBDSQR( 'U', M, N, M, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, A, LDA, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -2953,7 +2998,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+M*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL CUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL CUNGBR( 'Q', M, M, M, U, LDU,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + M
 *
@@ -3028,7 +3074,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: need 3*M, prefer 2*M+M*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL CUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL CUNGBR( 'Q', M, M, M, U, LDU,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + M
 *
@@ -3038,7 +3085,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL CBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), VT,
+                     CALL CBDSQR( 'U', M, N, M, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, U, LDU, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -3193,7 +3241,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL CBDSQR( 'U', M, N, 0, 0, S, RWORK( IE ), VT,
+                     CALL CBDSQR( 'U', M, N, 0, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, CDUM, 1, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -3372,7 +3421,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: need 3*M, prefer 2*M+M*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL CUNGBR( 'Q', M, M, M, A, LDA, WORK( ITAUQ ),
+                     CALL CUNGBR( 'Q', M, M, M, A, LDA,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + M
 *
@@ -3382,7 +3432,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL CBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), VT,
+                     CALL CBDSQR( 'U', M, N, M, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, A, LDA, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -3463,7 +3514,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+M*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL CUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL CUNGBR( 'Q', M, M, M, U, LDU,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + M
 *
@@ -3542,7 +3594,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: need 3*M, prefer 2*M+M*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL CUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL CUNGBR( 'Q', M, M, M, U, LDU,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + M
 *
@@ -3552,7 +3605,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL CBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), VT,
+                     CALL CBDSQR( 'U', M, N, M, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, U, LDU, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -3694,7 +3748,7 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
 *     Return optimal workspace in WORK(1)
 *
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
 *
       RETURN
 *
diff --git a/SRC/cgesvdq.f b/SRC/cgesvdq.f
index 1a587eca36..c309194f37 100644
--- a/SRC/cgesvdq.f
+++ b/SRC/cgesvdq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGESVDQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgesvdq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgesvdq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -363,7 +361,7 @@
 *>   an optimal implementation would do all necessary scaling before calling
 *>   CGESVD and the scaling in CGESVD can be switched off.
 *>   3. Other comments related to code optimization are given in comments in the
-*>   code, enlosed in [[double brackets]].
+*>   code, enclosed in [[double brackets]].
 *> \endverbatim
 *
 *> \par Bugs, examples and comments
@@ -404,14 +402,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEsing
+*> \ingroup gesvdq
 *
 *  =====================================================================
       SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
      $                    S, U, LDU, V, LDV, NUMRANK, IWORK, LIWORK,
      $                    CWORK, LCWORK, RWORK, LRWORK, INFO )
+      IMPLICIT NONE
 *     .. Scalar Arguments ..
-      IMPLICIT    NONE
       CHARACTER   JOBA, JOBP, JOBR, JOBU, JOBV
       INTEGER     M, N, LDA, LDU, LDV, NUMRANK, LIWORK, LCWORK, LRWORK,
      $            INFO
@@ -447,9 +445,10 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
       REAL        RDUMMY(1)
 *     ..
 *     .. External Subroutines (BLAS, LAPACK)
-      EXTERNAL    CGELQF, CGEQP3, CGEQRF, CGESVD, CLACPY, CLAPMT,
-     $            CLASCL, CLASET, CLASWP, CSSCAL, SLASET, SLASCL,
-     $            CPOCON, CUNMLQ, CUNMQR, XERBLA
+      EXTERNAL    CGELQF, CGEQP3, CGEQRF, CGESVD, CLACPY,
+     $            CLAPMT, CLASCL, CLASET, CLASWP, CSSCAL,
+     $            SLASET, SLASCL, CPOCON, CUNMLQ, CUNMQR,
+     $            XERBLA
 *     ..
 *     .. External Functions (BLAS, LAPACK)
       LOGICAL    LSAME
@@ -674,10 +673,12 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                    IF ( WNTVA ) THEN
                        CALL CGEQRF(N,N/2,U,LDU,CDUMMY,CDUMMY,-1,IERR)
                        LWRK_CGEQRF = INT( CDUMMY(1) )
-                       CALL CGESVD( 'S', 'O', N/2,N/2, V,LDV, S, U,LDU,
+                       CALL CGESVD( 'S', 'O', N/2,N/2, V,LDV, S, U,
+     $                              LDU,
      $                      V, LDV, CDUMMY, -1, RDUMMY, IERR )
                        LWRK_CGESVD2 = INT( CDUMMY(1) )
-                       CALL CUNMQR( 'R', 'C', N, N, N/2, U, LDU, CDUMMY,
+                       CALL CUNMQR( 'R', 'C', N, N, N/2, U, LDU,
+     $                              CDUMMY,
      $                      V, LDV, CDUMMY, -1, IERR )
                        LWRK_CUNMQR2 = INT( CDUMMY(1) )
                        OPTWRK2 = MAX( LWRK_CGEQP3, N/2+LWRK_CGEQRF,
@@ -696,10 +697,12 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                    IF ( WNTVA ) THEN
                       CALL CGELQF(N/2,N,U,LDU,CDUMMY,CDUMMY,-1,IERR)
                       LWRK_CGELQF = INT( CDUMMY(1) )
-                      CALL CGESVD( 'S','O', N/2,N/2, V, LDV, S, U, LDU,
+                      CALL CGESVD( 'S','O', N/2,N/2, V, LDV, S, U,
+     $                             LDU,
      $                     V, LDV, CDUMMY, -1, RDUMMY, IERR )
                       LWRK_CGESVD2 = INT( CDUMMY(1) )
-                      CALL CUNMLQ( 'R', 'N', N, N, N/2, U, LDU, CDUMMY,
+                      CALL CUNMLQ( 'R', 'N', N, N, N/2, U, LDU,
+     $                             CDUMMY,
      $                     V, LDV, CDUMMY,-1,IERR )
                       LWRK_CUNMLQ = INT( CDUMMY(1) )
                       OPTWRK2 = MAX( LWRK_CGEQP3, N/2+LWRK_CGELQF,
@@ -729,9 +732,9 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *     Return optimal workspace
 *
           IWORK(1) = IMINWRK
-          CWORK(1) = OPTWRK
-          CWORK(2) = MINWRK
-          RWORK(1) = RMINWRK
+          CWORK(1) = CMPLX( OPTWRK )
+          CWORK(2) = CMPLX( MINWRK )
+          RWORK(1) = REAL( RMINWRK )
           RETURN
       END IF
 *
@@ -774,9 +777,12 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *              Quick return: A is the M x N zero matrix.
                NUMRANK = 0
                CALL SLASET( 'G', N, 1, ZERO, ZERO, S, N )
-               IF ( WNTUS ) CALL CLASET('G', M, N, CZERO, CONE, U, LDU)
-               IF ( WNTUA ) CALL CLASET('G', M, M, CZERO, CONE, U, LDU)
-               IF ( WNTVA ) CALL CLASET('G', N, N, CZERO, CONE, V, LDV)
+               IF ( WNTUS ) CALL CLASET('G', M, N, CZERO, CONE, U,
+     $              LDU)
+               IF ( WNTUA ) CALL CLASET('G', M, M, CZERO, CONE, U,
+     $              LDU)
+               IF ( WNTVA ) CALL CLASET('G', N, N, CZERO, CONE, V,
+     $              LDV)
                IF ( WNTUF ) THEN
                    CALL CLASET( 'G', N, 1, CZERO, CZERO, CWORK, N )
                    CALL CLASET( 'G', M, N, CZERO, CONE, U, LDU )
@@ -797,7 +803,8 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
             IF ( RWORK(1) .GT. BIG / SQRT(REAL(M)) ) THEN
 *               .. to prevent overflow in the QR factorization, scale the
 *               matrix by 1/sqrt(M) if too large entry detected
-                CALL CLASCL('G',0,0,SQRT(REAL(M)),ONE, M,N, A,LDA, IERR)
+                CALL CLASCL('G',0,0,SQRT(REAL(M)),ONE, M,N, A,LDA,
+     $                       IERR)
                 ASCALED = .TRUE.
             END IF
             CALL CLASWP( N, A, LDA, 1, M-1, IWORK(N+1), 1 )
@@ -819,7 +826,8 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
           IF ( RTMP .GT. BIG / SQRT(REAL(M)) ) THEN
 *             .. to prevent overflow in the QR factorization, scale the
 *             matrix by 1/sqrt(M) if too large entry detected
-              CALL CLASCL('G',0,0, SQRT(REAL(M)),ONE, M,N, A,LDA, IERR)
+              CALL CLASCL('G',0,0, SQRT(REAL(M)),ONE, M,N, A,LDA,
+     $                     IERR)
               ASCALED = .TRUE.
           END IF
       END IF
@@ -948,7 +956,8 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *           .. compute the singular values of R = [A](1:NR,1:N)
 *
             IF ( NR .GT. 1 )
-     $          CALL CLASET( 'L', NR-1,NR-1, CZERO,CZERO, A(2,1), LDA )
+     $          CALL CLASET( 'L', NR-1,NR-1, CZERO,CZERO, A(2,1),
+     $                       LDA )
             CALL CGESVD( 'N', 'N', NR, N, A, LDA, S, U, LDU,
      $           V, LDV, CWORK, LCWORK, RWORK, INFO )
 *
@@ -968,7 +977,8 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
  1193          CONTINUE
  1192       CONTINUE
             IF ( NR .GT. 1 )
-     $          CALL CLASET( 'U', NR-1,NR-1, CZERO,CZERO, U(1,2), LDU )
+     $          CALL CLASET( 'U', NR-1,NR-1, CZERO,CZERO, U(1,2),
+     $                       LDU )
 *           .. the left singular vectors not computed, the NR right singular
 *           vectors overwrite [U](1:NR,1:NR) as conjugate transposed. These
 *           will be pre-multiplied by Q to build the left singular vectors of A.
@@ -989,7 +999,8 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *            .. copy R into [U] and overwrite [U] with the left singular vectors
              CALL CLACPY( 'U', NR, N, A, LDA, U, LDU )
              IF ( NR .GT. 1 )
-     $         CALL CLASET( 'L', NR-1, NR-1, CZERO, CZERO, U(2,1), LDU )
+     $         CALL CLASET( 'L', NR-1, NR-1, CZERO, CZERO, U(2,1),
+     $                      LDU )
 *            .. the right singular vectors not computed, the NR left singular
 *            vectors overwrite [U](1:NR,1:NR)
                 CALL CGESVD( 'O', 'N', NR, N, U, LDU, S, U, LDU,
@@ -1004,7 +1015,8 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
          IF ( ( NR .LT. M ) .AND. ( .NOT.WNTUF ) ) THEN
              CALL CLASET('A', M-NR, NR, CZERO, CZERO, U(NR+1,1), LDU)
              IF ( NR .LT. N1 ) THEN
-                CALL CLASET( 'A',NR,N1-NR,CZERO,CZERO,U(1,NR+1), LDU )
+                CALL CLASET( 'A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),
+     $                       LDU )
                 CALL CLASET( 'A',M-NR,N1-NR,CZERO,CONE,
      $               U(NR+1,NR+1), LDU )
              END IF
@@ -1032,7 +1044,8 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
  1166          CONTINUE
  1165       CONTINUE
             IF ( NR .GT. 1 )
-     $          CALL CLASET( 'U', NR-1,NR-1, CZERO,CZERO, V(1,2), LDV )
+     $          CALL CLASET( 'U', NR-1,NR-1, CZERO,CZERO, V(1,2),
+     $                       LDV )
 *           .. the left singular vectors of R**H overwrite V, the right singular
 *           vectors not computed
             IF ( WNTVR .OR. ( NR .EQ. N ) ) THEN
@@ -1062,7 +1075,8 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *               by padding a zero block. In the case NR << N, a more efficient
 *               way is to first use the QR factorization. For more details
 *               how to implement this, see the " FULL SVD " branch.
-                CALL CLASET('G', N, N-NR, CZERO, CZERO, V(1,NR+1), LDV)
+                CALL CLASET('G', N, N-NR, CZERO, CZERO, V(1,NR+1),
+     $                       LDV)
                 CALL CGESVD( 'O', 'N', N, N, V, LDV, S, U, LDU,
      $               U, LDU, CWORK(N+1), LCWORK-N, RWORK, INFO )
 *
@@ -1082,7 +1096,8 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *            .. copy R into V and overwrite V with the right singular vectors
              CALL CLACPY( 'U', NR, N, A, LDA, V, LDV )
              IF ( NR .GT. 1 )
-     $         CALL CLASET( 'L', NR-1, NR-1, CZERO, CZERO, V(2,1), LDV )
+     $         CALL CLASET( 'L', NR-1, NR-1, CZERO, CZERO, V(2,1),
+     $                      LDV )
 *            .. the right singular vectors overwrite V, the NR left singular
 *            vectors stored in U(1:NR,1:NR)
              IF ( WNTVR .OR. ( NR .EQ. N ) ) THEN
@@ -1096,7 +1111,8 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *               by padding a zero block. In the case NR << N, a more efficient
 *               way is to first use the LQ factorization. For more details
 *               how to implement this, see the " FULL SVD " branch.
-                 CALL CLASET('G', N-NR, N, CZERO,CZERO, V(NR+1,1), LDV)
+                 CALL CLASET('G', N-NR, N, CZERO,CZERO, V(NR+1,1),
+     $                        LDV)
                  CALL CGESVD( 'N', 'O', N, N, V, LDV, S, U, LDU,
      $                V, LDV, CWORK(N+1), LCWORK-N, RWORK, INFO )
                  CALL CLAPMT( .FALSE., N, N, V, LDV, IWORK )
@@ -1122,7 +1138,8 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
  1169          CONTINUE
  1168       CONTINUE
             IF ( NR .GT. 1 )
-     $          CALL CLASET( 'U', NR-1,NR-1, CZERO,CZERO, V(1,2), LDV )
+     $          CALL CLASET( 'U', NR-1,NR-1, CZERO,CZERO, V(1,2),
+     $                       LDV )
 *
 *           .. the left singular vectors of R**H overwrite [V], the NR right
 *           singular vectors of R**H stored in [U](1:NR,1:NR) as conjugate
@@ -1157,9 +1174,11 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
  1117           CONTINUE
 *
                 IF ( ( NR .LT. M ) .AND. .NOT.(WNTUF)) THEN
-                  CALL CLASET('A', M-NR,NR, CZERO,CZERO, U(NR+1,1), LDU)
+                  CALL CLASET('A', M-NR,NR, CZERO,CZERO, U(NR+1,1),
+     $                         LDU)
                   IF ( NR .LT. N1 ) THEN
-                     CALL CLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),LDU)
+                     CALL CLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),
+     $                            LDU)
                      CALL CLASET( 'A',M-NR,N1-NR,CZERO,CONE,
      $                    U(NR+1,NR+1), LDU )
                   END IF
@@ -1182,7 +1201,8 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
  1199                 CONTINUE
  1198              CONTINUE
                    IF ( NR .GT. 1 )
-     $             CALL CLASET('U',NR-1,NR-1, CZERO,CZERO, V(1,2),LDV)
+     $             CALL CLASET('U',NR-1,NR-1, CZERO,CZERO, V(1,2),
+     $                          LDV)
 *
                    CALL CLASET('A',N,N-NR,CZERO,CZERO,V(1,NR+1),LDV)
                    CALL CGESVD( 'O', 'A', N, N, V, LDV, S, V, LDV,
@@ -1212,7 +1232,8 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                    IF ( ( N .LT. M ) .AND. .NOT.(WNTUF)) THEN
                       CALL CLASET('A',M-N,N,CZERO,CZERO,U(N+1,1),LDU)
                       IF ( N .LT. N1 ) THEN
-                        CALL CLASET('A',N,N1-N,CZERO,CZERO,U(1,N+1),LDU)
+                        CALL CLASET('A',N,N1-N,CZERO,CZERO,U(1,N+1),
+     $                               LDU)
                         CALL CLASET('A',M-N,N1-N,CZERO,CONE,
      $                       U(N+1,N+1), LDU )
                       END IF
@@ -1226,7 +1247,8 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
  1197                 CONTINUE
  1196              CONTINUE
                    IF ( NR .GT. 1 )
-     $             CALL CLASET('U',NR-1,NR-1,CZERO,CZERO,U(1,NR+2),LDU)
+     $             CALL CLASET('U',NR-1,NR-1,CZERO,CZERO,U(1,NR+2),
+     $                          LDU)
                    CALL CGEQRF( N, NR, U(1,NR+1), LDU, CWORK(N+1),
      $                  CWORK(N+NR+1), LCWORK-N-NR, IERR )
                    DO 1143 p = 1, NR
@@ -1239,16 +1261,19 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
      $                 V,LDV, CWORK(N+NR+1),LCWORK-N-NR,RWORK, INFO )
                   CALL CLASET('A',N-NR,NR,CZERO,CZERO,V(NR+1,1),LDV)
                   CALL CLASET('A',NR,N-NR,CZERO,CZERO,V(1,NR+1),LDV)
-                  CALL CLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),LDV)
+                  CALL CLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),
+     $                         LDV)
                   CALL CUNMQR('R','C', N, N, NR, U(1,NR+1), LDU,
      $                 CWORK(N+1),V,LDV,CWORK(N+NR+1),LCWORK-N-NR,IERR)
                   CALL CLAPMT( .FALSE., N, N, V, LDV, IWORK )
 *                 .. assemble the left singular vector matrix U of dimensions
 *                 (M x NR) or (M x N) or (M x M).
                   IF ( ( NR .LT. M ) .AND. .NOT.(WNTUF)) THEN
-                     CALL CLASET('A',M-NR,NR,CZERO,CZERO,U(NR+1,1),LDU)
+                     CALL CLASET('A',M-NR,NR,CZERO,CZERO,U(NR+1,1),
+     $                            LDU)
                      IF ( NR .LT. N1 ) THEN
-                     CALL CLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),LDU)
+                     CALL CLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),
+     $                            LDU)
                      CALL CLASET( 'A',M-NR,N1-NR,CZERO,CONE,
      $                    U(NR+1,NR+1),LDU)
                      END IF
@@ -1264,7 +1289,8 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *                .. copy R into [V] and overwrite V with the right singular vectors
                  CALL CLACPY( 'U', NR, N, A, LDA, V, LDV )
                 IF ( NR .GT. 1 )
-     $          CALL CLASET( 'L', NR-1,NR-1, CZERO,CZERO, V(2,1), LDV )
+     $          CALL CLASET( 'L', NR-1,NR-1, CZERO,CZERO, V(2,1),
+     $                       LDV )
 *               .. the right singular vectors of R overwrite [V], the NR left
 *               singular vectors of R stored in [U](1:NR,1:NR)
                 CALL CGESVD( 'S', 'O', NR, N, V, LDV, S, U, LDU,
@@ -1274,9 +1300,11 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *               .. assemble the left singular vector matrix U of dimensions
 *              (M x NR) or (M x N) or (M x M).
                IF ( ( NR .LT. M ) .AND. .NOT.(WNTUF)) THEN
-                  CALL CLASET('A', M-NR,NR, CZERO,CZERO, U(NR+1,1), LDU)
+                  CALL CLASET('A', M-NR,NR, CZERO,CZERO, U(NR+1,1),
+     $                         LDU)
                   IF ( NR .LT. N1 ) THEN
-                     CALL CLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),LDU)
+                     CALL CLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),
+     $                            LDU)
                      CALL CLASET( 'A',M-NR,N1-NR,CZERO,CONE,
      $                    U(NR+1,NR+1), LDU )
                   END IF
@@ -1295,10 +1323,12 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                IF ( OPTRATIO * NR .GT. N ) THEN
                   CALL CLACPY( 'U', NR, N, A, LDA, V, LDV )
                   IF ( NR .GT. 1 )
-     $            CALL CLASET('L', NR-1,NR-1, CZERO,CZERO, V(2,1),LDV)
+     $            CALL CLASET('L', NR-1,NR-1, CZERO,CZERO, V(2,1),
+     $                         LDV)
 *              .. the right singular vectors of R overwrite [V], the NR left
 *                 singular vectors of R stored in [U](1:NR,1:NR)
-                  CALL CLASET('A', N-NR,N, CZERO,CZERO, V(NR+1,1),LDV)
+                  CALL CLASET('A', N-NR,N, CZERO,CZERO, V(NR+1,1),
+     $                         LDV)
                   CALL CGESVD( 'S', 'O', N, N, V, LDV, S, U, LDU,
      $                 V, LDV, CWORK(N+1), LCWORK-N, RWORK, INFO )
                   CALL CLAPMT( .FALSE., N, N, V, LDV, IWORK )
@@ -1310,7 +1340,8 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                   IF ( ( N .LT. M ) .AND. .NOT.(WNTUF)) THEN
                       CALL CLASET('A',M-N,N,CZERO,CZERO,U(N+1,1),LDU)
                       IF ( N .LT. N1 ) THEN
-                        CALL CLASET('A',N,N1-N,CZERO,CZERO,U(1,N+1),LDU)
+                        CALL CLASET('A',N,N1-N,CZERO,CZERO,U(1,N+1),
+     $                               LDU)
                         CALL CLASET( 'A',M-N,N1-N,CZERO,CONE,
      $                       U(N+1,N+1), LDU )
                       END IF
@@ -1318,7 +1349,8 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                ELSE
                   CALL CLACPY( 'U', NR, N, A, LDA, U(NR+1,1), LDU )
                   IF ( NR .GT. 1 )
-     $            CALL CLASET('L',NR-1,NR-1,CZERO,CZERO,U(NR+2,1),LDU)
+     $            CALL CLASET('L',NR-1,NR-1,CZERO,CZERO,U(NR+2,1),
+     $                         LDU)
                   CALL CGELQF( NR, N, U(NR+1,1), LDU, CWORK(N+1),
      $                 CWORK(N+NR+1), LCWORK-N-NR, IERR )
                   CALL CLACPY('L',NR,NR,U(NR+1,1),LDU,V,LDV)
@@ -1328,16 +1360,20 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
      $                 V, LDV, CWORK(N+NR+1), LCWORK-N-NR, RWORK, INFO )
                   CALL CLASET('A',N-NR,NR,CZERO,CZERO,V(NR+1,1),LDV)
                   CALL CLASET('A',NR,N-NR,CZERO,CZERO,V(1,NR+1),LDV)
-                  CALL CLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),LDV)
-                  CALL CUNMLQ('R','N',N,N,NR,U(NR+1,1),LDU,CWORK(N+1),
+                  CALL CLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),
+     $                         LDV)
+                  CALL CUNMLQ('R','N',N,N,NR,U(NR+1,1),LDU,
+     $                         CWORK(N+1),
      $                 V, LDV, CWORK(N+NR+1),LCWORK-N-NR,IERR)
                   CALL CLAPMT( .FALSE., N, N, V, LDV, IWORK )
 *               .. assemble the left singular vector matrix U of dimensions
 *              (M x NR) or (M x N) or (M x M).
                   IF ( ( NR .LT. M ) .AND. .NOT.(WNTUF)) THEN
-                     CALL CLASET('A',M-NR,NR,CZERO,CZERO,U(NR+1,1),LDU)
+                     CALL CLASET('A',M-NR,NR,CZERO,CZERO,U(NR+1,1),
+     $                            LDU)
                      IF ( NR .LT. N1 ) THEN
-                     CALL CLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),LDU)
+                     CALL CLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),
+     $                            LDU)
                      CALL CLASET( 'A',M-NR,N1-NR,CZERO,CONE,
      $                    U(NR+1,NR+1), LDU )
                      END IF
@@ -1370,13 +1406,14 @@ SUBROUTINE CGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *
 *     .. if numerical rank deficiency is detected, the truncated
 *     singular values are set to zero.
-      IF ( NR .LT. N ) CALL SLASET( 'G', N-NR,1, ZERO,ZERO, S(NR+1), N )
+      IF ( NR .LT. N ) CALL SLASET( 'G', N-NR,1, ZERO,ZERO, S(NR+1),
+     $     N )
 *     .. undo scaling; this may cause overflow in the largest singular
 *     values.
       IF ( ASCALED )
      $   CALL SLASCL( 'G',0,0, ONE,SQRT(REAL(M)), NR,1, S, N, IERR )
       IF ( CONDA ) RWORK(1) = SCONDA
-      RWORK(2) = p - NR
+      RWORK(2) = REAL( p - NR )
 *     .. p-NR is the number of singular values that are computed as
 *     exact zeros in CGESVD() applied to the (possibly truncated)
 *     full row rank triangular (trapezoidal) factor of A.
diff --git a/SRC/cgesvdx.f b/SRC/cgesvdx.f
index fbdb121ca7..61ab69beff 100644
--- a/SRC/cgesvdx.f
+++ b/SRC/cgesvdx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGESVDX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgesvdx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgesvdx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -208,7 +206,7 @@
 *> \param[out] WORK
 *> \verbatim
 *>          WORK is COMPLEX array, dimension (MAX(1,LWORK))
-*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK;
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
@@ -261,12 +259,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEsing
+*> \ingroup gesvdx
 *
 *  =====================================================================
       SUBROUTINE CGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
      $                    IL, IU, NS, S, U, LDU, VT, LDVT, WORK,
      $                    LWORK, RWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -305,15 +304,17 @@ SUBROUTINE CGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
       REAL               DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEBRD, CGELQF, CGEQRF, CLASCL, CLASET,
+      EXTERNAL           CGEBRD, CGELQF, CGEQRF, CLASCL,
+     $                   CLASET,
      $                   CUNMBR, CUNMQR, CUNMLQ, CLACPY, 
      $                   SBDSVDX, SLASCL, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, CLANGE
-      EXTERNAL           LSAME, ILAENV, SLAMCH, CLANGE
+      REAL               SLAMCH, CLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SLAMCH,
+     $                   CLANGE, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN, SQRT
@@ -395,7 +396,8 @@ SUBROUTINE CGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
          MAXWRK = 1
          IF( MINMN.GT.0 ) THEN
             IF( M.GE.N ) THEN
-               MNTHR = ILAENV( 6, 'CGESVD', JOBU // JOBVT, M, N, 0, 0 )
+               MNTHR = ILAENV( 6, 'CGESVD', JOBU // JOBVT, M, N, 0,
+     $                         0 )
                IF( M.GE.MNTHR ) THEN
 *
 *                 Path 1 (M much larger than N)
@@ -403,24 +405,28 @@ SUBROUTINE CGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   MINWRK = N*(N+5)
                   MAXWRK = N + N*ILAENV(1,'CGEQRF',' ',M,N,-1,-1)
                   MAXWRK = MAX(MAXWRK,
-     $                     N*N+2*N+2*N*ILAENV(1,'CGEBRD',' ',N,N,-1,-1))
+     $                     N*N+2*N+2*N*ILAENV(1,'CGEBRD',' ',N,N,-1,
+     $                                         -1))
                   IF (WANTU .OR. WANTVT) THEN
                      MAXWRK = MAX(MAXWRK,
-     $                       N*N+2*N+N*ILAENV(1,'CUNMQR','LN',N,N,N,-1))
+     $                       N*N+2*N+N*ILAENV(1,'CUNMQR','LN',N,N,N,
+     $                                         -1))
                   END IF
                ELSE
 *
 *                 Path 2 (M at least N, but not much larger)
 *
                   MINWRK = 3*N + M
-                  MAXWRK = 2*N + (M+N)*ILAENV(1,'CGEBRD',' ',M,N,-1,-1)
+                  MAXWRK = 2*N + (M+N)*ILAENV(1,'CGEBRD',' ',M,N,-1,
+     $                             -1)
                   IF (WANTU .OR. WANTVT) THEN
                      MAXWRK = MAX(MAXWRK,
      $                        2*N+N*ILAENV(1,'CUNMQR','LN',N,N,N,-1))
                   END IF
                END IF
             ELSE
-               MNTHR = ILAENV( 6, 'CGESVD', JOBU // JOBVT, M, N, 0, 0 )
+               MNTHR = ILAENV( 6, 'CGESVD', JOBU // JOBVT, M, N, 0,
+     $                         0 )
                IF( N.GE.MNTHR ) THEN
 *
 *                 Path 1t (N much larger than M)
@@ -428,10 +434,12 @@ SUBROUTINE CGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   MINWRK = M*(M+5)
                   MAXWRK = M + M*ILAENV(1,'CGELQF',' ',M,N,-1,-1)
                   MAXWRK = MAX(MAXWRK,
-     $                     M*M+2*M+2*M*ILAENV(1,'CGEBRD',' ',M,M,-1,-1))
+     $                     M*M+2*M+2*M*ILAENV(1,'CGEBRD',' ',M,M,-1,
+     $                                         -1))
                   IF (WANTU .OR. WANTVT) THEN
                      MAXWRK = MAX(MAXWRK,
-     $                       M*M+2*M+M*ILAENV(1,'CUNMQR','LN',M,M,M,-1))
+     $                       M*M+2*M+M*ILAENV(1,'CUNMQR','LN',M,M,M,
+     $                                         -1))
                   END IF
                ELSE
 *
@@ -439,7 +447,8 @@ SUBROUTINE CGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
 *
 *
                   MINWRK = 3*M + N
-                  MAXWRK = 2*M + (M+N)*ILAENV(1,'CGEBRD',' ',M,N,-1,-1)
+                  MAXWRK = 2*M + (M+N)*ILAENV(1,'CGEBRD',' ',M,N,-1,
+     $                             -1)
                   IF (WANTU .OR. WANTVT) THEN
                      MAXWRK = MAX(MAXWRK,
      $                        2*M+M*ILAENV(1,'CUNMQR','LN',M,M,M,-1))
@@ -448,7 +457,7 @@ SUBROUTINE CGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
             END IF
          END IF
          MAXWRK = MAX( MAXWRK, MINWRK )
-         WORK( 1 ) = CMPLX( REAL( MAXWRK ), ZERO )
+         WORK( 1 ) = SROUNDUP_LWORK( MAXWRK )
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
             INFO = -19
@@ -464,7 +473,7 @@ SUBROUTINE CGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
 *
 *     Quick return if possible
 *
-      IF( M.EQ.0 .OR. N.EQ.0 ) THEN
+      IF( MINMN.EQ.0 ) THEN
          RETURN
       END IF
 *
@@ -560,7 +569,8 @@ SUBROUTINE CGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   END DO
                   K = K + N
                END DO
-               CALL CLASET( 'A', M-N, NS, CZERO, CZERO, U( N+1,1 ), LDU)
+               CALL CLASET( 'A', M-N, NS, CZERO, CZERO, U( N+1,1 ),
+     $                      LDU)
 *
 *              Call CUNMBR to compute QB*UB.
 *              (Workspace in WORK( ITEMP ): need N, prefer N*NB)
@@ -636,7 +646,8 @@ SUBROUTINE CGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   END DO
                   K = K + N
                END DO
-               CALL CLASET( 'A', M-N, NS, CZERO, CZERO, U( N+1,1 ), LDU)
+               CALL CLASET( 'A', M-N, NS, CZERO, CZERO, U( N+1,1 ),
+     $                      LDU)
 *
 *              Call CUNMBR to compute QB*UB.
 *              (Workspace in WORK( ITEMP ): need N, prefer N*NB)
@@ -846,7 +857,7 @@ SUBROUTINE CGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
 *
 *     Return optimal workspace in WORK(1)
 *
-      WORK( 1 ) = CMPLX( REAL( MAXWRK ), ZERO )
+      WORK( 1 ) = SROUNDUP_LWORK( MAXWRK )
 *
       RETURN
 *
diff --git a/SRC/cgesvj.f b/SRC/cgesvj.f
index 149cf5e484..ef5d1b30f9 100644
--- a/SRC/cgesvj.f
+++ b/SRC/cgesvj.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGESVJ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgesvj.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgesvj.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -208,15 +206,17 @@
 *> \verbatim
 *>          CWORK is COMPLEX array, dimension (max(1,LWORK))
 *>          Used as workspace.
-*>          If on entry LWORK = -1, then a workspace query is assumed and
-*>          no computation is done; CWORK(1) is set to the minial (and optimal)
-*>          length of CWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER.
-*>          Length of CWORK, LWORK >= M+N.
+*>          Length of CWORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= M+N, otherwise.
+*>
+*>          If on entry LWORK = -1, then a workspace query is assumed and
+*>          no computation is done; CWORK(1) is set to the minial (and optimal)
+*>          length of CWORK.
 *> \endverbatim
 *>
 *> \param[in,out] RWORK
@@ -247,15 +247,17 @@
 *>          RWORK(6) = the largest absolute value over all sines of the
 *>                    Jacobi rotation angles in the last sweep. It can be
 *>                    useful for a post festum analysis.
-*>         If on entry LRWORK = -1, then a workspace query is assumed and
-*>         no computation is done; RWORK(1) is set to the minial (and optimal)
-*>         length of RWORK.
 *> \endverbatim
 *>
 *> \param[in] LRWORK
 *> \verbatim
 *>         LRWORK is INTEGER
-*>         Length of RWORK, LRWORK >= MAX(6,N).
+*>         Length of RWORK.
+*>         LRWORK >= 1, if MIN(M,N) = 0, and LRWORK >= MAX(6,N), otherwise
+*>
+*>         If on entry LRWORK = -1, then a workspace query is assumed and
+*>         no computation is done; RWORK(1) is set to the minial (and optimal)
+*>         length of RWORK.
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -276,7 +278,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup gesvj
 *
 *> \par Further Details:
 *  =====================
@@ -374,16 +376,17 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
       PARAMETER  ( NSWEEP = 30 )
 *     ..
 *     .. Local Scalars ..
-      COMPLEX AAPQ, OMPQ
-      REAL    AAPP, AAPP0, AAPQ1, AAQQ, APOAQ, AQOAP, BIG,
-     $        BIGTHETA, CS, CTOL, EPSLN, MXAAPQ,
-     $        MXSINJ, ROOTBIG, ROOTEPS, ROOTSFMIN, ROOTTOL,
-     $        SKL, SFMIN, SMALL, SN, T, TEMP1, THETA, THSIGN, TOL
-      INTEGER BLSKIP, EMPTSW, i, ibr, IERR, igl, IJBLSK, ir1,
-     $        ISWROT, jbc, jgl, KBL, LKAHEAD, MVL, N2, N34,
-     $        N4, NBL, NOTROT, p, PSKIPPED, q, ROWSKIP, SWBAND
-      LOGICAL APPLV, GOSCALE, LOWER, LQUERY, LSVEC, NOSCALE, ROTOK,
-     $        RSVEC, UCTOL, UPPER
+      COMPLEX    AAPQ, OMPQ
+      REAL       AAPP, AAPP0, AAPQ1, AAQQ, APOAQ, AQOAP, BIG,
+     $           BIGTHETA, CS, CTOL, EPSLN, MXAAPQ,
+     $           MXSINJ, ROOTBIG, ROOTEPS, ROOTSFMIN, ROOTTOL,
+     $           SKL, SFMIN, SMALL, SN, T, TEMP1, THETA, THSIGN, TOL
+      INTEGER    BLSKIP, EMPTSW, i, ibr, IERR, igl, IJBLSK, ir1,
+     $           ISWROT, jbc, jgl, KBL, LKAHEAD, MVL, N2, N34,
+     $           N4, NBL, NOTROT, p, PSKIPPED, q, ROWSKIP, SWBAND,
+     $           MINMN, LWMIN, LRWMIN
+      LOGICAL    APPLV, GOSCALE, LOWER, LQUERY, LSVEC, NOSCALE, ROTOK,
+     $           RSVEC, UCTOL, UPPER
 *     ..
 *     ..
 *     .. Intrinsic Functions ..
@@ -398,8 +401,8 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
       INTEGER            ISAMAX
       EXTERNAL           ISAMAX
 *     from LAPACK
-      REAL               SLAMCH
-      EXTERNAL           SLAMCH
+      REAL               SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           SLAMCH, SROUNDUP_LWORK
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
@@ -408,7 +411,8 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
 *     from BLAS
       EXTERNAL           CCOPY, CROT, CSSCAL, CSWAP, CAXPY
 *     from LAPACK
-      EXTERNAL           CLASCL, CLASET, CLASSQ, SLASCL, XERBLA
+      EXTERNAL           CLASCL, CLASET, CLASSQ, SLASCL,
+     $                   XERBLA
       EXTERNAL           CGSVJ0, CGSVJ1
 *     ..
 *     .. Executable Statements ..
@@ -422,12 +426,25 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
       UPPER = LSAME( JOBA, 'U' )
       LOWER = LSAME( JOBA, 'L' )
 *
-      LQUERY = ( LWORK .EQ. -1 ) .OR. ( LRWORK .EQ. -1 )
+      MINMN = MIN( M, N )
+      IF( MINMN.EQ.0 ) THEN
+         LWMIN  = 1
+         LRWMIN = 1
+      ELSE
+         LWMIN  = M + N
+         LRWMIN = MAX( 6, N )
+      END IF
+*
+      LQUERY = ( LWORK.EQ.-1 ) .OR. ( LRWORK.EQ.-1 )
       IF( .NOT.( UPPER .OR. LOWER .OR. LSAME( JOBA, 'G' ) ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.( LSVEC .OR. UCTOL .OR. LSAME( JOBU, 'N' ) ) ) THEN
+      ELSE IF( .NOT.( LSVEC .OR.
+     $         UCTOL .OR.
+     $         LSAME( JOBU, 'N' ) ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.( RSVEC .OR. APPLV .OR. LSAME( JOBV, 'N' ) ) ) THEN
+      ELSE IF( .NOT.( RSVEC .OR.
+     $         APPLV .OR.
+     $         LSAME( JOBV, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( M.LT.0 ) THEN
          INFO = -4
@@ -442,9 +459,9 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
          INFO = -11
       ELSE IF( UCTOL .AND. ( RWORK( 1 ).LE.ONE ) ) THEN
          INFO = -12
-      ELSE IF( LWORK.LT.( M+N ) .AND. ( .NOT.LQUERY ) ) THEN
+      ELSE IF( LWORK.LT.LWMIN .AND. ( .NOT.LQUERY ) ) THEN
          INFO = -13
-      ELSE IF( LRWORK.LT.MAX( N, 6 ) .AND. ( .NOT.LQUERY ) ) THEN
+      ELSE IF( LRWORK.LT.LRWMIN .AND. ( .NOT.LQUERY ) ) THEN
          INFO = -15
       ELSE
          INFO = 0
@@ -454,15 +471,15 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'CGESVJ', -INFO )
          RETURN
-      ELSE IF ( LQUERY ) THEN
-         CWORK(1) = M + N
-         RWORK(1) = MAX( N, 6 )
+      ELSE IF( LQUERY ) THEN
+         CWORK( 1 ) = SROUNDUP_LWORK( LWMIN )
+         RWORK( 1 ) = SROUNDUP_LWORK( LRWMIN )
          RETURN
       END IF
 *
 * #:) Quick return for void matrix
 *
-      IF( ( M.EQ.0 ) .OR. ( N.EQ.0 ) )RETURN
+      IF( MINMN.EQ.0 ) RETURN
 *
 *     Set numerical parameters
 *     The stopping criterion for Jacobi rotations is
@@ -770,7 +787,8 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
      $                   V( N4*q+1, N4+1 ), LDV, EPSLN, SFMIN, TOL, 1,
      $                   CWORK( N+1 ), LWORK-N, IERR )
 *
-            CALL CGSVJ0( JOBV, M, N4, A, LDA, CWORK, SVA, MVL, V, LDV,
+            CALL CGSVJ0( JOBV, M, N4, A, LDA, CWORK, SVA, MVL, V,
+     $                   LDV,
      $                   EPSLN, SFMIN, TOL, 1, CWORK( N+1 ), LWORK-N,
      $                   IERR )
 *
@@ -782,16 +800,19 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
          ELSE IF( UPPER ) THEN
 *
 *
-            CALL CGSVJ0( JOBV, N4, N4, A, LDA, CWORK, SVA, MVL, V, LDV,
+            CALL CGSVJ0( JOBV, N4, N4, A, LDA, CWORK, SVA, MVL, V,
+     $                   LDV,
      $                   EPSLN, SFMIN, TOL, 2, CWORK( N+1 ), LWORK-N,
      $                   IERR )
 *
-            CALL CGSVJ0( JOBV, N2, N4, A( 1, N4+1 ), LDA, CWORK( N4+1 ),
+            CALL CGSVJ0( JOBV, N2, N4, A( 1, N4+1 ), LDA,
+     $                   CWORK( N4+1 ),
      $                   SVA( N4+1 ), MVL, V( N4*q+1, N4+1 ), LDV,
      $                   EPSLN, SFMIN, TOL, 1, CWORK( N+1 ), LWORK-N,
      $                   IERR )
 *
-            CALL CGSVJ1( JOBV, N2, N2, N4, A, LDA, CWORK, SVA, MVL, V,
+            CALL CGSVJ1( JOBV, N2, N2, N4, A, LDA, CWORK, SVA, MVL,
+     $                   V,
      $                   LDV, EPSLN, SFMIN, TOL, 1, CWORK( N+1 ),
      $                   LWORK-N, IERR )
 *
@@ -944,7 +965,8 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                     T  = HALF / THETA
                                     CS = ONE
 
-                                    CALL CROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL CROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*T )
                                     IF ( RSVEC ) THEN
                                         CALL CROT( MVL, V(1,p), 1,
@@ -973,7 +995,8 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                     AAPP = AAPP*SQRT( MAX( ZERO,
      $                                      ONE-T*AQOAP*AAPQ1 ) )
 *
-                                    CALL CROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL CROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*SN )
                                     IF ( RSVEC ) THEN
                                         CALL CROT( MVL, V(1,p), 1,
@@ -986,14 +1009,17 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
 *              .. have to use modified Gram-Schmidt like transformation
                                  CALL CCOPY( M, A( 1, p ), 1,
      $                                       CWORK(N+1), 1 )
-                                 CALL CLASCL( 'G', 0, 0, AAPP, ONE, M,
+                                 CALL CLASCL( 'G', 0, 0, AAPP, ONE,
+     $                                        M,
      $                                        1, CWORK(N+1), LDA,
      $                                        IERR )
-                                 CALL CLASCL( 'G', 0, 0, AAQQ, ONE, M,
+                                 CALL CLASCL( 'G', 0, 0, AAQQ, ONE,
+     $                                        M,
      $                                        1, A( 1, q ), LDA, IERR )
                                  CALL CAXPY( M, -AAPQ, CWORK(N+1), 1,
      $                                       A( 1, q ), 1 )
-                                 CALL CLASCL( 'G', 0, 0, ONE, AAQQ, M,
+                                 CALL CLASCL( 'G', 0, 0, ONE, AAQQ,
+     $                                        M,
      $                                        1, A( 1, q ), LDA, IERR )
                                  SVA( q ) = AAQQ*SQRT( MAX( ZERO,
      $                                      ONE-AAPQ1*AAPQ1 ) )
@@ -1008,7 +1034,8 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = SCNRM2( M, A( 1, q ), 1 )
+                                    SVA( q ) = SCNRM2( M, A( 1, q ),
+     $                                   1 )
                                  ELSE
                                     T = ZERO
                                     AAQQ = ONE
@@ -1160,7 +1187,8 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                  IF( ABS( THETA ).GT.BIGTHETA ) THEN
                                     T  = HALF / THETA
                                     CS = ONE
-                                    CALL CROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL CROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*T )
                                     IF( RSVEC ) THEN
                                         CALL CROT( MVL, V(1,p), 1,
@@ -1187,7 +1215,8 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                     AAPP = AAPP*SQRT( MAX( ZERO,
      $                                         ONE-T*AQOAP*AAPQ1 ) )
 *
-                                    CALL CROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL CROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*SN )
                                     IF( RSVEC ) THEN
                                         CALL CROT( MVL, V(1,p), 1,
@@ -1201,15 +1230,18 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                IF( AAPP.GT.AAQQ ) THEN
                                     CALL CCOPY( M, A( 1, p ), 1,
      $                                          CWORK(N+1), 1 )
-                                    CALL CLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL CLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, CWORK(N+1),LDA,
      $                                           IERR )
-                                    CALL CLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL CLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     CALL CAXPY( M, -AAPQ, CWORK(N+1),
      $                                          1, A( 1, q ), 1 )
-                                    CALL CLASCL( 'G', 0, 0, ONE, AAQQ,
+                                    CALL CLASCL( 'G', 0, 0, ONE,
+     $                                           AAQQ,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     SVA( q ) = AAQQ*SQRT( MAX( ZERO,
@@ -1218,15 +1250,18 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                ELSE
                                    CALL CCOPY( M, A( 1, q ), 1,
      $                                          CWORK(N+1), 1 )
-                                    CALL CLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL CLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, CWORK(N+1),LDA,
      $                                           IERR )
-                                    CALL CLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL CLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     CALL CAXPY( M, -CONJG(AAPQ),
      $                                   CWORK(N+1), 1, A( 1, p ), 1 )
-                                    CALL CLASCL( 'G', 0, 0, ONE, AAPP,
+                                    CALL CLASCL( 'G', 0, 0, ONE,
+     $                                           AAPP,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     SVA( p ) = AAPP*SQRT( MAX( ZERO,
@@ -1242,7 +1277,8 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = SCNRM2( M, A( 1, q ), 1)
+                                    SVA( q ) = SCNRM2( M, A( 1, q ),
+     $                                   1)
                                   ELSE
                                     T = ZERO
                                     AAQQ = ONE
@@ -1384,7 +1420,8 @@ SUBROUTINE CGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
       IF( LSVEC .OR. UCTOL ) THEN
          DO 1998 p = 1, N4
 *           CALL CSSCAL( M, ONE / SVA( p ), A( 1, p ), 1 )
-            CALL CLASCL( 'G',0,0, SVA(p), ONE, M, 1, A(1,p), M, IERR )
+            CALL CLASCL( 'G',0,0, SVA(p), ONE, M, 1, A(1,p), M,
+     $                   IERR )
  1998    CONTINUE
       END IF
 *
diff --git a/SRC/cgesvx.f b/SRC/cgesvx.f
index 66c714bb1c..0b4c9d869b 100644
--- a/SRC/cgesvx.f
+++ b/SRC/cgesvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGESVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgesvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgesvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -302,7 +300,7 @@
 *>
 *> \param[out] RWORK
 *> \verbatim
-*>          RWORK is REAL array, dimension (2*N)
+*>          RWORK is REAL array, dimension (MAX(1,2*N))
 *>          On exit, RWORK(1) contains the reciprocal pivot growth
 *>          factor norm(A)/norm(U). The "max absolute element" norm is
 *>          used. If RWORK(1) is much less than 1, then the stability
@@ -341,12 +339,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEsolve
+*> \ingroup gesvx
 *
 *  =====================================================================
-      SUBROUTINE CGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE CGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF,
+     $                   IPIV,
      $                   EQUED, R, C, B, LDB, X, LDX, RCOND, FERR, BERR,
      $                   WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -384,7 +384,8 @@ SUBROUTINE CGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
       EXTERNAL           LSAME, CLANGE, CLANTR, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGECON, CGEEQU, CGERFS, CGETRF, CGETRS, CLACPY,
+      EXTERNAL           CGECON, CGEEQU, CGERFS, CGETRF, CGETRS,
+     $                   CLACPY,
      $                   CLAQGE, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -409,7 +410,9 @@ SUBROUTINE CGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
       ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
@@ -475,7 +478,8 @@ SUBROUTINE CGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *        Compute row and column scalings to equilibrate the matrix A.
 *
-         CALL CGEEQU( N, N, A, LDA, R, C, ROWCND, COLCND, AMAX, INFEQU )
+         CALL CGEEQU( N, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
+     $                INFEQU )
          IF( INFEQU.EQ.0 ) THEN
 *
 *           Equilibrate the matrix.
@@ -551,7 +555,8 @@ SUBROUTINE CGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL CGECON( NORM, N, AF, LDAF, ANORM, RCOND, WORK, RWORK, INFO )
+      CALL CGECON( NORM, N, AF, LDAF, ANORM, RCOND, WORK, RWORK,
+     $             INFO )
 *
 *     Compute the solution matrix X.
 *
diff --git a/SRC/cgesvxx.f b/SRC/cgesvxx.f
index e50f1b56f4..de7044eb3f 100644
--- a/SRC/cgesvxx.f
+++ b/SRC/cgesvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGESVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgesvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgesvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -532,14 +530,16 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEsolve
+*> \ingroup gesvxx
 *
 *  =====================================================================
-      SUBROUTINE CGESVXX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE CGESVXX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    EQUED, R, C, B, LDB, X, LDX, RCOND, RPVGRW,
      $                    BERR, N_ERR_BNDS, ERR_BNDS_NORM,
      $                    ERR_BNDS_COMP, NPARAMS, PARAMS, WORK, RWORK,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -586,7 +586,8 @@ SUBROUTINE CGESVXX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
       REAL               SLAMCH, CLA_GERPVGRW
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEEQUB, CGETRF, CGETRS, CLACPY, CLAQGE,
+      EXTERNAL           CGEEQUB, CGETRF, CGETRS, CLACPY,
+     $                   CLAQGE,
      $                   XERBLA, CLASCL2, CGERFSX
 *     ..
 *     .. Intrinsic Functions ..
diff --git a/SRC/cgetc2.f b/SRC/cgetc2.f
index 94267d7670..85e54e20e1 100644
--- a/SRC/cgetc2.f
+++ b/SRC/cgetc2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGETC2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgetc2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgetc2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,7 +96,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEauxiliary
+*> \ingroup getc2
 *
 *> \par Contributors:
 *  ==================
@@ -108,6 +106,7 @@
 *
 *  =====================================================================
       SUBROUTINE CGETC2( N, A, LDA, IPIV, JPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -132,7 +131,7 @@ SUBROUTINE CGETC2( N, A, LDA, IPIV, JPIV, INFO )
       REAL               BIGNUM, EPS, SMIN, SMLNUM, XMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGERU, CSWAP, SLABAD
+      EXTERNAL           CGERU, CSWAP
 *     ..
 *     .. External Functions ..
       REAL               SLAMCH
@@ -155,7 +154,6 @@ SUBROUTINE CGETC2( N, A, LDA, IPIV, JPIV, INFO )
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Handle the case N=1 by itself
 *
@@ -177,8 +175,8 @@ SUBROUTINE CGETC2( N, A, LDA, IPIV, JPIV, INFO )
 *        Find max element in matrix A
 *
          XMAX = ZERO
-         DO 20 IP = I, N
-            DO 10 JP = I, N
+         DO 20 JP = I, N
+            DO 10 IP = I, N
                IF( ABS( A( IP, JP ) ).GE.XMAX ) THEN
                   XMAX = ABS( A( IP, JP ) )
                   IPV = IP
diff --git a/SRC/cgetf2.f b/SRC/cgetf2.f
index aac9899702..cd0b7b204f 100644
--- a/SRC/cgetf2.f
+++ b/SRC/cgetf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGETF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgetf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgetf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup getf2
 *
 *  =====================================================================
       SUBROUTINE CGETF2( M, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -126,16 +125,14 @@ SUBROUTINE CGETF2( M, N, A, LDA, IPIV, INFO )
      $                   ZERO = ( 0.0E+0, 0.0E+0 ) )
 *     ..
 *     .. Local Scalars ..
-      REAL               SFMIN
-      INTEGER            I, J, JP
+      INTEGER            J, JP
 *     ..
 *     .. External Functions ..
-      REAL               SLAMCH
       INTEGER            ICAMAX
-      EXTERNAL           SLAMCH, ICAMAX
+      EXTERNAL           ICAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGERU, CSCAL, CSWAP, XERBLA
+      EXTERNAL           CGERU, CRSCL, CSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -161,10 +158,6 @@ SUBROUTINE CGETF2( M, N, A, LDA, IPIV, INFO )
 *
       IF( M.EQ.0 .OR. N.EQ.0 )
      $   RETURN
-*
-*     Compute machine safe minimum
-*
-      SFMIN = SLAMCH('S')
 *
       DO 10 J = 1, MIN( M, N )
 *
@@ -181,15 +174,8 @@ SUBROUTINE CGETF2( M, N, A, LDA, IPIV, INFO )
 *
 *           Compute elements J+1:M of J-th column.
 *
-            IF( J.LT.M ) THEN
-               IF( ABS(A( J, J )) .GE. SFMIN ) THEN
-                  CALL CSCAL( M-J, ONE / A( J, J ), A( J+1, J ), 1 )
-               ELSE
-                  DO 20 I = 1, M-J
-                     A( J+I, J ) = A( J+I, J ) / A( J, J )
-   20             CONTINUE
-               END IF
-            END IF
+            IF( J.LT.M )
+     $         CALL CRSCL( M-J, A( J, J ), A( J+1, J ), 1 )
 *
          ELSE IF( INFO.EQ.0 ) THEN
 *
diff --git a/SRC/cgetrf.f b/SRC/cgetrf.f
index d08e0bb9a5..7d1acdb07d 100644
--- a/SRC/cgetrf.f
+++ b/SRC/cgetrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGETRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgetrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgetrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup getrf
 *
 *  =====================================================================
       SUBROUTINE CGETRF( M, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -128,7 +127,8 @@ SUBROUTINE CGETRF( M, N, A, LDA, IPIV, INFO )
       INTEGER            I, IINFO, J, JB, NB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMM, CGETRF2, CLASWP, CTRSM, XERBLA
+      EXTERNAL           CGEMM, CGETRF2, CLASWP, CTRSM,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
@@ -177,7 +177,8 @@ SUBROUTINE CGETRF( M, N, A, LDA, IPIV, INFO )
 *           Factor diagonal and subdiagonal blocks and test for exact
 *           singularity.
 *
-            CALL CGETRF2( M-J+1, JB, A( J, J ), LDA, IPIV( J ), IINFO )
+            CALL CGETRF2( M-J+1, JB, A( J, J ), LDA, IPIV( J ),
+     $                    IINFO )
 *
 *           Adjust INFO and the pivot indices.
 *
@@ -200,14 +201,16 @@ SUBROUTINE CGETRF( M, N, A, LDA, IPIV, INFO )
 *
 *              Compute block row of U.
 *
-               CALL CTRSM( 'Left', 'Lower', 'No transpose', 'Unit', JB,
+               CALL CTRSM( 'Left', 'Lower', 'No transpose', 'Unit',
+     $                     JB,
      $                     N-J-JB+1, ONE, A( J, J ), LDA, A( J, J+JB ),
      $                     LDA )
                IF( J+JB.LE.M ) THEN
 *
 *                 Update trailing submatrix.
 *
-                  CALL CGEMM( 'No transpose', 'No transpose', M-J-JB+1,
+                  CALL CGEMM( 'No transpose', 'No transpose',
+     $                        M-J-JB+1,
      $                        N-J-JB+1, JB, -ONE, A( J+JB, J ), LDA,
      $                        A( J, J+JB ), LDA, ONE, A( J+JB, J+JB ),
      $                        LDA )
diff --git a/SRC/cgetrf2.f b/SRC/cgetrf2.f
index 796dd50054..03dca2c54a 100644
--- a/SRC/cgetrf2.f
+++ b/SRC/cgetrf2.f
@@ -106,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup getrf2
 *
 *  =====================================================================
       RECURSIVE SUBROUTINE CGETRF2( M, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cgetri.f b/SRC/cgetri.f
index bd7fc286c8..ca72a30c3e 100644
--- a/SRC/cgetri.f
+++ b/SRC/cgetri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGETRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgetri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgetri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup getri
 *
 *  =====================================================================
       SUBROUTINE CGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -138,10 +137,12 @@ SUBROUTINE CGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMM, CGEMV, CSWAP, CTRSM, CTRTRI, XERBLA
+      EXTERNAL           CGEMM, CGEMV, CSWAP, CTRSM, CTRTRI,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -152,8 +153,8 @@ SUBROUTINE CGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
 *
       INFO = 0
       NB = ILAENV( 1, 'CGETRI', ' ', N, -1, -1, -1 )
-      LWKOPT = N*NB
-      WORK( 1 ) = LWKOPT
+      LWKOPT = MAX( 1, N*NB )
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       LQUERY = ( LWORK.EQ.-1 )
       IF( N.LT.0 ) THEN
          INFO = -1
@@ -187,7 +188,8 @@ SUBROUTINE CGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
          IWS = MAX( LDWORK*NB, 1 )
          IF( LWORK.LT.IWS ) THEN
             NB = LWORK / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'CGETRI', ' ', N, -1, -1, -1 ) )
+            NBMIN = MAX( 2, ILAENV( 2, 'CGETRI', ' ', N, -1, -1,
+     $                   -1 ) )
          END IF
       ELSE
          IWS = N
@@ -238,7 +240,8 @@ SUBROUTINE CGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
      $         CALL CGEMM( 'No transpose', 'No transpose', N, JB,
      $                     N-J-JB+1, -ONE, A( 1, J+JB ), LDA,
      $                     WORK( J+JB ), LDWORK, ONE, A( 1, J ), LDA )
-            CALL CTRSM( 'Right', 'Lower', 'No transpose', 'Unit', N, JB,
+            CALL CTRSM( 'Right', 'Lower', 'No transpose', 'Unit', N,
+     $                  JB,
      $                  ONE, WORK( J ), LDWORK, A( 1, J ), LDA )
    50    CONTINUE
       END IF
@@ -251,7 +254,7 @@ SUBROUTINE CGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
      $      CALL CSWAP( N, A( 1, J ), 1, A( 1, JP ), 1 )
    60 CONTINUE
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK( IWS )
       RETURN
 *
 *     End of CGETRI
diff --git a/SRC/cgetrs.f b/SRC/cgetrs.f
index 187b1a686c..68e51c896a 100644
--- a/SRC/cgetrs.f
+++ b/SRC/cgetrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGETRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgetrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgetrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -114,10 +112,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup getrs
 *
 *  =====================================================================
       SUBROUTINE CGETRS( TRANS, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -189,7 +188,8 @@ SUBROUTINE CGETRS( TRANS, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *
 *        Solve L*X = B, overwriting B with X.
 *
-         CALL CTRSM( 'Left', 'Lower', 'No transpose', 'Unit', N, NRHS,
+         CALL CTRSM( 'Left', 'Lower', 'No transpose', 'Unit', N,
+     $               NRHS,
      $               ONE, A, LDA, B, LDB )
 *
 *        Solve U*X = B, overwriting B with X.
@@ -202,7 +202,8 @@ SUBROUTINE CGETRS( TRANS, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *
 *        Solve U**T *X = B or U**H *X = B, overwriting B with X.
 *
-         CALL CTRSM( 'Left', 'Upper', TRANS, 'Non-unit', N, NRHS, ONE,
+         CALL CTRSM( 'Left', 'Upper', TRANS, 'Non-unit', N, NRHS,
+     $               ONE,
      $               A, LDA, B, LDB )
 *
 *        Solve L**T *X = B, or L**H *X = B overwriting B with X.
diff --git a/SRC/cgetsls.f b/SRC/cgetsls.f
index eb721170e2..dcd9a0dd9a 100644
--- a/SRC/cgetsls.f
+++ b/SRC/cgetsls.f
@@ -22,8 +22,17 @@
 *>
 *> CGETSLS solves overdetermined or underdetermined complex linear systems
 *> involving an M-by-N matrix A, using a tall skinny QR or short wide LQ
-*> factorization of A.  It is assumed that A has full rank.
+*> factorization of A.
 *>
+*> It is assumed that A has full rank, and only a rudimentary protection
+*> against rank-deficient matrices is provided. This subroutine only detects
+*> exact rank-deficiency, where a diagonal element of the triangular factor
+*> of A is exactly zero.
+*>
+*> It is conceivable for one (or more) of the diagonal elements of the triangular
+*> factor of A to be subnormally tiny numbers without this subroutine signalling
+*> an error. The solutions computed for such almost-rank-deficient matrices may
+*> be less accurate due to a loss of numerical precision.
 *>
 *>
 *> The following options are provided:
@@ -127,7 +136,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1 or -2, then a workspace query is assumed.
 *>          If LWORK = -1, the routine calculates optimal size of WORK for the
 *>          optimal performance and returns this value in WORK(1).
@@ -141,7 +150,7 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO =  i, the i-th diagonal element of the
-*>                triangular factor of A is zero, so that A does not have
+*>                triangular factor of A is exactly zero, so that A does not have
 *>                full rank; the least squares solution could not be
 *>                computed.
 *> \endverbatim
@@ -154,11 +163,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEsolve
+*> \ingroup getsls
 *
 *  =====================================================================
       SUBROUTINE CGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
      $                    WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,33 +193,31 @@ SUBROUTINE CGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, TRAN
-      INTEGER            I, IASCL, IBSCL, J, MINMN, MAXMN, BROW,
-     $                   SCLLEN, MNK, TSZO, TSZM, LWO, LWM, LW1, LW2,
+      INTEGER            I, IASCL, IBSCL, J, MAXMN, BROW,
+     $                   SCLLEN, TSZO, TSZM, LWO, LWM, LW1, LW2,
      $                   WSIZEO, WSIZEM, INFO2
       REAL               ANRM, BIGNUM, BNRM, SMLNUM, DUM( 1 )
       COMPLEX            TQ( 5 ), WORKQ( 1 )
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      INTEGER            ILAENV
-      REAL               SLAMCH, CLANGE
-      EXTERNAL           LSAME, ILAENV, SLABAD, SLAMCH, CLANGE
+      REAL               SLAMCH, CLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, CLANGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CGEQR, CGEMQR, CLASCL, CLASET,
      $                   CTRTRS, XERBLA, CGELQ, CGEMLQ
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          REAL, MAX, MIN, INT
+      INTRINSIC          MAX, MIN, INT
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input arguments.
 *
       INFO = 0
-      MINMN = MIN( M, N )
       MAXMN = MAX( M, N )
-      MNK   = MAX( MINMN, NRHS )
       TRAN  = LSAME( TRANS, 'C' )
 *
       LQUERY = ( LWORK.EQ.-1 .OR. LWORK.EQ.-2 )
@@ -230,9 +238,12 @@ SUBROUTINE CGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
 *
       IF( INFO.EQ.0 ) THEN
 *
-*     Determine the block size and minimum LWORK
+*     Determine the optimum and minimum LWORK
 *
-       IF( M.GE.N ) THEN
+       IF( MIN( M, N, NRHS ).EQ.0 ) THEN
+         WSIZEO = 1
+         WSIZEM = 1
+       ELSE IF ( M.GE.N ) THEN
          CALL CGEQR( M, N, A, LDA, TQ, -1, WORKQ, -1, INFO2 )
          TSZO = INT( TQ( 1 ) )
          LWO  = INT( WORKQ( 1 ) )
@@ -267,17 +278,17 @@ SUBROUTINE CGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
        IF( ( LWORK.LT.WSIZEM ).AND.( .NOT.LQUERY ) ) THEN
           INFO = -10
        END IF
+*
+       WORK( 1 ) = SROUNDUP_LWORK( WSIZEO )
 *
       END IF
 *
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'CGETSLS', -INFO )
-        WORK( 1 ) = REAL( WSIZEO )
         RETURN
       END IF
       IF( LQUERY ) THEN
-        IF( LWORK.EQ.-1 ) WORK( 1 ) = REAL( WSIZEO )
-        IF( LWORK.EQ.-2 ) WORK( 1 ) = REAL( WSIZEM )
+        IF( LWORK.EQ.-2 ) WORK( 1 ) = SROUNDUP_LWORK( WSIZEM )
         RETURN
       END IF
       IF( LWORK.LT.WSIZEO ) THEN
@@ -300,7 +311,6 @@ SUBROUTINE CGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
 *
        SMLNUM = SLAMCH( 'S' ) / SLAMCH( 'P' )
        BIGNUM = ONE / SMLNUM
-       CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A, B if max element outside range [SMLNUM,BIGNUM]
 *
@@ -488,7 +498,7 @@ SUBROUTINE CGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
       END IF
 *
    50 CONTINUE
-      WORK( 1 ) = REAL( TSZO + LWO )
+      WORK( 1 ) = SROUNDUP_LWORK( TSZO + LWO )
       RETURN
 *
 *     End of CGETSLS
diff --git a/SRC/cgetsqrhrt.f b/SRC/cgetsqrhrt.f
index 4e4dc1d4ad..522f28a923 100644
--- a/SRC/cgetsqrhrt.f
+++ b/SRC/cgetsqrhrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGETSQRHRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgetsqrhrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgetsqrhrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,14 +128,17 @@
 *>
 *> \param[in] LWORK
 *> \verbatim
+*>          LWORK is INTEGER
 *>          The dimension of the array WORK.
-*>          LWORK >= MAX( LWT + LW1, MAX( LWT+N*N+LW2, LWT+N*N+N ) ),
+*>          If MIN(M,N) = 0, LWORK >= 1, else
+*>          LWORK >= MAX( 1, LWT + LW1, MAX( LWT+N*N+LW2, LWT+N*N+N ) ),
 *>          where
 *>             NUM_ALL_ROW_BLOCKS = CEIL((M-N)/(MB1-N)),
 *>             NB1LOCAL = MIN(NB1,N).
 *>             LWT = NUM_ALL_ROW_BLOCKS * N * NB1LOCAL,
 *>             LW1 = NB1LOCAL * N,
-*>             LW2 = NB1LOCAL * MAX( NB1LOCAL, ( N - NB1LOCAL ) ),
+*>             LW2 = NB1LOCAL * MAX( NB1LOCAL, ( N - NB1LOCAL ) ).
+*>
 *>          If LWORK = -1, then a workspace query is assumed.
 *>          The routine only calculates the optimal size of the WORK
 *>          array, returns this value as the first entry of the WORK
@@ -160,7 +161,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup comlpexOTHERcomputational
+*> \ingroup getsqrhrt
 *
 *> \par Contributors:
 *  ==================
@@ -174,7 +175,8 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
+      SUBROUTINE CGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT,
+     $                       WORK,
      $                       LWORK, INFO )
       IMPLICIT NONE
 *
@@ -200,8 +202,13 @@ SUBROUTINE CGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
       INTEGER            I, IINFO, J, LW1, LW2, LWT, LDWT, LWORKOPT,
      $                   NB1LOCAL, NB2LOCAL, NUM_ALL_ROW_BLOCKS
 *     ..
+*     .. External Functions ..
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
+*     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CLATSQR, CUNGTSQR_ROW, CUNHR_COL,
+      EXTERNAL           CCOPY, CLATSQR, CUNGTSQR_ROW,
+     $                   CUNHR_COL,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -212,7 +219,7 @@ SUBROUTINE CGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
 *     Test the input arguments
 *
       INFO = 0
-      LQUERY  = LWORK.EQ.-1
+      LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
       ELSE IF( N.LT.0 .OR. M.LT.N ) THEN
@@ -225,7 +232,7 @@ SUBROUTINE CGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
          INFO = -5
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -7
-      ELSE IF( LDT.LT.MAX( 1,  MIN( NB2, N ) ) ) THEN
+      ELSE IF( LDT.LT.MAX( 1, MIN( NB2, N ) ) ) THEN
          INFO = -9
       ELSE
 *
@@ -263,8 +270,9 @@ SUBROUTINE CGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
             LW2 = NB1LOCAL * MAX( NB1LOCAL, ( N - NB1LOCAL ) )
 *
             LWORKOPT = MAX( LWT + LW1, MAX( LWT+N*N+LW2, LWT+N*N+N ) )
+            LWORKOPT = MAX( 1, LWORKOPT )
 *
-            IF( ( LWORK.LT.MAX( 1, LWORKOPT ) ).AND.(.NOT.LQUERY) ) THEN
+            IF( LWORK.LT.LWORKOPT .AND. .NOT.LQUERY ) THEN
                INFO = -11
             END IF
 *
@@ -277,14 +285,14 @@ SUBROUTINE CGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
          CALL XERBLA( 'CGETSQRHRT', -INFO )
          RETURN
       ELSE IF ( LQUERY ) THEN
-         WORK( 1 ) = CMPLX( LWORKOPT )
+         WORK( 1 ) = SROUNDUP_LWORK( LWORKOPT )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
       IF( MIN( M, N ).EQ.0 ) THEN
-         WORK( 1 ) = CMPLX( LWORKOPT )
+         WORK( 1 ) = SROUNDUP_LWORK( LWORKOPT )
          RETURN
       END IF
 *
@@ -337,13 +345,14 @@ SUBROUTINE CGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
                A( I, J ) = -CONE * WORK( LWT+N*(J-1)+I )
             END DO
          ELSE
-            CALL CCOPY( N-I+1, WORK(LWT+N*(I-1)+I), N, A( I, I ), LDA )
+            CALL CCOPY( N-I+1, WORK(LWT+N*(I-1)+I), N, A( I, I ),
+     $                  LDA )
          END IF
       END DO
 *
-      WORK( 1 ) = CMPLX( LWORKOPT )
+      WORK( 1 ) = SROUNDUP_LWORK( LWORKOPT )
       RETURN
 *
 *     End of CGETSQRHRT
 *
-      END
\ No newline at end of file
+      END
diff --git a/SRC/cggbak.f b/SRC/cggbak.f
index e8ac348050..5db45e5129 100644
--- a/SRC/cggbak.f
+++ b/SRC/cggbak.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGBAK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cggbak.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cggbak.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -131,7 +129,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBcomputational
+*> \ingroup ggbak
 *
 *> \par Further Details:
 *  =====================
@@ -143,8 +141,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
+      SUBROUTINE CGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M,
+     $                   V,
      $                   LDV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,8 +183,10 @@ SUBROUTINE CGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
       LEFTV = LSAME( SIDE, 'L' )
 *
       INFO = 0
-      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
-     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+      IF( .NOT.LSAME( JOB, 'N' ) .AND.
+     $    .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND.
+     $                .NOT.LSAME( JOB, 'B' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.RIGHTV .AND. .NOT.LEFTV ) THEN
          INFO = -2
@@ -253,7 +255,7 @@ SUBROUTINE CGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
             IF( ILO.EQ.1 )
      $         GO TO 50
             DO 40 I = ILO - 1, 1, -1
-               K = RSCALE( I )
+               K = INT( RSCALE( I ) )
                IF( K.EQ.I )
      $            GO TO 40
                CALL CSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
@@ -263,7 +265,7 @@ SUBROUTINE CGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
             IF( IHI.EQ.N )
      $         GO TO 70
             DO 60 I = IHI + 1, N
-               K = RSCALE( I )
+               K = INT( RSCALE( I ) )
                IF( K.EQ.I )
      $            GO TO 60
                CALL CSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
@@ -277,7 +279,7 @@ SUBROUTINE CGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
             IF( ILO.EQ.1 )
      $         GO TO 90
             DO 80 I = ILO - 1, 1, -1
-               K = LSCALE( I )
+               K = INT( LSCALE( I ) )
                IF( K.EQ.I )
      $            GO TO 80
                CALL CSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
@@ -287,7 +289,7 @@ SUBROUTINE CGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
             IF( IHI.EQ.N )
      $         GO TO 110
             DO 100 I = IHI + 1, N
-               K = LSCALE( I )
+               K = INT( LSCALE( I ) )
                IF( K.EQ.I )
      $            GO TO 100
                CALL CSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
diff --git a/SRC/cggbal.f b/SRC/cggbal.f
index c7a2324157..4850184761 100644
--- a/SRC/cggbal.f
+++ b/SRC/cggbal.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGBAL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cggbal.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cggbal.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,7 +158,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBcomputational
+*> \ingroup ggbal
 *
 *> \par Further Details:
 *  =====================
@@ -174,6 +172,7 @@
 *  =====================================================================
       SUBROUTINE CGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
      $                   RSCALE, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -230,8 +229,10 @@ SUBROUTINE CGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
 *     Test the input parameters
 *
       INFO = 0
-      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
-     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+      IF( .NOT.LSAME( JOB, 'N' ) .AND.
+     $    .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND.
+     $                .NOT.LSAME( JOB, 'B' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -346,7 +347,7 @@ SUBROUTINE CGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
 *     Permute rows M and I
 *
   160 CONTINUE
-      LSCALE( M ) = I
+      LSCALE( M ) = REAL( I )
       IF( I.EQ.M )
      $   GO TO 170
       CALL CSWAP( N-K+1, A( I, K ), LDA, A( M, K ), LDA )
@@ -355,7 +356,7 @@ SUBROUTINE CGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
 *     Permute columns M and J
 *
   170 CONTINUE
-      RSCALE( M ) = J
+      RSCALE( M ) = REAL( J )
       IF( J.EQ.M )
      $   GO TO 180
       CALL CSWAP( L, A( 1, J ), 1, A( 1, M ), 1 )
@@ -514,8 +515,10 @@ SUBROUTINE CGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
       IF( CMAX.LT.HALF )
      $   GO TO 350
 *
-      CALL SAXPY( NR, -ALPHA, WORK( ILO+2*N ), 1, WORK( ILO+4*N ), 1 )
-      CALL SAXPY( NR, -ALPHA, WORK( ILO+3*N ), 1, WORK( ILO+5*N ), 1 )
+      CALL SAXPY( NR, -ALPHA, WORK( ILO+2*N ), 1, WORK( ILO+4*N ),
+     $            1 )
+      CALL SAXPY( NR, -ALPHA, WORK( ILO+3*N ), 1, WORK( ILO+5*N ),
+     $            1 )
 *
       PGAMMA = GAMMA
       IT = IT + 1
@@ -535,7 +538,7 @@ SUBROUTINE CGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
          IRAB = ICAMAX( N-ILO+1, B( I, ILO ), LDB )
          RAB = MAX( RAB, ABS( B( I, IRAB+ILO-1 ) ) )
          LRAB = INT( LOG10( RAB+SFMIN ) / BASL+ONE )
-         IR = LSCALE( I ) + SIGN( HALF, LSCALE( I ) )
+         IR = INT( LSCALE( I ) + SIGN( HALF, LSCALE( I ) ) )
          IR = MIN( MAX( IR, LSFMIN ), LSFMAX, LSFMAX-LRAB )
          LSCALE( I ) = SCLFAC**IR
          ICAB = ICAMAX( IHI, A( 1, I ), 1 )
@@ -543,7 +546,7 @@ SUBROUTINE CGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
          ICAB = ICAMAX( IHI, B( 1, I ), 1 )
          CAB = MAX( CAB, ABS( B( ICAB, I ) ) )
          LCAB = INT( LOG10( CAB+SFMIN ) / BASL+ONE )
-         JC = RSCALE( I ) + SIGN( HALF, RSCALE( I ) )
+         JC = INT( RSCALE( I ) + SIGN( HALF, RSCALE( I ) ) )
          JC = MIN( MAX( JC, LSFMIN ), LSFMAX, LSFMAX-LCAB )
          RSCALE( I ) = SCLFAC**JC
   360 CONTINUE
diff --git a/SRC/cgges.f b/SRC/cgges.f
index c54174da49..85bc2b0ee1 100644
--- a/SRC/cgges.f
+++ b/SRC/cgges.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGES + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgges.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgges.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -261,12 +259,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEeigen
+*> \ingroup gges
 *
 *  =====================================================================
-      SUBROUTINE CGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
+      SUBROUTINE CGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
+     $                  LDB,
      $                  SDIM, ALPHA, BETA, VSL, LDVSL, VSR, LDVSR, WORK,
      $                  LWORK, RWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -311,15 +311,16 @@ SUBROUTINE CGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
       REAL               DIF( 2 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEQRF, CGGBAK, CGGBAL, CGGHRD, CHGEQZ, CLACPY,
-     $                   CLASCL, CLASET, CTGSEN, CUNGQR, CUNMQR, SLABAD,
-     $                   XERBLA
+      EXTERNAL           CGEQRF, CGGBAK, CGGBAL, CGGHRD, CHGEQZ,
+     $                   CLACPY,
+     $                   CLASCL, CLASET, CTGSEN, CUNGQR, CUNMQR, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               CLANGE, SLAMCH
-      EXTERNAL           LSAME, ILAENV, CLANGE, SLAMCH
+      REAL               CLANGE, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, CLANGE, SLAMCH,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
@@ -360,7 +361,8 @@ SUBROUTINE CGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
          INFO = -1
       ELSE IF( IJOBVR.LE.0 ) THEN
          INFO = -2
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
          INFO = -5
@@ -383,14 +385,15 @@ SUBROUTINE CGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
 *
       IF( INFO.EQ.0 ) THEN
          LWKMIN = MAX( 1, 2*N )
-         LWKOPT = MAX( 1, N + N*ILAENV( 1, 'CGEQRF', ' ', N, 1, N, 0 ) )
+         LWKOPT = MAX( 1, N + N*ILAENV( 1, 'CGEQRF', ' ', N, 1, N,
+     $                 0 ) )
          LWKOPT = MAX( LWKOPT, N +
      $                 N*ILAENV( 1, 'CUNMQR', ' ', N, 1, N, -1 ) )
          IF( ILVSL ) THEN
             LWKOPT = MAX( LWKOPT, N +
      $                    N*ILAENV( 1, 'CUNGQR', ' ', N, 1, N, -1 ) )
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY )
      $      INFO = -18
@@ -415,7 +418,6 @@ SUBROUTINE CGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -528,9 +530,11 @@ SUBROUTINE CGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
 *        Undo scaling on eigenvalues before selecting
 *
          IF( ILASCL )
-     $      CALL CLASCL( 'G', 0, 0, ANRM, ANRMTO, N, 1, ALPHA, N, IERR )
+     $      CALL CLASCL( 'G', 0, 0, ANRM, ANRMTO, N, 1, ALPHA, N,
+     $                   IERR )
          IF( ILBSCL )
-     $      CALL CLASCL( 'G', 0, 0, BNRM, BNRMTO, N, 1, BETA, N, IERR )
+     $      CALL CLASCL( 'G', 0, 0, BNRM, BNRMTO, N, 1, BETA, N,
+     $                   IERR )
 *
 *        Select eigenvalues
 *
@@ -538,7 +542,8 @@ SUBROUTINE CGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
             BWORK( I ) = SELCTG( ALPHA( I ), BETA( I ) )
    10    CONTINUE
 *
-         CALL CTGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB, ALPHA,
+         CALL CTGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB,
+     $                ALPHA,
      $                BETA, VSL, LDVSL, VSR, LDVSR, SDIM, PVSL, PVSR,
      $                DIF, WORK( IWRK ), LWORK-IWRK+1, IDUM, 1, IERR )
          IF( IERR.EQ.1 )
@@ -587,7 +592,7 @@ SUBROUTINE CGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
 *
    30 CONTINUE
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/cgges3.f b/SRC/cgges3.f
index aac9f95103..05dbc7fa79 100644
--- a/SRC/cgges3.f
+++ b/SRC/cgges3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGES3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgges3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgges3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -215,7 +213,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= MAX(1,2*N).
+*>          For good performance, LWORK must generally be larger.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -260,12 +259,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEeigen
+*> \ingroup gges3
 *
 *  =====================================================================
       SUBROUTINE CGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
      $                   LDB, SDIM, ALPHA, BETA, VSL, LDVSL, VSR, LDVSR,
      $                   WORK, LWORK, RWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -300,7 +300,8 @@ SUBROUTINE CGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
       LOGICAL            CURSL, ILASCL, ILBSCL, ILVSL, ILVSR, LASTSL,
      $                   LQUERY, WANTST
       INTEGER            I, ICOLS, IERR, IHI, IJOBVL, IJOBVR, ILEFT,
-     $                   ILO, IRIGHT, IROWS, IRWRK, ITAU, IWRK, LWKOPT
+     $                   ILO, IRIGHT, IROWS, IRWRK, ITAU, IWRK, LWKOPT,
+     $                   LWKMIN
       REAL               ANRM, ANRMTO, BIGNUM, BNRM, BNRMTO, EPS, PVSL,
      $                   PVSR, SMLNUM
 *     ..
@@ -309,14 +310,15 @@ SUBROUTINE CGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
       REAL               DIF( 2 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEQRF, CGGBAK, CGGBAL, CGGHD3, CLAQZ0, CLACPY,
-     $                   CLASCL, CLASET, CTGSEN, CUNGQR, CUNMQR, SLABAD,
-     $                   XERBLA
+      EXTERNAL           CGEQRF, CGGBAK, CGGBAL, CGGHD3, CLAQZ0,
+     $                   CLACPY,
+     $                   CLASCL, CLASET, CTGSEN, CUNGQR, CUNMQR, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               CLANGE, SLAMCH
-      EXTERNAL           LSAME, CLANGE, SLAMCH
+      REAL               CLANGE, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           LSAME, CLANGE, SLAMCH,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
@@ -353,11 +355,14 @@ SUBROUTINE CGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
+      LWKMIN = MAX( 1, 2*N )
+*
       IF( IJOBVL.LE.0 ) THEN
          INFO = -1
       ELSE IF( IJOBVR.LE.0 ) THEN
          INFO = -2
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
          INFO = -5
@@ -369,7 +374,7 @@ SUBROUTINE CGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
          INFO = -14
       ELSE IF( LDVSR.LT.1 .OR. ( ILVSR .AND. LDVSR.LT.N ) ) THEN
          INFO = -16
-      ELSE IF( LWORK.LT.MAX( 1, 2*N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -18
       END IF
 *
@@ -377,29 +382,33 @@ SUBROUTINE CGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
 *
       IF( INFO.EQ.0 ) THEN
          CALL CGEQRF( N, N, B, LDB, WORK, WORK, -1, IERR )
-         LWKOPT = MAX( 1,  N + INT ( WORK( 1 ) ) )
+         LWKOPT = MAX( LWKMIN, N + INT( WORK( 1 ) ) )
          CALL CUNMQR( 'L', 'C', N, N, N, B, LDB, WORK, A, LDA, WORK,
      $                -1, IERR )
-         LWKOPT = MAX( LWKOPT, N + INT ( WORK( 1 ) ) )
+         LWKOPT = MAX( LWKOPT, N + INT( WORK( 1 ) ) )
          IF( ILVSL ) THEN
             CALL CUNGQR( N, N, N, VSL, LDVSL, WORK, WORK, -1,
      $                   IERR )
-            LWKOPT = MAX( LWKOPT, N + INT ( WORK( 1 ) ) )
+            LWKOPT = MAX( LWKOPT, N + INT( WORK( 1 ) ) )
          END IF
          CALL CGGHD3( JOBVSL, JOBVSR, N, 1, N, A, LDA, B, LDB, VSL,
      $                LDVSL, VSR, LDVSR, WORK, -1, IERR )
-         LWKOPT = MAX( LWKOPT, N + INT ( WORK( 1 ) ) )
+         LWKOPT = MAX( LWKOPT, N + INT( WORK( 1 ) ) )
          CALL CLAQZ0( 'S', JOBVSL, JOBVSR, N, 1, N, A, LDA, B, LDB,
      $                ALPHA, BETA, VSL, LDVSL, VSR, LDVSR, WORK, -1,
      $                RWORK, 0, IERR )
-         LWKOPT = MAX( LWKOPT, INT ( WORK( 1 ) ) )
+         LWKOPT = MAX( LWKOPT, INT( WORK( 1 ) ) )
          IF( WANTST ) THEN
             CALL CTGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB,
      $                   ALPHA, BETA, VSL, LDVSL, VSR, LDVSR, SDIM,
      $                   PVSL, PVSR, DIF, WORK, -1, IDUM, 1, IERR )
-            LWKOPT = MAX( LWKOPT, INT ( WORK( 1 ) ) )
+            LWKOPT = MAX( LWKOPT, INT( WORK( 1 ) ) )
+         END IF
+         IF( N.EQ.0 ) THEN
+            WORK( 1 ) = 1
+         ELSE
+            WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
          END IF
-         WORK( 1 ) = CMPLX( LWKOPT )
       END IF
 
 *
@@ -422,7 +431,6 @@ SUBROUTINE CGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -527,9 +535,11 @@ SUBROUTINE CGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
 *        Undo scaling on eigenvalues before selecting
 *
          IF( ILASCL )
-     $      CALL CLASCL( 'G', 0, 0, ANRM, ANRMTO, N, 1, ALPHA, N, IERR )
+     $      CALL CLASCL( 'G', 0, 0, ANRM, ANRMTO, N, 1, ALPHA, N,
+     $                   IERR )
          IF( ILBSCL )
-     $      CALL CLASCL( 'G', 0, 0, BNRM, BNRMTO, N, 1, BETA, N, IERR )
+     $      CALL CLASCL( 'G', 0, 0, BNRM, BNRMTO, N, 1, BETA, N,
+     $                   IERR )
 *
 *        Select eigenvalues
 *
@@ -537,7 +547,8 @@ SUBROUTINE CGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
             BWORK( I ) = SELCTG( ALPHA( I ), BETA( I ) )
    10    CONTINUE
 *
-         CALL CTGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB, ALPHA,
+         CALL CTGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB,
+     $                ALPHA,
      $                BETA, VSL, LDVSL, VSR, LDVSR, SDIM, PVSL, PVSR,
      $                DIF, WORK( IWRK ), LWORK-IWRK+1, IDUM, 1, IERR )
          IF( IERR.EQ.1 )
@@ -585,7 +596,7 @@ SUBROUTINE CGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
 *
    30 CONTINUE
 *
-      WORK( 1 ) = CMPLX( LWKOPT )
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       RETURN
 *
diff --git a/SRC/cggesx.f b/SRC/cggesx.f
index 6385a74c11..379d21c4ea 100644
--- a/SRC/cggesx.f
+++ b/SRC/cggesx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGESX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cggesx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cggesx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -320,13 +318,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEeigen
+*> \ingroup ggesx
 *
 *  =====================================================================
-      SUBROUTINE CGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
+      SUBROUTINE CGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A,
+     $                   LDA,
      $                   B, LDB, SDIM, ALPHA, BETA, VSL, LDVSL, VSR,
      $                   LDVSR, RCONDE, RCONDV, WORK, LWORK, RWORK,
      $                   IWORK, LIWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -372,15 +372,16 @@ SUBROUTINE CGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
       REAL               DIF( 2 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEQRF, CGGBAK, CGGBAL, CGGHRD, CHGEQZ, CLACPY,
-     $                   CLASCL, CLASET, CTGSEN, CUNGQR, CUNMQR, SLABAD,
-     $                   XERBLA
+      EXTERNAL           CGEQRF, CGGBAK, CGGBAL, CGGHRD, CHGEQZ,
+     $                   CLACPY,
+     $                   CLASCL, CLASET, CTGSEN, CUNGQR, CUNMQR, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               CLANGE, SLAMCH
-      EXTERNAL           LSAME, ILAENV, CLANGE, SLAMCH
+      REAL               CLANGE, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, CLANGE, SLAMCH,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
@@ -434,7 +435,8 @@ SUBROUTINE CGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
          INFO = -1
       ELSE IF( IJOBVR.LE.0 ) THEN
          INFO = -2
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( .NOT.( WANTSN .OR. WANTSE .OR. WANTSV .OR. WANTSB ) .OR.
      $         ( .NOT.WANTST .AND. .NOT.WANTSN ) ) THEN
@@ -466,7 +468,8 @@ SUBROUTINE CGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
      $                    ILAENV( 1, 'CUNMQR', ' ', N, 1, N, -1 ) ) )
             IF( ILVSL ) THEN
                MAXWRK = MAX( MAXWRK, N*( 1 +
-     $                       ILAENV( 1, 'CUNGQR', ' ', N, 1, N, -1 ) ) )
+     $                       ILAENV( 1, 'CUNGQR', ' ', N, 1, N,
+     $                               -1 ) ) )
             END IF
             LWRK = MAXWRK
             IF( IJOB.GE.1 )
@@ -476,7 +479,7 @@ SUBROUTINE CGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
             MAXWRK = 1
             LWRK   = 1
          END IF
-         WORK( 1 ) = LWRK
+         WORK( 1 ) = SROUNDUP_LWORK(LWRK)
          IF( WANTSN .OR. N.EQ.0 ) THEN
             LIWMIN = 1
          ELSE
@@ -510,7 +513,6 @@ SUBROUTINE CGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -621,9 +623,11 @@ SUBROUTINE CGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
 *        Undo scaling on eigenvalues before SELCTGing
 *
          IF( ILASCL )
-     $      CALL CLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHA, N, IERR )
+     $      CALL CLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHA, N,
+     $                   IERR )
          IF( ILBSCL )
-     $      CALL CLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N, IERR )
+     $      CALL CLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N,
+     $                   IERR )
 *
 *        Select eigenvalues
 *
@@ -705,7 +709,7 @@ SUBROUTINE CGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
 *
    40 CONTINUE
 *
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/cggev.f b/SRC/cggev.f
index c1c28a1805..4266cf959c 100644
--- a/SRC/cggev.f
+++ b/SRC/cggev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cggev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cggev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -209,11 +207,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEeigen
+*> \ingroup ggev
 *
 *  =====================================================================
       SUBROUTINE CGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
      $                  VL, LDVL, VR, LDVR, WORK, LWORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -253,15 +252,16 @@ SUBROUTINE CGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
       LOGICAL            LDUMMA( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEQRF, CGGBAK, CGGBAL, CGGHRD, CHGEQZ, CLACPY,
-     $                   CLASCL, CLASET, CTGEVC, CUNGQR, CUNMQR, SLABAD,
-     $                   XERBLA
+      EXTERNAL           CGEQRF, CGGBAK, CGGBAL, CGGHRD, CHGEQZ,
+     $                   CLACPY,
+     $                   CLASCL, CLASET, CTGEVC, CUNGQR, CUNMQR, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               CLANGE, SLAMCH
-      EXTERNAL           LSAME, ILAENV, CLANGE, SLAMCH
+      REAL               CLANGE, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, CLANGE, SLAMCH,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MAX, REAL, SQRT
@@ -329,14 +329,15 @@ SUBROUTINE CGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
 *
       IF( INFO.EQ.0 ) THEN
          LWKMIN = MAX( 1, 2*N )
-         LWKOPT = MAX( 1, N + N*ILAENV( 1, 'CGEQRF', ' ', N, 1, N, 0 ) )
+         LWKOPT = MAX( 1, N + N*ILAENV( 1, 'CGEQRF', ' ', N, 1, N,
+     $                 0 ) )
          LWKOPT = MAX( LWKOPT, N +
      $                 N*ILAENV( 1, 'CUNMQR', ' ', N, 1, N, 0 ) )
          IF( ILVL ) THEN
             LWKOPT = MAX( LWKOPT, N +
      $                 N*ILAENV( 1, 'CUNGQR', ' ', N, 1, N, -1 ) )
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY )
      $      INFO = -15
@@ -359,7 +360,6 @@ SUBROUTINE CGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
       EPS = SLAMCH( 'E' )*SLAMCH( 'B' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -492,7 +492,8 @@ SUBROUTINE CGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
             CHTEMP = 'R'
          END IF
 *
-         CALL CTGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL, LDVL,
+         CALL CTGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL,
+     $                LDVL,
      $                VR, LDVR, N, IN, WORK( IWRK ), RWORK( IRWRK ),
      $                IERR )
          IF( IERR.NE.0 ) THEN
@@ -547,7 +548,7 @@ SUBROUTINE CGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
       IF( ILBSCL )
      $   CALL CLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N, IERR )
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of CGGEV
diff --git a/SRC/cggev3.f b/SRC/cggev3.f
index 9483ecdeb1..ce6b486a32 100644
--- a/SRC/cggev3.f
+++ b/SRC/cggev3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGEV3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cggev3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cggev3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -174,7 +172,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= MAX(1,2*N).
+*>          For good performance, LWORK must generally be larger.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -208,11 +207,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEeigen
+*> \ingroup ggev3
 *
 *  =====================================================================
-      SUBROUTINE CGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
+      SUBROUTINE CGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA,
+     $                   BETA,
      $                   VL, LDVL, VR, LDVR, WORK, LWORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -243,7 +244,7 @@ SUBROUTINE CGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
       CHARACTER          CHTEMP
       INTEGER            ICOLS, IERR, IHI, IJOBVL, IJOBVR, ILEFT, ILO,
      $                   IN, IRIGHT, IROWS, IRWRK, ITAU, IWRK, JC, JR,
-     $                   LWKOPT
+     $                   LWKOPT, LWKMIN
       REAL               ANRM, ANRMTO, BIGNUM, BNRM, BNRMTO, EPS,
      $                   SMLNUM, TEMP
       COMPLEX            X
@@ -252,14 +253,15 @@ SUBROUTINE CGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
       LOGICAL            LDUMMA( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEQRF, CGGBAK, CGGBAL, CGGHD3, CLAQZ0, CLACPY,
-     $                   CLASCL, CLASET, CTGEVC, CUNGQR, CUNMQR, SLABAD,
-     $                   XERBLA
+      EXTERNAL           CGEQRF, CGGBAK, CGGBAL, CGGHD3, CLAQZ0,
+     $                   CLACPY,
+     $                   CLASCL, CLASET, CTGEVC, CUNGQR, CUNMQR, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               CLANGE, SLAMCH
-      EXTERNAL           LSAME, CLANGE, SLAMCH
+      REAL               CLANGE, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           LSAME, CLANGE, SLAMCH,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MAX, REAL, SQRT
@@ -301,6 +303,7 @@ SUBROUTINE CGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
+      LWKMIN = MAX( 1, 2*N )
       IF( IJOBVL.LE.0 ) THEN
          INFO = -1
       ELSE IF( IJOBVR.LE.0 ) THEN
@@ -315,7 +318,7 @@ SUBROUTINE CGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
          INFO = -11
       ELSE IF( LDVR.LT.1 .OR. ( ILVR .AND. LDVR.LT.N ) ) THEN
          INFO = -13
-      ELSE IF( LWORK.LT.MAX( 1, 2*N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -15
       END IF
 *
@@ -323,7 +326,7 @@ SUBROUTINE CGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
 *
       IF( INFO.EQ.0 ) THEN
          CALL CGEQRF( N, N, B, LDB, WORK, WORK, -1, IERR )
-         LWKOPT = MAX( N,  N+INT( WORK( 1 ) ) )
+         LWKOPT = MAX( LWKMIN, N+INT( WORK( 1 ) ) )
          CALL CUNMQR( 'L', 'C', N, N, N, B, LDB, WORK, A, LDA, WORK,
      $                -1, IERR )
          LWKOPT = MAX( LWKOPT, N+INT( WORK( 1 ) ) )
@@ -348,7 +351,11 @@ SUBROUTINE CGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
      $                   RWORK, 0, IERR )
             LWKOPT = MAX( LWKOPT, N+INT( WORK( 1 ) ) )
          END IF
-         WORK( 1 ) = CMPLX( LWKOPT )
+         IF( N.EQ.0 ) THEN
+            WORK( 1 ) = 1
+         ELSE
+            WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+         END IF
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -368,7 +375,6 @@ SUBROUTINE CGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
       EPS = SLAMCH( 'E' )*SLAMCH( 'B' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -495,7 +501,8 @@ SUBROUTINE CGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
             CHTEMP = 'R'
          END IF
 *
-         CALL CTGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL, LDVL,
+         CALL CTGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL,
+     $                LDVL,
      $                VR, LDVR, N, IN, WORK( IWRK ), RWORK( IRWRK ),
      $                IERR )
          IF( IERR.NE.0 ) THEN
@@ -549,7 +556,7 @@ SUBROUTINE CGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
       IF( ILBSCL )
      $   CALL CLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N, IERR )
 *
-      WORK( 1 ) = CMPLX( LWKOPT )
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       RETURN
 *
 *     End of CGGEV3
diff --git a/SRC/cggevx.f b/SRC/cggevx.f
index 405c9c3b56..c1d34c18c6 100644
--- a/SRC/cggevx.f
+++ b/SRC/cggevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cggevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cggevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -335,7 +333,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEeigen
+*> \ingroup ggevx
 *
 *> \par Further Details:
 *  =====================
@@ -367,10 +365,12 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
+      SUBROUTINE CGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B,
+     $                   LDB,
      $                   ALPHA, BETA, VL, LDVL, VR, LDVR, ILO, IHI,
      $                   LSCALE, RSCALE, ABNRM, BBNRM, RCONDE, RCONDV,
      $                   WORK, LWORK, RWORK, IWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -414,15 +414,17 @@ SUBROUTINE CGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
       LOGICAL            LDUMMA( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEQRF, CGGBAK, CGGBAL, CGGHRD, CHGEQZ, CLACPY,
+      EXTERNAL           CGEQRF, CGGBAK, CGGBAL, CGGHRD, CHGEQZ,
+     $                   CLACPY,
      $                   CLASCL, CLASET, CTGEVC, CTGSNA, CUNGQR, CUNMQR,
-     $                   SLABAD, SLASCL, XERBLA
+     $                   SLASCL, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               CLANGE, SLAMCH
-      EXTERNAL           LSAME, ILAENV, CLANGE, SLAMCH
+      REAL               CLANGE, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, CLANGE, SLAMCH,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MAX, REAL, SQRT
@@ -513,15 +515,18 @@ SUBROUTINE CGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
             END IF
             MAXWRK = MINWRK
             MAXWRK = MAX( MAXWRK,
-     $                    N + N*ILAENV( 1, 'CGEQRF', ' ', N, 1, N, 0 ) )
+     $                    N + N*ILAENV( 1, 'CGEQRF', ' ', N, 1, N,
+     $                                  0 ) )
             MAXWRK = MAX( MAXWRK,
-     $                    N + N*ILAENV( 1, 'CUNMQR', ' ', N, 1, N, 0 ) )
+     $                    N + N*ILAENV( 1, 'CUNMQR', ' ', N, 1, N,
+     $                                  0 ) )
             IF( ILVL ) THEN
                MAXWRK = MAX( MAXWRK, N +
-     $                       N*ILAENV( 1, 'CUNGQR', ' ', N, 1, N, 0 ) )
+     $                       N*ILAENV( 1, 'CUNGQR', ' ', N, 1, N,
+     $                                 0 ) )
             END IF
          END IF
-         WORK( 1 ) = MAXWRK
+         WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
             INFO = -25
@@ -545,7 +550,6 @@ SUBROUTINE CGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -580,7 +584,8 @@ SUBROUTINE CGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
 *     Permute and/or balance the matrix pair (A,B)
 *     (Real Workspace: need 6*N if BALANC = 'S' or 'B', 1 otherwise)
 *
-      CALL CGGBAL( BALANC, N, A, LDA, B, LDB, ILO, IHI, LSCALE, RSCALE,
+      CALL CGGBAL( BALANC, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
+     $             RSCALE,
      $             RWORK, IERR )
 *
 *     Compute ABNRM and BBNRM
@@ -749,7 +754,8 @@ SUBROUTINE CGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
 *     (Workspace: none needed)
 *
       IF( ILVL ) THEN
-         CALL CGGBAK( BALANC, 'L', N, ILO, IHI, LSCALE, RSCALE, N, VL,
+         CALL CGGBAK( BALANC, 'L', N, ILO, IHI, LSCALE, RSCALE, N,
+     $                VL,
      $                LDVL, IERR )
 *
          DO 50 JC = 1, N
@@ -767,7 +773,8 @@ SUBROUTINE CGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
       END IF
 *
       IF( ILVR ) THEN
-         CALL CGGBAK( BALANC, 'R', N, ILO, IHI, LSCALE, RSCALE, N, VR,
+         CALL CGGBAK( BALANC, 'R', N, ILO, IHI, LSCALE, RSCALE, N,
+     $                VR,
      $                LDVR, IERR )
          DO 80 JC = 1, N
             TEMP = ZERO
@@ -793,7 +800,7 @@ SUBROUTINE CGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
       IF( ILBSCL )
      $   CALL CLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N, IERR )
 *
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
       RETURN
 *
 *     End of CGGEVX
diff --git a/SRC/cggglm.f b/SRC/cggglm.f
index 3efca1e713..46c4a2c730 100644
--- a/SRC/cggglm.f
+++ b/SRC/cggglm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGGLM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cggglm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cggglm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -61,6 +59,16 @@
 *>                  x
 *>
 *> where inv(B) denotes the inverse of B.
+*>
+*> Callers of this subroutine should note that the singularity/rank-deficiency checks
+*> implemented in this subroutine are rudimentary. The CTRTRS subroutine called by this
+*> subroutine only signals a failure due to singularity if the problem is exactly singular.
+*>
+*> It is conceivable for one (or more) of the factors involved in the generalized QR
+*> factorization of the pair (A, B) to be subnormally close to singularity without this
+*> subroutine signalling an error. The solutions computed for such almost-rank-deficient
+*> problems may be less accurate due to a loss of numerical precision.
+*> 
 *> \endverbatim
 *
 *  Arguments:
@@ -159,12 +167,12 @@
 *>          = 0:  successful exit.
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value.
 *>          = 1:  the upper triangular factor R associated with A in the
-*>                generalized QR factorization of the pair (A, B) is
+*>                generalized QR factorization of the pair (A, B) is exactly
 *>                singular, so that rank(A) < M; the least squares
 *>                solution could not be computed.
 *>          = 2:  the bottom (N-M) by (N-M) part of the upper trapezoidal
 *>                factor T associated with B in the generalized QR
-*>                factorization of the pair (A, B) is singular, so that
+*>                factorization of the pair (A, B) is exactly singular, so that
 *>                rank( A B ) < N; the least squares solution could not
 *>                be computed.
 *> \endverbatim
@@ -177,11 +185,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHEReigen
+*> \ingroup ggglm
 *
 *  =====================================================================
-      SUBROUTINE CGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
+      SUBROUTINE CGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK,
+     $                   LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -208,12 +218,14 @@ SUBROUTINE CGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
      $                   NB4, NP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CGEMV, CGGQRF, CTRTRS, CUNMQR, CUNMRQ,
+      EXTERNAL           CCOPY, CGEMV, CGGQRF, CTRTRS, CUNMQR,
+     $                   CUNMRQ,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          INT, MAX, MIN
@@ -252,7 +264,7 @@ SUBROUTINE CGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
             LWKMIN = M + N + P
             LWKOPT = M + NP + MAX( N, P )*NB
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
             INFO = -12
@@ -289,12 +301,13 @@ SUBROUTINE CGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
 *
       CALL CGGQRF( N, M, P, A, LDA, WORK, B, LDB, WORK( M+1 ),
      $             WORK( M+NP+1 ), LWORK-M-NP, INFO )
-      LOPT = REAL( WORK( M+NP+1 ) )
+      LOPT = INT( WORK( M+NP+1 ) )
 *
 *     Update left-hand-side vector d = Q**H*d = ( d1 ) M
 *                                               ( d2 ) N-M
 *
-      CALL CUNMQR( 'Left', 'Conjugate transpose', N, 1, M, A, LDA, WORK,
+      CALL CUNMQR( 'Left', 'Conjugate transpose', N, 1, M, A, LDA,
+     $             WORK,
      $             D, MAX( 1, N ), WORK( M+NP+1 ), LWORK-M-NP, INFO )
       LOPT = MAX( LOPT, INT( WORK( M+NP+1 ) ) )
 *
@@ -320,13 +333,15 @@ SUBROUTINE CGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
 *
 *     Update d1 = d1 - T12*y2
 *
-      CALL CGEMV( 'No transpose', M, N-M, -CONE, B( 1, M+P-N+1 ), LDB,
+      CALL CGEMV( 'No transpose', M, N-M, -CONE, B( 1, M+P-N+1 ),
+     $            LDB,
      $            Y( M+P-N+1 ), 1, CONE, D, 1 )
 *
 *     Solve triangular system: R11*x = d1
 *
       IF( M.GT.0 ) THEN
-         CALL CTRTRS( 'Upper', 'No Transpose', 'Non unit', M, 1, A, LDA,
+         CALL CTRTRS( 'Upper', 'No Transpose', 'Non unit', M, 1, A,
+     $                LDA,
      $                D, M, INFO )
 *
          IF( INFO.GT.0 ) THEN
@@ -344,7 +359,7 @@ SUBROUTINE CGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
       CALL CUNMRQ( 'Left', 'Conjugate transpose', P, 1, NP,
      $             B( MAX( 1, N-P+1 ), 1 ), LDB, WORK( M+1 ), Y,
      $             MAX( 1, P ), WORK( M+NP+1 ), LWORK-M-NP, INFO )
-      WORK( 1 ) = M + NP + MAX( LOPT, INT( WORK( M+NP+1 ) ) )
+      WORK( 1 ) = CMPLX( M + NP + MAX( LOPT, INT( WORK( M+NP+1 ) ) ) )
 *
       RETURN
 *
diff --git a/SRC/cgghd3.f b/SRC/cgghd3.f
index 76d7de4ce0..7dc6a411da 100644
--- a/SRC/cgghd3.f
+++ b/SRC/cgghd3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGHD3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgghd3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgghd3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -180,14 +178,14 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX array, dimension (LWORK)
+*>          WORK is COMPLEX array, dimension (MAX(1,LWORK))
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in]  LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of the array WORK.  LWORK >= 1.
+*>          The length of the array WORK. LWORK >= 1.
 *>          For optimum performance LWORK >= 6*N*NB, where NB is the
 *>          optimal blocksize.
 *>
@@ -212,7 +210,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup gghd3
 *
 *> \par Further Details:
 *  =====================
@@ -226,7 +224,8 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
+      SUBROUTINE CGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB,
+     $                   Q,
      $                   LDQ, Z, LDZ, WORK, LWORK, INFO )
 *
 *  -- LAPACK computational routine --
@@ -265,10 +264,12 @@ SUBROUTINE CGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           ILAENV, LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGGHRD, CLARTG, CLASET, CUNM22, CROT, CGEMM,
+      EXTERNAL           CGGHRD, CLARTG, CLASET, CUNM22, CROT,
+     $                   CGEMM,
      $                   CGEMV, CTRMV, CLACPY, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -280,8 +281,13 @@ SUBROUTINE CGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
       INFO = 0
       NB = ILAENV( 1, 'CGGHD3', ' ', N, ILO, IHI, -1 )
-      LWKOPT = MAX( 6*N*NB, 1 )
-      WORK( 1 ) = CMPLX( LWKOPT )
+      NH = IHI - ILO + 1
+      IF( NH.LE.1 ) THEN
+         LWKOPT = 1
+      ELSE
+         LWKOPT = 6*N*NB
+      END IF
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       INITQ = LSAME( COMPQ, 'I' )
       WANTQ = INITQ .OR. LSAME( COMPQ, 'V' )
       INITZ = LSAME( COMPZ, 'I' )
@@ -330,7 +336,6 @@ SUBROUTINE CGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
 *     Quick return if possible
 *
-      NH = IHI - ILO + 1
       IF( NH.LE.1 ) THEN
          WORK( 1 ) = CONE
          RETURN
@@ -388,7 +393,8 @@ SUBROUTINE CGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
             N2NB = ( IHI-JCOL-1 ) / NNB - 1
             NBLST = IHI - JCOL - N2NB*NNB
-            CALL CLASET( 'All', NBLST, NBLST, CZERO, CONE, WORK, NBLST )
+            CALL CLASET( 'All', NBLST, NBLST, CZERO, CONE, WORK,
+     $                   NBLST )
             PW = NBLST * NBLST + 1
             DO I = 1, N2NB
                CALL CLASET( 'All', 2*NNB, 2*NNB, CZERO, CONE,
@@ -511,7 +517,7 @@ SUBROUTINE CGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
                IF( JJ.GT.0 ) THEN
                   DO I = JJ, 1, -1
-                     C = DBLE( A( J+1+I, J ) )
+                     C = REAL( A( J+1+I, J ) )
                      CALL CROT( IHI-TOP, A( TOP+1, J+I+1 ), 1,
      $                          A( TOP+1, J+I ), 1, C,
      $                          -CONJG( B( J+1+I, J ) ) )
@@ -581,10 +587,12 @@ SUBROUTINE CGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
                         WORK( PPW ) = A( I, J+1 )
                         PPW = PPW + 1
                      END DO
-                     CALL CTRMV( 'Upper', 'Conjugate', 'Non-unit', LEN,
+                     CALL CTRMV( 'Upper', 'Conjugate', 'Non-unit',
+     $                           LEN,
      $                           WORK( PPWO + NNB ), 2*NNB, WORK( PW ),
      $                           1 )
-                     CALL CTRMV( 'Lower', 'Conjugate', 'Non-unit', NNB,
+                     CALL CTRMV( 'Lower', 'Conjugate', 'Non-unit',
+     $                           NNB,
      $                           WORK( PPWO + 2*LEN*NNB ),
      $                           2*NNB, WORK( PW + LEN ), 1 )
                      CALL CGEMV( 'Conjugate', NNB, LEN, CONE,
@@ -753,9 +761,11 @@ SUBROUTINE CGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
                END DO
             ELSE
 *
-               CALL CLASET( 'Lower', IHI - JCOL - 1, NNB, CZERO, CZERO,
+               CALL CLASET( 'Lower', IHI - JCOL - 1, NNB, CZERO,
+     $                      CZERO,
      $                      A( JCOL + 2, JCOL ), LDA )
-               CALL CLASET( 'Lower', IHI - JCOL - 1, NNB, CZERO, CZERO,
+               CALL CLASET( 'Lower', IHI - JCOL - 1, NNB, CZERO,
+     $                      CZERO,
      $                      B( JCOL + 2, JCOL ), LDB )
             END IF
 *
@@ -775,7 +785,8 @@ SUBROUTINE CGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
 *                    Exploit the structure of U.
 *
-                     CALL CUNM22( 'Right', 'No Transpose', TOP, 2*NNB,
+                     CALL CUNM22( 'Right', 'No Transpose', TOP,
+     $                            2*NNB,
      $                            NNB, NNB, WORK( PPWO ), 2*NNB,
      $                            A( 1, J ), LDA, WORK( PW ),
      $                            LWORK-PW+1, IERR )
@@ -806,7 +817,8 @@ SUBROUTINE CGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
 *                    Exploit the structure of U.
 *
-                     CALL CUNM22( 'Right', 'No Transpose', TOP, 2*NNB,
+                     CALL CUNM22( 'Right', 'No Transpose', TOP,
+     $                            2*NNB,
      $                            NNB, NNB, WORK( PPWO ), 2*NNB,
      $                            B( 1, J ), LDB, WORK( PW ),
      $                            LWORK-PW+1, IERR )
@@ -886,9 +898,11 @@ SUBROUTINE CGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
       END IF
 *
       IF ( JCOL.LT.IHI )
-     $   CALL CGGHRD( COMPQ2, COMPZ2, N, JCOL, IHI, A, LDA, B, LDB, Q,
+     $   CALL CGGHRD( COMPQ2, COMPZ2, N, JCOL, IHI, A, LDA, B, LDB,
+     $                Q,
      $                LDQ, Z, LDZ, IERR )
-      WORK( 1 ) = CMPLX( LWKOPT )
+*
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       RETURN
 *
diff --git a/SRC/cgghrd.f b/SRC/cgghrd.f
index bf96a31381..8e4416375b 100644
--- a/SRC/cgghrd.f
+++ b/SRC/cgghrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGHRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgghrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgghrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -186,7 +184,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup gghrd
 *
 *> \par Further Details:
 *  =====================
@@ -199,8 +197,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CGGHRD( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
+      SUBROUTINE CGGHRD( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB,
+     $                   Q,
      $                   LDQ, Z, LDZ, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -343,11 +343,13 @@ SUBROUTINE CGGHRD( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
             CALL CLARTG( CTEMP, B( JROW, JROW-1 ), C, S,
      $                   B( JROW, JROW ) )
             B( JROW, JROW-1 ) = CZERO
-            CALL CROT( IHI, A( 1, JROW ), 1, A( 1, JROW-1 ), 1, C, S )
+            CALL CROT( IHI, A( 1, JROW ), 1, A( 1, JROW-1 ), 1, C,
+     $                 S )
             CALL CROT( JROW-1, B( 1, JROW ), 1, B( 1, JROW-1 ), 1, C,
      $                 S )
             IF( ILZ )
-     $         CALL CROT( N, Z( 1, JROW ), 1, Z( 1, JROW-1 ), 1, C, S )
+     $         CALL CROT( N, Z( 1, JROW ), 1, Z( 1, JROW-1 ), 1, C,
+     $                    S )
    30    CONTINUE
    40 CONTINUE
 *
diff --git a/SRC/cgglse.f b/SRC/cgglse.f
index 4785941dbe..0080717c43 100644
--- a/SRC/cgglse.f
+++ b/SRC/cgglse.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGLSE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgglse.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgglse.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -52,6 +50,16 @@
 *> matrices (B, A) given by
 *>
 *>    B = (0 R)*Q,   A = Z*T*Q.
+*>
+*> Callers of this subroutine should note that the singularity/rank-deficiency checks
+*> implemented in this subroutine are rudimentary. The CTRTRS subroutine called by this
+*> subroutine only signals a failure due to singularity if the problem is exactly singular.
+*>
+*> It is conceivable for one (or more) of the factors involved in the generalized RQ
+*> factorization of the pair (B, A) to be subnormally close to singularity without this
+*> subroutine signalling an error. The solutions computed for such almost-rank-deficient
+*> problems may be less accurate due to a loss of numerical precision.
+*> 
 *> \endverbatim
 *
 *  Arguments:
@@ -153,12 +161,12 @@
 *>          = 0:  successful exit.
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value.
 *>          = 1:  the upper triangular factor R associated with B in the
-*>                generalized RQ factorization of the pair (B, A) is
+*>                generalized RQ factorization of the pair (B, A) is exactly
 *>                singular, so that rank(B) < P; the least squares
 *>                solution could not be computed.
 *>          = 2:  the (N-P) by (N-P) part of the upper trapezoidal factor
 *>                T associated with A in the generalized RQ factorization
-*>                of the pair (B, A) is singular, so that
+*>                of the pair (B, A) is exactly singular, so that
 *>                rank( (A) ) < N; the least squares solution could not
 *>                    ( (B) )
 *>                be computed.
@@ -172,11 +180,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERsolve
+*> \ingroup gglse
 *
 *  =====================================================================
-      SUBROUTINE CGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
+      SUBROUTINE CGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK,
+     $                   LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -202,12 +212,14 @@ SUBROUTINE CGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
      $                   NB4, NR
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CGEMV, CGGRQF, CTRMV, CTRTRS,
+      EXTERNAL           CAXPY, CCOPY, CGEMV, CGGRQF, CTRMV,
+     $                   CTRTRS,
      $                   CUNMQR, CUNMRQ, XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          INT, MAX, MIN
@@ -246,7 +258,7 @@ SUBROUTINE CGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
             LWKMIN = M + N + P
             LWKOPT = P + MN + MAX( M, N )*NB
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
             INFO = -12
@@ -276,7 +288,7 @@ SUBROUTINE CGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
 *
       CALL CGGRQF( P, M, N, B, LDB, WORK, A, LDA, WORK( P+1 ),
      $             WORK( P+MN+1 ), LWORK-P-MN, INFO )
-      LOPT = REAL( WORK( P+MN+1 ) )
+      LOPT = INT( WORK( P+MN+1 ) )
 *
 *     Update c = Z**H *c = ( c1 ) N-P
 *                       ( c2 ) M+P-N
@@ -303,7 +315,8 @@ SUBROUTINE CGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
 *
 *        Update c1
 *
-         CALL CGEMV( 'No transpose', N-P, P, -CONE, A( 1, N-P+1 ), LDA,
+         CALL CGEMV( 'No transpose', N-P, P, -CONE, A( 1, N-P+1 ),
+     $               LDA,
      $               D, 1, CONE, C, 1 )
       END IF
 *
@@ -328,7 +341,8 @@ SUBROUTINE CGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
       IF( M.LT.N ) THEN
          NR = M + P - N
          IF( NR.GT.0 )
-     $      CALL CGEMV( 'No transpose', NR, N-M, -CONE, A( N-P+1, M+1 ),
+     $      CALL CGEMV( 'No transpose', NR, N-M, -CONE, A( N-P+1,
+     $                  M+1 ),
      $                  LDA, D( NR+1 ), 1, CONE, C( N-P+1 ), 1 )
       ELSE
          NR = P
@@ -343,7 +357,7 @@ SUBROUTINE CGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
 *
       CALL CUNMRQ( 'Left', 'Conjugate Transpose', N, 1, P, B, LDB,
      $             WORK( 1 ), X, N, WORK( P+MN+1 ), LWORK-P-MN, INFO )
-      WORK( 1 ) = P + MN + MAX( LOPT, INT( WORK( P+MN+1 ) ) )
+      WORK( 1 ) = CMPLX( P + MN + MAX( LOPT, INT( WORK( P+MN+1 ) ) ) )
 *
       RETURN
 *
diff --git a/SRC/cggqrf.f b/SRC/cggqrf.f
index febd9be8de..16cfe38bc3 100644
--- a/SRC/cggqrf.f
+++ b/SRC/cggqrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGQRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cggqrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cggqrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -173,7 +171,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup ggqrf
 *
 *> \par Further Details:
 *  =====================
@@ -212,6 +210,7 @@
 *  =====================================================================
       SUBROUTINE CGGQRF( N, M, P, A, LDA, TAUA, B, LDB, TAUB, WORK,
      $                   LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -236,7 +235,8 @@ SUBROUTINE CGGQRF( N, M, P, A, LDA, TAUA, B, LDB, TAUB, WORK,
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          INT, MAX, MIN
@@ -250,8 +250,8 @@ SUBROUTINE CGGQRF( N, M, P, A, LDA, TAUA, B, LDB, TAUB, WORK,
       NB2 = ILAENV( 1, 'CGERQF', ' ', N, P, -1, -1 )
       NB3 = ILAENV( 1, 'CUNMQR', ' ', N, M, P, -1 )
       NB = MAX( NB1, NB2, NB3 )
-      LWKOPT = MAX( N, M, P)*NB
-      WORK( 1 ) = LWKOPT
+      LWKOPT = MAX( 1, MAX( N, M, P )*NB )
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       LQUERY = ( LWORK.EQ.-1 )
       IF( N.LT.0 ) THEN
          INFO = -1
@@ -276,18 +276,19 @@ SUBROUTINE CGGQRF( N, M, P, A, LDA, TAUA, B, LDB, TAUB, WORK,
 *     QR factorization of N-by-M matrix A: A = Q*R
 *
       CALL CGEQRF( N, M, A, LDA, TAUA, WORK, LWORK, INFO )
-      LOPT = REAL( WORK( 1 ) )
+      LOPT = INT( WORK( 1 ) )
 *
 *     Update B := Q**H*B.
 *
-      CALL CUNMQR( 'Left', 'Conjugate Transpose', N, P, MIN( N, M ), A,
+      CALL CUNMQR( 'Left', 'Conjugate Transpose', N, P, MIN( N, M ),
+     $             A,
      $             LDA, TAUA, B, LDB, WORK, LWORK, INFO )
       LOPT = MAX( LOPT, INT( WORK( 1 ) ) )
 *
 *     RQ factorization of N-by-P matrix B: B = T*Z.
 *
       CALL CGERQF( N, P, B, LDB, TAUB, WORK, LWORK, INFO )
-      WORK( 1 ) = MAX( LOPT, INT( WORK( 1 ) ) )
+      WORK( 1 ) = SROUNDUP_LWORK( MAX( LOPT, INT( WORK( 1 ) ) ) )
 *
       RETURN
 *
diff --git a/SRC/cggrqf.f b/SRC/cggrqf.f
index b43febc1f5..b02999ac47 100644
--- a/SRC/cggrqf.f
+++ b/SRC/cggrqf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGRQF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cggrqf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cggrqf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -172,7 +170,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup ggrqf
 *
 *> \par Further Details:
 *  =====================
@@ -211,6 +209,7 @@
 *  =====================================================================
       SUBROUTINE CGGRQF( M, P, N, A, LDA, TAUA, B, LDB, TAUB, WORK,
      $                   LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -235,7 +234,8 @@ SUBROUTINE CGGRQF( M, P, N, A, LDA, TAUA, B, LDB, TAUB, WORK,
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          INT, MAX, MIN
@@ -249,8 +249,8 @@ SUBROUTINE CGGRQF( M, P, N, A, LDA, TAUA, B, LDB, TAUB, WORK,
       NB2 = ILAENV( 1, 'CGEQRF', ' ', P, N, -1, -1 )
       NB3 = ILAENV( 1, 'CUNMRQ', ' ', M, N, P, -1 )
       NB = MAX( NB1, NB2, NB3 )
-      LWKOPT = MAX( N, M, P)*NB
-      WORK( 1 ) = LWKOPT
+      LWKOPT = MAX( 1, MAX( N, M, P )*NB )
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -275,7 +275,7 @@ SUBROUTINE CGGRQF( M, P, N, A, LDA, TAUA, B, LDB, TAUB, WORK,
 *     RQ factorization of M-by-N matrix A: A = R*Q
 *
       CALL CGERQF( M, N, A, LDA, TAUA, WORK, LWORK, INFO )
-      LOPT = REAL( WORK( 1 ) )
+      LOPT = INT( WORK( 1 ) )
 *
 *     Update B := B*Q**H
 *
@@ -287,7 +287,7 @@ SUBROUTINE CGGRQF( M, P, N, A, LDA, TAUA, B, LDB, TAUB, WORK,
 *     QR factorization of P-by-N matrix B: B = Z*T
 *
       CALL CGEQRF( P, N, B, LDB, TAUB, WORK, LWORK, INFO )
-      WORK( 1 ) = MAX( LOPT, INT( WORK( 1 ) ) )
+      WORK( 1 ) = SROUNDUP_LWORK( MAX( LOPT, INT( WORK( 1 ) ) ) )
 *
       RETURN
 *
diff --git a/SRC/cggsvd3.f b/SRC/cggsvd3.f
index f248aebd52..3d64be11ad 100644
--- a/SRC/cggsvd3.f
+++ b/SRC/cggsvd3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGSVD3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cggsvd3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cggsvd3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -278,7 +276,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -333,7 +331,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEsing
+*> \ingroup ggsvd3
 *
 *> \par Contributors:
 *  ==================
@@ -351,6 +349,7 @@
       SUBROUTINE CGGSVD3( JOBU, JOBV, JOBQ, M, N, P, K, L, A, LDA, B,
      $                    LDB, ALPHA, BETA, U, LDU, V, LDV, Q, LDQ,
      $                    WORK, LWORK, RWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -428,7 +427,8 @@ SUBROUTINE CGGSVD3( JOBU, JOBV, JOBQ, M, N, P, K, L, A, LDA, B,
 *     Compute workspace
 *
       IF( INFO.EQ.0 ) THEN
-         CALL CGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB, TOLA,
+         CALL CGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
+     $                 TOLA,
      $                 TOLB, K, L, U, LDU, V, LDV, Q, LDQ, IWORK, RWORK,
      $                 WORK, WORK, -1, INFO )
          LWKOPT = N + INT( WORK( 1 ) )
@@ -455,8 +455,8 @@ SUBROUTINE CGGSVD3( JOBU, JOBV, JOBQ, M, N, P, K, L, A, LDA, B,
 *
       ULP = SLAMCH( 'Precision' )
       UNFL = SLAMCH( 'Safe Minimum' )
-      TOLA = MAX( M, N )*MAX( ANORM, UNFL )*ULP
-      TOLB = MAX( P, N )*MAX( BNORM, UNFL )*ULP
+      TOLA = REAL( MAX( M, N ) )*MAX( ANORM, UNFL )*ULP
+      TOLB = REAL( MAX( P, N ) )*MAX( BNORM, UNFL )*ULP
 *
       CALL CGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB, TOLA,
      $              TOLB, K, L, U, LDU, V, LDV, Q, LDQ, IWORK, RWORK,
diff --git a/SRC/cggsvp3.f b/SRC/cggsvp3.f
index 008a053a20..69819d7e08 100644
--- a/SRC/cggsvp3.f
+++ b/SRC/cggsvp3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGGSVP3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cggsvp3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cggsvp3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -233,7 +231,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -256,7 +254,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup ggsvp3
 *
 *> \par Further Details:
 *  =====================
@@ -311,7 +309,8 @@ SUBROUTINE CGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEQP3, CGEQR2, CGERQ2, CLACPY, CLAPMT,
+      EXTERNAL           CGEQP3, CGEQR2, CGERQ2, CLACPY,
+     $                   CLAPMT,
      $                   CLASET, CUNG2R, CUNM2R, CUNMR2, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -360,7 +359,8 @@ SUBROUTINE CGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *     Compute workspace
 *
       IF( INFO.EQ.0 ) THEN
-         CALL CGEQP3( P, N, B, LDB, IWORK, TAU, WORK, -1, RWORK, INFO )
+         CALL CGEQP3( P, N, B, LDB, IWORK, TAU, WORK, -1, RWORK,
+     $                INFO )
          LWKOPT = INT( WORK ( 1 ) )
          IF( WANTV ) THEN
             LWKOPT = MAX( LWKOPT, P )
@@ -370,7 +370,8 @@ SUBROUTINE CGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
          IF( WANTQ ) THEN
             LWKOPT = MAX( LWKOPT, N )
          END IF
-         CALL CGEQP3( M, N, A, LDA, IWORK, TAU, WORK, -1, RWORK, INFO )
+         CALL CGEQP3( M, N, A, LDA, IWORK, TAU, WORK, -1, RWORK,
+     $                INFO )
          LWKOPT = MAX( LWKOPT, INT( WORK ( 1 ) ) )
          LWKOPT = MAX( 1, LWKOPT )
          WORK( 1 ) = CMPLX( LWKOPT )
@@ -390,7 +391,8 @@ SUBROUTINE CGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
       DO 10 I = 1, N
          IWORK( I ) = 0
    10 CONTINUE
-      CALL CGEQP3( P, N, B, LDB, IWORK, TAU, WORK, LWORK, RWORK, INFO )
+      CALL CGEQP3( P, N, B, LDB, IWORK, TAU, WORK, LWORK, RWORK,
+     $             INFO )
 *
 *     Update A := A*P
 *
@@ -423,7 +425,8 @@ SUBROUTINE CGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
    30    CONTINUE
    40 CONTINUE
       IF( P.GT.L )
-     $   CALL CLASET( 'Full', P-L, N, CZERO, CZERO, B( L+1, 1 ), LDB )
+     $   CALL CLASET( 'Full', P-L, N, CZERO, CZERO, B( L+1, 1 ),
+     $                LDB )
 *
       IF( WANTQ ) THEN
 *
@@ -441,7 +444,8 @@ SUBROUTINE CGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *        Update A := A*Z**H
 *
-         CALL CUNMR2( 'Right', 'Conjugate transpose', M, N, L, B, LDB,
+         CALL CUNMR2( 'Right', 'Conjugate transpose', M, N, L, B,
+     $                LDB,
      $                TAU, A, LDA, WORK, INFO )
          IF( WANTQ ) THEN
 *
@@ -486,7 +490,8 @@ SUBROUTINE CGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *     Update A12 := U**H*A12, where A12 = A( 1:M, N-L+1:N )
 *
-      CALL CUNM2R( 'Left', 'Conjugate transpose', M, L, MIN( M, N-L ),
+      CALL CUNM2R( 'Left', 'Conjugate transpose', M, L, MIN( M,
+     $             N-L ),
      $             A, LDA, TAU, A( 1, N-L+1 ), LDA, WORK, INFO )
 *
       IF( WANTU ) THEN
@@ -495,7 +500,8 @@ SUBROUTINE CGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
          CALL CLASET( 'Full', M, M, CZERO, CZERO, U, LDU )
          IF( M.GT.1 )
-     $      CALL CLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA, U( 2, 1 ),
+     $      CALL CLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA, U( 2,
+     $                   1 ),
      $                   LDU )
          CALL CUNG2R( M, M, MIN( M, N-L ), U, LDU, TAU, WORK, INFO )
       END IF
@@ -516,7 +522,8 @@ SUBROUTINE CGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
    90    CONTINUE
   100 CONTINUE
       IF( M.GT.K )
-     $   CALL CLASET( 'Full', M-K, N-L, CZERO, CZERO, A( K+1, 1 ), LDA )
+     $   CALL CLASET( 'Full', M-K, N-L, CZERO, CZERO, A( K+1, 1 ),
+     $                LDA )
 *
       IF( N-L.GT.K ) THEN
 *
@@ -528,7 +535,8 @@ SUBROUTINE CGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update Q( 1:N,1:N-L ) = Q( 1:N,1:N-L )*Z1**H
 *
-            CALL CUNMR2( 'Right', 'Conjugate transpose', N, N-L, K, A,
+            CALL CUNMR2( 'Right', 'Conjugate transpose', N, N-L, K,
+     $                   A,
      $                   LDA, TAU, Q, LDQ, WORK, INFO )
          END IF
 *
@@ -553,7 +561,8 @@ SUBROUTINE CGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update U(:,K+1:M) := U(:,K+1:M)*U1
 *
-            CALL CUNM2R( 'Right', 'No transpose', M, M-K, MIN( M-K, L ),
+            CALL CUNM2R( 'Right', 'No transpose', M, M-K, MIN( M-K,
+     $                   L ),
      $                   A( K+1, N-L+1 ), LDA, TAU, U( 1, K+1 ), LDU,
      $                   WORK, INFO )
          END IF
diff --git a/SRC/cgsvj0.f b/SRC/cgsvj0.f
index 37853a10a1..11745219ab 100644
--- a/SRC/cgsvj0.f
+++ b/SRC/cgsvj0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGSVJ0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgsvj0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgsvj0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -52,10 +50,10 @@
 *>          Specifies whether the output from this procedure is used
 *>          to compute the matrix V:
 *>          = 'V': the product of the Jacobi rotations is accumulated
-*>                 by postmulyiplying the N-by-N array V.
+*>                 by postmultiplying the N-by-N array V.
 *>                (See the description of V.)
 *>          = 'A': the product of the Jacobi rotations is accumulated
-*>                 by postmulyiplying the MV-by-N array V.
+*>                 by postmultiplying the MV-by-N array V.
 *>                (See the descriptions of MV and V.)
 *>          = 'N': the Jacobi rotations are not accumulated.
 *> \endverbatim
@@ -117,7 +115,7 @@
 *> \param[in] MV
 *> \verbatim
 *>          MV is INTEGER
-*>          If JOBV = 'A', then MV rows of V are post-multipled by a
+*>          If JOBV = 'A', then MV rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
 *>          If JOBV = 'N',   then MV is not referenced.
 *> \endverbatim
@@ -125,9 +123,9 @@
 *> \param[in,out] V
 *> \verbatim
 *>          V is COMPLEX array, dimension (LDV,N)
-*>          If JOBV = 'V' then N rows of V are post-multipled by a
+*>          If JOBV = 'V' then N rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
-*>          If JOBV = 'A' then MV rows of V are post-multipled by a
+*>          If JOBV = 'A' then MV rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
 *>          If JOBV = 'N',   then V is not referenced.
 *> \endverbatim
@@ -193,7 +191,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup gsvj0
 *
 *> \par Further Details:
 *  =====================
@@ -499,7 +497,8 @@ SUBROUTINE CGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                     T  = HALF / THETA
                                     CS = ONE
 
-                                    CALL CROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL CROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*T )
                                     IF ( RSVEC ) THEN
                                         CALL CROT( MVL, V(1,p), 1,
@@ -528,7 +527,8 @@ SUBROUTINE CGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                     AAPP = AAPP*SQRT( MAX( ZERO,
      $                                      ONE-T*AQOAP*AAPQ1 ) )
 *
-                                    CALL CROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL CROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*SN )
                                     IF ( RSVEC ) THEN
                                         CALL CROT( MVL, V(1,p), 1,
@@ -541,14 +541,17 @@ SUBROUTINE CGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
 *              .. have to use modified Gram-Schmidt like transformation
                                  CALL CCOPY( M, A( 1, p ), 1,
      $                                       WORK, 1 )
-                                 CALL CLASCL( 'G', 0, 0, AAPP, ONE, M,
+                                 CALL CLASCL( 'G', 0, 0, AAPP, ONE,
+     $                                        M,
      $                                        1, WORK, LDA,
      $                                        IERR )
-                                 CALL CLASCL( 'G', 0, 0, AAQQ, ONE, M,
+                                 CALL CLASCL( 'G', 0, 0, AAQQ, ONE,
+     $                                        M,
      $                                        1, A( 1, q ), LDA, IERR )
                                  CALL CAXPY( M, -AAPQ, WORK, 1,
      $                                       A( 1, q ), 1 )
-                                 CALL CLASCL( 'G', 0, 0, ONE, AAQQ, M,
+                                 CALL CLASCL( 'G', 0, 0, ONE, AAQQ,
+     $                                        M,
      $                                        1, A( 1, q ), LDA, IERR )
                                  SVA( q ) = AAQQ*SQRT( MAX( ZERO,
      $                                      ONE-AAPQ1*AAPQ1 ) )
@@ -563,7 +566,8 @@ SUBROUTINE CGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = SCNRM2( M, A( 1, q ), 1 )
+                                    SVA( q ) = SCNRM2( M, A( 1, q ),
+     $                                   1 )
                                  ELSE
                                     T = ZERO
                                     AAQQ = ONE
@@ -715,7 +719,8 @@ SUBROUTINE CGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                  IF( ABS( THETA ).GT.BIGTHETA ) THEN
                                     T  = HALF / THETA
                                     CS = ONE
-                                    CALL CROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL CROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*T )
                                     IF( RSVEC ) THEN
                                         CALL CROT( MVL, V(1,p), 1,
@@ -742,7 +747,8 @@ SUBROUTINE CGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                     AAPP = AAPP*SQRT( MAX( ZERO,
      $                                         ONE-T*AQOAP*AAPQ1 ) )
 *
-                                    CALL CROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL CROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*SN )
                                     IF( RSVEC ) THEN
                                         CALL CROT( MVL, V(1,p), 1,
@@ -756,15 +762,18 @@ SUBROUTINE CGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                IF( AAPP.GT.AAQQ ) THEN
                                     CALL CCOPY( M, A( 1, p ), 1,
      $                                          WORK, 1 )
-                                    CALL CLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL CLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, WORK,LDA,
      $                                           IERR )
-                                    CALL CLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL CLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     CALL CAXPY( M, -AAPQ, WORK,
      $                                          1, A( 1, q ), 1 )
-                                    CALL CLASCL( 'G', 0, 0, ONE, AAQQ,
+                                    CALL CLASCL( 'G', 0, 0, ONE,
+     $                                           AAQQ,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     SVA( q ) = AAQQ*SQRT( MAX( ZERO,
@@ -773,15 +782,18 @@ SUBROUTINE CGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                ELSE
                                    CALL CCOPY( M, A( 1, q ), 1,
      $                                          WORK, 1 )
-                                    CALL CLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL CLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, WORK,LDA,
      $                                           IERR )
-                                    CALL CLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL CLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     CALL CAXPY( M, -CONJG(AAPQ),
      $                                   WORK, 1, A( 1, p ), 1 )
-                                    CALL CLASCL( 'G', 0, 0, ONE, AAPP,
+                                    CALL CLASCL( 'G', 0, 0, ONE,
+     $                                           AAPP,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     SVA( p ) = AAPP*SQRT( MAX( ZERO,
@@ -797,7 +809,8 @@ SUBROUTINE CGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = SCNRM2( M, A( 1, q ), 1)
+                                    SVA( q ) = SCNRM2( M, A( 1, q ),
+     $                                   1)
                                   ELSE
                                     T = ZERO
                                     AAQQ = ONE
diff --git a/SRC/cgsvj1.f b/SRC/cgsvj1.f
index f1a5204e32..4286db374e 100644
--- a/SRC/cgsvj1.f
+++ b/SRC/cgsvj1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGSVJ1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgsvj1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgsvj1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -75,10 +73,10 @@
 *>          Specifies whether the output from this procedure is used
 *>          to compute the matrix V:
 *>          = 'V': the product of the Jacobi rotations is accumulated
-*>                 by postmulyiplying the N-by-N array V.
+*>                 by postmultiplying the N-by-N array V.
 *>                (See the description of V.)
 *>          = 'A': the product of the Jacobi rotations is accumulated
-*>                 by postmulyiplying the MV-by-N array V.
+*>                 by postmultiplying the MV-by-N array V.
 *>                (See the descriptions of MV and V.)
 *>          = 'N': the Jacobi rotations are not accumulated.
 *> \endverbatim
@@ -147,7 +145,7 @@
 *> \param[in] MV
 *> \verbatim
 *>          MV is INTEGER
-*>          If JOBV = 'A', then MV rows of V are post-multipled by a
+*>          If JOBV = 'A', then MV rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
 *>          If JOBV = 'N',   then MV is not referenced.
 *> \endverbatim
@@ -155,9 +153,9 @@
 *> \param[in,out] V
 *> \verbatim
 *>          V is COMPLEX array, dimension (LDV,N)
-*>          If JOBV = 'V' then N rows of V are post-multipled by a
+*>          If JOBV = 'V' then N rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
-*>          If JOBV = 'A' then MV rows of V are post-multipled by a
+*>          If JOBV = 'A' then MV rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
 *>          If JOBV = 'N',   then V is not referenced.
 *> \endverbatim
@@ -223,7 +221,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup gsvj1
 *
 *> \par Contributor:
 *  ==================
@@ -233,6 +231,7 @@
 *  =====================================================================
       SUBROUTINE CGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
      $                   EPS, SFMIN, TOL, NSWEEP, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -484,7 +483,8 @@ SUBROUTINE CGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                  IF( ABS( THETA ).GT.BIGTHETA ) THEN
                                     T  = HALF / THETA
                                     CS = ONE
-                                    CALL CROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL CROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*T )
                                     IF( RSVEC ) THEN
                                         CALL CROT( MVL, V(1,p), 1,
@@ -511,7 +511,8 @@ SUBROUTINE CGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                     AAPP = AAPP*SQRT( MAX( ZERO,
      $                                         ONE-T*AQOAP*AAPQ1 ) )
 *
-                                    CALL CROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL CROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*SN )
                                     IF( RSVEC ) THEN
                                         CALL CROT( MVL, V(1,p), 1,
@@ -525,15 +526,18 @@ SUBROUTINE CGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                IF( AAPP.GT.AAQQ ) THEN
                                     CALL CCOPY( M, A( 1, p ), 1,
      $                                          WORK, 1 )
-                                    CALL CLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL CLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, WORK,LDA,
      $                                           IERR )
-                                    CALL CLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL CLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     CALL CAXPY( M, -AAPQ, WORK,
      $                                          1, A( 1, q ), 1 )
-                                    CALL CLASCL( 'G', 0, 0, ONE, AAQQ,
+                                    CALL CLASCL( 'G', 0, 0, ONE,
+     $                                           AAQQ,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     SVA( q ) = AAQQ*SQRT( MAX( ZERO,
@@ -542,15 +546,18 @@ SUBROUTINE CGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                ELSE
                                    CALL CCOPY( M, A( 1, q ), 1,
      $                                          WORK, 1 )
-                                    CALL CLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL CLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, WORK,LDA,
      $                                           IERR )
-                                    CALL CLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL CLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     CALL CAXPY( M, -CONJG(AAPQ),
      $                                   WORK, 1, A( 1, p ), 1 )
-                                    CALL CLASCL( 'G', 0, 0, ONE, AAPP,
+                                    CALL CLASCL( 'G', 0, 0, ONE,
+     $                                           AAPP,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     SVA( p ) = AAPP*SQRT( MAX( ZERO,
@@ -566,7 +573,8 @@ SUBROUTINE CGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = SCNRM2( M, A( 1, q ), 1)
+                                    SVA( q ) = SCNRM2( M, A( 1, q ),
+     $                                   1)
                                   ELSE
                                     T = ZERO
                                     AAQQ = ONE
diff --git a/SRC/cgtcon.f b/SRC/cgtcon.f
index b21a19594a..8acd7bf561 100644
--- a/SRC/cgtcon.f
+++ b/SRC/cgtcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGTCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgtcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgtcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,11 +131,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGTcomputational
+*> \ingroup gtcon
 *
 *  =====================================================================
       SUBROUTINE CGTCON( NORM, N, DL, D, DU, DU2, IPIV, ANORM, RCOND,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cgtrfs.f b/SRC/cgtrfs.f
index 9b76220e84..5ee0341793 100644
--- a/SRC/cgtrfs.f
+++ b/SRC/cgtrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGTRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgtrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgtrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -201,12 +199,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGTcomputational
+*> \ingroup gtrfs
 *
 *  =====================================================================
-      SUBROUTINE CGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
+      SUBROUTINE CGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
+     $                   DU2,
      $                   IPIV, B, LDB, X, LDX, FERR, BERR, WORK, RWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -247,7 +247,8 @@ SUBROUTINE CGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CGTTRS, CLACN2, CLAGTM, XERBLA
+      EXTERNAL           CAXPY, CCOPY, CGTTRS, CLACN2, CLAGTM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, CMPLX, MAX, REAL
@@ -309,7 +310,7 @@ SUBROUTINE CGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
       NZ = 4
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -326,7 +327,8 @@ SUBROUTINE CGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
 *        where op(A) = A, A**T, or A**H, depending on TRANS.
 *
          CALL CCOPY( N, B( 1, J ), 1, WORK, 1 )
-         CALL CLAGTM( TRANS, N, 1, -ONE, DL, D, DU, X( 1, J ), LDX, ONE,
+         CALL CLAGTM( TRANS, N, 1, -ONE, DL, D, DU, X( 1, J ), LDX,
+     $                ONE,
      $                WORK, N )
 *
 *        Compute abs(op(A))*abs(x) + abs(b) for use in the backward
@@ -401,7 +403,8 @@ SUBROUTINE CGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
 *
 *           Update solution and try again.
 *
-            CALL CGTTRS( TRANS, N, 1, DLF, DF, DUF, DU2, IPIV, WORK, N,
+            CALL CGTTRS( TRANS, N, 1, DLF, DF, DUF, DU2, IPIV, WORK,
+     $                   N,
      $                   INFO )
             CALL CAXPY( N, CMPLX( ONE ), WORK, 1, X( 1, J ), 1 )
             LSTRES = BERR( J )
@@ -433,10 +436,11 @@ SUBROUTINE CGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
 *
          DO 60 I = 1, N
             IF( RWORK( I ).GT.SAFE2 ) THEN
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I )
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I )
             ELSE
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I ) +
-     $                      SAFE1
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I ) + SAFE1
             END IF
    60    CONTINUE
 *
@@ -448,7 +452,8 @@ SUBROUTINE CGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
 *
 *              Multiply by diag(W)*inv(op(A)**H).
 *
-               CALL CGTTRS( TRANST, N, 1, DLF, DF, DUF, DU2, IPIV, WORK,
+               CALL CGTTRS( TRANST, N, 1, DLF, DF, DUF, DU2, IPIV,
+     $                      WORK,
      $                      N, INFO )
                DO 80 I = 1, N
                   WORK( I ) = RWORK( I )*WORK( I )
@@ -460,7 +465,8 @@ SUBROUTINE CGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
                DO 90 I = 1, N
                   WORK( I ) = RWORK( I )*WORK( I )
    90          CONTINUE
-               CALL CGTTRS( TRANSN, N, 1, DLF, DF, DUF, DU2, IPIV, WORK,
+               CALL CGTTRS( TRANSN, N, 1, DLF, DF, DUF, DU2, IPIV,
+     $                      WORK,
      $                      N, INFO )
             END IF
             GO TO 70
diff --git a/SRC/cgtsv.f b/SRC/cgtsv.f
index a9be1b70d5..83ed71d698 100644
--- a/SRC/cgtsv.f
+++ b/SRC/cgtsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGTSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgtsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgtsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,10 +115,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGTsolve
+*> \ingroup gtsv
 *
 *  =====================================================================
       SUBROUTINE CGTSV( N, NRHS, DL, D, DU, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cgtsvx.f b/SRC/cgtsvx.f
index 266e52b99b..83fb85f9fb 100644
--- a/SRC/cgtsvx.f
+++ b/SRC/cgtsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGTSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgtsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgtsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -285,12 +283,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGTsolve
+*> \ingroup gtsvx
 *
 *  =====================================================================
-      SUBROUTINE CGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
+      SUBROUTINE CGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF,
+     $                   DUF,
      $                   DU2, IPIV, B, LDB, X, LDX, RCOND, FERR, BERR,
      $                   WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -326,7 +326,8 @@ SUBROUTINE CGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
       EXTERNAL           LSAME, CLANGT, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CGTCON, CGTRFS, CGTTRF, CGTTRS, CLACPY,
+      EXTERNAL           CCOPY, CGTCON, CGTRFS, CGTTRF, CGTTRS,
+     $                   CLACPY,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -386,7 +387,8 @@ SUBROUTINE CGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL CGTCON( NORM, N, DLF, DF, DUF, DU2, IPIV, ANORM, RCOND, WORK,
+      CALL CGTCON( NORM, N, DLF, DF, DUF, DU2, IPIV, ANORM, RCOND,
+     $             WORK,
      $             INFO )
 *
 *     Compute the solution vectors X.
@@ -398,7 +400,8 @@ SUBROUTINE CGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
 *     Use iterative refinement to improve the computed solutions and
 *     compute error bounds and backward error estimates for them.
 *
-      CALL CGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2, IPIV,
+      CALL CGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
+     $             IPIV,
      $             B, LDB, X, LDX, FERR, BERR, WORK, RWORK, INFO )
 *
 *     Set INFO = N+1 if the matrix is singular to working precision.
diff --git a/SRC/cgttrf.f b/SRC/cgttrf.f
index 35d0997daf..71220bb9db 100644
--- a/SRC/cgttrf.f
+++ b/SRC/cgttrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGTTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgttrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgttrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,10 +115,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGTcomputational
+*> \ingroup gttrf
 *
 *  =====================================================================
       SUBROUTINE CGTTRF( N, DL, D, DU, DU2, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cgttrs.f b/SRC/cgttrs.f
index a37ad738e8..9ff93a4cf2 100644
--- a/SRC/cgttrs.f
+++ b/SRC/cgttrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGTTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgttrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgttrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,11 +128,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGTcomputational
+*> \ingroup gttrs
 *
 *  =====================================================================
-      SUBROUTINE CGTTRS( TRANS, N, NRHS, DL, D, DU, DU2, IPIV, B, LDB,
+      SUBROUTINE CGTTRS( TRANS, N, NRHS, DL, D, DU, DU2, IPIV, B,
+     $                   LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -212,7 +212,8 @@ SUBROUTINE CGTTRS( TRANS, N, NRHS, DL, D, DU, DU2, IPIV, B, LDB,
       ELSE
          DO 10 J = 1, NRHS, NB
             JB = MIN( NRHS-J+1, NB )
-            CALL CGTTS2( ITRANS, N, JB, DL, D, DU, DU2, IPIV, B( 1, J ),
+            CALL CGTTS2( ITRANS, N, JB, DL, D, DU, DU2, IPIV, B( 1,
+     $                   J ),
      $                   LDB )
    10    CONTINUE
       END IF
diff --git a/SRC/cgtts2.f b/SRC/cgtts2.f
index 60b5af0985..a3b6ee7921 100644
--- a/SRC/cgtts2.f
+++ b/SRC/cgtts2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CGTTS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cgtts2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cgtts2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGTcomputational
+*> \ingroup gtts2
 *
 *  =====================================================================
-      SUBROUTINE CGTTS2( ITRANS, N, NRHS, DL, D, DU, DU2, IPIV, B, LDB )
+      SUBROUTINE CGTTS2( ITRANS, N, NRHS, DL, D, DU, DU2, IPIV, B,
+     $                   LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/chb2st_kernels.f b/SRC/chb2st_kernels.f
index ea25b76e1d..906d260bd8 100644
--- a/SRC/chb2st_kernels.f
+++ b/SRC/chb2st_kernels.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHB2ST_KERNELS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chb2st_kernels.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chb2st_kernels.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,6 +161,8 @@
 *>
 *> \endverbatim
 *>
+*> \ingroup hb2st_kernels
+*>
 *  =====================================================================
       SUBROUTINE  CHB2ST_KERNELS( UPLO, WANTZ, TTYPE,
      $                            ST, ED, SWEEP, N, NB, IB,
@@ -285,7 +285,8 @@ SUBROUTINE  CHB2ST_KERNELS( UPLO, WANTZ, TTYPE,
                       A( DPOS-NB-I, J1+I ) = ZERO
    30             CONTINUE
                   CTMP = CONJG( A( DPOS-NB, J1 ) )
-                  CALL CLARFG( LM, CTMP, V( VPOS+1 ), 1, TAU( TAUPOS ) )
+                  CALL CLARFG( LM, CTMP, V( VPOS+1 ), 1,
+     $                         TAU( TAUPOS ) )
                   A( DPOS-NB, J1 ) = CTMP
 *
                   CALL CLARFX( 'Right', LN-1, LM, V( VPOS ),
diff --git a/SRC/chbev.f b/SRC/chbev.f
index 6f82cc46ba..a62c924ae7 100644
--- a/SRC/chbev.f
+++ b/SRC/chbev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHBEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chbev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chbev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,11 +142,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHEReigen
+*> \ingroup hbev
 *
 *  =====================================================================
       SUBROUTINE CHBEV( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
      $                  RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -181,7 +180,8 @@ SUBROUTINE CHBEV( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       EXTERNAL           LSAME, CLANHB, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHBTRD, CLASCL, CSTEQR, SSCAL, SSTERF, XERBLA
+      EXTERNAL           CHBTRD, CLASCL, CSTEQR, SSCAL, SSTERF,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          SQRT
@@ -251,9 +251,11 @@ SUBROUTINE CHBEV( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL CLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL CLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL CLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL CLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
       END IF
 *
diff --git a/SRC/chbev_2stage.f b/SRC/chbev_2stage.f
index 123d84729a..690dc0f100 100644
--- a/SRC/chbev_2stage.f
+++ b/SRC/chbev_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHBEV_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chbev_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chbev_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,7 +130,7 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = (2KD+1)*N + KD*NTHREADS
@@ -171,7 +169,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHEReigen
+*> \ingroup hbev_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -189,7 +187,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -197,16 +195,17 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE CHBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
+      SUBROUTINE CHBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z,
+     $                         LDZ,
      $                         WORK, LWORK, RWORK, INFO )
 *
       IMPLICIT NONE
@@ -240,11 +239,13 @@ SUBROUTINE CHBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV2STAGE
-      REAL               SLAMCH, CLANHB
-      EXTERNAL           LSAME, SLAMCH, CLANHB, ILAENV2STAGE
+      REAL               SLAMCH, CLANHB, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, CLANHB, ILAENV2STAGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SSCAL, SSTERF, XERBLA, CLASCL, CSTEQR,
+      EXTERNAL           SSCAL, SSTERF, XERBLA, CLASCL,
+     $                   CSTEQR,
      $                   CHETRD_2STAGE, CHETRD_HB2ST
 *     ..
 *     .. Intrinsic Functions ..
@@ -276,7 +277,7 @@ SUBROUTINE CHBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       IF( INFO.EQ.0 ) THEN
          IF( N.LE.1 ) THEN
             LWMIN = 1
-            WORK( 1 ) = LWMIN
+            WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
          ELSE
             IB    = ILAENV2STAGE( 2, 'CHETRD_HB2ST', JOBZ,
      $                            N, KD, -1, -1 )
@@ -285,7 +286,7 @@ SUBROUTINE CHBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
             LWTRD = ILAENV2STAGE( 4, 'CHETRD_HB2ST', JOBZ,
      $                            N, KD, IB, -1 )
             LWMIN = LHTRD + LWTRD
-            WORK( 1 )  = LWMIN
+            WORK( 1 )  = SROUNDUP_LWORK(LWMIN)
          ENDIF
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY )
@@ -337,9 +338,11 @@ SUBROUTINE CHBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL CLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL CLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL CLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL CLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
       END IF
 *
@@ -351,7 +354,7 @@ SUBROUTINE CHBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       LLWORK  = LWORK - INDWRK + 1
 *
       CALL CHETRD_HB2ST( "N", JOBZ, UPLO, N, KD, AB, LDAB, W,
-     $                    RWORK( INDE ), WORK( INDHOUS ), LHTRD, 
+     $                    RWORK( INDE ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWRK ), LLWORK, IINFO )
 *
 *     For eigenvalues only, call SSTERF.  For eigenvectors, call CSTEQR.
@@ -377,7 +380,7 @@ SUBROUTINE CHBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
 *
 *     Set WORK(1) to optimal workspace size.
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
 *
       RETURN
 *
diff --git a/SRC/chbevd.f b/SRC/chbevd.f
index 1598f4de5e..5a4eece550 100644
--- a/SRC/chbevd.f
+++ b/SRC/chbevd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHBEVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chbevd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chbevd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -41,12 +39,6 @@
 *> a complex Hermitian band matrix A.  If eigenvectors are desired, it
 *> uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -207,11 +199,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHEReigen
+*> \ingroup hbevd
 *
 *  =====================================================================
-      SUBROUTINE CHBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
+      SUBROUTINE CHBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
+     $                   WORK,
      $                   LWORK, RWORK, LRWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -245,11 +239,13 @@ SUBROUTINE CHBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               CLANHB, SLAMCH
-      EXTERNAL           LSAME, CLANHB, SLAMCH
+      REAL               CLANHB, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           LSAME, CLANHB, SLAMCH,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMM, CHBTRD, CLACPY, CLASCL, CSTEDC, SSCAL,
+      EXTERNAL           CGEMM, CHBTRD, CLACPY, CLASCL, CSTEDC,
+     $                   SSCAL,
      $                   SSTERF, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -294,8 +290,8 @@ SUBROUTINE CHBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         WORK( 1 ) = LWMIN
-         RWORK( 1 ) = LRWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
+         RWORK( 1 ) = REAL( LRWMIN )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -348,9 +344,11 @@ SUBROUTINE CHBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL CLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL CLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL CLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL CLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
       END IF
 *
@@ -369,7 +367,8 @@ SUBROUTINE CHBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       IF( .NOT.WANTZ ) THEN
          CALL SSTERF( N, W, RWORK( INDE ), INFO )
       ELSE
-         CALL CSTEDC( 'I', N, W, RWORK( INDE ), WORK, N, WORK( INDWK2 ),
+         CALL CSTEDC( 'I', N, W, RWORK( INDE ), WORK, N,
+     $                WORK( INDWK2 ),
      $                LLWK2, RWORK( INDWRK ), LLRWK, IWORK, LIWORK,
      $                INFO )
          CALL CGEMM( 'N', 'N', N, N, N, CONE, Z, LDZ, WORK, N, CZERO,
@@ -388,8 +387,8 @@ SUBROUTINE CHBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
          CALL SSCAL( IMAX, ONE / SIGMA, W, 1 )
       END IF
 *
-      WORK( 1 ) = LWMIN
-      RWORK( 1 ) = LRWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
+      RWORK( 1 ) = REAL( LRWMIN )
       IWORK( 1 ) = LIWMIN
       RETURN
 *
diff --git a/SRC/chbevd_2stage.f b/SRC/chbevd_2stage.f
index 340c546e8c..f5f2075f17 100644
--- a/SRC/chbevd_2stage.f
+++ b/SRC/chbevd_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHBEVD_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chbevd_2stage.f">
 *> [TGZ]</a>
@@ -15,13 +14,12 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chbevd_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
 *       SUBROUTINE CHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
-*                                 WORK, LWORK, RWORK, LRWORK, IWORK, 
+*                                 WORK, LWORK, RWORK, LRWORK, IWORK,
 *                                 LIWORK, INFO )
 *
 *       IMPLICIT NONE
@@ -47,12 +45,6 @@
 *> the reduction to tridiagonal.  If eigenvectors are desired, it
 *> uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -142,7 +134,7 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = (2KD+1)*N + KD*NTHREADS
@@ -219,7 +211,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHEReigen
+*> \ingroup hbevd_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -237,7 +229,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -245,17 +237,18 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE CHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
-     $                          WORK, LWORK, RWORK, LRWORK, IWORK, 
+      SUBROUTINE CHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z,
+     $                          LDZ,
+     $                          WORK, LWORK, RWORK, LRWORK, IWORK,
      $                          LIWORK, INFO )
 *
       IMPLICIT NONE
@@ -298,7 +291,8 @@ SUBROUTINE CHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       EXTERNAL           LSAME, SLAMCH, CLANHB, ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SSCAL, SSTERF, XERBLA, CGEMM, CLACPY,
+      EXTERNAL           SSCAL, SSTERF, XERBLA, CGEMM,
+     $                   CLACPY,
      $                   CLASCL, CSTEDC, CHETRD_HB2ST
 *     ..
 *     .. Intrinsic Functions ..
@@ -318,9 +312,12 @@ SUBROUTINE CHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
          LRWMIN = 1
          LIWMIN = 1
       ELSE
-         IB    = ILAENV2STAGE( 2, 'CHETRD_HB2ST', JOBZ, N, KD, -1, -1 )
-         LHTRD = ILAENV2STAGE( 3, 'CHETRD_HB2ST', JOBZ, N, KD, IB, -1 )
-         LWTRD = ILAENV2STAGE( 4, 'CHETRD_HB2ST', JOBZ, N, KD, IB, -1 )
+         IB    = ILAENV2STAGE( 2, 'CHETRD_HB2ST', JOBZ, N, KD, -1,
+     $                         -1 )
+         LHTRD = ILAENV2STAGE( 3, 'CHETRD_HB2ST', JOBZ, N, KD, IB,
+     $                         -1 )
+         LWTRD = ILAENV2STAGE( 4, 'CHETRD_HB2ST', JOBZ, N, KD, IB,
+     $                         -1 )
          IF( WANTZ ) THEN
             LWMIN = 2*N**2
             LRWMIN = 1 + 5*N + 2*N**2
@@ -346,8 +343,8 @@ SUBROUTINE CHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         WORK( 1 )  = LWMIN
-         RWORK( 1 ) = LRWMIN
+         WORK( 1 )  = CMPLX( LWMIN )
+         RWORK( 1 ) = REAL( LRWMIN )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -400,9 +397,11 @@ SUBROUTINE CHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL CLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL CLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL CLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL CLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
       END IF
 *
@@ -418,7 +417,7 @@ SUBROUTINE CHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       LLWK2   = LWORK - INDWK2 + 1
 *
       CALL CHETRD_HB2ST( "N", JOBZ, UPLO, N, KD, AB, LDAB, W,
-     $                    RWORK( INDE ), WORK( INDHOUS ), LHTRD, 
+     $                    RWORK( INDE ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWK ), LLWORK, IINFO )
 *
 *     For eigenvalues only, call SSTERF.  For eigenvectors, call CSTEDC.
@@ -426,7 +425,8 @@ SUBROUTINE CHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       IF( .NOT.WANTZ ) THEN
          CALL SSTERF( N, W, RWORK( INDE ), INFO )
       ELSE
-         CALL CSTEDC( 'I', N, W, RWORK( INDE ), WORK, N, WORK( INDWK2 ),
+         CALL CSTEDC( 'I', N, W, RWORK( INDE ), WORK, N,
+     $                WORK( INDWK2 ),
      $                LLWK2, RWORK( INDRWK ), LLRWK, IWORK, LIWORK,
      $                INFO )
          CALL CGEMM( 'N', 'N', N, N, N, CONE, Z, LDZ, WORK, N, CZERO,
@@ -445,8 +445,8 @@ SUBROUTINE CHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
          CALL SSCAL( IMAX, ONE / SIGMA, W, 1 )
       END IF
 *
-      WORK( 1 )  = LWMIN
-      RWORK( 1 ) = LRWMIN
+      WORK( 1 )  = CMPLX( LWMIN )
+      RWORK( 1 ) = REAL( LRWMIN )
       IWORK( 1 ) = LIWMIN
       RETURN
 *
diff --git a/SRC/chbevx.f b/SRC/chbevx.f
index 6b5f549a7f..7ebe76ac21 100644
--- a/SRC/chbevx.f
+++ b/SRC/chbevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHBEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chbevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chbevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -258,12 +256,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHEReigen
+*> \ingroup hbevx
 *
 *  =====================================================================
-      SUBROUTINE CHBEVX( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q, LDQ, VL,
+      SUBROUTINE CHBEVX( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q, LDQ,
+     $                   VL,
      $                   VU, IL, IU, ABSTOL, M, W, Z, LDZ, WORK, RWORK,
      $                   IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -306,7 +306,8 @@ SUBROUTINE CHBEVX( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q, LDQ, VL,
       EXTERNAL           LSAME, CLANHB, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CGEMV, CHBTRD, CLACPY, CLASCL, CSTEIN,
+      EXTERNAL           CCOPY, CGEMV, CHBTRD, CLACPY, CLASCL,
+     $                   CSTEIN,
      $                   CSTEQR, CSWAP, SCOPY, SSCAL, SSTEBZ, SSTERF,
      $                   XERBLA
 *     ..
@@ -416,9 +417,11 @@ SUBROUTINE CHBEVX( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q, LDQ, VL,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL CLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL CLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL CLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL CLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
          IF( ABSTOL.GT.0 )
      $      ABSTLL = ABSTOL*SIGMA
diff --git a/SRC/chbevx_2stage.f b/SRC/chbevx_2stage.f
index 22bced45f3..17bc8c6758 100644
--- a/SRC/chbevx_2stage.f
+++ b/SRC/chbevx_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHBEVX_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chbevx_2stage.f">
 *> [TGZ]</a>
@@ -15,14 +14,13 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chbevx_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
 *       SUBROUTINE CHBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB,
 *                                 Q, LDQ, VL, VU, IL, IU, ABSTOL, M, W,
-*                                 Z, LDZ, WORK, LWORK, RWORK, IWORK, 
+*                                 Z, LDZ, WORK, LWORK, RWORK, IWORK,
 *                                 IFAIL, INFO )
 *
 *       IMPLICIT NONE
@@ -233,7 +231,7 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = (2KD+1)*N + KD*NTHREADS
@@ -285,7 +283,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHEReigen
+*> \ingroup hbevx_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -303,7 +301,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -311,18 +309,18 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
       SUBROUTINE CHBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB,
      $                          Q, LDQ, VL, VU, IL, IU, ABSTOL, M, W,
-     $                          Z, LDZ, WORK, LWORK, RWORK, IWORK, 
+     $                          Z, LDZ, WORK, LWORK, RWORK, IWORK,
      $                          IFAIL, INFO )
 *
       IMPLICIT NONE
@@ -367,11 +365,13 @@ SUBROUTINE CHBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV2STAGE
-      REAL               SLAMCH, CLANHB
-      EXTERNAL           LSAME, SLAMCH, CLANHB, ILAENV2STAGE
+      REAL               SLAMCH, CLANHB, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, CLANHB, ILAENV2STAGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SSCAL, SSTEBZ, SSTERF, XERBLA, CCOPY,
+      EXTERNAL           SCOPY, SSCAL, SSTEBZ, SSTERF, XERBLA,
+     $                   CCOPY,
      $                   CGEMV, CLACPY, CLASCL, CSTEIN, CSTEQR,
      $                   CSWAP, CHETRD_HB2ST
 *     ..
@@ -424,16 +424,16 @@ SUBROUTINE CHBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB,
       IF( INFO.EQ.0 ) THEN
          IF( N.LE.1 ) THEN
             LWMIN = 1
-            WORK( 1 ) = LWMIN
+            WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
          ELSE
             IB    = ILAENV2STAGE( 2, 'CHETRD_HB2ST', JOBZ,
      $                            N, KD, -1, -1 )
-            LHTRD = ILAENV2STAGE( 3, 'CHETRD_HB2ST', JOBZ, 
+            LHTRD = ILAENV2STAGE( 3, 'CHETRD_HB2ST', JOBZ,
      $                            N, KD, IB, -1 )
-            LWTRD = ILAENV2STAGE( 4, 'CHETRD_HB2ST', JOBZ, 
+            LWTRD = ILAENV2STAGE( 4, 'CHETRD_HB2ST', JOBZ,
      $                            N, KD, IB, -1 )
             LWMIN = LHTRD + LWTRD
-            WORK( 1 )  = LWMIN
+            WORK( 1 )  = SROUNDUP_LWORK(LWMIN)
          ENDIF
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY )
@@ -503,9 +503,11 @@ SUBROUTINE CHBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL CLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL CLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL CLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL CLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
          IF( ABSTOL.GT.0 )
      $      ABSTLL = ABSTOL*SIGMA
@@ -637,7 +639,7 @@ SUBROUTINE CHBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB,
 *
 *     Set WORK(1) to optimal workspace size.
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
 *
       RETURN
 *
diff --git a/SRC/chbgst.f b/SRC/chbgst.f
index 53a25a27f8..9b12de6981 100644
--- a/SRC/chbgst.f
+++ b/SRC/chbgst.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHBGST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chbgst.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chbgst.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -157,11 +155,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hbgst
 *
 *  =====================================================================
-      SUBROUTINE CHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
+      SUBROUTINE CHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB,
+     $                   X,
      $                   LDX, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -197,7 +197,8 @@ SUBROUTINE CHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGERC, CGERU, CLACGV, CLAR2V, CLARGV, CLARTG,
+      EXTERNAL           CGERC, CGERU, CLACGV, CLAR2V, CLARGV,
+     $                   CLARTG,
      $                   CLARTV, CLASET, CROT, CSSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -441,7 +442,8 @@ SUBROUTINE CHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *           have been created outside the band
 *
             IF( NRT.GT.0 )
-     $         CALL CLARGV( NRT, AB( 1, J2T ), INCA, WORK( J2T-M ), KA1,
+     $         CALL CLARGV( NRT, AB( 1, J2T ), INCA, WORK( J2T-M ),
+     $                      KA1,
      $                      RWORK( J2T-M ), KA1 )
             IF( NR.GT.0 ) THEN
 *
@@ -670,7 +672,8 @@ SUBROUTINE CHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *
 *                 generate rotation to annihilate a(i-k+ka+1,i)
 *
-                  CALL CLARTG( AB( KA1-K, I ), RA1, RWORK( I-K+KA-M ),
+                  CALL CLARTG( AB( KA1-K, I ), RA1,
+     $                         RWORK( I-K+KA-M ),
      $                         WORK( I-K+KA-M ), RA )
 *
 *                 create nonzero element a(i-k+ka+1,i-k) outside the
@@ -706,7 +709,8 @@ SUBROUTINE CHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *           have been created outside the band
 *
             IF( NRT.GT.0 )
-     $         CALL CLARGV( NRT, AB( KA1, J2T-KA ), INCA, WORK( J2T-M ),
+     $         CALL CLARGV( NRT, AB( KA1, J2T-KA ), INCA,
+     $                      WORK( J2T-M ),
      $                      KA1, RWORK( J2T-M ), KA1 )
             IF( NR.GT.0 ) THEN
 *
@@ -721,7 +725,8 @@ SUBROUTINE CHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              apply rotations in 1st set from both sides to diagonal
 *              blocks
 *
-               CALL CLAR2V( NR, AB( 1, J2 ), AB( 1, J2+1 ), AB( 2, J2 ),
+               CALL CLAR2V( NR, AB( 1, J2 ), AB( 1, J2+1 ), AB( 2,
+     $                      J2 ),
      $                      INCA, RWORK( J2-M ), WORK( J2-M ), KA1 )
 *
                CALL CLACGV( NR, WORK( J2-M ), KA1 )
@@ -803,7 +808,8 @@ SUBROUTINE CHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              generate rotations in 2nd set to annihilate elements
 *              which have been created outside the band
 *
-               CALL CLARGV( NR, AB( KA1, J2-KA ), INCA, WORK( J2 ), KA1,
+               CALL CLARGV( NR, AB( KA1, J2-KA ), INCA, WORK( J2 ),
+     $                      KA1,
      $                      RWORK( J2 ), KA1 )
 *
 *              apply rotations in 2nd set from the left
@@ -817,7 +823,8 @@ SUBROUTINE CHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              apply rotations in 2nd set from both sides to diagonal
 *              blocks
 *
-               CALL CLAR2V( NR, AB( 1, J2 ), AB( 1, J2+1 ), AB( 2, J2 ),
+               CALL CLAR2V( NR, AB( 1, J2 ), AB( 1, J2+1 ), AB( 2,
+     $                      J2 ),
      $                      INCA, RWORK( J2 ), WORK( J2 ), KA1 )
 *
                CALL CLACGV( NR, WORK( J2 ), KA1 )
@@ -1021,7 +1028,8 @@ SUBROUTINE CHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *           have been created outside the band
 *
             IF( NRT.GT.0 )
-     $         CALL CLARGV( NRT, AB( 1, J1+KA ), INCA, WORK( J1 ), KA1,
+     $         CALL CLARGV( NRT, AB( 1, J1+KA ), INCA, WORK( J1 ),
+     $                      KA1,
      $                      RWORK( J1 ), KA1 )
             IF( NR.GT.0 ) THEN
 *
@@ -1122,7 +1130,8 @@ SUBROUTINE CHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              generate rotations in 2nd set to annihilate elements
 *              which have been created outside the band
 *
-               CALL CLARGV( NR, AB( 1, J1+KA ), INCA, WORK( M-KB+J1 ),
+               CALL CLARGV( NR, AB( 1, J1+KA ), INCA,
+     $                      WORK( M-KB+J1 ),
      $                      KA1, RWORK( M-KB+J1 ), KA1 )
 *
 *              apply rotations in 2nd set from the left
@@ -1232,7 +1241,8 @@ SUBROUTINE CHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *
                CALL CSSCAL( NX, ONE / BII, X( 1, I ), 1 )
                IF( KBT.GT.0 )
-     $            CALL CGERC( NX, KBT, -CONE, X( 1, I ), 1, BB( 2, I ),
+     $            CALL CGERC( NX, KBT, -CONE, X( 1, I ), 1, BB( 2,
+     $                        I ),
      $                        1, X( 1, I+1 ), LDX )
             END IF
 *
@@ -1291,14 +1301,16 @@ SUBROUTINE CHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *           have been created outside the band
 *
             IF( NRT.GT.0 )
-     $         CALL CLARGV( NRT, AB( KA1, J1 ), INCA, WORK( J1 ), KA1,
+     $         CALL CLARGV( NRT, AB( KA1, J1 ), INCA, WORK( J1 ),
+     $                      KA1,
      $                      RWORK( J1 ), KA1 )
             IF( NR.GT.0 ) THEN
 *
 *              apply rotations in 1st set from the right
 *
                DO 810 L = 1, KA - 1
-                  CALL CLARTV( NR, AB( L+1, J1 ), INCA, AB( L+2, J1-1 ),
+                  CALL CLARTV( NR, AB( L+1, J1 ), INCA, AB( L+2,
+     $                         J1-1 ),
      $                         INCA, RWORK( J1 ), WORK( J1 ), KA1 )
   810          CONTINUE
 *
@@ -1397,7 +1409,8 @@ SUBROUTINE CHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              apply rotations in 2nd set from the right
 *
                DO 890 L = 1, KA - 1
-                  CALL CLARTV( NR, AB( L+1, J1 ), INCA, AB( L+2, J1-1 ),
+                  CALL CLARTV( NR, AB( L+1, J1 ), INCA, AB( L+2,
+     $                         J1-1 ),
      $                         INCA, RWORK( M-KB+J1 ), WORK( M-KB+J1 ),
      $                         KA1 )
   890          CONTINUE
diff --git a/SRC/chbgv.f b/SRC/chbgv.f
index 130594a0f2..16c299efec 100644
--- a/SRC/chbgv.f
+++ b/SRC/chbgv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHBGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chbgv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chbgv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -175,11 +173,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHEReigen
+*> \ingroup hbgv
 *
 *  =====================================================================
-      SUBROUTINE CHBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W, Z,
+      SUBROUTINE CHBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
+     $                  Z,
      $                  LDZ, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -207,7 +207,8 @@ SUBROUTINE CHBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W, Z,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHBGST, CHBTRD, CPBSTF, CSTEQR, SSTERF, XERBLA
+      EXTERNAL           CHBGST, CHBTRD, CPBSTF, CSTEQR, SSTERF,
+     $                   XERBLA
 *     ..
 *     .. Executable Statements ..
 *
@@ -235,7 +236,7 @@ SUBROUTINE CHBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W, Z,
          INFO = -12
       END IF
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'CHBGV ', -INFO )
+         CALL XERBLA( 'CHBGV', -INFO )
          RETURN
       END IF
 *
diff --git a/SRC/chbgvd.f b/SRC/chbgvd.f
index c4ad20753f..69051cbfc2 100644
--- a/SRC/chbgvd.f
+++ b/SRC/chbgvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHBGVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chbgvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chbgvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -46,12 +44,6 @@
 *> and banded, and B is also positive definite.  If eigenvectors are
 *> desired, it uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -238,7 +230,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHEReigen
+*> \ingroup hbgvd
 *
 *> \par Contributors:
 *  ==================
@@ -246,9 +238,11 @@
 *>     Mark Fahey, Department of Mathematics, Univ. of Kentucky, USA
 *
 *  =====================================================================
-      SUBROUTINE CHBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
+      SUBROUTINE CHBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB,
+     $                   W,
      $                   Z, LDZ, WORK, LWORK, RWORK, LRWORK, IWORK,
      $                   LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -281,10 +275,12 @@ SUBROUTINE CHBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SSTERF, XERBLA, CGEMM, CHBGST, CHBTRD, CLACPY,
+      EXTERNAL           SSTERF, XERBLA, CGEMM, CHBGST, CHBTRD,
+     $                   CLACPY,
      $                   CPBSTF, CSTEDC
 *     ..
 *     .. Executable Statements ..
@@ -328,8 +324,8 @@ SUBROUTINE CHBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         WORK( 1 ) = LWMIN
-         RWORK( 1 ) = LRWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
+         RWORK( 1 ) = REAL( LRWMIN )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -386,7 +382,8 @@ SUBROUTINE CHBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
       IF( .NOT.WANTZ ) THEN
          CALL SSTERF( N, W, RWORK( INDE ), INFO )
       ELSE
-         CALL CSTEDC( 'I', N, W, RWORK( INDE ), WORK, N, WORK( INDWK2 ),
+         CALL CSTEDC( 'I', N, W, RWORK( INDE ), WORK, N,
+     $                WORK( INDWK2 ),
      $                LLWK2, RWORK( INDWRK ), LLRWK, IWORK, LIWORK,
      $                INFO )
          CALL CGEMM( 'N', 'N', N, N, N, CONE, Z, LDZ, WORK, N, CZERO,
@@ -394,8 +391,8 @@ SUBROUTINE CHBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
          CALL CLACPY( 'A', N, N, WORK( INDWK2 ), N, Z, LDZ )
       END IF
 *
-      WORK( 1 ) = LWMIN
-      RWORK( 1 ) = LRWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
+      RWORK( 1 ) = REAL( LRWMIN )
       IWORK( 1 ) = LIWMIN
       RETURN
 *
diff --git a/SRC/chbgvx.f b/SRC/chbgvx.f
index 57cf51a551..581d42900d 100644
--- a/SRC/chbgvx.f
+++ b/SRC/chbgvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHBGVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chbgvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chbgvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -286,7 +284,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHEReigen
+*> \ingroup hbgvx
 *
 *> \par Contributors:
 *  ==================
@@ -297,6 +295,7 @@
       SUBROUTINE CHBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
      $                   LDBB, Q, LDQ, VL, VU, IL, IU, ABSTOL, M, W, Z,
      $                   LDZ, WORK, RWORK, IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -327,7 +326,7 @@ SUBROUTINE CHBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
 *     .. Local Scalars ..
       LOGICAL            ALLEIG, INDEIG, TEST, UPPER, VALEIG, WANTZ
       CHARACTER          ORDER, VECT
-      INTEGER            I, IINFO, INDD, INDE, INDEE, INDIBL, INDISP,
+      INTEGER            I, IINFO, INDD, INDE, INDEE, INDISP,
      $                   INDIWK, INDRWK, INDWRK, ITMP1, J, JJ, NSPLIT
       REAL               TMP1
 *     ..
@@ -336,7 +335,8 @@ SUBROUTINE CHBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CGEMV, CHBGST, CHBTRD, CLACPY, CPBSTF,
+      EXTERNAL           CCOPY, CGEMV, CHBGST, CHBTRD, CLACPY,
+     $                   CPBSTF,
      $                   CSTEIN, CSTEQR, CSWAP, SCOPY, SSTEBZ, SSTERF,
      $                   XERBLA
 *     ..
@@ -470,17 +470,16 @@ SUBROUTINE CHBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
       ELSE
          ORDER = 'E'
       END IF
-      INDIBL = 1
-      INDISP = INDIBL + N
+      INDISP = 1 + N
       INDIWK = INDISP + N
       CALL SSTEBZ( RANGE, ORDER, N, VL, VU, IL, IU, ABSTOL,
      $             RWORK( INDD ), RWORK( INDE ), M, NSPLIT, W,
-     $             IWORK( INDIBL ), IWORK( INDISP ), RWORK( INDRWK ),
+     $             IWORK( 1 ), IWORK( INDISP ), RWORK( INDRWK ),
      $             IWORK( INDIWK ), INFO )
 *
       IF( WANTZ ) THEN
          CALL CSTEIN( N, RWORK( INDD ), RWORK( INDE ), M, W,
-     $                IWORK( INDIBL ), IWORK( INDISP ), Z, LDZ,
+     $                IWORK( 1 ), IWORK( INDISP ), Z, LDZ,
      $                RWORK( INDRWK ), IWORK( INDIWK ), IFAIL, INFO )
 *
 *        Apply unitary matrix used in reduction to tridiagonal
@@ -510,11 +509,11 @@ SUBROUTINE CHBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
    40       CONTINUE
 *
             IF( I.NE.0 ) THEN
-               ITMP1 = IWORK( INDIBL+I-1 )
+               ITMP1 = IWORK( 1 + I-1 )
                W( I ) = W( J )
-               IWORK( INDIBL+I-1 ) = IWORK( INDIBL+J-1 )
+               IWORK( 1 + I-1 ) = IWORK( 1 + J-1 )
                W( J ) = TMP1
-               IWORK( INDIBL+J-1 ) = ITMP1
+               IWORK( 1 + J-1 ) = ITMP1
                CALL CSWAP( N, Z( 1, I ), 1, Z( 1, J ), 1 )
                IF( INFO.NE.0 ) THEN
                   ITMP1 = IFAIL( I )
diff --git a/SRC/chbtrd.f b/SRC/chbtrd.f
index d05ce42f77..322dcbf896 100644
--- a/SRC/chbtrd.f
+++ b/SRC/chbtrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHBTRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chbtrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chbtrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -147,7 +145,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hbtrd
 *
 *> \par Further Details:
 *  =====================
@@ -160,6 +158,7 @@
 *  =====================================================================
       SUBROUTINE CHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -192,7 +191,8 @@ SUBROUTINE CHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
       COMPLEX            T, TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLACGV, CLAR2V, CLARGV, CLARTG, CLARTV, CLASET,
+      EXTERNAL           CLACGV, CLAR2V, CLARGV, CLARTG, CLARTV,
+     $                   CLASET,
      $                   CROT, CSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -276,7 +276,8 @@ SUBROUTINE CHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
 *                    generate plane rotations to annihilate nonzero
 *                    elements which have been created outside the band
 *
-                     CALL CLARGV( NR, AB( 1, J1-1 ), INCA, WORK( J1 ),
+                     CALL CLARGV( NR, AB( 1, J1-1 ), INCA,
+     $                            WORK( J1 ),
      $                            KD1, D( J1 ), KD1 )
 *
 *                    apply rotations from the right
@@ -348,7 +349,8 @@ SUBROUTINE CHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                               NRT = NR
                            END IF
                            IF( NRT.GT.0 )
-     $                        CALL CLARTV( NRT, AB( KD-L, J1+L ), INCA,
+     $                        CALL CLARTV( NRT, AB( KD-L, J1+L ),
+     $                                     INCA,
      $                                     AB( KD-L+1, J1+L ), INCA,
      $                                     D( J1 ), WORK( J1 ), KD1 )
    30                   CONTINUE
@@ -356,7 +358,8 @@ SUBROUTINE CHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                         J1END = J1 + KD1*( NR-2 )
                         IF( J1END.GE.J1 ) THEN
                            DO 40 JIN = J1, J1END, KD1
-                              CALL CROT( KD-1, AB( KD-1, JIN+1 ), INCX,
+                              CALL CROT( KD-1, AB( KD-1, JIN+1 ),
+     $                                   INCX,
      $                                   AB( KD, JIN+1 ), INCX,
      $                                   D( JIN ), WORK( JIN ) )
    40                      CONTINUE
@@ -391,13 +394,15 @@ SUBROUTINE CHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                            IQB = MAX( 1, J-IBL )
                            NQ = 1 + IQAEND - IQB
                            IQAEND = MIN( IQAEND+KD, IQEND )
-                           CALL CROT( NQ, Q( IQB, J-1 ), 1, Q( IQB, J ),
+                           CALL CROT( NQ, Q( IQB, J-1 ), 1, Q( IQB,
+     $                                J ),
      $                                1, D( J ), CONJG( WORK( J ) ) )
    50                   CONTINUE
                      ELSE
 *
                         DO 60 J = J1, J2, KD1
-                           CALL CROT( N, Q( 1, J-1 ), 1, Q( 1, J ), 1,
+                           CALL CROT( N, Q( 1, J-1 ), 1, Q( 1, J ),
+     $                                1,
      $                                D( J ), CONJG( WORK( J ) ) )
    60                   CONTINUE
                      END IF
@@ -495,7 +500,8 @@ SUBROUTINE CHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
 *
                      IF( NR.GT.2*KD-1 ) THEN
                         DO 130 L = 1, KD - 1
-                           CALL CLARTV( NR, AB( KD1-L, J1-KD1+L ), INCA,
+                           CALL CLARTV( NR, AB( KD1-L, J1-KD1+L ),
+     $                                  INCA,
      $                                  AB( KD1-L+1, J1-KD1+L ), INCA,
      $                                  D( J1 ), WORK( J1 ), KD1 )
   130                   CONTINUE
@@ -554,7 +560,8 @@ SUBROUTINE CHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                               NRT = NR
                            END IF
                            IF( NRT.GT.0 )
-     $                        CALL CLARTV( NRT, AB( L+2, J1-1 ), INCA,
+     $                        CALL CLARTV( NRT, AB( L+2, J1-1 ),
+     $                                     INCA,
      $                                     AB( L+1, J1 ), INCA, D( J1 ),
      $                                     WORK( J1 ), KD1 )
   150                   CONTINUE
@@ -599,13 +606,15 @@ SUBROUTINE CHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                            IQB = MAX( 1, J-IBL )
                            NQ = 1 + IQAEND - IQB
                            IQAEND = MIN( IQAEND+KD, IQEND )
-                           CALL CROT( NQ, Q( IQB, J-1 ), 1, Q( IQB, J ),
+                           CALL CROT( NQ, Q( IQB, J-1 ), 1, Q( IQB,
+     $                                J ),
      $                                1, D( J ), WORK( J ) )
   170                   CONTINUE
                      ELSE
 *
                         DO 180 J = J1, J2, KD1
-                           CALL CROT( N, Q( 1, J-1 ), 1, Q( 1, J ), 1,
+                           CALL CROT( N, Q( 1, J-1 ), 1, Q( 1, J ),
+     $                                1,
      $                                D( J ), WORK( J ) )
   180                   CONTINUE
                      END IF
diff --git a/SRC/checon.f b/SRC/checon.f
index 94c81bd42b..1a3e88e1b3 100644
--- a/SRC/checon.f
+++ b/SRC/checon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHECON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/checon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/checon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,11 +115,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hecon
 *
 *  =====================================================================
       SUBROUTINE CHECON( UPLO, N, A, LDA, IPIV, ANORM, RCOND, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/checon_3.f b/SRC/checon_3.f
index 2bbf879349..5da7494dae 100644
--- a/SRC/checon_3.f
+++ b/SRC/checon_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHECON_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/checon_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/checon_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,7 +142,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hecon_3
 *
 *> \par Contributors:
 *  ==================
@@ -163,6 +161,7 @@
 *  =====================================================================
       SUBROUTINE CHECON_3( UPLO, N, A, LDA, E, IPIV, ANORM, RCOND,
      $                     WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/checon_rook.f b/SRC/checon_rook.f
index 5c203d8d80..b07549a42a 100644
--- a/SRC/checon_rook.f
+++ b/SRC/checon_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHECON_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/checon_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/checon_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,7 +115,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hecon_rook
 *
 *> \par Contributors:
 *  ==================
@@ -134,8 +132,10 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE CHECON_ROOK( UPLO, N, A, LDA, IPIV, ANORM, RCOND, WORK,
+      SUBROUTINE CHECON_ROOK( UPLO, N, A, LDA, IPIV, ANORM, RCOND,
+     $                        WORK,
      $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cheequb.f b/SRC/cheequb.f
index 3ea7a1627a..d8388b4f60 100644
--- a/SRC/cheequb.f
+++ b/SRC/cheequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHEEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cheequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cheequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,7 +115,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup heequb
 *
 *> \par References:
 *  ================
@@ -128,7 +126,9 @@
 *>  Tech report version: http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.3.1679
 *>
 *  =====================================================================
-      SUBROUTINE CHEEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
+      SUBROUTINE CHEEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK,
+     $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -181,7 +181,8 @@ SUBROUTINE CHEEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF ( .NOT. ( LSAME( UPLO, 'U' ) .OR. LSAME( UPLO, 'L' ) ) ) THEN
+      IF ( .NOT. ( LSAME( UPLO, 'U' ) .OR.
+     $     LSAME( UPLO, 'L' ) ) ) THEN
          INFO = -1
       ELSE IF ( N .LT. 0 ) THEN
          INFO = -2
@@ -233,7 +234,7 @@ SUBROUTINE CHEEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
          S( J ) = 1.0E0 / S( J )
       END DO
 
-      TOL = ONE / SQRT( 2.0E0 * N )
+      TOL = ONE / SQRT( 2.0E0 * REAL( N ) )
 
       DO ITER = 1, MAX_ITER
          SCALE = 0.0E0
@@ -265,23 +266,23 @@ SUBROUTINE CHEEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
          DO I = 1, N
             AVG = AVG + REAL( S( I )*WORK( I ) )
          END DO
-         AVG = AVG / N
+         AVG = AVG / REAL( N )
 
          STD = 0.0E0
          DO I = N+1, 2*N
             WORK( I ) = S( I-N ) * WORK( I-N ) - AVG
          END DO
          CALL CLASSQ( N, WORK( N+1 ), 1, SCALE, SUMSQ )
-         STD = SCALE * SQRT( SUMSQ / N )
+         STD = SCALE * SQRT( SUMSQ / REAL( N ) )
 
          IF ( STD .LT. TOL * AVG ) GOTO 999
 
          DO I = 1, N
             T = CABS1( A( I, I ) )
             SI = S( I )
-            C2 = ( N-1 ) * T
-            C1 = REAL( ( N-2 ) * ( WORK( I ) - T*SI ) )
-            C0 = REAL( -(T*SI)*SI + 2*WORK( I )*SI - N*AVG )
+            C2 = REAL( N-1 ) * T
+            C1 = REAL( N-2 ) * ( REAL( WORK( I ) ) - T*SI )
+            C0 = REAL( -(T*SI)*SI + 2*WORK( I )*SI - REAL( N )*AVG )
             D = C1*C1 - 4*C0*C2
 
             IF ( D .LE. 0 ) THEN
@@ -316,7 +317,7 @@ SUBROUTINE CHEEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
                END DO
             END IF
 
-            AVG = AVG + REAL( ( U + WORK( I ) ) * D / N )
+            AVG = AVG + ( U + REAL( WORK( I ) ) ) * D / REAL( N )
             S( I ) = SI
          END DO
       END DO
diff --git a/SRC/cheev.f b/SRC/cheev.f
index fb8e451df8..19779903e0 100644
--- a/SRC/cheev.f
+++ b/SRC/cheev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHEEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cheev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cheev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,11 +130,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEeigen
+*> \ingroup heev
 *
 *  =====================================================================
       SUBROUTINE CHEEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -169,11 +168,13 @@ SUBROUTINE CHEEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               CLANHE, SLAMCH
-      EXTERNAL           ILAENV, LSAME, CLANHE, SLAMCH
+      REAL               CLANHE, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, CLANHE,
+     $                   SLAMCH, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHETRD, CLASCL, CSTEQR, CUNGTR, SSCAL, SSTERF,
+      EXTERNAL           CHETRD, CLASCL, CSTEQR, CUNGTR, SSCAL,
+     $                   SSTERF,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -201,7 +202,7 @@ SUBROUTINE CHEEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
       IF( INFO.EQ.0 ) THEN
          NB = ILAENV( 1, 'CHETRD', UPLO, N, -1, -1, -1 )
          LWKOPT = MAX( 1, ( NB+1 )*N )
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.MAX( 1, 2*N-1 ) .AND. .NOT.LQUERY )
      $      INFO = -8
@@ -266,7 +267,8 @@ SUBROUTINE CHEEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
       IF( .NOT.WANTZ ) THEN
          CALL SSTERF( N, W, RWORK( INDE ), INFO )
       ELSE
-         CALL CUNGTR( UPLO, N, A, LDA, WORK( INDTAU ), WORK( INDWRK ),
+         CALL CUNGTR( UPLO, N, A, LDA, WORK( INDTAU ),
+     $                WORK( INDWRK ),
      $                LLWORK, IINFO )
          INDWRK = INDE + N
          CALL CSTEQR( JOBZ, N, W, RWORK( INDE ), A, LDA,
@@ -286,7 +288,7 @@ SUBROUTINE CHEEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
 *
 *     Set WORK(1) to optimal complex workspace size.
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/cheev_2stage.f b/SRC/cheev_2stage.f
index fb7989d9f8..3fa0520bb6 100644
--- a/SRC/cheev_2stage.f
+++ b/SRC/cheev_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHEEV_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cheev_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cheev_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,12 +104,12 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + N
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + N
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -149,7 +147,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEeigen
+*> \ingroup heev_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -167,7 +165,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -175,11 +173,11 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
@@ -220,11 +218,13 @@ SUBROUTINE CHEEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV2STAGE
-      REAL               SLAMCH, CLANHE
-      EXTERNAL           LSAME, SLAMCH, CLANHE, ILAENV2STAGE
+      REAL               SLAMCH, CLANHE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, CLANHE, ILAENV2STAGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SSCAL, SSTERF, XERBLA, CLASCL, CSTEQR,
+      EXTERNAL           SSCAL, SSTERF, XERBLA, CLASCL,
+     $                   CSTEQR,
      $                   CUNGTR, CHETRD_2STAGE
 *     ..
 *     .. Intrinsic Functions ..
@@ -250,12 +250,16 @@ SUBROUTINE CHEEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         KD    = ILAENV2STAGE( 1, 'CHETRD_2STAGE', JOBZ, N, -1, -1, -1 )
-         IB    = ILAENV2STAGE( 2, 'CHETRD_2STAGE', JOBZ, N, KD, -1, -1 )
-         LHTRD = ILAENV2STAGE( 3, 'CHETRD_2STAGE', JOBZ, N, KD, IB, -1 )
-         LWTRD = ILAENV2STAGE( 4, 'CHETRD_2STAGE', JOBZ, N, KD, IB, -1 )
+         KD    = ILAENV2STAGE( 1, 'CHETRD_2STAGE', JOBZ, N, -1, -1,
+     $                         -1 )
+         IB    = ILAENV2STAGE( 2, 'CHETRD_2STAGE', JOBZ, N, KD, -1,
+     $                         -1 )
+         LHTRD = ILAENV2STAGE( 3, 'CHETRD_2STAGE', JOBZ, N, KD, IB,
+     $                         -1 )
+         LWTRD = ILAENV2STAGE( 4, 'CHETRD_2STAGE', JOBZ, N, KD, IB,
+     $                         -1 )
          LWMIN = N + LHTRD + LWTRD
-         WORK( 1 )  = LWMIN
+         WORK( 1 )  = SROUNDUP_LWORK(LWMIN)
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY )
      $      INFO = -8
@@ -314,7 +318,7 @@ SUBROUTINE CHEEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       LLWORK  = LWORK - INDWRK + 1
 *
       CALL CHETRD_2STAGE( JOBZ, UPLO, N, A, LDA, W, RWORK( INDE ),
-     $                    WORK( INDTAU ), WORK( INDHOUS ), LHTRD, 
+     $                    WORK( INDTAU ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWRK ), LLWORK, IINFO )
 *
 *     For eigenvalues only, call SSTERF.  For eigenvectors, first call
@@ -323,7 +327,8 @@ SUBROUTINE CHEEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       IF( .NOT.WANTZ ) THEN
          CALL SSTERF( N, W, RWORK( INDE ), INFO )
       ELSE
-         CALL CUNGTR( UPLO, N, A, LDA, WORK( INDTAU ), WORK( INDWRK ),
+         CALL CUNGTR( UPLO, N, A, LDA, WORK( INDTAU ),
+     $                WORK( INDWRK ),
      $                LLWORK, IINFO )
          INDWRK = INDE + N
          CALL CSTEQR( JOBZ, N, W, RWORK( INDE ), A, LDA,
@@ -343,7 +348,7 @@ SUBROUTINE CHEEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
 *
 *     Set WORK(1) to optimal complex workspace size.
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
 *
       RETURN
 *
diff --git a/SRC/cheevd.f b/SRC/cheevd.f
index 9a4a1efb7d..e511267783 100644
--- a/SRC/cheevd.f
+++ b/SRC/cheevd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHEEVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cheevd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cheevd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -41,12 +39,6 @@
 *> complex Hermitian matrix A.  If eigenvectors are desired, it uses a
 *> divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -122,8 +114,7 @@
 *>
 *> \param[out] RWORK
 *> \verbatim
-*>          RWORK is REAL array,
-*>                                         dimension (LRWORK)
+*>          RWORK is REAL array, dimension (MAX(1,LRWORK))
 *>          On exit, if INFO = 0, RWORK(1) returns the optimal LRWORK.
 *> \endverbatim
 *>
@@ -186,7 +177,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEeigen
+*> \ingroup heevd
 *
 *> \par Further Details:
 *  =====================
@@ -200,8 +191,10 @@
 *> at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE CHEEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
+      SUBROUTINE CHEEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
+     $                   RWORK,
      $                   LRWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -236,11 +229,13 @@ SUBROUTINE CHEEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               CLANHE, SLAMCH
-      EXTERNAL           ILAENV, LSAME, CLANHE, SLAMCH
+      REAL               CLANHE, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, CLANHE, SLAMCH,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHETRD, CLACPY, CLASCL, CSTEDC, CUNMTR, SSCAL,
+      EXTERNAL           CHETRD, CLACPY, CLASCL, CSTEDC, CUNMTR,
+     $                   SSCAL,
      $                   SSTERF, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -284,12 +279,13 @@ SUBROUTINE CHEEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
                LIWMIN = 1
             END IF
             LOPT = MAX( LWMIN, N +
-     $                  ILAENV( 1, 'CHETRD', UPLO, N, -1, -1, -1 ) )
+     $                  N*ILAENV( 1, 'CHETRD', UPLO, N, -1, -1,
+     $                            -1 ) )
             LROPT = LRWMIN
             LIOPT = LIWMIN
          END IF
-         WORK( 1 ) = LOPT
-         RWORK( 1 ) = LROPT
+         WORK( 1 ) = SROUNDUP_LWORK( LOPT )
+         RWORK( 1 ) = SROUNDUP_LWORK( LROPT )
          IWORK( 1 ) = LIOPT
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -384,8 +380,8 @@ SUBROUTINE CHEEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
          CALL SSCAL( IMAX, ONE / SIGMA, W, 1 )
       END IF
 *
-      WORK( 1 ) = LOPT
-      RWORK( 1 ) = LROPT
+      WORK( 1 ) = SROUNDUP_LWORK( LOPT )
+      RWORK( 1 ) = SROUNDUP_LWORK( LROPT )
       IWORK( 1 ) = LIOPT
 *
       RETURN
diff --git a/SRC/cheevd_2stage.f b/SRC/cheevd_2stage.f
index 830e13d301..986e40d471 100644
--- a/SRC/cheevd_2stage.f
+++ b/SRC/cheevd_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHEEVD_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cheevd_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cheevd_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -46,12 +44,6 @@
 *> the reduction to tridiagonal.  If eigenvectors are desired, it uses a
 *> divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -119,8 +111,8 @@
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + N+1
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + N+1
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -202,7 +194,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEeigen
+*> \ingroup heevd_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -231,7 +223,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -239,16 +231,17 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE CHEEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
+      SUBROUTINE CHEEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK,
+     $                          LWORK,
      $                   RWORK, LRWORK, IWORK, LIWORK, INFO )
 *
       IMPLICIT NONE
@@ -293,7 +286,8 @@ SUBROUTINE CHEEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       EXTERNAL           LSAME, SLAMCH, CLANHE, ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SSCAL, SSTERF, XERBLA, CLACPY, CLASCL,
+      EXTERNAL           SSCAL, SSTERF, XERBLA, CLACPY,
+     $                   CLASCL,
      $                   CSTEDC, CUNMTR, CHETRD_2STAGE
 *     ..
 *     .. Intrinsic Functions ..
@@ -342,8 +336,8 @@ SUBROUTINE CHEEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
                LIWMIN = 1
             END IF
          END IF
-         WORK( 1 )  = LWMIN
-         RWORK( 1 ) = LRWMIN
+         WORK( 1 )  = CMPLX( LWMIN )
+         RWORK( 1 ) = REAL( LRWMIN )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -410,7 +404,7 @@ SUBROUTINE CHEEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       LLWRK2  = LWORK - INDWK2 + 1
 *
       CALL CHETRD_2STAGE( JOBZ, UPLO, N, A, LDA, W, RWORK( INDE ),
-     $                    WORK( INDTAU ), WORK( INDHOUS ), LHTRD, 
+     $                    WORK( INDTAU ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWRK ), LLWORK, IINFO )
 *
 *     For eigenvalues only, call SSTERF.  For eigenvectors, first call
@@ -441,8 +435,8 @@ SUBROUTINE CHEEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
          CALL SSCAL( IMAX, ONE / SIGMA, W, 1 )
       END IF
 *
-      WORK( 1 )  = LWMIN
-      RWORK( 1 ) = LRWMIN
+      WORK( 1 )  = CMPLX( LWMIN )
+      RWORK( 1 ) = REAL( LRWMIN )
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/cheevr.f b/SRC/cheevr.f
index b8854b1829..bab9353f8a 100644
--- a/SRC/cheevr.f
+++ b/SRC/cheevr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHEEVR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cheevr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cheevr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -41,9 +39,16 @@
 *> \verbatim
 *>
 *> CHEEVR computes selected eigenvalues and, optionally, eigenvectors
-*> of a complex Hermitian matrix A.  Eigenvalues and eigenvectors can
-*> be selected by specifying either a range of values or a range of
-*> indices for the desired eigenvalues.
+*> of a complex Hermitian matrix A. Eigenvalues and eigenvectors can be
+*> selected by specifying either a range of values or a range of indices
+*> for the desired eigenvalues. Invocations with different choices for
+*> these parameters may result in the computation of slightly different
+*> eigenvalues and/or eigenvectors for the same matrix. The reason for
+*> this behavior is that there exists a variety of algorithms (each
+*> performing best for a particular set of options) with CHEEVR
+*> attempting to select the best based on the various parameters. In all
+*> cases, the computed values are accurate within the limits of finite
+*> precision arithmetic.
 *>
 *> CHEEVR first reduces the matrix A to tridiagonal form T with a call
 *> to CHETRD.  Then, whenever possible, CHEEVR calls CSTEMR to compute
@@ -107,6 +112,9 @@
 *>          JOBZ is CHARACTER*1
 *>          = 'N':  Compute eigenvalues only;
 *>          = 'V':  Compute eigenvalues and eigenvectors.
+*>
+*>          This parameter influences the choice of the algorithm and
+*>          may alter the computed values.
 *> \endverbatim
 *>
 *> \param[in] RANGE
@@ -118,6 +126,9 @@
 *>          = 'I': the IL-th through IU-th eigenvalues will be found.
 *>          For RANGE = 'V' or 'I' and IU - IL < N - 1, SSTEBZ and
 *>          CSTEIN are called
+*>
+*>          This parameter influences the choice of the algorithm and
+*>          may alter the computed values.
 *> \endverbatim
 *>
 *> \param[in] UPLO
@@ -242,6 +253,7 @@
 *>          Note: the user must ensure that at least max(1,M) columns are
 *>          supplied in the array Z; if RANGE = 'V', the exact value of M
 *>          is not known in advance and an upper bound must be used.
+*>          Supplying N columns is always safe.
 *> \endverbatim
 *>
 *> \param[in] LDZ
@@ -272,7 +284,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of the array WORK.  LWORK >= max(1,2*N).
+*>          The length of the array WORK.
+*>          If N <= 1, LWORK >= 1, else LWORK >= 2*N.
 *>          For optimal efficiency, LWORK >= (NB+1)*N,
 *>          where NB is the max of the blocksize for CHETRD and for
 *>          CUNMTR as returned by ILAENV.
@@ -294,7 +307,8 @@
 *> \param[in] LRWORK
 *> \verbatim
 *>          LRWORK is INTEGER
-*>          The length of the array RWORK.  LRWORK >= max(1,24*N).
+*>          The length of the array RWORK.
+*>          If N <= 1, LRWORK >= 1, else LRWORK >= 24*N.
 *>
 *>          If LRWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal sizes of the WORK, RWORK
@@ -313,7 +327,8 @@
 *> \param[in] LIWORK
 *> \verbatim
 *>          LIWORK is INTEGER
-*>          The dimension of the array IWORK.  LIWORK >= max(1,10*N).
+*>          The dimension of the array IWORK.
+*>          If N <= 1, LIWORK >= 1, else LIWORK >= 10*N.
 *>
 *>          If LIWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal sizes of the WORK, RWORK
@@ -338,7 +353,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEeigen
+*> \ingroup heevr
 *
 *> \par Contributors:
 *  ==================
@@ -351,9 +366,11 @@
 *>       California at Berkeley, USA \n
 *>
 *  =====================================================================
-      SUBROUTINE CHEEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
+      SUBROUTINE CHEEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL,
+     $                   IU,
      $                   ABSTOL, M, W, Z, LDZ, ISUPPZ, WORK, LWORK,
      $                   RWORK, LRWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -392,11 +409,13 @@ SUBROUTINE CHEEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               CLANSY, SLAMCH
-      EXTERNAL           LSAME, ILAENV, CLANSY, SLAMCH
+      REAL               CLANSY, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, CLANSY, SLAMCH,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHETRD, CSSCAL, CSTEMR, CSTEIN, CSWAP, CUNMTR,
+      EXTERNAL           CHETRD, CSSCAL, CSTEMR, CSTEIN, CSWAP,
+     $                   CUNMTR,
      $                   SCOPY, SSCAL, SSTEBZ, SSTERF, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -417,9 +436,15 @@ SUBROUTINE CHEEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
       LQUERY = ( ( LWORK.EQ.-1 ) .OR. ( LRWORK.EQ.-1 ) .OR.
      $         ( LIWORK.EQ.-1 ) )
 *
-      LRWMIN = MAX( 1, 24*N )
-      LIWMIN = MAX( 1, 10*N )
-      LWMIN = MAX( 1, 2*N )
+      IF( N.LE.1 ) THEN
+         LWMIN  = 1
+         LRWMIN = 1
+         LIWMIN = 1
+      ELSE
+         LWMIN  = 2*N
+         LRWMIN = 24*N
+         LIWMIN = 10*N
+      END IF
 *
       INFO = 0
       IF( .NOT.( WANTZ .OR. LSAME( JOBZ, 'N' ) ) ) THEN
@@ -454,8 +479,8 @@ SUBROUTINE CHEEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
          NB = ILAENV( 1, 'CHETRD', UPLO, N, -1, -1, -1 )
          NB = MAX( NB, ILAENV( 1, 'CUNMTR', UPLO, N, -1, -1, -1 ) )
          LWKOPT = MAX( ( NB+1 )*N, LWMIN )
-         WORK( 1 ) = LWKOPT
-         RWORK( 1 ) = LRWMIN
+         WORK( 1 )  = SROUNDUP_LWORK( LWKOPT )
+         RWORK( 1 ) = SROUNDUP_LWORK( LRWMIN )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -483,7 +508,7 @@ SUBROUTINE CHEEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
       END IF
 *
       IF( N.EQ.1 ) THEN
-         WORK( 1 ) = 2
+         WORK( 1 ) = 1
          IF( ALLEIG .OR. INDEIG ) THEN
             M = 1
             W( 1 ) = REAL( A( 1, 1 ) )
@@ -611,7 +636,7 @@ SUBROUTINE CHEEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
             CALL SCOPY( N-1, RWORK( INDRE ), 1, RWORK( INDREE ), 1 )
             CALL SCOPY( N, RWORK( INDRD ), 1, RWORK( INDRDD ), 1 )
 *
-            IF (ABSTOL .LE. TWO*N*EPS) THEN
+            IF (ABSTOL .LE. TWO*REAL( N )*EPS) THEN
                TRYRAC = .TRUE.
             ELSE
                TRYRAC = .FALSE.
@@ -667,7 +692,8 @@ SUBROUTINE CHEEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *
          INDWKN = INDWK
          LLWRKN = LWORK - INDWKN + 1
-         CALL CUNMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ), Z,
+         CALL CUNMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ),
+     $                Z,
      $                LDZ, WORK( INDWKN ), LLWRKN, IINFO )
       END IF
 *
@@ -710,8 +736,8 @@ SUBROUTINE CHEEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *
 *     Set WORK(1) to optimal workspace size.
 *
-      WORK( 1 ) = LWKOPT
-      RWORK( 1 ) = LRWMIN
+      WORK( 1 )  = SROUNDUP_LWORK( LWKOPT )
+      RWORK( 1 ) = SROUNDUP_LWORK( LRWMIN )
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/cheevr_2stage.f b/SRC/cheevr_2stage.f
index 0332a09bcd..5bd16f449c 100644
--- a/SRC/cheevr_2stage.f
+++ b/SRC/cheevr_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHEEVR_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cheevr_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cheevr_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -265,7 +263,7 @@
 *>          indicating the nonzero elements in Z. The i-th eigenvector
 *>          is nonzero only in elements ISUPPZ( 2*i-1 ) through
 *>          ISUPPZ( 2*i ). This is an output of CSTEMR (tridiagonal
-*>          matrix). The support of the eigenvectors of A is typically 
+*>          matrix). The support of the eigenvectors of A is typically
 *>          1:N because of the unitary transformations applied by CUNMTR.
 *>          Implemented only for RANGE = 'A' or 'I' and IU - IL = N - 1
 *> \endverbatim
@@ -279,12 +277,13 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  
+*>          The dimension of the array WORK.
+*>          If N <= 1,               LWORK must be at least 1.
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, 26*N, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + N
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + N
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -310,7 +309,8 @@
 *> \param[in] LRWORK
 *> \verbatim
 *>          LRWORK is INTEGER
-*>          The length of the array RWORK.  LRWORK >= max(1,24*N).
+*>          The length of the array RWORK.
+*>          If N <= 1, LRWORK >= 1, else LRWORK >= 24*N.
 *>
 *>          If LRWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal sizes of the WORK, RWORK
@@ -329,7 +329,8 @@
 *> \param[in] LIWORK
 *> \verbatim
 *>          LIWORK is INTEGER
-*>          The dimension of the array IWORK.  LIWORK >= max(1,10*N).
+*>          The dimension of the array IWORK.
+*>          If N <= 1, LIWORK >= 1, else LIWORK >= 10*N.
 *>
 *>          If LIWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal sizes of the WORK, RWORK
@@ -354,7 +355,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEeigen
+*> \ingroup heevr_2stage
 *
 *> \par Contributors:
 *  ==================
@@ -382,7 +383,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -390,11 +391,11 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
@@ -443,11 +444,13 @@ SUBROUTINE CHEEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV, ILAENV2STAGE
-      REAL               SLAMCH, CLANSY
-      EXTERNAL           LSAME, SLAMCH, CLANSY, ILAENV, ILAENV2STAGE
+      REAL               SLAMCH, CLANSY, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, CLANSY, ILAENV, ILAENV2STAGE,
+     $                   SROUNDUP_LWORK 
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SSCAL, SSTEBZ, SSTERF, XERBLA, CSSCAL,
+      EXTERNAL           SCOPY, SSCAL, SSTEBZ, SSTERF, XERBLA,
+     $                   CSSCAL,
      $                   CHETRD_2STAGE, CSTEMR, CSTEIN, CSWAP, CUNMTR
 *     ..
 *     .. Intrinsic Functions ..
@@ -468,13 +471,24 @@ SUBROUTINE CHEEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       LQUERY = ( ( LWORK.EQ.-1 ) .OR. ( LRWORK.EQ.-1 ) .OR.
      $         ( LIWORK.EQ.-1 ) )
 *
-      KD     = ILAENV2STAGE( 1, 'CHETRD_2STAGE', JOBZ, N, -1, -1, -1 )
-      IB     = ILAENV2STAGE( 2, 'CHETRD_2STAGE', JOBZ, N, KD, -1, -1 )
-      LHTRD  = ILAENV2STAGE( 3, 'CHETRD_2STAGE', JOBZ, N, KD, IB, -1 )
-      LWTRD  = ILAENV2STAGE( 4, 'CHETRD_2STAGE', JOBZ, N, KD, IB, -1 )
-      LWMIN  = N + LHTRD + LWTRD
-      LRWMIN = MAX( 1, 24*N )
-      LIWMIN = MAX( 1, 10*N )
+      KD     = ILAENV2STAGE( 1, 'CHETRD_2STAGE', JOBZ, N, -1, -1,
+     $                       -1 )
+      IB     = ILAENV2STAGE( 2, 'CHETRD_2STAGE', JOBZ, N, KD, -1,
+     $                       -1 )
+      LHTRD  = ILAENV2STAGE( 3, 'CHETRD_2STAGE', JOBZ, N, KD, IB,
+     $                       -1 )
+      LWTRD  = ILAENV2STAGE( 4, 'CHETRD_2STAGE', JOBZ, N, KD, IB,
+     $                       -1 )
+*
+      IF( N.LE.1 ) THEN
+         LWMIN  = 1
+         LRWMIN = 1
+         LIWMIN = 1
+      ELSE
+         LWMIN  = N + LHTRD + LWTRD
+         LRWMIN = 24*N
+         LIWMIN = 10*N
+      END IF
 *
       INFO = 0
       IF( .NOT.( LSAME( JOBZ, 'N' ) ) ) THEN
@@ -506,8 +520,8 @@ SUBROUTINE CHEEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         WORK( 1 )  = LWMIN
-         RWORK( 1 ) = LRWMIN
+         WORK( 1 )  = SROUNDUP_LWORK( LWMIN )
+         RWORK( 1 ) = SROUNDUP_LWORK( LRWMIN )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -535,7 +549,7 @@ SUBROUTINE CHEEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       END IF
 *
       IF( N.EQ.1 ) THEN
-         WORK( 1 ) = 2
+         WORK( 1 ) = 1
          IF( ALLEIG .OR. INDEIG ) THEN
             M = 1
             W( 1 ) = REAL( A( 1, 1 ) )
@@ -643,9 +657,9 @@ SUBROUTINE CHEEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *
 *     Call CHETRD_2STAGE to reduce Hermitian matrix to tridiagonal form.
 *
-      CALL CHETRD_2STAGE( JOBZ, UPLO, N, A, LDA, RWORK( INDRD ), 
+      CALL CHETRD_2STAGE( JOBZ, UPLO, N, A, LDA, RWORK( INDRD ),
      $                    RWORK( INDRE ), WORK( INDTAU ),
-     $                    WORK( INDHOUS ), LHTRD, 
+     $                    WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWK ), LLWORK, IINFO )
 *
 *     If all eigenvalues are desired
@@ -666,7 +680,7 @@ SUBROUTINE CHEEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
             CALL SCOPY( N-1, RWORK( INDRE ), 1, RWORK( INDREE ), 1 )
             CALL SCOPY( N, RWORK( INDRD ), 1, RWORK( INDRDD ), 1 )
 *
-            IF (ABSTOL .LE. TWO*N*EPS) THEN
+            IF ( ABSTOL .LE. TWO*REAL( N )*EPS ) THEN
                TRYRAC = .TRUE.
             ELSE
                TRYRAC = .FALSE.
@@ -722,7 +736,8 @@ SUBROUTINE CHEEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *
          INDWKN = INDWK
          LLWRKN = LWORK - INDWKN + 1
-         CALL CUNMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ), Z,
+         CALL CUNMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ),
+     $                Z,
      $                LDZ, WORK( INDWKN ), LLWRKN, IINFO )
       END IF
 *
@@ -765,8 +780,8 @@ SUBROUTINE CHEEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *
 *     Set WORK(1) to optimal workspace size.
 *
-      WORK( 1 )  = LWMIN
-      RWORK( 1 ) = LRWMIN
+      WORK( 1 )  = SROUNDUP_LWORK( LWMIN )
+      RWORK( 1 ) = SROUNDUP_LWORK( LRWMIN )
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/cheevx.f b/SRC/cheevx.f
index 1cec902aa3..c68b4a7c93 100644
--- a/SRC/cheevx.f
+++ b/SRC/cheevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHEEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cheevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cheevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -250,12 +248,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEeigen
+*> \ingroup heevx
 *
 *  =====================================================================
-      SUBROUTINE CHEEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
+      SUBROUTINE CHEEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL,
+     $                   IU,
      $                   ABSTOL, M, W, Z, LDZ, WORK, LWORK, RWORK,
      $                   IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -294,11 +294,13 @@ SUBROUTINE CHEEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, CLANHE
-      EXTERNAL           LSAME, ILAENV, SLAMCH, CLANHE
+      REAL               SLAMCH, CLANHE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SLAMCH,
+     $                   CLANHE, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SSCAL, SSTEBZ, SSTERF, XERBLA, CSSCAL,
+      EXTERNAL           SCOPY, SSCAL, SSTEBZ, SSTERF, XERBLA,
+     $                   CSSCAL,
      $                   CHETRD, CLACPY, CSTEIN, CSTEQR, CSWAP, CUNGTR,
      $                   CUNMTR
 *     ..
@@ -348,14 +350,15 @@ SUBROUTINE CHEEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
       IF( INFO.EQ.0 ) THEN
          IF( N.LE.1 ) THEN
             LWKMIN = 1
-            WORK( 1 ) = LWKMIN
+            LWKOPT = 1
          ELSE
             LWKMIN = 2*N
             NB = ILAENV( 1, 'CHETRD', UPLO, N, -1, -1, -1 )
-            NB = MAX( NB, ILAENV( 1, 'CUNMTR', UPLO, N, -1, -1, -1 ) )
-            LWKOPT = MAX( 1, ( NB + 1 )*N )
-            WORK( 1 ) = LWKOPT
+            NB = MAX( NB, ILAENV( 1, 'CUNMTR', UPLO, N, -1,
+     $                           -1, -1 ) )
+            LWKOPT = ( NB + 1 )*N
          END IF
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
          IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY )
      $      INFO = -17
@@ -504,7 +507,8 @@ SUBROUTINE CHEEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *        Apply unitary matrix used in reduction to tridiagonal
 *        form to eigenvectors returned by CSTEIN.
 *
-         CALL CUNMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ), Z,
+         CALL CUNMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ),
+     $                Z,
      $                LDZ, WORK( INDWRK ), LLWORK, IINFO )
       END IF
 *
@@ -552,7 +556,7 @@ SUBROUTINE CHEEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *
 *     Set WORK(1) to optimal complex workspace size.
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/cheevx_2stage.f b/SRC/cheevx_2stage.f
index 04f6e30e8a..38bf2b39fc 100644
--- a/SRC/cheevx_2stage.f
+++ b/SRC/cheevx_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHEEVX_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cheevx_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cheevx_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -209,12 +207,12 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, 8*N, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + N
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + N
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -265,7 +263,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEeigen
+*> \ingroup heevx_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -283,7 +281,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -291,11 +289,11 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
@@ -335,7 +333,7 @@ SUBROUTINE CHEEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       CHARACTER          ORDER
       INTEGER            I, IINFO, IMAX, INDD, INDE, INDEE, INDIBL,
      $                   INDISP, INDIWK, INDRWK, INDTAU, INDWRK, ISCALE,
-     $                   ITMP1, J, JJ, LLWORK, 
+     $                   ITMP1, J, JJ, LLWORK,
      $                   NSPLIT, LWMIN, LHTRD, LWTRD, KD, IB, INDHOUS
       REAL               ABSTLL, ANRM, BIGNUM, EPS, RMAX, RMIN, SAFMIN,
      $                   SIGMA, SMLNUM, TMP1, VLL, VUU
@@ -343,11 +341,13 @@ SUBROUTINE CHEEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV2STAGE
-      REAL               SLAMCH, CLANHE
-      EXTERNAL           LSAME, SLAMCH, CLANHE, ILAENV2STAGE
+      REAL               SLAMCH, CLANHE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, CLANHE, ILAENV2STAGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SSCAL, SSTEBZ, SSTERF, XERBLA, CSSCAL,
+      EXTERNAL           SCOPY, SSCAL, SSTEBZ, SSTERF, XERBLA,
+     $                   CSSCAL,
      $                   CLACPY, CSTEIN, CSTEQR, CSWAP, CUNGTR, CUNMTR,
      $                   CHETRD_2STAGE
 *     ..
@@ -397,7 +397,7 @@ SUBROUTINE CHEEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       IF( INFO.EQ.0 ) THEN
          IF( N.LE.1 ) THEN
             LWMIN = 1
-            WORK( 1 ) = LWMIN
+            WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
          ELSE
             KD    = ILAENV2STAGE( 1, 'CHETRD_2STAGE', JOBZ,
      $                            N, -1, -1, -1 )
@@ -408,7 +408,7 @@ SUBROUTINE CHEEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
             LWTRD = ILAENV2STAGE( 4, 'CHETRD_2STAGE', JOBZ,
      $                            N, KD, IB, -1 )
             LWMIN = N + LHTRD + LWTRD
-            WORK( 1 )  = LWMIN
+            WORK( 1 )  = SROUNDUP_LWORK(LWMIN)
          END IF
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY )
@@ -499,7 +499,7 @@ SUBROUTINE CHEEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       LLWORK  = LWORK - INDWRK + 1
 *
       CALL CHETRD_2STAGE( JOBZ, UPLO, N, A, LDA, RWORK( INDD ),
-     $                    RWORK( INDE ), WORK( INDTAU ), 
+     $                    RWORK( INDE ), WORK( INDTAU ),
      $                    WORK( INDHOUS ), LHTRD, WORK( INDWRK ),
      $                    LLWORK, IINFO )
 *
@@ -562,7 +562,8 @@ SUBROUTINE CHEEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *        Apply unitary matrix used in reduction to tridiagonal
 *        form to eigenvectors returned by CSTEIN.
 *
-         CALL CUNMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ), Z,
+         CALL CUNMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ),
+     $                Z,
      $                LDZ, WORK( INDWRK ), LLWORK, IINFO )
       END IF
 *
@@ -610,7 +611,7 @@ SUBROUTINE CHEEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *
 *     Set WORK(1) to optimal complex workspace size.
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
 *
       RETURN
 *
diff --git a/SRC/chegs2.f b/SRC/chegs2.f
index 0a949b4935..5ab70d4da1 100644
--- a/SRC/chegs2.f
+++ b/SRC/chegs2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHEGS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chegs2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chegs2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hegs2
 *
 *  =====================================================================
       SUBROUTINE CHEGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -153,7 +152,8 @@ SUBROUTINE CHEGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
       COMPLEX            CT
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CHER2, CLACGV, CSSCAL, CTRMV, CTRSV,
+      EXTERNAL           CAXPY, CHER2, CLACGV, CSSCAL, CTRMV,
+     $                   CTRSV,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -210,7 +210,8 @@ SUBROUTINE CHEGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
                   CALL CAXPY( N-K, CT, B( K, K+1 ), LDB, A( K, K+1 ),
      $                        LDA )
                   CALL CLACGV( N-K, B( K, K+1 ), LDB )
-                  CALL CTRSV( UPLO, 'Conjugate transpose', 'Non-unit',
+                  CALL CTRSV( UPLO, 'Conjugate transpose',
+     $                        'Non-unit',
      $                        N-K, B( K+1, K+1 ), LDB, A( K, K+1 ),
      $                        LDA )
                   CALL CLACGV( N-K, A( K, K+1 ), LDA )
@@ -231,10 +232,12 @@ SUBROUTINE CHEGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
                IF( K.LT.N ) THEN
                   CALL CSSCAL( N-K, ONE / BKK, A( K+1, K ), 1 )
                   CT = -HALF*AKK
-                  CALL CAXPY( N-K, CT, B( K+1, K ), 1, A( K+1, K ), 1 )
+                  CALL CAXPY( N-K, CT, B( K+1, K ), 1, A( K+1, K ),
+     $                        1 )
                   CALL CHER2( UPLO, N-K, -CONE, A( K+1, K ), 1,
      $                        B( K+1, K ), 1, A( K+1, K+1 ), LDA )
-                  CALL CAXPY( N-K, CT, B( K+1, K ), 1, A( K+1, K ), 1 )
+                  CALL CAXPY( N-K, CT, B( K+1, K ), 1, A( K+1, K ),
+     $                        1 )
                   CALL CTRSV( UPLO, 'No transpose', 'Non-unit', N-K,
      $                        B( K+1, K+1 ), LDB, A( K+1, K ), 1 )
                END IF
@@ -255,7 +258,8 @@ SUBROUTINE CHEGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
      $                     LDB, A( 1, K ), 1 )
                CT = HALF*AKK
                CALL CAXPY( K-1, CT, B( 1, K ), 1, A( 1, K ), 1 )
-               CALL CHER2( UPLO, K-1, CONE, A( 1, K ), 1, B( 1, K ), 1,
+               CALL CHER2( UPLO, K-1, CONE, A( 1, K ), 1, B( 1, K ),
+     $                     1,
      $                     A, LDA )
                CALL CAXPY( K-1, CT, B( 1, K ), 1, A( 1, K ), 1 )
                CALL CSSCAL( K-1, BKK, A( 1, K ), 1 )
@@ -272,12 +276,14 @@ SUBROUTINE CHEGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
                AKK = REAL( A( K, K ) )
                BKK = REAL( B( K, K ) )
                CALL CLACGV( K-1, A( K, 1 ), LDA )
-               CALL CTRMV( UPLO, 'Conjugate transpose', 'Non-unit', K-1,
+               CALL CTRMV( UPLO, 'Conjugate transpose', 'Non-unit',
+     $                     K-1,
      $                     B, LDB, A( K, 1 ), LDA )
                CT = HALF*AKK
                CALL CLACGV( K-1, B( K, 1 ), LDB )
                CALL CAXPY( K-1, CT, B( K, 1 ), LDB, A( K, 1 ), LDA )
-               CALL CHER2( UPLO, K-1, CONE, A( K, 1 ), LDA, B( K, 1 ),
+               CALL CHER2( UPLO, K-1, CONE, A( K, 1 ), LDA, B( K,
+     $                     1 ),
      $                     LDB, A, LDA )
                CALL CAXPY( K-1, CT, B( K, 1 ), LDB, A( K, 1 ), LDA )
                CALL CLACGV( K-1, B( K, 1 ), LDB )
diff --git a/SRC/chegst.f b/SRC/chegst.f
index 129619fdb3..b8337a6e79 100644
--- a/SRC/chegst.f
+++ b/SRC/chegst.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHEGST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chegst.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chegst.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hegst
 *
 *  =====================================================================
       SUBROUTINE CHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -152,7 +151,8 @@ SUBROUTINE CHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
       INTEGER            K, KB, NB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHEGS2, CHEMM, CHER2K, CTRMM, CTRSM, XERBLA
+      EXTERNAL           CHEGS2, CHEMM, CHER2K, CTRMM, CTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -221,7 +221,8 @@ SUBROUTINE CHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
                      CALL CHEMM( 'Left', UPLO, KB, N-K-KB+1, -HALF,
      $                           A( K, K ), LDA, B( K, K+KB ), LDB,
      $                           CONE, A( K, K+KB ), LDA )
-                     CALL CHER2K( UPLO, 'Conjugate transpose', N-K-KB+1,
+                     CALL CHER2K( UPLO, 'Conjugate transpose',
+     $                            N-K-KB+1,
      $                            KB, -CONE, A( K, K+KB ), LDA,
      $                            B( K, K+KB ), LDB, ONE,
      $                            A( K+KB, K+KB ), LDA )
@@ -246,7 +247,8 @@ SUBROUTINE CHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
                   CALL CHEGS2( ITYPE, UPLO, KB, A( K, K ), LDA,
      $                         B( K, K ), LDB, INFO )
                   IF( K+KB.LE.N ) THEN
-                     CALL CTRSM( 'Right', UPLO, 'Conjugate transpose',
+                     CALL CTRSM( 'Right', UPLO,
+     $                           'Conjugate transpose',
      $                           'Non-unit', N-K-KB+1, KB, CONE,
      $                           B( K, K ), LDB, A( K+KB, K ), LDA )
                      CALL CHEMM( 'Right', UPLO, N-K-KB+1, KB, -HALF,
@@ -276,15 +278,18 @@ SUBROUTINE CHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
 *
 *                 Update the upper triangle of A(1:k+kb-1,1:k+kb-1)
 *
-                  CALL CTRMM( 'Left', UPLO, 'No transpose', 'Non-unit',
+                  CALL CTRMM( 'Left', UPLO, 'No transpose',
+     $                        'Non-unit',
      $                        K-1, KB, CONE, B, LDB, A( 1, K ), LDA )
-                  CALL CHEMM( 'Right', UPLO, K-1, KB, HALF, A( K, K ),
+                  CALL CHEMM( 'Right', UPLO, K-1, KB, HALF, A( K,
+     $                        K ),
      $                        LDA, B( 1, K ), LDB, CONE, A( 1, K ),
      $                        LDA )
                   CALL CHER2K( UPLO, 'No transpose', K-1, KB, CONE,
      $                         A( 1, K ), LDA, B( 1, K ), LDB, ONE, A,
      $                         LDA )
-                  CALL CHEMM( 'Right', UPLO, K-1, KB, HALF, A( K, K ),
+                  CALL CHEMM( 'Right', UPLO, K-1, KB, HALF, A( K,
+     $                        K ),
      $                        LDA, B( 1, K ), LDB, CONE, A( 1, K ),
      $                        LDA )
                   CALL CTRMM( 'Right', UPLO, 'Conjugate transpose',
@@ -302,7 +307,8 @@ SUBROUTINE CHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
 *
 *                 Update the lower triangle of A(1:k+kb-1,1:k+kb-1)
 *
-                  CALL CTRMM( 'Right', UPLO, 'No transpose', 'Non-unit',
+                  CALL CTRMM( 'Right', UPLO, 'No transpose',
+     $                        'Non-unit',
      $                        KB, K-1, CONE, B, LDB, A( K, 1 ), LDA )
                   CALL CHEMM( 'Left', UPLO, KB, K-1, HALF, A( K, K ),
      $                        LDA, B( K, 1 ), LDB, CONE, A( K, 1 ),
diff --git a/SRC/chegv.f b/SRC/chegv.f
index f7675a19fe..b71b6c0fbe 100644
--- a/SRC/chegv.f
+++ b/SRC/chegv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHEGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chegv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chegv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,7 +158,7 @@
 *>                    i off-diagonal elements of an intermediate
 *>                    tridiagonal form did not converge to zero;
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -173,11 +171,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEeigen
+*> \ingroup hegv
 *
 *  =====================================================================
-      SUBROUTINE CHEGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
+      SUBROUTINE CHEGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
+     $                  WORK,
      $                  LWORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -206,10 +206,12 @@ SUBROUTINE CHEGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           ILAENV, LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHEEV, CHEGST, CPOTRF, CTRMM, CTRSM, XERBLA
+      EXTERNAL           CHEEV, CHEGST, CPOTRF, CTRMM, CTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -240,7 +242,7 @@ SUBROUTINE CHEGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
       IF( INFO.EQ.0 ) THEN
          NB = ILAENV( 1, 'CHETRD', UPLO, N, -1, -1, -1 )
          LWKOPT = MAX( 1, ( NB + 1 )*N )
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.MAX( 1, 2*N-1 ) .AND. .NOT.LQUERY ) THEN
             INFO = -11
@@ -270,7 +272,8 @@ SUBROUTINE CHEGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL CHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
-      CALL CHEEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK, INFO )
+      CALL CHEEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
+     $            INFO )
 *
       IF( WANTZ ) THEN
 *
@@ -290,7 +293,8 @@ SUBROUTINE CHEGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
                TRANS = 'C'
             END IF
 *
-            CALL CTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG, ONE,
+            CALL CTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG,
+     $                  ONE,
      $                  B, LDB, A, LDA )
 *
          ELSE IF( ITYPE.EQ.3 ) THEN
@@ -304,12 +308,13 @@ SUBROUTINE CHEGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
                TRANS = 'N'
             END IF
 *
-            CALL CTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG, ONE,
+            CALL CTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG,
+     $                  ONE,
      $                  B, LDB, A, LDA )
          END IF
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/chegv_2stage.f b/SRC/chegv_2stage.f
index 472581c4be..d9941a5060 100644
--- a/SRC/chegv_2stage.f
+++ b/SRC/chegv_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHEGV_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chegv_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chegv_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,12 +142,12 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + N
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + N
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -179,7 +177,7 @@
 *>                    i off-diagonal elements of an intermediate
 *>                    tridiagonal form did not converge to zero;
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -192,7 +190,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEeigen
+*> \ingroup hegv_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -210,7 +208,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -218,16 +216,17 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE CHEGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
+      SUBROUTINE CHEGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB,
+     $                         W,
      $                         WORK, LWORK, RWORK, INFO )
 *
       IMPLICIT NONE
@@ -259,10 +258,12 @@ SUBROUTINE CHEGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV2STAGE
-      EXTERNAL           LSAME, ILAENV2STAGE
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV2STAGE, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, CHEGST, CPOTRF, CTRMM, CTRSM,
+      EXTERNAL           XERBLA, CHEGST, CPOTRF, CTRMM,
+     $                   CTRSM,
      $                   CHEEV_2STAGE
 *     ..
 *     .. Intrinsic Functions ..
@@ -292,12 +293,16 @@ SUBROUTINE CHEGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         KD    = ILAENV2STAGE( 1, 'CHETRD_2STAGE', JOBZ, N, -1, -1, -1 )
-         IB    = ILAENV2STAGE( 2, 'CHETRD_2STAGE', JOBZ, N, KD, -1, -1 )
-         LHTRD = ILAENV2STAGE( 3, 'CHETRD_2STAGE', JOBZ, N, KD, IB, -1 )
-         LWTRD = ILAENV2STAGE( 4, 'CHETRD_2STAGE', JOBZ, N, KD, IB, -1 )
+         KD    = ILAENV2STAGE( 1, 'CHETRD_2STAGE', JOBZ, N, -1, -1,
+     $                         -1 )
+         IB    = ILAENV2STAGE( 2, 'CHETRD_2STAGE', JOBZ, N, KD, -1,
+     $                         -1 )
+         LHTRD = ILAENV2STAGE( 3, 'CHETRD_2STAGE', JOBZ, N, KD, IB,
+     $                         -1 )
+         LWTRD = ILAENV2STAGE( 4, 'CHETRD_2STAGE', JOBZ, N, KD, IB,
+     $                         -1 )
          LWMIN = N + LHTRD + LWTRD
-         WORK( 1 )  = LWMIN
+         WORK( 1 )  = SROUNDUP_LWORK(LWMIN)
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
             INFO = -11
@@ -327,7 +332,7 @@ SUBROUTINE CHEGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL CHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
-      CALL CHEEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, 
+      CALL CHEEV_2STAGE( JOBZ, UPLO, N, A, LDA, W,
      $                   WORK, LWORK, RWORK, INFO )
 *
       IF( WANTZ ) THEN
@@ -348,7 +353,8 @@ SUBROUTINE CHEGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
                TRANS = 'C'
             END IF
 *
-            CALL CTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG, ONE,
+            CALL CTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG,
+     $                  ONE,
      $                  B, LDB, A, LDA )
 *
          ELSE IF( ITYPE.EQ.3 ) THEN
@@ -362,12 +368,13 @@ SUBROUTINE CHEGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
                TRANS = 'N'
             END IF
 *
-            CALL CTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG, ONE,
+            CALL CTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG,
+     $                  ONE,
      $                  B, LDB, A, LDA )
          END IF
       END IF
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
 *
       RETURN
 *
diff --git a/SRC/chegvd.f b/SRC/chegvd.f
index 0c708190ce..1a6ab41853 100644
--- a/SRC/chegvd.f
+++ b/SRC/chegvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHEGVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chegvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chegvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -43,12 +41,6 @@
 *> B are assumed to be Hermitian and B is also positive definite.
 *> If eigenvectors are desired, it uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -212,7 +204,7 @@
 *>                    the submatrix lying in rows and columns INFO/(N+1)
 *>                    through mod(INFO,N+1);
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -225,7 +217,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEeigen
+*> \ingroup hegvd
 *
 *> \par Further Details:
 *  =====================
@@ -244,8 +236,10 @@
 *>     Mark Fahey, Department of Mathematics, Univ. of Kentucky, USA
 *>
 *  =====================================================================
-      SUBROUTINE CHEGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
+      SUBROUTINE CHEGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
+     $                   WORK,
      $                   LWORK, RWORK, LRWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -274,10 +268,12 @@ SUBROUTINE CHEGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHEEVD, CHEGST, CPOTRF, CTRMM, CTRSM, XERBLA
+      EXTERNAL           CHEEVD, CHEGST, CPOTRF, CTRMM, CTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, REAL
@@ -322,8 +318,8 @@ SUBROUTINE CHEGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         WORK( 1 ) = LOPT
-         RWORK( 1 ) = LROPT
+         WORK( 1 ) = SROUNDUP_LWORK(LOPT)
+         RWORK( 1 ) = REAL( LROPT )
          IWORK( 1 ) = LIOPT
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -358,11 +354,12 @@ SUBROUTINE CHEGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL CHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
-      CALL CHEEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK, LRWORK,
+      CALL CHEEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
+     $             LRWORK,
      $             IWORK, LIWORK, INFO )
-      LOPT = MAX( REAL( LOPT ), REAL( WORK( 1 ) ) )
-      LROPT = MAX( REAL( LROPT ), REAL( RWORK( 1 ) ) )
-      LIOPT = MAX( REAL( LIOPT ), REAL( IWORK( 1 ) ) )
+      LOPT = INT( MAX( REAL( LOPT ), REAL( WORK( 1 ) ) ) )
+      LROPT = INT( MAX( REAL( LROPT ), REAL( RWORK( 1 ) ) ) )
+      LIOPT = INT( MAX( REAL( LIOPT ), REAL( IWORK( 1 ) ) ) )
 *
       IF( WANTZ .AND. INFO.EQ.0 ) THEN
 *
@@ -398,8 +395,8 @@ SUBROUTINE CHEGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
          END IF
       END IF
 *
-      WORK( 1 ) = LOPT
-      RWORK( 1 ) = LROPT
+      WORK( 1 ) = SROUNDUP_LWORK(LOPT)
+      RWORK( 1 ) = REAL( LROPT )
       IWORK( 1 ) = LIOPT
 *
       RETURN
diff --git a/SRC/chegvx.f b/SRC/chegvx.f
index 6e428242d2..4770a0f46c 100644
--- a/SRC/chegvx.f
+++ b/SRC/chegvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHEGVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chegvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chegvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -280,7 +278,7 @@
 *>                    i eigenvectors failed to converge.  Their indices
 *>                    are stored in array IFAIL.
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -293,7 +291,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEeigen
+*> \ingroup hegvx
 *
 *> \par Contributors:
 *  ==================
@@ -304,6 +302,7 @@
       SUBROUTINE CHEGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
      $                   VL, VU, IL, IU, ABSTOL, M, W, Z, LDZ, WORK,
      $                   LWORK, RWORK, IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -335,10 +334,12 @@ SUBROUTINE CHEGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           ILAENV, LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHEEVX, CHEGST, CPOTRF, CTRMM, CTRSM, XERBLA
+      EXTERNAL           CHEEVX, CHEGST, CPOTRF, CTRMM, CTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -390,7 +391,7 @@ SUBROUTINE CHEGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
       IF( INFO.EQ.0 ) THEN
          NB = ILAENV( 1, 'CHETRD', UPLO, N, -1, -1, -1 )
          LWKOPT = MAX( 1, ( NB + 1 )*N )
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.MAX( 1, 2*N ) .AND. .NOT.LQUERY ) THEN
             INFO = -20
@@ -422,7 +423,8 @@ SUBROUTINE CHEGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL CHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
-      CALL CHEEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU, ABSTOL,
+      CALL CHEEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
+     $             ABSTOL,
      $             M, W, Z, LDZ, WORK, LWORK, RWORK, IWORK, IFAIL,
      $             INFO )
 *
@@ -443,7 +445,8 @@ SUBROUTINE CHEGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
                TRANS = 'C'
             END IF
 *
-            CALL CTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, M, CONE, B,
+            CALL CTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, M, CONE,
+     $                  B,
      $                  LDB, Z, LDZ )
 *
          ELSE IF( ITYPE.EQ.3 ) THEN
@@ -457,14 +460,15 @@ SUBROUTINE CHEGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
                TRANS = 'N'
             END IF
 *
-            CALL CTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, M, CONE, B,
+            CALL CTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, M, CONE,
+     $                  B,
      $                  LDB, Z, LDZ )
          END IF
       END IF
 *
 *     Set WORK(1) to optimal complex workspace size.
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/cherfs.f b/SRC/cherfs.f
index 704431ab59..2f06add2b2 100644
--- a/SRC/cherfs.f
+++ b/SRC/cherfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHERFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cherfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cherfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -184,11 +182,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup herfs
 *
 *  =====================================================================
-      SUBROUTINE CHERFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
+      SUBROUTINE CHERFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
+     $                   LDB,
      $                   X, LDX, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -229,7 +229,8 @@ SUBROUTINE CHERFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CHEMV, CHETRS, CLACN2, XERBLA
+      EXTERNAL           CAXPY, CCOPY, CHEMV, CHETRS, CLACN2,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MAX, REAL
@@ -286,7 +287,7 @@ SUBROUTINE CHERFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
       NZ = N + 1
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -302,7 +303,8 @@ SUBROUTINE CHERFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
 *        Compute residual R = B - A * X
 *
          CALL CCOPY( N, B( 1, J ), 1, WORK, 1 )
-         CALL CHEMV( UPLO, N, -ONE, A, LDA, X( 1, J ), 1, ONE, WORK, 1 )
+         CALL CHEMV( UPLO, N, -ONE, A, LDA, X( 1, J ), 1, ONE, WORK,
+     $               1 )
 *
 *        Compute componentwise relative backward error from formula
 *
@@ -394,10 +396,11 @@ SUBROUTINE CHERFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
 *
          DO 90 I = 1, N
             IF( RWORK( I ).GT.SAFE2 ) THEN
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I )
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I )
             ELSE
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I ) +
-     $                      SAFE1
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I ) + SAFE1
             END IF
    90    CONTINUE
 *
@@ -409,7 +412,8 @@ SUBROUTINE CHERFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
 *
 *              Multiply by diag(W)*inv(A**H).
 *
-               CALL CHETRS( UPLO, N, 1, AF, LDAF, IPIV, WORK, N, INFO )
+               CALL CHETRS( UPLO, N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
                DO 110 I = 1, N
                   WORK( I ) = RWORK( I )*WORK( I )
   110          CONTINUE
@@ -420,7 +424,8 @@ SUBROUTINE CHERFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
                DO 120 I = 1, N
                   WORK( I ) = RWORK( I )*WORK( I )
   120          CONTINUE
-               CALL CHETRS( UPLO, N, 1, AF, LDAF, IPIV, WORK, N, INFO )
+               CALL CHETRS( UPLO, N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
             END IF
             GO TO 100
          END IF
diff --git a/SRC/cherfsx.f b/SRC/cherfsx.f
index 3b533c3b54..c29cd53038 100644
--- a/SRC/cherfsx.f
+++ b/SRC/cherfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHERFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cherfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cherfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -391,13 +389,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup herfsx
 *
 *  =====================================================================
-      SUBROUTINE CHERFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE CHERFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    S, B, LDB, X, LDX, RCOND, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -459,7 +459,8 @@ SUBROUTINE CHERFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *     ..
 *     .. External Functions ..
       EXTERNAL           LSAME, ILAPREC
-      EXTERNAL           SLAMCH, CLANHE, CLA_HERCOND_X, CLA_HERCOND_C
+      EXTERNAL           SLAMCH, CLANHE, CLA_HERCOND_X,
+     $                   CLA_HERCOND_C
       REAL               SLAMCH, CLANHE, CLA_HERCOND_X, CLA_HERCOND_C
       LOGICAL            LSAME
       INTEGER            ILAPREC
@@ -516,7 +517,8 @@ SUBROUTINE CHERFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Test input parameters.
 *
-      IF (.NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF (.NOT.LSAME( UPLO, 'U' ) .AND.
+     $     .NOT.LSAME( UPLO, 'L' ) ) THEN
         INFO = -1
       ELSE IF( .NOT.RCEQU .AND. .NOT.LSAME( EQUED, 'N' ) ) THEN
         INFO = -2
@@ -608,10 +610,12 @@ SUBROUTINE CHERFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *     Compute scaled normwise condition number cond(A*C).
 *
          IF ( RCEQU ) THEN
-            RCOND_TMP = CLA_HERCOND_C( UPLO, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = CLA_HERCOND_C( UPLO, N, A, LDA, AF, LDAF,
+     $                                 IPIV,
      $           S, .TRUE., INFO, WORK, RWORK )
          ELSE
-            RCOND_TMP = CLA_HERCOND_C( UPLO, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = CLA_HERCOND_C( UPLO, N, A, LDA, AF, LDAF,
+     $                                 IPIV,
      $           S, .FALSE., INFO, WORK, RWORK )
          END IF
          DO J = 1, NRHS
diff --git a/SRC/chesv.f b/SRC/chesv.f
index 238fb0a944..7e10d33cd1 100644
--- a/SRC/chesv.f
+++ b/SRC/chesv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHESV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chesv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chesv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,11 +161,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEsolve
+*> \ingroup hesv
 *
 *  =====================================================================
       SUBROUTINE CHESV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
      $                  LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -191,7 +190,8 @@ SUBROUTINE CHESV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           XERBLA, CHETRF, CHETRS, CHETRS2
@@ -205,7 +205,8 @@ SUBROUTINE CHESV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -226,7 +227,7 @@ SUBROUTINE CHESV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
             NB = ILAENV( 1, 'CHETRF', UPLO, N, -1, -1, -1 )
             LWKOPT = N*NB
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -259,7 +260,7 @@ SUBROUTINE CHESV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/chesv_aa.f b/SRC/chesv_aa.f
index c9b97e09cb..132a29d821 100644
--- a/SRC/chesv_aa.f
+++ b/SRC/chesv_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHESV_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chesv_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chesv_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -154,11 +152,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEsolve
+*> \ingroup hesv_aa
 *
 *  =====================================================================
       SUBROUTINE CHESV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
      $                     LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -177,12 +176,13 @@ SUBROUTINE CHESV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
 *     .. Local Scalars ..
       LOGICAL            LQUERY
-      INTEGER            LWKOPT, LWKOPT_HETRF, LWKOPT_HETRS
+      INTEGER            LWKMIN, LWKOPT, LWKOPT_HETRF, LWKOPT_HETRS
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           XERBLA, CHETRF_AA, CHETRS_AA
@@ -196,7 +196,9 @@ SUBROUTINE CHESV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      LWKMIN = MAX( 1, 2*N, 3*N-2 )
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -206,18 +208,18 @@ SUBROUTINE CHESV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
          INFO = -5
       ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
          INFO = -8
-      ELSE IF( LWORK.LT.MAX( 2*N, 3*N-2 ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -10
       END IF
 *
       IF( INFO.EQ.0 ) THEN
          CALL CHETRF_AA( UPLO, N, A, LDA, IPIV, WORK, -1, INFO )
-         LWKOPT_HETRF = INT( WORK(1) )
+         LWKOPT_HETRF = INT( WORK( 1 ) )
          CALL CHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
      $                   -1, INFO )
-         LWKOPT_HETRS = INT( WORK(1) )
-         LWKOPT = MAX( LWKOPT_HETRF, LWKOPT_HETRS )
-         WORK( 1 ) = LWKOPT
+         LWKOPT_HETRS = INT( WORK( 1 ) )
+         LWKOPT = MAX( LWKMIN, LWKOPT_HETRF, LWKOPT_HETRS )
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -239,7 +241,7 @@ SUBROUTINE CHESV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       RETURN
 *
diff --git a/SRC/chesv_aa_2stage.f b/SRC/chesv_aa_2stage.f
index e474c6fada..b92e614799 100644
--- a/SRC/chesv_aa_2stage.f
+++ b/SRC/chesv_aa_2stage.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHESV_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chesv_aa_2stage.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chesv_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -87,7 +85,7 @@
 *>          triangular part of the matrix A, and the strictly upper
 *>          triangular part of A is not referenced.
 *>
-*>          On exit, L is stored below (or above) the subdiaonal blocks,
+*>          On exit, L is stored below (or above) the subdiagonal blocks,
 *>          when UPLO  is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -99,14 +97,14 @@
 *>
 *> \param[out] TB
 *> \verbatim
-*>          TB is COMPLEX array, dimension (LTB)
+*>          TB is COMPLEX array, dimension (MAX(1,LTB)).
 *>          On exit, details of the LU factorization of the band matrix.
 *> \endverbatim
 *>
 *> \param[in] LTB
 *> \verbatim
 *>          LTB is INTEGER
-*>          The size of the array TB. LTB >= 4*N, internally
+*>          The size of the array TB. LTB >= MAX(1,4*N), internally
 *>          used to select NB such that LTB >= (3*NB+1)*N.
 *>
 *>          If LTB = -1, then a workspace query is assumed; the
@@ -146,14 +144,15 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX workspace of size LWORK
+*>          WORK is COMPLEX workspace of size (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The size of WORK. LWORK >= N, internally used to select NB
-*>          such that LWORK >= N*NB.
+*>          The size of WORK. LWORK >= MAX(1,N), internally used to
+*>          select NB such that LWORK >= N*NB.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal size of the WORK array,
@@ -177,7 +176,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hesv_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE CHESV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
@@ -203,11 +202,12 @@ SUBROUTINE CHESV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *     .. Local Scalars ..
       LOGICAL            UPPER, TQUERY, WQUERY
-      INTEGER            LWKOPT
+      INTEGER            LWKMIN, LWKOPT
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CHETRF_AA_2STAGE, CHETRS_AA_2STAGE,
@@ -224,6 +224,7 @@ SUBROUTINE CHESV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
       UPPER = LSAME( UPLO, 'U' )
       WQUERY = ( LWORK.EQ.-1 )
       TQUERY = ( LTB.EQ.-1 )
+      LWKMIN = MAX( 1, N )
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
@@ -232,18 +233,19 @@ SUBROUTINE CHESV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
          INFO = -3
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -5
-      ELSE IF( LTB.LT.( 4*N ) .AND. .NOT.TQUERY ) THEN
+      ELSE IF( LTB.LT.MAX( 1, 4*N ) .AND. .NOT.TQUERY ) THEN
          INFO = -7
       ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
          INFO = -11
-      ELSE IF( LWORK.LT.N .AND. .NOT.WQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.WQUERY ) THEN
          INFO = -13
       END IF
 *
       IF( INFO.EQ.0 ) THEN
          CALL CHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, -1, IPIV,
      $                          IPIV2, WORK, -1, INFO )
-         LWKOPT = INT( WORK(1) )
+         LWKOPT = MAX( LWKMIN, INT( WORK( 1 ) ) )
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -253,7 +255,6 @@ SUBROUTINE CHESV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
          RETURN
       END IF
 *
-*
 *     Compute the factorization A = U**H*T*U or A = L*T*L**H.
 *
       CALL CHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV, IPIV2,
@@ -267,7 +268,7 @@ SUBROUTINE CHESV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       RETURN
 *
diff --git a/SRC/chesv_rk.f b/SRC/chesv_rk.f
index a659c8e795..e303eee64c 100644
--- a/SRC/chesv_rk.f
+++ b/SRC/chesv_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHESV_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chesv_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chesv_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -205,7 +203,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEsolve
+*> \ingroup hesv_rk
 *
 *> \par Contributors:
 *  ==================
@@ -223,8 +221,10 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE CHESV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
+      SUBROUTINE CHESV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
+     $                     WORK,
      $                     LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -247,7 +247,8 @@ SUBROUTINE CHESV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           XERBLA, CHETRF_RK, CHETRS_3
@@ -261,7 +262,8 @@ SUBROUTINE CHESV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -279,10 +281,11 @@ SUBROUTINE CHESV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
          IF( N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            CALL CHETRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, -1, INFO )
-            LWKOPT = REAL( WORK(1) )
+            CALL CHETRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, -1,
+     $                      INFO )
+            LWKOPT = INT( WORK( 1 ) )
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -300,11 +303,12 @@ SUBROUTINE CHESV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
 *
 *        Solve the system A*X = B with BLAS3 solver, overwriting B with X.
 *
-         CALL CHETRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, INFO )
+         CALL CHETRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
+     $                  INFO )
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/chesv_rook.f b/SRC/chesv_rook.f
index 8e0b1a88f4..8d19d23f74 100644
--- a/SRC/chesv_rook.f
+++ b/SRC/chesv_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHESV_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chesv_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chesv_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -184,7 +182,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEsolve
+*> \ingroup hesv_rook
 *>
 *> \verbatim
 *>
@@ -200,8 +198,10 @@
 *
 *
 *  =====================================================================
-      SUBROUTINE CHESV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
+      SUBROUTINE CHESV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
+     $                       WORK,
      $                       LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -225,7 +225,8 @@ SUBROUTINE CHESV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           XERBLA, CHETRF_ROOK, CHETRS_ROOK
@@ -239,7 +240,8 @@ SUBROUTINE CHESV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -260,7 +262,7 @@ SUBROUTINE CHESV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
             NB = ILAENV( 1, 'CHETRF_ROOK', UPLO, N, -1, -1, -1 )
             LWKOPT = N*NB
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -279,11 +281,12 @@ SUBROUTINE CHESV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
 *        Solve with TRS ( Use Level BLAS 2)
 *
-         CALL CHETRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+         CALL CHETRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
+     $                     INFO )
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/chesvx.f b/SRC/chesvx.f
index 6da49bdcf9..951497301f 100644
--- a/SRC/chesvx.f
+++ b/SRC/chesvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHESVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chesvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chesvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -276,12 +274,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEsolve
+*> \ingroup hesvx
 *
 *  =====================================================================
-      SUBROUTINE CHESVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
+      SUBROUTINE CHESVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
+     $                   B,
      $                   LDB, X, LDX, RCOND, FERR, BERR, WORK, LWORK,
      $                   RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -307,17 +307,19 @@ SUBROUTINE CHESVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, NOFACT
-      INTEGER            LWKOPT, NB
+      INTEGER            LWKMIN, LWKOPT, NB
       REAL               ANORM
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               CLANHE, SLAMCH
-      EXTERNAL           ILAENV, LSAME, CLANHE, SLAMCH
+      REAL               CLANHE, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, CLANHE, SLAMCH,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHECON, CHERFS, CHETRF, CHETRS, CLACPY, XERBLA
+      EXTERNAL           CHECON, CHERFS, CHETRF, CHETRS, CLACPY,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -329,9 +331,11 @@ SUBROUTINE CHESVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
       INFO = 0
       NOFACT = LSAME( FACT, 'N' )
       LQUERY = ( LWORK.EQ.-1 )
+      LWKMIN = MAX( 1, 2*N )
       IF( .NOT.NOFACT .AND. .NOT.LSAME( FACT, 'F' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -346,17 +350,17 @@ SUBROUTINE CHESVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
          INFO = -11
       ELSE IF( LDX.LT.MAX( 1, N ) ) THEN
          INFO = -13
-      ELSE IF( LWORK.LT.MAX( 1, 2*N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -18
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         LWKOPT = MAX( 1, 2*N )
+         LWKOPT = LWKMIN
          IF( NOFACT ) THEN
             NB = ILAENV( 1, 'CHETRF', UPLO, N, -1, -1, -1 )
             LWKOPT = MAX( LWKOPT, N*NB )
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -387,7 +391,8 @@ SUBROUTINE CHESVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL CHECON( UPLO, N, AF, LDAF, IPIV, ANORM, RCOND, WORK, INFO )
+      CALL CHECON( UPLO, N, AF, LDAF, IPIV, ANORM, RCOND, WORK,
+     $             INFO )
 *
 *     Compute the solution vectors X.
 *
@@ -405,7 +410,7 @@ SUBROUTINE CHESVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
       IF( RCOND.LT.SLAMCH( 'Epsilon' ) )
      $   INFO = N + 1
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       RETURN
 *
diff --git a/SRC/chesvxx.f b/SRC/chesvxx.f
index 2c022874a1..93f2ec379c 100644
--- a/SRC/chesvxx.f
+++ b/SRC/chesvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHESVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chesvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chesvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -499,13 +497,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEsolve
+*> \ingroup hesvxx
 *
 *  =====================================================================
-      SUBROUTINE CHESVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE CHESVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    EQUED, S, B, LDB, X, LDX, RCOND, RPVGRW, BERR,
      $                    N_ERR_BNDS, ERR_BNDS_NORM, ERR_BNDS_COMP,
      $                    NPARAMS, PARAMS, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -630,7 +630,8 @@ SUBROUTINE CHESVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Compute row and column scalings to equilibrate the matrix A.
 *
-         CALL CHEEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFEQU )
+         CALL CHEEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK,
+     $                 INFEQU )
          IF( INFEQU.EQ.0 ) THEN
 *
 *     Equilibrate the matrix.
@@ -649,7 +650,8 @@ SUBROUTINE CHESVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *        Compute the LDL^H or UDU^H factorization of A.
 *
          CALL CLACPY( UPLO, N, N, A, LDA, AF, LDAF )
-         CALL CHETRF( UPLO, N, AF, LDAF, IPIV, WORK, 5*MAX(1,N), INFO )
+         CALL CHETRF( UPLO, N, AF, LDAF, IPIV, WORK, 5*MAX(1,N),
+     $                INFO )
 *
 *        Return if INFO is non-zero.
 *
@@ -660,7 +662,8 @@ SUBROUTINE CHESVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *           leading rank-deficient INFO columns of A.
 *
             IF( N.GT.0 )
-     $           RPVGRW = CLA_HERPVGRW( UPLO, N, INFO, A, LDA, AF, LDAF,
+     $           RPVGRW = CLA_HERPVGRW( UPLO, N, INFO, A, LDA, AF,
+     $                                  LDAF,
      $           IPIV, RWORK )
             RETURN
          END IF
@@ -669,7 +672,8 @@ SUBROUTINE CHESVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *     Compute the reciprocal pivot growth factor RPVGRW.
 *
       IF( N.GT.0 )
-     $     RPVGRW = CLA_HERPVGRW( UPLO, N, INFO, A, LDA, AF, LDAF, IPIV,
+     $     RPVGRW = CLA_HERPVGRW( UPLO, N, INFO, A, LDA, AF, LDAF,
+     $                            IPIV,
      $     RWORK )
 *
 *     Compute the solution matrix X.
diff --git a/SRC/cheswapr.f b/SRC/cheswapr.f
index aded514234..ef6b3af720 100644
--- a/SRC/cheswapr.f
+++ b/SRC/cheswapr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHESWAPR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cheswapr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cheswapr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,10 +93,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEauxiliary
+*> \ingroup heswapr
 *
 *  =====================================================================
       SUBROUTINE CHESWAPR( UPLO, N, A, LDA, I1, I2)
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/chetd2.f b/SRC/chetd2.f
index ae4f72df15..b261151824 100644
--- a/SRC/chetd2.f
+++ b/SRC/chetd2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETD2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetd2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetd2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,7 +120,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetd2
 *
 *> \par Further Details:
 *  =====================
@@ -172,6 +170,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CHETD2( UPLO, N, A, LDA, D, E, TAU, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -255,7 +254,8 @@ SUBROUTINE CHETD2( UPLO, N, A, LDA, D, E, TAU, INFO )
 *
 *              Compute  x := tau * A * v  storing x in TAU(1:i)
 *
-               CALL CHEMV( UPLO, I, TAUI, A, LDA, A( 1, I+1 ), 1, ZERO,
+               CALL CHEMV( UPLO, I, TAUI, A, LDA, A( 1, I+1 ), 1,
+     $                     ZERO,
      $                     TAU, 1 )
 *
 *              Compute  w := x - 1/2 * tau * (x**H * v) * v
@@ -304,14 +304,16 @@ SUBROUTINE CHETD2( UPLO, N, A, LDA, D, E, TAU, INFO )
 *
 *              Compute  w := x - 1/2 * tau * (x**H * v) * v
 *
-               ALPHA = -HALF*TAUI*CDOTC( N-I, TAU( I ), 1, A( I+1, I ),
+               ALPHA = -HALF*TAUI*CDOTC( N-I, TAU( I ), 1, A( I+1,
+     $                                   I ),
      $                 1 )
                CALL CAXPY( N-I, ALPHA, A( I+1, I ), 1, TAU( I ), 1 )
 *
 *              Apply the transformation as a rank-2 update:
 *                 A := A - v * w**H - w * v**H
 *
-               CALL CHER2( UPLO, N-I, -ONE, A( I+1, I ), 1, TAU( I ), 1,
+               CALL CHER2( UPLO, N-I, -ONE, A( I+1, I ), 1, TAU( I ),
+     $                     1,
      $                     A( I+1, I+1 ), LDA )
 *
             ELSE
diff --git a/SRC/chetf2.f b/SRC/chetf2.f
index 84ba339fbb..0a6adfcef1 100644
--- a/SRC/chetf2.f
+++ b/SRC/chetf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,7 +125,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetf2
 *
 *> \par Further Details:
 *  =====================
@@ -183,6 +181,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CHETF2( UPLO, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -284,7 +283,8 @@ SUBROUTINE CHETF2( UPLO, N, A, LDA, IPIV, INFO )
             COLMAX = ZERO
          END IF
 *
-         IF( (MAX( ABSAKK, COLMAX ).EQ.ZERO) .OR. SISNAN(ABSAKK) ) THEN
+         IF( (MAX( ABSAKK, COLMAX ).EQ.ZERO) .OR.
+     $       SISNAN(ABSAKK) ) THEN
 *
 *           Column K is or underflow, or contains a NaN:
 *           set INFO and continue
@@ -468,7 +468,8 @@ SUBROUTINE CHETF2( UPLO, N, A, LDA, IPIV, INFO )
             COLMAX = ZERO
          END IF
 *
-         IF( (MAX( ABSAKK, COLMAX ).EQ.ZERO) .OR. SISNAN(ABSAKK) ) THEN
+         IF( (MAX( ABSAKK, COLMAX ).EQ.ZERO) .OR.
+     $       SISNAN(ABSAKK) ) THEN
 *
 *           Column K is zero or underflow, contains a NaN:
 *           set INFO and continue
@@ -491,7 +492,8 @@ SUBROUTINE CHETF2( UPLO, N, A, LDA, IPIV, INFO )
                JMAX = K - 1 + ICAMAX( IMAX-K, A( IMAX, K ), LDA )
                ROWMAX = CABS1( A( IMAX, JMAX ) )
                IF( IMAX.LT.N ) THEN
-                  JMAX = IMAX + ICAMAX( N-IMAX, A( IMAX+1, IMAX ), 1 )
+                  JMAX = IMAX + ICAMAX( N-IMAX, A( IMAX+1, IMAX ),
+     $                                  1 )
                   ROWMAX = MAX( ROWMAX, CABS1( A( JMAX, IMAX ) ) )
                END IF
 *
@@ -524,7 +526,8 @@ SUBROUTINE CHETF2( UPLO, N, A, LDA, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL CSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL CSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
                DO 60 J = KK + 1, KP - 1
                   T = CONJG( A( J, KK ) )
                   A( J, KK ) = CONJG( A( KP, J ) )
diff --git a/SRC/chetf2_rk.f b/SRC/chetf2_rk.f
index 4bb0323827..e9b4274344 100644
--- a/SRC/chetf2_rk.f
+++ b/SRC/chetf2_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETF2_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetf2_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetf2_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -208,7 +206,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetf2_rk
 *
 *> \par Further Details:
 *  =====================
@@ -238,6 +236,7 @@
 *
 *  =====================================================================
       SUBROUTINE CHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -480,7 +479,7 @@ SUBROUTINE CHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
                   A( J, K ) = CONJG( A( P, J ) )
                   A( P, J ) = T
    14          CONTINUE
-*              (3) Swap and conjugate corner elements at row-col interserction
+*              (3) Swap and conjugate corner elements at row-col intersection
                A( P, K ) = CONJG( A( P, K ) )
 *              (4) Swap diagonal elements at row-col intersection
                R1 = REAL( A( K, K ) )
@@ -491,7 +490,8 @@ SUBROUTINE CHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *              the interchanges in columns k+1:N.
 *
                IF( K.LT.N )
-     $            CALL CSWAP( N-K, A( K, K+1 ), LDA, A( P, K+1 ), LDA )
+     $            CALL CSWAP( N-K, A( K, K+1 ), LDA, A( P, K+1 ),
+     $                        LDA )
 *
             END IF
 *
@@ -508,7 +508,7 @@ SUBROUTINE CHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
                   A( J, KK ) = CONJG( A( KP, J ) )
                   A( KP, J ) = T
    15          CONTINUE
-*              (3) Swap and conjugate corner elements at row-col interserction
+*              (3) Swap and conjugate corner elements at row-col intersection
                A( KP, KK ) = CONJG( A( KP, KK ) )
 *              (4) Swap diagonal elements at row-col intersection
                R1 = REAL( A( KK, KK ) )
@@ -560,7 +560,8 @@ SUBROUTINE CHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                       = A - W(k)*1/D(k)*W(k)**T
 *
                      D11 = ONE / REAL( A( K, K ) )
-                     CALL CHER( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL CHER( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
 *
 *                    Store U(k) in column k
 *
@@ -579,7 +580,8 @@ SUBROUTINE CHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                       = A - W(k)*(1/D(k))*W(k)**T
 *                       = A - (W(k)/D(k))*(D(k))*(W(k)/D(K))**T
 *
-                     CALL CHER( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL CHER( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
                   END IF
 *
 *                 Store the superdiagonal element of D in array E
@@ -752,14 +754,16 @@ SUBROUTINE CHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                 Determine both ROWMAX and JMAX.
 *
                   IF( IMAX.NE.K ) THEN
-                     JMAX = K - 1 + ICAMAX( IMAX-K, A( IMAX, K ), LDA )
+                     JMAX = K - 1 + ICAMAX( IMAX-K, A( IMAX, K ),
+     $                                      LDA )
                      ROWMAX = CABS1( A( IMAX, JMAX ) )
                   ELSE
                      ROWMAX = ZERO
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + ICAMAX( N-IMAX, A( IMAX+1, IMAX ),
+                     ITEMP = IMAX + ICAMAX( N-IMAX, A( IMAX+1,
+     $                                      IMAX ),
      $                                     1 )
                      STEMP = CABS1( A( ITEMP, IMAX ) )
                      IF( STEMP.GT.ROWMAX ) THEN
@@ -834,7 +838,7 @@ SUBROUTINE CHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
                   A( J, K ) = CONJG( A( P, J ) )
                   A( P, J ) = T
    44          CONTINUE
-*              (3) Swap and conjugate corner elements at row-col interserction
+*              (3) Swap and conjugate corner elements at row-col intersection
                A( P, K ) = CONJG( A( P, K ) )
 *              (4) Swap diagonal elements at row-col intersection
                R1 = REAL( A( K, K ) )
@@ -855,14 +859,15 @@ SUBROUTINE CHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
             IF( KP.NE.KK ) THEN
 *              (1) Swap columnar parts
                IF( KP.LT.N )
-     $            CALL CSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL CSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
 *              (2) Swap and conjugate middle parts
                DO 45 J = KK + 1, KP - 1
                   T = CONJG( A( J, KK ) )
                   A( J, KK ) = CONJG( A( KP, J ) )
                   A( KP, J ) = T
    45          CONTINUE
-*              (3) Swap and conjugate corner elements at row-col interserction
+*              (3) Swap and conjugate corner elements at row-col intersection
                A( KP, KK ) = CONJG( A( KP, KK ) )
 *              (4) Swap diagonal elements at row-col intersection
                R1 = REAL( A( KK, KK ) )
diff --git a/SRC/chetf2_rook.f b/SRC/chetf2_rook.f
index ee4eaf68f2..1f49b604b0 100644
--- a/SRC/chetf2_rook.f
+++ b/SRC/chetf2_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETF2_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetf2_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetf2_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -129,7 +127,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetf2_rook
 *
 *> \par Further Details:
 *  =====================
@@ -191,6 +189,7 @@
 *
 *  =====================================================================
       SUBROUTINE CHETF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -420,7 +419,7 @@ SUBROUTINE CHETF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
                   A( J, K ) = CONJG( A( P, J ) )
                   A( P, J ) = T
    14          CONTINUE
-*              (3) Swap and conjugate corner elements at row-col interserction
+*              (3) Swap and conjugate corner elements at row-col intersection
                A( P, K ) = CONJG( A( P, K ) )
 *              (4) Swap diagonal elements at row-col intersection
                R1 = REAL( A( K, K ) )
@@ -441,7 +440,7 @@ SUBROUTINE CHETF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
                   A( J, KK ) = CONJG( A( KP, J ) )
                   A( KP, J ) = T
    15          CONTINUE
-*              (3) Swap and conjugate corner elements at row-col interserction
+*              (3) Swap and conjugate corner elements at row-col intersection
                A( KP, KK ) = CONJG( A( KP, KK ) )
 *              (4) Swap diagonal elements at row-col intersection
                R1 = REAL( A( KK, KK ) )
@@ -485,7 +484,8 @@ SUBROUTINE CHETF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                       = A - W(k)*1/D(k)*W(k)**T
 *
                      D11 = ONE / REAL( A( K, K ) )
-                     CALL CHER( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL CHER( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
 *
 *                    Store U(k) in column k
 *
@@ -504,7 +504,8 @@ SUBROUTINE CHETF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                       = A - W(k)*(1/D(k))*W(k)**T
 *                       = A - (W(k)/D(k))*(D(k))*(W(k)/D(K))**T
 *
-                     CALL CHER( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL CHER( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
                   END IF
                END IF
 *
@@ -651,14 +652,16 @@ SUBROUTINE CHETF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                 Determine both ROWMAX and JMAX.
 *
                   IF( IMAX.NE.K ) THEN
-                     JMAX = K - 1 + ICAMAX( IMAX-K, A( IMAX, K ), LDA )
+                     JMAX = K - 1 + ICAMAX( IMAX-K, A( IMAX, K ),
+     $                                      LDA )
                      ROWMAX = CABS1( A( IMAX, JMAX ) )
                   ELSE
                      ROWMAX = ZERO
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + ICAMAX( N-IMAX, A( IMAX+1, IMAX ),
+                     ITEMP = IMAX + ICAMAX( N-IMAX, A( IMAX+1,
+     $                                      IMAX ),
      $                                     1 )
                      STEMP = CABS1( A( ITEMP, IMAX ) )
                      IF( STEMP.GT.ROWMAX ) THEN
@@ -733,7 +736,7 @@ SUBROUTINE CHETF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
                   A( J, K ) = CONJG( A( P, J ) )
                   A( P, J ) = T
    44          CONTINUE
-*              (3) Swap and conjugate corner elements at row-col interserction
+*              (3) Swap and conjugate corner elements at row-col intersection
                A( P, K ) = CONJG( A( P, K ) )
 *              (4) Swap diagonal elements at row-col intersection
                R1 = REAL( A( K, K ) )
@@ -747,14 +750,15 @@ SUBROUTINE CHETF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
             IF( KP.NE.KK ) THEN
 *              (1) Swap columnar parts
                IF( KP.LT.N )
-     $            CALL CSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL CSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
 *              (2) Swap and conjugate middle parts
                DO 45 J = KK + 1, KP - 1
                   T = CONJG( A( J, KK ) )
                   A( J, KK ) = CONJG( A( KP, J ) )
                   A( KP, J ) = T
    45          CONTINUE
-*              (3) Swap and conjugate corner elements at row-col interserction
+*              (3) Swap and conjugate corner elements at row-col intersection
                A( KP, KK ) = CONJG( A( KP, KK ) )
 *              (4) Swap diagonal elements at row-col intersection
                R1 = REAL( A( KK, KK ) )
diff --git a/SRC/chetrd.f b/SRC/chetrd.f
index 52b9a895a9..11f272db07 100644
--- a/SRC/chetrd.f
+++ b/SRC/chetrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -139,7 +137,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetrd
 *
 *> \par Further Details:
 *  =====================
@@ -188,7 +186,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CHETRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
+      SUBROUTINE CHETRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -225,7 +225,8 @@ SUBROUTINE CHETRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -249,8 +250,8 @@ SUBROUTINE CHETRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
 *        Determine the block size.
 *
          NB = ILAENV( 1, 'CHETRD', UPLO, N, -1, -1, -1 )
-         LWKOPT = N*NB
-         WORK( 1 ) = LWKOPT
+         LWKOPT = MAX( 1, N*NB )
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -367,7 +368,7 @@ SUBROUTINE CHETRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
      $                TAU( I ), IINFO )
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of CHETRD
diff --git a/SRC/chetrd_2stage.f b/SRC/chetrd_2stage.f
index f5ad35f277..a201a6435f 100644
--- a/SRC/chetrd_2stage.f
+++ b/SRC/chetrd_2stage.f
@@ -4,23 +4,21 @@
 *
 *  =========== DOCUMENTATION ===========
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
-*
-*> \htmlonly
-*> Download CHETRD_2STAGE + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetrd_2stage.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/chetrd_2stage.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetrd_2stage.f"> 
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download CHETRD_2STAGE + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetrd_2stage.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/chetrd_2stage.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetrd_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE CHETRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU, 
+*       SUBROUTINE CHETRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
 *                                 HOUS2, LHOUS2, WORK, LWORK, INFO )
 *
 *       IMPLICIT NONE
@@ -34,7 +32,7 @@
 *       COMPLEX            A( LDA, * ), TAU( * ),
 *                          HOUS2( * ), WORK( * )
 *       ..
-*  
+*
 *
 *> \par Purpose:
 *  =============
@@ -52,11 +50,11 @@
 *> \param[in] VECT
 *> \verbatim
 *>          VECT is CHARACTER*1
-*>          = 'N':  No need for the Housholder representation, 
+*>          = 'N':  No need for the Housholder representation,
 *>                  in particular for the second stage (Band to
 *>                  tridiagonal) and thus LHOUS2 is of size max(1, 4*N);
-*>          = 'V':  the Householder representation is needed to 
-*>                  either generate Q1 Q2 or to apply Q1 Q2, 
+*>          = 'V':  the Householder representation is needed to
+*>                  either generate Q1 Q2 or to apply Q1 Q2,
 *>                  then LHOUS2 is to be queried and computed.
 *>                  (NOT AVAILABLE IN THIS RELEASE).
 *> \endverbatim
@@ -86,7 +84,7 @@
 *>          triangular part of A is not referenced.
 *>          On exit, if UPLO = 'U', the band superdiagonal
 *>          of A are overwritten by the corresponding elements of the
-*>          internal band-diagonal matrix AB, and the elements above 
+*>          internal band-diagonal matrix AB, and the elements above
 *>          the KD superdiagonal, with the array TAU, represent the unitary
 *>          matrix Q1 as a product of elementary reflectors; if UPLO
 *>          = 'L', the diagonal and band subdiagonal of A are over-
@@ -117,13 +115,13 @@
 *> \param[out] TAU
 *> \verbatim
 *>          TAU is COMPLEX array, dimension (N-KD)
-*>          The scalar factors of the elementary reflectors of 
+*>          The scalar factors of the elementary reflectors of
 *>          the first stage (see Further Details).
 *> \endverbatim
 *>
 *> \param[out] HOUS2
 *> \verbatim
-*>          HOUS2 is COMPLEX array, dimension (LHOUS2)
+*>          HOUS2 is COMPLEX array, dimension (MAX(1,LHOUS2))
 *>          Stores the Householder representation of the stage2
 *>          band to tridiagonal.
 *> \endverbatim
@@ -132,6 +130,8 @@
 *> \verbatim
 *>          LHOUS2 is INTEGER
 *>          The dimension of the array HOUS2.
+*>          LHOUS2 >= 1.
+*>
 *>          If LWORK = -1, or LHOUS2=-1,
 *>          then a query is assumed; the routine
 *>          only calculates the optimal size of the HOUS2 array, returns
@@ -143,13 +143,16 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX array, dimension (LWORK)
+*>          WORK is COMPLEX array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK = MAX(1, dimension)
+*>          The dimension of the array WORK.
+*>          If N = 0, LWORK >= 1, else LWORK = MAX(1, dimension).
+*>
 *>          If LWORK = -1, or LHOUS2 = -1,
 *>          then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -157,9 +160,9 @@
 *>          message related to LWORK is issued by XERBLA.
 *>          LWORK = MAX(1, dimension) where
 *>          dimension   = max(stage1,stage2) + (KD+1)*N
-*>                      = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                        + max(2*KD*KD, KD*NTHREADS) 
-*>                        + (KD+1)*N 
+*>                      = N*KD + N*max(KD+1,FACTOPTNB)
+*>                        + max(2*KD*KD, KD*NTHREADS)
+*>                        + (KD+1)*N
 *>          where KD is the blocking size of the reduction,
 *>          FACTOPTNB is the blocking used by the QR or LQ
 *>          algorithm, usually FACTOPTNB=128 is a good choice
@@ -177,12 +180,12 @@
 *  Authors:
 *  ========
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetrd_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -202,7 +205,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -210,16 +213,16 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CHETRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU, 
+      SUBROUTINE CHETRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
      $                          HOUS2, LHOUS2, WORK, LWORK, INFO )
 *
       IMPLICIT NONE
@@ -250,7 +253,8 @@ SUBROUTINE CHETRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV2STAGE
-      EXTERNAL           LSAME, ILAENV2STAGE
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV2STAGE, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -263,12 +267,19 @@ SUBROUTINE CHETRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
 *
 *     Determine the block size, the workspace size and the hous size.
 *
-      KD     = ILAENV2STAGE( 1, 'CHETRD_2STAGE', VECT, N, -1, -1, -1 )
-      IB     = ILAENV2STAGE( 2, 'CHETRD_2STAGE', VECT, N, KD, -1, -1 )
-      LHMIN  = ILAENV2STAGE( 3, 'CHETRD_2STAGE', VECT, N, KD, IB, -1 )
-      LWMIN  = ILAENV2STAGE( 4, 'CHETRD_2STAGE', VECT, N, KD, IB, -1 )
-*      WRITE(*,*),'CHETRD_2STAGE N KD UPLO LHMIN LWMIN ',N, KD, UPLO,
-*     $            LHMIN, LWMIN
+      KD     = ILAENV2STAGE( 1, 'CHETRD_2STAGE', VECT, N, -1, -1,
+     $                       -1 )
+      IB     = ILAENV2STAGE( 2, 'CHETRD_2STAGE', VECT, N, KD, -1,
+     $                       -1 )
+      IF( N.EQ.0 ) THEN
+         LHMIN = 1
+         LWMIN = 1
+      ELSE
+         LHMIN = ILAENV2STAGE( 3, 'CHETRD_2STAGE', VECT, N, KD,
+     $                         IB, -1 )
+         LWMIN = ILAENV2STAGE( 4, 'CHETRD_2STAGE', VECT, N, KD,
+     $                         IB, -1 )
+      END IF
 *
       IF( .NOT.LSAME( VECT, 'N' ) ) THEN
          INFO = -1
@@ -285,8 +296,8 @@ SUBROUTINE CHETRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         HOUS2( 1 ) = LHMIN
-         WORK( 1 )  = LWMIN
+         HOUS2( 1 ) = SROUNDUP_LWORK( LHMIN )
+         WORK( 1 )  = SROUNDUP_LWORK( LWMIN )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -309,14 +320,14 @@ SUBROUTINE CHETRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
       LWRK  = LWORK-LDAB*N
       ABPOS = 1
       WPOS  = ABPOS + LDAB*N
-      CALL CHETRD_HE2HB( UPLO, N, KD, A, LDA, WORK( ABPOS ), LDAB, 
+      CALL CHETRD_HE2HB( UPLO, N, KD, A, LDA, WORK( ABPOS ), LDAB,
      $                   TAU, WORK( WPOS ), LWRK, INFO )
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'CHETRD_HE2HB', -INFO )
          RETURN
       END IF
-      CALL CHETRD_HB2ST( 'Y', VECT, UPLO, N, KD, 
-     $                   WORK( ABPOS ), LDAB, D, E, 
+      CALL CHETRD_HB2ST( 'Y', VECT, UPLO, N, KD,
+     $                   WORK( ABPOS ), LDAB, D, E,
      $                   HOUS2, LHOUS2, WORK( WPOS ), LWRK, INFO )
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'CHETRD_HB2ST', -INFO )
@@ -324,8 +335,7 @@ SUBROUTINE CHETRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
       END IF
 *
 *
-      HOUS2( 1 ) = LHMIN
-      WORK( 1 )  = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       RETURN
 *
 *     End of CHETRD_2STAGE
diff --git a/SRC/chetrd_hb2st.F b/SRC/chetrd_hb2st.F
index e047ab7208..293e9b06d3 100644
--- a/SRC/chetrd_hb2st.F
+++ b/SRC/chetrd_hb2st.F
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRD_HB2ST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetrd_hb2st.f">
 *> [TGZ]</a>
@@ -13,12 +12,11 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetrd_hb2st.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB, 
+*       SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *                               D, E, HOUS, LHOUS, WORK, LWORK, INFO )
 *
 *       #if defined(_OPENMP)
@@ -53,12 +51,12 @@
 *> \param[in] STAGE1
 *> \verbatim
 *>          STAGE1 is CHARACTER*1
-*>          = 'N':  "No": to mention that the stage 1 of the reduction  
+*>          = 'N':  "No": to mention that the stage 1 of the reduction
 *>                  from dense to band using the chetrd_he2hb routine
-*>                  was not called before this routine to reproduce AB. 
-*>                  In other term this routine is called as standalone. 
-*>          = 'Y':  "Yes": to mention that the stage 1 of the 
-*>                  reduction from dense to band using the chetrd_he2hb 
+*>                  was not called before this routine to reproduce AB.
+*>                  In other term this routine is called as standalone.
+*>          = 'Y':  "Yes": to mention that the stage 1 of the
+*>                  reduction from dense to band using the chetrd_he2hb
 *>                  routine has been called to produce AB (e.g., AB is
 *>                  the output of chetrd_he2hb.
 *> \endverbatim
@@ -66,10 +64,10 @@
 *> \param[in] VECT
 *> \verbatim
 *>          VECT is CHARACTER*1
-*>          = 'N':  No need for the Housholder representation, 
+*>          = 'N':  No need for the Housholder representation,
 *>                  and thus LHOUS is of size max(1, 4*N);
-*>          = 'V':  the Householder representation is needed to 
-*>                  either generate or to apply Q later on, 
+*>          = 'V':  the Householder representation is needed to
+*>                  either generate or to apply Q later on,
 *>                  then LHOUS is to be queried and computed.
 *>                  (NOT AVAILABLE IN THIS RELEASE).
 *> \endverbatim
@@ -132,34 +130,39 @@
 *>
 *> \param[out] HOUS
 *> \verbatim
-*>          HOUS is COMPLEX array, dimension LHOUS, that
-*>          store the Householder representation.
+*>          HOUS is COMPLEX array, dimension (MAX(1,LHOUS))
+*>          Stores the Householder representation.
 *> \endverbatim
 *>
 *> \param[in] LHOUS
 *> \verbatim
 *>          LHOUS is INTEGER
-*>          The dimension of the array HOUS. LHOUS = MAX(1, dimension)
-*>          If LWORK = -1, or LHOUS=-1,
+*>          The dimension of the array HOUS.
+*>          If N = 0 or KD <= 1, LHOUS >= 1, else LHOUS = MAX(1, dimension).
+*>
+*>          If LWORK = -1, or LHOUS = -1,
 *>          then a query is assumed; the routine
 *>          only calculates the optimal size of the HOUS array, returns
 *>          this value as the first entry of the HOUS array, and no error
 *>          message related to LHOUS is issued by XERBLA.
 *>          LHOUS = MAX(1, dimension) where
 *>          dimension = 4*N if VECT='N'
-*>          not available now if VECT='H'     
+*>          not available now if VECT='H'
 *> \endverbatim
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX array, dimension LWORK.
+*>          WORK is COMPLEX array, dimension (MAX(1,LWORK)).
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK = MAX(1, dimension)
-*>          If LWORK = -1, or LHOUS=-1,
+*>          The dimension of the array WORK.
+*>          If N = 0 or KD <= 1, LWORK >= 1, else LWORK = MAX(1, dimension).
+*>
+*>          If LWORK = -1, or LHOUS = -1,
 *>          then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
@@ -188,7 +191,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hetrd_hb2st
 *
 *> \par Further Details:
 *  =====================
@@ -208,7 +211,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -216,16 +219,16 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB, 
+      SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
      $                         D, E, HOUS, LHOUS, WORK, LWORK, INFO )
 *
 *
@@ -259,33 +262,34 @@ SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, WANTQ, UPPER, AFTERS1
-      INTEGER            I, M, K, IB, SWEEPID, MYID, SHIFT, STT, ST, 
+      INTEGER            I, M, K, IB, SWEEPID, MYID, SHIFT, STT, ST,
      $                   ED, STIND, EDIND, BLKLASTIND, COLPT, THED,
      $                   STEPERCOL, GRSIZ, THGRSIZ, THGRNB, THGRID,
-     $                   NBTILES, TTYPE, TID, NTHREADS, DEBUG,
-     $                   ABDPOS, ABOFDPOS, DPOS, OFDPOS, AWPOS, 
+     $                   NBTILES, TTYPE, TID, NTHREADS,
+     $                   ABDPOS, ABOFDPOS, DPOS, OFDPOS, AWPOS,
      $                   INDA, INDW, APOS, SIZEA, LDA, INDV, INDTAU,
      $                   SICEV, SIZETAU, LDV, LHMIN, LWMIN
       REAL               ABSTMP
       COMPLEX            TMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHB2ST_KERNELS, CLACPY, CLASET, XERBLA
+      EXTERNAL           CHB2ST_KERNELS, CLACPY,
+     $                   CLASET, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MIN, MAX, CEILING, REAL
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      INTEGER            ILAENV2STAGE 
-      EXTERNAL           LSAME, ILAENV2STAGE
+      INTEGER            ILAENV2STAGE
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV2STAGE, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
 *     Determine the minimal workspace size required.
 *     Test the input parameters
 *
-      DEBUG   = 0
       INFO    = 0
       AFTERS1 = LSAME( STAGE1, 'Y' )
       WANTQ   = LSAME( VECT, 'V' )
@@ -294,9 +298,17 @@ SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *
 *     Determine the block size, the workspace size and the hous size.
 *
-      IB     = ILAENV2STAGE( 2, 'CHETRD_HB2ST', VECT, N, KD, -1, -1 )
-      LHMIN  = ILAENV2STAGE( 3, 'CHETRD_HB2ST', VECT, N, KD, IB, -1 )
-      LWMIN  = ILAENV2STAGE( 4, 'CHETRD_HB2ST', VECT, N, KD, IB, -1 )
+      IB       = ILAENV2STAGE( 2, 'CHETRD_HB2ST', VECT, N, KD,
+     $                         -1, -1 )
+      IF( N.EQ.0 .OR. KD.LE.1 ) THEN
+         LHMIN = 1
+         LWMIN = 1
+      ELSE
+         LHMIN = ILAENV2STAGE( 3, 'CHETRD_HB2ST', VECT, N, KD, IB,
+     $                         -1 )
+         LWMIN = ILAENV2STAGE( 4, 'CHETRD_HB2ST', VECT, N, KD, IB,
+     $                         -1 )
+      END IF
 *
       IF( .NOT.AFTERS1 .AND. .NOT.LSAME( STAGE1, 'N' ) ) THEN
          INFO = -1
@@ -317,8 +329,8 @@ SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         HOUS( 1 ) = LHMIN
-         WORK( 1 ) = LWMIN
+         HOUS( 1 ) = SROUNDUP_LWORK( LHMIN )
+         WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -358,7 +370,7 @@ SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
           ABDPOS   = KD + 1
           ABOFDPOS = KD
       ELSE
-          APOS     = INDA 
+          APOS     = INDA
           AWPOS    = INDA + KD + 1
           DPOS     = APOS
           OFDPOS   = DPOS + 1
@@ -366,11 +378,11 @@ SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
           ABOFDPOS = 2
 
       ENDIF
-*      
-*     Case KD=0: 
-*     The matrix is diagonal. We just copy it (convert to "real" for 
-*     complex because D is double and the imaginary part should be 0) 
-*     and store it in D. A sequential code here is better or 
+*
+*     Case KD=0:
+*     The matrix is diagonal. We just copy it (convert to "real" for
+*     complex because D is double and the imaginary part should be 0)
+*     and store it in D. A sequential code here is better or
 *     in a parallel environment it might need two cores for D and E
 *
       IF( KD.EQ.0 ) THEN
@@ -385,17 +397,17 @@ SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
           WORK( 1 ) = 1
           RETURN
       END IF
-*      
-*     Case KD=1: 
-*     The matrix is already Tridiagonal. We have to make diagonal 
+*
+*     Case KD=1:
+*     The matrix is already Tridiagonal. We have to make diagonal
 *     and offdiagonal elements real, and store them in D and E.
-*     For that, for real precision just copy the diag and offdiag 
-*     to D and E while for the COMPLEX case the bulge chasing is  
-*     performed to convert the hermetian tridiagonal to symmetric 
-*     tridiagonal. A simpler conversion formula might be used, but then 
+*     For that, for real precision just copy the diag and offdiag
+*     to D and E while for the COMPLEX case the bulge chasing is
+*     performed to convert the hermetian tridiagonal to symmetric
+*     tridiagonal. A simpler conversion formula might be used, but then
 *     updating the Q matrix will be required and based if Q is generated
-*     or not this might complicate the story. 
-*      
+*     or not this might complicate the story.
+*
       IF( KD.EQ.1 ) THEN
           DO 50 I = 1, N
               D( I ) = REAL( AB( ABDPOS, I ) )
@@ -444,7 +456,7 @@ SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
           RETURN
       END IF
 *
-*     Main code start here. 
+*     Main code start here.
 *     Reduce the hermitian band of A to a tridiagonal matrix.
 *
       THGRSIZ   = N
@@ -453,7 +465,7 @@ SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
       NBTILES   = CEILING( REAL(N)/REAL(KD) )
       STEPERCOL = CEILING( REAL(SHIFT)/REAL(GRSIZ) )
       THGRNB    = CEILING( REAL(N-1)/REAL(THGRSIZ) )
-*      
+*
       CALL CLACPY( "A", KD+1, N, AB, LDAB, WORK( APOS ), LDA )
       CALL CLASET( "A", KD,   N, ZERO, ZERO, WORK( AWPOS ), LDA )
 *
@@ -462,7 +474,7 @@ SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *
 #if defined(_OPENMP)
 !$OMP PARALLEL PRIVATE( TID, THGRID, BLKLASTIND )
-!$OMP$         PRIVATE( THED, I, M, K, ST, ED, STT, SWEEPID ) 
+!$OMP$         PRIVATE( THED, I, M, K, ST, ED, STT, SWEEPID )
 !$OMP$         PRIVATE( MYID, TTYPE, COLPT, STIND, EDIND )
 !$OMP$         SHARED ( UPLO, WANTQ, INDV, INDTAU, HOUS, WORK)
 !$OMP$         SHARED ( N, KD, IB, NBTILES, LDA, LDV, INDA )
@@ -471,7 +483,7 @@ SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 #endif
 *
 *     main bulge chasing loop
-*      
+*
       DO 100 THGRID = 1, THGRNB
           STT  = (THGRID-1)*THGRSIZ+1
           THED = MIN( (STT + THGRSIZ -1), (N-1))
@@ -482,7 +494,7 @@ SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
                   ST = STT
                   DO 130 SWEEPID = ST, ED
                       DO 140 K = 1, GRSIZ
-                          MYID  = (I-SWEEPID)*(STEPERCOL*GRSIZ) 
+                          MYID  = (I-SWEEPID)*(STEPERCOL*GRSIZ)
      $                           + (M-1)*GRSIZ + K
                           IF ( MYID.EQ.1 ) THEN
                               TTYPE = 1
@@ -508,16 +520,17 @@ SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
                           ENDIF
 *
 *                         Call the kernel
-*                             
+*
 #if defined(_OPENMP) && _OPENMP >= 201307
-                          IF( TTYPE.NE.1 ) THEN      
+                          IF( TTYPE.NE.1 ) THEN
 !$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1))
 !$OMP$     DEPEND(in:WORK(MYID-1))
 !$OMP$     DEPEND(out:WORK(MYID))
                               TID      = OMP_GET_THREAD_NUM()
-                              CALL CHB2ST_KERNELS( UPLO, WANTQ, TTYPE, 
+                              CALL CHB2ST_KERNELS(
+     $                             UPLO, WANTQ, TTYPE,
      $                             STIND, EDIND, SWEEPID, N, KD, IB,
-     $                             WORK ( INDA ), LDA, 
+     $                             WORK ( INDA ), LDA,
      $                             HOUS( INDV ), HOUS( INDTAU ), LDV,
      $                             WORK( INDW + TID*KD ) )
 !$OMP END TASK
@@ -525,20 +538,22 @@ SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 !$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1))
 !$OMP$     DEPEND(out:WORK(MYID))
                               TID      = OMP_GET_THREAD_NUM()
-                              CALL CHB2ST_KERNELS( UPLO, WANTQ, TTYPE, 
+                              CALL CHB2ST_KERNELS(
+     $                             UPLO, WANTQ, TTYPE,
      $                             STIND, EDIND, SWEEPID, N, KD, IB,
-     $                             WORK ( INDA ), LDA, 
+     $                             WORK ( INDA ), LDA,
      $                             HOUS( INDV ), HOUS( INDTAU ), LDV,
      $                             WORK( INDW + TID*KD ) )
 !$OMP END TASK
                           ENDIF
 #else
-                          CALL CHB2ST_KERNELS( UPLO, WANTQ, TTYPE, 
+                          CALL CHB2ST_KERNELS(
+     $                         UPLO, WANTQ, TTYPE,
      $                         STIND, EDIND, SWEEPID, N, KD, IB,
-     $                         WORK ( INDA ), LDA, 
+     $                         WORK ( INDA ), LDA,
      $                         HOUS( INDV ), HOUS( INDTAU ), LDV,
-     $                         WORK( INDW + TID*KD ) )
-#endif 
+     $                         WORK( INDW ) )
+#endif
                           IF ( BLKLASTIND.GE.(N-1) ) THEN
                               STT = STT + 1
                               EXIT
@@ -553,14 +568,14 @@ SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 !$OMP END MASTER
 !$OMP END PARALLEL
 #endif
-*      
+*
 *     Copy the diagonal from A to D. Note that D is REAL thus only
 *     the Real part is needed, the imaginary part should be zero.
 *
       DO 150 I = 1, N
           D( I ) = REAL( WORK( DPOS+(I-1)*LDA ) )
   150 CONTINUE
-*      
+*
 *     Copy the off diagonal from A to E. Note that E is REAL thus only
 *     the Real part is needed, the imaginary part should be zero.
 *
@@ -574,11 +589,10 @@ SUBROUTINE CHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
   170     CONTINUE
       ENDIF
 *
-      HOUS( 1 ) = LHMIN
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       RETURN
 *
 *     End of CHETRD_HB2ST
 *
       END
-      
+
diff --git a/SRC/chetrd_he2hb.f b/SRC/chetrd_he2hb.f
index 904555c10e..ac6c3213d3 100644
--- a/SRC/chetrd_he2hb.f
+++ b/SRC/chetrd_he2hb.f
@@ -7,7 +7,6 @@
 * Online html documentation available at 
 *            http://www.netlib.org/lapack/explore-html/ 
 *
-*> \htmlonly
 *> Download CHETRD_HE2HB + dependencies 
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetrd_he2hb.f"> 
 *> [TGZ]</a> 
@@ -15,7 +14,6 @@
 *> [ZIP]</a> 
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetrd_he2hb.f"> 
 *> [TXT]</a>
-*> \endhtmlonly 
 *
 *  Definition:
 *  ===========
@@ -123,8 +121,8 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX array, dimension (LWORK)
-*>          On exit, if INFO = 0, or if LWORK=-1, 
+*>          WORK is COMPLEX array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, or if LWORK = -1,
 *>          WORK(1) returns the size of LWORK.
 *> \endverbatim
 *>
@@ -132,7 +130,9 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK which should be calculated
-*>          by a workspace query. LWORK = MAX(1, LWORK_QUERY)
+*>          by a workspace query.
+*>          If N <= KD+1, LWORK >= 1, else LWORK = MAX(1, LWORK_QUERY).
+*>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
@@ -158,7 +158,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetrd_he2hb
 *
 *> \par Further Details:
 *  =====================
@@ -274,7 +274,8 @@ SUBROUTINE CHETRD_HE2HB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
      $                   TPOS, WPOS, S2POS, S1POS
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, CHER2K, CHEMM, CGEMM, CCOPY,
+      EXTERNAL           XERBLA, CHER2K, CHEMM, CGEMM,
+     $                   CCOPY,
      $                   CLARFT, CGELQF, CGEQRF, CLASET
 *     ..
 *     .. Intrinsic Functions ..
@@ -283,7 +284,8 @@ SUBROUTINE CHETRD_HE2HB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV2STAGE 
-      EXTERNAL           LSAME, ILAENV2STAGE
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV2STAGE, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -293,8 +295,12 @@ SUBROUTINE CHETRD_HE2HB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
       INFO   = 0
       UPPER  = LSAME( UPLO, 'U' )
       LQUERY = ( LWORK.EQ.-1 )
-      LWMIN  = ILAENV2STAGE( 4, 'CHETRD_HE2HB', '', N, KD, -1, -1 )
-      
+      IF( N.LE.KD+1 ) THEN
+         LWMIN = 1
+      ELSE
+         LWMIN = ILAENV2STAGE( 4, 'CHETRD_HE2HB', '', N, KD, -1, -1 )
+      END IF
+*
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
@@ -313,7 +319,7 @@ SUBROUTINE CHETRD_HE2HB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
          CALL XERBLA( 'CHETRD_HE2HB', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
-         WORK( 1 ) = LWMIN
+         WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
          RETURN
       END IF
 *
@@ -378,7 +384,8 @@ SUBROUTINE CHETRD_HE2HB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
 *        
              DO 20 J = I, I+PK-1
                 LK = MIN( KD, N-J ) + 1
-                CALL CCOPY( LK, A( J, J ), LDA, AB( KD+1, J ), LDAB-1 )
+                CALL CCOPY( LK, A( J, J ), LDA, AB( KD+1, J ),
+     $                      LDAB-1 )
    20        CONTINUE
 *                
              CALL CLASET( 'Lower', PK, PK, ZERO, ONE, 
@@ -506,7 +513,7 @@ SUBROUTINE CHETRD_HE2HB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
 
       END IF
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       RETURN
 *
 *     End of CHETRD_HE2HB
diff --git a/SRC/chetrf.f b/SRC/chetrf.f
index 484e762562..8388d1e9e7 100644
--- a/SRC/chetrf.f
+++ b/SRC/chetrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK.  LWORK >=1.  For best performance
+*>          The length of WORK. LWORK >= 1. For best performance
 *>          LWORK >= N*NB, where NB is the block size returned by ILAENV.
 *> \endverbatim
 *>
@@ -130,7 +128,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetrf
 *
 *> \par Further Details:
 *  =====================
@@ -174,6 +172,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CHETRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -197,7 +196,8 @@ SUBROUTINE CHETRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CHETF2, CLAHEF, XERBLA
@@ -227,8 +227,8 @@ SUBROUTINE CHETRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *        Determine the block size
 *
          NB = ILAENV( 1, 'CHETRF', UPLO, N, -1, -1, -1 )
-         LWKOPT = N*NB
-         WORK( 1 ) = LWKOPT
+         LWKOPT = MAX( 1, N*NB )
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -244,7 +244,8 @@ SUBROUTINE CHETRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
          IWS = LDWORK*NB
          IF( LWORK.LT.IWS ) THEN
             NB = MAX( LWORK / LDWORK, 1 )
-            NBMIN = MAX( 2, ILAENV( 2, 'CHETRF', UPLO, N, -1, -1, -1 ) )
+            NBMIN = MAX( 2, ILAENV( 2, 'CHETRF', UPLO, N, -1, -1,
+     $                   -1 ) )
          END IF
       ELSE
          IWS = 1
@@ -273,7 +274,8 @@ SUBROUTINE CHETRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *           Factorize columns k-kb+1:k of A and use blocked code to
 *           update columns 1:k-kb
 *
-            CALL CLAHEF( UPLO, K, NB, KB, A, LDA, IPIV, WORK, N, IINFO )
+            CALL CLAHEF( UPLO, K, NB, KB, A, LDA, IPIV, WORK, N,
+     $                   IINFO )
          ELSE
 *
 *           Use unblocked code to factorize columns 1:k of A
@@ -313,13 +315,15 @@ SUBROUTINE CHETRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *           Factorize columns k:k+kb-1 of A and use blocked code to
 *           update columns k+kb:n
 *
-            CALL CLAHEF( UPLO, N-K+1, NB, KB, A( K, K ), LDA, IPIV( K ),
+            CALL CLAHEF( UPLO, N-K+1, NB, KB, A( K, K ), LDA,
+     $                   IPIV( K ),
      $                   WORK, N, IINFO )
          ELSE
 *
 *           Use unblocked code to factorize columns k:n of A
 *
-            CALL CHETF2( UPLO, N-K+1, A( K, K ), LDA, IPIV( K ), IINFO )
+            CALL CHETF2( UPLO, N-K+1, A( K, K ), LDA, IPIV( K ),
+     $                   IINFO )
             KB = N - K + 1
          END IF
 *
@@ -346,7 +350,7 @@ SUBROUTINE CHETRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
       END IF
 *
    40 CONTINUE
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       RETURN
 *
 *     End of CHETRF
diff --git a/SRC/chetrf_aa.f b/SRC/chetrf_aa.f
index 54567b8cdf..2ebf2e5c79 100644
--- a/SRC/chetrf_aa.f
+++ b/SRC/chetrf_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRF_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetrf_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetrf_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -74,7 +72,7 @@
 *>
 *>          On exit, the tridiagonal matrix is stored in the diagonals
 *>          and the subdiagonals of A just below (or above) the diagonals,
-*>          and L is stored below (or above) the subdiaonals, when UPLO
+*>          and L is stored below (or above) the subdiagonals, when UPLO
 *>          is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -101,8 +99,10 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK.  LWORK >= 2*N. For optimum performance
-*>          LWORK >= N*(1+NB), where NB is the optimal blocksize.
+*>          The length of WORK.
+*>          LWORK >= 1, if N <= 1, and LWORK >= 2*N, otherwise.
+*>          For optimum performance LWORK >= N*(1+NB), where NB is
+*>          the optimal blocksize, returned by ILAENV.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -125,10 +125,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetrf_aa
 *
 *  =====================================================================
-      SUBROUTINE CHETRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
+      SUBROUTINE CHETRF_AA( UPLO, N, A, LDA, IPIV,
+     $                      WORK, LWORK, INFO )
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -152,17 +153,19 @@ SUBROUTINE CHETRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
 *
 *     .. Local Scalars ..
       LOGICAL      LQUERY, UPPER
-      INTEGER      J, LWKOPT
+      INTEGER      J, LWKMIN, LWKOPT
       INTEGER      NB, MJ, NJ, K1, K2, J1, J2, J3, JB
       COMPLEX      ALPHA
 *     ..
 *     .. External Functions ..
       LOGICAL      LSAME
       INTEGER      ILAENV
-      EXTERNAL     LSAME, ILAENV
+      REAL         SROUNDUP_LWORK
+      EXTERNAL     LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL     CLAHEF_AA, CGEMM, CCOPY, CSWAP, CSCAL, XERBLA
+      EXTERNAL     CLAHEF_AA, CGEMM, CCOPY, CSWAP, CSCAL,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC    REAL, CONJG, MAX
@@ -178,19 +181,26 @@ SUBROUTINE CHETRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
       INFO = 0
       UPPER = LSAME( UPLO, 'U' )
       LQUERY = ( LWORK.EQ.-1 )
+      IF( N.LE.1 ) THEN
+         LWKMIN = 1
+         LWKOPT = 1
+      ELSE
+         LWKMIN = 2*N
+         LWKOPT = (NB+1)*N
+      END IF
+*
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.( 2*N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -7
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         LWKOPT = (NB+1)*N
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -202,11 +212,11 @@ SUBROUTINE CHETRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
 *
 *     Quick return
 *
-      IF ( N.EQ.0 ) THEN
+      IF( N.EQ.0 ) THEN
           RETURN
       ENDIF
       IPIV( 1 ) = 1
-      IF ( N.EQ.1 ) THEN
+      IF( N.EQ.1 ) THEN
          A( 1, 1 ) = REAL( A( 1, 1 ) )
          RETURN
       END IF
@@ -429,7 +439,8 @@ SUBROUTINE CHETRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
 *
                   J3 = J2
                   DO MJ = NJ-1, 1, -1
-                     CALL CGEMM( 'No transpose', 'Conjugate transpose',
+                     CALL CGEMM( 'No transpose',
+     $                           'Conjugate transpose',
      $                           MJ, 1, JB+1,
      $                          -ONE, WORK( (J3-J1+1)+K1*N ), N,
      $                                A( J3, J1-K2 ), LDA,
@@ -459,7 +470,7 @@ SUBROUTINE CHETRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
       END IF
 *
    20 CONTINUE
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       RETURN
 *
 *     End of CHETRF_AA
diff --git a/SRC/chetrf_aa_2stage.f b/SRC/chetrf_aa_2stage.f
index 20a9859e8e..8d4880b7d3 100644
--- a/SRC/chetrf_aa_2stage.f
+++ b/SRC/chetrf_aa_2stage.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRF_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetrf_aa_2stage.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetrf_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -75,7 +73,7 @@
 *>          triangular part of the matrix A, and the strictly upper
 *>          triangular part of A is not referenced.
 *>
-*>          On exit, L is stored below (or above) the subdiaonal blocks,
+*>          On exit, L is stored below (or above) the subdiagonal blocks,
 *>          when UPLO  is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -87,14 +85,14 @@
 *>
 *> \param[out] TB
 *> \verbatim
-*>          TB is COMPLEX array, dimension (LTB)
+*>          TB is COMPLEX array, dimension (MAX(1,LTB))
 *>          On exit, details of the LU factorization of the band matrix.
 *> \endverbatim
 *>
 *> \param[in] LTB
 *> \verbatim
 *>          LTB is INTEGER
-*>          The size of the array TB. LTB >= 4*N, internally
+*>          The size of the array TB. LTB >= MAX(1,4*N), internally
 *>          used to select NB such that LTB >= (3*NB+1)*N.
 *>
 *>          If LTB = -1, then a workspace query is assumed; the
@@ -121,14 +119,14 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX workspace of size LWORK
+*>          WORK is COMPLEX workspace of size (MAX(1,LWORK))
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The size of WORK. LWORK >= N, internally used to select NB
-*>          such that LWORK >= N*NB.
+*>          The size of WORK. LWORK >= MAX(1,N), internally used
+*>          to select NB such that LWORK >= N*NB.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal size of the WORK array,
@@ -152,7 +150,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetrf_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE CHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
@@ -188,7 +186,8 @@ SUBROUTINE CHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
       
 *     ..
 *     .. External Subroutines ..
@@ -213,9 +212,9 @@ SUBROUTINE CHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -4
-      ELSE IF ( LTB .LT. 4*N .AND. .NOT.TQUERY ) THEN
+      ELSE IF( LTB.LT.MAX( 1, 4*N ) .AND. .NOT.TQUERY ) THEN
          INFO = -6
-      ELSE IF ( LWORK .LT. N .AND. .NOT.WQUERY ) THEN
+      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.WQUERY ) THEN
          INFO = -10
       END IF
 *
@@ -229,10 +228,10 @@ SUBROUTINE CHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
       NB = ILAENV( 1, 'CHETRF_AA_2STAGE', UPLO, N, -1, -1, -1 )
       IF( INFO.EQ.0 ) THEN
          IF( TQUERY ) THEN
-            TB( 1 ) = (3*NB+1)*N
+            TB( 1 ) = SROUNDUP_LWORK( MAX( 1, (3*NB+1)*N ) )
          END IF
          IF( WQUERY ) THEN
-            WORK( 1 ) = N*NB
+            WORK( 1 ) = SROUNDUP_LWORK( MAX( 1, N*NB ) )
          END IF
       END IF
       IF( TQUERY .OR. WQUERY ) THEN
@@ -241,7 +240,7 @@ SUBROUTINE CHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
 *
 *     Quick return
 *
-      IF ( N.EQ.0 ) THEN
+      IF( N.EQ.0 ) THEN
          RETURN
       ENDIF
 *
@@ -269,7 +268,7 @@ SUBROUTINE CHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
 *
 *     Save NB
 *
-      TB( 1 ) = NB
+      TB( 1 ) = CMPLX( NB )
 *
       IF( UPPER ) THEN
 *
@@ -560,13 +559,15 @@ SUBROUTINE CHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
 *                 Compute H(J,J)
 *
                   IF( J.EQ.1 ) THEN
-                     CALL CGEMM( 'NoTranspose', 'Conjugate transpose',
+                     CALL CGEMM( 'NoTranspose',
+     $                           'Conjugate transpose',
      $                       KB, KB, KB,
      $                       ONE,  TB( TD+1 + (J*NB)*LDTB ), LDTB-1,
      $                             A( J*NB+1, (J-1)*NB+1 ), LDA,
      $                       ZERO, WORK( J*NB+1 ), N )
                   ELSE
-                     CALL CGEMM( 'NoTranspose', 'Conjugate transpose',
+                     CALL CGEMM( 'NoTranspose',
+     $                           'Conjugate transpose',
      $                      KB, KB, NB+KB,
      $                      ONE, TB( TD+NB+1 + ((J-1)*NB)*LDTB ),
      $                         LDTB-1,
diff --git a/SRC/chetrf_rk.f b/SRC/chetrf_rk.f
index 3f60f43705..4776f6e346 100644
--- a/SRC/chetrf_rk.f
+++ b/SRC/chetrf_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRF_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetrf_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetrf_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -177,14 +175,14 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX array, dimension ( MAX(1,LWORK) ).
+*>          WORK is COMPLEX array, dimension (MAX(1,LWORK)).
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK.  LWORK >=1.  For best performance
+*>          The length of WORK.  LWORK >= 1.  For best performance
 *>          LWORK >= N*NB, where NB is the block size returned
 *>          by ILAENV.
 *>
@@ -229,7 +227,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetrf_rk
 *
 *> \par Further Details:
 *  =====================
@@ -256,6 +254,7 @@
 *  =====================================================================
       SUBROUTINE CHETRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
      $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -280,7 +279,8 @@ SUBROUTINE CHETRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CLAHEF_RK, CHETF2_RK, CSWAP, XERBLA
@@ -310,8 +310,8 @@ SUBROUTINE CHETRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *        Determine the block size
 *
          NB = ILAENV( 1, 'CHETRF_RK', UPLO, N, -1, -1, -1 )
-         LWKOPT = N*NB
-         WORK( 1 ) = LWKOPT
+         LWKOPT = MAX( 1, N*NB )
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -425,7 +425,8 @@ SUBROUTINE CHETRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *           Factorize columns k:k+kb-1 of A and use blocked code to
 *           update columns k+kb:n
 *
-            CALL CLAHEF_RK( UPLO, N-K+1, NB, KB, A( K, K ), LDA, E( K ),
+            CALL CLAHEF_RK( UPLO, N-K+1, NB, KB, A( K, K ), LDA,
+     $                      E( K ),
      $                        IPIV( K ), WORK, LDWORK, IINFO )
 
 
@@ -487,7 +488,7 @@ SUBROUTINE CHETRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       RETURN
 *
 *     End of CHETRF_RK
diff --git a/SRC/chetrf_rook.f b/SRC/chetrf_rook.f
index 805e0f4cbd..5ddbaa2e47 100644
--- a/SRC/chetrf_rook.f
+++ b/SRC/chetrf_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRF_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetrf_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetrf_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,7 +120,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK.  LWORK >=1.  For best performance
+*>          The length of WORK.  LWORK >= 1.  For best performance
 *>          LWORK >= N*NB, where NB is the block size returned by ILAENV.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
@@ -150,7 +148,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetrf_rook
 *
 *> \par Further Details:
 *  =====================
@@ -208,7 +206,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE CHETRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      SUBROUTINE CHETRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK,
+     $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -232,7 +232,8 @@ SUBROUTINE CHETRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CLAHEF_ROOK, CHETF2_ROOK, XERBLA
@@ -263,7 +264,7 @@ SUBROUTINE CHETRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *
          NB = ILAENV( 1, 'CHETRF_ROOK', UPLO, N, -1, -1, -1 )
          LWKOPT = MAX( 1, N*NB )
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -386,7 +387,7 @@ SUBROUTINE CHETRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
       END IF
 *
    40 CONTINUE
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       RETURN
 *
 *     End of CHETRF_ROOK
diff --git a/SRC/chetri.f b/SRC/chetri.f
index 7a38a25b8b..9e8baaab87 100644
--- a/SRC/chetri.f
+++ b/SRC/chetri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetri
 *
 *  =====================================================================
       SUBROUTINE CHETRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,7 +222,8 @@ SUBROUTINE CHETRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
                CALL CCOPY( K-1, A( 1, K ), 1, WORK, 1 )
                CALL CHEMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, ZERO,
      $                     A( 1, K ), 1 )
-               A( K, K ) = A( K, K ) - REAL( CDOTC( K-1, WORK, 1, A( 1,
+               A( K, K ) = A( K, K ) - REAL( CDOTC( K-1, WORK, 1,
+     $            A( 1,
      $                     K ), 1 ) )
             END IF
             KSTEP = 1
@@ -248,15 +248,18 @@ SUBROUTINE CHETRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
                CALL CCOPY( K-1, A( 1, K ), 1, WORK, 1 )
                CALL CHEMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, ZERO,
      $                     A( 1, K ), 1 )
-               A( K, K ) = A( K, K ) - REAL( CDOTC( K-1, WORK, 1, A( 1,
+               A( K, K ) = A( K, K ) - REAL( CDOTC( K-1, WORK, 1,
+     $            A( 1,
      $                     K ), 1 ) )
                A( K, K+1 ) = A( K, K+1 ) -
-     $                       CDOTC( K-1, A( 1, K ), 1, A( 1, K+1 ), 1 )
+     $                       CDOTC( K-1, A( 1, K ), 1, A( 1, K+1 ),
+     $                              1 )
                CALL CCOPY( K-1, A( 1, K+1 ), 1, WORK, 1 )
                CALL CHEMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, ZERO,
      $                     A( 1, K+1 ), 1 )
                A( K+1, K+1 ) = A( K+1, K+1 ) -
-     $                         REAL( CDOTC( K-1, WORK, 1, A( 1, K+1 ),
+     $                         REAL( CDOTC( K-1, WORK, 1, A( 1,
+     $                               K+1 ),
      $                         1 ) )
             END IF
             KSTEP = 2
@@ -316,7 +319,8 @@ SUBROUTINE CHETRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL CCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL CHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA, WORK,
+               CALL CHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA,
+     $                     WORK,
      $                     1, ZERO, A( K+1, K ), 1 )
                A( K, K ) = A( K, K ) - REAL( CDOTC( N-K, WORK, 1,
      $                     A( K+1, K ), 1 ) )
@@ -341,18 +345,22 @@ SUBROUTINE CHETRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL CCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL CHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA, WORK,
+               CALL CHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA,
+     $                     WORK,
      $                     1, ZERO, A( K+1, K ), 1 )
                A( K, K ) = A( K, K ) - REAL( CDOTC( N-K, WORK, 1,
      $                     A( K+1, K ), 1 ) )
                A( K, K-1 ) = A( K, K-1 ) -
-     $                       CDOTC( N-K, A( K+1, K ), 1, A( K+1, K-1 ),
+     $                       CDOTC( N-K, A( K+1, K ), 1, A( K+1,
+     $                              K-1 ),
      $                       1 )
                CALL CCOPY( N-K, A( K+1, K-1 ), 1, WORK, 1 )
-               CALL CHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA, WORK,
+               CALL CHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA,
+     $                     WORK,
      $                     1, ZERO, A( K+1, K-1 ), 1 )
                A( K-1, K-1 ) = A( K-1, K-1 ) -
-     $                         REAL( CDOTC( N-K, WORK, 1, A( K+1, K-1 ),
+     $                         REAL( CDOTC( N-K, WORK, 1, A( K+1,
+     $                               K-1 ),
      $                         1 ) )
             END IF
             KSTEP = 2
diff --git a/SRC/chetri2.f b/SRC/chetri2.f
index 2865a6440f..36ceeb8e78 100644
--- a/SRC/chetri2.f
+++ b/SRC/chetri2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRI2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetri2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetri2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,16 +86,16 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX array, dimension (N+NB+1)*(NB+3)
+*>          WORK is COMPLEX array, dimension (MAX(1,LWORK))
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK.
-*>          WORK is size >= (N+NB+1)*(NB+3)
+*>          If N = 0, LWORK >= 1, else LWORK >= (N+NB+1)*(NB+3).
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>           calculates:
+*>          calculates:
 *>              - the optimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array,
 *>              - and no error message related to LWORK is issued by XERBLA.
@@ -120,10 +118,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetri2
 *
 *  =====================================================================
       SUBROUTINE CHETRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -147,7 +146,8 @@ SUBROUTINE CHETRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CHETRI2X, CHETRI, XERBLA
@@ -159,9 +159,13 @@ SUBROUTINE CHETRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
       INFO = 0
       UPPER = LSAME( UPLO, 'U' )
       LQUERY = ( LWORK.EQ.-1 )
+*
 *     Get blocksize
+*
       NBMAX = ILAENV( 1, 'CHETRF', UPLO, N, -1, -1, -1 )
-      IF ( NBMAX .GE. N ) THEN
+      IF( N.EQ.0 ) THEN
+         MINSIZE = 1
+      ELSE IF( NBMAX.GE.N ) THEN
          MINSIZE = N
       ELSE
          MINSIZE = (N+NBMAX+1)*(NBMAX+3)
@@ -173,28 +177,29 @@ SUBROUTINE CHETRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -4
-      ELSE IF (LWORK .LT. MINSIZE .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.MINSIZE .AND. .NOT.LQUERY ) THEN
          INFO = -7
       END IF
-*
-*     Quick return if possible
-*
 *
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'CHETRI2', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
-         WORK(1)=MINSIZE
+         WORK( 1 ) = SROUNDUP_LWORK( MINSIZE )
          RETURN
       END IF
+*
+*     Quick return if possible
+*
       IF( N.EQ.0 )
      $   RETURN
 
-      IF( NBMAX .GE. N ) THEN
+      IF( NBMAX.GE.N ) THEN
          CALL CHETRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
       ELSE
          CALL CHETRI2X( UPLO, N, A, LDA, IPIV, WORK, NBMAX, INFO )
       END IF
+*
       RETURN
 *
 *     End of CHETRI2
diff --git a/SRC/chetri2x.f b/SRC/chetri2x.f
index 0cfaf2861c..cc5bc8bdc9 100644
--- a/SRC/chetri2x.f
+++ b/SRC/chetri2x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRI2X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetri2x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetri2x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,10 +111,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetri2x
 *
 *  =====================================================================
       SUBROUTINE CHETRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -384,8 +383,10 @@ SUBROUTINE CHETRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
             DO WHILE ( I .LE. N )
                IF( IPIV(I) .GT. 0 ) THEN
                   IP=IPIV(I)
-                 IF (I .LT. IP) CALL CHESWAPR( UPLO, N, A, LDA, I ,IP )
-                 IF (I .GT. IP) CALL CHESWAPR( UPLO, N, A, LDA, IP ,I )
+                 IF (I .LT. IP) CALL CHESWAPR( UPLO, N, A, LDA, I ,
+     $                IP )
+                 IF (I .GT. IP) CALL CHESWAPR( UPLO, N, A, LDA, IP ,
+     $                I )
                ELSE
                  IP=-IPIV(I)
                  I=I+1
@@ -567,12 +568,16 @@ SUBROUTINE CHETRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
             DO WHILE ( I .GE. 1 )
                IF( IPIV(I) .GT. 0 ) THEN
                   IP=IPIV(I)
-                 IF (I .LT. IP) CALL CHESWAPR( UPLO, N, A, LDA, I ,IP  )
-                 IF (I .GT. IP) CALL CHESWAPR( UPLO, N, A, LDA, IP ,I )
+                 IF (I .LT. IP) CALL CHESWAPR( UPLO, N, A, LDA, I ,
+     $                IP  )
+                 IF (I .GT. IP) CALL CHESWAPR( UPLO, N, A, LDA, IP ,
+     $                I )
                ELSE
                  IP=-IPIV(I)
-                 IF ( I .LT. IP) CALL CHESWAPR( UPLO, N, A, LDA, I ,IP )
-                 IF ( I .GT. IP) CALL CHESWAPR( UPLO, N, A, LDA, IP ,I )
+                 IF ( I .LT. IP) CALL CHESWAPR( UPLO, N, A, LDA, I ,
+     $                IP )
+                 IF ( I .GT. IP) CALL CHESWAPR( UPLO, N, A, LDA, IP ,
+     $                I )
                  I=I-1
                ENDIF
                I=I-1
diff --git a/SRC/chetri_3.f b/SRC/chetri_3.f
index cc2318b22f..15732d6f15 100644
--- a/SRC/chetri_3.f
+++ b/SRC/chetri_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRI_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetri_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetri_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,16 +117,17 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX array, dimension (N+NB+1)*(NB+3).
+*>          WORK is COMPLEX array, dimension (MAX(1,LWORK)).
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK. LWORK >= (N+NB+1)*(NB+3).
+*>          The length of WORK.
+*>          If N = 0, LWORK >= 1, else LWORK >= (N+NB+1)*(NB+3).
 *>
-*>          If LDWORK = -1, then a workspace query is assumed;
+*>          If LWORK = -1, then a workspace query is assumed;
 *>          the routine only calculates the optimal size of the optimal
 *>          size of the WORK array, returns this value as the first
 *>          entry of the WORK array, and no error message related to
@@ -152,7 +151,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetri_3
 *
 *> \par Contributors:
 *  ==================
@@ -167,6 +166,7 @@
 *  =====================================================================
       SUBROUTINE CHETRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
      $                     INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,7 +190,8 @@ SUBROUTINE CHETRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CHETRI_3X, XERBLA
@@ -208,8 +209,13 @@ SUBROUTINE CHETRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *
 *     Determine the block size
 *
-      NB = MAX( 1, ILAENV( 1, 'CHETRI_3', UPLO, N, -1, -1, -1 ) )
-      LWKOPT = ( N+NB+1 ) * ( NB+3 )
+      IF( N.EQ.0 ) THEN
+         LWKOPT = 1
+      ELSE
+         NB = MAX( 1, ILAENV( 1, 'CHETRI_3', UPLO, N, -1, -1, -1 ) )
+         LWKOPT = ( N+NB+1 ) * ( NB+3 )
+      END IF
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
@@ -217,7 +223,7 @@ SUBROUTINE CHETRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -4
-      ELSE IF ( LWORK .LT. LWKOPT .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKOPT .AND. .NOT.LQUERY ) THEN
          INFO = -8
       END IF
 *
@@ -225,7 +231,6 @@ SUBROUTINE CHETRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
          CALL XERBLA( 'CHETRI_3', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
-         WORK( 1 ) = LWKOPT
          RETURN
       END IF
 *
@@ -236,7 +241,7 @@ SUBROUTINE CHETRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *
       CALL CHETRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       RETURN
 *
diff --git a/SRC/chetri_3x.f b/SRC/chetri_3x.f
index 0a6083bef4..15b5fab8fd 100644
--- a/SRC/chetri_3x.f
+++ b/SRC/chetri_3x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRI_3X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetri_3x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetri_3x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -142,7 +140,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetri_3x
 *
 *> \par Contributors:
 *  ==================
@@ -155,7 +153,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE CHETRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
+      SUBROUTINE CHETRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB,
+     $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -191,7 +191,8 @@ SUBROUTINE CHETRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMM, CHESWAPR, CTRTRI, CTRMM, XERBLA
+      EXTERNAL           CGEMM, CHESWAPR, CTRTRI, CTRMM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, CONJG, MAX, REAL
@@ -436,8 +437,10 @@ SUBROUTINE CHETRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
          DO I = 1, N
              IP = ABS( IPIV( I ) )
              IF( IP.NE.I ) THEN
-                IF (I .LT. IP) CALL CHESWAPR( UPLO, N, A, LDA, I ,IP )
-                IF (I .GT. IP) CALL CHESWAPR( UPLO, N, A, LDA, IP ,I )
+                IF (I .LT. IP) CALL CHESWAPR( UPLO, N, A, LDA, I ,
+     $               IP )
+                IF (I .GT. IP) CALL CHESWAPR( UPLO, N, A, LDA, IP ,
+     $               I )
              END IF
          END DO
 *
@@ -632,8 +635,10 @@ SUBROUTINE CHETRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
          DO I = N, 1, -1
              IP = ABS( IPIV( I ) )
              IF( IP.NE.I ) THEN
-                IF (I .LT. IP) CALL CHESWAPR( UPLO, N, A, LDA, I ,IP )
-                IF (I .GT. IP) CALL CHESWAPR( UPLO, N, A, LDA, IP ,I )
+                IF (I .LT. IP) CALL CHESWAPR( UPLO, N, A, LDA, I ,
+     $               IP )
+                IF (I .GT. IP) CALL CHESWAPR( UPLO, N, A, LDA, IP ,
+     $               I )
              END IF
          END DO
 *
diff --git a/SRC/chetri_rook.f b/SRC/chetri_rook.f
index 8090a576c7..dfa7d69801 100644
--- a/SRC/chetri_rook.f
+++ b/SRC/chetri_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRI_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetri_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetri_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetri_rook
 *
 *> \par Contributors:
 *  ==================
@@ -125,6 +123,7 @@
 *
 *  =====================================================================
       SUBROUTINE CHETRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -237,7 +236,8 @@ SUBROUTINE CHETRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
                CALL CCOPY( K-1, A( 1, K ), 1, WORK, 1 )
                CALL CHEMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, CZERO,
      $                     A( 1, K ), 1 )
-               A( K, K ) = A( K, K ) - REAL( CDOTC( K-1, WORK, 1, A( 1,
+               A( K, K ) = A( K, K ) - REAL( CDOTC( K-1, WORK, 1,
+     $            A( 1,
      $                     K ), 1 ) )
             END IF
             KSTEP = 1
@@ -262,15 +262,18 @@ SUBROUTINE CHETRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
                CALL CCOPY( K-1, A( 1, K ), 1, WORK, 1 )
                CALL CHEMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, CZERO,
      $                     A( 1, K ), 1 )
-               A( K, K ) = A( K, K ) - REAL( CDOTC( K-1, WORK, 1, A( 1,
+               A( K, K ) = A( K, K ) - REAL( CDOTC( K-1, WORK, 1,
+     $            A( 1,
      $                     K ), 1 ) )
                A( K, K+1 ) = A( K, K+1 ) -
-     $                       CDOTC( K-1, A( 1, K ), 1, A( 1, K+1 ), 1 )
+     $                       CDOTC( K-1, A( 1, K ), 1, A( 1, K+1 ),
+     $                              1 )
                CALL CCOPY( K-1, A( 1, K+1 ), 1, WORK, 1 )
                CALL CHEMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, CZERO,
      $                     A( 1, K+1 ), 1 )
                A( K+1, K+1 ) = A( K+1, K+1 ) -
-     $                         REAL( CDOTC( K-1, WORK, 1, A( 1, K+1 ),
+     $                         REAL( CDOTC( K-1, WORK, 1, A( 1,
+     $                               K+1 ),
      $                         1 ) )
             END IF
             KSTEP = 2
@@ -383,7 +386,8 @@ SUBROUTINE CHETRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL CCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL CHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA, WORK,
+               CALL CHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA,
+     $                     WORK,
      $                     1, CZERO, A( K+1, K ), 1 )
                A( K, K ) = A( K, K ) - REAL( CDOTC( N-K, WORK, 1,
      $                     A( K+1, K ), 1 ) )
@@ -408,18 +412,22 @@ SUBROUTINE CHETRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL CCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL CHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA, WORK,
+               CALL CHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA,
+     $                     WORK,
      $                     1, CZERO, A( K+1, K ), 1 )
                A( K, K ) = A( K, K ) - REAL( CDOTC( N-K, WORK, 1,
      $                     A( K+1, K ), 1 ) )
                A( K, K-1 ) = A( K, K-1 ) -
-     $                       CDOTC( N-K, A( K+1, K ), 1, A( K+1, K-1 ),
+     $                       CDOTC( N-K, A( K+1, K ), 1, A( K+1,
+     $                              K-1 ),
      $                       1 )
                CALL CCOPY( N-K, A( K+1, K-1 ), 1, WORK, 1 )
-               CALL CHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA, WORK,
+               CALL CHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA,
+     $                     WORK,
      $                     1, CZERO, A( K+1, K-1 ), 1 )
                A( K-1, K-1 ) = A( K-1, K-1 ) -
-     $                         REAL( CDOTC( N-K, WORK, 1, A( K+1, K-1 ),
+     $                         REAL( CDOTC( N-K, WORK, 1, A( K+1,
+     $                               K-1 ),
      $                         1 ) )
             END IF
             KSTEP = 2
@@ -434,7 +442,8 @@ SUBROUTINE CHETRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
 *
                IF( KP.LT.N )
-     $            CALL CSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
+     $            CALL CSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
 *
                DO 90 J = K + 1, KP - 1
                   TEMP = CONJG( A( J, K ) )
@@ -459,7 +468,8 @@ SUBROUTINE CHETRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
 *
                IF( KP.LT.N )
-     $            CALL CSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
+     $            CALL CSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
 *
                DO 100 J = K + 1, KP - 1
                   TEMP = CONJG( A( J, K ) )
@@ -485,7 +495,8 @@ SUBROUTINE CHETRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
 *
                IF( KP.LT.N )
-     $            CALL CSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
+     $            CALL CSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
 *
                DO 110 J = K + 1, KP - 1
                   TEMP = CONJG( A( J, K ) )
diff --git a/SRC/chetrs.f b/SRC/chetrs.f
index 4dc97cd309..444ad11c0c 100644
--- a/SRC/chetrs.f
+++ b/SRC/chetrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,10 +111,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetrs
 *
 *  =====================================================================
       SUBROUTINE CHETRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -148,7 +147,8 @@ SUBROUTINE CHETRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMV, CGERU, CLACGV, CSSCAL, CSWAP, XERBLA
+      EXTERNAL           CGEMV, CGERU, CLACGV, CSSCAL, CSWAP,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CONJG, MAX, REAL
@@ -208,7 +208,8 @@ SUBROUTINE CHETRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           Multiply by inv(U(K)), where U(K) is the transformation
 *           stored in column K of A.
 *
-            CALL CGERU( K-1, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ), LDB,
+            CALL CGERU( K-1, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ),
+     $                  LDB,
      $                  B( 1, 1 ), LDB )
 *
 *           Multiply by the inverse of the diagonal block.
@@ -229,7 +230,8 @@ SUBROUTINE CHETRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           Multiply by inv(U(K)), where U(K) is the transformation
 *           stored in columns K-1 and K of A.
 *
-            CALL CGERU( K-2, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ), LDB,
+            CALL CGERU( K-2, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ),
+     $                  LDB,
      $                  B( 1, 1 ), LDB )
             CALL CGERU( K-2, NRHS, -ONE, A( 1, K-1 ), 1, B( K-1, 1 ),
      $                  LDB, B( 1, 1 ), LDB )
@@ -346,7 +348,8 @@ SUBROUTINE CHETRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           stored in column K of A.
 *
             IF( K.LT.N )
-     $         CALL CGERU( N-K, NRHS, -ONE, A( K+1, K ), 1, B( K, 1 ),
+     $         CALL CGERU( N-K, NRHS, -ONE, A( K+1, K ), 1, B( K,
+     $                     1 ),
      $                     LDB, B( K+1, 1 ), LDB )
 *
 *           Multiply by the inverse of the diagonal block.
@@ -368,7 +371,8 @@ SUBROUTINE CHETRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL CGERU( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K, 1 ),
+               CALL CGERU( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K,
+     $                     1 ),
      $                     LDB, B( K+2, 1 ), LDB )
                CALL CGERU( N-K-1, NRHS, -ONE, A( K+2, K+1 ), 1,
      $                     B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
diff --git a/SRC/chetrs2.f b/SRC/chetrs2.f
index 07b6e025fe..64db0da356 100644
--- a/SRC/chetrs2.f
+++ b/SRC/chetrs2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetrs2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetrs2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,11 +117,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetrs2
 *
 *  =====================================================================
       SUBROUTINE CHETRS2( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
      $                    WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -155,7 +154,8 @@ SUBROUTINE CHETRS2( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CSSCAL, CSYCONV, CSWAP, CTRSM, XERBLA
+      EXTERNAL           CSSCAL, CSYCONV, CSWAP, CTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CONJG, MAX, REAL
diff --git a/SRC/chetrs_3.f b/SRC/chetrs_3.f
index f9c25bd565..1ccca5850c 100644
--- a/SRC/chetrs_3.f
+++ b/SRC/chetrs_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRS_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetrs_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetrs_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -142,7 +140,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetrs_3
 *
 *> \par Contributors:
 *  ==================
@@ -162,6 +160,7 @@
 *  =====================================================================
       SUBROUTINE CHETRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
      $                     INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -247,7 +246,8 @@ SUBROUTINE CHETRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (U \P**T * B) -> B    [ (U \P**T * B) ]
 *
-         CALL CTRSM( 'L', 'U', 'N', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL CTRSM( 'L', 'U', 'N', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        Compute D \ B -> B   [ D \ (U \P**T * B) ]
 *
@@ -274,7 +274,8 @@ SUBROUTINE CHETRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (U**H \ B) -> B   [ U**H \ (D \ (U \P**T * B) ) ]
 *
-         CALL CTRSM( 'L', 'U', 'C', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL CTRSM( 'L', 'U', 'C', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        P * B  [ P * (U**H \ (D \ (U \P**T * B) )) ]
 *
@@ -315,7 +316,8 @@ SUBROUTINE CHETRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (L \P**T * B) -> B    [ (L \P**T * B) ]
 *
-         CALL CTRSM( 'L', 'L', 'N', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL CTRSM( 'L', 'L', 'N', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        Compute D \ B -> B   [ D \ (L \P**T * B) ]
 *
@@ -342,7 +344,8 @@ SUBROUTINE CHETRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (L**H \ B) -> B   [ L**H \ (D \ (L \P**T * B) ) ]
 *
-         CALL CTRSM('L', 'L', 'C', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL CTRSM('L', 'L', 'C', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        P * B  [ P * (L**H \ (D \ (L \P**T * B) )) ]
 *
diff --git a/SRC/chetrs_aa.f b/SRC/chetrs_aa.f
index 2546adb2de..3f11bd52a5 100644
--- a/SRC/chetrs_aa.f
+++ b/SRC/chetrs_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRS_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetrs_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetrs_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -105,7 +103,13 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK >= max(1,3*N-2).
+*>          The dimension of the array WORK.
+*>          If MIN(N,NRHS) = 0, LWORK >= 1, else LWORK >= 3*N-2.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the minimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -123,7 +127,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetrs_aa
 *
 *  =====================================================================
       SUBROUTINE CHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
@@ -151,23 +155,31 @@ SUBROUTINE CHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, UPPER
-      INTEGER            K, KP, LWKOPT
+      INTEGER            K, KP, LWKMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLACPY, CLACGV, CGTSV, CSWAP, CTRSM, XERBLA
+      EXTERNAL           CLACPY, CLACGV, CGTSV, CSWAP, CTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX
+      INTRINSIC          MIN, MAX
 *     ..
 *     .. Executable Statements ..
 *
       INFO = 0
       UPPER = LSAME( UPLO, 'U' )
       LQUERY = ( LWORK.EQ.-1 )
+      IF( MIN( N, NRHS ).EQ.0 ) THEN
+         LWKMIN = 1
+      ELSE
+         LWKMIN = 3*N-2
+      END IF
+*
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
@@ -178,21 +190,20 @@ SUBROUTINE CHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
          INFO = -5
       ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
          INFO = -8
-      ELSE IF( LWORK.LT.MAX( 1, 3*N-2 ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -10
       END IF
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'CHETRS_AA', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
-         LWKOPT = (3*N-2)
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK( LWKMIN )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( N.EQ.0 .OR. NRHS.EQ.0 )
+      IF( MIN( N, NRHS ).EQ.0 )
      $   RETURN
 *
       IF( UPPER ) THEN
@@ -215,7 +226,8 @@ SUBROUTINE CHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute U**H \ B -> B    [ (U**H \P**T * B) ]
 *
-            CALL CTRSM( 'L', 'U', 'C', 'U', N-1, NRHS, ONE, A( 1, 2 ),
+            CALL CTRSM( 'L', 'U', 'C', 'U', N-1, NRHS, ONE, A( 1,
+     $                  2 ),
      $                  LDA, B( 2, 1 ), LDB)
          END IF
 *
@@ -225,8 +237,10 @@ SUBROUTINE CHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
          CALL CLACPY( 'F', 1, N, A(1, 1), LDA+1, WORK(N), 1)
          IF( N.GT.1 ) THEN
-             CALL CLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 2*N ), 1)
-             CALL CLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 1 ), 1)
+             CALL CLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 2*N ),
+     $                    1)
+             CALL CLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 1 ),
+     $                    1)
              CALL CLACGV( N-1, WORK( 1 ), 1 )
          END IF
          CALL CGTSV(N, NRHS, WORK(1), WORK(N), WORK(2*N), B, LDB,
@@ -238,7 +252,8 @@ SUBROUTINE CHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute U \ B -> B   [ U \ (T \ (U**H \P**T * B) ) ]
 *
-            CALL CTRSM( 'L', 'U', 'N', 'U', N-1, NRHS, ONE, A( 1, 2 ),
+            CALL CTRSM( 'L', 'U', 'N', 'U', N-1, NRHS, ONE, A( 1,
+     $                  2 ),
      $                  LDA, B(2, 1), LDB)
 *
 *           Pivot, P * B  -> B [ P * (U \ (T \ (U**H \P**T * B) )) ]
@@ -282,8 +297,10 @@ SUBROUTINE CHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
          CALL CLACPY( 'F', 1, N, A(1, 1), LDA+1, WORK(N), 1)
          IF( N.GT.1 ) THEN
-             CALL CLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 1 ), 1 )
-             CALL CLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 2*N ), 1)
+             CALL CLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 1 ),
+     $                    1 )
+             CALL CLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 2*N ),
+     $                    1)
              CALL CLACGV( N-1, WORK( 2*N ), 1 )
          END IF
          CALL CGTSV(N, NRHS, WORK(1), WORK(N), WORK(2*N), B, LDB,
@@ -295,7 +312,8 @@ SUBROUTINE CHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute (L**H \ B) -> B   [ L**H \ (T \ (L \P**T * B) ) ]
 *
-            CALL CTRSM( 'L', 'L', 'C', 'U', N-1, NRHS, ONE, A( 2, 1 ),
+            CALL CTRSM( 'L', 'L', 'C', 'U', N-1, NRHS, ONE, A( 2,
+     $                  1 ),
      $                  LDA, B( 2, 1 ), LDB )
 *
 *           Pivot, P * B -> B  [ P * (L**H \ (T \ (L \P**T * B) )) ]
diff --git a/SRC/chetrs_aa_2stage.f b/SRC/chetrs_aa_2stage.f
index 41cd3e289d..6503012c0a 100644
--- a/SRC/chetrs_aa_2stage.f
+++ b/SRC/chetrs_aa_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRS_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetrs_aa_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetrs_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,7 +131,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetrs_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE CHETRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
@@ -217,7 +215,8 @@ SUBROUTINE CHETRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (U**T \ B) -> B    [ (U**T \P**T * B) ]
 *
-            CALL CTRSM( 'L', 'U', 'C', 'U', N-NB, NRHS, ONE, A(1, NB+1),
+            CALL CTRSM( 'L', 'U', 'C', 'U', N-NB, NRHS, ONE, A(1,
+     $                  NB+1),
      $                 LDA, B(NB+1, 1), LDB)
 *
          END IF
@@ -230,7 +229,8 @@ SUBROUTINE CHETRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (U \ B) -> B   [ U \ (T \ (U**T \P**T * B) ) ]
 *
-            CALL CTRSM( 'L', 'U', 'N', 'U', N-NB, NRHS, ONE, A(1, NB+1),
+            CALL CTRSM( 'L', 'U', 'N', 'U', N-NB, NRHS, ONE, A(1,
+     $                  NB+1),
      $                  LDA, B(NB+1, 1), LDB)
 *
 *           Pivot, P * B  [ P * (U \ (T \ (U**T \P**T * B) )) ]
@@ -251,7 +251,8 @@ SUBROUTINE CHETRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (L \P**T * B) -> B    [ (L \P**T * B) ]
 *
-            CALL CTRSM( 'L', 'L', 'N', 'U', N-NB, NRHS, ONE, A(NB+1, 1),
+            CALL CTRSM( 'L', 'L', 'N', 'U', N-NB, NRHS, ONE, A(NB+1,
+     $                  1),
      $                 LDA, B(NB+1, 1), LDB)
 *
          END IF
@@ -264,7 +265,8 @@ SUBROUTINE CHETRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (L**T \ B) -> B   [ L**T \ (T \ (L \P**T * B) ) ]
 *
-            CALL CTRSM( 'L', 'L', 'C', 'U', N-NB, NRHS, ONE, A(NB+1, 1),
+            CALL CTRSM( 'L', 'L', 'C', 'U', N-NB, NRHS, ONE, A(NB+1,
+     $                  1),
      $                  LDA, B(NB+1, 1), LDB)
 *
 *           Pivot, P * B  [ P * (L**T \ (T \ (L \P**T * B) )) ]
diff --git a/SRC/chetrs_rook.f b/SRC/chetrs_rook.f
index d80da9328e..bf766ccd3c 100644
--- a/SRC/chetrs_rook.f
+++ b/SRC/chetrs_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHETRS_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chetrs_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chetrs_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,7 +111,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup hetrs_rook
 *
 *> \par Contributors:
 *  ==================
@@ -133,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE CHETRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
      $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -164,7 +163,8 @@ SUBROUTINE CHETRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMV, CGERU, CLACGV, CSSCAL, CSWAP, XERBLA
+      EXTERNAL           CGEMV, CGERU, CLACGV, CSSCAL, CSWAP,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CONJG, MAX, REAL
@@ -224,7 +224,8 @@ SUBROUTINE CHETRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           Multiply by inv(U(K)), where U(K) is the transformation
 *           stored in column K of A.
 *
-            CALL CGERU( K-1, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ), LDB,
+            CALL CGERU( K-1, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ),
+     $                  LDB,
      $                  B( 1, 1 ), LDB )
 *
 *           Multiply by the inverse of the diagonal block.
@@ -249,7 +250,8 @@ SUBROUTINE CHETRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           Multiply by inv(U(K)), where U(K) is the transformation
 *           stored in columns K-1 and K of A.
 *
-            CALL CGERU( K-2, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ), LDB,
+            CALL CGERU( K-2, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ),
+     $                  LDB,
      $                  B( 1, 1 ), LDB )
             CALL CGERU( K-2, NRHS, -ONE, A( 1, K-1 ), 1, B( K-1, 1 ),
      $                  LDB, B( 1, 1 ), LDB )
@@ -371,7 +373,8 @@ SUBROUTINE CHETRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           stored in column K of A.
 *
             IF( K.LT.N )
-     $         CALL CGERU( N-K, NRHS, -ONE, A( K+1, K ), 1, B( K, 1 ),
+     $         CALL CGERU( N-K, NRHS, -ONE, A( K+1, K ), 1, B( K,
+     $                     1 ),
      $                     LDB, B( K+1, 1 ), LDB )
 *
 *           Multiply by the inverse of the diagonal block.
@@ -397,7 +400,8 @@ SUBROUTINE CHETRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL CGERU( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K, 1 ),
+               CALL CGERU( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K,
+     $                     1 ),
      $                     LDB, B( K+2, 1 ), LDB )
                CALL CGERU( N-K-1, NRHS, -ONE, A( K+2, K+1 ), 1,
      $                     B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
diff --git a/SRC/chfrk.f b/SRC/chfrk.f
index 7aa2343ed0..a20cfd225f 100644
--- a/SRC/chfrk.f
+++ b/SRC/chfrk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHFRK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chfrk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chfrk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,11 +158,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hfrk
 *
 *  =====================================================================
-      SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
+      SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA,
+     $                  BETA,
      $                  C )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -291,9 +291,11 @@ SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL CHERK( 'L', 'N', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 1 ), N )
-                  CALL CHERK( 'U', 'N', N2, K, ALPHA, A( N1+1, 1 ), LDA,
+                  CALL CHERK( 'U', 'N', N2, K, ALPHA, A( N1+1, 1 ),
+     $                        LDA,
      $                        BETA, C( N+1 ), N )
-                  CALL CGEMM( 'N', 'C', N2, N1, K, CALPHA, A( N1+1, 1 ),
+                  CALL CGEMM( 'N', 'C', N2, N1, K, CALPHA, A( N1+1,
+     $                        1 ),
      $                        LDA, A( 1, 1 ), LDA, CBETA, C( N1+1 ), N )
 *
                ELSE
@@ -302,9 +304,11 @@ SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL CHERK( 'L', 'C', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 1 ), N )
-                  CALL CHERK( 'U', 'C', N2, K, ALPHA, A( 1, N1+1 ), LDA,
+                  CALL CHERK( 'U', 'C', N2, K, ALPHA, A( 1, N1+1 ),
+     $                        LDA,
      $                        BETA, C( N+1 ), N )
-                  CALL CGEMM( 'C', 'N', N2, N1, K, CALPHA, A( 1, N1+1 ),
+                  CALL CGEMM( 'C', 'N', N2, N1, K, CALPHA, A( 1,
+     $                        N1+1 ),
      $                        LDA, A( 1, 1 ), LDA, CBETA, C( N1+1 ), N )
 *
                END IF
@@ -319,7 +323,8 @@ SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL CHERK( 'L', 'N', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( N2+1 ), N )
-                  CALL CHERK( 'U', 'N', N2, K, ALPHA, A( N2, 1 ), LDA,
+                  CALL CHERK( 'U', 'N', N2, K, ALPHA, A( N2, 1 ),
+     $                        LDA,
      $                        BETA, C( N1+1 ), N )
                   CALL CGEMM( 'N', 'C', N1, N2, K, CALPHA, A( 1, 1 ),
      $                        LDA, A( N2, 1 ), LDA, CBETA, C( 1 ), N )
@@ -330,7 +335,8 @@ SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL CHERK( 'L', 'C', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( N2+1 ), N )
-                  CALL CHERK( 'U', 'C', N2, K, ALPHA, A( 1, N2 ), LDA,
+                  CALL CHERK( 'U', 'C', N2, K, ALPHA, A( 1, N2 ),
+     $                        LDA,
      $                        BETA, C( N1+1 ), N )
                   CALL CGEMM( 'C', 'N', N1, N2, K, CALPHA, A( 1, 1 ),
      $                        LDA, A( 1, N2 ), LDA, CBETA, C( 1 ), N )
@@ -353,7 +359,8 @@ SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL CHERK( 'U', 'N', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 1 ), N1 )
-                  CALL CHERK( 'L', 'N', N2, K, ALPHA, A( N1+1, 1 ), LDA,
+                  CALL CHERK( 'L', 'N', N2, K, ALPHA, A( N1+1, 1 ),
+     $                        LDA,
      $                        BETA, C( 2 ), N1 )
                   CALL CGEMM( 'N', 'C', N1, N2, K, CALPHA, A( 1, 1 ),
      $                        LDA, A( N1+1, 1 ), LDA, CBETA,
@@ -365,7 +372,8 @@ SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL CHERK( 'U', 'C', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 1 ), N1 )
-                  CALL CHERK( 'L', 'C', N2, K, ALPHA, A( 1, N1+1 ), LDA,
+                  CALL CHERK( 'L', 'C', N2, K, ALPHA, A( 1, N1+1 ),
+     $                        LDA,
      $                        BETA, C( 2 ), N1 )
                   CALL CGEMM( 'C', 'N', N1, N2, K, CALPHA, A( 1, 1 ),
      $                        LDA, A( 1, N1+1 ), LDA, CBETA,
@@ -383,9 +391,11 @@ SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL CHERK( 'U', 'N', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( N2*N2+1 ), N2 )
-                  CALL CHERK( 'L', 'N', N2, K, ALPHA, A( N1+1, 1 ), LDA,
+                  CALL CHERK( 'L', 'N', N2, K, ALPHA, A( N1+1, 1 ),
+     $                        LDA,
      $                        BETA, C( N1*N2+1 ), N2 )
-                  CALL CGEMM( 'N', 'C', N2, N1, K, CALPHA, A( N1+1, 1 ),
+                  CALL CGEMM( 'N', 'C', N2, N1, K, CALPHA, A( N1+1,
+     $                        1 ),
      $                        LDA, A( 1, 1 ), LDA, CBETA, C( 1 ), N2 )
 *
                ELSE
@@ -394,9 +404,11 @@ SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL CHERK( 'U', 'C', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( N2*N2+1 ), N2 )
-                  CALL CHERK( 'L', 'C', N2, K, ALPHA, A( 1, N1+1 ), LDA,
+                  CALL CHERK( 'L', 'C', N2, K, ALPHA, A( 1, N1+1 ),
+     $                        LDA,
      $                        BETA, C( N1*N2+1 ), N2 )
-                  CALL CGEMM( 'C', 'N', N2, N1, K, CALPHA, A( 1, N1+1 ),
+                  CALL CGEMM( 'C', 'N', N2, N1, K, CALPHA, A( 1,
+     $                        N1+1 ),
      $                        LDA, A( 1, 1 ), LDA, CBETA, C( 1 ), N2 )
 *
                END IF
@@ -423,9 +435,11 @@ SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL CHERK( 'L', 'N', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 2 ), N+1 )
-                  CALL CHERK( 'U', 'N', NK, K, ALPHA, A( NK+1, 1 ), LDA,
+                  CALL CHERK( 'U', 'N', NK, K, ALPHA, A( NK+1, 1 ),
+     $                        LDA,
      $                        BETA, C( 1 ), N+1 )
-                  CALL CGEMM( 'N', 'C', NK, NK, K, CALPHA, A( NK+1, 1 ),
+                  CALL CGEMM( 'N', 'C', NK, NK, K, CALPHA, A( NK+1,
+     $                        1 ),
      $                        LDA, A( 1, 1 ), LDA, CBETA, C( NK+2 ),
      $                        N+1 )
 *
@@ -435,9 +449,11 @@ SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL CHERK( 'L', 'C', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 2 ), N+1 )
-                  CALL CHERK( 'U', 'C', NK, K, ALPHA, A( 1, NK+1 ), LDA,
+                  CALL CHERK( 'U', 'C', NK, K, ALPHA, A( 1, NK+1 ),
+     $                        LDA,
      $                        BETA, C( 1 ), N+1 )
-                  CALL CGEMM( 'C', 'N', NK, NK, K, CALPHA, A( 1, NK+1 ),
+                  CALL CGEMM( 'C', 'N', NK, NK, K, CALPHA, A( 1,
+     $                        NK+1 ),
      $                        LDA, A( 1, 1 ), LDA, CBETA, C( NK+2 ),
      $                        N+1 )
 *
@@ -453,7 +469,8 @@ SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL CHERK( 'L', 'N', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK+2 ), N+1 )
-                  CALL CHERK( 'U', 'N', NK, K, ALPHA, A( NK+1, 1 ), LDA,
+                  CALL CHERK( 'U', 'N', NK, K, ALPHA, A( NK+1, 1 ),
+     $                        LDA,
      $                        BETA, C( NK+1 ), N+1 )
                   CALL CGEMM( 'N', 'C', NK, NK, K, CALPHA, A( 1, 1 ),
      $                        LDA, A( NK+1, 1 ), LDA, CBETA, C( 1 ),
@@ -465,7 +482,8 @@ SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL CHERK( 'L', 'C', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK+2 ), N+1 )
-                  CALL CHERK( 'U', 'C', NK, K, ALPHA, A( 1, NK+1 ), LDA,
+                  CALL CHERK( 'U', 'C', NK, K, ALPHA, A( 1, NK+1 ),
+     $                        LDA,
      $                        BETA, C( NK+1 ), N+1 )
                   CALL CGEMM( 'C', 'N', NK, NK, K, CALPHA, A( 1, 1 ),
      $                        LDA, A( 1, NK+1 ), LDA, CBETA, C( 1 ),
@@ -489,7 +507,8 @@ SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL CHERK( 'U', 'N', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK+1 ), NK )
-                  CALL CHERK( 'L', 'N', NK, K, ALPHA, A( NK+1, 1 ), LDA,
+                  CALL CHERK( 'L', 'N', NK, K, ALPHA, A( NK+1, 1 ),
+     $                        LDA,
      $                        BETA, C( 1 ), NK )
                   CALL CGEMM( 'N', 'C', NK, NK, K, CALPHA, A( 1, 1 ),
      $                        LDA, A( NK+1, 1 ), LDA, CBETA,
@@ -501,7 +520,8 @@ SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL CHERK( 'U', 'C', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK+1 ), NK )
-                  CALL CHERK( 'L', 'C', NK, K, ALPHA, A( 1, NK+1 ), LDA,
+                  CALL CHERK( 'L', 'C', NK, K, ALPHA, A( 1, NK+1 ),
+     $                        LDA,
      $                        BETA, C( 1 ), NK )
                   CALL CGEMM( 'C', 'N', NK, NK, K, CALPHA, A( 1, 1 ),
      $                        LDA, A( 1, NK+1 ), LDA, CBETA,
@@ -519,9 +539,11 @@ SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL CHERK( 'U', 'N', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK*( NK+1 )+1 ), NK )
-                  CALL CHERK( 'L', 'N', NK, K, ALPHA, A( NK+1, 1 ), LDA,
+                  CALL CHERK( 'L', 'N', NK, K, ALPHA, A( NK+1, 1 ),
+     $                        LDA,
      $                        BETA, C( NK*NK+1 ), NK )
-                  CALL CGEMM( 'N', 'C', NK, NK, K, CALPHA, A( NK+1, 1 ),
+                  CALL CGEMM( 'N', 'C', NK, NK, K, CALPHA, A( NK+1,
+     $                        1 ),
      $                        LDA, A( 1, 1 ), LDA, CBETA, C( 1 ), NK )
 *
                ELSE
@@ -530,9 +552,11 @@ SUBROUTINE CHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL CHERK( 'U', 'C', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK*( NK+1 )+1 ), NK )
-                  CALL CHERK( 'L', 'C', NK, K, ALPHA, A( 1, NK+1 ), LDA,
+                  CALL CHERK( 'L', 'C', NK, K, ALPHA, A( 1, NK+1 ),
+     $                        LDA,
      $                        BETA, C( NK*NK+1 ), NK )
-                  CALL CGEMM( 'C', 'N', NK, NK, K, CALPHA, A( 1, NK+1 ),
+                  CALL CGEMM( 'C', 'N', NK, NK, K, CALPHA, A( 1,
+     $                        NK+1 ),
      $                        LDA, A( 1, 1 ), LDA, CBETA, C( 1 ), NK )
 *
                END IF
diff --git a/SRC/chgeqz.f b/SRC/chgeqz.f
index 8c1d62a875..5adce73c0e 100644
--- a/SRC/chgeqz.f
+++ b/SRC/chgeqz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHGEQZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chgeqz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chgeqz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -266,7 +264,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup hgeqz
 *
 *> \par Further Details:
 *  =====================
@@ -278,9 +276,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
+      SUBROUTINE CHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T,
+     $                   LDT,
      $                   ALPHA, BETA, Q, LDQ, Z, LDZ, WORK, LWORK,
      $                   RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -383,7 +383,7 @@ SUBROUTINE CHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
 *     Check Argument Values
 *
       INFO = 0
-      WORK( 1 ) = MAX( 1, N )
+      WORK( 1 ) = CMPLX( MAX( 1, N ) )
       LQUERY = ( LWORK.EQ.-1 )
       IF( ISCHUR.EQ.0 ) THEN
          INFO = -1
@@ -523,9 +523,7 @@ SUBROUTINE CHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
             END IF
          END IF
 *
-         IF( ABS( T( ILAST, ILAST ) ).LE.MAX( SAFMIN, ULP*( 
-     $         ABS( T( ILAST - 1, ILAST ) ) + ABS( T( ILAST-1, ILAST-1 )
-     $          ) ) ) ) THEN
+         IF( ABS( T( ILAST, ILAST ) ).LE.BTOL ) THEN
             T( ILAST, ILAST ) = CZERO
             GO TO 50
          END IF
@@ -551,10 +549,7 @@ SUBROUTINE CHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
 *
 *           Test 2: for T(j,j)=0
 *
-            TEMP = ABS ( T( J, J + 1 ) )
-            IF ( J .GT. ILO )
-     $           TEMP = TEMP + ABS ( T( J - 1, J ) )
-            IF( ABS( T( J, J ) ).LT.MAX( SAFMIN,ULP*TEMP ) ) THEN
+            IF( ABS( T( J, J ) ).LT.BTOL ) THEN
                T( J, J ) = CZERO
 *
 *              Test 1a: Check for 2 consecutive small subdiagonals in A
@@ -583,7 +578,8 @@ SUBROUTINE CHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
                      CALL CROT( ILASTM-JCH, T( JCH, JCH+1 ), LDT,
      $                          T( JCH+1, JCH+1 ), LDT, C, S )
                      IF( ILQ )
-     $                  CALL CROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ), 1,
+     $                  CALL CROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ),
+     $                             1,
      $                             C, CONJG( S ) )
                      IF( ILAZR2 )
      $                  H( JCH, JCH-1 ) = H( JCH, JCH-1 )*C
@@ -610,12 +606,14 @@ SUBROUTINE CHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
      $                            T( JCH, JCH+1 ) )
                      T( JCH+1, JCH+1 ) = CZERO
                      IF( JCH.LT.ILASTM-1 )
-     $                  CALL CROT( ILASTM-JCH-1, T( JCH, JCH+2 ), LDT,
+     $                  CALL CROT( ILASTM-JCH-1, T( JCH, JCH+2 ),
+     $                             LDT,
      $                             T( JCH+1, JCH+2 ), LDT, C, S )
                      CALL CROT( ILASTM-JCH+2, H( JCH, JCH-1 ), LDH,
      $                          H( JCH+1, JCH-1 ), LDH, C, S )
                      IF( ILQ )
-     $                  CALL CROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ), 1,
+     $                  CALL CROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ),
+     $                             1,
      $                             C, CONJG( S ) )
                      CTEMP = H( JCH+1, JCH )
                      CALL CLARTG( CTEMP, H( JCH+1, JCH-1 ), C, S,
@@ -626,7 +624,8 @@ SUBROUTINE CHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
                      CALL CROT( JCH-IFRSTM, T( IFRSTM, JCH ), 1,
      $                          T( IFRSTM, JCH-1 ), 1, C, S )
                      IF( ILZ )
-     $                  CALL CROT( N, Z( 1, JCH ), 1, Z( 1, JCH-1 ), 1,
+     $                  CALL CROT( N, Z( 1, JCH ), 1, Z( 1, JCH-1 ),
+     $                             1,
      $                             C, S )
    30             CONTINUE
                   GO TO 50
@@ -661,7 +660,8 @@ SUBROUTINE CHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
          CALL CROT( ILAST-IFRSTM, T( IFRSTM, ILAST ), 1,
      $              T( IFRSTM, ILAST-1 ), 1, C, S )
          IF( ILZ )
-     $      CALL CROT( N, Z( 1, ILAST ), 1, Z( 1, ILAST-1 ), 1, C, S )
+     $      CALL CROT( N, Z( 1, ILAST ), 1, Z( 1, ILAST-1 ), 1, C,
+     $                 S )
 *
 *        H(ILAST,ILAST-1)=0 -- Standardize B, set ALPHA and BETA
 *
@@ -671,8 +671,10 @@ SUBROUTINE CHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
             SIGNBC = CONJG( T( ILAST, ILAST ) / ABSB )
             T( ILAST, ILAST ) = ABSB
             IF( ILSCHR ) THEN
-               CALL CSCAL( ILAST-IFRSTM, SIGNBC, T( IFRSTM, ILAST ), 1 )
-               CALL CSCAL( ILAST+1-IFRSTM, SIGNBC, H( IFRSTM, ILAST ),
+               CALL CSCAL( ILAST-IFRSTM, SIGNBC, T( IFRSTM, ILAST ),
+     $                     1 )
+               CALL CSCAL( ILAST+1-IFRSTM, SIGNBC, H( IFRSTM,
+     $                     ILAST ),
      $                     1 )
             ELSE
                CALL CSCAL( 1, SIGNBC, H( ILAST, ILAST ), 1 )
diff --git a/SRC/chla_transtype.f b/SRC/chla_transtype.f
index 16c37afbfe..ba55590de0 100644
--- a/SRC/chla_transtype.f
+++ b/SRC/chla_transtype.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHLA_TRANSTYPE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chla_transtype.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chla_transtype.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -51,10 +49,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup la_transtype
 *
 *  =====================================================================
       CHARACTER*1 FUNCTION CHLA_TRANSTYPE( TRANS )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/chpcon.f b/SRC/chpcon.f
index f34b57cd94..d09af5e2c6 100644
--- a/SRC/chpcon.f
+++ b/SRC/chpcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHPCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chpcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chpcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -111,10 +109,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hpcon
 *
 *  =====================================================================
-      SUBROUTINE CHPCON( UPLO, N, AP, IPIV, ANORM, RCOND, WORK, INFO )
+      SUBROUTINE CHPCON( UPLO, N, AP, IPIV, ANORM, RCOND, WORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/chpev.f b/SRC/chpev.f
index 1be8c0c6d8..1cfa995b6f 100644
--- a/SRC/chpev.f
+++ b/SRC/chpev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHPEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chpev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chpev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,11 +128,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHEReigen
+*> \ingroup hpev
 *
 *  =====================================================================
       SUBROUTINE CHPEV( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, RWORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -168,7 +167,8 @@ SUBROUTINE CHPEV( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, RWORK,
       EXTERNAL           LSAME, CLANHP, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHPTRD, CSSCAL, CSTEQR, CUPGTR, SSCAL, SSTERF,
+      EXTERNAL           CHPTRD, CSSCAL, CSTEQR, CUPGTR, SSCAL,
+     $                   SSTERF,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -183,7 +183,8 @@ SUBROUTINE CHPEV( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, RWORK,
       INFO = 0
       IF( .NOT.( WANTZ .OR. LSAME( JOBZ, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.( LSAME( UPLO, 'L' ) .OR. LSAME( UPLO, 'U' ) ) )
+      ELSE IF( .NOT.( LSAME( UPLO, 'L' ) .OR.
+     $         LSAME( UPLO, 'U' ) ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
diff --git a/SRC/chpevd.f b/SRC/chpevd.f
index c44462394e..fd571568a3 100644
--- a/SRC/chpevd.f
+++ b/SRC/chpevd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHPEVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chpevd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chpevd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -41,12 +39,6 @@
 *> a complex Hermitian matrix A in packed storage.  If eigenvectors are
 *> desired, it uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -192,11 +184,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHEReigen
+*> \ingroup hpevd
 *
 *  =====================================================================
       SUBROUTINE CHPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
      $                   RWORK, LRWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -229,11 +222,13 @@ SUBROUTINE CHPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               CLANHP, SLAMCH
-      EXTERNAL           LSAME, CLANHP, SLAMCH
+      REAL               CLANHP, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           LSAME, CLANHP, SLAMCH,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHPTRD, CSSCAL, CSTEDC, CUPMTR, SSCAL, SSTERF,
+      EXTERNAL           CHPTRD, CSSCAL, CSTEDC, CUPMTR, SSCAL,
+     $                   SSTERF,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -249,7 +244,8 @@ SUBROUTINE CHPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
       INFO = 0
       IF( .NOT.( WANTZ .OR. LSAME( JOBZ, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.( LSAME( UPLO, 'L' ) .OR. LSAME( UPLO, 'U' ) ) )
+      ELSE IF( .NOT.( LSAME( UPLO, 'L' ) .OR.
+     $         LSAME( UPLO, 'U' ) ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -274,8 +270,8 @@ SUBROUTINE CHPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
                LIWMIN = 1
             END IF
          END IF
-         WORK( 1 ) = LWMIN
-         RWORK( 1 ) = LRWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
+         RWORK( 1 ) = REAL( LRWMIN )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -347,10 +343,12 @@ SUBROUTINE CHPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
       IF( .NOT.WANTZ ) THEN
          CALL SSTERF( N, W, RWORK( INDE ), INFO )
       ELSE
-         CALL CSTEDC( 'I', N, W, RWORK( INDE ), Z, LDZ, WORK( INDWRK ),
+         CALL CSTEDC( 'I', N, W, RWORK( INDE ), Z, LDZ,
+     $                WORK( INDWRK ),
      $                LLWRK, RWORK( INDRWK ), LLRWK, IWORK, LIWORK,
      $                INFO )
-         CALL CUPMTR( 'L', UPLO, 'N', N, N, AP, WORK( INDTAU ), Z, LDZ,
+         CALL CUPMTR( 'L', UPLO, 'N', N, N, AP, WORK( INDTAU ), Z,
+     $                LDZ,
      $                WORK( INDWRK ), IINFO )
       END IF
 *
@@ -365,8 +363,8 @@ SUBROUTINE CHPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
          CALL SSCAL( IMAX, ONE / SIGMA, W, 1 )
       END IF
 *
-      WORK( 1 ) = LWMIN
-      RWORK( 1 ) = LRWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
+      RWORK( 1 ) = REAL( LRWMIN )
       IWORK( 1 ) = LIWMIN
       RETURN
 *
diff --git a/SRC/chpevx.f b/SRC/chpevx.f
index a5af973a73..8596a28c4f 100644
--- a/SRC/chpevx.f
+++ b/SRC/chpevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHPEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chpevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chpevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -231,12 +229,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHEReigen
+*> \ingroup hpevx
 *
 *  =====================================================================
       SUBROUTINE CHPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
      $                   ABSTOL, M, W, Z, LDZ, WORK, RWORK, IWORK,
      $                   IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -264,7 +263,7 @@ SUBROUTINE CHPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
 *     .. Local Scalars ..
       LOGICAL            ALLEIG, INDEIG, TEST, VALEIG, WANTZ
       CHARACTER          ORDER
-      INTEGER            I, IINFO, IMAX, INDD, INDE, INDEE, INDIBL,
+      INTEGER            I, IINFO, IMAX, INDD, INDE, INDEE,
      $                   INDISP, INDIWK, INDRWK, INDTAU, INDWRK, ISCALE,
      $                   ITMP1, J, JJ, NSPLIT
       REAL               ABSTLL, ANRM, BIGNUM, EPS, RMAX, RMIN, SAFMIN,
@@ -276,7 +275,8 @@ SUBROUTINE CHPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
       EXTERNAL           LSAME, CLANHP, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHPTRD, CSSCAL, CSTEIN, CSTEQR, CSWAP, CUPGTR,
+      EXTERNAL           CHPTRD, CSSCAL, CSTEIN, CSTEQR, CSWAP,
+     $                   CUPGTR,
      $                   CUPMTR, SCOPY, SSCAL, SSTEBZ, SSTERF, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -296,7 +296,8 @@ SUBROUTINE CHPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
          INFO = -1
       ELSE IF( .NOT.( ALLEIG .OR. VALEIG .OR. INDEIG ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.( LSAME( UPLO, 'L' ) .OR. LSAME( UPLO, 'U' ) ) )
+      ELSE IF( .NOT.( LSAME( UPLO, 'L' ) .OR.
+     $         LSAME( UPLO, 'U' ) ) )
      $          THEN
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
@@ -434,24 +435,24 @@ SUBROUTINE CHPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
       ELSE
          ORDER = 'E'
       END IF
-      INDIBL = 1
-      INDISP = INDIBL + N
+      INDISP = 1 + N
       INDIWK = INDISP + N
       CALL SSTEBZ( RANGE, ORDER, N, VLL, VUU, IL, IU, ABSTLL,
      $             RWORK( INDD ), RWORK( INDE ), M, NSPLIT, W,
-     $             IWORK( INDIBL ), IWORK( INDISP ), RWORK( INDRWK ),
+     $             IWORK( 1 ), IWORK( INDISP ), RWORK( INDRWK ),
      $             IWORK( INDIWK ), INFO )
 *
       IF( WANTZ ) THEN
          CALL CSTEIN( N, RWORK( INDD ), RWORK( INDE ), M, W,
-     $                IWORK( INDIBL ), IWORK( INDISP ), Z, LDZ,
+     $                IWORK( 1 ), IWORK( INDISP ), Z, LDZ,
      $                RWORK( INDRWK ), IWORK( INDIWK ), IFAIL, INFO )
 *
 *        Apply unitary matrix used in reduction to tridiagonal
 *        form to eigenvectors returned by CSTEIN.
 *
          INDWRK = INDTAU + N
-         CALL CUPMTR( 'L', UPLO, 'N', N, M, AP, WORK( INDTAU ), Z, LDZ,
+         CALL CUPMTR( 'L', UPLO, 'N', N, M, AP, WORK( INDTAU ), Z,
+     $                LDZ,
      $                WORK( INDWRK ), IINFO )
       END IF
 *
@@ -482,11 +483,11 @@ SUBROUTINE CHPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
    30       CONTINUE
 *
             IF( I.NE.0 ) THEN
-               ITMP1 = IWORK( INDIBL+I-1 )
+               ITMP1 = IWORK( 1 + I-1 )
                W( I ) = W( J )
-               IWORK( INDIBL+I-1 ) = IWORK( INDIBL+J-1 )
+               IWORK( 1 + I-1 ) = IWORK( 1 + J-1 )
                W( J ) = TMP1
-               IWORK( INDIBL+J-1 ) = ITMP1
+               IWORK( 1 + J-1 ) = ITMP1
                CALL CSWAP( N, Z( 1, I ), 1, Z( 1, J ), 1 )
                IF( INFO.NE.0 ) THEN
                   ITMP1 = IFAIL( I )
diff --git a/SRC/chpgst.f b/SRC/chpgst.f
index 17f10b034b..5422ba499e 100644
--- a/SRC/chpgst.f
+++ b/SRC/chpgst.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHPGST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chpgst.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chpgst.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,10 +104,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hpgst
 *
 *  =====================================================================
       SUBROUTINE CHPGST( ITYPE, UPLO, N, AP, BP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -138,7 +137,8 @@ SUBROUTINE CHPGST( ITYPE, UPLO, N, AP, BP, INFO )
       COMPLEX            CT
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CHPMV, CHPR2, CSSCAL, CTPMV, CTPSV,
+      EXTERNAL           CAXPY, CHPMV, CHPR2, CSSCAL, CTPMV,
+     $                   CTPSV,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -183,12 +183,14 @@ SUBROUTINE CHPGST( ITYPE, UPLO, N, AP, BP, INFO )
 *
                AP( JJ ) = REAL( AP( JJ ) )
                BJJ = REAL( BP( JJ ) )
-               CALL CTPSV( UPLO, 'Conjugate transpose', 'Non-unit', J,
+               CALL CTPSV( UPLO, 'Conjugate transpose', 'Non-unit',
+     $                     J,
      $                     BP, AP( J1 ), 1 )
                CALL CHPMV( UPLO, J-1, -CONE, AP, BP( J1 ), 1, CONE,
      $                     AP( J1 ), 1 )
                CALL CSSCAL( J-1, ONE / BJJ, AP( J1 ), 1 )
-               AP( JJ ) = ( AP( JJ )-CDOTC( J-1, AP( J1 ), 1, BP( J1 ),
+               AP( JJ ) = ( AP( JJ )-CDOTC( J-1, AP( J1 ), 1,
+     $             BP( J1 ),
      $                    1 ) ) / BJJ
    10       CONTINUE
          ELSE
@@ -263,7 +265,8 @@ SUBROUTINE CHPGST( ITYPE, UPLO, N, AP, BP, INFO )
                AP( JJ ) = AJJ*BJJ + CDOTC( N-J, AP( JJ+1 ), 1,
      $                    BP( JJ+1 ), 1 )
                CALL CSSCAL( N-J, BJJ, AP( JJ+1 ), 1 )
-               CALL CHPMV( UPLO, N-J, CONE, AP( J1J1 ), BP( JJ+1 ), 1,
+               CALL CHPMV( UPLO, N-J, CONE, AP( J1J1 ), BP( JJ+1 ),
+     $                     1,
      $                     CONE, AP( JJ+1 ), 1 )
                CALL CTPMV( UPLO, 'Conjugate transpose', 'Non-unit',
      $                     N-J+1, BP( JJ ), AP( JJ ), 1 )
diff --git a/SRC/chpgv.f b/SRC/chpgv.f
index 417f101219..62fc22b4fa 100644
--- a/SRC/chpgv.f
+++ b/SRC/chpgv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHPGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chpgv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chpgv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,7 +142,7 @@
 *>                    i off-diagonal elements of an intermediate
 *>                    tridiagonal form did not convergeto zero;
 *>             > N:   if INFO = N + i, for 1 <= i <= n, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -157,11 +155,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHEReigen
+*> \ingroup hpgv
 *
 *  =====================================================================
-      SUBROUTINE CHPGV( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
+      SUBROUTINE CHPGV( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ,
+     $                  WORK,
      $                  RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,7 +188,8 @@ SUBROUTINE CHPGV( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHPEV, CHPGST, CPPTRF, CTPMV, CTPSV, XERBLA
+      EXTERNAL           CHPEV, CHPGST, CPPTRF, CTPMV, CTPSV,
+     $                   XERBLA
 *     ..
 *     .. Executable Statements ..
 *
diff --git a/SRC/chpgvd.f b/SRC/chpgvd.f
index 754be31ed3..ae55b4ee21 100644
--- a/SRC/chpgvd.f
+++ b/SRC/chpgvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHPGVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chpgvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chpgvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -44,12 +42,6 @@
 *> positive definite.
 *> If eigenvectors are desired, it uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -205,7 +197,7 @@
 *>                    i off-diagonal elements of an intermediate
 *>                    tridiagonal form did not convergeto zero;
 *>             > N:   if INFO = N + i, for 1 <= i <= n, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -218,7 +210,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHEReigen
+*> \ingroup hpgvd
 *
 *> \par Contributors:
 *  ==================
@@ -226,8 +218,10 @@
 *>     Mark Fahey, Department of Mathematics, Univ. of Kentucky, USA
 *
 *  =====================================================================
-      SUBROUTINE CHPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
+      SUBROUTINE CHPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ,
+     $                   WORK,
      $                   LWORK, RWORK, LRWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -252,10 +246,12 @@ SUBROUTINE CHPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHPEVD, CHPGST, CPPTRF, CTPMV, CTPSV, XERBLA
+      EXTERNAL           CHPEVD, CHPGST, CPPTRF, CTPMV, CTPSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, REAL
@@ -298,8 +294,8 @@ SUBROUTINE CHPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
             END IF
          END IF
 *
-         WORK( 1 ) = LWMIN
-         RWORK( 1 ) = LRWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
+         RWORK( 1 ) = REAL( LRWMIN )
          IWORK( 1 ) = LIWMIN
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
             INFO = -11
@@ -335,9 +331,9 @@ SUBROUTINE CHPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
       CALL CHPGST( ITYPE, UPLO, N, AP, BP, INFO )
       CALL CHPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK, RWORK,
      $             LRWORK, IWORK, LIWORK, INFO )
-      LWMIN = MAX( REAL( LWMIN ), REAL( WORK( 1 ) ) )
-      LRWMIN = MAX( REAL( LRWMIN ), REAL( RWORK( 1 ) ) )
-      LIWMIN = MAX( REAL( LIWMIN ), REAL( IWORK( 1 ) ) )
+      LWMIN = INT( MAX( REAL( LWMIN ), REAL( WORK( 1 ) ) ) )
+      LRWMIN = INT( MAX( REAL( LRWMIN ), REAL( RWORK( 1 ) ) ) )
+      LIWMIN = INT( MAX( REAL( LIWMIN ), REAL( IWORK( 1 ) ) ) )
 *
       IF( WANTZ ) THEN
 *
@@ -380,8 +376,8 @@ SUBROUTINE CHPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
          END IF
       END IF
 *
-      WORK( 1 ) = LWMIN
-      RWORK( 1 ) = LRWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
+      RWORK( 1 ) = REAL( LRWMIN )
       IWORK( 1 ) = LIWMIN
       RETURN
 *
diff --git a/SRC/chpgvx.f b/SRC/chpgvx.f
index 711daf55fd..3077d5f8aa 100644
--- a/SRC/chpgvx.f
+++ b/SRC/chpgvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHPGVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chpgvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chpgvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -250,7 +248,7 @@
 *>                    i eigenvectors failed to converge.  Their indices
 *>                    are stored in array IFAIL.
 *>             > N:   if INFO = N + i, for 1 <= i <= n, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -263,7 +261,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHEReigen
+*> \ingroup hpgvx
 *
 *> \par Contributors:
 *  ==================
@@ -274,6 +272,7 @@
       SUBROUTINE CHPGVX( ITYPE, JOBZ, RANGE, UPLO, N, AP, BP, VL, VU,
      $                   IL, IU, ABSTOL, M, W, Z, LDZ, WORK, RWORK,
      $                   IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -302,7 +301,8 @@ SUBROUTINE CHPGVX( ITYPE, JOBZ, RANGE, UPLO, N, AP, BP, VL, VU,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHPEVX, CHPGST, CPPTRF, CTPMV, CTPSV, XERBLA
+      EXTERNAL           CHPEVX, CHPGST, CPPTRF, CTPMV, CTPSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MIN
@@ -368,7 +368,8 @@ SUBROUTINE CHPGVX( ITYPE, JOBZ, RANGE, UPLO, N, AP, BP, VL, VU,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL CHPGST( ITYPE, UPLO, N, AP, BP, INFO )
-      CALL CHPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU, ABSTOL, M,
+      CALL CHPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU, ABSTOL,
+     $             M,
      $             W, Z, LDZ, WORK, RWORK, IWORK, IFAIL, INFO )
 *
       IF( WANTZ ) THEN
diff --git a/SRC/chprfs.f b/SRC/chprfs.f
index 65e22c5b00..38e9566c06 100644
--- a/SRC/chprfs.f
+++ b/SRC/chprfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHPRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chprfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chprfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -172,11 +170,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hprfs
 *
 *  =====================================================================
-      SUBROUTINE CHPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
+      SUBROUTINE CHPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
+     $                   LDX,
      $                   FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -217,7 +217,8 @@ SUBROUTINE CHPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CHPMV, CHPTRS, CLACN2, XERBLA
+      EXTERNAL           CAXPY, CCOPY, CHPMV, CHPTRS, CLACN2,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MAX, REAL
@@ -270,7 +271,7 @@ SUBROUTINE CHPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
       NZ = N + 1
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -386,10 +387,11 @@ SUBROUTINE CHPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
 *
          DO 90 I = 1, N
             IF( RWORK( I ).GT.SAFE2 ) THEN
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I )
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I )
             ELSE
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I ) +
-     $                      SAFE1
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I ) + SAFE1
             END IF
    90    CONTINUE
 *
diff --git a/SRC/chpsv.f b/SRC/chpsv.f
index d41c966128..044c30458e 100644
--- a/SRC/chpsv.f
+++ b/SRC/chpsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHPSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chpsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chpsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,7 +133,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERsolve
+*> \ingroup hpsv
 *
 *> \par Further Details:
 *  =====================
@@ -159,6 +157,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CHPSV( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,7 +189,8 @@ SUBROUTINE CHPSV( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/chpsvx.f b/SRC/chpsvx.f
index fa9f714f5b..989cf735bf 100644
--- a/SRC/chpsvx.f
+++ b/SRC/chpsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHPSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chpsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chpsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -249,7 +247,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERsolve
+*> \ingroup hpsvx
 *
 *> \par Further Details:
 *  =====================
@@ -272,8 +270,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CHPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
+      SUBROUTINE CHPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB,
+     $                   X,
      $                   LDX, RCOND, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -307,7 +307,8 @@ SUBROUTINE CHPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
       EXTERNAL           LSAME, CLANHP, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CHPCON, CHPRFS, CHPTRF, CHPTRS, CLACPY,
+      EXTERNAL           CCOPY, CHPCON, CHPRFS, CHPTRF, CHPTRS,
+     $                   CLACPY,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -321,7 +322,8 @@ SUBROUTINE CHPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
       NOFACT = LSAME( FACT, 'N' )
       IF( .NOT.NOFACT .AND. .NOT.LSAME( FACT, 'F' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -369,7 +371,8 @@ SUBROUTINE CHPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
 *     Use iterative refinement to improve the computed solutions and
 *     compute error bounds and backward error estimates for them.
 *
-      CALL CHPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX, FERR,
+      CALL CHPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
+     $             FERR,
      $             BERR, WORK, RWORK, INFO )
 *
 *     Set INFO = N+1 if the matrix is singular to working precision.
diff --git a/SRC/chptrd.f b/SRC/chptrd.f
index 5618e014f6..4bed3cf241 100644
--- a/SRC/chptrd.f
+++ b/SRC/chptrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHPTRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chptrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chptrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -112,7 +110,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hptrd
 *
 *> \par Further Details:
 *  =====================
@@ -148,6 +146,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CHPTRD( UPLO, N, AP, D, E, TAU, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -276,19 +275,22 @@ SUBROUTINE CHPTRD( UPLO, N, AP, D, E, TAU, INFO )
 *
 *              Compute  y := tau * A * v  storing y in TAU(i:n-1)
 *
-               CALL CHPMV( UPLO, N-I, TAUI, AP( I1I1 ), AP( II+1 ), 1,
+               CALL CHPMV( UPLO, N-I, TAUI, AP( I1I1 ), AP( II+1 ),
+     $                     1,
      $                     ZERO, TAU( I ), 1 )
 *
 *              Compute  w := y - 1/2 * tau * (y**H *v) * v
 *
-               ALPHA = -HALF*TAUI*CDOTC( N-I, TAU( I ), 1, AP( II+1 ),
+               ALPHA = -HALF*TAUI*CDOTC( N-I, TAU( I ), 1,
+     $                                   AP( II+1 ),
      $                 1 )
                CALL CAXPY( N-I, ALPHA, AP( II+1 ), 1, TAU( I ), 1 )
 *
 *              Apply the transformation as a rank-2 update:
 *                 A := A - v * w**H - w * v**H
 *
-               CALL CHPR2( UPLO, N-I, -ONE, AP( II+1 ), 1, TAU( I ), 1,
+               CALL CHPR2( UPLO, N-I, -ONE, AP( II+1 ), 1, TAU( I ),
+     $                     1,
      $                     AP( I1I1 ) )
 *
             END IF
diff --git a/SRC/chptrf.f b/SRC/chptrf.f
index d9bfffb06e..9f43531d35 100644
--- a/SRC/chptrf.f
+++ b/SRC/chptrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHPTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chptrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chptrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hptrf
 *
 *> \par Further Details:
 *  =====================
@@ -156,6 +154,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CHPTRF( UPLO, N, AP, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -524,7 +523,8 @@ SUBROUTINE CHPTRF( UPLO, N, AP, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL CSWAP( N-KP, AP( KNC+KP-KK+1 ), 1, AP( KPC+1 ),
+     $            CALL CSWAP( N-KP, AP( KNC+KP-KK+1 ), 1,
+     $                        AP( KPC+1 ),
      $                        1 )
                KX = KNC + KP - KK
                DO 80 J = KK + 1, KP - 1
@@ -592,7 +592,8 @@ SUBROUTINE CHPTRF( UPLO, N, AP, IPIV, INFO )
 *                 where L(k) and L(k+1) are the k-th and (k+1)-th
 *                 columns of L
 *
-                  D = SLAPY2( REAL( AP( K+1+( K-1 )*( 2*N-K ) / 2 ) ),
+                  D = SLAPY2(
+     $                REAL( AP( K+1+( K-1 )*( 2*N-K ) / 2 ) ),
      $                AIMAG( AP( K+1+( K-1 )*( 2*N-K ) / 2 ) ) )
                   D11 = REAL( AP( K+1+K*( 2*N-K-1 ) / 2 ) ) / D
                   D22 = REAL( AP( K+( K-1 )*( 2*N-K ) / 2 ) ) / D
diff --git a/SRC/chptri.f b/SRC/chptri.f
index 8147a6d183..d97cccd40d 100644
--- a/SRC/chptri.f
+++ b/SRC/chptri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHPTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chptri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chptri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hptri
 *
 *  =====================================================================
       SUBROUTINE CHPTRI( UPLO, N, AP, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,7 +222,8 @@ SUBROUTINE CHPTRI( UPLO, N, AP, IPIV, WORK, INFO )
                CALL CHPMV( UPLO, K-1, -CONE, AP, WORK, 1, ZERO,
      $                     AP( KC ), 1 )
                AP( KC+K-1 ) = AP( KC+K-1 ) -
-     $                        REAL( CDOTC( K-1, WORK, 1, AP( KC ), 1 ) )
+     $                        REAL( CDOTC( K-1, WORK, 1, AP( KC ),
+     $                              1 ) )
             END IF
             KSTEP = 1
          ELSE
@@ -248,15 +248,18 @@ SUBROUTINE CHPTRI( UPLO, N, AP, IPIV, WORK, INFO )
                CALL CHPMV( UPLO, K-1, -CONE, AP, WORK, 1, ZERO,
      $                     AP( KC ), 1 )
                AP( KC+K-1 ) = AP( KC+K-1 ) -
-     $                        REAL( CDOTC( K-1, WORK, 1, AP( KC ), 1 ) )
+     $                        REAL( CDOTC( K-1, WORK, 1, AP( KC ),
+     $                              1 ) )
                AP( KCNEXT+K-1 ) = AP( KCNEXT+K-1 ) -
-     $                            CDOTC( K-1, AP( KC ), 1, AP( KCNEXT ),
+     $                            CDOTC( K-1, AP( KC ), 1,
+     $                                   AP( KCNEXT ),
      $                            1 )
                CALL CCOPY( K-1, AP( KCNEXT ), 1, WORK, 1 )
                CALL CHPMV( UPLO, K-1, -CONE, AP, WORK, 1, ZERO,
      $                     AP( KCNEXT ), 1 )
                AP( KCNEXT+K ) = AP( KCNEXT+K ) -
-     $                          REAL( CDOTC( K-1, WORK, 1, AP( KCNEXT ),
+     $                          REAL( CDOTC( K-1, WORK, 1,
+     $                                AP( KCNEXT ),
      $                          1 ) )
             END IF
             KSTEP = 2
@@ -349,7 +352,8 @@ SUBROUTINE CHPTRI( UPLO, N, AP, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL CCOPY( N-K, AP( KC+1 ), 1, WORK, 1 )
-               CALL CHPMV( UPLO, N-K, -CONE, AP( KC+( N-K+1 ) ), WORK,
+               CALL CHPMV( UPLO, N-K, -CONE, AP( KC+( N-K+1 ) ),
+     $                     WORK,
      $                     1, ZERO, AP( KC+1 ), 1 )
                AP( KC ) = AP( KC ) - REAL( CDOTC( N-K, WORK, 1,
      $                    AP( KC+1 ), 1 ) )
@@ -357,10 +361,12 @@ SUBROUTINE CHPTRI( UPLO, N, AP, IPIV, WORK, INFO )
      $                          CDOTC( N-K, AP( KC+1 ), 1,
      $                          AP( KCNEXT+2 ), 1 )
                CALL CCOPY( N-K, AP( KCNEXT+2 ), 1, WORK, 1 )
-               CALL CHPMV( UPLO, N-K, -CONE, AP( KC+( N-K+1 ) ), WORK,
+               CALL CHPMV( UPLO, N-K, -CONE, AP( KC+( N-K+1 ) ),
+     $                     WORK,
      $                     1, ZERO, AP( KCNEXT+2 ), 1 )
                AP( KCNEXT ) = AP( KCNEXT ) -
-     $                        REAL( CDOTC( N-K, WORK, 1, AP( KCNEXT+2 ),
+     $                        REAL( CDOTC( N-K, WORK, 1,
+     $                              AP( KCNEXT+2 ),
      $                        1 ) )
             END IF
             KSTEP = 2
diff --git a/SRC/chptrs.f b/SRC/chptrs.f
index df3832d4e4..0da734428d 100644
--- a/SRC/chptrs.f
+++ b/SRC/chptrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHPTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chptrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chptrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hptrs
 *
 *  =====================================================================
       SUBROUTINE CHPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -143,7 +142,8 @@ SUBROUTINE CHPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMV, CGERU, CLACGV, CSSCAL, CSWAP, XERBLA
+      EXTERNAL           CGEMV, CGERU, CLACGV, CSSCAL, CSWAP,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CONJG, MAX, REAL
@@ -369,7 +369,8 @@ SUBROUTINE CHPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL CGERU( N-K-1, NRHS, -ONE, AP( KC+2 ), 1, B( K, 1 ),
+               CALL CGERU( N-K-1, NRHS, -ONE, AP( KC+2 ), 1, B( K,
+     $                     1 ),
      $                     LDB, B( K+2, 1 ), LDB )
                CALL CGERU( N-K-1, NRHS, -ONE, AP( KC+N-K+2 ), 1,
      $                     B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
diff --git a/SRC/chsein.f b/SRC/chsein.f
index c125211abb..3dd019deaf 100644
--- a/SRC/chsein.f
+++ b/SRC/chsein.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHSEIN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chsein.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chsein.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -226,7 +224,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hsein
 *
 *> \par Further Details:
 *  =====================
@@ -239,9 +237,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, W, VL,
+      SUBROUTINE CHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, W,
+     $                   VL,
      $                   LDVL, VR, LDVR, MM, M, WORK, RWORK, IFAILL,
      $                   IFAILR, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -343,7 +343,7 @@ SUBROUTINE CHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, W, VL,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       ULP = SLAMCH( 'Precision' )
-      SMLNUM = UNFL*( N / ULP )
+      SMLNUM = UNFL*( REAL( N ) / ULP )
 *
       LDWORK = N
 *
@@ -396,7 +396,8 @@ SUBROUTINE CHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, W, VL,
 *              Compute infinity-norm of submatrix H(KL:KR,KL:KR) if it
 *              has not ben computed before.
 *
-               HNORM = CLANHS( 'I', KR-KL+1, H( KL, KL ), LDH, RWORK )
+               HNORM = CLANHS( 'I', KR-KL+1, H( KL, KL ), LDH,
+     $                         RWORK )
                IF( SISNAN( HNORM ) ) THEN
                   INFO = -6
                   RETURN
@@ -425,7 +426,8 @@ SUBROUTINE CHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, W, VL,
 *
 *              Compute left eigenvector.
 *
-               CALL CLAEIN( .FALSE., NOINIT, N-KL+1, H( KL, KL ), LDH,
+               CALL CLAEIN( .FALSE., NOINIT, N-KL+1, H( KL, KL ),
+     $                      LDH,
      $                      WK, VL( KL, KS ), WORK, LDWORK, RWORK, EPS3,
      $                      SMLNUM, IINFO )
                IF( IINFO.GT.0 ) THEN
@@ -442,7 +444,8 @@ SUBROUTINE CHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, W, VL,
 *
 *              Compute right eigenvector.
 *
-               CALL CLAEIN( .TRUE., NOINIT, KR, H, LDH, WK, VR( 1, KS ),
+               CALL CLAEIN( .TRUE., NOINIT, KR, H, LDH, WK, VR( 1,
+     $                      KS ),
      $                      WORK, LDWORK, RWORK, EPS3, SMLNUM, IINFO )
                IF( IINFO.GT.0 ) THEN
                   INFO = INFO + 1
diff --git a/SRC/chseqr.f b/SRC/chseqr.f
index 007f72f59d..2696cf00a1 100644
--- a/SRC/chseqr.f
+++ b/SRC/chseqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CHSEQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/chseqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/chseqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -216,7 +214,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hseqr
 *
 *> \par Contributors:
 *  ==================
@@ -296,6 +294,7 @@
 *  =====================================================================
       SUBROUTINE CHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, W, Z, LDZ,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -343,10 +342,12 @@ SUBROUTINE CHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, W, Z, LDZ,
 *     .. External Functions ..
       INTEGER            ILAENV
       LOGICAL            LSAME
-      EXTERNAL           ILAENV, LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CLACPY, CLAHQR, CLAQR0, CLASET, XERBLA
+      EXTERNAL           CCOPY, CLACPY, CLAHQR, CLAQR0, CLASET,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CMPLX, MAX, MIN, REAL
@@ -397,7 +398,8 @@ SUBROUTINE CHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, W, Z, LDZ,
 *
 *        ==== Quick return in case of a workspace query ====
 *
-         CALL CLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO, IHI, Z,
+         CALL CLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO, IHI,
+     $                Z,
      $                LDZ, WORK, LWORK, INFO )
 *        ==== Ensure reported workspace size is backward-compatible with
 *        .    previous LAPACK versions. ====
@@ -412,7 +414,8 @@ SUBROUTINE CHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, W, Z, LDZ,
          IF( ILO.GT.1 )
      $      CALL CCOPY( ILO-1, H, LDH+1, W, 1 )
          IF( IHI.LT.N )
-     $      CALL CCOPY( N-IHI, H( IHI+1, IHI+1 ), LDH+1, W( IHI+1 ), 1 )
+     $      CALL CCOPY( N-IHI, H( IHI+1, IHI+1 ), LDH+1, W( IHI+1 ),
+     $                  1 )
 *
 *        ==== Initialize Z, if requested ====
 *
@@ -435,13 +438,15 @@ SUBROUTINE CHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, W, Z, LDZ,
 *        ==== CLAQR0 for big matrices; CLAHQR for small ones ====
 *
          IF( N.GT.NMIN ) THEN
-            CALL CLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO, IHI,
+            CALL CLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO,
+     $                   IHI,
      $                   Z, LDZ, WORK, LWORK, INFO )
          ELSE
 *
 *           ==== Small matrix ====
 *
-            CALL CLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO, IHI,
+            CALL CLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO,
+     $                   IHI,
      $                   Z, LDZ, INFO )
 *
             IF( INFO.GT.0 ) THEN
@@ -468,9 +473,11 @@ SUBROUTINE CHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, W, Z, LDZ,
 *
                   CALL CLACPY( 'A', N, N, H, LDH, HL, NL )
                   HL( N+1, N ) = ZERO
-                  CALL CLASET( 'A', NL, NL-N, ZERO, ZERO, HL( 1, N+1 ),
+                  CALL CLASET( 'A', NL, NL-N, ZERO, ZERO, HL( 1,
+     $                         N+1 ),
      $                         NL )
-                  CALL CLAQR0( WANTT, WANTZ, NL, ILO, KBOT, HL, NL, W,
+                  CALL CLAQR0( WANTT, WANTZ, NL, ILO, KBOT, HL, NL,
+     $                         W,
      $                         ILO, IHI, Z, LDZ, WORKL, NL, INFO )
                   IF( WANTT .OR. INFO.NE.0 )
      $               CALL CLACPY( 'A', N, N, HL, NL, H, LDH )
diff --git a/SRC/cla_gbamv.f b/SRC/cla_gbamv.f
index e98334fa48..d57ba063af 100644
--- a/SRC/cla_gbamv.f
+++ b/SRC/cla_gbamv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_GBAMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_gbamv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_gbamv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -158,6 +156,8 @@
 *>           Before entry with BETA non-zero, the incremented array Y
 *>           must contain the vector y. On exit, Y is overwritten by the
 *>           updated vector y.
+*>           If either m or n is zero, then Y not referenced and the function
+*>           performs a quick return.
 *> \endverbatim
 *>
 *> \param[in] INCY
@@ -178,11 +178,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBcomputational
+*> \ingroup la_gbamv
 *
 *  =====================================================================
       SUBROUTINE CLA_GBAMV( TRANS, M, N, KL, KU, ALPHA, AB, LDAB, X,
      $                      INCX, BETA, Y, INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cla_gbrcond_c.f b/SRC/cla_gbrcond_c.f
index ecea389a6f..a12ef88d39 100644
--- a/SRC/cla_gbrcond_c.f
+++ b/SRC/cla_gbrcond_c.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_GBRCOND_C + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_gbrcond_c.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_gbrcond_c.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -152,12 +150,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBcomputational
+*> \ingroup la_gbrcond
 *
 *  =====================================================================
       REAL FUNCTION CLA_GBRCOND_C( TRANS, N, KL, KU, AB, LDAB, AFB,
      $                             LDAFB, IPIV, C, CAPPLY, INFO, WORK,
      $                             RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cla_gbrcond_x.f b/SRC/cla_gbrcond_x.f
index ffe9edbb3e..64386f5f40 100644
--- a/SRC/cla_gbrcond_x.f
+++ b/SRC/cla_gbrcond_x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_GBRCOND_X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_gbrcond_x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_gbrcond_x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -145,11 +143,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBcomputational
+*> \ingroup la_gbrcond
 *
 *  =====================================================================
       REAL FUNCTION CLA_GBRCOND_X( TRANS, N, KL, KU, AB, LDAB, AFB,
      $                             LDAFB, IPIV, X, INFO, WORK, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cla_gbrfsx_extended.f b/SRC/cla_gbrfsx_extended.f
index 612598eb1c..8220d43d51 100644
--- a/SRC/cla_gbrfsx_extended.f
+++ b/SRC/cla_gbrfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_GBRFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_gbrfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_gbrfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -54,7 +52,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERR_BNDS_NORM
 *> and ERR_BNDS_COMP for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERR_BNDS_NORM and ERR_BNDS_COMP.
 *> \endverbatim
 *
@@ -397,16 +395,18 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBcomputational
+*> \ingroup la_gbrfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE CLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL, KU,
+      SUBROUTINE CLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL,
+     $                                KU,
      $                                NRHS, AB, LDAB, AFB, LDAFB, IPIV,
      $                                COLEQU, C, B, LDB, Y, LDY,
      $                                BERR_OUT, N_NORMS, ERR_BNDS_NORM,
      $                                ERR_BNDS_COMP, RES, AYB, DY,
      $                                Y_TAIL, RCOND, ITHRESH, RTHRESH,
      $                                DZ_UB, IGNORE_CWISE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -466,7 +466,8 @@ SUBROUTINE CLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL, KU,
       PARAMETER          ( LA_LINRX_RCOND_I = 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CGBTRS, CGBMV, BLAS_CGBMV_X,
+      EXTERNAL           CAXPY, CCOPY, CGBTRS, CGBMV,
+     $                   BLAS_CGBMV_X,
      $                   BLAS_CGBMV2_X, CLA_GBAMV, CLA_WWADDW, SLAMCH,
      $                   CHLA_TRANSTYPE, CLA_LIN_BERR
       REAL               SLAMCH
@@ -537,7 +538,8 @@ SUBROUTINE CLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL, KU,
 
 !        XXX: RES is no longer needed.
             CALL CCOPY( N, RES, 1, DY, 1 )
-            CALL CGBTRS( TRANS, N, KL, KU, 1, AFB, LDAFB, IPIV, DY, N,
+            CALL CGBTRS( TRANS, N, KL, KU, 1, AFB, LDAFB, IPIV, DY,
+     $                   N,
      $           INFO )
 *
 *         Calculate relative changes DX_X, DZ_Z and ratios DXRAT, DZRAT.
@@ -651,7 +653,7 @@ SUBROUTINE CLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL, KU,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF ( Y_PREC_STATE .LT. EXTRA_Y ) THEN
                CALL CAXPY( N, (1.0E+0,0.0E+0), DY, 1, Y(1,J), 1 )
diff --git a/SRC/cla_gbrpvgrw.f b/SRC/cla_gbrpvgrw.f
index 310f39949b..aa4c78d6ad 100644
--- a/SRC/cla_gbrpvgrw.f
+++ b/SRC/cla_gbrpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_GBRPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_gbrpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_gbrpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -109,11 +107,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBcomputational
+*> \ingroup la_gbrpvgrw
 *
 *  =====================================================================
       REAL FUNCTION CLA_GBRPVGRW( N, KL, KU, NCOLS, AB, LDAB, AFB,
      $                            LDAFB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cla_geamv.f b/SRC/cla_geamv.f
index 22ba240aac..6e81a989e1 100644
--- a/SRC/cla_geamv.f
+++ b/SRC/cla_geamv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_GEAMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_geamv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_geamv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -147,6 +145,8 @@
 *>           Before entry with BETA non-zero, the incremented array Y
 *>           must contain the vector y. On exit, Y is overwritten by the
 *>           updated vector y.
+*>           If either m or n is zero, then Y not referenced and the function
+*>           performs a quick return.
 *> \endverbatim
 *>
 *> \param[in] INCY
@@ -167,11 +167,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup la_geamv
 *
 *  =====================================================================
-      SUBROUTINE CLA_GEAMV( TRANS, M, N, ALPHA, A, LDA, X, INCX, BETA,
+      SUBROUTINE CLA_GEAMV( TRANS, M, N, ALPHA, A, LDA, X, INCX,
+     $                      BETA,
      $                      Y, INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cla_gercond_c.f b/SRC/cla_gercond_c.f
index 024dcb1d9a..6b0c960a6d 100644
--- a/SRC/cla_gercond_c.f
+++ b/SRC/cla_gercond_c.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_GERCOND_C + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_gercond_c.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_gercond_c.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -134,11 +132,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup la_gercond
 *
 *  =====================================================================
-      REAL FUNCTION CLA_GERCOND_C( TRANS, N, A, LDA, AF, LDAF, IPIV, C,
+      REAL FUNCTION CLA_GERCOND_C( TRANS, N, A, LDA, AF, LDAF, IPIV,
+     $                             C,
      $                             CAPPLY, INFO, WORK, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -266,7 +266,8 @@ REAL FUNCTION CLA_GERCOND_C( TRANS, N, A, LDA, AF, LDAF, IPIV, C,
                CALL CGETRS( 'No transpose', N, 1, AF, LDAF, IPIV,
      $            WORK, N, INFO )
             ELSE
-               CALL CGETRS( 'Conjugate transpose', N, 1, AF, LDAF, IPIV,
+               CALL CGETRS( 'Conjugate transpose', N, 1, AF, LDAF,
+     $                      IPIV,
      $            WORK, N, INFO )
             ENDIF
 *
@@ -288,7 +289,8 @@ REAL FUNCTION CLA_GERCOND_C( TRANS, N, A, LDA, AF, LDAF, IPIV, C,
             END IF
 *
             IF ( NOTRANS ) THEN
-               CALL CGETRS( 'Conjugate transpose', N, 1, AF, LDAF, IPIV,
+               CALL CGETRS( 'Conjugate transpose', N, 1, AF, LDAF,
+     $                      IPIV,
      $            WORK, N, INFO )
             ELSE
                CALL CGETRS( 'No transpose', N, 1, AF, LDAF, IPIV,
diff --git a/SRC/cla_gercond_x.f b/SRC/cla_gercond_x.f
index 80b0eab01f..bff3201b07 100644
--- a/SRC/cla_gercond_x.f
+++ b/SRC/cla_gercond_x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_GERCOND_X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_gercond_x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_gercond_x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,11 +125,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup la_gercond
 *
 *  =====================================================================
-      REAL FUNCTION CLA_GERCOND_X( TRANS, N, A, LDA, AF, LDAF, IPIV, X,
+      REAL FUNCTION CLA_GERCOND_X( TRANS, N, A, LDA, AF, LDAF, IPIV,
+     $                             X,
      $                             INFO, WORK, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -246,7 +246,8 @@ REAL FUNCTION CLA_GERCOND_X( TRANS, N, A, LDA, AF, LDAF, IPIV, X,
                CALL CGETRS( 'No transpose', N, 1, AF, LDAF, IPIV,
      $            WORK, N, INFO )
             ELSE
-               CALL CGETRS( 'Conjugate transpose', N, 1, AF, LDAF, IPIV,
+               CALL CGETRS( 'Conjugate transpose', N, 1, AF, LDAF,
+     $                      IPIV,
      $            WORK, N, INFO )
             ENDIF
 *
@@ -264,7 +265,8 @@ REAL FUNCTION CLA_GERCOND_X( TRANS, N, A, LDA, AF, LDAF, IPIV, X,
             END DO
 *
             IF ( NOTRANS ) THEN
-               CALL CGETRS( 'Conjugate transpose', N, 1, AF, LDAF, IPIV,
+               CALL CGETRS( 'Conjugate transpose', N, 1, AF, LDAF,
+     $                      IPIV,
      $            WORK, N, INFO )
             ELSE
                CALL CGETRS( 'No transpose', N, 1, AF, LDAF, IPIV,
diff --git a/SRC/cla_gerfsx_extended.f b/SRC/cla_gerfsx_extended.f
index 03beefe354..504f5ee0b3 100644
--- a/SRC/cla_gerfsx_extended.f
+++ b/SRC/cla_gerfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_GERFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_gerfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_gerfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -54,7 +52,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERRS_N
 *> and ERRS_C for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERRS_N and ERRS_C.
 *> \endverbatim
 *
@@ -385,15 +383,17 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup la_gerfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE CLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
+      SUBROUTINE CLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS,
+     $                                A,
      $                                LDA, AF, LDAF, IPIV, COLEQU, C, B,
      $                                LDB, Y, LDY, BERR_OUT, N_NORMS,
      $                                ERRS_N, ERRS_C, RES, AYB, DY,
      $                                Y_TAIL, RCOND, ITHRESH, RTHRESH,
      $                                DZ_UB, IGNORE_CWISE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -454,7 +454,8 @@ SUBROUTINE CLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
       PARAMETER          ( LA_LINRX_RCOND_I = 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CGETRS, CGEMV, BLAS_CGEMV_X,
+      EXTERNAL           CAXPY, CCOPY, CGETRS, CGEMV,
+     $                   BLAS_CGEMV_X,
      $                   BLAS_CGEMV2_X, CLA_GEAMV, CLA_WWADDW, SLAMCH,
      $                   CHLA_TRANSTYPE, CLA_LIN_BERR
       REAL               SLAMCH
@@ -513,11 +514,13 @@ SUBROUTINE CLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
                CALL CGEMV( TRANS, N, N, (-1.0E+0,0.0E+0), A, LDA,
      $              Y( 1, J ), 1, (1.0E+0,0.0E+0), RES, 1)
             ELSE IF (Y_PREC_STATE .EQ. EXTRA_RESIDUAL) THEN
-               CALL BLAS_CGEMV_X( TRANS_TYPE, N, N, (-1.0E+0,0.0E+0), A,
+               CALL BLAS_CGEMV_X( TRANS_TYPE, N, N, (-1.0E+0,0.0E+0),
+     $                            A,
      $              LDA, Y( 1, J ), 1, (1.0E+0,0.0E+0),
      $              RES, 1, PREC_TYPE )
             ELSE
-               CALL BLAS_CGEMV2_X( TRANS_TYPE, N, N, (-1.0E+0,0.0E+0),
+               CALL BLAS_CGEMV2_X( TRANS_TYPE, N, N,
+     $              (-1.0E+0,0.0E+0),
      $              A, LDA, Y(1, J), Y_TAIL, 1, (1.0E+0,0.0E+0), RES, 1,
      $              PREC_TYPE)
             END IF
@@ -637,7 +640,7 @@ SUBROUTINE CLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF ( Y_PREC_STATE .LT. EXTRA_Y ) THEN
                CALL CAXPY( N, (1.0E+0,0.0E+0), DY, 1, Y(1,J), 1 )
@@ -673,7 +676,8 @@ SUBROUTINE CLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
 *            op(A) = A, A**T, or A**H depending on TRANS (and type).
 *
          CALL CCOPY( N, B( 1, J ), 1, RES, 1 )
-         CALL CGEMV( TRANS, N, N, (-1.0E+0,0.0E+0), A, LDA, Y(1,J), 1,
+         CALL CGEMV( TRANS, N, N, (-1.0E+0,0.0E+0), A, LDA, Y(1,J),
+     $               1,
      $        (1.0E+0,0.0E+0), RES, 1 )
 
          DO I = 1, N
diff --git a/SRC/cla_gerpvgrw.f b/SRC/cla_gerpvgrw.f
index f7e514510a..e0918a0de7 100644
--- a/SRC/cla_gerpvgrw.f
+++ b/SRC/cla_gerpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_GERPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_gerpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_gerpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -91,10 +89,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup la_gerpvgrw
 *
 *  =====================================================================
       REAL FUNCTION CLA_GERPVGRW( N, NCOLS, A, LDA, AF, LDAF )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cla_heamv.f b/SRC/cla_heamv.f
index 6230de4af7..dc7413427b 100644
--- a/SRC/cla_heamv.f
+++ b/SRC/cla_heamv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_HEAMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_heamv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_heamv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -154,7 +152,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup la_heamv
 *
 *> \par Further Details:
 *  =====================
@@ -175,6 +173,7 @@
 *  =====================================================================
       SUBROUTINE CLA_HEAMV( UPLO, N, ALPHA, A, LDA, X, INCX, BETA, Y,
      $                      INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cla_hercond_c.f b/SRC/cla_hercond_c.f
index 64bb580971..d600bd3b7e 100644
--- a/SRC/cla_hercond_c.f
+++ b/SRC/cla_hercond_c.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_HERCOND_C + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_hercond_c.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_hercond_c.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,11 +128,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup la_hercond
 *
 *  =====================================================================
-      REAL FUNCTION CLA_HERCOND_C( UPLO, N, A, LDA, AF, LDAF, IPIV, C,
+      REAL FUNCTION CLA_HERCOND_C( UPLO, N, A, LDA, AF, LDAF, IPIV,
+     $                             C,
      $                             CAPPLY, INFO, WORK, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cla_hercond_x.f b/SRC/cla_hercond_x.f
index e79d4d449e..b4a6711a23 100644
--- a/SRC/cla_hercond_x.f
+++ b/SRC/cla_hercond_x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_HERCOND_X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_hercond_x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_hercond_x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,11 +121,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup la_hercond
 *
 *  =====================================================================
-      REAL FUNCTION CLA_HERCOND_X( UPLO, N, A, LDA, AF, LDAF, IPIV, X,
+      REAL FUNCTION CLA_HERCOND_X( UPLO, N, A, LDA, AF, LDAF, IPIV,
+     $                             X,
      $                             INFO, WORK, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cla_herfsx_extended.f b/SRC/cla_herfsx_extended.f
index 96ff805e91..e07dc5cd24 100644
--- a/SRC/cla_herfsx_extended.f
+++ b/SRC/cla_herfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_HERFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_herfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_herfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -55,7 +53,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERR_BNDS_NORM
 *> and ERR_BNDS_COMP for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERR_BNDS_NORM and ERR_BNDS_COMP.
 *> \endverbatim
 *
@@ -382,16 +380,18 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup la_herfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE CLA_HERFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
+      SUBROUTINE CLA_HERFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A,
+     $                                LDA,
      $                                AF, LDAF, IPIV, COLEQU, C, B, LDB,
      $                                Y, LDY, BERR_OUT, N_NORMS,
      $                                ERR_BNDS_NORM, ERR_BNDS_COMP, RES,
      $                                AYB, DY, Y_TAIL, RCOND, ITHRESH,
      $                                RTHRESH, DZ_UB, IGNORE_CWISE,
      $                                INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -457,7 +457,8 @@ SUBROUTINE CLA_HERFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
       INTEGER            ILAUPLO
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CHETRS, CHEMV, BLAS_CHEMV_X,
+      EXTERNAL           CAXPY, CCOPY, CHETRS, CHEMV,
+     $                   BLAS_CHEMV_X,
      $                   BLAS_CHEMV2_X, CLA_HEAMV, CLA_WWADDW,
      $                   CLA_LIN_BERR
       REAL               SLAMCH
@@ -537,7 +538,8 @@ SUBROUTINE CLA_HERFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
 *
             CALL CCOPY( N, B( 1, J ), 1, RES, 1 )
             IF ( Y_PREC_STATE .EQ. BASE_RESIDUAL ) THEN
-               CALL CHEMV( UPLO, N, CMPLX(-1.0), A, LDA, Y( 1, J ), 1,
+               CALL CHEMV( UPLO, N, CMPLX(-1.0), A, LDA, Y( 1, J ),
+     $                     1,
      $              CMPLX(1.0), RES, 1 )
             ELSE IF ( Y_PREC_STATE .EQ. EXTRA_RESIDUAL ) THEN
                CALL BLAS_CHEMV_X( UPLO2, N, CMPLX(-1.0), A, LDA,
@@ -654,7 +656,7 @@ SUBROUTINE CLA_HERFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF ( Y_PREC_STATE .LT. EXTRA_Y ) THEN
                CALL CAXPY( N, CMPLX(1.0), DY, 1, Y(1,J), 1 )
diff --git a/SRC/cla_herpvgrw.f b/SRC/cla_herpvgrw.f
index 21b01ac77b..7aa8e18cba 100644
--- a/SRC/cla_herpvgrw.f
+++ b/SRC/cla_herpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_HERPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_herpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_herpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,11 +113,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup la_herpvgrw
 *
 *  =====================================================================
-      REAL FUNCTION CLA_HERPVGRW( UPLO, N, INFO, A, LDA, AF, LDAF, IPIV,
+      REAL FUNCTION CLA_HERPVGRW( UPLO, N, INFO, A, LDA, AF, LDAF,
+     $                            IPIV,
      $                            WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cla_lin_berr.f b/SRC/cla_lin_berr.f
index a46c998ba3..6341abb7d0 100644
--- a/SRC/cla_lin_berr.f
+++ b/SRC/cla_lin_berr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_LIN_BERR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_lin_berr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_lin_berr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -94,10 +92,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup la_lin_berr
 *
 *  =====================================================================
       SUBROUTINE CLA_LIN_BERR( N, NZ, NRHS, RES, AYB, BERR )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cla_porcond_c.f b/SRC/cla_porcond_c.f
index d322979e50..d545664582 100644
--- a/SRC/cla_porcond_c.f
+++ b/SRC/cla_porcond_c.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_PORCOND_C + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_porcond_c.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_porcond_c.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,11 +120,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPOcomputational
+*> \ingroup la_porcond
 *
 *  =====================================================================
-      REAL FUNCTION CLA_PORCOND_C( UPLO, N, A, LDA, AF, LDAF, C, CAPPLY,
+      REAL FUNCTION CLA_PORCOND_C( UPLO, N, A, LDA, AF, LDAF, C,
+     $                             CAPPLY,
      $                             INFO, WORK, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cla_porcond_x.f b/SRC/cla_porcond_x.f
index 62d0584ef4..6b40aa1a94 100644
--- a/SRC/cla_porcond_x.f
+++ b/SRC/cla_porcond_x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_PORCOND_X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_porcond_x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_porcond_x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,11 +113,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPOcomputational
+*> \ingroup la_porcond
 *
 *  =====================================================================
-      REAL FUNCTION CLA_PORCOND_X( UPLO, N, A, LDA, AF, LDAF, X, INFO,
+      REAL FUNCTION CLA_PORCOND_X( UPLO, N, A, LDA, AF, LDAF, X,
+     $                             INFO,
      $                             WORK, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cla_porfsx_extended.f b/SRC/cla_porfsx_extended.f
index 49c5324c53..5768b52a59 100644
--- a/SRC/cla_porfsx_extended.f
+++ b/SRC/cla_porfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_PORFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_porfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_porfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -54,7 +52,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERR_BNDS_NORM
 *> and ERR_BNDS_COMP for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERR_BNDS_NORM and ERR_BNDS_COMP.
 *> \endverbatim
 *
@@ -374,16 +372,18 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPOcomputational
+*> \ingroup la_porfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE CLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
+      SUBROUTINE CLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A,
+     $                                LDA,
      $                                AF, LDAF, COLEQU, C, B, LDB, Y,
      $                                LDY, BERR_OUT, N_NORMS,
      $                                ERR_BNDS_NORM, ERR_BNDS_COMP, RES,
      $                                AYB, DY, Y_TAIL, RCOND, ITHRESH,
      $                                RTHRESH, DZ_UB, IGNORE_CWISE,
      $                                INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -448,7 +448,8 @@ SUBROUTINE CLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
       INTEGER            ILAUPLO
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CPOTRS, CHEMV, BLAS_CHEMV_X,
+      EXTERNAL           CAXPY, CCOPY, CPOTRS, CHEMV,
+     $                   BLAS_CHEMV_X,
      $                   BLAS_CHEMV2_X, CLA_HEAMV, CLA_WWADDW,
      $                   CLA_LIN_BERR, SLAMCH
       REAL               SLAMCH
@@ -625,7 +626,7 @@ SUBROUTINE CLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF (Y_PREC_STATE .LT. EXTRA_Y) THEN
                CALL CAXPY( N, CMPLX(1.0), DY, 1, Y(1,J), 1 )
@@ -662,7 +663,8 @@ SUBROUTINE CLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
 *            op(A) = A, A**T, or A**H depending on TRANS (and type).
 *
          CALL CCOPY( N, B( 1, J ), 1, RES, 1 )
-         CALL CHEMV(UPLO, N, CMPLX(-1.0), A, LDA, Y(1,J), 1, CMPLX(1.0),
+         CALL CHEMV(UPLO, N, CMPLX(-1.0), A, LDA, Y(1,J), 1,
+     $               CMPLX(1.0),
      $        RES, 1)
 
          DO I = 1, N
diff --git a/SRC/cla_porpvgrw.f b/SRC/cla_porpvgrw.f
index 1eb706d1a0..71a4c31858 100644
--- a/SRC/cla_porpvgrw.f
+++ b/SRC/cla_porpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_PORPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_porpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_porpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,10 +96,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPOcomputational
+*> \ingroup la_porpvgrw
 *
 *  =====================================================================
-      REAL FUNCTION CLA_PORPVGRW( UPLO, NCOLS, A, LDA, AF, LDAF, WORK )
+      REAL FUNCTION CLA_PORPVGRW( UPLO, NCOLS, A, LDA, AF, LDAF,
+     $                            WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -140,9 +140,9 @@ REAL FUNCTION CLA_PORPVGRW( UPLO, NCOLS, A, LDA, AF, LDAF, WORK )
 *     .. Executable Statements ..
       UPPER = LSAME( 'Upper', UPLO )
 *
-*     SPOTRF will have factored only the NCOLSxNCOLS leading minor, so
-*     we restrict the growth search to that minor and use only the first
-*     2*NCOLS workspace entries.
+*     SPOTRF will have factored only the NCOLSxNCOLS leading submatrix,
+*     so we restrict the growth search to that submatrix and use only
+*     the first 2*NCOLS workspace entries.
 *
       RPVGRW = 1.0
       DO I = 1, 2*NCOLS
diff --git a/SRC/cla_syamv.f b/SRC/cla_syamv.f
index 6507495838..36ec24d81b 100644
--- a/SRC/cla_syamv.f
+++ b/SRC/cla_syamv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_SYAMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_syamv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_syamv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -155,7 +153,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup la_heamv
 *
 *> \par Further Details:
 *  =====================
@@ -176,6 +174,7 @@
 *  =====================================================================
       SUBROUTINE CLA_SYAMV( UPLO, N, ALPHA, A, LDA, X, INCX, BETA, Y,
      $                      INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cla_syrcond_c.f b/SRC/cla_syrcond_c.f
index 74c02abd93..1ae35b6a20 100644
--- a/SRC/cla_syrcond_c.f
+++ b/SRC/cla_syrcond_c.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_SYRCOND_C + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_syrcond_c.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_syrcond_c.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,11 +128,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup la_hercond
 *
 *  =====================================================================
-      REAL FUNCTION CLA_SYRCOND_C( UPLO, N, A, LDA, AF, LDAF, IPIV, C,
+      REAL FUNCTION CLA_SYRCOND_C( UPLO, N, A, LDA, AF, LDAF, IPIV,
+     $                             C,
      $                             CAPPLY, INFO, WORK, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cla_syrcond_x.f b/SRC/cla_syrcond_x.f
index d898c16ec0..0f014563d5 100644
--- a/SRC/cla_syrcond_x.f
+++ b/SRC/cla_syrcond_x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_SYRCOND_X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_syrcond_x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_syrcond_x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,11 +121,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup la_hercond
 *
 *  =====================================================================
-      REAL FUNCTION CLA_SYRCOND_X( UPLO, N, A, LDA, AF, LDAF, IPIV, X,
+      REAL FUNCTION CLA_SYRCOND_X( UPLO, N, A, LDA, AF, LDAF, IPIV,
+     $                             X,
      $                             INFO, WORK, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cla_syrfsx_extended.f b/SRC/cla_syrfsx_extended.f
index 498759ebfe..cb35da6de0 100644
--- a/SRC/cla_syrfsx_extended.f
+++ b/SRC/cla_syrfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_SYRFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_syrfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_syrfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -55,7 +53,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERR_BNDS_NORM
 *> and ERR_BNDS_COMP for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERR_BNDS_NORM and ERR_BNDS_COMP.
 *> \endverbatim
 *
@@ -382,16 +380,18 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup la_herfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE CLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
+      SUBROUTINE CLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A,
+     $                                LDA,
      $                                AF, LDAF, IPIV, COLEQU, C, B, LDB,
      $                                Y, LDY, BERR_OUT, N_NORMS,
      $                                ERR_BNDS_NORM, ERR_BNDS_COMP, RES,
      $                                AYB, DY, Y_TAIL, RCOND, ITHRESH,
      $                                RTHRESH, DZ_UB, IGNORE_CWISE,
      $                                INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -457,7 +457,8 @@ SUBROUTINE CLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
       INTEGER            ILAUPLO
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CSYTRS, CSYMV, BLAS_CSYMV_X,
+      EXTERNAL           CAXPY, CCOPY, CSYTRS, CSYMV,
+     $                   BLAS_CSYMV_X,
      $                   BLAS_CSYMV2_X, CLA_SYAMV, CLA_WWADDW,
      $                   CLA_LIN_BERR
       REAL               SLAMCH
@@ -654,7 +655,7 @@ SUBROUTINE CLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF ( Y_PREC_STATE .LT. EXTRA_Y ) THEN
                CALL CAXPY( N, CMPLX(1.0), DY, 1, Y(1,J), 1 )
diff --git a/SRC/cla_syrpvgrw.f b/SRC/cla_syrpvgrw.f
index 1f53e0f9ed..9754a87dc4 100644
--- a/SRC/cla_syrpvgrw.f
+++ b/SRC/cla_syrpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_SYRPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_syrpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_syrpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,11 +113,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup la_herpvgrw
 *
 *  =====================================================================
-      REAL FUNCTION CLA_SYRPVGRW( UPLO, N, INFO, A, LDA, AF, LDAF, IPIV,
+      REAL FUNCTION CLA_SYRPVGRW( UPLO, N, INFO, A, LDA, AF, LDAF,
+     $                            IPIV,
      $                            WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cla_wwaddw.f b/SRC/cla_wwaddw.f
index aa78f60f41..432474b7c3 100644
--- a/SRC/cla_wwaddw.f
+++ b/SRC/cla_wwaddw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLA_WWADDW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cla_wwaddw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cla_wwaddw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -74,10 +72,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup la_wwaddw
 *
 *  =====================================================================
       SUBROUTINE CLA_WWADDW( N, X, Y, W )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clabrd.f b/SRC/clabrd.f
index 765d71e509..af751f1ae0 100644
--- a/SRC/clabrd.f
+++ b/SRC/clabrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLABRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clabrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clabrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -157,7 +155,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup labrd
 *
 *> \par Further Details:
 *  =====================
@@ -207,8 +205,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
+      SUBROUTINE CLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX,
+     $                   Y,
      $                   LDY )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -279,7 +279,8 @@ SUBROUTINE CLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
                CALL CGEMV( 'Conjugate transpose', M-I+1, I-1, ONE,
      $                     A( I, 1 ), LDA, A( I, I ), 1, ZERO,
      $                     Y( 1, I ), 1 )
-               CALL CGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1, 1 ),
+               CALL CGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1,
+     $                     1 ),
      $                     LDY, Y( 1, I ), 1, ONE, Y( I+1, I ), 1 )
                CALL CGEMV( 'Conjugate transpose', M-I+1, I-1, ONE,
      $                     X( I, 1 ), LDX, A( I, I ), 1, ZERO,
@@ -312,16 +313,19 @@ SUBROUTINE CLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
 *
 *              Compute X(i+1:m,i)
 *
-               CALL CGEMV( 'No transpose', M-I, N-I, ONE, A( I+1, I+1 ),
+               CALL CGEMV( 'No transpose', M-I, N-I, ONE, A( I+1,
+     $                     I+1 ),
      $                     LDA, A( I, I+1 ), LDA, ZERO, X( I+1, I ), 1 )
                CALL CGEMV( 'Conjugate transpose', N-I, I, ONE,
      $                     Y( I+1, 1 ), LDY, A( I, I+1 ), LDA, ZERO,
      $                     X( 1, I ), 1 )
                CALL CGEMV( 'No transpose', M-I, I, -ONE, A( I+1, 1 ),
      $                     LDA, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
-               CALL CGEMV( 'No transpose', I-1, N-I, ONE, A( 1, I+1 ),
+               CALL CGEMV( 'No transpose', I-1, N-I, ONE, A( 1,
+     $                     I+1 ),
      $                     LDA, A( I, I+1 ), LDA, ZERO, X( 1, I ), 1 )
-               CALL CGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1, 1 ),
+               CALL CGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1,
+     $                     1 ),
      $                     LDX, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
                CALL CSCAL( M-I, TAUP( I ), X( I+1, I ), 1 )
                CALL CLACGV( N-I, A( I, I+1 ), LDA )
@@ -357,16 +361,20 @@ SUBROUTINE CLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
 *
 *              Compute X(i+1:m,i)
 *
-               CALL CGEMV( 'No transpose', M-I, N-I+1, ONE, A( I+1, I ),
+               CALL CGEMV( 'No transpose', M-I, N-I+1, ONE, A( I+1,
+     $                     I ),
      $                     LDA, A( I, I ), LDA, ZERO, X( I+1, I ), 1 )
                CALL CGEMV( 'Conjugate transpose', N-I+1, I-1, ONE,
      $                     Y( I, 1 ), LDY, A( I, I ), LDA, ZERO,
      $                     X( 1, I ), 1 )
-               CALL CGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1, 1 ),
+               CALL CGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1,
+     $                     1 ),
      $                     LDA, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
-               CALL CGEMV( 'No transpose', I-1, N-I+1, ONE, A( 1, I ),
+               CALL CGEMV( 'No transpose', I-1, N-I+1, ONE, A( 1,
+     $                     I ),
      $                     LDA, A( I, I ), LDA, ZERO, X( 1, I ), 1 )
-               CALL CGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1, 1 ),
+               CALL CGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1,
+     $                     1 ),
      $                     LDX, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
                CALL CSCAL( M-I, TAUP( I ), X( I+1, I ), 1 )
                CALL CLACGV( N-I+1, A( I, I ), LDA )
@@ -374,7 +382,8 @@ SUBROUTINE CLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
 *              Update A(i+1:m,i)
 *
                CALL CLACGV( I-1, Y( I, 1 ), LDY )
-               CALL CGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1, 1 ),
+               CALL CGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1,
+     $                     1 ),
      $                     LDA, Y( I, 1 ), LDY, ONE, A( I+1, I ), 1 )
                CALL CLACGV( I-1, Y( I, 1 ), LDY )
                CALL CGEMV( 'No transpose', M-I, I, -ONE, X( I+1, 1 ),
@@ -396,7 +405,8 @@ SUBROUTINE CLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
                CALL CGEMV( 'Conjugate transpose', M-I, I-1, ONE,
      $                     A( I+1, 1 ), LDA, A( I+1, I ), 1, ZERO,
      $                     Y( 1, I ), 1 )
-               CALL CGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1, 1 ),
+               CALL CGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1,
+     $                     1 ),
      $                     LDY, Y( 1, I ), 1, ONE, Y( I+1, I ), 1 )
                CALL CGEMV( 'Conjugate transpose', M-I, I, ONE,
      $                     X( I+1, 1 ), LDX, A( I+1, I ), 1, ZERO,
diff --git a/SRC/clacgv.f b/SRC/clacgv.f
index d85df7435a..8569ed2284 100644
--- a/SRC/clacgv.f
+++ b/SRC/clacgv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLACGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clacgv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clacgv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -67,10 +65,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lacgv
 *
 *  =====================================================================
       SUBROUTINE CLACGV( N, X, INCX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clacn2.f b/SRC/clacn2.f
index cbbe9242bf..f984021b8c 100644
--- a/SRC/clacn2.f
+++ b/SRC/clacn2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLACN2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clacn2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clacn2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -96,7 +94,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lacn2
 *
 *> \par Further Details:
 *  =====================
@@ -130,6 +128,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CLACN2( N, V, X, EST, KASE, ISAVE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clacon.f b/SRC/clacon.f
index cb5e23db41..9815b93d50 100644
--- a/SRC/clacon.f
+++ b/SRC/clacon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLACON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clacon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clacon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -89,7 +87,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lacon
 *
 *> \par Further Details:
 *  =====================
@@ -111,6 +109,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CLACON( N, V, X, EST, KASE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clacp2.f b/SRC/clacp2.f
index 3c0f73b7bc..fe539b6225 100644
--- a/SRC/clacp2.f
+++ b/SRC/clacp2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLACP2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clacp2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clacp2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lacp2
 *
 *  =====================================================================
       SUBROUTINE CLACP2( UPLO, M, N, A, LDA, B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clacpy.f b/SRC/clacpy.f
index ab4404a29a..f224562f60 100644
--- a/SRC/clacpy.f
+++ b/SRC/clacpy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLACPY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clacpy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clacpy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -96,10 +94,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lacpy
 *
 *  =====================================================================
       SUBROUTINE CLACPY( UPLO, M, N, A, LDA, B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clacrm.f b/SRC/clacrm.f
index 84620b5e1b..c30edbac44 100644
--- a/SRC/clacrm.f
+++ b/SRC/clacrm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLACRM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clacrm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clacrm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lacrm
 *
 *  =====================================================================
       SUBROUTINE CLACRM( M, N, A, LDA, B, LDB, C, LDC, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clacrt.f b/SRC/clacrt.f
index d297f78dfd..1d592cabac 100644
--- a/SRC/clacrt.f
+++ b/SRC/clacrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLACRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clacrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clacrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,10 +96,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lacrt
 *
 *  =====================================================================
       SUBROUTINE CLACRT( N, CX, INCX, CY, INCY, C, S )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cladiv.f b/SRC/cladiv.f
index 1dca85a353..6e84b80667 100644
--- a/SRC/cladiv.f
+++ b/SRC/cladiv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLADIV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cladiv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cladiv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -57,10 +55,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup ladiv
 *
 *  =====================================================================
       COMPLEX FUNCTION CLADIV( X, Y )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/claed0.f b/SRC/claed0.f
index 40a301fa7c..f13e000a4e 100644
--- a/SRC/claed0.f
+++ b/SRC/claed0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAED0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claed0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claed0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -137,11 +135,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup laed0
 *
 *  =====================================================================
       SUBROUTINE CLAED0( QSIZ, N, D, E, Q, LDQ, QSTORE, LDQS, RWORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,7 +171,8 @@ SUBROUTINE CLAED0( QSIZ, N, D, E, Q, LDQ, QSTORE, LDQS, RWORK,
       REAL               TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CLACRM, CLAED7, SCOPY, SSTEQR, XERBLA
+      EXTERNAL           CCOPY, CLACRM, CLAED7, SCOPY, SSTEQR,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
diff --git a/SRC/claed7.f b/SRC/claed7.f
index 9d2f971414..448613a721 100644
--- a/SRC/claed7.f
+++ b/SRC/claed7.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAED7 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claed7.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claed7.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -239,13 +237,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup laed7
 *
 *  =====================================================================
-      SUBROUTINE CLAED7( N, CUTPNT, QSIZ, TLVLS, CURLVL, CURPBM, D, Q,
+      SUBROUTINE CLAED7( N, CUTPNT, QSIZ, TLVLS, CURLVL, CURPBM, D,
+     $                   Q,
      $                   LDQ, RHO, INDXQ, QSTORE, QPTR, PRMPTR, PERM,
      $                   GIVPTR, GIVCOL, GIVNUM, WORK, RWORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -270,7 +270,8 @@ SUBROUTINE CLAED7( N, CUTPNT, QSIZ, TLVLS, CURLVL, CURPBM, D, Q,
      $                   INDXC, INDXP, IQ, IW, IZ, K, N1, N2, PTR
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLACRM, CLAED8, SLAED9, SLAEDA, SLAMRG, XERBLA
+      EXTERNAL           CLACRM, CLAED8, SLAED9, SLAEDA, SLAMRG,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -356,14 +357,15 @@ SUBROUTINE CLAED7( N, CUTPNT, QSIZ, TLVLS, CURLVL, CURPBM, D, Q,
          CALL SLAED9( K, 1, K, N, D, RWORK( IQ ), K, RHO,
      $                RWORK( IDLMDA ), RWORK( IW ),
      $                QSTORE( QPTR( CURR ) ), K, INFO )
-         CALL CLACRM( QSIZ, K, WORK, QSIZ, QSTORE( QPTR( CURR ) ), K, Q,
+         CALL CLACRM( QSIZ, K, WORK, QSIZ, QSTORE( QPTR( CURR ) ), K,
+     $                Q,
      $                LDQ, RWORK( IQ ) )
          QPTR( CURR+1 ) = QPTR( CURR ) + K**2
          IF( INFO.NE.0 ) THEN
             RETURN
          END IF
 *
-*     Prepare the INDXQ sorting premutation.
+*     Prepare the INDXQ sorting permutation.
 *
          N1 = K
          N2 = N - K
diff --git a/SRC/claed8.f b/SRC/claed8.f
index c15a0365f9..52065c400e 100644
--- a/SRC/claed8.f
+++ b/SRC/claed8.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAED8 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claed8.f">
 *> [TGZ]</a>
@@ -13,12 +12,11 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claed8.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE CLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
+*       SUBROUTINE CLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMBDA,
 *                          Q2, LDQ2, W, INDXP, INDX, INDXQ, PERM, GIVPTR,
 *                          GIVCOL, GIVNUM, INFO )
 *
@@ -29,7 +27,7 @@
 *       .. Array Arguments ..
 *       INTEGER            GIVCOL( 2, * ), INDX( * ), INDXP( * ),
 *      $                   INDXQ( * ), PERM( * )
-*       REAL               D( * ), DLAMDA( * ), GIVNUM( 2, * ), W( * ),
+*       REAL               D( * ), DLAMBDA( * ), GIVNUM( 2, * ), W( * ),
 *      $                   Z( * )
 *       COMPLEX            Q( LDQ, * ), Q2( LDQ2, * )
 *       ..
@@ -122,9 +120,9 @@
 *>         destroyed during the updating process.
 *> \endverbatim
 *>
-*> \param[out] DLAMDA
+*> \param[out] DLAMBDA
 *> \verbatim
-*>          DLAMDA is REAL array, dimension (N)
+*>          DLAMBDA is REAL array, dimension (N)
 *>         Contains a copy of the first K eigenvalues which will be used
 *>         by SLAED3 to form the secular equation.
 *> \endverbatim
@@ -219,12 +217,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup laed8
 *
 *  =====================================================================
-      SUBROUTINE CLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
+      SUBROUTINE CLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z,
+     $                   DLAMBDA,
      $                   Q2, LDQ2, W, INDXP, INDX, INDXQ, PERM, GIVPTR,
      $                   GIVCOL, GIVNUM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -237,7 +237,7 @@ SUBROUTINE CLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
 *     .. Array Arguments ..
       INTEGER            GIVCOL( 2, * ), INDX( * ), INDXP( * ),
      $                   INDXQ( * ), PERM( * )
-      REAL               D( * ), DLAMDA( * ), GIVNUM( 2, * ), W( * ),
+      REAL               D( * ), DLAMBDA( * ), GIVNUM( 2, * ), W( * ),
      $                   Z( * )
       COMPLEX            Q( LDQ, * ), Q2( LDQ2, * )
 *     ..
@@ -259,7 +259,8 @@ SUBROUTINE CLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
       EXTERNAL           ISAMAX, SLAMCH, SLAPY2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CLACPY, CSROT, SCOPY, SLAMRG, SSCAL,
+      EXTERNAL           CCOPY, CLACPY, CSROT, SCOPY, SLAMRG,
+     $                   SSCAL,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -322,14 +323,14 @@ SUBROUTINE CLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
          INDXQ( I ) = INDXQ( I ) + CUTPNT
    20 CONTINUE
       DO 30 I = 1, N
-         DLAMDA( I ) = D( INDXQ( I ) )
+         DLAMBDA( I ) = D( INDXQ( I ) )
          W( I ) = Z( INDXQ( I ) )
    30 CONTINUE
       I = 1
       J = CUTPNT + 1
-      CALL SLAMRG( N1, N2, DLAMDA, 1, 1, INDX )
+      CALL SLAMRG( N1, N2, DLAMBDA, 1, 1, INDX )
       DO 40 I = 1, N
-         D( I ) = DLAMDA( INDX( I ) )
+         D( I ) = DLAMBDA( INDX( I ) )
          Z( I ) = W( INDX( I ) )
    40 CONTINUE
 *
@@ -350,7 +351,8 @@ SUBROUTINE CLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
             PERM( J ) = INDXQ( INDX( J ) )
             CALL CCOPY( QSIZ, Q( 1, PERM( J ) ), 1, Q2( 1, J ), 1 )
    50    CONTINUE
-         CALL CLACPY( 'A', QSIZ, N, Q2( 1, 1 ), LDQ2, Q( 1, 1 ), LDQ )
+         CALL CLACPY( 'A', QSIZ, N, Q2( 1, 1 ), LDQ2, Q( 1, 1 ),
+     $                LDQ )
          RETURN
       END IF
 *
@@ -438,7 +440,7 @@ SUBROUTINE CLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
          ELSE
             K = K + 1
             W( K ) = Z( JLAM )
-            DLAMDA( K ) = D( JLAM )
+            DLAMBDA( K ) = D( JLAM )
             INDXP( K ) = JLAM
             JLAM = J
          END IF
@@ -450,19 +452,19 @@ SUBROUTINE CLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
 *
       K = K + 1
       W( K ) = Z( JLAM )
-      DLAMDA( K ) = D( JLAM )
+      DLAMBDA( K ) = D( JLAM )
       INDXP( K ) = JLAM
 *
   100 CONTINUE
 *
-*     Sort the eigenvalues and corresponding eigenvectors into DLAMDA
+*     Sort the eigenvalues and corresponding eigenvectors into DLAMBDA
 *     and Q2 respectively.  The eigenvalues/vectors which were not
-*     deflated go into the first K slots of DLAMDA and Q2 respectively,
+*     deflated go into the first K slots of DLAMBDA and Q2 respectively,
 *     while those which were deflated go into the last N - K slots.
 *
       DO 110 J = 1, N
          JP = INDXP( J )
-         DLAMDA( J ) = D( JP )
+         DLAMBDA( J ) = D( JP )
          PERM( J ) = INDXQ( INDX( JP ) )
          CALL CCOPY( QSIZ, Q( 1, PERM( J ) ), 1, Q2( 1, J ), 1 )
   110 CONTINUE
@@ -471,8 +473,9 @@ SUBROUTINE CLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
 *     into the last N - K slots of D and Q respectively.
 *
       IF( K.LT.N ) THEN
-         CALL SCOPY( N-K, DLAMDA( K+1 ), 1, D( K+1 ), 1 )
-         CALL CLACPY( 'A', QSIZ, N-K, Q2( 1, K+1 ), LDQ2, Q( 1, K+1 ),
+         CALL SCOPY( N-K, DLAMBDA( K+1 ), 1, D( K+1 ), 1 )
+         CALL CLACPY( 'A', QSIZ, N-K, Q2( 1, K+1 ), LDQ2, Q( 1,
+     $                K+1 ),
      $                LDQ )
       END IF
 *
diff --git a/SRC/claein.f b/SRC/claein.f
index 9df436e447..efc659a954 100644
--- a/SRC/claein.f
+++ b/SRC/claein.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAEIN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claein.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claein.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -141,11 +139,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup laein
 *
 *  =====================================================================
-      SUBROUTINE CLAEIN( RIGHTV, NOINIT, N, H, LDH, W, V, B, LDB, RWORK,
+      SUBROUTINE CLAEIN( RIGHTV, NOINIT, N, H, LDH, W, V, B, LDB,
+     $                   RWORK,
      $                   EPS3, SMLNUM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -227,7 +227,8 @@ SUBROUTINE CLAEIN( RIGHTV, NOINIT, N, H, LDH, W, V, B, LDB, RWORK,
 *        Scale supplied initial vector.
 *
          VNORM = SCNRM2( N, V, 1 )
-         CALL CSSCAL( N, ( EPS3*ROOTN ) / MAX( VNORM, NRMSML ), V, 1 )
+         CALL CSSCAL( N, ( EPS3*ROOTN ) / MAX( VNORM, NRMSML ), V,
+     $                1 )
       END IF
 *
       IF( RIGHTV ) THEN
@@ -313,7 +314,8 @@ SUBROUTINE CLAEIN( RIGHTV, NOINIT, N, H, LDH, W, V, B, LDB, RWORK,
 *          or U**H *x = scale*v for a left eigenvector,
 *        overwriting x on v.
 *
-         CALL CLATRS( 'Upper', TRANS, 'Nonunit', NORMIN, N, B, LDB, V,
+         CALL CLATRS( 'Upper', TRANS, 'Nonunit', NORMIN, N, B, LDB,
+     $                V,
      $                SCALE, RWORK, IERR )
          NORMIN = 'Y'
 *
diff --git a/SRC/claesy.f b/SRC/claesy.f
index 045c9a5d9c..21c561e776 100644
--- a/SRC/claesy.f
+++ b/SRC/claesy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAESY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claesy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claesy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYauxiliary
+*> \ingroup laesy
 *
 *  =====================================================================
       SUBROUTINE CLAESY( A, B, C, RT1, RT2, EVSCAL, CS1, SN1 )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/claev2.f b/SRC/claev2.f
index e16b199276..b3e351baf8 100644
--- a/SRC/claev2.f
+++ b/SRC/claev2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAEV2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claev2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claev2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,7 +93,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup laev2
 *
 *> \par Further Details:
 *  =====================
@@ -118,6 +116,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CLAEV2( A, B, C, RT1, RT2, CS1, SN1 )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clag2z.f b/SRC/clag2z.f
index 467c08009c..b661fbd5ab 100644
--- a/SRC/clag2z.f
+++ b/SRC/clag2z.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAG2Z + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clag2z.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clag2z.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -96,10 +94,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup _lag2_
 *
 *  =====================================================================
       SUBROUTINE CLAG2Z( M, N, SA, LDSA, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clags2.f b/SRC/clags2.f
index 0cd06ba63d..c5f3df30ee 100644
--- a/SRC/clags2.f
+++ b/SRC/clags2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAGS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clags2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clags2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -150,11 +148,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lags2
 *
 *  =====================================================================
-      SUBROUTINE CLAGS2( UPPER, A1, A2, A3, B1, B2, B3, CSU, SNU, CSV,
+      SUBROUTINE CLAGS2( UPPER, A1, A2, A3, B1, B2, B3, CSU, SNU,
+     $                   CSV,
      $                   SNV, CSQ, SNQ )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -273,14 +273,18 @@ SUBROUTINE CLAGS2( UPPER, A1, A2, A3, B1, B2, B3, CSU, SNU, CSV,
 *           zero (2,2) elements of U**H *A and V**H *B, and then swap.
 *
             IF( ( ABS1( UA21 )+ABS1( UA22 ) ).EQ.ZERO ) THEN
-               CALL CLARTG( -CONJG( VB21 ), CONJG( VB22 ), CSQ, SNQ, R )
+               CALL CLARTG( -CONJG( VB21 ), CONJG( VB22 ), CSQ, SNQ,
+     $                      R )
             ELSE IF( ( ABS1( VB21 )+ABS( VB22 ) ).EQ.ZERO ) THEN
-               CALL CLARTG( -CONJG( UA21 ), CONJG( UA22 ), CSQ, SNQ, R )
+               CALL CLARTG( -CONJG( UA21 ), CONJG( UA22 ), CSQ, SNQ,
+     $                      R )
             ELSE IF( AUA22 / ( ABS1( UA21 )+ABS1( UA22 ) ).LE.AVB22 /
      $               ( ABS1( VB21 )+ABS1( VB22 ) ) ) THEN
-               CALL CLARTG( -CONJG( UA21 ), CONJG( UA22 ), CSQ, SNQ, R )
+               CALL CLARTG( -CONJG( UA21 ), CONJG( UA22 ), CSQ, SNQ,
+     $                      R )
             ELSE
-               CALL CLARTG( -CONJG( VB21 ), CONJG( VB22 ), CSQ, SNQ, R )
+               CALL CLARTG( -CONJG( VB21 ), CONJG( VB22 ), CSQ, SNQ,
+     $                      R )
             END IF
 *
             CSU = SNL
diff --git a/SRC/clagtm.f b/SRC/clagtm.f
index d34ca4a1a3..19cbda0672 100644
--- a/SRC/clagtm.f
+++ b/SRC/clagtm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAGTM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clagtm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clagtm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,7 @@
 *>
 *> \verbatim
 *>
-*> CLAGTM performs a matrix-vector product of the form
+*> CLAGTM performs a matrix-matrix product of the form
 *>
 *>    B := alpha * A * X + beta * B
 *>
@@ -137,11 +135,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lagtm
 *
 *  =====================================================================
-      SUBROUTINE CLAGTM( TRANS, N, NRHS, ALPHA, DL, D, DU, X, LDX, BETA,
+      SUBROUTINE CLAGTM( TRANS, N, NRHS, ALPHA, DL, D, DU, X, LDX,
+     $                   BETA,
      $                   B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clahef.f b/SRC/clahef.f
index 60ec116d6b..21c9f0986e 100644
--- a/SRC/clahef.f
+++ b/SRC/clahef.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAHEF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clahef.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clahef.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,7 +158,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup lahef
 *
 *> \par Contributors:
 *  ==================
@@ -173,7 +171,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE CLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
+      SUBROUTINE CLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -199,7 +199,7 @@ SUBROUTINE CLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
       PARAMETER          ( EIGHT = 8.0E+0, SEVTEN = 17.0E+0 )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            IMAX, J, JB, JJ, JMAX, JP, K, KK, KKW, KP,
+      INTEGER            IMAX, J, JJ, JMAX, JP, K, KK, KKW, KP,
      $                   KSTEP, KW
       REAL               ABSAKK, ALPHA, COLMAX, R1, ROWMAX, T
       COMPLEX            D11, D21, D22, Z
@@ -210,7 +210,8 @@ SUBROUTINE CLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
       EXTERNAL           LSAME, ICAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CGEMM, CGEMV, CLACGV, CSSCAL, CSWAP
+      EXTERNAL           CCOPY, CGEMMTR, CGEMV, CLACGV, CSSCAL,
+     $                   CSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, CONJG, MAX, MIN, REAL, SQRT
@@ -256,7 +257,8 @@ SUBROUTINE CLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
          CALL CCOPY( K-1, A( 1, K ), 1, W( 1, KW ), 1 )
          W( K, KW ) = REAL( A( K, K ) )
          IF( K.LT.N ) THEN
-            CALL CGEMV( 'No transpose', K, N-K, -CONE, A( 1, K+1 ), LDA,
+            CALL CGEMV( 'No transpose', K, N-K, -CONE, A( 1, K+1 ),
+     $                  LDA,
      $                  W( K, KW+1 ), LDW, CONE, W( 1, KW ), 1 )
             W( K, KW ) = REAL( W( K, KW ) )
          END IF
@@ -549,28 +551,11 @@ SUBROUTINE CLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *        A11 := A11 - U12*D*U12**H = A11 - U12*W**H
 *
-*        computing blocks of NB columns at a time (note that conjg(W) is
-*        actually stored)
+*        (note that conjg(W) is actually stored)
 *
-         DO 50 J = ( ( K-1 ) / NB )*NB + 1, 1, -NB
-            JB = MIN( NB, K-J+1 )
-*
-*           Update the upper triangle of the diagonal block
-*
-            DO 40 JJ = J, J + JB - 1
-               A( JJ, JJ ) = REAL( A( JJ, JJ ) )
-               CALL CGEMV( 'No transpose', JJ-J+1, N-K, -CONE,
-     $                     A( J, K+1 ), LDA, W( JJ, KW+1 ), LDW, CONE,
-     $                     A( J, JJ ), 1 )
-               A( JJ, JJ ) = REAL( A( JJ, JJ ) )
-   40       CONTINUE
-*
-*           Update the rectangular superdiagonal block
-*
-            CALL CGEMM( 'No transpose', 'Transpose', J-1, JB, N-K,
-     $                  -CONE, A( 1, K+1 ), LDA, W( J, KW+1 ), LDW,
-     $                  CONE, A( 1, J ), LDA )
-   50    CONTINUE
+         CALL CGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
+     $                 -CONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
+     $                 CONE, A( 1, 1 ), LDA )
 *
 *        Put U12 in standard form by partially undoing the interchanges
 *        in of rows in columns k+1:n looping backwards from k+1 to n
@@ -624,7 +609,8 @@ SUBROUTINE CLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
          W( K, K ) = REAL( A( K, K ) )
          IF( K.LT.N )
      $      CALL CCOPY( N-K, A( K+1, K ), 1, W( K+1, K ), 1 )
-         CALL CGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K, 1 ), LDA,
+         CALL CGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K, 1 ),
+     $               LDA,
      $               W( K, 1 ), LDW, CONE, W( K, K ), 1 )
          W( K, K ) = REAL( W( K, K ) )
 *
@@ -671,13 +657,15 @@ SUBROUTINE CLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *              Copy column IMAX to column K+1 of W and update it
 *
-               CALL CCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1 )
+               CALL CCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                     1 )
                CALL CLACGV( IMAX-K, W( K, K+1 ), 1 )
                W( IMAX, K+1 ) = REAL( A( IMAX, IMAX ) )
                IF( IMAX.LT.N )
      $            CALL CCOPY( N-IMAX, A( IMAX+1, IMAX ), 1,
      $                        W( IMAX+1, K+1 ), 1 )
-               CALL CGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K, 1 ),
+               CALL CGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K,
+     $                     1 ),
      $                     LDA, W( IMAX, 1 ), LDW, CONE, W( K, K+1 ),
      $                     1 )
                W( IMAX, K+1 ) = REAL( W( IMAX, K+1 ) )
@@ -751,7 +739,8 @@ SUBROUTINE CLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
      $                     LDA )
                CALL CLACGV( KP-KK-1, A( KP, KK+1 ), LDA )
                IF( KP.LT.N )
-     $            CALL CCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL CCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
 *
 *              Interchange rows KK and KP in first K-1 columns of A
 *              (columns K (or K and K+1 for 2-by-2 pivot) of A will be
@@ -909,29 +898,11 @@ SUBROUTINE CLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *        A22 := A22 - L21*D*L21**H = A22 - L21*W**H
 *
-*        computing blocks of NB columns at a time (note that conjg(W) is
-*        actually stored)
-*
-         DO 110 J = K, N, NB
-            JB = MIN( NB, N-J+1 )
-*
-*           Update the lower triangle of the diagonal block
-*
-            DO 100 JJ = J, J + JB - 1
-               A( JJ, JJ ) = REAL( A( JJ, JJ ) )
-               CALL CGEMV( 'No transpose', J+JB-JJ, K-1, -CONE,
-     $                     A( JJ, 1 ), LDA, W( JJ, 1 ), LDW, CONE,
-     $                     A( JJ, JJ ), 1 )
-               A( JJ, JJ ) = REAL( A( JJ, JJ ) )
-  100       CONTINUE
-*
-*           Update the rectangular subdiagonal block
+*        (note that conjg(W) is actually stored)
 *
-            IF( J+JB.LE.N )
-     $         CALL CGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
-     $                     K-1, -CONE, A( J+JB, 1 ), LDA, W( J, 1 ),
-     $                     LDW, CONE, A( J+JB, J ), LDA )
-  110    CONTINUE
+         CALL CGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
+     $                 K-1, -CONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
+     $                 CONE, A( K, K ), LDA )
 *
 *        Put L21 in standard form by partially undoing the interchanges
 *        of rows in columns 1:k-1 looping backwards from k-1 to 1
diff --git a/SRC/clahef_aa.f b/SRC/clahef_aa.f
index ae2fc96ce8..ad6ffaba9e 100644
--- a/SRC/clahef_aa.f
+++ b/SRC/clahef_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAHEF_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clahef_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clahef_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -136,7 +134,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup lahef_aa
 *
 *  =====================================================================
       SUBROUTINE CLAHEF_AA( UPLO, J1, M, NB, A, LDA, IPIV,
@@ -172,8 +170,8 @@ SUBROUTINE CLAHEF_AA( UPLO, J1, M, NB, A, LDA, IPIV,
       EXTERNAL     LSAME, ILAENV, ICAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL     CLACGV, CGEMV, CSCAL, CAXPY, CCOPY, CSWAP, CLASET,
-     $             XERBLA
+      EXTERNAL     CLACGV, CGEMV, CSCAL, CAXPY, CCOPY, CSWAP,
+     $             CLASET, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC    REAL, CONJG, MAX
diff --git a/SRC/clahef_rk.f b/SRC/clahef_rk.f
index ffdde7eeba..0c37ba3a7d 100644
--- a/SRC/clahef_rk.f
+++ b/SRC/clahef_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAHEF_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clahef_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clahef_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -239,7 +237,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup lahef_rk
 *
 *> \par Contributors:
 *  ==================
@@ -259,6 +257,7 @@
 *  =====================================================================
       SUBROUTINE CLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
      $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -286,7 +285,7 @@ SUBROUTINE CLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            DONE
-      INTEGER            IMAX, ITEMP, II, J, JB, JJ, JMAX, K, KK, KKW,
+      INTEGER            IMAX, ITEMP, II, J, JMAX, K, KK, KKW,
      $                   KP, KSTEP, KW, P
       REAL               ABSAKK, ALPHA, COLMAX, STEMP, R1, ROWMAX, T,
      $                   SFMIN
@@ -299,7 +298,8 @@ SUBROUTINE CLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
       EXTERNAL           LSAME, ICAMAX, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CSSCAL, CGEMM, CGEMV, CLACGV, CSWAP
+      EXTERNAL           CCOPY, CSSCAL, CGEMM, CGEMV, CLACGV,
+     $                   CSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, CONJG, AIMAG, MAX, MIN, REAL, SQRT
@@ -356,7 +356,8 @@ SUBROUTINE CLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
      $      CALL CCOPY( K-1, A( 1, K ), 1, W( 1, KW ), 1 )
          W( K, KW ) = REAL( A( K, K ) )
          IF( K.LT.N ) THEN
-            CALL CGEMV( 'No transpose', K, N-K, -CONE, A( 1, K+1 ), LDA,
+            CALL CGEMV( 'No transpose', K, N-K, -CONE, A( 1, K+1 ),
+     $                  LDA,
      $                  W( K, KW+1 ), LDW, CONE, W( 1, KW ), 1 )
             W( K, KW ) = REAL( W( K, KW ) )
          END IF
@@ -422,7 +423,8 @@ SUBROUTINE CLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *                 Copy column IMAX to column KW-1 of W and update it
 *
                   IF( IMAX.GT.1 )
-     $               CALL CCOPY( IMAX-1, A( 1, IMAX ), 1, W( 1, KW-1 ),
+     $               CALL CCOPY( IMAX-1, A( 1, IMAX ), 1, W( 1,
+     $                           KW-1 ),
      $                           1 )
                   W( IMAX, KW-1 ) = REAL( A( IMAX, IMAX ) )
 *
@@ -752,29 +754,11 @@ SUBROUTINE CLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *        A11 := A11 - U12*D*U12**H = A11 - U12*W**H
 *
-*        computing blocks of NB columns at a time (note that conjg(W) is
-*        actually stored)
+*        (note that conjg(W) is actually stored)
 *
-         DO 50 J = ( ( K-1 ) / NB )*NB + 1, 1, -NB
-            JB = MIN( NB, K-J+1 )
-*
-*           Update the upper triangle of the diagonal block
-*
-            DO 40 JJ = J, J + JB - 1
-               A( JJ, JJ ) = REAL( A( JJ, JJ ) )
-               CALL CGEMV( 'No transpose', JJ-J+1, N-K, -CONE,
-     $                     A( J, K+1 ), LDA, W( JJ, KW+1 ), LDW, CONE,
-     $                     A( J, JJ ), 1 )
-               A( JJ, JJ ) = REAL( A( JJ, JJ ) )
-   40       CONTINUE
-*
-*           Update the rectangular superdiagonal block
-*
-            IF( J.GE.2 )
-     $         CALL CGEMM( 'No transpose', 'Transpose', J-1, JB, N-K,
-     $                     -CONE, A( 1, K+1 ), LDA, W( J, KW+1 ), LDW,
-     $                     CONE, A( 1, J ), LDA )
-   50    CONTINUE
+         CALL CGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
+     $                 -CONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
+     $                 CONE, A( 1, 1 ), LDA )
 *
 *        Set KB to the number of columns factorized
 *
@@ -875,7 +859,8 @@ SUBROUTINE CLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column k+1 of W and update it
 *
-                  CALL CCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1)
+                  CALL CCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                        1)
                   CALL CLACGV( IMAX-K, W( K, K+1 ), 1 )
                   W( IMAX, K+1 ) = REAL( A( IMAX, IMAX ) )
 *
@@ -902,7 +887,8 @@ SUBROUTINE CLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + ICAMAX( N-IMAX, W( IMAX+1, K+1 ), 1)
+                     ITEMP = IMAX + ICAMAX( N-IMAX, W( IMAX+1, K+1 ),
+     $                                      1)
                      STEMP = CABS1( W( ITEMP, K+1 ) )
                      IF( STEMP.GT.ROWMAX ) THEN
                         ROWMAX = STEMP
@@ -925,7 +911,8 @@ SUBROUTINE CLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                    copy column K+1 of W to column K of W
 *
-                     CALL CCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL CCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                      DONE = .TRUE.
 *
@@ -954,7 +941,8 @@ SUBROUTINE CLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                    Copy updated JMAXth (next IMAXth) column to Kth of W
 *
-                     CALL CCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL CCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                   END IF
 *
@@ -1014,7 +1002,8 @@ SUBROUTINE CLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
      $                     LDA )
                CALL CLACGV( KP-KK-1, A( KP, KK+1 ), LDA )
                IF( KP.LT.N )
-     $            CALL CCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL CCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
 *
 *              Interchange rows KK and KP in first K-1 columns of A
 *              (column K (or K and K+1 for 2-by-2 pivot) of A will be
@@ -1195,29 +1184,11 @@ SUBROUTINE CLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *        A22 := A22 - L21*D*L21**H = A22 - L21*W**H
 *
-*        computing blocks of NB columns at a time (note that conjg(W) is
-*        actually stored)
-*
-         DO 110 J = K, N, NB
-            JB = MIN( NB, N-J+1 )
-*
-*           Update the lower triangle of the diagonal block
-*
-            DO 100 JJ = J, J + JB - 1
-               A( JJ, JJ ) = REAL( A( JJ, JJ ) )
-               CALL CGEMV( 'No transpose', J+JB-JJ, K-1, -CONE,
-     $                     A( JJ, 1 ), LDA, W( JJ, 1 ), LDW, CONE,
-     $                     A( JJ, JJ ), 1 )
-               A( JJ, JJ ) = REAL( A( JJ, JJ ) )
-  100       CONTINUE
-*
-*           Update the rectangular subdiagonal block
+*        (note that conjg(W) is actually stored)
 *
-            IF( J+JB.LE.N )
-     $         CALL CGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
-     $                     K-1, -CONE, A( J+JB, 1 ), LDA, W( J, 1 ),
-     $                     LDW, CONE, A( J+JB, J ), LDA )
-  110    CONTINUE
+         CALL CGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
+     $                 K-1, -CONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
+     $                 CONE, A( K, K ), LDA )
 *
 *        Set KB to the number of columns factorized
 *
diff --git a/SRC/clahef_rook.f b/SRC/clahef_rook.f
index 130dfcb00c..2f9ccaf1bb 100644
--- a/SRC/clahef_rook.f
+++ b/SRC/clahef_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAHEF_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clahef_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clahef_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -162,7 +160,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEcomputational
+*> \ingroup lahef_rook
 *
 *> \par Contributors:
 *  ==================
@@ -181,6 +179,7 @@
 *  =====================================================================
       SUBROUTINE CLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
      $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -220,7 +219,8 @@ SUBROUTINE CLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
       EXTERNAL           LSAME, ICAMAX, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CSSCAL, CGEMM, CGEMV, CLACGV, CSWAP
+      EXTERNAL           CCOPY, CSSCAL, CGEMM, CGEMV, CLACGV,
+     $                   CSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, CONJG, AIMAG, MAX, MIN, REAL, SQRT
@@ -272,7 +272,8 @@ SUBROUTINE CLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
      $      CALL CCOPY( K-1, A( 1, K ), 1, W( 1, KW ), 1 )
          W( K, KW ) = REAL( A( K, K ) )
          IF( K.LT.N ) THEN
-            CALL CGEMV( 'No transpose', K, N-K, -CONE, A( 1, K+1 ), LDA,
+            CALL CGEMV( 'No transpose', K, N-K, -CONE, A( 1, K+1 ),
+     $                  LDA,
      $                  W( K, KW+1 ), LDW, CONE, W( 1, KW ), 1 )
             W( K, KW ) = REAL( W( K, KW ) )
          END IF
@@ -332,7 +333,8 @@ SUBROUTINE CLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *                 Copy column IMAX to column KW-1 of W and update it
 *
                   IF( IMAX.GT.1 )
-     $               CALL CCOPY( IMAX-1, A( 1, IMAX ), 1, W( 1, KW-1 ),
+     $               CALL CCOPY( IMAX-1, A( 1, IMAX ), 1, W( 1,
+     $                           KW-1 ),
      $                           1 )
                   W( IMAX, KW-1 ) = REAL( A( IMAX, IMAX ) )
 *
@@ -796,7 +798,8 @@ SUBROUTINE CLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column k+1 of W and update it
 *
-                  CALL CCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1)
+                  CALL CCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                        1)
                   CALL CLACGV( IMAX-K, W( K, K+1 ), 1 )
                   W( IMAX, K+1 ) = REAL( A( IMAX, IMAX ) )
 *
@@ -823,7 +826,8 @@ SUBROUTINE CLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + ICAMAX( N-IMAX, W( IMAX+1, K+1 ), 1)
+                     ITEMP = IMAX + ICAMAX( N-IMAX, W( IMAX+1, K+1 ),
+     $                                      1)
                      STEMP = CABS1( W( ITEMP, K+1 ) )
                      IF( STEMP.GT.ROWMAX ) THEN
                         ROWMAX = STEMP
@@ -846,7 +850,8 @@ SUBROUTINE CLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                    copy column K+1 of W to column K of W
 *
-                     CALL CCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL CCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                      DONE = .TRUE.
 *
@@ -875,7 +880,8 @@ SUBROUTINE CLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                    Copy updated JMAXth (next IMAXth) column to Kth of W
 *
-                     CALL CCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL CCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                   END IF
 *
@@ -935,7 +941,8 @@ SUBROUTINE CLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
      $                     LDA )
                CALL CLACGV( KP-KK-1, A( KP, KK+1 ), LDA )
                IF( KP.LT.N )
-     $            CALL CCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL CCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
 *
 *              Interchange rows KK and KP in first K-1 columns of A
 *              (column K (or K and K+1 for 2-by-2 pivot) of A will be
diff --git a/SRC/clahqr.f b/SRC/clahqr.f
index dbd848e2f3..87bc3ccb48 100644
--- a/SRC/clahqr.f
+++ b/SRC/clahqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAHQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clahqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clahqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -171,7 +169,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lahqr
 *
 *> \par Contributors:
 *  ==================
@@ -236,7 +234,7 @@ SUBROUTINE CLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
       EXTERNAL           CLADIV, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CLARFG, CSCAL, SLABAD
+      EXTERNAL           CCOPY, CLARFG, CSCAL
 *     ..
 *     .. Statement Functions ..
       REAL               CABS1
@@ -284,10 +282,12 @@ SUBROUTINE CLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
             SC = CONJG( SC ) / ABS( SC )
             H( I, I-1 ) = ABS( H( I, I-1 ) )
             CALL CSCAL( JHI-I+1, SC, H( I, I ), LDH )
-            CALL CSCAL( MIN( JHI, I+1 )-JLO+1, CONJG( SC ), H( JLO, I ),
+            CALL CSCAL( MIN( JHI, I+1 )-JLO+1, CONJG( SC ), H( JLO,
+     $                  I ),
      $                  1 )
             IF( WANTZ )
-     $         CALL CSCAL( IHIZ-ILOZ+1, CONJG( SC ), Z( ILOZ, I ), 1 )
+     $         CALL CSCAL( IHIZ-ILOZ+1, CONJG( SC ), Z( ILOZ, I ),
+     $                     1 )
          END IF
    20 CONTINUE
 *
@@ -298,7 +298,6 @@ SUBROUTINE CLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
 *
       SAFMIN = SLAMCH( 'SAFE MINIMUM' )
       SAFMAX = RONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULP = SLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( REAL( NH ) / ULP )
 *
@@ -527,7 +526,8 @@ SUBROUTINE CLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
      $                  CALL CSCAL( I2-J, TEMP, H( J, J+1 ), LDH )
                      CALL CSCAL( J-I1, CONJG( TEMP ), H( I1, J ), 1 )
                      IF( WANTZ ) THEN
-                        CALL CSCAL( NZ, CONJG( TEMP ), Z( ILOZ, J ), 1 )
+                        CALL CSCAL( NZ, CONJG( TEMP ), Z( ILOZ, J ),
+     $                              1 )
                      END IF
                   END IF
   110          CONTINUE
diff --git a/SRC/clahr2.f b/SRC/clahr2.f
index ce15093dac..0fa6f281ee 100644
--- a/SRC/clahr2.f
+++ b/SRC/clahr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAHR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clahr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clahr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,7 +121,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lahr2
 *
 *> \par Further Details:
 *  =====================
@@ -178,6 +176,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CLAHR2( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -224,7 +223,8 @@ SUBROUTINE CLAHR2( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *           Update I-th column of A - Y * V**H
 *
             CALL CLACGV( I-1, A( K+I-1, 1 ), LDA )
-            CALL CGEMV( 'NO TRANSPOSE', N-K, I-1, -ONE, Y(K+1,1), LDY,
+            CALL CGEMV( 'NO TRANSPOSE', N-K, I-1, -ONE, Y(K+1,1),
+     $                  LDY,
      $                  A( K+I-1, 1 ), LDA, ONE, A( K+1, I ), 1 )
             CALL CLACGV( I-1, A( K+I-1, 1 ), LDA )
 *
@@ -274,7 +274,8 @@ SUBROUTINE CLAHR2( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *        Generate the elementary reflector H(I) to annihilate
 *        A(K+I+1:N,I)
 *
-         CALL CLARFG( N-K-I+1, A( K+I, I ), A( MIN( K+I+1, N ), I ), 1,
+         CALL CLARFG( N-K-I+1, A( K+I, I ), A( MIN( K+I+1, N ), I ),
+     $                1,
      $                TAU( I ) )
          EI = A( K+I, I )
          A( K+I, I ) = ONE
diff --git a/SRC/claic1.f b/SRC/claic1.f
index 773c718d1d..311d45d64f 100644
--- a/SRC/claic1.f
+++ b/SRC/claic1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAIC1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claic1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claic1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -128,10 +126,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup laic1
 *
 *  =====================================================================
       SUBROUTINE CLAIC1( JOB, J, X, SEST, W, GAMMA, SESTPR, S, C )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clals0.f b/SRC/clals0.f
index e981fc36fd..acd58866cc 100644
--- a/SRC/clals0.f
+++ b/SRC/clals0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLALS0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clals0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clals0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -254,7 +252,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup lals0
 *
 *> \par Contributors:
 *  ==================
@@ -264,9 +262,11 @@
 *>     Osni Marques, LBNL/NERSC, USA \n
 *
 *  =====================================================================
-      SUBROUTINE CLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
+      SUBROUTINE CLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX,
+     $                   LDBX,
      $                   PERM, GIVPTR, GIVCOL, LDGCOL, GIVNUM, LDGNUM,
      $                   POLES, DIFL, DIFR, Z, K, C, S, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -296,7 +296,8 @@ SUBROUTINE CLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
       REAL               DIFLJ, DIFRJ, DJ, DSIGJ, DSIGJP, TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CLACPY, CLASCL, CSROT, CSSCAL, SGEMV,
+      EXTERNAL           CCOPY, CLACPY, CLASCL, CSROT, CSSCAL,
+     $                   SGEMV,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
@@ -360,7 +361,8 @@ SUBROUTINE CLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
 *
          CALL CCOPY( NRHS, B( NLP1, 1 ), LDB, BX( 1, 1 ), LDBX )
          DO 20 I = 2, N
-            CALL CCOPY( NRHS, B( PERM( I ), 1 ), LDB, BX( I, 1 ), LDBX )
+            CALL CCOPY( NRHS, B( PERM( I ), 1 ), LDB, BX( I, 1 ),
+     $                  LDBX )
    20    CONTINUE
 *
 *        Step (3L): apply the inverse of the left singular vector
@@ -392,6 +394,11 @@ SUBROUTINE CLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
      $                ( POLES( I, 2 ).EQ.ZERO ) ) THEN
                      RWORK( I ) = ZERO
                   ELSE
+*
+*                    Use calls to the subroutine SLAMC3 to enforce the
+*                    parentheses (x+y)+z. The goal is to prevent
+*                    optimizing compilers from doing x+(y+z).
+*
                      RWORK( I ) = POLES( I, 2 )*Z( I ) /
      $                            ( SLAMC3( POLES( I, 2 ), DSIGJ )-
      $                            DIFLJ ) / ( POLES( I, 2 )+DJ )
@@ -470,7 +477,13 @@ SUBROUTINE CLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
                   IF( Z( J ).EQ.ZERO ) THEN
                      RWORK( I ) = ZERO
                   ELSE
-                     RWORK( I ) = Z( J ) / ( SLAMC3( DSIGJ, -POLES( I+1,
+*
+*                    Use calls to the subroutine SLAMC3 to enforce the
+*                    parentheses (x+y)+z. The goal is to prevent optimizing
+*                    compilers from doing x+(y+z).
+*
+                     RWORK( I ) = Z( J ) / ( SLAMC3( DSIGJ,
+     $                      -POLES( I+1,
      $                            2 ) )-DIFR( I, 1 ) ) /
      $                            ( DSIGJ+POLES( I, 1 ) ) / DIFR( I, 2 )
                   END IF
@@ -479,7 +492,8 @@ SUBROUTINE CLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
                   IF( Z( J ).EQ.ZERO ) THEN
                      RWORK( I ) = ZERO
                   ELSE
-                     RWORK( I ) = Z( J ) / ( SLAMC3( DSIGJ, -POLES( I,
+                     RWORK( I ) = Z( J ) / ( SLAMC3( DSIGJ,
+     $                      -POLES( I,
      $                            2 ) )-DIFL( I ) ) /
      $                            ( DSIGJ+POLES( I, 1 ) ) / DIFR( I, 2 )
                   END IF
@@ -521,7 +535,8 @@ SUBROUTINE CLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
 *
          IF( SQRE.EQ.1 ) THEN
             CALL CCOPY( NRHS, B( M, 1 ), LDB, BX( M, 1 ), LDBX )
-            CALL CSROT( NRHS, BX( 1, 1 ), LDBX, BX( M, 1 ), LDBX, C, S )
+            CALL CSROT( NRHS, BX( 1, 1 ), LDBX, BX( M, 1 ), LDBX, C,
+     $                  S )
          END IF
          IF( K.LT.MAX( M, N ) )
      $      CALL CLACPY( 'A', N-K, NRHS, B( K+1, 1 ), LDB,
@@ -534,7 +549,8 @@ SUBROUTINE CLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
             CALL CCOPY( NRHS, BX( M, 1 ), LDBX, B( M, 1 ), LDB )
          END IF
          DO 190 I = 2, N
-            CALL CCOPY( NRHS, BX( I, 1 ), LDBX, B( PERM( I ), 1 ), LDB )
+            CALL CCOPY( NRHS, BX( I, 1 ), LDBX, B( PERM( I ), 1 ),
+     $                  LDB )
   190    CONTINUE
 *
 *        Step (4R): apply back the Givens rotations performed.
diff --git a/SRC/clalsa.f b/SRC/clalsa.f
index 06883ab207..5fa702adb7 100644
--- a/SRC/clalsa.f
+++ b/SRC/clalsa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLALSA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clalsa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clalsa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -42,9 +40,9 @@
 *>
 *> \verbatim
 *>
-*> CLALSA is an itermediate step in solving the least squares problem
+*> CLALSA is an intermediate step in solving the least squares problem
 *> by computing the SVD of the coefficient matrix in compact form (The
-*> singular vectors are computed as products of simple orthorgonal
+*> singular vectors are computed as products of simple orthogonal
 *> matrices.).
 *>
 *> If ICOMPQ = 0, CLALSA applies the inverse of the left singular vector
@@ -250,7 +248,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup lalsa
 *
 *> \par Contributors:
 *  ==================
@@ -260,10 +258,12 @@
 *>     Osni Marques, LBNL/NERSC, USA \n
 *
 *  =====================================================================
-      SUBROUTINE CLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
+      SUBROUTINE CLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX,
+     $                   U,
      $                   LDU, VT, K, DIFL, DIFR, Z, POLES, GIVPTR,
      $                   GIVCOL, LDGCOL, PERM, GIVNUM, C, S, RWORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -294,7 +294,8 @@ SUBROUTINE CLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
      $                   NDIMR, NL, NLF, NLP1, NLVL, NR, NRF, NRP1, SQRE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CLALS0, SGEMM, SLASDT, XERBLA
+      EXTERNAL           CCOPY, CLALS0, SGEMM, SLASDT,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          AIMAG, CMPLX, REAL
@@ -473,7 +474,8 @@ SUBROUTINE CLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
             NLF = IC - NL
             NRF = IC + 1
             J = J - 1
-            CALL CLALS0( ICOMPQ, NL, NR, SQRE, NRHS, BX( NLF, 1 ), LDBX,
+            CALL CLALS0( ICOMPQ, NL, NR, SQRE, NRHS, BX( NLF, 1 ),
+     $                   LDBX,
      $                   B( NLF, 1 ), LDB, PERM( NLF, LVL ),
      $                   GIVPTR( J ), GIVCOL( NLF, LVL2 ), LDGCOL,
      $                   GIVNUM( NLF, LVL2 ), LDU, POLES( NLF, LVL2 ),
@@ -518,7 +520,8 @@ SUBROUTINE CLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
                SQRE = 1
             END IF
             J = J + 1
-            CALL CLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B( NLF, 1 ), LDB,
+            CALL CLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B( NLF, 1 ),
+     $                   LDB,
      $                   BX( NLF, 1 ), LDBX, PERM( NLF, LVL ),
      $                   GIVPTR( J ), GIVCOL( NLF, LVL2 ), LDGCOL,
      $                   GIVNUM( NLF, LVL2 ), LDU, POLES( NLF, LVL2 ),
@@ -560,7 +563,8 @@ SUBROUTINE CLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
                RWORK( J ) = REAL( B( JROW, JCOL ) )
   200       CONTINUE
   210    CONTINUE
-         CALL SGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ), LDU,
+         CALL SGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ),
+     $               LDU,
      $               RWORK( 1+NLP1*NRHS*2 ), NLP1, ZERO, RWORK( 1 ),
      $               NLP1 )
          J = NLP1*NRHS*2
@@ -570,7 +574,8 @@ SUBROUTINE CLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
                RWORK( J ) = AIMAG( B( JROW, JCOL ) )
   220       CONTINUE
   230    CONTINUE
-         CALL SGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ), LDU,
+         CALL SGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ),
+     $               LDU,
      $               RWORK( 1+NLP1*NRHS*2 ), NLP1, ZERO,
      $               RWORK( 1+NLP1*NRHS ), NLP1 )
          JREAL = 0
@@ -597,7 +602,8 @@ SUBROUTINE CLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
                RWORK( J ) = REAL( B( JROW, JCOL ) )
   260       CONTINUE
   270    CONTINUE
-         CALL SGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ), LDU,
+         CALL SGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ),
+     $               LDU,
      $               RWORK( 1+NRP1*NRHS*2 ), NRP1, ZERO, RWORK( 1 ),
      $               NRP1 )
          J = NRP1*NRHS*2
@@ -607,7 +613,8 @@ SUBROUTINE CLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
                RWORK( J ) = AIMAG( B( JROW, JCOL ) )
   280       CONTINUE
   290    CONTINUE
-         CALL SGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ), LDU,
+         CALL SGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ),
+     $               LDU,
      $               RWORK( 1+NRP1*NRHS*2 ), NRP1, ZERO,
      $               RWORK( 1+NRP1*NRHS ), NRP1 )
          JREAL = 0
diff --git a/SRC/clalsd.f b/SRC/clalsd.f
index a2da9a9257..6ee0744cb6 100644
--- a/SRC/clalsd.f
+++ b/SRC/clalsd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLALSD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clalsd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clalsd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -48,12 +46,6 @@
 *> problem; in this case a minimum norm solution is returned.
 *> The actual singular values are returned in D in ascending order.
 *>
-*> This code makes very mild assumptions about floating point
-*> arithmetic. It will work on machines with a guard digit in
-*> add/subtract, or on those binary machines without guard digits
-*> which subtract like the Cray XMP, Cray YMP, Cray C 90, or Cray 2.
-*> It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -171,7 +163,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup lalsd
 *
 *> \par Contributors:
 *  ==================
@@ -183,6 +175,7 @@
 *  =====================================================================
       SUBROUTINE CLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
      $                   RANK, WORK, RWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -222,7 +215,8 @@ SUBROUTINE CLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
       EXTERNAL           ISAMAX, SLAMCH, SLANST
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CLACPY, CLALSA, CLASCL, CLASET, CSROT,
+      EXTERNAL           CCOPY, CLACPY, CLALSA, CLASCL, CLASET,
+     $                   CSROT,
      $                   SGEMM, SLARTG, SLASCL, SLASDA, SLASDQ, SLASET,
      $                   SLASRT, XERBLA
 *     ..
@@ -268,7 +262,8 @@ SUBROUTINE CLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
             CALL CLASET( 'A', 1, NRHS, CZERO, CZERO, B, LDB )
          ELSE
             RANK = 1
-            CALL CLASCL( 'G', 0, 0, D( 1 ), ONE, 1, NRHS, B, LDB, INFO )
+            CALL CLASCL( 'G', 0, 0, D( 1 ), ONE, 1, NRHS, B, LDB,
+     $                   INFO )
             D( 1 ) = ABS( D( 1 ) )
          END IF
          RETURN
@@ -294,7 +289,8 @@ SUBROUTINE CLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
                DO 20 J = 1, N - 1
                   CS = RWORK( J*2-1 )
                   SN = RWORK( J*2 )
-                  CALL CSROT( 1, B( J, I ), 1, B( J+1, I ), 1, CS, SN )
+                  CALL CSROT( 1, B( J, I ), 1, B( J+1, I ), 1, CS,
+     $                        SN )
    20          CONTINUE
    30       CONTINUE
          END IF
@@ -366,9 +362,11 @@ SUBROUTINE CLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
          TOL = RCND*ABS( D( ISAMAX( N, D, 1 ) ) )
          DO 100 I = 1, N
             IF( D( I ).LE.TOL ) THEN
-               CALL CLASET( 'A', 1, NRHS, CZERO, CZERO, B( I, 1 ), LDB )
+               CALL CLASET( 'A', 1, NRHS, CZERO, CZERO, B( I, 1 ),
+     $                      LDB )
             ELSE
-               CALL CLASCL( 'G', 0, 0, D( I ), ONE, 1, NRHS, B( I, 1 ),
+               CALL CLASCL( 'G', 0, 0, D( I ), ONE, 1, NRHS, B( I,
+     $                      1 ),
      $                      LDB, INFO )
                RANK = RANK + 1
             END IF
@@ -596,7 +594,8 @@ SUBROUTINE CLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
 *        subproblems were not solved explicitly.
 *
          IF( ABS( D( I ) ).LE.TOL ) THEN
-            CALL CLASET( 'A', 1, NRHS, CZERO, CZERO, WORK( BX+I-1 ), N )
+            CALL CLASET( 'A', 1, NRHS, CZERO, CZERO, WORK( BX+I-1 ),
+     $                   N )
          ELSE
             RANK = RANK + 1
             CALL CLASCL( 'G', 0, 0, D( I ), ONE, 1, NRHS,
@@ -659,7 +658,8 @@ SUBROUTINE CLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
   300          CONTINUE
   310       CONTINUE
          ELSE
-            CALL CLALSA( ICMPQ2, SMLSIZ, NSIZE, NRHS, WORK( BXST ), N,
+            CALL CLALSA( ICMPQ2, SMLSIZ, NSIZE, NRHS, WORK( BXST ),
+     $                   N,
      $                   B( ST, 1 ), LDB, RWORK( U+ST1 ), N,
      $                   RWORK( VT+ST1 ), IWORK( K+ST1 ),
      $                   RWORK( DIFL+ST1 ), RWORK( DIFR+ST1 ),
diff --git a/SRC/clamswlq.f b/SRC/clamswlq.f
index c2ec1c1d33..f0ef39651d 100644
--- a/SRC/clamswlq.f
+++ b/SRC/clamswlq.f
@@ -19,13 +19,13 @@
 *>
 *> \verbatim
 *>
-*>    CLAMQRTS overwrites the general real M-by-N matrix C with
+*>    CLAMSWLQ overwrites the general complex M-by-N matrix C with
 *>
 *>
 *>                    SIDE = 'L'     SIDE = 'R'
 *>    TRANS = 'N':      Q * C          C * Q
 *>    TRANS = 'T':      Q**H * C       C * Q**H
-*>    where Q is a real orthogonal matrix defined as the product of blocked
+*>    where Q is a complex unitary matrix defined as the product of blocked
 *>    elementary reflectors computed by short wide LQ
 *>    factorization (CLASWLQ)
 *> \endverbatim
@@ -56,7 +56,7 @@
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix C. N >= M.
+*>          The number of columns of the matrix C. N >= 0.
 *> \endverbatim
 *>
 *> \param[in] K
@@ -70,14 +70,14 @@
 *> \param[in] MB
 *> \verbatim
 *>          MB is INTEGER
-*>          The row block size to be used in the blocked QR.
+*>          The row block size to be used in the blocked LQ.
 *>          M >= MB >= 1
 *> \endverbatim
 *>
 *> \param[in] NB
 *> \verbatim
 *>          NB is INTEGER
-*>          The column block size to be used in the blocked QR.
+*>          The column block size to be used in the blocked LQ.
 *>          NB > M.
 *> \endverbatim
 *>
@@ -94,9 +94,7 @@
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.
-*>          If SIDE = 'L', LDA >= max(1,M);
-*>          if SIDE = 'R', LDA >= max(1,N).
+*>          The leading dimension of the array A. LDA => max(1,K).
 *> \endverbatim
 *>
 *> \param[in] T
@@ -129,17 +127,20 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) COMPLEX array, dimension (MAX(1,LWORK))
+*>          (workspace) COMPLEX array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK.
-*>          If SIDE = 'L', LWORK >= max(1,NB) * MB;
-*>          if SIDE = 'R', LWORK >= max(1,M) * MB.
+*>          If MIN(M,N,K) = 0, LWORK >= 1.
+*>          If SIDE = 'L', LWORK >= max(1,NB*MB).
+*>          If SIDE = 'R', LWORK >= max(1,M*MB).
+*>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
+*>          only calculates the minimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
@@ -163,8 +164,8 @@
 *  =====================
 *>
 *> \verbatim
-*> Short-Wide LQ (SWLQ) performs LQ by a sequence of orthogonal transformations,
-*> representing Q as a product of other orthogonal matrices
+*> Short-Wide LQ (SWLQ) performs LQ by a sequence of unitary transformations,
+*> representing Q as a product of other unitary matrices
 *>   Q = Q(1) * Q(2) * . . . * Q(k)
 *> where each Q(i) zeros out upper diagonal entries of a block of NB rows of A:
 *>   Q(1) zeros out the upper diagonal entries of rows 1:NB of A
@@ -181,7 +182,7 @@
 *> stored in columns [(i-1)*(NB-M)+M+1:i*(NB-M)+M] of A, and by upper triangular
 *> block reflectors, stored in array T(1:LDT,(i-1)*M+1:i*M).
 *> The last Q(k) may use fewer rows.
-*> For more information see Further Details in TPQRT.
+*> For more information see Further Details in TPLQT.
 *>
 *> For more details of the overall algorithm, see the description of
 *> Sequential TSQR in Section 2.2 of [1].
@@ -191,90 +192,105 @@
 *>     SIAM J. Sci. Comput, vol. 34, no. 1, 2012
 *> \endverbatim
 *>
+*> \ingroup lamswlq
+*>
 *  =====================================================================
       SUBROUTINE CLAMSWLQ( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
-     $    LDT, C, LDC, WORK, LWORK, INFO )
+     $                     LDT, C, LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
 *     .. Scalar Arguments ..
-      CHARACTER         SIDE, TRANS
-      INTEGER           INFO, LDA, M, N, K, MB, NB, LDT, LWORK, LDC
+      CHARACTER          SIDE, TRANS
+      INTEGER            INFO, LDA, M, N, K, MB, NB, LDT, LWORK, LDC
 *     ..
 *     .. Array Arguments ..
-      COMPLEX           A( LDA, * ), WORK( * ), C(LDC, * ),
-     $      T( LDT, * )
+      COMPLEX            A( LDA, * ), WORK( * ), C( LDC, * ),
+     $                   T( LDT, * )
 *     ..
 *
 * =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
-      LOGICAL    LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER    I, II, KK, LW, CTR
+      LOGICAL            LEFT, RIGHT, TRAN, NOTRAN, LQUERY
+      INTEGER            I, II, KK, LW, CTR, MINMNK, LWMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
+*     ..
 *     .. External Subroutines ..
-      EXTERNAL    CTPMLQT, CGEMLQT, XERBLA
+      EXTERNAL           CTPMLQT, CGEMLQT, XERBLA
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input arguments
 *
-      LQUERY  = LWORK.LT.0
+      INFO = 0
+      LQUERY  = ( LWORK.EQ.-1 )
       NOTRAN  = LSAME( TRANS, 'N' )
       TRAN    = LSAME( TRANS, 'C' )
       LEFT    = LSAME( SIDE, 'L' )
       RIGHT   = LSAME( SIDE, 'R' )
-      IF (LEFT) THEN
+      IF( LEFT ) THEN
         LW = N * MB
       ELSE
         LW = M * MB
       END IF
 *
-      INFO = 0
+      MINMNK = MIN( M, N, K )
+      IF( MINMNK.EQ.0 ) THEN
+        LWMIN = 1
+      ELSE
+        LWMIN = MAX( 1, LW )
+      END IF
+*
       IF( .NOT.LEFT .AND. .NOT.RIGHT ) THEN
-         INFO = -1
+        INFO = -1
       ELSE IF( .NOT.TRAN .AND. .NOT.NOTRAN ) THEN
-         INFO = -2
-      ELSE IF( M.LT.0 ) THEN
+        INFO = -2
+      ELSE IF( K.LT.0 ) THEN
+        INFO = -5
+      ELSE IF( M.LT.K ) THEN
         INFO = -3
       ELSE IF( N.LT.0 ) THEN
         INFO = -4
-      ELSE IF( K.LT.0 ) THEN
-        INFO = -5
+      ELSE IF( K.LT.MB .OR. MB.LT.1 ) THEN
+        INFO = -6
       ELSE IF( LDA.LT.MAX( 1, K ) ) THEN
         INFO = -9
-      ELSE IF( LDT.LT.MAX( 1, MB) ) THEN
+      ELSE IF( LDT.LT.MAX( 1, MB ) ) THEN
         INFO = -11
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
-         INFO = -13
-      ELSE IF(( LWORK.LT.MAX(1,LW)).AND.(.NOT.LQUERY)) THEN
+        INFO = -13
+      ELSE IF( LWORK.LT.LWMIN .AND. (.NOT.LQUERY) ) THEN
         INFO = -15
       END IF
 *
+      IF( INFO.EQ.0 ) THEN
+        WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
+      END IF
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'CLAMSWLQ', -INFO )
-        WORK(1) = LW
         RETURN
-      ELSE IF (LQUERY) THEN
-        WORK(1) = LW
+      ELSE IF( LQUERY ) THEN
         RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( MIN(M,N,K).EQ.0 ) THEN
+      IF( MINMNK.EQ.0 ) THEN
         RETURN
       END IF
 *
       IF((NB.LE.K).OR.(NB.GE.MAX(M,N,K))) THEN
         CALL CGEMLQT( SIDE, TRANS, M, N, K, MB, A, LDA,
-     $        T, LDT, C, LDC, WORK, INFO)
+     $        T, LDT, C, LDC, WORK, INFO )
         RETURN
       END IF
 *
@@ -401,7 +417,7 @@ SUBROUTINE CLAMSWLQ( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
 *
       END IF
 *
-      WORK(1) = LW
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       RETURN
 *
 *     End of CLAMSWLQ
diff --git a/SRC/clamtsqr.f b/SRC/clamtsqr.f
index e5e28e2581..26891e4f7b 100644
--- a/SRC/clamtsqr.f
+++ b/SRC/clamtsqr.f
@@ -25,7 +25,7 @@
 *>                 SIDE = 'L'     SIDE = 'R'
 *> TRANS = 'N':      Q * C          C * Q
 *> TRANS = 'C':      Q**H * C       C * Q**H
-*>      where Q is a real orthogonal matrix defined as the product
+*>      where Q is a complex unitary matrix defined as the product
 *>      of blocked elementary reflectors computed by tall skinny
 *>      QR factorization (CLATSQR)
 *> \endverbatim
@@ -56,15 +56,14 @@
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix C. M >= N >= 0.
+*>          The number of columns of the matrix C. N >= 0.
 *> \endverbatim
 *>
 *> \param[in] K
 *> \verbatim
 *>          K is INTEGER
 *>          The number of elementary reflectors whose product defines
-*>          the matrix Q.
-*>          N >= K >= 0;
+*>          the matrix Q. M >= K >= 0;
 *>
 *> \endverbatim
 *>
@@ -72,7 +71,7 @@
 *> \verbatim
 *>          MB is INTEGER
 *>          The block size to be used in the blocked QR.
-*>          MB > N. (must be the same as DLATSQR)
+*>          MB > N. (must be the same as CLATSQR)
 *> \endverbatim
 *>
 *> \param[in] NB
@@ -87,7 +86,7 @@
 *>          A is COMPLEX array, dimension (LDA,K)
 *>          The i-th column must contain the vector which defines the
 *>          blockedelementary reflector H(i), for i = 1,2,...,k, as
-*>          returned by DLATSQR in the first k columns of
+*>          returned by CLATSQR in the first k columns of
 *>          its array argument A.
 *> \endverbatim
 *>
@@ -129,22 +128,24 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) COMPLEX array, dimension (MAX(1,LWORK))
-*>
+*>          (workspace) COMPLEX array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
+*>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK.
+*>          If MIN(M,N,K) = 0, LWORK >= 1.
+*>          If SIDE = 'L', LWORK >= max(1,N*NB).
+*>          If SIDE = 'R', LWORK >= max(1,MB*NB).
 *>
-*>          If SIDE = 'L', LWORK >= max(1,N)*NB;
-*>          if SIDE = 'R', LWORK >= max(1,MB)*NB.
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
+*>          only calculates the minimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
-*>
 *> \endverbatim
+*>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
@@ -164,8 +165,8 @@
 *  =====================
 *>
 *> \verbatim
-*> Tall-Skinny QR (TSQR) performs QR by a sequence of orthogonal transformations,
-*> representing Q as a product of other orthogonal matrices
+*> Tall-Skinny QR (TSQR) performs QR by a sequence of unitary transformations,
+*> representing Q as a product of other unitary matrices
 *>   Q = Q(1) * Q(2) * . . . * Q(k)
 *> where each Q(i) zeros out subdiagonal entries of a block of MB rows of A:
 *>   Q(1) zeros out the subdiagonal entries of rows 1:MB of A
@@ -192,96 +193,112 @@
 *>     SIAM J. Sci. Comput, vol. 34, no. 1, 2012
 *> \endverbatim
 *>
+*> \ingroup lamtsqr
+*>
 *  =====================================================================
       SUBROUTINE CLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
-     $        LDT, C, LDC, WORK, LWORK, INFO )
+     $                     LDT, C, LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
 *     .. Scalar Arguments ..
-      CHARACTER         SIDE, TRANS
-      INTEGER           INFO, LDA, M, N, K, MB, NB, LDT, LWORK, LDC
+      CHARACTER          SIDE, TRANS
+      INTEGER            INFO, LDA, M, N, K, MB, NB, LDT, LWORK, LDC
 *     ..
 *     .. Array Arguments ..
-      COMPLEX        A( LDA, * ), WORK( * ), C(LDC, * ),
-     $                T( LDT, * )
+      COMPLEX            A( LDA, * ), WORK( * ), C( LDC, * ),
+     $                   T( LDT, * )
 *     ..
 *
 * =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
-      LOGICAL    LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER    I, II, KK, LW, CTR
+      LOGICAL            LEFT, RIGHT, TRAN, NOTRAN, LQUERY
+      INTEGER            I, II, KK, LW, CTR, Q, MINMNK, LWMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
+*     ..
 *     .. External Subroutines ..
-      EXTERNAL   CGEMQRT, CTPMQRT, XERBLA
+      EXTERNAL           CGEMQRT, CTPMQRT, XERBLA
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input arguments
 *
-      LQUERY  = LWORK.LT.0
+      INFO = 0
+      LQUERY  = ( LWORK.EQ.-1 )
       NOTRAN  = LSAME( TRANS, 'N' )
       TRAN    = LSAME( TRANS, 'C' )
       LEFT    = LSAME( SIDE, 'L' )
       RIGHT   = LSAME( SIDE, 'R' )
-      IF (LEFT) THEN
+      IF( LEFT ) THEN
         LW = N * NB
+        Q = M
       ELSE
         LW = M * NB
+        Q = N
+      END IF
+*
+      MINMNK = MIN( M, N, K )
+      IF( MINMNK.EQ.0 ) THEN
+        LWMIN = 1
+      ELSE
+        LWMIN = MAX( 1, LW )
       END IF
 *
-      INFO = 0
       IF( .NOT.LEFT .AND. .NOT.RIGHT ) THEN
-         INFO = -1
+        INFO = -1
       ELSE IF( .NOT.TRAN .AND. .NOT.NOTRAN ) THEN
-         INFO = -2
-      ELSE IF( M.LT.0 ) THEN
+        INFO = -2
+      ELSE IF( M.LT.K ) THEN
         INFO = -3
       ELSE IF( N.LT.0 ) THEN
         INFO = -4
       ELSE IF( K.LT.0 ) THEN
         INFO = -5
-      ELSE IF( LDA.LT.MAX( 1, K ) ) THEN
+      ELSE IF( K.LT.NB .OR. NB.LT.1 ) THEN
+        INFO = -7
+      ELSE IF( LDA.LT.MAX( 1, Q ) ) THEN
         INFO = -9
-      ELSE IF( LDT.LT.MAX( 1, NB) ) THEN
+      ELSE IF( LDT.LT.MAX( 1, NB ) ) THEN
         INFO = -11
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
-         INFO = -13
-      ELSE IF(( LWORK.LT.MAX(1,LW)).AND.(.NOT.LQUERY)) THEN
+        INFO = -13
+      ELSE IF( LWORK.LT.LWMIN .AND. (.NOT.LQUERY) ) THEN
         INFO = -15
       END IF
 *
-*     Determine the block size if it is tall skinny or short and wide
-*
-      IF( INFO.EQ.0)  THEN
-          WORK(1) = LW
+      IF( INFO.EQ.0 ) THEN
+        WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       END IF
 *
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'CLAMTSQR', -INFO )
         RETURN
-      ELSE IF (LQUERY) THEN
-       RETURN
+      ELSE IF( LQUERY ) THEN
+        RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( MIN(M,N,K).EQ.0 ) THEN
+      IF( MINMNK.EQ.0 ) THEN
         RETURN
       END IF
+*
+*     Determine the block size if it is tall skinny or short and wide
 *
       IF((MB.LE.K).OR.(MB.GE.MAX(M,N,K))) THEN
         CALL CGEMQRT( SIDE, TRANS, M, N, K, NB, A, LDA,
-     $        T, LDT, C, LDC, WORK, INFO)
+     $        T, LDT, C, LDC, WORK, INFO )
         RETURN
-       END IF
+      END IF
 *
       IF(LEFT.AND.NOTRAN) THEN
 *
@@ -406,7 +423,7 @@ SUBROUTINE CLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
 *
       END IF
 *
-      WORK(1) = LW
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       RETURN
 *
 *     End of CLAMTSQR
diff --git a/SRC/clangb.f b/SRC/clangb.f
index 09f36bbc45..25405e23e2 100644
--- a/SRC/clangb.f
+++ b/SRC/clangb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLANGB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clangb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clangb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,11 +115,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBauxiliary
+*> \ingroup langb
 *
 *  =====================================================================
       REAL             FUNCTION CLANGB( NORM, N, KL, KU, AB, LDAB,
      $                 WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -201,7 +200,8 @@ REAL             FUNCTION CLANGB( NORM, N, KL, KU, AB, LDAB,
             TEMP = WORK( I )
             IF( VALUE.LT.TEMP .OR. SISNAN( TEMP ) ) VALUE = TEMP
    80    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
@@ -210,7 +210,8 @@ REAL             FUNCTION CLANGB( NORM, N, KL, KU, AB, LDAB,
          DO 90 J = 1, N
             L = MAX( 1, J-KU )
             K = KU + 1 - J + L
-            CALL CLASSQ( MIN( N, J+KL )-L+1, AB( K, J ), 1, SCALE, SUM )
+            CALL CLASSQ( MIN( N, J+KL )-L+1, AB( K, J ), 1, SCALE,
+     $                   SUM )
    90    CONTINUE
          VALUE = SCALE*SQRT( SUM )
       END IF
diff --git a/SRC/clange.f b/SRC/clange.f
index 14d487b26f..6e6304f325 100644
--- a/SRC/clange.f
+++ b/SRC/clange.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLANGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clange.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clange.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEauxiliary
+*> \ingroup lange
 *
 *  =====================================================================
       REAL             FUNCTION CLANGE( NORM, M, N, A, LDA, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,7 +189,8 @@ REAL             FUNCTION CLANGE( NORM, M, N, A, LDA, WORK )
             TEMP = WORK( I )
             IF( VALUE.LT.TEMP .OR. SISNAN( TEMP ) ) VALUE = TEMP
    80    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/clangt.f b/SRC/clangt.f
index a778c6702a..9d6a4679b0 100644
--- a/SRC/clangt.f
+++ b/SRC/clangt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLANGT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clangt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clangt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -99,10 +97,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup langt
 *
 *  =====================================================================
       REAL             FUNCTION CLANGT( NORM, N, DL, D, DU )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -146,11 +145,13 @@ REAL             FUNCTION CLANGT( NORM, N, DL, D, DU )
 *
          ANORM = ABS( D( N ) )
          DO 10 I = 1, N - 1
-            IF( ANORM.LT.ABS( DL( I ) ) .OR. SISNAN( ABS( DL( I ) ) ) )
+            IF( ANORM.LT.ABS( DL( I ) ) .OR.
+     $          SISNAN( ABS( DL( I ) ) ) )
      $           ANORM = ABS(DL(I))
             IF( ANORM.LT.ABS( D( I ) ) .OR. SISNAN( ABS( D( I ) ) ) )
      $           ANORM = ABS(D(I))
-            IF( ANORM.LT.ABS( DU( I ) ) .OR. SISNAN (ABS( DU( I ) ) ) )
+            IF( ANORM.LT.ABS( DU( I ) ) .OR.
+     $          SISNAN (ABS( DU( I ) ) ) )
      $           ANORM = ABS(DU(I))
    10    CONTINUE
       ELSE IF( LSAME( NORM, 'O' ) .OR. NORM.EQ.'1' ) THEN
@@ -183,7 +184,8 @@ REAL             FUNCTION CLANGT( NORM, N, DL, D, DU )
                IF( ANORM .LT. TEMP .OR. SISNAN( TEMP ) ) ANORM = TEMP
    30       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/clanhb.f b/SRC/clanhb.f
index 1eae7fbe74..57b41ab959 100644
--- a/SRC/clanhb.f
+++ b/SRC/clanhb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLANHB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clanhb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clanhb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -124,11 +122,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lanhb
 *
 *  =====================================================================
       REAL             FUNCTION CLANHB( NORM, UPLO, N, K, AB, LDAB,
      $                 WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -191,7 +190,8 @@ REAL             FUNCTION CLANHB( NORM, UPLO, N, K, AB, LDAB,
    30          CONTINUE
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is hermitian).
@@ -227,7 +227,8 @@ REAL             FUNCTION CLANHB( NORM, UPLO, N, K, AB, LDAB,
                IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
@@ -236,7 +237,8 @@ REAL             FUNCTION CLANHB( NORM, UPLO, N, K, AB, LDAB,
          IF( K.GT.0 ) THEN
             IF( LSAME( UPLO, 'U' ) ) THEN
                DO 110 J = 2, N
-                  CALL CLASSQ( MIN( J-1, K ), AB( MAX( K+2-J, 1 ), J ),
+                  CALL CLASSQ( MIN( J-1, K ), AB( MAX( K+2-J, 1 ),
+     $                         J ),
      $                         1, SCALE, SUM )
   110          CONTINUE
                L = K + 1
diff --git a/SRC/clanhe.f b/SRC/clanhe.f
index 8181b329ef..aaf07aba56 100644
--- a/SRC/clanhe.f
+++ b/SRC/clanhe.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLANHE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clanhe.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clanhe.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,10 +115,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEauxiliary
+*> \ingroup lanhe
 *
 *  =====================================================================
       REAL             FUNCTION CLANHE( NORM, UPLO, N, A, LDA, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,7 +182,8 @@ REAL             FUNCTION CLANHE( NORM, UPLO, N, A, LDA, WORK )
    30          CONTINUE
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is hermitian).
@@ -217,7 +217,8 @@ REAL             FUNCTION CLANHE( NORM, UPLO, N, A, LDA, WORK )
                IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/clanhf.f b/SRC/clanhf.f
index 4ce70602df..7282b3b0cc 100644
--- a/SRC/clanhf.f
+++ b/SRC/clanhf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLANHF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clanhf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clanhf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -131,7 +129,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup lanhf
 *
 *> \par Further Details:
 *  =====================
@@ -243,6 +241,7 @@
 *>
 *  =====================================================================
       REAL FUNCTION CLANHF( NORM, TRANSR, UPLO, N, A, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -677,7 +676,8 @@ REAL FUNCTION CLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                END IF
             END IF
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *       Find normI(A) ( = norm1(A), since A is Hermitian).
@@ -1129,7 +1129,8 @@ REAL FUNCTION CLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                END IF
             END IF
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *       Find normF(A).
 *
@@ -1143,7 +1144,8 @@ REAL FUNCTION CLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                IF( ILU.EQ.0 ) THEN
 *                 A is upper
                   DO J = 0, K - 3
-                     CALL CLASSQ( K-J-2, A( K+J+1+J*LDA ), 1, SCALE, S )
+                     CALL CLASSQ( K-J-2, A( K+J+1+J*LDA ), 1, SCALE,
+     $                            S )
 *                    L at A(k,0)
                   END DO
                   DO J = 0, K - 1
@@ -1190,11 +1192,13 @@ REAL FUNCTION CLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                ELSE
 *                 ilu=1 & A is lower
                   DO J = 0, K - 1
-                     CALL CLASSQ( N-J-1, A( J+1+J*LDA ), 1, SCALE, S )
+                     CALL CLASSQ( N-J-1, A( J+1+J*LDA ), 1, SCALE,
+     $                            S )
 *                    trap L at A(0,0)
                   END DO
                   DO J = 1, K - 2
-                     CALL CLASSQ( J, A( 0+( 1+J )*LDA ), 1, SCALE, S )
+                     CALL CLASSQ( J, A( 0+( 1+J )*LDA ), 1, SCALE,
+     $                            S )
 *                    U at A(0,1)
                   END DO
                   S = S + S
@@ -1240,7 +1244,8 @@ REAL FUNCTION CLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                IF( ILU.EQ.0 ) THEN
 *                 A**H is upper
                   DO J = 1, K - 2
-                     CALL CLASSQ( J, A( 0+( K+J )*LDA ), 1, SCALE, S )
+                     CALL CLASSQ( J, A( 0+( K+J )*LDA ), 1, SCALE,
+     $                            S )
 *                    U at A(0,k)
                   END DO
                   DO J = 0, K - 2
@@ -1302,7 +1307,8 @@ REAL FUNCTION CLANHF( NORM, TRANSR, UPLO, N, A, WORK )
 *                    k by k-1 rect. at A(0,k)
                   END DO
                   DO J = 0, K - 3
-                     CALL CLASSQ( K-J-2, A( J+2+J*LDA ), 1, SCALE, S )
+                     CALL CLASSQ( K-J-2, A( J+2+J*LDA ), 1, SCALE,
+     $                            S )
 *                    L at A(1,0)
                   END DO
                   S = S + S
@@ -1352,7 +1358,8 @@ REAL FUNCTION CLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                IF( ILU.EQ.0 ) THEN
 *                 A is upper
                   DO J = 0, K - 2
-                     CALL CLASSQ( K-J-1, A( K+J+2+J*LDA ), 1, SCALE, S )
+                     CALL CLASSQ( K-J-1, A( K+J+2+J*LDA ), 1, SCALE,
+     $                            S )
 *                 L at A(k+1,0)
                   END DO
                   DO J = 0, K - 1
@@ -1389,7 +1396,8 @@ REAL FUNCTION CLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                ELSE
 *                 ilu=1 & A is lower
                   DO J = 0, K - 1
-                     CALL CLASSQ( N-J-1, A( J+2+J*LDA ), 1, SCALE, S )
+                     CALL CLASSQ( N-J-1, A( J+2+J*LDA ), 1, SCALE,
+     $                            S )
 *                    trap L at A(1,0)
                   END DO
                   DO J = 1, K - 1
@@ -1429,7 +1437,8 @@ REAL FUNCTION CLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                IF( ILU.EQ.0 ) THEN
 *                 A**H is upper
                   DO J = 1, K - 1
-                     CALL CLASSQ( J, A( 0+( K+1+J )*LDA ), 1, SCALE, S )
+                     CALL CLASSQ( J, A( 0+( K+1+J )*LDA ), 1, SCALE,
+     $                            S )
 *                 U at A(0,k+1)
                   END DO
                   DO J = 0, K - 1
@@ -1437,7 +1446,8 @@ REAL FUNCTION CLANHF( NORM, TRANSR, UPLO, N, A, WORK )
 *                 k by k rect. at A(0,0)
                   END DO
                   DO J = 0, K - 2
-                     CALL CLASSQ( K-J-1, A( J+1+( J+K )*LDA ), 1, SCALE,
+                     CALL CLASSQ( K-J-1, A( J+1+( J+K )*LDA ), 1,
+     $                            SCALE,
      $                            S )
 *                 L at A(0,k)
                   END DO
@@ -1495,7 +1505,8 @@ REAL FUNCTION CLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                ELSE
 *                 A**H is lower
                   DO J = 1, K - 1
-                     CALL CLASSQ( J, A( 0+( J+1 )*LDA ), 1, SCALE, S )
+                     CALL CLASSQ( J, A( 0+( J+1 )*LDA ), 1, SCALE,
+     $                            S )
 *                 U at A(0,1)
                   END DO
                   DO J = K + 1, N
@@ -1503,7 +1514,8 @@ REAL FUNCTION CLANHF( NORM, TRANSR, UPLO, N, A, WORK )
 *                 k by k rect. at A(0,k+1)
                   END DO
                   DO J = 0, K - 2
-                     CALL CLASSQ( K-J-1, A( J+1+J*LDA ), 1, SCALE, S )
+                     CALL CLASSQ( K-J-1, A( J+1+J*LDA ), 1, SCALE,
+     $                            S )
 *                 L at A(0,0)
                   END DO
                   S = S + S
diff --git a/SRC/clanhp.f b/SRC/clanhp.f
index ff99a73537..1c48f1c18f 100644
--- a/SRC/clanhp.f
+++ b/SRC/clanhp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLANHP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clanhp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clanhp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -110,10 +108,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lanhp
 *
 *  =====================================================================
       REAL             FUNCTION CLANHP( NORM, UPLO, N, AP, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -180,7 +179,8 @@ REAL             FUNCTION CLANHP( NORM, UPLO, N, AP, WORK )
                K = K + N - J + 1
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is hermitian).
@@ -219,7 +219,8 @@ REAL             FUNCTION CLANHP( NORM, UPLO, N, AP, WORK )
                IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/clanhs.f b/SRC/clanhs.f
index faf86124ad..9ce1cabb64 100644
--- a/SRC/clanhs.f
+++ b/SRC/clanhs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLANHS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clanhs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clanhs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lanhs
 *
 *  =====================================================================
       REAL             FUNCTION CLANHS( NORM, N, A, LDA, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -184,7 +183,8 @@ REAL             FUNCTION CLANHS( NORM, N, A, LDA, WORK )
             SUM = WORK( I )
             IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
    80    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/clanht.f b/SRC/clanht.f
index 5ac3d4b1d2..987765e281 100644
--- a/SRC/clanht.f
+++ b/SRC/clanht.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLANHT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clanht.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clanht.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -94,10 +92,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lanht
 *
 *  =====================================================================
       REAL             FUNCTION CLANHT( NORM, N, D, E )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -163,7 +162,8 @@ REAL             FUNCTION CLANHT( NORM, N, D, E )
                IF( ANORM .LT. SUM .OR. SISNAN( SUM ) ) ANORM = SUM
    20       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/clansb.f b/SRC/clansb.f
index b95f6335f2..958f2f0b5e 100644
--- a/SRC/clansb.f
+++ b/SRC/clansb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLANSB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clansb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clansb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,11 +120,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lanhb
 *
 *  =====================================================================
       REAL             FUNCTION CLANSB( NORM, UPLO, N, K, AB, LDAB,
      $                 WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -185,7 +184,8 @@ REAL             FUNCTION CLANSB( NORM, UPLO, N, K, AB, LDAB,
    30          CONTINUE
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is symmetric).
@@ -221,7 +221,8 @@ REAL             FUNCTION CLANSB( NORM, UPLO, N, K, AB, LDAB,
                IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
@@ -230,7 +231,8 @@ REAL             FUNCTION CLANSB( NORM, UPLO, N, K, AB, LDAB,
          IF( K.GT.0 ) THEN
             IF( LSAME( UPLO, 'U' ) ) THEN
                DO 110 J = 2, N
-                  CALL CLASSQ( MIN( J-1, K ), AB( MAX( K+2-J, 1 ), J ),
+                  CALL CLASSQ( MIN( J-1, K ), AB( MAX( K+2-J, 1 ),
+     $                         J ),
      $                         1, SCALE, SUM )
   110          CONTINUE
                L = K + 1
diff --git a/SRC/clansp.f b/SRC/clansp.f
index 1065066d33..11741d6b0c 100644
--- a/SRC/clansp.f
+++ b/SRC/clansp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLANSP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clansp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clansp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lanhp
 *
 *  =====================================================================
       REAL             FUNCTION CLANSP( NORM, UPLO, N, AP, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -174,7 +173,8 @@ REAL             FUNCTION CLANSP( NORM, UPLO, N, AP, WORK )
                K = K + N - J + 1
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is symmetric).
@@ -213,7 +213,8 @@ REAL             FUNCTION CLANSP( NORM, UPLO, N, AP, WORK )
                IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/clansy.f b/SRC/clansy.f
index 478c14040d..54cb96228e 100644
--- a/SRC/clansy.f
+++ b/SRC/clansy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLANSY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clansy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clansy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -116,10 +114,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYauxiliary
+*> \ingroup lanhe
 *
 *  =====================================================================
       REAL             FUNCTION CLANSY( NORM, UPLO, N, A, LDA, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -178,7 +177,8 @@ REAL             FUNCTION CLANSY( NORM, UPLO, N, A, LDA, WORK )
    30          CONTINUE
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is symmetric).
@@ -212,7 +212,8 @@ REAL             FUNCTION CLANSY( NORM, UPLO, N, A, LDA, WORK )
                IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/clantb.f b/SRC/clantb.f
index f7747b6edd..988bedcaad 100644
--- a/SRC/clantb.f
+++ b/SRC/clantb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLANTB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clantb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clantb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,11 +131,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lantb
 *
 *  =====================================================================
       REAL             FUNCTION CLANTB( NORM, UPLO, DIAG, N, K, AB,
      $                 LDAB, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -187,14 +186,16 @@ REAL             FUNCTION CLANTB( NORM, UPLO, DIAG, N, K, AB,
                DO 20 J = 1, N
                   DO 10 I = MAX( K+2-J, 1 ), K
                      SUM = ABS( AB( I, J ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    10             CONTINUE
    20          CONTINUE
             ELSE
                DO 40 J = 1, N
                   DO 30 I = 2, MIN( N+1-J, K+1 )
                      SUM = ABS( AB( I, J ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    30             CONTINUE
    40          CONTINUE
             END IF
@@ -204,14 +205,16 @@ REAL             FUNCTION CLANTB( NORM, UPLO, DIAG, N, K, AB,
                DO 60 J = 1, N
                   DO 50 I = MAX( K+2-J, 1 ), K + 1
                      SUM = ABS( AB( I, J ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    50             CONTINUE
    60          CONTINUE
             ELSE
                DO 80 J = 1, N
                   DO 70 I = 1, MIN( N+1-J, K+1 )
                      SUM = ABS( AB( I, J ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    70             CONTINUE
    80          CONTINUE
             END IF
@@ -307,14 +310,15 @@ REAL             FUNCTION CLANTB( NORM, UPLO, DIAG, N, K, AB,
             SUM = WORK( I )
             IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
   270    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
          IF( LSAME( UPLO, 'U' ) ) THEN
             IF( LSAME( DIAG, 'U' ) ) THEN
                SCALE = ONE
-               SUM = N
+               SUM = REAL( N )
                IF( K.GT.0 ) THEN
                   DO 280 J = 2, N
                      CALL CLASSQ( MIN( J-1, K ),
@@ -326,17 +330,19 @@ REAL             FUNCTION CLANTB( NORM, UPLO, DIAG, N, K, AB,
                SCALE = ZERO
                SUM = ONE
                DO 290 J = 1, N
-                  CALL CLASSQ( MIN( J, K+1 ), AB( MAX( K+2-J, 1 ), J ),
+                  CALL CLASSQ( MIN( J, K+1 ), AB( MAX( K+2-J, 1 ),
+     $                         J ),
      $                         1, SCALE, SUM )
   290          CONTINUE
             END IF
          ELSE
             IF( LSAME( DIAG, 'U' ) ) THEN
                SCALE = ONE
-               SUM = N
+               SUM = REAL( N )
                IF( K.GT.0 ) THEN
                   DO 300 J = 1, N - 1
-                     CALL CLASSQ( MIN( N-J, K ), AB( 2, J ), 1, SCALE,
+                     CALL CLASSQ( MIN( N-J, K ), AB( 2, J ), 1,
+     $                            SCALE,
      $                            SUM )
   300             CONTINUE
                END IF
@@ -344,7 +350,8 @@ REAL             FUNCTION CLANTB( NORM, UPLO, DIAG, N, K, AB,
                SCALE = ZERO
                SUM = ONE
                DO 310 J = 1, N
-                  CALL CLASSQ( MIN( N-J+1, K+1 ), AB( 1, J ), 1, SCALE,
+                  CALL CLASSQ( MIN( N-J+1, K+1 ), AB( 1, J ), 1,
+     $                         SCALE,
      $                         SUM )
   310          CONTINUE
             END IF
diff --git a/SRC/clantp.f b/SRC/clantp.f
index f7169360eb..c645e814d3 100644
--- a/SRC/clantp.f
+++ b/SRC/clantp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLANTP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clantp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clantp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -118,10 +116,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lantp
 *
 *  =====================================================================
-      REAL             FUNCTION CLANTP( NORM, UPLO, DIAG, N, AP, WORK )
+      REAL             FUNCTION CLANTP( NORM, UPLO, DIAG, N, AP,
+     $                                  WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,7 +172,8 @@ REAL             FUNCTION CLANTP( NORM, UPLO, DIAG, N, AP, WORK )
                DO 20 J = 1, N
                   DO 10 I = K, K + J - 2
                      SUM = ABS( AP( I ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    10             CONTINUE
                   K = K + J
    20          CONTINUE
@@ -180,7 +181,8 @@ REAL             FUNCTION CLANTP( NORM, UPLO, DIAG, N, AP, WORK )
                DO 40 J = 1, N
                   DO 30 I = K + 1, K + N - J
                      SUM = ABS( AP( I ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    30             CONTINUE
                   K = K + N - J + 1
    40          CONTINUE
@@ -191,7 +193,8 @@ REAL             FUNCTION CLANTP( NORM, UPLO, DIAG, N, AP, WORK )
                DO 60 J = 1, N
                   DO 50 I = K, K + J - 1
                      SUM = ABS( AP( I ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    50             CONTINUE
                   K = K + J
    60          CONTINUE
@@ -199,7 +202,8 @@ REAL             FUNCTION CLANTP( NORM, UPLO, DIAG, N, AP, WORK )
                DO 80 J = 1, N
                   DO 70 I = K, K + N - J
                      SUM = ABS( AP( I ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    70             CONTINUE
                   K = K + N - J + 1
    80          CONTINUE
@@ -302,14 +306,15 @@ REAL             FUNCTION CLANTP( NORM, UPLO, DIAG, N, AP, WORK )
             SUM = WORK( I )
             IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
   270    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
          IF( LSAME( UPLO, 'U' ) ) THEN
             IF( LSAME( DIAG, 'U' ) ) THEN
                SCALE = ONE
-               SUM = N
+               SUM = REAL( N )
                K = 2
                DO 280 J = 2, N
                   CALL CLASSQ( J-1, AP( K ), 1, SCALE, SUM )
@@ -327,7 +332,7 @@ REAL             FUNCTION CLANTP( NORM, UPLO, DIAG, N, AP, WORK )
          ELSE
             IF( LSAME( DIAG, 'U' ) ) THEN
                SCALE = ONE
-               SUM = N
+               SUM = REAL( N )
                K = 2
                DO 300 J = 1, N - 1
                   CALL CLASSQ( N-J, AP( K ), 1, SCALE, SUM )
diff --git a/SRC/clantr.f b/SRC/clantr.f
index f1dce1402d..c91bec250a 100644
--- a/SRC/clantr.f
+++ b/SRC/clantr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLANTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clantr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clantr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -134,11 +132,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lantr
 *
 *  =====================================================================
-      REAL             FUNCTION CLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
+      REAL             FUNCTION CLANTR( NORM, UPLO, DIAG, M, N, A,
+     $                                  LDA,
      $                 WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,14 +188,16 @@ REAL             FUNCTION CLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
                DO 20 J = 1, N
                   DO 10 I = 1, MIN( M, J-1 )
                      SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    10             CONTINUE
    20          CONTINUE
             ELSE
                DO 40 J = 1, N
                   DO 30 I = J + 1, M
                      SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    30             CONTINUE
    40          CONTINUE
             END IF
@@ -205,14 +207,16 @@ REAL             FUNCTION CLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
                DO 60 J = 1, N
                   DO 50 I = 1, MIN( M, J )
                      SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    50             CONTINUE
    60          CONTINUE
             ELSE
                DO 80 J = 1, N
                   DO 70 I = J, M
                      SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    70             CONTINUE
    80          CONTINUE
             END IF
@@ -307,28 +311,31 @@ REAL             FUNCTION CLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
             SUM = WORK( I )
             IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
   280    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
          IF( LSAME( UPLO, 'U' ) ) THEN
             IF( LSAME( DIAG, 'U' ) ) THEN
                SCALE = ONE
-               SUM = MIN( M, N )
+               SUM = REAL( MIN( M, N ) )
                DO 290 J = 2, N
-                  CALL CLASSQ( MIN( M, J-1 ), A( 1, J ), 1, SCALE, SUM )
+                  CALL CLASSQ( MIN( M, J-1 ), A( 1, J ), 1, SCALE,
+     $                         SUM )
   290          CONTINUE
             ELSE
                SCALE = ZERO
                SUM = ONE
                DO 300 J = 1, N
-                  CALL CLASSQ( MIN( M, J ), A( 1, J ), 1, SCALE, SUM )
+                  CALL CLASSQ( MIN( M, J ), A( 1, J ), 1, SCALE,
+     $                         SUM )
   300          CONTINUE
             END IF
          ELSE
             IF( LSAME( DIAG, 'U' ) ) THEN
                SCALE = ONE
-               SUM = MIN( M, N )
+               SUM = REAL( MIN( M, N ) )
                DO 310 J = 1, N
                   CALL CLASSQ( M-J, A( MIN( M, J+1 ), J ), 1, SCALE,
      $                         SUM )
diff --git a/SRC/clapll.f b/SRC/clapll.f
index 2fea2b1a31..0609d1a2c5 100644
--- a/SRC/clapll.f
+++ b/SRC/clapll.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAPLL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clapll.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clapll.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -93,10 +91,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lapll
 *
 *  =====================================================================
       SUBROUTINE CLAPLL( N, X, INCX, Y, INCY, SSMIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clapmr.f b/SRC/clapmr.f
index fa6193fc3a..fde91c839e 100644
--- a/SRC/clapmr.f
+++ b/SRC/clapmr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAPMR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clapmr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clapmr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lapmr
 *
 *  =====================================================================
       SUBROUTINE CLAPMR( FORWRD, M, N, X, LDX, K )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clapmt.f b/SRC/clapmt.f
index e1230aeba9..285cbaff42 100644
--- a/SRC/clapmt.f
+++ b/SRC/clapmt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAPMT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clapmt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clapmt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lapmt
 *
 *  =====================================================================
       SUBROUTINE CLAPMT( FORWRD, M, N, X, LDX, K )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/claqgb.f b/SRC/claqgb.f
index 3f1e824dbf..9b30e5acdb 100644
--- a/SRC/claqgb.f
+++ b/SRC/claqgb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQGB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqgb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqgb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -152,11 +150,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBauxiliary
+*> \ingroup laqgb
 *
 *  =====================================================================
-      SUBROUTINE CLAQGB( M, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+      SUBROUTINE CLAQGB( M, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                   COLCND,
      $                   AMAX, EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/claqge.f b/SRC/claqge.f
index ae20ab7a02..cee3769705 100644
--- a/SRC/claqge.f
+++ b/SRC/claqge.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqge.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqge.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,11 +133,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEauxiliary
+*> \ingroup laqge
 *
 *  =====================================================================
       SUBROUTINE CLAQGE( M, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
      $                   EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/claqhb.f b/SRC/claqhb.f
index 0ee2a1e595..22a601ea38 100644
--- a/SRC/claqhb.f
+++ b/SRC/claqhb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQHB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqhb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqhb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -134,10 +132,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup laqhb
 *
 *  =====================================================================
-      SUBROUTINE CLAQHB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX, EQUED )
+      SUBROUTINE CLAQHB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX,
+     $                   EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/claqhe.f b/SRC/claqhe.f
index 619c35260f..905e0319bb 100644
--- a/SRC/claqhe.f
+++ b/SRC/claqhe.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQHE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqhe.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqhe.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,10 +125,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexHEauxiliary
+*> \ingroup laqhe
 *
 *  =====================================================================
       SUBROUTINE CLAQHE( UPLO, N, A, LDA, S, SCOND, AMAX, EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/claqhp.f b/SRC/claqhp.f
index e4088f7da6..7a8ad84451 100644
--- a/SRC/claqhp.f
+++ b/SRC/claqhp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQHP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqhp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqhp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,10 +117,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup laqhp
 *
 *  =====================================================================
       SUBROUTINE CLAQHP( UPLO, N, AP, S, SCOND, AMAX, EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/claqp2.f b/SRC/claqp2.f
index 6e41afeb4a..ea1e4edfcb 100644
--- a/SRC/claqp2.f
+++ b/SRC/claqp2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQP2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqp2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqp2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,7 +120,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup laqp2
 *
 *> \par Contributors:
 *  ==================
@@ -139,13 +137,12 @@
 *>
 *> LAPACK Working Note 176
 *
-*> \htmlonly
 *> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">[PDF]</a>
-*> \endhtmlonly
 *
 *  =====================================================================
       SUBROUTINE CLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
      $                   WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -164,17 +161,14 @@ SUBROUTINE CLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
 *
 *     .. Parameters ..
       REAL               ZERO, ONE
-      COMPLEX            CONE
-      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0,
-     $                   CONE = ( 1.0E+0, 0.0E+0 ) )
+      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0 )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I, ITEMP, J, MN, OFFPI, PVT
       REAL               TEMP, TEMP2, TOL3Z
-      COMPLEX            AII
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLARF, CLARFG, CSWAP
+      EXTERNAL           CLARF1F, CLARFG, CSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, CONJG, MAX, MIN, SQRT
@@ -211,7 +205,8 @@ SUBROUTINE CLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
 *        Generate elementary reflector H(i).
 *
          IF( OFFPI.LT.M ) THEN
-            CALL CLARFG( M-OFFPI+1, A( OFFPI, I ), A( OFFPI+1, I ), 1,
+            CALL CLARFG( M-OFFPI+1, A( OFFPI, I ), A( OFFPI+1, I ),
+     $                   1,
      $                   TAU( I ) )
          ELSE
             CALL CLARFG( 1, A( M, I ), A( M, I ), 1, TAU( I ) )
@@ -221,12 +216,9 @@ SUBROUTINE CLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
 *
 *           Apply H(i)**H to A(offset+i:m,i+1:n) from the left.
 *
-            AII = A( OFFPI, I )
-            A( OFFPI, I ) = CONE
-            CALL CLARF( 'Left', M-OFFPI+1, N-I, A( OFFPI, I ), 1,
-     $                  CONJG( TAU( I ) ), A( OFFPI, I+1 ), LDA,
-     $                  WORK( 1 ) )
-            A( OFFPI, I ) = AII
+            CALL CLARF1F( 'Left', M-OFFPI+1, N-I, A( OFFPI, I ), 1,
+     $                    CONJG( TAU( I ) ), A( OFFPI, I+1 ), LDA,
+     $                    WORK( 1 ) )
          END IF
 *
 *        Update partial column norms.
diff --git a/SRC/claqp2rk.f b/SRC/claqp2rk.f
new file mode 100644
index 0000000000..12ebf2d940
--- /dev/null
+++ b/SRC/claqp2rk.f
@@ -0,0 +1,711 @@
+*> \brief \b CLAQP2RK computes truncated QR factorization with column pivoting of a complex matrix block using Level 2 BLAS and overwrites a complex m-by-nrhs matrix B with Q**H * B.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download CLAQP2RK + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqp2rk.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/claqp2rk.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqp2rk.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*      SUBROUTINE CLAQP2RK( M, N, NRHS, IOFFSET, KMAX, ABSTOL, RELTOL,
+*     $                     KP1, MAXC2NRM, A, LDA, K, MAXC2NRMK,
+*     $                     RELMAXC2NRMK, JPIV, TAU, VN1, VN2, WORK,
+*     $                     INFO )
+*      IMPLICIT NONE
+*
+*     .. Scalar Arguments ..
+*      INTEGER            INFO, IOFFSET, KP1, K, KMAX, LDA, M, N, NRHS
+*      REAL               ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+*     $                   RELTOL
+*     ..
+*     .. Array Arguments ..
+*      INTEGER            JPIV( * )
+*      REAL               VN1( * ), VN2( * )
+*      COMPLEX            A( LDA, * ), TAU( * ), WORK( * )
+*     $
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> CLAQP2RK computes a truncated (rank K) or full rank Householder QR
+*> factorization with column pivoting of the complex matrix
+*> block A(IOFFSET+1:M,1:N) as
+*>
+*>   A * P(K) = Q(K) * R(K).
+*>
+*> The routine uses Level 2 BLAS. The block A(1:IOFFSET,1:N)
+*> is accordingly pivoted, but not factorized.
+*>
+*> The routine also overwrites the right-hand-sides matrix block B
+*> stored in A(IOFFSET+1:M,N+1:N+NRHS) with Q(K)**H * B.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of
+*>          columns of the matrix B. NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] IOFFSET
+*> \verbatim
+*>          IOFFSET is INTEGER
+*>          The number of rows of the matrix A that must be pivoted
+*>          but not factorized. IOFFSET >= 0.
+*>
+*>          IOFFSET also represents the number of columns of the whole
+*>          original matrix A_orig that have been factorized
+*>          in the previous steps.
+*> \endverbatim
+*>
+*> \param[in] KMAX
+*> \verbatim
+*>          KMAX is INTEGER
+*>
+*>          The first factorization stopping criterion. KMAX >= 0.
+*>
+*>          The maximum number of columns of the matrix A to factorize,
+*>          i.e. the maximum factorization rank.
+*>
+*>          a) If KMAX >= min(M-IOFFSET,N), then this stopping
+*>                criterion is not used, factorize columns
+*>                depending on ABSTOL and RELTOL.
+*>
+*>          b) If KMAX = 0, then this stopping criterion is
+*>             satisfied on input and the routine exits immediately.
+*>             This means that the factorization is not performed,
+*>             the matrices A and B and the arrays TAU, IPIV
+*>             are not modified.
+*> \endverbatim
+*>
+*> \param[in] ABSTOL
+*> \verbatim
+*>          ABSTOL is REAL, cannot be NaN.
+*>
+*>          The second factorization stopping criterion.
+*>
+*>          The absolute tolerance (stopping threshold) for
+*>          maximum column 2-norm of the residual matrix.
+*>          The algorithm converges (stops the factorization) when
+*>          the maximum column 2-norm of the residual matrix
+*>          is less than or equal to ABSTOL.
+*>
+*>          a) If ABSTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on KMAX and RELTOL.
+*>                This includes the case ABSTOL = -Inf.
+*>
+*>          b) If 0.0 <= ABSTOL then the input value
+*>                of ABSTOL is used.
+*> \endverbatim
+*>
+*> \param[in] RELTOL
+*> \verbatim
+*>          RELTOL is REAL, cannot be NaN.
+*>
+*>          The third factorization stopping criterion.
+*>
+*>          The tolerance (stopping threshold) for the ratio of the
+*>          maximum column 2-norm of the residual matrix to the maximum
+*>          column 2-norm of the original matrix A_orig. The algorithm
+*>          converges (stops the factorization), when this ratio is
+*>          less than or equal to RELTOL.
+*>
+*>          a) If RELTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on KMAX and ABSTOL.
+*>                This includes the case RELTOL = -Inf.
+*>
+*>          d) If 0.0 <= RELTOL then the input value of RELTOL
+*>                is used.
+*> \endverbatim
+*>
+*> \param[in] KP1
+*> \verbatim
+*>          KP1 is INTEGER
+*>          The index of the column with the maximum 2-norm in
+*>          the whole original matrix A_orig determined in the
+*>          main routine CGEQP3RK. 1 <= KP1 <= N_orig_mat.
+*> \endverbatim
+*>
+*> \param[in] MAXC2NRM
+*> \verbatim
+*>          MAXC2NRM is REAL
+*>          The maximum column 2-norm of the whole original
+*>          matrix A_orig computed in the main routine CGEQP3RK.
+*>          MAXC2NRM >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX array, dimension (LDA,N+NRHS)
+*>          On entry:
+*>              the M-by-N matrix A and M-by-NRHS matrix B, as in
+*>
+*>                                  N     NRHS
+*>              array_A   =   M  [ mat_A, mat_B ]
+*>
+*>          On exit:
+*>          1. The elements in block A(IOFFSET+1:M,1:K) below
+*>             the diagonal together with the array TAU represent
+*>             the unitary matrix Q(K) as a product of elementary
+*>             reflectors.
+*>          2. The upper triangular block of the matrix A stored
+*>             in A(IOFFSET+1:M,1:K) is the triangular factor obtained.
+*>          3. The block of the matrix A stored in A(1:IOFFSET,1:N)
+*>             has been accordingly pivoted, but not factorized.
+*>          4. The rest of the array A, block A(IOFFSET+1:M,K+1:N+NRHS).
+*>             The left part A(IOFFSET+1:M,K+1:N) of this block
+*>             contains the residual of the matrix A, and,
+*>             if NRHS > 0, the right part of the block
+*>             A(IOFFSET+1:M,N+1:N+NRHS) contains the block of
+*>             the right-hand-side matrix B. Both these blocks have been
+*>             updated by multiplication from the left by Q(K)**H.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] K
+*> \verbatim
+*>          K is INTEGER
+*>          Factorization rank of the matrix A, i.e. the rank of
+*>          the factor R, which is the same as the number of non-zero
+*>          rows of the factor R. 0 <= K <= min(M-IOFFSET,KMAX,N).
+*>
+*>          K also represents the number of non-zero Householder
+*>          vectors.
+*> \endverbatim
+*>
+*> \param[out] MAXC2NRMK
+*> \verbatim
+*>          MAXC2NRMK is REAL
+*>          The maximum column 2-norm of the residual matrix,
+*>          when the factorization stopped at rank K. MAXC2NRMK >= 0.
+*> \endverbatim
+*>
+*> \param[out] RELMAXC2NRMK
+*> \verbatim
+*>          RELMAXC2NRMK is REAL
+*>          The ratio MAXC2NRMK / MAXC2NRM of the maximum column
+*>          2-norm of the residual matrix (when the factorization
+*>          stopped at rank K) to the maximum column 2-norm of the
+*>          whole original matrix A. RELMAXC2NRMK >= 0.
+*> \endverbatim
+*>
+*> \param[out] JPIV
+*> \verbatim
+*>          JPIV is INTEGER array, dimension (N)
+*>          Column pivot indices, for 1 <= j <= N, column j
+*>          of the matrix A was interchanged with column JPIV(j).
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is COMPLEX array, dimension (min(M-IOFFSET,N))
+*>          The scalar factors of the elementary reflectors.
+*> \endverbatim
+*>
+*> \param[in,out] VN1
+*> \verbatim
+*>          VN1 is REAL array, dimension (N)
+*>          The vector with the partial column norms.
+*> \endverbatim
+*>
+*> \param[in,out] VN2
+*> \verbatim
+*>          VN2 is REAL array, dimension (N)
+*>          The vector with the exact column norms.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX array, dimension (N-1)
+*>          Used in CLARF1F subroutine to apply an elementary
+*>          reflector from the left.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          1) INFO = 0: successful exit.
+*>          2) If INFO = j_1, where 1 <= j_1 <= N, then NaN was
+*>             detected and the routine stops the computation.
+*>             The j_1-th column of the matrix A or the j_1-th
+*>             element of array TAU contains the first occurrence
+*>             of NaN in the factorization step K+1 ( when K columns
+*>             have been factorized ).
+*>
+*>             On exit:
+*>             K                  is set to the number of
+*>                                   factorized columns without
+*>                                   exception.
+*>             MAXC2NRMK          is set to NaN.
+*>             RELMAXC2NRMK       is set to NaN.
+*>             TAU(K+1:min(M,N))  is not set and contains undefined
+*>                                   elements. If j_1=K+1, TAU(K+1)
+*>                                   may contain NaN.
+*>          3) If INFO = j_2, where N+1 <= j_2 <= 2*N, then no NaN
+*>             was detected, but +Inf (or -Inf) was detected and
+*>             the routine continues the computation until completion.
+*>             The (j_2-N)-th column of the matrix A contains the first
+*>             occurrence of +Inf (or -Inf) in the factorization
+*>             step K+1 ( when K columns have been factorized ).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup laqp2rk
+*
+*> \par References:
+*  ================
+*> [1] A Level 3 BLAS QR factorization algorithm with column pivoting developed in 1996.
+*> G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain.
+*> X. Sun, Computer Science Dept., Duke University, USA.
+*> C. H. Bischof, Math. and Comp. Sci. Div., Argonne National Lab, USA.
+*> A BLAS-3 version of the QR factorization with column pivoting.
+*> LAPACK Working Note 114
+*> <a href="https://www.netlib.org/lapack/lawnspdf/lawn114.pdf">https://www.netlib.org/lapack/lawnspdf/lawn114.pdf</a>
+*> and in
+*> SIAM J. Sci. Comput., 19(5):1486-1494, Sept. 1998.
+*> <a href="https://doi.org/10.1137/S1064827595296732">https://doi.org/10.1137/S1064827595296732</a>
+*>
+*> [2] A partial column norm updating strategy developed in 2006.
+*> Z. Drmac and Z. Bujanovic, Dept. of Math., University of Zagreb, Croatia.
+*> On the failure of rank revealing QR factorization software – a case study.
+*> LAPACK Working Note 176.
+*> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">http://www.netlib.org/lapack/lawnspdf/lawn176.pdf</a>
+*> and in
+*> ACM Trans. Math. Softw. 35, 2, Article 12 (July 2008), 28 pages.
+*> <a href="https://doi.org/10.1145/1377612.1377616">https://doi.org/10.1145/1377612.1377616</a>
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
+*>
+*>  November  2023, Igor Kozachenko, James Demmel,
+*>                  EECS Department,
+*>                  University of California, Berkeley, USA.
+*>
+*> \endverbatim
+*
+*  =====================================================================
+      SUBROUTINE CLAQP2RK( M, N, NRHS, IOFFSET, KMAX, ABSTOL, RELTOL,
+     $                     KP1, MAXC2NRM, A, LDA, K, MAXC2NRMK,
+     $                     RELMAXC2NRMK, JPIV, TAU, VN1, VN2, WORK,
+     $                     INFO )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            INFO, IOFFSET, KP1, K, KMAX, LDA, M, N, NRHS
+      REAL               ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+     $                   RELTOL
+*     ..
+*     .. Array Arguments ..
+      INTEGER            JPIV( * )
+      REAL               VN1( * ), VN2( * )
+      COMPLEX            A( LDA, * ), TAU( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      REAL               ZERO, ONE
+      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0 )
+      COMPLEX            CZERO
+      PARAMETER          ( CZERO = ( 0.0E+0, 0.0E+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, ITEMP, J, JMAXC2NRM, KK, KP, MINMNFACT,
+     $                   MINMNUPDT
+      REAL               HUGEVAL, TAUNAN, TEMP, TEMP2, TOL3Z
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           CLARF1F, CLARFG, CSWAP
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, REAL, CONJG, AIMAG, MAX, MIN, SQRT
+*     ..
+*     .. External Functions ..
+      LOGICAL            SISNAN
+      INTEGER            ISAMAX
+      REAL               SLAMCH, SCNRM2
+      EXTERNAL           SISNAN, SLAMCH, ISAMAX, SCNRM2
+*     ..
+*     .. Executable Statements ..
+*
+*     Initialize INFO
+*
+      INFO = 0
+*
+*     MINMNFACT in the smallest dimension of the submatrix
+*     A(IOFFSET+1:M,1:N) to be factorized.
+*
+*     MINMNUPDT is the smallest dimension
+*     of the subarray A(IOFFSET+1:M,1:N+NRHS) to be udated, which
+*     contains the submatrices A(IOFFSET+1:M,1:N) and
+*     B(IOFFSET+1:M,1:NRHS) as column blocks.
+*
+      MINMNFACT = MIN( M-IOFFSET, N )
+      MINMNUPDT = MIN( M-IOFFSET, N+NRHS )
+      KMAX = MIN( KMAX, MINMNFACT )
+      TOL3Z = SQRT( SLAMCH( 'Epsilon' ) )
+      HUGEVAL = SLAMCH( 'Overflow' )
+*
+*     Compute the factorization, KK is the lomn loop index.
+*
+      DO KK = 1, KMAX
+*
+         I = IOFFSET + KK
+*
+         IF( I.EQ.1 ) THEN
+*
+*           ============================================================
+*
+*           We are at the first column of the original whole matrix A,
+*           therefore we use the computed KP1 and MAXC2NRM from the
+*           main routine.
+*
+            KP = KP1
+*
+*           ============================================================
+*
+         ELSE
+*
+*           ============================================================
+*
+*           Determine the pivot column in KK-th step, i.e. the index
+*           of the column with the maximum 2-norm in the
+*           submatrix A(I:M,K:N).
+*
+            KP = ( KK-1 ) + ISAMAX( N-KK+1, VN1( KK ), 1 )
+*
+*           Determine the maximum column 2-norm and the relative maximum
+*           column 2-norm of the submatrix A(I:M,KK:N) in step KK.
+*           RELMAXC2NRMK  will be computed later, after somecondition
+*           checks on MAXC2NRMK.
+*
+            MAXC2NRMK = VN1( KP )
+*
+*           ============================================================
+*
+*           Check if the submatrix A(I:M,KK:N) contains NaN, and set
+*           INFO parameter to the column number, where the first NaN
+*           is found and return from the routine.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( SISNAN( MAXC2NRMK ) ) THEN
+*
+*              Set K, the number of factorized columns.
+*              that are not zero.
+*
+                K = KK - 1
+                INFO = K + KP
+*
+*               Set RELMAXC2NRMK to NaN.
+*
+                RELMAXC2NRMK = MAXC2NRMK
+*
+*               Array TAU(K+1:MINMNFACT) is not set and contains
+*               undefined elements.
+*
+               RETURN
+            END IF
+*
+*           ============================================================
+*
+*           Quick return, if the submatrix A(I:M,KK:N) is
+*           a zero matrix.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( MAXC2NRMK.EQ.ZERO ) THEN
+*
+*              Set K, the number of factorized columns.
+*              that are not zero.
+*
+               K = KK - 1
+               RELMAXC2NRMK = ZERO
+*
+*              Set TAUs corresponding to the columns that were not
+*              factorized to ZERO, i.e. set TAU(KK:MINMNFACT) to CZERO.
+*
+               DO J = KK, MINMNFACT
+                  TAU( J ) = CZERO
+               END DO
+*
+*              Return from the routine.
+*
+               RETURN
+*
+            END IF
+*
+*           ============================================================
+*
+*           Check if the submatrix A(I:M,KK:N) contains Inf,
+*           set INFO parameter to the column number, where
+*           the first Inf is found plus N, and continue
+*           the computation.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( INFO.EQ.0 .AND. MAXC2NRMK.GT.HUGEVAL ) THEN
+               INFO = N + KK - 1 + KP
+            END IF
+*
+*           ============================================================
+*
+*           Test for the second and third stopping criteria.
+*           NOTE: There is no need to test for ABSTOL >= ZERO, since
+*           MAXC2NRMK is non-negative. Similarly, there is no need
+*           to test for RELTOL >= ZERO, since RELMAXC2NRMK is
+*           non-negative.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+
+            RELMAXC2NRMK =  MAXC2NRMK / MAXC2NRM
+*
+            IF( MAXC2NRMK.LE.ABSTOL .OR. RELMAXC2NRMK.LE.RELTOL ) THEN
+*
+*              Set K, the number of factorized columns.
+*
+               K = KK - 1
+*
+*              Set TAUs corresponding to the columns that were not
+*              factorized to ZERO, i.e. set TAU(KK:MINMNFACT) to CZERO.
+*
+               DO J = KK, MINMNFACT
+                  TAU( J ) = CZERO
+               END DO
+*
+*              Return from the routine.
+*
+               RETURN
+*
+            END IF
+*
+*           ============================================================
+*
+*           End ELSE of IF(I.EQ.1)
+*
+         END IF
+*
+*        ===============================================================
+*
+*        If the pivot column is not the first column of the
+*        subblock A(1:M,KK:N):
+*        1) swap the KK-th column and the KP-th pivot column
+*           in A(1:M,1:N);
+*        2) copy the KK-th element into the KP-th element of the partial
+*           and exact 2-norm vectors VN1 and VN2. ( Swap is not needed
+*           for VN1 and VN2 since we use the element with the index
+*           larger than KK in the next loop step.)
+*        3) Save the pivot interchange with the indices relative to the
+*           the original matrix A, not the block A(1:M,1:N).
+*
+         IF( KP.NE.KK ) THEN
+            CALL CSWAP( M, A( 1, KP ), 1, A( 1, KK ), 1 )
+            VN1( KP ) = VN1( KK )
+            VN2( KP ) = VN2( KK )
+            ITEMP = JPIV( KP )
+            JPIV( KP ) = JPIV( KK )
+            JPIV( KK ) = ITEMP
+         END IF
+*
+*        Generate elementary reflector H(KK) using the column A(I:M,KK),
+*        if the column has more than one element, otherwise
+*        the elementary reflector would be an identity matrix,
+*        and TAU(KK) = CZERO.
+*
+         IF( I.LT.M ) THEN
+            CALL CLARFG( M-I+1, A( I, KK ), A( I+1, KK ), 1,
+     $                   TAU( KK ) )
+         ELSE
+            TAU( KK ) = CZERO
+         END IF
+*
+*        Check if TAU(KK) contains NaN, set INFO parameter
+*        to the column number where NaN is found and return from
+*        the routine.
+*        NOTE: There is no need to check TAU(KK) for Inf,
+*        since CLARFG cannot produce TAU(KK) or Householder vector
+*        below the diagonal containing Inf. Only BETA on the diagonal,
+*        returned by CLARFG can contain Inf, which requires
+*        TAU(KK) to contain NaN. Therefore, this case of generating Inf
+*        by CLARFG is covered by checking TAU(KK) for NaN.
+*
+         IF( SISNAN( REAL( TAU(KK) ) ) ) THEN
+            TAUNAN = REAL( TAU(KK) )
+         ELSE IF( SISNAN( AIMAG( TAU(KK) ) ) ) THEN
+            TAUNAN = AIMAG( TAU(KK) )
+         ELSE
+            TAUNAN = ZERO
+         END IF
+*
+         IF( SISNAN( TAUNAN ) ) THEN
+            K = KK - 1
+            INFO = KK
+*
+*           Set MAXC2NRMK and  RELMAXC2NRMK to NaN.
+*
+            MAXC2NRMK = TAUNAN
+            RELMAXC2NRMK = TAUNAN
+*
+*           Array TAU(KK:MINMNFACT) is not set and contains
+*           undefined elements, except the first element TAU(KK) = NaN.
+*
+            RETURN
+         END IF
+*
+*        Apply H(KK)**H to A(I:M,KK+1:N+NRHS) from the left.
+*        ( If M >= N, then at KK = N there is no residual matrix,
+*         i.e. no columns of A to update, only columns of B.
+*         If M < N, then at KK = M-IOFFSET, I = M and we have a
+*         one-row residual matrix in A and the elementary
+*         reflector is a unit matrix, TAU(KK) = CZERO, i.e. no update
+*         is needed for the residual matrix in A and the
+*         right-hand-side-matrix in B.
+*         Therefore, we update only if
+*         KK < MINMNUPDT = min(M-IOFFSET, N+NRHS)
+*         condition is satisfied, not only KK < N+NRHS )
+*
+         IF( KK.LT.MINMNUPDT ) THEN
+            CALL CLARF1F( 'Left', M-I+1, N+NRHS-KK, A( I, KK ), 1,
+     $                    CONJG( TAU( KK ) ), A( I, KK+1 ), LDA,
+     $                    WORK( 1 ) )
+         END IF
+*
+         IF( KK.LT.MINMNFACT ) THEN
+*
+*           Update the partial column 2-norms for the residual matrix,
+*           only if the residual matrix A(I+1:M,KK+1:N) exists, i.e.
+*           when KK < min(M-IOFFSET, N).
+*
+            DO J = KK + 1, N
+               IF( VN1( J ).NE.ZERO ) THEN
+*
+*                 NOTE: The following lines follow from the analysis in
+*                 Lapack Working Note 176.
+*
+                  TEMP = ONE - ( ABS( A( I, J ) ) / VN1( J ) )**2
+                  TEMP = MAX( TEMP, ZERO )
+                  TEMP2 = TEMP*( VN1( J ) / VN2( J ) )**2
+                  IF( TEMP2 .LE. TOL3Z ) THEN
+*
+*                    Compute the column 2-norm for the partial
+*                    column A(I+1:M,J) by explicitly computing it,
+*                    and store it in both partial 2-norm vector VN1
+*                    and exact column 2-norm vector VN2.
+*
+                     VN1( J ) = SCNRM2( M-I, A( I+1, J ), 1 )
+                     VN2( J ) = VN1( J )
+*
+                  ELSE
+*
+*                    Update the column 2-norm for the partial
+*                    column A(I+1:M,J) by removing one
+*                    element A(I,J) and store it in partial
+*                    2-norm vector VN1.
+*
+                     VN1( J ) = VN1( J )*SQRT( TEMP )
+*
+                  END IF
+               END IF
+            END DO
+*
+         END IF
+*
+*     End factorization loop
+*
+      END DO
+*
+*     If we reached this point, all colunms have been factorized,
+*     i.e. no condition was triggered to exit the routine.
+*     Set the number of factorized columns.
+*
+      K = KMAX
+*
+*     We reached the end of the loop, i.e. all KMAX columns were
+*     factorized, we need to set MAXC2NRMK and RELMAXC2NRMK before
+*     we return.
+*
+      IF( K.LT.MINMNFACT ) THEN
+*
+         JMAXC2NRM = K + ISAMAX( N-K, VN1( K+1 ), 1 )
+         MAXC2NRMK = VN1( JMAXC2NRM )
+*
+         IF( K.EQ.0 ) THEN
+            RELMAXC2NRMK = ONE
+         ELSE
+            RELMAXC2NRMK = MAXC2NRMK / MAXC2NRM
+         END IF
+*
+      ELSE
+         MAXC2NRMK = ZERO
+         RELMAXC2NRMK = ZERO
+      END IF
+*
+*     We reached the end of the loop, i.e. all KMAX columns were
+*     factorized, set TAUs corresponding to the columns that were
+*     not factorized to ZERO, i.e. TAU(K+1:MINMNFACT) set to CZERO.
+*
+      DO J = K + 1, MINMNFACT
+         TAU( J ) = CZERO
+      END DO
+*
+      RETURN
+*
+*     End of CLAQP2RK
+*
+      END
diff --git a/SRC/claqp3rk.f b/SRC/claqp3rk.f
new file mode 100644
index 0000000000..8c6961e41b
--- /dev/null
+++ b/SRC/claqp3rk.f
@@ -0,0 +1,937 @@
+*> \brief \b CLAQP3RK computes a step of truncated QR factorization with column pivoting of a complex m-by-n matrix A using Level 3 BLAS and overwrites a complex m-by-nrhs matrix B with Q**H * B.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download CLAQP3RK + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqp3rk.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/claqp3rk.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqp3rk.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*      SUBROUTINE CLAQP3RK( M, N, NRHS, IOFFSET, NB, ABSTOL,
+*     $                     RELTOL, KP1, MAXC2NRM, A, LDA, DONE, KB,
+*     $                     MAXC2NRMK, RELMAXC2NRMK, JPIV, TAU,
+*     $                     VN1, VN2, AUXV, F, LDF, IWORK, INFO )
+*      IMPLICIT NONE
+*      LOGICAL            DONE
+*      INTEGER            INFO, IOFFSET, KB, KP1, LDA, LDF, M, N,
+*     $                   NB, NRHS
+*      REAL               ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+*     $                   RELTOL
+*     ..
+*     .. Array Arguments ..
+*      INTEGER            IWORK( * ), JPIV( * )
+*      REAL               VN1( * ), VN2( * )
+*      COMPLEX*16         A( LDA, * ), AUXV( * ), F( LDF, * ), TAU( * )
+*     ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> CLAQP3RK computes a step of truncated QR factorization with column
+*> pivoting of a complex M-by-N matrix A block A(IOFFSET+1:M,1:N)
+*> by using Level 3 BLAS as
+*>
+*>   A * P(KB) = Q(KB) * R(KB).
+*>
+*> The routine tries to factorize NB columns from A starting from
+*> the row IOFFSET+1 and updates the residual matrix with BLAS 3
+*> xGEMM. The number of actually factorized columns is returned
+*> is smaller than NB.
+*>
+*> Block A(1:IOFFSET,1:N) is accordingly pivoted, but not factorized.
+*>
+*> The routine also overwrites the right-hand-sides B matrix stored
+*> in A(IOFFSET+1:M,1:N+1:N+NRHS) with Q(KB)**H * B.
+*>
+*> Cases when the number of factorized columns KB < NB:
+*>
+*> (1) In some cases, due to catastrophic cancellations, it cannot
+*> factorize all NB columns and need to update the residual matrix.
+*> Hence, the actual number of factorized columns in the block returned
+*> in KB is smaller than NB. The logical DONE is returned as FALSE.
+*> The factorization of the whole original matrix A_orig must proceed
+*> with the next block.
+*>
+*> (2) Whenever the stopping criterion ABSTOL or RELTOL is satisfied,
+*> the factorization of the whole original matrix A_orig is stopped,
+*> the logical DONE is returned as TRUE. The number of factorized
+*> columns which is smaller than NB is returned in KB.
+*>
+*> (3) In case both stopping criteria ABSTOL or RELTOL are not used,
+*> and when the residual matrix is a zero matrix in some factorization
+*> step KB, the factorization of the whole original matrix A_orig is
+*> stopped, the logical DONE is returned as TRUE. The number of
+*> factorized columns which is smaller than NB is returned in KB.
+*>
+*> (4) Whenever NaN is detected in the matrix A or in the array TAU,
+*> the factorization of the whole original matrix A_orig is stopped,
+*> the logical DONE is returned as TRUE. The number of factorized
+*> columns which is smaller than NB is returned in KB. The INFO
+*> parameter is set to the column index of the first NaN occurrence.
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A. N >= 0
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of
+*>          columns of the matrix B. NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] IOFFSET
+*> \verbatim
+*>          IOFFSET is INTEGER
+*>          The number of rows of the matrix A that must be pivoted
+*>          but not factorized. IOFFSET >= 0.
+*>
+*>          IOFFSET also represents the number of columns of the whole
+*>          original matrix A_orig that have been factorized
+*>          in the previous steps.
+*> \endverbatim
+*>
+*> \param[in] NB
+*> \verbatim
+*>          NB is INTEGER
+*>          Factorization block size, i.e the number of columns
+*>          to factorize in the matrix A. 0 <= NB
+*>
+*>          If NB = 0, then the routine exits immediately.
+*>             This means that the factorization is not performed,
+*>             the matrices A and B and the arrays TAU, IPIV
+*>             are not modified.
+*> \endverbatim
+*>
+*> \param[in] ABSTOL
+*> \verbatim
+*>          ABSTOL is REAL, cannot be NaN.
+*>
+*>          The absolute tolerance (stopping threshold) for
+*>          maximum column 2-norm of the residual matrix.
+*>          The algorithm converges (stops the factorization) when
+*>          the maximum column 2-norm of the residual matrix
+*>          is less than or equal to ABSTOL.
+*>
+*>          a) If ABSTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on NB and RELTOL.
+*>                This includes the case ABSTOL = -Inf.
+*>
+*>          b) If 0.0 <= ABSTOL then the input value
+*>                of ABSTOL is used.
+*> \endverbatim
+*>
+*> \param[in] RELTOL
+*> \verbatim
+*>          RELTOL is REAL, cannot be NaN.
+*>
+*>          The tolerance (stopping threshold) for the ratio of the
+*>          maximum column 2-norm of the residual matrix to the maximum
+*>          column 2-norm of the original matrix A_orig. The algorithm
+*>          converges (stops the factorization), when this ratio is
+*>          less than or equal to RELTOL.
+*>
+*>          a) If RELTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on NB and ABSTOL.
+*>                This includes the case RELTOL = -Inf.
+*>
+*>          d) If 0.0 <= RELTOL then the input value of RELTOL
+*>                is used.
+*> \endverbatim
+*>
+*> \param[in] KP1
+*> \verbatim
+*>          KP1 is INTEGER
+*>          The index of the column with the maximum 2-norm in
+*>          the whole original matrix A_orig determined in the
+*>          main routine CGEQP3RK. 1 <= KP1 <= N_orig.
+*> \endverbatim
+*>
+*> \param[in] MAXC2NRM
+*> \verbatim
+*>          MAXC2NRM is REAL
+*>          The maximum column 2-norm of the whole original
+*>          matrix A_orig computed in the main routine CGEQP3RK.
+*>          MAXC2NRM >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX array, dimension (LDA,N+NRHS)
+*>          On entry:
+*>              the M-by-N matrix A and M-by-NRHS matrix B, as in
+*>
+*>                                  N     NRHS
+*>              array_A   =   M  [ mat_A, mat_B ]
+*>
+*>          On exit:
+*>          1. The elements in block A(IOFFSET+1:M,1:KB) below
+*>             the diagonal together with the array TAU represent
+*>             the unitary matrix Q(KB) as a product of elementary
+*>             reflectors.
+*>          2. The upper triangular block of the matrix A stored
+*>             in A(IOFFSET+1:M,1:KB) is the triangular factor obtained.
+*>          3. The block of the matrix A stored in A(1:IOFFSET,1:N)
+*>             has been accordingly pivoted, but not factorized.
+*>          4. The rest of the array A, block A(IOFFSET+1:M,KB+1:N+NRHS).
+*>             The left part A(IOFFSET+1:M,KB+1:N) of this block
+*>             contains the residual of the matrix A, and,
+*>             if NRHS > 0, the right part of the block
+*>             A(IOFFSET+1:M,N+1:N+NRHS) contains the block of
+*>             the right-hand-side matrix B. Both these blocks have been
+*>             updated by multiplication from the left by Q(KB)**H.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] DONE
+*> \verbatim
+*>          DONE is LOGICAL
+*>          TRUE: a) if the factorization completed before processing
+*>                   all min(M-IOFFSET,NB,N) columns due to ABSTOL
+*>                   or RELTOL criterion,
+*>                b) if the factorization completed before processing
+*>                   all min(M-IOFFSET,NB,N) columns due to the
+*>                   residual matrix being a ZERO matrix.
+*>                c) when NaN was detected in the matrix A
+*>                   or in the array TAU.
+*>          FALSE: otherwise.
+*> \endverbatim
+*>
+*> \param[out] KB
+*> \verbatim
+*>          KB is INTEGER
+*>          Factorization rank of the matrix A, i.e. the rank of
+*>          the factor R, which is the same as the number of non-zero
+*>          rows of the factor R.  0 <= KB <= min(M-IOFFSET,NB,N).
+*>
+*>          KB also represents the number of non-zero Householder
+*>          vectors.
+*> \endverbatim
+*>
+*> \param[out] MAXC2NRMK
+*> \verbatim
+*>          MAXC2NRMK is REAL
+*>          The maximum column 2-norm of the residual matrix,
+*>          when the factorization stopped at rank KB. MAXC2NRMK >= 0.
+*> \endverbatim
+*>
+*> \param[out] RELMAXC2NRMK
+*> \verbatim
+*>          RELMAXC2NRMK is REAL
+*>          The ratio MAXC2NRMK / MAXC2NRM of the maximum column
+*>          2-norm of the residual matrix (when the factorization
+*>          stopped at rank KB) to the maximum column 2-norm of the
+*>          original matrix A_orig. RELMAXC2NRMK >= 0.
+*> \endverbatim
+*>
+*> \param[out] JPIV
+*> \verbatim
+*>          JPIV is INTEGER array, dimension (N)
+*>          Column pivot indices, for 1 <= j <= N, column j
+*>          of the matrix A was interchanged with column JPIV(j).
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is COMPLEX array, dimension (min(M-IOFFSET,N))
+*>          The scalar factors of the elementary reflectors.
+*> \endverbatim
+*>
+*> \param[in,out] VN1
+*> \verbatim
+*>          VN1 is REAL array, dimension (N)
+*>          The vector with the partial column norms.
+*> \endverbatim
+*>
+*> \param[in,out] VN2
+*> \verbatim
+*>          VN2 is REAL array, dimension (N)
+*>          The vector with the exact column norms.
+*> \endverbatim
+*>
+*> \param[out] AUXV
+*> \verbatim
+*>          AUXV is COMPLEX array, dimension (NB)
+*>          Auxiliary vector.
+*> \endverbatim
+*>
+*> \param[out] F
+*> \verbatim
+*>          F is COMPLEX array, dimension (LDF,NB)
+*>          Matrix F**H = L*(Y**H)*A.
+*> \endverbatim
+*>
+*> \param[in] LDF
+*> \verbatim
+*>          LDF is INTEGER
+*>          The leading dimension of the array F. LDF >= max(1,N+NRHS).
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (N-1).
+*>          Is a work array. ( IWORK is used to store indices
+*>          of "bad" columns for norm downdating in the residual
+*>          matrix ).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          1) INFO = 0: successful exit.
+*>          2) If INFO = j_1, where 1 <= j_1 <= N, then NaN was
+*>             detected and the routine stops the computation.
+*>             The j_1-th column of the matrix A or the j_1-th
+*>             element of array TAU contains the first occurrence
+*>             of NaN in the factorization step KB+1 ( when KB columns
+*>             have been factorized ).
+*>
+*>             On exit:
+*>             KB                  is set to the number of
+*>                                    factorized columns without
+*>                                    exception.
+*>             MAXC2NRMK           is set to NaN.
+*>             RELMAXC2NRMK        is set to NaN.
+*>             TAU(KB+1:min(M,N))     is not set and contains undefined
+*>                                    elements. If j_1=KB+1, TAU(KB+1)
+*>                                    may contain NaN.
+*>          3) If INFO = j_2, where N+1 <= j_2 <= 2*N, then no NaN
+*>             was detected, but +Inf (or -Inf) was detected and
+*>             the routine continues the computation until completion.
+*>             The (j_2-N)-th column of the matrix A contains the first
+*>             occurrence of +Inf (or -Inf) in the actorization
+*>             step KB+1 ( when KB columns have been factorized ).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup laqp3rk
+*
+*> \par References:
+*  ================
+*> [1] A Level 3 BLAS QR factorization algorithm with column pivoting developed in 1996.
+*> G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain.
+*> X. Sun, Computer Science Dept., Duke University, USA.
+*> C. H. Bischof, Math. and Comp. Sci. Div., Argonne National Lab, USA.
+*> A BLAS-3 version of the QR factorization with column pivoting.
+*> LAPACK Working Note 114
+*> <a href="https://www.netlib.org/lapack/lawnspdf/lawn114.pdf">https://www.netlib.org/lapack/lawnspdf/lawn114.pdf</a>
+*> and in
+*> SIAM J. Sci. Comput., 19(5):1486-1494, Sept. 1998.
+*> <a href="https://doi.org/10.1137/S1064827595296732">https://doi.org/10.1137/S1064827595296732</a>
+*>
+*> [2] A partial column norm updating strategy developed in 2006.
+*> Z. Drmac and Z. Bujanovic, Dept. of Math., University of Zagreb, Croatia.
+*> On the failure of rank revealing QR factorization software – a case study.
+*> LAPACK Working Note 176.
+*> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">http://www.netlib.org/lapack/lawnspdf/lawn176.pdf</a>
+*> and in
+*> ACM Trans. Math. Softw. 35, 2, Article 12 (July 2008), 28 pages.
+*> <a href="https://doi.org/10.1145/1377612.1377616">https://doi.org/10.1145/1377612.1377616</a>
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
+*>
+*>  November  2023, Igor Kozachenko, James Demmel,
+*>                  EECS Department,
+*>                  University of California, Berkeley, USA.
+*>
+*> \endverbatim
+*
+*  =====================================================================
+      SUBROUTINE CLAQP3RK( M, N, NRHS, IOFFSET, NB, ABSTOL,
+     $                     RELTOL, KP1, MAXC2NRM, A, LDA, DONE, KB,
+     $                     MAXC2NRMK, RELMAXC2NRMK, JPIV, TAU,
+     $                     VN1, VN2, AUXV, F, LDF, IWORK, INFO )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      LOGICAL            DONE
+      INTEGER            INFO, IOFFSET, KB, KP1, LDA, LDF, M, N,
+     $                   NB, NRHS
+      REAL               ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+     $                   RELTOL
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IWORK( * ), JPIV( * )
+      REAL               VN1( * ), VN2( * )
+      COMPLEX            A( LDA, * ), AUXV( * ), F( LDF, * ), TAU( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      REAL               ZERO, ONE
+      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0 )
+      COMPLEX            CZERO, CONE
+      PARAMETER          ( CZERO = ( 0.0E+0, 0.0E+0 ),
+     $                   CONE = ( 1.0E+0, 0.0E+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            ITEMP, J, K, MINMNFACT, MINMNUPDT,
+     $                   LSTICC, KP, I, IF
+      REAL               HUGEVAL, TAUNAN, TEMP, TEMP2, TOL3Z
+      COMPLEX            AIK
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           CGEMM, CGEMV, CLARFG, CSWAP
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, REAL, CONJG, AIMAG, MAX, MIN, SQRT
+*     ..
+*     .. External Functions ..
+      LOGICAL            SISNAN
+      INTEGER            ISAMAX
+      REAL               SLAMCH, SCNRM2
+      EXTERNAL           SISNAN, SLAMCH, ISAMAX, SCNRM2
+*     ..
+*     .. Executable Statements ..
+*
+*     Initialize INFO
+*
+      INFO = 0
+*
+*     MINMNFACT in the smallest dimension of the submatrix
+*     A(IOFFSET+1:M,1:N) to be factorized.
+*
+      MINMNFACT = MIN( M-IOFFSET, N )
+      MINMNUPDT = MIN( M-IOFFSET, N+NRHS )
+      NB = MIN( NB, MINMNFACT )
+      TOL3Z = SQRT( SLAMCH( 'Epsilon' ) )
+      HUGEVAL = SLAMCH( 'Overflow' )
+*
+*     Compute factorization in a while loop over NB columns,
+*     K is the column index in the block A(1:M,1:N).
+*
+      K = 0
+      LSTICC = 0
+      DONE = .FALSE.
+*
+      DO WHILE ( K.LT.NB .AND. LSTICC.EQ.0 )
+         K = K + 1
+         I = IOFFSET + K
+*
+         IF( I.EQ.1 ) THEN
+*
+*           We are at the first column of the original whole matrix A_orig,
+*           therefore we use the computed KP1 and MAXC2NRM from the
+*           main routine.
+*
+            KP = KP1
+*
+         ELSE
+*
+*           Determine the pivot column in K-th step, i.e. the index
+*           of the column with the maximum 2-norm in the
+*           submatrix A(I:M,K:N).
+*
+            KP = ( K-1 ) + ISAMAX( N-K+1, VN1( K ), 1 )
+*
+*           Determine the maximum column 2-norm and the relative maximum
+*           column 2-norm of the submatrix A(I:M,K:N) in step K.
+*
+            MAXC2NRMK = VN1( KP )
+*
+*           ============================================================
+*
+*           Check if the submatrix A(I:M,K:N) contains NaN, set
+*           INFO parameter to the column number, where the first NaN
+*           is found and return from the routine.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( SISNAN( MAXC2NRMK ) ) THEN
+*
+               DONE = .TRUE.
+*
+*              Set KB, the number of factorized partial columns
+*                      that are non-zero in each step in the block,
+*                      i.e. the rank of the factor R.
+*              Set IF, the number of processed rows in the block, which
+*                      is the same as the number of processed rows in
+*                      the original whole matrix A_orig.
+*
+               KB = K - 1
+               IF = I - 1
+               INFO = KB + KP
+*
+*              Set RELMAXC2NRMK to NaN.
+*
+               RELMAXC2NRMK = MAXC2NRMK
+*
+*              There is no need to apply the block reflector to the
+*              residual of the matrix A stored in A(KB+1:M,KB+1:N),
+*              since the submatrix contains NaN and we stop
+*              the computation.
+*              But, we need to apply the block reflector to the residual
+*              right hand sides stored in A(KB+1:M,N+1:N+NRHS), if the
+*              residual right hand sides exist.  This occurs
+*              when ( NRHS != 0 AND KB <= (M-IOFFSET) ):
+*
+*              A(I+1:M,N+1:N+NRHS) := A(I+1:M,N+1:N+NRHS) -
+*                               A(I+1:M,1:KB) * F(N+1:N+NRHS,1:KB)**H.
+
+               IF( NRHS.GT.0 .AND. KB.LT.(M-IOFFSET) ) THEN
+                  CALL CGEMM( 'No transpose', 'Conjugate transpose',
+     $                  M-IF, NRHS, KB, -CONE, A( IF+1, 1 ), LDA,
+     $                  F( N+1, 1 ), LDF, CONE, A( IF+1, N+1 ), LDA )
+               END IF
+*
+*              There is no need to recompute the 2-norm of the
+*              difficult columns, since we stop the factorization.
+*
+*              Array TAU(KF+1:MINMNFACT) is not set and contains
+*              undefined elements.
+*
+*              Return from the routine.
+*
+               RETURN
+            END IF
+*
+*           Quick return, if the submatrix A(I:M,K:N) is
+*           a zero matrix. We need to check it only if the column index
+*           (same as row index) is larger than 1, since the condition
+*           for the whole original matrix A_orig is checked in the main
+*           routine.
+*
+            IF( MAXC2NRMK.EQ.ZERO ) THEN
+*
+               DONE = .TRUE.
+*
+*              Set KB, the number of factorized partial columns
+*                      that are non-zero in each step in the block,
+*                      i.e. the rank of the factor R.
+*              Set IF, the number of processed rows in the block, which
+*                      is the same as the number of processed rows in
+*                      the original whole matrix A_orig.
+*
+               KB = K - 1
+               IF = I - 1
+               RELMAXC2NRMK = ZERO
+*
+*              There is no need to apply the block reflector to the
+*              residual of the matrix A stored in A(KB+1:M,KB+1:N),
+*              since the submatrix is zero and we stop the computation.
+*              But, we need to apply the block reflector to the residual
+*              right hand sides stored in A(KB+1:M,N+1:N+NRHS), if the
+*              residual right hand sides exist.  This occurs
+*              when ( NRHS != 0 AND KB <= (M-IOFFSET) ):
+*
+*              A(I+1:M,N+1:N+NRHS) := A(I+1:M,N+1:N+NRHS) -
+*                               A(I+1:M,1:KB) * F(N+1:N+NRHS,1:KB)**H.
+*
+               IF( NRHS.GT.0 .AND. KB.LT.(M-IOFFSET) ) THEN
+                  CALL CGEMM( 'No transpose', 'Conjugate transpose',
+     $                  M-IF, NRHS, KB, -CONE, A( IF+1, 1 ), LDA,
+     $                  F( N+1, 1 ), LDF, CONE, A( IF+1, N+1 ), LDA )
+               END IF
+*
+*              There is no need to recompute the 2-norm of the
+*              difficult columns, since we stop the factorization.
+*
+*              Set TAUs corresponding to the columns that were not
+*              factorized to ZERO, i.e. set TAU(KB+1:MINMNFACT) = CZERO,
+*              which is equivalent to seting TAU(K:MINMNFACT) = CZERO.
+*
+               DO J = K, MINMNFACT
+                  TAU( J ) = CZERO
+               END DO
+*
+*              Return from the routine.
+*
+               RETURN
+*
+            END IF
+*
+*           ============================================================
+*
+*           Check if the submatrix A(I:M,K:N) contains Inf,
+*           set INFO parameter to the column number, where
+*           the first Inf is found plus N, and continue
+*           the computation.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( INFO.EQ.0 .AND. MAXC2NRMK.GT.HUGEVAL ) THEN
+               INFO = N + K - 1 + KP
+            END IF
+*
+*           ============================================================
+*
+*           Test for the second and third tolerance stopping criteria.
+*           NOTE: There is no need to test for ABSTOL.GE.ZERO, since
+*           MAXC2NRMK is non-negative. Similarly, there is no need
+*           to test for RELTOL.GE.ZERO, since RELMAXC2NRMK is
+*           non-negative.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            RELMAXC2NRMK =  MAXC2NRMK / MAXC2NRM
+*
+            IF( MAXC2NRMK.LE.ABSTOL .OR. RELMAXC2NRMK.LE.RELTOL ) THEN
+*
+               DONE = .TRUE.
+*
+*              Set KB, the number of factorized partial columns
+*                      that are non-zero in each step in the block,
+*                      i.e. the rank of the factor R.
+*              Set IF, the number of processed rows in the block, which
+*                      is the same as the number of processed rows in
+*                      the original whole matrix A_orig;
+*
+                  KB = K - 1
+                  IF = I - 1
+*
+*              Apply the block reflector to the residual of the
+*              matrix A and the residual of the right hand sides B, if
+*              the residual matrix and and/or the residual of the right
+*              hand sides exist,  i.e. if the submatrix
+*              A(I+1:M,KB+1:N+NRHS) exists.  This occurs when
+*                 KB < MINMNUPDT = min( M-IOFFSET, N+NRHS ):
+*
+*              A(IF+1:M,K+1:N+NRHS) := A(IF+1:M,KB+1:N+NRHS) -
+*                             A(IF+1:M,1:KB) * F(KB+1:N+NRHS,1:KB)**H.
+*
+               IF( KB.LT.MINMNUPDT ) THEN
+                  CALL CGEMM( 'No transpose', 'Conjugate transpose',
+     $                  M-IF, N+NRHS-KB, KB,-CONE, A( IF+1, 1 ), LDA,
+     $                  F( KB+1, 1 ), LDF, CONE, A( IF+1, KB+1 ), LDA )
+               END IF
+*
+*              There is no need to recompute the 2-norm of the
+*              difficult columns, since we stop the factorization.
+*
+*              Set TAUs corresponding to the columns that were not
+*              factorized to ZERO, i.e. set TAU(KB+1:MINMNFACT) = CZERO,
+*              which is equivalent to seting TAU(K:MINMNFACT) = CZERO.
+*
+               DO J = K, MINMNFACT
+                  TAU( J ) = CZERO
+               END DO
+*
+*              Return from the routine.
+*
+               RETURN
+*
+            END IF
+*
+*           ============================================================
+*
+*           End ELSE of IF(I.EQ.1)
+*
+         END IF
+*
+*        ===============================================================
+*
+*        If the pivot column is not the first column of the
+*        subblock A(1:M,K:N):
+*        1) swap the K-th column and the KP-th pivot column
+*           in A(1:M,1:N);
+*        2) swap the K-th row and the KP-th row in F(1:N,1:K-1)
+*        3) copy the K-th element into the KP-th element of the partial
+*           and exact 2-norm vectors VN1 and VN2. (Swap is not needed
+*           for VN1 and VN2 since we use the element with the index
+*           larger than K in the next loop step.)
+*        4) Save the pivot interchange with the indices relative to the
+*           the original matrix A_orig, not the block A(1:M,1:N).
+*
+         IF( KP.NE.K ) THEN
+            CALL CSWAP( M, A( 1, KP ), 1, A( 1, K ), 1 )
+            CALL CSWAP( K-1, F( KP, 1 ), LDF, F( K, 1 ), LDF )
+            VN1( KP ) = VN1( K )
+            VN2( KP ) = VN2( K )
+            ITEMP = JPIV( KP )
+            JPIV( KP ) = JPIV( K )
+            JPIV( K ) = ITEMP
+         END IF
+*
+*        Apply previous Householder reflectors to column K:
+*        A(I:M,K) := A(I:M,K) - A(I:M,1:K-1)*F(K,1:K-1)**H.
+*
+         IF( K.GT.1 ) THEN
+            DO J = 1, K - 1
+               F( K, J ) = CONJG( F( K, J ) )
+            END DO
+            CALL CGEMV( 'No transpose', M-I+1, K-1, -CONE, A( I, 1 ),
+     $                  LDA, F( K, 1 ), LDF, CONE, A( I, K ), 1 )
+            DO J = 1, K - 1
+               F( K, J ) = CONJG( F( K, J ) )
+            END DO
+         END IF
+*
+*        Generate elementary reflector H(k) using the column A(I:M,K).
+*
+         IF( I.LT.M ) THEN
+            CALL CLARFG( M-I+1, A( I, K ), A( I+1, K ), 1, TAU( K ) )
+         ELSE
+            TAU( K ) = CZERO
+         END IF
+*
+*        Check if TAU(K) contains NaN, set INFO parameter
+*        to the column number where NaN is found and return from
+*        the routine.
+*        NOTE: There is no need to check TAU(K) for Inf,
+*        since CLARFG cannot produce TAU(KK) or Householder vector
+*        below the diagonal containing Inf. Only BETA on the diagonal,
+*        returned by CLARFG can contain Inf, which requires
+*        TAU(K) to contain NaN. Therefore, this case of generating Inf
+*        by CLARFG is covered by checking TAU(K) for NaN.
+*
+         IF( SISNAN( REAL( TAU(K) ) ) ) THEN
+            TAUNAN = REAL( TAU(K) )
+         ELSE IF( SISNAN( AIMAG( TAU(K) ) ) ) THEN
+            TAUNAN = AIMAG( TAU(K) )
+         ELSE
+            TAUNAN = ZERO
+         END IF
+*
+         IF( SISNAN( TAUNAN ) ) THEN
+*
+            DONE = .TRUE.
+*
+*           Set KB, the number of factorized partial columns
+*                   that are non-zero in each step in the block,
+*                   i.e. the rank of the factor R.
+*           Set IF, the number of processed rows in the block, which
+*                   is the same as the number of processed rows in
+*                   the original whole matrix A_orig.
+*
+            KB = K - 1
+            IF = I - 1
+            INFO = K
+*
+*           Set MAXC2NRMK and  RELMAXC2NRMK to NaN.
+*
+            MAXC2NRMK = TAUNAN
+            RELMAXC2NRMK = TAUNAN
+*
+*           There is no need to apply the block reflector to the
+*           residual of the matrix A stored in A(KB+1:M,KB+1:N),
+*           since the submatrix contains NaN and we stop
+*           the computation.
+*           But, we need to apply the block reflector to the residual
+*           right hand sides stored in A(KB+1:M,N+1:N+NRHS), if the
+*           residual right hand sides exist.  This occurs
+*           when ( NRHS != 0 AND KB <= (M-IOFFSET) ):
+*
+*           A(I+1:M,N+1:N+NRHS) := A(I+1:M,N+1:N+NRHS) -
+*                            A(I+1:M,1:KB) * F(N+1:N+NRHS,1:KB)**H.
+*
+            IF( NRHS.GT.0 .AND. KB.LT.(M-IOFFSET) ) THEN
+               CALL CGEMM( 'No transpose', 'Conjugate transpose',
+     $               M-IF, NRHS, KB, -CONE, A( IF+1, 1 ), LDA,
+     $               F( N+1, 1 ), LDF, CONE, A( IF+1, N+1 ), LDA )
+            END IF
+*
+*           There is no need to recompute the 2-norm of the
+*           difficult columns, since we stop the factorization.
+*
+*           Array TAU(KF+1:MINMNFACT) is not set and contains
+*           undefined elements.
+*
+*           Return from the routine.
+*
+            RETURN
+         END IF
+*
+*        ===============================================================
+*
+         AIK = A( I, K )
+         A( I, K ) = CONE
+*
+*        ===============================================================
+*
+*        Compute the current K-th column of F:
+*          1) F(K+1:N,K) := tau(K) * A(I:M,K+1:N)**H * A(I:M,K).
+*
+         IF( K.LT.N+NRHS ) THEN
+            CALL CGEMV( 'Conjugate transpose', M-I+1, N+NRHS-K,
+     $                  TAU( K ), A( I, K+1 ), LDA, A( I, K ), 1,
+     $                  CZERO, F( K+1, K ), 1 )
+         END IF
+*
+*           2) Zero out elements above and on the diagonal of the
+*              column K in matrix F, i.e elements F(1:K,K).
+*
+         DO J = 1, K
+            F( J, K ) = CZERO
+         END DO
+*
+*         3) Incremental updating of the K-th column of F:
+*        F(1:N,K) := F(1:N,K) - tau(K) * F(1:N,1:K-1) * A(I:M,1:K-1)**H
+*                    * A(I:M,K).
+*
+         IF( K.GT.1 ) THEN
+            CALL CGEMV( 'Conjugate Transpose', M-I+1, K-1, -TAU( K ),
+     $                   A( I, 1 ), LDA, A( I, K ), 1, CZERO,
+     $                   AUXV( 1 ), 1 )
+*
+            CALL CGEMV( 'No transpose', N+NRHS, K-1, CONE,
+     $                  F( 1, 1 ), LDF, AUXV( 1 ), 1, CONE,
+     $                  F( 1, K ), 1 )
+         END IF
+*
+*        ===============================================================
+*
+*        Update the current I-th row of A:
+*        A(I,K+1:N+NRHS) := A(I,K+1:N+NRHS)
+*                         - A(I,1:K)*F(K+1:N+NRHS,1:K)**H.
+*
+         IF( K.LT.N+NRHS ) THEN
+            CALL CGEMM( 'No transpose', 'Conjugate transpose',
+     $            1, N+NRHS-K, K, -CONE, A( I, 1 ), LDA,
+     $            F( K+1, 1 ), LDF, CONE, A( I, K+1 ), LDA )
+         END IF
+*
+         A( I, K ) = AIK
+*
+*        Update the partial column 2-norms for the residual matrix,
+*        only if the residual matrix A(I+1:M,K+1:N) exists, i.e.
+*        when K < MINMNFACT = min( M-IOFFSET, N ).
+*
+         IF( K.LT.MINMNFACT ) THEN
+*
+            DO J = K + 1, N
+               IF( VN1( J ).NE.ZERO ) THEN
+*
+*                 NOTE: The following lines follow from the analysis in
+*                 Lapack Working Note 176.
+*
+                  TEMP = ABS( A( I, J ) ) / VN1( J )
+                  TEMP = MAX( ZERO, ( ONE+TEMP )*( ONE-TEMP ) )
+                  TEMP2 = TEMP*( VN1( J ) / VN2( J ) )**2
+                  IF( TEMP2.LE.TOL3Z ) THEN
+*
+*                    At J-index, we have a difficult column for the
+*                    update of the 2-norm. Save the index of the previous
+*                    difficult column in IWORK(J-1).
+*                    NOTE: ILSTCC > 1, threfore we can use IWORK only
+*                    with N-1 elements, where the elements are
+*                    shifted by 1 to the left.
+*
+                     IWORK( J-1 ) = LSTICC
+*
+*                    Set the index of the last difficult column LSTICC.
+*
+                     LSTICC = J
+*
+                  ELSE
+                     VN1( J ) = VN1( J )*SQRT( TEMP )
+                  END IF
+               END IF
+            END DO
+*
+         END IF
+*
+*        End of while loop.
+*
+      END DO
+*
+*     Now, afler the loop:
+*        Set KB, the number of factorized columns in the block;
+*        Set IF, the number of processed rows in the block, which
+*                is the same as the number of processed rows in
+*                the original whole matrix A_orig, IF = IOFFSET + KB.
+*
+      KB = K
+      IF = I
+*
+*     Apply the block reflector to the residual of the matrix A
+*     and the residual of the right hand sides B, if the residual
+*     matrix and and/or the residual of the right hand sides
+*     exist,  i.e. if the submatrix A(I+1:M,KB+1:N+NRHS) exists.
+*     This occurs when KB < MINMNUPDT = min( M-IOFFSET, N+NRHS ):
+*
+*     A(IF+1:M,K+1:N+NRHS) := A(IF+1:M,KB+1:N+NRHS) -
+*                         A(IF+1:M,1:KB) * F(KB+1:N+NRHS,1:KB)**H.
+*
+      IF( KB.LT.MINMNUPDT ) THEN
+         CALL CGEMM( 'No transpose', 'Conjugate transpose',
+     $         M-IF, N+NRHS-KB, KB, -CONE, A( IF+1, 1 ), LDA,
+     $         F( KB+1, 1 ), LDF, CONE, A( IF+1, KB+1 ), LDA )
+      END IF
+*
+*     Recompute the 2-norm of the difficult columns.
+*     Loop over the index of the difficult columns from the largest
+*     to the smallest index.
+*
+      DO WHILE( LSTICC.GT.0 )
+*
+*        LSTICC is the index of the last difficult column is greater
+*        than 1.
+*        ITEMP is the index of the previous difficult column.
+*
+         ITEMP = IWORK( LSTICC-1 )
+*
+*        Compute the 2-norm explicilty for the last difficult column and
+*        save it in the partial and exact 2-norm vectors VN1 and VN2.
+*
+*        NOTE: The computation of VN1( LSTICC ) relies on the fact that
+*        SCNRM2 does not fail on vectors with norm below the value of
+*        SQRT(SLAMCH('S'))
+*
+         VN1( LSTICC ) = SCNRM2( M-IF, A( IF+1, LSTICC ), 1 )
+         VN2( LSTICC ) = VN1( LSTICC )
+*
+*        Downdate the index of the last difficult column to
+*        the index of the previous difficult column.
+*
+         LSTICC = ITEMP
+*
+      END DO
+*
+      RETURN
+*
+*     End of CLAQP3RK
+*
+      END
diff --git a/SRC/claqps.f b/SRC/claqps.f
index e41c47c3c6..07a369f997 100644
--- a/SRC/claqps.f
+++ b/SRC/claqps.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQPS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqps.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqps.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -150,7 +148,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup laqps
 *
 *> \par Contributors:
 *  ==================
@@ -168,13 +166,13 @@
 *>
 *> LAPACK Working Note 176
 *
-*> \htmlonly
 *> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">[PDF]</a>
-*> \endhtmlonly
 *
 *  =====================================================================
-      SUBROUTINE CLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
+      SUBROUTINE CLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU,
+     $                   VN1,
      $                   VN2, AUXV, F, LDF )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -248,7 +246,8 @@ SUBROUTINE CLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
             DO 20 J = 1, K - 1
                F( K, J ) = CONJG( F( K, J ) )
    20       CONTINUE
-            CALL CGEMV( 'No transpose', M-RK+1, K-1, -CONE, A( RK, 1 ),
+            CALL CGEMV( 'No transpose', M-RK+1, K-1, -CONE, A( RK,
+     $                  1 ),
      $                  LDA, F( K, 1 ), LDF, CONE, A( RK, K ), 1 )
             DO 30 J = 1, K - 1
                F( K, J ) = CONJG( F( K, J ) )
@@ -258,7 +257,8 @@ SUBROUTINE CLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
 *        Generate elementary reflector H(k).
 *
          IF( RK.LT.M ) THEN
-            CALL CLARFG( M-RK+1, A( RK, K ), A( RK+1, K ), 1, TAU( K ) )
+            CALL CLARFG( M-RK+1, A( RK, K ), A( RK+1, K ), 1,
+     $                   TAU( K ) )
          ELSE
             CALL CLARFG( 1, A( RK, K ), A( RK, K ), 1, TAU( K ) )
          END IF
@@ -287,7 +287,8 @@ SUBROUTINE CLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
 *                    *A(RK:M,K).
 *
          IF( K.GT.1 ) THEN
-            CALL CGEMV( 'Conjugate transpose', M-RK+1, K-1, -TAU( K ),
+            CALL CGEMV( 'Conjugate transpose', M-RK+1, K-1,
+     $                  -TAU( K ),
      $                  A( RK, 1 ), LDA, A( RK, K ), 1, CZERO,
      $                  AUXV( 1 ), 1 )
 *
@@ -299,7 +300,8 @@ SUBROUTINE CLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
 *        A(RK,K+1:N) := A(RK,K+1:N) - A(RK,1:K)*F(K+1:N,1:K)**H.
 *
          IF( K.LT.N ) THEN
-            CALL CGEMM( 'No transpose', 'Conjugate transpose', 1, N-K,
+            CALL CGEMM( 'No transpose', 'Conjugate transpose', 1,
+     $                  N-K,
      $                  K, -CONE, A( RK, 1 ), LDA, F( K+1, 1 ), LDF,
      $                  CONE, A( RK, K+1 ), LDA )
          END IF
@@ -340,7 +342,8 @@ SUBROUTINE CLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
 *                         A(OFFSET+KB+1:M,1:KB)*F(KB+1:N,1:KB)**H.
 *
       IF( KB.LT.MIN( N, M-OFFSET ) ) THEN
-         CALL CGEMM( 'No transpose', 'Conjugate transpose', M-RK, N-KB,
+         CALL CGEMM( 'No transpose', 'Conjugate transpose', M-RK,
+     $               N-KB,
      $               KB, -CONE, A( RK+1, 1 ), LDA, F( KB+1, 1 ), LDF,
      $               CONE, A( RK+1, KB+1 ), LDA )
       END IF
diff --git a/SRC/claqr0.f b/SRC/claqr0.f
index 47494e0677..fc453765d9 100644
--- a/SRC/claqr0.f
+++ b/SRC/claqr0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQR0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqr0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqr0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -214,7 +212,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup laqr0
 *
 *> \par Contributors:
 *  ==================
@@ -237,6 +235,7 @@
 *  =====================================================================
       SUBROUTINE CLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
      $                   IHIZ, Z, LDZ, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -299,7 +298,8 @@ SUBROUTINE CLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
       COMPLEX            ZDUM( 1, 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLACPY, CLAHQR, CLAQR3, CLAQR4, CLAQR5
+      EXTERNAL           CLACPY, CLAHQR, CLAQR3, CLAQR4,
+     $                   CLAQR5
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, CMPLX, INT, MAX, MIN, MOD, REAL,
@@ -509,7 +509,8 @@ SUBROUTINE CLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
 *
 *           ==== Aggressive early deflation ====
 *
-            CALL CLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+            CALL CLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH,
+     $                   ILOZ,
      $                   IHIZ, Z, LDZ, LS, LD, W, H( KV, 1 ), LDH, NHO,
      $                   H( KV, KT ), LDH, NVE, H( KWV, 1 ), LDH, WORK,
      $                   LWORK )
diff --git a/SRC/claqr1.f b/SRC/claqr1.f
index e6989798f1..06fcab1a48 100644
--- a/SRC/claqr1.f
+++ b/SRC/claqr1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQR1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqr1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqr1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -94,7 +92,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup laqr1
 *
 *> \par Contributors:
 *  ==================
@@ -104,6 +102,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CLAQR1( N, H, LDH, S1, S2, V )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/claqr2.f b/SRC/claqr2.f
index 1695fbe5bd..22aa712349 100644
--- a/SRC/claqr2.f
+++ b/SRC/claqr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -254,7 +252,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup laqr2
 *
 *> \par Contributors:
 *  ==================
@@ -263,9 +261,11 @@
 *>       University of Kansas, USA
 *>
 *  =====================================================================
-      SUBROUTINE CLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+      SUBROUTINE CLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH,
+     $                   ILOZ,
      $                   IHIZ, Z, LDZ, NS, ND, SH, V, LDV, NH, T, LDT,
      $                   NV, WV, LDWV, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -291,7 +291,7 @@ SUBROUTINE CLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
       PARAMETER          ( RZERO = 0.0e0, RONE = 1.0e0 )
 *     ..
 *     .. Local Scalars ..
-      COMPLEX            BETA, CDUM, S, TAU
+      COMPLEX            CDUM, S, TAU
       REAL               FOO, SAFMAX, SAFMIN, SMLNUM, ULP
       INTEGER            I, IFST, ILST, INFO, INFQR, J, JW, KCOL, KLN,
      $                   KNT, KROW, KWTOP, LTOP, LWK1, LWK2, LWKOPT
@@ -301,8 +301,9 @@ SUBROUTINE CLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
       EXTERNAL           SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CGEHRD, CGEMM, CLACPY, CLAHQR, CLARF,
-     $                   CLARFG, CLASET, CTREXC, CUNMHR, SLABAD
+      EXTERNAL           CCOPY, CGEHRD, CGEMM, CLACPY, CLAHQR,
+     $                   CLARF1F,
+     $                   CLARFG, CLASET, CTREXC, CUNMHR
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, CMPLX, CONJG, INT, MAX, MIN, REAL
@@ -329,7 +330,8 @@ SUBROUTINE CLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
 *        ==== Workspace query call to CUNMHR ====
 *
-         CALL CUNMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V, LDV,
+         CALL CUNMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V,
+     $                LDV,
      $                WORK, -1, INFO )
          LWK2 = INT( WORK( 1 ) )
 *
@@ -360,7 +362,6 @@ SUBROUTINE CLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
       SAFMIN = SLAMCH( 'SAFE MINIMUM' )
       SAFMAX = RONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULP = SLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( REAL( N ) / ULP )
 *
@@ -399,7 +400,8 @@ SUBROUTINE CLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *     .    here and there to keep track.) ====
 *
       CALL CLACPY( 'U', JW, JW, H( KWTOP, KWTOP ), LDH, T, LDT )
-      CALL CCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ), LDT+1 )
+      CALL CCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ),
+     $            LDT+1 )
 *
       CALL CLASET( 'A', JW, JW, ZERO, ONE, V, LDV )
       CALL CLAHQR( .true., .true., JW, 1, JW, T, LDT, SH( KWTOP ), 1,
@@ -451,7 +453,8 @@ SUBROUTINE CLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
    20       CONTINUE
             ILST = I
             IF( IFST.NE.ILST )
-     $         CALL CTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, INFO )
+     $         CALL CTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST,
+     $                      INFO )
    30    CONTINUE
       END IF
 *
@@ -471,18 +474,17 @@ SUBROUTINE CLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
             DO 50 I = 1, NS
                WORK( I ) = CONJG( WORK( I ) )
    50       CONTINUE
-            BETA = WORK( 1 )
-            CALL CLARFG( NS, BETA, WORK( 2 ), 1, TAU )
-            WORK( 1 ) = ONE
+            CALL CLARFG( NS, WORK( 1 ), WORK( 2 ), 1, TAU )
 *
-            CALL CLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ), LDT )
+            CALL CLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ),
+     $                   LDT )
 *
-            CALL CLARF( 'L', NS, JW, WORK, 1, CONJG( TAU ), T, LDT,
-     $                  WORK( JW+1 ) )
-            CALL CLARF( 'R', NS, NS, WORK, 1, TAU, T, LDT,
-     $                  WORK( JW+1 ) )
-            CALL CLARF( 'R', JW, NS, WORK, 1, TAU, V, LDV,
-     $                  WORK( JW+1 ) )
+            CALL CLARF1F( 'L', NS, JW, WORK, 1, CONJG( TAU ), T, LDT,
+     $                    WORK( JW+1 ) )
+            CALL CLARF1F( 'R', NS, NS, WORK, 1, TAU, T, LDT,
+     $                    WORK( JW+1 ) )
+            CALL CLARF1F( 'R', JW, NS, WORK, 1, TAU, V, LDV,
+     $                    WORK( JW+1 ) )
 *
             CALL CGEHRD( JW, 1, NS, T, LDT, WORK, WORK( JW+1 ),
      $                   LWORK-JW, INFO )
@@ -500,7 +502,8 @@ SUBROUTINE CLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *        .    H and Z, if requested.  ====
 *
          IF( NS.GT.1 .AND. S.NE.ZERO )
-     $      CALL CUNMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V, LDV,
+     $      CALL CUNMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V,
+     $                   LDV,
      $                   WORK( JW+1 ), LWORK-JW, INFO )
 *
 *        ==== Update vertical slab in H ====
@@ -514,7 +517,8 @@ SUBROUTINE CLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
             KLN = MIN( NV, KWTOP-KROW )
             CALL CGEMM( 'N', 'N', KLN, JW, JW, ONE, H( KROW, KWTOP ),
      $                  LDH, V, LDV, ZERO, WV, LDWV )
-            CALL CLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ), LDH )
+            CALL CLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ),
+     $                   LDH )
    60    CONTINUE
 *
 *        ==== Update horizontal slab in H ====
@@ -534,7 +538,8 @@ SUBROUTINE CLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
          IF( WANTZ ) THEN
             DO 80 KROW = ILOZ, IHIZ, NV
                KLN = MIN( NV, IHIZ-KROW+1 )
-               CALL CGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW, KWTOP ),
+               CALL CGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW,
+     $                     KWTOP ),
      $                     LDZ, V, LDV, ZERO, WV, LDWV )
                CALL CLACPY( 'A', KLN, JW, WV, LDWV, Z( KROW, KWTOP ),
      $                      LDZ )
diff --git a/SRC/claqr3.f b/SRC/claqr3.f
index 2f5402de97..c0f3530c30 100644
--- a/SRC/claqr3.f
+++ b/SRC/claqr3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQR3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqr3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqr3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -251,7 +249,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup laqr3
 *
 *> \par Contributors:
 *  ==================
@@ -260,9 +258,11 @@
 *>       University of Kansas, USA
 *>
 *  =====================================================================
-      SUBROUTINE CLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+      SUBROUTINE CLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH,
+     $                   ILOZ,
      $                   IHIZ, Z, LDZ, NS, ND, SH, V, LDV, NH, T, LDT,
      $                   NV, WV, LDWV, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -288,7 +288,7 @@ SUBROUTINE CLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
       PARAMETER          ( RZERO = 0.0e0, RONE = 1.0e0 )
 *     ..
 *     .. Local Scalars ..
-      COMPLEX            BETA, CDUM, S, TAU
+      COMPLEX            CDUM, S, TAU
       REAL               FOO, SAFMAX, SAFMIN, SMLNUM, ULP
       INTEGER            I, IFST, ILST, INFO, INFQR, J, JW, KCOL, KLN,
      $                   KNT, KROW, KWTOP, LTOP, LWK1, LWK2, LWK3,
@@ -300,8 +300,9 @@ SUBROUTINE CLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
       EXTERNAL           SLAMCH, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CGEHRD, CGEMM, CLACPY, CLAHQR, CLAQR4,
-     $                   CLARF, CLARFG, CLASET, CTREXC, CUNMHR, SLABAD
+      EXTERNAL           CCOPY, CGEHRD, CGEMM, CLACPY, CLAHQR,
+     $                   CLAQR4,
+     $                   CLARF1F, CLARFG, CLASET, CTREXC, CUNMHR
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, CMPLX, CONJG, INT, MAX, MIN, REAL
@@ -328,13 +329,15 @@ SUBROUTINE CLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
 *        ==== Workspace query call to CUNMHR ====
 *
-         CALL CUNMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V, LDV,
+         CALL CUNMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V,
+     $                LDV,
      $                WORK, -1, INFO )
          LWK2 = INT( WORK( 1 ) )
 *
 *        ==== Workspace query call to CLAQR4 ====
 *
-         CALL CLAQR4( .true., .true., JW, 1, JW, T, LDT, SH, 1, JW, V,
+         CALL CLAQR4( .true., .true., JW, 1, JW, T, LDT, SH, 1, JW,
+     $                V,
      $                LDV, WORK, -1, INFQR )
          LWK3 = INT( WORK( 1 ) )
 *
@@ -365,7 +368,6 @@ SUBROUTINE CLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
       SAFMIN = SLAMCH( 'SAFE MINIMUM' )
       SAFMAX = RONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULP = SLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( REAL( N ) / ULP )
 *
@@ -404,15 +406,18 @@ SUBROUTINE CLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *     .    here and there to keep track.) ====
 *
       CALL CLACPY( 'U', JW, JW, H( KWTOP, KWTOP ), LDH, T, LDT )
-      CALL CCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ), LDT+1 )
+      CALL CCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ),
+     $            LDT+1 )
 *
       CALL CLASET( 'A', JW, JW, ZERO, ONE, V, LDV )
       NMIN = ILAENV( 12, 'CLAQR3', 'SV', JW, 1, JW, LWORK )
       IF( JW.GT.NMIN ) THEN
-         CALL CLAQR4( .true., .true., JW, 1, JW, T, LDT, SH( KWTOP ), 1,
+         CALL CLAQR4( .true., .true., JW, 1, JW, T, LDT, SH( KWTOP ),
+     $                1,
      $                JW, V, LDV, WORK, LWORK, INFQR )
       ELSE
-         CALL CLAHQR( .true., .true., JW, 1, JW, T, LDT, SH( KWTOP ), 1,
+         CALL CLAHQR( .true., .true., JW, 1, JW, T, LDT, SH( KWTOP ),
+     $                1,
      $                JW, V, LDV, INFQR )
       END IF
 *
@@ -462,7 +467,8 @@ SUBROUTINE CLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
    20       CONTINUE
             ILST = I
             IF( IFST.NE.ILST )
-     $         CALL CTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, INFO )
+     $         CALL CTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST,
+     $                      INFO )
    30    CONTINUE
       END IF
 *
@@ -482,18 +488,17 @@ SUBROUTINE CLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
             DO 50 I = 1, NS
                WORK( I ) = CONJG( WORK( I ) )
    50       CONTINUE
-            BETA = WORK( 1 )
-            CALL CLARFG( NS, BETA, WORK( 2 ), 1, TAU )
-            WORK( 1 ) = ONE
+            CALL CLARFG( NS, WORK( 1 ), WORK( 2 ), 1, TAU )
 *
-            CALL CLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ), LDT )
+            CALL CLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ),
+     $                   LDT )
 *
-            CALL CLARF( 'L', NS, JW, WORK, 1, CONJG( TAU ), T, LDT,
-     $                  WORK( JW+1 ) )
-            CALL CLARF( 'R', NS, NS, WORK, 1, TAU, T, LDT,
-     $                  WORK( JW+1 ) )
-            CALL CLARF( 'R', JW, NS, WORK, 1, TAU, V, LDV,
-     $                  WORK( JW+1 ) )
+            CALL CLARF1F( 'L', NS, JW, WORK, 1, CONJG( TAU ), T, LDT,
+     $                    WORK( JW+1 ) )
+            CALL CLARF1F( 'R', NS, NS, WORK, 1, TAU, T, LDT,
+     $                    WORK( JW+1 ) )
+            CALL CLARF1F( 'R', JW, NS, WORK, 1, TAU, V, LDV,
+     $                    WORK( JW+1 ) )
 *
             CALL CGEHRD( JW, 1, NS, T, LDT, WORK, WORK( JW+1 ),
      $                   LWORK-JW, INFO )
@@ -511,7 +516,8 @@ SUBROUTINE CLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *        .    H and Z, if requested.  ====
 *
          IF( NS.GT.1 .AND. S.NE.ZERO )
-     $      CALL CUNMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V, LDV,
+     $      CALL CUNMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V,
+     $                   LDV,
      $                   WORK( JW+1 ), LWORK-JW, INFO )
 *
 *        ==== Update vertical slab in H ====
@@ -525,7 +531,8 @@ SUBROUTINE CLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
             KLN = MIN( NV, KWTOP-KROW )
             CALL CGEMM( 'N', 'N', KLN, JW, JW, ONE, H( KROW, KWTOP ),
      $                  LDH, V, LDV, ZERO, WV, LDWV )
-            CALL CLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ), LDH )
+            CALL CLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ),
+     $                   LDH )
    60    CONTINUE
 *
 *        ==== Update horizontal slab in H ====
@@ -545,7 +552,8 @@ SUBROUTINE CLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
          IF( WANTZ ) THEN
             DO 80 KROW = ILOZ, IHIZ, NV
                KLN = MIN( NV, IHIZ-KROW+1 )
-               CALL CGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW, KWTOP ),
+               CALL CGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW,
+     $                     KWTOP ),
      $                     LDZ, V, LDV, ZERO, WV, LDWV )
                CALL CLACPY( 'A', KLN, JW, WV, LDWV, Z( KROW, KWTOP ),
      $                      LDZ )
diff --git a/SRC/claqr4.f b/SRC/claqr4.f
index b2d15dd6e4..83e49a5373 100644
--- a/SRC/claqr4.f
+++ b/SRC/claqr4.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQR4 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqr4.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqr4.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -222,7 +220,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup laqr4
 *
 *> \par Contributors:
 *  ==================
@@ -245,6 +243,7 @@
 *  =====================================================================
       SUBROUTINE CLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
      $                   IHIZ, Z, LDZ, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -519,7 +518,8 @@ SUBROUTINE CLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
 *
 *           ==== Aggressive early deflation ====
 *
-            CALL CLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+            CALL CLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH,
+     $                   ILOZ,
      $                   IHIZ, Z, LDZ, LS, LD, W, H( KV, 1 ), LDH, NHO,
      $                   H( KV, KT ), LDH, NVE, H( KWV, 1 ), LDH, WORK,
      $                   LWORK )
diff --git a/SRC/claqr5.f b/SRC/claqr5.f
index 95cc33b9d9..4ece3ca9d7 100644
--- a/SRC/claqr5.f
+++ b/SRC/claqr5.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQR5 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqr5.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqr5.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -225,7 +223,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup laqr5
 *
 *> \par Contributors:
 *  ==================
@@ -251,7 +249,8 @@
 *>       ACM Trans. Math. Softw. 40, 2, Article 12 (February 2014).
 *>
 *  =====================================================================
-      SUBROUTINE CLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
+      SUBROUTINE CLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
+     $                   S,
      $                   H, LDH, ILOZ, IHIZ, Z, LDZ, V, LDV, U, LDU, NV,
      $                   WV, LDWV, NH, WH, LDWH )
       IMPLICIT NONE
@@ -279,7 +278,7 @@ SUBROUTINE CLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
       PARAMETER          ( RZERO = 0.0e0, RONE = 1.0e0 )
 *     ..
 *     .. Local Scalars ..
-      COMPLEX            ALPHA, BETA, CDUM, REFSUM
+      COMPLEX            ALPHA, BETA, CDUM, REFSUM, T1, T2, T3
       REAL               H11, H12, H21, H22, SAFMAX, SAFMIN, SCL,
      $                   SMLNUM, TST1, TST2, ULP
       INTEGER            I2, I4, INCOL, J, JBOT, JCOL, JLEN,
@@ -300,8 +299,8 @@ SUBROUTINE CLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
       COMPLEX            VT( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMM, CLACPY, CLAQR1, CLARFG, CLASET, CTRMM,
-     $                   SLABAD
+      EXTERNAL           CGEMM, CLACPY, CLAQR1, CLARFG, CLASET,
+     $                   CTRMM
 *     ..
 *     .. Statement Functions ..
       REAL               CABS1
@@ -331,7 +330,6 @@ SUBROUTINE CLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
 *
       SAFMIN = SLAMCH( 'SAFE MINIMUM' )
       SAFMAX = RONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULP = SLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( REAL( N ) / ULP )
 *
@@ -424,12 +422,12 @@ SUBROUTINE CLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
 *              ==== Perform update from right within 
 *              .    computational window. ====
 *
+               T1 = V( 1, M22 )
+               T2 = T1*CONJG( V( 2, M22 ) )
                DO 30 J = JTOP, MIN( KBOT, K+3 )
-                  REFSUM = V( 1, M22 )*( H( J, K+1 )+V( 2, M22 )*
-     $                     H( J, K+2 ) )
-                  H( J, K+1 ) = H( J, K+1 ) - REFSUM
-                  H( J, K+2 ) = H( J, K+2 ) -
-     $                          REFSUM*CONJG( V( 2, M22 ) )
+                  REFSUM = H( J, K+1 ) + V( 2, M22 )*H( J, K+2 )
+                  H( J, K+1 ) = H( J, K+1 ) - REFSUM*T1
+                  H( J, K+2 ) = H( J, K+2 ) - REFSUM*T2
    30          CONTINUE
 *
 *              ==== Perform update from left within 
@@ -442,12 +440,13 @@ SUBROUTINE CLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
                ELSE
                   JBOT = KBOT
                END IF
+               T1 = CONJG( V( 1, M22 ) )
+               T2 = T1*V( 2, M22 )
                DO 40 J = K+1, JBOT
-                  REFSUM = CONJG( V( 1, M22 ) )*
-     $                     ( H( K+1, J )+CONJG( V( 2, M22 ) )*
-     $                     H( K+2, J ) )
-                  H( K+1, J ) = H( K+1, J ) - REFSUM
-                  H( K+2, J ) = H( K+2, J ) - REFSUM*V( 2, M22 )
+                  REFSUM = H( K+1, J ) +
+     $                     CONJG( V( 2, M22 ) )*H( K+2, J )
+                  H( K+1, J ) = H( K+1, J ) - REFSUM*T1
+                  H( K+2, J ) = H( K+2, J ) - REFSUM*T2
    40          CONTINUE
 *
 *              ==== The following convergence test requires that
@@ -532,11 +531,13 @@ SUBROUTINE CLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
 *                 .    Mth bulge. Exploit fact that first two elements
 *                 .    of row are actually zero. ====
 *
-                  REFSUM = V( 1, M )*V( 3, M )*H( K+3, K+2 )
-                  H( K+3, K   ) = -REFSUM
-                  H( K+3, K+1 ) = -REFSUM*CONJG( V( 2, M ) )
-                  H( K+3, K+2 ) = H( K+3, K+2 ) -
-     $                            REFSUM*CONJG( V( 3, M ) )
+                  T1 = V( 1, M )
+                  T2 = T1*CONJG( V( 2, M ) )
+                  T3 = T1*CONJG( V( 3, M ) )
+                  REFSUM = V( 3, M )*H( K+3, K+2 )
+                  H( K+3, K   ) = -REFSUM*T1
+                  H( K+3, K+1 ) = -REFSUM*T2
+                  H( K+3, K+2 ) = H( K+3, K+2 ) - REFSUM*T3
 *
 *                 ==== Calculate reflection to move
 *                 .    Mth bulge one step. ====
@@ -571,12 +572,13 @@ SUBROUTINE CLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
      $                            S( 2*M ), VT )
                      ALPHA = VT( 1 )
                      CALL CLARFG( 3, ALPHA, VT( 2 ), 1, VT( 1 ) )
-                     REFSUM = CONJG( VT( 1 ) )*
-     $                        ( H( K+1, K )+CONJG( VT( 2 ) )*
-     $                        H( K+2, K ) )
+                     T1 = CONJG( VT( 1 ) )
+                     T2 = T1*VT( 2 )
+                     T3 = T1*VT( 3 )
+                     REFSUM = H( K+1, K )+CONJG( VT( 2 ) )*H( K+2, K )
 *
-                     IF( CABS1( H( K+2, K )-REFSUM*VT( 2 ) )+
-     $                   CABS1( REFSUM*VT( 3 ) ).GT.ULP*
+                     IF( CABS1( H( K+2, K )-REFSUM*T2 )+
+     $                   CABS1( REFSUM*T3 ).GT.ULP*
      $                   ( CABS1( H( K, K ) )+CABS1( H( K+1,
      $                   K+1 ) )+CABS1( H( K+2, K+2 ) ) ) ) THEN
 *
@@ -594,7 +596,7 @@ SUBROUTINE CLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
 *                       .    Replace the old reflector with
 *                       .    the new one. ====
 *
-                        H( K+1, K ) = H( K+1, K ) - REFSUM
+                        H( K+1, K ) = H( K+1, K ) - REFSUM*T1
                         H( K+2, K ) = ZERO
                         H( K+3, K ) = ZERO
                         V( 1, M ) = VT( 1 )
@@ -610,25 +612,28 @@ SUBROUTINE CLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
 *              .     deflation check. We still delay most of the
 *              .     updates from the left for efficiency. ====
 *
+               T1 = V( 1, M )
+               T2 = T1*CONJG( V( 2, M ) )
+               T3 = T1*CONJG( V( 3, M ) )
                DO 70 J = JTOP, MIN( KBOT, K+3 )
-                  REFSUM = V( 1, M )*( H( J, K+1 )+V( 2, M )*
-     $                     H( J, K+2 )+V( 3, M )*H( J, K+3 ) )
-                  H( J, K+1 ) = H( J, K+1 ) - REFSUM
-                  H( J, K+2 ) = H( J, K+2 ) -
-     $                          REFSUM*CONJG( V( 2, M ) )
-                  H( J, K+3 ) = H( J, K+3 ) -
-     $                          REFSUM*CONJG( V( 3, M ) )
+                  REFSUM = H( J, K+1 ) + V( 2, M )*H( J, K+2 )
+     $                     + V( 3, M )*H( J, K+3 )
+                  H( J, K+1 ) = H( J, K+1 ) - REFSUM*T1
+                  H( J, K+2 ) = H( J, K+2 ) - REFSUM*T2
+                  H( J, K+3 ) = H( J, K+3 ) - REFSUM*T3
    70          CONTINUE
 *
 *              ==== Perform update from left for subsequent
 *              .    column. ====
 *
-               REFSUM =  CONJG( V( 1, M ) )*( H( K+1, K+1 )
-     $                  +CONJG( V( 2, M ) )*H( K+2, K+1 )
-     $                  +CONJG( V( 3, M ) )*H( K+3, K+1 ) )
-               H( K+1, K+1 ) = H( K+1, K+1 ) - REFSUM
-               H( K+2, K+1 ) = H( K+2, K+1 ) - REFSUM*V( 2, M )
-               H( K+3, K+1 ) = H( K+3, K+1 ) - REFSUM*V( 3, M )
+               T1 = CONJG( V( 1, M ) )
+               T2 = T1*V( 2, M )
+               T3 = T1*V( 3, M )
+               REFSUM = H( K+1, K+1 ) + CONJG( V( 2, M ) )*H( K+2, K+1 )
+     $                  + CONJG( V( 3, M ) )*H( K+3, K+1 )
+               H( K+1, K+1 ) = H( K+1, K+1 ) - REFSUM*T1
+               H( K+2, K+1 ) = H( K+2, K+1 ) - REFSUM*T2
+               H( K+3, K+1 ) = H( K+3, K+1 ) - REFSUM*T3
 *
 *              ==== The following convergence test requires that
 *              .    the tradition small-compared-to-nearby-diagonals
@@ -688,13 +693,15 @@ SUBROUTINE CLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
 *
             DO 100 M = MBOT, MTOP, -1
                K = KRCOL + 2*( M-1 )
+               T1 = CONJG( V( 1, M ) )
+               T2 = T1*V( 2, M )
+               T3 = T1*V( 3, M )
                DO 90 J = MAX( KTOP, KRCOL + 2*M ), JBOT
-                  REFSUM = CONJG( V( 1, M ) )*
-     $                     ( H( K+1, J )+CONJG( V( 2, M ) )*
-     $                     H( K+2, J )+CONJG( V( 3, M ) )*H( K+3, J ) )
-                  H( K+1, J ) = H( K+1, J ) - REFSUM
-                  H( K+2, J ) = H( K+2, J ) - REFSUM*V( 2, M )
-                  H( K+3, J ) = H( K+3, J ) - REFSUM*V( 3, M )
+                  REFSUM = H( K+1, J ) + CONJG( V( 2, M ) )*
+     $                     H( K+2, J ) + CONJG( V( 3, M ) )*H( K+3, J )
+                  H( K+1, J ) = H( K+1, J ) - REFSUM*T1
+                  H( K+2, J ) = H( K+2, J ) - REFSUM*T2
+                  H( K+3, J ) = H( K+3, J ) - REFSUM*T3
    90          CONTINUE
   100       CONTINUE
 *
@@ -712,14 +719,15 @@ SUBROUTINE CLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
                   I2 = MAX( 1, KTOP-INCOL )
                   I2 = MAX( I2, KMS-(KRCOL-INCOL)+1 )
                   I4 = MIN( KDU, KRCOL + 2*( MBOT-1 ) - INCOL + 5 )
+                  T1 = V( 1, M )
+                  T2 = T1*CONJG( V( 2, M ) )
+                  T3 = T1*CONJG( V( 3, M ) )
                   DO 110 J = I2, I4
-                     REFSUM = V( 1, M )*( U( J, KMS+1 )+V( 2, M )*
-     $                        U( J, KMS+2 )+V( 3, M )*U( J, KMS+3 ) )
-                     U( J, KMS+1 ) = U( J, KMS+1 ) - REFSUM
-                     U( J, KMS+2 ) = U( J, KMS+2 ) -
-     $                               REFSUM*CONJG( V( 2, M ) )
-                     U( J, KMS+3 ) = U( J, KMS+3 ) -
-     $                               REFSUM*CONJG( V( 3, M ) )
+                     REFSUM = U( J, KMS+1 ) + V( 2, M )*U( J, KMS+2 )
+     $                        + V( 3, M )*U( J, KMS+3 )
+                     U( J, KMS+1 ) = U( J, KMS+1 ) - REFSUM*T1
+                     U( J, KMS+2 ) = U( J, KMS+2 ) - REFSUM*T2
+                     U( J, KMS+3 ) = U( J, KMS+3 ) - REFSUM*T3
   110             CONTINUE
   120          CONTINUE
             ELSE IF( WANTZ ) THEN
@@ -730,14 +738,15 @@ SUBROUTINE CLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
 *
                DO 140 M = MBOT, MTOP, -1
                   K = KRCOL + 2*( M-1 )
+                  T1 = V( 1, M )
+                  T2 = T1*CONJG( V( 2, M ) )
+                  T3 = T1*CONJG( V( 3, M ) )
                   DO 130 J = ILOZ, IHIZ
-                     REFSUM = V( 1, M )*( Z( J, K+1 )+V( 2, M )*
-     $                        Z( J, K+2 )+V( 3, M )*Z( J, K+3 ) )
-                     Z( J, K+1 ) = Z( J, K+1 ) - REFSUM
-                     Z( J, K+2 ) = Z( J, K+2 ) -
-     $                             REFSUM*CONJG( V( 2, M ) )
-                     Z( J, K+3 ) = Z( J, K+3 ) -
-     $                             REFSUM*CONJG( V( 3, M ) )
+                     REFSUM = Z( J, K+1 ) + V( 2, M )*Z( J, K+2 )
+     $                        + V( 3, M )*Z( J, K+3 )
+                     Z( J, K+1 ) = Z( J, K+1 ) - REFSUM*T1
+                     Z( J, K+2 ) = Z( J, K+2 ) - REFSUM*T2
+                     Z( J, K+3 ) = Z( J, K+3 ) - REFSUM*T3
   130             CONTINUE
   140          CONTINUE
             END IF
diff --git a/SRC/claqsb.f b/SRC/claqsb.f
index f7e3c0ef07..6d9350d558 100644
--- a/SRC/claqsb.f
+++ b/SRC/claqsb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQSB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqsb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqsb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -134,10 +132,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup laqhb
 *
 *  =====================================================================
-      SUBROUTINE CLAQSB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX, EQUED )
+      SUBROUTINE CLAQSB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX,
+     $                   EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/claqsp.f b/SRC/claqsp.f
index 523e4a19e0..afc80955b8 100644
--- a/SRC/claqsp.f
+++ b/SRC/claqsp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQSP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqsp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqsp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,10 +117,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup laqhp
 *
 *  =====================================================================
       SUBROUTINE CLAQSP( UPLO, N, AP, S, SCOND, AMAX, EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/claqsy.f b/SRC/claqsy.f
index d9f3a5dddc..439bd24766 100644
--- a/SRC/claqsy.f
+++ b/SRC/claqsy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQSY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claqsy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claqsy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,10 +125,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYauxiliary
+*> \ingroup laqhe
 *
 *  =====================================================================
       SUBROUTINE CLAQSY( UPLO, N, A, LDA, S, SCOND, AMAX, EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/claqz0.f b/SRC/claqz0.f
index 2284fd65d9..1f6e09c622 100644
--- a/SRC/claqz0.f
+++ b/SRC/claqz0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQZ0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/CLAQZ0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/CLAQZ0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -89,7 +87,7 @@
 *>      Anal., 29(2006), pp. 199--227.
 *>
 *> Ref: T. Steel, D. Camps, K. Meerbergen, R. Vandebril "A multishift,
-*>      multipole rational QZ method with agressive early deflation"
+*>      multipole rational QZ method with aggressive early deflation"
 *> \endverbatim
 *
 *  Arguments:
@@ -274,10 +272,11 @@
 *
 *> \date May 2020
 *
-*> \ingroup complexGEcomputational
+*> \ingroup laqz0
 *>
 *  =====================================================================
-      RECURSIVE SUBROUTINE CLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
+      RECURSIVE SUBROUTINE CLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI,
+     $                             A,
      $                             LDA, B, LDB, ALPHA, BETA, Q, LDQ, Z,
      $                             LDZ, WORK, LWORK, RWORK, REC,
      $                             INFO )
@@ -299,7 +298,7 @@ RECURSIVE SUBROUTINE CLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
       PARAMETER( ZERO = 0.0, ONE = 1.0, HALF = 0.5 )
 
 *     Local scalars
-      REAL :: SMLNUM, ULP, SAFMIN, SAFMAX, C1, TEMPR
+      REAL :: SMLNUM, ULP, SAFMIN, SAFMAX, C1, TEMPR, BNORM, BTOL
       COMPLEX :: ESHIFT, S1, TEMP
       INTEGER :: ISTART, ISTOP, IITER, MAXIT, ISTART2, K, LD, NSHIFTS,
      $           NBLOCK, NW, NMIN, NIBBLE, N_UNDEFLATED, N_DEFLATED,
@@ -310,9 +309,9 @@ RECURSIVE SUBROUTINE CLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
       CHARACTER :: JBCMPZ*3
 
 *     External Functions
-      EXTERNAL :: XERBLA, CHGEQZ, CLAQZ2, CLAQZ3, CLASET, SLABAD,
+      EXTERNAL :: XERBLA, CHGEQZ, CLAQZ2, CLAQZ3, CLASET,
      $            CLARTG, CROT
-      REAL, EXTERNAL :: SLAMCH
+      REAL, EXTERNAL :: SLAMCH, CLANHS
       LOGICAL, EXTERNAL :: LSAME
       INTEGER, EXTERNAL :: ILAENV
 
@@ -412,12 +411,14 @@ RECURSIVE SUBROUTINE CLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
       NSR = MAX( 2, NSR-MOD( NSR, 2 ) )
 
       RCOST = ILAENV( 17, 'CLAQZ0', JBCMPZ, N, ILO, IHI, LWORK )
-      ITEMP1 = INT( NSR/SQRT( 1+2*NSR/( REAL( RCOST )/100*N ) ) )
+      ITEMP1 = INT( REAL( NSR )/SQRT( 1+2*REAL( NSR )/
+     $         ( REAL( RCOST )/100*REAL( N ) ) ) )
       ITEMP1 = ( ( ITEMP1-1 )/4 )*4+4
       NBR = NSR+ITEMP1
 
       IF( N .LT. NMIN .OR. REC .GE. 2 ) THEN
-         CALL CHGEQZ( WANTS, WANTQ, WANTZ, N, ILO, IHI, A, LDA, B, LDB,
+         CALL CHGEQZ( WANTS, WANTQ, WANTZ, N, ILO, IHI, A, LDA, B,
+     $                LDB,
      $                ALPHA, BETA, Q, LDQ, Z, LDZ, WORK, LWORK, RWORK,
      $                INFO )
          RETURN
@@ -429,7 +430,8 @@ RECURSIVE SUBROUTINE CLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 
 *     Workspace query to CLAQZ2
       NW = MAX( NWR, NMIN )
-      CALL CLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW, A, LDA, B, LDB,
+      CALL CLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW, A, LDA, B,
+     $             LDB,
      $             Q, LDQ, Z, LDZ, N_UNDEFLATED, N_DEFLATED, ALPHA,
      $             BETA, WORK, NW, WORK, NW, WORK, -1, RWORK, REC,
      $             AED_INFO )
@@ -462,10 +464,12 @@ RECURSIVE SUBROUTINE CLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 *     Get machine constants
       SAFMIN = SLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE/SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULP = SLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( REAL( N )/ULP )
 
+      BNORM = CLANHS( 'F', IHI-ILO+1, B( ILO, ILO ), LDB, RWORK )
+      BTOL = MAX( SAFMIN, ULP*BNORM )
+
       ISTART = ILO
       ISTOP = IHI
       MAXIT = 30*( IHI-ILO+1 )
@@ -528,30 +532,26 @@ RECURSIVE SUBROUTINE CLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 *        slow down the method when many infinite eigenvalues are present
          K = ISTOP
          DO WHILE ( K.GE.ISTART2 )
-            TEMPR = ZERO
-            IF( K .LT. ISTOP ) THEN
-               TEMPR = TEMPR+ABS( B( K, K+1 ) )
-            END IF
-            IF( K .GT. ISTART2 ) THEN
-               TEMPR = TEMPR+ABS( B( K-1, K ) )
-            END IF
 
-            IF( ABS( B( K, K ) ) .LT. MAX( SMLNUM, ULP*TEMPR ) ) THEN
-*              A diagonal element of B is negligable, move it
+            IF( ABS( B( K, K ) ) .LT. BTOL ) THEN
+*              A diagonal element of B is negligible, move it
 *              to the top and deflate it
                
                DO K2 = K, ISTART2+1, -1
-                  CALL CLARTG( B( K2-1, K2 ), B( K2-1, K2-1 ), C1, S1,
+                  CALL CLARTG( B( K2-1, K2 ), B( K2-1, K2-1 ), C1,
+     $                         S1,
      $                         TEMP )
                   B( K2-1, K2 ) = TEMP
                   B( K2-1, K2-1 ) = CZERO
 
                   CALL CROT( K2-2-ISTARTM+1, B( ISTARTM, K2 ), 1,
      $                       B( ISTARTM, K2-1 ), 1, C1, S1 )
-                  CALL CROT( MIN( K2+1, ISTOP )-ISTARTM+1, A( ISTARTM,
+                  CALL CROT( MIN( K2+1, ISTOP )-ISTARTM+1,
+     $                       A( ISTARTM,
      $                       K2 ), 1, A( ISTARTM, K2-1 ), 1, C1, S1 )
                   IF ( ILZ ) THEN
-                     CALL CROT( N, Z( 1, K2 ), 1, Z( 1, K2-1 ), 1, C1,
+                     CALL CROT( N, Z( 1, K2 ), 1, Z( 1, K2-1 ), 1,
+     $                          C1,
      $                          S1 )
                   END IF
 
@@ -561,9 +561,11 @@ RECURSIVE SUBROUTINE CLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
                      A( K2, K2-1 ) = TEMP
                      A( K2+1, K2-1 ) = CZERO
 
-                     CALL CROT( ISTOPM-K2+1, A( K2, K2 ), LDA, A( K2+1,
+                     CALL CROT( ISTOPM-K2+1, A( K2, K2 ), LDA,
+     $                          A( K2+1,
      $                          K2 ), LDA, C1, S1 )
-                     CALL CROT( ISTOPM-K2+1, B( K2, K2 ), LDB, B( K2+1,
+                     CALL CROT( ISTOPM-K2+1, B( K2, K2 ), LDB,
+     $                          B( K2+1,
      $                          K2 ), LDB, C1, S1 )
                      IF( ILQ ) THEN
                         CALL CROT( N, Q( 1, K2 ), 1, Q( 1, K2+1 ), 1,
@@ -625,7 +627,8 @@ RECURSIVE SUBROUTINE CLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 *
 *        Time for AED
 *
-         CALL CLAQZ2( ILSCHUR, ILQ, ILZ, N, ISTART2, ISTOP, NW, A, LDA,
+         CALL CLAQZ2( ILSCHUR, ILQ, ILZ, N, ISTART2, ISTOP, NW, A,
+     $                LDA,
      $                B, LDB, Q, LDQ, Z, LDZ, N_UNDEFLATED, N_DEFLATED,
      $                ALPHA, BETA, WORK, NW, WORK( NW**2+1 ), NW,
      $                WORK( 2*NW**2+1 ), LWORK-2*NW**2, RWORK, REC,
@@ -648,7 +651,7 @@ RECURSIVE SUBROUTINE CLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 
          NS = MIN( NSHIFTS, ISTOP-ISTART2 )
          NS = MIN( NS, N_UNDEFLATED )
-         SHIFTPOS = ISTOP-N_DEFLATED-N_UNDEFLATED+1
+         SHIFTPOS = ISTOP-N_UNDEFLATED+1
 
          IF ( MOD( LD, 6 ) .EQ. 0 ) THEN
 * 
@@ -668,7 +671,8 @@ RECURSIVE SUBROUTINE CLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 *
 *        Time for a QZ sweep
 *
-         CALL CLAQZ3( ILSCHUR, ILQ, ILZ, N, ISTART2, ISTOP, NS, NBLOCK,
+         CALL CLAQZ3( ILSCHUR, ILQ, ILZ, N, ISTART2, ISTOP, NS,
+     $                NBLOCK,
      $                ALPHA( SHIFTPOS ), BETA( SHIFTPOS ), A, LDA, B,
      $                LDB, Q, LDQ, Z, LDZ, WORK, NBLOCK, WORK( NBLOCK**
      $                2+1 ), NBLOCK, WORK( 2*NBLOCK**2+1 ),
diff --git a/SRC/claqz1.f b/SRC/claqz1.f
index b89fe6e196..cb555ee309 100644
--- a/SRC/claqz1.f
+++ b/SRC/claqz1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQZ1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/CLAQZ1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/CLAQZ1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -165,10 +163,11 @@
 *
 *> \date May 2020
 *
-*> \ingroup complexGEcomputational
+*> \ingroup laqz1
 *>
 *  =====================================================================
-      SUBROUTINE CLAQZ1( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
+      SUBROUTINE CLAQZ1( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA,
+     $                   B,
      $                   LDB, NQ, QSTART, Q, LDQ, NZ, ZSTART, Z, LDZ )
       IMPLICIT NONE
 *
@@ -203,7 +202,8 @@ SUBROUTINE CLAQZ1( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
          CALL CROT( IHI-ISTARTM+1, A( ISTARTM, IHI ), 1, A( ISTARTM,
      $              IHI-1 ), 1, C, S )
          IF ( ILZ ) THEN
-            CALL CROT( NZ, Z( 1, IHI-ZSTART+1 ), 1, Z( 1, IHI-1-ZSTART+
+            CALL CROT( NZ, Z( 1, IHI-ZSTART+1 ), 1, Z( 1,
+     $                 IHI-1-ZSTART+
      $                 1 ), 1, C, S )
          END IF
 *
@@ -219,10 +219,12 @@ SUBROUTINE CLAQZ1( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
          B( K+1, K ) = CZERO
          CALL CROT( K+2-ISTARTM+1, A( ISTARTM, K+1 ), 1, A( ISTARTM,
      $              K ), 1, C, S )
-         CALL CROT( K-ISTARTM+1, B( ISTARTM, K+1 ), 1, B( ISTARTM, K ),
+         CALL CROT( K-ISTARTM+1, B( ISTARTM, K+1 ), 1, B( ISTARTM,
+     $              K ),
      $              1, C, S )
          IF ( ILZ ) THEN
-            CALL CROT( NZ, Z( 1, K+1-ZSTART+1 ), 1, Z( 1, K-ZSTART+1 ),
+            CALL CROT( NZ, Z( 1, K+1-ZSTART+1 ), 1, Z( 1,
+     $                 K-ZSTART+1 ),
      $                 1, C, S )
          END IF
 *
@@ -231,9 +233,11 @@ SUBROUTINE CLAQZ1( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
          CALL CLARTG( A( K+1, K ), A( K+2, K ), C, S, TEMP )
          A( K+1, K ) = TEMP
          A( K+2, K ) = CZERO
-         CALL CROT( ISTOPM-K, A( K+1, K+1 ), LDA, A( K+2, K+1 ), LDA, C,
+         CALL CROT( ISTOPM-K, A( K+1, K+1 ), LDA, A( K+2, K+1 ), LDA,
+     $              C,
      $              S )
-         CALL CROT( ISTOPM-K, B( K+1, K+1 ), LDB, B( K+2, K+1 ), LDB, C,
+         CALL CROT( ISTOPM-K, B( K+1, K+1 ), LDB, B( K+2, K+1 ), LDB,
+     $              C,
      $              S )
          IF ( ILQ ) THEN
             CALL CROT( NQ, Q( 1, K+1-QSTART+1 ), 1, Q( 1, K+2-QSTART+
diff --git a/SRC/claqz2.f b/SRC/claqz2.f
index 895e0095bf..f133d16263 100644
--- a/SRC/claqz2.f
+++ b/SRC/claqz2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQZ2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/CLAQZ2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/CLAQZ2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -209,6 +207,7 @@
 *>          REC is INTEGER
 *>             REC indicates the current recursion level. Should be set
 *>             to 0 on first call.
+*> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
@@ -224,10 +223,11 @@
 *
 *> \date May 2020
 *
-*> \ingroup complexGEcomputational
+*> \ingroup laqz2
 *>
 *  =====================================================================
-      RECURSIVE SUBROUTINE CLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
+      RECURSIVE SUBROUTINE CLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI,
+     $                             NW,
      $                             A, LDA, B, LDB, Q, LDQ, Z, LDZ, NS,
      $                             ND, ALPHA, BETA, QC, LDQC, ZC, LDZC,
      $                             WORK, LWORK, RWORK, REC, INFO )
@@ -257,7 +257,7 @@ RECURSIVE SUBROUTINE CLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
       COMPLEX :: S, S1, TEMP
 
 *     External Functions
-      EXTERNAL :: XERBLA, CLAQZ0, CLAQZ1, SLABAD, CLACPY, CLASET, CGEMM,
+      EXTERNAL :: XERBLA, CLAQZ0, CLAQZ1, CLACPY, CLASET, CGEMM,
      $            CTGEXC, CLARTG, CROT
       REAL, EXTERNAL :: SLAMCH
 
@@ -282,7 +282,7 @@ RECURSIVE SUBROUTINE CLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
       LWORKREQ = MAX( LWORKREQ, N*NW, 2*NW**2+N )
       IF ( LWORK .EQ.-1 ) THEN
 *        workspace query, quick return
-         WORK( 1 ) = LWORKREQ
+         WORK( 1 ) = CMPLX( LWORKREQ )
          RETURN
       ELSE IF ( LWORK .LT. LWORKREQ ) THEN
          INFO = -26
@@ -296,7 +296,6 @@ RECURSIVE SUBROUTINE CLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
 *     Get machine constants
       SAFMIN = SLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE/SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULP = SLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( REAL( N )/ULP )
 
@@ -319,7 +318,8 @@ RECURSIVE SUBROUTINE CLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
 
 *     Store window in case of convergence failure
       CALL CLACPY( 'ALL', JW, JW, A( KWTOP, KWTOP ), LDA, WORK, JW )
-      CALL CLACPY( 'ALL', JW, JW, B( KWTOP, KWTOP ), LDB, WORK( JW**2+
+      CALL CLACPY( 'ALL', JW, JW, B( KWTOP, KWTOP ), LDB,
+     $             WORK( JW**2+
      $             1 ), JW )
 
 *     Transform window to real schur form
@@ -334,7 +334,8 @@ RECURSIVE SUBROUTINE CLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
 *        Convergence failure, restore the window and exit
          ND = 0
          NS = JW-QZ_SMALL_INFO
-         CALL CLACPY( 'ALL', JW, JW, WORK, JW, A( KWTOP, KWTOP ), LDA )
+         CALL CLACPY( 'ALL', JW, JW, WORK, JW, A( KWTOP, KWTOP ),
+     $                LDA )
          CALL CLACPY( 'ALL', JW, JW, WORK( JW**2+1 ), JW, B( KWTOP,
      $                KWTOP ), LDB )
          RETURN
@@ -391,11 +392,14 @@ RECURSIVE SUBROUTINE CLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
             A( K, KWTOP-1 ) = TEMP
             A( K+1, KWTOP-1 ) = CZERO
             K2 = MAX( KWTOP, K-1 )
-            CALL CROT( IHI-K2+1, A( K, K2 ), LDA, A( K+1, K2 ), LDA, C1,
+            CALL CROT( IHI-K2+1, A( K, K2 ), LDA, A( K+1, K2 ), LDA,
+     $                 C1,
      $                 S1 )
-            CALL CROT( IHI-( K-1 )+1, B( K, K-1 ), LDB, B( K+1, K-1 ),
+            CALL CROT( IHI-( K-1 )+1, B( K, K-1 ), LDB, B( K+1,
+     $                 K-1 ),
      $                 LDB, C1, S1 )
-            CALL CROT( JW, QC( 1, K-KWTOP+1 ), 1, QC( 1, K+1-KWTOP+1 ),
+            CALL CROT( JW, QC( 1, K-KWTOP+1 ), 1, QC( 1,
+     $                 K+1-KWTOP+1 ),
      $                 1, C1, CONJG( S1 ) )
          END DO
 
@@ -437,25 +441,29 @@ RECURSIVE SUBROUTINE CLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
      $                IHI+1 ), LDB )
       END IF
       IF ( ILQ ) THEN
-         CALL CGEMM( 'N', 'N', N, JW, JW, CONE, Q( 1, KWTOP ), LDQ, QC,
+         CALL CGEMM( 'N', 'N', N, JW, JW, CONE, Q( 1, KWTOP ), LDQ,
+     $               QC,
      $               LDQC, CZERO, WORK, N )
          CALL CLACPY( 'ALL', N, JW, WORK, N, Q( 1, KWTOP ), LDQ )
       END IF
 
       IF ( KWTOP-1-ISTARTM+1 > 0 ) THEN
-         CALL CGEMM( 'N', 'N', KWTOP-ISTARTM, JW, JW, CONE, A( ISTARTM,
+         CALL CGEMM( 'N', 'N', KWTOP-ISTARTM, JW, JW, CONE,
+     $               A( ISTARTM,
      $               KWTOP ), LDA, ZC, LDZC, CZERO, WORK,
      $               KWTOP-ISTARTM )
         CALL CLACPY( 'ALL', KWTOP-ISTARTM, JW, WORK, KWTOP-ISTARTM,
      $               A( ISTARTM, KWTOP ), LDA )
-         CALL CGEMM( 'N', 'N', KWTOP-ISTARTM, JW, JW, CONE, B( ISTARTM,
+         CALL CGEMM( 'N', 'N', KWTOP-ISTARTM, JW, JW, CONE,
+     $               B( ISTARTM,
      $               KWTOP ), LDB, ZC, LDZC, CZERO, WORK,
      $               KWTOP-ISTARTM )
         CALL CLACPY( 'ALL', KWTOP-ISTARTM, JW, WORK, KWTOP-ISTARTM,
      $               B( ISTARTM, KWTOP ), LDB )
       END IF
       IF ( ILZ ) THEN
-         CALL CGEMM( 'N', 'N', N, JW, JW, CONE, Z( 1, KWTOP ), LDZ, ZC,
+         CALL CGEMM( 'N', 'N', N, JW, JW, CONE, Z( 1, KWTOP ), LDZ,
+     $               ZC,
      $               LDZC, CZERO, WORK, N )
          CALL CLACPY( 'ALL', N, JW, WORK, N, Z( 1, KWTOP ), LDZ )
       END IF
diff --git a/SRC/claqz3.f b/SRC/claqz3.f
index fecba656d2..bbd0265eef 100644
--- a/SRC/claqz3.f
+++ b/SRC/claqz3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAQZ3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/CLAQZ3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/CLAQZ3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -197,7 +195,7 @@
 *
 *> \date May 2020
 *
-*> \ingroup complexGEcomputational
+*> \ingroup laqz3
 *>
 *  =====================================================================
       SUBROUTINE CLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
@@ -230,8 +228,8 @@ SUBROUTINE CLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       COMPLEX :: TEMP, TEMP2, TEMP3, S
 
 *     External Functions
-      EXTERNAL :: XERBLA, SLABAD, CLASET, CLARTG, CROT, CLAQZ1, CGEMM,
-     $            CLACPY
+      EXTERNAL :: XERBLA, CLASET, CLARTG, CROT,
+     $            CLAQZ1, CGEMM, CLACPY
       REAL, EXTERNAL :: SLAMCH
 
       INFO = 0
@@ -240,7 +238,7 @@ SUBROUTINE CLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       END IF
       IF ( LWORK .EQ.-1 ) THEN
 *        workspace query, quick return
-         WORK( 1 ) = N*NBLOCK_DESIRED
+         WORK( 1 ) = CMPLX( N*NBLOCK_DESIRED )
          RETURN
       ELSE IF ( LWORK .LT. N*NBLOCK_DESIRED ) THEN
          INFO = -25
@@ -258,7 +256,6 @@ SUBROUTINE CLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
 *     Get machine constants
       SAFMIN = SLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE/SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
 
       IF ( ILO .GE. IHI ) THEN
          RETURN
@@ -302,11 +299,12 @@ SUBROUTINE CLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
          END IF
 
          CALL CLARTG( TEMP2, TEMP3, C, S, TEMP )
-         CALL CROT( NS, A( ILO, ILO ), LDA, A( ILO+1, ILO ), LDA, C,
-     $              S )
-         CALL CROT( NS, B( ILO, ILO ), LDB, B( ILO+1, ILO ), LDB, C,
-     $              S )
-         CALL CROT( NS+1, QC( 1, 1 ), 1, QC( 1, 2 ), 1, C, CONJG( S ) )
+         CALL CROT( NS, A( ILO, ILO ), LDA, A( ILO+1, ILO ), LDA,
+     $              C, S )
+         CALL CROT( NS, B( ILO, ILO ), LDB, B( ILO+1, ILO ), LDB,
+     $              C, S )
+         CALL CROT( NS+1, QC( 1, 1 ), 1, QC( 1, 2 ), 1, C,
+     $              CONJG( S ) )
         
 *        Chase the shift down
          DO J = 1, NS-I
@@ -326,11 +324,13 @@ SUBROUTINE CLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       SHEIGHT = NS+1
       SWIDTH = ISTOPM-( ILO+NS )+1
       IF ( SWIDTH > 0 ) THEN
-         CALL CGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC, LDQC,
+         CALL CGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC,
+     $               LDQC,
      $               A( ILO, ILO+NS ), LDA, CZERO, WORK, SHEIGHT )
          CALL CLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, A( ILO,
      $                ILO+NS ), LDA )
-         CALL CGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC, LDQC,
+         CALL CGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC,
+     $               LDQC,
      $               B( ILO, ILO+NS ), LDB, CZERO, WORK, SHEIGHT )
          CALL CLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, B( ILO,
      $                ILO+NS ), LDB )
@@ -349,12 +349,14 @@ SUBROUTINE CLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
          CALL CGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, CONE,
      $               A( ISTARTM, ILO ), LDA, ZC, LDZC, CZERO, WORK,
      $               SHEIGHT )
-         CALL CLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, A( ISTARTM,
+         CALL CLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                A( ISTARTM,
      $                ILO ), LDA )
          CALL CGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, CONE,
      $               B( ISTARTM, ILO ), LDB, ZC, LDZC, CZERO, WORK,
      $               SHEIGHT )
-         CALL CLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, B( ISTARTM,
+         CALL CLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                B( ISTARTM,
      $                ILO ), LDB )
       END IF
       IF ( ILZ ) THEN
@@ -386,7 +388,8 @@ SUBROUTINE CLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
 *              Move down the block with index k+i+j, updating
 *              the (ns+np x ns+np) block:
 *              (k:k+ns+np,k:k+ns+np-1)
-               CALL CLAQZ1( .TRUE., .TRUE., K+I+J, ISTARTB, ISTOPB, IHI,
+               CALL CLAQZ1( .TRUE., .TRUE., K+I+J, ISTARTB, ISTOPB,
+     $                      IHI,
      $                      A, LDA, B, LDB, NBLOCK, K+1, QC, LDQC,
      $                      NBLOCK, K, ZC, LDZC )
             END DO
@@ -403,18 +406,22 @@ SUBROUTINE CLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
             CALL CGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC,
      $                  LDQC, A( K+1, K+NS+NP ), LDA, CZERO, WORK,
      $                  SHEIGHT )
-            CALL CLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, A( K+1,
+            CALL CLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                   A( K+1,
      $                   K+NS+NP ), LDA )
             CALL CGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC,
      $                  LDQC, B( K+1, K+NS+NP ), LDB, CZERO, WORK,
      $                  SHEIGHT )
-            CALL CLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, B( K+1,
+            CALL CLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                   B( K+1,
      $                   K+NS+NP ), LDB )
          END IF
          IF ( ILQ ) THEN
-            CALL CGEMM( 'N', 'N', N, NBLOCK, NBLOCK, CONE, Q( 1, K+1 ),
+            CALL CGEMM( 'N', 'N', N, NBLOCK, NBLOCK, CONE, Q( 1,
+     $                  K+1 ),
      $                  LDQ, QC, LDQC, CZERO, WORK, N )
-            CALL CLACPY( 'ALL', N, NBLOCK, WORK, N, Q( 1, K+1 ), LDQ )
+            CALL CLACPY( 'ALL', N, NBLOCK, WORK, N, Q( 1, K+1 ),
+     $                   LDQ )
          END IF
 
 *        Update A(istartm:k,k:k+ns+npos-1) and B(istartm:k,k:k+ns+npos-1)
@@ -457,7 +464,8 @@ SUBROUTINE CLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       DO I = 1, NS
 *        Chase the shift down to the bottom right corner
          DO ISHIFT = IHI-I, IHI-1
-            CALL CLAQZ1( .TRUE., .TRUE., ISHIFT, ISTARTB, ISTOPB, IHI,
+            CALL CLAQZ1( .TRUE., .TRUE., ISHIFT, ISTARTB, ISTOPB,
+     $                   IHI,
      $                   A, LDA, B, LDB, NS, IHI-NS+1, QC, LDQC, NS+1,
      $                   IHI-NS, ZC, LDZC )
          END DO
@@ -471,17 +479,20 @@ SUBROUTINE CLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       SHEIGHT = NS
       SWIDTH = ISTOPM-( IHI+1 )+1
       IF ( SWIDTH > 0 ) THEN
-         CALL CGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC, LDQC,
+         CALL CGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC,
+     $               LDQC,
      $               A( IHI-NS+1, IHI+1 ), LDA, CZERO, WORK, SHEIGHT )
          CALL CLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
      $                A( IHI-NS+1, IHI+1 ), LDA )
-         CALL CGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC, LDQC,
+         CALL CGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC,
+     $               LDQC,
      $               B( IHI-NS+1, IHI+1 ), LDB, CZERO, WORK, SHEIGHT )
          CALL CLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
      $                B( IHI-NS+1, IHI+1 ), LDB )
       END IF
       IF ( ILQ ) THEN
-         CALL CGEMM( 'N', 'N', N, NS, NS, CONE, Q( 1, IHI-NS+1 ), LDQ,
+         CALL CGEMM( 'N', 'N', N, NS, NS, CONE, Q( 1, IHI-NS+1 ),
+     $               LDQ,
      $               QC, LDQC, CZERO, WORK, N )
          CALL CLACPY( 'ALL', N, NS, WORK, N, Q( 1, IHI-NS+1 ), LDQ )
       END IF
@@ -494,16 +505,19 @@ SUBROUTINE CLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
          CALL CGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, CONE,
      $               A( ISTARTM, IHI-NS ), LDA, ZC, LDZC, CZERO, WORK,
      $               SHEIGHT )
-         CALL CLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, A( ISTARTM,
+         CALL CLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                A( ISTARTM,
      $                IHI-NS ), LDA )
          CALL CGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, CONE,
      $               B( ISTARTM, IHI-NS ), LDB, ZC, LDZC, CZERO, WORK,
      $               SHEIGHT )
-         CALL CLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, B( ISTARTM,
+         CALL CLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                B( ISTARTM,
      $                IHI-NS ), LDB )
       END IF
       IF ( ILZ ) THEN
-         CALL CGEMM( 'N', 'N', N, NS+1, NS+1, CONE, Z( 1, IHI-NS ), LDZ,
+         CALL CGEMM( 'N', 'N', N, NS+1, NS+1, CONE, Z( 1, IHI-NS ),
+     $               LDZ,
      $               ZC, LDZC, CZERO, WORK, N )
          CALL CLACPY( 'ALL', N, NS+1, WORK, N, Z( 1, IHI-NS ), LDZ )
       END IF
diff --git a/SRC/clar1v.f b/SRC/clar1v.f
index f8d6531c3e..2098c9bc36 100644
--- a/SRC/clar1v.f
+++ b/SRC/clar1v.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAR1V + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clar1v.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clar1v.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -212,7 +210,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lar1v
 *
 *> \par Contributors:
 *  ==================
@@ -227,6 +225,7 @@
       SUBROUTINE CLAR1V( N, B1, BN, LAMBDA, D, L, LD, LLD,
      $           PIVMIN, GAPTOL, Z, WANTNC, NEGCNT, ZTZ, MINGMA,
      $           R, ISUPPZ, NRMINV, RESID, RQCORR, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clar2v.f b/SRC/clar2v.f
index e293a7cab1..7254d6d33f 100644
--- a/SRC/clar2v.f
+++ b/SRC/clar2v.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAR2V + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clar2v.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clar2v.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -104,10 +102,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lar2v
 *
 *  =====================================================================
       SUBROUTINE CLAR2V( N, X, Y, Z, INCX, C, S, INCC )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clarcm.f b/SRC/clarcm.f
index 4ad9563918..9f163df701 100644
--- a/SRC/clarcm.f
+++ b/SRC/clarcm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLARCM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarcm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarcm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup larcm
 *
 *  =====================================================================
       SUBROUTINE CLARCM( M, N, A, LDA, B, LDB, C, LDC, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clarf.f b/SRC/clarf.f
index b76841f59c..07b19f55dd 100644
--- a/SRC/clarf.f
+++ b/SRC/clarf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLARF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup larf
 *
 *  =====================================================================
       SUBROUTINE CLARF( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -204,7 +203,8 @@ SUBROUTINE CLARF( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
 *
 *           C(1:lastv,1:lastc) := C(...) - v(1:lastv,1) * w(1:lastc,1)**H
 *
-            CALL CGERC( LASTV, LASTC, -TAU, V, INCV, WORK, 1, C, LDC )
+            CALL CGERC( LASTV, LASTC, -TAU, V, INCV, WORK, 1, C,
+     $                  LDC )
          END IF
       ELSE
 *
@@ -219,7 +219,8 @@ SUBROUTINE CLARF( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
 *
 *           C(1:lastc,1:lastv) := C(...) - w(1:lastc,1) * v(1:lastv,1)**H
 *
-            CALL CGERC( LASTC, LASTV, -TAU, WORK, 1, V, INCV, C, LDC )
+            CALL CGERC( LASTC, LASTV, -TAU, WORK, 1, V, INCV, C,
+     $                  LDC )
          END IF
       END IF
       RETURN
diff --git a/SRC/clarf1f.f b/SRC/clarf1f.f
new file mode 100644
index 0000000000..cb9fc47ee1
--- /dev/null
+++ b/SRC/clarf1f.f
@@ -0,0 +1,266 @@
+*> \brief \b CLARF1F applies an elementary reflector to a general rectangular
+*              matrix assuming v(1) = 1.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download CLARF1F + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarf1f.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/clarf1f.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarf1f.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE CLARF1F( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          SIDE
+*       INTEGER            INCV, LDC, M, N
+*       COMPLEX            TAU
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX            C( LDC, * ), V( * ), WORK( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> CLARF1F applies a complex elementary reflector H to a complex m by n matrix
+*> C, from either the left or the right. H is represented in the form
+*>
+*>       H = I - tau * v * v**H
+*>
+*> where tau is a complex scalar and v is a complex vector assuming v(1) = 1.
+*>
+*> If tau = 0, then H is taken to be the unit matrix.
+*>
+*> To apply H**H (the conjugate transpose of H), supply conjg(tau) instead
+*> tau.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'L': form  H * C
+*>          = 'R': form  C * H
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is COMPLEX array, dimension
+*>                     (1 + (M-1)*abs(INCV)) if SIDE = 'L'
+*>                  or (1 + (N-1)*abs(INCV)) if SIDE = 'R'
+*>          The vector v in the representation of H. V is not used if
+*>          TAU = 0.
+*> \endverbatim
+*>
+*> \param[in] INCV
+*> \verbatim
+*>          INCV is INTEGER
+*>          The increment between elements of v. INCV <> 0.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX
+*>          The value tau in the representation of H.
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is COMPLEX array, dimension (LDC,N)
+*>          On entry, the m by n matrix C.
+*>          On exit, C is overwritten by the matrix H * C if SIDE = 'L',
+*>          or C * H if SIDE = 'R'.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX array, dimension
+*>                         (N) if SIDE = 'L'
+*>                      or (M) if SIDE = 'R'
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup larf1f
+*
+*  =====================================================================
+      SUBROUTINE CLARF1F( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          SIDE
+      INTEGER            INCV, LDC, M, N
+      COMPLEX            TAU
+*     ..
+*     .. Array Arguments ..
+      COMPLEX            C( LDC, * ), V( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      COMPLEX            ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0E+0, 0.0E+0 ),
+     $                   ZERO = ( 0.0E+0, 0.0E+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            APPLYLEFT
+      INTEGER            I, LASTV, LASTC
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           CAXPY, CGEMV, CGER, CSCAL
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          CONJG
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILACLR, ILACLC
+      EXTERNAL           LSAME, ILACLR, ILACLC
+*     ..
+*     .. Executable Statements ..
+*
+      APPLYLEFT = LSAME( SIDE, 'L' )
+      LASTV = 1
+      LASTC = 0
+      IF( TAU.NE.ZERO ) THEN
+!     Set up variables for scanning V.  LASTV begins pointing to the end
+!     of V up to V(1).
+         IF( APPLYLEFT ) THEN
+            LASTV = M
+         ELSE
+            LASTV = N
+         END IF
+         IF( INCV.GT.0 ) THEN
+            I = 1 + (LASTV-1) * INCV
+         ELSE
+            I = 1
+         END IF
+!     Look for the last non-zero row in V.
+         DO WHILE( LASTV.GT.1 .AND. V( I ).EQ.ZERO )
+            LASTV = LASTV - 1
+            I = I - INCV
+         END DO
+         IF( APPLYLEFT ) THEN
+!     Scan for the last non-zero column in C(1:lastv,:).
+            LASTC = ILACLC(LASTV, N, C, LDC)
+         ELSE
+!     Scan for the last non-zero row in C(:,1:lastv).
+            LASTC = ILACLR(M, LASTV, C, LDC)
+         END IF
+      END IF
+      IF( LASTC.EQ.0 ) THEN
+         RETURN
+      END IF
+      IF( APPLYLEFT ) THEN
+*
+*        Form  H * C
+*
+         IF( LASTV.EQ.1 ) THEN
+*
+*           C(1,1:lastc) := ( 1 - tau ) * C(1,1:lastc)
+*
+            CALL CSCAL( LASTC, ONE - TAU, C, LDC )
+         ELSE
+*
+*        w(1:lastc,1) := C(2:lastv,1:lastc)**H * v(2:lastv,1)
+*
+         CALL CGEMV( 'Conjugate transpose', LASTV - 1, LASTC, ONE,
+     $               C( 2, 1 ), LDC, V( 1 + INCV ), INCV, ZERO,
+     $               WORK, 1 )
+*
+*        w(1:lastc,1) += v(1,1) * C(1,1:lastc)**H
+*
+         DO I = 1, LASTC
+            WORK( I ) = WORK( I ) + CONJG( C( 1, I ) )
+         END DO
+*
+*        C(1, 1:lastc) += - tau * v(1,1) * w(1:lastc,1)**H
+*
+         DO I = 1, LASTC
+            C( 1, I ) = C( 1, I ) - TAU * CONJG( WORK( I ) )
+         END DO
+*
+*        C(2:lastv,1:lastc) += - tau * v(2:lastv,1) * w(1:lastc,1)**H
+*
+         CALL CGERC( LASTV - 1, LASTC, -TAU, V( 1 + INCV ), INCV,
+     $               WORK, 1, C( 2, 1 ), LDC )
+            END IF
+      ELSE
+*
+*        Form  C * H
+*
+         IF( LASTV.EQ.1 ) THEN
+*
+*           C(1:lastc,1) := ( 1 - tau ) * C(1:lastc,1)
+*
+            CALL CSCAL( LASTC, ONE - TAU, C, 1 )
+         ELSE
+*
+*           w(1:lastc,1) := C(1:lastc,2:lastv) * v(2:lastv,1)
+*
+            CALL CGEMV( 'No transpose', LASTC, LASTV - 1, ONE,
+     $                  C( 1, 2 ), LDC, V( 1 + INCV ), INCV, ZERO,
+     $                  WORK, 1 )
+*
+*           w(1:lastc,1) += v(1,1) * C(1:lastc,1)
+*
+            CALL CAXPY( LASTC, ONE, C, 1, WORK, 1 )
+*
+*           C(1:lastc,1) += - tau * v(1,1) * w(1:lastc,1)
+*
+            CALL CAXPY( LASTC, -TAU, WORK, 1, C, 1 )
+*
+*           C(1:lastc,2:lastv) += - tau * w(1:lastc,1) * v(2:lastv)**H
+*
+            CALL CGERC( LASTC, LASTV - 1, -TAU, WORK, 1,
+     $                  V( 1 + INCV ), INCV, C( 1, 2 ), LDC )
+         END IF
+      END IF
+      RETURN
+*
+*     End of CLARF1F
+*
+      END
diff --git a/SRC/clarf1l.f b/SRC/clarf1l.f
new file mode 100644
index 0000000000..a592255f16
--- /dev/null
+++ b/SRC/clarf1l.f
@@ -0,0 +1,264 @@
+*> \brief \b CLARF1L applies an elementary reflector to a general rectangular
+*              matrix assuming v(lastv) = 1, where lastv is the last non-zero
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download CLARF1L + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarf1l.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/clarf1l.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarf1l.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE CLARF1L( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          SIDE
+*       INTEGER            INCV, LDC, M, N
+*       COMPLEX            TAU
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX            C( LDC, * ), V( * ), WORK( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> CLARF1L applies a complex elementary reflector H to a complex m by n matrix
+*> C, from either the left or the right. H is represented in the form
+*>
+*>       H = I - tau * v * v**H
+*>
+*> where tau is a real scalar and v is a real vector assuming v(lastv) = 1,
+*> where lastv is the last non-zero element.
+*>
+*> If tau = 0, then H is taken to be the unit matrix.
+*>
+*> To apply H**H (the conjugate transpose of H), supply conjg(tau) instead
+*> tau.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'L': form  H * C
+*>          = 'R': form  C * H
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is COMPLEX array, dimension
+*>                     (1 + (M-1)*abs(INCV)) if SIDE = 'L'
+*>                  or (1 + (N-1)*abs(INCV)) if SIDE = 'R'
+*>          The vector v in the representation of H. V is not used if
+*>          TAU = 0.
+*> \endverbatim
+*>
+*> \param[in] INCV
+*> \verbatim
+*>          INCV is INTEGER
+*>          The increment between elements of v. INCV > 0.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX
+*>          The value tau in the representation of H.
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is COMPLEX array, dimension (LDC,N)
+*>          On entry, the m by n matrix C.
+*>          On exit, C is overwritten by the matrix H * C if SIDE = 'L',
+*>          or C * H if SIDE = 'R'.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX array, dimension
+*>                         (N) if SIDE = 'L'
+*>                      or (M) if SIDE = 'R'
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup larf1f
+*
+*  =====================================================================
+      SUBROUTINE CLARF1L( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          SIDE
+      INTEGER            INCV, LDC, M, N
+      COMPLEX            TAU
+*     ..
+*     .. Array Arguments ..
+      COMPLEX            C( LDC, * ), V( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      COMPLEX            ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0E+0, 0.0E+0 ),
+     $                   ZERO = ( 0.0E+0, 0.0E+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            APPLYLEFT
+      INTEGER            I, J, LASTV, LASTC, FIRSTV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           CAXPY, CGEMV, CGERC, CSCAL
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          CONJG
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILACLR, ILACLC
+      EXTERNAL           LSAME, ILACLR, ILACLC
+*     ..
+*     .. Executable Statements ..
+*
+      APPLYLEFT = LSAME( SIDE, 'L' )
+      FIRSTV = 1
+      LASTC = 0
+      IF( TAU.NE.ZERO ) THEN
+!     Set up variables for scanning V.  LASTV begins pointing to the end
+!     of V up to V(1).
+         IF( APPLYLEFT ) THEN
+            LASTV = M
+         ELSE
+            LASTV = N
+         END IF
+         I = 1
+!     Look for the last non-zero row in V.
+         DO WHILE( LASTV.GT.FIRSTV .AND. V( I ).EQ.ZERO )
+            FIRSTV = FIRSTV + 1
+            I = I + INCV
+         END DO
+         IF( APPLYLEFT ) THEN
+!     Scan for the last non-zero column in C(1:lastv,:).
+            LASTC = ILACLC(LASTV, N, C, LDC)
+         ELSE
+!     Scan for the last non-zero row in C(:,1:lastv).
+            LASTC = ILACLR(M, LASTV, C, LDC)
+         END IF
+      END IF
+      IF( LASTC.EQ.0 ) THEN
+         RETURN
+      END IF
+      IF( APPLYLEFT ) THEN
+*
+*        Form  H * C
+*
+         IF( LASTV.EQ.FIRSTV ) THEN        
+*
+*           C(lastv,1:lastc) := ( 1 - tau ) * C(lastv,1:lastc)
+*
+            CALL CSCAL( LASTC, ONE - TAU, C( LASTV, 1 ), LDC )
+         ELSE
+*
+*           w(1:lastc,1) := C(firstv:lastv-1,1:lastc)**T * v(firstv:lastv-1,1)
+*
+            CALL CGEMV( 'Conjugate transpose', LASTV - FIRSTV, LASTC,
+     $                  ONE, C( FIRSTV, 1 ), LDC, V( I ), INCV, ZERO,
+     $                  WORK, 1 )
+*
+*           w(1:lastc,1) += C(lastv,1:lastc)**H * v(lastv,1)
+*
+            DO J = 1, LASTC
+               WORK( J ) = WORK( J ) + CONJG( C( LASTV, J ) )
+            END DO
+*
+*           C(lastv,1:lastc) += - tau * v(lastv,1) * w(1:lastc,1)**H
+*
+            DO J = 1, LASTC
+               C( LASTV, J ) = C( LASTV, J )
+     $                         - TAU * CONJG( WORK( J ) )
+            END DO
+*
+*           C(firstv:lastv-1,1:lastc) += - tau * v(firstv:lastv-1,1) * w(1:lastc,1)**H
+*
+            CALL CGERC( LASTV - FIRSTV, LASTC, -TAU, V( I ), INCV,
+     $                  WORK, 1, C( FIRSTV, 1 ), LDC)
+         END IF
+      ELSE
+*
+*        Form  C * H
+*
+         IF( LASTV.EQ.FIRSTV ) THEN
+*
+*           C(1:lastc,lastv) := ( 1 - tau ) * C(1:lastc,lastv)
+*
+            CALL CSCAL( LASTC, ONE - TAU, C( 1, LASTV ), 1 )
+         ELSE
+*
+*           w(1:lastc,1) := C(1:lastc,firstv:lastv-1) * v(firstv:lastv-1,1)
+*
+            CALL CGEMV( 'No transpose', LASTC, LASTV - FIRSTV, ONE,
+     $                  C( 1, FIRSTV ), LDC, V( I ), INCV, ZERO,
+     $                  WORK, 1 )
+*
+*           w(1:lastc,1) += C(1:lastc,lastv) * v(lastv,1)
+*
+            CALL CAXPY( LASTC, ONE, C( 1, LASTV ), 1, WORK, 1 )
+*
+*           C(1:lastc,lastv) += - tau * v(lastv,1) * w(1:lastc,1)
+*
+            CALL CAXPY( LASTC, -TAU, WORK, 1, C( 1, LASTV ), 1 )
+*
+*           C(1:lastc,firstv:lastv-1) += - tau * w(1:lastc,1) * v(firstv:lastv-1)**H
+*
+            CALL CGERC( LASTC, LASTV - FIRSTV, -TAU, WORK, 1, V( I ),
+     $                  INCV, C( 1, FIRSTV ), LDC )
+         END IF
+      END IF
+      RETURN
+*
+*     End of CLARF1L
+*
+      END
diff --git a/SRC/clarfb.f b/SRC/clarfb.f
index 3dcadb1879..6a94ee3335 100644
--- a/SRC/clarfb.f
+++ b/SRC/clarfb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLARFB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarfb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarfb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -161,7 +159,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup larfb
 *
 *> \par Further Details:
 *  =====================
@@ -170,9 +168,8 @@
 *>
 *>  The shape of the matrix V and the storage of the vectors which define
 *>  the H(i) is best illustrated by the following example with n = 5 and
-*>  k = 3. The elements equal to 1 are not stored; the corresponding
-*>  array elements are modified but restored on exit. The rest of the
-*>  array is not used.
+*>  k = 3. The triangular part of V (including its diagonal) is not
+*>  referenced.
 *>
 *>  DIRECT = 'F' and STOREV = 'C':         DIRECT = 'F' and STOREV = 'R':
 *>
@@ -192,8 +189,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
+      SUBROUTINE CLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V,
+     $                   LDV,
      $                   T, LDT, C, LDC, WORK, LDWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -265,20 +264,23 @@ SUBROUTINE CLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1
 *
-               CALL CTRMM( 'Right', 'Lower', 'No transpose', 'Unit', N,
+               CALL CTRMM( 'Right', 'Lower', 'No transpose', 'Unit',
+     $                     N,
      $                     K, ONE, V, LDV, WORK, LDWORK )
                IF( M.GT.K ) THEN
 *
 *                 W := W + C2**H *V2
 *
-                  CALL CGEMM( 'Conjugate transpose', 'No transpose', N,
+                  CALL CGEMM( 'Conjugate transpose', 'No transpose',
+     $                        N,
      $                        K, M-K, ONE, C( K+1, 1 ), LDC,
      $                        V( K+1, 1 ), LDV, ONE, WORK, LDWORK )
                END IF
 *
 *              W := W * T**H  or  W * T
 *
-               CALL CTRMM( 'Right', 'Upper', TRANST, 'Non-unit', N, K,
+               CALL CTRMM( 'Right', 'Upper', TRANST, 'Non-unit', N,
+     $                     K,
      $                     ONE, T, LDT, WORK, LDWORK )
 *
 *              C := C - V * W**H
@@ -319,13 +321,15 @@ SUBROUTINE CLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1
 *
-               CALL CTRMM( 'Right', 'Lower', 'No transpose', 'Unit', M,
+               CALL CTRMM( 'Right', 'Lower', 'No transpose', 'Unit',
+     $                     M,
      $                     K, ONE, V, LDV, WORK, LDWORK )
                IF( N.GT.K ) THEN
 *
 *                 W := W + C2 * V2
 *
-                  CALL CGEMM( 'No transpose', 'No transpose', M, K, N-K,
+                  CALL CGEMM( 'No transpose', 'No transpose', M, K,
+     $                        N-K,
      $                        ONE, C( 1, K+1 ), LDC, V( K+1, 1 ), LDV,
      $                        ONE, WORK, LDWORK )
                END IF
@@ -341,7 +345,8 @@ SUBROUTINE CLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 C2 := C2 - W * V2**H
 *
-                  CALL CGEMM( 'No transpose', 'Conjugate transpose', M,
+                  CALL CGEMM( 'No transpose', 'Conjugate transpose',
+     $                        M,
      $                        N-K, K, -ONE, WORK, LDWORK, V( K+1, 1 ),
      $                        LDV, ONE, C( 1, K+1 ), LDC )
                END IF
@@ -376,26 +381,30 @@ SUBROUTINE CLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *              W := C2**H
 *
                DO 70 J = 1, K
-                  CALL CCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ), 1 )
+                  CALL CCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ),
+     $                        1 )
                   CALL CLACGV( N, WORK( 1, J ), 1 )
    70          CONTINUE
 *
 *              W := W * V2
 *
-               CALL CTRMM( 'Right', 'Upper', 'No transpose', 'Unit', N,
+               CALL CTRMM( 'Right', 'Upper', 'No transpose', 'Unit',
+     $                     N,
      $                     K, ONE, V( M-K+1, 1 ), LDV, WORK, LDWORK )
                IF( M.GT.K ) THEN
 *
 *                 W := W + C1**H * V1
 *
-                  CALL CGEMM( 'Conjugate transpose', 'No transpose', N,
+                  CALL CGEMM( 'Conjugate transpose', 'No transpose',
+     $                        N,
      $                        K, M-K, ONE, C, LDC, V, LDV, ONE, WORK,
      $                        LDWORK )
                END IF
 *
 *              W := W * T**H  or  W * T
 *
-               CALL CTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K,
+               CALL CTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N,
+     $                     K,
      $                     ONE, T, LDT, WORK, LDWORK )
 *
 *              C := C - V * W**H
@@ -438,13 +447,15 @@ SUBROUTINE CLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V2
 *
-               CALL CTRMM( 'Right', 'Upper', 'No transpose', 'Unit', M,
+               CALL CTRMM( 'Right', 'Upper', 'No transpose', 'Unit',
+     $                     M,
      $                     K, ONE, V( N-K+1, 1 ), LDV, WORK, LDWORK )
                IF( N.GT.K ) THEN
 *
 *                 W := W + C1 * V1
 *
-                  CALL CGEMM( 'No transpose', 'No transpose', M, K, N-K,
+                  CALL CGEMM( 'No transpose', 'No transpose', M, K,
+     $                        N-K,
      $                        ONE, C, LDC, V, LDV, ONE, WORK, LDWORK )
                END IF
 *
@@ -459,7 +470,8 @@ SUBROUTINE CLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 C1 := C1 - W * V1**H
 *
-                  CALL CGEMM( 'No transpose', 'Conjugate transpose', M,
+                  CALL CGEMM( 'No transpose', 'Conjugate transpose',
+     $                        M,
      $                        N-K, K, -ONE, WORK, LDWORK, V, LDV, ONE,
      $                        C, LDC )
                END IF
@@ -517,7 +529,8 @@ SUBROUTINE CLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * T**H  or  W * T
 *
-               CALL CTRMM( 'Right', 'Upper', TRANST, 'Non-unit', N, K,
+               CALL CTRMM( 'Right', 'Upper', TRANST, 'Non-unit', N,
+     $                     K,
      $                     ONE, T, LDT, WORK, LDWORK )
 *
 *              C := C - V**H * W**H
@@ -534,7 +547,8 @@ SUBROUTINE CLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1
 *
-               CALL CTRMM( 'Right', 'Upper', 'No transpose', 'Unit', N,
+               CALL CTRMM( 'Right', 'Upper', 'No transpose', 'Unit',
+     $                     N,
      $                     K, ONE, V, LDV, WORK, LDWORK )
 *
 *              C1 := C1 - W**H
@@ -565,7 +579,8 @@ SUBROUTINE CLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 W := W + C2 * V2**H
 *
-                  CALL CGEMM( 'No transpose', 'Conjugate transpose', M,
+                  CALL CGEMM( 'No transpose', 'Conjugate transpose',
+     $                        M,
      $                        K, N-K, ONE, C( 1, K+1 ), LDC,
      $                        V( 1, K+1 ), LDV, ONE, WORK, LDWORK )
                END IF
@@ -581,14 +596,16 @@ SUBROUTINE CLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 C2 := C2 - W * V2
 *
-                  CALL CGEMM( 'No transpose', 'No transpose', M, N-K, K,
+                  CALL CGEMM( 'No transpose', 'No transpose', M, N-K,
+     $                        K,
      $                        -ONE, WORK, LDWORK, V( 1, K+1 ), LDV, ONE,
      $                        C( 1, K+1 ), LDC )
                END IF
 *
 *              W := W * V1
 *
-               CALL CTRMM( 'Right', 'Upper', 'No transpose', 'Unit', M,
+               CALL CTRMM( 'Right', 'Upper', 'No transpose', 'Unit',
+     $                     M,
      $                     K, ONE, V, LDV, WORK, LDWORK )
 *
 *              C1 := C1 - W
@@ -616,7 +633,8 @@ SUBROUTINE CLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *              W := C2**H
 *
                DO 190 J = 1, K
-                  CALL CCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ), 1 )
+                  CALL CCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ),
+     $                        1 )
                   CALL CLACGV( N, WORK( 1, J ), 1 )
   190          CONTINUE
 *
@@ -636,7 +654,8 @@ SUBROUTINE CLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * T**H  or  W * T
 *
-               CALL CTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K,
+               CALL CTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N,
+     $                     K,
      $                     ONE, T, LDT, WORK, LDWORK )
 *
 *              C := C - V**H * W**H
@@ -652,7 +671,8 @@ SUBROUTINE CLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V2
 *
-               CALL CTRMM( 'Right', 'Lower', 'No transpose', 'Unit', N,
+               CALL CTRMM( 'Right', 'Lower', 'No transpose', 'Unit',
+     $                     N,
      $                     K, ONE, V( 1, M-K+1 ), LDV, WORK, LDWORK )
 *
 *              C2 := C2 - W**H
@@ -685,7 +705,8 @@ SUBROUTINE CLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 W := W + C1 * V1**H
 *
-                  CALL CGEMM( 'No transpose', 'Conjugate transpose', M,
+                  CALL CGEMM( 'No transpose', 'Conjugate transpose',
+     $                        M,
      $                        K, N-K, ONE, C, LDC, V, LDV, ONE, WORK,
      $                        LDWORK )
                END IF
@@ -701,13 +722,15 @@ SUBROUTINE CLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 C1 := C1 - W * V1
 *
-                  CALL CGEMM( 'No transpose', 'No transpose', M, N-K, K,
+                  CALL CGEMM( 'No transpose', 'No transpose', M, N-K,
+     $                        K,
      $                        -ONE, WORK, LDWORK, V, LDV, ONE, C, LDC )
                END IF
 *
 *              W := W * V2
 *
-               CALL CTRMM( 'Right', 'Lower', 'No transpose', 'Unit', M,
+               CALL CTRMM( 'Right', 'Lower', 'No transpose', 'Unit',
+     $                     M,
      $                     K, ONE, V( 1, N-K+1 ), LDV, WORK, LDWORK )
 *
 *              C1 := C1 - W
diff --git a/SRC/clarfb_gett.f b/SRC/clarfb_gett.f
index ee6959ed80..634f15dd80 100644
--- a/SRC/clarfb_gett.f
+++ b/SRC/clarfb_gett.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLARFB_GETT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarfb_gett.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarfb_gett.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *>
 *  Definition:
 *  ===========
@@ -157,7 +155,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup larfb_gett
 *
 *> \par Contributors:
 *  ==================
@@ -452,7 +450,7 @@ SUBROUTINE CLARFB_GETT( IDENT, M, N, K, T, LDT, A, LDA, B, LDB,
          IF( LNOTIDENT ) THEN
 *
 *           col2_(2) Compute W2: = (V1**H) * W2 = (A1**H) * W2,
-*           V1 is not an identy matrix, but unit lower-triangular
+*           V1 is not an identity matrix, but unit lower-triangular
 *           V1 stored in A1 (diagonal ones are not stored).
 *
 *
diff --git a/SRC/clarfg.f b/SRC/clarfg.f
index 36a98f5893..d9e6cf4bcc 100644
--- a/SRC/clarfg.f
+++ b/SRC/clarfg.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLARFG + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarfg.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarfg.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -99,10 +97,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup larfg
 *
 *  =====================================================================
       SUBROUTINE CLARFG( N, ALPHA, X, INCX, TAU )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clarfgp.f b/SRC/clarfgp.f
index b584484c7f..ca24dc8ec4 100644
--- a/SRC/clarfgp.f
+++ b/SRC/clarfgp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLARFGP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarfgp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarfgp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup larfgp
 *
 *  =====================================================================
       SUBROUTINE CLARFGP( N, ALPHA, X, INCX, TAU )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -122,13 +121,14 @@ SUBROUTINE CLARFGP( N, ALPHA, X, INCX, TAU )
 *     ..
 *     .. Local Scalars ..
       INTEGER            J, KNT
-      REAL               ALPHI, ALPHR, BETA, BIGNUM, SMLNUM, XNORM
+      REAL               ALPHI, ALPHR, BETA, BIGNUM, EPS, SMLNUM, XNORM
       COMPLEX            SAVEALPHA
 *     ..
 *     .. External Functions ..
       REAL               SCNRM2, SLAMCH, SLAPY3, SLAPY2
       COMPLEX            CLADIV
-      EXTERNAL           SCNRM2, SLAMCH, SLAPY3, SLAPY2, CLADIV
+      EXTERNAL           SCNRM2, SLAMCH, SLAPY3, SLAPY2,
+     $                   CLADIV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, CMPLX, REAL, SIGN
@@ -143,37 +143,28 @@ SUBROUTINE CLARFGP( N, ALPHA, X, INCX, TAU )
          RETURN
       END IF
 *
+      EPS = SLAMCH( 'Precision' )
       XNORM = SCNRM2( N-1, X, INCX )
       ALPHR = REAL( ALPHA )
       ALPHI = AIMAG( ALPHA )
 *
-      IF( XNORM.EQ.ZERO ) THEN
+      IF( XNORM.LE.EPS*ABS(ALPHA) .AND. ALPHI.EQ.ZERO ) THEN
 *
 *        H  =  [1-alpha/abs(alpha) 0; 0 I], sign chosen so ALPHA >= 0.
 *
-         IF( ALPHI.EQ.ZERO ) THEN
-            IF( ALPHR.GE.ZERO ) THEN
-*              When TAU.eq.ZERO, the vector is special-cased to be
-*              all zeros in the application routines.  We do not need
-*              to clear it.
-               TAU = ZERO
-            ELSE
-*              However, the application routines rely on explicit
-*              zero checks when TAU.ne.ZERO, and we must clear X.
-               TAU = TWO
-               DO J = 1, N-1
-                  X( 1 + (J-1)*INCX ) = ZERO
-               END DO
-               ALPHA = -ALPHA
-            END IF
+         IF( ALPHR.GE.ZERO ) THEN
+*           When TAU.eq.ZERO, the vector is special-cased to be
+*           all zeros in the application routines.  We do not need
+*           to clear it.
+            TAU = ZERO
          ELSE
-*           Only "reflecting" the diagonal entry to be real and non-negative.
-            XNORM = SLAPY2( ALPHR, ALPHI )
-            TAU = CMPLX( ONE - ALPHR / XNORM, -ALPHI / XNORM )
+*           However, the application routines rely on explicit
+*           zero checks when TAU.ne.ZERO, and we must clear X.
+            TAU = TWO
             DO J = 1, N-1
                X( 1 + (J-1)*INCX ) = ZERO
             END DO
-            ALPHA = XNORM
+            ALPHA = -ALPHA
          END IF
       ELSE
 *
diff --git a/SRC/clarft.f b/SRC/clarft.f
index fdf80b78e9..3bf2448ba8 100644
--- a/SRC/clarft.f
+++ b/SRC/clarft.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLARFT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarft.f">
 *> [TGZ]</a>
@@ -13,12 +12,11 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarft.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE CLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+*       RECURSIVE SUBROUTINE CLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
 *
 *       .. Scalar Arguments ..
 *       CHARACTER          DIRECT, STOREV
@@ -130,7 +128,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup larft
 *
 *> \par Further Details:
 *  =====================
@@ -159,167 +157,484 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+      RECURSIVE SUBROUTINE CLARFT( DIRECT, STOREV, N, K, V, LDV,
+     $                             TAU, T, LDT )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
-*     .. Scalar Arguments ..
-      CHARACTER          DIRECT, STOREV
-      INTEGER            K, LDT, LDV, N
+*        .. Scalar Arguments
+*
+      CHARACTER         DIRECT, STOREV
+      INTEGER           K, LDT, LDV, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX            T( LDT, * ), TAU( * ), V( LDV, * )
-*     ..
 *
-*  =====================================================================
+      COMPLEX           T( LDT, * ), TAU( * ), V( LDV, * )
+*     ..
 *
 *     .. Parameters ..
-      COMPLEX            ONE, ZERO
-      PARAMETER          ( ONE = ( 1.0E+0, 0.0E+0 ),
-     $                   ZERO = ( 0.0E+0, 0.0E+0 ) )
-*     ..
+*
+      COMPLEX           ONE, NEG_ONE, ZERO
+      PARAMETER(ONE=(1.0E+0,0.0E+0), ZERO = (0.0E+0,0.0E+0),
+     $            NEG_ONE=(-1.0E+0,0.0E+0))
+*
 *     .. Local Scalars ..
-      INTEGER            I, J, PREVLASTV, LASTV
-*     ..
+*
+      INTEGER           I,J,L,NX
+      LOGICAL           QR,LQ,QL,DIRF,COLV
+*
 *     .. External Subroutines ..
-      EXTERNAL           CGEMM, CGEMV, CTRMV
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      EXTERNAL           LSAME
+*
+      EXTERNAL          CTRMM,CGEMM,CLACPY
+*
+*     .. External Functions..
+*
+      LOGICAL           LSAME
+      INTEGER           ILAENV
+      EXTERNAL          LSAME, ILAENV
+*
+*     .. Intrinsic Functions..
+*
+      INTRINSIC         CONJG
+*     
+*     The general scheme used is inspired by the approach inside DGEQRT3
+*     which was (at the time of writing this code):
+*     Based on the algorithm of Elmroth and Gustavson,
+*     IBM J. Res. Develop. Vol 44 No. 4 July 2000.
 *     ..
 *     .. Executable Statements ..
 *
 *     Quick return if possible
 *
-      IF( N.EQ.0 )
-     $   RETURN
-*
-      IF( LSAME( DIRECT, 'F' ) ) THEN
-         PREVLASTV = N
-         DO I = 1, K
-            PREVLASTV = MAX( PREVLASTV, I )
-            IF( TAU( I ).EQ.ZERO ) THEN
-*
-*              H(i)  =  I
-*
-               DO J = 1, I
-                  T( J, I ) = ZERO
-               END DO
-            ELSE
-*
-*              general case
-*
-               IF( LSAME( STOREV, 'C' ) ) THEN
-*                 Skip any trailing zeros.
-                  DO LASTV = N, I+1, -1
-                     IF( V( LASTV, I ).NE.ZERO ) EXIT
-                  END DO
-                  DO J = 1, I-1
-                     T( J, I ) = -TAU( I ) * CONJG( V( I , J ) )
-                  END DO
-                  J = MIN( LASTV, PREVLASTV )
-*
-*                 T(1:i-1,i) := - tau(i) * V(i:j,1:i-1)**H * V(i:j,i)
-*
-                  CALL CGEMV( 'Conjugate transpose', J-I, I-1,
-     $                        -TAU( I ), V( I+1, 1 ), LDV,
-     $                        V( I+1, I ), 1,
-     $                        ONE, T( 1, I ), 1 )
-               ELSE
-*                 Skip any trailing zeros.
-                  DO LASTV = N, I+1, -1
-                     IF( V( I, LASTV ).NE.ZERO ) EXIT
-                  END DO
-                  DO J = 1, I-1
-                     T( J, I ) = -TAU( I ) * V( J , I )
-                  END DO
-                  J = MIN( LASTV, PREVLASTV )
-*
-*                 T(1:i-1,i) := - tau(i) * V(1:i-1,i:j) * V(i,i:j)**H
-*
-                  CALL CGEMM( 'N', 'C', I-1, 1, J-I, -TAU( I ),
-     $                        V( 1, I+1 ), LDV, V( I, I+1 ), LDV,
-     $                        ONE, T( 1, I ), LDT )
-               END IF
-*
-*              T(1:i-1,i) := T(1:i-1,1:i-1) * T(1:i-1,i)
-*
-               CALL CTRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T,
-     $                     LDT, T( 1, I ), 1 )
-               T( I, I ) = TAU( I )
-               IF( I.GT.1 ) THEN
-                  PREVLASTV = MAX( PREVLASTV, LASTV )
-               ELSE
-                  PREVLASTV = LASTV
-               END IF
-            END IF
+      IF(N.EQ.0.OR.K.EQ.0) THEN
+         RETURN
+      END IF
+*
+*     Base case
+*
+      IF(N.EQ.1.OR.K.EQ.1) THEN
+         T(1,1) = TAU(1)
+         RETURN
+      END IF
+*
+*     Determine when to cross over into the level 2 based implementation
+*
+      NX = ILAENV(3, "CLARFT", DIRECT // STOREV, N, K, -1, -1)
+      IF(K.LT.NX) THEN
+         CALL CLARFT_LVL2(DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT)
+         RETURN
+      END IF
+*
+*     Beginning of executable statements
+*
+      L = K / 2
+*
+*     Determine what kind of Q we need to compute
+*     We assume that if the user doesn't provide 'F' for DIRECT,
+*     then they meant to provide 'B' and if they don't provide
+*     'C' for STOREV, then they meant to provide 'R'
+*
+      DIRF = LSAME(DIRECT,'F')
+      COLV = LSAME(STOREV,'C')
+*
+*     QR happens when we have forward direction in column storage
+*
+      QR = DIRF.AND.COLV
+*
+*     LQ happens when we have forward direction in row storage
+*
+      LQ = DIRF.AND.(.NOT.COLV)
+*
+*     QL happens when we have backward direction in column storage
+*
+      QL = (.NOT.DIRF).AND.COLV
+*
+*     The last case is RQ. Due to how we structured this, if the
+*     above 3 are false, then RQ must be true, so we never store 
+*     this
+*     RQ happens when we have backward direction in row storage
+*     RQ = (.NOT.DIRF).AND.(.NOT.COLV)
+*
+      IF(QR) THEN
+*
+*        Break V apart into 6 components
+*
+*        V = |---------------|
+*            |V_{1,1} 0      |
+*            |V_{2,1} V_{2,2}|
+*            |V_{3,1} V_{3,2}|
+*            |---------------|
+*
+*        V_{1,1}\in\C^{l,l}      unit lower triangular
+*        V_{2,1}\in\C^{k-l,l}    rectangular
+*        V_{3,1}\in\C^{n-k,l}    rectangular
+*        
+*        V_{2,2}\in\C^{k-l,k-l}  unit lower triangular
+*        V_{3,2}\in\C^{n-k,k-l}  rectangular
+*
+*        We will construct the T matrix 
+*        T = |---------------|
+*            |T_{1,1} T_{1,2}|
+*            |0       T_{2,2}|
+*            |---------------|
+*
+*        T is the triangular factor obtained from block reflectors. 
+*        To motivate the structure, assume we have already computed T_{1,1}
+*        and T_{2,2}. Then collect the associated reflectors in V_1 and V_2
+*
+*        T_{1,1}\in\C^{l, l}     upper triangular
+*        T_{2,2}\in\C^{k-l, k-l} upper triangular
+*        T_{1,2}\in\C^{l, k-l}   rectangular
+*
+*        Where l = floor(k/2)
+*
+*        Then, consider the product:
+*        
+*        (I - V_1*T_{1,1}*V_1')*(I - V_2*T_{2,2}*V_2')
+*        = I - V_1*T_{1,1}*V_1' - V_2*T_{2,2}*V_2' + V_1*T_{1,1}*V_1'*V_2*T_{2,2}*V_2'
+*        
+*        Define T{1,2} = -T_{1,1}*V_1'*V_2*T_{2,2}
+*        
+*        Then, we can define the matrix V as 
+*        V = |-------|
+*            |V_1 V_2|
+*            |-------|
+*        
+*        So, our product is equivalent to the matrix product
+*        I - V*T*V'
+*        This means, we can compute T_{1,1} and T_{2,2}, then use this information
+*        to compute T_{1,2}
+*
+*        Compute T_{1,1} recursively
+*
+         CALL CLARFT(DIRECT, STOREV, N, L, V, LDV, TAU, T, LDT)
+*
+*        Compute T_{2,2} recursively
+*
+         CALL CLARFT(DIRECT, STOREV, N-L, K-L, V(L+1, L+1), LDV, 
+     $               TAU(L+1), T(L+1, L+1), LDT)
+*
+*        Compute T_{1,2} 
+*        T_{1,2} = V_{2,1}'
+*
+         DO J = 1, L
+            DO I = 1, K-L
+               T(J, L+I) = CONJG(V(L+I, J))
+            END DO
          END DO
-      ELSE
-         PREVLASTV = 1
-         DO I = K, 1, -1
-            IF( TAU( I ).EQ.ZERO ) THEN
-*
-*              H(i)  =  I
-*
-               DO J = I, K
-                  T( J, I ) = ZERO
-               END DO
-            ELSE
-*
-*              general case
-*
-               IF( I.LT.K ) THEN
-                  IF( LSAME( STOREV, 'C' ) ) THEN
-*                    Skip any leading zeros.
-                     DO LASTV = 1, I-1
-                        IF( V( LASTV, I ).NE.ZERO ) EXIT
-                     END DO
-                     DO J = I+1, K
-                        T( J, I ) = -TAU( I ) * CONJG( V( N-K+I , J ) )
-                     END DO
-                     J = MAX( LASTV, PREVLASTV )
-*
-*                    T(i+1:k,i) = -tau(i) * V(j:n-k+i,i+1:k)**H * V(j:n-k+i,i)
-*
-                     CALL CGEMV( 'Conjugate transpose', N-K+I-J, K-I,
-     $                           -TAU( I ), V( J, I+1 ), LDV, V( J, I ),
-     $                           1, ONE, T( I+1, I ), 1 )
-                  ELSE
-*                    Skip any leading zeros.
-                     DO LASTV = 1, I-1
-                        IF( V( I, LASTV ).NE.ZERO ) EXIT
-                     END DO
-                     DO J = I+1, K
-                        T( J, I ) = -TAU( I ) * V( J, N-K+I )
-                     END DO
-                     J = MAX( LASTV, PREVLASTV )
-*
-*                    T(i+1:k,i) = -tau(i) * V(i+1:k,j:n-k+i) * V(i,j:n-k+i)**H
-*
-                     CALL CGEMM( 'N', 'C', K-I, 1, N-K+I-J, -TAU( I ),
-     $                           V( I+1, J ), LDV, V( I, J ), LDV,
-     $                           ONE, T( I+1, I ), LDT )
-                  END IF
-*
-*                 T(i+1:k,i) := T(i+1:k,i+1:k) * T(i+1:k,i)
-*
-                  CALL CTRMV( 'Lower', 'No transpose', 'Non-unit', K-I,
-     $                        T( I+1, I+1 ), LDT, T( I+1, I ), 1 )
-                  IF( I.GT.1 ) THEN
-                     PREVLASTV = MIN( PREVLASTV, LASTV )
-                  ELSE
-                     PREVLASTV = LASTV
-                  END IF
-               END IF
-               T( I, I ) = TAU( I )
-            END IF
+*
+*        T_{1,2} = T_{1,2}*V_{2,2}
+*
+         CALL CTRMM('Right', 'Lower', 'No transpose', 'Unit', L,
+     $         K-L, ONE, V(L+1, L+1), LDV, T(1, L+1), LDT)
+
+*
+*        T_{1,2} = V_{3,1}'*V_{3,2} + T_{1,2}
+*        Note: We assume K <= N, and GEMM will do nothing if N=K
+*
+         CALL CGEMM('Conjugate', 'No transpose', L, K-L, N-K, ONE, 
+     $         V(K+1, 1), LDV, V(K+1, L+1), LDV, ONE, T(1, L+1),
+     $         LDT)
+*
+*        At this point, we have that T_{1,2} = V_1'*V_2
+*        All that is left is to pre and post multiply by -T_{1,1} and T_{2,2}
+*        respectively.
+*
+*        T_{1,2} = -T_{1,1}*T_{1,2}
+*
+         CALL CTRMM('Left', 'Upper', 'No transpose', 'Non-unit', L,
+     $         K-L, NEG_ONE, T, LDT, T(1, L+1), LDT)
+*
+*        T_{1,2} = T_{1,2}*T_{2,2}
+*
+         CALL CTRMM('Right', 'Upper', 'No transpose', 'Non-unit', L, 
+     $         K-L, ONE, T(L+1, L+1), LDT, T(1, L+1), LDT)
+
+      ELSE IF(LQ) THEN
+*
+*        Break V apart into 6 components
+*
+*        V = |----------------------|
+*            |V_{1,1} V_{1,2} V{1,3}|
+*            |0       V_{2,2} V{2,3}|
+*            |----------------------|
+*
+*        V_{1,1}\in\C^{l,l}      unit upper triangular
+*        V_{1,2}\in\C^{l,k-l}    rectangular
+*        V_{1,3}\in\C^{l,n-k}    rectangular
+*        
+*        V_{2,2}\in\C^{k-l,k-l}  unit upper triangular
+*        V_{2,3}\in\C^{k-l,n-k}  rectangular
+*
+*        Where l = floor(k/2)
+*
+*        We will construct the T matrix 
+*        T = |---------------|
+*            |T_{1,1} T_{1,2}|
+*            |0       T_{2,2}|
+*            |---------------|
+*
+*        T is the triangular factor obtained from block reflectors. 
+*        To motivate the structure, assume we have already computed T_{1,1}
+*        and T_{2,2}. Then collect the associated reflectors in V_1 and V_2
+*
+*        T_{1,1}\in\C^{l, l}     upper triangular
+*        T_{2,2}\in\C^{k-l, k-l} upper triangular
+*        T_{1,2}\in\C^{l, k-l}   rectangular
+*
+*        Then, consider the product:
+*        
+*        (I - V_1'*T_{1,1}*V_1)*(I - V_2'*T_{2,2}*V_2)
+*        = I - V_1'*T_{1,1}*V_1 - V_2'*T_{2,2}*V_2 + V_1'*T_{1,1}*V_1*V_2'*T_{2,2}*V_2
+*        
+*        Define T_{1,2} = -T_{1,1}*V_1*V_2'*T_{2,2}
+*        
+*        Then, we can define the matrix V as 
+*        V = |---|
+*            |V_1|
+*            |V_2|
+*            |---|
+*        
+*        So, our product is equivalent to the matrix product
+*        I - V'*T*V
+*        This means, we can compute T_{1,1} and T_{2,2}, then use this information
+*        to compute T_{1,2}
+*
+*        Compute T_{1,1} recursively
+*
+         CALL CLARFT(DIRECT, STOREV, N, L, V, LDV, TAU, T, LDT)
+*
+*        Compute T_{2,2} recursively
+*
+         CALL CLARFT(DIRECT, STOREV, N-L, K-L, V(L+1, L+1), LDV, 
+     $               TAU(L+1), T(L+1, L+1), LDT)
+
+*
+*        Compute T_{1,2}
+*        T_{1,2} = V_{1,2}
+*
+         CALL CLACPY('All', L, K-L, V(1, L+1), LDV, T(1, L+1), LDT)
+*
+*        T_{1,2} = T_{1,2}*V_{2,2}'
+*
+         CALL CTRMM('Right', 'Upper', 'Conjugate', 'Unit', L, K-L,
+     $      ONE, V(L+1, L+1), LDV, T(1, L+1), LDT)
+
+*
+*        T_{1,2} = V_{1,3}*V_{2,3}' + T_{1,2}
+*        Note: We assume K <= N, and GEMM will do nothing if N=K
+*
+         CALL CGEMM('No transpose', 'Conjugate', L, K-L, N-K, ONE,
+     $      V(1, K+1), LDV, V(L+1, K+1), LDV, ONE, T(1, L+1), LDT)
+*
+*        At this point, we have that T_{1,2} = V_1*V_2'
+*        All that is left is to pre and post multiply by -T_{1,1} and T_{2,2}
+*        respectively.
+*
+*        T_{1,2} = -T_{1,1}*T_{1,2}
+*
+         CALL CTRMM('Left', 'Upper', 'No transpose', 'Non-unit', L,
+     $      K-L, NEG_ONE, T, LDT, T(1, L+1), LDT)
+
+*
+*        T_{1,2} = T_{1,2}*T_{2,2}
+*
+         CALL CTRMM('Right', 'Upper', 'No transpose', 'Non-unit', L,
+     $      K-L, ONE, T(L+1,L+1), LDT, T(1, L+1), LDT)
+      ELSE IF(QL) THEN
+*
+*        Break V apart into 6 components
+*
+*        V = |---------------|
+*            |V_{1,1} V_{1,2}|
+*            |V_{2,1} V_{2,2}|
+*            |0       V_{3,2}|
+*            |---------------|
+*
+*        V_{1,1}\in\C^{n-k,k-l}  rectangular
+*        V_{2,1}\in\C^{k-l,k-l}  unit upper triangular
+*        
+*        V_{1,2}\in\C^{n-k,l}    rectangular
+*        V_{2,2}\in\C^{k-l,l}    rectangular
+*        V_{3,2}\in\C^{l,l}      unit upper triangular
+*
+*        We will construct the T matrix 
+*        T = |---------------|
+*            |T_{1,1} 0      |
+*            |T_{2,1} T_{2,2}|
+*            |---------------|
+*
+*        T is the triangular factor obtained from block reflectors. 
+*        To motivate the structure, assume we have already computed T_{1,1}
+*        and T_{2,2}. Then collect the associated reflectors in V_1 and V_2
+*
+*        T_{1,1}\in\C^{k-l, k-l} non-unit lower triangular
+*        T_{2,2}\in\C^{l, l}     non-unit lower triangular
+*        T_{2,1}\in\C^{k-l, l}   rectangular
+*
+*        Where l = floor(k/2)
+*
+*        Then, consider the product:
+*        
+*        (I - V_2*T_{2,2}*V_2')*(I - V_1*T_{1,1}*V_1')
+*        = I - V_2*T_{2,2}*V_2' - V_1*T_{1,1}*V_1' + V_2*T_{2,2}*V_2'*V_1*T_{1,1}*V_1'
+*        
+*        Define T_{2,1} = -T_{2,2}*V_2'*V_1*T_{1,1}
+*        
+*        Then, we can define the matrix V as 
+*        V = |-------|
+*            |V_1 V_2|
+*            |-------|
+*        
+*        So, our product is equivalent to the matrix product
+*        I - V*T*V'
+*        This means, we can compute T_{1,1} and T_{2,2}, then use this information
+*        to compute T_{2,1}
+*
+*        Compute T_{1,1} recursively
+*
+         CALL CLARFT(DIRECT, STOREV, N-L, K-L, V, LDV, TAU, T, LDT)
+*
+*        Compute T_{2,2} recursively
+*
+         CALL CLARFT(DIRECT, STOREV, N, L, V(1, K-L+1), LDV,
+     $               TAU(K-L+1), T(K-L+1, K-L+1), LDT)
+*
+*        Compute T_{2,1}
+*        T_{2,1} = V_{2,2}'
+*
+         DO J = 1, K-L
+            DO I = 1, L
+               T(K-L+I, J) = CONJG(V(N-K+J, K-L+I))
+            END DO
          END DO
-      END IF
-      RETURN
 *
-*     End of CLARFT
+*        T_{2,1} = T_{2,1}*V_{2,1}
+*
+         CALL CTRMM('Right', 'Upper', 'No transpose', 'Unit', L,
+     $               K-L, ONE, V(N-K+1, 1), LDV, T(K-L+1, 1), LDT)
+
+*
+*        T_{2,1} = V_{2,2}'*V_{2,1} + T_{2,1}
+*        Note: We assume K <= N, and GEMM will do nothing if N=K
+*
+         CALL CGEMM('Conjugate', 'No transpose', L, K-L, N-K, ONE,
+     $               V(1, K-L+1), LDV, V, LDV, ONE, T(K-L+1, 1),
+     $               LDT)
+*
+*        At this point, we have that T_{2,1} = V_2'*V_1
+*        All that is left is to pre and post multiply by -T_{2,2} and T_{1,1}
+*        respectively.
+*
+*        T_{2,1} = -T_{2,2}*T_{2,1}
 *
-      END
+         CALL CTRMM('Left', 'Lower', 'No transpose', 'Non-unit', L,
+     $               K-L, NEG_ONE, T(K-L+1, K-L+1), LDT,
+     $               T(K-L+1, 1), LDT)
+*
+*        T_{2,1} = T_{2,1}*T_{1,1}
+*
+         CALL CTRMM('Right', 'Lower', 'No transpose', 'Non-unit', L,
+     $               K-L, ONE, T, LDT, T(K-L+1, 1), LDT)
+      ELSE
+*
+*        Else means RQ case
+*
+*        Break V apart into 6 components
+*
+*        V = |-----------------------|
+*            |V_{1,1} V_{1,2} 0      |
+*            |V_{2,1} V_{2,2} V_{2,3}|
+*            |-----------------------|
+*
+*        V_{1,1}\in\C^{k-l,n-k}  rectangular
+*        V_{1,2}\in\C^{k-l,k-l}  unit lower triangular
+*
+*        V_{2,1}\in\C^{l,n-k}    rectangular
+*        V_{2,2}\in\C^{l,k-l}    rectangular
+*        V_{2,3}\in\C^{l,l}      unit lower triangular
+*
+*        We will construct the T matrix 
+*        T = |---------------|
+*            |T_{1,1} 0      |
+*            |T_{2,1} T_{2,2}|
+*            |---------------|
+*
+*        T is the triangular factor obtained from block reflectors. 
+*        To motivate the structure, assume we have already computed T_{1,1}
+*        and T_{2,2}. Then collect the associated reflectors in V_1 and V_2
+*
+*        T_{1,1}\in\C^{k-l, k-l} non-unit lower triangular
+*        T_{2,2}\in\C^{l, l}     non-unit lower triangular
+*        T_{2,1}\in\C^{k-l, l}   rectangular
+*
+*        Where l = floor(k/2)
+*
+*        Then, consider the product:
+*        
+*        (I - V_2'*T_{2,2}*V_2)*(I - V_1'*T_{1,1}*V_1)
+*        = I - V_2'*T_{2,2}*V_2 - V_1'*T_{1,1}*V_1 + V_2'*T_{2,2}*V_2*V_1'*T_{1,1}*V_1
+*        
+*        Define T_{2,1} = -T_{2,2}*V_2*V_1'*T_{1,1}
+*        
+*        Then, we can define the matrix V as 
+*        V = |---|
+*            |V_1|
+*            |V_2|
+*            |---|
+*        
+*        So, our product is equivalent to the matrix product
+*        I - V'*T*V
+*        This means, we can compute T_{1,1} and T_{2,2}, then use this information
+*        to compute T_{2,1}
+*
+*        Compute T_{1,1} recursively
+*
+         CALL CLARFT(DIRECT, STOREV, N-L, K-L, V, LDV, TAU, T, LDT)
+*
+*        Compute T_{2,2} recursively
+*
+         CALL CLARFT(DIRECT, STOREV, N, L, V(K-L+1,1), LDV,
+     $               TAU(K-L+1), T(K-L+1, K-L+1), LDT)
+*
+*        Compute T_{2,1}
+*        T_{2,1} = V_{2,2}
+*
+         CALL CLACPY('All', L, K-L, V(K-L+1, N-K+1), LDV, 
+     $               T(K-L+1, 1), LDT)
+
+*
+*        T_{2,1} = T_{2,1}*V_{1,2}'
+*
+         CALL CTRMM('Right', 'Lower', 'Conjugate', 'Unit', L, K-L,
+     $               ONE, V(1, N-K+1), LDV, T(K-L+1,1), LDT)
+
+*
+*        T_{2,1} = V_{2,1}*V_{1,1}' + T_{2,1}
+*        Note: We assume K <= N, and GEMM will do nothing if N=K
+*
+         CALL CGEMM('No transpose', 'Conjugate', L, K-L, N-K, ONE, 
+     $               V(K-L+1, 1), LDV, V, LDV, ONE, T(K-L+1, 1),
+     $               LDT)
+
+*
+*        At this point, we have that T_{2,1} = V_2*V_1'
+*        All that is left is to pre and post multiply by -T_{2,2} and T_{1,1}
+*        respectively.
+*
+*        T_{2,1} = -T_{2,2}*T_{2,1}
+*
+         CALL CTRMM('Left', 'Lower', 'No tranpose', 'Non-unit', L,
+     $               K-L, NEG_ONE, T(K-L+1, K-L+1), LDT, 
+     $               T(K-L+1, 1), LDT)
+
+*
+*        T_{2,1} = T_{2,1}*T_{1,1}
+*
+         CALL CTRMM('Right', 'Lower', 'No tranpose', 'Non-unit', L,
+     $               K-L, ONE, T, LDT, T(K-L+1, 1), LDT)
+      END IF
+      END SUBROUTINE
diff --git a/SRC/clarft_lvl2.f b/SRC/clarft_lvl2.f
new file mode 100644
index 0000000000..3b0aea1132
--- /dev/null
+++ b/SRC/clarft_lvl2.f
@@ -0,0 +1,328 @@
+*> \brief \b CLARFT_LVL2: Level 2 BLAS version for terminating case of CLARFT
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download CLARFT_LVL2 + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarft.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/clarft.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarft.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE CLARFT_LVL2( DIRECT, STOREV, N, K, V, LDV, TAU,
+*                    T, LDT )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          DIRECT, STOREV
+*       INTEGER            K, LDT, LDV, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX            T( LDT, * ), TAU( * ), V( LDV, * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> CLARFT_LVL2 forms the triangular factor T of a complex block reflector H
+*> of order n, which is defined as a product of k elementary reflectors.
+*>
+*> If DIRECT = 'F', H = H(1) H(2) . . . H(k) and T is upper triangular;
+*>
+*> If DIRECT = 'B', H = H(k) . . . H(2) H(1) and T is lower triangular.
+*>
+*> If STOREV = 'C', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th column of the array V, and
+*>
+*>    H  =  I - V * T * V**H
+*>
+*> If STOREV = 'R', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th row of the array V, and
+*>
+*>    H  =  I - V**H * T * V
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] DIRECT
+*> \verbatim
+*>          DIRECT is CHARACTER*1
+*>          Specifies the order in which the elementary reflectors are
+*>          multiplied to form the block reflector:
+*>          = 'F': H = H(1) H(2) . . . H(k) (Forward)
+*>          = 'B': H = H(k) . . . H(2) H(1) (Backward)
+*> \endverbatim
+*>
+*> \param[in] STOREV
+*> \verbatim
+*>          STOREV is CHARACTER*1
+*>          Specifies how the vectors which define the elementary
+*>          reflectors are stored (see also Further Details):
+*>          = 'C': columnwise
+*>          = 'R': rowwise
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the block reflector H. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The order of the triangular factor T (= the number of
+*>          elementary reflectors). K >= 1.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is COMPLEX array, dimension
+*>                               (LDV,K) if STOREV = 'C'
+*>                               (LDV,N) if STOREV = 'R'
+*>          The matrix V. See further details.
+*> \endverbatim
+*>
+*> \param[in] LDV
+*> \verbatim
+*>          LDV is INTEGER
+*>          The leading dimension of the array V.
+*>          If STOREV = 'C', LDV >= max(1,N); if STOREV = 'R', LDV >= K.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i).
+*> \endverbatim
+*>
+*> \param[out] T
+*> \verbatim
+*>          T is COMPLEX array, dimension (LDT,K)
+*>          The k by k triangular factor T of the block reflector.
+*>          If DIRECT = 'F', T is upper triangular; if DIRECT = 'B', T is
+*>          lower triangular. The rest of the array is not used.
+*> \endverbatim
+*>
+*> \param[in] LDT
+*> \verbatim
+*>          LDT is INTEGER
+*>          The leading dimension of the array T. LDT >= K.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup larft
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The shape of the matrix V and the storage of the vectors which define
+*>  the H(i) is best illustrated by the following example with n = 5 and
+*>  k = 3. The elements equal to 1 are not stored.
+*>
+*>  DIRECT = 'F' and STOREV = 'C':         DIRECT = 'F' and STOREV = 'R':
+*>
+*>               V = (  1       )                 V = (  1 v1 v1 v1 v1 )
+*>                   ( v1  1    )                     (     1 v2 v2 v2 )
+*>                   ( v1 v2  1 )                     (        1 v3 v3 )
+*>                   ( v1 v2 v3 )
+*>                   ( v1 v2 v3 )
+*>
+*>  DIRECT = 'B' and STOREV = 'C':         DIRECT = 'B' and STOREV = 'R':
+*>
+*>               V = ( v1 v2 v3 )                 V = ( v1 v1  1       )
+*>                   ( v1 v2 v3 )                     ( v2 v2 v2  1    )
+*>                   (  1 v2 v3 )                     ( v3 v3 v3 v3  1 )
+*>                   (     1 v3 )
+*>                   (        1 )
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE CLARFT_LVL2( DIRECT, STOREV, N, K, V, LDV, TAU,
+     $            T, LDT )
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          DIRECT, STOREV
+      INTEGER            K, LDT, LDV, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX            T( LDT, * ), TAU( * ), V( LDV, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      COMPLEX            ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0E+0, 0.0E+0 ),
+     $                   ZERO = ( 0.0E+0, 0.0E+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J, PREVLASTV, LASTV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           CGEMM, CGEMV, CTRMV
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+*
+      IF( LSAME( DIRECT, 'F' ) ) THEN
+         PREVLASTV = N
+         DO I = 1, K
+            PREVLASTV = MAX( PREVLASTV, I )
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = 1, I
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( LSAME( STOREV, 'C' ) ) THEN
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( LASTV, I ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * CONJG( V( I , J ) )
+                  END DO
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(i:j,1:i-1)**H * V(i:j,i)
+*
+                  CALL CGEMV( 'Conjugate transpose', J-I, I-1,
+     $                        -TAU( I ), V( I+1, 1 ), LDV,
+     $                        V( I+1, I ), 1,
+     $                        ONE, T( 1, I ), 1 )
+               ELSE
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( I, LASTV ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * V( J , I )
+                  END DO
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(1:i-1,i:j) * V(i,i:j)**H
+*
+                  CALL CGEMM( 'N', 'C', I-1, 1, J-I, -TAU( I ),
+     $                        V( 1, I+1 ), LDV, V( I, I+1 ), LDV,
+     $                        ONE, T( 1, I ), LDT )
+               END IF
+*
+*              T(1:i-1,i) := T(1:i-1,1:i-1) * T(1:i-1,i)
+*
+               CALL CTRMV( 'Upper', 'No transpose', 'Non-unit', I-1,
+     $                     T,
+     $                     LDT, T( 1, I ), 1 )
+               T( I, I ) = TAU( I )
+               IF( I.GT.1 ) THEN
+                  PREVLASTV = MAX( PREVLASTV, LASTV )
+               ELSE
+                  PREVLASTV = LASTV
+               END IF
+            END IF
+         END DO
+      ELSE
+         PREVLASTV = 1
+         DO I = K, 1, -1
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = I, K
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( I.LT.K ) THEN
+                  IF( LSAME( STOREV, 'C' ) ) THEN
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( LASTV, I ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * CONJG( V( N-K+I , J ) )
+                     END DO
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(j:n-k+i,i+1:k)**H * V(j:n-k+i,i)
+*
+                     CALL CGEMV( 'Conjugate transpose', N-K+I-J, K-I,
+     $                           -TAU( I ), V( J, I+1 ), LDV, V( J, I ),
+     $                           1, ONE, T( I+1, I ), 1 )
+                  ELSE
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( I, LASTV ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * V( J, N-K+I )
+                     END DO
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(i+1:k,j:n-k+i) * V(i,j:n-k+i)**H
+*
+                     CALL CGEMM( 'N', 'C', K-I, 1, N-K+I-J,
+     $                           -TAU( I ),
+     $                           V( I+1, J ), LDV, V( I, J ), LDV,
+     $                           ONE, T( I+1, I ), LDT )
+                  END IF
+*
+*                 T(i+1:k,i) := T(i+1:k,i+1:k) * T(i+1:k,i)
+*
+                  CALL CTRMV( 'Lower', 'No transpose', 'Non-unit',
+     $                        K-I,
+     $                        T( I+1, I+1 ), LDT, T( I+1, I ), 1 )
+                  IF( I.GT.1 ) THEN
+                     PREVLASTV = MIN( PREVLASTV, LASTV )
+                  ELSE
+                     PREVLASTV = LASTV
+                  END IF
+               END IF
+               T( I, I ) = TAU( I )
+            END IF
+         END DO
+      END IF
+      RETURN
+*
+*     End of CLARFT_LVL2
+*
+      END
diff --git a/SRC/clarfx.f b/SRC/clarfx.f
index 6a39094b8e..c9f8fb2e80 100644
--- a/SRC/clarfx.f
+++ b/SRC/clarfx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLARFX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarfx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarfx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -112,10 +110,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup larfx
 *
 *  =====================================================================
       SUBROUTINE CLARFX( SIDE, M, N, V, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clarfy.f b/SRC/clarfy.f
index 77292757b4..f5ea56c00d 100644
--- a/SRC/clarfy.f
+++ b/SRC/clarfy.f
@@ -101,10 +101,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup larfy
 *
 *  =====================================================================
       SUBROUTINE CLARFY( UPLO, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clargv.f b/SRC/clargv.f
index 82a77b4422..a784436407 100644
--- a/SRC/clargv.f
+++ b/SRC/clargv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLARGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clargv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clargv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -104,7 +102,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup largv
 *
 *> \par Further Details:
 *  =====================
@@ -119,6 +117,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CLARGV( N, X, INCX, Y, INCY, C, INCC )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clarnv.f b/SRC/clarnv.f
index 6d71d2b538..333eee6ea3 100644
--- a/SRC/clarnv.f
+++ b/SRC/clarnv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLARNV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarnv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarnv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -81,7 +79,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup larnv
 *
 *> \par Further Details:
 *  =====================
@@ -96,6 +94,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CLARNV( IDIST, ISEED, N, X )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clarrv.f b/SRC/clarrv.f
index 1f09e4da6a..dac574d75e 100644
--- a/SRC/clarrv.f
+++ b/SRC/clarrv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLARRV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarrv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarrv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -266,7 +264,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup larrv
 *
 *> \par Contributors:
 *  ==================
@@ -283,6 +281,7 @@ SUBROUTINE CLARRV( N, VL, VU, D, L, PIVMIN,
      $                   RTOL1, RTOL2, W, WERR, WGAP,
      $                   IBLOCK, INDEXW, GERS, Z, LDZ, ISUPPZ,
      $                   WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -334,7 +333,8 @@ SUBROUTINE CLARRV( N, VL, VU, D, L, PIVMIN,
       EXTERNAL           SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLAR1V, CLASET, CSSCAL, SCOPY, SLARRB,
+      EXTERNAL           CLAR1V, CLASET, CSSCAL, SCOPY,
+     $                   SLARRB,
      $                   SLARRF
 *     ..
 *     .. Intrinsic Functions ..
@@ -348,7 +348,7 @@ SUBROUTINE CLARRV( N, VL, VU, D, L, PIVMIN,
 *
 *     Quick return if possible
 *
-      IF( N.LE.0 ) THEN
+      IF( (N.LE.0).OR.(M.LE.0) ) THEN
          RETURN
       END IF
 *
diff --git a/SRC/clarscl2.f b/SRC/clarscl2.f
index 26b028dbba..a55cb8d4bb 100644
--- a/SRC/clarscl2.f
+++ b/SRC/clarscl2.f
@@ -1,11 +1,10 @@
-*> \brief \b CLARSCL2 performs reciprocal diagonal scaling on a vector.
+*> \brief \b CLARSCL2 performs reciprocal diagonal scaling on a matrix.
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLARSCL2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarscl2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarscl2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -34,7 +32,7 @@
 *>
 *> \verbatim
 *>
-*> CLARSCL2 performs a reciprocal diagonal scaling on an vector:
+*> CLARSCL2 performs a reciprocal diagonal scaling on a matrix:
 *>   x <-- inv(D) * x
 *> where the REAL diagonal matrix D is stored as a vector.
 *>
@@ -66,14 +64,14 @@
 *> \param[in,out] X
 *> \verbatim
 *>          X is COMPLEX array, dimension (LDX,N)
-*>     On entry, the vector X to be scaled by D.
-*>     On exit, the scaled vector.
+*>     On entry, the matrix X to be scaled by D.
+*>     On exit, the scaled matrix.
 *> \endverbatim
 *>
 *> \param[in] LDX
 *> \verbatim
 *>          LDX is INTEGER
-*>     The leading dimension of the vector X. LDX >= M.
+*>     The leading dimension of the matrix X. LDX >= M.
 *> \endverbatim
 *
 *  Authors:
@@ -84,10 +82,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup larscl2
 *
 *  =====================================================================
       SUBROUTINE CLARSCL2 ( M, N, D, X, LDX )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clartg.f90 b/SRC/clartg.f90
index f63a0f8d20..553b78236c 100644
--- a/SRC/clartg.f90
+++ b/SRC/clartg.f90
@@ -30,7 +30,7 @@
 !> The mathematical formulas used for C and S are
 !>
 !>    sgn(x) = {  x / |x|,   x != 0
-!>             {  1,         x = 0
+!>             {  1,         x  = 0
 !>
 !>    R = sgn(F) * sqrt(|F|**2 + |G|**2)
 !>
@@ -38,19 +38,20 @@
 !>
 !>    S = sgn(F) * conjg(G) / sqrt(|F|**2 + |G|**2)
 !>
+!> Special conditions:
+!>    If G=0, then C=1 and S=0.
+!>    If F=0, then C=0 and S is chosen so that R is real.
+!>
 !> When F and G are real, the formulas simplify to C = F/R and
 !> S = G/R, and the returned values of C, S, and R should be
-!> identical to those returned by CLARTG.
+!> identical to those returned by SLARTG.
 !>
 !> The algorithm used to compute these quantities incorporates scaling
 !> to avoid overflow or underflow in computing the square root of the
 !> sum of squares.
 !>
-!> This is a faster version of the BLAS1 routine CROTG, except for
-!> the following differences:
-!>    F and G are unchanged on return.
-!>    If G=0, then C=1 and S=0.
-!>    If F=0, then C=0 and S is chosen so that R is real.
+!> This is the same routine CROTG fom BLAS1, except that
+!> F and G are unchanged on return.
 !>
 !> Below, wp=>sp stands for single precision from LA_CONSTANTS module.
 !> \endverbatim
@@ -91,22 +92,19 @@
 !  Authors:
 !  ========
 !
-!> \author Edward Anderson, Lockheed Martin
-!
-!> \date August 2016
+!> \author Weslley Pereira, University of Colorado Denver, USA
 !
-!> \ingroup OTHERauxiliary
+!> \date December 2021
 !
-!> \par Contributors:
-!  ==================
-!>
-!> Weslley Pereira, University of Colorado Denver, USA
+!> \ingroup lartg
 !
 !> \par Further Details:
 !  =====================
 !>
 !> \verbatim
 !>
+!> Based on the algorithm from
+!>
 !>  Anderson E. (2017)
 !>  Algorithm 978: Safe Scaling in the Level 1 BLAS
 !>  ACM Trans Math Softw 44:1--28
@@ -117,9 +115,10 @@
 subroutine CLARTG( f, g, c, s, r )
    use LA_CONSTANTS, &
    only: wp=>sp, zero=>szero, one=>sone, two=>stwo, czero, &
-         rtmin=>srtmin, rtmax=>srtmax, safmin=>ssafmin, safmax=>ssafmax
+         safmin=>ssafmin, safmax=>ssafmax
+   implicit none
 !
-!  -- LAPACK auxiliary routine (version 3.10.0) --
+!  -- LAPACK auxiliary routine --
 !  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 !  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 !     February 2021
@@ -129,7 +128,7 @@ subroutine CLARTG( f, g, c, s, r )
    complex(wp)        f, g, r, s
 !  ..
 !  .. Local Scalars ..
-   real(wp) :: d, f1, f2, g1, g2, h2, p, u, uu, v, vv, w
+   real(wp) :: d, f1, f2, g1, g2, h2, u, v, w, rtmin, rtmax
    complex(wp) :: fs, gs, t
 !  ..
 !  .. Intrinsic Functions ..
@@ -141,6 +140,9 @@ subroutine CLARTG( f, g, c, s, r )
 !  .. Statement Function definitions ..
    ABSSQ( t ) = real( t )**2 + aimag( t )**2
 !  ..
+!  .. Constants ..
+   rtmin = sqrt( safmin )
+!  ..
 !  .. Executable Statements ..
 !
    if( g == czero ) then
@@ -149,30 +151,43 @@ subroutine CLARTG( f, g, c, s, r )
       r = f
    else if( f == czero ) then
       c = zero
-      g1 = max( abs(real(g)), abs(aimag(g)) )
-      if( g1 > rtmin .and. g1 < rtmax ) then
+      if( real(g) == zero ) then
+         r = abs(aimag(g))
+         s = conjg( g ) / r
+      elseif( aimag(g) == zero ) then
+         r = abs(real(g))
+         s = conjg( g ) / r
+      else
+         g1 = max( abs(real(g)), abs(aimag(g)) )
+         rtmax = sqrt( safmax/2 )
+         if( g1 > rtmin .and. g1 < rtmax ) then
 !
 !        Use unscaled algorithm
 !
-         g2 = ABSSQ( g )
-         d = sqrt( g2 )
-         s = conjg( g ) / d
-         r = d
-      else
+!           The following two lines can be replaced by `d = abs( g )`.
+!           This algorithm do not use the intrinsic complex abs.
+            g2 = ABSSQ( g )
+            d = sqrt( g2 )
+            s = conjg( g ) / d
+            r = d
+         else
 !
 !        Use scaled algorithm
 !
-         u = min( safmax, max( safmin, g1 ) )
-         uu = one / u
-         gs = g*uu
-         g2 = ABSSQ( gs )
-         d = sqrt( g2 )
-         s = conjg( gs ) / d
-         r = d*u
+            u = min( safmax, max( safmin, g1 ) )
+            gs = g / u
+!           The following two lines can be replaced by `d = abs( gs )`.
+!           This algorithm do not use the intrinsic complex abs.
+            g2 = ABSSQ( gs )
+            d = sqrt( g2 )
+            s = conjg( gs ) / d
+            r = d*u
+         end if
       end if
    else
       f1 = max( abs(real(f)), abs(aimag(f)) )
       g1 = max( abs(real(g)), abs(aimag(g)) )
+      rtmax = sqrt( safmax/4 )
       if( f1 > rtmin .and. f1 < rtmax .and. &
           g1 > rtmin .and. g1 < rtmax ) then
 !
@@ -181,32 +196,51 @@ subroutine CLARTG( f, g, c, s, r )
          f2 = ABSSQ( f )
          g2 = ABSSQ( g )
          h2 = f2 + g2
-         if( f2 > rtmin .and. h2 < rtmax ) then
-            d = sqrt( f2*h2 )
+         ! safmin <= f2 <= h2 <= safmax
+         if( f2 >= h2 * safmin ) then
+            ! safmin <= f2/h2 <= 1, and h2/f2 is finite
+            c = sqrt( f2 / h2 )
+            r = f / c
+            rtmax = rtmax * 2
+            if( f2 > rtmin .and. h2 < rtmax ) then
+               ! safmin <= sqrt( f2*h2 ) <= safmax
+               s = conjg( g ) * ( f / sqrt( f2*h2 ) )
+            else
+               s = conjg( g ) * ( r / h2 )
+            end if
          else
-            d = sqrt( f2 )*sqrt( h2 )
+            ! f2/h2 <= safmin may be subnormal, and h2/f2 may overflow.
+            ! Moreover,
+            !  safmin <= f2*f2 * safmax < f2 * h2 < h2*h2 * safmin <= safmax,
+            !  sqrt(safmin) <= sqrt(f2 * h2) <= sqrt(safmax).
+            ! Also,
+            !  g2 >> f2, which means that h2 = g2.
+            d = sqrt( f2 * h2 )
+            c = f2 / d
+            if( c >= safmin ) then
+               r = f / c
+            else
+               ! f2 / sqrt(f2 * h2) < safmin, then
+               !  sqrt(safmin) <= f2 * sqrt(safmax) <= h2 / sqrt(f2 * h2) <= h2 * (safmin / f2) <= h2 <= safmax
+               r = f * ( h2 / d )
+            end if
+            s = conjg( g ) * ( f / d )
          end if
-         p = 1 / d
-         c = f2*p
-         s = conjg( g )*( f*p )
-         r = f*( h2*p )
       else
 !
 !        Use scaled algorithm
 !
          u = min( safmax, max( safmin, f1, g1 ) )
-         uu = one / u
-         gs = g*uu
+         gs = g / u
          g2 = ABSSQ( gs )
-         if( f1*uu < rtmin ) then
+         if( f1 / u < rtmin ) then
 !
 !           f is not well-scaled when scaled by g1.
 !           Use a different scaling for f.
 !
             v = min( safmax, max( safmin, f1 ) )
-            vv = one / v
-            w = v * uu
-            fs = f*vv
+            w = v / u
+            fs = f / v
             f2 = ABSSQ( fs )
             h2 = f2*w**2 + g2
          else
@@ -214,19 +248,43 @@ subroutine CLARTG( f, g, c, s, r )
 !           Otherwise use the same scaling for f and g.
 !
             w = one
-            fs = f*uu
+            fs = f / u
             f2 = ABSSQ( fs )
             h2 = f2 + g2
          end if
-         if( f2 > rtmin .and. h2 < rtmax ) then
-            d = sqrt( f2*h2 )
+         ! safmin <= f2 <= h2 <= safmax
+         if( f2 >= h2 * safmin ) then
+            ! safmin <= f2/h2 <= 1, and h2/f2 is finite
+            c = sqrt( f2 / h2 )
+            r = fs / c
+            rtmax = rtmax * 2
+            if( f2 > rtmin .and. h2 < rtmax ) then
+               ! safmin <= sqrt( f2*h2 ) <= safmax
+               s = conjg( gs ) * ( fs / sqrt( f2*h2 ) )
+            else
+               s = conjg( gs ) * ( r / h2 )
+            end if
          else
-            d = sqrt( f2 )*sqrt( h2 )
+            ! f2/h2 <= safmin may be subnormal, and h2/f2 may overflow.
+            ! Moreover,
+            !  safmin <= f2*f2 * safmax < f2 * h2 < h2*h2 * safmin <= safmax,
+            !  sqrt(safmin) <= sqrt(f2 * h2) <= sqrt(safmax).
+            ! Also,
+            !  g2 >> f2, which means that h2 = g2.
+            d = sqrt( f2 * h2 )
+            c = f2 / d
+            if( c >= safmin ) then
+               r = fs / c
+            else
+               ! f2 / sqrt(f2 * h2) < safmin, then
+               !  sqrt(safmin) <= f2 * sqrt(safmax) <= h2 / sqrt(f2 * h2) <= h2 * (safmin / f2) <= h2 <= safmax
+               r = fs * ( h2 / d )
+            end if
+            s = conjg( gs ) * ( fs / d )
          end if
-         p = 1 / d
-         c = ( f2*p )*w
-         s = conjg( gs )*( fs*p )
-         r = ( fs*( h2*p ) )*u
+         ! Rescale c and r
+         c = c * w
+         r = r * u
       end if
    end if
    return
diff --git a/SRC/clartv.f b/SRC/clartv.f
index 08999bf36b..4eadcabb29 100644
--- a/SRC/clartv.f
+++ b/SRC/clartv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLARTV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clartv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clartv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -100,10 +98,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lartv
 *
 *  =====================================================================
       SUBROUTINE CLARTV( N, X, INCX, Y, INCY, C, S, INCC )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clarz.f b/SRC/clarz.f
index 0a40b40f50..df5bf8014d 100644
--- a/SRC/clarz.f
+++ b/SRC/clarz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLARZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -129,7 +127,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup larz
 *
 *> \par Contributors:
 *  ==================
@@ -144,6 +142,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CLARZ( SIDE, M, N, L, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -166,7 +165,8 @@ SUBROUTINE CLARZ( SIDE, M, N, L, V, INCV, TAU, C, LDC, WORK )
      $                   ZERO = ( 0.0E+0, 0.0E+0 ) )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CGEMV, CGERC, CGERU, CLACGV
+      EXTERNAL           CAXPY, CCOPY, CGEMV, CGERC, CGERU,
+     $                   CLACGV
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -187,7 +187,8 @@ SUBROUTINE CLARZ( SIDE, M, N, L, V, INCV, TAU, C, LDC, WORK )
 *
 *           w( 1:n ) = conjg( w( 1:n ) + C( m-l+1:m, 1:n )**H * v( 1:l ) )
 *
-            CALL CGEMV( 'Conjugate transpose', L, N, ONE, C( M-L+1, 1 ),
+            CALL CGEMV( 'Conjugate transpose', L, N, ONE, C( M-L+1,
+     $                  1 ),
      $                  LDC, V, INCV, ONE, WORK, 1 )
             CALL CLACGV( N, WORK, 1 )
 *
@@ -214,7 +215,8 @@ SUBROUTINE CLARZ( SIDE, M, N, L, V, INCV, TAU, C, LDC, WORK )
 *
 *           w( 1:m ) = w( 1:m ) + C( 1:m, n-l+1:n, 1:n ) * v( 1:l )
 *
-            CALL CGEMV( 'No transpose', M, L, ONE, C( 1, N-L+1 ), LDC,
+            CALL CGEMV( 'No transpose', M, L, ONE, C( 1, N-L+1 ),
+     $                  LDC,
      $                  V, INCV, ONE, WORK, 1 )
 *
 *           C( 1:m, 1 ) = C( 1:m, 1 ) - tau * w( 1:m )
diff --git a/SRC/clarzb.f b/SRC/clarzb.f
index 97d7b0e40c..59e7dee2e2 100644
--- a/SRC/clarzb.f
+++ b/SRC/clarzb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLARZB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarzb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarzb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -164,7 +162,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup larzb
 *
 *> \par Contributors:
 *  ==================
@@ -180,6 +178,7 @@
 *  =====================================================================
       SUBROUTINE CLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
      $                   LDV, T, LDT, C, LDC, WORK, LDWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -257,7 +256,8 @@ SUBROUTINE CLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
 *
 *        W( 1:n, 1:k ) = W( 1:n, 1:k ) * T**T  or  W( 1:m, 1:k ) * T
 *
-         CALL CTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K, ONE, T,
+         CALL CTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K, ONE,
+     $               T,
      $               LDT, WORK, LDWORK )
 *
 *        C( 1:k, 1:n ) = C( 1:k, 1:n ) - W( 1:n, 1:k )**H
@@ -272,7 +272,8 @@ SUBROUTINE CLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
 *                            V( 1:k, 1:l )**H * W( 1:n, 1:k )**H
 *
          IF( L.GT.0 )
-     $      CALL CGEMM( 'Transpose', 'Transpose', L, N, K, -ONE, V, LDV,
+     $      CALL CGEMM( 'Transpose', 'Transpose', L, N, K, -ONE, V,
+     $                  LDV,
      $                  WORK, LDWORK, ONE, C( M-L+1, 1 ), LDC )
 *
       ELSE IF( LSAME( SIDE, 'R' ) ) THEN
@@ -298,7 +299,8 @@ SUBROUTINE CLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
          DO 50 J = 1, K
             CALL CLACGV( K-J+1, T( J, J ), 1 )
    50    CONTINUE
-         CALL CTRMM( 'Right', 'Lower', TRANS, 'Non-unit', M, K, ONE, T,
+         CALL CTRMM( 'Right', 'Lower', TRANS, 'Non-unit', M, K, ONE,
+     $               T,
      $               LDT, WORK, LDWORK )
          DO 60 J = 1, K
             CALL CLACGV( K-J+1, T( J, J ), 1 )
@@ -319,7 +321,8 @@ SUBROUTINE CLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
             CALL CLACGV( K, V( 1, J ), 1 )
    90    CONTINUE
          IF( L.GT.0 )
-     $      CALL CGEMM( 'No transpose', 'No transpose', M, L, K, -ONE,
+     $      CALL CGEMM( 'No transpose', 'No transpose', M, L, K,
+     $                  -ONE,
      $                  WORK, LDWORK, V, LDV, ONE, C( 1, N-L+1 ), LDC )
          DO 100 J = 1, L
             CALL CLACGV( K, V( 1, J ), 1 )
diff --git a/SRC/clarzt.f b/SRC/clarzt.f
index b21bc6f1ad..772308572c 100644
--- a/SRC/clarzt.f
+++ b/SRC/clarzt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLARZT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clarzt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clarzt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,7 +131,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup larzt
 *
 *> \par Contributors:
 *  ==================
@@ -182,6 +180,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CLARZT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clascl.f b/SRC/clascl.f
index 399af23a4b..65cfe7e3d8 100644
--- a/SRC/clascl.f
+++ b/SRC/clascl.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLASCL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clascl.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clascl.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -136,10 +134,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lascl
 *
 *  =====================================================================
-      SUBROUTINE CLASCL( TYPE, KL, KU, CFROM, CTO, M, N, A, LDA, INFO )
+      SUBROUTINE CLASCL( TYPE, KL, KU, CFROM, CTO, M, N, A, LDA,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -272,6 +272,8 @@ SUBROUTINE CLASCL( TYPE, KL, KU, CFROM, CTO, M, N, A, LDA, INFO )
          ELSE
             MUL = CTOC / CFROMC
             DONE = .TRUE.
+            IF (MUL .EQ. ONE)
+     $         RETURN
          END IF
       END IF
 *
diff --git a/SRC/clascl2.f b/SRC/clascl2.f
index 2ae27975c5..bb450f8a54 100644
--- a/SRC/clascl2.f
+++ b/SRC/clascl2.f
@@ -1,11 +1,10 @@
-*> \brief \b CLASCL2 performs diagonal scaling on a vector.
+*> \brief \b CLASCL2 performs diagonal scaling on a matrix.
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLASCL2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clascl2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clascl2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -34,9 +32,9 @@
 *>
 *> \verbatim
 *>
-*> CLASCL2 performs a diagonal scaling on a vector:
+*> CLASCL2 performs a diagonal scaling on a matrix:
 *>   x <-- D * x
-*> where the diagonal REAL matrix D is stored as a vector.
+*> where the diagonal REAL matrix D is stored as a matrix.
 *>
 *> Eventually to be replaced by BLAS_cge_diag_scale in the new BLAS
 *> standard.
@@ -66,14 +64,14 @@
 *> \param[in,out] X
 *> \verbatim
 *>          X is COMPLEX array, dimension (LDX,N)
-*>     On entry, the vector X to be scaled by D.
-*>     On exit, the scaled vector.
+*>     On entry, the matrix X to be scaled by D.
+*>     On exit, the scaled matrix.
 *> \endverbatim
 *>
 *> \param[in] LDX
 *> \verbatim
 *>          LDX is INTEGER
-*>     The leading dimension of the vector X. LDX >= M.
+*>     The leading dimension of the matrix X. LDX >= M.
 *> \endverbatim
 *
 *  Authors:
@@ -84,10 +82,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup lascl2
 *
 *  =====================================================================
       SUBROUTINE CLASCL2 ( M, N, D, X, LDX )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/claset.f b/SRC/claset.f
index d1a6779d34..088cebeded 100644
--- a/SRC/claset.f
+++ b/SRC/claset.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLASET + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claset.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claset.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -99,10 +97,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup laset
 *
 *  =====================================================================
       SUBROUTINE CLASET( UPLO, M, N, ALPHA, BETA, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clasr.f b/SRC/clasr.f
index 71fc7521f7..c1563a87dc 100644
--- a/SRC/clasr.f
+++ b/SRC/clasr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLASR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clasr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clasr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -193,10 +191,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lasr
 *
 *  =====================================================================
       SUBROUTINE CLASR( SIDE, PIVOT, DIRECT, M, N, C, S, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -237,12 +236,14 @@ SUBROUTINE CLASR( SIDE, PIVOT, DIRECT, M, N, C, S, A, LDA )
 *     Test the input parameters
 *
       INFO = 0
-      IF( .NOT.( LSAME( SIDE, 'L' ) .OR. LSAME( SIDE, 'R' ) ) ) THEN
+      IF( .NOT.( LSAME( SIDE, 'L' ) .OR.
+     $    LSAME( SIDE, 'R' ) ) ) THEN
          INFO = 1
       ELSE IF( .NOT.( LSAME( PIVOT, 'V' ) .OR. LSAME( PIVOT,
      $         'T' ) .OR. LSAME( PIVOT, 'B' ) ) ) THEN
          INFO = 2
-      ELSE IF( .NOT.( LSAME( DIRECT, 'F' ) .OR. LSAME( DIRECT, 'B' ) ) )
+      ELSE IF( .NOT.( LSAME( DIRECT, 'F' ) .OR.
+     $         LSAME( DIRECT, 'B' ) ) )
      $          THEN
          INFO = 3
       ELSE IF( M.LT.0 ) THEN
diff --git a/SRC/classq.f90 b/SRC/classq.f90
index cb4e7971f0..55710d5e4c 100644
--- a/SRC/classq.f90
+++ b/SRC/classq.f90
@@ -5,7 +5,6 @@
 ! Online html documentation available at
 !            http://www.netlib.org/lapack/explore-html/
 !
-!> \htmlonly
 !> Download CLASSQ + dependencies
 !> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/classq.f90">
 !> [TGZ]</a>
@@ -13,7 +12,6 @@
 !> [ZIP]</a>
 !> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/classq.f90">
 !> [TXT]</a>
-!> \endhtmlonly
 !
 !  Definition:
 !  ===========
@@ -34,28 +32,15 @@
 !>
 !> \verbatim
 !>
-!> CLASSQ  returns the values  scl  and  smsq  such that
+!> CLASSQ returns the values scale_out and sumsq_out such that
 !>
-!>    ( scl**2 )*smsq = x( 1 )**2 +...+ x( n )**2 + ( scale**2 )*sumsq,
+!>    (scale_out**2)*sumsq_out = x( 1 )**2 +...+ x( n )**2 + (scale**2)*sumsq,
 !>
-!> where  x( i ) = X( 1 + ( i - 1 )*INCX ). The value of  sumsq  is
+!> where x( i ) = X( 1 + ( i - 1 )*INCX ). The value of sumsq is
 !> assumed to be non-negative.
 !>
 !> scale and sumsq must be supplied in SCALE and SUMSQ and
-!> scl and smsq are overwritten on SCALE and SUMSQ respectively.
-!>
-!> If scale * sqrt( sumsq ) > tbig then
-!>    we require:   scale >= sqrt( TINY*EPS ) / sbig   on entry,
-!> and if 0 < scale * sqrt( sumsq ) < tsml then
-!>    we require:   scale <= sqrt( HUGE ) / ssml       on entry,
-!> where
-!>    tbig -- upper threshold for values whose square is representable;
-!>    sbig -- scaling constant for big numbers; \see la_constants.f90
-!>    tsml -- lower threshold for values whose square is representable;
-!>    ssml -- scaling constant for small numbers; \see la_constants.f90
-!> and
-!>    TINY*EPS -- tiniest representable number;
-!>    HUGE     -- biggest representable number.
+!> scale_out and sumsq_out are overwritten on SCALE and SUMSQ respectively.
 !>
 !> \endverbatim
 !
@@ -72,7 +57,7 @@
 !> \verbatim
 !>          X is COMPLEX array, dimension (1+(N-1)*abs(INCX))
 !>          The vector for which a scaled sum of squares is computed.
-!>             x( i )  = X( 1 + ( i - 1 )*INCX ), 1 <= i <= n.
+!>             x( i ) = X( 1 + ( i - 1 )*INCX ), 1 <= i <= n.
 !> \endverbatim
 !>
 !> \param[in] INCX
@@ -82,24 +67,24 @@
 !>          If INCX > 0, X(1+(i-1)*INCX) = x(i) for 1 <= i <= n
 !>          If INCX < 0, X(1-(n-i)*INCX) = x(i) for 1 <= i <= n
 !>          If INCX = 0, x isn't a vector so there is no need to call
-!>          this subroutine.  If you call it anyway, it will count x(1)
+!>          this subroutine. If you call it anyway, it will count x(1)
 !>          in the vector norm N times.
 !> \endverbatim
 !>
 !> \param[in,out] SCALE
 !> \verbatim
 !>          SCALE is REAL
-!>          On entry, the value  scale  in the equation above.
-!>          On exit, SCALE is overwritten with  scl , the scaling factor
+!>          On entry, the value scale in the equation above.
+!>          On exit, SCALE is overwritten by scale_out, the scaling factor
 !>          for the sum of squares.
 !> \endverbatim
 !>
 !> \param[in,out] SUMSQ
 !> \verbatim
 !>          SUMSQ is REAL
-!>          On entry, the value  sumsq  in the equation above.
-!>          On exit, SUMSQ is overwritten with  smsq , the basic sum of
-!>          squares from which  scl  has been factored out.
+!>          On entry, the value sumsq in the equation above.
+!>          On exit, SUMSQ is overwritten by sumsq_out, the basic sum of
+!>          squares from which scale_out has been factored out.
 !> \endverbatim
 !
 !  Authors:
@@ -130,14 +115,15 @@
 !>
 !> \endverbatim
 !
-!> \ingroup OTHERauxiliary
+!> \ingroup lassq
 !
 !  =====================================================================
-subroutine CLASSQ( n, x, incx, scl, sumsq )
+subroutine CLASSQ( n, x, incx, scale, sumsq )
    use LA_CONSTANTS, &
       only: wp=>sp, zero=>szero, one=>sone, &
             sbig=>ssbig, ssml=>sssml, tbig=>stbig, tsml=>stsml
    use LA_XISNAN
+   implicit none
 !
 !  -- LAPACK auxiliary routine --
 !  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -145,7 +131,7 @@ subroutine CLASSQ( n, x, incx, scl, sumsq )
 !
 !  .. Scalar Arguments ..
    integer :: incx, n
-   real(wp) :: scl, sumsq
+   real(wp) :: scale, sumsq
 !  ..
 !  .. Array Arguments ..
    complex(wp) :: x(*)
@@ -158,10 +144,10 @@ subroutine CLASSQ( n, x, incx, scl, sumsq )
 !
 !  Quick return if possible
 !
-   if( LA_ISNAN(scl) .or. LA_ISNAN(sumsq) ) return
-   if( sumsq == zero ) scl = one
-   if( scl == zero ) then
-      scl = one
+   if( LA_ISNAN(scale) .or. LA_ISNAN(sumsq) ) return
+   if( sumsq == zero ) scale = one
+   if( scale == zero ) then
+      scale = one
       sumsq = zero
    end if
    if (n <= 0) then
@@ -207,15 +193,27 @@ subroutine CLASSQ( n, x, incx, scl, sumsq )
 !  Put the existing sum of squares into one of the accumulators
 !
    if( sumsq > zero ) then
-      ax = scl*sqrt( sumsq )
+      ax = scale*sqrt( sumsq )
       if (ax > tbig) then
-!        We assume scl >= sqrt( TINY*EPS ) / sbig
-         abig = abig + (scl*sbig)**2 * sumsq
+         if (scale > one) then
+            scale = scale * sbig
+            abig = abig + scale * (scale * sumsq)
+         else
+            ! sumsq > tbig^2 => (sbig * (sbig * sumsq)) is representable
+            abig = abig + scale * (scale * (sbig * (sbig * sumsq)))
+         end if
       else if (ax < tsml) then
-!        We assume scl <= sqrt( HUGE ) / ssml
-         if (notbig) asml = asml + (scl*ssml)**2 * sumsq
+         if (notbig) then
+            if (scale < one) then
+               scale = scale * ssml
+               asml = asml + scale * (scale * sumsq)
+            else
+               ! sumsq < tsml^2 => (ssml * (ssml * sumsq)) is representable
+               asml = asml + scale * (scale * (ssml * (ssml * sumsq)))
+            end if
+         end if
       else
-         amed = amed + scl**2 * sumsq
+         amed = amed + scale * (scale * sumsq)
       end if
    end if
 !
@@ -229,7 +227,7 @@ subroutine CLASSQ( n, x, incx, scl, sumsq )
       if (amed > zero .or. LA_ISNAN(amed)) then
          abig = abig + (amed*sbig)*sbig
       end if
-      scl = one / sbig
+      scale = one / sbig
       sumsq = abig
    else if (asml > zero) then
 !
@@ -245,17 +243,17 @@ subroutine CLASSQ( n, x, incx, scl, sumsq )
             ymin = asml
             ymax = amed
          end if
-         scl = one
+         scale = one
          sumsq = ymax**2*( one + (ymin/ymax)**2 )
       else
-         scl = one / ssml
+         scale = one / ssml
          sumsq = asml
       end if
    else
 !
 !     Otherwise all values are mid-range or zero
 !
-      scl = one
+      scale = one
       sumsq = amed
    end if
    return
diff --git a/SRC/claswlq.f b/SRC/claswlq.f
index 37089c2300..835c679447 100644
--- a/SRC/claswlq.f
+++ b/SRC/claswlq.f
@@ -60,7 +60,7 @@
 *> \verbatim
 *>          NB is INTEGER
 *>          The column block size to be used in the blocked QR.
-*>          NB > M.
+*>          NB > 0.
 *> \endverbatim
 *>
 *> \param[in,out] A
@@ -96,21 +96,24 @@
 *>          The leading dimension of the array T.  LDT >= MB.
 *> \endverbatim
 *>
-*>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) COMPLEX array, dimension (MAX(1,LWORK))
-*>
+*>          (workspace) COMPLEX array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
+*>
 *> \param[in] LWORK
 *> \verbatim
-*>          The dimension of the array WORK.  LWORK >= MB*M.
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= MB*M, otherwise.
+*>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
+*>          only calculates the minimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
-*>
 *> \endverbatim
+*>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
@@ -158,40 +161,43 @@
 *>     SIAM J. Sci. Comput, vol. 34, no. 1, 2012
 *> \endverbatim
 *>
+*> \ingroup laswlq
+*>
 *  =====================================================================
       SUBROUTINE CLASWLQ( M, N, MB, NB, A, LDA, T, LDT, WORK, LWORK,
-     $                  INFO)
+     $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd. --
 *
 *     .. Scalar Arguments ..
-      INTEGER           INFO, LDA, M, N, MB, NB, LWORK, LDT
+      INTEGER            INFO, LDA, M, N, MB, NB, LWORK, LDT
 *     ..
 *     .. Array Arguments ..
-      COMPLEX           A( LDA, * ), WORK( * ), T( LDT, *)
+      COMPLEX            A( LDA, * ), WORK( * ), T( LDT, * )
 *     ..
 *
 *  =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
-      LOGICAL    LQUERY
-      INTEGER    I, II, KK, CTR
+      LOGICAL            LQUERY
+      INTEGER            I, II, KK, CTR, MINMN, LWMIN
 *     ..
 *     .. EXTERNAL FUNCTIONS ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      INTEGER            ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
+*     ..
 *     .. EXTERNAL SUBROUTINES ..
       EXTERNAL           CGELQT, CTPLQT, XERBLA
+*     ..
 *     .. INTRINSIC FUNCTIONS ..
       INTRINSIC          MAX, MIN, MOD
 *     ..
-*     .. EXTERNAL FUNCTIONS ..
-      INTEGER            ILAENV
-      EXTERNAL           ILAENV
-*     ..
 *     .. EXECUTABLE STATEMENTS ..
 *
 *     TEST THE INPUT ARGUMENTS
@@ -199,73 +205,81 @@ SUBROUTINE CLASWLQ( M, N, MB, NB, A, LDA, T, LDT, WORK, LWORK,
       INFO = 0
 *
       LQUERY = ( LWORK.EQ.-1 )
+*
+      MINMN = MIN( M, N )
+      IF( MINMN.EQ.0 ) THEN
+        LWMIN = 1
+      ELSE
+        LWMIN = M*MB
+      END IF
 *
       IF( M.LT.0 ) THEN
         INFO = -1
       ELSE IF( N.LT.0 .OR. N.LT.M ) THEN
         INFO = -2
-      ELSE IF( MB.LT.1 .OR. ( MB.GT.M .AND. M.GT.0 )) THEN
+      ELSE IF( MB.LT.1 .OR. ( MB.GT.M .AND. M.GT.0 ) ) THEN
         INFO = -3
-      ELSE IF( NB.LE.M ) THEN
+      ELSE IF( NB.LE.0 ) THEN
         INFO = -4
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-        INFO = -5
+        INFO = -6
       ELSE IF( LDT.LT.MB ) THEN
         INFO = -8
-      ELSE IF( ( LWORK.LT.M*MB) .AND. (.NOT.LQUERY) ) THEN
+      ELSE IF( LWORK.LT.LWMIN .AND. (.NOT.LQUERY) ) THEN
         INFO = -10
       END IF
-      IF( INFO.EQ.0)  THEN
-      WORK(1) = MB*M
+*
+      IF( INFO.EQ.0 ) THEN
+        WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       END IF
 *
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'CLASWLQ', -INFO )
         RETURN
-      ELSE IF (LQUERY) THEN
-       RETURN
+      ELSE IF( LQUERY ) THEN
+        RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( MIN(M,N).EQ.0 ) THEN
-          RETURN
+      IF( MINMN.EQ.0 ) THEN
+        RETURN
       END IF
 *
 *     The LQ Decomposition
 *
-       IF((M.GE.N).OR.(NB.LE.M).OR.(NB.GE.N)) THEN
+      IF( (M.GE.N) .OR. (NB.LE.M) .OR. (NB.GE.N) ) THEN
         CALL CGELQT( M, N, MB, A, LDA, T, LDT, WORK, INFO)
         RETURN
-       END IF
+      END IF
 *
-       KK = MOD((N-M),(NB-M))
-       II=N-KK+1
+      KK = MOD((N-M),(NB-M))
+      II = N-KK+1
 *
-*      Compute the LQ factorization of the first block A(1:M,1:NB)
+*     Compute the LQ factorization of the first block A(1:M,1:NB)
 *
-       CALL CGELQT( M, NB, MB, A(1,1), LDA, T, LDT, WORK, INFO)
-       CTR = 1
+      CALL CGELQT( M, NB, MB, A(1,1), LDA, T, LDT, WORK, INFO)
+      CTR = 1
 *
-       DO I = NB+1, II-NB+M , (NB-M)
+      DO I = NB+1, II-NB+M , (NB-M)
 *
-*      Compute the QR factorization of the current block A(1:M,I:I+NB-M)
+*       Compute the QR factorization of the current block A(1:M,I:I+NB-M)
 *
-         CALL CTPLQT( M, NB-M, 0, MB, A(1,1), LDA, A( 1, I ),
+        CALL CTPLQT( M, NB-M, 0, MB, A(1,1), LDA, A( 1, I ),
      $                  LDA, T(1,CTR*M+1),
      $                  LDT, WORK, INFO )
-         CTR = CTR + 1
-       END DO
+        CTR = CTR + 1
+      END DO
 *
 *     Compute the QR factorization of the last block A(1:M,II:N)
 *
-       IF (II.LE.N) THEN
+      IF( II.LE.N ) THEN
         CALL CTPLQT( M, KK, 0, MB, A(1,1), LDA, A( 1, II ),
      $                  LDA, T(1,CTR*M+1), LDT,
      $                  WORK, INFO )
-       END IF
+      END IF
 *
-      WORK( 1 ) = M * MB
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       RETURN
 *
 *     End of CLASWLQ
diff --git a/SRC/claswp.f b/SRC/claswp.f
index 60af6f664d..111352cb3d 100644
--- a/SRC/claswp.f
+++ b/SRC/claswp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLASWP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claswp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claswp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -99,7 +97,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup laswp
 *
 *> \par Further Details:
 *  =====================
@@ -112,6 +110,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CLASWP( N, A, LDA, K1, K2, IPIV, INCX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clasyf.f b/SRC/clasyf.f
index e6666cfed6..926c62de68 100644
--- a/SRC/clasyf.f
+++ b/SRC/clasyf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLASYF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clasyf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clasyf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,7 +158,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup lahef
 *
 *> \par Contributors:
 *  ==================
@@ -173,7 +171,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE CLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
+      SUBROUTINE CLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -199,7 +199,7 @@ SUBROUTINE CLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
       PARAMETER          ( CONE = ( 1.0E+0, 0.0E+0 ) )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            IMAX, J, JB, JJ, JMAX, JP, K, KK, KKW, KP,
+      INTEGER            IMAX, J, JJ, JMAX, JP, K, KK, KKW, KP,
      $                   KSTEP, KW
       REAL               ABSAKK, ALPHA, COLMAX, ROWMAX
       COMPLEX            D11, D21, D22, R1, T, Z
@@ -210,7 +210,7 @@ SUBROUTINE CLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
       EXTERNAL           LSAME, ICAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CGEMM, CGEMV, CSCAL, CSWAP
+      EXTERNAL           CCOPY, CGEMMTR, CGEMV, CSCAL, CSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MAX, MIN, REAL, SQRT
@@ -252,7 +252,8 @@ SUBROUTINE CLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
          CALL CCOPY( K, A( 1, K ), 1, W( 1, KW ), 1 )
          IF( K.LT.N )
-     $      CALL CGEMV( 'No transpose', K, N-K, -CONE, A( 1, K+1 ), LDA,
+     $      CALL CGEMV( 'No transpose', K, N-K, -CONE, A( 1, K+1 ),
+     $                  LDA,
      $                  W( K, KW+1 ), LDW, CONE, W( 1, KW ), 1 )
 *
          KSTEP = 1
@@ -480,25 +481,9 @@ SUBROUTINE CLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *        A11 := A11 - U12*D*U12**T = A11 - U12*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 50 J = ( ( K-1 ) / NB )*NB + 1, 1, -NB
-            JB = MIN( NB, K-J+1 )
-*
-*           Update the upper triangle of the diagonal block
-*
-            DO 40 JJ = J, J + JB - 1
-               CALL CGEMV( 'No transpose', JJ-J+1, N-K, -CONE,
-     $                     A( J, K+1 ), LDA, W( JJ, KW+1 ), LDW, CONE,
-     $                     A( J, JJ ), 1 )
-   40       CONTINUE
-*
-*           Update the rectangular superdiagonal block
-*
-            CALL CGEMM( 'No transpose', 'Transpose', J-1, JB, N-K,
-     $                  -CONE, A( 1, K+1 ), LDA, W( J, KW+1 ), LDW,
-     $                  CONE, A( 1, J ), LDA )
-   50    CONTINUE
+         CALL CGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
+     $                 -CONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
+     $                 CONE, A( 1, 1 ), LDA )
 *
 *        Put U12 in standard form by partially undoing the interchanges
 *        in columns k+1:n looping backwards from k+1 to n
@@ -548,7 +533,8 @@ SUBROUTINE CLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *        Copy column K of A to column K of W and update it
 *
          CALL CCOPY( N-K+1, A( K, K ), 1, W( K, K ), 1 )
-         CALL CGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K, 1 ), LDA,
+         CALL CGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K, 1 ),
+     $               LDA,
      $               W( K, 1 ), LDW, CONE, W( K, K ), 1 )
 *
          KSTEP = 1
@@ -586,10 +572,13 @@ SUBROUTINE CLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *              Copy column IMAX to column K+1 of W and update it
 *
-               CALL CCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1 )
-               CALL CCOPY( N-IMAX+1, A( IMAX, IMAX ), 1, W( IMAX, K+1 ),
+               CALL CCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                     1 )
+               CALL CCOPY( N-IMAX+1, A( IMAX, IMAX ), 1, W( IMAX,
+     $                     K+1 ),
      $                     1 )
-               CALL CGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K, 1 ),
+               CALL CGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K,
+     $                     1 ),
      $                     LDA, W( IMAX, 1 ), LDW, CONE, W( K, K+1 ),
      $                     1 )
 *
@@ -648,7 +637,8 @@ SUBROUTINE CLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
                CALL CCOPY( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
      $                     LDA )
                IF( KP.LT.N )
-     $            CALL CCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL CCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
 *
 *              Interchange rows KK and KP in first K-1 columns of A
 *              (columns K (or K and K+1 for 2-by-2 pivot) of A will be
@@ -771,26 +761,9 @@ SUBROUTINE CLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *        A22 := A22 - L21*D*L21**T = A22 - L21*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 110 J = K, N, NB
-            JB = MIN( NB, N-J+1 )
-*
-*           Update the lower triangle of the diagonal block
-*
-            DO 100 JJ = J, J + JB - 1
-               CALL CGEMV( 'No transpose', J+JB-JJ, K-1, -CONE,
-     $                     A( JJ, 1 ), LDA, W( JJ, 1 ), LDW, CONE,
-     $                     A( JJ, JJ ), 1 )
-  100       CONTINUE
-*
-*           Update the rectangular subdiagonal block
-*
-            IF( J+JB.LE.N )
-     $         CALL CGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
-     $                     K-1, -CONE, A( J+JB, 1 ), LDA, W( J, 1 ),
-     $                     LDW, CONE, A( J+JB, J ), LDA )
-  110    CONTINUE
+         CALL CGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
+     $                 K-1, -CONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
+     $                 CONE, A( K, K ), LDA )
 *
 *        Put L21 in standard form by partially undoing the interchanges
 *        of rows in columns 1:k-1 looping backwards from k-1 to 1
diff --git a/SRC/clasyf_aa.f b/SRC/clasyf_aa.f
index d79b06874e..6931a04a0f 100644
--- a/SRC/clasyf_aa.f
+++ b/SRC/clasyf_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLASYF_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clasyf_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clasyf_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -136,7 +134,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup lahef_aa
 *
 *  =====================================================================
       SUBROUTINE CLASYF_AA( UPLO, J1, M, NB, A, LDA, IPIV,
@@ -172,7 +170,8 @@ SUBROUTINE CLASYF_AA( UPLO, J1, M, NB, A, LDA, IPIV,
       EXTERNAL           LSAME, ILAENV, ICAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CGEMV, CSCAL, CCOPY, CSWAP, CLASET,
+      EXTERNAL           CAXPY, CGEMV, CSCAL, CCOPY, CSWAP,
+     $                   CLASET,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
diff --git a/SRC/clasyf_rk.f b/SRC/clasyf_rk.f
index 080a65a121..a9e7364616 100644
--- a/SRC/clasyf_rk.f
+++ b/SRC/clasyf_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLASYF_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clasyf_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clasyf_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -239,7 +237,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup lahef_rk
 *
 *> \par Contributors:
 *  ==================
@@ -259,6 +257,7 @@
 *  =====================================================================
       SUBROUTINE CLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
      $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -298,7 +297,7 @@ SUBROUTINE CLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
       EXTERNAL           LSAME, ICAMAX, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CGEMM, CGEMV, CSCAL, CSWAP
+      EXTERNAL           CCOPY, CGEMMTR, CGEMV, CSCAL, CSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MAX, MIN, REAL, SQRT
@@ -414,7 +413,8 @@ SUBROUTINE CLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column KW-1 of W and update it
 *
-                  CALL CCOPY( IMAX, A( 1, IMAX ), 1, W( 1, KW-1 ), 1 )
+                  CALL CCOPY( IMAX, A( 1, IMAX ), 1, W( 1, KW-1 ),
+     $                        1 )
                   CALL CCOPY( K-IMAX, A( IMAX, IMAX+1 ), LDA,
      $                        W( IMAX+1, KW-1 ), 1 )
 *
@@ -513,7 +513,8 @@ SUBROUTINE CLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *              and last N-K+2 columns of W
 *
                CALL CSWAP( N-K+1, A( K, K ), LDA, A( P, K ), LDA )
-               CALL CSWAP( N-KK+1, W( K, KKW ), LDW, W( P, KKW ), LDW )
+               CALL CSWAP( N-KK+1, W( K, KKW ), LDW, W( P, KKW ),
+     $                     LDW )
             END IF
 *
 *           Updated column KP is already stored in column KKW of W
@@ -530,7 +531,8 @@ SUBROUTINE CLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *              Interchange rows KK and KP in last N-KK+1 columns
 *              of A and W
 *
-               CALL CSWAP( N-KK+1, A( KK, KK ), LDA, A( KP, KK ), LDA )
+               CALL CSWAP( N-KK+1, A( KK, KK ), LDA, A( KP, KK ),
+     $                     LDA )
                CALL CSWAP( N-KK+1, W( KK, KKW ), LDW, W( KP, KKW ),
      $                     LDW )
             END IF
@@ -624,26 +626,9 @@ SUBROUTINE CLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *        A11 := A11 - U12*D*U12**T = A11 - U12*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 50 J = ( ( K-1 ) / NB )*NB + 1, 1, -NB
-            JB = MIN( NB, K-J+1 )
-*
-*           Update the upper triangle of the diagonal block
-*
-            DO 40 JJ = J, J + JB - 1
-               CALL CGEMV( 'No transpose', JJ-J+1, N-K, -CONE,
-     $                     A( J, K+1 ), LDA, W( JJ, KW+1 ), LDW, CONE,
-     $                     A( J, JJ ), 1 )
-   40       CONTINUE
-*
-*           Update the rectangular superdiagonal block
-*
-            IF( J.GE.2 )
-     $         CALL CGEMM( 'No transpose', 'Transpose', J-1, JB,
-     $                     N-K, -CONE, A( 1, K+1 ), LDA, W( J, KW+1 ),
-     $                     LDW, CONE, A( 1, J ), LDA )
-   50    CONTINUE
+         CALL CGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
+     $                 -CONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
+     $                 CONE, A( 1, 1 ), LDA )
 *
 *        Set KB to the number of columns factorized
 *
@@ -737,7 +722,8 @@ SUBROUTINE CLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column K+1 of W and update it
 *
-                  CALL CCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1)
+                  CALL CCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                        1)
                   CALL CCOPY( N-IMAX+1, A( IMAX, IMAX ), 1,
      $                        W( IMAX, K+1 ), 1 )
                   IF( K.GT.1 )
@@ -757,7 +743,8 @@ SUBROUTINE CLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + ICAMAX( N-IMAX, W( IMAX+1, K+1 ), 1)
+                     ITEMP = IMAX + ICAMAX( N-IMAX, W( IMAX+1, K+1 ),
+     $                                      1)
                      STEMP = CABS1( W( ITEMP, K+1 ) )
                      IF( STEMP.GT.ROWMAX ) THEN
                         ROWMAX = STEMP
@@ -779,7 +766,8 @@ SUBROUTINE CLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                    copy column K+1 of W to column K of W
 *
-                     CALL CCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL CCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                      DONE = .TRUE.
 *
@@ -805,7 +793,8 @@ SUBROUTINE CLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                    Copy updated JMAXth (next IMAXth) column to Kth of W
 *
-                     CALL CCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL CCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                   END IF
 *
@@ -840,7 +829,8 @@ SUBROUTINE CLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *              Copy non-updated column KK to column KP
 *
                A( KP, K ) = A( KK, K )
-               CALL CCOPY( KP-K-1, A( K+1, KK ), 1, A( KP, K+1 ), LDA )
+               CALL CCOPY( KP-K-1, A( K+1, KK ), 1, A( KP, K+1 ),
+     $                     LDA )
                CALL CCOPY( N-KP+1, A( KP, KK ), 1, A( KP, KP ), 1 )
 *
 *              Interchange rows KK and KP in first KK columns of A and W
@@ -937,26 +927,9 @@ SUBROUTINE CLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *        A22 := A22 - L21*D*L21**T = A22 - L21*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 110 J = K, N, NB
-            JB = MIN( NB, N-J+1 )
-*
-*           Update the lower triangle of the diagonal block
-*
-            DO 100 JJ = J, J + JB - 1
-               CALL CGEMV( 'No transpose', J+JB-JJ, K-1, -CONE,
-     $                     A( JJ, 1 ), LDA, W( JJ, 1 ), LDW, CONE,
-     $                     A( JJ, JJ ), 1 )
-  100       CONTINUE
-*
-*           Update the rectangular subdiagonal block
-*
-            IF( J+JB.LE.N )
-     $         CALL CGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
-     $                     K-1, -CONE, A( J+JB, 1 ), LDA, W( J, 1 ),
-     $                     LDW, CONE, A( J+JB, J ), LDA )
-  110    CONTINUE
+         CALL CGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
+     $                 K-1, -CONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
+     $                 CONE, A( K, K ), LDA )
 *
 *        Set KB to the number of columns factorized
 *
diff --git a/SRC/clasyf_rook.f b/SRC/clasyf_rook.f
index 40e2cbe944..b0c6440c2f 100644
--- a/SRC/clasyf_rook.f
+++ b/SRC/clasyf_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLASYF_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clasyf_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clasyf_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -161,7 +159,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup lahef_rook
 *
 *> \par Contributors:
 *  ==================
@@ -181,6 +179,7 @@
 *  =====================================================================
       SUBROUTINE CLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
      $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -208,7 +207,7 @@ SUBROUTINE CLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            DONE
-      INTEGER            IMAX, ITEMP, J, JB, JJ, JMAX, JP1, JP2, K, KK,
+      INTEGER            IMAX, ITEMP, J, JJ, JMAX, JP1, JP2, K, KK,
      $                   KW, KKW, KP, KSTEP, P, II
       REAL               ABSAKK, ALPHA, COLMAX, ROWMAX, STEMP, SFMIN
       COMPLEX            D11, D12, D21, D22, R1, T, Z
@@ -220,7 +219,7 @@ SUBROUTINE CLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
       EXTERNAL           LSAME, ICAMAX, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CGEMM, CGEMV, CSCAL, CSWAP
+      EXTERNAL           CCOPY, CGEMMTR, CGEMV, CSCAL, CSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, SQRT, AIMAG, REAL
@@ -325,7 +324,8 @@ SUBROUTINE CLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column KW-1 of W and update it
 *
-                  CALL CCOPY( IMAX, A( 1, IMAX ), 1, W( 1, KW-1 ), 1 )
+                  CALL CCOPY( IMAX, A( 1, IMAX ), 1, W( 1, KW-1 ),
+     $                        1 )
                   CALL CCOPY( K-IMAX, A( IMAX, IMAX+1 ), LDA,
      $                        W( IMAX+1, KW-1 ), 1 )
 *
@@ -424,7 +424,8 @@ SUBROUTINE CLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *              and last N-K+2 columns of W
 *
                CALL CSWAP( N-K+1, A( K, K ), LDA, A( P, K ), LDA )
-               CALL CSWAP( N-KK+1, W( K, KKW ), LDW, W( P, KKW ), LDW )
+               CALL CSWAP( N-KK+1, W( K, KKW ), LDW, W( P, KKW ),
+     $                     LDW )
             END IF
 *
 *           Updated column KP is already stored in column KKW of W
@@ -441,7 +442,8 @@ SUBROUTINE CLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *              Interchange rows KK and KP in last N-KK+1 columns
 *              of A and W
 *
-               CALL CSWAP( N-KK+1, A( KK, KK ), LDA, A( KP, KK ), LDA )
+               CALL CSWAP( N-KK+1, A( KK, KK ), LDA, A( KP, KK ),
+     $                     LDA )
                CALL CSWAP( N-KK+1, W( KK, KKW ), LDW, W( KP, KKW ),
      $                     LDW )
             END IF
@@ -522,26 +524,11 @@ SUBROUTINE CLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *        A11 := A11 - U12*D*U12**T = A11 - U12*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 50 J = ( ( K-1 ) / NB )*NB + 1, 1, -NB
-            JB = MIN( NB, K-J+1 )
-*
-*           Update the upper triangle of the diagonal block
-*
-            DO 40 JJ = J, J + JB - 1
-               CALL CGEMV( 'No transpose', JJ-J+1, N-K, -CONE,
-     $                     A( J, K+1 ), LDA, W( JJ, KW+1 ), LDW, CONE,
-     $                     A( J, JJ ), 1 )
-   40       CONTINUE
-*
-*           Update the rectangular superdiagonal block
+*        (note that conjg(W) is actually stored)
 *
-            IF( J.GE.2 )
-     $         CALL CGEMM( 'No transpose', 'Transpose', J-1, JB,
-     $                  N-K, -CONE, A( 1, K+1 ), LDA, W( J, KW+1 ), LDW,
-     $                  CONE, A( 1, J ), LDA )
-   50    CONTINUE
+         CALL CGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
+     $                 -CONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
+     $                 CONE, A( 1, 1 ), LDA )
 *
 *        Put U12 in standard form by partially undoing the interchanges
 *        in columns k+1:n
@@ -651,7 +638,8 @@ SUBROUTINE CLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column K+1 of W and update it
 *
-                  CALL CCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1)
+                  CALL CCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                        1)
                   CALL CCOPY( N-IMAX+1, A( IMAX, IMAX ), 1,
      $                        W( IMAX, K+1 ), 1 )
                   IF( K.GT.1 )
@@ -671,7 +659,8 @@ SUBROUTINE CLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + ICAMAX( N-IMAX, W( IMAX+1, K+1 ), 1)
+                     ITEMP = IMAX + ICAMAX( N-IMAX, W( IMAX+1, K+1 ),
+     $                                      1)
                      STEMP = CABS1( W( ITEMP, K+1 ) )
                      IF( STEMP.GT.ROWMAX ) THEN
                         ROWMAX = STEMP
@@ -693,7 +682,8 @@ SUBROUTINE CLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                    copy column K+1 of W to column K of W
 *
-                     CALL CCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL CCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                      DONE = .TRUE.
 *
@@ -719,7 +709,8 @@ SUBROUTINE CLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                    Copy updated JMAXth (next IMAXth) column to Kth of W
 *
-                     CALL CCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL CCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                   END IF
 *
@@ -754,7 +745,8 @@ SUBROUTINE CLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *              Copy non-updated column KK to column KP
 *
                A( KP, K ) = A( KK, K )
-               CALL CCOPY( KP-K-1, A( K+1, KK ), 1, A( KP, K+1 ), LDA )
+               CALL CCOPY( KP-K-1, A( K+1, KK ), 1, A( KP, K+1 ),
+     $                     LDA )
                CALL CCOPY( N-KP+1, A( KP, KK ), 1, A( KP, KP ), 1 )
 *
 *              Interchange rows KK and KP in first KK columns of A and W
@@ -838,26 +830,11 @@ SUBROUTINE CLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *        A22 := A22 - L21*D*L21**T = A22 - L21*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 110 J = K, N, NB
-            JB = MIN( NB, N-J+1 )
-*
-*           Update the lower triangle of the diagonal block
-*
-            DO 100 JJ = J, J + JB - 1
-               CALL CGEMV( 'No transpose', J+JB-JJ, K-1, -CONE,
-     $                     A( JJ, 1 ), LDA, W( JJ, 1 ), LDW, CONE,
-     $                     A( JJ, JJ ), 1 )
-  100       CONTINUE
-*
-*           Update the rectangular subdiagonal block
+*        (note that conjg(W) is actually stored)
 *
-            IF( J+JB.LE.N )
-     $         CALL CGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
-     $                    K-1, -CONE, A( J+JB, 1 ), LDA, W( J, 1 ), LDW,
-     $                    CONE, A( J+JB, J ), LDA )
-  110    CONTINUE
+         CALL CGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
+     $                 K-1, -CONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
+     $                 CONE, A( K, K ), LDA )
 *
 *        Put L21 in standard form by partially undoing the interchanges
 *        in columns 1:k-1
diff --git a/SRC/clatbs.f b/SRC/clatbs.f
index 606f963d38..2ab7fcc27f 100644
--- a/SRC/clatbs.f
+++ b/SRC/clatbs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLATBS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clatbs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clatbs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,7 +161,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup latbs
 *
 *> \par Further Details:
 *  =====================
@@ -238,8 +236,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB, X,
+      SUBROUTINE CLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB,
+     $                   X,
      $                   SCALE, CNORM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -274,11 +274,12 @@ SUBROUTINE CLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB, X,
       INTEGER            ICAMAX, ISAMAX
       REAL               SCASUM, SLAMCH
       COMPLEX            CDOTC, CDOTU, CLADIV
-      EXTERNAL           LSAME, ICAMAX, ISAMAX, SCASUM, SLAMCH, CDOTC,
+      EXTERNAL           LSAME, ICAMAX, ISAMAX, SCASUM, SLAMCH,
+     $                   CDOTC,
      $                   CDOTU, CLADIV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CSSCAL, CTBSV, SLABAD, SSCAL, XERBLA
+      EXTERNAL           CAXPY, CSSCAL, CTBSV, SSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, CMPLX, CONJG, MAX, MIN, REAL
@@ -324,17 +325,14 @@ SUBROUTINE CLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB, X,
 *
 *     Quick return if possible
 *
+      SCALE = ONE
       IF( N.EQ.0 )
      $   RETURN
 *
 *     Determine machine dependent parameters to control overflow.
 *
-      SMLNUM = SLAMCH( 'Safe minimum' )
-      BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
-      SMLNUM = SMLNUM / SLAMCH( 'Precision' )
+      SMLNUM = SLAMCH( 'Safe minimum' ) / SLAMCH( 'Precision' )
       BIGNUM = ONE / SMLNUM
-      SCALE = ONE
 *
       IF( LSAME( NORMIN, 'N' ) ) THEN
 *
diff --git a/SRC/clatdf.f b/SRC/clatdf.f
index 5445e387e5..930013595b 100644
--- a/SRC/clatdf.f
+++ b/SRC/clatdf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLATDF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clatdf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clatdf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -134,7 +132,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup latdf
 *
 *> \par Further Details:
 *  =====================
@@ -166,6 +164,7 @@
 *  =====================================================================
       SUBROUTINE CLATDF( IJOB, N, Z, LDZ, RHS, RDSUM, RDSCAL, IPIV,
      $                   JPIV )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -200,7 +199,8 @@ SUBROUTINE CLATDF( IJOB, N, Z, LDZ, RHS, RDSUM, RDSCAL, IPIV,
       COMPLEX            WORK( 4*MAXDIM ), XM( MAXDIM ), XP( MAXDIM )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CGECON, CGESC2, CLASSQ, CLASWP,
+      EXTERNAL           CAXPY, CCOPY, CGECON, CGESC2, CLASSQ,
+     $                   CLASWP,
      $                   CSCAL
 *     ..
 *     .. External Functions ..
@@ -227,12 +227,13 @@ SUBROUTINE CLATDF( IJOB, N, Z, LDZ, RHS, RDSUM, RDSCAL, IPIV,
             BM = RHS( J ) - CONE
             SPLUS = ONE
 *
-*           Lockahead for L- part RHS(1:N-1) = +-1
+*           Look-ahead for L- part RHS(1:N-1) = +-1
 *           SPLUS and SMIN computed more efficiently than in BSOLVE[1].
 *
             SPLUS = SPLUS + REAL( CDOTC( N-J, Z( J+1, J ), 1, Z( J+1,
      $              J ), 1 ) )
-            SMINU = REAL( CDOTC( N-J, Z( J+1, J ), 1, RHS( J+1 ), 1 ) )
+            SMINU = REAL( CDOTC( N-J, Z( J+1, J ), 1, RHS( J+1 ),
+     $                    1 ) )
             SPLUS = SPLUS*REAL( RHS( J ) )
             IF( SPLUS.GT.SMINU ) THEN
                RHS( J ) = BP
diff --git a/SRC/clatps.f b/SRC/clatps.f
index a5578b5d49..a639d27481 100644
--- a/SRC/clatps.f
+++ b/SRC/clatps.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLATPS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clatps.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clatps.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,7 +149,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup latps
 *
 *> \par Further Details:
 *  =====================
@@ -228,6 +226,7 @@
 *  =====================================================================
       SUBROUTINE CLATPS( UPLO, TRANS, DIAG, NORMIN, N, AP, X, SCALE,
      $                   CNORM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -262,11 +261,12 @@ SUBROUTINE CLATPS( UPLO, TRANS, DIAG, NORMIN, N, AP, X, SCALE,
       INTEGER            ICAMAX, ISAMAX
       REAL               SCASUM, SLAMCH
       COMPLEX            CDOTC, CDOTU, CLADIV
-      EXTERNAL           LSAME, ICAMAX, ISAMAX, SCASUM, SLAMCH, CDOTC,
+      EXTERNAL           LSAME, ICAMAX, ISAMAX, SCASUM, SLAMCH,
+     $                   CDOTC,
      $                   CDOTU, CLADIV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CSSCAL, CTPSV, SLABAD, SSCAL, XERBLA
+      EXTERNAL           CAXPY, CSSCAL, CTPSV, SSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, CMPLX, CONJG, MAX, MIN, REAL
@@ -315,7 +315,6 @@ SUBROUTINE CLATPS( UPLO, TRANS, DIAG, NORMIN, N, AP, X, SCALE,
 *
       SMLNUM = SLAMCH( 'Safe minimum' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SMLNUM / SLAMCH( 'Precision' )
       BIGNUM = ONE / SMLNUM
       SCALE = ONE
@@ -660,7 +659,8 @@ SUBROUTINE CLATPS( UPLO, TRANS, DIAG, NORMIN, N, AP, X, SCALE,
 *                    Compute the update
 *                       x(1:j-1) := x(1:j-1) - x(j) * A(1:j-1,j)
 *
-                     CALL CAXPY( J-1, -X( J )*TSCAL, AP( IP-J+1 ), 1, X,
+                     CALL CAXPY( J-1, -X( J )*TSCAL, AP( IP-J+1 ), 1,
+     $                           X,
      $                           1 )
                      I = ICAMAX( J-1, X, 1 )
                      XMAX = CABS1( X( I ) )
diff --git a/SRC/clatrd.f b/SRC/clatrd.f
index 6e9da3b27f..a83e21a518 100644
--- a/SRC/clatrd.f
+++ b/SRC/clatrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLATRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clatrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clatrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -140,7 +138,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup latrd
 *
 *> \par Further Details:
 *  =====================
@@ -196,6 +194,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,7 +222,8 @@ SUBROUTINE CLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
       COMPLEX            ALPHA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CGEMV, CHEMV, CLACGV, CLARFG, CSCAL
+      EXTERNAL           CAXPY, CGEMV, CHEMV, CLACGV, CLARFG,
+     $                   CSCAL
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -256,7 +256,8 @@ SUBROUTINE CLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
      $                     LDA, W( I, IW+1 ), LDW, ONE, A( 1, I ), 1 )
                CALL CLACGV( N-I, W( I, IW+1 ), LDW )
                CALL CLACGV( N-I, A( I, I+1 ), LDA )
-               CALL CGEMV( 'No transpose', I, N-I, -ONE, W( 1, IW+1 ),
+               CALL CGEMV( 'No transpose', I, N-I, -ONE, W( 1,
+     $                     IW+1 ),
      $                     LDW, A( I, I+1 ), LDA, ONE, A( 1, I ), 1 )
                CALL CLACGV( N-I, A( I, I+1 ), LDA )
                A( I, I ) = REAL( A( I, I ) )
@@ -332,17 +333,20 @@ SUBROUTINE CLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
                CALL CGEMV( 'Conjugate transpose', N-I, I-1, ONE,
      $                     W( I+1, 1 ), LDW, A( I+1, I ), 1, ZERO,
      $                     W( 1, I ), 1 )
-               CALL CGEMV( 'No transpose', N-I, I-1, -ONE, A( I+1, 1 ),
+               CALL CGEMV( 'No transpose', N-I, I-1, -ONE, A( I+1,
+     $                     1 ),
      $                     LDA, W( 1, I ), 1, ONE, W( I+1, I ), 1 )
                CALL CGEMV( 'Conjugate transpose', N-I, I-1, ONE,
      $                     A( I+1, 1 ), LDA, A( I+1, I ), 1, ZERO,
      $                     W( 1, I ), 1 )
-               CALL CGEMV( 'No transpose', N-I, I-1, -ONE, W( I+1, 1 ),
+               CALL CGEMV( 'No transpose', N-I, I-1, -ONE, W( I+1,
+     $                     1 ),
      $                     LDW, W( 1, I ), 1, ONE, W( I+1, I ), 1 )
                CALL CSCAL( N-I, TAU( I ), W( I+1, I ), 1 )
                ALPHA = -HALF*TAU( I )*CDOTC( N-I, W( I+1, I ), 1,
      $                 A( I+1, I ), 1 )
-               CALL CAXPY( N-I, ALPHA, A( I+1, I ), 1, W( I+1, I ), 1 )
+               CALL CAXPY( N-I, ALPHA, A( I+1, I ), 1, W( I+1, I ),
+     $                     1 )
             END IF
 *
    20    CONTINUE
diff --git a/SRC/clatrs.f b/SRC/clatrs.f
index 946ab80689..bb8bc868a5 100644
--- a/SRC/clatrs.f
+++ b/SRC/clatrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLATRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clatrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clatrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -159,7 +157,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup latrs
 *
 *> \par Further Details:
 *  =====================
@@ -234,8 +232,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
+      SUBROUTINE CLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X,
+     $                   SCALE,
      $                   CNORM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -270,11 +270,12 @@ SUBROUTINE CLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
       INTEGER            ICAMAX, ISAMAX
       REAL               SCASUM, SLAMCH
       COMPLEX            CDOTC, CDOTU, CLADIV
-      EXTERNAL           LSAME, ICAMAX, ISAMAX, SCASUM, SLAMCH, CDOTC,
+      EXTERNAL           LSAME, ICAMAX, ISAMAX, SCASUM, SLAMCH,
+     $                   CDOTC,
      $                   CDOTU, CLADIV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CSSCAL, CTRSV, SLABAD, SSCAL, XERBLA
+      EXTERNAL           CAXPY, CSSCAL, CTRSV, SSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, CMPLX, CONJG, MAX, MIN, REAL
@@ -318,17 +319,14 @@ SUBROUTINE CLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
 *
 *     Quick return if possible
 *
+      SCALE = ONE
       IF( N.EQ.0 )
      $   RETURN
 *
 *     Determine machine dependent parameters to control overflow.
 *
-      SMLNUM = SLAMCH( 'Safe minimum' )
-      BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
-      SMLNUM = SMLNUM / SLAMCH( 'Precision' )
+      SMLNUM = SLAMCH( 'Safe minimum' ) / SLAMCH( 'Precision' )
       BIGNUM = ONE / SMLNUM
-      SCALE = ONE
 *
       IF( LSAME( NORMIN, 'N' ) ) THEN
 *
@@ -360,8 +358,74 @@ SUBROUTINE CLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
       IF( TMAX.LE.BIGNUM*HALF ) THEN
          TSCAL = ONE
       ELSE
-         TSCAL = HALF / ( SMLNUM*TMAX )
-         CALL SSCAL( N, TSCAL, CNORM, 1 )
+*
+*        Avoid NaN generation if entries in CNORM exceed the
+*        overflow threshold
+*
+         IF ( TMAX.LE.SLAMCH('Overflow') ) THEN
+*           Case 1: All entries in CNORM are valid floating-point numbers
+            TSCAL = HALF / ( SMLNUM*TMAX )
+            CALL SSCAL( N, TSCAL, CNORM, 1 )
+         ELSE
+*           Case 2: At least one column norm of A cannot be
+*           represented as a floating-point number. Find the
+*           maximum offdiagonal absolute value
+*           max( |Re(A(I,J))|, |Im(A(I,J)| ). If this entry is
+*           not +/- Infinity, use this value as TSCAL.
+            TMAX = ZERO
+            IF( UPPER ) THEN
+*
+*              A is upper triangular.
+*
+               DO J = 2, N
+                  DO I = 1, J - 1
+                     TMAX = MAX( TMAX, ABS( REAL( A( I, J ) ) ),
+     $                           ABS( AIMAG(A ( I, J ) ) ) )
+                  END DO
+               END DO
+            ELSE
+*
+*              A is lower triangular.
+*
+               DO J = 1, N - 1
+                  DO I = J + 1, N
+                     TMAX = MAX( TMAX, ABS( REAL( A( I, J ) ) ),
+     $                           ABS( AIMAG(A ( I, J ) ) ) )
+                  END DO
+               END DO
+            END IF
+*
+            IF( TMAX.LE.SLAMCH('Overflow') ) THEN
+               TSCAL = ONE / ( SMLNUM*TMAX )
+               DO J = 1, N
+                  IF( CNORM( J ).LE.SLAMCH('Overflow') ) THEN
+                     CNORM( J ) = CNORM( J )*TSCAL
+                  ELSE
+*                    Recompute the 1-norm of each column without
+*                    introducing Infinity in the summation.
+                     TSCAL = TWO * TSCAL
+                     CNORM( J ) = ZERO
+                     IF( UPPER ) THEN
+                        DO I = 1, J - 1
+                           CNORM( J ) = CNORM( J ) +
+     $                                  TSCAL * CABS2( A( I, J ) )
+                        END DO
+                     ELSE
+                        DO I = J + 1, N
+                           CNORM( J ) = CNORM( J ) +
+     $                                  TSCAL * CABS2( A( I, J ) )
+                        END DO
+                     END IF
+                     TSCAL = TSCAL * HALF
+                  END IF
+               END DO
+            ELSE
+*              At least one entry of A is not a valid floating-point
+*              entry. Rely on TRSV to propagate Inf and NaN.
+               CALL CTRSV( UPLO, TRANS, DIAG, N, A, LDA, X, 1 )
+               RETURN
+            END IF
+         END IF
       END IF
 *
 *     Compute a bound on the computed solution vector to see if the
@@ -723,7 +787,8 @@ SUBROUTINE CLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
                   IF( UPPER ) THEN
                      CSUMJ = CDOTU( J-1, A( 1, J ), 1, X, 1 )
                   ELSE IF( J.LT.N ) THEN
-                     CSUMJ = CDOTU( N-J, A( J+1, J ), 1, X( J+1 ), 1 )
+                     CSUMJ = CDOTU( N-J, A( J+1, J ), 1, X( J+1 ),
+     $                              1 )
                   END IF
                ELSE
 *
@@ -857,7 +922,8 @@ SUBROUTINE CLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
                   IF( UPPER ) THEN
                      CSUMJ = CDOTC( J-1, A( 1, J ), 1, X, 1 )
                   ELSE IF( J.LT.N ) THEN
-                     CSUMJ = CDOTC( N-J, A( J+1, J ), 1, X( J+1 ), 1 )
+                     CSUMJ = CDOTC( N-J, A( J+1, J ), 1, X( J+1 ),
+     $                              1 )
                   END IF
                ELSE
 *
diff --git a/SRC/clatrs3.f b/SRC/clatrs3.f
new file mode 100644
index 0000000000..1e2d11a178
--- /dev/null
+++ b/SRC/clatrs3.f
@@ -0,0 +1,691 @@
+*> \brief \b CLATRS3 solves a triangular system of equations with the scale factors set to prevent overflow.
+*
+*  Definition:
+*  ===========
+*
+*      SUBROUTINE CLATRS3( UPLO, TRANS, DIAG, NORMIN, N, NRHS, A, LDA,
+*                          X, LDX, SCALE, CNORM, WORK, LWORK, INFO )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          DIAG, NORMIN, TRANS, UPLO
+*       INTEGER            INFO, LDA, LWORK, LDX, N, NRHS
+*       ..
+*       .. Array Arguments ..
+*       REAL               CNORM( * ), SCALE( * ), WORK( * )
+*       COMPLEX            A( LDA, * ), X( LDX, * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> CLATRS3 solves one of the triangular systems
+*>
+*>    A * X = B * diag(scale),  A**T * X = B * diag(scale), or
+*>    A**H * X = B * diag(scale)
+*>
+*> with scaling to prevent overflow.  Here A is an upper or lower
+*> triangular matrix, A**T denotes the transpose of A, A**H denotes the
+*> conjugate transpose of A. X and B are n-by-nrhs matrices and scale
+*> is an nrhs-element vector of scaling factors. A scaling factor scale(j)
+*> is usually less than or equal to 1, chosen such that X(:,j) is less
+*> than the overflow threshold. If the matrix A is singular (A(j,j) = 0
+*> for some j), then a non-trivial solution to A*X = 0 is returned. If
+*> the system is so badly scaled that the solution cannot be represented
+*> as (1/scale(k))*X(:,k), then x(:,k) = 0 and scale(k) is returned.
+*>
+*> This is a BLAS-3 version of LATRS for solving several right
+*> hand sides simultaneously.
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>          Specifies whether the matrix A is upper or lower triangular.
+*>          = 'U':  Upper triangular
+*>          = 'L':  Lower triangular
+*> \endverbatim
+*>
+*> \param[in] TRANS
+*> \verbatim
+*>          TRANS is CHARACTER*1
+*>          Specifies the operation applied to A.
+*>          = 'N':  Solve A * x = s*b  (No transpose)
+*>          = 'T':  Solve A**T* x = s*b  (Transpose)
+*>          = 'C':  Solve A**T* x = s*b  (Conjugate transpose)
+*> \endverbatim
+*>
+*> \param[in] DIAG
+*> \verbatim
+*>          DIAG is CHARACTER*1
+*>          Specifies whether or not the matrix A is unit triangular.
+*>          = 'N':  Non-unit triangular
+*>          = 'U':  Unit triangular
+*> \endverbatim
+*>
+*> \param[in] NORMIN
+*> \verbatim
+*>          NORMIN is CHARACTER*1
+*>          Specifies whether CNORM has been set or not.
+*>          = 'Y':  CNORM contains the column norms on entry
+*>          = 'N':  CNORM is not set on entry.  On exit, the norms will
+*>                  be computed and stored in CNORM.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of columns of X.  NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX array, dimension (LDA,N)
+*>          The triangular matrix A.  If UPLO = 'U', the leading n by n
+*>          upper triangular part of the array A contains the upper
+*>          triangular matrix, and the strictly lower triangular part of
+*>          A is not referenced.  If UPLO = 'L', the leading n by n lower
+*>          triangular part of the array A contains the lower triangular
+*>          matrix, and the strictly upper triangular part of A is not
+*>          referenced.  If DIAG = 'U', the diagonal elements of A are
+*>          also not referenced and are assumed to be 1.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max (1,N).
+*> \endverbatim
+*>
+*> \param[in,out] X
+*> \verbatim
+*>          X is COMPLEX array, dimension (LDX,NRHS)
+*>          On entry, the right hand side B of the triangular system.
+*>          On exit, X is overwritten by the solution matrix X.
+*> \endverbatim
+*>
+*> \param[in] LDX
+*> \verbatim
+*>          LDX is INTEGER
+*>          The leading dimension of the array X.  LDX >= max (1,N).
+*> \endverbatim
+*>
+*> \param[out] SCALE
+*> \verbatim
+*>          SCALE is REAL array, dimension (NRHS)
+*>          The scaling factor s(k) is for the triangular system
+*>          A * x(:,k) = s(k)*b(:,k)  or  A**T* x(:,k) = s(k)*b(:,k).
+*>          If SCALE = 0, the matrix A is singular or badly scaled.
+*>          If A(j,j) = 0 is encountered, a non-trivial vector x(:,k)
+*>          that is an exact or approximate solution to A*x(:,k) = 0
+*>          is returned. If the system so badly scaled that solution
+*>          cannot be presented as x(:,k) * 1/s(k), then x(:,k) = 0
+*>          is returned.
+*> \endverbatim
+*>
+*> \param[in,out] CNORM
+*> \verbatim
+*>          CNORM is REAL array, dimension (N)
+*>
+*>          If NORMIN = 'Y', CNORM is an input argument and CNORM(j)
+*>          contains the norm of the off-diagonal part of the j-th column
+*>          of A.  If TRANS = 'N', CNORM(j) must be greater than or equal
+*>          to the infinity-norm, and if TRANS = 'T' or 'C', CNORM(j)
+*>          must be greater than or equal to the 1-norm.
+*>
+*>          If NORMIN = 'N', CNORM is an output argument and CNORM(j)
+*>          returns the 1-norm of the offdiagonal part of the j-th column
+*>          of A.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is REAL array, dimension (MAX(1,LWORK)).
+*>          On exit, if INFO = 0, WORK(1) returns the optimal size of
+*>          WORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>
+*>          If MIN(N,NRHS) = 0, LWORK >= 1, else
+*>          LWORK >= MAX(1, 2*NBA * MAX(NBA, MIN(NRHS, 32)), where
+*>          NBA = (N + NB - 1)/NB and NB is the optimal block size.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal dimensions of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -k, the k-th argument had an illegal value
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup latrs3
+*> \par Further Details:
+*  =====================
+*  \verbatim
+*  The algorithm follows the structure of a block triangular solve.
+*  The diagonal block is solved with a call to the robust the triangular
+*  solver LATRS for every right-hand side RHS = 1, ..., NRHS
+*     op(A( J, J )) * x( J, RHS ) = SCALOC * b( J, RHS ),
+*  where op( A ) = A or op( A ) = A**T or op( A ) = A**H.
+*  The linear block updates operate on block columns of X,
+*     B( I, K ) - op(A( I, J )) * X( J, K )
+*  and use GEMM. To avoid overflow in the linear block update, the worst case
+*  growth is estimated. For every RHS, a scale factor s <= 1.0 is computed
+*  such that
+*     || s * B( I, RHS )||_oo
+*   + || op(A( I, J )) ||_oo * || s *  X( J, RHS ) ||_oo <= Overflow threshold
+*
+*  Once all columns of a block column have been rescaled (BLAS-1), the linear
+*  update is executed with GEMM without overflow.
+*
+*  To limit rescaling, local scale factors track the scaling of column segments.
+*  There is one local scale factor s( I, RHS ) per block row I = 1, ..., NBA
+*  per right-hand side column RHS = 1, ..., NRHS. The global scale factor
+*  SCALE( RHS ) is chosen as the smallest local scale factor s( I, RHS )
+*  I = 1, ..., NBA.
+*  A triangular solve op(A( J, J )) * x( J, RHS ) = SCALOC * b( J, RHS )
+*  updates the local scale factor s( J, RHS ) := s( J, RHS ) * SCALOC. The
+*  linear update of potentially inconsistently scaled vector segments
+*     s( I, RHS ) * b( I, RHS ) - op(A( I, J )) * ( s( J, RHS )* x( J, RHS ) )
+*  computes a consistent scaling SCAMIN = MIN( s(I, RHS ), s(J, RHS) ) and,
+*  if necessary, rescales the blocks prior to calling GEMM.
+*
+*  \endverbatim
+*  =====================================================================
+*  References:
+*  C. C. Kjelgaard Mikkelsen, A. B. Schwarz and L. Karlsson (2019).
+*  Parallel robust solution of triangular linear systems. Concurrency
+*  and Computation: Practice and Experience, 31(19), e5064.
+*
+*  Contributor:
+*   Angelika Schwarz, Umea University, Sweden.
+*
+*  =====================================================================
+      SUBROUTINE CLATRS3( UPLO, TRANS, DIAG, NORMIN, N, NRHS, A, LDA,
+     $                    X, LDX, SCALE, CNORM, WORK, LWORK, INFO )
+      IMPLICIT NONE
+*
+*     .. Scalar Arguments ..
+      CHARACTER          DIAG, TRANS, NORMIN, UPLO
+      INTEGER            INFO, LDA, LWORK, LDX, N, NRHS
+*     ..
+*     .. Array Arguments ..
+      COMPLEX            A( LDA, * ), X( LDX, * )
+      REAL               CNORM( * ), SCALE( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      REAL               ZERO, ONE
+      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0 )
+      COMPLEX            CZERO, CONE
+      PARAMETER          ( CZERO = ( 0.0E+0, 0.0E+0 ) )
+      PARAMETER          ( CONE = ( 1.0E+0, 0.0E+0 ) )
+      INTEGER            NBMAX, NBMIN, NBRHS, NRHSMIN
+      PARAMETER          ( NRHSMIN = 2, NBRHS = 32 )
+      PARAMETER          ( NBMIN = 8, NBMAX = 64 )
+*     ..
+*     .. Local Arrays ..
+      REAL               W( NBMAX ), XNRM( NBRHS )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY, NOTRAN, NOUNIT, UPPER
+      INTEGER            AWRK, I, IFIRST, IINC, ILAST, II, I1, I2, J,
+     $                   JFIRST, JINC, JLAST, J1, J2, K, KK, K1, K2,
+     $                   LANRM, LDS, LSCALE, NB, NBA, NBX, RHS, LWMIN
+      REAL               ANRM, BIGNUM, BNRM, RSCAL, SCAL, SCALOC,
+     $                   SCAMIN, SMLNUM, TMAX
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      REAL               SLAMCH, CLANGE, SLARMM,
+     $                   SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SLAMCH,
+     $                   CLANGE, SLARMM, SROUNDUP_LWORK
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           CLATRS, CSSCAL, XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+      INFO = 0
+      UPPER = LSAME( UPLO, 'U' )
+      NOTRAN = LSAME( TRANS, 'N' )
+      NOUNIT = LSAME( DIAG, 'N' )
+      LQUERY = ( LWORK.EQ.-1 )
+*
+*     Partition A and X into blocks.
+*
+      NB = MAX( NBMIN, ILAENV( 1, 'CLATRS', '', N, N, -1, -1 ) )
+      NB = MIN( NBMAX, NB )
+      NBA = MAX( 1, (N + NB - 1) / NB )
+      NBX = MAX( 1, (NRHS + NBRHS - 1) / NBRHS )
+*
+*     Compute the workspace
+*
+*     The workspace comprises two parts.
+*     The first part stores the local scale factors. Each simultaneously
+*     computed right-hand side requires one local scale factor per block
+*     row. WORK( I + KK * LDS ) is the scale factor of the vector
+*     segment associated with the I-th block row and the KK-th vector
+*     in the block column.
+*
+      LSCALE = NBA * MAX( NBA, MIN( NRHS, NBRHS ) )
+      LDS = NBA
+*
+*     The second part stores upper bounds of the triangular A. There are
+*     a total of NBA x NBA blocks, of which only the upper triangular
+*     part or the lower triangular part is referenced. The upper bound of
+*     the block A( I, J ) is stored as WORK( AWRK + I + J * NBA ).
+*
+      LANRM = NBA * NBA
+      AWRK = LSCALE
+*
+      IF( MIN( N, NRHS ).EQ.0 ) THEN
+         LWMIN = 1
+      ELSE
+         LWMIN = LSCALE + LANRM
+      END IF
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
+*
+*     Test the input parameters.
+*
+      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
+     $         LSAME( TRANS, 'C' ) ) THEN
+         INFO = -2
+      ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
+         INFO = -3
+      ELSE IF( .NOT.LSAME( NORMIN, 'Y' ) .AND. .NOT.
+     $         LSAME( NORMIN, 'N' ) ) THEN
+         INFO = -4
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -5
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -6
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -8
+      ELSE IF( LDX.LT.MAX( 1, N ) ) THEN
+         INFO = -10
+      ELSE IF( .NOT.LQUERY .AND. LWORK.LT.LWMIN ) THEN
+         INFO = -14
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'CLATRS3', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Initialize scaling factors
+*
+      DO KK = 1, NRHS
+         SCALE( KK ) = ONE
+      END DO
+*
+*     Quick return if possible
+*
+      IF( MIN( N, NRHS ).EQ.0 )
+     $   RETURN
+*
+*     Determine machine dependent constant to control overflow.
+*
+      BIGNUM = SLAMCH( 'Overflow' )
+      SMLNUM = SLAMCH( 'Safe Minimum' )
+*
+*     Use unblocked code for small problems
+*
+      IF( NRHS.LT.NRHSMIN ) THEN
+         CALL CLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X( 1,
+     $                1 ),
+     $                SCALE( 1 ), CNORM, INFO )
+         DO K = 2, NRHS
+            CALL CLATRS( UPLO, TRANS, DIAG, 'Y', N, A, LDA, X( 1,
+     $                   K ),
+     $                   SCALE( K ), CNORM, INFO )
+         END DO
+         RETURN
+      END IF
+*
+*     Compute norms of blocks of A excluding diagonal blocks and find
+*     the block with the largest norm TMAX.
+*
+      TMAX = ZERO
+      DO J = 1, NBA
+         J1 = (J-1)*NB + 1
+         J2 = MIN( J*NB, N ) + 1
+         IF ( UPPER ) THEN
+            IFIRST = 1
+            ILAST = J - 1
+         ELSE
+            IFIRST = J + 1
+            ILAST = NBA
+         END IF
+         DO I = IFIRST, ILAST
+            I1 = (I-1)*NB + 1
+            I2 = MIN( I*NB, N ) + 1
+*
+*           Compute upper bound of A( I1:I2-1, J1:J2-1 ).
+*
+            IF( NOTRAN ) THEN
+               ANRM = CLANGE( 'I', I2-I1, J2-J1, A( I1, J1 ), LDA,
+     $                        W )
+               WORK( AWRK + I+(J-1)*NBA ) = ANRM
+            ELSE
+               ANRM = CLANGE( '1', I2-I1, J2-J1, A( I1, J1 ), LDA,
+     $                        W )
+               WORK( AWRK + J+(I-1)*NBA ) = ANRM
+            END IF
+            TMAX = MAX( TMAX, ANRM )
+         END DO
+      END DO
+*
+      IF( .NOT. TMAX.LE.SLAMCH('Overflow') ) THEN
+*
+*        Some matrix entries have huge absolute value. At least one upper
+*        bound norm( A(I1:I2-1, J1:J2-1), 'I') is not a valid floating-point
+*        number, either due to overflow in LANGE or due to Inf in A.
+*        Fall back to LATRS. Set normin = 'N' for every right-hand side to
+*        force computation of TSCAL in LATRS to avoid the likely overflow
+*        in the computation of the column norms CNORM.
+*
+         DO K = 1, NRHS
+            CALL CLATRS( UPLO, TRANS, DIAG, 'N', N, A, LDA, X( 1,
+     $                   K ),
+     $                   SCALE( K ), CNORM, INFO )
+         END DO
+         RETURN
+      END IF
+*
+*     Every right-hand side requires workspace to store NBA local scale
+*     factors. To save workspace, X is computed successively in block columns
+*     of width NBRHS, requiring a total of NBA x NBRHS space. If sufficient
+*     workspace is available, larger values of NBRHS or NBRHS = NRHS are viable.
+      DO K = 1, NBX
+*        Loop over block columns (index = K) of X and, for column-wise scalings,
+*        over individual columns (index = KK).
+*        K1: column index of the first column in X( J, K )
+*        K2: column index of the first column in X( J, K+1 )
+*        so the K2 - K1 is the column count of the block X( J, K )
+         K1 = (K-1)*NBRHS + 1
+         K2 = MIN( K*NBRHS, NRHS ) + 1
+*
+*        Initialize local scaling factors of current block column X( J, K )
+*
+         DO KK = 1, K2-K1
+            DO I = 1, NBA
+               WORK( I+KK*LDS ) = ONE
+            END DO
+         END DO
+*
+         IF( NOTRAN ) THEN
+*
+*           Solve A * X(:, K1:K2-1) = B * diag(scale(K1:K2-1))
+*
+            IF( UPPER ) THEN
+               JFIRST = NBA
+               JLAST = 1
+               JINC = -1
+            ELSE
+               JFIRST = 1
+               JLAST = NBA
+               JINC = 1
+            END IF
+         ELSE
+*
+*           Solve op(A) * X(:, K1:K2-1) = B * diag(scale(K1:K2-1))
+*           where op(A) = A**T or op(A) = A**H
+*
+            IF( UPPER ) THEN
+               JFIRST = 1
+               JLAST = NBA
+               JINC = 1
+            ELSE
+               JFIRST = NBA
+               JLAST = 1
+               JINC = -1
+            END IF
+         END IF
+
+         DO J = JFIRST, JLAST, JINC
+*           J1: row index of the first row in A( J, J )
+*           J2: row index of the first row in A( J+1, J+1 )
+*           so that J2 - J1 is the row count of the block A( J, J )
+            J1 = (J-1)*NB + 1
+            J2 = MIN( J*NB, N ) + 1
+*
+*           Solve op(A( J, J )) * X( J, RHS ) = SCALOC * B( J, RHS )
+*
+            DO KK = 1, K2-K1
+               RHS = K1 + KK - 1
+               IF( KK.EQ.1 ) THEN
+                  CALL CLATRS( UPLO, TRANS, DIAG, 'N', J2-J1,
+     $                         A( J1, J1 ), LDA, X( J1, RHS ),
+     $                         SCALOC, CNORM, INFO )
+               ELSE
+                  CALL CLATRS( UPLO, TRANS, DIAG, 'Y', J2-J1,
+     $                         A( J1, J1 ), LDA, X( J1, RHS ),
+     $                         SCALOC, CNORM, INFO )
+               END IF
+*              Find largest absolute value entry in the vector segment
+*              X( J1:J2-1, RHS ) as an upper bound for the worst case
+*              growth in the linear updates.
+               XNRM( KK ) = CLANGE( 'I', J2-J1, 1, X( J1, RHS ),
+     $                              LDX, W )
+*
+               IF( SCALOC .EQ. ZERO ) THEN
+*                 LATRS found that A is singular through A(j,j) = 0.
+*                 Reset the computation x(1:n) = 0, x(j) = 1, SCALE = 0
+*                 and compute op(A)*x = 0. Note that X(J1:J2-1, KK) is
+*                 set by LATRS.
+                  SCALE( RHS ) = ZERO
+                  DO II = 1, J1-1
+                     X( II, KK ) = CZERO
+                  END DO
+                  DO II = J2, N
+                     X( II, KK ) = CZERO
+                  END DO
+*                 Discard the local scale factors.
+                  DO II = 1, NBA
+                     WORK( II+KK*LDS ) = ONE
+                  END DO
+                  SCALOC = ONE
+               ELSE IF( SCALOC*WORK( J+KK*LDS ) .EQ. ZERO ) THEN
+*                 LATRS computed a valid scale factor, but combined with
+*                 the current scaling the solution does not have a
+*                 scale factor > 0.
+*
+*                 Set WORK( J+KK*LDS ) to smallest valid scale
+*                 factor and increase SCALOC accordingly.
+                  SCAL = WORK( J+KK*LDS ) / SMLNUM
+                  SCALOC = SCALOC * SCAL
+                  WORK( J+KK*LDS ) = SMLNUM
+*                 If LATRS overestimated the growth, x may be
+*                 rescaled to preserve a valid combined scale
+*                 factor WORK( J, KK ) > 0.
+                  RSCAL = ONE / SCALOC
+                  IF( XNRM( KK )*RSCAL .LE. BIGNUM ) THEN
+                     XNRM( KK ) = XNRM( KK ) * RSCAL
+                     CALL CSSCAL( J2-J1, RSCAL, X( J1, RHS ), 1 )
+                     SCALOC = ONE
+                  ELSE
+*                    The system op(A) * x = b is badly scaled and its
+*                    solution cannot be represented as (1/scale) * x.
+*                    Set x to zero. This approach deviates from LATRS
+*                    where a completely meaningless non-zero vector
+*                    is returned that is not a solution to op(A) * x = b.
+                     SCALE( RHS ) = ZERO
+                     DO II = 1, N
+                        X( II, KK ) = CZERO
+                     END DO
+*                    Discard the local scale factors.
+                     DO II = 1, NBA
+                        WORK( II+KK*LDS ) = ONE
+                     END DO
+                     SCALOC = ONE
+                  END IF
+               END IF
+               SCALOC = SCALOC * WORK( J+KK*LDS )
+               WORK( J+KK*LDS ) = SCALOC
+            END DO
+*
+*           Linear block updates
+*
+            IF( NOTRAN ) THEN
+               IF( UPPER ) THEN
+                  IFIRST = J - 1
+                  ILAST = 1
+                  IINC = -1
+               ELSE
+                  IFIRST = J + 1
+                  ILAST = NBA
+                  IINC = 1
+               END IF
+            ELSE
+               IF( UPPER ) THEN
+                  IFIRST = J + 1
+                  ILAST = NBA
+                  IINC = 1
+               ELSE
+                  IFIRST = J - 1
+                  ILAST = 1
+                  IINC = -1
+               END IF
+            END IF
+*
+            DO I = IFIRST, ILAST, IINC
+*              I1: row index of the first column in X( I, K )
+*              I2: row index of the first column in X( I+1, K )
+*              so the I2 - I1 is the row count of the block X( I, K )
+               I1 = (I-1)*NB + 1
+               I2 = MIN( I*NB, N ) + 1
+*
+*              Prepare the linear update to be executed with GEMM.
+*              For each column, compute a consistent scaling, a
+*              scaling factor to survive the linear update, and
+*              rescale the column segments, if necessary. Then
+*              the linear update is safely executed.
+*
+               DO KK = 1, K2-K1
+                  RHS = K1 + KK - 1
+*                 Compute consistent scaling
+                  SCAMIN = MIN( WORK( I+KK*LDS), WORK( J+KK*LDS ) )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  BNRM = CLANGE( 'I', I2-I1, 1, X( I1, RHS ), LDX,
+     $                           W )
+                  BNRM = BNRM*( SCAMIN / WORK( I+KK*LDS ) )
+                  XNRM( KK ) = XNRM( KK )*( SCAMIN / WORK( J+KK*LDS) )
+                  ANRM = WORK( AWRK + I+(J-1)*NBA )
+                  SCALOC = SLARMM( ANRM, XNRM( KK ), BNRM )
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to X( I, KK ) and X( J, KK ).
+*
+                  SCAL = ( SCAMIN / WORK( I+KK*LDS) )*SCALOC
+                  IF( SCAL.NE.ONE ) THEN
+                     CALL CSSCAL( I2-I1, SCAL, X( I1, RHS ), 1 )
+                     WORK( I+KK*LDS ) = SCAMIN*SCALOC
+                  END IF
+*
+                  SCAL = ( SCAMIN / WORK( J+KK*LDS ) )*SCALOC
+                  IF( SCAL.NE.ONE ) THEN
+                     CALL CSSCAL( J2-J1, SCAL, X( J1, RHS ), 1 )
+                     WORK( J+KK*LDS ) = SCAMIN*SCALOC
+                  END IF
+               END DO
+*
+               IF( NOTRAN ) THEN
+*
+*                 B( I, K ) := B( I, K ) - A( I, J ) * X( J, K )
+*
+                  CALL CGEMM( 'N', 'N', I2-I1, K2-K1, J2-J1, -CONE,
+     $                        A( I1, J1 ), LDA, X( J1, K1 ), LDX,
+     $                        CONE, X( I1, K1 ), LDX )
+               ELSE IF( LSAME( TRANS, 'T' ) ) THEN
+*
+*                 B( I, K ) := B( I, K ) - A( I, J )**T * X( J, K )
+*
+                  CALL CGEMM( 'T', 'N', I2-I1, K2-K1, J2-J1, -CONE,
+     $                        A( J1, I1 ), LDA, X( J1, K1 ), LDX,
+     $                        CONE, X( I1, K1 ), LDX )
+               ELSE
+*
+*                 B( I, K ) := B( I, K ) - A( I, J )**H * X( J, K )
+*
+                  CALL CGEMM( 'C', 'N', I2-I1, K2-K1, J2-J1, -CONE,
+     $                        A( J1, I1 ), LDA, X( J1, K1 ), LDX,
+     $                        CONE, X( I1, K1 ), LDX )
+               END IF
+            END DO
+         END DO
+*
+*        Reduce local scaling factors
+*
+         DO KK = 1, K2-K1
+            RHS = K1 + KK - 1
+            DO I = 1, NBA
+               SCALE( RHS ) = MIN( SCALE( RHS ), WORK( I+KK*LDS ) )
+            END DO
+         END DO
+*
+*        Realize consistent scaling
+*
+         DO KK = 1, K2-K1
+            RHS = K1 + KK - 1
+            IF( SCALE( RHS ).NE.ONE .AND. SCALE( RHS ).NE. ZERO ) THEN
+               DO I = 1, NBA
+                  I1 = (I-1)*NB + 1
+                  I2 = MIN( I*NB, N ) + 1
+                  SCAL = SCALE( RHS ) / WORK( I+KK*LDS )
+                  IF( SCAL.NE.ONE )
+     $               CALL CSSCAL( I2-I1, SCAL, X( I1, RHS ), 1 )
+               END DO
+            END IF
+         END DO
+      END DO
+*
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
+*
+      RETURN
+*
+*     End of CLATRS3
+*
+      END
diff --git a/SRC/clatrz.f b/SRC/clatrz.f
index 677892011d..366df134de 100644
--- a/SRC/clatrz.f
+++ b/SRC/clatrz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLATRZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clatrz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clatrz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,7 +95,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup latrz
 *
 *> \par Contributors:
 *  ==================
@@ -137,6 +135,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CLATRZ( M, N, L, A, LDA, TAU, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/clatsqr.f b/SRC/clatsqr.f
index 2b80ba71bd..0392b3da78 100644
--- a/SRC/clatsqr.f
+++ b/SRC/clatsqr.f
@@ -101,14 +101,18 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) COMPLEX array, dimension (MAX(1,LWORK))
+*>          (workspace) COMPLEX array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
-*>          The dimension of the array WORK.  LWORK >= NB*N.
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= NB*N, otherwise.
+*>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
+*>          only calculates the minimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
@@ -160,33 +164,39 @@
 *>     SIAM J. Sci. Comput, vol. 34, no. 1, 2012
 *> \endverbatim
 *>
+*> \ingroup latsqr
+*>
 *  =====================================================================
       SUBROUTINE CLATSQR( M, N, MB, NB, A, LDA, T, LDT, WORK,
-     $                    LWORK, INFO)
+     $                    LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd. --
 *
 *     .. Scalar Arguments ..
-      INTEGER           INFO, LDA, M, N, MB, NB, LDT, LWORK
+      INTEGER            INFO, LDA, M, N, MB, NB, LDT, LWORK
 *     ..
 *     .. Array Arguments ..
-      COMPLEX           A( LDA, * ), WORK( * ), T(LDT, *)
+      COMPLEX            A( LDA, * ), WORK( * ), T( LDT, * )
 *     ..
 *
 *  =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
-      LOGICAL    LQUERY
-      INTEGER    I, II, KK, CTR
+      LOGICAL            LQUERY
+      INTEGER            I, II, KK, CTR, LWMIN, MINMN
 *     ..
 *     .. EXTERNAL FUNCTIONS ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
+*     ..
 *     .. EXTERNAL SUBROUTINES ..
-      EXTERNAL    CGEQRT, CTPQRT, XERBLA
+      EXTERNAL           CGEQRT, CTPQRT, XERBLA
+*     ..
 *     .. INTRINSIC FUNCTIONS ..
       INTRINSIC          MAX, MIN, MOD
 *     ..
@@ -197,71 +207,79 @@ SUBROUTINE CLATSQR( M, N, MB, NB, A, LDA, T, LDT, WORK,
       INFO = 0
 *
       LQUERY = ( LWORK.EQ.-1 )
+*
+      MINMN = MIN( M, N )
+      IF( MINMN.EQ.0 ) THEN
+        LWMIN = 1
+      ELSE
+        LWMIN = N*NB
+      END IF
 *
       IF( M.LT.0 ) THEN
         INFO = -1
       ELSE IF( N.LT.0 .OR. M.LT.N ) THEN
         INFO = -2
-      ELSE IF( MB.LE.N ) THEN
+      ELSE IF( MB.LT.1 ) THEN
         INFO = -3
-      ELSE IF( NB.LT.1 .OR. ( NB.GT.N .AND. N.GT.0 )) THEN
+      ELSE IF( NB.LT.1 .OR. ( NB.GT.N .AND. N.GT.0 ) ) THEN
         INFO = -4
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-        INFO = -5
+        INFO = -6
       ELSE IF( LDT.LT.NB ) THEN
         INFO = -8
-      ELSE IF( LWORK.LT.(N*NB) .AND. (.NOT.LQUERY) ) THEN
+      ELSE IF( LWORK.LT.LWMIN .AND. (.NOT.LQUERY) ) THEN
         INFO = -10
       END IF
-      IF( INFO.EQ.0)  THEN
-        WORK(1) = NB*N
+*
+      IF( INFO.EQ.0 ) THEN
+        WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       END IF
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'CLATSQR', -INFO )
         RETURN
-      ELSE IF (LQUERY) THEN
-       RETURN
+      ELSE IF( LQUERY ) THEN
+        RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( MIN(M,N).EQ.0 ) THEN
-          RETURN
+      IF( MINMN.EQ.0 ) THEN
+        RETURN
       END IF
 *
 *     The QR Decomposition
 *
-       IF ((MB.LE.N).OR.(MB.GE.M)) THEN
-         CALL CGEQRT( M, N, NB, A, LDA, T, LDT, WORK, INFO)
-         RETURN
-       END IF
-       KK = MOD((M-N),(MB-N))
-       II=M-KK+1
+      IF ( (MB.LE.N) .OR. (MB.GE.M) ) THEN
+        CALL CGEQRT( M, N, NB, A, LDA, T, LDT, WORK, INFO )
+        RETURN
+      END IF
+      KK = MOD((M-N),(MB-N))
+      II = M-KK+1
 *
-*      Compute the QR factorization of the first block A(1:MB,1:N)
+*     Compute the QR factorization of the first block A(1:MB,1:N)
 *
-       CALL CGEQRT( MB, N, NB, A(1,1), LDA, T, LDT, WORK, INFO )
-       CTR = 1
+      CALL CGEQRT( MB, N, NB, A(1,1), LDA, T, LDT, WORK, INFO )
+      CTR = 1
 *
-       DO I = MB+1, II-MB+N ,  (MB-N)
+      DO I = MB+1, II-MB+N, (MB-N)
 *
-*      Compute the QR factorization of the current block A(I:I+MB-N,1:N)
+*       Compute the QR factorization of the current block A(I:I+MB-N,1:N)
 *
-         CALL CTPQRT( MB-N, N, 0, NB, A(1,1), LDA, A( I, 1 ), LDA,
+        CALL CTPQRT( MB-N, N, 0, NB, A(1,1), LDA, A( I, 1 ), LDA,
      $                 T(1,CTR * N + 1),
-     $                  LDT, WORK, INFO )
-         CTR = CTR + 1
-       END DO
+     $                 LDT, WORK, INFO )
+        CTR = CTR + 1
+      END DO
 *
-*      Compute the QR factorization of the last block A(II:M,1:N)
+*     Compute the QR factorization of the last block A(II:M,1:N)
 *
-       IF (II.LE.M) THEN
-         CALL CTPQRT( KK, N, 0, NB, A(1,1), LDA, A( II, 1 ), LDA,
+      IF( II.LE.M ) THEN
+        CALL CTPQRT( KK, N, 0, NB, A(1,1), LDA, A( II, 1 ), LDA,
      $                 T(1, CTR * N + 1), LDT,
-     $                  WORK, INFO )
-       END IF
+     $                 WORK, INFO )
+      END IF
 *
-      work( 1 ) = N*NB
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       RETURN
 *
 *     End of CLATSQR
diff --git a/SRC/claunhr_col_getrfnp.f b/SRC/claunhr_col_getrfnp.f
index 96381ee26d..ab0359af27 100644
--- a/SRC/claunhr_col_getrfnp.f
+++ b/SRC/claunhr_col_getrfnp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAUNHR_COL_GETRFNP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claunhr_col_getrfnp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claunhr_col_getrfnp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -128,7 +126,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup launhr_col_getrfnp
 *
 *> \par Contributors:
 *  ==================
@@ -166,7 +164,8 @@ SUBROUTINE CLAUNHR_COL_GETRFNP( M, N, A, LDA, D, INFO )
       INTEGER            IINFO, J, JB, NB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMM, CLAUNHR_COL_GETRFNP2, CTRSM, XERBLA
+      EXTERNAL           CGEMM, CLAUNHR_COL_GETRFNP2, CTRSM,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
@@ -223,14 +222,16 @@ SUBROUTINE CLAUNHR_COL_GETRFNP( M, N, A, LDA, D, INFO )
 *
 *              Compute block row of U.
 *
-               CALL CTRSM( 'Left', 'Lower', 'No transpose', 'Unit', JB,
+               CALL CTRSM( 'Left', 'Lower', 'No transpose', 'Unit',
+     $                     JB,
      $                     N-J-JB+1, CONE, A( J, J ), LDA, A( J, J+JB ),
      $                     LDA )
                IF( J+JB.LE.M ) THEN
 *
 *                 Update trailing submatrix.
 *
-                  CALL CGEMM( 'No transpose', 'No transpose', M-J-JB+1,
+                  CALL CGEMM( 'No transpose', 'No transpose',
+     $                        M-J-JB+1,
      $                        N-J-JB+1, JB, -CONE, A( J+JB, J ), LDA,
      $                        A( J, J+JB ), LDA, CONE, A( J+JB, J+JB ),
      $                        LDA )
diff --git a/SRC/claunhr_col_getrfnp2.f b/SRC/claunhr_col_getrfnp2.f
index d3103fde90..2734f3fd30 100644
--- a/SRC/claunhr_col_getrfnp2.f
+++ b/SRC/claunhr_col_getrfnp2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAUNHR_COL_GETRFNP2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/claunhr_col_getrfnp2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/claunhr_col_getrfnp2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -149,7 +147,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup launhr_col_getrfnp2
 *
 *> \par Contributors:
 *  ==================
@@ -163,7 +161,8 @@
 *> \endverbatim
 *
 *  =====================================================================
-      RECURSIVE SUBROUTINE CLAUNHR_COL_GETRFNP2( M, N, A, LDA, D, INFO )
+      RECURSIVE SUBROUTINE CLAUNHR_COL_GETRFNP2( M, N, A, LDA, D,
+     $                                           INFO )
       IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
@@ -295,7 +294,8 @@ RECURSIVE SUBROUTINE CLAUNHR_COL_GETRFNP2( M, N, A, LDA, D, INFO )
 *        Update B22, i.e. compute the Schur complement
 *        B22 := B22 - B21*B12
 *
-         CALL CGEMM( 'N', 'N', M-N1, N2, N1, -CONE, A( N1+1, 1 ), LDA,
+         CALL CGEMM( 'N', 'N', M-N1, N2, N1, -CONE, A( N1+1, 1 ),
+     $               LDA,
      $               A( 1, N1+1 ), LDA, CONE, A( N1+1, N1+1 ), LDA )
 *
 *        Factor B22, recursive call
diff --git a/SRC/clauu2.f b/SRC/clauu2.f
index 240ec20c08..92fba29af9 100644
--- a/SRC/clauu2.f
+++ b/SRC/clauu2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAUU2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clauu2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clauu2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,10 +93,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lauu2
 *
 *  =====================================================================
       SUBROUTINE CLAUU2( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -164,10 +163,12 @@ SUBROUTINE CLAUU2( UPLO, N, A, LDA, INFO )
          DO 10 I = 1, N
             AII = REAL( A( I, I ) )
             IF( I.LT.N ) THEN
-               A( I, I ) = AII*AII + REAL( CDOTC( N-I, A( I, I+1 ), LDA,
+               A( I, I ) = AII*AII + REAL( CDOTC( N-I, A( I, I+1 ),
+     $            LDA,
      $                     A( I, I+1 ), LDA ) )
                CALL CLACGV( N-I, A( I, I+1 ), LDA )
-               CALL CGEMV( 'No transpose', I-1, N-I, ONE, A( 1, I+1 ),
+               CALL CGEMV( 'No transpose', I-1, N-I, ONE, A( 1,
+     $                     I+1 ),
      $                     LDA, A( I, I+1 ), LDA, CMPLX( AII ),
      $                     A( 1, I ), 1 )
                CALL CLACGV( N-I, A( I, I+1 ), LDA )
@@ -183,7 +184,8 @@ SUBROUTINE CLAUU2( UPLO, N, A, LDA, INFO )
          DO 20 I = 1, N
             AII = REAL( A( I, I ) )
             IF( I.LT.N ) THEN
-               A( I, I ) = AII*AII + REAL( CDOTC( N-I, A( I+1, I ), 1,
+               A( I, I ) = AII*AII + REAL( CDOTC( N-I, A( I+1, I ),
+     $            1,
      $                     A( I+1, I ), 1 ) )
                CALL CLACGV( I-1, A( I, 1 ), LDA )
                CALL CGEMV( 'Conjugate transpose', N-I, I-1, ONE,
diff --git a/SRC/clauum.f b/SRC/clauum.f
index 8b3cbc51dd..49f4410c57 100644
--- a/SRC/clauum.f
+++ b/SRC/clauum.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CLAUUM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/clauum.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/clauum.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,10 +93,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup lauum
 *
 *  =====================================================================
       SUBROUTINE CLAUUM( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -202,7 +201,8 @@ SUBROUTINE CLAUUM( UPLO, N, A, LDA, INFO )
      $                     A( I, 1 ), LDA )
                CALL CLAUU2( 'Lower', IB, A( I, I ), LDA, INFO )
                IF( I+IB.LE.N ) THEN
-                  CALL CGEMM( 'Conjugate transpose', 'No transpose', IB,
+                  CALL CGEMM( 'Conjugate transpose', 'No transpose',
+     $                        IB,
      $                        I-1, N-I-IB+1, CONE, A( I+IB, I ), LDA,
      $                        A( I+IB, 1 ), LDA, CONE, A( I, 1 ), LDA )
                   CALL CHERK( 'Lower', 'Conjugate transpose', IB,
diff --git a/SRC/cpbcon.f b/SRC/cpbcon.f
index df1a3bd1f7..ed365b1567 100644
--- a/SRC/cpbcon.f
+++ b/SRC/cpbcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPBCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpbcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpbcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -125,11 +123,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup pbcon
 *
 *  =====================================================================
       SUBROUTINE CPBCON( UPLO, N, KD, AB, LDAB, ANORM, RCOND, WORK,
      $                   RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -231,13 +230,15 @@ SUBROUTINE CPBCON( UPLO, N, KD, AB, LDAB, ANORM, RCOND, WORK,
 *
 *           Multiply by inv(U).
 *
-            CALL CLATBS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL CLATBS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   KD, AB, LDAB, WORK, SCALEU, RWORK, INFO )
          ELSE
 *
 *           Multiply by inv(L).
 *
-            CALL CLATBS( 'Lower', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL CLATBS( 'Lower', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   KD, AB, LDAB, WORK, SCALEL, RWORK, INFO )
             NORMIN = 'Y'
 *
diff --git a/SRC/cpbequ.f b/SRC/cpbequ.f
index fd91ea121b..3a1b667e66 100644
--- a/SRC/cpbequ.f
+++ b/SRC/cpbequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPBEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpbequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpbequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,10 +121,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup pbequ
 *
 *  =====================================================================
-      SUBROUTINE CPBEQU( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX, INFO )
+      SUBROUTINE CPBEQU( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cpbrfs.f b/SRC/cpbrfs.f
index eb35e8fc0a..aee4d3330a 100644
--- a/SRC/cpbrfs.f
+++ b/SRC/cpbrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPBRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpbrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpbrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -181,11 +179,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup pbrfs
 *
 *  =====================================================================
       SUBROUTINE CPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
      $                   LDB, X, LDX, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -225,7 +224,8 @@ SUBROUTINE CPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CHBMV, CLACN2, CPBTRS, XERBLA
+      EXTERNAL           CAXPY, CCOPY, CHBMV, CLACN2, CPBTRS,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MAX, MIN, REAL
@@ -284,7 +284,7 @@ SUBROUTINE CPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
       NZ = MIN( N+1, 2*KD+2 )
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -396,10 +396,11 @@ SUBROUTINE CPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
 *
          DO 90 I = 1, N
             IF( RWORK( I ).GT.SAFE2 ) THEN
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I )
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I )
             ELSE
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I ) +
-     $                      SAFE1
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I ) + SAFE1
             END IF
    90    CONTINUE
 *
@@ -411,7 +412,8 @@ SUBROUTINE CPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
 *
 *              Multiply by diag(W)*inv(A**H).
 *
-               CALL CPBTRS( UPLO, N, KD, 1, AFB, LDAFB, WORK, N, INFO )
+               CALL CPBTRS( UPLO, N, KD, 1, AFB, LDAFB, WORK, N,
+     $                      INFO )
                DO 110 I = 1, N
                   WORK( I ) = RWORK( I )*WORK( I )
   110          CONTINUE
@@ -422,7 +424,8 @@ SUBROUTINE CPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
                DO 120 I = 1, N
                   WORK( I ) = RWORK( I )*WORK( I )
   120          CONTINUE
-               CALL CPBTRS( UPLO, N, KD, 1, AFB, LDAFB, WORK, N, INFO )
+               CALL CPBTRS( UPLO, N, KD, 1, AFB, LDAFB, WORK, N,
+     $                      INFO )
             END IF
             GO TO 100
          END IF
diff --git a/SRC/cpbstf.f b/SRC/cpbstf.f
index 0452a91835..f92c23330b 100644
--- a/SRC/cpbstf.f
+++ b/SRC/cpbstf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPBSTF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpbstf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpbstf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -110,7 +108,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup pbstf
 *
 *> \par Further Details:
 *  =====================
@@ -150,6 +148,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CPBSTF( UPLO, N, KD, AB, LDAB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cpbsv.f b/SRC/cpbsv.f
index 248abbc1f3..0db1e3b2a5 100644
--- a/SRC/cpbsv.f
+++ b/SRC/cpbsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPBSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpbsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpbsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,9 +117,9 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i of A is not
-*>                positive definite, so the factorization could not be
-*>                completed, and the solution has not been computed.
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                of A is not positive, so the factorization could not
+*>                be completed, and the solution has not been computed.
 *> \endverbatim
 *
 *  Authors:
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERsolve
+*> \ingroup pbsv
 *
 *> \par Further Details:
 *  =====================
@@ -161,6 +159,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CPBSV( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -191,7 +190,8 @@ SUBROUTINE CPBSV( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/cpbsvx.f b/SRC/cpbsvx.f
index 652e185010..f9b22e5164 100644
--- a/SRC/cpbsvx.f
+++ b/SRC/cpbsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPBSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpbsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpbsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -70,7 +68,7 @@
 *>    where U is an upper triangular band matrix, and L is a lower
 *>    triangular band matrix.
 *>
-*> 3. If the leading i-by-i principal minor is not positive definite,
+*> 3. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A.  If the reciprocal of the condition number is less than machine
@@ -280,10 +278,10 @@
 *>          = 0: successful exit
 *>          < 0: if INFO = -i, the i-th argument had an illegal value
 *>          > 0: if INFO = i, and i is
-*>                <= N:  the leading minor of order i of A is
-*>                       not positive definite, so the factorization
-*>                       could not be completed, and the solution has not
-*>                       been computed. RCOND = 0 is returned.
+*>                <= N:  the leading principal minor of order i of A
+*>                       is not positive, so the factorization could not
+*>                       be completed, and the solution has not been
+*>                       computed. RCOND = 0 is returned.
 *>                = N+1: U is nonsingular, but RCOND is less than machine
 *>                       precision, meaning that the matrix is singular
 *>                       to working precision.  Nevertheless, the
@@ -301,7 +299,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERsolve
+*> \ingroup pbsvx
 *
 *> \par Further Details:
 *  =====================
@@ -336,9 +334,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
+      SUBROUTINE CPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB,
+     $                   LDAFB,
      $                   EQUED, S, B, LDB, X, LDX, RCOND, FERR, BERR,
      $                   WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -372,7 +372,8 @@ SUBROUTINE CPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
       EXTERNAL           LSAME, CLANHB, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CLACPY, CLAQHB, CPBCON, CPBEQU, CPBRFS,
+      EXTERNAL           CCOPY, CLACPY, CLAQHB, CPBCON, CPBEQU,
+     $                   CPBRFS,
      $                   CPBTRF, CPBTRS, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -395,7 +396,9 @@ SUBROUTINE CPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
       ELSE IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
@@ -452,7 +455,8 @@ SUBROUTINE CPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
 *
 *           Equilibrate the matrix.
 *
-            CALL CLAQHB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX, EQUED )
+            CALL CLAQHB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX,
+     $                   EQUED )
             RCEQU = LSAME( EQUED, 'Y' )
          END IF
       END IF
@@ -500,7 +504,8 @@ SUBROUTINE CPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL CPBCON( UPLO, N, KD, AFB, LDAFB, ANORM, RCOND, WORK, RWORK,
+      CALL CPBCON( UPLO, N, KD, AFB, LDAFB, ANORM, RCOND, WORK,
+     $             RWORK,
      $             INFO )
 *
 *     Compute the solution matrix X.
@@ -511,7 +516,8 @@ SUBROUTINE CPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
 *     Use iterative refinement to improve the computed solution and
 *     compute error bounds and backward error estimates for it.
 *
-      CALL CPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B, LDB, X,
+      CALL CPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B, LDB,
+     $             X,
      $             LDX, FERR, BERR, WORK, RWORK, INFO )
 *
 *     Transform the solution matrix X to a solution of the original
diff --git a/SRC/cpbtf2.f b/SRC/cpbtf2.f
index 0be2c0a7f5..dbc399f700 100644
--- a/SRC/cpbtf2.f
+++ b/SRC/cpbtf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPBTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpbtf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpbtf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,8 +95,8 @@
 *>          INFO is INTEGER
 *>          = 0: successful exit
 *>          < 0: if INFO = -k, the k-th argument had an illegal value
-*>          > 0: if INFO = k, the leading minor of order k is not
-*>               positive definite, and the factorization could not be
+*>          > 0: if INFO = k, the leading principal minor of order k
+*>               is not positive, and the factorization could not be
 *>               completed.
 *> \endverbatim
 *
@@ -110,7 +108,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup pbtf2
 *
 *> \par Further Details:
 *  =====================
@@ -139,6 +137,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CPBTF2( UPLO, N, KD, AB, LDAB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cpbtrf.f b/SRC/cpbtrf.f
index a4c18efb39..498b9c64ec 100644
--- a/SRC/cpbtrf.f
+++ b/SRC/cpbtrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPBTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpbtrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpbtrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -92,8 +90,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *> \endverbatim
 *
@@ -105,7 +103,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup pbtrf
 *
 *> \par Further Details:
 *  =====================
@@ -139,6 +137,7 @@
 *
 *  =====================================================================
       SUBROUTINE CPBTRF( UPLO, N, KD, AB, LDAB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -174,7 +173,8 @@ SUBROUTINE CPBTRF( UPLO, N, KD, AB, LDAB, INFO )
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMM, CHERK, CPBTF2, CPOTF2, CTRSM, XERBLA
+      EXTERNAL           CGEMM, CHERK, CPBTF2, CPOTF2, CTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MIN
@@ -271,14 +271,16 @@ SUBROUTINE CPBTRF( UPLO, N, KD, AB, LDAB, INFO )
 *
 *                    Update A12
 *
-                     CALL CTRSM( 'Left', 'Upper', 'Conjugate transpose',
+                     CALL CTRSM( 'Left', 'Upper',
+     $                           'Conjugate transpose',
      $                           'Non-unit', IB, I2, CONE,
      $                           AB( KD+1, I ), LDAB-1,
      $                           AB( KD+1-IB, I+IB ), LDAB-1 )
 *
 *                    Update A22
 *
-                     CALL CHERK( 'Upper', 'Conjugate transpose', I2, IB,
+                     CALL CHERK( 'Upper', 'Conjugate transpose', I2,
+     $                           IB,
      $                           -ONE, AB( KD+1-IB, I+IB ), LDAB-1, ONE,
      $                           AB( KD+1, I+IB ), LDAB-1 )
                   END IF
@@ -295,7 +297,8 @@ SUBROUTINE CPBTRF( UPLO, N, KD, AB, LDAB, INFO )
 *
 *                    Update A13 (in the work array).
 *
-                     CALL CTRSM( 'Left', 'Upper', 'Conjugate transpose',
+                     CALL CTRSM( 'Left', 'Upper',
+     $                           'Conjugate transpose',
      $                           'Non-unit', IB, I3, CONE,
      $                           AB( KD+1, I ), LDAB-1, WORK, LDWORK )
 *
@@ -310,7 +313,8 @@ SUBROUTINE CPBTRF( UPLO, N, KD, AB, LDAB, INFO )
 *
 *                    Update A33
 *
-                     CALL CHERK( 'Upper', 'Conjugate transpose', I3, IB,
+                     CALL CHERK( 'Upper', 'Conjugate transpose', I3,
+     $                           IB,
      $                           -ONE, WORK, LDWORK, ONE,
      $                           AB( KD+1, I+KD ), LDAB-1 )
 *
@@ -380,7 +384,8 @@ SUBROUTINE CPBTRF( UPLO, N, KD, AB, LDAB, INFO )
 *
 *                    Update A22
 *
-                     CALL CHERK( 'Lower', 'No transpose', I2, IB, -ONE,
+                     CALL CHERK( 'Lower', 'No transpose', I2, IB,
+     $                           -ONE,
      $                           AB( 1+IB, I ), LDAB-1, ONE,
      $                           AB( 1, I+IB ), LDAB-1 )
                   END IF
@@ -413,7 +418,8 @@ SUBROUTINE CPBTRF( UPLO, N, KD, AB, LDAB, INFO )
 *
 *                    Update A33
 *
-                     CALL CHERK( 'Lower', 'No transpose', I3, IB, -ONE,
+                     CALL CHERK( 'Lower', 'No transpose', I3, IB,
+     $                           -ONE,
      $                           WORK, LDWORK, ONE, AB( 1, I+KD ),
      $                           LDAB-1 )
 *
diff --git a/SRC/cpbtrs.f b/SRC/cpbtrs.f
index 62874f688a..20b386eed5 100644
--- a/SRC/cpbtrs.f
+++ b/SRC/cpbtrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPBTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpbtrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpbtrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -114,10 +112,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup pbtrs
 *
 *  =====================================================================
       SUBROUTINE CPBTRS( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -184,12 +183,14 @@ SUBROUTINE CPBTRS( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
 *
 *           Solve U**H *X = B, overwriting B with X.
 *
-            CALL CTBSV( 'Upper', 'Conjugate transpose', 'Non-unit', N,
+            CALL CTBSV( 'Upper', 'Conjugate transpose', 'Non-unit',
+     $                  N,
      $                  KD, AB, LDAB, B( 1, J ), 1 )
 *
 *           Solve U*X = B, overwriting B with X.
 *
-            CALL CTBSV( 'Upper', 'No transpose', 'Non-unit', N, KD, AB,
+            CALL CTBSV( 'Upper', 'No transpose', 'Non-unit', N, KD,
+     $                  AB,
      $                  LDAB, B( 1, J ), 1 )
    10    CONTINUE
       ELSE
@@ -200,12 +201,14 @@ SUBROUTINE CPBTRS( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
 *
 *           Solve L*X = B, overwriting B with X.
 *
-            CALL CTBSV( 'Lower', 'No transpose', 'Non-unit', N, KD, AB,
+            CALL CTBSV( 'Lower', 'No transpose', 'Non-unit', N, KD,
+     $                  AB,
      $                  LDAB, B( 1, J ), 1 )
 *
 *           Solve L**H *X = B, overwriting B with X.
 *
-            CALL CTBSV( 'Lower', 'Conjugate transpose', 'Non-unit', N,
+            CALL CTBSV( 'Lower', 'Conjugate transpose', 'Non-unit',
+     $                  N,
      $                  KD, AB, LDAB, B( 1, J ), 1 )
    20    CONTINUE
       END IF
diff --git a/SRC/cpftrf.f b/SRC/cpftrf.f
index cbaab6832a..473c9d102b 100644
--- a/SRC/cpftrf.f
+++ b/SRC/cpftrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPFTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpftrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpftrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -91,8 +89,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *>
 *>  Further Notes on RFP Format:
@@ -204,10 +202,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup pftrf
 *
 *  =====================================================================
       SUBROUTINE CPFTRF( TRANSR, UPLO, N, A, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -304,7 +303,8 @@ SUBROUTINE CPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL CPOTRF( 'L', N1, A( 0 ), N, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL CTRSM( 'R', 'L', 'C', 'N', N2, N1, CONE, A( 0 ), N,
+               CALL CTRSM( 'R', 'L', 'C', 'N', N2, N1, CONE, A( 0 ),
+     $                     N,
      $                     A( N1 ), N )
                CALL CHERK( 'U', 'N', N2, N1, -ONE, A( N1 ), N, ONE,
      $                     A( N ), N )
@@ -321,7 +321,8 @@ SUBROUTINE CPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL CPOTRF( 'L', N1, A( N2 ), N, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL CTRSM( 'L', 'L', 'N', 'N', N1, N2, CONE, A( N2 ), N,
+               CALL CTRSM( 'L', 'L', 'N', 'N', N1, N2, CONE, A( N2 ),
+     $                     N,
      $                     A( 0 ), N )
                CALL CHERK( 'U', 'C', N2, N1, -ONE, A( 0 ), N, ONE,
      $                     A( N1 ), N )
@@ -344,9 +345,11 @@ SUBROUTINE CPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL CPOTRF( 'U', N1, A( 0 ), N1, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL CTRSM( 'L', 'U', 'C', 'N', N1, N2, CONE, A( 0 ), N1,
+               CALL CTRSM( 'L', 'U', 'C', 'N', N1, N2, CONE, A( 0 ),
+     $                     N1,
      $                     A( N1*N1 ), N1 )
-               CALL CHERK( 'L', 'C', N2, N1, -ONE, A( N1*N1 ), N1, ONE,
+               CALL CHERK( 'L', 'C', N2, N1, -ONE, A( N1*N1 ), N1,
+     $                     ONE,
      $                     A( 1 ), N1 )
                CALL CPOTRF( 'L', N2, A( 1 ), N1, INFO )
                IF( INFO.GT.0 )
@@ -361,7 +364,8 @@ SUBROUTINE CPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL CPOTRF( 'U', N1, A( N2*N2 ), N2, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL CTRSM( 'R', 'U', 'N', 'N', N2, N1, CONE, A( N2*N2 ),
+               CALL CTRSM( 'R', 'U', 'N', 'N', N2, N1, CONE,
+     $                     A( N2*N2 ),
      $                     N2, A( 0 ), N2 )
                CALL CHERK( 'L', 'N', N2, N1, -ONE, A( 0 ), N2, ONE,
      $                     A( N1*N2 ), N2 )
@@ -390,7 +394,8 @@ SUBROUTINE CPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL CPOTRF( 'L', K, A( 1 ), N+1, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL CTRSM( 'R', 'L', 'C', 'N', K, K, CONE, A( 1 ), N+1,
+               CALL CTRSM( 'R', 'L', 'C', 'N', K, K, CONE, A( 1 ),
+     $                     N+1,
      $                     A( K+1 ), N+1 )
                CALL CHERK( 'U', 'N', K, K, -ONE, A( K+1 ), N+1, ONE,
      $                     A( 0 ), N+1 )
@@ -430,9 +435,11 @@ SUBROUTINE CPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL CPOTRF( 'U', K, A( 0+K ), K, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL CTRSM( 'L', 'U', 'C', 'N', K, K, CONE, A( K ), N1,
+               CALL CTRSM( 'L', 'U', 'C', 'N', K, K, CONE, A( K ),
+     $                     N1,
      $                     A( K*( K+1 ) ), K )
-               CALL CHERK( 'L', 'C', K, K, -ONE, A( K*( K+1 ) ), K, ONE,
+               CALL CHERK( 'L', 'C', K, K, -ONE, A( K*( K+1 ) ), K,
+     $                     ONE,
      $                     A( 0 ), K )
                CALL CPOTRF( 'L', K, A( 0 ), K, INFO )
                IF( INFO.GT.0 )
diff --git a/SRC/cpftri.f b/SRC/cpftri.f
index 1f783a6fd1..342dcfb7d8 100644
--- a/SRC/cpftri.f
+++ b/SRC/cpftri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPFTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpftri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpftri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,7 +95,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup pftri
 *
 *> \par Further Details:
 *  =====================
@@ -209,6 +207,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CPFTRI( TRANSR, UPLO, N, A, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -237,7 +236,8 @@ SUBROUTINE CPFTRI( TRANSR, UPLO, N, A, INFO )
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, CTFTRI, CLAUUM, CTRMM, CHERK
+      EXTERNAL           XERBLA, CTFTRI, CLAUUM, CTRMM,
+     $                   CHERK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MOD
@@ -312,7 +312,8 @@ SUBROUTINE CPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL CLAUUM( 'L', N1, A( 0 ), N, INFO )
                CALL CHERK( 'L', 'C', N1, N2, ONE, A( N1 ), N, ONE,
      $                     A( 0 ), N )
-               CALL CTRMM( 'L', 'U', 'N', 'N', N2, N1, CONE, A( N ), N,
+               CALL CTRMM( 'L', 'U', 'N', 'N', N2, N1, CONE, A( N ),
+     $                     N,
      $                     A( N1 ), N )
                CALL CLAUUM( 'U', N2, A( N ), N, INFO )
 *
@@ -325,7 +326,8 @@ SUBROUTINE CPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL CLAUUM( 'L', N1, A( N2 ), N, INFO )
                CALL CHERK( 'L', 'N', N1, N2, ONE, A( 0 ), N, ONE,
      $                     A( N2 ), N )
-               CALL CTRMM( 'R', 'U', 'C', 'N', N1, N2, CONE, A( N1 ), N,
+               CALL CTRMM( 'R', 'U', 'C', 'N', N1, N2, CONE, A( N1 ),
+     $                     N,
      $                     A( 0 ), N )
                CALL CLAUUM( 'U', N2, A( N1 ), N, INFO )
 *
@@ -341,9 +343,11 @@ SUBROUTINE CPFTRI( TRANSR, UPLO, N, A, INFO )
 *              T1 -> a(0), T2 -> a(1), S -> a(0+N1*N1)
 *
                CALL CLAUUM( 'U', N1, A( 0 ), N1, INFO )
-               CALL CHERK( 'U', 'N', N1, N2, ONE, A( N1*N1 ), N1, ONE,
+               CALL CHERK( 'U', 'N', N1, N2, ONE, A( N1*N1 ), N1,
+     $                     ONE,
      $                     A( 0 ), N1 )
-               CALL CTRMM( 'R', 'L', 'N', 'N', N1, N2, CONE, A( 1 ), N1,
+               CALL CTRMM( 'R', 'L', 'N', 'N', N1, N2, CONE, A( 1 ),
+     $                     N1,
      $                     A( N1*N1 ), N1 )
                CALL CLAUUM( 'L', N2, A( 1 ), N1, INFO )
 *
@@ -355,7 +359,8 @@ SUBROUTINE CPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL CLAUUM( 'U', N1, A( N2*N2 ), N2, INFO )
                CALL CHERK( 'U', 'C', N1, N2, ONE, A( 0 ), N2, ONE,
      $                     A( N2*N2 ), N2 )
-               CALL CTRMM( 'L', 'L', 'C', 'N', N2, N1, CONE, A( N1*N2 ),
+               CALL CTRMM( 'L', 'L', 'C', 'N', N2, N1, CONE,
+     $                     A( N1*N2 ),
      $                     N2, A( 0 ), N2 )
                CALL CLAUUM( 'L', N2, A( N1*N2 ), N2, INFO )
 *
@@ -380,7 +385,8 @@ SUBROUTINE CPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL CLAUUM( 'L', K, A( 1 ), N+1, INFO )
                CALL CHERK( 'L', 'C', K, K, ONE, A( K+1 ), N+1, ONE,
      $                     A( 1 ), N+1 )
-               CALL CTRMM( 'L', 'U', 'N', 'N', K, K, CONE, A( 0 ), N+1,
+               CALL CTRMM( 'L', 'U', 'N', 'N', K, K, CONE, A( 0 ),
+     $                     N+1,
      $                     A( K+1 ), N+1 )
                CALL CLAUUM( 'U', K, A( 0 ), N+1, INFO )
 *
@@ -393,7 +399,8 @@ SUBROUTINE CPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL CLAUUM( 'L', K, A( K+1 ), N+1, INFO )
                CALL CHERK( 'L', 'N', K, K, ONE, A( 0 ), N+1, ONE,
      $                     A( K+1 ), N+1 )
-               CALL CTRMM( 'R', 'U', 'C', 'N', K, K, CONE, A( K ), N+1,
+               CALL CTRMM( 'R', 'U', 'C', 'N', K, K, CONE, A( K ),
+     $                     N+1,
      $                     A( 0 ), N+1 )
                CALL CLAUUM( 'U', K, A( K ), N+1, INFO )
 *
@@ -410,7 +417,8 @@ SUBROUTINE CPFTRI( TRANSR, UPLO, N, A, INFO )
 *              T1 -> a(0+k), T2 -> a(0+0), S -> a(0+k*(k+1)); lda=k
 *
                CALL CLAUUM( 'U', K, A( K ), K, INFO )
-               CALL CHERK( 'U', 'N', K, K, ONE, A( K*( K+1 ) ), K, ONE,
+               CALL CHERK( 'U', 'N', K, K, ONE, A( K*( K+1 ) ), K,
+     $                     ONE,
      $                     A( K ), K )
                CALL CTRMM( 'R', 'L', 'N', 'N', K, K, CONE, A( 0 ), K,
      $                     A( K*( K+1 ) ), K )
@@ -425,7 +433,8 @@ SUBROUTINE CPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL CLAUUM( 'U', K, A( K*( K+1 ) ), K, INFO )
                CALL CHERK( 'U', 'C', K, K, ONE, A( 0 ), K, ONE,
      $                     A( K*( K+1 ) ), K )
-               CALL CTRMM( 'L', 'L', 'C', 'N', K, K, CONE, A( K*K ), K,
+               CALL CTRMM( 'L', 'L', 'C', 'N', K, K, CONE, A( K*K ),
+     $                     K,
      $                     A( 0 ), K )
                CALL CLAUUM( 'L', K, A( K*K ), K, INFO )
 *
diff --git a/SRC/cpftrs.f b/SRC/cpftrs.f
index cd9a2434ca..211d54b84c 100644
--- a/SRC/cpftrs.f
+++ b/SRC/cpftrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPFTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpftrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpftrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -105,7 +103,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup pftrs
 *
 *> \par Further Details:
 *  =====================
@@ -217,6 +215,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CPFTRS( TRANSR, UPLO, N, NRHS, A, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -280,14 +279,18 @@ SUBROUTINE CPFTRS( TRANSR, UPLO, N, NRHS, A, B, LDB, INFO )
 *     start execution: there are two triangular solves
 *
       IF( LOWER ) THEN
-         CALL CTFSM( TRANSR, 'L', UPLO, 'N', 'N', N, NRHS, CONE, A, B,
+         CALL CTFSM( TRANSR, 'L', UPLO, 'N', 'N', N, NRHS, CONE, A,
+     $               B,
      $               LDB )
-         CALL CTFSM( TRANSR, 'L', UPLO, 'C', 'N', N, NRHS, CONE, A, B,
+         CALL CTFSM( TRANSR, 'L', UPLO, 'C', 'N', N, NRHS, CONE, A,
+     $               B,
      $               LDB )
       ELSE
-         CALL CTFSM( TRANSR, 'L', UPLO, 'C', 'N', N, NRHS, CONE, A, B,
+         CALL CTFSM( TRANSR, 'L', UPLO, 'C', 'N', N, NRHS, CONE, A,
+     $               B,
      $               LDB )
-         CALL CTFSM( TRANSR, 'L', UPLO, 'N', 'N', N, NRHS, CONE, A, B,
+         CALL CTFSM( TRANSR, 'L', UPLO, 'N', 'N', N, NRHS, CONE, A,
+     $               B,
      $               LDB )
       END IF
 *
diff --git a/SRC/cpocon.f b/SRC/cpocon.f
index 790d61d749..2840371184 100644
--- a/SRC/cpocon.f
+++ b/SRC/cpocon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPOCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpocon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpocon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,11 +111,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPOcomputational
+*> \ingroup pocon
 *
 *  =====================================================================
       SUBROUTINE CPOCON( UPLO, N, A, LDA, ANORM, RCOND, WORK, RWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -216,13 +215,15 @@ SUBROUTINE CPOCON( UPLO, N, A, LDA, ANORM, RCOND, WORK, RWORK,
 *
 *           Multiply by inv(U).
 *
-            CALL CLATRS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL CLATRS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   A, LDA, WORK, SCALEU, RWORK, INFO )
          ELSE
 *
 *           Multiply by inv(L).
 *
-            CALL CLATRS( 'Lower', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL CLATRS( 'Lower', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   A, LDA, WORK, SCALEL, RWORK, INFO )
             NORMIN = 'Y'
 *
diff --git a/SRC/cpoequ.f b/SRC/cpoequ.f
index adc484d96f..81c78840bf 100644
--- a/SRC/cpoequ.f
+++ b/SRC/cpoequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPOEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpoequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpoequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,10 +104,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPOcomputational
+*> \ingroup poequ
 *
 *  =====================================================================
       SUBROUTINE CPOEQU( N, A, LDA, S, SCOND, AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cpoequb.f b/SRC/cpoequb.f
index 22f5387b50..f2d0164622 100644
--- a/SRC/cpoequb.f
+++ b/SRC/cpoequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPOEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpoequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpoequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -112,10 +110,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPOcomputational
+*> \ingroup poequb
 *
 *  =====================================================================
       SUBROUTINE CPOEQUB( N, A, LDA, S, SCOND, AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cporfs.f b/SRC/cporfs.f
index 8e12d79738..e008edd22e 100644
--- a/SRC/cporfs.f
+++ b/SRC/cporfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPORFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cporfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cporfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -175,11 +173,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPOcomputational
+*> \ingroup porfs
 *
 *  =====================================================================
       SUBROUTINE CPORFS( UPLO, N, NRHS, A, LDA, AF, LDAF, B, LDB, X,
      $                   LDX, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -219,7 +218,8 @@ SUBROUTINE CPORFS( UPLO, N, NRHS, A, LDA, AF, LDAF, B, LDB, X,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CHEMV, CLACN2, CPOTRS, XERBLA
+      EXTERNAL           CAXPY, CCOPY, CHEMV, CLACN2, CPOTRS,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MAX, REAL
@@ -276,7 +276,7 @@ SUBROUTINE CPORFS( UPLO, N, NRHS, A, LDA, AF, LDAF, B, LDB, X,
       NZ = N + 1
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -292,7 +292,8 @@ SUBROUTINE CPORFS( UPLO, N, NRHS, A, LDA, AF, LDAF, B, LDB, X,
 *        Compute residual R = B - A * X
 *
          CALL CCOPY( N, B( 1, J ), 1, WORK, 1 )
-         CALL CHEMV( UPLO, N, -ONE, A, LDA, X( 1, J ), 1, ONE, WORK, 1 )
+         CALL CHEMV( UPLO, N, -ONE, A, LDA, X( 1, J ), 1, ONE, WORK,
+     $               1 )
 *
 *        Compute componentwise relative backward error from formula
 *
@@ -384,10 +385,11 @@ SUBROUTINE CPORFS( UPLO, N, NRHS, A, LDA, AF, LDAF, B, LDB, X,
 *
          DO 90 I = 1, N
             IF( RWORK( I ).GT.SAFE2 ) THEN
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I )
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I )
             ELSE
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I ) +
-     $                      SAFE1
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I ) + SAFE1
             END IF
    90    CONTINUE
 *
diff --git a/SRC/cporfsx.f b/SRC/cporfsx.f
index c41ba270eb..4b7c093722 100644
--- a/SRC/cporfsx.f
+++ b/SRC/cporfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPORFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cporfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cporfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -383,13 +381,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPOcomputational
+*> \ingroup porfsx
 *
 *  =====================================================================
-      SUBROUTINE CPORFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, S, B,
+      SUBROUTINE CPORFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, S,
+     $                    B,
      $                    LDB, X, LDX, RCOND, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -451,7 +451,8 @@ SUBROUTINE CPORFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, S, B,
 *     ..
 *     .. External Functions ..
       EXTERNAL           LSAME, ILAPREC
-      EXTERNAL           SLAMCH, CLANHE, CLA_PORCOND_X, CLA_PORCOND_C
+      EXTERNAL           SLAMCH, CLANHE, CLA_PORCOND_X,
+     $                   CLA_PORCOND_C
       REAL               SLAMCH, CLANHE, CLA_PORCOND_X, CLA_PORCOND_C
       LOGICAL            LSAME
       INTEGER            ILAPREC
@@ -508,7 +509,8 @@ SUBROUTINE CPORFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, S, B,
 *
 *     Test input parameters.
 *
-      IF (.NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF (.NOT.LSAME( UPLO, 'U' ) .AND.
+     $     .NOT.LSAME( UPLO, 'L' ) ) THEN
         INFO = -1
       ELSE IF( .NOT.RCEQU .AND. .NOT.LSAME( EQUED, 'N' ) ) THEN
         INFO = -2
diff --git a/SRC/cposv.f b/SRC/cposv.f
index f37dfa3c09..332f5b2773 100644
--- a/SRC/cposv.f
+++ b/SRC/cposv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPOSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cposv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cposv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -110,9 +108,9 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i of A is not
-*>                positive definite, so the factorization could not be
-*>                completed, and the solution has not been computed.
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                of A is not positive, so the factorization could not
+*>                be completed, and the solution has not been computed.
 *> \endverbatim
 *
 *  Authors:
@@ -123,10 +121,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPOsolve
+*> \ingroup posv
 *
 *  =====================================================================
       SUBROUTINE CPOSV( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -157,7 +156,8 @@ SUBROUTINE CPOSV( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/cposvx.f b/SRC/cposvx.f
index 78b9f4db1e..366ac8c2ed 100644
--- a/SRC/cposvx.f
+++ b/SRC/cposvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPOSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cposvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cposvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -70,7 +68,7 @@
 *>    where U is an upper triangular matrix and L is a lower triangular
 *>    matrix.
 *>
-*> 3. If the leading i-by-i principal minor is not positive definite,
+*> 3. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A.  If the reciprocal of the condition number is less than machine
@@ -276,10 +274,10 @@
 *>          = 0: successful exit
 *>          < 0: if INFO = -i, the i-th argument had an illegal value
 *>          > 0: if INFO = i, and i is
-*>                <= N:  the leading minor of order i of A is
-*>                       not positive definite, so the factorization
-*>                       could not be completed, and the solution has not
-*>                       been computed. RCOND = 0 is returned.
+*>                <= N:  the leading principal minor of order i of A
+*>                       is not positive, so the factorization could not
+*>                       be completed, and the solution has not been
+*>                       computed. RCOND = 0 is returned.
 *>                = N+1: U is nonsingular, but RCOND is less than machine
 *>                       precision, meaning that the matrix is singular
 *>                       to working precision.  Nevertheless, the
@@ -297,12 +295,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPOsolve
+*> \ingroup posvx
 *
 *  =====================================================================
-      SUBROUTINE CPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
+      SUBROUTINE CPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF,
+     $                   EQUED,
      $                   S, B, LDB, X, LDX, RCOND, FERR, BERR, WORK,
      $                   RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -336,7 +336,8 @@ SUBROUTINE CPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
       EXTERNAL           LSAME, CLANHE, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLACPY, CLAQHE, CPOCON, CPOEQU, CPORFS, CPOTRF,
+      EXTERNAL           CLACPY, CLAQHE, CPOCON, CPOEQU, CPORFS,
+     $                   CPOTRF,
      $                   CPOTRS, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -358,10 +359,13 @@ SUBROUTINE CPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -450,7 +454,8 @@ SUBROUTINE CPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL CPOCON( UPLO, N, AF, LDAF, ANORM, RCOND, WORK, RWORK, INFO )
+      CALL CPOCON( UPLO, N, AF, LDAF, ANORM, RCOND, WORK, RWORK,
+     $             INFO )
 *
 *     Compute the solution matrix X.
 *
diff --git a/SRC/cposvxx.f b/SRC/cposvxx.f
index 7834c75da4..f6daf66186 100644
--- a/SRC/cposvxx.f
+++ b/SRC/cposvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPOSVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cposvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cposvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -87,7 +85,7 @@
 *>    where U is an upper triangular matrix and L is a lower triangular
 *>    matrix.
 *>
-*>    3. If the leading i-by-i principal minor is not positive definite,
+*>    3. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A (see argument RCOND).  If the reciprocal of the condition number
@@ -486,13 +484,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPOsolve
+*> \ingroup posvxx
 *
 *  =====================================================================
-      SUBROUTINE CPOSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
+      SUBROUTINE CPOSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF,
+     $                    EQUED,
      $                    S, B, LDB, X, LDX, RCOND, RPVGRW, BERR,
      $                    N_ERR_BNDS, ERR_BNDS_NORM, ERR_BNDS_COMP,
      $                    NPARAMS, PARAMS, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cpotf2.f b/SRC/cpotf2.f
index 2f4658bae3..f7be4280cb 100644
--- a/SRC/cpotf2.f
+++ b/SRC/cpotf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPOTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpotf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpotf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -89,8 +87,8 @@
 *>          INFO is INTEGER
 *>          = 0: successful exit
 *>          < 0: if INFO = -k, the k-th argument had an illegal value
-*>          > 0: if INFO = k, the leading minor of order k is not
-*>               positive definite, and the factorization could not be
+*>          > 0: if INFO = k, the leading principal minor of order k
+*>               is not positive, and the factorization could not be
 *>               completed.
 *> \endverbatim
 *
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPOcomputational
+*> \ingroup potf2
 *
 *  =====================================================================
       SUBROUTINE CPOTF2( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -201,7 +200,8 @@ SUBROUTINE CPOTF2( UPLO, N, A, LDA, INFO )
 *
 *           Compute L(J,J) and test for non-positive-definiteness.
 *
-            AJJ = REAL( REAL( A( J, J ) ) - CDOTC( J-1, A( J, 1 ), LDA,
+            AJJ = REAL( REAL( A( J, J ) ) - CDOTC( J-1, A( J, 1 ),
+     $                  LDA,
      $            A( J, 1 ), LDA ) )
             IF( AJJ.LE.ZERO.OR.SISNAN( AJJ ) ) THEN
                A( J, J ) = AJJ
@@ -214,7 +214,8 @@ SUBROUTINE CPOTF2( UPLO, N, A, LDA, INFO )
 *
             IF( J.LT.N ) THEN
                CALL CLACGV( J-1, A( J, 1 ), LDA )
-               CALL CGEMV( 'No transpose', N-J, J-1, -CONE, A( J+1, 1 ),
+               CALL CGEMV( 'No transpose', N-J, J-1, -CONE, A( J+1,
+     $                     1 ),
      $                     LDA, A( J, 1 ), LDA, CONE, A( J+1, J ), 1 )
                CALL CLACGV( J-1, A( J, 1 ), LDA )
                CALL CSSCAL( N-J, ONE / AJJ, A( J+1, J ), 1 )
diff --git a/SRC/cpotrf.f b/SRC/cpotrf.f
index 6aba3103e1..468e6c1dbd 100644
--- a/SRC/cpotrf.f
+++ b/SRC/cpotrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPOTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpotrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpotrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -87,8 +85,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *> \endverbatim
 *
@@ -100,10 +98,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPOcomputational
+*> \ingroup potrf
 *
 *  =====================================================================
       SUBROUTINE CPOTRF( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -134,7 +133,8 @@ SUBROUTINE CPOTRF( UPLO, N, A, LDA, INFO )
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMM, CHERK, CPOTRF2, CTRSM, XERBLA
+      EXTERNAL           CGEMM, CHERK, CPOTRF2, CTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -193,7 +193,8 @@ SUBROUTINE CPOTRF( UPLO, N, A, LDA, INFO )
 *
 *                 Compute the current block row.
 *
-                  CALL CGEMM( 'Conjugate transpose', 'No transpose', JB,
+                  CALL CGEMM( 'Conjugate transpose', 'No transpose',
+     $                        JB,
      $                        N-J-JB+1, J-1, -CONE, A( 1, J ), LDA,
      $                        A( 1, J+JB ), LDA, CONE, A( J, J+JB ),
      $                        LDA )
@@ -226,7 +227,8 @@ SUBROUTINE CPOTRF( UPLO, N, A, LDA, INFO )
      $                        N-J-JB+1, JB, J-1, -CONE, A( J+JB, 1 ),
      $                        LDA, A( J, 1 ), LDA, CONE, A( J+JB, J ),
      $                        LDA )
-                  CALL CTRSM( 'Right', 'Lower', 'Conjugate transpose',
+                  CALL CTRSM( 'Right', 'Lower',
+     $                        'Conjugate transpose',
      $                        'Non-unit', N-J-JB+1, JB, CONE, A( J, J ),
      $                        LDA, A( J+JB, J ), LDA )
                END IF
diff --git a/SRC/cpotrf2.f b/SRC/cpotrf2.f
index e1eae3e9df..436dcbe5de 100644
--- a/SRC/cpotrf2.f
+++ b/SRC/cpotrf2.f
@@ -86,8 +86,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *> \endverbatim
 *
@@ -99,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPOcomputational
+*> \ingroup potrf2
 *
 *  =====================================================================
       RECURSIVE SUBROUTINE CPOTRF2( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cpotri.f b/SRC/cpotri.f
index bf05c91be2..aca43e8984 100644
--- a/SRC/cpotri.f
+++ b/SRC/cpotri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPOTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpotri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpotri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,10 +86,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPOcomputational
+*> \ingroup potri
 *
 *  =====================================================================
       SUBROUTINE CPOTRI( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -122,7 +121,8 @@ SUBROUTINE CPOTRI( UPLO, N, A, LDA, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/cpotrs.f b/SRC/cpotrs.f
index bb08ca6878..a8841924af 100644
--- a/SRC/cpotrs.f
+++ b/SRC/cpotrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPOTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpotrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpotrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -103,10 +101,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPOcomputational
+*> \ingroup potrs
 *
 *  =====================================================================
       SUBROUTINE CPOTRS( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,7 +171,8 @@ SUBROUTINE CPOTRS( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
 *
 *        Solve U**H *X = B, overwriting B with X.
 *
-         CALL CTRSM( 'Left', 'Upper', 'Conjugate transpose', 'Non-unit',
+         CALL CTRSM( 'Left', 'Upper', 'Conjugate transpose',
+     $               'Non-unit',
      $               N, NRHS, ONE, A, LDA, B, LDB )
 *
 *        Solve U*X = B, overwriting B with X.
@@ -190,7 +190,8 @@ SUBROUTINE CPOTRS( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
 *
 *        Solve L**H *X = B, overwriting B with X.
 *
-         CALL CTRSM( 'Left', 'Lower', 'Conjugate transpose', 'Non-unit',
+         CALL CTRSM( 'Left', 'Lower', 'Conjugate transpose',
+     $               'Non-unit',
      $               N, NRHS, ONE, A, LDA, B, LDB )
       END IF
 *
diff --git a/SRC/cppcon.f b/SRC/cppcon.f
index 84e3b79779..1e94a98901 100644
--- a/SRC/cppcon.f
+++ b/SRC/cppcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPPCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cppcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cppcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -111,10 +109,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup ppcon
 *
 *  =====================================================================
-      SUBROUTINE CPPCON( UPLO, N, AP, ANORM, RCOND, WORK, RWORK, INFO )
+      SUBROUTINE CPPCON( UPLO, N, AP, ANORM, RCOND, WORK, RWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -211,13 +211,15 @@ SUBROUTINE CPPCON( UPLO, N, AP, ANORM, RCOND, WORK, RWORK, INFO )
 *
 *           Multiply by inv(U).
 *
-            CALL CLATPS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL CLATPS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   AP, WORK, SCALEU, RWORK, INFO )
          ELSE
 *
 *           Multiply by inv(L).
 *
-            CALL CLATPS( 'Lower', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL CLATPS( 'Lower', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   AP, WORK, SCALEL, RWORK, INFO )
             NORMIN = 'Y'
 *
diff --git a/SRC/cppequ.f b/SRC/cppequ.f
index 223167338c..972e13903f 100644
--- a/SRC/cppequ.f
+++ b/SRC/cppequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPPEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cppequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cppequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -110,10 +108,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup ppequ
 *
 *  =====================================================================
       SUBROUTINE CPPEQU( UPLO, N, AP, S, SCOND, AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cpprfs.f b/SRC/cpprfs.f
index 6c26b0c130..ba69687aaa 100644
--- a/SRC/cpprfs.f
+++ b/SRC/cpprfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPPRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpprfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpprfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,11 +161,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup pprfs
 *
 *  =====================================================================
-      SUBROUTINE CPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
+      SUBROUTINE CPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX,
+     $                   FERR,
      $                   BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -207,7 +207,8 @@ SUBROUTINE CPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CHPMV, CLACN2, CPPTRS, XERBLA
+      EXTERNAL           CAXPY, CCOPY, CHPMV, CLACN2, CPPTRS,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MAX, REAL
@@ -260,7 +261,7 @@ SUBROUTINE CPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
       NZ = N + 1
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -276,7 +277,8 @@ SUBROUTINE CPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
 *        Compute residual R = B - A * X
 *
          CALL CCOPY( N, B( 1, J ), 1, WORK, 1 )
-         CALL CHPMV( UPLO, N, -CONE, AP, X( 1, J ), 1, CONE, WORK, 1 )
+         CALL CHPMV( UPLO, N, -CONE, AP, X( 1, J ), 1, CONE, WORK,
+     $               1 )
 *
 *        Compute componentwise relative backward error from formula
 *
@@ -376,10 +378,11 @@ SUBROUTINE CPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
 *
          DO 90 I = 1, N
             IF( RWORK( I ).GT.SAFE2 ) THEN
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I )
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I )
             ELSE
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I ) +
-     $                      SAFE1
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I ) + SAFE1
             END IF
    90    CONTINUE
 *
diff --git a/SRC/cppsv.f b/SRC/cppsv.f
index 1e6f02695b..20f5b2af9e 100644
--- a/SRC/cppsv.f
+++ b/SRC/cppsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPPSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cppsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cppsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -104,9 +102,9 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i of A is not
-*>                positive definite, so the factorization could not be
-*>                completed, and the solution has not been computed.
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                of A is not positive, so the factorization could not
+*>                be completed, and the solution has not been computed.
 *> \endverbatim
 *
 *  Authors:
@@ -117,7 +115,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERsolve
+*> \ingroup ppsv
 *
 *> \par Further Details:
 *  =====================
@@ -141,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CPPSV( UPLO, N, NRHS, AP, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,7 +170,8 @@ SUBROUTINE CPPSV( UPLO, N, NRHS, AP, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/cppsvx.f b/SRC/cppsvx.f
index f6f07538c0..0e905eb96d 100644
--- a/SRC/cppsvx.f
+++ b/SRC/cppsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPPSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cppsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cppsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -69,7 +67,7 @@
 *>    where U is an upper triangular matrix, L is a lower triangular
 *>    matrix, and **H indicates conjugate transpose.
 *>
-*> 3. If the leading i-by-i principal minor is not positive definite,
+*> 3. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A.  If the reciprocal of the condition number is less than machine
@@ -262,10 +260,10 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO = i, and i is
-*>                <= N:  the leading minor of order i of A is
-*>                       not positive definite, so the factorization
-*>                       could not be completed, and the solution has not
-*>                       been computed. RCOND = 0 is returned.
+*>                <= N:  the leading principal minor of order i of A
+*>                       is not positive, so the factorization could not
+*>                       be completed, and the solution has not been
+*>                       computed. RCOND = 0 is returned.
 *>                = N+1: U is nonsingular, but RCOND is less than machine
 *>                       precision, meaning that the matrix is singular
 *>                       to working precision.  Nevertheless, the
@@ -283,7 +281,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERsolve
+*> \ingroup ppsvx
 *
 *> \par Further Details:
 *  =====================
@@ -306,8 +304,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B, LDB,
+      SUBROUTINE CPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B,
+     $                   LDB,
      $                   X, LDX, RCOND, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -341,7 +341,8 @@ SUBROUTINE CPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B, LDB,
       EXTERNAL           LSAME, CLANHP, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CLACPY, CLAQHP, CPPCON, CPPEQU, CPPRFS,
+      EXTERNAL           CCOPY, CLACPY, CLAQHP, CPPCON, CPPEQU,
+     $                   CPPRFS,
      $                   CPPTRF, CPPTRS, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -363,10 +364,13 @@ SUBROUTINE CPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B, LDB,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -461,7 +465,8 @@ SUBROUTINE CPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B, LDB,
 *     Use iterative refinement to improve the computed solution and
 *     compute error bounds and backward error estimates for it.
 *
-      CALL CPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR, BERR,
+      CALL CPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
+     $             BERR,
      $             WORK, RWORK, INFO )
 *
 *     Transform the solution matrix X to a solution of the original
diff --git a/SRC/cpptrf.f b/SRC/cpptrf.f
index 4e81458cbc..04a206bb0e 100644
--- a/SRC/cpptrf.f
+++ b/SRC/cpptrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPPTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpptrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpptrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -79,9 +77,9 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
-*>                completed.
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive definite, and the factorization could
+*>                not be completed.
 *> \endverbatim
 *
 *  Authors:
@@ -92,7 +90,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup pptrf
 *
 *> \par Further Details:
 *  =====================
@@ -116,6 +114,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CPPTRF( UPLO, N, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -184,7 +183,8 @@ SUBROUTINE CPPTRF( UPLO, N, AP, INFO )
 *           Compute elements 1:J-1 of column J.
 *
             IF( J.GT.1 )
-     $         CALL CTPSV( 'Upper', 'Conjugate transpose', 'Non-unit',
+     $         CALL CTPSV( 'Upper', 'Conjugate transpose',
+     $                     'Non-unit',
      $                     J-1, AP, AP( JC ), 1 )
 *
 *           Compute U(J,J) and test for non-positive-definiteness.
diff --git a/SRC/cpptri.f b/SRC/cpptri.f
index 3f24d20bd2..d96e847d05 100644
--- a/SRC/cpptri.f
+++ b/SRC/cpptri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPPTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpptri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpptri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -86,10 +84,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup pptri
 *
 *  =====================================================================
       SUBROUTINE CPPTRI( UPLO, N, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,9 +171,11 @@ SUBROUTINE CPPTRI( UPLO, N, AP, INFO )
          JJ = 1
          DO 20 J = 1, N
             JJN = JJ + N - J + 1
-            AP( JJ ) = REAL( CDOTC( N-J+1, AP( JJ ), 1, AP( JJ ), 1 ) )
+            AP( JJ ) = REAL( CDOTC( N-J+1, AP( JJ ), 1, AP( JJ ),
+     $          1 ) )
             IF( J.LT.N )
-     $         CALL CTPMV( 'Lower', 'Conjugate transpose', 'Non-unit',
+     $         CALL CTPMV( 'Lower', 'Conjugate transpose',
+     $                     'Non-unit',
      $                     N-J, AP( JJN ), AP( JJ+1 ), 1 )
             JJ = JJN
    20    CONTINUE
diff --git a/SRC/cpptrs.f b/SRC/cpptrs.f
index 08bba1acc0..8ab13a260b 100644
--- a/SRC/cpptrs.f
+++ b/SRC/cpptrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPPTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpptrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpptrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup pptrs
 *
 *  =====================================================================
       SUBROUTINE CPPTRS( UPLO, N, NRHS, AP, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -167,7 +166,8 @@ SUBROUTINE CPPTRS( UPLO, N, NRHS, AP, B, LDB, INFO )
 *
 *           Solve U**H *X = B, overwriting B with X.
 *
-            CALL CTPSV( 'Upper', 'Conjugate transpose', 'Non-unit', N,
+            CALL CTPSV( 'Upper', 'Conjugate transpose', 'Non-unit',
+     $                  N,
      $                  AP, B( 1, I ), 1 )
 *
 *           Solve U*X = B, overwriting B with X.
@@ -188,7 +188,8 @@ SUBROUTINE CPPTRS( UPLO, N, NRHS, AP, B, LDB, INFO )
 *
 *           Solve L**H *X = Y, overwriting B with X.
 *
-            CALL CTPSV( 'Lower', 'Conjugate transpose', 'Non-unit', N,
+            CALL CTPSV( 'Lower', 'Conjugate transpose', 'Non-unit',
+     $                  N,
      $                  AP, B( 1, I ), 1 )
    20    CONTINUE
       END IF
diff --git a/SRC/cpstf2.f b/SRC/cpstf2.f
index 001042e1ef..be2e93cff8 100644
--- a/SRC/cpstf2.f
+++ b/SRC/cpstf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPSTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpstf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpstf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,10 +133,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup pstf2
 *
 *  =====================================================================
-      SUBROUTINE CPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
+      SUBROUTINE CPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -175,7 +175,8 @@ SUBROUTINE CPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
       EXTERNAL           SLAMCH, LSAME, SISNAN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMV, CLACGV, CSSCAL, CSWAP, XERBLA
+      EXTERNAL           CGEMV, CLACGV, CSSCAL, CSWAP,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CONJG, MAX, REAL, SQRT
@@ -225,7 +226,7 @@ SUBROUTINE CPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *     Compute stopping value if not supplied
 *
       IF( TOL.LT.ZERO ) THEN
-         SSTOP = N * SLAMCH( 'Epsilon' ) * AJJ
+         SSTOP = REAL( N ) * SLAMCH( 'Epsilon' ) * AJJ
       ELSE
          SSTOP = TOL
       END IF
@@ -300,7 +301,8 @@ SUBROUTINE CPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *
             IF( J.LT.N ) THEN
                CALL CLACGV( J-1, A( 1, J ), 1 )
-               CALL CGEMV( 'Trans', J-1, N-J, -CONE, A( 1, J+1 ), LDA,
+               CALL CGEMV( 'Trans', J-1, N-J, -CONE, A( 1, J+1 ),
+     $                     LDA,
      $                     A( 1, J ), 1, CONE, A( J, J+1 ), LDA )
                CALL CLACGV( J-1, A( 1, J ), 1 )
                CALL CSSCAL( N-J, ONE / AJJ, A( J, J+1 ), LDA )
@@ -346,7 +348,8 @@ SUBROUTINE CPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
                A( PVT, PVT ) = A( J, J )
                CALL CSWAP( J-1, A( J, 1 ), LDA, A( PVT, 1 ), LDA )
                IF( PVT.LT.N )
-     $            CALL CSWAP( N-PVT, A( PVT+1, J ), 1, A( PVT+1, PVT ),
+     $            CALL CSWAP( N-PVT, A( PVT+1, J ), 1, A( PVT+1,
+     $                        PVT ),
      $                        1 )
                DO 170 I = J + 1, PVT - 1
                   CTEMP = CONJG( A( I, J ) )
diff --git a/SRC/cpstrf.f b/SRC/cpstrf.f
index 119b954f39..5a649cbe19 100644
--- a/SRC/cpstrf.f
+++ b/SRC/cpstrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPSTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpstrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpstrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,10 +133,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup pstrf
 *
 *  =====================================================================
-      SUBROUTINE CPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
+      SUBROUTINE CPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -176,7 +176,8 @@ SUBROUTINE CPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
       EXTERNAL           SLAMCH, ILAENV, LSAME, SISNAN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMV, CHERK, CLACGV, CPSTF2, CSSCAL, CSWAP,
+      EXTERNAL           CGEMV, CHERK, CLACGV, CPSTF2, CSSCAL,
+     $                   CSWAP,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -240,7 +241,7 @@ SUBROUTINE CPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *     Compute stopping value if not supplied
 *
          IF( TOL.LT.ZERO ) THEN
-            SSTOP = N * SLAMCH( 'Epsilon' ) * AJJ
+            SSTOP = REAL( N ) * SLAMCH( 'Epsilon' ) * AJJ
          ELSE
             SSTOP = TOL
          END IF
@@ -323,7 +324,8 @@ SUBROUTINE CPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *
                   IF( J.LT.N ) THEN
                      CALL CLACGV( J-1, A( 1, J ), 1 )
-                     CALL CGEMV( 'Trans', J-K, N-J, -CONE, A( K, J+1 ),
+                     CALL CGEMV( 'Trans', J-K, N-J, -CONE, A( K,
+     $                           J+1 ),
      $                           LDA, A( K, J ), 1, CONE, A( J, J+1 ),
      $                           LDA )
                      CALL CLACGV( J-1, A( 1, J ), 1 )
@@ -390,7 +392,8 @@ SUBROUTINE CPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *                    Pivot OK, so can now swap pivot rows and columns
 *
                      A( PVT, PVT ) = A( J, J )
-                     CALL CSWAP( J-1, A( J, 1 ), LDA, A( PVT, 1 ), LDA )
+                     CALL CSWAP( J-1, A( J, 1 ), LDA, A( PVT, 1 ),
+     $                           LDA )
                      IF( PVT.LT.N )
      $                  CALL CSWAP( N-PVT, A( PVT+1, J ), 1,
      $                              A( PVT+1, PVT ), 1 )
diff --git a/SRC/cptcon.f b/SRC/cptcon.f
index 67d247dffc..b12df00bd6 100644
--- a/SRC/cptcon.f
+++ b/SRC/cptcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPTCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cptcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cptcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,7 +100,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPTcomputational
+*> \ingroup ptcon
 *
 *> \par Further Details:
 *  =====================
@@ -116,6 +114,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CPTCON( N, D, E, ANORM, RCOND, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cpteqr.f b/SRC/cpteqr.f
index e3af590416..135b6e23b6 100644
--- a/SRC/cpteqr.f
+++ b/SRC/cpteqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPTEQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpteqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpteqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,8 +121,8 @@
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value.
 *>          > 0:  if INFO = i, and i is:
 *>                <= N  the Cholesky factorization of the matrix could
-*>                      not be performed because the i-th principal minor
-*>                      was not positive definite.
+*>                      not be performed because the leading principal
+*>                      minor of order i was not positive.
 *>                > N   the SVD algorithm failed to converge;
 *>                      if INFO = N+i, i off-diagonal elements of the
 *>                      bidiagonal factor did not converge to zero.
@@ -138,10 +136,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPTcomputational
+*> \ingroup pteqr
 *
 *  =====================================================================
       SUBROUTINE CPTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cptrfs.f b/SRC/cptrfs.f
index 1ef289dcce..18fa2e3739 100644
--- a/SRC/cptrfs.f
+++ b/SRC/cptrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPTRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cptrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cptrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -175,11 +173,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPTcomputational
+*> \ingroup ptrfs
 *
 *  =====================================================================
       SUBROUTINE CPTRFS( UPLO, N, NRHS, D, E, DF, EF, B, LDB, X, LDX,
      $                   FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -271,7 +270,7 @@ SUBROUTINE CPTRFS( UPLO, N, NRHS, D, E, DF, EF, B, LDB, X, LDX,
       NZ = 4
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -409,10 +408,11 @@ SUBROUTINE CPTRFS( UPLO, N, NRHS, D, E, DF, EF, B, LDB, X, LDX,
 *
          DO 60 I = 1, N
             IF( RWORK( I ).GT.SAFE2 ) THEN
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I )
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I )
             ELSE
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I ) +
-     $                      SAFE1
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I ) + SAFE1
             END IF
    60    CONTINUE
          IX = ISAMAX( N, RWORK, 1 )
diff --git a/SRC/cptsv.f b/SRC/cptsv.f
index 20ee32bbed..0ce6e02299 100644
--- a/SRC/cptsv.f
+++ b/SRC/cptsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPTSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cptsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cptsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -94,8 +92,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the solution has not been
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the solution has not been
 *>                computed.  The factorization has not been completed
 *>                unless i = N.
 *> \endverbatim
@@ -108,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPTsolve
+*> \ingroup ptsv
 *
 *  =====================================================================
       SUBROUTINE CPTSV( N, NRHS, D, E, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cptsvx.f b/SRC/cptsvx.f
index db63a3c36a..fd1423f86a 100644
--- a/SRC/cptsvx.f
+++ b/SRC/cptsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPTSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cptsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cptsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -60,7 +58,7 @@
 *>    factorization can also be regarded as having the form
 *>    A = U**H*D*U.
 *>
-*> 2. If the leading i-by-i principal minor is not positive definite,
+*> 2. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A.  If the reciprocal of the condition number is less than machine
@@ -205,10 +203,10 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO = i, and i is
-*>                <= N:  the leading minor of order i of A is
-*>                       not positive definite, so the factorization
-*>                       could not be completed, and the solution has not
-*>                       been computed. RCOND = 0 is returned.
+*>                <= N:  the leading principal minor of order i of A
+*>                       is not positive, so the factorization could not
+*>                       be completed, and the solution has not been
+*>                       computed. RCOND = 0 is returned.
 *>                = N+1: U is nonsingular, but RCOND is less than machine
 *>                       precision, meaning that the matrix is singular
 *>                       to working precision.  Nevertheless, the
@@ -226,11 +224,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPTsolve
+*> \ingroup ptsvx
 *
 *  =====================================================================
       SUBROUTINE CPTSVX( FACT, N, NRHS, D, E, DF, EF, B, LDB, X, LDX,
      $                   RCOND, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -264,7 +263,8 @@ SUBROUTINE CPTSVX( FACT, N, NRHS, D, E, DF, EF, B, LDB, X, LDX,
       EXTERNAL           LSAME, CLANHT, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CLACPY, CPTCON, CPTRFS, CPTTRF, CPTTRS,
+      EXTERNAL           CCOPY, CLACPY, CPTCON, CPTRFS, CPTTRF,
+     $                   CPTTRS,
      $                   SCOPY, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -325,7 +325,8 @@ SUBROUTINE CPTSVX( FACT, N, NRHS, D, E, DF, EF, B, LDB, X, LDX,
 *     Use iterative refinement to improve the computed solutions and
 *     compute error bounds and backward error estimates for them.
 *
-      CALL CPTRFS( 'Lower', N, NRHS, D, E, DF, EF, B, LDB, X, LDX, FERR,
+      CALL CPTRFS( 'Lower', N, NRHS, D, E, DF, EF, B, LDB, X, LDX,
+     $             FERR,
      $             BERR, WORK, RWORK, INFO )
 *
 *     Set INFO = N+1 if the matrix is singular to working precision.
diff --git a/SRC/cpttrf.f b/SRC/cpttrf.f
index c6379e9239..1d0da1199b 100644
--- a/SRC/cpttrf.f
+++ b/SRC/cpttrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPTTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpttrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpttrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -71,8 +69,8 @@
 *>          INFO is INTEGER
 *>          = 0: successful exit
 *>          < 0: if INFO = -k, the k-th argument had an illegal value
-*>          > 0: if INFO = k, the leading minor of order k is not
-*>               positive definite; if k < N, the factorization could not
+*>          > 0: if INFO = k, the leading principal minor of order k
+*>               is not positive; if k < N, the factorization could not
 *>               be completed, while if k = N, the factorization was
 *>               completed, but D(N) <= 0.
 *> \endverbatim
@@ -85,10 +83,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPTcomputational
+*> \ingroup pttrf
 *
 *  =====================================================================
       SUBROUTINE CPTTRF( N, D, E, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cpttrs.f b/SRC/cpttrs.f
index 636a8de929..ac9bac3104 100644
--- a/SRC/cpttrs.f
+++ b/SRC/cpttrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPTTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cpttrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cpttrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -114,10 +112,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPTcomputational
+*> \ingroup pttrs
 *
 *  =====================================================================
       SUBROUTINE CPTTRS( UPLO, N, NRHS, D, E, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cptts2.f b/SRC/cptts2.f
index 15ea7ede86..cfef1ae3de 100644
--- a/SRC/cptts2.f
+++ b/SRC/cptts2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CPTTS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cptts2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cptts2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,10 +104,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexPTcomputational
+*> \ingroup ptts2
 *
 *  =====================================================================
       SUBROUTINE CPTTS2( IUPLO, N, NRHS, D, E, B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/crot.f b/SRC/crot.f
index 6dc771506f..884b5caf19 100644
--- a/SRC/crot.f
+++ b/SRC/crot.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CROT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/crot.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/crot.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -35,7 +33,7 @@
 *>
 *> \verbatim
 *>
-*> CROT   applies a plane rotation, where the cos (C) is real and the
+*> CROT applies a plane rotation, where the cos (C) is real and the
 *> sin (S) is complex, and the vectors CX and CY are complex.
 *> \endverbatim
 *
@@ -96,10 +94,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup rot
 *
 *  =====================================================================
       SUBROUTINE CROT( N, CX, INCX, CY, INCY, C, S )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/crscl.f b/SRC/crscl.f
new file mode 100644
index 0000000000..d59b049aa0
--- /dev/null
+++ b/SRC/crscl.f
@@ -0,0 +1,203 @@
+*> \brief \b CRSCL multiplies a vector by the reciprocal of a real scalar.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download CRSCL + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/crscl.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/crscl.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/crscl.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE CRSCL( N, A, X, INCX )
+*
+*       .. Scalar Arguments ..
+*       INTEGER            INCX, N
+*       COMPLEX            A
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX            X( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> CRSCL multiplies an n-element complex vector x by the complex scalar
+*> 1/a.  This is done without overflow or underflow as long as
+*> the final result x/a does not overflow or underflow.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of components of the vector x.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX
+*>          The scalar a which is used to divide each component of x.
+*>          A must not be 0, or the subroutine will divide by zero.
+*> \endverbatim
+*>
+*> \param[in,out] X
+*> \verbatim
+*>          X is COMPLEX array, dimension
+*>                         (1+(N-1)*abs(INCX))
+*>          The n-element vector x.
+*> \endverbatim
+*>
+*> \param[in] INCX
+*> \verbatim
+*>          INCX is INTEGER
+*>          The increment between successive values of the vector X.
+*>          > 0:  X(1) = X(1) and X(1+(i-1)*INCX) = x(i),     1< i<= n
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup complexOTHERauxiliary
+*
+*  =====================================================================
+      SUBROUTINE CRSCL( N, A, X, INCX )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            INCX, N
+      COMPLEX            A
+*     ..
+*     .. Array Arguments ..
+      COMPLEX            X( * )
+*     ..
+*
+* =====================================================================
+*
+*     .. Parameters ..
+      REAL               ZERO, ONE
+      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0 )
+*     ..
+*     .. Local Scalars ..
+      REAL               SAFMAX, SAFMIN, OV, AR, AI, ABSR, ABSI, UR
+     %                   , UI
+*     ..
+*     .. External Functions ..
+      REAL               SLAMCH
+      COMPLEX            CLADIV
+      EXTERNAL           SLAMCH, CLADIV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           CSCAL, CSSCAL, CSRSCL
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible
+*
+      IF( N.LE.0 )
+     $   RETURN
+*
+*     Get machine parameters
+*
+      SAFMIN = SLAMCH( 'S' )
+      SAFMAX = ONE / SAFMIN
+      OV   = SLAMCH( 'O' )
+*
+*     Initialize constants related to A.
+*
+      AR = REAL( A )
+      AI = AIMAG( A )
+      ABSR = ABS( AR )
+      ABSI = ABS( AI )
+*
+      IF( AI.EQ.ZERO ) THEN
+*        If alpha is real, then we can use csrscl
+         CALL CSRSCL( N, AR, X, INCX )
+*
+      ELSE IF( AR.EQ.ZERO ) THEN
+*        If alpha has a zero real part, then we follow the same rules as if
+*        alpha were real.
+         IF( ABSI.GT.SAFMAX ) THEN
+            CALL CSSCAL( N, SAFMIN, X, INCX )
+            CALL CSCAL( N, CMPLX( ZERO, -SAFMAX / AI ), X, INCX )
+         ELSE IF( ABSI.LT.SAFMIN ) THEN
+            CALL CSCAL( N, CMPLX( ZERO, -SAFMIN / AI ), X, INCX )
+            CALL CSSCAL( N, SAFMAX, X, INCX )
+         ELSE
+            CALL CSCAL( N, CMPLX( ZERO, -ONE / AI ), X, INCX )
+         END IF
+*
+      ELSE
+*        The following numbers can be computed.
+*        They are the inverse of the real and imaginary parts of 1/alpha.
+*        Note that a and b are always different from zero.
+*        NaNs are only possible if either:
+*        1. alphaR or alphaI is NaN.
+*        2. alphaR and alphaI are both infinite, in which case it makes sense
+*        to propagate a NaN.
+         UR = AR + AI * ( AI / AR )
+         UI = AI + AR * ( AR / AI )
+*
+         IF( (ABS( UR ).LT.SAFMIN).OR.(ABS( UI ).LT.SAFMIN) ) THEN
+*           This means that both alphaR and alphaI are very small.
+            CALL CSCAL( N, CMPLX( SAFMIN / UR, -SAFMIN / UI ), X,
+     $                  INCX )
+            CALL CSSCAL( N, SAFMAX, X, INCX )
+         ELSE IF( (ABS( UR ).GT.SAFMAX).OR.(ABS( UI ).GT.SAFMAX) ) THEN
+            IF( (ABSR.GT.OV).OR.(ABSI.GT.OV) ) THEN
+*              This means that a and b are both Inf. No need for scaling.
+               CALL CSCAL( N, CMPLX( ONE / UR, -ONE / UI ), X, INCX )
+            ELSE
+               CALL CSSCAL( N, SAFMIN, X, INCX )
+               IF( (ABS( UR ).GT.OV).OR.(ABS( UI ).GT.OV) ) THEN
+*                 Infs were generated. We do proper scaling to avoid them.
+                  IF( ABSR.GE.ABSI ) THEN
+*                    ABS( UR ) <= ABS( UI )
+                     UR = (SAFMIN * AR) + SAFMIN * (AI * ( AI / AR ))
+                     UI = (SAFMIN * AI) + AR * ( (SAFMIN * AR) / AI )
+                  ELSE
+*                    ABS( UR ) > ABS( UI )
+                     UR = (SAFMIN * AR) + AI * ( (SAFMIN * AI) / AR )
+                     UI = (SAFMIN * AI) + SAFMIN * (AR * ( AR / AI ))
+                  END IF
+                  CALL CSCAL( N, CMPLX( ONE / UR, -ONE / UI ), X,
+     $                        INCX )
+               ELSE
+                  CALL CSCAL( N, CMPLX( SAFMAX / UR, -SAFMAX / UI ),
+     $                        X, INCX )
+               END IF
+            END IF
+         ELSE
+            CALL CSCAL( N, CMPLX( ONE / UR, -ONE / UI ), X, INCX )
+         END IF
+      END IF
+*
+      RETURN
+*
+*     End of CRSCL
+*
+      END
diff --git a/SRC/cspcon.f b/SRC/cspcon.f
index 75b33da6a4..47875fb829 100644
--- a/SRC/cspcon.f
+++ b/SRC/cspcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSPCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cspcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cspcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -111,10 +109,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hpcon
 *
 *  =====================================================================
-      SUBROUTINE CSPCON( UPLO, N, AP, IPIV, ANORM, RCOND, WORK, INFO )
+      SUBROUTINE CSPCON( UPLO, N, AP, IPIV, ANORM, RCOND, WORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cspmv.f b/SRC/cspmv.f
index 6b8c9c8c91..ab15a53653 100644
--- a/SRC/cspmv.f
+++ b/SRC/cspmv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSPMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cspmv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cspmv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,10 +142,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup hpmv
 *
 *  =====================================================================
       SUBROUTINE CSPMV( UPLO, N, ALPHA, AP, X, INCX, BETA, Y, INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -186,7 +185,8 @@ SUBROUTINE CSPMV( UPLO, N, ALPHA, AP, X, INCX, BETA, Y, INCY )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = 1
       ELSE IF( N.LT.0 ) THEN
          INFO = 2
diff --git a/SRC/cspr.f b/SRC/cspr.f
index bc23b7c489..bc64cc2553 100644
--- a/SRC/cspr.f
+++ b/SRC/cspr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSPR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cspr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cspr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -125,10 +123,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup hpr
 *
 *  =====================================================================
       SUBROUTINE CSPR( UPLO, N, ALPHA, X, INCX, AP )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -165,7 +164,8 @@ SUBROUTINE CSPR( UPLO, N, ALPHA, X, INCX, AP )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = 1
       ELSE IF( N.LT.0 ) THEN
          INFO = 2
diff --git a/SRC/csprfs.f b/SRC/csprfs.f
index e52aaa5f3a..96dd103c58 100644
--- a/SRC/csprfs.f
+++ b/SRC/csprfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSPRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csprfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csprfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -172,11 +170,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hprfs
 *
 *  =====================================================================
-      SUBROUTINE CSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
+      SUBROUTINE CSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
+     $                   LDX,
      $                   FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -217,7 +217,8 @@ SUBROUTINE CSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CLACN2, CSPMV, CSPTRS, XERBLA
+      EXTERNAL           CAXPY, CCOPY, CLACN2, CSPMV, CSPTRS,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MAX, REAL
@@ -270,7 +271,7 @@ SUBROUTINE CSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
       NZ = N + 1
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -385,10 +386,11 @@ SUBROUTINE CSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
 *
          DO 90 I = 1, N
             IF( RWORK( I ).GT.SAFE2 ) THEN
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I )
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I )
             ELSE
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I ) +
-     $                      SAFE1
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I ) + SAFE1
             END IF
    90    CONTINUE
 *
diff --git a/SRC/cspsv.f b/SRC/cspsv.f
index bfb5aa21c6..ed7f6fdaab 100644
--- a/SRC/cspsv.f
+++ b/SRC/cspsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSPSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cspsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cspsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,7 +133,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERsolve
+*> \ingroup hpsv
 *
 *> \par Further Details:
 *  =====================
@@ -159,6 +157,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CSPSV( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,7 +189,8 @@ SUBROUTINE CSPSV( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/cspsvx.f b/SRC/cspsvx.f
index 5de199340a..d6034381cd 100644
--- a/SRC/cspsvx.f
+++ b/SRC/cspsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSPSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cspsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cspsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -249,7 +247,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERsolve
+*> \ingroup hpsvx
 *
 *> \par Further Details:
 *  =====================
@@ -272,8 +270,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
+      SUBROUTINE CSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB,
+     $                   X,
      $                   LDX, RCOND, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -307,7 +307,8 @@ SUBROUTINE CSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
       EXTERNAL           LSAME, CLANSP, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CLACPY, CSPCON, CSPRFS, CSPTRF, CSPTRS,
+      EXTERNAL           CCOPY, CLACPY, CSPCON, CSPRFS, CSPTRF,
+     $                   CSPTRS,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -321,7 +322,8 @@ SUBROUTINE CSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
       NOFACT = LSAME( FACT, 'N' )
       IF( .NOT.NOFACT .AND. .NOT.LSAME( FACT, 'F' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -369,7 +371,8 @@ SUBROUTINE CSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
 *     Use iterative refinement to improve the computed solutions and
 *     compute error bounds and backward error estimates for them.
 *
-      CALL CSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX, FERR,
+      CALL CSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
+     $             FERR,
      $             BERR, WORK, RWORK, INFO )
 *
 *     Set INFO = N+1 if the matrix is singular to working precision.
diff --git a/SRC/csptrf.f b/SRC/csptrf.f
index 702ed0c518..e5209e2407 100644
--- a/SRC/csptrf.f
+++ b/SRC/csptrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSPTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csptrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csptrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,7 +106,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hptrf
 *
 *> \par Further Details:
 *  =====================
@@ -155,6 +153,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CSPTRF( UPLO, N, AP, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -506,7 +505,8 @@ SUBROUTINE CSPTRF( UPLO, N, AP, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL CSWAP( N-KP, AP( KNC+KP-KK+1 ), 1, AP( KPC+1 ),
+     $            CALL CSWAP( N-KP, AP( KNC+KP-KK+1 ), 1,
+     $                        AP( KPC+1 ),
      $                        1 )
                KX = KNC + KP - KK
                DO 80 J = KK + 1, KP - 1
diff --git a/SRC/csptri.f b/SRC/csptri.f
index 8ae1d1daa2..c8bcf53c5f 100644
--- a/SRC/csptri.f
+++ b/SRC/csptri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSPTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csptri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csptri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hptri
 *
 *  =====================================================================
       SUBROUTINE CSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -218,7 +217,8 @@ SUBROUTINE CSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
 *
             IF( K.GT.1 ) THEN
                CALL CCOPY( K-1, AP( KC ), 1, WORK, 1 )
-               CALL CSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO, AP( KC ),
+               CALL CSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO,
+     $                     AP( KC ),
      $                     1 )
                AP( KC+K-1 ) = AP( KC+K-1 ) -
      $                        CDOTU( K-1, WORK, 1, AP( KC ), 1 )
@@ -243,18 +243,21 @@ SUBROUTINE CSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
 *
             IF( K.GT.1 ) THEN
                CALL CCOPY( K-1, AP( KC ), 1, WORK, 1 )
-               CALL CSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO, AP( KC ),
+               CALL CSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO,
+     $                     AP( KC ),
      $                     1 )
                AP( KC+K-1 ) = AP( KC+K-1 ) -
      $                        CDOTU( K-1, WORK, 1, AP( KC ), 1 )
                AP( KCNEXT+K-1 ) = AP( KCNEXT+K-1 ) -
-     $                            CDOTU( K-1, AP( KC ), 1, AP( KCNEXT ),
+     $                            CDOTU( K-1, AP( KC ), 1,
+     $                                   AP( KCNEXT ),
      $                            1 )
                CALL CCOPY( K-1, AP( KCNEXT ), 1, WORK, 1 )
                CALL CSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO,
      $                     AP( KCNEXT ), 1 )
                AP( KCNEXT+K ) = AP( KCNEXT+K ) -
-     $                          CDOTU( K-1, WORK, 1, AP( KCNEXT ), 1 )
+     $                          CDOTU( K-1, WORK, 1, AP( KCNEXT ),
+     $                                 1 )
             END IF
             KSTEP = 2
             KCNEXT = KCNEXT + K + 1
@@ -345,7 +348,8 @@ SUBROUTINE CSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL CCOPY( N-K, AP( KC+1 ), 1, WORK, 1 )
-               CALL CSPMV( UPLO, N-K, -ONE, AP( KC+( N-K+1 ) ), WORK, 1,
+               CALL CSPMV( UPLO, N-K, -ONE, AP( KC+( N-K+1 ) ), WORK,
+     $                     1,
      $                     ZERO, AP( KC+1 ), 1 )
                AP( KC ) = AP( KC ) - CDOTU( N-K, WORK, 1, AP( KC+1 ),
      $                    1 )
@@ -353,10 +357,12 @@ SUBROUTINE CSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
      $                          CDOTU( N-K, AP( KC+1 ), 1,
      $                          AP( KCNEXT+2 ), 1 )
                CALL CCOPY( N-K, AP( KCNEXT+2 ), 1, WORK, 1 )
-               CALL CSPMV( UPLO, N-K, -ONE, AP( KC+( N-K+1 ) ), WORK, 1,
+               CALL CSPMV( UPLO, N-K, -ONE, AP( KC+( N-K+1 ) ), WORK,
+     $                     1,
      $                     ZERO, AP( KCNEXT+2 ), 1 )
                AP( KCNEXT ) = AP( KCNEXT ) -
-     $                        CDOTU( N-K, WORK, 1, AP( KCNEXT+2 ), 1 )
+     $                        CDOTU( N-K, WORK, 1, AP( KCNEXT+2 ),
+     $                               1 )
             END IF
             KSTEP = 2
             KCNEXT = KCNEXT - ( N-K+3 )
diff --git a/SRC/csptrs.f b/SRC/csptrs.f
index 6434c473ad..846718c021 100644
--- a/SRC/csptrs.f
+++ b/SRC/csptrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSPTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csptrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csptrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup hptrs
 *
 *  =====================================================================
       SUBROUTINE CSPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -267,7 +266,8 @@ SUBROUTINE CSPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *           Multiply by inv(U**T(K)), where U(K) is the transformation
 *           stored in column K of A.
 *
-            CALL CGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, AP( KC ),
+            CALL CGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB,
+     $                  AP( KC ),
      $                  1, ONE, B( K, 1 ), LDB )
 *
 *           Interchange rows K and IPIV(K).
@@ -284,7 +284,8 @@ SUBROUTINE CSPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *           Multiply by inv(U**T(K+1)), where U(K+1) is the transformation
 *           stored in columns K and K+1 of A.
 *
-            CALL CGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, AP( KC ),
+            CALL CGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB,
+     $                  AP( KC ),
      $                  1, ONE, B( K, 1 ), LDB )
             CALL CGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB,
      $                  AP( KC+K ), 1, ONE, B( K+1, 1 ), LDB )
@@ -355,7 +356,8 @@ SUBROUTINE CSPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL CGERU( N-K-1, NRHS, -ONE, AP( KC+2 ), 1, B( K, 1 ),
+               CALL CGERU( N-K-1, NRHS, -ONE, AP( KC+2 ), 1, B( K,
+     $                     1 ),
      $                     LDB, B( K+2, 1 ), LDB )
                CALL CGERU( N-K-1, NRHS, -ONE, AP( KC+N-K+2 ), 1,
      $                     B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
diff --git a/SRC/csrscl.f b/SRC/csrscl.f
index 5f27f63872..02ebc1832d 100644
--- a/SRC/csrscl.f
+++ b/SRC/csrscl.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSRSCL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csrscl.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csrscl.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -77,10 +75,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup rscl
 *
 *  =====================================================================
       SUBROUTINE CSRSCL( N, SA, SX, INCX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -109,7 +108,7 @@ SUBROUTINE CSRSCL( N, SA, SX, INCX )
       EXTERNAL           SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CSSCAL, SLABAD
+      EXTERNAL           CSSCAL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS
@@ -125,7 +124,6 @@ SUBROUTINE CSRSCL( N, SA, SX, INCX )
 *
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Initialize the denominator to SA and the numerator to 1.
 *
diff --git a/SRC/cstedc.f b/SRC/cstedc.f
index a57d9eaef1..2a912cb963 100644
--- a/SRC/cstedc.f
+++ b/SRC/cstedc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSTEDC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cstedc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cstedc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -43,12 +41,6 @@
 *> be found if CHETRD or CHPTRD or CHBTRD has been used to reduce this
 *> matrix to tridiagonal form.
 *>
-*> This code makes very mild assumptions about floating point
-*> arithmetic. It will work on machines with a guard digit in
-*> add/subtract, or on those binary machines without guard digits
-*> which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or Cray-2.
-*> It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.  See SLAED3 for details.
 *> \endverbatim
 *
 *  Arguments:
@@ -198,7 +190,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup stedc
 *
 *> \par Contributors:
 *  ==================
@@ -209,6 +201,7 @@
 *  =====================================================================
       SUBROUTINE CSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, RWORK,
      $                   LRWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -239,11 +232,13 @@ SUBROUTINE CSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, RWORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANST
-      EXTERNAL           ILAENV, LSAME, SLAMCH, SLANST
+      REAL               SLAMCH, SLANST, SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SLAMCH, SLANST,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, CLACPY, CLACRM, CLAED0, CSTEQR, CSWAP,
+      EXTERNAL           XERBLA, CLACPY, CLACRM, CLAED0, CSTEQR,
+     $                   CSWAP,
      $                   SLASCL, SLASET, SSTEDC, SSTEQR, SSTERF
 *     ..
 *     .. Intrinsic Functions ..
@@ -301,8 +296,8 @@ SUBROUTINE CSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, RWORK,
             LRWMIN = 1 + 4*N + 2*N**2
             LIWMIN = 3 + 5*N
          END IF
-         WORK( 1 ) = LWMIN
-         RWORK( 1 ) = LRWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
+         RWORK( 1 ) = REAL( LRWMIN )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -414,12 +409,15 @@ SUBROUTINE CSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, RWORK,
 *              Scale.
 *
                ORGNRM = SLANST( 'M', M, D( START ), E( START ) )
-               CALL SLASCL( 'G', 0, 0, ORGNRM, ONE, M, 1, D( START ), M,
+               CALL SLASCL( 'G', 0, 0, ORGNRM, ONE, M, 1, D( START ),
+     $                      M,
      $                      INFO )
-               CALL SLASCL( 'G', 0, 0, ORGNRM, ONE, M-1, 1, E( START ),
+               CALL SLASCL( 'G', 0, 0, ORGNRM, ONE, M-1, 1,
+     $                      E( START ),
      $                      M-1, INFO )
 *
-               CALL CLAED0( N, M, D( START ), E( START ), Z( 1, START ),
+               CALL CLAED0( N, M, D( START ), E( START ), Z( 1,
+     $                      START ),
      $                      LDZ, WORK, N, RWORK, IWORK, INFO )
                IF( INFO.GT.0 ) THEN
                   INFO = ( INFO / ( M+1 )+START-1 )*( N+1 ) +
@@ -429,13 +427,15 @@ SUBROUTINE CSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, RWORK,
 *
 *              Scale back.
 *
-               CALL SLASCL( 'G', 0, 0, ONE, ORGNRM, M, 1, D( START ), M,
+               CALL SLASCL( 'G', 0, 0, ONE, ORGNRM, M, 1, D( START ),
+     $                      M,
      $                      INFO )
 *
             ELSE
                CALL SSTEQR( 'I', M, D( START ), E( START ), RWORK, M,
      $                      RWORK( M*M+1 ), INFO )
-               CALL CLACRM( N, M, Z( 1, START ), LDZ, RWORK, M, WORK, N,
+               CALL CLACRM( N, M, Z( 1, START ), LDZ, RWORK, M, WORK,
+     $                      N,
      $                      RWORK( M*M+1 ) )
                CALL CLACPY( 'A', N, M, WORK, N, Z( 1, START ), LDZ )
                IF( INFO.GT.0 ) THEN
@@ -472,8 +472,8 @@ SUBROUTINE CSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, RWORK,
       END IF
 *
    70 CONTINUE
-      WORK( 1 ) = LWMIN
-      RWORK( 1 ) = LRWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
+      RWORK( 1 ) = REAL( LRWMIN )
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/cstegr.f b/SRC/cstegr.f
index 9d6e06da32..0060301289 100644
--- a/SRC/cstegr.f
+++ b/SRC/cstegr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSTEGR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cstegr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cstegr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -56,7 +54,7 @@
 *>
 *> Note : CSTEGR and CSTEMR work only on machines which follow
 *> IEEE-754 floating-point standard in their handling of infinities and
-*> NaNs.  Normal execution may create these exceptiona values and hence
+*> NaNs.  Normal execution may create these exceptional values and hence
 *> may abort due to a floating point exception in environments which
 *> do not conform to the IEEE-754 standard.
 *> \endverbatim
@@ -249,7 +247,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup stegr
 *
 *> \par Contributors:
 *  ==================
@@ -262,6 +260,7 @@
       SUBROUTINE CSTEGR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $           ABSTOL, M, W, Z, LDZ, ISUPPZ, WORK, LWORK, IWORK,
      $           LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cstein.f b/SRC/cstein.f
index 5609efb014..1040fe888c 100644
--- a/SRC/cstein.f
+++ b/SRC/cstein.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSTEIN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cstein.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cstein.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -174,11 +172,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup stein
 *
 *  =====================================================================
       SUBROUTINE CSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
      $                   IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -222,7 +221,8 @@ SUBROUTINE CSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
       EXTERNAL           ISAMAX, SLAMCH, SNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLAGTF, SLAGTS, SLARNV, SSCAL, XERBLA
+      EXTERNAL           SCOPY, SLAGTF, SLAGTS, SLARNV, SSCAL,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, CMPLX, MAX, REAL, SQRT
@@ -317,7 +317,7 @@ SUBROUTINE CSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
    50    CONTINUE
          ORTOL = ODM3*ONENRM
 *
-         STPCRT = SQRT( ODM1 / BLKSIZ )
+         STPCRT = SQRT( ODM1 / REAL( BLKSIZ ) )
 *
 *        Loop through eigenvalues of block nblk.
 *
@@ -365,7 +365,8 @@ SUBROUTINE CSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
 *           Compute LU factors with partial pivoting  ( PT = LU )
 *
             TOL = ZERO
-            CALL SLAGTF( BLKSIZ, WORK( INDRV4+1 ), XJ, WORK( INDRV2+2 ),
+            CALL SLAGTF( BLKSIZ, WORK( INDRV4+1 ), XJ,
+     $                   WORK( INDRV2+2 ),
      $                   WORK( INDRV3+1 ), TOL, WORK( INDRV5+1 ), IWORK,
      $                   IINFO )
 *
@@ -379,14 +380,15 @@ SUBROUTINE CSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
 *           Normalize and scale the righthand side vector Pb.
 *
             JMAX = ISAMAX( BLKSIZ, WORK( INDRV1+1 ), 1 )
-            SCL = BLKSIZ*ONENRM*MAX( EPS,
+            SCL = REAL( BLKSIZ )*ONENRM*MAX( EPS,
      $            ABS( WORK( INDRV4+BLKSIZ ) ) ) /
      $            ABS( WORK( INDRV1+JMAX ) )
             CALL SSCAL( BLKSIZ, SCL, WORK( INDRV1+1 ), 1 )
 *
 *           Solve the system LU = Pb.
 *
-            CALL SLAGTS( -1, BLKSIZ, WORK( INDRV4+1 ), WORK( INDRV2+2 ),
+            CALL SLAGTS( -1, BLKSIZ, WORK( INDRV4+1 ),
+     $                   WORK( INDRV2+2 ),
      $                   WORK( INDRV3+1 ), WORK( INDRV5+1 ), IWORK,
      $                   WORK( INDRV1+1 ), TOL, IINFO )
 *
diff --git a/SRC/cstemr.f b/SRC/cstemr.f
index d49684db35..15dc809d31 100644
--- a/SRC/cstemr.f
+++ b/SRC/cstemr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSTEMR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cstemr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cstemr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -320,7 +318,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup stemr
 *
 *> \par Contributors:
 *  ==================
@@ -329,12 +327,14 @@
 *> Jim Demmel, University of California, Berkeley, USA \n
 *> Inderjit Dhillon, University of Texas, Austin, USA \n
 *> Osni Marques, LBNL/NERSC, USA \n
-*> Christof Voemel, University of California, Berkeley, USA
+*> Christof Voemel, University of California, Berkeley, USA \n
+*> Aravindh Krishnamoorthy, FAU, Erlangen, Germany \n
 *
 *  =====================================================================
       SUBROUTINE CSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $                   M, W, Z, LDZ, NZC, ISUPPZ, TRYRAC, WORK, LWORK,
      $                   IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -361,7 +361,8 @@ SUBROUTINE CSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $                     MINRGP = 3.0E-3 )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            ALLEIG, INDEIG, LQUERY, VALEIG, WANTZ, ZQUERY
+      LOGICAL            ALLEIG, INDEIG, LQUERY, VALEIG, WANTZ, ZQUERY,
+     $                   LAESWAP
       INTEGER            I, IBEGIN, IEND, IFIRST, IIL, IINDBL, IINDW,
      $                   IINDWK, IINFO, IINSPL, IIU, ILAST, IN, INDD,
      $                   INDE2, INDERR, INDGP, INDGRS, INDWRK, ITMP,
@@ -374,11 +375,13 @@ SUBROUTINE CSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               SLAMCH, SLANST
-      EXTERNAL           LSAME, SLAMCH, SLANST
+      REAL               SLAMCH, SLANST, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, SLANST,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLARRV, CSWAP, SCOPY, SLAE2, SLAEV2, SLARRC,
+      EXTERNAL           CLARRV, CSWAP, SCOPY, SLAE2, SLAEV2,
+     $                   SLARRC,
      $                   SLARRE, SLARRJ, SLARRR, SLASRT, SSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -397,6 +400,7 @@ SUBROUTINE CSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
 *
       LQUERY = ( ( LWORK.EQ.-1 ).OR.( LIWORK.EQ.-1 ) )
       ZQUERY = ( NZC.EQ.-1 )
+      LAESWAP = .FALSE.
 
 *     SSTEMR needs WORK of size 6*N, IWORK of size 3*N.
 *     In addition, SLARRE needs WORK of size 6*N, IWORK of size 5*N.
@@ -459,7 +463,7 @@ SUBROUTINE CSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
       RMAX = MIN( SQRT( BIGNUM ), ONE / SQRT( SQRT( SAFMIN ) ) )
 *
       IF( INFO.EQ.0 ) THEN
-         WORK( 1 ) = LWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
          IWORK( 1 ) = LIWMIN
 *
          IF( WANTZ .AND. ALLEIG ) THEN
@@ -474,7 +478,7 @@ SUBROUTINE CSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
             NZCMIN = 0
          ENDIF
          IF( ZQUERY .AND. INFO.EQ.0 ) THEN
-            Z( 1,1 ) = NZCMIN
+            Z( 1,1 ) = CMPLX( NZCMIN )
          ELSE IF( NZC.LT.NZCMIN .AND. .NOT.ZQUERY ) THEN
             INFO = -14
          END IF
@@ -519,6 +523,15 @@ SUBROUTINE CSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
          ELSE IF( WANTZ.AND.(.NOT.ZQUERY) ) THEN
             CALL SLAEV2( D(1), E(1), D(2), R1, R2, CS, SN )
          END IF
+*        D/S/LAE2 and D/S/LAEV2 outputs satisfy |R1| >= |R2|. However,
+*        the following code requires R1 >= R2. Hence, we correct
+*        the order of R1, R2, CS, SN if R1 < R2 before further processing.
+         IF( R1.LT.R2 ) THEN
+            E(2) = R1
+            R1 = R2
+            R2 = E(2)
+            LAESWAP = .TRUE.
+         ENDIF
          IF( ALLEIG.OR.
      $      (VALEIG.AND.(R2.GT.WL).AND.
      $                  (R2.LE.WU)).OR.
@@ -526,8 +539,13 @@ SUBROUTINE CSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
             M = M+1
             W( M ) = R2
             IF( WANTZ.AND.(.NOT.ZQUERY) ) THEN
-               Z( 1, M ) = -SN
-               Z( 2, M ) = CS
+               IF( LAESWAP ) THEN
+                  Z( 1, M ) = CS
+                  Z( 2, M ) = SN
+               ELSE
+                  Z( 1, M ) = -SN
+                  Z( 2, M ) = CS
+               ENDIF
 *              Note: At most one of SN and CS can be zero.
                IF (SN.NE.ZERO) THEN
                   IF (CS.NE.ZERO) THEN
@@ -550,8 +568,13 @@ SUBROUTINE CSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
             M = M+1
             W( M ) = R1
             IF( WANTZ.AND.(.NOT.ZQUERY) ) THEN
-               Z( 1, M ) = CS
-               Z( 2, M ) = SN
+               IF( LAESWAP ) THEN
+                  Z( 1, M ) = -SN
+                  Z( 2, M ) = CS
+               ELSE
+                  Z( 1, M ) = CS
+                  Z( 2, M ) = SN
+               ENDIF
 *              Note: At most one of SN and CS can be zero.
                IF (SN.NE.ZERO) THEN
                   IF (CS.NE.ZERO) THEN
@@ -779,7 +802,7 @@ SUBROUTINE CSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
       ENDIF
 *
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       IWORK( 1 ) = LIWMIN
       RETURN
 *
diff --git a/SRC/csteqr.f b/SRC/csteqr.f
index 4044e77eda..b7b180b9fa 100644
--- a/SRC/csteqr.f
+++ b/SRC/csteqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSTEQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csteqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csteqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -125,10 +123,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup steqr
 *
 *  =====================================================================
       SUBROUTINE CSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -168,7 +167,8 @@ SUBROUTINE CSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
       EXTERNAL           LSAME, SLAMCH, SLANST, SLAPY2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLASET, CLASR, CSWAP, SLAE2, SLAEV2, SLARTG,
+      EXTERNAL           CLASET, CLASR, CSWAP, SLAE2, SLAEV2,
+     $                   SLARTG,
      $                   SLASCL, SLASRT, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -274,13 +274,15 @@ SUBROUTINE CSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
      $   GO TO 10
       IF( ANORM.GT.SSFMAX ) THEN
          ISCALE = 1
-         CALL SLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L+1, 1, D( L ), N,
+         CALL SLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L+1, 1, D( L ),
+     $                N,
      $                INFO )
          CALL SLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L, 1, E( L ), N,
      $                INFO )
       ELSE IF( ANORM.LT.SSFMIN ) THEN
          ISCALE = 2
-         CALL SLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L+1, 1, D( L ), N,
+         CALL SLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L+1, 1, D( L ),
+     $                N,
      $                INFO )
          CALL SLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L, 1, E( L ), N,
      $                INFO )
@@ -323,7 +325,8 @@ SUBROUTINE CSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
 *
          IF( M.EQ.L+1 ) THEN
             IF( ICOMPZ.GT.0 ) THEN
-               CALL SLAEV2( D( L ), E( L ), D( L+1 ), RT1, RT2, C, S )
+               CALL SLAEV2( D( L ), E( L ), D( L+1 ), RT1, RT2, C,
+     $                      S )
                WORK( L ) = C
                WORK( N-1+L ) = S
                CALL CLASR( 'R', 'V', 'B', N, 2, WORK( L ),
@@ -382,7 +385,8 @@ SUBROUTINE CSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
 *
          IF( ICOMPZ.GT.0 ) THEN
             MM = M - L + 1
-            CALL CLASR( 'R', 'V', 'B', N, MM, WORK( L ), WORK( N-1+L ),
+            CALL CLASR( 'R', 'V', 'B', N, MM, WORK( L ),
+     $                  WORK( N-1+L ),
      $                  Z( 1, L ), LDZ )
          END IF
 *
@@ -430,7 +434,8 @@ SUBROUTINE CSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
 *
          IF( M.EQ.L-1 ) THEN
             IF( ICOMPZ.GT.0 ) THEN
-               CALL SLAEV2( D( L-1 ), E( L-1 ), D( L ), RT1, RT2, C, S )
+               CALL SLAEV2( D( L-1 ), E( L-1 ), D( L ), RT1, RT2, C,
+     $                      S )
                WORK( M ) = C
                WORK( N-1+M ) = S
                CALL CLASR( 'R', 'V', 'F', N, 2, WORK( M ),
@@ -489,7 +494,8 @@ SUBROUTINE CSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
 *
          IF( ICOMPZ.GT.0 ) THEN
             MM = L - M + 1
-            CALL CLASR( 'R', 'V', 'F', N, MM, WORK( M ), WORK( N-1+M ),
+            CALL CLASR( 'R', 'V', 'F', N, MM, WORK( M ),
+     $                  WORK( N-1+M ),
      $                  Z( 1, M ), LDZ )
          END IF
 *
@@ -515,12 +521,14 @@ SUBROUTINE CSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
       IF( ISCALE.EQ.1 ) THEN
          CALL SLASCL( 'G', 0, 0, SSFMAX, ANORM, LENDSV-LSV+1, 1,
      $                D( LSV ), N, INFO )
-         CALL SLASCL( 'G', 0, 0, SSFMAX, ANORM, LENDSV-LSV, 1, E( LSV ),
+         CALL SLASCL( 'G', 0, 0, SSFMAX, ANORM, LENDSV-LSV, 1,
+     $                E( LSV ),
      $                N, INFO )
       ELSE IF( ISCALE.EQ.2 ) THEN
          CALL SLASCL( 'G', 0, 0, SSFMIN, ANORM, LENDSV-LSV+1, 1,
      $                D( LSV ), N, INFO )
-         CALL SLASCL( 'G', 0, 0, SSFMIN, ANORM, LENDSV-LSV, 1, E( LSV ),
+         CALL SLASCL( 'G', 0, 0, SSFMIN, ANORM, LENDSV-LSV, 1,
+     $                E( LSV ),
      $                N, INFO )
       END IF
 *
diff --git a/SRC/csycon.f b/SRC/csycon.f
index f4fb33a377..8520fbcd21 100644
--- a/SRC/csycon.f
+++ b/SRC/csycon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csycon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csycon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,11 +115,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hecon
 *
 *  =====================================================================
       SUBROUTINE CSYCON( UPLO, N, A, LDA, IPIV, ANORM, RCOND, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/csycon_3.f b/SRC/csycon_3.f
index 7fe915e576..f35ed4d593 100644
--- a/SRC/csycon_3.f
+++ b/SRC/csycon_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYCON_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csycon_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csycon_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,7 +142,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hecon_3
 *
 *> \par Contributors:
 *  ==================
@@ -163,6 +161,7 @@
 *  =====================================================================
       SUBROUTINE CSYCON_3( UPLO, N, A, LDA, E, IPIV, ANORM, RCOND,
      $                     WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/csycon_rook.f b/SRC/csycon_rook.f
index f01659c779..863ff8a77c 100644
--- a/SRC/csycon_rook.f
+++ b/SRC/csycon_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYCON_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csycon_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csycon_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,7 +115,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hecon_rook
 *
 *> \par Contributors:
 *  ==================
@@ -134,8 +132,10 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE CSYCON_ROOK( UPLO, N, A, LDA, IPIV, ANORM, RCOND, WORK,
+      SUBROUTINE CSYCON_ROOK( UPLO, N, A, LDA, IPIV, ANORM, RCOND,
+     $                        WORK,
      $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/csyconv.f b/SRC/csyconv.f
index 79a1b0c114..4dc36af2c0 100644
--- a/SRC/csyconv.f
+++ b/SRC/csyconv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYCONV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csyconv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csyconv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup syconv
 *
 *  =====================================================================
       SUBROUTINE CSYCONV( UPLO, WAY, N, A, LDA, IPIV, E, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/csyconvf.f b/SRC/csyconvf.f
index f3b46f0b42..5ce5d92bbf 100644
--- a/SRC/csyconvf.f
+++ b/SRC/csyconvf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYCONVF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csyconvf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csyconvf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -39,7 +37,7 @@
 *> CSYTRF provided on entry in parameter A into the factorization
 *> output format used in CSYTRF_RK (or CSYTRF_BK) that is stored
 *> on exit in parameters A and E. It also converts in place details of
-*> the intechanges stored in IPIV from the format used in CSYTRF into
+*> the interchanges stored in IPIV from the format used in CSYTRF into
 *> the format used in CSYTRF_RK (or CSYTRF_BK).
 *>
 *> If parameter WAY = 'R':
@@ -48,7 +46,7 @@
 *> (or CSYTRF_BK) provided on entry in parameters A and E into
 *> the factorization output format used in CSYTRF that is stored
 *> on exit in parameter A. It also converts in place details of
-*> the intechanges stored in IPIV from the format used in CSYTRF_RK
+*> the interchanges stored in IPIV from the format used in CSYTRF_RK
 *> (or CSYTRF_BK) into the format used in CSYTRF.
 *>
 *> CSYCONVF can also convert in Hermitian matrix case, i.e. between
@@ -192,7 +190,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup syconvf
 *
 *> \par Contributors:
 *  ==================
@@ -206,6 +204,7 @@
 *> \endverbatim
 *  =====================================================================
       SUBROUTINE CSYCONVF( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -325,7 +324,7 @@ SUBROUTINE CSYCONVF( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
                   END IF
 *
 *                 Convert IPIV
-*                 There is no interchnge of rows i and and IPIV(i),
+*                 There is no interchange of rows i and and IPIV(i),
 *                 so this should be reflected in IPIV format for
 *                 *SYTRF_RK ( or *SYTRF_BK)
 *
@@ -469,7 +468,7 @@ SUBROUTINE CSYCONVF( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
                   END IF
 *
 *                 Convert IPIV
-*                 There is no interchnge of rows i and and IPIV(i),
+*                 There is no interchange of rows i and and IPIV(i),
 *                 so this should be reflected in IPIV format for
 *                 *SYTRF_RK ( or *SYTRF_BK)
 *
@@ -535,7 +534,7 @@ SUBROUTINE CSYCONVF( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
 *
 *           Revert VALUE
 *           Assign subdiagonal entries of D from array E to
-*           subgiagonal entries of A.
+*           subdiagonal entries of A.
 *
             I = 1
             DO WHILE ( I.LE.N-1 )
diff --git a/SRC/csyconvf_rook.f b/SRC/csyconvf_rook.f
index a5b9d82da2..3aa05c578a 100644
--- a/SRC/csyconvf_rook.f
+++ b/SRC/csyconvf_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYCONVF_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csyconvf_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csyconvf_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -183,7 +181,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup syconvf_rook
 *
 *> \par Contributors:
 *  ==================
@@ -197,6 +195,7 @@
 *> \endverbatim
 *  =====================================================================
       SUBROUTINE CSYCONVF_ROOK( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -520,7 +519,7 @@ SUBROUTINE CSYCONVF_ROOK( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
 *
 *           Revert VALUE
 *           Assign subdiagonal entries of D from array E to
-*           subgiagonal entries of A.
+*           subdiagonal entries of A.
 *
             I = 1
             DO WHILE ( I.LE.N-1 )
diff --git a/SRC/csyequb.f b/SRC/csyequb.f
index 185501d04f..5d27ab6484 100644
--- a/SRC/csyequb.f
+++ b/SRC/csyequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csyequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csyequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,7 +115,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup heequb
 *
 *> \par References:
 *  ================
@@ -128,7 +126,9 @@
 *>  Tech report version: http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.3.1679
 *>
 *  =====================================================================
-      SUBROUTINE CSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
+      SUBROUTINE CSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK,
+     $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -181,7 +181,8 @@ SUBROUTINE CSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF ( .NOT. ( LSAME( UPLO, 'U' ) .OR. LSAME( UPLO, 'L' ) ) ) THEN
+      IF ( .NOT. ( LSAME( UPLO, 'U' ) .OR.
+     $     LSAME( UPLO, 'L' ) ) ) THEN
          INFO = -1
       ELSE IF ( N .LT. 0 ) THEN
          INFO = -2
@@ -233,7 +234,7 @@ SUBROUTINE CSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
          S( J ) = 1.0 / S( J )
       END DO
 
-      TOL = ONE / SQRT( 2.0E0 * N )
+      TOL = ONE / SQRT( 2.0E0 * REAL( N ) )
 
       DO ITER = 1, MAX_ITER
          SCALE = 0.0E0
@@ -265,23 +266,23 @@ SUBROUTINE CSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
          DO I = 1, N
             AVG = AVG + REAL( S( I )*WORK( I ) )
          END DO
-         AVG = AVG / N
+         AVG = AVG / REAL( N )
 
          STD = 0.0E0
          DO I = N+1, 2*N
             WORK( I ) = S( I-N ) * WORK( I-N ) - AVG
          END DO
          CALL CLASSQ( N, WORK( N+1 ), 1, SCALE, SUMSQ )
-         STD = SCALE * SQRT( SUMSQ / N )
+         STD = SCALE * SQRT( SUMSQ / REAL( N ) )
 
          IF ( STD .LT. TOL * AVG ) GOTO 999
 
          DO I = 1, N
             T = CABS1( A( I, I ) )
             SI = S( I )
-            C2 = ( N-1 ) * T
+            C2 = REAL( N-1 ) * T
             C1 = REAL( N-2 ) * ( REAL( WORK( I ) ) - T*SI )
-            C0 = -(T*SI)*SI + 2 * REAL( WORK( I ) ) * SI - N*AVG
+            C0 = -(T*SI)*SI + 2 * REAL( WORK( I ) ) * SI - REAL( N )*AVG
             D = C1*C1 - 4*C0*C2
 
             IF ( D .LE. 0 ) THEN
@@ -316,7 +317,7 @@ SUBROUTINE CSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
                END DO
             END IF
 
-            AVG = AVG + ( U + REAL( WORK( I ) ) ) * D / N
+            AVG = AVG + ( U + REAL( WORK( I ) ) ) * D / REAL( N )
             S( I ) = SI
          END DO
       END DO
diff --git a/SRC/csymv.f b/SRC/csymv.f
index e54ea2289f..1e534d635c 100644
--- a/SRC/csymv.f
+++ b/SRC/csymv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csymv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csymv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -150,10 +148,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYauxiliary
+*> \ingroup hemv
 *
 *  =====================================================================
-      SUBROUTINE CSYMV( UPLO, N, ALPHA, A, LDA, X, INCX, BETA, Y, INCY )
+      SUBROUTINE CSYMV( UPLO, N, ALPHA, A, LDA, X, INCX, BETA, Y,
+     $                  INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -195,7 +195,8 @@ SUBROUTINE CSYMV( UPLO, N, ALPHA, A, LDA, X, INCX, BETA, Y, INCY )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = 1
       ELSE IF( N.LT.0 ) THEN
          INFO = 2
diff --git a/SRC/csyr.f b/SRC/csyr.f
index a96f0053ce..3d80dbc216 100644
--- a/SRC/csyr.f
+++ b/SRC/csyr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csyr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csyr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -128,10 +126,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYauxiliary
+*> \ingroup her
 *
 *  =====================================================================
       SUBROUTINE CSYR( UPLO, N, ALPHA, X, INCX, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,7 +170,8 @@ SUBROUTINE CSYR( UPLO, N, ALPHA, X, INCX, A, LDA )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = 1
       ELSE IF( N.LT.0 ) THEN
          INFO = 2
diff --git a/SRC/csyrfs.f b/SRC/csyrfs.f
index 382b1ae297..1eb70db202 100644
--- a/SRC/csyrfs.f
+++ b/SRC/csyrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csyrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csyrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -184,11 +182,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup herfs
 *
 *  =====================================================================
-      SUBROUTINE CSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
+      SUBROUTINE CSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
+     $                   LDB,
      $                   X, LDX, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -229,7 +229,8 @@ SUBROUTINE CSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CLACN2, CSYMV, CSYTRS, XERBLA
+      EXTERNAL           CAXPY, CCOPY, CLACN2, CSYMV, CSYTRS,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MAX, REAL
@@ -286,7 +287,7 @@ SUBROUTINE CSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
       NZ = N + 1
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -302,7 +303,8 @@ SUBROUTINE CSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
 *        Compute residual R = B - A * X
 *
          CALL CCOPY( N, B( 1, J ), 1, WORK, 1 )
-         CALL CSYMV( UPLO, N, -ONE, A, LDA, X( 1, J ), 1, ONE, WORK, 1 )
+         CALL CSYMV( UPLO, N, -ONE, A, LDA, X( 1, J ), 1, ONE, WORK,
+     $               1 )
 *
 *        Compute componentwise relative backward error from formula
 *
@@ -394,10 +396,11 @@ SUBROUTINE CSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
 *
          DO 90 I = 1, N
             IF( RWORK( I ).GT.SAFE2 ) THEN
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I )
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I )
             ELSE
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I ) +
-     $                      SAFE1
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I ) + SAFE1
             END IF
    90    CONTINUE
 *
@@ -409,7 +412,8 @@ SUBROUTINE CSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
 *
 *              Multiply by diag(W)*inv(A**T).
 *
-               CALL CSYTRS( UPLO, N, 1, AF, LDAF, IPIV, WORK, N, INFO )
+               CALL CSYTRS( UPLO, N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
                DO 110 I = 1, N
                   WORK( I ) = RWORK( I )*WORK( I )
   110          CONTINUE
@@ -420,7 +424,8 @@ SUBROUTINE CSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
                DO 120 I = 1, N
                   WORK( I ) = RWORK( I )*WORK( I )
   120          CONTINUE
-               CALL CSYTRS( UPLO, N, 1, AF, LDAF, IPIV, WORK, N, INFO )
+               CALL CSYTRS( UPLO, N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
             END IF
             GO TO 100
          END IF
diff --git a/SRC/csyrfsx.f b/SRC/csyrfsx.f
index 040d0253c9..ed38a1ed8a 100644
--- a/SRC/csyrfsx.f
+++ b/SRC/csyrfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYRFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csyrfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csyrfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -392,13 +390,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup herfsx
 *
 *  =====================================================================
-      SUBROUTINE CSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE CSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    S, B, LDB, X, LDX, RCOND, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -461,7 +461,8 @@ SUBROUTINE CSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *     ..
 *     .. External Functions ..
       EXTERNAL           LSAME, ILAPREC
-      EXTERNAL           SLAMCH, CLANSY, CLA_SYRCOND_X, CLA_SYRCOND_C
+      EXTERNAL           SLAMCH, CLANSY, CLA_SYRCOND_X,
+     $                   CLA_SYRCOND_C
       REAL               SLAMCH, CLANSY, CLA_SYRCOND_X, CLA_SYRCOND_C
       LOGICAL            LSAME
       INTEGER            ILAPREC
@@ -518,7 +519,8 @@ SUBROUTINE CSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Test input parameters.
 *
-      IF ( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF ( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $     .NOT.LSAME( UPLO, 'L' ) ) THEN
         INFO = -1
       ELSE IF( .NOT.RCEQU .AND. .NOT.LSAME( EQUED, 'N' ) ) THEN
         INFO = -2
@@ -610,10 +612,12 @@ SUBROUTINE CSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *     Compute scaled normwise condition number cond(A*C).
 *
          IF ( RCEQU ) THEN
-            RCOND_TMP = CLA_SYRCOND_C( UPLO, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = CLA_SYRCOND_C( UPLO, N, A, LDA, AF, LDAF,
+     $                                 IPIV,
      $           S, .TRUE., INFO, WORK, RWORK )
          ELSE
-            RCOND_TMP = CLA_SYRCOND_C( UPLO, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = CLA_SYRCOND_C( UPLO, N, A, LDA, AF, LDAF,
+     $                                 IPIV,
      $           S, .FALSE., INFO, WORK, RWORK )
          END IF
          DO J = 1, NRHS
diff --git a/SRC/csysv.f b/SRC/csysv.f
index 6f175e381b..fa19fe2def 100644
--- a/SRC/csysv.f
+++ b/SRC/csysv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csysv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csysv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,11 +161,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYsolve
+*> \ingroup hesv
 *
 *  =====================================================================
       SUBROUTINE CSYSV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
      $                  LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,7 +189,8 @@ SUBROUTINE CSYSV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           XERBLA, CSYTRF, CSYTRS, CSYTRS2
@@ -204,7 +204,8 @@ SUBROUTINE CSYSV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -223,9 +224,9 @@ SUBROUTINE CSYSV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
             LWKOPT = 1
          ELSE
             CALL CSYTRF( UPLO, N, A, LDA, IPIV, WORK, -1, INFO )
-            LWKOPT = REAL( WORK(1) )
+            LWKOPT = INT( WORK( 1 ) )
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -258,7 +259,7 @@ SUBROUTINE CSYSV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/csysv_aa.f b/SRC/csysv_aa.f
index 8548c27893..469a961dc6 100644
--- a/SRC/csysv_aa.f
+++ b/SRC/csysv_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYSV_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csysv_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csysv_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -154,11 +152,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYsolve
+*> \ingroup hesv_aa
 *
 *  =====================================================================
       SUBROUTINE CSYSV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
      $                        LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -182,7 +181,8 @@ SUBROUTINE CSYSV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           ILAENV, LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           XERBLA, CSYTRF_AA, CSYTRS_AA
@@ -196,7 +196,8 @@ SUBROUTINE CSYSV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -217,7 +218,7 @@ SUBROUTINE CSYSV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
      $                   -1, INFO )
          LWKOPT_SYTRS = INT( WORK(1) )
          LWKOPT = MAX( LWKOPT_SYTRF, LWKOPT_SYTRS )
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -239,7 +240,7 @@ SUBROUTINE CSYSV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/csysv_aa_2stage.f b/SRC/csysv_aa_2stage.f
index d8881a7480..8fc84acac9 100644
--- a/SRC/csysv_aa_2stage.f
+++ b/SRC/csysv_aa_2stage.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYSV_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csysv_aa_2stage.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csysv_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -87,7 +85,7 @@
 *>          triangular part of the matrix A, and the strictly upper
 *>          triangular part of A is not referenced.
 *>
-*>          On exit, L is stored below (or above) the subdiaonal blocks,
+*>          On exit, L is stored below (or above) the subdiagonal blocks,
 *>          when UPLO  is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -177,7 +175,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hesv_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE CSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
@@ -207,7 +205,8 @@ SUBROUTINE CSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CSYTRF_AA_2STAGE, 
@@ -267,7 +266,7 @@ SUBROUTINE CSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/csysv_rk.f b/SRC/csysv_rk.f
index 793e39df5a..67b0b7db93 100644
--- a/SRC/csysv_rk.f
+++ b/SRC/csysv_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYSV_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csysv_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csysv_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -205,7 +203,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYsolve
+*> \ingroup hesv_rk
 *
 *> \par Contributors:
 *  ==================
@@ -223,8 +221,10 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE CSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
+      SUBROUTINE CSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
+     $                     WORK,
      $                     LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -247,7 +247,8 @@ SUBROUTINE CSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           XERBLA, CSYTRF_RK, CSYTRS_3
@@ -261,7 +262,8 @@ SUBROUTINE CSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -279,10 +281,11 @@ SUBROUTINE CSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
          IF( N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            CALL CSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, -1, INFO )
-            LWKOPT = REAL( WORK(1) )
+            CALL CSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, -1,
+     $                      INFO )
+            LWKOPT = INT( WORK( 1 ) )
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -300,11 +303,12 @@ SUBROUTINE CSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
 *
 *        Solve the system A*X = B with BLAS3 solver, overwriting B with X.
 *
-         CALL CSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, INFO )
+         CALL CSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
+     $                  INFO )
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/csysv_rook.f b/SRC/csysv_rook.f
index daa9f27c41..6ca14c7b47 100644
--- a/SRC/csysv_rook.f
+++ b/SRC/csysv_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYSV_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csysv_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csysv_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -181,7 +179,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYsolve
+*> \ingroup hesv_rook
 *
 *> \par Contributors:
 *  ==================
@@ -199,8 +197,10 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE CSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
+      SUBROUTINE CSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
+     $                       WORK,
      $                  LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,7 +223,8 @@ SUBROUTINE CSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           XERBLA, CSYTRF_ROOK, CSYTRS_ROOK
@@ -237,7 +238,8 @@ SUBROUTINE CSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -256,9 +258,9 @@ SUBROUTINE CSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
             LWKOPT = 1
          ELSE
             CALL CSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, -1, INFO )
-            LWKOPT = REAL( WORK(1) )
+            LWKOPT = INT( WORK( 1 ) )
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -277,11 +279,12 @@ SUBROUTINE CSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
 *        Solve with TRS_ROOK ( Use Level 2 BLAS)
 *
-         CALL CSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+         CALL CSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
+     $                     INFO )
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/csysvx.f b/SRC/csysvx.f
index 2afa082a9f..c261f4fd68 100644
--- a/SRC/csysvx.f
+++ b/SRC/csysvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csysvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csysvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -276,12 +274,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYsolve
+*> \ingroup hesvx
 *
 *  =====================================================================
-      SUBROUTINE CSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
+      SUBROUTINE CSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
+     $                   B,
      $                   LDB, X, LDX, RCOND, FERR, BERR, WORK, LWORK,
      $                   RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -313,11 +313,13 @@ SUBROUTINE CSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               CLANSY, SLAMCH
-      EXTERNAL           ILAENV, LSAME, CLANSY, SLAMCH
+      REAL               CLANSY, SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, CLANSY, SLAMCH,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLACPY, CSYCON, CSYRFS, CSYTRF, CSYTRS, XERBLA
+      EXTERNAL           CLACPY, CSYCON, CSYRFS, CSYTRF, CSYTRS,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -331,7 +333,8 @@ SUBROUTINE CSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
       LQUERY = ( LWORK.EQ.-1 )
       IF( .NOT.NOFACT .AND. .NOT.LSAME( FACT, 'F' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -356,7 +359,7 @@ SUBROUTINE CSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
             NB = ILAENV( 1, 'CSYTRF', UPLO, N, -1, -1, -1 )
             LWKOPT = MAX( LWKOPT, N*NB )
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -387,7 +390,8 @@ SUBROUTINE CSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL CSYCON( UPLO, N, AF, LDAF, IPIV, ANORM, RCOND, WORK, INFO )
+      CALL CSYCON( UPLO, N, AF, LDAF, IPIV, ANORM, RCOND, WORK,
+     $             INFO )
 *
 *     Compute the solution vectors X.
 *
@@ -405,7 +409,7 @@ SUBROUTINE CSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
       IF( RCOND.LT.SLAMCH( 'Epsilon' ) )
      $   INFO = N + 1
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/csysvxx.f b/SRC/csysvxx.f
index 19d07411ca..4c2d447c3e 100644
--- a/SRC/csysvxx.f
+++ b/SRC/csysvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYSVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csysvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csysvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -499,13 +497,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYsolve
+*> \ingroup hesvxx
 *
 *  =====================================================================
-      SUBROUTINE CSYSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE CSYSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    EQUED, S, B, LDB, X, LDX, RCOND, RPVGRW, BERR,
      $                    N_ERR_BNDS, ERR_BNDS_NORM, ERR_BNDS_COMP,
      $                    NPARAMS, PARAMS, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -630,7 +630,8 @@ SUBROUTINE CSYSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Compute row and column scalings to equilibrate the matrix A.
 *
-         CALL CSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFEQU )
+         CALL CSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK,
+     $                 INFEQU )
          IF( INFEQU.EQ.0 ) THEN
 *
 *     Equilibrate the matrix.
@@ -650,7 +651,8 @@ SUBROUTINE CSYSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *        Compute the LDL^T or UDU^T factorization of A.
 *
          CALL CLACPY( UPLO, N, N, A, LDA, AF, LDAF )
-         CALL CSYTRF( UPLO, N, AF, LDAF, IPIV, WORK, 5*MAX(1,N), INFO )
+         CALL CSYTRF( UPLO, N, AF, LDAF, IPIV, WORK, 5*MAX(1,N),
+     $                INFO )
 *
 *        Return if INFO is non-zero.
 *
diff --git a/SRC/csyswapr.f b/SRC/csyswapr.f
index 185d819225..ed5ca84b55 100644
--- a/SRC/csyswapr.f
+++ b/SRC/csyswapr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYSWAPR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csyswapr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csyswapr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -58,15 +56,13 @@
 *> \param[in,out] A
 *> \verbatim
 *>          A is COMPLEX array, dimension (LDA,N)
-*>          On entry, the NB diagonal matrix D and the multipliers
-*>          used to obtain the factor U or L as computed by CSYTRF.
-*>
-*>          On exit, if INFO = 0, the (symmetric) inverse of the original
-*>          matrix.  If UPLO = 'U', the upper triangular part of the
-*>          inverse is formed and the part of A below the diagonal is not
-*>          referenced; if UPLO = 'L' the lower triangular part of the
-*>          inverse is formed and the part of A above the diagonal is
-*>          not referenced.
+*>          On entry, the N-by-N matrix A. On exit, the permuted matrix
+*>          where the rows I1 and I2 and columns I1 and I2 are interchanged.
+*>          If UPLO = 'U', the interchanges are applied to the upper
+*>          triangular part and the strictly lower triangular part of A is
+*>          not referenced; if UPLO = 'L', the interchanges are applied to
+*>          the lower triangular part and the part of A above the diagonal
+*>          is not referenced.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -95,10 +91,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYauxiliary
+*> \ingroup heswapr
 *
 *  =====================================================================
       SUBROUTINE CSYSWAPR( UPLO, N, A, LDA, I1, I2)
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -116,7 +113,6 @@ SUBROUTINE CSYSWAPR( UPLO, N, A, LDA, I1, I2)
 *     ..
 *     .. Local Scalars ..
       LOGICAL            UPPER
-      INTEGER            I
       COMPLEX            TMP
 *
 *     .. External Functions ..
@@ -143,19 +139,12 @@ SUBROUTINE CSYSWAPR( UPLO, N, A, LDA, I1, I2)
          A(I1,I1)=A(I2,I2)
          A(I2,I2)=TMP
 *
-         DO I=1,I2-I1-1
-            TMP=A(I1,I1+I)
-            A(I1,I1+I)=A(I1+I,I2)
-            A(I1+I,I2)=TMP
-         END DO
+         CALL CSWAP( I2-I1-1, A(I1,I1+1), LDA, A(I1+1,I2), 1 )
 *
 *          third swap
 *          - swap row I1 and I2 from I2+1 to N
-         DO I=I2+1,N
-            TMP=A(I1,I)
-            A(I1,I)=A(I2,I)
-            A(I2,I)=TMP
-         END DO
+         IF ( I2.LT.N )
+     $      CALL CSWAP( N-I2, A(I1,I2+1), LDA, A(I2,I2+1), LDA )
 *
         ELSE
 *
@@ -171,19 +160,12 @@ SUBROUTINE CSYSWAPR( UPLO, N, A, LDA, I1, I2)
           A(I1,I1)=A(I2,I2)
           A(I2,I2)=TMP
 *
-          DO I=1,I2-I1-1
-             TMP=A(I1+I,I1)
-             A(I1+I,I1)=A(I2,I1+I)
-             A(I2,I1+I)=TMP
-          END DO
+          CALL CSWAP( I2-I1-1, A(I1+1,I1), 1, A(I2,I1+1), LDA )
 *
 *         third swap
 *          - swap col I1 and I2 from I2+1 to N
-          DO I=I2+1,N
-             TMP=A(I,I1)
-             A(I,I1)=A(I,I2)
-             A(I,I2)=TMP
-          END DO
+          IF ( I2.LT.N )
+     $        CALL CSWAP( N-I2, A(I2+1,I1), 1, A(I2+1,I2), 1 )
 *
       ENDIF
       END SUBROUTINE CSYSWAPR
diff --git a/SRC/csytf2.f b/SRC/csytf2.f
index 0bee443189..01c882fad5 100644
--- a/SRC/csytf2.f
+++ b/SRC/csytf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,7 +125,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetf2
 *
 *> \par Further Details:
 *  =====================
@@ -188,6 +186,7 @@
 *
 *  =====================================================================
       SUBROUTINE CSYTF2( UPLO, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -481,7 +480,8 @@ SUBROUTINE CSYTF2( UPLO, N, A, LDA, IPIV, INFO )
                JMAX = K - 1 + ICAMAX( IMAX-K, A( IMAX, K ), LDA )
                ROWMAX = CABS1( A( IMAX, JMAX ) )
                IF( IMAX.LT.N ) THEN
-                  JMAX = IMAX + ICAMAX( N-IMAX, A( IMAX+1, IMAX ), 1 )
+                  JMAX = IMAX + ICAMAX( N-IMAX, A( IMAX+1, IMAX ),
+     $                                  1 )
                   ROWMAX = MAX( ROWMAX, CABS1( A( JMAX, IMAX ) ) )
                END IF
 *
@@ -513,7 +513,8 @@ SUBROUTINE CSYTF2( UPLO, N, A, LDA, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL CSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL CSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
                CALL CSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
      $                     LDA )
                T = A( KK, KK )
diff --git a/SRC/csytf2_rk.f b/SRC/csytf2_rk.f
index 12d6d5d8f9..a2ff8ad9e5 100644
--- a/SRC/csytf2_rk.f
+++ b/SRC/csytf2_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTF2_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytf2_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytf2_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -208,7 +206,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetf2_rk
 *
 *> \par Further Details:
 *  =====================
@@ -238,6 +236,7 @@
 *
 *  =====================================================================
       SUBROUTINE CSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -469,7 +468,8 @@ SUBROUTINE CSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *              the interchanges in columns k+1:N.
 *
                IF( K.LT.N )
-     $            CALL CSWAP( N-K, A( K, K+1 ), LDA, A( P, K+1 ), LDA )
+     $            CALL CSWAP( N-K, A( K, K+1 ), LDA, A( P, K+1 ),
+     $                        LDA )
 *
             END IF
 *
@@ -484,7 +484,8 @@ SUBROUTINE CSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
                IF( KP.GT.1 )
      $            CALL CSWAP( KP-1, A( 1, KK ), 1, A( 1, KP ), 1 )
                IF( ( KK.GT.1 ) .AND. ( KP.LT.(KK-1) ) )
-     $            CALL CSWAP( KK-KP-1, A( KP+1, KK ), 1, A( KP, KP+1 ),
+     $            CALL CSWAP( KK-KP-1, A( KP+1, KK ), 1, A( KP,
+     $                        KP+1 ),
      $                     LDA )
                T = A( KK, KK )
                A( KK, KK ) = A( KP, KP )
@@ -526,7 +527,8 @@ SUBROUTINE CSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                       = A - W(k)*1/D(k)*W(k)**T
 *
                      D11 = CONE / A( K, K )
-                     CALL CSYR( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL CSYR( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
 *
 *                    Store U(k) in column k
 *
@@ -545,7 +547,8 @@ SUBROUTINE CSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                       = A - W(k)*(1/D(k))*W(k)**T
 *                       = A - (W(k)/D(k))*(D(k))*(W(k)/D(K))**T
 *
-                     CALL CSYR( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL CSYR( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
                   END IF
 *
 *                 Store the superdiagonal element of D in array E
@@ -703,14 +706,16 @@ SUBROUTINE CSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                 Determine both ROWMAX and JMAX.
 *
                   IF( IMAX.NE.K ) THEN
-                     JMAX = K - 1 + ICAMAX( IMAX-K, A( IMAX, K ), LDA )
+                     JMAX = K - 1 + ICAMAX( IMAX-K, A( IMAX, K ),
+     $                                      LDA )
                      ROWMAX = CABS1( A( IMAX, JMAX ) )
                   ELSE
                      ROWMAX = ZERO
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + ICAMAX( N-IMAX, A( IMAX+1, IMAX ),
+                     ITEMP = IMAX + ICAMAX( N-IMAX, A( IMAX+1,
+     $                                      IMAX ),
      $                                     1 )
                      STEMP = CABS1( A( ITEMP, IMAX ) )
                      IF( STEMP.GT.ROWMAX ) THEN
@@ -769,7 +774,8 @@ SUBROUTINE CSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
                IF( P.LT.N )
      $            CALL CSWAP( N-P, A( P+1, K ), 1, A( P+1, P ), 1 )
                IF( P.GT.(K+1) )
-     $            CALL CSWAP( P-K-1, A( K+1, K ), 1, A( P, K+1 ), LDA )
+     $            CALL CSWAP( P-K-1, A( K+1, K ), 1, A( P, K+1 ),
+     $                        LDA )
                T = A( K, K )
                A( K, K ) = A( P, P )
                A( P, P ) = T
@@ -791,9 +797,11 @@ SUBROUTINE CSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL CSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL CSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
                IF( ( KK.LT.N ) .AND. ( KP.GT.(KK+1) ) )
-     $            CALL CSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
+     $            CALL CSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP,
+     $                        KK+1 ),
      $                     LDA )
                T = A( KK, KK )
                A( KK, KK ) = A( KP, KP )
diff --git a/SRC/csytf2_rook.f b/SRC/csytf2_rook.f
index 5ae4c98036..df504cef8b 100644
--- a/SRC/csytf2_rook.f
+++ b/SRC/csytf2_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTF2_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytf2_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytf2_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -129,7 +127,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetf2_rook
 *
 *> \par Further Details:
 *  =====================
@@ -191,6 +189,7 @@
 *
 *  =====================================================================
       SUBROUTINE CSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -418,7 +417,8 @@ SUBROUTINE CSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
                IF( KP.GT.1 )
      $            CALL CSWAP( KP-1, A( 1, KK ), 1, A( 1, KP ), 1 )
                IF( ( KK.GT.1 ) .AND. ( KP.LT.(KK-1) ) )
-     $            CALL CSWAP( KK-KP-1, A( KP+1, KK ), 1, A( KP, KP+1 ),
+     $            CALL CSWAP( KK-KP-1, A( KP+1, KK ), 1, A( KP,
+     $                        KP+1 ),
      $                     LDA )
                T = A( KK, KK )
                A( KK, KK ) = A( KP, KP )
@@ -452,7 +452,8 @@ SUBROUTINE CSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                       = A - W(k)*1/D(k)*W(k)**T
 *
                      D11 = CONE / A( K, K )
-                     CALL CSYR( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL CSYR( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
 *
 *                    Store U(k) in column k
 *
@@ -471,7 +472,8 @@ SUBROUTINE CSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                       = A - W(k)*(1/D(k))*W(k)**T
 *                       = A - (W(k)/D(k))*(D(k))*(W(k)/D(K))**T
 *
-                     CALL CSYR( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL CSYR( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
                   END IF
                END IF
 *
@@ -601,14 +603,16 @@ SUBROUTINE CSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                 Determine both ROWMAX and JMAX.
 *
                   IF( IMAX.NE.K ) THEN
-                     JMAX = K - 1 + ICAMAX( IMAX-K, A( IMAX, K ), LDA )
+                     JMAX = K - 1 + ICAMAX( IMAX-K, A( IMAX, K ),
+     $                                      LDA )
                      ROWMAX = CABS1( A( IMAX, JMAX ) )
                   ELSE
                      ROWMAX = ZERO
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + ICAMAX( N-IMAX, A( IMAX+1, IMAX ),
+                     ITEMP = IMAX + ICAMAX( N-IMAX, A( IMAX+1,
+     $                                      IMAX ),
      $                                     1 )
                      STEMP = CABS1( A( ITEMP, IMAX ) )
                      IF( STEMP.GT.ROWMAX ) THEN
@@ -667,7 +671,8 @@ SUBROUTINE CSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
                IF( P.LT.N )
      $            CALL CSWAP( N-P, A( P+1, K ), 1, A( P+1, P ), 1 )
                IF( P.GT.(K+1) )
-     $            CALL CSWAP( P-K-1, A( K+1, K ), 1, A( P, K+1 ), LDA )
+     $            CALL CSWAP( P-K-1, A( K+1, K ), 1, A( P, K+1 ),
+     $                        LDA )
                T = A( K, K )
                A( K, K ) = A( P, P )
                A( P, P ) = T
@@ -682,9 +687,11 @@ SUBROUTINE CSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL CSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL CSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
                IF( ( KK.LT.N ) .AND. ( KP.GT.(KK+1) ) )
-     $            CALL CSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
+     $            CALL CSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP,
+     $                        KK+1 ),
      $                     LDA )
                T = A( KK, KK )
                A( KK, KK ) = A( KP, KP )
diff --git a/SRC/csytrf.f b/SRC/csytrf.f
index ebf228f188..a8f3a9372f 100644
--- a/SRC/csytrf.f
+++ b/SRC/csytrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,7 +133,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetrf
 *
 *> \par Further Details:
 *  =====================
@@ -179,6 +177,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -202,7 +201,8 @@ SUBROUTINE CSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CLASYF, CSYTF2, XERBLA
@@ -232,8 +232,8 @@ SUBROUTINE CSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *        Determine the block size
 *
          NB = ILAENV( 1, 'CSYTRF', UPLO, N, -1, -1, -1 )
-         LWKOPT = N*NB
-         WORK( 1 ) = LWKOPT
+         LWKOPT = MAX( 1, N*NB )
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -249,7 +249,8 @@ SUBROUTINE CSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
          IWS = LDWORK*NB
          IF( LWORK.LT.IWS ) THEN
             NB = MAX( LWORK / LDWORK, 1 )
-            NBMIN = MAX( 2, ILAENV( 2, 'CSYTRF', UPLO, N, -1, -1, -1 ) )
+            NBMIN = MAX( 2, ILAENV( 2, 'CSYTRF', UPLO, N, -1, -1,
+     $                   -1 ) )
          END IF
       ELSE
          IWS = 1
@@ -278,7 +279,8 @@ SUBROUTINE CSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *           Factorize columns k-kb+1:k of A and use blocked code to
 *           update columns 1:k-kb
 *
-            CALL CLASYF( UPLO, K, NB, KB, A, LDA, IPIV, WORK, N, IINFO )
+            CALL CLASYF( UPLO, K, NB, KB, A, LDA, IPIV, WORK, N,
+     $                   IINFO )
          ELSE
 *
 *           Use unblocked code to factorize columns 1:k of A
@@ -318,13 +320,15 @@ SUBROUTINE CSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *           Factorize columns k:k+kb-1 of A and use blocked code to
 *           update columns k+kb:n
 *
-            CALL CLASYF( UPLO, N-K+1, NB, KB, A( K, K ), LDA, IPIV( K ),
+            CALL CLASYF( UPLO, N-K+1, NB, KB, A( K, K ), LDA,
+     $                   IPIV( K ),
      $                   WORK, N, IINFO )
          ELSE
 *
 *           Use unblocked code to factorize columns k:n of A
 *
-            CALL CSYTF2( UPLO, N-K+1, A( K, K ), LDA, IPIV( K ), IINFO )
+            CALL CSYTF2( UPLO, N-K+1, A( K, K ), LDA, IPIV( K ),
+     $                   IINFO )
             KB = N - K + 1
          END IF
 *
@@ -351,7 +355,7 @@ SUBROUTINE CSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
       END IF
 *
    40 CONTINUE
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of CSYTRF
diff --git a/SRC/csytrf_aa.f b/SRC/csytrf_aa.f
index b1165a425b..906bf06600 100644
--- a/SRC/csytrf_aa.f
+++ b/SRC/csytrf_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTRF_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytrf_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytrf_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -74,7 +72,7 @@
 *>
 *>          On exit, the tridiagonal matrix is stored in the diagonals
 *>          and the subdiagonals of A just below (or above) the diagonals,
-*>          and L is stored below (or above) the subdiaonals, when UPLO
+*>          and L is stored below (or above) the subdiagonals, when UPLO
 *>          is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -125,7 +123,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetrf_aa
 *
 *  =====================================================================
       SUBROUTINE CSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
@@ -159,10 +157,12 @@ SUBROUTINE CSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLASYF_AA, CGEMM, CGEMV, CSCAL, CSWAP, CCOPY,
+      EXTERNAL           CLASYF_AA, CGEMM, CGEMV, CSCAL, CSWAP,
+     $                   CCOPY,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -191,7 +191,7 @@ SUBROUTINE CSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
 *
       IF( INFO.EQ.0 ) THEN
          LWKOPT = (NB+1)*N
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -457,7 +457,7 @@ SUBROUTINE CSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
       END IF
 *
    20 CONTINUE
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of CSYTRF_AA
diff --git a/SRC/csytrf_aa_2stage.f b/SRC/csytrf_aa_2stage.f
index 8a2cfd7bc0..b2a16223ae 100644
--- a/SRC/csytrf_aa_2stage.f
+++ b/SRC/csytrf_aa_2stage.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTRF_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytrf_aa_2stage.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytrf_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -75,7 +73,7 @@
 *>          triangular part of the matrix A, and the strictly upper
 *>          triangular part of A is not referenced.
 *>
-*>          On exit, L is stored below (or above) the subdiaonal blocks,
+*>          On exit, L is stored below (or above) the subdiagonal blocks,
 *>          when UPLO  is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -152,7 +150,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetrf_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE CSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
@@ -188,10 +186,12 @@ SUBROUTINE CSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CGBTRF, CGEMM, CGETRF, CLACPY,  
+      EXTERNAL           CCOPY, CGBTRF, CGEMM, CGETRF,
+     $                   CLACPY,
      $                   CLASET, CTRSM, CSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -227,10 +227,10 @@ SUBROUTINE CSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
       NB = ILAENV( 1, 'CSYTRF_AA_2STAGE', UPLO, N, -1, -1, -1 )
       IF( INFO.EQ.0 ) THEN
          IF( TQUERY ) THEN
-            TB( 1 ) = (3*NB+1)*N
+            TB( 1 ) = CMPLX( (3*NB+1)*N )
          END IF
          IF( WQUERY ) THEN
-            WORK( 1 ) = N*NB
+            WORK( 1 ) = SROUNDUP_LWORK(N*NB)
          END IF
       END IF
       IF( TQUERY .OR. WQUERY ) THEN
@@ -267,7 +267,7 @@ SUBROUTINE CSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
 *
 *     Save NB
 *
-      TB( 1 ) = NB
+      TB( 1 ) = CMPLX( NB )
 *
       IF( UPPER ) THEN
 *
diff --git a/SRC/csytrf_rk.f b/SRC/csytrf_rk.f
index 9c2b7182f2..c663b14e37 100644
--- a/SRC/csytrf_rk.f
+++ b/SRC/csytrf_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTRF_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytrf_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytrf_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -229,7 +227,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetrf_rk
 *
 *> \par Further Details:
 *  =====================
@@ -256,6 +254,7 @@
 *  =====================================================================
       SUBROUTINE CSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
      $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -280,7 +279,8 @@ SUBROUTINE CSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CLASYF_RK, CSYTF2_RK, CSWAP, XERBLA
@@ -310,8 +310,8 @@ SUBROUTINE CSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *        Determine the block size
 *
          NB = ILAENV( 1, 'CSYTRF_RK', UPLO, N, -1, -1, -1 )
-         LWKOPT = N*NB
-         WORK( 1 ) = LWKOPT
+         LWKOPT = MAX( 1, N*NB )
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -425,7 +425,8 @@ SUBROUTINE CSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *           Factorize columns k:k+kb-1 of A and use blocked code to
 *           update columns k+kb:n
 *
-            CALL CLASYF_RK( UPLO, N-K+1, NB, KB, A( K, K ), LDA, E( K ),
+            CALL CLASYF_RK( UPLO, N-K+1, NB, KB, A( K, K ), LDA,
+     $                      E( K ),
      $                        IPIV( K ), WORK, LDWORK, IINFO )
 
 
@@ -487,7 +488,7 @@ SUBROUTINE CSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of CSYTRF_RK
diff --git a/SRC/csytrf_rook.f b/SRC/csytrf_rook.f
index ce7c1e5866..83c8bea142 100644
--- a/SRC/csytrf_rook.f
+++ b/SRC/csytrf_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTRF_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytrf_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytrf_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -146,7 +144,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetrf_rook
 *
 *> \par Further Details:
 *  =====================
@@ -204,7 +202,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE CSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      SUBROUTINE CSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK,
+     $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -228,7 +228,8 @@ SUBROUTINE CSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CLASYF_ROOK, CSYTF2_ROOK, XERBLA
@@ -259,7 +260,7 @@ SUBROUTINE CSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *
          NB = ILAENV( 1, 'CSYTRF_ROOK', UPLO, N, -1, -1, -1 )
          LWKOPT = MAX( 1, N*NB )
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -382,7 +383,7 @@ SUBROUTINE CSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
       END IF
 *
    40 CONTINUE
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of CSYTRF_ROOK
diff --git a/SRC/csytri.f b/SRC/csytri.f
index 3f3665338a..17c9ef4d76 100644
--- a/SRC/csytri.f
+++ b/SRC/csytri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetri
 *
 *  =====================================================================
       SUBROUTINE CSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -221,7 +220,8 @@ SUBROUTINE CSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
                CALL CCOPY( K-1, A( 1, K ), 1, WORK, 1 )
                CALL CSYMV( UPLO, K-1, -ONE, A, LDA, WORK, 1, ZERO,
      $                     A( 1, K ), 1 )
-               A( K, K ) = A( K, K ) - CDOTU( K-1, WORK, 1, A( 1, K ),
+               A( K, K ) = A( K, K ) - CDOTU( K-1, WORK, 1, A( 1,
+     $            K ),
      $                     1 )
             END IF
             KSTEP = 1
@@ -246,10 +246,12 @@ SUBROUTINE CSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
                CALL CCOPY( K-1, A( 1, K ), 1, WORK, 1 )
                CALL CSYMV( UPLO, K-1, -ONE, A, LDA, WORK, 1, ZERO,
      $                     A( 1, K ), 1 )
-               A( K, K ) = A( K, K ) - CDOTU( K-1, WORK, 1, A( 1, K ),
+               A( K, K ) = A( K, K ) - CDOTU( K-1, WORK, 1, A( 1,
+     $            K ),
      $                     1 )
                A( K, K+1 ) = A( K, K+1 ) -
-     $                       CDOTU( K-1, A( 1, K ), 1, A( 1, K+1 ), 1 )
+     $                       CDOTU( K-1, A( 1, K ), 1, A( 1, K+1 ),
+     $                              1 )
                CALL CCOPY( K-1, A( 1, K+1 ), 1, WORK, 1 )
                CALL CSYMV( UPLO, K-1, -ONE, A, LDA, WORK, 1, ZERO,
      $                     A( 1, K+1 ), 1 )
@@ -308,9 +310,11 @@ SUBROUTINE CSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL CCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL CSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL CSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K ), 1 )
-               A( K, K ) = A( K, K ) - CDOTU( N-K, WORK, 1, A( K+1, K ),
+               A( K, K ) = A( K, K ) - CDOTU( N-K, WORK, 1, A( K+1,
+     $            K ),
      $                     1 )
             END IF
             KSTEP = 1
@@ -333,18 +337,23 @@ SUBROUTINE CSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL CCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL CSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL CSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K ), 1 )
-               A( K, K ) = A( K, K ) - CDOTU( N-K, WORK, 1, A( K+1, K ),
+               A( K, K ) = A( K, K ) - CDOTU( N-K, WORK, 1, A( K+1,
+     $            K ),
      $                     1 )
                A( K, K-1 ) = A( K, K-1 ) -
-     $                       CDOTU( N-K, A( K+1, K ), 1, A( K+1, K-1 ),
+     $                       CDOTU( N-K, A( K+1, K ), 1, A( K+1,
+     $                              K-1 ),
      $                       1 )
                CALL CCOPY( N-K, A( K+1, K-1 ), 1, WORK, 1 )
-               CALL CSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL CSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K-1 ), 1 )
                A( K-1, K-1 ) = A( K-1, K-1 ) -
-     $                         CDOTU( N-K, WORK, 1, A( K+1, K-1 ), 1 )
+     $                         CDOTU( N-K, WORK, 1, A( K+1, K-1 ),
+     $                                1 )
             END IF
             KSTEP = 2
          END IF
diff --git a/SRC/csytri2.f b/SRC/csytri2.f
index 33c71060ea..beb6f3e99c 100644
--- a/SRC/csytri2.f
+++ b/SRC/csytri2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTRI2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytri2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytri2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,10 +118,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetri2
 *
 *  =====================================================================
       SUBROUTINE CSYTRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -184,7 +183,7 @@ SUBROUTINE CSYTRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
          CALL XERBLA( 'CSYTRI2', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
-         WORK(1)=MINSIZE
+         WORK(1)=CMPLX( MINSIZE )
          RETURN
       END IF
       IF( N.EQ.0 )
diff --git a/SRC/csytri2x.f b/SRC/csytri2x.f
index 306e666e0e..47e2772e96 100644
--- a/SRC/csytri2x.f
+++ b/SRC/csytri2x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTRI2X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytri2x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytri2x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,10 +111,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetri2x
 *
 *  =====================================================================
       SUBROUTINE CSYTRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -382,8 +381,10 @@ SUBROUTINE CSYTRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
             DO WHILE ( I .LE. N )
                IF( IPIV(I) .GT. 0 ) THEN
                   IP=IPIV(I)
-                 IF (I .LT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, I ,IP )
-                 IF (I .GT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                 IF (I .LT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, I ,
+     $                IP )
+                 IF (I .GT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, IP ,
+     $                I )
                ELSE
                  IP=-IPIV(I)
                  I=I+1
@@ -565,12 +566,16 @@ SUBROUTINE CSYTRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
             DO WHILE ( I .GE. 1 )
                IF( IPIV(I) .GT. 0 ) THEN
                   IP=IPIV(I)
-                 IF (I .LT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, I ,IP  )
-                 IF (I .GT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                 IF (I .LT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, I ,
+     $                IP  )
+                 IF (I .GT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, IP ,
+     $                I )
                ELSE
                  IP=-IPIV(I)
-                 IF ( I .LT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, I ,IP )
-                 IF ( I .GT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                 IF ( I .LT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, I ,
+     $                IP )
+                 IF ( I .GT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, IP ,
+     $                I )
                  I=I-1
                ENDIF
                I=I-1
diff --git a/SRC/csytri_3.f b/SRC/csytri_3.f
index 279f62853e..4d8b83f0ea 100644
--- a/SRC/csytri_3.f
+++ b/SRC/csytri_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTRI_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytri_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytri_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -152,7 +150,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetri_3
 *
 *> \par Contributors:
 *  ==================
@@ -167,6 +165,7 @@
 *  =====================================================================
       SUBROUTINE CSYTRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
      $                     INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,7 +189,8 @@ SUBROUTINE CSYTRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CSYTRI_3X, XERBLA
@@ -225,7 +225,7 @@ SUBROUTINE CSYTRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
          CALL XERBLA( 'CSYTRI_3', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
          RETURN
       END IF
 *
@@ -236,7 +236,7 @@ SUBROUTINE CSYTRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *
       CALL CSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/csytri_3x.f b/SRC/csytri_3x.f
index 138fe67c83..935217fbfd 100644
--- a/SRC/csytri_3x.f
+++ b/SRC/csytri_3x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTRI_3X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytri_3x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytri_3x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -142,7 +140,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetri_3x
 *
 *> \par Contributors:
 *  ==================
@@ -155,7 +153,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE CSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
+      SUBROUTINE CSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB,
+     $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,7 +188,8 @@ SUBROUTINE CSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMM, CSYSWAPR, CTRTRI, CTRMM, XERBLA
+      EXTERNAL           CGEMM, CSYSWAPR, CTRTRI, CTRMM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MOD
@@ -433,8 +434,10 @@ SUBROUTINE CSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
          DO I = 1, N
              IP = ABS( IPIV( I ) )
              IF( IP.NE.I ) THEN
-                IF (I .LT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, I ,IP )
-                IF (I .GT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                IF (I .LT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, I ,
+     $               IP )
+                IF (I .GT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, IP ,
+     $               I )
              END IF
          END DO
 *
@@ -629,8 +632,10 @@ SUBROUTINE CSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
          DO I = N, 1, -1
              IP = ABS( IPIV( I ) )
              IF( IP.NE.I ) THEN
-                IF (I .LT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, I ,IP )
-                IF (I .GT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                IF (I .LT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, I ,
+     $               IP )
+                IF (I .GT. IP) CALL CSYSWAPR( UPLO, N, A, LDA, IP ,
+     $               I )
              END IF
          END DO
 *
diff --git a/SRC/csytri_rook.f b/SRC/csytri_rook.f
index 9fba543801..ff3165a502 100644
--- a/SRC/csytri_rook.f
+++ b/SRC/csytri_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTRI_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytri_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytri_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetri_rook
 *
 *> \par Contributors:
 *  ==================
@@ -126,6 +124,7 @@
 *
 *  =====================================================================
       SUBROUTINE CSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -236,7 +235,8 @@ SUBROUTINE CSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
                CALL CCOPY( K-1, A( 1, K ), 1, WORK, 1 )
                CALL CSYMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, CZERO,
      $                     A( 1, K ), 1 )
-               A( K, K ) = A( K, K ) - CDOTU( K-1, WORK, 1, A( 1, K ),
+               A( K, K ) = A( K, K ) - CDOTU( K-1, WORK, 1, A( 1,
+     $            K ),
      $                     1 )
             END IF
             KSTEP = 1
@@ -261,10 +261,12 @@ SUBROUTINE CSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
                CALL CCOPY( K-1, A( 1, K ), 1, WORK, 1 )
                CALL CSYMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, CZERO,
      $                     A( 1, K ), 1 )
-               A( K, K ) = A( K, K ) - CDOTU( K-1, WORK, 1, A( 1, K ),
+               A( K, K ) = A( K, K ) - CDOTU( K-1, WORK, 1, A( 1,
+     $            K ),
      $                     1 )
                A( K, K+1 ) = A( K, K+1 ) -
-     $                       CDOTU( K-1, A( 1, K ), 1, A( 1, K+1 ), 1 )
+     $                       CDOTU( K-1, A( 1, K ), 1, A( 1, K+1 ),
+     $                              1 )
                CALL CCOPY( K-1, A( 1, K+1 ), 1, WORK, 1 )
                CALL CSYMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, CZERO,
      $                     A( 1, K+1 ), 1 )
@@ -283,7 +285,8 @@ SUBROUTINE CSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
                IF( KP.GT.1 )
      $             CALL CSWAP( KP-1, A( 1, K ), 1, A( 1, KP ), 1 )
-               CALL CSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ), LDA )
+               CALL CSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ),
+     $                     LDA )
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
                A( KP, KP ) = TEMP
@@ -297,7 +300,8 @@ SUBROUTINE CSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
                IF( KP.GT.1 )
      $            CALL CSWAP( KP-1, A( 1, K ), 1, A( 1, KP ), 1 )
-               CALL CSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ), LDA )
+               CALL CSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ),
+     $                     LDA )
 *
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
@@ -312,7 +316,8 @@ SUBROUTINE CSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
                IF( KP.GT.1 )
      $            CALL CSWAP( KP-1, A( 1, K ), 1, A( 1, KP ), 1 )
-               CALL CSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ), LDA )
+               CALL CSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ),
+     $                     LDA )
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
                A( KP, KP ) = TEMP
@@ -350,9 +355,11 @@ SUBROUTINE CSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL CCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL CSYMV( UPLO, N-K,-CONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL CSYMV( UPLO, N-K,-CONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     CZERO, A( K+1, K ), 1 )
-               A( K, K ) = A( K, K ) - CDOTU( N-K, WORK, 1, A( K+1, K ),
+               A( K, K ) = A( K, K ) - CDOTU( N-K, WORK, 1, A( K+1,
+     $            K ),
      $                     1 )
             END IF
             KSTEP = 1
@@ -375,18 +382,23 @@ SUBROUTINE CSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL CCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL CSYMV( UPLO, N-K,-CONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL CSYMV( UPLO, N-K,-CONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     CZERO, A( K+1, K ), 1 )
-               A( K, K ) = A( K, K ) - CDOTU( N-K, WORK, 1, A( K+1, K ),
+               A( K, K ) = A( K, K ) - CDOTU( N-K, WORK, 1, A( K+1,
+     $            K ),
      $                     1 )
                A( K, K-1 ) = A( K, K-1 ) -
-     $                       CDOTU( N-K, A( K+1, K ), 1, A( K+1, K-1 ),
+     $                       CDOTU( N-K, A( K+1, K ), 1, A( K+1,
+     $                              K-1 ),
      $                       1 )
                CALL CCOPY( N-K, A( K+1, K-1 ), 1, WORK, 1 )
-               CALL CSYMV( UPLO, N-K,-CONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL CSYMV( UPLO, N-K,-CONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     CZERO, A( K+1, K-1 ), 1 )
                A( K-1, K-1 ) = A( K-1, K-1 ) -
-     $                         CDOTU( N-K, WORK, 1, A( K+1, K-1 ), 1 )
+     $                         CDOTU( N-K, WORK, 1, A( K+1, K-1 ),
+     $                                1 )
             END IF
             KSTEP = 2
          END IF
@@ -399,8 +411,10 @@ SUBROUTINE CSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             KP = IPIV( K )
             IF( KP.NE.K ) THEN
                IF( KP.LT.N )
-     $            CALL CSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
-               CALL CSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ), LDA )
+     $            CALL CSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
+               CALL CSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ),
+     $                     LDA )
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
                A( KP, KP ) = TEMP
@@ -413,8 +427,10 @@ SUBROUTINE CSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             KP = -IPIV( K )
             IF( KP.NE.K ) THEN
                IF( KP.LT.N )
-     $            CALL CSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
-               CALL CSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ), LDA )
+     $            CALL CSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
+               CALL CSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ),
+     $                     LDA )
 *
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
@@ -428,8 +444,10 @@ SUBROUTINE CSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             KP = -IPIV( K )
             IF( KP.NE.K ) THEN
                IF( KP.LT.N )
-     $            CALL CSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
-               CALL CSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ), LDA )
+     $            CALL CSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
+               CALL CSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ),
+     $                     LDA )
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
                A( KP, KP ) = TEMP
diff --git a/SRC/csytrs.f b/SRC/csytrs.f
index c872fda946..ad74beeb1a 100644
--- a/SRC/csytrs.f
+++ b/SRC/csytrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,10 +111,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetrs
 *
 *  =====================================================================
       SUBROUTINE CSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -207,7 +206,8 @@ SUBROUTINE CSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           Multiply by inv(U(K)), where U(K) is the transformation
 *           stored in column K of A.
 *
-            CALL CGERU( K-1, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ), LDB,
+            CALL CGERU( K-1, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ),
+     $                  LDB,
      $                  B( 1, 1 ), LDB )
 *
 *           Multiply by the inverse of the diagonal block.
@@ -227,7 +227,8 @@ SUBROUTINE CSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           Multiply by inv(U(K)), where U(K) is the transformation
 *           stored in columns K-1 and K of A.
 *
-            CALL CGERU( K-2, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ), LDB,
+            CALL CGERU( K-2, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ),
+     $                  LDB,
      $                  B( 1, 1 ), LDB )
             CALL CGERU( K-2, NRHS, -ONE, A( 1, K-1 ), 1, B( K-1, 1 ),
      $                  LDB, B( 1, 1 ), LDB )
@@ -270,7 +271,8 @@ SUBROUTINE CSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           Multiply by inv(U**T(K)), where U(K) is the transformation
 *           stored in column K of A.
 *
-            CALL CGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, A( 1, K ),
+            CALL CGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, A( 1,
+     $                  K ),
      $                  1, ONE, B( K, 1 ), LDB )
 *
 *           Interchange rows K and IPIV(K).
@@ -286,7 +288,8 @@ SUBROUTINE CSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           Multiply by inv(U**T(K+1)), where U(K+1) is the transformation
 *           stored in columns K and K+1 of A.
 *
-            CALL CGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, A( 1, K ),
+            CALL CGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, A( 1,
+     $                  K ),
      $                  1, ONE, B( K, 1 ), LDB )
             CALL CGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB,
      $                  A( 1, K+1 ), 1, ONE, B( K+1, 1 ), LDB )
@@ -333,7 +336,8 @@ SUBROUTINE CSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           stored in column K of A.
 *
             IF( K.LT.N )
-     $         CALL CGERU( N-K, NRHS, -ONE, A( K+1, K ), 1, B( K, 1 ),
+     $         CALL CGERU( N-K, NRHS, -ONE, A( K+1, K ), 1, B( K,
+     $                     1 ),
      $                     LDB, B( K+1, 1 ), LDB )
 *
 *           Multiply by the inverse of the diagonal block.
@@ -354,7 +358,8 @@ SUBROUTINE CSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL CGERU( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K, 1 ),
+               CALL CGERU( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K,
+     $                     1 ),
      $                     LDB, B( K+2, 1 ), LDB )
                CALL CGERU( N-K-1, NRHS, -ONE, A( K+2, K+1 ), 1,
      $                     B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
diff --git a/SRC/csytrs2.f b/SRC/csytrs2.f
index a3e7f4144c..9199bd90b2 100644
--- a/SRC/csytrs2.f
+++ b/SRC/csytrs2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTRS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytrs2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytrs2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -124,11 +122,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetrs2
 *
 *  =====================================================================
       SUBROUTINE CSYTRS2( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
      $                    WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -159,7 +158,8 @@ SUBROUTINE CSYTRS2( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CSCAL, CSYCONV, CSWAP, CTRSM, XERBLA
+      EXTERNAL           CSCAL, CSYCONV, CSWAP, CTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
diff --git a/SRC/csytrs_3.f b/SRC/csytrs_3.f
index 48b12d1cd0..3e715b26e3 100644
--- a/SRC/csytrs_3.f
+++ b/SRC/csytrs_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTRS_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytrs_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytrs_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -142,7 +140,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetrs_3
 *
 *> \par Contributors:
 *  ==================
@@ -162,6 +160,7 @@
 *  =====================================================================
       SUBROUTINE CSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
      $                     INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -246,7 +245,8 @@ SUBROUTINE CSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (U \P**T * B) -> B    [ (U \P**T * B) ]
 *
-         CALL CTRSM( 'L', 'U', 'N', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL CTRSM( 'L', 'U', 'N', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        Compute D \ B -> B   [ D \ (U \P**T * B) ]
 *
@@ -272,7 +272,8 @@ SUBROUTINE CSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (U**T \ B) -> B   [ U**T \ (D \ (U \P**T * B) ) ]
 *
-         CALL CTRSM( 'L', 'U', 'T', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL CTRSM( 'L', 'U', 'T', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        P * B  [ P * (U**T \ (D \ (U \P**T * B) )) ]
 *
@@ -313,7 +314,8 @@ SUBROUTINE CSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (L \P**T * B) -> B    [ (L \P**T * B) ]
 *
-         CALL CTRSM( 'L', 'L', 'N', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL CTRSM( 'L', 'L', 'N', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        Compute D \ B -> B   [ D \ (L \P**T * B) ]
 *
@@ -339,7 +341,8 @@ SUBROUTINE CSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (L**T \ B) -> B   [ L**T \ (D \ (L \P**T * B) ) ]
 *
-         CALL CTRSM('L', 'L', 'T', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL CTRSM('L', 'L', 'T', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        P * B  [ P * (L**T \ (D \ (L \P**T * B) )) ]
 *
diff --git a/SRC/csytrs_aa.f b/SRC/csytrs_aa.f
index 1f6ea40af5..4a69084416 100644
--- a/SRC/csytrs_aa.f
+++ b/SRC/csytrs_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTRS_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytrs_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytrs_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,7 +121,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetrs_aa
 *
 *  =====================================================================
       SUBROUTINE CSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
@@ -155,7 +153,8 @@ SUBROUTINE CSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CLACPY, CGTSV, CSWAP, CTRSM, XERBLA
@@ -186,7 +185,7 @@ SUBROUTINE CSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
          RETURN
       ELSE IF( LQUERY ) THEN
          LWKOPT = (3*N-2)
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
          RETURN
       END IF
 *
@@ -213,7 +212,8 @@ SUBROUTINE CSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute U**T \ B -> B    [ (U**T \P**T * B) ]
 *
-            CALL CTRSM( 'L', 'U', 'T', 'U', N-1, NRHS, ONE, A( 1, 2 ),
+            CALL CTRSM( 'L', 'U', 'T', 'U', N-1, NRHS, ONE, A( 1,
+     $                  2 ),
      $                  LDA, B( 2, 1 ), LDB)
          END IF
 *
@@ -223,10 +223,13 @@ SUBROUTINE CSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
          CALL CLACPY( 'F', 1, N, A( 1, 1 ), LDA+1, WORK( N ), 1)
          IF( N.GT.1 ) THEN
-            CALL CLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 1 ), 1 )
-            CALL CLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 2*N ), 1 )
+            CALL CLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 1 ),
+     $                   1 )
+            CALL CLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 2*N ),
+     $                   1 )
          END IF
-         CALL CGTSV( N, NRHS, WORK( 1 ), WORK( N ), WORK( 2*N ), B, LDB,
+         CALL CGTSV( N, NRHS, WORK( 1 ), WORK( N ), WORK( 2*N ), B,
+     $               LDB,
      $               INFO )
 *
 *        3) Backward substitution with U
@@ -235,7 +238,8 @@ SUBROUTINE CSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute U \ B -> B   [ U \ (T \ (U**T \P**T * B) ) ]
 *
-            CALL CTRSM( 'L', 'U', 'N', 'U', N-1, NRHS, ONE, A( 1, 2 ),
+            CALL CTRSM( 'L', 'U', 'N', 'U', N-1, NRHS, ONE, A( 1,
+     $                  2 ),
      $                  LDA, B( 2, 1 ), LDB)
 *
 *           Pivot, P * B -> B  [ P * (U**T \ (T \ (U \P**T * B) )) ]
@@ -265,7 +269,8 @@ SUBROUTINE CSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute L \ B -> B    [ (L \P**T * B) ]
 *
-            CALL CTRSM( 'L', 'L', 'N', 'U', N-1, NRHS, ONE, A( 2, 1 ),
+            CALL CTRSM( 'L', 'L', 'N', 'U', N-1, NRHS, ONE, A( 2,
+     $                  1 ),
      $                  LDA, B( 2, 1 ), LDB)
          END IF
 *
@@ -276,10 +281,13 @@ SUBROUTINE CSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
          CALL CLACPY( 'F', 1, N, A(1, 1), LDA+1, WORK(N), 1)
          IF( N.GT.1 ) THEN
-            CALL CLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 1 ), 1 )
-            CALL CLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 2*N ), 1 )
+            CALL CLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 1 ),
+     $                   1 )
+            CALL CLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 2*N ),
+     $                   1 )
          END IF
-         CALL CGTSV( N, NRHS, WORK( 1 ), WORK(N), WORK( 2*N ), B, LDB,
+         CALL CGTSV( N, NRHS, WORK( 1 ), WORK(N), WORK( 2*N ), B,
+     $               LDB,
      $               INFO)
 *
 *        3) Backward substitution with L**T
@@ -288,7 +296,8 @@ SUBROUTINE CSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute (L**T \ B) -> B   [ L**T \ (T \ (L \P**T * B) ) ]
 *
-            CALL CTRSM( 'L', 'L', 'T', 'U', N-1, NRHS, ONE, A( 2, 1 ),
+            CALL CTRSM( 'L', 'L', 'T', 'U', N-1, NRHS, ONE, A( 2,
+     $                  1 ),
      $                  LDA, B( 2, 1 ), LDB)
 *
 *           Pivot, P * B -> B  [ P * (L**T \ (T \ (L \P**T * B) )) ]
diff --git a/SRC/csytrs_aa_2stage.f b/SRC/csytrs_aa_2stage.f
index add9f42756..e0e58dd7a1 100644
--- a/SRC/csytrs_aa_2stage.f
+++ b/SRC/csytrs_aa_2stage.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTRS_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytrs_aa_2stage.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytrs_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -131,7 +129,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetrs_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE CSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
@@ -215,7 +213,8 @@ SUBROUTINE CSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (U**T \ B) -> B    [ (U**T \P**T * B) ]
 *
-            CALL CTRSM( 'L', 'U', 'T', 'U', N-NB, NRHS, ONE, A(1, NB+1),
+            CALL CTRSM( 'L', 'U', 'T', 'U', N-NB, NRHS, ONE, A(1,
+     $                  NB+1),
      $                 LDA, B(NB+1, 1), LDB)
 *
          END IF
@@ -228,7 +227,8 @@ SUBROUTINE CSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (U \ B) -> B   [ U \ (T \ (U**T \P**T * B) ) ]
 *
-            CALL CTRSM( 'L', 'U', 'N', 'U', N-NB, NRHS, ONE, A(1, NB+1),
+            CALL CTRSM( 'L', 'U', 'N', 'U', N-NB, NRHS, ONE, A(1,
+     $                  NB+1),
      $                  LDA, B(NB+1, 1), LDB)
 *
 *           Pivot, P * B -> B  [ P * (U \ (T \ (U**T \P**T * B) )) ]
@@ -249,7 +249,8 @@ SUBROUTINE CSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (L \ B) -> B    [ (L \P**T * B) ]
 *
-            CALL CTRSM( 'L', 'L', 'N', 'U', N-NB, NRHS, ONE, A(NB+1, 1),
+            CALL CTRSM( 'L', 'L', 'N', 'U', N-NB, NRHS, ONE, A(NB+1,
+     $                  1),
      $                 LDA, B(NB+1, 1), LDB)
 *
          END IF
@@ -262,7 +263,8 @@ SUBROUTINE CSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (L**T \ B) -> B   [ L**T \ (T \ (L \P**T * B) ) ]
 *
-            CALL CTRSM( 'L', 'L', 'T', 'U', N-NB, NRHS, ONE, A(NB+1, 1),
+            CALL CTRSM( 'L', 'L', 'T', 'U', N-NB, NRHS, ONE, A(NB+1,
+     $                  1),
      $                  LDA, B(NB+1, 1), LDB)
 *
 *           Pivot, P * B -> B  [ P * (L**T \ (T \ (L \P**T * B) )) ]
diff --git a/SRC/csytrs_rook.f b/SRC/csytrs_rook.f
index edc2248f26..df16f6f1a7 100644
--- a/SRC/csytrs_rook.f
+++ b/SRC/csytrs_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CSYTRS_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/csytrs_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/csytrs_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,7 +111,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup hetrs_rook
 *
 *> \par Contributors:
 *  ==================
@@ -133,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE CSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
      $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,7 +222,8 @@ SUBROUTINE CSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           Multiply by inv(U(K)), where U(K) is the transformation
 *           stored in column K of A.
 *
-            CALL CGERU( K-1, NRHS, -CONE, A( 1, K ), 1, B( K, 1 ), LDB,
+            CALL CGERU( K-1, NRHS, -CONE, A( 1, K ), 1, B( K, 1 ),
+     $                  LDB,
      $                 B( 1, 1 ), LDB )
 *
 *           Multiply by the inverse of the diagonal block.
@@ -250,7 +250,8 @@ SUBROUTINE CSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
             IF( K.GT.2 ) THEN
                CALL CGERU( K-2, NRHS,-CONE, A( 1, K ), 1, B( K, 1 ),
      $                    LDB, B( 1, 1 ), LDB )
-               CALL CGERU( K-2, NRHS,-CONE, A( 1, K-1 ), 1, B( K-1, 1 ),
+               CALL CGERU( K-2, NRHS,-CONE, A( 1, K-1 ), 1, B( K-1,
+     $                     1 ),
      $                    LDB, B( 1, 1 ), LDB )
             END IF
 *
@@ -363,7 +364,8 @@ SUBROUTINE CSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           stored in column K of A.
 *
             IF( K.LT.N )
-     $         CALL CGERU( N-K, NRHS, -CONE, A( K+1, K ), 1, B( K, 1 ),
+     $         CALL CGERU( N-K, NRHS, -CONE, A( K+1, K ), 1, B( K,
+     $                     1 ),
      $                    LDB, B( K+1, 1 ), LDB )
 *
 *           Multiply by the inverse of the diagonal block.
@@ -388,7 +390,8 @@ SUBROUTINE CSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL CGERU( N-K-1, NRHS,-CONE, A( K+2, K ), 1, B( K, 1 ),
+               CALL CGERU( N-K-1, NRHS,-CONE, A( K+2, K ), 1, B( K,
+     $                     1 ),
      $                    LDB, B( K+2, 1 ), LDB )
                CALL CGERU( N-K-1, NRHS,-CONE, A( K+2, K+1 ), 1,
      $                    B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
@@ -433,7 +436,8 @@ SUBROUTINE CSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           stored in column K of A.
 *
             IF( K.LT.N )
-     $         CALL CGEMV( 'Transpose', N-K, NRHS, -CONE, B( K+1, 1 ),
+     $         CALL CGEMV( 'Transpose', N-K, NRHS, -CONE, B( K+1,
+     $                     1 ),
      $                     LDB, A( K+1, K ), 1, CONE, B( K, 1 ), LDB )
 *
 *           Interchange rows K and IPIV(K).
@@ -450,9 +454,11 @@ SUBROUTINE CSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           stored in columns K-1 and K of A.
 *
             IF( K.LT.N ) THEN
-               CALL CGEMV( 'Transpose', N-K, NRHS, -CONE, B( K+1, 1 ),
+               CALL CGEMV( 'Transpose', N-K, NRHS, -CONE, B( K+1,
+     $                     1 ),
      $                     LDB, A( K+1, K ), 1, CONE, B( K, 1 ), LDB )
-               CALL CGEMV( 'Transpose', N-K, NRHS, -CONE, B( K+1, 1 ),
+               CALL CGEMV( 'Transpose', N-K, NRHS, -CONE, B( K+1,
+     $                     1 ),
      $                     LDB, A( K+1, K-1 ), 1, CONE, B( K-1, 1 ),
      $                     LDB )
             END IF
diff --git a/SRC/ctbcon.f b/SRC/ctbcon.f
index 4943011eb2..2577d39c1d 100644
--- a/SRC/ctbcon.f
+++ b/SRC/ctbcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTBCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctbcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctbcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,11 +133,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tbcon
 *
 *  =====================================================================
-      SUBROUTINE CTBCON( NORM, UPLO, DIAG, N, KD, AB, LDAB, RCOND, WORK,
+      SUBROUTINE CTBCON( NORM, UPLO, DIAG, N, KD, AB, LDAB, RCOND,
+     $                   WORK,
      $                   RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -251,13 +251,15 @@ SUBROUTINE CTBCON( NORM, UPLO, DIAG, N, KD, AB, LDAB, RCOND, WORK,
 *
 *              Multiply by inv(A).
 *
-               CALL CLATBS( UPLO, 'No transpose', DIAG, NORMIN, N, KD,
+               CALL CLATBS( UPLO, 'No transpose', DIAG, NORMIN, N,
+     $                      KD,
      $                      AB, LDAB, WORK, SCALE, RWORK, INFO )
             ELSE
 *
 *              Multiply by inv(A**H).
 *
-               CALL CLATBS( UPLO, 'Conjugate transpose', DIAG, NORMIN,
+               CALL CLATBS( UPLO, 'Conjugate transpose', DIAG,
+     $                      NORMIN,
      $                      N, KD, AB, LDAB, WORK, SCALE, RWORK, INFO )
             END IF
             NORMIN = 'Y'
diff --git a/SRC/ctbrfs.f b/SRC/ctbrfs.f
index cfa2107e97..6a7ed7d14f 100644
--- a/SRC/ctbrfs.f
+++ b/SRC/ctbrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTBRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctbrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctbrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -180,11 +178,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tbrfs
 *
 *  =====================================================================
       SUBROUTINE CTBRFS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
      $                   LDB, X, LDX, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -219,7 +218,8 @@ SUBROUTINE CTBRFS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CLACN2, CTBMV, CTBSV, XERBLA
+      EXTERNAL           CAXPY, CCOPY, CLACN2, CTBMV, CTBSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MAX, MIN, REAL
@@ -292,7 +292,7 @@ SUBROUTINE CTBRFS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
       NZ = KD + 2
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -443,10 +443,11 @@ SUBROUTINE CTBRFS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
 *
          DO 200 I = 1, N
             IF( RWORK( I ).GT.SAFE2 ) THEN
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I )
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I )
             ELSE
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I ) +
-     $                      SAFE1
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I ) + SAFE1
             END IF
   200    CONTINUE
 *
diff --git a/SRC/ctbtrs.f b/SRC/ctbtrs.f
index 1e0499765a..5c0f288eac 100644
--- a/SRC/ctbtrs.f
+++ b/SRC/ctbtrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTBTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctbtrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctbtrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -39,8 +37,14 @@
 *>
 *>    A * X = B,  A**T * X = B,  or  A**H * X = B,
 *>
-*> where A is a triangular band matrix of order N, and B is an
-*> N-by-NRHS matrix.  A check is made to verify that A is nonsingular.
+*> where A is a triangular band matrix of order N, and B is an N-by-NRHS matrix.
+*>
+*> This subroutine verifies that A is nonsingular, but callers should note that only exact
+*> singularity is detected. It is conceivable for one or more diagonal elements of A to be
+*> subnormally tiny numbers without this subroutine signalling an error.
+*>
+*> If a possible loss of numerical precision due to near-singular matrices is a concern, the
+*> caller should verify that A is nonsingular within some tolerance before calling this subroutine.
 *> \endverbatim
 *
 *  Arguments:
@@ -125,7 +129,7 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the i-th diagonal element of A is zero,
+*>          > 0:  if INFO = i, the i-th diagonal element of A is exactly zero,
 *>                indicating that the matrix is singular and the
 *>                solutions X have not been computed.
 *> \endverbatim
@@ -138,11 +142,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tbtrs
 *
 *  =====================================================================
       SUBROUTINE CTBTRS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
      $                   LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -186,7 +191,8 @@ SUBROUTINE CTBTRS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.
-     $         LSAME( TRANS, 'T' ) .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+     $         LSAME( TRANS, 'T' ) .AND.
+     $                .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -2
       ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
          INFO = -3
@@ -231,7 +237,8 @@ SUBROUTINE CTBTRS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
 *     Solve A * X = B,  A**T * X = B,  or  A**H * X = B.
 *
       DO 30 J = 1, NRHS
-         CALL CTBSV( UPLO, TRANS, DIAG, N, KD, AB, LDAB, B( 1, J ), 1 )
+         CALL CTBSV( UPLO, TRANS, DIAG, N, KD, AB, LDAB, B( 1, J ),
+     $               1 )
    30 CONTINUE
 *
       RETURN
diff --git a/SRC/ctfsm.f b/SRC/ctfsm.f
index 7ea2c1006d..0870d5b2b4 100644
--- a/SRC/ctfsm.f
+++ b/SRC/ctfsm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTFSM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctfsm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctfsm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -140,8 +138,9 @@
 *>
 *> \param[in] A
 *> \verbatim
-*>          A is COMPLEX array, dimension (N*(N+1)/2)
-*>           NT = N*(N+1)/2. On entry, the matrix A in RFP Format.
+*>          A is COMPLEX array, dimension (NT)
+*>           NT = N*(N+1)/2 if SIDE='R' and NT = M*(M+1)/2 otherwise.
+*>           On entry, the matrix A in RFP Format. 
 *>           RFP Format is described by TRANSR, UPLO and N as follows:
 *>           If TRANSR='N' then RFP A is (0:N,0:K-1) when N is even;
 *>           K=N/2. RFP A is (0:N-1,0:K) when N is odd; K=N/2. If
@@ -182,7 +181,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tfsm
 *
 *> \par Further Details:
 *  =====================
@@ -293,8 +292,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
+      SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA,
+     $                  A,
      $                  B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -348,7 +349,8 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
          INFO = -3
       ELSE IF( .NOT.NOTRANS .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -4
-      ELSE IF( .NOT.LSAME( DIAG, 'N' ) .AND. .NOT.LSAME( DIAG, 'U' ) )
+      ELSE IF( .NOT.LSAME( DIAG, 'N' ) .AND.
+     $         .NOT.LSAME( DIAG, 'U' ) )
      $         THEN
          INFO = -5
       ELSE IF( M.LT.0 ) THEN
@@ -419,12 +421,15 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    TRANS = 'N'
 *
                      IF( M.EQ.1 ) THEN
-                        CALL CTRSM( 'L', 'L', 'N', DIAG, M1, N, ALPHA,
+                        CALL CTRSM( 'L', 'L', 'N', DIAG, M1, N,
+     $                              ALPHA,
      $                              A, M, B, LDB )
                      ELSE
-                        CALL CTRSM( 'L', 'L', 'N', DIAG, M1, N, ALPHA,
+                        CALL CTRSM( 'L', 'L', 'N', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M, B, LDB )
-                        CALL CGEMM( 'N', 'N', M2, N, M1, -CONE, A( M1 ),
+                        CALL CGEMM( 'N', 'N', M2, N, M1, -CONE,
+     $                              A( M1 ),
      $                              M, B, LDB, ALPHA, B( M1, 0 ), LDB )
                         CALL CTRSM( 'L', 'U', 'C', DIAG, M2, N, CONE,
      $                              A( M ), M, B( M1, 0 ), LDB )
@@ -436,12 +441,15 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    TRANS = 'C'
 *
                      IF( M.EQ.1 ) THEN
-                        CALL CTRSM( 'L', 'L', 'C', DIAG, M1, N, ALPHA,
+                        CALL CTRSM( 'L', 'L', 'C', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M, B, LDB )
                      ELSE
-                        CALL CTRSM( 'L', 'U', 'N', DIAG, M2, N, ALPHA,
+                        CALL CTRSM( 'L', 'U', 'N', DIAG, M2, N,
+     $                              ALPHA,
      $                              A( M ), M, B( M1, 0 ), LDB )
-                        CALL CGEMM( 'C', 'N', M1, N, M2, -CONE, A( M1 ),
+                        CALL CGEMM( 'C', 'N', M1, N, M2, -CONE,
+     $                              A( M1 ),
      $                              M, B( M1, 0 ), LDB, ALPHA, B, LDB )
                         CALL CTRSM( 'L', 'L', 'C', DIAG, M1, N, CONE,
      $                              A( 0 ), M, B, LDB )
@@ -460,7 +468,8 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL CTRSM( 'L', 'L', 'N', DIAG, M1, N, ALPHA,
      $                           A( M2 ), M, B, LDB )
-                     CALL CGEMM( 'C', 'N', M2, N, M1, -CONE, A( 0 ), M,
+                     CALL CGEMM( 'C', 'N', M2, N, M1, -CONE, A( 0 ),
+     $                           M,
      $                           B, LDB, ALPHA, B( M1, 0 ), LDB )
                      CALL CTRSM( 'L', 'U', 'C', DIAG, M2, N, CONE,
      $                           A( M1 ), M, B( M1, 0 ), LDB )
@@ -472,7 +481,8 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL CTRSM( 'L', 'U', 'N', DIAG, M2, N, ALPHA,
      $                           A( M1 ), M, B( M1, 0 ), LDB )
-                     CALL CGEMM( 'N', 'N', M1, N, M2, -CONE, A( 0 ), M,
+                     CALL CGEMM( 'N', 'N', M1, N, M2, -CONE, A( 0 ),
+     $                           M,
      $                           B( M1, 0 ), LDB, ALPHA, B, LDB )
                      CALL CTRSM( 'L', 'L', 'C', DIAG, M1, N, CONE,
      $                           A( M2 ), M, B, LDB )
@@ -495,10 +505,12 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    TRANS = 'N'
 *
                      IF( M.EQ.1 ) THEN
-                        CALL CTRSM( 'L', 'U', 'C', DIAG, M1, N, ALPHA,
+                        CALL CTRSM( 'L', 'U', 'C', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M1, B, LDB )
                      ELSE
-                        CALL CTRSM( 'L', 'U', 'C', DIAG, M1, N, ALPHA,
+                        CALL CTRSM( 'L', 'U', 'C', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M1, B, LDB )
                         CALL CGEMM( 'C', 'N', M2, N, M1, -CONE,
      $                              A( M1*M1 ), M1, B, LDB, ALPHA,
@@ -513,10 +525,12 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    TRANS = 'C'
 *
                      IF( M.EQ.1 ) THEN
-                        CALL CTRSM( 'L', 'U', 'N', DIAG, M1, N, ALPHA,
+                        CALL CTRSM( 'L', 'U', 'N', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M1, B, LDB )
                      ELSE
-                        CALL CTRSM( 'L', 'L', 'C', DIAG, M2, N, ALPHA,
+                        CALL CTRSM( 'L', 'L', 'C', DIAG, M2, N,
+     $                              ALPHA,
      $                              A( 1 ), M1, B( M1, 0 ), LDB )
                         CALL CGEMM( 'N', 'N', M1, N, M2, -CONE,
      $                              A( M1*M1 ), M1, B( M1, 0 ), LDB,
@@ -538,7 +552,8 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL CTRSM( 'L', 'U', 'C', DIAG, M1, N, ALPHA,
      $                           A( M2*M2 ), M2, B, LDB )
-                     CALL CGEMM( 'N', 'N', M2, N, M1, -CONE, A( 0 ), M2,
+                     CALL CGEMM( 'N', 'N', M2, N, M1, -CONE, A( 0 ),
+     $                           M2,
      $                           B, LDB, ALPHA, B( M1, 0 ), LDB )
                      CALL CTRSM( 'L', 'L', 'N', DIAG, M2, N, CONE,
      $                           A( M1*M2 ), M2, B( M1, 0 ), LDB )
@@ -550,7 +565,8 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL CTRSM( 'L', 'L', 'C', DIAG, M2, N, ALPHA,
      $                           A( M1*M2 ), M2, B( M1, 0 ), LDB )
-                     CALL CGEMM( 'C', 'N', M1, N, M2, -CONE, A( 0 ), M2,
+                     CALL CGEMM( 'C', 'N', M1, N, M2, -CONE, A( 0 ),
+     $                           M2,
      $                           B( M1, 0 ), LDB, ALPHA, B, LDB )
                      CALL CTRSM( 'L', 'U', 'N', DIAG, M1, N, CONE,
      $                           A( M2*M2 ), M2, B, LDB )
@@ -610,7 +626,8 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL CTRSM( 'L', 'L', 'N', DIAG, K, N, ALPHA,
      $                           A( K+1 ), M+1, B, LDB )
-                     CALL CGEMM( 'C', 'N', K, N, K, -CONE, A( 0 ), M+1,
+                     CALL CGEMM( 'C', 'N', K, N, K, -CONE, A( 0 ),
+     $                           M+1,
      $                           B, LDB, ALPHA, B( K, 0 ), LDB )
                      CALL CTRSM( 'L', 'U', 'C', DIAG, K, N, CONE,
      $                           A( K ), M+1, B( K, 0 ), LDB )
@@ -621,7 +638,8 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    and TRANS = 'C'
                      CALL CTRSM( 'L', 'U', 'N', DIAG, K, N, ALPHA,
      $                           A( K ), M+1, B( K, 0 ), LDB )
-                     CALL CGEMM( 'N', 'N', K, N, K, -CONE, A( 0 ), M+1,
+                     CALL CGEMM( 'N', 'N', K, N, K, -CONE, A( 0 ),
+     $                           M+1,
      $                           B( K, 0 ), LDB, ALPHA, B, LDB )
                      CALL CTRSM( 'L', 'L', 'C', DIAG, K, N, CONE,
      $                           A( K+1 ), M+1, B, LDB )
@@ -677,7 +695,8 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL CTRSM( 'L', 'U', 'C', DIAG, K, N, ALPHA,
      $                           A( K*( K+1 ) ), K, B, LDB )
-                     CALL CGEMM( 'N', 'N', K, N, K, -CONE, A( 0 ), K, B,
+                     CALL CGEMM( 'N', 'N', K, N, K, -CONE, A( 0 ), K,
+     $                           B,
      $                           LDB, ALPHA, B( K, 0 ), LDB )
                      CALL CTRSM( 'L', 'L', 'N', DIAG, K, N, CONE,
      $                           A( K*K ), K, B( K, 0 ), LDB )
@@ -743,7 +762,8 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL CTRSM( 'R', 'U', 'C', DIAG, M, N2, ALPHA,
      $                           A( N ), N, B( 0, N1 ), LDB )
-                     CALL CGEMM( 'N', 'N', M, N1, N2, -CONE, B( 0, N1 ),
+                     CALL CGEMM( 'N', 'N', M, N1, N2, -CONE, B( 0,
+     $                           N1 ),
      $                           LDB, A( N1 ), N, ALPHA, B( 0, 0 ),
      $                           LDB )
                      CALL CTRSM( 'R', 'L', 'N', DIAG, M, N1, CONE,
@@ -756,7 +776,8 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL CTRSM( 'R', 'L', 'C', DIAG, M, N1, ALPHA,
      $                           A( 0 ), N, B( 0, 0 ), LDB )
-                     CALL CGEMM( 'N', 'C', M, N2, N1, -CONE, B( 0, 0 ),
+                     CALL CGEMM( 'N', 'C', M, N2, N1, -CONE, B( 0,
+     $                           0 ),
      $                           LDB, A( N1 ), N, ALPHA, B( 0, N1 ),
      $                           LDB )
                      CALL CTRSM( 'R', 'U', 'N', DIAG, M, N2, CONE,
@@ -775,7 +796,8 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL CTRSM( 'R', 'L', 'C', DIAG, M, N1, ALPHA,
      $                           A( N2 ), N, B( 0, 0 ), LDB )
-                     CALL CGEMM( 'N', 'N', M, N2, N1, -CONE, B( 0, 0 ),
+                     CALL CGEMM( 'N', 'N', M, N2, N1, -CONE, B( 0,
+     $                           0 ),
      $                           LDB, A( 0 ), N, ALPHA, B( 0, N1 ),
      $                           LDB )
                      CALL CTRSM( 'R', 'U', 'N', DIAG, M, N2, CONE,
@@ -788,7 +810,8 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL CTRSM( 'R', 'U', 'C', DIAG, M, N2, ALPHA,
      $                           A( N1 ), N, B( 0, N1 ), LDB )
-                     CALL CGEMM( 'N', 'C', M, N1, N2, -CONE, B( 0, N1 ),
+                     CALL CGEMM( 'N', 'C', M, N1, N2, -CONE, B( 0,
+     $                           N1 ),
      $                           LDB, A( 0 ), N, ALPHA, B( 0, 0 ), LDB )
                      CALL CTRSM( 'R', 'L', 'N', DIAG, M, N1, CONE,
      $                           A( N2 ), N, B( 0, 0 ), LDB )
@@ -812,7 +835,8 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL CTRSM( 'R', 'L', 'N', DIAG, M, N2, ALPHA,
      $                           A( 1 ), N1, B( 0, N1 ), LDB )
-                     CALL CGEMM( 'N', 'C', M, N1, N2, -CONE, B( 0, N1 ),
+                     CALL CGEMM( 'N', 'C', M, N1, N2, -CONE, B( 0,
+     $                           N1 ),
      $                           LDB, A( N1*N1 ), N1, ALPHA, B( 0, 0 ),
      $                           LDB )
                      CALL CTRSM( 'R', 'U', 'C', DIAG, M, N1, CONE,
@@ -825,7 +849,8 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL CTRSM( 'R', 'U', 'N', DIAG, M, N1, ALPHA,
      $                           A( 0 ), N1, B( 0, 0 ), LDB )
-                     CALL CGEMM( 'N', 'N', M, N2, N1, -CONE, B( 0, 0 ),
+                     CALL CGEMM( 'N', 'N', M, N2, N1, -CONE, B( 0,
+     $                           0 ),
      $                           LDB, A( N1*N1 ), N1, ALPHA, B( 0, N1 ),
      $                           LDB )
                      CALL CTRSM( 'R', 'L', 'C', DIAG, M, N2, CONE,
@@ -844,7 +869,8 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL CTRSM( 'R', 'U', 'N', DIAG, M, N1, ALPHA,
      $                           A( N2*N2 ), N2, B( 0, 0 ), LDB )
-                     CALL CGEMM( 'N', 'C', M, N2, N1, -CONE, B( 0, 0 ),
+                     CALL CGEMM( 'N', 'C', M, N2, N1, -CONE, B( 0,
+     $                           0 ),
      $                           LDB, A( 0 ), N2, ALPHA, B( 0, N1 ),
      $                           LDB )
                      CALL CTRSM( 'R', 'L', 'C', DIAG, M, N2, CONE,
@@ -857,7 +883,8 @@ SUBROUTINE CTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL CTRSM( 'R', 'L', 'N', DIAG, M, N2, ALPHA,
      $                           A( N1*N2 ), N2, B( 0, N1 ), LDB )
-                     CALL CGEMM( 'N', 'N', M, N1, N2, -CONE, B( 0, N1 ),
+                     CALL CGEMM( 'N', 'N', M, N1, N2, -CONE, B( 0,
+     $                           N1 ),
      $                           LDB, A( 0 ), N2, ALPHA, B( 0, 0 ),
      $                           LDB )
                      CALL CTRSM( 'R', 'U', 'C', DIAG, M, N1, CONE,
diff --git a/SRC/ctftri.f b/SRC/ctftri.f
index faf647b986..ccca315430 100644
--- a/SRC/ctftri.f
+++ b/SRC/ctftri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTFTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctftri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctftri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,7 +104,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tftri
 *
 *> \par Further Details:
 *  =====================
@@ -218,6 +216,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -262,7 +261,8 @@ SUBROUTINE CTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
          INFO = -1
       ELSE IF( .NOT.LOWER .AND. .NOT.LSAME( UPLO, 'U' ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.LSAME( DIAG, 'N' ) .AND. .NOT.LSAME( DIAG, 'U' ) )
+      ELSE IF( .NOT.LSAME( DIAG, 'N' ) .AND.
+     $         .NOT.LSAME( DIAG, 'U' ) )
      $         THEN
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
@@ -318,14 +318,16 @@ SUBROUTINE CTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
                CALL CTRTRI( 'L', DIAG, N1, A( 0 ), N, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL CTRMM( 'R', 'L', 'N', DIAG, N2, N1, -CONE, A( 0 ),
+               CALL CTRMM( 'R', 'L', 'N', DIAG, N2, N1, -CONE,
+     $                     A( 0 ),
      $                     N, A( N1 ), N )
                CALL CTRTRI( 'U', DIAG, N2, A( N ), N, INFO )
                IF( INFO.GT.0 )
      $            INFO = INFO + N1
                IF( INFO.GT.0 )
      $            RETURN
-               CALL CTRMM( 'L', 'U', 'C', DIAG, N2, N1, CONE, A( N ), N,
+               CALL CTRMM( 'L', 'U', 'C', DIAG, N2, N1, CONE, A( N ),
+     $                     N,
      $                     A( N1 ), N )
 *
             ELSE
@@ -337,14 +339,16 @@ SUBROUTINE CTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
                CALL CTRTRI( 'L', DIAG, N1, A( N2 ), N, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL CTRMM( 'L', 'L', 'C', DIAG, N1, N2, -CONE, A( N2 ),
+               CALL CTRMM( 'L', 'L', 'C', DIAG, N1, N2, -CONE,
+     $                     A( N2 ),
      $                     N, A( 0 ), N )
                CALL CTRTRI( 'U', DIAG, N2, A( N1 ), N, INFO )
                IF( INFO.GT.0 )
      $            INFO = INFO + N1
                IF( INFO.GT.0 )
      $            RETURN
-               CALL CTRMM( 'R', 'U', 'N', DIAG, N1, N2, CONE, A( N1 ),
+               CALL CTRMM( 'R', 'U', 'N', DIAG, N1, N2, CONE,
+     $                     A( N1 ),
      $                     N, A( 0 ), N )
 *
             END IF
@@ -361,7 +365,8 @@ SUBROUTINE CTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
                CALL CTRTRI( 'U', DIAG, N1, A( 0 ), N1, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL CTRMM( 'L', 'U', 'N', DIAG, N1, N2, -CONE, A( 0 ),
+               CALL CTRMM( 'L', 'U', 'N', DIAG, N1, N2, -CONE,
+     $                     A( 0 ),
      $                     N1, A( N1*N1 ), N1 )
                CALL CTRTRI( 'L', DIAG, N2, A( 1 ), N1, INFO )
                IF( INFO.GT.0 )
@@ -416,7 +421,8 @@ SUBROUTINE CTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
      $            INFO = INFO + K
                IF( INFO.GT.0 )
      $            RETURN
-               CALL CTRMM( 'L', 'U', 'C', DIAG, K, K, CONE, A( 0 ), N+1,
+               CALL CTRMM( 'L', 'U', 'C', DIAG, K, K, CONE, A( 0 ),
+     $                     N+1,
      $                     A( K+1 ), N+1 )
 *
             ELSE
@@ -428,14 +434,16 @@ SUBROUTINE CTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
                CALL CTRTRI( 'L', DIAG, K, A( K+1 ), N+1, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL CTRMM( 'L', 'L', 'C', DIAG, K, K, -CONE, A( K+1 ),
+               CALL CTRMM( 'L', 'L', 'C', DIAG, K, K, -CONE,
+     $                     A( K+1 ),
      $                     N+1, A( 0 ), N+1 )
                CALL CTRTRI( 'U', DIAG, K, A( K ), N+1, INFO )
                IF( INFO.GT.0 )
      $            INFO = INFO + K
                IF( INFO.GT.0 )
      $            RETURN
-               CALL CTRMM( 'R', 'U', 'N', DIAG, K, K, CONE, A( K ), N+1,
+               CALL CTRMM( 'R', 'U', 'N', DIAG, K, K, CONE, A( K ),
+     $                     N+1,
      $                     A( 0 ), N+1 )
             END IF
          ELSE
@@ -451,14 +459,16 @@ SUBROUTINE CTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
                CALL CTRTRI( 'U', DIAG, K, A( K ), K, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL CTRMM( 'L', 'U', 'N', DIAG, K, K, -CONE, A( K ), K,
+               CALL CTRMM( 'L', 'U', 'N', DIAG, K, K, -CONE, A( K ),
+     $                     K,
      $                     A( K*( K+1 ) ), K )
                CALL CTRTRI( 'L', DIAG, K, A( 0 ), K, INFO )
                IF( INFO.GT.0 )
      $            INFO = INFO + K
                IF( INFO.GT.0 )
      $            RETURN
-               CALL CTRMM( 'R', 'L', 'C', DIAG, K, K, CONE, A( 0 ), K,
+               CALL CTRMM( 'R', 'L', 'C', DIAG, K, K, CONE, A( 0 ),
+     $                     K,
      $                     A( K*( K+1 ) ), K )
             ELSE
 *
@@ -476,7 +486,8 @@ SUBROUTINE CTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
      $            INFO = INFO + K
                IF( INFO.GT.0 )
      $            RETURN
-               CALL CTRMM( 'L', 'L', 'N', DIAG, K, K, CONE, A( K*K ), K,
+               CALL CTRMM( 'L', 'L', 'N', DIAG, K, K, CONE, A( K*K ),
+     $                     K,
      $                     A( 0 ), K )
             END IF
          END IF
diff --git a/SRC/ctfttp.f b/SRC/ctfttp.f
index 4da1aa1842..aae1ad880f 100644
--- a/SRC/ctfttp.f
+++ b/SRC/ctfttp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTFTTP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctfttp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctfttp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -93,7 +91,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tfttp
 *
 *> \par Further Details:
 *  =====================
@@ -205,6 +203,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CTFTTP( TRANSR, UPLO, N, ARF, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ctfttr.f b/SRC/ctfttr.f
index 2b1ab39345..9d7e66c928 100644
--- a/SRC/ctfttr.f
+++ b/SRC/ctfttr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTFTTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctfttr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctfttr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,7 +99,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tfttr
 *
 *> \par Further Details:
 *  =====================
@@ -213,6 +211,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CTFTTR( TRANSR, UPLO, N, ARF, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ctgevc.f b/SRC/ctgevc.f
index 4e5289cb20..504d670d0e 100644
--- a/SRC/ctgevc.f
+++ b/SRC/ctgevc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTGEVC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctgevc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctgevc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -53,7 +51,7 @@
 *>
 *>    S*x = w*P*x,  (y**H)*S = w*(y**H)*P,
 *>
-*> where y**H denotes the conjugate tranpose of y.
+*> where y**H denotes the conjugate transpose of y.
 *> The eigenvalues are not input to this routine, but are computed
 *> directly from the diagonal elements of S and P.
 *>
@@ -154,7 +152,7 @@
 *> \verbatim
 *>          VR is COMPLEX array, dimension (LDVR,MM)
 *>          On entry, if SIDE = 'R' or 'B' and HOWMNY = 'B', VR must
-*>          contain an N-by-N matrix Q (usually the unitary matrix Z
+*>          contain an N-by-N matrix Z (usually the unitary matrix Z
 *>          of right Schur vectors returned by CHGEQZ).
 *>          On exit, if SIDE = 'R' or 'B', VR contains:
 *>          if HOWMNY = 'A', the matrix X of right eigenvectors of (S,P);
@@ -211,11 +209,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup tgevc
 *
 *  =====================================================================
       SUBROUTINE CTGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
      $                   LDVL, VR, LDVR, MM, M, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -259,7 +258,7 @@ SUBROUTINE CTGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
       EXTERNAL           LSAME, SLAMCH, CLADIV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMV, SLABAD, XERBLA
+      EXTERNAL           CGEMV, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, CMPLX, CONJG, MAX, MIN, REAL
@@ -367,11 +366,10 @@ SUBROUTINE CTGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
 *
       SAFMIN = SLAMCH( 'Safe minimum' )
       BIG = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, BIG )
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
-      SMALL = SAFMIN*N / ULP
+      SMALL = SAFMIN*REAL( N ) / ULP
       BIG = ONE / SMALL
-      BIGNUM = ONE / ( SAFMIN*N )
+      BIGNUM = ONE / ( SAFMIN*REAL( N ) )
 *
 *     Compute the 1-norm of each column of the strictly upper triangular
 *     part of A and B to check for possible overflow in the triangular
@@ -528,7 +526,8 @@ SUBROUTINE CTGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
 *              Back transform eigenvector if HOWMNY='B'.
 *
                IF( ILBACK ) THEN
-                  CALL CGEMV( 'N', N, N+1-JE, CONE, VL( 1, JE ), LDVL,
+                  CALL CGEMV( 'N', N, N+1-JE, CONE, VL( 1, JE ),
+     $                        LDVL,
      $                        WORK( JE ), 1, CZERO, WORK( N+1 ), 1 )
                   ISRC = 2
                   IBEG = 1
diff --git a/SRC/ctgex2.f b/SRC/ctgex2.f
index c519a597d3..99b18109b1 100644
--- a/SRC/ctgex2.f
+++ b/SRC/ctgex2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTGEX2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctgex2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctgex2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -153,7 +151,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEauxiliary
+*> \ingroup tgex2
 *
 *> \par Further Details:
 *  =====================
@@ -187,6 +185,7 @@
 *  =====================================================================
       SUBROUTINE CTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
      $                   LDZ, J1, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -338,10 +337,14 @@ SUBROUTINE CTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *     If the swap is accepted ("weakly" and "strongly"), apply the
 *     equivalence transformations to the original matrix pair (A,B)
 *
-      CALL CROT( J1+1, A( 1, J1 ), 1, A( 1, J1+1 ), 1, CZ, CONJG( SZ ) )
-      CALL CROT( J1+1, B( 1, J1 ), 1, B( 1, J1+1 ), 1, CZ, CONJG( SZ ) )
-      CALL CROT( N-J1+1, A( J1, J1 ), LDA, A( J1+1, J1 ), LDA, CQ, SQ )
-      CALL CROT( N-J1+1, B( J1, J1 ), LDB, B( J1+1, J1 ), LDB, CQ, SQ )
+      CALL CROT( J1+1, A( 1, J1 ), 1, A( 1, J1+1 ), 1, CZ,
+     $           CONJG( SZ ) )
+      CALL CROT( J1+1, B( 1, J1 ), 1, B( 1, J1+1 ), 1, CZ,
+     $           CONJG( SZ ) )
+      CALL CROT( N-J1+1, A( J1, J1 ), LDA, A( J1+1, J1 ), LDA, CQ,
+     $           SQ )
+      CALL CROT( N-J1+1, B( J1, J1 ), LDB, B( J1+1, J1 ), LDB, CQ,
+     $           SQ )
 *
 *     Set  N1 by N2 (2,1) blocks to 0
 *
@@ -351,9 +354,11 @@ SUBROUTINE CTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *     Accumulate transformations into Q and Z if requested.
 *
       IF( WANTZ )
-     $   CALL CROT( N, Z( 1, J1 ), 1, Z( 1, J1+1 ), 1, CZ, CONJG( SZ ) )
+     $   CALL CROT( N, Z( 1, J1 ), 1, Z( 1, J1+1 ), 1, CZ,
+     $              CONJG( SZ ) )
       IF( WANTQ )
-     $   CALL CROT( N, Q( 1, J1 ), 1, Q( 1, J1+1 ), 1, CQ, CONJG( SQ ) )
+     $   CALL CROT( N, Q( 1, J1 ), 1, Q( 1, J1+1 ), 1, CQ,
+     $              CONJG( SQ ) )
 *
 *     Exit with INFO = 0 if swap was successfully performed.
 *
diff --git a/SRC/ctgexc.f b/SRC/ctgexc.f
index f50f8be3f6..a6296ba25f 100644
--- a/SRC/ctgexc.f
+++ b/SRC/ctgexc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTGEXC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctgexc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctgexc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,7 +161,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGEcomputational
+*> \ingroup tgexc
 *
 *> \par Contributors:
 *  ==================
@@ -197,6 +195,7 @@
 *  =====================================================================
       SUBROUTINE CTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
      $                   LDZ, IFST, ILST, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -261,7 +260,8 @@ SUBROUTINE CTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
 *        Swap with next one below
 *
-         CALL CTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z, LDZ,
+         CALL CTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
+     $                LDZ,
      $                HERE, INFO )
          IF( INFO.NE.0 ) THEN
             ILST = HERE
@@ -278,7 +278,8 @@ SUBROUTINE CTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
 *        Swap with next one above
 *
-         CALL CTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z, LDZ,
+         CALL CTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
+     $                LDZ,
      $                HERE, INFO )
          IF( INFO.NE.0 ) THEN
             ILST = HERE
diff --git a/SRC/ctgsen.f b/SRC/ctgsen.f
index f9b6cd10c8..006b035afe 100644
--- a/SRC/ctgsen.f
+++ b/SRC/ctgsen.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTGSEN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctgsen.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctgsen.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -290,7 +288,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tgsen
 *
 *> \par Further Details:
 *  =====================
@@ -339,7 +337,7 @@
 *>            [ kron(In2, B11)  -kron(B22**H, In1) ].
 *>
 *>  Here, Inx is the identity matrix of size nx and A22**H is the
-*>  conjuguate transpose of A22. kron(X, Y) is the Kronecker product between
+*>  conjugate transpose of A22. kron(X, Y) is the Kronecker product between
 *>  the matrices X and Y.
 *>
 *>  When DIF(2) is small, small changes in (A, B) can cause large changes
@@ -427,9 +425,11 @@
 *>      1996.
 *>
 *  =====================================================================
-      SUBROUTINE CTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
+      SUBROUTINE CTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B,
+     $                   LDB,
      $                   ALPHA, BETA, Q, LDQ, Z, LDZ, M, PL, PR, DIF,
      $                   WORK, LWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -467,9 +467,14 @@ SUBROUTINE CTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *     .. Local Arrays ..
       INTEGER            ISAVE( 3 )
 *     ..
+*     .. External Functions ..
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
+*     ..
 *     .. External Subroutines ..
       REAL               SLAMCH
-      EXTERNAL           CLACN2, CLACPY, CLASSQ, CSCAL, CTGEXC, CTGSYL,
+      EXTERNAL           CLACN2, CLACPY, CLASSQ, CSCAL, CTGEXC,
+     $                   CTGSYL,
      $                   SLAMCH, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -537,7 +542,7 @@ SUBROUTINE CTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
          LIWMIN = 1
       END IF
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) =  SROUNDUP_LWORK(LWMIN)
       IWORK( 1 ) = LIWMIN
 *
       IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -589,7 +594,8 @@ SUBROUTINE CTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *           and Z that will swap adjacent diagonal blocks in (A, B).
 *
             IF( K.NE.KS )
-     $         CALL CTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
+     $         CALL CTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+     $                      Z,
      $                      LDZ, K, KS, IERR )
 *
             IF( IERR.GT.0 ) THEN
@@ -619,7 +625,8 @@ SUBROUTINE CTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
          N2 = N - M
          I = N1 + 1
          CALL CLACPY( 'Full', N1, N2, A( 1, I ), LDA, WORK, N1 )
-         CALL CLACPY( 'Full', N1, N2, B( 1, I ), LDB, WORK( N1*N2+1 ),
+         CALL CLACPY( 'Full', N1, N2, B( 1, I ), LDB,
+     $                WORK( N1*N2+1 ),
      $                N1 )
          IJB = 0
          CALL CTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA, WORK,
@@ -661,14 +668,16 @@ SUBROUTINE CTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *           Frobenius norm-based Difu estimate.
 *
-            CALL CTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA, WORK,
+            CALL CTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA,
+     $                   WORK,
      $                   N1, B, LDB, B( I, I ), LDB, WORK( N1*N2+1 ),
      $                   N1, DSCALE, DIF( 1 ), WORK( N1*N2*2+1 ),
      $                   LWORK-2*N1*N2, IWORK, IERR )
 *
 *           Frobenius norm-based Difl estimate.
 *
-            CALL CTGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A, LDA, WORK,
+            CALL CTGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A, LDA,
+     $                   WORK,
      $                   N2, B( I, I ), LDB, B, LDB, WORK( N1*N2+1 ),
      $                   N2, DSCALE, DIF( 2 ), WORK( N1*N2*2+1 ),
      $                   LWORK-2*N1*N2, IWORK, IERR )
@@ -696,7 +705,8 @@ SUBROUTINE CTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *                 Solve generalized Sylvester equation
 *
-                  CALL CTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA,
+                  CALL CTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ),
+     $                         LDA,
      $                         WORK, N1, B, LDB, B( I, I ), LDB,
      $                         WORK( N1*N2+1 ), N1, DSCALE, DIF( 1 ),
      $                         WORK( N1*N2*2+1 ), LWORK-2*N1*N2, IWORK,
@@ -705,7 +715,8 @@ SUBROUTINE CTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *                 Solve the transposed variant.
 *
-                  CALL CTGSYL( 'C', IJB, N1, N2, A, LDA, A( I, I ), LDA,
+                  CALL CTGSYL( 'C', IJB, N1, N2, A, LDA, A( I, I ),
+     $                         LDA,
      $                         WORK, N1, B, LDB, B( I, I ), LDB,
      $                         WORK( N1*N2+1 ), N1, DSCALE, DIF( 1 ),
      $                         WORK( N1*N2*2+1 ), LWORK-2*N1*N2, IWORK,
@@ -725,7 +736,8 @@ SUBROUTINE CTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *                 Solve generalized Sylvester equation
 *
-                  CALL CTGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A, LDA,
+                  CALL CTGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A,
+     $                         LDA,
      $                         WORK, N2, B( I, I ), LDB, B, LDB,
      $                         WORK( N1*N2+1 ), N2, DSCALE, DIF( 2 ),
      $                         WORK( N1*N2*2+1 ), LWORK-2*N1*N2, IWORK,
@@ -734,7 +746,8 @@ SUBROUTINE CTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *                 Solve the transposed variant.
 *
-                  CALL CTGSYL( 'C', IJB, N2, N1, A( I, I ), LDA, A, LDA,
+                  CALL CTGSYL( 'C', IJB, N2, N1, A( I, I ), LDA, A,
+     $                         LDA,
      $                         WORK, N2, B, LDB, B( I, I ), LDB,
      $                         WORK( N1*N2+1 ), N2, DSCALE, DIF( 2 ),
      $                         WORK( N1*N2*2+1 ), LWORK-2*N1*N2, IWORK,
@@ -771,7 +784,7 @@ SUBROUTINE CTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
    70 CONTINUE
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) =  SROUNDUP_LWORK(LWMIN)
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/ctgsja.f b/SRC/ctgsja.f
index 22725e86ce..6b49f64aea 100644
--- a/SRC/ctgsja.f
+++ b/SRC/ctgsja.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTGSJA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctgsja.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctgsja.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -351,7 +349,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tgsja
 *
 *> \par Further Details:
 *  =====================
@@ -376,6 +374,7 @@
       SUBROUTINE CTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
      $                   LDB, TOLA, TOLB, ALPHA, BETA, U, LDU, V, LDV,
      $                   Q, LDQ, WORK, NCYCLE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -417,7 +416,8 @@ SUBROUTINE CTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CLAGS2, CLAPLL, CLASET, CROT, CSSCAL,
+      EXTERNAL           CCOPY, CLAGS2, CLAPLL, CLASET, CROT,
+     $                   CSSCAL,
      $                   SLARTG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -440,9 +440,13 @@ SUBROUTINE CTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
       INFO = 0
       IF( .NOT.( INITU .OR. WANTU .OR. LSAME( JOBU, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.( INITV .OR. WANTV .OR. LSAME( JOBV, 'N' ) ) ) THEN
+      ELSE IF( .NOT.( INITV .OR.
+     $         WANTV .OR.
+     $         LSAME( JOBV, 'N' ) ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.( INITQ .OR. WANTQ .OR. LSAME( JOBQ, 'N' ) ) ) THEN
+      ELSE IF( .NOT.( INITQ .OR.
+     $         WANTQ .OR.
+     $         LSAME( JOBQ, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( M.LT.0 ) THEN
          INFO = -4
@@ -512,7 +516,8 @@ SUBROUTINE CTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
 *              Update (K+I)-th and (K+J)-th rows of matrix A: U**H *A
 *
                IF( K+J.LE.M )
-     $            CALL CROT( L, A( K+J, N-L+1 ), LDA, A( K+I, N-L+1 ),
+     $            CALL CROT( L, A( K+J, N-L+1 ), LDA, A( K+I,
+     $                       N-L+1 ),
      $                       LDA, CSU, CONJG( SNU ) )
 *
 *              Update I-th and J-th rows of matrix B: V**H *B
@@ -555,10 +560,12 @@ SUBROUTINE CTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
      $                       SNU )
 *
                IF( WANTV )
-     $            CALL CROT( P, V( 1, J ), 1, V( 1, I ), 1, CSV, SNV )
+     $            CALL CROT( P, V( 1, J ), 1, V( 1, I ), 1, CSV,
+     $                       SNV )
 *
                IF( WANTQ )
-     $            CALL CROT( N, Q( 1, N-L+J ), 1, Q( 1, N-L+I ), 1, CSQ,
+     $            CALL CROT( N, Q( 1, N-L+J ), 1, Q( 1, N-L+I ), 1,
+     $                       CSQ,
      $                       SNQ )
 *
    10       CONTINUE
@@ -575,7 +582,8 @@ SUBROUTINE CTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
             ERROR = ZERO
             DO 30 I = 1, MIN( L, M-K )
                CALL CCOPY( L-I+1, A( K+I, N-L+I ), LDA, WORK, 1 )
-               CALL CCOPY( L-I+1, B( I, N-L+I ), LDB, WORK( L+1 ), 1 )
+               CALL CCOPY( L-I+1, B( I, N-L+I ), LDB, WORK( L+1 ),
+     $                     1 )
                CALL CLAPLL( L-I+1, WORK, 1, WORK( L+1 ), 1, SSMIN )
                ERROR = MAX( ERROR, SSMIN )
    30       CONTINUE
@@ -618,16 +626,19 @@ SUBROUTINE CTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
      $            CALL CSSCAL( P, -ONE, V( 1, I ), 1 )
             END IF
 *
-            CALL SLARTG( ABS( GAMMA ), ONE, BETA( K+I ), ALPHA( K+I ),
+            CALL SLARTG( ABS( GAMMA ), ONE, BETA( K+I ),
+     $                   ALPHA( K+I ),
      $                   RWK )
 *
             IF( ALPHA( K+I ).GE.BETA( K+I ) ) THEN
-               CALL CSSCAL( L-I+1, ONE / ALPHA( K+I ), A( K+I, N-L+I ),
+               CALL CSSCAL( L-I+1, ONE / ALPHA( K+I ), A( K+I,
+     $                      N-L+I ),
      $                      LDA )
             ELSE
                CALL CSSCAL( L-I+1, ONE / BETA( K+I ), B( I, N-L+I ),
      $                      LDB )
-               CALL CCOPY( L-I+1, B( I, N-L+I ), LDB, A( K+I, N-L+I ),
+               CALL CCOPY( L-I+1, B( I, N-L+I ), LDB, A( K+I,
+     $                     N-L+I ),
      $                     LDA )
             END IF
 *
diff --git a/SRC/ctgsna.f b/SRC/ctgsna.f
index 2295dc5ccc..13c0e17ad0 100644
--- a/SRC/ctgsna.f
+++ b/SRC/ctgsna.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTGSNA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctgsna.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctgsna.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -213,7 +211,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tgsna
 *
 *> \par Further Details:
 *  =====================
@@ -308,6 +306,7 @@
       SUBROUTINE CTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
      $                   LDVL, VR, LDVR, S, DIF, MM, M, WORK, LWORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -343,12 +342,16 @@ SUBROUTINE CTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               SCNRM2, SLAMCH, SLAPY2
+      REAL               SCNRM2, SLAMCH, SLAPY2,
+     $                   SROUNDUP_LWORK
       COMPLEX            CDOTC
-      EXTERNAL           LSAME, SCNRM2, SLAMCH, SLAPY2, CDOTC
+      EXTERNAL           LSAME, SCNRM2, SLAMCH,
+     $                   SLAPY2, SROUNDUP_LWORK,
+     $                   CDOTC
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMV, CLACPY, CTGEXC, CTGSYL, SLABAD, XERBLA
+      EXTERNAL           CGEMV, CLACPY, CTGEXC, CTGSYL,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, CMPLX, MAX
@@ -402,7 +405,7 @@ SUBROUTINE CTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
          ELSE
             LWMIN = N
          END IF
-         WORK( 1 ) = LWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
 *
          IF( MM.LT.M ) THEN
             INFO = -15
@@ -428,7 +431,6 @@ SUBROUTINE CTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       KS = 0
       DO 20 K = 1, N
 *
@@ -465,7 +467,8 @@ SUBROUTINE CTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
 *
          IF( WANTDF ) THEN
             IF( N.EQ.1 ) THEN
-               DIF( KS ) = SLAPY2( ABS( A( 1, 1 ) ), ABS( B( 1, 1 ) ) )
+               DIF( KS ) = SLAPY2( ABS( A( 1, 1 ) ), ABS( B( 1,
+     $              1 ) ) )
             ELSE
 *
 *              Estimate the reciprocal condition number of the k-th
@@ -479,7 +482,8 @@ SUBROUTINE CTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
                IFST = K
                ILST = 1
 *
-               CALL CTGEXC( .FALSE., .FALSE., N, WORK, N, WORK( N*N+1 ),
+               CALL CTGEXC( .FALSE., .FALSE., N, WORK, N,
+     $                      WORK( N*N+1 ),
      $                      N, DUMMY, 1, DUMMY1, 1, IFST, ILST, IERR )
 *
                IF( IERR.GT.0 ) THEN
@@ -498,7 +502,8 @@ SUBROUTINE CTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
                   N1 = 1
                   N2 = N - N1
                   I = N*N + 1
-                  CALL CTGSYL( 'N', IDIFJB, N2, N1, WORK( N*N1+N1+1 ),
+                  CALL CTGSYL( 'N', IDIFJB, N2, N1,
+     $                         WORK( N*N1+N1+1 ),
      $                         N, WORK, N, WORK( N1+1 ), N,
      $                         WORK( N*N1+N1+I ), N, WORK( I ), N,
      $                         WORK( N1+I ), N, SCALE, DIF( KS ), DUMMY,
@@ -508,7 +513,7 @@ SUBROUTINE CTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
          END IF
 *
    20 CONTINUE
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       RETURN
 *
 *     End of CTGSNA
diff --git a/SRC/ctgsy2.f b/SRC/ctgsy2.f
index 2840af74cb..cd9121def2 100644
--- a/SRC/ctgsy2.f
+++ b/SRC/ctgsy2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTGSY2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctgsy2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctgsy2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -244,7 +242,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYauxiliary
+*> \ingroup tgsy2
 *
 *> \par Contributors:
 *  ==================
@@ -253,9 +251,11 @@
 *>     Umea University, S-901 87 Umea, Sweden.
 *
 *  =====================================================================
-      SUBROUTINE CTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
+      SUBROUTINE CTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC,
+     $                   D,
      $                   LDD, E, LDE, F, LDF, SCALE, RDSUM, RDSCAL,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -293,7 +293,8 @@ SUBROUTINE CTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CGESC2, CGETC2, CSCAL, CLATDF, XERBLA
+      EXTERNAL           CAXPY, CGESC2, CGETC2, CSCAL, CLATDF,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CMPLX, CONJG, MAX
@@ -369,9 +370,11 @@ SUBROUTINE CTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   CALL CGESC2( LDZ, Z, LDZ, RHS, IPIV, JPIV, SCALOC )
                   IF( SCALOC.NE.ONE ) THEN
                      DO 10 K = 1, N
-                        CALL CSCAL( M, CMPLX( SCALOC, ZERO ), C( 1, K ),
+                        CALL CSCAL( M, CMPLX( SCALOC, ZERO ), C( 1,
+     $                              K ),
      $                              1 )
-                        CALL CSCAL( M, CMPLX( SCALOC, ZERO ), F( 1, K ),
+                        CALL CSCAL( M, CMPLX( SCALOC, ZERO ), F( 1,
+     $                              K ),
      $                              1 )
    10                CONTINUE
                      SCALE = SCALE*SCALOC
@@ -390,8 +393,10 @@ SUBROUTINE CTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
 *
                IF( I.GT.1 ) THEN
                   ALPHA = -RHS( 1 )
-                  CALL CAXPY( I-1, ALPHA, A( 1, I ), 1, C( 1, J ), 1 )
-                  CALL CAXPY( I-1, ALPHA, D( 1, I ), 1, F( 1, J ), 1 )
+                  CALL CAXPY( I-1, ALPHA, A( 1, I ), 1, C( 1, J ),
+     $                        1 )
+                  CALL CAXPY( I-1, ALPHA, D( 1, I ), 1, F( 1, J ),
+     $                        1 )
                END IF
                IF( J.LT.N ) THEN
                   CALL CAXPY( N-J, RHS( 2 ), B( J, J+1 ), LDB,
diff --git a/SRC/ctgsyl.f b/SRC/ctgsyl.f
index ae14371254..6cf019d0c9 100644
--- a/SRC/ctgsyl.f
+++ b/SRC/ctgsyl.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTGSYL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctgsyl.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctgsyl.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -260,7 +258,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup tgsyl
 *
 *> \par Contributors:
 *  ==================
@@ -289,9 +287,11 @@
 *>      July 1989, pp 745-751.
 *>
 *  =====================================================================
-      SUBROUTINE CTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
+      SUBROUTINE CTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC,
+     $                   D,
      $                   LDD, E, LDE, F, LDF, SCALE, DIF, WORK, LWORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -329,10 +329,12 @@ SUBROUTINE CTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMM, CLACPY, CLASET, CSCAL, CTGSY2, XERBLA
+      EXTERNAL           CGEMM, CLACPY, CLASET, CSCAL, CTGSY2,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CMPLX, MAX, REAL, SQRT
@@ -382,7 +384,7 @@ SUBROUTINE CTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
          ELSE
             LWMIN = 1
          END IF
-         WORK( 1 ) = LWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
             INFO = -20
@@ -436,7 +438,8 @@ SUBROUTINE CTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
             DSCALE = ZERO
             DSUM = ONE
             PQ = M*N
-            CALL CTGSY2( TRANS, IFUNC, M, N, A, LDA, B, LDB, C, LDC, D,
+            CALL CTGSY2( TRANS, IFUNC, M, N, A, LDA, B, LDB, C, LDC,
+     $                   D,
      $                   LDD, E, LDE, F, LDF, SCALE, DSUM, DSCALE,
      $                   INFO )
             IF( DSCALE.NE.ZERO ) THEN
@@ -524,7 +527,8 @@ SUBROUTINE CTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   IS = IWORK( I )
                   IE = IWORK( I+1 ) - 1
                   MB = IE - IS + 1
-                  CALL CTGSY2( TRANS, IFUNC, MB, NB, A( IS, IS ), LDA,
+                  CALL CTGSY2( TRANS, IFUNC, MB, NB, A( IS, IS ),
+     $                         LDA,
      $                         B( JS, JS ), LDB, C( IS, JS ), LDC,
      $                         D( IS, IS ), LDD, E( JS, JS ), LDE,
      $                         F( IS, JS ), LDF, SCALOC, DSUM, DSCALE,
@@ -534,9 +538,11 @@ SUBROUTINE CTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   PQ = PQ + MB*NB
                   IF( SCALOC.NE.ONE ) THEN
                      DO 80 K = 1, JS - 1
-                        CALL CSCAL( M, CMPLX( SCALOC, ZERO ), C( 1, K ),
+                        CALL CSCAL( M, CMPLX( SCALOC, ZERO ), C( 1,
+     $                              K ),
      $                              1 )
-                        CALL CSCAL( M, CMPLX( SCALOC, ZERO ), F( 1, K ),
+                        CALL CSCAL( M, CMPLX( SCALOC, ZERO ), F( 1,
+     $                              K ),
      $                              1 )
    80                CONTINUE
                      DO 90 K = JS, JE
@@ -552,9 +558,11 @@ SUBROUTINE CTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
      $                              F( IE+1, K ), 1 )
   100                CONTINUE
                      DO 110 K = JE + 1, N
-                        CALL CSCAL( M, CMPLX( SCALOC, ZERO ), C( 1, K ),
+                        CALL CSCAL( M, CMPLX( SCALOC, ZERO ), C( 1,
+     $                              K ),
      $                              1 )
-                        CALL CSCAL( M, CMPLX( SCALOC, ZERO ), F( 1, K ),
+                        CALL CSCAL( M, CMPLX( SCALOC, ZERO ), F( 1,
+     $                              K ),
      $                              1 )
   110                CONTINUE
                      SCALE = SCALE*SCALOC
@@ -637,9 +645,11 @@ SUBROUTINE CTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
      $                           1 )
   160             CONTINUE
                   DO 170 K = JS, JE
-                     CALL CSCAL( IS-1, CMPLX( SCALOC, ZERO ), C( 1, K ),
+                     CALL CSCAL( IS-1, CMPLX( SCALOC, ZERO ), C( 1,
+     $                           K ),
      $                           1 )
-                     CALL CSCAL( IS-1, CMPLX( SCALOC, ZERO ), F( 1, K ),
+                     CALL CSCAL( IS-1, CMPLX( SCALOC, ZERO ), F( 1,
+     $                           K ),
      $                           1 )
   170             CONTINUE
                   DO 180 K = JS, JE
@@ -683,7 +693,7 @@ SUBROUTINE CTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
   210    CONTINUE
       END IF
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
 *
       RETURN
 *
diff --git a/SRC/ctpcon.f b/SRC/ctpcon.f
index 44ae10d7e9..46270d9194 100644
--- a/SRC/ctpcon.f
+++ b/SRC/ctpcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTPCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctpcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctpcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,11 +120,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tpcon
 *
 *  =====================================================================
       SUBROUTINE CTPCON( NORM, UPLO, DIAG, N, AP, RCOND, WORK, RWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -234,13 +233,15 @@ SUBROUTINE CTPCON( NORM, UPLO, DIAG, N, AP, RCOND, WORK, RWORK,
 *
 *              Multiply by inv(A).
 *
-               CALL CLATPS( UPLO, 'No transpose', DIAG, NORMIN, N, AP,
+               CALL CLATPS( UPLO, 'No transpose', DIAG, NORMIN, N,
+     $                      AP,
      $                      WORK, SCALE, RWORK, INFO )
             ELSE
 *
 *              Multiply by inv(A**H).
 *
-               CALL CLATPS( UPLO, 'Conjugate transpose', DIAG, NORMIN,
+               CALL CLATPS( UPLO, 'Conjugate transpose', DIAG,
+     $                      NORMIN,
      $                      N, AP, WORK, SCALE, RWORK, INFO )
             END IF
             NORMIN = 'Y'
diff --git a/SRC/ctplqt.f b/SRC/ctplqt.f
index 01263a4e1b..204b7b93af 100644
--- a/SRC/ctplqt.f
+++ b/SRC/ctplqt.f
@@ -117,7 +117,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tplqt
 *
 *> \par Further Details:
 *  =====================
@@ -171,6 +171,7 @@
 *  =====================================================================
       SUBROUTINE CTPLQT( M, N, L, MB, A, LDA, B, LDB, T, LDT, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ctplqt2.f b/SRC/ctplqt2.f
index bb455fefeb..57afa46d90 100644
--- a/SRC/ctplqt2.f
+++ b/SRC/ctplqt2.f
@@ -104,7 +104,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tplqt2
 *
 *> \par Further Details:
 *  =====================
@@ -159,6 +159,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CTPLQT2( M, N, L, A, LDA, B, LDB, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ctpmlqt.f b/SRC/ctpmlqt.f
index 76b4890f6e..155719f5c7 100644
--- a/SRC/ctpmlqt.f
+++ b/SRC/ctpmlqt.f
@@ -21,7 +21,7 @@
 *>
 *> \verbatim
 *>
-*> CTPMLQT applies a complex orthogonal matrix Q obtained from a
+*> CTPMLQT applies a complex unitary matrix Q obtained from a
 *> "triangular-pentagonal" complex block reflector H to a general
 *> complex matrix C, which consists of two blocks A and B.
 *> \endverbatim
@@ -88,9 +88,7 @@
 *> \param[in] LDV
 *> \verbatim
 *>          LDV is INTEGER
-*>          The leading dimension of the array V.
-*>          If SIDE = 'L', LDV >= max(1,M);
-*>          if SIDE = 'R', LDV >= max(1,N).
+*>          The leading dimension of the array V. LDV >= K.
 *> \endverbatim
 *>
 *> \param[in] T
@@ -120,8 +118,8 @@
 *> \verbatim
 *>          LDA is INTEGER
 *>          The leading dimension of the array A.
-*>          If SIDE = 'L', LDC >= max(1,K);
-*>          If SIDE = 'R', LDC >= max(1,M).
+*>          If SIDE = 'L', LDA >= max(1,K);
+*>          If SIDE = 'R', LDA >= max(1,M).
 *> \endverbatim
 *>
 *> \param[in,out] B
@@ -160,7 +158,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tpmlqt
 *
 *> \par Further Details:
 *  =====================
@@ -184,7 +182,7 @@
 *>
 *>  If SIDE = 'R':  C = [A B]  where A is M-by-K, B is M-by-N and V is K-by-N.
 *>
-*>  The real orthogonal matrix Q is formed from V and T.
+*>  The complex unitary matrix Q is formed from V and T.
 *>
 *>  If TRANS='N' and SIDE='L', C is on exit replaced with Q * C.
 *>
@@ -196,8 +194,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CTPMLQT( SIDE, TRANS, M, N, K, L, MB, V, LDV, T, LDT,
+      SUBROUTINE CTPMLQT( SIDE, TRANS, M, N, K, L, MB, V, LDV, T,
+     $                    LDT,
      $                    A, LDA, B, LDB, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ctpmqrt.f b/SRC/ctpmqrt.f
index 75ee6c0ae5..52812d0738 100644
--- a/SRC/ctpmqrt.f
+++ b/SRC/ctpmqrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTPMQRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctpmqrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctpmqrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -175,7 +173,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tpmqrt
 *
 *> \par Further Details:
 *  =====================
@@ -211,8 +209,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CTPMQRT( SIDE, TRANS, M, N, K, L, NB, V, LDV, T, LDT,
+      SUBROUTINE CTPMQRT( SIDE, TRANS, M, N, K, L, NB, V, LDV, T,
+     $                    LDT,
      $                    A, LDA, B, LDB, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ctpqrt.f b/SRC/ctpqrt.f
index 9abd06e8bf..3c2dea3744 100644
--- a/SRC/ctpqrt.f
+++ b/SRC/ctpqrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTPQRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctpqrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctpqrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tpqrt
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +184,7 @@
 *  =====================================================================
       SUBROUTINE CTPQRT( M, N, L, NB, A, LDA, B, LDB, T, LDT, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ctpqrt2.f b/SRC/ctpqrt2.f
index 3cd75da356..11a06b6150 100644
--- a/SRC/ctpqrt2.f
+++ b/SRC/ctpqrt2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTPQRT2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctpqrt2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctpqrt2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,7 +117,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tpqrt2
 *
 *> \par Further Details:
 *  =====================
@@ -170,6 +168,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CTPQRT2( M, N, L, A, LDA, B, LDB, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ctprfb.f b/SRC/ctprfb.f
index 11496180fc..09a31a8033 100644
--- a/SRC/ctprfb.f
+++ b/SRC/ctprfb.f
@@ -1,11 +1,10 @@
-*> \brief \b CTPRFB applies a real or complex "triangular-pentagonal" blocked reflector to a real or complex matrix, which is composed of two blocks.
+*> \brief \b CTPRFB applies a complex "triangular-pentagonal" block reflector to a complex matrix, which is composed of two blocks.
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTPRFB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctprfb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctprfb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -194,7 +192,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup tprfb
 *
 *> \par Further Details:
 *  =====================
@@ -248,6 +246,7 @@
 *  =====================================================================
       SUBROUTINE CTPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
      $                   V, LDV, T, LDT, A, LDA, B, LDB, WORK, LDWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -432,7 +431,8 @@ SUBROUTINE CTPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
 *
          CALL CGEMM( 'N', 'C', M, N-L, K, -ONE, WORK, LDWORK,
      $               V, LDV, ONE, B, LDB )
-         CALL CGEMM( 'N', 'C', M, L, K-L, -ONE, WORK( 1, KP ), LDWORK,
+         CALL CGEMM( 'N', 'C', M, L, K-L, -ONE, WORK( 1, KP ),
+     $               LDWORK,
      $               V( NP, KP ), LDV, ONE, B( 1, NP ), LDB )
          CALL CTRMM( 'R', 'U', 'C', 'N', M, L, ONE, V( NP, 1 ), LDV,
      $               WORK, LDWORK )
@@ -673,7 +673,8 @@ SUBROUTINE CTPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
 *
          CALL CGEMM( 'N', 'N', M, N-L, K, -ONE, WORK, LDWORK,
      $               V, LDV, ONE, B, LDB )
-         CALL CGEMM( 'N', 'N', M, L, K-L, -ONE, WORK( 1, KP ), LDWORK,
+         CALL CGEMM( 'N', 'N', M, L, K-L, -ONE, WORK( 1, KP ),
+     $               LDWORK,
      $               V( KP, NP ), LDV, ONE, B( 1, NP ), LDB )
          CALL CTRMM( 'R', 'L', 'N', 'N', M, L, ONE, V( 1, NP ), LDV,
      $               WORK, LDWORK )
diff --git a/SRC/ctprfs.f b/SRC/ctprfs.f
index 97fabc66ac..1d6efe6a1b 100644
--- a/SRC/ctprfs.f
+++ b/SRC/ctprfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTPRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctprfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctprfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -166,11 +164,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tprfs
 *
 *  =====================================================================
-      SUBROUTINE CTPRFS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X, LDX,
+      SUBROUTINE CTPRFS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X,
+     $                   LDX,
      $                   FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -204,7 +204,8 @@ SUBROUTINE CTPRFS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X, LDX,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CLACN2, CTPMV, CTPSV, XERBLA
+      EXTERNAL           CAXPY, CCOPY, CLACN2, CTPMV, CTPSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MAX, REAL
@@ -273,7 +274,7 @@ SUBROUTINE CTPRFS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X, LDX,
       NZ = N + 1
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -432,10 +433,11 @@ SUBROUTINE CTPRFS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X, LDX,
 *
          DO 200 I = 1, N
             IF( RWORK( I ).GT.SAFE2 ) THEN
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I )
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I )
             ELSE
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I ) +
-     $                      SAFE1
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I ) + SAFE1
             END IF
   200    CONTINUE
 *
diff --git a/SRC/ctptri.f b/SRC/ctptri.f
index e3f0d7d1b0..1b95847bc2 100644
--- a/SRC/ctptri.f
+++ b/SRC/ctptri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTPTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctptri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctptri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -91,7 +89,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tptri
 *
 *> \par Further Details:
 *  =====================
@@ -114,6 +112,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CTPTRI( UPLO, DIAG, N, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ctptrs.f b/SRC/ctptrs.f
index a3f7687bd2..8e8c80e07c 100644
--- a/SRC/ctptrs.f
+++ b/SRC/ctptrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTPTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctptrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctptrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -38,9 +36,14 @@
 *>
 *>    A * X = B,  A**T * X = B,  or  A**H * X = B,
 *>
-*> where A is a triangular matrix of order N stored in packed format,
-*> and B is an N-by-NRHS matrix.  A check is made to verify that A is
-*> nonsingular.
+*> where A is a triangular matrix of order N stored in packed format, and B is an N-by-NRHS matrix.
+*>
+*> This subroutine verifies that A is nonsingular, but callers should note that only exact
+*> singularity is detected. It is conceivable for one or more diagonal elements of A to be
+*> subnormally tiny numbers without this subroutine signalling an error.
+*>
+*> If a possible loss of numerical precision due to near-singular matrices is a concern, the
+*> caller should verify that A is nonsingular within some tolerance before calling this subroutine.
 *> \endverbatim
 *
 *  Arguments:
@@ -110,7 +113,7 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the i-th diagonal element of A is zero,
+*>          > 0:  if INFO = i, the i-th diagonal element of A is exactly zero,
 *>                indicating that the matrix is singular and the
 *>                solutions X have not been computed.
 *> \endverbatim
@@ -123,10 +126,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tptrs
 *
 *  =====================================================================
-      SUBROUTINE CTPTRS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, INFO )
+      SUBROUTINE CTPTRS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -170,7 +175,8 @@ SUBROUTINE CTPTRS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, INFO )
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.
-     $         LSAME( TRANS, 'T' ) .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+     $         LSAME( TRANS, 'T' ) .AND.
+     $                .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -2
       ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
          INFO = -3
diff --git a/SRC/ctpttf.f b/SRC/ctpttf.f
index af7e8961bc..50ebc2ee84 100644
--- a/SRC/ctpttf.f
+++ b/SRC/ctpttf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTPTTF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctpttf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctpttf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -92,7 +90,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tpttf
 *
 *> \par Further Details:
 *  =====================
@@ -204,6 +202,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CTPTTF( TRANSR, UPLO, N, AP, ARF, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ctpttr.f b/SRC/ctpttr.f
index 0b9c498a04..854a36d29e 100644
--- a/SRC/ctpttr.f
+++ b/SRC/ctpttr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTPTTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctpttr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctpttr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tpttr
 *
 *  =====================================================================
       SUBROUTINE CTPTTR( UPLO, N, AP, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ctrcon.f b/SRC/ctrcon.f
index a14748f41c..1cf56cb32d 100644
--- a/SRC/ctrcon.f
+++ b/SRC/ctrcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTRCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctrcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctrcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -129,11 +127,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup trcon
 *
 *  =====================================================================
       SUBROUTINE CTRCON( NORM, UPLO, DIAG, N, A, LDA, RCOND, WORK,
      $                   RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -249,7 +248,8 @@ SUBROUTINE CTRCON( NORM, UPLO, DIAG, N, A, LDA, RCOND, WORK,
 *
 *              Multiply by inv(A**H).
 *
-               CALL CLATRS( UPLO, 'Conjugate transpose', DIAG, NORMIN,
+               CALL CLATRS( UPLO, 'Conjugate transpose', DIAG,
+     $                      NORMIN,
      $                      N, A, LDA, WORK, SCALE, RWORK, INFO )
             END IF
             NORMIN = 'Y'
diff --git a/SRC/ctrevc.f b/SRC/ctrevc.f
index 42880ab427..e0a8623254 100644
--- a/SRC/ctrevc.f
+++ b/SRC/ctrevc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTREVC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctrevc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctrevc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -196,7 +194,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup trevc
 *
 *> \par Further Details:
 *  =====================
@@ -213,8 +211,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
+      SUBROUTINE CTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
+     $                   VR,
      $                   LDVR, MM, M, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -253,7 +253,8 @@ SUBROUTINE CTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
       EXTERNAL           LSAME, ICAMAX, SCASUM, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CGEMV, CLATRS, CSSCAL, SLABAD, XERBLA
+      EXTERNAL           CCOPY, CGEMV, CLATRS, CSSCAL,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, CMPLX, CONJG, MAX, REAL
@@ -319,9 +320,8 @@ SUBROUTINE CTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Precision' )
-      SMLNUM = UNFL*( N / ULP )
+      SMLNUM = UNFL*( REAL( N ) / ULP )
 *
 *     Store the diagonal elements of T in working array WORK.
 *
@@ -388,7 +388,8 @@ SUBROUTINE CTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
    60          CONTINUE
             ELSE
                IF( KI.GT.1 )
-     $            CALL CGEMV( 'N', N, KI-1, CMONE, VR, LDVR, WORK( 1 ),
+     $            CALL CGEMV( 'N', N, KI-1, CMONE, VR, LDVR,
+     $                        WORK( 1 ),
      $                        1, CMPLX( SCALE ), VR( 1, KI ), 1 )
 *
                II = ICAMAX( N, VR( 1, KI ), 1 )
@@ -437,7 +438,8 @@ SUBROUTINE CTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
   100       CONTINUE
 *
             IF( KI.LT.N ) THEN
-               CALL CLATRS( 'Upper', 'Conjugate transpose', 'Non-unit',
+               CALL CLATRS( 'Upper', 'Conjugate transpose',
+     $                      'Non-unit',
      $                      'Y', N-KI, T( KI+1, KI+1 ), LDT,
      $                      WORK( KI+1 ), SCALE, RWORK, INFO )
                WORK( KI ) = SCALE
@@ -457,7 +459,8 @@ SUBROUTINE CTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
   110          CONTINUE
             ELSE
                IF( KI.LT.N )
-     $            CALL CGEMV( 'N', N, N-KI, CMONE, VL( 1, KI+1 ), LDVL,
+     $            CALL CGEMV( 'N', N, N-KI, CMONE, VL( 1, KI+1 ),
+     $                        LDVL,
      $                        WORK( KI+1 ), 1, CMPLX( SCALE ),
      $                        VL( 1, KI ), 1 )
 *
diff --git a/SRC/ctrevc3.f b/SRC/ctrevc3.f
index 0f58696b2b..3e622eb2e6 100644
--- a/SRC/ctrevc3.f
+++ b/SRC/ctrevc3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTREVC3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctrevc3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctrevc3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -222,7 +220,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup trevc3
 *
 *> \par Further Details:
 *  =====================
@@ -239,7 +237,8 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
+      SUBROUTINE CTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
+     $                    VR,
      $                    LDVR, MM, M, WORK, LWORK, RWORK, LRWORK, INFO)
       IMPLICIT NONE
 *
@@ -278,12 +277,14 @@ SUBROUTINE CTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV, ICAMAX
-      REAL               SLAMCH, SCASUM
-      EXTERNAL           LSAME, ILAENV, ICAMAX, SLAMCH, SCASUM
+      REAL               SLAMCH, SCASUM, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, ICAMAX, SLAMCH, SCASUM,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, CCOPY, CLASET, CSSCAL, CGEMM, CGEMV,
-     $                   CLATRS, CLACPY, SLABAD
+      EXTERNAL           XERBLA, CCOPY, CLASET, CSSCAL, CGEMM,
+     $                   CGEMV,
+     $                   CLATRS, CLACPY
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, REAL, CMPLX, CONJG, AIMAG, MAX
@@ -321,9 +322,9 @@ SUBROUTINE CTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
       INFO = 0
       NB = ILAENV( 1, 'CTREVC', SIDE // HOWMNY, N, -1, -1, -1 )
-      MAXWRK = N + 2*N*NB
-      WORK(1) = MAXWRK
-      RWORK(1) = N
+      MAXWRK = MAX( 1, N + 2*N*NB )
+      WORK(1) = SROUNDUP_LWORK(MAXWRK)
+      RWORK(1) = REAL( MAX( 1, N ) )
       LQUERY = ( LWORK.EQ.-1 .OR. LRWORK.EQ.-1 )
       IF( .NOT.RIGHTV .AND. .NOT.LEFTV ) THEN
          INFO = -1
@@ -371,9 +372,8 @@ SUBROUTINE CTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Precision' )
-      SMLNUM = UNFL*( N / ULP )
+      SMLNUM = UNFL*( REAL( N ) / ULP )
 *
 *     Store the diagonal elements of T in working array WORK.
 *
@@ -543,7 +543,8 @@ SUBROUTINE CTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
   100       CONTINUE
 *
             IF( KI.LT.N ) THEN
-               CALL CLATRS( 'Upper', 'Conjugate transpose', 'Non-unit',
+               CALL CLATRS( 'Upper', 'Conjugate transpose',
+     $                      'Non-unit',
      $                      'Y', N-KI, T( KI+1, KI+1 ), LDT,
      $                      WORK( KI+1 + IV*N ), SCALE, RWORK, INFO )
                WORK( KI + IV*N ) = SCALE
@@ -554,7 +555,8 @@ SUBROUTINE CTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
             IF( .NOT.OVER ) THEN
 *              ------------------------------
 *              no back-transform: copy x to VL and normalize.
-               CALL CCOPY( N-KI+1, WORK( KI + IV*N ), 1, VL(KI,IS), 1 )
+               CALL CCOPY( N-KI+1, WORK( KI + IV*N ), 1, VL(KI,IS),
+     $                     1 )
 *
                II = ICAMAX( N-KI+1, VL( KI, IS ), 1 ) + KI - 1
                REMAX = ONE / CABS1( VL( II, IS ) )
@@ -568,7 +570,8 @@ SUBROUTINE CTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *              ------------------------------
 *              version 1: back-transform each vector with GEMV, Q*x.
                IF( KI.LT.N )
-     $            CALL CGEMV( 'N', N, N-KI, CONE, VL( 1, KI+1 ), LDVL,
+     $            CALL CGEMV( 'N', N, N-KI, CONE, VL( 1, KI+1 ),
+     $                        LDVL,
      $                        WORK( KI+1 + IV*N ), 1, CMPLX( SCALE ),
      $                        VL( 1, KI ), 1 )
 *
diff --git a/SRC/ctrexc.f b/SRC/ctrexc.f
index ea64ddf9b8..0090acd190 100644
--- a/SRC/ctrexc.f
+++ b/SRC/ctrexc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTREXC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctrexc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctrexc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -40,7 +38,7 @@
 *>
 *> The Schur form T is reordered by a unitary similarity transformation
 *> Z**H*T*Z, and optionally the matrix Q of Schur vectors is updated by
-*> postmultplying it with Z.
+*> postmultiplying it with Z.
 *> \endverbatim
 *
 *  Arguments:
@@ -119,10 +117,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup trexc
 *
 *  =====================================================================
       SUBROUTINE CTREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -213,9 +212,11 @@ SUBROUTINE CTREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, INFO )
 *        Apply transformation to the matrix T.
 *
          IF( K+2.LE.N )
-     $      CALL CROT( N-K-1, T( K, K+2 ), LDT, T( K+1, K+2 ), LDT, CS,
+     $      CALL CROT( N-K-1, T( K, K+2 ), LDT, T( K+1, K+2 ), LDT,
+     $                 CS,
      $                 SN )
-         CALL CROT( K-1, T( 1, K ), 1, T( 1, K+1 ), 1, CS, CONJG( SN ) )
+         CALL CROT( K-1, T( 1, K ), 1, T( 1, K+1 ), 1, CS,
+     $              CONJG( SN ) )
 *
          T( K, K ) = T22
          T( K+1, K+1 ) = T11
diff --git a/SRC/ctrrfs.f b/SRC/ctrrfs.f
index 40c3cdde0b..4a07b48d56 100644
--- a/SRC/ctrrfs.f
+++ b/SRC/ctrrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTRRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctrrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctrrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -174,11 +172,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup trrfs
 *
 *  =====================================================================
-      SUBROUTINE CTRRFS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB, X,
+      SUBROUTINE CTRRFS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB,
+     $                   X,
      $                   LDX, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -213,7 +213,8 @@ SUBROUTINE CTRRFS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB, X,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CCOPY, CLACN2, CTRMV, CTRSV, XERBLA
+      EXTERNAL           CAXPY, CCOPY, CLACN2, CTRMV, CTRSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, MAX, REAL
@@ -284,7 +285,7 @@ SUBROUTINE CTRRFS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB, X,
       NZ = N + 1
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -427,10 +428,11 @@ SUBROUTINE CTRRFS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB, X,
 *
          DO 200 I = 1, N
             IF( RWORK( I ).GT.SAFE2 ) THEN
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I )
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I )
             ELSE
-               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I ) +
-     $                      SAFE1
+               RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
+     $                      EPS*RWORK( I ) + SAFE1
             END IF
   200    CONTINUE
 *
diff --git a/SRC/ctrsen.f b/SRC/ctrsen.f
index d93b97be6c..64ca2ce081 100644
--- a/SRC/ctrsen.f
+++ b/SRC/ctrsen.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTRSEN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctrsen.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctrsen.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -182,7 +180,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup trsen
 *
 *> \par Further Details:
 *  =====================
@@ -259,8 +257,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CTRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, W, M, S,
+      SUBROUTINE CTRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, W, M,
+     $                   S,
      $                   SEP, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -293,11 +293,12 @@ SUBROUTINE CTRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, W, M, S,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               CLANGE
-      EXTERNAL           LSAME, CLANGE
+      REAL               CLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, CLANGE, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLACN2, CLACPY, CTREXC, CTRSYL, XERBLA
+      EXTERNAL           CLACN2, CLACPY, CTREXC, CTRSYL,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
@@ -350,7 +351,7 @@ SUBROUTINE CTRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, W, M, S,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         WORK( 1 ) = LWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -444,7 +445,7 @@ SUBROUTINE CTRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, W, M, S,
          W( K ) = T( K, K )
    50 CONTINUE
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
 *
       RETURN
 *
diff --git a/SRC/ctrsna.f b/SRC/ctrsna.f
index b8074907c0..bec3a8d999 100644
--- a/SRC/ctrsna.f
+++ b/SRC/ctrsna.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTRSNA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctrsna.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctrsna.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -197,7 +195,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup trsna
 *
 *> \par Further Details:
 *  =====================
@@ -243,9 +241,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
+      SUBROUTINE CTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
+     $                   VR,
      $                   LDVR, S, SEP, MM, M, WORK, LDWORK, RWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -285,10 +285,11 @@ SUBROUTINE CTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
       INTEGER            ICAMAX
       REAL               SCNRM2, SLAMCH
       COMPLEX            CDOTC
-      EXTERNAL           LSAME, ICAMAX, SCNRM2, SLAMCH, CDOTC
+      EXTERNAL           LSAME, ICAMAX, SCNRM2, SLAMCH,
+     $                   CDOTC
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLACN2, CLACPY, CLATRS, CSRSCL, CTREXC, SLABAD,
+      EXTERNAL           CLACN2, CLACPY, CLATRS, CSRSCL, CTREXC,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -368,7 +369,6 @@ SUBROUTINE CTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
       KS = 1
       DO 50 K = 1, N
@@ -399,7 +399,8 @@ SUBROUTINE CTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *           diagonal element to the (1,1) position.
 *
             CALL CLACPY( 'Full', N, N, T, LDT, WORK, LDWORK )
-            CALL CTREXC( 'No Q', N, WORK, LDWORK, DUMMY, 1, K, 1, IERR )
+            CALL CTREXC( 'No Q', N, WORK, LDWORK, DUMMY, 1, K, 1,
+     $                   IERR )
 *
 *           Form  C = T22 - lambda*I in WORK(2:N,2:N).
 *
@@ -415,7 +416,8 @@ SUBROUTINE CTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
             KASE = 0
             NORMIN = 'N'
    30       CONTINUE
-            CALL CLACN2( N-1, WORK( 1, N+1 ), WORK, EST, KASE, ISAVE )
+            CALL CLACN2( N-1, WORK( 1, N+1 ), WORK, EST, KASE,
+     $                   ISAVE )
 *
             IF( KASE.NE.0 ) THEN
                IF( KASE.EQ.1 ) THEN
diff --git a/SRC/ctrsyl.f b/SRC/ctrsyl.f
index 7a2243ee9b..54ba04e4c0 100644
--- a/SRC/ctrsyl.f
+++ b/SRC/ctrsyl.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTRSYL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctrsyl.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctrsyl.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -149,11 +147,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexSYcomputational
+*> \ingroup trsyl
 *
 *  =====================================================================
       SUBROUTINE CTRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
      $                   LDC, SCALE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,10 +187,11 @@ SUBROUTINE CTRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
       LOGICAL            LSAME
       REAL               CLANGE, SLAMCH
       COMPLEX            CDOTC, CDOTU, CLADIV
-      EXTERNAL           LSAME, CLANGE, SLAMCH, CDOTC, CDOTU, CLADIV
+      EXTERNAL           LSAME, CLANGE, SLAMCH, CDOTC, CDOTU,
+     $                   CLADIV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CSSCAL, SLABAD, XERBLA
+      EXTERNAL           CSSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, CMPLX, CONJG, MAX, MIN, REAL
@@ -237,12 +237,11 @@ SUBROUTINE CTRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SMLNUM*REAL( M*N ) / EPS
       BIGNUM = ONE / SMLNUM
       SMIN = MAX( SMLNUM, EPS*CLANGE( 'M', M, M, A, LDA, DUM ),
      $       EPS*CLANGE( 'M', N, N, B, LDB, DUM ) )
-      SGN = ISGN
+      SGN = REAL( ISGN )
 *
       IF( NOTRNA .AND. NOTRNB ) THEN
 *
diff --git a/SRC/ctrsyl3.f b/SRC/ctrsyl3.f
new file mode 100644
index 0000000000..5bf90f242b
--- /dev/null
+++ b/SRC/ctrsyl3.f
@@ -0,0 +1,1157 @@
+*> \brief \b CTRSYL3
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE CTRSYL3( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB,
+*                           C, LDC, SCALE, SWORK, LDSWORK, INFO )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          TRANA, TRANB
+*       INTEGER            INFO, ISGN, LDA, LDB, LDC, LDSWORK, M, N
+*       REAL               SCALE
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX            A( LDA, * ), B( LDB, * ), C( LDC, * )
+*       REAL               SWORK( LDSWORK, * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*>  CTRSYL3 solves the complex Sylvester matrix equation:
+*>
+*>     op(A)*X + X*op(B) = scale*C or
+*>     op(A)*X - X*op(B) = scale*C,
+*>
+*>  where op(A) = A or A**H, and  A and B are both upper triangular. A is
+*>  M-by-M and B is N-by-N; the right hand side C and the solution X are
+*>  M-by-N; and scale is an output scale factor, set <= 1 to avoid
+*>  overflow in X.
+*>
+*>  This is the block version of the algorithm.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] TRANA
+*> \verbatim
+*>          TRANA is CHARACTER*1
+*>          Specifies the option op(A):
+*>          = 'N': op(A) = A    (No transpose)
+*>          = 'C': op(A) = A**H (Conjugate transpose)
+*> \endverbatim
+*>
+*> \param[in] TRANB
+*> \verbatim
+*>          TRANB is CHARACTER*1
+*>          Specifies the option op(B):
+*>          = 'N': op(B) = B    (No transpose)
+*>          = 'C': op(B) = B**H (Conjugate transpose)
+*> \endverbatim
+*>
+*> \param[in] ISGN
+*> \verbatim
+*>          ISGN is INTEGER
+*>          Specifies the sign in the equation:
+*>          = +1: solve op(A)*X + X*op(B) = scale*C
+*>          = -1: solve op(A)*X - X*op(B) = scale*C
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The order of the matrix A, and the number of rows in the
+*>          matrices X and C. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix B, and the number of columns in the
+*>          matrices X and C. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX array, dimension (LDA,M)
+*>          The upper triangular matrix A.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in] B
+*> \verbatim
+*>          B is COMPLEX array, dimension (LDB,N)
+*>          The upper triangular matrix B.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= max(1,N).
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is COMPLEX array, dimension (LDC,N)
+*>          On entry, the M-by-N right hand side matrix C.
+*>          On exit, C is overwritten by the solution matrix X.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M)
+*> \endverbatim
+*>
+*> \param[out] SCALE
+*> \verbatim
+*>          SCALE is REAL
+*>          The scale factor, scale, set <= 1 to avoid overflow in X.
+*> \endverbatim
+*>
+*> \param[out] SWORK
+*> \verbatim
+*>          SWORK is REAL array, dimension (MAX(2, ROWS), MAX(1,COLS)).
+*>          On exit, if INFO = 0, SWORK(1) returns the optimal value ROWS
+*>          and SWORK(2) returns the optimal COLS.
+*> \endverbatim
+*>
+*> \param[in] LDSWORK
+*> \verbatim
+*>          LDSWORK is INTEGER
+*>          LDSWORK >= MAX(2,ROWS), where ROWS = ((M + NB - 1) / NB + 1)
+*>          and NB is the optimal block size.
+*>
+*>          If LDSWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal dimensions of the SWORK matrix,
+*>          returns these values as the first and second entry of the SWORK
+*>          matrix, and no error message related LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0: successful exit
+*>          < 0: if INFO = -i, the i-th argument had an illegal value
+*>          = 1: A and B have common or very close eigenvalues; perturbed
+*>               values were used to solve the equation (but the matrices
+*>               A and B are unchanged).
+*> \endverbatim
+*
+*> \ingroup trsyl3
+*
+*  =====================================================================
+*  References:
+*   E. S. Quintana-Orti and R. A. Van De Geijn (2003). Formal derivation of
+*   algorithms: The triangular Sylvester equation, ACM Transactions
+*   on Mathematical Software (TOMS), volume 29, pages 218--243.
+*
+*   A. Schwarz and C. C. Kjelgaard Mikkelsen (2020). Robust Task-Parallel
+*   Solution of the Triangular Sylvester Equation. Lecture Notes in
+*   Computer Science, vol 12043, pages 82--92, Springer.
+*
+*  Contributor:
+*   Angelika Schwarz, Umea University, Sweden.
+*
+*  =====================================================================
+      SUBROUTINE CTRSYL3( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB,
+     $                    C, LDC, SCALE, SWORK, LDSWORK, INFO )
+      IMPLICIT NONE
+*
+*     .. Scalar Arguments ..
+      CHARACTER          TRANA, TRANB
+      INTEGER            INFO, ISGN, LDA, LDB, LDC, LDSWORK, M, N
+      REAL               SCALE
+*     ..
+*     .. Array Arguments ..
+      COMPLEX            A( LDA, * ), B( LDB, * ), C( LDC, * )
+      REAL               SWORK( LDSWORK, * )
+*     ..
+*     .. Parameters ..
+      REAL               ZERO, ONE
+      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0 )
+      COMPLEX            CONE
+      PARAMETER          ( CONE = ( 1.0E+0, 0.0E+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            NOTRNA, NOTRNB, LQUERY
+      INTEGER            AWRK, BWRK, I, I1, I2, IINFO, J, J1, J2, JJ,
+     $                   K, K1, K2, L, L1, L2, LL, NBA, NB, NBB
+      REAL               ANRM, BIGNUM, BNRM, CNRM, SCAL, SCALOC,
+     $                   SCAMIN, SGN, XNRM, BUF, SMLNUM
+      COMPLEX            CSGN
+*     ..
+*     .. Local Arrays ..
+      REAL               WNRM( MAX( M, N ) )
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      REAL               CLANGE, SLAMCH, SLARMM
+      EXTERNAL           CLANGE, ILAENV, LSAME, SLAMCH,
+     $                   SLARMM
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           CSSCAL, CGEMM, CLASCL, CTRSYL,
+     $                   XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, AIMAG, EXPONENT, MAX, MIN, REAL
+*     ..
+*     .. Executable Statements ..
+*
+*     Decode and Test input parameters
+*
+      NOTRNA = LSAME( TRANA, 'N' )
+      NOTRNB = LSAME( TRANB, 'N' )
+*
+*     Use the same block size for all matrices.
+*
+      NB = MAX( 8, ILAENV( 1, 'CTRSYL', '', M, N, -1, -1) )
+*
+*     Compute number of blocks in A and B
+*
+      NBA = MAX( 1, (M + NB - 1) / NB )
+      NBB = MAX( 1, (N + NB - 1) / NB )
+*
+*     Compute workspace
+*
+      INFO = 0
+      LQUERY = ( LDSWORK.EQ.-1 )
+      IF( LQUERY ) THEN
+         LDSWORK = 2
+         SWORK(1,1) = REAL( MAX( NBA, NBB ) )
+         SWORK(2,1) = REAL( 2 * NBB + NBA )
+      END IF
+*
+*     Test the input arguments
+*
+      IF( .NOT.NOTRNA .AND. .NOT. LSAME( TRANA, 'C' ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.NOTRNB .AND. .NOT. LSAME( TRANB, 'C' ) ) THEN
+         INFO = -2
+      ELSE IF( ISGN.NE.1 .AND. ISGN.NE.-1 ) THEN
+         INFO = -3
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -5
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -7
+      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+         INFO = -9
+      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
+         INFO = -11
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'CTRSYL3', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      SCALE = ONE
+      IF( M.EQ.0 .OR. N.EQ.0 )
+     $   RETURN
+*
+*     Use unblocked code for small problems or if insufficient
+*     workspace is provided
+*
+      IF( MIN( NBA, NBB ).EQ.1 .OR. LDSWORK.LT.MAX( NBA, NBB ) ) THEN
+        CALL CTRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB,
+     $               C, LDC, SCALE, INFO )
+        RETURN
+      END IF
+*
+*     Set constants to control overflow
+*
+      SMLNUM = SLAMCH( 'S' )
+      BIGNUM = ONE / SMLNUM
+*
+*     Set local scaling factors.
+*
+      DO L = 1, NBB
+         DO K = 1, NBA
+            SWORK( K, L ) = ONE
+         END DO
+      END DO
+*
+*     Fallback scaling factor to prevent flushing of SWORK( K, L ) to zero.
+*     This scaling is to ensure compatibility with TRSYL and may get flushed.
+*
+      BUF = ONE
+*
+*      Compute upper bounds of blocks of A and B
+*
+      AWRK = NBB
+      DO K = 1, NBA
+         K1 = (K - 1) * NB + 1
+         K2 = MIN( K * NB, M ) + 1
+         DO L = K, NBA
+            L1 = (L - 1) * NB + 1
+            L2 = MIN( L * NB, M ) + 1
+            IF( NOTRNA ) THEN
+               SWORK( K, AWRK + L ) = CLANGE( 'I', K2-K1, L2-L1,
+     $                                        A( K1, L1 ), LDA, WNRM )
+            ELSE
+               SWORK( L, AWRK + K ) = CLANGE( '1', K2-K1, L2-L1,
+     $                                        A( K1, L1 ), LDA, WNRM )
+            END IF
+         END DO
+      END DO
+      BWRK = NBB + NBA
+      DO K = 1, NBB
+         K1 = (K - 1) * NB + 1
+         K2 = MIN( K * NB, N ) + 1
+         DO L = K, NBB
+            L1 = (L - 1) * NB + 1
+            L2 = MIN( L * NB, N ) + 1
+            IF( NOTRNB ) THEN
+               SWORK( K, BWRK + L ) = CLANGE( 'I', K2-K1, L2-L1,
+     $                                        B( K1, L1 ), LDB, WNRM )
+            ELSE
+               SWORK( L, BWRK + K ) = CLANGE( '1', K2-K1, L2-L1,
+     $                                        B( K1, L1 ), LDB, WNRM )
+            END IF
+         END DO
+      END DO
+*
+      SGN = REAL( ISGN )
+      CSGN = CMPLX( SGN, ZERO )
+*
+      IF( NOTRNA .AND. NOTRNB ) THEN
+*
+*        Solve    A*X + ISGN*X*B = scale*C.
+*
+*        The (K,L)th block of X is determined starting from
+*        bottom-left corner column by column by
+*
+*         A(K,K)*X(K,L) + ISGN*X(K,L)*B(L,L) = C(K,L) - R(K,L)
+*
+*        Where
+*                  M                         L-1
+*        R(K,L) = SUM [A(K,I)*X(I,L)] + ISGN*SUM [X(K,J)*B(J,L)].
+*                I=K+1                       J=1
+*
+*        Start loop over block rows (index = K) and block columns (index = L)
+*
+         DO K = NBA, 1, -1
+*
+*           K1: row index of the first row in X( K, L )
+*           K2: row index of the first row in X( K+1, L )
+*           so the K2 - K1 is the column count of the block X( K, L )
+*
+            K1 = (K - 1) * NB + 1
+            K2 = MIN( K * NB, M ) + 1
+            DO L = 1, NBB
+*
+*              L1: column index of the first column in X( K, L )
+*              L2: column index of the first column in X( K, L + 1)
+*              so that L2 - L1 is the row count of the block X( K, L )
+*
+               L1 = (L - 1) * NB + 1
+               L2 = MIN( L * NB, N ) + 1
+*
+               CALL CTRSYL( TRANA, TRANB, ISGN, K2-K1, L2-L1,
+     $                      A( K1, K1 ), LDA,
+     $                      B( L1, L1 ), LDB,
+     $                      C( K1, L1 ), LDC, SCALOC, IINFO )
+               INFO = MAX( INFO, IINFO )
+*
+               IF( SCALOC * SWORK( K, L ) .EQ. ZERO ) THEN
+                  IF( SCALOC .EQ. ZERO ) THEN
+*                    The magnitude of the largest entry of X(K1:K2-1, L1:L2-1)
+*                    is larger than the product of BIGNUM**2 and cannot be
+*                    represented in the form (1/SCALE)*X(K1:K2-1, L1:L2-1).
+*                    Mark the computation as pointless.
+                     BUF = ZERO
+                  ELSE
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                  END IF
+                  DO JJ = 1, NBB
+                     DO LL = 1, NBA
+*                       Bound by BIGNUM to not introduce Inf. The value
+*                       is irrelevant; corresponding entries of the
+*                       solution will be flushed in consistency scaling.
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                     END DO
+                  END DO
+               END IF
+               SWORK( K, L ) = SCALOC * SWORK( K, L )
+               XNRM = CLANGE( 'I', K2-K1, L2-L1, C( K1, L1 ), LDC,
+     $                        WNRM )
+*
+               DO I = K - 1, 1, -1
+*
+*                 C( I, L ) := C( I, L ) - A( I, K ) * C( K, L )
+*
+                  I1 = (I - 1) * NB + 1
+                  I2 = MIN( I * NB, M ) + 1
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = CLANGE( 'I', I2-I1, L2-L1, C( I1, L1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( I, L ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( I, L ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  ANRM = SWORK( I, AWRK + K )
+                  SCALOC = SLARMM( ANRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.E0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.E0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( I, L ) and C( K, L ).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL.NE.ONE ) THEN
+                      DO JJ = L1, L2-1
+                         CALL CSSCAL( K2-K1, SCAL, C( K1, JJ ), 1)
+                      END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( I, L ) ) * SCALOC
+                  IF( SCAL.NE.ONE ) THEN
+                      DO LL = L1, L2-1
+                         CALL CSSCAL( I2-I1, SCAL, C( I1, LL ), 1)
+                      END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( I, L ) = SCAMIN * SCALOC
+*
+                  CALL CGEMM( 'N', 'N', I2-I1, L2-L1, K2-K1, -CONE,
+     $                        A( I1, K1 ), LDA, C( K1, L1 ), LDC,
+     $                        CONE, C( I1, L1 ), LDC )
+*
+               END DO
+*
+               DO J = L + 1, NBB
+*
+*                 C( K, J ) := C( K, J ) - SGN * C( K, L ) * B( L, J )
+*
+                  J1 = (J - 1) * NB + 1
+                  J2 = MIN( J * NB, N ) + 1
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = CLANGE( 'I', K2-K1, J2-J1, C( K1, J1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( K, J ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( K, J ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  BNRM = SWORK(L, BWRK + J)
+                  SCALOC = SLARMM( BNRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.E0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.E0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( K, J ) and C( K, L).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL CSSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( K, J ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                      DO JJ = J1, J2-1
+                         CALL CSSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                      END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( K, J ) = SCAMIN * SCALOC
+*
+                  CALL CGEMM( 'N', 'N', K2-K1, J2-J1, L2-L1, -CSGN,
+     $                        C( K1, L1 ), LDC, B( L1, J1 ), LDB,
+     $                        CONE, C( K1, J1 ), LDC )
+               END DO
+            END DO
+         END DO
+      ELSE IF( .NOT.NOTRNA .AND. NOTRNB ) THEN
+*
+*        Solve    A**H *X + ISGN*X*B = scale*C.
+*
+*        The (K,L)th block of X is determined starting from
+*        upper-left corner column by column by
+*
+*          A(K,K)**H*X(K,L) + ISGN*X(K,L)*B(L,L) = C(K,L) - R(K,L)
+*
+*        Where
+*                   K-1                        L-1
+*          R(K,L) = SUM [A(I,K)**H*X(I,L)] +ISGN*SUM [X(K,J)*B(J,L)]
+*                   I=1                        J=1
+*
+*        Start loop over block rows (index = K) and block columns (index = L)
+*
+         DO K = 1, NBA
+*
+*           K1: row index of the first row in X( K, L )
+*           K2: row index of the first row in X( K+1, L )
+*           so the K2 - K1 is the column count of the block X( K, L )
+*
+            K1 = (K - 1) * NB + 1
+            K2 = MIN( K * NB, M ) + 1
+            DO L = 1, NBB
+*
+*              L1: column index of the first column in X( K, L )
+*              L2: column index of the first column in X( K, L + 1)
+*              so that L2 - L1 is the row count of the block X( K, L )
+*
+               L1 = (L - 1) * NB + 1
+               L2 = MIN( L * NB, N ) + 1
+*
+               CALL CTRSYL( TRANA, TRANB, ISGN, K2-K1, L2-L1,
+     $                      A( K1, K1 ), LDA,
+     $                      B( L1, L1 ), LDB,
+     $                      C( K1, L1 ), LDC, SCALOC, IINFO )
+               INFO = MAX( INFO, IINFO )
+*
+               IF( SCALOC * SWORK( K, L ) .EQ. ZERO ) THEN
+                  IF( SCALOC .EQ. ZERO ) THEN
+*                    The magnitude of the largest entry of X(K1:K2-1, L1:L2-1)
+*                    is larger than the product of BIGNUM**2 and cannot be
+*                    represented in the form (1/SCALE)*X(K1:K2-1, L1:L2-1).
+*                    Mark the computation as pointless.
+                     BUF = ZERO
+                  ELSE
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                  END IF
+                  DO JJ = 1, NBB
+                     DO LL = 1, NBA
+*                       Bound by BIGNUM to not introduce Inf. The value
+*                       is irrelevant; corresponding entries of the
+*                       solution will be flushed in consistency scaling.
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                     END DO
+                  END DO
+               END IF
+               SWORK( K, L ) = SCALOC * SWORK( K, L )
+               XNRM = CLANGE( 'I', K2-K1, L2-L1, C( K1, L1 ), LDC,
+     $                        WNRM )
+*
+               DO I = K + 1, NBA
+*
+*                 C( I, L ) := C( I, L ) - A( K, I )**H * C( K, L )
+*
+                  I1 = (I - 1) * NB + 1
+                  I2 = MIN( I * NB, M ) + 1
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = CLANGE( 'I', I2-I1, L2-L1, C( I1, L1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( I, L ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( I, L ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  ANRM = SWORK( I, AWRK + K )
+                  SCALOC = SLARMM( ANRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.E0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.E0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to to C( I, L ) and C( K, L).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL CSSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( I, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL CSSCAL( I2-I1, SCAL, C( I1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( I, L ) = SCAMIN * SCALOC
+*
+                  CALL CGEMM( 'C', 'N', I2-I1, L2-L1, K2-K1, -CONE,
+     $                        A( K1, I1 ), LDA, C( K1, L1 ), LDC,
+     $                        CONE, C( I1, L1 ), LDC )
+               END DO
+*
+               DO J = L + 1, NBB
+*
+*                 C( K, J ) := C( K, J ) - SGN * C( K, L ) * B( L, J )
+*
+                  J1 = (J - 1) * NB + 1
+                  J2 = MIN( J * NB, N ) + 1
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = CLANGE( 'I', K2-K1, J2-J1, C( K1, J1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( K, J ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( K, J ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  BNRM = SWORK( L, BWRK + J )
+                  SCALOC = SLARMM( BNRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.E0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.E0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to to C( K, J ) and C( K, L).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                      DO LL = L1, L2-1
+                         CALL CSSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                      END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( K, J ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO JJ = J1, J2-1
+                        CALL CSSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( K, J ) = SCAMIN * SCALOC
+*
+                  CALL CGEMM( 'N', 'N', K2-K1, J2-J1, L2-L1, -CSGN,
+     $                        C( K1, L1 ), LDC, B( L1, J1 ), LDB,
+     $                        CONE, C( K1, J1 ), LDC )
+               END DO
+            END DO
+         END DO
+      ELSE IF( .NOT.NOTRNA .AND. .NOT.NOTRNB ) THEN
+*
+*        Solve    A**H *X + ISGN*X*B**H = scale*C.
+*
+*        The (K,L)th block of X is determined starting from
+*        top-right corner column by column by
+*
+*           A(K,K)**H*X(K,L) + ISGN*X(K,L)*B(L,L)**H = C(K,L) - R(K,L)
+*
+*        Where
+*                     K-1                          N
+*            R(K,L) = SUM [A(I,K)**H*X(I,L)] + ISGN*SUM [X(K,J)*B(L,J)**H].
+*                     I=1                        J=L+1
+*
+*        Start loop over block rows (index = K) and block columns (index = L)
+*
+         DO K = 1, NBA
+*
+*           K1: row index of the first row in X( K, L )
+*           K2: row index of the first row in X( K+1, L )
+*           so the K2 - K1 is the column count of the block X( K, L )
+*
+            K1 = (K - 1) * NB + 1
+            K2 = MIN( K * NB, M ) + 1
+            DO L = NBB, 1, -1
+*
+*              L1: column index of the first column in X( K, L )
+*              L2: column index of the first column in X( K, L + 1)
+*              so that L2 - L1 is the row count of the block X( K, L )
+*
+               L1 = (L - 1) * NB + 1
+               L2 = MIN( L * NB, N ) + 1
+*
+               CALL CTRSYL( TRANA, TRANB, ISGN, K2-K1, L2-L1,
+     $                      A( K1, K1 ), LDA,
+     $                      B( L1, L1 ), LDB,
+     $                      C( K1, L1 ), LDC, SCALOC, IINFO )
+               INFO = MAX( INFO, IINFO )
+*
+               IF( SCALOC * SWORK( K, L ) .EQ. ZERO ) THEN
+                  IF( SCALOC .EQ. ZERO ) THEN
+*                    The magnitude of the largest entry of X(K1:K2-1, L1:L2-1)
+*                    is larger than the product of BIGNUM**2 and cannot be
+*                    represented in the form (1/SCALE)*X(K1:K2-1, L1:L2-1).
+*                    Mark the computation as pointless.
+                     BUF = ZERO
+                  ELSE
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                  END IF
+                  DO JJ = 1, NBB
+                     DO LL = 1, NBA
+*                       Bound by BIGNUM to not introduce Inf. The value
+*                       is irrelevant; corresponding entries of the
+*                       solution will be flushed in consistency scaling.
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                     END DO
+                  END DO
+               END IF
+               SWORK( K, L ) = SCALOC * SWORK( K, L )
+               XNRM = CLANGE( 'I', K2-K1, L2-L1, C( K1, L1 ), LDC,
+     $                        WNRM )
+*
+               DO I = K + 1, NBA
+*
+*                 C( I, L ) := C( I, L ) - A( K, I )**H * C( K, L )
+*
+                  I1 = (I - 1) * NB + 1
+                  I2 = MIN( I * NB, M ) + 1
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = CLANGE( 'I', I2-I1, L2-L1, C( I1, L1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( I, L ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( I, L ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  ANRM = SWORK( I, AWRK + K )
+                  SCALOC = SLARMM( ANRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.E0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.E0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( I, L ) and C( K, L).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL CSSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( I, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL CSSCAL( I2-I1, SCAL, C( I1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( I, L ) = SCAMIN * SCALOC
+*
+                  CALL CGEMM( 'C', 'N', I2-I1, L2-L1, K2-K1, -CONE,
+     $                        A( K1, I1 ), LDA, C( K1, L1 ), LDC,
+     $                        CONE, C( I1, L1 ), LDC )
+               END DO
+*
+               DO J = 1, L - 1
+*
+*                 C( K, J ) := C( K, J ) - SGN * C( K, L ) * B( J, L )**H
+*
+                  J1 = (J - 1) * NB + 1
+                  J2 = MIN( J * NB, N ) + 1
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = CLANGE( 'I', K2-K1, J2-J1, C( K1, J1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( K, J ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( K, J ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  BNRM = SWORK( L, BWRK + J )
+                  SCALOC = SLARMM( BNRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.E0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.E0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( K, J ) and C( K, L).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL CSSCAL( K2-K1, SCAL, C( K1, LL ), 1)
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( K, J ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO JJ = J1, J2-1
+                        CALL CSSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( K, J ) = SCAMIN * SCALOC
+*
+                  CALL CGEMM( 'N', 'C', K2-K1, J2-J1, L2-L1, -CSGN,
+     $                        C( K1, L1 ), LDC, B( J1, L1 ), LDB,
+     $                        CONE, C( K1, J1 ), LDC )
+               END DO
+            END DO
+         END DO
+      ELSE IF( NOTRNA .AND. .NOT.NOTRNB ) THEN
+*
+*        Solve    A*X + ISGN*X*B**H = scale*C.
+*
+*        The (K,L)th block of X is determined starting from
+*        bottom-right corner column by column by
+*
+*            A(K,K)*X(K,L) + ISGN*X(K,L)*B(L,L)**H = C(K,L) - R(K,L)
+*
+*        Where
+*                      M                          N
+*            R(K,L) = SUM [A(K,I)*X(I,L)] + ISGN*SUM [X(K,J)*B(L,J)**H].
+*                    I=K+1                      J=L+1
+*
+*        Start loop over block rows (index = K) and block columns (index = L)
+*
+         DO K = NBA, 1, -1
+*
+*           K1: row index of the first row in X( K, L )
+*           K2: row index of the first row in X( K+1, L )
+*           so the K2 - K1 is the column count of the block X( K, L )
+*
+            K1 = (K - 1) * NB + 1
+            K2 = MIN( K * NB, M ) + 1
+            DO L = NBB, 1, -1
+*
+*              L1: column index of the first column in X( K, L )
+*              L2: column index of the first column in X( K, L + 1)
+*              so that L2 - L1 is the row count of the block X( K, L )
+*
+               L1 = (L - 1) * NB + 1
+               L2 = MIN( L * NB, N ) + 1
+*
+               CALL CTRSYL( TRANA, TRANB, ISGN, K2-K1, L2-L1,
+     $                      A( K1, K1 ), LDA,
+     $                      B( L1, L1 ), LDB,
+     $                      C( K1, L1 ), LDC, SCALOC, IINFO )
+               INFO = MAX( INFO, IINFO )
+*
+               IF( SCALOC * SWORK( K, L ) .EQ. ZERO ) THEN
+                  IF( SCALOC .EQ. ZERO ) THEN
+*                    The magnitude of the largest entry of X(K1:K2-1, L1:L2-1)
+*                    is larger than the product of BIGNUM**2 and cannot be
+*                    represented in the form (1/SCALE)*X(K1:K2-1, L1:L2-1).
+*                    Mark the computation as pointless.
+                     BUF = ZERO
+                  ELSE
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                  END IF
+                  DO JJ = 1, NBB
+                     DO LL = 1, NBA
+*                       Bound by BIGNUM to not introduce Inf. The value
+*                       is irrelevant; corresponding entries of the
+*                       solution will be flushed in consistency scaling.
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                     END DO
+                  END DO
+               END IF
+               SWORK( K, L ) = SCALOC * SWORK( K, L )
+               XNRM = CLANGE( 'I', K2-K1, L2-L1, C( K1, L1 ), LDC,
+     $                        WNRM )
+*
+               DO I = 1, K - 1
+*
+*                 C( I, L ) := C( I, L ) - A( I, K ) * C( K, L )
+*
+                  I1 = (I - 1) * NB + 1
+                  I2 = MIN( I * NB, M ) + 1
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = CLANGE( 'I', I2-I1, L2-L1, C( I1, L1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( I, L ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( I, L ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  ANRM = SWORK( I, AWRK + K )
+                  SCALOC = SLARMM( ANRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.E0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.E0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( I, L ) and C( K, L).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL CSSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( I, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL CSSCAL( I2-I1, SCAL, C( I1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( I, L ) = SCAMIN * SCALOC
+*
+                  CALL CGEMM( 'N', 'N', I2-I1, L2-L1, K2-K1, -CONE,
+     $                        A( I1, K1 ), LDA, C( K1, L1 ), LDC,
+     $                        CONE, C( I1, L1 ), LDC )
+*
+               END DO
+*
+               DO J = 1, L - 1
+*
+*                 C( K, J ) := C( K, J ) - SGN * C( K, L ) * B( J, L )**H
+*
+                  J1 = (J - 1) * NB + 1
+                  J2 = MIN( J * NB, N ) + 1
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = CLANGE( 'I', K2-K1, J2-J1, C( K1, J1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( K, J ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( K, J ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  BNRM = SWORK( L, BWRK + J )
+                  SCALOC = SLARMM( BNRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.E0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.E0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC 
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( K, J ) and C( K, L).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO JJ = L1, L2-1
+                        CALL CSSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( K, J ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO JJ = J1, J2-1
+                        CALL CSSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( K, J ) = SCAMIN * SCALOC
+*
+                  CALL CGEMM( 'N', 'C', K2-K1, J2-J1, L2-L1, -CSGN,
+     $                        C( K1, L1 ), LDC, B( J1, L1 ), LDB,
+     $                        CONE, C( K1, J1 ), LDC )
+               END DO
+            END DO
+         END DO
+*
+      END IF
+*
+*     Reduce local scaling factors
+*
+      SCALE = SWORK( 1, 1 )
+      DO K = 1, NBA
+         DO L = 1, NBB
+            SCALE = MIN( SCALE, SWORK( K, L ) )
+         END DO
+      END DO
+      IF( SCALE .EQ. ZERO ) THEN
+*
+*        The magnitude of the largest entry of the solution is larger
+*        than the product of BIGNUM**2 and cannot be represented in the
+*        form (1/SCALE)*X if SCALE is REAL. Set SCALE to
+*        zero and give up.
+*
+         SWORK(1,1) = REAL( MAX( NBA, NBB ) )
+         SWORK(2,1) = REAL( 2 * NBB + NBA )
+         RETURN
+      END IF
+*
+*     Realize consistent scaling
+*
+      DO K = 1, NBA
+         K1 = (K - 1) * NB + 1
+         K2 = MIN( K * NB, M ) + 1
+         DO L = 1, NBB
+            L1 = (L - 1) * NB + 1
+            L2 = MIN( L * NB, N ) + 1
+            SCAL = SCALE / SWORK( K, L )
+            IF( SCAL .NE. ONE ) THEN
+               DO LL = L1, L2-1
+                  CALL CSSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+               END DO
+            ENDIF
+         END DO
+      END DO
+*
+      IF( BUF .NE. ONE .AND. BUF.GT.ZERO ) THEN
+*
+*        Decrease SCALE as much as possible.
+*
+         SCALOC = MIN( SCALE / SMLNUM, ONE / BUF )
+         BUF = BUF * SCALOC
+         SCALE = SCALE / SCALOC
+      END IF
+*
+      IF( BUF.NE.ONE .AND. BUF.GT.ZERO ) THEN
+*
+*        In case of overly aggressive scaling during the computation,
+*        flushing of the global scale factor may be prevented by
+*        undoing some of the scaling. This step is to ensure that
+*        this routine flushes only scale factors that TRSYL also
+*        flushes and be usable as a drop-in replacement.
+*
+*        How much can the normwise largest entry be upscaled?
+*
+         SCAL = MAX( ABS( REAL( C( 1, 1 ) ) ),
+     $               ABS( AIMAG( C ( 1, 1 ) ) ) )
+         DO K = 1, M
+            DO L = 1, N
+               SCAL = MAX( SCAL, ABS( REAL ( C( K, L ) ) ),
+     $                     ABS( AIMAG ( C( K, L ) ) ) )
+            END DO
+         END DO
+*
+*        Increase BUF as close to 1 as possible and apply scaling.
+*
+         SCALOC = MIN( BIGNUM / SCAL, ONE / BUF )
+         BUF = BUF * SCALOC
+         CALL CLASCL( 'G', -1, -1, ONE, SCALOC, M, N, C, LDC, IINFO )
+      END IF
+*
+*     Combine with buffer scaling factor. SCALE will be flushed if
+*     BUF is less than one here.
+*
+      SCALE = SCALE * BUF
+*
+*     Restore workspace dimensions
+*
+      SWORK(1,1) = REAL( MAX( NBA, NBB ) )
+      SWORK(2,1) = REAL( 2 * NBB + NBA )
+*
+      RETURN
+*
+*     End of CTRSYL3
+*
+      END
diff --git a/SRC/ctrti2.f b/SRC/ctrti2.f
index 47a9ab45f5..647fecaa9a 100644
--- a/SRC/ctrti2.f
+++ b/SRC/ctrti2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTRTI2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctrti2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctrti2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -103,10 +101,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup trti2
 *
 *  =====================================================================
       SUBROUTINE CTRTI2( UPLO, DIAG, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ctrtri.f b/SRC/ctrtri.f
index d7f41ba3e8..a9efe6e43e 100644
--- a/SRC/ctrtri.f
+++ b/SRC/ctrtri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTRTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctrtri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctrtri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup trtri
 *
 *  =====================================================================
       SUBROUTINE CTRTRI( UPLO, DIAG, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -198,9 +197,11 @@ SUBROUTINE CTRTRI( UPLO, DIAG, N, A, LDA, INFO )
 *
 *              Compute rows 1:j-1 of current block column
 *
-               CALL CTRMM( 'Left', 'Upper', 'No transpose', DIAG, J-1,
+               CALL CTRMM( 'Left', 'Upper', 'No transpose', DIAG,
+     $                     J-1,
      $                     JB, ONE, A, LDA, A( 1, J ), LDA )
-               CALL CTRSM( 'Right', 'Upper', 'No transpose', DIAG, J-1,
+               CALL CTRSM( 'Right', 'Upper', 'No transpose', DIAG,
+     $                     J-1,
      $                     JB, -ONE, A( J, J ), LDA, A( 1, J ), LDA )
 *
 *              Compute inverse of current diagonal block
diff --git a/SRC/ctrtrs.f b/SRC/ctrtrs.f
index 47e4245f74..1b530f37c5 100644
--- a/SRC/ctrtrs.f
+++ b/SRC/ctrtrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTRTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctrtrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctrtrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -39,8 +37,14 @@
 *>
 *>    A * X = B,  A**T * X = B,  or  A**H * X = B,
 *>
-*> where A is a triangular matrix of order N, and B is an N-by-NRHS
-*> matrix.  A check is made to verify that A is nonsingular.
+*> where A is a triangular matrix of order N, and B is an N-by-NRHS matrix.
+*>
+*> This subroutine verifies that A is nonsingular, but callers should note that only exact
+*> singularity is detected. It is conceivable for one or more diagonal elements of A to be
+*> subnormally tiny numbers without this subroutine signalling an error.
+*>
+*> If a possible loss of numerical precision due to near-singular matrices is a concern, the
+*> caller should verify that A is nonsingular within some tolerance before calling this subroutine.
 *> \endverbatim
 *
 *  Arguments:
@@ -119,7 +123,7 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0: if INFO = -i, the i-th argument had an illegal value
-*>          > 0: if INFO = i, the i-th diagonal element of A is zero,
+*>          > 0:  if INFO = i, the i-th diagonal element of A is exactly zero,
 *>               indicating that the matrix is singular and the solutions
 *>               X have not been computed.
 *> \endverbatim
@@ -132,11 +136,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup trtrs
 *
 *  =====================================================================
       SUBROUTINE CTRTRS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -176,10 +181,12 @@ SUBROUTINE CTRTRS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB,
 *
       INFO = 0
       NOUNIT = LSAME( DIAG, 'N' )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.
-     $         LSAME( TRANS, 'T' ) .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+     $         LSAME( TRANS, 'T' ) .AND.
+     $                .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -2
       ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
          INFO = -3
diff --git a/SRC/ctrttf.f b/SRC/ctrttf.f
index bbfa0a922b..7d1974ad9b 100644
--- a/SRC/ctrttf.f
+++ b/SRC/ctrttf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTRTTF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctrttf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctrttf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,7 +99,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup trttf
 *
 *> \par Further Details:
 *  =====================
@@ -213,6 +211,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CTRTTF( TRANSR, UPLO, N, A, LDA, ARF, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ctrttp.f b/SRC/ctrttp.f
index 92bdb23f9a..06f776be17 100644
--- a/SRC/ctrttp.f
+++ b/SRC/ctrttp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTRTTP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctrttp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctrttp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup trttp
 *
 *  =====================================================================
       SUBROUTINE CTRTTP( UPLO, N, A, LDA, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ctzrzf.f b/SRC/ctzrzf.f
index b21f092cea..7db94b02cd 100644
--- a/SRC/ctzrzf.f
+++ b/SRC/ctzrzf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CTZRZF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ctzrzf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ctzrzf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -116,7 +114,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup tzrzf
 *
 *> \par Contributors:
 *  ==================
@@ -148,6 +146,7 @@
 *>
 *  =====================================================================
       SUBROUTINE CTZRZF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -179,7 +178,8 @@ SUBROUTINE CTZRZF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -207,7 +207,7 @@ SUBROUTINE CTZRZF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
             LWKOPT = M*NB
             LWKMIN = MAX( 1, M )
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
             INFO = -7
@@ -280,7 +280,8 @@ SUBROUTINE CTZRZF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *              Form the triangular factor of the block reflector
 *              H = H(i+ib-1) . . . H(i+1) H(i)
 *
-               CALL CLARZT( 'Backward', 'Rowwise', N-M, IB, A( I, M1 ),
+               CALL CLARZT( 'Backward', 'Rowwise', N-M, IB, A( I,
+     $                      M1 ),
      $                      LDA, TAU( I ), WORK, LDWORK )
 *
 *              Apply H to A(1:i-1,i:n) from the right
@@ -301,7 +302,7 @@ SUBROUTINE CTZRZF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
       IF( MU.GT.0 )
      $   CALL CLATRZ( MU, N, N-M, A, LDA, TAU, WORK )
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/cunbdb.f b/SRC/cunbdb.f
index a41895dc8c..ee0cb2871e 100644
--- a/SRC/cunbdb.f
+++ b/SRC/cunbdb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNBDB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunbdb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunbdb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -255,7 +253,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unbdb
 *
 *> \par Further Details:
 *  =====================
@@ -281,9 +279,11 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
+      SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12,
+     $                   LDX12,
      $                   X21, LDX21, X22, LDX22, THETA, PHI, TAUP1,
      $                   TAUP2, TAUQ1, TAUQ2, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -306,8 +306,6 @@ SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
 *     .. Parameters ..
       REAL               REALONE
       PARAMETER          ( REALONE = 1.0E0 )
-      COMPLEX            ONE
-      PARAMETER          ( ONE = (1.0E0,0.0E0) )
 *     ..
 *     .. Local Scalars ..
       LOGICAL            COLMAJOR, LQUERY
@@ -315,14 +313,15 @@ SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
       REAL               Z1, Z2, Z3, Z4
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CAXPY, CLARF, CLARFGP, CSCAL, XERBLA
+      EXTERNAL           CAXPY, CLARF1F, CLARFGP, CSCAL,
+     $                   XERBLA
       EXTERNAL           CLACGV
 *
 *     ..
 *     .. External Functions ..
-      REAL               SCNRM2
+      REAL               SCNRM2, SROUNDUP_LWORK
       LOGICAL            LSAME
-      EXTERNAL           SCNRM2, LSAME
+      EXTERNAL           SCNRM2, SROUNDUP_LWORK, LSAME
 *     ..
 *     .. Intrinsic Functions
       INTRINSIC          ATAN2, COS, MAX, MIN, SIN
@@ -377,7 +376,7 @@ SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
       IF( INFO .EQ. 0 ) THEN
          LWORKOPT = M - Q
          LWORKMIN = M - Q
-         WORK(1) = LWORKOPT
+         WORK(1) = SROUNDUP_LWORK(LWORKOPT)
          IF( LWORK .LT. LWORKMIN .AND. .NOT. LQUERY ) THEN
             INFO = -21
          END IF
@@ -418,11 +417,11 @@ SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
      $                 SCNRM2( P-I+1, X11(I,I), 1 ) )
 *
             IF( P .GT. I ) THEN
-               CALL CLARFGP( P-I+1, X11(I,I), X11(I+1,I), 1, TAUP1(I) )
+               CALL CLARFGP( P-I+1, X11(I,I), X11(I+1,I), 1,
+     $                       TAUP1(I) )
             ELSE IF ( P .EQ. I ) THEN
                CALL CLARFGP( P-I+1, X11(I,I), X11(I,I), 1, TAUP1(I) )
             END IF
-            X11(I,I) = ONE
             IF ( M-P .GT. I ) THEN
                CALL CLARFGP( M-P-I+1, X21(I,I), X21(I+1,I), 1,
      $                       TAUP2(I) )
@@ -430,19 +429,20 @@ SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL CLARFGP( M-P-I+1, X21(I,I), X21(I,I), 1,
      $                       TAUP2(I) )
             END IF
-            X21(I,I) = ONE
 *
             IF ( Q .GT. I ) THEN
-               CALL CLARF( 'L', P-I+1, Q-I, X11(I,I), 1,
-     $                     CONJG(TAUP1(I)), X11(I,I+1), LDX11, WORK )
-               CALL CLARF( 'L', M-P-I+1, Q-I, X21(I,I), 1,
-     $                     CONJG(TAUP2(I)), X21(I,I+1), LDX21, WORK )
+               CALL CLARF1F( 'L', P-I+1, Q-I, X11(I,I), 1,
+     $                       CONJG(TAUP1(I)), X11(I,I+1), LDX11,
+     $                       WORK )
+               CALL CLARF1F( 'L', M-P-I+1, Q-I, X21(I,I), 1,
+     $                       CONJG(TAUP2(I)), X21(I,I+1), LDX21,
+     $                       WORK )
             END IF
             IF ( M-Q+1 .GT. I ) THEN
-               CALL CLARF( 'L', P-I+1, M-Q-I+1, X11(I,I), 1,
-     $                     CONJG(TAUP1(I)), X12(I,I), LDX12, WORK )
-               CALL CLARF( 'L', M-P-I+1, M-Q-I+1, X21(I,I), 1,
-     $                     CONJG(TAUP2(I)), X22(I,I), LDX22, WORK )
+               CALL CLARF1F( 'L', P-I+1, M-Q-I+1, X11(I,I), 1,
+     $                       CONJG(TAUP1(I)), X12(I,I), LDX12, WORK )
+               CALL CLARF1F( 'L', M-P-I+1, M-Q-I+1, X21(I,I), 1,
+     $                       CONJG(TAUP2(I)), X22(I,I), LDX22, WORK )
             END IF
 *
             IF( I .LT. Q ) THEN
@@ -451,7 +451,8 @@ SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL CAXPY( Q-I, CMPLX( Z2*Z3*COS(THETA(I)), 0.0E0 ),
      $                     X21(I,I+1), LDX21, X11(I,I+1), LDX11 )
             END IF
-            CALL CSCAL( M-Q-I+1, CMPLX( -Z1*Z4*SIN(THETA(I)), 0.0E0 ),
+            CALL CSCAL( M-Q-I+1, CMPLX( -Z1*Z4*SIN(THETA(I)),
+     $                  0.0E0 ),
      $                  X12(I,I), LDX12 )
             CALL CAXPY( M-Q-I+1, CMPLX( Z2*Z4*COS(THETA(I)), 0.0E0 ),
      $                  X22(I,I), LDX22, X12(I,I), LDX12 )
@@ -469,7 +470,6 @@ SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                   CALL CLARFGP( Q-I, X11(I,I+1), X11(I,I+2), LDX11,
      $                          TAUQ1(I) )
                END IF
-               X11(I,I+1) = ONE
             END IF
             IF ( M-Q+1 .GT. I ) THEN
                CALL CLACGV( M-Q-I+1, X12(I,I), LDX12 )
@@ -481,21 +481,20 @@ SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
      $                          TAUQ2(I) )
                END IF
             END IF
-            X12(I,I) = ONE
 *
             IF( I .LT. Q ) THEN
-               CALL CLARF( 'R', P-I, Q-I, X11(I,I+1), LDX11, TAUQ1(I),
-     $                     X11(I+1,I+1), LDX11, WORK )
-               CALL CLARF( 'R', M-P-I, Q-I, X11(I,I+1), LDX11, TAUQ1(I),
-     $                     X21(I+1,I+1), LDX21, WORK )
+               CALL CLARF1F( 'R', P-I, Q-I, X11(I,I+1), LDX11,
+     $                       TAUQ1(I), X11(I+1,I+1), LDX11, WORK )
+               CALL CLARF1F( 'R', M-P-I, Q-I, X11(I,I+1), LDX11,
+     $                       TAUQ1(I), X21(I+1,I+1), LDX21, WORK )
             END IF
             IF ( P .GT. I ) THEN
-               CALL CLARF( 'R', P-I, M-Q-I+1, X12(I,I), LDX12, TAUQ2(I),
-     $                     X12(I+1,I), LDX12, WORK )
+               CALL CLARF1F( 'R', P-I, M-Q-I+1, X12(I,I), LDX12,
+     $                       TAUQ2(I), X12(I+1,I), LDX12, WORK )
             END IF
             IF ( M-P .GT. I ) THEN
-               CALL CLARF( 'R', M-P-I, M-Q-I+1, X12(I,I), LDX12,
-     $                     TAUQ2(I), X22(I+1,I), LDX22, WORK )
+               CALL CLARF1F( 'R', M-P-I, M-Q-I+1, X12(I,I), LDX12,
+     $                       TAUQ2(I), X22(I+1,I), LDX22, WORK )
             END IF
 *
             IF( I .LT. Q )
@@ -518,15 +517,14 @@ SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL CLARFGP( M-Q-I+1, X12(I,I), X12(I,I+1), LDX12,
      $                       TAUQ2(I) )
             END IF
-            X12(I,I) = ONE
 *
             IF ( P .GT. I ) THEN
-               CALL CLARF( 'R', P-I, M-Q-I+1, X12(I,I), LDX12, TAUQ2(I),
-     $                     X12(I+1,I), LDX12, WORK )
+               CALL CLARF1F( 'R', P-I, M-Q-I+1, X12(I,I), LDX12,
+     $                       TAUQ2(I), X12(I+1,I), LDX12, WORK )
             END IF
             IF( M-P-Q .GE. 1 )
-     $         CALL CLARF( 'R', M-P-Q, M-Q-I+1, X12(I,I), LDX12,
-     $                     TAUQ2(I), X22(Q+1,I), LDX22, WORK )
+     $         CALL CLARF1F( 'R', M-P-Q, M-Q-I+1, X12(I,I), LDX12,
+     $                       TAUQ2(I), X22(Q+1,I), LDX22, WORK )
 *
             CALL CLACGV( M-Q-I+1, X12(I,I), LDX12 )
 *
@@ -541,9 +539,9 @@ SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
             CALL CLACGV( M-P-Q-I+1, X22(Q+I,P+I), LDX22 )
             CALL CLARFGP( M-P-Q-I+1, X22(Q+I,P+I), X22(Q+I,P+I+1),
      $                    LDX22, TAUQ2(P+I) )
-            X22(Q+I,P+I) = ONE
-            CALL CLARF( 'R', M-P-Q-I, M-P-Q-I+1, X22(Q+I,P+I), LDX22,
-     $                  TAUQ2(P+I), X22(Q+I+1,P+I), LDX22, WORK )
+            CALL CLARF1F( 'R', M-P-Q-I, M-P-Q-I+1, X22(Q+I,P+I),
+     $                    LDX22, TAUQ2(P+I), X22(Q+I+1,P+I), LDX22,
+     $                    WORK )
 *
             CALL CLACGV( M-P-Q-I+1, X22(Q+I,P+I), LDX22 )
 *
@@ -580,8 +578,8 @@ SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
             CALL CLACGV( P-I+1, X11(I,I), LDX11 )
             CALL CLACGV( M-P-I+1, X21(I,I), LDX21 )
 *
-            CALL CLARFGP( P-I+1, X11(I,I), X11(I,I+1), LDX11, TAUP1(I) )
-            X11(I,I) = ONE
+            CALL CLARFGP( P-I+1, X11(I,I), X11(I,I+1), LDX11,
+     $                    TAUP1(I) )
             IF ( I .EQ. M-P ) THEN
                CALL CLARFGP( M-P-I+1, X21(I,I), X21(I,I), LDX21,
      $                       TAUP2(I) )
@@ -589,16 +587,15 @@ SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL CLARFGP( M-P-I+1, X21(I,I), X21(I,I+1), LDX21,
      $                       TAUP2(I) )
             END IF
-            X21(I,I) = ONE
 *
-            CALL CLARF( 'R', Q-I, P-I+1, X11(I,I), LDX11, TAUP1(I),
-     $                  X11(I+1,I), LDX11, WORK )
-            CALL CLARF( 'R', M-Q-I+1, P-I+1, X11(I,I), LDX11, TAUP1(I),
-     $                  X12(I,I), LDX12, WORK )
-            CALL CLARF( 'R', Q-I, M-P-I+1, X21(I,I), LDX21, TAUP2(I),
-     $                  X21(I+1,I), LDX21, WORK )
-            CALL CLARF( 'R', M-Q-I+1, M-P-I+1, X21(I,I), LDX21,
-     $                  TAUP2(I), X22(I,I), LDX22, WORK )
+            CALL CLARF1F( 'R', Q-I, P-I+1, X11(I,I), LDX11, TAUP1(I),
+     $                    X11(I+1,I), LDX11, WORK )
+            CALL CLARF1F( 'R', M-Q-I+1, P-I+1, X11(I,I), LDX11,
+     $                    TAUP1(I), X12(I,I), LDX12, WORK )
+            CALL CLARF1F( 'R', Q-I, M-P-I+1, X21(I,I), LDX21,
+     $                    TAUP2(I), X21(I+1,I), LDX21, WORK )
+            CALL CLARF1F( 'R', M-Q-I+1, M-P-I+1, X21(I,I), LDX21,
+     $                    TAUP2(I), X22(I,I), LDX22, WORK )
 *
             CALL CLACGV( P-I+1, X11(I,I), LDX11 )
             CALL CLACGV( M-P-I+1, X21(I,I), LDX21 )
@@ -609,7 +606,8 @@ SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL CAXPY( Q-I, CMPLX( Z2*Z3*COS(THETA(I)), 0.0E0 ),
      $                     X21(I+1,I), 1, X11(I+1,I), 1 )
             END IF
-            CALL CSCAL( M-Q-I+1, CMPLX( -Z1*Z4*SIN(THETA(I)), 0.0E0 ),
+            CALL CSCAL( M-Q-I+1, CMPLX( -Z1*Z4*SIN(THETA(I)),
+     $                  0.0E0 ),
      $                  X12(I,I), 1 )
             CALL CAXPY( M-Q-I+1, CMPLX( Z2*Z4*COS(THETA(I)), 0.0E0 ),
      $                  X22(I,I), 1, X12(I,I), 1 )
@@ -619,24 +617,27 @@ SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
      $                  SCNRM2( M-Q-I+1, X12(I,I), 1 ) )
 *
             IF( I .LT. Q ) THEN
-               CALL CLARFGP( Q-I, X11(I+1,I), X11(I+2,I), 1, TAUQ1(I) )
-               X11(I+1,I) = ONE
+               CALL CLARFGP( Q-I, X11(I+1,I), X11(I+2,I), 1,
+     $                       TAUQ1(I) )
             END IF
-            CALL CLARFGP( M-Q-I+1, X12(I,I), X12(I+1,I), 1, TAUQ2(I) )
-            X12(I,I) = ONE
+            CALL CLARFGP( M-Q-I+1, X12(I,I), X12(I+1,I), 1,
+     $                    TAUQ2(I) )
 *
             IF( I .LT. Q ) THEN
-               CALL CLARF( 'L', Q-I, P-I, X11(I+1,I), 1,
-     $                     CONJG(TAUQ1(I)), X11(I+1,I+1), LDX11, WORK )
-               CALL CLARF( 'L', Q-I, M-P-I, X11(I+1,I), 1,
-     $                     CONJG(TAUQ1(I)), X21(I+1,I+1), LDX21, WORK )
+               CALL CLARF1F( 'L', Q-I, P-I, X11(I+1,I), 1,
+     $                       CONJG(TAUQ1(I)), X11(I+1,I+1), LDX11,
+     $                       WORK )
+               CALL CLARF1F( 'L', Q-I, M-P-I, X11(I+1,I), 1,
+     $                       CONJG(TAUQ1(I)), X21(I+1,I+1), LDX21,
+     $                       WORK )
             END IF
-            CALL CLARF( 'L', M-Q-I+1, P-I, X12(I,I), 1, CONJG(TAUQ2(I)),
-     $                  X12(I,I+1), LDX12, WORK )
+            CALL CLARF1F( 'L', M-Q-I+1, P-I, X12(I,I), 1,
+     $                    CONJG(TAUQ2(I)), X12(I,I+1), LDX12, WORK )
 
             IF ( M-P .GT. I ) THEN
-               CALL CLARF( 'L', M-Q-I+1, M-P-I, X12(I,I), 1,
-     $                     CONJG(TAUQ2(I)), X22(I,I+1), LDX22, WORK )
+               CALL CLARF1F( 'L', M-Q-I+1, M-P-I, X12(I,I), 1,
+     $                       CONJG(TAUQ2(I)), X22(I,I+1), LDX22,
+     $                       WORK )
             END IF
          END DO
 *
@@ -644,17 +645,20 @@ SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
 *
          DO I = Q + 1, P
 *
-            CALL CSCAL( M-Q-I+1, CMPLX( -Z1*Z4, 0.0E0 ), X12(I,I), 1 )
-            CALL CLARFGP( M-Q-I+1, X12(I,I), X12(I+1,I), 1, TAUQ2(I) )
-            X12(I,I) = ONE
+            CALL CSCAL( M-Q-I+1, CMPLX( -Z1*Z4, 0.0E0 ), X12(I,I),
+     $                  1 )
+            CALL CLARFGP( M-Q-I+1, X12(I,I), X12(I+1,I), 1,
+     $                    TAUQ2(I) )
 *
             IF ( P .GT. I ) THEN
-               CALL CLARF( 'L', M-Q-I+1, P-I, X12(I,I), 1,
-     $                     CONJG(TAUQ2(I)), X12(I,I+1), LDX12, WORK )
+               CALL CLARF1F( 'L', M-Q-I+1, P-I, X12(I,I), 1,
+     $                       CONJG(TAUQ2(I)), X12(I,I+1), LDX12,
+     $                       WORK )
             END IF
             IF( M-P-Q .GE. 1 )
-     $         CALL CLARF( 'L', M-Q-I+1, M-P-Q, X12(I,I), 1,
-     $                     CONJG(TAUQ2(I)), X22(I,Q+1), LDX22, WORK )
+     $         CALL CLARF1F( 'L', M-Q-I+1, M-P-Q, X12(I,I), 1,
+     $                       CONJG(TAUQ2(I)), X22(I,Q+1), LDX22,
+     $                       WORK )
 *
          END DO
 *
@@ -666,11 +670,10 @@ SUBROUTINE CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
      $                  X22(P+I,Q+I), 1 )
             CALL CLARFGP( M-P-Q-I+1, X22(P+I,Q+I), X22(P+I+1,Q+I), 1,
      $                    TAUQ2(P+I) )
-            X22(P+I,Q+I) = ONE
             IF ( M-P-Q .NE. I ) THEN
-               CALL CLARF( 'L', M-P-Q-I+1, M-P-Q-I, X22(P+I,Q+I), 1,
-     $                     CONJG(TAUQ2(P+I)), X22(P+I,Q+I+1), LDX22,
-     $                     WORK )
+               CALL CLARF1F( 'L', M-P-Q-I+1, M-P-Q-I, X22(P+I,Q+I),
+     $                       1, CONJG(TAUQ2(P+I)), X22(P+I,Q+I+1),
+     $                       LDX22, WORK )
             END IF
          END DO
 *
diff --git a/SRC/cunbdb1.f b/SRC/cunbdb1.f
index 740e38a859..08b2fd8465 100644
--- a/SRC/cunbdb1.f
+++ b/SRC/cunbdb1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNBDB1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunbdb1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunbdb1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,7 @@
 *>\verbatim
 *>
 *> CUNBDB1 simultaneously bidiagonalizes the blocks of a tall and skinny
-*> matrix X with orthonomal columns:
+*> matrix X with orthonormal columns:
 *>
 *>                            [ B11 ]
 *>      [ X11 ]   [ P1 |    ] [  0  ]
@@ -173,7 +171,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unbdb1
 *
 *> \par Further Details:
 *  =====================
@@ -197,8 +195,10 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE CUNBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
+      SUBROUTINE CUNBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    PHI,
      $                    TAUP1, TAUP2, TAUQ1, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -215,10 +215,6 @@ SUBROUTINE CUNBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *
 *  ====================================================================
 *
-*     .. Parameters ..
-      COMPLEX            ONE
-      PARAMETER          ( ONE = (1.0E0,0.0E0) )
-*     ..
 *     .. Local Scalars ..
       REAL               C, S
       INTEGER            CHILDINFO, I, ILARF, IORBDB5, LLARF, LORBDB5,
@@ -226,12 +222,13 @@ SUBROUTINE CUNBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       LOGICAL            LQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLARF, CLARFGP, CUNBDB5, CSROT, XERBLA
+      EXTERNAL           CLARF1F, CLARFGP, CUNBDB5, CSROT,
+     $                   XERBLA
       EXTERNAL           CLACGV
 *     ..
 *     .. External Functions ..
-      REAL               SCNRM2
-      EXTERNAL           SCNRM2
+      REAL               SCNRM2, SROUNDUP_LWORK
+      EXTERNAL           SCNRM2, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Function ..
       INTRINSIC          ATAN2, COS, MAX, SIN, SQRT
@@ -264,7 +261,7 @@ SUBROUTINE CUNBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
          LORBDB5 = Q-2
          LWORKOPT = MAX( ILARF+LLARF-1, IORBDB5+LORBDB5-1 )
          LWORKMIN = LWORKOPT
-         WORK(1) = LWORKOPT
+         WORK(1) = SROUNDUP_LWORK(LWORKOPT)
          IF( LWORK .LT. LWORKMIN .AND. .NOT.LQUERY ) THEN
            INFO = -14
          END IF
@@ -285,24 +282,24 @@ SUBROUTINE CUNBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
          THETA(I) = ATAN2( REAL( X21(I,I) ), REAL( X11(I,I) ) )
          C = COS( THETA(I) )
          S = SIN( THETA(I) )
-         X11(I,I) = ONE
-         X21(I,I) = ONE
-         CALL CLARF( 'L', P-I+1, Q-I, X11(I,I), 1, CONJG(TAUP1(I)),
-     $               X11(I,I+1), LDX11, WORK(ILARF) )
-         CALL CLARF( 'L', M-P-I+1, Q-I, X21(I,I), 1, CONJG(TAUP2(I)),
-     $               X21(I,I+1), LDX21, WORK(ILARF) )
+         CALL CLARF1F( 'L', P-I+1, Q-I, X11(I,I), 1, CONJG(TAUP1(I)),
+     $                 X11(I,I+1), LDX11, WORK(ILARF) )
+         CALL CLARF1F( 'L', M-P-I+1, Q-I, X21(I,I), 1,
+     $                 CONJG(TAUP2(I)), X21(I,I+1), LDX21,
+     $                 WORK(ILARF) )
 *
          IF( I .LT. Q ) THEN
             CALL CSROT( Q-I, X11(I,I+1), LDX11, X21(I,I+1), LDX21, C,
      $                  S )
             CALL CLACGV( Q-I, X21(I,I+1), LDX21 )
-            CALL CLARFGP( Q-I, X21(I,I+1), X21(I,I+2), LDX21, TAUQ1(I) )
+            CALL CLARFGP( Q-I, X21(I,I+1), X21(I,I+2), LDX21,
+     $                    TAUQ1(I) )
             S = REAL( X21(I,I+1) )
-            X21(I,I+1) = ONE
-            CALL CLARF( 'R', P-I, Q-I, X21(I,I+1), LDX21, TAUQ1(I),
-     $                  X11(I+1,I+1), LDX11, WORK(ILARF) )
-            CALL CLARF( 'R', M-P-I, Q-I, X21(I,I+1), LDX21, TAUQ1(I),
-     $                  X21(I+1,I+1), LDX21, WORK(ILARF) )
+            CALL CLARF1F( 'R', P-I, Q-I, X21(I,I+1), LDX21, TAUQ1(I),
+     $                    X11(I+1,I+1), LDX11, WORK(ILARF) )
+            CALL CLARF1F( 'R', M-P-I, Q-I, X21(I,I+1), LDX21,
+     $                    TAUQ1(I), X21(I+1,I+1), LDX21,
+     $                    WORK(ILARF) )
             CALL CLACGV( Q-I, X21(I,I+1), LDX21 )
             C = SQRT( SCNRM2( P-I, X11(I+1,I+1), 1 )**2
      $              + SCNRM2( M-P-I, X21(I+1,I+1), 1 )**2 )
diff --git a/SRC/cunbdb2.f b/SRC/cunbdb2.f
index db238f9256..337e572a0d 100644
--- a/SRC/cunbdb2.f
+++ b/SRC/cunbdb2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNBDB2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunbdb2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunbdb2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,7 @@
 *>\verbatim
 *>
 *> CUNBDB2 simultaneously bidiagonalizes the blocks of a tall and skinny
-*> matrix X with orthonomal columns:
+*> matrix X with orthonormal columns:
 *>
 *>                            [ B11 ]
 *>      [ X11 ]   [ P1 |    ] [  0  ]
@@ -122,14 +120,14 @@
 *>
 *> \param[out] TAUP1
 *> \verbatim
-*>          TAUP1 is COMPLEX array, dimension (P)
+*>          TAUP1 is COMPLEX array, dimension (P-1)
 *>           The scalar factors of the elementary reflectors that define
 *>           P1.
 *> \endverbatim
 *>
 *> \param[out] TAUP2
 *> \verbatim
-*>          TAUP2 is COMPLEX array, dimension (M-P)
+*>          TAUP2 is COMPLEX array, dimension (Q)
 *>           The scalar factors of the elementary reflectors that define
 *>           P2.
 *> \endverbatim
@@ -173,7 +171,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unbdb2
 *
 *> \par Further Details:
 *  =====================
@@ -197,8 +195,10 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE CUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
+      SUBROUTINE CUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    PHI,
      $                    TAUP1, TAUP2, TAUQ1, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -216,9 +216,8 @@ SUBROUTINE CUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *  ====================================================================
 *
 *     .. Parameters ..
-      COMPLEX            NEGONE, ONE
-      PARAMETER          ( NEGONE = (-1.0E0,0.0E0),
-     $                     ONE = (1.0E0,0.0E0) )
+      COMPLEX            NEGONE
+      PARAMETER          ( NEGONE = (-1.0E0,0.0E0) )
 *     ..
 *     .. Local Scalars ..
       REAL               C, S
@@ -227,12 +226,13 @@ SUBROUTINE CUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       LOGICAL            LQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLARF, CLARFGP, CUNBDB5, CSROT, CSCAL, CLACGV,
+      EXTERNAL           CLARF1F, CLARFGP, CUNBDB5, CSROT, CSCAL,
+     $                   CLACGV,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
-      REAL               SCNRM2
-      EXTERNAL           SCNRM2
+      REAL               SCNRM2, SROUNDUP_LWORK
+      EXTERNAL           SCNRM2, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Function ..
       INTRINSIC          ATAN2, COS, MAX, SIN, SQRT
@@ -265,7 +265,7 @@ SUBROUTINE CUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
          LORBDB5 = Q-1
          LWORKOPT = MAX( ILARF+LLARF-1, IORBDB5+LORBDB5-1 )
          LWORKMIN = LWORKOPT
-         WORK(1) = LWORKOPT
+         WORK(1) = SROUNDUP_LWORK(LWORKOPT)
          IF( LWORK .LT. LWORKMIN .AND. .NOT.LQUERY ) THEN
            INFO = -14
          END IF
@@ -288,11 +288,10 @@ SUBROUTINE CUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
          CALL CLACGV( Q-I+1, X11(I,I), LDX11 )
          CALL CLARFGP( Q-I+1, X11(I,I), X11(I,I+1), LDX11, TAUQ1(I) )
          C = REAL( X11(I,I) )
-         X11(I,I) = ONE
-         CALL CLARF( 'R', P-I, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
-     $               X11(I+1,I), LDX11, WORK(ILARF) )
-         CALL CLARF( 'R', M-P-I+1, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
-     $               X21(I,I), LDX21, WORK(ILARF) )
+         CALL CLARF1F( 'R', P-I, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
+     $                 X11(I+1,I), LDX11, WORK(ILARF) )
+         CALL CLARF1F( 'R', M-P-I+1, Q-I+1, X11(I,I), LDX11,
+     $                 TAUQ1(I), X21(I,I), LDX21, WORK(ILARF) )
          CALL CLACGV( Q-I+1, X11(I,I), LDX11 )
          S = SQRT( SCNRM2( P-I, X11(I+1,I), 1 )**2
      $           + SCNRM2( M-P-I+1, X21(I,I), 1 )**2 )
@@ -308,13 +307,13 @@ SUBROUTINE CUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
             PHI(I) = ATAN2( REAL( X11(I+1,I) ), REAL( X21(I,I) ) )
             C = COS( PHI(I) )
             S = SIN( PHI(I) )
-            X11(I+1,I) = ONE
-            CALL CLARF( 'L', P-I, Q-I, X11(I+1,I), 1, CONJG(TAUP1(I)),
-     $                  X11(I+1,I+1), LDX11, WORK(ILARF) )
+            CALL CLARF1F( 'L', P-I, Q-I, X11(I+1,I), 1,
+     $                    CONJG(TAUP1(I)), X11(I+1,I+1), LDX11,
+     $                    WORK(ILARF) )
          END IF
-         X21(I,I) = ONE
-         CALL CLARF( 'L', M-P-I+1, Q-I, X21(I,I), 1, CONJG(TAUP2(I)),
-     $               X21(I,I+1), LDX21, WORK(ILARF) )
+         CALL CLARF1F( 'L', M-P-I+1, Q-I, X21(I,I), 1,
+     $                 CONJG(TAUP2(I)), X21(I,I+1), LDX21,
+     $                 WORK(ILARF) )
 *
       END DO
 *
@@ -322,9 +321,9 @@ SUBROUTINE CUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *
       DO I = P + 1, Q
          CALL CLARFGP( M-P-I+1, X21(I,I), X21(I+1,I), 1, TAUP2(I) )
-         X21(I,I) = ONE
-         CALL CLARF( 'L', M-P-I+1, Q-I, X21(I,I), 1, CONJG(TAUP2(I)),
-     $               X21(I,I+1), LDX21, WORK(ILARF) )
+         CALL CLARF1F( 'L', M-P-I+1, Q-I, X21(I,I), 1,
+     $                 CONJG(TAUP2(I)), X21(I,I+1), LDX21,
+     $                 WORK(ILARF) )
       END DO
 *
       RETURN
diff --git a/SRC/cunbdb3.f b/SRC/cunbdb3.f
index b532bfbc8e..c03de68257 100644
--- a/SRC/cunbdb3.f
+++ b/SRC/cunbdb3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNBDB3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunbdb3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunbdb3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,7 @@
 *>\verbatim
 *>
 *> CUNBDB3 simultaneously bidiagonalizes the blocks of a tall and skinny
-*> matrix X with orthonomal columns:
+*> matrix X with orthonormal columns:
 *>
 *>                            [ B11 ]
 *>      [ X11 ]   [ P1 |    ] [  0  ]
@@ -173,7 +171,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unbdb3
 *
 *> \par Further Details:
 *  =====================
@@ -197,8 +195,10 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE CUNBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
+      SUBROUTINE CUNBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    PHI,
      $                    TAUP1, TAUP2, TAUQ1, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -215,10 +215,6 @@ SUBROUTINE CUNBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *
 *  ====================================================================
 *
-*     .. Parameters ..
-      COMPLEX            ONE
-      PARAMETER          ( ONE = (1.0E0,0.0E0) )
-*     ..
 *     .. Local Scalars ..
       REAL               C, S
       INTEGER            CHILDINFO, I, ILARF, IORBDB5, LLARF, LORBDB5,
@@ -226,11 +222,12 @@ SUBROUTINE CUNBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       LOGICAL            LQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLARF, CLARFGP, CUNBDB5, CSROT, CLACGV, XERBLA
+      EXTERNAL           CLARF1F, CLARFGP, CUNBDB5, CSROT, CLACGV,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
-      REAL               SCNRM2
-      EXTERNAL           SCNRM2
+      REAL               SCNRM2, SROUNDUP_LWORK
+      EXTERNAL           SCNRM2, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Function ..
       INTRINSIC          ATAN2, COS, MAX, SIN, SQRT
@@ -263,7 +260,7 @@ SUBROUTINE CUNBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
          LORBDB5 = Q-1
          LWORKOPT = MAX( ILARF+LLARF-1, IORBDB5+LORBDB5-1 )
          LWORKMIN = LWORKOPT
-         WORK(1) = LWORKOPT
+         WORK(1) = SROUNDUP_LWORK(LWORKOPT)
          IF( LWORK .LT. LWORKMIN .AND. .NOT.LQUERY ) THEN
            INFO = -14
          END IF
@@ -287,11 +284,10 @@ SUBROUTINE CUNBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
          CALL CLACGV( Q-I+1, X21(I,I), LDX21 )
          CALL CLARFGP( Q-I+1, X21(I,I), X21(I,I+1), LDX21, TAUQ1(I) )
          S = REAL( X21(I,I) )
-         X21(I,I) = ONE
-         CALL CLARF( 'R', P-I+1, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
-     $               X11(I,I), LDX11, WORK(ILARF) )
-         CALL CLARF( 'R', M-P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
-     $               X21(I+1,I), LDX21, WORK(ILARF) )
+         CALL CLARF1F( 'R', P-I+1, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
+     $                 X11(I,I), LDX11, WORK(ILARF) )
+         CALL CLARF1F( 'R', M-P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
+     $                 X21(I+1,I), LDX21, WORK(ILARF) )
          CALL CLACGV( Q-I+1, X21(I,I), LDX21 )
          C = SQRT( SCNRM2( P-I+1, X11(I,I), 1 )**2
      $           + SCNRM2( M-P-I, X21(I+1,I), 1 )**2 )
@@ -302,17 +298,17 @@ SUBROUTINE CUNBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
      $                 WORK(IORBDB5), LORBDB5, CHILDINFO )
          CALL CLARFGP( P-I+1, X11(I,I), X11(I+1,I), 1, TAUP1(I) )
          IF( I .LT. M-P ) THEN
-            CALL CLARFGP( M-P-I, X21(I+1,I), X21(I+2,I), 1, TAUP2(I) )
+            CALL CLARFGP( M-P-I, X21(I+1,I), X21(I+2,I), 1,
+     $                    TAUP2(I) )
             PHI(I) = ATAN2( REAL( X21(I+1,I) ), REAL( X11(I,I) ) )
             C = COS( PHI(I) )
             S = SIN( PHI(I) )
-            X21(I+1,I) = ONE
-            CALL CLARF( 'L', M-P-I, Q-I, X21(I+1,I), 1, CONJG(TAUP2(I)),
-     $                  X21(I+1,I+1), LDX21, WORK(ILARF) )
+            CALL CLARF1F( 'L', M-P-I, Q-I, X21(I+1,I), 1,
+     $                    CONJG(TAUP2(I)), X21(I+1,I+1), LDX21,
+     $                    WORK(ILARF) )
          END IF
-         X11(I,I) = ONE
-         CALL CLARF( 'L', P-I+1, Q-I, X11(I,I), 1, CONJG(TAUP1(I)),
-     $               X11(I,I+1), LDX11, WORK(ILARF) )
+         CALL CLARF1F( 'L', P-I+1, Q-I, X11(I,I), 1, CONJG(TAUP1(I)),
+     $                 X11(I,I+1), LDX11, WORK(ILARF) )
 *
       END DO
 *
@@ -320,9 +316,8 @@ SUBROUTINE CUNBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *
       DO I = M-P + 1, Q
          CALL CLARFGP( P-I+1, X11(I,I), X11(I+1,I), 1, TAUP1(I) )
-         X11(I,I) = ONE
-         CALL CLARF( 'L', P-I+1, Q-I, X11(I,I), 1, CONJG(TAUP1(I)),
-     $               X11(I,I+1), LDX11, WORK(ILARF) )
+         CALL CLARF1F( 'L', P-I+1, Q-I, X11(I,I), 1, CONJG(TAUP1(I)),
+     $                 X11(I,I+1), LDX11, WORK(ILARF) )
       END DO
 *
       RETURN
diff --git a/SRC/cunbdb4.f b/SRC/cunbdb4.f
index e6afd89c30..16e71860c1 100644
--- a/SRC/cunbdb4.f
+++ b/SRC/cunbdb4.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNBDB4 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunbdb4.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunbdb4.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -38,7 +36,7 @@
 *>\verbatim
 *>
 *> CUNBDB4 simultaneously bidiagonalizes the blocks of a tall and skinny
-*> matrix X with orthonomal columns:
+*> matrix X with orthonormal columns:
 *>
 *>                            [ B11 ]
 *>      [ X11 ]   [ P1 |    ] [  0  ]
@@ -124,14 +122,14 @@
 *>
 *> \param[out] TAUP1
 *> \verbatim
-*>          TAUP1 is COMPLEX array, dimension (P)
+*>          TAUP1 is COMPLEX array, dimension (M-Q)
 *>           The scalar factors of the elementary reflectors that define
 *>           P1.
 *> \endverbatim
 *>
 *> \param[out] TAUP2
 *> \verbatim
-*>          TAUP2 is COMPLEX array, dimension (M-P)
+*>          TAUP2 is COMPLEX array, dimension (M-Q)
 *>           The scalar factors of the elementary reflectors that define
 *>           P2.
 *> \endverbatim
@@ -183,7 +181,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unbdb4
 *
 *> \par Further Details:
 *  =====================
@@ -207,9 +205,11 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE CUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
+      SUBROUTINE CUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    PHI,
      $                    TAUP1, TAUP2, TAUQ1, PHANTOM, WORK, LWORK,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -227,8 +227,8 @@ SUBROUTINE CUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *  ====================================================================
 *
 *     .. Parameters ..
-      COMPLEX            NEGONE, ONE, ZERO
-      PARAMETER          ( NEGONE = (-1.0E0,0.0E0), ONE = (1.0E0,0.0E0),
+      COMPLEX            NEGONE, ZERO
+      PARAMETER          ( NEGONE = (-1.0E0,0.0E0),
      $                     ZERO = (0.0E0,0.0E0) )
 *     ..
 *     .. Local Scalars ..
@@ -238,12 +238,13 @@ SUBROUTINE CUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       LOGICAL            LQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLARF, CLARFGP, CUNBDB5, CSROT, CSCAL, CLACGV,
+      EXTERNAL           CLARF1F, CLARFGP, CUNBDB5, CSROT, CSCAL,
+     $                   CLACGV,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
-      REAL               SCNRM2
-      EXTERNAL           SCNRM2
+      REAL               SCNRM2, SROUNDUP_LWORK
+      EXTERNAL           SCNRM2, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Function ..
       INTRINSIC          ATAN2, COS, MAX, SIN, SQRT
@@ -277,7 +278,7 @@ SUBROUTINE CUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
          LWORKOPT = ILARF + LLARF - 1
          LWORKOPT = MAX( LWORKOPT, IORBDB5 + LORBDB5 - 1 )
          LWORKMIN = LWORKOPT
-         WORK(1) = LWORKOPT
+         WORK(1) = SROUNDUP_LWORK(LWORKOPT)
          IF( LWORK .LT. LWORKMIN .AND. .NOT.LQUERY ) THEN
            INFO = -14
          END IF
@@ -302,44 +303,43 @@ SUBROUTINE CUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
      $                    LORBDB5, CHILDINFO )
             CALL CSCAL( P, NEGONE, PHANTOM(1), 1 )
             CALL CLARFGP( P, PHANTOM(1), PHANTOM(2), 1, TAUP1(1) )
-            CALL CLARFGP( M-P, PHANTOM(P+1), PHANTOM(P+2), 1, TAUP2(1) )
+            CALL CLARFGP( M-P, PHANTOM(P+1), PHANTOM(P+2), 1,
+     $                    TAUP2(1) )
             THETA(I) = ATAN2( REAL( PHANTOM(1) ), REAL( PHANTOM(P+1) ) )
             C = COS( THETA(I) )
             S = SIN( THETA(I) )
-            PHANTOM(1) = ONE
-            PHANTOM(P+1) = ONE
-            CALL CLARF( 'L', P, Q, PHANTOM(1), 1, CONJG(TAUP1(1)), X11,
-     $                  LDX11, WORK(ILARF) )
-            CALL CLARF( 'L', M-P, Q, PHANTOM(P+1), 1, CONJG(TAUP2(1)),
-     $                  X21, LDX21, WORK(ILARF) )
+            CALL CLARF1F( 'L', P, Q, PHANTOM(1), 1, CONJG(TAUP1(1)),
+     $                    X11, LDX11, WORK(ILARF) )
+            CALL CLARF1F( 'L', M-P, Q, PHANTOM(P+1), 1,
+     $                    CONJG(TAUP2(1)), X21, LDX21, WORK(ILARF) )
          ELSE
             CALL CUNBDB5( P-I+1, M-P-I+1, Q-I+1, X11(I,I-1), 1,
      $                    X21(I,I-1), 1, X11(I,I), LDX11, X21(I,I),
      $                    LDX21, WORK(IORBDB5), LORBDB5, CHILDINFO )
             CALL CSCAL( P-I+1, NEGONE, X11(I,I-1), 1 )
-            CALL CLARFGP( P-I+1, X11(I,I-1), X11(I+1,I-1), 1, TAUP1(I) )
+            CALL CLARFGP( P-I+1, X11(I,I-1), X11(I+1,I-1), 1,
+     $                    TAUP1(I) )
             CALL CLARFGP( M-P-I+1, X21(I,I-1), X21(I+1,I-1), 1,
      $                    TAUP2(I) )
             THETA(I) = ATAN2( REAL( X11(I,I-1) ), REAL( X21(I,I-1) ) )
             C = COS( THETA(I) )
             S = SIN( THETA(I) )
-            X11(I,I-1) = ONE
-            X21(I,I-1) = ONE
-            CALL CLARF( 'L', P-I+1, Q-I+1, X11(I,I-1), 1,
-     $                  CONJG(TAUP1(I)), X11(I,I), LDX11, WORK(ILARF) )
-            CALL CLARF( 'L', M-P-I+1, Q-I+1, X21(I,I-1), 1,
-     $                  CONJG(TAUP2(I)), X21(I,I), LDX21, WORK(ILARF) )
+            CALL CLARF1F( 'L', P-I+1, Q-I+1, X11(I,I-1), 1,
+     $                    CONJG(TAUP1(I)), X11(I,I), LDX11,
+     $                    WORK(ILARF) )
+            CALL CLARF1F( 'L', M-P-I+1, Q-I+1, X21(I,I-1), 1,
+     $                    CONJG(TAUP2(I)), X21(I,I), LDX21,
+     $                    WORK(ILARF) )
          END IF
 *
          CALL CSROT( Q-I+1, X11(I,I), LDX11, X21(I,I), LDX21, S, -C )
          CALL CLACGV( Q-I+1, X21(I,I), LDX21 )
          CALL CLARFGP( Q-I+1, X21(I,I), X21(I,I+1), LDX21, TAUQ1(I) )
          C = REAL( X21(I,I) )
-         X21(I,I) = ONE
-         CALL CLARF( 'R', P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
-     $               X11(I+1,I), LDX11, WORK(ILARF) )
-         CALL CLARF( 'R', M-P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
-     $               X21(I+1,I), LDX21, WORK(ILARF) )
+         CALL CLARF1F( 'R', P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
+     $                 X11(I+1,I), LDX11, WORK(ILARF) )
+         CALL CLARF1F( 'R', M-P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
+     $                 X21(I+1,I), LDX21, WORK(ILARF) )
          CALL CLACGV( Q-I+1, X21(I,I), LDX21 )
          IF( I .LT. M-Q ) THEN
             S = SQRT( SCNRM2( P-I, X11(I+1,I), 1 )**2
@@ -354,11 +354,10 @@ SUBROUTINE CUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       DO I = M - Q + 1, P
          CALL CLACGV( Q-I+1, X11(I,I), LDX11 )
          CALL CLARFGP( Q-I+1, X11(I,I), X11(I,I+1), LDX11, TAUQ1(I) )
-         X11(I,I) = ONE
-         CALL CLARF( 'R', P-I, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
-     $               X11(I+1,I), LDX11, WORK(ILARF) )
-         CALL CLARF( 'R', Q-P, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
-     $               X21(M-Q+1,I), LDX21, WORK(ILARF) )
+         CALL CLARF1F( 'R', P-I, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
+     $                 X11(I+1,I), LDX11, WORK(ILARF) )
+         CALL CLARF1F( 'R', Q-P, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
+     $                 X21(M-Q+1,I), LDX21, WORK(ILARF) )
          CALL CLACGV( Q-I+1, X11(I,I), LDX11 )
       END DO
 *
@@ -366,11 +365,12 @@ SUBROUTINE CUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *
       DO I = P + 1, Q
          CALL CLACGV( Q-I+1, X21(M-Q+I-P,I), LDX21 )
-         CALL CLARFGP( Q-I+1, X21(M-Q+I-P,I), X21(M-Q+I-P,I+1), LDX21,
+         CALL CLARFGP( Q-I+1, X21(M-Q+I-P,I), X21(M-Q+I-P,I+1),
+     $                 LDX21,
      $                 TAUQ1(I) )
-         X21(M-Q+I-P,I) = ONE
-         CALL CLARF( 'R', Q-I, Q-I+1, X21(M-Q+I-P,I), LDX21, TAUQ1(I),
-     $               X21(M-Q+I-P+1,I), LDX21, WORK(ILARF) )
+         CALL CLARF1F( 'R', Q-I, Q-I+1, X21(M-Q+I-P,I), LDX21,
+     $                 TAUQ1(I), X21(M-Q+I-P+1,I), LDX21,
+     $                 WORK(ILARF) )
          CALL CLACGV( Q-I+1, X21(M-Q+I-P,I), LDX21 )
       END DO
 *
diff --git a/SRC/cunbdb5.f b/SRC/cunbdb5.f
index d2ff4e7000..067c65756d 100644
--- a/SRC/cunbdb5.f
+++ b/SRC/cunbdb5.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNBDB5 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunbdb5.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunbdb5.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -148,11 +146,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unbdb5
 *
 *  =====================================================================
-      SUBROUTINE CUNBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
+      SUBROUTINE CUNBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1,
+     $                    Q2,
      $                    LDQ2, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -169,18 +169,21 @@ SUBROUTINE CUNBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
 *  =====================================================================
 *
 *     .. Parameters ..
+      REAL               REALZERO
+      PARAMETER          ( REALZERO = 0.0E0 )
       COMPLEX            ONE, ZERO
       PARAMETER          ( ONE = (1.0E0,0.0E0), ZERO = (0.0E0,0.0E0) )
 *     ..
 *     .. Local Scalars ..
       INTEGER            CHILDINFO, I, J
+      REAL               EPS, NORM, SCL, SSQ
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CUNBDB6, XERBLA
+      EXTERNAL           CLASSQ, CUNBDB6, CSCAL, XERBLA
 *     ..
 *     .. External Functions ..
-      REAL               SCNRM2
-      EXTERNAL           SCNRM2
+      REAL               SLAMCH, SCNRM2
+      EXTERNAL           SLAMCH, SCNRM2
 *     ..
 *     .. Intrinsic Function ..
       INTRINSIC          MAX
@@ -213,16 +216,33 @@ SUBROUTINE CUNBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
          RETURN
       END IF
 *
-*     Project X onto the orthogonal complement of Q
+      EPS = SLAMCH( 'Precision' )
 *
-      CALL CUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2, LDQ2,
-     $              WORK, LWORK, CHILDINFO )
+*     Project X onto the orthogonal complement of Q if X is nonzero
 *
-*     If the projection is nonzero, then return
+      SCL = REALZERO
+      SSQ = REALZERO
+      CALL CLASSQ( M1, X1, INCX1, SCL, SSQ )
+      CALL CLASSQ( M2, X2, INCX2, SCL, SSQ )
+      NORM = SCL * SQRT( SSQ )
 *
-      IF( SCNRM2(M1,X1,INCX1) .NE. ZERO
-     $    .OR. SCNRM2(M2,X2,INCX2) .NE. ZERO ) THEN
-         RETURN
+      IF( NORM .GT. REAL( N ) * EPS ) THEN
+*        Scale vector to unit norm to avoid problems in the caller code.
+*        Computing the reciprocal is undesirable but
+*         * xLASCL cannot be used because of the vector increments and
+*         * the round-off error has a negligible impact on
+*           orthogonalization.
+         CALL CSCAL( M1, ONE / NORM, X1, INCX1 )
+         CALL CSCAL( M2, ONE / NORM, X2, INCX2 )
+         CALL CUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
+     $              LDQ2, WORK, LWORK, CHILDINFO )
+*
+*        If the projection is nonzero, then return
+*
+         IF( SCNRM2(M1,X1,INCX1) .NE. REALZERO
+     $       .OR. SCNRM2(M2,X2,INCX2) .NE. REALZERO ) THEN
+            RETURN
+         END IF
       END IF
 *
 *     Project each standard basis vector e_1,...,e_M1 in turn, stopping
@@ -238,8 +258,8 @@ SUBROUTINE CUNBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
          END DO
          CALL CUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
      $                 LDQ2, WORK, LWORK, CHILDINFO )
-         IF( SCNRM2(M1,X1,INCX1) .NE. ZERO
-     $       .OR. SCNRM2(M2,X2,INCX2) .NE. ZERO ) THEN
+         IF( SCNRM2(M1,X1,INCX1) .NE. REALZERO
+     $       .OR. SCNRM2(M2,X2,INCX2) .NE. REALZERO ) THEN
             RETURN
          END IF
       END DO
@@ -257,8 +277,8 @@ SUBROUTINE CUNBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
          X2(I) = ONE
          CALL CUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
      $                 LDQ2, WORK, LWORK, CHILDINFO )
-         IF( SCNRM2(M1,X1,INCX1) .NE. ZERO
-     $       .OR. SCNRM2(M2,X2,INCX2) .NE. ZERO ) THEN
+         IF( SCNRM2(M1,X1,INCX1) .NE. REALZERO
+     $       .OR. SCNRM2(M2,X2,INCX2) .NE. REALZERO ) THEN
             RETURN
          END IF
       END DO
diff --git a/SRC/cunbdb6.f b/SRC/cunbdb6.f
index 7acc99cb8b..0ce344390b 100644
--- a/SRC/cunbdb6.f
+++ b/SRC/cunbdb6.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNBDB6 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunbdb6.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunbdb6.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -41,10 +39,15 @@
 *> with respect to the columns of
 *>      Q = [ Q1 ] .
 *>          [ Q2 ]
-*> The columns of Q must be orthonormal.
+*> The columns of Q must be orthonormal. The orthogonalized vector will
+*> be zero if and only if it lies entirely in the range of Q.
 *>
-*> If the projection is zero according to Kahan's "twice is enough"
-*> criterion, then the zero vector is returned.
+*> The projection is computed with at most two iterations of the
+*> classical Gram-Schmidt algorithm, see
+*> * L. Giraud, J. Langou, M. Rozložník. "On the round-off error
+*>   analysis of the Gram-Schmidt algorithm with reorthogonalization."
+*>   2002. CERFACS Technical Report No. TR/PA/02/33. URL:
+*>   https://www.cerfacs.fr/algor/reports/2002/TR_PA_02_33.pdf
 *>
 *>\endverbatim
 *
@@ -146,11 +149,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unbdb6
 *
 *  =====================================================================
-      SUBROUTINE CUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
+      SUBROUTINE CUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1,
+     $                    Q2,
      $                    LDQ2, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -167,16 +172,19 @@ SUBROUTINE CUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
 *  =====================================================================
 *
 *     .. Parameters ..
-      REAL               ALPHASQ, REALONE, REALZERO
-      PARAMETER          ( ALPHASQ = 0.01E0, REALONE = 1.0E0,
+      REAL               ALPHA, REALONE, REALZERO
+      PARAMETER          ( ALPHA = 0.83E0, REALONE = 1.0E0,
      $                     REALZERO = 0.0E0 )
       COMPLEX            NEGONE, ONE, ZERO
       PARAMETER          ( NEGONE = (-1.0E0,0.0E0), ONE = (1.0E0,0.0E0),
      $                     ZERO = (0.0E0,0.0E0) )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I
-      REAL               NORMSQ1, NORMSQ2, SCL1, SCL2, SSQ1, SSQ2
+      INTEGER            I, IX
+      REAL               EPS, NORM, NORM_NEW, SCL, SSQ
+*     ..
+*     .. External Functions ..
+      REAL               SLAMCH
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CGEMV, CLASSQ, XERBLA
@@ -211,55 +219,63 @@ SUBROUTINE CUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
          CALL XERBLA( 'CUNBDB6', -INFO )
          RETURN
       END IF
+*
+      EPS = SLAMCH( 'Precision' )
+*
+*     Compute the Euclidean norm of X
+*
+      SCL = REALZERO
+      SSQ = REALZERO
+      CALL CLASSQ( M1, X1, INCX1, SCL, SSQ )
+      CALL CLASSQ( M2, X2, INCX2, SCL, SSQ )
+      NORM = SCL * SQRT( SSQ )
 *
 *     First, project X onto the orthogonal complement of Q's column
 *     space
-*
-      SCL1 = REALZERO
-      SSQ1 = REALONE
-      CALL CLASSQ( M1, X1, INCX1, SCL1, SSQ1 )
-      SCL2 = REALZERO
-      SSQ2 = REALONE
-      CALL CLASSQ( M2, X2, INCX2, SCL2, SSQ2 )
-      NORMSQ1 = SCL1**2*SSQ1 + SCL2**2*SSQ2
 *
       IF( M1 .EQ. 0 ) THEN
          DO I = 1, N
             WORK(I) = ZERO
          END DO
       ELSE
-         CALL CGEMV( 'C', M1, N, ONE, Q1, LDQ1, X1, INCX1, ZERO, WORK,
+         CALL CGEMV( 'C', M1, N, ONE, Q1, LDQ1, X1, INCX1, ZERO,
+     $               WORK,
      $               1 )
       END IF
 *
-      CALL CGEMV( 'C', M2, N, ONE, Q2, LDQ2, X2, INCX2, ONE, WORK, 1 )
+      CALL CGEMV( 'C', M2, N, ONE, Q2, LDQ2, X2, INCX2, ONE, WORK,
+     $            1 )
 *
       CALL CGEMV( 'N', M1, N, NEGONE, Q1, LDQ1, WORK, 1, ONE, X1,
      $            INCX1 )
       CALL CGEMV( 'N', M2, N, NEGONE, Q2, LDQ2, WORK, 1, ONE, X2,
      $            INCX2 )
 *
-      SCL1 = REALZERO
-      SSQ1 = REALONE
-      CALL CLASSQ( M1, X1, INCX1, SCL1, SSQ1 )
-      SCL2 = REALZERO
-      SSQ2 = REALONE
-      CALL CLASSQ( M2, X2, INCX2, SCL2, SSQ2 )
-      NORMSQ2 = SCL1**2*SSQ1 + SCL2**2*SSQ2
+      SCL = REALZERO
+      SSQ = REALZERO
+      CALL CLASSQ( M1, X1, INCX1, SCL, SSQ )
+      CALL CLASSQ( M2, X2, INCX2, SCL, SSQ )
+      NORM_NEW = SCL * SQRT(SSQ)
 *
 *     If projection is sufficiently large in norm, then stop.
 *     If projection is zero, then stop.
 *     Otherwise, project again.
 *
-      IF( NORMSQ2 .GE. ALPHASQ*NORMSQ1 ) THEN
+      IF( NORM_NEW .GE. ALPHA * NORM ) THEN
          RETURN
       END IF
 *
-      IF( NORMSQ2 .EQ. ZERO ) THEN
+      IF( NORM_NEW .LE. REAL( N ) * EPS * NORM ) THEN
+         DO IX = 1, 1 + (M1-1)*INCX1, INCX1
+           X1( IX ) = ZERO
+         END DO
+         DO IX = 1, 1 + (M2-1)*INCX2, INCX2
+           X2( IX ) = ZERO
+         END DO
          RETURN
       END IF
 *
-      NORMSQ1 = NORMSQ2
+      NORM = NORM_NEW
 *
       DO I = 1, N
          WORK(I) = ZERO
@@ -270,35 +286,35 @@ SUBROUTINE CUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
             WORK(I) = ZERO
          END DO
       ELSE
-         CALL CGEMV( 'C', M1, N, ONE, Q1, LDQ1, X1, INCX1, ZERO, WORK,
+         CALL CGEMV( 'C', M1, N, ONE, Q1, LDQ1, X1, INCX1, ZERO,
+     $               WORK,
      $               1 )
       END IF
 *
-      CALL CGEMV( 'C', M2, N, ONE, Q2, LDQ2, X2, INCX2, ONE, WORK, 1 )
+      CALL CGEMV( 'C', M2, N, ONE, Q2, LDQ2, X2, INCX2, ONE, WORK,
+     $            1 )
 *
       CALL CGEMV( 'N', M1, N, NEGONE, Q1, LDQ1, WORK, 1, ONE, X1,
      $            INCX1 )
       CALL CGEMV( 'N', M2, N, NEGONE, Q2, LDQ2, WORK, 1, ONE, X2,
      $            INCX2 )
 *
-      SCL1 = REALZERO
-      SSQ1 = REALONE
-      CALL CLASSQ( M1, X1, INCX1, SCL1, SSQ1 )
-      SCL2 = REALZERO
-      SSQ2 = REALONE
-      CALL CLASSQ( M1, X1, INCX1, SCL1, SSQ1 )
-      NORMSQ2 = SCL1**2*SSQ1 + SCL2**2*SSQ2
+      SCL = REALZERO
+      SSQ = REALZERO
+      CALL CLASSQ( M1, X1, INCX1, SCL, SSQ )
+      CALL CLASSQ( M2, X2, INCX2, SCL, SSQ )
+      NORM_NEW = SCL * SQRT(SSQ)
 *
 *     If second projection is sufficiently large in norm, then do
 *     nothing more. Alternatively, if it shrunk significantly, then
 *     truncate it to zero.
 *
-      IF( NORMSQ2 .LT. ALPHASQ*NORMSQ1 ) THEN
-         DO I = 1, M1
-            X1(I) = ZERO
+      IF( NORM_NEW .LT. ALPHA * NORM ) THEN
+         DO IX = 1, 1 + (M1-1)*INCX1, INCX1
+            X1(IX) = ZERO
          END DO
-         DO I = 1, M2
-            X2(I) = ZERO
+         DO IX = 1, 1 + (M2-1)*INCX2, INCX2
+            X2(IX) = ZERO
          END DO
       END IF
 *
@@ -307,4 +323,3 @@ SUBROUTINE CUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
 *     End of CUNBDB6
 *
       END
-
diff --git a/SRC/cuncsd.f b/SRC/cuncsd.f
index 3653a396a5..27d1212275 100644
--- a/SRC/cuncsd.f
+++ b/SRC/cuncsd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNCSD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cuncsd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cuncsd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -308,15 +306,17 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup uncsd
 *
 *  =====================================================================
-      RECURSIVE SUBROUTINE CUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
+      RECURSIVE SUBROUTINE CUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T,
+     $                             TRANS,
      $                             SIGNS, M, P, Q, X11, LDX11, X12,
      $                             LDX12, X21, LDX21, X22, LDX22, THETA,
      $                             U1, LDU1, U2, LDU2, V1T, LDV1T, V2T,
      $                             LDV2T, WORK, LWORK, RWORK, LRWORK,
      $                             IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -360,12 +360,14 @@ RECURSIVE SUBROUTINE CUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
       LOGICAL            LRQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, CBBCSD, CLACPY, CLAPMR, CLAPMT,
+      EXTERNAL           XERBLA, CBBCSD, CLACPY, CLAPMR,
+     $                   CLAPMT,
      $                   CUNBDB, CUNGLQ, CUNGQR
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions
       INTRINSIC          INT, MAX, MIN
@@ -428,7 +430,8 @@ RECURSIVE SUBROUTINE CUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
          ELSE
             SIGNST = 'D'
          END IF
-         CALL CUNCSD( JOBV1T, JOBV2T, JOBU1, JOBU2, TRANST, SIGNST, M,
+         CALL CUNCSD( JOBV1T, JOBV2T, JOBU1, JOBU2, TRANST, SIGNST,
+     $                M,
      $                Q, P, X11, LDX11, X21, LDX21, X12, LDX12, X22,
      $                LDX22, THETA, V1T, LDV1T, V2T, LDV2T, U1, LDU1,
      $                U2, LDU2, WORK, LWORK, RWORK, LRWORK, IWORK,
@@ -476,7 +479,7 @@ RECURSIVE SUBROUTINE CUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
          LBBCSDWORKMIN = LBBCSDWORKOPT
          LRWORKOPT = IBBCSD + LBBCSDWORKOPT - 1
          LRWORKMIN = IBBCSD + LBBCSDWORKMIN - 1
-         RWORK(1) = LRWORKOPT
+         RWORK(1) = REAL( LRWORKOPT )
 *
 *        Complex workspace
 *
@@ -504,7 +507,8 @@ RECURSIVE SUBROUTINE CUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
      $              IORBDB + LORBDBWORKOPT ) - 1
          LWORKMIN = MAX( IORGQR + LORGQRWORKMIN, IORGLQ + LORGLQWORKMIN,
      $              IORBDB + LORBDBWORKMIN ) - 1
-         WORK(1) = MAX(LWORKOPT,LWORKMIN)
+         LWORKOPT = MAX(LWORKOPT,LWORKMIN)
+         WORK(1) = SROUNDUP_LWORK(LWORKOPT)
 *
          IF( LWORK .LT. LWORKMIN
      $       .AND. .NOT. ( LQUERY .OR. LRQUERY ) ) THEN
@@ -531,7 +535,8 @@ RECURSIVE SUBROUTINE CUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
 *
 *     Transform to bidiagonal block form
 *
-      CALL CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12, X21,
+      CALL CUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
+     $             X21,
      $             LDX21, X22, LDX22, THETA, RWORK(IPHI), WORK(ITAUP1),
      $             WORK(ITAUP2), WORK(ITAUQ1), WORK(ITAUQ2),
      $             WORK(IORBDB), LORBDBWORK, CHILDINFO )
@@ -541,7 +546,8 @@ RECURSIVE SUBROUTINE CUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
       IF( COLMAJOR ) THEN
          IF( WANTU1 .AND. P .GT. 0 ) THEN
             CALL CLACPY( 'L', P, Q, X11, LDX11, U1, LDU1 )
-            CALL CUNGQR( P, P, Q, U1, LDU1, WORK(ITAUP1), WORK(IORGQR),
+            CALL CUNGQR( P, P, Q, U1, LDU1, WORK(ITAUP1),
+     $                   WORK(IORGQR),
      $                   LORGQRWORK, INFO)
          END IF
          IF( WANTU2 .AND. M-P .GT. 0 ) THEN
@@ -557,7 +563,8 @@ RECURSIVE SUBROUTINE CUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
                V1T(1,J) = ZERO
                V1T(J,1) = ZERO
             END DO
-            CALL CUNGLQ( Q-1, Q-1, Q-1, V1T(2,2), LDV1T, WORK(ITAUQ1),
+            CALL CUNGLQ( Q-1, Q-1, Q-1, V1T(2,2), LDV1T,
+     $                   WORK(ITAUQ1),
      $                   WORK(IORGLQ), LORGLQWORK, INFO )
          END IF
          IF( WANTV2T .AND. M-Q .GT. 0 ) THEN
@@ -574,7 +581,8 @@ RECURSIVE SUBROUTINE CUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
       ELSE
          IF( WANTU1 .AND. P .GT. 0 ) THEN
             CALL CLACPY( 'U', Q, P, X11, LDX11, U1, LDU1 )
-            CALL CUNGLQ( P, P, Q, U1, LDU1, WORK(ITAUP1), WORK(IORGLQ),
+            CALL CUNGLQ( P, P, Q, U1, LDU1, WORK(ITAUP1),
+     $                   WORK(IORGLQ),
      $                   LORGLQWORK, INFO)
          END IF
          IF( WANTU2 .AND. M-P .GT. 0 ) THEN
@@ -590,7 +598,8 @@ RECURSIVE SUBROUTINE CUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
                V1T(1,J) = ZERO
                V1T(J,1) = ZERO
             END DO
-            CALL CUNGQR( Q-1, Q-1, Q-1, V1T(2,2), LDV1T, WORK(ITAUQ1),
+            CALL CUNGQR( Q-1, Q-1, Q-1, V1T(2,2), LDV1T,
+     $                   WORK(ITAUQ1),
      $                   WORK(IORGQR), LORGQRWORK, INFO )
          END IF
          IF( WANTV2T .AND. M-Q .GT. 0 ) THEN
@@ -608,7 +617,8 @@ RECURSIVE SUBROUTINE CUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
 *
 *     Compute the CSD of the matrix in bidiagonal-block form
 *
-      CALL CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q, THETA,
+      CALL CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
+     $             THETA,
      $             RWORK(IPHI), U1, LDU1, U2, LDU2, V1T, LDV1T, V2T,
      $             LDV2T, RWORK(IB11D), RWORK(IB11E), RWORK(IB12D),
      $             RWORK(IB12E), RWORK(IB21D), RWORK(IB21E),
diff --git a/SRC/cuncsd2by1.f b/SRC/cuncsd2by1.f
index 84129473de..521ec099fd 100644
--- a/SRC/cuncsd2by1.f
+++ b/SRC/cuncsd2by1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNCSD2BY1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cuncsd2by1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cuncsd2by1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -218,7 +216,7 @@
 *>          and RWORK array, respectively, and no error message related
 *>          to LWORK or LRWORK is issued by XERBLA.
 *> \endverbatim
-*
+*>
 *> \param[out] IWORK
 *> \verbatim
 *>          IWORK is INTEGER array, dimension (M-MIN(P,M-P,Q,M-Q))
@@ -247,13 +245,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup uncsd2by1
 *
 *  =====================================================================
-      SUBROUTINE CUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
+      SUBROUTINE CUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11,
+     $                       LDX11,
      $                       X21, LDX21, THETA, U1, LDU1, U2, LDU2, V1T,
      $                       LDV1T, WORK, LWORK, RWORK, LRWORK, IWORK,
      $                       INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -293,13 +293,15 @@ SUBROUTINE CUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
       COMPLEX            CDUM( 1, 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CBBCSD, CCOPY, CLACPY, CLAPMR, CLAPMT, CUNBDB1,
+      EXTERNAL           CBBCSD, CCOPY, CLACPY, CLAPMR, CLAPMT,
+     $                   CUNBDB1,
      $                   CUNBDB2, CUNBDB3, CUNBDB4, CUNGLQ, CUNGQR,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Function ..
       INTRINSIC          INT, MAX, MIN
@@ -411,17 +413,20 @@ SUBROUTINE CUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
                LORGLQMIN = MAX( LORGLQMIN, Q-1 )
                LORGLQOPT = MAX( LORGLQOPT, INT( WORK(1) ) )
             END IF
-            CALL CBBCSD( JOBU1, JOBU2, JOBV1T, 'N', 'N', M, P, Q, THETA,
+            CALL CBBCSD( JOBU1, JOBU2, JOBV1T, 'N', 'N', M, P, Q,
+     $                   THETA,
      $                   DUM(1), U1, LDU1, U2, LDU2, V1T, LDV1T, CDUM,
      $                   1, DUM, DUM, DUM, DUM, DUM, DUM, DUM, DUM,
      $                   RWORK(1), -1, CHILDINFO )
             LBBCSD = INT( RWORK(1) )
          ELSE IF( R .EQ. P ) THEN
-            CALL CUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, DUM,
+            CALL CUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    DUM,
      $                    CDUM, CDUM, CDUM, WORK(1), -1, CHILDINFO )
             LORBDB = INT( WORK(1) )
             IF( WANTU1 .AND. P .GT. 0 ) THEN
-               CALL CUNGQR( P-1, P-1, P-1, U1(2,2), LDU1, CDUM, WORK(1),
+               CALL CUNGQR( P-1, P-1, P-1, U1(2,2), LDU1, CDUM,
+     $                      WORK(1),
      $                      -1, CHILDINFO )
                LORGQRMIN = MAX( LORGQRMIN, P-1 )
                LORGQROPT = MAX( LORGQROPT, INT( WORK(1) ) )
@@ -438,13 +443,15 @@ SUBROUTINE CUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
                LORGLQMIN = MAX( LORGLQMIN, Q )
                LORGLQOPT = MAX( LORGLQOPT, INT( WORK(1) ) )
             END IF
-            CALL CBBCSD( JOBV1T, 'N', JOBU1, JOBU2, 'T', M, Q, P, THETA,
+            CALL CBBCSD( JOBV1T, 'N', JOBU1, JOBU2, 'T', M, Q, P,
+     $                   THETA,
      $                   DUM, V1T, LDV1T, CDUM, 1, U1, LDU1, U2, LDU2,
      $                   DUM, DUM, DUM, DUM, DUM, DUM, DUM, DUM,
      $                   RWORK(1), -1, CHILDINFO )
             LBBCSD = INT( RWORK(1) )
          ELSE IF( R .EQ. M-P ) THEN
-            CALL CUNBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, DUM,
+            CALL CUNBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    DUM,
      $                    CDUM, CDUM, CDUM, WORK(1), -1, CHILDINFO )
             LORBDB = INT( WORK(1) )
             IF( WANTU1 .AND. P .GT. 0 ) THEN
@@ -471,7 +478,8 @@ SUBROUTINE CUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
      $                   RWORK(1), -1, CHILDINFO )
             LBBCSD = INT( RWORK(1) )
          ELSE
-            CALL CUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, DUM,
+            CALL CUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    DUM,
      $                    CDUM, CDUM, CDUM, CDUM, WORK(1), -1, CHILDINFO
      $                  )
             LORBDB = M + INT( WORK(1) )
@@ -482,7 +490,8 @@ SUBROUTINE CUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
                LORGQROPT = MAX( LORGQROPT, INT( WORK(1) ) )
             END IF
             IF( WANTU2 .AND. M-P .GT. 0 ) THEN
-               CALL CUNGQR( M-P, M-P, M-Q, U2, LDU2, CDUM, WORK(1), -1,
+               CALL CUNGQR( M-P, M-P, M-Q, U2, LDU2, CDUM, WORK(1),
+     $                      -1,
      $                      CHILDINFO )
                LORGQRMIN = MAX( LORGQRMIN, M-P )
                LORGQROPT = MAX( LORGQROPT, INT( WORK(1) ) )
@@ -501,14 +510,14 @@ SUBROUTINE CUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
          END IF
          LRWORKMIN = IBBCSD+LBBCSD-1
          LRWORKOPT = LRWORKMIN
-         RWORK(1) = LRWORKOPT
+         RWORK(1) = REAL( LRWORKOPT )
          LWORKMIN = MAX( IORBDB+LORBDB-1,
      $                   IORGQR+LORGQRMIN-1,
      $                   IORGLQ+LORGLQMIN-1 )
          LWORKOPT = MAX( IORBDB+LORBDB-1,
      $                   IORGQR+LORGQROPT-1,
      $                   IORGLQ+LORGLQOPT-1 )
-         WORK(1) = LWORKOPT
+         WORK(1) = SROUNDUP_LWORK(LWORKOPT)
          IF( LWORK .LT. LWORKMIN .AND. .NOT.LQUERY ) THEN
             INFO = -19
          END IF
@@ -542,7 +551,8 @@ SUBROUTINE CUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
 *
          IF( WANTU1 .AND. P .GT. 0 ) THEN
             CALL CLACPY( 'L', P, Q, X11, LDX11, U1, LDU1 )
-            CALL CUNGQR( P, P, Q, U1, LDU1, WORK(ITAUP1), WORK(IORGQR),
+            CALL CUNGQR( P, P, Q, U1, LDU1, WORK(ITAUP1),
+     $                   WORK(IORGQR),
      $                   LORGQR, CHILDINFO )
          END IF
          IF( WANTU2 .AND. M-P .GT. 0 ) THEN
@@ -558,7 +568,8 @@ SUBROUTINE CUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
             END DO
             CALL CLACPY( 'U', Q-1, Q-1, X21(1,2), LDX21, V1T(2,2),
      $                   LDV1T )
-            CALL CUNGLQ( Q-1, Q-1, Q-1, V1T(2,2), LDV1T, WORK(ITAUQ1),
+            CALL CUNGLQ( Q-1, Q-1, Q-1, V1T(2,2), LDV1T,
+     $                   WORK(ITAUQ1),
      $                   WORK(IORGLQ), LORGLQ, CHILDINFO )
          END IF
 *
@@ -601,7 +612,8 @@ SUBROUTINE CUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
                U1(1,J) = ZERO
                U1(J,1) = ZERO
             END DO
-            CALL CLACPY( 'L', P-1, P-1, X11(2,1), LDX11, U1(2,2), LDU1 )
+            CALL CLACPY( 'L', P-1, P-1, X11(2,1), LDX11, U1(2,2),
+     $                   LDU1 )
             CALL CUNGQR( P-1, P-1, P-1, U1(2,2), LDU1, WORK(ITAUP1),
      $                   WORK(IORGQR), LORGQR, CHILDINFO )
          END IF
@@ -651,7 +663,8 @@ SUBROUTINE CUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
 *
          IF( WANTU1 .AND. P .GT. 0 ) THEN
             CALL CLACPY( 'L', P, Q, X11, LDX11, U1, LDU1 )
-            CALL CUNGQR( P, P, Q, U1, LDU1, WORK(ITAUP1), WORK(IORGQR),
+            CALL CUNGQR( P, P, Q, U1, LDU1, WORK(ITAUP1),
+     $                   WORK(IORGQR),
      $                   LORGQR, CHILDINFO )
          END IF
          IF( WANTU2 .AND. M-P .GT. 0 ) THEN
@@ -735,7 +748,8 @@ SUBROUTINE CUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
          END IF
          IF( WANTV1T .AND. Q .GT. 0 ) THEN
             CALL CLACPY( 'U', M-Q, Q, X21, LDX21, V1T, LDV1T )
-            CALL CLACPY( 'U', P-(M-Q), Q-(M-Q), X11(M-Q+1,M-Q+1), LDX11,
+            CALL CLACPY( 'U', P-(M-Q), Q-(M-Q), X11(M-Q+1,M-Q+1),
+     $                   LDX11,
      $                   V1T(M-Q+1,M-Q+1), LDV1T )
             CALL CLACPY( 'U', -P+Q, Q-P, X21(M-Q+1,P+1), LDX21,
      $                   V1T(P+1,P+1), LDV1T )
diff --git a/SRC/cung2l.f b/SRC/cung2l.f
index a05843a5d3..477876cc5c 100644
--- a/SRC/cung2l.f
+++ b/SRC/cung2l.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNG2L + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cung2l.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cung2l.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup ung2l
 *
 *  =====================================================================
       SUBROUTINE CUNG2L( M, N, K, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -134,7 +133,7 @@ SUBROUTINE CUNG2L( M, N, K, A, LDA, TAU, WORK, INFO )
       INTEGER            I, II, J, L
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLARF, CSCAL, XERBLA
+      EXTERNAL           CLARF1L, CSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -178,8 +177,8 @@ SUBROUTINE CUNG2L( M, N, K, A, LDA, TAU, WORK, INFO )
 *        Apply H(i) to A(1:m-k+i,1:n-k+i) from the left
 *
          A( M-N+II, II ) = ONE
-         CALL CLARF( 'Left', M-N+II, II-1, A( 1, II ), 1, TAU( I ), A,
-     $               LDA, WORK )
+         CALL CLARF1L( 'Left', M-N+II, II-1, A( 1, II ), 1, TAU( I ),
+     $                 A, LDA, WORK )
          CALL CSCAL( M-N+II-1, -TAU( I ), A( 1, II ), 1 )
          A( M-N+II, II ) = ONE - TAU( I )
 *
diff --git a/SRC/cung2r.f b/SRC/cung2r.f
index a984818c1e..d48e050aa9 100644
--- a/SRC/cung2r.f
+++ b/SRC/cung2r.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNG2R + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cung2r.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cung2r.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup ung2r
 *
 *  =====================================================================
       SUBROUTINE CUNG2R( M, N, K, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -134,7 +133,7 @@ SUBROUTINE CUNG2R( M, N, K, A, LDA, TAU, WORK, INFO )
       INTEGER            I, J, L
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLARF, CSCAL, XERBLA
+      EXTERNAL           CLARF1F, CSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -177,9 +176,8 @@ SUBROUTINE CUNG2R( M, N, K, A, LDA, TAU, WORK, INFO )
 *        Apply H(i) to A(i:m,i:n) from the left
 *
          IF( I.LT.N ) THEN
-            A( I, I ) = ONE
-            CALL CLARF( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
-     $                  A( I, I+1 ), LDA, WORK )
+            CALL CLARF1F( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
+     $                    A( I, I+1 ), LDA, WORK )
          END IF
          IF( I.LT.M )
      $      CALL CSCAL( M-I, -TAU( I ), A( I+1, I ), 1 )
diff --git a/SRC/cungbr.f b/SRC/cungbr.f
index c973d0b0a7..13962fd805 100644
--- a/SRC/cungbr.f
+++ b/SRC/cungbr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNGBR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cungbr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cungbr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -150,10 +148,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexGBcomputational
+*> \ingroup ungbr
 *
 *  =====================================================================
-      SUBROUTINE CUNGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE CUNGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -180,7 +180,8 @@ SUBROUTINE CUNGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CUNGLQ, CUNGQR, XERBLA
@@ -233,7 +234,7 @@ SUBROUTINE CUNGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
                END IF
             END IF
          END IF
-         LWKOPT = REAL( WORK( 1 ) )
+         LWKOPT = INT( WORK( 1 ) )
          LWKOPT = MAX (LWKOPT, MN)
       END IF
 *
@@ -241,7 +242,7 @@ SUBROUTINE CUNGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
          CALL XERBLA( 'CUNGBR', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
          RETURN
       END IF
 *
@@ -327,7 +328,7 @@ SUBROUTINE CUNGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
             END IF
          END IF
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of CUNGBR
diff --git a/SRC/cunghr.f b/SRC/cunghr.f
index 4f8a0a2639..495034d721 100644
--- a/SRC/cunghr.f
+++ b/SRC/cunghr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNGHR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunghr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunghr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,10 +117,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unghr
 *
 *  =====================================================================
-      SUBROUTINE CUNGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE CUNGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -151,7 +151,8 @@ SUBROUTINE CUNGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -178,7 +179,7 @@ SUBROUTINE CUNGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
       IF( INFO.EQ.0 ) THEN
          NB = ILAENV( 1, 'CUNGQR', ' ', NH, NH, NH, -1 )
          LWKOPT = MAX( 1, NH )*NB
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -230,7 +231,7 @@ SUBROUTINE CUNGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
          CALL CUNGQR( NH, NH, NH, A( ILO+1, ILO+1 ), LDA, TAU( ILO ),
      $                WORK, LWORK, IINFO )
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of CUNGHR
diff --git a/SRC/cungl2.f b/SRC/cungl2.f
index 81a3b89cd8..8b5b2b8457 100644
--- a/SRC/cungl2.f
+++ b/SRC/cungl2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNGL2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cungl2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cungl2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,10 +104,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup ungl2
 *
 *  =====================================================================
       SUBROUTINE CUNGL2( M, N, K, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -133,7 +132,7 @@ SUBROUTINE CUNGL2( M, N, K, A, LDA, TAU, WORK, INFO )
       INTEGER            I, J, L
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLACGV, CLARF, CSCAL, XERBLA
+      EXTERNAL           CLACGV, CLARF1F, CSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CONJG, MAX
@@ -182,9 +181,9 @@ SUBROUTINE CUNGL2( M, N, K, A, LDA, TAU, WORK, INFO )
          IF( I.LT.N ) THEN
             CALL CLACGV( N-I, A( I, I+1 ), LDA )
             IF( I.LT.M ) THEN
-               A( I, I ) = ONE
-               CALL CLARF( 'Right', M-I, N-I+1, A( I, I ), LDA,
-     $                     CONJG( TAU( I ) ), A( I+1, I ), LDA, WORK )
+               CALL CLARF1F( 'Right', M-I, N-I+1, A( I, I ), LDA,
+     $                       CONJG( TAU( I ) ), A( I+1, I ), LDA,
+     $                       WORK )
             END IF
             CALL CSCAL( N-I, -TAU( I ), A( I, I+1 ), LDA )
             CALL CLACGV( N-I, A( I, I+1 ), LDA )
diff --git a/SRC/cunglq.f b/SRC/cunglq.f
index e250e036cf..dd53851c7a 100644
--- a/SRC/cunglq.f
+++ b/SRC/cunglq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNGLQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunglq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunglq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,10 +118,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unglq
 *
 *  =====================================================================
       SUBROUTINE CUNGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -155,7 +154,8 @@ SUBROUTINE CUNGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -164,7 +164,7 @@ SUBROUTINE CUNGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
       INFO = 0
       NB = ILAENV( 1, 'CUNGLQ', ' ', M, N, K, -1 )
       LWKOPT = MAX( 1, M )*NB
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -211,7 +211,8 @@ SUBROUTINE CUNGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              determine the minimum value of NB.
 *
                NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'CUNGLQ', ' ', M, N, K, -1 ) )
+               NBMIN = MAX( 2, ILAENV( 2, 'CUNGLQ', ' ', M, N, K,
+     $                      -1 ) )
             END IF
          END IF
       END IF
@@ -252,12 +253,14 @@ SUBROUTINE CUNGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              Form the triangular factor of the block reflector
 *              H = H(i) H(i+1) . . . H(i+ib-1)
 *
-               CALL CLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I, I ),
+               CALL CLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I,
+     $                      I ),
      $                      LDA, TAU( I ), WORK, LDWORK )
 *
 *              Apply H**H to A(i+ib:m,i:n) from the right
 *
-               CALL CLARFB( 'Right', 'Conjugate transpose', 'Forward',
+               CALL CLARFB( 'Right', 'Conjugate transpose',
+     $                      'Forward',
      $                      'Rowwise', M-I-IB+1, N-I+1, IB, A( I, I ),
      $                      LDA, WORK, LDWORK, A( I+IB, I ), LDA,
      $                      WORK( IB+1 ), LDWORK )
@@ -265,7 +268,8 @@ SUBROUTINE CUNGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *           Apply H**H to columns i:n of current block
 *
-            CALL CUNGL2( IB, N-I+1, IB, A( I, I ), LDA, TAU( I ), WORK,
+            CALL CUNGL2( IB, N-I+1, IB, A( I, I ), LDA, TAU( I ),
+     $                   WORK,
      $                   IINFO )
 *
 *           Set columns 1:i-1 of current block to zero
@@ -278,7 +282,7 @@ SUBROUTINE CUNGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
    50    CONTINUE
       END IF
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK(IWS)
       RETURN
 *
 *     End of CUNGLQ
diff --git a/SRC/cungql.f b/SRC/cungql.f
index d3b812a62d..0c9c4a5599 100644
--- a/SRC/cungql.f
+++ b/SRC/cungql.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNGQL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cungql.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cungql.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup ungql
 *
 *  =====================================================================
       SUBROUTINE CUNGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -156,7 +155,8 @@ SUBROUTINE CUNGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -181,7 +181,7 @@ SUBROUTINE CUNGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
             NB = ILAENV( 1, 'CUNGQL', ' ', M, N, K, -1 )
             LWKOPT = N*NB
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
             INFO = -8
@@ -221,7 +221,8 @@ SUBROUTINE CUNGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              determine the minimum value of NB.
 *
                NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'CUNGQL', ' ', M, N, K, -1 ) )
+               NBMIN = MAX( 2, ILAENV( 2, 'CUNGQL', ' ', M, N, K,
+     $                      -1 ) )
             END IF
          END IF
       END IF
@@ -285,7 +286,7 @@ SUBROUTINE CUNGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
    50    CONTINUE
       END IF
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = CMPLX( IWS )
       RETURN
 *
 *     End of CUNGQL
diff --git a/SRC/cungqr.f b/SRC/cungqr.f
index 5010ae0df1..c7c39a5436 100644
--- a/SRC/cungqr.f
+++ b/SRC/cungqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNGQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cungqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cungqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup ungqr
 *
 *  =====================================================================
       SUBROUTINE CUNGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -156,7 +155,8 @@ SUBROUTINE CUNGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -165,7 +165,7 @@ SUBROUTINE CUNGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
       INFO = 0
       NB = ILAENV( 1, 'CUNGQR', ' ', M, N, K, -1 )
       LWKOPT = MAX( 1, N )*NB
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -212,7 +212,8 @@ SUBROUTINE CUNGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              determine the minimum value of NB.
 *
                NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'CUNGQR', ' ', M, N, K, -1 ) )
+               NBMIN = MAX( 2, ILAENV( 2, 'CUNGQR', ' ', M, N, K,
+     $                      -1 ) )
             END IF
          END IF
       END IF
@@ -266,7 +267,8 @@ SUBROUTINE CUNGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *           Apply H to rows i:m of current block
 *
-            CALL CUNG2R( M-I+1, IB, IB, A( I, I ), LDA, TAU( I ), WORK,
+            CALL CUNG2R( M-I+1, IB, IB, A( I, I ), LDA, TAU( I ),
+     $                   WORK,
      $                   IINFO )
 *
 *           Set rows 1:i-1 of current block to zero
@@ -279,7 +281,7 @@ SUBROUTINE CUNGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
    50    CONTINUE
       END IF
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK(IWS)
       RETURN
 *
 *     End of CUNGQR
diff --git a/SRC/cungr2.f b/SRC/cungr2.f
index 1f2f2b4610..e421117f02 100644
--- a/SRC/cungr2.f
+++ b/SRC/cungr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNGR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cungr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cungr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup ungr2
 *
 *  =====================================================================
       SUBROUTINE CUNGR2( M, N, K, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -134,7 +133,7 @@ SUBROUTINE CUNGR2( M, N, K, A, LDA, TAU, WORK, INFO )
       INTEGER            I, II, J, L
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLACGV, CLARF, CSCAL, XERBLA
+      EXTERNAL           CLACGV, CLARF1L, CSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CONJG, MAX
@@ -183,8 +182,8 @@ SUBROUTINE CUNGR2( M, N, K, A, LDA, TAU, WORK, INFO )
 *
          CALL CLACGV( N-M+II-1, A( II, 1 ), LDA )
          A( II, N-M+II ) = ONE
-         CALL CLARF( 'Right', II-1, N-M+II, A( II, 1 ), LDA,
-     $               CONJG( TAU( I ) ), A, LDA, WORK )
+         CALL CLARF1L( 'Right', II-1, N-M+II, A( II, 1 ), LDA,
+     $                 CONJG( TAU( I ) ), A, LDA, WORK )
          CALL CSCAL( N-M+II-1, -TAU( I ), A( II, 1 ), LDA )
          CALL CLACGV( N-M+II-1, A( II, 1 ), LDA )
          A( II, N-M+II ) = ONE - CONJG( TAU( I ) )
diff --git a/SRC/cungrq.f b/SRC/cungrq.f
index 1593ff938b..6032e9c0b9 100644
--- a/SRC/cungrq.f
+++ b/SRC/cungrq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNGRQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cungrq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cungrq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup ungrq
 *
 *  =====================================================================
       SUBROUTINE CUNGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -156,7 +155,8 @@ SUBROUTINE CUNGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -181,7 +181,7 @@ SUBROUTINE CUNGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
             NB = ILAENV( 1, 'CUNGRQ', ' ', M, N, K, -1 )
             LWKOPT = M*NB
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.MAX( 1, M ) .AND. .NOT.LQUERY ) THEN
             INFO = -8
@@ -221,7 +221,8 @@ SUBROUTINE CUNGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              determine the minimum value of NB.
 *
                NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'CUNGRQ', ' ', M, N, K, -1 ) )
+               NBMIN = MAX( 2, ILAENV( 2, 'CUNGRQ', ' ', M, N, K,
+     $                      -1 ) )
             END IF
          END IF
       END IF
@@ -265,7 +266,8 @@ SUBROUTINE CUNGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *              Apply H**H to A(1:m-k+i-1,1:n-k+i+ib-1) from the right
 *
-               CALL CLARFB( 'Right', 'Conjugate transpose', 'Backward',
+               CALL CLARFB( 'Right', 'Conjugate transpose',
+     $                      'Backward',
      $                      'Rowwise', II-1, N-K+I+IB-1, IB, A( II, 1 ),
      $                      LDA, WORK, LDWORK, A, LDA, WORK( IB+1 ),
      $                      LDWORK )
@@ -273,7 +275,8 @@ SUBROUTINE CUNGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *           Apply H**H to columns 1:n-k+i+ib-1 of current block
 *
-            CALL CUNGR2( IB, N-K+I+IB-1, IB, A( II, 1 ), LDA, TAU( I ),
+            CALL CUNGR2( IB, N-K+I+IB-1, IB, A( II, 1 ), LDA,
+     $                   TAU( I ),
      $                   WORK, IINFO )
 *
 *           Set columns n-k+i+ib:n of current block to zero
@@ -286,7 +289,7 @@ SUBROUTINE CUNGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
    50    CONTINUE
       END IF
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK(IWS)
       RETURN
 *
 *     End of CUNGRQ
diff --git a/SRC/cungtr.f b/SRC/cungtr.f
index 26ff0428ef..c758c54e44 100644
--- a/SRC/cungtr.f
+++ b/SRC/cungtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNGTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cungtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cungtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -116,10 +114,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup ungtr
 *
 *  =====================================================================
       SUBROUTINE CUNGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -147,7 +146,8 @@ SUBROUTINE CUNGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           ILAENV, LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CUNGQL, CUNGQR, XERBLA
@@ -179,7 +179,7 @@ SUBROUTINE CUNGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
            NB = ILAENV( 1, 'CUNGQR', ' ', N-1, N-1, N-1, -1 )
          END IF
          LWKOPT = MAX( 1, N-1 )*NB
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -217,7 +217,8 @@ SUBROUTINE CUNGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *        Generate Q(1:n-1,1:n-1)
 *
-         CALL CUNGQL( N-1, N-1, N-1, A, LDA, TAU, WORK, LWORK, IINFO )
+         CALL CUNGQL( N-1, N-1, N-1, A, LDA, TAU, WORK, LWORK,
+     $                IINFO )
 *
       ELSE
 *
@@ -245,7 +246,7 @@ SUBROUTINE CUNGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
      $                   LWORK, IINFO )
          END IF
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of CUNGTR
diff --git a/SRC/cungtsqr.f b/SRC/cungtsqr.f
index f20abec31e..9f50c556c8 100644
--- a/SRC/cungtsqr.f
+++ b/SRC/cungtsqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNGTSQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cuntsqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cungtsqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *>
 *  Definition:
 *  ===========
@@ -133,6 +131,7 @@
 *>
 *> \param[in] LWORK
 *> \verbatim
+*>          LWORK is INTEGER
 *>          The dimension of the array WORK.  LWORK >= (M+NB)*N.
 *>          If LWORK = -1, then a workspace query is assumed.
 *>          The routine only calculates the optimal size of the WORK
@@ -156,7 +155,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup ungtsqr
 *
 *> \par Contributors:
 *  ==================
diff --git a/SRC/cungtsqr_row.f b/SRC/cungtsqr_row.f
index e1597c58be..dda2705ea5 100644
--- a/SRC/cungtsqr_row.f
+++ b/SRC/cungtsqr_row.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNGTSQR_ROW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunrgtsqr_row.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunrgtsqr_row.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *>
 *  Definition:
 *  ===========
@@ -144,6 +142,7 @@
 *>
 *> \param[in] LWORK
 *> \verbatim
+*>          LWORK is INTEGER
 *>          The dimension of the array WORK.
 *>          LWORK >= NBLOCAL * MAX(NBLOCAL,(N-NBLOCAL)),
 *>          where NBLOCAL=MIN(NB,N).
@@ -169,7 +168,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup ungtsqr_row
 *
 *> \par Contributors:
 *  ==================
diff --git a/SRC/cunhr_col.f b/SRC/cunhr_col.f
index eeec34170c..649b27d410 100644
--- a/SRC/cunhr_col.f
+++ b/SRC/cunhr_col.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNHR_COL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunhr_col.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunhr_col.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *>
 *  Definition:
 *  ===========
@@ -241,7 +239,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unhr_col
 *
 *> \par Contributors:
 *  ==================
@@ -281,7 +279,8 @@ SUBROUTINE CUNHR_COL( M, N, NB, A, LDA, T, LDT, D, INFO )
      $                   NPLUSONE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CCOPY, CLAUNHR_COL_GETRFNP, CSCAL, CTRSM,
+      EXTERNAL           CCOPY, CLAUNHR_COL_GETRFNP, CSCAL,
+     $                   CTRSM,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -420,7 +419,7 @@ SUBROUTINE CUNHR_COL( M, N, NB, A, LDA, T, LDT, D, INFO )
 *
          JBTEMP2 = JB - 2
          DO J = JB, JB+JNB-2
-            DO I = J-JBTEMP2, NB
+            DO I = J-JBTEMP2, MIN( NB, N )
                T( I, J ) = CZERO
             END DO
          END DO
diff --git a/SRC/cunm22.f b/SRC/cunm22.f
index f11a2180c5..6675b90479 100644
--- a/SRC/cunm22.f
+++ b/SRC/cunm22.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNM22 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunm22.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunm22.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -154,7 +152,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unm22
 *
 *  =====================================================================
       SUBROUTINE CUNM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
@@ -215,7 +213,8 @@ SUBROUTINE CUNM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
       IF( N1.EQ.0 .OR. N2.EQ.0 ) NW = 1
       IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.LSAME( TRANS, 'C' ) )
+      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND.
+     $         .NOT.LSAME( TRANS, 'C' ) )
      $          THEN
          INFO = -2
       ELSE IF( M.LT.0 ) THEN
@@ -281,13 +280,15 @@ SUBROUTINE CUNM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *
                CALL CLACPY( 'All', N1, LEN, C( N2+1, I ), LDC, WORK,
      $                      LDWORK )
-               CALL CTRMM( 'Left', 'Lower', 'No Transpose', 'Non-Unit',
+               CALL CTRMM( 'Left', 'Lower', 'No Transpose',
+     $                     'Non-Unit',
      $                     N1, LEN, ONE, Q( 1, N2+1 ), LDQ, WORK,
      $                     LDWORK )
 *
 *              Multiply top part of C by Q11.
 *
-               CALL CGEMM( 'No Transpose', 'No Transpose', N1, LEN, N2,
+               CALL CGEMM( 'No Transpose', 'No Transpose', N1, LEN,
+     $                     N2,
      $                     ONE, Q, LDQ, C( 1, I ), LDC, ONE, WORK,
      $                     LDWORK )
 *
@@ -295,13 +296,15 @@ SUBROUTINE CUNM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *
                CALL CLACPY( 'All', N2, LEN, C( 1, I ), LDC,
      $                      WORK( N1+1 ), LDWORK )
-               CALL CTRMM( 'Left', 'Upper', 'No Transpose', 'Non-Unit',
+               CALL CTRMM( 'Left', 'Upper', 'No Transpose',
+     $                     'Non-Unit',
      $                     N2, LEN, ONE, Q( N1+1, 1 ), LDQ,
      $                     WORK( N1+1 ), LDWORK )
 *
 *              Multiply bottom part of C by Q22.
 *
-               CALL CGEMM( 'No Transpose', 'No Transpose', N2, LEN, N1,
+               CALL CGEMM( 'No Transpose', 'No Transpose', N2, LEN,
+     $                     N1,
      $                     ONE, Q( N1+1, N2+1 ), LDQ, C( N2+1, I ), LDC,
      $                     ONE, WORK( N1+1 ), LDWORK )
 *
@@ -359,13 +362,15 @@ SUBROUTINE CUNM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *
                CALL CLACPY( 'All', LEN, N2, C( I, N1+1 ), LDC, WORK,
      $                      LDWORK )
-               CALL CTRMM( 'Right', 'Upper', 'No Transpose', 'Non-Unit',
+               CALL CTRMM( 'Right', 'Upper', 'No Transpose',
+     $                     'Non-Unit',
      $                     LEN, N2, ONE, Q( N1+1, 1 ), LDQ, WORK,
      $                     LDWORK )
 *
 *              Multiply left part of C by Q11.
 *
-               CALL CGEMM( 'No Transpose', 'No Transpose', LEN, N2, N1,
+               CALL CGEMM( 'No Transpose', 'No Transpose', LEN, N2,
+     $                     N1,
      $                     ONE, C( I, 1 ), LDC, Q, LDQ, ONE, WORK,
      $                     LDWORK )
 *
@@ -373,13 +378,15 @@ SUBROUTINE CUNM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *
                CALL CLACPY( 'All', LEN, N1, C( I, 1 ), LDC,
      $                      WORK( 1 + N2*LDWORK ), LDWORK )
-               CALL CTRMM( 'Right', 'Lower', 'No Transpose', 'Non-Unit',
+               CALL CTRMM( 'Right', 'Lower', 'No Transpose',
+     $                     'Non-Unit',
      $                     LEN, N1, ONE, Q( 1, N2+1 ), LDQ,
      $                     WORK( 1 + N2*LDWORK ), LDWORK )
 *
 *              Multiply right part of C by Q22.
 *
-               CALL CGEMM( 'No Transpose', 'No Transpose', LEN, N1, N2,
+               CALL CGEMM( 'No Transpose', 'No Transpose', LEN, N1,
+     $                     N2,
      $                     ONE, C( I, N1+1 ), LDC, Q( N1+1, N2+1 ), LDQ,
      $                     ONE, WORK( 1 + N2*LDWORK ), LDWORK )
 *
diff --git a/SRC/cunm2l.f b/SRC/cunm2l.f
index 416c0a0c36..0b6ffc8ca0 100644
--- a/SRC/cunm2l.f
+++ b/SRC/cunm2l.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNM2L + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunm2l.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunm2l.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,11 +149,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unm2l
 *
 *  =====================================================================
       SUBROUTINE CUNM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,21 +170,17 @@ SUBROUTINE CUNM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      COMPLEX            ONE
-      PARAMETER          ( ONE = ( 1.0E+0, 0.0E+0 ) )
-*     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, NOTRAN
       INTEGER            I, I1, I2, I3, MI, NI, NQ
-      COMPLEX            AII, TAUI
+      COMPLEX            TAUI
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLARF, XERBLA
+      EXTERNAL           CLARF1L, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CONJG, MAX
@@ -266,10 +261,8 @@ SUBROUTINE CUNM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
          ELSE
             TAUI = CONJG( TAU( I ) )
          END IF
-         AII = A( NQ-K+I, I )
-         A( NQ-K+I, I ) = ONE
-         CALL CLARF( SIDE, MI, NI, A( 1, I ), 1, TAUI, C, LDC, WORK )
-         A( NQ-K+I, I ) = AII
+         CALL CLARF1L( SIDE, MI, NI, A( 1, I ), 1, TAUI, C, LDC,
+     $                 WORK )
    10 CONTINUE
       RETURN
 *
diff --git a/SRC/cunm2r.f b/SRC/cunm2r.f
index a79e9a78d0..c357356235 100644
--- a/SRC/cunm2r.f
+++ b/SRC/cunm2r.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNM2R + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunm2r.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunm2r.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,11 +149,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unm2r
 *
 *  =====================================================================
       SUBROUTINE CUNM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,21 +170,17 @@ SUBROUTINE CUNM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      COMPLEX            ONE
-      PARAMETER          ( ONE = ( 1.0E+0, 0.0E+0 ) )
-*     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, NOTRAN
       INTEGER            I, I1, I2, I3, IC, JC, MI, NI, NQ
-      COMPLEX            AII, TAUI
+      COMPLEX            TAUI
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLARF, XERBLA
+      EXTERNAL           CLARF1F, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CONJG, MAX
@@ -270,11 +265,8 @@ SUBROUTINE CUNM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
          ELSE
             TAUI = CONJG( TAU( I ) )
          END IF
-         AII = A( I, I )
-         A( I, I ) = ONE
-         CALL CLARF( SIDE, MI, NI, A( I, I ), 1, TAUI, C( IC, JC ), LDC,
-     $               WORK )
-         A( I, I ) = AII
+         CALL CLARF1F( SIDE, MI, NI, A( I, I ), 1, TAUI, C( IC, JC ),
+     $                 LDC, WORK )
    10 CONTINUE
       RETURN
 *
diff --git a/SRC/cunmbr.f b/SRC/cunmbr.f
index cef6025b02..b9060f30be 100644
--- a/SRC/cunmbr.f
+++ b/SRC/cunmbr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNMBR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunmbr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunmbr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -189,11 +187,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unmbr
 *
 *  =====================================================================
       SUBROUTINE CUNMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
      $                   LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -218,7 +217,8 @@ SUBROUTINE CUNMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           ILAENV, LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CUNMLQ, CUNMQR, XERBLA
@@ -271,18 +271,22 @@ SUBROUTINE CUNMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
          IF( M.GT.0 .AND. N.GT.0 ) THEN
             IF( APPLYQ ) THEN
                IF( LEFT ) THEN
-                  NB = ILAENV( 1, 'CUNMQR', SIDE // TRANS, M-1, N, M-1,
+                  NB = ILAENV( 1, 'CUNMQR', SIDE // TRANS, M-1, N,
+     $                         M-1,
      $                         -1 )
                ELSE
-                  NB = ILAENV( 1, 'CUNMQR', SIDE // TRANS, M, N-1, N-1,
+                  NB = ILAENV( 1, 'CUNMQR', SIDE // TRANS, M, N-1,
+     $                         N-1,
      $                         -1 )
                END IF
             ELSE
                IF( LEFT ) THEN
-                  NB = ILAENV( 1, 'CUNMLQ', SIDE // TRANS, M-1, N, M-1,
+                  NB = ILAENV( 1, 'CUNMLQ', SIDE // TRANS, M-1, N,
+     $                         M-1,
      $                         -1 )
                ELSE
-                  NB = ILAENV( 1, 'CUNMLQ', SIDE // TRANS, M, N-1, N-1,
+                  NB = ILAENV( 1, 'CUNMLQ', SIDE // TRANS, M, N-1,
+     $                         N-1,
      $                         -1 )
                END IF
             END IF
@@ -290,7 +294,7 @@ SUBROUTINE CUNMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
          ELSE
             LWKOPT = 1
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -330,7 +334,8 @@ SUBROUTINE CUNMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
                I1 = 1
                I2 = 2
             END IF
-            CALL CUNMQR( SIDE, TRANS, MI, NI, NQ-1, A( 2, 1 ), LDA, TAU,
+            CALL CUNMQR( SIDE, TRANS, MI, NI, NQ-1, A( 2, 1 ), LDA,
+     $                   TAU,
      $                   C( I1, I2 ), LDC, WORK, LWORK, IINFO )
          END IF
       ELSE
@@ -367,7 +372,7 @@ SUBROUTINE CUNMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
      $                   TAU, C( I1, I2 ), LDC, WORK, LWORK, IINFO )
          END IF
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of CUNMBR
diff --git a/SRC/cunmhr.f b/SRC/cunmhr.f
index af3140d5f3..ef966980cc 100644
--- a/SRC/cunmhr.f
+++ b/SRC/cunmhr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNMHR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunmhr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunmhr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -171,11 +169,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unmhr
 *
 *  =====================================================================
       SUBROUTINE CUNMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
      $                   LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -199,7 +198,8 @@ SUBROUTINE CUNMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           ILAENV, LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CUNMQR, XERBLA
@@ -227,7 +227,8 @@ SUBROUTINE CUNMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
       END IF
       IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.LSAME( TRANS, 'C' ) )
+      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND.
+     $         .NOT.LSAME( TRANS, 'C' ) )
      $          THEN
          INFO = -2
       ELSE IF( M.LT.0 ) THEN
@@ -253,7 +254,7 @@ SUBROUTINE CUNMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
             NB = ILAENV( 1, 'CUNMQR', SIDE // TRANS, M, NH, NH, -1 )
          END IF
          LWKOPT = NW*NB
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -285,7 +286,7 @@ SUBROUTINE CUNMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
       CALL CUNMQR( SIDE, TRANS, MI, NI, NH, A( ILO+1, ILO ), LDA,
      $             TAU( ILO ), C( I1, I2 ), LDC, WORK, LWORK, IINFO )
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of CUNMHR
diff --git a/SRC/cunml2.f b/SRC/cunml2.f
index 6af8cc0358..edd0a39ef2 100644
--- a/SRC/cunml2.f
+++ b/SRC/cunml2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNML2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunml2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunml2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,11 +149,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unml2
 *
 *  =====================================================================
       SUBROUTINE CUNML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,21 +170,17 @@ SUBROUTINE CUNML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      COMPLEX            ONE
-      PARAMETER          ( ONE = ( 1.0E+0, 0.0E+0 ) )
-*     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, NOTRAN
       INTEGER            I, I1, I2, I3, IC, JC, MI, NI, NQ
-      COMPLEX            AII, TAUI
+      COMPLEX            TAUI
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLACGV, CLARF, XERBLA
+      EXTERNAL           CLACGV, CLARF1F, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CONJG, MAX
@@ -272,11 +267,8 @@ SUBROUTINE CUNML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
          END IF
          IF( I.LT.NQ )
      $      CALL CLACGV( NQ-I, A( I, I+1 ), LDA )
-         AII = A( I, I )
-         A( I, I ) = ONE
-         CALL CLARF( SIDE, MI, NI, A( I, I ), LDA, TAUI, C( IC, JC ),
-     $               LDC, WORK )
-         A( I, I ) = AII
+         CALL CLARF1F( SIDE, MI, NI, A( I, I ), LDA, TAUI, C( IC,
+     $                 JC ), LDC, WORK )
          IF( I.LT.NQ )
      $      CALL CLACGV( NQ-I, A( I, I+1 ), LDA )
    10 CONTINUE
diff --git a/SRC/cunmlq.f b/SRC/cunmlq.f
index 25a4107708..9b41794fca 100644
--- a/SRC/cunmlq.f
+++ b/SRC/cunmlq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNMLQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunmlq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunmlq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,11 +158,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unmlq
 *
 *  =====================================================================
       SUBROUTINE CUNMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -195,7 +194,8 @@ SUBROUTINE CUNMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CLARFB, CLARFT, CUNML2, XERBLA
@@ -246,11 +246,12 @@ SUBROUTINE CUNMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
          IF( M.EQ.0 .OR. N.EQ.0 .OR. K.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            NB = MIN( NBMAX, ILAENV( 1, 'CUNMLQ', SIDE // TRANS, M, N,
+            NB = MIN( NBMAX, ILAENV( 1, 'CUNMLQ', SIDE // TRANS, M,
+     $                N,
      $                               K, -1 ) )
             LWKOPT = NW*NB + TSIZE
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -273,7 +274,8 @@ SUBROUTINE CUNMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'CUNMLQ', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'CUNMLQ', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -282,7 +284,8 @@ SUBROUTINE CUNMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Use unblocked code
 *
-         CALL CUNML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+         CALL CUNML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                WORK,
      $                IINFO )
       ELSE
 *
@@ -338,12 +341,13 @@ SUBROUTINE CUNMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *           Apply H or H**H
 *
-            CALL CLARFB( SIDE, TRANST, 'Forward', 'Rowwise', MI, NI, IB,
+            CALL CLARFB( SIDE, TRANST, 'Forward', 'Rowwise', MI, NI,
+     $                   IB,
      $                   A( I, I ), LDA, WORK( IWT ), LDT,
      $                   C( IC, JC ), LDC, WORK, LDWORK )
    10    CONTINUE
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of CUNMLQ
diff --git a/SRC/cunmql.f b/SRC/cunmql.f
index 3c71660663..60097c231a 100644
--- a/SRC/cunmql.f
+++ b/SRC/cunmql.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNMQL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunmql.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunmql.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,11 +158,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unmql
 *
 *  =====================================================================
       SUBROUTINE CUNMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -194,7 +193,8 @@ SUBROUTINE CUNMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CLARFB, CLARFT, CUNM2L, XERBLA
@@ -245,11 +245,12 @@ SUBROUTINE CUNMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
          IF( M.EQ.0 .OR. N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            NB = MIN( NBMAX, ILAENV( 1, 'CUNMQL', SIDE // TRANS, M, N,
+            NB = MIN( NBMAX, ILAENV( 1, 'CUNMQL', SIDE // TRANS, M,
+     $                N,
      $                               K, -1 ) )
             LWKOPT = NW*NB + TSIZE
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -272,7 +273,8 @@ SUBROUTINE CUNMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'CUNMQL', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'CUNMQL', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -281,7 +283,8 @@ SUBROUTINE CUNMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Use unblocked code
 *
-         CALL CUNM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+         CALL CUNM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                WORK,
      $                IINFO )
       ELSE
 *
@@ -327,12 +330,13 @@ SUBROUTINE CUNMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *           Apply H or H**H
 *
-            CALL CLARFB( SIDE, TRANS, 'Backward', 'Columnwise', MI, NI,
+            CALL CLARFB( SIDE, TRANS, 'Backward', 'Columnwise', MI,
+     $                   NI,
      $                   IB, A( 1, I ), LDA, WORK( IWT ), LDT, C, LDC,
      $                   WORK, LDWORK )
    10    CONTINUE
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of CUNMQL
diff --git a/SRC/cunmqr.f b/SRC/cunmqr.f
index 7e59d71297..4b51be72fe 100644
--- a/SRC/cunmqr.f
+++ b/SRC/cunmqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNMQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunmqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunmqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,11 +158,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unmqr
 *
 *  =====================================================================
       SUBROUTINE CUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -194,7 +193,8 @@ SUBROUTINE CUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CLARFB, CLARFT, CUNM2R, XERBLA
@@ -242,10 +242,11 @@ SUBROUTINE CUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Compute the workspace requirements
 *
-         NB = MIN( NBMAX, ILAENV( 1, 'CUNMQR', SIDE // TRANS, M, N, K,
+         NB = MIN( NBMAX, ILAENV( 1, 'CUNMQR', SIDE // TRANS, M, N,
+     $             K,
      $        -1 ) )
          LWKOPT = NW*NB + TSIZE
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -267,7 +268,8 @@ SUBROUTINE CUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'CUNMQR', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'CUNMQR', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -276,7 +278,8 @@ SUBROUTINE CUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Use unblocked code
 *
-         CALL CUNM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+         CALL CUNM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                WORK,
      $                IINFO )
       ELSE
 *
@@ -308,7 +311,8 @@ SUBROUTINE CUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *           Form the triangular factor of the block reflector
 *           H = H(i) H(i+1) . . . H(i+ib-1)
 *
-            CALL CLARFT( 'Forward', 'Columnwise', NQ-I+1, IB, A( I, I ),
+            CALL CLARFT( 'Forward', 'Columnwise', NQ-I+1, IB, A( I,
+     $                   I ),
      $                   LDA, TAU( I ), WORK( IWT ), LDT )
             IF( LEFT ) THEN
 *
@@ -326,12 +330,13 @@ SUBROUTINE CUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *           Apply H or H**H
 *
-            CALL CLARFB( SIDE, TRANS, 'Forward', 'Columnwise', MI, NI,
+            CALL CLARFB( SIDE, TRANS, 'Forward', 'Columnwise', MI,
+     $                   NI,
      $                   IB, A( I, I ), LDA, WORK( IWT ), LDT,
      $                   C( IC, JC ), LDC, WORK, LDWORK )
    10    CONTINUE
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of CUNMQR
diff --git a/SRC/cunmr2.f b/SRC/cunmr2.f
index ebd4cfbb64..ca4f9fd6f8 100644
--- a/SRC/cunmr2.f
+++ b/SRC/cunmr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNMR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunmr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunmr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,11 +149,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unmr2
 *
 *  =====================================================================
       SUBROUTINE CUNMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,21 +170,17 @@ SUBROUTINE CUNMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      COMPLEX            ONE
-      PARAMETER          ( ONE = ( 1.0E+0, 0.0E+0 ) )
-*     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, NOTRAN
       INTEGER            I, I1, I2, I3, MI, NI, NQ
-      COMPLEX            AII, TAUI
+      COMPLEX            TAUI
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLACGV, CLARF, XERBLA
+      EXTERNAL           CLACGV, CLARF1L, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CONJG, MAX
@@ -267,10 +262,8 @@ SUBROUTINE CUNMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
             TAUI = TAU( I )
          END IF
          CALL CLACGV( NQ-K+I-1, A( I, 1 ), LDA )
-         AII = A( I, NQ-K+I )
-         A( I, NQ-K+I ) = ONE
-         CALL CLARF( SIDE, MI, NI, A( I, 1 ), LDA, TAUI, C, LDC, WORK )
-         A( I, NQ-K+I ) = AII
+         CALL CLARF1L( SIDE, MI, NI, A( I, 1 ), LDA, TAUI, C, LDC,
+     $                 WORK )
          CALL CLACGV( NQ-K+I-1, A( I, 1 ), LDA )
    10 CONTINUE
       RETURN
diff --git a/SRC/cunmr3.f b/SRC/cunmr3.f
index dcd893fa32..7e94914585 100644
--- a/SRC/cunmr3.f
+++ b/SRC/cunmr3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNMR3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunmr3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunmr3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -159,7 +157,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unmr3
 *
 *> \par Contributors:
 *  ==================
@@ -173,8 +171,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CUNMR3( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
+      SUBROUTINE CUNMR3( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C,
+     $                   LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cunmrq.f b/SRC/cunmrq.f
index 5a233f6040..a7f50e8363 100644
--- a/SRC/cunmrq.f
+++ b/SRC/cunmrq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNMRQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunmrq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunmrq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,11 +158,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unmrq
 *
 *  =====================================================================
       SUBROUTINE CUNMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -195,7 +194,8 @@ SUBROUTINE CUNMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CLARFB, CLARFT, CUNMR2, XERBLA
@@ -246,11 +246,12 @@ SUBROUTINE CUNMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
          IF( M.EQ.0 .OR. N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            NB = MIN( NBMAX, ILAENV( 1, 'CUNMRQ', SIDE // TRANS, M, N,
+            NB = MIN( NBMAX, ILAENV( 1, 'CUNMRQ', SIDE // TRANS, M,
+     $                N,
      $                               K, -1 ) )
             LWKOPT = NW*NB + TSIZE
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -271,7 +272,8 @@ SUBROUTINE CUNMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'CUNMRQ', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'CUNMRQ', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -280,7 +282,8 @@ SUBROUTINE CUNMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Use unblocked code
 *
-         CALL CUNMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+         CALL CUNMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                WORK,
      $                IINFO )
       ELSE
 *
@@ -337,7 +340,7 @@ SUBROUTINE CUNMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LDWORK )
    10    CONTINUE
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of CUNMRQ
diff --git a/SRC/cunmrz.f b/SRC/cunmrz.f
index 8e06f2329a..ec74d38a05 100644
--- a/SRC/cunmrz.f
+++ b/SRC/cunmrz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNMRZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunmrz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunmrz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -168,7 +166,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unmrz
 *
 *> \par Contributors:
 *  ==================
@@ -182,8 +180,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CUNMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
+      SUBROUTINE CUNMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C,
+     $                   LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -213,7 +213,8 @@ SUBROUTINE CUNMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CLARZB, CLARZT, CUNMR3, XERBLA
@@ -267,11 +268,12 @@ SUBROUTINE CUNMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
          IF( M.EQ.0 .OR. N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            NB = MIN( NBMAX, ILAENV( 1, 'CUNMRQ', SIDE // TRANS, M, N,
+            NB = MIN( NBMAX, ILAENV( 1, 'CUNMRQ', SIDE // TRANS, M,
+     $                N,
      $                               K, -1 ) )
             LWKOPT = NW*NB + TSIZE
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -296,7 +298,8 @@ SUBROUTINE CUNMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'CUNMRQ', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'CUNMRQ', SIDE // TRANS, M, N,
+     $                   K,
      $                              -1 ) )
          END IF
       END IF
@@ -345,7 +348,8 @@ SUBROUTINE CUNMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
 *           Form the triangular factor of the block reflector
 *           H = H(i+ib-1) . . . H(i+1) H(i)
 *
-            CALL CLARZT( 'Backward', 'Rowwise', L, IB, A( I, JA ), LDA,
+            CALL CLARZT( 'Backward', 'Rowwise', L, IB, A( I, JA ),
+     $                   LDA,
      $                   TAU( I ), WORK( IWT ), LDT )
 *
             IF( LEFT ) THEN
@@ -371,7 +375,7 @@ SUBROUTINE CUNMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/cunmtr.f b/SRC/cunmtr.f
index 097dba91e7..05577b85e5 100644
--- a/SRC/cunmtr.f
+++ b/SRC/cunmtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUNMTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cunmtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cunmtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -164,11 +162,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unmtr
 *
 *  =====================================================================
-      SUBROUTINE CUNMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
+      SUBROUTINE CUNMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C,
+     $                   LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -192,7 +192,8 @@ SUBROUTINE CUNMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           ILAENV, LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CUNMQL, CUNMQR, XERBLA
@@ -222,7 +223,8 @@ SUBROUTINE CUNMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
          INFO = -1
       ELSE IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.LSAME( TRANS, 'C' ) )
+      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND.
+     $         .NOT.LSAME( TRANS, 'C' ) )
      $          THEN
          INFO = -3
       ELSE IF( M.LT.0 ) THEN
@@ -256,7 +258,7 @@ SUBROUTINE CUNMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
             END IF
          END IF
          LWKOPT = NW*NB
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -285,7 +287,8 @@ SUBROUTINE CUNMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
 *
 *        Q was determined by a call to CHETRD with UPLO = 'U'
 *
-         CALL CUNMQL( SIDE, TRANS, MI, NI, NQ-1, A( 1, 2 ), LDA, TAU, C,
+         CALL CUNMQL( SIDE, TRANS, MI, NI, NQ-1, A( 1, 2 ), LDA, TAU,
+     $                C,
      $                LDC, WORK, LWORK, IINFO )
       ELSE
 *
@@ -301,7 +304,7 @@ SUBROUTINE CUNMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
          CALL CUNMQR( SIDE, TRANS, MI, NI, NQ-1, A( 2, 1 ), LDA, TAU,
      $                C( I1, I2 ), LDC, WORK, LWORK, IINFO )
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of CUNMTR
diff --git a/SRC/cupgtr.f b/SRC/cupgtr.f
index c491a1f4db..39813f8883 100644
--- a/SRC/cupgtr.f
+++ b/SRC/cupgtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUPGTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cupgtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cupgtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup upgtr
 *
 *  =====================================================================
       SUBROUTINE CUPGTR( UPLO, N, AP, TAU, Q, LDQ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/cupmtr.f b/SRC/cupmtr.f
index 2629e91792..b4fb38e854 100644
--- a/SRC/cupmtr.f
+++ b/SRC/cupmtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download CUPMTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/cupmtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/cupmtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -142,11 +140,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup upmtr
 *
 *  =====================================================================
-      SUBROUTINE CUPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC, WORK,
+      SUBROUTINE CUPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC,
+     $                   WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -162,21 +162,17 @@ SUBROUTINE CUPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC, WORK,
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      COMPLEX            ONE
-      PARAMETER          ( ONE = ( 1.0E+0, 0.0E+0 ) )
-*     ..
 *     .. Local Scalars ..
       LOGICAL            FORWRD, LEFT, NOTRAN, UPPER
       INTEGER            I, I1, I2, I3, IC, II, JC, MI, NI, NQ
-      COMPLEX            AII, TAUI
+      COMPLEX            TAUI
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLARF, XERBLA
+      EXTERNAL           CLARF1F, CLARF1L, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CONJG, MAX
@@ -265,11 +261,8 @@ SUBROUTINE CUPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC, WORK,
             ELSE
                TAUI = CONJG( TAU( I ) )
             END IF
-            AII = AP( II )
-            AP( II ) = ONE
-            CALL CLARF( SIDE, MI, NI, AP( II-I+1 ), 1, TAUI, C, LDC,
-     $                  WORK )
-            AP( II ) = AII
+            CALL CLARF1L( SIDE, MI, NI, AP( II-I+1 ), 1, TAUI, C,
+     $                    LDC, WORK )
 *
             IF( FORWRD ) THEN
                II = II + I + 2
@@ -305,8 +298,6 @@ SUBROUTINE CUPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC, WORK,
          END IF
 *
          DO 20 I = I1, I2, I3
-            AII = AP( II )
-            AP( II ) = ONE
             IF( LEFT ) THEN
 *
 *              H(i) or H(i)**H is applied to C(i+1:m,1:n)
@@ -328,9 +319,8 @@ SUBROUTINE CUPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC, WORK,
             ELSE
                TAUI = CONJG( TAU( I ) )
             END IF
-            CALL CLARF( SIDE, MI, NI, AP( II ), 1, TAUI, C( IC, JC ),
-     $                  LDC, WORK )
-            AP( II ) = AII
+            CALL CLARF1F( SIDE, MI, NI, AP( II ), 1, TAUI, C( IC,
+     $                    JC ), LDC, WORK )
 *
             IF( FORWRD ) THEN
                II = II + NQ - I + 1
diff --git a/SRC/dbbcsd.f b/SRC/dbbcsd.f
index 4fcf9ab5de..c7780b8f8e 100644
--- a/SRC/dbbcsd.f
+++ b/SRC/dbbcsd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DBBCSD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dbbcsd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dbbcsd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -322,13 +320,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup bbcsd
 *
 *  =====================================================================
-      SUBROUTINE DBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
+      SUBROUTINE DBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P,
+     $                   Q,
      $                   THETA, PHI, U1, LDU1, U2, LDU2, V1T, LDV1T,
      $                   V2T, LDV2T, B11D, B11E, B12D, B12E, B21D, B21E,
      $                   B22D, B22E, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -372,7 +372,8 @@ SUBROUTINE DBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
      $                   UNFL, X1, X2, Y1, Y2
 *
 *     .. External Subroutines ..
-      EXTERNAL           DLASR, DSCAL, DSWAP, DLARTGP, DLARTGS, DLAS2,
+      EXTERNAL           DLASR, DSCAL, DSWAP, DLARTGP, DLARTGS,
+     $                   DLAS2,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
@@ -559,9 +560,11 @@ SUBROUTINE DBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
 *
 *           Compute shifts for B11 and B21 and use the lesser
 *
-            CALL DLAS2( B11D(IMAX-1), B11E(IMAX-1), B11D(IMAX), SIGMA11,
+            CALL DLAS2( B11D(IMAX-1), B11E(IMAX-1), B11D(IMAX),
+     $                  SIGMA11,
      $                  DUMMY )
-            CALL DLAS2( B21D(IMAX-1), B21E(IMAX-1), B21D(IMAX), SIGMA21,
+            CALL DLAS2( B21D(IMAX-1), B21E(IMAX-1), B21D(IMAX),
+     $                  SIGMA21,
      $                  DUMMY )
 *
             IF( SIGMA11 .LE. SIGMA21 ) THEN
@@ -697,7 +700,8 @@ SUBROUTINE DBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
 *           chasing by applying the original shift again.
 *
             IF( .NOT. RESTART11 .AND. .NOT. RESTART21 ) THEN
-               CALL DLARTGP( X2, X1, WORK(IV1TSN+I-1), WORK(IV1TCS+I-1),
+               CALL DLARTGP( X2, X1, WORK(IV1TSN+I-1),
+     $                       WORK(IV1TCS+I-1),
      $                       R )
             ELSE IF( .NOT. RESTART11 .AND. RESTART21 ) THEN
                CALL DLARTGP( B11BULGE, B11E(I-1), WORK(IV1TSN+I-1),
@@ -724,10 +728,12 @@ SUBROUTINE DBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
                CALL DLARTGP( B22BULGE, B22D(I-1), WORK(IV2TSN+I-1-1),
      $                       WORK(IV2TCS+I-1-1), R )
             ELSE IF( NU .LT. MU ) THEN
-               CALL DLARTGS( B12E(I-1), B12D(I), NU, WORK(IV2TCS+I-1-1),
+               CALL DLARTGS( B12E(I-1), B12D(I), NU,
+     $                       WORK(IV2TCS+I-1-1),
      $                       WORK(IV2TSN+I-1-1) )
             ELSE
-               CALL DLARTGS( B22E(I-1), B22D(I), MU, WORK(IV2TCS+I-1-1),
+               CALL DLARTGS( B22E(I-1), B22D(I), MU,
+     $                       WORK(IV2TCS+I-1-1),
      $                       WORK(IV2TSN+I-1-1) )
             END IF
 *
@@ -780,7 +786,8 @@ SUBROUTINE DBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
 *           chasing by applying the original shift again.
 *
             IF( .NOT. RESTART11 .AND. .NOT. RESTART12 ) THEN
-               CALL DLARTGP( X2, X1, WORK(IU1SN+I-1), WORK(IU1CS+I-1),
+               CALL DLARTGP( X2, X1, WORK(IU1SN+I-1),
+     $                       WORK(IU1CS+I-1),
      $                       R )
             ELSE IF( .NOT. RESTART11 .AND. RESTART12 ) THEN
                CALL DLARTGP( B11BULGE, B11D(I), WORK(IU1SN+I-1),
@@ -796,7 +803,8 @@ SUBROUTINE DBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
      $                       WORK(IU1SN+I-1) )
             END IF
             IF( .NOT. RESTART21 .AND. .NOT. RESTART22 ) THEN
-               CALL DLARTGP( Y2, Y1, WORK(IU2SN+I-1), WORK(IU2CS+I-1),
+               CALL DLARTGP( Y2, Y1, WORK(IU2SN+I-1),
+     $                       WORK(IU2CS+I-1),
      $                       R )
             ELSE IF( .NOT. RESTART21 .AND. RESTART22 ) THEN
                CALL DLARTGP( B21BULGE, B21D(I), WORK(IU2SN+I-1),
@@ -862,10 +870,12 @@ SUBROUTINE DBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
             CALL DLARTGP( Y2, Y1, WORK(IV2TSN+IMAX-1-1),
      $                    WORK(IV2TCS+IMAX-1-1), R )
          ELSE IF( .NOT. RESTART12 .AND. RESTART22 ) THEN
-            CALL DLARTGP( B12BULGE, B12D(IMAX-1), WORK(IV2TSN+IMAX-1-1),
+            CALL DLARTGP( B12BULGE, B12D(IMAX-1),
+     $                    WORK(IV2TSN+IMAX-1-1),
      $                    WORK(IV2TCS+IMAX-1-1), R )
          ELSE IF( RESTART12 .AND. .NOT. RESTART22 ) THEN
-            CALL DLARTGP( B22BULGE, B22D(IMAX-1), WORK(IV2TSN+IMAX-1-1),
+            CALL DLARTGP( B22BULGE, B22D(IMAX-1),
+     $                    WORK(IV2TSN+IMAX-1-1),
      $                    WORK(IV2TCS+IMAX-1-1), R )
          ELSE IF( NU .LT. MU ) THEN
             CALL DLARTGS( B12E(IMAX-1), B12D(IMAX), NU,
@@ -1052,7 +1062,8 @@ SUBROUTINE DBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
                IF( WANTU2 )
      $            CALL DSWAP( M-P, U2(1,I), 1, U2(1,MINI), 1 )
                IF( WANTV1T )
-     $            CALL DSWAP( Q, V1T(I,1), LDV1T, V1T(MINI,1), LDV1T )
+     $            CALL DSWAP( Q, V1T(I,1), LDV1T, V1T(MINI,1),
+     $                        LDV1T )
                IF( WANTV2T )
      $            CALL DSWAP( M-Q, V2T(I,1), LDV2T, V2T(MINI,1),
      $               LDV2T )
diff --git a/SRC/dbdsdc.f b/SRC/dbdsdc.f
index 99fe82296d..21907669fe 100644
--- a/SRC/dbdsdc.f
+++ b/SRC/dbdsdc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DBDSDC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dbdsdc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dbdsdc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -45,13 +43,6 @@
 *> respectively. DBDSDC can be used to compute all singular values,
 *> and optionally, singular vectors or singular vectors in compact form.
 *>
-*> This code makes very mild assumptions about floating point
-*> arithmetic. It will work on machines with a guard digit in
-*> add/subtract, or on those binary machines without guard digits
-*> which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or Cray-2.
-*> It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.  See DLASD3 for details.
-*>
 *> The code currently calls DLASDQ if singular values only are desired.
 *> However, it can be slightly modified to compute singular values
 *> using the divide and conquer method.
@@ -191,7 +182,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup bdsdc
 *
 *> \par Contributors:
 *  ==================
@@ -200,8 +191,10 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE DBDSDC( UPLO, COMPQ, N, D, E, U, LDU, VT, LDVT, Q, IQ,
+      SUBROUTINE DBDSDC( UPLO, COMPQ, N, D, E, U, LDU, VT, LDVT, Q,
+     $                   IQ,
      $                   WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -240,7 +233,8 @@ SUBROUTINE DBDSDC( UPLO, COMPQ, N, D, E, U, LDU, VT, LDVT, Q, IQ,
       EXTERNAL           LSAME, ILAENV, DLAMCH, DLANST
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLARTG, DLASCL, DLASD0, DLASDA, DLASDQ,
+      EXTERNAL           DCOPY, DLARTG, DLASCL, DLASD0, DLASDA,
+     $                   DLASDQ,
      $                   DLASET, DLASR, DSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -347,14 +341,17 @@ SUBROUTINE DBDSDC( UPLO, COMPQ, N, D, E, U, LDU, VT, LDVT, Q, IQ,
          IF( ICOMPQ.EQ.2 ) THEN
             CALL DLASET( 'A', N, N, ZERO, ONE, U, LDU )
             CALL DLASET( 'A', N, N, ZERO, ONE, VT, LDVT )
-            CALL DLASDQ( 'U', 0, N, N, N, 0, D, E, VT, LDVT, U, LDU, U,
+            CALL DLASDQ( 'U', 0, N, N, N, 0, D, E, VT, LDVT, U, LDU,
+     $                   U,
      $                   LDU, WORK( WSTART ), INFO )
          ELSE IF( ICOMPQ.EQ.1 ) THEN
             IU = 1
             IVT = IU + N
-            CALL DLASET( 'A', N, N, ZERO, ONE, Q( IU+( QSTART-1 )*N ),
+            CALL DLASET( 'A', N, N, ZERO, ONE,
+     $                   Q( IU+( QSTART-1 )*N ),
      $                   N )
-            CALL DLASET( 'A', N, N, ZERO, ONE, Q( IVT+( QSTART-1 )*N ),
+            CALL DLASET( 'A', N, N, ZERO, ONE,
+     $                   Q( IVT+( QSTART-1 )*N ),
      $                   N )
             CALL DLASDQ( 'U', 0, N, N, N, 0, D, E,
      $                   Q( IVT+( QSTART-1 )*N ), N,
@@ -512,7 +509,8 @@ SUBROUTINE DBDSDC( UPLO, COMPQ, N, D, E, U, LDU, VT, LDVT, Q, IQ,
 *     which rotated B to be upper bidiagonal
 *
       IF( ( IUPLO.EQ.2 ) .AND. ( ICOMPQ.EQ.2 ) )
-     $   CALL DLASR( 'L', 'V', 'B', N, N, WORK( 1 ), WORK( N ), U, LDU )
+     $   CALL DLASR( 'L', 'V', 'B', N, N, WORK( 1 ), WORK( N ), U,
+     $               LDU )
 *
       RETURN
 *
diff --git a/SRC/dbdsqr.f b/SRC/dbdsqr.f
index c220a5875d..7f6a276f8b 100644
--- a/SRC/dbdsqr.f
+++ b/SRC/dbdsqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DBDSQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dbdsqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dbdsqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -166,7 +164,9 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (4*(N-1))
+*>          WORK is DOUBLE PRECISION array, dimension (LWORK)
+*>          LWORK = 4*N, if NCVT = NRU = NCC = 0, and
+*>          LWORK = 4*(N-1), otherwise
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -233,11 +233,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup bdsqr
 *
 *  =====================================================================
       SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $                   LDU, C, LDC, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -278,7 +279,7 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $                   MAXITDIVN, NM1, NM12, NM13, OLDLL, OLDM
       DOUBLE PRECISION   ABSE, ABSS, COSL, COSR, CS, EPS, F, G, H, MU,
      $                   OLDCS, OLDSN, R, SHIFT, SIGMN, SIGMX, SINL,
-     $                   SINR, SLL, SMAX, SMIN, SMINL, SMINOA,
+     $                   SINR, SLL, SMAX, SMIN, SMINOA,
      $                   SN, THRESH, TOL, TOLMUL, UNFL
 *     ..
 *     .. External Functions ..
@@ -287,7 +288,8 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
       EXTERNAL           LSAME, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARTG, DLAS2, DLASQ1, DLASR, DLASV2, DROT,
+      EXTERNAL           DLARTG, DLAS2, DLASQ1, DLASR, DLASV2,
+     $                   DROT,
      $                   DSCAL, DSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -368,10 +370,12 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *        Update singular vectors if desired
 *
          IF( NRU.GT.0 )
-     $      CALL DLASR( 'R', 'V', 'F', NRU, N, WORK( 1 ), WORK( N ), U,
+     $      CALL DLASR( 'R', 'V', 'F', NRU, N, WORK( 1 ), WORK( N ),
+     $                  U,
      $                  LDU )
          IF( NCC.GT.0 )
-     $      CALL DLASR( 'L', 'V', 'F', N, NCC, WORK( 1 ), WORK( N ), C,
+     $      CALL DLASR( 'L', 'V', 'F', N, NCC, WORK( 1 ), WORK( N ),
+     $                  C,
      $                  LDC )
       END IF
 *
@@ -391,7 +395,7 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
       DO 30 I = 1, N - 1
          SMAX = MAX( SMAX, ABS( E( I ) ) )
    30 CONTINUE
-      SMINL = ZERO
+      SMIN = ZERO
       IF( TOL.GE.ZERO ) THEN
 *
 *        Relative accuracy desired
@@ -451,7 +455,6 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
       IF( TOL.LT.ZERO .AND. ABS( D( M ) ).LE.THRESH )
      $   D( M ) = ZERO
       SMAX = ABS( D( M ) )
-      SMIN = SMAX
       DO 70 LLL = 1, M - 1
          LL = M - LLL
          ABSS = ABS( D( LL ) )
@@ -460,7 +463,6 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $      D( LL ) = ZERO
          IF( ABSE.LE.THRESH )
      $      GO TO 80
-         SMIN = MIN( SMIN, ABSS )
          SMAX = MAX( SMAX, ABSS, ABSE )
    70 CONTINUE
       LL = 0
@@ -495,10 +497,12 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *        Compute singular vectors, if desired
 *
          IF( NCVT.GT.0 )
-     $      CALL DROT( NCVT, VT( M-1, 1 ), LDVT, VT( M, 1 ), LDVT, COSR,
+     $      CALL DROT( NCVT, VT( M-1, 1 ), LDVT, VT( M, 1 ), LDVT,
+     $                 COSR,
      $                 SINR )
          IF( NRU.GT.0 )
-     $      CALL DROT( NRU, U( 1, M-1 ), 1, U( 1, M ), 1, COSL, SINL )
+     $      CALL DROT( NRU, U( 1, M-1 ), 1, U( 1, M ), 1, COSL,
+     $                 SINL )
          IF( NCC.GT.0 )
      $      CALL DROT( NCC, C( M-1, 1 ), LDC, C( M, 1 ), LDC, COSL,
      $                 SINL )
@@ -542,14 +546,14 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *           apply convergence criterion forward
 *
             MU = ABS( D( LL ) )
-            SMINL = MU
+            SMIN = MU
             DO 100 LLL = LL, M - 1
                IF( ABS( E( LLL ) ).LE.TOL*MU ) THEN
                   E( LLL ) = ZERO
                   GO TO 60
                END IF
                MU = ABS( D( LLL+1 ) )*( MU / ( MU+ABS( E( LLL ) ) ) )
-               SMINL = MIN( SMINL, MU )
+               SMIN = MIN( SMIN, MU )
   100       CONTINUE
          END IF
 *
@@ -570,14 +574,14 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *           apply convergence criterion backward
 *
             MU = ABS( D( M ) )
-            SMINL = MU
+            SMIN = MU
             DO 110 LLL = M - 1, LL, -1
                IF( ABS( E( LLL ) ).LE.TOL*MU ) THEN
                   E( LLL ) = ZERO
                   GO TO 60
                END IF
                MU = ABS( D( LLL ) )*( MU / ( MU+ABS( E( LLL ) ) ) )
-               SMINL = MIN( SMINL, MU )
+               SMIN = MIN( SMIN, MU )
   110       CONTINUE
          END IF
       END IF
@@ -587,7 +591,7 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *     Compute shift.  First, test if shifting would ruin relative
 *     accuracy, and if so set the shift to zero.
 *
-      IF( TOL.GE.ZERO .AND. N*TOL*( SMINL / SMAX ).LE.
+      IF( TOL.GE.ZERO .AND. N*TOL*( SMIN / SMAX ).LE.
      $    MAX( EPS, HNDRTH*TOL ) ) THEN
 *
 *        Use a zero shift to avoid loss of relative accuracy
@@ -631,7 +635,8 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
                CALL DLARTG( D( I )*CS, E( I ), CS, SN, R )
                IF( I.GT.LL )
      $            E( I-1 ) = OLDSN*R
-               CALL DLARTG( OLDCS*R, D( I+1 )*SN, OLDCS, OLDSN, D( I ) )
+               CALL DLARTG( OLDCS*R, D( I+1 )*SN, OLDCS, OLDSN,
+     $                      D( I ) )
                WORK( I-LL+1 ) = CS
                WORK( I-LL+1+NM1 ) = SN
                WORK( I-LL+1+NM12 ) = OLDCS
@@ -647,10 +652,12 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $         CALL DLASR( 'L', 'V', 'F', M-LL+1, NCVT, WORK( 1 ),
      $                     WORK( N ), VT( LL, 1 ), LDVT )
             IF( NRU.GT.0 )
-     $         CALL DLASR( 'R', 'V', 'F', NRU, M-LL+1, WORK( NM12+1 ),
+     $         CALL DLASR( 'R', 'V', 'F', NRU, M-LL+1,
+     $                     WORK( NM12+1 ),
      $                     WORK( NM13+1 ), U( 1, LL ), LDU )
             IF( NCC.GT.0 )
-     $         CALL DLASR( 'L', 'V', 'F', M-LL+1, NCC, WORK( NM12+1 ),
+     $         CALL DLASR( 'L', 'V', 'F', M-LL+1, NCC,
+     $                     WORK( NM12+1 ),
      $                     WORK( NM13+1 ), C( LL, 1 ), LDC )
 *
 *           Test convergence
@@ -669,7 +676,8 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
                CALL DLARTG( D( I )*CS, E( I-1 ), CS, SN, R )
                IF( I.LT.M )
      $            E( I ) = OLDSN*R
-               CALL DLARTG( OLDCS*R, D( I-1 )*SN, OLDCS, OLDSN, D( I ) )
+               CALL DLARTG( OLDCS*R, D( I-1 )*SN, OLDCS, OLDSN,
+     $                      D( I ) )
                WORK( I-LL ) = CS
                WORK( I-LL+NM1 ) = -SN
                WORK( I-LL+NM12 ) = OLDCS
@@ -682,7 +690,8 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *           Update singular vectors
 *
             IF( NCVT.GT.0 )
-     $         CALL DLASR( 'L', 'V', 'B', M-LL+1, NCVT, WORK( NM12+1 ),
+     $         CALL DLASR( 'L', 'V', 'B', M-LL+1, NCVT,
+     $                     WORK( NM12+1 ),
      $                     WORK( NM13+1 ), VT( LL, 1 ), LDVT )
             IF( NRU.GT.0 )
      $         CALL DLASR( 'R', 'V', 'B', NRU, M-LL+1, WORK( 1 ),
@@ -737,10 +746,12 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $         CALL DLASR( 'L', 'V', 'F', M-LL+1, NCVT, WORK( 1 ),
      $                     WORK( N ), VT( LL, 1 ), LDVT )
             IF( NRU.GT.0 )
-     $         CALL DLASR( 'R', 'V', 'F', NRU, M-LL+1, WORK( NM12+1 ),
+     $         CALL DLASR( 'R', 'V', 'F', NRU, M-LL+1,
+     $                     WORK( NM12+1 ),
      $                     WORK( NM13+1 ), U( 1, LL ), LDU )
             IF( NCC.GT.0 )
-     $         CALL DLASR( 'L', 'V', 'F', M-LL+1, NCC, WORK( NM12+1 ),
+     $         CALL DLASR( 'L', 'V', 'F', M-LL+1, NCC,
+     $                     WORK( NM12+1 ),
      $                     WORK( NM13+1 ), C( LL, 1 ), LDC )
 *
 *           Test convergence
@@ -787,7 +798,8 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *           Update singular vectors if desired
 *
             IF( NCVT.GT.0 )
-     $         CALL DLASR( 'L', 'V', 'B', M-LL+1, NCVT, WORK( NM12+1 ),
+     $         CALL DLASR( 'L', 'V', 'B', M-LL+1, NCVT,
+     $                     WORK( NM12+1 ),
      $                     WORK( NM13+1 ), VT( LL, 1 ), LDVT )
             IF( NRU.GT.0 )
      $         CALL DLASR( 'R', 'V', 'B', NRU, M-LL+1, WORK( 1 ),
@@ -806,6 +818,12 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *
   160 CONTINUE
       DO 170 I = 1, N
+         IF( D( I ).EQ.ZERO ) THEN
+*
+*           Avoid -ZERO
+*
+            D( I ) = ZERO
+         END IF
          IF( D( I ).LT.ZERO ) THEN
             D( I ) = -D( I )
 *
@@ -843,7 +861,8 @@ SUBROUTINE DBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
             IF( NRU.GT.0 )
      $         CALL DSWAP( NRU, U( 1, ISUB ), 1, U( 1, N+1-I ), 1 )
             IF( NCC.GT.0 )
-     $         CALL DSWAP( NCC, C( ISUB, 1 ), LDC, C( N+1-I, 1 ), LDC )
+     $         CALL DSWAP( NCC, C( ISUB, 1 ), LDC, C( N+1-I, 1 ),
+     $                     LDC )
          END IF
   190 CONTINUE
       GO TO 220
diff --git a/SRC/dbdsvdx.f b/SRC/dbdsvdx.f
index 4ccd4edadb..3bce0f9a03 100644
--- a/SRC/dbdsvdx.f
+++ b/SRC/dbdsvdx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DBDSVDX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dbdsvdx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dbdsvdx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -45,7 +43,7 @@
 *>
 *>  Given an upper bidiagonal B with diagonal D = [ d_1 d_2 ... d_N ]
 *>  and superdiagonal E = [ e_1 e_2 ... e_N-1 ], DBDSVDX computes the
-*>  singular value decompositon of B through the eigenvalues and
+*>  singular value decomposition of B through the eigenvalues and
 *>  eigenvectors of the N*2-by-N*2 tridiagonal matrix
 *>
 *>        |  0  d_1                |
@@ -218,11 +216,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup bdsvdx
 *
 *  =====================================================================
       SUBROUTINE DBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $                    NS, S, Z, LDZ, WORK, IWORK, INFO)
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -263,10 +262,12 @@ SUBROUTINE DBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
       LOGICAL            LSAME
       INTEGER            IDAMAX
       DOUBLE PRECISION   DDOT, DLAMCH, DNRM2
-      EXTERNAL           IDAMAX, LSAME, DAXPY, DDOT, DLAMCH, DNRM2
+      EXTERNAL           IDAMAX, LSAME, DAXPY, DDOT, DLAMCH,
+     $                   DNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSTEVX, DCOPY, DLASET, DSCAL, DSWAP, XERBLA
+      EXTERNAL           DSTEVX, DCOPY, DLASET, DSCAL, DSWAP,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, SIGN, SQRT
@@ -423,7 +424,8 @@ SUBROUTINE DBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
          IF( NS.EQ.0 ) THEN
             RETURN
          ELSE
-            IF( WANTZ ) CALL DLASET( 'F', N*2, NS, ZERO, ZERO, Z, LDZ )
+            IF( WANTZ ) CALL DLASET( 'F', N*2, NS, ZERO, ZERO, Z,
+     $          LDZ )
          END IF
       ELSE IF( INDSV ) THEN
 *
@@ -460,7 +462,8 @@ SUBROUTINE DBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
 *
          IF( VLTGK.EQ.VUTGK ) VLTGK = VLTGK - TOL
 *
-         IF( WANTZ ) CALL DLASET( 'F', N*2, IU-IL+1, ZERO, ZERO, Z, LDZ)
+         IF( WANTZ ) CALL DLASET( 'F', N*2, IU-IL+1, ZERO, ZERO, Z,
+     $       LDZ)
       END IF
 *
 *     Initialize variables and pointers for S, Z, and WORK.
@@ -587,7 +590,8 @@ SUBROUTINE DBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
 *                 WORK( ITEMP: ): 2*5*NTGK
 *                 IWORK( 1: ): 2*6*NTGK
 *
-                  CALL DSTEVX( JOBZ, RNGVX, NTGK, WORK( IDTGK+ISPLT-1 ),
+                  CALL DSTEVX( JOBZ, RNGVX, NTGK,
+     $                         WORK( IDTGK+ISPLT-1 ),
      $                         WORK( IETGK+ISPLT-1 ), VLTGK, VUTGK,
      $                         ILTGK, IUTGK, ABSTOL, NSL, S( ISBEG ),
      $                         Z( IROWZ,ICOLZ ), LDZ, WORK( ITEMP ),
@@ -642,13 +646,15 @@ SUBROUTINE DBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $                      ABS( NRMU-ORTOL )*SQRT2.GT.ONE )
      $                      THEN
                            DO J = 0, I-1
-                              ZJTJI = -DDOT( NRU, Z( IROWU, ICOLZ+J ),
+                              ZJTJI = -DDOT( NRU, Z( IROWU,
+     $                                       ICOLZ+J ),
      $                                       2, Z( IROWU, ICOLZ+I ), 2 )
                               CALL DAXPY( NRU, ZJTJI,
      $                                    Z( IROWU, ICOLZ+J ), 2,
      $                                    Z( IROWU, ICOLZ+I ), 2 )
                            END DO
-                           NRMU = DNRM2( NRU, Z( IROWU, ICOLZ+I ), 2 )
+                           NRMU = DNRM2( NRU, Z( IROWU, ICOLZ+I ),
+     $                                   2 )
                            CALL DSCAL( NRU, ONE/NRMU,
      $                                 Z( IROWU,ICOLZ+I ), 2 )
                         END IF
@@ -665,13 +671,15 @@ SUBROUTINE DBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $                      ABS( NRMV-ORTOL )*SQRT2.GT.ONE )
      $                      THEN
                            DO J = 0, I-1
-                              ZJTJI = -DDOT( NRV, Z( IROWV, ICOLZ+J ),
+                              ZJTJI = -DDOT( NRV, Z( IROWV,
+     $                                       ICOLZ+J ),
      $                                       2, Z( IROWV, ICOLZ+I ), 2 )
                               CALL DAXPY( NRU, ZJTJI,
      $                                    Z( IROWV, ICOLZ+J ), 2,
      $                                    Z( IROWV, ICOLZ+I ), 2 )
                            END DO
-                           NRMV = DNRM2( NRV, Z( IROWV, ICOLZ+I ), 2 )
+                           NRMV = DNRM2( NRV, Z( IROWV, ICOLZ+I ),
+     $                                   2 )
                            CALL DSCAL( NRV, ONE/NRMV,
      $                                 Z( IROWV,ICOLZ+I ), 2 )
                         END IF
@@ -751,7 +759,8 @@ SUBROUTINE DBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
          IF( K.NE.NS+1-I ) THEN
             S( K ) = S( NS+1-I )
             S( NS+1-I ) = SMIN
-            IF( WANTZ ) CALL DSWAP( N*2, Z( 1,K ), 1, Z( 1,NS+1-I ), 1 )
+            IF( WANTZ ) CALL DSWAP( N*2, Z( 1,K ), 1, Z( 1,NS+1-I ),
+     $          1 )
          END IF
       END DO
 *
diff --git a/SRC/ddisna.f b/SRC/ddisna.f
index 1e5e9778e4..53493b7c38 100644
--- a/SRC/ddisna.f
+++ b/SRC/ddisna.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DDISNA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ddisna.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ddisna.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -110,10 +108,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup disna
 *
 *  =====================================================================
       SUBROUTINE DDISNA( JOB, M, N, D, SEP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dgbbrd.f b/SRC/dgbbrd.f
index 03aaa0a009..3b8b7d83a7 100644
--- a/SRC/dgbbrd.f
+++ b/SRC/dgbbrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGBBRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgbbrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgbbrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -179,11 +177,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBcomputational
+*> \ingroup gbbrd
 *
 *  =====================================================================
       SUBROUTINE DGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
      $                   LDQ, PT, LDPT, C, LDC, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -211,7 +210,8 @@ SUBROUTINE DGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
       DOUBLE PRECISION   RA, RB, RC, RS
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARGV, DLARTG, DLARTV, DLASET, DROT, XERBLA
+      EXTERNAL           DLARGV, DLARTG, DLARTV, DLASET, DROT,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -230,7 +230,9 @@ SUBROUTINE DGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
       WANTC = NCC.GT.0
       KLU1 = KL + KU + 1
       INFO = 0
-      IF( .NOT.WANTQ .AND. .NOT.WANTPT .AND. .NOT.LSAME( VECT, 'N' ) )
+      IF( .NOT.WANTQ .AND.
+     $    .NOT.WANTPT .AND.
+     $    .NOT.LSAME( VECT, 'N' ) )
      $     THEN
          INFO = -1
       ELSE IF( M.LT.0 ) THEN
@@ -327,7 +329,8 @@ SUBROUTINE DGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
                      NRT = NR
                   END IF
                   IF( NRT.GT.0 )
-     $               CALL DLARTV( NRT, AB( KLU1-L, J1-KLM+L-1 ), INCA,
+     $               CALL DLARTV( NRT, AB( KLU1-L, J1-KLM+L-1 ),
+     $                            INCA,
      $                            AB( KLU1-L+1, J1-KLM+L-1 ), INCA,
      $                            WORK( MN+J1 ), WORK( J1 ), KB1 )
    10          CONTINUE
@@ -367,7 +370,8 @@ SUBROUTINE DGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
 *                 apply plane rotations to C
 *
                   DO 30 J = J1, J2, KB1
-                     CALL DROT( NCC, C( J-1, 1 ), LDC, C( J, 1 ), LDC,
+                     CALL DROT( NCC, C( J-1, 1 ), LDC, C( J, 1 ),
+     $                          LDC,
      $                          WORK( MN+J ), WORK( J ) )
    30             CONTINUE
                END IF
diff --git a/SRC/dgbcon.f b/SRC/dgbcon.f
index 1ffb3c0f8b..739c311e59 100644
--- a/SRC/dgbcon.f
+++ b/SRC/dgbcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGBCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgbcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgbcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -138,11 +136,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBcomputational
+*> \ingroup gbcon
 *
 *  =====================================================================
-      SUBROUTINE DGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM, RCOND,
+      SUBROUTINE DGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM,
+     $                   RCOND,
      $                   WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -180,7 +180,8 @@ SUBROUTINE DGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM, RCOND,
       EXTERNAL           LSAME, IDAMAX, DDOT, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DLACN2, DLATBS, DRSCL, XERBLA
+      EXTERNAL           DAXPY, DLACN2, DLATBS, DRSCL,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MIN
@@ -249,13 +250,15 @@ SUBROUTINE DGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM, RCOND,
                      WORK( JP ) = WORK( J )
                      WORK( J ) = T
                   END IF
-                  CALL DAXPY( LM, -T, AB( KD+1, J ), 1, WORK( J+1 ), 1 )
+                  CALL DAXPY( LM, -T, AB( KD+1, J ), 1, WORK( J+1 ),
+     $                        1 )
    20          CONTINUE
             END IF
 *
 *           Multiply by inv(U).
 *
-            CALL DLATBS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL DLATBS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   KL+KU, AB, LDAB, WORK, SCALE, WORK( 2*N+1 ),
      $                   INFO )
          ELSE
diff --git a/SRC/dgbequ.f b/SRC/dgbequ.f
index ab8b20b2e2..e078fbf849 100644
--- a/SRC/dgbequ.f
+++ b/SRC/dgbequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGBEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgbequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgbequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -145,11 +143,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBcomputational
+*> \ingroup gbequ
 *
 *  =====================================================================
-      SUBROUTINE DGBEQU( M, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+      SUBROUTINE DGBEQU( M, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                   COLCND,
      $                   AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dgbequb.f b/SRC/dgbequb.f
index 93179f733d..41f7cfb100 100644
--- a/SRC/dgbequb.f
+++ b/SRC/dgbequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGBEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgbequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgbequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -152,11 +150,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBcomputational
+*> \ingroup gbequb
 *
 *  =====================================================================
-      SUBROUTINE DGBEQUB( M, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+      SUBROUTINE DGBEQUB( M, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                    COLCND,
      $                    AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dgbrfs.f b/SRC/dgbrfs.f
index 9520f23f66..ebb87dd22d 100644
--- a/SRC/dgbrfs.f
+++ b/SRC/dgbrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGBRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgbrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgbrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -196,12 +194,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBcomputational
+*> \ingroup gbrfs
 *
 *  =====================================================================
-      SUBROUTINE DGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
+      SUBROUTINE DGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
+     $                   LDAFB,
      $                   IPIV, B, LDB, X, LDX, FERR, BERR, WORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -241,7 +241,8 @@ SUBROUTINE DGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DGBMV, DGBTRS, DLACN2, XERBLA
+      EXTERNAL           DAXPY, DCOPY, DGBMV, DGBTRS, DLACN2,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN
@@ -320,7 +321,8 @@ SUBROUTINE DGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
 *        where op(A) = A, A**T, or A**H, depending on TRANS.
 *
          CALL DCOPY( N, B( 1, J ), 1, WORK( N+1 ), 1 )
-         CALL DGBMV( TRANS, N, N, KL, KU, -ONE, AB, LDAB, X( 1, J ), 1,
+         CALL DGBMV( TRANS, N, N, KL, KU, -ONE, AB, LDAB, X( 1, J ),
+     $               1,
      $               ONE, WORK( N+1 ), 1 )
 *
 *        Compute componentwise relative backward error from formula
@@ -418,7 +420,8 @@ SUBROUTINE DGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
 *
          KASE = 0
   100    CONTINUE
-         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
diff --git a/SRC/dgbrfsx.f b/SRC/dgbrfsx.f
index 8ab1a580fe..c601f0f594 100644
--- a/SRC/dgbrfsx.f
+++ b/SRC/dgbrfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGBRFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgbrfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgbrfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -429,14 +427,16 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBcomputational
+*> \ingroup gbrfsx
 *
 *  =====================================================================
-      SUBROUTINE DGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
+      SUBROUTINE DGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB,
+     $                    AFB,
      $                    LDAFB, IPIV, R, C, B, LDB, X, LDX, RCOND,
      $                    BERR, N_ERR_BNDS, ERR_BNDS_NORM,
      $                    ERR_BNDS_COMP, NPARAMS, PARAMS, WORK, IWORK,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -647,14 +647,16 @@ SUBROUTINE DGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
          PREC_TYPE = ILAPREC( 'E' )
 
          IF ( NOTRAN ) THEN
-            CALL DLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE,  N, KL, KU,
+            CALL DLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE,  N, KL,
+     $                                KU,
      $           NRHS, AB, LDAB, AFB, LDAFB, IPIV, COLEQU, C, B,
      $           LDB, X, LDX, BERR, N_NORMS, ERR_BNDS_NORM,
      $           ERR_BNDS_COMP, WORK( N+1 ), WORK( 1 ), WORK( 2*N+1 ),
      $           WORK( 1 ), RCOND, ITHRESH, RTHRESH, UNSTABLE_THRESH,
      $           IGNORE_CWISE, INFO )
          ELSE
-            CALL DLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE,  N, KL, KU,
+            CALL DLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE,  N, KL,
+     $                                KU,
      $           NRHS, AB, LDAB, AFB, LDAFB, IPIV, ROWEQU, R, B,
      $           LDB, X, LDX, BERR, N_NORMS, ERR_BNDS_NORM,
      $           ERR_BNDS_COMP, WORK( N+1 ), WORK( 1 ), WORK( 2*N+1 ),
@@ -663,7 +665,8 @@ SUBROUTINE DGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
          END IF
       END IF
 
-      ERR_LBND = MAX( 10.0D+0, SQRT( DBLE( N ) ) ) * DLAMCH( 'Epsilon' )
+      ERR_LBND = MAX( 10.0D+0,
+     $                SQRT( DBLE( N ) ) ) * DLAMCH( 'Epsilon' )
       IF ( N_ERR_BNDS .GE. 1 .AND. N_NORMS .GE. 1 ) THEN
 *
 *     Compute scaled normwise condition number cond(A*C).
@@ -721,7 +724,8 @@ SUBROUTINE DGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
          DO J = 1, NRHS
             IF ( ERR_BNDS_COMP( J, LA_LINRX_ERR_I ) .LT. CWISE_WRONG )
      $     THEN
-               RCOND_TMP = DLA_GBRCOND( TRANS, N, KL, KU, AB, LDAB, AFB,
+               RCOND_TMP = DLA_GBRCOND( TRANS, N, KL, KU, AB, LDAB,
+     $                                  AFB,
      $              LDAFB, IPIV, 1, X( 1, J ), INFO, WORK, IWORK )
             ELSE
                RCOND_TMP = 0.0D+0
diff --git a/SRC/dgbsv.f b/SRC/dgbsv.f
index 1d4e6cb938..e76ed38c4a 100644
--- a/SRC/dgbsv.f
+++ b/SRC/dgbsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGBSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgbsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgbsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,7 +131,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBsolve
+*> \ingroup gbsv
 *
 *> \par Further Details:
 *  =====================
@@ -158,7 +156,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DGBSV( N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB, INFO )
+      SUBROUTINE DGBSV( N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
+     $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -210,7 +210,8 @@ SUBROUTINE DGBSV( N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB, INFO )
 *
 *        Solve the system A*X = B, overwriting B with X.
 *
-         CALL DGBTRS( 'No transpose', N, KL, KU, NRHS, AB, LDAB, IPIV,
+         CALL DGBTRS( 'No transpose', N, KL, KU, NRHS, AB, LDAB,
+     $                IPIV,
      $                B, LDB, INFO )
       END IF
       RETURN
diff --git a/SRC/dgbsvx.f b/SRC/dgbsvx.f
index 030f28f0a6..d22a641d49 100644
--- a/SRC/dgbsvx.f
+++ b/SRC/dgbsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGBSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgbsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgbsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -316,7 +314,7 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (3*N)
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,3*N))
 *>          On exit, WORK(1) contains the reciprocal pivot growth
 *>          factor norm(A)/norm(U). The "max absolute element" norm is
 *>          used. If WORK(1) is much less than 1, then the stability
@@ -360,12 +358,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBsolve
+*> \ingroup gbsvx
 *
 *  =====================================================================
       SUBROUTINE DGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
      $                   LDAFB, IPIV, EQUED, R, C, B, LDB, X, LDX,
      $                   RCOND, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -402,7 +401,8 @@ SUBROUTINE DGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
       EXTERNAL           LSAME, DLAMCH, DLANGB, DLANTB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGBCON, DGBEQU, DGBRFS, DGBTRF, DGBTRS,
+      EXTERNAL           DCOPY, DGBCON, DGBEQU, DGBRFS, DGBTRF,
+     $                   DGBTRS,
      $                   DLACPY, DLAQGB, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -427,7 +427,9 @@ SUBROUTINE DGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
       ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
@@ -503,7 +505,8 @@ SUBROUTINE DGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *
 *           Equilibrate the matrix.
 *
-            CALL DLAQGB( N, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+            CALL DLAQGB( N, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                   COLCND,
      $                   AMAX, EQUED )
             ROWEQU = LSAME( EQUED, 'R' ) .OR. LSAME( EQUED, 'B' )
             COLEQU = LSAME( EQUED, 'C' ) .OR. LSAME( EQUED, 'B' )
@@ -554,7 +557,8 @@ SUBROUTINE DGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
                   ANORM = MAX( ANORM, ABS( AB( I, J ) ) )
    80          CONTINUE
    90       CONTINUE
-            RPVGRW = DLANTB( 'M', 'U', 'N', INFO, MIN( INFO-1, KL+KU ),
+            RPVGRW = DLANTB( 'M', 'U', 'N', INFO, MIN( INFO-1,
+     $                       KL+KU ),
      $                       AFB( MAX( 1, KL+KU+2-INFO ), 1 ), LDAFB,
      $                       WORK )
             IF( RPVGRW.EQ.ZERO ) THEN
@@ -598,7 +602,8 @@ SUBROUTINE DGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *     Use iterative refinement to improve the computed solution and
 *     compute error bounds and backward error estimates for it.
 *
-      CALL DGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB, IPIV,
+      CALL DGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
+     $             IPIV,
      $             B, LDB, X, LDX, FERR, BERR, WORK, IWORK, INFO )
 *
 *     Transform the solution matrix X to a solution of the original
diff --git a/SRC/dgbsvxx.f b/SRC/dgbsvxx.f
index 0ea26a3ec1..f560a2f50c 100644
--- a/SRC/dgbsvxx.f
+++ b/SRC/dgbsvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGBSVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgbsvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgbsvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -549,14 +547,16 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBsolve
+*> \ingroup gbsvxx
 *
 *  =====================================================================
-      SUBROUTINE DGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
+      SUBROUTINE DGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB,
+     $                    AFB,
      $                    LDAFB, IPIV, EQUED, R, C, B, LDB, X, LDX,
      $                    RCOND, RPVGRW, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -603,7 +603,8 @@ SUBROUTINE DGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
       DOUBLE PRECISION   DLAMCH, DLA_GBRPVGRW
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGBEQUB, DGBTRF, DGBTRS, DLACPY, DLAQGB,
+      EXTERNAL           DGBEQUB, DGBTRF, DGBTRS, DLACPY,
+     $                   DLAQGB,
      $                   XERBLA, DLASCL2, DGBRFSX
 *     ..
 *     .. Intrinsic Functions ..
@@ -710,7 +711,8 @@ SUBROUTINE DGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *
 *     Equilibrate the matrix.
 *
-            CALL DLAQGB( N, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+            CALL DLAQGB( N, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                   COLCND,
      $           AMAX, EQUED )
             ROWEQU = LSAME( EQUED, 'R' ) .OR. LSAME( EQUED, 'B' )
             COLEQU = LSAME( EQUED, 'C' ) .OR. LSAME( EQUED, 'B' )
@@ -776,7 +778,8 @@ SUBROUTINE DGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *     Use iterative refinement to improve the computed solution and
 *     compute error bounds and backward error estimates for it.
 *
-      CALL DGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
+      CALL DGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
+     $              LDAFB,
      $     IPIV, R, C, B, LDB, X, LDX, RCOND, BERR,
      $     N_ERR_BNDS, ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $     WORK, IWORK, INFO )
diff --git a/SRC/dgbtf2.f b/SRC/dgbtf2.f
index a643682582..8ff949b96e 100644
--- a/SRC/dgbtf2.f
+++ b/SRC/dgbtf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGBTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgbtf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgbtf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,7 +113,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBcomputational
+*> \ingroup gbtf2
 *
 *> \par Further Details:
 *  =====================
@@ -142,6 +140,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGBTF2( M, N, KL, KU, AB, LDAB, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -249,7 +248,8 @@ SUBROUTINE DGBTF2( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *              Compute multipliers.
 *
-               CALL DSCAL( KM, ONE / AB( KV+1, J ), AB( KV+2, J ), 1 )
+               CALL DSCAL( KM, ONE / AB( KV+1, J ), AB( KV+2, J ),
+     $                     1 )
 *
 *              Update trailing submatrix within the band.
 *
diff --git a/SRC/dgbtrf.f b/SRC/dgbtrf.f
index af305e26b4..6dd8d90082 100644
--- a/SRC/dgbtrf.f
+++ b/SRC/dgbtrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGBTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgbtrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgbtrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,7 +113,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBcomputational
+*> \ingroup gbtrf
 *
 *> \par Further Details:
 *  =====================
@@ -141,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -176,7 +175,8 @@ SUBROUTINE DGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
       EXTERNAL           IDAMAX, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGBTF2, DGEMM, DGER, DLASWP, DSCAL,
+      EXTERNAL           DCOPY, DGBTF2, DGEMM, DGER, DLASWP,
+     $                   DSCAL,
      $                   DSWAP, DTRSM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -324,7 +324,8 @@ SUBROUTINE DGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                 Compute multipliers
 *
-                  CALL DSCAL( KM, ONE / AB( KV+1, JJ ), AB( KV+2, JJ ),
+                  CALL DSCAL( KM, ONE / AB( KV+1, JJ ), AB( KV+2,
+     $                        JJ ),
      $                        1 )
 *
 *                 Update trailing submatrix within the band and within
@@ -393,7 +394,8 @@ SUBROUTINE DGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                 Update A12
 *
-                  CALL DTRSM( 'Left', 'Lower', 'No transpose', 'Unit',
+                  CALL DTRSM( 'Left', 'Lower', 'No transpose',
+     $                        'Unit',
      $                        JB, J2, ONE, AB( KV+1, J ), LDAB-1,
      $                        AB( KV+1-JB, J+JB ), LDAB-1 )
 *
@@ -401,7 +403,8 @@ SUBROUTINE DGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                    Update A22
 *
-                     CALL DGEMM( 'No transpose', 'No transpose', I2, J2,
+                     CALL DGEMM( 'No transpose', 'No transpose', I2,
+     $                           J2,
      $                           JB, -ONE, AB( KV+1+JB, J ), LDAB-1,
      $                           AB( KV+1-JB, J+JB ), LDAB-1, ONE,
      $                           AB( KV+1, J+JB ), LDAB-1 )
@@ -411,7 +414,8 @@ SUBROUTINE DGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                    Update A32
 *
-                     CALL DGEMM( 'No transpose', 'No transpose', I3, J2,
+                     CALL DGEMM( 'No transpose', 'No transpose', I3,
+     $                           J2,
      $                           JB, -ONE, WORK31, LDWORK,
      $                           AB( KV+1-JB, J+JB ), LDAB-1, ONE,
      $                           AB( KV+KL+1-JB, J+JB ), LDAB-1 )
@@ -431,7 +435,8 @@ SUBROUTINE DGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                 Update A13 in the work array
 *
-                  CALL DTRSM( 'Left', 'Lower', 'No transpose', 'Unit',
+                  CALL DTRSM( 'Left', 'Lower', 'No transpose',
+     $                        'Unit',
      $                        JB, J3, ONE, AB( KV+1, J ), LDAB-1,
      $                        WORK13, LDWORK )
 *
@@ -439,7 +444,8 @@ SUBROUTINE DGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                    Update A23
 *
-                     CALL DGEMM( 'No transpose', 'No transpose', I2, J3,
+                     CALL DGEMM( 'No transpose', 'No transpose', I2,
+     $                           J3,
      $                           JB, -ONE, AB( KV+1+JB, J ), LDAB-1,
      $                           WORK13, LDWORK, ONE, AB( 1+JB, J+KV ),
      $                           LDAB-1 )
@@ -449,7 +455,8 @@ SUBROUTINE DGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                    Update A33
 *
-                     CALL DGEMM( 'No transpose', 'No transpose', I3, J3,
+                     CALL DGEMM( 'No transpose', 'No transpose', I3,
+     $                           J3,
      $                           JB, -ONE, WORK31, LDWORK, WORK13,
      $                           LDWORK, ONE, AB( 1+KL, J+KV ), LDAB-1 )
                   END IF
diff --git a/SRC/dgbtrs.f b/SRC/dgbtrs.f
index f22d802de7..be2a6d49cc 100644
--- a/SRC/dgbtrs.f
+++ b/SRC/dgbtrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGBTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgbtrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgbtrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,11 +128,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBcomputational
+*> \ingroup gbtrs
 *
 *  =====================================================================
-      SUBROUTINE DGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
+      SUBROUTINE DGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B,
+     $                   LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -221,7 +221,8 @@ SUBROUTINE DGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
                L = IPIV( J )
                IF( L.NE.J )
      $            CALL DSWAP( NRHS, B( L, 1 ), LDB, B( J, 1 ), LDB )
-               CALL DGER( LM, NRHS, -ONE, AB( KD+1, J ), 1, B( J, 1 ),
+               CALL DGER( LM, NRHS, -ONE, AB( KD+1, J ), 1, B( J,
+     $                    1 ),
      $                    LDB, B( J+1, 1 ), LDB )
    10       CONTINUE
          END IF
@@ -230,7 +231,8 @@ SUBROUTINE DGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
 *
 *           Solve U*X = B, overwriting B with X.
 *
-            CALL DTBSV( 'Upper', 'No transpose', 'Non-unit', N, KL+KU,
+            CALL DTBSV( 'Upper', 'No transpose', 'Non-unit', N,
+     $                  KL+KU,
      $                  AB, LDAB, B( 1, I ), 1 )
    20    CONTINUE
 *
@@ -242,7 +244,8 @@ SUBROUTINE DGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
 *
 *           Solve U**T*X = B, overwriting B with X.
 *
-            CALL DTBSV( 'Upper', 'Transpose', 'Non-unit', N, KL+KU, AB,
+            CALL DTBSV( 'Upper', 'Transpose', 'Non-unit', N, KL+KU,
+     $                  AB,
      $                  LDAB, B( 1, I ), 1 )
    30    CONTINUE
 *
diff --git a/SRC/dgebak.f b/SRC/dgebak.f
index e978d7af29..96eb5c36ca 100644
--- a/SRC/dgebak.f
+++ b/SRC/dgebak.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEBAK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgebak.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgebak.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,11 +120,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gebak
 *
 *  =====================================================================
       SUBROUTINE DGEBAK( JOB, SIDE, N, ILO, IHI, SCALE, M, V, LDV,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -169,8 +168,10 @@ SUBROUTINE DGEBAK( JOB, SIDE, N, ILO, IHI, SCALE, M, V, LDV,
       LEFTV = LSAME( SIDE, 'L' )
 *
       INFO = 0
-      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
-     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+      IF( .NOT.LSAME( JOB, 'N' ) .AND.
+     $    .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND.
+     $                .NOT.LSAME( JOB, 'B' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.RIGHTV .AND. .NOT.LEFTV ) THEN
          INFO = -2
@@ -236,7 +237,7 @@ SUBROUTINE DGEBAK( JOB, SIDE, N, ILO, IHI, SCALE, M, V, LDV,
      $            GO TO 40
                IF( I.LT.ILO )
      $            I = ILO - II
-               K = SCALE( I )
+               K = INT( SCALE( I ) )
                IF( K.EQ.I )
      $            GO TO 40
                CALL DSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
@@ -250,7 +251,7 @@ SUBROUTINE DGEBAK( JOB, SIDE, N, ILO, IHI, SCALE, M, V, LDV,
      $            GO TO 50
                IF( I.LT.ILO )
      $            I = ILO - II
-               K = SCALE( I )
+               K = INT( SCALE( I ) )
                IF( K.EQ.I )
      $            GO TO 50
                CALL DSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
diff --git a/SRC/dgebal.f b/SRC/dgebal.f
index 821c7704a2..185a3cee6a 100644
--- a/SRC/dgebal.f
+++ b/SRC/dgebal.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEBAL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgebal.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgebal.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,7 +119,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gebal
 *
 *> \par Further Details:
 *  =====================
@@ -153,10 +151,14 @@
 *>
 *>  Modified by Tzu-Yi Chen, Computer Science Division, University of
 *>    California at Berkeley, USA
+*>
+*>  Refactored by Evert Provoost, Department of Computer Science,
+*>    KU Leuven, Belgium
 *> \endverbatim
 *>
 *  =====================================================================
       SUBROUTINE DGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -181,8 +183,8 @@ SUBROUTINE DGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
       PARAMETER          ( FACTOR = 0.95D+0 )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            NOCONV
-      INTEGER            I, ICA, IEXC, IRA, J, K, L, M
+      LOGICAL            NOCONV, CANSWAP
+      INTEGER            I, ICA, IRA, J, K, L
       DOUBLE PRECISION   C, CA, F, G, R, RA, S, SFMAX1, SFMAX2, SFMIN1,
      $                   SFMIN2
 *     ..
@@ -190,7 +192,8 @@ SUBROUTINE DGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
       LOGICAL            DISNAN, LSAME
       INTEGER            IDAMAX
       DOUBLE PRECISION   DLAMCH, DNRM2
-      EXTERNAL           DISNAN, LSAME, IDAMAX, DLAMCH, DNRM2
+      EXTERNAL           DISNAN, LSAME, IDAMAX, DLAMCH,
+     $                   DNRM2
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           DSCAL, DSWAP, XERBLA
@@ -201,8 +204,10 @@ SUBROUTINE DGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
 *     Test the input parameters
 *
       INFO = 0
-      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
-     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+      IF( .NOT.LSAME( JOB, 'N' ) .AND.
+     $    .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND.
+     $                .NOT.LSAME( JOB, 'B' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -214,177 +219,194 @@ SUBROUTINE DGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
          RETURN
       END IF
 *
-      K = 1
-      L = N
+*     Quick returns.
 *
-      IF( N.EQ.0 )
-     $   GO TO 210
+      IF( N.EQ.0 ) THEN
+         ILO = 1
+         IHI = 0
+         RETURN
+      END IF
 *
       IF( LSAME( JOB, 'N' ) ) THEN
-         DO 10 I = 1, N
+         DO I = 1, N
             SCALE( I ) = ONE
-   10    CONTINUE
-         GO TO 210
+         END DO
+         ILO = 1
+         IHI = N
+         RETURN
       END IF
 *
-      IF( LSAME( JOB, 'S' ) )
-     $   GO TO 120
-*
-*     Permutation to isolate eigenvalues if possible
-*
-      GO TO 50
-*
-*     Row and column exchange.
-*
-   20 CONTINUE
-      SCALE( M ) = J
-      IF( J.EQ.M )
-     $   GO TO 30
-*
-      CALL DSWAP( L, A( 1, J ), 1, A( 1, M ), 1 )
-      CALL DSWAP( N-K+1, A( J, K ), LDA, A( M, K ), LDA )
-*
-   30 CONTINUE
-      GO TO ( 40, 80 )IEXC
-*
-*     Search for rows isolating an eigenvalue and push them down.
-*
-   40 CONTINUE
-      IF( L.EQ.1 )
-     $   GO TO 210
-      L = L - 1
-*
-   50 CONTINUE
-      DO 70 J = L, 1, -1
+*     Permutation to isolate eigenvalues if possible.
 *
-         DO 60 I = 1, L
-            IF( I.EQ.J )
-     $         GO TO 60
-            IF( A( J, I ).NE.ZERO )
-     $         GO TO 70
-   60    CONTINUE
-*
-         M = L
-         IEXC = 1
-         GO TO 20
-   70 CONTINUE
-*
-      GO TO 90
+      K = 1
+      L = N
 *
-*     Search for columns isolating an eigenvalue and push them left.
+      IF( .NOT.LSAME( JOB, 'S' ) ) THEN
 *
-   80 CONTINUE
-      K = K + 1
+*        Row and column exchange.
 *
-   90 CONTINUE
-      DO 110 J = K, L
+         NOCONV = .TRUE.
+         DO WHILE( NOCONV )
+*
+*           Search for rows isolating an eigenvalue and push them down.
+*
+            NOCONV = .FALSE.
+            DO I = L, 1, -1
+               CANSWAP = .TRUE.
+               DO J = 1, L
+                  IF( I.NE.J .AND. A( I, J ).NE.ZERO ) THEN
+                     CANSWAP = .FALSE.
+                     EXIT
+                  END IF
+               END DO
+*
+               IF( CANSWAP ) THEN
+                  SCALE( L ) = I
+                  IF( I.NE.L ) THEN
+                     CALL DSWAP( L, A( 1, I ), 1, A( 1, L ), 1 )
+                     CALL DSWAP( N-K+1, A( I, K ), LDA, A( L, K ),
+     $                           LDA )
+                  END IF
+                  NOCONV = .TRUE.
+*
+                  IF( L.EQ.1 ) THEN
+                     ILO = 1
+                     IHI = 1
+                     RETURN
+                  END IF
+*
+                  L = L - 1
+               END IF
+            END DO
+*
+         END DO
+
+         NOCONV = .TRUE.
+         DO WHILE( NOCONV )
+*
+*           Search for columns isolating an eigenvalue and push them left.
+*
+            NOCONV = .FALSE.
+            DO J = K, L
+               CANSWAP = .TRUE.
+               DO I = K, L
+                  IF( I.NE.J .AND. A( I, J ).NE.ZERO ) THEN
+                     CANSWAP = .FALSE.
+                     EXIT
+                  END IF
+               END DO
+*
+               IF( CANSWAP ) THEN
+                  SCALE( K ) = J
+                  IF( J.NE.K ) THEN
+                     CALL DSWAP( L, A( 1, J ), 1, A( 1, K ), 1 )
+                     CALL DSWAP( N-K+1, A( J, K ), LDA, A( K, K ),
+     $                           LDA )
+                  END IF
+                  NOCONV = .TRUE.
+*
+                  K = K + 1
+               END IF
+            END DO
+*
+         END DO
 *
-         DO 100 I = K, L
-            IF( I.EQ.J )
-     $         GO TO 100
-            IF( A( I, J ).NE.ZERO )
-     $         GO TO 110
-  100    CONTINUE
+      END IF
 *
-         M = K
-         IEXC = 2
-         GO TO 20
-  110 CONTINUE
+*     Initialize SCALE for non-permuted submatrix.
 *
-  120 CONTINUE
-      DO 130 I = K, L
+      DO I = K, L
          SCALE( I ) = ONE
-  130 CONTINUE
+      END DO
 *
-      IF( LSAME( JOB, 'P' ) )
-     $   GO TO 210
+*     If we only had to permute, we are done.
+*
+      IF( LSAME( JOB, 'P' ) ) THEN
+         ILO = K
+         IHI = L
+         RETURN
+      END IF
 *
 *     Balance the submatrix in rows K to L.
 *
-*     Iterative loop for norm reduction
+*     Iterative loop for norm reduction.
 *
       SFMIN1 = DLAMCH( 'S' ) / DLAMCH( 'P' )
       SFMAX1 = ONE / SFMIN1
       SFMIN2 = SFMIN1*SCLFAC
       SFMAX2 = ONE / SFMIN2
 *
-  140 CONTINUE
-      NOCONV = .FALSE.
+      NOCONV = .TRUE.
+      DO WHILE( NOCONV )
+         NOCONV = .FALSE.
 *
-      DO 200 I = K, L
+         DO I = K, L
 *
-         C = DNRM2( L-K+1, A( K, I ), 1 )
-         R = DNRM2( L-K+1, A( I, K ), LDA )
-         ICA = IDAMAX( L, A( 1, I ), 1 )
-         CA = ABS( A( ICA, I ) )
-         IRA = IDAMAX( N-K+1, A( I, K ), LDA )
-         RA = ABS( A( I, IRA+K-1 ) )
+            C = DNRM2( L-K+1, A( K, I ), 1 )
+            R = DNRM2( L-K+1, A( I, K ), LDA )
+            ICA = IDAMAX( L, A( 1, I ), 1 )
+            CA = ABS( A( ICA, I ) )
+            IRA = IDAMAX( N-K+1, A( I, K ), LDA )
+            RA = ABS( A( I, IRA+K-1 ) )
 *
-*        Guard against zero C or R due to underflow.
+*           Guard against zero C or R due to underflow.
 *
-         IF( C.EQ.ZERO .OR. R.EQ.ZERO )
-     $      GO TO 200
-         G = R / SCLFAC
-         F = ONE
-         S = C + R
-  160    CONTINUE
-         IF( C.GE.G .OR. MAX( F, C, CA ).GE.SFMAX2 .OR.
-     $       MIN( R, G, RA ).LE.SFMIN2 )GO TO 170
-            IF( DISNAN( C+F+CA+R+G+RA ) ) THEN
+            IF( C.EQ.ZERO .OR. R.EQ.ZERO ) CYCLE
 *
 *           Exit if NaN to avoid infinite loop
 *
-            INFO = -3
-            CALL XERBLA( 'DGEBAL', -INFO )
-            RETURN
-         END IF
-         F = F*SCLFAC
-         C = C*SCLFAC
-         CA = CA*SCLFAC
-         R = R / SCLFAC
-         G = G / SCLFAC
-         RA = RA / SCLFAC
-         GO TO 160
-*
-  170    CONTINUE
-         G = C / SCLFAC
-  180    CONTINUE
-         IF( G.LT.R .OR. MAX( R, RA ).GE.SFMAX2 .OR.
-     $       MIN( F, C, G, CA ).LE.SFMIN2 )GO TO 190
-         F = F / SCLFAC
-         C = C / SCLFAC
-         G = G / SCLFAC
-         CA = CA / SCLFAC
-         R = R*SCLFAC
-         RA = RA*SCLFAC
-         GO TO 180
-*
-*        Now balance.
-*
-  190    CONTINUE
-         IF( ( C+R ).GE.FACTOR*S )
-     $      GO TO 200
-         IF( F.LT.ONE .AND. SCALE( I ).LT.ONE ) THEN
-            IF( F*SCALE( I ).LE.SFMIN1 )
-     $         GO TO 200
-         END IF
-         IF( F.GT.ONE .AND. SCALE( I ).GT.ONE ) THEN
-            IF( SCALE( I ).GE.SFMAX1 / F )
-     $         GO TO 200
-         END IF
-         G = ONE / F
-         SCALE( I ) = SCALE( I )*F
-         NOCONV = .TRUE.
-*
-         CALL DSCAL( N-K+1, G, A( I, K ), LDA )
-         CALL DSCAL( L, F, A( 1, I ), 1 )
-*
-  200 CONTINUE
-*
-      IF( NOCONV )
-     $   GO TO 140
+            IF( DISNAN( C+CA+R+RA ) ) THEN
+               INFO = -3
+               CALL XERBLA( 'DGEBAL', -INFO )
+               RETURN
+            END IF
+*
+            G = R / SCLFAC
+            F = ONE
+            S = C + R
+*
+            DO WHILE( C.LT.G .AND. MAX( F, C, CA ).LT.SFMAX2 .AND.
+     $                MIN( R, G, RA ).GT.SFMIN2 )
+               F = F*SCLFAC
+               C = C*SCLFAC
+               CA = CA*SCLFAC
+               R = R / SCLFAC
+               G = G / SCLFAC
+               RA = RA / SCLFAC
+            END DO
+*
+            G = C / SCLFAC
+*
+            DO WHILE( G.GE.R .AND. MAX( R, RA ).LT.SFMAX2 .AND.
+     $                MIN( F, C, G, CA ).GT.SFMIN2 )
+               F = F / SCLFAC
+               C = C / SCLFAC
+               G = G / SCLFAC
+               CA = CA / SCLFAC
+               R = R*SCLFAC
+               RA = RA*SCLFAC
+            END DO
+*
+*           Now balance.
+*
+            IF( ( C+R ).GE.FACTOR*S ) CYCLE
+            IF( F.LT.ONE .AND. SCALE( I ).LT.ONE ) THEN
+               IF( F*SCALE( I ).LE.SFMIN1 ) CYCLE
+            END IF
+            IF( F.GT.ONE .AND. SCALE( I ).GT.ONE ) THEN
+               IF( SCALE( I ).GE.SFMAX1 / F ) CYCLE
+            END IF
+            G = ONE / F
+            SCALE( I ) = SCALE( I )*F
+            NOCONV = .TRUE.
+*
+            CALL DSCAL( N-K+1, G, A( I, K ), LDA )
+            CALL DSCAL( L, F, A( 1, I ), 1 )
+*
+         END DO
+*
+      END DO
 *
-  210 CONTINUE
       ILO = K
       IHI = L
 *
diff --git a/SRC/dgebd2.f b/SRC/dgebd2.f
index daaa187aff..b94bcc4784 100644
--- a/SRC/dgebd2.f
+++ b/SRC/dgebd2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEBD2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgebd2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgebd2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gebd2
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +184,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -202,14 +201,14 @@ SUBROUTINE DGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
 *  =====================================================================
 *
 *     .. Parameters ..
-      DOUBLE PRECISION   ZERO, ONE
-      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+      DOUBLE PRECISION   ZERO
+      PARAMETER          ( ZERO = 0.0D+0 )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARF, DLARFG, XERBLA
+      EXTERNAL           DLARF1F, DLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -242,14 +241,13 @@ SUBROUTINE DGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
             CALL DLARFG( M-I+1, A( I, I ), A( MIN( I+1, M ), I ), 1,
      $                   TAUQ( I ) )
             D( I ) = A( I, I )
-            A( I, I ) = ONE
 *
 *           Apply H(i) to A(i:m,i+1:n) from the left
 *
             IF( I.LT.N )
-     $         CALL DLARF( 'Left', M-I+1, N-I, A( I, I ), 1, TAUQ( I ),
+     $         CALL DLARF1F( 'Left', M-I+1, N-I, A( I, I ), 1,
+     $                     TAUQ( I ),
      $                     A( I, I+1 ), LDA, WORK )
-            A( I, I ) = D( I )
 *
             IF( I.LT.N ) THEN
 *
@@ -259,13 +257,11 @@ SUBROUTINE DGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
                CALL DLARFG( N-I, A( I, I+1 ), A( I, MIN( I+2, N ) ),
      $                      LDA, TAUP( I ) )
                E( I ) = A( I, I+1 )
-               A( I, I+1 ) = ONE
 *
 *              Apply G(i) to A(i+1:m,i+1:n) from the right
 *
-               CALL DLARF( 'Right', M-I, N-I, A( I, I+1 ), LDA,
+               CALL DLARF1F( 'Right', M-I, N-I, A( I, I+1 ), LDA,
      $                     TAUP( I ), A( I+1, I+1 ), LDA, WORK )
-               A( I, I+1 ) = E( I )
             ELSE
                TAUP( I ) = ZERO
             END IF
@@ -278,33 +274,32 @@ SUBROUTINE DGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
 *
 *           Generate elementary reflector G(i) to annihilate A(i,i+1:n)
 *
-            CALL DLARFG( N-I+1, A( I, I ), A( I, MIN( I+1, N ) ), LDA,
+            CALL DLARFG( N-I+1, A( I, I ), A( I, MIN( I+1, N ) ),
+     $                   LDA,
      $                   TAUP( I ) )
             D( I ) = A( I, I )
-            A( I, I ) = ONE
 *
 *           Apply G(i) to A(i+1:m,i:n) from the right
 *
             IF( I.LT.M )
-     $         CALL DLARF( 'Right', M-I, N-I+1, A( I, I ), LDA,
+     $         CALL DLARF1F( 'Right', M-I, N-I+1, A( I, I ), LDA,
      $                     TAUP( I ), A( I+1, I ), LDA, WORK )
-            A( I, I ) = D( I )
 *
             IF( I.LT.M ) THEN
 *
 *              Generate elementary reflector H(i) to annihilate
 *              A(i+2:m,i)
 *
-               CALL DLARFG( M-I, A( I+1, I ), A( MIN( I+2, M ), I ), 1,
+               CALL DLARFG( M-I, A( I+1, I ), A( MIN( I+2, M ), I ),
+     $                      1,
      $                      TAUQ( I ) )
                E( I ) = A( I+1, I )
-               A( I+1, I ) = ONE
 *
 *              Apply H(i) to A(i+1:m,i+1:n) from the left
 *
-               CALL DLARF( 'Left', M-I, N-I, A( I+1, I ), 1, TAUQ( I ),
+               CALL DLARF1F( 'Left', M-I, N-I, A( I+1, I ), 1,
+     $                     TAUQ( I ),
      $                     A( I+1, I+1 ), LDA, WORK )
-               A( I+1, I ) = E( I )
             ELSE
                TAUQ( I ) = ZERO
             END IF
diff --git a/SRC/dgebrd.f b/SRC/dgebrd.f
index 0f0d1651a7..9f6b1f3c7c 100644
--- a/SRC/dgebrd.f
+++ b/SRC/dgebrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEBRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgebrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgebrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,7 +120,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of the array WORK.  LWORK >= max(1,M,N).
+*>          The length of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= MAX(M,N), otherwise.
 *>          For optimum performance LWORK >= (M+N)*NB, where NB
 *>          is the optimal blocksize.
 *>
@@ -147,7 +146,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gebrd
 *
 *> \par Further Details:
 *  =====================
@@ -202,6 +201,7 @@
 *  =====================================================================
       SUBROUTINE DGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,8 +223,8 @@ SUBROUTINE DGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY
-      INTEGER            I, IINFO, J, LDWRKX, LDWRKY, LWKOPT, MINMN, NB,
-     $                   NBMIN, NX, WS
+      INTEGER            I, IINFO, J, LDWRKX, LDWRKY, LWKMIN, LWKOPT,
+     $                   MINMN, NB, NBMIN, NX, WS
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           DGEBD2, DGEMM, DLABRD, XERBLA
@@ -241,9 +241,17 @@ SUBROUTINE DGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *     Test the input parameters
 *
       INFO = 0
-      NB = MAX( 1, ILAENV( 1, 'DGEBRD', ' ', M, N, -1, -1 ) )
-      LWKOPT = ( M+N )*NB
+      MINMN = MIN( M, N )
+      IF( MINMN.EQ.0 ) THEN
+         LWKMIN = 1
+         LWKOPT = 1
+      ELSE
+         LWKMIN = MAX( M, N )
+         NB = MAX( 1, ILAENV( 1, 'DGEBRD', ' ', M, N, -1, -1 ) )
+         LWKOPT = ( M+N )*NB
+      ENDIF
       WORK( 1 ) = DBLE( LWKOPT )
+*
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -251,7 +259,7 @@ SUBROUTINE DGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, M, N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -10
       END IF
       IF( INFO.LT.0 ) THEN
@@ -263,7 +271,6 @@ SUBROUTINE DGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *
 *     Quick return if possible
 *
-      MINMN = MIN( M, N )
       IF( MINMN.EQ.0 ) THEN
          WORK( 1 ) = 1
          RETURN
@@ -282,7 +289,7 @@ SUBROUTINE DGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *        Determine when to switch from blocked to unblocked code.
 *
          IF( NX.LT.MINMN ) THEN
-            WS = ( M+N )*NB
+            WS = LWKOPT
             IF( LWORK.LT.WS ) THEN
 *
 *              Not enough work space for the optimal NB, consider using
@@ -307,7 +314,8 @@ SUBROUTINE DGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *        the matrices X and Y which are needed to update the unreduced
 *        part of the matrix
 *
-         CALL DLABRD( M-I+1, N-I+1, NB, A( I, I ), LDA, D( I ), E( I ),
+         CALL DLABRD( M-I+1, N-I+1, NB, A( I, I ), LDA, D( I ),
+     $                E( I ),
      $                TAUQ( I ), TAUP( I ), WORK, LDWRKX,
      $                WORK( LDWRKX*NB+1 ), LDWRKY )
 *
@@ -318,7 +326,8 @@ SUBROUTINE DGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
      $               NB, -ONE, A( I+NB, I ), LDA,
      $               WORK( LDWRKX*NB+NB+1 ), LDWRKY, ONE,
      $               A( I+NB, I+NB ), LDA )
-         CALL DGEMM( 'No transpose', 'No transpose', M-I-NB+1, N-I-NB+1,
+         CALL DGEMM( 'No transpose', 'No transpose', M-I-NB+1,
+     $               N-I-NB+1,
      $               NB, -ONE, WORK( NB+1 ), LDWRKX, A( I, I+NB ), LDA,
      $               ONE, A( I+NB, I+NB ), LDA )
 *
diff --git a/SRC/dgecon.f b/SRC/dgecon.f
index aa10dee9a2..948793ff1f 100644
--- a/SRC/dgecon.f
+++ b/SRC/dgecon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGECON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgecon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgecon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -105,7 +103,15 @@
 *> \verbatim
 *>          INFO is INTEGER
 *>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>                NaNs are illegal values for ANORM, and they propagate to
+*>                the output parameter RCOND.
+*>                Infinity is illegal for ANORM, and it propagates to the output
+*>                parameter RCOND as 0.
+*>          = 1:  if RCOND = NaN, or
+*>                   RCOND = Inf, or
+*>                   the computed norm of the inverse of A is 0.
+*>                In the latter, RCOND = 0 is returned.
 *> \endverbatim
 *
 *  Authors:
@@ -116,11 +122,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gecon
 *
 *  =====================================================================
       SUBROUTINE DGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -146,16 +153,16 @@ SUBROUTINE DGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, IWORK,
       LOGICAL            ONENRM
       CHARACTER          NORMIN
       INTEGER            IX, KASE, KASE1
-      DOUBLE PRECISION   AINVNM, SCALE, SL, SMLNUM, SU
+      DOUBLE PRECISION   AINVNM, SCALE, SL, SMLNUM, SU, HUGEVAL
 *     ..
 *     .. Local Arrays ..
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Functions ..
-      LOGICAL            LSAME
+      LOGICAL            LSAME, DISNAN
       INTEGER            IDAMAX
       DOUBLE PRECISION   DLAMCH
-      EXTERNAL           LSAME, IDAMAX, DLAMCH
+      EXTERNAL           LSAME, IDAMAX, DLAMCH, DISNAN
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           DLACN2, DLATRS, DRSCL, XERBLA
@@ -164,6 +171,8 @@ SUBROUTINE DGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, IWORK,
       INTRINSIC          ABS, MAX
 *     ..
 *     .. Executable Statements ..
+*
+      HUGEVAL = DLAMCH( 'Overflow' )
 *
 *     Test the input parameters.
 *
@@ -191,6 +200,13 @@ SUBROUTINE DGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, IWORK,
          RETURN
       ELSE IF( ANORM.EQ.ZERO ) THEN
          RETURN
+      ELSE IF( DISNAN( ANORM ) ) THEN
+         RCOND = ANORM
+         INFO = -5
+         RETURN
+      ELSE IF( ANORM.GT.HUGEVAL ) THEN
+         INFO = -5
+         RETURN
       END IF
 *
       SMLNUM = DLAMCH( 'Safe minimum' )
@@ -212,18 +228,21 @@ SUBROUTINE DGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, IWORK,
 *
 *           Multiply by inv(L).
 *
-            CALL DLATRS( 'Lower', 'No transpose', 'Unit', NORMIN, N, A,
+            CALL DLATRS( 'Lower', 'No transpose', 'Unit', NORMIN, N,
+     $                   A,
      $                   LDA, WORK, SL, WORK( 2*N+1 ), INFO )
 *
 *           Multiply by inv(U).
 *
-            CALL DLATRS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL DLATRS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   A, LDA, WORK, SU, WORK( 3*N+1 ), INFO )
          ELSE
 *
 *           Multiply by inv(U**T).
 *
-            CALL DLATRS( 'Upper', 'Transpose', 'Non-unit', NORMIN, N, A,
+            CALL DLATRS( 'Upper', 'Transpose', 'Non-unit', NORMIN, N,
+     $                   A,
      $                   LDA, WORK, SU, WORK( 3*N+1 ), INFO )
 *
 *           Multiply by inv(L**T).
@@ -247,8 +266,17 @@ SUBROUTINE DGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, IWORK,
 *
 *     Compute the estimate of the reciprocal condition number.
 *
-      IF( AINVNM.NE.ZERO )
-     $   RCOND = ( ONE / AINVNM ) / ANORM
+      IF( AINVNM.NE.ZERO ) THEN
+         RCOND = ( ONE / AINVNM ) / ANORM
+      ELSE
+         INFO = 1
+         RETURN
+      END IF
+*
+*     Check for NaNs and Infs
+*
+      IF( DISNAN( RCOND ) .OR. RCOND.GT.HUGEVAL )
+     $   INFO = 1
 *
    20 CONTINUE
       RETURN
diff --git a/SRC/dgedmd.f90 b/SRC/dgedmd.f90
new file mode 100644
index 0000000000..642e2d61b3
--- /dev/null
+++ b/SRC/dgedmd.f90
@@ -0,0 +1,1205 @@
+!> \brief \b DGEDMD computes the Dynamic Mode Decomposition (DMD) for a pair of data snapshot matrices.
+!
+!  =========== DOCUMENTATION ===========
+!
+!  Definition:
+!  ===========
+!
+!     SUBROUTINE DGEDMD( JOBS, JOBZ, JOBR, JOBF,  WHTSVD,  &
+!                        M, N, X, LDX, Y, LDY, NRNK, TOL,  &
+!                        K, REIG,  IMEIG,   Z, LDZ,  RES,  &
+!                        B, LDB, W,  LDW,   S, LDS,        &
+!                        WORK, LWORK, IWORK, LIWORK, INFO )
+!.....
+!     USE, INTRINSIC :: iso_fortran_env, only: real64
+!     IMPLICIT NONE
+!     INTEGER, PARAMETER :: WP = real64
+!.....
+!     Scalar arguments
+!     CHARACTER, INTENT(IN)   :: JOBS,   JOBZ,  JOBR,  JOBF
+!     INTEGER,   INTENT(IN)   :: WHTSVD, M, N,   LDX,  LDY, &
+!                                NRNK, LDZ, LDB, LDW,  LDS, &
+!                                LWORK,  LIWORK
+!     INTEGER,   INTENT(OUT)  :: K, INFO
+!     REAL(KIND=WP), INTENT(IN)  :: TOL
+!     Array arguments
+!     REAL(KIND=WP), INTENT(INOUT) :: X(LDX,*), Y(LDY,*)
+!     REAL(KIND=WP), INTENT(OUT)   :: Z(LDZ,*), B(LDB,*), &
+!                                     W(LDW,*), S(LDS,*)
+!     REAL(KIND=WP), INTENT(OUT)   :: REIG(*),  IMEIG(*), &
+!                                     RES(*)
+!     REAL(KIND=WP), INTENT(OUT)   :: WORK(*)
+!     INTEGER,       INTENT(OUT)   :: IWORK(*)
+!
+!............................................................
+!>    \par Purpose:
+!     =============
+!>    \verbatim
+!>    DGEDMD computes the Dynamic Mode Decomposition (DMD) for
+!>    a pair of data snapshot matrices. For the input matrices
+!>    X and Y such that Y = A*X with an unaccessible matrix
+!>    A, DGEDMD computes a certain number of Ritz pairs of A using
+!>    the standard Rayleigh-Ritz extraction from a subspace of
+!>    range(X) that is determined using the leading left singular
+!>    vectors of X. Optionally, DGEDMD returns the residuals
+!>    of the computed Ritz pairs, the information needed for
+!>    a refinement of the Ritz vectors, or the eigenvectors of
+!>    the Exact DMD.
+!>    For further details see the references listed
+!>    below. For more details of the implementation see [3].
+!>    \endverbatim
+!............................................................
+!>    \par References:
+!     ================
+!>    \verbatim
+!>    [1] P. Schmid: Dynamic mode decomposition of numerical
+!>        and experimental data,
+!>        Journal of Fluid Mechanics 656, 5-28, 2010.
+!>    [2] Z. Drmac, I. Mezic, R. Mohr: Data driven modal
+!>        decompositions: analysis and enhancements,
+!>        SIAM J. on Sci. Comp. 40 (4), A2253-A2285, 2018.
+!>    [3] Z. Drmac: A LAPACK implementation of the Dynamic
+!>        Mode Decomposition I. Technical report. AIMDyn Inc.
+!>        and LAPACK Working Note 298.
+!>    [4] J. Tu, C. W. Rowley, D. M. Luchtenburg, S. L.
+!>        Brunton, N. Kutz: On Dynamic Mode Decomposition:
+!>        Theory and Applications, Journal of Computational
+!>        Dynamics 1(2), 391 -421, 2014.
+!>    \endverbatim
+!......................................................................
+!>    \par Developed and supported by:
+!     ================================
+!>    \verbatim
+!>    Developed and coded by Zlatko Drmac, Faculty of Science,
+!>    University of Zagreb;  drmac@math.hr
+!>    In cooperation with
+!>    AIMdyn Inc., Santa Barbara, CA.
+!>    and supported by
+!>    - DARPA SBIR project "Koopman Operator-Based Forecasting
+!>    for Nonstationary Processes from Near-Term, Limited
+!>    Observational Data" Contract No: W31P4Q-21-C-0007
+!>    - DARPA PAI project "Physics-Informed Machine Learning
+!>    Methodologies" Contract No: HR0011-18-9-0033
+!>    - DARPA MoDyL project "A Data-Driven, Operator-Theoretic
+!>    Framework for Space-Time Analysis of Process Dynamics"
+!>    Contract No: HR0011-16-C-0116
+!>    Any opinions, findings and conclusions or recommendations
+!>    expressed in this material are those of the author and
+!>    do not necessarily reflect the views of the DARPA SBIR
+!>    Program Office
+!>    \endverbatim
+!......................................................................
+!>    \par Distribution Statement A:
+!     ==============================
+!>    \verbatim
+!>    Approved for Public Release, Distribution Unlimited.
+!>    Cleared by DARPA on September 29, 2022
+!>    \endverbatim
+!......................................................................
+!     Arguments
+!     =========
+!
+!>    \param[in] JOBS
+!>    \verbatim
+!>    JOBS (input) is CHARACTER*1
+!>    Determines whether the initial data snapshots are scaled
+!>    by a diagonal matrix.
+!>    'S' :: The data snapshots matrices X and Y are multiplied
+!>           with a diagonal matrix D so that X*D has unit
+!>           nonzero columns (in the Euclidean 2-norm)
+!>    'C' :: The snapshots are scaled as with the 'S' option.
+!>           If it is found that an i-th column of X is zero
+!>           vector and the corresponding i-th column of Y is
+!>           non-zero, then the i-th column of Y is set to
+!>           zero and a warning flag is raised.
+!>    'Y' :: The data snapshots matrices X and Y are multiplied
+!>           by a diagonal matrix D so that Y*D has unit
+!>           nonzero columns (in the Euclidean 2-norm)
+!>    'N' :: No data scaling.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBZ
+!>    \verbatim
+!>    JOBZ (input) CHARACTER*1
+!>    Determines whether the eigenvectors (Koopman modes) will
+!>    be computed.
+!>    'V' :: The eigenvectors (Koopman modes) will be computed
+!>           and returned in the matrix Z.
+!>           See the description of Z.
+!>    'F' :: The eigenvectors (Koopman modes) will be returned
+!>           in factored form as the product X(:,1:K)*W, where X
+!>           contains a POD basis (leading left singular vectors
+!>           of the data matrix X) and W contains the eigenvectors
+!>           of the corresponding Rayleigh quotient.
+!>           See the descriptions of K, X, W, Z.
+!>    'N' :: The eigenvectors are not computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBR
+!>    \verbatim
+!>    JOBR (input) CHARACTER*1
+!>    Determines whether to compute the residuals.
+!>    'R' :: The residuals for the computed eigenpairs will be
+!>           computed and stored in the array RES.
+!>           See the description of RES.
+!>           For this option to be legal, JOBZ must be 'V'.
+!>    'N' :: The residuals are not computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBF
+!>    \verbatim
+!>    JOBF (input) CHARACTER*1
+!>    Specifies whether to store information needed for post-
+!>    processing (e.g. computing refined Ritz vectors)
+!>    'R' :: The matrix needed for the refinement of the Ritz
+!>           vectors is computed and stored in the array B.
+!>           See the description of B.
+!>    'E' :: The unscaled eigenvectors of the Exact DMD are
+!>           computed and returned in the array B. See the
+!>           description of B.
+!>    'N' :: No eigenvector refinement data is computed.
+!>    \endverbatim
+!.....
+!>    \param[in] WHTSVD
+!>    \verbatim
+!>    WHTSVD (input) INTEGER, WHSTVD in { 1, 2, 3, 4 }
+!>    Allows for a selection of the SVD algorithm from the
+!>    LAPACK library.
+!>    1 :: DGESVD (the QR SVD algorithm)
+!>    2 :: DGESDD (the Divide and Conquer algorithm; if enough
+!>         workspace available, this is the fastest option)
+!>    3 :: DGESVDQ (the preconditioned QR SVD  ; this and 4
+!>         are the most accurate options)
+!>    4 :: DGEJSV (the preconditioned Jacobi SVD; this and 3
+!>         are the most accurate options)
+!>    For the four methods above, a significant difference in
+!>    the accuracy of small singular values is possible if
+!>    the snapshots vary in norm so that X is severely
+!>    ill-conditioned. If small (smaller than EPS*||X||)
+!>    singular values are of interest and JOBS=='N',  then
+!>    the options (3, 4) give the most accurate results, where
+!>    the option 4 is slightly better and with stronger
+!>    theoretical background.
+!>    If JOBS=='S', i.e. the columns of X will be normalized,
+!>    then all methods give nearly equally accurate results.
+!>    \endverbatim
+!.....
+!>    \param[in] M
+!>    \verbatim
+!>    M (input) INTEGER, M>= 0
+!>    The state space dimension (the row dimension of X, Y).
+!>    \endverbatim
+!.....
+!>    \param[in] N
+!>    \verbatim
+!>    N (input) INTEGER, 0 <= N <= M
+!>    The number of data snapshot pairs
+!>    (the number of columns of X and Y).
+!>    \endverbatim
+!.....
+!>    \param[in,out] X
+!>    \verbatim
+!>    X (input/output) REAL(KIND=WP) M-by-N array
+!>    > On entry, X contains the data snapshot matrix X. It is
+!>    assumed that the column norms of X are in the range of
+!>    the normalized floating point numbers.
+!>    < On exit, the leading K columns of X contain a POD basis,
+!>    i.e. the leading K left singular vectors of the input
+!>    data matrix X, U(:,1:K). All N columns of X contain all
+!>    left singular vectors of the input matrix X.
+!>    See the descriptions of K, Z and W.
+!>    \endverbatim
+!.....
+!>    \param[in] LDX
+!>    \verbatim
+!>    LDX (input) INTEGER, LDX >= M
+!>    The leading dimension of the array X.
+!>    \endverbatim
+!.....
+!>    \param[in,out] Y
+!>    \verbatim
+!>    Y (input/workspace/output) REAL(KIND=WP) M-by-N array
+!>    > On entry, Y contains the data snapshot matrix Y
+!>    < On exit,
+!>    If JOBR == 'R', the leading K columns of Y  contain
+!>    the residual vectors for the computed Ritz pairs.
+!>    See the description of RES.
+!>    If JOBR == 'N', Y contains the original input data,
+!>                    scaled according to the value of JOBS.
+!>    \endverbatim
+!.....
+!>    \param[in] LDY
+!>    \verbatim
+!>    LDY (input) INTEGER , LDY >= M
+!>    The leading dimension of the array Y.
+!>    \endverbatim
+!.....
+!>    \param[in] NRNK
+!>    \verbatim
+!>    NRNK (input) INTEGER
+!>    Determines the mode how to compute the numerical rank,
+!>    i.e. how to truncate small singular values of the input
+!>    matrix X. On input, if
+!>    NRNK = -1 :: i-th singular value sigma(i) is truncated
+!>                 if sigma(i) <= TOL*sigma(1).
+!>                 This option is recommended.
+!>    NRNK = -2 :: i-th singular value sigma(i) is truncated
+!>                 if sigma(i) <= TOL*sigma(i-1)
+!>                 This option is included for R&D purposes.
+!>                 It requires highly accurate SVD, which
+!>                 may not be feasible.
+!>
+!>    The numerical rank can be enforced by using positive
+!>    value of NRNK as follows:
+!>    0 < NRNK <= N :: at most NRNK largest singular values
+!>    will be used. If the number of the computed nonzero
+!>    singular values is less than NRNK, then only those
+!>    nonzero values will be used and the actually used
+!>    dimension is less than NRNK. The actual number of
+!>    the nonzero singular values is returned in the variable
+!>    K. See the descriptions of TOL and  K.
+!>    \endverbatim
+!.....
+!>    \param[in] TOL
+!>    \verbatim
+!>    TOL (input) REAL(KIND=WP), 0 <= TOL < 1
+!>    The tolerance for truncating small singular values.
+!>    See the description of NRNK.
+!>    \endverbatim
+!.....
+!>    \param[out] K
+!>    \verbatim
+!>    K (output) INTEGER,  0 <= K <= N
+!>    The dimension of the POD basis for the data snapshot
+!>    matrix X and the number of the computed Ritz pairs.
+!>    The value of K is determined according to the rule set
+!>    by the parameters NRNK and TOL.
+!>    See the descriptions of NRNK and TOL.
+!>    \endverbatim
+!.....
+!>    \param[out] REIG
+!>    \verbatim
+!>    REIG (output) REAL(KIND=WP) N-by-1 array
+!>    The leading K (K<=N) entries of REIG contain
+!>    the real parts of the computed eigenvalues
+!>    REIG(1:K) + sqrt(-1)*IMEIG(1:K).
+!>    See the descriptions of K, IMEIG, and Z.
+!>    \endverbatim
+!.....
+!>    \param[out] IMEIG
+!>    \verbatim
+!>    IMEIG (output) REAL(KIND=WP) N-by-1 array
+!>    The leading K (K<=N) entries of IMEIG contain
+!>    the imaginary parts of the computed eigenvalues
+!>    REIG(1:K) + sqrt(-1)*IMEIG(1:K).
+!>    The eigenvalues are determined as follows:
+!>    If IMEIG(i) == 0, then the corresponding eigenvalue is
+!>    real, LAMBDA(i) = REIG(i).
+!>    If IMEIG(i)>0, then the corresponding complex
+!>    conjugate pair of eigenvalues reads
+!>    LAMBDA(i)   = REIG(i) + sqrt(-1)*IMAG(i)
+!>    LAMBDA(i+1) = REIG(i) - sqrt(-1)*IMAG(i)
+!>    That is, complex conjugate pairs have consecutive
+!>    indices (i,i+1), with the positive imaginary part
+!>    listed first.
+!>    See the descriptions of K, REIG, and Z.
+!>    \endverbatim
+!.....
+!>    \param[out] Z
+!>    \verbatim
+!>    Z (workspace/output) REAL(KIND=WP)  M-by-N array
+!>    If JOBZ =='V' then
+!>       Z contains real Ritz vectors as follows:
+!>       If IMEIG(i)=0, then Z(:,i) is an eigenvector of
+!>       the i-th Ritz value; ||Z(:,i)||_2=1.
+!>       If IMEIG(i) > 0 (and IMEIG(i+1) < 0) then
+!>       [Z(:,i) Z(:,i+1)] span an invariant subspace and
+!>       the Ritz values extracted from this subspace are
+!>       REIG(i) + sqrt(-1)*IMEIG(i) and
+!>       REIG(i) - sqrt(-1)*IMEIG(i).
+!>       The corresponding eigenvectors are
+!>       Z(:,i) + sqrt(-1)*Z(:,i+1) and
+!>       Z(:,i) - sqrt(-1)*Z(:,i+1), respectively.
+!>       || Z(:,i:i+1)||_F = 1.
+!>    If JOBZ == 'F', then the above descriptions hold for
+!>    the columns of X(:,1:K)*W(1:K,1:K), where the columns
+!>    of W(1:k,1:K) are the computed eigenvectors of the
+!>    K-by-K Rayleigh quotient. The columns of W(1:K,1:K)
+!>    are similarly structured: If IMEIG(i) == 0 then
+!>    X(:,1:K)*W(:,i) is an eigenvector, and if IMEIG(i)>0
+!>    then X(:,1:K)*W(:,i)+sqrt(-1)*X(:,1:K)*W(:,i+1) and
+!>         X(:,1:K)*W(:,i)-sqrt(-1)*X(:,1:K)*W(:,i+1)
+!>    are the eigenvectors of LAMBDA(i), LAMBDA(i+1).
+!>    See the descriptions of REIG, IMEIG, X and W.
+!>    \endverbatim
+!.....
+!>    \param[in] LDZ
+!>    \verbatim
+!>    LDZ (input) INTEGER , LDZ >= M
+!>    The leading dimension of the array Z.
+!>    \endverbatim
+!.....
+!>    \param[out] RES
+!>    \verbatim
+!>    RES (output) REAL(KIND=WP) N-by-1 array
+!>    RES(1:K) contains the residuals for the K computed
+!>    Ritz pairs.
+!>    If LAMBDA(i) is real, then
+!>       RES(i) = || A * Z(:,i) - LAMBDA(i)*Z(:,i))||_2.
+!>    If [LAMBDA(i), LAMBDA(i+1)] is a complex conjugate pair
+!>    then
+!>    RES(i)=RES(i+1) = || A * Z(:,i:i+1) - Z(:,i:i+1) *B||_F
+!>    where B = [ real(LAMBDA(i)) imag(LAMBDA(i)) ]
+!>              [-imag(LAMBDA(i)) real(LAMBDA(i)) ].
+!>    It holds that
+!>    RES(i)   = || A*ZC(:,i)   - LAMBDA(i)  *ZC(:,i)   ||_2
+!>    RES(i+1) = || A*ZC(:,i+1) - LAMBDA(i+1)*ZC(:,i+1) ||_2
+!>    where ZC(:,i)   =  Z(:,i) + sqrt(-1)*Z(:,i+1)
+!>          ZC(:,i+1) =  Z(:,i) - sqrt(-1)*Z(:,i+1)
+!>    See the description of REIG, IMEIG and Z.
+!>    \endverbatim
+!.....
+!>    \param[out] B
+!>    \verbatim
+!>    B (output) REAL(KIND=WP)  M-by-N array.
+!>    IF JOBF =='R', B(1:M,1:K) contains A*U(:,1:K), and can
+!>    be used for computing the refined vectors; see further
+!>    details in the provided references.
+!>    If JOBF == 'E', B(1:M,1;K) contains
+!>    A*U(:,1:K)*W(1:K,1:K), which are the vectors from the
+!>    Exact DMD, up to scaling by the inverse eigenvalues.
+!>    If JOBF =='N', then B is not referenced.
+!>    See the descriptions of X, W, K.
+!>    \endverbatim
+!.....
+!>    \param[in] LDB
+!>    \verbatim
+!>    LDB (input) INTEGER, LDB >= M
+!>    The leading dimension of the array B.
+!>    \endverbatim
+!.....
+!>    \param[out] W
+!>    \verbatim
+!>    W (workspace/output) REAL(KIND=WP) N-by-N array
+!>    On exit, W(1:K,1:K) contains the K computed
+!>    eigenvectors of the matrix Rayleigh quotient (real and
+!>    imaginary parts for each complex conjugate pair of the
+!>    eigenvalues). The Ritz vectors (returned in Z) are the
+!>    product of X (containing a POD basis for the input
+!>    matrix X) and W. See the descriptions of K, S, X and Z.
+!>    W is also used as a workspace to temporarily store the
+!>    right singular vectors of X.
+!>    \endverbatim
+!.....
+!>    \param[in] LDW
+!>    \verbatim
+!>    LDW (input) INTEGER, LDW >= N
+!>    The leading dimension of the array W.
+!>    \endverbatim
+!.....
+!>    \param[out] S
+!>    \verbatim
+!>    S (workspace/output) REAL(KIND=WP) N-by-N array
+!>    The array S(1:K,1:K) is used for the matrix Rayleigh
+!>    quotient. This content is overwritten during
+!>    the eigenvalue decomposition by DGEEV.
+!>    See the description of K.
+!>    \endverbatim
+!.....
+!>    \param[in] LDS
+!>    \verbatim
+!>    LDS (input) INTEGER, LDS >= N
+!>    The leading dimension of the array S.
+!>    \endverbatim
+!.....
+!>    \param[out] WORK
+!>    \verbatim
+!>    WORK (workspace/output) REAL(KIND=WP) LWORK-by-1 array
+!>    On exit, WORK(1:N) contains the singular values of
+!>    X (for JOBS=='N') or column scaled X (JOBS=='S', 'C').
+!>    If WHTSVD==4, then WORK(N+1) and WORK(N+2) contain
+!>    scaling factor WORK(N+2)/WORK(N+1) used to scale X
+!>    and Y to avoid overflow in the SVD of X.
+!>    This may be of interest if the scaling option is off
+!>    and as many as possible smallest eigenvalues are
+!>    desired to the highest feasible accuracy.
+!>    If the call to DGEDMD is only workspace query, then
+!>    WORK(1) contains the minimal workspace length and
+!>    WORK(2) is the optimal workspace length. Hence, the
+!>    leng of work is at least 2.
+!>    See the description of LWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LWORK
+!>    \verbatim
+!>    LWORK (input) INTEGER
+!>    The minimal length of the workspace vector WORK.
+!>    LWORK is calculated as follows:
+!>    If WHTSVD == 1 ::
+!>       If JOBZ == 'V', then
+!>       LWORK >= MAX(2, N + LWORK_SVD, N+MAX(1,4*N)).
+!>       If JOBZ == 'N'  then
+!>       LWORK >= MAX(2, N + LWORK_SVD, N+MAX(1,3*N)).
+!>       Here LWORK_SVD = MAX(1,3*N+M,5*N) is the minimal
+!>       workspace length of DGESVD.
+!>    If WHTSVD == 2 ::
+!>       If JOBZ == 'V', then
+!>       LWORK >= MAX(2, N + LWORK_SVD, N+MAX(1,4*N))
+!>       If JOBZ == 'N', then
+!>       LWORK >= MAX(2, N + LWORK_SVD, N+MAX(1,3*N))
+!>       Here LWORK_SVD = MAX(M, 5*N*N+4*N)+3*N*N is the
+!>       minimal workspace length of DGESDD.
+!>    If WHTSVD == 3 ::
+!>       If JOBZ == 'V', then
+!>       LWORK >= MAX(2, N+LWORK_SVD,N+MAX(1,4*N))
+!>       If JOBZ == 'N', then
+!>       LWORK >= MAX(2, N+LWORK_SVD,N+MAX(1,3*N))
+!>       Here LWORK_SVD = N+M+MAX(3*N+1,
+!>                       MAX(1,3*N+M,5*N),MAX(1,N))
+!>       is the minimal workspace length of DGESVDQ.
+!>    If WHTSVD == 4 ::
+!>       If JOBZ == 'V', then
+!>       LWORK >= MAX(2, N+LWORK_SVD,N+MAX(1,4*N))
+!>       If JOBZ == 'N', then
+!>       LWORK >= MAX(2, N+LWORK_SVD,N+MAX(1,3*N))
+!>       Here LWORK_SVD = MAX(7,2*M+N,6*N+2*N*N) is the
+!>       minimal workspace length of DGEJSV.
+!>    The above expressions are not simplified in order to
+!>    make the usage of WORK more transparent, and for
+!>    easier checking. In any case, LWORK >= 2.
+!>    If on entry LWORK = -1, then a workspace query is
+!>    assumed and the procedure only computes the minimal
+!>    and the optimal workspace lengths for both WORK and
+!>    IWORK. See the descriptions of WORK and IWORK.
+!>    \endverbatim
+!.....
+!>    \param[out] IWORK
+!>    \verbatim
+!>    IWORK (workspace/output) INTEGER LIWORK-by-1 array
+!>    Workspace that is required only if WHTSVD equals
+!>    2 , 3 or 4. (See the description of WHTSVD).
+!>    If on entry LWORK =-1 or LIWORK=-1, then the
+!>    minimal length of IWORK is computed and returned in
+!>    IWORK(1). See the description of LIWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LIWORK
+!>    \verbatim
+!>    LIWORK (input) INTEGER
+!>    The minimal length of the workspace vector IWORK.
+!>    If WHTSVD == 1, then only IWORK(1) is used; LIWORK >=1
+!>    If WHTSVD == 2, then LIWORK >= MAX(1,8*MIN(M,N))
+!>    If WHTSVD == 3, then LIWORK >= MAX(1,M+N-1)
+!>    If WHTSVD == 4, then LIWORK >= MAX(3,M+3*N)
+!>    If on entry LIWORK = -1, then a workspace query is
+!>    assumed and the procedure only computes the minimal
+!>    and the optimal workspace lengths for both WORK and
+!>    IWORK. See the descriptions of WORK and IWORK.
+!>    \endverbatim
+!.....
+!>    \param[out] INFO
+!>    \verbatim
+!>    INFO (output) INTEGER
+!>    -i < 0 :: On entry, the i-th argument had an
+!>              illegal value
+!>       = 0 :: Successful return.
+!>       = 1 :: Void input. Quick exit (M=0 or N=0).
+!>       = 2 :: The SVD computation of X did not converge.
+!>              Suggestion: Check the input data and/or
+!>              repeat with different WHTSVD.
+!>       = 3 :: The computation of the eigenvalues did not
+!>              converge.
+!>       = 4 :: If data scaling was requested on input and
+!>              the procedure found inconsistency in the data
+!>              such that for some column index i,
+!>              X(:,i) = 0 but Y(:,i) /= 0, then Y(:,i) is set
+!>              to zero if JOBS=='C'. The computation proceeds
+!>              with original or modified data and warning
+!>              flag is set with INFO=4.
+!>    \endverbatim
+!
+!  Authors:
+!  ========
+!
+!> \author Zlatko Drmac
+!
+!> \ingroup gedmd
+!
+!.............................................................
+!.............................................................
+      SUBROUTINE DGEDMD( JOBS, JOBZ, JOBR, JOBF,  WHTSVD,  &
+                         M, N, X, LDX, Y, LDY, NRNK, TOL,  &
+                         K, REIG,  IMEIG,   Z, LDZ,  RES,  &
+                         B, LDB, W,  LDW,   S, LDS,        &
+                         WORK, LWORK, IWORK, LIWORK, INFO )
+!
+!  -- LAPACK driver routine                                           --
+!
+!  -- LAPACK is a software package provided by University of          --
+!  -- Tennessee, University of California Berkeley, University of     --
+!  -- Colorado Denver and NAG Ltd..                                   --
+!
+!.....
+      USE, INTRINSIC :: iso_fortran_env, only: real64
+      IMPLICIT NONE
+      INTEGER, PARAMETER :: WP = real64
+!
+!     Scalar arguments
+!     ~~~~~~~~~~~~~~~~
+      CHARACTER, INTENT(IN)   :: JOBS,   JOBZ,  JOBR,  JOBF
+      INTEGER,   INTENT(IN)   :: WHTSVD, M, N,   LDX,  LDY, &
+                                 NRNK, LDZ, LDB, LDW,  LDS, &
+                                 LWORK,  LIWORK
+      INTEGER,   INTENT(OUT)  :: K, INFO
+      REAL(KIND=WP), INTENT(IN)  :: TOL
+!
+!     Array arguments
+!     ~~~~~~~~~~~~~~~
+      REAL(KIND=WP), INTENT(INOUT) :: X(LDX,*), Y(LDY,*)
+      REAL(KIND=WP), INTENT(OUT)   :: Z(LDZ,*), B(LDB,*), &
+                                      W(LDW,*), S(LDS,*)
+      REAL(KIND=WP), INTENT(OUT)   :: REIG(*),  IMEIG(*), &
+                                      RES(*)
+      REAL(KIND=WP), INTENT(OUT)   :: WORK(*)
+      INTEGER,       INTENT(OUT)   :: IWORK(*)
+!
+!     Parameters
+!     ~~~~~~~~~~
+      REAL(KIND=WP), PARAMETER ::  ONE = 1.0_WP
+      REAL(KIND=WP), PARAMETER :: ZERO = 0.0_WP
+!
+!     Local scalars
+!     ~~~~~~~~~~~~~
+      REAL(KIND=WP) :: OFL,    ROOTSC, SCALE,  SMALL,  &
+                       SSUM,   XSCL1,  XSCL2
+      INTEGER       :: i,   j, IMINWR,  INFO1, INFO2,  &
+                       LWRKEV, LWRSDD, LWRSVD,         &
+                       LWRSVQ, MLWORK, MWRKEV, MWRSDD, &
+                       MWRSVD, MWRSVJ, MWRSVQ, NUMRNK, &
+                       OLWORK
+      LOGICAL       :: BADXY,  LQUERY, SCCOLX, SCCOLY, &
+                       WNTEX,  WNTREF, WNTRES, WNTVEC
+      CHARACTER     :: JOBZL,  T_OR_N
+      CHARACTER     :: JSVOPT
+!
+!     Local arrays
+!     ~~~~~~~~~~~~
+      REAL(KIND=WP) :: AB(2,2), RDUMMY(2), RDUMMY2(2)
+!
+!     External functions (BLAS and LAPACK)
+!     ~~~~~~~~~~~~~~~~~
+      REAL(KIND=WP) DLANGE, DLAMCH, DNRM2
+      EXTERNAL      DLANGE, DLAMCH, DNRM2, IDAMAX
+      INTEGER       IDAMAX
+      LOGICAL       DISNAN, LSAME
+      EXTERNAL      DISNAN, LSAME
+!
+!     External subroutines (BLAS and LAPACK)
+!     ~~~~~~~~~~~~~~~~~~~~
+      EXTERNAL      DAXPY,  DGEMM,  DSCAL
+      EXTERNAL      DGEEV,  DGEJSV, DGESDD, DGESVD, DGESVDQ, &
+                    DLACPY, DLASCL, DLASSQ, XERBLA
+!
+!     Intrinsic functions
+!     ~~~~~~~~~~~~~~~~~~~
+      INTRINSIC     DBLE, INT, MAX, SQRT
+!............................................................
+!
+!    Test the input arguments
+!
+      WNTRES = LSAME(JOBR,'R')
+      SCCOLX = LSAME(JOBS,'S') .OR. LSAME(JOBS,'C')
+      SCCOLY = LSAME(JOBS,'Y')
+      WNTVEC = LSAME(JOBZ,'V')
+      WNTREF = LSAME(JOBF,'R')
+      WNTEX  = LSAME(JOBF,'E')
+      INFO   = 0
+      LQUERY = ( ( LWORK == -1 ) .OR. ( LIWORK == -1 ) )
+!
+      IF ( .NOT. (SCCOLX .OR. SCCOLY .OR. &
+                                  LSAME(JOBS,'N')) )   THEN
+          INFO = -1
+      ELSE IF ( .NOT. (WNTVEC .OR. LSAME(JOBZ,'N')        &
+                              .OR. LSAME(JOBZ,'F')) )  THEN
+          INFO = -2
+      ELSE IF ( .NOT. (WNTRES .OR. LSAME(JOBR,'N')) .OR.  &
+                ( WNTRES .AND. (.NOT.WNTVEC) ) )       THEN
+          INFO = -3
+      ELSE IF ( .NOT. (WNTREF .OR. WNTEX .OR.             &
+                LSAME(JOBF,'N') ) )                    THEN
+          INFO = -4
+      ELSE IF ( .NOT.((WHTSVD == 1) .OR. (WHTSVD == 2) .OR.  &
+                      (WHTSVD == 3) .OR. (WHTSVD == 4) )) THEN
+          INFO = -5
+      ELSE IF ( M < 0 )   THEN
+          INFO = -6
+      ELSE IF ( ( N < 0 ) .OR. ( N > M ) ) THEN
+          INFO = -7
+      ELSE IF ( LDX < M ) THEN
+          INFO = -9
+      ELSE IF ( LDY < M ) THEN
+          INFO = -11
+      ELSE IF ( .NOT. (( NRNK == -2).OR.(NRNK == -1).OR. &
+                ((NRNK >= 1).AND.(NRNK <=N ))) )      THEN
+          INFO = -12
+      ELSE IF ( ( TOL < ZERO ) .OR. ( TOL >= ONE ) )  THEN
+          INFO = -13
+      ELSE IF ( LDZ < M ) THEN
+          INFO = -18
+      ELSE IF ( (WNTREF .OR. WNTEX ) .AND. ( LDB < M ) ) THEN
+          INFO = -21
+      ELSE IF ( LDW < N ) THEN
+          INFO = -23
+      ELSE IF ( LDS < N ) THEN
+          INFO = -25
+      END IF
+!
+      IF ( INFO == 0 ) THEN
+          ! Compute the minimal and the optimal workspace
+          ! requirements. Simulate running the code and
+          ! determine minimal and optimal sizes of the
+          ! workspace at any moment of the run.
+         IF ( N == 0 ) THEN
+             ! Quick return. All output except K is void.
+             ! INFO=1 signals the void input.
+             ! In case of a workspace query, the default
+             ! minimal workspace lengths are returned.
+            IF ( LQUERY ) THEN
+                IWORK(1) = 1
+                WORK(1)  = 2
+                WORK(2)  = 2
+            ELSE
+               K = 0
+            END IF
+            INFO = 1
+            RETURN
+         END IF
+         MLWORK = MAX(2,N)
+         OLWORK = MAX(2,N)
+         IMINWR = 1
+         SELECT CASE ( WHTSVD )
+         CASE (1)
+             ! The following is specified as the minimal
+             ! length of WORK in the definition of DGESVD:
+             ! MWRSVD = MAX(1,3*MIN(M,N)+MAX(M,N),5*MIN(M,N))
+             MWRSVD = MAX(1,3*MIN(M,N)+MAX(M,N),5*MIN(M,N))
+             MLWORK = MAX(MLWORK,N + MWRSVD)
+             IF ( LQUERY ) THEN
+                CALL DGESVD( 'O', 'S', M, N, X, LDX, WORK, &
+                           B, LDB, W, LDW, RDUMMY, -1, INFO1 )
+                LWRSVD = MAX( MWRSVD, INT( RDUMMY(1) ) )
+                OLWORK = MAX(OLWORK,N + LWRSVD)
+             END IF
+         CASE (2)
+             ! The following is specified as the minimal
+             ! length of WORK in the definition of DGESDD:
+             ! MWRSDD = 3*MIN(M,N)*MIN(M,N) +
+             ! MAX( MAX(M,N),5*MIN(M,N)*MIN(M,N)+4*MIN(M,N) )
+             ! IMINWR = 8*MIN(M,N)
+             MWRSDD = 3*MIN(M,N)*MIN(M,N) +                &
+              MAX( MAX(M,N),5*MIN(M,N)*MIN(M,N)+4*MIN(M,N) )
+             MLWORK = MAX(MLWORK,N + MWRSDD)
+             IMINWR = 8*MIN(M,N)
+             IF ( LQUERY ) THEN
+                CALL DGESDD( 'O', M, N, X, LDX, WORK, B,     &
+                     LDB, W, LDW, RDUMMY, -1, IWORK, INFO1 )
+                LWRSDD = MAX( MWRSDD, INT( RDUMMY(1) ) )
+                OLWORK = MAX(OLWORK,N + LWRSDD)
+             END IF
+         CASE (3)
+             !LWQP3 = 3*N+1
+             !LWORQ = MAX(N, 1)
+             !MWRSVD = MAX(1,3*MIN(M,N)+MAX(M,N),5*MIN(M,N))
+             !MWRSVQ = N + MAX( LWQP3, MWRSVD, LWORQ ) + MAX(M,2)
+             !MLWORK = N +  MWRSVQ
+             !IMINWR = M+N-1
+             CALL DGESVDQ( 'H', 'P', 'N', 'R', 'R', M, N, &
+                             X, LDX, WORK, Z, LDZ, W, LDW,   &
+                             NUMRNK, IWORK, LIWORK, RDUMMY,  &
+                             -1, RDUMMY2, -1, INFO1 )
+             IMINWR = IWORK(1)
+             MWRSVQ = INT(RDUMMY(2))
+             MLWORK = MAX(MLWORK,N+MWRSVQ+INT(RDUMMY2(1)))
+             IF ( LQUERY ) THEN
+                LWRSVQ = MAX( MWRSVQ, INT(RDUMMY(1)) )
+                OLWORK = MAX(OLWORK,N+LWRSVQ+INT(RDUMMY2(1)))
+             END IF
+         CASE (4)
+             JSVOPT = 'J'
+             !MWRSVJ = MAX( 7, 2*M+N, 6*N+2*N*N ) ! for JSVOPT='V'
+             MWRSVJ = MAX( 7, 2*M+N, 4*N+N*N, 2*N+N*N+6 )
+             MLWORK = MAX(MLWORK,N+MWRSVJ)
+             IMINWR = MAX( 3, M+3*N )
+             IF ( LQUERY ) THEN
+                OLWORK =  MAX(OLWORK,N+MWRSVJ)
+             END IF
+         END SELECT
+         IF ( WNTVEC .OR. WNTEX .OR. LSAME(JOBZ,'F') ) THEN
+             JOBZL = 'V'
+         ELSE
+             JOBZL = 'N'
+         END IF
+         ! Workspace calculation to the DGEEV call
+         IF ( LSAME(JOBZL,'V') ) THEN
+             MWRKEV = MAX( 1, 4*N )
+         ELSE
+             MWRKEV = MAX( 1, 3*N )
+         END IF
+         MLWORK = MAX(MLWORK,N+MWRKEV)
+         IF ( LQUERY ) THEN
+                CALL DGEEV( 'N', JOBZL, N, S, LDS, REIG, &
+                    IMEIG, W, LDW, W, LDW, RDUMMY, -1, INFO1 )
+                LWRKEV = MAX( MWRKEV, INT(RDUMMY(1)) )
+                OLWORK = MAX( OLWORK, N+LWRKEV )
+         END IF
+!
+         IF ( LIWORK < IMINWR .AND. (.NOT.LQUERY) ) INFO = -29
+         IF (  LWORK < MLWORK .AND. (.NOT.LQUERY) ) INFO = -27
+      END IF
+!
+      IF( INFO /= 0 ) THEN
+         CALL XERBLA( 'DGEDMD', -INFO )
+         RETURN
+      ELSE IF ( LQUERY ) THEN
+!     Return minimal and optimal workspace sizes
+          IWORK(1) = IMINWR
+          WORK(1)  = MLWORK
+          WORK(2)  = OLWORK
+          RETURN
+      END IF
+!............................................................
+!
+      OFL   = DLAMCH('O')
+      SMALL = DLAMCH('S')
+      BADXY = .FALSE.
+!
+!     <1> Optional scaling of the snapshots (columns of X, Y)
+!     ==========================================================
+      IF ( SCCOLX ) THEN
+          ! The columns of X will be normalized.
+          ! To prevent overflows, the column norms of X are
+          ! carefully computed using DLASSQ.
+          K = 0
+          DO i = 1, N
+            !WORK(i) = DNRM2( M, X(1,i), 1 )
+            SSUM  = ONE
+            SCALE = ZERO
+            CALL DLASSQ( M, X(1,i), 1, SCALE, SSUM )
+            IF ( DISNAN(SCALE) .OR. DISNAN(SSUM) ) THEN
+                K    =  0
+                INFO = -8
+                CALL XERBLA('DGEDMD',-INFO)
+            END IF
+            IF ( (SCALE /= ZERO) .AND. (SSUM /= ZERO) ) THEN
+               ROOTSC = SQRT(SSUM)
+               IF ( SCALE .GE. (OFL / ROOTSC) ) THEN
+!                 Norm of X(:,i) overflows. First, X(:,i)
+!                 is scaled by
+!                 ( ONE / ROOTSC ) / SCALE = 1/||X(:,i)||_2.
+!                 Next, the norm of X(:,i) is stored without
+!                 overflow as WORK(i) = - SCALE * (ROOTSC/M),
+!                 the minus sign indicating the 1/M factor.
+!                 Scaling is performed without overflow, and
+!                 underflow may occur in the smallest entries
+!                 of X(:,i). The relative backward and forward
+!                 errors are small in the ell_2 norm.
+                  CALL DLASCL( 'G', 0, 0, SCALE, ONE/ROOTSC, &
+                               M, 1, X(1,i), M, INFO2 )
+                  WORK(i) = - SCALE * ( ROOTSC / DBLE(M) )
+               ELSE
+!                 X(:,i) will be scaled to unit 2-norm
+                  WORK(i) =   SCALE * ROOTSC
+                  CALL DLASCL( 'G',0, 0, WORK(i), ONE, M, 1, &
+                               X(1,i), M, INFO2 )              ! LAPACK CALL
+!                 X(1:M,i) = (ONE/WORK(i)) * X(1:M,i)          ! INTRINSIC
+               END IF
+            ELSE
+               WORK(i) = ZERO
+               K = K + 1
+            END IF
+          END DO
+          IF ( K == N ) THEN
+          ! All columns of X are zero. Return error code -8.
+          ! (the 8th input variable had an illegal value)
+          K = 0
+          INFO = -8
+          CALL XERBLA('DGEDMD',-INFO)
+          RETURN
+          END IF
+          DO i = 1, N
+!           Now, apply the same scaling to the columns of Y.
+            IF ( WORK(i) >  ZERO ) THEN
+                CALL DSCAL( M, ONE/WORK(i), Y(1,i), 1 )  ! BLAS CALL
+!               Y(1:M,i) = (ONE/WORK(i)) * Y(1:M,i)      ! INTRINSIC
+            ELSE IF ( WORK(i) < ZERO ) THEN
+                CALL DLASCL( 'G', 0, 0, -WORK(i),          &
+                     ONE/DBLE(M), M, 1, Y(1,i), M, INFO2 ) ! LAPACK CALL
+            ELSE IF ( Y(IDAMAX(M, Y(1,i),1),i )  &
+                                            /= ZERO ) THEN
+!               X(:,i) is zero vector. For consistency,
+!               Y(:,i) should also be zero. If Y(:,i) is not
+!               zero, then the data might be inconsistent or
+!               corrupted. If JOBS == 'C', Y(:,i) is set to
+!               zero and a warning flag is raised.
+!               The computation continues but the
+!               situation will be reported in the output.
+                BADXY = .TRUE.
+                IF ( LSAME(JOBS,'C')) &
+                CALL DSCAL( M, ZERO, Y(1,i), 1 )  ! BLAS CALL
+            END IF
+          END DO
+      END IF
+  !
+      IF ( SCCOLY ) THEN
+          ! The columns of Y will be normalized.
+          ! To prevent overflows, the column norms of Y are
+          ! carefully computed using DLASSQ.
+          DO i = 1, N
+            !WORK(i) = DNRM2( M, Y(1,i), 1 )
+            SSUM  = ONE
+            SCALE = ZERO
+            CALL DLASSQ( M, Y(1,i), 1, SCALE, SSUM )
+            IF ( DISNAN(SCALE) .OR. DISNAN(SSUM) ) THEN
+                K    =  0
+                INFO = -10
+                CALL XERBLA('DGEDMD',-INFO)
+            END IF
+            IF ( SCALE /= ZERO  .AND. (SSUM /= ZERO) ) THEN
+               ROOTSC = SQRT(SSUM)
+               IF ( SCALE .GE. (OFL / ROOTSC) ) THEN
+!                 Norm of Y(:,i) overflows. First, Y(:,i)
+!                 is scaled by
+!                 ( ONE / ROOTSC ) / SCALE = 1/||Y(:,i)||_2.
+!                 Next, the norm of Y(:,i) is stored without
+!                 overflow as WORK(i) = - SCALE * (ROOTSC/M),
+!                 the minus sign indicating the 1/M factor.
+!                 Scaling is performed without overflow, and
+!                 underflow may occur in the smallest entries
+!                 of Y(:,i). The relative backward and forward
+!                 errors are small in the ell_2 norm.
+                  CALL DLASCL( 'G', 0, 0, SCALE, ONE/ROOTSC, &
+                               M, 1, Y(1,i), M, INFO2 )
+                  WORK(i) = - SCALE * ( ROOTSC / DBLE(M) )
+               ELSE
+!                 X(:,i) will be scaled to unit 2-norm
+                  WORK(i) =   SCALE * ROOTSC
+                  CALL DLASCL( 'G',0, 0, WORK(i), ONE, M, 1, &
+                               Y(1,i), M, INFO2 )              ! LAPACK CALL
+!                 Y(1:M,i) = (ONE/WORK(i)) * Y(1:M,i)          ! INTRINSIC
+               END IF
+            ELSE
+               WORK(i) = ZERO
+            END IF
+         END DO
+         DO i = 1, N
+!           Now, apply the same scaling to the columns of X.
+            IF ( WORK(i) >  ZERO ) THEN
+                CALL DSCAL( M, ONE/WORK(i), X(1,i), 1 )  ! BLAS CALL
+!               X(1:M,i) = (ONE/WORK(i)) * X(1:M,i)      ! INTRINSIC
+            ELSE IF ( WORK(i) < ZERO ) THEN
+                CALL DLASCL( 'G', 0, 0, -WORK(i),          &
+                     ONE/DBLE(M), M, 1, X(1,i), M, INFO2 ) ! LAPACK CALL
+            ELSE IF ( X(IDAMAX(M, X(1,i),1),i )  &
+                                           /= ZERO ) THEN
+!               Y(:,i) is zero vector.  If X(:,i) is not
+!               zero, then a warning flag is raised.
+!               The computation continues but the
+!               situation will be reported in the output.
+                BADXY = .TRUE.
+            END IF
+         END DO
+       END IF
+!
+!     <2> SVD of the data snapshot matrix X.
+!     =====================================
+!     The left singular vectors are stored in the array X.
+!     The right singular vectors are in the array W.
+!     The array W will later on contain the eigenvectors
+!     of a Rayleigh quotient.
+      NUMRNK = N
+      SELECT CASE ( WHTSVD )
+         CASE (1)
+             CALL DGESVD( 'O', 'S', M, N, X, LDX, WORK, B, &
+                  LDB, W, LDW, WORK(N+1), LWORK-N, INFO1 ) ! LAPACK CALL
+             T_OR_N = 'T'
+         CASE (2)
+            CALL DGESDD( 'O', M, N, X, LDX, WORK, B, LDB, W, &
+                 LDW, WORK(N+1), LWORK-N, IWORK, INFO1 )   ! LAPACK CALL
+            T_OR_N = 'T'
+         CASE (3)
+              CALL DGESVDQ( 'H', 'P', 'N', 'R', 'R', M, N, &
+                   X, LDX, WORK, Z, LDZ, W, LDW, &
+                   NUMRNK, IWORK, LIWORK, WORK(N+MAX(2,M)+1),&
+                   LWORK-N-MAX(2,M), WORK(N+1), MAX(2,M), INFO1)     ! LAPACK CALL
+              CALL DLACPY( 'A', M, NUMRNK, Z, LDZ, X, LDX )   ! LAPACK CALL
+         T_OR_N = 'T'
+         CASE (4)
+              CALL DGEJSV( 'F', 'U', JSVOPT, 'N', 'N', 'P', M, &
+                   N, X, LDX, WORK, Z, LDZ, W, LDW, &
+                   WORK(N+1), LWORK-N, IWORK, INFO1 )    ! LAPACK CALL
+              CALL DLACPY( 'A', M, N, Z, LDZ, X, LDX )   ! LAPACK CALL
+              T_OR_N = 'N'
+              XSCL1 = WORK(N+1)
+              XSCL2 = WORK(N+2)
+              IF ( XSCL1 /=  XSCL2 ) THEN
+                 ! This is an exceptional situation. If the
+                 ! data matrices are not scaled and the
+                 ! largest singular value of X overflows.
+                 ! In that case DGEJSV can return the SVD
+                 ! in scaled form. The scaling factor can be used
+                 ! to rescale the data (X and Y).
+                 CALL DLASCL( 'G', 0, 0, XSCL1, XSCL2, M, N, Y, LDY, INFO2  )
+              END IF
+      END SELECT
+!
+      IF ( INFO1 > 0 ) THEN
+         ! The SVD selected subroutine did not converge.
+         ! Return with an error code.
+         INFO = 2
+         RETURN
+      END IF
+!
+      IF ( WORK(1) == ZERO ) THEN
+          ! The largest computed singular value of (scaled)
+          ! X is zero. Return error code -8
+          ! (the 8th input variable had an illegal value).
+          K = 0
+          INFO = -8
+          CALL XERBLA('DGEDMD',-INFO)
+          RETURN
+      END IF
+!
+      !<3> Determine the numerical rank of the data
+      !    snapshots matrix X. This depends on the
+      !    parameters NRNK and TOL.
+
+      SELECT CASE ( NRNK )
+          CASE ( -1 )
+               K = 1
+               DO i = 2, NUMRNK
+                 IF ( ( WORK(i) <= WORK(1)*TOL ) .OR. &
+                      ( WORK(i) <= SMALL ) ) EXIT
+                 K = K + 1
+               END DO
+          CASE ( -2 )
+               K = 1
+               DO i = 1, NUMRNK-1
+                 IF ( ( WORK(i+1) <= WORK(i)*TOL  ) .OR. &
+                      ( WORK(i) <= SMALL ) ) EXIT
+                 K = K + 1
+               END DO
+          CASE DEFAULT
+               K = 1
+               DO i = 2, NRNK
+                  IF ( WORK(i) <= SMALL ) EXIT
+                  K = K + 1
+               END DO
+          END SELECT
+      !   Now, U = X(1:M,1:K) is the SVD/POD basis for the
+      !   snapshot data in the input matrix X.
+
+      !<4> Compute the Rayleigh quotient S = U^T * A * U.
+      !    Depending on the requested outputs, the computation
+      !    is organized to compute additional auxiliary
+      !    matrices (for the residuals and refinements).
+      !
+      !    In all formulas below, we need V_k*Sigma_k^(-1)
+      !    where either V_k is in W(1:N,1:K), or V_k^T is in
+      !    W(1:K,1:N). Here Sigma_k=diag(WORK(1:K)).
+      IF ( LSAME(T_OR_N, 'N') ) THEN
+          DO i = 1, K
+           CALL DSCAL( N, ONE/WORK(i), W(1,i), 1 )    ! BLAS CALL
+           ! W(1:N,i) = (ONE/WORK(i)) * W(1:N,i)      ! INTRINSIC
+          END DO
+      ELSE
+          ! This non-unit stride access is due to the fact
+          ! that DGESVD, DGESVDQ and DGESDD return the
+          ! transposed matrix of the right singular vectors.
+          !DO i = 1, K
+          ! CALL DSCAL( N, ONE/WORK(i), W(i,1), LDW )    ! BLAS CALL
+          ! ! W(i,1:N) = (ONE/WORK(i)) * W(i,1:N)      ! INTRINSIC
+          !END DO
+          DO i = 1, K
+              WORK(N+i) = ONE/WORK(i)
+          END DO
+          DO j = 1, N
+             DO i = 1, K
+                 W(i,j) = (WORK(N+i))*W(i,j)
+             END DO
+          END DO
+      END IF
+!
+      IF ( WNTREF ) THEN
+         !
+         ! Need A*U(:,1:K)=Y*V_k*inv(diag(WORK(1:K)))
+         ! for computing the refined Ritz vectors
+         ! (optionally, outside DGEDMD).
+          CALL DGEMM( 'N', T_OR_N, M, K, N, ONE, Y, LDY, W, &
+                      LDW, ZERO, Z, LDZ )                        ! BLAS CALL
+          ! Z(1:M,1:K)=MATMUL(Y(1:M,1:N),TRANSPOSE(W(1:K,1:N)))  ! INTRINSIC, for T_OR_N=='T'
+          ! Z(1:M,1:K)=MATMUL(Y(1:M,1:N),W(1:N,1:K))             ! INTRINSIC, for T_OR_N=='N'
+          !
+          ! At this point Z contains
+          ! A * U(:,1:K) = Y * V_k * Sigma_k^(-1), and
+          ! this is needed for computing the residuals.
+          ! This matrix is  returned in the array B and
+          ! it can be used to compute refined Ritz vectors.
+          CALL DLACPY( 'A', M, K, Z, LDZ, B, LDB )   ! BLAS CALL
+          ! B(1:M,1:K) = Z(1:M,1:K)                  ! INTRINSIC
+
+          CALL DGEMM( 'T', 'N', K, K, M, ONE, X, LDX, Z, &
+                      LDZ, ZERO, S, LDS )                        ! BLAS CALL
+          ! S(1:K,1:K) = MATMUL(TANSPOSE(X(1:M,1:K)),Z(1:M,1:K)) ! INTRINSIC
+          ! At this point S = U^T * A * U is the Rayleigh quotient.
+      ELSE
+        ! A * U(:,1:K) is not explicitly needed and the
+        ! computation is organized differently. The Rayleigh
+        ! quotient is computed more efficiently.
+        CALL DGEMM( 'T', 'N', K, N, M, ONE, X, LDX, Y, LDY, &
+                   ZERO, Z, LDZ )                                   ! BLAS CALL
+        ! Z(1:K,1:N) = MATMUL( TRANSPOSE(X(1:M,1:K)), Y(1:M,1:N) )  ! INTRINSIC
+        ! In the two DGEMM calls here, can use K for LDZ.
+        CALL DGEMM( 'N', T_OR_N, K, K, N, ONE, Z, LDZ, W, &
+                    LDW, ZERO, S, LDS )                         ! BLAS CALL
+        ! S(1:K,1:K) = MATMUL(Z(1:K,1:N),TRANSPOSE(W(1:K,1:N))) ! INTRINSIC, for T_OR_N=='T'
+        ! S(1:K,1:K) = MATMUL(Z(1:K,1:N),(W(1:N,1:K)))          ! INTRINSIC, for T_OR_N=='N'
+        ! At this point S = U^T * A * U is the Rayleigh quotient.
+        ! If the residuals are requested, save scaled V_k into Z.
+        ! Recall that V_k or V_k^T is stored in W.
+        IF ( WNTRES .OR. WNTEX ) THEN
+          IF ( LSAME(T_OR_N, 'N') ) THEN
+              CALL DLACPY( 'A', N, K, W, LDW, Z, LDZ )
+          ELSE
+              CALL DLACPY( 'A', K, N, W, LDW, Z, LDZ )
+          END IF
+        END IF
+      END IF
+!
+      !<5> Compute the Ritz values and (if requested) the
+      !   right eigenvectors of the Rayleigh quotient.
+      !
+      CALL DGEEV( 'N', JOBZL, K, S, LDS, REIG, IMEIG, W, &
+                  LDW, W, LDW, WORK(N+1), LWORK-N, INFO1 )   ! LAPACK CALL
+      !
+      ! W(1:K,1:K) contains the eigenvectors of the Rayleigh
+      ! quotient. Even in the case of complex spectrum, all
+      ! computation is done in real arithmetic. REIG and
+      ! IMEIG are the real and the imaginary parts of the
+      ! eigenvalues, so that the spectrum is given as
+      ! REIG(:) + sqrt(-1)*IMEIG(:). Complex conjugate pairs
+      ! are listed at consecutive positions. For such a
+      ! complex conjugate pair of the eigenvalues, the
+      ! corresponding eigenvectors are also a complex
+      ! conjugate pair with the real and imaginary parts
+      ! stored column-wise in W at the corresponding
+      ! consecutive column indices. See the description of Z.
+      ! Also, see the description of DGEEV.
+      IF ( INFO1 > 0 ) THEN
+         ! DGEEV failed to compute the eigenvalues and
+         ! eigenvectors of the Rayleigh quotient.
+         INFO = 3
+         RETURN
+      END IF
+!
+      ! <6> Compute the eigenvectors (if requested) and,
+      ! the residuals (if requested).
+      !
+      IF ( WNTVEC .OR. WNTEX ) THEN
+      IF ( WNTRES ) THEN
+          IF ( WNTREF ) THEN
+            ! Here, if the refinement is requested, we have
+            ! A*U(:,1:K) already computed and stored in Z.
+            ! For the residuals, need Y = A * U(:,1;K) * W.
+            CALL DGEMM( 'N', 'N', M, K, K, ONE, Z, LDZ, W, &
+                       LDW, ZERO, Y, LDY )               ! BLAS CALL
+            ! Y(1:M,1:K) = Z(1:M,1:K) * W(1:K,1:K)       ! INTRINSIC
+            ! This frees Z; Y contains A * U(:,1:K) * W.
+          ELSE
+            ! Compute S = V_k * Sigma_k^(-1) * W, where
+            ! V_k * Sigma_k^(-1) is stored in Z
+            CALL DGEMM( T_OR_N, 'N', N, K, K, ONE, Z, LDZ, &
+                       W, LDW, ZERO, S, LDS)
+            ! Then, compute Z = Y * S =
+            ! = Y * V_k * Sigma_k^(-1) * W(1:K,1:K) =
+            ! = A * U(:,1:K) * W(1:K,1:K)
+            CALL DGEMM( 'N', 'N', M, K, N, ONE, Y, LDY, S, &
+                       LDS, ZERO, Z, LDZ)
+            ! Save a copy of Z into Y and free Z for holding
+            ! the Ritz vectors.
+            CALL DLACPY( 'A', M, K, Z, LDZ, Y, LDY )
+            IF ( WNTEX ) CALL DLACPY( 'A', M, K, Z, LDZ, B, LDB )
+          END IF
+      ELSE IF ( WNTEX ) THEN
+          ! Compute S = V_k * Sigma_k^(-1) * W, where
+            ! V_k * Sigma_k^(-1) is stored in Z
+            CALL DGEMM( T_OR_N, 'N', N, K, K, ONE, Z, LDZ, &
+                       W, LDW, ZERO, S, LDS )
+            ! Then, compute Z = Y * S =
+            ! = Y * V_k * Sigma_k^(-1) * W(1:K,1:K) =
+            ! = A * U(:,1:K) * W(1:K,1:K)
+            CALL DGEMM( 'N', 'N', M, K, N, ONE, Y, LDY, S, &
+                       LDS, ZERO, B, LDB )
+            ! The above call replaces the following two calls
+            ! that were used in the developing-testing phase.
+            ! CALL DGEMM( 'N', 'N', M, K, N, ONE, Y, LDY, S, &
+            !           LDS, ZERO, Z, LDZ)
+            ! Save a copy of Z into B and free Z for holding
+            ! the Ritz vectors.
+            ! CALL DLACPY( 'A', M, K, Z, LDZ, B, LDB )
+      END IF
+!
+      ! Compute the real form of the Ritz vectors
+      IF ( WNTVEC ) CALL DGEMM( 'N', 'N', M, K, K, ONE, X, LDX, W, LDW, &
+                   ZERO, Z, LDZ )                           ! BLAS CALL
+      ! Z(1:M,1:K) = MATMUL(X(1:M,1:K), W(1:K,1:K))         ! INTRINSIC
+!
+      IF ( WNTRES ) THEN
+         i = 1
+         DO WHILE ( i <= K )
+            IF ( IMEIG(i) == ZERO ) THEN
+                ! have a real eigenvalue with real eigenvector
+                CALL DAXPY( M, -REIG(i), Z(1,i), 1, Y(1,i), 1 )       ! BLAS CALL
+                ! Y(1:M,i) = Y(1:M,i) - REIG(i) * Z(1:M,i)            ! INTRINSIC
+                RES(i) = DNRM2( M, Y(1,i), 1)                         ! BLAS CALL
+                i = i + 1
+            ELSE
+               ! Have a complex conjugate pair
+               ! REIG(i) +- sqrt(-1)*IMEIG(i).
+               ! Since all computation is done in real
+               ! arithmetic, the formula for the residual
+               ! is recast for real representation of the
+               ! complex conjugate eigenpair. See the
+               ! description of RES.
+               AB(1,1) =  REIG(i)
+               AB(2,1) = -IMEIG(i)
+               AB(1,2) =  IMEIG(i)
+               AB(2,2) =  REIG(i)
+               CALL DGEMM( 'N', 'N', M, 2, 2, -ONE, Z(1,i), &
+                           LDZ, AB, 2, ONE, Y(1,i), LDY )          ! BLAS CALL
+               ! Y(1:M,i:i+1) = Y(1:M,i:i+1) - Z(1:M,i:i+1) * AB   ! INTRINSIC
+               RES(i)   = DLANGE( 'F', M, 2, Y(1,i), LDY, &
+                                  WORK(N+1) )                      ! LAPACK CALL
+               RES(i+1) = RES(i)
+               i = i + 2
+            END IF
+         END DO
+      END IF
+      END IF
+!
+      IF ( WHTSVD == 4 ) THEN
+          WORK(N+1) = XSCL1
+          WORK(N+2) = XSCL2
+      END IF
+!
+!     Successful exit.
+      IF ( .NOT. BADXY ) THEN
+         INFO = 0
+      ELSE
+         ! A warning on possible data inconsistency.
+         ! This should be a rare event.
+         INFO = 4
+      END IF
+!............................................................
+      RETURN
+!     ......
+      END SUBROUTINE DGEDMD
diff --git a/SRC/dgedmdq.f90 b/SRC/dgedmdq.f90
new file mode 100644
index 0000000000..75d9d18ee3
--- /dev/null
+++ b/SRC/dgedmdq.f90
@@ -0,0 +1,863 @@
+!> \brief \b DGEDMDQ computes the Dynamic Mode Decomposition (DMD) for a pair of data snapshot matrices.
+!
+!  =========== DOCUMENTATION ===========
+!
+!  Definition:
+!  ===========
+!
+!     SUBROUTINE DGEDMDQ( JOBS,  JOBZ, JOBR, JOBQ, JOBT, JOBF,   &
+!                         WHTSVD,   M, N, F, LDF,  X, LDX,  Y,   &
+!                         LDY,   NRNK,  TOL,   K,  REIG, IMEIG,  &
+!                         Z, LDZ, RES,  B,     LDB,   V, LDV,    &
+!                         S, LDS, WORK, LWORK, IWORK, LIWORK, INFO )
+!.....
+!     USE, INTRINSIC :: iso_fortran_env, only: real64
+!     IMPLICIT NONE
+!     INTEGER, PARAMETER :: WP = real64
+!.....
+!     Scalar arguments
+!     CHARACTER, INTENT(IN)  :: JOBS, JOBZ, JOBR, JOBQ,    &
+!                               JOBT, JOBF
+!     INTEGER,   INTENT(IN)  :: WHTSVD, M, N,   LDF, LDX,  &
+!                               LDY, NRNK, LDZ, LDB, LDV,  &
+!                               LDS, LWORK,  LIWORK
+!     INTEGER,   INTENT(OUT) :: INFO,    K
+!     REAL(KIND=WP), INTENT(IN)    ::   TOL
+!     Array arguments
+!     REAL(KIND=WP), INTENT(INOUT) :: F(LDF,*)
+!     REAL(KIND=WP), INTENT(OUT)   :: X(LDX,*), Y(LDY,*),  &
+!                                     Z(LDZ,*), B(LDB,*),  &
+!                                     V(LDV,*), S(LDS,*)
+!     REAL(KIND=WP), INTENT(OUT)   :: REIG(*),  IMEIG(*),  &
+!                                     RES(*)
+!     REAL(KIND=WP), INTENT(OUT)   :: WORK(*)
+!     INTEGER,       INTENT(OUT)   :: IWORK(*)
+!
+!............................................................
+!>    \par Purpose:
+!     =============
+!>    \verbatim
+!>     DGEDMDQ computes the Dynamic Mode Decomposition (DMD) for
+!>     a pair of data snapshot matrices, using a QR factorization
+!>     based compression of the data. For the input matrices
+!>     X and Y such that Y = A*X with an unaccessible matrix
+!>     A, DGEDMDQ computes a certain number of Ritz pairs of A using
+!>     the standard Rayleigh-Ritz extraction from a subspace of
+!>     range(X) that is determined using the leading left singular
+!>     vectors of X. Optionally, DGEDMDQ returns the residuals
+!>     of the computed Ritz pairs, the information needed for
+!>     a refinement of the Ritz vectors, or the eigenvectors of
+!>     the Exact DMD.
+!>     For further details see the references listed
+!>     below. For more details of the implementation see [3].
+!>    \endverbatim
+!............................................................
+!>    \par References:
+!     ================
+!>    \verbatim
+!>    [1] P. Schmid: Dynamic mode decomposition of numerical
+!>        and experimental data,
+!>        Journal of Fluid Mechanics 656, 5-28, 2010.
+!>    [2] Z. Drmac, I. Mezic, R. Mohr: Data driven modal
+!>        decompositions: analysis and enhancements,
+!>        SIAM J. on Sci. Comp. 40 (4), A2253-A2285, 2018.
+!>    [3] Z. Drmac: A LAPACK implementation of the Dynamic
+!>        Mode Decomposition I. Technical report. AIMDyn Inc.
+!>        and LAPACK Working Note 298.
+!>    [4] J. Tu, C. W. Rowley, D. M. Luchtenburg, S. L.
+!>        Brunton, N. Kutz: On Dynamic Mode Decomposition:
+!>        Theory and Applications, Journal of Computational
+!>        Dynamics 1(2), 391 -421, 2014.
+!>    \endverbatim
+!......................................................................
+!>    \par Developed and supported by:
+!     ================================
+!>    \verbatim
+!>    Developed and coded by Zlatko Drmac, Faculty of Science,
+!>    University of Zagreb;  drmac@math.hr
+!>    In cooperation with
+!>    AIMdyn Inc., Santa Barbara, CA.
+!>    and supported by
+!>    - DARPA SBIR project "Koopman Operator-Based Forecasting
+!>    for Nonstationary Processes from Near-Term, Limited
+!>    Observational Data" Contract No: W31P4Q-21-C-0007
+!>    - DARPA PAI project "Physics-Informed Machine Learning
+!>    Methodologies" Contract No: HR0011-18-9-0033
+!>    - DARPA MoDyL project "A Data-Driven, Operator-Theoretic
+!>    Framework for Space-Time Analysis of Process Dynamics"
+!>    Contract No: HR0011-16-C-0116
+!>    Any opinions, findings and conclusions or recommendations
+!>    expressed in this material are those of the author and
+!>    do not necessarily reflect the views of the DARPA SBIR
+!>    Program Office.
+!>    \endverbatim
+!......................................................................
+!>    \par Distribution Statement A:
+!     ==============================
+!>    \verbatim
+!>    Approved for Public Release, Distribution Unlimited.
+!>    Cleared by DARPA on September 29, 2022
+!>    \endverbatim
+!......................................................................
+!     Arguments
+!     =========
+!
+!>    \param[in] JOBS
+!>    \verbatim
+!>    JOBS (input) CHARACTER*1
+!>    Determines whether the initial data snapshots are scaled
+!>    by a diagonal matrix. The data snapshots are the columns
+!>    of F. The leading N-1 columns of F are denoted X and the
+!>    trailing N-1 columns are denoted Y.
+!>    'S' :: The data snapshots matrices X and Y are multiplied
+!>           with a diagonal matrix D so that X*D has unit
+!>           nonzero columns (in the Euclidean 2-norm)
+!>    'C' :: The snapshots are scaled as with the 'S' option.
+!>           If it is found that an i-th column of X is zero
+!>           vector and the corresponding i-th column of Y is
+!>           non-zero, then the i-th column of Y is set to
+!>           zero and a warning flag is raised.
+!>    'Y' :: The data snapshots matrices X and Y are multiplied
+!>           by a diagonal matrix D so that Y*D has unit
+!>           nonzero columns (in the Euclidean 2-norm)
+!>    'N' :: No data scaling.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBZ
+!>    \verbatim
+!>    JOBZ (input) CHARACTER*1
+!>    Determines whether the eigenvectors (Koopman modes) will
+!>    be computed.
+!>    'V' :: The eigenvectors (Koopman modes) will be computed
+!>           and returned in the matrix Z.
+!>           See the description of Z.
+!>    'F' :: The eigenvectors (Koopman modes) will be returned
+!>           in factored form as the product Z*V, where Z
+!>           is orthonormal and V contains the eigenvectors
+!>           of the corresponding Rayleigh quotient.
+!>           See the descriptions of F, V, Z.
+!>    'Q' :: The eigenvectors (Koopman modes) will be returned
+!>           in factored form as the product Q*Z, where Z
+!>           contains the eigenvectors of the compression of the
+!>           underlying discretized operator onto the span of
+!>           the data snapshots. See the descriptions of F, V, Z.
+!>           Q is from the initial QR factorization.
+!>    'N' :: The eigenvectors are not computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBR
+!>    \verbatim
+!>    JOBR (input) CHARACTER*1
+!>    Determines whether to compute the residuals.
+!>    'R' :: The residuals for the computed eigenpairs will
+!>           be computed and stored in the array RES.
+!>           See the description of RES.
+!>           For this option to be legal, JOBZ must be 'V'.
+!>    'N' :: The residuals are not computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBQ
+!>    \verbatim
+!>    JOBQ (input) CHARACTER*1
+!>    Specifies whether to explicitly compute and return the
+!>    orthogonal matrix from the QR factorization.
+!>    'Q' :: The matrix Q of the QR factorization of the data
+!>           snapshot matrix is computed and stored in the
+!>           array F. See the description of F.
+!>    'N' :: The matrix Q is not explicitly computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBT
+!>    \verbatim
+!>    JOBT (input) CHARACTER*1
+!>    Specifies whether to return the upper triangular factor
+!>    from the QR factorization.
+!>    'R' :: The matrix R of the QR factorization of the data
+!>           snapshot matrix F is returned in the array Y.
+!>           See the description of Y and Further details.
+!>    'N' :: The matrix R is not returned.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBF
+!>    \verbatim
+!>    JOBF (input) CHARACTER*1
+!>    Specifies whether to store information needed for post-
+!>    processing (e.g. computing refined Ritz vectors)
+!>    'R' :: The matrix needed for the refinement of the Ritz
+!>           vectors is computed and stored in the array B.
+!>           See the description of B.
+!>    'E' :: The unscaled eigenvectors of the Exact DMD are
+!>           computed and returned in the array B. See the
+!>           description of B.
+!>    'N' :: No eigenvector refinement data is computed.
+!>    To be useful on exit, this option needs JOBQ='Q'.
+!>    \endverbatim
+!.....
+!>    \param[in] WHTSVD
+!>    \verbatim
+!>    WHTSVD (input) INTEGER, WHSTVD in { 1, 2, 3, 4 }
+!>    Allows for a selection of the SVD algorithm from the
+!>    LAPACK library.
+!>    1 :: DGESVD (the QR SVD algorithm)
+!>    2 :: DGESDD (the Divide and Conquer algorithm; if enough
+!>         workspace available, this is the fastest option)
+!>    3 :: DGESVDQ (the preconditioned QR SVD  ; this and 4
+!>         are the most accurate options)
+!>    4 :: DGEJSV (the preconditioned Jacobi SVD; this and 3
+!>         are the most accurate options)
+!>    For the four methods above, a significant difference in
+!>    the accuracy of small singular values is possible if
+!>    the snapshots vary in norm so that X is severely
+!>    ill-conditioned. If small (smaller than EPS*||X||)
+!>    singular values are of interest and JOBS=='N',  then
+!>    the options (3, 4) give the most accurate results, where
+!>    the option 4 is slightly better and with stronger
+!>    theoretical background.
+!>    If JOBS=='S', i.e. the columns of X will be normalized,
+!>    then all methods give nearly equally accurate results.
+!>    \endverbatim
+!.....
+!>    \param[in] M
+!>    \verbatim
+!>    M (input) INTEGER, M >= 0
+!>    The state space dimension (the number of rows of F).
+!>    \endverbatim
+!.....
+!>    \param[in] N
+!>    \verbatim
+!>    N (input) INTEGER, 0 <= N <= M
+!>    The number of data snapshots from a single trajectory,
+!>    taken at equidistant discrete times. This is the
+!>    number of columns of F.
+!>    \endverbatim
+!.....
+!>    \param[in,out] F
+!>    \verbatim
+!>    F (input/output) REAL(KIND=WP) M-by-N array
+!>    > On entry,
+!>    the columns of F are the sequence of data snapshots
+!>    from a single trajectory, taken at equidistant discrete
+!>    times. It is assumed that the column norms of F are
+!>    in the range of the normalized floating point numbers.
+!>    < On exit,
+!>    If JOBQ == 'Q', the array F contains the orthogonal
+!>    matrix/factor of the QR factorization of the initial
+!>    data snapshots matrix F. See the description of JOBQ.
+!>    If JOBQ == 'N', the entries in F strictly below the main
+!>    diagonal contain, column-wise, the information on the
+!>    Householder vectors, as returned by DGEQRF. The
+!>    remaining information to restore the orthogonal matrix
+!>    of the initial QR factorization is stored in WORK(1:N).
+!>    See the description of WORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LDF
+!>    \verbatim
+!>    LDF (input) INTEGER, LDF >= M
+!>    The leading dimension of the array F.
+!>    \endverbatim
+!.....
+!>    \param[in,out] X
+!>    \verbatim
+!>    X (workspace/output) REAL(KIND=WP) MIN(M,N)-by-(N-1) array
+!>    X is used as workspace to hold representations of the
+!>    leading N-1 snapshots in the orthonormal basis computed
+!>    in the QR factorization of F.
+!>    On exit, the leading K columns of X contain the leading
+!>    K left singular vectors of the above described content
+!>    of X. To lift them to the space of the left singular
+!>    vectors U(:,1:K)of the input data, pre-multiply with the
+!>    Q factor from the initial QR factorization.
+!>    See the descriptions of F, K, V  and Z.
+!>    \endverbatim
+!.....
+!>    \param[in] LDX
+!>    \verbatim
+!>    LDX (input) INTEGER, LDX >= N
+!>    The leading dimension of the array X.
+!>    \endverbatim
+!.....
+!>    \param[in,out] Y
+!>    \verbatim
+!>    Y (workspace/output) REAL(KIND=WP) MIN(M,N)-by-(N-1) array
+!>    Y is used as workspace to hold representations of the
+!>    trailing N-1 snapshots in the orthonormal basis computed
+!>    in the QR factorization of F.
+!>    On exit,
+!>    If JOBT == 'R', Y contains the MIN(M,N)-by-N upper
+!>    triangular factor from the QR factorization of the data
+!>    snapshot matrix F.
+!>    \endverbatim
+!.....
+!>    \param[in] LDY
+!>    \verbatim
+!>    LDY (input) INTEGER , LDY >= N
+!>    The leading dimension of the array Y.
+!>    \endverbatim
+!.....
+!>    \param[in] NRNK
+!>    \verbatim
+!>    NRNK (input) INTEGER
+!>    Determines the mode how to compute the numerical rank,
+!>    i.e. how to truncate small singular values of the input
+!>    matrix X. On input, if
+!>    NRNK = -1 :: i-th singular value sigma(i) is truncated
+!>                 if sigma(i) <= TOL*sigma(1)
+!>                 This option is recommended.
+!>    NRNK = -2 :: i-th singular value sigma(i) is truncated
+!>                 if sigma(i) <= TOL*sigma(i-1)
+!>                 This option is included for R&D purposes.
+!>                 It requires highly accurate SVD, which
+!>                 may not be feasible.
+!>    The numerical rank can be enforced by using positive
+!>    value of NRNK as follows:
+!>    0 < NRNK <= N-1 :: at most NRNK largest singular values
+!>    will be used. If the number of the computed nonzero
+!>    singular values is less than NRNK, then only those
+!>    nonzero values will be used and the actually used
+!>    dimension is less than NRNK. The actual number of
+!>    the nonzero singular values is returned in the variable
+!>    K. See the description of K.
+!>    \endverbatim
+!.....
+!>    \param[in] TOL
+!>     \verbatim
+!>     TOL (input) REAL(KIND=WP), 0 <= TOL < 1
+!>     The tolerance for truncating small singular values.
+!>     See the description of NRNK.
+!>     \endverbatim
+!.....
+!>     \param[out] K
+!>     \verbatim
+!>     K (output) INTEGER,  0 <= K <= N
+!>     The dimension of the SVD/POD basis for the leading N-1
+!>     data snapshots (columns of F) and the number of the
+!>     computed Ritz pairs. The value of K is determined
+!>     according to the rule set by the parameters NRNK and
+!>     TOL. See the descriptions of NRNK and TOL.
+!>     \endverbatim
+!.....
+!>    \param[out] REIG
+!>    \verbatim
+!>    REIG (output) REAL(KIND=WP) (N-1)-by-1 array
+!>    The leading K (K<=N) entries of REIG contain
+!>    the real parts of the computed eigenvalues
+!>    REIG(1:K) + sqrt(-1)*IMEIG(1:K).
+!>    See the descriptions of K, IMEIG, Z.
+!>    \endverbatim
+!.....
+!>    \param[out] IMEIG
+!>    \verbatim
+!>    IMEIG (output) REAL(KIND=WP) (N-1)-by-1 array
+!>    The leading K (K<N) entries of REIG contain
+!>    the imaginary parts of the computed eigenvalues
+!>    REIG(1:K) + sqrt(-1)*IMEIG(1:K).
+!>    The eigenvalues are determined as follows:
+!>    If IMEIG(i) == 0, then the corresponding eigenvalue is
+!>    real, LAMBDA(i) = REIG(i).
+!>    If IMEIG(i)>0, then the corresponding complex
+!>    conjugate pair of eigenvalues reads
+!>    LAMBDA(i)   = REIG(i) + sqrt(-1)*IMAG(i)
+!>    LAMBDA(i+1) = REIG(i) - sqrt(-1)*IMAG(i)
+!>    That is, complex conjugate pairs have consequtive
+!>    indices (i,i+1), with the positive imaginary part
+!>    listed first.
+!>    See the descriptions of K, REIG, Z.
+!>    \endverbatim
+!.....
+!>    \param[out] Z
+!>    \verbatim
+!>    Z (workspace/output) REAL(KIND=WP)  M-by-(N-1) array
+!>    If JOBZ =='V' then
+!>       Z contains real Ritz vectors as follows:
+!>       If IMEIG(i)=0, then Z(:,i) is an eigenvector of
+!>       the i-th Ritz value.
+!>       If IMEIG(i) > 0 (and IMEIG(i+1) < 0) then
+!>       [Z(:,i) Z(:,i+1)] span an invariant subspace and
+!>       the Ritz values extracted from this subspace are
+!>       REIG(i) + sqrt(-1)*IMEIG(i) and
+!>       REIG(i) - sqrt(-1)*IMEIG(i).
+!>       The corresponding eigenvectors are
+!>       Z(:,i) + sqrt(-1)*Z(:,i+1) and
+!>       Z(:,i) - sqrt(-1)*Z(:,i+1), respectively.
+!>    If JOBZ == 'F', then the above descriptions hold for
+!>    the columns of Z*V, where the columns of V are the
+!>    eigenvectors of the K-by-K Rayleigh quotient, and Z is
+!>    orthonormal. The columns of V are similarly structured:
+!>    If IMEIG(i) == 0 then Z*V(:,i) is an eigenvector, and if
+!>    IMEIG(i) > 0 then Z*V(:,i)+sqrt(-1)*Z*V(:,i+1) and
+!>                      Z*V(:,i)-sqrt(-1)*Z*V(:,i+1)
+!>    are the eigenvectors of LAMBDA(i), LAMBDA(i+1).
+!>    See the descriptions of REIG, IMEIG, X and V.
+!>    \endverbatim
+!.....
+!>    \param[in] LDZ
+!>    \verbatim
+!>    LDZ (input) INTEGER , LDZ >= M
+!>    The leading dimension of the array Z.
+!>    \endverbatim
+!.....
+!>    \param[out] RES
+!>    \verbatim
+!>    RES (output) REAL(KIND=WP) (N-1)-by-1 array
+!>    RES(1:K) contains the residuals for the K computed
+!>    Ritz pairs.
+!>    If LAMBDA(i) is real, then
+!>       RES(i) = || A * Z(:,i) - LAMBDA(i)*Z(:,i))||_2.
+!>    If [LAMBDA(i), LAMBDA(i+1)] is a complex conjugate pair
+!>    then
+!>    RES(i)=RES(i+1) = || A * Z(:,i:i+1) - Z(:,i:i+1) *B||_F
+!>    where B = [ real(LAMBDA(i)) imag(LAMBDA(i)) ]
+!>              [-imag(LAMBDA(i)) real(LAMBDA(i)) ].
+!>    It holds that
+!>    RES(i)   = || A*ZC(:,i)   - LAMBDA(i)  *ZC(:,i)   ||_2
+!>    RES(i+1) = || A*ZC(:,i+1) - LAMBDA(i+1)*ZC(:,i+1) ||_2
+!>    where ZC(:,i)   =  Z(:,i) + sqrt(-1)*Z(:,i+1)
+!>          ZC(:,i+1) =  Z(:,i) - sqrt(-1)*Z(:,i+1)
+!>    See the description of Z.
+!>    \endverbatim
+!.....
+!>    \param[out] B
+!>    \verbatim
+!>    B (output) REAL(KIND=WP)  MIN(M,N)-by-(N-1) array.
+!>    IF JOBF =='R', B(1:N,1:K) contains A*U(:,1:K), and can
+!>    be used for computing the refined vectors; see further
+!>    details in the provided references.
+!>    If JOBF == 'E', B(1:N,1;K) contains
+!>    A*U(:,1:K)*W(1:K,1:K), which are the vectors from the
+!>    Exact DMD, up to scaling by the inverse eigenvalues.
+!>    In both cases, the content of B can be lifted to the
+!>    original dimension of the input data by pre-multiplying
+!>    with the Q factor from the initial QR factorization.
+!>    Here A denotes a compression of the underlying operator.
+!>    See the descriptions of F and X.
+!>    If JOBF =='N', then B is not referenced.
+!>    \endverbatim
+!.....
+!>    \param[in] LDB
+!>    \verbatim
+!>    LDB (input) INTEGER, LDB >= MIN(M,N)
+!>    The leading dimension of the array B.
+!>    \endverbatim
+!.....
+!>    \param[out] V
+!>    \verbatim
+!>    V (workspace/output) REAL(KIND=WP) (N-1)-by-(N-1) array
+!>    On exit, V(1:K,1:K) contains the K eigenvectors of
+!>    the Rayleigh quotient. The eigenvectors of a complex
+!>    conjugate pair of eigenvalues are returned in real form
+!>    as explained in the description of Z. The Ritz vectors
+!>    (returned in Z) are the product of X and V; see
+!>    the descriptions of X and Z.
+!>    \endverbatim
+!.....
+!>    \param[in] LDV
+!>    \verbatim
+!>    LDV (input) INTEGER, LDV >= N-1
+!>    The leading dimension of the array V.
+!>    \endverbatim
+!.....
+!>    \param[out] S
+!>    \verbatim
+!>    S (output) REAL(KIND=WP) (N-1)-by-(N-1) array
+!>    The array S(1:K,1:K) is used for the matrix Rayleigh
+!>    quotient. This content is overwritten during
+!>    the eigenvalue decomposition by DGEEV.
+!>    See the description of K.
+!>    \endverbatim
+!.....
+!>    \param[in] LDS
+!>    \verbatim
+!>    LDS (input) INTEGER, LDS >= N-1
+!>    The leading dimension of the array S.
+!>    \endverbatim
+!.....
+!>    \param[out] WORK
+!>    \verbatim
+!>    WORK (workspace/output) REAL(KIND=WP) LWORK-by-1 array
+!>    On exit,
+!>    WORK(1:MIN(M,N)) contains the scalar factors of the
+!>    elementary reflectors as returned by DGEQRF of the
+!>    M-by-N input matrix F.
+!>    WORK(MIN(M,N)+1:MIN(M,N)+N-1) contains the singular values of
+!>    the input submatrix F(1:M,1:N-1).
+!>    If the call to DGEDMDQ is only workspace query, then
+!>    WORK(1) contains the minimal workspace length and
+!>    WORK(2) is the optimal workspace length. Hence, the
+!>    length of work is at least 2.
+!>    See the description of LWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LWORK
+!>    \verbatim
+!>    LWORK (input) INTEGER
+!>    The minimal length of the  workspace vector WORK.
+!>    LWORK is calculated as follows:
+!>    Let MLWQR  = N (minimal workspace for DGEQRF[M,N])
+!>        MLWDMD = minimal workspace for DGEDMD (see the
+!>                 description of LWORK in DGEDMD) for
+!>                 snapshots of dimensions MIN(M,N)-by-(N-1)
+!>        MLWMQR = N (minimal workspace for
+!>                   DORMQR['L','N',M,N,N])
+!>        MLWGQR = N (minimal workspace for DORGQR[M,N,N])
+!>    Then
+!>    LWORK = MAX(N+MLWQR, N+MLWDMD)
+!>    is updated as follows:
+!>       if   JOBZ == 'V' or JOBZ == 'F' THEN
+!>            LWORK = MAX( LWORK, MIN(M,N)+N-1+MLWMQR )
+!>       if   JOBQ == 'Q' THEN
+!>            LWORK = MAX( LWORK, MIN(M,N)+N-1+MLWGQR)
+!>    If on entry LWORK = -1, then a workspace query is
+!>    assumed and the procedure only computes the minimal
+!>    and the optimal workspace lengths for both WORK and
+!>    IWORK. See the descriptions of WORK and IWORK.
+!>    \endverbatim
+!.....
+!>    \param[out] IWORK
+!>    \verbatim
+!>    IWORK (workspace/output) INTEGER LIWORK-by-1 array
+!>    Workspace that is required only if WHTSVD equals
+!>    2 , 3 or 4. (See the description of WHTSVD).
+!>    If on entry LWORK =-1 or LIWORK=-1, then the
+!>    minimal length of IWORK is computed and returned in
+!>    IWORK(1). See the description of LIWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LIWORK
+!>    \verbatim
+!>    LIWORK (input) INTEGER
+!>    The minimal length of the workspace vector IWORK.
+!>    If WHTSVD == 1, then only IWORK(1) is used; LIWORK >=1
+!>    Let M1=MIN(M,N), N1=N-1. Then
+!>    If WHTSVD == 2, then LIWORK >= MAX(1,8*MIN(M1,N1))
+!>    If WHTSVD == 3, then LIWORK >= MAX(1,M1+N1-1)
+!>    If WHTSVD == 4, then LIWORK >= MAX(3,M1+3*N1)
+!>    If on entry LIWORK = -1, then a workspace query is
+!>    assumed and the procedure only computes the minimal
+!>    and the optimal workspace lengths for both WORK and
+!>    IWORK. See the descriptions of WORK and IWORK.
+!>    \endverbatim
+!.....
+!>    \param[out] INFO
+!>    \verbatim
+!>    INFO (output) INTEGER
+!>    -i < 0 :: On entry, the i-th argument had an
+!>              illegal value
+!>       = 0 :: Successful return.
+!>       = 1 :: Void input. Quick exit (M=0 or N=0).
+!>       = 2 :: The SVD computation of X did not converge.
+!>              Suggestion: Check the input data and/or
+!>              repeat with different WHTSVD.
+!>       = 3 :: The computation of the eigenvalues did not
+!>              converge.
+!>       = 4 :: If data scaling was requested on input and
+!>              the procedure found inconsistency in the data
+!>              such that for some column index i,
+!>              X(:,i) = 0 but Y(:,i) /= 0, then Y(:,i) is set
+!>              to zero if JOBS=='C'. The computation proceeds
+!>              with original or modified data and warning
+!>              flag is set with INFO=4.
+!>    \endverbatim
+!
+!  Authors:
+!  ========
+!
+!> \author Zlatko Drmac
+!
+!> \ingroup gedmd
+!
+!.............................................................
+!.............................................................
+SUBROUTINE DGEDMDQ( JOBS,  JOBZ, JOBR, JOBQ, JOBT, JOBF,   &
+                    WHTSVD,   M, N, F, LDF,  X, LDX,  Y,   &
+                    LDY,   NRNK,  TOL,   K,  REIG, IMEIG,  &
+                    Z, LDZ, RES,  B,     LDB,   V, LDV,    &
+                    S, LDS, WORK, LWORK, IWORK, LIWORK, INFO )
+!
+!  -- LAPACK driver routine                                           --
+!
+!  -- LAPACK is a software package provided by University of          --
+!  -- Tennessee, University of California Berkeley, University of     --
+!  -- Colorado Denver and NAG Ltd..                                   --
+!
+!.....
+      USE, INTRINSIC :: iso_fortran_env, only: real64
+      IMPLICIT NONE
+      INTEGER, PARAMETER :: WP = real64
+!
+!     Scalar arguments
+!     ~~~~~~~~~~~~~~~~
+      CHARACTER, INTENT(IN)  :: JOBS, JOBZ, JOBR, JOBQ,    &
+                                JOBT, JOBF
+      INTEGER,   INTENT(IN)  :: WHTSVD, M, N,   LDF, LDX,  &
+                                LDY, NRNK, LDZ, LDB, LDV,  &
+                                LDS, LWORK,  LIWORK
+      INTEGER,   INTENT(OUT) :: INFO,    K
+      REAL(KIND=WP), INTENT(IN)    ::   TOL
+!
+!     Array arguments
+!     ~~~~~~~~~~~~~~~
+      REAL(KIND=WP), INTENT(INOUT) :: F(LDF,*)
+      REAL(KIND=WP), INTENT(OUT)   :: X(LDX,*), Y(LDY,*),  &
+                                      Z(LDZ,*), B(LDB,*),  &
+                                      V(LDV,*), S(LDS,*)
+      REAL(KIND=WP), INTENT(OUT)   :: REIG(*),  IMEIG(*),  &
+                                      RES(*)
+      REAL(KIND=WP), INTENT(OUT)   :: WORK(*)
+      INTEGER,       INTENT(OUT)   :: IWORK(*)
+!
+!     Parameters
+!     ~~~~~~~~~~
+      REAL(KIND=WP), PARAMETER ::  ONE = 1.0_WP
+      REAL(KIND=WP), PARAMETER :: ZERO = 0.0_WP
+!
+!     Local scalars
+!     ~~~~~~~~~~~~~
+      INTEGER           :: IMINWR, INFO1,  MLWDMD, MLWGQR, &
+                           MLWMQR, MLWORK, MLWQR,  MINMN,  &
+                           OLWDMD, OLWGQR, OLWMQR, OLWORK, &
+                           OLWQR
+      LOGICAL           :: LQUERY, SCCOLX, SCCOLY, WANTQ,  &
+                           WNTTRF, WNTRES, WNTVEC, WNTVCF, &
+                           WNTVCQ, WNTREF, WNTEX
+      CHARACTER(LEN=1)  :: JOBVL
+!
+!     Local array
+!     ~~~~~~~~~~~
+      REAL(KIND=WP) :: RDUMMY(2)
+!
+!     External functions (BLAS and LAPACK)
+!     ~~~~~~~~~~~~~~~~~
+      LOGICAL       LSAME
+      EXTERNAL      LSAME
+!
+!     External subroutines (BLAS and LAPACK)
+!     ~~~~~~~~~~~~~~~~~~~~
+      EXTERNAL      DGEMM
+      EXTERNAL      DGEDMD, DGEQRF, DLACPY, DLASET, DORGQR, &
+                    DORMQR, XERBLA
+!
+!     Intrinsic functions
+!     ~~~~~~~~~~~~~~~~~~~
+      INTRINSIC      MAX, MIN, INT
+ !..........................................................
+ !
+ !    Test the input arguments
+      WNTRES = LSAME(JOBR,'R')
+      SCCOLX = LSAME(JOBS,'S') .OR. LSAME( JOBS, 'C' )
+      SCCOLY = LSAME(JOBS,'Y')
+      WNTVEC = LSAME(JOBZ,'V')
+      WNTVCF = LSAME(JOBZ,'F')
+      WNTVCQ = LSAME(JOBZ,'Q')
+      WNTREF = LSAME(JOBF,'R')
+      WNTEX  = LSAME(JOBF,'E')
+      WANTQ  = LSAME(JOBQ,'Q')
+      WNTTRF = LSAME(JOBT,'R')
+      MINMN  = MIN(M,N)
+      INFO = 0
+      LQUERY = ( ( LWORK == -1 ) .OR. ( LIWORK == -1 ) )
+!
+      IF ( .NOT. (SCCOLX .OR. SCCOLY .OR.                &
+                                  LSAME(JOBS,'N')) )  THEN
+          INFO = -1
+      ELSE IF ( .NOT. (WNTVEC .OR. WNTVCF .OR. WNTVCQ    &
+                              .OR. LSAME(JOBZ,'N')) ) THEN
+          INFO = -2
+      ELSE IF ( .NOT. (WNTRES .OR. LSAME(JOBR,'N')) .OR.    &
+          ( WNTRES .AND. LSAME(JOBZ,'N') ) ) THEN
+          INFO = -3
+      ELSE IF ( .NOT. (WANTQ .OR. LSAME(JOBQ,'N')) ) THEN
+          INFO = -4
+      ELSE IF ( .NOT. ( WNTTRF .OR. LSAME(JOBT,'N') ) )  THEN
+          INFO = -5
+      ELSE IF ( .NOT. (WNTREF .OR. WNTEX .OR.             &
+                LSAME(JOBF,'N') ) )                    THEN
+          INFO = -6
+      ELSE IF ( .NOT. ((WHTSVD == 1).OR.(WHTSVD == 2).OR.   &
+                       (WHTSVD == 3).OR.(WHTSVD == 4)) ) THEN
+          INFO = -7
+      ELSE IF ( M < 0 ) THEN
+          INFO = -8
+      ELSE IF ( ( N < 0 ) .OR. ( N > M+1 ) ) THEN
+          INFO = -9
+      ELSE IF ( LDF < M ) THEN
+          INFO = -11
+      ELSE IF ( LDX < MINMN ) THEN
+          INFO = -13
+      ELSE IF ( LDY < MINMN ) THEN
+          INFO = -15
+      ELSE IF ( .NOT. (( NRNK == -2).OR.(NRNK == -1).OR.    &
+                       ((NRNK >= 1).AND.(NRNK <=N ))) )  THEN
+          INFO = -16
+      ELSE IF ( ( TOL < ZERO ) .OR. ( TOL >= ONE ) ) THEN
+          INFO = -17
+      ELSE IF ( LDZ < M ) THEN
+          INFO = -22
+      ELSE IF ( (WNTREF.OR.WNTEX ).AND.( LDB < MINMN ) ) THEN
+          INFO = -25
+      ELSE IF ( LDV < N-1 ) THEN
+          INFO = -27
+      ELSE IF ( LDS < N-1 ) THEN
+          INFO = -29
+      END IF
+!
+      IF ( WNTVEC .OR. WNTVCF .OR. WNTVCQ ) THEN
+          JOBVL = 'V'
+      ELSE
+          JOBVL = 'N'
+      END IF
+      IF ( INFO == 0 ) THEN
+          ! Compute the minimal and the optimal workspace
+          ! requirements. Simulate running the code and
+          ! determine minimal and optimal sizes of the
+          ! workspace at any moment of the run.
+         IF ( ( N == 0 ) .OR. ( N == 1 ) ) THEN
+             ! All output except K is void. INFO=1 signals
+             ! the void input. In case of a workspace query,
+             ! the minimal workspace lengths are returned.
+            IF ( LQUERY ) THEN
+               IWORK(1) = 1
+                WORK(1) = 2
+                WORK(2) = 2
+            ELSE
+               K = 0
+            END IF
+            INFO = 1
+            RETURN
+         END IF
+         MLWQR  = MAX(1,N)  ! Minimal workspace length for DGEQRF.
+         MLWORK = MINMN + MLWQR
+         IF ( LQUERY ) THEN
+             CALL DGEQRF( M, N, F, LDF, WORK, RDUMMY, -1, &
+                          INFO1 )
+             OLWQR  = INT(RDUMMY(1))
+             OLWORK = MIN(M,N) + OLWQR
+         END IF
+         CALL DGEDMD( JOBS, JOBVL, JOBR, JOBF, WHTSVD, MINMN,&
+                      N-1, X, LDX, Y, LDY, NRNK, TOL, K,     &
+                      REIG, IMEIG, Z, LDZ, RES,  B, LDB,     &
+                      V, LDV, S, LDS, WORK, -1, IWORK,       &
+                      LIWORK, INFO1 )
+         MLWDMD = INT(WORK(1))
+         MLWORK = MAX(MLWORK, MINMN + MLWDMD)
+         IMINWR = IWORK(1)
+         IF ( LQUERY ) THEN
+             OLWDMD = INT(WORK(2))
+             OLWORK = MAX(OLWORK, MINMN+OLWDMD)
+         END IF
+         IF ( WNTVEC .OR. WNTVCF ) THEN
+            MLWMQR = MAX(1,N)
+            MLWORK = MAX(MLWORK,MINMN+N-1+MLWMQR)
+            IF ( LQUERY ) THEN
+               CALL DORMQR( 'L','N', M, N, MINMN, F, LDF,  &
+                            WORK, Z, LDZ, WORK, -1, INFO1 )
+               OLWMQR = INT(WORK(1))
+               OLWORK = MAX(OLWORK,MINMN+N-1+OLWMQR)
+            END IF
+         END IF
+         IF ( WANTQ ) THEN
+            MLWGQR = N
+            MLWORK = MAX(MLWORK,MINMN+N-1+MLWGQR)
+            IF ( LQUERY ) THEN
+                CALL DORGQR( M, MINMN, MINMN, F, LDF, WORK, &
+                             WORK, -1, INFO1 )
+                OLWGQR = INT(WORK(1))
+                OLWORK = MAX(OLWORK,MINMN+N-1+OLWGQR)
+            END IF
+         END IF
+         IMINWR = MAX( 1, IMINWR )
+         MLWORK = MAX( 2, MLWORK )
+         IF (  LWORK < MLWORK .AND. (.NOT.LQUERY) ) INFO = -31
+         IF ( LIWORK < IMINWR .AND. (.NOT.LQUERY) ) INFO = -33
+      END IF
+      IF( INFO /= 0 ) THEN
+         CALL XERBLA( 'DGEDMDQ', -INFO )
+         RETURN
+      ELSE IF ( LQUERY ) THEN
+!     Return minimal and optimal workspace sizes
+          IWORK(1) = IMINWR
+          WORK(1)  = MLWORK
+          WORK(2)  = OLWORK
+          RETURN
+      END IF
+!.....
+!     Initial QR factorization that is used to represent the
+!     snapshots as elements of lower dimensional subspace.
+!     For large scale computation with M >>N , at this place
+!     one can use an out of core QRF.
+!
+      CALL DGEQRF( M, N, F, LDF, WORK,               &
+                   WORK(MINMN+1), LWORK-MINMN, INFO1 )
+!
+!     Define X and Y as the snapshots representations in the
+!     orthogonal basis computed in the QR factorization.
+!     X corresponds to the leading N-1 and Y to the trailing
+!     N-1 snapshots.
+      CALL DLASET( 'L', MINMN, N-1, ZERO,  ZERO, X, LDX )
+      CALL DLACPY( 'U', MINMN, N-1, F,      LDF, X, LDX )
+      CALL DLACPY( 'A', MINMN, N-1, F(1,2), LDF, Y, LDY )
+      IF ( M >= 3 ) THEN
+          CALL DLASET( 'L', MINMN-2, N-2, ZERO,  ZERO, &
+                       Y(3,1), LDY )
+      END IF
+!
+!     Compute the DMD of the projected snapshot pairs (X,Y)
+      CALL DGEDMD( JOBS, JOBVL, JOBR, JOBF, WHTSVD, MINMN,  &
+                   N-1, X, LDX, Y, LDY, NRNK,   TOL, K,     &
+                   REIG, IMEIG, Z, LDZ, RES, B, LDB, V,     &
+                   LDV, S, LDS, WORK(MINMN+1), LWORK-MINMN, &
+                   IWORK, LIWORK, INFO1 )
+      IF ( INFO1 == 2 .OR. INFO1 == 3 ) THEN
+          ! Return with error code. See DGEDMD for details.
+          INFO = INFO1
+          RETURN
+      ELSE
+          INFO = INFO1
+      END IF
+!
+!     The Ritz vectors (Koopman modes) can be explicitly
+!     formed or returned in factored form.
+      IF ( WNTVEC ) THEN
+        ! Compute the eigenvectors explicitly.
+        IF ( M > MINMN ) CALL DLASET( 'A', M-MINMN, K, ZERO, &
+                                     ZERO, Z(MINMN+1,1), LDZ )
+        CALL DORMQR( 'L','N', M, K, MINMN, F, LDF, WORK, Z,  &
+             LDZ, WORK(MINMN+N), LWORK-(MINMN+N-1), INFO1 )
+      ELSE IF ( WNTVCF ) THEN
+        !   Return the Ritz vectors (eigenvectors) in factored
+        !   form Z*V, where Z contains orthonormal matrix (the
+        !   product of Q from the initial QR factorization and
+        !   the SVD/POD_basis returned by DGEDMD in X) and the
+        !   second factor (the eigenvectors of the Rayleigh
+        !   quotient) is in the array V, as returned by DGEDMD.
+        CALL DLACPY( 'A', N, K, X, LDX, Z, LDZ )
+        IF ( M > N ) CALL DLASET( 'A', M-N, K, ZERO, ZERO,   &
+                                  Z(N+1,1), LDZ )
+        CALL DORMQR( 'L','N', M, K, MINMN, F, LDF, WORK, Z,  &
+             LDZ, WORK(MINMN+N), LWORK-(MINMN+N-1), INFO1 )
+      END IF
+!
+!     Some optional output variables:
+!
+!     The upper triangular factor R in the initial QR
+!     factorization is optionally returned in the array Y.
+!     This is useful if this call to DGEDMDQ is to be
+!     followed by a streaming DMD that is implemented in a
+!     QR compressed form.
+      IF ( WNTTRF ) THEN ! Return the upper triangular R in Y
+         CALL DLASET( 'A', MINMN, N, ZERO,  ZERO, Y, LDY )
+         CALL DLACPY( 'U', MINMN, N, F, LDF,      Y, LDY )
+      END IF
+!
+!     The orthonormal/orthogonal factor Q in the initial QR
+!     factorization is optionally returned in the array F.
+!     Same as with the triangular factor above, this is
+!     useful in a streaming DMD.
+      IF ( WANTQ ) THEN               ! Q overwrites F
+         CALL DORGQR( M, MINMN, MINMN, F, LDF, WORK, &
+              WORK(MINMN+N), LWORK-(MINMN+N-1), INFO1 )
+      END IF
+!
+      RETURN
+!
+      END SUBROUTINE DGEDMDQ
diff --git a/SRC/dgeequ.f b/SRC/dgeequ.f
index 3dc323014d..1ef9bc76e0 100644
--- a/SRC/dgeequ.f
+++ b/SRC/dgeequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -131,11 +129,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup geequ
 *
 *  =====================================================================
       SUBROUTINE DGEEQU( M, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dgeequb.f b/SRC/dgeequb.f
index 728c6213e4..c3c9b74451 100644
--- a/SRC/dgeequb.f
+++ b/SRC/dgeequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -138,11 +136,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup geequb
 *
 *  =====================================================================
       SUBROUTINE DGEEQUB( M, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dgees.f b/SRC/dgees.f
index 82b9d6ee44..23f2954e3a 100644
--- a/SRC/dgees.f
+++ b/SRC/dgees.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEES + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgees.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgees.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -208,11 +206,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEeigen
+*> \ingroup gees
 *
 *  =====================================================================
       SUBROUTINE DGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
      $                  VS, LDVS, WORK, LWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -250,8 +249,9 @@ SUBROUTINE DGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
       DOUBLE PRECISION   DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEBAK, DGEBAL, DGEHRD, DHSEQR, DLACPY,
-     $                   DLABAD, DLASCL, DORGHR, DSWAP, DTRSEN, XERBLA
+      EXTERNAL           DCOPY, DGEBAK, DGEBAL, DGEHRD, DHSEQR,
+     $                   DLACPY,
+     $                   DLASCL, DORGHR, DSWAP, DTRSEN, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -272,7 +272,8 @@ SUBROUTINE DGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
       WANTST = LSAME( SORT, 'S' )
       IF( ( .NOT.WANTVS ) .AND. ( .NOT.LSAME( JOBVS, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
          INFO = -4
@@ -300,9 +301,10 @@ SUBROUTINE DGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
             MAXWRK = 2*N + N*ILAENV( 1, 'DGEHRD', ' ', N, 1, N, 0 )
             MINWRK = 3*N
 *
-            CALL DHSEQR( 'S', JOBVS, N, 1, N, A, LDA, WR, WI, VS, LDVS,
+            CALL DHSEQR( 'S', JOBVS, N, 1, N, A, LDA, WR, WI, VS,
+     $                   LDVS,
      $             WORK, -1, IEVAL )
-            HSWORK = WORK( 1 )
+            HSWORK = INT( WORK( 1 ) )
 *
             IF( .NOT.WANTVS ) THEN
                MAXWRK = MAX( MAXWRK, N + HSWORK )
@@ -338,7 +340,6 @@ SUBROUTINE DGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -379,7 +380,8 @@ SUBROUTINE DGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
 *        Generate orthogonal matrix in VS
 *        (Workspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *
-         CALL DORGHR( N, ILO, IHI, VS, LDVS, WORK( ITAU ), WORK( IWRK ),
+         CALL DORGHR( N, ILO, IHI, VS, LDVS, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
       END IF
 *
@@ -420,7 +422,8 @@ SUBROUTINE DGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
 *        Undo balancing
 *        (Workspace: need N)
 *
-         CALL DGEBAK( 'P', 'R', N, ILO, IHI, WORK( IBAL ), N, VS, LDVS,
+         CALL DGEBAK( 'P', 'R', N, ILO, IHI, WORK( IBAL ), N, VS,
+     $                LDVS,
      $                IERR )
       END IF
 *
@@ -463,12 +466,14 @@ SUBROUTINE DGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
                      WI( I ) = ZERO
                      WI( I+1 ) = ZERO
                      IF( I.GT.1 )
-     $                  CALL DSWAP( I-1, A( 1, I ), 1, A( 1, I+1 ), 1 )
+     $                  CALL DSWAP( I-1, A( 1, I ), 1, A( 1, I+1 ),
+     $                              1 )
                      IF( N.GT.I+1 )
      $                  CALL DSWAP( N-I-1, A( I, I+2 ), LDA,
      $                              A( I+1, I+2 ), LDA )
                      IF( WANTVS ) THEN
-                        CALL DSWAP( N, VS( 1, I ), 1, VS( 1, I+1 ), 1 )
+                        CALL DSWAP( N, VS( 1, I ), 1, VS( 1, I+1 ),
+     $                              1 )
                      END IF
                      A( I, I+1 ) = A( I+1, I )
                      A( I+1, I ) = ZERO
diff --git a/SRC/dgeesx.f b/SRC/dgeesx.f
index 08fbb6468e..93f119ea9c 100644
--- a/SRC/dgeesx.f
+++ b/SRC/dgeesx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEESX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeesx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeesx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -272,12 +270,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEeigen
+*> \ingroup geesx
 *
 *  =====================================================================
       SUBROUTINE DGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
      $                   WR, WI, VS, LDVS, RCONDE, RCONDV, WORK, LWORK,
      $                   IWORK, LIWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -317,14 +316,15 @@ SUBROUTINE DGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
       DOUBLE PRECISION   DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEBAK, DGEBAL, DGEHRD, DHSEQR, DLACPY,
+      EXTERNAL           DCOPY, DGEBAK, DGEBAL, DGEHRD, DHSEQR,
+     $                   DLACPY,
      $                   DLASCL, DORGHR, DSWAP, DTRSEN, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
       DOUBLE PRECISION   DLAMCH, DLANGE
-      EXTERNAL           LSAME, ILAENV, DLABAD, DLAMCH, DLANGE
+      EXTERNAL           LSAME, ILAENV, DLAMCH, DLANGE
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
@@ -344,7 +344,8 @@ SUBROUTINE DGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
 *
       IF( ( .NOT.WANTVS ) .AND. ( .NOT.LSAME( JOBVS, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -2
       ELSE IF( .NOT.( WANTSN .OR. WANTSE .OR. WANTSV .OR. WANTSB ) .OR.
      $         ( .NOT.WANTST .AND. .NOT.WANTSN ) ) THEN
@@ -380,9 +381,10 @@ SUBROUTINE DGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
             MAXWRK = 2*N + N*ILAENV( 1, 'DGEHRD', ' ', N, 1, N, 0 )
             MINWRK = 3*N
 *
-            CALL DHSEQR( 'S', JOBVS, N, 1, N, A, LDA, WR, WI, VS, LDVS,
+            CALL DHSEQR( 'S', JOBVS, N, 1, N, A, LDA, WR, WI, VS,
+     $                   LDVS,
      $             WORK, -1, IEVAL )
-            HSWORK = WORK( 1 )
+            HSWORK = INT( WORK( 1 ) )
 *
             IF( .NOT.WANTVS ) THEN
                MAXWRK = MAX( MAXWRK, N + HSWORK )
@@ -426,7 +428,6 @@ SUBROUTINE DGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -467,7 +468,8 @@ SUBROUTINE DGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
 *        Generate orthogonal matrix in VS
 *        (RWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *
-         CALL DORGHR( N, ILO, IHI, VS, LDVS, WORK( ITAU ), WORK( IWRK ),
+         CALL DORGHR( N, ILO, IHI, VS, LDVS, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
       END IF
 *
@@ -500,7 +502,8 @@ SUBROUTINE DGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
 *        (IWorkspace: if SENSE is 'V' or 'B', need SDIM*(N-SDIM)
 *                     otherwise, need 0 )
 *
-         CALL DTRSEN( SENSE, JOBVS, BWORK, N, A, LDA, VS, LDVS, WR, WI,
+         CALL DTRSEN( SENSE, JOBVS, BWORK, N, A, LDA, VS, LDVS, WR,
+     $                WI,
      $                SDIM, RCONDE, RCONDV, WORK( IWRK ), LWORK-IWRK+1,
      $                IWORK, LIWORK, ICOND )
          IF( .NOT.WANTSN )
@@ -528,7 +531,8 @@ SUBROUTINE DGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
 *        Undo balancing
 *        (RWorkspace: need N)
 *
-         CALL DGEBAK( 'P', 'R', N, ILO, IHI, WORK( IBAL ), N, VS, LDVS,
+         CALL DGEBAK( 'P', 'R', N, ILO, IHI, WORK( IBAL ), N, VS,
+     $                LDVS,
      $                IERR )
       END IF
 *
@@ -540,7 +544,8 @@ SUBROUTINE DGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
          CALL DCOPY( N, A, LDA+1, WR, 1 )
          IF( ( WANTSV .OR. WANTSB ) .AND. INFO.EQ.0 ) THEN
             DUM( 1 ) = RCONDV
-            CALL DLASCL( 'G', 0, 0, CSCALE, ANRM, 1, 1, DUM, 1, IERR )
+            CALL DLASCL( 'G', 0, 0, CSCALE, ANRM, 1, 1, DUM, 1,
+     $                   IERR )
             RCONDV = DUM( 1 )
          END IF
          IF( CSCALE.EQ.SMLNUM ) THEN
@@ -576,12 +581,14 @@ SUBROUTINE DGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
                      WI( I ) = ZERO
                      WI( I+1 ) = ZERO
                      IF( I.GT.1 )
-     $                  CALL DSWAP( I-1, A( 1, I ), 1, A( 1, I+1 ), 1 )
+     $                  CALL DSWAP( I-1, A( 1, I ), 1, A( 1, I+1 ),
+     $                              1 )
                      IF( N.GT.I+1 )
      $                  CALL DSWAP( N-I-1, A( I, I+2 ), LDA,
      $                              A( I+1, I+2 ), LDA )
                      IF( WANTVS ) THEN
-                       CALL DSWAP( N, VS( 1, I ), 1, VS( 1, I+1 ), 1 )
+                       CALL DSWAP( N, VS( 1, I ), 1, VS( 1, I+1 ),
+     $                             1 )
                      END IF
                      A( I, I+1 ) = A( I+1, I )
                      A( I+1, I ) = ZERO
diff --git a/SRC/dgeev.f b/SRC/dgeev.f
index 4677b9f520..e32a0f29d6 100644
--- a/SRC/dgeev.f
+++ b/SRC/dgeev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -184,10 +182,11 @@
 *
 *  @precisions fortran d -> s
 *
-*> \ingroup doubleGEeigen
+*> \ingroup geev
 *
 *  =====================================================================
-      SUBROUTINE DGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
+      SUBROUTINE DGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL,
+     $                  VR,
      $                  LDVR, WORK, LWORK, INFO )
       implicit none
 *
@@ -223,15 +222,16 @@ SUBROUTINE DGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
       DOUBLE PRECISION   DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEBAK, DGEBAL, DGEHRD, DHSEQR, DLABAD, DLACPY,
-     $                   DLARTG, DLASCL, DORGHR, DROT, DSCAL, DTREVC3,
-     $                   XERBLA
+      EXTERNAL           DGEBAK, DGEBAL, DGEHRD, DHSEQR, DLACPY,
+     $                   DLARTG,
+     $                   DLASCL, DORGHR, DROT, DSCAL, DTREVC3, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            IDAMAX, ILAENV
       DOUBLE PRECISION   DLAMCH, DLANGE, DLAPY2, DNRM2
-      EXTERNAL           LSAME, IDAMAX, ILAENV, DLAMCH, DLANGE, DLAPY2,
+      EXTERNAL           LSAME, IDAMAX, ILAENV, DLAMCH, DLANGE,
+     $                   DLAPY2,
      $                   DNRM2
 *     ..
 *     .. Intrinsic Functions ..
@@ -247,7 +247,8 @@ SUBROUTINE DGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
       WANTVR = LSAME( JOBVR, 'V' )
       IF( ( .NOT.WANTVL ) .AND. ( .NOT.LSAME( JOBVL, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( ( .NOT.WANTVR ) .AND. ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTVR ) .AND.
+     $         ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
          INFO = -3
@@ -279,7 +280,8 @@ SUBROUTINE DGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
                MINWRK = 4*N
                MAXWRK = MAX( MAXWRK, 2*N + ( N - 1 )*ILAENV( 1,
      $                       'DORGHR', ' ', N, 1, N, -1 ) )
-               CALL DHSEQR( 'S', 'V', N, 1, N, A, LDA, WR, WI, VL, LDVL,
+               CALL DHSEQR( 'S', 'V', N, 1, N, A, LDA, WR, WI, VL,
+     $                      LDVL,
      $                      WORK, -1, INFO )
                HSWORK = INT( WORK(1) )
                MAXWRK = MAX( MAXWRK, N + 1, N + HSWORK )
@@ -293,7 +295,8 @@ SUBROUTINE DGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
                MINWRK = 4*N
                MAXWRK = MAX( MAXWRK, 2*N + ( N - 1 )*ILAENV( 1,
      $                       'DORGHR', ' ', N, 1, N, -1 ) )
-               CALL DHSEQR( 'S', 'V', N, 1, N, A, LDA, WR, WI, VR, LDVR,
+               CALL DHSEQR( 'S', 'V', N, 1, N, A, LDA, WR, WI, VR,
+     $                      LDVR,
      $                      WORK, -1, INFO )
                HSWORK = INT( WORK(1) )
                MAXWRK = MAX( MAXWRK, N + 1, N + HSWORK )
@@ -305,7 +308,8 @@ SUBROUTINE DGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
                MAXWRK = MAX( MAXWRK, 4*N )
             ELSE
                MINWRK = 3*N
-               CALL DHSEQR( 'E', 'N', N, 1, N, A, LDA, WR, WI, VR, LDVR,
+               CALL DHSEQR( 'E', 'N', N, 1, N, A, LDA, WR, WI, VR,
+     $                      LDVR,
      $                      WORK, -1, INFO )
                HSWORK = INT( WORK(1) )
                MAXWRK = MAX( MAXWRK, N + 1, N + HSWORK )
@@ -336,7 +340,6 @@ SUBROUTINE DGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -379,14 +382,16 @@ SUBROUTINE DGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
 *        Generate orthogonal matrix in VL
 *        (Workspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *
-         CALL DORGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ), WORK( IWRK ),
+         CALL DORGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
 *
 *        Perform QR iteration, accumulating Schur vectors in VL
 *        (Workspace: need N+1, prefer N+HSWORK (see comments) )
 *
          IWRK = ITAU
-         CALL DHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, WR, WI, VL, LDVL,
+         CALL DHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, WR, WI, VL,
+     $                LDVL,
      $                WORK( IWRK ), LWORK-IWRK+1, INFO )
 *
          IF( WANTVR ) THEN
@@ -409,14 +414,16 @@ SUBROUTINE DGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
 *        Generate orthogonal matrix in VR
 *        (Workspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *
-         CALL DORGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ), WORK( IWRK ),
+         CALL DORGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
 *
 *        Perform QR iteration, accumulating Schur vectors in VR
 *        (Workspace: need N+1, prefer N+HSWORK (see comments) )
 *
          IWRK = ITAU
-         CALL DHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, WR, WI, VR, LDVR,
+         CALL DHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, WR, WI, VR,
+     $                LDVR,
      $                WORK( IWRK ), LWORK-IWRK+1, INFO )
 *
       ELSE
@@ -425,7 +432,8 @@ SUBROUTINE DGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
 *        (Workspace: need N+1, prefer N+HSWORK (see comments) )
 *
          IWRK = ITAU
-         CALL DHSEQR( 'E', 'N', N, ILO, IHI, A, LDA, WR, WI, VR, LDVR,
+         CALL DHSEQR( 'E', 'N', N, ILO, IHI, A, LDA, WR, WI, VR,
+     $                LDVR,
      $                WORK( IWRK ), LWORK-IWRK+1, INFO )
       END IF
 *
@@ -439,7 +447,8 @@ SUBROUTINE DGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
 *        Compute left and/or right eigenvectors
 *        (Workspace: need 4*N, prefer N + N + 2*N*NB)
 *
-         CALL DTREVC3( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR, LDVR,
+         CALL DTREVC3( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR,
+     $                 LDVR,
      $                 N, NOUT, WORK( IWRK ), LWORK-IWRK+1, IERR )
       END IF
 *
@@ -448,7 +457,8 @@ SUBROUTINE DGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
 *        Undo balancing of left eigenvectors
 *        (Workspace: need N)
 *
-         CALL DGEBAK( 'B', 'L', N, ILO, IHI, WORK( IBAL ), N, VL, LDVL,
+         CALL DGEBAK( 'B', 'L', N, ILO, IHI, WORK( IBAL ), N, VL,
+     $                LDVL,
      $                IERR )
 *
 *        Normalize left eigenvectors and make largest component real
@@ -478,7 +488,8 @@ SUBROUTINE DGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
 *        Undo balancing of right eigenvectors
 *        (Workspace: need N)
 *
-         CALL DGEBAK( 'B', 'R', N, ILO, IHI, WORK( IBAL ), N, VR, LDVR,
+         CALL DGEBAK( 'B', 'R', N, ILO, IHI, WORK( IBAL ), N, VR,
+     $                LDVR,
      $                IERR )
 *
 *        Normalize right eigenvectors and make largest component real
@@ -507,9 +518,11 @@ SUBROUTINE DGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
 *
    50 CONTINUE
       IF( SCALEA ) THEN
-         CALL DLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1, WR( INFO+1 ),
+         CALL DLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1,
+     $                WR( INFO+1 ),
      $                MAX( N-INFO, 1 ), IERR )
-         CALL DLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1, WI( INFO+1 ),
+         CALL DLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1,
+     $                WI( INFO+1 ),
      $                MAX( N-INFO, 1 ), IERR )
          IF( INFO.GT.0 ) THEN
             CALL DLASCL( 'G', 0, 0, CSCALE, ANRM, ILO-1, 1, WR, N,
diff --git a/SRC/dgeevx.f b/SRC/dgeevx.f
index 212bea2bb3..17e3633464 100644
--- a/SRC/dgeevx.f
+++ b/SRC/dgeevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -297,10 +295,11 @@
 *
 *  @precisions fortran d -> s
 *
-*> \ingroup doubleGEeigen
+*> \ingroup geevx
 *
 *  =====================================================================
-      SUBROUTINE DGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
+      SUBROUTINE DGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR,
+     $                   WI,
      $                   VL, LDVL, VR, LDVR, ILO, IHI, SCALE, ABNRM,
      $                   RCONDE, RCONDV, WORK, LWORK, IWORK, INFO )
       implicit none
@@ -341,15 +340,17 @@ SUBROUTINE DGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
       DOUBLE PRECISION   DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEBAK, DGEBAL, DGEHRD, DHSEQR, DLABAD, DLACPY,
-     $                   DLARTG, DLASCL, DORGHR, DROT, DSCAL, DTREVC3,
-     $                   DTRSNA, XERBLA
+      EXTERNAL           DGEBAK, DGEBAL, DGEHRD, DHSEQR, DLACPY,
+     $                   DLARTG,
+     $                   DLASCL, DORGHR, DROT, DSCAL, DTREVC3, DTRSNA,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            IDAMAX, ILAENV
       DOUBLE PRECISION   DLAMCH, DLANGE, DLAPY2, DNRM2
-      EXTERNAL           LSAME, IDAMAX, ILAENV, DLAMCH, DLANGE, DLAPY2,
+      EXTERNAL           LSAME, IDAMAX, ILAENV, DLAMCH, DLANGE,
+     $                   DLAPY2,
      $                   DNRM2
 *     ..
 *     .. Intrinsic Functions ..
@@ -368,12 +369,16 @@ SUBROUTINE DGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
       WNTSNV = LSAME( SENSE, 'V' )
       WNTSNB = LSAME( SENSE, 'B' )
       IF( .NOT.( LSAME( BALANC, 'N' ) .OR. LSAME( BALANC, 'S' )
-     $      .OR. LSAME( BALANC, 'P' ) .OR. LSAME( BALANC, 'B' ) ) )
+     $      .OR.
+     $                  LSAME( BALANC, 'P' ) .OR.
+     $                  LSAME( BALANC, 'B' ) ) )
      $     THEN
          INFO = -1
-      ELSE IF( ( .NOT.WANTVL ) .AND. ( .NOT.LSAME( JOBVL, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTVL ) .AND.
+     $         ( .NOT.LSAME( JOBVL, 'N' ) ) ) THEN
          INFO = -2
-      ELSE IF( ( .NOT.WANTVR ) .AND. ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTVR ) .AND.
+     $         ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( .NOT.( WNTSNN .OR. WNTSNE .OR. WNTSNB .OR. WNTSNV ) .OR.
      $         ( ( WNTSNE .OR. WNTSNB ) .AND. .NOT.( WANTVL .AND.
@@ -412,7 +417,8 @@ SUBROUTINE DGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
      $                       N, NOUT, WORK, -1, IERR )
                LWORK_TREVC = INT( WORK(1) )
                MAXWRK = MAX( MAXWRK, N + LWORK_TREVC )
-               CALL DHSEQR( 'S', 'V', N, 1, N, A, LDA, WR, WI, VL, LDVL,
+               CALL DHSEQR( 'S', 'V', N, 1, N, A, LDA, WR, WI, VL,
+     $                      LDVL,
      $                WORK, -1, INFO )
             ELSE IF( WANTVR ) THEN
                CALL DTREVC3( 'R', 'B', SELECT, N, A, LDA,
@@ -420,7 +426,8 @@ SUBROUTINE DGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
      $                       N, NOUT, WORK, -1, IERR )
                LWORK_TREVC = INT( WORK(1) )
                MAXWRK = MAX( MAXWRK, N + LWORK_TREVC )
-               CALL DHSEQR( 'S', 'V', N, 1, N, A, LDA, WR, WI, VR, LDVR,
+               CALL DHSEQR( 'S', 'V', N, 1, N, A, LDA, WR, WI, VR,
+     $                      LDVR,
      $                WORK, -1, INFO )
             ELSE
                IF( WNTSNN ) THEN
@@ -445,7 +452,8 @@ SUBROUTINE DGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
                IF( ( .NOT.WNTSNN ) .AND. ( .NOT.WNTSNE ) )
      $            MINWRK = MAX( MINWRK, N*N + 6*N )
                MAXWRK = MAX( MAXWRK, HSWORK )
-               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1, 'DORGHR',
+               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1,
+     $                       'DORGHR',
      $                       ' ', N, 1, N, -1 ) )
                IF( ( .NOT.WNTSNN ) .AND. ( .NOT.WNTSNE ) )
      $            MAXWRK = MAX( MAXWRK, N*N + 6*N )
@@ -477,7 +485,6 @@ SUBROUTINE DGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -525,14 +532,16 @@ SUBROUTINE DGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
 *        Generate orthogonal matrix in VL
 *        (Workspace: need 2*N-1, prefer N+(N-1)*NB)
 *
-         CALL DORGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ), WORK( IWRK ),
+         CALL DORGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
 *
 *        Perform QR iteration, accumulating Schur vectors in VL
 *        (Workspace: need 1, prefer HSWORK (see comments) )
 *
          IWRK = ITAU
-         CALL DHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, WR, WI, VL, LDVL,
+         CALL DHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, WR, WI, VL,
+     $                LDVL,
      $                WORK( IWRK ), LWORK-IWRK+1, INFO )
 *
          IF( WANTVR ) THEN
@@ -555,14 +564,16 @@ SUBROUTINE DGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
 *        Generate orthogonal matrix in VR
 *        (Workspace: need 2*N-1, prefer N+(N-1)*NB)
 *
-         CALL DORGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ), WORK( IWRK ),
+         CALL DORGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
 *
 *        Perform QR iteration, accumulating Schur vectors in VR
 *        (Workspace: need 1, prefer HSWORK (see comments) )
 *
          IWRK = ITAU
-         CALL DHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, WR, WI, VR, LDVR,
+         CALL DHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, WR, WI, VR,
+     $                LDVR,
      $                WORK( IWRK ), LWORK-IWRK+1, INFO )
 *
       ELSE
@@ -579,7 +590,8 @@ SUBROUTINE DGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
 *        (Workspace: need 1, prefer HSWORK (see comments) )
 *
          IWRK = ITAU
-         CALL DHSEQR( JOB, 'N', N, ILO, IHI, A, LDA, WR, WI, VR, LDVR,
+         CALL DHSEQR( JOB, 'N', N, ILO, IHI, A, LDA, WR, WI, VR,
+     $                LDVR,
      $                WORK( IWRK ), LWORK-IWRK+1, INFO )
       END IF
 *
@@ -593,7 +605,8 @@ SUBROUTINE DGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
 *        Compute left and/or right eigenvectors
 *        (Workspace: need 3*N, prefer N + 2*N*NB)
 *
-         CALL DTREVC3( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR, LDVR,
+         CALL DTREVC3( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR,
+     $                 LDVR,
      $                 N, NOUT, WORK( IWRK ), LWORK-IWRK+1, IERR )
       END IF
 *
@@ -601,7 +614,8 @@ SUBROUTINE DGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
 *     (Workspace: need N*N+6*N unless SENSE = 'E')
 *
       IF( .NOT.WNTSNN ) THEN
-         CALL DTRSNA( SENSE, 'A', SELECT, N, A, LDA, VL, LDVL, VR, LDVR,
+         CALL DTRSNA( SENSE, 'A', SELECT, N, A, LDA, VL, LDVL, VR,
+     $                LDVR,
      $                RCONDE, RCONDV, N, NOUT, WORK( IWRK ), N, IWORK,
      $                ICOND )
       END IF
@@ -668,9 +682,11 @@ SUBROUTINE DGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
 *
    50 CONTINUE
       IF( SCALEA ) THEN
-         CALL DLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1, WR( INFO+1 ),
+         CALL DLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1,
+     $                WR( INFO+1 ),
      $                MAX( N-INFO, 1 ), IERR )
-         CALL DLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1, WI( INFO+1 ),
+         CALL DLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1,
+     $                WI( INFO+1 ),
      $                MAX( N-INFO, 1 ), IERR )
          IF( INFO.EQ.0 ) THEN
             IF( ( WNTSNV .OR. WNTSNB ) .AND. ICOND.EQ.0 )
diff --git a/SRC/dgehd2.f b/SRC/dgehd2.f
index c71e38433f..eaaf091a60 100644
--- a/SRC/dgehd2.f
+++ b/SRC/dgehd2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEHD2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgehd2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgehd2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,7 +104,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gehd2
 *
 *> \par Further Details:
 *  =====================
@@ -146,6 +144,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGEHD2( N, ILO, IHI, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -166,10 +165,9 @@ SUBROUTINE DGEHD2( N, ILO, IHI, A, LDA, TAU, WORK, INFO )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I
-      DOUBLE PRECISION   AII
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARF, DLARFG, XERBLA
+      EXTERNAL           DLARF1F, DLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -199,20 +197,17 @@ SUBROUTINE DGEHD2( N, ILO, IHI, A, LDA, TAU, WORK, INFO )
 *
          CALL DLARFG( IHI-I, A( I+1, I ), A( MIN( I+2, N ), I ), 1,
      $                TAU( I ) )
-         AII = A( I+1, I )
-         A( I+1, I ) = ONE
 *
 *        Apply H(i) to A(1:ihi,i+1:ihi) from the right
 *
-         CALL DLARF( 'Right', IHI, IHI-I, A( I+1, I ), 1, TAU( I ),
+         CALL DLARF1F( 'Right', IHI, IHI-I, A( I+1, I ), 1, TAU( I ),
      $               A( 1, I+1 ), LDA, WORK )
 *
 *        Apply H(i) to A(i+1:ihi,i+1:n) from the left
 *
-         CALL DLARF( 'Left', IHI-I, N-I, A( I+1, I ), 1, TAU( I ),
+         CALL DLARF1F( 'Left', IHI-I, N-I, A( I+1, I ), 1, TAU( I ),
      $               A( I+1, I+1 ), LDA, WORK )
 *
-         A( I+1, I ) = AII
    10 CONTINUE
 *
       RETURN
diff --git a/SRC/dgehrd.f b/SRC/dgehrd.f
index a40c61cb6d..ec7edd4796 100644
--- a/SRC/dgehrd.f
+++ b/SRC/dgehrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEHRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgehrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgehrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -89,7 +87,7 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (LWORK)
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
@@ -120,7 +118,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gehrd
 *
 *> \par Further Details:
 *  =====================
@@ -163,7 +161,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE DGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -173,7 +173,7 @@ SUBROUTINE DGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
       INTEGER            IHI, ILO, INFO, LDA, LWORK, N
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION  A( LDA, * ), TAU( * ), WORK( * )
+      DOUBLE PRECISION   A( LDA, * ), TAU( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
@@ -182,7 +182,7 @@ SUBROUTINE DGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
       INTEGER            NBMAX, LDT, TSIZE
       PARAMETER          ( NBMAX = 64, LDT = NBMAX+1,
      $                     TSIZE = LDT*NBMAX )
-      DOUBLE PRECISION  ZERO, ONE
+      DOUBLE PRECISION   ZERO, ONE
       PARAMETER          ( ZERO = 0.0D+0,
      $                     ONE = 1.0D+0 )
 *     ..
@@ -190,10 +190,11 @@ SUBROUTINE DGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
       LOGICAL            LQUERY
       INTEGER            I, IB, IINFO, IWT, J, LDWORK, LWKOPT, NB,
      $                   NBMIN, NH, NX
-      DOUBLE PRECISION  EI
+      DOUBLE PRECISION   EI
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DGEHD2, DGEMM, DLAHR2, DLARFB, DTRMM,
+      EXTERNAL           DAXPY, DGEHD2, DGEMM, DLAHR2, DLARFB,
+     $                   DTRMM,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -221,12 +222,18 @@ SUBROUTINE DGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -8
       END IF
 *
+      NH = IHI - ILO + 1
       IF( INFO.EQ.0 ) THEN
 *
 *        Compute the workspace requirements
 *
-         NB = MIN( NBMAX, ILAENV( 1, 'DGEHRD', ' ', N, ILO, IHI, -1 ) )
-         LWKOPT = N*NB + TSIZE
+         IF( NH.LE.1 ) THEN
+            LWKOPT = 1
+         ELSE
+            NB = MIN( NBMAX, ILAENV( 1, 'DGEHRD', ' ', N, ILO, IHI,
+     $                              -1 ) )
+            LWKOPT = N*NB + TSIZE
+         ENDIF
          WORK( 1 ) = LWKOPT
       END IF
 *
@@ -248,7 +255,6 @@ SUBROUTINE DGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *     Quick return if possible
 *
-      NH = IHI - ILO + 1
       IF( NH.LE.1 ) THEN
          WORK( 1 ) = 1
          RETURN
@@ -268,7 +274,7 @@ SUBROUTINE DGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *           Determine if workspace is large enough for blocked code
 *
-            IF( LWORK.LT.N*NB+TSIZE ) THEN
+            IF( LWORK.LT.LWKOPT ) THEN
 *
 *              Not enough workspace to use optimal NB:  determine the
 *              minimum value of NB, and reduce NB or force use of
@@ -344,6 +350,7 @@ SUBROUTINE DGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *     Use unblocked code to reduce the rest of the matrix
 *
       CALL DGEHD2( N, I, IHI, A, LDA, TAU, WORK, IINFO )
+*
       WORK( 1 ) = LWKOPT
 *
       RETURN
diff --git a/SRC/dgejsv.f b/SRC/dgejsv.f
index fc13f4a5fb..b3b118f35c 100644
--- a/SRC/dgejsv.f
+++ b/SRC/dgejsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEJSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgejsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgejsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -21,9 +19,9 @@
 *       SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *                          M, N, A, LDA, SVA, U, LDU, V, LDV,
 *                          WORK, LWORK, IWORK, INFO )
+*       IMPLICIT NONE
 *
 *       .. Scalar Arguments ..
-*       IMPLICIT    NONE
 *       INTEGER     INFO, LDA, LDU, LDV, LWORK, M, N
 *       ..
 *       .. Array Arguments ..
@@ -224,7 +222,7 @@
 *>
 *> \param[out] U
 *> \verbatim
-*>          U is DOUBLE PRECISION array, dimension ( LDU, N )
+*>          U is DOUBLE PRECISION array, dimension ( LDU, N ) or ( LDU, M )
 *>          If JOBU = 'U', then U contains on exit the M-by-N matrix of
 *>                         the left singular vectors.
 *>          If JOBU = 'F', then U contains on exit the M-by-M matrix of
@@ -253,7 +251,7 @@
 *>          If JOBV = 'V', 'J' then V contains on exit the N-by-N matrix of
 *>                         the right singular vectors;
 *>          If JOBV = 'W', AND (JOBU = 'U' AND JOBT = 'T' AND M = N),
-*>                         then V is used as workspace if the pprocedure
+*>                         then V is used as workspace if the procedure
 *>                         replaces A with A^t. In that case, [U] is computed
 *>                         in V as right singular vectors of A^t and then
 *>                         copied back to the U array. This 'W' option is just
@@ -271,7 +269,7 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (LWORK)
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(7,LWORK))
 *>          On exit, if N > 0 .AND. M > 0 (else not referenced),
 *>          WORK(1) = SCALE = WORK(2) / WORK(1) is the scaling factor such
 *>                    that SCALE*SVA(1:N) are the computed singular values
@@ -362,7 +360,7 @@
 *>
 *> \param[out] IWORK
 *> \verbatim
-*>          IWORK is INTEGER array, dimension (M+3*N).
+*>          IWORK is INTEGER array, dimension (MAX(3,M+3*N)).
 *>          On exit,
 *>          IWORK(1) = the numerical rank determined after the initial
 *>                     QR factorization with pivoting. See the descriptions
@@ -391,7 +389,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEsing
+*> \ingroup gejsv
 *
 *> \par Further Details:
 *  =====================
@@ -473,13 +471,13 @@
       SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
      $                   M, N, A, LDA, SVA, U, LDU, V, LDV,
      $                   WORK, LWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
 *     .. Scalar Arguments ..
-      IMPLICIT    NONE
       INTEGER     INFO, LDA, LDU, LDV, LWORK, M, N
 *     ..
 *     .. Array Arguments ..
@@ -514,7 +512,8 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
       EXTERNAL  IDAMAX, LSAME, DLAMCH, DNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL  DCOPY,  DGELQF, DGEQP3, DGEQRF, DLACPY, DLASCL,
+      EXTERNAL  DCOPY,  DGELQF, DGEQP3, DGEQRF, DLACPY,
+     $                   DLASCL,
      $          DLASET, DLASSQ, DLASWP, DORGQR, DORMLQ,
      $          DORMQR, DPOCON, DSCAL,  DSWAP,  DTRSM,  XERBLA
 *
@@ -692,8 +691,10 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
             CALL DLACPY( 'A', M, 1, A, LDA, U, LDU )
 *           computing all M left singular vectors of the M x 1 matrix
             IF ( N1 .NE. N  ) THEN
-               CALL DGEQRF( M, N, U,LDU, WORK, WORK(N+1),LWORK-N,IERR )
-               CALL DORGQR( M,N1,1, U,LDU,WORK,WORK(N+1),LWORK-N,IERR )
+               CALL DGEQRF( M, N, U,LDU, WORK, WORK(N+1),LWORK-N,
+     $                      IERR )
+               CALL DORGQR( M,N1,1, U,LDU,WORK,WORK(N+1),LWORK-N,
+     $                      IERR )
                CALL DCOPY( M, A(1,1), 1, U(1,1), 1 )
             END IF
          END IF
@@ -1115,7 +1116,8 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
  1949             CONTINUE
  1947          CONTINUE
             ELSE
-               CALL DLASET( 'U', NR-1, NR-1, ZERO, ZERO, A(1,2), LDA )
+               CALL DLASET( 'U', NR-1, NR-1, ZERO, ZERO, A(1,2),
+     $                      LDA )
             END IF
 *
 *           .. and one-sided Jacobi rotations are started on a lower
@@ -1139,7 +1141,8 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
             DO 1998 p = 1, NR
                CALL DCOPY( N-p+1, A(p,p), LDA, V(p,p), 1 )
  1998       CONTINUE
-            CALL DLASET( 'Upper', NR-1, NR-1, ZERO, ZERO, V(1,2), LDV )
+            CALL DLASET( 'Upper', NR-1, NR-1, ZERO, ZERO, V(1,2),
+     $                   LDV )
 *
             CALL DGESVJ( 'L','U','N', N, NR, V,LDV, SVA, NR, A,LDA,
      $                  WORK, LWORK, INFO )
@@ -1151,25 +1154,32 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *        .. two more QR factorizations ( one QRF is not enough, two require
 *        accumulated product of Jacobi rotations, three are perfect )
 *
-            CALL DLASET( 'Lower', NR-1, NR-1, ZERO, ZERO, A(2,1), LDA )
-            CALL DGELQF( NR, N, A, LDA, WORK, WORK(N+1), LWORK-N, IERR)
+            CALL DLASET( 'Lower', NR-1, NR-1, ZERO, ZERO, A(2,1),
+     $                   LDA )
+            CALL DGELQF( NR, N, A, LDA, WORK, WORK(N+1), LWORK-N,
+     $                   IERR)
             CALL DLACPY( 'Lower', NR, NR, A, LDA, V, LDV )
-            CALL DLASET( 'Upper', NR-1, NR-1, ZERO, ZERO, V(1,2), LDV )
+            CALL DLASET( 'Upper', NR-1, NR-1, ZERO, ZERO, V(1,2),
+     $                   LDV )
             CALL DGEQRF( NR, NR, V, LDV, WORK(N+1), WORK(2*N+1),
      $                   LWORK-2*N, IERR )
             DO 8998 p = 1, NR
                CALL DCOPY( NR-p+1, V(p,p), LDV, V(p,p), 1 )
  8998       CONTINUE
-            CALL DLASET( 'Upper', NR-1, NR-1, ZERO, ZERO, V(1,2), LDV )
+            CALL DLASET( 'Upper', NR-1, NR-1, ZERO, ZERO, V(1,2),
+     $                   LDV )
 *
             CALL DGESVJ( 'Lower', 'U','N', NR, NR, V,LDV, SVA, NR, U,
      $                  LDU, WORK(N+1), LWORK, INFO )
             SCALEM  = WORK(N+1)
             NUMRANK = IDNINT(WORK(N+2))
             IF ( NR .LT. N ) THEN
-               CALL DLASET( 'A',N-NR, NR, ZERO,ZERO, V(NR+1,1),   LDV )
-               CALL DLASET( 'A',NR, N-NR, ZERO,ZERO, V(1,NR+1),   LDV )
-               CALL DLASET( 'A',N-NR,N-NR,ZERO,ONE, V(NR+1,NR+1), LDV )
+               CALL DLASET( 'A',N-NR, NR, ZERO,ZERO, V(NR+1,1),
+     $                      LDV )
+               CALL DLASET( 'A',NR, N-NR, ZERO,ZERO, V(1,NR+1),
+     $                      LDV )
+               CALL DLASET( 'A',N-NR,N-NR,ZERO,ONE, V(NR+1,NR+1),
+     $                      LDV )
             END IF
 *
          CALL DORMLQ( 'Left', 'Transpose', N, N, NR, A, LDA, WORK,
@@ -1213,8 +1223,10 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
          IF ( NR .LT. M ) THEN
             CALL DLASET( 'A',  M-NR, NR,ZERO, ZERO, U(NR+1,1), LDU )
             IF ( NR .LT. N1 ) THEN
-               CALL DLASET( 'A',NR, N1-NR, ZERO, ZERO, U(1,NR+1), LDU )
-               CALL DLASET( 'A',M-NR,N1-NR,ZERO,ONE,U(NR+1,NR+1), LDU )
+               CALL DLASET( 'A',NR, N1-NR, ZERO, ZERO, U(1,NR+1),
+     $                      LDU )
+               CALL DLASET( 'A',M-NR,N1-NR,ZERO,ONE,U(NR+1,NR+1),
+     $                      LDU )
             END IF
          END IF
 *
@@ -1276,7 +1288,8 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
  2968             CONTINUE
  2969          CONTINUE
             ELSE
-               CALL DLASET( 'U', NR-1, NR-1, ZERO, ZERO, V(1,2), LDV )
+               CALL DLASET( 'U', NR-1, NR-1, ZERO, ZERO, V(1,2),
+     $                      LDV )
             END IF
 *
 *           Estimate the row scaled condition number of R1
@@ -1386,7 +1399,7 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                IF ( CONDR2 .GE. COND_OK ) THEN
 *                 .. save the Householder vectors used for Q3
 *                 (this overwrites the copy of R2, as it will not be
-*                 needed in this branch, but it does not overwritte the
+*                 needed in this branch, but it does not overwrite the
 *                 Huseholder vectors of Q2.).
                   CALL DLACPY( 'U', NR, NR, V, LDV, WORK(2*N+1), N )
 *                 .. and the rest of the information on Q3 is in
@@ -1409,7 +1422,7 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
             END IF
 *
 *        Second preconditioning finished; continue with Jacobi SVD
-*        The input matrix is lower trinagular.
+*        The input matrix is lower triangular.
 *
 *        Recover the right singular vectors as solution of a well
 *        conditioned triangular matrix equation.
@@ -1432,7 +1445,8 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *                 equation is Q2*V2 = the product of the Jacobi rotations
 *                 used in DGESVJ, premultiplied with the orthogonal matrix
 *                 from the second QR factorization.
-                  CALL DTRSM( 'L','U','N','N', NR,NR,ONE, A,LDA, V,LDV )
+                  CALL DTRSM( 'L','U','N','N', NR,NR,ONE, A,LDA, V,
+     $                        LDV )
                ELSE
 *                 .. R1 is well conditioned, but non-square. Transpose(R2)
 *                 is inverted to get the product of the Jacobi rotations
@@ -1443,7 +1457,8 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                   IF ( NR .LT. N ) THEN
                     CALL DLASET('A',N-NR,NR,ZERO,ZERO,V(NR+1,1),LDV)
                     CALL DLASET('A',NR,N-NR,ZERO,ZERO,V(1,NR+1),LDV)
-                    CALL DLASET('A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),LDV)
+                    CALL DLASET('A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),
+     $                           LDV)
                   END IF
                   CALL DORMQR('L','N',N,N,NR,WORK(2*N+1),N,WORK(N+1),
      $                 V,LDV,WORK(2*N+N*NR+NR+1),LWORK-2*N-N*NR-NR,IERR)
@@ -1454,10 +1469,11 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 * :)           .. the input matrix A is very likely a relative of
 *              the Kahan matrix :)
 *              The matrix R2 is inverted. The solution of the matrix equation
-*              is Q3^T*V3 = the product of the Jacobi rotations (appplied to
+*              is Q3^T*V3 = the product of the Jacobi rotations (applied to
 *              the lower triangular L3 from the LQ factorization of
 *              R2=L3*Q3), pre-multiplied with the transposed Q3.
-               CALL DGESVJ( 'L', 'U', 'N', NR, NR, V, LDV, SVA, NR, U,
+               CALL DGESVJ( 'L', 'U', 'N', NR, NR, V, LDV, SVA, NR,
+     $                      U,
      $              LDU, WORK(2*N+N*NR+NR+1), LWORK-2*N-N*NR-NR, INFO )
                SCALEM  = WORK(2*N+N*NR+NR+1)
                NUMRANK = IDNINT(WORK(2*N+N*NR+NR+2))
@@ -1465,7 +1481,8 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                   CALL DCOPY( NR, V(1,p), 1, U(1,p), 1 )
                   CALL DSCAL( NR, SVA(p),    U(1,p), 1 )
  3870          CONTINUE
-               CALL DTRSM('L','U','N','N',NR,NR,ONE,WORK(2*N+1),N,U,LDU)
+               CALL DTRSM('L','U','N','N',NR,NR,ONE,WORK(2*N+1),N,U,
+     $                     LDU)
 *              .. apply the permutation from the second QR factorization
                DO 873 q = 1, NR
                   DO 872 p = 1, NR
@@ -1478,7 +1495,8 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                IF ( NR .LT. N ) THEN
                   CALL DLASET( 'A',N-NR,NR,ZERO,ZERO,V(NR+1,1),LDV )
                   CALL DLASET( 'A',NR,N-NR,ZERO,ZERO,V(1,NR+1),LDV )
-                  CALL DLASET( 'A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),LDV )
+                  CALL DLASET( 'A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),
+     $                         LDV )
                END IF
                CALL DORMQR( 'L','N',N,N,NR,WORK(2*N+1),N,WORK(N+1),
      $              V,LDV,WORK(2*N+N*NR+NR+1),LWORK-2*N-N*NR-NR,IERR )
@@ -1494,14 +1512,16 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *              defense ensures that DGEJSV completes the task.
 *              Compute the full SVD of L3 using DGESVJ with explicit
 *              accumulation of Jacobi rotations.
-               CALL DGESVJ( 'L', 'U', 'V', NR, NR, V, LDV, SVA, NR, U,
+               CALL DGESVJ( 'L', 'U', 'V', NR, NR, V, LDV, SVA, NR,
+     $                      U,
      $              LDU, WORK(2*N+N*NR+NR+1), LWORK-2*N-N*NR-NR, INFO )
                SCALEM  = WORK(2*N+N*NR+NR+1)
                NUMRANK = IDNINT(WORK(2*N+N*NR+NR+2))
                IF ( NR .LT. N ) THEN
                   CALL DLASET( 'A',N-NR,NR,ZERO,ZERO,V(NR+1,1),LDV )
                   CALL DLASET( 'A',NR,N-NR,ZERO,ZERO,V(1,NR+1),LDV )
-                  CALL DLASET( 'A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),LDV )
+                  CALL DLASET( 'A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),
+     $                         LDV )
                END IF
                CALL DORMQR( 'L','N',N,N,NR,WORK(2*N+1),N,WORK(N+1),
      $              V,LDV,WORK(2*N+N*NR+NR+1),LWORK-2*N-N*NR-NR,IERR )
@@ -1539,10 +1559,12 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *           At this moment, V contains the right singular vectors of A.
 *           Next, assemble the left singular vector matrix U (M x N).
             IF ( NR .LT. M ) THEN
-               CALL DLASET( 'A', M-NR, NR, ZERO, ZERO, U(NR+1,1), LDU )
+               CALL DLASET( 'A', M-NR, NR, ZERO, ZERO, U(NR+1,1),
+     $                      LDU )
                IF ( NR .LT. N1 ) THEN
                   CALL DLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),LDU)
-                  CALL DLASET('A',M-NR,N1-NR,ZERO,ONE,U(NR+1,NR+1),LDU)
+                  CALL DLASET('A',M-NR,N1-NR,ZERO,ONE,U(NR+1,NR+1),
+     $                         LDU)
                END IF
             END IF
 *
@@ -1611,8 +1633,10 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
             IF ( N .LT. M ) THEN
                CALL DLASET( 'A',  M-N, N, ZERO, ZERO, U(N+1,1), LDU )
                IF ( N .LT. N1 ) THEN
-                  CALL DLASET( 'A',N,  N1-N, ZERO, ZERO,  U(1,N+1),LDU )
-                  CALL DLASET( 'A',M-N,N1-N, ZERO, ONE,U(N+1,N+1),LDU )
+                  CALL DLASET( 'A',N,  N1-N, ZERO, ZERO,  U(1,N+1),
+     $                         LDU )
+                  CALL DLASET( 'A',M-N,N1-N, ZERO, ONE,U(N+1,N+1),
+     $                         LDU )
                END IF
             END IF
             CALL DORMQR( 'Left', 'No Tr', M, N1, N, A, LDA, WORK, U,
@@ -1719,8 +1743,10 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
          IF ( NR .LT. M ) THEN
             CALL DLASET( 'A',  M-NR, NR, ZERO, ZERO, U(NR+1,1), LDU )
             IF ( NR .LT. N1 ) THEN
-               CALL DLASET( 'A',NR,  N1-NR, ZERO, ZERO,  U(1,NR+1),LDU )
-               CALL DLASET( 'A',M-NR,N1-NR, ZERO, ONE,U(NR+1,NR+1),LDU )
+               CALL DLASET( 'A',NR,  N1-NR, ZERO, ZERO,  U(1,NR+1),
+     $                      LDU )
+               CALL DLASET( 'A',M-NR,N1-NR, ZERO, ONE,U(NR+1,NR+1),
+     $                      LDU )
             END IF
          END IF
 *
@@ -1745,7 +1771,8 @@ SUBROUTINE DGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *     Undo scaling, if necessary (and possible)
 *
       IF ( USCAL2 .LE. (BIG/SVA(1))*USCAL1 ) THEN
-         CALL DLASCL( 'G', 0, 0, USCAL1, USCAL2, NR, 1, SVA, N, IERR )
+         CALL DLASCL( 'G', 0, 0, USCAL1, USCAL2, NR, 1, SVA, N,
+     $                IERR )
          USCAL1 = ONE
          USCAL2 = ONE
       END IF
diff --git a/SRC/dgelq.f b/SRC/dgelq.f
index 013b6c3564..98f4ba84c9 100644
--- a/SRC/dgelq.f
+++ b/SRC/dgelq.f
@@ -98,7 +98,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1 or -2, then a workspace query is assumed. The routine
 *>          only calculates the sizes of the T and WORK arrays, returns these
 *>          values as the first entries of the T and WORK arrays, and no error
@@ -166,9 +166,12 @@
 *>  the LQ factorization.
 *> \endverbatim
 *>
+*> \ingroup gelq
+*>
 *  =====================================================================
       SUBROUTINE DGELQ( M, N, A, LDA, T, TSIZE, WORK, LWORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dgelq2.f b/SRC/dgelq2.f
index 9915c57d47..b7c8c933d8 100644
--- a/SRC/dgelq2.f
+++ b/SRC/dgelq2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGELQ2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgelq2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgelq2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -104,7 +102,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gelq2
 *
 *> \par Further Details:
 *  =====================
@@ -126,6 +124,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGELQ2( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -146,10 +145,9 @@ SUBROUTINE DGELQ2( M, N, A, LDA, TAU, WORK, INFO )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      DOUBLE PRECISION   AII
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARF, DLARFG, XERBLA
+      EXTERNAL           DLARF1F, DLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -183,11 +181,9 @@ SUBROUTINE DGELQ2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *           Apply H(i) to A(i+1:m,i:n) from the right
 *
-            AII = A( I, I )
-            A( I, I ) = ONE
-            CALL DLARF( 'Right', M-I, N-I+1, A( I, I ), LDA, TAU( I ),
+            CALL DLARF1F( 'Right', M-I, N-I+1, A( I, I ), LDA,
+     $                  TAU( I ),
      $                  A( I+1, I ), LDA, WORK )
-            A( I, I ) = AII
          END IF
    10 CONTINUE
       RETURN
diff --git a/SRC/dgelqf.f b/SRC/dgelqf.f
index ed3372f965..d7efe9cfe1 100644
--- a/SRC/dgelqf.f
+++ b/SRC/dgelqf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGELQF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgelqf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgelqf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -93,7 +91,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,M).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= M, otherwise.
 *>          For optimum performance LWORK >= M*NB, where NB is the
 *>          optimal blocksize.
 *>
@@ -118,7 +117,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gelqf
 *
 *> \par Further Details:
 *  =====================
@@ -140,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -174,9 +174,8 @@ SUBROUTINE DGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     Test the input arguments
 *
       INFO = 0
+      K = MIN( M, N )
       NB = ILAENV( 1, 'DGELQF', ' ', M, N, -1, -1 )
-      LWKOPT = M*NB
-      WORK( 1 ) = LWKOPT
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -184,19 +183,25 @@ SUBROUTINE DGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, M ) .AND. .NOT.LQUERY ) THEN
-         INFO = -7
+      ELSE IF( .NOT.LQUERY ) THEN
+         IF( LWORK.LE.0 .OR. ( N.GT.0 .AND. LWORK.LT.MAX( 1, M ) ) )
+     $      INFO = -7
       END IF
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'DGELQF', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
+         IF( K.EQ.0 ) THEN
+            LWKOPT = 1
+         ELSE
+            LWKOPT = M*NB
+         END IF
+         WORK( 1 ) = LWKOPT
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      K = MIN( M, N )
       IF( K.EQ.0 ) THEN
          WORK( 1 ) = 1
          RETURN
@@ -245,7 +250,8 @@ SUBROUTINE DGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *              Form the triangular factor of the block reflector
 *              H = H(i) H(i+1) . . . H(i+ib-1)
 *
-               CALL DLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I, I ),
+               CALL DLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I,
+     $                      I ),
      $                      LDA, TAU( I ), WORK, LDWORK )
 *
 *              Apply H to A(i+ib:m,i:n) from the right
diff --git a/SRC/dgelqt.f b/SRC/dgelqt.f
index 263d4dfa23..4d92fe6d34 100644
--- a/SRC/dgelqt.f
+++ b/SRC/dgelqt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGELQT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgelqt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgelqt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -55,7 +53,7 @@
 *> \param[in] MB
 *> \verbatim
 *>          MB is INTEGER
-*>          The block size to be used in the blocked QR.  MIN(M,N) >= MB >= 1.
+*>          The block size to be used in the blocked LQ.  MIN(M,N) >= MB >= 1.
 *> \endverbatim
 *>
 *> \param[in,out] A
@@ -90,7 +88,10 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (MB*N)
+*>          WORK is DOUBLE PRECISION array, dimension (MB*M).
+*>          Note: A smaller workspace of MB*(M-MB) may also be sufficient, but
+*>          that is yet to be proven. MB*M is a conservative estimate and the
+*>          recommended value to use.
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -108,7 +109,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gelqt
 *
 *> \par Further Details:
 *  =====================
@@ -116,7 +117,7 @@
 *> \verbatim
 *>
 *>  The matrix V stores the elementary reflectors H(i) in the i-th row
-*>  above the diagonal. For example, if M=5 and N=3, the matrix V is
+*>  above the diagonal. For example, if M=3 and N=5, the matrix V is
 *>
 *>               V = (  1  v1 v1 v1 v1 )
 *>                   (     1  v2 v2 v2 )
@@ -136,6 +137,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGELQT( M, N, MB, A, LDA, T, LDT, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dgelqt3.f b/SRC/dgelqt3.f
index 5bcc06a80f..8e3bfb2154 100644
--- a/SRC/dgelqt3.f
+++ b/SRC/dgelqt3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGELQT3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgelqt3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgelqt3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -100,7 +98,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gelqt3
 *
 *> \par Further Details:
 *  =====================
@@ -128,6 +126,7 @@
 *>
 *  =====================================================================
       RECURSIVE SUBROUTINE DGELQT3( M, N, A, LDA, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -173,7 +172,8 @@ RECURSIVE SUBROUTINE DGELQT3( M, N, A, LDA, T, LDT, INFO )
 *
 *        Compute Householder transform when M=1
 *
-         CALL DLARFG( N, A, A( 1, MIN( 2, N ) ), LDA, T )
+         CALL DLARFG( N, A( 1, 1 ), A( 1, MIN( 2, N ) ), LDA,
+     &                T( 1, 1 ) )
 *
       ELSE
 *
diff --git a/SRC/dgels.f b/SRC/dgels.f
index 3d0c6155dd..21900fe596 100644
--- a/SRC/dgels.f
+++ b/SRC/dgels.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGELS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgels.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgels.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,17 @@
 *>
 *> DGELS solves overdetermined or underdetermined real linear systems
 *> involving an M-by-N matrix A, or its transpose, using a QR or LQ
-*> factorization of A.  It is assumed that A has full rank.
+*> factorization of A.
+*>
+*> It is assumed that A has full rank, and only a rudimentary protection
+*> against rank-deficient matrices is provided. This subroutine only detects
+*> exact rank-deficiency, where a diagonal element of the triangular factor
+*> of A is exactly zero.
+*>
+*> It is conceivable for one (or more) of the diagonal elements of the triangular
+*> factor of A to be subnormally tiny numbers without this subroutine signalling
+*> an error. The solutions computed for such almost-rank-deficient matrices may
+*> be less accurate due to a loss of numerical precision.
 *>
 *> The following options are provided:
 *>
@@ -162,7 +170,7 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO =  i, the i-th diagonal element of the
-*>                triangular factor of A is zero, so that A does not have
+*>                triangular factor of A is exactly zero, so that A does not have
 *>                full rank; the least squares solution could not be
 *>                computed.
 *> \endverbatim
@@ -175,11 +183,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEsolve
+*> \ingroup gels
 *
 *  =====================================================================
-      SUBROUTINE DGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
+      SUBROUTINE DGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK,
+     $                  LWORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -211,10 +221,11 @@ SUBROUTINE DGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
       LOGICAL            LSAME
       INTEGER            ILAENV
       DOUBLE PRECISION   DLAMCH, DLANGE
-      EXTERNAL           LSAME, ILAENV, DLABAD, DLAMCH, DLANGE
+      EXTERNAL           LSAME, ILAENV, DLAMCH, DLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGELQF, DGEQRF, DLASCL, DLASET, DORMLQ, DORMQR,
+      EXTERNAL           DGELQF, DGEQRF, DLASCL, DLASET, DORMLQ,
+     $                   DORMQR,
      $                   DTRTRS, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -227,7 +238,8 @@ SUBROUTINE DGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
       INFO = 0
       MN = MIN( M, N )
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.( LSAME( TRANS, 'N' ) .OR. LSAME( TRANS, 'T' ) ) ) THEN
+      IF( .NOT.( LSAME( TRANS, 'N' ) .OR.
+     $    LSAME( TRANS, 'T' ) ) ) THEN
          INFO = -1
       ELSE IF( M.LT.0 ) THEN
          INFO = -2
@@ -295,7 +307,6 @@ SUBROUTINE DGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
       SMLNUM = DLAMCH( 'S' ) / DLAMCH( 'P' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A, B if max element outside range [SMLNUM,BIGNUM]
 *
@@ -346,7 +357,8 @@ SUBROUTINE DGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *        compute QR factorization of A
 *
-         CALL DGEQRF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ), LWORK-MN,
+         CALL DGEQRF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ),
+     $                LWORK-MN,
      $                INFO )
 *
 *        workspace at least N, optimally N*NB
@@ -365,7 +377,8 @@ SUBROUTINE DGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *           B(1:N,1:NRHS) := inv(R) * B(1:N,1:NRHS)
 *
-            CALL DTRTRS( 'Upper', 'No transpose', 'Non-unit', N, NRHS,
+            CALL DTRTRS( 'Upper', 'No transpose', 'Non-unit', N,
+     $                   NRHS,
      $                   A, LDA, B, LDB, INFO )
 *
             IF( INFO.GT.0 ) THEN
@@ -411,7 +424,8 @@ SUBROUTINE DGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *        Compute LQ factorization of A
 *
-         CALL DGELQF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ), LWORK-MN,
+         CALL DGELQF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ),
+     $                LWORK-MN,
      $                INFO )
 *
 *        workspace at least M, optimally M*NB.
@@ -422,7 +436,8 @@ SUBROUTINE DGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *           B(1:M,1:NRHS) := inv(L) * B(1:M,1:NRHS)
 *
-            CALL DTRTRS( 'Lower', 'No transpose', 'Non-unit', M, NRHS,
+            CALL DTRTRS( 'Lower', 'No transpose', 'Non-unit', M,
+     $                   NRHS,
      $                   A, LDA, B, LDB, INFO )
 *
             IF( INFO.GT.0 ) THEN
diff --git a/SRC/dgelsd.f b/SRC/dgelsd.f
index b3b3d8b2d3..0043f2593b 100644
--- a/SRC/dgelsd.f
+++ b/SRC/dgelsd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGELSD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgelsd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgelsd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -59,12 +57,6 @@
 *> singular values which are less than RCOND times the largest singular
 *> value.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -194,7 +186,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEsolve
+*> \ingroup gelsd
 *
 *> \par Contributors:
 *  ==================
@@ -206,6 +198,7 @@
 *  =====================================================================
       SUBROUTINE DGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
      $                   WORK, LWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -234,7 +227,8 @@ SUBROUTINE DGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
       DOUBLE PRECISION   ANRM, BIGNUM, BNRM, EPS, SFMIN, SMLNUM
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEBRD, DGELQF, DGEQRF, DLABAD, DLACPY, DLALSD,
+      EXTERNAL           DGEBRD, DGELQF, DGEQRF, DLACPY,
+     $                   DLALSD,
      $                   DLASCL, DLASET, DORMBR, DORMLQ, DORMQR, XERBLA
 *     ..
 *     .. External Functions ..
@@ -282,7 +276,7 @@ SUBROUTINE DGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
      $       LOG( TWO ) ) + 1, 0 )
 *
       IF( INFO.EQ.0 ) THEN
-         MAXWRK = 0
+         MAXWRK = 1
          LIWORK = 3*MINMN*NLVL + 11*MINMN
          MM = M
          IF( M.GE.N .AND. M.GE.MNTHR ) THEN
@@ -316,13 +310,16 @@ SUBROUTINE DGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *              Path 2a - underdetermined, with many more columns
 *              than rows.
 *
-               MAXWRK = M + M*ILAENV( 1, 'DGELQF', ' ', M, N, -1, -1 )
+               MAXWRK = M + M*ILAENV( 1, 'DGELQF', ' ', M, N, -1,
+     $                                -1 )
                MAXWRK = MAX( MAXWRK, M*M+4*M+2*M*
      $                  ILAENV( 1, 'DGEBRD', ' ', M, M, -1, -1 ) )
                MAXWRK = MAX( MAXWRK, M*M+4*M+NRHS*
-     $                  ILAENV( 1, 'DORMBR', 'QLT', M, NRHS, M, -1 ) )
+     $                  ILAENV( 1, 'DORMBR', 'QLT', M, NRHS, M,
+     $                          -1 ) )
                MAXWRK = MAX( MAXWRK, M*M+4*M+( M-1 )*
-     $                  ILAENV( 1, 'DORMBR', 'PLN', M, NRHS, M, -1 ) )
+     $                  ILAENV( 1, 'DORMBR', 'PLN', M, NRHS, M,
+     $                          -1 ) )
                IF( NRHS.GT.1 ) THEN
                   MAXWRK = MAX( MAXWRK, M*M+M+M*NRHS )
                ELSE
@@ -342,9 +339,11 @@ SUBROUTINE DGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
                MAXWRK = 3*M + ( N+M )*ILAENV( 1, 'DGEBRD', ' ', M, N,
      $                  -1, -1 )
                MAXWRK = MAX( MAXWRK, 3*M+NRHS*
-     $                  ILAENV( 1, 'DORMBR', 'QLT', M, NRHS, N, -1 ) )
+     $                  ILAENV( 1, 'DORMBR', 'QLT', M, NRHS, N,
+     $                          -1 ) )
                MAXWRK = MAX( MAXWRK, 3*M+M*
-     $                  ILAENV( 1, 'DORMBR', 'PLN', N, NRHS, M, -1 ) )
+     $                  ILAENV( 1, 'DORMBR', 'PLN', N, NRHS, M,
+     $                          -1 ) )
                MAXWRK = MAX( MAXWRK, 3*M+WLALSD )
             END IF
             MINWRK = MAX( 3*M+NRHS, 3*M+M, 3*M+WLALSD )
@@ -378,7 +377,6 @@ SUBROUTINE DGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
       SFMIN = DLAMCH( 'S' )
       SMLNUM = SFMIN / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A if max entry outside range [SMLNUM,BIGNUM].
 *
@@ -414,13 +412,15 @@ SUBROUTINE DGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *        Scale matrix norm up to SMLNUM.
 *
-         CALL DLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 1
       ELSE IF( BNRM.GT.BIGNUM ) THEN
 *
 *        Scale matrix norm down to BIGNUM.
 *
-         CALL DLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 2
       END IF
 *
@@ -453,13 +453,15 @@ SUBROUTINE DGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *           Multiply B by transpose(Q).
 *           (Workspace: need N+NRHS, prefer N+NRHS*NB)
 *
-            CALL DORMQR( 'L', 'T', M, NRHS, N, A, LDA, WORK( ITAU ), B,
+            CALL DORMQR( 'L', 'T', M, NRHS, N, A, LDA, WORK( ITAU ),
+     $                   B,
      $                   LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
 *           Zero out below R.
 *
             IF( N.GT.1 ) THEN
-               CALL DLASET( 'L', N-1, N-1, ZERO, ZERO, A( 2, 1 ), LDA )
+               CALL DLASET( 'L', N-1, N-1, ZERO, ZERO, A( 2, 1 ),
+     $                      LDA )
             END IF
          END IF
 *
@@ -478,7 +480,8 @@ SUBROUTINE DGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        Multiply B by transpose of left bidiagonalizing vectors of R.
 *        (Workspace: need 3*N+NRHS, prefer 3*N+NRHS*NB)
 *
-         CALL DORMBR( 'Q', 'L', 'T', MM, NRHS, N, A, LDA, WORK( ITAUQ ),
+         CALL DORMBR( 'Q', 'L', 'T', MM, NRHS, N, A, LDA,
+     $                WORK( ITAUQ ),
      $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
 *        Solve the bidiagonal least squares problem.
@@ -491,7 +494,8 @@ SUBROUTINE DGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *        Multiply B by right bidiagonalizing vectors of R.
 *
-         CALL DORMBR( 'P', 'L', 'N', N, NRHS, N, A, LDA, WORK( ITAUP ),
+         CALL DORMBR( 'P', 'L', 'N', N, NRHS, N, A, LDA,
+     $                WORK( ITAUP ),
      $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
       ELSE IF( N.GE.MNTHR .AND. LWORK.GE.4*M+M*M+
@@ -581,7 +585,8 @@ SUBROUTINE DGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        Multiply B by transpose of left bidiagonalizing vectors.
 *        (Workspace: need 3*M+NRHS, prefer 3*M+NRHS*NB)
 *
-         CALL DORMBR( 'Q', 'L', 'T', M, NRHS, N, A, LDA, WORK( ITAUQ ),
+         CALL DORMBR( 'Q', 'L', 'T', M, NRHS, N, A, LDA,
+     $                WORK( ITAUQ ),
      $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
 *        Solve the bidiagonal least squares problem.
@@ -594,7 +599,8 @@ SUBROUTINE DGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *        Multiply B by right bidiagonalizing vectors of A.
 *
-         CALL DORMBR( 'P', 'L', 'N', N, NRHS, M, A, LDA, WORK( ITAUP ),
+         CALL DORMBR( 'P', 'L', 'N', N, NRHS, M, A, LDA,
+     $                WORK( ITAUP ),
      $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
       END IF
@@ -602,18 +608,22 @@ SUBROUTINE DGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *     Undo scaling.
 *
       IF( IASCL.EQ.1 ) THEN
-         CALL DLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL DLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN, 1, S, MINMN,
      $                INFO )
       ELSE IF( IASCL.EQ.2 ) THEN
-         CALL DLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL DLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN, 1, S, MINMN,
      $                INFO )
       END IF
       IF( IBSCL.EQ.1 ) THEN
-         CALL DLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL DLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       END IF
 *
    10 CONTINUE
diff --git a/SRC/dgelss.f b/SRC/dgelss.f
index 8ed703fcf2..7408207636 100644
--- a/SRC/dgelss.f
+++ b/SRC/dgelss.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGELSS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgelss.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgelss.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -164,11 +162,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEsolve
+*> \ingroup gelss
 *
 *  =====================================================================
       SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -202,8 +201,9 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
       DOUBLE PRECISION   DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DBDSQR, DCOPY, DGEBRD, DGELQF, DGEMM, DGEMV,
-     $                   DGEQRF, DLABAD, DLACPY, DLASCL, DLASET, DORGBR,
+      EXTERNAL           DBDSQR, DCOPY, DGEBRD, DGELQF, DGEMM,
+     $                   DGEMV,
+     $                   DGEQRF, DLACPY, DLASCL, DLASET, DORGBR,
      $                   DORMBR, DORMLQ, DORMQR, DRSCL, XERBLA
 *     ..
 *     .. External Functions ..
@@ -254,11 +254,11 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *              Compute space needed for DGEQRF
                CALL DGEQRF( M, N, A, LDA, DUM(1), DUM(1), -1, INFO )
-               LWORK_DGEQRF=DUM(1)
+               LWORK_DGEQRF = INT( DUM(1) )
 *              Compute space needed for DORMQR
                CALL DORMQR( 'L', 'T', M, NRHS, N, A, LDA, DUM(1), B,
      $                   LDB, DUM(1), -1, INFO )
-               LWORK_DORMQR=DUM(1)
+               LWORK_DORMQR = INT( DUM(1) )
                MM = N
                MAXWRK = MAX( MAXWRK, N + LWORK_DGEQRF )
                MAXWRK = MAX( MAXWRK, N + LWORK_DORMQR )
@@ -273,15 +273,16 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *              Compute space needed for DGEBRD
                CALL DGEBRD( MM, N, A, LDA, S, DUM(1), DUM(1),
      $                      DUM(1), DUM(1), -1, INFO )
-               LWORK_DGEBRD=DUM(1)
+               LWORK_DGEBRD = INT( DUM(1) )
 *              Compute space needed for DORMBR
-               CALL DORMBR( 'Q', 'L', 'T', MM, NRHS, N, A, LDA, DUM(1),
+               CALL DORMBR( 'Q', 'L', 'T', MM, NRHS, N, A, LDA,
+     $                      DUM(1),
      $                B, LDB, DUM(1), -1, INFO )
-               LWORK_DORMBR=DUM(1)
+               LWORK_DORMBR = INT( DUM(1) )
 *              Compute space needed for DORGBR
                CALL DORGBR( 'P', N, N, N, A, LDA, DUM(1),
      $                   DUM(1), -1, INFO )
-               LWORK_DORGBR=DUM(1)
+               LWORK_DORGBR = INT( DUM(1) )
 *              Compute total workspace needed
                MAXWRK = MAX( MAXWRK, 3*N + LWORK_DGEBRD )
                MAXWRK = MAX( MAXWRK, 3*N + LWORK_DORMBR )
@@ -305,23 +306,23 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *                 Compute space needed for DGELQF
                   CALL DGELQF( M, N, A, LDA, DUM(1), DUM(1),
      $                -1, INFO )
-                  LWORK_DGELQF=DUM(1)
+                  LWORK_DGELQF = INT( DUM(1) )
 *                 Compute space needed for DGEBRD
                   CALL DGEBRD( M, M, A, LDA, S, DUM(1), DUM(1),
      $                      DUM(1), DUM(1), -1, INFO )
-                  LWORK_DGEBRD=DUM(1)
+                  LWORK_DGEBRD = INT( DUM(1) )
 *                 Compute space needed for DORMBR
                   CALL DORMBR( 'Q', 'L', 'T', M, NRHS, N, A, LDA,
      $                DUM(1), B, LDB, DUM(1), -1, INFO )
-                  LWORK_DORMBR=DUM(1)
+                  LWORK_DORMBR = INT( DUM(1) )
 *                 Compute space needed for DORGBR
                   CALL DORGBR( 'P', M, M, M, A, LDA, DUM(1),
      $                   DUM(1), -1, INFO )
-                  LWORK_DORGBR=DUM(1)
+                  LWORK_DORGBR = INT( DUM(1) )
 *                 Compute space needed for DORMLQ
                   CALL DORMLQ( 'L', 'T', N, NRHS, M, A, LDA, DUM(1),
      $                 B, LDB, DUM(1), -1, INFO )
-                  LWORK_DORMLQ=DUM(1)
+                  LWORK_DORMLQ = INT( DUM(1) )
 *                 Compute total workspace needed
                   MAXWRK = M + LWORK_DGELQF
                   MAXWRK = MAX( MAXWRK, M*M + 4*M + LWORK_DGEBRD )
@@ -341,15 +342,15 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *                 Compute space needed for DGEBRD
                   CALL DGEBRD( M, N, A, LDA, S, DUM(1), DUM(1),
      $                      DUM(1), DUM(1), -1, INFO )
-                  LWORK_DGEBRD=DUM(1)
+                  LWORK_DGEBRD = INT( DUM(1) )
 *                 Compute space needed for DORMBR
                   CALL DORMBR( 'Q', 'L', 'T', M, NRHS, M, A, LDA,
      $                DUM(1), B, LDB, DUM(1), -1, INFO )
-                  LWORK_DORMBR=DUM(1)
+                  LWORK_DORMBR = INT( DUM(1) )
 *                 Compute space needed for DORGBR
                   CALL DORGBR( 'P', M, N, M, A, LDA, DUM(1),
      $                   DUM(1), -1, INFO )
-                  LWORK_DORGBR=DUM(1)
+                  LWORK_DORGBR = INT( DUM(1) )
                   MAXWRK = 3*M + LWORK_DGEBRD
                   MAXWRK = MAX( MAXWRK, 3*M + LWORK_DORMBR )
                   MAXWRK = MAX( MAXWRK, 3*M + LWORK_DORGBR )
@@ -385,7 +386,6 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
       SFMIN = DLAMCH( 'S' )
       SMLNUM = SFMIN / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A if max element outside range [SMLNUM,BIGNUM]
 *
@@ -421,13 +421,15 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *        Scale matrix norm up to SMLNUM
 *
-         CALL DLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 1
       ELSE IF( BNRM.GT.BIGNUM ) THEN
 *
 *        Scale matrix norm down to BIGNUM
 *
-         CALL DLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 2
       END IF
 *
@@ -455,13 +457,15 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *           Multiply B by transpose(Q)
 *           (Workspace: need N+NRHS, prefer N+NRHS*NB)
 *
-            CALL DORMQR( 'L', 'T', M, NRHS, N, A, LDA, WORK( ITAU ), B,
+            CALL DORMQR( 'L', 'T', M, NRHS, N, A, LDA, WORK( ITAU ),
+     $                   B,
      $                   LDB, WORK( IWORK ), LWORK-IWORK+1, INFO )
 *
 *           Zero out below R
 *
             IF( N.GT.1 )
-     $         CALL DLASET( 'L', N-1, N-1, ZERO, ZERO, A( 2, 1 ), LDA )
+     $         CALL DLASET( 'L', N-1, N-1, ZERO, ZERO, A( 2, 1 ),
+     $                      LDA )
          END IF
 *
          IE = 1
@@ -479,7 +483,8 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        Multiply B by transpose of left bidiagonalizing vectors of R
 *        (Workspace: need 3*N+NRHS, prefer 3*N+NRHS*NB)
 *
-         CALL DORMBR( 'Q', 'L', 'T', MM, NRHS, N, A, LDA, WORK( ITAUQ ),
+         CALL DORMBR( 'Q', 'L', 'T', MM, NRHS, N, A, LDA,
+     $                WORK( ITAUQ ),
      $                B, LDB, WORK( IWORK ), LWORK-IWORK+1, INFO )
 *
 *        Generate right bidiagonalizing vectors of R in A
@@ -510,7 +515,8 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
                CALL DRSCL( NRHS, S( I ), B( I, 1 ), LDB )
                RANK = RANK + 1
             ELSE
-               CALL DLASET( 'F', 1, NRHS, ZERO, ZERO, B( I, 1 ), LDB )
+               CALL DLASET( 'F', 1, NRHS, ZERO, ZERO, B( I, 1 ),
+     $                      LDB )
             END IF
    10    CONTINUE
 *
@@ -518,18 +524,20 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (Workspace: need N, prefer N*NRHS)
 *
          IF( LWORK.GE.LDB*NRHS .AND. NRHS.GT.1 ) THEN
-            CALL DGEMM( 'T', 'N', N, NRHS, N, ONE, A, LDA, B, LDB, ZERO,
+            CALL DGEMM( 'T', 'N', N, NRHS, N, ONE, A, LDA, B, LDB,
+     $                  ZERO,
      $                  WORK, LDB )
             CALL DLACPY( 'G', N, NRHS, WORK, LDB, B, LDB )
          ELSE IF( NRHS.GT.1 ) THEN
             CHUNK = LWORK / N
             DO 20 I = 1, NRHS, CHUNK
                BL = MIN( NRHS-I+1, CHUNK )
-               CALL DGEMM( 'T', 'N', N, BL, N, ONE, A, LDA, B( 1, I ),
+               CALL DGEMM( 'T', 'N', N, BL, N, ONE, A, LDA, B( 1,
+     $                     I ),
      $                     LDB, ZERO, WORK, N )
                CALL DLACPY( 'G', N, BL, WORK, N, B( 1, I ), LDB )
    20       CONTINUE
-         ELSE
+         ELSE IF( NRHS.EQ.1 ) THEN
             CALL DGEMV( 'T', N, N, ONE, A, LDA, B, 1, ZERO, WORK, 1 )
             CALL DCOPY( N, WORK, 1, B, 1 )
          END IF
@@ -580,7 +588,8 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        Generate right bidiagonalizing vectors of R in WORK(IL)
 *        (Workspace: need M*M+5*M-1, prefer M*M+4*M+(M-1)*NB)
 *
-         CALL DORGBR( 'P', M, M, M, WORK( IL ), LDWORK, WORK( ITAUP ),
+         CALL DORGBR( 'P', M, M, M, WORK( IL ), LDWORK,
+     $                WORK( ITAUP ),
      $                WORK( IWORK ), LWORK-IWORK+1, INFO )
          IWORK = IE + M
 *
@@ -605,7 +614,8 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
                CALL DRSCL( NRHS, S( I ), B( I, 1 ), LDB )
                RANK = RANK + 1
             ELSE
-               CALL DLASET( 'F', 1, NRHS, ZERO, ZERO, B( I, 1 ), LDB )
+               CALL DLASET( 'F', 1, NRHS, ZERO, ZERO, B( I, 1 ),
+     $                      LDB )
             END IF
    30    CONTINUE
          IWORK = IE
@@ -614,21 +624,23 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (Workspace: need M*M+2*M, prefer M*M+M+M*NRHS)
 *
          IF( LWORK.GE.LDB*NRHS+IWORK-1 .AND. NRHS.GT.1 ) THEN
-            CALL DGEMM( 'T', 'N', M, NRHS, M, ONE, WORK( IL ), LDWORK,
+            CALL DGEMM( 'T', 'N', M, NRHS, M, ONE, WORK( IL ),
+     $                  LDWORK,
      $                  B, LDB, ZERO, WORK( IWORK ), LDB )
             CALL DLACPY( 'G', M, NRHS, WORK( IWORK ), LDB, B, LDB )
          ELSE IF( NRHS.GT.1 ) THEN
             CHUNK = ( LWORK-IWORK+1 ) / M
             DO 40 I = 1, NRHS, CHUNK
                BL = MIN( NRHS-I+1, CHUNK )
-               CALL DGEMM( 'T', 'N', M, BL, M, ONE, WORK( IL ), LDWORK,
+               CALL DGEMM( 'T', 'N', M, BL, M, ONE, WORK( IL ),
+     $                     LDWORK,
      $                     B( 1, I ), LDB, ZERO, WORK( IWORK ), M )
                CALL DLACPY( 'G', M, BL, WORK( IWORK ), M, B( 1, I ),
      $                      LDB )
    40       CONTINUE
-         ELSE
-            CALL DGEMV( 'T', M, M, ONE, WORK( IL ), LDWORK, B( 1, 1 ),
-     $                  1, ZERO, WORK( IWORK ), 1 )
+         ELSE IF( NRHS.EQ.1 ) THEN
+            CALL DGEMV( 'T', M, M, ONE, WORK( IL ), LDWORK, B( 1,
+     $                  1 ),1, ZERO, WORK( IWORK ), 1 )
             CALL DCOPY( M, WORK( IWORK ), 1, B( 1, 1 ), 1 )
          END IF
 *
@@ -662,7 +674,8 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        Multiply B by transpose of left bidiagonalizing vectors
 *        (Workspace: need 3*M+NRHS, prefer 3*M+NRHS*NB)
 *
-         CALL DORMBR( 'Q', 'L', 'T', M, NRHS, N, A, LDA, WORK( ITAUQ ),
+         CALL DORMBR( 'Q', 'L', 'T', M, NRHS, N, A, LDA,
+     $                WORK( ITAUQ ),
      $                B, LDB, WORK( IWORK ), LWORK-IWORK+1, INFO )
 *
 *        Generate right bidiagonalizing vectors in A
@@ -693,7 +706,8 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
                CALL DRSCL( NRHS, S( I ), B( I, 1 ), LDB )
                RANK = RANK + 1
             ELSE
-               CALL DLASET( 'F', 1, NRHS, ZERO, ZERO, B( I, 1 ), LDB )
+               CALL DLASET( 'F', 1, NRHS, ZERO, ZERO, B( I, 1 ),
+     $                      LDB )
             END IF
    50    CONTINUE
 *
@@ -701,18 +715,20 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (Workspace: need N, prefer N*NRHS)
 *
          IF( LWORK.GE.LDB*NRHS .AND. NRHS.GT.1 ) THEN
-            CALL DGEMM( 'T', 'N', N, NRHS, M, ONE, A, LDA, B, LDB, ZERO,
+            CALL DGEMM( 'T', 'N', N, NRHS, M, ONE, A, LDA, B, LDB,
+     $                  ZERO,
      $                  WORK, LDB )
             CALL DLACPY( 'F', N, NRHS, WORK, LDB, B, LDB )
          ELSE IF( NRHS.GT.1 ) THEN
             CHUNK = LWORK / N
             DO 60 I = 1, NRHS, CHUNK
                BL = MIN( NRHS-I+1, CHUNK )
-               CALL DGEMM( 'T', 'N', N, BL, M, ONE, A, LDA, B( 1, I ),
+               CALL DGEMM( 'T', 'N', N, BL, M, ONE, A, LDA, B( 1,
+     $                     I ),
      $                     LDB, ZERO, WORK, N )
                CALL DLACPY( 'F', N, BL, WORK, N, B( 1, I ), LDB )
    60       CONTINUE
-         ELSE
+         ELSE IF( NRHS.EQ.1 ) THEN
             CALL DGEMV( 'T', M, N, ONE, A, LDA, B, 1, ZERO, WORK, 1 )
             CALL DCOPY( N, WORK, 1, B, 1 )
          END IF
@@ -721,18 +737,22 @@ SUBROUTINE DGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *     Undo scaling
 *
       IF( IASCL.EQ.1 ) THEN
-         CALL DLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL DLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN, 1, S, MINMN,
      $                INFO )
       ELSE IF( IASCL.EQ.2 ) THEN
-         CALL DLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL DLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN, 1, S, MINMN,
      $                INFO )
       END IF
       IF( IBSCL.EQ.1 ) THEN
-         CALL DLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL DLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       END IF
 *
    70 CONTINUE
diff --git a/SRC/dgelst.f b/SRC/dgelst.f
new file mode 100644
index 0000000000..6e69a71596
--- /dev/null
+++ b/SRC/dgelst.f
@@ -0,0 +1,545 @@
+*> \brief <b> DGELST solves overdetermined or underdetermined systems for GE matrices using QR or LQ factorization with compact WY representation of Q.</b>
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download DGELST + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgelst.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgelst.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgelst.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DGELST( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
+*                          INFO )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          TRANS
+*       INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), WORK( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> DGELST solves overdetermined or underdetermined real linear systems
+*> involving an M-by-N matrix A, or its transpose, using a QR or LQ
+*> factorization of A with compact WY representation of Q.
+*>
+*> It is assumed that A has full rank, and only a rudimentary protection
+*> against rank-deficient matrices is provided. This subroutine only detects
+*> exact rank-deficiency, where a diagonal element of the triangular factor
+*> of A is exactly zero.
+*>
+*> It is conceivable for one (or more) of the diagonal elements of the triangular
+*> factor of A to be subnormally tiny numbers without this subroutine signalling
+*> an error. The solutions computed for such almost-rank-deficient matrices may
+*> be less accurate due to a loss of numerical precision.
+*>
+*> The following options are provided:
+*>
+*> 1. If TRANS = 'N' and m >= n:  find the least squares solution of
+*>    an overdetermined system, i.e., solve the least squares problem
+*>                 minimize || B - A*X ||.
+*>
+*> 2. If TRANS = 'N' and m < n:  find the minimum norm solution of
+*>    an underdetermined system A * X = B.
+*>
+*> 3. If TRANS = 'T' and m >= n:  find the minimum norm solution of
+*>    an underdetermined system A**T * X = B.
+*>
+*> 4. If TRANS = 'T' and m < n:  find the least squares solution of
+*>    an overdetermined system, i.e., solve the least squares problem
+*>                 minimize || B - A**T * X ||.
+*>
+*> Several right hand side vectors b and solution vectors x can be
+*> handled in a single call; they are stored as the columns of the
+*> M-by-NRHS right hand side matrix B and the N-by-NRHS solution
+*> matrix X.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] TRANS
+*> \verbatim
+*>          TRANS is CHARACTER*1
+*>          = 'N': the linear system involves A;
+*>          = 'T': the linear system involves A**T.
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of
+*>          columns of the matrices B and X. NRHS >=0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA,N)
+*>          On entry, the M-by-N matrix A.
+*>          On exit,
+*>            if M >= N, A is overwritten by details of its QR
+*>                       factorization as returned by DGEQRT;
+*>            if M <  N, A is overwritten by details of its LQ
+*>                       factorization as returned by DGELQT.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in,out] B
+*> \verbatim
+*>          B is DOUBLE PRECISION array, dimension (LDB,NRHS)
+*>          On entry, the matrix B of right hand side vectors, stored
+*>          columnwise; B is M-by-NRHS if TRANS = 'N', or N-by-NRHS
+*>          if TRANS = 'T'.
+*>          On exit, if INFO = 0, B is overwritten by the solution
+*>          vectors, stored columnwise:
+*>          if TRANS = 'N' and m >= n, rows 1 to n of B contain the least
+*>          squares solution vectors; the residual sum of squares for the
+*>          solution in each column is given by the sum of squares of
+*>          elements N+1 to M in that column;
+*>          if TRANS = 'N' and m < n, rows 1 to N of B contain the
+*>          minimum norm solution vectors;
+*>          if TRANS = 'T' and m >= n, rows 1 to M of B contain the
+*>          minimum norm solution vectors;
+*>          if TRANS = 'T' and m < n, rows 1 to M of B contain the
+*>          least squares solution vectors; the residual sum of squares
+*>          for the solution in each column is given by the sum of
+*>          squares of elements M+1 to N in that column.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= MAX(1,M,N).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          LWORK >= max( 1, MN + max( MN, NRHS ) ).
+*>          For optimal performance,
+*>          LWORK >= max( 1, (MN + max( MN, NRHS ))*NB ).
+*>          where MN = min(M,N) and NB is the optimum block size.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO =  i, the i-th diagonal element of the
+*>                triangular factor of A is exactly zero, so that A does not have
+*>                full rank; the least squares solution could not be
+*>                computed.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup gelst
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
+*>
+*>  November 2022,  Igor Kozachenko,
+*>                  Computer Science Division,
+*>                  University of California, Berkeley
+*> \endverbatim
+*
+*  =====================================================================
+      SUBROUTINE DGELST( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK,
+     $                   LWORK,
+     $                   INFO )
+      IMPLICIT NONE
+*
+*  -- LAPACK driver routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          TRANS
+      INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY, TPSD
+      INTEGER            BROW, I, IASCL, IBSCL, J, LWOPT, MN, MNNRHS,
+     $                   NB, NBMIN, SCLLEN
+      DOUBLE PRECISION   ANRM, BIGNUM, BNRM, SMLNUM
+*     ..
+*     .. Local Arrays ..
+      DOUBLE PRECISION   RWORK( 1 )
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      DOUBLE PRECISION   DLAMCH, DLANGE
+      EXTERNAL           LSAME, ILAENV, DLAMCH, DLANGE
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DGELQT, DGEQRT, DGEMLQT, DGEMQRT,
+     $                   DLASCL,
+     $                   DLASET, DTRTRS, XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DBLE, MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input arguments.
+*
+      INFO = 0
+      MN = MIN( M, N )
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( .NOT.( LSAME( TRANS, 'N' ) .OR.
+     $    LSAME( TRANS, 'T' ) ) ) THEN
+         INFO = -1
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -6
+      ELSE IF( LDB.LT.MAX( 1, M, N ) ) THEN
+         INFO = -8
+      ELSE IF( LWORK.LT.MAX( 1, MN+MAX( MN, NRHS ) ) .AND. .NOT.LQUERY )
+     $          THEN
+         INFO = -10
+      END IF
+*
+*     Figure out optimal block size and optimal workspace size
+*
+      IF( INFO.EQ.0 .OR. INFO.EQ.-10 ) THEN
+*
+         TPSD = .TRUE.
+         IF( LSAME( TRANS, 'N' ) )
+     $      TPSD = .FALSE.
+*
+         NB = ILAENV( 1, 'DGELST', ' ', M, N, -1, -1 )
+*
+         MNNRHS = MAX( MN, NRHS )
+         LWOPT = MAX( 1, (MN+MNNRHS)*NB )
+         WORK( 1 ) = DBLE( LWOPT )
+*
+      END IF
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'DGELST ', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( MIN( M, N, NRHS ).EQ.0 ) THEN
+         CALL DLASET( 'Full', MAX( M, N ), NRHS, ZERO, ZERO, B, LDB )
+         WORK( 1 ) = DBLE( LWOPT )
+         RETURN
+      END IF
+*
+*     *GEQRT and *GELQT routines cannot accept NB larger than min(M,N)
+*
+      IF( NB.GT.MN ) NB = MN
+*
+*     Determine the block size from the supplied LWORK
+*     ( at this stage we know that LWORK >= (minimum required workspace,
+*     but it may be less than optimal)
+*
+      NB = MIN( NB, LWORK/( MN + MNNRHS ) )
+*
+*     The minimum value of NB, when blocked code is used
+*
+      NBMIN = MAX( 2, ILAENV( 2, 'DGELST', ' ', M, N, -1, -1 ) )
+*
+      IF( NB.LT.NBMIN ) THEN
+         NB = 1
+      END IF
+*
+*     Get machine parameters
+*
+      SMLNUM = DLAMCH( 'S' ) / DLAMCH( 'P' )
+      BIGNUM = ONE / SMLNUM
+*
+*     Scale A, B if max element outside range [SMLNUM,BIGNUM]
+*
+      ANRM = DLANGE( 'M', M, N, A, LDA, RWORK )
+      IASCL = 0
+      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
+*
+*        Scale matrix norm up to SMLNUM
+*
+         CALL DLASCL( 'G', 0, 0, ANRM, SMLNUM, M, N, A, LDA, INFO )
+         IASCL = 1
+      ELSE IF( ANRM.GT.BIGNUM ) THEN
+*
+*        Scale matrix norm down to BIGNUM
+*
+         CALL DLASCL( 'G', 0, 0, ANRM, BIGNUM, M, N, A, LDA, INFO )
+         IASCL = 2
+      ELSE IF( ANRM.EQ.ZERO ) THEN
+*
+*        Matrix all zero. Return zero solution.
+*
+         CALL DLASET( 'Full', MAX( M, N ), NRHS, ZERO, ZERO, B, LDB )
+         WORK( 1 ) = DBLE( LWOPT )
+         RETURN
+      END IF
+*
+      BROW = M
+      IF( TPSD )
+     $   BROW = N
+      BNRM = DLANGE( 'M', BROW, NRHS, B, LDB, RWORK )
+      IBSCL = 0
+      IF( BNRM.GT.ZERO .AND. BNRM.LT.SMLNUM ) THEN
+*
+*        Scale matrix norm up to SMLNUM
+*
+         CALL DLASCL( 'G', 0, 0, BNRM, SMLNUM, BROW, NRHS, B, LDB,
+     $                INFO )
+         IBSCL = 1
+      ELSE IF( BNRM.GT.BIGNUM ) THEN
+*
+*        Scale matrix norm down to BIGNUM
+*
+         CALL DLASCL( 'G', 0, 0, BNRM, BIGNUM, BROW, NRHS, B, LDB,
+     $                INFO )
+         IBSCL = 2
+      END IF
+*
+      IF( M.GE.N ) THEN
+*
+*        M > N:
+*        Compute the blocked QR factorization of A,
+*        using the compact WY representation of Q,
+*        workspace at least N, optimally N*NB.
+*
+         CALL DGEQRT( M, N, NB, A, LDA, WORK( 1 ), NB,
+     $                WORK( MN*NB+1 ), INFO )
+*
+         IF( .NOT.TPSD ) THEN
+*
+*           M > N, A is not transposed:
+*           Overdetermined system of equations,
+*           least-squares problem, min || A * X - B ||.
+*
+*           Compute B(1:M,1:NRHS) := Q**T * B(1:M,1:NRHS),
+*           using the compact WY representation of Q,
+*           workspace at least NRHS, optimally NRHS*NB.
+*
+            CALL DGEMQRT( 'Left', 'Transpose', M, NRHS, N, NB, A,
+     $                    LDA,
+     $                    WORK( 1 ), NB, B, LDB, WORK( MN*NB+1 ),
+     $                    INFO )
+*
+*           Compute B(1:N,1:NRHS) := inv(R) * B(1:N,1:NRHS)
+*
+            CALL DTRTRS( 'Upper', 'No transpose', 'Non-unit', N,
+     $                   NRHS,
+     $                   A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
+*
+            SCLLEN = N
+*
+         ELSE
+*
+*           M > N, A is transposed:
+*           Underdetermined system of equations,
+*           minimum norm solution of A**T * X = B.
+*
+*           Compute B := inv(R**T) * B in two row blocks of B.
+*
+*           Block 1: B(1:N,1:NRHS) := inv(R**T) * B(1:N,1:NRHS)
+*
+            CALL DTRTRS( 'Upper', 'Transpose', 'Non-unit', N, NRHS,
+     $                   A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
+*
+*           Block 2: Zero out all rows below the N-th row in B:
+*           B(N+1:M,1:NRHS) = ZERO
+*
+            DO  J = 1, NRHS
+               DO I = N + 1, M
+                  B( I, J ) = ZERO
+               END DO
+            END DO
+*
+*           Compute B(1:M,1:NRHS) := Q(1:N,:) * B(1:N,1:NRHS),
+*           using the compact WY representation of Q,
+*           workspace at least NRHS, optimally NRHS*NB.
+*
+            CALL DGEMQRT( 'Left', 'No transpose', M, NRHS, N, NB,
+     $                    A, LDA, WORK( 1 ), NB, B, LDB,
+     $                    WORK( MN*NB+1 ), INFO )
+*
+            SCLLEN = M
+*
+         END IF
+*
+      ELSE
+*
+*        M < N:
+*        Compute the blocked LQ factorization of A,
+*        using the compact WY representation of Q,
+*        workspace at least M, optimally M*NB.
+*
+         CALL DGELQT( M, N, NB, A, LDA, WORK( 1 ), NB,
+     $                WORK( MN*NB+1 ), INFO )
+*
+         IF( .NOT.TPSD ) THEN
+*
+*           M < N, A is not transposed:
+*           Underdetermined system of equations,
+*           minimum norm solution of A * X = B.
+*
+*           Compute B := inv(L) * B in two row blocks of B.
+*
+*           Block 1: B(1:M,1:NRHS) := inv(L) * B(1:M,1:NRHS)
+*
+            CALL DTRTRS( 'Lower', 'No transpose', 'Non-unit', M,
+     $                   NRHS,
+     $                   A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
+*
+*           Block 2: Zero out all rows below the M-th row in B:
+*           B(M+1:N,1:NRHS) = ZERO
+*
+            DO J = 1, NRHS
+               DO I = M + 1, N
+                  B( I, J ) = ZERO
+               END DO
+            END DO
+*
+*           Compute B(1:N,1:NRHS) := Q(1:N,:)**T * B(1:M,1:NRHS),
+*           using the compact WY representation of Q,
+*           workspace at least NRHS, optimally NRHS*NB.
+*
+            CALL DGEMLQT( 'Left', 'Transpose', N, NRHS, M, NB, A,
+     $                    LDA,
+     $                   WORK( 1 ), NB, B, LDB,
+     $                   WORK( MN*NB+1 ), INFO )
+*
+            SCLLEN = N
+*
+         ELSE
+*
+*           M < N, A is transposed:
+*           Overdetermined system of equations,
+*           least-squares problem, min || A**T * X - B ||.
+*
+*           Compute B(1:N,1:NRHS) := Q * B(1:N,1:NRHS),
+*           using the compact WY representation of Q,
+*           workspace at least NRHS, optimally NRHS*NB.
+*
+            CALL DGEMLQT( 'Left', 'No transpose', N, NRHS, M, NB,
+     $                    A, LDA, WORK( 1 ), NB, B, LDB,
+     $                    WORK( MN*NB+1), INFO )
+*
+*           Compute B(1:M,1:NRHS) := inv(L**T) * B(1:M,1:NRHS)
+*
+            CALL DTRTRS( 'Lower', 'Transpose', 'Non-unit', M, NRHS,
+     $                   A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
+*
+            SCLLEN = M
+*
+         END IF
+*
+      END IF
+*
+*     Undo scaling
+*
+      IF( IASCL.EQ.1 ) THEN
+         CALL DLASCL( 'G', 0, 0, ANRM, SMLNUM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      ELSE IF( IASCL.EQ.2 ) THEN
+         CALL DLASCL( 'G', 0, 0, ANRM, BIGNUM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      END IF
+      IF( IBSCL.EQ.1 ) THEN
+         CALL DLASCL( 'G', 0, 0, SMLNUM, BNRM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      ELSE IF( IBSCL.EQ.2 ) THEN
+         CALL DLASCL( 'G', 0, 0, BIGNUM, BNRM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      END IF
+*
+      WORK( 1 ) = DBLE( LWOPT )
+*
+      RETURN
+*
+*     End of DGELST
+*
+      END
diff --git a/SRC/dgelsy.f b/SRC/dgelsy.f
index aebab92640..54bc881c28 100644
--- a/SRC/dgelsy.f
+++ b/SRC/dgelsy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGELSY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgelsy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgelsy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,6 +113,7 @@
 *>          B is DOUBLE PRECISION array, dimension (LDB,NRHS)
 *>          On entry, the M-by-NRHS right hand side matrix B.
 *>          On exit, the N-by-NRHS solution matrix X.
+*>          If M = 0 or N = 0, B is not referenced.
 *> \endverbatim
 *>
 *> \param[in] LDB
@@ -147,6 +146,7 @@
 *>          The effective rank of A, i.e., the order of the submatrix
 *>          R11.  This is the same as the order of the submatrix T11
 *>          in the complete orthogonal factorization of A.
+*>          If NRHS = 0, RANK = 0 on output.
 *> \endverbatim
 *>
 *> \param[out] WORK
@@ -189,7 +189,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEsolve
+*> \ingroup gelsy
 *
 *> \par Contributors:
 *  ==================
@@ -199,8 +199,10 @@
 *>    G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain \n
 *>
 *  =====================================================================
-      SUBROUTINE DGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
+      SUBROUTINE DGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND,
+     $                   RANK,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -236,7 +238,8 @@ SUBROUTINE DGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
       EXTERNAL           ILAENV, DLAMCH, DLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEQP3, DLABAD, DLAIC1, DLASCL, DLASET,
+      EXTERNAL           DCOPY, DGEQP3, DLAIC1, DLASCL,
+     $                   DLASET,
      $                   DORMQR, DORMRZ, DTRSM, DTZRZF, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -305,7 +308,6 @@ SUBROUTINE DGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
       SMLNUM = DLAMCH( 'S' ) / DLAMCH( 'P' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A, B if max entries outside range [SMLNUM,BIGNUM]
 *
@@ -338,13 +340,15 @@ SUBROUTINE DGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
 *        Scale matrix norm up to SMLNUM
 *
-         CALL DLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 1
       ELSE IF( BNRM.GT.BIGNUM ) THEN
 *
 *        Scale matrix norm down to BIGNUM
 *
-         CALL DLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 2
       END IF
 *
@@ -411,7 +415,8 @@ SUBROUTINE DGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
 *     B(1:M,1:NRHS) := Q**T * B(1:M,1:NRHS)
 *
-      CALL DORMQR( 'Left', 'Transpose', M, NRHS, MN, A, LDA, WORK( 1 ),
+      CALL DORMQR( 'Left', 'Transpose', M, NRHS, MN, A, LDA,
+     $             WORK( 1 ),
      $             B, LDB, WORK( 2*MN+1 ), LWORK-2*MN, INFO )
       WSIZE = MAX( WSIZE, 2*MN+WORK( 2*MN+1 ) )
 *
@@ -452,18 +457,22 @@ SUBROUTINE DGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *     Undo scaling
 *
       IF( IASCL.EQ.1 ) THEN
-         CALL DLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL DLASCL( 'U', 0, 0, SMLNUM, ANRM, RANK, RANK, A, LDA,
      $                INFO )
       ELSE IF( IASCL.EQ.2 ) THEN
-         CALL DLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL DLASCL( 'U', 0, 0, BIGNUM, ANRM, RANK, RANK, A, LDA,
      $                INFO )
       END IF
       IF( IBSCL.EQ.1 ) THEN
-         CALL DLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL DLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       END IF
 *
    70 CONTINUE
diff --git a/SRC/dgemlq.f b/SRC/dgemlq.f
index 3ba2091054..e3d1f7447f 100644
--- a/SRC/dgemlq.f
+++ b/SRC/dgemlq.f
@@ -111,16 +111,17 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          (workspace) DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1, then a workspace query is assumed. The routine
 *>          only calculates the size of the WORK array, returns this
-*>          value as WORK(1), and no error message related to WORK 
+*>          value as WORK(1), and no error message related to WORK
 *>          is issued by XERBLA.
 *> \endverbatim
 *>
@@ -144,7 +145,7 @@
 *>
 *> \verbatim
 *>
-*> These details are particular for this LAPACK implementation. Users should not 
+*> These details are particular for this LAPACK implementation. Users should not
 *> take them for granted. These details may change in the future, and are not likely
 *> true for another LAPACK implementation. These details are relevant if one wants
 *> to try to understand the code. They are not part of the interface.
@@ -160,14 +161,17 @@
 *>  block sizes MB and NB returned by ILAENV, DGELQ will use either
 *>  DLASWLQ (if the matrix is wide-and-short) or DGELQT to compute
 *>  the LQ factorization.
-*>  This version of DGEMLQ will use either DLAMSWLQ or DGEMLQT to 
+*>  This version of DGEMLQ will use either DLAMSWLQ or DGEMLQT to
 *>  multiply matrix Q by another matrix.
 *>  Further Details in DLAMSWLQ or DGEMLQT.
 *> \endverbatim
 *>
+*> \ingroup gemlq
+*>
 *  =====================================================================
       SUBROUTINE DGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
      $                   C, LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -186,7 +190,7 @@ SUBROUTINE DGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER            MB, NB, LW, NBLCKS, MN
+      INTEGER            MB, NB, LW, NBLCKS, MN, MINMNK, LWMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -202,7 +206,7 @@ SUBROUTINE DGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *
 *     Test the input arguments
 *
-      LQUERY  = LWORK.EQ.-1
+      LQUERY  = ( LWORK.EQ.-1 )
       NOTRAN  = LSAME( TRANS, 'N' )
       TRAN    = LSAME( TRANS, 'T' )
       LEFT    = LSAME( SIDE, 'L' )
@@ -217,6 +221,13 @@ SUBROUTINE DGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
         LW = M * MB
         MN = N
       END IF
+*
+      MINMNK = MIN( M, N, K )
+      IF( MINMNK.EQ.0 ) THEN
+         LWMIN = 1
+      ELSE
+         LWMIN = MAX( 1, LW )
+      END IF
 *
       IF( ( NB.GT.K ) .AND. ( MN.GT.K ) ) THEN
         IF( MOD( MN - K, NB - K ) .EQ. 0 ) THEN
@@ -245,12 +256,12 @@ SUBROUTINE DGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
         INFO = -9
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
         INFO = -11
-      ELSE IF( ( LWORK.LT.MAX( 1, LW ) ) .AND. ( .NOT.LQUERY ) ) THEN
+      ELSE IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
         INFO = -13
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-        WORK( 1 ) = LW
+        WORK( 1 ) = LWMIN
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -262,7 +273,7 @@ SUBROUTINE DGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *
 *     Quick return if possible
 *
-      IF( MIN( M, N, K ).EQ.0 ) THEN
+      IF( MINMNK.EQ.0 ) THEN
         RETURN
       END IF
 *
@@ -275,7 +286,7 @@ SUBROUTINE DGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
      $                 MB, C, LDC, WORK, LWORK, INFO )
       END IF
 *
-      WORK( 1 ) = LW
+      WORK( 1 ) = LWMIN
 *
       RETURN
 *
diff --git a/SRC/dgemlqt.f b/SRC/dgemlqt.f
index 2c7bf24da4..76ddde199c 100644
--- a/SRC/dgemlqt.f
+++ b/SRC/dgemlqt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEMLQT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgemlqt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgemlqt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -110,7 +108,7 @@
 *> \param[in] LDV
 *> \verbatim
 *>          LDV is INTEGER
-*>          The leading dimension of the array V. LDV >= max(1,K).
+*>          The leading dimension of the array V.  LDV >= max(1,K).
 *> \endverbatim
 *>
 *> \param[in] T
@@ -160,11 +158,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gemlqt
 *
 *  =====================================================================
       SUBROUTINE DGEMLQT( SIDE, TRANS, M, N, K, MB, V, LDV, T, LDT,
      $                   C, LDC, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,7 +182,7 @@ SUBROUTINE DGEMLQT( SIDE, TRANS, M, N, K, MB, V, LDV, T, LDT,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, RIGHT, TRAN, NOTRAN
-      INTEGER            I, IB, LDWORK, KF
+      INTEGER            I, IB, LDWORK, KF, Q
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -207,8 +206,10 @@ SUBROUTINE DGEMLQT( SIDE, TRANS, M, N, K, MB, V, LDV, T, LDT,
 *
       IF( LEFT ) THEN
          LDWORK = MAX( 1, N )
+         Q = M
       ELSE IF ( RIGHT ) THEN
          LDWORK = MAX( 1, M )
+         Q = N
       END IF
       IF( .NOT.LEFT .AND. .NOT.RIGHT ) THEN
          INFO = -1
@@ -218,7 +219,7 @@ SUBROUTINE DGEMLQT( SIDE, TRANS, M, N, K, MB, V, LDV, T, LDT,
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
          INFO = -4
-      ELSE IF( K.LT.0) THEN
+      ELSE IF( K.LT.0 .OR. K.GT.Q ) THEN
          INFO = -5
       ELSE IF( MB.LT.1 .OR. (MB.GT.K .AND. K.GT.0)) THEN
          INFO = -6
diff --git a/SRC/dgemqr.f b/SRC/dgemqr.f
index 022cf21e43..5423917ba3 100644
--- a/SRC/dgemqr.f
+++ b/SRC/dgemqr.f
@@ -111,16 +111,17 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          (workspace) DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1, then a workspace query is assumed. The routine
 *>          only calculates the size of the WORK array, returns this
-*>          value as WORK(1), and no error message related to WORK 
+*>          value as WORK(1), and no error message related to WORK
 *>          is issued by XERBLA.
 *> \endverbatim
 *>
@@ -144,7 +145,7 @@
 *>
 *> \verbatim
 *>
-*> These details are particular for this LAPACK implementation. Users should not 
+*> These details are particular for this LAPACK implementation. Users should not
 *> take them for granted. These details may change in the future, and are not likely
 *> true for another LAPACK implementation. These details are relevant if one wants
 *> to try to understand the code. They are not part of the interface.
@@ -160,15 +161,18 @@
 *>  block sizes MB and NB returned by ILAENV, DGEQR will use either
 *>  DLATSQR (if the matrix is tall-and-skinny) or DGEQRT to compute
 *>  the QR factorization.
-*>  This version of DGEMQR will use either DLAMTSQR or DGEMQRT to 
+*>  This version of DGEMQR will use either DLAMTSQR or DGEMQRT to
 *>  multiply matrix Q by another matrix.
 *>  Further Details in DLATMSQR or DGEMQRT.
 *>
 *> \endverbatim
 *>
+*> \ingroup gemqr
+*>
 *  =====================================================================
       SUBROUTINE DGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
      $                   C, LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -187,7 +191,7 @@ SUBROUTINE DGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER            MB, NB, LW, NBLCKS, MN
+      INTEGER            MB, NB, LW, NBLCKS, MN, MINMNK, LWMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -203,7 +207,7 @@ SUBROUTINE DGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *
 *     Test the input arguments
 *
-      LQUERY  = LWORK.EQ.-1
+      LQUERY  = ( LWORK.EQ.-1 )
       NOTRAN  = LSAME( TRANS, 'N' )
       TRAN    = LSAME( TRANS, 'T' )
       LEFT    = LSAME( SIDE, 'L' )
@@ -218,6 +222,13 @@ SUBROUTINE DGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
         LW = MB * NB
         MN = N
       END IF
+*
+      MINMNK = MIN( M, N, K )
+      IF( MINMNK.EQ.0 ) THEN
+         LWMIN = 1
+      ELSE
+         LWMIN = MAX( 1, LW )
+      END IF
 *
       IF( ( MB.GT.K ) .AND. ( MN.GT.K ) ) THEN
         IF( MOD( MN - K, MB - K ).EQ.0 ) THEN
@@ -246,12 +257,12 @@ SUBROUTINE DGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
         INFO = -9
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
         INFO = -11
-      ELSE IF( ( LWORK.LT.MAX( 1, LW ) ) .AND. ( .NOT.LQUERY ) ) THEN
+      ELSE IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
         INFO = -13
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-        WORK( 1 ) = LW
+        WORK( 1 ) = LWMIN
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -263,7 +274,7 @@ SUBROUTINE DGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *
 *     Quick return if possible
 *
-      IF( MIN( M, N, K ).EQ.0 ) THEN
+      IF( MINMNK.EQ.0 ) THEN
         RETURN
       END IF
 *
@@ -276,7 +287,7 @@ SUBROUTINE DGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
      $                 NB, C, LDC, WORK, LWORK, INFO )
       END IF
 *
-      WORK( 1 ) = LW
+      WORK( 1 ) = LWMIN
 *
       RETURN
 *
diff --git a/SRC/dgemqrt.f b/SRC/dgemqrt.f
index 95c1a735c6..d1ac64a586 100644
--- a/SRC/dgemqrt.f
+++ b/SRC/dgemqrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEMQRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgemqrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgemqrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -94,7 +92,7 @@
 *>          NB is INTEGER
 *>          The block size used for the storage of T.  K >= NB >= 1.
 *>          This must be the same value of NB used to generate T
-*>          in CGEQRT.
+*>          in DGEQRT.
 *> \endverbatim
 *>
 *> \param[in] V
@@ -102,7 +100,7 @@
 *>          V is DOUBLE PRECISION array, dimension (LDV,K)
 *>          The i-th column must contain the vector which defines the
 *>          elementary reflector H(i), for i = 1,2,...,k, as returned by
-*>          CGEQRT in the first K columns of its array argument A.
+*>          DGEQRT in the first K columns of its array argument A.
 *> \endverbatim
 *>
 *> \param[in] LDV
@@ -117,7 +115,7 @@
 *> \verbatim
 *>          T is DOUBLE PRECISION array, dimension (LDT,K)
 *>          The upper triangular factors of the block reflectors
-*>          as returned by CGEQRT, stored as a NB-by-N matrix.
+*>          as returned by DGEQRT, stored as a NB-by-N matrix.
 *> \endverbatim
 *>
 *> \param[in] LDT
@@ -160,11 +158,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gemqrt
 *
 *  =====================================================================
       SUBROUTINE DGEMQRT( SIDE, TRANS, M, N, K, NB, V, LDV, T, LDT,
      $                   C, LDC, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dgeql2.f b/SRC/dgeql2.f
index 2d3ce1419f..1b2f55a658 100644
--- a/SRC/dgeql2.f
+++ b/SRC/dgeql2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEQL2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeql2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeql2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,7 +96,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup geql2
 *
 *> \par Further Details:
 *  =====================
@@ -120,6 +118,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGEQL2( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -140,10 +139,9 @@ SUBROUTINE DGEQL2( M, N, A, LDA, TAU, WORK, INFO )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      DOUBLE PRECISION   AII
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARF, DLARFG, XERBLA
+      EXTERNAL           DLARF1L, DLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -177,11 +175,9 @@ SUBROUTINE DGEQL2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *        Apply H(i) to A(1:m-k+i,1:n-k+i-1) from the left
 *
-         AII = A( M-K+I, N-K+I )
-         A( M-K+I, N-K+I ) = ONE
-         CALL DLARF( 'Left', M-K+I, N-K+I-1, A( 1, N-K+I ), 1, TAU( I ),
+         CALL DLARF1L( 'Left', M-K+I, N-K+I-1, A( 1, N-K+I ), 1,
+     $               TAU( I ),
      $               A, LDA, WORK )
-         A( M-K+I, N-K+I ) = AII
    10 CONTINUE
       RETURN
 *
diff --git a/SRC/dgeqlf.f b/SRC/dgeqlf.f
index b8ac0b1a0e..f54928a29f 100644
--- a/SRC/dgeqlf.f
+++ b/SRC/dgeqlf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEQLF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeqlf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeqlf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,7 +86,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,N).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= N, otherwise.
 *>          For optimum performance LWORK >= N*NB, where NB is the
 *>          optimal blocksize.
 *>
@@ -113,7 +112,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup geqlf
 *
 *> \par Further Details:
 *  =====================
@@ -135,6 +134,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,8 +188,9 @@ SUBROUTINE DGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          END IF
          WORK( 1 ) = LWKOPT
 *
-         IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
-            INFO = -7
+         IF( .NOT.LQUERY ) THEN
+            IF( LWORK.LE.0 .OR. ( M.GT.0 .AND. LWORK.LT.MAX( 1, N ) ) )
+     $         INFO = -7
          END IF
       END IF
 *
@@ -246,7 +247,8 @@ SUBROUTINE DGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *           Compute the QL factorization of the current block
 *           A(1:m-k+i+ib-1,n-k+i:n-k+i+ib-1)
 *
-            CALL DGEQL2( M-K+I+IB-1, IB, A( 1, N-K+I ), LDA, TAU( I ),
+            CALL DGEQL2( M-K+I+IB-1, IB, A( 1, N-K+I ), LDA,
+     $                   TAU( I ),
      $                   WORK, IINFO )
             IF( N-K+I.GT.1 ) THEN
 *
diff --git a/SRC/dgeqp3.f b/SRC/dgeqp3.f
index e79ecf371b..31c9367325 100644
--- a/SRC/dgeqp3.f
+++ b/SRC/dgeqp3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEQP3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeqp3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeqp3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,7 +118,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup geqp3
 *
 *> \par Further Details:
 *  =====================
@@ -148,6 +146,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -173,7 +172,8 @@ SUBROUTINE DGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, INFO )
      $                   NBMIN, NFXD, NX, SM, SMINMN, SN, TOPBMN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEQRF, DLAQP2, DLAQPS, DORMQR, DSWAP, XERBLA
+      EXTERNAL           DGEQRF, DLAQP2, DLAQPS, DORMQR, DSWAP,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
@@ -255,7 +255,8 @@ SUBROUTINE DGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, INFO )
          IF( NA.LT.N ) THEN
 *CC         CALL DORM2R( 'Left', 'Transpose', M, N-NA, NA, A, LDA,
 *CC  $                   TAU, A( 1, NA+1 ), LDA, WORK, INFO )
-            CALL DORMQR( 'Left', 'Transpose', M, N-NA, NA, A, LDA, TAU,
+            CALL DORMQR( 'Left', 'Transpose', M, N-NA, NA, A, LDA,
+     $                   TAU,
      $                   A( 1, NA+1 ), LDA, WORK, LWORK, INFO )
             IWS = MAX( IWS, INT( WORK( 1 ) ) )
          END IF
@@ -296,7 +297,8 @@ SUBROUTINE DGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, INFO )
 *                 determine the minimum value of NB.
 *
                   NB = ( LWORK-2*SN ) / ( SN+1 )
-                  NBMIN = MAX( 2, ILAENV( INBMIN, 'DGEQRF', ' ', SM, SN,
+                  NBMIN = MAX( 2, ILAENV( INBMIN, 'DGEQRF', ' ', SM,
+     $                         SN,
      $                    -1, -1 ) )
 *
 *
diff --git a/SRC/dgeqp3rk.f b/SRC/dgeqp3rk.f
new file mode 100644
index 0000000000..8645f88ebb
--- /dev/null
+++ b/SRC/dgeqp3rk.f
@@ -0,0 +1,1073 @@
+*> \brief \b DGEQP3RK computes a truncated Householder QR factorization with column pivoting of a real m-by-n matrix A by using Level 3 BLAS and overwrites a real m-by-nrhs matrix B with Q**T * B.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download DGEQP3RK + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeqp3rk.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgeqp3rk.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeqp3rk.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DGEQP3RK( M, N, NRHS, KMAX, ABSTOL, RELTOL, A, LDA,
+*      $                     K, MAXC2NRMK, RELMAXC2NRMK, JPIV, TAU,
+*      $                     WORK, LWORK, IWORK, INFO )
+*       IMPLICIT NONE
+*
+*      .. Scalar Arguments ..
+*       INTEGER            INFO, K, KMAX, LDA, LWORK, M, N, NRHS
+*       DOUBLE PRECISION   ABSTOL, MAXC2NRMK, RELMAXC2NRMK, RELTOL
+*      ..
+*      .. Array Arguments ..
+*       INTEGER            IWORK( * ), JPIV( * )
+*       DOUBLE PRECISION   A( LDA, * ), TAU( * ), WORK( * )
+*      ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> DGEQP3RK performs two tasks simultaneously:
+*>
+*> Task 1: The routine computes a truncated (rank K) or full rank
+*> Householder QR factorization with column pivoting of a real
+*> M-by-N matrix A using Level 3 BLAS. K is the number of columns
+*> that were factorized, i.e. factorization rank of the
+*> factor R, K <= min(M,N).
+*>
+*>  A * P(K) = Q(K) * R(K)  =
+*>
+*>        = Q(K) * ( R11(K) R12(K) ) = Q(K) * (   R(K)_approx    )
+*>                 ( 0      R22(K) )          ( 0  R(K)_residual ),
+*>
+*> where:
+*>
+*>  P(K)            is an N-by-N permutation matrix;
+*>  Q(K)            is an M-by-M orthogonal matrix;
+*>  R(K)_approx   = ( R11(K), R12(K) ) is a rank K approximation of the
+*>                    full rank factor R with K-by-K upper-triangular
+*>                    R11(K) and K-by-N rectangular R12(K). The diagonal
+*>                    entries of R11(K) appear in non-increasing order
+*>                    of absolute value, and absolute values of all of
+*>                    them exceed the maximum column 2-norm of R22(K)
+*>                    up to roundoff error.
+*>  R(K)_residual = R22(K) is the residual of a rank K approximation
+*>                    of the full rank factor R. It is a
+*>                    an (M-K)-by-(N-K) rectangular matrix;
+*>  0               is a an (M-K)-by-K zero matrix.
+*>
+*> Task 2: At the same time, the routine overwrites a real M-by-NRHS
+*> matrix B with  Q(K)**T * B  using Level 3 BLAS.
+*>
+*> =====================================================================
+*>
+*> The matrices A and B are stored on input in the array A as
+*> the left and right blocks A(1:M,1:N) and A(1:M, N+1:N+NRHS)
+*> respectively.
+*>
+*>                                  N     NRHS
+*>             array_A   =   M  [ mat_A, mat_B ]
+*>
+*> The truncation criteria (i.e. when to stop the factorization)
+*> can be any of the following:
+*>
+*>   1) The input parameter KMAX, the maximum number of columns
+*>      KMAX to factorize, i.e. the factorization rank is limited
+*>      to KMAX. If KMAX >= min(M,N), the criterion is not used.
+*>
+*>   2) The input parameter ABSTOL, the absolute tolerance for
+*>      the maximum column 2-norm of the residual matrix R22(K). This
+*>      means that the factorization stops if this norm is less or
+*>      equal to ABSTOL. If ABSTOL < 0.0, the criterion is not used.
+*>
+*>   3) The input parameter RELTOL, the tolerance for the maximum
+*>      column 2-norm matrix of the residual matrix R22(K) divided
+*>      by the maximum column 2-norm of the original matrix A, which
+*>      is equal to abs(R(1,1)). This means that the factorization stops
+*>      when the ratio of the maximum column 2-norm of R22(K) to
+*>      the maximum column 2-norm of A is less than or equal to RELTOL.
+*>      If RELTOL < 0.0, the criterion is not used.
+*>
+*>   4) In case both stopping criteria ABSTOL or RELTOL are not used,
+*>      and when the residual matrix R22(K) is a zero matrix in some
+*>      factorization step K. ( This stopping criterion is implicit. )
+*>
+*>  The algorithm stops when any of these conditions is first
+*>  satisfied, otherwise the whole matrix A is factorized.
+*>
+*>  To factorize the whole matrix A, use the values
+*>  KMAX >= min(M,N), ABSTOL < 0.0 and RELTOL < 0.0.
+*>
+*>  The routine returns:
+*>     a) Q(K), R(K)_approx = ( R11(K), R12(K) ),
+*>        R(K)_residual = R22(K), P(K), i.e. the resulting matrices
+*>        of the factorization; P(K) is represented by JPIV,
+*>        ( if K = min(M,N), R(K)_approx is the full factor R,
+*>        and there is no residual matrix R(K)_residual);
+*>     b) K, the number of columns that were factorized,
+*>        i.e. factorization rank;
+*>     c) MAXC2NRMK, the maximum column 2-norm of the residual
+*>        matrix R(K)_residual = R22(K),
+*>        ( if K = min(M,N), MAXC2NRMK = 0.0 );
+*>     d) RELMAXC2NRMK equals MAXC2NRMK divided by MAXC2NRM, the maximum
+*>        column 2-norm of the original matrix A, which is equal
+*>        to abs(R(1,1)), ( if K = min(M,N), RELMAXC2NRMK = 0.0 );
+*>     e) Q(K)**T * B, the matrix B with the orthogonal
+*>        transformation Q(K)**T applied on the left.
+*>
+*> The N-by-N permutation matrix P(K) is stored in a compact form in
+*> the integer array JPIV. For 1 <= j <= N, column j
+*> of the matrix A was interchanged with column JPIV(j).
+*>
+*> The M-by-M orthogonal matrix Q is represented as a product
+*> of elementary Householder reflectors
+*>
+*>     Q(K) = H(1) *  H(2) * . . . * H(K),
+*>
+*> where K is the number of columns that were factorized.
+*>
+*> Each H(j) has the form
+*>
+*>     H(j) = I - tau * v * v**T,
+*>
+*> where 1 <= j <= K and
+*>   I    is an M-by-M identity matrix,
+*>   tau  is a real scalar,
+*>   v    is a real vector with v(1:j-1) = 0 and v(j) = 1.
+*>
+*> v(j+1:M) is stored on exit in A(j+1:M,j) and tau in TAU(j).
+*>
+*> See the Further Details section for more information.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e. the number of
+*>          columns of the matrix B. NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] KMAX
+*> \verbatim
+*>          KMAX is INTEGER
+*>
+*>          The first factorization stopping criterion. KMAX >= 0.
+*>
+*>          The maximum number of columns of the matrix A to factorize,
+*>          i.e. the maximum factorization rank.
+*>
+*>          a) If KMAX >= min(M,N), then this stopping criterion
+*>                is not used, the routine factorizes columns
+*>                depending on ABSTOL and RELTOL.
+*>
+*>          b) If KMAX = 0, then this stopping criterion is
+*>                satisfied on input and the routine exits immediately.
+*>                This means that the factorization is not performed,
+*>                the matrices A and B are not modified, and
+*>                the matrix A is itself the residual.
+*> \endverbatim
+*>
+*> \param[in] ABSTOL
+*> \verbatim
+*>          ABSTOL is DOUBLE PRECISION
+*>
+*>          The second factorization stopping criterion, cannot be NaN.
+*>
+*>          The absolute tolerance (stopping threshold) for
+*>          maximum column 2-norm of the residual matrix R22(K).
+*>          The algorithm converges (stops the factorization) when
+*>          the maximum column 2-norm of the residual matrix R22(K)
+*>          is less than or equal to ABSTOL. Let SAFMIN = DLAMCH('S').
+*>
+*>          a) If ABSTOL is NaN, then no computation is performed
+*>                and an error message ( INFO = -5 ) is issued
+*>                by XERBLA.
+*>
+*>          b) If ABSTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on KMAX and RELTOL.
+*>                This includes the case ABSTOL = -Inf.
+*>
+*>          c) If 0.0 <= ABSTOL < 2*SAFMIN, then ABSTOL = 2*SAFMIN
+*>                is used. This includes the case ABSTOL = -0.0.
+*>
+*>          d) If 2*SAFMIN <= ABSTOL then the input value
+*>                of ABSTOL is used.
+*>
+*>          Let MAXC2NRM be the maximum column 2-norm of the
+*>          whole original matrix A.
+*>          If ABSTOL chosen above is >= MAXC2NRM, then this
+*>          stopping criterion is satisfied on input and routine exits
+*>          immediately after MAXC2NRM is computed. The routine
+*>          returns MAXC2NRM in MAXC2NORMK,
+*>          and 1.0 in RELMAXC2NORMK.
+*>          This includes the case ABSTOL = +Inf. This means that the
+*>          factorization is not performed, the matrices A and B are not
+*>          modified, and the matrix A is itself the residual.
+*> \endverbatim
+*>
+*> \param[in] RELTOL
+*> \verbatim
+*>          RELTOL is DOUBLE PRECISION
+*>
+*>          The third factorization stopping criterion, cannot be NaN.
+*>
+*>          The tolerance (stopping threshold) for the ratio
+*>          abs(R(K+1,K+1))/abs(R(1,1)) of the maximum column 2-norm of
+*>          the residual matrix R22(K) to the maximum column 2-norm of
+*>          the original matrix A. The algorithm converges (stops the
+*>          factorization), when abs(R(K+1,K+1))/abs(R(1,1)) A is less
+*>          than or equal to RELTOL. Let EPS = DLAMCH('E').
+*>
+*>          a) If RELTOL is NaN, then no computation is performed
+*>                and an error message ( INFO = -6 ) is issued
+*>                by XERBLA.
+*>
+*>          b) If RELTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on KMAX and ABSTOL.
+*>                This includes the case RELTOL = -Inf.
+*>
+*>          c) If 0.0 <= RELTOL < EPS, then RELTOL = EPS is used.
+*>                This includes the case RELTOL = -0.0.
+*>
+*>          d) If EPS <= RELTOL then the input value of RELTOL
+*>                is used.
+*>
+*>          Let MAXC2NRM be the maximum column 2-norm of the
+*>          whole original matrix A.
+*>          If RELTOL chosen above is >= 1.0, then this stopping
+*>          criterion is satisfied on input and routine exits
+*>          immediately after MAXC2NRM is computed.
+*>          The routine returns MAXC2NRM in MAXC2NORMK,
+*>          and 1.0 in RELMAXC2NORMK.
+*>          This includes the case RELTOL = +Inf. This means that the
+*>          factorization is not performed, the matrices A and B are not
+*>          modified, and the matrix A is itself the residual.
+*>
+*>          NOTE: We recommend that RELTOL satisfy
+*>                min( max(M,N)*EPS, sqrt(EPS) ) <= RELTOL
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA,N+NRHS)
+*>
+*>          On entry:
+*>
+*>          a) The subarray A(1:M,1:N) contains the M-by-N matrix A.
+*>          b) The subarray A(1:M,N+1:N+NRHS) contains the M-by-NRHS
+*>             matrix B.
+*>
+*>                                  N     NRHS
+*>              array_A   =   M  [ mat_A, mat_B ]
+*>
+*>          On exit:
+*>
+*>          a) The subarray A(1:M,1:N) contains parts of the factors
+*>             of the matrix A:
+*>
+*>            1) If K = 0, A(1:M,1:N) contains the original matrix A.
+*>            2) If K > 0, A(1:M,1:N) contains parts of the
+*>            factors:
+*>
+*>              1. The elements below the diagonal of the subarray
+*>                 A(1:M,1:K) together with TAU(1:K) represent the
+*>                 orthogonal matrix Q(K) as a product of K Householder
+*>                 elementary reflectors.
+*>
+*>              2. The elements on and above the diagonal of
+*>                 the subarray A(1:K,1:N) contain K-by-N
+*>                 upper-trapezoidal matrix
+*>                 R(K)_approx = ( R11(K), R12(K) ).
+*>                 NOTE: If K=min(M,N), i.e. full rank factorization,
+*>                       then R_approx(K) is the full factor R which
+*>                       is upper-trapezoidal. If, in addition, M>=N,
+*>                       then R is upper-triangular.
+*>
+*>              3. The subarray A(K+1:M,K+1:N) contains (M-K)-by-(N-K)
+*>                 rectangular matrix R(K)_residual = R22(K).
+*>
+*>          b) If NRHS > 0, the subarray A(1:M,N+1:N+NRHS) contains
+*>             the M-by-NRHS product Q(K)**T * B.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*>          This is the leading dimension for both matrices, A and B.
+*> \endverbatim
+*>
+*> \param[out] K
+*> \verbatim
+*>          K is INTEGER
+*>          Factorization rank of the matrix A, i.e. the rank of
+*>          the factor R, which is the same as the number of non-zero
+*>          rows of the factor R. 0 <= K <= min(M,KMAX,N).
+*>
+*>          K also represents the number of non-zero Householder
+*>          vectors.
+*>
+*>          NOTE: If K = 0, a) the arrays A and B are not modified;
+*>                          b) the array TAU(1:min(M,N)) is set to ZERO,
+*>                             if the matrix A does not contain NaN,
+*>                             otherwise the elements TAU(1:min(M,N))
+*>                             are undefined;
+*>                          c) the elements of the array JPIV are set
+*>                             as follows: for j = 1:N, JPIV(j) = j.
+*> \endverbatim
+*>
+*> \param[out] MAXC2NRMK
+*> \verbatim
+*>          MAXC2NRMK is DOUBLE PRECISION
+*>          The maximum column 2-norm of the residual matrix R22(K),
+*>          when the factorization stopped at rank K. MAXC2NRMK >= 0.
+*>
+*>          a) If K = 0, i.e. the factorization was not performed,
+*>             the matrix A was not modified and is itself a residual
+*>             matrix, then MAXC2NRMK equals the maximum column 2-norm
+*>             of the original matrix A.
+*>
+*>          b) If 0 < K < min(M,N), then MAXC2NRMK is returned.
+*>
+*>          c) If K = min(M,N), i.e. the whole matrix A was
+*>             factorized and there is no residual matrix,
+*>             then MAXC2NRMK = 0.0.
+*>
+*>          NOTE: MAXC2NRMK in the factorization step K would equal
+*>                R(K+1,K+1) in the next factorization step K+1.
+*> \endverbatim
+*>
+*> \param[out] RELMAXC2NRMK
+*> \verbatim
+*>          RELMAXC2NRMK is DOUBLE PRECISION
+*>          The ratio MAXC2NRMK / MAXC2NRM of the maximum column
+*>          2-norm of the residual matrix R22(K) (when the factorization
+*>          stopped at rank K) to the maximum column 2-norm of the
+*>          whole original matrix A. RELMAXC2NRMK >= 0.
+*>
+*>          a) If K = 0, i.e. the factorization was not performed,
+*>             the matrix A was not modified and is itself a residual
+*>             matrix, then RELMAXC2NRMK = 1.0.
+*>
+*>          b) If 0 < K < min(M,N), then
+*>                RELMAXC2NRMK = MAXC2NRMK / MAXC2NRM is returned.
+*>
+*>          c) If K = min(M,N), i.e. the whole matrix A was
+*>             factorized and there is no residual matrix,
+*>             then RELMAXC2NRMK = 0.0.
+*>
+*>         NOTE: RELMAXC2NRMK in the factorization step K would equal
+*>               abs(R(K+1,K+1))/abs(R(1,1)) in the next factorization
+*>               step K+1.
+*> \endverbatim
+*>
+*> \param[out] JPIV
+*> \verbatim
+*>          JPIV is INTEGER array, dimension (N)
+*>          Column pivot indices. For 1 <= j <= N, column j
+*>          of the matrix A was interchanged with column JPIV(j).
+*>
+*>          The elements of the array JPIV(1:N) are always set
+*>          by the routine, for example, even  when no columns
+*>          were factorized, i.e. when K = 0, the elements are
+*>          set as JPIV(j) = j for j = 1:N.
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is DOUBLE PRECISION array, dimension (min(M,N))
+*>          The scalar factors of the elementary reflectors.
+*>
+*>          If 0 < K <= min(M,N), only the elements TAU(1:K) of
+*>          the array TAU are modified by the factorization.
+*>          After the factorization computed, if no NaN was found
+*>          during the factorization, the remaining elements
+*>          TAU(K+1:min(M,N)) are set to zero, otherwise the
+*>          elements TAU(K+1:min(M,N)) are not set and therefore
+*>          undefined.
+*>          ( If K = 0, all elements of TAU are set to zero, if
+*>          the matrix A does not contain NaN. )
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and
+*>          LWORK >= (3*N+NRHS-1), otherwise.
+*>          For optimal performance LWORK >= (2*N + NB*( N+NRHS+1 )),
+*>          where NB is the optimal block size for DGEQP3RK returned
+*>          by ILAENV. Minimal block size MINNB=2.
+*>
+*>          NOTE: The decision, whether to use unblocked BLAS 2
+*>          or blocked BLAS 3 code is based not only on the dimension
+*>          LWORK of the availbale workspace WORK, but also also on the
+*>          matrix A dimension N via crossover point NX returned
+*>          by ILAENV. (For N less than NX, unblocked code should be
+*>          used.)
+*>
+*>          If LWORK = -1, then a workspace query is assumed;
+*>          the routine only calculates the optimal size of the WORK
+*>          array, returns this value as the first entry of the WORK
+*>          array, and no error message related to LWORK is issued
+*>          by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (N-1).
+*>          Is a work array. ( IWORK is used to store indices
+*>          of "bad" columns for norm downdating in the residual
+*>          matrix in the blocked step auxiliary subroutine DLAQP3RK ).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          1) INFO = 0: successful exit.
+*>          2) INFO < 0: if INFO = -i, the i-th argument had an
+*>                       illegal value.
+*>          3) If INFO = j_1, where 1 <= j_1 <= N, then NaN was
+*>             detected and the routine stops the computation.
+*>             The j_1-th column of the matrix A or the j_1-th
+*>             element of array TAU contains the first occurrence
+*>             of NaN in the factorization step K+1 ( when K columns
+*>             have been factorized ).
+*>
+*>             On exit:
+*>             K                  is set to the number of
+*>                                   factorized columns without
+*>                                   exception.
+*>             MAXC2NRMK          is set to NaN.
+*>             RELMAXC2NRMK       is set to NaN.
+*>             TAU(K+1:min(M,N))  is not set and contains undefined
+*>                                   elements. If j_1=K+1, TAU(K+1)
+*>                                   may contain NaN.
+*>          4) If INFO = j_2, where N+1 <= j_2 <= 2*N, then no NaN
+*>             was detected, but +Inf (or -Inf) was detected and
+*>             the routine continues the computation until completion.
+*>             The (j_2-N)-th column of the matrix A contains the first
+*>             occurrence of +Inf (or -Inf) in the factorization
+*>             step K+1 ( when K columns have been factorized ).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup geqp3rk
+*
+*> \par Further Details:
+*  =====================
+*
+*> \verbatim
+*> DGEQP3RK is based on the same BLAS3 Householder QR factorization
+*> algorithm with column pivoting as in DGEQP3 routine which uses
+*> DLARFG routine to generate Householder reflectors
+*> for QR factorization.
+*>
+*> We can also write:
+*>
+*>   A = A_approx(K) + A_residual(K)
+*>
+*> The low rank approximation matrix A(K)_approx from
+*> the truncated QR factorization of rank K of the matrix A is:
+*>
+*>   A(K)_approx = Q(K) * ( R(K)_approx ) * P(K)**T
+*>                        (     0     0 )
+*>
+*>               = Q(K) * ( R11(K) R12(K) ) * P(K)**T
+*>                        (      0      0 )
+*>
+*> The residual A_residual(K) of the matrix A is:
+*>
+*>   A_residual(K) = Q(K) * ( 0              0 ) * P(K)**T =
+*>                          ( 0  R(K)_residual )
+*>
+*>                 = Q(K) * ( 0        0 ) * P(K)**T
+*>                          ( 0   R22(K) )
+*>
+*> The truncated (rank K) factorization guarantees that
+*> the maximum column 2-norm of A_residual(K) is less than
+*> or equal to MAXC2NRMK up to roundoff error.
+*>
+*> NOTE: An approximation of the null vectors
+*>       of A can be easily computed from R11(K)
+*>       and R12(K):
+*>
+*>       Null( A(K) )_approx = P * ( inv(R11(K)) * R12(K) )
+*>                                 (         -I           )
+*>
+*> \endverbatim
+*
+*> \par References:
+*  ================
+*> [1] A Level 3 BLAS QR factorization algorithm with column pivoting developed in 1996.
+*> G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain.
+*> X. Sun, Computer Science Dept., Duke University, USA.
+*> C. H. Bischof, Math. and Comp. Sci. Div., Argonne National Lab, USA.
+*> A BLAS-3 version of the QR factorization with column pivoting.
+*> LAPACK Working Note 114
+*> <a href="https://www.netlib.org/lapack/lawnspdf/lawn114.pdf">https://www.netlib.org/lapack/lawnspdf/lawn114.pdf</a>
+*> and in
+*> SIAM J. Sci. Comput., 19(5):1486-1494, Sept. 1998.
+*> <a href="https://doi.org/10.1137/S1064827595296732">https://doi.org/10.1137/S1064827595296732</a>
+*>
+*> [2] A partial column norm updating strategy developed in 2006.
+*> Z. Drmac and Z. Bujanovic, Dept. of Math., University of Zagreb, Croatia.
+*> On the failure of rank revealing QR factorization software – a case study.
+*> LAPACK Working Note 176.
+*> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">http://www.netlib.org/lapack/lawnspdf/lawn176.pdf</a>
+*> and in
+*> ACM Trans. Math. Softw. 35, 2, Article 12 (July 2008), 28 pages.
+*> <a href="https://doi.org/10.1145/1377612.1377616">https://doi.org/10.1145/1377612.1377616</a>
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
+*>
+*>  November  2023, Igor Kozachenko, James Demmel,
+*>                  EECS Department,
+*>                  University of California, Berkeley, USA.
+*>
+*> \endverbatim
+*
+*  =====================================================================
+      SUBROUTINE DGEQP3RK( M, N, NRHS, KMAX, ABSTOL, RELTOL, A, LDA,
+     $                     K, MAXC2NRMK, RELMAXC2NRMK, JPIV, TAU,
+     $                     WORK, LWORK, IWORK, INFO )
+      IMPLICIT NONE
+*
+*  -- LAPACK computational routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            INFO, K, KF, KMAX, LDA, LWORK, M, N, NRHS
+      DOUBLE PRECISION   ABSTOL,  MAXC2NRMK, RELMAXC2NRMK, RELTOL
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IWORK( * ), JPIV( * )
+      DOUBLE PRECISION   A( LDA, * ), TAU( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      INTEGER            INB, INBMIN, IXOVER
+      PARAMETER          ( INB = 1, INBMIN = 2, IXOVER = 3 )
+      DOUBLE PRECISION   ZERO, ONE, TWO
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0, TWO = 2.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY, DONE
+      INTEGER            IINFO, IOFFSET, IWS, J, JB, JBF, JMAXB, JMAX,
+     $                   JMAXC2NRM, KP1, LWKOPT, MINMN, N_SUB, NB,
+     $                   NBMIN, NX
+      DOUBLE PRECISION   EPS, HUGEVAL, MAXC2NRM, SAFMIN
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DLAQP2RK, DLAQP3RK, XERBLA
+*     ..
+*     .. External Functions ..
+      LOGICAL            DISNAN
+      INTEGER            IDAMAX, ILAENV
+      DOUBLE PRECISION   DLAMCH, DNRM2
+      EXTERNAL           DISNAN, DLAMCH, DNRM2, IDAMAX, ILAENV
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DBLE, MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Test input arguments
+*     ====================
+*
+      INFO = 0
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( KMAX.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( DISNAN( ABSTOL ) ) THEN
+         INFO = -5
+      ELSE IF( DISNAN( RELTOL ) ) THEN
+         INFO = -6
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -8
+      END IF
+*
+*     If the input parameters M, N, NRHS, KMAX, LDA are valid:
+*       a) Test the input workspace size LWORK for the minimum
+*          size requirement IWS.
+*       b) Determine the optimal block size NB and optimal
+*          workspace size LWKOPT to be returned in WORK(1)
+*          in case of (1) LWORK < IWS, (2) LQUERY = .TRUE.,
+*          (3) when routine exits.
+*     Here, IWS is the miminum workspace required for unblocked
+*     code.
+*
+      IF( INFO.EQ.0 ) THEN
+         MINMN = MIN( M, N )
+         IF( MINMN.EQ.0 ) THEN
+            IWS = 1
+            LWKOPT = 1
+         ELSE
+*
+*           Minimal workspace size in case of using only unblocked
+*           BLAS 2 code in DLAQP2RK.
+*           1) DGEQP3RK and DLAQP2RK: 2*N to store full and partial
+*              column 2-norms.
+*           2) DLAQP2RK: N+NRHS-1 to use in WORK array that is used
+*              in DLARF1F subroutine inside DLAQP2RK to apply an
+*              elementary reflector from the left.
+*           TOTAL_WORK_SIZE = 3*N + NRHS - 1
+*
+            IWS = 3*N + NRHS - 1
+*
+*           Assign to NB optimal block size.
+*
+            NB = ILAENV( INB, 'DGEQP3RK', ' ', M, N, -1, -1 )
+*
+*           A formula for the optimal workspace size in case of using
+*           both unblocked BLAS 2 in DLAQP2RK and blocked BLAS 3 code
+*           in DLAQP3RK.
+*           1) DGEQP3RK, DLAQP2RK, DLAQP3RK: 2*N to store full and
+*              partial column 2-norms.
+*           2) DLAQP2RK: N+NRHS-1 to use in WORK array that is used
+*              in DLARF1F subroutine to apply an elementary reflector
+*              from the left.
+*           3) DLAQP3RK: NB*(N+NRHS) to use in the work array F that
+*              is used to apply a block reflector from
+*              the left.
+*           4) DLAQP3RK: NB to use in the auxilixary array AUX.
+*           Sizes (2) and ((3) + (4)) should intersect, therefore
+*           TOTAL_WORK_SIZE = 2*N + NB*( N+NRHS+1 ), given NBMIN=2.
+*
+            LWKOPT = 2*N + NB*( N+NRHS+1 )
+         END IF
+         WORK( 1 ) = DBLE( LWKOPT )
+*
+         IF( ( LWORK.LT.IWS ) .AND. .NOT.LQUERY ) THEN
+            INFO = -15
+         END IF
+      END IF
+*
+*      NOTE: The optimal workspace size is returned in WORK(1), if
+*            the input parameters M, N, NRHS, KMAX, LDA are valid.
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'DGEQP3RK', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible for M=0 or N=0.
+*
+      IF( MINMN.EQ.0 ) THEN
+         K = 0
+         MAXC2NRMK = ZERO
+         RELMAXC2NRMK = ZERO
+         WORK( 1 ) = DBLE( LWKOPT )
+         RETURN
+      END IF
+*
+*     ==================================================================
+*
+*     Initialize column pivot array JPIV.
+*
+      DO J = 1, N
+         JPIV( J ) = J
+      END DO
+*
+*     ==================================================================
+*
+*     Initialize storage for partial and exact column 2-norms.
+*     a) The elements WORK(1:N) are used to store partial column
+*        2-norms of the matrix A, and may decrease in each computation
+*        step; initialize to the values of complete columns 2-norms.
+*     b) The elements WORK(N+1:2*N) are used to store complete column
+*        2-norms of the matrix A, they are not changed during the
+*        computation; initialize the values of complete columns 2-norms.
+*
+      DO J = 1, N
+         WORK( J ) = DNRM2( M, A( 1, J ), 1 )
+         WORK( N+J ) = WORK( J )
+      END DO
+*
+*     ==================================================================
+*
+*     Compute the pivot column index and the maximum column 2-norm
+*     for the whole original matrix stored in A(1:M,1:N).
+*
+      KP1 = IDAMAX( N, WORK( 1 ), 1 )
+      MAXC2NRM = WORK( KP1 )
+*
+*     ==================================================================.
+*
+      IF( DISNAN( MAXC2NRM ) ) THEN
+*
+*        Check if the matrix A contains NaN, set INFO parameter
+*        to the column number where the first NaN is found and return
+*        from the routine.
+*
+         K = 0
+         INFO = KP1
+*
+*        Set MAXC2NRMK and  RELMAXC2NRMK to NaN.
+*
+         MAXC2NRMK = MAXC2NRM
+         RELMAXC2NRMK = MAXC2NRM
+*
+*        Array TAU is not set and contains undefined elements.
+*
+         WORK( 1 ) = DBLE( LWKOPT )
+         RETURN
+      END IF
+*
+*     ===================================================================
+*
+      IF( MAXC2NRM.EQ.ZERO ) THEN
+*
+*        Check is the matrix A is a zero matrix, set array TAU and
+*        return from the routine.
+*
+         K = 0
+         MAXC2NRMK = ZERO
+         RELMAXC2NRMK = ZERO
+*
+         DO J = 1, MINMN
+            TAU( J ) = ZERO
+         END DO
+*
+         WORK( 1 ) = DBLE( LWKOPT )
+         RETURN
+*
+      END IF
+*
+*     ===================================================================
+*
+      HUGEVAL = DLAMCH( 'Overflow' )
+*
+      IF( MAXC2NRM.GT.HUGEVAL ) THEN
+*
+*        Check if the matrix A contains +Inf or -Inf, set INFO parameter
+*        to the column number, where the first +/-Inf  is found plus N,
+*        and continue the computation.
+*
+         INFO = N + KP1
+*
+      END IF
+*
+*     ==================================================================
+*
+*     Quick return if possible for the case when the first
+*     stopping criterion is satisfied, i.e. KMAX = 0.
+*
+      IF( KMAX.EQ.0 ) THEN
+         K = 0
+         MAXC2NRMK = MAXC2NRM
+         RELMAXC2NRMK = ONE
+         DO J = 1, MINMN
+            TAU( J ) = ZERO
+         END DO
+         WORK( 1 ) = DBLE( LWKOPT )
+         RETURN
+      END IF
+*
+*     ==================================================================
+*
+      EPS = DLAMCH('Epsilon')
+*
+*     Adjust ABSTOL
+*
+      IF( ABSTOL.GE.ZERO ) THEN
+         SAFMIN = DLAMCH('Safe minimum')
+         ABSTOL = MAX( ABSTOL, TWO*SAFMIN )
+      END IF
+*
+*     Adjust RELTOL
+*
+      IF( RELTOL.GE.ZERO ) THEN
+         RELTOL = MAX( RELTOL, EPS )
+      END IF
+*
+*     ===================================================================
+*
+*     JMAX is the maximum index of the column to be factorized,
+*     which is also limited by the first stopping criterion KMAX.
+*
+      JMAX = MIN( KMAX, MINMN )
+*
+*     ===================================================================
+*
+*     Quick return if possible for the case when the second or third
+*     stopping criterion for the whole original matrix is satified,
+*     i.e. MAXC2NRM <= ABSTOL or RELMAXC2NRM <= RELTOL
+*     (which is ONE <= RELTOL).
+*
+      IF( MAXC2NRM.LE.ABSTOL .OR. ONE.LE.RELTOL ) THEN
+*
+         K = 0
+         MAXC2NRMK = MAXC2NRM
+         RELMAXC2NRMK = ONE
+*
+         DO J = 1, MINMN
+            TAU( J ) = ZERO
+         END DO
+*
+         WORK( 1 ) = DBLE( LWKOPT )
+         RETURN
+      END IF
+*
+*     ==================================================================
+*     Factorize columns
+*     ==================================================================
+*
+*     Determine the block size.
+*
+      NBMIN = 2
+      NX = 0
+*
+      IF( ( NB.GT.1 ) .AND. ( NB.LT.MINMN ) ) THEN
+*
+*        Determine when to cross over from blocked to unblocked code.
+*        (for N less than NX, unblocked code should be used).
+*
+         NX = MAX( 0, ILAENV( IXOVER, 'DGEQP3RK', ' ', M, N, -1,
+     $                        -1 ))
+*
+         IF( NX.LT.MINMN ) THEN
+*
+*           Determine if workspace is large enough for blocked code.
+*
+            IF( LWORK.LT.LWKOPT ) THEN
+*
+*              Not enough workspace to use optimal block size that
+*              is currently stored in NB.
+*              Reduce NB and determine the minimum value of NB.
+*
+               NB = ( LWORK-2*N ) / ( N+1 )
+               NBMIN = MAX( 2, ILAENV( INBMIN, 'DGEQP3RK', ' ', M, N,
+     $                 -1, -1 ) )
+*
+            END IF
+         END IF
+      END IF
+*
+*     ==================================================================
+*
+*     DONE is the boolean flag to rerpresent the case when the
+*     factorization completed in the block factorization routine,
+*     before the end of the block.
+*
+      DONE = .FALSE.
+*
+*     J is the column index.
+*
+      J = 1
+*
+*     (1) Use blocked code initially.
+*
+*     JMAXB is the maximum column index of the block, when the
+*     blocked code is used, is also limited by the first stopping
+*     criterion KMAX.
+*
+      JMAXB = MIN( KMAX, MINMN - NX )
+*
+      IF( NB.GE.NBMIN .AND. NB.LT.JMAX .AND. JMAXB.GT.0 ) THEN
+*
+*        Loop over the column blocks of the matrix A(1:M,1:JMAXB). Here:
+*        J   is the column index of a column block;
+*        JB  is the column block size to pass to block factorization
+*            routine in a loop step;
+*        JBF is the number of columns that were actually factorized
+*            that was returned by the block factorization routine
+*            in a loop step, JBF <= JB;
+*        N_SUB is the number of columns in the submatrix;
+*        IOFFSET is the number of rows that should not be factorized.
+*
+         DO WHILE( J.LE.JMAXB )
+*
+            JB = MIN( NB, JMAXB-J+1 )
+            N_SUB = N-J+1
+            IOFFSET = J-1
+*
+*           Factorize JB columns among the columns A(J:N).
+*
+            CALL DLAQP3RK( M, N_SUB, NRHS, IOFFSET, JB, ABSTOL,
+     $                     RELTOL, KP1, MAXC2NRM, A( 1, J ), LDA,
+     $                     DONE, JBF, MAXC2NRMK, RELMAXC2NRMK,
+     $                     JPIV( J ), TAU( J ),
+     $                     WORK( J ), WORK( N+J ),
+     $                     WORK( 2*N+1 ), WORK( 2*N+JB+1 ),
+     $                     N+NRHS-J+1, IWORK, IINFO )
+*
+*           Set INFO on the first occurence of Inf.
+*
+            IF( IINFO.GT.N_SUB .AND. INFO.EQ.0 ) THEN
+               INFO = 2*IOFFSET + IINFO
+            END IF
+*
+            IF( DONE ) THEN
+*
+*              Either the submatrix is zero before the end of the
+*              column block, or ABSTOL or RELTOL criterion is
+*              satisfied before the end of the column block, we can
+*              return from the routine. Perform the following before
+*              returning:
+*                a) Set the number of factorized columns K,
+*                   K = IOFFSET + JBF from the last call of blocked
+*                   routine.
+*                NOTE: 1) MAXC2NRMK and RELMAXC2NRMK are returned
+*                         by the block factorization routine;
+*                      2) The remaining TAUs are set to ZERO by the
+*                         block factorization routine.
+*
+               K = IOFFSET + JBF
+*
+*              Set INFO on the first occurrence of NaN, NaN takes
+*              prcedence over Inf.
+*
+               IF( IINFO.LE.N_SUB .AND. IINFO.GT.0 ) THEN
+                  INFO = IOFFSET + IINFO
+               END IF
+*
+*              Return from the routine.
+*
+               WORK( 1 ) = DBLE( LWKOPT )
+*
+               RETURN
+*
+            END IF
+*
+            J = J + JBF
+*
+         END DO
+*
+      END IF
+*
+*     Use unblocked code to factor the last or only block.
+*     J = JMAX+1 means we factorized the maximum possible number of
+*     columns, that is in ELSE clause we need to compute
+*     the MAXC2NORM and RELMAXC2NORM to return after we processed
+*     the blocks.
+*
+      IF( J.LE.JMAX ) THEN
+*
+*        N_SUB is the number of columns in the submatrix;
+*        IOFFSET is the number of rows that should not be factorized.
+*
+         N_SUB = N-J+1
+         IOFFSET = J-1
+*
+         CALL DLAQP2RK( M, N_SUB, NRHS, IOFFSET, JMAX-J+1,
+     $                  ABSTOL, RELTOL, KP1, MAXC2NRM, A( 1, J ), LDA,
+     $                  KF, MAXC2NRMK, RELMAXC2NRMK, JPIV( J ),
+     $                  TAU( J ), WORK( J ), WORK( N+J ),
+     $                  WORK( 2*N+1 ), IINFO )
+*
+*        ABSTOL or RELTOL criterion is satisfied when the number of
+*        the factorized columns KF is smaller then the  number
+*        of columns JMAX-J+1 supplied to be factorized by the
+*        unblocked routine, we can return from
+*        the routine. Perform the following before returning:
+*           a) Set the number of factorized columns K,
+*           b) MAXC2NRMK and RELMAXC2NRMK are returned by the
+*              unblocked factorization routine above.
+*
+         K = J - 1 + KF
+*
+*        Set INFO on the first exception occurence.
+*
+*        Set INFO on the first exception occurence of Inf or NaN,
+*        (NaN takes precedence over Inf).
+*
+         IF( IINFO.GT.N_SUB .AND. INFO.EQ.0 ) THEN
+            INFO = 2*IOFFSET + IINFO
+         ELSE IF( IINFO.LE.N_SUB .AND. IINFO.GT.0 ) THEN
+            INFO = IOFFSET + IINFO
+         END IF
+*
+      ELSE
+*
+*        Compute the return values for blocked code.
+*
+*        Set the number of factorized columns if the unblocked routine
+*        was not called.
+*
+            K = JMAX
+*
+*        If there exits a residual matrix after the blocked code:
+*           1) compute the values of MAXC2NRMK, RELMAXC2NRMK of the
+*              residual matrix, otherwise set them to ZERO;
+*           2) Set TAU(K+1:MINMN) to ZERO.
+*
+         IF( K.LT.MINMN ) THEN
+            JMAXC2NRM = K + IDAMAX( N-K, WORK( K+1 ), 1 )
+            MAXC2NRMK = WORK( JMAXC2NRM )
+            IF( K.EQ.0 ) THEN
+               RELMAXC2NRMK = ONE
+            ELSE
+               RELMAXC2NRMK = MAXC2NRMK / MAXC2NRM
+            END IF
+*
+            DO J = K + 1, MINMN
+               TAU( J ) = ZERO
+            END DO
+*
+         END IF
+*
+*     END IF( J.LE.JMAX ) THEN
+*
+      END IF
+*
+      WORK( 1 ) = DBLE( LWKOPT )
+*
+      RETURN
+*
+*     End of DGEQP3RK
+*
+      END
diff --git a/SRC/dgeqr.f b/SRC/dgeqr.f
index eac8930ce0..fe657da3c0 100644
--- a/SRC/dgeqr.f
+++ b/SRC/dgeqr.f
@@ -99,7 +99,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1 or -2, then a workspace query is assumed. The routine
 *>          only calculates the sizes of the T and WORK arrays, returns these
 *>          values as the first entries of the T and WORK arrays, and no error
@@ -168,9 +168,12 @@
 *>
 *> \endverbatim
 *>
+*> \ingroup geqr
+*>
 *  =====================================================================
       SUBROUTINE DGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,7 +191,7 @@ SUBROUTINE DGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, LMINWS, MINT, MINW
-      INTEGER            MB, NB, MINTSZ, NBLCKS
+      INTEGER            MB, NB, MINTSZ, NBLCKS, LWMIN, LWREQ
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -244,8 +247,10 @@ SUBROUTINE DGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
 *
 *     Determine if the workspace size satisfies minimal size
 *
+      LWMIN = MAX( 1, N )
+      LWREQ = MAX( 1, N*NB )
       LMINWS = .FALSE.
-      IF( ( TSIZE.LT.MAX( 1, NB*N*NBLCKS + 5 ) .OR. LWORK.LT.NB*N )
+      IF( ( TSIZE.LT.MAX( 1, NB*N*NBLCKS + 5 ) .OR. LWORK.LT.LWREQ )
      $    .AND. ( LWORK.GE.N ) .AND. ( TSIZE.GE.MINTSZ )
      $    .AND. ( .NOT.LQUERY ) ) THEN
         IF( TSIZE.LT.MAX( 1, NB*N*NBLCKS + 5 ) ) THEN
@@ -253,7 +258,7 @@ SUBROUTINE DGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
           NB = 1
           MB = M
         END IF
-        IF( LWORK.LT.NB*N ) THEN
+        IF( LWORK.LT.LWREQ ) THEN
           LMINWS = .TRUE.
           NB = 1
         END IF
@@ -268,7 +273,7 @@ SUBROUTINE DGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
       ELSE IF( TSIZE.LT.MAX( 1, NB*N*NBLCKS + 5 )
      $   .AND. ( .NOT.LQUERY ) .AND. ( .NOT.LMINWS ) ) THEN
         INFO = -6
-      ELSE IF( ( LWORK.LT.MAX( 1, N*NB ) ) .AND. ( .NOT.LQUERY )
+      ELSE IF( ( LWORK.LT.LWREQ ) .AND. ( .NOT.LQUERY )
      $   .AND. ( .NOT.LMINWS ) ) THEN
         INFO = -8
       END IF
@@ -282,9 +287,9 @@ SUBROUTINE DGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
         T( 2 ) = MB
         T( 3 ) = NB
         IF( MINW ) THEN
-          WORK( 1 ) = MAX( 1, N )
+          WORK( 1 ) = LWMIN
         ELSE
-          WORK( 1 ) = MAX( 1, NB*N )
+          WORK( 1 ) = LWREQ
         END IF
       END IF
       IF( INFO.NE.0 ) THEN
@@ -309,7 +314,7 @@ SUBROUTINE DGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
      $                LWORK, INFO )
       END IF
 *
-      WORK( 1 ) = MAX( 1, NB*N )
+      WORK( 1 ) = LWREQ
 *
       RETURN
 *
diff --git a/SRC/dgeqr2.f b/SRC/dgeqr2.f
index 5791b3a915..94872f54e6 100644
--- a/SRC/dgeqr2.f
+++ b/SRC/dgeqr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEQR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeqr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeqr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -105,7 +103,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup geqr2
 *
 *> \par Further Details:
 *  =====================
@@ -127,6 +125,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGEQR2( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -147,10 +146,9 @@ SUBROUTINE DGEQR2( M, N, A, LDA, TAU, WORK, INFO )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      DOUBLE PRECISION   AII
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARF, DLARFG, XERBLA
+      EXTERNAL           DLARF1F, DLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -184,11 +182,8 @@ SUBROUTINE DGEQR2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *           Apply H(i) to A(i:m,i+1:n) from the left
 *
-            AII = A( I, I )
-            A( I, I ) = ONE
-            CALL DLARF( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
+            CALL DLARF1F( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
      $                  A( I, I+1 ), LDA, WORK )
-            A( I, I ) = AII
          END IF
    10 CONTINUE
       RETURN
diff --git a/SRC/dgeqr2p.f b/SRC/dgeqr2p.f
index c7b62d87d7..cce4d346ea 100644
--- a/SRC/dgeqr2p.f
+++ b/SRC/dgeqr2p.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEQR2P + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeqr2p.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeqr2p.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup geqr2p
 *
 *> \par Further Details:
 *  =====================
@@ -131,6 +129,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGEQR2P( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -151,10 +150,9 @@ SUBROUTINE DGEQR2P( M, N, A, LDA, TAU, WORK, INFO )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      DOUBLE PRECISION   AII
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARF, DLARFGP, XERBLA
+      EXTERNAL           DLARF1F, DLARFGP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -188,11 +186,8 @@ SUBROUTINE DGEQR2P( M, N, A, LDA, TAU, WORK, INFO )
 *
 *           Apply H(i) to A(i:m,i+1:n) from the left
 *
-            AII = A( I, I )
-            A( I, I ) = ONE
-            CALL DLARF( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
+            CALL DLARF1F( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
      $                  A( I, I+1 ), LDA, WORK )
-            A( I, I ) = AII
          END IF
    10 CONTINUE
       RETURN
diff --git a/SRC/dgeqrf.f b/SRC/dgeqrf.f
index 5d649f692e..0221e586f3 100644
--- a/SRC/dgeqrf.f
+++ b/SRC/dgeqrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEQRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeqrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeqrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,7 +93,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,N).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= N, otherwise.
 *>          For optimum performance LWORK >= N*NB, where NB is
 *>          the optimal blocksize.
 *>
@@ -120,7 +119,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup geqrf
 *
 *> \par Further Details:
 *  =====================
@@ -142,6 +141,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -175,10 +175,9 @@ SUBROUTINE DGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *     Test the input arguments
 *
+      K = MIN( M, N )
       INFO = 0
       NB = ILAENV( 1, 'DGEQRF', ' ', M, N, -1, -1 )
-      LWKOPT = N*NB
-      WORK( 1 ) = LWKOPT
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -186,19 +185,25 @@ SUBROUTINE DGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
-         INFO = -7
+      ELSE IF( .NOT.LQUERY ) THEN
+         IF( LWORK.LE.0 .OR. ( M.GT.0 .AND. LWORK.LT.MAX( 1, N ) ) )
+     $      INFO = -7
       END IF
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'DGEQRF', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
+         IF( K.EQ.0 ) THEN
+            LWKOPT = 1
+         ELSE
+            LWKOPT = N*NB
+         END IF
+         WORK( 1 ) = LWKOPT
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      K = MIN( M, N )
       IF( K.EQ.0 ) THEN
          WORK( 1 ) = 1
          RETURN
diff --git a/SRC/dgeqrfp.f b/SRC/dgeqrfp.f
index 46d2ee4794..90e8dd6861 100644
--- a/SRC/dgeqrfp.f
+++ b/SRC/dgeqrfp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEQRFP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeqrfp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeqrfp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,7 +95,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,N).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= N, otherwise.
 *>          For optimum performance LWORK >= N*NB, where NB is
 *>          the optimal blocksize.
 *>
@@ -122,7 +121,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup geqrfp
 *
 *> \par Further Details:
 *  =====================
@@ -146,6 +145,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -162,8 +162,8 @@ SUBROUTINE DGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *     .. Local Scalars ..
       LOGICAL            LQUERY
-      INTEGER            I, IB, IINFO, IWS, K, LDWORK, LWKOPT, NB,
-     $                   NBMIN, NX
+      INTEGER            I, IB, IINFO, IWS, K, LDWORK, LWKMIN, LWKOPT,
+     $                   NB, NBMIN, NX
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           DGEQR2P, DLARFB, DLARFT, XERBLA
@@ -181,8 +181,16 @@ SUBROUTINE DGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
       INFO = 0
       NB = ILAENV( 1, 'DGEQRF', ' ', M, N, -1, -1 )
-      LWKOPT = N*NB
+      K = MIN( M, N )
+      IF( K.EQ.0 ) THEN
+         LWKMIN = 1
+         LWKOPT = 1
+      ELSE
+         LWKMIN = N
+         LWKOPT = N*NB
+      END IF
       WORK( 1 ) = LWKOPT
+*
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -190,7 +198,7 @@ SUBROUTINE DGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -7
       END IF
       IF( INFO.NE.0 ) THEN
@@ -202,7 +210,6 @@ SUBROUTINE DGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *     Quick return if possible
 *
-      K = MIN( M, N )
       IF( K.EQ.0 ) THEN
          WORK( 1 ) = 1
          RETURN
@@ -210,7 +217,7 @@ SUBROUTINE DGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
       NBMIN = 2
       NX = 0
-      IWS = N
+      IWS = LWKMIN
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
 *
 *        Determine when to cross over from blocked to unblocked code.
diff --git a/SRC/dgeqrt.f b/SRC/dgeqrt.f
index 06dfb0576b..8a34eae385 100644
--- a/SRC/dgeqrt.f
+++ b/SRC/dgeqrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEQRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeqrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeqrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,7 +106,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup geqrt
 *
 *> \par Further Details:
 *  =====================
@@ -138,6 +136,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGEQRT( M, N, NB, A, LDA, T, LDT, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -195,9 +194,11 @@ SUBROUTINE DGEQRT( M, N, NB, A, LDA, T, LDT, WORK, INFO )
 *     Compute the QR factorization of the current block A(I:M,I:I+IB-1)
 *
          IF( USE_RECURSIVE_QR ) THEN
-            CALL DGEQRT3( M-I+1, IB, A(I,I), LDA, T(1,I), LDT, IINFO )
+            CALL DGEQRT3( M-I+1, IB, A(I,I), LDA, T(1,I), LDT,
+     $                    IINFO )
          ELSE
-            CALL DGEQRT2( M-I+1, IB, A(I,I), LDA, T(1,I), LDT, IINFO )
+            CALL DGEQRT2( M-I+1, IB, A(I,I), LDA, T(1,I), LDT,
+     $                    IINFO )
          END IF
          IF( I+IB.LE.N ) THEN
 *
diff --git a/SRC/dgeqrt2.f b/SRC/dgeqrt2.f
index c422cf4979..04448810c1 100644
--- a/SRC/dgeqrt2.f
+++ b/SRC/dgeqrt2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEQRT2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeqrt2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeqrt2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,7 +95,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup geqrt2
 *
 *> \par Further Details:
 *  =====================
@@ -124,6 +122,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGEQRT2( M, N, A, LDA, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -154,10 +153,10 @@ SUBROUTINE DGEQRT2( M, N, A, LDA, T, LDT, INFO )
 *     Test the input arguments
 *
       INFO = 0
-      IF( M.LT.0 ) THEN
-         INFO = -1
-      ELSE IF( N.LT.0 ) THEN
+      IF( N.LT.0 ) THEN
          INFO = -2
+      ELSE IF( M.LT.N ) THEN
+         INFO = -1
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
       ELSE IF( LDT.LT.MAX( 1, N ) ) THEN
diff --git a/SRC/dgeqrt3.f b/SRC/dgeqrt3.f
index 1fbd868d7e..03cfbd2c31 100644
--- a/SRC/dgeqrt3.f
+++ b/SRC/dgeqrt3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGEQRT3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeqrt3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeqrt3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -100,7 +98,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup geqrt3
 *
 *> \par Further Details:
 *  =====================
@@ -129,6 +127,7 @@
 *>
 *  =====================================================================
       RECURSIVE SUBROUTINE DGEQRT3( M, N, A, LDA, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dgerfs.f b/SRC/dgerfs.f
index ea10d77f9d..5276d1b882 100644
--- a/SRC/dgerfs.f
+++ b/SRC/dgerfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGERFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgerfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgerfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -177,11 +175,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gerfs
 *
 *  =====================================================================
-      SUBROUTINE DGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
+      SUBROUTINE DGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
+     $                   LDB,
      $                   X, LDX, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -221,7 +221,8 @@ SUBROUTINE DGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DGEMV, DGETRS, DLACN2, XERBLA
+      EXTERNAL           DAXPY, DCOPY, DGEMV, DGETRS, DLACN2,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -392,14 +393,16 @@ SUBROUTINE DGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
 *
          KASE = 0
   100    CONTINUE
-         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
 *
 *              Multiply by diag(W)*inv(op(A)**T).
 *
-               CALL DGETRS( TRANST, N, 1, AF, LDAF, IPIV, WORK( N+1 ),
+               CALL DGETRS( TRANST, N, 1, AF, LDAF, IPIV,
+     $                      WORK( N+1 ),
      $                      N, INFO )
                DO 110 I = 1, N
                   WORK( N+I ) = WORK( I )*WORK( N+I )
@@ -411,7 +414,8 @@ SUBROUTINE DGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
                DO 120 I = 1, N
                   WORK( N+I ) = WORK( I )*WORK( N+I )
   120          CONTINUE
-               CALL DGETRS( TRANS, N, 1, AF, LDAF, IPIV, WORK( N+1 ), N,
+               CALL DGETRS( TRANS, N, 1, AF, LDAF, IPIV, WORK( N+1 ),
+     $                      N,
      $                      INFO )
             END IF
             GO TO 100
diff --git a/SRC/dgerfsx.f b/SRC/dgerfsx.f
index c4a898f629..0beeff12f2 100644
--- a/SRC/dgerfsx.f
+++ b/SRC/dgerfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGERFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgerfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgerfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -404,13 +402,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gerfsx
 *
 *  =====================================================================
-      SUBROUTINE DGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE DGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    R, C, B, LDB, X, LDX, RCOND, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -606,7 +606,8 @@ SUBROUTINE DGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
          NORM = '1'
       END IF
       ANORM = DLANGE( NORM, N, N, A, LDA, WORK )
-      CALL DGECON( NORM, N, AF, LDAF, ANORM, RCOND, WORK, IWORK, INFO )
+      CALL DGECON( NORM, N, AF, LDAF, ANORM, RCOND, WORK, IWORK,
+     $             INFO )
 *
 *     Perform refinement on each right-hand side
 *
@@ -631,19 +632,23 @@ SUBROUTINE DGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
          END IF
       END IF
 
-      ERR_LBND = MAX( 10.0D+0, SQRT( DBLE( N ) ) ) * DLAMCH( 'Epsilon' )
+      ERR_LBND = MAX( 10.0D+0,
+     $                SQRT( DBLE( N ) ) ) * DLAMCH( 'Epsilon' )
       IF ( N_ERR_BNDS .GE. 1 .AND. N_NORMS .GE. 1 ) THEN
 *
 *     Compute scaled normwise condition number cond(A*C).
 *
          IF ( COLEQU .AND. NOTRAN ) THEN
-            RCOND_TMP = DLA_GERCOND( TRANS, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = DLA_GERCOND( TRANS, N, A, LDA, AF, LDAF,
+     $                               IPIV,
      $           -1, C, INFO, WORK, IWORK )
          ELSE IF ( ROWEQU .AND. .NOT. NOTRAN ) THEN
-            RCOND_TMP = DLA_GERCOND( TRANS, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = DLA_GERCOND( TRANS, N, A, LDA, AF, LDAF,
+     $                               IPIV,
      $           -1, R, INFO, WORK, IWORK )
          ELSE
-            RCOND_TMP = DLA_GERCOND( TRANS, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = DLA_GERCOND( TRANS, N, A, LDA, AF, LDAF,
+     $                               IPIV,
      $           0, R, INFO, WORK, IWORK )
          END IF
          DO J = 1, NRHS
diff --git a/SRC/dgerq2.f b/SRC/dgerq2.f
index 97d33761da..23ff2d068c 100644
--- a/SRC/dgerq2.f
+++ b/SRC/dgerq2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGERQ2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgerq2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgerq2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,7 +96,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gerq2
 *
 *> \par Further Details:
 *  =====================
@@ -120,6 +118,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGERQ2( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -140,10 +139,9 @@ SUBROUTINE DGERQ2( M, N, A, LDA, TAU, WORK, INFO )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      DOUBLE PRECISION   AII
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARF, DLARFG, XERBLA
+      EXTERNAL           DLARF1L, DLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -177,11 +175,8 @@ SUBROUTINE DGERQ2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *        Apply H(i) to A(1:m-k+i-1,1:n-k+i) from the right
 *
-         AII = A( M-K+I, N-K+I )
-         A( M-K+I, N-K+I ) = ONE
-         CALL DLARF( 'Right', M-K+I-1, N-K+I, A( M-K+I, 1 ), LDA,
+         CALL DLARF1L( 'Right', M-K+I-1, N-K+I, A( M-K+I, 1 ), LDA,
      $               TAU( I ), A, LDA, WORK )
-         A( M-K+I, N-K+I ) = AII
    10 CONTINUE
       RETURN
 *
diff --git a/SRC/dgerqf.f b/SRC/dgerqf.f
index 6381a873af..a72a35b5b1 100644
--- a/SRC/dgerqf.f
+++ b/SRC/dgerqf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGERQF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgerqf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgerqf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,7 +86,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,M).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= M, otherwise.
 *>          For optimum performance LWORK >= M*NB, where NB is
 *>          the optimal blocksize.
 *>
@@ -113,7 +112,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gerqf
 *
 *> \par Further Details:
 *  =====================
@@ -135,6 +134,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DGERQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,8 +188,9 @@ SUBROUTINE DGERQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          END IF
          WORK( 1 ) = LWKOPT
 *
-         IF( LWORK.LT.MAX( 1, M ) .AND. .NOT.LQUERY ) THEN
-            INFO = -7
+         IF( .NOT.LQUERY ) THEN
+            IF( LWORK.LE.0 .OR. ( N.GT.0 .AND. LWORK.LT.MAX( 1, M ) ) )
+     $         INFO = -7
          END IF
       END IF
 *
@@ -246,7 +247,8 @@ SUBROUTINE DGERQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *           Compute the RQ factorization of the current block
 *           A(m-k+i:m-k+i+ib-1,1:n-k+i+ib-1)
 *
-            CALL DGERQ2( IB, N-K+I+IB-1, A( M-K+I, 1 ), LDA, TAU( I ),
+            CALL DGERQ2( IB, N-K+I+IB-1, A( M-K+I, 1 ), LDA,
+     $                   TAU( I ),
      $                   WORK, IINFO )
             IF( M-K+I.GT.1 ) THEN
 *
diff --git a/SRC/dgesc2.f b/SRC/dgesc2.f
index 813bdf625d..4f7afce743 100644
--- a/SRC/dgesc2.f
+++ b/SRC/dgesc2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGESC2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgesc2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgesc2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,7 +99,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEauxiliary
+*> \ingroup gesc2
 *
 *> \par Contributors:
 *  ==================
@@ -111,6 +109,7 @@
 *
 *  =====================================================================
       SUBROUTINE DGESC2( N, A, LDA, RHS, IPIV, JPIV, SCALE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -136,7 +135,7 @@ SUBROUTINE DGESC2( N, A, LDA, RHS, IPIV, JPIV, SCALE )
       DOUBLE PRECISION   BIGNUM, EPS, SMLNUM, TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLASWP, DSCAL, DLABAD
+      EXTERNAL           DLASWP, DSCAL
 *     ..
 *     .. External Functions ..
       INTEGER            IDAMAX
@@ -153,7 +152,6 @@ SUBROUTINE DGESC2( N, A, LDA, RHS, IPIV, JPIV, SCALE )
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Apply permutations IPIV to RHS
 *
diff --git a/SRC/dgesdd.f b/SRC/dgesdd.f
index 27a6c1f8c0..9b648dcf11 100644
--- a/SRC/dgesdd.f
+++ b/SRC/dgesdd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGESDD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgesdd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgesdd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -55,12 +53,6 @@
 *>
 *> Note that the routine returns VT = V**T, not V.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -205,7 +197,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEsing
+*> \ingroup gesdd
 *
 *> \par Contributors:
 *  ==================
@@ -260,7 +252,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
       DOUBLE PRECISION   DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DBDSDC, DGEBRD, DGELQF, DGEMM, DGEQRF, DLACPY,
+      EXTERNAL           DBDSDC, DGEBRD, DGELQF, DGEMM, DGEQRF,
+     $                   DLACPY,
      $                   DLASCL, DLASET, DORGBR, DORGLQ, DORGQR, DORMBR,
      $                   XERBLA
 *     ..
@@ -343,10 +336,12 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
      $                   IERR )
             LWORK_DORGBR_Q_NN = INT( DUM(1) )
 *
-            CALL DORGQR( M, M, N, DUM(1), M, DUM(1), DUM(1), -1, IERR )
+            CALL DORGQR( M, M, N, DUM(1), M, DUM(1), DUM(1), -1,
+     $                   IERR )
             LWORK_DORGQR_MM = INT( DUM(1) )
 *
-            CALL DORGQR( M, N, N, DUM(1), M, DUM(1), DUM(1), -1, IERR )
+            CALL DORGQR( M, N, N, DUM(1), M, DUM(1), DUM(1), -1,
+     $                   IERR )
             LWORK_DORGQR_MN = INT( DUM(1) )
 *
             CALL DORMBR( 'P', 'R', 'T', N, N, N, DUM(1), N,
@@ -465,13 +460,15 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
             CALL DGELQF( M, N, A, M, DUM(1), DUM(1), -1, IERR )
             LWORK_DGELQF_MN = INT( DUM(1) )
 *
-            CALL DORGLQ( N, N, M, DUM(1), N, DUM(1), DUM(1), -1, IERR )
+            CALL DORGLQ( N, N, M, DUM(1), N, DUM(1), DUM(1), -1,
+     $                   IERR )
             LWORK_DORGLQ_NN = INT( DUM(1) )
 *
             CALL DORGLQ( M, N, M, A, M, DUM(1), DUM(1), -1, IERR )
             LWORK_DORGLQ_MN = INT( DUM(1) )
 *
-            CALL DORGBR( 'P', M, M, M, A, N, DUM(1), DUM(1), -1, IERR )
+            CALL DORGBR( 'P', M, M, M, A, N, DUM(1), DUM(1), -1,
+     $                   IERR )
             LWORK_DORGBR_P_MM = INT( DUM(1) )
 *
             CALL DORMBR( 'P', 'R', 'T', M, M, M, DUM(1), M,
@@ -631,12 +628,14 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   N [tau] + N    [work]
 *              Workspace: prefer N [tau] + N*NB [work]
 *
-               CALL DGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL DGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
 *              Zero out below R
 *
-               CALL DLASET( 'L', N-1, N-1, ZERO, ZERO, A( 2, 1 ), LDA )
+               CALL DLASET( 'L', N-1, N-1, ZERO, ZERO, A( 2, 1 ),
+     $                      LDA )
                IE = 1
                ITAUQ = IE + N
                ITAUP = ITAUQ + N
@@ -646,7 +645,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   3*N [e, tauq, taup] + N      [work]
 *              Workspace: prefer 3*N [e, tauq, taup] + 2*N*NB [work]
 *
-               CALL DGEBRD( N, N, A, LDA, S, WORK( IE ), WORK( ITAUQ ),
+               CALL DGEBRD( N, N, A, LDA, S, WORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
      $                      IERR )
                NWORK = IE + N
@@ -654,7 +654,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Perform bidiagonal SVD, computing singular values only
 *              Workspace: need   N [e] + BDSPAC
 *
-               CALL DBDSDC( 'U', 'N', N, S, WORK( IE ), DUM, 1, DUM, 1,
+               CALL DBDSDC( 'U', 'N', N, S, WORK( IE ), DUM, 1, DUM,
+     $                      1,
      $                      DUM, IDUM, WORK( NWORK ), IWORK, INFO )
 *
             ELSE IF( WNTQO ) THEN
@@ -679,13 +680,15 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   N*N [R] + N [tau] + N    [work]
 *              Workspace: prefer N*N [R] + N [tau] + N*NB [work]
 *
-               CALL DGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL DGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
 *              Copy R to WORK(IR), zeroing out below it
 *
                CALL DLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
-               CALL DLASET( 'L', N - 1, N - 1, ZERO, ZERO, WORK(IR+1),
+               CALL DLASET( 'L', N - 1, N - 1, ZERO, ZERO,
+     $                      WORK(IR+1),
      $                      LDWRKR )
 *
 *              Generate Q in A
@@ -717,7 +720,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              singular vectors of bidiagonal matrix in VT
 *              Workspace: need   N*N [R] + 3*N [e, tauq, taup] + N*N [U] + BDSPAC
 *
-               CALL DBDSDC( 'U', 'I', N, S, WORK( IE ), WORK( IU ), N,
+               CALL DBDSDC( 'U', 'I', N, S, WORK( IE ), WORK( IU ),
+     $                      N,
      $                      VT, LDVT, DUM, IDUM, WORK( NWORK ), IWORK,
      $                      INFO )
 *
@@ -726,10 +730,12 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   N*N [R] + 3*N [e, tauq, taup] + N*N [U] + N    [work]
 *              Workspace: prefer N*N [R] + 3*N [e, tauq, taup] + N*N [U] + N*NB [work]
 *
-               CALL DORMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ), LDWRKR,
+               CALL DORMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ),
+     $                      LDWRKR,
      $                      WORK( ITAUQ ), WORK( IU ), N, WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
-               CALL DORMBR( 'P', 'R', 'T', N, N, N, WORK( IR ), LDWRKR,
+               CALL DORMBR( 'P', 'R', 'T', N, N, N, WORK( IR ),
+     $                      LDWRKR,
      $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
@@ -765,13 +771,15 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   N*N [R] + N [tau] + N    [work]
 *              Workspace: prefer N*N [R] + N [tau] + N*NB [work]
 *
-               CALL DGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL DGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
 *              Copy R to WORK(IR), zeroing out below it
 *
                CALL DLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
-               CALL DLASET( 'L', N - 1, N - 1, ZERO, ZERO, WORK(IR+1),
+               CALL DLASET( 'L', N - 1, N - 1, ZERO, ZERO,
+     $                      WORK(IR+1),
      $                      LDWRKR )
 *
 *              Generate Q in A
@@ -807,11 +815,13 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   N*N [R] + 3*N [e, tauq, taup] + N    [work]
 *              Workspace: prefer N*N [R] + 3*N [e, tauq, taup] + N*NB [work]
 *
-               CALL DORMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ), LDWRKR,
+               CALL DORMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ),
+     $                      LDWRKR,
      $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
-               CALL DORMBR( 'P', 'R', 'T', N, N, N, WORK( IR ), LDWRKR,
+               CALL DORMBR( 'P', 'R', 'T', N, N, N, WORK( IR ),
+     $                      LDWRKR,
      $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
@@ -820,7 +830,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   N*N [R]
 *
                CALL DLACPY( 'F', N, N, U, LDU, WORK( IR ), LDWRKR )
-               CALL DGEMM( 'N', 'N', M, N, N, ONE, A, LDA, WORK( IR ),
+               CALL DGEMM( 'N', 'N', M, N, N, ONE, A, LDA,
+     $                     WORK( IR ),
      $                     LDWRKR, ZERO, U, LDU )
 *
             ELSE IF( WNTQA ) THEN
@@ -841,7 +852,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   N*N [U] + N [tau] + N    [work]
 *              Workspace: prefer N*N [U] + N [tau] + N*NB [work]
 *
-               CALL DGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL DGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
                CALL DLACPY( 'L', M, N, A, LDA, U, LDU )
 *
@@ -853,7 +865,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
 *              Produce R in A, zeroing out other entries
 *
-               CALL DLASET( 'L', N-1, N-1, ZERO, ZERO, A( 2, 1 ), LDA )
+               CALL DLASET( 'L', N-1, N-1, ZERO, ZERO, A( 2, 1 ),
+     $                      LDA )
                IE = ITAU
                ITAUQ = IE + N
                ITAUP = ITAUQ + N
@@ -863,7 +876,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   N*N [U] + 3*N [e, tauq, taup] + N      [work]
 *              Workspace: prefer N*N [U] + 3*N [e, tauq, taup] + 2*N*NB [work]
 *
-               CALL DGEBRD( N, N, A, LDA, S, WORK( IE ), WORK( ITAUQ ),
+               CALL DGEBRD( N, N, A, LDA, S, WORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
      $                      IERR )
 *
@@ -872,7 +886,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              singular vectors of bidiagonal matrix in VT
 *              Workspace: need   N*N [U] + 3*N [e, tauq, taup] + BDSPAC
 *
-               CALL DBDSDC( 'U', 'I', N, S, WORK( IE ), WORK( IU ), N,
+               CALL DBDSDC( 'U', 'I', N, S, WORK( IE ), WORK( IU ),
+     $                      N,
      $                      VT, LDVT, DUM, IDUM, WORK( NWORK ), IWORK,
      $                      INFO )
 *
@@ -892,7 +907,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              WORK(IU), storing result in A
 *              Workspace: need   N*N [U]
 *
-               CALL DGEMM( 'N', 'N', M, N, N, ONE, U, LDU, WORK( IU ),
+               CALL DGEMM( 'N', 'N', M, N, N, ONE, U, LDU,
+     $                     WORK( IU ),
      $                     LDWRKU, ZERO, A, LDA )
 *
 *              Copy left singular vectors of A from A to U
@@ -926,7 +942,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Perform bidiagonal SVD, only computing singular values
 *              Workspace: need   3*N [e, tauq, taup] + BDSPAC
 *
-               CALL DBDSDC( 'U', 'N', N, S, WORK( IE ), DUM, 1, DUM, 1,
+               CALL DBDSDC( 'U', 'N', N, S, WORK( IE ), DUM, 1, DUM,
+     $                      1,
      $                      DUM, IDUM, WORK( NWORK ), IWORK, INFO )
             ELSE IF( WNTQO ) THEN
 *              Path 5o (M >= N, JOBZ='O')
@@ -985,7 +1002,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
 *                 Copy left singular vectors of A from WORK(IU) to A
 *
-                  CALL DLACPY( 'F', M, N, WORK( IU ), LDWRKU, A, LDA )
+                  CALL DLACPY( 'F', M, N, WORK( IU ), LDWRKU, A,
+     $                         LDA )
                ELSE
 *
 *                 Path 5o-slow
@@ -1004,7 +1022,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                   DO 20 I = 1, M, LDWRKR
                      CHUNK = MIN( M - I + 1, LDWRKR )
-                     CALL DGEMM( 'N', 'N', CHUNK, N, N, ONE, A( I, 1 ),
+                     CALL DGEMM( 'N', 'N', CHUNK, N, N, ONE, A( I,
+     $                           1 ),
      $                           LDA, WORK( IU ), LDWRKU, ZERO,
      $                           WORK( IR ), LDWRKR )
                      CALL DLACPY( 'F', CHUNK, N, WORK( IR ), LDWRKR,
@@ -1052,7 +1071,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Set the right corner of U to identity matrix
 *
                IF( M.GT.N ) THEN
-                  CALL DLASET( 'F', M - N, M - N, ZERO, ONE, U(N+1,N+1),
+                  CALL DLASET( 'F', M - N, M - N, ZERO, ONE, U(N+1,
+     $                         N+1),
      $                         LDU )
                END IF
 *
@@ -1091,12 +1111,14 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   M [tau] + M [work]
 *              Workspace: prefer M [tau] + M*NB [work]
 *
-               CALL DGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL DGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
 *              Zero out above L
 *
-               CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ), LDA )
+               CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ),
+     $                      LDA )
                IE = 1
                ITAUQ = IE + M
                ITAUP = ITAUQ + M
@@ -1106,7 +1128,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   3*M [e, tauq, taup] + M      [work]
 *              Workspace: prefer 3*M [e, tauq, taup] + 2*M*NB [work]
 *
-               CALL DGEBRD( M, M, A, LDA, S, WORK( IE ), WORK( ITAUQ ),
+               CALL DGEBRD( M, M, A, LDA, S, WORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
      $                      IERR )
                NWORK = IE + M
@@ -1114,7 +1137,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Perform bidiagonal SVD, computing singular values only
 *              Workspace: need   M [e] + BDSPAC
 *
-               CALL DBDSDC( 'U', 'N', M, S, WORK( IE ), DUM, 1, DUM, 1,
+               CALL DBDSDC( 'U', 'N', M, S, WORK( IE ), DUM, 1, DUM,
+     $                      1,
      $                      DUM, IDUM, WORK( NWORK ), IWORK, INFO )
 *
             ELSE IF( WNTQO ) THEN
@@ -1143,7 +1167,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   M*M [VT] + M*M [L] + M [tau] + M    [work]
 *              Workspace: prefer M*M [VT] + M*M [L] + M [tau] + M*NB [work]
 *
-               CALL DGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL DGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
 *              Copy L to WORK(IL), zeroing about above it
@@ -1185,10 +1210,12 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   M*M [VT] + M*M [L] + 3*M [e, tauq, taup] + M    [work]
 *              Workspace: prefer M*M [VT] + M*M [L] + 3*M [e, tauq, taup] + M*NB [work]
 *
-               CALL DORMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ), LDWRKL,
+               CALL DORMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ),
+     $                      LDWRKL,
      $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
-               CALL DORMBR( 'P', 'R', 'T', M, M, M, WORK( IL ), LDWRKL,
+               CALL DORMBR( 'P', 'R', 'T', M, M, M, WORK( IL ),
+     $                      LDWRKL,
      $                      WORK( ITAUP ), WORK( IVT ), M,
      $                      WORK( NWORK ), LWORK - NWORK + 1, IERR )
 *
@@ -1200,7 +1227,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                DO 30 I = 1, N, CHUNK
                   BLK = MIN( N - I + 1, CHUNK )
-                  CALL DGEMM( 'N', 'N', M, BLK, M, ONE, WORK( IVT ), M,
+                  CALL DGEMM( 'N', 'N', M, BLK, M, ONE, WORK( IVT ),
+     $                        M,
      $                        A( 1, I ), LDA, ZERO, WORK( IL ), LDWRKL )
                   CALL DLACPY( 'F', M, BLK, WORK( IL ), LDWRKL,
      $                         A( 1, I ), LDA )
@@ -1224,7 +1252,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   M*M [L] + M [tau] + M    [work]
 *              Workspace: prefer M*M [L] + M [tau] + M*NB [work]
 *
-               CALL DGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL DGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
 *              Copy L to WORK(IL), zeroing out above it
@@ -1266,10 +1295,12 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   M*M [L] + 3*M [e, tauq, taup] + M    [work]
 *              Workspace: prefer M*M [L] + 3*M [e, tauq, taup] + M*NB [work]
 *
-               CALL DORMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ), LDWRKL,
+               CALL DORMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ),
+     $                      LDWRKL,
      $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
-               CALL DORMBR( 'P', 'R', 'T', M, M, M, WORK( IL ), LDWRKL,
+               CALL DORMBR( 'P', 'R', 'T', M, M, M, WORK( IL ),
+     $                      LDWRKL,
      $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
@@ -1278,7 +1309,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   M*M [L]
 *
                CALL DLACPY( 'F', M, M, VT, LDVT, WORK( IL ), LDWRKL )
-               CALL DGEMM( 'N', 'N', M, N, M, ONE, WORK( IL ), LDWRKL,
+               CALL DGEMM( 'N', 'N', M, N, M, ONE, WORK( IL ),
+     $                     LDWRKL,
      $                     A, LDA, ZERO, VT, LDVT )
 *
             ELSE IF( WNTQA ) THEN
@@ -1299,7 +1331,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   M*M [VT] + M [tau] + M    [work]
 *              Workspace: prefer M*M [VT] + M [tau] + M*NB [work]
 *
-               CALL DGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL DGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
                CALL DLACPY( 'U', M, N, A, LDA, VT, LDVT )
 *
@@ -1312,7 +1345,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
 *              Produce L in A, zeroing out other entries
 *
-               CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ), LDA )
+               CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ),
+     $                      LDA )
                IE = ITAU
                ITAUQ = IE + M
                ITAUP = ITAUQ + M
@@ -1322,7 +1356,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   M*M [VT] + 3*M [e, tauq, taup] + M      [work]
 *              Workspace: prefer M*M [VT] + 3*M [e, tauq, taup] + 2*M*NB [work]
 *
-               CALL DGEBRD( M, M, A, LDA, S, WORK( IE ), WORK( ITAUQ ),
+               CALL DGEBRD( M, M, A, LDA, S, WORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
      $                      IERR )
 *
@@ -1351,7 +1386,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Q in VT, storing result in A
 *              Workspace: need   M*M [VT]
 *
-               CALL DGEMM( 'N', 'N', M, N, M, ONE, WORK( IVT ), LDWKVT,
+               CALL DGEMM( 'N', 'N', M, N, M, ONE, WORK( IVT ),
+     $                     LDWKVT,
      $                     VT, LDVT, ZERO, A, LDA )
 *
 *              Copy right singular vectors of A from A to VT
@@ -1385,7 +1421,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Perform bidiagonal SVD, only computing singular values
 *              Workspace: need   3*M [e, tauq, taup] + BDSPAC
 *
-               CALL DBDSDC( 'L', 'N', M, S, WORK( IE ), DUM, 1, DUM, 1,
+               CALL DBDSDC( 'L', 'N', M, S, WORK( IE ), DUM, 1, DUM,
+     $                      1,
      $                      DUM, IDUM, WORK( NWORK ), IWORK, INFO )
             ELSE IF( WNTQO ) THEN
 *              Path 5to (N > M, JOBZ='O')
@@ -1442,7 +1479,8 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
 *                 Copy right singular vectors of A from WORK(IVT) to A
 *
-                  CALL DLACPY( 'F', M, N, WORK( IVT ), LDWKVT, A, LDA )
+                  CALL DLACPY( 'F', M, N, WORK( IVT ), LDWKVT, A,
+     $                         LDA )
                ELSE
 *
 *                 Path 5to-slow
@@ -1461,10 +1499,12 @@ SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                   DO 40 I = 1, N, CHUNK
                      BLK = MIN( N - I + 1, CHUNK )
-                     CALL DGEMM( 'N', 'N', M, BLK, M, ONE, WORK( IVT ),
+                     CALL DGEMM( 'N', 'N', M, BLK, M, ONE,
+     $                           WORK( IVT ),
      $                           LDWKVT, A( 1, I ), LDA, ZERO,
      $                           WORK( IL ), M )
-                     CALL DLACPY( 'F', M, BLK, WORK( IL ), M, A( 1, I ),
+                     CALL DLACPY( 'F', M, BLK, WORK( IL ), M, A( 1,
+     $                            I ),
      $                            LDA )
    40             CONTINUE
                END IF
diff --git a/SRC/dgesv.f b/SRC/dgesv.f
index 3609c52f47..05fd3d7de8 100644
--- a/SRC/dgesv.f
+++ b/SRC/dgesv.f
@@ -1,3 +1,5 @@
+*> \addtogroup gesv
+*>
 *> \brief <b> DGESV computes the solution to system of linear equations A * X = B for GE matrices</b>
 *
 *  =========== DOCUMENTATION ===========
@@ -5,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGESV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgesv.f">
 *> [TGZ]</a>
@@ -13,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgesv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,10 +115,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEsolve
+*> \ingroup gesv
 *
 *  =====================================================================
       SUBROUTINE DGESV( N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dgesvd.f b/SRC/dgesvd.f
index 7cc8b35129..68d3f2698d 100644
--- a/SRC/dgesvd.f
+++ b/SRC/dgesvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGESVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgesvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgesvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -203,11 +201,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEsing
+*> \ingroup gesvd
 *
 *  =====================================================================
       SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
      $                   VT, LDVT, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -244,7 +243,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
       DOUBLE PRECISION   DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DBDSQR, DGEBRD, DGELQF, DGEMM, DGEQRF, DLACPY,
+      EXTERNAL           DBDSQR, DGEBRD, DGELQF, DGEMM, DGEQRF,
+     $                   DLACPY,
      $                   DLASCL, DLASET, DORGBR, DORGLQ, DORGQR, DORMBR,
      $                   XERBLA
 *     ..
@@ -474,7 +474,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
             CALL DGELQF( M, N, A, LDA, DUM(1), DUM(1), -1, IERR )
             LWORK_DGELQF = INT( DUM(1) )
 *           Compute space needed for DORGLQ
-            CALL DORGLQ( N, N, M, DUM(1), N, DUM(1), DUM(1), -1, IERR )
+            CALL DORGLQ( N, N, M, DUM(1), N, DUM(1), DUM(1), -1,
+     $                   IERR )
             LWORK_DORGLQ_N = INT( DUM(1) )
             CALL DORGLQ( M, N, M, A, LDA, DUM(1), DUM(1), -1, IERR )
             LWORK_DORGLQ_M = INT( DUM(1) )
@@ -684,7 +685,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *              Compute A=Q*R
 *              (Workspace: need 2*N, prefer N + N*NB)
 *
-               CALL DGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( IWORK ),
+               CALL DGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( IWORK ),
      $                      LWORK-IWORK+1, IERR )
 *
 *              Zero out below R
@@ -701,7 +703,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *              Bidiagonalize R in A
 *              (Workspace: need 4*N, prefer 3*N + 2*N*NB)
 *
-               CALL DGEBRD( N, N, A, LDA, S, WORK( IE ), WORK( ITAUQ ),
+               CALL DGEBRD( N, N, A, LDA, S, WORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( IWORK ), LWORK-IWORK+1,
      $                      IERR )
                NCVT = 0
@@ -720,7 +723,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *              singular vectors of A in A if desired
 *              (Workspace: need BDSPAC)
 *
-               CALL DBDSQR( 'U', N, NCVT, 0, 0, S, WORK( IE ), A, LDA,
+               CALL DBDSQR( 'U', N, NCVT, 0, 0, S, WORK( IE ), A,
+     $                      LDA,
      $                      DUM, 1, DUM, 1, WORK( IWORK ), INFO )
 *
 *              If right singular vectors desired in VT, copy them there
@@ -769,8 +773,10 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *
 *                 Copy R to WORK(IR) and zero out below it
 *
-                  CALL DLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
-                  CALL DLASET( 'L', N-1, N-1, ZERO, ZERO, WORK( IR+1 ),
+                  CALL DLACPY( 'U', N, N, A, LDA, WORK( IR ),
+     $                         LDWRKR )
+                  CALL DLASET( 'L', N-1, N-1, ZERO, ZERO,
+     $                         WORK( IR+1 ),
      $                         LDWRKR )
 *
 *                 Generate Q in A
@@ -786,7 +792,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                 Bidiagonalize R in WORK(IR)
 *                 (Workspace: need N*N + 4*N, prefer N*N + 3*N + 2*N*NB)
 *
-                  CALL DGEBRD( N, N, WORK( IR ), LDWRKR, S, WORK( IE ),
+                  CALL DGEBRD( N, N, WORK( IR ), LDWRKR, S,
+     $                         WORK( IE ),
      $                         WORK( ITAUQ ), WORK( ITAUP ),
      $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
@@ -802,7 +809,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                 singular vectors of R in WORK(IR)
 *                 (Workspace: need N*N + BDSPAC)
 *
-                  CALL DBDSQR( 'U', N, 0, N, 0, S, WORK( IE ), DUM, 1,
+                  CALL DBDSQR( 'U', N, 0, N, 0, S, WORK( IE ), DUM,
+     $                         1,
      $                         WORK( IR ), LDWRKR, DUM, 1,
      $                         WORK( IWORK ), INFO )
                   IU = IE + N
@@ -813,7 +821,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *
                   DO 10 I = 1, M, LDWRKU
                      CHUNK = MIN( M-I+1, LDWRKU )
-                     CALL DGEMM( 'N', 'N', CHUNK, N, N, ONE, A( I, 1 ),
+                     CALL DGEMM( 'N', 'N', CHUNK, N, N, ONE, A( I,
+     $                           1 ),
      $                           LDA, WORK( IR ), LDWRKR, ZERO,
      $                           WORK( IU ), LDWRKU )
                      CALL DLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
@@ -847,7 +856,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                 singular vectors of A in A
 *                 (Workspace: need BDSPAC)
 *
-                  CALL DBDSQR( 'U', N, 0, M, 0, S, WORK( IE ), DUM, 1,
+                  CALL DBDSQR( 'U', N, 0, M, 0, S, WORK( IE ), DUM,
+     $                         1,
      $                         A, LDA, DUM, 1, WORK( IWORK ), INFO )
 *
                END IF
@@ -914,7 +924,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
                   CALL DGEBRD( N, N, VT, LDVT, S, WORK( IE ),
      $                         WORK( ITAUQ ), WORK( ITAUP ),
      $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  CALL DLACPY( 'L', N, N, VT, LDVT, WORK( IR ), LDWRKR )
+                  CALL DLACPY( 'L', N, N, VT, LDVT, WORK( IR ),
+     $                         LDWRKR )
 *
 *                 Generate left vectors bidiagonalizing R in WORK(IR)
 *                 (Workspace: need N*N + 4*N, prefer N*N + 3*N + N*NB)
@@ -935,7 +946,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                 singular vectors of R in VT
 *                 (Workspace: need N*N + BDSPAC)
 *
-                  CALL DBDSQR( 'U', N, N, N, 0, S, WORK( IE ), VT, LDVT,
+                  CALL DBDSQR( 'U', N, N, N, 0, S, WORK( IE ), VT,
+     $                         LDVT,
      $                         WORK( IR ), LDWRKR, DUM, 1,
      $                         WORK( IWORK ), INFO )
                   IU = IE + N
@@ -946,7 +958,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *
                   DO 20 I = 1, M, LDWRKU
                      CHUNK = MIN( M-I+1, LDWRKU )
-                     CALL DGEMM( 'N', 'N', CHUNK, N, N, ONE, A( I, 1 ),
+                     CALL DGEMM( 'N', 'N', CHUNK, N, N, ONE, A( I,
+     $                           1 ),
      $                           LDA, WORK( IR ), LDWRKR, ZERO,
      $                           WORK( IU ), LDWRKU )
                      CALL DLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
@@ -1009,7 +1022,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                 singular vectors of A in VT
 *                 (Workspace: need BDSPAC)
 *
-                  CALL DBDSQR( 'U', N, N, M, 0, S, WORK( IE ), VT, LDVT,
+                  CALL DBDSQR( 'U', N, N, M, 0, S, WORK( IE ), VT,
+     $                         LDVT,
      $                         A, LDA, DUM, 1, WORK( IWORK ), INFO )
 *
                END IF
@@ -1084,7 +1098,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    singular vectors of R in WORK(IR)
 *                    (Workspace: need N*N + BDSPAC)
 *
-                     CALL DBDSQR( 'U', N, 0, N, 0, S, WORK( IE ), DUM,
+                     CALL DBDSQR( 'U', N, 0, N, 0, S, WORK( IE ),
+     $                            DUM,
      $                            1, WORK( IR ), LDWRKR, DUM, 1,
      $                            WORK( IWORK ), INFO )
 *
@@ -1145,7 +1160,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    singular vectors of A in U
 *                    (Workspace: need BDSPAC)
 *
-                     CALL DBDSQR( 'U', N, 0, M, 0, S, WORK( IE ), DUM,
+                     CALL DBDSQR( 'U', N, 0, M, 0, S, WORK( IE ),
+     $                            DUM,
      $                            1, U, LDU, DUM, 1, WORK( IWORK ),
      $                            INFO )
 *
@@ -1308,7 +1324,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    Generate right vectors bidiagonalizing R in A
 *                    (Workspace: need 4*N-1, prefer 3*N + (N-1)*NB)
 *
-                     CALL DORGBR( 'P', N, N, N, A, LDA, WORK( ITAUP ),
+                     CALL DORGBR( 'P', N, N, N, A, LDA,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + N
 *
@@ -1393,7 +1410,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (Workspace: need N*N + 4*N-1,
 *                                prefer N*N+3*N+(N-1)*NB)
 *
-                     CALL DORGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+                     CALL DORGBR( 'P', N, N, N, VT, LDVT,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + N
 *
@@ -1462,7 +1480,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    Generate right bidiagonalizing vectors in VT
 *                    (Workspace: need 4*N-1, prefer 3*N + (N-1)*NB)
 *
-                     CALL DORGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+                     CALL DORGBR( 'P', N, N, N, VT, LDVT,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + N
 *
@@ -1550,7 +1569,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    singular vectors of R in WORK(IR)
 *                    (Workspace: need N*N + BDSPAC)
 *
-                     CALL DBDSQR( 'U', N, 0, N, 0, S, WORK( IE ), DUM,
+                     CALL DBDSQR( 'U', N, 0, N, 0, S, WORK( IE ),
+     $                            DUM,
      $                            1, WORK( IR ), LDWRKR, DUM, 1,
      $                            WORK( IWORK ), INFO )
 *
@@ -1616,7 +1636,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    singular vectors of A in U
 *                    (Workspace: need BDSPAC)
 *
-                     CALL DBDSQR( 'U', N, 0, M, 0, S, WORK( IE ), DUM,
+                     CALL DBDSQR( 'U', N, 0, M, 0, S, WORK( IE ),
+     $                            DUM,
      $                            1, U, LDU, DUM, 1, WORK( IWORK ),
      $                            INFO )
 *
@@ -1784,7 +1805,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    Generate right bidiagonalizing vectors in A
 *                    (Workspace: need 4*N-1, prefer 3*N + (N-1)*NB)
 *
-                     CALL DORGBR( 'P', N, N, N, A, LDA, WORK( ITAUP ),
+                     CALL DORGBR( 'P', N, N, N, A, LDA,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + N
 *
@@ -1870,7 +1892,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (Workspace: need N*N + 4*N-1,
 *                                prefer N*N+3*N+(N-1)*NB)
 *
-                     CALL DORGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+                     CALL DORGBR( 'P', N, N, N, VT, LDVT,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + N
 *
@@ -1943,7 +1966,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    Generate right bidiagonalizing vectors in VT
 *                    (Workspace: need 4*N-1, prefer 3*N + (N-1)*NB)
 *
-                     CALL DORGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+                     CALL DORGBR( 'P', N, N, N, VT, LDVT,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + N
 *
@@ -2047,7 +2071,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *              vectors in A
 *              (Workspace: need BDSPAC)
 *
-               CALL DBDSQR( 'U', N, NCVT, NRU, 0, S, WORK( IE ), A, LDA,
+               CALL DBDSQR( 'U', N, NCVT, NRU, 0, S, WORK( IE ), A,
+     $                      LDA,
      $                      U, LDU, DUM, 1, WORK( IWORK ), INFO )
             ELSE
 *
@@ -2081,12 +2106,14 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *              Compute A=L*Q
 *              (Workspace: need 2*M, prefer M + M*NB)
 *
-               CALL DGELQF( M, N, A, LDA, WORK( ITAU ), WORK( IWORK ),
+               CALL DGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( IWORK ),
      $                      LWORK-IWORK+1, IERR )
 *
 *              Zero out above L
 *
-               CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ), LDA )
+               CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ),
+     $                      LDA )
                IE = 1
                ITAUQ = IE + M
                ITAUP = ITAUQ + M
@@ -2095,7 +2122,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *              Bidiagonalize L in A
 *              (Workspace: need 4*M, prefer 3*M + 2*M*NB)
 *
-               CALL DGEBRD( M, M, A, LDA, S, WORK( IE ), WORK( ITAUQ ),
+               CALL DGEBRD( M, M, A, LDA, S, WORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( IWORK ), LWORK-IWORK+1,
      $                      IERR )
                IF( WNTUO .OR. WNTUAS ) THEN
@@ -2115,7 +2143,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *              vectors of A in A if desired
 *              (Workspace: need BDSPAC)
 *
-               CALL DBDSQR( 'U', M, 0, NRU, 0, S, WORK( IE ), DUM, 1, A,
+               CALL DBDSQR( 'U', M, 0, NRU, 0, S, WORK( IE ), DUM, 1,
+     $                      A,
      $                      LDA, DUM, 1, WORK( IWORK ), INFO )
 *
 *              If left singular vectors desired in U, copy them there
@@ -2167,7 +2196,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *
 *                 Copy L to WORK(IR) and zero out above it
 *
-                  CALL DLACPY( 'L', M, M, A, LDA, WORK( IR ), LDWRKR )
+                  CALL DLACPY( 'L', M, M, A, LDA, WORK( IR ),
+     $                         LDWRKR )
                   CALL DLASET( 'U', M-1, M-1, ZERO, ZERO,
      $                         WORK( IR+LDWRKR ), LDWRKR )
 *
@@ -2184,7 +2214,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                 Bidiagonalize L in WORK(IR)
 *                 (Workspace: need M*M + 4*M, prefer M*M + 3*M + 2*M*NB)
 *
-                  CALL DGEBRD( M, M, WORK( IR ), LDWRKR, S, WORK( IE ),
+                  CALL DGEBRD( M, M, WORK( IR ), LDWRKR, S,
+     $                         WORK( IE ),
      $                         WORK( ITAUQ ), WORK( ITAUP ),
      $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
@@ -2211,7 +2242,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *
                   DO 30 I = 1, N, CHUNK
                      BLK = MIN( N-I+1, CHUNK )
-                     CALL DGEMM( 'N', 'N', M, BLK, M, ONE, WORK( IR ),
+                     CALL DGEMM( 'N', 'N', M, BLK, M, ONE,
+     $                           WORK( IR ),
      $                           LDWRKR, A( 1, I ), LDA, ZERO,
      $                           WORK( IU ), LDWRKU )
                      CALL DLACPY( 'F', M, BLK, WORK( IU ), LDWRKU,
@@ -2245,7 +2277,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                 singular vectors of A in A
 *                 (Workspace: need BDSPAC)
 *
-                  CALL DBDSQR( 'L', M, N, 0, 0, S, WORK( IE ), A, LDA,
+                  CALL DBDSQR( 'L', M, N, 0, 0, S, WORK( IE ), A,
+     $                         LDA,
      $                         DUM, 1, DUM, 1, WORK( IWORK ), INFO )
 *
                END IF
@@ -2314,7 +2347,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
                   CALL DGEBRD( M, M, U, LDU, S, WORK( IE ),
      $                         WORK( ITAUQ ), WORK( ITAUP ),
      $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  CALL DLACPY( 'U', M, M, U, LDU, WORK( IR ), LDWRKR )
+                  CALL DLACPY( 'U', M, M, U, LDU, WORK( IR ),
+     $                         LDWRKR )
 *
 *                 Generate right vectors bidiagonalizing L in WORK(IR)
 *                 (Workspace: need M*M + 4*M-1, prefer M*M + 3*M + (M-1)*NB)
@@ -2346,7 +2380,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *
                   DO 40 I = 1, N, CHUNK
                      BLK = MIN( N-I+1, CHUNK )
-                     CALL DGEMM( 'N', 'N', M, BLK, M, ONE, WORK( IR ),
+                     CALL DGEMM( 'N', 'N', M, BLK, M, ONE,
+     $                           WORK( IR ),
      $                           LDWRKR, A( 1, I ), LDA, ZERO,
      $                           WORK( IU ), LDWRKU )
                      CALL DLACPY( 'F', M, BLK, WORK( IU ), LDWRKU,
@@ -2408,7 +2443,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                 singular vectors of A in A
 *                 (Workspace: need BDSPAC)
 *
-                  CALL DBDSQR( 'U', M, N, M, 0, S, WORK( IE ), A, LDA,
+                  CALL DBDSQR( 'U', M, N, M, 0, S, WORK( IE ), A,
+     $                         LDA,
      $                         U, LDU, DUM, 1, WORK( IWORK ), INFO )
 *
                END IF
@@ -2524,7 +2560,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *
 *                    Zero out above L in A
 *
-                     CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ),
+                     CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1,
+     $                            2 ),
      $                            LDA )
 *
 *                    Bidiagonalize L in A
@@ -2687,7 +2724,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *
 *                    Zero out above L in A
 *
-                     CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ),
+                     CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1,
+     $                            2 ),
      $                            LDA )
 *
 *                    Bidiagonalize L in A
@@ -2707,7 +2745,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    Generate left bidiagonalizing vectors of L in A
 *                    (Workspace: need 4*M, prefer 3*M + M*NB)
 *
-                     CALL DORGBR( 'Q', M, M, M, A, LDA, WORK( ITAUQ ),
+                     CALL DORGBR( 'Q', M, M, M, A, LDA,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + M
 *
@@ -2792,7 +2831,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    Generate left bidiagonalizing vectors in U
 *                    (Workspace: need M*M + 4*M, prefer M*M + 3*M + M*NB)
 *
-                     CALL DORGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL DORGBR( 'Q', M, M, M, U, LDU,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + M
 *
@@ -2835,7 +2875,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    Copy L to U, zeroing out above it
 *
                      CALL DLACPY( 'L', M, M, A, LDA, U, LDU )
-                     CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, U( 1, 2 ),
+                     CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, U( 1,
+     $                            2 ),
      $                            LDU )
                      IE = ITAU
                      ITAUQ = IE + M
@@ -2860,7 +2901,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    Generate left bidiagonalizing vectors in U
 *                    (Workspace: need 4*M, prefer 3*M + M*NB)
 *
-                     CALL DORGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL DORGBR( 'Q', M, M, M, U, LDU,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + M
 *
@@ -2990,7 +3032,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *
 *                    Zero out above L in A
 *
-                     CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ),
+                     CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1,
+     $                            2 ),
      $                            LDA )
 *
 *                    Bidiagonalize L in A
@@ -3158,7 +3201,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *
 *                    Zero out above L in A
 *
-                     CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ),
+                     CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1,
+     $                            2 ),
      $                            LDA )
 *
 *                    Bidiagonalize L in A
@@ -3179,7 +3223,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    Generate left bidiagonalizing vectors in A
 *                    (Workspace: need 4*M, prefer 3*M + M*NB)
 *
-                     CALL DORGBR( 'Q', M, M, M, A, LDA, WORK( ITAUQ ),
+                     CALL DORGBR( 'Q', M, M, M, A, LDA,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + M
 *
@@ -3264,7 +3309,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    Generate left bidiagonalizing vectors in U
 *                    (Workspace: need M*M + 4*M, prefer M*M + 3*M + M*NB)
 *
-                     CALL DORGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL DORGBR( 'Q', M, M, M, U, LDU,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + M
 *
@@ -3311,7 +3357,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    Copy L to U, zeroing out above it
 *
                      CALL DLACPY( 'L', M, M, A, LDA, U, LDU )
-                     CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, U( 1, 2 ),
+                     CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, U( 1,
+     $                            2 ),
      $                            LDU )
                      IE = ITAU
                      ITAUQ = IE + M
@@ -3336,7 +3383,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    Generate left bidiagonalizing vectors in U
 *                    (Workspace: need 4*M, prefer 3*M + M*NB)
 *
-                     CALL DORGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL DORGBR( 'Q', M, M, M, U, LDU,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + M
 *
@@ -3440,7 +3488,8 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *              vectors in A
 *              (Workspace: need BDSPAC)
 *
-               CALL DBDSQR( 'L', M, NCVT, NRU, 0, S, WORK( IE ), A, LDA,
+               CALL DBDSQR( 'L', M, NCVT, NRU, 0, S, WORK( IE ), A,
+     $                      LDA,
      $                      U, LDU, DUM, 1, WORK( IWORK ), INFO )
             ELSE
 *
@@ -3480,13 +3529,15 @@ SUBROUTINE DGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
      $      CALL DLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN, 1, S, MINMN,
      $                   IERR )
          IF( INFO.NE.0 .AND. ANRM.GT.BIGNUM )
-     $      CALL DLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN-1, 1, WORK( 2 ),
+     $      CALL DLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN-1, 1,
+     $                   WORK( 2 ),
      $                   MINMN, IERR )
          IF( ANRM.LT.SMLNUM )
      $      CALL DLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN, 1, S, MINMN,
      $                   IERR )
          IF( INFO.NE.0 .AND. ANRM.LT.SMLNUM )
-     $      CALL DLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN-1, 1, WORK( 2 ),
+     $      CALL DLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN-1, 1,
+     $                   WORK( 2 ),
      $                   MINMN, IERR )
       END IF
 *
diff --git a/SRC/dgesvdq.f b/SRC/dgesvdq.f
index 6f9ac703ee..0753858ed6 100644
--- a/SRC/dgesvdq.f
+++ b/SRC/dgesvdq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGESVDQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgesvdq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgesvdq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -365,7 +363,7 @@
 *>   an optimal implementation would do all necessary scaling before calling
 *>   CGESVD and the scaling in CGESVD can be switched off.
 *>   3. Other comments related to code optimization are given in comments in the
-*>   code, enlosed in [[double brackets]].
+*>   code, enclosed in [[double brackets]].
 *> \endverbatim
 *
 *> \par Bugs, examples and comments
@@ -406,14 +404,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEsing
+*> \ingroup gesvdq
 *
 *  =====================================================================
       SUBROUTINE DGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
      $                    S, U, LDU, V, LDV, NUMRANK, IWORK, LIWORK,
      $                    WORK, LWORK, RWORK, LRWORK, INFO )
+      IMPLICIT NONE
 *     .. Scalar Arguments ..
-      IMPLICIT    NONE
       CHARACTER   JOBA, JOBP, JOBR, JOBU, JOBV
       INTEGER     M, N, LDA, LDU, LDV, NUMRANK, LIWORK, LWORK, LRWORK,
      $            INFO
@@ -443,7 +441,8 @@ SUBROUTINE DGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
       DOUBLE PRECISION RDUMMY(1)
 *     ..
 *     .. External Subroutines (BLAS, LAPACK)
-      EXTERNAL    DGELQF, DGEQP3, DGEQRF, DGESVD, DLACPY, DLAPMT,
+      EXTERNAL    DGELQF, DGEQP3, DGEQRF, DGESVD, DLACPY,
+     $                   DLAPMT,
      $            DLASCL, DLASET, DLASWP, DSCAL,  DPOCON, DORMLQ,
      $            DORMQR, XERBLA
 *     ..
@@ -675,10 +674,12 @@ SUBROUTINE DGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                    IF ( WNTVA ) THEN
                        CALL DGEQRF(N,N/2,U,LDU,RDUMMY,RDUMMY,-1,IERR)
                        LWRK_DGEQRF = INT( RDUMMY(1) )
-                       CALL DGESVD( 'S', 'O', N/2,N/2, V,LDV, S, U,LDU,
+                       CALL DGESVD( 'S', 'O', N/2,N/2, V,LDV, S, U,
+     $                              LDU,
      $                      V, LDV, RDUMMY, -1, IERR )
                        LWRK_DGESVD2 = INT( RDUMMY(1) )
-                       CALL DORMQR( 'R', 'C', N, N, N/2, U, LDU, RDUMMY,
+                       CALL DORMQR( 'R', 'C', N, N, N/2, U, LDU,
+     $                              RDUMMY,
      $                      V, LDV, RDUMMY, -1, IERR )
                        LWRK_DORMQR2 = INT( RDUMMY(1) )
                        OPTWRK2 = MAX( LWRK_DGEQP3, N/2+LWRK_DGEQRF,
@@ -697,10 +698,12 @@ SUBROUTINE DGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                    IF ( WNTVA ) THEN
                       CALL DGELQF(N/2,N,U,LDU,RDUMMY,RDUMMY,-1,IERR)
                       LWRK_DGELQF = INT( RDUMMY(1) )
-                      CALL DGESVD( 'S','O', N/2,N/2, V, LDV, S, U, LDU,
+                      CALL DGESVD( 'S','O', N/2,N/2, V, LDV, S, U,
+     $                             LDU,
      $                     V, LDV, RDUMMY, -1, IERR )
                       LWRK_DGESVD2 = INT( RDUMMY(1) )
-                      CALL DORMLQ( 'R', 'N', N, N, N/2, U, LDU, RDUMMY,
+                      CALL DORMLQ( 'R', 'N', N, N, N/2, U, LDU,
+     $                             RDUMMY,
      $                     V, LDV, RDUMMY,-1,IERR )
                       LWRK_DORMLQ = INT( RDUMMY(1) )
                       OPTWRK2 = MAX( LWRK_DGEQP3, N/2+LWRK_DGELQF,
@@ -800,7 +803,8 @@ SUBROUTINE DGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
             IF ( RWORK(1) .GT. BIG / SQRT(DBLE(M)) ) THEN
 *               .. to prevent overflow in the QR factorization, scale the
 *               matrix by 1/sqrt(M) if too large entry detected
-                CALL DLASCL('G',0,0,SQRT(DBLE(M)),ONE, M,N, A,LDA, IERR)
+                CALL DLASCL('G',0,0,SQRT(DBLE(M)),ONE, M,N, A,LDA,
+     $                       IERR)
                 ASCALED = .TRUE.
             END IF
             CALL DLASWP( N, A, LDA, 1, M-1, IWORK(N+1), 1 )
@@ -822,7 +826,8 @@ SUBROUTINE DGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
           IF ( RTMP .GT. BIG / SQRT(DBLE(M)) ) THEN
 *             .. to prevent overflow in the QR factorization, scale the
 *             matrix by 1/sqrt(M) if too large entry detected
-              CALL DLASCL('G',0,0, SQRT(DBLE(M)),ONE, M,N, A,LDA, IERR)
+              CALL DLASCL('G',0,0, SQRT(DBLE(M)),ONE, M,N, A,LDA,
+     $                     IERR)
               ASCALED = .TRUE.
           END IF
       END IF
@@ -990,7 +995,8 @@ SUBROUTINE DGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *            .. copy R into [U] and overwrite [U] with the left singular vectors
              CALL DLACPY( 'U', NR, N, A, LDA, U, LDU )
              IF ( NR .GT. 1 )
-     $         CALL DLASET( 'L', NR-1, NR-1, ZERO, ZERO, U(2,1), LDU )
+     $         CALL DLASET( 'L', NR-1, NR-1, ZERO, ZERO, U(2,1),
+     $                      LDU )
 *            .. the right singular vectors not computed, the NR left singular
 *            vectors overwrite [U](1:NR,1:NR)
                 CALL DGESVD( 'O', 'N', NR, N, U, LDU, S, U, LDU,
@@ -1081,7 +1087,8 @@ SUBROUTINE DGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *            .. copy R into V and overwrite V with the right singular vectors
              CALL DLACPY( 'U', NR, N, A, LDA, V, LDV )
              IF ( NR .GT. 1 )
-     $         CALL DLASET( 'L', NR-1, NR-1, ZERO, ZERO, V(2,1), LDV )
+     $         CALL DLASET( 'L', NR-1, NR-1, ZERO, ZERO, V(2,1),
+     $                      LDV )
 *            .. the right singular vectors overwrite V, the NR left singular
 *            vectors stored in U(1:NR,1:NR)
              IF ( WNTVR .OR. ( NR .EQ. N ) ) THEN
@@ -1153,9 +1160,11 @@ SUBROUTINE DGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
  1117           CONTINUE
 *
                 IF ( ( NR .LT. M ) .AND. .NOT.(WNTUF)) THEN
-                  CALL DLASET('A', M-NR,NR, ZERO,ZERO, U(NR+1,1), LDU)
+                  CALL DLASET('A', M-NR,NR, ZERO,ZERO, U(NR+1,1),
+     $                         LDU)
                   IF ( NR .LT. N1 ) THEN
-                     CALL DLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),LDU)
+                     CALL DLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),
+     $                            LDU)
                      CALL DLASET( 'A',M-NR,N1-NR,ZERO,ONE,
      $                    U(NR+1,NR+1), LDU )
                   END IF
@@ -1206,7 +1215,8 @@ SUBROUTINE DGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                    IF ( ( N .LT. M ) .AND. .NOT.(WNTUF)) THEN
                       CALL DLASET('A',M-N,N,ZERO,ZERO,U(N+1,1),LDU)
                       IF ( N .LT. N1 ) THEN
-                        CALL DLASET('A',N,N1-N,ZERO,ZERO,U(1,N+1),LDU)
+                        CALL DLASET('A',N,N1-N,ZERO,ZERO,U(1,N+1),
+     $                               LDU)
                         CALL DLASET('A',M-N,N1-N,ZERO,ONE,
      $                       U(N+1,N+1), LDU )
                       END IF
@@ -1233,7 +1243,8 @@ SUBROUTINE DGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
      $                 V,LDV, WORK(N+NR+1),LWORK-N-NR, INFO )
                   CALL DLASET('A',N-NR,NR,ZERO,ZERO,V(NR+1,1),LDV)
                   CALL DLASET('A',NR,N-NR,ZERO,ZERO,V(1,NR+1),LDV)
-                  CALL DLASET('A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),LDV)
+                  CALL DLASET('A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),
+     $                         LDV)
                   CALL DORMQR('R','C', N, N, NR, U(1,NR+1), LDU,
      $                 WORK(N+1),V,LDV,WORK(N+NR+1),LWORK-N-NR,IERR)
                   CALL DLAPMT( .FALSE., N, N, V, LDV, IWORK )
@@ -1242,7 +1253,8 @@ SUBROUTINE DGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                   IF ( ( NR .LT. M ) .AND. .NOT.(WNTUF)) THEN
                      CALL DLASET('A',M-NR,NR,ZERO,ZERO,U(NR+1,1),LDU)
                      IF ( NR .LT. N1 ) THEN
-                     CALL DLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),LDU)
+                     CALL DLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),
+     $                            LDU)
                      CALL DLASET( 'A',M-NR,N1-NR,ZERO,ONE,
      $                    U(NR+1,NR+1),LDU)
                      END IF
@@ -1268,9 +1280,11 @@ SUBROUTINE DGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *               .. assemble the left singular vector matrix U of dimensions
 *              (M x NR) or (M x N) or (M x M).
                IF ( ( NR .LT. M ) .AND. .NOT.(WNTUF)) THEN
-                  CALL DLASET('A', M-NR,NR, ZERO,ZERO, U(NR+1,1), LDU)
+                  CALL DLASET('A', M-NR,NR, ZERO,ZERO, U(NR+1,1),
+     $                         LDU)
                   IF ( NR .LT. N1 ) THEN
-                     CALL DLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),LDU)
+                     CALL DLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),
+     $                            LDU)
                      CALL DLASET( 'A',M-NR,N1-NR,ZERO,ONE,
      $                    U(NR+1,NR+1), LDU )
                   END IF
@@ -1304,7 +1318,8 @@ SUBROUTINE DGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                   IF ( ( N .LT. M ) .AND. .NOT.(WNTUF)) THEN
                       CALL DLASET('A',M-N,N,ZERO,ZERO,U(N+1,1),LDU)
                       IF ( N .LT. N1 ) THEN
-                        CALL DLASET('A',N,N1-N,ZERO,ZERO,U(1,N+1),LDU)
+                        CALL DLASET('A',N,N1-N,ZERO,ZERO,U(1,N+1),
+     $                               LDU)
                         CALL DLASET( 'A',M-N,N1-N,ZERO,ONE,
      $                       U(N+1,N+1), LDU )
                       END IF
@@ -1322,7 +1337,8 @@ SUBROUTINE DGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
      $                 V, LDV, WORK(N+NR+1), LWORK-N-NR, INFO )
                   CALL DLASET('A',N-NR,NR,ZERO,ZERO,V(NR+1,1),LDV)
                   CALL DLASET('A',NR,N-NR,ZERO,ZERO,V(1,NR+1),LDV)
-                  CALL DLASET('A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),LDV)
+                  CALL DLASET('A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),
+     $                         LDV)
                   CALL DORMLQ('R','N',N,N,NR,U(NR+1,1),LDU,WORK(N+1),
      $                 V, LDV, WORK(N+NR+1),LWORK-N-NR,IERR)
                   CALL DLAPMT( .FALSE., N, N, V, LDV, IWORK )
@@ -1331,7 +1347,8 @@ SUBROUTINE DGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                   IF ( ( NR .LT. M ) .AND. .NOT.(WNTUF)) THEN
                      CALL DLASET('A',M-NR,NR,ZERO,ZERO,U(NR+1,1),LDU)
                      IF ( NR .LT. N1 ) THEN
-                     CALL DLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),LDU)
+                     CALL DLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),
+     $                            LDU)
                      CALL DLASET( 'A',M-NR,N1-NR,ZERO,ONE,
      $                    U(NR+1,NR+1), LDU )
                      END IF
@@ -1364,7 +1381,8 @@ SUBROUTINE DGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *
 *     .. if numerical rank deficiency is detected, the truncated
 *     singular values are set to zero.
-      IF ( NR .LT. N ) CALL DLASET( 'G', N-NR,1, ZERO,ZERO, S(NR+1), N )
+      IF ( NR .LT. N ) CALL DLASET( 'G', N-NR,1, ZERO,ZERO, S(NR+1),
+     $     N )
 *     .. undo scaling; this may cause overflow in the largest singular
 *     values.
       IF ( ASCALED )
diff --git a/SRC/dgesvdx.f b/SRC/dgesvdx.f
index db444b78de..0c828e8a50 100644
--- a/SRC/dgesvdx.f
+++ b/SRC/dgesvdx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGESVDX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgesvdx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgesvdx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -254,12 +252,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEsing
+*> \ingroup gesvdx
 *
 *  =====================================================================
       SUBROUTINE DGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
      $                    IL, IU, NS, S, U, LDU, VT, LDVT, WORK,
      $                    LWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -294,7 +293,8 @@ SUBROUTINE DGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
       DOUBLE PRECISION   DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DBDSVDX, DGEBRD, DGELQF, DGEQRF, DLACPY,
+      EXTERNAL           DBDSVDX, DGEBRD, DGELQF, DGEQRF,
+     $                   DLACPY,
      $                   DLASCL, DLASET, DORMBR, DORMLQ, DORMQR,
      $                   DCOPY, XERBLA
 *     ..
@@ -384,7 +384,8 @@ SUBROUTINE DGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
          MAXWRK = 1
          IF( MINMN.GT.0 ) THEN
             IF( M.GE.N ) THEN
-               MNTHR = ILAENV( 6, 'DGESVD', JOBU // JOBVT, M, N, 0, 0 )
+               MNTHR = ILAENV( 6, 'DGESVD', JOBU // JOBVT, M, N, 0,
+     $                         0 )
                IF( M.GE.MNTHR ) THEN
 *
 *                 Path 1 (M much larger than N)
@@ -419,7 +420,8 @@ SUBROUTINE DGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   MINWRK = MAX(N*(N*2+19),4*N+M)
                END IF
             ELSE
-               MNTHR = ILAENV( 6, 'DGESVD', JOBU // JOBVT, M, N, 0, 0 )
+               MNTHR = ILAENV( 6, 'DGESVD', JOBU // JOBVT, M, N, 0,
+     $                         0 )
                IF( N.GE.MNTHR ) THEN
 *
 *                 Path 1t (N much larger than M)
@@ -541,8 +543,10 @@ SUBROUTINE DGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
             ITAUP = ITAUQ + N
             ITEMP = ITAUP + N
             CALL DLACPY( 'U', N, N, A, LDA, WORK( IQRF ), N )
-            CALL DLASET( 'L', N-1, N-1, ZERO, ZERO, WORK( IQRF+1 ), N )
-            CALL DGEBRD( N, N, WORK( IQRF ), N, WORK( ID ), WORK( IE ),
+            CALL DLASET( 'L', N-1, N-1, ZERO, ZERO, WORK( IQRF+1 ),
+     $                   N )
+            CALL DGEBRD( N, N, WORK( IQRF ), N, WORK( ID ),
+     $                   WORK( IE ),
      $                   WORK( ITAUQ ), WORK( ITAUP ), WORK( ITEMP ),
      $                   LWORK-ITEMP+1, INFO )
 *
@@ -551,7 +555,8 @@ SUBROUTINE DGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
 *
             ITGKZ = ITEMP
             ITEMP = ITGKZ + N*(N*2+1)
-            CALL DBDSVDX( 'U', JOBZ, RNGTGK, N, WORK( ID ), WORK( IE ),
+            CALL DBDSVDX( 'U', JOBZ, RNGTGK, N, WORK( ID ),
+     $                    WORK( IE ),
      $                    VL, VU, ILTGK, IUTGK, NS, S, WORK( ITGKZ ),
      $                    N*2, WORK( ITEMP ), IWORK, INFO)
 *
@@ -563,7 +568,8 @@ SUBROUTINE DGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   CALL DCOPY( N, WORK( J ), 1, U( 1,I ), 1 )
                   J = J + N*2
                END DO
-               CALL DLASET( 'A', M-N, NS, ZERO, ZERO, U( N+1,1 ), LDU )
+               CALL DLASET( 'A', M-N, NS, ZERO, ZERO, U( N+1,1 ),
+     $                      LDU )
 *
 *              Call DORMBR to compute QB*UB.
 *              (Workspace in WORK( ITEMP ): need N, prefer N*NB)
@@ -620,7 +626,8 @@ SUBROUTINE DGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
 *
             ITGKZ = ITEMP
             ITEMP = ITGKZ + N*(N*2+1)
-            CALL DBDSVDX( 'U', JOBZ, RNGTGK, N, WORK( ID ), WORK( IE ),
+            CALL DBDSVDX( 'U', JOBZ, RNGTGK, N, WORK( ID ),
+     $                    WORK( IE ),
      $                    VL, VU, ILTGK, IUTGK, NS, S, WORK( ITGKZ ),
      $                    N*2, WORK( ITEMP ), IWORK, INFO)
 *
@@ -632,7 +639,8 @@ SUBROUTINE DGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   CALL DCOPY( N, WORK( J ), 1, U( 1,I ), 1 )
                   J = J + N*2
                END DO
-               CALL DLASET( 'A', M-N, NS, ZERO, ZERO, U( N+1,1 ), LDU )
+               CALL DLASET( 'A', M-N, NS, ZERO, ZERO, U( N+1,1 ),
+     $                      LDU )
 *
 *              Call DORMBR to compute QB*UB.
 *              (Workspace in WORK( ITEMP ): need N, prefer N*NB)
@@ -689,8 +697,10 @@ SUBROUTINE DGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
             ITAUP = ITAUQ + M
             ITEMP = ITAUP + M
             CALL DLACPY( 'L', M, M, A, LDA, WORK( ILQF ), M )
-            CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, WORK( ILQF+M ), M )
-            CALL DGEBRD( M, M, WORK( ILQF ), M, WORK( ID ), WORK( IE ),
+            CALL DLASET( 'U', M-1, M-1, ZERO, ZERO, WORK( ILQF+M ),
+     $                   M )
+            CALL DGEBRD( M, M, WORK( ILQF ), M, WORK( ID ),
+     $                   WORK( IE ),
      $                   WORK( ITAUQ ), WORK( ITAUP ), WORK( ITEMP ),
      $                   LWORK-ITEMP+1, INFO )
 *
@@ -699,7 +709,8 @@ SUBROUTINE DGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
 *
             ITGKZ = ITEMP
             ITEMP = ITGKZ + M*(M*2+1)
-            CALL DBDSVDX( 'U', JOBZ, RNGTGK, M, WORK( ID ), WORK( IE ),
+            CALL DBDSVDX( 'U', JOBZ, RNGTGK, M, WORK( ID ),
+     $                    WORK( IE ),
      $                    VL, VU, ILTGK, IUTGK, NS, S, WORK( ITGKZ ),
      $                    M*2, WORK( ITEMP ), IWORK, INFO)
 *
@@ -728,7 +739,8 @@ SUBROUTINE DGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   CALL DCOPY( M, WORK( J ), 1, VT( I,1 ), LDVT )
                   J = J + M*2
                END DO
-               CALL DLASET( 'A', NS, N-M, ZERO, ZERO, VT( 1,M+1 ), LDVT)
+               CALL DLASET( 'A', NS, N-M, ZERO, ZERO, VT( 1,M+1 ),
+     $                      LDVT)
 *
 *              Call DORMBR to compute (VB**T)*(PB**T)
 *              (Workspace in WORK( ITEMP ): need M, prefer M*NB)
@@ -768,7 +780,8 @@ SUBROUTINE DGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
 *
             ITGKZ = ITEMP
             ITEMP = ITGKZ + M*(M*2+1)
-            CALL DBDSVDX( 'L', JOBZ, RNGTGK, M, WORK( ID ), WORK( IE ),
+            CALL DBDSVDX( 'L', JOBZ, RNGTGK, M, WORK( ID ),
+     $                    WORK( IE ),
      $                    VL, VU, ILTGK, IUTGK, NS, S, WORK( ITGKZ ),
      $                    M*2, WORK( ITEMP ), IWORK, INFO)
 *
@@ -797,7 +810,8 @@ SUBROUTINE DGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   CALL DCOPY( M, WORK( J ), 1, VT( I,1 ), LDVT )
                   J = J + M*2
                END DO
-               CALL DLASET( 'A', NS, N-M, ZERO, ZERO, VT( 1,M+1 ), LDVT)
+               CALL DLASET( 'A', NS, N-M, ZERO, ZERO, VT( 1,M+1 ),
+     $                      LDVT)
 *
 *              Call DORMBR to compute VB**T * PB**T
 *              (Workspace in WORK( ITEMP ): need M, prefer M*NB)
diff --git a/SRC/dgesvj.f b/SRC/dgesvj.f
index 5fdb21e45c..fc5eb211db 100644
--- a/SRC/dgesvj.f
+++ b/SRC/dgesvj.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGESVJ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgesvj.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgesvj.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -208,7 +206,7 @@
 *>
 *> \param[in,out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (LWORK)
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
 *>          On entry :
 *>          If JOBU = 'C' :
 *>          WORK(1) = CTOL, where CTOL defines the threshold for convergence.
@@ -239,7 +237,12 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          length of WORK, WORK >= MAX(6,M+N)
+*>          The length of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= MAX(6,M+N), otherwise.
+*>
+*>          If on entry LWORK = -1, then a workspace query is assumed and
+*>          no computation is done; WORK(1) is set to the minial (and optimal)
+*>          length of WORK.
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -260,7 +263,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gesvj
 *
 *> \par Further Details:
 *  =====================
@@ -334,6 +337,7 @@
 *  =====================================================================
       SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
      $                   LDV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -365,9 +369,9 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
       INTEGER            BLSKIP, EMPTSW, i, ibr, IERR, igl, IJBLSK, ir1,
      $                   ISWROT, jbc, jgl, KBL, LKAHEAD, MVL, N2, N34,
      $                   N4, NBL, NOTROT, p, PSKIPPED, q, ROWSKIP,
-     $                   SWBAND
-      LOGICAL            APPLV, GOSCALE, LOWER, LSVEC, NOSCALE, ROTOK,
-     $                   RSVEC, UCTOL, UPPER
+     $                   SWBAND, MINMN, LWMIN
+      LOGICAL            APPLV, GOSCALE, LOWER, LQUERY, LSVEC, NOSCALE,
+     $                   ROTOK, RSVEC, UCTOL, UPPER
 *     ..
 *     .. Local Arrays ..
       DOUBLE PRECISION   FASTR( 5 )
@@ -408,11 +412,23 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
       UPPER = LSAME( JOBA, 'U' )
       LOWER = LSAME( JOBA, 'L' )
 *
+      MINMN = MIN( M, N )
+      IF( MINMN.EQ.0 ) THEN
+         LWMIN = 1
+      ELSE
+         LWMIN = MAX( 6, M+N )
+      END IF
+*
+      LQUERY = ( LWORK.EQ.-1 )
       IF( .NOT.( UPPER .OR. LOWER .OR. LSAME( JOBA, 'G' ) ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.( LSVEC .OR. UCTOL .OR. LSAME( JOBU, 'N' ) ) ) THEN
+      ELSE IF( .NOT.( LSVEC .OR.
+     $         UCTOL .OR.
+     $         LSAME( JOBU, 'N' ) ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.( RSVEC .OR. APPLV .OR. LSAME( JOBV, 'N' ) ) ) THEN
+      ELSE IF( .NOT.( RSVEC .OR.
+     $         APPLV .OR.
+     $         LSAME( JOBV, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( M.LT.0 ) THEN
          INFO = -4
@@ -427,7 +443,7 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
          INFO = -11
       ELSE IF( UCTOL .AND. ( WORK( 1 ).LE.ONE ) ) THEN
          INFO = -12
-      ELSE IF( LWORK.LT.MAX( M+N, 6 ) ) THEN
+      ELSE IF( LWORK.LT.LWMIN .AND. ( .NOT.LQUERY ) ) THEN
          INFO = -13
       ELSE
          INFO = 0
@@ -437,11 +453,14 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'DGESVJ', -INFO )
          RETURN
+      ELSE IF( LQUERY ) THEN
+         WORK( 1 ) = LWMIN
+         RETURN
       END IF
 *
 * #:) Quick return for void matrix
 *
-      IF( ( M.EQ.0 ) .OR. ( N.EQ.0 ) )RETURN
+      IF( MINMN.EQ.0 ) RETURN
 *
 *     Set numerical parameters
 *     The stopping criterion for Jacobi rotations is
@@ -765,11 +784,13 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
          ELSE IF( UPPER ) THEN
 *
 *
-            CALL DGSVJ0( JOBV, N4, N4, A, LDA, WORK, SVA, MVL, V, LDV,
+            CALL DGSVJ0( JOBV, N4, N4, A, LDA, WORK, SVA, MVL, V,
+     $                   LDV,
      $                   EPSLN, SFMIN, TOL, 2, WORK( N+1 ), LWORK-N,
      $                   IERR )
 *
-            CALL DGSVJ0( JOBV, N2, N4, A( 1, N4+1 ), LDA, WORK( N4+1 ),
+            CALL DGSVJ0( JOBV, N2, N4, A( 1, N4+1 ), LDA,
+     $                   WORK( N4+1 ),
      $                   SVA( N4+1 ), MVL, V( N4*q+1, N4+1 ), LDV,
      $                   EPSLN, SFMIN, TOL, 1, WORK( N+1 ), LWORK-N,
      $                   IERR )
@@ -872,7 +893,8 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                            IF( AAQQ.GE.ONE ) THEN
                               ROTOK = ( SMALL*AAPP ).LE.AAQQ
                               IF( AAPP.LT.( BIG / AAQQ ) ) THEN
-                                 AAPQ = ( DDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( DDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*WORK( p )*WORK( q ) /
      $                                  AAQQ ) / AAPP
                               ELSE
@@ -887,7 +909,8 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                            ELSE
                               ROTOK = AAPP.LE.( AAQQ / SMALL )
                               IF( AAPP.GT.( SMALL / AAQQ ) ) THEN
-                                 AAPQ = ( DDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( DDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*WORK( p )*WORK( q ) /
      $                                  AAQQ ) / AAPP
                               ELSE
@@ -964,7 +987,8 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                           FASTR( 4 ) = -T*AQOAP
                                           WORK( p ) = WORK( p )*CS
                                           WORK( q ) = WORK( q )*CS
-                                          CALL DROTM( M, A( 1, p ), 1,
+                                          CALL DROTM( M, A( 1, p ),
+     $                                                1,
      $                                                A( 1, q ), 1,
      $                                                FASTR )
                                           IF( RSVEC )CALL DROTM( MVL,
@@ -980,7 +1004,8 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                           WORK( p ) = WORK( p )*CS
                                           WORK( q ) = WORK( q ) / CS
                                           IF( RSVEC ) THEN
-                                             CALL DAXPY( MVL, -T*AQOAP,
+                                             CALL DAXPY( MVL,
+     $                                                   -T*AQOAP,
      $                                                   V( 1, q ), 1,
      $                                                   V( 1, p ), 1 )
                                              CALL DAXPY( MVL,
@@ -994,13 +1019,15 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                           CALL DAXPY( M, T*APOAQ,
      $                                                A( 1, p ), 1,
      $                                                A( 1, q ), 1 )
-                                          CALL DAXPY( M, -CS*SN*AQOAP,
+                                          CALL DAXPY( M,
+     $                                                -CS*SN*AQOAP,
      $                                                A( 1, q ), 1,
      $                                                A( 1, p ), 1 )
                                           WORK( p ) = WORK( p ) / CS
                                           WORK( q ) = WORK( q )*CS
                                           IF( RSVEC ) THEN
-                                             CALL DAXPY( MVL, T*APOAQ,
+                                             CALL DAXPY( MVL,
+     $                                                   T*APOAQ,
      $                                                   V( 1, p ), 1,
      $                                                   V( 1, q ), 1 )
                                              CALL DAXPY( MVL,
@@ -1014,7 +1041,8 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                              CALL DAXPY( M, -T*AQOAP,
      $                                                   A( 1, q ), 1,
      $                                                   A( 1, p ), 1 )
-                                             CALL DAXPY( M, CS*SN*APOAQ,
+                                             CALL DAXPY( M,
+     $                                                   CS*SN*APOAQ,
      $                                                   A( 1, p ), 1,
      $                                                   A( 1, q ), 1 )
                                              WORK( p ) = WORK( p )*CS
@@ -1057,15 +1085,19 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
 *              .. have to use modified Gram-Schmidt like transformation
                                  CALL DCOPY( M, A( 1, p ), 1,
      $                                       WORK( N+1 ), 1 )
-                                 CALL DLASCL( 'G', 0, 0, AAPP, ONE, M,
+                                 CALL DLASCL( 'G', 0, 0, AAPP, ONE,
+     $                                        M,
      $                                        1, WORK( N+1 ), LDA,
      $                                        IERR )
-                                 CALL DLASCL( 'G', 0, 0, AAQQ, ONE, M,
+                                 CALL DLASCL( 'G', 0, 0, AAQQ, ONE,
+     $                                        M,
      $                                        1, A( 1, q ), LDA, IERR )
                                  TEMP1 = -AAPQ*WORK( p ) / WORK( q )
-                                 CALL DAXPY( M, TEMP1, WORK( N+1 ), 1,
+                                 CALL DAXPY( M, TEMP1, WORK( N+1 ),
+     $                                       1,
      $                                       A( 1, q ), 1 )
-                                 CALL DLASCL( 'G', 0, 0, ONE, AAQQ, M,
+                                 CALL DLASCL( 'G', 0, 0, ONE, AAQQ,
+     $                                        M,
      $                                        1, A( 1, q ), LDA, IERR )
                                  SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                      ONE-AAPQ*AAPQ ) )
@@ -1080,7 +1112,8 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = DNRM2( M, A( 1, q ), 1 )*
+                                    SVA( q ) = DNRM2( M, A( 1, q ),
+     $                                   1 )*
      $                                         WORK( q )
                                  ELSE
                                     T = ZERO
@@ -1179,7 +1212,8 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                  ROTOK = ( SMALL*AAQQ ).LE.AAPP
                               END IF
                               IF( AAPP.LT.( BIG / AAQQ ) ) THEN
-                                 AAPQ = ( DDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( DDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*WORK( p )*WORK( q ) /
      $                                  AAQQ ) / AAPP
                               ELSE
@@ -1198,7 +1232,8 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                  ROTOK = AAQQ.LE.( AAPP / SMALL )
                               END IF
                               IF( AAPP.GT.( SMALL / AAQQ ) ) THEN
-                                 AAPQ = ( DDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( DDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*WORK( p )*WORK( q ) /
      $                                  AAQQ ) / AAPP
                               ELSE
@@ -1270,7 +1305,8 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                           FASTR( 4 ) = -T*AQOAP
                                           WORK( p ) = WORK( p )*CS
                                           WORK( q ) = WORK( q )*CS
-                                          CALL DROTM( M, A( 1, p ), 1,
+                                          CALL DROTM( M, A( 1, p ),
+     $                                                1,
      $                                                A( 1, q ), 1,
      $                                                FASTR )
                                           IF( RSVEC )CALL DROTM( MVL,
@@ -1284,7 +1320,8 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
      $                                                A( 1, p ), 1,
      $                                                A( 1, q ), 1 )
                                           IF( RSVEC ) THEN
-                                             CALL DAXPY( MVL, -T*AQOAP,
+                                             CALL DAXPY( MVL,
+     $                                                   -T*AQOAP,
      $                                                   V( 1, q ), 1,
      $                                                   V( 1, p ), 1 )
                                              CALL DAXPY( MVL,
@@ -1300,11 +1337,13 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                           CALL DAXPY( M, T*APOAQ,
      $                                                A( 1, p ), 1,
      $                                                A( 1, q ), 1 )
-                                          CALL DAXPY( M, -CS*SN*AQOAP,
+                                          CALL DAXPY( M,
+     $                                                -CS*SN*AQOAP,
      $                                                A( 1, q ), 1,
      $                                                A( 1, p ), 1 )
                                           IF( RSVEC ) THEN
-                                             CALL DAXPY( MVL, T*APOAQ,
+                                             CALL DAXPY( MVL,
+     $                                                   T*APOAQ,
      $                                                   V( 1, p ), 1,
      $                                                   V( 1, q ), 1 )
                                              CALL DAXPY( MVL,
@@ -1320,7 +1359,8 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                              CALL DAXPY( M, -T*AQOAP,
      $                                                   A( 1, q ), 1,
      $                                                   A( 1, p ), 1 )
-                                             CALL DAXPY( M, CS*SN*APOAQ,
+                                             CALL DAXPY( M,
+     $                                                   CS*SN*APOAQ,
      $                                                   A( 1, p ), 1,
      $                                                   A( 1, q ), 1 )
                                              WORK( p ) = WORK( p )*CS
@@ -1363,16 +1403,20 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                  IF( AAPP.GT.AAQQ ) THEN
                                     CALL DCOPY( M, A( 1, p ), 1,
      $                                          WORK( N+1 ), 1 )
-                                    CALL DLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL DLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, WORK( N+1 ), LDA,
      $                                           IERR )
-                                    CALL DLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL DLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     TEMP1 = -AAPQ*WORK( p ) / WORK( q )
-                                    CALL DAXPY( M, TEMP1, WORK( N+1 ),
+                                    CALL DAXPY( M, TEMP1,
+     $                                          WORK( N+1 ),
      $                                          1, A( 1, q ), 1 )
-                                    CALL DLASCL( 'G', 0, 0, ONE, AAQQ,
+                                    CALL DLASCL( 'G', 0, 0, ONE,
+     $                                           AAQQ,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
@@ -1381,16 +1425,20 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                  ELSE
                                     CALL DCOPY( M, A( 1, q ), 1,
      $                                          WORK( N+1 ), 1 )
-                                    CALL DLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL DLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, WORK( N+1 ), LDA,
      $                                           IERR )
-                                    CALL DLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL DLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     TEMP1 = -AAPQ*WORK( q ) / WORK( p )
-                                    CALL DAXPY( M, TEMP1, WORK( N+1 ),
+                                    CALL DAXPY( M, TEMP1,
+     $                                          WORK( N+1 ),
      $                                          1, A( 1, p ), 1 )
-                                    CALL DLASCL( 'G', 0, 0, ONE, AAPP,
+                                    CALL DLASCL( 'G', 0, 0, ONE,
+     $                                           AAPP,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     SVA( p ) = AAPP*DSQRT( MAX( ZERO,
@@ -1406,7 +1454,8 @@ SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = DNRM2( M, A( 1, q ), 1 )*
+                                    SVA( q ) = DNRM2( M, A( 1, q ),
+     $                                   1 )*
      $                                         WORK( q )
                                  ELSE
                                     T = ZERO
diff --git a/SRC/dgesvx.f b/SRC/dgesvx.f
index 4dc1d83cfe..aa4e578129 100644
--- a/SRC/dgesvx.f
+++ b/SRC/dgesvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGESVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgesvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgesvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -296,7 +294,7 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (4*N)
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,4*N))
 *>          On exit, WORK(1) contains the reciprocal pivot growth
 *>          factor norm(A)/norm(U). The "max absolute element" norm is
 *>          used. If WORK(1) is much less than 1, then the stability
@@ -340,12 +338,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEsolve
+*> \ingroup gesvx
 *
 *  =====================================================================
-      SUBROUTINE DGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE DGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF,
+     $                   IPIV,
      $                   EQUED, R, C, B, LDB, X, LDX, RCOND, FERR, BERR,
      $                   WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -382,7 +382,8 @@ SUBROUTINE DGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
       EXTERNAL           LSAME, DLAMCH, DLANGE, DLANTR
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGECON, DGEEQU, DGERFS, DGETRF, DGETRS, DLACPY,
+      EXTERNAL           DGECON, DGEEQU, DGERFS, DGETRF, DGETRS,
+     $                   DLACPY,
      $                   DLAQGE, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -407,7 +408,9 @@ SUBROUTINE DGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
       ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
@@ -473,7 +476,8 @@ SUBROUTINE DGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *        Compute row and column scalings to equilibrate the matrix A.
 *
-         CALL DGEEQU( N, N, A, LDA, R, C, ROWCND, COLCND, AMAX, INFEQU )
+         CALL DGEEQU( N, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
+     $                INFEQU )
          IF( INFEQU.EQ.0 ) THEN
 *
 *           Equilibrate the matrix.
@@ -548,7 +552,8 @@ SUBROUTINE DGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL DGECON( NORM, N, AF, LDAF, ANORM, RCOND, WORK, IWORK, INFO )
+      CALL DGECON( NORM, N, AF, LDAF, ANORM, RCOND, WORK, IWORK,
+     $             INFO )
 *
 *     Compute the solution matrix X.
 *
diff --git a/SRC/dgesvxx.f b/SRC/dgesvxx.f
index e1f86354bf..1e16ad2e5f 100644
--- a/SRC/dgesvxx.f
+++ b/SRC/dgesvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGESVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgesvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgesvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -529,14 +527,16 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEsolve
+*> \ingroup gesvxx
 *
 *  =====================================================================
-      SUBROUTINE DGESVXX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE DGESVXX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    EQUED, R, C, B, LDB, X, LDX, RCOND, RPVGRW,
      $                    BERR, N_ERR_BNDS, ERR_BNDS_NORM,
      $                    ERR_BNDS_COMP, NPARAMS, PARAMS, WORK, IWORK,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -583,7 +583,8 @@ SUBROUTINE DGESVXX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
       DOUBLE PRECISION   DLAMCH, DLA_GERPVGRW
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEEQUB, DGETRF, DGETRS, DLACPY, DLAQGE,
+      EXTERNAL           DGEEQUB, DGETRF, DGETRS, DLACPY,
+     $                   DLAQGE,
      $                   XERBLA, DLASCL2, DGERFSX
 *     ..
 *     .. Intrinsic Functions ..
diff --git a/SRC/dgetc2.f b/SRC/dgetc2.f
index d2f0ede826..4f9a289d96 100644
--- a/SRC/dgetc2.f
+++ b/SRC/dgetc2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGETC2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgetc2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgetc2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,7 +96,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEauxiliary
+*> \ingroup getc2
 *
 *> \par Contributors:
 *  ==================
@@ -108,6 +106,7 @@
 *
 *  =====================================================================
       SUBROUTINE DGETC2( N, A, LDA, IPIV, JPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -132,7 +131,7 @@ SUBROUTINE DGETC2( N, A, LDA, IPIV, JPIV, INFO )
       DOUBLE PRECISION   BIGNUM, EPS, SMIN, SMLNUM, XMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGER, DSWAP, DLABAD
+      EXTERNAL           DGER, DSWAP
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION   DLAMCH
@@ -155,7 +154,6 @@ SUBROUTINE DGETC2( N, A, LDA, IPIV, JPIV, INFO )
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Handle the case N=1 by itself
 *
@@ -177,8 +175,8 @@ SUBROUTINE DGETC2( N, A, LDA, IPIV, JPIV, INFO )
 *        Find max element in matrix A
 *
          XMAX = ZERO
-         DO 20 IP = I, N
-            DO 10 JP = I, N
+         DO 20 JP = I, N
+            DO 10 IP = I, N
                IF( ABS( A( IP, JP ) ).GE.XMAX ) THEN
                   XMAX = ABS( A( IP, JP ) )
                   IPV = IP
diff --git a/SRC/dgetf2.f b/SRC/dgetf2.f
index fc1587842e..df70eff785 100644
--- a/SRC/dgetf2.f
+++ b/SRC/dgetf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGETF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgetf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgetf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup getf2
 *
 *  =====================================================================
       SUBROUTINE DGETF2( M, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -199,7 +198,8 @@ SUBROUTINE DGETF2( M, N, A, LDA, IPIV, INFO )
 *
 *           Update trailing submatrix.
 *
-            CALL DGER( M-J, N-J, -ONE, A( J+1, J ), 1, A( J, J+1 ), LDA,
+            CALL DGER( M-J, N-J, -ONE, A( J+1, J ), 1, A( J, J+1 ),
+     $                 LDA,
      $                 A( J+1, J+1 ), LDA )
          END IF
    10 CONTINUE
diff --git a/SRC/dgetrf.f b/SRC/dgetrf.f
index 73d0f3601a..f057dc816f 100644
--- a/SRC/dgetrf.f
+++ b/SRC/dgetrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGETRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgetrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgetrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup getrf
 *
 *  =====================================================================
       SUBROUTINE DGETRF( M, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -128,7 +127,8 @@ SUBROUTINE DGETRF( M, N, A, LDA, IPIV, INFO )
       INTEGER            I, IINFO, J, JB, NB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DGETRF2, DLASWP, DTRSM, XERBLA
+      EXTERNAL           DGEMM, DGETRF2, DLASWP, DTRSM,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
@@ -177,7 +177,8 @@ SUBROUTINE DGETRF( M, N, A, LDA, IPIV, INFO )
 *           Factor diagonal and subdiagonal blocks and test for exact
 *           singularity.
 *
-            CALL DGETRF2( M-J+1, JB, A( J, J ), LDA, IPIV( J ), IINFO )
+            CALL DGETRF2( M-J+1, JB, A( J, J ), LDA, IPIV( J ),
+     $                    IINFO )
 *
 *           Adjust INFO and the pivot indices.
 *
@@ -200,14 +201,16 @@ SUBROUTINE DGETRF( M, N, A, LDA, IPIV, INFO )
 *
 *              Compute block row of U.
 *
-               CALL DTRSM( 'Left', 'Lower', 'No transpose', 'Unit', JB,
+               CALL DTRSM( 'Left', 'Lower', 'No transpose', 'Unit',
+     $                     JB,
      $                     N-J-JB+1, ONE, A( J, J ), LDA, A( J, J+JB ),
      $                     LDA )
                IF( J+JB.LE.M ) THEN
 *
 *                 Update trailing submatrix.
 *
-                  CALL DGEMM( 'No transpose', 'No transpose', M-J-JB+1,
+                  CALL DGEMM( 'No transpose', 'No transpose',
+     $                        M-J-JB+1,
      $                        N-J-JB+1, JB, -ONE, A( J+JB, J ), LDA,
      $                        A( J, J+JB ), LDA, ONE, A( J+JB, J+JB ),
      $                        LDA )
diff --git a/SRC/dgetrf2.f b/SRC/dgetrf2.f
index 40af0793dd..9d2403ef43 100644
--- a/SRC/dgetrf2.f
+++ b/SRC/dgetrf2.f
@@ -106,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup getrf2
 *
 *  =====================================================================
       RECURSIVE SUBROUTINE DGETRF2( M, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dgetri.f b/SRC/dgetri.f
index 92ef90c186..71843779a5 100644
--- a/SRC/dgetri.f
+++ b/SRC/dgetri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGETRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgetri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgetri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup getri
 *
 *  =====================================================================
       SUBROUTINE DGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -140,7 +139,8 @@ SUBROUTINE DGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
       EXTERNAL           ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DGEMV, DSWAP, DTRSM, DTRTRI, XERBLA
+      EXTERNAL           DGEMM, DGEMV, DSWAP, DTRSM, DTRTRI,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -151,8 +151,9 @@ SUBROUTINE DGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
 *
       INFO = 0
       NB = ILAENV( 1, 'DGETRI', ' ', N, -1, -1, -1 )
-      LWKOPT = N*NB
+      LWKOPT = MAX( 1, N*NB )
       WORK( 1 ) = LWKOPT
+*
       LQUERY = ( LWORK.EQ.-1 )
       IF( N.LT.0 ) THEN
          INFO = -1
@@ -186,7 +187,8 @@ SUBROUTINE DGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
          IWS = MAX( LDWORK*NB, 1 )
          IF( LWORK.LT.IWS ) THEN
             NB = LWORK / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'DGETRI', ' ', N, -1, -1, -1 ) )
+            NBMIN = MAX( 2, ILAENV( 2, 'DGETRI', ' ', N, -1, -1,
+     $                   -1 ) )
          END IF
       ELSE
          IWS = N
@@ -237,7 +239,8 @@ SUBROUTINE DGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
      $         CALL DGEMM( 'No transpose', 'No transpose', N, JB,
      $                     N-J-JB+1, -ONE, A( 1, J+JB ), LDA,
      $                     WORK( J+JB ), LDWORK, ONE, A( 1, J ), LDA )
-            CALL DTRSM( 'Right', 'Lower', 'No transpose', 'Unit', N, JB,
+            CALL DTRSM( 'Right', 'Lower', 'No transpose', 'Unit', N,
+     $                  JB,
      $                  ONE, WORK( J ), LDWORK, A( 1, J ), LDA )
    50    CONTINUE
       END IF
diff --git a/SRC/dgetrs.f b/SRC/dgetrs.f
index d3464f685a..3422c40fd1 100644
--- a/SRC/dgetrs.f
+++ b/SRC/dgetrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGETRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgetrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgetrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -114,10 +112,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup getrs
 *
 *  =====================================================================
       SUBROUTINE DGETRS( TRANS, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -189,7 +188,8 @@ SUBROUTINE DGETRS( TRANS, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *
 *        Solve L*X = B, overwriting B with X.
 *
-         CALL DTRSM( 'Left', 'Lower', 'No transpose', 'Unit', N, NRHS,
+         CALL DTRSM( 'Left', 'Lower', 'No transpose', 'Unit', N,
+     $               NRHS,
      $               ONE, A, LDA, B, LDB )
 *
 *        Solve U*X = B, overwriting B with X.
@@ -202,12 +202,14 @@ SUBROUTINE DGETRS( TRANS, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *
 *        Solve U**T *X = B, overwriting B with X.
 *
-         CALL DTRSM( 'Left', 'Upper', 'Transpose', 'Non-unit', N, NRHS,
+         CALL DTRSM( 'Left', 'Upper', 'Transpose', 'Non-unit', N,
+     $               NRHS,
      $               ONE, A, LDA, B, LDB )
 *
 *        Solve L**T *X = B, overwriting B with X.
 *
-         CALL DTRSM( 'Left', 'Lower', 'Transpose', 'Unit', N, NRHS, ONE,
+         CALL DTRSM( 'Left', 'Lower', 'Transpose', 'Unit', N, NRHS,
+     $               ONE,
      $               A, LDA, B, LDB )
 *
 *        Apply row interchanges to the solution vectors.
diff --git a/SRC/dgetsls.f b/SRC/dgetsls.f
index 899397666b..5b61d5888f 100644
--- a/SRC/dgetsls.f
+++ b/SRC/dgetsls.f
@@ -22,8 +22,17 @@
 *>
 *> DGETSLS solves overdetermined or underdetermined real linear systems
 *> involving an M-by-N matrix A, using a tall skinny QR or short wide LQ
-*> factorization of A.  It is assumed that A has full rank.
+*> factorization of A.
 *>
+*> It is assumed that A has full rank, and only a rudimentary protection
+*> against rank-deficient matrices is provided. This subroutine only detects
+*> exact rank-deficiency, where a diagonal element of the triangular factor
+*> of A is exactly zero.
+*>
+*> It is conceivable for one (or more) of the diagonal elements of the triangular
+*> factor of A to be subnormally tiny numbers without this subroutine signalling
+*> an error. The solutions computed for such almost-rank-deficient matrices may
+*> be less accurate due to a loss of numerical precision.
 *>
 *>
 *> The following options are provided:
@@ -127,7 +136,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1 or -2, then a workspace query is assumed.
 *>          If LWORK = -1, the routine calculates optimal size of WORK for the
 *>          optimal performance and returns this value in WORK(1).
@@ -141,7 +150,7 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO =  i, the i-th diagonal element of the
-*>                triangular factor of A is zero, so that A does not have
+*>                triangular factor of A is exactly zero, so that A does not have
 *>                full rank; the least squares solution could not be
 *>                computed.
 *> \endverbatim
@@ -154,11 +163,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEsolve
+*> \ingroup getsls
 *
 *  =====================================================================
       SUBROUTINE DGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
      $                    WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -181,16 +191,15 @@ SUBROUTINE DGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, TRAN
-      INTEGER            I, IASCL, IBSCL, J, MINMN, MAXMN, BROW,
-     $                   SCLLEN, MNK, TSZO, TSZM, LWO, LWM, LW1, LW2,
+      INTEGER            I, IASCL, IBSCL, J, MAXMN, BROW,
+     $                   SCLLEN, TSZO, TSZM, LWO, LWM, LW1, LW2,
      $                   WSIZEO, WSIZEM, INFO2
       DOUBLE PRECISION   ANRM, BIGNUM, BNRM, SMLNUM, TQ( 5 ), WORKQ( 1 )
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      INTEGER            ILAENV
       DOUBLE PRECISION   DLAMCH, DLANGE
-      EXTERNAL           LSAME, ILAENV, DLABAD, DLAMCH, DLANGE
+      EXTERNAL           LSAME, DLAMCH, DLANGE
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           DGEQR, DGEMQR, DLASCL, DLASET,
@@ -204,9 +213,7 @@ SUBROUTINE DGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
 *     Test the input arguments.
 *
       INFO = 0
-      MINMN = MIN( M, N )
       MAXMN = MAX( M, N )
-      MNK   = MAX( MINMN, NRHS )
       TRAN  = LSAME( TRANS, 'T' )
 *
       LQUERY = ( LWORK.EQ.-1 .OR. LWORK.EQ.-2 )
@@ -227,9 +234,12 @@ SUBROUTINE DGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
 *
       IF( INFO.EQ.0 ) THEN
 *
-*     Determine the block size and minimum LWORK
+*     Determine the optimum and minimum LWORK
 *
-       IF( M.GE.N ) THEN
+       IF( MIN( M, N, NRHS ).EQ.0 ) THEN
+         WSIZEM = 1
+         WSIZEO = 1
+       ELSE IF( M.GE.N ) THEN
          CALL DGEQR( M, N, A, LDA, TQ, -1, WORKQ, -1, INFO2 )
          TSZO = INT( TQ( 1 ) )
          LWO  = INT( WORKQ( 1 ) )
@@ -264,17 +274,17 @@ SUBROUTINE DGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
        IF( ( LWORK.LT.WSIZEM ).AND.( .NOT.LQUERY ) ) THEN
           INFO = -10
        END IF
+*
+       WORK( 1 ) = DBLE( WSIZEO )
 *
       END IF
 *
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'DGETSLS', -INFO )
-        WORK( 1 ) = DBLE( WSIZEO )
         RETURN
       END IF
       IF( LQUERY ) THEN
-        IF( LWORK.EQ.-1 ) WORK( 1 ) = REAL( WSIZEO )
-        IF( LWORK.EQ.-2 ) WORK( 1 ) = REAL( WSIZEM )
+        IF( LWORK.EQ.-2 ) WORK( 1 ) = DBLE( WSIZEM )
         RETURN
       END IF
       IF( LWORK.LT.WSIZEO ) THEN
@@ -297,7 +307,6 @@ SUBROUTINE DGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
 *
        SMLNUM = DLAMCH( 'S' ) / DLAMCH( 'P' )
        BIGNUM = ONE / SMLNUM
-       CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A, B if max element outside range [SMLNUM,BIGNUM]
 *
diff --git a/SRC/dgetsqrhrt.f b/SRC/dgetsqrhrt.f
index 668deeba81..39ba99357d 100644
--- a/SRC/dgetsqrhrt.f
+++ b/SRC/dgetsqrhrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGETSQRHRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgetsqrhrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgetsqrhrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,14 +128,17 @@
 *>
 *> \param[in] LWORK
 *> \verbatim
+*>          LWORK is INTEGER
 *>          The dimension of the array WORK.
-*>          LWORK >= MAX( LWT + LW1, MAX( LWT+N*N+LW2, LWT+N*N+N ) ),
+*>          If MIN(M,N) = 0, LWORK >= 1, else
+*>          LWORK >= MAX( 1, LWT + LW1, MAX( LWT+N*N+LW2, LWT+N*N+N ) ),
 *>          where
 *>             NUM_ALL_ROW_BLOCKS = CEIL((M-N)/(MB1-N)),
 *>             NB1LOCAL = MIN(NB1,N).
 *>             LWT = NUM_ALL_ROW_BLOCKS * N * NB1LOCAL,
 *>             LW1 = NB1LOCAL * N,
-*>             LW2 = NB1LOCAL * MAX( NB1LOCAL, ( N - NB1LOCAL ) ),
+*>             LW2 = NB1LOCAL * MAX( NB1LOCAL, ( N - NB1LOCAL ) ).
+*>
 *>          If LWORK = -1, then a workspace query is assumed.
 *>          The routine only calculates the optimal size of the WORK
 *>          array, returns this value as the first entry of the WORK
@@ -160,7 +161,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup getsqrhrt
 *
 *> \par Contributors:
 *  ==================
@@ -174,7 +175,8 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
+      SUBROUTINE DGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT,
+     $                       WORK,
      $                       LWORK, INFO )
       IMPLICIT NONE
 *
@@ -201,7 +203,8 @@ SUBROUTINE DGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
      $                   NB1LOCAL, NB2LOCAL, NUM_ALL_ROW_BLOCKS
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLATSQR, DORGTSQR_ROW, DORHR_COL,
+      EXTERNAL           DCOPY, DLATSQR, DORGTSQR_ROW,
+     $                   DORHR_COL,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -212,7 +215,7 @@ SUBROUTINE DGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
 *     Test the input arguments
 *
       INFO = 0
-      LQUERY  = LWORK.EQ.-1
+      LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
       ELSE IF( N.LT.0 .OR. M.LT.N ) THEN
@@ -225,7 +228,7 @@ SUBROUTINE DGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
          INFO = -5
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -7
-      ELSE IF( LDT.LT.MAX( 1,  MIN( NB2, N ) ) ) THEN
+      ELSE IF( LDT.LT.MAX( 1, MIN( NB2, N ) ) ) THEN
          INFO = -9
       ELSE
 *
@@ -263,8 +266,9 @@ SUBROUTINE DGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
             LW2 = NB1LOCAL * MAX( NB1LOCAL, ( N - NB1LOCAL ) )
 *
             LWORKOPT = MAX( LWT + LW1, MAX( LWT+N*N+LW2, LWT+N*N+N ) )
+            LWORKOPT = MAX( 1, LWORKOPT )
 *
-            IF( ( LWORK.LT.MAX( 1, LWORKOPT ) ).AND.(.NOT.LQUERY) ) THEN
+            IF( LWORK.LT.LWORKOPT .AND. .NOT.LQUERY ) THEN
                INFO = -11
             END IF
 *
@@ -337,7 +341,8 @@ SUBROUTINE DGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
                A( I, J ) = -ONE * WORK( LWT+N*(J-1)+I )
             END DO
          ELSE
-            CALL DCOPY( N-I+1, WORK(LWT+N*(I-1)+I), N, A( I, I ), LDA )
+            CALL DCOPY( N-I+1, WORK(LWT+N*(I-1)+I), N, A( I, I ),
+     $                  LDA )
          END IF
       END DO
 *
@@ -346,4 +351,4 @@ SUBROUTINE DGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
 *
 *     End of DGETSQRHRT
 *
-      END
\ No newline at end of file
+      END
diff --git a/SRC/dggbak.f b/SRC/dggbak.f
index 76820e39d2..804e6fb2c4 100644
--- a/SRC/dggbak.f
+++ b/SRC/dggbak.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGBAK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dggbak.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dggbak.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,7 +128,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBcomputational
+*> \ingroup ggbak
 *
 *> \par Further Details:
 *  =====================
@@ -142,8 +140,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
+      SUBROUTINE DGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M,
+     $                   V,
      $                   LDV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -181,8 +181,10 @@ SUBROUTINE DGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
       LEFTV = LSAME( SIDE, 'L' )
 *
       INFO = 0
-      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
-     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+      IF( .NOT.LSAME( JOB, 'N' ) .AND.
+     $    .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND.
+     $                .NOT.LSAME( JOB, 'B' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.RIGHTV .AND. .NOT.LEFTV ) THEN
          INFO = -2
diff --git a/SRC/dggbal.f b/SRC/dggbal.f
index c588eceb46..a3537646f3 100644
--- a/SRC/dggbal.f
+++ b/SRC/dggbal.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGBAL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dggbal.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dggbal.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,7 +158,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBcomputational
+*> \ingroup ggbal
 *
 *> \par Further Details:
 *  =====================
@@ -174,6 +172,7 @@
 *  =====================================================================
       SUBROUTINE DGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
      $                   RSCALE, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -221,8 +220,10 @@ SUBROUTINE DGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
 *     Test the input parameters
 *
       INFO = 0
-      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
-     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+      IF( .NOT.LSAME( JOB, 'N' ) .AND.
+     $    .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND.
+     $                .NOT.LSAME( JOB, 'B' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -501,8 +502,10 @@ SUBROUTINE DGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
       IF( CMAX.LT.HALF )
      $   GO TO 350
 *
-      CALL DAXPY( NR, -ALPHA, WORK( ILO+2*N ), 1, WORK( ILO+4*N ), 1 )
-      CALL DAXPY( NR, -ALPHA, WORK( ILO+3*N ), 1, WORK( ILO+5*N ), 1 )
+      CALL DAXPY( NR, -ALPHA, WORK( ILO+2*N ), 1, WORK( ILO+4*N ),
+     $            1 )
+      CALL DAXPY( NR, -ALPHA, WORK( ILO+3*N ), 1, WORK( ILO+5*N ),
+     $            1 )
 *
       PGAMMA = GAMMA
       IT = IT + 1
diff --git a/SRC/dgges.f b/SRC/dgges.f
index 31db23715d..b700860f68 100644
--- a/SRC/dgges.f
+++ b/SRC/dgges.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGES + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgges.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgges.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -234,8 +232,8 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK.
-*>          If N = 0, LWORK >= 1, else LWORK >= 8*N+16.
-*>          For good performance , LWORK must generally be larger.
+*>          If N = 0, LWORK >= 1, else LWORK >= MAX(8*N,6*N+16).
+*>          For good performance, LWORK must generally be larger.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -275,12 +273,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEeigen
+*> \ingroup gges
 *
 *  =====================================================================
-      SUBROUTINE DGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
+      SUBROUTINE DGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
+     $                  LDB,
      $                  SDIM, ALPHAR, ALPHAI, BETA, VSL, LDVSL, VSR,
      $                  LDVSR, WORK, LWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -321,9 +321,9 @@ SUBROUTINE DGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
       DOUBLE PRECISION   DIF( 2 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEQRF, DGGBAK, DGGBAL, DGGHRD, DHGEQZ, DLABAD,
-     $                   DLACPY, DLASCL, DLASET, DORGQR, DORMQR, DTGSEN,
-     $                   XERBLA
+      EXTERNAL           DGEQRF, DGGBAK, DGGBAL, DGGHRD, DHGEQZ,
+     $                   DLACPY,
+     $                   DLASCL, DLASET, DORGQR, DORMQR, DTGSEN, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -370,7 +370,8 @@ SUBROUTINE DGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
          INFO = -1
       ELSE IF( IJOBVR.LE.0 ) THEN
          INFO = -2
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
          INFO = -5
@@ -400,7 +401,8 @@ SUBROUTINE DGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
      $                    N*ILAENV( 1, 'DORMQR', ' ', N, 1, N, -1 ) )
             IF( ILVSL ) THEN
                MAXWRK = MAX( MAXWRK, MINWRK - N +
-     $                       N*ILAENV( 1, 'DORGQR', ' ', N, 1, N, -1 ) )
+     $                       N*ILAENV( 1, 'DORGQR', ' ', N, 1, N,
+     $                                 -1 ) )
             END IF
          ELSE
             MINWRK = 1
@@ -431,7 +433,6 @@ SUBROUTINE DGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
       EPS = DLAMCH( 'P' )
       SAFMIN = DLAMCH( 'S' )
       SAFMAX = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       SMLNUM = SQRT( SAFMIN ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -546,15 +547,18 @@ SUBROUTINE DGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
      $                   IERR )
          END IF
          IF( ILBSCL )
-     $      CALL DLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N, IERR )
+     $      CALL DLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N,
+     $                   IERR )
 *
 *        Select eigenvalues
 *
          DO 10 I = 1, N
-            BWORK( I ) = SELCTG( ALPHAR( I ), ALPHAI( I ), BETA( I ) )
+            BWORK( I ) = SELCTG( ALPHAR( I ), ALPHAI( I ),
+     $             BETA( I ) )
    10    CONTINUE
 *
-         CALL DTGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB, ALPHAR,
+         CALL DTGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB,
+     $                ALPHAR,
      $                ALPHAI, BETA, VSL, LDVSL, VSR, LDVSR, SDIM, PVSL,
      $                PVSR, DIF, WORK( IWRK ), LWORK-IWRK+1, IDUM, 1,
      $                IERR )
@@ -618,8 +622,10 @@ SUBROUTINE DGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
 *
       IF( ILASCL ) THEN
          CALL DLASCL( 'H', 0, 0, ANRMTO, ANRM, N, N, A, LDA, IERR )
-         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N, IERR )
-         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N, IERR )
+         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N,
+     $                IERR )
+         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N,
+     $                IERR )
       END IF
 *
       IF( ILBSCL ) THEN
diff --git a/SRC/dgges3.f b/SRC/dgges3.f
index 7b00d294af..5ea3f5dbd1 100644
--- a/SRC/dgges3.f
+++ b/SRC/dgges3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGES3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgges3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgges3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -234,6 +232,8 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK.
+*>          If N = 0, LWORK >= 1, else LWORK >= 6*N+16.
+*>          For good performance, LWORK must generally be larger.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -273,12 +273,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEeigen
+*> \ingroup gges3
 *
 *  =====================================================================
       SUBROUTINE DGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
      $                   LDB, SDIM, ALPHAR, ALPHAI, BETA, VSL, LDVSL,
      $                   VSR, LDVSR, WORK, LWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -309,7 +310,8 @@ SUBROUTINE DGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
       LOGICAL            CURSL, ILASCL, ILBSCL, ILVSL, ILVSR, LASTSL,
      $                   LQUERY, LST2SL, WANTST
       INTEGER            I, ICOLS, IERR, IHI, IJOBVL, IJOBVR, ILEFT,
-     $                   ILO, IP, IRIGHT, IROWS, ITAU, IWRK, LWKOPT
+     $                   ILO, IP, IRIGHT, IROWS, ITAU, IWRK, LWKOPT,
+     $                   LWKMIN
       DOUBLE PRECISION   ANRM, ANRMTO, BIGNUM, BNRM, BNRMTO, EPS, PVSL,
      $                   PVSR, SAFMAX, SAFMIN, SMLNUM
 *     ..
@@ -318,9 +320,9 @@ SUBROUTINE DGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
       DOUBLE PRECISION   DIF( 2 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEQRF, DGGBAK, DGGBAL, DGGHD3, DLAQZ0, DLABAD,
-     $                   DLACPY, DLASCL, DLASET, DORGQR, DORMQR, DTGSEN,
-     $                   XERBLA
+      EXTERNAL           DGEQRF, DGGBAK, DGGBAL, DGGHD3, DLAQZ0,
+     $                   DLACPY,
+     $                   DLASCL, DLASET, DORGQR, DORMQR, DTGSEN, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -362,11 +364,18 @@ SUBROUTINE DGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
+      IF( N.EQ.0 ) THEN
+         LWKMIN = 1
+      ELSE
+         LWKMIN = 6*N+16
+      END IF
+*
       IF( IJOBVL.LE.0 ) THEN
          INFO = -1
       ELSE IF( IJOBVR.LE.0 ) THEN
          INFO = -2
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
          INFO = -5
@@ -378,7 +387,7 @@ SUBROUTINE DGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
          INFO = -15
       ELSE IF( LDVSR.LT.1 .OR. ( ILVSR .AND. LDVSR.LT.N ) ) THEN
          INFO = -17
-      ELSE IF( LWORK.LT.6*N+16 .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -19
       END IF
 *
@@ -386,29 +395,33 @@ SUBROUTINE DGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
 *
       IF( INFO.EQ.0 ) THEN
          CALL DGEQRF( N, N, B, LDB, WORK, WORK, -1, IERR )
-         LWKOPT = MAX( 6*N+16, 3*N+INT( WORK ( 1 ) ) )
+         LWKOPT = MAX( LWKMIN, 3*N+INT( WORK( 1 ) ) )
          CALL DORMQR( 'L', 'T', N, N, N, B, LDB, WORK, A, LDA, WORK,
      $                -1, IERR )
-         LWKOPT = MAX( LWKOPT, 3*N+INT( WORK ( 1 ) ) )
+         LWKOPT = MAX( LWKOPT, 3*N+INT( WORK( 1 ) ) )
          IF( ILVSL ) THEN
             CALL DORGQR( N, N, N, VSL, LDVSL, WORK, WORK, -1, IERR )
-            LWKOPT = MAX( LWKOPT, 3*N+INT( WORK ( 1 ) ) )
+            LWKOPT = MAX( LWKOPT, 3*N+INT( WORK( 1 ) ) )
          END IF
          CALL DGGHD3( JOBVSL, JOBVSR, N, 1, N, A, LDA, B, LDB, VSL,
      $                LDVSL, VSR, LDVSR, WORK, -1, IERR )
-         LWKOPT = MAX( LWKOPT, 3*N+INT( WORK ( 1 ) ) )
+         LWKOPT = MAX( LWKOPT, 3*N+INT( WORK( 1 ) ) )
          CALL DLAQZ0( 'S', JOBVSL, JOBVSR, N, 1, N, A, LDA, B, LDB,
      $                ALPHAR, ALPHAI, BETA, VSL, LDVSL, VSR, LDVSR,
      $                WORK, -1, 0, IERR )
-         LWKOPT = MAX( LWKOPT, 2*N+INT( WORK ( 1 ) ) )
+         LWKOPT = MAX( LWKOPT, 2*N+INT( WORK( 1 ) ) )
          IF( WANTST ) THEN
             CALL DTGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB,
      $                   ALPHAR, ALPHAI, BETA, VSL, LDVSL, VSR, LDVSR,
      $                   SDIM, PVSL, PVSR, DIF, WORK, -1, IDUM, 1,
      $                   IERR )
-            LWKOPT = MAX( LWKOPT, 2*N+INT( WORK ( 1 ) ) )
+            LWKOPT = MAX( LWKOPT, 2*N+INT( WORK( 1 ) ) )
+         END IF
+         IF( N.EQ.0 ) THEN
+            WORK( 1 ) = 1
+         ELSE
+            WORK( 1 ) = LWKOPT
          END IF
-         WORK( 1 ) = LWKOPT
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -430,7 +443,6 @@ SUBROUTINE DGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
       EPS = DLAMCH( 'P' )
       SAFMIN = DLAMCH( 'S' )
       SAFMAX = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       SMLNUM = SQRT( SAFMIN ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -539,15 +551,18 @@ SUBROUTINE DGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
      $                   IERR )
          END IF
          IF( ILBSCL )
-     $      CALL DLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N, IERR )
+     $      CALL DLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N,
+     $                   IERR )
 *
 *        Select eigenvalues
 *
          DO 10 I = 1, N
-            BWORK( I ) = SELCTG( ALPHAR( I ), ALPHAI( I ), BETA( I ) )
+            BWORK( I ) = SELCTG( ALPHAR( I ), ALPHAI( I ),
+     $             BETA( I ) )
    10    CONTINUE
 *
-         CALL DTGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB, ALPHAR,
+         CALL DTGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB,
+     $                ALPHAR,
      $                ALPHAI, BETA, VSL, LDVSL, VSR, LDVSR, SDIM, PVSL,
      $                PVSR, DIF, WORK( IWRK ), LWORK-IWRK+1, IDUM, 1,
      $                IERR )
@@ -610,8 +625,10 @@ SUBROUTINE DGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
 *
       IF( ILASCL ) THEN
          CALL DLASCL( 'H', 0, 0, ANRMTO, ANRM, N, N, A, LDA, IERR )
-         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N, IERR )
-         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N, IERR )
+         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N,
+     $                IERR )
+         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N,
+     $                IERR )
       END IF
 *
       IF( ILBSCL ) THEN
diff --git a/SRC/dggesx.f b/SRC/dggesx.f
index 932c74227a..c716af4c9f 100644
--- a/SRC/dggesx.f
+++ b/SRC/dggesx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGESX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dggesx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dggesx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -337,7 +335,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEeigen
+*> \ingroup ggesx
 *
 *> \par Further Details:
 *  =====================
@@ -358,10 +356,12 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
+      SUBROUTINE DGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A,
+     $                   LDA,
      $                   B, LDB, SDIM, ALPHAR, ALPHAI, BETA, VSL, LDVSL,
      $                   VSR, LDVSR, RCONDE, RCONDV, WORK, LWORK, IWORK,
      $                   LIWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -405,9 +405,9 @@ SUBROUTINE DGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
       DOUBLE PRECISION   DIF( 2 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEQRF, DGGBAK, DGGBAL, DGGHRD, DHGEQZ, DLABAD,
-     $                   DLACPY, DLASCL, DLASET, DORGQR, DORMQR, DTGSEN,
-     $                   XERBLA
+      EXTERNAL           DGEQRF, DGGBAK, DGGBAL, DGGHRD, DHGEQZ,
+     $                   DLACPY,
+     $                   DLASCL, DLASET, DORGQR, DORMQR, DTGSEN, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -467,7 +467,8 @@ SUBROUTINE DGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
          INFO = -1
       ELSE IF( IJOBVR.LE.0 ) THEN
          INFO = -2
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( .NOT.( WANTSN .OR. WANTSE .OR. WANTSV .OR. WANTSB ) .OR.
      $         ( .NOT.WANTST .AND. .NOT.WANTSN ) ) THEN
@@ -544,7 +545,6 @@ SUBROUTINE DGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
       EPS = DLAMCH( 'P' )
       SAFMIN = DLAMCH( 'S' )
       SAFMAX = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       SMLNUM = SQRT( SAFMIN ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -662,12 +662,14 @@ SUBROUTINE DGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
      $                   IERR )
          END IF
          IF( ILBSCL )
-     $      CALL DLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N, IERR )
+     $      CALL DLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N,
+     $                   IERR )
 *
 *        Select eigenvalues
 *
          DO 10 I = 1, N
-            BWORK( I ) = SELCTG( ALPHAR( I ), ALPHAI( I ), BETA( I ) )
+            BWORK( I ) = SELCTG( ALPHAR( I ), ALPHAI( I ),
+     $             BETA( I ) )
    10    CONTINUE
 *
 *        Reorder eigenvalues, transform Generalized Schur vectors, and
@@ -755,8 +757,10 @@ SUBROUTINE DGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
 *
       IF( ILASCL ) THEN
          CALL DLASCL( 'H', 0, 0, ANRMTO, ANRM, N, N, A, LDA, IERR )
-         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N, IERR )
-         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N, IERR )
+         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N,
+     $                IERR )
+         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N,
+     $                IERR )
       END IF
 *
       IF( ILBSCL ) THEN
diff --git a/SRC/dggev.f b/SRC/dggev.f
index a02203e059..3b8df6be96 100644
--- a/SRC/dggev.f
+++ b/SRC/dggev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dggev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dggev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -218,11 +216,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEeigen
+*> \ingroup ggev
 *
 *  =====================================================================
-      SUBROUTINE DGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
+      SUBROUTINE DGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
+     $                  ALPHAI,
      $                  BETA, VL, LDVL, VR, LDVR, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -257,9 +257,9 @@ SUBROUTINE DGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
       LOGICAL            LDUMMA( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEQRF, DGGBAK, DGGBAL, DGGHRD, DHGEQZ, DLABAD,
-     $                   DLACPY,DLASCL, DLASET, DORGQR, DORMQR, DTGEVC,
-     $                   XERBLA
+      EXTERNAL           DGEQRF, DGGBAK, DGGBAL, DGGHRD, DHGEQZ,
+     $                   DLACPY,
+     $                   DLASCL, DLASET, DORGQR, DORMQR, DTGEVC, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -358,7 +358,6 @@ SUBROUTINE DGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -489,7 +488,8 @@ SUBROUTINE DGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
          ELSE
             CHTEMP = 'R'
          END IF
-         CALL DTGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL, LDVL,
+         CALL DTGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL,
+     $                LDVL,
      $                VR, LDVR, N, IN, WORK( IWRK ), IERR )
          IF( IERR.NE.0 ) THEN
             INFO = N + 2
@@ -573,8 +573,10 @@ SUBROUTINE DGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
   110 CONTINUE
 *
       IF( ILASCL ) THEN
-         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N, IERR )
-         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N, IERR )
+         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N,
+     $                IERR )
+         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N,
+     $                IERR )
       END IF
 *
       IF( ILBSCL ) THEN
diff --git a/SRC/dggev3.f b/SRC/dggev3.f
index 4bbe8a40f5..bbde307d22 100644
--- a/SRC/dggev3.f
+++ b/SRC/dggev3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGEV3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dggev3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dggev3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -188,7 +186,9 @@
 *>
 *> \param[in] LWORK
 *> \verbatim
-*>          LWORK is INTEGER
+*>          LWORK is INTEGER.
+*>          The dimension of the array WORK. LWORK >= MAX(1,8*N).
+*>          For good performance, LWORK should generally be larger.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -217,12 +217,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEeigen
+*> \ingroup ggev3
 *
 *  =====================================================================
       SUBROUTINE DGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
      $                   ALPHAI, BETA, VL, LDVL, VR, LDVR, WORK, LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -248,7 +249,8 @@ SUBROUTINE DGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
       LOGICAL            ILASCL, ILBSCL, ILV, ILVL, ILVR, LQUERY
       CHARACTER          CHTEMP
       INTEGER            ICOLS, IERR, IHI, IJOBVL, IJOBVR, ILEFT, ILO,
-     $                   IN, IRIGHT, IROWS, ITAU, IWRK, JC, JR, LWKOPT
+     $                   IN, IRIGHT, IROWS, ITAU, IWRK, JC, JR, LWKOPT,
+     $                   LWKMIN
       DOUBLE PRECISION   ANRM, ANRMTO, BIGNUM, BNRM, BNRMTO, EPS,
      $                   SMLNUM, TEMP
 *     ..
@@ -256,9 +258,10 @@ SUBROUTINE DGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
       LOGICAL            LDUMMA( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEQRF, DGGBAK, DGGBAL, DGGHD3, DLAQZ0, DLABAD,
-     $                   DLACPY, DLASCL, DLASET, DORGQR, DORMQR, DTGEVC,
-     $                   XERBLA
+      EXTERNAL           DGEQRF, DGGBAK, DGGBAL,
+     $                   DGGHD3, DLAQZ0, DLACPY,
+     $                   DLASCL, DLASET, DORGQR,
+     $                   DORMQR, DTGEVC, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -299,6 +302,7 @@ SUBROUTINE DGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
+      LWKMIN = MAX( 1, 8*N )
       IF( IJOBVL.LE.0 ) THEN
          INFO = -1
       ELSE IF( IJOBVR.LE.0 ) THEN
@@ -313,7 +317,7 @@ SUBROUTINE DGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
          INFO = -12
       ELSE IF( LDVR.LT.1 .OR. ( ILVR .AND. LDVR.LT.N ) ) THEN
          INFO = -14
-      ELSE IF( LWORK.LT.MAX( 1, 8*N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -16
       END IF
 *
@@ -321,13 +325,13 @@ SUBROUTINE DGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
 *
       IF( INFO.EQ.0 ) THEN
          CALL DGEQRF( N, N, B, LDB, WORK, WORK, -1, IERR )
-         LWKOPT = MAX(1, 8*N, 3*N+INT( WORK( 1 ) ) )
-         CALL DORMQR( 'L', 'T', N, N, N, B, LDB, WORK, A, LDA, WORK, -1,
-     $                IERR )
-         LWKOPT = MAX( LWKOPT, 3*N+INT( WORK ( 1 ) ) )
+         LWKOPT = MAX( LWKMIN, 3*N+INT( WORK( 1 ) ) )
+         CALL DORMQR( 'L', 'T', N, N, N, B, LDB, WORK, A, LDA,
+     $                WORK, -1, IERR )
+         LWKOPT = MAX( LWKOPT, 3*N+INT( WORK( 1 ) ) )
          IF( ILVL ) THEN
             CALL DORGQR( N, N, N, VL, LDVL, WORK, WORK, -1, IERR )
-            LWKOPT = MAX( LWKOPT, 3*N+INT( WORK ( 1 ) ) )
+            LWKOPT = MAX( LWKOPT, 3*N+INT( WORK( 1 ) ) )
          END IF
          IF( ILV ) THEN
             CALL DGGHD3( JOBVL, JOBVR, N, 1, N, A, LDA, B, LDB, VL,
@@ -336,18 +340,21 @@ SUBROUTINE DGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
             CALL DLAQZ0( 'S', JOBVL, JOBVR, N, 1, N, A, LDA, B, LDB,
      $                   ALPHAR, ALPHAI, BETA, VL, LDVL, VR, LDVR,
      $                   WORK, -1, 0, IERR )
-            LWKOPT = MAX( LWKOPT, 2*N+INT( WORK ( 1 ) ) )
+            LWKOPT = MAX( LWKOPT, 2*N+INT( WORK( 1 ) ) )
          ELSE
             CALL DGGHD3( 'N', 'N', N, 1, N, A, LDA, B, LDB, VL, LDVL,
      $                   VR, LDVR, WORK, -1, IERR )
-            LWKOPT = MAX( LWKOPT, 3*N+INT( WORK ( 1 ) ) )
+            LWKOPT = MAX( LWKOPT, 3*N+INT( WORK( 1 ) ) )
             CALL DLAQZ0( 'E', JOBVL, JOBVR, N, 1, N, A, LDA, B, LDB,
      $                   ALPHAR, ALPHAI, BETA, VL, LDVL, VR, LDVR,
      $                   WORK, -1, 0, IERR )
-            LWKOPT = MAX( LWKOPT, 2*N+INT( WORK ( 1 ) ) )
+            LWKOPT = MAX( LWKOPT, 2*N+INT( WORK( 1 ) ) )
+         END IF
+         IF( N.EQ.0 ) THEN
+            WORK( 1 ) = 1
+         ELSE
+            WORK( 1 ) = LWKOPT
          END IF
-
-         WORK( 1 ) = LWKOPT
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -367,7 +374,6 @@ SUBROUTINE DGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -492,7 +498,8 @@ SUBROUTINE DGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
          ELSE
             CHTEMP = 'R'
          END IF
-         CALL DTGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL, LDVL,
+         CALL DTGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL,
+     $                LDVL,
      $                VR, LDVR, N, IN, WORK( IWRK ), IERR )
          IF( IERR.NE.0 ) THEN
             INFO = N + 2
@@ -575,8 +582,10 @@ SUBROUTINE DGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
   110 CONTINUE
 *
       IF( ILASCL ) THEN
-         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N, IERR )
-         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N, IERR )
+         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N,
+     $                IERR )
+         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N,
+     $                IERR )
       END IF
 *
       IF( ILBSCL ) THEN
diff --git a/SRC/dggevx.f b/SRC/dggevx.f
index b69f3f9bf6..c0e168e8f9 100644
--- a/SRC/dggevx.f
+++ b/SRC/dggevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dggevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dggevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -352,7 +350,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEeigen
+*> \ingroup ggevx
 *
 *> \par Further Details:
 *  =====================
@@ -384,10 +382,12 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
+      SUBROUTINE DGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B,
+     $                   LDB,
      $                   ALPHAR, ALPHAI, BETA, VL, LDVL, VR, LDVR, ILO,
      $                   IHI, LSCALE, RSCALE, ABNRM, BBNRM, RCONDE,
      $                   RCONDV, WORK, LWORK, IWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -427,9 +427,10 @@ SUBROUTINE DGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
       LOGICAL            LDUMMA( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEQRF, DGGBAK, DGGBAL, DGGHRD, DHGEQZ, DLABAD,
-     $                   DLACPY, DLASCL, DLASET, DORGQR, DORMQR, DTGEVC,
-     $                   DTGSNA, XERBLA
+      EXTERNAL           DGEQRF, DGGBAK, DGGBAL, DGGHRD, DHGEQZ,
+     $                   DLACPY,
+     $                   DLASCL, DLASET, DORGQR, DORMQR, DTGEVC, DTGSNA,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -478,7 +479,9 @@ SUBROUTINE DGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
       IF( .NOT.( LSAME( BALANC, 'N' ) .OR. LSAME( BALANC,
-     $    'S' ) .OR. LSAME( BALANC, 'P' ) .OR. LSAME( BALANC, 'B' ) ) )
+     $    'S' ) .OR.
+     $                      LSAME( BALANC, 'P' ) .OR.
+     $                      LSAME( BALANC, 'B' ) ) )
      $     THEN
          INFO = -1
       ELSE IF( IJOBVL.LE.0 ) THEN
@@ -526,12 +529,15 @@ SUBROUTINE DGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
             END IF
             MAXWRK = MINWRK
             MAXWRK = MAX( MAXWRK,
-     $                    N + N*ILAENV( 1, 'DGEQRF', ' ', N, 1, N, 0 ) )
+     $                    N + N*ILAENV( 1, 'DGEQRF', ' ', N, 1, N,
+     $                                  0 ) )
             MAXWRK = MAX( MAXWRK,
-     $                    N + N*ILAENV( 1, 'DORMQR', ' ', N, 1, N, 0 ) )
+     $                    N + N*ILAENV( 1, 'DORMQR', ' ', N, 1, N,
+     $                                  0 ) )
             IF( ILVL ) THEN
                MAXWRK = MAX( MAXWRK, N +
-     $                       N*ILAENV( 1, 'DORGQR', ' ', N, 1, N, 0 ) )
+     $                       N*ILAENV( 1, 'DORGQR', ' ', N, 1, N,
+     $                                 0 ) )
             END IF
          END IF
          WORK( 1 ) = MAXWRK
@@ -559,7 +565,6 @@ SUBROUTINE DGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -594,7 +599,8 @@ SUBROUTINE DGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
 *     Permute and/or balance the matrix pair (A,B)
 *     (Workspace: need 6*N if BALANC = 'S' or 'B', 1 otherwise)
 *
-      CALL DGGBAL( BALANC, N, A, LDA, B, LDB, ILO, IHI, LSCALE, RSCALE,
+      CALL DGGBAL( BALANC, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
+     $             RSCALE,
      $             WORK, IERR )
 *
 *     Compute ABNRM and BBNRM
@@ -779,7 +785,8 @@ SUBROUTINE DGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
 *     (Workspace: none needed)
 *
       IF( ILVL ) THEN
-         CALL DGGBAK( BALANC, 'L', N, ILO, IHI, LSCALE, RSCALE, N, VL,
+         CALL DGGBAK( BALANC, 'L', N, ILO, IHI, LSCALE, RSCALE, N,
+     $                VL,
      $                LDVL, IERR )
 *
          DO 70 JC = 1, N
@@ -812,7 +819,8 @@ SUBROUTINE DGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
    70    CONTINUE
       END IF
       IF( ILVR ) THEN
-         CALL DGGBAK( BALANC, 'R', N, ILO, IHI, LSCALE, RSCALE, N, VR,
+         CALL DGGBAK( BALANC, 'R', N, ILO, IHI, LSCALE, RSCALE, N,
+     $                VR,
      $                LDVR, IERR )
          DO 120 JC = 1, N
             IF( ALPHAI( JC ).LT.ZERO )
@@ -849,8 +857,10 @@ SUBROUTINE DGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
   130 CONTINUE
 *
       IF( ILASCL ) THEN
-         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N, IERR )
-         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N, IERR )
+         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N,
+     $                IERR )
+         CALL DLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N,
+     $                IERR )
       END IF
 *
       IF( ILBSCL ) THEN
diff --git a/SRC/dggglm.f b/SRC/dggglm.f
index d43785d32d..32a3f8a9b2 100644
--- a/SRC/dggglm.f
+++ b/SRC/dggglm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGGLM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dggglm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dggglm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -61,6 +59,16 @@
 *>                  x
 *>
 *> where inv(B) denotes the inverse of B.
+*>
+*> Callers of this subroutine should note that the singularity/rank-deficiency checks
+*> implemented in this subroutine are rudimentary. The DTRTRS subroutine called by this
+*> subroutine only signals a failure due to singularity if the problem is exactly singular.
+*>
+*> It is conceivable for one (or more) of the factors involved in the generalized QR
+*> factorization of the pair (A, B) to be subnormally close to singularity without this
+*> subroutine signalling an error. The solutions computed for such almost-rank-deficient
+*> problems may be less accurate due to a loss of numerical precision.
+*> 
 *> \endverbatim
 *
 *  Arguments:
@@ -159,12 +167,12 @@
 *>          = 0:  successful exit.
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value.
 *>          = 1:  the upper triangular factor R associated with A in the
-*>                generalized QR factorization of the pair (A, B) is
+*>                generalized QR factorization of the pair (A, B) is exactly
 *>                singular, so that rank(A) < M; the least squares
 *>                solution could not be computed.
 *>          = 2:  the bottom (N-M) by (N-M) part of the upper trapezoidal
 *>                factor T associated with B in the generalized QR
-*>                factorization of the pair (A, B) is singular, so that
+*>                factorization of the pair (A, B) is exactly singular, so that
 *>                rank( A B ) < N; the least squares solution could not
 *>                be computed.
 *> \endverbatim
@@ -177,11 +185,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup ggglm
 *
 *  =====================================================================
-      SUBROUTINE DGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
+      SUBROUTINE DGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK,
+     $                   LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -207,7 +217,8 @@ SUBROUTINE DGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
      $                   NB4, NP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEMV, DGGQRF, DORMQR, DORMRQ, DTRTRS,
+      EXTERNAL           DCOPY, DGEMV, DGGQRF, DORMQR, DORMRQ,
+     $                   DTRTRS,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
@@ -288,7 +299,7 @@ SUBROUTINE DGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
 *
       CALL DGGQRF( N, M, P, A, LDA, WORK, B, LDB, WORK( M+1 ),
      $             WORK( M+NP+1 ), LWORK-M-NP, INFO )
-      LOPT = WORK( M+NP+1 )
+      LOPT = INT( WORK( M+NP+1 ) )
 *
 *     Update left-hand-side vector d = Q**T*d = ( d1 ) M
 *                                               ( d2 ) N-M
@@ -325,7 +336,8 @@ SUBROUTINE DGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
 *     Solve triangular system: R11*x = d1
 *
       IF( M.GT.0 ) THEN
-         CALL DTRTRS( 'Upper', 'No Transpose', 'Non unit', M, 1, A, LDA,
+         CALL DTRTRS( 'Upper', 'No Transpose', 'Non unit', M, 1, A,
+     $                LDA,
      $                D, M, INFO )
 *
          IF( INFO.GT.0 ) THEN
diff --git a/SRC/dgghd3.f b/SRC/dgghd3.f
index 43d7a77df5..18ade9b69d 100644
--- a/SRC/dgghd3.f
+++ b/SRC/dgghd3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGHD3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgghd3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgghd3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -179,14 +177,14 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (LWORK)
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
-*> \param[in]  LWORK
+*> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of the array WORK.  LWORK >= 1.
+*>          The length of the array WORK. LWORK >= 1.
 *>          For optimum performance LWORK >= 6*N*NB, where NB is the
 *>          optimal blocksize.
 *>
@@ -211,7 +209,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup gghd3
 *
 *> \par Further Details:
 *  =====================
@@ -225,7 +223,8 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
+      SUBROUTINE DGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB,
+     $                   Q,
      $                   LDQ, Z, LDZ, WORK, LWORK, INFO )
 *
 *  -- LAPACK computational routine --
@@ -263,7 +262,8 @@ SUBROUTINE DGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
       EXTERNAL           ILAENV, LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGGHRD, DLARTG, DLASET, DORM22, DROT, DGEMM,
+      EXTERNAL           DGGHRD, DLARTG, DLASET, DORM22, DROT,
+     $                   DGEMM,
      $                   DGEMV, DTRMV, DLACPY, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -275,7 +275,12 @@ SUBROUTINE DGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
       INFO = 0
       NB = ILAENV( 1, 'DGGHD3', ' ', N, ILO, IHI, -1 )
-      LWKOPT = MAX( 6*N*NB, 1 )
+      NH = IHI - ILO + 1
+      IF( NH.LE.1 ) THEN
+         LWKOPT = 1
+      ELSE
+         LWKOPT = 6*N*NB
+      END IF
       WORK( 1 ) = DBLE( LWKOPT )
       INITQ = LSAME( COMPQ, 'I' )
       WANTQ = INITQ .OR. LSAME( COMPQ, 'V' )
@@ -325,7 +330,6 @@ SUBROUTINE DGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
 *     Quick return if possible
 *
-      NH = IHI - ILO + 1
       IF( NH.LE.1 ) THEN
          WORK( 1 ) = ONE
          RETURN
@@ -383,7 +387,8 @@ SUBROUTINE DGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
             N2NB = ( IHI-JCOL-1 ) / NNB - 1
             NBLST = IHI - JCOL - N2NB*NNB
-            CALL DLASET( 'All', NBLST, NBLST, ZERO, ONE, WORK, NBLST )
+            CALL DLASET( 'All', NBLST, NBLST, ZERO, ONE, WORK,
+     $                   NBLST )
             PW = NBLST * NBLST + 1
             DO I = 1, N2NB
                CALL DLASET( 'All', 2*NNB, 2*NNB, ZERO, ONE,
@@ -580,10 +585,12 @@ SUBROUTINE DGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
                         WORK( PPW ) = A( I, J+1 )
                         PPW = PPW + 1
                      END DO
-                     CALL DTRMV( 'Upper', 'Transpose', 'Non-unit', LEN,
+                     CALL DTRMV( 'Upper', 'Transpose', 'Non-unit',
+     $                           LEN,
      $                           WORK( PPWO + NNB ), 2*NNB, WORK( PW ),
      $                           1 )
-                     CALL DTRMV( 'Lower', 'Transpose', 'Non-unit', NNB,
+                     CALL DTRMV( 'Lower', 'Transpose', 'Non-unit',
+     $                           NNB,
      $                           WORK( PPWO + 2*LEN*NNB ),
      $                           2*NNB, WORK( PW + LEN ), 1 )
                      CALL DGEMV( 'Transpose', NNB, LEN, ONE,
@@ -772,7 +779,8 @@ SUBROUTINE DGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
 *                    Exploit the structure of U.
 *
-                     CALL DORM22( 'Right', 'No Transpose', TOP, 2*NNB,
+                     CALL DORM22( 'Right', 'No Transpose', TOP,
+     $                            2*NNB,
      $                            NNB, NNB, WORK( PPWO ), 2*NNB,
      $                            A( 1, J ), LDA, WORK( PW ),
      $                            LWORK-PW+1, IERR )
@@ -803,7 +811,8 @@ SUBROUTINE DGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
 *                    Exploit the structure of U.
 *
-                     CALL DORM22( 'Right', 'No Transpose', TOP, 2*NNB,
+                     CALL DORM22( 'Right', 'No Transpose', TOP,
+     $                            2*NNB,
      $                            NNB, NNB, WORK( PPWO ), 2*NNB,
      $                            B( 1, J ), LDB, WORK( PW ),
      $                            LWORK-PW+1, IERR )
@@ -883,8 +892,10 @@ SUBROUTINE DGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
       END IF
 *
       IF ( JCOL.LT.IHI )
-     $   CALL DGGHRD( COMPQ2, COMPZ2, N, JCOL, IHI, A, LDA, B, LDB, Q,
+     $   CALL DGGHRD( COMPQ2, COMPZ2, N, JCOL, IHI, A, LDA, B, LDB,
+     $                Q,
      $                LDQ, Z, LDZ, IERR )
+*
       WORK( 1 ) = DBLE( LWKOPT )
 *
       RETURN
diff --git a/SRC/dgghrd.f b/SRC/dgghrd.f
index 2f71a84103..3e1d68bf7a 100644
--- a/SRC/dgghrd.f
+++ b/SRC/dgghrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGHRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgghrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgghrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -189,7 +187,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup gghrd
 *
 *> \par Further Details:
 *  =====================
@@ -202,8 +200,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DGGHRD( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
+      SUBROUTINE DGGHRD( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB,
+     $                   Q,
      $                   LDQ, Z, LDZ, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -335,7 +335,8 @@ SUBROUTINE DGGHRD( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
             CALL DROT( N+2-JROW, B( JROW-1, JROW-1 ), LDB,
      $                 B( JROW, JROW-1 ), LDB, C, S )
             IF( ILQ )
-     $         CALL DROT( N, Q( 1, JROW-1 ), 1, Q( 1, JROW ), 1, C, S )
+     $         CALL DROT( N, Q( 1, JROW-1 ), 1, Q( 1, JROW ), 1, C,
+     $                    S )
 *
 *           Step 2: rotate columns JROW, JROW-1 to kill B(JROW,JROW-1)
 *
@@ -343,11 +344,13 @@ SUBROUTINE DGGHRD( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
             CALL DLARTG( TEMP, B( JROW, JROW-1 ), C, S,
      $                   B( JROW, JROW ) )
             B( JROW, JROW-1 ) = ZERO
-            CALL DROT( IHI, A( 1, JROW ), 1, A( 1, JROW-1 ), 1, C, S )
+            CALL DROT( IHI, A( 1, JROW ), 1, A( 1, JROW-1 ), 1, C,
+     $                 S )
             CALL DROT( JROW-1, B( 1, JROW ), 1, B( 1, JROW-1 ), 1, C,
      $                 S )
             IF( ILZ )
-     $         CALL DROT( N, Z( 1, JROW ), 1, Z( 1, JROW-1 ), 1, C, S )
+     $         CALL DROT( N, Z( 1, JROW ), 1, Z( 1, JROW-1 ), 1, C,
+     $                    S )
    30    CONTINUE
    40 CONTINUE
 *
diff --git a/SRC/dgglse.f b/SRC/dgglse.f
index 2fd17bbcb5..6c1198af19 100644
--- a/SRC/dgglse.f
+++ b/SRC/dgglse.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGLSE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgglse.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgglse.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -52,6 +50,16 @@
 *> matrices (B, A) given by
 *>
 *>    B = (0 R)*Q,   A = Z*T*Q.
+*>
+*> Callers of this subroutine should note that the singularity/rank-deficiency checks
+*> implemented in this subroutine are rudimentary. The DTRTRS subroutine called by this
+*> subroutine only signals a failure due to singularity if the problem is exactly singular.
+*>
+*> It is conceivable for one (or more) of the factors involved in the generalized RQ
+*> factorization of the pair (B, A) to be subnormally close to singularity without this
+*> subroutine signalling an error. The solutions computed for such almost-rank-deficient
+*> problems may be less accurate due to a loss of numerical precision.
+*> 
 *> \endverbatim
 *
 *  Arguments:
@@ -153,12 +161,12 @@
 *>          = 0:  successful exit.
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value.
 *>          = 1:  the upper triangular factor R associated with B in the
-*>                generalized RQ factorization of the pair (B, A) is
+*>                generalized RQ factorization of the pair (B, A) is exactly
 *>                singular, so that rank(B) < P; the least squares
 *>                solution could not be computed.
 *>          = 2:  the (N-P) by (N-P) part of the upper trapezoidal factor
 *>                T associated with A in the generalized RQ factorization
-*>                of the pair (B, A) is singular, so that
+*>                of the pair (B, A) is exactly singular, so that
 *>                rank( (A) ) < N; the least squares solution could not
 *>                    ( (B) )
 *>                be computed.
@@ -172,11 +180,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERsolve
+*> \ingroup gglse
 *
 *  =====================================================================
-      SUBROUTINE DGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
+      SUBROUTINE DGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK,
+     $                   LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -202,7 +212,8 @@ SUBROUTINE DGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
      $                   NB4, NR
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DGEMV, DGGRQF, DORMQR, DORMRQ,
+      EXTERNAL           DAXPY, DCOPY, DGEMV, DGGRQF, DORMQR,
+     $                   DORMRQ,
      $                   DTRMV, DTRTRS, XERBLA
 *     ..
 *     .. External Functions ..
@@ -276,12 +287,13 @@ SUBROUTINE DGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
 *
       CALL DGGRQF( P, M, N, B, LDB, WORK, A, LDA, WORK( P+1 ),
      $             WORK( P+MN+1 ), LWORK-P-MN, INFO )
-      LOPT = WORK( P+MN+1 )
+      LOPT = INT( WORK( P+MN+1 ) )
 *
 *     Update c = Z**T *c = ( c1 ) N-P
 *                          ( c2 ) M+P-N
 *
-      CALL DORMQR( 'Left', 'Transpose', M, 1, MN, A, LDA, WORK( P+1 ),
+      CALL DORMQR( 'Left', 'Transpose', M, 1, MN, A, LDA,
+     $             WORK( P+1 ),
      $             C, MAX( 1, M ), WORK( P+MN+1 ), LWORK-P-MN, INFO )
       LOPT = MAX( LOPT, INT( WORK( P+MN+1 ) ) )
 *
@@ -302,7 +314,8 @@ SUBROUTINE DGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
 *
 *        Update c1
 *
-         CALL DGEMV( 'No transpose', N-P, P, -ONE, A( 1, N-P+1 ), LDA,
+         CALL DGEMV( 'No transpose', N-P, P, -ONE, A( 1, N-P+1 ),
+     $               LDA,
      $               D, 1, ONE, C, 1 )
       END IF
 *
@@ -327,7 +340,8 @@ SUBROUTINE DGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
       IF( M.LT.N ) THEN
          NR = M + P - N
          IF( NR.GT.0 )
-     $      CALL DGEMV( 'No transpose', NR, N-M, -ONE, A( N-P+1, M+1 ),
+     $      CALL DGEMV( 'No transpose', NR, N-M, -ONE, A( N-P+1,
+     $                  M+1 ),
      $                  LDA, D( NR+1 ), 1, ONE, C( N-P+1 ), 1 )
       ELSE
          NR = P
@@ -340,7 +354,8 @@ SUBROUTINE DGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
 *
 *     Backward transformation x = Q**T*x
 *
-      CALL DORMRQ( 'Left', 'Transpose', N, 1, P, B, LDB, WORK( 1 ), X,
+      CALL DORMRQ( 'Left', 'Transpose', N, 1, P, B, LDB, WORK( 1 ),
+     $             X,
      $             N, WORK( P+MN+1 ), LWORK-P-MN, INFO )
       WORK( 1 ) = P + MN + MAX( LOPT, INT( WORK( P+MN+1 ) ) )
 *
diff --git a/SRC/dggqrf.f b/SRC/dggqrf.f
index 617af274ff..4aeac8677f 100644
--- a/SRC/dggqrf.f
+++ b/SRC/dggqrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGQRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dggqrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dggqrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -173,7 +171,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup ggqrf
 *
 *> \par Further Details:
 *  =====================
@@ -212,6 +210,7 @@
 *  =====================================================================
       SUBROUTINE DGGQRF( N, M, P, A, LDA, TAUA, B, LDB, TAUB, WORK,
      $                   LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -250,7 +249,7 @@ SUBROUTINE DGGQRF( N, M, P, A, LDA, TAUA, B, LDB, TAUB, WORK,
       NB2 = ILAENV( 1, 'DGERQF', ' ', N, P, -1, -1 )
       NB3 = ILAENV( 1, 'DORMQR', ' ', N, M, P, -1 )
       NB = MAX( NB1, NB2, NB3 )
-      LWKOPT = MAX( N, M, P )*NB
+      LWKOPT = MAX( 1, MAX( N, M, P )*NB )
       WORK( 1 ) = LWKOPT
       LQUERY = ( LWORK.EQ.-1 )
       IF( N.LT.0 ) THEN
@@ -276,17 +275,19 @@ SUBROUTINE DGGQRF( N, M, P, A, LDA, TAUA, B, LDB, TAUB, WORK,
 *     QR factorization of N-by-M matrix A: A = Q*R
 *
       CALL DGEQRF( N, M, A, LDA, TAUA, WORK, LWORK, INFO )
-      LOPT = WORK( 1 )
+      LOPT = INT( WORK( 1 ) )
 *
 *     Update B := Q**T*B.
 *
-      CALL DORMQR( 'Left', 'Transpose', N, P, MIN( N, M ), A, LDA, TAUA,
+      CALL DORMQR( 'Left', 'Transpose', N, P, MIN( N, M ), A, LDA,
+     $             TAUA,
      $             B, LDB, WORK, LWORK, INFO )
       LOPT = MAX( LOPT, INT( WORK( 1 ) ) )
 *
 *     RQ factorization of N-by-P matrix B: B = T*Z.
 *
       CALL DGERQF( N, P, B, LDB, TAUB, WORK, LWORK, INFO )
+*
       WORK( 1 ) = MAX( LOPT, INT( WORK( 1 ) ) )
 *
       RETURN
diff --git a/SRC/dggrqf.f b/SRC/dggrqf.f
index 07f8752d80..be55eac72a 100644
--- a/SRC/dggrqf.f
+++ b/SRC/dggrqf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGRQF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dggrqf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dggrqf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -172,7 +170,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup ggrqf
 *
 *> \par Further Details:
 *  =====================
@@ -211,6 +209,7 @@
 *  =====================================================================
       SUBROUTINE DGGRQF( M, P, N, A, LDA, TAUA, B, LDB, TAUB, WORK,
      $                   LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -249,7 +248,7 @@ SUBROUTINE DGGRQF( M, P, N, A, LDA, TAUA, B, LDB, TAUB, WORK,
       NB2 = ILAENV( 1, 'DGEQRF', ' ', P, N, -1, -1 )
       NB3 = ILAENV( 1, 'DORMRQ', ' ', M, N, P, -1 )
       NB = MAX( NB1, NB2, NB3 )
-      LWKOPT = MAX( N, M, P )*NB
+      LWKOPT = MAX( 1, MAX( N, M, P )*NB )
       WORK( 1 ) = LWKOPT
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
@@ -275,7 +274,7 @@ SUBROUTINE DGGRQF( M, P, N, A, LDA, TAUA, B, LDB, TAUB, WORK,
 *     RQ factorization of M-by-N matrix A: A = R*Q
 *
       CALL DGERQF( M, N, A, LDA, TAUA, WORK, LWORK, INFO )
-      LOPT = WORK( 1 )
+      LOPT = INT( WORK( 1 ) )
 *
 *     Update B := B*Q**T
 *
diff --git a/SRC/dggsvd3.f b/SRC/dggsvd3.f
index 503f0d8cc7..21ac309fcb 100644
--- a/SRC/dggsvd3.f
+++ b/SRC/dggsvd3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGSVD3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dggsvd3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dggsvd3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -278,7 +276,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -328,7 +326,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEsing
+*> \ingroup ggsvd3
 *
 *> \par Contributors:
 *  ==================
@@ -346,6 +344,7 @@
       SUBROUTINE DGGSVD3( JOBU, JOBV, JOBQ, M, N, P, K, L, A, LDA, B,
      $                    LDB, ALPHA, BETA, U, LDU, V, LDV, Q, LDQ,
      $                    WORK, LWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -423,7 +422,8 @@ SUBROUTINE DGGSVD3( JOBU, JOBV, JOBQ, M, N, P, K, L, A, LDA, B,
 *     Compute workspace
 *
       IF( INFO.EQ.0 ) THEN
-         CALL DGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB, TOLA,
+         CALL DGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
+     $                 TOLA,
      $                 TOLB, K, L, U, LDU, V, LDV, Q, LDQ, IWORK, WORK,
      $                 WORK, -1, INFO )
          LWKOPT = N + INT( WORK( 1 ) )
diff --git a/SRC/dggsvp3.f b/SRC/dggsvp3.f
index 4e1db3117b..ca488f2f29 100644
--- a/SRC/dggsvp3.f
+++ b/SRC/dggsvp3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGGSVP3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dggsvp3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dggsvp3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -227,7 +225,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -250,7 +248,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup ggsvp3
 *
 *> \par Further Details:
 *  =====================
@@ -303,7 +301,8 @@ SUBROUTINE DGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEQP3, DGEQR2, DGERQ2, DLACPY, DLAPMT,
+      EXTERNAL           DGEQP3, DGEQR2, DGERQ2, DLACPY,
+     $                   DLAPMT,
      $                   DLASET, DORG2R, DORM2R, DORMR2, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -440,7 +439,8 @@ SUBROUTINE DGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update Q := Q*Z**T
 *
-            CALL DORMR2( 'Right', 'Transpose', N, N, L, B, LDB, TAU, Q,
+            CALL DORMR2( 'Right', 'Transpose', N, N, L, B, LDB, TAU,
+     $                   Q,
      $                   LDQ, WORK, INFO )
          END IF
 *
@@ -487,7 +487,8 @@ SUBROUTINE DGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
          CALL DLASET( 'Full', M, M, ZERO, ZERO, U, LDU )
          IF( M.GT.1 )
-     $      CALL DLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA, U( 2, 1 ),
+     $      CALL DLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA, U( 2,
+     $                   1 ),
      $                   LDU )
          CALL DORG2R( M, M, MIN( M, N-L ), U, LDU, TAU, WORK, INFO )
       END IF
@@ -508,7 +509,8 @@ SUBROUTINE DGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
    90    CONTINUE
   100 CONTINUE
       IF( M.GT.K )
-     $   CALL DLASET( 'Full', M-K, N-L, ZERO, ZERO, A( K+1, 1 ), LDA )
+     $   CALL DLASET( 'Full', M-K, N-L, ZERO, ZERO, A( K+1, 1 ),
+     $                LDA )
 *
       IF( N-L.GT.K ) THEN
 *
@@ -520,7 +522,8 @@ SUBROUTINE DGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update Q( 1:N,1:N-L ) = Q( 1:N,1:N-L )*Z1**T
 *
-            CALL DORMR2( 'Right', 'Transpose', N, N-L, K, A, LDA, TAU,
+            CALL DORMR2( 'Right', 'Transpose', N, N-L, K, A, LDA,
+     $                   TAU,
      $                   Q, LDQ, WORK, INFO )
          END IF
 *
@@ -545,7 +548,8 @@ SUBROUTINE DGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update U(:,K+1:M) := U(:,K+1:M)*U1
 *
-            CALL DORM2R( 'Right', 'No transpose', M, M-K, MIN( M-K, L ),
+            CALL DORM2R( 'Right', 'No transpose', M, M-K, MIN( M-K,
+     $                   L ),
      $                   A( K+1, N-L+1 ), LDA, TAU, U( 1, K+1 ), LDU,
      $                   WORK, INFO )
          END IF
diff --git a/SRC/dgsvj0.f b/SRC/dgsvj0.f
index 197a9a626c..077537bf9c 100644
--- a/SRC/dgsvj0.f
+++ b/SRC/dgsvj0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGSVJ0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgsvj0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgsvj0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -52,10 +50,10 @@
 *>          Specifies whether the output from this procedure is used
 *>          to compute the matrix V:
 *>          = 'V': the product of the Jacobi rotations is accumulated
-*>                 by postmulyiplying the N-by-N array V.
+*>                 by postmultiplying the N-by-N array V.
 *>                (See the description of V.)
 *>          = 'A': the product of the Jacobi rotations is accumulated
-*>                 by postmulyiplying the MV-by-N array V.
+*>                 by postmultiplying the MV-by-N array V.
 *>                (See the descriptions of MV and V.)
 *>          = 'N': the Jacobi rotations are not accumulated.
 *> \endverbatim
@@ -117,7 +115,7 @@
 *> \param[in] MV
 *> \verbatim
 *>          MV is INTEGER
-*>          If JOBV = 'A', then MV rows of V are post-multipled by a
+*>          If JOBV = 'A', then MV rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
 *>          If JOBV = 'N',   then MV is not referenced.
 *> \endverbatim
@@ -125,9 +123,9 @@
 *> \param[in,out] V
 *> \verbatim
 *>          V is DOUBLE PRECISION array, dimension (LDV,N)
-*>          If JOBV = 'V' then N rows of V are post-multipled by a
+*>          If JOBV = 'V' then N rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
-*>          If JOBV = 'A' then MV rows of V are post-multipled by a
+*>          If JOBV = 'A' then MV rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
 *>          If JOBV = 'N',   then V is not referenced.
 *> \endverbatim
@@ -193,7 +191,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup gsvj0
 *
 *> \par Further Details:
 *  =====================
@@ -215,6 +213,7 @@
 *  =====================================================================
       SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
      $                   SFMIN, TOL, NSWEEP, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -259,7 +258,8 @@ SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
       EXTERNAL           IDAMAX, LSAME, DDOT, DNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DLASCL, DLASSQ, DROTM, DSWAP,
+      EXTERNAL           DAXPY, DCOPY, DLASCL, DLASSQ, DROTM,
+     $                   DSWAP,
      $                   XERBLA
 *     ..
 *     .. Executable Statements ..
@@ -424,12 +424,15 @@ SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                            IF( AAQQ.GE.ONE ) THEN
                               ROTOK = ( SMALL*AAPP ).LE.AAQQ
                               IF( AAPP.LT.( BIG / AAQQ ) ) THEN
-                                 AAPQ = ( DDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( DDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*D( p )*D( q ) / AAQQ )
      $                                  / AAPP
                               ELSE
-                                 CALL DCOPY( M, A( 1, p ), 1, WORK, 1 )
-                                 CALL DLASCL( 'G', 0, 0, AAPP, D( p ),
+                                 CALL DCOPY( M, A( 1, p ), 1, WORK,
+     $                                       1 )
+                                 CALL DLASCL( 'G', 0, 0, AAPP,
+     $                                        D( p ),
      $                                        M, 1, WORK, LDA, IERR )
                                  AAPQ = DDOT( M, WORK, 1, A( 1, q ),
      $                                  1 )*D( q ) / AAQQ
@@ -437,12 +440,15 @@ SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                            ELSE
                               ROTOK = AAPP.LE.( AAQQ / SMALL )
                               IF( AAPP.GT.( SMALL / AAQQ ) ) THEN
-                                 AAPQ = ( DDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( DDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*D( p )*D( q ) / AAQQ )
      $                                  / AAPP
                               ELSE
-                                 CALL DCOPY( M, A( 1, q ), 1, WORK, 1 )
-                                 CALL DLASCL( 'G', 0, 0, AAQQ, D( q ),
+                                 CALL DCOPY( M, A( 1, q ), 1, WORK,
+     $                                       1 )
+                                 CALL DLASCL( 'G', 0, 0, AAQQ,
+     $                                        D( q ),
      $                                        M, 1, WORK, LDA, IERR )
                                  AAPQ = DDOT( M, WORK, 1, A( 1, p ),
      $                                  1 )*D( p ) / AAPP
@@ -511,7 +517,8 @@ SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                           FASTR( 4 ) = -T*AQOAP
                                           D( p ) = D( p )*CS
                                           D( q ) = D( q )*CS
-                                          CALL DROTM( M, A( 1, p ), 1,
+                                          CALL DROTM( M, A( 1, p ),
+     $                                                1,
      $                                                A( 1, q ), 1,
      $                                                FASTR )
                                           IF( RSVEC )CALL DROTM( MVL,
@@ -527,7 +534,8 @@ SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                           D( p ) = D( p )*CS
                                           D( q ) = D( q ) / CS
                                           IF( RSVEC ) THEN
-                                             CALL DAXPY( MVL, -T*AQOAP,
+                                             CALL DAXPY( MVL,
+     $                                                   -T*AQOAP,
      $                                                   V( 1, q ), 1,
      $                                                   V( 1, p ), 1 )
                                              CALL DAXPY( MVL,
@@ -541,13 +549,15 @@ SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                           CALL DAXPY( M, T*APOAQ,
      $                                                A( 1, p ), 1,
      $                                                A( 1, q ), 1 )
-                                          CALL DAXPY( M, -CS*SN*AQOAP,
+                                          CALL DAXPY( M,
+     $                                                -CS*SN*AQOAP,
      $                                                A( 1, q ), 1,
      $                                                A( 1, p ), 1 )
                                           D( p ) = D( p ) / CS
                                           D( q ) = D( q )*CS
                                           IF( RSVEC ) THEN
-                                             CALL DAXPY( MVL, T*APOAQ,
+                                             CALL DAXPY( MVL,
+     $                                                   T*APOAQ,
      $                                                   V( 1, p ), 1,
      $                                                   V( 1, q ), 1 )
                                              CALL DAXPY( MVL,
@@ -560,7 +570,8 @@ SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                              CALL DAXPY( M, -T*AQOAP,
      $                                                   A( 1, q ), 1,
      $                                                   A( 1, p ), 1 )
-                                             CALL DAXPY( M, CS*SN*APOAQ,
+                                             CALL DAXPY( M,
+     $                                                   CS*SN*APOAQ,
      $                                                   A( 1, p ), 1,
      $                                                   A( 1, q ), 1 )
                                              D( p ) = D( p )*CS
@@ -601,15 +612,19 @@ SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
 *
                               ELSE
 *              .. have to use modified Gram-Schmidt like transformation
-                                 CALL DCOPY( M, A( 1, p ), 1, WORK, 1 )
-                                 CALL DLASCL( 'G', 0, 0, AAPP, ONE, M,
+                                 CALL DCOPY( M, A( 1, p ), 1, WORK,
+     $                                       1 )
+                                 CALL DLASCL( 'G', 0, 0, AAPP, ONE,
+     $                                        M,
      $                                        1, WORK, LDA, IERR )
-                                 CALL DLASCL( 'G', 0, 0, AAQQ, ONE, M,
+                                 CALL DLASCL( 'G', 0, 0, AAQQ, ONE,
+     $                                        M,
      $                                        1, A( 1, q ), LDA, IERR )
                                  TEMP1 = -AAPQ*D( p ) / D( q )
                                  CALL DAXPY( M, TEMP1, WORK, 1,
      $                                       A( 1, q ), 1 )
-                                 CALL DLASCL( 'G', 0, 0, ONE, AAQQ, M,
+                                 CALL DLASCL( 'G', 0, 0, ONE, AAQQ,
+     $                                        M,
      $                                        1, A( 1, q ), LDA, IERR )
                                  SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                      ONE-AAPQ*AAPQ ) )
@@ -623,7 +638,8 @@ SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = DNRM2( M, A( 1, q ), 1 )*
+                                    SVA( q ) = DNRM2( M, A( 1, q ),
+     $                                   1 )*
      $                                         D( q )
                                  ELSE
                                     T = ZERO
@@ -724,12 +740,15 @@ SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                  ROTOK = ( SMALL*AAQQ ).LE.AAPP
                               END IF
                               IF( AAPP.LT.( BIG / AAQQ ) ) THEN
-                                 AAPQ = ( DDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( DDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*D( p )*D( q ) / AAQQ )
      $                                  / AAPP
                               ELSE
-                                 CALL DCOPY( M, A( 1, p ), 1, WORK, 1 )
-                                 CALL DLASCL( 'G', 0, 0, AAPP, D( p ),
+                                 CALL DCOPY( M, A( 1, p ), 1, WORK,
+     $                                       1 )
+                                 CALL DLASCL( 'G', 0, 0, AAPP,
+     $                                        D( p ),
      $                                        M, 1, WORK, LDA, IERR )
                                  AAPQ = DDOT( M, WORK, 1, A( 1, q ),
      $                                  1 )*D( q ) / AAQQ
@@ -741,12 +760,15 @@ SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                  ROTOK = AAQQ.LE.( AAPP / SMALL )
                               END IF
                               IF( AAPP.GT.( SMALL / AAQQ ) ) THEN
-                                 AAPQ = ( DDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( DDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*D( p )*D( q ) / AAQQ )
      $                                  / AAPP
                               ELSE
-                                 CALL DCOPY( M, A( 1, q ), 1, WORK, 1 )
-                                 CALL DLASCL( 'G', 0, 0, AAQQ, D( q ),
+                                 CALL DCOPY( M, A( 1, q ), 1, WORK,
+     $                                       1 )
+                                 CALL DLASCL( 'G', 0, 0, AAQQ,
+     $                                        D( q ),
      $                                        M, 1, WORK, LDA, IERR )
                                  AAPQ = DDOT( M, WORK, 1, A( 1, p ),
      $                                  1 )*D( p ) / AAPP
@@ -810,7 +832,8 @@ SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                           FASTR( 4 ) = -T*AQOAP
                                           D( p ) = D( p )*CS
                                           D( q ) = D( q )*CS
-                                          CALL DROTM( M, A( 1, p ), 1,
+                                          CALL DROTM( M, A( 1, p ),
+     $                                                1,
      $                                                A( 1, q ), 1,
      $                                                FASTR )
                                           IF( RSVEC )CALL DROTM( MVL,
@@ -824,7 +847,8 @@ SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
      $                                                A( 1, p ), 1,
      $                                                A( 1, q ), 1 )
                                           IF( RSVEC ) THEN
-                                             CALL DAXPY( MVL, -T*AQOAP,
+                                             CALL DAXPY( MVL,
+     $                                                   -T*AQOAP,
      $                                                   V( 1, q ), 1,
      $                                                   V( 1, p ), 1 )
                                              CALL DAXPY( MVL,
@@ -840,11 +864,13 @@ SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                           CALL DAXPY( M, T*APOAQ,
      $                                                A( 1, p ), 1,
      $                                                A( 1, q ), 1 )
-                                          CALL DAXPY( M, -CS*SN*AQOAP,
+                                          CALL DAXPY( M,
+     $                                                -CS*SN*AQOAP,
      $                                                A( 1, q ), 1,
      $                                                A( 1, p ), 1 )
                                           IF( RSVEC ) THEN
-                                             CALL DAXPY( MVL, T*APOAQ,
+                                             CALL DAXPY( MVL,
+     $                                                   T*APOAQ,
      $                                                   V( 1, p ), 1,
      $                                                   V( 1, q ), 1 )
                                              CALL DAXPY( MVL,
@@ -859,7 +885,8 @@ SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                              CALL DAXPY( M, -T*AQOAP,
      $                                                   A( 1, q ), 1,
      $                                                   A( 1, p ), 1 )
-                                             CALL DAXPY( M, CS*SN*APOAQ,
+                                             CALL DAXPY( M,
+     $                                                   CS*SN*APOAQ,
      $                                                   A( 1, p ), 1,
      $                                                   A( 1, q ), 1 )
                                              D( p ) = D( p )*CS
@@ -900,34 +927,42 @@ SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
 *
                               ELSE
                                  IF( AAPP.GT.AAQQ ) THEN
-                                    CALL DCOPY( M, A( 1, p ), 1, WORK,
+                                    CALL DCOPY( M, A( 1, p ), 1,
+     $                                          WORK,
      $                                          1 )
-                                    CALL DLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL DLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, WORK, LDA, IERR )
-                                    CALL DLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL DLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     TEMP1 = -AAPQ*D( p ) / D( q )
                                     CALL DAXPY( M, TEMP1, WORK, 1,
      $                                          A( 1, q ), 1 )
-                                    CALL DLASCL( 'G', 0, 0, ONE, AAQQ,
+                                    CALL DLASCL( 'G', 0, 0, ONE,
+     $                                           AAQQ,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                         ONE-AAPQ*AAPQ ) )
                                     MXSINJ = MAX( MXSINJ, SFMIN )
                                  ELSE
-                                    CALL DCOPY( M, A( 1, q ), 1, WORK,
+                                    CALL DCOPY( M, A( 1, q ), 1,
+     $                                          WORK,
      $                                          1 )
-                                    CALL DLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL DLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, WORK, LDA, IERR )
-                                    CALL DLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL DLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     TEMP1 = -AAPQ*D( q ) / D( p )
                                     CALL DAXPY( M, TEMP1, WORK, 1,
      $                                          A( 1, p ), 1 )
-                                    CALL DLASCL( 'G', 0, 0, ONE, AAPP,
+                                    CALL DLASCL( 'G', 0, 0, ONE,
+     $                                           AAPP,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     SVA( p ) = AAPP*DSQRT( MAX( ZERO,
@@ -943,7 +978,8 @@ SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = DNRM2( M, A( 1, q ), 1 )*
+                                    SVA( q ) = DNRM2( M, A( 1, q ),
+     $                                   1 )*
      $                                         D( q )
                                  ELSE
                                     T = ZERO
diff --git a/SRC/dgsvj1.f b/SRC/dgsvj1.f
index 11d1dde2bc..b19fdac1b8 100644
--- a/SRC/dgsvj1.f
+++ b/SRC/dgsvj1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGSVJ1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgsvj1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgsvj1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -75,10 +73,10 @@
 *>          Specifies whether the output from this procedure is used
 *>          to compute the matrix V:
 *>          = 'V': the product of the Jacobi rotations is accumulated
-*>                 by postmulyiplying the N-by-N array V.
+*>                 by postmultiplying the N-by-N array V.
 *>                (See the description of V.)
 *>          = 'A': the product of the Jacobi rotations is accumulated
-*>                 by postmulyiplying the MV-by-N array V.
+*>                 by postmultiplying the MV-by-N array V.
 *>                (See the descriptions of MV and V.)
 *>          = 'N': the Jacobi rotations are not accumulated.
 *> \endverbatim
@@ -147,7 +145,7 @@
 *> \param[in] MV
 *> \verbatim
 *>          MV is INTEGER
-*>          If JOBV = 'A', then MV rows of V are post-multipled by a
+*>          If JOBV = 'A', then MV rows of V are post-multiplied by a
 *>                         sequence of Jacobi rotations.
 *>          If JOBV = 'N', then MV is not referenced.
 *> \endverbatim
@@ -155,9 +153,9 @@
 *> \param[in,out] V
 *> \verbatim
 *>          V is DOUBLE PRECISION array, dimension (LDV,N)
-*>          If JOBV = 'V', then N rows of V are post-multipled by a
+*>          If JOBV = 'V', then N rows of V are post-multiplied by a
 *>                         sequence of Jacobi rotations.
-*>          If JOBV = 'A', then MV rows of V are post-multipled by a
+*>          If JOBV = 'A', then MV rows of V are post-multiplied by a
 *>                         sequence of Jacobi rotations.
 *>          If JOBV = 'N', then V is not referenced.
 *> \endverbatim
@@ -223,7 +221,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup gsvj1
 *
 *> \par Contributors:
 *  ==================
@@ -233,6 +231,7 @@
 *  =====================================================================
       SUBROUTINE DGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
      $                   EPS, SFMIN, TOL, NSWEEP, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -277,7 +276,8 @@ SUBROUTINE DGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
       EXTERNAL           IDAMAX, LSAME, DDOT, DNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DLASCL, DLASSQ, DROTM, DSWAP,
+      EXTERNAL           DAXPY, DCOPY, DLASCL, DLASSQ, DROTM,
+     $                   DSWAP,
      $                   XERBLA
 *     ..
 *     .. Executable Statements ..
@@ -423,12 +423,15 @@ SUBROUTINE DGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                  ROTOK = ( SMALL*AAQQ ).LE.AAPP
                               END IF
                               IF( AAPP.LT.( BIG / AAQQ ) ) THEN
-                                 AAPQ = ( DDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( DDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*D( p )*D( q ) / AAQQ )
      $                                  / AAPP
                               ELSE
-                                 CALL DCOPY( M, A( 1, p ), 1, WORK, 1 )
-                                 CALL DLASCL( 'G', 0, 0, AAPP, D( p ),
+                                 CALL DCOPY( M, A( 1, p ), 1, WORK,
+     $                                       1 )
+                                 CALL DLASCL( 'G', 0, 0, AAPP,
+     $                                        D( p ),
      $                                        M, 1, WORK, LDA, IERR )
                                  AAPQ = DDOT( M, WORK, 1, A( 1, q ),
      $                                  1 )*D( q ) / AAQQ
@@ -440,12 +443,15 @@ SUBROUTINE DGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                  ROTOK = AAQQ.LE.( AAPP / SMALL )
                               END IF
                               IF( AAPP.GT.( SMALL / AAQQ ) ) THEN
-                                 AAPQ = ( DDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( DDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*D( p )*D( q ) / AAQQ )
      $                                  / AAPP
                               ELSE
-                                 CALL DCOPY( M, A( 1, q ), 1, WORK, 1 )
-                                 CALL DLASCL( 'G', 0, 0, AAQQ, D( q ),
+                                 CALL DCOPY( M, A( 1, q ), 1, WORK,
+     $                                       1 )
+                                 CALL DLASCL( 'G', 0, 0, AAQQ,
+     $                                        D( q ),
      $                                        M, 1, WORK, LDA, IERR )
                                  AAPQ = DDOT( M, WORK, 1, A( 1, p ),
      $                                  1 )*D( p ) / AAPP
@@ -509,7 +515,8 @@ SUBROUTINE DGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                           FASTR( 4 ) = -T*AQOAP
                                           D( p ) = D( p )*CS
                                           D( q ) = D( q )*CS
-                                          CALL DROTM( M, A( 1, p ), 1,
+                                          CALL DROTM( M, A( 1, p ),
+     $                                                1,
      $                                                A( 1, q ), 1,
      $                                                FASTR )
                                           IF( RSVEC )CALL DROTM( MVL,
@@ -523,7 +530,8 @@ SUBROUTINE DGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
      $                                                A( 1, p ), 1,
      $                                                A( 1, q ), 1 )
                                           IF( RSVEC ) THEN
-                                             CALL DAXPY( MVL, -T*AQOAP,
+                                             CALL DAXPY( MVL,
+     $                                                   -T*AQOAP,
      $                                                   V( 1, q ), 1,
      $                                                   V( 1, p ), 1 )
                                              CALL DAXPY( MVL,
@@ -539,11 +547,13 @@ SUBROUTINE DGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                           CALL DAXPY( M, T*APOAQ,
      $                                                A( 1, p ), 1,
      $                                                A( 1, q ), 1 )
-                                          CALL DAXPY( M, -CS*SN*AQOAP,
+                                          CALL DAXPY( M,
+     $                                                -CS*SN*AQOAP,
      $                                                A( 1, q ), 1,
      $                                                A( 1, p ), 1 )
                                           IF( RSVEC ) THEN
-                                             CALL DAXPY( MVL, T*APOAQ,
+                                             CALL DAXPY( MVL,
+     $                                                   T*APOAQ,
      $                                                   V( 1, p ), 1,
      $                                                   V( 1, q ), 1 )
                                              CALL DAXPY( MVL,
@@ -558,7 +568,8 @@ SUBROUTINE DGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                              CALL DAXPY( M, -T*AQOAP,
      $                                                   A( 1, q ), 1,
      $                                                   A( 1, p ), 1 )
-                                             CALL DAXPY( M, CS*SN*APOAQ,
+                                             CALL DAXPY( M,
+     $                                                   CS*SN*APOAQ,
      $                                                   A( 1, p ), 1,
      $                                                   A( 1, q ), 1 )
                                              D( p ) = D( p )*CS
@@ -599,34 +610,42 @@ SUBROUTINE DGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
 
                               ELSE
                                  IF( AAPP.GT.AAQQ ) THEN
-                                    CALL DCOPY( M, A( 1, p ), 1, WORK,
+                                    CALL DCOPY( M, A( 1, p ), 1,
+     $                                          WORK,
      $                                          1 )
-                                    CALL DLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL DLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, WORK, LDA, IERR )
-                                    CALL DLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL DLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     TEMP1 = -AAPQ*D( p ) / D( q )
                                     CALL DAXPY( M, TEMP1, WORK, 1,
      $                                          A( 1, q ), 1 )
-                                    CALL DLASCL( 'G', 0, 0, ONE, AAQQ,
+                                    CALL DLASCL( 'G', 0, 0, ONE,
+     $                                           AAQQ,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                         ONE-AAPQ*AAPQ ) )
                                     MXSINJ = MAX( MXSINJ, SFMIN )
                                  ELSE
-                                    CALL DCOPY( M, A( 1, q ), 1, WORK,
+                                    CALL DCOPY( M, A( 1, q ), 1,
+     $                                          WORK,
      $                                          1 )
-                                    CALL DLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL DLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, WORK, LDA, IERR )
-                                    CALL DLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL DLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     TEMP1 = -AAPQ*D( q ) / D( p )
                                     CALL DAXPY( M, TEMP1, WORK, 1,
      $                                          A( 1, p ), 1 )
-                                    CALL DLASCL( 'G', 0, 0, ONE, AAPP,
+                                    CALL DLASCL( 'G', 0, 0, ONE,
+     $                                           AAPP,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     SVA( p ) = AAPP*DSQRT( MAX( ZERO,
@@ -642,7 +661,8 @@ SUBROUTINE DGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = DNRM2( M, A( 1, q ), 1 )*
+                                    SVA( q ) = DNRM2( M, A( 1, q ),
+     $                                   1 )*
      $                                         D( q )
                                  ELSE
                                     T = ZERO
diff --git a/SRC/dgtcon.f b/SRC/dgtcon.f
index e007ac146c..e22e2a445a 100644
--- a/SRC/dgtcon.f
+++ b/SRC/dgtcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGTCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgtcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgtcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -138,11 +136,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGTcomputational
+*> \ingroup gtcon
 *
 *  =====================================================================
       SUBROUTINE DGTCON( NORM, N, DL, D, DU, DU2, IPIV, ANORM, RCOND,
      $                   WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -234,7 +233,8 @@ SUBROUTINE DGTCON( NORM, N, DL, D, DU, DU2, IPIV, ANORM, RCOND,
 *
 *           Multiply by inv(L**T)*inv(U**T).
 *
-            CALL DGTTRS( 'Transpose', N, 1, DL, D, DU, DU2, IPIV, WORK,
+            CALL DGTTRS( 'Transpose', N, 1, DL, D, DU, DU2, IPIV,
+     $                   WORK,
      $                   N, INFO )
          END IF
          GO TO 20
diff --git a/SRC/dgtrfs.f b/SRC/dgtrfs.f
index e2bb3d2adc..828c3d3669 100644
--- a/SRC/dgtrfs.f
+++ b/SRC/dgtrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGTRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgtrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgtrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -200,12 +198,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGTcomputational
+*> \ingroup gtrfs
 *
 *  =====================================================================
-      SUBROUTINE DGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
+      SUBROUTINE DGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
+     $                   DU2,
      $                   IPIV, B, LDB, X, LDX, FERR, BERR, WORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -244,7 +244,8 @@ SUBROUTINE DGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DGTTRS, DLACN2, DLAGTM, XERBLA
+      EXTERNAL           DAXPY, DCOPY, DGTTRS, DLACN2, DLAGTM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -317,7 +318,8 @@ SUBROUTINE DGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
 *        where op(A) = A, A**T, or A**H, depending on TRANS.
 *
          CALL DCOPY( N, B( 1, J ), 1, WORK( N+1 ), 1 )
-         CALL DLAGTM( TRANS, N, 1, -ONE, DL, D, DU, X( 1, J ), LDX, ONE,
+         CALL DLAGTM( TRANS, N, 1, -ONE, DL, D, DU, X( 1, J ), LDX,
+     $                ONE,
      $                WORK( N+1 ), N )
 *
 *        Compute abs(op(A))*abs(x) + abs(b) for use in the backward
@@ -428,7 +430,8 @@ SUBROUTINE DGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
 *
          KASE = 0
    70    CONTINUE
-         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
diff --git a/SRC/dgtsv.f b/SRC/dgtsv.f
index 0f02201d58..ea3b201596 100644
--- a/SRC/dgtsv.f
+++ b/SRC/dgtsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGTSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgtsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgtsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,10 +118,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGTsolve
+*> \ingroup gtsv
 *
 *  =====================================================================
       SUBROUTINE DGTSV( N, NRHS, DL, D, DU, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dgtsvx.f b/SRC/dgtsvx.f
index ec8df80bb6..21cff8613c 100644
--- a/SRC/dgtsvx.f
+++ b/SRC/dgtsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGTSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgtsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgtsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -284,12 +282,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGTsolve
+*> \ingroup gtsvx
 *
 *  =====================================================================
-      SUBROUTINE DGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
+      SUBROUTINE DGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF,
+     $                   DUF,
      $                   DU2, IPIV, B, LDB, X, LDX, RCOND, FERR, BERR,
      $                   WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -324,7 +324,8 @@ SUBROUTINE DGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
       EXTERNAL           LSAME, DLAMCH, DLANGT
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGTCON, DGTRFS, DGTTRF, DGTTRS, DLACPY,
+      EXTERNAL           DCOPY, DGTCON, DGTRFS, DGTTRF, DGTTRS,
+     $                   DLACPY,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -384,7 +385,8 @@ SUBROUTINE DGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL DGTCON( NORM, N, DLF, DF, DUF, DU2, IPIV, ANORM, RCOND, WORK,
+      CALL DGTCON( NORM, N, DLF, DF, DUF, DU2, IPIV, ANORM, RCOND,
+     $             WORK,
      $             IWORK, INFO )
 *
 *     Compute the solution vectors X.
@@ -396,7 +398,8 @@ SUBROUTINE DGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
 *     Use iterative refinement to improve the computed solutions and
 *     compute error bounds and backward error estimates for them.
 *
-      CALL DGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2, IPIV,
+      CALL DGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
+     $             IPIV,
      $             B, LDB, X, LDX, FERR, BERR, WORK, IWORK, INFO )
 *
 *     Set INFO = N+1 if the matrix is singular to working precision.
diff --git a/SRC/dgttrf.f b/SRC/dgttrf.f
index 061c211504..984983a302 100644
--- a/SRC/dgttrf.f
+++ b/SRC/dgttrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGTTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgttrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgttrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,10 +115,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGTcomputational
+*> \ingroup gttrf
 *
 *  =====================================================================
       SUBROUTINE DGTTRF( N, DL, D, DU, DU2, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dgttrs.f b/SRC/dgttrs.f
index cb9a897c3b..1f3d84469a 100644
--- a/SRC/dgttrs.f
+++ b/SRC/dgttrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGTTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgttrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgttrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,11 +128,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGTcomputational
+*> \ingroup gttrs
 *
 *  =====================================================================
-      SUBROUTINE DGTTRS( TRANS, N, NRHS, DL, D, DU, DU2, IPIV, B, LDB,
+      SUBROUTINE DGTTRS( TRANS, N, NRHS, DL, D, DU, DU2, IPIV, B,
+     $                   LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -210,7 +210,8 @@ SUBROUTINE DGTTRS( TRANS, N, NRHS, DL, D, DU, DU2, IPIV, B, LDB,
       ELSE
          DO 10 J = 1, NRHS, NB
             JB = MIN( NRHS-J+1, NB )
-            CALL DGTTS2( ITRANS, N, JB, DL, D, DU, DU2, IPIV, B( 1, J ),
+            CALL DGTTS2( ITRANS, N, JB, DL, D, DU, DU2, IPIV, B( 1,
+     $                   J ),
      $                   LDB )
    10    CONTINUE
       END IF
diff --git a/SRC/dgtts2.f b/SRC/dgtts2.f
index ffa69eac93..a79dce66ed 100644
--- a/SRC/dgtts2.f
+++ b/SRC/dgtts2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DGTTS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgtts2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgtts2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGTcomputational
+*> \ingroup gtts2
 *
 *  =====================================================================
-      SUBROUTINE DGTTS2( ITRANS, N, NRHS, DL, D, DU, DU2, IPIV, B, LDB )
+      SUBROUTINE DGTTS2( ITRANS, N, NRHS, DL, D, DU, DU2, IPIV, B,
+     $                   LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dhgeqz.f b/SRC/dhgeqz.f
index 3fe2a083c8..68632f95e1 100644
--- a/SRC/dhgeqz.f
+++ b/SRC/dhgeqz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DHGEQZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dhgeqz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dhgeqz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -282,7 +280,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup hgeqz
 *
 *> \par Further Details:
 *  =====================
@@ -298,9 +296,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
+      SUBROUTINE DHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T,
+     $                   LDT,
      $                   ALPHAR, ALPHAI, BETA, Q, LDQ, Z, LDZ, WORK,
      $                   LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -337,9 +337,9 @@ SUBROUTINE DHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
      $                   BTOL, C, C11I, C11R, C12, C21, C22I, C22R, CL,
      $                   CQ, CR, CZ, ESHIFT, S, S1, S1INV, S2, SAFMAX,
      $                   SAFMIN, SCALE, SL, SQI, SQR, SR, SZI, SZR, T1,
-     $                   TAU, TEMP, TEMP2, TEMPI, TEMPR, U1, U12, U12L,
-     $                   U2, ULP, VS, W11, W12, W21, W22, WABS, WI, WR,
-     $                   WR2
+     $                   T2, T3, TAU, TEMP, TEMP2, TEMPI, TEMPR, U1,
+     $                   U12, U12L, U2, ULP, VS, W11, W12, W21, W22,
+     $                   WABS, WI, WR, WR2
 *     ..
 *     .. Local Arrays ..
       DOUBLE PRECISION   V( 3 )
@@ -347,10 +347,12 @@ SUBROUTINE DHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
 *     .. External Functions ..
       LOGICAL            LSAME
       DOUBLE PRECISION   DLAMCH, DLANHS, DLAPY2, DLAPY3
-      EXTERNAL           LSAME, DLAMCH, DLANHS, DLAPY2, DLAPY3
+      EXTERNAL           LSAME, DLAMCH, DLANHS, DLAPY2,
+     $                   DLAPY3
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLAG2, DLARFG, DLARTG, DLASET, DLASV2, DROT,
+      EXTERNAL           DLAG2, DLARFG, DLARTG, DLASET, DLASV2,
+     $                   DROT,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -536,9 +538,7 @@ SUBROUTINE DHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
             END IF
          END IF
 *
-         IF( ABS( T( ILAST, ILAST ) ).LE.MAX( SAFMIN, ULP*( 
-     $         ABS( T( ILAST - 1, ILAST ) ) + ABS( T( ILAST-1, ILAST-1 )
-     $          ) ) ) ) THEN
+         IF( ABS( T( ILAST, ILAST ) ).LE.BTOL ) THEN
             T( ILAST, ILAST ) = ZERO
             GO TO 70
          END IF
@@ -564,10 +564,7 @@ SUBROUTINE DHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
 *
 *           Test 2: for T(j,j)=0
 *
-            TEMP = ABS ( T( J, J + 1 ) )
-            IF ( J .GT. ILO )
-     $           TEMP = TEMP + ABS ( T( J - 1, J ) )
-            IF( ABS( T( J, J ) ).LT.MAX( SAFMIN,ULP*TEMP ) ) THEN
+            IF( ABS( T( J, J ) ).LT.BTOL ) THEN
                T( J, J ) = ZERO
 *
 *              Test 1a: Check for 2 consecutive small subdiagonals in A
@@ -602,7 +599,8 @@ SUBROUTINE DHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
                      CALL DROT( ILASTM-JCH, T( JCH, JCH+1 ), LDT,
      $                          T( JCH+1, JCH+1 ), LDT, C, S )
                      IF( ILQ )
-     $                  CALL DROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ), 1,
+     $                  CALL DROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ),
+     $                             1,
      $                             C, S )
                      IF( ILAZR2 )
      $                  H( JCH, JCH-1 ) = H( JCH, JCH-1 )*C
@@ -629,12 +627,14 @@ SUBROUTINE DHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
      $                            T( JCH, JCH+1 ) )
                      T( JCH+1, JCH+1 ) = ZERO
                      IF( JCH.LT.ILASTM-1 )
-     $                  CALL DROT( ILASTM-JCH-1, T( JCH, JCH+2 ), LDT,
+     $                  CALL DROT( ILASTM-JCH-1, T( JCH, JCH+2 ),
+     $                             LDT,
      $                             T( JCH+1, JCH+2 ), LDT, C, S )
                      CALL DROT( ILASTM-JCH+2, H( JCH, JCH-1 ), LDH,
      $                          H( JCH+1, JCH-1 ), LDH, C, S )
                      IF( ILQ )
-     $                  CALL DROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ), 1,
+     $                  CALL DROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ),
+     $                             1,
      $                             C, S )
                      TEMP = H( JCH+1, JCH )
                      CALL DLARTG( TEMP, H( JCH+1, JCH-1 ), C, S,
@@ -645,7 +645,8 @@ SUBROUTINE DHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
                      CALL DROT( JCH-IFRSTM, T( IFRSTM, JCH ), 1,
      $                          T( IFRSTM, JCH-1 ), 1, C, S )
                      IF( ILZ )
-     $                  CALL DROT( N, Z( 1, JCH ), 1, Z( 1, JCH-1 ), 1,
+     $                  CALL DROT( N, Z( 1, JCH ), 1, Z( 1, JCH-1 ),
+     $                             1,
      $                             C, S )
    50             CONTINUE
                   GO TO 70
@@ -680,7 +681,8 @@ SUBROUTINE DHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
          CALL DROT( ILAST-IFRSTM, T( IFRSTM, ILAST ), 1,
      $              T( IFRSTM, ILAST-1 ), 1, C, S )
          IF( ILZ )
-     $      CALL DROT( N, Z( 1, ILAST ), 1, Z( 1, ILAST-1 ), 1, C, S )
+     $      CALL DROT( N, Z( 1, ILAST ), 1, Z( 1, ILAST-1 ), 1, C,
+     $                 S )
 *
 *        H(ILAST,ILAST-1)=0 -- Standardize B, set ALPHAR, ALPHAI,
 *                              and BETA
@@ -912,10 +914,12 @@ SUBROUTINE DHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
      $                    T( IFRSTM, ILAST ), 1, CR, SR )
 *
             IF( ILQ )
-     $         CALL DROT( N, Q( 1, ILAST-1 ), 1, Q( 1, ILAST ), 1, CL,
+     $         CALL DROT( N, Q( 1, ILAST-1 ), 1, Q( 1, ILAST ), 1,
+     $                    CL,
      $                    SL )
             IF( ILZ )
-     $         CALL DROT( N, Z( 1, ILAST-1 ), 1, Z( 1, ILAST ), 1, CR,
+     $         CALL DROT( N, Z( 1, ILAST-1 ), 1, Z( 1, ILAST ), 1,
+     $                    CR,
      $                    SR )
 *
             T( ILAST-1, ILAST-1 ) = B11
@@ -1132,25 +1136,27 @@ SUBROUTINE DHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
                   H( J+2, J-1 ) = ZERO
                END IF
 *
+               T2 = TAU*V( 2 )
+               T3 = TAU*V( 3 )
                DO 230 JC = J, ILASTM
-                  TEMP = TAU*( H( J, JC )+V( 2 )*H( J+1, JC )+V( 3 )*
-     $                   H( J+2, JC ) )
-                  H( J, JC ) = H( J, JC ) - TEMP
-                  H( J+1, JC ) = H( J+1, JC ) - TEMP*V( 2 )
-                  H( J+2, JC ) = H( J+2, JC ) - TEMP*V( 3 )
-                  TEMP2 = TAU*( T( J, JC )+V( 2 )*T( J+1, JC )+V( 3 )*
-     $                    T( J+2, JC ) )
-                  T( J, JC ) = T( J, JC ) - TEMP2
-                  T( J+1, JC ) = T( J+1, JC ) - TEMP2*V( 2 )
-                  T( J+2, JC ) = T( J+2, JC ) - TEMP2*V( 3 )
+                  TEMP = H( J, JC )+V( 2 )*H( J+1, JC )+V( 3 )*
+     $                   H( J+2, JC )
+                  H( J, JC ) = H( J, JC ) - TEMP*TAU
+                  H( J+1, JC ) = H( J+1, JC ) - TEMP*T2
+                  H( J+2, JC ) = H( J+2, JC ) - TEMP*T3
+                  TEMP2 = T( J, JC )+V( 2 )*T( J+1, JC )+V( 3 )*
+     $                    T( J+2, JC )
+                  T( J, JC ) = T( J, JC ) - TEMP2*TAU
+                  T( J+1, JC ) = T( J+1, JC ) - TEMP2*T2
+                  T( J+2, JC ) = T( J+2, JC ) - TEMP2*T3
   230          CONTINUE
                IF( ILQ ) THEN
                   DO 240 JR = 1, N
-                     TEMP = TAU*( Q( JR, J )+V( 2 )*Q( JR, J+1 )+V( 3 )*
-     $                      Q( JR, J+2 ) )
-                     Q( JR, J ) = Q( JR, J ) - TEMP
-                     Q( JR, J+1 ) = Q( JR, J+1 ) - TEMP*V( 2 )
-                     Q( JR, J+2 ) = Q( JR, J+2 ) - TEMP*V( 3 )
+                     TEMP = Q( JR, J )+V( 2 )*Q( JR, J+1 )+V( 3 )*
+     $                      Q( JR, J+2 )
+                     Q( JR, J ) = Q( JR, J ) - TEMP*TAU
+                     Q( JR, J+1 ) = Q( JR, J+1 ) - TEMP*T2
+                     Q( JR, J+2 ) = Q( JR, J+2 ) - TEMP*T3
   240             CONTINUE
                END IF
 *
@@ -1238,27 +1244,29 @@ SUBROUTINE DHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
 *
 *              Apply transformations from the right.
 *
+               T2 = TAU*V(2)
+               T3 = TAU*V(3)
                DO 260 JR = IFRSTM, MIN( J+3, ILAST )
-                  TEMP = TAU*( H( JR, J )+V( 2 )*H( JR, J+1 )+V( 3 )*
-     $                   H( JR, J+2 ) )
-                  H( JR, J ) = H( JR, J ) - TEMP
-                  H( JR, J+1 ) = H( JR, J+1 ) - TEMP*V( 2 )
-                  H( JR, J+2 ) = H( JR, J+2 ) - TEMP*V( 3 )
+                  TEMP = H( JR, J )+V( 2 )*H( JR, J+1 )+V( 3 )*
+     $                   H( JR, J+2 )
+                  H( JR, J ) = H( JR, J ) - TEMP*TAU
+                  H( JR, J+1 ) = H( JR, J+1 ) - TEMP*T2
+                  H( JR, J+2 ) = H( JR, J+2 ) - TEMP*T3
   260          CONTINUE
                DO 270 JR = IFRSTM, J + 2
-                  TEMP = TAU*( T( JR, J )+V( 2 )*T( JR, J+1 )+V( 3 )*
-     $                   T( JR, J+2 ) )
-                  T( JR, J ) = T( JR, J ) - TEMP
-                  T( JR, J+1 ) = T( JR, J+1 ) - TEMP*V( 2 )
-                  T( JR, J+2 ) = T( JR, J+2 ) - TEMP*V( 3 )
+                  TEMP = T( JR, J )+V( 2 )*T( JR, J+1 )+V( 3 )*
+     $                   T( JR, J+2 )
+                  T( JR, J ) = T( JR, J ) - TEMP*TAU
+                  T( JR, J+1 ) = T( JR, J+1 ) - TEMP*T2
+                  T( JR, J+2 ) = T( JR, J+2 ) - TEMP*T3
   270          CONTINUE
                IF( ILZ ) THEN
                   DO 280 JR = 1, N
-                     TEMP = TAU*( Z( JR, J )+V( 2 )*Z( JR, J+1 )+V( 3 )*
-     $                      Z( JR, J+2 ) )
-                     Z( JR, J ) = Z( JR, J ) - TEMP
-                     Z( JR, J+1 ) = Z( JR, J+1 ) - TEMP*V( 2 )
-                     Z( JR, J+2 ) = Z( JR, J+2 ) - TEMP*V( 3 )
+                     TEMP = Z( JR, J )+V( 2 )*Z( JR, J+1 )+V( 3 )*
+     $                      Z( JR, J+2 )
+                     Z( JR, J ) = Z( JR, J ) - TEMP*TAU
+                     Z( JR, J+1 ) = Z( JR, J+1 ) - TEMP*T2
+                     Z( JR, J+2 ) = Z( JR, J+2 ) - TEMP*T3
   280             CONTINUE
                END IF
                T( J+1, J ) = ZERO
diff --git a/SRC/dhsein.f b/SRC/dhsein.f
index 326e8e3962..c03fe3fa23 100644
--- a/SRC/dhsein.f
+++ b/SRC/dhsein.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DHSEIN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dhsein.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dhsein.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -244,7 +242,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup hsein
 *
 *> \par Further Details:
 *  =====================
@@ -257,9 +255,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, WR, WI,
+      SUBROUTINE DHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, WR,
+     $                   WI,
      $                   VL, LDVL, VR, LDVR, MM, M, WORK, IFAILL,
      $                   IFAILR, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -457,7 +457,8 @@ SUBROUTINE DHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, WR, WI,
 *
 *              Compute left eigenvector.
 *
-               CALL DLAEIN( .FALSE., NOINIT, N-KL+1, H( KL, KL ), LDH,
+               CALL DLAEIN( .FALSE., NOINIT, N-KL+1, H( KL, KL ),
+     $                      LDH,
      $                      WKR, WKI, VL( KL, KSR ), VL( KL, KSI ),
      $                      WORK, LDWORK, WORK( N*N+N+1 ), EPS3, SMLNUM,
      $                      BIGNUM, IINFO )
diff --git a/SRC/dhseqr.f b/SRC/dhseqr.f
index 2d59c6cc7e..83ace92b97 100644
--- a/SRC/dhseqr.f
+++ b/SRC/dhseqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DHSEQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dhseqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dhseqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -233,7 +231,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup hseqr
 *
 *> \par Contributors:
 *  ==================
@@ -313,6 +311,7 @@
 *  =====================================================================
       SUBROUTINE DHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, WR, WI, Z,
      $                   LDZ, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -361,7 +360,8 @@ SUBROUTINE DHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, WR, WI, Z,
       EXTERNAL           ILAENV, LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLACPY, DLAHQR, DLAQR0, DLASET, XERBLA
+      EXTERNAL           DLACPY, DLAHQR, DLAQR0, DLASET,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, MAX, MIN
@@ -454,13 +454,15 @@ SUBROUTINE DHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, WR, WI, Z,
 *        ==== DLAQR0 for big matrices; DLAHQR for small ones ====
 *
          IF( N.GT.NMIN ) THEN
-            CALL DLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI, ILO,
+            CALL DLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
+     $                   ILO,
      $                   IHI, Z, LDZ, WORK, LWORK, INFO )
          ELSE
 *
 *           ==== Small matrix ====
 *
-            CALL DLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI, ILO,
+            CALL DLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
+     $                   ILO,
      $                   IHI, Z, LDZ, INFO )
 *
             IF( INFO.GT.0 ) THEN
@@ -475,7 +477,8 @@ SUBROUTINE DHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, WR, WI, Z,
 *                 ==== Larger matrices have enough subdiagonal scratch
 *                 .    space to call DLAQR0 directly. ====
 *
-                  CALL DLAQR0( WANTT, WANTZ, N, ILO, KBOT, H, LDH, WR,
+                  CALL DLAQR0( WANTT, WANTZ, N, ILO, KBOT, H, LDH,
+     $                         WR,
      $                         WI, ILO, IHI, Z, LDZ, WORK, LWORK, INFO )
 *
                ELSE
@@ -487,9 +490,11 @@ SUBROUTINE DHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, WR, WI, Z,
 *
                   CALL DLACPY( 'A', N, N, H, LDH, HL, NL )
                   HL( N+1, N ) = ZERO
-                  CALL DLASET( 'A', NL, NL-N, ZERO, ZERO, HL( 1, N+1 ),
+                  CALL DLASET( 'A', NL, NL-N, ZERO, ZERO, HL( 1,
+     $                         N+1 ),
      $                         NL )
-                  CALL DLAQR0( WANTT, WANTZ, NL, ILO, KBOT, HL, NL, WR,
+                  CALL DLAQR0( WANTT, WANTZ, NL, ILO, KBOT, HL, NL,
+     $                         WR,
      $                         WI, ILO, IHI, Z, LDZ, WORKL, NL, INFO )
                   IF( WANTT .OR. INFO.NE.0 )
      $               CALL DLACPY( 'A', N, N, HL, NL, H, LDH )
diff --git a/SRC/disnan.f b/SRC/disnan.f
index e621b2589c..f5d1a4a257 100644
--- a/SRC/disnan.f
+++ b/SRC/disnan.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DISNAN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/disnan.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/disnan.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -52,10 +50,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup isnan
 *
 *  =====================================================================
       LOGICAL FUNCTION DISNAN( DIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dla_gbamv.f b/SRC/dla_gbamv.f
index a998c0cf11..560866bd84 100644
--- a/SRC/dla_gbamv.f
+++ b/SRC/dla_gbamv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLA_GBAMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dla_gbamv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dla_gbamv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -157,6 +155,8 @@
 *>           Before entry with BETA non-zero, the incremented array Y
 *>           must contain the vector y. On exit, Y is overwritten by the
 *>           updated vector y.
+*>           If either m or n is zero, then Y not referenced and the function
+*>           performs a quick return.
 *> \endverbatim
 *>
 *> \param[in] INCY
@@ -177,11 +177,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBcomputational
+*> \ingroup la_gbamv
 *
 *  =====================================================================
       SUBROUTINE DLA_GBAMV( TRANS, M, N, KL, KU, ALPHA, AB, LDAB, X,
      $                      INCX, BETA, Y, INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dla_gbrcond.f b/SRC/dla_gbrcond.f
index c5e944b8de..3952b0ea91 100644
--- a/SRC/dla_gbrcond.f
+++ b/SRC/dla_gbrcond.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLA_GBRCOND + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dla_gbrcond.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dla_gbrcond.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -161,12 +159,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBcomputational
+*> \ingroup la_gbrcond
 *
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION DLA_GBRCOND( TRANS, N, KL, KU, AB, LDAB,
+      DOUBLE PRECISION FUNCTION DLA_GBRCOND( TRANS, N, KL, KU, AB,
+     $                                       LDAB,
      $                                       AFB, LDAFB, IPIV, CMODE, C,
      $                                       INFO, WORK, IWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -294,7 +294,8 @@ DOUBLE PRECISION FUNCTION DLA_GBRCOND( TRANS, N, KL, KU, AB, LDAB,
                CALL DGBTRS( 'No transpose', N, KL, KU, 1, AFB, LDAFB,
      $              IPIV, WORK, N, INFO )
             ELSE
-               CALL DGBTRS( 'Transpose', N, KL, KU, 1, AFB, LDAFB, IPIV,
+               CALL DGBTRS( 'Transpose', N, KL, KU, 1, AFB, LDAFB,
+     $                      IPIV,
      $              WORK, N, INFO )
             END IF
 *
@@ -324,7 +325,8 @@ DOUBLE PRECISION FUNCTION DLA_GBRCOND( TRANS, N, KL, KU, AB, LDAB,
             END IF
 
             IF ( NOTRANS ) THEN
-               CALL DGBTRS( 'Transpose', N, KL, KU, 1, AFB, LDAFB, IPIV,
+               CALL DGBTRS( 'Transpose', N, KL, KU, 1, AFB, LDAFB,
+     $                      IPIV,
      $              WORK, N, INFO )
             ELSE
                CALL DGBTRS( 'No transpose', N, KL, KU, 1, AFB, LDAFB,
diff --git a/SRC/dla_gbrfsx_extended.f b/SRC/dla_gbrfsx_extended.f
index ecb0b9f09f..80845af7e5 100644
--- a/SRC/dla_gbrfsx_extended.f
+++ b/SRC/dla_gbrfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLA_GBRFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dla_gbrfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dla_gbrfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -55,7 +53,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERR_BNDS_NORM
 *> and ERR_BNDS_COMP for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERR_BNDS_NORM and ERR_BNDS_COMP.
 *> \endverbatim
 *
@@ -398,16 +396,18 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBcomputational
+*> \ingroup la_gbrfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE DLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL, KU,
+      SUBROUTINE DLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL,
+     $                                KU,
      $                                NRHS, AB, LDAB, AFB, LDAFB, IPIV,
      $                                COLEQU, C, B, LDB, Y, LDY,
      $                                BERR_OUT, N_NORMS, ERR_BNDS_NORM,
      $                                ERR_BNDS_COMP, RES, AYB, DY,
      $                                Y_TAIL, RCOND, ITHRESH, RTHRESH,
      $                                DZ_UB, IGNORE_CWISE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -466,7 +466,8 @@ SUBROUTINE DLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL, KU,
       PARAMETER          ( LA_LINRX_RCOND_I = 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DGBTRS, DGBMV, BLAS_DGBMV_X,
+      EXTERNAL           DAXPY, DCOPY, DGBTRS, DGBMV,
+     $                   BLAS_DGBMV_X,
      $                   BLAS_DGBMV2_X, DLA_GBAMV, DLA_WWADDW, DLAMCH,
      $                   CHLA_TRANSTYPE, DLA_LIN_BERR
       DOUBLE PRECISION   DLAMCH
@@ -531,7 +532,8 @@ SUBROUTINE DLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL, KU,
 
 !        XXX: RES is no longer needed.
             CALL DCOPY( N, RES, 1, DY, 1 )
-            CALL DGBTRS( TRANS, N, KL, KU, 1, AFB, LDAFB, IPIV, DY, N,
+            CALL DGBTRS( TRANS, N, KL, KU, 1, AFB, LDAFB, IPIV, DY,
+     $                   N,
      $           INFO )
 *
 *         Calculate relative changes DX_X, DZ_Z and ratios DXRAT, DZRAT.
@@ -645,7 +647,7 @@ SUBROUTINE DLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL, KU,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF (Y_PREC_STATE .LT. EXTRA_Y) THEN
                CALL DAXPY( N, 1.0D+0, DY, 1, Y(1,J), 1 )
diff --git a/SRC/dla_gbrpvgrw.f b/SRC/dla_gbrpvgrw.f
index 92d4da3b51..3b1493a64b 100644
--- a/SRC/dla_gbrpvgrw.f
+++ b/SRC/dla_gbrpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLA_GBRPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dla_gbrpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dla_gbrpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -109,11 +107,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBcomputational
+*> \ingroup la_gbrpvgrw
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLA_GBRPVGRW( N, KL, KU, NCOLS, AB,
      $                                        LDAB, AFB, LDAFB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dla_geamv.f b/SRC/dla_geamv.f
index 8e962b459f..991e85d832 100644
--- a/SRC/dla_geamv.f
+++ b/SRC/dla_geamv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLA_GEAMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dla_geamv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dla_geamv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -146,6 +144,8 @@
 *>           Before entry with BETA non-zero, the incremented array Y
 *>           must contain the vector y. On exit, Y is overwritten by the
 *>           updated vector y.
+*>           If either m or n is zero, then Y not referenced and the function
+*>           performs a quick return.
 *> \endverbatim
 *>
 *> \param[in] INCY
@@ -166,11 +166,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup la_geamv
 *
 *  =====================================================================
-      SUBROUTINE DLA_GEAMV ( TRANS, M, N, ALPHA, A, LDA, X, INCX, BETA,
+      SUBROUTINE DLA_GEAMV ( TRANS, M, N, ALPHA, A, LDA, X, INCX,
+     $                       BETA,
      $                       Y, INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dla_gercond.f b/SRC/dla_gercond.f
index 07597c0f7e..7e2fea9f55 100644
--- a/SRC/dla_gercond.f
+++ b/SRC/dla_gercond.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLA_GERCOND + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dla_gercond.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dla_gercond.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -143,12 +141,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup la_gercond
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLA_GERCOND( TRANS, N, A, LDA, AF,
      $                                       LDAF, IPIV, CMODE, C,
      $                                       INFO, WORK, IWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dla_gerfsx_extended.f b/SRC/dla_gerfsx_extended.f
index cff131b8bf..13825b5403 100644
--- a/SRC/dla_gerfsx_extended.f
+++ b/SRC/dla_gerfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLA_GERFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dla_gerfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dla_gerfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -53,7 +51,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERRS_N
 *> and ERRS_C for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERRS_N and ERRS_C.
 *> \endverbatim
 *
@@ -384,15 +382,17 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup la_gerfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE DLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
+      SUBROUTINE DLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS,
+     $                                A,
      $                                LDA, AF, LDAF, IPIV, COLEQU, C, B,
      $                                LDB, Y, LDY, BERR_OUT, N_NORMS,
      $                                ERRS_N, ERRS_C, RES, AYB, DY,
      $                                Y_TAIL, RCOND, ITHRESH, RTHRESH,
      $                                DZ_UB, IGNORE_CWISE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -450,7 +450,8 @@ SUBROUTINE DLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
       PARAMETER          ( LA_LINRX_RCOND_I = 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DGETRS, DGEMV, BLAS_DGEMV_X,
+      EXTERNAL           DAXPY, DCOPY, DGETRS, DGEMV,
+     $                   BLAS_DGEMV_X,
      $                   BLAS_DGEMV2_X, DLA_GEAMV, DLA_WWADDW, DLAMCH,
      $                   CHLA_TRANSTYPE, DLA_LIN_BERR
       DOUBLE PRECISION   DLAMCH
@@ -500,7 +501,8 @@ SUBROUTINE DLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
 *
             CALL DCOPY( N, B( 1, J ), 1, RES, 1 )
             IF ( Y_PREC_STATE .EQ. BASE_RESIDUAL ) THEN
-               CALL DGEMV( TRANS, N, N, -1.0D+0, A, LDA, Y( 1, J ), 1,
+               CALL DGEMV( TRANS, N, N, -1.0D+0, A, LDA, Y( 1, J ),
+     $                     1,
      $              1.0D+0, RES, 1 )
             ELSE IF ( Y_PREC_STATE .EQ. EXTRA_RESIDUAL ) THEN
                CALL BLAS_DGEMV_X( TRANS_TYPE, N, N, -1.0D+0, A, LDA,
@@ -625,7 +627,7 @@ SUBROUTINE DLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF ( Y_PREC_STATE .LT. EXTRA_Y ) THEN
                CALL DAXPY( N, 1.0D+0, DY, 1, Y( 1, J ), 1 )
diff --git a/SRC/dla_gerpvgrw.f b/SRC/dla_gerpvgrw.f
index d4d668245c..43b140e07f 100644
--- a/SRC/dla_gerpvgrw.f
+++ b/SRC/dla_gerpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLA_GERPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dla_gerpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dla_gerpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -92,11 +90,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup la_gerpvgrw
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLA_GERPVGRW( N, NCOLS, A, LDA, AF,
      $         LDAF )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dla_lin_berr.f b/SRC/dla_lin_berr.f
index c3fab85636..4ee58df3b2 100644
--- a/SRC/dla_lin_berr.f
+++ b/SRC/dla_lin_berr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLA_LIN_BERR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dla_lin_berr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dla_lin_berr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -94,10 +92,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup la_lin_berr
 *
 *  =====================================================================
       SUBROUTINE DLA_LIN_BERR ( N, NZ, NRHS, RES, AYB, BERR )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dla_porcond.f b/SRC/dla_porcond.f
index fd04138da4..a11c41d613 100644
--- a/SRC/dla_porcond.f
+++ b/SRC/dla_porcond.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLA_PORCOND + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dla_porcond.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dla_porcond.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,12 +131,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePOcomputational
+*> \ingroup la_porcond
 *
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION DLA_PORCOND( UPLO, N, A, LDA, AF, LDAF,
+      DOUBLE PRECISION FUNCTION DLA_PORCOND( UPLO, N, A, LDA, AF,
+     $                                       LDAF,
      $                                       CMODE, C, INFO, WORK,
      $                                       IWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dla_porfsx_extended.f b/SRC/dla_porfsx_extended.f
index cabf631fd3..a7c4716945 100644
--- a/SRC/dla_porfsx_extended.f
+++ b/SRC/dla_porfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLA_PORFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dla_porfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dla_porfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -54,7 +52,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERR_BNDS_NORM
 *> and ERR_BNDS_COMP for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERR_BNDS_NORM and ERR_BNDS_COMP.
 *> \endverbatim
 *
@@ -374,16 +372,18 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePOcomputational
+*> \ingroup la_porfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE DLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
+      SUBROUTINE DLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A,
+     $                                LDA,
      $                                AF, LDAF, COLEQU, C, B, LDB, Y,
      $                                LDY, BERR_OUT, N_NORMS,
      $                                ERR_BNDS_NORM, ERR_BNDS_COMP, RES,
      $                                AYB, DY, Y_TAIL, RCOND, ITHRESH,
      $                                RTHRESH, DZ_UB, IGNORE_CWISE,
      $                                INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -446,7 +446,8 @@ SUBROUTINE DLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
       INTEGER            ILAUPLO
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL          DAXPY, DCOPY, DPOTRS, DSYMV, BLAS_DSYMV_X,
+      EXTERNAL          DAXPY, DCOPY, DPOTRS, DSYMV,
+     $                   BLAS_DSYMV_X,
      $                  BLAS_DSYMV2_X, DLA_SYAMV, DLA_WWADDW,
      $                  DLA_LIN_BERR
       DOUBLE PRECISION   DLAMCH
@@ -617,7 +618,7 @@ SUBROUTINE DLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF (Y_PREC_STATE .LT. EXTRA_Y) THEN
                CALL DAXPY( N, 1.0D+0, DY, 1, Y(1,J), 1 )
@@ -654,7 +655,8 @@ SUBROUTINE DLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
 *            op(A) = A, A**T, or A**H depending on TRANS (and type).
 *
          CALL DCOPY( N, B( 1, J ), 1, RES, 1 )
-         CALL DSYMV( UPLO, N, -1.0D+0, A, LDA, Y(1,J), 1, 1.0D+0, RES,
+         CALL DSYMV( UPLO, N, -1.0D+0, A, LDA, Y(1,J), 1, 1.0D+0,
+     $               RES,
      $     1 )
 
          DO I = 1, N
diff --git a/SRC/dla_porpvgrw.f b/SRC/dla_porpvgrw.f
index 93ad3eb6a9..ae0e386919 100644
--- a/SRC/dla_porpvgrw.f
+++ b/SRC/dla_porpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLA_PORPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dla_porpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dla_porpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,11 +96,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePOcomputational
+*> \ingroup la_porpvgrw
 *
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION DLA_PORPVGRW( UPLO, NCOLS, A, LDA, AF,
+      DOUBLE PRECISION FUNCTION DLA_PORPVGRW( UPLO, NCOLS, A, LDA,
+     $                                        AF,
      $                                        LDAF, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -134,9 +134,9 @@ DOUBLE PRECISION FUNCTION DLA_PORPVGRW( UPLO, NCOLS, A, LDA, AF,
 *
       UPPER = LSAME( 'Upper', UPLO )
 *
-*     DPOTRF will have factored only the NCOLSxNCOLS leading minor, so
-*     we restrict the growth search to that minor and use only the first
-*     2*NCOLS workspace entries.
+*     DPOTRF will have factored only the NCOLSxNCOLS leading submatrix,
+*     so we restrict the growth search to that submatrix and use only
+*     the first 2*NCOLS workspace entries.
 *
       RPVGRW = 1.0D+0
       DO I = 1, 2*NCOLS
diff --git a/SRC/dla_syamv.f b/SRC/dla_syamv.f
index 3911e2ab2f..c17c4c5c06 100644
--- a/SRC/dla_syamv.f
+++ b/SRC/dla_syamv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLA_SYAMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dla_syamv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dla_syamv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -153,7 +151,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup la_heamv
 *
 *> \par Further Details:
 *  =====================
@@ -174,6 +172,7 @@
 *  =====================================================================
       SUBROUTINE DLA_SYAMV( UPLO, N, ALPHA, A, LDA, X, INCX, BETA, Y,
      $                      INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dla_syrcond.f b/SRC/dla_syrcond.f
index 80c099773e..00d8a33fbe 100644
--- a/SRC/dla_syrcond.f
+++ b/SRC/dla_syrcond.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLA_SYRCOND + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dla_syrcond.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dla_syrcond.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -139,12 +137,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup la_hercond
 *
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION DLA_SYRCOND( UPLO, N, A, LDA, AF, LDAF,
+      DOUBLE PRECISION FUNCTION DLA_SYRCOND( UPLO, N, A, LDA, AF,
+     $                                       LDAF,
      $                                       IPIV, CMODE, C, INFO, WORK,
      $                                       IWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -282,9 +282,11 @@ DOUBLE PRECISION FUNCTION DLA_SYRCOND( UPLO, N, A, LDA, AF, LDAF,
             END DO
 
             IF ( UP ) THEN
-               CALL DSYTRS( 'U', N, 1, AF, LDAF, IPIV, WORK, N, INFO )
+               CALL DSYTRS( 'U', N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
             ELSE
-               CALL DSYTRS( 'L', N, 1, AF, LDAF, IPIV, WORK, N, INFO )
+               CALL DSYTRS( 'L', N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
             ENDIF
 *
 *           Multiply by inv(C).
@@ -313,9 +315,11 @@ DOUBLE PRECISION FUNCTION DLA_SYRCOND( UPLO, N, A, LDA, AF, LDAF,
             END IF
 
             IF ( UP ) THEN
-               CALL DSYTRS( 'U', N, 1, AF, LDAF, IPIV, WORK, N, INFO )
+               CALL DSYTRS( 'U', N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
             ELSE
-               CALL DSYTRS( 'L', N, 1, AF, LDAF, IPIV, WORK, N, INFO )
+               CALL DSYTRS( 'L', N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
             ENDIF
 *
 *           Multiply by R.
diff --git a/SRC/dla_syrfsx_extended.f b/SRC/dla_syrfsx_extended.f
index 4ccac897aa..46ff962bee 100644
--- a/SRC/dla_syrfsx_extended.f
+++ b/SRC/dla_syrfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLA_SYRFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dla_syrfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dla_syrfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -56,7 +54,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERR_BNDS_NORM
 *> and ERR_BNDS_COMP for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERR_BNDS_NORM and ERR_BNDS_COMP.
 *> \endverbatim
 *
@@ -383,16 +381,18 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup la_herfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE DLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
+      SUBROUTINE DLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A,
+     $                                LDA,
      $                                AF, LDAF, IPIV, COLEQU, C, B, LDB,
      $                                Y, LDY, BERR_OUT, N_NORMS,
      $                                ERR_BNDS_NORM, ERR_BNDS_COMP, RES,
      $                                AYB, DY, Y_TAIL, RCOND, ITHRESH,
      $                                RTHRESH, DZ_UB, IGNORE_CWISE,
      $                                INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -456,7 +456,8 @@ SUBROUTINE DLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
       INTEGER            ILAUPLO
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DSYTRS, DSYMV, BLAS_DSYMV_X,
+      EXTERNAL           DAXPY, DCOPY, DSYTRS, DSYMV,
+     $                   BLAS_DSYMV_X,
      $                   BLAS_DSYMV2_X, DLA_SYAMV, DLA_WWADDW,
      $                   DLA_LIN_BERR
       DOUBLE PRECISION   DLAMCH
@@ -647,7 +648,7 @@ SUBROUTINE DLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF (Y_PREC_STATE .LT. EXTRA_Y) THEN
                CALL DAXPY( N, 1.0D+0, DY, 1, Y(1,J), 1 )
@@ -683,7 +684,8 @@ SUBROUTINE DLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
 *        Compute residual RES = B_s - op(A_s) * Y,
 *            op(A) = A, A**T, or A**H depending on TRANS (and type).
          CALL DCOPY( N, B( 1, J ), 1, RES, 1 )
-         CALL DSYMV( UPLO, N, -1.0D+0, A, LDA, Y(1,J), 1, 1.0D+0, RES,
+         CALL DSYMV( UPLO, N, -1.0D+0, A, LDA, Y(1,J), 1, 1.0D+0,
+     $               RES,
      $     1 )
 
          DO I = 1, N
diff --git a/SRC/dla_syrpvgrw.f b/SRC/dla_syrpvgrw.f
index b74133e6c8..c161599f48 100644
--- a/SRC/dla_syrpvgrw.f
+++ b/SRC/dla_syrpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLA_SYRPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dla_syrpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dla_syrpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -114,11 +112,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup la_herpvgrw
 *
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION DLA_SYRPVGRW( UPLO, N, INFO, A, LDA, AF,
+      DOUBLE PRECISION FUNCTION DLA_SYRPVGRW( UPLO, N, INFO, A, LDA,
+     $                                        AF,
      $                                        LDAF, IPIV, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dla_wwaddw.f b/SRC/dla_wwaddw.f
index 9b07a30724..c98899e36e 100644
--- a/SRC/dla_wwaddw.f
+++ b/SRC/dla_wwaddw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLA_WWADDW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dla_wwaddw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dla_wwaddw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -74,10 +72,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup la_wwaddw
 *
 *  =====================================================================
       SUBROUTINE DLA_WWADDW( N, X, Y, W )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlabad.f b/SRC/dlabad.f
index 95b35e53b8..9a84370d8c 100644
--- a/SRC/dlabad.f
+++ b/SRC/dlabad.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLABAD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlabad.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlabad.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -30,14 +28,10 @@
 *>
 *> \verbatim
 *>
-*> DLABAD takes as input the values computed by DLAMCH for underflow and
-*> overflow, and returns the square root of each of these values if the
-*> log of LARGE is sufficiently large.  This subroutine is intended to
-*> identify machines with a large exponent range, such as the Crays, and
-*> redefine the underflow and overflow limits to be the square roots of
-*> the values computed by DLAMCH.  This subroutine is needed because
-*> DLAMCH does not compensate for poor arithmetic in the upper half of
-*> the exponent range, as is found on a Cray.
+*> DLABAD is a no-op and kept for compatibility reasons. It used
+*> to correct the overflow/underflow behavior of machines that
+*> are not IEEE-754 compliant.
+*>
 *> \endverbatim
 *
 *  Arguments:
@@ -47,16 +41,14 @@
 *> \verbatim
 *>          SMALL is DOUBLE PRECISION
 *>          On entry, the underflow threshold as computed by DLAMCH.
-*>          On exit, if LOG10(LARGE) is sufficiently large, the square
-*>          root of SMALL, otherwise unchanged.
+*>          On exit, the unchanged value SMALL.
 *> \endverbatim
 *>
 *> \param[in,out] LARGE
 *> \verbatim
 *>          LARGE is DOUBLE PRECISION
 *>          On entry, the overflow threshold as computed by DLAMCH.
-*>          On exit, if LOG10(LARGE) is sufficiently large, the square
-*>          root of LARGE, otherwise unchanged.
+*>          On exit, the unchanged value LARGE.
 *> \endverbatim
 *
 *  Authors:
@@ -67,10 +59,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup labad
 *
 *  =====================================================================
       SUBROUTINE DLABAD( SMALL, LARGE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -90,10 +83,10 @@ SUBROUTINE DLABAD( SMALL, LARGE )
 *     If it looks like we're on a Cray, take the square root of
 *     SMALL and LARGE to avoid overflow and underflow problems.
 *
-      IF( LOG10( LARGE ).GT.2000.D0 ) THEN
-         SMALL = SQRT( SMALL )
-         LARGE = SQRT( LARGE )
-      END IF
+*      IF( LOG10( LARGE ).GT.2000.D0 ) THEN
+*         SMALL = SQRT( SMALL )
+*         LARGE = SQRT( LARGE )
+*      END IF
 *
       RETURN
 *
diff --git a/SRC/dlabrd.f b/SRC/dlabrd.f
index 86dfc10c7c..2ab7f53314 100644
--- a/SRC/dlabrd.f
+++ b/SRC/dlabrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLABRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlabrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlabrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -156,7 +154,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup labrd
 *
 *> \par Further Details:
 *  =====================
@@ -205,8 +203,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
+      SUBROUTINE DLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX,
+     $                   Y,
      $                   LDY )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -267,11 +267,14 @@ SUBROUTINE DLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
 *
                CALL DGEMV( 'Transpose', M-I+1, N-I, ONE, A( I, I+1 ),
      $                     LDA, A( I, I ), 1, ZERO, Y( I+1, I ), 1 )
-               CALL DGEMV( 'Transpose', M-I+1, I-1, ONE, A( I, 1 ), LDA,
+               CALL DGEMV( 'Transpose', M-I+1, I-1, ONE, A( I, 1 ),
+     $                     LDA,
      $                     A( I, I ), 1, ZERO, Y( 1, I ), 1 )
-               CALL DGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1, 1 ),
+               CALL DGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1,
+     $                     1 ),
      $                     LDY, Y( 1, I ), 1, ONE, Y( I+1, I ), 1 )
-               CALL DGEMV( 'Transpose', M-I+1, I-1, ONE, X( I, 1 ), LDX,
+               CALL DGEMV( 'Transpose', M-I+1, I-1, ONE, X( I, 1 ),
+     $                     LDX,
      $                     A( I, I ), 1, ZERO, Y( 1, I ), 1 )
                CALL DGEMV( 'Transpose', I-1, N-I, -ONE, A( 1, I+1 ),
      $                     LDA, Y( 1, I ), 1, ONE, Y( I+1, I ), 1 )
@@ -293,15 +296,19 @@ SUBROUTINE DLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
 *
 *              Compute X(i+1:m,i)
 *
-               CALL DGEMV( 'No transpose', M-I, N-I, ONE, A( I+1, I+1 ),
+               CALL DGEMV( 'No transpose', M-I, N-I, ONE, A( I+1,
+     $                     I+1 ),
      $                     LDA, A( I, I+1 ), LDA, ZERO, X( I+1, I ), 1 )
-               CALL DGEMV( 'Transpose', N-I, I, ONE, Y( I+1, 1 ), LDY,
+               CALL DGEMV( 'Transpose', N-I, I, ONE, Y( I+1, 1 ),
+     $                     LDY,
      $                     A( I, I+1 ), LDA, ZERO, X( 1, I ), 1 )
                CALL DGEMV( 'No transpose', M-I, I, -ONE, A( I+1, 1 ),
      $                     LDA, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
-               CALL DGEMV( 'No transpose', I-1, N-I, ONE, A( 1, I+1 ),
+               CALL DGEMV( 'No transpose', I-1, N-I, ONE, A( 1,
+     $                     I+1 ),
      $                     LDA, A( I, I+1 ), LDA, ZERO, X( 1, I ), 1 )
-               CALL DGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1, 1 ),
+               CALL DGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1,
+     $                     1 ),
      $                     LDX, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
                CALL DSCAL( M-I, TAUP( I ), X( I+1, I ), 1 )
             END IF
@@ -316,12 +323,14 @@ SUBROUTINE DLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
 *
             CALL DGEMV( 'No transpose', N-I+1, I-1, -ONE, Y( I, 1 ),
      $                  LDY, A( I, 1 ), LDA, ONE, A( I, I ), LDA )
-            CALL DGEMV( 'Transpose', I-1, N-I+1, -ONE, A( 1, I ), LDA,
+            CALL DGEMV( 'Transpose', I-1, N-I+1, -ONE, A( 1, I ),
+     $                  LDA,
      $                  X( I, 1 ), LDX, ONE, A( I, I ), LDA )
 *
 *           Generate reflection P(i) to annihilate A(i,i+1:n)
 *
-            CALL DLARFG( N-I+1, A( I, I ), A( I, MIN( I+1, N ) ), LDA,
+            CALL DLARFG( N-I+1, A( I, I ), A( I, MIN( I+1, N ) ),
+     $                   LDA,
      $                   TAUP( I ) )
             D( I ) = A( I, I )
             IF( I.LT.M ) THEN
@@ -329,28 +338,35 @@ SUBROUTINE DLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
 *
 *              Compute X(i+1:m,i)
 *
-               CALL DGEMV( 'No transpose', M-I, N-I+1, ONE, A( I+1, I ),
+               CALL DGEMV( 'No transpose', M-I, N-I+1, ONE, A( I+1,
+     $                     I ),
      $                     LDA, A( I, I ), LDA, ZERO, X( I+1, I ), 1 )
-               CALL DGEMV( 'Transpose', N-I+1, I-1, ONE, Y( I, 1 ), LDY,
+               CALL DGEMV( 'Transpose', N-I+1, I-1, ONE, Y( I, 1 ),
+     $                     LDY,
      $                     A( I, I ), LDA, ZERO, X( 1, I ), 1 )
-               CALL DGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1, 1 ),
+               CALL DGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1,
+     $                     1 ),
      $                     LDA, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
-               CALL DGEMV( 'No transpose', I-1, N-I+1, ONE, A( 1, I ),
+               CALL DGEMV( 'No transpose', I-1, N-I+1, ONE, A( 1,
+     $                     I ),
      $                     LDA, A( I, I ), LDA, ZERO, X( 1, I ), 1 )
-               CALL DGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1, 1 ),
+               CALL DGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1,
+     $                     1 ),
      $                     LDX, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
                CALL DSCAL( M-I, TAUP( I ), X( I+1, I ), 1 )
 *
 *              Update A(i+1:m,i)
 *
-               CALL DGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1, 1 ),
+               CALL DGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1,
+     $                     1 ),
      $                     LDA, Y( I, 1 ), LDY, ONE, A( I+1, I ), 1 )
                CALL DGEMV( 'No transpose', M-I, I, -ONE, X( I+1, 1 ),
      $                     LDX, A( 1, I ), 1, ONE, A( I+1, I ), 1 )
 *
 *              Generate reflection Q(i) to annihilate A(i+2:m,i)
 *
-               CALL DLARFG( M-I, A( I+1, I ), A( MIN( I+2, M ), I ), 1,
+               CALL DLARFG( M-I, A( I+1, I ), A( MIN( I+2, M ), I ),
+     $                      1,
      $                      TAUQ( I ) )
                E( I ) = A( I+1, I )
                A( I+1, I ) = ONE
@@ -359,13 +375,17 @@ SUBROUTINE DLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
 *
                CALL DGEMV( 'Transpose', M-I, N-I, ONE, A( I+1, I+1 ),
      $                     LDA, A( I+1, I ), 1, ZERO, Y( I+1, I ), 1 )
-               CALL DGEMV( 'Transpose', M-I, I-1, ONE, A( I+1, 1 ), LDA,
+               CALL DGEMV( 'Transpose', M-I, I-1, ONE, A( I+1, 1 ),
+     $                     LDA,
      $                     A( I+1, I ), 1, ZERO, Y( 1, I ), 1 )
-               CALL DGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1, 1 ),
+               CALL DGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1,
+     $                     1 ),
      $                     LDY, Y( 1, I ), 1, ONE, Y( I+1, I ), 1 )
-               CALL DGEMV( 'Transpose', M-I, I, ONE, X( I+1, 1 ), LDX,
+               CALL DGEMV( 'Transpose', M-I, I, ONE, X( I+1, 1 ),
+     $                     LDX,
      $                     A( I+1, I ), 1, ZERO, Y( 1, I ), 1 )
-               CALL DGEMV( 'Transpose', I, N-I, -ONE, A( 1, I+1 ), LDA,
+               CALL DGEMV( 'Transpose', I, N-I, -ONE, A( 1, I+1 ),
+     $                     LDA,
      $                     Y( 1, I ), 1, ONE, Y( I+1, I ), 1 )
                CALL DSCAL( N-I, TAUQ( I ), Y( I+1, I ), 1 )
             END IF
diff --git a/SRC/dlacn2.f b/SRC/dlacn2.f
index ee2e7ca266..635b752fa0 100644
--- a/SRC/dlacn2.f
+++ b/SRC/dlacn2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLACN2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlacn2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlacn2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,7 +99,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lacn2
 *
 *> \par Further Details:
 *  =====================
@@ -133,6 +131,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLACN2( N, V, X, ISGN, EST, KASE, ISAVE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlacon.f b/SRC/dlacon.f
index c4f8a4512a..452fcd2820 100644
--- a/SRC/dlacon.f
+++ b/SRC/dlacon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLACON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlacon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlacon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,7 +93,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lacon
 *
 *> \par Contributors:
 *  ==================
@@ -112,6 +110,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLACON( N, V, X, ISGN, EST, KASE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlacpy.f b/SRC/dlacpy.f
index 917aa1e2a2..6a1933d801 100644
--- a/SRC/dlacpy.f
+++ b/SRC/dlacpy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLACPY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlacpy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlacpy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -96,10 +94,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lacpy
 *
 *  =====================================================================
       SUBROUTINE DLACPY( UPLO, M, N, A, LDA, B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dladiv.f b/SRC/dladiv.f
index 4265618fed..78cabe2478 100644
--- a/SRC/dladiv.f
+++ b/SRC/dladiv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLADIV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dladiv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dladiv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -84,10 +82,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup ladiv
 *
 *  =====================================================================
       SUBROUTINE DLADIV( A, B, C, D, P, Q )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -170,10 +169,11 @@ SUBROUTINE DLADIV( A, B, C, D, P, Q )
 *
       END
 
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup ladiv
 
 
       SUBROUTINE DLADIV1( A, B, C, D, P, Q )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -210,7 +210,7 @@ SUBROUTINE DLADIV1( A, B, C, D, P, Q )
 *
       END
 
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup ladiv
 
       DOUBLE PRECISION FUNCTION DLADIV2( A, B, C, D, R, T )
 *
diff --git a/SRC/dlae2.f b/SRC/dlae2.f
index a0e3971b41..388b82786e 100644
--- a/SRC/dlae2.f
+++ b/SRC/dlae2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAE2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlae2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlae2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -78,7 +76,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lae2
 *
 *> \par Further Details:
 *  =====================
@@ -99,6 +97,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLAE2( A, B, C, RT1, RT2 )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlaebz.f b/SRC/dlaebz.f
index 980536ce67..24a6116433 100644
--- a/SRC/dlaebz.f
+++ b/SRC/dlaebz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAEBZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaebz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaebz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -273,7 +271,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup laebz
 *
 *> \par Further Details:
 *  =====================
@@ -316,6 +314,7 @@
       SUBROUTINE DLAEBZ( IJOB, NITMAX, N, MMAX, MINP, NBMIN, ABSTOL,
      $                   RELTOL, PIVMIN, D, E, E2, NVAL, AB, C, MOUT,
      $                   NAB, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlaed0.f b/SRC/dlaed0.f
index fe3b6249e9..bc4fcb02de 100644
--- a/SRC/dlaed0.f
+++ b/SRC/dlaed0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAED0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaed0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaed0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -158,7 +156,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed0
 *
 *> \par Contributors:
 *  ==================
@@ -169,6 +167,7 @@
 *  =====================================================================
       SUBROUTINE DLAED0( ICOMPQ, QSIZ, N, D, E, Q, LDQ, QSTORE, LDQS,
      $                   WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -197,7 +196,8 @@ SUBROUTINE DLAED0( ICOMPQ, QSIZ, N, D, E, Q, LDQ, QSTORE, LDQS,
       DOUBLE PRECISION   TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEMM, DLACPY, DLAED1, DLAED7, DSTEQR,
+      EXTERNAL           DCOPY, DGEMM, DLACPY, DLAED1, DLAED7,
+     $                   DSTEQR,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
@@ -373,7 +373,8 @@ SUBROUTINE DLAED0( ICOMPQ, QSIZ, N, D, E, Q, LDQ, QSTORE, LDQS,
      $                      E( SUBMAT+MSD2-1 ), MSD2, WORK,
      $                      IWORK( SUBPBS+1 ), INFO )
             ELSE
-               CALL DLAED7( ICOMPQ, MATSIZ, QSIZ, TLVLS, CURLVL, CURPRB,
+               CALL DLAED7( ICOMPQ, MATSIZ, QSIZ, TLVLS, CURLVL,
+     $                      CURPRB,
      $                      D( SUBMAT ), QSTORE( 1, SUBMAT ), LDQS,
      $                      IWORK( INDXQ+SUBMAT ), E( SUBMAT+MSD2-1 ),
      $                      MSD2, WORK( IQ ), IWORK( IQPTR ),
diff --git a/SRC/dlaed1.f b/SRC/dlaed1.f
index 3718139c14..69675ee279 100644
--- a/SRC/dlaed1.f
+++ b/SRC/dlaed1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAED1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaed1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaed1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -148,7 +146,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed1
 *
 *> \par Contributors:
 *  ==================
@@ -158,8 +156,10 @@
 *>  Modified by Francoise Tisseur, University of Tennessee
 *>
 *  =====================================================================
-      SUBROUTINE DLAED1( N, D, Q, LDQ, INDXQ, RHO, CUTPNT, WORK, IWORK,
+      SUBROUTINE DLAED1( N, D, Q, LDQ, INDXQ, RHO, CUTPNT, WORK,
+     $                   IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -181,7 +181,8 @@ SUBROUTINE DLAED1( N, D, Q, LDQ, INDXQ, RHO, CUTPNT, WORK, IWORK,
      $                   IW, IZ, K, N1, N2, ZPP1
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLAED2, DLAED3, DLAMRG, XERBLA
+      EXTERNAL           DCOPY, DLAED2, DLAED3, DLAMRG,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -229,7 +230,8 @@ SUBROUTINE DLAED1( N, D, Q, LDQ, INDXQ, RHO, CUTPNT, WORK, IWORK,
 *
       CALL DCOPY( CUTPNT, Q( CUTPNT, 1 ), LDQ, WORK( IZ ), 1 )
       ZPP1 = CUTPNT + 1
-      CALL DCOPY( N-CUTPNT, Q( ZPP1, ZPP1 ), LDQ, WORK( IZ+CUTPNT ), 1 )
+      CALL DCOPY( N-CUTPNT, Q( ZPP1, ZPP1 ), LDQ, WORK( IZ+CUTPNT ),
+     $            1 )
 *
 *     Deflate eigenvalues.
 *
diff --git a/SRC/dlaed2.f b/SRC/dlaed2.f
index 9b1f1e0930..a0820fdabc 100644
--- a/SRC/dlaed2.f
+++ b/SRC/dlaed2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAED2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaed2.f">
 *> [TGZ]</a>
@@ -13,12 +12,11 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaed2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE DLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
+*       SUBROUTINE DLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMBDA, W,
 *                          Q2, INDX, INDXC, INDXP, COLTYP, INFO )
 *
 *       .. Scalar Arguments ..
@@ -28,7 +26,7 @@
 *       .. Array Arguments ..
 *       INTEGER            COLTYP( * ), INDX( * ), INDXC( * ), INDXP( * ),
 *      $                   INDXQ( * )
-*       DOUBLE PRECISION   D( * ), DLAMDA( * ), Q( LDQ, * ), Q2( * ),
+*       DOUBLE PRECISION   D( * ), DLAMBDA( * ), Q( LDQ, * ), Q2( * ),
 *      $                   W( * ), Z( * )
 *       ..
 *
@@ -123,9 +121,9 @@
 *>         process.
 *> \endverbatim
 *>
-*> \param[out] DLAMDA
+*> \param[out] DLAMBDA
 *> \verbatim
-*>          DLAMDA is DOUBLE PRECISION array, dimension (N)
+*>          DLAMBDA is DOUBLE PRECISION array, dimension (N)
 *>         A copy of the first K eigenvalues which will be used by
 *>         DLAED3 to form the secular equation.
 *> \endverbatim
@@ -148,7 +146,7 @@
 *> \param[out] INDX
 *> \verbatim
 *>          INDX is INTEGER array, dimension (N)
-*>         The permutation used to sort the contents of DLAMDA into
+*>         The permutation used to sort the contents of DLAMBDA into
 *>         ascending order.
 *> \endverbatim
 *>
@@ -197,7 +195,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed2
 *
 *> \par Contributors:
 *  ==================
@@ -207,8 +205,10 @@
 *>  Modified by Francoise Tisseur, University of Tennessee
 *>
 *  =====================================================================
-      SUBROUTINE DLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
+      SUBROUTINE DLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMBDA,
+     $                   W,
      $                   Q2, INDX, INDXC, INDXP, COLTYP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -221,7 +221,7 @@ SUBROUTINE DLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
 *     .. Array Arguments ..
       INTEGER            COLTYP( * ), INDX( * ), INDXC( * ), INDXP( * ),
      $                   INDXQ( * )
-      DOUBLE PRECISION   D( * ), DLAMDA( * ), Q( LDQ, * ), Q2( * ),
+      DOUBLE PRECISION   D( * ), DLAMBDA( * ), Q( LDQ, * ), Q2( * ),
      $                   W( * ), Z( * )
 *     ..
 *
@@ -246,7 +246,8 @@ SUBROUTINE DLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
       EXTERNAL           IDAMAX, DLAMCH, DLAPY2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLACPY, DLAMRG, DROT, DSCAL, XERBLA
+      EXTERNAL           DCOPY, DLACPY, DLAMRG, DROT, DSCAL,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, SQRT
@@ -300,9 +301,9 @@ SUBROUTINE DLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
 *     re-integrate the deflated parts from the last pass
 *
       DO 20 I = 1, N
-         DLAMDA( I ) = D( INDXQ( I ) )
+         DLAMBDA( I ) = D( INDXQ( I ) )
    20 CONTINUE
-      CALL DLAMRG( N1, N2, DLAMDA, 1, 1, INDXC )
+      CALL DLAMRG( N1, N2, DLAMBDA, 1, 1, INDXC )
       DO 30 I = 1, N
          INDX( I ) = INDXQ( INDXC( I ) )
    30 CONTINUE
@@ -324,11 +325,11 @@ SUBROUTINE DLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
          DO 40 J = 1, N
             I = INDX( J )
             CALL DCOPY( N, Q( 1, I ), 1, Q2( IQ2 ), 1 )
-            DLAMDA( J ) = D( I )
+            DLAMBDA( J ) = D( I )
             IQ2 = IQ2 + N
    40    CONTINUE
          CALL DLACPY( 'A', N, N, Q2, N, Q, LDQ )
-         CALL DCOPY( N, DLAMDA, 1, D, 1 )
+         CALL DCOPY( N, DLAMBDA, 1, D, 1 )
          GO TO 190
       END IF
 *
@@ -421,7 +422,7 @@ SUBROUTINE DLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
             PJ = NJ
          ELSE
             K = K + 1
-            DLAMDA( K ) = D( PJ )
+            DLAMBDA( K ) = D( PJ )
             W( K ) = Z( PJ )
             INDXP( K ) = PJ
             PJ = NJ
@@ -433,7 +434,7 @@ SUBROUTINE DLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
 *     Record the last eigenvalue.
 *
       K = K + 1
-      DLAMDA( K ) = D( PJ )
+      DLAMBDA( K ) = D( PJ )
       W( K ) = Z( PJ )
       INDXP( K ) = PJ
 *
@@ -470,9 +471,9 @@ SUBROUTINE DLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
          PSM( CT ) = PSM( CT ) + 1
   130 CONTINUE
 *
-*     Sort the eigenvalues and corresponding eigenvectors into DLAMDA
+*     Sort the eigenvalues and corresponding eigenvectors into DLAMBDA
 *     and Q2 respectively.  The eigenvalues/vectors which were not
-*     deflated go into the first K slots of DLAMDA and Q2 respectively,
+*     deflated go into the first K slots of DLAMBDA and Q2 respectively,
 *     while those which were deflated go into the last N - K slots.
 *
       I = 1
diff --git a/SRC/dlaed3.f b/SRC/dlaed3.f
index c58944e604..6024c6c366 100644
--- a/SRC/dlaed3.f
+++ b/SRC/dlaed3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAED3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaed3.f">
 *> [TGZ]</a>
@@ -13,12 +12,11 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaed3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE DLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMDA, Q2, INDX,
+*       SUBROUTINE DLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMBDA, Q2, INDX,
 *                          CTOT, W, S, INFO )
 *
 *       .. Scalar Arguments ..
@@ -27,7 +25,7 @@
 *       ..
 *       .. Array Arguments ..
 *       INTEGER            CTOT( * ), INDX( * )
-*       DOUBLE PRECISION   D( * ), DLAMDA( * ), Q( LDQ, * ), Q2( * ),
+*       DOUBLE PRECISION   D( * ), DLAMBDA( * ), Q( LDQ, * ), Q2( * ),
 *      $                   S( * ), W( * )
 *       ..
 *
@@ -44,12 +42,6 @@
 *> being combined by the matrix of eigenvectors of the K-by-K system
 *> which is solved here.
 *>
-*> This code makes very mild assumptions about floating point
-*> arithmetic. It will work on machines with a guard digit in
-*> add/subtract, or on those binary machines without guard digits
-*> which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or Cray-2.
-*> It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -104,14 +96,12 @@
 *>          RHO >= 0 required.
 *> \endverbatim
 *>
-*> \param[in,out] DLAMDA
+*> \param[in] DLAMBDA
 *> \verbatim
-*>          DLAMDA is DOUBLE PRECISION array, dimension (K)
+*>          DLAMBDA is DOUBLE PRECISION array, dimension (K)
 *>          The first K elements of this array contain the old roots
 *>          of the deflated updating problem.  These are the poles
-*>          of the secular equation. May be changed on output by
-*>          having lowest order bit set to zero on Cray X-MP, Cray Y-MP,
-*>          Cray-2, or Cray C-90, as described above.
+*>          of the secular equation.
 *> \endverbatim
 *>
 *> \param[in] Q2
@@ -170,7 +160,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed3
 *
 *> \par Contributors:
 *  ==================
@@ -180,8 +170,9 @@
 *>  Modified by Francoise Tisseur, University of Tennessee
 *>
 *  =====================================================================
-      SUBROUTINE DLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMDA, Q2, INDX,
+      SUBROUTINE DLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMBDA, Q2, INDX,
      $                   CTOT, W, S, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -193,7 +184,7 @@ SUBROUTINE DLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMDA, Q2, INDX,
 *     ..
 *     .. Array Arguments ..
       INTEGER            CTOT( * ), INDX( * )
-      DOUBLE PRECISION   D( * ), DLAMDA( * ), Q( LDQ, * ), Q2( * ),
+      DOUBLE PRECISION   D( * ), DLAMBDA( * ), Q( LDQ, * ), Q2( * ),
      $                   S( * ), W( * )
 *     ..
 *
@@ -208,11 +199,12 @@ SUBROUTINE DLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMDA, Q2, INDX,
       DOUBLE PRECISION   TEMP
 *     ..
 *     .. External Functions ..
-      DOUBLE PRECISION   DLAMC3, DNRM2
-      EXTERNAL           DLAMC3, DNRM2
+      DOUBLE PRECISION   DNRM2
+      EXTERNAL           DNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEMM, DLACPY, DLAED4, DLASET, XERBLA
+      EXTERNAL           DCOPY, DGEMM, DLACPY, DLAED4, DLASET,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SIGN, SQRT
@@ -240,29 +232,10 @@ SUBROUTINE DLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMDA, Q2, INDX,
       IF( K.EQ.0 )
      $   RETURN
 *
-*     Modify values DLAMDA(i) to make sure all DLAMDA(i)-DLAMDA(j) can
-*     be computed with high relative accuracy (barring over/underflow).
-*     This is a problem on machines without a guard digit in
-*     add/subtract (Cray XMP, Cray YMP, Cray C 90 and Cray 2).
-*     The following code replaces DLAMDA(I) by 2*DLAMDA(I)-DLAMDA(I),
-*     which on any of these machines zeros out the bottommost
-*     bit of DLAMDA(I) if it is 1; this makes the subsequent
-*     subtractions DLAMDA(I)-DLAMDA(J) unproblematic when cancellation
-*     occurs. On binary machines with a guard digit (almost all
-*     machines) it does not change DLAMDA(I) at all. On hexadecimal
-*     and decimal machines with a guard digit, it slightly
-*     changes the bottommost bits of DLAMDA(I). It does not account
-*     for hexadecimal or decimal machines without guard digits
-*     (we know of none). We use a subroutine call to compute
-*     2*DLAMBDA(I) to prevent optimizing compilers from eliminating
-*     this code.
-*
-      DO 10 I = 1, K
-         DLAMDA( I ) = DLAMC3( DLAMDA( I ), DLAMDA( I ) ) - DLAMDA( I )
-   10 CONTINUE
 *
       DO 20 J = 1, K
-         CALL DLAED4( K, J, DLAMDA, W, Q( 1, J ), RHO, D( J ), INFO )
+         CALL DLAED4( K, J, DLAMBDA, W, Q( 1, J ), RHO, D( J ),
+     $                INFO )
 *
 *        If the zero finder fails, the computation is terminated.
 *
@@ -293,10 +266,10 @@ SUBROUTINE DLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMDA, Q2, INDX,
       CALL DCOPY( K, Q, LDQ+1, W, 1 )
       DO 60 J = 1, K
          DO 40 I = 1, J - 1
-            W( I ) = W( I )*( Q( I, J ) / ( DLAMDA( I )-DLAMDA( J ) ) )
+            W( I ) = W( I )*( Q( I, J )/( DLAMBDA( I )-DLAMBDA( J ) ) )
    40    CONTINUE
          DO 50 I = J + 1, K
-            W( I ) = W( I )*( Q( I, J ) / ( DLAMDA( I )-DLAMDA( J ) ) )
+            W( I ) = W( I )*( Q( I, J )/( DLAMBDA( I )-DLAMBDA( J ) ) )
    50    CONTINUE
    60 CONTINUE
       DO 70 I = 1, K
@@ -327,7 +300,8 @@ SUBROUTINE DLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMDA, Q2, INDX,
       CALL DLACPY( 'A', N23, K, Q( CTOT( 1 )+1, 1 ), LDQ, S, N23 )
       IQ2 = N1*N12 + 1
       IF( N23.NE.0 ) THEN
-         CALL DGEMM( 'N', 'N', N2, K, N23, ONE, Q2( IQ2 ), N2, S, N23,
+         CALL DGEMM( 'N', 'N', N2, K, N23, ONE, Q2( IQ2 ), N2, S,
+     $               N23,
      $               ZERO, Q( N1+1, 1 ), LDQ )
       ELSE
          CALL DLASET( 'A', N2, K, ZERO, ZERO, Q( N1+1, 1 ), LDQ )
@@ -335,7 +309,8 @@ SUBROUTINE DLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMDA, Q2, INDX,
 *
       CALL DLACPY( 'A', N12, K, Q, LDQ, S, N12 )
       IF( N12.NE.0 ) THEN
-         CALL DGEMM( 'N', 'N', N1, K, N12, ONE, Q2, N1, S, N12, ZERO, Q,
+         CALL DGEMM( 'N', 'N', N1, K, N12, ONE, Q2, N1, S, N12, ZERO,
+     $               Q,
      $               LDQ )
       ELSE
          CALL DLASET( 'A', N1, K, ZERO, ZERO, Q( 1, 1 ), LDQ )
diff --git a/SRC/dlaed4.f b/SRC/dlaed4.f
index 3ee3ef920f..2aac7145f2 100644
--- a/SRC/dlaed4.f
+++ b/SRC/dlaed4.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAED4 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaed4.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaed4.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed4
 *
 *> \par Contributors:
 *  ==================
@@ -142,6 +140,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLAED4( N, I, D, Z, DELTA, RHO, DLAM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -328,9 +327,12 @@ SUBROUTINE DLAED4( N, I, D, Z, DELTA, RHO, DLAM, INFO )
          IF( C.LT.ZERO )
      $      C = ABS( C )
          IF( C.EQ.ZERO ) THEN
-*          ETA = B/A
+*           ETA = B/A
 *           ETA = RHO - TAU
-            ETA = DLTUB - TAU
+*           ETA = DLTUB - TAU
+*
+*           Update proposed by Li, Ren-Cang:
+            ETA = -W / ( DPSI+DPHI )
          ELSE IF( A.GE.ZERO ) THEN
             ETA = ( A+SQRT( ABS( A*A-FOUR*B*C ) ) ) / ( TWO*C )
          ELSE
@@ -829,7 +831,8 @@ SUBROUTINE DLAED4( N, I, D, Z, DELTA, RHO, DLAM, INFO )
                      ZZ( 3 ) = Z( IIP1 )*Z( IIP1 )
                   END IF
                END IF
-               CALL DLAED6( NITER, ORGATI, C, DELTA( IIM1 ), ZZ, W, ETA,
+               CALL DLAED6( NITER, ORGATI, C, DELTA( IIM1 ), ZZ, W,
+     $                      ETA,
      $                      INFO )
                IF( INFO.NE.0 )
      $            GO TO 250
diff --git a/SRC/dlaed5.f b/SRC/dlaed5.f
index d9e977e6b7..fb888497b5 100644
--- a/SRC/dlaed5.f
+++ b/SRC/dlaed5.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAED5 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaed5.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaed5.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,7 +93,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed5
 *
 *> \par Contributors:
 *  ==================
@@ -105,6 +103,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLAED5( I, D, Z, DELTA, RHO, DLAM )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlaed6.f b/SRC/dlaed6.f
index a0c0364e56..691aa08d31 100644
--- a/SRC/dlaed6.f
+++ b/SRC/dlaed6.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAED6 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaed6.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaed6.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,7 +113,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed6
 *
 *> \par Further Details:
 *  =====================
@@ -136,7 +134,9 @@
 *>     at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE DLAED6( KNITER, ORGATI, RHO, D, Z, FINIT, TAU, INFO )
+      SUBROUTINE DLAED6( KNITER, ORGATI, RHO, D, Z, FINIT, TAU,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlaed7.f b/SRC/dlaed7.f
index d968c56752..a6da1e25a8 100644
--- a/SRC/dlaed7.f
+++ b/SRC/dlaed7.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAED7 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaed7.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaed7.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -244,7 +242,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed7
 *
 *> \par Contributors:
 *  ==================
@@ -253,10 +251,12 @@
 *> at Berkeley, USA
 *
 *  =====================================================================
-      SUBROUTINE DLAED7( ICOMPQ, N, QSIZ, TLVLS, CURLVL, CURPBM, D, Q,
+      SUBROUTINE DLAED7( ICOMPQ, N, QSIZ, TLVLS, CURLVL, CURPBM, D,
+     $                   Q,
      $                   LDQ, INDXQ, RHO, CUTPNT, QSTORE, QPTR, PRMPTR,
      $                   PERM, GIVPTR, GIVCOL, GIVNUM, WORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -285,7 +285,8 @@ SUBROUTINE DLAED7( ICOMPQ, N, QSIZ, TLVLS, CURLVL, CURPBM, D, Q,
      $                   IQ2, IS, IW, IZ, K, LDQ2, N1, N2, PTR
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DLAED8, DLAED9, DLAEDA, DLAMRG, XERBLA
+      EXTERNAL           DGEMM, DLAED8, DLAED9, DLAEDA, DLAMRG,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -374,7 +375,8 @@ SUBROUTINE DLAED7( ICOMPQ, N, QSIZ, TLVLS, CURLVL, CURPBM, D, Q,
 *     Solve Secular Equation.
 *
       IF( K.NE.0 ) THEN
-         CALL DLAED9( K, 1, K, N, D, WORK( IS ), K, RHO, WORK( IDLMDA ),
+         CALL DLAED9( K, 1, K, N, D, WORK( IS ), K, RHO,
+     $                WORK( IDLMDA ),
      $                WORK( IW ), QSTORE( QPTR( CURR ) ), K, INFO )
          IF( INFO.NE.0 )
      $      GO TO 30
diff --git a/SRC/dlaed8.f b/SRC/dlaed8.f
index 3631fb4566..1535dc0554 100644
--- a/SRC/dlaed8.f
+++ b/SRC/dlaed8.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAED8 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaed8.f">
 *> [TGZ]</a>
@@ -13,13 +12,12 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaed8.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
 *       SUBROUTINE DLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
-*                          CUTPNT, Z, DLAMDA, Q2, LDQ2, W, PERM, GIVPTR,
+*                          CUTPNT, Z, DLAMBDA, Q2, LDQ2, W, PERM, GIVPTR,
 *                          GIVCOL, GIVNUM, INDXP, INDX, INFO )
 *
 *       .. Scalar Arguments ..
@@ -30,7 +28,7 @@
 *       .. Array Arguments ..
 *       INTEGER            GIVCOL( 2, * ), INDX( * ), INDXP( * ),
 *      $                   INDXQ( * ), PERM( * )
-*       DOUBLE PRECISION   D( * ), DLAMDA( * ), GIVNUM( 2, * ),
+*       DOUBLE PRECISION   D( * ), DLAMBDA( * ), GIVNUM( 2, * ),
 *      $                   Q( LDQ, * ), Q2( LDQ2, * ), W( * ), Z( * )
 *       ..
 *
@@ -141,9 +139,9 @@
 *>         process.
 *> \endverbatim
 *>
-*> \param[out] DLAMDA
+*> \param[out] DLAMBDA
 *> \verbatim
-*>          DLAMDA is DOUBLE PRECISION array, dimension (N)
+*>          DLAMBDA is DOUBLE PRECISION array, dimension (N)
 *>         A copy of the first K eigenvalues which will be used by
 *>         DLAED3 to form the secular equation.
 *> \endverbatim
@@ -228,7 +226,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed8
 *
 *> \par Contributors:
 *  ==================
@@ -238,8 +236,9 @@
 *
 *  =====================================================================
       SUBROUTINE DLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
-     $                   CUTPNT, Z, DLAMDA, Q2, LDQ2, W, PERM, GIVPTR,
+     $                   CUTPNT, Z, DLAMBDA, Q2, LDQ2, W, PERM, GIVPTR,
      $                   GIVCOL, GIVNUM, INDXP, INDX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -253,7 +252,7 @@ SUBROUTINE DLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
 *     .. Array Arguments ..
       INTEGER            GIVCOL( 2, * ), INDX( * ), INDXP( * ),
      $                   INDXQ( * ), PERM( * )
-      DOUBLE PRECISION   D( * ), DLAMDA( * ), GIVNUM( 2, * ),
+      DOUBLE PRECISION   D( * ), DLAMBDA( * ), GIVNUM( 2, * ),
      $                   Q( LDQ, * ), Q2( LDQ2, * ), W( * ), Z( * )
 *     ..
 *
@@ -275,7 +274,8 @@ SUBROUTINE DLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
       EXTERNAL           IDAMAX, DLAMCH, DLAPY2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLACPY, DLAMRG, DROT, DSCAL, XERBLA
+      EXTERNAL           DCOPY, DLACPY, DLAMRG, DROT, DSCAL,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, SQRT
@@ -339,14 +339,14 @@ SUBROUTINE DLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
          INDXQ( I ) = INDXQ( I ) + CUTPNT
    20 CONTINUE
       DO 30 I = 1, N
-         DLAMDA( I ) = D( INDXQ( I ) )
+         DLAMBDA( I ) = D( INDXQ( I ) )
          W( I ) = Z( INDXQ( I ) )
    30 CONTINUE
       I = 1
       J = CUTPNT + 1
-      CALL DLAMRG( N1, N2, DLAMDA, 1, 1, INDX )
+      CALL DLAMRG( N1, N2, DLAMBDA, 1, 1, INDX )
       DO 40 I = 1, N
-         D( I ) = DLAMDA( INDX( I ) )
+         D( I ) = DLAMBDA( INDX( I ) )
          Z( I ) = W( INDX( I ) )
    40 CONTINUE
 *
@@ -370,7 +370,8 @@ SUBROUTINE DLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
          ELSE
             DO 60 J = 1, N
                PERM( J ) = INDXQ( INDX( J ) )
-               CALL DCOPY( QSIZ, Q( 1, PERM( J ) ), 1, Q2( 1, J ), 1 )
+               CALL DCOPY( QSIZ, Q( 1, PERM( J ) ), 1, Q2( 1, J ),
+     $                     1 )
    60       CONTINUE
             CALL DLACPY( 'A', QSIZ, N, Q2( 1, 1 ), LDQ2, Q( 1, 1 ),
      $                   LDQ )
@@ -464,7 +465,7 @@ SUBROUTINE DLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
          ELSE
             K = K + 1
             W( K ) = Z( JLAM )
-            DLAMDA( K ) = D( JLAM )
+            DLAMBDA( K ) = D( JLAM )
             INDXP( K ) = JLAM
             JLAM = J
          END IF
@@ -476,26 +477,26 @@ SUBROUTINE DLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
 *
       K = K + 1
       W( K ) = Z( JLAM )
-      DLAMDA( K ) = D( JLAM )
+      DLAMBDA( K ) = D( JLAM )
       INDXP( K ) = JLAM
 *
   110 CONTINUE
 *
-*     Sort the eigenvalues and corresponding eigenvectors into DLAMDA
+*     Sort the eigenvalues and corresponding eigenvectors into DLAMBDA
 *     and Q2 respectively.  The eigenvalues/vectors which were not
-*     deflated go into the first K slots of DLAMDA and Q2 respectively,
+*     deflated go into the first K slots of DLAMBDA and Q2 respectively,
 *     while those which were deflated go into the last N - K slots.
 *
       IF( ICOMPQ.EQ.0 ) THEN
          DO 120 J = 1, N
             JP = INDXP( J )
-            DLAMDA( J ) = D( JP )
+            DLAMBDA( J ) = D( JP )
             PERM( J ) = INDXQ( INDX( JP ) )
   120    CONTINUE
       ELSE
          DO 130 J = 1, N
             JP = INDXP( J )
-            DLAMDA( J ) = D( JP )
+            DLAMBDA( J ) = D( JP )
             PERM( J ) = INDXQ( INDX( JP ) )
             CALL DCOPY( QSIZ, Q( 1, PERM( J ) ), 1, Q2( 1, J ), 1 )
   130    CONTINUE
@@ -506,9 +507,9 @@ SUBROUTINE DLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
 *
       IF( K.LT.N ) THEN
          IF( ICOMPQ.EQ.0 ) THEN
-            CALL DCOPY( N-K, DLAMDA( K+1 ), 1, D( K+1 ), 1 )
+            CALL DCOPY( N-K, DLAMBDA( K+1 ), 1, D( K+1 ), 1 )
          ELSE
-            CALL DCOPY( N-K, DLAMDA( K+1 ), 1, D( K+1 ), 1 )
+            CALL DCOPY( N-K, DLAMBDA( K+1 ), 1, D( K+1 ), 1 )
             CALL DLACPY( 'A', QSIZ, N-K, Q2( 1, K+1 ), LDQ2,
      $                   Q( 1, K+1 ), LDQ )
          END IF
diff --git a/SRC/dlaed9.f b/SRC/dlaed9.f
index b88cdd9077..077d982e86 100644
--- a/SRC/dlaed9.f
+++ b/SRC/dlaed9.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAED9 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaed9.f">
 *> [TGZ]</a>
@@ -13,20 +12,19 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaed9.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE DLAED9( K, KSTART, KSTOP, N, D, Q, LDQ, RHO, DLAMDA, W,
-*                          S, LDS, INFO )
+*       SUBROUTINE DLAED9( K, KSTART, KSTOP, N, D, Q, LDQ, RHO, DLAMBDA,
+*                          W, S, LDS, INFO )
 *
 *       .. Scalar Arguments ..
 *       INTEGER            INFO, K, KSTART, KSTOP, LDQ, LDS, N
 *       DOUBLE PRECISION   RHO
 *       ..
 *       .. Array Arguments ..
-*       DOUBLE PRECISION   D( * ), DLAMDA( * ), Q( LDQ, * ), S( LDS, * ),
+*       DOUBLE PRECISION   D( * ), DLAMBDA( * ), Q( LDQ, * ), S( LDS, * ),
 *      $                   W( * )
 *       ..
 *
@@ -96,9 +94,9 @@
 *>          RHO >= 0 required.
 *> \endverbatim
 *>
-*> \param[in] DLAMDA
+*> \param[in] DLAMBDA
 *> \verbatim
-*>          DLAMDA is DOUBLE PRECISION array, dimension (K)
+*>          DLAMBDA is DOUBLE PRECISION array, dimension (K)
 *>          The first K elements of this array contain the old roots
 *>          of the deflated updating problem.  These are the poles
 *>          of the secular equation.
@@ -142,7 +140,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed9
 *
 *> \par Contributors:
 *  ==================
@@ -151,8 +149,10 @@
 *> at Berkeley, USA
 *
 *  =====================================================================
-      SUBROUTINE DLAED9( K, KSTART, KSTOP, N, D, Q, LDQ, RHO, DLAMDA, W,
-     $                   S, LDS, INFO )
+      SUBROUTINE DLAED9( K, KSTART, KSTOP, N, D, Q, LDQ, RHO,
+     $                   DLAMBDA,
+     $                   W, S, LDS, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -163,7 +163,7 @@ SUBROUTINE DLAED9( K, KSTART, KSTOP, N, D, Q, LDQ, RHO, DLAMDA, W,
       DOUBLE PRECISION   RHO
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION   D( * ), DLAMDA( * ), Q( LDQ, * ), S( LDS, * ),
+      DOUBLE PRECISION   D( * ), DLAMBDA( * ), Q( LDQ, * ), S( LDS, * ),
      $                   W( * )
 *     ..
 *
@@ -174,8 +174,8 @@ SUBROUTINE DLAED9( K, KSTART, KSTOP, N, D, Q, LDQ, RHO, DLAMDA, W,
       DOUBLE PRECISION   TEMP
 *     ..
 *     .. External Functions ..
-      DOUBLE PRECISION   DLAMC3, DNRM2
-      EXTERNAL           DLAMC3, DNRM2
+      DOUBLE PRECISION   DNRM2
+      EXTERNAL           DNRM2
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           DCOPY, DLAED4, XERBLA
@@ -212,30 +212,10 @@ SUBROUTINE DLAED9( K, KSTART, KSTOP, N, D, Q, LDQ, RHO, DLAMDA, W,
 *
       IF( K.EQ.0 )
      $   RETURN
-*
-*     Modify values DLAMDA(i) to make sure all DLAMDA(i)-DLAMDA(j) can
-*     be computed with high relative accuracy (barring over/underflow).
-*     This is a problem on machines without a guard digit in
-*     add/subtract (Cray XMP, Cray YMP, Cray C 90 and Cray 2).
-*     The following code replaces DLAMDA(I) by 2*DLAMDA(I)-DLAMDA(I),
-*     which on any of these machines zeros out the bottommost
-*     bit of DLAMDA(I) if it is 1; this makes the subsequent
-*     subtractions DLAMDA(I)-DLAMDA(J) unproblematic when cancellation
-*     occurs. On binary machines with a guard digit (almost all
-*     machines) it does not change DLAMDA(I) at all. On hexadecimal
-*     and decimal machines with a guard digit, it slightly
-*     changes the bottommost bits of DLAMDA(I). It does not account
-*     for hexadecimal or decimal machines without guard digits
-*     (we know of none). We use a subroutine call to compute
-*     2*DLAMBDA(I) to prevent optimizing compilers from eliminating
-*     this code.
-*
-      DO 10 I = 1, N
-         DLAMDA( I ) = DLAMC3( DLAMDA( I ), DLAMDA( I ) ) - DLAMDA( I )
-   10 CONTINUE
 *
       DO 20 J = KSTART, KSTOP
-         CALL DLAED4( K, J, DLAMDA, W, Q( 1, J ), RHO, D( J ), INFO )
+         CALL DLAED4( K, J, DLAMBDA, W, Q( 1, J ), RHO, D( J ),
+     $                INFO )
 *
 *        If the zero finder fails, the computation is terminated.
 *
@@ -261,10 +241,10 @@ SUBROUTINE DLAED9( K, KSTART, KSTOP, N, D, Q, LDQ, RHO, DLAMDA, W,
       CALL DCOPY( K, Q, LDQ+1, W, 1 )
       DO 70 J = 1, K
          DO 50 I = 1, J - 1
-            W( I ) = W( I )*( Q( I, J ) / ( DLAMDA( I )-DLAMDA( J ) ) )
+            W( I ) = W( I )*( Q( I, J )/( DLAMBDA( I )-DLAMBDA( J ) ) )
    50    CONTINUE
          DO 60 I = J + 1, K
-            W( I ) = W( I )*( Q( I, J ) / ( DLAMDA( I )-DLAMDA( J ) ) )
+            W( I ) = W( I )*( Q( I, J )/( DLAMBDA( I )-DLAMBDA( J ) ) )
    60    CONTINUE
    70 CONTINUE
       DO 80 I = 1, K
diff --git a/SRC/dlaeda.f b/SRC/dlaeda.f
index 8864fd7f2a..0c787eb477 100644
--- a/SRC/dlaeda.f
+++ b/SRC/dlaeda.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAEDA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaeda.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaeda.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -152,7 +150,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laeda
 *
 *> \par Contributors:
 *  ==================
@@ -161,8 +159,10 @@
 *> at Berkeley, USA
 *
 *  =====================================================================
-      SUBROUTINE DLAEDA( N, TLVLS, CURLVL, CURPBM, PRMPTR, PERM, GIVPTR,
+      SUBROUTINE DLAEDA( N, TLVLS, CURLVL, CURPBM, PRMPTR, PERM,
+     $                   GIVPTR,
      $                   GIVCOL, GIVNUM, Q, QPTR, Z, ZTEMP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -286,7 +286,8 @@ SUBROUTINE DLAEDA( N, TLVLS, CURLVL, CURPBM, PRMPTR, PERM, GIVPTR,
             CALL DGEMV( 'T', BSIZ1, BSIZ1, ONE, Q( QPTR( CURR ) ),
      $                  BSIZ1, ZTEMP( 1 ), 1, ZERO, Z( ZPTR1 ), 1 )
          END IF
-         CALL DCOPY( PSIZ1-BSIZ1, ZTEMP( BSIZ1+1 ), 1, Z( ZPTR1+BSIZ1 ),
+         CALL DCOPY( PSIZ1-BSIZ1, ZTEMP( BSIZ1+1 ), 1,
+     $               Z( ZPTR1+BSIZ1 ),
      $               1 )
          IF( BSIZ2.GT.0 ) THEN
             CALL DGEMV( 'T', BSIZ2, BSIZ2, ONE, Q( QPTR( CURR+1 ) ),
diff --git a/SRC/dlaein.f b/SRC/dlaein.f
index 8e4c7fea1b..17bb819aaa 100644
--- a/SRC/dlaein.f
+++ b/SRC/dlaein.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAEIN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaein.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaein.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -164,11 +162,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup laein
 *
 *  =====================================================================
-      SUBROUTINE DLAEIN( RIGHTV, NOINIT, N, H, LDH, WR, WI, VR, VI, B,
+      SUBROUTINE DLAEIN( RIGHTV, NOINIT, N, H, LDH, WR, WI, VR, VI,
+     $                   B,
      $                   LDB, WORK, EPS3, SMLNUM, BIGNUM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -332,7 +332,8 @@ SUBROUTINE DLAEIN( RIGHTV, NOINIT, N, H, LDH, WR, WI, VR, VI, B,
 *             or U**T*x = scale*v for a left eigenvector,
 *           overwriting x on v.
 *
-            CALL DLATRS( 'Upper', TRANS, 'Nonunit', NORMIN, N, B, LDB,
+            CALL DLATRS( 'Upper', TRANS, 'Nonunit', NORMIN, N, B,
+     $                   LDB,
      $                   VR, SCALE, WORK, IERR )
             NORMIN = 'Y'
 *
@@ -378,7 +379,8 @@ SUBROUTINE DLAEIN( RIGHTV, NOINIT, N, H, LDH, WR, WI, VR, VI, B,
 *
 *           Scale supplied initial vector.
 *
-            NORM = DLAPY2( DNRM2( N, VR, 1 ), DNRM2( N, VI, 1 ) )
+            NORM = DLAPY2( DNRM2( N, VR, 1 ),
+     $                     DNRM2( N, VI, 1 ) )
             REC = ( EPS3*ROOTN ) / MAX( NORM, NRMSML )
             CALL DSCAL( N, REC, VR, 1 )
             CALL DSCAL( N, REC, VI, 1 )
@@ -569,7 +571,8 @@ SUBROUTINE DLAEIN( RIGHTV, NOINIT, N, H, LDH, WR, WI, VR, VI, B,
 *
 *                 Divide by diagonal element of B.
 *
-                  CALL DLADIV( XR, XI, B( I, I ), B( I+1, I ), VR( I ),
+                  CALL DLADIV( XR, XI, B( I, I ), B( I+1, I ),
+     $                         VR( I ),
      $                         VI( I ) )
                   VMAX = MAX( ABS( VR( I ) )+ABS( VI( I ) ), VMAX )
                   VCRIT = BIGNUM / VMAX
diff --git a/SRC/dlaev2.f b/SRC/dlaev2.f
index 9e29991a6d..b808e708de 100644
--- a/SRC/dlaev2.f
+++ b/SRC/dlaev2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAEV2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaev2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaev2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -94,7 +92,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup laev2
 *
 *> \par Further Details:
 *  =====================
@@ -117,6 +115,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLAEV2( A, B, C, RT1, RT2, CS1, SN1 )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlaexc.f b/SRC/dlaexc.f
index b2a27b7776..fd1022a9bc 100644
--- a/SRC/dlaexc.f
+++ b/SRC/dlaexc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAEXC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaexc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaexc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,11 +128,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup laexc
 *
 *  =====================================================================
       SUBROUTINE DLAEXC( WANTQ, N, T, LDT, Q, LDQ, J1, N1, N2, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -173,7 +172,8 @@ SUBROUTINE DLAEXC( WANTQ, N, T, LDT, Q, LDQ, J1, N1, N2, WORK,
       EXTERNAL           DLAMCH, DLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLACPY, DLANV2, DLARFG, DLARFX, DLARTG, DLASY2,
+      EXTERNAL           DLACPY, DLANV2, DLARFG, DLARFX, DLARTG,
+     $                   DLASY2,
      $                   DROT
 *     ..
 *     .. Intrinsic Functions ..
@@ -208,7 +208,8 @@ SUBROUTINE DLAEXC( WANTQ, N, T, LDT, Q, LDQ, J1, N1, N2, WORK,
 *        Apply transformation to the matrix T.
 *
          IF( J3.LE.N )
-     $      CALL DROT( N-J1-1, T( J1, J3 ), LDT, T( J2, J3 ), LDT, CS,
+     $      CALL DROT( N-J1-1, T( J1, J3 ), LDT, T( J2, J3 ), LDT,
+     $                 CS,
      $                 SN )
          CALL DROT( J1-1, T( 1, J1 ), 1, T( 1, J2 ), 1, CS, SN )
 *
@@ -276,7 +277,8 @@ SUBROUTINE DLAEXC( WANTQ, N, T, LDT, Q, LDQ, J1, N1, N2, WORK,
 *
 *        Accept swap: apply transformation to the entire matrix T.
 *
-         CALL DLARFX( 'L', 3, N-J1+1, U, TAU, T( J1, J1 ), LDT, WORK )
+         CALL DLARFX( 'L', 3, N-J1+1, U, TAU, T( J1, J1 ), LDT,
+     $                WORK )
          CALL DLARFX( 'R', J2, 3, U, TAU, T( 1, J1 ), LDT, WORK )
 *
          T( J3, J1 ) = ZERO
@@ -370,9 +372,11 @@ SUBROUTINE DLAEXC( WANTQ, N, T, LDT, Q, LDQ, J1, N1, N2, WORK,
 *
 *        Accept swap: apply transformation to the entire matrix T.
 *
-         CALL DLARFX( 'L', 3, N-J1+1, U1, TAU1, T( J1, J1 ), LDT, WORK )
+         CALL DLARFX( 'L', 3, N-J1+1, U1, TAU1, T( J1, J1 ), LDT,
+     $                WORK )
          CALL DLARFX( 'R', J4, 3, U1, TAU1, T( 1, J1 ), LDT, WORK )
-         CALL DLARFX( 'L', 3, N-J1+1, U2, TAU2, T( J2, J1 ), LDT, WORK )
+         CALL DLARFX( 'L', 3, N-J1+1, U2, TAU2, T( J2, J1 ), LDT,
+     $                WORK )
          CALL DLARFX( 'R', J4, 3, U2, TAU2, T( 1, J2 ), LDT, WORK )
 *
          T( J3, J1 ) = ZERO
@@ -396,7 +400,8 @@ SUBROUTINE DLAEXC( WANTQ, N, T, LDT, Q, LDQ, J1, N1, N2, WORK,
 *
             CALL DLANV2( T( J1, J1 ), T( J1, J2 ), T( J2, J1 ),
      $                   T( J2, J2 ), WR1, WI1, WR2, WI2, CS, SN )
-            CALL DROT( N-J1-1, T( J1, J1+2 ), LDT, T( J2, J1+2 ), LDT,
+            CALL DROT( N-J1-1, T( J1, J1+2 ), LDT, T( J2, J1+2 ),
+     $                 LDT,
      $                 CS, SN )
             CALL DROT( J1-1, T( 1, J1 ), 1, T( 1, J2 ), 1, CS, SN )
             IF( WANTQ )
diff --git a/SRC/dlag2.f b/SRC/dlag2.f
index 81c81a0aad..eb01a9f712 100644
--- a/SRC/dlag2.f
+++ b/SRC/dlag2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAG2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlag2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlag2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -148,11 +146,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lag2
 *
 *  =====================================================================
       SUBROUTINE DLAG2( A, LDA, B, LDB, SAFMIN, SCALE1, SCALE2, WR1,
      $                  WR2, WI )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlag2s.f b/SRC/dlag2s.f
index e5a9302238..b0a3756bd7 100644
--- a/SRC/dlag2s.f
+++ b/SRC/dlag2s.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAG2S + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlag2s.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlag2s.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -34,8 +32,8 @@
 *>
 *> \verbatim
 *>
-*> DLAG2S converts a DOUBLE PRECISION matrix, SA, to a SINGLE
-*> PRECISION matrix, A.
+*> DLAG2S converts a DOUBLE PRECISION matrix, A, to a SINGLE
+*> PRECISION matrix, SA.
 *>
 *> RMAX is the overflow for the SINGLE PRECISION arithmetic
 *> DLAG2S checks that all the entries of A are between -RMAX and
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup _lag2_
 *
 *  =====================================================================
       SUBROUTINE DLAG2S( M, N, A, LDA, SA, LDSA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -128,6 +127,9 @@ SUBROUTINE DLAG2S( M, N, A, LDA, SA, LDSA, INFO )
       REAL               SLAMCH
       EXTERNAL           SLAMCH
 *     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          REAL
+*     ..
 *     .. Executable Statements ..
 *
       RMAX = SLAMCH( 'O' )
@@ -137,7 +139,7 @@ SUBROUTINE DLAG2S( M, N, A, LDA, SA, LDSA, INFO )
                INFO = 1
                GO TO 30
             END IF
-            SA( I, J ) = A( I, J )
+            SA( I, J ) = REAL( A( I, J ) )
    10    CONTINUE
    20 CONTINUE
       INFO = 0
diff --git a/SRC/dlags2.f b/SRC/dlags2.f
index 88caf25a82..ea4ca74e3f 100644
--- a/SRC/dlags2.f
+++ b/SRC/dlags2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAGS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlags2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlags2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,11 +142,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lags2
 *
 *  =====================================================================
-      SUBROUTINE DLAGS2( UPPER, A1, A2, A3, B1, B2, B3, CSU, SNU, CSV,
+      SUBROUTINE DLAGS2( UPPER, A1, A2, A3, B1, B2, B3, CSU, SNU,
+     $                   CSV,
      $                   SNV, CSQ, SNQ )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlagtf.f b/SRC/dlagtf.f
index 214bbb7a62..4e35725500 100644
--- a/SRC/dlagtf.f
+++ b/SRC/dlagtf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAGTF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlagtf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlagtf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -149,10 +147,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lagtf
 *
 *  =====================================================================
       SUBROUTINE DLAGTF( N, A, LAMBDA, B, C, TOL, D, IN, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlagtm.f b/SRC/dlagtm.f
index fd443df2b5..83a235df28 100644
--- a/SRC/dlagtm.f
+++ b/SRC/dlagtm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAGTM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlagtm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlagtm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,7 @@
 *>
 *> \verbatim
 *>
-*> DLAGTM performs a matrix-vector product of the form
+*> DLAGTM performs a matrix-matrix product of the form
 *>
 *>    B := alpha * A * X + beta * B
 *>
@@ -137,11 +135,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lagtm
 *
 *  =====================================================================
-      SUBROUTINE DLAGTM( TRANS, N, NRHS, ALPHA, DL, D, DU, X, LDX, BETA,
+      SUBROUTINE DLAGTM( TRANS, N, NRHS, ALPHA, DL, D, DU, X, LDX,
+     $                   BETA,
      $                   B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlagts.f b/SRC/dlagts.f
index 092d1764ed..5efb4c6f7b 100644
--- a/SRC/dlagts.f
+++ b/SRC/dlagts.f
@@ -1,11 +1,12 @@
-*> \brief \b DLAGTS solves the system of equations (T-λI)x = y or (T-λI)Tx = y,where T is a general tridiagonal matrix and λ a scalar, using the LU factorization computed by slagtf.
+*> \brief \b DLAGTS solves the system of equations (T-λI)x = y
+*> or (T-λI)^Tx = y, where T is a general tridiagonal matrix
+*> and λ a scalar, using the LU factorization computed by slagtf.
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAGTS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlagts.f">
 *> [TGZ]</a>
@@ -13,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlagts.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -154,10 +154,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lagts
 *
 *  =====================================================================
       SUBROUTINE DLAGTS( JOB, N, A, B, C, D, IN, Y, TOL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlagv2.f b/SRC/dlagv2.f
index 885fe8a7d8..893de5affb 100644
--- a/SRC/dlagv2.f
+++ b/SRC/dlagv2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAGV2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlagv2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlagv2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,7 +142,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lagv2
 *
 *> \par Contributors:
 *  ==================
@@ -152,8 +150,10 @@
 *>     Mark Fahey, Department of Mathematics, Univ. of Kentucky, USA
 *
 *  =====================================================================
-      SUBROUTINE DLAGV2( A, LDA, B, LDB, ALPHAR, ALPHAI, BETA, CSL, SNL,
+      SUBROUTINE DLAGV2( A, LDA, B, LDB, ALPHAR, ALPHAI, BETA, CSL,
+     $                   SNL,
      $                   CSR, SNR )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -253,7 +253,8 @@ SUBROUTINE DLAGV2( A, LDA, B, LDB, ALPHAR, ALPHAI, BETA, CSL, SNL,
 *
 *        B is nonsingular, first compute the eigenvalues of (A,B)
 *
-         CALL DLAG2( A, LDA, B, LDB, SAFMIN, SCALE1, SCALE2, WR1, WR2,
+         CALL DLAG2( A, LDA, B, LDB, SAFMIN, SCALE1, SCALE2, WR1,
+     $               WR2,
      $               WI )
 *
          IF( WI.EQ.ZERO ) THEN
diff --git a/SRC/dlahqr.f b/SRC/dlahqr.f
index 449134b865..df57bd4623 100644
--- a/SRC/dlahqr.f
+++ b/SRC/dlahqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAHQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlahqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlahqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -183,7 +181,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lahqr
 *
 *> \par Further Details:
 *  =====================
@@ -244,7 +242,7 @@ SUBROUTINE DLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
       EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLABAD, DLANV2, DLARFG, DROT
+      EXTERNAL           DCOPY, DLANV2, DLARFG, DROT
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, MAX, MIN, SQRT
@@ -278,7 +276,6 @@ SUBROUTINE DLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
 *
       SAFMIN = DLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULP = DLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( DBLE( NH ) / ULP )
 *
@@ -596,13 +593,15 @@ SUBROUTINE DLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
             IF( I2.GT.I )
      $         CALL DROT( I2-I, H( I-1, I+1 ), LDH, H( I, I+1 ), LDH,
      $                    CS, SN )
-            CALL DROT( I-I1-1, H( I1, I-1 ), 1, H( I1, I ), 1, CS, SN )
+            CALL DROT( I-I1-1, H( I1, I-1 ), 1, H( I1, I ), 1, CS,
+     $                 SN )
          END IF
          IF( WANTZ ) THEN
 *
 *           Apply the transformation to Z.
 *
-            CALL DROT( NZ, Z( ILOZ, I-1 ), 1, Z( ILOZ, I ), 1, CS, SN )
+            CALL DROT( NZ, Z( ILOZ, I-1 ), 1, Z( ILOZ, I ), 1, CS,
+     $                 SN )
          END IF
       END IF
 *     reset deflation counter
diff --git a/SRC/dlahr2.f b/SRC/dlahr2.f
index d517d5a93a..9a7eebf028 100644
--- a/SRC/dlahr2.f
+++ b/SRC/dlahr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAHR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlahr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlahr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,7 +121,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lahr2
 *
 *> \par Further Details:
 *  =====================
@@ -178,6 +176,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLAHR2( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,7 +222,8 @@ SUBROUTINE DLAHR2( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *
 *           Update I-th column of A - Y * V**T
 *
-            CALL DGEMV( 'NO TRANSPOSE', N-K, I-1, -ONE, Y(K+1,1), LDY,
+            CALL DGEMV( 'NO TRANSPOSE', N-K, I-1, -ONE, Y(K+1,1),
+     $                  LDY,
      $                  A( K+I-1, 1 ), LDA, ONE, A( K+1, I ), 1 )
 *
 *           Apply I - V * T**T * V**T to this column (call it b) from the
@@ -272,7 +272,8 @@ SUBROUTINE DLAHR2( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *        Generate the elementary reflector H(I) to annihilate
 *        A(K+I+1:N,I)
 *
-         CALL DLARFG( N-K-I+1, A( K+I, I ), A( MIN( K+I+1, N ), I ), 1,
+         CALL DLARFG( N-K-I+1, A( K+I, I ), A( MIN( K+I+1, N ), I ),
+     $                1,
      $                TAU( I ) )
          EI = A( K+I, I )
          A( K+I, I ) = ONE
diff --git a/SRC/dlaic1.f b/SRC/dlaic1.f
index ac22d23693..83fb4fb542 100644
--- a/SRC/dlaic1.f
+++ b/SRC/dlaic1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAIC1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaic1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaic1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,10 +125,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup laic1
 *
 *  =====================================================================
       SUBROUTINE DLAIC1( JOB, J, X, SEST, W, GAMMA, SESTPR, S, C )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlaisnan.f b/SRC/dlaisnan.f
index 2caf5fb1d0..d74fcf6a26 100644
--- a/SRC/dlaisnan.f
+++ b/SRC/dlaisnan.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAISNAN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaisnan.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaisnan.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -67,10 +65,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup laisnan
 *
 *  =====================================================================
       LOGICAL FUNCTION DLAISNAN( DIN1, DIN2 )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlaln2.f b/SRC/dlaln2.f
index b21819b056..9219df95f9 100644
--- a/SRC/dlaln2.f
+++ b/SRC/dlaln2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLALN2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaln2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaln2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -210,11 +208,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup laln2
 *
 *  =====================================================================
       SUBROUTINE DLALN2( LTRANS, NA, NW, SMIN, CA, A, LDA, D1, D2, B,
      $                   LDB, WR, WI, X, LDX, SCALE, XNORM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlals0.f b/SRC/dlals0.f
index cfca222806..168f176da9 100644
--- a/SRC/dlals0.f
+++ b/SRC/dlals0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLALS0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlals0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlals0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -252,7 +250,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup lals0
 *
 *> \par Contributors:
 *  ==================
@@ -262,9 +260,11 @@
 *>     Osni Marques, LBNL/NERSC, USA \n
 *
 *  =====================================================================
-      SUBROUTINE DLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
+      SUBROUTINE DLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX,
+     $                   LDBX,
      $                   PERM, GIVPTR, GIVCOL, LDGCOL, GIVNUM, LDGNUM,
      $                   POLES, DIFL, DIFR, Z, K, C, S, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -293,7 +293,8 @@ SUBROUTINE DLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
       DOUBLE PRECISION   DIFLJ, DIFRJ, DJ, DSIGJ, DSIGJP, TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEMV, DLACPY, DLASCL, DROT, DSCAL,
+      EXTERNAL           DCOPY, DGEMV, DLACPY, DLASCL, DROT,
+     $                   DSCAL,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
@@ -357,7 +358,8 @@ SUBROUTINE DLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
 *
          CALL DCOPY( NRHS, B( NLP1, 1 ), LDB, BX( 1, 1 ), LDBX )
          DO 20 I = 2, N
-            CALL DCOPY( NRHS, B( PERM( I ), 1 ), LDB, BX( I, 1 ), LDBX )
+            CALL DCOPY( NRHS, B( PERM( I ), 1 ), LDB, BX( I, 1 ),
+     $                  LDBX )
    20    CONTINUE
 *
 *        Step (3L): apply the inverse of the left singular vector
@@ -389,6 +391,11 @@ SUBROUTINE DLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
      $                ( POLES( I, 2 ).EQ.ZERO ) ) THEN
                      WORK( I ) = ZERO
                   ELSE
+*
+*                    Use calls to the subroutine DLAMC3 to enforce the
+*                    parentheses (x+y)+z. The goal is to prevent
+*                    optimizing compilers from doing x+(y+z).
+*
                      WORK( I ) = POLES( I, 2 )*Z( I ) /
      $                           ( DLAMC3( POLES( I, 2 ), DSIGJ )-
      $                           DIFLJ ) / ( POLES( I, 2 )+DJ )
@@ -406,7 +413,8 @@ SUBROUTINE DLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
    40          CONTINUE
                WORK( 1 ) = NEGONE
                TEMP = DNRM2( K, WORK, 1 )
-               CALL DGEMV( 'T', K, NRHS, ONE, BX, LDBX, WORK, 1, ZERO,
+               CALL DGEMV( 'T', K, NRHS, ONE, BX, LDBX, WORK, 1,
+     $                     ZERO,
      $                     B( J, 1 ), LDB )
                CALL DLASCL( 'G', 0, 0, TEMP, ONE, 1, NRHS, B( J, 1 ),
      $                      LDB, INFO )
@@ -440,7 +448,13 @@ SUBROUTINE DLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
                   IF( Z( J ).EQ.ZERO ) THEN
                      WORK( I ) = ZERO
                   ELSE
-                     WORK( I ) = Z( J ) / ( DLAMC3( DSIGJ, -POLES( I+1,
+*
+*                    Use calls to the subroutine DLAMC3 to enforce the
+*                    parentheses (x+y)+z. The goal is to prevent
+*                    optimizing compilers from doing x+(y+z).
+*
+                     WORK( I ) = Z( J ) / ( DLAMC3( DSIGJ,
+     $                     -POLES( I+1,
      $                           2 ) )-DIFR( I, 1 ) ) /
      $                           ( DSIGJ+POLES( I, 1 ) ) / DIFR( I, 2 )
                   END IF
@@ -464,10 +478,12 @@ SUBROUTINE DLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
 *
          IF( SQRE.EQ.1 ) THEN
             CALL DCOPY( NRHS, B( M, 1 ), LDB, BX( M, 1 ), LDBX )
-            CALL DROT( NRHS, BX( 1, 1 ), LDBX, BX( M, 1 ), LDBX, C, S )
+            CALL DROT( NRHS, BX( 1, 1 ), LDBX, BX( M, 1 ), LDBX, C,
+     $                 S )
          END IF
          IF( K.LT.MAX( M, N ) )
-     $      CALL DLACPY( 'A', N-K, NRHS, B( K+1, 1 ), LDB, BX( K+1, 1 ),
+     $      CALL DLACPY( 'A', N-K, NRHS, B( K+1, 1 ), LDB, BX( K+1,
+     $                   1 ),
      $                   LDBX )
 *
 *        Step (3R): permute rows of B.
@@ -477,7 +493,8 @@ SUBROUTINE DLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
             CALL DCOPY( NRHS, BX( M, 1 ), LDBX, B( M, 1 ), LDB )
          END IF
          DO 90 I = 2, N
-            CALL DCOPY( NRHS, BX( I, 1 ), LDBX, B( PERM( I ), 1 ), LDB )
+            CALL DCOPY( NRHS, BX( I, 1 ), LDBX, B( PERM( I ), 1 ),
+     $                  LDB )
    90    CONTINUE
 *
 *        Step (4R): apply back the Givens rotations performed.
diff --git a/SRC/dlalsa.f b/SRC/dlalsa.f
index da8e0fa175..a0768f6a29 100644
--- a/SRC/dlalsa.f
+++ b/SRC/dlalsa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLALSA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlalsa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlalsa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -43,9 +41,9 @@
 *>
 *> \verbatim
 *>
-*> DLALSA is an itermediate step in solving the least squares problem
+*> DLALSA is an intermediate step in solving the least squares problem
 *> by computing the SVD of the coefficient matrix in compact form (The
-*> singular vectors are computed as products of simple orthorgonal
+*> singular vectors are computed as products of simple orthogonal
 *> matrices.).
 *>
 *> If ICOMPQ = 0, DLALSA applies the inverse of the left singular vector
@@ -250,7 +248,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup lalsa
 *
 *> \par Contributors:
 *  ==================
@@ -260,10 +258,12 @@
 *>     Osni Marques, LBNL/NERSC, USA \n
 *
 *  =====================================================================
-      SUBROUTINE DLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
+      SUBROUTINE DLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX,
+     $                   U,
      $                   LDU, VT, K, DIFL, DIFR, Z, POLES, GIVPTR,
      $                   GIVCOL, LDGCOL, PERM, GIVNUM, C, S, WORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -295,7 +295,8 @@ SUBROUTINE DLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
      $                   NR, NRF, NRP1, SQRE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEMM, DLALS0, DLASDT, XERBLA
+      EXTERNAL           DCOPY, DGEMM, DLALS0, DLASDT,
+     $                   XERBLA
 *     ..
 *     .. Executable Statements ..
 *
@@ -402,7 +403,8 @@ SUBROUTINE DLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
             NLF = IC - NL
             NRF = IC + 1
             J = J - 1
-            CALL DLALS0( ICOMPQ, NL, NR, SQRE, NRHS, BX( NLF, 1 ), LDBX,
+            CALL DLALS0( ICOMPQ, NL, NR, SQRE, NRHS, BX( NLF, 1 ),
+     $                   LDBX,
      $                   B( NLF, 1 ), LDB, PERM( NLF, LVL ),
      $                   GIVPTR( J ), GIVCOL( NLF, LVL2 ), LDGCOL,
      $                   GIVNUM( NLF, LVL2 ), LDU, POLES( NLF, LVL2 ),
@@ -447,7 +449,8 @@ SUBROUTINE DLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
                SQRE = 1
             END IF
             J = J + 1
-            CALL DLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B( NLF, 1 ), LDB,
+            CALL DLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B( NLF, 1 ),
+     $                   LDB,
      $                   BX( NLF, 1 ), LDBX, PERM( NLF, LVL ),
      $                   GIVPTR( J ), GIVCOL( NLF, LVL2 ), LDGCOL,
      $                   GIVNUM( NLF, LVL2 ), LDU, POLES( NLF, LVL2 ),
@@ -475,9 +478,11 @@ SUBROUTINE DLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
          END IF
          NLF = IC - NL
          NRF = IC + 1
-         CALL DGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ), LDU,
+         CALL DGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ),
+     $               LDU,
      $               B( NLF, 1 ), LDB, ZERO, BX( NLF, 1 ), LDBX )
-         CALL DGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ), LDU,
+         CALL DGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ),
+     $               LDU,
      $               B( NRF, 1 ), LDB, ZERO, BX( NRF, 1 ), LDBX )
    80 CONTINUE
 *
diff --git a/SRC/dlalsd.f b/SRC/dlalsd.f
index d22c45dc6e..8844e75526 100644
--- a/SRC/dlalsd.f
+++ b/SRC/dlalsd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLALSD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlalsd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlalsd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -47,12 +45,6 @@
 *> problem; in this case a minimum norm solution is returned.
 *> The actual singular values are returned in D in ascending order.
 *>
-*> This code makes very mild assumptions about floating point
-*> arithmetic. It will work on machines with a guard digit in
-*> add/subtract, or on those binary machines without guard digits
-*> which subtract like the Cray XMP, Cray YMP, Cray C 90, or Cray 2.
-*> It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -164,7 +156,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup lalsd
 *
 *> \par Contributors:
 *  ==================
@@ -176,6 +168,7 @@
 *  =====================================================================
       SUBROUTINE DLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
      $                   RANK, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -210,7 +203,8 @@ SUBROUTINE DLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
       EXTERNAL           IDAMAX, DLAMCH, DLANST
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEMM, DLACPY, DLALSA, DLARTG, DLASCL,
+      EXTERNAL           DCOPY, DGEMM, DLACPY, DLALSA, DLARTG,
+     $                   DLASCL,
      $                   DLASDA, DLASDQ, DLASET, DLASRT, DROT, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -255,7 +249,8 @@ SUBROUTINE DLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
             CALL DLASET( 'A', 1, NRHS, ZERO, ZERO, B, LDB )
          ELSE
             RANK = 1
-            CALL DLASCL( 'G', 0, 0, D( 1 ), ONE, 1, NRHS, B, LDB, INFO )
+            CALL DLASCL( 'G', 0, 0, D( 1 ), ONE, 1, NRHS, B, LDB,
+     $                   INFO )
             D( 1 ) = ABS( D( 1 ) )
          END IF
          RETURN
@@ -281,7 +276,8 @@ SUBROUTINE DLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
                DO 20 J = 1, N - 1
                   CS = WORK( J*2-1 )
                   SN = WORK( J*2 )
-                  CALL DROT( 1, B( J, I ), 1, B( J+1, I ), 1, CS, SN )
+                  CALL DROT( 1, B( J, I ), 1, B( J+1, I ), 1, CS,
+     $                       SN )
    20          CONTINUE
    30       CONTINUE
          END IF
@@ -305,7 +301,8 @@ SUBROUTINE DLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
       IF( N.LE.SMLSIZ ) THEN
          NWORK = 1 + N*N
          CALL DLASET( 'A', N, N, ZERO, ONE, WORK, N )
-         CALL DLASDQ( 'U', 0, N, N, 0, NRHS, D, E, WORK, N, WORK, N, B,
+         CALL DLASDQ( 'U', 0, N, N, 0, NRHS, D, E, WORK, N, WORK, N,
+     $                B,
      $                LDB, WORK( NWORK ), INFO )
          IF( INFO.NE.0 ) THEN
             RETURN
@@ -313,14 +310,17 @@ SUBROUTINE DLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
          TOL = RCND*ABS( D( IDAMAX( N, D, 1 ) ) )
          DO 40 I = 1, N
             IF( D( I ).LE.TOL ) THEN
-               CALL DLASET( 'A', 1, NRHS, ZERO, ZERO, B( I, 1 ), LDB )
+               CALL DLASET( 'A', 1, NRHS, ZERO, ZERO, B( I, 1 ),
+     $                      LDB )
             ELSE
-               CALL DLASCL( 'G', 0, 0, D( I ), ONE, 1, NRHS, B( I, 1 ),
+               CALL DLASCL( 'G', 0, 0, D( I ), ONE, 1, NRHS, B( I,
+     $                      1 ),
      $                      LDB, INFO )
                RANK = RANK + 1
             END IF
    40    CONTINUE
-         CALL DGEMM( 'T', 'N', N, NRHS, N, ONE, WORK, N, B, LDB, ZERO,
+         CALL DGEMM( 'T', 'N', N, NRHS, N, ONE, WORK, N, B, LDB,
+     $               ZERO,
      $               WORK( NWORK ), N )
          CALL DLACPY( 'A', N, NRHS, WORK( NWORK ), N, B, LDB )
 *
@@ -468,7 +468,8 @@ SUBROUTINE DLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
 *        subproblems were not solved explicitly.
 *
          IF( ABS( D( I ) ).LE.TOL ) THEN
-            CALL DLASET( 'A', 1, NRHS, ZERO, ZERO, WORK( BX+I-1 ), N )
+            CALL DLASET( 'A', 1, NRHS, ZERO, ZERO, WORK( BX+I-1 ),
+     $                   N )
          ELSE
             RANK = RANK + 1
             CALL DLASCL( 'G', 0, 0, D( I ), ONE, 1, NRHS,
@@ -492,7 +493,8 @@ SUBROUTINE DLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
      $                  WORK( VT+ST1 ), N, WORK( BXST ), N, ZERO,
      $                  B( ST, 1 ), LDB )
          ELSE
-            CALL DLALSA( ICMPQ2, SMLSIZ, NSIZE, NRHS, WORK( BXST ), N,
+            CALL DLALSA( ICMPQ2, SMLSIZ, NSIZE, NRHS, WORK( BXST ),
+     $                   N,
      $                   B( ST, 1 ), LDB, WORK( U+ST1 ), N,
      $                   WORK( VT+ST1 ), IWORK( K+ST1 ),
      $                   WORK( DIFL+ST1 ), WORK( DIFR+ST1 ),
diff --git a/SRC/dlamrg.f b/SRC/dlamrg.f
index 80bd354b97..d270b35038 100644
--- a/SRC/dlamrg.f
+++ b/SRC/dlamrg.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAMRG + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlamrg.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlamrg.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -92,10 +90,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lamrg
 *
 *  =====================================================================
       SUBROUTINE DLAMRG( N1, N2, A, DTRD1, DTRD2, INDEX )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlamswlq.f b/SRC/dlamswlq.f
index b883c3ca47..0ba13a2948 100644
--- a/SRC/dlamswlq.f
+++ b/SRC/dlamswlq.f
@@ -19,7 +19,7 @@
 *>
 *> \verbatim
 *>
-*>    DLAMQRTS overwrites the general real M-by-N matrix C with
+*>    DLAMSWLQ overwrites the general real M-by-N matrix C with
 *>
 *>
 *>                    SIDE = 'L'     SIDE = 'R'
@@ -56,7 +56,7 @@
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix C. N >= M.
+*>          The number of columns of the matrix C. N >= 0.
 *> \endverbatim
 *>
 *> \param[in] K
@@ -70,14 +70,14 @@
 *> \param[in] MB
 *> \verbatim
 *>          MB is INTEGER
-*>          The row block size to be used in the blocked QR.
+*>          The row block size to be used in the blocked LQ.
 *>          M >= MB >= 1
 *> \endverbatim
 *>
 *> \param[in] NB
 *> \verbatim
 *>          NB is INTEGER
-*>          The column block size to be used in the blocked QR.
+*>          The column block size to be used in the blocked LQ.
 *>          NB > M.
 *> \endverbatim
 *>
@@ -94,9 +94,7 @@
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.
-*>          If SIDE = 'L', LDA >= max(1,M);
-*>          if SIDE = 'R', LDA >= max(1,N).
+*>          The leading dimension of the array A. LDA >= max(1,K).
 *> \endverbatim
 *>
 *> \param[in] T
@@ -129,17 +127,20 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          (workspace) DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK.
-*>          If SIDE = 'L', LWORK >= max(1,NB) * MB;
-*>          if SIDE = 'R', LWORK >= max(1,M) * MB.
+*>
+*>          If MIN(M,N,K) = 0, LWORK >= 1.
+*>          If SIDE = 'L', LWORK >= max(1,NB*MB).
+*>          If SIDE = 'R', LWORK >= max(1,M*MB).
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
+*>          only calculates the minimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
@@ -181,7 +182,7 @@
 *> stored in columns [(i-1)*(NB-M)+M+1:i*(NB-M)+M] of A, and by upper triangular
 *> block reflectors, stored in array T(1:LDT,(i-1)*M+1:i*M).
 *> The last Q(k) may use fewer rows.
-*> For more information see Further Details in TPQRT.
+*> For more information see Further Details in TPLQT.
 *>
 *> For more details of the overall algorithm, see the description of
 *> Sequential TSQR in Section 2.2 of [1].
@@ -191,29 +192,32 @@
 *>     SIAM J. Sci. Comput, vol. 34, no. 1, 2012
 *> \endverbatim
 *>
+*> \ingroup lamswlq
+*>
 *  =====================================================================
       SUBROUTINE DLAMSWLQ( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
-     $    LDT, C, LDC, WORK, LWORK, INFO )
+     $                     LDT, C, LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
 *     .. Scalar Arguments ..
-      CHARACTER         SIDE, TRANS
-      INTEGER           INFO, LDA, M, N, K, MB, NB, LDT, LWORK, LDC
+      CHARACTER          SIDE, TRANS
+      INTEGER            INFO, LDA, M, N, K, MB, NB, LDT, LWORK, LDC
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION A( LDA, * ), WORK( * ), C(LDC, * ),
-     $      T( LDT, * )
+      DOUBLE PRECISION   A( LDA, * ), WORK( * ), C( LDC, * ),
+     $                   T( LDT, * )
 *     ..
 *
 * =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
-      LOGICAL    LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER    I, II, KK, CTR, LW
+      LOGICAL            LEFT, RIGHT, TRAN, NOTRAN, LQUERY
+      INTEGER            I, II, KK, CTR, LW, MINMNK, LWMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -225,50 +229,60 @@ SUBROUTINE DLAMSWLQ( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
 *
 *     Test the input arguments
 *
-      LQUERY  = LWORK.LT.0
+      LQUERY  = ( LWORK.EQ.-1 )
       NOTRAN  = LSAME( TRANS, 'N' )
       TRAN    = LSAME( TRANS, 'T' )
       LEFT    = LSAME( SIDE, 'L' )
       RIGHT   = LSAME( SIDE, 'R' )
-      IF (LEFT) THEN
+      IF( LEFT ) THEN
         LW = N * MB
       ELSE
         LW = M * MB
       END IF
+*
+      MINMNK = MIN( M, N, K )
+      IF( MINMNK.EQ.0 ) THEN
+        LWMIN = 1
+      ELSE
+        LWMIN = MAX( 1, LW )
+      END IF
 *
       INFO = 0
       IF( .NOT.LEFT .AND. .NOT.RIGHT ) THEN
-         INFO = -1
+        INFO = -1
       ELSE IF( .NOT.TRAN .AND. .NOT.NOTRAN ) THEN
-         INFO = -2
-      ELSE IF( M.LT.0 ) THEN
+        INFO = -2
+      ELSE IF( K.LT.0 ) THEN
+        INFO = -5
+      ELSE IF( M.LT.K ) THEN
         INFO = -3
       ELSE IF( N.LT.0 ) THEN
         INFO = -4
-      ELSE IF( K.LT.0 ) THEN
-        INFO = -5
+      ELSE IF( K.LT.MB .OR. MB.LT.1 ) THEN
+        INFO = -6
       ELSE IF( LDA.LT.MAX( 1, K ) ) THEN
         INFO = -9
-      ELSE IF( LDT.LT.MAX( 1, MB) ) THEN
+      ELSE IF( LDT.LT.MAX( 1, MB ) ) THEN
         INFO = -11
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
-         INFO = -13
-      ELSE IF(( LWORK.LT.MAX(1,LW)).AND.(.NOT.LQUERY)) THEN
+        INFO = -13
+      ELSE IF( LWORK.LT.LWMIN .AND. (.NOT.LQUERY) ) THEN
         INFO = -15
       END IF
 *
+      IF( INFO.EQ.0 ) THEN
+        WORK( 1 ) = LWMIN
+      END IF
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'DLAMSWLQ', -INFO )
-        WORK(1) = LW
         RETURN
-      ELSE IF (LQUERY) THEN
-        WORK(1) = LW
+      ELSE IF( LQUERY ) THEN
         RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( MIN(M,N,K).EQ.0 ) THEN
+      IF( MINMNK.EQ.0 ) THEN
         RETURN
       END IF
 *
@@ -402,7 +416,8 @@ SUBROUTINE DLAMSWLQ( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
 *
       END IF
 *
-      WORK(1) = LW
+      WORK( 1 ) = LWMIN
+*
       RETURN
 *
 *     End of DLAMSWLQ
diff --git a/SRC/dlamtsqr.f b/SRC/dlamtsqr.f
index 776e24f52b..3a9a0bec05 100644
--- a/SRC/dlamtsqr.f
+++ b/SRC/dlamtsqr.f
@@ -56,15 +56,14 @@
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix C. M >= N >= 0.
+*>          The number of columns of the matrix C. N >= 0.
 *> \endverbatim
 *>
 *> \param[in] K
 *> \verbatim
 *>          K is INTEGER
 *>          The number of elementary reflectors whose product defines
-*>          the matrix Q.
-*>          N >= K >= 0;
+*>          the matrix Q. M >= K >= 0;
 *>
 *> \endverbatim
 *>
@@ -129,22 +128,24 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) DOUBLE PRECISION array, dimension (MAX(1,LWORK))
-*>
+*>          (workspace) DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
+*>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK.
+*>          If MIN(M,N,K) = 0, LWORK >= 1.
+*>          If SIDE = 'L', LWORK >= max(1,N*NB).
+*>          If SIDE = 'R', LWORK >= max(1,MB*NB).
 *>
-*>          If SIDE = 'L', LWORK >= max(1,N)*NB;
-*>          if SIDE = 'R', LWORK >= max(1,MB)*NB.
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
+*>          only calculates the minimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
-*>
 *> \endverbatim
+*>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
@@ -192,29 +193,32 @@
 *>     SIAM J. Sci. Comput, vol. 34, no. 1, 2012
 *> \endverbatim
 *>
+*> \ingroup lamtsqr
+*>
 *  =====================================================================
       SUBROUTINE DLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
-     $        LDT, C, LDC, WORK, LWORK, INFO )
+     $                     LDT, C, LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
 *     .. Scalar Arguments ..
-      CHARACTER         SIDE, TRANS
-      INTEGER           INFO, LDA, M, N, K, MB, NB, LDT, LWORK, LDC
+      CHARACTER          SIDE, TRANS
+      INTEGER            INFO, LDA, M, N, K, MB, NB, LDT, LWORK, LDC
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION A( LDA, * ), WORK( * ), C(LDC, * ),
-     $                T( LDT, * )
+      DOUBLE PRECISION   A( LDA, * ), WORK( * ), C( LDC, * ),
+     $                   T( LDT, * )
 *     ..
 *
 * =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
-      LOGICAL    LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER    I, II, KK, LW, CTR
+      LOGICAL            LEFT, RIGHT, TRAN, NOTRAN, LQUERY
+      INTEGER            I, II, KK, LW, CTR, Q, MINMNK, LWMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -226,62 +230,73 @@ SUBROUTINE DLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
 *
 *     Test the input arguments
 *
-      LQUERY  = LWORK.LT.0
+      INFO = 0
+      LQUERY  = ( LWORK.EQ.-1 )
       NOTRAN  = LSAME( TRANS, 'N' )
       TRAN    = LSAME( TRANS, 'T' )
       LEFT    = LSAME( SIDE, 'L' )
       RIGHT   = LSAME( SIDE, 'R' )
-      IF (LEFT) THEN
+      IF( LEFT ) THEN
         LW = N * NB
+        Q = M
       ELSE
         LW = MB * NB
+        Q = N
+      END IF
+*
+      MINMNK = MIN( M, N, K )
+      IF( MINMNK.EQ.0 ) THEN
+        LWMIN = 1
+      ELSE
+        LWMIN = MAX( 1, LW )
       END IF
 *
-      INFO = 0
       IF( .NOT.LEFT .AND. .NOT.RIGHT ) THEN
-         INFO = -1
+        INFO = -1
       ELSE IF( .NOT.TRAN .AND. .NOT.NOTRAN ) THEN
-         INFO = -2
-      ELSE IF( M.LT.0 ) THEN
+        INFO = -2
+      ELSE IF( M.LT.K ) THEN
         INFO = -3
       ELSE IF( N.LT.0 ) THEN
         INFO = -4
       ELSE IF( K.LT.0 ) THEN
         INFO = -5
-      ELSE IF( LDA.LT.MAX( 1, K ) ) THEN
+      ELSE IF( K.LT.NB .OR. NB.LT.1 ) THEN
+        INFO = -7
+      ELSE IF( LDA.LT.MAX( 1, Q ) ) THEN
         INFO = -9
-      ELSE IF( LDT.LT.MAX( 1, NB) ) THEN
+      ELSE IF( LDT.LT.MAX( 1, NB ) ) THEN
         INFO = -11
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
-         INFO = -13
-      ELSE IF(( LWORK.LT.MAX(1,LW)).AND.(.NOT.LQUERY)) THEN
+        INFO = -13
+      ELSE IF( LWORK.LT.LWMIN .AND. (.NOT.LQUERY) ) THEN
         INFO = -15
       END IF
 *
-*     Determine the block size if it is tall skinny or short and wide
-*
-      IF( INFO.EQ.0)  THEN
-          WORK(1) = LW
+      IF( INFO.EQ.0 ) THEN
+        WORK( 1 ) = LWMIN
       END IF
 *
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'DLAMTSQR', -INFO )
         RETURN
-      ELSE IF (LQUERY) THEN
-       RETURN
+      ELSE IF( LQUERY ) THEN
+        RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( MIN(M,N,K).EQ.0 ) THEN
+      IF( MINMNK.EQ.0 ) THEN
         RETURN
       END IF
+*
+*     Determine the block size if it is tall skinny or short and wide
 *
       IF((MB.LE.K).OR.(MB.GE.MAX(M,N,K))) THEN
         CALL DGEMQRT( SIDE, TRANS, M, N, K, NB, A, LDA,
-     $        T, LDT, C, LDC, WORK, INFO)
+     $        T, LDT, C, LDC, WORK, INFO )
         RETURN
-       END IF
+      END IF
 *
       IF(LEFT.AND.NOTRAN) THEN
 *
@@ -407,7 +422,8 @@ SUBROUTINE DLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
 *
       END IF
 *
-      WORK(1) = LW
+      WORK( 1 ) = LWMIN
+*
       RETURN
 *
 *     End of DLAMTSQR
diff --git a/SRC/dlaneg.f b/SRC/dlaneg.f
index 2502852eba..7f09043de3 100644
--- a/SRC/dlaneg.f
+++ b/SRC/dlaneg.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLANEG + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaneg.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaneg.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -104,7 +102,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup laneg
 *
 *> \par Contributors:
 *  ==================
@@ -115,6 +113,7 @@
 *>
 *  =====================================================================
       INTEGER FUNCTION DLANEG( N, D, LLD, SIGMA, PIVMIN, R )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlangb.f b/SRC/dlangb.f
index 96c9570852..ca77c81206 100644
--- a/SRC/dlangb.f
+++ b/SRC/dlangb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLANGB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlangb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlangb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -116,11 +114,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBauxiliary
+*> \ingroup langb
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLANGB( NORM, N, KL, KU, AB, LDAB,
      $                 WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -200,7 +199,8 @@ DOUBLE PRECISION FUNCTION DLANGB( NORM, N, KL, KU, AB, LDAB,
             TEMP = WORK( I )
             IF( VALUE.LT.TEMP .OR. DISNAN( TEMP ) ) VALUE = TEMP
    80    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
@@ -209,7 +209,8 @@ DOUBLE PRECISION FUNCTION DLANGB( NORM, N, KL, KU, AB, LDAB,
          DO 90 J = 1, N
             L = MAX( 1, J-KU )
             K = KU + 1 - J + L
-            CALL DLASSQ( MIN( N, J+KL )-L+1, AB( K, J ), 1, SCALE, SUM )
+            CALL DLASSQ( MIN( N, J+KL )-L+1, AB( K, J ), 1, SCALE,
+     $                   SUM )
    90    CONTINUE
          VALUE = SCALE*SQRT( SUM )
       END IF
diff --git a/SRC/dlange.f b/SRC/dlange.f
index 9d214cb542..a6769de8ba 100644
--- a/SRC/dlange.f
+++ b/SRC/dlange.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLANGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlange.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlange.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEauxiliary
+*> \ingroup lange
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLANGE( NORM, M, N, A, LDA, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,7 +187,8 @@ DOUBLE PRECISION FUNCTION DLANGE( NORM, M, N, A, LDA, WORK )
             TEMP = WORK( I )
             IF( VALUE.LT.TEMP .OR. DISNAN( TEMP ) ) VALUE = TEMP
    80    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/dlangt.f b/SRC/dlangt.f
index 61626b0aae..4202894a87 100644
--- a/SRC/dlangt.f
+++ b/SRC/dlangt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLANGT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlangt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlangt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -99,10 +97,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup langt
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLANGT( NORM, N, DL, D, DU )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -146,11 +145,13 @@ DOUBLE PRECISION FUNCTION DLANGT( NORM, N, DL, D, DU )
 *
          ANORM = ABS( D( N ) )
          DO 10 I = 1, N - 1
-            IF( ANORM.LT.ABS( DL( I ) ) .OR. DISNAN( ABS( DL( I ) ) ) )
+            IF( ANORM.LT.ABS( DL( I ) ) .OR.
+     $          DISNAN( ABS( DL( I ) ) ) )
      $           ANORM = ABS(DL(I))
             IF( ANORM.LT.ABS( D( I ) ) .OR. DISNAN( ABS( D( I ) ) ) )
      $           ANORM = ABS(D(I))
-            IF( ANORM.LT.ABS( DU( I ) ) .OR. DISNAN (ABS( DU( I ) ) ) )
+            IF( ANORM.LT.ABS( DU( I ) ) .OR.
+     $          DISNAN (ABS( DU( I ) ) ) )
      $           ANORM = ABS(DU(I))
    10    CONTINUE
       ELSE IF( LSAME( NORM, 'O' ) .OR. NORM.EQ.'1' ) THEN
@@ -183,7 +184,8 @@ DOUBLE PRECISION FUNCTION DLANGT( NORM, N, DL, D, DU )
                IF( ANORM .LT. TEMP .OR. DISNAN( TEMP ) ) ANORM = TEMP
    30       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/dlanhs.f b/SRC/dlanhs.f
index 29560e4a66..adb17e0782 100644
--- a/SRC/dlanhs.f
+++ b/SRC/dlanhs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLANHS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlanhs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlanhs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lanhs
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLANHS( NORM, N, A, LDA, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -182,7 +181,8 @@ DOUBLE PRECISION FUNCTION DLANHS( NORM, N, A, LDA, WORK )
             SUM = WORK( I )
             IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
    80    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/dlansb.f b/SRC/dlansb.f
index 4df8db250f..2140a79cb1 100644
--- a/SRC/dlansb.f
+++ b/SRC/dlansb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLANSB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlansb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlansb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,11 +119,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lanhb
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLANSB( NORM, UPLO, N, K, AB, LDAB,
      $                 WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,7 +182,8 @@ DOUBLE PRECISION FUNCTION DLANSB( NORM, UPLO, N, K, AB, LDAB,
    30          CONTINUE
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is symmetric).
@@ -219,7 +219,8 @@ DOUBLE PRECISION FUNCTION DLANSB( NORM, UPLO, N, K, AB, LDAB,
                IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
@@ -228,7 +229,8 @@ DOUBLE PRECISION FUNCTION DLANSB( NORM, UPLO, N, K, AB, LDAB,
          IF( K.GT.0 ) THEN
             IF( LSAME( UPLO, 'U' ) ) THEN
                DO 110 J = 2, N
-                  CALL DLASSQ( MIN( J-1, K ), AB( MAX( K+2-J, 1 ), J ),
+                  CALL DLASSQ( MIN( J-1, K ), AB( MAX( K+2-J, 1 ),
+     $                         J ),
      $                         1, SCALE, SUM )
   110          CONTINUE
                L = K + 1
diff --git a/SRC/dlansf.f b/SRC/dlansf.f
index 30e4248292..e255786d6b 100644
--- a/SRC/dlansf.f
+++ b/SRC/dlansf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLANSF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlansf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlansf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,7 +113,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup lanhf
 *
 *> \par Further Details:
 *  =====================
@@ -205,7 +203,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION DLANSF( NORM, TRANSR, UPLO, N, A, WORK )
+      DOUBLE PRECISION FUNCTION DLANSF( NORM, TRANSR, UPLO, N, A,
+     $                                  WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -332,7 +332,8 @@ DOUBLE PRECISION FUNCTION DLANSF( NORM, TRANSR, UPLO, N, A, WORK )
                END DO
             END IF
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is symmetric).
@@ -777,7 +778,8 @@ DOUBLE PRECISION FUNCTION DLANSF( NORM, TRANSR, UPLO, N, A, WORK )
                END IF
             END IF
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *       Find normF(A).
 *
@@ -791,7 +793,8 @@ DOUBLE PRECISION FUNCTION DLANSF( NORM, TRANSR, UPLO, N, A, WORK )
                IF( ILU.EQ.0 ) THEN
 *                 A is upper
                   DO J = 0, K - 3
-                     CALL DLASSQ( K-J-2, A( K+J+1+J*LDA ), 1, SCALE, S )
+                     CALL DLASSQ( K-J-2, A( K+J+1+J*LDA ), 1, SCALE,
+     $                            S )
 *                    L at A(k,0)
                   END DO
                   DO J = 0, K - 1
@@ -807,11 +810,13 @@ DOUBLE PRECISION FUNCTION DLANSF( NORM, TRANSR, UPLO, N, A, WORK )
                ELSE
 *                 ilu=1 & A is lower
                   DO J = 0, K - 1
-                     CALL DLASSQ( N-J-1, A( J+1+J*LDA ), 1, SCALE, S )
+                     CALL DLASSQ( N-J-1, A( J+1+J*LDA ), 1, SCALE,
+     $                            S )
 *                    trap L at A(0,0)
                   END DO
                   DO J = 0, K - 2
-                     CALL DLASSQ( J, A( 0+( 1+J )*LDA ), 1, SCALE, S )
+                     CALL DLASSQ( J, A( 0+( 1+J )*LDA ), 1, SCALE,
+     $                            S )
 *                    U at A(0,1)
                   END DO
                   S = S + S
@@ -826,7 +831,8 @@ DOUBLE PRECISION FUNCTION DLANSF( NORM, TRANSR, UPLO, N, A, WORK )
                IF( ILU.EQ.0 ) THEN
 *                 A**T is upper
                   DO J = 1, K - 2
-                     CALL DLASSQ( J, A( 0+( K+J )*LDA ), 1, SCALE, S )
+                     CALL DLASSQ( J, A( 0+( K+J )*LDA ), 1, SCALE,
+     $                            S )
 *                    U at A(0,k)
                   END DO
                   DO J = 0, K - 2
@@ -842,7 +848,8 @@ DOUBLE PRECISION FUNCTION DLANSF( NORM, TRANSR, UPLO, N, A, WORK )
 *                 double s for the off diagonal elements
                   CALL DLASSQ( K-1, A( 0+K*LDA ), LDA+1, SCALE, S )
 *                 tri U at A(0,k)
-                  CALL DLASSQ( K, A( 0+( K-1 )*LDA ), LDA+1, SCALE, S )
+                  CALL DLASSQ( K, A( 0+( K-1 )*LDA ), LDA+1, SCALE,
+     $                         S )
 *                 tri L at A(0,k-1)
                ELSE
 *                 A**T is lower
@@ -855,7 +862,8 @@ DOUBLE PRECISION FUNCTION DLANSF( NORM, TRANSR, UPLO, N, A, WORK )
 *                    k by k-1 rect. at A(0,k)
                   END DO
                   DO J = 0, K - 3
-                     CALL DLASSQ( K-J-2, A( J+2+J*LDA ), 1, SCALE, S )
+                     CALL DLASSQ( K-J-2, A( J+2+J*LDA ), 1, SCALE,
+     $                            S )
 *                    L at A(1,0)
                   END DO
                   S = S + S
@@ -873,7 +881,8 @@ DOUBLE PRECISION FUNCTION DLANSF( NORM, TRANSR, UPLO, N, A, WORK )
                IF( ILU.EQ.0 ) THEN
 *                 A is upper
                   DO J = 0, K - 2
-                     CALL DLASSQ( K-J-1, A( K+J+2+J*LDA ), 1, SCALE, S )
+                     CALL DLASSQ( K-J-1, A( K+J+2+J*LDA ), 1, SCALE,
+     $                            S )
 *                    L at A(k+1,0)
                   END DO
                   DO J = 0, K - 1
@@ -889,7 +898,8 @@ DOUBLE PRECISION FUNCTION DLANSF( NORM, TRANSR, UPLO, N, A, WORK )
                ELSE
 *                 ilu=1 & A is lower
                   DO J = 0, K - 1
-                     CALL DLASSQ( N-J-1, A( J+2+J*LDA ), 1, SCALE, S )
+                     CALL DLASSQ( N-J-1, A( J+2+J*LDA ), 1, SCALE,
+     $                            S )
 *                    trap L at A(1,0)
                   END DO
                   DO J = 1, K - 1
@@ -908,7 +918,8 @@ DOUBLE PRECISION FUNCTION DLANSF( NORM, TRANSR, UPLO, N, A, WORK )
                IF( ILU.EQ.0 ) THEN
 *                 A**T is upper
                   DO J = 1, K - 1
-                     CALL DLASSQ( J, A( 0+( K+1+J )*LDA ), 1, SCALE, S )
+                     CALL DLASSQ( J, A( 0+( K+1+J )*LDA ), 1, SCALE,
+     $                            S )
 *                    U at A(0,k+1)
                   END DO
                   DO J = 0, K - 1
@@ -916,20 +927,23 @@ DOUBLE PRECISION FUNCTION DLANSF( NORM, TRANSR, UPLO, N, A, WORK )
 *                    k by k rect. at A(0,0)
                   END DO
                   DO J = 0, K - 2
-                     CALL DLASSQ( K-J-1, A( J+1+( J+K )*LDA ), 1, SCALE,
+                     CALL DLASSQ( K-J-1, A( J+1+( J+K )*LDA ), 1,
+     $                            SCALE,
      $                            S )
 *                    L at A(0,k)
                   END DO
                   S = S + S
 *                 double s for the off diagonal elements
-                  CALL DLASSQ( K, A( 0+( K+1 )*LDA ), LDA+1, SCALE, S )
+                  CALL DLASSQ( K, A( 0+( K+1 )*LDA ), LDA+1, SCALE,
+     $                         S )
 *                 tri U at A(0,k+1)
                   CALL DLASSQ( K, A( 0+K*LDA ), LDA+1, SCALE, S )
 *                 tri L at A(0,k)
                ELSE
 *                 A**T is lower
                   DO J = 1, K - 1
-                     CALL DLASSQ( J, A( 0+( J+1 )*LDA ), 1, SCALE, S )
+                     CALL DLASSQ( J, A( 0+( J+1 )*LDA ), 1, SCALE,
+     $                            S )
 *                    U at A(0,1)
                   END DO
                   DO J = K + 1, N
@@ -937,7 +951,8 @@ DOUBLE PRECISION FUNCTION DLANSF( NORM, TRANSR, UPLO, N, A, WORK )
 *                    k by k rect. at A(0,k+1)
                   END DO
                   DO J = 0, K - 2
-                     CALL DLASSQ( K-J-1, A( J+1+J*LDA ), 1, SCALE, S )
+                     CALL DLASSQ( K-J-1, A( J+1+J*LDA ), 1, SCALE,
+     $                            S )
 *                    L at A(0,0)
                   END DO
                   S = S + S
diff --git a/SRC/dlansp.f b/SRC/dlansp.f
index 50f974e1e0..082bbef971 100644
--- a/SRC/dlansp.f
+++ b/SRC/dlansp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLANSP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlansp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlansp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lanhp
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLANSP( NORM, UPLO, N, AP, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,7 +171,8 @@ DOUBLE PRECISION FUNCTION DLANSP( NORM, UPLO, N, AP, WORK )
                K = K + N - J + 1
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is symmetric).
@@ -211,7 +211,8 @@ DOUBLE PRECISION FUNCTION DLANSP( NORM, UPLO, N, AP, WORK )
                IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/dlanst.f b/SRC/dlanst.f
index c5bc7ea038..d2da5853e6 100644
--- a/SRC/dlanst.f
+++ b/SRC/dlanst.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLANST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlanst.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlanst.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -93,10 +91,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lanht
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLANST( NORM, N, D, E )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -161,7 +160,8 @@ DOUBLE PRECISION FUNCTION DLANST( NORM, N, D, E )
                IF( ANORM .LT. SUM .OR. DISNAN( SUM ) ) ANORM = SUM
    20       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/dlansy.f b/SRC/dlansy.f
index 949c5535a2..aec1b43ca5 100644
--- a/SRC/dlansy.f
+++ b/SRC/dlansy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLANSY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlansy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlansy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,10 +113,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYauxiliary
+*> \ingroup lanhe
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLANSY( NORM, UPLO, N, A, LDA, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -176,7 +175,8 @@ DOUBLE PRECISION FUNCTION DLANSY( NORM, UPLO, N, A, LDA, WORK )
    30          CONTINUE
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is symmetric).
@@ -210,7 +210,8 @@ DOUBLE PRECISION FUNCTION DLANSY( NORM, UPLO, N, A, LDA, WORK )
                IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/dlantb.f b/SRC/dlantb.f
index c2bcfa6122..8ca8a12323 100644
--- a/SRC/dlantb.f
+++ b/SRC/dlantb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLANTB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlantb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlantb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,11 +130,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lantb
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLANTB( NORM, UPLO, DIAG, N, K, AB,
      $                 LDAB, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -185,14 +184,16 @@ DOUBLE PRECISION FUNCTION DLANTB( NORM, UPLO, DIAG, N, K, AB,
                DO 20 J = 1, N
                   DO 10 I = MAX( K+2-J, 1 ), K
                      SUM = ABS( AB( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    10             CONTINUE
    20          CONTINUE
             ELSE
                DO 40 J = 1, N
                   DO 30 I = 2, MIN( N+1-J, K+1 )
                      SUM = ABS( AB( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    30             CONTINUE
    40          CONTINUE
             END IF
@@ -202,14 +203,16 @@ DOUBLE PRECISION FUNCTION DLANTB( NORM, UPLO, DIAG, N, K, AB,
                DO 60 J = 1, N
                   DO 50 I = MAX( K+2-J, 1 ), K + 1
                      SUM = ABS( AB( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    50             CONTINUE
    60          CONTINUE
             ELSE
                DO 80 J = 1, N
                   DO 70 I = 1, MIN( N+1-J, K+1 )
                      SUM = ABS( AB( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    70             CONTINUE
    80          CONTINUE
             END IF
@@ -305,7 +308,8 @@ DOUBLE PRECISION FUNCTION DLANTB( NORM, UPLO, DIAG, N, K, AB,
             SUM = WORK( I )
             IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
   270    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
@@ -324,7 +328,8 @@ DOUBLE PRECISION FUNCTION DLANTB( NORM, UPLO, DIAG, N, K, AB,
                SCALE = ZERO
                SUM = ONE
                DO 290 J = 1, N
-                  CALL DLASSQ( MIN( J, K+1 ), AB( MAX( K+2-J, 1 ), J ),
+                  CALL DLASSQ( MIN( J, K+1 ), AB( MAX( K+2-J, 1 ),
+     $                         J ),
      $                         1, SCALE, SUM )
   290          CONTINUE
             END IF
@@ -334,7 +339,8 @@ DOUBLE PRECISION FUNCTION DLANTB( NORM, UPLO, DIAG, N, K, AB,
                SUM = N
                IF( K.GT.0 ) THEN
                   DO 300 J = 1, N - 1
-                     CALL DLASSQ( MIN( N-J, K ), AB( 2, J ), 1, SCALE,
+                     CALL DLASSQ( MIN( N-J, K ), AB( 2, J ), 1,
+     $                            SCALE,
      $                            SUM )
   300             CONTINUE
                END IF
@@ -342,7 +348,8 @@ DOUBLE PRECISION FUNCTION DLANTB( NORM, UPLO, DIAG, N, K, AB,
                SCALE = ZERO
                SUM = ONE
                DO 310 J = 1, N
-                  CALL DLASSQ( MIN( N-J+1, K+1 ), AB( 1, J ), 1, SCALE,
+                  CALL DLASSQ( MIN( N-J+1, K+1 ), AB( 1, J ), 1,
+     $                         SCALE,
      $                         SUM )
   310          CONTINUE
             END IF
diff --git a/SRC/dlantp.f b/SRC/dlantp.f
index 12f8b8e756..1e13f69ea5 100644
--- a/SRC/dlantp.f
+++ b/SRC/dlantp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLANTP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlantp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlantp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,10 +115,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lantp
 *
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION DLANTP( NORM, UPLO, DIAG, N, AP, WORK )
+      DOUBLE PRECISION FUNCTION DLANTP( NORM, UPLO, DIAG, N, AP,
+     $                                  WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -170,7 +170,8 @@ DOUBLE PRECISION FUNCTION DLANTP( NORM, UPLO, DIAG, N, AP, WORK )
                DO 20 J = 1, N
                   DO 10 I = K, K + J - 2
                      SUM = ABS( AP( I ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    10             CONTINUE
                   K = K + J
    20          CONTINUE
@@ -178,7 +179,8 @@ DOUBLE PRECISION FUNCTION DLANTP( NORM, UPLO, DIAG, N, AP, WORK )
                DO 40 J = 1, N
                   DO 30 I = K + 1, K + N - J
                      SUM = ABS( AP( I ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    30             CONTINUE
                   K = K + N - J + 1
    40          CONTINUE
@@ -189,7 +191,8 @@ DOUBLE PRECISION FUNCTION DLANTP( NORM, UPLO, DIAG, N, AP, WORK )
                DO 60 J = 1, N
                   DO 50 I = K, K + J - 1
                      SUM = ABS( AP( I ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    50             CONTINUE
                   K = K + J
    60          CONTINUE
@@ -197,7 +200,8 @@ DOUBLE PRECISION FUNCTION DLANTP( NORM, UPLO, DIAG, N, AP, WORK )
                DO 80 J = 1, N
                   DO 70 I = K, K + N - J
                      SUM = ABS( AP( I ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    70             CONTINUE
                   K = K + N - J + 1
    80          CONTINUE
@@ -300,7 +304,8 @@ DOUBLE PRECISION FUNCTION DLANTP( NORM, UPLO, DIAG, N, AP, WORK )
             SUM = WORK( I )
             IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
   270    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/dlantr.f b/SRC/dlantr.f
index 9b68f19755..8c80a2f54d 100644
--- a/SRC/dlantr.f
+++ b/SRC/dlantr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLANTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlantr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlantr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,11 +131,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lantr
 *
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION DLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
+      DOUBLE PRECISION FUNCTION DLANTR( NORM, UPLO, DIAG, M, N, A,
+     $                                  LDA,
      $                 WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -186,14 +186,16 @@ DOUBLE PRECISION FUNCTION DLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
                DO 20 J = 1, N
                   DO 10 I = 1, MIN( M, J-1 )
                      SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    10             CONTINUE
    20          CONTINUE
             ELSE
                DO 40 J = 1, N
                   DO 30 I = J + 1, M
                      SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    30             CONTINUE
    40          CONTINUE
             END IF
@@ -203,14 +205,16 @@ DOUBLE PRECISION FUNCTION DLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
                DO 60 J = 1, N
                   DO 50 I = 1, MIN( M, J )
                      SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    50             CONTINUE
    60          CONTINUE
             ELSE
                DO 80 J = 1, N
                   DO 70 I = J, M
                      SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    70             CONTINUE
    80          CONTINUE
             END IF
@@ -305,7 +309,8 @@ DOUBLE PRECISION FUNCTION DLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
             SUM = WORK( I )
             IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
   280    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
@@ -314,13 +319,15 @@ DOUBLE PRECISION FUNCTION DLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
                SCALE = ONE
                SUM = MIN( M, N )
                DO 290 J = 2, N
-                  CALL DLASSQ( MIN( M, J-1 ), A( 1, J ), 1, SCALE, SUM )
+                  CALL DLASSQ( MIN( M, J-1 ), A( 1, J ), 1, SCALE,
+     $                         SUM )
   290          CONTINUE
             ELSE
                SCALE = ZERO
                SUM = ONE
                DO 300 J = 1, N
-                  CALL DLASSQ( MIN( M, J ), A( 1, J ), 1, SCALE, SUM )
+                  CALL DLASSQ( MIN( M, J ), A( 1, J ), 1, SCALE,
+     $                         SUM )
   300          CONTINUE
             END IF
          ELSE
diff --git a/SRC/dlanv2.f b/SRC/dlanv2.f
index 204cddd02f..97c6489068 100644
--- a/SRC/dlanv2.f
+++ b/SRC/dlanv2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLANV2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlanv2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlanv2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -109,7 +107,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lanv2
 *
 *> \par Further Details:
 *  =====================
@@ -124,6 +122,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLANV2( A, B, C, D, RT1R, RT1I, RT2R, RT2I, CS, SN )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -144,7 +143,7 @@ SUBROUTINE DLANV2( A, B, C, D, RT1R, RT1I, RT2R, RT2I, CS, SN )
 *     ..
 *     .. Local Scalars ..
       DOUBLE PRECISION   AA, BB, BCMAX, BCMIS, CC, CS1, DD, EPS, P, SAB,
-     $                   SAC, SCALE, SIGMA, SN1, TAU, TEMP, Z, SAFMIN, 
+     $                   SAC, SCALE, SIGMA, SN1, TAU, TEMP, Z, SAFMIN,
      $                   SAFMN2, SAFMX2
       INTEGER            COUNT
 *     ..
@@ -248,10 +247,14 @@ SUBROUTINE DLANV2( A, B, C, D, RT1R, RT1I, RT2R, RT2I, CS, SN )
 *
 *           Compute [ A  B ] = [ CS  SN ] [ AA  BB ]
 *                   [ C  D ]   [-SN  CS ] [ CC  DD ]
+*
+*           Note: Some of the multiplications are wrapped in parentheses to
+*                 prevent compilers from using FMA instructions. See
+*                 https://github.com/Reference-LAPACK/lapack/issues/1031.
 *
             A = AA*CS + CC*SN
-            B = BB*CS + DD*SN
-            C = -AA*SN + CC*CS
+            B = ( BB*CS ) + ( DD*SN )
+            C = -( AA*SN ) + ( CC*CS )
             D = -BB*SN + DD*CS
 *
             TEMP = HALF*( A+D )
diff --git a/SRC/dlaorhr_col_getrfnp.f b/SRC/dlaorhr_col_getrfnp.f
index 706bfa9b13..739dc74c8a 100644
--- a/SRC/dlaorhr_col_getrfnp.f
+++ b/SRC/dlaorhr_col_getrfnp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAORHR_COL_GETRFNP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaorhr_col_getrfnp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaorhr_col_getrfnp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -128,7 +126,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup launhr_col_getrfnp
 *
 *> \par Contributors:
 *  ==================
@@ -166,7 +164,8 @@ SUBROUTINE DLAORHR_COL_GETRFNP( M, N, A, LDA, D, INFO )
       INTEGER            IINFO, J, JB, NB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DLAORHR_COL_GETRFNP2, DTRSM, XERBLA
+      EXTERNAL           DGEMM, DLAORHR_COL_GETRFNP2, DTRSM,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
@@ -223,14 +222,16 @@ SUBROUTINE DLAORHR_COL_GETRFNP( M, N, A, LDA, D, INFO )
 *
 *              Compute block row of U.
 *
-               CALL DTRSM( 'Left', 'Lower', 'No transpose', 'Unit', JB,
+               CALL DTRSM( 'Left', 'Lower', 'No transpose', 'Unit',
+     $                     JB,
      $                     N-J-JB+1, ONE, A( J, J ), LDA, A( J, J+JB ),
      $                     LDA )
                IF( J+JB.LE.M ) THEN
 *
 *                 Update trailing submatrix.
 *
-                  CALL DGEMM( 'No transpose', 'No transpose', M-J-JB+1,
+                  CALL DGEMM( 'No transpose', 'No transpose',
+     $                        M-J-JB+1,
      $                        N-J-JB+1, JB, -ONE, A( J+JB, J ), LDA,
      $                        A( J, J+JB ), LDA, ONE, A( J+JB, J+JB ),
      $                        LDA )
diff --git a/SRC/dlaorhr_col_getrfnp2.f b/SRC/dlaorhr_col_getrfnp2.f
index c424ca660d..17f2d6070c 100644
--- a/SRC/dlaorhr_col_getrfnp2.f
+++ b/SRC/dlaorhr_col_getrfnp2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAORHR_GETRF2NP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaorhr_col_getrfnp2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaorhr_col_getrfnp2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -149,7 +147,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup launhr_col_getrfnp2
 *
 *> \par Contributors:
 *  ==================
@@ -163,7 +161,8 @@
 *> \endverbatim
 *
 *  =====================================================================
-      RECURSIVE SUBROUTINE DLAORHR_COL_GETRFNP2( M, N, A, LDA, D, INFO )
+      RECURSIVE SUBROUTINE DLAORHR_COL_GETRFNP2( M, N, A, LDA, D,
+     $                                           INFO )
       IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
diff --git a/SRC/dlapll.f b/SRC/dlapll.f
index 1cc15fb994..57a94ca960 100644
--- a/SRC/dlapll.f
+++ b/SRC/dlapll.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAPLL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlapll.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlapll.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,10 +93,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lapll
 *
 *  =====================================================================
       SUBROUTINE DLAPLL( N, X, INCX, Y, INCY, SSMIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlapmr.f b/SRC/dlapmr.f
index 36eea184e8..d715128b26 100644
--- a/SRC/dlapmr.f
+++ b/SRC/dlapmr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAPMR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlapmr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlapmr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lapmr
 *
 *  =====================================================================
       SUBROUTINE DLAPMR( FORWRD, M, N, X, LDX, K )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlapmt.f b/SRC/dlapmt.f
index 19530885cf..c7134fec3d 100644
--- a/SRC/dlapmt.f
+++ b/SRC/dlapmt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAPMT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlapmt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlapmt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lapmt
 *
 *  =====================================================================
       SUBROUTINE DLAPMT( FORWRD, M, N, X, LDX, K )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlapy2.f b/SRC/dlapy2.f
index 1f63193bb7..5b092c31d8 100644
--- a/SRC/dlapy2.f
+++ b/SRC/dlapy2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAPY2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlapy2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlapy2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -56,10 +54,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lapy2
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLAPY2( X, Y )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlapy3.f b/SRC/dlapy3.f
index 230a65cdb2..77548d73c3 100644
--- a/SRC/dlapy3.f
+++ b/SRC/dlapy3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAPY3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlapy3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlapy3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -61,10 +59,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lapy3
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLAPY3( X, Y, Z )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlaqgb.f b/SRC/dlaqgb.f
index a13124f1e9..00f7770485 100644
--- a/SRC/dlaqgb.f
+++ b/SRC/dlaqgb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQGB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqgb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqgb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,11 +149,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBauxiliary
+*> \ingroup laqgb
 *
 *  =====================================================================
-      SUBROUTINE DLAQGB( M, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+      SUBROUTINE DLAQGB( M, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                   COLCND,
      $                   AMAX, EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlaqge.f b/SRC/dlaqge.f
index e9324cec8e..252a0c8952 100644
--- a/SRC/dlaqge.f
+++ b/SRC/dlaqge.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqge.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqge.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -134,11 +132,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEauxiliary
+*> \ingroup laqge
 *
 *  =====================================================================
       SUBROUTINE DLAQGE( M, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
      $                   EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlaqp2.f b/SRC/dlaqp2.f
index b99de6d7d5..d32f075484 100644
--- a/SRC/dlaqp2.f
+++ b/SRC/dlaqp2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQP2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqp2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqp2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,7 +120,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup laqp2
 *
 *> \par Contributors:
 *  ==================
@@ -139,13 +137,12 @@
 *>
 *> LAPACK Working Note 176
 *
-*> \htmlonly
 *> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">[PDF]</a>
-*> \endhtmlonly
 *
 *  =====================================================================
       SUBROUTINE DLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
      $                   WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -168,7 +165,7 @@ SUBROUTINE DLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
 *     ..
 *     .. Local Scalars ..
       INTEGER            I, ITEMP, J, MN, OFFPI, PVT
-      DOUBLE PRECISION   AII, TEMP, TEMP2, TOL3Z
+      DOUBLE PRECISION   TEMP, TEMP2, TOL3Z
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           DLARF, DLARFG, DSWAP
@@ -208,7 +205,8 @@ SUBROUTINE DLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
 *        Generate elementary reflector H(i).
 *
          IF( OFFPI.LT.M ) THEN
-            CALL DLARFG( M-OFFPI+1, A( OFFPI, I ), A( OFFPI+1, I ), 1,
+            CALL DLARFG( M-OFFPI+1, A( OFFPI, I ), A( OFFPI+1, I ),
+     $                   1,
      $                   TAU( I ) )
          ELSE
             CALL DLARFG( 1, A( M, I ), A( M, I ), 1, TAU( I ) )
@@ -218,11 +216,8 @@ SUBROUTINE DLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
 *
 *           Apply H(i)**T to A(offset+i:m,i+1:n) from the left.
 *
-            AII = A( OFFPI, I )
-            A( OFFPI, I ) = ONE
-            CALL DLARF( 'Left', M-OFFPI+1, N-I, A( OFFPI, I ), 1,
+            CALL DLARF1F( 'Left', M-OFFPI+1, N-I, A( OFFPI, I ), 1,
      $                  TAU( I ), A( OFFPI, I+1 ), LDA, WORK( 1 ) )
-            A( OFFPI, I ) = AII
          END IF
 *
 *        Update partial column norms.
diff --git a/SRC/dlaqp2rk.f b/SRC/dlaqp2rk.f
new file mode 100644
index 0000000000..1e3d826d76
--- /dev/null
+++ b/SRC/dlaqp2rk.f
@@ -0,0 +1,700 @@
+*> \brief \b DLAQP2RK computes truncated QR factorization with column pivoting of a real matrix block using Level 2 BLAS and overwrites a real m-by-nrhs matrix B with Q**T * B.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download DLAQP2RK + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqp2rk.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dlaqp2rk.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqp2rk.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*      SUBROUTINE DLAQP2RK( M, N, NRHS, IOFFSET, KMAX, ABSTOL, RELTOL,
+*     $                     KP1, MAXC2NRM, A, LDA, K, MAXC2NRMK,
+*     $                     RELMAXC2NRMK, JPIV, TAU, VN1, VN2, WORK,
+*     $                     INFO )
+*      IMPLICIT NONE
+*
+*     .. Scalar Arguments ..
+*      INTEGER            INFO, IOFFSET, KP1, K, KMAX, LDA, M, N, NRHS
+*      DOUBLE PRECISION   ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+*     $                   RELTOL
+*     ..
+*     .. Array Arguments ..
+*      INTEGER            JPIV( * )
+*      DOUBLE PRECISION   A( LDA, * ), TAU( * ), VN1( * ), VN2( * ),
+*     $                   WORK( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> DLAQP2RK computes a truncated (rank K) or full rank Householder QR
+*> factorization with column pivoting of a real matrix
+*> block A(IOFFSET+1:M,1:N) as
+*>
+*>   A * P(K) = Q(K) * R(K).
+*>
+*> The routine uses Level 2 BLAS. The block A(1:IOFFSET,1:N)
+*> is accordingly pivoted, but not factorized.
+*>
+*> The routine also overwrites the right-hand-sides matrix block B
+*> stored in A(IOFFSET+1:M,N+1:N+NRHS) with Q(K)**T * B.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of
+*>          columns of the matrix B. NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] IOFFSET
+*> \verbatim
+*>          IOFFSET is INTEGER
+*>          The number of rows of the matrix A that must be pivoted
+*>          but not factorized. IOFFSET >= 0.
+*>
+*>          IOFFSET also represents the number of columns of the whole
+*>          original matrix A_orig that have been factorized
+*>          in the previous steps.
+*> \endverbatim
+*>
+*> \param[in] KMAX
+*> \verbatim
+*>          KMAX is INTEGER
+*>
+*>          The first factorization stopping criterion. KMAX >= 0.
+*>
+*>          The maximum number of columns of the matrix A to factorize,
+*>          i.e. the maximum factorization rank.
+*>
+*>          a) If KMAX >= min(M-IOFFSET,N), then this stopping
+*>                criterion is not used, factorize columns
+*>                depending on ABSTOL and RELTOL.
+*>
+*>          b) If KMAX = 0, then this stopping criterion is
+*>             satisfied on input and the routine exits immediately.
+*>             This means that the factorization is not performed,
+*>             the matrices A and B and the arrays TAU, IPIV
+*>             are not modified.
+*> \endverbatim
+*>
+*> \param[in] ABSTOL
+*> \verbatim
+*>          ABSTOL is DOUBLE PRECISION, cannot be NaN.
+*>
+*>          The second factorization stopping criterion.
+*>
+*>          The absolute tolerance (stopping threshold) for
+*>          maximum column 2-norm of the residual matrix.
+*>          The algorithm converges (stops the factorization) when
+*>          the maximum column 2-norm of the residual matrix
+*>          is less than or equal to ABSTOL.
+*>
+*>          a) If ABSTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on KMAX and RELTOL.
+*>                This includes the case ABSTOL = -Inf.
+*>
+*>          b) If 0.0 <= ABSTOL then the input value
+*>                of ABSTOL is used.
+*> \endverbatim
+*>
+*> \param[in] RELTOL
+*> \verbatim
+*>          RELTOL is DOUBLE PRECISION, cannot be NaN.
+*>
+*>          The third factorization stopping criterion.
+*>
+*>          The tolerance (stopping threshold) for the ratio of the
+*>          maximum column 2-norm of the residual matrix to the maximum
+*>          column 2-norm of the original matrix A_orig. The algorithm
+*>          converges (stops the factorization), when this ratio is
+*>          less than or equal to RELTOL.
+*>
+*>          a) If RELTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on KMAX and ABSTOL.
+*>                This includes the case RELTOL = -Inf.
+*>
+*>          d) If 0.0 <= RELTOL then the input value of RELTOL
+*>                is used.
+*> \endverbatim
+*>
+*> \param[in] KP1
+*> \verbatim
+*>          KP1 is INTEGER
+*>          The index of the column with the maximum 2-norm in
+*>          the whole original matrix A_orig determined in the
+*>          main routine DGEQP3RK. 1 <= KP1 <= N_orig_mat.
+*> \endverbatim
+*>
+*> \param[in] MAXC2NRM
+*> \verbatim
+*>          MAXC2NRM is DOUBLE PRECISION
+*>          The maximum column 2-norm of the whole original
+*>          matrix A_orig computed in the main routine DGEQP3RK.
+*>          MAXC2NRM >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA,N+NRHS)
+*>          On entry:
+*>              the M-by-N matrix A and M-by-NRHS matrix B, as in
+*>
+*>                                  N     NRHS
+*>              array_A   =   M  [ mat_A, mat_B ]
+*>
+*>          On exit:
+*>          1. The elements in block A(IOFFSET+1:M,1:K) below
+*>             the diagonal together with the array TAU represent
+*>             the orthogonal matrix Q(K) as a product of elementary
+*>             reflectors.
+*>          2. The upper triangular block of the matrix A stored
+*>             in A(IOFFSET+1:M,1:K) is the triangular factor obtained.
+*>          3. The block of the matrix A stored in A(1:IOFFSET,1:N)
+*>             has been accordingly pivoted, but not factorized.
+*>          4. The rest of the array A, block A(IOFFSET+1:M,K+1:N+NRHS).
+*>             The left part A(IOFFSET+1:M,K+1:N) of this block
+*>             contains the residual of the matrix A, and,
+*>             if NRHS > 0, the right part of the block
+*>             A(IOFFSET+1:M,N+1:N+NRHS) contains the block of
+*>             the right-hand-side matrix B. Both these blocks have been
+*>             updated by multiplication from the left by Q(K)**T.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] K
+*> \verbatim
+*>          K is INTEGER
+*>          Factorization rank of the matrix A, i.e. the rank of
+*>          the factor R, which is the same as the number of non-zero
+*>          rows of the factor R. 0 <= K <= min(M-IOFFSET,KMAX,N).
+*>
+*>          K also represents the number of non-zero Householder
+*>          vectors.
+*> \endverbatim
+*>
+*> \param[out] MAXC2NRMK
+*> \verbatim
+*>          MAXC2NRMK is DOUBLE PRECISION
+*>          The maximum column 2-norm of the residual matrix,
+*>          when the factorization stopped at rank K. MAXC2NRMK >= 0.
+*> \endverbatim
+*>
+*> \param[out] RELMAXC2NRMK
+*> \verbatim
+*>          RELMAXC2NRMK is DOUBLE PRECISION
+*>          The ratio MAXC2NRMK / MAXC2NRM of the maximum column
+*>          2-norm of the residual matrix (when the factorization
+*>          stopped at rank K) to the maximum column 2-norm of the
+*>          whole original matrix A. RELMAXC2NRMK >= 0.
+*> \endverbatim
+*>
+*> \param[out] JPIV
+*> \verbatim
+*>          JPIV is INTEGER array, dimension (N)
+*>          Column pivot indices, for 1 <= j <= N, column j
+*>          of the matrix A was interchanged with column JPIV(j).
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is DOUBLE PRECISION array, dimension (min(M-IOFFSET,N))
+*>          The scalar factors of the elementary reflectors.
+*> \endverbatim
+*>
+*> \param[in,out] VN1
+*> \verbatim
+*>          VN1 is DOUBLE PRECISION array, dimension (N)
+*>          The vector with the partial column norms.
+*> \endverbatim
+*>
+*> \param[in,out] VN2
+*> \verbatim
+*>          VN2 is DOUBLE PRECISION array, dimension (N)
+*>          The vector with the exact column norms.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension (N-1)
+*>          Used in DLARF1F subroutine to apply an elementary
+*>          reflector from the left.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          1) INFO = 0: successful exit.
+*>          2) If INFO = j_1, where 1 <= j_1 <= N, then NaN was
+*>             detected and the routine stops the computation.
+*>             The j_1-th column of the matrix A or the j_1-th
+*>             element of array TAU contains the first occurrence
+*>             of NaN in the factorization step K+1 ( when K columns
+*>             have been factorized ).
+*>
+*>             On exit:
+*>             K                  is set to the number of
+*>                                   factorized columns without
+*>                                   exception.
+*>             MAXC2NRMK          is set to NaN.
+*>             RELMAXC2NRMK       is set to NaN.
+*>             TAU(K+1:min(M,N))  is not set and contains undefined
+*>                                   elements. If j_1=K+1, TAU(K+1)
+*>                                   may contain NaN.
+*>          3) If INFO = j_2, where N+1 <= j_2 <= 2*N, then no NaN
+*>             was detected, but +Inf (or -Inf) was detected and
+*>             the routine continues the computation until completion.
+*>             The (j_2-N)-th column of the matrix A contains the first
+*>             occurrence of +Inf (or -Inf) in the factorization
+*>             step K+1 ( when K columns have been factorized ).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup laqp2rk
+*
+*> \par References:
+*  ================
+*> [1] A Level 3 BLAS QR factorization algorithm with column pivoting developed in 1996.
+*> G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain.
+*> X. Sun, Computer Science Dept., Duke University, USA.
+*> C. H. Bischof, Math. and Comp. Sci. Div., Argonne National Lab, USA.
+*> A BLAS-3 version of the QR factorization with column pivoting.
+*> LAPACK Working Note 114
+*> <a href="https://www.netlib.org/lapack/lawnspdf/lawn114.pdf">https://www.netlib.org/lapack/lawnspdf/lawn114.pdf</a>
+*> and in
+*> SIAM J. Sci. Comput., 19(5):1486-1494, Sept. 1998.
+*> <a href="https://doi.org/10.1137/S1064827595296732">https://doi.org/10.1137/S1064827595296732</a>
+*>
+*> [2] A partial column norm updating strategy developed in 2006.
+*> Z. Drmac and Z. Bujanovic, Dept. of Math., University of Zagreb, Croatia.
+*> On the failure of rank revealing QR factorization software – a case study.
+*> LAPACK Working Note 176.
+*> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">http://www.netlib.org/lapack/lawnspdf/lawn176.pdf</a>
+*> and in
+*> ACM Trans. Math. Softw. 35, 2, Article 12 (July 2008), 28 pages.
+*> <a href="https://doi.org/10.1145/1377612.1377616">https://doi.org/10.1145/1377612.1377616</a>
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
+*>
+*>  November  2023, Igor Kozachenko, James Demmel,
+*>                  EECS Department,
+*>                  University of California, Berkeley, USA.
+*>
+*> \endverbatim
+*
+*  =====================================================================
+      SUBROUTINE DLAQP2RK( M, N, NRHS, IOFFSET, KMAX, ABSTOL, RELTOL,
+     $                     KP1, MAXC2NRM, A, LDA, K, MAXC2NRMK,
+     $                     RELMAXC2NRMK, JPIV, TAU, VN1, VN2, WORK,
+     $                     INFO )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            INFO, IOFFSET, KP1, K, KMAX, LDA, M, N, NRHS
+      DOUBLE PRECISION   ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+     $                   RELTOL
+*     ..
+*     .. Array Arguments ..
+      INTEGER            JPIV( * )
+      DOUBLE PRECISION   A( LDA, * ), TAU( * ), VN1( * ), VN2( * ),
+     $                   WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, ITEMP, J, JMAXC2NRM, KK, KP, MINMNFACT,
+     $                   MINMNUPDT
+      DOUBLE PRECISION   HUGEVAL, TEMP, TEMP2, TOL3Z
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DLARF1F, DLARFG, DSWAP
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, MIN, SQRT
+*     ..
+*     .. External Functions ..
+      LOGICAL            DISNAN
+      INTEGER            IDAMAX
+      DOUBLE PRECISION   DLAMCH, DNRM2
+      EXTERNAL           DISNAN, DLAMCH, IDAMAX, DNRM2
+*     ..
+*     .. Executable Statements ..
+*
+*     Initialize INFO
+*
+      INFO = 0
+*
+*     MINMNFACT in the smallest dimension of the submatrix
+*     A(IOFFSET+1:M,1:N) to be factorized.
+*
+*     MINMNUPDT is the smallest dimension
+*     of the subarray A(IOFFSET+1:M,1:N+NRHS) to be udated, which
+*     contains the submatrices A(IOFFSET+1:M,1:N) and
+*     B(IOFFSET+1:M,1:NRHS) as column blocks.
+*
+      MINMNFACT = MIN( M-IOFFSET, N )
+      MINMNUPDT = MIN( M-IOFFSET, N+NRHS )
+      KMAX = MIN( KMAX, MINMNFACT )
+      TOL3Z = SQRT( DLAMCH( 'Epsilon' ) )
+      HUGEVAL = DLAMCH( 'Overflow' )
+*
+*     Compute the factorization, KK is the lomn loop index.
+*
+      DO KK = 1, KMAX
+*
+         I = IOFFSET + KK
+*
+         IF( I.EQ.1 ) THEN
+*
+*           ============================================================
+*
+*           We are at the first column of the original whole matrix A,
+*           therefore we use the computed KP1 and MAXC2NRM from the
+*           main routine.
+*
+
+            KP = KP1
+*
+*           ============================================================
+*
+         ELSE
+*
+*           ============================================================
+*
+*           Determine the pivot column in KK-th step, i.e. the index
+*           of the column with the maximum 2-norm in the
+*           submatrix A(I:M,K:N).
+*
+            KP = ( KK-1 ) + IDAMAX( N-KK+1, VN1( KK ), 1 )
+*
+*           Determine the maximum column 2-norm and the relative maximum
+*           column 2-norm of the submatrix A(I:M,KK:N) in step KK.
+*           RELMAXC2NRMK  will be computed later, after somecondition
+*           checks on MAXC2NRMK.
+*
+            MAXC2NRMK = VN1( KP )
+*
+*           ============================================================
+*
+*           Check if the submatrix A(I:M,KK:N) contains NaN, and set
+*           INFO parameter to the column number, where the first NaN
+*           is found and return from the routine.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( DISNAN( MAXC2NRMK ) ) THEN
+*
+*              Set K, the number of factorized columns.
+*              that are not zero.
+*
+                K = KK - 1
+                INFO = K + KP
+*
+*               Set RELMAXC2NRMK to NaN.
+*
+                RELMAXC2NRMK = MAXC2NRMK
+*
+*               Array TAU(K+1:MINMNFACT) is not set and contains
+*               undefined elements.
+*
+               RETURN
+            END IF
+*
+*           ============================================================
+*
+*           Quick return, if the submatrix A(I:M,KK:N) is
+*           a zero matrix.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( MAXC2NRMK.EQ.ZERO ) THEN
+*
+*              Set K, the number of factorized columns.
+*              that are not zero.
+*
+               K = KK - 1
+               RELMAXC2NRMK = ZERO
+*
+*              Set TAUs corresponding to the columns that were not
+*              factorized to ZERO, i.e. set TAU(KK:MINMNFACT) to ZERO.
+*
+               DO J = KK, MINMNFACT
+                  TAU( J ) = ZERO
+               END DO
+*
+*              Return from the routine.
+*
+               RETURN
+*
+            END IF
+*
+*           ============================================================
+*
+*           Check if the submatrix A(I:M,KK:N) contains Inf,
+*           set INFO parameter to the column number, where
+*           the first Inf is found plus N, and continue
+*           the computation.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( INFO.EQ.0 .AND. MAXC2NRMK.GT.HUGEVAL ) THEN
+               INFO = N + KK - 1 + KP
+            END IF
+*
+*           ============================================================
+*
+*           Test for the second and third stopping criteria.
+*           NOTE: There is no need to test for ABSTOL >= ZERO, since
+*           MAXC2NRMK is non-negative. Similarly, there is no need
+*           to test for RELTOL >= ZERO, since RELMAXC2NRMK is
+*           non-negative.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+
+            RELMAXC2NRMK =  MAXC2NRMK / MAXC2NRM
+*
+            IF( MAXC2NRMK.LE.ABSTOL .OR. RELMAXC2NRMK.LE.RELTOL ) THEN
+*
+*              Set K, the number of factorized columns.
+*
+               K = KK - 1
+*
+*              Set TAUs corresponding to the columns that were not
+*              factorized to ZERO, i.e. set TAU(KK:MINMNFACT) to ZERO.
+*
+               DO J = KK, MINMNFACT
+                  TAU( J ) = ZERO
+               END DO
+*
+*              Return from the routine.
+*
+               RETURN
+*
+            END IF
+*
+*           ============================================================
+*
+*           End ELSE of IF(I.EQ.1)
+*
+         END IF
+*
+*        ===============================================================
+*
+*        If the pivot column is not the first column of the
+*        subblock A(1:M,KK:N):
+*        1) swap the KK-th column and the KP-th pivot column
+*           in A(1:M,1:N);
+*        2) copy the KK-th element into the KP-th element of the partial
+*           and exact 2-norm vectors VN1 and VN2. ( Swap is not needed
+*           for VN1 and VN2 since we use the element with the index
+*           larger than KK in the next loop step.)
+*        3) Save the pivot interchange with the indices relative to the
+*           the original matrix A, not the block A(1:M,1:N).
+*
+         IF( KP.NE.KK ) THEN
+            CALL DSWAP( M, A( 1, KP ), 1, A( 1, KK ), 1 )
+            VN1( KP ) = VN1( KK )
+            VN2( KP ) = VN2( KK )
+            ITEMP = JPIV( KP )
+            JPIV( KP ) = JPIV( KK )
+            JPIV( KK ) = ITEMP
+         END IF
+*
+*        Generate elementary reflector H(KK) using the column A(I:M,KK),
+*        if the column has more than one element, otherwise
+*        the elementary reflector would be an identity matrix,
+*        and TAU(KK) = ZERO.
+*
+         IF( I.LT.M ) THEN
+            CALL DLARFG( M-I+1, A( I, KK ), A( I+1, KK ), 1,
+     $                   TAU( KK ) )
+         ELSE
+            TAU( KK ) = ZERO
+         END IF
+*
+*        Check if TAU(KK) contains NaN, set INFO parameter
+*        to the column number where NaN is found and return from
+*        the routine.
+*        NOTE: There is no need to check TAU(KK) for Inf,
+*        since DLARFG cannot produce TAU(KK) or Householder vector
+*        below the diagonal containing Inf. Only BETA on the diagonal,
+*        returned by DLARFG can contain Inf, which requires
+*        TAU(KK) to contain NaN. Therefore, this case of generating Inf
+*        by DLARFG is covered by checking TAU(KK) for NaN.
+*
+         IF( DISNAN( TAU(KK) ) ) THEN
+            K = KK - 1
+            INFO = KK
+*
+*           Set MAXC2NRMK and  RELMAXC2NRMK to NaN.
+*
+            MAXC2NRMK = TAU( KK )
+            RELMAXC2NRMK = TAU( KK )
+*
+*           Array TAU(KK:MINMNFACT) is not set and contains
+*           undefined elements, except the first element TAU(KK) = NaN.
+*
+            RETURN
+         END IF
+*
+*        Apply H(KK)**T to A(I:M,KK+1:N+NRHS) from the left.
+*        ( If M >= N, then at KK = N there is no residual matrix,
+*         i.e. no columns of A to update, only columns of B.
+*         If M < N, then at KK = M-IOFFSET, I = M and we have a
+*         one-row residual matrix in A and the elementary
+*         reflector is a unit matrix, TAU(KK) = ZERO, i.e. no update
+*         is needed for the residual matrix in A and the
+*         right-hand-side-matrix in B.
+*         Therefore, we update only if
+*         KK < MINMNUPDT = min(M-IOFFSET, N+NRHS)
+*         condition is satisfied, not only KK < N+NRHS )
+*
+         IF( KK.LT.MINMNUPDT ) THEN
+            CALL DLARF1F( 'Left', M-I+1, N+NRHS-KK, A( I, KK ), 1,
+     $                  TAU( KK ), A( I, KK+1 ), LDA, WORK( 1 ) )
+         END IF
+*
+         IF( KK.LT.MINMNFACT ) THEN
+*
+*           Update the partial column 2-norms for the residual matrix,
+*           only if the residual matrix A(I+1:M,KK+1:N) exists, i.e.
+*           when KK < min(M-IOFFSET, N).
+*
+            DO J = KK + 1, N
+               IF( VN1( J ).NE.ZERO ) THEN
+*
+*                 NOTE: The following lines follow from the analysis in
+*                 Lapack Working Note 176.
+*
+                  TEMP = ONE - ( ABS( A( I, J ) ) / VN1( J ) )**2
+                  TEMP = MAX( TEMP, ZERO )
+                  TEMP2 = TEMP*( VN1( J ) / VN2( J ) )**2
+                  IF( TEMP2 .LE. TOL3Z ) THEN
+*
+*                    Compute the column 2-norm for the partial
+*                    column A(I+1:M,J) by explicitly computing it,
+*                    and store it in both partial 2-norm vector VN1
+*                    and exact column 2-norm vector VN2.
+*
+                     VN1( J ) = DNRM2( M-I, A( I+1, J ), 1 )
+                     VN2( J ) = VN1( J )
+*
+                  ELSE
+*
+*                    Update the column 2-norm for the partial
+*                    column A(I+1:M,J) by removing one
+*                    element A(I,J) and store it in partial
+*                    2-norm vector VN1.
+*
+                     VN1( J ) = VN1( J )*SQRT( TEMP )
+*
+                  END IF
+               END IF
+            END DO
+*
+         END IF
+*
+*     End factorization loop
+*
+      END DO
+*
+*     If we reached this point, all colunms have been factorized,
+*     i.e. no condition was triggered to exit the routine.
+*     Set the number of factorized columns.
+*
+      K = KMAX
+*
+*     We reached the end of the loop, i.e. all KMAX columns were
+*     factorized, we need to set MAXC2NRMK and RELMAXC2NRMK before
+*     we return.
+*
+      IF( K.LT.MINMNFACT ) THEN
+*
+         JMAXC2NRM = K + IDAMAX( N-K, VN1( K+1 ), 1 )
+         MAXC2NRMK = VN1( JMAXC2NRM )
+*
+         IF( K.EQ.0 ) THEN
+            RELMAXC2NRMK = ONE
+         ELSE
+            RELMAXC2NRMK = MAXC2NRMK / MAXC2NRM
+         END IF
+*
+      ELSE
+         MAXC2NRMK = ZERO
+         RELMAXC2NRMK = ZERO
+      END IF
+*
+*     We reached the end of the loop, i.e. all KMAX columns were
+*     factorized, set TAUs corresponding to the columns that were
+*     not factorized to ZERO, i.e. TAU(K+1:MINMNFACT) set to ZERO.
+*
+      DO J = K + 1, MINMNFACT
+         TAU( J ) = ZERO
+      END DO
+*
+      RETURN
+*
+*     End of DLAQP2RK
+*
+      END
diff --git a/SRC/dlaqp3rk.f b/SRC/dlaqp3rk.f
new file mode 100644
index 0000000000..f86675cc02
--- /dev/null
+++ b/SRC/dlaqp3rk.f
@@ -0,0 +1,925 @@
+*> \brief \b DLAQP3RK computes a step of truncated QR factorization with column pivoting of a real m-by-n matrix A using Level 3 BLAS and overwrites a real m-by-nrhs matrix B with Q**T * B.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download DLAQP3RK + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqp3rk.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dlaqp3rk.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqp3rk.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*      SUBROUTINE DLAQP3RK( M, N, NRHS, IOFFSET, NB, ABSTOL,
+*     $                     RELTOL, KP1, MAXC2NRM, A, LDA, DONE, KB,
+*     $                     MAXC2NRMK, RELMAXC2NRMK, JPIV, TAU,
+*     $                     VN1, VN2, AUXV, F, LDF, IWORK, INFO )
+*      IMPLICIT NONE
+*      LOGICAL            DONE
+*      INTEGER            INFO, IOFFSET, KB, KP1, LDA, LDF, M, N,
+*     $                   NB, NRHS
+*      DOUBLE PRECISION   ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+*     $                   RELTOL
+*
+*     .. Scalar Arguments ..
+*      LOGICAL            DONE
+*      INTEGER            KB, LDA, LDF, M, N, NB, NRHS, IOFFSET
+*      DOUBLE PRECISION   ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+*     $                   RELTOL
+*     ..
+*     .. Array Arguments ..
+*      INTEGER            IWORK( * ), JPIV( * )
+*      DOUBLE PRECISION   A( LDA, * ), AUXV( * ), F( LDF, * ), TAU( * ),
+*     $                   VN1( * ), VN2( * )
+*     ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> DLAQP3RK computes a step of truncated QR factorization with column
+*> pivoting of a real M-by-N matrix A block A(IOFFSET+1:M,1:N)
+*> by using Level 3 BLAS as
+*>
+*>   A * P(KB) = Q(KB) * R(KB).
+*>
+*> The routine tries to factorize NB columns from A starting from
+*> the row IOFFSET+1 and updates the residual matrix with BLAS 3
+*> xGEMM. The number of actually factorized columns is returned
+*> is smaller than NB.
+*>
+*> Block A(1:IOFFSET,1:N) is accordingly pivoted, but not factorized.
+*>
+*> The routine also overwrites the right-hand-sides B matrix stored
+*> in A(IOFFSET+1:M,1:N+1:N+NRHS) with Q(KB)**T * B.
+*>
+*> Cases when the number of factorized columns KB < NB:
+*>
+*> (1) In some cases, due to catastrophic cancellations, it cannot
+*> factorize all NB columns and need to update the residual matrix.
+*> Hence, the actual number of factorized columns in the block returned
+*> in KB is smaller than NB. The logical DONE is returned as FALSE.
+*> The factorization of the whole original matrix A_orig must proceed
+*> with the next block.
+*>
+*> (2) Whenever the stopping criterion ABSTOL or RELTOL is satisfied,
+*> the factorization of the whole original matrix A_orig is stopped,
+*> the logical DONE is returned as TRUE. The number of factorized
+*> columns which is smaller than NB is returned in KB.
+*>
+*> (3) In case both stopping criteria ABSTOL or RELTOL are not used,
+*> and when the residual matrix is a zero matrix in some factorization
+*> step KB, the factorization of the whole original matrix A_orig is
+*> stopped, the logical DONE is returned as TRUE. The number of
+*> factorized columns which is smaller than NB is returned in KB.
+*>
+*> (4) Whenever NaN is detected in the matrix A or in the array TAU,
+*> the factorization of the whole original matrix A_orig is stopped,
+*> the logical DONE is returned as TRUE. The number of factorized
+*> columns which is smaller than NB is returned in KB. The INFO
+*> parameter is set to the column index of the first NaN occurrence.
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A. N >= 0
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of
+*>          columns of the matrix B. NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] IOFFSET
+*> \verbatim
+*>          IOFFSET is INTEGER
+*>          The number of rows of the matrix A that must be pivoted
+*>          but not factorized. IOFFSET >= 0.
+*>
+*>          IOFFSET also represents the number of columns of the whole
+*>          original matrix A_orig that have been factorized
+*>          in the previous steps.
+*> \endverbatim
+*>
+*> \param[in] NB
+*> \verbatim
+*>          NB is INTEGER
+*>          Factorization block size, i.e the number of columns
+*>          to factorize in the matrix A. 0 <= NB
+*>
+*>          If NB = 0, then the routine exits immediately.
+*>             This means that the factorization is not performed,
+*>             the matrices A and B and the arrays TAU, IPIV
+*>             are not modified.
+*> \endverbatim
+*>
+*> \param[in] ABSTOL
+*> \verbatim
+*>          ABSTOL is DOUBLE PRECISION, cannot be NaN.
+*>
+*>          The absolute tolerance (stopping threshold) for
+*>          maximum column 2-norm of the residual matrix.
+*>          The algorithm converges (stops the factorization) when
+*>          the maximum column 2-norm of the residual matrix
+*>          is less than or equal to ABSTOL.
+*>
+*>          a) If ABSTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on NB and RELTOL.
+*>                This includes the case ABSTOL = -Inf.
+*>
+*>          b) If 0.0 <= ABSTOL then the input value
+*>                of ABSTOL is used.
+*> \endverbatim
+*>
+*> \param[in] RELTOL
+*> \verbatim
+*>          RELTOL is DOUBLE PRECISION, cannot be NaN.
+*>
+*>          The tolerance (stopping threshold) for the ratio of the
+*>          maximum column 2-norm of the residual matrix to the maximum
+*>          column 2-norm of the original matrix A_orig. The algorithm
+*>          converges (stops the factorization), when this ratio is
+*>          less than or equal to RELTOL.
+*>
+*>          a) If RELTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on NB and ABSTOL.
+*>                This includes the case RELTOL = -Inf.
+*>
+*>          d) If 0.0 <= RELTOL then the input value of RELTOL
+*>                is used.
+*> \endverbatim
+*>
+*> \param[in] KP1
+*> \verbatim
+*>          KP1 is INTEGER
+*>          The index of the column with the maximum 2-norm in
+*>          the whole original matrix A_orig determined in the
+*>          main routine DGEQP3RK. 1 <= KP1 <= N_orig.
+*> \endverbatim
+*>
+*> \param[in] MAXC2NRM
+*> \verbatim
+*>          MAXC2NRM is DOUBLE PRECISION
+*>          The maximum column 2-norm of the whole original
+*>          matrix A_orig computed in the main routine DGEQP3RK.
+*>          MAXC2NRM >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA,N+NRHS)
+*>          On entry:
+*>              the M-by-N matrix A and M-by-NRHS matrix B, as in
+*>
+*>                                  N     NRHS
+*>              array_A   =   M  [ mat_A, mat_B ]
+*>
+*>          On exit:
+*>          1. The elements in block A(IOFFSET+1:M,1:KB) below
+*>             the diagonal together with the array TAU represent
+*>             the orthogonal matrix Q(KB) as a product of elementary
+*>             reflectors.
+*>          2. The upper triangular block of the matrix A stored
+*>             in A(IOFFSET+1:M,1:KB) is the triangular factor obtained.
+*>          3. The block of the matrix A stored in A(1:IOFFSET,1:N)
+*>             has been accordingly pivoted, but not factorized.
+*>          4. The rest of the array A, block A(IOFFSET+1:M,KB+1:N+NRHS).
+*>             The left part A(IOFFSET+1:M,KB+1:N) of this block
+*>             contains the residual of the matrix A, and,
+*>             if NRHS > 0, the right part of the block
+*>             A(IOFFSET+1:M,N+1:N+NRHS) contains the block of
+*>             the right-hand-side matrix B. Both these blocks have been
+*>             updated by multiplication from the left by Q(KB)**T.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] DONE
+*> \verbatim
+*>          DONE is LOGICAL
+*>          TRUE: a) if the factorization completed before processing
+*>                   all min(M-IOFFSET,NB,N) columns due to ABSTOL
+*>                   or RELTOL criterion,
+*>                b) if the factorization completed before processing
+*>                   all min(M-IOFFSET,NB,N) columns due to the
+*>                   residual matrix being a ZERO matrix.
+*>                c) when NaN was detected in the matrix A
+*>                   or in the array TAU.
+*>          FALSE: otherwise.
+*> \endverbatim
+*>
+*> \param[out] KB
+*> \verbatim
+*>          KB is INTEGER
+*>          Factorization rank of the matrix A, i.e. the rank of
+*>          the factor R, which is the same as the number of non-zero
+*>          rows of the factor R.  0 <= KB <= min(M-IOFFSET,NB,N).
+*>
+*>          KB also represents the number of non-zero Householder
+*>          vectors.
+*> \endverbatim
+*>
+*> \param[out] MAXC2NRMK
+*> \verbatim
+*>          MAXC2NRMK is DOUBLE PRECISION
+*>          The maximum column 2-norm of the residual matrix,
+*>          when the factorization stopped at rank KB. MAXC2NRMK >= 0.
+*> \endverbatim
+*>
+*> \param[out] RELMAXC2NRMK
+*> \verbatim
+*>          RELMAXC2NRMK is DOUBLE PRECISION
+*>          The ratio MAXC2NRMK / MAXC2NRM of the maximum column
+*>          2-norm of the residual matrix (when the factorization
+*>          stopped at rank KB) to the maximum column 2-norm of the
+*>          original matrix A_orig. RELMAXC2NRMK >= 0.
+*> \endverbatim
+*>
+*> \param[out] JPIV
+*> \verbatim
+*>          JPIV is INTEGER array, dimension (N)
+*>          Column pivot indices, for 1 <= j <= N, column j
+*>          of the matrix A was interchanged with column JPIV(j).
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is DOUBLE PRECISION array, dimension (min(M-IOFFSET,N))
+*>          The scalar factors of the elementary reflectors.
+*> \endverbatim
+*>
+*> \param[in,out] VN1
+*> \verbatim
+*>          VN1 is DOUBLE PRECISION array, dimension (N)
+*>          The vector with the partial column norms.
+*> \endverbatim
+*>
+*> \param[in,out] VN2
+*> \verbatim
+*>          VN2 is DOUBLE PRECISION array, dimension (N)
+*>          The vector with the exact column norms.
+*> \endverbatim
+*>
+*> \param[out] AUXV
+*> \verbatim
+*>          AUXV is DOUBLE PRECISION array, dimension (NB)
+*>          Auxiliary vector.
+*> \endverbatim
+*>
+*> \param[out] F
+*> \verbatim
+*>          F is DOUBLE PRECISION array, dimension (LDF,NB)
+*>          Matrix F**T = L*(Y**T)*A.
+*> \endverbatim
+*>
+*> \param[in] LDF
+*> \verbatim
+*>          LDF is INTEGER
+*>          The leading dimension of the array F. LDF >= max(1,N+NRHS).
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (N-1).
+*>          Is a work array. ( IWORK is used to store indices
+*>          of "bad" columns for norm downdating in the residual
+*>          matrix ).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          1) INFO = 0: successful exit.
+*>          2) If INFO = j_1, where 1 <= j_1 <= N, then NaN was
+*>             detected and the routine stops the computation.
+*>             The j_1-th column of the matrix A or the j_1-th
+*>             element of array TAU contains the first occurrence
+*>             of NaN in the factorization step KB+1 ( when KB columns
+*>             have been factorized ).
+*>
+*>             On exit:
+*>             KB                  is set to the number of
+*>                                    factorized columns without
+*>                                    exception.
+*>             MAXC2NRMK           is set to NaN.
+*>             RELMAXC2NRMK        is set to NaN.
+*>             TAU(KB+1:min(M,N))     is not set and contains undefined
+*>                                    elements. If j_1=KB+1, TAU(KB+1)
+*>                                    may contain NaN.
+*>          3) If INFO = j_2, where N+1 <= j_2 <= 2*N, then no NaN
+*>             was detected, but +Inf (or -Inf) was detected and
+*>             the routine continues the computation until completion.
+*>             The (j_2-N)-th column of the matrix A contains the first
+*>             occurrence of +Inf (or -Inf) in the actorization
+*>             step KB+1 ( when KB columns have been factorized ).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup laqp3rk
+*
+*> \par References:
+*  ================
+*> [1] A Level 3 BLAS QR factorization algorithm with column pivoting developed in 1996.
+*> G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain.
+*> X. Sun, Computer Science Dept., Duke University, USA.
+*> C. H. Bischof, Math. and Comp. Sci. Div., Argonne National Lab, USA.
+*> A BLAS-3 version of the QR factorization with column pivoting.
+*> LAPACK Working Note 114
+*> <a href="https://www.netlib.org/lapack/lawnspdf/lawn114.pdf">https://www.netlib.org/lapack/lawnspdf/lawn114.pdf</a>
+*> and in
+*> SIAM J. Sci. Comput., 19(5):1486-1494, Sept. 1998.
+*> <a href="https://doi.org/10.1137/S1064827595296732">https://doi.org/10.1137/S1064827595296732</a>
+*>
+*> [2] A partial column norm updating strategy developed in 2006.
+*> Z. Drmac and Z. Bujanovic, Dept. of Math., University of Zagreb, Croatia.
+*> On the failure of rank revealing QR factorization software – a case study.
+*> LAPACK Working Note 176.
+*> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">http://www.netlib.org/lapack/lawnspdf/lawn176.pdf</a>
+*> and in
+*> ACM Trans. Math. Softw. 35, 2, Article 12 (July 2008), 28 pages.
+*> <a href="https://doi.org/10.1145/1377612.1377616">https://doi.org/10.1145/1377612.1377616</a>
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
+*>
+*>  November  2023, Igor Kozachenko, James Demmel,
+*>                  EECS Department,
+*>                  University of California, Berkeley, USA.
+*>
+*> \endverbatim
+*
+*  =====================================================================
+      SUBROUTINE DLAQP3RK( M, N, NRHS, IOFFSET, NB, ABSTOL,
+     $                     RELTOL, KP1, MAXC2NRM, A, LDA, DONE, KB,
+     $                     MAXC2NRMK, RELMAXC2NRMK, JPIV, TAU,
+     $                     VN1, VN2, AUXV, F, LDF, IWORK, INFO )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      LOGICAL            DONE
+      INTEGER            INFO, IOFFSET, KB, KP1, LDA, LDF, M, N,
+     $                   NB, NRHS
+      DOUBLE PRECISION   ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+     $                   RELTOL
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IWORK( * ), JPIV( * )
+      DOUBLE PRECISION   A( LDA, * ), AUXV( * ), F( LDF, * ), TAU( * ),
+     $                   VN1( * ), VN2( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            ITEMP, J, K, MINMNFACT, MINMNUPDT,
+     $                   LSTICC, KP, I, IF
+      DOUBLE PRECISION   AIK, HUGEVAL, TEMP, TEMP2, TOL3Z
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DGEMM, DGEMV, DLARFG, DSWAP
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, MIN, SQRT
+*     ..
+*     .. External Functions ..
+      LOGICAL            DISNAN
+      INTEGER            IDAMAX
+      DOUBLE PRECISION   DLAMCH, DNRM2
+      EXTERNAL           DISNAN, DLAMCH, IDAMAX, DNRM2
+*     ..
+*     .. Executable Statements ..
+*
+*     Initialize INFO
+*
+      INFO = 0
+*
+*     MINMNFACT in the smallest dimension of the submatrix
+*     A(IOFFSET+1:M,1:N) to be factorized.
+*
+      MINMNFACT = MIN( M-IOFFSET, N )
+      MINMNUPDT = MIN( M-IOFFSET, N+NRHS )
+      NB = MIN( NB, MINMNFACT )
+      TOL3Z = SQRT( DLAMCH( 'Epsilon' ) )
+      HUGEVAL = DLAMCH( 'Overflow' )
+*
+*     Compute factorization in a while loop over NB columns,
+*     K is the column index in the block A(1:M,1:N).
+*
+      K = 0
+      LSTICC = 0
+      DONE = .FALSE.
+*
+      DO WHILE ( K.LT.NB .AND. LSTICC.EQ.0 )
+         K = K + 1
+         I = IOFFSET + K
+*
+         IF( I.EQ.1 ) THEN
+*
+*           We are at the first column of the original whole matrix A_orig,
+*           therefore we use the computed KP1 and MAXC2NRM from the
+*           main routine.
+*
+            KP = KP1
+*
+         ELSE
+*
+*           Determine the pivot column in K-th step, i.e. the index
+*           of the column with the maximum 2-norm in the
+*           submatrix A(I:M,K:N).
+*
+            KP = ( K-1 ) + IDAMAX( N-K+1, VN1( K ), 1 )
+*
+*           Determine the maximum column 2-norm and the relative maximum
+*           column 2-norm of the submatrix A(I:M,K:N) in step K.
+*
+            MAXC2NRMK = VN1( KP )
+*
+*           ============================================================
+*
+*           Check if the submatrix A(I:M,K:N) contains NaN, set
+*           INFO parameter to the column number, where the first NaN
+*           is found and return from the routine.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( DISNAN( MAXC2NRMK ) ) THEN
+*
+               DONE = .TRUE.
+*
+*              Set KB, the number of factorized partial columns
+*                      that are non-zero in each step in the block,
+*                      i.e. the rank of the factor R.
+*              Set IF, the number of processed rows in the block, which
+*                      is the same as the number of processed rows in
+*                      the original whole matrix A_orig.
+*
+               KB = K - 1
+               IF = I - 1
+               INFO = KB + KP
+*
+*              Set RELMAXC2NRMK to NaN.
+*
+               RELMAXC2NRMK = MAXC2NRMK
+*
+*              There is no need to apply the block reflector to the
+*              residual of the matrix A stored in A(KB+1:M,KB+1:N),
+*              since the submatrix contains NaN and we stop
+*              the computation.
+*              But, we need to apply the block reflector to the residual
+*              right hand sides stored in A(KB+1:M,N+1:N+NRHS), if the
+*              residual right hand sides exist.  This occurs
+*              when ( NRHS != 0 AND KB <= (M-IOFFSET) ):
+*
+*              A(I+1:M,N+1:N+NRHS) := A(I+1:M,N+1:N+NRHS) -
+*                               A(I+1:M,1:KB) * F(N+1:N+NRHS,1:KB)**T.
+
+               IF( NRHS.GT.0 .AND. KB.LT.(M-IOFFSET) ) THEN
+                  CALL DGEMM( 'No transpose', 'Transpose',
+     $                  M-IF, NRHS, KB, -ONE, A( IF+1, 1 ), LDA,
+     $                  F( N+1, 1 ), LDF, ONE, A( IF+1, N+1 ), LDA )
+               END IF
+*
+*              There is no need to recompute the 2-norm of the
+*              difficult columns, since we stop the factorization.
+*
+*              Array TAU(KF+1:MINMNFACT) is not set and contains
+*              undefined elements.
+*
+*              Return from the routine.
+*
+               RETURN
+            END IF
+*
+*           Quick return, if the submatrix A(I:M,K:N) is
+*           a zero matrix. We need to check it only if the column index
+*           (same as row index) is larger than 1, since the condition
+*           for the whole original matrix A_orig is checked in the main
+*           routine.
+*
+            IF( MAXC2NRMK.EQ.ZERO ) THEN
+*
+               DONE = .TRUE.
+*
+*              Set KB, the number of factorized partial columns
+*                      that are non-zero in each step in the block,
+*                      i.e. the rank of the factor R.
+*              Set IF, the number of processed rows in the block, which
+*                      is the same as the number of processed rows in
+*                      the original whole matrix A_orig.
+*
+               KB = K - 1
+               IF = I - 1
+               RELMAXC2NRMK = ZERO
+*
+*              There is no need to apply the block reflector to the
+*              residual of the matrix A stored in A(KB+1:M,KB+1:N),
+*              since the submatrix is zero and we stop the computation.
+*              But, we need to apply the block reflector to the residual
+*              right hand sides stored in A(KB+1:M,N+1:N+NRHS), if the
+*              residual right hand sides exist.  This occurs
+*              when ( NRHS != 0 AND KB <= (M-IOFFSET) ):
+*
+*              A(I+1:M,N+1:N+NRHS) := A(I+1:M,N+1:N+NRHS) -
+*                               A(I+1:M,1:KB) * F(N+1:N+NRHS,1:KB)**T.
+*
+               IF( NRHS.GT.0 .AND. KB.LT.(M-IOFFSET) ) THEN
+                  CALL DGEMM( 'No transpose', 'Transpose',
+     $                  M-IF, NRHS, KB, -ONE, A( IF+1, 1 ), LDA,
+     $                  F( N+1, 1 ), LDF, ONE, A( IF+1, N+1 ), LDA )
+               END IF
+*
+*              There is no need to recompute the 2-norm of the
+*              difficult columns, since we stop the factorization.
+*
+*              Set TAUs corresponding to the columns that were not
+*              factorized to ZERO, i.e. set TAU(KB+1:MINMNFACT) = ZERO,
+*              which is equivalent to seting TAU(K:MINMNFACT) = ZERO.
+*
+               DO J = K, MINMNFACT
+                  TAU( J ) = ZERO
+               END DO
+*
+*              Return from the routine.
+*
+               RETURN
+*
+            END IF
+*
+*           ============================================================
+*
+*           Check if the submatrix A(I:M,K:N) contains Inf,
+*           set INFO parameter to the column number, where
+*           the first Inf is found plus N, and continue
+*           the computation.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( INFO.EQ.0 .AND. MAXC2NRMK.GT.HUGEVAL ) THEN
+               INFO = N + K - 1 + KP
+            END IF
+*
+*           ============================================================
+*
+*           Test for the second and third tolerance stopping criteria.
+*           NOTE: There is no need to test for ABSTOL.GE.ZERO, since
+*           MAXC2NRMK is non-negative. Similarly, there is no need
+*           to test for RELTOL.GE.ZERO, since RELMAXC2NRMK is
+*           non-negative.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            RELMAXC2NRMK =  MAXC2NRMK / MAXC2NRM
+*
+            IF( MAXC2NRMK.LE.ABSTOL .OR. RELMAXC2NRMK.LE.RELTOL ) THEN
+*
+               DONE = .TRUE.
+*
+*              Set KB, the number of factorized partial columns
+*                      that are non-zero in each step in the block,
+*                      i.e. the rank of the factor R.
+*              Set IF, the number of processed rows in the block, which
+*                      is the same as the number of processed rows in
+*                      the original whole matrix A_orig;
+*
+                  KB = K - 1
+                  IF = I - 1
+*
+*              Apply the block reflector to the residual of the
+*              matrix A and the residual of the right hand sides B, if
+*              the residual matrix and and/or the residual of the right
+*              hand sides exist,  i.e. if the submatrix
+*              A(I+1:M,KB+1:N+NRHS) exists.  This occurs when
+*                 KB < MINMNUPDT = min( M-IOFFSET, N+NRHS ):
+*
+*              A(IF+1:M,K+1:N+NRHS) := A(IF+1:M,KB+1:N+NRHS) -
+*                             A(IF+1:M,1:KB) * F(KB+1:N+NRHS,1:KB)**T.
+*
+               IF( KB.LT.MINMNUPDT ) THEN
+                  CALL DGEMM( 'No transpose', 'Transpose',
+     $                  M-IF, N+NRHS-KB, KB,-ONE, A( IF+1, 1 ), LDA,
+     $                  F( KB+1, 1 ), LDF, ONE, A( IF+1, KB+1 ), LDA )
+               END IF
+*
+*              There is no need to recompute the 2-norm of the
+*              difficult columns, since we stop the factorization.
+*
+*              Set TAUs corresponding to the columns that were not
+*              factorized to ZERO, i.e. set TAU(KB+1:MINMNFACT) = ZERO,
+*              which is equivalent to seting TAU(K:MINMNFACT) = ZERO.
+*
+               DO J = K, MINMNFACT
+                  TAU( J ) = ZERO
+               END DO
+*
+*              Return from the routine.
+*
+               RETURN
+*
+            END IF
+*
+*           ============================================================
+*
+*           End ELSE of IF(I.EQ.1)
+*
+         END IF
+*
+*        ===============================================================
+*
+*        If the pivot column is not the first column of the
+*        subblock A(1:M,K:N):
+*        1) swap the K-th column and the KP-th pivot column
+*           in A(1:M,1:N);
+*        2) swap the K-th row and the KP-th row in F(1:N,1:K-1)
+*        3) copy the K-th element into the KP-th element of the partial
+*           and exact 2-norm vectors VN1 and VN2. (Swap is not needed
+*           for VN1 and VN2 since we use the element with the index
+*           larger than K in the next loop step.)
+*        4) Save the pivot interchange with the indices relative to the
+*           the original matrix A_orig, not the block A(1:M,1:N).
+*
+         IF( KP.NE.K ) THEN
+            CALL DSWAP( M, A( 1, KP ), 1, A( 1, K ), 1 )
+            CALL DSWAP( K-1, F( KP, 1 ), LDF, F( K, 1 ), LDF )
+            VN1( KP ) = VN1( K )
+            VN2( KP ) = VN2( K )
+            ITEMP = JPIV( KP )
+            JPIV( KP ) = JPIV( K )
+            JPIV( K ) = ITEMP
+         END IF
+*
+*        Apply previous Householder reflectors to column K:
+*        A(I:M,K) := A(I:M,K) - A(I:M,1:K-1)*F(K,1:K-1)**T.
+*
+         IF( K.GT.1 ) THEN
+            CALL DGEMV( 'No transpose', M-I+1, K-1, -ONE, A( I, 1 ),
+     $                  LDA, F( K, 1 ), LDF, ONE, A( I, K ), 1 )
+         END IF
+*
+*        Generate elementary reflector H(k) using the column A(I:M,K).
+*
+         IF( I.LT.M ) THEN
+            CALL DLARFG( M-I+1, A( I, K ), A( I+1, K ), 1, TAU( K ) )
+         ELSE
+            TAU( K ) = ZERO
+         END IF
+*
+*        Check if TAU(K) contains NaN, set INFO parameter
+*        to the column number where NaN is found and return from
+*        the routine.
+*        NOTE: There is no need to check TAU(K) for Inf,
+*        since DLARFG cannot produce TAU(K) or Householder vector
+*        below the diagonal containing Inf. Only BETA on the diagonal,
+*        returned by DLARFG can contain Inf, which requires
+*        TAU(K) to contain NaN. Therefore, this case of generating Inf
+*        by DLARFG is covered by checking TAU(K) for NaN.
+*
+         IF( DISNAN( TAU(K) ) ) THEN
+*
+            DONE = .TRUE.
+*
+*           Set KB, the number of factorized partial columns
+*                   that are non-zero in each step in the block,
+*                   i.e. the rank of the factor R.
+*           Set IF, the number of processed rows in the block, which
+*                   is the same as the number of processed rows in
+*                   the original whole matrix A_orig.
+*
+            KB = K - 1
+            IF = I - 1
+            INFO = K
+*
+*           Set MAXC2NRMK and  RELMAXC2NRMK to NaN.
+*
+            MAXC2NRMK = TAU( K )
+            RELMAXC2NRMK = TAU( K )
+*
+*           There is no need to apply the block reflector to the
+*           residual of the matrix A stored in A(KB+1:M,KB+1:N),
+*           since the submatrix contains NaN and we stop
+*           the computation.
+*           But, we need to apply the block reflector to the residual
+*           right hand sides stored in A(KB+1:M,N+1:N+NRHS), if the
+*           residual right hand sides exist.  This occurs
+*           when ( NRHS != 0 AND KB <= (M-IOFFSET) ):
+*
+*           A(I+1:M,N+1:N+NRHS) := A(I+1:M,N+1:N+NRHS) -
+*                            A(I+1:M,1:KB) * F(N+1:N+NRHS,1:KB)**T.
+*
+            IF( NRHS.GT.0 .AND. KB.LT.(M-IOFFSET) ) THEN
+               CALL DGEMM( 'No transpose', 'Transpose',
+     $               M-IF, NRHS, KB, -ONE, A( IF+1, 1 ), LDA,
+     $               F( N+1, 1 ), LDF, ONE, A( IF+1, N+1 ), LDA )
+            END IF
+*
+*           There is no need to recompute the 2-norm of the
+*           difficult columns, since we stop the factorization.
+*
+*           Array TAU(KF+1:MINMNFACT) is not set and contains
+*           undefined elements.
+*
+*           Return from the routine.
+*
+            RETURN
+         END IF
+*
+*        ===============================================================
+*
+         AIK = A( I, K )
+         A( I, K ) = ONE
+*
+*        ===============================================================
+*
+*        Compute the current K-th column of F:
+*          1) F(K+1:N,K) := tau(K) * A(I:M,K+1:N)**T * A(I:M,K).
+*
+         IF( K.LT.N+NRHS ) THEN
+            CALL DGEMV( 'Transpose', M-I+1, N+NRHS-K,
+     $                  TAU( K ), A( I, K+1 ), LDA, A( I, K ), 1,
+     $                  ZERO, F( K+1, K ), 1 )
+         END IF
+*
+*           2) Zero out elements above and on the diagonal of the
+*              column K in matrix F, i.e elements F(1:K,K).
+*
+         DO J = 1, K
+            F( J, K ) = ZERO
+         END DO
+*
+*         3) Incremental updating of the K-th column of F:
+*        F(1:N,K) := F(1:N,K) - tau(K) * F(1:N,1:K-1) * A(I:M,1:K-1)**T
+*                    * A(I:M,K).
+*
+         IF( K.GT.1 ) THEN
+            CALL DGEMV( 'Transpose', M-I+1, K-1, -TAU( K ),
+     $                  A( I, 1 ), LDA, A( I, K ), 1, ZERO,
+     $                  AUXV( 1 ), 1 )
+*
+            CALL DGEMV( 'No transpose', N+NRHS, K-1, ONE,
+     $                  F( 1, 1 ), LDF, AUXV( 1 ), 1, ONE,
+     $                  F( 1, K ), 1 )
+         END IF
+*
+*        ===============================================================
+*
+*        Update the current I-th row of A:
+*        A(I,K+1:N+NRHS) := A(I,K+1:N+NRHS)
+*                         - A(I,1:K)*F(K+1:N+NRHS,1:K)**T.
+*
+         IF( K.LT.N+NRHS ) THEN
+            CALL DGEMV( 'No transpose', N+NRHS-K, K, -ONE,
+     $                  F( K+1, 1 ), LDF, A( I, 1 ), LDA, ONE,
+     $                  A( I, K+1 ), LDA )
+         END IF
+*
+         A( I, K ) = AIK
+*
+*        Update the partial column 2-norms for the residual matrix,
+*        only if the residual matrix A(I+1:M,K+1:N) exists, i.e.
+*        when K < MINMNFACT = min( M-IOFFSET, N ).
+*
+         IF( K.LT.MINMNFACT ) THEN
+*
+            DO J = K + 1, N
+               IF( VN1( J ).NE.ZERO ) THEN
+*
+*                 NOTE: The following lines follow from the analysis in
+*                 Lapack Working Note 176.
+*
+                  TEMP = ABS( A( I, J ) ) / VN1( J )
+                  TEMP = MAX( ZERO, ( ONE+TEMP )*( ONE-TEMP ) )
+                  TEMP2 = TEMP*( VN1( J ) / VN2( J ) )**2
+                  IF( TEMP2.LE.TOL3Z ) THEN
+*
+*                    At J-index, we have a difficult column for the
+*                    update of the 2-norm. Save the index of the previous
+*                    difficult column in IWORK(J-1).
+*                    NOTE: ILSTCC > 1, threfore we can use IWORK only
+*                    with N-1 elements, where the elements are
+*                    shifted by 1 to the left.
+*
+                     IWORK( J-1 ) = LSTICC
+*
+*                    Set the index of the last difficult column LSTICC.
+*
+                     LSTICC = J
+*
+                  ELSE
+                     VN1( J ) = VN1( J )*SQRT( TEMP )
+                  END IF
+               END IF
+            END DO
+*
+         END IF
+*
+*        End of while loop.
+*
+      END DO
+*
+*     Now, afler the loop:
+*        Set KB, the number of factorized columns in the block;
+*        Set IF, the number of processed rows in the block, which
+*                is the same as the number of processed rows in
+*                the original whole matrix A_orig, IF = IOFFSET + KB.
+*
+      KB = K
+      IF = I
+*
+*     Apply the block reflector to the residual of the matrix A
+*     and the residual of the right hand sides B, if the residual
+*     matrix and and/or the residual of the right hand sides
+*     exist,  i.e. if the submatrix A(I+1:M,KB+1:N+NRHS) exists.
+*     This occurs when KB < MINMNUPDT = min( M-IOFFSET, N+NRHS ):
+*
+*     A(IF+1:M,K+1:N+NRHS) := A(IF+1:M,KB+1:N+NRHS) -
+*                         A(IF+1:M,1:KB) * F(KB+1:N+NRHS,1:KB)**T.
+*
+      IF( KB.LT.MINMNUPDT ) THEN
+         CALL DGEMM( 'No transpose', 'Transpose',
+     $         M-IF, N+NRHS-KB, KB, -ONE, A( IF+1, 1 ), LDA,
+     $         F( KB+1, 1 ), LDF, ONE, A( IF+1, KB+1 ), LDA )
+      END IF
+*
+*     Recompute the 2-norm of the difficult columns.
+*     Loop over the index of the difficult columns from the largest
+*     to the smallest index.
+*
+      DO WHILE( LSTICC.GT.0 )
+*
+*        LSTICC is the index of the last difficult column is greater
+*        than 1.
+*        ITEMP is the index of the previous difficult column.
+*
+         ITEMP = IWORK( LSTICC-1 )
+*
+*        Compute the 2-norm explicilty for the last difficult column and
+*        save it in the partial and exact 2-norm vectors VN1 and VN2.
+*
+*        NOTE: The computation of VN1( LSTICC ) relies on the fact that
+*        DNRM2 does not fail on vectors with norm below the value of
+*        SQRT(DLAMCH('S'))
+*
+         VN1( LSTICC ) = DNRM2( M-IF, A( IF+1, LSTICC ), 1 )
+         VN2( LSTICC ) = VN1( LSTICC )
+*
+*        Downdate the index of the last difficult column to
+*        the index of the previous difficult column.
+*
+         LSTICC = ITEMP
+*
+      END DO
+*
+      RETURN
+*
+*     End of DLAQP3RK
+*
+      END
diff --git a/SRC/dlaqps.f b/SRC/dlaqps.f
index dda8278bb8..bb199fdeeb 100644
--- a/SRC/dlaqps.f
+++ b/SRC/dlaqps.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQPS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqps.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqps.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -150,7 +148,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup laqps
 *
 *> \par Contributors:
 *  ==================
@@ -167,13 +165,13 @@
 *>
 *> LAPACK Working Note 176
 *
-*> \htmlonly
 *> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">[PDF]</a>
-*> \endhtmlonly
 *
 *  =====================================================================
-      SUBROUTINE DLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
+      SUBROUTINE DLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU,
+     $                   VN1,
      $                   VN2, AUXV, F, LDF )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -240,14 +238,16 @@ SUBROUTINE DLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
 *        A(RK:M,K) := A(RK:M,K) - A(RK:M,1:K-1)*F(K,1:K-1)**T.
 *
          IF( K.GT.1 ) THEN
-            CALL DGEMV( 'No transpose', M-RK+1, K-1, -ONE, A( RK, 1 ),
+            CALL DGEMV( 'No transpose', M-RK+1, K-1, -ONE, A( RK,
+     $                  1 ),
      $                  LDA, F( K, 1 ), LDF, ONE, A( RK, K ), 1 )
          END IF
 *
 *        Generate elementary reflector H(k).
 *
          IF( RK.LT.M ) THEN
-            CALL DLARFG( M-RK+1, A( RK, K ), A( RK+1, K ), 1, TAU( K ) )
+            CALL DLARFG( M-RK+1, A( RK, K ), A( RK+1, K ), 1,
+     $                   TAU( K ) )
          ELSE
             CALL DLARFG( 1, A( RK, K ), A( RK, K ), 1, TAU( K ) )
          END IF
@@ -276,7 +276,8 @@ SUBROUTINE DLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
 *                    *A(RK:M,K).
 *
          IF( K.GT.1 ) THEN
-            CALL DGEMV( 'Transpose', M-RK+1, K-1, -TAU( K ), A( RK, 1 ),
+            CALL DGEMV( 'Transpose', M-RK+1, K-1, -TAU( K ), A( RK,
+     $                  1 ),
      $                  LDA, A( RK, K ), 1, ZERO, AUXV( 1 ), 1 )
 *
             CALL DGEMV( 'No transpose', N, K-1, ONE, F( 1, 1 ), LDF,
@@ -287,7 +288,8 @@ SUBROUTINE DLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
 *        A(RK,K+1:N) := A(RK,K+1:N) - A(RK,1:K)*F(K+1:N,1:K)**T.
 *
          IF( K.LT.N ) THEN
-            CALL DGEMV( 'No transpose', N-K, K, -ONE, F( K+1, 1 ), LDF,
+            CALL DGEMV( 'No transpose', N-K, K, -ONE, F( K+1, 1 ),
+     $                  LDF,
      $                  A( RK, 1 ), LDA, ONE, A( RK, K+1 ), LDA )
          END IF
 *
@@ -327,7 +329,8 @@ SUBROUTINE DLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
 *                         A(OFFSET+KB+1:M,1:KB)*F(KB+1:N,1:KB)**T.
 *
       IF( KB.LT.MIN( N, M-OFFSET ) ) THEN
-         CALL DGEMM( 'No transpose', 'Transpose', M-RK, N-KB, KB, -ONE,
+         CALL DGEMM( 'No transpose', 'Transpose', M-RK, N-KB, KB,
+     $               -ONE,
      $               A( RK+1, 1 ), LDA, F( KB+1, 1 ), LDF, ONE,
      $               A( RK+1, KB+1 ), LDA )
       END IF
diff --git a/SRC/dlaqr0.f b/SRC/dlaqr0.f
index 3e73b8de20..c25e0bfea2 100644
--- a/SRC/dlaqr0.f
+++ b/SRC/dlaqr0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQR0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqr0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqr0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -248,11 +246,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup laqr0
 *
 *  =====================================================================
       SUBROUTINE DLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
      $                   ILOZ, IHIZ, Z, LDZ, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -313,7 +312,8 @@ SUBROUTINE DLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
       DOUBLE PRECISION   ZDUM( 1, 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLACPY, DLAHQR, DLANV2, DLAQR3, DLAQR4, DLAQR5
+      EXTERNAL           DLACPY, DLAHQR, DLANV2, DLAQR3, DLAQR4,
+     $                   DLAQR5
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, INT, MAX, MIN, MOD
@@ -516,7 +516,8 @@ SUBROUTINE DLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
 *
 *           ==== Aggressive early deflation ====
 *
-            CALL DLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+            CALL DLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH,
+     $                   ILOZ,
      $                   IHIZ, Z, LDZ, LS, LD, WR, WI, H( KV, 1 ), LDH,
      $                   NHO, H( KV, KT ), LDH, NVE, H( KWV, 1 ), LDH,
      $                   WORK, LWORK )
@@ -560,7 +561,8 @@ SUBROUTINE DLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
                      BB = SS
                      CC = WILK2*SS
                      DD = AA
-                     CALL DLANV2( AA, BB, CC, DD, WR( I-1 ), WI( I-1 ),
+                     CALL DLANV2( AA, BB, CC, DD, WR( I-1 ),
+     $                            WI( I-1 ),
      $                            WR( I ), WI( I ), CS, SN )
    30             CONTINUE
                   IF( KS.EQ.KTOP ) THEN
diff --git a/SRC/dlaqr1.f b/SRC/dlaqr1.f
index f411ac9556..564c4ed732 100644
--- a/SRC/dlaqr1.f
+++ b/SRC/dlaqr1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQR1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqr1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqr1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,7 +106,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup laqr1
 *
 *> \par Contributors:
 *  ==================
@@ -118,6 +116,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLAQR1( N, H, LDH, SR1, SI1, SR2, SI2, V )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlaqr2.f b/SRC/dlaqr2.f
index 515c836582..02ae83cb5d 100644
--- a/SRC/dlaqr2.f
+++ b/SRC/dlaqr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -263,7 +261,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup laqr2
 *
 *> \par Contributors:
 *  ==================
@@ -272,9 +270,11 @@
 *>       University of Kansas, USA
 *>
 *  =====================================================================
-      SUBROUTINE DLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+      SUBROUTINE DLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH,
+     $                   ILOZ,
      $                   IHIZ, Z, LDZ, NS, ND, SR, SI, V, LDV, NH, T,
      $                   LDT, NV, WV, LDWV, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -309,8 +309,9 @@ SUBROUTINE DLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
       EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEHRD, DGEMM, DLABAD, DLACPY, DLAHQR,
-     $                   DLANV2, DLARF, DLARFG, DLASET, DORMHR, DTREXC
+      EXTERNAL           DCOPY, DGEHRD, DGEMM, DLACPY,
+     $                   DLAHQR,
+     $                   DLANV2, DLARF1F, DLARFG, DLASET, DORMHR, DTREXC
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, INT, MAX, MIN, SQRT
@@ -331,7 +332,8 @@ SUBROUTINE DLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
 *        ==== Workspace query call to DORMHR ====
 *
-         CALL DORMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V, LDV,
+         CALL DORMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V,
+     $                LDV,
      $                WORK, -1, INFO )
          LWK2 = INT( WORK( 1 ) )
 *
@@ -362,7 +364,6 @@ SUBROUTINE DLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
       SAFMIN = DLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULP = DLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( DBLE( N ) / ULP )
 *
@@ -402,7 +403,8 @@ SUBROUTINE DLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *     .    here and there to keep track.) ====
 *
       CALL DLACPY( 'U', JW, JW, H( KWTOP, KWTOP ), LDH, T, LDT )
-      CALL DCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ), LDT+1 )
+      CALL DCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ),
+     $            LDT+1 )
 *
       CALL DLASET( 'A', JW, JW, ZERO, ONE, V, LDV )
       CALL DLAHQR( .true., .true., JW, 1, JW, T, LDT, SR( KWTOP ),
@@ -449,7 +451,8 @@ SUBROUTINE DLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *              .    (DTREXC can not fail in this case.) ====
 *
                IFST = NS
-               CALL DTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, WORK,
+               CALL DTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST,
+     $                      WORK,
      $                      INFO )
                ILST = ILST + 1
             END IF
@@ -474,7 +477,8 @@ SUBROUTINE DLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *              .    ILST in case of a rare exchange failure. ====
 *
                IFST = NS
-               CALL DTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, WORK,
+               CALL DTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST,
+     $                      WORK,
      $                      INFO )
                ILST = ILST + 2
             END IF
@@ -536,7 +540,8 @@ SUBROUTINE DLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
                SORTED = .false.
                IFST = I
                ILST = K
-               CALL DTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, WORK,
+               CALL DTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST,
+     $                      WORK,
      $                      INFO )
                IF( INFO.EQ.0 ) THEN
                   I = ILST
@@ -591,15 +596,15 @@ SUBROUTINE DLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
             CALL DCOPY( NS, V, LDV, WORK, 1 )
             BETA = WORK( 1 )
             CALL DLARFG( NS, BETA, WORK( 2 ), 1, TAU )
-            WORK( 1 ) = ONE
 *
-            CALL DLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ), LDT )
+            CALL DLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ),
+     $                   LDT )
 *
-            CALL DLARF( 'L', NS, JW, WORK, 1, TAU, T, LDT,
+            CALL DLARF1F( 'L', NS, JW, WORK, 1, TAU, T, LDT,
      $                  WORK( JW+1 ) )
-            CALL DLARF( 'R', NS, NS, WORK, 1, TAU, T, LDT,
+            CALL DLARF1F( 'R', NS, NS, WORK, 1, TAU, T, LDT,
      $                  WORK( JW+1 ) )
-            CALL DLARF( 'R', JW, NS, WORK, 1, TAU, V, LDV,
+            CALL DLARF1F( 'R', JW, NS, WORK, 1, TAU, V, LDV,
      $                  WORK( JW+1 ) )
 *
             CALL DGEHRD( JW, 1, NS, T, LDT, WORK, WORK( JW+1 ),
@@ -618,7 +623,8 @@ SUBROUTINE DLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *        .    H and Z, if requested.  ====
 *
          IF( NS.GT.1 .AND. S.NE.ZERO )
-     $      CALL DORMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V, LDV,
+     $      CALL DORMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V,
+     $                   LDV,
      $                   WORK( JW+1 ), LWORK-JW, INFO )
 *
 *        ==== Update vertical slab in H ====
@@ -632,7 +638,8 @@ SUBROUTINE DLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
             KLN = MIN( NV, KWTOP-KROW )
             CALL DGEMM( 'N', 'N', KLN, JW, JW, ONE, H( KROW, KWTOP ),
      $                  LDH, V, LDV, ZERO, WV, LDWV )
-            CALL DLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ), LDH )
+            CALL DLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ),
+     $                   LDH )
    70    CONTINUE
 *
 *        ==== Update horizontal slab in H ====
@@ -652,7 +659,8 @@ SUBROUTINE DLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
          IF( WANTZ ) THEN
             DO 90 KROW = ILOZ, IHIZ, NV
                KLN = MIN( NV, IHIZ-KROW+1 )
-               CALL DGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW, KWTOP ),
+               CALL DGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW,
+     $                     KWTOP ),
      $                     LDZ, V, LDV, ZERO, WV, LDWV )
                CALL DLACPY( 'A', KLN, JW, WV, LDWV, Z( KROW, KWTOP ),
      $                      LDZ )
diff --git a/SRC/dlaqr3.f b/SRC/dlaqr3.f
index 36e08f02e8..9ddd8c7a4a 100644
--- a/SRC/dlaqr3.f
+++ b/SRC/dlaqr3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQR3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqr3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqr3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -260,7 +258,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup laqr3
 *
 *> \par Contributors:
 *  ==================
@@ -269,9 +267,11 @@
 *>       University of Kansas, USA
 *>
 *  =====================================================================
-      SUBROUTINE DLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+      SUBROUTINE DLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH,
+     $                   ILOZ,
      $                   IHIZ, Z, LDZ, NS, ND, SR, SI, V, LDV, NH, T,
      $                   LDT, NV, WV, LDWV, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -307,9 +307,9 @@ SUBROUTINE DLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
       EXTERNAL           DLAMCH, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEHRD, DGEMM, DLABAD, DLACPY, DLAHQR,
-     $                   DLANV2, DLAQR4, DLARF, DLARFG, DLASET, DORMHR,
-     $                   DTREXC
+      EXTERNAL           DCOPY, DGEHRD, DGEMM, DLACPY, DLAHQR,
+     $                   DLANV2,
+     $                   DLAQR4, DLARF1F, DLARFG, DLASET, DORMHR, DTREXC
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, INT, MAX, MIN, SQRT
@@ -330,13 +330,15 @@ SUBROUTINE DLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
 *        ==== Workspace query call to DORMHR ====
 *
-         CALL DORMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V, LDV,
+         CALL DORMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V,
+     $                LDV,
      $                WORK, -1, INFO )
          LWK2 = INT( WORK( 1 ) )
 *
 *        ==== Workspace query call to DLAQR4 ====
 *
-         CALL DLAQR4( .true., .true., JW, 1, JW, T, LDT, SR, SI, 1, JW,
+         CALL DLAQR4( .true., .true., JW, 1, JW, T, LDT, SR, SI, 1,
+     $                JW,
      $                V, LDV, WORK, -1, INFQR )
          LWK3 = INT( WORK( 1 ) )
 *
@@ -367,7 +369,6 @@ SUBROUTINE DLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
       SAFMIN = DLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULP = DLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( DBLE( N ) / ULP )
 *
@@ -407,7 +408,8 @@ SUBROUTINE DLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *     .    here and there to keep track.) ====
 *
       CALL DLACPY( 'U', JW, JW, H( KWTOP, KWTOP ), LDH, T, LDT )
-      CALL DCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ), LDT+1 )
+      CALL DCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ),
+     $            LDT+1 )
 *
       CALL DLASET( 'A', JW, JW, ZERO, ONE, V, LDV )
       NMIN = ILAENV( 12, 'DLAQR3', 'SV', JW, 1, JW, LWORK )
@@ -460,7 +462,8 @@ SUBROUTINE DLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *              .    (DTREXC can not fail in this case.) ====
 *
                IFST = NS
-               CALL DTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, WORK,
+               CALL DTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST,
+     $                      WORK,
      $                      INFO )
                ILST = ILST + 1
             END IF
@@ -485,7 +488,8 @@ SUBROUTINE DLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *              .    ILST in case of a rare exchange failure. ====
 *
                IFST = NS
-               CALL DTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, WORK,
+               CALL DTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST,
+     $                      WORK,
      $                      INFO )
                ILST = ILST + 2
             END IF
@@ -547,7 +551,8 @@ SUBROUTINE DLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
                SORTED = .false.
                IFST = I
                ILST = K
-               CALL DTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, WORK,
+               CALL DTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST,
+     $                      WORK,
      $                      INFO )
                IF( INFO.EQ.0 ) THEN
                   I = ILST
@@ -602,15 +607,15 @@ SUBROUTINE DLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
             CALL DCOPY( NS, V, LDV, WORK, 1 )
             BETA = WORK( 1 )
             CALL DLARFG( NS, BETA, WORK( 2 ), 1, TAU )
-            WORK( 1 ) = ONE
 *
-            CALL DLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ), LDT )
+            CALL DLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ),
+     $                   LDT )
 *
-            CALL DLARF( 'L', NS, JW, WORK, 1, TAU, T, LDT,
+            CALL DLARF1F( 'L', NS, JW, WORK, 1, TAU, T, LDT,
      $                  WORK( JW+1 ) )
-            CALL DLARF( 'R', NS, NS, WORK, 1, TAU, T, LDT,
+            CALL DLARF1F( 'R', NS, NS, WORK, 1, TAU, T, LDT,
      $                  WORK( JW+1 ) )
-            CALL DLARF( 'R', JW, NS, WORK, 1, TAU, V, LDV,
+            CALL DLARF1F( 'R', JW, NS, WORK, 1, TAU, V, LDV,
      $                  WORK( JW+1 ) )
 *
             CALL DGEHRD( JW, 1, NS, T, LDT, WORK, WORK( JW+1 ),
@@ -629,7 +634,8 @@ SUBROUTINE DLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *        .    H and Z, if requested.  ====
 *
          IF( NS.GT.1 .AND. S.NE.ZERO )
-     $      CALL DORMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V, LDV,
+     $      CALL DORMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V,
+     $                   LDV,
      $                   WORK( JW+1 ), LWORK-JW, INFO )
 *
 *        ==== Update vertical slab in H ====
@@ -643,7 +649,8 @@ SUBROUTINE DLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
             KLN = MIN( NV, KWTOP-KROW )
             CALL DGEMM( 'N', 'N', KLN, JW, JW, ONE, H( KROW, KWTOP ),
      $                  LDH, V, LDV, ZERO, WV, LDWV )
-            CALL DLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ), LDH )
+            CALL DLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ),
+     $                   LDH )
    70    CONTINUE
 *
 *        ==== Update horizontal slab in H ====
@@ -663,7 +670,8 @@ SUBROUTINE DLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
          IF( WANTZ ) THEN
             DO 90 KROW = ILOZ, IHIZ, NV
                KLN = MIN( NV, IHIZ-KROW+1 )
-               CALL DGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW, KWTOP ),
+               CALL DGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW,
+     $                     KWTOP ),
      $                     LDZ, V, LDV, ZERO, WV, LDWV )
                CALL DLACPY( 'A', KLN, JW, WV, LDWV, Z( KROW, KWTOP ),
      $                      LDZ )
diff --git a/SRC/dlaqr4.f b/SRC/dlaqr4.f
index 0668a54b24..1432106d1d 100644
--- a/SRC/dlaqr4.f
+++ b/SRC/dlaqr4.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQR4 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqr4.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqr4.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -237,7 +235,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup laqr4
 *
 *> \par Contributors:
 *  ==================
@@ -260,6 +258,7 @@
 *  =====================================================================
       SUBROUTINE DLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
      $                   ILOZ, IHIZ, Z, LDZ, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -319,7 +318,8 @@ SUBROUTINE DLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
       DOUBLE PRECISION   ZDUM( 1, 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLACPY, DLAHQR, DLANV2, DLAQR2, DLAQR5
+      EXTERNAL           DLACPY, DLAHQR, DLANV2, DLAQR2,
+     $                   DLAQR5
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, INT, MAX, MIN, MOD
@@ -522,7 +522,8 @@ SUBROUTINE DLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
 *
 *           ==== Aggressive early deflation ====
 *
-            CALL DLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+            CALL DLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH,
+     $                   ILOZ,
      $                   IHIZ, Z, LDZ, LS, LD, WR, WI, H( KV, 1 ), LDH,
      $                   NHO, H( KV, KT ), LDH, NVE, H( KWV, 1 ), LDH,
      $                   WORK, LWORK )
@@ -566,7 +567,8 @@ SUBROUTINE DLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
                      BB = SS
                      CC = WILK2*SS
                      DD = AA
-                     CALL DLANV2( AA, BB, CC, DD, WR( I-1 ), WI( I-1 ),
+                     CALL DLANV2( AA, BB, CC, DD, WR( I-1 ),
+     $                            WI( I-1 ),
      $                            WR( I ), WI( I ), CS, SN )
    30             CONTINUE
                   IF( KS.EQ.KTOP ) THEN
diff --git a/SRC/dlaqr5.f b/SRC/dlaqr5.f
index 0c63ab8000..fe8719d7ad 100644
--- a/SRC/dlaqr5.f
+++ b/SRC/dlaqr5.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQR5 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqr5.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqr5.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -233,7 +231,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup laqr5
 *
 *> \par Contributors:
 *  ==================
@@ -286,8 +284,8 @@ SUBROUTINE DLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *     ..
 *     .. Local Scalars ..
       DOUBLE PRECISION   ALPHA, BETA, H11, H12, H21, H22, REFSUM,
-     $                   SAFMAX, SAFMIN, SCL, SMLNUM, SWAP, TST1, TST2,
-     $                   ULP
+     $                   SAFMAX, SAFMIN, SCL, SMLNUM, SWAP, T1, T2,
+     $                   T3, TST1, TST2, ULP
       INTEGER            I, I2, I4, INCOL, J, JBOT, JCOL, JLEN,
      $                   JROW, JTOP, K, K1, KDU, KMS, KRCOL,
      $                   M, M22, MBOT, MTOP, NBMPS, NDCOL,
@@ -306,7 +304,7 @@ SUBROUTINE DLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
       DOUBLE PRECISION   VT( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DLABAD, DLACPY, DLAQR1, DLARFG, DLASET,
+      EXTERNAL           DGEMM, DLACPY, DLAQR1, DLARFG, DLASET,
      $                   DTRMM
 *     ..
 *     .. Executable Statements ..
@@ -353,7 +351,6 @@ SUBROUTINE DLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *
       SAFMIN = DLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULP = DLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( DBLE( N ) / ULP )
 *
@@ -447,11 +444,12 @@ SUBROUTINE DLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *              ==== Perform update from right within 
 *              .    computational window. ====
 *
+               T1 = V( 1, M22 )
+               T2 = T1*V( 2, M22 )
                DO 30 J = JTOP, MIN( KBOT, K+3 )
-                  REFSUM = V( 1, M22 )*( H( J, K+1 )+V( 2, M22 )*
-     $                     H( J, K+2 ) )
-                  H( J, K+1 ) = H( J, K+1 ) - REFSUM
-                  H( J, K+2 ) = H( J, K+2 ) - REFSUM*V( 2, M22 )
+                  REFSUM = H( J, K+1 ) + V( 2, M22 )*H( J, K+2 )
+                  H( J, K+1 ) = H( J, K+1 ) - REFSUM*T1
+                  H( J, K+2 ) = H( J, K+2 ) - REFSUM*T2
    30          CONTINUE
 *
 *              ==== Perform update from left within 
@@ -464,11 +462,12 @@ SUBROUTINE DLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
                ELSE
                   JBOT = KBOT
                END IF
+               T1 = V( 1, M22 )
+               T2 = T1*V( 2, M22 )
                DO 40 J = K+1, JBOT
-                  REFSUM = V( 1, M22 )*( H( K+1, J )+V( 2, M22 )*
-     $                     H( K+2, J ) )
-                  H( K+1, J ) = H( K+1, J ) - REFSUM
-                  H( K+2, J ) = H( K+2, J ) - REFSUM*V( 2, M22 )
+                  REFSUM = H( K+1, J ) + V( 2, M22 )*H( K+2, J )
+                  H( K+1, J ) = H( K+1, J ) - REFSUM*T1
+                  H( K+2, J ) = H( K+2, J ) - REFSUM*T2
    40          CONTINUE
 *
 *              ==== The following convergence test requires that
@@ -522,18 +521,20 @@ SUBROUTINE DLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *
                IF( ACCUM ) THEN
                   KMS = K - INCOL
+                  T1 = V( 1, M22 )
+                  T2 = T1*V( 2, M22 )
                   DO 50 J = MAX( 1, KTOP-INCOL ), KDU
-                     REFSUM = V( 1, M22 )*( U( J, KMS+1 )+
-     $                        V( 2, M22 )*U( J, KMS+2 ) )
-                     U( J, KMS+1 ) = U( J, KMS+1 ) - REFSUM
-                     U( J, KMS+2 ) = U( J, KMS+2 ) - REFSUM*V( 2, M22 )
+                     REFSUM = U( J, KMS+1 ) + V( 2, M22 )*U( J, KMS+2 )
+                     U( J, KMS+1 ) = U( J, KMS+1 ) - REFSUM*T1
+                     U( J, KMS+2 ) = U( J, KMS+2 ) - REFSUM*T2
   50                 CONTINUE
                ELSE IF( WANTZ ) THEN
+                  T1 = V( 1, M22 )
+                  T2 = T1*V( 2, M22 )
                   DO 60 J = ILOZ, IHIZ
-                     REFSUM = V( 1, M22 )*( Z( J, K+1 )+V( 2, M22 )*
-     $                        Z( J, K+2 ) )
-                     Z( J, K+1 ) = Z( J, K+1 ) - REFSUM
-                     Z( J, K+2 ) = Z( J, K+2 ) - REFSUM*V( 2, M22 )
+                     REFSUM = Z( J, K+1 )+V( 2, M22 )*Z( J, K+2 )
+                     Z( J, K+1 ) = Z( J, K+1 ) - REFSUM*T1
+                     Z( J, K+2 ) = Z( J, K+2 ) - REFSUM*T2
   60              CONTINUE
                END IF
             END IF
@@ -554,10 +555,13 @@ SUBROUTINE DLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *                 .    Mth bulge. Exploit fact that first two elements
 *                 .    of row are actually zero. ====
 *
-                  REFSUM = V( 1, M )*V( 3, M )*H( K+3, K+2 )
-                  H( K+3, K   ) = -REFSUM
-                  H( K+3, K+1 ) = -REFSUM*V( 2, M )
-                  H( K+3, K+2 ) = H( K+3, K+2 ) - REFSUM*V( 3, M )
+                  T1 = V( 1, M )
+                  T2 = T1*V( 2, M )
+                  T3 = T1*V( 3, M )
+                  REFSUM = V( 3, M )*H( K+3, K+2 )
+                  H( K+3, K   ) = -REFSUM*T1
+                  H( K+3, K+1 ) = -REFSUM*T2
+                  H( K+3, K+2 ) = H( K+3, K+2 ) - REFSUM*T3
 *
 *                 ==== Calculate reflection to move
 *                 .    Mth bulge one step. ====
@@ -593,11 +597,13 @@ SUBROUTINE DLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
      $                            VT )
                      ALPHA = VT( 1 )
                      CALL DLARFG( 3, ALPHA, VT( 2 ), 1, VT( 1 ) )
-                     REFSUM = VT( 1 )*( H( K+1, K )+VT( 2 )*
-     $                        H( K+2, K ) )
+                     T1 = VT( 1 )
+                     T2 = T1*VT( 2 )
+                     T3 = T1*VT( 3 )
+                     REFSUM = H( K+1, K ) + VT( 2 )*H( K+2, K )
 *
-                     IF( ABS( H( K+2, K )-REFSUM*VT( 2 ) )+
-     $                   ABS( REFSUM*VT( 3 ) ).GT.ULP*
+                     IF( ABS( H( K+2, K )-REFSUM*T2 )+
+     $                   ABS( REFSUM*T3 ).GT.ULP*
      $                   ( ABS( H( K, K ) )+ABS( H( K+1,
      $                   K+1 ) )+ABS( H( K+2, K+2 ) ) ) ) THEN
 *
@@ -615,7 +621,7 @@ SUBROUTINE DLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *                       .    Replace the old reflector with
 *                       .    the new one. ====
 *
-                        H( K+1, K ) = H( K+1, K ) - REFSUM
+                        H( K+1, K ) = H( K+1, K ) - REFSUM*T1
                         H( K+2, K ) = ZERO
                         H( K+3, K ) = ZERO
                         V( 1, M ) = VT( 1 )
@@ -631,22 +637,25 @@ SUBROUTINE DLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *              .     deflation check. We still delay most of the
 *              .     updates from the left for efficiency. ====      
 *
+               T1 = V( 1, M )
+               T2 = T1*V( 2, M )
+               T3 = T1*V( 3, M )
                DO 70 J = JTOP, MIN( KBOT, K+3 )
-                  REFSUM = V( 1, M )*( H( J, K+1 )+V( 2, M )*
-     $                     H( J, K+2 )+V( 3, M )*H( J, K+3 ) )
-                  H( J, K+1 ) = H( J, K+1 ) - REFSUM
-                  H( J, K+2 ) = H( J, K+2 ) - REFSUM*V( 2, M )
-                  H( J, K+3 ) = H( J, K+3 ) - REFSUM*V( 3, M )
+                  REFSUM = H( J, K+1 ) + V( 2, M )*H( J, K+2 )
+     $                     + V( 3, M )*H( J, K+3 )
+                  H( J, K+1 ) = H( J, K+1 ) - REFSUM*T1
+                  H( J, K+2 ) = H( J, K+2 ) - REFSUM*T2
+                  H( J, K+3 ) = H( J, K+3 ) - REFSUM*T3
    70          CONTINUE
 *
 *              ==== Perform update from left for subsequent
 *              .    column. ====
 *
-               REFSUM = V( 1, M )*( H( K+1, K+1 )+V( 2, M )*
-     $                  H( K+2, K+1 )+V( 3, M )*H( K+3, K+1 ) )
-               H( K+1, K+1 ) = H( K+1, K+1 ) - REFSUM
-               H( K+2, K+1 ) = H( K+2, K+1 ) - REFSUM*V( 2, M )
-               H( K+3, K+1 ) = H( K+3, K+1 ) - REFSUM*V( 3, M )
+               REFSUM = H( K+1, K+1 ) + V( 2, M )*H( K+2, K+1 )
+     $                  + V( 3, M )*H( K+3, K+1 )
+               H( K+1, K+1 ) = H( K+1, K+1 ) - REFSUM*T1
+               H( K+2, K+1 ) = H( K+2, K+1 ) - REFSUM*T2
+               H( K+3, K+1 ) = H( K+3, K+1 ) - REFSUM*T3
 *
 *              ==== The following convergence test requires that
 *              .    the tradition small-compared-to-nearby-diagonals
@@ -706,12 +715,15 @@ SUBROUTINE DLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *
             DO 100 M = MBOT, MTOP, -1
                K = KRCOL + 2*( M-1 )
+               T1 = V( 1, M )
+               T2 = T1*V( 2, M )
+               T3 = T1*V( 3, M )
                DO 90 J = MAX( KTOP, KRCOL + 2*M ), JBOT
-                  REFSUM = V( 1, M )*( H( K+1, J )+V( 2, M )*
-     $                     H( K+2, J )+V( 3, M )*H( K+3, J ) )
-                  H( K+1, J ) = H( K+1, J ) - REFSUM
-                  H( K+2, J ) = H( K+2, J ) - REFSUM*V( 2, M )
-                  H( K+3, J ) = H( K+3, J ) - REFSUM*V( 3, M )
+                  REFSUM = H( K+1, J ) + V( 2, M )*H( K+2, J )
+     $                     + V( 3, M )*H( K+3, J )
+                  H( K+1, J ) = H( K+1, J ) - REFSUM*T1
+                  H( K+2, J ) = H( K+2, J ) - REFSUM*T2
+                  H( K+3, J ) = H( K+3, J ) - REFSUM*T3
    90          CONTINUE
   100       CONTINUE
 *
@@ -729,12 +741,15 @@ SUBROUTINE DLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
                   I2 = MAX( 1, KTOP-INCOL )
                   I2 = MAX( I2, KMS-(KRCOL-INCOL)+1 )
                   I4 = MIN( KDU, KRCOL + 2*( MBOT-1 ) - INCOL + 5 )
+                  T1 = V( 1, M )
+                  T2 = T1*V( 2, M )
+                  T3 = T1*V( 3, M )
                   DO 110 J = I2, I4
-                     REFSUM = V( 1, M )*( U( J, KMS+1 )+V( 2, M )*
-     $                        U( J, KMS+2 )+V( 3, M )*U( J, KMS+3 ) )
-                     U( J, KMS+1 ) = U( J, KMS+1 ) - REFSUM
-                     U( J, KMS+2 ) = U( J, KMS+2 ) - REFSUM*V( 2, M )
-                     U( J, KMS+3 ) = U( J, KMS+3 ) - REFSUM*V( 3, M )
+                     REFSUM = U( J, KMS+1 ) + V( 2, M )*U( J, KMS+2 )
+     $                        + V( 3, M )*U( J, KMS+3 )
+                     U( J, KMS+1 ) = U( J, KMS+1 ) - REFSUM*T1
+                     U( J, KMS+2 ) = U( J, KMS+2 ) - REFSUM*T2
+                     U( J, KMS+3 ) = U( J, KMS+3 ) - REFSUM*T3
   110             CONTINUE
   120          CONTINUE
             ELSE IF( WANTZ ) THEN
@@ -745,12 +760,15 @@ SUBROUTINE DLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *
                DO 140 M = MBOT, MTOP, -1
                   K = KRCOL + 2*( M-1 )
+                  T1 = V( 1, M )
+                  T2 = T1*V( 2, M )
+                  T3 = T1*V( 3, M )
                   DO 130 J = ILOZ, IHIZ
-                     REFSUM = V( 1, M )*( Z( J, K+1 )+V( 2, M )*
-     $                        Z( J, K+2 )+V( 3, M )*Z( J, K+3 ) )
-                     Z( J, K+1 ) = Z( J, K+1 ) - REFSUM
-                     Z( J, K+2 ) = Z( J, K+2 ) - REFSUM*V( 2, M )
-                     Z( J, K+3 ) = Z( J, K+3 ) - REFSUM*V( 3, M )
+                     REFSUM = Z( J, K+1 ) + V( 2, M )*Z( J, K+2 )
+     $                        + V( 3, M )*Z( J, K+3 )
+                     Z( J, K+1 ) = Z( J, K+1 ) - REFSUM*T1
+                     Z( J, K+2 ) = Z( J, K+2 ) - REFSUM*T2
+                     Z( J, K+3 ) = Z( J, K+3 ) - REFSUM*T3
   130             CONTINUE
   140          CONTINUE
             END IF
diff --git a/SRC/dlaqsb.f b/SRC/dlaqsb.f
index 3ea4aa8be7..a433c4f4b5 100644
--- a/SRC/dlaqsb.f
+++ b/SRC/dlaqsb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQSB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqsb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqsb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,10 +131,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup laqhb
 *
 *  =====================================================================
-      SUBROUTINE DLAQSB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX, EQUED )
+      SUBROUTINE DLAQSB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX,
+     $                   EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlaqsp.f b/SRC/dlaqsp.f
index dcd122e49d..cdeabb491a 100644
--- a/SRC/dlaqsp.f
+++ b/SRC/dlaqsp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQSP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqsp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqsp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -118,10 +116,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup laqhp
 *
 *  =====================================================================
       SUBROUTINE DLAQSP( UPLO, N, AP, S, SCOND, AMAX, EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlaqsy.f b/SRC/dlaqsy.f
index cc708180ac..c02b783049 100644
--- a/SRC/dlaqsy.f
+++ b/SRC/dlaqsy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQSY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqsy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqsy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -126,10 +124,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYauxiliary
+*> \ingroup laqhe
 *
 *  =====================================================================
       SUBROUTINE DLAQSY( UPLO, N, A, LDA, S, SCOND, AMAX, EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlaqtr.f b/SRC/dlaqtr.f
index cc901d65f8..a08c23fe0d 100644
--- a/SRC/dlaqtr.f
+++ b/SRC/dlaqtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -157,11 +155,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup laqtr
 *
 *  =====================================================================
-      SUBROUTINE DLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X, WORK,
+      SUBROUTINE DLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X,
+     $                   WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -314,7 +314,8 @@ SUBROUTINE DLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X, WORK,
                      END IF
                   END IF
                   IF( J1.GT.1 ) THEN
-                     CALL DAXPY( J1-1, -X( J1 ), T( 1, J1 ), 1, X, 1 )
+                     CALL DAXPY( J1-1, -X( J1 ), T( 1, J1 ), 1, X,
+     $                           1 )
                      K = IDAMAX( J1-1, X, 1 )
                      XMAX = ABS( X( K ) )
                   END IF
@@ -357,8 +358,10 @@ SUBROUTINE DLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X, WORK,
 *                 Update right-hand side
 *
                   IF( J1.GT.1 ) THEN
-                     CALL DAXPY( J1-1, -X( J1 ), T( 1, J1 ), 1, X, 1 )
-                     CALL DAXPY( J1-1, -X( J2 ), T( 1, J2 ), 1, X, 1 )
+                     CALL DAXPY( J1-1, -X( J1 ), T( 1, J1 ), 1, X,
+     $                           1 )
+                     CALL DAXPY( J1-1, -X( J2 ), T( 1, J2 ), 1, X,
+     $                           1 )
                      K = IDAMAX( J1-1, X, 1 )
                      XMAX = ABS( X( K ) )
                   END IF
@@ -402,7 +405,8 @@ SUBROUTINE DLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X, WORK,
                      END IF
                   END IF
 *
-                  X( J1 ) = X( J1 ) - DDOT( J1-1, T( 1, J1 ), 1, X, 1 )
+                  X( J1 ) = X( J1 ) - DDOT( J1-1, T( 1, J1 ), 1, X,
+     $               1 )
 *
                   XJ = ABS( X( J1 ) )
                   TJJ = ABS( T( J1, J1 ) )
@@ -532,7 +536,8 @@ SUBROUTINE DLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X, WORK,
                   END IF
 *
                   IF( J1.GT.1 ) THEN
-                     CALL DAXPY( J1-1, -X( J1 ), T( 1, J1 ), 1, X, 1 )
+                     CALL DAXPY( J1-1, -X( J1 ), T( 1, J1 ), 1, X,
+     $                           1 )
                      CALL DAXPY( J1-1, -X( N+J1 ), T( 1, J1 ), 1,
      $                           X( N+1 ), 1 )
 *
@@ -554,7 +559,8 @@ SUBROUTINE DLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X, WORK,
                   D( 2, 1 ) = X( J2 )
                   D( 1, 2 ) = X( N+J1 )
                   D( 2, 2 ) = X( N+J2 )
-                  CALL DLALN2( .FALSE., 2, 2, SMINW, ONE, T( J1, J1 ),
+                  CALL DLALN2( .FALSE., 2, 2, SMINW, ONE, T( J1,
+     $                         J1 ),
      $                         LDT, ONE, ONE, D, 2, ZERO, -W, V, 2,
      $                         SCALOC, XNORM, IERR )
                   IF( IERR.NE.0 )
@@ -586,8 +592,10 @@ SUBROUTINE DLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X, WORK,
 *                 Update the right-hand side.
 *
                   IF( J1.GT.1 ) THEN
-                     CALL DAXPY( J1-1, -X( J1 ), T( 1, J1 ), 1, X, 1 )
-                     CALL DAXPY( J1-1, -X( J2 ), T( 1, J2 ), 1, X, 1 )
+                     CALL DAXPY( J1-1, -X( J1 ), T( 1, J1 ), 1, X,
+     $                           1 )
+                     CALL DAXPY( J1-1, -X( J2 ), T( 1, J2 ), 1, X,
+     $                           1 )
 *
                      CALL DAXPY( J1-1, -X( N+J1 ), T( 1, J1 ), 1,
      $                           X( N+1 ), 1 )
@@ -644,7 +652,8 @@ SUBROUTINE DLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X, WORK,
                      END IF
                   END IF
 *
-                  X( J1 ) = X( J1 ) - DDOT( J1-1, T( 1, J1 ), 1, X, 1 )
+                  X( J1 ) = X( J1 ) - DDOT( J1-1, T( 1, J1 ), 1, X,
+     $               1 )
                   X( N+J1 ) = X( N+J1 ) - DDOT( J1-1, T( 1, J1 ), 1,
      $                        X( N+1 ), 1 )
                   IF( J1.GT.1 ) THEN
diff --git a/SRC/dlaqz0.f b/SRC/dlaqz0.f
index 1bf65fd601..ab6ccf22b8 100644
--- a/SRC/dlaqz0.f
+++ b/SRC/dlaqz0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQZ0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqz0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqz0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,7 +100,7 @@
 *>      Anal., 29(2006), pp. 199--227.
 *>
 *> Ref: T. Steel, D. Camps, K. Meerbergen, R. Vandebril "A multishift,
-*>      multipole rational QZ method with agressive early deflation"
+*>      multipole rational QZ method with aggressive early deflation"
 *> \endverbatim
 *
 *  Arguments:
@@ -296,10 +294,11 @@
 *
 *> \date May 2020
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup laqz0
 *>
 *  =====================================================================
-      RECURSIVE SUBROUTINE DLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
+      RECURSIVE SUBROUTINE DLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI,
+     $                             A,
      $                             LDA, B, LDB, ALPHAR, ALPHAI, BETA,
      $                             Q, LDQ, Z, LDZ, WORK, LWORK, REC,
      $                             INFO )
@@ -322,7 +321,7 @@ RECURSIVE SUBROUTINE DLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 
 *     Local scalars
       DOUBLE PRECISION :: SMLNUM, ULP, ESHIFT, SAFMIN, SAFMAX, C1, S1,
-     $                    TEMP, SWAP
+     $                    TEMP, SWAP, BNORM, BTOL
       INTEGER :: ISTART, ISTOP, IITER, MAXIT, ISTART2, K, LD, NSHIFTS,
      $           NBLOCK, NW, NMIN, NIBBLE, N_UNDEFLATED, N_DEFLATED,
      $           NS, SWEEP_INFO, SHIFTPOS, LWORKREQ, K2, ISTARTM,
@@ -332,9 +331,9 @@ RECURSIVE SUBROUTINE DLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
       CHARACTER :: JBCMPZ*3
 
 *     External Functions
-      EXTERNAL :: XERBLA, DHGEQZ, DLASET, DLAQZ3, DLAQZ4, DLABAD,
+      EXTERNAL :: XERBLA, DHGEQZ, DLASET, DLAQZ3, DLAQZ4,
      $            DLARTG, DROT
-      DOUBLE PRECISION, EXTERNAL :: DLAMCH
+      DOUBLE PRECISION, EXTERNAL :: DLAMCH, DLANHS
       LOGICAL, EXTERNAL :: LSAME
       INTEGER, EXTERNAL :: ILAENV
 
@@ -439,7 +438,8 @@ RECURSIVE SUBROUTINE DLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
       NBR = NSR+ITEMP1
 
       IF( N .LT. NMIN .OR. REC .GE. 2 ) THEN
-         CALL DHGEQZ( WANTS, WANTQ, WANTZ, N, ILO, IHI, A, LDA, B, LDB,
+         CALL DHGEQZ( WANTS, WANTQ, WANTZ, N, ILO, IHI, A, LDA, B,
+     $                LDB,
      $                ALPHAR, ALPHAI, BETA, Q, LDQ, Z, LDZ, WORK,
      $                LWORK, INFO )
          RETURN
@@ -451,7 +451,8 @@ RECURSIVE SUBROUTINE DLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 
 *     Workspace query to dlaqz3
       NW = MAX( NWR, NMIN )
-      CALL DLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW, A, LDA, B, LDB,
+      CALL DLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW, A, LDA, B,
+     $             LDB,
      $             Q, LDQ, Z, LDZ, N_UNDEFLATED, N_DEFLATED, ALPHAR,
      $             ALPHAI, BETA, WORK, NW, WORK, NW, WORK, -1, REC,
      $             AED_INFO )
@@ -476,16 +477,20 @@ RECURSIVE SUBROUTINE DLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 *
 *     Initialize Q and Z
 *
-      IF( IWANTQ.EQ.3 ) CALL DLASET( 'FULL', N, N, ZERO, ONE, Q, LDQ )
-      IF( IWANTZ.EQ.3 ) CALL DLASET( 'FULL', N, N, ZERO, ONE, Z, LDZ )
+      IF( IWANTQ.EQ.3 ) CALL DLASET( 'FULL', N, N, ZERO, ONE, Q,
+     $    LDQ )
+      IF( IWANTZ.EQ.3 ) CALL DLASET( 'FULL', N, N, ZERO, ONE, Z,
+     $    LDZ )
 
 *     Get machine constants
       SAFMIN = DLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE/SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULP = DLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( DBLE( N )/ULP )
 
+      BNORM = DLANHS( 'F', IHI-ILO+1, B( ILO, ILO ), LDB, WORK )
+      BTOL = MAX( SAFMIN, ULP*BNORM )
+
       ISTART = ILO
       ISTOP = IHI
       MAXIT = 3*( IHI-ILO+1 )
@@ -562,30 +567,26 @@ RECURSIVE SUBROUTINE DLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 *        slow down the method when many infinite eigenvalues are present
          K = ISTOP
          DO WHILE ( K.GE.ISTART2 )
-            TEMP = ZERO
-            IF( K .LT. ISTOP ) THEN
-               TEMP = TEMP+ABS( B( K, K+1 ) )
-            END IF
-            IF( K .GT. ISTART2 ) THEN
-               TEMP = TEMP+ABS( B( K-1, K ) )
-            END IF
 
-            IF( ABS( B( K, K ) ) .LT. MAX( SMLNUM, ULP*TEMP ) ) THEN
-*              A diagonal element of B is negligable, move it
+            IF( ABS( B( K, K ) ) .LT. BTOL ) THEN
+*              A diagonal element of B is negligible, move it
 *              to the top and deflate it
                
                DO K2 = K, ISTART2+1, -1
-                  CALL DLARTG( B( K2-1, K2 ), B( K2-1, K2-1 ), C1, S1,
+                  CALL DLARTG( B( K2-1, K2 ), B( K2-1, K2-1 ), C1,
+     $                         S1,
      $                         TEMP )
                   B( K2-1, K2 ) = TEMP
                   B( K2-1, K2-1 ) = ZERO
 
                   CALL DROT( K2-2-ISTARTM+1, B( ISTARTM, K2 ), 1,
      $                       B( ISTARTM, K2-1 ), 1, C1, S1 )
-                  CALL DROT( MIN( K2+1, ISTOP )-ISTARTM+1, A( ISTARTM,
+                  CALL DROT( MIN( K2+1, ISTOP )-ISTARTM+1,
+     $                       A( ISTARTM,
      $                       K2 ), 1, A( ISTARTM, K2-1 ), 1, C1, S1 )
                   IF ( ILZ ) THEN
-                     CALL DROT( N, Z( 1, K2 ), 1, Z( 1, K2-1 ), 1, C1,
+                     CALL DROT( N, Z( 1, K2 ), 1, Z( 1, K2-1 ), 1,
+     $                          C1,
      $                          S1 )
                   END IF
 
@@ -595,9 +596,11 @@ RECURSIVE SUBROUTINE DLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
                      A( K2, K2-1 ) = TEMP
                      A( K2+1, K2-1 ) = ZERO
 
-                     CALL DROT( ISTOPM-K2+1, A( K2, K2 ), LDA, A( K2+1,
+                     CALL DROT( ISTOPM-K2+1, A( K2, K2 ), LDA,
+     $                          A( K2+1,
      $                          K2 ), LDA, C1, S1 )
-                     CALL DROT( ISTOPM-K2+1, B( K2, K2 ), LDB, B( K2+1,
+                     CALL DROT( ISTOPM-K2+1, B( K2, K2 ), LDB,
+     $                          B( K2+1,
      $                          K2 ), LDB, C1, S1 )
                      IF( ILQ ) THEN
                         CALL DROT( N, Q( 1, K2 ), 1, Q( 1, K2+1 ), 1,
@@ -659,7 +662,8 @@ RECURSIVE SUBROUTINE DLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 *
 *        Time for AED
 *
-         CALL DLAQZ3( ILSCHUR, ILQ, ILZ, N, ISTART2, ISTOP, NW, A, LDA,
+         CALL DLAQZ3( ILSCHUR, ILQ, ILZ, N, ISTART2, ISTOP, NW, A,
+     $                LDA,
      $                B, LDB, Q, LDQ, Z, LDZ, N_UNDEFLATED, N_DEFLATED,
      $                ALPHAR, ALPHAI, BETA, WORK, NW, WORK( NW**2+1 ),
      $                NW, WORK( 2*NW**2+1 ), LWORK-2*NW**2, REC,
@@ -682,7 +686,7 @@ RECURSIVE SUBROUTINE DLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 
          NS = MIN( NSHIFTS, ISTOP-ISTART2 )
          NS = MIN( NS, N_UNDEFLATED )
-         SHIFTPOS = ISTOP-N_DEFLATED-N_UNDEFLATED+1
+         SHIFTPOS = ISTOP-N_UNDEFLATED+1
 *
 *        Shuffle shifts to put double shifts in front
 *        This ensures that we don't split up a double shift
@@ -729,7 +733,8 @@ RECURSIVE SUBROUTINE DLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 *
 *        Time for a QZ sweep
 *
-         CALL DLAQZ4( ILSCHUR, ILQ, ILZ, N, ISTART2, ISTOP, NS, NBLOCK,
+         CALL DLAQZ4( ILSCHUR, ILQ, ILZ, N, ISTART2, ISTOP, NS,
+     $                NBLOCK,
      $                ALPHAR( SHIFTPOS ), ALPHAI( SHIFTPOS ),
      $                BETA( SHIFTPOS ), A, LDA, B, LDB, Q, LDQ, Z, LDZ,
      $                WORK, NBLOCK, WORK( NBLOCK**2+1 ), NBLOCK,
diff --git a/SRC/dlaqz1.f b/SRC/dlaqz1.f
index b7a53ea376..daa62d0f3e 100644
--- a/SRC/dlaqz1.f
+++ b/SRC/dlaqz1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQZ1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqz1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqz1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,7 +117,7 @@
 *
 *> \date May 2020
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup laqz1
 *>
 *  =====================================================================
       SUBROUTINE DLAQZ1( A, LDA, B, LDB, SR1, SR2, SI, BETA1, BETA2,
diff --git a/SRC/dlaqz2.f b/SRC/dlaqz2.f
index 806e0c2530..fd47e3d67d 100644
--- a/SRC/dlaqz2.f
+++ b/SRC/dlaqz2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQZ2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqz2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqz2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -166,10 +164,11 @@
 *
 *> \date May 2020
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup laqz2
 *>
 *  =====================================================================
-      SUBROUTINE DLAQZ2( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
+      SUBROUTINE DLAQZ2( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA,
+     $                   B,
      $                   LDB, NQ, QSTART, Q, LDQ, NZ, ZSTART, Z, LDZ )
       IMPLICIT NONE
 *
@@ -205,16 +204,19 @@ SUBROUTINE DLAQZ2( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
 *
          CALL DROT( IHI-ISTARTM+1, B( ISTARTM, IHI ), 1, B( ISTARTM,
      $              IHI-1 ), 1, C1, S1 )
-         CALL DROT( IHI-ISTARTM+1, B( ISTARTM, IHI-1 ), 1, B( ISTARTM,
+         CALL DROT( IHI-ISTARTM+1, B( ISTARTM, IHI-1 ), 1,
+     $              B( ISTARTM,
      $              IHI-2 ), 1, C2, S2 )
          B( IHI-1, IHI-2 ) = ZERO
          B( IHI, IHI-2 ) = ZERO
          CALL DROT( IHI-ISTARTM+1, A( ISTARTM, IHI ), 1, A( ISTARTM,
      $              IHI-1 ), 1, C1, S1 )
-         CALL DROT( IHI-ISTARTM+1, A( ISTARTM, IHI-1 ), 1, A( ISTARTM,
+         CALL DROT( IHI-ISTARTM+1, A( ISTARTM, IHI-1 ), 1,
+     $              A( ISTARTM,
      $              IHI-2 ), 1, C2, S2 )
          IF ( ILZ ) THEN
-            CALL DROT( NZ, Z( 1, IHI-ZSTART+1 ), 1, Z( 1, IHI-1-ZSTART+
+            CALL DROT( NZ, Z( 1, IHI-ZSTART+1 ), 1, Z( 1,
+     $                 IHI-1-ZSTART+
      $                 1 ), 1, C1, S1 )
             CALL DROT( NZ, Z( 1, IHI-1-ZSTART+1 ), 1, Z( 1,
      $                 IHI-2-ZSTART+1 ), 1, C2, S2 )
@@ -229,7 +231,8 @@ SUBROUTINE DLAQZ2( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
          CALL DROT( ISTOPM-IHI+2, B( IHI-1, IHI-1 ), LDB, B( IHI,
      $              IHI-1 ), LDB, C1, S1 )
          IF ( ILQ ) THEN
-            CALL DROT( NQ, Q( 1, IHI-1-QSTART+1 ), 1, Q( 1, IHI-QSTART+
+            CALL DROT( NQ, Q( 1, IHI-1-QSTART+1 ), 1, Q( 1,
+     $                 IHI-QSTART+
      $                 1 ), 1, C1, S1 )
          END IF
 *
@@ -241,7 +244,8 @@ SUBROUTINE DLAQZ2( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
          CALL DROT( IHI-ISTARTM+1, A( ISTARTM, IHI ), 1, A( ISTARTM,
      $              IHI-1 ), 1, C1, S1 )
          IF ( ILZ ) THEN
-            CALL DROT( NZ, Z( 1, IHI-ZSTART+1 ), 1, Z( 1, IHI-1-ZSTART+
+            CALL DROT( NZ, Z( 1, IHI-ZSTART+1 ), 1, Z( 1,
+     $                 IHI-1-ZSTART+
      $                 1 ), 1, C1, S1 )
          END IF
 *
@@ -277,7 +281,8 @@ SUBROUTINE DLAQZ2( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
          IF ( ILZ ) THEN
             CALL DROT( NZ, Z( 1, K+2-ZSTART+1 ), 1, Z( 1, K+1-ZSTART+
      $                 1 ), 1, C1, S1 )
-            CALL DROT( NZ, Z( 1, K+1-ZSTART+1 ), 1, Z( 1, K-ZSTART+1 ),
+            CALL DROT( NZ, Z( 1, K+1-ZSTART+1 ), 1, Z( 1,
+     $                 K-ZSTART+1 ),
      $                 1, C2, S2 )
          END IF
          B( K+1, K ) = ZERO
diff --git a/SRC/dlaqz3.f b/SRC/dlaqz3.f
index e85bf0bb77..9f6829b285 100644
--- a/SRC/dlaqz3.f
+++ b/SRC/dlaqz3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQZ3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqz3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqz3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -229,10 +227,11 @@
 *
 *> \date May 2020
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup laqz3
 *>
 *  =====================================================================
-      RECURSIVE SUBROUTINE DLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
+      RECURSIVE SUBROUTINE DLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI,
+     $                             NW,
      $                             A, LDA, B, LDB, Q, LDQ, Z, LDZ, NS,
      $                             ND, ALPHAR, ALPHAI, BETA, QC, LDQC,
      $                             ZC, LDZC, WORK, LWORK, REC, INFO )
@@ -260,7 +259,7 @@ RECURSIVE SUBROUTINE DLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
       DOUBLE PRECISION :: S, SMLNUM, ULP, SAFMIN, SAFMAX, C1, S1, TEMP
 
 *     External Functions
-      EXTERNAL :: XERBLA, DTGEXC, DLABAD, DLAQZ0, DLACPY, DLASET,
+      EXTERNAL :: XERBLA, DTGEXC, DLAQZ0, DLACPY, DLASET,
      $            DLAQZ2, DROT, DLARTG, DLAG2, DGEMM
       DOUBLE PRECISION, EXTERNAL :: DLAMCH
 
@@ -302,7 +301,6 @@ RECURSIVE SUBROUTINE DLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
 *     Get machine constants
       SAFMIN = DLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE/SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULP = DLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( DBLE( N )/ULP )
 
@@ -326,7 +324,8 @@ RECURSIVE SUBROUTINE DLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
 
 *     Store window in case of convergence failure
       CALL DLACPY( 'ALL', JW, JW, A( KWTOP, KWTOP ), LDA, WORK, JW )
-      CALL DLACPY( 'ALL', JW, JW, B( KWTOP, KWTOP ), LDB, WORK( JW**2+
+      CALL DLACPY( 'ALL', JW, JW, B( KWTOP, KWTOP ), LDB,
+     $             WORK( JW**2+
      $             1 ), JW )
 
 *     Transform window to real schur form
@@ -341,7 +340,8 @@ RECURSIVE SUBROUTINE DLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
 *        Convergence failure, restore the window and exit
          ND = 0
          NS = JW-QZ_SMALL_INFO
-         CALL DLACPY( 'ALL', JW, JW, WORK, JW, A( KWTOP, KWTOP ), LDA )
+         CALL DLACPY( 'ALL', JW, JW, WORK, JW, A( KWTOP, KWTOP ),
+     $                LDA )
          CALL DLACPY( 'ALL', JW, JW, WORK( JW**2+1 ), JW, B( KWTOP,
      $                KWTOP ), LDB )
          RETURN
@@ -448,11 +448,14 @@ RECURSIVE SUBROUTINE DLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
             A( K, KWTOP-1 ) = TEMP
             A( K+1, KWTOP-1 ) = ZERO
             K2 = MAX( KWTOP, K-1 )
-            CALL DROT( IHI-K2+1, A( K, K2 ), LDA, A( K+1, K2 ), LDA, C1,
+            CALL DROT( IHI-K2+1, A( K, K2 ), LDA, A( K+1, K2 ), LDA,
+     $                 C1,
      $                 S1 )
-            CALL DROT( IHI-( K-1 )+1, B( K, K-1 ), LDB, B( K+1, K-1 ),
+            CALL DROT( IHI-( K-1 )+1, B( K, K-1 ), LDB, B( K+1,
+     $                 K-1 ),
      $                 LDB, C1, S1 )
-            CALL DROT( JW, QC( 1, K-KWTOP+1 ), 1, QC( 1, K+1-KWTOP+1 ),
+            CALL DROT( JW, QC( 1, K-KWTOP+1 ), 1, QC( 1,
+     $                 K+1-KWTOP+1 ),
      $                 1, C1, S1 )
          END DO
 
@@ -477,7 +480,8 @@ RECURSIVE SUBROUTINE DLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
                DO K2 = K, KWBOT-2
 
 *                 Move shift down
-                  CALL DLARTG( B( K2+1, K2+1 ), B( K2+1, K2 ), C1, S1,
+                  CALL DLARTG( B( K2+1, K2+1 ), B( K2+1, K2 ), C1,
+     $                         S1,
      $                         TEMP )
                   B( K2+1, K2+1 ) = TEMP
                   B( K2+1, K2 ) = ZERO
@@ -492,9 +496,11 @@ RECURSIVE SUBROUTINE DLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
      $                         TEMP )
                   A( K2+1, K2 ) = TEMP
                   A( K2+2, K2 ) = ZERO
-                  CALL DROT( ISTOPM-K2, A( K2+1, K2+1 ), LDA, A( K2+2,
+                  CALL DROT( ISTOPM-K2, A( K2+1, K2+1 ), LDA,
+     $                       A( K2+2,
      $                       K2+1 ), LDA, C1, S1 )
-                  CALL DROT( ISTOPM-K2, B( K2+1, K2+1 ), LDB, B( K2+2,
+                  CALL DROT( ISTOPM-K2, B( K2+1, K2+1 ), LDB,
+     $                       B( K2+2,
      $                       K2+1 ), LDB, C1, S1 )
                   CALL DROT( JW, QC( 1, K2+1-KWTOP+1 ), 1, QC( 1,
      $                       K2+2-KWTOP+1 ), 1, C1, S1 )
@@ -502,7 +508,8 @@ RECURSIVE SUBROUTINE DLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
                END DO
 
 *              Remove the shift
-               CALL DLARTG( B( KWBOT, KWBOT ), B( KWBOT, KWBOT-1 ), C1,
+               CALL DLARTG( B( KWBOT, KWBOT ), B( KWBOT, KWBOT-1 ),
+     $                      C1,
      $                      S1, TEMP )
                B( KWBOT, KWBOT ) = TEMP
                B( KWBOT, KWBOT-1 ) = ZERO
@@ -539,25 +546,29 @@ RECURSIVE SUBROUTINE DLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
      $                IHI+1 ), LDB )
       END IF
       IF ( ILQ ) THEN
-         CALL DGEMM( 'N', 'N', N, JW, JW, ONE, Q( 1, KWTOP ), LDQ, QC,
+         CALL DGEMM( 'N', 'N', N, JW, JW, ONE, Q( 1, KWTOP ), LDQ,
+     $               QC,
      $               LDQC, ZERO, WORK, N )
          CALL DLACPY( 'ALL', N, JW, WORK, N, Q( 1, KWTOP ), LDQ )
       END IF
 
       IF ( KWTOP-1-ISTARTM+1 > 0 ) THEN
-         CALL DGEMM( 'N', 'N', KWTOP-ISTARTM, JW, JW, ONE, A( ISTARTM,
+         CALL DGEMM( 'N', 'N', KWTOP-ISTARTM, JW, JW, ONE,
+     $               A( ISTARTM,
      $               KWTOP ), LDA, ZC, LDZC, ZERO, WORK,
      $               KWTOP-ISTARTM )
          CALL DLACPY( 'ALL', KWTOP-ISTARTM, JW, WORK, KWTOP-ISTARTM,
      $                A( ISTARTM, KWTOP ), LDA )
-         CALL DGEMM( 'N', 'N', KWTOP-ISTARTM, JW, JW, ONE, B( ISTARTM,
+         CALL DGEMM( 'N', 'N', KWTOP-ISTARTM, JW, JW, ONE,
+     $               B( ISTARTM,
      $               KWTOP ), LDB, ZC, LDZC, ZERO, WORK,
      $               KWTOP-ISTARTM )
          CALL DLACPY( 'ALL', KWTOP-ISTARTM, JW, WORK, KWTOP-ISTARTM,
      $                B( ISTARTM, KWTOP ), LDB )
       END IF
       IF ( ILZ ) THEN
-         CALL DGEMM( 'N', 'N', N, JW, JW, ONE, Z( 1, KWTOP ), LDZ, ZC,
+         CALL DGEMM( 'N', 'N', N, JW, JW, ONE, Z( 1, KWTOP ), LDZ,
+     $               ZC,
      $               LDZC, ZERO, WORK, N )
          CALL DLACPY( 'ALL', N, JW, WORK, N, Z( 1, KWTOP ), LDZ )
       END IF
diff --git a/SRC/dlaqz4.f b/SRC/dlaqz4.f
index 1848727751..ad5680cc9b 100644
--- a/SRC/dlaqz4.f
+++ b/SRC/dlaqz4.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAQZ4 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaqz4.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaqz4.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -203,7 +201,7 @@
 *
 *> \date May 2020
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup laqz4
 *>
 *  =====================================================================
       SUBROUTINE DLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
@@ -315,18 +313,21 @@ SUBROUTINE DLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
 
       DO I = 1, NS, 2
 *        Introduce the shift
-         CALL DLAQZ1( A( ILO, ILO ), LDA, B( ILO, ILO ), LDB, SR( I ),
+         CALL DLAQZ1( A( ILO, ILO ), LDA, B( ILO, ILO ), LDB,
+     $                SR( I ),
      $                SR( I+1 ), SI( I ), SS( I ), SS( I+1 ), V )
 
          TEMP = V( 2 )
          CALL DLARTG( TEMP, V( 3 ), C1, S1, V( 2 ) )
          CALL DLARTG( V( 1 ), V( 2 ), C2, S2, TEMP )
 
-         CALL DROT( NS, A( ILO+1, ILO ), LDA, A( ILO+2, ILO ), LDA, C1,
+         CALL DROT( NS, A( ILO+1, ILO ), LDA, A( ILO+2, ILO ), LDA,
+     $              C1,
      $              S1 )
          CALL DROT( NS, A( ILO, ILO ), LDA, A( ILO+1, ILO ), LDA, C2,
      $              S2 )
-         CALL DROT( NS, B( ILO+1, ILO ), LDB, B( ILO+2, ILO ), LDB, C1,
+         CALL DROT( NS, B( ILO+1, ILO ), LDB, B( ILO+2, ILO ), LDB,
+     $              C1,
      $              S1 )
          CALL DROT( NS, B( ILO, ILO ), LDB, B( ILO+1, ILO ), LDB, C2,
      $              S2 )
@@ -351,11 +352,13 @@ SUBROUTINE DLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       SHEIGHT = NS+1
       SWIDTH = ISTOPM-( ILO+NS )+1
       IF ( SWIDTH > 0 ) THEN
-         CALL DGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC, LDQC,
+         CALL DGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC,
+     $               LDQC,
      $               A( ILO, ILO+NS ), LDA, ZERO, WORK, SHEIGHT )
          CALL DLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, A( ILO,
      $                ILO+NS ), LDA )
-         CALL DGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC, LDQC,
+         CALL DGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC,
+     $               LDQC,
      $               B( ILO, ILO+NS ), LDB, ZERO, WORK, SHEIGHT )
          CALL DLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, B( ILO,
      $                ILO+NS ), LDB )
@@ -371,17 +374,22 @@ SUBROUTINE DLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       SHEIGHT = ILO-1-ISTARTM+1
       SWIDTH = NS
       IF ( SHEIGHT > 0 ) THEN
-         CALL DGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, ONE, A( ISTARTM,
+         CALL DGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, ONE,
+     $               A( ISTARTM,
      $               ILO ), LDA, ZC, LDZC, ZERO, WORK, SHEIGHT )
-         CALL DLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, A( ISTARTM,
+         CALL DLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                A( ISTARTM,
      $                ILO ), LDA )
-         CALL DGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, ONE, B( ISTARTM,
+         CALL DGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, ONE,
+     $               B( ISTARTM,
      $               ILO ), LDB, ZC, LDZC, ZERO, WORK, SHEIGHT )
-         CALL DLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, B( ISTARTM,
+         CALL DLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                B( ISTARTM,
      $                ILO ), LDB )
       END IF
       IF ( ILZ ) THEN
-         CALL DGEMM( 'N', 'N', N, SWIDTH, SWIDTH, ONE, Z( 1, ILO ), LDZ,
+         CALL DGEMM( 'N', 'N', N, SWIDTH, SWIDTH, ONE, Z( 1, ILO ),
+     $               LDZ,
      $               ZC, LDZC, ZERO, WORK, N )
          CALL DLACPY( 'ALL', N, SWIDTH, WORK, N, Z( 1, ILO ), LDZ )
       END IF
@@ -426,18 +434,22 @@ SUBROUTINE DLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
             CALL DGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC,
      $                  LDQC, A( K+1, K+NS+NP ), LDA, ZERO, WORK,
      $                  SHEIGHT )
-            CALL DLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, A( K+1,
+            CALL DLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                   A( K+1,
      $                   K+NS+NP ), LDA )
             CALL DGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC,
      $                  LDQC, B( K+1, K+NS+NP ), LDB, ZERO, WORK,
      $                  SHEIGHT )
-            CALL DLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, B( K+1,
+            CALL DLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                   B( K+1,
      $                   K+NS+NP ), LDB )
          END IF
          IF ( ILQ ) THEN
-            CALL DGEMM( 'N', 'N', N, NBLOCK, NBLOCK, ONE, Q( 1, K+1 ),
+            CALL DGEMM( 'N', 'N', N, NBLOCK, NBLOCK, ONE, Q( 1,
+     $                  K+1 ),
      $                  LDQ, QC, LDQC, ZERO, WORK, N )
-            CALL DLACPY( 'ALL', N, NBLOCK, WORK, N, Q( 1, K+1 ), LDQ )
+            CALL DLACPY( 'ALL', N, NBLOCK, WORK, N, Q( 1, K+1 ),
+     $                   LDQ )
          END IF
 
 *        Update A(istartm:k,k:k+ns+npos-1) and B(istartm:k,k:k+ns+npos-1)
@@ -480,7 +492,8 @@ SUBROUTINE DLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       DO I = 1, NS, 2
 *        Chase the shift down to the bottom right corner
          DO ISHIFT = IHI-I-1, IHI-2
-            CALL DLAQZ2( .TRUE., .TRUE., ISHIFT, ISTARTB, ISTOPB, IHI,
+            CALL DLAQZ2( .TRUE., .TRUE., ISHIFT, ISTARTB, ISTOPB,
+     $                   IHI,
      $                   A, LDA, B, LDB, NS, IHI-NS+1, QC, LDQC, NS+1,
      $                   IHI-NS, ZC, LDZC )
          END DO
@@ -494,11 +507,13 @@ SUBROUTINE DLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       SHEIGHT = NS
       SWIDTH = ISTOPM-( IHI+1 )+1
       IF ( SWIDTH > 0 ) THEN
-         CALL DGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC, LDQC,
+         CALL DGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC,
+     $               LDQC,
      $               A( IHI-NS+1, IHI+1 ), LDA, ZERO, WORK, SHEIGHT )
          CALL DLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
      $                A( IHI-NS+1, IHI+1 ), LDA )
-         CALL DGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC, LDQC,
+         CALL DGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC,
+     $               LDQC,
      $               B( IHI-NS+1, IHI+1 ), LDB, ZERO, WORK, SHEIGHT )
          CALL DLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
      $                B( IHI-NS+1, IHI+1 ), LDB )
@@ -514,17 +529,22 @@ SUBROUTINE DLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       SHEIGHT = IHI-NS-ISTARTM+1
       SWIDTH = NS+1
       IF ( SHEIGHT > 0 ) THEN
-         CALL DGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, ONE, A( ISTARTM,
+         CALL DGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, ONE,
+     $               A( ISTARTM,
      $               IHI-NS ), LDA, ZC, LDZC, ZERO, WORK, SHEIGHT )
-         CALL DLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, A( ISTARTM,
+         CALL DLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                A( ISTARTM,
      $                IHI-NS ), LDA )
-         CALL DGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, ONE, B( ISTARTM,
+         CALL DGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, ONE,
+     $               B( ISTARTM,
      $               IHI-NS ), LDB, ZC, LDZC, ZERO, WORK, SHEIGHT )
-         CALL DLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, B( ISTARTM,
+         CALL DLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                B( ISTARTM,
      $                IHI-NS ), LDB )
       END IF
       IF ( ILZ ) THEN
-         CALL DGEMM( 'N', 'N', N, NS+1, NS+1, ONE, Z( 1, IHI-NS ), LDZ,
+         CALL DGEMM( 'N', 'N', N, NS+1, NS+1, ONE, Z( 1, IHI-NS ),
+     $               LDZ,
      $               ZC, LDZC, ZERO, WORK, N )
          CALL DLACPY( 'ALL', N, NS+1, WORK, N, Z( 1, IHI-NS ), LDZ )
       END IF
diff --git a/SRC/dlar1v.f b/SRC/dlar1v.f
index df836c34db..cd585d2acc 100644
--- a/SRC/dlar1v.f
+++ b/SRC/dlar1v.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAR1V + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlar1v.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlar1v.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -212,7 +210,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lar1v
 *
 *> \par Contributors:
 *  ==================
@@ -227,6 +225,7 @@
       SUBROUTINE DLAR1V( N, B1, BN, LAMBDA, D, L, LD, LLD,
      $           PIVMIN, GAPTOL, Z, WANTNC, NEGCNT, ZTZ, MINGMA,
      $           R, ISUPPZ, NRMINV, RESID, RQCORR, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlar2v.f b/SRC/dlar2v.f
index c763e997ac..4055f1e4b3 100644
--- a/SRC/dlar2v.f
+++ b/SRC/dlar2v.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAR2V + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlar2v.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlar2v.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -103,10 +101,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lar2v
 *
 *  =====================================================================
       SUBROUTINE DLAR2V( N, X, Y, Z, INCX, C, S, INCC )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlarf.f b/SRC/dlarf.f
index ed21638645..b4075b5c62 100644
--- a/SRC/dlarf.f
+++ b/SRC/dlarf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,10 +115,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup larf
 *
 *  =====================================================================
       SUBROUTINE DLARF( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -194,7 +193,8 @@ SUBROUTINE DLARF( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
 *
 *           w(1:lastc,1) := C(1:lastv,1:lastc)**T * v(1:lastv,1)
 *
-            CALL DGEMV( 'Transpose', LASTV, LASTC, ONE, C, LDC, V, INCV,
+            CALL DGEMV( 'Transpose', LASTV, LASTC, ONE, C, LDC, V,
+     $                  INCV,
      $           ZERO, WORK, 1 )
 *
 *           C(1:lastv,1:lastc) := C(...) - v(1:lastv,1) * w(1:lastc,1)**T
diff --git a/SRC/dlarf1f.f b/SRC/dlarf1f.f
new file mode 100644
index 0000000000..c65035c61f
--- /dev/null
+++ b/SRC/dlarf1f.f
@@ -0,0 +1,291 @@
+*> \brief \b DLARF1F applies an elementary reflector to a general rectangular
+*              matrix assuming v(1) = 1.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download DLARF1F + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarf1f.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dlarf1f.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarf1f.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DLARF1F( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          SIDE
+*       INTEGER            INCV, LDC, M, N
+*       DOUBLE PRECISION   TAU
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   C( LDC, * ), V( * ), WORK( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> DLARF1F applies a real elementary reflector H to a real m by n matrix
+*> C, from either the left or the right. H is represented in the form
+*>
+*>       H = I - tau * v * v**T
+*>
+*> where tau is a real scalar and v is a real vector.
+*>
+*> If tau = 0, then H is taken to be the unit matrix.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'L': form  H * C
+*>          = 'R': form  C * H
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is DOUBLE PRECISION array, dimension
+*>                     (1 + (M-1)*abs(INCV)) if SIDE = 'L'
+*>                  or (1 + (N-1)*abs(INCV)) if SIDE = 'R'
+*>          The vector v in the representation of H. V is not used if
+*>          TAU = 0. V(1) is not referenced or modified.
+*> \endverbatim
+*>
+*> \param[in] INCV
+*> \verbatim
+*>          INCV is INTEGER
+*>          The increment between elements of v. INCV <> 0.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is DOUBLE PRECISION
+*>          The value tau in the representation of H.
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is DOUBLE PRECISION array, dimension (LDC,N)
+*>          On entry, the m by n matrix C.
+*>          On exit, C is overwritten by the matrix H * C if SIDE = 'L',
+*>          or C * H if SIDE = 'R'.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension
+*>                         (N) if SIDE = 'L'
+*>                      or (M) if SIDE = 'R'
+*> \endverbatim
+*
+*  To take advantage of the fact that v(1) = 1, we do the following
+*     v = [ 1 v_2 ]**T
+*     If SIDE='L'
+*           |-----|
+*           | C_1 |
+*        C =| C_2 |
+*           |-----|
+*        C_1\in\mathbb{R}^{1\times n}, C_2\in\mathbb{R}^{m-1\times n}
+*        So we compute:
+*        C = HC   = (I - \tau vv**T)C
+*                 = C - \tau vv**T C
+*        w = C**T v  = [ C_1**T C_2**T ] [ 1 v_2 ]**T
+*                    = C_1**T + C_2**T v ( DGEMM then DAXPY )
+*        C  = C - \tau vv**T C
+*           = C - \tau vw**T
+*        Giving us   C_1 = C_1 - \tau w**T ( DAXPY )
+*                 and
+*                    C_2 = C_2 - \tau v_2w**T ( DGER )
+*     If SIDE='R'
+*
+*        C = [ C_1 C_2 ]
+*        C_1\in\mathbb{R}^{m\times 1}, C_2\in\mathbb{R}^{m\times n-1}
+*        So we compute: 
+*        C = CH   = C(I - \tau vv**T)
+*                 = C - \tau Cvv**T
+*
+*        w = Cv   = [ C_1 C_2 ] [ 1 v_2 ]**T
+*                 = C_1 + C_2v_2 ( DGEMM then DAXPY )
+*        C  = C - \tau Cvv**T
+*           = C - \tau wv**T
+*        Giving us   C_1 = C_1 - \tau w ( DAXPY )
+*                 and
+*                    C_2 = C_2 - \tau wv_2**T ( DGER )
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup larf
+*
+*  =====================================================================
+      SUBROUTINE DLARF1F( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          SIDE
+      INTEGER            INCV, LDC, M, N
+      DOUBLE PRECISION   TAU
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   C( LDC, * ), V( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            APPLYLEFT
+      INTEGER            I, LASTV, LASTC
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DGEMV, DGER, DAXPY, DSCAL
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILADLR, ILADLC
+      EXTERNAL           LSAME, ILADLR, ILADLC
+*     ..
+*     .. Executable Statements ..
+*
+      APPLYLEFT = LSAME( SIDE, 'L' )
+      LASTV = 1
+      LASTC = 0
+      IF( TAU.NE.ZERO ) THEN
+!     Set up variables for scanning V.  LASTV begins pointing to the end
+!     of V.
+         IF( APPLYLEFT ) THEN
+            LASTV = M
+         ELSE
+            LASTV = N
+         END IF
+         IF( INCV.GT.0 ) THEN
+            I = 1 + (LASTV-1) * INCV
+         ELSE
+            I = 1
+         END IF
+!     Look for the last non-zero row in V.
+!        Since we are assuming that V(1) = 1, and it is not stored, so we
+!        shouldn't access it.
+         DO WHILE( LASTV.GT.1 .AND. V( I ).EQ.ZERO )
+            LASTV = LASTV - 1
+            I = I - INCV
+         END DO
+         IF( APPLYLEFT ) THEN
+!     Scan for the last non-zero column in C(1:lastv,:).
+            LASTC = ILADLC(LASTV, N, C, LDC)
+         ELSE
+!     Scan for the last non-zero row in C(:,1:lastv).
+            LASTC = ILADLR(M, LASTV, C, LDC)
+         END IF
+      END IF
+      IF( LASTC.EQ.0 ) THEN
+         RETURN
+      END IF
+      IF( APPLYLEFT ) THEN
+*
+*        Form  H * C
+*
+         ! Check if lastv = 1. This means v = 1, So we just need to compute
+         ! C := HC = (1-\tau)C.
+         IF( LASTV.EQ.1 ) THEN
+*
+*           C(1,1:lastc) := ( 1 - tau ) * C(1,1:lastc)
+*
+            CALL DSCAL(LASTC, ONE - TAU, C, LDC)
+         ELSE
+*
+*           w(1:lastc,1) := C(1:lastv,1:lastc)**T * v(1:lastv,1)
+*
+            ! w(1:lastc,1) := C(2:lastv,1:lastc)**T * v(2:lastv,1)
+            CALL DGEMV( 'Transpose', LASTV-1, LASTC, ONE, C(1+1,1),
+     $                  LDC, V(1+INCV), INCV, ZERO, WORK, 1)
+            ! w(1:lastc,1) += C(1,1:lastc)**T * v(1,1) = C(1,1:lastc)**T
+            CALL DAXPY(LASTC, ONE, C, LDC, WORK, 1)
+*
+*           C(1:lastv,1:lastc) := C(...) - tau * v(1:lastv,1) * w(1:lastc,1)**T
+*
+            ! C(1, 1:lastc)   := C(...) - tau * v(1,1) * w(1:lastc,1)**T
+            !                  = C(...) - tau * w(1:lastc,1)**T
+            CALL DAXPY(LASTC, -TAU, WORK, 1, C, LDC)
+            ! C(2:lastv,1:lastc) := C(...) - tau * v(2:lastv,1)*w(1:lastc,1)**T
+            CALL DGER(LASTV-1, LASTC, -TAU, V(1+INCV), INCV, WORK, 1,
+     $                  C(1+1,1), LDC)
+         END IF
+      ELSE
+*
+*        Form  C * H
+*
+         ! Check if n = 1. This means v = 1, so we just need to compute
+         ! C := CH = C(1-\tau).
+         IF( LASTV.EQ.1 ) THEN
+*
+*           C(1:lastc,1) := ( 1 - tau ) * C(1:lastc,1)
+*
+            CALL DSCAL(LASTC, ONE - TAU, C, 1)
+         ELSE
+*
+*           w(1:lastc,1) := C(1:lastc,1:lastv) * v(1:lastv,1)
+*
+            ! w(1:lastc,1) := C(1:lastc,2:lastv) * v(2:lastv,1)
+            CALL DGEMV( 'No transpose', LASTC, LASTV-1, ONE, 
+     $         C(1,1+1), LDC, V(1+INCV), INCV, ZERO, WORK, 1 )
+            ! w(1:lastc,1) += C(1:lastc,1) v(1,1) = C(1:lastc,1)
+            CALL DAXPY(LASTC, ONE, C, 1, WORK, 1)
+*
+*           C(1:lastc,1:lastv) := C(...) - tau * w(1:lastc,1) * v(1:lastv,1)**T
+*
+            ! C(1:lastc,1)     := C(...) - tau * w(1:lastc,1) * v(1,1)**T
+            !                   = C(...) - tau * w(1:lastc,1)
+            CALL DAXPY(LASTC, -TAU, WORK, 1, C, 1)
+            ! C(1:lastc,2:lastv) := C(...) - tau * w(1:lastc,1) * v(2:lastv)**T
+            CALL DGER( LASTC, LASTV-1, -TAU, WORK, 1, V(1+INCV),
+     $                  INCV, C(1,1+1), LDC )
+         END IF
+      END IF
+      RETURN
+*
+*     End of DLARF1F
+*
+      END
diff --git a/SRC/dlarf1l.f b/SRC/dlarf1l.f
new file mode 100644
index 0000000000..d225701fcd
--- /dev/null
+++ b/SRC/dlarf1l.f
@@ -0,0 +1,251 @@
+*> \brief \b DLARF1L applies an elementary reflector to a general rectangular
+*              matrix assuming v(lastv) = 1 where lastv is the last non-zero
+*              element
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download DLARF1L + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarf1l.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dlarf1l.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarf1l.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DLARF1L( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          SIDE
+*       INTEGER            INCV, LDC, M, N
+*       DOUBLE PRECISION   TAU
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   C( LDC, * ), V( * ), WORK( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> DLARF1L applies a real elementary reflector H to a real m by n matrix
+*> C, from either the left or the right. H is represented in the form
+*>
+*>       H = I - tau * v * v**T
+*>
+*> where tau is a real scalar and v is a real vector.
+*>
+*> If tau = 0, then H is taken to be the unit matrix.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'L': form  H * C
+*>          = 'R': form  C * H
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is DOUBLE PRECISION array, dimension
+*>                     (1 + (M-1)*abs(INCV)) if SIDE = 'L'
+*>                  or (1 + (N-1)*abs(INCV)) if SIDE = 'R'
+*>          The vector v in the representation of H. V is not used if
+*>          TAU = 0.
+*> \endverbatim
+*>
+*> \param[in] INCV
+*> \verbatim
+*>          INCV is INTEGER
+*>          The increment between elements of v. INCV <> 0.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is DOUBLE PRECISION
+*>          The value tau in the representation of H.
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is DOUBLE PRECISION array, dimension (LDC,N)
+*>          On entry, the m by n matrix C.
+*>          On exit, C is overwritten by the matrix H * C if SIDE = 'L',
+*>          or C * H if SIDE = 'R'.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension
+*>                         (N) if SIDE = 'L'
+*>                      or (M) if SIDE = 'R'
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup larf
+*
+*  =====================================================================
+      SUBROUTINE DLARF1L( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          SIDE
+      INTEGER            INCV, LDC, M, N
+      DOUBLE PRECISION   TAU
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   C( LDC, * ), V( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            APPLYLEFT
+      INTEGER            I, FIRSTV, LASTV, LASTC
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DAXPY, DGEMV, DGER, DSCAL
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILADLR, ILADLC
+      EXTERNAL           LSAME, ILADLR, ILADLC
+*     ..
+*     .. Executable Statements ..
+*
+      APPLYLEFT = LSAME( SIDE, 'L' )
+      FIRSTV = 1
+      LASTC = 0
+      IF( TAU.NE.ZERO ) THEN
+!     Set up variables for scanning V.  LASTV begins pointing to the end
+!     of V.
+         IF( APPLYLEFT ) THEN
+            LASTV = M
+         ELSE
+            LASTV = N
+         END IF
+         I = 1
+!     Look for the last non-zero row in V.
+         DO WHILE( LASTV.GT.FIRSTV .AND. V( I ).EQ.ZERO )
+            FIRSTV = FIRSTV + 1
+            I = I + INCV
+         END DO
+         IF( APPLYLEFT ) THEN
+!     Scan for the last non-zero column in C(1:lastv,:).
+            LASTC = ILADLC(LASTV, N, C, LDC)
+         ELSE
+!     Scan for the last non-zero row in C(:,1:lastv).
+            LASTC = ILADLR(M, LASTV, C, LDC)
+         END IF
+      END IF
+      IF( LASTC.EQ.0 ) THEN
+         RETURN
+      END IF
+      IF( APPLYLEFT ) THEN
+*
+*        Form  H * C
+*
+         IF( LASTV.GT.0 ) THEN
+            ! Check if m = 1. This means v = 1, So we just need to compute
+            ! C := HC = (1-\tau)C.
+            IF( LASTV.EQ.FIRSTV ) THEN
+               CALL DSCAL(LASTC, ONE - TAU, C( FIRSTV, 1), LDC)
+            ELSE
+*
+*              w(1:lastc,1) := C(1:lastv,1:lastc)**T * v(1:lastv,1)
+*
+               ! w(1:lastc,1) := C(1:lastv-1,1:lastc)**T * v(1:lastv-1,1)
+               CALL DGEMV( 'Transpose', LASTV-FIRSTV, LASTC, ONE,
+     $                     C(FIRSTV,1), LDC, V(I), INCV, ZERO, 
+     $                     WORK, 1)
+               ! w(1:lastc,1) += C(lastv,1:lastc)**T * v(lastv,1) = C(lastv,1:lastc)**T
+               CALL DAXPY(LASTC, ONE, C(LASTV,1), LDC, WORK, 1)
+*
+*              C(1:lastv,1:lastc) := C(...) - tau * v(1:lastv,1) * w(1:lastc,1)**T
+*
+               ! C(lastv, 1:lastc)   := C(...) - tau * v(lastv,1) * w(1:lastc,1)**T
+               !                      = C(...) - tau * w(1:lastc,1)**T
+               CALL DAXPY(LASTC, -TAU, WORK, 1, C(LASTV,1), LDC)
+               ! C(1:lastv-1,1:lastc) := C(...) - tau * v(1:lastv-1,1)*w(1:lastc,1)**T
+               CALL DGER(LASTV-FIRSTV, LASTC, -TAU, V(I), INCV,
+     $                   WORK, 1, C(FIRSTV,1), LDC)
+            END IF
+         END IF
+      ELSE
+*
+*        Form  C * H
+*
+         IF( LASTV.GT.0 ) THEN
+            ! Check if n = 1. This means v = 1, so we just need to compute
+            ! C := CH = C(1-\tau).
+            IF( LASTV.EQ.FIRSTV ) THEN
+               CALL DSCAL(LASTC, ONE - TAU, C, 1)
+            ELSE
+*
+*              w(1:lastc,1) := C(1:lastc,1:lastv) * v(1:lastv,1)
+*
+               ! w(1:lastc,1) := C(1:lastc,1:lastv-1) * v(1:lastv-1,1)
+               CALL DGEMV( 'No transpose', LASTC, LASTV-FIRSTV,
+     $            ONE, C(1,FIRSTV), LDC, V(I), INCV, ZERO, WORK, 1 )
+               ! w(1:lastc,1) += C(1:lastc,lastv) * v(lastv,1) = C(1:lastc,lastv)
+               CALL DAXPY(LASTC, ONE, C(1,LASTV), 1, WORK, 1)
+*
+*              C(1:lastc,1:lastv) := C(...) - tau * w(1:lastc,1) * v(1:lastv,1)**T
+*
+               ! C(1:lastc,lastv)     := C(...) - tau * w(1:lastc,1) * v(lastv,1)**T
+               !                       = C(...) - tau * w(1:lastc,1)
+               CALL DAXPY(LASTC, -TAU, WORK, 1, C(1,LASTV), 1)
+               ! C(1:lastc,1:lastv-1) := C(...) - tau * w(1:lastc,1) * v(1:lastv-1)**T
+               CALL DGER( LASTC, LASTV-FIRSTV, -TAU, WORK, 1, V(I), 
+     $                     INCV, C(1,FIRSTV), LDC )
+            END IF
+         END IF
+      END IF
+      RETURN
+*
+*     End of DLARF1L
+*
+      END
diff --git a/SRC/dlarfb.f b/SRC/dlarfb.f
index a3fa083b43..66b244d331 100644
--- a/SRC/dlarfb.f
+++ b/SRC/dlarfb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARFB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarfb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarfb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -161,7 +159,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup larfb
 *
 *> \par Further Details:
 *  =====================
@@ -170,9 +168,8 @@
 *>
 *>  The shape of the matrix V and the storage of the vectors which define
 *>  the H(i) is best illustrated by the following example with n = 5 and
-*>  k = 3. The elements equal to 1 are not stored; the corresponding
-*>  array elements are modified but restored on exit. The rest of the
-*>  array is not used.
+*>  k = 3. The triangular part of V (including its diagonal) is not
+*>  referenced.
 *>
 *>  DIRECT = 'F' and STOREV = 'C':         DIRECT = 'F' and STOREV = 'R':
 *>
@@ -192,8 +189,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
+      SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V,
+     $                   LDV,
      $                   T, LDT, C, LDC, WORK, LDWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -261,7 +260,8 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1
 *
-               CALL DTRMM( 'Right', 'Lower', 'No transpose', 'Unit', N,
+               CALL DTRMM( 'Right', 'Lower', 'No transpose', 'Unit',
+     $                     N,
      $                     K, ONE, V, LDV, WORK, LDWORK )
                IF( M.GT.K ) THEN
 *
@@ -274,7 +274,8 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * T**T  or  W * T
 *
-               CALL DTRMM( 'Right', 'Upper', TRANST, 'Non-unit', N, K,
+               CALL DTRMM( 'Right', 'Upper', TRANST, 'Non-unit', N,
+     $                     K,
      $                     ONE, T, LDT, WORK, LDWORK )
 *
 *              C := C - V * W**T
@@ -290,7 +291,8 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1**T
 *
-               CALL DTRMM( 'Right', 'Lower', 'Transpose', 'Unit', N, K,
+               CALL DTRMM( 'Right', 'Lower', 'Transpose', 'Unit', N,
+     $                     K,
      $                     ONE, V, LDV, WORK, LDWORK )
 *
 *              C1 := C1 - W**T
@@ -315,13 +317,15 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1
 *
-               CALL DTRMM( 'Right', 'Lower', 'No transpose', 'Unit', M,
+               CALL DTRMM( 'Right', 'Lower', 'No transpose', 'Unit',
+     $                     M,
      $                     K, ONE, V, LDV, WORK, LDWORK )
                IF( N.GT.K ) THEN
 *
 *                 W := W + C2 * V2
 *
-                  CALL DGEMM( 'No transpose', 'No transpose', M, K, N-K,
+                  CALL DGEMM( 'No transpose', 'No transpose', M, K,
+     $                        N-K,
      $                        ONE, C( 1, K+1 ), LDC, V( K+1, 1 ), LDV,
      $                        ONE, WORK, LDWORK )
                END IF
@@ -344,7 +348,8 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1**T
 *
-               CALL DTRMM( 'Right', 'Lower', 'Transpose', 'Unit', M, K,
+               CALL DTRMM( 'Right', 'Lower', 'Transpose', 'Unit', M,
+     $                     K,
      $                     ONE, V, LDV, WORK, LDWORK )
 *
 *              C1 := C1 - W
@@ -372,12 +377,14 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *              W := C2**T
 *
                DO 70 J = 1, K
-                  CALL DCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ), 1 )
+                  CALL DCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ),
+     $                        1 )
    70          CONTINUE
 *
 *              W := W * V2
 *
-               CALL DTRMM( 'Right', 'Upper', 'No transpose', 'Unit', N,
+               CALL DTRMM( 'Right', 'Upper', 'No transpose', 'Unit',
+     $                     N,
      $                     K, ONE, V( M-K+1, 1 ), LDV, WORK, LDWORK )
                IF( M.GT.K ) THEN
 *
@@ -389,7 +396,8 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * T**T  or  W * T
 *
-               CALL DTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K,
+               CALL DTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N,
+     $                     K,
      $                     ONE, T, LDT, WORK, LDWORK )
 *
 *              C := C - V * W**T
@@ -404,7 +412,8 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V2**T
 *
-               CALL DTRMM( 'Right', 'Upper', 'Transpose', 'Unit', N, K,
+               CALL DTRMM( 'Right', 'Upper', 'Transpose', 'Unit', N,
+     $                     K,
      $                     ONE, V( M-K+1, 1 ), LDV, WORK, LDWORK )
 *
 *              C2 := C2 - W**T
@@ -429,13 +438,15 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V2
 *
-               CALL DTRMM( 'Right', 'Upper', 'No transpose', 'Unit', M,
+               CALL DTRMM( 'Right', 'Upper', 'No transpose', 'Unit',
+     $                     M,
      $                     K, ONE, V( N-K+1, 1 ), LDV, WORK, LDWORK )
                IF( N.GT.K ) THEN
 *
 *                 W := W + C1 * V1
 *
-                  CALL DGEMM( 'No transpose', 'No transpose', M, K, N-K,
+                  CALL DGEMM( 'No transpose', 'No transpose', M, K,
+     $                        N-K,
      $                        ONE, C, LDC, V, LDV, ONE, WORK, LDWORK )
                END IF
 *
@@ -456,7 +467,8 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V2**T
 *
-               CALL DTRMM( 'Right', 'Upper', 'Transpose', 'Unit', M, K,
+               CALL DTRMM( 'Right', 'Upper', 'Transpose', 'Unit', M,
+     $                     K,
      $                     ONE, V( N-K+1, 1 ), LDV, WORK, LDWORK )
 *
 *              C2 := C2 - W
@@ -491,20 +503,23 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1**T
 *
-               CALL DTRMM( 'Right', 'Upper', 'Transpose', 'Unit', N, K,
+               CALL DTRMM( 'Right', 'Upper', 'Transpose', 'Unit', N,
+     $                     K,
      $                     ONE, V, LDV, WORK, LDWORK )
                IF( M.GT.K ) THEN
 *
 *                 W := W + C2**T * V2**T
 *
-                  CALL DGEMM( 'Transpose', 'Transpose', N, K, M-K, ONE,
+                  CALL DGEMM( 'Transpose', 'Transpose', N, K, M-K,
+     $                        ONE,
      $                        C( K+1, 1 ), LDC, V( 1, K+1 ), LDV, ONE,
      $                        WORK, LDWORK )
                END IF
 *
 *              W := W * T**T  or  W * T
 *
-               CALL DTRMM( 'Right', 'Upper', TRANST, 'Non-unit', N, K,
+               CALL DTRMM( 'Right', 'Upper', TRANST, 'Non-unit', N,
+     $                     K,
      $                     ONE, T, LDT, WORK, LDWORK )
 *
 *              C := C - V**T * W**T
@@ -513,14 +528,16 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 C2 := C2 - V2**T * W**T
 *
-                  CALL DGEMM( 'Transpose', 'Transpose', M-K, N, K, -ONE,
+                  CALL DGEMM( 'Transpose', 'Transpose', M-K, N, K,
+     $                        -ONE,
      $                        V( 1, K+1 ), LDV, WORK, LDWORK, ONE,
      $                        C( K+1, 1 ), LDC )
                END IF
 *
 *              W := W * V1
 *
-               CALL DTRMM( 'Right', 'Upper', 'No transpose', 'Unit', N,
+               CALL DTRMM( 'Right', 'Upper', 'No transpose', 'Unit',
+     $                     N,
      $                     K, ONE, V, LDV, WORK, LDWORK )
 *
 *              C1 := C1 - W**T
@@ -545,7 +562,8 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1**T
 *
-               CALL DTRMM( 'Right', 'Upper', 'Transpose', 'Unit', M, K,
+               CALL DTRMM( 'Right', 'Upper', 'Transpose', 'Unit', M,
+     $                     K,
      $                     ONE, V, LDV, WORK, LDWORK )
                IF( N.GT.K ) THEN
 *
@@ -567,14 +585,16 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 C2 := C2 - W * V2
 *
-                  CALL DGEMM( 'No transpose', 'No transpose', M, N-K, K,
+                  CALL DGEMM( 'No transpose', 'No transpose', M, N-K,
+     $                        K,
      $                        -ONE, WORK, LDWORK, V( 1, K+1 ), LDV, ONE,
      $                        C( 1, K+1 ), LDC )
                END IF
 *
 *              W := W * V1
 *
-               CALL DTRMM( 'Right', 'Upper', 'No transpose', 'Unit', M,
+               CALL DTRMM( 'Right', 'Upper', 'No transpose', 'Unit',
+     $                     M,
      $                     K, ONE, V, LDV, WORK, LDWORK )
 *
 *              C1 := C1 - W
@@ -602,24 +622,28 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *              W := C2**T
 *
                DO 190 J = 1, K
-                  CALL DCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ), 1 )
+                  CALL DCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ),
+     $                        1 )
   190          CONTINUE
 *
 *              W := W * V2**T
 *
-               CALL DTRMM( 'Right', 'Lower', 'Transpose', 'Unit', N, K,
+               CALL DTRMM( 'Right', 'Lower', 'Transpose', 'Unit', N,
+     $                     K,
      $                     ONE, V( 1, M-K+1 ), LDV, WORK, LDWORK )
                IF( M.GT.K ) THEN
 *
 *                 W := W + C1**T * V1**T
 *
-                  CALL DGEMM( 'Transpose', 'Transpose', N, K, M-K, ONE,
+                  CALL DGEMM( 'Transpose', 'Transpose', N, K, M-K,
+     $                        ONE,
      $                        C, LDC, V, LDV, ONE, WORK, LDWORK )
                END IF
 *
 *              W := W * T**T  or  W * T
 *
-               CALL DTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K,
+               CALL DTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N,
+     $                     K,
      $                     ONE, T, LDT, WORK, LDWORK )
 *
 *              C := C - V**T * W**T
@@ -628,13 +652,15 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 C1 := C1 - V1**T * W**T
 *
-                  CALL DGEMM( 'Transpose', 'Transpose', M-K, N, K, -ONE,
+                  CALL DGEMM( 'Transpose', 'Transpose', M-K, N, K,
+     $                        -ONE,
      $                        V, LDV, WORK, LDWORK, ONE, C, LDC )
                END IF
 *
 *              W := W * V2
 *
-               CALL DTRMM( 'Right', 'Lower', 'No transpose', 'Unit', N,
+               CALL DTRMM( 'Right', 'Lower', 'No transpose', 'Unit',
+     $                     N,
      $                     K, ONE, V( 1, M-K+1 ), LDV, WORK, LDWORK )
 *
 *              C2 := C2 - W**T
@@ -659,7 +685,8 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V2**T
 *
-               CALL DTRMM( 'Right', 'Lower', 'Transpose', 'Unit', M, K,
+               CALL DTRMM( 'Right', 'Lower', 'Transpose', 'Unit', M,
+     $                     K,
      $                     ONE, V( 1, N-K+1 ), LDV, WORK, LDWORK )
                IF( N.GT.K ) THEN
 *
@@ -680,13 +707,15 @@ SUBROUTINE DLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 C1 := C1 - W * V1
 *
-                  CALL DGEMM( 'No transpose', 'No transpose', M, N-K, K,
+                  CALL DGEMM( 'No transpose', 'No transpose', M, N-K,
+     $                        K,
      $                        -ONE, WORK, LDWORK, V, LDV, ONE, C, LDC )
                END IF
 *
 *              W := W * V2
 *
-               CALL DTRMM( 'Right', 'Lower', 'No transpose', 'Unit', M,
+               CALL DTRMM( 'Right', 'Lower', 'No transpose', 'Unit',
+     $                     M,
      $                     K, ONE, V( 1, N-K+1 ), LDV, WORK, LDWORK )
 *
 *              C1 := C1 - W
diff --git a/SRC/dlarfb_gett.f b/SRC/dlarfb_gett.f
index 10ab6461ef..102c1b4d9d 100644
--- a/SRC/dlarfb_gett.f
+++ b/SRC/dlarfb_gett.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARFB_GETT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarfb_gett.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarfb_gett.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -157,7 +155,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup larfb_gett
 *
 *> \par Contributors:
 *  ==================
@@ -451,7 +449,7 @@ SUBROUTINE DLARFB_GETT( IDENT, M, N, K, T, LDT, A, LDA, B, LDB,
          IF( LNOTIDENT ) THEN
 *
 *           col2_(2) Compute W2: = (V1**T) * W2 = (A1**T) * W2,
-*           V1 is not an identy matrix, but unit lower-triangular
+*           V1 is not an identity matrix, but unit lower-triangular
 *           V1 stored in A1 (diagonal ones are not stored).
 *
 *
diff --git a/SRC/dlarfg.f b/SRC/dlarfg.f
index 9bfb45a6b0..38f65af0fb 100644
--- a/SRC/dlarfg.f
+++ b/SRC/dlarfg.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARFG + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarfg.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarfg.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -99,10 +97,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup larfg
 *
 *  =====================================================================
       SUBROUTINE DLARFG( N, ALPHA, X, INCX, TAU )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlarfgp.f b/SRC/dlarfgp.f
index 69845056d4..a1431ebe2c 100644
--- a/SRC/dlarfgp.f
+++ b/SRC/dlarfgp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARFGP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarfgp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarfgp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup larfgp
 *
 *  =====================================================================
       SUBROUTINE DLARFGP( N, ALPHA, X, INCX, TAU )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -122,7 +121,7 @@ SUBROUTINE DLARFGP( N, ALPHA, X, INCX, TAU )
 *     ..
 *     .. Local Scalars ..
       INTEGER            J, KNT
-      DOUBLE PRECISION   BETA, BIGNUM, SAVEALPHA, SMLNUM, XNORM
+      DOUBLE PRECISION   BETA, BIGNUM, EPS, SAVEALPHA, SMLNUM, XNORM
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION   DLAMCH, DLAPY2, DNRM2
@@ -141,11 +140,12 @@ SUBROUTINE DLARFGP( N, ALPHA, X, INCX, TAU )
          RETURN
       END IF
 *
+      EPS = DLAMCH( 'Precision' )
       XNORM = DNRM2( N-1, X, INCX )
 *
-      IF( XNORM.EQ.ZERO ) THEN
+      IF( XNORM.LE.EPS*ABS(ALPHA) ) THEN
 *
-*        H  =  [+/-1, 0; I], sign chosen so ALPHA >= 0
+*        H  =  [+/-1, 0; I], sign chosen so ALPHA >= 0.
 *
          IF( ALPHA.GE.ZERO ) THEN
 *           When TAU.eq.ZERO, the vector is special-cased to be
diff --git a/SRC/dlarft.f b/SRC/dlarft.f
index a8d9de61f1..fa2ea0d134 100644
--- a/SRC/dlarft.f
+++ b/SRC/dlarft.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARFT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarft.f">
 *> [TGZ]</a>
@@ -13,12 +12,11 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarft.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE DLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+*       RECURSIVE SUBROUTINE DLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
 *
 *       .. Scalar Arguments ..
 *       CHARACTER          DIRECT, STOREV
@@ -130,7 +128,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup larft
 *
 *> \par Further Details:
 *  =====================
@@ -159,165 +157,480 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+      RECURSIVE SUBROUTINE DLARFT( DIRECT, STOREV, N, K, V, LDV,
+     $                             TAU, T, LDT )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
-*     .. Scalar Arguments ..
+*        .. Scalar Arguments
+*
       CHARACTER          DIRECT, STOREV
       INTEGER            K, LDT, LDV, N
 *     ..
 *     .. Array Arguments ..
+*
       DOUBLE PRECISION   T( LDT, * ), TAU( * ), V( LDV, * )
 *     ..
 *
-*  =====================================================================
-*
 *     .. Parameters ..
-      DOUBLE PRECISION   ONE, ZERO
-      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
-*     ..
+*
+      DOUBLE PRECISION ONE, NEG_ONE, ZERO
+      PARAMETER(ONE=1.0D+0, ZERO = 0.0D+0, NEG_ONE=-1.0D+0)
+*
 *     .. Local Scalars ..
-      INTEGER            I, J, PREVLASTV, LASTV
-*     ..
+*
+      INTEGER           I,J,L,NX
+      LOGICAL           QR,LQ,QL,DIRF,COLV
+*
 *     .. External Subroutines ..
-      EXTERNAL           DGEMV, DTRMV
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      EXTERNAL           LSAME
+*
+      EXTERNAL          DTRMM,DGEMM,DLACPY
+*
+*     .. External Functions..
+*
+      LOGICAL           LSAME
+      INTEGER           ILAENV
+      EXTERNAL          LSAME, ILAENV
+*     
+*     The general scheme used is inspired by the approach inside DGEQRT3
+*     which was (at the time of writing this code):
+*     Based on the algorithm of Elmroth and Gustavson,
+*     IBM J. Res. Develop. Vol 44 No. 4 July 2000.
 *     ..
 *     .. Executable Statements ..
 *
 *     Quick return if possible
 *
-      IF( N.EQ.0 )
-     $   RETURN
-*
-      IF( LSAME( DIRECT, 'F' ) ) THEN
-         PREVLASTV = N
-         DO I = 1, K
-            PREVLASTV = MAX( I, PREVLASTV )
-            IF( TAU( I ).EQ.ZERO ) THEN
-*
-*              H(i)  =  I
-*
-               DO J = 1, I
-                  T( J, I ) = ZERO
-               END DO
-            ELSE
-*
-*              general case
-*
-               IF( LSAME( STOREV, 'C' ) ) THEN
-*                 Skip any trailing zeros.
-                  DO LASTV = N, I+1, -1
-                     IF( V( LASTV, I ).NE.ZERO ) EXIT
-                  END DO
-                  DO J = 1, I-1
-                     T( J, I ) = -TAU( I ) * V( I , J )
-                  END DO
-                  J = MIN( LASTV, PREVLASTV )
-*
-*                 T(1:i-1,i) := - tau(i) * V(i:j,1:i-1)**T * V(i:j,i)
-*
-                  CALL DGEMV( 'Transpose', J-I, I-1, -TAU( I ),
-     $                        V( I+1, 1 ), LDV, V( I+1, I ), 1, ONE,
-     $                        T( 1, I ), 1 )
-               ELSE
-*                 Skip any trailing zeros.
-                  DO LASTV = N, I+1, -1
-                     IF( V( I, LASTV ).NE.ZERO ) EXIT
-                  END DO
-                  DO J = 1, I-1
-                     T( J, I ) = -TAU( I ) * V( J , I )
-                  END DO
-                  J = MIN( LASTV, PREVLASTV )
-*
-*                 T(1:i-1,i) := - tau(i) * V(1:i-1,i:j) * V(i,i:j)**T
-*
-                  CALL DGEMV( 'No transpose', I-1, J-I, -TAU( I ),
-     $                        V( 1, I+1 ), LDV, V( I, I+1 ), LDV, ONE,
-     $                        T( 1, I ), 1 )
-               END IF
-*
-*              T(1:i-1,i) := T(1:i-1,1:i-1) * T(1:i-1,i)
-*
-               CALL DTRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T,
-     $                     LDT, T( 1, I ), 1 )
-               T( I, I ) = TAU( I )
-               IF( I.GT.1 ) THEN
-                  PREVLASTV = MAX( PREVLASTV, LASTV )
-               ELSE
-                  PREVLASTV = LASTV
-               END IF
-            END IF
+      IF(N.EQ.0.OR.K.EQ.0) THEN
+         RETURN
+      END IF
+*
+*     Base case
+*
+      IF(N.EQ.1.OR.K.EQ.1) THEN
+         T(1,1) = TAU(1)
+         RETURN
+      END IF
+*
+*     Determine when to cross over into the level 2 based implementation
+*
+      NX = ILAENV(3, "DLARFT", DIRECT // STOREV, N, K, -1, -1)
+      IF(K.LT.NX) THEN
+         CALL DLARFT_LVL2(DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT)
+         RETURN
+      END IF
+*
+*     Beginning of executable statements
+*
+      L = K / 2
+*
+*     Determine what kind of Q we need to compute
+*     We assume that if the user doesn't provide 'F' for DIRECT,
+*     then they meant to provide 'B' and if they don't provide
+*     'C' for STOREV, then they meant to provide 'R'
+*
+      DIRF = LSAME(DIRECT,'F')
+      COLV = LSAME(STOREV,'C')
+*
+*     QR happens when we have forward direction in column storage
+*
+      QR = DIRF.AND.COLV
+*
+*     LQ happens when we have forward direction in row storage
+*
+      LQ = DIRF.AND.(.NOT.COLV)
+*
+*     QL happens when we have backward direction in column storage
+*
+      QL = (.NOT.DIRF).AND.COLV
+*
+*     The last case is RQ. Due to how we structured this, if the
+*     above 3 are false, then RQ must be true, so we never store 
+*     this
+*     RQ happens when we have backward direction in row storage
+*     RQ = (.NOT.DIRF).AND.(.NOT.COLV)
+*
+      IF(QR) THEN
+*
+*        Break V apart into 6 components
+*
+*        V = |---------------|
+*            |V_{1,1} 0      |
+*            |V_{2,1} V_{2,2}|
+*            |V_{3,1} V_{3,2}|
+*            |---------------|
+*
+*        V_{1,1}\in\R^{l,l}      unit lower triangular
+*        V_{2,1}\in\R^{k-l,l}    rectangular
+*        V_{3,1}\in\R^{n-k,l}    rectangular
+*        
+*        V_{2,2}\in\R^{k-l,k-l}  unit lower triangular
+*        V_{3,2}\in\R^{n-k,k-l}  rectangular
+*
+*        We will construct the T matrix 
+*        T = |---------------|
+*            |T_{1,1} T_{1,2}|
+*            |0       T_{2,2}|
+*            |---------------|
+*
+*        T is the triangular factor obtained from block reflectors. 
+*        To motivate the structure, assume we have already computed T_{1,1}
+*        and T_{2,2}. Then collect the associated reflectors in V_1 and V_2
+*
+*        T_{1,1}\in\R^{l, l}     upper triangular
+*        T_{2,2}\in\R^{k-l, k-l} upper triangular
+*        T_{1,2}\in\R^{l, k-l}   rectangular
+*
+*        Where l = floor(k/2)
+*
+*        Then, consider the product:
+*        
+*        (I - V_1*T_{1,1}*V_1')*(I - V_2*T_{2,2}*V_2')
+*        = I - V_1*T_{1,1}*V_1' - V_2*T_{2,2}*V_2' + V_1*T_{1,1}*V_1'*V_2*T_{2,2}*V_2'
+*        
+*        Define T_{1,2} = -T_{1,1}*V_1'*V_2*T_{2,2}
+*        
+*        Then, we can define the matrix V as 
+*        V = |-------|
+*            |V_1 V_2|
+*            |-------|
+*        
+*        So, our product is equivalent to the matrix product
+*        I - V*T*V'
+*        This means, we can compute T_{1,1} and T_{2,2}, then use this information
+*        to compute T_{1,2}
+*
+*        Compute T_{1,1} recursively
+*
+         CALL DLARFT(DIRECT, STOREV, N, L, V, LDV, TAU, T, LDT)
+*
+*        Compute T_{2,2} recursively
+*
+         CALL DLARFT(DIRECT, STOREV, N-L, K-L, V(L+1, L+1), LDV, 
+     $               TAU(L+1), T(L+1, L+1), LDT)
+*
+*        Compute T_{1,2} 
+*        T_{1,2} = V_{2,1}'
+*
+         DO J = 1, L
+            DO I = 1, K-L
+               T(J, L+I) = V(L+I, J)
+            END DO
          END DO
-      ELSE
-         PREVLASTV = 1
-         DO I = K, 1, -1
-            IF( TAU( I ).EQ.ZERO ) THEN
-*
-*              H(i)  =  I
-*
-               DO J = I, K
-                  T( J, I ) = ZERO
-               END DO
-            ELSE
-*
-*              general case
-*
-               IF( I.LT.K ) THEN
-                  IF( LSAME( STOREV, 'C' ) ) THEN
-*                    Skip any leading zeros.
-                     DO LASTV = 1, I-1
-                        IF( V( LASTV, I ).NE.ZERO ) EXIT
-                     END DO
-                     DO J = I+1, K
-                        T( J, I ) = -TAU( I ) * V( N-K+I , J )
-                     END DO
-                     J = MAX( LASTV, PREVLASTV )
-*
-*                    T(i+1:k,i) = -tau(i) * V(j:n-k+i,i+1:k)**T * V(j:n-k+i,i)
-*
-                     CALL DGEMV( 'Transpose', N-K+I-J, K-I, -TAU( I ),
-     $                           V( J, I+1 ), LDV, V( J, I ), 1, ONE,
-     $                           T( I+1, I ), 1 )
-                  ELSE
-*                    Skip any leading zeros.
-                     DO LASTV = 1, I-1
-                        IF( V( I, LASTV ).NE.ZERO ) EXIT
-                     END DO
-                     DO J = I+1, K
-                        T( J, I ) = -TAU( I ) * V( J, N-K+I )
-                     END DO
-                     J = MAX( LASTV, PREVLASTV )
-*
-*                    T(i+1:k,i) = -tau(i) * V(i+1:k,j:n-k+i) * V(i,j:n-k+i)**T
-*
-                     CALL DGEMV( 'No transpose', K-I, N-K+I-J,
-     $                    -TAU( I ), V( I+1, J ), LDV, V( I, J ), LDV,
-     $                    ONE, T( I+1, I ), 1 )
-                  END IF
-*
-*                 T(i+1:k,i) := T(i+1:k,i+1:k) * T(i+1:k,i)
-*
-                  CALL DTRMV( 'Lower', 'No transpose', 'Non-unit', K-I,
-     $                        T( I+1, I+1 ), LDT, T( I+1, I ), 1 )
-                  IF( I.GT.1 ) THEN
-                     PREVLASTV = MIN( PREVLASTV, LASTV )
-                  ELSE
-                     PREVLASTV = LASTV
-                  END IF
-               END IF
-               T( I, I ) = TAU( I )
-            END IF
+*
+*        T_{1,2} = T_{1,2}*V_{2,2}
+*
+         CALL DTRMM('Right', 'Lower', 'No transpose', 'Unit', L,
+     $               K-L, ONE, V(L+1, L+1), LDV, T(1, L+1), LDT)
+
+*
+*        T_{1,2} = V_{3,1}'*V_{3,2} + T_{1,2}
+*        Note: We assume K <= N, and GEMM will do nothing if N=K
+*
+         CALL DGEMM('Transpose', 'No transpose', L, K-L, N-K, ONE, 
+     $               V(K+1, 1), LDV, V(K+1, L+1), LDV, ONE, 
+     $               T(1, L+1), LDT)
+*
+*        At this point, we have that T_{1,2} = V_1'*V_2
+*        All that is left is to pre and post multiply by -T_{1,1} and T_{2,2}
+*        respectively.
+*
+*        T_{1,2} = -T_{1,1}*T_{1,2}
+*
+         CALL DTRMM('Left', 'Upper', 'No transpose', 'Non-unit', L,
+     $               K-L, NEG_ONE, T, LDT, T(1, L+1), LDT)
+*
+*        T_{1,2} = T_{1,2}*T_{2,2}
+*
+         CALL DTRMM('Right', 'Upper', 'No transpose', 'Non-unit', L, 
+     $               K-L, ONE, T(L+1, L+1), LDT, T(1, L+1), LDT)
+
+      ELSE IF(LQ) THEN
+*
+*        Break V apart into 6 components
+*
+*        V = |----------------------|
+*            |V_{1,1} V_{1,2} V{1,3}|
+*            |0       V_{2,2} V{2,3}|
+*            |----------------------|
+*
+*        V_{1,1}\in\R^{l,l}      unit upper triangular
+*        V_{1,2}\in\R^{l,k-l}    rectangular
+*        V_{1,3}\in\R^{l,n-k}    rectangular
+*        
+*        V_{2,2}\in\R^{k-l,k-l}  unit upper triangular
+*        V_{2,3}\in\R^{k-l,n-k}  rectangular
+*
+*        Where l = floor(k/2)
+*
+*        We will construct the T matrix 
+*        T = |---------------|
+*            |T_{1,1} T_{1,2}|
+*            |0       T_{2,2}|
+*            |---------------|
+*
+*        T is the triangular factor obtained from block reflectors. 
+*        To motivate the structure, assume we have already computed T_{1,1}
+*        and T_{2,2}. Then collect the associated reflectors in V_1 and V_2
+*
+*        T_{1,1}\in\R^{l, l}     upper triangular
+*        T_{2,2}\in\R^{k-l, k-l} upper triangular
+*        T_{1,2}\in\R^{l, k-l}   rectangular
+*
+*        Then, consider the product:
+*        
+*        (I - V_1'*T_{1,1}*V_1)*(I - V_2'*T_{2,2}*V_2)
+*        = I - V_1'*T_{1,1}*V_1 - V_2'*T_{2,2}*V_2 + V_1'*T_{1,1}*V_1*V_2'*T_{2,2}*V_2
+*        
+*        Define T_{1,2} = -T_{1,1}*V_1*V_2'*T_{2,2}
+*        
+*        Then, we can define the matrix V as 
+*        V = |---|
+*            |V_1|
+*            |V_2|
+*            |---|
+*        
+*        So, our product is equivalent to the matrix product
+*        I - V'*T*V
+*        This means, we can compute T_{1,1} and T_{2,2}, then use this information
+*        to compute T_{1,2}
+*
+*        Compute T_{1,1} recursively
+*
+         CALL DLARFT(DIRECT, STOREV, N, L, V, LDV, TAU, T, LDT)
+*
+*        Compute T_{2,2} recursively
+*
+         CALL DLARFT(DIRECT, STOREV, N-L, K-L, V(L+1, L+1), LDV, 
+     $      TAU(L+1), T(L+1, L+1), LDT)
+
+*
+*        Compute T_{1,2}
+*        T_{1,2} = V_{1,2}
+*
+         CALL DLACPY('All', L, K-L, V(1, L+1), LDV, T(1, L+1), LDT)
+*
+*        T_{1,2} = T_{1,2}*V_{2,2}'
+*
+         CALL DTRMM('Right', 'Upper', 'Transpose', 'Unit', L, K-L,
+     $               ONE, V(L+1, L+1), LDV, T(1, L+1), LDT)
+
+*
+*        T_{1,2} = V_{1,3}*V_{2,3}' + T_{1,2}
+*        Note: We assume K <= N, and GEMM will do nothing if N=K
+*
+         CALL DGEMM('No transpose', 'Transpose', L, K-L, N-K, ONE,
+     $               V(1, K+1), LDV, V(L+1, K+1), LDV, ONE, 
+     $               T(1, L+1), LDT)
+*
+*        At this point, we have that T_{1,2} = V_1*V_2'
+*        All that is left is to pre and post multiply by -T_{1,1} and T_{2,2}
+*        respectively.
+*
+*        T_{1,2} = -T_{1,1}*T_{1,2}
+*
+         CALL DTRMM('Left', 'Upper', 'No transpose', 'Non-unit', L,
+     $               K-L, NEG_ONE, T, LDT, T(1, L+1), LDT)
+
+*
+*        T_{1,2} = T_{1,2}*T_{2,2}
+*
+         CALL DTRMM('Right', 'Upper', 'No transpose', 'Non-unit', L,
+     $               K-L, ONE, T(L+1, L+1), LDT, T(1, L+1), LDT)
+      ELSE IF(QL) THEN
+*
+*        Break V apart into 6 components
+*
+*        V = |---------------|
+*            |V_{1,1} V_{1,2}|
+*            |V_{2,1} V_{2,2}|
+*            |0       V_{3,2}|
+*            |---------------|
+*
+*        V_{1,1}\in\R^{n-k,k-l}  rectangular
+*        V_{2,1}\in\R^{k-l,k-l}  unit upper triangular
+*        
+*        V_{1,2}\in\R^{n-k,l}    rectangular
+*        V_{2,2}\in\R^{k-l,l}    rectangular
+*        V_{3,2}\in\R^{l,l}      unit upper triangular
+*
+*        We will construct the T matrix 
+*        T = |---------------|
+*            |T_{1,1} 0      |
+*            |T_{2,1} T_{2,2}|
+*            |---------------|
+*
+*        T is the triangular factor obtained from block reflectors. 
+*        To motivate the structure, assume we have already computed T_{1,1}
+*        and T_{2,2}. Then collect the associated reflectors in V_1 and V_2
+*
+*        T_{1,1}\in\R^{k-l, k-l} non-unit lower triangular
+*        T_{2,2}\in\R^{l, l}     non-unit lower triangular
+*        T_{2,1}\in\R^{k-l, l}   rectangular
+*
+*        Where l = floor(k/2)
+*
+*        Then, consider the product:
+*        
+*        (I - V_2*T_{2,2}*V_2')*(I - V_1*T_{1,1}*V_1')
+*        = I - V_2*T_{2,2}*V_2' - V_1*T_{1,1}*V_1' + V_2*T_{2,2}*V_2'*V_1*T_{1,1}*V_1'
+*        
+*        Define T_{2,1} = -T_{2,2}*V_2'*V_1*T_{1,1}
+*        
+*        Then, we can define the matrix V as 
+*        V = |-------|
+*            |V_1 V_2|
+*            |-------|
+*        
+*        So, our product is equivalent to the matrix product
+*        I - V*T*V'
+*        This means, we can compute T_{1,1} and T_{2,2}, then use this information
+*        to compute T_{2,1}
+*
+*        Compute T_{1,1} recursively
+*
+         CALL DLARFT(DIRECT, STOREV, N-L, K-L, V, LDV, TAU, T, LDT)
+*
+*        Compute T_{2,2} recursively
+*
+         CALL DLARFT(DIRECT, STOREV, N, L, V(1, K-L+1), LDV,
+     $               TAU(K-L+1), T(K-L+1, K-L+1), LDT)
+*
+*        Compute T_{2,1}
+*        T_{2,1} = V_{2,2}'
+*
+         DO J = 1, K-L
+            DO I = 1, L
+               T(K-L+I, J) = V(N-K+J, K-L+I)
+            END DO
          END DO
-      END IF
-      RETURN
 *
-*     End of DLARFT
+*        T_{2,1} = T_{2,1}*V_{2,1}
+*
+         CALL DTRMM('Right', 'Upper', 'No transpose', 'Unit', L,
+     $               K-L, ONE, V(N-K+1, 1), LDV, T(K-L+1, 1), LDT)
+
+*
+*        T_{2,1} = V_{2,2}'*V_{2,1} + T_{2,1}
+*        Note: We assume K <= N, and GEMM will do nothing if N=K
+*
+         CALL DGEMM('Transpose', 'No transpose', L, K-L, N-K, ONE,
+     $               V(1, K-L+1), LDV, V, LDV, ONE, T(K-L+1, 1),
+     $               LDT)
+*
+*        At this point, we have that T_{2,1} = V_2'*V_1
+*        All that is left is to pre and post multiply by -T_{2,2} and T_{1,1}
+*        respectively.
+*
+*        T_{2,1} = -T_{2,2}*T_{2,1}
+*
+         CALL DTRMM('Left', 'Lower', 'No transpose', 'Non-unit', L,
+     $               K-L, NEG_ONE, T(K-L+1, K-L+1), LDT,
+     $               T(K-L+1, 1), LDT)
 *
-      END
+*        T_{2,1} = T_{2,1}*T_{1,1}
+*
+         CALL DTRMM('Right', 'Lower', 'No transpose', 'Non-unit', L,
+     $               K-L, ONE, T, LDT, T(K-L+1, 1), LDT)
+      ELSE
+*
+*        Else means RQ case
+*
+*        Break V apart into 6 components
+*
+*        V = |-----------------------|
+*            |V_{1,1} V_{1,2} 0      |
+*            |V_{2,1} V_{2,2} V_{2,3}|
+*            |-----------------------|
+*
+*        V_{1,1}\in\R^{k-l,n-k}  rectangular
+*        V_{1,2}\in\R^{k-l,k-l}  unit lower triangular
+*
+*        V_{2,1}\in\R^{l,n-k}    rectangular
+*        V_{2,2}\in\R^{l,k-l}    rectangular
+*        V_{2,3}\in\R^{l,l}      unit lower triangular
+*
+*        We will construct the T matrix 
+*        T = |---------------|
+*            |T_{1,1} 0      |
+*            |T_{2,1} T_{2,2}|
+*            |---------------|
+*
+*        T is the triangular factor obtained from block reflectors. 
+*        To motivate the structure, assume we have already computed T_{1,1}
+*        and T_{2,2}. Then collect the associated reflectors in V_1 and V_2
+*
+*        T_{1,1}\in\R^{k-l, k-l} non-unit lower triangular
+*        T_{2,2}\in\R^{l, l}     non-unit lower triangular
+*        T_{2,1}\in\R^{k-l, l}   rectangular
+*
+*        Where l = floor(k/2)
+*
+*        Then, consider the product:
+*        
+*        (I - V_2'*T_{2,2}*V_2)*(I - V_1'*T_{1,1}*V_1)
+*        = I - V_2'*T_{2,2}*V_2 - V_1'*T_{1,1}*V_1 + V_2'*T_{2,2}*V_2*V_1'*T_{1,1}*V_1
+*        
+*        Define T_{2,1} = -T_{2,2}*V_2*V_1'*T_{1,1}
+*        
+*        Then, we can define the matrix V as 
+*        V = |---|
+*            |V_1|
+*            |V_2|
+*            |---|
+*        
+*        So, our product is equivalent to the matrix product
+*        I - V'*T*V
+*        This means, we can compute T_{1,1} and T_{2,2}, then use this information
+*        to compute T_{2,1}
+*
+*        Compute T_{1,1} recursively
+*
+         CALL DLARFT(DIRECT, STOREV, N-L, K-L, V, LDV, TAU, T, LDT)
+*
+*        Compute T_{2,2} recursively
+*
+         CALL DLARFT(DIRECT, STOREV, N, L, V(K-L+1, 1), LDV,
+     $               TAU(K-L+1), T(K-L+1, K-L+1), LDT)
+*
+*        Compute T_{2,1}
+*        T_{2,1} = V_{2,2}
+*
+         CALL DLACPY('All', L, K-L, V(K-L+1, N-K+1), LDV,
+     $               T(K-L+1, 1), LDT)
+
+*
+*        T_{2,1} = T_{2,1}*V_{1,2}'
+*
+         CALL DTRMM('Right', 'Lower', 'Transpose', 'Unit', L, K-L,
+     $               ONE, V(1, N-K+1), LDV, T(K-L+1, 1), LDT)
+
+*
+*        T_{2,1} = V_{2,1}*V_{1,1}' + T_{2,1} 
+*        Note: We assume K <= N, and GEMM will do nothing if N=K
+*
+         CALL DGEMM('No transpose', 'Transpose', L, K-L, N-K, ONE, 
+     $               V(K-L+1, 1), LDV, V, LDV, ONE, T(K-L+1, 1),
+     $               LDT)
+
+*
+*        At this point, we have that T_{2,1} = V_2*V_1'
+*        All that is left is to pre and post multiply by -T_{2,2} and T_{1,1}
+*        respectively.
+*
+*        T_{2,1} = -T_{2,2}*T_{2,1}
+*
+         CALL DTRMM('Left', 'Lower', 'No tranpose', 'Non-unit', L,
+     $               K-L, NEG_ONE, T(K-L+1, K-L+1), LDT,
+     $               T(K-L+1, 1), LDT)
+
+*
+*        T_{2,1} = T_{2,1}*T_{1,1}
+*
+         CALL DTRMM('Right', 'Lower', 'No tranpose', 'Non-unit', L,
+     $               K-L, ONE, T, LDT, T(K-L+1, 1), LDT)
+      END IF
+      END SUBROUTINE
diff --git a/SRC/dlarft_lvl2.f b/SRC/dlarft_lvl2.f
new file mode 100644
index 0000000000..9614df466d
--- /dev/null
+++ b/SRC/dlarft_lvl2.f
@@ -0,0 +1,326 @@
+*> \brief \b DLARFT_LVL2: Level 2 BLAS version for terminating case of DLARFT.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download DLARFT_LVL2 + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarft.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dlarft.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarft.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DLARFT_LVL2( DIRECT, STOREV, N, K, V, LDV, TAU,
+*                    T, LDT )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          DIRECT, STOREV
+*       INTEGER            K, LDT, LDV, N
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   T( LDT, * ), TAU( * ), V( LDV, * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> DLARFT_LVL2 forms the triangular factor T of a real block reflector H
+*> of order n, which is defined as a product of k elementary reflectors.
+*>
+*> If DIRECT = 'F', H = H(1) H(2) . . . H(k) and T is upper triangular;
+*>
+*> If DIRECT = 'B', H = H(k) . . . H(2) H(1) and T is lower triangular.
+*>
+*> If STOREV = 'C', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th column of the array V, and
+*>
+*>    H  =  I - V * T * V**T
+*>
+*> If STOREV = 'R', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th row of the array V, and
+*>
+*>    H  =  I - V**T * T * V
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] DIRECT
+*> \verbatim
+*>          DIRECT is CHARACTER*1
+*>          Specifies the order in which the elementary reflectors are
+*>          multiplied to form the block reflector:
+*>          = 'F': H = H(1) H(2) . . . H(k) (Forward)
+*>          = 'B': H = H(k) . . . H(2) H(1) (Backward)
+*> \endverbatim
+*>
+*> \param[in] STOREV
+*> \verbatim
+*>          STOREV is CHARACTER*1
+*>          Specifies how the vectors which define the elementary
+*>          reflectors are stored (see also Further Details):
+*>          = 'C': columnwise
+*>          = 'R': rowwise
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the block reflector H. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The order of the triangular factor T (= the number of
+*>          elementary reflectors). K >= 1.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is DOUBLE PRECISION array, dimension
+*>                               (LDV,K) if STOREV = 'C'
+*>                               (LDV,N) if STOREV = 'R'
+*>          The matrix V. See further details.
+*> \endverbatim
+*>
+*> \param[in] LDV
+*> \verbatim
+*>          LDV is INTEGER
+*>          The leading dimension of the array V.
+*>          If STOREV = 'C', LDV >= max(1,N); if STOREV = 'R', LDV >= K.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is DOUBLE PRECISION array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i).
+*> \endverbatim
+*>
+*> \param[out] T
+*> \verbatim
+*>          T is DOUBLE PRECISION array, dimension (LDT,K)
+*>          The k by k triangular factor T of the block reflector.
+*>          If DIRECT = 'F', T is upper triangular; if DIRECT = 'B', T is
+*>          lower triangular. The rest of the array is not used.
+*> \endverbatim
+*>
+*> \param[in] LDT
+*> \verbatim
+*>          LDT is INTEGER
+*>          The leading dimension of the array T. LDT >= K.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup larft
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The shape of the matrix V and the storage of the vectors which define
+*>  the H(i) is best illustrated by the following example with n = 5 and
+*>  k = 3. The elements equal to 1 are not stored.
+*>
+*>  DIRECT = 'F' and STOREV = 'C':         DIRECT = 'F' and STOREV = 'R':
+*>
+*>               V = (  1       )                 V = (  1 v1 v1 v1 v1 )
+*>                   ( v1  1    )                     (     1 v2 v2 v2 )
+*>                   ( v1 v2  1 )                     (        1 v3 v3 )
+*>                   ( v1 v2 v3 )
+*>                   ( v1 v2 v3 )
+*>
+*>  DIRECT = 'B' and STOREV = 'C':         DIRECT = 'B' and STOREV = 'R':
+*>
+*>               V = ( v1 v2 v3 )                 V = ( v1 v1  1       )
+*>                   ( v1 v2 v3 )                     ( v2 v2 v2  1    )
+*>                   (  1 v2 v3 )                     ( v3 v3 v3 v3  1 )
+*>                   (     1 v3 )
+*>                   (        1 )
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE DLARFT_LVL2( DIRECT, STOREV, N, K, V, LDV, TAU,
+     $            T, LDT )
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          DIRECT, STOREV
+      INTEGER            K, LDT, LDV, N
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   T( LDT, * ), TAU( * ), V( LDV, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J, PREVLASTV, LASTV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DGEMV, DTRMV
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+*
+      IF( LSAME( DIRECT, 'F' ) ) THEN
+         PREVLASTV = N
+         DO I = 1, K
+            PREVLASTV = MAX( I, PREVLASTV )
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = 1, I
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( LSAME( STOREV, 'C' ) ) THEN
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( LASTV, I ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * V( I , J )
+                  END DO
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(i:j,1:i-1)**T * V(i:j,i)
+*
+                  CALL DGEMV( 'Transpose', J-I, I-1, -TAU( I ),
+     $                        V( I+1, 1 ), LDV, V( I+1, I ), 1, ONE,
+     $                        T( 1, I ), 1 )
+               ELSE
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( I, LASTV ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * V( J , I )
+                  END DO
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(1:i-1,i:j) * V(i,i:j)**T
+*
+                  CALL DGEMV( 'No transpose', I-1, J-I, -TAU( I ),
+     $                        V( 1, I+1 ), LDV, V( I, I+1 ), LDV, ONE,
+     $                        T( 1, I ), 1 )
+               END IF
+*
+*              T(1:i-1,i) := T(1:i-1,1:i-1) * T(1:i-1,i)
+*
+               CALL DTRMV( 'Upper', 'No transpose', 'Non-unit', I-1,
+     $                     T,
+     $                     LDT, T( 1, I ), 1 )
+               T( I, I ) = TAU( I )
+               IF( I.GT.1 ) THEN
+                  PREVLASTV = MAX( PREVLASTV, LASTV )
+               ELSE
+                  PREVLASTV = LASTV
+               END IF
+            END IF
+         END DO
+      ELSE
+         PREVLASTV = 1
+         DO I = K, 1, -1
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = I, K
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( I.LT.K ) THEN
+                  IF( LSAME( STOREV, 'C' ) ) THEN
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( LASTV, I ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * V( N-K+I , J )
+                     END DO
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(j:n-k+i,i+1:k)**T * V(j:n-k+i,i)
+*
+                     CALL DGEMV( 'Transpose', N-K+I-J, K-I,
+     $                           -TAU( I ),
+     $                           V( J, I+1 ), LDV, V( J, I ), 1, ONE,
+     $                           T( I+1, I ), 1 )
+                  ELSE
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( I, LASTV ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * V( J, N-K+I )
+                     END DO
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(i+1:k,j:n-k+i) * V(i,j:n-k+i)**T
+*
+                     CALL DGEMV( 'No transpose', K-I, N-K+I-J,
+     $                    -TAU( I ), V( I+1, J ), LDV, V( I, J ), LDV,
+     $                    ONE, T( I+1, I ), 1 )
+                  END IF
+*
+*                 T(i+1:k,i) := T(i+1:k,i+1:k) * T(i+1:k,i)
+*
+                  CALL DTRMV( 'Lower', 'No transpose', 'Non-unit',
+     $                        K-I,
+     $                        T( I+1, I+1 ), LDT, T( I+1, I ), 1 )
+                  IF( I.GT.1 ) THEN
+                     PREVLASTV = MIN( PREVLASTV, LASTV )
+                  ELSE
+                     PREVLASTV = LASTV
+                  END IF
+               END IF
+               T( I, I ) = TAU( I )
+            END IF
+         END DO
+      END IF
+      RETURN
+*
+*     End of DLARFT_LVL2
+*
+      END
diff --git a/SRC/dlarfx.f b/SRC/dlarfx.f
index e7665f9866..4bc96b5a4a 100644
--- a/SRC/dlarfx.f
+++ b/SRC/dlarfx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARFX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarfx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarfx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,10 +111,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup larfx
 *
 *  =====================================================================
       SUBROUTINE DLARFX( SIDE, M, N, V, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlarfy.f b/SRC/dlarfy.f
index d0c3c8b8ac..18ac578ddf 100644
--- a/SRC/dlarfy.f
+++ b/SRC/dlarfy.f
@@ -101,10 +101,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup larfy
 *
 *  =====================================================================
       SUBROUTINE DLARFY( UPLO, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlargv.f b/SRC/dlargv.f
index 90a4f8d544..2485c6fd5d 100644
--- a/SRC/dlargv.f
+++ b/SRC/dlargv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlargv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlargv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup largv
 *
 *  =====================================================================
       SUBROUTINE DLARGV( N, X, INCX, Y, INCY, C, INCC )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlarmm.f b/SRC/dlarmm.f
new file mode 100644
index 0000000000..f1e78dfade
--- /dev/null
+++ b/SRC/dlarmm.f
@@ -0,0 +1,99 @@
+*> \brief \b DLARMM
+*
+*  Definition:
+*  ===========
+*
+*      DOUBLE PRECISION FUNCTION DLARMM( ANORM, BNORM, CNORM )
+*
+*     .. Scalar Arguments ..
+*      DOUBLE PRECISION   ANORM, BNORM, CNORM
+*     ..
+*
+*>  \par Purpose:
+*  =======
+*>
+*> \verbatim
+*>
+*> DLARMM returns a factor s in (0, 1] such that the linear updates
+*>
+*>    (s * C) - A * (s * B)  and  (s * C) - (s * A) * B
+*>
+*> cannot overflow, where A, B, and C are matrices of conforming
+*> dimensions.
+*>
+*> This is an auxiliary routine so there is no argument checking.
+*> \endverbatim
+*
+*  Arguments:
+*  =========
+*
+*> \param[in] ANORM
+*> \verbatim
+*>          ANORM is DOUBLE PRECISION
+*>          The infinity norm of A. ANORM >= 0.
+*>          The number of rows of the matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] BNORM
+*> \verbatim
+*>          BNORM is DOUBLE PRECISION
+*>          The infinity norm of B. BNORM >= 0.
+*> \endverbatim
+*>
+*> \param[in] CNORM
+*> \verbatim
+*>          CNORM is DOUBLE PRECISION
+*>          The infinity norm of C. CNORM >= 0.
+*> \endverbatim
+*>
+*>
+*  =====================================================================
+*>  References:
+*>    C. C. Kjelgaard Mikkelsen and L. Karlsson, Blocked Algorithms for
+*>    Robust Solution of Triangular Linear Systems. In: International
+*>    Conference on Parallel Processing and Applied Mathematics, pages
+*>    68--78. Springer, 2017.
+*>
+*> \ingroup larmm
+*  =====================================================================
+
+      DOUBLE PRECISION FUNCTION DLARMM( ANORM, BNORM, CNORM )
+      IMPLICIT NONE
+*     .. Scalar Arguments ..
+      DOUBLE PRECISION   ANORM, BNORM, CNORM
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, HALF, FOUR
+      PARAMETER          ( ONE = 1.0D0, HALF = 0.5D+0, FOUR = 4.0D0 )
+*     ..
+*     .. Local Scalars ..
+       DOUBLE PRECISION   BIGNUM, SMLNUM
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH
+      EXTERNAL           DLAMCH
+*     ..
+*     .. Executable Statements ..
+*
+*
+*     Determine machine dependent parameters to control overflow.
+*
+      SMLNUM = DLAMCH( 'Safe minimum' ) / DLAMCH( 'Precision' )
+      BIGNUM = ( ONE / SMLNUM ) / FOUR
+*
+*     Compute a scale factor.
+*
+      DLARMM = ONE
+      IF( BNORM .LE. ONE ) THEN
+         IF( ANORM * BNORM .GT. BIGNUM - CNORM ) THEN
+            DLARMM = HALF
+         END IF
+      ELSE
+         IF( ANORM .GT. (BIGNUM - CNORM) / BNORM ) THEN
+            DLARMM = HALF / BNORM
+         END IF
+      END IF
+      RETURN
+*
+*     ==== End of DLARMM ====
+*
+      END
diff --git a/SRC/dlarnv.f b/SRC/dlarnv.f
index 3557d215c1..cfa4c5b303 100644
--- a/SRC/dlarnv.f
+++ b/SRC/dlarnv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARNV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarnv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarnv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -79,7 +77,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larnv
 *
 *> \par Further Details:
 *  =====================
@@ -94,6 +92,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLARNV( IDIST, ISEED, N, X )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlarra.f b/SRC/dlarra.f
index 2fb30cd762..2a6c37f485 100644
--- a/SRC/dlarra.f
+++ b/SRC/dlarra.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARRA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarra.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarra.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,7 +117,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larra
 *
 *> \par Contributors:
 *  ==================
@@ -133,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE DLARRA( N, D, E, E2, SPLTOL, TNRM,
      $                    NSPLIT, ISPLIT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -164,6 +163,7 @@ SUBROUTINE DLARRA( N, D, E, E2, SPLTOL, TNRM,
 *     .. Executable Statements ..
 *
       INFO = 0
+      NSPLIT = 1
 *
 *     Quick return if possible
 *
@@ -172,7 +172,6 @@ SUBROUTINE DLARRA( N, D, E, E2, SPLTOL, TNRM,
       END IF
 *
 *     Compute splitting points
-      NSPLIT = 1
       IF(SPLTOL.LT.ZERO) THEN
 *        Criterion based on absolute off-diagonal value
          TMP1 = ABS(SPLTOL)* TNRM
diff --git a/SRC/dlarrb.f b/SRC/dlarrb.f
index 839b1d41ba..38555f818a 100644
--- a/SRC/dlarrb.f
+++ b/SRC/dlarrb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARRB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarrb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarrb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -178,7 +176,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larrb
 *
 *> \par Contributors:
 *  ==================
@@ -193,6 +191,7 @@
       SUBROUTINE DLARRB( N, D, LLD, IFIRST, ILAST, RTOL1,
      $                   RTOL2, OFFSET, W, WGAP, WERR, WORK, IWORK,
      $                   PIVMIN, SPDIAM, TWIST, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlarrc.f b/SRC/dlarrc.f
index 55a17626ac..95995430e4 100644
--- a/SRC/dlarrc.f
+++ b/SRC/dlarrc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARRC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarrc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarrc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,7 +118,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larrc
 *
 *> \par Contributors:
 *  ==================
@@ -134,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE DLARRC( JOBT, N, VL, VU, D, E, PIVMIN,
      $                            EIGCNT, LCNT, RCNT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -167,6 +166,9 @@ SUBROUTINE DLARRC( JOBT, N, VL, VU, D, E, PIVMIN,
 *     .. Executable Statements ..
 *
       INFO = 0
+      LCNT = 0
+      RCNT = 0
+      EIGCNT = 0
 *
 *     Quick return if possible
 *
@@ -174,9 +176,6 @@ SUBROUTINE DLARRC( JOBT, N, VL, VU, D, E, PIVMIN,
          RETURN
       END IF
 *
-      LCNT = 0
-      RCNT = 0
-      EIGCNT = 0
       MATT = LSAME( JOBT, 'T' )
 
 
diff --git a/SRC/dlarrd.f b/SRC/dlarrd.f
index 08dfd02c30..69e957c655 100644
--- a/SRC/dlarrd.f
+++ b/SRC/dlarrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -319,13 +317,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larrd
 *
 *  =====================================================================
       SUBROUTINE DLARRD( RANGE, ORDER, N, VL, VU, IL, IU, GERS,
      $                    RELTOL, D, E, E2, PIVMIN, NSPLIT, ISPLIT,
      $                    M, W, WERR, WL, WU, IBLOCK, INDEXW,
      $                    WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -381,6 +380,7 @@ SUBROUTINE DLARRD( RANGE, ORDER, N, VL, VU, IL, IU, GERS,
 *     .. Executable Statements ..
 *
       INFO = 0
+      M = 0
 *
 *     Quick return if possible
 *
@@ -424,14 +424,9 @@ SUBROUTINE DLARRD( RANGE, ORDER, N, VL, VU, IL, IU, GERS,
       END IF
 
 *     Initialize error flags
-      INFO = 0
       NCNVRG = .FALSE.
       TOOFEW = .FALSE.
 
-*     Quick return if possible
-      M = 0
-      IF( N.EQ.0 ) RETURN
-
 *     Simplification:
       IF( IRANGE.EQ.INDRNG .AND. IL.EQ.1 .AND. IU.EQ.N ) IRANGE = 1
 
@@ -680,7 +675,8 @@ SUBROUTINE DLARRD( RANGE, ORDER, N, VL, VU, IL, IU, GERS,
 *           Compute Eigenvalues
             ITMAX = INT( ( LOG( GU-GL+PIVMIN )-LOG( PIVMIN ) ) /
      $              LOG( TWO ) ) + 2
-            CALL DLAEBZ( 2, ITMAX, IN, IN, 1, NB, ATOLI, RTOLI, PIVMIN,
+            CALL DLAEBZ( 2, ITMAX, IN, IN, 1, NB, ATOLI, RTOLI,
+     $                   PIVMIN,
      $                   D( IBEGIN ), E( IBEGIN ), E2( IBEGIN ),
      $                   IDUMMA, WORK( N+1 ), WORK( N+2*IN+1 ), IOUT,
      $                   IWORK, W( M+1 ), IBLOCK( M+1 ), IINFO )
diff --git a/SRC/dlarre.f b/SRC/dlarre.f
index afbfe6379c..5dc07904fe 100644
--- a/SRC/dlarre.f
+++ b/SRC/dlarre.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARRE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarre.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarre.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -51,7 +49,7 @@
 *> DSTEMR to compute the eigenvectors of T.
 *> The accuracy varies depending on whether bisection is used to
 *> find a few eigenvalues or the dqds algorithm (subroutine DLASQ2) to
-*> conpute all and then discard any unwanted one.
+*> compute all and then discard any unwanted one.
 *> As an added benefit, DLARRE also outputs the n
 *> Gerschgorin intervals for the matrices L_i D_i L_i^T.
 *> \endverbatim
@@ -276,7 +274,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larre
 *
 *> \par Further Details:
 *  =====================
@@ -302,6 +300,7 @@ SUBROUTINE DLARRE( RANGE, N, VL, VU, IL, IU, D, E, E2,
      $                    RTOL1, RTOL2, SPLTOL, NSPLIT, ISPLIT, M,
      $                    W, WERR, WGAP, IBLOCK, INDEXW, GERS, PIVMIN,
      $                    WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -356,7 +355,8 @@ SUBROUTINE DLARRE( RANGE, N, VL, VU, IL, IU, D, E, E2,
 
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLARNV, DLARRA, DLARRB, DLARRC, DLARRD,
+      EXTERNAL           DCOPY, DLARNV, DLARRA, DLARRB, DLARRC,
+     $                   DLARRD,
      $                   DLASQ2, DLARRK
 *     ..
 *     .. Intrinsic Functions ..
@@ -367,6 +367,8 @@ SUBROUTINE DLARRE( RANGE, N, VL, VU, IL, IU, D, E, E2,
 *
 
       INFO = 0
+      NSPLIT = 0
+      M = 0
 *
 *     Quick return if possible
 *
@@ -384,8 +386,6 @@ SUBROUTINE DLARRE( RANGE, N, VL, VU, IL, IU, D, E, E2,
          IRANGE = INDRNG
       END IF
 
-      M = 0
-
 *     Get machine constants
       SAFMIN = DLAMCH( 'S' )
       EPS = DLAMCH( 'P' )
diff --git a/SRC/dlarrf.f b/SRC/dlarrf.f
index a496e1b2d8..1f1b8c7dbe 100644
--- a/SRC/dlarrf.f
+++ b/SRC/dlarrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -174,7 +172,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larrf
 *
 *> \par Contributors:
 *  ==================
@@ -190,6 +188,7 @@ SUBROUTINE DLARRF( N, D, L, LD, CLSTRT, CLEND,
      $                   W, WGAP, WERR,
      $                   SPDIAM, CLGAPL, CLGAPR, PIVMIN, SIGMA,
      $                   DPLUS, LPLUS, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlarrj.f b/SRC/dlarrj.f
index f6abd84e7f..af3110f6eb 100644
--- a/SRC/dlarrj.f
+++ b/SRC/dlarrj.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARRJ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarrj.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarrj.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -150,7 +148,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larrj
 *
 *> \par Contributors:
 *  ==================
@@ -165,6 +163,7 @@
       SUBROUTINE DLARRJ( N, D, E2, IFIRST, ILAST,
      $                   RTOL, OFFSET, W, WERR, WORK, IWORK,
      $                   PIVMIN, SPDIAM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlarrk.f b/SRC/dlarrk.f
index 6c56a9baba..ea95a59ed6 100644
--- a/SRC/dlarrk.f
+++ b/SRC/dlarrk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARRK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarrk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarrk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -137,11 +135,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larrk
 *
 *  =====================================================================
       SUBROUTINE DLARRK( N, IW, GL, GU,
      $                    D, E2, PIVMIN, RELTOL, W, WERR, INFO)
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlarrr.f b/SRC/dlarrr.f
index 3bd6beb308..8ac1c0238e 100644
--- a/SRC/dlarrr.f
+++ b/SRC/dlarrr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARRR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarrr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarrr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -78,7 +76,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larrr
 *
 *> \par Contributors:
 *  ==================
@@ -91,6 +89,7 @@
 *
 *  =====================================================================
       SUBROUTINE DLARRR( N, D, E, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlarrv.f b/SRC/dlarrv.f
index b036c1e660..4cf354ab76 100644
--- a/SRC/dlarrv.f
+++ b/SRC/dlarrv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARRV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarrv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarrv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -272,7 +270,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup larrv
 *
 *> \par Contributors:
 *  ==================
@@ -289,6 +287,7 @@ SUBROUTINE DLARRV( N, VL, VU, D, L, PIVMIN,
      $                   RTOL1, RTOL2, W, WERR, WGAP,
      $                   IBLOCK, INDEXW, GERS, Z, LDZ, ISUPPZ,
      $                   WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -337,7 +336,8 @@ SUBROUTINE DLARRV( N, VL, VU, D, L, PIVMIN,
       EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLAR1V, DLARRB, DLARRF, DLASET,
+      EXTERNAL           DCOPY, DLAR1V, DLARRB, DLARRF,
+     $                   DLASET,
      $                   DSCAL
 *     ..
 *     .. Intrinsic Functions ..
@@ -350,7 +350,7 @@ SUBROUTINE DLARRV( N, VL, VU, D, L, PIVMIN,
 *
 *     Quick return if possible
 *
-      IF( N.LE.0 ) THEN
+      IF( (N.LE.0).OR.(M.LE.0) ) THEN
          RETURN
       END IF
 *
diff --git a/SRC/dlarscl2.f b/SRC/dlarscl2.f
index 2468e2702d..ee55636f9a 100644
--- a/SRC/dlarscl2.f
+++ b/SRC/dlarscl2.f
@@ -1,11 +1,10 @@
-*> \brief \b DLARSCL2 performs reciprocal diagonal scaling on a vector.
+*> \brief \b DLARSCL2 performs reciprocal diagonal scaling on a matrix.
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARSCL2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarscl2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarscl2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -33,7 +31,7 @@
 *>
 *> \verbatim
 *>
-*> DLARSCL2 performs a reciprocal diagonal scaling on an vector:
+*> DLARSCL2 performs a reciprocal diagonal scaling on a matrix:
 *>   x <-- inv(D) * x
 *> where the diagonal matrix D is stored as a vector.
 *>
@@ -65,14 +63,14 @@
 *> \param[in,out] X
 *> \verbatim
 *>          X is DOUBLE PRECISION array, dimension (LDX,N)
-*>     On entry, the vector X to be scaled by D.
-*>     On exit, the scaled vector.
+*>     On entry, the matrix X to be scaled by D.
+*>     On exit, the scaled matrix.
 *> \endverbatim
 *>
 *> \param[in] LDX
 *> \verbatim
 *>          LDX is INTEGER
-*>     The leading dimension of the vector X. LDX >= M.
+*>     The leading dimension of the matrix X. LDX >= M.
 *> \endverbatim
 *
 *  Authors:
@@ -83,10 +81,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup larscl2
 *
 *  =====================================================================
       SUBROUTINE DLARSCL2 ( M, N, D, X, LDX )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlartg.f90 b/SRC/dlartg.f90
index 03a708f863..f6facdb1a6 100644
--- a/SRC/dlartg.f90
+++ b/SRC/dlartg.f90
@@ -11,7 +11,7 @@
 !       SUBROUTINE DLARTG( F, G, C, S, R )
 !
 !       .. Scalar Arguments ..
-!       REAL(wp)      C, F, G, R, S
+!       REAL(wp)          C, F, G, R, S
 !       ..
 !
 !> \par Purpose:
@@ -45,8 +45,6 @@
 !>       floating point operations (saves work in DBDSQR when
 !>       there are zeros on the diagonal).
 !>
-!> If F exceeds G in magnitude, C will be positive.
-!>
 !> Below, wp=>dp stands for double precision from LA_CONSTANTS module.
 !> \endverbatim
 !
@@ -90,7 +88,7 @@
 !
 !> \date July 2016
 !
-!> \ingroup OTHERauxiliary
+!> \ingroup lartg
 !
 !> \par Contributors:
 !  ==================
@@ -112,9 +110,10 @@
 subroutine DLARTG( f, g, c, s, r )
    use LA_CONSTANTS, &
    only: wp=>dp, zero=>dzero, half=>dhalf, one=>done, &
-         rtmin=>drtmin, rtmax=>drtmax, safmin=>dsafmin, safmax=>dsafmax
+         safmin=>dsafmin, safmax=>dsafmax
+   implicit none
 !
-!  -- LAPACK auxiliary routine (version 3.10.0) --
+!  -- LAPACK auxiliary routine --
 !  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 !  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 !     February 2021
@@ -123,11 +122,15 @@ subroutine DLARTG( f, g, c, s, r )
    real(wp) :: c, f, g, r, s
 !  ..
 !  .. Local Scalars ..
-   real(wp) :: d, f1, fs, g1, gs, p, u, uu
+   real(wp) :: d, f1, fs, g1, gs, u, rtmin, rtmax
 !  ..
 !  .. Intrinsic Functions ..
    intrinsic :: abs, sign, sqrt
 !  ..
+!  .. Constants ..
+   rtmin = sqrt( safmin )
+   rtmax = sqrt( safmax/2 )
+!  ..
 !  .. Executable Statements ..
 !
    f1 = abs( f )
@@ -143,20 +146,18 @@ subroutine DLARTG( f, g, c, s, r )
    else if( f1 > rtmin .and. f1 < rtmax .and. &
             g1 > rtmin .and. g1 < rtmax ) then
       d = sqrt( f*f + g*g )
-      p = one / d
-      c = f1*p
-      s = g*sign( p, f )
+      c = f1 / d
       r = sign( d, f )
+      s = g / r
    else
       u = min( safmax, max( safmin, f1, g1 ) )
-      uu = one / u
-      fs = f*uu
-      gs = g*uu
+      fs = f / u
+      gs = g / u
       d = sqrt( fs*fs + gs*gs )
-      p = one / d
-      c = abs( fs )*p
-      s = gs*sign( p, f )
-      r = sign( d, f )*u
+      c = abs( fs ) / d
+      r = sign( d, f )
+      s = gs / r
+      r = r*u
    end if
    return
 end subroutine
diff --git a/SRC/dlartgp.f b/SRC/dlartgp.f
index 8aeb2edbb8..27c02581eb 100644
--- a/SRC/dlartgp.f
+++ b/SRC/dlartgp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARTGP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlartgp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlartgp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,10 +86,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lartgp
 *
 *  =====================================================================
       SUBROUTINE DLARTGP( F, G, CS, SN, R )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlartgs.f b/SRC/dlartgs.f
index 2310df87fa..8ec0e256be 100644
--- a/SRC/dlartgs.f
+++ b/SRC/dlartgs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARTGS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlartgs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlartgs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -83,10 +81,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lartgs
 *
 *  =====================================================================
       SUBROUTINE DLARTGS( X, Y, SIGMA, CS, SN )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlartv.f b/SRC/dlartv.f
index 85f5136cd5..9dc4284f42 100644
--- a/SRC/dlartv.f
+++ b/SRC/dlartv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARTV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlartv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlartv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lartv
 *
 *  =====================================================================
       SUBROUTINE DLARTV( N, X, INCX, Y, INCY, C, S, INCC )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlaruv.f b/SRC/dlaruv.f
index 0f5c9541de..cd0ea3d51d 100644
--- a/SRC/dlaruv.f
+++ b/SRC/dlaruv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARUV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaruv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaruv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -72,7 +70,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup laruv
 *
 *> \par Further Details:
 *  =====================
@@ -92,6 +90,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLARUV( ISEED, N, X )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -382,6 +381,11 @@ SUBROUTINE DLARUV( ISEED, N, X )
      $                   1537 /
 *     ..
 *     .. Executable Statements ..
+*
+*     Quick return for N < 1
+      IF ( N < 1 ) THEN
+         RETURN
+      END IF
 *
       I1 = ISEED( 1 )
       I2 = ISEED( 2 )
diff --git a/SRC/dlarz.f b/SRC/dlarz.f
index 2c628a7f51..de3136d592 100644
--- a/SRC/dlarz.f
+++ b/SRC/dlarz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,7 +125,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup larz
 *
 *> \par Contributors:
 *  ==================
@@ -142,6 +140,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLARZ( SIDE, M, N, L, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,7 +182,8 @@ SUBROUTINE DLARZ( SIDE, M, N, L, V, INCV, TAU, C, LDC, WORK )
 *
 *           w( 1:n ) = w( 1:n ) + C( m-l+1:m, 1:n )**T * v( 1:l )
 *
-            CALL DGEMV( 'Transpose', L, N, ONE, C( M-L+1, 1 ), LDC, V,
+            CALL DGEMV( 'Transpose', L, N, ONE, C( M-L+1, 1 ), LDC,
+     $                  V,
      $                  INCV, ONE, WORK, 1 )
 *
 *           C( 1, 1:n ) = C( 1, 1:n ) - tau * w( 1:n )
@@ -209,7 +209,8 @@ SUBROUTINE DLARZ( SIDE, M, N, L, V, INCV, TAU, C, LDC, WORK )
 *
 *           w( 1:m ) = w( 1:m ) + C( 1:m, n-l+1:n, 1:n ) * v( 1:l )
 *
-            CALL DGEMV( 'No transpose', M, L, ONE, C( 1, N-L+1 ), LDC,
+            CALL DGEMV( 'No transpose', M, L, ONE, C( 1, N-L+1 ),
+     $                  LDC,
      $                  V, INCV, ONE, WORK, 1 )
 *
 *           C( 1:m, 1 ) = C( 1:m, 1 ) - tau * w( 1:m )
diff --git a/SRC/dlarzb.f b/SRC/dlarzb.f
index d7b8fd2c19..ff1645b530 100644
--- a/SRC/dlarzb.f
+++ b/SRC/dlarzb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARZB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarzb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarzb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -164,7 +162,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup larzb
 *
 *> \par Contributors:
 *  ==================
@@ -180,6 +178,7 @@
 *  =====================================================================
       SUBROUTINE DLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
      $                   LDV, T, LDT, C, LDC, WORK, LDWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -256,7 +255,8 @@ SUBROUTINE DLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
 *
 *        W( 1:n, 1:k ) = W( 1:n, 1:k ) * T**T  or  W( 1:m, 1:k ) * T
 *
-         CALL DTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K, ONE, T,
+         CALL DTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K, ONE,
+     $               T,
      $               LDT, WORK, LDWORK )
 *
 *        C( 1:k, 1:n ) = C( 1:k, 1:n ) - W( 1:n, 1:k )**T
@@ -271,7 +271,8 @@ SUBROUTINE DLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
 *                            V( 1:k, 1:l )**T * W( 1:n, 1:k )**T
 *
          IF( L.GT.0 )
-     $      CALL DGEMM( 'Transpose', 'Transpose', L, N, K, -ONE, V, LDV,
+     $      CALL DGEMM( 'Transpose', 'Transpose', L, N, K, -ONE, V,
+     $                  LDV,
      $                  WORK, LDWORK, ONE, C( M-L+1, 1 ), LDC )
 *
       ELSE IF( LSAME( SIDE, 'R' ) ) THEN
@@ -293,7 +294,8 @@ SUBROUTINE DLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
 *
 *        W( 1:m, 1:k ) = W( 1:m, 1:k ) * T  or  W( 1:m, 1:k ) * T**T
 *
-         CALL DTRMM( 'Right', 'Lower', TRANS, 'Non-unit', M, K, ONE, T,
+         CALL DTRMM( 'Right', 'Lower', TRANS, 'Non-unit', M, K, ONE,
+     $               T,
      $               LDT, WORK, LDWORK )
 *
 *        C( 1:m, 1:k ) = C( 1:m, 1:k ) - W( 1:m, 1:k )
@@ -308,7 +310,8 @@ SUBROUTINE DLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
 *                            W( 1:m, 1:k ) * V( 1:k, 1:l )
 *
          IF( L.GT.0 )
-     $      CALL DGEMM( 'No transpose', 'No transpose', M, L, K, -ONE,
+     $      CALL DGEMM( 'No transpose', 'No transpose', M, L, K,
+     $                  -ONE,
      $                  WORK, LDWORK, V, LDV, ONE, C( 1, N-L+1 ), LDC )
 *
       END IF
diff --git a/SRC/dlarzt.f b/SRC/dlarzt.f
index f24b690a40..e570903a0c 100644
--- a/SRC/dlarzt.f
+++ b/SRC/dlarzt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLARZT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlarzt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlarzt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,7 +131,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup larzt
 *
 *> \par Contributors:
 *  ==================
@@ -182,6 +180,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLARZT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlas2.f b/SRC/dlas2.f
index ea929e86f7..a5e2406ea0 100644
--- a/SRC/dlas2.f
+++ b/SRC/dlas2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlas2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlas2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -78,7 +76,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup las2
 *
 *> \par Further Details:
 *  =====================
@@ -93,9 +91,7 @@
 *>  infinite.
 *>
 *>  Overflow will not occur unless the largest singular value itself
-*>  overflows, or is within a few ulps of overflow. (On machines with
-*>  partial overflow, like the Cray, overflow may occur if the largest
-*>  singular value is within a factor of 2 of overflow.)
+*>  overflows, or is within a few ulps of overflow.
 *>
 *>  Underflow is harmless if underflow is gradual. Otherwise, results
 *>  may correspond to a matrix modified by perturbations of size near
@@ -104,6 +100,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLAS2( F, G, H, SSMIN, SSMAX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlascl.f b/SRC/dlascl.f
index 05ad1c4f3c..79ff0d2c84 100644
--- a/SRC/dlascl.f
+++ b/SRC/dlascl.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASCL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlascl.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlascl.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -136,10 +134,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lascl
 *
 *  =====================================================================
-      SUBROUTINE DLASCL( TYPE, KL, KU, CFROM, CTO, M, N, A, LDA, INFO )
+      SUBROUTINE DLASCL( TYPE, KL, KU, CFROM, CTO, M, N, A, LDA,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -272,6 +272,8 @@ SUBROUTINE DLASCL( TYPE, KL, KU, CFROM, CTO, M, N, A, LDA, INFO )
          ELSE
             MUL = CTOC / CFROMC
             DONE = .TRUE.
+            IF (MUL .EQ. ONE)
+     $         RETURN
          END IF
       END IF
 *
diff --git a/SRC/dlascl2.f b/SRC/dlascl2.f
index 901e43c494..0eb0990ac0 100644
--- a/SRC/dlascl2.f
+++ b/SRC/dlascl2.f
@@ -1,11 +1,10 @@
-*> \brief \b DLASCL2 performs diagonal scaling on a vector.
+*> \brief \b DLASCL2 performs diagonal scaling on a matrix.
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASCL2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlascl2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlascl2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -33,7 +31,7 @@
 *>
 *> \verbatim
 *>
-*> DLASCL2 performs a diagonal scaling on a vector:
+*> DLASCL2 performs a diagonal scaling on a matrix:
 *>   x <-- D * x
 *> where the diagonal matrix D is stored as a vector.
 *>
@@ -65,14 +63,14 @@
 *> \param[in,out] X
 *> \verbatim
 *>          X is DOUBLE PRECISION array, dimension (LDX,N)
-*>     On entry, the vector X to be scaled by D.
-*>     On exit, the scaled vector.
+*>     On entry, the matrix X to be scaled by D.
+*>     On exit, the scaled matrix.
 *> \endverbatim
 *>
 *> \param[in] LDX
 *> \verbatim
 *>          LDX is INTEGER
-*>     The leading dimension of the vector X. LDX >= M.
+*>     The leading dimension of the matrix X. LDX >= M.
 *> \endverbatim
 *
 *  Authors:
@@ -83,10 +81,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup lascl2
 *
 *  =====================================================================
       SUBROUTINE DLASCL2 ( M, N, D, X, LDX )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlasd0.f b/SRC/dlasd0.f
index 215dc87171..a5f301c014 100644
--- a/SRC/dlasd0.f
+++ b/SRC/dlasd0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASD0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasd0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasd0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -79,10 +77,11 @@
 *>         On exit, E has been destroyed.
 *> \endverbatim
 *>
-*> \param[out] U
+*> \param[in,out] U
 *> \verbatim
 *>          U is DOUBLE PRECISION array, dimension (LDU, N)
-*>         On exit, U contains the left singular vectors.
+*>         On exit, U contains the left singular vectors, 
+*>          if U passed in as (N, N) Identity.
 *> \endverbatim
 *>
 *> \param[in] LDU
@@ -91,10 +90,11 @@
 *>         On entry, leading dimension of U.
 *> \endverbatim
 *>
-*> \param[out] VT
+*> \param[in,out] VT
 *> \verbatim
 *>          VT is DOUBLE PRECISION array, dimension (LDVT, M)
-*>         On exit, VT**T contains the right singular vectors.
+*>         On exit, VT**T contains the right singular vectors,
+*>          if VT passed in as (M, M) Identity.
 *> \endverbatim
 *>
 *> \param[in] LDVT
@@ -136,7 +136,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd0
 *
 *> \par Contributors:
 *  ==================
@@ -145,8 +145,10 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE DLASD0( N, SQRE, D, E, U, LDU, VT, LDVT, SMLSIZ, IWORK,
+      SUBROUTINE DLASD0( N, SQRE, D, E, U, LDU, VT, LDVT, SMLSIZ,
+     $                   IWORK,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -201,7 +203,8 @@ SUBROUTINE DLASD0( N, SQRE, D, E, U, LDU, VT, LDVT, SMLSIZ, IWORK,
 *     If the input matrix is too small, call DLASDQ to find the SVD.
 *
       IF( N.LE.SMLSIZ ) THEN
-         CALL DLASDQ( 'U', SQRE, N, M, N, 0, D, E, VT, LDVT, U, LDU, U,
+         CALL DLASDQ( 'U', SQRE, N, M, N, 0, D, E, VT, LDVT, U, LDU,
+     $                U,
      $                LDU, WORK, INFO )
          RETURN
       END IF
@@ -238,7 +241,8 @@ SUBROUTINE DLASD0( N, SQRE, D, E, U, LDU, VT, LDVT, SMLSIZ, IWORK,
          NLF = IC - NL
          NRF = IC + 1
          SQREI = 1
-         CALL DLASDQ( 'U', SQREI, NL, NLP1, NL, NCC, D( NLF ), E( NLF ),
+         CALL DLASDQ( 'U', SQREI, NL, NLP1, NL, NCC, D( NLF ),
+     $                E( NLF ),
      $                VT( NLF, NLF ), LDVT, U( NLF, NLF ), LDU,
      $                U( NLF, NLF ), LDU, WORK, INFO )
          IF( INFO.NE.0 ) THEN
@@ -254,7 +258,8 @@ SUBROUTINE DLASD0( N, SQRE, D, E, U, LDU, VT, LDVT, SMLSIZ, IWORK,
             SQREI = 1
          END IF
          NRP1 = NR + SQREI
-         CALL DLASDQ( 'U', SQREI, NR, NRP1, NR, NCC, D( NRF ), E( NRF ),
+         CALL DLASDQ( 'U', SQREI, NR, NRP1, NR, NCC, D( NRF ),
+     $                E( NRF ),
      $                VT( NRF, NRF ), LDVT, U( NRF, NRF ), LDU,
      $                U( NRF, NRF ), LDU, WORK, INFO )
          IF( INFO.NE.0 ) THEN
diff --git a/SRC/dlasd1.f b/SRC/dlasd1.f
index f17bf94853..96078d3668 100644
--- a/SRC/dlasd1.f
+++ b/SRC/dlasd1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASD1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasd1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasd1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -190,7 +188,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd1
 *
 *> \par Contributors:
 *  ==================
@@ -199,8 +197,10 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE DLASD1( NL, NR, SQRE, D, ALPHA, BETA, U, LDU, VT, LDVT,
+      SUBROUTINE DLASD1( NL, NR, SQRE, D, ALPHA, BETA, U, LDU, VT,
+     $                   LDVT,
      $                   IDXQ, IWORK, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -228,7 +228,8 @@ SUBROUTINE DLASD1( NL, NR, SQRE, D, ALPHA, BETA, U, LDU, VT, LDVT,
       DOUBLE PRECISION   ORGNRM
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLAMRG, DLASCL, DLASD2, DLASD3, XERBLA
+      EXTERNAL           DLAMRG, DLASCL, DLASD2, DLASD3,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -287,7 +288,8 @@ SUBROUTINE DLASD1( NL, NR, SQRE, D, ALPHA, BETA, U, LDU, VT, LDVT,
 *
 *     Deflate singular values.
 *
-      CALL DLASD2( NL, NR, SQRE, K, D, WORK( IZ ), ALPHA, BETA, U, LDU,
+      CALL DLASD2( NL, NR, SQRE, K, D, WORK( IZ ), ALPHA, BETA, U,
+     $             LDU,
      $             VT, LDVT, WORK( ISIGMA ), WORK( IU2 ), LDU2,
      $             WORK( IVT2 ), LDVT2, IWORK( IDXP ), IWORK( IDX ),
      $             IWORK( IDXC ), IDXQ, IWORK( COLTYP ), INFO )
@@ -295,7 +297,8 @@ SUBROUTINE DLASD1( NL, NR, SQRE, D, ALPHA, BETA, U, LDU, VT, LDVT,
 *     Solve Secular Equation and update singular vectors.
 *
       LDQ = K
-      CALL DLASD3( NL, NR, SQRE, K, D, WORK( IQ ), LDQ, WORK( ISIGMA ),
+      CALL DLASD3( NL, NR, SQRE, K, D, WORK( IQ ), LDQ,
+     $             WORK( ISIGMA ),
      $             U, LDU, WORK( IU2 ), LDU2, VT, LDVT, WORK( IVT2 ),
      $             LDVT2, IWORK( IDXC ), IWORK( COLTYP ), WORK( IZ ),
      $             INFO )
diff --git a/SRC/dlasd2.f b/SRC/dlasd2.f
index 378faa6813..911b43fad1 100644
--- a/SRC/dlasd2.f
+++ b/SRC/dlasd2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASD2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasd2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasd2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -254,7 +252,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd2
 *
 *> \par Contributors:
 *  ==================
@@ -263,9 +261,11 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE DLASD2( NL, NR, SQRE, K, D, Z, ALPHA, BETA, U, LDU, VT,
+      SUBROUTINE DLASD2( NL, NR, SQRE, K, D, Z, ALPHA, BETA, U, LDU,
+     $                   VT,
      $                   LDVT, DSIGMA, U2, LDU2, VT2, LDVT2, IDXP, IDX,
      $                   IDXC, IDXQ, COLTYP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -303,7 +303,8 @@ SUBROUTINE DLASD2( NL, NR, SQRE, K, D, Z, ALPHA, BETA, U, LDU, VT,
       EXTERNAL           DLAMCH, DLAPY2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLACPY, DLAMRG, DLASET, DROT, XERBLA
+      EXTERNAL           DCOPY, DLACPY, DLAMRG, DLASET, DROT,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -479,7 +480,8 @@ SUBROUTINE DLASD2( NL, NR, SQRE, K, D, Z, ALPHA, BETA, U, LDU, VT,
                IDXJ = IDXJ - 1
             END IF
             CALL DROT( N, U( 1, IDXJP ), 1, U( 1, IDXJ ), 1, C, S )
-            CALL DROT( M, VT( IDXJP, 1 ), LDVT, VT( IDXJ, 1 ), LDVT, C,
+            CALL DROT( M, VT( IDXJP, 1 ), LDVT, VT( IDXJ, 1 ), LDVT,
+     $                 C,
      $                 S )
             IF( COLTYP( J ).NE.COLTYP( JPREV ) ) THEN
                COLTYP( J ) = 3
@@ -614,7 +616,8 @@ SUBROUTINE DLASD2( NL, NR, SQRE, K, D, Z, ALPHA, BETA, U, LDU, VT,
          CALL DCOPY( N-K, DSIGMA( K+1 ), 1, D( K+1 ), 1 )
          CALL DLACPY( 'A', N, N-K, U2( 1, K+1 ), LDU2, U( 1, K+1 ),
      $                LDU )
-         CALL DLACPY( 'A', N-K, M, VT2( K+1, 1 ), LDVT2, VT( K+1, 1 ),
+         CALL DLACPY( 'A', N-K, M, VT2( K+1, 1 ), LDVT2, VT( K+1,
+     $                1 ),
      $                LDVT )
       END IF
 *
diff --git a/SRC/dlasd3.f b/SRC/dlasd3.f
index df939efc54..6effd905df 100644
--- a/SRC/dlasd3.f
+++ b/SRC/dlasd3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASD3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasd3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasd3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -44,13 +42,6 @@
 *> appropriate calls to DLASD4 and then updates the singular
 *> vectors by matrix multiplication.
 *>
-*> This code makes very mild assumptions about floating point
-*> arithmetic. It will work on machines with a guard digit in
-*> add/subtract, or on those binary machines without guard digits
-*> which subtract like the Cray XMP, Cray YMP, Cray C 90, or Cray 2.
-*> It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
-*>
 *> DLASD3 is called from DLASD1.
 *> \endverbatim
 *
@@ -103,7 +94,7 @@
 *>         The leading dimension of the array Q.  LDQ >= K.
 *> \endverbatim
 *>
-*> \param[in,out] DSIGMA
+*> \param[in] DSIGMA
 *> \verbatim
 *>          DSIGMA is DOUBLE PRECISION array, dimension(K)
 *>         The first K elements of this array contain the old roots
@@ -209,7 +200,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd3
 *
 *> \par Contributors:
 *  ==================
@@ -218,9 +209,11 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE DLASD3( NL, NR, SQRE, K, D, Q, LDQ, DSIGMA, U, LDU, U2,
+      SUBROUTINE DLASD3( NL, NR, SQRE, K, D, Q, LDQ, DSIGMA, U, LDU,
+     $                   U2,
      $                   LDU2, VT, LDVT, VT2, LDVT2, IDXC, CTOT, Z,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -249,11 +242,12 @@ SUBROUTINE DLASD3( NL, NR, SQRE, K, D, Q, LDQ, DSIGMA, U, LDU, U2,
       DOUBLE PRECISION   RHO, TEMP
 *     ..
 *     .. External Functions ..
-      DOUBLE PRECISION   DLAMC3, DNRM2
-      EXTERNAL           DLAMC3, DNRM2
+      DOUBLE PRECISION   DNRM2
+      EXTERNAL           DNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEMM, DLACPY, DLASCL, DLASD4, XERBLA
+      EXTERNAL           DCOPY, DGEMM, DLACPY, DLASCL, DLASD4,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, SIGN, SQRT
@@ -310,27 +304,6 @@ SUBROUTINE DLASD3( NL, NR, SQRE, K, D, Q, LDQ, DSIGMA, U, LDU, U2,
          RETURN
       END IF
 *
-*     Modify values DSIGMA(i) to make sure all DSIGMA(i)-DSIGMA(j) can
-*     be computed with high relative accuracy (barring over/underflow).
-*     This is a problem on machines without a guard digit in
-*     add/subtract (Cray XMP, Cray YMP, Cray C 90 and Cray 2).
-*     The following code replaces DSIGMA(I) by 2*DSIGMA(I)-DSIGMA(I),
-*     which on any of these machines zeros out the bottommost
-*     bit of DSIGMA(I) if it is 1; this makes the subsequent
-*     subtractions DSIGMA(I)-DSIGMA(J) unproblematic when cancellation
-*     occurs. On binary machines with a guard digit (almost all
-*     machines) it does not change DSIGMA(I) at all. On hexadecimal
-*     and decimal machines with a guard digit, it slightly
-*     changes the bottommost bits of DSIGMA(I). It does not account
-*     for hexadecimal or decimal machines without guard digits
-*     (we know of none). We use a subroutine call to compute
-*     2*DSIGMA(I) to prevent optimizing compilers from eliminating
-*     this code.
-*
-      DO 20 I = 1, K
-         DSIGMA( I ) = DLAMC3( DSIGMA( I ), DSIGMA( I ) ) - DSIGMA( I )
-   20 CONTINUE
-*
 *     Keep a copy of Z.
 *
       CALL DCOPY( K, Z, 1, Q, 1 )
@@ -392,16 +365,19 @@ SUBROUTINE DLASD3( NL, NR, SQRE, K, D, Q, LDQ, DSIGMA, U, LDU, U2,
 *     Update the left singular vector matrix.
 *
       IF( K.EQ.2 ) THEN
-         CALL DGEMM( 'N', 'N', N, K, K, ONE, U2, LDU2, Q, LDQ, ZERO, U,
+         CALL DGEMM( 'N', 'N', N, K, K, ONE, U2, LDU2, Q, LDQ, ZERO,
+     $               U,
      $               LDU )
          GO TO 100
       END IF
       IF( CTOT( 1 ).GT.0 ) THEN
-         CALL DGEMM( 'N', 'N', NL, K, CTOT( 1 ), ONE, U2( 1, 2 ), LDU2,
+         CALL DGEMM( 'N', 'N', NL, K, CTOT( 1 ), ONE, U2( 1, 2 ),
+     $               LDU2,
      $               Q( 2, 1 ), LDQ, ZERO, U( 1, 1 ), LDU )
          IF( CTOT( 3 ).GT.0 ) THEN
             KTEMP = 2 + CTOT( 1 ) + CTOT( 2 )
-            CALL DGEMM( 'N', 'N', NL, K, CTOT( 3 ), ONE, U2( 1, KTEMP ),
+            CALL DGEMM( 'N', 'N', NL, K, CTOT( 3 ), ONE, U2( 1,
+     $                  KTEMP ),
      $                  LDU2, Q( KTEMP, 1 ), LDQ, ONE, U( 1, 1 ), LDU )
          END IF
       ELSE IF( CTOT( 3 ).GT.0 ) THEN
@@ -414,7 +390,8 @@ SUBROUTINE DLASD3( NL, NR, SQRE, K, D, Q, LDQ, DSIGMA, U, LDU, U2,
       CALL DCOPY( K, Q( 1, 1 ), LDQ, U( NLP1, 1 ), LDU )
       KTEMP = 2 + CTOT( 1 )
       CTEMP = CTOT( 2 ) + CTOT( 3 )
-      CALL DGEMM( 'N', 'N', NR, K, CTEMP, ONE, U2( NLP2, KTEMP ), LDU2,
+      CALL DGEMM( 'N', 'N', NR, K, CTEMP, ONE, U2( NLP2, KTEMP ),
+     $            LDU2,
      $            Q( KTEMP, 1 ), LDQ, ZERO, U( NLP2, 1 ), LDU )
 *
 *     Generate the right singular vectors.
@@ -432,7 +409,8 @@ SUBROUTINE DLASD3( NL, NR, SQRE, K, D, Q, LDQ, DSIGMA, U, LDU, U2,
 *     Update the right singular vector matrix.
 *
       IF( K.EQ.2 ) THEN
-         CALL DGEMM( 'N', 'N', K, M, K, ONE, Q, LDQ, VT2, LDVT2, ZERO,
+         CALL DGEMM( 'N', 'N', K, M, K, ONE, Q, LDQ, VT2, LDVT2,
+     $               ZERO,
      $               VT, LDVT )
          RETURN
       END IF
@@ -441,7 +419,8 @@ SUBROUTINE DLASD3( NL, NR, SQRE, K, D, Q, LDQ, DSIGMA, U, LDU, U2,
      $            VT2( 1, 1 ), LDVT2, ZERO, VT( 1, 1 ), LDVT )
       KTEMP = 2 + CTOT( 1 ) + CTOT( 2 )
       IF( KTEMP.LE.LDVT2 )
-     $   CALL DGEMM( 'N', 'N', K, NLP1, CTOT( 3 ), ONE, Q( 1, KTEMP ),
+     $   CALL DGEMM( 'N', 'N', K, NLP1, CTOT( 3 ), ONE, Q( 1,
+     $               KTEMP ),
      $               LDQ, VT2( KTEMP, 1 ), LDVT2, ONE, VT( 1, 1 ),
      $               LDVT )
 *
diff --git a/SRC/dlasd4.f b/SRC/dlasd4.f
index acfd896b3b..dee6f32a41 100644
--- a/SRC/dlasd4.f
+++ b/SRC/dlasd4.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASD4 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasd4.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasd4.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -140,7 +138,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd4
 *
 *> \par Contributors:
 *  ==================
@@ -150,6 +148,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLASD4( N, I, D, Z, DELTA, RHO, SIGMA, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlasd5.f b/SRC/dlasd5.f
index 645c2fdc3e..cc82db40b1 100644
--- a/SRC/dlasd5.f
+++ b/SRC/dlasd5.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASD5 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasd5.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasd5.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -103,7 +101,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd5
 *
 *> \par Contributors:
 *  ==================
@@ -113,6 +111,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLASD5( I, D, Z, DELTA, RHO, DSIGMA, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlasd6.f b/SRC/dlasd6.f
index 51e67588dd..276efd365f 100644
--- a/SRC/dlasd6.f
+++ b/SRC/dlasd6.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASD6 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasd6.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasd6.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -297,7 +295,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd6
 *
 *> \par Contributors:
 *  ==================
@@ -306,10 +304,12 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE DLASD6( ICOMPQ, NL, NR, SQRE, D, VF, VL, ALPHA, BETA,
+      SUBROUTINE DLASD6( ICOMPQ, NL, NR, SQRE, D, VF, VL, ALPHA,
+     $                   BETA,
      $                   IDXQ, PERM, GIVPTR, GIVCOL, LDGCOL, GIVNUM,
      $                   LDGNUM, POLES, DIFL, DIFR, Z, K, C, S, WORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -340,7 +340,8 @@ SUBROUTINE DLASD6( ICOMPQ, NL, NR, SQRE, D, VF, VL, ALPHA, BETA,
       DOUBLE PRECISION   ORGNRM
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLAMRG, DLASCL, DLASD7, DLASD8, XERBLA
+      EXTERNAL           DCOPY, DLAMRG, DLASCL, DLASD7, DLASD8,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
diff --git a/SRC/dlasd7.f b/SRC/dlasd7.f
index ff9ba4c36a..e7baeb2448 100644
--- a/SRC/dlasd7.f
+++ b/SRC/dlasd7.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASD7 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasd7.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasd7.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -264,7 +262,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd7
 *
 *> \par Contributors:
 *  ==================
@@ -273,10 +271,12 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE DLASD7( ICOMPQ, NL, NR, SQRE, K, D, Z, ZW, VF, VFW, VL,
+      SUBROUTINE DLASD7( ICOMPQ, NL, NR, SQRE, K, D, Z, ZW, VF, VFW,
+     $                   VL,
      $                   VLW, ALPHA, BETA, DSIGMA, IDX, IDXP, IDXQ,
      $                   PERM, GIVPTR, GIVCOL, LDGCOL, GIVNUM, LDGNUM,
      $                   C, S, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlasd8.f b/SRC/dlasd8.f
index a769bdb22e..c446ca4a2a 100644
--- a/SRC/dlasd8.f
+++ b/SRC/dlasd8.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASD8 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasd8.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasd8.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,14 +119,12 @@
 *>          The leading dimension of DIFR, must be at least K.
 *> \endverbatim
 *>
-*> \param[in,out] DSIGMA
+*> \param[in] DSIGMA
 *> \verbatim
 *>          DSIGMA is DOUBLE PRECISION array, dimension ( K )
 *>          On entry, the first K elements of this array contain the old
 *>          roots of the deflated updating problem.  These are the poles
 *>          of the secular equation.
-*>          On exit, the elements of DSIGMA may be very slightly altered
-*>          in value.
 *> \endverbatim
 *>
 *> \param[out] WORK
@@ -152,7 +148,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd8
 *
 *> \par Contributors:
 *  ==================
@@ -163,6 +159,7 @@
 *  =====================================================================
       SUBROUTINE DLASD8( ICOMPQ, K, D, Z, VF, VL, DIFL, DIFR, LDDIFR,
      $                   DSIGMA, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,7 +185,8 @@ SUBROUTINE DLASD8( ICOMPQ, K, D, Z, VF, VL, DIFL, DIFR, LDDIFR,
       DOUBLE PRECISION   DIFLJ, DIFRJ, DJ, DSIGJ, DSIGJP, RHO, TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLASCL, DLASD4, DLASET, XERBLA
+      EXTERNAL           DCOPY, DLASCL, DLASD4, DLASET,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION   DDOT, DLAMC3, DNRM2
@@ -227,27 +225,6 @@ SUBROUTINE DLASD8( ICOMPQ, K, D, Z, VF, VL, DIFL, DIFR, LDDIFR,
          RETURN
       END IF
 *
-*     Modify values DSIGMA(i) to make sure all DSIGMA(i)-DSIGMA(j) can
-*     be computed with high relative accuracy (barring over/underflow).
-*     This is a problem on machines without a guard digit in
-*     add/subtract (Cray XMP, Cray YMP, Cray C 90 and Cray 2).
-*     The following code replaces DSIGMA(I) by 2*DSIGMA(I)-DSIGMA(I),
-*     which on any of these machines zeros out the bottommost
-*     bit of DSIGMA(I) if it is 1; this makes the subsequent
-*     subtractions DSIGMA(I)-DSIGMA(J) unproblematic when cancellation
-*     occurs. On binary machines with a guard digit (almost all
-*     machines) it does not change DSIGMA(I) at all. On hexadecimal
-*     and decimal machines with a guard digit, it slightly
-*     changes the bottommost bits of DSIGMA(I). It does not account
-*     for hexadecimal or decimal machines without guard digits
-*     (we know of none). We use a subroutine call to compute
-*     2*DLAMBDA(I) to prevent optimizing compilers from eliminating
-*     this code.
-*
-      DO 10 I = 1, K
-         DSIGMA( I ) = DLAMC3( DSIGMA( I ), DSIGMA( I ) ) - DSIGMA( I )
-   10 CONTINUE
-*
 *     Book keeping.
 *
       IWK1 = 1
@@ -312,12 +289,19 @@ SUBROUTINE DLASD8( ICOMPQ, K, D, Z, VF, VL, DIFL, DIFR, LDDIFR,
             DSIGJP = -DSIGMA( J+1 )
          END IF
          WORK( J ) = -Z( J ) / DIFLJ / ( DSIGMA( J )+DJ )
+*
+*        Use calls to the subroutine DLAMC3 to enforce the parentheses
+*        (x+y)+z. The goal is to prevent optimizing compilers
+*        from doing x+(y+z).
+*
          DO 60 I = 1, J - 1
-            WORK( I ) = Z( I ) / ( DLAMC3( DSIGMA( I ), DSIGJ )-DIFLJ )
+            WORK( I ) = Z( I ) / ( DLAMC3( DSIGMA( I ),
+     $            DSIGJ )-DIFLJ )
      $                   / ( DSIGMA( I )+DJ )
    60    CONTINUE
          DO 70 I = J + 1, K
-            WORK( I ) = Z( I ) / ( DLAMC3( DSIGMA( I ), DSIGJP )+DIFRJ )
+            WORK( I ) = Z( I ) / ( DLAMC3( DSIGMA( I ),
+     $            DSIGJP )+DIFRJ )
      $                   / ( DSIGMA( I )+DJ )
    70    CONTINUE
          TEMP = DNRM2( K, WORK, 1 )
diff --git a/SRC/dlasda.f b/SRC/dlasda.f
index 3e169a4edb..70bc87bd0c 100644
--- a/SRC/dlasda.f
+++ b/SRC/dlasda.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASDA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasda.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasda.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -258,7 +256,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasda
 *
 *> \par Contributors:
 *  ==================
@@ -267,9 +265,11 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE DLASDA( ICOMPQ, SMLSIZ, N, SQRE, D, E, U, LDU, VT, K,
+      SUBROUTINE DLASDA( ICOMPQ, SMLSIZ, N, SQRE, D, E, U, LDU, VT,
+     $                   K,
      $                   DIFL, DIFR, Z, POLES, GIVPTR, GIVCOL, LDGCOL,
      $                   PERM, GIVNUM, C, S, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -301,7 +301,8 @@ SUBROUTINE DLASDA( ICOMPQ, SMLSIZ, N, SQRE, D, E, U, LDU, VT, K,
       DOUBLE PRECISION   ALPHA, BETA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLASD6, DLASDQ, DLASDT, DLASET, XERBLA
+      EXTERNAL           DCOPY, DLASD6, DLASDQ, DLASDT, DLASET,
+     $                   XERBLA
 *     ..
 *     .. Executable Statements ..
 *
@@ -333,10 +334,12 @@ SUBROUTINE DLASDA( ICOMPQ, SMLSIZ, N, SQRE, D, E, U, LDU, VT, K,
 *
       IF( N.LE.SMLSIZ ) THEN
          IF( ICOMPQ.EQ.0 ) THEN
-            CALL DLASDQ( 'U', SQRE, N, 0, 0, 0, D, E, VT, LDU, U, LDU,
+            CALL DLASDQ( 'U', SQRE, N, 0, 0, 0, D, E, VT, LDU, U,
+     $                   LDU,
      $                   U, LDU, WORK, INFO )
          ELSE
-            CALL DLASDQ( 'U', SQRE, N, M, N, 0, D, E, VT, LDU, U, LDU,
+            CALL DLASDQ( 'U', SQRE, N, M, N, 0, D, E, VT, LDU, U,
+     $                   LDU,
      $                   U, LDU, WORK, INFO )
          END IF
          RETURN
@@ -397,7 +400,8 @@ SUBROUTINE DLASDA( ICOMPQ, SMLSIZ, N, SQRE, D, E, U, LDU, VT, K,
             CALL DCOPY( NLP1, WORK( ITEMP ), 1, WORK( VLI ), 1 )
          ELSE
             CALL DLASET( 'A', NL, NL, ZERO, ONE, U( NLF, 1 ), LDU )
-            CALL DLASET( 'A', NLP1, NLP1, ZERO, ONE, VT( NLF, 1 ), LDU )
+            CALL DLASET( 'A', NLP1, NLP1, ZERO, ONE, VT( NLF, 1 ),
+     $                   LDU )
             CALL DLASDQ( 'U', SQREI, NL, NLP1, NL, NCC, D( NLF ),
      $                   E( NLF ), VT( NLF, 1 ), LDU, U( NLF, 1 ), LDU,
      $                   U( NLF, 1 ), LDU, WORK( NWORK1 ), INFO )
@@ -431,7 +435,8 @@ SUBROUTINE DLASDA( ICOMPQ, SMLSIZ, N, SQRE, D, E, U, LDU, VT, K,
             CALL DCOPY( NRP1, WORK( ITEMP ), 1, WORK( VLI ), 1 )
          ELSE
             CALL DLASET( 'A', NR, NR, ZERO, ONE, U( NRF, 1 ), LDU )
-            CALL DLASET( 'A', NRP1, NRP1, ZERO, ONE, VT( NRF, 1 ), LDU )
+            CALL DLASET( 'A', NRP1, NRP1, ZERO, ONE, VT( NRF, 1 ),
+     $                   LDU )
             CALL DLASDQ( 'U', SQREI, NR, NRP1, NR, NCC, D( NRF ),
      $                   E( NRF ), VT( NRF, 1 ), LDU, U( NRF, 1 ), LDU,
      $                   U( NRF, 1 ), LDU, WORK( NWORK1 ), INFO )
diff --git a/SRC/dlasdq.f b/SRC/dlasdq.f
index 0c39b24f0d..5c6fdb650e 100644
--- a/SRC/dlasdq.f
+++ b/SRC/dlasdq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASDQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasdq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasdq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -197,7 +195,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasdq
 *
 *> \par Contributors:
 *  ==================
@@ -206,8 +204,10 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE DLASDQ( UPLO, SQRE, N, NCVT, NRU, NCC, D, E, VT, LDVT,
+      SUBROUTINE DLASDQ( UPLO, SQRE, N, NCVT, NRU, NCC, D, E, VT,
+     $                   LDVT,
      $                   U, LDU, C, LDC, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -234,7 +234,8 @@ SUBROUTINE DLASDQ( UPLO, SQRE, N, NCVT, NRU, NCC, D, E, VT, LDVT,
       DOUBLE PRECISION   CS, R, SMIN, SN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DBDSQR, DLARTG, DLASR, DSWAP, XERBLA
+      EXTERNAL           DBDSQR, DLARTG, DLASR, DSWAP,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -395,7 +396,8 @@ SUBROUTINE DLASDQ( UPLO, SQRE, N, NCVT, NRU, NCC, D, E, VT, LDVT,
             D( ISUB ) = D( I )
             D( I ) = SMIN
             IF( NCVT.GT.0 )
-     $         CALL DSWAP( NCVT, VT( ISUB, 1 ), LDVT, VT( I, 1 ), LDVT )
+     $         CALL DSWAP( NCVT, VT( ISUB, 1 ), LDVT, VT( I, 1 ),
+     $                     LDVT )
             IF( NRU.GT.0 )
      $         CALL DSWAP( NRU, U( 1, ISUB ), 1, U( 1, I ), 1 )
             IF( NCC.GT.0 )
diff --git a/SRC/dlasdt.f b/SRC/dlasdt.f
index 0d9999ea62..23d62b5ac1 100644
--- a/SRC/dlasdt.f
+++ b/SRC/dlasdt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASDT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasdt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasdt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -92,7 +90,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasdt
 *
 *> \par Contributors:
 *  ==================
@@ -102,6 +100,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLASDT( N, LVL, ND, INODE, NDIML, NDIMR, MSUB )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlaset.f b/SRC/dlaset.f
index 625c757b6b..67777a8c2e 100644
--- a/SRC/dlaset.f
+++ b/SRC/dlaset.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASET + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaset.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaset.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -103,10 +101,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup laset
 *
 *  =====================================================================
       SUBROUTINE DLASET( UPLO, M, N, ALPHA, BETA, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlasq1.f b/SRC/dlasq1.f
index 27fa30736e..0b4903dd16 100644
--- a/SRC/dlasq1.f
+++ b/SRC/dlasq1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASQ1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasq1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasq1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lasq1
 *
 *  =====================================================================
       SUBROUTINE DLASQ1( N, D, E, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -128,7 +127,8 @@ SUBROUTINE DLASQ1( N, D, E, WORK, INFO )
       DOUBLE PRECISION   EPS, SCALE, SAFMIN, SIGMN, SIGMX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLAS2, DLASCL, DLASQ2, DLASRT, XERBLA
+      EXTERNAL           DCOPY, DLAS2, DLASCL, DLASQ2, DLASRT,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION   DLAMCH
diff --git a/SRC/dlasq2.f b/SRC/dlasq2.f
index 608ca7a619..7f46e06b9e 100644
--- a/SRC/dlasq2.f
+++ b/SRC/dlasq2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASQ2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasq2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasq2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,7 +93,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lasq2
 *
 *> \par Further Details:
 *  =====================
@@ -109,6 +107,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLASQ2( N, Z, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -463,7 +462,8 @@ SUBROUTINE DLASQ2( N, Z, INFO )
 *
 *           While submatrix unfinished take a good dqds step.
 *
-            CALL DLASQ3( I0, N0, Z, PP, DMIN, SIGMA, DESIG, QMAX, NFAIL,
+            CALL DLASQ3( I0, N0, Z, PP, DMIN, SIGMA, DESIG, QMAX,
+     $                   NFAIL,
      $                   ITER, NDIV, IEEE, TTYPE, DMIN1, DMIN2, DN, DN1,
      $                   DN2, G, TAU )
 *
diff --git a/SRC/dlasq3.f b/SRC/dlasq3.f
index e4bdafe06e..50769f906d 100644
--- a/SRC/dlasq3.f
+++ b/SRC/dlasq3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASQ3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasq3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasq3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -173,12 +171,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lasq3
 *
 *  =====================================================================
-      SUBROUTINE DLASQ3( I0, N0, Z, PP, DMIN, SIGMA, DESIG, QMAX, NFAIL,
+      SUBROUTINE DLASQ3( I0, N0, Z, PP, DMIN, SIGMA, DESIG, QMAX,
+     $                   NFAIL,
      $                   ITER, NDIV, IEEE, TTYPE, DMIN1, DMIN2, DN, DN1,
      $                   DN2, G, TAU )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlasq4.f b/SRC/dlasq4.f
index 2652ddb2ba..cd99b14237 100644
--- a/SRC/dlasq4.f
+++ b/SRC/dlasq4.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASQ4 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasq4.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasq4.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,7 +133,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lasq4
 *
 *> \par Further Details:
 *  =====================
@@ -148,6 +146,7 @@
 *  =====================================================================
       SUBROUTINE DLASQ4( I0, N0, Z, PP, N0IN, DMIN, DMIN1, DMIN2, DN,
      $                   DN1, DN2, TAU, TTYPE, G )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlasq5.f b/SRC/dlasq5.f
index 5679ab60a5..99e046317b 100644
--- a/SRC/dlasq5.f
+++ b/SRC/dlasq5.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASQ5 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasq5.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasq5.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -136,11 +134,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lasq5
 *
 *  =====================================================================
-      SUBROUTINE DLASQ5( I0, N0, Z, PP, TAU, SIGMA, DMIN, DMIN1, DMIN2,
+      SUBROUTINE DLASQ5( I0, N0, Z, PP, TAU, SIGMA, DMIN, DMIN1,
+     $                   DMIN2,
      $                   DN, DNM1, DNM2, IEEE, EPS )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlasq6.f b/SRC/dlasq6.f
index 9218b5060e..1f3b3e4524 100644
--- a/SRC/dlasq6.f
+++ b/SRC/dlasq6.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASQ6 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasq6.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasq6.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -111,11 +109,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lasq6
 *
 *  =====================================================================
       SUBROUTINE DLASQ6( I0, N0, Z, PP, DMIN, DMIN1, DMIN2, DN,
      $                   DNM1, DNM2 )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlasr.f b/SRC/dlasr.f
index dd0cedd85e..c3a805ab12 100644
--- a/SRC/dlasr.f
+++ b/SRC/dlasr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -192,10 +190,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasr
 *
 *  =====================================================================
       SUBROUTINE DLASR( SIDE, PIVOT, DIRECT, M, N, C, S, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -234,12 +233,14 @@ SUBROUTINE DLASR( SIDE, PIVOT, DIRECT, M, N, C, S, A, LDA )
 *     Test the input parameters
 *
       INFO = 0
-      IF( .NOT.( LSAME( SIDE, 'L' ) .OR. LSAME( SIDE, 'R' ) ) ) THEN
+      IF( .NOT.( LSAME( SIDE, 'L' ) .OR.
+     $    LSAME( SIDE, 'R' ) ) ) THEN
          INFO = 1
       ELSE IF( .NOT.( LSAME( PIVOT, 'V' ) .OR. LSAME( PIVOT,
      $         'T' ) .OR. LSAME( PIVOT, 'B' ) ) ) THEN
          INFO = 2
-      ELSE IF( .NOT.( LSAME( DIRECT, 'F' ) .OR. LSAME( DIRECT, 'B' ) ) )
+      ELSE IF( .NOT.( LSAME( DIRECT, 'F' ) .OR.
+     $         LSAME( DIRECT, 'B' ) ) )
      $          THEN
          INFO = 3
       ELSE IF( M.LT.0 ) THEN
diff --git a/SRC/dlasrt.f b/SRC/dlasrt.f
index d789239e3d..09a960d851 100644
--- a/SRC/dlasrt.f
+++ b/SRC/dlasrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -81,10 +79,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lasrt
 *
 *  =====================================================================
       SUBROUTINE DLASRT( ID, N, D, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlassq.f90 b/SRC/dlassq.f90
index fddd1bf38f..19a36a43dc 100644
--- a/SRC/dlassq.f90
+++ b/SRC/dlassq.f90
@@ -5,7 +5,6 @@
 ! Online html documentation available at
 !            http://www.netlib.org/lapack/explore-html/
 !
-!> \htmlonly
 !> Download DLASSQ + dependencies
 !> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlassq.f90">
 !> [TGZ]</a>
@@ -13,7 +12,6 @@
 !> [ZIP]</a>
 !> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlassq.f90">
 !> [TXT]</a>
-!> \endhtmlonly
 !
 !  Definition:
 !  ===========
@@ -34,28 +32,15 @@
 !>
 !> \verbatim
 !>
-!> DLASSQ  returns the values  scl  and  smsq  such that
+!> DLASSQ returns the values scale_out and sumsq_out such that
 !>
-!>    ( scl**2 )*smsq = x( 1 )**2 +...+ x( n )**2 + ( scale**2 )*sumsq,
+!>    (scale_out**2)*sumsq_out = x( 1 )**2 +...+ x( n )**2 + (scale**2)*sumsq,
 !>
-!> where  x( i ) = X( 1 + ( i - 1 )*INCX ). The value of  sumsq  is
+!> where x( i ) = X( 1 + ( i - 1 )*INCX ). The value of sumsq is
 !> assumed to be non-negative.
 !>
 !> scale and sumsq must be supplied in SCALE and SUMSQ and
-!> scl and smsq are overwritten on SCALE and SUMSQ respectively.
-!>
-!> If scale * sqrt( sumsq ) > tbig then
-!>    we require:   scale >= sqrt( TINY*EPS ) / sbig   on entry,
-!> and if 0 < scale * sqrt( sumsq ) < tsml then
-!>    we require:   scale <= sqrt( HUGE ) / ssml       on entry,
-!> where
-!>    tbig -- upper threshold for values whose square is representable;
-!>    sbig -- scaling constant for big numbers; \see la_constants.f90
-!>    tsml -- lower threshold for values whose square is representable;
-!>    ssml -- scaling constant for small numbers; \see la_constants.f90
-!> and
-!>    TINY*EPS -- tiniest representable number;
-!>    HUGE     -- biggest representable number.
+!> scale_out and sumsq_out are overwritten on SCALE and SUMSQ respectively.
 !>
 !> \endverbatim
 !
@@ -72,7 +57,7 @@
 !> \verbatim
 !>          X is DOUBLE PRECISION array, dimension (1+(N-1)*abs(INCX))
 !>          The vector for which a scaled sum of squares is computed.
-!>             x( i )  = X( 1 + ( i - 1 )*INCX ), 1 <= i <= n.
+!>             x( i ) = X( 1 + ( i - 1 )*INCX ), 1 <= i <= n.
 !> \endverbatim
 !>
 !> \param[in] INCX
@@ -82,24 +67,24 @@
 !>          If INCX > 0, X(1+(i-1)*INCX) = x(i) for 1 <= i <= n
 !>          If INCX < 0, X(1-(n-i)*INCX) = x(i) for 1 <= i <= n
 !>          If INCX = 0, x isn't a vector so there is no need to call
-!>          this subroutine.  If you call it anyway, it will count x(1)
+!>          this subroutine. If you call it anyway, it will count x(1)
 !>          in the vector norm N times.
 !> \endverbatim
 !>
 !> \param[in,out] SCALE
 !> \verbatim
 !>          SCALE is DOUBLE PRECISION
-!>          On entry, the value  scale  in the equation above.
-!>          On exit, SCALE is overwritten with  scl , the scaling factor
+!>          On entry, the value scale in the equation above.
+!>          On exit, SCALE is overwritten by scale_out, the scaling factor
 !>          for the sum of squares.
 !> \endverbatim
 !>
 !> \param[in,out] SUMSQ
 !> \verbatim
 !>          SUMSQ is DOUBLE PRECISION
-!>          On entry, the value  sumsq  in the equation above.
-!>          On exit, SUMSQ is overwritten with  smsq , the basic sum of
-!>          squares from which  scl  has been factored out.
+!>          On entry, the value sumsq in the equation above.
+!>          On exit, SUMSQ is overwritten by sumsq_out, the basic sum of
+!>          squares from which scale_out has been factored out.
 !> \endverbatim
 !
 !  Authors:
@@ -130,14 +115,15 @@
 !>
 !> \endverbatim
 !
-!> \ingroup OTHERauxiliary
+!> \ingroup lassq
 !
 !  =====================================================================
-subroutine DLASSQ( n, x, incx, scl, sumsq )
+subroutine DLASSQ( n, x, incx, scale, sumsq )
    use LA_CONSTANTS, &
       only: wp=>dp, zero=>dzero, one=>done, &
             sbig=>dsbig, ssml=>dssml, tbig=>dtbig, tsml=>dtsml
    use LA_XISNAN
+   implicit none
 !
 !  -- LAPACK auxiliary routine --
 !  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -145,7 +131,7 @@ subroutine DLASSQ( n, x, incx, scl, sumsq )
 !
 !  .. Scalar Arguments ..
    integer :: incx, n
-   real(wp) :: scl, sumsq
+   real(wp) :: scale, sumsq
 !  ..
 !  .. Array Arguments ..
    real(wp) :: x(*)
@@ -158,10 +144,10 @@ subroutine DLASSQ( n, x, incx, scl, sumsq )
 !
 !  Quick return if possible
 !
-   if( LA_ISNAN(scl) .or. LA_ISNAN(sumsq) ) return
-   if( sumsq == zero ) scl = one
-   if( scl == zero ) then
-      scl = one
+   if( LA_ISNAN(scale) .or. LA_ISNAN(sumsq) ) return
+   if( sumsq == zero ) scale = one
+   if( scale == zero ) then
+      scale = one
       sumsq = zero
    end if
    if (n <= 0) then
@@ -198,15 +184,27 @@ subroutine DLASSQ( n, x, incx, scl, sumsq )
 !  Put the existing sum of squares into one of the accumulators
 !
    if( sumsq > zero ) then
-      ax = scl*sqrt( sumsq )
+      ax = scale*sqrt( sumsq )
       if (ax > tbig) then
-!        We assume scl >= sqrt( TINY*EPS ) / sbig
-         abig = abig + (scl*sbig)**2 * sumsq
+         if (scale > one) then
+            scale = scale * sbig
+            abig = abig + scale * (scale * sumsq)
+         else
+            ! sumsq > tbig^2 => (sbig * (sbig * sumsq)) is representable
+            abig = abig + scale * (scale * (sbig * (sbig * sumsq)))
+         end if
       else if (ax < tsml) then
-!        We assume scl <= sqrt( HUGE ) / ssml
-         if (notbig) asml = asml + (scl*ssml)**2 * sumsq
+         if (notbig) then
+            if (scale < one) then
+               scale = scale * ssml
+               asml = asml + scale * (scale * sumsq)
+            else
+               ! sumsq < tsml^2 => (ssml * (ssml * sumsq)) is representable
+               asml = asml + scale * (scale * (ssml * (ssml * sumsq)))
+            end if
+         end if
       else
-         amed = amed + scl**2 * sumsq
+         amed = amed + scale * (scale * sumsq)
       end if
    end if
 !
@@ -220,7 +218,7 @@ subroutine DLASSQ( n, x, incx, scl, sumsq )
       if (amed > zero .or. LA_ISNAN(amed)) then
          abig = abig + (amed*sbig)*sbig
       end if
-      scl = one / sbig
+      scale = one / sbig
       sumsq = abig
    else if (asml > zero) then
 !
@@ -236,17 +234,17 @@ subroutine DLASSQ( n, x, incx, scl, sumsq )
             ymin = asml
             ymax = amed
          end if
-         scl = one
+         scale = one
          sumsq = ymax**2*( one + (ymin/ymax)**2 )
       else
-         scl = one / ssml
+         scale = one / ssml
          sumsq = asml
       end if
    else
 !
 !     Otherwise all values are mid-range or zero
 !
-      scl = one
+      scale = one
       sumsq = amed
    end if
    return
diff --git a/SRC/dlasv2.f b/SRC/dlasv2.f
index 64a06dee1a..87c31867d2 100644
--- a/SRC/dlasv2.f
+++ b/SRC/dlasv2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASV2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasv2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasv2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasv2
 *
 *> \par Further Details:
 *  =====================
@@ -124,9 +122,7 @@
 *>  infinite.
 *>
 *>  Overflow will not occur unless the largest singular value itself
-*>  overflows or is within a few ulps of overflow. (On machines with
-*>  partial overflow, like the Cray, overflow may occur if the largest
-*>  singular value is within a factor of 2 of overflow.)
+*>  overflows or is within a few ulps of overflow.
 *>
 *>  Underflow is harmless if underflow is gradual. Otherwise, results
 *>  may correspond to a matrix modified by perturbations of size near
@@ -135,6 +131,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLASV2( F, G, H, SSMIN, SSMAX, SNR, CSR, SNL, CSL )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlaswlq.f b/SRC/dlaswlq.f
index 0d7224eb89..1fe8885012 100644
--- a/SRC/dlaswlq.f
+++ b/SRC/dlaswlq.f
@@ -60,7 +60,7 @@
 *> \verbatim
 *>          NB is INTEGER
 *>          The column block size to be used in the blocked QR.
-*>          NB > M.
+*>          NB > 0.
 *> \endverbatim
 *>
 *> \param[in,out] A
@@ -99,18 +99,22 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) DOUBLE PRECISION array, dimension (MAX(1,LWORK))
-*>
+*>          (workspace) DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
+*>
 *> \param[in] LWORK
 *> \verbatim
-*>          The dimension of the array WORK.  LWORK >= MB*M.
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= MB*M, otherwise.
+*>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
+*>          only calculates the minimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
-*>
 *> \endverbatim
+*>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
@@ -158,33 +162,38 @@
 *>     SIAM J. Sci. Comput, vol. 34, no. 1, 2012
 *> \endverbatim
 *>
+*> \ingroup laswlq
+*>
 *  =====================================================================
       SUBROUTINE DLASWLQ( M, N, MB, NB, A, LDA, T, LDT, WORK, LWORK,
-     $                  INFO)
+     $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd. --
 *
 *     .. Scalar Arguments ..
-      INTEGER           INFO, LDA, M, N, MB, NB, LWORK, LDT
+      INTEGER            INFO, LDA, M, N, MB, NB, LWORK, LDT
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION  A( LDA, * ), WORK( * ), T( LDT, *)
+      DOUBLE PRECISION   A( LDA, * ), WORK( * ), T( LDT, * )
 *     ..
 *
 *  =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
-      LOGICAL    LQUERY
-      INTEGER    I, II, KK, CTR
+      LOGICAL            LQUERY
+      INTEGER            I, II, KK, CTR, MINMN, LWMIN
 *     ..
 *     .. EXTERNAL FUNCTIONS ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
+*     ..
 *     .. EXTERNAL SUBROUTINES ..
       EXTERNAL           DGELQT, DTPLQT, XERBLA
+*     ..
 *     .. INTRINSIC FUNCTIONS ..
       INTRINSIC          MAX, MIN, MOD
 *     ..
@@ -195,73 +204,82 @@ SUBROUTINE DLASWLQ( M, N, MB, NB, A, LDA, T, LDT, WORK, LWORK,
       INFO = 0
 *
       LQUERY = ( LWORK.EQ.-1 )
+*
+      MINMN = MIN( M, N )
+      IF( MINMN.EQ.0 ) THEN
+         LWMIN = 1
+      ELSE
+         LWMIN = M*MB
+      END IF
 *
       IF( M.LT.0 ) THEN
         INFO = -1
       ELSE IF( N.LT.0 .OR. N.LT.M ) THEN
         INFO = -2
-      ELSE IF( MB.LT.1 .OR. ( MB.GT.M .AND. M.GT.0 )) THEN
+      ELSE IF( MB.LT.1 .OR. ( MB.GT.M .AND. M.GT.0 ) ) THEN
         INFO = -3
-      ELSE IF( NB.LE.M ) THEN
+      ELSE IF( NB.LT.0 ) THEN
         INFO = -4
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-        INFO = -5
+        INFO = -6
       ELSE IF( LDT.LT.MB ) THEN
         INFO = -8
-      ELSE IF( ( LWORK.LT.M*MB) .AND. (.NOT.LQUERY) ) THEN
+      ELSE IF( LWORK.LT.LWMIN .AND. (.NOT.LQUERY) ) THEN
         INFO = -10
       END IF
-      IF( INFO.EQ.0)  THEN
-      WORK(1) = MB*M
+*
+      IF( INFO.EQ.0 ) THEN
+        WORK( 1 ) = LWMIN
       END IF
 *
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'DLASWLQ', -INFO )
         RETURN
-      ELSE IF (LQUERY) THEN
-       RETURN
+      ELSE IF( LQUERY ) THEN
+        RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( MIN(M,N).EQ.0 ) THEN
-          RETURN
+      IF( MINMN.EQ.0 ) THEN
+        RETURN
       END IF
 *
 *     The LQ Decomposition
 *
-       IF((M.GE.N).OR.(NB.LE.M).OR.(NB.GE.N)) THEN
-        CALL DGELQT( M, N, MB, A, LDA, T, LDT, WORK, INFO)
+      IF( (M.GE.N) .OR. (NB.LE.M) .OR. (NB.GE.N) ) THEN
+        CALL DGELQT( M, N, MB, A, LDA, T, LDT, WORK, INFO )
         RETURN
-       END IF
+      END IF
 *
-       KK = MOD((N-M),(NB-M))
-       II=N-KK+1
+      KK = MOD((N-M),(NB-M))
+      II = N-KK+1
 *
-*      Compute the LQ factorization of the first block A(1:M,1:NB)
+*     Compute the LQ factorization of the first block A(1:M,1:NB)
 *
-       CALL DGELQT( M, NB, MB, A(1,1), LDA, T, LDT, WORK, INFO)
-       CTR = 1
+      CALL DGELQT( M, NB, MB, A(1,1), LDA, T, LDT, WORK, INFO )
+      CTR = 1
 *
-       DO I = NB+1, II-NB+M , (NB-M)
+      DO I = NB+1, II-NB+M, (NB-M)
 *
-*      Compute the QR factorization of the current block A(1:M,I:I+NB-M)
+*       Compute the QR factorization of the current block A(1:M,I:I+NB-M)
 *
-         CALL DTPLQT( M, NB-M, 0, MB, A(1,1), LDA, A( 1, I ),
-     $                  LDA, T(1, CTR * M + 1),
-     $                  LDT, WORK, INFO )
-         CTR = CTR + 1
-       END DO
+        CALL DTPLQT( M, NB-M, 0, MB, A(1,1), LDA, A( 1, I ),
+     $                 LDA, T(1, CTR * M + 1),
+     $                 LDT, WORK, INFO )
+        CTR = CTR + 1
+      END DO
 *
 *     Compute the QR factorization of the last block A(1:M,II:N)
 *
-       IF (II.LE.N) THEN
+      IF( II.LE.N ) THEN
         CALL DTPLQT( M, KK, 0, MB, A(1,1), LDA, A( 1, II ),
-     $                  LDA, T(1, CTR * M + 1), LDT,
-     $                  WORK, INFO )
-       END IF
+     $                 LDA, T(1, CTR * M + 1), LDT,
+     $                 WORK, INFO )
+      END IF
+*
+      WORK( 1 ) = LWMIN
 *
-      WORK( 1 ) = M * MB
       RETURN
 *
 *     End of DLASWLQ
diff --git a/SRC/dlaswp.f b/SRC/dlaswp.f
index b35729a205..38d35fc283 100644
--- a/SRC/dlaswp.f
+++ b/SRC/dlaswp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASWP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaswp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaswp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -99,7 +97,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup laswp
 *
 *> \par Further Details:
 *  =====================
@@ -112,6 +110,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLASWP( N, A, LDA, K1, K2, IPIV, INCX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlasy2.f b/SRC/dlasy2.f
index 18245202cc..3c1fe876f6 100644
--- a/SRC/dlasy2.f
+++ b/SRC/dlasy2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASY2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasy2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasy2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -166,11 +164,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYauxiliary
+*> \ingroup lasy2
 *
 *  =====================================================================
       SUBROUTINE DLASY2( LTRANL, LTRANR, ISGN, N1, N2, TL, LDTL, TR,
      $                   LDTR, B, LDB, SCALE, X, LDX, XNORM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlasyf.f b/SRC/dlasyf.f
index 3064f5e1e4..68e0087f38 100644
--- a/SRC/dlasyf.f
+++ b/SRC/dlasyf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASYF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasyf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasyf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -159,7 +157,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup lahef
 *
 *> \par Contributors:
 *  ==================
@@ -172,7 +170,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE DLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
+      SUBROUTINE DLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -196,7 +196,7 @@ SUBROUTINE DLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
       PARAMETER          ( EIGHT = 8.0D+0, SEVTEN = 17.0D+0 )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            IMAX, J, JB, JJ, JMAX, JP, K, KK, KKW, KP,
+      INTEGER            IMAX, J, JJ, JMAX, JP, K, KK, KKW, KP,
      $                   KSTEP, KW
       DOUBLE PRECISION   ABSAKK, ALPHA, COLMAX, D11, D21, D22, R1,
      $                   ROWMAX, T
@@ -207,7 +207,7 @@ SUBROUTINE DLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
       EXTERNAL           LSAME, IDAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEMM, DGEMV, DSCAL, DSWAP
+      EXTERNAL           DCOPY, DGEMMTR, DGEMV, DSCAL, DSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, SQRT
@@ -243,7 +243,8 @@ SUBROUTINE DLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
          CALL DCOPY( K, A( 1, K ), 1, W( 1, KW ), 1 )
          IF( K.LT.N )
-     $      CALL DGEMV( 'No transpose', K, N-K, -ONE, A( 1, K+1 ), LDA,
+     $      CALL DGEMV( 'No transpose', K, N-K, -ONE, A( 1, K+1 ),
+     $                  LDA,
      $                  W( K, KW+1 ), LDW, ONE, W( 1, KW ), 1 )
 *
          KSTEP = 1
@@ -285,7 +286,8 @@ SUBROUTINE DLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
                CALL DCOPY( K-IMAX, A( IMAX, IMAX+1 ), LDA,
      $                     W( IMAX+1, KW-1 ), 1 )
                IF( K.LT.N )
-     $            CALL DGEMV( 'No transpose', K, N-K, -ONE, A( 1, K+1 ),
+     $            CALL DGEMV( 'No transpose', K, N-K, -ONE, A( 1,
+     $                        K+1 ),
      $                        LDA, W( IMAX, KW+1 ), LDW, ONE,
      $                        W( 1, KW-1 ), 1 )
 *
@@ -471,25 +473,9 @@ SUBROUTINE DLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *        A11 := A11 - U12*D*U12**T = A11 - U12*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 50 J = ( ( K-1 ) / NB )*NB + 1, 1, -NB
-            JB = MIN( NB, K-J+1 )
-*
-*           Update the upper triangle of the diagonal block
-*
-            DO 40 JJ = J, J + JB - 1
-               CALL DGEMV( 'No transpose', JJ-J+1, N-K, -ONE,
-     $                     A( J, K+1 ), LDA, W( JJ, KW+1 ), LDW, ONE,
-     $                     A( J, JJ ), 1 )
-   40       CONTINUE
-*
-*           Update the rectangular superdiagonal block
-*
-            CALL DGEMM( 'No transpose', 'Transpose', J-1, JB, N-K, -ONE,
-     $                  A( 1, K+1 ), LDA, W( J, KW+1 ), LDW, ONE,
-     $                  A( 1, J ), LDA )
-   50    CONTINUE
+         CALL DGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
+     $                 -ONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
+     $                 ONE, A( 1, 1 ), LDA )
 *
 *        Put U12 in standard form by partially undoing the interchanges
 *        in columns k+1:n looping backwards from k+1 to n
@@ -539,7 +525,8 @@ SUBROUTINE DLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *        Copy column K of A to column K of W and update it
 *
          CALL DCOPY( N-K+1, A( K, K ), 1, W( K, K ), 1 )
-         CALL DGEMV( 'No transpose', N-K+1, K-1, -ONE, A( K, 1 ), LDA,
+         CALL DGEMV( 'No transpose', N-K+1, K-1, -ONE, A( K, 1 ),
+     $               LDA,
      $               W( K, 1 ), LDW, ONE, W( K, K ), 1 )
 *
          KSTEP = 1
@@ -577,10 +564,13 @@ SUBROUTINE DLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *              Copy column IMAX to column K+1 of W and update it
 *
-               CALL DCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1 )
-               CALL DCOPY( N-IMAX+1, A( IMAX, IMAX ), 1, W( IMAX, K+1 ),
+               CALL DCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                     1 )
+               CALL DCOPY( N-IMAX+1, A( IMAX, IMAX ), 1, W( IMAX,
+     $                     K+1 ),
      $                     1 )
-               CALL DGEMV( 'No transpose', N-K+1, K-1, -ONE, A( K, 1 ),
+               CALL DGEMV( 'No transpose', N-K+1, K-1, -ONE, A( K,
+     $                     1 ),
      $                     LDA, W( IMAX, 1 ), LDW, ONE, W( K, K+1 ), 1 )
 *
 *              JMAX is the column-index of the largest off-diagonal
@@ -638,7 +628,8 @@ SUBROUTINE DLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
                CALL DCOPY( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
      $                     LDA )
                IF( KP.LT.N )
-     $            CALL DCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL DCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
 *
 *              Interchange rows KK and KP in first K-1 columns of A
 *              (columns K (or K and K+1 for 2-by-2 pivot) of A will be
@@ -761,26 +752,9 @@ SUBROUTINE DLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *        A22 := A22 - L21*D*L21**T = A22 - L21*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 110 J = K, N, NB
-            JB = MIN( NB, N-J+1 )
-*
-*           Update the lower triangle of the diagonal block
-*
-            DO 100 JJ = J, J + JB - 1
-               CALL DGEMV( 'No transpose', J+JB-JJ, K-1, -ONE,
-     $                     A( JJ, 1 ), LDA, W( JJ, 1 ), LDW, ONE,
-     $                     A( JJ, JJ ), 1 )
-  100       CONTINUE
-*
-*           Update the rectangular subdiagonal block
-*
-            IF( J+JB.LE.N )
-     $         CALL DGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
-     $                     K-1, -ONE, A( J+JB, 1 ), LDA, W( J, 1 ), LDW,
-     $                     ONE, A( J+JB, J ), LDA )
-  110    CONTINUE
+         CALL DGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
+     $                 K-1, -ONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
+     $                 ONE, A( K, K ), LDA )
 *
 *        Put L21 in standard form by partially undoing the interchanges
 *        of rows in columns 1:k-1 looping backwards from k-1 to 1
diff --git a/SRC/dlasyf_aa.f b/SRC/dlasyf_aa.f
index f6b01ea6c0..991ae005d2 100644
--- a/SRC/dlasyf_aa.f
+++ b/SRC/dlasyf_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASYF_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasyf_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasyf_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -136,7 +134,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup lahef_aa
 *
 *  =====================================================================
       SUBROUTINE DLASYF_AA( UPLO, J1, M, NB, A, LDA, IPIV,
@@ -172,7 +170,8 @@ SUBROUTINE DLASYF_AA( UPLO, J1, M, NB, A, LDA, IPIV,
       EXTERNAL           LSAME, ILAENV, IDAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMV, DAXPY, DCOPY, DSWAP, DSCAL, DLASET,
+      EXTERNAL           DGEMV, DAXPY, DCOPY, DSWAP, DSCAL,
+     $                   DLASET,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
diff --git a/SRC/dlasyf_rk.f b/SRC/dlasyf_rk.f
index 1a0117738f..174469e362 100644
--- a/SRC/dlasyf_rk.f
+++ b/SRC/dlasyf_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASYF_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasyf_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasyf_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -239,7 +237,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup lahef_rk
 *
 *> \par Contributors:
 *  ==================
@@ -259,6 +257,7 @@
 *  =====================================================================
       SUBROUTINE DLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
      $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -283,7 +282,7 @@ SUBROUTINE DLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            DONE
-      INTEGER            IMAX, ITEMP, J, JB, JJ, JMAX, K, KK, KW, KKW,
+      INTEGER            IMAX, ITEMP, J, JMAX, K, KK, KW, KKW,
      $                   KP, KSTEP, P, II
       DOUBLE PRECISION   ABSAKK, ALPHA, COLMAX, D11, D12, D21, D22,
      $                   DTEMP, R1, ROWMAX, T, SFMIN
@@ -295,7 +294,7 @@ SUBROUTINE DLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
       EXTERNAL           LSAME, IDAMAX, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEMM, DGEMV, DSCAL, DSWAP
+      EXTERNAL           DCOPY, DGEMMTR, DGEMV, DSCAL, DSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, SQRT
@@ -405,7 +404,8 @@ SUBROUTINE DLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column KW-1 of W and update it
 *
-                  CALL DCOPY( IMAX, A( 1, IMAX ), 1, W( 1, KW-1 ), 1 )
+                  CALL DCOPY( IMAX, A( 1, IMAX ), 1, W( 1, KW-1 ),
+     $                        1 )
                   CALL DCOPY( K-IMAX, A( IMAX, IMAX+1 ), LDA,
      $                        W( IMAX+1, KW-1 ), 1 )
 *
@@ -504,7 +504,8 @@ SUBROUTINE DLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *              and last N-K+2 columns of W
 *
                CALL DSWAP( N-K+1, A( K, K ), LDA, A( P, K ), LDA )
-               CALL DSWAP( N-KK+1, W( K, KKW ), LDW, W( P, KKW ), LDW )
+               CALL DSWAP( N-KK+1, W( K, KKW ), LDW, W( P, KKW ),
+     $                     LDW )
             END IF
 *
 *           Updated column KP is already stored in column KKW of W
@@ -521,7 +522,8 @@ SUBROUTINE DLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *              Interchange rows KK and KP in last N-KK+1 columns
 *              of A and W
 *
-               CALL DSWAP( N-KK+1, A( KK, KK ), LDA, A( KP, KK ), LDA )
+               CALL DSWAP( N-KK+1, A( KK, KK ), LDA, A( KP, KK ),
+     $                     LDA )
                CALL DSWAP( N-KK+1, W( KK, KKW ), LDW, W( KP, KKW ),
      $                     LDW )
             END IF
@@ -615,26 +617,9 @@ SUBROUTINE DLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *        A11 := A11 - U12*D*U12**T = A11 - U12*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 50 J = ( ( K-1 ) / NB )*NB + 1, 1, -NB
-            JB = MIN( NB, K-J+1 )
-*
-*           Update the upper triangle of the diagonal block
-*
-            DO 40 JJ = J, J + JB - 1
-               CALL DGEMV( 'No transpose', JJ-J+1, N-K, -ONE,
-     $                     A( J, K+1 ), LDA, W( JJ, KW+1 ), LDW, ONE,
-     $                     A( J, JJ ), 1 )
-   40       CONTINUE
-*
-*           Update the rectangular superdiagonal block
-*
-            IF( J.GE.2 )
-     $         CALL DGEMM( 'No transpose', 'Transpose', J-1, JB,
-     $                  N-K, -ONE, A( 1, K+1 ), LDA, W( J, KW+1 ),
-     $                  LDW, ONE, A( 1, J ), LDA )
-   50    CONTINUE
+         CALL DGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
+     $                 -ONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
+     $                 ONE, A( 1, 1 ), LDA )
 *
 *        Set KB to the number of columns factorized
 *
@@ -728,7 +713,8 @@ SUBROUTINE DLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column K+1 of W and update it
 *
-                  CALL DCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1)
+                  CALL DCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                        1)
                   CALL DCOPY( N-IMAX+1, A( IMAX, IMAX ), 1,
      $                        W( IMAX, K+1 ), 1 )
                   IF( K.GT.1 )
@@ -748,7 +734,8 @@ SUBROUTINE DLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + IDAMAX( N-IMAX, W( IMAX+1, K+1 ), 1)
+                     ITEMP = IMAX + IDAMAX( N-IMAX, W( IMAX+1, K+1 ),
+     $                                      1)
                      DTEMP = ABS( W( ITEMP, K+1 ) )
                      IF( DTEMP.GT.ROWMAX ) THEN
                         ROWMAX = DTEMP
@@ -770,7 +757,8 @@ SUBROUTINE DLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                    copy column K+1 of W to column K of W
 *
-                     CALL DCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL DCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                      DONE = .TRUE.
 *
@@ -796,7 +784,8 @@ SUBROUTINE DLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                    Copy updated JMAXth (next IMAXth) column to Kth of W
 *
-                     CALL DCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL DCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                   END IF
 *
@@ -831,7 +820,8 @@ SUBROUTINE DLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *              Copy non-updated column KK to column KP
 *
                A( KP, K ) = A( KK, K )
-               CALL DCOPY( KP-K-1, A( K+1, KK ), 1, A( KP, K+1 ), LDA )
+               CALL DCOPY( KP-K-1, A( K+1, KK ), 1, A( KP, K+1 ),
+     $                     LDA )
                CALL DCOPY( N-KP+1, A( KP, KK ), 1, A( KP, KP ), 1 )
 *
 *              Interchange rows KK and KP in first KK columns of A and W
@@ -928,26 +918,9 @@ SUBROUTINE DLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *        A22 := A22 - L21*D*L21**T = A22 - L21*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 110 J = K, N, NB
-            JB = MIN( NB, N-J+1 )
-*
-*           Update the lower triangle of the diagonal block
-*
-            DO 100 JJ = J, J + JB - 1
-               CALL DGEMV( 'No transpose', J+JB-JJ, K-1, -ONE,
-     $                     A( JJ, 1 ), LDA, W( JJ, 1 ), LDW, ONE,
-     $                     A( JJ, JJ ), 1 )
-  100       CONTINUE
-*
-*           Update the rectangular subdiagonal block
-*
-            IF( J+JB.LE.N )
-     $         CALL DGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
-     $                     K-1, -ONE, A( J+JB, 1 ), LDA, W( J, 1 ),
-     $                     LDW, ONE, A( J+JB, J ), LDA )
-  110    CONTINUE
+         CALL DGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
+     $                 K-1, -ONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
+     $                 ONE, A( K, K ), LDA )
 *
 *        Set KB to the number of columns factorized
 *
diff --git a/SRC/dlasyf_rook.f b/SRC/dlasyf_rook.f
index 03bcd91a34..ea2ce91d70 100644
--- a/SRC/dlasyf_rook.f
+++ b/SRC/dlasyf_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLASYF_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlasyf_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlasyf_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -161,7 +159,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup lahef_rook
 *
 *> \par Contributors:
 *  ==================
@@ -181,6 +179,7 @@
 *  =====================================================================
       SUBROUTINE DLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
      $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -205,7 +204,7 @@ SUBROUTINE DLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            DONE
-      INTEGER            IMAX, ITEMP, J, JB, JJ, JMAX, JP1, JP2, K, KK,
+      INTEGER            IMAX, ITEMP, J, JJ, JMAX, JP1, JP2, K, KK,
      $                   KW, KKW, KP, KSTEP, P, II
 
       DOUBLE PRECISION   ABSAKK, ALPHA, COLMAX, D11, D12, D21, D22,
@@ -218,7 +217,7 @@ SUBROUTINE DLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
       EXTERNAL           LSAME, IDAMAX, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEMM, DGEMV, DSCAL, DSWAP
+      EXTERNAL           DCOPY, DGEMMTR, DGEMV, DSCAL, DSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, SQRT
@@ -317,7 +316,8 @@ SUBROUTINE DLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column KW-1 of W and update it
 *
-                  CALL DCOPY( IMAX, A( 1, IMAX ), 1, W( 1, KW-1 ), 1 )
+                  CALL DCOPY( IMAX, A( 1, IMAX ), 1, W( 1, KW-1 ),
+     $                        1 )
                   CALL DCOPY( K-IMAX, A( IMAX, IMAX+1 ), LDA,
      $                        W( IMAX+1, KW-1 ), 1 )
 *
@@ -416,7 +416,8 @@ SUBROUTINE DLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *              and last N-K+2 columns of W
 *
                CALL DSWAP( N-K+1, A( K, K ), LDA, A( P, K ), LDA )
-               CALL DSWAP( N-KK+1, W( K, KKW ), LDW, W( P, KKW ), LDW )
+               CALL DSWAP( N-KK+1, W( K, KKW ), LDW, W( P, KKW ),
+     $                     LDW )
             END IF
 *
 *           Updated column KP is already stored in column KKW of W
@@ -433,7 +434,8 @@ SUBROUTINE DLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *              Interchange rows KK and KP in last N-KK+1 columns
 *              of A and W
 *
-               CALL DSWAP( N-KK+1, A( KK, KK ), LDA, A( KP, KK ), LDA )
+               CALL DSWAP( N-KK+1, A( KK, KK ), LDA, A( KP, KK ),
+     $                     LDA )
                CALL DSWAP( N-KK+1, W( KK, KKW ), LDW, W( KP, KKW ),
      $                     LDW )
             END IF
@@ -514,26 +516,9 @@ SUBROUTINE DLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *        A11 := A11 - U12*D*U12**T = A11 - U12*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 50 J = ( ( K-1 ) / NB )*NB + 1, 1, -NB
-            JB = MIN( NB, K-J+1 )
-*
-*           Update the upper triangle of the diagonal block
-*
-            DO 40 JJ = J, J + JB - 1
-               CALL DGEMV( 'No transpose', JJ-J+1, N-K, -ONE,
-     $                     A( J, K+1 ), LDA, W( JJ, KW+1 ), LDW, ONE,
-     $                     A( J, JJ ), 1 )
-   40       CONTINUE
-*
-*           Update the rectangular superdiagonal block
-*
-            IF( J.GE.2 )
-     $         CALL DGEMM( 'No transpose', 'Transpose', J-1, JB,
-     $                  N-K, -ONE, A( 1, K+1 ), LDA, W( J, KW+1 ), LDW,
-     $                  ONE, A( 1, J ), LDA )
-   50    CONTINUE
+         CALL DGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
+     $                 -ONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
+     $                 ONE, A( 1, 1 ), LDA )
 *
 *        Put U12 in standard form by partially undoing the interchanges
 *        in columns k+1:n
@@ -643,7 +628,8 @@ SUBROUTINE DLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column K+1 of W and update it
 *
-                  CALL DCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1)
+                  CALL DCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                        1)
                   CALL DCOPY( N-IMAX+1, A( IMAX, IMAX ), 1,
      $                        W( IMAX, K+1 ), 1 )
                   IF( K.GT.1 )
@@ -663,7 +649,8 @@ SUBROUTINE DLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + IDAMAX( N-IMAX, W( IMAX+1, K+1 ), 1)
+                     ITEMP = IMAX + IDAMAX( N-IMAX, W( IMAX+1, K+1 ),
+     $                                      1)
                      DTEMP = ABS( W( ITEMP, K+1 ) )
                      IF( DTEMP.GT.ROWMAX ) THEN
                         ROWMAX = DTEMP
@@ -685,7 +672,8 @@ SUBROUTINE DLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                    copy column K+1 of W to column K of W
 *
-                     CALL DCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL DCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                      DONE = .TRUE.
 *
@@ -711,7 +699,8 @@ SUBROUTINE DLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                    Copy updated JMAXth (next IMAXth) column to Kth of W
 *
-                     CALL DCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL DCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                   END IF
 *
@@ -746,7 +735,8 @@ SUBROUTINE DLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *              Copy non-updated column KK to column KP
 *
                A( KP, K ) = A( KK, K )
-               CALL DCOPY( KP-K-1, A( K+1, KK ), 1, A( KP, K+1 ), LDA )
+               CALL DCOPY( KP-K-1, A( K+1, KK ), 1, A( KP, K+1 ),
+     $                     LDA )
                CALL DCOPY( N-KP+1, A( KP, KK ), 1, A( KP, KP ), 1 )
 *
 *              Interchange rows KK and KP in first KK columns of A and W
@@ -830,26 +820,9 @@ SUBROUTINE DLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *        A22 := A22 - L21*D*L21**T = A22 - L21*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 110 J = K, N, NB
-            JB = MIN( NB, N-J+1 )
-*
-*           Update the lower triangle of the diagonal block
-*
-            DO 100 JJ = J, J + JB - 1
-               CALL DGEMV( 'No transpose', J+JB-JJ, K-1, -ONE,
-     $                     A( JJ, 1 ), LDA, W( JJ, 1 ), LDW, ONE,
-     $                     A( JJ, JJ ), 1 )
-  100       CONTINUE
-*
-*           Update the rectangular subdiagonal block
-*
-            IF( J+JB.LE.N )
-     $         CALL DGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
-     $                     K-1, -ONE, A( J+JB, 1 ), LDA, W( J, 1 ), LDW,
-     $                     ONE, A( J+JB, J ), LDA )
-  110    CONTINUE
+         CALL DGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
+     $                 K-1, -ONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
+     $                 ONE, A( K, K ), LDA )
 *
 *        Put L21 in standard form by partially undoing the interchanges
 *        in columns 1:k-1
diff --git a/SRC/dlat2s.f b/SRC/dlat2s.f
index 3d00fe0a37..9ffb61bace 100644
--- a/SRC/dlat2s.f
+++ b/SRC/dlat2s.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAT2S + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlat2s.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlat2s.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -104,10 +102,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup _lat2_
 *
 *  =====================================================================
       SUBROUTINE DLAT2S( UPLO, N, A, LDA, SA, LDSA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -134,6 +133,9 @@ SUBROUTINE DLAT2S( UPLO, N, A, LDA, SA, LDSA, INFO )
       LOGICAL            LSAME
       EXTERNAL           SLAMCH, LSAME
 *     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          REAL
+*     ..
 *     .. Executable Statements ..
 *
       RMAX = SLAMCH( 'O' )
@@ -146,7 +148,7 @@ SUBROUTINE DLAT2S( UPLO, N, A, LDA, SA, LDSA, INFO )
                   INFO = 1
                   GO TO 50
                END IF
-               SA( I, J ) = A( I, J )
+               SA( I, J ) = REAL( A( I, J ) )
    10       CONTINUE
    20    CONTINUE
       ELSE
@@ -157,7 +159,7 @@ SUBROUTINE DLAT2S( UPLO, N, A, LDA, SA, LDSA, INFO )
                   INFO = 1
                   GO TO 50
                END IF
-               SA( I, J ) = A( I, J )
+               SA( I, J ) = REAL( A( I, J ) )
    30       CONTINUE
    40    CONTINUE
       END IF
diff --git a/SRC/dlatbs.f b/SRC/dlatbs.f
index 4b71d53994..51ea9f1ca5 100644
--- a/SRC/dlatbs.f
+++ b/SRC/dlatbs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLATBS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlatbs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlatbs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -162,7 +160,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup latbs
 *
 *> \par Further Details:
 *  =====================
@@ -237,8 +235,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB, X,
+      SUBROUTINE DLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB,
+     $                   X,
      $                   SCALE, CNORM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -310,6 +310,7 @@ SUBROUTINE DLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB, X,
 *
 *     Quick return if possible
 *
+      SCALE = ONE
       IF( N.EQ.0 )
      $   RETURN
 *
@@ -317,7 +318,6 @@ SUBROUTINE DLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB, X,
 *
       SMLNUM = DLAMCH( 'Safe minimum' ) / DLAMCH( 'Precision' )
       BIGNUM = ONE / SMLNUM
-      SCALE = ONE
 *
       IF( LSAME( NORMIN, 'N' ) ) THEN
 *
@@ -702,7 +702,8 @@ SUBROUTINE DLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB, X,
                   ELSE
                      JLEN = MIN( KD, N-J )
                      IF( JLEN.GT.0 )
-     $                  SUMJ = DDOT( JLEN, AB( 2, J ), 1, X( J+1 ), 1 )
+     $                  SUMJ = DDOT( JLEN, AB( 2, J ), 1, X( J+1 ),
+     $                               1 )
                   END IF
                ELSE
 *
diff --git a/SRC/dlatdf.f b/SRC/dlatdf.f
index bb285c4956..c0ddb1fa57 100644
--- a/SRC/dlatdf.f
+++ b/SRC/dlatdf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLATDF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlatdf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlatdf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,7 +131,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup latdf
 *
 *> \par Further Details:
 *  =====================
@@ -168,6 +166,7 @@
 *  =====================================================================
       SUBROUTINE DLATDF( IJOB, N, Z, LDZ, RHS, RDSUM, RDSCAL, IPIV,
      $                   JPIV )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -199,7 +198,8 @@ SUBROUTINE DLATDF( IJOB, N, Z, LDZ, RHS, RDSUM, RDSCAL, IPIV,
       DOUBLE PRECISION   WORK( 4*MAXDIM ), XM( MAXDIM ), XP( MAXDIM )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DGECON, DGESC2, DLASSQ, DLASWP,
+      EXTERNAL           DAXPY, DCOPY, DGECON, DGESC2, DLASSQ,
+     $                   DLASWP,
      $                   DSCAL
 *     ..
 *     .. External Functions ..
@@ -229,7 +229,8 @@ SUBROUTINE DLATDF( IJOB, N, Z, LDZ, RHS, RDSUM, RDSCAL, IPIV,
 *           Look-ahead for L-part RHS(1:N-1) = + or -1, SPLUS and
 *           SMIN computed more efficiently than in BSOLVE [1].
 *
-            SPLUS = SPLUS + DDOT( N-J, Z( J+1, J ), 1, Z( J+1, J ), 1 )
+            SPLUS = SPLUS + DDOT( N-J, Z( J+1, J ), 1, Z( J+1, J ),
+     $                            1 )
             SMINU = DDOT( N-J, Z( J+1, J ), 1, RHS( J+1 ), 1 )
             SPLUS = SPLUS*RHS( J )
             IF( SPLUS.GT.SMINU ) THEN
diff --git a/SRC/dlatps.f b/SRC/dlatps.f
index 0aead85563..4f47b991d6 100644
--- a/SRC/dlatps.f
+++ b/SRC/dlatps.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLATPS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlatps.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlatps.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -149,7 +147,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup latps
 *
 *> \par Further Details:
 *  =====================
@@ -226,6 +224,7 @@
 *  =====================================================================
       SUBROUTINE DLATPS( UPLO, TRANS, DIAG, NORMIN, N, AP, X, SCALE,
      $                   CNORM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -617,7 +616,8 @@ SUBROUTINE DLATPS( UPLO, TRANS, DIAG, NORMIN, N, AP, X, SCALE,
 *                    Compute the update
 *                       x(1:j-1) := x(1:j-1) - x(j) * A(1:j-1,j)
 *
-                     CALL DAXPY( J-1, -X( J )*TSCAL, AP( IP-J+1 ), 1, X,
+                     CALL DAXPY( J-1, -X( J )*TSCAL, AP( IP-J+1 ), 1,
+     $                           X,
      $                           1 )
                      I = IDAMAX( J-1, X, 1 )
                      XMAX = ABS( X( I ) )
diff --git a/SRC/dlatrd.f b/SRC/dlatrd.f
index 010a85a212..a8a11543cf 100644
--- a/SRC/dlatrd.f
+++ b/SRC/dlatrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLATRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlatrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlatrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -139,7 +137,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup latrd
 *
 *> \par Further Details:
 *  =====================
@@ -195,6 +193,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -248,7 +247,8 @@ SUBROUTINE DLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
 *
                CALL DGEMV( 'No transpose', I, N-I, -ONE, A( 1, I+1 ),
      $                     LDA, W( I, IW+1 ), LDW, ONE, A( 1, I ), 1 )
-               CALL DGEMV( 'No transpose', I, N-I, -ONE, W( 1, IW+1 ),
+               CALL DGEMV( 'No transpose', I, N-I, -ONE, W( 1,
+     $                     IW+1 ),
      $                     LDW, A( I, I+1 ), LDA, ONE, A( 1, I ), 1 )
             END IF
             IF( I.GT.1 ) THEN
@@ -256,7 +256,8 @@ SUBROUTINE DLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
 *              Generate elementary reflector H(i) to annihilate
 *              A(1:i-2,i)
 *
-               CALL DLARFG( I-1, A( I-1, I ), A( 1, I ), 1, TAU( I-1 ) )
+               CALL DLARFG( I-1, A( I-1, I ), A( 1, I ), 1,
+     $                      TAU( I-1 ) )
                E( I-1 ) = A( I-1, I )
                A( I-1, I ) = ONE
 *
@@ -265,12 +266,14 @@ SUBROUTINE DLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
                CALL DSYMV( 'Upper', I-1, ONE, A, LDA, A( 1, I ), 1,
      $                     ZERO, W( 1, IW ), 1 )
                IF( I.LT.N ) THEN
-                  CALL DGEMV( 'Transpose', I-1, N-I, ONE, W( 1, IW+1 ),
+                  CALL DGEMV( 'Transpose', I-1, N-I, ONE, W( 1,
+     $                        IW+1 ),
      $                        LDW, A( 1, I ), 1, ZERO, W( I+1, IW ), 1 )
                   CALL DGEMV( 'No transpose', I-1, N-I, -ONE,
      $                        A( 1, I+1 ), LDA, W( I+1, IW ), 1, ONE,
      $                        W( 1, IW ), 1 )
-                  CALL DGEMV( 'Transpose', I-1, N-I, ONE, A( 1, I+1 ),
+                  CALL DGEMV( 'Transpose', I-1, N-I, ONE, A( 1,
+     $                        I+1 ),
      $                        LDA, A( 1, I ), 1, ZERO, W( I+1, IW ), 1 )
                   CALL DGEMV( 'No transpose', I-1, N-I, -ONE,
      $                        W( 1, IW+1 ), LDW, W( I+1, IW ), 1, ONE,
@@ -300,7 +303,8 @@ SUBROUTINE DLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
 *              Generate elementary reflector H(i) to annihilate
 *              A(i+2:n,i)
 *
-               CALL DLARFG( N-I, A( I+1, I ), A( MIN( I+2, N ), I ), 1,
+               CALL DLARFG( N-I, A( I+1, I ), A( MIN( I+2, N ), I ),
+     $                      1,
      $                      TAU( I ) )
                E( I ) = A( I+1, I )
                A( I+1, I ) = ONE
@@ -309,18 +313,23 @@ SUBROUTINE DLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
 *
                CALL DSYMV( 'Lower', N-I, ONE, A( I+1, I+1 ), LDA,
      $                     A( I+1, I ), 1, ZERO, W( I+1, I ), 1 )
-               CALL DGEMV( 'Transpose', N-I, I-1, ONE, W( I+1, 1 ), LDW,
+               CALL DGEMV( 'Transpose', N-I, I-1, ONE, W( I+1, 1 ),
+     $                     LDW,
      $                     A( I+1, I ), 1, ZERO, W( 1, I ), 1 )
-               CALL DGEMV( 'No transpose', N-I, I-1, -ONE, A( I+1, 1 ),
+               CALL DGEMV( 'No transpose', N-I, I-1, -ONE, A( I+1,
+     $                     1 ),
      $                     LDA, W( 1, I ), 1, ONE, W( I+1, I ), 1 )
-               CALL DGEMV( 'Transpose', N-I, I-1, ONE, A( I+1, 1 ), LDA,
+               CALL DGEMV( 'Transpose', N-I, I-1, ONE, A( I+1, 1 ),
+     $                     LDA,
      $                     A( I+1, I ), 1, ZERO, W( 1, I ), 1 )
-               CALL DGEMV( 'No transpose', N-I, I-1, -ONE, W( I+1, 1 ),
+               CALL DGEMV( 'No transpose', N-I, I-1, -ONE, W( I+1,
+     $                     1 ),
      $                     LDW, W( 1, I ), 1, ONE, W( I+1, I ), 1 )
                CALL DSCAL( N-I, TAU( I ), W( I+1, I ), 1 )
                ALPHA = -HALF*TAU( I )*DDOT( N-I, W( I+1, I ), 1,
      $                 A( I+1, I ), 1 )
-               CALL DAXPY( N-I, ALPHA, A( I+1, I ), 1, W( I+1, I ), 1 )
+               CALL DAXPY( N-I, ALPHA, A( I+1, I ), 1, W( I+1, I ),
+     $                     1 )
             END IF
 *
    20    CONTINUE
diff --git a/SRC/dlatrs.f b/SRC/dlatrs.f
index 43f92911d7..ff38d41233 100644
--- a/SRC/dlatrs.f
+++ b/SRC/dlatrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLATRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlatrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlatrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -158,7 +156,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup latrs
 *
 *> \par Further Details:
 *  =====================
@@ -233,8 +231,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
+      SUBROUTINE DLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X,
+     $                   SCALE,
      $                   CNORM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -261,11 +261,15 @@ SUBROUTINE DLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
       DOUBLE PRECISION   BIGNUM, GROW, REC, SMLNUM, SUMJ, TJJ, TJJS,
      $                   TMAX, TSCAL, USCAL, XBND, XJ, XMAX
 *     ..
+*     .. Local Arrays ..
+      DOUBLE PRECISION   WORK(1)
+*     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            IDAMAX
-      DOUBLE PRECISION   DASUM, DDOT, DLAMCH
-      EXTERNAL           LSAME, IDAMAX, DASUM, DDOT, DLAMCH
+      DOUBLE PRECISION   DASUM, DDOT, DLAMCH, DLANGE
+      EXTERNAL           LSAME, IDAMAX, DASUM, DDOT, DLAMCH,
+     $                   DLANGE
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           DAXPY, DSCAL, DTRSV, XERBLA
@@ -304,6 +308,7 @@ SUBROUTINE DLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
 *
 *     Quick return if possible
 *
+      SCALE = ONE
       IF( N.EQ.0 )
      $   RETURN
 *
@@ -311,7 +316,6 @@ SUBROUTINE DLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
 *
       SMLNUM = DLAMCH( 'Safe minimum' ) / DLAMCH( 'Precision' )
       BIGNUM = ONE / SMLNUM
-      SCALE = ONE
 *
       IF( LSAME( NORMIN, 'N' ) ) THEN
 *
@@ -343,8 +347,67 @@ SUBROUTINE DLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
       IF( TMAX.LE.BIGNUM ) THEN
          TSCAL = ONE
       ELSE
-         TSCAL = ONE / ( SMLNUM*TMAX )
-         CALL DSCAL( N, TSCAL, CNORM, 1 )
+*
+*        Avoid NaN generation if entries in CNORM exceed the
+*        overflow threshold
+*
+         IF( TMAX.LE.DLAMCH('Overflow') ) THEN
+*           Case 1: All entries in CNORM are valid floating-point numbers
+            TSCAL = ONE / ( SMLNUM*TMAX )
+            CALL DSCAL( N, TSCAL, CNORM, 1 )
+         ELSE
+*           Case 2: At least one column norm of A cannot be represented
+*           as floating-point number. Find the offdiagonal entry A( I, J )
+*           with the largest absolute value. If this entry is not +/- Infinity,
+*           use this value as TSCAL.
+            TMAX = ZERO
+            IF( UPPER ) THEN
+*
+*              A is upper triangular.
+*
+               DO J = 2, N
+                  TMAX = MAX( DLANGE( 'M', J-1, 1, A( 1, J ), 1,
+     $                        WORK ), TMAX )
+               END DO
+            ELSE
+*
+*              A is lower triangular.
+*
+               DO J = 1, N - 1
+                  TMAX = MAX( DLANGE( 'M', N-J, 1, A( J+1, J ), 1,
+     $                        WORK ), TMAX )
+               END DO
+            END IF
+*
+            IF( TMAX.LE.DLAMCH('Overflow') ) THEN
+               TSCAL = ONE / ( SMLNUM*TMAX )
+               DO J = 1, N
+                  IF( CNORM( J ).LE.DLAMCH('Overflow') ) THEN
+                     CNORM( J ) = CNORM( J )*TSCAL
+                  ELSE
+*                    Recompute the 1-norm without introducing Infinity
+*                    in the summation
+                     CNORM( J ) = ZERO
+                     IF( UPPER ) THEN
+                        DO I = 1, J - 1
+                           CNORM( J ) = CNORM( J ) +
+     $                                  TSCAL * ABS( A( I, J ) )
+                        END DO
+                     ELSE
+                        DO I = J + 1, N
+                           CNORM( J ) = CNORM( J ) +
+     $                                  TSCAL * ABS( A( I, J ) )
+                        END DO
+                     END IF
+                  END IF
+               END DO
+            ELSE
+*              At least one entry of A is not a valid floating-point entry.
+*              Rely on TRSV to propagate Inf and NaN.
+               CALL DTRSV( UPLO, TRANS, DIAG, N, A, LDA, X, 1 )
+               RETURN
+            END IF
+         END IF
       END IF
 *
 *     Compute a bound on the computed solution vector to see if the
diff --git a/SRC/dlatrs3.f b/SRC/dlatrs3.f
new file mode 100644
index 0000000000..ae94b8dff1
--- /dev/null
+++ b/SRC/dlatrs3.f
@@ -0,0 +1,679 @@
+*> \brief \b DLATRS3 solves a triangular system of equations with the scale factors set to prevent overflow.
+*
+*  Definition:
+*  ===========
+*
+*      SUBROUTINE DLATRS3( UPLO, TRANS, DIAG, NORMIN, N, NRHS, A, LDA,
+*                          X, LDX, SCALE, CNORM, WORK, LWORK, INFO )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          DIAG, NORMIN, TRANS, UPLO
+*       INTEGER            INFO, LDA, LWORK, LDX, N, NRHS
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   A( LDA, * ), CNORM( * ), SCALE( * ), 
+*                          WORK( * ), X( LDX, * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> DLATRS3 solves one of the triangular systems
+*>
+*>    A * X = B * diag(scale)  or  A**T * X = B * diag(scale)
+*>
+*> with scaling to prevent overflow.  Here A is an upper or lower
+*> triangular matrix, A**T denotes the transpose of A. X and B are
+*> n by nrhs matrices and scale is an nrhs element vector of scaling
+*> factors. A scaling factor scale(j) is usually less than or equal
+*> to 1, chosen such that X(:,j) is less than the overflow threshold.
+*> If the matrix A is singular (A(j,j) = 0 for some j), then
+*> a non-trivial solution to A*X = 0 is returned. If the system is
+*> so badly scaled that the solution cannot be represented as
+*> (1/scale(k))*X(:,k), then x(:,k) = 0 and scale(k) is returned.
+*>
+*> This is a BLAS-3 version of LATRS for solving several right
+*> hand sides simultaneously.
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>          Specifies whether the matrix A is upper or lower triangular.
+*>          = 'U':  Upper triangular
+*>          = 'L':  Lower triangular
+*> \endverbatim
+*>
+*> \param[in] TRANS
+*> \verbatim
+*>          TRANS is CHARACTER*1
+*>          Specifies the operation applied to A.
+*>          = 'N':  Solve A * x = s*b  (No transpose)
+*>          = 'T':  Solve A**T* x = s*b  (Transpose)
+*>          = 'C':  Solve A**T* x = s*b  (Conjugate transpose = Transpose)
+*> \endverbatim
+*>
+*> \param[in] DIAG
+*> \verbatim
+*>          DIAG is CHARACTER*1
+*>          Specifies whether or not the matrix A is unit triangular.
+*>          = 'N':  Non-unit triangular
+*>          = 'U':  Unit triangular
+*> \endverbatim
+*>
+*> \param[in] NORMIN
+*> \verbatim
+*>          NORMIN is CHARACTER*1
+*>          Specifies whether CNORM has been set or not.
+*>          = 'Y':  CNORM contains the column norms on entry
+*>          = 'N':  CNORM is not set on entry.  On exit, the norms will
+*>                  be computed and stored in CNORM.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of columns of X.  NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA,N)
+*>          The triangular matrix A.  If UPLO = 'U', the leading n by n
+*>          upper triangular part of the array A contains the upper
+*>          triangular matrix, and the strictly lower triangular part of
+*>          A is not referenced.  If UPLO = 'L', the leading n by n lower
+*>          triangular part of the array A contains the lower triangular
+*>          matrix, and the strictly upper triangular part of A is not
+*>          referenced.  If DIAG = 'U', the diagonal elements of A are
+*>          also not referenced and are assumed to be 1.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max (1,N).
+*> \endverbatim
+*>
+*> \param[in,out] X
+*> \verbatim
+*>          X is DOUBLE PRECISION array, dimension (LDX,NRHS)
+*>          On entry, the right hand side B of the triangular system.
+*>          On exit, X is overwritten by the solution matrix X.
+*> \endverbatim
+*>
+*> \param[in] LDX
+*> \verbatim
+*>          LDX is INTEGER
+*>          The leading dimension of the array X.  LDX >= max (1,N).
+*> \endverbatim
+*>
+*> \param[out] SCALE
+*> \verbatim
+*>          SCALE is DOUBLE PRECISION array, dimension (NRHS)
+*>          The scaling factor s(k) is for the triangular system
+*>          A * x(:,k) = s(k)*b(:,k)  or  A**T* x(:,k) = s(k)*b(:,k).
+*>          If SCALE = 0, the matrix A is singular or badly scaled.
+*>          If A(j,j) = 0 is encountered, a non-trivial vector x(:,k)
+*>          that is an exact or approximate solution to A*x(:,k) = 0
+*>          is returned. If the system so badly scaled that solution
+*>          cannot be presented as x(:,k) * 1/s(k), then x(:,k) = 0
+*>          is returned.
+*> \endverbatim
+*>
+*> \param[in,out] CNORM
+*> \verbatim
+*>          CNORM is DOUBLE PRECISION array, dimension (N)
+*>
+*>          If NORMIN = 'Y', CNORM is an input argument and CNORM(j)
+*>          contains the norm of the off-diagonal part of the j-th column
+*>          of A.  If TRANS = 'N', CNORM(j) must be greater than or equal
+*>          to the infinity-norm, and if TRANS = 'T' or 'C', CNORM(j)
+*>          must be greater than or equal to the 1-norm.
+*>
+*>          If NORMIN = 'N', CNORM is an output argument and CNORM(j)
+*>          returns the 1-norm of the offdiagonal part of the j-th column
+*>          of A.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK)).
+*>          On exit, if INFO = 0, WORK(1) returns the optimal size of
+*>          WORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>
+*>          If MIN(N,NRHS) = 0, LWORK >= 1, else
+*>          LWORK >= MAX(1, 2*NBA * MAX(NBA, MIN(NRHS, 32)), where
+*>          NBA = (N + NB - 1)/NB and NB is the optimal block size.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal dimensions of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -k, the k-th argument had an illegal value
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup latrs3
+*> \par Further Details:
+*  =====================
+*  \verbatim
+*  The algorithm follows the structure of a block triangular solve.
+*  The diagonal block is solved with a call to the robust the triangular
+*  solver LATRS for every right-hand side RHS = 1, ..., NRHS
+*     op(A( J, J )) * x( J, RHS ) = SCALOC * b( J, RHS ),
+*  where op( A ) = A or op( A ) = A**T.
+*  The linear block updates operate on block columns of X,
+*     B( I, K ) - op(A( I, J )) * X( J, K )
+*  and use GEMM. To avoid overflow in the linear block update, the worst case
+*  growth is estimated. For every RHS, a scale factor s <= 1.0 is computed
+*  such that
+*     || s * B( I, RHS )||_oo
+*   + || op(A( I, J )) ||_oo * || s *  X( J, RHS ) ||_oo <= Overflow threshold
+*
+*  Once all columns of a block column have been rescaled (BLAS-1), the linear
+*  update is executed with GEMM without overflow.
+*
+*  To limit rescaling, local scale factors track the scaling of column segments.
+*  There is one local scale factor s( I, RHS ) per block row I = 1, ..., NBA
+*  per right-hand side column RHS = 1, ..., NRHS. The global scale factor
+*  SCALE( RHS ) is chosen as the smallest local scale factor s( I, RHS )
+*  I = 1, ..., NBA.
+*  A triangular solve op(A( J, J )) * x( J, RHS ) = SCALOC * b( J, RHS )
+*  updates the local scale factor s( J, RHS ) := s( J, RHS ) * SCALOC. The
+*  linear update of potentially inconsistently scaled vector segments
+*     s( I, RHS ) * b( I, RHS ) - op(A( I, J )) * ( s( J, RHS )* x( J, RHS ) )
+*  computes a consistent scaling SCAMIN = MIN( s(I, RHS ), s(J, RHS) ) and,
+*  if necessary, rescales the blocks prior to calling GEMM.
+*
+*  \endverbatim
+*  =====================================================================
+*  References:
+*  C. C. Kjelgaard Mikkelsen, A. B. Schwarz and L. Karlsson (2019).
+*  Parallel robust solution of triangular linear systems. Concurrency
+*  and Computation: Practice and Experience, 31(19), e5064.
+*
+*  Contributor:
+*   Angelika Schwarz, Umea University, Sweden.
+*
+*  =====================================================================
+      SUBROUTINE DLATRS3( UPLO, TRANS, DIAG, NORMIN, N, NRHS, A, LDA,
+     $                    X, LDX, SCALE, CNORM, WORK, LWORK, INFO )
+      IMPLICIT NONE
+*
+*     .. Scalar Arguments ..
+      CHARACTER          DIAG, TRANS, NORMIN, UPLO
+      INTEGER            INFO, LDA, LWORK, LDX, N, NRHS
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   A( LDA, * ), CNORM( * ), X( LDX, * ),
+     $                   SCALE( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+      INTEGER            NBMAX, NBMIN, NBRHS, NRHSMIN
+      PARAMETER          ( NRHSMIN = 2, NBRHS = 32 )
+      PARAMETER          ( NBMIN = 8, NBMAX = 64 )
+*     ..
+*     .. Local Arrays ..
+      DOUBLE PRECISION   W( NBMAX ), XNRM( NBRHS )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY, NOTRAN, NOUNIT, UPPER
+      INTEGER            AWRK, I, IFIRST, IINC, ILAST, II, I1, I2, J,
+     $                   JFIRST, JINC, JLAST, J1, J2, K, KK, K1, K2,
+     $                   LANRM, LDS, LSCALE, NB, NBA, NBX, RHS, LWMIN
+      DOUBLE PRECISION   ANRM, BIGNUM, BNRM, RSCAL, SCAL, SCALOC,
+     $                   SCAMIN, SMLNUM, TMAX
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      DOUBLE PRECISION   DLAMCH, DLANGE, DLARMM
+      EXTERNAL           DLAMCH, DLANGE, DLARMM, ILAENV,
+     $                   LSAME
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DLATRS, DSCAL, XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+      INFO = 0
+      UPPER = LSAME( UPLO, 'U' )
+      NOTRAN = LSAME( TRANS, 'N' )
+      NOUNIT = LSAME( DIAG, 'N' )
+      LQUERY = ( LWORK.EQ.-1 )
+*
+*     Partition A and X into blocks
+*
+      NB = MAX( 8, ILAENV( 1, 'DLATRS', '', N, N, -1, -1 ) )
+      NB = MIN( NBMAX, NB )
+      NBA = MAX( 1, (N + NB - 1) / NB )
+      NBX = MAX( 1, (NRHS + NBRHS - 1) / NBRHS )
+*
+*     Compute the workspace
+*
+*     The workspace comprises two parts.
+*     The first part stores the local scale factors. Each simultaneously
+*     computed right-hand side requires one local scale factor per block
+*     row. WORK( I+KK*LDS ) is the scale factor of the vector
+*     segment associated with the I-th block row and the KK-th vector
+*     in the block column.
+*
+      LSCALE = NBA * MAX( NBA, MIN( NRHS, NBRHS ) )
+      LDS = NBA
+*
+*     The second part stores upper bounds of the triangular A. There are
+*     a total of NBA x NBA blocks, of which only the upper triangular
+*     part or the lower triangular part is referenced. The upper bound of
+*     the block A( I, J ) is stored as WORK( AWRK + I + J * NBA ).
+*
+      LANRM = NBA * NBA
+      AWRK = LSCALE
+*
+      IF( MIN( N, NRHS ).EQ.0 ) THEN
+         LWMIN = 1
+      ELSE
+         LWMIN = LSCALE + LANRM
+      END IF
+      WORK( 1 ) = LWMIN
+*
+*     Test the input parameters
+*
+      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
+     $         LSAME( TRANS, 'C' ) ) THEN
+         INFO = -2
+      ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
+         INFO = -3
+      ELSE IF( .NOT.LSAME( NORMIN, 'Y' ) .AND. .NOT.
+     $         LSAME( NORMIN, 'N' ) ) THEN
+         INFO = -4
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -5
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -6
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -8
+      ELSE IF( LDX.LT.MAX( 1, N ) ) THEN
+         INFO = -10
+      ELSE IF( .NOT.LQUERY .AND. LWORK.LT.LWMIN ) THEN
+         INFO = -14
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'DLATRS3', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Initialize scaling factors
+*
+      DO KK = 1, NRHS
+         SCALE( KK ) = ONE
+      END DO
+*
+*     Quick return if possible
+*
+      IF( MIN( N, NRHS ).EQ.0 )
+     $   RETURN
+*
+*     Determine machine dependent constant to control overflow.
+*
+      BIGNUM = DLAMCH( 'Overflow' )
+      SMLNUM = DLAMCH( 'Safe Minimum' )
+*
+*     Use unblocked code for small problems
+*
+      IF( NRHS.LT.NRHSMIN ) THEN
+         CALL DLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X( 1, 1),
+     $                SCALE( 1 ), CNORM, INFO )
+         DO K = 2, NRHS
+            CALL DLATRS( UPLO, TRANS, DIAG, 'Y', N, A, LDA, X( 1,
+     $                   K ),
+     $                   SCALE( K ), CNORM, INFO )
+         END DO
+         RETURN
+      END IF
+*
+*     Compute norms of blocks of A excluding diagonal blocks and find
+*     the block with the largest norm TMAX.
+*
+      TMAX = ZERO
+      DO J = 1, NBA
+         J1 = (J-1)*NB + 1
+         J2 = MIN( J*NB, N ) + 1
+         IF ( UPPER ) THEN
+            IFIRST = 1
+            ILAST = J - 1
+         ELSE
+            IFIRST = J + 1
+            ILAST = NBA
+         END IF
+         DO I = IFIRST, ILAST
+            I1 = (I-1)*NB + 1
+            I2 = MIN( I*NB, N ) + 1
+*
+*           Compute upper bound of A( I1:I2-1, J1:J2-1 ).
+*
+            IF( NOTRAN ) THEN
+               ANRM = DLANGE( 'I', I2-I1, J2-J1, A( I1, J1 ), LDA,
+     $                        W )
+               WORK( AWRK + I+(J-1)*NBA ) = ANRM
+            ELSE
+               ANRM = DLANGE( '1', I2-I1, J2-J1, A( I1, J1 ), LDA,
+     $                        W )
+               WORK( AWRK + J+(I-1)*NBA ) = ANRM
+            END IF
+            TMAX = MAX( TMAX, ANRM )
+         END DO
+      END DO
+*
+      IF( .NOT. TMAX.LE.DLAMCH('Overflow') ) THEN
+*
+*        Some matrix entries have huge absolute value. At least one upper
+*        bound norm( A(I1:I2-1, J1:J2-1), 'I') is not a valid floating-point
+*        number, either due to overflow in LANGE or due to Inf in A.
+*        Fall back to LATRS. Set normin = 'N' for every right-hand side to
+*        force computation of TSCAL in LATRS to avoid the likely overflow
+*        in the computation of the column norms CNORM.
+*
+         DO K = 1, NRHS
+            CALL DLATRS( UPLO, TRANS, DIAG, 'N', N, A, LDA, X( 1,
+     $                   K ),
+     $                   SCALE( K ), CNORM, INFO )
+         END DO
+         RETURN
+      END IF
+*
+*     Every right-hand side requires workspace to store NBA local scale
+*     factors. To save workspace, X is computed successively in block columns
+*     of width NBRHS, requiring a total of NBA x NBRHS space. If sufficient
+*     workspace is available, larger values of NBRHS or NBRHS = NRHS are viable.
+      DO K = 1, NBX
+*        Loop over block columns (index = K) of X and, for column-wise scalings,
+*        over individual columns (index = KK).
+*        K1: column index of the first column in X( J, K )
+*        K2: column index of the first column in X( J, K+1 )
+*        so the K2 - K1 is the column count of the block X( J, K )
+         K1 = (K-1)*NBRHS + 1
+         K2 = MIN( K*NBRHS, NRHS ) + 1
+*
+*        Initialize local scaling factors of current block column X( J, K )
+*
+         DO KK = 1, K2-K1
+            DO I = 1, NBA
+               WORK( I+KK*LDS ) = ONE
+            END DO
+         END DO
+*
+         IF( NOTRAN ) THEN
+*
+*           Solve A * X(:, K1:K2-1) = B * diag(scale(K1:K2-1))
+*
+            IF( UPPER ) THEN
+               JFIRST = NBA
+               JLAST = 1
+               JINC = -1
+            ELSE
+               JFIRST = 1
+               JLAST = NBA
+               JINC = 1
+            END IF
+         ELSE
+*
+*           Solve A**T * X(:, K1:K2-1) = B * diag(scale(K1:K2-1))
+*
+            IF( UPPER ) THEN
+               JFIRST = 1
+               JLAST = NBA
+               JINC = 1
+            ELSE
+               JFIRST = NBA
+               JLAST = 1
+               JINC = -1
+            END IF
+         END IF
+*
+         DO J = JFIRST, JLAST, JINC
+*           J1: row index of the first row in A( J, J )
+*           J2: row index of the first row in A( J+1, J+1 )
+*           so that J2 - J1 is the row count of the block A( J, J )
+            J1 = (J-1)*NB + 1
+            J2 = MIN( J*NB, N ) + 1
+*
+*           Solve op(A( J, J )) * X( J, RHS ) = SCALOC * B( J, RHS )
+*           for all right-hand sides in the current block column,
+*           one RHS at a time.
+*
+            DO KK = 1, K2-K1
+               RHS = K1 + KK - 1
+               IF( KK.EQ.1 ) THEN
+                  CALL DLATRS( UPLO, TRANS, DIAG, 'N', J2-J1,
+     $                         A( J1, J1 ), LDA, X( J1, RHS ),
+     $                         SCALOC, CNORM, INFO )
+               ELSE
+                  CALL DLATRS( UPLO, TRANS, DIAG, 'Y', J2-J1,
+     $                         A( J1, J1 ), LDA, X( J1, RHS ),
+     $                         SCALOC, CNORM, INFO )
+               END IF
+*              Find largest absolute value entry in the vector segment
+*              X( J1:J2-1, RHS ) as an upper bound for the worst case
+*              growth in the linear updates.
+               XNRM( KK ) = DLANGE( 'I', J2-J1, 1, X( J1, RHS ),
+     $                              LDX, W )
+*
+               IF( SCALOC .EQ. ZERO ) THEN
+*                 LATRS found that A is singular through A(j,j) = 0.
+*                 Reset the computation x(1:n) = 0, x(j) = 1, SCALE = 0
+*                 and compute A*x = 0 (or A**T*x = 0). Note that
+*                 X(J1:J2-1, KK) is set by LATRS.
+                  SCALE( RHS ) = ZERO
+                  DO II = 1, J1-1
+                     X( II, KK ) = ZERO
+                  END DO
+                  DO II = J2, N
+                     X( II, KK ) = ZERO
+                  END DO
+*                 Discard the local scale factors.
+                  DO II = 1, NBA
+                     WORK( II+KK*LDS ) = ONE
+                  END DO
+                  SCALOC = ONE
+               ELSE IF( SCALOC * WORK( J+KK*LDS ) .EQ. ZERO ) THEN
+*                 LATRS computed a valid scale factor, but combined with
+*                 the current scaling the solution does not have a
+*                 scale factor > 0.
+*
+*                 Set WORK( J+KK*LDS ) to smallest valid scale
+*                 factor and increase SCALOC accordingly.
+                  SCAL = WORK( J+KK*LDS ) / SMLNUM
+                  SCALOC = SCALOC * SCAL
+                  WORK( J+KK*LDS ) = SMLNUM
+*                 If LATRS overestimated the growth, x may be
+*                 rescaled to preserve a valid combined scale
+*                 factor WORK( J, KK ) > 0.
+                  RSCAL = ONE / SCALOC
+                  IF( XNRM( KK ) * RSCAL .LE. BIGNUM ) THEN
+                     XNRM( KK ) = XNRM( KK ) * RSCAL
+                     CALL DSCAL( J2-J1, RSCAL, X( J1, RHS ), 1 )
+                     SCALOC = ONE
+                  ELSE
+*                    The system op(A) * x = b is badly scaled and its
+*                    solution cannot be represented as (1/scale) * x.
+*                    Set x to zero. This approach deviates from LATRS
+*                    where a completely meaningless non-zero vector
+*                    is returned that is not a solution to op(A) * x = b.
+                     SCALE( RHS ) = ZERO
+                     DO II = 1, N
+                        X( II, KK ) = ZERO
+                     END DO
+*                    Discard the local scale factors.
+                     DO II = 1, NBA
+                        WORK( II+KK*LDS ) = ONE
+                     END DO
+                     SCALOC = ONE
+                  END IF
+               END IF
+               SCALOC = SCALOC * WORK( J+KK*LDS )
+               WORK( J+KK*LDS ) = SCALOC
+            END DO
+*
+*           Linear block updates
+*
+            IF( NOTRAN ) THEN
+               IF( UPPER ) THEN
+                  IFIRST = J - 1
+                  ILAST = 1
+                  IINC = -1
+               ELSE
+                  IFIRST = J + 1
+                  ILAST = NBA
+                  IINC = 1
+               END IF
+            ELSE
+               IF( UPPER ) THEN
+                  IFIRST = J + 1
+                  ILAST = NBA
+                  IINC = 1
+               ELSE
+                  IFIRST = J - 1
+                  ILAST = 1
+                  IINC = -1
+               END IF
+            END IF
+*
+            DO I = IFIRST, ILAST, IINC
+*              I1: row index of the first column in X( I, K )
+*              I2: row index of the first column in X( I+1, K )
+*              so the I2 - I1 is the row count of the block X( I, K )
+               I1 = (I-1)*NB + 1
+               I2 = MIN( I*NB, N ) + 1
+*
+*              Prepare the linear update to be executed with GEMM.
+*              For each column, compute a consistent scaling, a
+*              scaling factor to survive the linear update, and
+*              rescale the column segments, if necessary. Then
+*              the linear update is safely executed.
+*
+               DO KK = 1, K2-K1
+                  RHS = K1 + KK - 1
+*                 Compute consistent scaling
+                  SCAMIN = MIN( WORK( I + KK*LDS), WORK( J + KK*LDS ) )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  BNRM = DLANGE( 'I', I2-I1, 1, X( I1, RHS ), LDX,
+     $                           W )
+                  BNRM = BNRM*( SCAMIN / WORK( I+KK*LDS ) )
+                  XNRM( KK ) = XNRM( KK )*(SCAMIN / WORK( J+KK*LDS ))
+                  ANRM = WORK( AWRK + I+(J-1)*NBA )
+                  SCALOC = DLARMM( ANRM, XNRM( KK ), BNRM )
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to B( I, KK ) and B( J, KK ).
+*
+                  SCAL = ( SCAMIN / WORK( I+KK*LDS) )*SCALOC
+                  IF( SCAL.NE.ONE ) THEN
+                     CALL DSCAL( I2-I1, SCAL, X( I1, RHS ), 1 )
+                     WORK( I+KK*LDS ) = SCAMIN*SCALOC
+                  END IF
+*
+                  SCAL = ( SCAMIN / WORK( J+KK*LDS ) )*SCALOC
+                  IF( SCAL.NE.ONE ) THEN
+                     CALL DSCAL( J2-J1, SCAL, X( J1, RHS ), 1 )
+                     WORK( J+KK*LDS ) = SCAMIN*SCALOC
+                  END IF
+               END DO
+*
+               IF( NOTRAN ) THEN
+*
+*                 B( I, K ) := B( I, K ) - A( I, J ) * X( J, K )
+*
+                  CALL DGEMM( 'N', 'N', I2-I1, K2-K1, J2-J1, -ONE,
+     $                        A( I1, J1 ), LDA, X( J1, K1 ), LDX,
+     $                        ONE, X( I1, K1 ), LDX )
+               ELSE
+*
+*                 B( I, K ) := B( I, K ) - A( J, I )**T * X( J, K )
+*
+                  CALL DGEMM( 'T', 'N', I2-I1, K2-K1, J2-J1, -ONE,
+     $                        A( J1, I1 ), LDA, X( J1, K1 ), LDX,
+     $                        ONE, X( I1, K1 ), LDX )
+               END IF
+            END DO
+         END DO
+*
+*        Reduce local scaling factors
+*
+         DO KK = 1, K2-K1
+            RHS = K1 + KK - 1
+            DO I = 1, NBA
+               SCALE( RHS ) = MIN( SCALE( RHS ), WORK( I+KK*LDS ) )
+            END DO
+         END DO
+*
+*        Realize consistent scaling
+*
+         DO KK = 1, K2-K1
+            RHS = K1 + KK - 1
+            IF( SCALE( RHS ).NE.ONE .AND. SCALE( RHS ).NE. ZERO ) THEN
+               DO I = 1, NBA
+                  I1 = (I-1)*NB + 1
+                  I2 = MIN( I*NB, N ) + 1
+                  SCAL = SCALE( RHS ) / WORK( I+KK*LDS )
+                  IF( SCAL.NE.ONE )
+     $               CALL DSCAL( I2-I1, SCAL, X( I1, RHS ), 1 )
+               END DO
+            END IF
+         END DO
+      END DO
+*
+      WORK( 1 ) = LWMIN
+*
+      RETURN
+*
+*     End of DLATRS3
+*
+      END
diff --git a/SRC/dlatrz.f b/SRC/dlatrz.f
index 42b3171313..83394e019a 100644
--- a/SRC/dlatrz.f
+++ b/SRC/dlatrz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLATRZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlatrz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlatrz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,7 +95,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup latrz
 *
 *> \par Contributors:
 *  ==================
@@ -137,6 +135,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DLATRZ( M, N, L, A, LDA, TAU, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dlatsqr.f b/SRC/dlatsqr.f
index a7e8f8fe8e..8c596ce2fb 100644
--- a/SRC/dlatsqr.f
+++ b/SRC/dlatsqr.f
@@ -57,7 +57,7 @@
 *> \verbatim
 *>          MB is INTEGER
 *>          The row block size to be used in the blocked QR.
-*>          MB > N.
+*>          MB > 0.
 *> \endverbatim
 *>
 *> \param[in] NB
@@ -101,14 +101,18 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          (workspace) DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
-*>          The dimension of the array WORK.  LWORK >= NB*N.
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= NB*N, otherwise.
+*>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
+*>          only calculates the minimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
@@ -160,27 +164,30 @@
 *>     SIAM J. Sci. Comput, vol. 34, no. 1, 2012
 *> \endverbatim
 *>
+*> \ingroup latsqr
+*>
 *  =====================================================================
       SUBROUTINE DLATSQR( M, N, MB, NB, A, LDA, T, LDT, WORK,
-     $                    LWORK, INFO)
+     $                    LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd. --
 *
 *     .. Scalar Arguments ..
-      INTEGER           INFO, LDA, M, N, MB, NB, LDT, LWORK
+      INTEGER            INFO, LDA, M, N, MB, NB, LDT, LWORK
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION  A( LDA, * ), WORK( * ), T(LDT, *)
+      DOUBLE PRECISION   A( LDA, * ), WORK( * ), T( LDT, * )
 *     ..
 *
 *  =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
-      LOGICAL    LQUERY
-      INTEGER    I, II, KK, CTR
+      LOGICAL            LQUERY
+      INTEGER            I, II, KK, CTR, MINMN, LWMIN
 *     ..
 *     .. EXTERNAL FUNCTIONS ..
       LOGICAL            LSAME
@@ -197,72 +204,81 @@ SUBROUTINE DLATSQR( M, N, MB, NB, A, LDA, T, LDT, WORK,
       INFO = 0
 *
       LQUERY = ( LWORK.EQ.-1 )
+*
+      MINMN = MIN( M, N )
+      IF( MINMN.EQ.0 ) THEN
+        LWMIN = 1
+      ELSE
+        LWMIN = N*NB
+      END IF
 *
       IF( M.LT.0 ) THEN
         INFO = -1
       ELSE IF( N.LT.0 .OR. M.LT.N ) THEN
         INFO = -2
-      ELSE IF( MB.LE.N ) THEN
+      ELSE IF( MB.LT.1 ) THEN
         INFO = -3
-      ELSE IF( NB.LT.1 .OR. ( NB.GT.N .AND. N.GT.0 )) THEN
+      ELSE IF( NB.LT.1 .OR. ( NB.GT.N .AND. N.GT.0 ) ) THEN
         INFO = -4
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-        INFO = -5
+        INFO = -6
       ELSE IF( LDT.LT.NB ) THEN
         INFO = -8
-      ELSE IF( LWORK.LT.(N*NB) .AND. (.NOT.LQUERY) ) THEN
+      ELSE IF( LWORK.LT.LWMIN .AND. (.NOT.LQUERY) ) THEN
         INFO = -10
       END IF
-      IF( INFO.EQ.0)  THEN
-        WORK(1) = NB*N
+*
+      IF( INFO.EQ.0 ) THEN
+        WORK( 1 ) = LWMIN
       END IF
+*
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'DLATSQR', -INFO )
         RETURN
-      ELSE IF (LQUERY) THEN
-       RETURN
+      ELSE IF( LQUERY ) THEN
+        RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( MIN(M,N).EQ.0 ) THEN
-          RETURN
+      IF( MINMN.EQ.0 ) THEN
+        RETURN
       END IF
 *
 *     The QR Decomposition
 *
-       IF ((MB.LE.N).OR.(MB.GE.M)) THEN
-         CALL DGEQRT( M, N, NB, A, LDA, T, LDT, WORK, INFO)
-         RETURN
-       END IF
+      IF( (MB.LE.N) .OR. (MB.GE.M) ) THEN
+        CALL DGEQRT( M, N, NB, A, LDA, T, LDT, WORK, INFO )
+        RETURN
+      END IF
 *
-       KK = MOD((M-N),(MB-N))
-       II=M-KK+1
+      KK = MOD((M-N),(MB-N))
+      II = M-KK+1
 *
-*      Compute the QR factorization of the first block A(1:MB,1:N)
+*     Compute the QR factorization of the first block A(1:MB,1:N)
 *
-       CALL DGEQRT( MB, N, NB, A(1,1), LDA, T, LDT, WORK, INFO )
+      CALL DGEQRT( MB, N, NB, A(1,1), LDA, T, LDT, WORK, INFO )
 *
-       CTR = 1
-       DO I = MB+1, II-MB+N ,  (MB-N)
+      CTR = 1
+      DO I = MB+1, II-MB+N, (MB-N)
 *
-*      Compute the QR factorization of the current block A(I:I+MB-N,1:N)
+*       Compute the QR factorization of the current block A(I:I+MB-N,1:N)
 *
-         CALL DTPQRT( MB-N, N, 0, NB, A(1,1), LDA, A( I, 1 ), LDA,
-     $                 T(1, CTR * N + 1),
-     $                  LDT, WORK, INFO )
-         CTR = CTR + 1
-       END DO
+        CALL DTPQRT( MB-N, N, 0, NB, A(1,1), LDA, A( I, 1 ), LDA,
+     $                T(1, CTR * N + 1),
+     $                LDT, WORK, INFO )
+        CTR = CTR + 1
+      END DO
 *
-*      Compute the QR factorization of the last block A(II:M,1:N)
+*     Compute the QR factorization of the last block A(II:M,1:N)
 *
-       IF (II.LE.M) THEN
-         CALL DTPQRT( KK, N, 0, NB, A(1,1), LDA, A( II, 1 ), LDA,
-     $                 T(1, CTR * N + 1), LDT,
-     $                  WORK, INFO )
-       END IF
+      IF( II.LE.M ) THEN
+        CALL DTPQRT( KK, N, 0, NB, A(1,1), LDA, A( II, 1 ), LDA,
+     $                T(1, CTR * N + 1), LDT,
+     $                WORK, INFO )
+      END IF
 *
-      WORK( 1 ) = N*NB
+      WORK( 1 ) = LWMIN
       RETURN
 *
 *     End of DLATSQR
diff --git a/SRC/dlauu2.f b/SRC/dlauu2.f
index a026d96de1..b62eaad835 100644
--- a/SRC/dlauu2.f
+++ b/SRC/dlauu2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAUU2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlauu2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlauu2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,10 +93,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lauu2
 *
 *  =====================================================================
       SUBROUTINE DLAUU2( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -164,8 +163,10 @@ SUBROUTINE DLAUU2( UPLO, N, A, LDA, INFO )
          DO 10 I = 1, N
             AII = A( I, I )
             IF( I.LT.N ) THEN
-               A( I, I ) = DDOT( N-I+1, A( I, I ), LDA, A( I, I ), LDA )
-               CALL DGEMV( 'No transpose', I-1, N-I, ONE, A( 1, I+1 ),
+               A( I, I ) = DDOT( N-I+1, A( I, I ), LDA, A( I, I ),
+     $            LDA )
+               CALL DGEMV( 'No transpose', I-1, N-I, ONE, A( 1,
+     $                     I+1 ),
      $                     LDA, A( I, I+1 ), LDA, AII, A( 1, I ), 1 )
             ELSE
                CALL DSCAL( I, AII, A( 1, I ), 1 )
@@ -180,7 +181,8 @@ SUBROUTINE DLAUU2( UPLO, N, A, LDA, INFO )
             AII = A( I, I )
             IF( I.LT.N ) THEN
                A( I, I ) = DDOT( N-I+1, A( I, I ), 1, A( I, I ), 1 )
-               CALL DGEMV( 'Transpose', N-I, I-1, ONE, A( I+1, 1 ), LDA,
+               CALL DGEMV( 'Transpose', N-I, I-1, ONE, A( I+1, 1 ),
+     $                     LDA,
      $                     A( I+1, I ), 1, AII, A( I, 1 ), LDA )
             ELSE
                CALL DSCAL( I, AII, A( I, 1 ), LDA )
diff --git a/SRC/dlauum.f b/SRC/dlauum.f
index b832eaa869..2321f238fe 100644
--- a/SRC/dlauum.f
+++ b/SRC/dlauum.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAUUM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlauum.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlauum.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,10 +93,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup lauum
 *
 *  =====================================================================
       SUBROUTINE DLAUUM( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -194,14 +193,16 @@ SUBROUTINE DLAUUM( UPLO, N, A, LDA, INFO )
 *
             DO 20 I = 1, N, NB
                IB = MIN( NB, N-I+1 )
-               CALL DTRMM( 'Left', 'Lower', 'Transpose', 'Non-unit', IB,
+               CALL DTRMM( 'Left', 'Lower', 'Transpose', 'Non-unit',
+     $                     IB,
      $                     I-1, ONE, A( I, I ), LDA, A( I, 1 ), LDA )
                CALL DLAUU2( 'Lower', IB, A( I, I ), LDA, INFO )
                IF( I+IB.LE.N ) THEN
                   CALL DGEMM( 'Transpose', 'No transpose', IB, I-1,
      $                        N-I-IB+1, ONE, A( I+IB, I ), LDA,
      $                        A( I+IB, 1 ), LDA, ONE, A( I, 1 ), LDA )
-                  CALL DSYRK( 'Lower', 'Transpose', IB, N-I-IB+1, ONE,
+                  CALL DSYRK( 'Lower', 'Transpose', IB, N-I-IB+1,
+     $                        ONE,
      $                        A( I+IB, I ), LDA, ONE, A( I, I ), LDA )
                END IF
    20       CONTINUE
diff --git a/SRC/dopgtr.f b/SRC/dopgtr.f
index 214030ffbe..7a5de71e59 100644
--- a/SRC/dopgtr.f
+++ b/SRC/dopgtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DOPGTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dopgtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dopgtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup upgtr
 *
 *  =====================================================================
       SUBROUTINE DOPGTR( UPLO, N, AP, TAU, Q, LDQ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dopmtr.f b/SRC/dopmtr.f
index c18074deca..5646b8eacc 100644
--- a/SRC/dopmtr.f
+++ b/SRC/dopmtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DOPMTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dopmtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dopmtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -142,11 +140,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup upmtr
 *
 *  =====================================================================
-      SUBROUTINE DOPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC, WORK,
+      SUBROUTINE DOPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC,
+     $                   WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -260,11 +260,9 @@ SUBROUTINE DOPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC, WORK,
 *
 *           Apply H(i)
 *
-            AII = AP( II )
-            AP( II ) = ONE
-            CALL DLARF( SIDE, MI, NI, AP( II-I+1 ), 1, TAU( I ), C, LDC,
+            CALL DLARF1L( SIDE, MI, NI, AP( II-I+1 ), 1, TAU( I ), C,
+     $                  LDC,
      $                  WORK )
-            AP( II ) = AII
 *
             IF( FORWRD ) THEN
                II = II + I + 2
diff --git a/SRC/dorbdb.f b/SRC/dorbdb.f
index 3edfda6b84..08be1794a6 100644
--- a/SRC/dorbdb.f
+++ b/SRC/dorbdb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORBDB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorbdb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorbdb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -255,7 +253,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unbdb
 *
 *> \par Further Details:
 *  =====================
@@ -281,9 +279,11 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE DORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
+      SUBROUTINE DORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12,
+     $                   LDX12,
      $                   X21, LDX21, X22, LDX22, THETA, PHI, TAUP1,
      $                   TAUP2, TAUQ1, TAUQ2, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -315,7 +315,8 @@ SUBROUTINE DORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
       DOUBLE PRECISION   Z1, Z2, Z3, Z4
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DLARF, DLARFGP, DSCAL, XERBLA
+      EXTERNAL           DAXPY, DLARF1F, DLARFGP, DSCAL,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION   DNRM2
@@ -398,14 +399,16 @@ SUBROUTINE DORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL DSCAL( P-I+1, Z1, X11(I,I), 1 )
             ELSE
                CALL DSCAL( P-I+1, Z1*COS(PHI(I-1)), X11(I,I), 1 )
-               CALL DAXPY( P-I+1, -Z1*Z3*Z4*SIN(PHI(I-1)), X12(I,I-1),
+               CALL DAXPY( P-I+1, -Z1*Z3*Z4*SIN(PHI(I-1)), X12(I,
+     $                     I-1),
      $                     1, X11(I,I), 1 )
             END IF
             IF( I .EQ. 1 ) THEN
                CALL DSCAL( M-P-I+1, Z2, X21(I,I), 1 )
             ELSE
                CALL DSCAL( M-P-I+1, Z2*COS(PHI(I-1)), X21(I,I), 1 )
-               CALL DAXPY( M-P-I+1, -Z2*Z3*Z4*SIN(PHI(I-1)), X22(I,I-1),
+               CALL DAXPY( M-P-I+1, -Z2*Z3*Z4*SIN(PHI(I-1)), X22(I,
+     $                     I-1),
      $                     1, X21(I,I), 1 )
             END IF
 *
@@ -413,44 +416,48 @@ SUBROUTINE DORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
      $                 DNRM2( P-I+1, X11(I,I), 1 ) )
 *
             IF( P .GT. I ) THEN
-               CALL DLARFGP( P-I+1, X11(I,I), X11(I+1,I), 1, TAUP1(I) )
+               CALL DLARFGP( P-I+1, X11(I,I), X11(I+1,I), 1,
+     $                       TAUP1(I) )
             ELSE IF( P .EQ. I ) THEN
                CALL DLARFGP( P-I+1, X11(I,I), X11(I,I), 1, TAUP1(I) )
             END IF
-            X11(I,I) = ONE
             IF ( M-P .GT. I ) THEN
                CALL DLARFGP( M-P-I+1, X21(I,I), X21(I+1,I), 1,
      $                       TAUP2(I) )
             ELSE IF ( M-P .EQ. I ) THEN
-               CALL DLARFGP( M-P-I+1, X21(I,I), X21(I,I), 1, TAUP2(I) )
+               CALL DLARFGP( M-P-I+1, X21(I,I), X21(I,I), 1,
+     $                       TAUP2(I) )
             END IF
-            X21(I,I) = ONE
 *
             IF ( Q .GT. I ) THEN
-               CALL DLARF( 'L', P-I+1, Q-I, X11(I,I), 1, TAUP1(I),
+               CALL DLARF1F( 'L', P-I+1, Q-I, X11(I,I), 1, TAUP1(I),
      $                     X11(I,I+1), LDX11, WORK )
             END IF
             IF ( M-Q+1 .GT. I ) THEN
-               CALL DLARF( 'L', P-I+1, M-Q-I+1, X11(I,I), 1, TAUP1(I),
+               CALL DLARF1F( 'L', P-I+1, M-Q-I+1, X11(I,I), 1,
+     $                     TAUP1(I),
      $                     X12(I,I), LDX12, WORK )
             END IF
             IF ( Q .GT. I ) THEN
-               CALL DLARF( 'L', M-P-I+1, Q-I, X21(I,I), 1, TAUP2(I),
-     $                     X21(I,I+1), LDX21, WORK )
+               CALL DLARF1F( 'L', M-P-I+1, Q-I, X21(I,I), 1,
+     $                       TAUP2(I), X21(I,I+1), LDX21, WORK )
             END IF
             IF ( M-Q+1 .GT. I ) THEN
-               CALL DLARF( 'L', M-P-I+1, M-Q-I+1, X21(I,I), 1, TAUP2(I),
-     $                     X22(I,I), LDX22, WORK )
+               CALL DLARF1F( 'L', M-P-I+1, M-Q-I+1, X21(I,I), 1,
+     $                       TAUP2(I), X22(I,I), LDX22, WORK )
             END IF
 *
             IF( I .LT. Q ) THEN
                CALL DSCAL( Q-I, -Z1*Z3*SIN(THETA(I)), X11(I,I+1),
      $                     LDX11 )
-               CALL DAXPY( Q-I, Z2*Z3*COS(THETA(I)), X21(I,I+1), LDX21,
+               CALL DAXPY( Q-I, Z2*Z3*COS(THETA(I)), X21(I,I+1),
+     $                     LDX21,
      $                     X11(I,I+1), LDX11 )
             END IF
-            CALL DSCAL( M-Q-I+1, -Z1*Z4*SIN(THETA(I)), X12(I,I), LDX12 )
-            CALL DAXPY( M-Q-I+1, Z2*Z4*COS(THETA(I)), X22(I,I), LDX22,
+            CALL DSCAL( M-Q-I+1, -Z1*Z4*SIN(THETA(I)), X12(I,I),
+     $                  LDX12 )
+            CALL DAXPY( M-Q-I+1, Z2*Z4*COS(THETA(I)), X22(I,I),
+     $                  LDX22,
      $                  X12(I,I), LDX12 )
 *
             IF( I .LT. Q )
@@ -465,7 +472,6 @@ SUBROUTINE DORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                   CALL DLARFGP( Q-I, X11(I,I+1), X11(I,I+2), LDX11,
      $                          TAUQ1(I) )
                END IF
-               X11(I,I+1) = ONE
             END IF
             IF ( Q+I-1 .LT. M ) THEN
                IF ( M-Q .EQ. I ) THEN
@@ -476,20 +482,22 @@ SUBROUTINE DORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
      $                          TAUQ2(I) )
                END IF
             END IF
-            X12(I,I) = ONE
 *
             IF( I .LT. Q ) THEN
-               CALL DLARF( 'R', P-I, Q-I, X11(I,I+1), LDX11, TAUQ1(I),
+               CALL DLARF1F( 'R', P-I, Q-I, X11(I,I+1), LDX11,
+     $                     TAUQ1(I),
      $                     X11(I+1,I+1), LDX11, WORK )
-               CALL DLARF( 'R', M-P-I, Q-I, X11(I,I+1), LDX11, TAUQ1(I),
+               CALL DLARF1F( 'R', M-P-I, Q-I, X11(I,I+1), LDX11,
+     $                     TAUQ1(I),
      $                     X21(I+1,I+1), LDX21, WORK )
             END IF
             IF ( P .GT. I ) THEN
-               CALL DLARF( 'R', P-I, M-Q-I+1, X12(I,I), LDX12, TAUQ2(I),
+               CALL DLARF1F( 'R', P-I, M-Q-I+1, X12(I,I), LDX12,
+     $                     TAUQ2(I),
      $                     X12(I+1,I), LDX12, WORK )
             END IF
             IF ( M-P .GT. I ) THEN
-               CALL DLARF( 'R', M-P-I, M-Q-I+1, X12(I,I), LDX12,
+               CALL DLARF1F( 'R', M-P-I, M-Q-I+1, X12(I,I), LDX12,
      $                     TAUQ2(I), X22(I+1,I), LDX22, WORK )
             END IF
 *
@@ -507,14 +515,14 @@ SUBROUTINE DORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL DLARFGP( M-Q-I+1, X12(I,I), X12(I,I+1), LDX12,
      $                       TAUQ2(I) )
             END IF
-            X12(I,I) = ONE
 *
             IF ( P .GT. I ) THEN
-               CALL DLARF( 'R', P-I, M-Q-I+1, X12(I,I), LDX12, TAUQ2(I),
+               CALL DLARF1F( 'R', P-I, M-Q-I+1, X12(I,I), LDX12,
+     $                     TAUQ2(I),
      $                     X12(I+1,I), LDX12, WORK )
             END IF
             IF( M-P-Q .GE. 1 )
-     $         CALL DLARF( 'R', M-P-Q, M-Q-I+1, X12(I,I), LDX12,
+     $         CALL DLARF1F( 'R', M-P-Q, M-Q-I+1, X12(I,I), LDX12,
      $                     TAUQ2(I), X22(Q+1,I), LDX22, WORK )
 *
          END DO
@@ -531,9 +539,9 @@ SUBROUTINE DORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL DLARFGP( M-P-Q-I+1, X22(Q+I,P+I), X22(Q+I,P+I+1),
      $                       LDX22, TAUQ2(P+I) )
             END IF
-            X22(Q+I,P+I) = ONE
             IF ( I .LT. M-P-Q ) THEN
-               CALL DLARF( 'R', M-P-Q-I, M-P-Q-I+1, X22(Q+I,P+I), LDX22,
+               CALL DLARF1F( 'R', M-P-Q-I, M-P-Q-I+1, X22(Q+I,P+I),
+     $                     LDX22,
      $                     TAUQ2(P+I), X22(Q+I+1,P+I), LDX22, WORK )
             END IF
 *
@@ -549,22 +557,25 @@ SUBROUTINE DORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL DSCAL( P-I+1, Z1, X11(I,I), LDX11 )
             ELSE
                CALL DSCAL( P-I+1, Z1*COS(PHI(I-1)), X11(I,I), LDX11 )
-               CALL DAXPY( P-I+1, -Z1*Z3*Z4*SIN(PHI(I-1)), X12(I-1,I),
+               CALL DAXPY( P-I+1, -Z1*Z3*Z4*SIN(PHI(I-1)), X12(I-1,
+     $                     I),
      $                     LDX12, X11(I,I), LDX11 )
             END IF
             IF( I .EQ. 1 ) THEN
                CALL DSCAL( M-P-I+1, Z2, X21(I,I), LDX21 )
             ELSE
-               CALL DSCAL( M-P-I+1, Z2*COS(PHI(I-1)), X21(I,I), LDX21 )
-               CALL DAXPY( M-P-I+1, -Z2*Z3*Z4*SIN(PHI(I-1)), X22(I-1,I),
+               CALL DSCAL( M-P-I+1, Z2*COS(PHI(I-1)), X21(I,I),
+     $                     LDX21 )
+               CALL DAXPY( M-P-I+1, -Z2*Z3*Z4*SIN(PHI(I-1)), X22(I-1,
+     $                     I),
      $                     LDX22, X21(I,I), LDX21 )
             END IF
 *
             THETA(I) = ATAN2( DNRM2( M-P-I+1, X21(I,I), LDX21 ),
      $                 DNRM2( P-I+1, X11(I,I), LDX11 ) )
 *
-            CALL DLARFGP( P-I+1, X11(I,I), X11(I,I+1), LDX11, TAUP1(I) )
-            X11(I,I) = ONE
+            CALL DLARFGP( P-I+1, X11(I,I), X11(I,I+1), LDX11,
+     $                    TAUP1(I) )
             IF ( I .EQ. M-P ) THEN
                CALL DLARFGP( M-P-I+1, X21(I,I), X21(I,I), LDX21,
      $                    TAUP2(I) )
@@ -572,22 +583,23 @@ SUBROUTINE DORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL DLARFGP( M-P-I+1, X21(I,I), X21(I,I+1), LDX21,
      $                    TAUP2(I) )
             END IF
-            X21(I,I) = ONE
 *
             IF ( Q .GT. I ) THEN
-               CALL DLARF( 'R', Q-I, P-I+1, X11(I,I), LDX11, TAUP1(I),
+               CALL DLARF1F( 'R', Q-I, P-I+1, X11(I,I), LDX11,
+     $                     TAUP1(I),
      $                     X11(I+1,I), LDX11, WORK )
             END IF
             IF ( M-Q+1 .GT. I ) THEN
-               CALL DLARF( 'R', M-Q-I+1, P-I+1, X11(I,I), LDX11,
+               CALL DLARF1F( 'R', M-Q-I+1, P-I+1, X11(I,I), LDX11,
      $                     TAUP1(I), X12(I,I), LDX12, WORK )
             END IF
             IF ( Q .GT. I ) THEN
-               CALL DLARF( 'R', Q-I, M-P-I+1, X21(I,I), LDX21, TAUP2(I),
+               CALL DLARF1F( 'R', Q-I, M-P-I+1, X21(I,I), LDX21,
+     $                     TAUP2(I),
      $                     X21(I+1,I), LDX21, WORK )
             END IF
             IF ( M-Q+1 .GT. I ) THEN
-               CALL DLARF( 'R', M-Q-I+1, M-P-I+1, X21(I,I), LDX21,
+               CALL DLARF1F( 'R', M-Q-I+1, M-P-I+1, X21(I,I), LDX21,
      $                     TAUP2(I), X22(I,I), LDX22, WORK )
             END IF
 *
@@ -612,7 +624,6 @@ SUBROUTINE DORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                   CALL DLARFGP( Q-I, X11(I+1,I), X11(I+2,I), 1,
      $                          TAUQ1(I) )
                END IF
-               X11(I+1,I) = ONE
             END IF
             IF ( M-Q .GT. I ) THEN
                CALL DLARFGP( M-Q-I+1, X12(I,I), X12(I+1,I), 1,
@@ -621,19 +632,18 @@ SUBROUTINE DORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL DLARFGP( M-Q-I+1, X12(I,I), X12(I,I), 1,
      $                       TAUQ2(I) )
             END IF
-            X12(I,I) = ONE
 *
             IF( I .LT. Q ) THEN
-               CALL DLARF( 'L', Q-I, P-I, X11(I+1,I), 1, TAUQ1(I),
+               CALL DLARF1F( 'L', Q-I, P-I, X11(I+1,I), 1, TAUQ1(I),
      $                     X11(I+1,I+1), LDX11, WORK )
-               CALL DLARF( 'L', Q-I, M-P-I, X11(I+1,I), 1, TAUQ1(I),
-     $                     X21(I+1,I+1), LDX21, WORK )
+               CALL DLARF1F( 'L', Q-I, M-P-I, X11(I+1,I), 1,
+     $                       TAUQ1(I), X21(I+1,I+1), LDX21, WORK )
             END IF
-            CALL DLARF( 'L', M-Q-I+1, P-I, X12(I,I), 1, TAUQ2(I),
-     $                  X12(I,I+1), LDX12, WORK )
+            CALL DLARF1F( 'L', M-Q-I+1, P-I, X12(I,I), 1, TAUQ2(I),
+     $                    X12(I,I+1), LDX12, WORK )
             IF ( M-P-I .GT. 0 ) THEN
-               CALL DLARF( 'L', M-Q-I+1, M-P-I, X12(I,I), 1, TAUQ2(I),
-     $                     X22(I,I+1), LDX22, WORK )
+               CALL DLARF1F( 'L', M-Q-I+1, M-P-I, X12(I,I), 1,
+     $                       TAUQ2(I), X22(I,I+1), LDX22, WORK )
             END IF
 *
          END DO
@@ -643,16 +653,16 @@ SUBROUTINE DORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
          DO I = Q + 1, P
 *
             CALL DSCAL( M-Q-I+1, -Z1*Z4, X12(I,I), 1 )
-            CALL DLARFGP( M-Q-I+1, X12(I,I), X12(I+1,I), 1, TAUQ2(I) )
-            X12(I,I) = ONE
+            CALL DLARFGP( M-Q-I+1, X12(I,I), X12(I+1,I), 1,
+     $                    TAUQ2(I) )
 *
             IF ( P .GT. I ) THEN
-               CALL DLARF( 'L', M-Q-I+1, P-I, X12(I,I), 1, TAUQ2(I),
-     $                  X12(I,I+1), LDX12, WORK )
+               CALL DLARF1F( 'L', M-Q-I+1, P-I, X12(I,I), 1,
+     $                       TAUQ2(I), X12(I,I+1), LDX12, WORK )
             END IF
             IF( M-P-Q .GE. 1 )
-     $         CALL DLARF( 'L', M-Q-I+1, M-P-Q, X12(I,I), 1, TAUQ2(I),
-     $                     X22(I,Q+1), LDX22, WORK )
+     $         CALL DLARF1F( 'L', M-Q-I+1, M-P-Q, X12(I,I), 1,
+     $                       TAUQ2(I), X22(I,Q+1), LDX22, WORK )
 *
          END DO
 *
@@ -662,15 +672,17 @@ SUBROUTINE DORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
 *
             CALL DSCAL( M-P-Q-I+1, Z2*Z4, X22(P+I,Q+I), 1 )
             IF ( M-P-Q .EQ. I ) THEN
-               CALL DLARFGP( M-P-Q-I+1, X22(P+I,Q+I), X22(P+I,Q+I), 1,
+               CALL DLARFGP( M-P-Q-I+1, X22(P+I,Q+I), X22(P+I,Q+I),
+     $                       1,
      $                       TAUQ2(P+I) )
             ELSE
-               CALL DLARFGP( M-P-Q-I+1, X22(P+I,Q+I), X22(P+I+1,Q+I), 1,
+               CALL DLARFGP( M-P-Q-I+1, X22(P+I,Q+I), X22(P+I+1,Q+I),
+     $                       1,
      $                       TAUQ2(P+I) )
-               CALL DLARF( 'L', M-P-Q-I+1, M-P-Q-I, X22(P+I,Q+I), 1,
-     $                  TAUQ2(P+I), X22(P+I,Q+I+1), LDX22, WORK )
+               CALL DLARF1F( 'L', M-P-Q-I+1, M-P-Q-I, X22(P+I,Q+I),
+     $                       1, TAUQ2(P+I), X22(P+I,Q+I+1), LDX22,
+     $                       WORK )
             END IF
-            X22(P+I,Q+I) = ONE
 *
          END DO
 *
diff --git a/SRC/dorbdb1.f b/SRC/dorbdb1.f
index dae18f5df5..c52293bb68 100644
--- a/SRC/dorbdb1.f
+++ b/SRC/dorbdb1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORBDB1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorbdb1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorbdb1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,7 @@
 *>\verbatim
 *>
 *> DORBDB1 simultaneously bidiagonalizes the blocks of a tall and skinny
-*> matrix X with orthonomal columns:
+*> matrix X with orthonormal columns:
 *>
 *>                            [ B11 ]
 *>      [ X11 ]   [ P1 |    ] [  0  ]
@@ -174,7 +172,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unbdb1
 *
 *> \par Further Details:
 *  =====================
@@ -198,8 +196,10 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE DORBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
+      SUBROUTINE DORBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    PHI,
      $                    TAUP1, TAUP2, TAUQ1, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -227,7 +227,8 @@ SUBROUTINE DORBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       LOGICAL            LQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARF, DLARFGP, DORBDB5, DROT, XERBLA
+      EXTERNAL           DLARF1F, DLARFGP, DORBDB5, DROT,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION   DNRM2
@@ -285,22 +286,23 @@ SUBROUTINE DORBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
          THETA(I) = ATAN2( X21(I,I), X11(I,I) )
          C = COS( THETA(I) )
          S = SIN( THETA(I) )
-         X11(I,I) = ONE
-         X21(I,I) = ONE
-         CALL DLARF( 'L', P-I+1, Q-I, X11(I,I), 1, TAUP1(I), X11(I,I+1),
+         CALL DLARF1F( 'L', P-I+1, Q-I, X11(I,I), 1, TAUP1(I), X11(I,
+     $               I+1),
      $               LDX11, WORK(ILARF) )
-         CALL DLARF( 'L', M-P-I+1, Q-I, X21(I,I), 1, TAUP2(I),
+         CALL DLARF1F( 'L', M-P-I+1, Q-I, X21(I,I), 1, TAUP2(I),
      $               X21(I,I+1), LDX21, WORK(ILARF) )
 *
          IF( I .LT. Q ) THEN
-            CALL DROT( Q-I, X11(I,I+1), LDX11, X21(I,I+1), LDX21, C, S )
-            CALL DLARFGP( Q-I, X21(I,I+1), X21(I,I+2), LDX21, TAUQ1(I) )
+            CALL DROT( Q-I, X11(I,I+1), LDX11, X21(I,I+1), LDX21, C,
+     $                 S )
+            CALL DLARFGP( Q-I, X21(I,I+1), X21(I,I+2), LDX21,
+     $                    TAUQ1(I) )
             S = X21(I,I+1)
-            X21(I,I+1) = ONE
-            CALL DLARF( 'R', P-I, Q-I, X21(I,I+1), LDX21, TAUQ1(I),
+            CALL DLARF1F( 'R', P-I, Q-I, X21(I,I+1), LDX21, TAUQ1(I),
      $                  X11(I+1,I+1), LDX11, WORK(ILARF) )
-            CALL DLARF( 'R', M-P-I, Q-I, X21(I,I+1), LDX21, TAUQ1(I),
-     $                  X21(I+1,I+1), LDX21, WORK(ILARF) )
+            CALL DLARF1F( 'R', M-P-I, Q-I, X21(I,I+1), LDX21,
+     $                    TAUQ1(I), X21(I+1,I+1), LDX21,
+     $                    WORK(ILARF) )
             C = SQRT( DNRM2( P-I, X11(I+1,I+1), 1 )**2
      $          + DNRM2( M-P-I, X21(I+1,I+1), 1 )**2 )
             PHI(I) = ATAN2( S, C )
diff --git a/SRC/dorbdb2.f b/SRC/dorbdb2.f
index 64e4645bcc..8a5b8d9bae 100644
--- a/SRC/dorbdb2.f
+++ b/SRC/dorbdb2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORBDB2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorbdb2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorbdb2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,7 @@
 *>\verbatim
 *>
 *> DORBDB2 simultaneously bidiagonalizes the blocks of a tall and skinny
-*> matrix X with orthonomal columns:
+*> matrix X with orthonormal columns:
 *>
 *>                            [ B11 ]
 *>      [ X11 ]   [ P1 |    ] [  0  ]
@@ -122,14 +120,14 @@
 *>
 *> \param[out] TAUP1
 *> \verbatim
-*>          TAUP1 is DOUBLE PRECISION array, dimension (P)
+*>          TAUP1 is DOUBLE PRECISION array, dimension (P-1)
 *>           The scalar factors of the elementary reflectors that define
 *>           P1.
 *> \endverbatim
 *>
 *> \param[out] TAUP2
 *> \verbatim
-*>          TAUP2 is DOUBLE PRECISION array, dimension (M-P)
+*>          TAUP2 is DOUBLE PRECISION array, dimension (Q)
 *>           The scalar factors of the elementary reflectors that define
 *>           P2.
 *> \endverbatim
@@ -173,7 +171,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unbdb2
 *
 *> \par Further Details:
 *  =====================
@@ -197,8 +195,10 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE DORBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
+      SUBROUTINE DORBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    PHI,
      $                    TAUP1, TAUP2, TAUQ1, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -226,7 +226,8 @@ SUBROUTINE DORBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       LOGICAL            LQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARF, DLARFGP, DORBDB5, DROT, DSCAL, XERBLA
+      EXTERNAL           DLARF1F, DLARFGP, DORBDB5, DROT, DSCAL,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION   DNRM2
@@ -280,15 +281,15 @@ SUBROUTINE DORBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       DO I = 1, P
 *
          IF( I .GT. 1 ) THEN
-            CALL DROT( Q-I+1, X11(I,I), LDX11, X21(I-1,I), LDX21, C, S )
+            CALL DROT( Q-I+1, X11(I,I), LDX11, X21(I-1,I), LDX21, C,
+     $                 S )
          END IF
          CALL DLARFGP( Q-I+1, X11(I,I), X11(I,I+1), LDX11, TAUQ1(I) )
          C = X11(I,I)
-         X11(I,I) = ONE
-         CALL DLARF( 'R', P-I, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
+         CALL DLARF1F( 'R', P-I, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
      $               X11(I+1,I), LDX11, WORK(ILARF) )
-         CALL DLARF( 'R', M-P-I+1, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
-     $               X21(I,I), LDX21, WORK(ILARF) )
+         CALL DLARF1F( 'R', M-P-I+1, Q-I+1, X11(I,I), LDX11,
+     $                 TAUQ1(I), X21(I,I), LDX21, WORK(ILARF) )
          S = SQRT( DNRM2( P-I, X11(I+1,I), 1 )**2
      $           + DNRM2( M-P-I+1, X21(I,I), 1 )**2 )
          THETA(I) = ATAN2( S, C )
@@ -303,12 +304,10 @@ SUBROUTINE DORBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
             PHI(I) = ATAN2( X11(I+1,I), X21(I,I) )
             C = COS( PHI(I) )
             S = SIN( PHI(I) )
-            X11(I+1,I) = ONE
-            CALL DLARF( 'L', P-I, Q-I, X11(I+1,I), 1, TAUP1(I),
+            CALL DLARF1F( 'L', P-I, Q-I, X11(I+1,I), 1, TAUP1(I),
      $                  X11(I+1,I+1), LDX11, WORK(ILARF) )
          END IF
-         X21(I,I) = ONE
-         CALL DLARF( 'L', M-P-I+1, Q-I, X21(I,I), 1, TAUP2(I),
+         CALL DLARF1F( 'L', M-P-I+1, Q-I, X21(I,I), 1, TAUP2(I),
      $               X21(I,I+1), LDX21, WORK(ILARF) )
 *
       END DO
@@ -317,8 +316,7 @@ SUBROUTINE DORBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *
       DO I = P + 1, Q
          CALL DLARFGP( M-P-I+1, X21(I,I), X21(I+1,I), 1, TAUP2(I) )
-         X21(I,I) = ONE
-         CALL DLARF( 'L', M-P-I+1, Q-I, X21(I,I), 1, TAUP2(I),
+         CALL DLARF1F( 'L', M-P-I+1, Q-I, X21(I,I), 1, TAUP2(I),
      $               X21(I,I+1), LDX21, WORK(ILARF) )
       END DO
 *
diff --git a/SRC/dorbdb3.f b/SRC/dorbdb3.f
index 7b37279560..855b711a5a 100644
--- a/SRC/dorbdb3.f
+++ b/SRC/dorbdb3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORBDB3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorbdb3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorbdb3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,7 @@
 *>\verbatim
 *>
 *> DORBDB3 simultaneously bidiagonalizes the blocks of a tall and skinny
-*> matrix X with orthonomal columns:
+*> matrix X with orthonormal columns:
 *>
 *>                            [ B11 ]
 *>      [ X11 ]   [ P1 |    ] [  0  ]
@@ -172,7 +170,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unbdb3
 *
 *> \par Further Details:
 *  =====================
@@ -196,8 +194,10 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE DORBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
+      SUBROUTINE DORBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    PHI,
      $                    TAUP1, TAUP2, TAUQ1, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -225,7 +225,8 @@ SUBROUTINE DORBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       LOGICAL            LQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARF, DLARFGP, DORBDB5, DROT, XERBLA
+      EXTERNAL           DLARF1F, DLARFGP, DORBDB5, DROT,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION   DNRM2
@@ -279,15 +280,15 @@ SUBROUTINE DORBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       DO I = 1, M-P
 *
          IF( I .GT. 1 ) THEN
-            CALL DROT( Q-I+1, X11(I-1,I), LDX11, X21(I,I), LDX11, C, S )
+            CALL DROT( Q-I+1, X11(I-1,I), LDX11, X21(I,I), LDX11, C,
+     $                 S )
          END IF
 *
          CALL DLARFGP( Q-I+1, X21(I,I), X21(I,I+1), LDX21, TAUQ1(I) )
          S = X21(I,I)
-         X21(I,I) = ONE
-         CALL DLARF( 'R', P-I+1, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
+         CALL DLARF1F( 'R', P-I+1, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
      $               X11(I,I), LDX11, WORK(ILARF) )
-         CALL DLARF( 'R', M-P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
+         CALL DLARF1F( 'R', M-P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
      $               X21(I+1,I), LDX21, WORK(ILARF) )
          C = SQRT( DNRM2( P-I+1, X11(I,I), 1 )**2
      $           + DNRM2( M-P-I, X21(I+1,I), 1 )**2 )
@@ -298,16 +299,16 @@ SUBROUTINE DORBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
      $                 WORK(IORBDB5), LORBDB5, CHILDINFO )
          CALL DLARFGP( P-I+1, X11(I,I), X11(I+1,I), 1, TAUP1(I) )
          IF( I .LT. M-P ) THEN
-            CALL DLARFGP( M-P-I, X21(I+1,I), X21(I+2,I), 1, TAUP2(I) )
+            CALL DLARFGP( M-P-I, X21(I+1,I), X21(I+2,I), 1,
+     $                    TAUP2(I) )
             PHI(I) = ATAN2( X21(I+1,I), X11(I,I) )
             C = COS( PHI(I) )
             S = SIN( PHI(I) )
-            X21(I+1,I) = ONE
-            CALL DLARF( 'L', M-P-I, Q-I, X21(I+1,I), 1, TAUP2(I),
+            CALL DLARF1F( 'L', M-P-I, Q-I, X21(I+1,I), 1, TAUP2(I),
      $                  X21(I+1,I+1), LDX21, WORK(ILARF) )
          END IF
-         X11(I,I) = ONE
-         CALL DLARF( 'L', P-I+1, Q-I, X11(I,I), 1, TAUP1(I), X11(I,I+1),
+         CALL DLARF1F( 'L', P-I+1, Q-I, X11(I,I), 1, TAUP1(I), X11(I,
+     $               I+1),
      $               LDX11, WORK(ILARF) )
 *
       END DO
@@ -316,8 +317,8 @@ SUBROUTINE DORBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *
       DO I = M-P + 1, Q
          CALL DLARFGP( P-I+1, X11(I,I), X11(I+1,I), 1, TAUP1(I) )
-         X11(I,I) = ONE
-         CALL DLARF( 'L', P-I+1, Q-I, X11(I,I), 1, TAUP1(I), X11(I,I+1),
+         CALL DLARF1F( 'L', P-I+1, Q-I, X11(I,I), 1, TAUP1(I), X11(I,
+     $               I+1),
      $               LDX11, WORK(ILARF) )
       END DO
 *
diff --git a/SRC/dorbdb4.f b/SRC/dorbdb4.f
index a09568415d..6a218fa8ad 100644
--- a/SRC/dorbdb4.f
+++ b/SRC/dorbdb4.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORBDB4 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorbdb4.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorbdb4.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -38,7 +36,7 @@
 *>\verbatim
 *>
 *> DORBDB4 simultaneously bidiagonalizes the blocks of a tall and skinny
-*> matrix X with orthonomal columns:
+*> matrix X with orthonormal columns:
 *>
 *>                            [ B11 ]
 *>      [ X11 ]   [ P1 |    ] [  0  ]
@@ -124,14 +122,14 @@
 *>
 *> \param[out] TAUP1
 *> \verbatim
-*>          TAUP1 is DOUBLE PRECISION array, dimension (P)
+*>          TAUP1 is DOUBLE PRECISION array, dimension (M-Q)
 *>           The scalar factors of the elementary reflectors that define
 *>           P1.
 *> \endverbatim
 *>
 *> \param[out] TAUP2
 *> \verbatim
-*>          TAUP2 is DOUBLE PRECISION array, dimension (M-P)
+*>          TAUP2 is DOUBLE PRECISION array, dimension (M-Q)
 *>           The scalar factors of the elementary reflectors that define
 *>           P2.
 *> \endverbatim
@@ -183,7 +181,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unbdb4
 *
 *> \par Further Details:
 *  =====================
@@ -207,9 +205,11 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE DORBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
+      SUBROUTINE DORBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    PHI,
      $                    TAUP1, TAUP2, TAUQ1, PHANTOM, WORK, LWORK,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -237,7 +237,8 @@ SUBROUTINE DORBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       LOGICAL            LQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARF, DLARFGP, DORBDB5, DROT, DSCAL, XERBLA
+      EXTERNAL           DLARF, DLARFGP, DORBDB5, DROT, DSCAL,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION   DNRM2
@@ -300,42 +301,39 @@ SUBROUTINE DORBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
      $                    LORBDB5, CHILDINFO )
             CALL DSCAL( P, NEGONE, PHANTOM(1), 1 )
             CALL DLARFGP( P, PHANTOM(1), PHANTOM(2), 1, TAUP1(1) )
-            CALL DLARFGP( M-P, PHANTOM(P+1), PHANTOM(P+2), 1, TAUP2(1) )
+            CALL DLARFGP( M-P, PHANTOM(P+1), PHANTOM(P+2), 1,
+     $                    TAUP2(1) )
             THETA(I) = ATAN2( PHANTOM(1), PHANTOM(P+1) )
             C = COS( THETA(I) )
             S = SIN( THETA(I) )
-            PHANTOM(1) = ONE
-            PHANTOM(P+1) = ONE
-            CALL DLARF( 'L', P, Q, PHANTOM(1), 1, TAUP1(1), X11, LDX11,
-     $                  WORK(ILARF) )
-            CALL DLARF( 'L', M-P, Q, PHANTOM(P+1), 1, TAUP2(1), X21,
-     $                  LDX21, WORK(ILARF) )
+            CALL DLARF1F( 'L', P, Q, PHANTOM(1), 1, TAUP1(1), X11,
+     $                    LDX11, WORK(ILARF) )
+            CALL DLARF1F( 'L', M-P, Q, PHANTOM(P+1), 1, TAUP2(1),
+     $                    X21, LDX21, WORK(ILARF) )
          ELSE
             CALL DORBDB5( P-I+1, M-P-I+1, Q-I+1, X11(I,I-1), 1,
      $                    X21(I,I-1), 1, X11(I,I), LDX11, X21(I,I),
      $                    LDX21, WORK(IORBDB5), LORBDB5, CHILDINFO )
             CALL DSCAL( P-I+1, NEGONE, X11(I,I-1), 1 )
-            CALL DLARFGP( P-I+1, X11(I,I-1), X11(I+1,I-1), 1, TAUP1(I) )
+            CALL DLARFGP( P-I+1, X11(I,I-1), X11(I+1,I-1), 1,
+     $                    TAUP1(I) )
             CALL DLARFGP( M-P-I+1, X21(I,I-1), X21(I+1,I-1), 1,
      $                    TAUP2(I) )
             THETA(I) = ATAN2( X11(I,I-1), X21(I,I-1) )
             C = COS( THETA(I) )
             S = SIN( THETA(I) )
-            X11(I,I-1) = ONE
-            X21(I,I-1) = ONE
-            CALL DLARF( 'L', P-I+1, Q-I+1, X11(I,I-1), 1, TAUP1(I),
-     $                  X11(I,I), LDX11, WORK(ILARF) )
-            CALL DLARF( 'L', M-P-I+1, Q-I+1, X21(I,I-1), 1, TAUP2(I),
-     $                  X21(I,I), LDX21, WORK(ILARF) )
+            CALL DLARF1F( 'L', P-I+1, Q-I+1, X11(I,I-1), 1, TAUP1(I),
+     $                    X11(I,I), LDX11, WORK(ILARF) )
+            CALL DLARF1F( 'L', M-P-I+1, Q-I+1, X21(I,I-1), 1,
+     $                    TAUP2(I), X21(I,I), LDX21, WORK(ILARF) )
          END IF
 *
          CALL DROT( Q-I+1, X11(I,I), LDX11, X21(I,I), LDX21, S, -C )
          CALL DLARFGP( Q-I+1, X21(I,I), X21(I,I+1), LDX21, TAUQ1(I) )
          C = X21(I,I)
-         X21(I,I) = ONE
-         CALL DLARF( 'R', P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
+         CALL DLARF1F( 'R', P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
      $               X11(I+1,I), LDX11, WORK(ILARF) )
-         CALL DLARF( 'R', M-P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
+         CALL DLARF1F( 'R', M-P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
      $               X21(I+1,I), LDX21, WORK(ILARF) )
          IF( I .LT. M-Q ) THEN
             S = SQRT( DNRM2( P-I, X11(I+1,I), 1 )**2
@@ -349,20 +347,20 @@ SUBROUTINE DORBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *
       DO I = M - Q + 1, P
          CALL DLARFGP( Q-I+1, X11(I,I), X11(I,I+1), LDX11, TAUQ1(I) )
-         X11(I,I) = ONE
-         CALL DLARF( 'R', P-I, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
+         CALL DLARF1F( 'R', P-I, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
      $               X11(I+1,I), LDX11, WORK(ILARF) )
-         CALL DLARF( 'R', Q-P, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
+         CALL DLARF1F( 'R', Q-P, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
      $               X21(M-Q+1,I), LDX21, WORK(ILARF) )
       END DO
 *
 *     Reduce the bottom-right portion of X21 to [ 0 I ]
 *
       DO I = P + 1, Q
-         CALL DLARFGP( Q-I+1, X21(M-Q+I-P,I), X21(M-Q+I-P,I+1), LDX21,
+         CALL DLARFGP( Q-I+1, X21(M-Q+I-P,I), X21(M-Q+I-P,I+1),
+     $                 LDX21,
      $                 TAUQ1(I) )
-         X21(M-Q+I-P,I) = ONE
-         CALL DLARF( 'R', Q-I, Q-I+1, X21(M-Q+I-P,I), LDX21, TAUQ1(I),
+         CALL DLARF1F( 'R', Q-I, Q-I+1, X21(M-Q+I-P,I), LDX21,
+     $               TAUQ1(I),
      $               X21(M-Q+I-P+1,I), LDX21, WORK(ILARF) )
       END DO
 *
diff --git a/SRC/dorbdb5.f b/SRC/dorbdb5.f
index 6e057a05f8..8f03a4081e 100644
--- a/SRC/dorbdb5.f
+++ b/SRC/dorbdb5.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORBDB5 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorbdb5.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorbdb5.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -148,11 +146,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unbdb5
 *
 *  =====================================================================
-      SUBROUTINE DORBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
+      SUBROUTINE DORBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1,
+     $                    Q2,
      $                    LDQ2, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -169,18 +169,21 @@ SUBROUTINE DORBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
 *  =====================================================================
 *
 *     .. Parameters ..
+      DOUBLE PRECISION   REALZERO
+      PARAMETER          ( REALZERO = 0.0D0 )
       DOUBLE PRECISION   ONE, ZERO
       PARAMETER          ( ONE = 1.0D0, ZERO = 0.0D0 )
 *     ..
 *     .. Local Scalars ..
       INTEGER            CHILDINFO, I, J
+      DOUBLE PRECISION   EPS, NORM, SCL, SSQ
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DORBDB6, XERBLA
+      EXTERNAL           DLASSQ, DORBDB6, DSCAL, XERBLA
 *     ..
 *     .. External Functions ..
-      DOUBLE PRECISION   DNRM2
-      EXTERNAL           DNRM2
+      DOUBLE PRECISION   DLAMCH, DNRM2
+      EXTERNAL           DLAMCH, DNRM2
 *     ..
 *     .. Intrinsic Function ..
       INTRINSIC          MAX
@@ -213,16 +216,33 @@ SUBROUTINE DORBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
          RETURN
       END IF
 *
-*     Project X onto the orthogonal complement of Q
+      EPS = DLAMCH( 'Precision' )
 *
-      CALL DORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2, LDQ2,
-     $              WORK, LWORK, CHILDINFO )
+*     Project X onto the orthogonal complement of Q if X is nonzero
 *
-*     If the projection is nonzero, then return
+      SCL = REALZERO
+      SSQ = REALZERO
+      CALL DLASSQ( M1, X1, INCX1, SCL, SSQ )
+      CALL DLASSQ( M2, X2, INCX2, SCL, SSQ )
+      NORM = SCL * SQRT( SSQ )
 *
-      IF( DNRM2(M1,X1,INCX1) .NE. ZERO
-     $    .OR. DNRM2(M2,X2,INCX2) .NE. ZERO ) THEN
-         RETURN
+      IF( NORM .GT. N * EPS ) THEN
+*        Scale vector to unit norm to avoid problems in the caller code.
+*        Computing the reciprocal is undesirable but
+*         * xLASCL cannot be used because of the vector increments and
+*         * the round-off error has a negligible impact on
+*           orthogonalization.
+         CALL DSCAL( M1, ONE / NORM, X1, INCX1 )
+         CALL DSCAL( M2, ONE / NORM, X2, INCX2 )
+         CALL DORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
+     $              LDQ2, WORK, LWORK, CHILDINFO )
+*
+*        If the projection is nonzero, then return
+*
+         IF( DNRM2(M1,X1,INCX1) .NE. REALZERO
+     $       .OR. DNRM2(M2,X2,INCX2) .NE. REALZERO ) THEN
+            RETURN
+         END IF
       END IF
 *
 *     Project each standard basis vector e_1,...,e_M1 in turn, stopping
@@ -238,8 +258,8 @@ SUBROUTINE DORBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
          END DO
          CALL DORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
      $                 LDQ2, WORK, LWORK, CHILDINFO )
-         IF( DNRM2(M1,X1,INCX1) .NE. ZERO
-     $       .OR. DNRM2(M2,X2,INCX2) .NE. ZERO ) THEN
+         IF( DNRM2(M1,X1,INCX1) .NE. REALZERO
+     $       .OR. DNRM2(M2,X2,INCX2) .NE. REALZERO ) THEN
             RETURN
          END IF
       END DO
@@ -257,8 +277,8 @@ SUBROUTINE DORBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
          X2(I) = ONE
          CALL DORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
      $                 LDQ2, WORK, LWORK, CHILDINFO )
-         IF( DNRM2(M1,X1,INCX1) .NE. ZERO
-     $       .OR. DNRM2(M2,X2,INCX2) .NE. ZERO ) THEN
+         IF( DNRM2(M1,X1,INCX1) .NE. REALZERO
+     $       .OR. DNRM2(M2,X2,INCX2) .NE. REALZERO ) THEN
             RETURN
          END IF
       END DO
diff --git a/SRC/dorbdb6.f b/SRC/dorbdb6.f
index fac52f760d..82aa93a5a3 100644
--- a/SRC/dorbdb6.f
+++ b/SRC/dorbdb6.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORBDB6 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorbdb6.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorbdb6.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -41,10 +39,15 @@
 *> with respect to the columns of
 *>      Q = [ Q1 ] .
 *>          [ Q2 ]
-*> The columns of Q must be orthonormal.
+*> The columns of Q must be orthonormal. The orthogonalized vector will
+*> be zero if and only if it lies entirely in the range of Q.
 *>
-*> If the projection is zero according to Kahan's "twice is enough"
-*> criterion, then the zero vector is returned.
+*> The projection is computed with at most two iterations of the
+*> classical Gram-Schmidt algorithm, see
+*> * L. Giraud, J. Langou, M. Rozložník. "On the round-off error
+*>   analysis of the Gram-Schmidt algorithm with reorthogonalization."
+*>   2002. CERFACS Technical Report No. TR/PA/02/33. URL:
+*>   https://www.cerfacs.fr/algor/reports/2002/TR_PA_02_33.pdf
 *>
 *>\endverbatim
 *
@@ -146,11 +149,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unbdb6
 *
 *  =====================================================================
-      SUBROUTINE DORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
+      SUBROUTINE DORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1,
+     $                    Q2,
      $                    LDQ2, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -167,15 +172,18 @@ SUBROUTINE DORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
 *  =====================================================================
 *
 *     .. Parameters ..
-      DOUBLE PRECISION   ALPHASQ, REALONE, REALZERO
-      PARAMETER          ( ALPHASQ = 0.01D0, REALONE = 1.0D0,
+      DOUBLE PRECISION   ALPHA, REALONE, REALZERO
+      PARAMETER          ( ALPHA = 0.83D0, REALONE = 1.0D0,
      $                     REALZERO = 0.0D0 )
       DOUBLE PRECISION   NEGONE, ONE, ZERO
       PARAMETER          ( NEGONE = -1.0D0, ONE = 1.0D0, ZERO = 0.0D0 )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I
-      DOUBLE PRECISION   NORMSQ1, NORMSQ2, SCL1, SCL2, SSQ1, SSQ2
+      INTEGER            I, IX
+      DOUBLE PRECISION   EPS, NORM, NORM_NEW, SCL, SSQ
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           DGEMV, DLASSQ, XERBLA
@@ -210,55 +218,63 @@ SUBROUTINE DORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
          CALL XERBLA( 'DORBDB6', -INFO )
          RETURN
       END IF
+*
+      EPS = DLAMCH( 'Precision' )
+*
+*     Compute the Euclidean norm of X
+*
+      SCL = REALZERO
+      SSQ = REALZERO
+      CALL DLASSQ( M1, X1, INCX1, SCL, SSQ )
+      CALL DLASSQ( M2, X2, INCX2, SCL, SSQ )
+      NORM = SCL * SQRT( SSQ )
 *
 *     First, project X onto the orthogonal complement of Q's column
 *     space
-*
-      SCL1 = REALZERO
-      SSQ1 = REALONE
-      CALL DLASSQ( M1, X1, INCX1, SCL1, SSQ1 )
-      SCL2 = REALZERO
-      SSQ2 = REALONE
-      CALL DLASSQ( M2, X2, INCX2, SCL2, SSQ2 )
-      NORMSQ1 = SCL1**2*SSQ1 + SCL2**2*SSQ2
 *
       IF( M1 .EQ. 0 ) THEN
          DO I = 1, N
             WORK(I) = ZERO
          END DO
       ELSE
-         CALL DGEMV( 'C', M1, N, ONE, Q1, LDQ1, X1, INCX1, ZERO, WORK,
+         CALL DGEMV( 'C', M1, N, ONE, Q1, LDQ1, X1, INCX1, ZERO,
+     $               WORK,
      $               1 )
       END IF
 *
-      CALL DGEMV( 'C', M2, N, ONE, Q2, LDQ2, X2, INCX2, ONE, WORK, 1 )
+      CALL DGEMV( 'C', M2, N, ONE, Q2, LDQ2, X2, INCX2, ONE, WORK,
+     $            1 )
 *
       CALL DGEMV( 'N', M1, N, NEGONE, Q1, LDQ1, WORK, 1, ONE, X1,
      $            INCX1 )
       CALL DGEMV( 'N', M2, N, NEGONE, Q2, LDQ2, WORK, 1, ONE, X2,
      $            INCX2 )
 *
-      SCL1 = REALZERO
-      SSQ1 = REALONE
-      CALL DLASSQ( M1, X1, INCX1, SCL1, SSQ1 )
-      SCL2 = REALZERO
-      SSQ2 = REALONE
-      CALL DLASSQ( M2, X2, INCX2, SCL2, SSQ2 )
-      NORMSQ2 = SCL1**2*SSQ1 + SCL2**2*SSQ2
+      SCL = REALZERO
+      SSQ = REALZERO
+      CALL DLASSQ( M1, X1, INCX1, SCL, SSQ )
+      CALL DLASSQ( M2, X2, INCX2, SCL, SSQ )
+      NORM_NEW = SCL * SQRT(SSQ)
 *
 *     If projection is sufficiently large in norm, then stop.
 *     If projection is zero, then stop.
 *     Otherwise, project again.
 *
-      IF( NORMSQ2 .GE. ALPHASQ*NORMSQ1 ) THEN
+      IF( NORM_NEW .GE. ALPHA * NORM ) THEN
          RETURN
       END IF
 *
-      IF( NORMSQ2 .EQ. ZERO ) THEN
+      IF( NORM_NEW .LE. N * EPS * NORM ) THEN
+         DO IX = 1, 1 + (M1-1)*INCX1, INCX1
+           X1( IX ) = ZERO
+         END DO
+         DO IX = 1, 1 + (M2-1)*INCX2, INCX2
+           X2( IX ) = ZERO
+         END DO
          RETURN
       END IF
 *
-      NORMSQ1 = NORMSQ2
+      NORM = NORM_NEW
 *
       DO I = 1, N
          WORK(I) = ZERO
@@ -269,35 +285,35 @@ SUBROUTINE DORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
             WORK(I) = ZERO
          END DO
       ELSE
-         CALL DGEMV( 'C', M1, N, ONE, Q1, LDQ1, X1, INCX1, ZERO, WORK,
+         CALL DGEMV( 'C', M1, N, ONE, Q1, LDQ1, X1, INCX1, ZERO,
+     $               WORK,
      $               1 )
       END IF
 *
-      CALL DGEMV( 'C', M2, N, ONE, Q2, LDQ2, X2, INCX2, ONE, WORK, 1 )
+      CALL DGEMV( 'C', M2, N, ONE, Q2, LDQ2, X2, INCX2, ONE, WORK,
+     $            1 )
 *
       CALL DGEMV( 'N', M1, N, NEGONE, Q1, LDQ1, WORK, 1, ONE, X1,
      $            INCX1 )
       CALL DGEMV( 'N', M2, N, NEGONE, Q2, LDQ2, WORK, 1, ONE, X2,
      $            INCX2 )
 *
-      SCL1 = REALZERO
-      SSQ1 = REALONE
-      CALL DLASSQ( M1, X1, INCX1, SCL1, SSQ1 )
-      SCL2 = REALZERO
-      SSQ2 = REALONE
-      CALL DLASSQ( M1, X1, INCX1, SCL1, SSQ1 )
-      NORMSQ2 = SCL1**2*SSQ1 + SCL2**2*SSQ2
+      SCL = REALZERO
+      SSQ = REALZERO
+      CALL DLASSQ( M1, X1, INCX1, SCL, SSQ )
+      CALL DLASSQ( M2, X2, INCX2, SCL, SSQ )
+      NORM_NEW = SCL * SQRT(SSQ)
 *
 *     If second projection is sufficiently large in norm, then do
 *     nothing more. Alternatively, if it shrunk significantly, then
 *     truncate it to zero.
 *
-      IF( NORMSQ2 .LT. ALPHASQ*NORMSQ1 ) THEN
-         DO I = 1, M1
-            X1(I) = ZERO
+      IF( NORM_NEW .LT. ALPHA * NORM ) THEN
+         DO IX = 1, 1 + (M1-1)*INCX1, INCX1
+            X1(IX) = ZERO
          END DO
-         DO I = 1, M2
-            X2(I) = ZERO
+         DO IX = 1, 1 + (M2-1)*INCX2, INCX2
+            X2(IX) = ZERO
          END DO
       END IF
 *
@@ -306,4 +322,3 @@ SUBROUTINE DORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
 *     End of DORBDB6
 *
       END
-
diff --git a/SRC/dorcsd.f b/SRC/dorcsd.f
index 86463bd9b3..3a3fab2861 100644
--- a/SRC/dorcsd.f
+++ b/SRC/dorcsd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORCSD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorcsd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorcsd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -289,14 +287,16 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup uncsd
 *
 *  =====================================================================
-      RECURSIVE SUBROUTINE DORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
+      RECURSIVE SUBROUTINE DORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T,
+     $                             TRANS,
      $                             SIGNS, M, P, Q, X11, LDX11, X12,
      $                             LDX12, X21, LDX21, X22, LDX22, THETA,
      $                             U1, LDU1, U2, LDU2, V1T, LDV1T, V2T,
      $                             LDV2T, WORK, LWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -404,7 +404,8 @@ RECURSIVE SUBROUTINE DORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
          ELSE
             SIGNST = 'D'
          END IF
-         CALL DORCSD( JOBV1T, JOBV2T, JOBU1, JOBU2, TRANST, SIGNST, M,
+         CALL DORCSD( JOBV1T, JOBV2T, JOBU1, JOBU2, TRANST, SIGNST,
+     $                M,
      $                Q, P, X11, LDX11, X21, LDX21, X12, LDX12, X22,
      $                LDX22, THETA, V1T, LDV1T, V2T, LDV2T, U1, LDU1,
      $                U2, LDU2, WORK, LWORK, IWORK, INFO )
@@ -494,7 +495,8 @@ RECURSIVE SUBROUTINE DORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
 *
 *     Transform to bidiagonal block form
 *
-      CALL DORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12, X21,
+      CALL DORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
+     $             X21,
      $             LDX21, X22, LDX22, THETA, WORK(IPHI), WORK(ITAUP1),
      $             WORK(ITAUP2), WORK(ITAUQ1), WORK(ITAUQ2),
      $             WORK(IORBDB), LORBDBWORK, CHILDINFO )
@@ -504,7 +506,8 @@ RECURSIVE SUBROUTINE DORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
       IF( COLMAJOR ) THEN
          IF( WANTU1 .AND. P .GT. 0 ) THEN
             CALL DLACPY( 'L', P, Q, X11, LDX11, U1, LDU1 )
-            CALL DORGQR( P, P, Q, U1, LDU1, WORK(ITAUP1), WORK(IORGQR),
+            CALL DORGQR( P, P, Q, U1, LDU1, WORK(ITAUP1),
+     $                   WORK(IORGQR),
      $                   LORGQRWORK, INFO)
          END IF
          IF( WANTU2 .AND. M-P .GT. 0 ) THEN
@@ -520,7 +523,8 @@ RECURSIVE SUBROUTINE DORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
                V1T(1,J) = ZERO
                V1T(J,1) = ZERO
             END DO
-            CALL DORGLQ( Q-1, Q-1, Q-1, V1T(2,2), LDV1T, WORK(ITAUQ1),
+            CALL DORGLQ( Q-1, Q-1, Q-1, V1T(2,2), LDV1T,
+     $                   WORK(ITAUQ1),
      $                   WORK(IORGLQ), LORGLQWORK, INFO )
          END IF
          IF( WANTV2T .AND. M-Q .GT. 0 ) THEN
@@ -537,7 +541,8 @@ RECURSIVE SUBROUTINE DORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
       ELSE
          IF( WANTU1 .AND. P .GT. 0 ) THEN
             CALL DLACPY( 'U', Q, P, X11, LDX11, U1, LDU1 )
-            CALL DORGLQ( P, P, Q, U1, LDU1, WORK(ITAUP1), WORK(IORGLQ),
+            CALL DORGLQ( P, P, Q, U1, LDU1, WORK(ITAUP1),
+     $                   WORK(IORGLQ),
      $                   LORGLQWORK, INFO)
          END IF
          IF( WANTU2 .AND. M-P .GT. 0 ) THEN
@@ -553,7 +558,8 @@ RECURSIVE SUBROUTINE DORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
                V1T(1,J) = ZERO
                V1T(J,1) = ZERO
             END DO
-            CALL DORGQR( Q-1, Q-1, Q-1, V1T(2,2), LDV1T, WORK(ITAUQ1),
+            CALL DORGQR( Q-1, Q-1, Q-1, V1T(2,2), LDV1T,
+     $                   WORK(ITAUQ1),
      $                   WORK(IORGQR), LORGQRWORK, INFO )
          END IF
          IF( WANTV2T .AND. M-Q .GT. 0 ) THEN
@@ -567,7 +573,8 @@ RECURSIVE SUBROUTINE DORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
 *
 *     Compute the CSD of the matrix in bidiagonal-block form
 *
-      CALL DBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q, THETA,
+      CALL DBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
+     $             THETA,
      $             WORK(IPHI), U1, LDU1, U2, LDU2, V1T, LDV1T, V2T,
      $             LDV2T, WORK(IB11D), WORK(IB11E), WORK(IB12D),
      $             WORK(IB12E), WORK(IB21D), WORK(IB21E), WORK(IB22D),
diff --git a/SRC/dorcsd2by1.f b/SRC/dorcsd2by1.f
index 06bf53db16..ab62ecdb8c 100644
--- a/SRC/dorcsd2by1.f
+++ b/SRC/dorcsd2by1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORCSD2BY1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorcsd2by1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorcsd2by1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -224,12 +222,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup uncsd2by1
 *
 *  =====================================================================
-      SUBROUTINE DORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
+      SUBROUTINE DORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11,
+     $                       LDX11,
      $                       X21, LDX21, THETA, U1, LDU1, U2, LDU2, V1T,
      $                       LDV1T, WORK, LWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine (3.5.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -266,7 +266,8 @@ SUBROUTINE DORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
       DOUBLE PRECISION   DUM1(1), DUM2(1,1)
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DBBCSD, DCOPY, DLACPY, DLAPMR, DLAPMT, DORBDB1,
+      EXTERNAL           DBBCSD, DCOPY, DLACPY, DLAPMR, DLAPMT,
+     $                   DORBDB1,
      $                   DORBDB2, DORBDB3, DORBDB4, DORGLQ, DORGQR,
      $                   XERBLA
 *     ..
@@ -370,7 +371,8 @@ SUBROUTINE DORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
                LORGLQMIN = MAX( LORGLQMIN, Q-1 )
                LORGLQOPT = MAX( LORGLQOPT, INT( WORK(1) ) )
             END IF
-            CALL DBBCSD( JOBU1, JOBU2, JOBV1T, 'N', 'N', M, P, Q, THETA,
+            CALL DBBCSD( JOBU1, JOBU2, JOBV1T, 'N', 'N', M, P, Q,
+     $                   THETA,
      $                   DUM1, U1, LDU1, U2, LDU2, V1T, LDV1T,
      $                   DUM2, 1, DUM1, DUM1, DUM1,
      $                   DUM1, DUM1, DUM1, DUM1,
@@ -399,7 +401,8 @@ SUBROUTINE DORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
                LORGLQMIN = MAX( LORGLQMIN, Q )
                LORGLQOPT = MAX( LORGLQOPT, INT( WORK(1) ) )
             END IF
-            CALL DBBCSD( JOBV1T, 'N', JOBU1, JOBU2, 'T', M, Q, P, THETA,
+            CALL DBBCSD( JOBV1T, 'N', JOBU1, JOBU2, 'T', M, Q, P,
+     $                   THETA,
      $                   DUM1, V1T, LDV1T, DUM2, 1, U1, LDU1,
      $                   U2, LDU2, DUM1, DUM1, DUM1,
      $                   DUM1, DUM1, DUM1, DUM1,
@@ -503,7 +506,8 @@ SUBROUTINE DORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
 *
          IF( WANTU1 .AND. P .GT. 0 ) THEN
             CALL DLACPY( 'L', P, Q, X11, LDX11, U1, LDU1 )
-            CALL DORGQR( P, P, Q, U1, LDU1, WORK(ITAUP1), WORK(IORGQR),
+            CALL DORGQR( P, P, Q, U1, LDU1, WORK(ITAUP1),
+     $                   WORK(IORGQR),
      $                   LORGQR, CHILDINFO )
          END IF
          IF( WANTU2 .AND. M-P .GT. 0 ) THEN
@@ -519,7 +523,8 @@ SUBROUTINE DORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
             END DO
             CALL DLACPY( 'U', Q-1, Q-1, X21(1,2), LDX21, V1T(2,2),
      $                   LDV1T )
-            CALL DORGLQ( Q-1, Q-1, Q-1, V1T(2,2), LDV1T, WORK(ITAUQ1),
+            CALL DORGLQ( Q-1, Q-1, Q-1, V1T(2,2), LDV1T,
+     $                   WORK(ITAUQ1),
      $                   WORK(IORGLQ), LORGLQ, CHILDINFO )
          END IF
 *
@@ -562,7 +567,8 @@ SUBROUTINE DORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
                U1(1,J) = ZERO
                U1(J,1) = ZERO
             END DO
-            CALL DLACPY( 'L', P-1, P-1, X11(2,1), LDX11, U1(2,2), LDU1 )
+            CALL DLACPY( 'L', P-1, P-1, X11(2,1), LDX11, U1(2,2),
+     $                   LDU1 )
             CALL DORGQR( P-1, P-1, P-1, U1(2,2), LDU1, WORK(ITAUP1),
      $                   WORK(IORGQR), LORGQR, CHILDINFO )
          END IF
@@ -580,7 +586,7 @@ SUBROUTINE DORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
 *        Simultaneously diagonalize X11 and X21.
 *
          CALL DBBCSD( JOBV1T, 'N', JOBU1, JOBU2, 'T', M, Q, P, THETA,
-     $                WORK(IPHI), V1T, LDV1T, DUM2, 1, U1, LDU1, U2,
+     $                WORK(IPHI), V1T, LDV1T, DUM1, 1, U1, LDU1, U2,
      $                LDU2, WORK(IB11D), WORK(IB11E), WORK(IB12D),
      $                WORK(IB12E), WORK(IB21D), WORK(IB21E),
      $                WORK(IB22D), WORK(IB22E), WORK(IBBCSD), LBBCSD,
@@ -612,7 +618,8 @@ SUBROUTINE DORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
 *
          IF( WANTU1 .AND. P .GT. 0 ) THEN
             CALL DLACPY( 'L', P, Q, X11, LDX11, U1, LDU1 )
-            CALL DORGQR( P, P, Q, U1, LDU1, WORK(ITAUP1), WORK(IORGQR),
+            CALL DORGQR( P, P, Q, U1, LDU1, WORK(ITAUP1),
+     $                   WORK(IORGQR),
      $                   LORGQR, CHILDINFO )
          END IF
          IF( WANTU2 .AND. M-P .GT. 0 ) THEN
@@ -635,7 +642,7 @@ SUBROUTINE DORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
 *        Simultaneously diagonalize X11 and X21.
 *
          CALL DBBCSD( 'N', JOBV1T, JOBU2, JOBU1, 'T', M, M-Q, M-P,
-     $                THETA, WORK(IPHI), DUM2, 1, V1T, LDV1T, U2,
+     $                THETA, WORK(IPHI), DUM1, 1, V1T, LDV1T, U2,
      $                LDU2, U1, LDU1, WORK(IB11D), WORK(IB11E),
      $                WORK(IB12D), WORK(IB12E), WORK(IB21D),
      $                WORK(IB21E), WORK(IB22D), WORK(IB22E),
@@ -695,7 +702,8 @@ SUBROUTINE DORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
          END IF
          IF( WANTV1T .AND. Q .GT. 0 ) THEN
             CALL DLACPY( 'U', M-Q, Q, X21, LDX21, V1T, LDV1T )
-            CALL DLACPY( 'U', P-(M-Q), Q-(M-Q), X11(M-Q+1,M-Q+1), LDX11,
+            CALL DLACPY( 'U', P-(M-Q), Q-(M-Q), X11(M-Q+1,M-Q+1),
+     $                   LDX11,
      $                   V1T(M-Q+1,M-Q+1), LDV1T )
             CALL DLACPY( 'U', -P+Q, Q-P, X21(M-Q+1,P+1), LDX21,
      $                   V1T(P+1,P+1), LDV1T )
@@ -706,7 +714,7 @@ SUBROUTINE DORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
 *        Simultaneously diagonalize X11 and X21.
 *
          CALL DBBCSD( JOBU2, JOBU1, 'N', JOBV1T, 'N', M, M-P, M-Q,
-     $                THETA, WORK(IPHI), U2, LDU2, U1, LDU1, DUM2,
+     $                THETA, WORK(IPHI), U2, LDU2, U1, LDU1, DUM1,
      $                1, V1T, LDV1T, WORK(IB11D), WORK(IB11E),
      $                WORK(IB12D), WORK(IB12E), WORK(IB21D),
      $                WORK(IB21E), WORK(IB22D), WORK(IB22E),
diff --git a/SRC/dorg2l.f b/SRC/dorg2l.f
index 0a42d4cf5a..5111fa19ff 100644
--- a/SRC/dorg2l.f
+++ b/SRC/dorg2l.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORG2L + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorg2l.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorg2l.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup ung2l
 *
 *  =====================================================================
       SUBROUTINE DORG2L( M, N, K, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -133,7 +132,7 @@ SUBROUTINE DORG2L( M, N, K, A, LDA, TAU, WORK, INFO )
       INTEGER            I, II, J, L
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARF, DSCAL, XERBLA
+      EXTERNAL           DLARF1L, DSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -176,8 +175,9 @@ SUBROUTINE DORG2L( M, N, K, A, LDA, TAU, WORK, INFO )
 *
 *        Apply H(i) to A(1:m-k+i,1:n-k+i) from the left
 *
-         A( M-N+II, II ) = ONE
-         CALL DLARF( 'Left', M-N+II, II-1, A( 1, II ), 1, TAU( I ), A,
+         !A(M-N+II, II) = ONE
+         CALL DLARF1L( 'Left', M-N+II, II-1, A( 1, II ), 1, TAU( I ),
+     $               A,
      $               LDA, WORK )
          CALL DSCAL( M-N+II-1, -TAU( I ), A( 1, II ), 1 )
          A( M-N+II, II ) = ONE - TAU( I )
diff --git a/SRC/dorg2r.f b/SRC/dorg2r.f
index c64ad4b0ac..213a2d54c5 100644
--- a/SRC/dorg2r.f
+++ b/SRC/dorg2r.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORG2R + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorg2r.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorg2r.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup ung2r
 *
 *  =====================================================================
       SUBROUTINE DORG2R( M, N, K, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -133,7 +132,7 @@ SUBROUTINE DORG2R( M, N, K, A, LDA, TAU, WORK, INFO )
       INTEGER            I, J, L
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARF, DSCAL, XERBLA
+      EXTERNAL           DLARF1F, DSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -176,8 +175,7 @@ SUBROUTINE DORG2R( M, N, K, A, LDA, TAU, WORK, INFO )
 *        Apply H(i) to A(i:m,i:n) from the left
 *
          IF( I.LT.N ) THEN
-            A( I, I ) = ONE
-            CALL DLARF( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
+            CALL DLARF1F( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
      $                  A( I, I+1 ), LDA, WORK )
          END IF
          IF( I.LT.M )
diff --git a/SRC/dorgbr.f b/SRC/dorgbr.f
index 1b242ff97f..cf24a14c7f 100644
--- a/SRC/dorgbr.f
+++ b/SRC/dorgbr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORGBR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorgbr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorgbr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -150,10 +148,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGBcomputational
+*> \ingroup ungbr
 *
 *  =====================================================================
-      SUBROUTINE DORGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE DORGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -232,7 +232,7 @@ SUBROUTINE DORGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
                END IF
             END IF
          END IF
-         LWKOPT = WORK( 1 )
+         LWKOPT = INT( WORK( 1 ) )
          LWKOPT = MAX (LWKOPT, MN)
       END IF
 *
diff --git a/SRC/dorghr.f b/SRC/dorghr.f
index 2feb39b5aa..4438348c47 100644
--- a/SRC/dorghr.f
+++ b/SRC/dorghr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORGHR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorghr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorghr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,10 +117,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unghr
 *
 *  =====================================================================
-      SUBROUTINE DORGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE DORGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dorgl2.f b/SRC/dorgl2.f
index ce1d2c6750..d8f10ebbe5 100644
--- a/SRC/dorgl2.f
+++ b/SRC/dorgl2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORGL2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorgl2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorgl2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,10 +104,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup ungl2
 *
 *  =====================================================================
       SUBROUTINE DORGL2( M, N, K, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -132,7 +131,7 @@ SUBROUTINE DORGL2( M, N, K, A, LDA, TAU, WORK, INFO )
       INTEGER            I, J, L
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARF, DSCAL, XERBLA
+      EXTERNAL           DLARF1F, DSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -180,8 +179,7 @@ SUBROUTINE DORGL2( M, N, K, A, LDA, TAU, WORK, INFO )
 *
          IF( I.LT.N ) THEN
             IF( I.LT.M ) THEN
-               A( I, I ) = ONE
-               CALL DLARF( 'Right', M-I, N-I+1, A( I, I ), LDA,
+               CALL DLARF1F( 'Right', M-I, N-I+1, A( I, I ), LDA,
      $                     TAU( I ), A( I+1, I ), LDA, WORK )
             END IF
             CALL DSCAL( N-I, -TAU( I ), A( I, I+1 ), LDA )
diff --git a/SRC/dorglq.f b/SRC/dorglq.f
index 8c37c18b75..d775a96f98 100644
--- a/SRC/dorglq.f
+++ b/SRC/dorglq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORGLQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorglq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorglq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,10 +118,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unglq
 *
 *  =====================================================================
       SUBROUTINE DORGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -211,7 +210,8 @@ SUBROUTINE DORGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              determine the minimum value of NB.
 *
                NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'DORGLQ', ' ', M, N, K, -1 ) )
+               NBMIN = MAX( 2, ILAENV( 2, 'DORGLQ', ' ', M, N, K,
+     $                      -1 ) )
             END IF
          END IF
       END IF
@@ -252,12 +252,14 @@ SUBROUTINE DORGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              Form the triangular factor of the block reflector
 *              H = H(i) H(i+1) . . . H(i+ib-1)
 *
-               CALL DLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I, I ),
+               CALL DLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I,
+     $                      I ),
      $                      LDA, TAU( I ), WORK, LDWORK )
 *
 *              Apply H**T to A(i+ib:m,i:n) from the right
 *
-               CALL DLARFB( 'Right', 'Transpose', 'Forward', 'Rowwise',
+               CALL DLARFB( 'Right', 'Transpose', 'Forward',
+     $                      'Rowwise',
      $                      M-I-IB+1, N-I+1, IB, A( I, I ), LDA, WORK,
      $                      LDWORK, A( I+IB, I ), LDA, WORK( IB+1 ),
      $                      LDWORK )
@@ -265,7 +267,8 @@ SUBROUTINE DORGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *           Apply H**T to columns i:n of current block
 *
-            CALL DORGL2( IB, N-I+1, IB, A( I, I ), LDA, TAU( I ), WORK,
+            CALL DORGL2( IB, N-I+1, IB, A( I, I ), LDA, TAU( I ),
+     $                   WORK,
      $                   IINFO )
 *
 *           Set columns 1:i-1 of current block to zero
diff --git a/SRC/dorgql.f b/SRC/dorgql.f
index 45e5bf19f1..50fbf8a83a 100644
--- a/SRC/dorgql.f
+++ b/SRC/dorgql.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORGQL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorgql.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorgql.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup ungql
 *
 *  =====================================================================
       SUBROUTINE DORGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -221,7 +220,8 @@ SUBROUTINE DORGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              determine the minimum value of NB.
 *
                NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'DORGQL', ' ', M, N, K, -1 ) )
+               NBMIN = MAX( 2, ILAENV( 2, 'DORGQL', ' ', M, N, K,
+     $                      -1 ) )
             END IF
          END IF
       END IF
diff --git a/SRC/dorgqr.f b/SRC/dorgqr.f
index a41ce7ed56..edf783ebd4 100644
--- a/SRC/dorgqr.f
+++ b/SRC/dorgqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORGQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorgqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorgqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup ungqr
 *
 *  =====================================================================
       SUBROUTINE DORGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -212,7 +211,8 @@ SUBROUTINE DORGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              determine the minimum value of NB.
 *
                NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'DORGQR', ' ', M, N, K, -1 ) )
+               NBMIN = MAX( 2, ILAENV( 2, 'DORGQR', ' ', M, N, K,
+     $                      -1 ) )
             END IF
          END IF
       END IF
@@ -266,7 +266,8 @@ SUBROUTINE DORGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *           Apply H to rows i:m of current block
 *
-            CALL DORG2R( M-I+1, IB, IB, A( I, I ), LDA, TAU( I ), WORK,
+            CALL DORG2R( M-I+1, IB, IB, A( I, I ), LDA, TAU( I ),
+     $                   WORK,
      $                   IINFO )
 *
 *           Set rows 1:i-1 of current block to zero
diff --git a/SRC/dorgr2.f b/SRC/dorgr2.f
index 5244c85fd0..43e731966f 100644
--- a/SRC/dorgr2.f
+++ b/SRC/dorgr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORGR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorgr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorgr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup ungr2
 *
 *  =====================================================================
       SUBROUTINE DORGR2( M, N, K, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -180,8 +179,9 @@ SUBROUTINE DORGR2( M, N, K, A, LDA, TAU, WORK, INFO )
 *
 *        Apply H(i) to A(1:m-k+i,1:n-k+i) from the right
 *
-         A( II, N-M+II ) = ONE
-         CALL DLARF( 'Right', II-1, N-M+II, A( II, 1 ), LDA, TAU( I ),
+         !A( II, N-M+II ) = ONE
+         CALL DLARF1L( 'Right', II-1, N-M+II, A( II, 1 ), LDA,
+     $               TAU( I ),
      $               A, LDA, WORK )
          CALL DSCAL( N-M+II-1, -TAU( I ), A( II, 1 ), LDA )
          A( II, N-M+II ) = ONE - TAU( I )
diff --git a/SRC/dorgrq.f b/SRC/dorgrq.f
index 7e09f94e5b..7a8c1f0158 100644
--- a/SRC/dorgrq.f
+++ b/SRC/dorgrq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORGRQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorgrq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorgrq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup ungrq
 *
 *  =====================================================================
       SUBROUTINE DORGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -221,7 +220,8 @@ SUBROUTINE DORGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              determine the minimum value of NB.
 *
                NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'DORGRQ', ' ', M, N, K, -1 ) )
+               NBMIN = MAX( 2, ILAENV( 2, 'DORGRQ', ' ', M, N, K,
+     $                      -1 ) )
             END IF
          END IF
       END IF
@@ -265,14 +265,16 @@ SUBROUTINE DORGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *              Apply H**T to A(1:m-k+i-1,1:n-k+i+ib-1) from the right
 *
-               CALL DLARFB( 'Right', 'Transpose', 'Backward', 'Rowwise',
+               CALL DLARFB( 'Right', 'Transpose', 'Backward',
+     $                      'Rowwise',
      $                      II-1, N-K+I+IB-1, IB, A( II, 1 ), LDA, WORK,
      $                      LDWORK, A, LDA, WORK( IB+1 ), LDWORK )
             END IF
 *
 *           Apply H**T to columns 1:n-k+i+ib-1 of current block
 *
-            CALL DORGR2( IB, N-K+I+IB-1, IB, A( II, 1 ), LDA, TAU( I ),
+            CALL DORGR2( IB, N-K+I+IB-1, IB, A( II, 1 ), LDA,
+     $                   TAU( I ),
      $                   WORK, IINFO )
 *
 *           Set columns n-k+i+ib:n of current block to zero
diff --git a/SRC/dorgtr.f b/SRC/dorgtr.f
index 0a0ab15a78..c10865fff6 100644
--- a/SRC/dorgtr.f
+++ b/SRC/dorgtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORGTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorgtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorgtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -116,10 +114,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup ungtr
 *
 *  =====================================================================
       SUBROUTINE DORGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -216,7 +215,8 @@ SUBROUTINE DORGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *        Generate Q(1:n-1,1:n-1)
 *
-         CALL DORGQL( N-1, N-1, N-1, A, LDA, TAU, WORK, LWORK, IINFO )
+         CALL DORGQL( N-1, N-1, N-1, A, LDA, TAU, WORK, LWORK,
+     $                IINFO )
 *
       ELSE
 *
diff --git a/SRC/dorgtsqr.f b/SRC/dorgtsqr.f
index efc4b5b965..3759ebe1eb 100644
--- a/SRC/dorgtsqr.f
+++ b/SRC/dorgtsqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORGTSQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorgtsqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorgtsqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,6 +131,7 @@
 *>
 *> \param[in] LWORK
 *> \verbatim
+*>          LWORK is INTEGER
 *>          The dimension of the array WORK.  LWORK >= (M+NB)*N.
 *>          If LWORK = -1, then a workspace query is assumed.
 *>          The routine only calculates the optimal size of the WORK
@@ -156,7 +155,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup ungtsqr
 *
 *> \par Contributors:
 *  ==================
diff --git a/SRC/dorgtsqr_row.f b/SRC/dorgtsqr_row.f
index 94f8b01206..2042ecbe40 100644
--- a/SRC/dorgtsqr_row.f
+++ b/SRC/dorgtsqr_row.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORGTSQR_ROW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorgtsqr_row.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorgtsqr_row.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,6 +142,7 @@
 *>
 *> \param[in] LWORK
 *> \verbatim
+*>          LWORK is INTEGER
 *>          The dimension of the array WORK.
 *>          LWORK >= NBLOCAL * MAX(NBLOCAL,(N-NBLOCAL)),
 *>          where NBLOCAL=MIN(NB,N).
@@ -169,7 +168,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup ungtsqr_row
 *
 *> \par Contributors:
 *  ==================
diff --git a/SRC/dorhr_col.f b/SRC/dorhr_col.f
index 794ecab78e..36b69d72d5 100644
--- a/SRC/dorhr_col.f
+++ b/SRC/dorhr_col.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORHR_COL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorhr_col.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorhr_col.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -241,7 +239,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unhr_col
 *
 *> \par Contributors:
 *  ==================
@@ -280,7 +278,8 @@ SUBROUTINE DORHR_COL( M, N, NB, A, LDA, T, LDT, D, INFO )
      $                   NPLUSONE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLAORHR_COL_GETRFNP, DSCAL, DTRSM,
+      EXTERNAL           DCOPY, DLAORHR_COL_GETRFNP, DSCAL,
+     $                   DTRSM,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -419,7 +418,7 @@ SUBROUTINE DORHR_COL( M, N, NB, A, LDA, T, LDT, D, INFO )
 *
          JBTEMP2 = JB - 2
          DO J = JB, JB+JNB-2
-            DO I = J-JBTEMP2, NB
+            DO I = J-JBTEMP2, MIN( NB, N )
                T( I, J ) = ZERO
             END DO
          END DO
diff --git a/SRC/dorm22.f b/SRC/dorm22.f
index 7a25660404..56483bc2e4 100644
--- a/SRC/dorm22.f
+++ b/SRC/dorm22.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORM22 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorm22.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorm22.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -155,7 +153,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unm22
 *
 *  =====================================================================
       SUBROUTINE DORM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
@@ -216,7 +214,8 @@ SUBROUTINE DORM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
       IF( N1.EQ.0 .OR. N2.EQ.0 ) NW = 1
       IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.LSAME( TRANS, 'T' ) )
+      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND.
+     $         .NOT.LSAME( TRANS, 'T' ) )
      $          THEN
          INFO = -2
       ELSE IF( M.LT.0 ) THEN
@@ -282,13 +281,15 @@ SUBROUTINE DORM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *
                CALL DLACPY( 'All', N1, LEN, C( N2+1, I ), LDC, WORK,
      $                      LDWORK )
-               CALL DTRMM( 'Left', 'Lower', 'No Transpose', 'Non-Unit',
+               CALL DTRMM( 'Left', 'Lower', 'No Transpose',
+     $                     'Non-Unit',
      $                     N1, LEN, ONE, Q( 1, N2+1 ), LDQ, WORK,
      $                     LDWORK )
 *
 *              Multiply top part of C by Q11.
 *
-               CALL DGEMM( 'No Transpose', 'No Transpose', N1, LEN, N2,
+               CALL DGEMM( 'No Transpose', 'No Transpose', N1, LEN,
+     $                     N2,
      $                     ONE, Q, LDQ, C( 1, I ), LDC, ONE, WORK,
      $                     LDWORK )
 *
@@ -296,13 +297,15 @@ SUBROUTINE DORM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *
                CALL DLACPY( 'All', N2, LEN, C( 1, I ), LDC,
      $                      WORK( N1+1 ), LDWORK )
-               CALL DTRMM( 'Left', 'Upper', 'No Transpose', 'Non-Unit',
+               CALL DTRMM( 'Left', 'Upper', 'No Transpose',
+     $                     'Non-Unit',
      $                     N2, LEN, ONE, Q( N1+1, 1 ), LDQ,
      $                     WORK( N1+1 ), LDWORK )
 *
 *              Multiply bottom part of C by Q22.
 *
-               CALL DGEMM( 'No Transpose', 'No Transpose', N2, LEN, N1,
+               CALL DGEMM( 'No Transpose', 'No Transpose', N2, LEN,
+     $                     N1,
      $                     ONE, Q( N1+1, N2+1 ), LDQ, C( N2+1, I ), LDC,
      $                     ONE, WORK( N1+1 ), LDWORK )
 *
@@ -360,13 +363,15 @@ SUBROUTINE DORM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *
                CALL DLACPY( 'All', LEN, N2, C( I, N1+1 ), LDC, WORK,
      $                      LDWORK )
-               CALL DTRMM( 'Right', 'Upper', 'No Transpose', 'Non-Unit',
+               CALL DTRMM( 'Right', 'Upper', 'No Transpose',
+     $                     'Non-Unit',
      $                     LEN, N2, ONE, Q( N1+1, 1 ), LDQ, WORK,
      $                     LDWORK )
 *
 *              Multiply left part of C by Q11.
 *
-               CALL DGEMM( 'No Transpose', 'No Transpose', LEN, N2, N1,
+               CALL DGEMM( 'No Transpose', 'No Transpose', LEN, N2,
+     $                     N1,
      $                     ONE, C( I, 1 ), LDC, Q, LDQ, ONE, WORK,
      $                     LDWORK )
 *
@@ -374,13 +379,15 @@ SUBROUTINE DORM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *
                CALL DLACPY( 'All', LEN, N1, C( I, 1 ), LDC,
      $                      WORK( 1 + N2*LDWORK ), LDWORK )
-               CALL DTRMM( 'Right', 'Lower', 'No Transpose', 'Non-Unit',
+               CALL DTRMM( 'Right', 'Lower', 'No Transpose',
+     $                     'Non-Unit',
      $                     LEN, N1, ONE, Q( 1, N2+1 ), LDQ,
      $                     WORK( 1 + N2*LDWORK ), LDWORK )
 *
 *              Multiply right part of C by Q22.
 *
-               CALL DGEMM( 'No Transpose', 'No Transpose', LEN, N1, N2,
+               CALL DGEMM( 'No Transpose', 'No Transpose', LEN, N1,
+     $                     N2,
      $                     ONE, C( I, N1+1 ), LDC, Q( N1+1, N2+1 ), LDQ,
      $                     ONE, WORK( 1 + N2*LDWORK ), LDWORK )
 *
diff --git a/SRC/dorm2l.f b/SRC/dorm2l.f
index c99039c541..f86a12f3a6 100644
--- a/SRC/dorm2l.f
+++ b/SRC/dorm2l.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORM2L + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorm2l.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorm2l.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,7 +96,6 @@
 *>          The i-th column must contain the vector which defines the
 *>          elementary reflector H(i), for i = 1,2,...,k, as returned by
 *>          DGEQLF in the last k columns of its array argument A.
-*>          A is modified by the routine but restored on exit.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -151,11 +148,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unm2l
 *
 *  =====================================================================
       SUBROUTINE DORM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -178,14 +176,13 @@ SUBROUTINE DORM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *     .. Local Scalars ..
       LOGICAL            LEFT, NOTRAN
       INTEGER            I, I1, I2, I3, MI, NI, NQ
-      DOUBLE PRECISION   AII
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARF, XERBLA
+      EXTERNAL           DLARF1L, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -262,11 +259,8 @@ SUBROUTINE DORM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Apply H(i)
 *
-         AII = A( NQ-K+I, I )
-         A( NQ-K+I, I ) = ONE
-         CALL DLARF( SIDE, MI, NI, A( 1, I ), 1, TAU( I ), C, LDC,
+         CALL DLARF1L( SIDE, MI, NI, A( 1, I ), 1, TAU( I ), C, LDC,
      $               WORK )
-         A( NQ-K+I, I ) = AII
    10 CONTINUE
       RETURN
 *
diff --git a/SRC/dorm2r.f b/SRC/dorm2r.f
index ac88eec8dc..0bda2b1497 100644
--- a/SRC/dorm2r.f
+++ b/SRC/dorm2r.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORM2R + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorm2r.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorm2r.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,7 +96,6 @@
 *>          The i-th column must contain the vector which defines the
 *>          elementary reflector H(i), for i = 1,2,...,k, as returned by
 *>          DGEQRF in the first k columns of its array argument A.
-*>          A is modified by the routine but restored on exit.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -151,11 +148,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unm2r
 *
 *  =====================================================================
       SUBROUTINE DORM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -178,14 +176,13 @@ SUBROUTINE DORM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *     .. Local Scalars ..
       LOGICAL            LEFT, NOTRAN
       INTEGER            I, I1, I2, I3, IC, JC, MI, NI, NQ
-      DOUBLE PRECISION   AII
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARF, XERBLA
+      EXTERNAL            XERBLA, DLARF1F
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -266,11 +263,9 @@ SUBROUTINE DORM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Apply H(i)
 *
-         AII = A( I, I )
-         A( I, I ) = ONE
-         CALL DLARF( SIDE, MI, NI, A( I, I ), 1, TAU( I ), C( IC, JC ),
+         CALL DLARF1F( SIDE, MI, NI, A( I, I ), 1, TAU( I ), C( IC,
+     $               JC ),
      $               LDC, WORK )
-         A( I, I ) = AII
    10 CONTINUE
       RETURN
 *
diff --git a/SRC/dormbr.f b/SRC/dormbr.f
index 86abb10072..cc86aa291a 100644
--- a/SRC/dormbr.f
+++ b/SRC/dormbr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORMBR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dormbr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dormbr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -187,11 +185,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unmbr
 *
 *  =====================================================================
       SUBROUTINE DORMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
      $                   LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -324,7 +323,8 @@ SUBROUTINE DORMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
                I1 = 1
                I2 = 2
             END IF
-            CALL DORMQR( SIDE, TRANS, MI, NI, NQ-1, A( 2, 1 ), LDA, TAU,
+            CALL DORMQR( SIDE, TRANS, MI, NI, NQ-1, A( 2, 1 ), LDA,
+     $                   TAU,
      $                   C( I1, I2 ), LDC, WORK, LWORK, IINFO )
          END IF
       ELSE
diff --git a/SRC/dormhr.f b/SRC/dormhr.f
index 1cf1731743..7fd509e623 100644
--- a/SRC/dormhr.f
+++ b/SRC/dormhr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORMHR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dormhr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dormhr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -170,11 +168,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unmhr
 *
 *  =====================================================================
       SUBROUTINE DORMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
      $                   LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -225,7 +224,8 @@ SUBROUTINE DORMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
       END IF
       IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.LSAME( TRANS, 'T' ) )
+      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND.
+     $         .NOT.LSAME( TRANS, 'T' ) )
      $          THEN
          INFO = -2
       ELSE IF( M.LT.0 ) THEN
diff --git a/SRC/dorml2.f b/SRC/dorml2.f
index a9ddd460d8..f5f8957b5b 100644
--- a/SRC/dorml2.f
+++ b/SRC/dorml2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORML2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dorml2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dorml2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -100,7 +98,6 @@
 *>          The i-th row must contain the vector which defines the
 *>          elementary reflector H(i), for i = 1,2,...,k, as returned by
 *>          DGELQF in the first k rows of its array argument A.
-*>          A is modified by the routine but restored on exit.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -151,11 +148,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unml2
 *
 *  =====================================================================
       SUBROUTINE DORML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -178,14 +176,13 @@ SUBROUTINE DORML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *     .. Local Scalars ..
       LOGICAL            LEFT, NOTRAN
       INTEGER            I, I1, I2, I3, IC, JC, MI, NI, NQ
-      DOUBLE PRECISION   AII
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARF, XERBLA
+      EXTERNAL           DLARF1F, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -266,11 +263,8 @@ SUBROUTINE DORML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Apply H(i)
 *
-         AII = A( I, I )
-         A( I, I ) = ONE
-         CALL DLARF( SIDE, MI, NI, A( I, I ), LDA, TAU( I ),
+         CALL DLARF1F( SIDE, MI, NI, A( I, I ), LDA, TAU( I ),
      $               C( IC, JC ), LDC, WORK )
-         A( I, I ) = AII
    10 CONTINUE
       RETURN
 *
diff --git a/SRC/dormlq.f b/SRC/dormlq.f
index ef039285ab..3985082acc 100644
--- a/SRC/dormlq.f
+++ b/SRC/dormlq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORMLQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dormlq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dormlq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -159,11 +157,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unmlq
 *
 *  =====================================================================
       SUBROUTINE DORMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -241,7 +240,8 @@ SUBROUTINE DORMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Compute the workspace requirements
 *
-         NB = MIN( NBMAX, ILAENV( 1, 'DORMLQ', SIDE // TRANS, M, N, K,
+         NB = MIN( NBMAX, ILAENV( 1, 'DORMLQ', SIDE // TRANS, M, N,
+     $             K,
      $        -1 ) )
          LWKOPT = NW*NB + TSIZE
          WORK( 1 ) = LWKOPT
@@ -266,7 +266,8 @@ SUBROUTINE DORMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'DORMLQ', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'DORMLQ', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -275,7 +276,8 @@ SUBROUTINE DORMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Use unblocked code
 *
-         CALL DORML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+         CALL DORML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                WORK,
      $                IINFO )
       ELSE
 *
@@ -331,7 +333,8 @@ SUBROUTINE DORMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *           Apply H or H**T
 *
-            CALL DLARFB( SIDE, TRANST, 'Forward', 'Rowwise', MI, NI, IB,
+            CALL DLARFB( SIDE, TRANST, 'Forward', 'Rowwise', MI, NI,
+     $                   IB,
      $                   A( I, I ), LDA, WORK( IWT ), LDT,
      $                   C( IC, JC ), LDC, WORK, LDWORK )
    10    CONTINUE
diff --git a/SRC/dormql.f b/SRC/dormql.f
index 7c9f189e0d..ff6ba5ac0d 100644
--- a/SRC/dormql.f
+++ b/SRC/dormql.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORMQL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dormql.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dormql.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -159,11 +157,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unmql
 *
 *  =====================================================================
       SUBROUTINE DORMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -243,7 +242,8 @@ SUBROUTINE DORMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
          IF( M.EQ.0 .OR. N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            NB = MIN( NBMAX, ILAENV( 1, 'DORMQL', SIDE // TRANS, M, N,
+            NB = MIN( NBMAX, ILAENV( 1, 'DORMQL', SIDE // TRANS, M,
+     $                N,
      $                               K, -1 ) )
             LWKOPT = NW*NB + TSIZE
          END IF
@@ -268,7 +268,8 @@ SUBROUTINE DORMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'DORMQL', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'DORMQL', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -277,7 +278,8 @@ SUBROUTINE DORMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Use unblocked code
 *
-         CALL DORM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+         CALL DORM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                WORK,
      $                IINFO )
       ELSE
 *
@@ -323,7 +325,8 @@ SUBROUTINE DORMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *           Apply H or H**T
 *
-            CALL DLARFB( SIDE, TRANS, 'Backward', 'Columnwise', MI, NI,
+            CALL DLARFB( SIDE, TRANS, 'Backward', 'Columnwise', MI,
+     $                   NI,
      $                   IB, A( 1, I ), LDA, WORK( IWT ), LDT, C, LDC,
      $                   WORK, LDWORK )
    10    CONTINUE
diff --git a/SRC/dormqr.f b/SRC/dormqr.f
index 4d0bae3a5f..36b58ebc9e 100644
--- a/SRC/dormqr.f
+++ b/SRC/dormqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORMQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dormqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dormqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -159,11 +157,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unmqr
 *
 *  =====================================================================
       SUBROUTINE DORMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -240,7 +239,8 @@ SUBROUTINE DORMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Compute the workspace requirements
 *
-         NB = MIN( NBMAX, ILAENV( 1, 'DORMQR', SIDE // TRANS, M, N, K,
+         NB = MIN( NBMAX, ILAENV( 1, 'DORMQR', SIDE // TRANS, M, N,
+     $             K,
      $        -1 ) )
          LWKOPT = NW*NB + TSIZE
          WORK( 1 ) = LWKOPT
@@ -265,7 +265,8 @@ SUBROUTINE DORMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'DORMQR', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'DORMQR', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -274,7 +275,8 @@ SUBROUTINE DORMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Use unblocked code
 *
-         CALL DORM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+         CALL DORM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                WORK,
      $                IINFO )
       ELSE
 *
@@ -306,7 +308,8 @@ SUBROUTINE DORMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *           Form the triangular factor of the block reflector
 *           H = H(i) H(i+1) . . . H(i+ib-1)
 *
-            CALL DLARFT( 'Forward', 'Columnwise', NQ-I+1, IB, A( I, I ),
+            CALL DLARFT( 'Forward', 'Columnwise', NQ-I+1, IB, A( I,
+     $                   I ),
      $                   LDA, TAU( I ), WORK( IWT ), LDT )
             IF( LEFT ) THEN
 *
@@ -324,7 +327,8 @@ SUBROUTINE DORMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *           Apply H or H**T
 *
-            CALL DLARFB( SIDE, TRANS, 'Forward', 'Columnwise', MI, NI,
+            CALL DLARFB( SIDE, TRANS, 'Forward', 'Columnwise', MI,
+     $                   NI,
      $                   IB, A( I, I ), LDA, WORK( IWT ), LDT,
      $                   C( IC, JC ), LDC, WORK, LDWORK )
    10    CONTINUE
diff --git a/SRC/dormr2.f b/SRC/dormr2.f
index 8f15c6eb4d..2fbfd73c50 100644
--- a/SRC/dormr2.f
+++ b/SRC/dormr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORMR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dormr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dormr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,11 +149,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unmr2
 *
 *  =====================================================================
       SUBROUTINE DORMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dormr3.f b/SRC/dormr3.f
index 9eaef200ae..7f2dbeea6a 100644
--- a/SRC/dormr3.f
+++ b/SRC/dormr3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORMR3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dormr3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dormr3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -159,7 +157,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unmr3
 *
 *> \par Contributors:
 *  ==================
@@ -173,8 +171,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DORMR3( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
+      SUBROUTINE DORMR3( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C,
+     $                   LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dormrq.f b/SRC/dormrq.f
index 43422f9583..5f538eac65 100644
--- a/SRC/dormrq.f
+++ b/SRC/dormrq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORMRQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dormrq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dormrq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -159,11 +157,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unmrq
 *
 *  =====================================================================
       SUBROUTINE DORMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -244,7 +243,8 @@ SUBROUTINE DORMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
          IF( M.EQ.0 .OR. N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            NB = MIN( NBMAX, ILAENV( 1, 'DORMRQ', SIDE // TRANS, M, N,
+            NB = MIN( NBMAX, ILAENV( 1, 'DORMRQ', SIDE // TRANS, M,
+     $                N,
      $                               K, -1 ) )
             LWKOPT = NW*NB + TSIZE
          END IF
@@ -269,7 +269,8 @@ SUBROUTINE DORMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'DORMRQ', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'DORMRQ', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -278,7 +279,8 @@ SUBROUTINE DORMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Use unblocked code
 *
-         CALL DORMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+         CALL DORMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                WORK,
      $                IINFO )
       ELSE
 *
diff --git a/SRC/dormrz.f b/SRC/dormrz.f
index 0dea1b5ff1..ac4ffb7f8a 100644
--- a/SRC/dormrz.f
+++ b/SRC/dormrz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORMRZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dormrz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dormrz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -168,7 +166,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unmrz
 *
 *> \par Contributors:
 *  ==================
@@ -182,8 +180,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DORMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
+      SUBROUTINE DORMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C,
+     $                   LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -267,7 +267,8 @@ SUBROUTINE DORMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
          IF( M.EQ.0 .OR. N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            NB = MIN( NBMAX, ILAENV( 1, 'DORMRQ', SIDE // TRANS, M, N,
+            NB = MIN( NBMAX, ILAENV( 1, 'DORMRQ', SIDE // TRANS, M,
+     $                N,
      $                               K, -1 ) )
             LWKOPT = NW*NB + TSIZE
          END IF
@@ -293,7 +294,8 @@ SUBROUTINE DORMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'DORMRQ', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'DORMRQ', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -342,7 +344,8 @@ SUBROUTINE DORMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
 *           Form the triangular factor of the block reflector
 *           H = H(i+ib-1) . . . H(i+1) H(i)
 *
-            CALL DLARZT( 'Backward', 'Rowwise', L, IB, A( I, JA ), LDA,
+            CALL DLARZT( 'Backward', 'Rowwise', L, IB, A( I, JA ),
+     $                   LDA,
      $                   TAU( I ), WORK( IWT ), LDT )
 *
             IF( LEFT ) THEN
diff --git a/SRC/dormtr.f b/SRC/dormtr.f
index 1f664d63cc..db3b0bcb1c 100644
--- a/SRC/dormtr.f
+++ b/SRC/dormtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DORMTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dormtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dormtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,11 +161,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup unmtr
 *
 *  =====================================================================
-      SUBROUTINE DORMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
+      SUBROUTINE DORMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C,
+     $                   LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -220,7 +220,8 @@ SUBROUTINE DORMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
          INFO = -1
       ELSE IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.LSAME( TRANS, 'T' ) )
+      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND.
+     $         .NOT.LSAME( TRANS, 'T' ) )
      $          THEN
          INFO = -3
       ELSE IF( M.LT.0 ) THEN
@@ -283,7 +284,8 @@ SUBROUTINE DORMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
 *
 *        Q was determined by a call to DSYTRD with UPLO = 'U'
 *
-         CALL DORMQL( SIDE, TRANS, MI, NI, NQ-1, A( 1, 2 ), LDA, TAU, C,
+         CALL DORMQL( SIDE, TRANS, MI, NI, NQ-1, A( 1, 2 ), LDA, TAU,
+     $                C,
      $                LDC, WORK, LWORK, IINFO )
       ELSE
 *
diff --git a/SRC/dpbcon.f b/SRC/dpbcon.f
index 27ea5e234f..feccf65352 100644
--- a/SRC/dpbcon.f
+++ b/SRC/dpbcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPBCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpbcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpbcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -124,11 +122,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup pbcon
 *
 *  =====================================================================
       SUBROUTINE DPBCON( UPLO, N, KD, AB, LDAB, ANORM, RCOND, WORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,14 +222,16 @@ SUBROUTINE DPBCON( UPLO, N, KD, AB, LDAB, ANORM, RCOND, WORK,
 *
 *           Multiply by inv(U).
 *
-            CALL DLATBS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL DLATBS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   KD, AB, LDAB, WORK, SCALEU, WORK( 2*N+1 ),
      $                   INFO )
          ELSE
 *
 *           Multiply by inv(L).
 *
-            CALL DLATBS( 'Lower', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL DLATBS( 'Lower', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   KD, AB, LDAB, WORK, SCALEL, WORK( 2*N+1 ),
      $                   INFO )
             NORMIN = 'Y'
diff --git a/SRC/dpbequ.f b/SRC/dpbequ.f
index 01c2cd0886..09034c8844 100644
--- a/SRC/dpbequ.f
+++ b/SRC/dpbequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPBEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpbequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpbequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,10 +120,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup pbequ
 *
 *  =====================================================================
-      SUBROUTINE DPBEQU( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX, INFO )
+      SUBROUTINE DPBEQU( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dpbrfs.f b/SRC/dpbrfs.f
index d7a854f02d..514478bc53 100644
--- a/SRC/dpbrfs.f
+++ b/SRC/dpbrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPBRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpbrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpbrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -181,11 +179,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup pbrfs
 *
 *  =====================================================================
       SUBROUTINE DPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
      $                   LDB, X, LDX, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -224,7 +223,8 @@ SUBROUTINE DPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DLACN2, DPBTRS, DSBMV, XERBLA
+      EXTERNAL           DAXPY, DCOPY, DLACN2, DPBTRS, DSBMV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN
@@ -397,14 +397,16 @@ SUBROUTINE DPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
 *
          KASE = 0
   100    CONTINUE
-         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
 *
 *              Multiply by diag(W)*inv(A**T).
 *
-               CALL DPBTRS( UPLO, N, KD, 1, AFB, LDAFB, WORK( N+1 ), N,
+               CALL DPBTRS( UPLO, N, KD, 1, AFB, LDAFB, WORK( N+1 ),
+     $                      N,
      $                      INFO )
                DO 110 I = 1, N
                   WORK( N+I ) = WORK( N+I )*WORK( I )
@@ -416,7 +418,8 @@ SUBROUTINE DPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
                DO 120 I = 1, N
                   WORK( N+I ) = WORK( N+I )*WORK( I )
   120          CONTINUE
-               CALL DPBTRS( UPLO, N, KD, 1, AFB, LDAFB, WORK( N+1 ), N,
+               CALL DPBTRS( UPLO, N, KD, 1, AFB, LDAFB, WORK( N+1 ),
+     $                      N,
      $                      INFO )
             END IF
             GO TO 100
diff --git a/SRC/dpbstf.f b/SRC/dpbstf.f
index 61068d9cd8..024a8a4af3 100644
--- a/SRC/dpbstf.f
+++ b/SRC/dpbstf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPBSTF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpbstf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpbstf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -110,7 +108,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup pbstf
 *
 *> \par Further Details:
 *  =====================
@@ -149,6 +147,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DPBSTF( UPLO, N, KD, AB, LDAB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dpbsv.f b/SRC/dpbsv.f
index a52e783099..f50a58d00b 100644
--- a/SRC/dpbsv.f
+++ b/SRC/dpbsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPBSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpbsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpbsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,9 +117,9 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i of A is not
-*>                positive definite, so the factorization could not be
-*>                completed, and the solution has not been computed.
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                of A is not positive, so the factorization could not
+*>                be completed, and the solution has not been computed.
 *> \endverbatim
 *
 *  Authors:
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERsolve
+*> \ingroup pbsv
 *
 *> \par Further Details:
 *  =====================
@@ -161,6 +159,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DPBSV( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -191,7 +190,8 @@ SUBROUTINE DPBSV( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/dpbsvx.f b/SRC/dpbsvx.f
index 1bf526fc7f..c67e9352e3 100644
--- a/SRC/dpbsvx.f
+++ b/SRC/dpbsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPBSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpbsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpbsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -71,7 +69,7 @@
 *>    where U is an upper triangular band matrix, and L is a lower
 *>    triangular band matrix.
 *>
-*> 3. If the leading i-by-i principal minor is not positive definite,
+*> 3. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A.  If the reciprocal of the condition number is less than machine
@@ -281,10 +279,10 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO = i, and i is
-*>                <= N:  the leading minor of order i of A is
-*>                       not positive definite, so the factorization
-*>                       could not be completed, and the solution has not
-*>                       been computed. RCOND = 0 is returned.
+*>                <= N:  the leading principal minor of order i of A
+*>                       is not positive, so the factorization could not
+*>                       be completed, and the solution has not been
+*>                       computed. RCOND = 0 is returned.
 *>                = N+1: U is nonsingular, but RCOND is less than machine
 *>                       precision, meaning that the matrix is singular
 *>                       to working precision.  Nevertheless, the
@@ -302,7 +300,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERsolve
+*> \ingroup pbsvx
 *
 *> \par Further Details:
 *  =====================
@@ -337,9 +335,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
+      SUBROUTINE DPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB,
+     $                   LDAFB,
      $                   EQUED, S, B, LDB, X, LDX, RCOND, FERR, BERR,
      $                   WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -374,7 +374,8 @@ SUBROUTINE DPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
       EXTERNAL           LSAME, DLAMCH, DLANSB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLACPY, DLAQSB, DPBCON, DPBEQU, DPBRFS,
+      EXTERNAL           DCOPY, DLACPY, DLAQSB, DPBCON, DPBEQU,
+     $                   DPBRFS,
      $                   DPBTRF, DPBTRS, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -397,7 +398,9 @@ SUBROUTINE DPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
       ELSE IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
@@ -454,7 +457,8 @@ SUBROUTINE DPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
 *
 *           Equilibrate the matrix.
 *
-            CALL DLAQSB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX, EQUED )
+            CALL DLAQSB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX,
+     $                   EQUED )
             RCEQU = LSAME( EQUED, 'Y' )
          END IF
       END IF
@@ -502,7 +506,8 @@ SUBROUTINE DPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL DPBCON( UPLO, N, KD, AFB, LDAFB, ANORM, RCOND, WORK, IWORK,
+      CALL DPBCON( UPLO, N, KD, AFB, LDAFB, ANORM, RCOND, WORK,
+     $             IWORK,
      $             INFO )
 *
 *     Compute the solution matrix X.
@@ -513,7 +518,8 @@ SUBROUTINE DPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
 *     Use iterative refinement to improve the computed solution and
 *     compute error bounds and backward error estimates for it.
 *
-      CALL DPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B, LDB, X,
+      CALL DPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B, LDB,
+     $             X,
      $             LDX, FERR, BERR, WORK, IWORK, INFO )
 *
 *     Transform the solution matrix X to a solution of the original
diff --git a/SRC/dpbtf2.f b/SRC/dpbtf2.f
index 5346292944..9a477228a7 100644
--- a/SRC/dpbtf2.f
+++ b/SRC/dpbtf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPBTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpbtf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpbtf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,8 +95,8 @@
 *>          INFO is INTEGER
 *>          = 0: successful exit
 *>          < 0: if INFO = -k, the k-th argument had an illegal value
-*>          > 0: if INFO = k, the leading minor of order k is not
-*>               positive definite, and the factorization could not be
+*>          > 0: if INFO = k, the leading principal minor of order k
+*>               is not positive, and the factorization could not be
 *>               completed.
 *> \endverbatim
 *
@@ -110,7 +108,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup pbtf2
 *
 *> \par Further Details:
 *  =====================
@@ -139,6 +137,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DPBTF2( UPLO, N, KD, AB, LDAB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dpbtrf.f b/SRC/dpbtrf.f
index 8256f8938d..c2149d2c4f 100644
--- a/SRC/dpbtrf.f
+++ b/SRC/dpbtrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPBTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpbtrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpbtrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -92,8 +90,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *> \endverbatim
 *
@@ -105,7 +103,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup pbtrf
 *
 *> \par Further Details:
 *  =====================
@@ -139,6 +137,7 @@
 *
 *  =====================================================================
       SUBROUTINE DPBTRF( UPLO, N, KD, AB, LDAB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,7 +171,8 @@ SUBROUTINE DPBTRF( UPLO, N, KD, AB, LDAB, INFO )
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DPBTF2, DPOTF2, DSYRK, DTRSM, XERBLA
+      EXTERNAL           DGEMM, DPBTF2, DPOTF2, DSYRK, DTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MIN
@@ -299,7 +299,8 @@ SUBROUTINE DPBTRF( UPLO, N, KD, AB, LDAB, INFO )
 *                    Update A23
 *
                      IF( I2.GT.0 )
-     $                  CALL DGEMM( 'Transpose', 'No Transpose', I2, I3,
+     $                  CALL DGEMM( 'Transpose', 'No Transpose', I2,
+     $                              I3,
      $                              IB, -ONE, AB( KD+1-IB, I+IB ),
      $                              LDAB-1, WORK, LDWORK, ONE,
      $                              AB( 1+IB, I+KD ), LDAB-1 )
@@ -375,7 +376,8 @@ SUBROUTINE DPBTRF( UPLO, N, KD, AB, LDAB, INFO )
 *
 *                    Update A22
 *
-                     CALL DSYRK( 'Lower', 'No Transpose', I2, IB, -ONE,
+                     CALL DSYRK( 'Lower', 'No Transpose', I2, IB,
+     $                           -ONE,
      $                           AB( 1+IB, I ), LDAB-1, ONE,
      $                           AB( 1, I+IB ), LDAB-1 )
                   END IF
@@ -399,14 +401,16 @@ SUBROUTINE DPBTRF( UPLO, N, KD, AB, LDAB, INFO )
 *                    Update A32
 *
                      IF( I2.GT.0 )
-     $                  CALL DGEMM( 'No transpose', 'Transpose', I3, I2,
+     $                  CALL DGEMM( 'No transpose', 'Transpose', I3,
+     $                              I2,
      $                              IB, -ONE, WORK, LDWORK,
      $                              AB( 1+IB, I ), LDAB-1, ONE,
      $                              AB( 1+KD-IB, I+IB ), LDAB-1 )
 *
 *                    Update A33
 *
-                     CALL DSYRK( 'Lower', 'No Transpose', I3, IB, -ONE,
+                     CALL DSYRK( 'Lower', 'No Transpose', I3, IB,
+     $                           -ONE,
      $                           WORK, LDWORK, ONE, AB( 1, I+KD ),
      $                           LDAB-1 )
 *
diff --git a/SRC/dpbtrs.f b/SRC/dpbtrs.f
index 134b3b1d5c..548f9939ba 100644
--- a/SRC/dpbtrs.f
+++ b/SRC/dpbtrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPBTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpbtrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpbtrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -114,10 +112,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup pbtrs
 *
 *  =====================================================================
       SUBROUTINE DPBTRS( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -189,7 +188,8 @@ SUBROUTINE DPBTRS( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
 *
 *           Solve U*X = B, overwriting B with X.
 *
-            CALL DTBSV( 'Upper', 'No transpose', 'Non-unit', N, KD, AB,
+            CALL DTBSV( 'Upper', 'No transpose', 'Non-unit', N, KD,
+     $                  AB,
      $                  LDAB, B( 1, J ), 1 )
    10    CONTINUE
       ELSE
@@ -200,7 +200,8 @@ SUBROUTINE DPBTRS( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
 *
 *           Solve L*X = B, overwriting B with X.
 *
-            CALL DTBSV( 'Lower', 'No transpose', 'Non-unit', N, KD, AB,
+            CALL DTBSV( 'Lower', 'No transpose', 'Non-unit', N, KD,
+     $                  AB,
      $                  LDAB, B( 1, J ), 1 )
 *
 *           Solve L**T *X = B, overwriting B with X.
diff --git a/SRC/dpftrf.f b/SRC/dpftrf.f
index 980debaf24..139c1226c0 100644
--- a/SRC/dpftrf.f
+++ b/SRC/dpftrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPFTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpftrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpftrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -91,8 +89,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *> \endverbatim
 *
@@ -104,7 +102,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup pftrf
 *
 *> \par Further Details:
 *  =====================
@@ -195,6 +193,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DPFTRF( TRANSR, UPLO, N, A, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -290,7 +289,8 @@ SUBROUTINE DPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL DPOTRF( 'L', N1, A( 0 ), N, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL DTRSM( 'R', 'L', 'T', 'N', N2, N1, ONE, A( 0 ), N,
+               CALL DTRSM( 'R', 'L', 'T', 'N', N2, N1, ONE, A( 0 ),
+     $                     N,
      $                     A( N1 ), N )
                CALL DSYRK( 'U', 'N', N2, N1, -ONE, A( N1 ), N, ONE,
      $                     A( N ), N )
@@ -307,7 +307,8 @@ SUBROUTINE DPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL DPOTRF( 'L', N1, A( N2 ), N, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL DTRSM( 'L', 'L', 'N', 'N', N1, N2, ONE, A( N2 ), N,
+               CALL DTRSM( 'L', 'L', 'N', 'N', N1, N2, ONE, A( N2 ),
+     $                     N,
      $                     A( 0 ), N )
                CALL DSYRK( 'U', 'T', N2, N1, -ONE, A( 0 ), N, ONE,
      $                     A( N1 ), N )
@@ -330,9 +331,11 @@ SUBROUTINE DPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL DPOTRF( 'U', N1, A( 0 ), N1, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL DTRSM( 'L', 'U', 'T', 'N', N1, N2, ONE, A( 0 ), N1,
+               CALL DTRSM( 'L', 'U', 'T', 'N', N1, N2, ONE, A( 0 ),
+     $                     N1,
      $                     A( N1*N1 ), N1 )
-               CALL DSYRK( 'L', 'T', N2, N1, -ONE, A( N1*N1 ), N1, ONE,
+               CALL DSYRK( 'L', 'T', N2, N1, -ONE, A( N1*N1 ), N1,
+     $                     ONE,
      $                     A( 1 ), N1 )
                CALL DPOTRF( 'L', N2, A( 1 ), N1, INFO )
                IF( INFO.GT.0 )
@@ -347,7 +350,8 @@ SUBROUTINE DPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL DPOTRF( 'U', N1, A( N2*N2 ), N2, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL DTRSM( 'R', 'U', 'N', 'N', N2, N1, ONE, A( N2*N2 ),
+               CALL DTRSM( 'R', 'U', 'N', 'N', N2, N1, ONE,
+     $                     A( N2*N2 ),
      $                     N2, A( 0 ), N2 )
                CALL DSYRK( 'L', 'N', N2, N1, -ONE, A( 0 ), N2, ONE,
      $                     A( N1*N2 ), N2 )
@@ -376,7 +380,8 @@ SUBROUTINE DPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL DPOTRF( 'L', K, A( 1 ), N+1, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL DTRSM( 'R', 'L', 'T', 'N', K, K, ONE, A( 1 ), N+1,
+               CALL DTRSM( 'R', 'L', 'T', 'N', K, K, ONE, A( 1 ),
+     $                     N+1,
      $                     A( K+1 ), N+1 )
                CALL DSYRK( 'U', 'N', K, K, -ONE, A( K+1 ), N+1, ONE,
      $                     A( 0 ), N+1 )
@@ -418,7 +423,8 @@ SUBROUTINE DPFTRF( TRANSR, UPLO, N, A, INFO )
      $            RETURN
                CALL DTRSM( 'L', 'U', 'T', 'N', K, K, ONE, A( K ), N1,
      $                     A( K*( K+1 ) ), K )
-               CALL DSYRK( 'L', 'T', K, K, -ONE, A( K*( K+1 ) ), K, ONE,
+               CALL DSYRK( 'L', 'T', K, K, -ONE, A( K*( K+1 ) ), K,
+     $                     ONE,
      $                     A( 0 ), K )
                CALL DPOTRF( 'L', K, A( 0 ), K, INFO )
                IF( INFO.GT.0 )
diff --git a/SRC/dpftri.f b/SRC/dpftri.f
index dca45d32cd..e94ef9e280 100644
--- a/SRC/dpftri.f
+++ b/SRC/dpftri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPFTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpftri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpftri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,7 +95,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup pftri
 *
 *> \par Further Details:
 *  =====================
@@ -188,6 +186,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DPFTRI( TRANSR, UPLO, N, A, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -215,7 +214,8 @@ SUBROUTINE DPFTRI( TRANSR, UPLO, N, A, INFO )
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, DTFTRI, DLAUUM, DTRMM, DSYRK
+      EXTERNAL           XERBLA, DTFTRI, DLAUUM, DTRMM,
+     $                   DSYRK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MOD
@@ -290,7 +290,8 @@ SUBROUTINE DPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL DLAUUM( 'L', N1, A( 0 ), N, INFO )
                CALL DSYRK( 'L', 'T', N1, N2, ONE, A( N1 ), N, ONE,
      $                     A( 0 ), N )
-               CALL DTRMM( 'L', 'U', 'N', 'N', N2, N1, ONE, A( N ), N,
+               CALL DTRMM( 'L', 'U', 'N', 'N', N2, N1, ONE, A( N ),
+     $                     N,
      $                     A( N1 ), N )
                CALL DLAUUM( 'U', N2, A( N ), N, INFO )
 *
@@ -303,7 +304,8 @@ SUBROUTINE DPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL DLAUUM( 'L', N1, A( N2 ), N, INFO )
                CALL DSYRK( 'L', 'N', N1, N2, ONE, A( 0 ), N, ONE,
      $                     A( N2 ), N )
-               CALL DTRMM( 'R', 'U', 'T', 'N', N1, N2, ONE, A( N1 ), N,
+               CALL DTRMM( 'R', 'U', 'T', 'N', N1, N2, ONE, A( N1 ),
+     $                     N,
      $                     A( 0 ), N )
                CALL DLAUUM( 'U', N2, A( N1 ), N, INFO )
 *
@@ -319,9 +321,11 @@ SUBROUTINE DPFTRI( TRANSR, UPLO, N, A, INFO )
 *              T1 -> a(0), T2 -> a(1), S -> a(0+N1*N1)
 *
                CALL DLAUUM( 'U', N1, A( 0 ), N1, INFO )
-               CALL DSYRK( 'U', 'N', N1, N2, ONE, A( N1*N1 ), N1, ONE,
+               CALL DSYRK( 'U', 'N', N1, N2, ONE, A( N1*N1 ), N1,
+     $                     ONE,
      $                     A( 0 ), N1 )
-               CALL DTRMM( 'R', 'L', 'N', 'N', N1, N2, ONE, A( 1 ), N1,
+               CALL DTRMM( 'R', 'L', 'N', 'N', N1, N2, ONE, A( 1 ),
+     $                     N1,
      $                     A( N1*N1 ), N1 )
                CALL DLAUUM( 'L', N2, A( 1 ), N1, INFO )
 *
@@ -333,7 +337,8 @@ SUBROUTINE DPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL DLAUUM( 'U', N1, A( N2*N2 ), N2, INFO )
                CALL DSYRK( 'U', 'T', N1, N2, ONE, A( 0 ), N2, ONE,
      $                     A( N2*N2 ), N2 )
-               CALL DTRMM( 'L', 'L', 'T', 'N', N2, N1, ONE, A( N1*N2 ),
+               CALL DTRMM( 'L', 'L', 'T', 'N', N2, N1, ONE,
+     $                     A( N1*N2 ),
      $                     N2, A( 0 ), N2 )
                CALL DLAUUM( 'L', N2, A( N1*N2 ), N2, INFO )
 *
@@ -358,7 +363,8 @@ SUBROUTINE DPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL DLAUUM( 'L', K, A( 1 ), N+1, INFO )
                CALL DSYRK( 'L', 'T', K, K, ONE, A( K+1 ), N+1, ONE,
      $                     A( 1 ), N+1 )
-               CALL DTRMM( 'L', 'U', 'N', 'N', K, K, ONE, A( 0 ), N+1,
+               CALL DTRMM( 'L', 'U', 'N', 'N', K, K, ONE, A( 0 ),
+     $                     N+1,
      $                     A( K+1 ), N+1 )
                CALL DLAUUM( 'U', K, A( 0 ), N+1, INFO )
 *
@@ -371,7 +377,8 @@ SUBROUTINE DPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL DLAUUM( 'L', K, A( K+1 ), N+1, INFO )
                CALL DSYRK( 'L', 'N', K, K, ONE, A( 0 ), N+1, ONE,
      $                     A( K+1 ), N+1 )
-               CALL DTRMM( 'R', 'U', 'T', 'N', K, K, ONE, A( K ), N+1,
+               CALL DTRMM( 'R', 'U', 'T', 'N', K, K, ONE, A( K ),
+     $                     N+1,
      $                     A( 0 ), N+1 )
                CALL DLAUUM( 'U', K, A( K ), N+1, INFO )
 *
@@ -388,7 +395,8 @@ SUBROUTINE DPFTRI( TRANSR, UPLO, N, A, INFO )
 *              T1 -> a(0+k), T2 -> a(0+0), S -> a(0+k*(k+1)); lda=k
 *
                CALL DLAUUM( 'U', K, A( K ), K, INFO )
-               CALL DSYRK( 'U', 'N', K, K, ONE, A( K*( K+1 ) ), K, ONE,
+               CALL DSYRK( 'U', 'N', K, K, ONE, A( K*( K+1 ) ), K,
+     $                     ONE,
      $                     A( K ), K )
                CALL DTRMM( 'R', 'L', 'N', 'N', K, K, ONE, A( 0 ), K,
      $                     A( K*( K+1 ) ), K )
@@ -403,7 +411,8 @@ SUBROUTINE DPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL DLAUUM( 'U', K, A( K*( K+1 ) ), K, INFO )
                CALL DSYRK( 'U', 'T', K, K, ONE, A( 0 ), K, ONE,
      $                     A( K*( K+1 ) ), K )
-               CALL DTRMM( 'L', 'L', 'T', 'N', K, K, ONE, A( K*K ), K,
+               CALL DTRMM( 'L', 'L', 'T', 'N', K, K, ONE, A( K*K ),
+     $                     K,
      $                     A( 0 ), K )
                CALL DLAUUM( 'L', K, A( K*K ), K, INFO )
 *
diff --git a/SRC/dpftrs.f b/SRC/dpftrs.f
index adbe677a4a..c2f163a1d0 100644
--- a/SRC/dpftrs.f
+++ b/SRC/dpftrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPFTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpftrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpftrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -105,7 +103,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup pftrs
 *
 *> \par Further Details:
 *  =====================
@@ -196,6 +194,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DPFTRS( TRANSR, UPLO, N, NRHS, A, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dpocon.f b/SRC/dpocon.f
index 4cdc010da2..e84881dfea 100644
--- a/SRC/dpocon.f
+++ b/SRC/dpocon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPOCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpocon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpocon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,11 +111,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePOcomputational
+*> \ingroup pocon
 *
 *  =====================================================================
       SUBROUTINE DPOCON( UPLO, N, A, LDA, ANORM, RCOND, WORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -203,25 +202,29 @@ SUBROUTINE DPOCON( UPLO, N, A, LDA, ANORM, RCOND, WORK, IWORK,
 *
 *           Multiply by inv(U**T).
 *
-            CALL DLATRS( 'Upper', 'Transpose', 'Non-unit', NORMIN, N, A,
+            CALL DLATRS( 'Upper', 'Transpose', 'Non-unit', NORMIN, N,
+     $                   A,
      $                   LDA, WORK, SCALEL, WORK( 2*N+1 ), INFO )
             NORMIN = 'Y'
 *
 *           Multiply by inv(U).
 *
-            CALL DLATRS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL DLATRS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   A, LDA, WORK, SCALEU, WORK( 2*N+1 ), INFO )
          ELSE
 *
 *           Multiply by inv(L).
 *
-            CALL DLATRS( 'Lower', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL DLATRS( 'Lower', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   A, LDA, WORK, SCALEL, WORK( 2*N+1 ), INFO )
             NORMIN = 'Y'
 *
 *           Multiply by inv(L**T).
 *
-            CALL DLATRS( 'Lower', 'Transpose', 'Non-unit', NORMIN, N, A,
+            CALL DLATRS( 'Lower', 'Transpose', 'Non-unit', NORMIN, N,
+     $                   A,
      $                   LDA, WORK, SCALEU, WORK( 2*N+1 ), INFO )
          END IF
 *
diff --git a/SRC/dpoequ.f b/SRC/dpoequ.f
index c6223a6e51..e795cccf6b 100644
--- a/SRC/dpoequ.f
+++ b/SRC/dpoequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPOEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpoequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpoequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -105,10 +103,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePOcomputational
+*> \ingroup poequ
 *
 *  =====================================================================
       SUBROUTINE DPOEQU( N, A, LDA, S, SCOND, AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dpoequb.f b/SRC/dpoequb.f
index 0706834a10..3bb719769f 100644
--- a/SRC/dpoequb.f
+++ b/SRC/dpoequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPOEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpoequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpoequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -111,10 +109,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePOcomputational
+*> \ingroup poequb
 *
 *  =====================================================================
       SUBROUTINE DPOEQUB( N, A, LDA, S, SCOND, AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dporfs.f b/SRC/dporfs.f
index 4b4a209373..3d3cb57314 100644
--- a/SRC/dporfs.f
+++ b/SRC/dporfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPORFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dporfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dporfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -175,11 +173,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePOcomputational
+*> \ingroup porfs
 *
 *  =====================================================================
       SUBROUTINE DPORFS( UPLO, N, NRHS, A, LDA, AF, LDAF, B, LDB, X,
      $                   LDX, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -218,7 +217,8 @@ SUBROUTINE DPORFS( UPLO, N, NRHS, A, LDA, AF, LDAF, B, LDB, X,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DLACN2, DPOTRS, DSYMV, XERBLA
+      EXTERNAL           DAXPY, DCOPY, DLACN2, DPOTRS, DSYMV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -386,14 +386,16 @@ SUBROUTINE DPORFS( UPLO, N, NRHS, A, LDA, AF, LDAF, B, LDB, X,
 *
          KASE = 0
   100    CONTINUE
-         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
 *
 *              Multiply by diag(W)*inv(A**T).
 *
-               CALL DPOTRS( UPLO, N, 1, AF, LDAF, WORK( N+1 ), N, INFO )
+               CALL DPOTRS( UPLO, N, 1, AF, LDAF, WORK( N+1 ), N,
+     $                      INFO )
                DO 110 I = 1, N
                   WORK( N+I ) = WORK( I )*WORK( N+I )
   110          CONTINUE
@@ -404,7 +406,8 @@ SUBROUTINE DPORFS( UPLO, N, NRHS, A, LDA, AF, LDAF, B, LDB, X,
                DO 120 I = 1, N
                   WORK( N+I ) = WORK( I )*WORK( N+I )
   120          CONTINUE
-               CALL DPOTRS( UPLO, N, 1, AF, LDAF, WORK( N+1 ), N, INFO )
+               CALL DPOTRS( UPLO, N, 1, AF, LDAF, WORK( N+1 ), N,
+     $                      INFO )
             END IF
             GO TO 100
          END IF
diff --git a/SRC/dporfsx.f b/SRC/dporfsx.f
index a7937f0dce..a2549e125a 100644
--- a/SRC/dporfsx.f
+++ b/SRC/dporfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPORFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dporfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dporfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -384,13 +382,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePOcomputational
+*> \ingroup porfsx
 *
 *  =====================================================================
-      SUBROUTINE DPORFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, S, B,
+      SUBROUTINE DPORFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, S,
+     $                    B,
      $                    LDB, X, LDX, RCOND, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -595,7 +595,8 @@ SUBROUTINE DPORFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, S, B,
      $        INFO )
       END IF
 
-      ERR_LBND = MAX( 10.0D+0, SQRT( DBLE( N ) ) ) * DLAMCH( 'Epsilon' )
+      ERR_LBND = MAX( 10.0D+0,
+     $                SQRT( DBLE( N ) ) ) * DLAMCH( 'Epsilon' )
       IF ( N_ERR_BNDS .GE. 1 .AND. N_NORMS .GE. 1 ) THEN
 *
 *     Compute scaled normwise condition number cond(A*C).
diff --git a/SRC/dposv.f b/SRC/dposv.f
index ee2988e6fd..2660ac1eef 100644
--- a/SRC/dposv.f
+++ b/SRC/dposv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPOSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dposv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dposv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -110,9 +108,9 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i of A is not
-*>                positive definite, so the factorization could not be
-*>                completed, and the solution has not been computed.
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                of A is not positive, so the factorization could not
+*>                be completed, and the solution has not been computed.
 *> \endverbatim
 *
 *  Authors:
@@ -123,10 +121,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePOsolve
+*> \ingroup posv
 *
 *  =====================================================================
       SUBROUTINE DPOSV( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -157,7 +156,8 @@ SUBROUTINE DPOSV( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/dposvx.f b/SRC/dposvx.f
index 4a0b9d605f..1360664ccb 100644
--- a/SRC/dposvx.f
+++ b/SRC/dposvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPOSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dposvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dposvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -71,7 +69,7 @@
 *>    where U is an upper triangular matrix and L is a lower triangular
 *>    matrix.
 *>
-*> 3. If the leading i-by-i principal minor is not positive definite,
+*> 3. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A.  If the reciprocal of the condition number is less than machine
@@ -277,10 +275,10 @@
 *>          = 0: successful exit
 *>          < 0: if INFO = -i, the i-th argument had an illegal value
 *>          > 0: if INFO = i, and i is
-*>                <= N:  the leading minor of order i of A is
-*>                       not positive definite, so the factorization
-*>                       could not be completed, and the solution has not
-*>                       been computed. RCOND = 0 is returned.
+*>                <= N:  the leading principal minor of order i of A
+*>                       is not positive, so the factorization could not
+*>                       be completed, and the solution has not been
+*>                       computed. RCOND = 0 is returned.
 *>                = N+1: U is nonsingular, but RCOND is less than machine
 *>                       precision, meaning that the matrix is singular
 *>                       to working precision.  Nevertheless, the
@@ -298,12 +296,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePOsolve
+*> \ingroup posvx
 *
 *  =====================================================================
-      SUBROUTINE DPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
+      SUBROUTINE DPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF,
+     $                   EQUED,
      $                   S, B, LDB, X, LDX, RCOND, FERR, BERR, WORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -338,7 +338,8 @@ SUBROUTINE DPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
       EXTERNAL           LSAME, DLAMCH, DLANSY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLACPY, DLAQSY, DPOCON, DPOEQU, DPORFS, DPOTRF,
+      EXTERNAL           DLACPY, DLAQSY, DPOCON, DPOEQU, DPORFS,
+     $                   DPOTRF,
      $                   DPOTRS, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -360,10 +361,13 @@ SUBROUTINE DPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -452,7 +456,8 @@ SUBROUTINE DPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL DPOCON( UPLO, N, AF, LDAF, ANORM, RCOND, WORK, IWORK, INFO )
+      CALL DPOCON( UPLO, N, AF, LDAF, ANORM, RCOND, WORK, IWORK,
+     $             INFO )
 *
 *     Compute the solution matrix X.
 *
diff --git a/SRC/dposvxx.f b/SRC/dposvxx.f
index e74b23c80f..f508c37e8d 100644
--- a/SRC/dposvxx.f
+++ b/SRC/dposvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPOSVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dposvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dposvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,7 +86,7 @@
 *>    where U is an upper triangular matrix and L is a lower triangular
 *>    matrix.
 *>
-*>    3. If the leading i-by-i principal minor is not positive definite,
+*>    3. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A (see argument RCOND).  If the reciprocal of the condition number
@@ -484,13 +482,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePOsolve
+*> \ingroup posvxx
 *
 *  =====================================================================
-      SUBROUTINE DPOSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
+      SUBROUTINE DPOSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF,
+     $                    EQUED,
      $                    S, B, LDB, X, LDX, RCOND, RPVGRW, BERR,
      $                    N_ERR_BNDS, ERR_BNDS_NORM, ERR_BNDS_COMP,
      $                    NPARAMS, PARAMS, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -537,7 +537,8 @@ SUBROUTINE DPOSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
       DOUBLE PRECISION   DLAMCH, DLA_PORPVGRW
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DPOEQUB, DPOTRF, DPOTRS, DLACPY, DLAQSY,
+      EXTERNAL           DPOEQUB, DPOTRF, DPOTRS, DLACPY,
+     $                   DLAQSY,
      $                   XERBLA, DLASCL2, DPORFSX
 *     ..
 *     .. Intrinsic Functions ..
@@ -645,7 +646,8 @@ SUBROUTINE DPOSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
 *           Compute the reciprocal pivot growth factor of the
 *           leading rank-deficient INFO columns of A.
 *
-            RPVGRW = DLA_PORPVGRW( UPLO, INFO, A, LDA, AF, LDAF, WORK )
+            RPVGRW = DLA_PORPVGRW( UPLO, INFO, A, LDA, AF, LDAF,
+     $                             WORK )
             RETURN
          ENDIF
       END IF
diff --git a/SRC/dpotf2.f b/SRC/dpotf2.f
index 08fa4957fd..6337967389 100644
--- a/SRC/dpotf2.f
+++ b/SRC/dpotf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPOTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpotf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpotf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -89,8 +87,8 @@
 *>          INFO is INTEGER
 *>          = 0: successful exit
 *>          < 0: if INFO = -k, the k-th argument had an illegal value
-*>          > 0: if INFO = k, the leading minor of order k is not
-*>               positive definite, and the factorization could not be
+*>          > 0: if INFO = k, the leading principal minor of order k
+*>               is not positive, and the factorization could not be
 *>               completed.
 *> \endverbatim
 *
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePOcomputational
+*> \ingroup potf2
 *
 *  =====================================================================
       SUBROUTINE DPOTF2( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -208,7 +207,8 @@ SUBROUTINE DPOTF2( UPLO, N, A, LDA, INFO )
 *           Compute elements J+1:N of column J.
 *
             IF( J.LT.N ) THEN
-               CALL DGEMV( 'No transpose', N-J, J-1, -ONE, A( J+1, 1 ),
+               CALL DGEMV( 'No transpose', N-J, J-1, -ONE, A( J+1,
+     $                     1 ),
      $                     LDA, A( J, 1 ), LDA, ONE, A( J+1, J ), 1 )
                CALL DSCAL( N-J, ONE / AJJ, A( J+1, J ), 1 )
             END IF
diff --git a/SRC/dpotrf.f b/SRC/dpotrf.f
index 1679fc3cd8..fecbbef2bb 100644
--- a/SRC/dpotrf.f
+++ b/SRC/dpotrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPOTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpotrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpotrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -87,8 +85,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *> \endverbatim
 *
@@ -100,10 +98,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePOcomputational
+*> \ingroup potrf
 *
 *  =====================================================================
       SUBROUTINE DPOTRF( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -133,7 +132,8 @@ SUBROUTINE DPOTRF( UPLO, N, A, LDA, INFO )
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DPOTRF2, DSYRK, DTRSM, XERBLA
+      EXTERNAL           DGEMM, DPOTRF2, DSYRK, DTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -192,10 +192,12 @@ SUBROUTINE DPOTRF( UPLO, N, A, LDA, INFO )
 *
 *                 Compute the current block row.
 *
-                  CALL DGEMM( 'Transpose', 'No transpose', JB, N-J-JB+1,
+                  CALL DGEMM( 'Transpose', 'No transpose', JB,
+     $                        N-J-JB+1,
      $                        J-1, -ONE, A( 1, J ), LDA, A( 1, J+JB ),
      $                        LDA, ONE, A( J, J+JB ), LDA )
-                  CALL DTRSM( 'Left', 'Upper', 'Transpose', 'Non-unit',
+                  CALL DTRSM( 'Left', 'Upper', 'Transpose',
+     $                        'Non-unit',
      $                        JB, N-J-JB+1, ONE, A( J, J ), LDA,
      $                        A( J, J+JB ), LDA )
                END IF
@@ -220,10 +222,12 @@ SUBROUTINE DPOTRF( UPLO, N, A, LDA, INFO )
 *
 *                 Compute the current block column.
 *
-                  CALL DGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
+                  CALL DGEMM( 'No transpose', 'Transpose', N-J-JB+1,
+     $                        JB,
      $                        J-1, -ONE, A( J+JB, 1 ), LDA, A( J, 1 ),
      $                        LDA, ONE, A( J+JB, J ), LDA )
-                  CALL DTRSM( 'Right', 'Lower', 'Transpose', 'Non-unit',
+                  CALL DTRSM( 'Right', 'Lower', 'Transpose',
+     $                        'Non-unit',
      $                        N-J-JB+1, JB, ONE, A( J, J ), LDA,
      $                        A( J+JB, J ), LDA )
                END IF
diff --git a/SRC/dpotrf2.f b/SRC/dpotrf2.f
index 6c28ce6d67..fe389926e5 100644
--- a/SRC/dpotrf2.f
+++ b/SRC/dpotrf2.f
@@ -86,8 +86,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *> \endverbatim
 *
@@ -99,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePOcomputational
+*> \ingroup potrf2
 *
 *  =====================================================================
       RECURSIVE SUBROUTINE DPOTRF2( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dpotri.f b/SRC/dpotri.f
index 7daa0c8c43..54a5380a57 100644
--- a/SRC/dpotri.f
+++ b/SRC/dpotri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPOTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpotri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpotri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,10 +86,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePOcomputational
+*> \ingroup potri
 *
 *  =====================================================================
       SUBROUTINE DPOTRI( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -122,7 +121,8 @@ SUBROUTINE DPOTRI( UPLO, N, A, LDA, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/dpotrs.f b/SRC/dpotrs.f
index 862ee078fd..f72030e802 100644
--- a/SRC/dpotrs.f
+++ b/SRC/dpotrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPOTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpotrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpotrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -103,10 +101,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePOcomputational
+*> \ingroup potrs
 *
 *  =====================================================================
       SUBROUTINE DPOTRS( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,7 +171,8 @@ SUBROUTINE DPOTRS( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
 *
 *        Solve U**T *X = B, overwriting B with X.
 *
-         CALL DTRSM( 'Left', 'Upper', 'Transpose', 'Non-unit', N, NRHS,
+         CALL DTRSM( 'Left', 'Upper', 'Transpose', 'Non-unit', N,
+     $               NRHS,
      $               ONE, A, LDA, B, LDB )
 *
 *        Solve U*X = B, overwriting B with X.
@@ -190,7 +190,8 @@ SUBROUTINE DPOTRS( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
 *
 *        Solve L**T *X = B, overwriting B with X.
 *
-         CALL DTRSM( 'Left', 'Lower', 'Transpose', 'Non-unit', N, NRHS,
+         CALL DTRSM( 'Left', 'Lower', 'Transpose', 'Non-unit', N,
+     $               NRHS,
      $               ONE, A, LDA, B, LDB )
       END IF
 *
diff --git a/SRC/dppcon.f b/SRC/dppcon.f
index 3e3112929a..02ba55cc88 100644
--- a/SRC/dppcon.f
+++ b/SRC/dppcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPPCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dppcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dppcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -111,10 +109,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup ppcon
 *
 *  =====================================================================
-      SUBROUTINE DPPCON( UPLO, N, AP, ANORM, RCOND, WORK, IWORK, INFO )
+      SUBROUTINE DPPCON( UPLO, N, AP, ANORM, RCOND, WORK, IWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -204,13 +204,15 @@ SUBROUTINE DPPCON( UPLO, N, AP, ANORM, RCOND, WORK, IWORK, INFO )
 *
 *           Multiply by inv(U).
 *
-            CALL DLATPS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL DLATPS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   AP, WORK, SCALEU, WORK( 2*N+1 ), INFO )
          ELSE
 *
 *           Multiply by inv(L).
 *
-            CALL DLATPS( 'Lower', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL DLATPS( 'Lower', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   AP, WORK, SCALEL, WORK( 2*N+1 ), INFO )
             NORMIN = 'Y'
 *
diff --git a/SRC/dppequ.f b/SRC/dppequ.f
index c99a71e454..4c1179f3b3 100644
--- a/SRC/dppequ.f
+++ b/SRC/dppequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPPEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dppequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dppequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -109,10 +107,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup ppequ
 *
 *  =====================================================================
       SUBROUTINE DPPEQU( UPLO, N, AP, S, SCOND, AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dpprfs.f b/SRC/dpprfs.f
index d547cb2efd..e05a5f40cd 100644
--- a/SRC/dpprfs.f
+++ b/SRC/dpprfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPPRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpprfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpprfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,11 +161,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup pprfs
 *
 *  =====================================================================
-      SUBROUTINE DPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
+      SUBROUTINE DPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX,
+     $                   FERR,
      $                   BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -206,7 +206,8 @@ SUBROUTINE DPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DLACN2, DPPTRS, DSPMV, XERBLA
+      EXTERNAL           DAXPY, DCOPY, DLACN2, DPPTRS, DSPMV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -269,7 +270,8 @@ SUBROUTINE DPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
 *        Compute residual R = B - A * X
 *
          CALL DCOPY( N, B( 1, J ), 1, WORK( N+1 ), 1 )
-         CALL DSPMV( UPLO, N, -ONE, AP, X( 1, J ), 1, ONE, WORK( N+1 ),
+         CALL DSPMV( UPLO, N, -ONE, AP, X( 1, J ), 1, ONE,
+     $               WORK( N+1 ),
      $               1 )
 *
 *        Compute componentwise relative backward error from formula
@@ -377,7 +379,8 @@ SUBROUTINE DPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
 *
          KASE = 0
   100    CONTINUE
-         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
diff --git a/SRC/dppsv.f b/SRC/dppsv.f
index 435703b08c..abb353d498 100644
--- a/SRC/dppsv.f
+++ b/SRC/dppsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPPSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dppsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dppsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -104,9 +102,9 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i of A is not
-*>                positive definite, so the factorization could not be
-*>                completed, and the solution has not been computed.
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                of A is not positive, so the factorization could not
+*>                be completed, and the solution has not been computed.
 *> \endverbatim
 *
 *  Authors:
@@ -117,7 +115,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERsolve
+*> \ingroup ppsv
 *
 *> \par Further Details:
 *  =====================
@@ -141,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DPPSV( UPLO, N, NRHS, AP, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,7 +170,8 @@ SUBROUTINE DPPSV( UPLO, N, NRHS, AP, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/dppsvx.f b/SRC/dppsvx.f
index cb41d39ee1..a9131f813b 100644
--- a/SRC/dppsvx.f
+++ b/SRC/dppsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPPSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dppsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dppsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -69,7 +67,7 @@
 *>    where U is an upper triangular matrix and L is a lower triangular
 *>    matrix.
 *>
-*> 3. If the leading i-by-i principal minor is not positive definite,
+*> 3. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A.  If the reciprocal of the condition number is less than machine
@@ -262,10 +260,10 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO = i, and i is
-*>                <= N:  the leading minor of order i of A is
-*>                       not positive definite, so the factorization
-*>                       could not be completed, and the solution has not
-*>                       been computed. RCOND = 0 is returned.
+*>                <= N:  the leading principal minor of order i of A
+*>                       is not positive, so the factorization could not
+*>                       be completed, and the solution has not been
+*>                       computed. RCOND = 0 is returned.
 *>                = N+1: U is nonsingular, but RCOND is less than machine
 *>                       precision, meaning that the matrix is singular
 *>                       to working precision.  Nevertheless, the
@@ -283,7 +281,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERsolve
+*> \ingroup ppsvx
 *
 *> \par Further Details:
 *  =====================
@@ -306,8 +304,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B, LDB,
+      SUBROUTINE DPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B,
+     $                   LDB,
      $                   X, LDX, RCOND, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -341,7 +341,8 @@ SUBROUTINE DPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B, LDB,
       EXTERNAL           LSAME, DLAMCH, DLANSP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLACPY, DLAQSP, DPPCON, DPPEQU, DPPRFS,
+      EXTERNAL           DCOPY, DLACPY, DLAQSP, DPPCON, DPPEQU,
+     $                   DPPRFS,
      $                   DPPTRF, DPPTRS, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -363,10 +364,13 @@ SUBROUTINE DPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B, LDB,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -461,7 +465,8 @@ SUBROUTINE DPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B, LDB,
 *     Use iterative refinement to improve the computed solution and
 *     compute error bounds and backward error estimates for it.
 *
-      CALL DPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR, BERR,
+      CALL DPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
+     $             BERR,
      $             WORK, IWORK, INFO )
 *
 *     Transform the solution matrix X to a solution of the original
diff --git a/SRC/dpptrf.f b/SRC/dpptrf.f
index 2d8de5110f..c606a7a9dc 100644
--- a/SRC/dpptrf.f
+++ b/SRC/dpptrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPPTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpptrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpptrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -79,8 +77,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *> \endverbatim
 *
@@ -92,7 +90,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup pptrf
 *
 *> \par Further Details:
 *  =====================
@@ -116,6 +114,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DPPTRF( UPLO, N, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dpptri.f b/SRC/dpptri.f
index 1f7d14a774..b46494f82b 100644
--- a/SRC/dpptri.f
+++ b/SRC/dpptri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPPTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpptri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpptri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -86,10 +84,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup pptri
 *
 *  =====================================================================
       SUBROUTINE DPPTRI( UPLO, N, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dpptrs.f b/SRC/dpptrs.f
index c5b8eb9911..97f82aa072 100644
--- a/SRC/dpptrs.f
+++ b/SRC/dpptrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPPTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpptrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpptrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup pptrs
 *
 *  =====================================================================
       SUBROUTINE DPPTRS( UPLO, N, NRHS, AP, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dpstf2.f b/SRC/dpstf2.f
index 8055fa9825..3deeaac58c 100644
--- a/SRC/dpstf2.f
+++ b/SRC/dpstf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPSTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpstf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpstf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -134,10 +132,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup pstf2
 *
 *  =====================================================================
-      SUBROUTINE DPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
+      SUBROUTINE DPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -272,7 +272,8 @@ SUBROUTINE DPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
                IF( PVT.LT.N )
      $            CALL DSWAP( N-PVT, A( J, PVT+1 ), LDA,
      $                        A( PVT, PVT+1 ), LDA )
-               CALL DSWAP( PVT-J-1, A( J, J+1 ), LDA, A( J+1, PVT ), 1 )
+               CALL DSWAP( PVT-J-1, A( J, J+1 ), LDA, A( J+1, PVT ),
+     $                     1 )
 *
 *              Swap dot products and PIV
 *
@@ -333,9 +334,11 @@ SUBROUTINE DPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
                A( PVT, PVT ) = A( J, J )
                CALL DSWAP( J-1, A( J, 1 ), LDA, A( PVT, 1 ), LDA )
                IF( PVT.LT.N )
-     $            CALL DSWAP( N-PVT, A( PVT+1, J ), 1, A( PVT+1, PVT ),
+     $            CALL DSWAP( N-PVT, A( PVT+1, J ), 1, A( PVT+1,
+     $                        PVT ),
      $                        1 )
-               CALL DSWAP( PVT-J-1, A( J+1, J ), 1, A( PVT, J+1 ), LDA )
+               CALL DSWAP( PVT-J-1, A( J+1, J ), 1, A( PVT, J+1 ),
+     $                     LDA )
 *
 *              Swap dot products and PIV
 *
@@ -353,7 +356,8 @@ SUBROUTINE DPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *           Compute elements J+1:N of column J
 *
             IF( J.LT.N ) THEN
-               CALL DGEMV( 'No Trans', N-J, J-1, -ONE, A( J+1, 1 ), LDA,
+               CALL DGEMV( 'No Trans', N-J, J-1, -ONE, A( J+1, 1 ),
+     $                     LDA,
      $                     A( J, 1 ), LDA, ONE, A( J+1, J ), 1 )
                CALL DSCAL( N-J, ONE / AJJ, A( J+1, J ), 1 )
             END IF
diff --git a/SRC/dpstrf.f b/SRC/dpstrf.f
index 9987cde574..62bf795536 100644
--- a/SRC/dpstrf.f
+++ b/SRC/dpstrf.f
@@ -6,7 +6,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPSTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpstrf.f">
 *> [TGZ]</a>
@@ -14,7 +13,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpstrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,10 +133,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup pstrf
 *
 *  =====================================================================
-      SUBROUTINE DPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
+      SUBROUTINE DPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,7 +172,8 @@ SUBROUTINE DPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
       EXTERNAL           DLAMCH, ILAENV, LSAME, DISNAN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMV, DPSTF2, DSCAL, DSWAP, DSYRK, XERBLA
+      EXTERNAL           DGEMV, DPSTF2, DSCAL, DSWAP, DSYRK,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN, SQRT, MAXLOC
@@ -314,7 +315,8 @@ SUBROUTINE DPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *                 Compute elements J+1:N of row J.
 *
                   IF( J.LT.N ) THEN
-                     CALL DGEMV( 'Trans', J-K, N-J, -ONE, A( K, J+1 ),
+                     CALL DGEMV( 'Trans', J-K, N-J, -ONE, A( K,
+     $                           J+1 ),
      $                           LDA, A( K, J ), 1, ONE, A( J, J+1 ),
      $                           LDA )
                      CALL DSCAL( N-J, ONE / AJJ, A( J, J+1 ), LDA )
@@ -378,11 +380,13 @@ SUBROUTINE DPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *                    Pivot OK, so can now swap pivot rows and columns
 *
                      A( PVT, PVT ) = A( J, J )
-                     CALL DSWAP( J-1, A( J, 1 ), LDA, A( PVT, 1 ), LDA )
+                     CALL DSWAP( J-1, A( J, 1 ), LDA, A( PVT, 1 ),
+     $                           LDA )
                      IF( PVT.LT.N )
      $                  CALL DSWAP( N-PVT, A( PVT+1, J ), 1,
      $                              A( PVT+1, PVT ), 1 )
-                     CALL DSWAP( PVT-J-1, A( J+1, J ), 1, A( PVT, J+1 ),
+                     CALL DSWAP( PVT-J-1, A( J+1, J ), 1, A( PVT,
+     $                           J+1 ),
      $                           LDA )
 *
 *                    Swap dot products and PIV
diff --git a/SRC/dptcon.f b/SRC/dptcon.f
index f619064163..9bdf2f7957 100644
--- a/SRC/dptcon.f
+++ b/SRC/dptcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPTCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dptcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dptcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,7 +99,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePTcomputational
+*> \ingroup ptcon
 *
 *> \par Further Details:
 *  =====================
@@ -115,6 +113,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DPTCON( N, D, E, ANORM, RCOND, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dpteqr.f b/SRC/dpteqr.f
index aa1f1a80c8..b1016d5634 100644
--- a/SRC/dpteqr.f
+++ b/SRC/dpteqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPTEQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpteqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpteqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,8 +121,8 @@
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value.
 *>          > 0:  if INFO = i, and i is:
 *>                <= N  the Cholesky factorization of the matrix could
-*>                      not be performed because the i-th principal minor
-*>                      was not positive definite.
+*>                      not be performed because the leading principal
+*>                      minor of order i was not positive.
 *>                > N   the SVD algorithm failed to converge;
 *>                      if INFO = N+i, i off-diagonal elements of the
 *>                      bidiagonal factor did not converge to zero.
@@ -138,10 +136,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePTcomputational
+*> \ingroup pteqr
 *
 *  =====================================================================
       SUBROUTINE DPTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dptrfs.f b/SRC/dptrfs.f
index c3486dbb63..62df79b51d 100644
--- a/SRC/dptrfs.f
+++ b/SRC/dptrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPTRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dptrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dptrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -155,11 +153,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePTcomputational
+*> \ingroup ptrfs
 *
 *  =====================================================================
       SUBROUTINE DPTRFS( N, NRHS, D, E, DF, EF, B, LDB, X, LDX, FERR,
      $                   BERR, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dptsv.f b/SRC/dptsv.f
index addc34b882..5e6988f6fc 100644
--- a/SRC/dptsv.f
+++ b/SRC/dptsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPTSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dptsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dptsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -93,8 +91,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the solution has not been
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the solution has not been
 *>                computed.  The factorization has not been completed
 *>                unless i = N.
 *> \endverbatim
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePTsolve
+*> \ingroup ptsv
 *
 *  =====================================================================
       SUBROUTINE DPTSV( N, NRHS, D, E, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dptsvx.f b/SRC/dptsvx.f
index 7fb6cf4365..848fa7f2d0 100644
--- a/SRC/dptsvx.f
+++ b/SRC/dptsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPTSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dptsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dptsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -59,7 +57,7 @@
 *>    factorization can also be regarded as having the form
 *>    A = U**T*D*U.
 *>
-*> 2. If the leading i-by-i principal minor is not positive definite,
+*> 2. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A.  If the reciprocal of the condition number is less than machine
@@ -199,10 +197,10 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO = i, and i is
-*>                <= N:  the leading minor of order i of A is
-*>                       not positive definite, so the factorization
-*>                       could not be completed, and the solution has not
-*>                       been computed. RCOND = 0 is returned.
+*>                <= N:  the leading principal minor of order i of A
+*>                       is not positive, so the factorization could not
+*>                       be completed, and the solution has not been
+*>                       computed. RCOND = 0 is returned.
 *>                = N+1: U is nonsingular, but RCOND is less than machine
 *>                       precision, meaning that the matrix is singular
 *>                       to working precision.  Nevertheless, the
@@ -220,11 +218,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePTsolve
+*> \ingroup ptsvx
 *
 *  =====================================================================
       SUBROUTINE DPTSVX( FACT, N, NRHS, D, E, DF, EF, B, LDB, X, LDX,
      $                   RCOND, FERR, BERR, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -257,7 +256,8 @@ SUBROUTINE DPTSVX( FACT, N, NRHS, D, E, DF, EF, B, LDB, X, LDX,
       EXTERNAL           LSAME, DLAMCH, DLANST
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLACPY, DPTCON, DPTRFS, DPTTRF, DPTTRS,
+      EXTERNAL           DCOPY, DLACPY, DPTCON, DPTRFS, DPTTRF,
+     $                   DPTTRS,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
diff --git a/SRC/dpttrf.f b/SRC/dpttrf.f
index e0022e3ada..59dd4b57b7 100644
--- a/SRC/dpttrf.f
+++ b/SRC/dpttrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPTTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpttrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpttrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -70,8 +68,8 @@
 *>          INFO is INTEGER
 *>          = 0: successful exit
 *>          < 0: if INFO = -k, the k-th argument had an illegal value
-*>          > 0: if INFO = k, the leading minor of order k is not
-*>               positive definite; if k < N, the factorization could not
+*>          > 0: if INFO = k, the leading principal minor of order k
+*>               is not positive; if k < N, the factorization could not
 *>               be completed, while if k = N, the factorization was
 *>               completed, but D(N) <= 0.
 *> \endverbatim
@@ -84,10 +82,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePTcomputational
+*> \ingroup pttrf
 *
 *  =====================================================================
       SUBROUTINE DPTTRF( N, D, E, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dpttrs.f b/SRC/dpttrs.f
index c98f700300..1a94d84467 100644
--- a/SRC/dpttrs.f
+++ b/SRC/dpttrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPTTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dpttrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dpttrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePTcomputational
+*> \ingroup pttrs
 *
 *  =====================================================================
       SUBROUTINE DPTTRS( N, NRHS, D, E, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dptts2.f b/SRC/dptts2.f
index 2fec1515fc..334b54e6cb 100644
--- a/SRC/dptts2.f
+++ b/SRC/dptts2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DPTTS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dptts2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dptts2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,10 +93,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePTcomputational
+*> \ingroup ptts2
 *
 *  =====================================================================
       SUBROUTINE DPTTS2( N, NRHS, D, E, B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/drscl.f b/SRC/drscl.f
index fcd8569650..2fcdf32343 100644
--- a/SRC/drscl.f
+++ b/SRC/drscl.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DRSCL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/drscl.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/drscl.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -77,10 +75,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup rscl
 *
 *  =====================================================================
       SUBROUTINE DRSCL( N, SA, SX, INCX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -109,7 +108,7 @@ SUBROUTINE DRSCL( N, SA, SX, INCX )
       EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSCAL, DLABAD
+      EXTERNAL           DSCAL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS
@@ -125,7 +124,6 @@ SUBROUTINE DRSCL( N, SA, SX, INCX )
 *
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Initialize the denominator to SA and the numerator to 1.
 *
diff --git a/SRC/dsb2st_kernels.f b/SRC/dsb2st_kernels.f
index 683d7a24e3..4fa1ae9096 100644
--- a/SRC/dsb2st_kernels.f
+++ b/SRC/dsb2st_kernels.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSB2ST_KERNELS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsb2st_kernels.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsb2st_kernels.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,6 +161,8 @@
 *>
 *> \endverbatim
 *>
+*> \ingroup hb2st_kernels
+*>
 *  =====================================================================
       SUBROUTINE  DSB2ST_KERNELS( UPLO, WANTZ, TTYPE,
      $                            ST, ED, SWEEP, N, NB, IB,
@@ -285,7 +285,8 @@ SUBROUTINE  DSB2ST_KERNELS( UPLO, WANTZ, TTYPE,
                       A( DPOS-NB-I, J1+I ) = ZERO
    30             CONTINUE
                   CTMP = ( A( DPOS-NB, J1 ) )
-                  CALL DLARFG( LM, CTMP, V( VPOS+1 ), 1, TAU( TAUPOS ) )
+                  CALL DLARFG( LM, CTMP, V( VPOS+1 ), 1,
+     $                         TAU( TAUPOS ) )
                   A( DPOS-NB, J1 ) = CTMP
 *
                   CALL DLARFX( 'Right', LN-1, LM, V( VPOS ),
diff --git a/SRC/dsbev.f b/SRC/dsbev.f
index a323dd4b5e..6dbf94170b 100644
--- a/SRC/dsbev.f
+++ b/SRC/dsbev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSBEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsbev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsbev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -138,11 +136,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup hbev
 *
 *  =====================================================================
       SUBROUTINE DSBEV( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -174,7 +173,8 @@ SUBROUTINE DSBEV( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       EXTERNAL           LSAME, DLAMCH, DLANSB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLASCL, DSBTRD, DSCAL, DSTEQR, DSTERF, XERBLA
+      EXTERNAL           DLASCL, DSBTRD, DSCAL, DSTEQR, DSTERF,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          SQRT
@@ -244,9 +244,11 @@ SUBROUTINE DSBEV( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL DLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL DLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL DLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL DLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
       END IF
 *
@@ -254,7 +256,8 @@ SUBROUTINE DSBEV( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
 *
       INDE = 1
       INDWRK = INDE + N
-      CALL DSBTRD( JOBZ, UPLO, N, KD, AB, LDAB, W, WORK( INDE ), Z, LDZ,
+      CALL DSBTRD( JOBZ, UPLO, N, KD, AB, LDAB, W, WORK( INDE ), Z,
+     $             LDZ,
      $             WORK( INDWRK ), IINFO )
 *
 *     For eigenvalues only, call DSTERF.  For eigenvectors, call SSTEQR.
@@ -262,7 +265,8 @@ SUBROUTINE DSBEV( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       IF( .NOT.WANTZ ) THEN
          CALL DSTERF( N, W, WORK( INDE ), INFO )
       ELSE
-         CALL DSTEQR( JOBZ, N, W, WORK( INDE ), Z, LDZ, WORK( INDWRK ),
+         CALL DSTEQR( JOBZ, N, W, WORK( INDE ), Z, LDZ,
+     $                WORK( INDWRK ),
      $                INFO )
       END IF
 *
diff --git a/SRC/dsbev_2stage.f b/SRC/dsbev_2stage.f
index 84143fc4a7..d873e29089 100644
--- a/SRC/dsbev_2stage.f
+++ b/SRC/dsbev_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSBEV_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsbev_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsbev_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -131,7 +129,7 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = (2KD+1)*N + KD*NTHREADS + N
@@ -164,7 +162,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup hbev_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -182,7 +180,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -190,16 +188,17 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE DSBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
+      SUBROUTINE DSBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z,
+     $                         LDZ,
      $                         WORK, LWORK, INFO )
 *
       IMPLICIT NONE
@@ -236,8 +235,9 @@ SUBROUTINE DSBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       EXTERNAL           LSAME, DLAMCH, DLANSB, ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLASCL, DSCAL, DSTEQR, DSTERF, XERBLA,
-     $                   DSYTRD_SB2ST 
+      EXTERNAL           DLASCL, DSCAL, DSTEQR, DSTERF,
+     $                   XERBLA,
+     $                   DSYTRD_SB2ST
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          SQRT
@@ -329,9 +329,11 @@ SUBROUTINE DSBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL DLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL DLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL DLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL DLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
       END IF
 *
@@ -343,7 +345,7 @@ SUBROUTINE DSBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       LLWORK  = LWORK - INDWRK + 1
 *
       CALL DSYTRD_SB2ST( "N", JOBZ, UPLO, N, KD, AB, LDAB, W,
-     $                    WORK( INDE ), WORK( INDHOUS ), LHTRD, 
+     $                    WORK( INDE ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWRK ), LLWORK, IINFO )
 *
 *     For eigenvalues only, call DSTERF.  For eigenvectors, call SSTEQR.
@@ -351,7 +353,8 @@ SUBROUTINE DSBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       IF( .NOT.WANTZ ) THEN
          CALL DSTERF( N, W, WORK( INDE ), INFO )
       ELSE
-         CALL DSTEQR( JOBZ, N, W, WORK( INDE ), Z, LDZ, WORK( INDWRK ),
+         CALL DSTEQR( JOBZ, N, W, WORK( INDE ), Z, LDZ,
+     $                WORK( INDWRK ),
      $                INFO )
       END IF
 *
diff --git a/SRC/dsbevd.f b/SRC/dsbevd.f
index 3eb4ed8df1..c4e3b0fb58 100644
--- a/SRC/dsbevd.f
+++ b/SRC/dsbevd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSBEVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsbevd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsbevd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -40,12 +38,6 @@
 *> a real symmetric band matrix A. If eigenvectors are desired, it uses
 *> a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -185,11 +177,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup hbevd
 *
 *  =====================================================================
-      SUBROUTINE DSBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
+      SUBROUTINE DSBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
+     $                   WORK,
      $                   LWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,7 +217,8 @@ SUBROUTINE DSBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       EXTERNAL           LSAME, DLAMCH, DLANSB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DLACPY, DLASCL, DSBTRD, DSCAL, DSTEDC,
+      EXTERNAL           DGEMM, DLACPY, DLASCL, DSBTRD, DSCAL,
+     $                   DSTEDC,
      $                   DSTERF, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -316,9 +311,11 @@ SUBROUTINE DSBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL DLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL DLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL DLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL DLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
       END IF
 *
@@ -328,7 +325,8 @@ SUBROUTINE DSBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       INDWRK = INDE + N
       INDWK2 = INDWRK + N*N
       LLWRK2 = LWORK - INDWK2 + 1
-      CALL DSBTRD( JOBZ, UPLO, N, KD, AB, LDAB, W, WORK( INDE ), Z, LDZ,
+      CALL DSBTRD( JOBZ, UPLO, N, KD, AB, LDAB, W, WORK( INDE ), Z,
+     $             LDZ,
      $             WORK( INDWRK ), IINFO )
 *
 *     For eigenvalues only, call DSTERF.  For eigenvectors, call SSTEDC.
@@ -338,7 +336,8 @@ SUBROUTINE DSBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       ELSE
          CALL DSTEDC( 'I', N, W, WORK( INDE ), WORK( INDWRK ), N,
      $                WORK( INDWK2 ), LLWRK2, IWORK, LIWORK, INFO )
-         CALL DGEMM( 'N', 'N', N, N, N, ONE, Z, LDZ, WORK( INDWRK ), N,
+         CALL DGEMM( 'N', 'N', N, N, N, ONE, Z, LDZ, WORK( INDWRK ),
+     $               N,
      $               ZERO, WORK( INDWK2 ), N )
          CALL DLACPY( 'A', N, N, WORK( INDWK2 ), N, Z, LDZ )
       END IF
diff --git a/SRC/dsbevd_2stage.f b/SRC/dsbevd_2stage.f
index 45a64b4781..c7bf0c4f19 100644
--- a/SRC/dsbevd_2stage.f
+++ b/SRC/dsbevd_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSBEVD_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsbevd_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsbevd_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -45,12 +43,6 @@
 *> the reduction to tridiagonal. If eigenvectors are desired, it uses
 *> a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -140,7 +132,7 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = (2KD+1)*N + KD*NTHREADS + N
@@ -194,7 +186,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup hbevd_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -212,7 +204,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -220,16 +212,17 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE DSBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
+      SUBROUTINE DSBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z,
+     $                          LDZ,
      $                          WORK, LWORK, IWORK, LIWORK, INFO )
 *
       IMPLICIT NONE
@@ -268,7 +261,8 @@ SUBROUTINE DSBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       EXTERNAL           LSAME, DLAMCH, DLANSB, ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DLACPY, DLASCL, DSCAL, DSTEDC,
+      EXTERNAL           DGEMM, DLACPY, DLASCL, DSCAL,
+     $                   DSTEDC,
      $                   DSTERF, XERBLA, DSYTRD_SB2ST
 *     ..
 *     .. Intrinsic Functions ..
@@ -287,9 +281,12 @@ SUBROUTINE DSBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
          LIWMIN = 1
          LWMIN = 1
       ELSE
-         IB    = ILAENV2STAGE( 2, 'DSYTRD_SB2ST', JOBZ, N, KD, -1, -1 )
-         LHTRD = ILAENV2STAGE( 3, 'DSYTRD_SB2ST', JOBZ, N, KD, IB, -1 )
-         LWTRD = ILAENV2STAGE( 4, 'DSYTRD_SB2ST', JOBZ, N, KD, IB, -1 )
+         IB    = ILAENV2STAGE( 2, 'DSYTRD_SB2ST', JOBZ, N, KD, -1,
+     $                         -1 )
+         LHTRD = ILAENV2STAGE( 3, 'DSYTRD_SB2ST', JOBZ, N, KD, IB,
+     $                         -1 )
+         LWTRD = ILAENV2STAGE( 4, 'DSYTRD_SB2ST', JOBZ, N, KD, IB,
+     $                         -1 )
          IF( WANTZ ) THEN
             LIWMIN = 3 + 5*N
             LWMIN = 1 + 5*N + 2*N**2
@@ -364,9 +361,11 @@ SUBROUTINE DSBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL DLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL DLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL DLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL DLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
       END IF
 *
@@ -380,7 +379,7 @@ SUBROUTINE DSBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       LLWRK2  = LWORK - INDWK2 + 1
 *
       CALL DSYTRD_SB2ST( "N", JOBZ, UPLO, N, KD, AB, LDAB, W,
-     $                    WORK( INDE ), WORK( INDHOUS ), LHTRD, 
+     $                    WORK( INDE ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWRK ), LLWORK, IINFO )
 *
 *     For eigenvalues only, call DSTERF.  For eigenvectors, call SSTEDC.
@@ -390,7 +389,8 @@ SUBROUTINE DSBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       ELSE
          CALL DSTEDC( 'I', N, W, WORK( INDE ), WORK( INDWRK ), N,
      $                WORK( INDWK2 ), LLWRK2, IWORK, LIWORK, INFO )
-         CALL DGEMM( 'N', 'N', N, N, N, ONE, Z, LDZ, WORK( INDWRK ), N,
+         CALL DGEMM( 'N', 'N', N, N, N, ONE, Z, LDZ, WORK( INDWRK ),
+     $               N,
      $               ZERO, WORK( INDWK2 ), N )
          CALL DLACPY( 'A', N, N, WORK( INDWK2 ), N, Z, LDZ )
       END IF
diff --git a/SRC/dsbevx.f b/SRC/dsbevx.f
index c5886a2d6a..c53e3bbb01 100644
--- a/SRC/dsbevx.f
+++ b/SRC/dsbevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSBEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsbevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsbevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -256,12 +254,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup hbevx
 *
 *  =====================================================================
-      SUBROUTINE DSBEVX( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q, LDQ, VL,
+      SUBROUTINE DSBEVX( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q, LDQ,
+     $                   VL,
      $                   VU, IL, IU, ABSTOL, M, W, Z, LDZ, WORK, IWORK,
      $                   IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -299,7 +299,8 @@ SUBROUTINE DSBEVX( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q, LDQ, VL,
       EXTERNAL           LSAME, DLAMCH, DLANSB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEMV, DLACPY, DLASCL, DSBTRD, DSCAL,
+      EXTERNAL           DCOPY, DGEMV, DLACPY, DLASCL, DSBTRD,
+     $                   DSCAL,
      $                   DSTEBZ, DSTEIN, DSTEQR, DSTERF, DSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -407,9 +408,11 @@ SUBROUTINE DSBEVX( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q, LDQ, VL,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL DLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL DLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL DLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL DLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
          IF( ABSTOL.GT.0 )
      $      ABSTLL = ABSTOL*SIGMA
diff --git a/SRC/dsbevx_2stage.f b/SRC/dsbevx_2stage.f
index b57eee29f1..a43816916b 100644
--- a/SRC/dsbevx_2stage.f
+++ b/SRC/dsbevx_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSBEVX_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsbevx_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsbevx_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -235,7 +233,7 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, 7*N, dimension) where
 *>                                   dimension = (2KD+1)*N + KD*NTHREADS + 2*N
@@ -281,7 +279,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup hbevx_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -299,7 +297,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -307,16 +305,17 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE DSBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q,
+      SUBROUTINE DSBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB,
+     $                          Q,
      $                          LDQ, VL, VU, IL, IU, ABSTOL, M, W, Z,
      $                          LDZ, WORK, LWORK, IWORK, IFAIL, INFO )
 *
@@ -361,7 +360,8 @@ SUBROUTINE DSBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q,
       EXTERNAL           LSAME, DLAMCH, DLANSB, ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEMV, DLACPY, DLASCL, DSCAL,
+      EXTERNAL           DCOPY, DGEMV, DLACPY, DLASCL,
+     $                   DSCAL,
      $                   DSTEBZ, DSTEIN, DSTEQR, DSTERF, DSWAP, XERBLA,
      $                   DSYTRD_SB2ST
 *     ..
@@ -492,9 +492,11 @@ SUBROUTINE DSBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL DLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL DLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL DLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL DLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
          IF( ABSTOL.GT.0 )
      $      ABSTLL = ABSTOL*SIGMA
@@ -512,8 +514,9 @@ SUBROUTINE DSBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q,
       INDWRK  = INDHOUS + LHTRD
       LLWORK  = LWORK - INDWRK + 1
 *
-      CALL DSYTRD_SB2ST( "N", JOBZ, UPLO, N, KD, AB, LDAB, WORK( INDD ),
-     $                    WORK( INDE ), WORK( INDHOUS ), LHTRD, 
+      CALL DSYTRD_SB2ST( "N", JOBZ, UPLO, N, KD, AB, LDAB,
+     $                   WORK( INDD ),
+     $                    WORK( INDE ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWRK ), LLWORK, IINFO )
 *
 *     If all eigenvalues are desired and ABSTOL is less than or equal
diff --git a/SRC/dsbgst.f b/SRC/dsbgst.f
index 10500b8c5d..1881e110ab 100644
--- a/SRC/dsbgst.f
+++ b/SRC/dsbgst.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSBGST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsbgst.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsbgst.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,11 +149,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup hbgst
 *
 *  =====================================================================
-      SUBROUTINE DSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
+      SUBROUTINE DSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB,
+     $                   X,
      $                   LDX, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -187,7 +187,8 @@ SUBROUTINE DSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGER, DLAR2V, DLARGV, DLARTG, DLARTV, DLASET,
+      EXTERNAL           DGER, DLAR2V, DLARGV, DLARTG, DLARTV,
+     $                   DLASET,
      $                   DROT, DSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -427,7 +428,8 @@ SUBROUTINE DSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *           have been created outside the band
 *
             IF( NRT.GT.0 )
-     $         CALL DLARGV( NRT, AB( 1, J2T ), INCA, WORK( J2T-M ), KA1,
+     $         CALL DLARGV( NRT, AB( 1, J2T ), INCA, WORK( J2T-M ),
+     $                      KA1,
      $                      WORK( N+J2T-M ), KA1 )
             IF( NR.GT.0 ) THEN
 *
@@ -651,7 +653,8 @@ SUBROUTINE DSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *
 *                 generate rotation to annihilate a(i-k+ka+1,i)
 *
-                  CALL DLARTG( AB( KA1-K, I ), RA1, WORK( N+I-K+KA-M ),
+                  CALL DLARTG( AB( KA1-K, I ), RA1,
+     $                         WORK( N+I-K+KA-M ),
      $                         WORK( I-K+KA-M ), RA )
 *
 *                 create nonzero element a(i-k+ka+1,i-k) outside the
@@ -687,7 +690,8 @@ SUBROUTINE DSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *           have been created outside the band
 *
             IF( NRT.GT.0 )
-     $         CALL DLARGV( NRT, AB( KA1, J2T-KA ), INCA, WORK( J2T-M ),
+     $         CALL DLARGV( NRT, AB( KA1, J2T-KA ), INCA,
+     $                      WORK( J2T-M ),
      $                      KA1, WORK( N+J2T-M ), KA1 )
             IF( NR.GT.0 ) THEN
 *
@@ -702,7 +706,8 @@ SUBROUTINE DSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              apply rotations in 1st set from both sides to diagonal
 *              blocks
 *
-               CALL DLAR2V( NR, AB( 1, J2 ), AB( 1, J2+1 ), AB( 2, J2 ),
+               CALL DLAR2V( NR, AB( 1, J2 ), AB( 1, J2+1 ), AB( 2,
+     $                      J2 ),
      $                      INCA, WORK( N+J2-M ), WORK( J2-M ), KA1 )
 *
             END IF
@@ -783,7 +788,8 @@ SUBROUTINE DSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              generate rotations in 2nd set to annihilate elements
 *              which have been created outside the band
 *
-               CALL DLARGV( NR, AB( KA1, J2-KA ), INCA, WORK( J2 ), KA1,
+               CALL DLARGV( NR, AB( KA1, J2-KA ), INCA, WORK( J2 ),
+     $                      KA1,
      $                      WORK( N+J2 ), KA1 )
 *
 *              apply rotations in 2nd set from the left
@@ -797,7 +803,8 @@ SUBROUTINE DSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              apply rotations in 2nd set from both sides to diagonal
 *              blocks
 *
-               CALL DLAR2V( NR, AB( 1, J2 ), AB( 1, J2+1 ), AB( 2, J2 ),
+               CALL DLAR2V( NR, AB( 1, J2 ), AB( 1, J2+1 ), AB( 2,
+     $                      J2 ),
      $                      INCA, WORK( N+J2 ), WORK( J2 ), KA1 )
 *
             END IF
@@ -936,7 +943,8 @@ SUBROUTINE DSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *
                CALL DSCAL( NX, ONE / BII, X( 1, I ), 1 )
                IF( KBT.GT.0 )
-     $            CALL DGER( NX, KBT, -ONE, X( 1, I ), 1, BB( KB, I+1 ),
+     $            CALL DGER( NX, KBT, -ONE, X( 1, I ), 1, BB( KB,
+     $                       I+1 ),
      $                       LDBB-1, X( 1, I+1 ), LDX )
             END IF
 *
@@ -994,7 +1002,8 @@ SUBROUTINE DSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *           have been created outside the band
 *
             IF( NRT.GT.0 )
-     $         CALL DLARGV( NRT, AB( 1, J1+KA ), INCA, WORK( J1 ), KA1,
+     $         CALL DLARGV( NRT, AB( 1, J1+KA ), INCA, WORK( J1 ),
+     $                      KA1,
      $                      WORK( N+J1 ), KA1 )
             IF( NR.GT.0 ) THEN
 *
@@ -1094,7 +1103,8 @@ SUBROUTINE DSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              generate rotations in 2nd set to annihilate elements
 *              which have been created outside the band
 *
-               CALL DLARGV( NR, AB( 1, J1+KA ), INCA, WORK( M-KB+J1 ),
+               CALL DLARGV( NR, AB( 1, J1+KA ), INCA,
+     $                      WORK( M-KB+J1 ),
      $                      KA1, WORK( N+M-KB+J1 ), KA1 )
 *
 *              apply rotations in 2nd set from the left
@@ -1200,7 +1210,8 @@ SUBROUTINE DSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *
                CALL DSCAL( NX, ONE / BII, X( 1, I ), 1 )
                IF( KBT.GT.0 )
-     $            CALL DGER( NX, KBT, -ONE, X( 1, I ), 1, BB( 2, I ), 1,
+     $            CALL DGER( NX, KBT, -ONE, X( 1, I ), 1, BB( 2, I ),
+     $                       1,
      $                       X( 1, I+1 ), LDX )
             END IF
 *
@@ -1258,14 +1269,16 @@ SUBROUTINE DSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *           have been created outside the band
 *
             IF( NRT.GT.0 )
-     $         CALL DLARGV( NRT, AB( KA1, J1 ), INCA, WORK( J1 ), KA1,
+     $         CALL DLARGV( NRT, AB( KA1, J1 ), INCA, WORK( J1 ),
+     $                      KA1,
      $                      WORK( N+J1 ), KA1 )
             IF( NR.GT.0 ) THEN
 *
 *              apply rotations in 1st set from the right
 *
                DO 810 L = 1, KA - 1
-                  CALL DLARTV( NR, AB( L+1, J1 ), INCA, AB( L+2, J1-1 ),
+                  CALL DLARTV( NR, AB( L+1, J1 ), INCA, AB( L+2,
+     $                         J1-1 ),
      $                         INCA, WORK( N+J1 ), WORK( J1 ), KA1 )
   810          CONTINUE
 *
@@ -1363,7 +1376,8 @@ SUBROUTINE DSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              apply rotations in 2nd set from the right
 *
                DO 890 L = 1, KA - 1
-                  CALL DLARTV( NR, AB( L+1, J1 ), INCA, AB( L+2, J1-1 ),
+                  CALL DLARTV( NR, AB( L+1, J1 ), INCA, AB( L+2,
+     $                         J1-1 ),
      $                         INCA, WORK( N+M-KB+J1 ), WORK( M-KB+J1 ),
      $                         KA1 )
   890          CONTINUE
diff --git a/SRC/dsbgv.f b/SRC/dsbgv.f
index b49df0063e..4da2c1bb1a 100644
--- a/SRC/dsbgv.f
+++ b/SRC/dsbgv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSBGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsbgv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsbgv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -169,11 +167,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup hbgv
 *
 *  =====================================================================
-      SUBROUTINE DSBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W, Z,
+      SUBROUTINE DSBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
+     $                  Z,
      $                  LDZ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -200,7 +200,8 @@ SUBROUTINE DSBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W, Z,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DPBSTF, DSBGST, DSBTRD, DSTEQR, DSTERF, XERBLA
+      EXTERNAL           DPBSTF, DSBGST, DSBTRD, DSTEQR, DSTERF,
+     $                   XERBLA
 *     ..
 *     .. Executable Statements ..
 *
@@ -228,7 +229,7 @@ SUBROUTINE DSBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W, Z,
          INFO = -12
       END IF
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'DSBGV ', -INFO )
+         CALL XERBLA( 'DSBGV', -INFO )
          RETURN
       END IF
 *
@@ -259,7 +260,8 @@ SUBROUTINE DSBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W, Z,
       ELSE
          VECT = 'N'
       END IF
-      CALL DSBTRD( VECT, UPLO, N, KA, AB, LDAB, W, WORK( INDE ), Z, LDZ,
+      CALL DSBTRD( VECT, UPLO, N, KA, AB, LDAB, W, WORK( INDE ), Z,
+     $             LDZ,
      $             WORK( INDWRK ), IINFO )
 *
 *     For eigenvalues only, call DSTERF.  For eigenvectors, call SSTEQR.
@@ -267,7 +269,8 @@ SUBROUTINE DSBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W, Z,
       IF( .NOT.WANTZ ) THEN
          CALL DSTERF( N, W, WORK( INDE ), INFO )
       ELSE
-         CALL DSTEQR( JOBZ, N, W, WORK( INDE ), Z, LDZ, WORK( INDWRK ),
+         CALL DSTEQR( JOBZ, N, W, WORK( INDE ), Z, LDZ,
+     $                WORK( INDWRK ),
      $                INFO )
       END IF
       RETURN
diff --git a/SRC/dsbgvd.f b/SRC/dsbgvd.f
index 30b0166110..ed16ca2d24 100644
--- a/SRC/dsbgvd.f
+++ b/SRC/dsbgvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSBGVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsbgvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsbgvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -43,12 +41,6 @@
 *> banded, and B is also positive definite.  If eigenvectors are
 *> desired, it uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -214,7 +206,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup hbgvd
 *
 *> \par Contributors:
 *  ==================
@@ -222,8 +214,10 @@
 *>     Mark Fahey, Department of Mathematics, Univ. of Kentucky, USA
 *
 *  =====================================================================
-      SUBROUTINE DSBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
+      SUBROUTINE DSBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB,
+     $                   W,
      $                   Z, LDZ, WORK, LWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -256,7 +250,8 @@ SUBROUTINE DSBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DLACPY, DPBSTF, DSBGST, DSBTRD, DSTEDC,
+      EXTERNAL           DGEMM, DLACPY, DPBSTF, DSBGST, DSBTRD,
+     $                   DSTEDC,
      $                   DSTERF, XERBLA
 *     ..
 *     .. Executable Statements ..
@@ -344,7 +339,8 @@ SUBROUTINE DSBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
       ELSE
          VECT = 'N'
       END IF
-      CALL DSBTRD( VECT, UPLO, N, KA, AB, LDAB, W, WORK( INDE ), Z, LDZ,
+      CALL DSBTRD( VECT, UPLO, N, KA, AB, LDAB, W, WORK( INDE ), Z,
+     $             LDZ,
      $             WORK( INDWRK ), IINFO )
 *
 *     For eigenvalues only, call DSTERF. For eigenvectors, call SSTEDC.
@@ -354,7 +350,8 @@ SUBROUTINE DSBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
       ELSE
          CALL DSTEDC( 'I', N, W, WORK( INDE ), WORK( INDWRK ), N,
      $                WORK( INDWK2 ), LLWRK2, IWORK, LIWORK, INFO )
-         CALL DGEMM( 'N', 'N', N, N, N, ONE, Z, LDZ, WORK( INDWRK ), N,
+         CALL DGEMM( 'N', 'N', N, N, N, ONE, Z, LDZ, WORK( INDWRK ),
+     $               N,
      $               ZERO, WORK( INDWK2 ), N )
          CALL DLACPY( 'A', N, N, WORK( INDWK2 ), N, Z, LDZ )
       END IF
diff --git a/SRC/dsbgvx.f b/SRC/dsbgvx.f
index 55dbce2eef..9d44acf897 100644
--- a/SRC/dsbgvx.f
+++ b/SRC/dsbgvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSBGVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsbgvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsbgvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -267,7 +265,7 @@
 *>                  Their indices are stored in IFAIL.
 *>          > N:  DPBSTF returned an error code; i.e.,
 *>                if INFO = N + i, for 1 <= i <= N, then the leading
-*>                minor of order i of B is not positive definite.
+*>                principal minor of order i of B is not positive.
 *>                The factorization of B could not be completed and
 *>                no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -280,7 +278,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup hbgvx
 *
 *> \par Contributors:
 *  ==================
@@ -291,6 +289,7 @@
       SUBROUTINE DSBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
      $                   LDBB, Q, LDQ, VL, VU, IL, IU, ABSTOL, M, W, Z,
      $                   LDZ, WORK, IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -317,7 +316,7 @@ SUBROUTINE DSBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
 *     .. Local Scalars ..
       LOGICAL            ALLEIG, INDEIG, TEST, UPPER, VALEIG, WANTZ
       CHARACTER          ORDER, VECT
-      INTEGER            I, IINFO, INDD, INDE, INDEE, INDIBL, INDISP,
+      INTEGER            I, IINFO, INDD, INDE, INDEE, INDISP,
      $                   INDIWO, INDWRK, ITMP1, J, JJ, NSPLIT
       DOUBLE PRECISION   TMP1
 *     ..
@@ -326,7 +325,8 @@ SUBROUTINE DSBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEMV, DLACPY, DPBSTF, DSBGST, DSBTRD,
+      EXTERNAL           DCOPY, DGEMV, DLACPY, DPBSTF, DSBGST,
+     $                   DSBTRD,
      $                   DSTEBZ, DSTEIN, DSTEQR, DSTERF, DSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -457,17 +457,16 @@ SUBROUTINE DSBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
       ELSE
          ORDER = 'E'
       END IF
-      INDIBL = 1
-      INDISP = INDIBL + N
+      INDISP = 1 + N
       INDIWO = INDISP + N
       CALL DSTEBZ( RANGE, ORDER, N, VL, VU, IL, IU, ABSTOL,
      $             WORK( INDD ), WORK( INDE ), M, NSPLIT, W,
-     $             IWORK( INDIBL ), IWORK( INDISP ), WORK( INDWRK ),
+     $             IWORK( 1 ), IWORK( INDISP ), WORK( INDWRK ),
      $             IWORK( INDIWO ), INFO )
 *
       IF( WANTZ ) THEN
          CALL DSTEIN( N, WORK( INDD ), WORK( INDE ), M, W,
-     $                IWORK( INDIBL ), IWORK( INDISP ), Z, LDZ,
+     $                IWORK( 1 ), IWORK( INDISP ), Z, LDZ,
      $                WORK( INDWRK ), IWORK( INDIWO ), IFAIL, INFO )
 *
 *        Apply transformation matrix used in reduction to tridiagonal
@@ -497,11 +496,11 @@ SUBROUTINE DSBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
    40       CONTINUE
 *
             IF( I.NE.0 ) THEN
-               ITMP1 = IWORK( INDIBL+I-1 )
+               ITMP1 = IWORK( 1 + I-1 )
                W( I ) = W( J )
-               IWORK( INDIBL+I-1 ) = IWORK( INDIBL+J-1 )
+               IWORK( 1 + I-1 ) = IWORK( 1 + J-1 )
                W( J ) = TMP1
-               IWORK( INDIBL+J-1 ) = ITMP1
+               IWORK( 1 + J-1 ) = ITMP1
                CALL DSWAP( N, Z( 1, I ), 1, Z( 1, J ), 1 )
                IF( INFO.NE.0 ) THEN
                   ITMP1 = IFAIL( I )
diff --git a/SRC/dsbtrd.f b/SRC/dsbtrd.f
index 28b8d73955..c321f6c12b 100644
--- a/SRC/dsbtrd.f
+++ b/SRC/dsbtrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSBTRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsbtrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsbtrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -147,7 +145,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup hbtrd
 *
 *> \par Further Details:
 *  =====================
@@ -160,6 +158,7 @@
 *  =====================================================================
       SUBROUTINE DSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,7 +187,8 @@ SUBROUTINE DSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
       DOUBLE PRECISION   TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLAR2V, DLARGV, DLARTG, DLARTV, DLASET, DROT,
+      EXTERNAL           DLAR2V, DLARGV, DLARTG, DLARTV, DLASET,
+     $                   DROT,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -270,7 +270,8 @@ SUBROUTINE DSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
 *                    generate plane rotations to annihilate nonzero
 *                    elements which have been created outside the band
 *
-                     CALL DLARGV( NR, AB( 1, J1-1 ), INCA, WORK( J1 ),
+                     CALL DLARGV( NR, AB( 1, J1-1 ), INCA,
+     $                            WORK( J1 ),
      $                            KD1, D( J1 ), KD1 )
 *
 *                    apply rotations from the right
@@ -341,7 +342,8 @@ SUBROUTINE DSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                               NRT = NR
                            END IF
                            IF( NRT.GT.0 )
-     $                        CALL DLARTV( NRT, AB( KD-L, J1+L ), INCA,
+     $                        CALL DLARTV( NRT, AB( KD-L, J1+L ),
+     $                                     INCA,
      $                                     AB( KD-L+1, J1+L ), INCA,
      $                                     D( J1 ), WORK( J1 ), KD1 )
    30                   CONTINUE
@@ -349,7 +351,8 @@ SUBROUTINE DSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                         J1END = J1 + KD1*( NR-2 )
                         IF( J1END.GE.J1 ) THEN
                            DO 40 JIN = J1, J1END, KD1
-                              CALL DROT( KD-1, AB( KD-1, JIN+1 ), INCX,
+                              CALL DROT( KD-1, AB( KD-1, JIN+1 ),
+     $                                   INCX,
      $                                   AB( KD, JIN+1 ), INCX,
      $                                   D( JIN ), WORK( JIN ) )
    40                      CONTINUE
@@ -384,13 +387,15 @@ SUBROUTINE DSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                            IQB = MAX( 1, J-IBL )
                            NQ = 1 + IQAEND - IQB
                            IQAEND = MIN( IQAEND+KD, IQEND )
-                           CALL DROT( NQ, Q( IQB, J-1 ), 1, Q( IQB, J ),
+                           CALL DROT( NQ, Q( IQB, J-1 ), 1, Q( IQB,
+     $                                J ),
      $                                1, D( J ), WORK( J ) )
    50                   CONTINUE
                      ELSE
 *
                         DO 60 J = J1, J2, KD1
-                           CALL DROT( N, Q( 1, J-1 ), 1, Q( 1, J ), 1,
+                           CALL DROT( N, Q( 1, J-1 ), 1, Q( 1, J ),
+     $                                1,
      $                                D( J ), WORK( J ) )
    60                   CONTINUE
                      END IF
@@ -473,7 +478,8 @@ SUBROUTINE DSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
 *
                      IF( NR.GT.2*KD-1 ) THEN
                         DO 130 L = 1, KD - 1
-                           CALL DLARTV( NR, AB( KD1-L, J1-KD1+L ), INCA,
+                           CALL DLARTV( NR, AB( KD1-L, J1-KD1+L ),
+     $                                  INCA,
      $                                  AB( KD1-L+1, J1-KD1+L ), INCA,
      $                                  D( J1 ), WORK( J1 ), KD1 )
   130                   CONTINUE
@@ -531,7 +537,8 @@ SUBROUTINE DSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                               NRT = NR
                            END IF
                            IF( NRT.GT.0 )
-     $                        CALL DLARTV( NRT, AB( L+2, J1-1 ), INCA,
+     $                        CALL DLARTV( NRT, AB( L+2, J1-1 ),
+     $                                     INCA,
      $                                     AB( L+1, J1 ), INCA, D( J1 ),
      $                                     WORK( J1 ), KD1 )
   150                   CONTINUE
@@ -576,13 +583,15 @@ SUBROUTINE DSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                            IQB = MAX( 1, J-IBL )
                            NQ = 1 + IQAEND - IQB
                            IQAEND = MIN( IQAEND+KD, IQEND )
-                           CALL DROT( NQ, Q( IQB, J-1 ), 1, Q( IQB, J ),
+                           CALL DROT( NQ, Q( IQB, J-1 ), 1, Q( IQB,
+     $                                J ),
      $                                1, D( J ), WORK( J ) )
   170                   CONTINUE
                      ELSE
 *
                         DO 180 J = J1, J2, KD1
-                           CALL DROT( N, Q( 1, J-1 ), 1, Q( 1, J ), 1,
+                           CALL DROT( N, Q( 1, J-1 ), 1, Q( 1, J ),
+     $                                1,
      $                                D( J ), WORK( J ) )
   180                   CONTINUE
                      END IF
diff --git a/SRC/dsfrk.f b/SRC/dsfrk.f
index e1b9b89bb1..d63c3367a3 100644
--- a/SRC/dsfrk.f
+++ b/SRC/dsfrk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSFRK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsfrk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsfrk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -158,11 +156,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup hfrk
 *
 *  =====================================================================
-      SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
+      SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA,
+     $                  BETA,
      $                  C )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -282,9 +282,11 @@ SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL DSYRK( 'L', 'N', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 1 ), N )
-                  CALL DSYRK( 'U', 'N', N2, K, ALPHA, A( N1+1, 1 ), LDA,
+                  CALL DSYRK( 'U', 'N', N2, K, ALPHA, A( N1+1, 1 ),
+     $                        LDA,
      $                        BETA, C( N+1 ), N )
-                  CALL DGEMM( 'N', 'T', N2, N1, K, ALPHA, A( N1+1, 1 ),
+                  CALL DGEMM( 'N', 'T', N2, N1, K, ALPHA, A( N1+1,
+     $                        1 ),
      $                        LDA, A( 1, 1 ), LDA, BETA, C( N1+1 ), N )
 *
                ELSE
@@ -293,9 +295,11 @@ SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL DSYRK( 'L', 'T', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 1 ), N )
-                  CALL DSYRK( 'U', 'T', N2, K, ALPHA, A( 1, N1+1 ), LDA,
+                  CALL DSYRK( 'U', 'T', N2, K, ALPHA, A( 1, N1+1 ),
+     $                        LDA,
      $                        BETA, C( N+1 ), N )
-                  CALL DGEMM( 'T', 'N', N2, N1, K, ALPHA, A( 1, N1+1 ),
+                  CALL DGEMM( 'T', 'N', N2, N1, K, ALPHA, A( 1,
+     $                        N1+1 ),
      $                        LDA, A( 1, 1 ), LDA, BETA, C( N1+1 ), N )
 *
                END IF
@@ -310,7 +314,8 @@ SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL DSYRK( 'L', 'N', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( N2+1 ), N )
-                  CALL DSYRK( 'U', 'N', N2, K, ALPHA, A( N2, 1 ), LDA,
+                  CALL DSYRK( 'U', 'N', N2, K, ALPHA, A( N2, 1 ),
+     $                        LDA,
      $                        BETA, C( N1+1 ), N )
                   CALL DGEMM( 'N', 'T', N1, N2, K, ALPHA, A( 1, 1 ),
      $                        LDA, A( N2, 1 ), LDA, BETA, C( 1 ), N )
@@ -321,7 +326,8 @@ SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL DSYRK( 'L', 'T', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( N2+1 ), N )
-                  CALL DSYRK( 'U', 'T', N2, K, ALPHA, A( 1, N2 ), LDA,
+                  CALL DSYRK( 'U', 'T', N2, K, ALPHA, A( 1, N2 ),
+     $                        LDA,
      $                        BETA, C( N1+1 ), N )
                   CALL DGEMM( 'T', 'N', N1, N2, K, ALPHA, A( 1, 1 ),
      $                        LDA, A( 1, N2 ), LDA, BETA, C( 1 ), N )
@@ -344,7 +350,8 @@ SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL DSYRK( 'U', 'N', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 1 ), N1 )
-                  CALL DSYRK( 'L', 'N', N2, K, ALPHA, A( N1+1, 1 ), LDA,
+                  CALL DSYRK( 'L', 'N', N2, K, ALPHA, A( N1+1, 1 ),
+     $                        LDA,
      $                        BETA, C( 2 ), N1 )
                   CALL DGEMM( 'N', 'T', N1, N2, K, ALPHA, A( 1, 1 ),
      $                        LDA, A( N1+1, 1 ), LDA, BETA,
@@ -356,7 +363,8 @@ SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL DSYRK( 'U', 'T', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 1 ), N1 )
-                  CALL DSYRK( 'L', 'T', N2, K, ALPHA, A( 1, N1+1 ), LDA,
+                  CALL DSYRK( 'L', 'T', N2, K, ALPHA, A( 1, N1+1 ),
+     $                        LDA,
      $                        BETA, C( 2 ), N1 )
                   CALL DGEMM( 'T', 'N', N1, N2, K, ALPHA, A( 1, 1 ),
      $                        LDA, A( 1, N1+1 ), LDA, BETA,
@@ -374,9 +382,11 @@ SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL DSYRK( 'U', 'N', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( N2*N2+1 ), N2 )
-                  CALL DSYRK( 'L', 'N', N2, K, ALPHA, A( N1+1, 1 ), LDA,
+                  CALL DSYRK( 'L', 'N', N2, K, ALPHA, A( N1+1, 1 ),
+     $                        LDA,
      $                        BETA, C( N1*N2+1 ), N2 )
-                  CALL DGEMM( 'N', 'T', N2, N1, K, ALPHA, A( N1+1, 1 ),
+                  CALL DGEMM( 'N', 'T', N2, N1, K, ALPHA, A( N1+1,
+     $                        1 ),
      $                        LDA, A( 1, 1 ), LDA, BETA, C( 1 ), N2 )
 *
                ELSE
@@ -385,9 +395,11 @@ SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL DSYRK( 'U', 'T', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( N2*N2+1 ), N2 )
-                  CALL DSYRK( 'L', 'T', N2, K, ALPHA, A( 1, N1+1 ), LDA,
+                  CALL DSYRK( 'L', 'T', N2, K, ALPHA, A( 1, N1+1 ),
+     $                        LDA,
      $                        BETA, C( N1*N2+1 ), N2 )
-                  CALL DGEMM( 'T', 'N', N2, N1, K, ALPHA, A( 1, N1+1 ),
+                  CALL DGEMM( 'T', 'N', N2, N1, K, ALPHA, A( 1,
+     $                        N1+1 ),
      $                        LDA, A( 1, 1 ), LDA, BETA, C( 1 ), N2 )
 *
                END IF
@@ -414,9 +426,11 @@ SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL DSYRK( 'L', 'N', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 2 ), N+1 )
-                  CALL DSYRK( 'U', 'N', NK, K, ALPHA, A( NK+1, 1 ), LDA,
+                  CALL DSYRK( 'U', 'N', NK, K, ALPHA, A( NK+1, 1 ),
+     $                        LDA,
      $                        BETA, C( 1 ), N+1 )
-                  CALL DGEMM( 'N', 'T', NK, NK, K, ALPHA, A( NK+1, 1 ),
+                  CALL DGEMM( 'N', 'T', NK, NK, K, ALPHA, A( NK+1,
+     $                        1 ),
      $                        LDA, A( 1, 1 ), LDA, BETA, C( NK+2 ),
      $                        N+1 )
 *
@@ -426,9 +440,11 @@ SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL DSYRK( 'L', 'T', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 2 ), N+1 )
-                  CALL DSYRK( 'U', 'T', NK, K, ALPHA, A( 1, NK+1 ), LDA,
+                  CALL DSYRK( 'U', 'T', NK, K, ALPHA, A( 1, NK+1 ),
+     $                        LDA,
      $                        BETA, C( 1 ), N+1 )
-                  CALL DGEMM( 'T', 'N', NK, NK, K, ALPHA, A( 1, NK+1 ),
+                  CALL DGEMM( 'T', 'N', NK, NK, K, ALPHA, A( 1,
+     $                        NK+1 ),
      $                        LDA, A( 1, 1 ), LDA, BETA, C( NK+2 ),
      $                        N+1 )
 *
@@ -444,7 +460,8 @@ SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL DSYRK( 'L', 'N', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK+2 ), N+1 )
-                  CALL DSYRK( 'U', 'N', NK, K, ALPHA, A( NK+1, 1 ), LDA,
+                  CALL DSYRK( 'U', 'N', NK, K, ALPHA, A( NK+1, 1 ),
+     $                        LDA,
      $                        BETA, C( NK+1 ), N+1 )
                   CALL DGEMM( 'N', 'T', NK, NK, K, ALPHA, A( 1, 1 ),
      $                        LDA, A( NK+1, 1 ), LDA, BETA, C( 1 ),
@@ -456,7 +473,8 @@ SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL DSYRK( 'L', 'T', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK+2 ), N+1 )
-                  CALL DSYRK( 'U', 'T', NK, K, ALPHA, A( 1, NK+1 ), LDA,
+                  CALL DSYRK( 'U', 'T', NK, K, ALPHA, A( 1, NK+1 ),
+     $                        LDA,
      $                        BETA, C( NK+1 ), N+1 )
                   CALL DGEMM( 'T', 'N', NK, NK, K, ALPHA, A( 1, 1 ),
      $                        LDA, A( 1, NK+1 ), LDA, BETA, C( 1 ),
@@ -480,7 +498,8 @@ SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL DSYRK( 'U', 'N', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK+1 ), NK )
-                  CALL DSYRK( 'L', 'N', NK, K, ALPHA, A( NK+1, 1 ), LDA,
+                  CALL DSYRK( 'L', 'N', NK, K, ALPHA, A( NK+1, 1 ),
+     $                        LDA,
      $                        BETA, C( 1 ), NK )
                   CALL DGEMM( 'N', 'T', NK, NK, K, ALPHA, A( 1, 1 ),
      $                        LDA, A( NK+1, 1 ), LDA, BETA,
@@ -492,7 +511,8 @@ SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL DSYRK( 'U', 'T', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK+1 ), NK )
-                  CALL DSYRK( 'L', 'T', NK, K, ALPHA, A( 1, NK+1 ), LDA,
+                  CALL DSYRK( 'L', 'T', NK, K, ALPHA, A( 1, NK+1 ),
+     $                        LDA,
      $                        BETA, C( 1 ), NK )
                   CALL DGEMM( 'T', 'N', NK, NK, K, ALPHA, A( 1, 1 ),
      $                        LDA, A( 1, NK+1 ), LDA, BETA,
@@ -510,9 +530,11 @@ SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL DSYRK( 'U', 'N', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK*( NK+1 )+1 ), NK )
-                  CALL DSYRK( 'L', 'N', NK, K, ALPHA, A( NK+1, 1 ), LDA,
+                  CALL DSYRK( 'L', 'N', NK, K, ALPHA, A( NK+1, 1 ),
+     $                        LDA,
      $                        BETA, C( NK*NK+1 ), NK )
-                  CALL DGEMM( 'N', 'T', NK, NK, K, ALPHA, A( NK+1, 1 ),
+                  CALL DGEMM( 'N', 'T', NK, NK, K, ALPHA, A( NK+1,
+     $                        1 ),
      $                        LDA, A( 1, 1 ), LDA, BETA, C( 1 ), NK )
 *
                ELSE
@@ -521,9 +543,11 @@ SUBROUTINE DSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL DSYRK( 'U', 'T', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK*( NK+1 )+1 ), NK )
-                  CALL DSYRK( 'L', 'T', NK, K, ALPHA, A( 1, NK+1 ), LDA,
+                  CALL DSYRK( 'L', 'T', NK, K, ALPHA, A( 1, NK+1 ),
+     $                        LDA,
      $                        BETA, C( NK*NK+1 ), NK )
-                  CALL DGEMM( 'T', 'N', NK, NK, K, ALPHA, A( 1, NK+1 ),
+                  CALL DGEMM( 'T', 'N', NK, NK, K, ALPHA, A( 1,
+     $                        NK+1 ),
      $                        LDA, A( 1, 1 ), LDA, BETA, C( 1 ), NK )
 *
                END IF
diff --git a/SRC/dsgesv.f b/SRC/dsgesv.f
index 986492f8ba..e9b4254fa0 100644
--- a/SRC/dsgesv.f
+++ b/SRC/dsgesv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSGESV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsgesv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsgesv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -187,11 +185,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEsolve
+*> \ingroup gesv_mixed
 *
 *  =====================================================================
       SUBROUTINE DSGESV( N, NRHS, A, LDA, IPIV, B, LDB, X, LDX, WORK,
      $                   SWORK, ITER, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -227,7 +226,8 @@ SUBROUTINE DSGESV( N, NRHS, A, LDA, IPIV, B, LDB, X, LDX, WORK,
       DOUBLE PRECISION   ANRM, CTE, EPS, RNRM, XNRM
 *
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DGEMM, DLACPY, DLAG2S, DGETRF, DGETRS,
+      EXTERNAL           DAXPY, DGEMM, DLACPY, DLAG2S, DGETRF,
+     $                   DGETRS,
      $                   SGETRF, SGETRS, SLAG2D, XERBLA
 *     ..
 *     .. External Functions ..
@@ -327,7 +327,8 @@ SUBROUTINE DSGESV( N, NRHS, A, LDA, IPIV, B, LDB, X, LDX, WORK,
 *
       CALL DLACPY( 'All', N, NRHS, B, LDB, WORK, N )
 *
-      CALL DGEMM( 'No Transpose', 'No Transpose', N, NRHS, N, NEGONE, A,
+      CALL DGEMM( 'No Transpose', 'No Transpose', N, NRHS, N, NEGONE,
+     $            A,
      $            LDA, X, LDX, ONE, WORK, N )
 *
 *     Check whether the NRHS normwise backward errors satisfy the
@@ -362,7 +363,8 @@ SUBROUTINE DSGESV( N, NRHS, A, LDA, IPIV, B, LDB, X, LDX, WORK,
 *
 *        Solve the system SA*SX = SR.
 *
-         CALL SGETRS( 'No transpose', N, NRHS, SWORK( PTSA ), N, IPIV,
+         CALL SGETRS( 'No transpose', N, NRHS, SWORK( PTSA ), N,
+     $                IPIV,
      $                SWORK( PTSX ), N, INFO )
 *
 *        Convert SX back to double precision and update the current
@@ -378,7 +380,8 @@ SUBROUTINE DSGESV( N, NRHS, A, LDA, IPIV, B, LDB, X, LDX, WORK,
 *
          CALL DLACPY( 'All', N, NRHS, B, LDB, WORK, N )
 *
-         CALL DGEMM( 'No Transpose', 'No Transpose', N, NRHS, N, NEGONE,
+         CALL DGEMM( 'No Transpose', 'No Transpose', N, NRHS, N,
+     $               NEGONE,
      $               A, LDA, X, LDX, ONE, WORK, N )
 *
 *        Check whether the NRHS normwise backward errors satisfy the
diff --git a/SRC/dspcon.f b/SRC/dspcon.f
index ea92d70aff..30d2b89041 100644
--- a/SRC/dspcon.f
+++ b/SRC/dspcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSPCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dspcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dspcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,11 +115,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup hpcon
 *
 *  =====================================================================
-      SUBROUTINE DSPCON( UPLO, N, AP, IPIV, ANORM, RCOND, WORK, IWORK,
+      SUBROUTINE DSPCON( UPLO, N, AP, IPIV, ANORM, RCOND, WORK,
+     $                   IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dspev.f b/SRC/dspev.f
index f884664a98..e003010277 100644
--- a/SRC/dspev.f
+++ b/SRC/dspev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSPEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dspev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dspev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,10 +121,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup hpev
 *
 *  =====================================================================
       SUBROUTINE DSPEV( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -158,7 +157,8 @@ SUBROUTINE DSPEV( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, INFO )
       EXTERNAL           LSAME, DLAMCH, DLANSP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DOPGTR, DSCAL, DSPTRD, DSTEQR, DSTERF, XERBLA
+      EXTERNAL           DOPGTR, DSCAL, DSPTRD, DSTEQR, DSTERF,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          SQRT
@@ -172,7 +172,8 @@ SUBROUTINE DSPEV( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, INFO )
       INFO = 0
       IF( .NOT.( WANTZ .OR. LSAME( JOBZ, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.( LSAME( UPLO, 'U' ) .OR. LSAME( UPLO, 'L' ) ) )
+      ELSE IF( .NOT.( LSAME( UPLO, 'U' ) .OR.
+     $         LSAME( UPLO, 'L' ) ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -226,7 +227,8 @@ SUBROUTINE DSPEV( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, INFO )
 *
       INDE = 1
       INDTAU = INDE + N
-      CALL DSPTRD( UPLO, N, AP, W, WORK( INDE ), WORK( INDTAU ), IINFO )
+      CALL DSPTRD( UPLO, N, AP, W, WORK( INDE ), WORK( INDTAU ),
+     $             IINFO )
 *
 *     For eigenvalues only, call DSTERF.  For eigenvectors, first call
 *     DOPGTR to generate the orthogonal matrix, then call DSTEQR.
@@ -237,7 +239,8 @@ SUBROUTINE DSPEV( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, INFO )
          INDWRK = INDTAU + N
          CALL DOPGTR( UPLO, N, AP, WORK( INDTAU ), Z, LDZ,
      $                WORK( INDWRK ), IINFO )
-         CALL DSTEQR( JOBZ, N, W, WORK( INDE ), Z, LDZ, WORK( INDTAU ),
+         CALL DSTEQR( JOBZ, N, W, WORK( INDE ), Z, LDZ,
+     $                WORK( INDTAU ),
      $                INFO )
       END IF
 *
diff --git a/SRC/dspevd.f b/SRC/dspevd.f
index d9d6c89177..b27888029b 100644
--- a/SRC/dspevd.f
+++ b/SRC/dspevd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSPEVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dspevd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dspevd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -40,12 +38,6 @@
 *> of a real symmetric matrix A in packed storage. If eigenvectors are
 *> desired, it uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -170,11 +162,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup hpevd
 *
 *  =====================================================================
       SUBROUTINE DSPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
      $                   IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -208,7 +201,8 @@ SUBROUTINE DSPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
       EXTERNAL           LSAME, DLAMCH, DLANSP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DOPMTR, DSCAL, DSPTRD, DSTEDC, DSTERF, XERBLA
+      EXTERNAL           DOPMTR, DSCAL, DSPTRD, DSTEDC, DSTERF,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          SQRT
@@ -223,7 +217,8 @@ SUBROUTINE DSPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
       INFO = 0
       IF( .NOT.( WANTZ .OR. LSAME( JOBZ, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.( LSAME( UPLO, 'U' ) .OR. LSAME( UPLO, 'L' ) ) )
+      ELSE IF( .NOT.( LSAME( UPLO, 'U' ) .OR.
+     $         LSAME( UPLO, 'L' ) ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -302,7 +297,8 @@ SUBROUTINE DSPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
 *
       INDE = 1
       INDTAU = INDE + N
-      CALL DSPTRD( UPLO, N, AP, W, WORK( INDE ), WORK( INDTAU ), IINFO )
+      CALL DSPTRD( UPLO, N, AP, W, WORK( INDE ), WORK( INDTAU ),
+     $             IINFO )
 *
 *     For eigenvalues only, call DSTERF.  For eigenvectors, first call
 *     DSTEDC to generate the eigenvector matrix, WORK(INDWRK), of the
@@ -314,9 +310,11 @@ SUBROUTINE DSPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
       ELSE
          INDWRK = INDTAU + N
          LLWORK = LWORK - INDWRK + 1
-         CALL DSTEDC( 'I', N, W, WORK( INDE ), Z, LDZ, WORK( INDWRK ),
+         CALL DSTEDC( 'I', N, W, WORK( INDE ), Z, LDZ,
+     $                WORK( INDWRK ),
      $                LLWORK, IWORK, LIWORK, INFO )
-         CALL DOPMTR( 'L', UPLO, 'N', N, N, AP, WORK( INDTAU ), Z, LDZ,
+         CALL DOPMTR( 'L', UPLO, 'N', N, N, AP, WORK( INDTAU ), Z,
+     $                LDZ,
      $                WORK( INDWRK ), IINFO )
       END IF
 *
diff --git a/SRC/dspevx.f b/SRC/dspevx.f
index f56ce298f7..758357c563 100644
--- a/SRC/dspevx.f
+++ b/SRC/dspevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSPEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dspevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dspevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -225,12 +223,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup hpevx
 *
 *  =====================================================================
       SUBROUTINE DSPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
      $                   ABSTOL, M, W, Z, LDZ, WORK, IWORK, IFAIL,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -255,7 +254,7 @@ SUBROUTINE DSPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
 *     .. Local Scalars ..
       LOGICAL            ALLEIG, INDEIG, TEST, VALEIG, WANTZ
       CHARACTER          ORDER
-      INTEGER            I, IINFO, IMAX, INDD, INDE, INDEE, INDIBL,
+      INTEGER            I, IINFO, IMAX, INDD, INDE, INDEE,
      $                   INDISP, INDIWO, INDTAU, INDWRK, ISCALE, ITMP1,
      $                   J, JJ, NSPLIT
       DOUBLE PRECISION   ABSTLL, ANRM, BIGNUM, EPS, RMAX, RMIN, SAFMIN,
@@ -267,7 +266,8 @@ SUBROUTINE DSPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
       EXTERNAL           LSAME, DLAMCH, DLANSP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DOPGTR, DOPMTR, DSCAL, DSPTRD, DSTEBZ,
+      EXTERNAL           DCOPY, DOPGTR, DOPMTR, DSCAL, DSPTRD,
+     $                   DSTEBZ,
      $                   DSTEIN, DSTEQR, DSTERF, DSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -287,7 +287,8 @@ SUBROUTINE DSPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
          INFO = -1
       ELSE IF( .NOT.( ALLEIG .OR. VALEIG .OR. INDEIG ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.( LSAME( UPLO, 'L' ) .OR. LSAME( UPLO, 'U' ) ) )
+      ELSE IF( .NOT.( LSAME( UPLO, 'L' ) .OR.
+     $         LSAME( UPLO, 'U' ) ) )
      $          THEN
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
@@ -424,23 +425,23 @@ SUBROUTINE DSPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
       ELSE
          ORDER = 'E'
       END IF
-      INDIBL = 1
-      INDISP = INDIBL + N
+      INDISP = 1 + N
       INDIWO = INDISP + N
       CALL DSTEBZ( RANGE, ORDER, N, VLL, VUU, IL, IU, ABSTLL,
      $             WORK( INDD ), WORK( INDE ), M, NSPLIT, W,
-     $             IWORK( INDIBL ), IWORK( INDISP ), WORK( INDWRK ),
+     $             IWORK( 1 ), IWORK( INDISP ), WORK( INDWRK ),
      $             IWORK( INDIWO ), INFO )
 *
       IF( WANTZ ) THEN
          CALL DSTEIN( N, WORK( INDD ), WORK( INDE ), M, W,
-     $                IWORK( INDIBL ), IWORK( INDISP ), Z, LDZ,
+     $                IWORK( 1 ), IWORK( INDISP ), Z, LDZ,
      $                WORK( INDWRK ), IWORK( INDIWO ), IFAIL, INFO )
 *
 *        Apply orthogonal matrix used in reduction to tridiagonal
 *        form to eigenvectors returned by DSTEIN.
 *
-         CALL DOPMTR( 'L', UPLO, 'N', N, M, AP, WORK( INDTAU ), Z, LDZ,
+         CALL DOPMTR( 'L', UPLO, 'N', N, M, AP, WORK( INDTAU ), Z,
+     $                LDZ,
      $                WORK( INDWRK ), IINFO )
       END IF
 *
@@ -471,11 +472,11 @@ SUBROUTINE DSPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
    30       CONTINUE
 *
             IF( I.NE.0 ) THEN
-               ITMP1 = IWORK( INDIBL+I-1 )
+               ITMP1 = IWORK( 1 + I-1 )
                W( I ) = W( J )
-               IWORK( INDIBL+I-1 ) = IWORK( INDIBL+J-1 )
+               IWORK( 1 + I-1 ) = IWORK( 1 + J-1 )
                W( J ) = TMP1
-               IWORK( INDIBL+J-1 ) = ITMP1
+               IWORK( 1 + J-1 ) = ITMP1
                CALL DSWAP( N, Z( 1, I ), 1, Z( 1, J ), 1 )
                IF( INFO.NE.0 ) THEN
                   ITMP1 = IFAIL( I )
diff --git a/SRC/dspgst.f b/SRC/dspgst.f
index 95734606a3..feabd724a3 100644
--- a/SRC/dspgst.f
+++ b/SRC/dspgst.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSPGST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dspgst.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dspgst.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,10 +104,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup hpgst
 *
 *  =====================================================================
       SUBROUTINE DSPGST( ITYPE, UPLO, N, AP, BP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -135,7 +134,8 @@ SUBROUTINE DSPGST( ITYPE, UPLO, N, AP, BP, INFO )
       DOUBLE PRECISION   AJJ, AKK, BJJ, BKK, CT
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DSCAL, DSPMV, DSPR2, DTPMV, DTPSV,
+      EXTERNAL           DAXPY, DSCAL, DSPMV, DSPR2, DTPMV,
+     $                   DTPSV,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
@@ -181,7 +181,8 @@ SUBROUTINE DSPGST( ITYPE, UPLO, N, AP, BP, INFO )
                CALL DSPMV( UPLO, J-1, -ONE, AP, BP( J1 ), 1, ONE,
      $                     AP( J1 ), 1 )
                CALL DSCAL( J-1, ONE / BJJ, AP( J1 ), 1 )
-               AP( JJ ) = ( AP( JJ )-DDOT( J-1, AP( J1 ), 1, BP( J1 ),
+               AP( JJ ) = ( AP( JJ )-DDOT( J-1, AP( J1 ), 1,
+     $             BP( J1 ),
      $                    1 ) ) / BJJ
    10       CONTINUE
          ELSE
diff --git a/SRC/dspgv.f b/SRC/dspgv.f
index d8ec3b1a42..ac180f8d2d 100644
--- a/SRC/dspgv.f
+++ b/SRC/dspgv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSPGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dspgv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dspgv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -139,7 +137,7 @@
 *>                    i off-diagonal elements of an intermediate
 *>                    tridiagonal form did not converge to zero.
 *>             > N:   if INFO = n + i, for 1 <= i <= n, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -152,11 +150,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup hpgv
 *
 *  =====================================================================
-      SUBROUTINE DSPGV( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
+      SUBROUTINE DSPGV( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ,
+     $                  WORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,7 +183,8 @@ SUBROUTINE DSPGV( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DPPTRF, DSPEV, DSPGST, DTPMV, DTPSV, XERBLA
+      EXTERNAL           DPPTRF, DSPEV, DSPGST, DTPMV, DTPSV,
+     $                   XERBLA
 *     ..
 *     .. Executable Statements ..
 *
diff --git a/SRC/dspgvd.f b/SRC/dspgvd.f
index 5563263882..7a0f6c0732 100644
--- a/SRC/dspgvd.f
+++ b/SRC/dspgvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSPGVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dspgvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dspgvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -44,12 +42,6 @@
 *> positive definite.
 *> If eigenvectors are desired, it uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -184,7 +176,7 @@
 *>                    i off-diagonal elements of an intermediate
 *>                    tridiagonal form did not converge to zero;
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -197,7 +189,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup hpgvd
 *
 *> \par Contributors:
 *  ==================
@@ -205,8 +197,10 @@
 *>     Mark Fahey, Department of Mathematics, Univ. of Kentucky, USA
 *
 *  =====================================================================
-      SUBROUTINE DSPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
+      SUBROUTINE DSPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ,
+     $                   WORK,
      $                   LWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -234,7 +228,8 @@ SUBROUTINE DSPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DPPTRF, DSPEVD, DSPGST, DTPMV, DTPSV, XERBLA
+      EXTERNAL           DPPTRF, DSPEVD, DSPGST, DTPMV, DTPSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, MAX
@@ -307,8 +302,8 @@ SUBROUTINE DSPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
       CALL DSPGST( ITYPE, UPLO, N, AP, BP, INFO )
       CALL DSPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK, IWORK,
      $             LIWORK, INFO )
-      LWMIN = MAX( DBLE( LWMIN ), DBLE( WORK( 1 ) ) )
-      LIWMIN = MAX( DBLE( LIWMIN ), DBLE( IWORK( 1 ) ) )
+      LWMIN = INT( MAX( DBLE( LWMIN ), DBLE( WORK( 1 ) ) ) )
+      LIWMIN = INT( MAX( DBLE( LIWMIN ), DBLE( IWORK( 1 ) ) ) )
 *
       IF( WANTZ ) THEN
 *
diff --git a/SRC/dspgvx.f b/SRC/dspgvx.f
index ec93147aa4..26465c5364 100644
--- a/SRC/dspgvx.f
+++ b/SRC/dspgvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSPGVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dspgvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dspgvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -245,7 +243,7 @@
 *>                    i eigenvectors failed to converge.  Their indices
 *>                    are stored in array IFAIL.
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -258,7 +256,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup hpgvx
 *
 *> \par Contributors:
 *  ==================
@@ -269,6 +267,7 @@
       SUBROUTINE DSPGVX( ITYPE, JOBZ, RANGE, UPLO, N, AP, BP, VL, VU,
      $                   IL, IU, ABSTOL, M, W, Z, LDZ, WORK, IWORK,
      $                   IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -297,7 +296,8 @@ SUBROUTINE DSPGVX( ITYPE, JOBZ, RANGE, UPLO, N, AP, BP, VL, VU,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DPPTRF, DSPEVX, DSPGST, DTPMV, DTPSV, XERBLA
+      EXTERNAL           DPPTRF, DSPEVX, DSPGST, DTPMV, DTPSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MIN
@@ -364,7 +364,8 @@ SUBROUTINE DSPGVX( ITYPE, JOBZ, RANGE, UPLO, N, AP, BP, VL, VU,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL DSPGST( ITYPE, UPLO, N, AP, BP, INFO )
-      CALL DSPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU, ABSTOL, M,
+      CALL DSPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU, ABSTOL,
+     $             M,
      $             W, Z, LDZ, WORK, IWORK, IFAIL, INFO )
 *
       IF( WANTZ ) THEN
diff --git a/SRC/dsposv.f b/SRC/dsposv.f
index c3b8de0e3e..9bbb220966 100644
--- a/SRC/dsposv.f
+++ b/SRC/dsposv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSPOSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsposv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsposv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -177,8 +175,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i of (DOUBLE
-*>                PRECISION) A is not positive definite, so the
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                of (DOUBLE PRECISION) A is not positive, so the
 *>                factorization could not be completed, and the solution
 *>                has not been computed.
 *> \endverbatim
@@ -191,11 +189,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doublePOsolve
+*> \ingroup posv_mixed
 *
 *  =====================================================================
       SUBROUTINE DSPOSV( UPLO, N, NRHS, A, LDA, B, LDB, X, LDX, WORK,
      $                   SWORK, ITER, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -231,7 +230,8 @@ SUBROUTINE DSPOSV( UPLO, N, NRHS, A, LDA, B, LDB, X, LDX, WORK,
       DOUBLE PRECISION   ANRM, CTE, EPS, RNRM, XNRM
 *
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DSYMM, DLACPY, DLAT2S, DLAG2S, SLAG2D,
+      EXTERNAL           DAXPY, DSYMM, DLACPY, DLAT2S, DLAG2S,
+     $                   SLAG2D,
      $                   SPOTRF, SPOTRS, DPOTRF, DPOTRS, XERBLA
 *     ..
 *     .. External Functions ..
@@ -250,7 +250,8 @@ SUBROUTINE DSPOSV( UPLO, N, NRHS, A, LDA, B, LDB, X, LDX, WORK,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -369,7 +370,8 @@ SUBROUTINE DSPOSV( UPLO, N, NRHS, A, LDA, B, LDB, X, LDX, WORK,
 *
 *        Solve the system SA*SX = SR.
 *
-         CALL SPOTRS( UPLO, N, NRHS, SWORK( PTSA ), N, SWORK( PTSX ), N,
+         CALL SPOTRS( UPLO, N, NRHS, SWORK( PTSA ), N, SWORK( PTSX ),
+     $                N,
      $                INFO )
 *
 *        Convert SX back to double precision and update the current
diff --git a/SRC/dsprfs.f b/SRC/dsprfs.f
index 796686d569..dd7856f641 100644
--- a/SRC/dsprfs.f
+++ b/SRC/dsprfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSPRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsprfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsprfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -171,11 +169,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup hprfs
 *
 *  =====================================================================
-      SUBROUTINE DSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
+      SUBROUTINE DSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
+     $                   LDX,
      $                   FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -214,7 +214,8 @@ SUBROUTINE DSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DLACN2, DSPMV, DSPTRS, XERBLA
+      EXTERNAL           DAXPY, DCOPY, DLACN2, DSPMV, DSPTRS,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -277,7 +278,8 @@ SUBROUTINE DSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
 *        Compute residual R = B - A * X
 *
          CALL DCOPY( N, B( 1, J ), 1, WORK( N+1 ), 1 )
-         CALL DSPMV( UPLO, N, -ONE, AP, X( 1, J ), 1, ONE, WORK( N+1 ),
+         CALL DSPMV( UPLO, N, -ONE, AP, X( 1, J ), 1, ONE,
+     $               WORK( N+1 ),
      $               1 )
 *
 *        Compute componentwise relative backward error from formula
@@ -346,7 +348,8 @@ SUBROUTINE DSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
 *
 *           Update solution and try again.
 *
-            CALL DSPTRS( UPLO, N, 1, AFP, IPIV, WORK( N+1 ), N, INFO )
+            CALL DSPTRS( UPLO, N, 1, AFP, IPIV, WORK( N+1 ), N,
+     $                   INFO )
             CALL DAXPY( N, ONE, WORK( N+1 ), 1, X( 1, J ), 1 )
             LSTRES = BERR( J )
             COUNT = COUNT + 1
@@ -385,7 +388,8 @@ SUBROUTINE DSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
 *
          KASE = 0
   100    CONTINUE
-         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
diff --git a/SRC/dspsv.f b/SRC/dspsv.f
index 8cf1927964..727466c787 100644
--- a/SRC/dspsv.f
+++ b/SRC/dspsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSPSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dspsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dspsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,7 +133,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERsolve
+*> \ingroup hpsv
 *
 *> \par Further Details:
 *  =====================
@@ -159,6 +157,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DSPSV( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,7 +189,8 @@ SUBROUTINE DSPSV( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/dspsvx.f b/SRC/dspsvx.f
index 86737f8191..3a99d2c162 100644
--- a/SRC/dspsvx.f
+++ b/SRC/dspsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSPSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dspsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dspsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -248,7 +246,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERsolve
+*> \ingroup hpsvx
 *
 *> \par Further Details:
 *  =====================
@@ -271,8 +269,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
+      SUBROUTINE DSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB,
+     $                   X,
      $                   LDX, RCOND, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -305,7 +305,8 @@ SUBROUTINE DSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
       EXTERNAL           LSAME, DLAMCH, DLANSP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLACPY, DSPCON, DSPRFS, DSPTRF, DSPTRS,
+      EXTERNAL           DCOPY, DLACPY, DSPCON, DSPRFS, DSPTRF,
+     $                   DSPTRS,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -319,7 +320,8 @@ SUBROUTINE DSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
       NOFACT = LSAME( FACT, 'N' )
       IF( .NOT.NOFACT .AND. .NOT.LSAME( FACT, 'F' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -357,7 +359,8 @@ SUBROUTINE DSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL DSPCON( UPLO, N, AFP, IPIV, ANORM, RCOND, WORK, IWORK, INFO )
+      CALL DSPCON( UPLO, N, AFP, IPIV, ANORM, RCOND, WORK, IWORK,
+     $             INFO )
 *
 *     Compute the solution vectors X.
 *
@@ -367,7 +370,8 @@ SUBROUTINE DSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
 *     Use iterative refinement to improve the computed solutions and
 *     compute error bounds and backward error estimates for them.
 *
-      CALL DSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX, FERR,
+      CALL DSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
+     $             FERR,
      $             BERR, WORK, IWORK, INFO )
 *
 *     Set INFO = N+1 if the matrix is singular to working precision.
diff --git a/SRC/dsptrd.f b/SRC/dsptrd.f
index b892ed9aab..16104fcbfa 100644
--- a/SRC/dsptrd.f
+++ b/SRC/dsptrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSPTRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsptrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsptrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -111,7 +109,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup hptrd
 *
 *> \par Further Details:
 *  =====================
@@ -147,6 +145,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DSPTRD( UPLO, N, AP, D, E, TAU, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -266,7 +265,8 @@ SUBROUTINE DSPTRD( UPLO, N, AP, D, E, TAU, INFO )
 *
 *              Compute  y := tau * A * v  storing y in TAU(i:n-1)
 *
-               CALL DSPMV( UPLO, N-I, TAUI, AP( I1I1 ), AP( II+1 ), 1,
+               CALL DSPMV( UPLO, N-I, TAUI, AP( I1I1 ), AP( II+1 ),
+     $                     1,
      $                     ZERO, TAU( I ), 1 )
 *
 *              Compute  w := y - 1/2 * tau * (y**T *v) * v
@@ -278,7 +278,8 @@ SUBROUTINE DSPTRD( UPLO, N, AP, D, E, TAU, INFO )
 *              Apply the transformation as a rank-2 update:
 *                 A := A - v * w**T - w * v**T
 *
-               CALL DSPR2( UPLO, N-I, -ONE, AP( II+1 ), 1, TAU( I ), 1,
+               CALL DSPR2( UPLO, N-I, -ONE, AP( II+1 ), 1, TAU( I ),
+     $                     1,
      $                     AP( I1I1 ) )
 *
                AP( II+1 ) = E( I )
diff --git a/SRC/dsptrf.f b/SRC/dsptrf.f
index c81d8bcbf8..57d4373ac0 100644
--- a/SRC/dsptrf.f
+++ b/SRC/dsptrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSPTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsptrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsptrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup hptrf
 *
 *> \par Further Details:
 *  =====================
@@ -156,6 +154,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DSPTRF( UPLO, N, AP, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -500,7 +499,8 @@ SUBROUTINE DSPTRF( UPLO, N, AP, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL DSWAP( N-KP, AP( KNC+KP-KK+1 ), 1, AP( KPC+1 ),
+     $            CALL DSWAP( N-KP, AP( KNC+KP-KK+1 ), 1,
+     $                        AP( KPC+1 ),
      $                        1 )
                KX = KNC + KP - KK
                DO 80 J = KK + 1, KP - 1
diff --git a/SRC/dsptri.f b/SRC/dsptri.f
index abed7ed499..24e59167b1 100644
--- a/SRC/dsptri.f
+++ b/SRC/dsptri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSPTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsptri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsptri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup hptri
 *
 *  =====================================================================
       SUBROUTINE DSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -217,7 +216,8 @@ SUBROUTINE DSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
 *
             IF( K.GT.1 ) THEN
                CALL DCOPY( K-1, AP( KC ), 1, WORK, 1 )
-               CALL DSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO, AP( KC ),
+               CALL DSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO,
+     $                     AP( KC ),
      $                     1 )
                AP( KC+K-1 ) = AP( KC+K-1 ) -
      $                        DDOT( K-1, WORK, 1, AP( KC ), 1 )
@@ -242,12 +242,14 @@ SUBROUTINE DSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
 *
             IF( K.GT.1 ) THEN
                CALL DCOPY( K-1, AP( KC ), 1, WORK, 1 )
-               CALL DSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO, AP( KC ),
+               CALL DSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO,
+     $                     AP( KC ),
      $                     1 )
                AP( KC+K-1 ) = AP( KC+K-1 ) -
      $                        DDOT( K-1, WORK, 1, AP( KC ), 1 )
                AP( KCNEXT+K-1 ) = AP( KCNEXT+K-1 ) -
-     $                            DDOT( K-1, AP( KC ), 1, AP( KCNEXT ),
+     $                            DDOT( K-1, AP( KC ), 1,
+     $                                  AP( KCNEXT ),
      $                            1 )
                CALL DCOPY( K-1, AP( KCNEXT ), 1, WORK, 1 )
                CALL DSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO,
@@ -321,7 +323,8 @@ SUBROUTINE DSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
                CALL DCOPY( N-K, AP( KC+1 ), 1, WORK, 1 )
                CALL DSPMV( UPLO, N-K, -ONE, AP( KC+N-K+1 ), WORK, 1,
      $                     ZERO, AP( KC+1 ), 1 )
-               AP( KC ) = AP( KC ) - DDOT( N-K, WORK, 1, AP( KC+1 ), 1 )
+               AP( KC ) = AP( KC ) - DDOT( N-K, WORK, 1, AP( KC+1 ),
+     $             1 )
             END IF
             KSTEP = 1
          ELSE
@@ -343,14 +346,17 @@ SUBROUTINE DSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL DCOPY( N-K, AP( KC+1 ), 1, WORK, 1 )
-               CALL DSPMV( UPLO, N-K, -ONE, AP( KC+( N-K+1 ) ), WORK, 1,
+               CALL DSPMV( UPLO, N-K, -ONE, AP( KC+( N-K+1 ) ), WORK,
+     $                     1,
      $                     ZERO, AP( KC+1 ), 1 )
-               AP( KC ) = AP( KC ) - DDOT( N-K, WORK, 1, AP( KC+1 ), 1 )
+               AP( KC ) = AP( KC ) - DDOT( N-K, WORK, 1, AP( KC+1 ),
+     $             1 )
                AP( KCNEXT+1 ) = AP( KCNEXT+1 ) -
      $                          DDOT( N-K, AP( KC+1 ), 1,
      $                          AP( KCNEXT+2 ), 1 )
                CALL DCOPY( N-K, AP( KCNEXT+2 ), 1, WORK, 1 )
-               CALL DSPMV( UPLO, N-K, -ONE, AP( KC+( N-K+1 ) ), WORK, 1,
+               CALL DSPMV( UPLO, N-K, -ONE, AP( KC+( N-K+1 ) ), WORK,
+     $                     1,
      $                     ZERO, AP( KCNEXT+2 ), 1 )
                AP( KCNEXT ) = AP( KCNEXT ) -
      $                        DDOT( N-K, WORK, 1, AP( KCNEXT+2 ), 1 )
diff --git a/SRC/dsptrs.f b/SRC/dsptrs.f
index a8f39a4ede..6826c0749d 100644
--- a/SRC/dsptrs.f
+++ b/SRC/dsptrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSPTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsptrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsptrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup hptrs
 *
 *  =====================================================================
       SUBROUTINE DSPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -267,7 +266,8 @@ SUBROUTINE DSPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *           Multiply by inv(U**T(K)), where U(K) is the transformation
 *           stored in column K of A.
 *
-            CALL DGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, AP( KC ),
+            CALL DGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB,
+     $                  AP( KC ),
      $                  1, ONE, B( K, 1 ), LDB )
 *
 *           Interchange rows K and IPIV(K).
@@ -284,7 +284,8 @@ SUBROUTINE DSPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *           Multiply by inv(U**T(K+1)), where U(K+1) is the transformation
 *           stored in columns K and K+1 of A.
 *
-            CALL DGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, AP( KC ),
+            CALL DGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB,
+     $                  AP( KC ),
      $                  1, ONE, B( K, 1 ), LDB )
             CALL DGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB,
      $                  AP( KC+K ), 1, ONE, B( K+1, 1 ), LDB )
@@ -355,7 +356,8 @@ SUBROUTINE DSPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL DGER( N-K-1, NRHS, -ONE, AP( KC+2 ), 1, B( K, 1 ),
+               CALL DGER( N-K-1, NRHS, -ONE, AP( KC+2 ), 1, B( K,
+     $                    1 ),
      $                    LDB, B( K+2, 1 ), LDB )
                CALL DGER( N-K-1, NRHS, -ONE, AP( KC+N-K+2 ), 1,
      $                    B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
diff --git a/SRC/dstebz.f b/SRC/dstebz.f
index baf417b0a5..6105e2322e 100644
--- a/SRC/dstebz.f
+++ b/SRC/dstebz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSTEBZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dstebz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dstebz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -264,12 +262,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup stebz
 *
 *  =====================================================================
-      SUBROUTINE DSTEBZ( RANGE, ORDER, N, VL, VU, IL, IU, ABSTOL, D, E,
+      SUBROUTINE DSTEBZ( RANGE, ORDER, N, VL, VU, IL, IU, ABSTOL, D,
+     $                   E,
      $                   M, NSPLIT, W, IBLOCK, ISPLIT, WORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -481,7 +481,8 @@ SUBROUTINE DSTEBZ( RANGE, ORDER, N, VL, VU, IL, IU, ABSTOL, D, E,
          IWORK( 5 ) = IL - 1
          IWORK( 6 ) = IU
 *
-         CALL DLAEBZ( 3, ITMAX, N, 2, 2, NB, ATOLI, RTOLI, PIVMIN, D, E,
+         CALL DLAEBZ( 3, ITMAX, N, 2, 2, NB, ATOLI, RTOLI, PIVMIN, D,
+     $                E,
      $                WORK, IWORK( 5 ), WORK( N+1 ), WORK( N+5 ), IOUT,
      $                IWORK, W, IBLOCK, IINFO )
 *
@@ -623,7 +624,8 @@ SUBROUTINE DSTEBZ( RANGE, ORDER, N, VL, VU, IL, IU, ABSTOL, D, E,
 *
             ITMAX = INT( ( LOG( GU-GL+PIVMIN )-LOG( PIVMIN ) ) /
      $              LOG( TWO ) ) + 2
-            CALL DLAEBZ( 2, ITMAX, IN, IN, 1, NB, ATOLI, RTOLI, PIVMIN,
+            CALL DLAEBZ( 2, ITMAX, IN, IN, 1, NB, ATOLI, RTOLI,
+     $                   PIVMIN,
      $                   D( IBEGIN ), E( IBEGIN ), WORK( IBEGIN ),
      $                   IDUMMA, WORK( N+1 ), WORK( N+2*IN+1 ), IOUT,
      $                   IWORK, W( M+1 ), IBLOCK( M+1 ), IINFO )
diff --git a/SRC/dstedc.f b/SRC/dstedc.f
index 2ed84afaac..02c3719fb5 100644
--- a/SRC/dstedc.f
+++ b/SRC/dstedc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSTEDC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dstedc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dstedc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -42,12 +40,6 @@
 *> found if DSYTRD or DSPTRD or DSBTRD has been used to reduce this
 *> matrix to tridiagonal form.
 *>
-*> This code makes very mild assumptions about floating point
-*> arithmetic. It will work on machines with a guard digit in
-*> add/subtract, or on those binary machines without guard digits
-*> which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or Cray-2.
-*> It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.  See DLAED3 for details.
 *> \endverbatim
 *
 *  Arguments:
@@ -173,7 +165,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup stedc
 *
 *> \par Contributors:
 *  ==================
@@ -185,6 +177,7 @@
 *  =====================================================================
       SUBROUTINE DSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
      $                   LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -218,7 +211,8 @@ SUBROUTINE DSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
       EXTERNAL           LSAME, ILAENV, DLAMCH, DLANST
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DLACPY, DLAED0, DLASCL, DLASET, DLASRT,
+      EXTERNAL           DGEMM, DLACPY, DLAED0, DLASCL, DLASET,
+     $                   DLASRT,
      $                   DSTEQR, DSTERF, DSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -383,9 +377,11 @@ SUBROUTINE DSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
 *              Scale.
 *
                ORGNRM = DLANST( 'M', M, D( START ), E( START ) )
-               CALL DLASCL( 'G', 0, 0, ORGNRM, ONE, M, 1, D( START ), M,
+               CALL DLASCL( 'G', 0, 0, ORGNRM, ONE, M, 1, D( START ),
+     $                      M,
      $                      INFO )
-               CALL DLASCL( 'G', 0, 0, ORGNRM, ONE, M-1, 1, E( START ),
+               CALL DLASCL( 'G', 0, 0, ORGNRM, ONE, M-1, 1,
+     $                      E( START ),
      $                      M-1, INFO )
 *
                IF( ICOMPZ.EQ.1 ) THEN
@@ -404,7 +400,8 @@ SUBROUTINE DSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
 *
 *              Scale back.
 *
-               CALL DLASCL( 'G', 0, 0, ONE, ORGNRM, M, 1, D( START ), M,
+               CALL DLASCL( 'G', 0, 0, ONE, ORGNRM, M, 1, D( START ),
+     $                      M,
      $                      INFO )
 *
             ELSE
@@ -414,7 +411,8 @@ SUBROUTINE DSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
 *                 the length of D, we must solve the sub-problem in a
 *                 workspace and then multiply back into Z.
 *
-                  CALL DSTEQR( 'I', M, D( START ), E( START ), WORK, M,
+                  CALL DSTEQR( 'I', M, D( START ), E( START ), WORK,
+     $                         M,
      $                         WORK( M*M+1 ), INFO )
                   CALL DLACPY( 'A', N, M, Z( 1, START ), LDZ,
      $                         WORK( STOREZ ), N )
diff --git a/SRC/dstegr.f b/SRC/dstegr.f
index 01ec101d8c..378d3c9dca 100644
--- a/SRC/dstegr.f
+++ b/SRC/dstegr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSTEGR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dstegr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dstegr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -56,7 +54,7 @@
 *>
 *> Note : DSTEGR and DSTEMR work only on machines which follow
 *> IEEE-754 floating-point standard in their handling of infinities and
-*> NaNs.  Normal execution may create these exceptiona values and hence
+*> NaNs.  Normal execution may create these exceptional values and hence
 *> may abort due to a floating point exception in environments which
 *> do not conform to the IEEE-754 standard.
 *> \endverbatim
@@ -249,7 +247,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup stegr
 *
 *> \par Contributors:
 *  ==================
@@ -262,6 +260,7 @@
       SUBROUTINE DSTEGR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $           ABSTOL, M, W, Z, LDZ, ISUPPZ, WORK, LWORK, IWORK,
      $           LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dstein.f b/SRC/dstein.f
index 6506be92ac..02de3a0b37 100644
--- a/SRC/dstein.f
+++ b/SRC/dstein.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSTEIN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dstein.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dstein.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -166,11 +164,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup stein
 *
 *  =====================================================================
       SUBROUTINE DSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
      $                   IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -210,7 +209,8 @@ SUBROUTINE DSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
       EXTERNAL           IDAMAX, DDOT, DLAMCH, DNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DLAGTF, DLAGTS, DLARNV, DSCAL,
+      EXTERNAL           DAXPY, DCOPY, DLAGTF, DLAGTS, DLARNV,
+     $                   DSCAL,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -354,7 +354,8 @@ SUBROUTINE DSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
 *           Compute LU factors with partial pivoting  ( PT = LU )
 *
             TOL = ZERO
-            CALL DLAGTF( BLKSIZ, WORK( INDRV4+1 ), XJ, WORK( INDRV2+2 ),
+            CALL DLAGTF( BLKSIZ, WORK( INDRV4+1 ), XJ,
+     $                   WORK( INDRV2+2 ),
      $                   WORK( INDRV3+1 ), TOL, WORK( INDRV5+1 ), IWORK,
      $                   IINFO )
 *
@@ -375,7 +376,8 @@ SUBROUTINE DSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
 *
 *           Solve the system LU = Pb.
 *
-            CALL DLAGTS( -1, BLKSIZ, WORK( INDRV4+1 ), WORK( INDRV2+2 ),
+            CALL DLAGTS( -1, BLKSIZ, WORK( INDRV4+1 ),
+     $                   WORK( INDRV2+2 ),
      $                   WORK( INDRV3+1 ), WORK( INDRV5+1 ), IWORK,
      $                   WORK( INDRV1+1 ), TOL, IINFO )
 *
@@ -388,7 +390,8 @@ SUBROUTINE DSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
      $         GPIND = J
             IF( GPIND.NE.J ) THEN
                DO 80 I = GPIND, J - 1
-                  ZTR = -DDOT( BLKSIZ, WORK( INDRV1+1 ), 1, Z( B1, I ),
+                  ZTR = -DDOT( BLKSIZ, WORK( INDRV1+1 ), 1, Z( B1,
+     $                         I ),
      $                  1 )
                   CALL DAXPY( BLKSIZ, ZTR, Z( B1, I ), 1,
      $                        WORK( INDRV1+1 ), 1 )
diff --git a/SRC/dstemr.f b/SRC/dstemr.f
index d0c71ddd98..71b32ebd3e 100644
--- a/SRC/dstemr.f
+++ b/SRC/dstemr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSTEMR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dstemr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dstemr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -303,7 +301,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup stemr
 *
 *> \par Contributors:
 *  ==================
@@ -312,12 +310,14 @@
 *> Jim Demmel, University of California, Berkeley, USA \n
 *> Inderjit Dhillon, University of Texas, Austin, USA \n
 *> Osni Marques, LBNL/NERSC, USA \n
-*> Christof Voemel, University of California, Berkeley, USA
+*> Christof Voemel, University of California, Berkeley, USA \n
+*> Aravindh Krishnamoorthy, FAU, Erlangen, Germany \n
 *
 *  =====================================================================
       SUBROUTINE DSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $                   M, W, Z, LDZ, NZC, ISUPPZ, TRYRAC, WORK, LWORK,
      $                   IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -344,7 +344,8 @@ SUBROUTINE DSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $                     MINRGP = 1.0D-3 )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            ALLEIG, INDEIG, LQUERY, VALEIG, WANTZ, ZQUERY
+      LOGICAL            ALLEIG, INDEIG, LQUERY, VALEIG, WANTZ, ZQUERY,
+     $                   LAESWAP
       INTEGER            I, IBEGIN, IEND, IFIRST, IIL, IINDBL, IINDW,
      $                   IINDWK, IINFO, IINSPL, IIU, ILAST, IN, INDD,
      $                   INDE2, INDERR, INDGP, INDGRS, INDWRK, ITMP,
@@ -361,7 +362,8 @@ SUBROUTINE DSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
       EXTERNAL           LSAME, DLAMCH, DLANST
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLAE2, DLAEV2, DLARRC, DLARRE, DLARRJ,
+      EXTERNAL           DCOPY, DLAE2, DLAEV2, DLARRC, DLARRE,
+     $                   DLARRJ,
      $                   DLARRR, DLARRV, DLASRT, DSCAL, DSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -380,6 +382,7 @@ SUBROUTINE DSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
 *
       LQUERY = ( ( LWORK.EQ.-1 ).OR.( LIWORK.EQ.-1 ) )
       ZQUERY = ( NZC.EQ.-1 )
+      LAESWAP = .FALSE.
 
 *     DSTEMR needs WORK of size 6*N, IWORK of size 3*N.
 *     In addition, DLARRE needs WORK of size 6*N, IWORK of size 5*N.
@@ -502,6 +505,15 @@ SUBROUTINE DSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
          ELSE IF( WANTZ.AND.(.NOT.ZQUERY) ) THEN
             CALL DLAEV2( D(1), E(1), D(2), R1, R2, CS, SN )
          END IF
+*        D/S/LAE2 and D/S/LAEV2 outputs satisfy |R1| >= |R2|. However,
+*        the following code requires R1 >= R2. Hence, we correct
+*        the order of R1, R2, CS, SN if R1 < R2 before further processing.
+         IF( R1.LT.R2 ) THEN
+            E(2) = R1
+            R1 = R2
+            R2 = E(2)
+            LAESWAP = .TRUE.
+         ENDIF
          IF( ALLEIG.OR.
      $      (VALEIG.AND.(R2.GT.WL).AND.
      $                  (R2.LE.WU)).OR.
@@ -509,8 +521,13 @@ SUBROUTINE DSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
             M = M+1
             W( M ) = R2
             IF( WANTZ.AND.(.NOT.ZQUERY) ) THEN
-               Z( 1, M ) = -SN
-               Z( 2, M ) = CS
+               IF( LAESWAP ) THEN
+                  Z( 1, M ) = CS
+                  Z( 2, M ) = SN
+               ELSE
+                  Z( 1, M ) = -SN
+                  Z( 2, M ) = CS
+               ENDIF
 *              Note: At most one of SN and CS can be zero.
                IF (SN.NE.ZERO) THEN
                   IF (CS.NE.ZERO) THEN
@@ -533,8 +550,13 @@ SUBROUTINE DSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
             M = M+1
             W( M ) = R1
             IF( WANTZ.AND.(.NOT.ZQUERY) ) THEN
-               Z( 1, M ) = CS
-               Z( 2, M ) = SN
+               IF( LAESWAP ) THEN
+                  Z( 1, M ) = -SN
+                  Z( 2, M ) = CS
+               ELSE
+                  Z( 1, M ) = CS
+                  Z( 2, M ) = SN
+               ENDIF
 *              Note: At most one of SN and CS can be zero.
                IF (SN.NE.ZERO) THEN
                   IF (CS.NE.ZERO) THEN
diff --git a/SRC/dsteqr.f b/SRC/dsteqr.f
index 50a9188c7c..acbbafb48f 100644
--- a/SRC/dsteqr.f
+++ b/SRC/dsteqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSTEQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsteqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsteqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -124,10 +122,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup steqr
 *
 *  =====================================================================
       SUBROUTINE DSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -163,7 +162,8 @@ SUBROUTINE DSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
       EXTERNAL           LSAME, DLAMCH, DLANST, DLAPY2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLAE2, DLAEV2, DLARTG, DLASCL, DLASET, DLASR,
+      EXTERNAL           DLAE2, DLAEV2, DLARTG, DLASCL, DLASET,
+     $                   DLASR,
      $                   DLASRT, DSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -269,13 +269,15 @@ SUBROUTINE DSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
      $   GO TO 10
       IF( ANORM.GT.SSFMAX ) THEN
          ISCALE = 1
-         CALL DLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L+1, 1, D( L ), N,
+         CALL DLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L+1, 1, D( L ),
+     $                N,
      $                INFO )
          CALL DLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L, 1, E( L ), N,
      $                INFO )
       ELSE IF( ANORM.LT.SSFMIN ) THEN
          ISCALE = 2
-         CALL DLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L+1, 1, D( L ), N,
+         CALL DLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L+1, 1, D( L ),
+     $                N,
      $                INFO )
          CALL DLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L, 1, E( L ), N,
      $                INFO )
@@ -318,7 +320,8 @@ SUBROUTINE DSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
 *
          IF( M.EQ.L+1 ) THEN
             IF( ICOMPZ.GT.0 ) THEN
-               CALL DLAEV2( D( L ), E( L ), D( L+1 ), RT1, RT2, C, S )
+               CALL DLAEV2( D( L ), E( L ), D( L+1 ), RT1, RT2, C,
+     $                      S )
                WORK( L ) = C
                WORK( N-1+L ) = S
                CALL DLASR( 'R', 'V', 'B', N, 2, WORK( L ),
@@ -377,7 +380,8 @@ SUBROUTINE DSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
 *
          IF( ICOMPZ.GT.0 ) THEN
             MM = M - L + 1
-            CALL DLASR( 'R', 'V', 'B', N, MM, WORK( L ), WORK( N-1+L ),
+            CALL DLASR( 'R', 'V', 'B', N, MM, WORK( L ),
+     $                  WORK( N-1+L ),
      $                  Z( 1, L ), LDZ )
          END IF
 *
@@ -425,7 +429,8 @@ SUBROUTINE DSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
 *
          IF( M.EQ.L-1 ) THEN
             IF( ICOMPZ.GT.0 ) THEN
-               CALL DLAEV2( D( L-1 ), E( L-1 ), D( L ), RT1, RT2, C, S )
+               CALL DLAEV2( D( L-1 ), E( L-1 ), D( L ), RT1, RT2, C,
+     $                      S )
                WORK( M ) = C
                WORK( N-1+M ) = S
                CALL DLASR( 'R', 'V', 'F', N, 2, WORK( M ),
@@ -484,7 +489,8 @@ SUBROUTINE DSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
 *
          IF( ICOMPZ.GT.0 ) THEN
             MM = L - M + 1
-            CALL DLASR( 'R', 'V', 'F', N, MM, WORK( M ), WORK( N-1+M ),
+            CALL DLASR( 'R', 'V', 'F', N, MM, WORK( M ),
+     $                  WORK( N-1+M ),
      $                  Z( 1, M ), LDZ )
          END IF
 *
@@ -510,12 +516,14 @@ SUBROUTINE DSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
       IF( ISCALE.EQ.1 ) THEN
          CALL DLASCL( 'G', 0, 0, SSFMAX, ANORM, LENDSV-LSV+1, 1,
      $                D( LSV ), N, INFO )
-         CALL DLASCL( 'G', 0, 0, SSFMAX, ANORM, LENDSV-LSV, 1, E( LSV ),
+         CALL DLASCL( 'G', 0, 0, SSFMAX, ANORM, LENDSV-LSV, 1,
+     $                E( LSV ),
      $                N, INFO )
       ELSE IF( ISCALE.EQ.2 ) THEN
          CALL DLASCL( 'G', 0, 0, SSFMIN, ANORM, LENDSV-LSV+1, 1,
      $                D( LSV ), N, INFO )
-         CALL DLASCL( 'G', 0, 0, SSFMIN, ANORM, LENDSV-LSV, 1, E( LSV ),
+         CALL DLASCL( 'G', 0, 0, SSFMIN, ANORM, LENDSV-LSV, 1,
+     $                E( LSV ),
      $                N, INFO )
       END IF
 *
diff --git a/SRC/dsterf.f b/SRC/dsterf.f
index b0f8d36084..1f0a4a3afb 100644
--- a/SRC/dsterf.f
+++ b/SRC/dsterf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSTERF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsterf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsterf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -79,10 +77,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup sterf
 *
 *  =====================================================================
       SUBROUTINE DSTERF( N, D, E, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,13 +189,15 @@ SUBROUTINE DSTERF( N, D, E, INFO )
      $   GO TO 10
       IF( (ANORM.GT.SSFMAX) ) THEN
          ISCALE = 1
-         CALL DLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L+1, 1, D( L ), N,
+         CALL DLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L+1, 1, D( L ),
+     $                N,
      $                INFO )
          CALL DLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L, 1, E( L ), N,
      $                INFO )
       ELSE IF( ANORM.LT.SSFMIN ) THEN
          ISCALE = 2
-         CALL DLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L+1, 1, D( L ), N,
+         CALL DLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L+1, 1, D( L ),
+     $                N,
      $                INFO )
          CALL DLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L, 1, E( L ), N,
      $                INFO )
diff --git a/SRC/dstev.f b/SRC/dstev.f
index 21c4ceed1c..58dde99b58 100644
--- a/SRC/dstev.f
+++ b/SRC/dstev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSTEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dstev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dstev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -109,10 +107,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup stev
 *
 *  =====================================================================
       SUBROUTINE DSTEV( JOBZ, N, D, E, Z, LDZ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dstevd.f b/SRC/dstevd.f
index 507f39b2b6..864fa647ae 100644
--- a/SRC/dstevd.f
+++ b/SRC/dstevd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSTEVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dstevd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dstevd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -40,12 +38,6 @@
 *> real symmetric tridiagonal matrix. If eigenvectors are desired, it
 *> uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -155,11 +147,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup stevd
 *
 *  =====================================================================
       SUBROUTINE DSTEVD( JOBZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
      $                   LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -280,7 +273,8 @@ SUBROUTINE DSTEVD( JOBZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
       IF( .NOT.WANTZ ) THEN
          CALL DSTERF( N, D, E, INFO )
       ELSE
-         CALL DSTEDC( 'I', N, D, E, Z, LDZ, WORK, LWORK, IWORK, LIWORK,
+         CALL DSTEDC( 'I', N, D, E, Z, LDZ, WORK, LWORK, IWORK,
+     $                LIWORK,
      $                INFO )
       END IF
 *
diff --git a/SRC/dstevr.f b/SRC/dstevr.f
index ce9383758d..d75afcb375 100644
--- a/SRC/dstevr.f
+++ b/SRC/dstevr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSTEVR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dstevr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dstevr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -287,7 +285,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup stevr
 *
 *> \par Contributors:
 *  ==================
@@ -298,9 +296,11 @@
 *>       California at Berkeley, USA \n
 *>
 *  =====================================================================
-      SUBROUTINE DSTEVR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
+      SUBROUTINE DSTEVR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
+     $                   ABSTOL,
      $                   M, W, Z, LDZ, ISUPPZ, WORK, LWORK, IWORK,
      $                   LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -339,7 +339,8 @@ SUBROUTINE DSTEVR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
       EXTERNAL           LSAME, ILAENV, DLAMCH, DLANST
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTEMR, DSTEIN, DSTERF,
+      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTEMR, DSTEIN,
+     $                   DSTERF,
      $                   DSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -521,12 +522,14 @@ SUBROUTINE DSTEVR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
          ORDER = 'E'
       END IF
 
-      CALL DSTEBZ( RANGE, ORDER, N, VLL, VUU, IL, IU, ABSTOL, D, E, M,
+      CALL DSTEBZ( RANGE, ORDER, N, VLL, VUU, IL, IU, ABSTOL, D, E,
+     $             M,
      $             NSPLIT, W, IWORK( INDIBL ), IWORK( INDISP ), WORK,
      $             IWORK( INDIWO ), INFO )
 *
       IF( WANTZ ) THEN
-         CALL DSTEIN( N, D, E, M, W, IWORK( INDIBL ), IWORK( INDISP ),
+         CALL DSTEIN( N, D, E, M, W, IWORK( INDIBL ),
+     $                IWORK( INDISP ),
      $                Z, LDZ, WORK, IWORK( INDIWO ), IWORK( INDIFL ),
      $                INFO )
       END IF
diff --git a/SRC/dstevx.f b/SRC/dstevx.f
index f93c1d3b75..7ec970f08d 100644
--- a/SRC/dstevx.f
+++ b/SRC/dstevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSTEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dstevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dstevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -219,11 +217,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHEReigen
+*> \ingroup stevx
 *
 *  =====================================================================
-      SUBROUTINE DSTEVX( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
+      SUBROUTINE DSTEVX( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
+     $                   ABSTOL,
      $                   M, W, Z, LDZ, WORK, IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -248,7 +248,7 @@ SUBROUTINE DSTEVX( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
 *     .. Local Scalars ..
       LOGICAL            ALLEIG, INDEIG, TEST, VALEIG, WANTZ
       CHARACTER          ORDER
-      INTEGER            I, IMAX, INDIBL, INDISP, INDIWO, INDWRK,
+      INTEGER            I, IMAX, INDISP, INDIWO, INDWRK,
      $                   ISCALE, ITMP1, J, JJ, NSPLIT
       DOUBLE PRECISION   BIGNUM, EPS, RMAX, RMIN, SAFMIN, SIGMA, SMLNUM,
      $                   TMP1, TNRM, VLL, VUU
@@ -259,7 +259,8 @@ SUBROUTINE DSTEVX( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
       EXTERNAL           LSAME, DLAMCH, DLANST
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTEIN, DSTEQR, DSTERF,
+      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTEIN, DSTEQR,
+     $                   DSTERF,
      $                   DSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -377,7 +378,8 @@ SUBROUTINE DSTEVX( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
          IF( .NOT.WANTZ ) THEN
             CALL DSTERF( N, W, WORK, INFO )
          ELSE
-            CALL DSTEQR( 'I', N, W, WORK, Z, LDZ, WORK( INDWRK ), INFO )
+            CALL DSTEQR( 'I', N, W, WORK, Z, LDZ, WORK( INDWRK ),
+     $                   INFO )
             IF( INFO.EQ.0 ) THEN
                DO 10 I = 1, N
                   IFAIL( I ) = 0
@@ -399,15 +401,15 @@ SUBROUTINE DSTEVX( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
          ORDER = 'E'
       END IF
       INDWRK = 1
-      INDIBL = 1
-      INDISP = INDIBL + N
+      INDISP = 1 + N
       INDIWO = INDISP + N
-      CALL DSTEBZ( RANGE, ORDER, N, VLL, VUU, IL, IU, ABSTOL, D, E, M,
-     $             NSPLIT, W, IWORK( INDIBL ), IWORK( INDISP ),
+      CALL DSTEBZ( RANGE, ORDER, N, VLL, VUU, IL, IU, ABSTOL, D, E,
+     $             M,
+     $             NSPLIT, W, IWORK( 1 ), IWORK( INDISP ),
      $             WORK( INDWRK ), IWORK( INDIWO ), INFO )
 *
       IF( WANTZ ) THEN
-         CALL DSTEIN( N, D, E, M, W, IWORK( INDIBL ), IWORK( INDISP ),
+         CALL DSTEIN( N, D, E, M, W, IWORK( 1 ), IWORK( INDISP ),
      $                Z, LDZ, WORK( INDWRK ), IWORK( INDIWO ), IFAIL,
      $                INFO )
       END IF
@@ -439,11 +441,11 @@ SUBROUTINE DSTEVX( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
    30       CONTINUE
 *
             IF( I.NE.0 ) THEN
-               ITMP1 = IWORK( INDIBL+I-1 )
+               ITMP1 = IWORK( 1 + I-1 )
                W( I ) = W( J )
-               IWORK( INDIBL+I-1 ) = IWORK( INDIBL+J-1 )
+               IWORK( 1 + I-1 ) = IWORK( 1 + J-1 )
                W( J ) = TMP1
-               IWORK( INDIBL+J-1 ) = ITMP1
+               IWORK( 1 + J-1 ) = ITMP1
                CALL DSWAP( N, Z( 1, I ), 1, Z( 1, J ), 1 )
                IF( INFO.NE.0 ) THEN
                   ITMP1 = IFAIL( I )
diff --git a/SRC/dsycon.f b/SRC/dsycon.f
index 617a917008..0e9d43f672 100644
--- a/SRC/dsycon.f
+++ b/SRC/dsycon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsycon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsycon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,11 +120,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hecon
 *
 *  =====================================================================
       SUBROUTINE DSYCON( UPLO, N, A, LDA, IPIV, ANORM, RCOND, WORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dsycon_3.f b/SRC/dsycon_3.f
index f5cc65dd42..a5829bffb8 100644
--- a/SRC/dsycon_3.f
+++ b/SRC/dsycon_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYCON_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsycon_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsycon_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -149,7 +147,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hecon_3
 *
 *> \par Contributors:
 *  ==================
@@ -168,6 +166,7 @@
 *  =====================================================================
       SUBROUTINE DSYCON_3( UPLO, N, A, LDA, E, IPIV, ANORM, RCOND,
      $                     WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dsycon_rook.f b/SRC/dsycon_rook.f
index dab67a225a..e10b78c0f4 100644
--- a/SRC/dsycon_rook.f
+++ b/SRC/dsycon_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYCON_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsycon_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsycon_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,7 +120,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hecon_rook
 *
 *> \par Contributors:
 *  ==================
@@ -139,8 +137,10 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE DSYCON_ROOK( UPLO, N, A, LDA, IPIV, ANORM, RCOND, WORK,
+      SUBROUTINE DSYCON_ROOK( UPLO, N, A, LDA, IPIV, ANORM, RCOND,
+     $                        WORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dsyconv.f b/SRC/dsyconv.f
index e213f03d1b..3659633bb8 100644
--- a/SRC/dsyconv.f
+++ b/SRC/dsyconv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYCONV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsyconv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsyconv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup syconv
 *
 *  =====================================================================
       SUBROUTINE DSYCONV( UPLO, WAY, N, A, LDA, IPIV, E, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dsyconvf.f b/SRC/dsyconvf.f
index 9e7a5af0e1..d321e43218 100644
--- a/SRC/dsyconvf.f
+++ b/SRC/dsyconvf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYCONVF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsyconvf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsyconvf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -39,7 +37,7 @@
 *> DSYTRF provided on entry in parameter A into the factorization
 *> output format used in DSYTRF_RK (or DSYTRF_BK) that is stored
 *> on exit in parameters A and E. It also converts in place details of
-*> the intechanges stored in IPIV from the format used in DSYTRF into
+*> the interchanges stored in IPIV from the format used in DSYTRF into
 *> the format used in DSYTRF_RK (or DSYTRF_BK).
 *>
 *> If parameter WAY = 'R':
@@ -48,7 +46,7 @@
 *> (or DSYTRF_BK) provided on entry in parameters A and E into
 *> the factorization output format used in DSYTRF that is stored
 *> on exit in parameter A. It also converts in place details of
-*> the intechanges stored in IPIV from the format used in DSYTRF_RK
+*> the interchanges stored in IPIV from the format used in DSYTRF_RK
 *> (or DSYTRF_BK) into the format used in DSYTRF.
 *> \endverbatim
 *
@@ -189,7 +187,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup syconvf
 *
 *> \par Contributors:
 *  ==================
@@ -203,6 +201,7 @@
 *> \endverbatim
 *  =====================================================================
       SUBROUTINE DSYCONVF( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -322,7 +321,7 @@ SUBROUTINE DSYCONVF( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
                   END IF
 *
 *                 Convert IPIV
-*                 There is no interchnge of rows i and and IPIV(i),
+*                 There is no interchange of rows i and and IPIV(i),
 *                 so this should be reflected in IPIV format for
 *                 *SYTRF_RK ( or *SYTRF_BK)
 *
@@ -466,7 +465,7 @@ SUBROUTINE DSYCONVF( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
                   END IF
 *
 *                 Convert IPIV
-*                 There is no interchnge of rows i and and IPIV(i),
+*                 There is no interchange of rows i and and IPIV(i),
 *                 so this should be reflected in IPIV format for
 *                 *SYTRF_RK ( or *SYTRF_BK)
 *
@@ -532,7 +531,7 @@ SUBROUTINE DSYCONVF( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
 *
 *           Revert VALUE
 *           Assign subdiagonal entries of D from array E to
-*           subgiagonal entries of A.
+*           subdiagonal entries of A.
 *
             I = 1
             DO WHILE ( I.LE.N-1 )
diff --git a/SRC/dsyconvf_rook.f b/SRC/dsyconvf_rook.f
index d7f529358c..fb5c4889ca 100644
--- a/SRC/dsyconvf_rook.f
+++ b/SRC/dsyconvf_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYCONVF_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsyconvf_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsyconvf_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -180,7 +178,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup syconvf_rook
 *
 *> \par Contributors:
 *  ==================
@@ -194,6 +192,7 @@
 *> \endverbatim
 *  =====================================================================
       SUBROUTINE DSYCONVF_ROOK( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -517,7 +516,7 @@ SUBROUTINE DSYCONVF_ROOK( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
 *
 *           Revert VALUE
 *           Assign subdiagonal entries of D from array E to
-*           subgiagonal entries of A.
+*           subdiagonal entries of A.
 *
             I = 1
             DO WHILE ( I.LE.N-1 )
diff --git a/SRC/dsyequb.f b/SRC/dsyequb.f
index 1f909be19b..e6ad2fdf65 100644
--- a/SRC/dsyequb.f
+++ b/SRC/dsyequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsyequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsyequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -116,7 +114,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup heequb
 *
 *> \par References:
 *  ================
@@ -127,7 +125,9 @@
 *>  Tech report version: http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.3.1679
 *>
 *  =====================================================================
-      SUBROUTINE DSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
+      SUBROUTINE DSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK,
+     $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,7 +172,8 @@ SUBROUTINE DSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF ( .NOT. ( LSAME( UPLO, 'U' ) .OR. LSAME( UPLO, 'L' ) ) ) THEN
+      IF ( .NOT. ( LSAME( UPLO, 'U' ) .OR.
+     $     LSAME( UPLO, 'L' ) ) ) THEN
          INFO = -1
       ELSE IF ( N .LT. 0 ) THEN
          INFO = -2
diff --git a/SRC/dsyev.f b/SRC/dsyev.f
index da7557ee02..9ef68d16b5 100644
--- a/SRC/dsyev.f
+++ b/SRC/dsyev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsyev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsyev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -125,10 +123,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYeigen
+*> \ingroup heev
 *
 *  =====================================================================
       SUBROUTINE DSYEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -162,7 +161,8 @@ SUBROUTINE DSYEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, INFO )
       EXTERNAL           LSAME, ILAENV, DLAMCH, DLANSY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLASCL, DORGTR, DSCAL, DSTEQR, DSTERF, DSYTRD,
+      EXTERNAL           DLASCL, DORGTR, DSCAL, DSTEQR, DSTERF,
+     $                   DSYTRD,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -255,9 +255,11 @@ SUBROUTINE DSYEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, INFO )
       IF( .NOT.WANTZ ) THEN
          CALL DSTERF( N, W, WORK( INDE ), INFO )
       ELSE
-         CALL DORGTR( UPLO, N, A, LDA, WORK( INDTAU ), WORK( INDWRK ),
+         CALL DORGTR( UPLO, N, A, LDA, WORK( INDTAU ),
+     $                WORK( INDWRK ),
      $                LLWORK, IINFO )
-         CALL DSTEQR( JOBZ, N, W, WORK( INDE ), A, LDA, WORK( INDTAU ),
+         CALL DSTEQR( JOBZ, N, W, WORK( INDE ), A, LDA,
+     $                WORK( INDTAU ),
      $                INFO )
       END IF
 *
diff --git a/SRC/dsyev_2stage.f b/SRC/dsyev_2stage.f
index 50d51d992b..0f825fed4b 100644
--- a/SRC/dsyev_2stage.f
+++ b/SRC/dsyev_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYEV_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsyev_2stage.f">
 *> [TGZ]</a>
@@ -15,12 +14,11 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsyev_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE DSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, 
+*       SUBROUTINE DSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
 *                                INFO )
 *
 *       IMPLICIT NONE
@@ -97,7 +95,7 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension LWORK
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
@@ -105,12 +103,12 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + 2*N
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + 2*N
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -143,7 +141,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYeigen
+*> \ingroup heev_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -161,7 +159,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -169,16 +167,16 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE DSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, 
+      SUBROUTINE DSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
      $                         INFO )
 *
       IMPLICIT NONE
@@ -215,7 +213,8 @@ SUBROUTINE DSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       EXTERNAL           LSAME, DLAMCH, DLANSY, ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLASCL, DORGTR, DSCAL, DSTEQR, DSTERF,
+      EXTERNAL           DLASCL, DORGTR, DSCAL, DSTEQR,
+     $                   DSTERF,
      $                   XERBLA, DSYTRD_2STAGE
 *     ..
 *     .. Intrinsic Functions ..
@@ -241,10 +240,14 @@ SUBROUTINE DSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         KD    = ILAENV2STAGE( 1, 'DSYTRD_2STAGE', JOBZ, N, -1, -1, -1 )
-         IB    = ILAENV2STAGE( 2, 'DSYTRD_2STAGE', JOBZ, N, KD, -1, -1 )
-         LHTRD = ILAENV2STAGE( 3, 'DSYTRD_2STAGE', JOBZ, N, KD, IB, -1 )
-         LWTRD = ILAENV2STAGE( 4, 'DSYTRD_2STAGE', JOBZ, N, KD, IB, -1 )
+         KD    = ILAENV2STAGE( 1, 'DSYTRD_2STAGE', JOBZ, N, -1, -1,
+     $                         -1 )
+         IB    = ILAENV2STAGE( 2, 'DSYTRD_2STAGE', JOBZ, N, KD, -1,
+     $                         -1 )
+         LHTRD = ILAENV2STAGE( 3, 'DSYTRD_2STAGE', JOBZ, N, KD, IB,
+     $                         -1 )
+         LWTRD = ILAENV2STAGE( 4, 'DSYTRD_2STAGE', JOBZ, N, KD, IB,
+     $                         -1 )
          LWMIN = 2*N + LHTRD + LWTRD
          WORK( 1 )  = LWMIN
 *
@@ -305,7 +308,7 @@ SUBROUTINE DSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       LLWORK  = LWORK - INDWRK + 1
 *
       CALL DSYTRD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK( INDE ),
-     $                    WORK( INDTAU ), WORK( INDHOUS ), LHTRD, 
+     $                    WORK( INDTAU ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWRK ), LLWORK, IINFO )
 *
 *     For eigenvalues only, call DSTERF.  For eigenvectors, first call
@@ -317,9 +320,11 @@ SUBROUTINE DSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
 *        Not available in this release, and argument checking should not
 *        let it getting here
          RETURN
-         CALL DORGTR( UPLO, N, A, LDA, WORK( INDTAU ), WORK( INDWRK ),
+         CALL DORGTR( UPLO, N, A, LDA, WORK( INDTAU ),
+     $                WORK( INDWRK ),
      $                LLWORK, IINFO )
-         CALL DSTEQR( JOBZ, N, W, WORK( INDE ), A, LDA, WORK( INDTAU ),
+         CALL DSTEQR( JOBZ, N, W, WORK( INDE ), A, LDA,
+     $                WORK( INDTAU ),
      $                INFO )
       END IF
 *
diff --git a/SRC/dsyevd.f b/SRC/dsyevd.f
index edbe896fe8..6cf24222f4 100644
--- a/SRC/dsyevd.f
+++ b/SRC/dsyevd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYEVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsyevd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsyevd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -40,13 +38,6 @@
 *> real symmetric matrix A. If eigenvectors are desired, it uses a
 *> divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
-*>
 *> Because of large use of BLAS of level 3, DSYEVD needs N**2 more
 *> workspace than DSYEVX.
 *> \endverbatim
@@ -103,8 +94,7 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array,
-*>                                         dimension (LWORK)
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
@@ -167,7 +157,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYeigen
+*> \ingroup heevd
 *
 *> \par Contributors:
 *  ==================
@@ -180,8 +170,10 @@
 
 *>
 *  =====================================================================
-      SUBROUTINE DSYEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, IWORK,
+      SUBROUTINE DSYEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
+     $                   IWORK,
      $                   LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -217,7 +209,8 @@ SUBROUTINE DSYEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, IWORK,
       EXTERNAL           LSAME, DLAMCH, DLANSY, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLACPY, DLASCL, DORMTR, DSCAL, DSTEDC, DSTERF,
+      EXTERNAL           DLACPY, DLASCL, DORMTR, DSCAL, DSTEDC,
+     $                   DSTERF,
      $                   DSYTRD, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -257,7 +250,8 @@ SUBROUTINE DSYEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, IWORK,
                LWMIN = 2*N + 1
             END IF
             LOPT = MAX( LWMIN, 2*N +
-     $                  ILAENV( 1, 'DSYTRD', UPLO, N, -1, -1, -1 ) )
+     $                  N*ILAENV( 1, 'DSYTRD', UPLO, N, -1, -1,
+     $                            -1 ) )
             LIOPT = LIWMIN
          END IF
          WORK( 1 ) = LOPT
diff --git a/SRC/dsyevd_2stage.f b/SRC/dsyevd_2stage.f
index 0eae8ad062..622be3ab4a 100644
--- a/SRC/dsyevd_2stage.f
+++ b/SRC/dsyevd_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYEVD_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsyevd_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsyevd_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -45,12 +43,6 @@
 *> the reduction to tridiagonal. If eigenvectors are desired, it uses a
 *> divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -119,8 +111,8 @@
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + 2*N+1
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + 2*N+1
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -180,7 +172,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYeigen
+*> \ingroup heevd_2stage
 *
 *> \par Contributors:
 *  ==================
@@ -205,7 +197,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -213,16 +205,17 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE DSYEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
+      SUBROUTINE DSYEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK,
+     $                          LWORK,
      $                          IWORK, LIWORK, INFO )
 *
       IMPLICIT NONE
@@ -262,7 +255,8 @@ SUBROUTINE DSYEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       EXTERNAL           LSAME, DLAMCH, DLANSY, ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLACPY, DLASCL, DORMTR, DSCAL, DSTEDC, DSTERF,
+      EXTERNAL           DLACPY, DLASCL, DORMTR, DSCAL, DSTEDC,
+     $                   DSTERF,
      $                   DSYTRD_2STAGE, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -371,7 +365,7 @@ SUBROUTINE DSYEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       LLWRK2  = LWORK - INDWK2 + 1
 *
       CALL DSYTRD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK( INDE ),
-     $                    WORK( INDTAU ), WORK( INDHOUS ), LHTRD, 
+     $                    WORK( INDTAU ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWRK ), LLWORK, IINFO )
 *
 *     For eigenvalues only, call DSTERF.  For eigenvectors, first call
diff --git a/SRC/dsyevr.f b/SRC/dsyevr.f
index 698691533f..92166fa1bd 100644
--- a/SRC/dsyevr.f
+++ b/SRC/dsyevr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYEVR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsyevr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsyevr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -39,9 +37,16 @@
 *> \verbatim
 *>
 *> DSYEVR computes selected eigenvalues and, optionally, eigenvectors
-*> of a real symmetric matrix A.  Eigenvalues and eigenvectors can be
-*> selected by specifying either a range of values or a range of
-*> indices for the desired eigenvalues.
+*> of a real symmetric matrix A. Eigenvalues and eigenvectors can be
+*> selected by specifying either a range of values or a range of indices
+*> for the desired eigenvalues. Invocations with different choices for
+*> these parameters may result in the computation of slightly different
+*> eigenvalues and/or eigenvectors for the same matrix. The reason for
+*> this behavior is that there exists a variety of algorithms (each
+*> performing best for a particular set of options) with DSYEVR
+*> attempting to select the best based on the various parameters. In all
+*> cases, the computed values are accurate within the limits of finite
+*> precision arithmetic.
 *>
 *> DSYEVR first reduces the matrix A to tridiagonal form T with a call
 *> to DSYTRD.  Then, whenever possible, DSYEVR calls DSTEMR to compute
@@ -105,6 +110,9 @@
 *>          JOBZ is CHARACTER*1
 *>          = 'N':  Compute eigenvalues only;
 *>          = 'V':  Compute eigenvalues and eigenvectors.
+*>
+*>          This parameter influences the choice of the algorithm and
+*>          may alter the computed values.
 *> \endverbatim
 *>
 *> \param[in] RANGE
@@ -116,6 +124,9 @@
 *>          = 'I': the IL-th through IU-th eigenvalues will be found.
 *>          For RANGE = 'V' or 'I' and IU - IL < N - 1, DSTEBZ and
 *>          DSTEIN are called
+*>
+*>          This parameter influences the choice of the algorithm and
+*>          may alter the computed values.
 *> \endverbatim
 *>
 *> \param[in] UPLO
@@ -271,7 +282,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,26*N).
+*>          The dimension of the array WORK.
+*>          If N <= 1, LWORK >= 1, else LWORK >= 26*N.
 *>          For optimal efficiency, LWORK >= (NB+6)*N,
 *>          where NB is the max of the blocksize for DSYTRD and DORMTR
 *>          returned by ILAENV.
@@ -285,13 +297,14 @@
 *> \param[out] IWORK
 *> \verbatim
 *>          IWORK is INTEGER array, dimension (MAX(1,LIWORK))
-*>          On exit, if INFO = 0, IWORK(1) returns the optimal LWORK.
+*>          On exit, if INFO = 0, IWORK(1) returns the optimal LIWORK.
 *> \endverbatim
 *>
 *> \param[in] LIWORK
 *> \verbatim
 *>          LIWORK is INTEGER
-*>          The dimension of the array IWORK.  LIWORK >= max(1,10*N).
+*>          The dimension of the array IWORK.
+*>          If N <= 1, LIWORK >= 1, else LIWORK >= 10*N.
 *>
 *>          If LIWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal size of the IWORK array,
@@ -315,7 +328,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYeigen
+*> \ingroup heevr
 *
 *> \par Contributors:
 *  ==================
@@ -328,9 +341,11 @@
 *>       California at Berkeley, USA \n
 *>
 *  =====================================================================
-      SUBROUTINE DSYEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
+      SUBROUTINE DSYEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL,
+     $                   IU,
      $                   ABSTOL, M, W, Z, LDZ, ISUPPZ, WORK, LWORK,
      $                   IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -370,7 +385,8 @@ SUBROUTINE DSYEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
       EXTERNAL           LSAME, ILAENV, DLAMCH, DLANSY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DORMTR, DSCAL, DSTEBZ, DSTEMR, DSTEIN,
+      EXTERNAL           DCOPY, DORMTR, DSCAL, DSTEBZ, DSTEMR,
+     $                   DSTEIN,
      $                   DSTERF, DSWAP, DSYTRD, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -390,8 +406,13 @@ SUBROUTINE DSYEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *
       LQUERY = ( ( LWORK.EQ.-1 ) .OR. ( LIWORK.EQ.-1 ) )
 *
-      LWMIN = MAX( 1, 26*N )
-      LIWMIN = MAX( 1, 10*N )
+      IF( N.LE.1 ) THEN
+         LWMIN  = 1
+         LIWMIN = 1
+      ELSE
+         LWMIN  = 26*N
+         LIWMIN = 10*N
+      END IF
 *
       INFO = 0
       IF( .NOT.( WANTZ .OR. LSAME( JOBZ, 'N' ) ) ) THEN
@@ -450,7 +471,7 @@ SUBROUTINE DSYEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
       END IF
 *
       IF( N.EQ.1 ) THEN
-         WORK( 1 ) = 7
+         WORK( 1 ) = 1
          IF( ALLEIG .OR. INDEIG ) THEN
             M = 1
             W( 1 ) = A( 1, 1 )
@@ -625,7 +646,8 @@ SUBROUTINE DSYEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *
          INDWKN = INDE
          LLWRKN = LWORK - INDWKN + 1
-         CALL DORMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ), Z,
+         CALL DORMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ),
+     $                Z,
      $                LDZ, WORK( INDWKN ), LLWRKN, IINFO )
       END IF
 *
diff --git a/SRC/dsyevr_2stage.f b/SRC/dsyevr_2stage.f
index 09242bbd31..180800e265 100644
--- a/SRC/dsyevr_2stage.f
+++ b/SRC/dsyevr_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYEVR_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsyevr_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsyevr_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -263,7 +261,7 @@
 *>          indicating the nonzero elements in Z. The i-th eigenvector
 *>          is nonzero only in elements ISUPPZ( 2*i-1 ) through
 *>          ISUPPZ( 2*i ). This is an output of DSTEMR (tridiagonal
-*>          matrix). The support of the eigenvectors of A is typically 
+*>          matrix). The support of the eigenvectors of A is typically
 *>          1:N because of the orthogonal transformations applied by DORMTR.
 *>          Implemented only for RANGE = 'A' or 'I' and IU - IL = N - 1
 *> \endverbatim
@@ -277,12 +275,13 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  
+*>          The dimension of the array WORK.
+*>          If N <= 1,               LWORK must be at least 1.
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, 26*N, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + 5*N
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + 5*N
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -300,13 +299,14 @@
 *> \param[out] IWORK
 *> \verbatim
 *>          IWORK is INTEGER array, dimension (MAX(1,LIWORK))
-*>          On exit, if INFO = 0, IWORK(1) returns the optimal LWORK.
+*>          On exit, if INFO = 0, IWORK(1) returns the optimal LIWORK.
 *> \endverbatim
 *>
 *> \param[in] LIWORK
 *> \verbatim
 *>          LIWORK is INTEGER
-*>          The dimension of the array IWORK.  LIWORK >= max(1,10*N).
+*>          The dimension of the array IWORK.
+*>          If N <= 1, LIWORK >= 1, else LIWORK >= 10*N.
 *>
 *>          If LIWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal size of the IWORK array,
@@ -330,7 +330,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYeigen
+*> \ingroup heevr_2stage
 *
 *> \par Contributors:
 *  ==================
@@ -358,7 +358,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -366,11 +366,11 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
@@ -417,10 +417,12 @@ SUBROUTINE DSYEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       LOGICAL            LSAME
       INTEGER            ILAENV, ILAENV2STAGE
       DOUBLE PRECISION   DLAMCH, DLANSY
-      EXTERNAL           LSAME, DLAMCH, DLANSY, ILAENV, ILAENV2STAGE
+      EXTERNAL           LSAME, DLAMCH, DLANSY, ILAENV,
+     $                   ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DORMTR, DSCAL, DSTEBZ, DSTEMR, DSTEIN,
+      EXTERNAL           DCOPY, DORMTR, DSCAL, DSTEBZ, DSTEMR,
+     $                   DSTEIN,
      $                   DSTERF, DSWAP, DSYTRD_2STAGE, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -440,12 +442,22 @@ SUBROUTINE DSYEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *
       LQUERY = ( ( LWORK.EQ.-1 ) .OR. ( LIWORK.EQ.-1 ) )
 *
-      KD     = ILAENV2STAGE( 1, 'DSYTRD_2STAGE', JOBZ, N, -1, -1, -1 )
-      IB     = ILAENV2STAGE( 2, 'DSYTRD_2STAGE', JOBZ, N, KD, -1, -1 )
-      LHTRD  = ILAENV2STAGE( 3, 'DSYTRD_2STAGE', JOBZ, N, KD, IB, -1 )
-      LWTRD  = ILAENV2STAGE( 4, 'DSYTRD_2STAGE', JOBZ, N, KD, IB, -1 )
-      LWMIN  = MAX( 26*N, 5*N + LHTRD + LWTRD )
-      LIWMIN = MAX( 1, 10*N )
+      KD     = ILAENV2STAGE( 1, 'DSYTRD_2STAGE', JOBZ, N, -1, -1,
+     $                       -1 )
+      IB     = ILAENV2STAGE( 2, 'DSYTRD_2STAGE', JOBZ, N, KD, -1,
+     $                       -1 )
+      LHTRD  = ILAENV2STAGE( 3, 'DSYTRD_2STAGE', JOBZ, N, KD, IB,
+     $                       -1 )
+      LWTRD  = ILAENV2STAGE( 4, 'DSYTRD_2STAGE', JOBZ, N, KD, IB,
+     $                       -1 )
+*
+      IF( N.LE.1 ) THEN
+         LWMIN  = 1
+         LIWMIN = 1
+      ELSE
+         LWMIN  = MAX( 26*N, 5*N + LHTRD + LWTRD )
+         LIWMIN = 10*N
+      END IF
 *
       INFO = 0
       IF( .NOT.( LSAME( JOBZ, 'N' ) ) ) THEN
@@ -484,7 +496,7 @@ SUBROUTINE DSYEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *         NB = ILAENV( 1, 'DSYTRD', UPLO, N, -1, -1, -1 )
 *         NB = MAX( NB, ILAENV( 1, 'DORMTR', UPLO, N, -1, -1, -1 ) )
 *         LWKOPT = MAX( ( NB+1 )*N, LWMIN )
-         WORK( 1 ) = LWMIN
+         WORK( 1 )  = LWMIN
          IWORK( 1 ) = LIWMIN
       END IF
 *
@@ -504,7 +516,7 @@ SUBROUTINE DSYEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       END IF
 *
       IF( N.EQ.1 ) THEN
-         WORK( 1 ) = 7
+         WORK( 1 ) = 1
          IF( ALLEIG .OR. INDEIG ) THEN
             M = 1
             W( 1 ) = A( 1, 1 )
@@ -608,7 +620,7 @@ SUBROUTINE DSYEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *     Call DSYTRD_2STAGE to reduce symmetric matrix to tridiagonal form.
 *
 *
-      CALL DSYTRD_2STAGE( JOBZ, UPLO, N, A, LDA, WORK( INDD ), 
+      CALL DSYTRD_2STAGE( JOBZ, UPLO, N, A, LDA, WORK( INDD ),
      $                    WORK( INDE ), WORK( INDTAU ), WORK( INDHOUS ),
      $                    LHTRD, WORK( INDWK ), LLWORK, IINFO )
 *
@@ -684,7 +696,8 @@ SUBROUTINE DSYEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *
          INDWKN = INDE
          LLWRKN = LWORK - INDWKN + 1
-         CALL DORMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ), Z,
+         CALL DORMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ),
+     $                Z,
      $                LDZ, WORK( INDWKN ), LLWRKN, IINFO )
       END IF
 *
@@ -727,7 +740,7 @@ SUBROUTINE DSYEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *
 *     Set WORK(1) to optimal workspace size.
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 )  = LWMIN
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/dsyevx.f b/SRC/dsyevx.f
index 99719874b5..770b7a6e9f 100644
--- a/SRC/dsyevx.f
+++ b/SRC/dsyevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsyevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsyevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -244,12 +242,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYeigen
+*> \ingroup heevx
 *
 *  =====================================================================
-      SUBROUTINE DSYEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
+      SUBROUTINE DSYEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL,
+     $                   IU,
      $                   ABSTOL, M, W, Z, LDZ, WORK, LWORK, IWORK,
      $                   IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -289,7 +289,8 @@ SUBROUTINE DSYEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
       EXTERNAL           LSAME, ILAENV, DLAMCH, DLANSY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLACPY, DORGTR, DORMTR, DSCAL, DSTEBZ,
+      EXTERNAL           DCOPY, DLACPY, DORGTR, DORMTR, DSCAL,
+     $                   DSTEBZ,
      $                   DSTEIN, DSTEQR, DSTERF, DSWAP, DSYTRD, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -338,14 +339,15 @@ SUBROUTINE DSYEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
       IF( INFO.EQ.0 ) THEN
          IF( N.LE.1 ) THEN
             LWKMIN = 1
-            WORK( 1 ) = LWKMIN
+            LWKOPT = 1
          ELSE
             LWKMIN = 8*N
             NB = ILAENV( 1, 'DSYTRD', UPLO, N, -1, -1, -1 )
-            NB = MAX( NB, ILAENV( 1, 'DORMTR', UPLO, N, -1, -1, -1 ) )
+            NB = MAX( NB, ILAENV( 1, 'DORMTR', UPLO, N, -1, -1,
+     $                -1 ) )
             LWKOPT = MAX( LWKMIN, ( NB + 3 )*N )
-            WORK( 1 ) = LWKOPT
          END IF
+         WORK( 1 ) = LWKOPT
 *
          IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY )
      $      INFO = -17
@@ -494,7 +496,8 @@ SUBROUTINE DSYEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *
          INDWKN = INDE
          LLWRKN = LWORK - INDWKN + 1
-         CALL DORMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ), Z,
+         CALL DORMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ),
+     $                Z,
      $                LDZ, WORK( INDWKN ), LLWRKN, IINFO )
       END IF
 *
diff --git a/SRC/dsyevx_2stage.f b/SRC/dsyevx_2stage.f
index dbb3203d29..7f2c7ffb0d 100644
--- a/SRC/dsyevx_2stage.f
+++ b/SRC/dsyevx_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYEVX_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsyevx_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsyevx_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -208,12 +206,12 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, 8*N, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + 3*N
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + 3*N
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -259,7 +257,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYeigen
+*> \ingroup heevx_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -277,7 +275,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -285,11 +283,11 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
@@ -338,7 +336,8 @@ SUBROUTINE DSYEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       EXTERNAL           LSAME, DLAMCH, DLANSY, ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLACPY, DORGTR, DORMTR, DSCAL, DSTEBZ,
+      EXTERNAL           DCOPY, DLACPY, DORGTR, DORMTR, DSCAL,
+     $                   DSTEBZ,
      $                   DSTEIN, DSTEQR, DSTERF, DSWAP, XERBLA,
      $                   DSYTRD_2STAGE
 *     ..
@@ -487,7 +486,7 @@ SUBROUTINE DSYEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       INDWRK  = INDHOUS + LHTRD
       LLWORK  = LWORK - INDWRK + 1
 *
-      CALL DSYTRD_2STAGE( JOBZ, UPLO, N, A, LDA, WORK( INDD ), 
+      CALL DSYTRD_2STAGE( JOBZ, UPLO, N, A, LDA, WORK( INDD ),
      $                    WORK( INDE ), WORK( INDTAU ), WORK( INDHOUS ),
      $                    LHTRD, WORK( INDWRK ), LLWORK, IINFO )
 *
@@ -552,7 +551,8 @@ SUBROUTINE DSYEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *
          INDWKN = INDE
          LLWRKN = LWORK - INDWKN + 1
-         CALL DORMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ), Z,
+         CALL DORMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ),
+     $                Z,
      $                LDZ, WORK( INDWKN ), LLWRKN, IINFO )
       END IF
 *
diff --git a/SRC/dsygs2.f b/SRC/dsygs2.f
index 8a39bea77e..7cf3e344b4 100644
--- a/SRC/dsygs2.f
+++ b/SRC/dsygs2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYGS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsygs2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsygs2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,10 +118,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hegs2
 *
 *  =====================================================================
       SUBROUTINE DSYGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -149,7 +148,8 @@ SUBROUTINE DSYGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
       DOUBLE PRECISION   AKK, BKK, CT
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DSCAL, DSYR2, DTRMV, DTRSV, XERBLA
+      EXTERNAL           DAXPY, DSCAL, DSYR2, DTRMV, DTRSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -221,10 +221,12 @@ SUBROUTINE DSYGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
                IF( K.LT.N ) THEN
                   CALL DSCAL( N-K, ONE / BKK, A( K+1, K ), 1 )
                   CT = -HALF*AKK
-                  CALL DAXPY( N-K, CT, B( K+1, K ), 1, A( K+1, K ), 1 )
+                  CALL DAXPY( N-K, CT, B( K+1, K ), 1, A( K+1, K ),
+     $                        1 )
                   CALL DSYR2( UPLO, N-K, -ONE, A( K+1, K ), 1,
      $                        B( K+1, K ), 1, A( K+1, K+1 ), LDA )
-                  CALL DAXPY( N-K, CT, B( K+1, K ), 1, A( K+1, K ), 1 )
+                  CALL DAXPY( N-K, CT, B( K+1, K ), 1, A( K+1, K ),
+     $                        1 )
                   CALL DTRSV( UPLO, 'No transpose', 'Non-unit', N-K,
      $                        B( K+1, K+1 ), LDB, A( K+1, K ), 1 )
                END IF
@@ -245,7 +247,8 @@ SUBROUTINE DSYGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
      $                     LDB, A( 1, K ), 1 )
                CT = HALF*AKK
                CALL DAXPY( K-1, CT, B( 1, K ), 1, A( 1, K ), 1 )
-               CALL DSYR2( UPLO, K-1, ONE, A( 1, K ), 1, B( 1, K ), 1,
+               CALL DSYR2( UPLO, K-1, ONE, A( 1, K ), 1, B( 1, K ),
+     $                     1,
      $                     A, LDA )
                CALL DAXPY( K-1, CT, B( 1, K ), 1, A( 1, K ), 1 )
                CALL DSCAL( K-1, BKK, A( 1, K ), 1 )
@@ -261,7 +264,8 @@ SUBROUTINE DSYGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
 *
                AKK = A( K, K )
                BKK = B( K, K )
-               CALL DTRMV( UPLO, 'Transpose', 'Non-unit', K-1, B, LDB,
+               CALL DTRMV( UPLO, 'Transpose', 'Non-unit', K-1, B,
+     $                     LDB,
      $                     A( K, 1 ), LDA )
                CT = HALF*AKK
                CALL DAXPY( K-1, CT, B( K, 1 ), LDB, A( K, 1 ), LDA )
diff --git a/SRC/dsygst.f b/SRC/dsygst.f
index 05b90372ab..745c7e8321 100644
--- a/SRC/dsygst.f
+++ b/SRC/dsygst.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYGST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsygst.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsygst.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,10 +118,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hegst
 *
 *  =====================================================================
       SUBROUTINE DSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -148,7 +147,8 @@ SUBROUTINE DSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
       INTEGER            K, KB, NB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSYGS2, DSYMM, DSYR2K, DTRMM, DTRSM, XERBLA
+      EXTERNAL           DSYGS2, DSYMM, DSYR2K, DTRMM, DTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -211,13 +211,15 @@ SUBROUTINE DSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
                   CALL DSYGS2( ITYPE, UPLO, KB, A( K, K ), LDA,
      $                         B( K, K ), LDB, INFO )
                   IF( K+KB.LE.N ) THEN
-                     CALL DTRSM( 'Left', UPLO, 'Transpose', 'Non-unit',
+                     CALL DTRSM( 'Left', UPLO, 'Transpose',
+     $                           'Non-unit',
      $                           KB, N-K-KB+1, ONE, B( K, K ), LDB,
      $                           A( K, K+KB ), LDA )
                      CALL DSYMM( 'Left', UPLO, KB, N-K-KB+1, -HALF,
      $                           A( K, K ), LDA, B( K, K+KB ), LDB, ONE,
      $                           A( K, K+KB ), LDA )
-                     CALL DSYR2K( UPLO, 'Transpose', N-K-KB+1, KB, -ONE,
+                     CALL DSYR2K( UPLO, 'Transpose', N-K-KB+1, KB,
+     $                            -ONE,
      $                            A( K, K+KB ), LDA, B( K, K+KB ), LDB,
      $                            ONE, A( K+KB, K+KB ), LDA )
                      CALL DSYMM( 'Left', UPLO, KB, N-K-KB+1, -HALF,
@@ -241,7 +243,8 @@ SUBROUTINE DSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
                   CALL DSYGS2( ITYPE, UPLO, KB, A( K, K ), LDA,
      $                         B( K, K ), LDB, INFO )
                   IF( K+KB.LE.N ) THEN
-                     CALL DTRSM( 'Right', UPLO, 'Transpose', 'Non-unit',
+                     CALL DTRSM( 'Right', UPLO, 'Transpose',
+     $                           'Non-unit',
      $                           N-K-KB+1, KB, ONE, B( K, K ), LDB,
      $                           A( K+KB, K ), LDA )
                      CALL DSYMM( 'Right', UPLO, N-K-KB+1, KB, -HALF,
@@ -270,14 +273,17 @@ SUBROUTINE DSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
 *
 *                 Update the upper triangle of A(1:k+kb-1,1:k+kb-1)
 *
-                  CALL DTRMM( 'Left', UPLO, 'No transpose', 'Non-unit',
+                  CALL DTRMM( 'Left', UPLO, 'No transpose',
+     $                        'Non-unit',
      $                        K-1, KB, ONE, B, LDB, A( 1, K ), LDA )
-                  CALL DSYMM( 'Right', UPLO, K-1, KB, HALF, A( K, K ),
+                  CALL DSYMM( 'Right', UPLO, K-1, KB, HALF, A( K,
+     $                        K ),
      $                        LDA, B( 1, K ), LDB, ONE, A( 1, K ), LDA )
                   CALL DSYR2K( UPLO, 'No transpose', K-1, KB, ONE,
      $                         A( 1, K ), LDA, B( 1, K ), LDB, ONE, A,
      $                         LDA )
-                  CALL DSYMM( 'Right', UPLO, K-1, KB, HALF, A( K, K ),
+                  CALL DSYMM( 'Right', UPLO, K-1, KB, HALF, A( K,
+     $                        K ),
      $                        LDA, B( 1, K ), LDB, ONE, A( 1, K ), LDA )
                   CALL DTRMM( 'Right', UPLO, 'Transpose', 'Non-unit',
      $                        K-1, KB, ONE, B( K, K ), LDB, A( 1, K ),
@@ -294,7 +300,8 @@ SUBROUTINE DSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
 *
 *                 Update the lower triangle of A(1:k+kb-1,1:k+kb-1)
 *
-                  CALL DTRMM( 'Right', UPLO, 'No transpose', 'Non-unit',
+                  CALL DTRMM( 'Right', UPLO, 'No transpose',
+     $                        'Non-unit',
      $                        KB, K-1, ONE, B, LDB, A( K, 1 ), LDA )
                   CALL DSYMM( 'Left', UPLO, KB, K-1, HALF, A( K, K ),
      $                        LDA, B( K, 1 ), LDB, ONE, A( K, 1 ), LDA )
@@ -303,7 +310,8 @@ SUBROUTINE DSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
      $                         LDA )
                   CALL DSYMM( 'Left', UPLO, KB, K-1, HALF, A( K, K ),
      $                        LDA, B( K, 1 ), LDB, ONE, A( K, 1 ), LDA )
-                  CALL DTRMM( 'Left', UPLO, 'Transpose', 'Non-unit', KB,
+                  CALL DTRMM( 'Left', UPLO, 'Transpose', 'Non-unit',
+     $                        KB,
      $                        K-1, ONE, B( K, K ), LDB, A( K, 1 ), LDA )
                   CALL DSYGS2( ITYPE, UPLO, KB, A( K, K ), LDA,
      $                         B( K, K ), LDB, INFO )
diff --git a/SRC/dsygv.f b/SRC/dsygv.f
index 5208dbb1f1..6e00cbf924 100644
--- a/SRC/dsygv.f
+++ b/SRC/dsygv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsygv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsygv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -154,7 +152,7 @@
 *>                    i off-diagonal elements of an intermediate
 *>                    tridiagonal form did not converge to zero;
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -167,11 +165,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYeigen
+*> \ingroup hegv
 *
 *  =====================================================================
-      SUBROUTINE DSYGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
+      SUBROUTINE DSYGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
+     $                  WORK,
      $                  LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -202,7 +202,8 @@ SUBROUTINE DSYGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DPOTRF, DSYEV, DSYGST, DTRMM, DTRSM, XERBLA
+      EXTERNAL           DPOTRF, DSYEV, DSYGST, DTRMM, DTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -284,7 +285,8 @@ SUBROUTINE DSYGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
                TRANS = 'T'
             END IF
 *
-            CALL DTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG, ONE,
+            CALL DTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG,
+     $                  ONE,
      $                  B, LDB, A, LDA )
 *
          ELSE IF( ITYPE.EQ.3 ) THEN
@@ -298,7 +300,8 @@ SUBROUTINE DSYGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
                TRANS = 'N'
             END IF
 *
-            CALL DTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG, ONE,
+            CALL DTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG,
+     $                  ONE,
      $                  B, LDB, A, LDA )
          END IF
       END IF
diff --git a/SRC/dsygv_2stage.f b/SRC/dsygv_2stage.f
index 5c71ebf94c..51e9afbc63 100644
--- a/SRC/dsygv_2stage.f
+++ b/SRC/dsygv_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYGV_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsygv_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsygv_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -143,12 +141,12 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + 2*N
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + 2*N
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -173,7 +171,7 @@
 *>                    i off-diagonal elements of an intermediate
 *>                    tridiagonal form did not converge to zero;
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -186,7 +184,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYeigen
+*> \ingroup hegv_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -204,7 +202,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -212,16 +210,17 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE DSYGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
+      SUBROUTINE DSYGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB,
+     $                         W,
      $                         WORK, LWORK, INFO )
 *
       IMPLICIT NONE
@@ -247,7 +246,7 @@ SUBROUTINE DSYGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
 *     .. Local Scalars ..
       LOGICAL            LQUERY, UPPER, WANTZ
       CHARACTER          TRANS
-      INTEGER            NEIG, LWMIN, LHTRD, LWTRD, KD, IB 
+      INTEGER            NEIG, LWMIN, LHTRD, LWTRD, KD, IB
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -255,7 +254,8 @@ SUBROUTINE DSYGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
       EXTERNAL           LSAME, ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DPOTRF, DSYGST, DTRMM, DTRSM, XERBLA,
+      EXTERNAL           DPOTRF, DSYGST, DTRMM, DTRSM,
+     $                   XERBLA,
      $                   DSYEV_2STAGE
 *     ..
 *     .. Intrinsic Functions ..
@@ -285,10 +285,14 @@ SUBROUTINE DSYGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         KD    = ILAENV2STAGE( 1, 'DSYTRD_2STAGE', JOBZ, N, -1, -1, -1 )
-         IB    = ILAENV2STAGE( 2, 'DSYTRD_2STAGE', JOBZ, N, KD, -1, -1 )
-         LHTRD = ILAENV2STAGE( 3, 'DSYTRD_2STAGE', JOBZ, N, KD, IB, -1 )
-         LWTRD = ILAENV2STAGE( 4, 'DSYTRD_2STAGE', JOBZ, N, KD, IB, -1 )
+         KD    = ILAENV2STAGE( 1, 'DSYTRD_2STAGE', JOBZ, N, -1, -1,
+     $                         -1 )
+         IB    = ILAENV2STAGE( 2, 'DSYTRD_2STAGE', JOBZ, N, KD, -1,
+     $                         -1 )
+         LHTRD = ILAENV2STAGE( 3, 'DSYTRD_2STAGE', JOBZ, N, KD, IB,
+     $                         -1 )
+         LWTRD = ILAENV2STAGE( 4, 'DSYTRD_2STAGE', JOBZ, N, KD, IB,
+     $                         -1 )
          LWMIN = 2*N + LHTRD + LWTRD
          WORK( 1 )  = LWMIN
 *
@@ -320,7 +324,8 @@ SUBROUTINE DSYGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL DSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
-      CALL DSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, INFO )
+      CALL DSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
+     $                   INFO )
 *
       IF( WANTZ ) THEN
 *
@@ -340,7 +345,8 @@ SUBROUTINE DSYGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
                TRANS = 'T'
             END IF
 *
-            CALL DTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG, ONE,
+            CALL DTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG,
+     $                  ONE,
      $                  B, LDB, A, LDA )
 *
          ELSE IF( ITYPE.EQ.3 ) THEN
@@ -354,7 +360,8 @@ SUBROUTINE DSYGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
                TRANS = 'N'
             END IF
 *
-            CALL DTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG, ONE,
+            CALL DTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG,
+     $                  ONE,
      $                  B, LDB, A, LDA )
          END IF
       END IF
diff --git a/SRC/dsygvd.f b/SRC/dsygvd.f
index 61134bedce..6dbb777de9 100644
--- a/SRC/dsygvd.f
+++ b/SRC/dsygvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYGVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsygvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsygvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -42,12 +40,6 @@
 *> B are assumed to be symmetric and B is also positive definite.
 *> If eigenvectors are desired, it uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -190,7 +182,7 @@
 *>                    the submatrix lying in rows and columns INFO/(N+1)
 *>                    through mod(INFO,N+1);
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -203,7 +195,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYeigen
+*> \ingroup hegvd
 *
 *> \par Further Details:
 *  =====================
@@ -222,8 +214,10 @@
 *>     Mark Fahey, Department of Mathematics, Univ. of Kentucky, USA
 *>
 *  =====================================================================
-      SUBROUTINE DSYGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
+      SUBROUTINE DSYGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
+     $                   WORK,
      $                   LWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -254,7 +248,8 @@ SUBROUTINE DSYGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DPOTRF, DSYEVD, DSYGST, DTRMM, DTRSM, XERBLA
+      EXTERNAL           DPOTRF, DSYEVD, DSYGST, DTRMM, DTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, MAX
@@ -328,10 +323,11 @@ SUBROUTINE DSYGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL DSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
-      CALL DSYEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, IWORK, LIWORK,
+      CALL DSYEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, IWORK,
+     $             LIWORK,
      $             INFO )
-      LOPT = MAX( DBLE( LOPT ), DBLE( WORK( 1 ) ) )
-      LIOPT = MAX( DBLE( LIOPT ), DBLE( IWORK( 1 ) ) )
+      LOPT = INT( MAX( DBLE( LOPT ), DBLE( WORK( 1 ) ) ) )
+      LIOPT = INT( MAX( DBLE( LIOPT ), DBLE( IWORK( 1 ) ) ) )
 *
       IF( WANTZ .AND. INFO.EQ.0 ) THEN
 *
diff --git a/SRC/dsygvx.f b/SRC/dsygvx.f
index 3fa55b97c1..c5059bbaf4 100644
--- a/SRC/dsygvx.f
+++ b/SRC/dsygvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYGVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsygvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsygvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -270,7 +268,7 @@
 *>                    i eigenvectors failed to converge.  Their indices
 *>                    are stored in array IFAIL.
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -283,7 +281,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYeigen
+*> \ingroup hegvx
 *
 *> \par Contributors:
 *  ==================
@@ -294,6 +292,7 @@
       SUBROUTINE DSYGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
      $                   VL, VU, IL, IU, ABSTOL, M, W, Z, LDZ, WORK,
      $                   LWORK, IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -327,7 +326,8 @@ SUBROUTINE DSYGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DPOTRF, DSYEVX, DSYGST, DTRMM, DTRSM, XERBLA
+      EXTERNAL           DPOTRF, DSYEVX, DSYGST, DTRMM, DTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -412,7 +412,8 @@ SUBROUTINE DSYGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL DSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
-      CALL DSYEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU, ABSTOL,
+      CALL DSYEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
+     $             ABSTOL,
      $             M, W, Z, LDZ, WORK, LWORK, IWORK, IFAIL, INFO )
 *
       IF( WANTZ ) THEN
@@ -432,7 +433,8 @@ SUBROUTINE DSYGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
                TRANS = 'T'
             END IF
 *
-            CALL DTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, M, ONE, B,
+            CALL DTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, M, ONE,
+     $                  B,
      $                  LDB, Z, LDZ )
 *
          ELSE IF( ITYPE.EQ.3 ) THEN
@@ -446,7 +448,8 @@ SUBROUTINE DSYGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
                TRANS = 'N'
             END IF
 *
-            CALL DTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, M, ONE, B,
+            CALL DTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, M, ONE,
+     $                  B,
      $                  LDB, Z, LDZ )
          END IF
       END IF
diff --git a/SRC/dsyrfs.f b/SRC/dsyrfs.f
index eb23fd6019..1d3cab01dc 100644
--- a/SRC/dsyrfs.f
+++ b/SRC/dsyrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsyrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsyrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -183,11 +181,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup herfs
 *
 *  =====================================================================
-      SUBROUTINE DSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
+      SUBROUTINE DSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
+     $                   LDB,
      $                   X, LDX, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -226,7 +226,8 @@ SUBROUTINE DSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DLACN2, DSYMV, DSYTRS, XERBLA
+      EXTERNAL           DAXPY, DCOPY, DLACN2, DSYMV, DSYTRS,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -395,14 +396,16 @@ SUBROUTINE DSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
 *
          KASE = 0
   100    CONTINUE
-         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
 *
 *              Multiply by diag(W)*inv(A**T).
 *
-               CALL DSYTRS( UPLO, N, 1, AF, LDAF, IPIV, WORK( N+1 ), N,
+               CALL DSYTRS( UPLO, N, 1, AF, LDAF, IPIV, WORK( N+1 ),
+     $                      N,
      $                      INFO )
                DO 110 I = 1, N
                   WORK( N+I ) = WORK( I )*WORK( N+I )
@@ -414,7 +417,8 @@ SUBROUTINE DSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
                DO 120 I = 1, N
                   WORK( N+I ) = WORK( I )*WORK( N+I )
   120          CONTINUE
-               CALL DSYTRS( UPLO, N, 1, AF, LDAF, IPIV, WORK( N+1 ), N,
+               CALL DSYTRS( UPLO, N, 1, AF, LDAF, IPIV, WORK( N+1 ),
+     $                      N,
      $                      INFO )
             END IF
             GO TO 100
diff --git a/SRC/dsyrfsx.f b/SRC/dsyrfsx.f
index f3a1d75447..a0e28affb0 100644
--- a/SRC/dsyrfsx.f
+++ b/SRC/dsyrfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYRFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsyrfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsyrfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -392,13 +390,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup herfsx
 *
 *  =====================================================================
-      SUBROUTINE DSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE DSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    S, B, LDB, X, LDX, RCOND, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -517,7 +517,8 @@ SUBROUTINE DSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Test input parameters.
 *
-      IF ( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF ( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $     .NOT.LSAME( UPLO, 'L' ) ) THEN
         INFO = -1
       ELSE IF( .NOT.RCEQU .AND. .NOT.LSAME( EQUED, 'N' ) ) THEN
         INFO = -2
@@ -602,7 +603,8 @@ SUBROUTINE DSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
      $        INFO )
       END IF
 
-      ERR_LBND = MAX( 10.0D+0, SQRT( DBLE( N ) ) )*DLAMCH( 'Epsilon' )
+      ERR_LBND = MAX( 10.0D+0,
+     $                SQRT( DBLE( N ) ) )*DLAMCH( 'Epsilon' )
       IF (N_ERR_BNDS .GE. 1 .AND. N_NORMS .GE. 1) THEN
 *
 *     Compute scaled normwise condition number cond(A*C).
@@ -656,7 +658,8 @@ SUBROUTINE DSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
          DO J = 1, NRHS
             IF ( ERR_BNDS_COMP( J, LA_LINRX_ERR_I ) .LT. CWISE_WRONG )
      $     THEN
-               RCOND_TMP = DLA_SYRCOND( UPLO, N, A, LDA, AF, LDAF, IPIV,
+               RCOND_TMP = DLA_SYRCOND( UPLO, N, A, LDA, AF, LDAF,
+     $                                  IPIV,
      $              1, X(1,J), INFO, WORK, IWORK )
             ELSE
                RCOND_TMP = 0.0D+0
diff --git a/SRC/dsysv.f b/SRC/dsysv.f
index a6305e13c3..51eb022620 100644
--- a/SRC/dsysv.f
+++ b/SRC/dsysv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsysv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsysv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,11 +161,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYsolve
+*> \ingroup hesv
 *
 *  =====================================================================
       SUBROUTINE DSYSV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
      $                  LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -204,7 +203,8 @@ SUBROUTINE DSYSV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -223,7 +223,7 @@ SUBROUTINE DSYSV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
             LWKOPT = 1
          ELSE
             CALL DSYTRF( UPLO, N, A, LDA, IPIV, WORK, -1, INFO )
-            LWKOPT = WORK(1)
+            LWKOPT = INT( WORK( 1 ) )
          END IF
          WORK( 1 ) = LWKOPT
       END IF
diff --git a/SRC/dsysv_aa.f b/SRC/dsysv_aa.f
index 8dab5a384d..2757bff994 100644
--- a/SRC/dsysv_aa.f
+++ b/SRC/dsysv_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYSV_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsysv_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsysv_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -154,11 +152,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYsolve
+*> \ingroup hesv_aa
 *
 *  =====================================================================
       SUBROUTINE DSYSV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
      $                     LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -177,7 +176,7 @@ SUBROUTINE DSYSV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
 *     .. Local Scalars ..
       LOGICAL            LQUERY
-      INTEGER            LWKOPT, LWKOPT_SYTRF, LWKOPT_SYTRS
+      INTEGER            LWKMIN, LWKOPT, LWKOPT_SYTRF, LWKOPT_SYTRS
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -196,7 +195,9 @@ SUBROUTINE DSYSV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      LWKMIN = MAX( 1, 2*N, 3*N-2 )
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -206,17 +207,17 @@ SUBROUTINE DSYSV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
          INFO = -5
       ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
          INFO = -8
-      ELSE IF( LWORK.LT.MAX(2*N, 3*N-2) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -10
       END IF
 *
       IF( INFO.EQ.0 ) THEN
          CALL DSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, -1, INFO )
-         LWKOPT_SYTRF = INT( WORK(1) )
+         LWKOPT_SYTRF = INT( WORK( 1 ) )
          CALL DSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
      $                   -1, INFO )
-         LWKOPT_SYTRS = INT( WORK(1) )
-         LWKOPT = MAX( LWKOPT_SYTRF, LWKOPT_SYTRS )
+         LWKOPT_SYTRS = INT( WORK( 1 ) )
+         LWKOPT = MAX( LWKMIN, LWKOPT_SYTRF, LWKOPT_SYTRS )
          WORK( 1 ) = LWKOPT
       END IF
 *
diff --git a/SRC/dsysv_aa_2stage.f b/SRC/dsysv_aa_2stage.f
index 1100702ba0..f38d86f477 100644
--- a/SRC/dsysv_aa_2stage.f
+++ b/SRC/dsysv_aa_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYSV_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsysv_aa_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsysv_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -89,7 +87,7 @@
 *>          triangular part of the matrix A, and the strictly upper
 *>          triangular part of A is not referenced.
 *>
-*>          On exit, L is stored below (or above) the subdiaonal blocks,
+*>          On exit, L is stored below (or above) the subdiagonal blocks,
 *>          when UPLO  is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -101,14 +99,14 @@
 *>
 *> \param[out] TB
 *> \verbatim
-*>          TB is DOUBLE PRECISION array, dimension (LTB)
+*>          TB is DOUBLE PRECISION array, dimension (MAX(1,LTB))
 *>          On exit, details of the LU factorization of the band matrix.
 *> \endverbatim
 *>
 *> \param[in] LTB
 *> \verbatim
 *>          LTB is INTEGER
-*>          The size of the array TB. LTB >= 4*N, internally
+*>          The size of the array TB. LTB >= MAX(1,4*N), internally
 *>          used to select NB such that LTB >= (3*NB+1)*N.
 *>
 *>          If LTB = -1, then a workspace query is assumed; the
@@ -148,14 +146,15 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION workspace of size LWORK
+*>          WORK is DOUBLE PRECISION workspace of size (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The size of WORK. LWORK >= N, internally used to select NB
-*>          such that LWORK >= N*NB.
+*>          The size of WORK. LWORK >= MAX(1,N), internally used to
+*>          select NB such that LWORK >= N*NB.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal size of the WORK array,
@@ -179,7 +178,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYsolve
+*> \ingroup hesv_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE DSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
@@ -205,7 +204,7 @@ SUBROUTINE DSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *     .. Local Scalars ..
       LOGICAL            UPPER, TQUERY, WQUERY
-      INTEGER            LWKOPT
+      INTEGER            LWKMIN, LWKOPT
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -226,6 +225,7 @@ SUBROUTINE DSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
       UPPER = LSAME( UPLO, 'U' )
       WQUERY = ( LWORK.EQ.-1 )
       TQUERY = ( LTB.EQ.-1 )
+      LWKMIN = MAX( 1, N )
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
@@ -234,18 +234,19 @@ SUBROUTINE DSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
          INFO = -3
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -5
-      ELSE IF( LTB.LT.( 4*N ) .AND. .NOT.TQUERY ) THEN
+      ELSE IF( LTB.LT.MAX( 1, 4*N ) .AND. .NOT.TQUERY ) THEN
          INFO = -7
       ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
          INFO = -11
-      ELSE IF( LWORK.LT.N .AND. .NOT.WQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.WQUERY ) THEN
          INFO = -13
       END IF
 *
       IF( INFO.EQ.0 ) THEN
          CALL DSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, -1, IPIV,
      $                          IPIV2, WORK, -1, INFO )
-         LWKOPT = INT( WORK(1) )
+         LWKOPT = MAX( LWKMIN, INT( WORK( 1 ) ) )
+         WORK( 1 ) = LWKOPT
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -255,7 +256,6 @@ SUBROUTINE DSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
          RETURN
       END IF
 *
-*
 *     Compute the factorization A = U**T*T*U or A = L*T*L**T.
 *
       CALL DSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV, IPIV2,
diff --git a/SRC/dsysv_rk.f b/SRC/dsysv_rk.f
index 05d8f7d3ff..cb00228e1c 100644
--- a/SRC/dsysv_rk.f
+++ b/SRC/dsysv_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYSV_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsysv_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsysv_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -205,7 +203,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYsolve
+*> \ingroup hesv_rk
 *
 *> \par Contributors:
 *  ==================
@@ -225,6 +223,7 @@
 *  =====================================================================
       SUBROUTINE DSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
      $                     WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -261,7 +260,8 @@ SUBROUTINE DSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -279,8 +279,9 @@ SUBROUTINE DSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
          IF( N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            CALL DSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, -1, INFO )
-            LWKOPT = WORK(1)
+            CALL DSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, -1,
+     $                      INFO )
+            LWKOPT = INT( WORK( 1 ) )
          END IF
          WORK( 1 ) = LWKOPT
       END IF
@@ -301,7 +302,8 @@ SUBROUTINE DSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Solve the system A*X = B with BLAS3 solver, overwriting B with X.
 *
-         CALL DSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, INFO )
+         CALL DSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
+     $                  INFO )
 *
       END IF
 *
diff --git a/SRC/dsysv_rook.f b/SRC/dsysv_rook.f
index 6ebb52eae4..ead2f15b30 100644
--- a/SRC/dsysv_rook.f
+++ b/SRC/dsysv_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYSV_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsysv_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsysv_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -181,7 +179,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYsolve
+*> \ingroup hesv_rook
 *
 *> \par Contributors:
 *  ==================
@@ -199,8 +197,10 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE DSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
+      SUBROUTINE DSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
+     $                       WORK,
      $                  LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -237,7 +237,8 @@ SUBROUTINE DSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -256,7 +257,7 @@ SUBROUTINE DSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
             LWKOPT = 1
          ELSE
             CALL DSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, -1, INFO )
-            LWKOPT = WORK(1)
+            LWKOPT = INT( WORK( 1 ) )
          END IF
          WORK( 1 ) = LWKOPT
       END IF
@@ -277,7 +278,8 @@ SUBROUTINE DSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
 *        Solve with TRS_ROOK ( Use Level 2 BLAS)
 *
-         CALL DSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+         CALL DSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
+     $                     INFO )
 *
       END IF
 *
diff --git a/SRC/dsysvx.f b/SRC/dsysvx.f
index a30831e726..e8c0c24fef 100644
--- a/SRC/dsysvx.f
+++ b/SRC/dsysvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsysvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsysvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -275,12 +273,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYsolve
+*> \ingroup hesvx
 *
 *  =====================================================================
-      SUBROUTINE DSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
+      SUBROUTINE DSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
+     $                   B,
      $                   LDB, X, LDX, RCOND, FERR, BERR, WORK, LWORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -305,7 +305,7 @@ SUBROUTINE DSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, NOFACT
-      INTEGER            LWKOPT, NB
+      INTEGER            LWKMIN, LWKOPT, NB
       DOUBLE PRECISION   ANORM
 *     ..
 *     .. External Functions ..
@@ -315,7 +315,8 @@ SUBROUTINE DSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
       EXTERNAL           LSAME, ILAENV, DLAMCH, DLANSY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLACPY, DSYCON, DSYRFS, DSYTRF, DSYTRS, XERBLA
+      EXTERNAL           DLACPY, DSYCON, DSYRFS, DSYTRF, DSYTRS,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -327,9 +328,11 @@ SUBROUTINE DSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
       INFO = 0
       NOFACT = LSAME( FACT, 'N' )
       LQUERY = ( LWORK.EQ.-1 )
+      LWKMIN = MAX( 1, 3*N )
       IF( .NOT.NOFACT .AND. .NOT.LSAME( FACT, 'F' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -344,12 +347,12 @@ SUBROUTINE DSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
          INFO = -11
       ELSE IF( LDX.LT.MAX( 1, N ) ) THEN
          INFO = -13
-      ELSE IF( LWORK.LT.MAX( 1, 3*N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -18
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         LWKOPT = MAX( 1, 3*N )
+         LWKOPT = LWKMIN
          IF( NOFACT ) THEN
             NB = ILAENV( 1, 'DSYTRF', UPLO, N, -1, -1, -1 )
             LWKOPT = MAX( LWKOPT, N*NB )
@@ -385,7 +388,8 @@ SUBROUTINE DSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL DSYCON( UPLO, N, AF, LDAF, IPIV, ANORM, RCOND, WORK, IWORK,
+      CALL DSYCON( UPLO, N, AF, LDAF, IPIV, ANORM, RCOND, WORK,
+     $             IWORK,
      $             INFO )
 *
 *     Compute the solution vectors X.
diff --git a/SRC/dsysvxx.f b/SRC/dsysvxx.f
index 82d30a4b71..3ded3fb8ed 100644
--- a/SRC/dsysvxx.f
+++ b/SRC/dsysvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYSVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsysvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsysvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -495,13 +493,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYsolve
+*> \ingroup hesvxx
 *
 *  =====================================================================
-      SUBROUTINE DSYSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE DSYSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    EQUED, S, B, LDB, X, LDX, RCOND, RPVGRW, BERR,
      $                    N_ERR_BNDS, ERR_BNDS_NORM, ERR_BNDS_COMP,
      $                    NPARAMS, PARAMS, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -626,7 +626,8 @@ SUBROUTINE DSYSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Compute row and column scalings to equilibrate the matrix A.
 *
-         CALL DSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFEQU )
+         CALL DSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK,
+     $                 INFEQU )
          IF( INFEQU.EQ.0 ) THEN
 *
 *     Equilibrate the matrix.
@@ -645,7 +646,8 @@ SUBROUTINE DSYSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *        Compute the LDL^T or UDU^T factorization of A.
 *
          CALL DLACPY( UPLO, N, N, A, LDA, AF, LDAF )
-         CALL DSYTRF( UPLO, N, AF, LDAF, IPIV, WORK, 5*MAX(1,N), INFO )
+         CALL DSYTRF( UPLO, N, AF, LDAF, IPIV, WORK, 5*MAX(1,N),
+     $                INFO )
 *
 *        Return if INFO is non-zero.
 *
diff --git a/SRC/dsyswapr.f b/SRC/dsyswapr.f
index c60ccbefc3..7d0348b1ad 100644
--- a/SRC/dsyswapr.f
+++ b/SRC/dsyswapr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYSWAPR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsyswapr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsyswapr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -57,16 +55,14 @@
 *>
 *> \param[in,out] A
 *> \verbatim
-*>          A is DOUBLE PRECISION array, dimension (LDA,N)
-*>          On entry, the NB diagonal matrix D and the multipliers
-*>          used to obtain the factor U or L as computed by DSYTRF.
-*>
-*>          On exit, if INFO = 0, the (symmetric) inverse of the original
-*>          matrix.  If UPLO = 'U', the upper triangular part of the
-*>          inverse is formed and the part of A below the diagonal is not
-*>          referenced; if UPLO = 'L' the lower triangular part of the
-*>          inverse is formed and the part of A above the diagonal is
-*>          not referenced.
+*>          A is DOUBLE PRECISION array, dimension (LDA,*)
+*>          On entry, the N-by-N matrix A. On exit, the permuted matrix
+*>          where the rows I1 and I2 and columns I1 and I2 are interchanged.
+*>          If UPLO = 'U', the interchanges are applied to the upper
+*>          triangular part and the strictly lower triangular part of A is
+*>          not referenced; if UPLO = 'L', the interchanges are applied to
+*>          the lower triangular part and the part of A above the diagonal
+*>          is not referenced.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -95,10 +91,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYauxiliary
+*> \ingroup heswapr
 *
 *  =====================================================================
       SUBROUTINE DSYSWAPR( UPLO, N, A, LDA, I1, I2)
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -109,14 +106,13 @@ SUBROUTINE DSYSWAPR( UPLO, N, A, LDA, I1, I2)
       INTEGER          I1, I2, LDA, N
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION A( LDA, N )
+      DOUBLE PRECISION A( LDA, * )
 *
 *  =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
       LOGICAL            UPPER
-      INTEGER            I
       DOUBLE PRECISION   TMP
 *
 *     .. External Functions ..
@@ -143,19 +139,12 @@ SUBROUTINE DSYSWAPR( UPLO, N, A, LDA, I1, I2)
          A(I1,I1)=A(I2,I2)
          A(I2,I2)=TMP
 *
-         DO I=1,I2-I1-1
-            TMP=A(I1,I1+I)
-            A(I1,I1+I)=A(I1+I,I2)
-            A(I1+I,I2)=TMP
-         END DO
+         CALL DSWAP( I2-I1-1, A(I1,I1+1), LDA, A(I1+1,I2), 1 )
 *
 *          third swap
 *          - swap row I1 and I2 from I2+1 to N
-         DO I=I2+1,N
-            TMP=A(I1,I)
-            A(I1,I)=A(I2,I)
-            A(I2,I)=TMP
-         END DO
+         IF ( I2.LT.N )
+     $      CALL DSWAP( N-I2, A(I1,I2+1), LDA, A(I2,I2+1), LDA )
 *
         ELSE
 *
@@ -171,19 +160,12 @@ SUBROUTINE DSYSWAPR( UPLO, N, A, LDA, I1, I2)
           A(I1,I1)=A(I2,I2)
           A(I2,I2)=TMP
 *
-          DO I=1,I2-I1-1
-             TMP=A(I1+I,I1)
-             A(I1+I,I1)=A(I2,I1+I)
-             A(I2,I1+I)=TMP
-          END DO
+          CALL DSWAP( I2-I1-1, A(I1+1,I1), 1, A(I2,I1+1), LDA )
 *
 *         third swap
 *          - swap col I1 and I2 from I2+1 to N
-          DO I=I2+1,N
-             TMP=A(I,I1)
-             A(I,I1)=A(I,I2)
-             A(I,I2)=TMP
-          END DO
+         IF ( I2.LT.N )
+     $      CALL DSWAP( N-I2, A(I2+1,I1), 1, A(I2+1,I2), 1 )
 *
       ENDIF
       END SUBROUTINE DSYSWAPR
diff --git a/SRC/dsytd2.f b/SRC/dsytd2.f
index 977b6daa41..a16b9fd541 100644
--- a/SRC/dsytd2.f
+++ b/SRC/dsytd2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTD2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytd2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytd2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,7 +118,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetd2
 *
 *> \par Further Details:
 *  =====================
@@ -170,6 +168,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DSYTD2( UPLO, N, A, LDA, D, E, TAU, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -249,7 +248,8 @@ SUBROUTINE DSYTD2( UPLO, N, A, LDA, D, E, TAU, INFO )
 *
 *              Compute  x := tau * A * v  storing x in TAU(1:i)
 *
-               CALL DSYMV( UPLO, I, TAUI, A, LDA, A( 1, I+1 ), 1, ZERO,
+               CALL DSYMV( UPLO, I, TAUI, A, LDA, A( 1, I+1 ), 1,
+     $                     ZERO,
      $                     TAU, 1 )
 *
 *              Compute  w := x - 1/2 * tau * (x**T * v) * v
@@ -295,14 +295,16 @@ SUBROUTINE DSYTD2( UPLO, N, A, LDA, D, E, TAU, INFO )
 *
 *              Compute  w := x - 1/2 * tau * (x**T * v) * v
 *
-               ALPHA = -HALF*TAUI*DDOT( N-I, TAU( I ), 1, A( I+1, I ),
+               ALPHA = -HALF*TAUI*DDOT( N-I, TAU( I ), 1, A( I+1,
+     $                                  I ),
      $                 1 )
                CALL DAXPY( N-I, ALPHA, A( I+1, I ), 1, TAU( I ), 1 )
 *
 *              Apply the transformation as a rank-2 update:
 *                 A := A - v * w**T - w * v**T
 *
-               CALL DSYR2( UPLO, N-I, -ONE, A( I+1, I ), 1, TAU( I ), 1,
+               CALL DSYR2( UPLO, N-I, -ONE, A( I+1, I ), 1, TAU( I ),
+     $                     1,
      $                     A( I+1, I+1 ), LDA )
 *
                A( I+1, I ) = E( I )
diff --git a/SRC/dsytf2.f b/SRC/dsytf2.f
index b05d25ad15..bd4340a6a7 100644
--- a/SRC/dsytf2.f
+++ b/SRC/dsytf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,7 +125,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetf2
 *
 *> \par Further Details:
 *  =====================
@@ -191,6 +189,7 @@
 *
 *  =====================================================================
       SUBROUTINE DSYTF2( UPLO, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -284,7 +283,8 @@ SUBROUTINE DSYTF2( UPLO, N, A, LDA, IPIV, INFO )
             COLMAX = ZERO
          END IF
 *
-         IF( (MAX( ABSAKK, COLMAX ).EQ.ZERO) .OR. DISNAN(ABSAKK) ) THEN
+         IF( (MAX( ABSAKK, COLMAX ).EQ.ZERO) .OR.
+     $       DISNAN(ABSAKK) ) THEN
 *
 *           Column K is zero or underflow, or contains a NaN:
 *           set INFO and continue
@@ -454,7 +454,8 @@ SUBROUTINE DSYTF2( UPLO, N, A, LDA, IPIV, INFO )
             COLMAX = ZERO
          END IF
 *
-         IF( (MAX( ABSAKK, COLMAX ).EQ.ZERO) .OR. DISNAN(ABSAKK) ) THEN
+         IF( (MAX( ABSAKK, COLMAX ).EQ.ZERO) .OR.
+     $       DISNAN(ABSAKK) ) THEN
 *
 *           Column K is zero or underflow, or contains a NaN:
 *           set INFO and continue
@@ -476,7 +477,8 @@ SUBROUTINE DSYTF2( UPLO, N, A, LDA, IPIV, INFO )
                JMAX = K - 1 + IDAMAX( IMAX-K, A( IMAX, K ), LDA )
                ROWMAX = ABS( A( IMAX, JMAX ) )
                IF( IMAX.LT.N ) THEN
-                  JMAX = IMAX + IDAMAX( N-IMAX, A( IMAX+1, IMAX ), 1 )
+                  JMAX = IMAX + IDAMAX( N-IMAX, A( IMAX+1, IMAX ),
+     $                                  1 )
                   ROWMAX = MAX( ROWMAX, ABS( A( JMAX, IMAX ) ) )
                END IF
 *
@@ -508,7 +510,8 @@ SUBROUTINE DSYTF2( UPLO, N, A, LDA, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL DSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL DSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
                CALL DSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
      $                     LDA )
                T = A( KK, KK )
diff --git a/SRC/dsytf2_rk.f b/SRC/dsytf2_rk.f
index e9afcb6aad..0c464ec0f5 100644
--- a/SRC/dsytf2_rk.f
+++ b/SRC/dsytf2_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTF2_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytf2_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytf2_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -208,7 +206,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetf2_rk
 *
 *> \par Further Details:
 *  =====================
@@ -238,6 +236,7 @@
 *
 *  =====================================================================
       SUBROUTINE DSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -460,7 +459,8 @@ SUBROUTINE DSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *              the interchanges in columns k+1:N.
 *
                IF( K.LT.N )
-     $            CALL DSWAP( N-K, A( K, K+1 ), LDA, A( P, K+1 ), LDA )
+     $            CALL DSWAP( N-K, A( K, K+1 ), LDA, A( P, K+1 ),
+     $                        LDA )
 *
             END IF
 *
@@ -475,7 +475,8 @@ SUBROUTINE DSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
                IF( KP.GT.1 )
      $            CALL DSWAP( KP-1, A( 1, KK ), 1, A( 1, KP ), 1 )
                IF( ( KK.GT.1 ) .AND. ( KP.LT.(KK-1) ) )
-     $            CALL DSWAP( KK-KP-1, A( KP+1, KK ), 1, A( KP, KP+1 ),
+     $            CALL DSWAP( KK-KP-1, A( KP+1, KK ), 1, A( KP,
+     $                        KP+1 ),
      $                     LDA )
                T = A( KK, KK )
                A( KK, KK ) = A( KP, KP )
@@ -517,7 +518,8 @@ SUBROUTINE DSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                       = A - W(k)*1/D(k)*W(k)**T
 *
                      D11 = ONE / A( K, K )
-                     CALL DSYR( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL DSYR( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
 *
 *                    Store U(k) in column k
 *
@@ -536,7 +538,8 @@ SUBROUTINE DSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                       = A - W(k)*(1/D(k))*W(k)**T
 *                       = A - (W(k)/D(k))*(D(k))*(W(k)/D(K))**T
 *
-                     CALL DSYR( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL DSYR( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
                   END IF
 *
 *                 Store the superdiagonal element of D in array E
@@ -694,14 +697,16 @@ SUBROUTINE DSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                 Determine both ROWMAX and JMAX.
 *
                   IF( IMAX.NE.K ) THEN
-                     JMAX = K - 1 + IDAMAX( IMAX-K, A( IMAX, K ), LDA )
+                     JMAX = K - 1 + IDAMAX( IMAX-K, A( IMAX, K ),
+     $                                      LDA )
                      ROWMAX = ABS( A( IMAX, JMAX ) )
                   ELSE
                      ROWMAX = ZERO
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + IDAMAX( N-IMAX, A( IMAX+1, IMAX ),
+                     ITEMP = IMAX + IDAMAX( N-IMAX, A( IMAX+1,
+     $                                      IMAX ),
      $                                     1 )
                      DTEMP = ABS( A( ITEMP, IMAX ) )
                      IF( DTEMP.GT.ROWMAX ) THEN
@@ -760,7 +765,8 @@ SUBROUTINE DSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
                IF( P.LT.N )
      $            CALL DSWAP( N-P, A( P+1, K ), 1, A( P+1, P ), 1 )
                IF( P.GT.(K+1) )
-     $            CALL DSWAP( P-K-1, A( K+1, K ), 1, A( P, K+1 ), LDA )
+     $            CALL DSWAP( P-K-1, A( K+1, K ), 1, A( P, K+1 ),
+     $                        LDA )
                T = A( K, K )
                A( K, K ) = A( P, P )
                A( P, P ) = T
@@ -782,9 +788,11 @@ SUBROUTINE DSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL DSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL DSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
                IF( ( KK.LT.N ) .AND. ( KP.GT.(KK+1) ) )
-     $            CALL DSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
+     $            CALL DSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP,
+     $                        KK+1 ),
      $                     LDA )
                T = A( KK, KK )
                A( KK, KK ) = A( KP, KP )
diff --git a/SRC/dsytf2_rook.f b/SRC/dsytf2_rook.f
index 251b3909bb..270deab60f 100644
--- a/SRC/dsytf2_rook.f
+++ b/SRC/dsytf2_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTF2_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytf2_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytf2_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -129,7 +127,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetf2_rook
 *
 *> \par Further Details:
 *  =====================
@@ -191,6 +189,7 @@
 *
 *  =====================================================================
       SUBROUTINE DSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -410,7 +409,8 @@ SUBROUTINE DSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
                IF( KP.GT.1 )
      $            CALL DSWAP( KP-1, A( 1, KK ), 1, A( 1, KP ), 1 )
                IF( ( KK.GT.1 ) .AND. ( KP.LT.(KK-1) ) )
-     $            CALL DSWAP( KK-KP-1, A( KP+1, KK ), 1, A( KP, KP+1 ),
+     $            CALL DSWAP( KK-KP-1, A( KP+1, KK ), 1, A( KP,
+     $                        KP+1 ),
      $                     LDA )
                T = A( KK, KK )
                A( KK, KK ) = A( KP, KP )
@@ -444,7 +444,8 @@ SUBROUTINE DSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                       = A - W(k)*1/D(k)*W(k)**T
 *
                      D11 = ONE / A( K, K )
-                     CALL DSYR( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL DSYR( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
 *
 *                    Store U(k) in column k
 *
@@ -463,7 +464,8 @@ SUBROUTINE DSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                       = A - W(k)*(1/D(k))*W(k)**T
 *                       = A - (W(k)/D(k))*(D(k))*(W(k)/D(K))**T
 *
-                     CALL DSYR( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL DSYR( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
                   END IF
                END IF
 *
@@ -593,14 +595,16 @@ SUBROUTINE DSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                 Determine both ROWMAX and JMAX.
 *
                   IF( IMAX.NE.K ) THEN
-                     JMAX = K - 1 + IDAMAX( IMAX-K, A( IMAX, K ), LDA )
+                     JMAX = K - 1 + IDAMAX( IMAX-K, A( IMAX, K ),
+     $                                      LDA )
                      ROWMAX = ABS( A( IMAX, JMAX ) )
                   ELSE
                      ROWMAX = ZERO
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + IDAMAX( N-IMAX, A( IMAX+1, IMAX ),
+                     ITEMP = IMAX + IDAMAX( N-IMAX, A( IMAX+1,
+     $                                      IMAX ),
      $                                     1 )
                      DTEMP = ABS( A( ITEMP, IMAX ) )
                      IF( DTEMP.GT.ROWMAX ) THEN
@@ -659,7 +663,8 @@ SUBROUTINE DSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
                IF( P.LT.N )
      $            CALL DSWAP( N-P, A( P+1, K ), 1, A( P+1, P ), 1 )
                IF( P.GT.(K+1) )
-     $            CALL DSWAP( P-K-1, A( K+1, K ), 1, A( P, K+1 ), LDA )
+     $            CALL DSWAP( P-K-1, A( K+1, K ), 1, A( P, K+1 ),
+     $                        LDA )
                T = A( K, K )
                A( K, K ) = A( P, P )
                A( P, P ) = T
@@ -674,9 +679,11 @@ SUBROUTINE DSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL DSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL DSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
                IF( ( KK.LT.N ) .AND. ( KP.GT.(KK+1) ) )
-     $            CALL DSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
+     $            CALL DSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP,
+     $                        KK+1 ),
      $                     LDA )
                T = A( KK, KK )
                A( KK, KK ) = A( KP, KP )
diff --git a/SRC/dsytrd.f b/SRC/dsytrd.f
index 3dcfc3db2b..1c3feb1dd2 100644
--- a/SRC/dsytrd.f
+++ b/SRC/dsytrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -139,7 +137,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetrd
 *
 *> \par Further Details:
 *  =====================
@@ -188,7 +186,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DSYTRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
+      SUBROUTINE DSYTRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -247,7 +247,7 @@ SUBROUTINE DSYTRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
 *        Determine the block size.
 *
          NB = ILAENV( 1, 'DSYTRD', UPLO, N, -1, -1, -1 )
-         LWKOPT = N*NB
+         LWKOPT = MAX( 1, N*NB )
          WORK( 1 ) = LWKOPT
       END IF
 *
@@ -315,7 +315,8 @@ SUBROUTINE DSYTRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
 *           Update the unreduced submatrix A(1:i-1,1:i-1), using an
 *           update of the form:  A := A - V*W**T - W*V**T
 *
-            CALL DSYR2K( UPLO, 'No transpose', I-1, NB, -ONE, A( 1, I ),
+            CALL DSYR2K( UPLO, 'No transpose', I-1, NB, -ONE, A( 1,
+     $                   I ),
      $                   LDA, WORK, LDWORK, ONE, A, LDA )
 *
 *           Copy superdiagonal elements back into A, and diagonal
diff --git a/SRC/dsytrd_2stage.f b/SRC/dsytrd_2stage.f
index 8ae77d3e4b..81edff47ea 100644
--- a/SRC/dsytrd_2stage.f
+++ b/SRC/dsytrd_2stage.f
@@ -4,23 +4,21 @@
 *
 *  =========== DOCUMENTATION ===========
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
-*
-*> \htmlonly
-*> Download DSYTRD_2STAGE + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytrd_2stage.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dsytrd_2stage.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytrd_2stage.f"> 
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download DSYTRD_2STAGE + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytrd_2stage.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dsytrd_2stage.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytrd_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE DSYTRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU, 
+*       SUBROUTINE DSYTRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
 *                                 HOUS2, LHOUS2, WORK, LWORK, INFO )
 *
 *       IMPLICIT NONE
@@ -34,7 +32,7 @@
 *       DOUBLE PRECISION   A( LDA, * ), TAU( * ),
 *                          HOUS2( * ), WORK( * )
 *       ..
-*  
+*
 *
 *> \par Purpose:
 *  =============
@@ -52,11 +50,11 @@
 *> \param[in] VECT
 *> \verbatim
 *>          VECT is CHARACTER*1
-*>          = 'N':  No need for the Housholder representation, 
+*>          = 'N':  No need for the Housholder representation,
 *>                  in particular for the second stage (Band to
 *>                  tridiagonal) and thus LHOUS2 is of size max(1, 4*N);
-*>          = 'V':  the Householder representation is needed to 
-*>                  either generate Q1 Q2 or to apply Q1 Q2, 
+*>          = 'V':  the Householder representation is needed to
+*>                  either generate Q1 Q2 or to apply Q1 Q2,
 *>                  then LHOUS2 is to be queried and computed.
 *>                  (NOT AVAILABLE IN THIS RELEASE).
 *> \endverbatim
@@ -86,7 +84,7 @@
 *>          triangular part of A is not referenced.
 *>          On exit, if UPLO = 'U', the band superdiagonal
 *>          of A are overwritten by the corresponding elements of the
-*>          internal band-diagonal matrix AB, and the elements above 
+*>          internal band-diagonal matrix AB, and the elements above
 *>          the KD superdiagonal, with the array TAU, represent the orthogonal
 *>          matrix Q1 as a product of elementary reflectors; if UPLO
 *>          = 'L', the diagonal and band subdiagonal of A are over-
@@ -117,13 +115,13 @@
 *> \param[out] TAU
 *> \verbatim
 *>          TAU is DOUBLE PRECISION array, dimension (N-KD)
-*>          The scalar factors of the elementary reflectors of 
+*>          The scalar factors of the elementary reflectors of
 *>          the first stage (see Further Details).
 *> \endverbatim
 *>
 *> \param[out] HOUS2
 *> \verbatim
-*>          HOUS2 is DOUBLE PRECISION array, dimension (LHOUS2)
+*>          HOUS2 is DOUBLE PRECISION array, dimension (MAX(1,LHOUS2))
 *>          Stores the Householder representation of the stage2
 *>          band to tridiagonal.
 *> \endverbatim
@@ -132,6 +130,8 @@
 *> \verbatim
 *>          LHOUS2 is INTEGER
 *>          The dimension of the array HOUS2.
+*>          LHOUS2 >= 1.
+*>
 *>          If LWORK = -1, or LHOUS2 = -1,
 *>          then a query is assumed; the routine
 *>          only calculates the optimal size of the HOUS2 array, returns
@@ -143,23 +143,26 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (LWORK)
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK = MAX(1, dimension)
-*>          If LWORK = -1, or LHOUS2=-1,
+*>          The dimension of the array WORK.
+*>          If N = 0, LWORK >= 1, else LWORK = MAX(1, dimension).
+*>
+*>          If LWORK = -1, or LHOUS2 = -1,
 *>          then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
 *>          LWORK = MAX(1, dimension) where
 *>          dimension   = max(stage1,stage2) + (KD+1)*N
-*>                      = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                        + max(2*KD*KD, KD*NTHREADS) 
-*>                        + (KD+1)*N 
+*>                      = N*KD + N*max(KD+1,FACTOPTNB)
+*>                        + max(2*KD*KD, KD*NTHREADS)
+*>                        + (KD+1)*N
 *>          where KD is the blocking size of the reduction,
 *>          FACTOPTNB is the blocking used by the QR or LQ
 *>          algorithm, usually FACTOPTNB=128 is a good choice
@@ -177,12 +180,12 @@
 *  Authors:
 *  ========
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetrd_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -202,7 +205,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -210,16 +213,16 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DSYTRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU, 
+      SUBROUTINE DSYTRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
      $                          HOUS2, LHOUS2, WORK, LWORK, INFO )
 *
       IMPLICIT NONE
@@ -263,12 +266,19 @@ SUBROUTINE DSYTRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
 *
 *     Determine the block size, the workspace size and the hous size.
 *
-      KD     = ILAENV2STAGE( 1, 'DSYTRD_2STAGE', VECT, N, -1, -1, -1 )
-      IB     = ILAENV2STAGE( 2, 'DSYTRD_2STAGE', VECT, N, KD, -1, -1 )
-      LHMIN  = ILAENV2STAGE( 3, 'DSYTRD_2STAGE', VECT, N, KD, IB, -1 )
-      LWMIN  = ILAENV2STAGE( 4, 'DSYTRD_2STAGE', VECT, N, KD, IB, -1 )
-*      WRITE(*,*),'DSYTRD_2STAGE N KD UPLO LHMIN LWMIN ',N, KD, UPLO,
-*     $            LHMIN, LWMIN
+      KD     = ILAENV2STAGE( 1, 'DSYTRD_2STAGE', VECT, N, -1, -1,
+     $                      -1 )
+      IB     = ILAENV2STAGE( 2, 'DSYTRD_2STAGE', VECT, N, KD, -1,
+     $                      -1 )
+      IF( N.EQ.0 ) THEN
+         LHMIN = 1
+         LWMIN = 1
+      ELSE
+         LHMIN = ILAENV2STAGE( 3, 'DSYTRD_2STAGE', VECT, N, KD, IB,
+     $                        -1 )
+         LWMIN = ILAENV2STAGE( 4, 'DSYTRD_2STAGE', VECT, N, KD, IB,
+     $                        -1 )
+      END IF
 *
       IF( .NOT.LSAME( VECT, 'N' ) ) THEN
          INFO = -1
@@ -309,14 +319,14 @@ SUBROUTINE DSYTRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
       LWRK  = LWORK-LDAB*N
       ABPOS = 1
       WPOS  = ABPOS + LDAB*N
-      CALL DSYTRD_SY2SB( UPLO, N, KD, A, LDA, WORK( ABPOS ), LDAB, 
+      CALL DSYTRD_SY2SB( UPLO, N, KD, A, LDA, WORK( ABPOS ), LDAB,
      $                   TAU, WORK( WPOS ), LWRK, INFO )
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'DSYTRD_SY2SB', -INFO )
          RETURN
       END IF
-      CALL DSYTRD_SB2ST( 'Y', VECT, UPLO, N, KD, 
-     $                   WORK( ABPOS ), LDAB, D, E, 
+      CALL DSYTRD_SB2ST( 'Y', VECT, UPLO, N, KD,
+     $                   WORK( ABPOS ), LDAB, D, E,
      $                   HOUS2, LHOUS2, WORK( WPOS ), LWRK, INFO )
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'DSYTRD_SB2ST', -INFO )
@@ -324,8 +334,7 @@ SUBROUTINE DSYTRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
       END IF
 *
 *
-      HOUS2( 1 ) = LHMIN
-      WORK( 1 )  = LWMIN
+      WORK( 1 ) = LWMIN
       RETURN
 *
 *     End of DSYTRD_2STAGE
diff --git a/SRC/dsytrd_sb2st.F b/SRC/dsytrd_sb2st.F
index fabc107560..fa4645bf55 100644
--- a/SRC/dsytrd_sb2st.F
+++ b/SRC/dsytrd_sb2st.F
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRD_SB2ST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytrd_sb2st.f">
 *> [TGZ]</a>
@@ -13,12 +12,11 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytrd_sb2st.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB, 
+*       SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *                               D, E, HOUS, LHOUS, WORK, LWORK, INFO )
 *
 *       #if defined(_OPENMP)
@@ -53,12 +51,12 @@
 *> \param[in] STAGE1
 *> \verbatim
 *>          STAGE1 is CHARACTER*1
-*>          = 'N':  "No": to mention that the stage 1 of the reduction  
+*>          = 'N':  "No": to mention that the stage 1 of the reduction
 *>                  from dense to band using the dsytrd_sy2sb routine
-*>                  was not called before this routine to reproduce AB. 
-*>                  In other term this routine is called as standalone. 
-*>          = 'Y':  "Yes": to mention that the stage 1 of the 
-*>                  reduction from dense to band using the dsytrd_sy2sb 
+*>                  was not called before this routine to reproduce AB.
+*>                  In other term this routine is called as standalone.
+*>          = 'Y':  "Yes": to mention that the stage 1 of the
+*>                  reduction from dense to band using the dsytrd_sy2sb
 *>                  routine has been called to produce AB (e.g., AB is
 *>                  the output of dsytrd_sy2sb.
 *> \endverbatim
@@ -66,10 +64,10 @@
 *> \param[in] VECT
 *> \verbatim
 *>          VECT is CHARACTER*1
-*>          = 'N':  No need for the Housholder representation, 
+*>          = 'N':  No need for the Housholder representation,
 *>                  and thus LHOUS is of size max(1, 4*N);
-*>          = 'V':  the Householder representation is needed to 
-*>                  either generate or to apply Q later on, 
+*>          = 'V':  the Householder representation is needed to
+*>                  either generate or to apply Q later on,
 *>                  then LHOUS is to be queried and computed.
 *>                  (NOT AVAILABLE IN THIS RELEASE).
 *> \endverbatim
@@ -132,34 +130,39 @@
 *>
 *> \param[out] HOUS
 *> \verbatim
-*>          HOUS is DOUBLE PRECISION array, dimension LHOUS, that
-*>          store the Householder representation.
+*>          HOUS is DOUBLE PRECISION array, dimension (MAX(1,LHOUS))
+*>          Stores the Householder representation.
 *> \endverbatim
 *>
 *> \param[in] LHOUS
 *> \verbatim
 *>          LHOUS is INTEGER
-*>          The dimension of the array HOUS. LHOUS = MAX(1, dimension)
-*>          If LWORK = -1, or LHOUS=-1,
+*>          The dimension of the array HOUS.
+*>          If N = 0 or KD <= 1, LHOUS >= 1, else LHOUS = MAX(1, dimension).
+*>
+*>          If LWORK = -1, or LHOUS = -1,
 *>          then a query is assumed; the routine
 *>          only calculates the optimal size of the HOUS array, returns
 *>          this value as the first entry of the HOUS array, and no error
 *>          message related to LHOUS is issued by XERBLA.
 *>          LHOUS = MAX(1, dimension) where
 *>          dimension = 4*N if VECT='N'
-*>          not available now if VECT='H'     
+*>          not available now if VECT='H'
 *> \endverbatim
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension LWORK.
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK = MAX(1, dimension)
-*>          If LWORK = -1, or LHOUS=-1,
+*>          The dimension of the array WORK.
+*>          If N = 0 or KD <= 1, LWORK >= 1, else LWORK = MAX(1, dimension).
+*>
+*>          If LWORK = -1, or LHOUS = -1,
 *>          then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
@@ -188,7 +191,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup real16OTHERcomputational
+*> \ingroup hetrd_hb2st
 *
 *> \par Further Details:
 *  =====================
@@ -208,7 +211,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -216,16 +219,16 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB, 
+      SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
      $                         D, E, HOUS, LHOUS, WORK, LWORK, INFO )
 *
 #if defined(_OPENMP)
@@ -258,23 +261,24 @@ SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, WANTQ, UPPER, AFTERS1
-      INTEGER            I, M, K, IB, SWEEPID, MYID, SHIFT, STT, ST, 
+      INTEGER            I, M, K, IB, SWEEPID, MYID, SHIFT, STT, ST,
      $                   ED, STIND, EDIND, BLKLASTIND, COLPT, THED,
      $                   STEPERCOL, GRSIZ, THGRSIZ, THGRNB, THGRID,
-     $                   NBTILES, TTYPE, TID, NTHREADS, DEBUG,
-     $                   ABDPOS, ABOFDPOS, DPOS, OFDPOS, AWPOS, 
+     $                   NBTILES, TTYPE, TID, NTHREADS,
+     $                   ABDPOS, ABOFDPOS, DPOS, OFDPOS, AWPOS,
      $                   INDA, INDW, APOS, SIZEA, LDA, INDV, INDTAU,
      $                   SIDEV, SIZETAU, LDV, LHMIN, LWMIN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSB2ST_KERNELS, DLACPY, DLASET, XERBLA
+      EXTERNAL           DSB2ST_KERNELS, DLACPY,
+     $                   DLASET, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MIN, MAX, CEILING, REAL
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      INTEGER            ILAENV2STAGE 
+      INTEGER            ILAENV2STAGE
       EXTERNAL           LSAME, ILAENV2STAGE
 *     ..
 *     .. Executable Statements ..
@@ -282,7 +286,6 @@ SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *     Determine the minimal workspace size required.
 *     Test the input parameters
 *
-      DEBUG   = 0
       INFO    = 0
       AFTERS1 = LSAME( STAGE1, 'Y' )
       WANTQ   = LSAME( VECT, 'V' )
@@ -291,9 +294,17 @@ SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *
 *     Determine the block size, the workspace size and the hous size.
 *
-      IB     = ILAENV2STAGE( 2, 'DSYTRD_SB2ST', VECT, N, KD, -1, -1 )
-      LHMIN  = ILAENV2STAGE( 3, 'DSYTRD_SB2ST', VECT, N, KD, IB, -1 )
-      LWMIN  = ILAENV2STAGE( 4, 'DSYTRD_SB2ST', VECT, N, KD, IB, -1 )
+      IB       = ILAENV2STAGE( 2, 'DSYTRD_SB2ST', VECT, N, KD,
+     $                      -1, -1 )
+      IF( N.EQ.0 .OR. KD.LE.1 ) THEN
+         LHMIN = 1
+         LWMIN = 1
+      ELSE
+         LHMIN = ILAENV2STAGE( 3, 'DSYTRD_SB2ST', VECT, N, KD, IB,
+     $                      -1 )
+         LWMIN = ILAENV2STAGE( 4, 'DSYTRD_SB2ST', VECT, N, KD, IB,
+     $                      -1 )
+      END IF
 *
       IF( .NOT.AFTERS1 .AND. .NOT.LSAME( STAGE1, 'N' ) ) THEN
          INFO = -1
@@ -355,7 +366,7 @@ SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
           ABDPOS   = KD + 1
           ABOFDPOS = KD
       ELSE
-          APOS     = INDA 
+          APOS     = INDA
           AWPOS    = INDA + KD + 1
           DPOS     = APOS
           OFDPOS   = DPOS + 1
@@ -363,11 +374,11 @@ SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
           ABOFDPOS = 2
 
       ENDIF
-*      
-*     Case KD=0: 
-*     The matrix is diagonal. We just copy it (convert to "real" for 
-*     real because D is double and the imaginary part should be 0) 
-*     and store it in D. A sequential code here is better or 
+*
+*     Case KD=0:
+*     The matrix is diagonal. We just copy it (convert to "real" for
+*     real because D is double and the imaginary part should be 0)
+*     and store it in D. A sequential code here is better or
 *     in a parallel environment it might need two cores for D and E
 *
       IF( KD.EQ.0 ) THEN
@@ -382,17 +393,17 @@ SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
           WORK( 1 ) = 1
           RETURN
       END IF
-*      
-*     Case KD=1: 
-*     The matrix is already Tridiagonal. We have to make diagonal 
+*
+*     Case KD=1:
+*     The matrix is already Tridiagonal. We have to make diagonal
 *     and offdiagonal elements real, and store them in D and E.
-*     For that, for real precision just copy the diag and offdiag 
-*     to D and E while for the COMPLEX case the bulge chasing is  
-*     performed to convert the hermetian tridiagonal to symmetric 
-*     tridiagonal. A simpler conversion formula might be used, but then 
+*     For that, for real precision just copy the diag and offdiag
+*     to D and E while for the COMPLEX case the bulge chasing is
+*     performed to convert the hermetian tridiagonal to symmetric
+*     tridiagonal. A simpler conversion formula might be used, but then
 *     updating the Q matrix will be required and based if Q is generated
-*     or not this might complicate the story. 
-*      
+*     or not this might complicate the story.
+*
       IF( KD.EQ.1 ) THEN
           DO 50 I = 1, N
               D( I ) = ( AB( ABDPOS, I ) )
@@ -413,7 +424,7 @@ SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
           RETURN
       END IF
 *
-*     Main code start here. 
+*     Main code start here.
 *     Reduce the symmetric band of A to a tridiagonal matrix.
 *
       THGRSIZ   = N
@@ -422,7 +433,7 @@ SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
       NBTILES   = CEILING( REAL(N)/REAL(KD) )
       STEPERCOL = CEILING( REAL(SHIFT)/REAL(GRSIZ) )
       THGRNB    = CEILING( REAL(N-1)/REAL(THGRSIZ) )
-*      
+*
       CALL DLACPY( "A", KD+1, N, AB, LDAB, WORK( APOS ), LDA )
       CALL DLASET( "A", KD,   N, ZERO, ZERO, WORK( AWPOS ), LDA )
 *
@@ -431,7 +442,7 @@ SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *
 #if defined(_OPENMP)
 !$OMP PARALLEL PRIVATE( TID, THGRID, BLKLASTIND )
-!$OMP$         PRIVATE( THED, I, M, K, ST, ED, STT, SWEEPID ) 
+!$OMP$         PRIVATE( THED, I, M, K, ST, ED, STT, SWEEPID )
 !$OMP$         PRIVATE( MYID, TTYPE, COLPT, STIND, EDIND )
 !$OMP$         SHARED ( UPLO, WANTQ, INDV, INDTAU, HOUS, WORK)
 !$OMP$         SHARED ( N, KD, IB, NBTILES, LDA, LDV, INDA )
@@ -440,7 +451,7 @@ SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 #endif
 *
 *     main bulge chasing loop
-*      
+*
       DO 100 THGRID = 1, THGRNB
           STT  = (THGRID-1)*THGRSIZ+1
           THED = MIN( (STT + THGRSIZ -1), (N-1))
@@ -451,7 +462,7 @@ SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
                   ST = STT
                   DO 130 SWEEPID = ST, ED
                       DO 140 K = 1, GRSIZ
-                          MYID  = (I-SWEEPID)*(STEPERCOL*GRSIZ) 
+                          MYID  = (I-SWEEPID)*(STEPERCOL*GRSIZ)
      $                           + (M-1)*GRSIZ + K
                           IF ( MYID.EQ.1 ) THEN
                               TTYPE = 1
@@ -477,16 +488,17 @@ SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
                           ENDIF
 *
 *                         Call the kernel
-*                             
+*
 #if defined(_OPENMP) &&  _OPENMP >= 201307
-                          IF( TTYPE.NE.1 ) THEN      
+                          IF( TTYPE.NE.1 ) THEN
 !$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1))
 !$OMP$     DEPEND(in:WORK(MYID-1))
 !$OMP$     DEPEND(out:WORK(MYID))
                               TID      = OMP_GET_THREAD_NUM()
-                              CALL DSB2ST_KERNELS( UPLO, WANTQ, TTYPE, 
+                              CALL DSB2ST_KERNELS(
+     $                             UPLO, WANTQ, TTYPE,
      $                             STIND, EDIND, SWEEPID, N, KD, IB,
-     $                             WORK ( INDA ), LDA, 
+     $                             WORK ( INDA ), LDA,
      $                             HOUS( INDV ), HOUS( INDTAU ), LDV,
      $                             WORK( INDW + TID*KD ) )
 !$OMP END TASK
@@ -494,20 +506,22 @@ SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 !$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1))
 !$OMP$     DEPEND(out:WORK(MYID))
                               TID      = OMP_GET_THREAD_NUM()
-                              CALL DSB2ST_KERNELS( UPLO, WANTQ, TTYPE, 
+                              CALL DSB2ST_KERNELS(
+     $                             UPLO, WANTQ, TTYPE,
      $                             STIND, EDIND, SWEEPID, N, KD, IB,
-     $                             WORK ( INDA ), LDA, 
+     $                             WORK ( INDA ), LDA,
      $                             HOUS( INDV ), HOUS( INDTAU ), LDV,
      $                             WORK( INDW + TID*KD ) )
 !$OMP END TASK
                           ENDIF
 #else
-                          CALL DSB2ST_KERNELS( UPLO, WANTQ, TTYPE, 
+                          CALL DSB2ST_KERNELS(
+     $                         UPLO, WANTQ, TTYPE,
      $                         STIND, EDIND, SWEEPID, N, KD, IB,
-     $                         WORK ( INDA ), LDA, 
+     $                         WORK ( INDA ), LDA,
      $                         HOUS( INDV ), HOUS( INDTAU ), LDV,
-     $                         WORK( INDW + TID*KD ) )
-#endif 
+     $                         WORK( INDW ) )
+#endif
                           IF ( BLKLASTIND.GE.(N-1) ) THEN
                               STT = STT + 1
                               EXIT
@@ -522,14 +536,14 @@ SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 !$OMP END MASTER
 !$OMP END PARALLEL
 #endif
-*      
+*
 *     Copy the diagonal from A to D. Note that D is REAL thus only
 *     the Real part is needed, the imaginary part should be zero.
 *
       DO 150 I = 1, N
           D( I ) = ( WORK( DPOS+(I-1)*LDA ) )
   150 CONTINUE
-*      
+*
 *     Copy the off diagonal from A to E. Note that E is REAL thus only
 *     the Real part is needed, the imaginary part should be zero.
 *
@@ -543,11 +557,10 @@ SUBROUTINE DSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
   170     CONTINUE
       ENDIF
 *
-      HOUS( 1 ) = LHMIN
       WORK( 1 ) = LWMIN
       RETURN
 *
 *     End of DSYTRD_SB2ST
 *
       END
-      
+
diff --git a/SRC/dsytrd_sy2sb.f b/SRC/dsytrd_sy2sb.f
index 1660b5c7e3..e23c0c6c7e 100644
--- a/SRC/dsytrd_sy2sb.f
+++ b/SRC/dsytrd_sy2sb.f
@@ -7,7 +7,6 @@
 * Online html documentation available at 
 *            http://www.netlib.org/lapack/explore-html/ 
 *
-*> \htmlonly
 *> Download DSYTRD_SY2SB + dependencies 
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytrd_sy2sb.f"> 
 *> [TGZ]</a> 
@@ -15,7 +14,6 @@
 *> [ZIP]</a> 
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytrd_sy2sb.f"> 
 *> [TXT]</a>
-*> \endhtmlonly 
 *
 *  Definition:
 *  ===========
@@ -123,8 +121,8 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (LWORK)
-*>          On exit, if INFO = 0, or if LWORK=-1, 
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, or if LWORK = -1,
 *>          WORK(1) returns the size of LWORK.
 *> \endverbatim
 *>
@@ -132,7 +130,9 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK which should be calculated
-*>          by a workspace query. LWORK = MAX(1, LWORK_QUERY)
+*>          by a workspace query.
+*>          If N <= KD+1, LWORK >= 1, else LWORK = MAX(1, LWORK_QUERY)
+*>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
@@ -158,7 +158,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetrd_he2hb
 *
 *> \par Further Details:
 *  =====================
@@ -274,7 +274,8 @@ SUBROUTINE DSYTRD_SY2SB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
      $                   TPOS, WPOS, S2POS, S1POS
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, DSYR2K, DSYMM, DGEMM, DCOPY,
+      EXTERNAL           XERBLA, DSYR2K, DSYMM, DGEMM,
+     $                   DCOPY,
      $                   DLARFT, DGELQF, DGEQRF, DLASET
 *     ..
 *     .. Intrinsic Functions ..
@@ -293,8 +294,13 @@ SUBROUTINE DSYTRD_SY2SB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
       INFO   = 0
       UPPER  = LSAME( UPLO, 'U' )
       LQUERY = ( LWORK.EQ.-1 )
-      LWMIN  = ILAENV2STAGE( 4, 'DSYTRD_SY2SB', '', N, KD, -1, -1 )
-      
+      IF( N.LE.KD+1 ) THEN
+         LWMIN = 1
+      ELSE
+         LWMIN = ILAENV2STAGE( 4, 'DSYTRD_SY2SB', ' ', N, KD, -1,
+     $                        -1 )
+      END IF
+*
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
@@ -378,7 +384,8 @@ SUBROUTINE DSYTRD_SY2SB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
 *        
              DO 20 J = I, I+PK-1
                 LK = MIN( KD, N-J ) + 1
-                CALL DCOPY( LK, A( J, J ), LDA, AB( KD+1, J ), LDAB-1 )
+                CALL DCOPY( LK, A( J, J ), LDA, AB( KD+1, J ),
+     $                      LDAB-1 )
    20        CONTINUE
 *                
              CALL DLASET( 'Lower', PK, PK, ZERO, ONE, 
diff --git a/SRC/dsytrf.f b/SRC/dsytrf.f
index a39b032836..3fb06a5faf 100644
--- a/SRC/dsytrf.f
+++ b/SRC/dsytrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK.  LWORK >=1.  For best performance
+*>          The length of WORK.  LWORK >= 1.  For best performance
 *>          LWORK >= N*NB, where NB is the block size returned by ILAENV.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
@@ -135,7 +133,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetrf
 *
 *> \par Further Details:
 *  =====================
@@ -179,6 +177,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -232,7 +231,7 @@ SUBROUTINE DSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *        Determine the block size
 *
          NB = ILAENV( 1, 'DSYTRF', UPLO, N, -1, -1, -1 )
-         LWKOPT = N*NB
+         LWKOPT = MAX( 1, N*NB )
          WORK( 1 ) = LWKOPT
       END IF
 *
@@ -249,7 +248,8 @@ SUBROUTINE DSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
          IWS = LDWORK*NB
          IF( LWORK.LT.IWS ) THEN
             NB = MAX( LWORK / LDWORK, 1 )
-            NBMIN = MAX( 2, ILAENV( 2, 'DSYTRF', UPLO, N, -1, -1, -1 ) )
+            NBMIN = MAX( 2, ILAENV( 2, 'DSYTRF', UPLO, N, -1, -1,
+     $                   -1 ) )
          END IF
       ELSE
          IWS = 1
@@ -319,13 +319,15 @@ SUBROUTINE DSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *           Factorize columns k:k+kb-1 of A and use blocked code to
 *           update columns k+kb:n
 *
-            CALL DLASYF( UPLO, N-K+1, NB, KB, A( K, K ), LDA, IPIV( K ),
+            CALL DLASYF( UPLO, N-K+1, NB, KB, A( K, K ), LDA,
+     $                   IPIV( K ),
      $                   WORK, LDWORK, IINFO )
          ELSE
 *
 *           Use unblocked code to factorize columns k:n of A
 *
-            CALL DSYTF2( UPLO, N-K+1, A( K, K ), LDA, IPIV( K ), IINFO )
+            CALL DSYTF2( UPLO, N-K+1, A( K, K ), LDA, IPIV( K ),
+     $                   IINFO )
             KB = N - K + 1
          END IF
 *
@@ -352,6 +354,7 @@ SUBROUTINE DSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
       END IF
 *
    40 CONTINUE
+*
       WORK( 1 ) = LWKOPT
       RETURN
 *
diff --git a/SRC/dsytrf_aa.f b/SRC/dsytrf_aa.f
index 3467379537..9d301b25a8 100644
--- a/SRC/dsytrf_aa.f
+++ b/SRC/dsytrf_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRF_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytrf_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytrf_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -74,7 +72,7 @@
 *>
 *>          On exit, the tridiagonal matrix is stored in the diagonals
 *>          and the subdiagonals of A just below (or above) the diagonals,
-*>          and L is stored below (or above) the subdiaonals, when UPLO
+*>          and L is stored below (or above) the subdiagonals, when UPLO
 *>          is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -101,8 +99,10 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK.  LWORK >= MAX(1,2*N). For optimum performance
-*>          LWORK >= N*(1+NB), where NB is the optimal blocksize.
+*>          The length of WORK.
+*>          LWORK >= 1, if N <= 1, and LWORK >= 2*N, otherwise.
+*>          For optimum performance LWORK >= N*(1+NB), where NB is
+*>          the optimal blocksize, returned by ILAENV.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -125,10 +125,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetrf_aa
 *
 *  =====================================================================
-      SUBROUTINE DSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
+      SUBROUTINE DSYTRF_AA( UPLO, N, A, LDA, IPIV,
+     $                      WORK, LWORK, INFO )
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -152,7 +153,7 @@ SUBROUTINE DSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
 *
 *     .. Local Scalars ..
       LOGICAL            LQUERY, UPPER
-      INTEGER            J, LWKOPT
+      INTEGER            J, LWKMIN, LWKOPT
       INTEGER            NB, MJ, NJ, K1, K2, J1, J2, J3, JB
       DOUBLE PRECISION   ALPHA
 *     ..
@@ -162,7 +163,8 @@ SUBROUTINE DSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLASYF_AA, DGEMM, DGEMV, DSCAL, DCOPY, DSWAP,
+      EXTERNAL           DLASYF_AA, DGEMM, DGEMV, DSCAL, DCOPY,
+     $                   DSWAP,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -179,18 +181,25 @@ SUBROUTINE DSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
       INFO = 0
       UPPER = LSAME( UPLO, 'U' )
       LQUERY = ( LWORK.EQ.-1 )
+      IF( N.LE.1 ) THEN
+         LWKMIN = 1
+         LWKOPT = 1
+      ELSE
+         LWKMIN = 2*N
+         LWKOPT = (NB+1)*N
+      END IF
+*
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, 2*N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -7
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         LWKOPT = (NB+1)*N
          WORK( 1 ) = LWKOPT
       END IF
 *
@@ -203,11 +212,11 @@ SUBROUTINE DSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
 *
 *     Quick return
 *
-      IF ( N.EQ.0 ) THEN
+      IF( N.EQ.0 ) THEN
           RETURN
       ENDIF
       IPIV( 1 ) = 1
-      IF ( N.EQ.1 ) THEN
+      IF( N.EQ.1 ) THEN
          RETURN
       END IF
 *
diff --git a/SRC/dsytrf_aa_2stage.f b/SRC/dsytrf_aa_2stage.f
index b7f5f07c20..fbd0408d20 100644
--- a/SRC/dsytrf_aa_2stage.f
+++ b/SRC/dsytrf_aa_2stage.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRF_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytrf_aa_2stage.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytrf_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -75,7 +73,7 @@
 *>          triangular part of the matrix A, and the strictly upper
 *>          triangular part of A is not referenced.
 *>
-*>          On exit, L is stored below (or above) the subdiaonal blocks,
+*>          On exit, L is stored below (or above) the subdiagonal blocks,
 *>          when UPLO  is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -87,14 +85,14 @@
 *>
 *> \param[out] TB
 *> \verbatim
-*>          TB is DOUBLE PRECISION array, dimension (LTB)
+*>          TB is DOUBLE PRECISION array, dimension (MAX(1,LTB))
 *>          On exit, details of the LU factorization of the band matrix.
 *> \endverbatim
 *>
 *> \param[in] LTB
 *> \verbatim
 *>          LTB is INTEGER
-*>          The size of the array TB. LTB >= 4*N, internally
+*>          The size of the array TB. LTB >= MAX(1,4*N), internally
 *>          used to select NB such that LTB >= (3*NB+1)*N.
 *>
 *>          If LTB = -1, then a workspace query is assumed; the
@@ -121,14 +119,14 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION workspace of size LWORK
+*>          WORK is DOUBLE PRECISION workspace of size (MAX(1,LWORK))
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The size of WORK. LWORK >= N, internally used to select NB
-*>          such that LWORK >= N*NB.
+*>          The size of WORK. LWORK >= MAX(1,N), internally used
+*>          to select NB such that LWORK >= N*NB.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal size of the WORK array,
@@ -152,7 +150,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetrf_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE DSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
@@ -211,9 +209,9 @@ SUBROUTINE DSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -4
-      ELSE IF ( LTB .LT. 4*N .AND. .NOT.TQUERY ) THEN
+      ELSE IF( LTB.LT.MAX( 1, 4*N ) .AND. .NOT.TQUERY ) THEN
          INFO = -6
-      ELSE IF ( LWORK .LT. N .AND. .NOT.WQUERY ) THEN
+      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.WQUERY ) THEN
          INFO = -10
       END IF
 *
@@ -227,10 +225,10 @@ SUBROUTINE DSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
       NB = ILAENV( 1, 'DSYTRF_AA_2STAGE', UPLO, N, -1, -1, -1 )
       IF( INFO.EQ.0 ) THEN
          IF( TQUERY ) THEN
-            TB( 1 ) = (3*NB+1)*N
+            TB( 1 ) = MAX( 1, (3*NB+1)*N )
          END IF
          IF( WQUERY ) THEN
-            WORK( 1 ) = N*NB
+            WORK( 1 ) = MAX( 1, N*NB )
          END IF
       END IF
       IF( TQUERY .OR. WQUERY ) THEN
@@ -239,7 +237,7 @@ SUBROUTINE DSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
 *
 *     Quick return
 *
-      IF ( N.EQ.0 ) THEN
+      IF( N.EQ.0 ) THEN
          RETURN
       ENDIF
 *
diff --git a/SRC/dsytrf_rk.f b/SRC/dsytrf_rk.f
index 7341b9263b..fcbb040d33 100644
--- a/SRC/dsytrf_rk.f
+++ b/SRC/dsytrf_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRF_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytrf_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytrf_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -177,14 +175,14 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension ( MAX(1,LWORK) ).
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK)).
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK.  LWORK >=1.  For best performance
+*>          The length of WORK.  LWORK >= 1.  For best performance
 *>          LWORK >= N*NB, where NB is the block size returned
 *>          by ILAENV.
 *>
@@ -229,7 +227,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetrf_rk
 *
 *> \par Further Details:
 *  =====================
@@ -256,6 +254,7 @@
 *  =====================================================================
       SUBROUTINE DSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
      $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -310,7 +309,7 @@ SUBROUTINE DSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *        Determine the block size
 *
          NB = ILAENV( 1, 'DSYTRF_RK', UPLO, N, -1, -1, -1 )
-         LWKOPT = N*NB
+         LWKOPT = MAX( 1, N*NB )
          WORK( 1 ) = LWKOPT
       END IF
 *
@@ -425,7 +424,8 @@ SUBROUTINE DSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *           Factorize columns k:k+kb-1 of A and use blocked code to
 *           update columns k+kb:n
 *
-            CALL DLASYF_RK( UPLO, N-K+1, NB, KB, A( K, K ), LDA, E( K ),
+            CALL DLASYF_RK( UPLO, N-K+1, NB, KB, A( K, K ), LDA,
+     $                      E( K ),
      $                        IPIV( K ), WORK, LDWORK, IINFO )
 
 
diff --git a/SRC/dsytrf_rook.f b/SRC/dsytrf_rook.f
index 2f00d18024..92e9004414 100644
--- a/SRC/dsytrf_rook.f
+++ b/SRC/dsytrf_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRF_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytrf_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytrf_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -118,7 +116,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK.  LWORK >=1.  For best performance
+*>          The length of WORK.  LWORK >= 1.  For best performance
 *>          LWORK >= N*NB, where NB is the block size returned by ILAENV.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
@@ -146,7 +144,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetrf_rook
 *
 *> \par Further Details:
 *  =====================
@@ -204,7 +202,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE DSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      SUBROUTINE DSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK,
+     $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dsytri.f b/SRC/dsytri.f
index f1552d6fe2..23da29c807 100644
--- a/SRC/dsytri.f
+++ b/SRC/dsytri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetri
 *
 *  =====================================================================
       SUBROUTINE DSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -248,7 +247,8 @@ SUBROUTINE DSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
                A( K, K ) = A( K, K ) - DDOT( K-1, WORK, 1, A( 1, K ),
      $                     1 )
                A( K, K+1 ) = A( K, K+1 ) -
-     $                       DDOT( K-1, A( 1, K ), 1, A( 1, K+1 ), 1 )
+     $                       DDOT( K-1, A( 1, K ), 1, A( 1, K+1 ),
+     $                             1 )
                CALL DCOPY( K-1, A( 1, K+1 ), 1, WORK, 1 )
                CALL DSYMV( UPLO, K-1, -ONE, A, LDA, WORK, 1, ZERO,
      $                     A( 1, K+1 ), 1 )
@@ -307,9 +307,11 @@ SUBROUTINE DSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL DCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL DSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL DSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K ), 1 )
-               A( K, K ) = A( K, K ) - DDOT( N-K, WORK, 1, A( K+1, K ),
+               A( K, K ) = A( K, K ) - DDOT( N-K, WORK, 1, A( K+1,
+     $            K ),
      $                     1 )
             END IF
             KSTEP = 1
@@ -332,15 +334,19 @@ SUBROUTINE DSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL DCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL DSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL DSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K ), 1 )
-               A( K, K ) = A( K, K ) - DDOT( N-K, WORK, 1, A( K+1, K ),
+               A( K, K ) = A( K, K ) - DDOT( N-K, WORK, 1, A( K+1,
+     $            K ),
      $                     1 )
                A( K, K-1 ) = A( K, K-1 ) -
-     $                       DDOT( N-K, A( K+1, K ), 1, A( K+1, K-1 ),
+     $                       DDOT( N-K, A( K+1, K ), 1, A( K+1,
+     $                             K-1 ),
      $                       1 )
                CALL DCOPY( N-K, A( K+1, K-1 ), 1, WORK, 1 )
-               CALL DSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL DSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K-1 ), 1 )
                A( K-1, K-1 ) = A( K-1, K-1 ) -
      $                         DDOT( N-K, WORK, 1, A( K+1, K-1 ), 1 )
diff --git a/SRC/dsytri2.f b/SRC/dsytri2.f
index dbcdcdb588..6f95c00b90 100644
--- a/SRC/dsytri2.f
+++ b/SRC/dsytri2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRI2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytri2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytri2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,16 +86,16 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (N+NB+1)*(NB+3)
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK.
-*>          WORK is size >= (N+NB+1)*(NB+3)
+*>          If N = 0, LWORK >= 1, else LWORK >= (N+NB+1)*(NB+3).
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>           calculates:
+*>          calculates:
 *>              - the optimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array,
 *>              - and no error message related to LWORK is issued by XERBLA.
@@ -120,10 +118,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetri2
 *
 *  =====================================================================
       SUBROUTINE DSYTRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -159,9 +158,13 @@ SUBROUTINE DSYTRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
       INFO = 0
       UPPER = LSAME( UPLO, 'U' )
       LQUERY = ( LWORK.EQ.-1 )
+*
 *     Get blocksize
+*
       NBMAX = ILAENV( 1, 'DSYTRI2', UPLO, N, -1, -1, -1 )
-      IF ( NBMAX .GE. N ) THEN
+      IF( N.EQ.0 ) THEN
+         MINSIZE = 1
+      ELSE IF( NBMAX.GE.N ) THEN
          MINSIZE = N
       ELSE
          MINSIZE = (N+NBMAX+1)*(NBMAX+3)
@@ -173,28 +176,29 @@ SUBROUTINE DSYTRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -4
-      ELSE IF (LWORK .LT. MINSIZE .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.MINSIZE .AND. .NOT.LQUERY ) THEN
          INFO = -7
       END IF
-*
-*     Quick return if possible
-*
 *
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'DSYTRI2', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
-         WORK(1)=MINSIZE
+         WORK( 1 ) = MINSIZE
          RETURN
       END IF
+*
+*     Quick return if possible
+*
       IF( N.EQ.0 )
      $   RETURN
 
-      IF( NBMAX .GE. N ) THEN
+      IF( NBMAX.GE.N ) THEN
          CALL DSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
       ELSE
          CALL DSYTRI2X( UPLO, N, A, LDA, IPIV, WORK, NBMAX, INFO )
       END IF
+*
       RETURN
 *
 *     End of DSYTRI2
diff --git a/SRC/dsytri2x.f b/SRC/dsytri2x.f
index 2ae4f10591..a4dc9d0111 100644
--- a/SRC/dsytri2x.f
+++ b/SRC/dsytri2x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRI2X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytri2x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytri2x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,10 +111,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetri2x
 *
 *  =====================================================================
       SUBROUTINE DSYTRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -382,8 +381,10 @@ SUBROUTINE DSYTRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
             DO WHILE ( I .LE. N )
                IF( IPIV(I) .GT. 0 ) THEN
                   IP=IPIV(I)
-                 IF (I .LT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, I ,IP )
-                 IF (I .GT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                 IF (I .LT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, I ,
+     $                IP )
+                 IF (I .GT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, IP ,
+     $                I )
                ELSE
                  IP=-IPIV(I)
                  I=I+1
@@ -568,12 +569,16 @@ SUBROUTINE DSYTRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
             DO WHILE ( I .GE. 1 )
                IF( IPIV(I) .GT. 0 ) THEN
                   IP=IPIV(I)
-                 IF (I .LT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, I ,IP  )
-                 IF (I .GT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                 IF (I .LT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, I ,
+     $                IP  )
+                 IF (I .GT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, IP ,
+     $                I )
                ELSE
                  IP=-IPIV(I)
-                 IF ( I .LT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, I ,IP )
-                 IF ( I .GT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, IP, I )
+                 IF ( I .LT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, I ,
+     $                IP )
+                 IF ( I .GT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, IP,
+     $                I )
                  I=I-1
                ENDIF
                I=I-1
diff --git a/SRC/dsytri_3.f b/SRC/dsytri_3.f
index 86d69cdfdd..537e3c33e7 100644
--- a/SRC/dsytri_3.f
+++ b/SRC/dsytri_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRI_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytri_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytri_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,16 +117,17 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (N+NB+1)*(NB+3).
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK)).
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK. LWORK >= (N+NB+1)*(NB+3).
+*>          The length of WORK.
+*>          If N = 0, LWORK >= 1, else LWORK >= (N+NB+1)*(NB+3).
 *>
-*>          If LDWORK = -1, then a workspace query is assumed;
+*>          If LWORK = -1, then a workspace query is assumed;
 *>          the routine only calculates the optimal size of the optimal
 *>          size of the WORK array, returns this value as the first
 *>          entry of the WORK array, and no error message related to
@@ -152,7 +151,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetri_3
 *
 *> \par Contributors:
 *  ==================
@@ -167,6 +166,7 @@
 *  =====================================================================
       SUBROUTINE DSYTRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
      $                     INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -208,8 +208,13 @@ SUBROUTINE DSYTRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *
 *     Determine the block size
 *
-      NB = MAX( 1, ILAENV( 1, 'DSYTRI_3', UPLO, N, -1, -1, -1 ) )
-      LWKOPT = ( N+NB+1 ) * ( NB+3 )
+      IF( N.EQ.0 ) THEN
+         LWKOPT = 1
+      ELSE
+         NB = MAX( 1, ILAENV( 1, 'DSYTRI_3', UPLO, N, -1, -1, -1 ) )
+         LWKOPT = ( N+NB+1 ) * ( NB+3 )
+      END IF
+      WORK( 1 ) = LWKOPT
 *
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
@@ -217,7 +222,7 @@ SUBROUTINE DSYTRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -4
-      ELSE IF ( LWORK .LT. LWKOPT .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKOPT .AND. .NOT.LQUERY ) THEN
          INFO = -8
       END IF
 *
@@ -225,7 +230,6 @@ SUBROUTINE DSYTRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
          CALL XERBLA( 'DSYTRI_3', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
-         WORK( 1 ) = LWKOPT
          RETURN
       END IF
 *
diff --git a/SRC/dsytri_3x.f b/SRC/dsytri_3x.f
index 2e3809a1ec..ae68e9b987 100644
--- a/SRC/dsytri_3x.f
+++ b/SRC/dsytri_3x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRI_3X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytri_3x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytri_3x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -142,7 +140,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetri_3x
 *
 *> \par Contributors:
 *  ==================
@@ -155,7 +153,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE DSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
+      SUBROUTINE DSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB,
+     $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -187,7 +187,8 @@ SUBROUTINE DSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DSYSWAPR, DTRTRI, DTRMM, XERBLA
+      EXTERNAL           DGEMM, DSYSWAPR, DTRTRI, DTRMM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MOD
@@ -431,8 +432,10 @@ SUBROUTINE DSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
          DO I = 1, N
              IP = ABS( IPIV( I ) )
              IF( IP.NE.I ) THEN
-                IF (I .LT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, I ,IP )
-                IF (I .GT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                IF (I .LT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, I ,
+     $               IP )
+                IF (I .GT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, IP ,
+     $               I )
              END IF
          END DO
 *
@@ -627,8 +630,10 @@ SUBROUTINE DSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
          DO I = N, 1, -1
              IP = ABS( IPIV( I ) )
              IF( IP.NE.I ) THEN
-                IF (I .LT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, I ,IP )
-                IF (I .GT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                IF (I .LT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, I ,
+     $               IP )
+                IF (I .GT. IP) CALL DSYSWAPR( UPLO, N, A, LDA, IP ,
+     $               I )
              END IF
          END DO
 *
diff --git a/SRC/dsytri_rook.f b/SRC/dsytri_rook.f
index 3d1a24aafc..d46b46863f 100644
--- a/SRC/dsytri_rook.f
+++ b/SRC/dsytri_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRI_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytri_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytri_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetri_rook
 *
 *> \par Contributors:
 *  ==================
@@ -126,6 +124,7 @@
 *
 *  =====================================================================
       SUBROUTINE DSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -263,7 +262,8 @@ SUBROUTINE DSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
                A( K, K ) = A( K, K ) - DDOT( K-1, WORK, 1, A( 1, K ),
      $                     1 )
                A( K, K+1 ) = A( K, K+1 ) -
-     $                       DDOT( K-1, A( 1, K ), 1, A( 1, K+1 ), 1 )
+     $                       DDOT( K-1, A( 1, K ), 1, A( 1, K+1 ),
+     $                             1 )
                CALL DCOPY( K-1, A( 1, K+1 ), 1, WORK, 1 )
                CALL DSYMV( UPLO, K-1, -ONE, A, LDA, WORK, 1, ZERO,
      $                     A( 1, K+1 ), 1 )
@@ -282,7 +282,8 @@ SUBROUTINE DSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
                IF( KP.GT.1 )
      $             CALL DSWAP( KP-1, A( 1, K ), 1, A( 1, KP ), 1 )
-               CALL DSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ), LDA )
+               CALL DSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ),
+     $                     LDA )
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
                A( KP, KP ) = TEMP
@@ -296,7 +297,8 @@ SUBROUTINE DSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
                IF( KP.GT.1 )
      $            CALL DSWAP( KP-1, A( 1, K ), 1, A( 1, KP ), 1 )
-               CALL DSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ), LDA )
+               CALL DSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ),
+     $                     LDA )
 *
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
@@ -311,7 +313,8 @@ SUBROUTINE DSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
                IF( KP.GT.1 )
      $            CALL DSWAP( KP-1, A( 1, K ), 1, A( 1, KP ), 1 )
-               CALL DSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ), LDA )
+               CALL DSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ),
+     $                     LDA )
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
                A( KP, KP ) = TEMP
@@ -349,9 +352,11 @@ SUBROUTINE DSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL DCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL DSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL DSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K ), 1 )
-               A( K, K ) = A( K, K ) - DDOT( N-K, WORK, 1, A( K+1, K ),
+               A( K, K ) = A( K, K ) - DDOT( N-K, WORK, 1, A( K+1,
+     $            K ),
      $                     1 )
             END IF
             KSTEP = 1
@@ -374,15 +379,19 @@ SUBROUTINE DSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL DCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL DSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL DSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K ), 1 )
-               A( K, K ) = A( K, K ) - DDOT( N-K, WORK, 1, A( K+1, K ),
+               A( K, K ) = A( K, K ) - DDOT( N-K, WORK, 1, A( K+1,
+     $            K ),
      $                     1 )
                A( K, K-1 ) = A( K, K-1 ) -
-     $                       DDOT( N-K, A( K+1, K ), 1, A( K+1, K-1 ),
+     $                       DDOT( N-K, A( K+1, K ), 1, A( K+1,
+     $                             K-1 ),
      $                       1 )
                CALL DCOPY( N-K, A( K+1, K-1 ), 1, WORK, 1 )
-               CALL DSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL DSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K-1 ), 1 )
                A( K-1, K-1 ) = A( K-1, K-1 ) -
      $                         DDOT( N-K, WORK, 1, A( K+1, K-1 ), 1 )
@@ -398,8 +407,10 @@ SUBROUTINE DSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             KP = IPIV( K )
             IF( KP.NE.K ) THEN
                IF( KP.LT.N )
-     $            CALL DSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
-               CALL DSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ), LDA )
+     $            CALL DSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
+               CALL DSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ),
+     $                     LDA )
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
                A( KP, KP ) = TEMP
@@ -412,8 +423,10 @@ SUBROUTINE DSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             KP = -IPIV( K )
             IF( KP.NE.K ) THEN
                IF( KP.LT.N )
-     $            CALL DSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
-               CALL DSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ), LDA )
+     $            CALL DSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
+               CALL DSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ),
+     $                     LDA )
 *
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
@@ -427,8 +440,10 @@ SUBROUTINE DSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             KP = -IPIV( K )
             IF( KP.NE.K ) THEN
                IF( KP.LT.N )
-     $            CALL DSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
-               CALL DSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ), LDA )
+     $            CALL DSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
+               CALL DSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ),
+     $                     LDA )
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
                A( KP, KP ) = TEMP
diff --git a/SRC/dsytrs.f b/SRC/dsytrs.f
index f1be52e887..1651f2aa3a 100644
--- a/SRC/dsytrs.f
+++ b/SRC/dsytrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,10 +111,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetrs
 *
 *  =====================================================================
       SUBROUTINE DSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -270,7 +269,8 @@ SUBROUTINE DSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           Multiply by inv(U**T(K)), where U(K) is the transformation
 *           stored in column K of A.
 *
-            CALL DGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, A( 1, K ),
+            CALL DGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, A( 1,
+     $                  K ),
      $                  1, ONE, B( K, 1 ), LDB )
 *
 *           Interchange rows K and IPIV(K).
@@ -286,7 +286,8 @@ SUBROUTINE DSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           Multiply by inv(U**T(K+1)), where U(K+1) is the transformation
 *           stored in columns K and K+1 of A.
 *
-            CALL DGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, A( 1, K ),
+            CALL DGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, A( 1,
+     $                  K ),
      $                  1, ONE, B( K, 1 ), LDB )
             CALL DGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB,
      $                  A( 1, K+1 ), 1, ONE, B( K+1, 1 ), LDB )
@@ -354,7 +355,8 @@ SUBROUTINE DSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL DGER( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K, 1 ),
+               CALL DGER( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K,
+     $                    1 ),
      $                    LDB, B( K+2, 1 ), LDB )
                CALL DGER( N-K-1, NRHS, -ONE, A( K+2, K+1 ), 1,
      $                    B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
diff --git a/SRC/dsytrs2.f b/SRC/dsytrs2.f
index 7e868f1a1f..9f4fcb7891 100644
--- a/SRC/dsytrs2.f
+++ b/SRC/dsytrs2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytrs2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytrs2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -124,11 +122,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetrs2
 *
 *  =====================================================================
       SUBROUTINE DSYTRS2( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
      $                    WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -159,7 +158,8 @@ SUBROUTINE DSYTRS2( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSCAL, DSYCONV, DSWAP, DTRSM, XERBLA
+      EXTERNAL           DSCAL, DSYCONV, DSWAP, DTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
diff --git a/SRC/dsytrs_3.f b/SRC/dsytrs_3.f
index 56ec92059a..da11fe2c96 100644
--- a/SRC/dsytrs_3.f
+++ b/SRC/dsytrs_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRS_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytrs_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytrs_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -142,7 +140,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetrs_3
 *
 *> \par Contributors:
 *  ==================
@@ -162,6 +160,7 @@
 *  =====================================================================
       SUBROUTINE DSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
      $                     INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -246,7 +245,8 @@ SUBROUTINE DSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (U \P**T * B) -> B    [ (U \P**T * B) ]
 *
-         CALL DTRSM( 'L', 'U', 'N', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL DTRSM( 'L', 'U', 'N', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        Compute D \ B -> B   [ D \ (U \P**T * B) ]
 *
@@ -272,7 +272,8 @@ SUBROUTINE DSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (U**T \ B) -> B   [ U**T \ (D \ (U \P**T * B) ) ]
 *
-         CALL DTRSM( 'L', 'U', 'T', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL DTRSM( 'L', 'U', 'T', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        P * B  [ P * (U**T \ (D \ (U \P**T * B) )) ]
 *
@@ -313,7 +314,8 @@ SUBROUTINE DSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (L \P**T * B) -> B    [ (L \P**T * B) ]
 *
-         CALL DTRSM( 'L', 'L', 'N', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL DTRSM( 'L', 'L', 'N', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        Compute D \ B -> B   [ D \ (L \P**T * B) ]
 *
@@ -339,7 +341,8 @@ SUBROUTINE DSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (L**T \ B) -> B   [ L**T \ (D \ (L \P**T * B) ) ]
 *
-         CALL DTRSM('L', 'L', 'T', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL DTRSM('L', 'L', 'T', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        P * B  [ P * (L**T \ (D \ (L \P**T * B) )) ]
 *
diff --git a/SRC/dsytrs_aa.f b/SRC/dsytrs_aa.f
index 26b11a2a0b..af7b9b2628 100644
--- a/SRC/dsytrs_aa.f
+++ b/SRC/dsytrs_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRS_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytrs_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytrs_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -105,7 +103,13 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK >= max(1,3*N-2).
+*>          The dimension of the array WORK.
+*>          If MIN(N,NRHS) = 0, LWORK >= 1, else LWORK >= 3*N-2.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the minimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -123,7 +127,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetrs_aa
 *
 *  =====================================================================
       SUBROUTINE DSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
@@ -151,7 +155,7 @@ SUBROUTINE DSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, UPPER
-      INTEGER            K, KP, LWKOPT
+      INTEGER            K, KP, LWKMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -161,13 +165,19 @@ SUBROUTINE DSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
       EXTERNAL           DLACPY, DGTSV, DSWAP, DTRSM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX
+      INTRINSIC          MIN, MAX
 *     ..
 *     .. Executable Statements ..
 *
       INFO = 0
       UPPER = LSAME( UPLO, 'U' )
       LQUERY = ( LWORK.EQ.-1 )
+      IF( MIN( N, NRHS ).EQ.0 ) THEN
+         LWKMIN = 1
+      ELSE
+         LWKMIN = 3*N-2
+      END IF
+*
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
@@ -178,21 +188,20 @@ SUBROUTINE DSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
          INFO = -5
       ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
          INFO = -8
-      ELSE IF( LWORK.LT.MAX( 1, 3*N-2 ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -10
       END IF
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'DSYTRS_AA', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
-         LWKOPT = (3*N-2)
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = LWKMIN
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( N.EQ.0 .OR. NRHS.EQ.0 )
+      IF( MIN( N, NRHS ).EQ.0 )
      $   RETURN
 *
       IF( UPPER ) THEN
@@ -208,7 +217,8 @@ SUBROUTINE DSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
             DO K = 1, N
                KP = IPIV( K )
                IF( KP.NE.K )
-     $             CALL DSWAP( NRHS, B( K, 1 ), LDB, B( KP, 1 ), LDB )
+     $             CALL DSWAP( NRHS, B( K, 1 ), LDB, B( KP, 1 ),
+     $                         LDB )
             END DO
 *
 *           Compute U**T \ B -> B    [ (U**T \P**T * B) ]
@@ -223,10 +233,13 @@ SUBROUTINE DSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
          CALL DLACPY( 'F', 1, N, A( 1, 1 ), LDA+1, WORK( N ), 1)
          IF( N.GT.1 ) THEN
-            CALL DLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 1 ), 1 )
-            CALL DLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 2*N ), 1 )
+            CALL DLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 1 ),
+     $                   1 )
+            CALL DLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 2*N ),
+     $                   1 )
          END IF
-         CALL DGTSV( N, NRHS, WORK( 1 ), WORK( N ), WORK( 2*N ), B, LDB,
+         CALL DGTSV( N, NRHS, WORK( 1 ), WORK( N ), WORK( 2*N ), B,
+     $               LDB,
      $               INFO )
 *
 *        3) Backward substitution with U
@@ -235,7 +248,8 @@ SUBROUTINE DSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute U \ B -> B   [ U \ (T \ (U**T \P**T * B) ) ]
 *
-            CALL DTRSM( 'L', 'U', 'N', 'U', N-1, NRHS, ONE, A( 1, 2 ),
+            CALL DTRSM( 'L', 'U', 'N', 'U', N-1, NRHS, ONE, A( 1,
+     $                  2 ),
      $                  LDA, B( 2, 1 ), LDB)
 *
 *           Pivot, P * B -> B  [ P * (U \ (T \ (U**T \P**T * B) )) ]
@@ -265,7 +279,8 @@ SUBROUTINE DSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute L \ B -> B    [ (L \P**T * B) ]
 *
-            CALL DTRSM( 'L', 'L', 'N', 'U', N-1, NRHS, ONE, A( 2, 1 ),
+            CALL DTRSM( 'L', 'L', 'N', 'U', N-1, NRHS, ONE, A( 2,
+     $                  1 ),
      $                  LDA, B( 2, 1 ), LDB)
          END IF
 *
@@ -275,10 +290,13 @@ SUBROUTINE DSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
          CALL DLACPY( 'F', 1, N, A(1, 1), LDA+1, WORK(N), 1)
          IF( N.GT.1 ) THEN
-            CALL DLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 1 ), 1 )
-            CALL DLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 2*N ), 1 )
+            CALL DLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 1 ),
+     $                   1 )
+            CALL DLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 2*N ),
+     $                   1 )
          END IF
-         CALL DGTSV( N, NRHS, WORK( 1 ), WORK(N), WORK( 2*N ), B, LDB,
+         CALL DGTSV( N, NRHS, WORK( 1 ), WORK(N), WORK( 2*N ), B,
+     $               LDB,
      $               INFO)
 *
 *        3) Backward substitution with L**T
@@ -287,7 +305,8 @@ SUBROUTINE DSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute (L**T \ B) -> B   [ L**T \ (T \ (L \P**T * B) ) ]
 *
-            CALL DTRSM( 'L', 'L', 'T', 'U', N-1, NRHS, ONE, A( 2, 1 ),
+            CALL DTRSM( 'L', 'L', 'T', 'U', N-1, NRHS, ONE, A( 2,
+     $                  1 ),
      $                  LDA, B( 2, 1 ), LDB)
 *
 *           Pivot, P * B -> B  [ P * (L**T \ (T \ (L \P**T * B) )) ]
diff --git a/SRC/dsytrs_aa_2stage.f b/SRC/dsytrs_aa_2stage.f
index 963a886839..75cfea0fac 100644
--- a/SRC/dsytrs_aa_2stage.f
+++ b/SRC/dsytrs_aa_2stage.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRS_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytrs_aa_2stage.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytrs_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -131,7 +129,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetrs_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE DSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
@@ -215,7 +213,8 @@ SUBROUTINE DSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (U**T \ B) -> B    [ (U**T \P**T * B) ]
 *
-            CALL DTRSM( 'L', 'U', 'T', 'U', N-NB, NRHS, ONE, A(1, NB+1),
+            CALL DTRSM( 'L', 'U', 'T', 'U', N-NB, NRHS, ONE, A(1,
+     $                  NB+1),
      $                 LDA, B(NB+1, 1), LDB)
 *
          END IF
@@ -228,7 +227,8 @@ SUBROUTINE DSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (U \ B) -> B   [ U \ (T \ (U**T \P**T * B) ) ]
 *
-            CALL DTRSM( 'L', 'U', 'N', 'U', N-NB, NRHS, ONE, A(1, NB+1),
+            CALL DTRSM( 'L', 'U', 'N', 'U', N-NB, NRHS, ONE, A(1,
+     $                  NB+1),
      $                  LDA, B(NB+1, 1), LDB)
 *
 *           Pivot, P * B -> B  [ P * (U \ (T \ (U**T \P**T * B) )) ]
@@ -249,7 +249,8 @@ SUBROUTINE DSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (L \ B) -> B    [ (L \P**T * B) ]
 *
-            CALL DTRSM( 'L', 'L', 'N', 'U', N-NB, NRHS, ONE, A(NB+1, 1),
+            CALL DTRSM( 'L', 'L', 'N', 'U', N-NB, NRHS, ONE, A(NB+1,
+     $                  1),
      $                 LDA, B(NB+1, 1), LDB)
 *
          END IF
@@ -262,7 +263,8 @@ SUBROUTINE DSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (L**T \ B) -> B   [ L**T \ (T \ (L \P**T * B) ) ]
 *
-            CALL DTRSM( 'L', 'L', 'T', 'U', N-NB, NRHS, ONE, A(NB+1, 1),
+            CALL DTRSM( 'L', 'L', 'T', 'U', N-NB, NRHS, ONE, A(NB+1,
+     $                  1),
      $                  LDA, B(NB+1, 1), LDB)
 *
 *           Pivot, P * B -> B  [ P * (L**T \ (T \ (L \P**T * B) )) ]
diff --git a/SRC/dsytrs_rook.f b/SRC/dsytrs_rook.f
index 1830347f83..0d4f967a53 100644
--- a/SRC/dsytrs_rook.f
+++ b/SRC/dsytrs_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DSYTRS_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dsytrs_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dsytrs_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,7 +111,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup hetrs_rook
 *
 *> \par Contributors:
 *  ==================
@@ -133,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE DSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
      $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -250,7 +249,8 @@ SUBROUTINE DSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
             IF( K.GT.2 ) THEN
                CALL DGER( K-2, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ),
      $                    LDB, B( 1, 1 ), LDB )
-               CALL DGER( K-2, NRHS, -ONE, A( 1, K-1 ), 1, B( K-1, 1 ),
+               CALL DGER( K-2, NRHS, -ONE, A( 1, K-1 ), 1, B( K-1,
+     $                    1 ),
      $                    LDB, B( 1, 1 ), LDB )
             END IF
 *
@@ -388,7 +388,8 @@ SUBROUTINE DSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL DGER( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K, 1 ),
+               CALL DGER( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K,
+     $                    1 ),
      $                    LDB, B( K+2, 1 ), LDB )
                CALL DGER( N-K-1, NRHS, -ONE, A( K+2, K+1 ), 1,
      $                    B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
diff --git a/SRC/dtbcon.f b/SRC/dtbcon.f
index b0dc2a5641..23daaa255d 100644
--- a/SRC/dtbcon.f
+++ b/SRC/dtbcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTBCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtbcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtbcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,11 +133,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tbcon
 *
 *  =====================================================================
-      SUBROUTINE DTBCON( NORM, UPLO, DIAG, N, KD, AB, LDAB, RCOND, WORK,
+      SUBROUTINE DTBCON( NORM, UPLO, DIAG, N, KD, AB, LDAB, RCOND,
+     $                   WORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -238,19 +238,22 @@ SUBROUTINE DTBCON( NORM, UPLO, DIAG, N, KD, AB, LDAB, RCOND, WORK,
          END IF
          KASE = 0
    10    CONTINUE
-         CALL DLACN2( N, WORK( N+1 ), WORK, IWORK, AINVNM, KASE, ISAVE )
+         CALL DLACN2( N, WORK( N+1 ), WORK, IWORK, AINVNM, KASE,
+     $                ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.KASE1 ) THEN
 *
 *              Multiply by inv(A).
 *
-               CALL DLATBS( UPLO, 'No transpose', DIAG, NORMIN, N, KD,
+               CALL DLATBS( UPLO, 'No transpose', DIAG, NORMIN, N,
+     $                      KD,
      $                      AB, LDAB, WORK, SCALE, WORK( 2*N+1 ), INFO )
             ELSE
 *
 *              Multiply by inv(A**T).
 *
-               CALL DLATBS( UPLO, 'Transpose', DIAG, NORMIN, N, KD, AB,
+               CALL DLATBS( UPLO, 'Transpose', DIAG, NORMIN, N, KD,
+     $                      AB,
      $                      LDAB, WORK, SCALE, WORK( 2*N+1 ), INFO )
             END IF
             NORMIN = 'Y'
diff --git a/SRC/dtbrfs.f b/SRC/dtbrfs.f
index 361a9b0b7a..5434e992df 100644
--- a/SRC/dtbrfs.f
+++ b/SRC/dtbrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTBRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtbrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtbrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -180,11 +178,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tbrfs
 *
 *  =====================================================================
       SUBROUTINE DTBRFS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
      $                   LDB, X, LDX, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -218,7 +217,8 @@ SUBROUTINE DTBRFS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DLACN2, DTBMV, DTBSV, XERBLA
+      EXTERNAL           DAXPY, DCOPY, DLACN2, DTBMV, DTBSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN
@@ -439,7 +439,8 @@ SUBROUTINE DTBRFS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
 *
          KASE = 0
   210    CONTINUE
-         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
diff --git a/SRC/dtbtrs.f b/SRC/dtbtrs.f
index 05bd5f895b..adaa279774 100644
--- a/SRC/dtbtrs.f
+++ b/SRC/dtbtrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTBTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtbtrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtbtrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -39,8 +37,14 @@
 *>
 *>    A * X = B  or  A**T * X = B,
 *>
-*> where A is a triangular band matrix of order N, and B is an
-*> N-by NRHS matrix.  A check is made to verify that A is nonsingular.
+*> where A is a triangular band matrix of order N, and B is an N-by-NRHS matrix.
+*>
+*> This subroutine verifies that A is nonsingular, but callers should note that only exact
+*> singularity is detected. It is conceivable for one or more diagonal elements of A to be
+*> subnormally tiny numbers without this subroutine signalling an error.
+*>
+*> If a possible loss of numerical precision due to near-singular matrices is a concern, the
+*> caller should verify that A is nonsingular within some tolerance before calling this subroutine.
 *> \endverbatim
 *
 *  Arguments:
@@ -125,7 +129,7 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the i-th diagonal element of A is zero,
+*>          > 0:  if INFO = i, the i-th diagonal element of A is exactly zero,
 *>                indicating that the matrix is singular and the
 *>                solutions X have not been computed.
 *> \endverbatim
@@ -138,11 +142,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tbtrs
 *
 *  =====================================================================
       SUBROUTINE DTBTRS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
      $                   LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -186,7 +191,8 @@ SUBROUTINE DTBTRS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.
-     $         LSAME( TRANS, 'T' ) .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+     $         LSAME( TRANS, 'T' ) .AND.
+     $                .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -2
       ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
          INFO = -3
@@ -231,7 +237,8 @@ SUBROUTINE DTBTRS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
 *     Solve A * X = B  or  A**T * X = B.
 *
       DO 30 J = 1, NRHS
-         CALL DTBSV( UPLO, TRANS, DIAG, N, KD, AB, LDAB, B( 1, J ), 1 )
+         CALL DTBSV( UPLO, TRANS, DIAG, N, KD, AB, LDAB, B( 1, J ),
+     $               1 )
    30 CONTINUE
 *
       RETURN
diff --git a/SRC/dtfsm.f b/SRC/dtfsm.f
index b2a80d029d..8545e3a230 100644
--- a/SRC/dtfsm.f
+++ b/SRC/dtfsm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTFSM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtfsm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtfsm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -141,7 +139,8 @@
 *> \param[in] A
 *> \verbatim
 *>          A is DOUBLE PRECISION array, dimension (NT)
-*>           NT = N*(N+1)/2. On entry, the matrix A in RFP Format.
+*>           NT = N*(N+1)/2 if SIDE='R' and NT = M*(M+1)/2 otherwise.
+*>           On entry, the matrix A in RFP Format.
 *>           RFP Format is described by TRANSR, UPLO and N as follows:
 *>           If TRANSR='N' then RFP A is (0:N,0:K-1) when N is even;
 *>           K=N/2. RFP A is (0:N-1,0:K) when N is odd; K=N/2. If
@@ -182,7 +181,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tfsm
 *
 *> \par Further Details:
 *  =====================
@@ -272,8 +271,10 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
+      SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA,
+     $                  A,
      $                  B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -327,7 +328,8 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
          INFO = -3
       ELSE IF( .NOT.NOTRANS .AND. .NOT.LSAME( TRANS, 'T' ) ) THEN
          INFO = -4
-      ELSE IF( .NOT.LSAME( DIAG, 'N' ) .AND. .NOT.LSAME( DIAG, 'U' ) )
+      ELSE IF( .NOT.LSAME( DIAG, 'N' ) .AND.
+     $         .NOT.LSAME( DIAG, 'U' ) )
      $         THEN
          INFO = -5
       ELSE IF( M.LT.0 ) THEN
@@ -399,12 +401,15 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    TRANS = 'N'
 *
                      IF( M.EQ.1 ) THEN
-                        CALL DTRSM( 'L', 'L', 'N', DIAG, M1, N, ALPHA,
+                        CALL DTRSM( 'L', 'L', 'N', DIAG, M1, N,
+     $                              ALPHA,
      $                              A, M, B, LDB )
                      ELSE
-                        CALL DTRSM( 'L', 'L', 'N', DIAG, M1, N, ALPHA,
+                        CALL DTRSM( 'L', 'L', 'N', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M, B, LDB )
-                        CALL DGEMM( 'N', 'N', M2, N, M1, -ONE, A( M1 ),
+                        CALL DGEMM( 'N', 'N', M2, N, M1, -ONE,
+     $                              A( M1 ),
      $                              M, B, LDB, ALPHA, B( M1, 0 ), LDB )
                         CALL DTRSM( 'L', 'U', 'T', DIAG, M2, N, ONE,
      $                              A( M ), M, B( M1, 0 ), LDB )
@@ -416,12 +421,15 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    TRANS = 'T'
 *
                      IF( M.EQ.1 ) THEN
-                        CALL DTRSM( 'L', 'L', 'T', DIAG, M1, N, ALPHA,
+                        CALL DTRSM( 'L', 'L', 'T', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M, B, LDB )
                      ELSE
-                        CALL DTRSM( 'L', 'U', 'N', DIAG, M2, N, ALPHA,
+                        CALL DTRSM( 'L', 'U', 'N', DIAG, M2, N,
+     $                              ALPHA,
      $                              A( M ), M, B( M1, 0 ), LDB )
-                        CALL DGEMM( 'T', 'N', M1, N, M2, -ONE, A( M1 ),
+                        CALL DGEMM( 'T', 'N', M1, N, M2, -ONE,
+     $                              A( M1 ),
      $                              M, B( M1, 0 ), LDB, ALPHA, B, LDB )
                         CALL DTRSM( 'L', 'L', 'T', DIAG, M1, N, ONE,
      $                              A( 0 ), M, B, LDB )
@@ -440,7 +448,8 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL DTRSM( 'L', 'L', 'N', DIAG, M1, N, ALPHA,
      $                           A( M2 ), M, B, LDB )
-                     CALL DGEMM( 'T', 'N', M2, N, M1, -ONE, A( 0 ), M,
+                     CALL DGEMM( 'T', 'N', M2, N, M1, -ONE, A( 0 ),
+     $                           M,
      $                           B, LDB, ALPHA, B( M1, 0 ), LDB )
                      CALL DTRSM( 'L', 'U', 'T', DIAG, M2, N, ONE,
      $                           A( M1 ), M, B( M1, 0 ), LDB )
@@ -452,7 +461,8 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL DTRSM( 'L', 'U', 'N', DIAG, M2, N, ALPHA,
      $                           A( M1 ), M, B( M1, 0 ), LDB )
-                     CALL DGEMM( 'N', 'N', M1, N, M2, -ONE, A( 0 ), M,
+                     CALL DGEMM( 'N', 'N', M1, N, M2, -ONE, A( 0 ),
+     $                           M,
      $                           B( M1, 0 ), LDB, ALPHA, B, LDB )
                      CALL DTRSM( 'L', 'L', 'T', DIAG, M1, N, ONE,
      $                           A( M2 ), M, B, LDB )
@@ -475,10 +485,12 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    TRANS = 'N'
 *
                      IF( M.EQ.1 ) THEN
-                        CALL DTRSM( 'L', 'U', 'T', DIAG, M1, N, ALPHA,
+                        CALL DTRSM( 'L', 'U', 'T', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M1, B, LDB )
                      ELSE
-                        CALL DTRSM( 'L', 'U', 'T', DIAG, M1, N, ALPHA,
+                        CALL DTRSM( 'L', 'U', 'T', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M1, B, LDB )
                         CALL DGEMM( 'T', 'N', M2, N, M1, -ONE,
      $                              A( M1*M1 ), M1, B, LDB, ALPHA,
@@ -493,10 +505,12 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    TRANS = 'T'
 *
                      IF( M.EQ.1 ) THEN
-                        CALL DTRSM( 'L', 'U', 'N', DIAG, M1, N, ALPHA,
+                        CALL DTRSM( 'L', 'U', 'N', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M1, B, LDB )
                      ELSE
-                        CALL DTRSM( 'L', 'L', 'T', DIAG, M2, N, ALPHA,
+                        CALL DTRSM( 'L', 'L', 'T', DIAG, M2, N,
+     $                              ALPHA,
      $                              A( 1 ), M1, B( M1, 0 ), LDB )
                         CALL DGEMM( 'N', 'N', M1, N, M2, -ONE,
      $                              A( M1*M1 ), M1, B( M1, 0 ), LDB,
@@ -518,7 +532,8 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL DTRSM( 'L', 'U', 'T', DIAG, M1, N, ALPHA,
      $                           A( M2*M2 ), M2, B, LDB )
-                     CALL DGEMM( 'N', 'N', M2, N, M1, -ONE, A( 0 ), M2,
+                     CALL DGEMM( 'N', 'N', M2, N, M1, -ONE, A( 0 ),
+     $                           M2,
      $                           B, LDB, ALPHA, B( M1, 0 ), LDB )
                      CALL DTRSM( 'L', 'L', 'N', DIAG, M2, N, ONE,
      $                           A( M1*M2 ), M2, B( M1, 0 ), LDB )
@@ -530,7 +545,8 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL DTRSM( 'L', 'L', 'T', DIAG, M2, N, ALPHA,
      $                           A( M1*M2 ), M2, B( M1, 0 ), LDB )
-                     CALL DGEMM( 'T', 'N', M1, N, M2, -ONE, A( 0 ), M2,
+                     CALL DGEMM( 'T', 'N', M1, N, M2, -ONE, A( 0 ),
+     $                           M2,
      $                           B( M1, 0 ), LDB, ALPHA, B, LDB )
                      CALL DTRSM( 'L', 'U', 'N', DIAG, M1, N, ONE,
      $                           A( M2*M2 ), M2, B, LDB )
@@ -590,7 +606,8 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL DTRSM( 'L', 'L', 'N', DIAG, K, N, ALPHA,
      $                           A( K+1 ), M+1, B, LDB )
-                     CALL DGEMM( 'T', 'N', K, N, K, -ONE, A( 0 ), M+1,
+                     CALL DGEMM( 'T', 'N', K, N, K, -ONE, A( 0 ),
+     $                           M+1,
      $                           B, LDB, ALPHA, B( K, 0 ), LDB )
                      CALL DTRSM( 'L', 'U', 'T', DIAG, K, N, ONE,
      $                           A( K ), M+1, B( K, 0 ), LDB )
@@ -601,7 +618,8 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    and TRANS = 'T'
                      CALL DTRSM( 'L', 'U', 'N', DIAG, K, N, ALPHA,
      $                           A( K ), M+1, B( K, 0 ), LDB )
-                     CALL DGEMM( 'N', 'N', K, N, K, -ONE, A( 0 ), M+1,
+                     CALL DGEMM( 'N', 'N', K, N, K, -ONE, A( 0 ),
+     $                           M+1,
      $                           B( K, 0 ), LDB, ALPHA, B, LDB )
                      CALL DTRSM( 'L', 'L', 'T', DIAG, K, N, ONE,
      $                           A( K+1 ), M+1, B, LDB )
@@ -657,7 +675,8 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL DTRSM( 'L', 'U', 'T', DIAG, K, N, ALPHA,
      $                           A( K*( K+1 ) ), K, B, LDB )
-                     CALL DGEMM( 'N', 'N', K, N, K, -ONE, A( 0 ), K, B,
+                     CALL DGEMM( 'N', 'N', K, N, K, -ONE, A( 0 ), K,
+     $                           B,
      $                           LDB, ALPHA, B( K, 0 ), LDB )
                      CALL DTRSM( 'L', 'L', 'N', DIAG, K, N, ONE,
      $                           A( K*K ), K, B( K, 0 ), LDB )
@@ -723,7 +742,8 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL DTRSM( 'R', 'U', 'T', DIAG, M, N2, ALPHA,
      $                           A( N ), N, B( 0, N1 ), LDB )
-                     CALL DGEMM( 'N', 'N', M, N1, N2, -ONE, B( 0, N1 ),
+                     CALL DGEMM( 'N', 'N', M, N1, N2, -ONE, B( 0,
+     $                           N1 ),
      $                           LDB, A( N1 ), N, ALPHA, B( 0, 0 ),
      $                           LDB )
                      CALL DTRSM( 'R', 'L', 'N', DIAG, M, N1, ONE,
@@ -736,7 +756,8 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL DTRSM( 'R', 'L', 'T', DIAG, M, N1, ALPHA,
      $                           A( 0 ), N, B( 0, 0 ), LDB )
-                     CALL DGEMM( 'N', 'T', M, N2, N1, -ONE, B( 0, 0 ),
+                     CALL DGEMM( 'N', 'T', M, N2, N1, -ONE, B( 0,
+     $                           0 ),
      $                           LDB, A( N1 ), N, ALPHA, B( 0, N1 ),
      $                           LDB )
                      CALL DTRSM( 'R', 'U', 'N', DIAG, M, N2, ONE,
@@ -755,7 +776,8 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL DTRSM( 'R', 'L', 'T', DIAG, M, N1, ALPHA,
      $                           A( N2 ), N, B( 0, 0 ), LDB )
-                     CALL DGEMM( 'N', 'N', M, N2, N1, -ONE, B( 0, 0 ),
+                     CALL DGEMM( 'N', 'N', M, N2, N1, -ONE, B( 0,
+     $                           0 ),
      $                           LDB, A( 0 ), N, ALPHA, B( 0, N1 ),
      $                           LDB )
                      CALL DTRSM( 'R', 'U', 'N', DIAG, M, N2, ONE,
@@ -768,7 +790,8 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL DTRSM( 'R', 'U', 'T', DIAG, M, N2, ALPHA,
      $                           A( N1 ), N, B( 0, N1 ), LDB )
-                     CALL DGEMM( 'N', 'T', M, N1, N2, -ONE, B( 0, N1 ),
+                     CALL DGEMM( 'N', 'T', M, N1, N2, -ONE, B( 0,
+     $                           N1 ),
      $                           LDB, A( 0 ), N, ALPHA, B( 0, 0 ), LDB )
                      CALL DTRSM( 'R', 'L', 'N', DIAG, M, N1, ONE,
      $                           A( N2 ), N, B( 0, 0 ), LDB )
@@ -792,7 +815,8 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL DTRSM( 'R', 'L', 'N', DIAG, M, N2, ALPHA,
      $                           A( 1 ), N1, B( 0, N1 ), LDB )
-                     CALL DGEMM( 'N', 'T', M, N1, N2, -ONE, B( 0, N1 ),
+                     CALL DGEMM( 'N', 'T', M, N1, N2, -ONE, B( 0,
+     $                           N1 ),
      $                           LDB, A( N1*N1 ), N1, ALPHA, B( 0, 0 ),
      $                           LDB )
                      CALL DTRSM( 'R', 'U', 'T', DIAG, M, N1, ONE,
@@ -805,7 +829,8 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL DTRSM( 'R', 'U', 'N', DIAG, M, N1, ALPHA,
      $                           A( 0 ), N1, B( 0, 0 ), LDB )
-                     CALL DGEMM( 'N', 'N', M, N2, N1, -ONE, B( 0, 0 ),
+                     CALL DGEMM( 'N', 'N', M, N2, N1, -ONE, B( 0,
+     $                           0 ),
      $                           LDB, A( N1*N1 ), N1, ALPHA, B( 0, N1 ),
      $                           LDB )
                      CALL DTRSM( 'R', 'L', 'T', DIAG, M, N2, ONE,
@@ -824,7 +849,8 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL DTRSM( 'R', 'U', 'N', DIAG, M, N1, ALPHA,
      $                           A( N2*N2 ), N2, B( 0, 0 ), LDB )
-                     CALL DGEMM( 'N', 'T', M, N2, N1, -ONE, B( 0, 0 ),
+                     CALL DGEMM( 'N', 'T', M, N2, N1, -ONE, B( 0,
+     $                           0 ),
      $                           LDB, A( 0 ), N2, ALPHA, B( 0, N1 ),
      $                           LDB )
                      CALL DTRSM( 'R', 'L', 'T', DIAG, M, N2, ONE,
@@ -837,7 +863,8 @@ SUBROUTINE DTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL DTRSM( 'R', 'L', 'N', DIAG, M, N2, ALPHA,
      $                           A( N1*N2 ), N2, B( 0, N1 ), LDB )
-                     CALL DGEMM( 'N', 'N', M, N1, N2, -ONE, B( 0, N1 ),
+                     CALL DGEMM( 'N', 'N', M, N1, N2, -ONE, B( 0,
+     $                           N1 ),
      $                           LDB, A( 0 ), N2, ALPHA, B( 0, 0 ),
      $                           LDB )
                      CALL DTRSM( 'R', 'U', 'T', DIAG, M, N1, ONE,
diff --git a/SRC/dtftri.f b/SRC/dtftri.f
index d367c90299..ce7199fd86 100644
--- a/SRC/dtftri.f
+++ b/SRC/dtftri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTFTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtftri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtftri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tftri
 *
 *> \par Further Details:
 *  =====================
@@ -198,6 +196,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -242,7 +241,8 @@ SUBROUTINE DTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
          INFO = -1
       ELSE IF( .NOT.LOWER .AND. .NOT.LSAME( UPLO, 'U' ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.LSAME( DIAG, 'N' ) .AND. .NOT.LSAME( DIAG, 'U' ) )
+      ELSE IF( .NOT.LSAME( DIAG, 'N' ) .AND.
+     $         .NOT.LSAME( DIAG, 'U' ) )
      $         THEN
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
@@ -305,7 +305,8 @@ SUBROUTINE DTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
      $            INFO = INFO + N1
                IF( INFO.GT.0 )
      $            RETURN
-               CALL DTRMM( 'L', 'U', 'T', DIAG, N2, N1, ONE, A( N ), N,
+               CALL DTRMM( 'L', 'U', 'T', DIAG, N2, N1, ONE, A( N ),
+     $                     N,
      $                     A( N1 ), N )
 *
             ELSE
@@ -317,7 +318,8 @@ SUBROUTINE DTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
                CALL DTRTRI( 'L', DIAG, N1, A( N2 ), N, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL DTRMM( 'L', 'L', 'T', DIAG, N1, N2, -ONE, A( N2 ),
+               CALL DTRMM( 'L', 'L', 'T', DIAG, N1, N2, -ONE,
+     $                     A( N2 ),
      $                     N, A( 0 ), N )
                CALL DTRTRI( 'U', DIAG, N2, A( N1 ), N, INFO )
                IF( INFO.GT.0 )
@@ -396,7 +398,8 @@ SUBROUTINE DTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
      $            INFO = INFO + K
                IF( INFO.GT.0 )
      $            RETURN
-               CALL DTRMM( 'L', 'U', 'T', DIAG, K, K, ONE, A( 0 ), N+1,
+               CALL DTRMM( 'L', 'U', 'T', DIAG, K, K, ONE, A( 0 ),
+     $                     N+1,
      $                     A( K+1 ), N+1 )
 *
             ELSE
@@ -415,7 +418,8 @@ SUBROUTINE DTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
      $            INFO = INFO + K
                IF( INFO.GT.0 )
      $            RETURN
-               CALL DTRMM( 'R', 'U', 'N', DIAG, K, K, ONE, A( K ), N+1,
+               CALL DTRMM( 'R', 'U', 'N', DIAG, K, K, ONE, A( K ),
+     $                     N+1,
      $                     A( 0 ), N+1 )
             END IF
          ELSE
@@ -431,7 +435,8 @@ SUBROUTINE DTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
                CALL DTRTRI( 'U', DIAG, K, A( K ), K, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL DTRMM( 'L', 'U', 'N', DIAG, K, K, -ONE, A( K ), K,
+               CALL DTRMM( 'L', 'U', 'N', DIAG, K, K, -ONE, A( K ),
+     $                     K,
      $                     A( K*( K+1 ) ), K )
                CALL DTRTRI( 'L', DIAG, K, A( 0 ), K, INFO )
                IF( INFO.GT.0 )
@@ -456,7 +461,8 @@ SUBROUTINE DTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
      $            INFO = INFO + K
                IF( INFO.GT.0 )
      $            RETURN
-               CALL DTRMM( 'L', 'L', 'N', DIAG, K, K, ONE, A( K*K ), K,
+               CALL DTRMM( 'L', 'L', 'N', DIAG, K, K, ONE, A( K*K ),
+     $                     K,
      $                     A( 0 ), K )
             END IF
          END IF
diff --git a/SRC/dtfttp.f b/SRC/dtfttp.f
index c83af44067..3a70c9534b 100644
--- a/SRC/dtfttp.f
+++ b/SRC/dtfttp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTFTTP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtfttp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtfttp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -93,7 +91,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tfttp
 *
 *> \par Further Details:
 *  =====================
@@ -184,6 +182,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DTFTTP( TRANSR, UPLO, N, ARF, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dtfttr.f b/SRC/dtfttr.f
index 3bfe4f1d9a..592eb68f0a 100644
--- a/SRC/dtfttr.f
+++ b/SRC/dtfttr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTFTTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtfttr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtfttr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,7 +100,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tfttr
 *
 *> \par Further Details:
 *  =====================
@@ -193,6 +191,7 @@
 *
 *  =====================================================================
       SUBROUTINE DTFTTR( TRANSR, UPLO, N, ARF, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dtgevc.f b/SRC/dtgevc.f
index e7084664cb..57c7082dd3 100644
--- a/SRC/dtgevc.f
+++ b/SRC/dtgevc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTGEVC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtgevc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtgevc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -52,7 +50,7 @@
 *>
 *>    S*x = w*P*x,  (y**H)*S = w*(y**H)*P,
 *>
-*> where y**H denotes the conjugate tranpose of y.
+*> where y**H denotes the conjugate transpose of y.
 *> The eigenvalues are not input to this routine, but are computed
 *> directly from the diagonal blocks of S and P.
 *>
@@ -228,7 +226,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup tgevc
 *
 *> \par Further Details:
 *  =====================
@@ -292,6 +290,7 @@
 *  =====================================================================
       SUBROUTINE DTGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
      $                   LDVL, VR, LDVR, MM, M, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -337,7 +336,8 @@ SUBROUTINE DTGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
       EXTERNAL           LSAME, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMV, DLABAD, DLACPY, DLAG2, DLALN2, XERBLA
+      EXTERNAL           DGEMV, DLACPY, DLAG2, DLALN2,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN
@@ -463,7 +463,6 @@ SUBROUTINE DTGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
 *
       SAFMIN = DLAMCH( 'Safe minimum' )
       BIG = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, BIG )
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       SMALL = SAFMIN*N / ULP
       BIG = ONE / SMALL
@@ -765,7 +764,8 @@ SUBROUTINE DTGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
 *              Solve  ( a A - b B )  y = SUM(,)
 *              with scaling and perturbation of the denominator
 *
-               CALL DLALN2( .TRUE., NA, NW, DMIN, ACOEF, S( J, J ), LDS,
+               CALL DLALN2( .TRUE., NA, NW, DMIN, ACOEF, S( J, J ),
+     $                      LDS,
      $                      BDIAG( 1 ), BDIAG( 2 ), SUM, 2, BCOEFR,
      $                      BCOEFI, WORK( 2*N+J ), N, SCALE, TEMP,
      $                      IINFO )
@@ -791,11 +791,13 @@ SUBROUTINE DTGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
      $                        WORK( ( JW+2 )*N+JE ), 1, ZERO,
      $                        WORK( ( JW+4 )*N+1 ), 1 )
   170          CONTINUE
-               CALL DLACPY( ' ', N, NW, WORK( 4*N+1 ), N, VL( 1, JE ),
+               CALL DLACPY( ' ', N, NW, WORK( 4*N+1 ), N, VL( 1,
+     $                      JE ),
      $                      LDVL )
                IBEG = 1
             ELSE
-               CALL DLACPY( ' ', N, NW, WORK( 2*N+1 ), N, VL( 1, IEIG ),
+               CALL DLACPY( ' ', N, NW, WORK( 2*N+1 ), N, VL( 1,
+     $                      IEIG ),
      $                      LDVL )
                IBEG = JE
             END IF
@@ -954,7 +956,8 @@ SUBROUTINE DTGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
 *
 *              Complex eigenvalue
 *
-               CALL DLAG2( S( JE-1, JE-1 ), LDS, P( JE-1, JE-1 ), LDP,
+               CALL DLAG2( S( JE-1, JE-1 ), LDS, P( JE-1, JE-1 ),
+     $                     LDP,
      $                     SAFMIN*SAFETY, ACOEF, TEMP, BCOEFR, TEMP2,
      $                     BCOEFI )
                IF( BCOEFI.EQ.ZERO ) THEN
diff --git a/SRC/dtgex2.f b/SRC/dtgex2.f
index 00c23a8330..8c01a4f5e0 100644
--- a/SRC/dtgex2.f
+++ b/SRC/dtgex2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTGEX2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtgex2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtgex2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -181,7 +179,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEauxiliary
+*> \ingroup tgex2
 *
 *> \par Further Details:
 *  =====================
@@ -218,6 +216,7 @@
 *  =====================================================================
       SUBROUTINE DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
      $                   LDZ, J1, N1, N2, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -254,7 +253,7 @@ SUBROUTINE DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
      $                   THRESHA, THRESHB
 *     ..
 *     .. Local Arrays ..
-      INTEGER            IWORK( LDST )
+      INTEGER            IWORK( LDST + 2 )
       DOUBLE PRECISION   AI( 2 ), AR( 2 ), BE( 2 ), IR( LDST, LDST ),
      $                   IRCOP( LDST, LDST ), LI( LDST, LDST ),
      $                   LICOP( LDST, LDST ), S( LDST, LDST ),
@@ -266,7 +265,8 @@ SUBROUTINE DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
       EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DGEQR2, DGERQ2, DLACPY, DLAGV2, DLARTG,
+      EXTERNAL           DGEMM, DGEQR2, DGERQ2, DLACPY, DLAGV2,
+     $                   DLARTG,
      $                   DLASET, DLASSQ, DORG2R, DORGR2, DORM2R, DORMR2,
      $                   DROT, DSCAL, DTGSY2
 *     ..
@@ -345,10 +345,12 @@ SUBROUTINE DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
          CALL DROT( 2, T( 1, 1 ), 1, T( 1, 2 ), 1, IR( 1, 1 ),
      $              IR( 2, 1 ) )
          IF( SA.GE.SB ) THEN
-            CALL DLARTG( S( 1, 1 ), S( 2, 1 ), LI( 1, 1 ), LI( 2, 1 ),
+            CALL DLARTG( S( 1, 1 ), S( 2, 1 ), LI( 1, 1 ), LI( 2,
+     $                   1 ),
      $                   DDUM )
          ELSE
-            CALL DLARTG( T( 1, 1 ), T( 2, 1 ), LI( 1, 1 ), LI( 2, 1 ),
+            CALL DLARTG( T( 1, 1 ), T( 2, 1 ), LI( 1, 1 ), LI( 2,
+     $                   1 ),
      $                   DDUM )
          END IF
          CALL DROT( 2, S( 1, 1 ), LDST, S( 2, 1 ), LDST, LI( 1, 1 ),
@@ -373,22 +375,28 @@ SUBROUTINE DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *               and
 *               F-norm((B-QL**H*T*QR)) <= O(EPS*F-norm((B)))
 *
-            CALL DLACPY( 'Full', M, M, A( J1, J1 ), LDA, WORK( M*M+1 ),
+            CALL DLACPY( 'Full', M, M, A( J1, J1 ), LDA,
+     $                   WORK( M*M+1 ),
      $                   M )
-            CALL DGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, S, LDST, ZERO,
+            CALL DGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, S, LDST,
+     $                  ZERO,
      $                  WORK, M )
-            CALL DGEMM( 'N', 'T', M, M, M, -ONE, WORK, M, IR, LDST, ONE,
+            CALL DGEMM( 'N', 'T', M, M, M, -ONE, WORK, M, IR, LDST,
+     $                  ONE,
      $                  WORK( M*M+1 ), M )
             DSCALE = ZERO
             DSUM = ONE
             CALL DLASSQ( M*M, WORK( M*M+1 ), 1, DSCALE, DSUM )
             SA = DSCALE*SQRT( DSUM )
 *
-            CALL DLACPY( 'Full', M, M, B( J1, J1 ), LDB, WORK( M*M+1 ),
+            CALL DLACPY( 'Full', M, M, B( J1, J1 ), LDB,
+     $                   WORK( M*M+1 ),
      $                   M )
-            CALL DGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, T, LDST, ZERO,
+            CALL DGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, T, LDST,
+     $                  ZERO,
      $                  WORK, M )
-            CALL DGEMM( 'N', 'T', M, M, M, -ONE, WORK, M, IR, LDST, ONE,
+            CALL DGEMM( 'N', 'T', M, M, M, -ONE, WORK, M, IR, LDST,
+     $                  ONE,
      $                  WORK( M*M+1 ), M )
             DSCALE = ZERO
             DSUM = ONE
@@ -488,11 +496,13 @@ SUBROUTINE DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
          CALL DGEMM( 'T', 'N', M, M, M, ONE, LI, LDST, S, LDST, ZERO,
      $               WORK, M )
-         CALL DGEMM( 'N', 'T', M, M, M, ONE, WORK, M, IR, LDST, ZERO, S,
+         CALL DGEMM( 'N', 'T', M, M, M, ONE, WORK, M, IR, LDST, ZERO,
+     $               S,
      $               LDST )
          CALL DGEMM( 'T', 'N', M, M, M, ONE, LI, LDST, T, LDST, ZERO,
      $               WORK, M )
-         CALL DGEMM( 'N', 'T', M, M, M, ONE, WORK, M, IR, LDST, ZERO, T,
+         CALL DGEMM( 'N', 'T', M, M, M, ONE, WORK, M, IR, LDST, ZERO,
+     $               T,
      $               LDST )
          CALL DLACPY( 'F', M, M, S, LDST, SCPY, LDST )
          CALL DLACPY( 'F', M, M, T, LDST, TCPY, LDST )
@@ -505,11 +515,13 @@ SUBROUTINE DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
          CALL DGERQ2( M, M, T, LDST, TAUR, WORK, LINFO )
          IF( LINFO.NE.0 )
      $      GO TO 70
-         CALL DORMR2( 'R', 'T', M, M, M, T, LDST, TAUR, S, LDST, WORK,
+         CALL DORMR2( 'R', 'T', M, M, M, T, LDST, TAUR, S, LDST,
+     $                WORK,
      $                LINFO )
          IF( LINFO.NE.0 )
      $      GO TO 70
-         CALL DORMR2( 'L', 'N', M, M, M, T, LDST, TAUR, IR, LDST, WORK,
+         CALL DORMR2( 'L', 'N', M, M, M, T, LDST, TAUR, IR, LDST,
+     $                WORK,
      $                LINFO )
          IF( LINFO.NE.0 )
      $      GO TO 70
@@ -529,9 +541,11 @@ SUBROUTINE DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
          CALL DGEQR2( M, M, TCPY, LDST, TAUL, WORK, LINFO )
          IF( LINFO.NE.0 )
      $      GO TO 70
-         CALL DORM2R( 'L', 'T', M, M, M, TCPY, LDST, TAUL, SCPY, LDST,
+         CALL DORM2R( 'L', 'T', M, M, M, TCPY, LDST, TAUL, SCPY,
+     $                LDST,
      $                WORK, INFO )
-         CALL DORM2R( 'R', 'N', M, M, M, TCPY, LDST, TAUL, LICOP, LDST,
+         CALL DORM2R( 'R', 'N', M, M, M, TCPY, LDST, TAUL, LICOP,
+     $                LDST,
      $                WORK, INFO )
          IF( LINFO.NE.0 )
      $      GO TO 70
@@ -569,22 +583,28 @@ SUBROUTINE DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *               and
 *               F-norm((B-QL**H*T*QR)) <= O(EPS*F-norm((B)))
 *
-            CALL DLACPY( 'Full', M, M, A( J1, J1 ), LDA, WORK( M*M+1 ),
+            CALL DLACPY( 'Full', M, M, A( J1, J1 ), LDA,
+     $                   WORK( M*M+1 ),
      $                   M )
-            CALL DGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, S, LDST, ZERO,
+            CALL DGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, S, LDST,
+     $                  ZERO,
      $                  WORK, M )
-            CALL DGEMM( 'N', 'N', M, M, M, -ONE, WORK, M, IR, LDST, ONE,
+            CALL DGEMM( 'N', 'N', M, M, M, -ONE, WORK, M, IR, LDST,
+     $                  ONE,
      $                  WORK( M*M+1 ), M )
             DSCALE = ZERO
             DSUM = ONE
             CALL DLASSQ( M*M, WORK( M*M+1 ), 1, DSCALE, DSUM )
             SA = DSCALE*SQRT( DSUM )
 *
-            CALL DLACPY( 'Full', M, M, B( J1, J1 ), LDB, WORK( M*M+1 ),
+            CALL DLACPY( 'Full', M, M, B( J1, J1 ), LDB,
+     $                   WORK( M*M+1 ),
      $                   M )
-            CALL DGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, T, LDST, ZERO,
+            CALL DGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, T, LDST,
+     $                  ZERO,
      $                  WORK, M )
-            CALL DGEMM( 'N', 'N', M, M, M, -ONE, WORK, M, IR, LDST, ONE,
+            CALL DGEMM( 'N', 'N', M, M, M, -ONE, WORK, M, IR, LDST,
+     $                  ONE,
      $                  WORK( M*M+1 ), M )
             DSCALE = ZERO
             DSUM = ONE
@@ -614,7 +634,8 @@ SUBROUTINE DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
          T( 1, 1 ) = ONE
          IDUM = LWORK - M*M - 2
          IF( N2.GT.1 ) THEN
-            CALL DLAGV2( A( J1, J1 ), LDA, B( J1, J1 ), LDB, AR, AI, BE,
+            CALL DLAGV2( A( J1, J1 ), LDA, B( J1, J1 ), LDB, AR, AI,
+     $                   BE,
      $                   WORK( 1 ), WORK( 2 ), T( 1, 1 ), T( 2, 1 ) )
             WORK( M+1 ) = -WORK( 2 )
             WORK( M+2 ) = WORK( 1 )
@@ -625,7 +646,8 @@ SUBROUTINE DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
          T( M, M ) = ONE
 *
          IF( N1.GT.1 ) THEN
-            CALL DLAGV2( A( J1+N2, J1+N2 ), LDA, B( J1+N2, J1+N2 ), LDB,
+            CALL DLAGV2( A( J1+N2, J1+N2 ), LDA, B( J1+N2, J1+N2 ),
+     $                   LDB,
      $                   TAUR, TAUL, WORK( M*M+1 ), WORK( N2*M+N2+1 ),
      $                   WORK( N2*M+N2+2 ), T( N2+1, N2+1 ),
      $                   T( M, M-1 ) )
@@ -634,13 +656,17 @@ SUBROUTINE DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
             T( M, M ) = T( N2+1, N2+1 )
             T( M-1, M ) = -T( M, M-1 )
          END IF
-         CALL DGEMM( 'T', 'N', N2, N1, N2, ONE, WORK, M, A( J1, J1+N2 ),
+         CALL DGEMM( 'T', 'N', N2, N1, N2, ONE, WORK, M, A( J1,
+     $               J1+N2 ),
      $               LDA, ZERO, WORK( M*M+1 ), N2 )
-         CALL DLACPY( 'Full', N2, N1, WORK( M*M+1 ), N2, A( J1, J1+N2 ),
+         CALL DLACPY( 'Full', N2, N1, WORK( M*M+1 ), N2, A( J1,
+     $                J1+N2 ),
      $                LDA )
-         CALL DGEMM( 'T', 'N', N2, N1, N2, ONE, WORK, M, B( J1, J1+N2 ),
+         CALL DGEMM( 'T', 'N', N2, N1, N2, ONE, WORK, M, B( J1,
+     $               J1+N2 ),
      $               LDB, ZERO, WORK( M*M+1 ), N2 )
-         CALL DLACPY( 'Full', N2, N1, WORK( M*M+1 ), N2, B( J1, J1+N2 ),
+         CALL DLACPY( 'Full', N2, N1, WORK( M*M+1 ), N2, B( J1,
+     $                J1+N2 ),
      $                LDB )
          CALL DGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, WORK, M, ZERO,
      $               WORK( M*M+1 ), M )
diff --git a/SRC/dtgexc.f b/SRC/dtgexc.f
index 9dce3f597b..ba8155334a 100644
--- a/SRC/dtgexc.f
+++ b/SRC/dtgexc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTGEXC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtgexc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtgexc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -195,7 +193,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup tgexc
 *
 *> \par Contributors:
 *  ==================
@@ -217,6 +215,7 @@
 *  =====================================================================
       SUBROUTINE DTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
      $                   LDZ, IFST, ILST, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -381,7 +380,8 @@ SUBROUTINE DTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
 *              Swap two 1-by-1 blocks.
 *
-               CALL DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
+               CALL DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+     $                      Z,
      $                      LDZ, HERE, 1, 1, WORK, LWORK, INFO )
                IF( INFO.NE.0 ) THEN
                   ILST = HERE
@@ -399,7 +399,8 @@ SUBROUTINE DTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
 *                 2-by-2 block did not split.
 *
-                  CALL DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+                  CALL DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q,
+     $                         LDQ,
      $                         Z, LDZ, HERE, 1, NBNEXT, WORK, LWORK,
      $                         INFO )
                   IF( INFO.NE.0 ) THEN
@@ -411,14 +412,16 @@ SUBROUTINE DTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
 *                 2-by-2 block did split.
 *
-                  CALL DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+                  CALL DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q,
+     $                         LDQ,
      $                         Z, LDZ, HERE, 1, 1, WORK, LWORK, INFO )
                   IF( INFO.NE.0 ) THEN
                      ILST = HERE
                      RETURN
                   END IF
                   HERE = HERE + 1
-                  CALL DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+                  CALL DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q,
+     $                         LDQ,
      $                         Z, LDZ, HERE, 1, 1, WORK, LWORK, INFO )
                   IF( INFO.NE.0 ) THEN
                      ILST = HERE
@@ -484,7 +487,8 @@ SUBROUTINE DTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
 *              Swap two 1-by-1 blocks.
 *
-               CALL DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
+               CALL DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+     $                      Z,
      $                      LDZ, HERE, NBNEXT, 1, WORK, LWORK, INFO )
                IF( INFO.NE.0 ) THEN
                   ILST = HERE
@@ -501,7 +505,8 @@ SUBROUTINE DTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
 *                 2-by-2 block did not split.
 *
-                  CALL DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+                  CALL DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q,
+     $                         LDQ,
      $                         Z, LDZ, HERE-1, 2, 1, WORK, LWORK, INFO )
                   IF( INFO.NE.0 ) THEN
                      ILST = HERE
@@ -512,14 +517,16 @@ SUBROUTINE DTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
 *                 2-by-2 block did split.
 *
-                  CALL DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+                  CALL DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q,
+     $                         LDQ,
      $                         Z, LDZ, HERE, 1, 1, WORK, LWORK, INFO )
                   IF( INFO.NE.0 ) THEN
                      ILST = HERE
                      RETURN
                   END IF
                   HERE = HERE - 1
-                  CALL DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+                  CALL DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q,
+     $                         LDQ,
      $                         Z, LDZ, HERE, 1, 1, WORK, LWORK, INFO )
                   IF( INFO.NE.0 ) THEN
                      ILST = HERE
diff --git a/SRC/dtgsen.f b/SRC/dtgsen.f
index 8de66b6a17..3c29894843 100644
--- a/SRC/dtgsen.f
+++ b/SRC/dtgsen.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTGSEN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtgsen.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtgsen.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -304,7 +302,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tgsen
 *
 *> \par Further Details:
 *  =====================
@@ -445,9 +443,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
+      SUBROUTINE DTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B,
+     $                   LDB,
      $                   ALPHAR, ALPHAI, BETA, Q, LDQ, Z, LDZ, M, PL,
      $                   PR, DIF, WORK, LWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -486,7 +486,8 @@ SUBROUTINE DTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLACN2, DLACPY, DLAG2, DLASSQ, DTGEXC, DTGSYL,
+      EXTERNAL           DLACN2, DLACPY, DLAG2, DLASSQ, DTGEXC,
+     $                   DTGSYL,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
@@ -634,7 +635,8 @@ SUBROUTINE DTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
                KK = K
                IF( K.NE.KS )
-     $            CALL DTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+     $            CALL DTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q,
+     $                         LDQ,
      $                         Z, LDZ, KK, KS, WORK, LWORK, IERR )
 *
                IF( IERR.GT.0 ) THEN
@@ -668,7 +670,8 @@ SUBROUTINE DTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
          I = N1 + 1
          IJB = 0
          CALL DLACPY( 'Full', N1, N2, A( 1, I ), LDA, WORK, N1 )
-         CALL DLACPY( 'Full', N1, N2, B( 1, I ), LDB, WORK( N1*N2+1 ),
+         CALL DLACPY( 'Full', N1, N2, B( 1, I ), LDB,
+     $                WORK( N1*N2+1 ),
      $                N1 )
          CALL DTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA, WORK,
      $                N1, B, LDB, B( I, I ), LDB, WORK( N1*N2+1 ), N1,
@@ -710,14 +713,16 @@ SUBROUTINE DTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *           Frobenius norm-based Difu-estimate.
 *
-            CALL DTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA, WORK,
+            CALL DTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA,
+     $                   WORK,
      $                   N1, B, LDB, B( I, I ), LDB, WORK( N1*N2+1 ),
      $                   N1, DSCALE, DIF( 1 ), WORK( 2*N1*N2+1 ),
      $                   LWORK-2*N1*N2, IWORK, IERR )
 *
 *           Frobenius norm-based Difl-estimate.
 *
-            CALL DTGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A, LDA, WORK,
+            CALL DTGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A, LDA,
+     $                   WORK,
      $                   N2, B( I, I ), LDB, B, LDB, WORK( N1*N2+1 ),
      $                   N2, DSCALE, DIF( 2 ), WORK( 2*N1*N2+1 ),
      $                   LWORK-2*N1*N2, IWORK, IERR )
@@ -746,7 +751,8 @@ SUBROUTINE DTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *                 Solve generalized Sylvester equation.
 *
-                  CALL DTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA,
+                  CALL DTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ),
+     $                         LDA,
      $                         WORK, N1, B, LDB, B( I, I ), LDB,
      $                         WORK( N1*N2+1 ), N1, DSCALE, DIF( 1 ),
      $                         WORK( 2*N1*N2+1 ), LWORK-2*N1*N2, IWORK,
@@ -755,7 +761,8 @@ SUBROUTINE DTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *                 Solve the transposed variant.
 *
-                  CALL DTGSYL( 'T', IJB, N1, N2, A, LDA, A( I, I ), LDA,
+                  CALL DTGSYL( 'T', IJB, N1, N2, A, LDA, A( I, I ),
+     $                         LDA,
      $                         WORK, N1, B, LDB, B( I, I ), LDB,
      $                         WORK( N1*N2+1 ), N1, DSCALE, DIF( 1 ),
      $                         WORK( 2*N1*N2+1 ), LWORK-2*N1*N2, IWORK,
@@ -775,7 +782,8 @@ SUBROUTINE DTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *                 Solve generalized Sylvester equation.
 *
-                  CALL DTGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A, LDA,
+                  CALL DTGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A,
+     $                         LDA,
      $                         WORK, N2, B( I, I ), LDB, B, LDB,
      $                         WORK( N1*N2+1 ), N2, DSCALE, DIF( 2 ),
      $                         WORK( 2*N1*N2+1 ), LWORK-2*N1*N2, IWORK,
@@ -784,7 +792,8 @@ SUBROUTINE DTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *                 Solve the transposed variant.
 *
-                  CALL DTGSYL( 'T', IJB, N2, N1, A( I, I ), LDA, A, LDA,
+                  CALL DTGSYL( 'T', IJB, N2, N1, A( I, I ), LDA, A,
+     $                         LDA,
      $                         WORK, N2, B( I, I ), LDB, B, LDB,
      $                         WORK( N1*N2+1 ), N2, DSCALE, DIF( 2 ),
      $                         WORK( 2*N1*N2+1 ), LWORK-2*N1*N2, IWORK,
@@ -826,7 +835,8 @@ SUBROUTINE DTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
                WORK( 6 ) = B( K+1, K )
                WORK( 7 ) = B( K, K+1 )
                WORK( 8 ) = B( K+1, K+1 )
-               CALL DLAG2( WORK, 2, WORK( 5 ), 2, SMLNUM*EPS, BETA( K ),
+               CALL DLAG2( WORK, 2, WORK( 5 ), 2, SMLNUM*EPS,
+     $                     BETA( K ),
      $                     BETA( K+1 ), ALPHAR( K ), ALPHAR( K+1 ),
      $                     ALPHAI( K ) )
                ALPHAI( K+1 ) = -ALPHAI( K )
diff --git a/SRC/dtgsja.f b/SRC/dtgsja.f
index 37668c7391..f53545e710 100644
--- a/SRC/dtgsja.f
+++ b/SRC/dtgsja.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTGSJA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtgsja.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtgsja.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -350,7 +348,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tgsja
 *
 *> \par Further Details:
 *  =====================
@@ -375,6 +373,7 @@
       SUBROUTINE DTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
      $                   LDB, TOLA, TOLB, ALPHA, BETA, U, LDU, V, LDV,
      $                   Q, LDQ, WORK, NCYCLE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -412,7 +411,8 @@ SUBROUTINE DTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLAGS2, DLAPLL, DLARTG, DLASET, DROT,
+      EXTERNAL           DCOPY, DLAGS2, DLAPLL, DLARTG, DLASET,
+     $                   DROT,
      $                   DSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -435,9 +435,13 @@ SUBROUTINE DTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
       INFO = 0
       IF( .NOT.( INITU .OR. WANTU .OR. LSAME( JOBU, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.( INITV .OR. WANTV .OR. LSAME( JOBV, 'N' ) ) ) THEN
+      ELSE IF( .NOT.( INITV .OR.
+     $         WANTV .OR.
+     $         LSAME( JOBV, 'N' ) ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.( INITQ .OR. WANTQ .OR. LSAME( JOBQ, 'N' ) ) ) THEN
+      ELSE IF( .NOT.( INITQ .OR.
+     $         WANTQ .OR.
+     $         LSAME( JOBQ, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( M.LT.0 ) THEN
          INFO = -4
@@ -507,7 +511,8 @@ SUBROUTINE DTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
 *              Update (K+I)-th and (K+J)-th rows of matrix A: U**T *A
 *
                IF( K+J.LE.M )
-     $            CALL DROT( L, A( K+J, N-L+1 ), LDA, A( K+I, N-L+1 ),
+     $            CALL DROT( L, A( K+J, N-L+1 ), LDA, A( K+I,
+     $                       N-L+1 ),
      $                       LDA, CSU, SNU )
 *
 *              Update I-th and J-th rows of matrix B: V**T *B
@@ -541,10 +546,12 @@ SUBROUTINE DTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
      $                       SNU )
 *
                IF( WANTV )
-     $            CALL DROT( P, V( 1, J ), 1, V( 1, I ), 1, CSV, SNV )
+     $            CALL DROT( P, V( 1, J ), 1, V( 1, I ), 1, CSV,
+     $                       SNV )
 *
                IF( WANTQ )
-     $            CALL DROT( N, Q( 1, N-L+J ), 1, Q( 1, N-L+I ), 1, CSQ,
+     $            CALL DROT( N, Q( 1, N-L+J ), 1, Q( 1, N-L+I ), 1,
+     $                       CSQ,
      $                       SNQ )
 *
    10       CONTINUE
@@ -561,7 +568,8 @@ SUBROUTINE DTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
             ERROR = ZERO
             DO 30 I = 1, MIN( L, M-K )
                CALL DCOPY( L-I+1, A( K+I, N-L+I ), LDA, WORK, 1 )
-               CALL DCOPY( L-I+1, B( I, N-L+I ), LDB, WORK( L+1 ), 1 )
+               CALL DCOPY( L-I+1, B( I, N-L+I ), LDB, WORK( L+1 ),
+     $                     1 )
                CALL DLAPLL( L-I+1, WORK, 1, WORK( L+1 ), 1, SSMIN )
                ERROR = MAX( ERROR, SSMIN )
    30       CONTINUE
@@ -606,16 +614,19 @@ SUBROUTINE DTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
      $            CALL DSCAL( P, -ONE, V( 1, I ), 1 )
             END IF
 *
-            CALL DLARTG( ABS( GAMMA ), ONE, BETA( K+I ), ALPHA( K+I ),
+            CALL DLARTG( ABS( GAMMA ), ONE, BETA( K+I ),
+     $                   ALPHA( K+I ),
      $                   RWK )
 *
             IF( ALPHA( K+I ).GE.BETA( K+I ) ) THEN
-               CALL DSCAL( L-I+1, ONE / ALPHA( K+I ), A( K+I, N-L+I ),
+               CALL DSCAL( L-I+1, ONE / ALPHA( K+I ), A( K+I,
+     $                     N-L+I ),
      $                     LDA )
             ELSE
                CALL DSCAL( L-I+1, ONE / BETA( K+I ), B( I, N-L+I ),
      $                     LDB )
-               CALL DCOPY( L-I+1, B( I, N-L+I ), LDB, A( K+I, N-L+I ),
+               CALL DCOPY( L-I+1, B( I, N-L+I ), LDB, A( K+I,
+     $                     N-L+I ),
      $                     LDA )
             END IF
 *
diff --git a/SRC/dtgsna.f b/SRC/dtgsna.f
index b9b3ad8afb..42d8401466 100644
--- a/SRC/dtgsna.f
+++ b/SRC/dtgsna.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTGSNA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtgsna.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtgsna.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -230,7 +228,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tgsna
 *
 *> \par Further Details:
 *  =====================
@@ -378,6 +376,7 @@
       SUBROUTINE DTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
      $                   LDVL, VR, LDVR, S, DIF, MM, M, WORK, LWORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -420,7 +419,8 @@ SUBROUTINE DTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
       EXTERNAL           LSAME, DDOT, DLAMCH, DLAPY2, DNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMV, DLACPY, DLAG2, DTGEXC, DTGSYL, XERBLA
+      EXTERNAL           DGEMV, DLACPY, DLAG2, DTGEXC, DTGSYL,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN, SQRT
@@ -558,7 +558,8 @@ SUBROUTINE DTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
      $                DNRM2( N, VR( 1, KS+1 ), 1 ) )
                LNRM = DLAPY2( DNRM2( N, VL( 1, KS ), 1 ),
      $                DNRM2( N, VL( 1, KS+1 ), 1 ) )
-               CALL DGEMV( 'N', N, N, ONE, A, LDA, VR( 1, KS ), 1, ZERO,
+               CALL DGEMV( 'N', N, N, ONE, A, LDA, VR( 1, KS ), 1,
+     $                     ZERO,
      $                     WORK, 1 )
                TMPRR = DDOT( N, WORK, 1, VL( 1, KS ), 1 )
                TMPRI = DDOT( N, WORK, 1, VL( 1, KS+1 ), 1 )
@@ -568,7 +569,8 @@ SUBROUTINE DTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
                TMPIR = DDOT( N, WORK, 1, VL( 1, KS ), 1 )
                UHAV = TMPRR + TMPII
                UHAVI = TMPIR - TMPRI
-               CALL DGEMV( 'N', N, N, ONE, B, LDB, VR( 1, KS ), 1, ZERO,
+               CALL DGEMV( 'N', N, N, ONE, B, LDB, VR( 1, KS ), 1,
+     $                     ZERO,
      $                     WORK, 1 )
                TMPRR = DDOT( N, WORK, 1, VL( 1, KS ), 1 )
                TMPRI = DDOT( N, WORK, 1, VL( 1, KS+1 ), 1 )
@@ -590,10 +592,12 @@ SUBROUTINE DTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
 *
                RNRM = DNRM2( N, VR( 1, KS ), 1 )
                LNRM = DNRM2( N, VL( 1, KS ), 1 )
-               CALL DGEMV( 'N', N, N, ONE, A, LDA, VR( 1, KS ), 1, ZERO,
+               CALL DGEMV( 'N', N, N, ONE, A, LDA, VR( 1, KS ), 1,
+     $                     ZERO,
      $                     WORK, 1 )
                UHAV = DDOT( N, WORK, 1, VL( 1, KS ), 1 )
-               CALL DGEMV( 'N', N, N, ONE, B, LDB, VR( 1, KS ), 1, ZERO,
+               CALL DGEMV( 'N', N, N, ONE, B, LDB, VR( 1, KS ), 1,
+     $                     ZERO,
      $                     WORK, 1 )
                UHBV = DDOT( N, WORK, 1, VL( 1, KS ), 1 )
                COND = DLAPY2( UHAV, UHBV )
@@ -632,8 +636,8 @@ SUBROUTINE DTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
                C1 = TWO*( ALPHAR*ALPHAR+ALPHAI*ALPHAI+BETA*BETA )
                C2 = FOUR*BETA*BETA*ALPHAI*ALPHAI
                ROOT1 = C1 + SQRT( C1*C1-4.0D0*C2 )
-               ROOT2 = C2 / ROOT1
                ROOT1 = ROOT1 / TWO
+               ROOT2 = C2 / ROOT1
                COND = MIN( SQRT( ROOT1 ), SQRT( ROOT2 ) )
             END IF
 *
@@ -645,7 +649,8 @@ SUBROUTINE DTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
             IFST = K
             ILST = 1
 *
-            CALL DTGEXC( .FALSE., .FALSE., N, WORK, N, WORK( N*N+1 ), N,
+            CALL DTGEXC( .FALSE., .FALSE., N, WORK, N, WORK( N*N+1 ),
+     $                   N,
      $                   DUMMY, 1, DUMMY1, 1, IFST, ILST,
      $                   WORK( N*N*2+1 ), LWORK-2*N*N, IERR )
 *
@@ -671,7 +676,8 @@ SUBROUTINE DTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
                ELSE
                   I = N*N + 1
                   IZ = 2*N*N + 1
-                  CALL DTGSYL( 'N', DIFDRI, N2, N1, WORK( N*N1+N1+1 ),
+                  CALL DTGSYL( 'N', DIFDRI, N2, N1,
+     $                         WORK( N*N1+N1+1 ),
      $                         N, WORK, N, WORK( N1+1 ), N,
      $                         WORK( N*N1+N1+I ), N, WORK( I ), N,
      $                         WORK( N1+I ), N, SCALE, DIF( KS ),
diff --git a/SRC/dtgsy2.f b/SRC/dtgsy2.f
index 3926f20865..98e9a5700f 100644
--- a/SRC/dtgsy2.f
+++ b/SRC/dtgsy2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTGSY2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtgsy2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtgsy2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -259,7 +257,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYauxiliary
+*> \ingroup tgsy2
 *
 *> \par Contributors:
 *  ==================
@@ -268,9 +266,11 @@
 *>     Umea University, S-901 87 Umea, Sweden.
 *
 *  =====================================================================
-      SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
+      SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC,
+     $                   D,
      $                   LDD, E, LDE, F, LDF, SCALE, RDSUM, RDSCAL,
      $                   IWORK, PQ, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -313,7 +313,8 @@ SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DGEMM, DGEMV, DGER, DGESC2,
+      EXTERNAL           DAXPY, DCOPY, DGEMM, DGEMV, DGER,
+     $                   DGESC2,
      $                   DGETC2, DLASET, DLATDF, DSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -466,9 +467,11 @@ SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
 *
                   IF( I.GT.1 ) THEN
                      ALPHA = -RHS( 1 )
-                     CALL DAXPY( IS-1, ALPHA, A( 1, IS ), 1, C( 1, JS ),
+                     CALL DAXPY( IS-1, ALPHA, A( 1, IS ), 1, C( 1,
+     $                           JS ),
      $                           1 )
-                     CALL DAXPY( IS-1, ALPHA, D( 1, IS ), 1, F( 1, JS ),
+                     CALL DAXPY( IS-1, ALPHA, D( 1, IS ), 1, F( 1,
+     $                           JS ),
      $                           1 )
                   END IF
                   IF( J.LT.Q ) THEN
@@ -541,9 +544,11 @@ SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
 *                 equation.
 *
                   IF( I.GT.1 ) THEN
-                     CALL DGER( IS-1, NB, -ONE, A( 1, IS ), 1, RHS( 1 ),
+                     CALL DGER( IS-1, NB, -ONE, A( 1, IS ), 1,
+     $                          RHS( 1 ),
      $                          1, C( 1, JS ), LDC )
-                     CALL DGER( IS-1, NB, -ONE, D( 1, IS ), 1, RHS( 1 ),
+                     CALL DGER( IS-1, NB, -ONE, D( 1, IS ), 1,
+     $                          RHS( 1 ),
      $                          1, F( 1, JS ), LDF )
                   END IF
                   IF( J.LT.Q ) THEN
@@ -551,9 +556,11 @@ SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
      $                           C( IS, JE+1 ), LDC )
                      CALL DAXPY( N-JE, RHS( 3 ), E( JS, JE+1 ), LDE,
      $                           F( IS, JE+1 ), LDF )
-                     CALL DAXPY( N-JE, RHS( 4 ), B( JSP1, JE+1 ), LDB,
+                     CALL DAXPY( N-JE, RHS( 4 ), B( JSP1, JE+1 ),
+     $                           LDB,
      $                           C( IS, JE+1 ), LDC )
-                     CALL DAXPY( N-JE, RHS( 4 ), E( JSP1, JE+1 ), LDE,
+                     CALL DAXPY( N-JE, RHS( 4 ), E( JSP1, JE+1 ),
+     $                           LDE,
      $                           F( IS, JE+1 ), LDF )
                   END IF
 *
@@ -619,9 +626,11 @@ SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
 *                 equation.
 *
                   IF( I.GT.1 ) THEN
-                     CALL DGEMV( 'N', IS-1, MB, -ONE, A( 1, IS ), LDA,
+                     CALL DGEMV( 'N', IS-1, MB, -ONE, A( 1, IS ),
+     $                           LDA,
      $                           RHS( 1 ), 1, ONE, C( 1, JS ), 1 )
-                     CALL DGEMV( 'N', IS-1, MB, -ONE, D( 1, IS ), LDD,
+                     CALL DGEMV( 'N', IS-1, MB, -ONE, D( 1, IS ),
+     $                           LDD,
      $                           RHS( 1 ), 1, ONE, F( 1, JS ), 1 )
                   END IF
                   IF( J.LT.Q ) THEN
@@ -679,7 +688,8 @@ SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   II = MB*NB + 1
                   DO 80 JJ = 0, NB - 1
                      CALL DCOPY( MB, C( IS, JS+JJ ), 1, RHS( K ), 1 )
-                     CALL DCOPY( MB, F( IS, JS+JJ ), 1, RHS( II ), 1 )
+                     CALL DCOPY( MB, F( IS, JS+JJ ), 1, RHS( II ),
+     $                           1 )
                      K = K + MB
                      II = II + MB
    80             CONTINUE
@@ -710,7 +720,8 @@ SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   II = MB*NB + 1
                   DO 100 JJ = 0, NB - 1
                      CALL DCOPY( MB, RHS( K ), 1, C( IS, JS+JJ ), 1 )
-                     CALL DCOPY( MB, RHS( II ), 1, F( IS, JS+JJ ), 1 )
+                     CALL DCOPY( MB, RHS( II ), 1, F( IS, JS+JJ ),
+     $                           1 )
                      K = K + MB
                      II = II + MB
   100             CONTINUE
@@ -728,10 +739,12 @@ SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   END IF
                   IF( J.LT.Q ) THEN
                      K = MB*NB + 1
-                     CALL DGEMM( 'N', 'N', MB, N-JE, NB, ONE, RHS( K ),
+                     CALL DGEMM( 'N', 'N', MB, N-JE, NB, ONE,
+     $                           RHS( K ),
      $                           MB, B( JS, JE+1 ), LDB, ONE,
      $                           C( IS, JE+1 ), LDC )
-                     CALL DGEMM( 'N', 'N', MB, N-JE, NB, ONE, RHS( K ),
+                     CALL DGEMM( 'N', 'N', MB, N-JE, NB, ONE,
+     $                           RHS( K ),
      $                           MB, E( JS, JE+1 ), LDE, ONE,
      $                           F( IS, JE+1 ), LDF )
                   END IF
@@ -782,7 +795,8 @@ SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   IF( IERR.GT.0 )
      $               INFO = IERR
 *
-                  CALL DGESC2( ZDIM, Z, LDZ, RHS, IPIV, JPIV, SCALOC )
+                  CALL DGESC2( ZDIM, Z, LDZ, RHS, IPIV, JPIV,
+     $                         SCALOC )
                   IF( SCALOC.NE.ONE ) THEN
                      DO 130 K = 1, N
                         CALL DSCAL( M, SCALOC, C( 1, K ), 1 )
@@ -801,10 +815,12 @@ SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
 *
                   IF( J.GT.P+2 ) THEN
                      ALPHA = RHS( 1 )
-                     CALL DAXPY( JS-1, ALPHA, B( 1, JS ), 1, F( IS, 1 ),
+                     CALL DAXPY( JS-1, ALPHA, B( 1, JS ), 1, F( IS,
+     $                           1 ),
      $                           LDF )
                      ALPHA = RHS( 2 )
-                     CALL DAXPY( JS-1, ALPHA, E( 1, JS ), 1, F( IS, 1 ),
+                     CALL DAXPY( JS-1, ALPHA, E( 1, JS ), 1, F( IS,
+     $                           1 ),
      $                           LDF )
                   END IF
                   IF( I.LT.P ) THEN
@@ -852,7 +868,8 @@ SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   CALL DGETC2( ZDIM, Z, LDZ, IPIV, JPIV, IERR )
                   IF( IERR.GT.0 )
      $               INFO = IERR
-                  CALL DGESC2( ZDIM, Z, LDZ, RHS, IPIV, JPIV, SCALOC )
+                  CALL DGESC2( ZDIM, Z, LDZ, RHS, IPIV, JPIV,
+     $                         SCALOC )
                   IF( SCALOC.NE.ONE ) THEN
                      DO 140 K = 1, N
                         CALL DSCAL( M, SCALOC, C( 1, K ), 1 )
@@ -925,7 +942,8 @@ SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   IF( IERR.GT.0 )
      $               INFO = IERR
 *
-                  CALL DGESC2( ZDIM, Z, LDZ, RHS, IPIV, JPIV, SCALOC )
+                  CALL DGESC2( ZDIM, Z, LDZ, RHS, IPIV, JPIV,
+     $                         SCALOC )
                   IF( SCALOC.NE.ONE ) THEN
                      DO 150 K = 1, N
                         CALL DSCAL( M, SCALOC, C( 1, K ), 1 )
@@ -945,9 +963,11 @@ SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
 *                 equation.
 *
                   IF( J.GT.P+2 ) THEN
-                     CALL DGER( MB, JS-1, ONE, RHS( 1 ), 1, B( 1, JS ),
+                     CALL DGER( MB, JS-1, ONE, RHS( 1 ), 1, B( 1,
+     $                          JS ),
      $                          1, F( IS, 1 ), LDF )
-                     CALL DGER( MB, JS-1, ONE, RHS( 3 ), 1, E( 1, JS ),
+                     CALL DGER( MB, JS-1, ONE, RHS( 3 ), 1, E( 1,
+     $                          JS ),
      $                          1, F( IS, 1 ), LDF )
                   END IF
                   IF( I.LT.P ) THEN
@@ -1007,7 +1027,8 @@ SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   II = MB*NB + 1
                   DO 160 JJ = 0, NB - 1
                      CALL DCOPY( MB, C( IS, JS+JJ ), 1, RHS( K ), 1 )
-                     CALL DCOPY( MB, F( IS, JS+JJ ), 1, RHS( II ), 1 )
+                     CALL DCOPY( MB, F( IS, JS+JJ ), 1, RHS( II ),
+     $                           1 )
                      K = K + MB
                      II = II + MB
   160             CONTINUE
@@ -1019,7 +1040,8 @@ SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   IF( IERR.GT.0 )
      $               INFO = IERR
 *
-                  CALL DGESC2( ZDIM, Z, LDZ, RHS, IPIV, JPIV, SCALOC )
+                  CALL DGESC2( ZDIM, Z, LDZ, RHS, IPIV, JPIV,
+     $                         SCALOC )
                   IF( SCALOC.NE.ONE ) THEN
                      DO 170 K = 1, N
                         CALL DSCAL( M, SCALOC, C( 1, K ), 1 )
@@ -1034,7 +1056,8 @@ SUBROUTINE DTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   II = MB*NB + 1
                   DO 180 JJ = 0, NB - 1
                      CALL DCOPY( MB, RHS( K ), 1, C( IS, JS+JJ ), 1 )
-                     CALL DCOPY( MB, RHS( II ), 1, F( IS, JS+JJ ), 1 )
+                     CALL DCOPY( MB, RHS( II ), 1, F( IS, JS+JJ ),
+     $                           1 )
                      K = K + MB
                      II = II + MB
   180             CONTINUE
diff --git a/SRC/dtgsyl.f b/SRC/dtgsyl.f
index 101c92dcff..e32d332b05 100644
--- a/SRC/dtgsyl.f
+++ b/SRC/dtgsyl.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTGSYL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtgsyl.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtgsyl.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -261,7 +259,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup tgsyl
 *
 *> \par Contributors:
 *  ==================
@@ -293,9 +291,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
+      SUBROUTINE DTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC,
+     $                   D,
      $                   LDD, E, LDE, F, LDF, SCALE, DIF, WORK, LWORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -334,7 +334,8 @@ SUBROUTINE DTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DLACPY, DLASET, DSCAL, DTGSY2, XERBLA
+      EXTERNAL           DGEMM, DLACPY, DLASET, DSCAL, DTGSY2,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, MAX, SQRT
@@ -437,7 +438,8 @@ SUBROUTINE DTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
             DSCALE = ZERO
             DSUM = ONE
             PQ = 0
-            CALL DTGSY2( TRANS, IFUNC, M, N, A, LDA, B, LDB, C, LDC, D,
+            CALL DTGSY2( TRANS, IFUNC, M, N, A, LDA, B, LDB, C, LDC,
+     $                   D,
      $                   LDD, E, LDE, F, LDF, SCALE, DSUM, DSCALE,
      $                   IWORK, PQ, INFO )
             IF( DSCALE.NE.ZERO ) THEN
@@ -531,7 +533,8 @@ SUBROUTINE DTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   IE = IWORK( I+1 ) - 1
                   MB = IE - IS + 1
                   PPQQ = 0
-                  CALL DTGSY2( TRANS, IFUNC, MB, NB, A( IS, IS ), LDA,
+                  CALL DTGSY2( TRANS, IFUNC, MB, NB, A( IS, IS ),
+     $                         LDA,
      $                         B( JS, JS ), LDB, C( IS, JS ), LDC,
      $                         D( IS, IS ), LDD, E( JS, JS ), LDE,
      $                         F( IS, JS ), LDF, SCALOC, DSUM, DSCALE,
@@ -650,10 +653,12 @@ SUBROUTINE DTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
 *              Substitute R(I, J) and L(I, J) into remaining equation.
 *
                IF( J.GT.P+2 ) THEN
-                  CALL DGEMM( 'N', 'T', MB, JS-1, NB, ONE, C( IS, JS ),
+                  CALL DGEMM( 'N', 'T', MB, JS-1, NB, ONE, C( IS,
+     $                        JS ),
      $                        LDC, B( 1, JS ), LDB, ONE, F( IS, 1 ),
      $                        LDF )
-                  CALL DGEMM( 'N', 'T', MB, JS-1, NB, ONE, F( IS, JS ),
+                  CALL DGEMM( 'N', 'T', MB, JS-1, NB, ONE, F( IS,
+     $                        JS ),
      $                        LDF, E( 1, JS ), LDE, ONE, F( IS, 1 ),
      $                        LDF )
                END IF
diff --git a/SRC/dtpcon.f b/SRC/dtpcon.f
index 39c7265bb3..fd78460d0c 100644
--- a/SRC/dtpcon.f
+++ b/SRC/dtpcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTPCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtpcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtpcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,11 +120,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tpcon
 *
 *  =====================================================================
       SUBROUTINE DTPCON( NORM, UPLO, DIAG, N, AP, RCOND, WORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -221,13 +220,15 @@ SUBROUTINE DTPCON( NORM, UPLO, DIAG, N, AP, RCOND, WORK, IWORK,
          END IF
          KASE = 0
    10    CONTINUE
-         CALL DLACN2( N, WORK( N+1 ), WORK, IWORK, AINVNM, KASE, ISAVE )
+         CALL DLACN2( N, WORK( N+1 ), WORK, IWORK, AINVNM, KASE,
+     $                ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.KASE1 ) THEN
 *
 *              Multiply by inv(A).
 *
-               CALL DLATPS( UPLO, 'No transpose', DIAG, NORMIN, N, AP,
+               CALL DLATPS( UPLO, 'No transpose', DIAG, NORMIN, N,
+     $                      AP,
      $                      WORK, SCALE, WORK( 2*N+1 ), INFO )
             ELSE
 *
diff --git a/SRC/dtplqt.f b/SRC/dtplqt.f
index 98fe771042..5d90858100 100644
--- a/SRC/dtplqt.f
+++ b/SRC/dtplqt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTPLQT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtplqt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtplqt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tplqt
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +184,7 @@
 *  =====================================================================
       SUBROUTINE DTPLQT( M, N, L, MB, A, LDA, B, LDB, T, LDT, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dtplqt2.f b/SRC/dtplqt2.f
index 8a2f31dd1e..50a3f7022e 100644
--- a/SRC/dtplqt2.f
+++ b/SRC/dtplqt2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTPLQT2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtplqt2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtplqt2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,7 +117,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tplqt2
 *
 *> \par Further Details:
 *  =====================
@@ -174,6 +172,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DTPLQT2( M, N, L, A, LDA, B, LDB, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dtpmlqt.f b/SRC/dtpmlqt.f
index fbfdd6afb0..96521a71ea 100644
--- a/SRC/dtpmlqt.f
+++ b/SRC/dtpmlqt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTPMLQT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtpmlqt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtpmlqt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -103,9 +101,7 @@
 *> \param[in] LDV
 *> \verbatim
 *>          LDV is INTEGER
-*>          The leading dimension of the array V.
-*>          If SIDE = 'L', LDV >= max(1,M);
-*>          if SIDE = 'R', LDV >= max(1,N).
+*>          The leading dimension of the array V. LDV >= K.
 *> \endverbatim
 *>
 *> \param[in] T
@@ -135,8 +131,8 @@
 *> \verbatim
 *>          LDA is INTEGER
 *>          The leading dimension of the array A.
-*>          If SIDE = 'L', LDC >= max(1,K);
-*>          If SIDE = 'R', LDC >= max(1,M).
+*>          If SIDE = 'L', LDA >= max(1,K);
+*>          If SIDE = 'R', LDA >= max(1,M).
 *> \endverbatim
 *>
 *> \param[in,out] B
@@ -175,7 +171,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tpmlqt
 *
 *> \par Further Details:
 *  =====================
@@ -211,8 +207,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DTPMLQT( SIDE, TRANS, M, N, K, L, MB, V, LDV, T, LDT,
+      SUBROUTINE DTPMLQT( SIDE, TRANS, M, N, K, L, MB, V, LDV, T,
+     $                    LDT,
      $                    A, LDA, B, LDB, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -239,7 +237,7 @@ SUBROUTINE DTPMLQT( SIDE, TRANS, M, N, K, L, MB, V, LDV, T, LDT,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, DLARFB, DTPRFB
+      EXTERNAL           XERBLA, DTPRFB
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
diff --git a/SRC/dtpmqrt.f b/SRC/dtpmqrt.f
index 9cf4fa0864..69f006dd73 100644
--- a/SRC/dtpmqrt.f
+++ b/SRC/dtpmqrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTPMQRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtpmqrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtpmqrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -175,7 +173,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tpmqrt
 *
 *> \par Further Details:
 *  =====================
@@ -211,8 +209,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DTPMQRT( SIDE, TRANS, M, N, K, L, NB, V, LDV, T, LDT,
+      SUBROUTINE DTPMQRT( SIDE, TRANS, M, N, K, L, NB, V, LDV, T,
+     $                    LDT,
      $                    A, LDA, B, LDB, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dtpqrt.f b/SRC/dtpqrt.f
index 28401f7142..b1b9727b81 100644
--- a/SRC/dtpqrt.f
+++ b/SRC/dtpqrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTPQRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtpqrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtpqrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tpqrt
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +184,7 @@
 *  =====================================================================
       SUBROUTINE DTPQRT( M, N, L, NB, A, LDA, B, LDB, T, LDT, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dtpqrt2.f b/SRC/dtpqrt2.f
index 1ace030138..33860a30d8 100644
--- a/SRC/dtpqrt2.f
+++ b/SRC/dtpqrt2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTPQRT2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtpqrt2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtpqrt2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,7 +117,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tpqrt2
 *
 *> \par Further Details:
 *  =====================
@@ -170,6 +168,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DTPQRT2( M, N, L, A, LDA, B, LDB, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dtprfb.f b/SRC/dtprfb.f
index a3fc7d6c63..64547155a8 100644
--- a/SRC/dtprfb.f
+++ b/SRC/dtprfb.f
@@ -1,11 +1,10 @@
-*> \brief \b DTPRFB applies a real or complex "triangular-pentagonal" blocked reflector to a real or complex matrix, which is composed of two blocks.
+*> \brief \b DTPRFB applies a real "triangular-pentagonal" block reflector to a real matrix, which is composed of two blocks.
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTPRFB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtprfb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtprfb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -194,7 +192,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup tprfb
 *
 *> \par Further Details:
 *  =====================
@@ -248,6 +246,7 @@
 *  =====================================================================
       SUBROUTINE DTPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
      $                   V, LDV, T, LDT, A, LDA, B, LDB, WORK, LDWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -429,7 +428,8 @@ SUBROUTINE DTPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
 *
          CALL DGEMM( 'N', 'T', M, N-L, K, -ONE, WORK, LDWORK,
      $               V, LDV, ONE, B, LDB )
-         CALL DGEMM( 'N', 'T', M, L, K-L, -ONE, WORK( 1, KP ), LDWORK,
+         CALL DGEMM( 'N', 'T', M, L, K-L, -ONE, WORK( 1, KP ),
+     $               LDWORK,
      $               V( NP, KP ), LDV, ONE, B( 1, NP ), LDB )
          CALL DTRMM( 'R', 'U', 'T', 'N', M, L, ONE, V( NP, 1 ), LDV,
      $               WORK, LDWORK )
@@ -670,7 +670,8 @@ SUBROUTINE DTPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
 *
          CALL DGEMM( 'N', 'N', M, N-L, K, -ONE, WORK, LDWORK,
      $               V, LDV, ONE, B, LDB )
-         CALL DGEMM( 'N', 'N', M, L, K-L, -ONE, WORK( 1, KP ), LDWORK,
+         CALL DGEMM( 'N', 'N', M, L, K-L, -ONE, WORK( 1, KP ),
+     $               LDWORK,
      $               V( KP, NP ), LDV, ONE, B( 1, NP ), LDB )
          CALL DTRMM( 'R', 'L', 'N', 'N', M, L, ONE, V( 1, NP ), LDV,
      $               WORK, LDWORK )
diff --git a/SRC/dtprfs.f b/SRC/dtprfs.f
index bd4f0ce08e..f9a6eb5432 100644
--- a/SRC/dtprfs.f
+++ b/SRC/dtprfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTPRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtprfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtprfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -167,11 +165,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tprfs
 *
 *  =====================================================================
-      SUBROUTINE DTPRFS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X, LDX,
+      SUBROUTINE DTPRFS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X,
+     $                   LDX,
      $                   FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -205,7 +205,8 @@ SUBROUTINE DTPRFS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X, LDX,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DLACN2, DTPMV, DTPSV, XERBLA
+      EXTERNAL           DAXPY, DCOPY, DLACN2, DTPMV, DTPSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -429,14 +430,16 @@ SUBROUTINE DTPRFS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X, LDX,
 *
          KASE = 0
   210    CONTINUE
-         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
 *
 *              Multiply by diag(W)*inv(op(A)**T).
 *
-               CALL DTPSV( UPLO, TRANST, DIAG, N, AP, WORK( N+1 ), 1 )
+               CALL DTPSV( UPLO, TRANST, DIAG, N, AP, WORK( N+1 ),
+     $                     1 )
                DO 220 I = 1, N
                   WORK( N+I ) = WORK( I )*WORK( N+I )
   220          CONTINUE
diff --git a/SRC/dtptri.f b/SRC/dtptri.f
index f1c976f2ce..7bc5e2ec51 100644
--- a/SRC/dtptri.f
+++ b/SRC/dtptri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTPTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtptri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtptri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -91,7 +89,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tptri
 *
 *> \par Further Details:
 *  =====================
@@ -114,6 +112,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DTPTRI( UPLO, DIAG, N, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dtptrs.f b/SRC/dtptrs.f
index 18a92d0454..b17673ebaf 100644
--- a/SRC/dtptrs.f
+++ b/SRC/dtptrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTPTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtptrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtptrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -38,9 +36,14 @@
 *>
 *>    A * X = B  or  A**T * X = B,
 *>
-*> where A is a triangular matrix of order N stored in packed format,
-*> and B is an N-by-NRHS matrix.  A check is made to verify that A is
-*> nonsingular.
+*> where A is a triangular matrix of order N stored in packed format, and B is an N-by-NRHS matrix.
+*>
+*> This subroutine verifies that A is nonsingular, but callers should note that only exact
+*> singularity is detected. It is conceivable for one or more diagonal elements of A to be
+*> subnormally tiny numbers without this subroutine signalling an error.
+*>
+*> If a possible loss of numerical precision due to near-singular matrices is a concern, the
+*> caller should verify that A is nonsingular within some tolerance before calling this subroutine.
 *> \endverbatim
 *
 *  Arguments:
@@ -110,7 +113,7 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the i-th diagonal element of A is zero,
+*>          > 0:  if INFO = i, the i-th diagonal element of A is exactly zero,
 *>                indicating that the matrix is singular and the
 *>                solutions X have not been computed.
 *> \endverbatim
@@ -123,10 +126,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tptrs
 *
 *  =====================================================================
-      SUBROUTINE DTPTRS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, INFO )
+      SUBROUTINE DTPTRS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -170,7 +175,8 @@ SUBROUTINE DTPTRS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, INFO )
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.
-     $         LSAME( TRANS, 'T' ) .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+     $         LSAME( TRANS, 'T' ) .AND.
+     $                .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -2
       ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
          INFO = -3
diff --git a/SRC/dtpttf.f b/SRC/dtpttf.f
index 0c7aa1e947..e13dc0f246 100644
--- a/SRC/dtpttf.f
+++ b/SRC/dtpttf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTPTTF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtpttf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtpttf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -92,7 +90,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tpttf
 *
 *> \par Further Details:
 *  =====================
@@ -183,6 +181,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DTPTTF( TRANSR, UPLO, N, AP, ARF, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dtpttr.f b/SRC/dtpttr.f
index 2126eda09a..db6fdc6d43 100644
--- a/SRC/dtpttr.f
+++ b/SRC/dtpttr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTPTTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtpttr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtpttr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tpttr
 *
 *  =====================================================================
       SUBROUTINE DTPTTR( UPLO, N, AP, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dtrcon.f b/SRC/dtrcon.f
index 9b6c75489a..fb30524431 100644
--- a/SRC/dtrcon.f
+++ b/SRC/dtrcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTRCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtrcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtrcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -129,11 +127,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup trcon
 *
 *  =====================================================================
       SUBROUTINE DTRCON( NORM, UPLO, DIAG, N, A, LDA, RCOND, WORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -230,7 +229,8 @@ SUBROUTINE DTRCON( NORM, UPLO, DIAG, N, A, LDA, RCOND, WORK,
          END IF
          KASE = 0
    10    CONTINUE
-         CALL DLACN2( N, WORK( N+1 ), WORK, IWORK, AINVNM, KASE, ISAVE )
+         CALL DLACN2( N, WORK( N+1 ), WORK, IWORK, AINVNM, KASE,
+     $                ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.KASE1 ) THEN
 *
@@ -242,7 +242,8 @@ SUBROUTINE DTRCON( NORM, UPLO, DIAG, N, A, LDA, RCOND, WORK,
 *
 *              Multiply by inv(A**T).
 *
-               CALL DLATRS( UPLO, 'Transpose', DIAG, NORMIN, N, A, LDA,
+               CALL DLATRS( UPLO, 'Transpose', DIAG, NORMIN, N, A,
+     $                      LDA,
      $                      WORK, SCALE, WORK( 2*N+1 ), INFO )
             END IF
             NORMIN = 'Y'
diff --git a/SRC/dtrevc.f b/SRC/dtrevc.f
index 149b43c789..20dd57c2b2 100644
--- a/SRC/dtrevc.f
+++ b/SRC/dtrevc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTREVC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtrevc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtrevc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -200,7 +198,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup trevc
 *
 *> \par Further Details:
 *  =====================
@@ -217,8 +215,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
+      SUBROUTINE DTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
+     $                   VR,
      $                   LDVR, MM, M, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -254,7 +254,7 @@ SUBROUTINE DTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
       EXTERNAL           LSAME, IDAMAX, DDOT, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DAXPY, DCOPY, DGEMV, DLALN2, DSCAL,
+      EXTERNAL           DAXPY, DCOPY, DGEMV, DLALN2, DSCAL,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -341,7 +341,6 @@ SUBROUTINE DTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Precision' )
       SMLNUM = UNFL*( N / ULP )
       BIGNUM = ( ONE-ULP ) / SMLNUM
@@ -433,7 +432,8 @@ SUBROUTINE DTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
 *                    1-by-1 diagonal block
 *
-                     CALL DLALN2( .FALSE., 1, 1, SMIN, ONE, T( J, J ),
+                     CALL DLALN2( .FALSE., 1, 1, SMIN, ONE, T( J,
+     $                            J ),
      $                            LDT, ONE, ONE, WORK( J+N ), N, WR,
      $                            ZERO, X, 2, SCALE, XNORM, IERR )
 *
@@ -564,7 +564,8 @@ SUBROUTINE DTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
 *                    1-by-1 diagonal block
 *
-                     CALL DLALN2( .FALSE., 1, 2, SMIN, ONE, T( J, J ),
+                     CALL DLALN2( .FALSE., 1, 2, SMIN, ONE, T( J,
+     $                            J ),
      $                            LDT, ONE, ONE, WORK( J+N ), N, WR, WI,
      $                            X, 2, SCALE, XNORM, IERR )
 *
@@ -674,7 +675,8 @@ SUBROUTINE DTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
      $                           WORK( 1+N2 ), 1, WORK( KI+N2 ),
      $                           VR( 1, KI ), 1 )
                   ELSE
-                     CALL DSCAL( N, WORK( KI-1+N ), VR( 1, KI-1 ), 1 )
+                     CALL DSCAL( N, WORK( KI-1+N ), VR( 1, KI-1 ),
+     $                           1 )
                      CALL DSCAL( N, WORK( KI+N2 ), VR( 1, KI ), 1 )
                   END IF
 *
@@ -783,7 +785,8 @@ SUBROUTINE DTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
 *                    Solve (T(J,J)-WR)**T*X = WORK
 *
-                     CALL DLALN2( .FALSE., 1, 1, SMIN, ONE, T( J, J ),
+                     CALL DLALN2( .FALSE., 1, 1, SMIN, ONE, T( J,
+     $                            J ),
      $                            LDT, ONE, ONE, WORK( J+N ), N, WR,
      $                            ZERO, X, 2, SCALE, XNORM, IERR )
 *
@@ -843,7 +846,8 @@ SUBROUTINE DTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *              Copy the vector x or Q*x to VL and normalize.
 *
                IF( .NOT.OVER ) THEN
-                  CALL DCOPY( N-KI+1, WORK( KI+N ), 1, VL( KI, IS ), 1 )
+                  CALL DCOPY( N-KI+1, WORK( KI+N ), 1, VL( KI, IS ),
+     $                        1 )
 *
                   II = IDAMAX( N-KI+1, VL( KI, IS ), 1 ) + KI - 1
                   REMAX = ONE / ABS( VL( II, IS ) )
@@ -856,7 +860,8 @@ SUBROUTINE DTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
                ELSE
 *
                   IF( KI.LT.N )
-     $               CALL DGEMV( 'N', N, N-KI, ONE, VL( 1, KI+1 ), LDVL,
+     $               CALL DGEMV( 'N', N, N-KI, ONE, VL( 1, KI+1 ),
+     $                           LDVL,
      $                           WORK( KI+1+N ), 1, WORK( KI+N ),
      $                           VL( 1, KI ), 1 )
 *
@@ -935,7 +940,8 @@ SUBROUTINE DTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
 *                    Solve (T(J,J)-(WR-i*WI))*(X11+i*X12)= WK+I*WK2
 *
-                     CALL DLALN2( .FALSE., 1, 2, SMIN, ONE, T( J, J ),
+                     CALL DLALN2( .FALSE., 1, 2, SMIN, ONE, T( J,
+     $                            J ),
      $                            LDT, ONE, ONE, WORK( J+N ), N, WR,
      $                            -WI, X, 2, SCALE, XNORM, IERR )
 *
@@ -980,7 +986,8 @@ SUBROUTINE DTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
      $                               WORK( KI+2+N ), 1 )
 *
                      WORK( J+1+N2 ) = WORK( J+1+N2 ) -
-     $                                DDOT( J-KI-2, T( KI+2, J+1 ), 1,
+     $                                DDOT( J-KI-2, T( KI+2, J+1 ),
+     $                                      1,
      $                                WORK( KI+2+N2 ), 1 )
 *
 *                    Solve 2-by-2 complex linear equation
@@ -1011,8 +1018,10 @@ SUBROUTINE DTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *              Copy the vector x or Q*x to VL and normalize.
 *
                IF( .NOT.OVER ) THEN
-                  CALL DCOPY( N-KI+1, WORK( KI+N ), 1, VL( KI, IS ), 1 )
-                  CALL DCOPY( N-KI+1, WORK( KI+N2 ), 1, VL( KI, IS+1 ),
+                  CALL DCOPY( N-KI+1, WORK( KI+N ), 1, VL( KI, IS ),
+     $                        1 )
+                  CALL DCOPY( N-KI+1, WORK( KI+N2 ), 1, VL( KI,
+     $                        IS+1 ),
      $                        1 )
 *
                   EMAX = ZERO
@@ -1038,7 +1047,8 @@ SUBROUTINE DTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
      $                           WORK( KI+1+N2 ), VL( 1, KI+1 ), 1 )
                   ELSE
                      CALL DSCAL( N, WORK( KI+N ), VL( 1, KI ), 1 )
-                     CALL DSCAL( N, WORK( KI+1+N2 ), VL( 1, KI+1 ), 1 )
+                     CALL DSCAL( N, WORK( KI+1+N2 ), VL( 1, KI+1 ),
+     $                           1 )
                   END IF
 *
                   EMAX = ZERO
diff --git a/SRC/dtrevc3.f b/SRC/dtrevc3.f
index a4651e788f..10fd6e5f7d 100644
--- a/SRC/dtrevc3.f
+++ b/SRC/dtrevc3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTREVC3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtrevc3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtrevc3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -215,7 +213,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup trevc3
 *
 *> \par Further Details:
 *  =====================
@@ -274,8 +272,9 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
       EXTERNAL           LSAME, IDAMAX, ILAENV, DDOT, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DGEMV, DLALN2, DSCAL, XERBLA,
-     $                   DGEMM, DLASET, DLABAD, DLACPY
+      EXTERNAL           DAXPY, DCOPY, DGEMV, DLALN2, DSCAL,
+     $                   XERBLA,
+     $                   DGEMM, DLASET, DLACPY
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
@@ -298,7 +297,7 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *
       INFO = 0
       NB = ILAENV( 1, 'DTREVC', SIDE // HOWMNY, N, -1, -1, -1 )
-      MAXWRK = N + 2*N*NB
+      MAXWRK = MAX( 1, N + 2*N*NB )
       WORK(1) = MAXWRK
       LQUERY = ( LWORK.EQ.-1 )
       IF( .NOT.RIGHTV .AND. .NOT.LEFTV ) THEN
@@ -381,7 +380,6 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Precision' )
       SMLNUM = UNFL*( N / ULP )
       BIGNUM = ( ONE-ULP ) / SMLNUM
@@ -490,7 +488,8 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *
 *                    1-by-1 diagonal block
 *
-                     CALL DLALN2( .FALSE., 1, 1, SMIN, ONE, T( J, J ),
+                     CALL DLALN2( .FALSE., 1, 1, SMIN, ONE, T( J,
+     $                            J ),
      $                            LDT, ONE, ONE, WORK( J+IV*N ), N, WR,
      $                            ZERO, X, 2, SCALE, XNORM, IERR )
 *
@@ -557,7 +556,8 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
                IF( .NOT.OVER ) THEN
 *                 ------------------------------
 *                 no back-transform: copy x to VR and normalize.
-                  CALL DCOPY( KI, WORK( 1 + IV*N ), 1, VR( 1, IS ), 1 )
+                  CALL DCOPY( KI, WORK( 1 + IV*N ), 1, VR( 1, IS ),
+     $                        1 )
 *
                   II = IDAMAX( KI, VR( 1, IS ), 1 )
                   REMAX = ONE / ABS( VR( II, IS ) )
@@ -636,7 +636,8 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *
 *                    1-by-1 diagonal block
 *
-                     CALL DLALN2( .FALSE., 1, 2, SMIN, ONE, T( J, J ),
+                     CALL DLALN2( .FALSE., 1, 2, SMIN, ONE, T( J,
+     $                            J ),
      $                            LDT, ONE, ONE, WORK( J+(IV-1)*N ), N,
      $                            WR, WI, X, 2, SCALE, XNORM, IERR )
 *
@@ -654,8 +655,10 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *                    Scale if necessary
 *
                      IF( SCALE.NE.ONE ) THEN
-                        CALL DSCAL( KI, SCALE, WORK( 1+(IV-1)*N ), 1 )
-                        CALL DSCAL( KI, SCALE, WORK( 1+(IV  )*N ), 1 )
+                        CALL DSCAL( KI, SCALE, WORK( 1+(IV-1)*N ),
+     $                              1 )
+                        CALL DSCAL( KI, SCALE, WORK( 1+(IV  )*N ),
+     $                              1 )
                      END IF
                      WORK( J+(IV-1)*N ) = X( 1, 1 )
                      WORK( J+(IV  )*N ) = X( 1, 2 )
@@ -694,8 +697,10 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *                    Scale if necessary
 *
                      IF( SCALE.NE.ONE ) THEN
-                        CALL DSCAL( KI, SCALE, WORK( 1+(IV-1)*N ), 1 )
-                        CALL DSCAL( KI, SCALE, WORK( 1+(IV  )*N ), 1 )
+                        CALL DSCAL( KI, SCALE, WORK( 1+(IV-1)*N ),
+     $                              1 )
+                        CALL DSCAL( KI, SCALE, WORK( 1+(IV  )*N ),
+     $                              1 )
                      END IF
                      WORK( J-1+(IV-1)*N ) = X( 1, 1 )
                      WORK( J  +(IV-1)*N ) = X( 2, 1 )
@@ -720,8 +725,10 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
                IF( .NOT.OVER ) THEN
 *                 ------------------------------
 *                 no back-transform: copy x to VR and normalize.
-                  CALL DCOPY( KI, WORK( 1+(IV-1)*N ), 1, VR(1,IS-1), 1 )
-                  CALL DCOPY( KI, WORK( 1+(IV  )*N ), 1, VR(1,IS  ), 1 )
+                  CALL DCOPY( KI, WORK( 1+(IV-1)*N ), 1, VR(1,IS-1),
+     $                        1 )
+                  CALL DCOPY( KI, WORK( 1+(IV  )*N ), 1, VR(1,IS  ),
+     $                        1 )
 *
                   EMAX = ZERO
                   DO 100 K = 1, KI
@@ -748,8 +755,10 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
      $                           WORK( 1  + (IV)*N ), 1,
      $                           WORK( KI + (IV)*N ), VR( 1, KI ), 1 )
                   ELSE
-                     CALL DSCAL( N, WORK(KI-1+(IV-1)*N), VR(1,KI-1), 1)
-                     CALL DSCAL( N, WORK(KI  +(IV  )*N), VR(1,KI  ), 1)
+                     CALL DSCAL( N, WORK(KI-1+(IV-1)*N), VR(1,KI-1),
+     $                           1)
+                     CALL DSCAL( N, WORK(KI  +(IV  )*N), VR(1,KI  ),
+     $                           1)
                   END IF
 *
                   EMAX = ZERO
@@ -928,14 +937,16 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *
 *                    Solve [ T(J,J) - WR ]**T * X = WORK
 *
-                     CALL DLALN2( .FALSE., 1, 1, SMIN, ONE, T( J, J ),
+                     CALL DLALN2( .FALSE., 1, 1, SMIN, ONE, T( J,
+     $                            J ),
      $                            LDT, ONE, ONE, WORK( J+IV*N ), N, WR,
      $                            ZERO, X, 2, SCALE, XNORM, IERR )
 *
 *                    Scale if necessary
 *
                      IF( SCALE.NE.ONE )
-     $                  CALL DSCAL( N-KI+1, SCALE, WORK( KI+IV*N ), 1 )
+     $                  CALL DSCAL( N-KI+1, SCALE, WORK( KI+IV*N ),
+     $                              1 )
                      WORK( J+IV*N ) = X( 1, 1 )
                      VMAX = MAX( ABS( WORK( J+IV*N ) ), VMAX )
                      VCRIT = BIGNUM / VMAX
@@ -960,7 +971,8 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
      $                                      WORK( KI+1+IV*N ), 1 )
 *
                      WORK( J+1+IV*N ) = WORK( J+1+IV*N ) -
-     $                                  DDOT( J-KI-1, T( KI+1, J+1 ), 1,
+     $                                  DDOT( J-KI-1, T( KI+1, J+1 ),
+     $                                        1,
      $                                        WORK( KI+1+IV*N ), 1 )
 *
 *                    Solve
@@ -974,7 +986,8 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *                    Scale if necessary
 *
                      IF( SCALE.NE.ONE )
-     $                  CALL DSCAL( N-KI+1, SCALE, WORK( KI+IV*N ), 1 )
+     $                  CALL DSCAL( N-KI+1, SCALE, WORK( KI+IV*N ),
+     $                              1 )
                      WORK( J  +IV*N ) = X( 1, 1 )
                      WORK( J+1+IV*N ) = X( 2, 1 )
 *
@@ -1080,30 +1093,37 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *
                      IF( WORK( J ).GT.VCRIT ) THEN
                         REC = ONE / VMAX
-                        CALL DSCAL( N-KI+1, REC, WORK(KI+(IV  )*N), 1 )
-                        CALL DSCAL( N-KI+1, REC, WORK(KI+(IV+1)*N), 1 )
+                        CALL DSCAL( N-KI+1, REC, WORK(KI+(IV  )*N),
+     $                              1 )
+                        CALL DSCAL( N-KI+1, REC, WORK(KI+(IV+1)*N),
+     $                              1 )
                         VMAX = ONE
                         VCRIT = BIGNUM
                      END IF
 *
                      WORK( J+(IV  )*N ) = WORK( J+(IV)*N ) -
-     $                                  DDOT( J-KI-2, T( KI+2, J ), 1,
+     $                                  DDOT( J-KI-2, T( KI+2, J ),
+     $                                        1,
      $                                        WORK( KI+2+(IV)*N ), 1 )
                      WORK( J+(IV+1)*N ) = WORK( J+(IV+1)*N ) -
-     $                                  DDOT( J-KI-2, T( KI+2, J ), 1,
+     $                                  DDOT( J-KI-2, T( KI+2, J ),
+     $                                        1,
      $                                        WORK( KI+2+(IV+1)*N ), 1 )
 *
 *                    Solve [ T(J,J)-(WR-i*WI) ]*(X11+i*X12)= WK+I*WK2
 *
-                     CALL DLALN2( .FALSE., 1, 2, SMIN, ONE, T( J, J ),
+                     CALL DLALN2( .FALSE., 1, 2, SMIN, ONE, T( J,
+     $                            J ),
      $                            LDT, ONE, ONE, WORK( J+IV*N ), N, WR,
      $                            -WI, X, 2, SCALE, XNORM, IERR )
 *
 *                    Scale if necessary
 *
                      IF( SCALE.NE.ONE ) THEN
-                        CALL DSCAL( N-KI+1, SCALE, WORK(KI+(IV  )*N), 1)
-                        CALL DSCAL( N-KI+1, SCALE, WORK(KI+(IV+1)*N), 1)
+                        CALL DSCAL( N-KI+1, SCALE, WORK(KI+(IV  )*N),
+     $                              1)
+                        CALL DSCAL( N-KI+1, SCALE, WORK(KI+(IV+1)*N),
+     $                              1)
                      END IF
                      WORK( J+(IV  )*N ) = X( 1, 1 )
                      WORK( J+(IV+1)*N ) = X( 1, 2 )
@@ -1121,8 +1141,10 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
                      BETA = MAX( WORK( J ), WORK( J+1 ) )
                      IF( BETA.GT.VCRIT ) THEN
                         REC = ONE / VMAX
-                        CALL DSCAL( N-KI+1, REC, WORK(KI+(IV  )*N), 1 )
-                        CALL DSCAL( N-KI+1, REC, WORK(KI+(IV+1)*N), 1 )
+                        CALL DSCAL( N-KI+1, REC, WORK(KI+(IV  )*N),
+     $                              1 )
+                        CALL DSCAL( N-KI+1, REC, WORK(KI+(IV+1)*N),
+     $                              1 )
                         VMAX = ONE
                         VCRIT = BIGNUM
                      END IF
@@ -1136,11 +1158,13 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
      $                                      WORK( KI+2+(IV+1)*N ), 1 )
 *
                      WORK( J+1+(IV  )*N ) = WORK( J+1+(IV)*N ) -
-     $                                DDOT( J-KI-2, T( KI+2, J+1 ), 1,
+     $                                DDOT( J-KI-2, T( KI+2, J+1 ),
+     $                                      1,
      $                                      WORK( KI+2+(IV)*N ), 1 )
 *
                      WORK( J+1+(IV+1)*N ) = WORK( J+1+(IV+1)*N ) -
-     $                                DDOT( J-KI-2, T( KI+2, J+1 ), 1,
+     $                                DDOT( J-KI-2, T( KI+2, J+1 ),
+     $                                      1,
      $                                      WORK( KI+2+(IV+1)*N ), 1 )
 *
 *                    Solve 2-by-2 complex linear equation
@@ -1154,8 +1178,10 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *                    Scale if necessary
 *
                      IF( SCALE.NE.ONE ) THEN
-                        CALL DSCAL( N-KI+1, SCALE, WORK(KI+(IV  )*N), 1)
-                        CALL DSCAL( N-KI+1, SCALE, WORK(KI+(IV+1)*N), 1)
+                        CALL DSCAL( N-KI+1, SCALE, WORK(KI+(IV  )*N),
+     $                              1)
+                        CALL DSCAL( N-KI+1, SCALE, WORK(KI+(IV+1)*N),
+     $                              1)
                      END IF
                      WORK( J  +(IV  )*N ) = X( 1, 1 )
                      WORK( J  +(IV+1)*N ) = X( 1, 2 )
@@ -1208,8 +1234,10 @@ SUBROUTINE DTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
      $                           WORK( KI+1 + (IV+1)*N ),
      $                           VL( 1, KI+1 ), 1 )
                   ELSE
-                     CALL DSCAL( N, WORK(KI+  (IV  )*N), VL(1, KI  ), 1)
-                     CALL DSCAL( N, WORK(KI+1+(IV+1)*N), VL(1, KI+1), 1)
+                     CALL DSCAL( N, WORK(KI+  (IV  )*N), VL(1, KI  ),
+     $                           1)
+                     CALL DSCAL( N, WORK(KI+1+(IV+1)*N), VL(1, KI+1),
+     $                           1)
                   END IF
 *
                   EMAX = ZERO
diff --git a/SRC/dtrexc.f b/SRC/dtrexc.f
index 4cb18e3836..953abae52d 100644
--- a/SRC/dtrexc.f
+++ b/SRC/dtrexc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTREXC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtrexc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtrexc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -140,11 +138,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup trexc
 *
 *  =====================================================================
       SUBROUTINE DTREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -295,7 +294,8 @@ SUBROUTINE DTREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, WORK,
 *
 *              Swap two 1 by 1 blocks, no problems possible
 *
-               CALL DLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE, 1, NBNEXT,
+               CALL DLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE, 1,
+     $                      NBNEXT,
      $                      WORK, INFO )
                HERE = HERE + 1
             ELSE
@@ -321,7 +321,8 @@ SUBROUTINE DTREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, WORK,
 *
                   CALL DLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE, 1, 1,
      $                         WORK, INFO )
-                  CALL DLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE+1, 1, 1,
+                  CALL DLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE+1, 1,
+     $                         1,
      $                         WORK, INFO )
                   HERE = HERE + 2
                END IF
@@ -346,7 +347,8 @@ SUBROUTINE DTREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, WORK,
                IF( T( HERE-1, HERE-2 ).NE.ZERO )
      $            NBNEXT = 2
             END IF
-            CALL DLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE-NBNEXT, NBNEXT,
+            CALL DLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE-NBNEXT,
+     $                   NBNEXT,
      $                   NBF, WORK, INFO )
             IF( INFO.NE.0 ) THEN
                ILST = HERE
@@ -371,7 +373,8 @@ SUBROUTINE DTREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, WORK,
                IF( T( HERE-1, HERE-2 ).NE.ZERO )
      $            NBNEXT = 2
             END IF
-            CALL DLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE-NBNEXT, NBNEXT,
+            CALL DLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE-NBNEXT,
+     $                   NBNEXT,
      $                   1, WORK, INFO )
             IF( INFO.NE.0 ) THEN
                ILST = HERE
@@ -381,7 +384,8 @@ SUBROUTINE DTREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, WORK,
 *
 *              Swap two 1 by 1 blocks, no problems possible
 *
-               CALL DLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE, NBNEXT, 1,
+               CALL DLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE, NBNEXT,
+     $                      1,
      $                      WORK, INFO )
                HERE = HERE - 1
             ELSE
@@ -394,7 +398,8 @@ SUBROUTINE DTREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, WORK,
 *
 *                 2 by 2 Block did not split
 *
-                  CALL DLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE-1, 2, 1,
+                  CALL DLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE-1, 2,
+     $                         1,
      $                         WORK, INFO )
                   IF( INFO.NE.0 ) THEN
                      ILST = HERE
@@ -407,7 +412,8 @@ SUBROUTINE DTREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, WORK,
 *
                   CALL DLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE, 1, 1,
      $                         WORK, INFO )
-                  CALL DLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE-1, 1, 1,
+                  CALL DLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE-1, 1,
+     $                         1,
      $                         WORK, INFO )
                   HERE = HERE - 2
                END IF
diff --git a/SRC/dtrrfs.f b/SRC/dtrrfs.f
index de0dc52058..0d19e34da8 100644
--- a/SRC/dtrrfs.f
+++ b/SRC/dtrrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTRRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtrrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtrrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -174,11 +172,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup trrfs
 *
 *  =====================================================================
-      SUBROUTINE DTRRFS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB, X,
+      SUBROUTINE DTRRFS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB,
+     $                   X,
      $                   LDX, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -212,7 +212,8 @@ SUBROUTINE DTRRFS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB, X,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DLACN2, DTRMV, DTRSV, XERBLA
+      EXTERNAL           DAXPY, DCOPY, DLACN2, DTRMV, DTRSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -426,14 +427,16 @@ SUBROUTINE DTRRFS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB, X,
 *
          KASE = 0
   210    CONTINUE
-         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL DLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
 *
 *              Multiply by diag(W)*inv(op(A)**T).
 *
-               CALL DTRSV( UPLO, TRANST, DIAG, N, A, LDA, WORK( N+1 ),
+               CALL DTRSV( UPLO, TRANST, DIAG, N, A, LDA,
+     $                     WORK( N+1 ),
      $                     1 )
                DO 220 I = 1, N
                   WORK( N+I ) = WORK( I )*WORK( N+I )
diff --git a/SRC/dtrsen.f b/SRC/dtrsen.f
index 3aba35aded..ef61434b95 100644
--- a/SRC/dtrsen.f
+++ b/SRC/dtrsen.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTRSEN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtrsen.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtrsen.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -230,7 +228,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup trsen
 *
 *> \par Further Details:
 *  =====================
@@ -308,8 +306,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DTRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, WR, WI,
+      SUBROUTINE DTRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, WR,
+     $                   WI,
      $                   M, S, SEP, WORK, LWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -349,7 +349,8 @@ SUBROUTINE DTRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, WR, WI,
       EXTERNAL           LSAME, DLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLACN2, DLACPY, DTREXC, DTRSYL, XERBLA
+      EXTERNAL           DLACN2, DLACPY, DTREXC, DTRSYL,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
@@ -470,7 +471,8 @@ SUBROUTINE DTRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, WR, WI,
                IERR = 0
                KK = K
                IF( K.NE.KS )
-     $            CALL DTREXC( COMPQ, N, T, LDT, Q, LDQ, KK, KS, WORK,
+     $            CALL DTREXC( COMPQ, N, T, LDT, Q, LDQ, KK, KS,
+     $                         WORK,
      $                         IERR )
                IF( IERR.EQ.1 .OR. IERR.EQ.2 ) THEN
 *
@@ -518,7 +520,8 @@ SUBROUTINE DTRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, WR, WI,
          EST = ZERO
          KASE = 0
    30    CONTINUE
-         CALL DLACN2( NN, WORK( NN+1 ), WORK, IWORK, EST, KASE, ISAVE )
+         CALL DLACN2( NN, WORK( NN+1 ), WORK, IWORK, EST, KASE,
+     $                ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
 *
diff --git a/SRC/dtrsna.f b/SRC/dtrsna.f
index ffcfe0545f..a69db664f6 100644
--- a/SRC/dtrsna.f
+++ b/SRC/dtrsna.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTRSNA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtrsna.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtrsna.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -213,7 +211,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup trsna
 *
 *> \par Further Details:
 *  =====================
@@ -259,9 +257,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
+      SUBROUTINE DTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
+     $                   VR,
      $                   LDVR, S, SEP, MM, M, WORK, LDWORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -300,7 +300,8 @@ SUBROUTINE DTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
       EXTERNAL           LSAME, DDOT, DLAMCH, DLAPY2, DNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLACN2, DLACPY, DLAQTR, DTREXC, XERBLA
+      EXTERNAL           DLACN2, DLACPY, DLAQTR, DTREXC,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
@@ -392,7 +393,6 @@ SUBROUTINE DTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
       KS = 0
       PAIR = .FALSE.
@@ -441,10 +441,12 @@ SUBROUTINE DTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *              Complex eigenvalue.
 *
                PROD1 = DDOT( N, VR( 1, KS ), 1, VL( 1, KS ), 1 )
-               PROD1 = PROD1 + DDOT( N, VR( 1, KS+1 ), 1, VL( 1, KS+1 ),
+               PROD1 = PROD1 + DDOT( N, VR( 1, KS+1 ), 1, VL( 1,
+     $                               KS+1 ),
      $                 1 )
                PROD2 = DDOT( N, VL( 1, KS ), 1, VR( 1, KS+1 ), 1 )
-               PROD2 = PROD2 - DDOT( N, VL( 1, KS+1 ), 1, VR( 1, KS ),
+               PROD2 = PROD2 - DDOT( N, VL( 1, KS+1 ), 1, VR( 1,
+     $                               KS ),
      $                 1 )
                RNRM = DLAPY2( DNRM2( N, VR( 1, KS ), 1 ),
      $                DNRM2( N, VR( 1, KS+1 ), 1 ) )
@@ -467,7 +469,8 @@ SUBROUTINE DTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
             CALL DLACPY( 'Full', N, N, T, LDT, WORK, LDWORK )
             IFST = K
             ILST = 1
-            CALL DTREXC( 'No Q', N, WORK, LDWORK, DUMMY, 1, IFST, ILST,
+            CALL DTREXC( 'No Q', N, WORK, LDWORK, DUMMY, 1, IFST,
+     $                   ILST,
      $                   WORK( 1, N+1 ), IERR )
 *
             IF( IERR.EQ.1 .OR. IERR.EQ.2 ) THEN
@@ -535,7 +538,8 @@ SUBROUTINE DTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
                EST = ZERO
                KASE = 0
    50          CONTINUE
-               CALL DLACN2( NN, WORK( 1, N+2 ), WORK( 1, N+4 ), IWORK,
+               CALL DLACN2( NN, WORK( 1, N+2 ), WORK( 1, N+4 ),
+     $                      IWORK,
      $                      EST, KASE, ISAVE )
                IF( KASE.NE.0 ) THEN
                   IF( KASE.EQ.1 ) THEN
@@ -543,7 +547,8 @@ SUBROUTINE DTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
 *                       Real eigenvalue: solve C**T*x = scale*c.
 *
-                        CALL DLAQTR( .TRUE., .TRUE., N-1, WORK( 2, 2 ),
+                        CALL DLAQTR( .TRUE., .TRUE., N-1, WORK( 2,
+     $                               2 ),
      $                               LDWORK, DUMMY, DUMM, SCALE,
      $                               WORK( 1, N+4 ), WORK( 1, N+6 ),
      $                               IERR )
@@ -552,7 +557,8 @@ SUBROUTINE DTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *                       Complex eigenvalue: solve
 *                       C**T*(p+iq) = scale*(c+id) in real arithmetic.
 *
-                        CALL DLAQTR( .TRUE., .FALSE., N-1, WORK( 2, 2 ),
+                        CALL DLAQTR( .TRUE., .FALSE., N-1, WORK( 2,
+     $                               2 ),
      $                               LDWORK, WORK( 1, N+1 ), MU, SCALE,
      $                               WORK( 1, N+4 ), WORK( 1, N+6 ),
      $                               IERR )
@@ -562,7 +568,8 @@ SUBROUTINE DTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
 *                       Real eigenvalue: solve C*x = scale*c.
 *
-                        CALL DLAQTR( .FALSE., .TRUE., N-1, WORK( 2, 2 ),
+                        CALL DLAQTR( .FALSE., .TRUE., N-1, WORK( 2,
+     $                               2 ),
      $                               LDWORK, DUMMY, DUMM, SCALE,
      $                               WORK( 1, N+4 ), WORK( 1, N+6 ),
      $                               IERR )
diff --git a/SRC/dtrsyl.f b/SRC/dtrsyl.f
index ea1fd4f19a..c2bd7bb15a 100644
--- a/SRC/dtrsyl.f
+++ b/SRC/dtrsyl.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTRSYL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtrsyl.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtrsyl.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -156,11 +154,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleSYcomputational
+*> \ingroup trsyl
 *
 *  =====================================================================
       SUBROUTINE DTRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
      $                   LDC, SCALE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -196,7 +195,7 @@ SUBROUTINE DTRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
       EXTERNAL           LSAME, DDOT, DLAMCH, DLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLALN2, DLASY2, DSCAL, XERBLA
+      EXTERNAL           DLALN2, DLASY2, DSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, MAX, MIN
@@ -244,7 +243,6 @@ SUBROUTINE DTRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SMLNUM*DBLE( M*N ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -592,7 +590,8 @@ SUBROUTINE DTRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
                   SUMR = DDOT( L1-1, C( K2, 1 ), LDC, B( 1, L2 ), 1 )
                   VEC( 2, 2 ) = C( K2, L2 ) - ( SUML+SGN*SUMR )
 *
-                  CALL DLASY2( .TRUE., .FALSE., ISGN, 2, 2, A( K1, K1 ),
+                  CALL DLASY2( .TRUE., .FALSE., ISGN, 2, 2, A( K1,
+     $                         K1 ),
      $                         LDA, B( L1, L1 ), LDB, VEC, 2, SCALOC, X,
      $                         2, XNORM, IERR )
                   IF( IERR.NE.0 )
@@ -776,7 +775,8 @@ SUBROUTINE DTRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
      $                   B( L2, MIN( L2+1, N ) ), LDB )
                   VEC( 2, 2 ) = C( K2, L2 ) - ( SUML+SGN*SUMR )
 *
-                  CALL DLASY2( .TRUE., .TRUE., ISGN, 2, 2, A( K1, K1 ),
+                  CALL DLASY2( .TRUE., .TRUE., ISGN, 2, 2, A( K1,
+     $                         K1 ),
      $                         LDA, B( L1, L1 ), LDB, VEC, 2, SCALOC, X,
      $                         2, XNORM, IERR )
                   IF( IERR.NE.0 )
@@ -969,7 +969,8 @@ SUBROUTINE DTRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
      $                   B( L2, MIN( L2+1, N ) ), LDB )
                   VEC( 2, 2 ) = C( K2, L2 ) - ( SUML+SGN*SUMR )
 *
-                  CALL DLASY2( .FALSE., .TRUE., ISGN, 2, 2, A( K1, K1 ),
+                  CALL DLASY2( .FALSE., .TRUE., ISGN, 2, 2, A( K1,
+     $                         K1 ),
      $                         LDA, B( L1, L1 ), LDB, VEC, 2, SCALOC, X,
      $                         2, XNORM, IERR )
                   IF( IERR.NE.0 )
diff --git a/SRC/dtrsyl3.f b/SRC/dtrsyl3.f
new file mode 100644
index 0000000000..79fcf4a013
--- /dev/null
+++ b/SRC/dtrsyl3.f
@@ -0,0 +1,1263 @@
+*> \brief \b DTRSYL3
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DTRSYL3( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB,
+*                           C,
+*                           LDC, SCALE, IWORK, LIWORK, SWORK, LDSWORK,
+*                           INFO )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          TRANA, TRANB
+*       INTEGER            INFO, ISGN, LDA, LDB, LDC, M, N,
+*                          LIWORK, LDSWORK
+*       DOUBLE PRECISION   SCALE
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            IWORK( * )
+*       DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), C( LDC, * ),
+*                          SWORK( LDSWORK, * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*>  DTRSYL3 solves the real Sylvester matrix equation:
+*>
+*>     op(A)*X + X*op(B) = scale*C or
+*>     op(A)*X - X*op(B) = scale*C,
+*>
+*>  where op(A) = A or A**T, and  A and B are both upper quasi-
+*>  triangular. A is M-by-M and B is N-by-N; the right hand side C and
+*>  the solution X are M-by-N; and scale is an output scale factor, set
+*>  <= 1 to avoid overflow in X.
+*>
+*>  A and B must be in Schur canonical form (as returned by DHSEQR), that
+*>  is, block upper triangular with 1-by-1 and 2-by-2 diagonal blocks;
+*>  each 2-by-2 diagonal block has its diagonal elements equal and its
+*>  off-diagonal elements of opposite sign.
+*>
+*>  This is the block version of the algorithm.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] TRANA
+*> \verbatim
+*>          TRANA is CHARACTER*1
+*>          Specifies the option op(A):
+*>          = 'N': op(A) = A    (No transpose)
+*>          = 'T': op(A) = A**T (Transpose)
+*>          = 'C': op(A) = A**H (Conjugate transpose = Transpose)
+*> \endverbatim
+*>
+*> \param[in] TRANB
+*> \verbatim
+*>          TRANB is CHARACTER*1
+*>          Specifies the option op(B):
+*>          = 'N': op(B) = B    (No transpose)
+*>          = 'T': op(B) = B**T (Transpose)
+*>          = 'C': op(B) = B**H (Conjugate transpose = Transpose)
+*> \endverbatim
+*>
+*> \param[in] ISGN
+*> \verbatim
+*>          ISGN is INTEGER
+*>          Specifies the sign in the equation:
+*>          = +1: solve op(A)*X + X*op(B) = scale*C
+*>          = -1: solve op(A)*X - X*op(B) = scale*C
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The order of the matrix A, and the number of rows in the
+*>          matrices X and C. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix B, and the number of columns in the
+*>          matrices X and C. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA,M)
+*>          The upper quasi-triangular matrix A, in Schur canonical form.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in] B
+*> \verbatim
+*>          B is DOUBLE PRECISION array, dimension (LDB,N)
+*>          The upper quasi-triangular matrix B, in Schur canonical form.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= max(1,N).
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is DOUBLE PRECISION array, dimension (LDC,N)
+*>          On entry, the M-by-N right hand side matrix C.
+*>          On exit, C is overwritten by the solution matrix X.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M)
+*> \endverbatim
+*>
+*> \param[out] SCALE
+*> \verbatim
+*>          SCALE is DOUBLE PRECISION
+*>          The scale factor, scale, set <= 1 to avoid overflow in X.
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (MAX(1,LIWORK))
+*>          On exit, if INFO = 0, IWORK(1) returns the optimal LIWORK.
+*> \endverbatim
+*>
+*> \param[in] LIWORK
+*> \verbatim
+*>          IWORK is INTEGER
+*>          The dimension of the array IWORK. LIWORK >=  ((M + NB - 1) / NB + 1)
+*>          + ((N + NB - 1) / NB + 1), where NB is the optimal block size.
+*>
+*>          If LIWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal dimension of the IWORK array,
+*>          returns this value as the first entry of the IWORK array, and
+*>          no error message related to LIWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] SWORK
+*> \verbatim
+*>          SWORK is DOUBLE PRECISION array, dimension (MAX(2, ROWS),
+*>          MAX(1,COLS)).
+*>          On exit, if INFO = 0, SWORK(1) returns the optimal value ROWS
+*>          and SWORK(2) returns the optimal COLS.
+*> \endverbatim
+*>
+*> \param[in] LDSWORK
+*> \verbatim
+*>          LDSWORK is INTEGER
+*>          LDSWORK >= MAX(2,ROWS), where ROWS = ((M + NB - 1) / NB + 1)
+*>          and NB is the optimal block size.
+*>
+*>          If LDSWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal dimensions of the SWORK matrix,
+*>          returns these values as the first and second entry of the SWORK
+*>          matrix, and no error message related LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0: successful exit
+*>          < 0: if INFO = -i, the i-th argument had an illegal value
+*>          = 1: A and B have common or very close eigenvalues; perturbed
+*>               values were used to solve the equation (but the matrices
+*>               A and B are unchanged).
+*> \endverbatim
+*
+*> \ingroup trsyl3
+*
+*  =====================================================================
+*  References:
+*   E. S. Quintana-Orti and R. A. Van De Geijn (2003). Formal derivation of
+*   algorithms: The triangular Sylvester equation, ACM Transactions
+*   on Mathematical Software (TOMS), volume 29, pages 218--243.
+*
+*   A. Schwarz and C. C. Kjelgaard Mikkelsen (2020). Robust Task-Parallel
+*   Solution of the Triangular Sylvester Equation. Lecture Notes in
+*   Computer Science, vol 12043, pages 82--92, Springer.
+*
+*  Contributor:
+*   Angelika Schwarz, Umea University, Sweden.
+*
+*  =====================================================================
+      SUBROUTINE DTRSYL3( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB,
+     $                    C, LDC, SCALE, IWORK, LIWORK, SWORK,
+     $                    LDSWORK, INFO )
+      IMPLICIT NONE
+*
+*     .. Scalar Arguments ..
+      CHARACTER          TRANA, TRANB
+      INTEGER            INFO, ISGN, LDA, LDB, LDC, M, N,
+     $                   LIWORK, LDSWORK
+      DOUBLE PRECISION   SCALE
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IWORK( * )
+      DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), C( LDC, * ),
+     $                   SWORK( LDSWORK, * )
+*     ..
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            NOTRNA, NOTRNB, LQUERY, SKIP
+      INTEGER            AWRK, BWRK, I, I1, I2, IINFO, J, J1, J2, JJ,
+     $                   K, K1, K2, L, L1, L2, LL, NBA, NB, NBB, PC
+      DOUBLE PRECISION   ANRM, BIGNUM, BNRM, CNRM, SCAL, SCALOC,
+     $                   SCAMIN, SGN, XNRM, BUF, SMLNUM
+*     ..
+*     .. Local Arrays ..
+      DOUBLE PRECISION   WNRM( MAX( M, N ) )
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      DOUBLE PRECISION   DLANGE, DLAMCH, DLARMM
+      EXTERNAL           DLANGE, DLAMCH, DLARMM, ILAENV,
+     $                   LSAME
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DGEMM, DLASCL, DSCAL, DTRSYL,
+     $                   XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, EXPONENT, MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Decode and Test input parameters
+*
+      NOTRNA = LSAME( TRANA, 'N' )
+      NOTRNB = LSAME( TRANB, 'N' )
+*
+*     Use the same block size for all matrices.
+*
+      NB = MAX(8, ILAENV( 1, 'DTRSYL', '', M, N, -1, -1) )
+*
+*     Compute number of blocks in A and B
+*
+      NBA = MAX( 1, (M + NB - 1) / NB )
+      NBB = MAX( 1, (N + NB - 1) / NB )
+*
+*     Compute workspace
+*
+      INFO = 0
+      LQUERY = ( LIWORK.EQ.-1 .OR. LDSWORK.EQ.-1 )
+      IWORK( 1 ) = NBA + NBB + 2
+      IF( LQUERY ) THEN
+         LDSWORK = 2
+         SWORK( 1, 1 ) = MAX( NBA, NBB )
+         SWORK( 2, 1 ) = 2 * NBB + NBA
+      END IF
+*
+*     Test the input arguments
+*
+      IF( .NOT.NOTRNA .AND. .NOT.LSAME( TRANA, 'T' ) .AND. .NOT.
+     $    LSAME( TRANA, 'C' ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.NOTRNB .AND. .NOT.LSAME( TRANB, 'T' ) .AND. .NOT.
+     $         LSAME( TRANB, 'C' ) ) THEN
+         INFO = -2
+      ELSE IF( ISGN.NE.1 .AND. ISGN.NE.-1 ) THEN
+         INFO = -3
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -5
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -7
+      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+         INFO = -9
+      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
+         INFO = -11
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'DTRSYL3', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      SCALE = ONE
+      IF( M.EQ.0 .OR. N.EQ.0 )
+     $   RETURN
+*
+*     Use unblocked code for small problems or if insufficient
+*     workspaces are provided
+*
+      IF( MIN( NBA, NBB ).EQ.1 .OR. LDSWORK.LT.MAX( NBA, NBB ) .OR.
+     $    LIWORK.LT.IWORK(1) ) THEN
+        CALL DTRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB,
+     $               C, LDC, SCALE, INFO )
+        RETURN
+      END IF
+*
+*     Set constants to control overflow
+*
+      SMLNUM = DLAMCH( 'S' )
+      BIGNUM = ONE / SMLNUM
+*
+*      Partition A such that 2-by-2 blocks on the diagonal are not split
+*
+       SKIP = .FALSE.
+       DO I = 1, NBA
+          IWORK( I ) = ( I - 1 ) * NB + 1
+       END DO
+       IWORK( NBA + 1 ) = M + 1
+       DO K = 1, NBA
+          L1 = IWORK( K )
+          L2 = IWORK( K + 1 ) - 1
+          DO L = L1, L2
+             IF( SKIP ) THEN
+                SKIP = .FALSE.
+                CYCLE
+             END IF
+             IF( L.GE.M ) THEN
+*               A( M, M ) is a 1-by-1 block
+                CYCLE
+             END IF
+             IF( A( L, L+1 ).NE.ZERO .AND. A( L+1, L ).NE.ZERO ) THEN
+*               Check if 2-by-2 block is split
+                IF( L + 1 .EQ. IWORK( K + 1 ) ) THEN
+                   IWORK( K + 1 ) = IWORK( K + 1 ) + 1
+                   CYCLE
+                END IF
+                SKIP = .TRUE.
+             END IF
+          END DO
+       END DO
+       IWORK( NBA + 1 ) = M + 1
+       IF( IWORK( NBA ).GE.IWORK( NBA + 1 ) ) THEN
+          IWORK( NBA ) = IWORK( NBA + 1 )
+          NBA = NBA - 1
+       END IF
+*
+*      Partition B such that 2-by-2 blocks on the diagonal are not split
+*
+       PC = NBA + 1
+       SKIP = .FALSE.
+       DO I = 1, NBB
+          IWORK( PC + I ) = ( I - 1 ) * NB + 1
+       END DO
+       IWORK( PC + NBB + 1 ) = N + 1
+       DO K = 1, NBB
+          L1 = IWORK( PC + K )
+          L2 = IWORK( PC + K + 1 ) - 1
+          DO L = L1, L2
+             IF( SKIP ) THEN
+                SKIP = .FALSE.
+                CYCLE
+             END IF
+             IF( L.GE.N ) THEN
+*               B( N, N ) is a 1-by-1 block
+                CYCLE
+             END IF
+             IF( B( L, L+1 ).NE.ZERO .AND. B( L+1, L ).NE.ZERO ) THEN
+*               Check if 2-by-2 block is split
+                IF( L + 1 .EQ. IWORK( PC + K + 1 ) ) THEN
+                   IWORK( PC + K + 1 ) = IWORK( PC + K + 1 ) + 1
+                   CYCLE
+                END IF
+                SKIP = .TRUE.
+             END IF
+          END DO
+       END DO
+       IWORK( PC + NBB + 1 ) = N + 1
+       IF( IWORK( PC + NBB ).GE.IWORK( PC + NBB + 1 ) ) THEN
+          IWORK( PC + NBB ) = IWORK( PC + NBB + 1 )
+          NBB = NBB - 1
+       END IF
+*
+*     Set local scaling factors - must never attain zero.
+*
+      DO L = 1, NBB
+         DO K = 1, NBA
+            SWORK( K, L ) = ONE
+         END DO
+      END DO
+*
+*     Fallback scaling factor to prevent flushing of SWORK( K, L ) to zero.
+*     This scaling is to ensure compatibility with TRSYL and may get flushed.
+*
+      BUF = ONE
+*
+*     Compute upper bounds of blocks of A and B
+*
+      AWRK = NBB
+      DO K = 1, NBA
+         K1 = IWORK( K )
+         K2 = IWORK( K + 1 )
+         DO L = K, NBA
+            L1 = IWORK( L )
+            L2 = IWORK( L + 1 )
+            IF( NOTRNA ) THEN
+               SWORK( K, AWRK + L ) = DLANGE( 'I', K2-K1, L2-L1,
+     $                                        A( K1, L1 ), LDA, WNRM )
+            ELSE
+               SWORK( L, AWRK + K ) = DLANGE( '1', K2-K1, L2-L1,
+     $                                        A( K1, L1 ), LDA, WNRM )
+            END IF
+         END DO
+      END DO
+      BWRK = NBB + NBA
+      DO K = 1, NBB
+         K1 = IWORK( PC + K )
+         K2 = IWORK( PC + K + 1 )
+         DO L = K, NBB
+            L1 = IWORK( PC + L )
+            L2 = IWORK( PC + L + 1 )
+            IF( NOTRNB ) THEN
+               SWORK( K, BWRK + L ) = DLANGE( 'I', K2-K1, L2-L1,
+     $                                        B( K1, L1 ), LDB, WNRM )
+            ELSE
+               SWORK( L, BWRK + K ) = DLANGE( '1', K2-K1, L2-L1,
+     $                                        B( K1, L1 ), LDB, WNRM )
+            END IF
+         END DO
+      END DO
+*
+      SGN = DBLE( ISGN )
+*
+      IF( NOTRNA .AND. NOTRNB ) THEN
+*
+*        Solve    A*X + ISGN*X*B = scale*C.
+*
+*        The (K,L)th block of X is determined starting from
+*        bottom-left corner column by column by
+*
+*         A(K,K)*X(K,L) + ISGN*X(K,L)*B(L,L) = C(K,L) - R(K,L)
+*
+*        Where
+*                  M                         L-1
+*        R(K,L) = SUM [A(K,I)*X(I,L)] + ISGN*SUM [X(K,J)*B(J,L)].
+*                I=K+1                       J=1
+*
+*        Start loop over block rows (index = K) and block columns (index = L)
+*
+         DO K = NBA, 1, -1
+*
+*           K1: row index of the first row in X( K, L )
+*           K2: row index of the first row in X( K+1, L )
+*           so the K2 - K1 is the column count of the block X( K, L )
+*
+            K1 = IWORK( K )
+            K2 = IWORK( K + 1 )
+            DO L = 1, NBB
+*
+*              L1: column index of the first column in X( K, L )
+*              L2: column index of the first column in X( K, L + 1)
+*              so that L2 - L1 is the row count of the block X( K, L )
+*
+               L1 = IWORK( PC + L )
+               L2 = IWORK( PC + L + 1 )
+*
+               CALL DTRSYL( TRANA, TRANB, ISGN, K2-K1, L2-L1,
+     $                      A( K1, K1 ), LDA,
+     $                      B( L1, L1 ), LDB,
+     $                      C( K1, L1 ), LDC, SCALOC, IINFO )
+               INFO = MAX( INFO, IINFO )
+*
+               IF ( SCALOC * SWORK( K, L ) .EQ. ZERO ) THEN
+                  IF( SCALOC .EQ. ZERO ) THEN
+*                    The magnitude of the largest entry of X(K1:K2-1, L1:L2-1)
+*                    is larger than the product of BIGNUM**2 and cannot be
+*                    represented in the form (1/SCALE)*X(K1:K2-1, L1:L2-1).
+*                    Mark the computation as pointless.
+                     BUF = ZERO
+                  ELSE
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                  END IF
+                  DO JJ = 1, NBB
+                     DO LL = 1, NBA
+*                       Bound by BIGNUM to not introduce Inf. The value
+*                       is irrelevant; corresponding entries of the
+*                       solution will be flushed in consistency scaling.
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                     END DO
+                  END DO
+               END IF
+               SWORK( K, L ) = SCALOC * SWORK( K, L )
+               XNRM = DLANGE( 'I', K2-K1, L2-L1, C( K1, L1 ), LDC,
+     $                        WNRM )
+*
+               DO I = K - 1, 1, -1
+*
+*                 C( I, L ) := C( I, L ) - A( I, K ) * C( K, L )
+*
+                  I1 = IWORK( I )
+                  I2 = IWORK( I + 1 )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = DLANGE( 'I', I2-I1, L2-L1, C( I1, L1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( I, L ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( I, L ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  ANRM = SWORK( I, AWRK + K )
+                  SCALOC = DLARMM( ANRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.D0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.D0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( I, L ) and C( K, L ).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF (SCAL .NE. ONE) THEN
+                      DO JJ = L1, L2-1
+                         CALL DSCAL( K2-K1, SCAL, C( K1, JJ ), 1)
+                      END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( I, L ) ) * SCALOC
+                  IF (SCAL .NE. ONE) THEN
+                      DO LL = L1, L2-1
+                         CALL DSCAL( I2-I1, SCAL, C( I1, LL ), 1)
+                      END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( I, L ) = SCAMIN * SCALOC
+*
+                  CALL DGEMM( 'N', 'N', I2-I1, L2-L1, K2-K1, -ONE,
+     $                        A( I1, K1 ), LDA, C( K1, L1 ), LDC,
+     $                        ONE, C( I1, L1 ), LDC )
+*
+               END DO
+*
+               DO J = L + 1, NBB
+*
+*                 C( K, J ) := C( K, J ) - SGN * C( K, L ) * B( L, J )
+*
+                  J1 = IWORK( PC + J )
+                  J2 = IWORK( PC + J + 1 )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = DLANGE( 'I', K2-K1, J2-J1, C( K1, J1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( K, J ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( K, J ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  BNRM = SWORK(L, BWRK + J)
+                  SCALOC = DLARMM( BNRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.D0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.D0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( K, J ) and C( K, L).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL DSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( K, J ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                      DO JJ = J1, J2-1
+                         CALL DSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                      END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( K, J ) = SCAMIN * SCALOC
+*
+                  CALL DGEMM( 'N', 'N', K2-K1, J2-J1, L2-L1, -SGN,
+     $                        C( K1, L1 ), LDC, B( L1, J1 ), LDB,
+     $                        ONE, C( K1, J1 ), LDC )
+               END DO
+            END DO
+         END DO
+      ELSE IF( .NOT.NOTRNA .AND. NOTRNB ) THEN
+*
+*        Solve    A**T*X + ISGN*X*B = scale*C.
+*
+*        The (K,L)th block of X is determined starting from
+*        upper-left corner column by column by
+*
+*          A(K,K)**T*X(K,L) + ISGN*X(K,L)*B(L,L) = C(K,L) - R(K,L)
+*
+*        Where
+*                   K-1                        L-1
+*          R(K,L) = SUM [A(I,K)**T*X(I,L)] +ISGN*SUM [X(K,J)*B(J,L)]
+*                   I=1                        J=1
+*
+*        Start loop over block rows (index = K) and block columns (index = L)
+*
+         DO K = 1, NBA
+*
+*           K1: row index of the first row in X( K, L )
+*           K2: row index of the first row in X( K+1, L )
+*           so the K2 - K1 is the column count of the block X( K, L )
+*
+            K1 = IWORK( K )
+            K2 = IWORK( K + 1 )
+            DO L = 1, NBB
+*
+*              L1: column index of the first column in X( K, L )
+*              L2: column index of the first column in X( K, L + 1)
+*              so that L2 - L1 is the row count of the block X( K, L )
+*
+               L1 = IWORK( PC + L )
+               L2 = IWORK( PC + L + 1 )
+*
+               CALL DTRSYL( TRANA, TRANB, ISGN, K2-K1, L2-L1,
+     $                      A( K1, K1 ), LDA,
+     $                      B( L1, L1 ), LDB,
+     $                      C( K1, L1 ), LDC, SCALOC, IINFO )
+               INFO = MAX( INFO, IINFO )
+*
+               IF( SCALOC * SWORK( K, L ) .EQ. ZERO ) THEN
+                  IF( SCALOC .EQ. ZERO ) THEN
+*                    The magnitude of the largest entry of X(K1:K2-1, L1:L2-1)
+*                    is larger than the product of BIGNUM**2 and cannot be
+*                    represented in the form (1/SCALE)*X(K1:K2-1, L1:L2-1).
+*                    Mark the computation as pointless.
+                     BUF = ZERO
+                  ELSE
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                  END IF
+                  DO JJ = 1, NBB
+                     DO LL = 1, NBA
+*                       Bound by BIGNUM to not introduce Inf. The value
+*                       is irrelevant; corresponding entries of the
+*                       solution will be flushed in consistency scaling.
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                     END DO
+                  END DO
+               END IF
+               SWORK( K, L ) = SCALOC * SWORK( K, L )
+               XNRM = DLANGE( 'I', K2-K1, L2-L1, C( K1, L1 ), LDC,
+     $                        WNRM )
+*
+               DO I = K + 1, NBA
+*
+*                 C( I, L ) := C( I, L ) - A( K, I )**T * C( K, L )
+*
+                  I1 = IWORK( I )
+                  I2 = IWORK( I + 1 )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = DLANGE( 'I', I2-I1, L2-L1, C( I1, L1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( I, L ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( I, L ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  ANRM = SWORK( I, AWRK + K )
+                  SCALOC = DLARMM( ANRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.D0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.D0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to to C( I, L ) and C( K, L ).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF (SCAL .NE. ONE) THEN
+                     DO LL = L1, L2-1
+                        CALL DSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( I, L ) ) * SCALOC
+                  IF (SCAL .NE. ONE) THEN
+                     DO LL = L1, L2-1
+                        CALL DSCAL( I2-I1, SCAL, C( I1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( I, L ) = SCAMIN * SCALOC
+*
+                  CALL DGEMM( 'T', 'N', I2-I1, L2-L1, K2-K1, -ONE,
+     $                        A( K1, I1 ), LDA, C( K1, L1 ), LDC,
+     $                        ONE, C( I1, L1 ), LDC )
+               END DO
+*
+               DO J = L + 1, NBB
+*
+*                 C( K, J ) := C( K, J ) - SGN * C( K, L ) * B( L, J )
+*
+                  J1 = IWORK( PC + J )
+                  J2 = IWORK( PC + J + 1 )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = DLANGE( 'I', K2-K1, J2-J1, C( K1, J1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( K, J ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( K, J ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  BNRM = SWORK( L, BWRK + J )
+                  SCALOC = DLARMM( BNRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.D0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.D0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to to C( K, J ) and C( K, L ).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                      DO LL = L1, L2-1
+                         CALL DSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                      END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( K, J ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO JJ = J1, J2-1
+                        CALL DSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( K, J ) = SCAMIN * SCALOC
+*
+                  CALL DGEMM( 'N', 'N', K2-K1, J2-J1, L2-L1, -SGN,
+     $                        C( K1, L1 ), LDC, B( L1, J1 ), LDB,
+     $                        ONE, C( K1, J1 ), LDC )
+               END DO
+            END DO
+         END DO
+      ELSE IF( .NOT.NOTRNA .AND. .NOT.NOTRNB ) THEN
+*
+*        Solve    A**T*X + ISGN*X*B**T = scale*C.
+*
+*        The (K,L)th block of X is determined starting from
+*        top-right corner column by column by
+*
+*           A(K,K)**T*X(K,L) + ISGN*X(K,L)*B(L,L)**T = C(K,L) - R(K,L)
+*
+*        Where
+*                     K-1                          N
+*            R(K,L) = SUM [A(I,K)**T*X(I,L)] + ISGN*SUM [X(K,J)*B(L,J)**T].
+*                     I=1                        J=L+1
+*
+*        Start loop over block rows (index = K) and block columns (index = L)
+*
+         DO K = 1, NBA
+*
+*           K1: row index of the first row in X( K, L )
+*           K2: row index of the first row in X( K+1, L )
+*           so the K2 - K1 is the column count of the block X( K, L )
+*
+            K1 = IWORK( K )
+            K2 = IWORK( K + 1 )
+            DO L = NBB, 1, -1
+*
+*              L1: column index of the first column in X( K, L )
+*              L2: column index of the first column in X( K, L + 1)
+*              so that L2 - L1 is the row count of the block X( K, L )
+*
+               L1 = IWORK( PC + L )
+               L2 = IWORK( PC + L + 1 )
+*
+               CALL DTRSYL( TRANA, TRANB, ISGN, K2-K1, L2-L1,
+     $                      A( K1, K1 ), LDA,
+     $                      B( L1, L1 ), LDB,
+     $                      C( K1, L1 ), LDC, SCALOC, IINFO )
+               INFO = MAX( INFO, IINFO )
+*
+               SWORK( K, L ) = SCALOC * SWORK( K, L )
+               IF( SCALOC * SWORK( K, L ) .EQ. ZERO ) THEN
+                  IF( SCALOC .EQ. ZERO ) THEN
+*                    The magnitude of the largest entry of X(K1:K2-1, L1:L2-1)
+*                    is larger than the product of BIGNUM**2 and cannot be
+*                    represented in the form (1/SCALE)*X(K1:K2-1, L1:L2-1).
+*                    Mark the computation as pointless.
+                     BUF = ZERO
+                  ELSE
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                  END IF
+                  DO JJ = 1, NBB
+                     DO LL = 1, NBA
+*                       Bound by BIGNUM to not introduce Inf. The value
+*                       is irrelevant; corresponding entries of the
+*                       solution will be flushed in consistency scaling.
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                     END DO
+                  END DO
+               END IF
+               XNRM = DLANGE( 'I', K2-K1, L2-L1, C( K1, L1 ), LDC,
+     $                        WNRM )
+*
+               DO I = K + 1, NBA
+*
+*                 C( I, L ) := C( I, L ) - A( K, I )**T * C( K, L )
+*
+                  I1 = IWORK( I )
+                  I2 = IWORK( I + 1 )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = DLANGE( 'I', I2-I1, L2-L1, C( I1, L1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( I, L ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( I, L ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  ANRM = SWORK( I, AWRK + K )
+                  SCALOC = DLARMM( ANRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.D0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.D0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( I, L ) and C( K, L ).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF (SCAL .NE. ONE) THEN
+                     DO LL = L1, L2-1
+                        CALL DSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( I, L ) ) * SCALOC
+                  IF (SCAL .NE. ONE) THEN
+                     DO LL = L1, L2-1
+                        CALL DSCAL( I2-I1, SCAL, C( I1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( I, L ) = SCAMIN * SCALOC
+*
+                  CALL DGEMM( 'T', 'N', I2-I1, L2-L1, K2-K1, -ONE,
+     $                        A( K1, I1 ), LDA, C( K1, L1 ), LDC,
+     $                        ONE, C( I1, L1 ), LDC )
+               END DO
+*
+               DO J = 1, L - 1
+*
+*                 C( K, J ) := C( K, J ) - SGN * C( K, L ) * B( J, L )**T
+*
+                  J1 = IWORK( PC + J )
+                  J2 = IWORK( PC + J + 1 )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = DLANGE( 'I', K2-K1, J2-J1, C( K1, J1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( K, J ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( K, J ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  BNRM = SWORK( L, BWRK + J )
+                  SCALOC = DLARMM( BNRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.D0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.D0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( K, J ) and C( K, L ).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL DSCAL( K2-K1, SCAL, C( K1, LL ), 1)
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( K, J ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO JJ = J1, J2-1
+                        CALL DSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( K, J ) = SCAMIN * SCALOC
+*
+                  CALL DGEMM( 'N', 'T', K2-K1, J2-J1, L2-L1, -SGN,
+     $                        C( K1, L1 ), LDC, B( J1, L1 ), LDB,
+     $                        ONE, C( K1, J1 ), LDC )
+               END DO
+            END DO
+         END DO
+      ELSE IF( NOTRNA .AND. .NOT.NOTRNB ) THEN
+*
+*        Solve    A*X + ISGN*X*B**T = scale*C.
+*
+*        The (K,L)th block of X is determined starting from
+*        bottom-right corner column by column by
+*
+*            A(K,K)*X(K,L) + ISGN*X(K,L)*B(L,L)**T = C(K,L) - R(K,L)
+*
+*        Where
+*                      M                          N
+*            R(K,L) = SUM [A(K,I)*X(I,L)] + ISGN*SUM [X(K,J)*B(L,J)**T].
+*                    I=K+1                      J=L+1
+*
+*        Start loop over block rows (index = K) and block columns (index = L)
+*
+         DO K = NBA, 1, -1
+*
+*           K1: row index of the first row in X( K, L )
+*           K2: row index of the first row in X( K+1, L )
+*           so the K2 - K1 is the column count of the block X( K, L )
+*
+            K1 = IWORK( K )
+            K2 = IWORK( K + 1 )
+            DO L = NBB, 1, -1
+*
+*              L1: column index of the first column in X( K, L )
+*              L2: column index of the first column in X( K, L + 1)
+*              so that L2 - L1 is the row count of the block X( K, L )
+*
+               L1 = IWORK( PC + L )
+               L2 = IWORK( PC + L + 1 )
+*
+               CALL DTRSYL( TRANA, TRANB, ISGN, K2-K1, L2-L1,
+     $                      A( K1, K1 ), LDA,
+     $                      B( L1, L1 ), LDB,
+     $                      C( K1, L1 ), LDC, SCALOC, IINFO )
+               INFO = MAX( INFO, IINFO )
+*
+               IF( SCALOC * SWORK( K, L ) .EQ. ZERO ) THEN
+                  IF( SCALOC .EQ. ZERO ) THEN
+*                    The magnitude of the largest entry of X(K1:K2-1, L1:L2-1)
+*                    is larger than the product of BIGNUM**2 and cannot be
+*                    represented in the form (1/SCALE)*X(K1:K2-1, L1:L2-1).
+*                    Mark the computation as pointless.
+                     BUF = ZERO
+                  ELSE
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                  END IF
+                  DO JJ = 1, NBB
+                     DO LL = 1, NBA
+*                       Bound by BIGNUM to not introduce Inf. The value
+*                       is irrelevant; corresponding entries of the
+*                       solution will be flushed in consistency scaling.
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                     END DO
+                  END DO
+               END IF
+               SWORK( K, L ) = SCALOC * SWORK( K, L )
+               XNRM = DLANGE( 'I', K2-K1, L2-L1, C( K1, L1 ), LDC,
+     $                        WNRM )
+*
+               DO I = 1, K - 1
+*
+*                 C( I, L ) := C( I, L ) - A( I, K ) * C( K, L )
+*
+                  I1 = IWORK( I )
+                  I2 = IWORK( I + 1 )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = DLANGE( 'I', I2-I1, L2-L1, C( I1, L1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( I, L ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( I, L ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  ANRM = SWORK( I, AWRK + K )
+                  SCALOC = DLARMM( ANRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.D0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.D0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( I, L ) and C( K, L ).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF (SCAL .NE. ONE) THEN
+                     DO LL = L1, L2-1
+                        CALL DSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( I, L ) ) * SCALOC
+                  IF (SCAL .NE. ONE) THEN
+                     DO LL = L1, L2-1
+                        CALL DSCAL( I2-I1, SCAL, C( I1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( I, L ) = SCAMIN * SCALOC
+*
+                  CALL DGEMM( 'N', 'N', I2-I1, L2-L1, K2-K1, -ONE,
+     $                        A( I1, K1 ), LDA, C( K1, L1 ), LDC,
+     $                        ONE, C( I1, L1 ), LDC )
+*
+               END DO
+*
+               DO J = 1, L - 1
+*
+*                 C( K, J ) := C( K, J ) - SGN * C( K, L ) * B( J, L )**T
+*
+                  J1 = IWORK( PC + J )
+                  J2 = IWORK( PC + J + 1 )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = DLANGE( 'I', K2-K1, J2-J1, C( K1, J1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( K, J ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( K, J ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  BNRM = SWORK( L, BWRK + J )
+                  SCALOC = DLARMM( BNRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.D0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.D0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( K, J ) and C( K, L ).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO JJ = L1, L2-1
+                        CALL DSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( K, J ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO JJ = J1, J2-1
+                        CALL DSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( K, J ) = SCAMIN * SCALOC
+*
+                  CALL DGEMM( 'N', 'T', K2-K1, J2-J1, L2-L1, -SGN,
+     $                        C( K1, L1 ), LDC, B( J1, L1 ), LDB,
+     $                        ONE, C( K1, J1 ), LDC )
+               END DO
+            END DO
+         END DO
+*
+      END IF
+*
+*     Reduce local scaling factors
+*
+      SCALE = SWORK( 1, 1 )
+      DO K = 1, NBA
+         DO L = 1, NBB
+            SCALE = MIN( SCALE, SWORK( K, L ) )
+         END DO
+      END DO
+*
+      IF( SCALE .EQ. ZERO ) THEN
+*
+*        The magnitude of the largest entry of the solution is larger
+*        than the product of BIGNUM**2 and cannot be represented in the
+*        form (1/SCALE)*X if SCALE is DOUBLE PRECISION. Set SCALE to
+*        zero and give up.
+*
+         IWORK(1) = NBA + NBB + 2
+         SWORK(1,1) = MAX( NBA, NBB )
+         SWORK(2,1) = 2 * NBB + NBA
+         RETURN
+      END IF
+*
+*     Realize consistent scaling
+*
+      DO K = 1, NBA
+         K1 = IWORK( K )
+         K2 = IWORK( K + 1 )
+         DO L = 1, NBB
+            L1 = IWORK( PC + L )
+            L2 = IWORK( PC + L + 1 )
+            SCAL = SCALE / SWORK( K, L )
+            IF( SCAL .NE. ONE ) THEN
+               DO LL = L1, L2-1
+                  CALL DSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+               END DO
+            ENDIF
+         END DO
+      END DO
+*
+      IF( BUF .NE. ONE .AND. BUF.GT.ZERO ) THEN
+*
+*        Decrease SCALE as much as possible.
+*
+         SCALOC = MIN( SCALE / SMLNUM, ONE / BUF )
+         BUF = BUF * SCALOC
+         SCALE = SCALE / SCALOC
+      END IF
+
+      IF( BUF.NE.ONE .AND. BUF.GT.ZERO ) THEN
+*
+*        In case of overly aggressive scaling during the computation,
+*        flushing of the global scale factor may be prevented by
+*        undoing some of the scaling. This step is to ensure that
+*        this routine flushes only scale factors that TRSYL also
+*        flushes and be usable as a drop-in replacement.
+*
+*        How much can the normwise largest entry be upscaled?
+*
+         SCAL = C( 1, 1 )
+         DO K = 1, M
+            DO L = 1, N
+               SCAL = MAX( SCAL, ABS( C( K, L ) ) )
+            END DO
+         END DO
+*
+*        Increase BUF as close to 1 as possible and apply scaling.
+*
+         SCALOC = MIN( BIGNUM / SCAL, ONE / BUF )
+         BUF = BUF * SCALOC
+         CALL DLASCL( 'G', -1, -1, ONE, SCALOC, M, N, C, LDC,
+     $               IWORK(1) )
+      END IF
+*
+*     Combine with buffer scaling factor. SCALE will be flushed if
+*     BUF is less than one here.
+*
+      SCALE = SCALE * BUF
+*
+*     Restore workspace dimensions
+*
+      IWORK(1) = NBA + NBB + 2
+      SWORK(1,1) = MAX( NBA, NBB )
+      SWORK(2,1) = 2 * NBB + NBA
+*
+      RETURN
+*
+*     End of DTRSYL3
+*
+      END
diff --git a/SRC/dtrti2.f b/SRC/dtrti2.f
index 0d9115554c..d57fcda994 100644
--- a/SRC/dtrti2.f
+++ b/SRC/dtrti2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTRTI2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtrti2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtrti2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -103,10 +101,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup trti2
 *
 *  =====================================================================
       SUBROUTINE DTRTI2( UPLO, DIAG, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dtrtri.f b/SRC/dtrtri.f
index 1cf9a9aafb..6eced55339 100644
--- a/SRC/dtrtri.f
+++ b/SRC/dtrtri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTRTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtrtri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtrtri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup trtri
 *
 *  =====================================================================
       SUBROUTINE DTRTRI( UPLO, DIAG, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -197,9 +196,11 @@ SUBROUTINE DTRTRI( UPLO, DIAG, N, A, LDA, INFO )
 *
 *              Compute rows 1:j-1 of current block column
 *
-               CALL DTRMM( 'Left', 'Upper', 'No transpose', DIAG, J-1,
+               CALL DTRMM( 'Left', 'Upper', 'No transpose', DIAG,
+     $                     J-1,
      $                     JB, ONE, A, LDA, A( 1, J ), LDA )
-               CALL DTRSM( 'Right', 'Upper', 'No transpose', DIAG, J-1,
+               CALL DTRSM( 'Right', 'Upper', 'No transpose', DIAG,
+     $                     J-1,
      $                     JB, -ONE, A( J, J ), LDA, A( 1, J ), LDA )
 *
 *              Compute inverse of current diagonal block
diff --git a/SRC/dtrtrs.f b/SRC/dtrtrs.f
index d82f31d0b4..806282652c 100644
--- a/SRC/dtrtrs.f
+++ b/SRC/dtrtrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTRTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtrtrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtrtrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -39,8 +37,14 @@
 *>
 *>    A * X = B  or  A**T * X = B,
 *>
-*> where A is a triangular matrix of order N, and B is an N-by-NRHS
-*> matrix.  A check is made to verify that A is nonsingular.
+*> where A is a triangular matrix of order N, and B is an N-by-NRHS matrix.
+*>
+*> This subroutine verifies that A is nonsingular, but callers should note that only exact
+*> singularity is detected. It is conceivable for one or more diagonal elements of A to be
+*> subnormally tiny numbers without this subroutine signalling an error.
+*>
+*> If a possible loss of numerical precision due to near-singular matrices is a concern, the
+*> caller should verify that A is nonsingular within some tolerance before calling this subroutine.
 *> \endverbatim
 *
 *  Arguments:
@@ -119,7 +123,7 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0: if INFO = -i, the i-th argument had an illegal value
-*>          > 0: if INFO = i, the i-th diagonal element of A is zero,
+*>          > 0:  if INFO = i, the i-th diagonal element of A is exactly zero,
 *>               indicating that the matrix is singular and the solutions
 *>               X have not been computed.
 *> \endverbatim
@@ -132,11 +136,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup trtrs
 *
 *  =====================================================================
       SUBROUTINE DTRTRS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -175,10 +180,12 @@ SUBROUTINE DTRTRS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB,
 *
       INFO = 0
       NOUNIT = LSAME( DIAG, 'N' )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.
-     $         LSAME( TRANS, 'T' ) .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+     $         LSAME( TRANS, 'T' ) .AND.
+     $                .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -2
       ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
          INFO = -3
diff --git a/SRC/dtrttf.f b/SRC/dtrttf.f
index 4e4b5ee556..2cb51164fd 100644
--- a/SRC/dtrttf.f
+++ b/SRC/dtrttf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTRTTF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtrttf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtrttf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -100,7 +98,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup trttf
 *
 *> \par Further Details:
 *  =====================
@@ -191,6 +189,7 @@
 *
 *  =====================================================================
       SUBROUTINE DTRTTF( TRANSR, UPLO, N, A, LDA, ARF, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dtrttp.f b/SRC/dtrttp.f
index 15289172cf..b863d091a3 100644
--- a/SRC/dtrttp.f
+++ b/SRC/dtrttp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTRTTP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtrttp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtrttp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup trttp
 *
 *  =====================================================================
       SUBROUTINE DTRTTP( UPLO, N, A, LDA, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/dtzrzf.f b/SRC/dtzrzf.f
index ced2c4f5e8..f0de6c03eb 100644
--- a/SRC/dtzrzf.f
+++ b/SRC/dtzrzf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTZRZF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtzrzf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtzrzf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -116,7 +114,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tzrzf
 *
 *> \par Contributors:
 *  ==================
@@ -148,6 +146,7 @@
 *>
 *  =====================================================================
       SUBROUTINE DTZRZF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -280,7 +279,8 @@ SUBROUTINE DTZRZF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *              Form the triangular factor of the block reflector
 *              H = H(i+ib-1) . . . H(i+1) H(i)
 *
-               CALL DLARZT( 'Backward', 'Rowwise', N-M, IB, A( I, M1 ),
+               CALL DLARZT( 'Backward', 'Rowwise', N-M, IB, A( I,
+     $                      M1 ),
      $                      LDA, TAU( I ), WORK, LDWORK )
 *
 *              Apply H to A(1:i-1,i:n) from the right
diff --git a/SRC/dzsum1.f b/SRC/dzsum1.f
index 7c5ebfacf7..37fd8f751f 100644
--- a/SRC/dzsum1.f
+++ b/SRC/dzsum1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DZSUM1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dzsum1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dzsum1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -69,7 +67,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup sum1
 *
 *> \par Contributors:
 *  ==================
@@ -78,6 +76,7 @@
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DZSUM1( N, CX, INCX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/icmax1.f b/SRC/icmax1.f
index 05a655836a..1da55b97df 100644
--- a/SRC/icmax1.f
+++ b/SRC/icmax1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ICMAX1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/icmax1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/icmax1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -69,7 +67,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup imax1
 *
 *> \par Contributors:
 *  ==================
@@ -78,6 +76,7 @@
 *
 *  =====================================================================
       INTEGER FUNCTION ICMAX1( N, CX, INCX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ieeeck.f b/SRC/ieeeck.f
index 74065c3b4e..a50774ce11 100644
--- a/SRC/ieeeck.f
+++ b/SRC/ieeeck.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download IEEECK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ieeeck.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ieeeck.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -41,7 +39,7 @@
 *> \param[in] ISPEC
 *> \verbatim
 *>          ISPEC is INTEGER
-*>          Specifies whether to test just for inifinity arithmetic
+*>          Specifies whether to test just for infinity arithmetic
 *>          or whether to test for infinity and NaN arithmetic.
 *>          = 0: Verify infinity arithmetic only.
 *>          = 1: Verify infinity and NaN arithmetic.
@@ -75,10 +73,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup ieeeck
 *
 *  =====================================================================
       INTEGER          FUNCTION IEEECK( ISPEC, ZERO, ONE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ilaclc.f b/SRC/ilaclc.f
index 9ac02867af..eab59c2c80 100644
--- a/SRC/ilaclc.f
+++ b/SRC/ilaclc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ILACLC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ilaclc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ilaclc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -71,10 +69,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup ilalc
 *
 *  =====================================================================
       INTEGER FUNCTION ILACLC( M, N, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ilaclr.f b/SRC/ilaclr.f
index 9f9a1cd323..1c516a3fde 100644
--- a/SRC/ilaclr.f
+++ b/SRC/ilaclr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ILACLR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ilaclr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ilaclr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -71,10 +69,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup ilalr
 *
 *  =====================================================================
       INTEGER FUNCTION ILACLR( M, N, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/iladiag.f b/SRC/iladiag.f
index 1fff79a931..d6a4e9e3df 100644
--- a/SRC/iladiag.f
+++ b/SRC/iladiag.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ILADIAG + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/iladiag.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/iladiag.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -51,10 +49,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup iladiag
 *
 *  =====================================================================
       INTEGER FUNCTION ILADIAG( DIAG )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/iladlc.f b/SRC/iladlc.f
index a98e7218bf..1826a8abaf 100644
--- a/SRC/iladlc.f
+++ b/SRC/iladlc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ILADLC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/iladlc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/iladlc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -71,10 +69,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup ilalc
 *
 *  =====================================================================
       INTEGER FUNCTION ILADLC( M, N, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/iladlr.f b/SRC/iladlr.f
index b1abded84b..d111e6e885 100644
--- a/SRC/iladlr.f
+++ b/SRC/iladlr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ILADLR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/iladlr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/iladlr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -71,10 +69,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup ilalr
 *
 *  =====================================================================
       INTEGER FUNCTION ILADLR( M, N, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ilaenv.f b/SRC/ilaenv.f
index af28503986..e108108d7f 100644
--- a/SRC/ilaenv.f
+++ b/SRC/ilaenv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ILAENV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ilaenv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ilaenv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup ilaenv
 *
 *> \par Further Details:
 *  =====================
@@ -159,6 +157,7 @@
 *>
 *  =====================================================================
       INTEGER FUNCTION ILAENV( ISPEC, NAME, OPTS, N1, N2, N3, N4 )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -355,6 +354,12 @@ INTEGER FUNCTION ILAENV( ISPEC, NAME, OPTS, N1, N2, N3, N4 )
             ELSE
                NB = 64
             END IF
+         ELSE IF( SUBNAM( 4: 7 ).EQ.'QP3RK' ) THEN
+            IF( SNAME ) THEN
+               NB = 32
+            ELSE
+               NB = 32
+            END IF
          END IF
       ELSE IF( C2.EQ.'PO' ) THEN
          IF( C3.EQ.'TRF' ) THEN
@@ -469,6 +474,15 @@ INTEGER FUNCTION ILAENV( ISPEC, NAME, OPTS, N1, N2, N3, N4 )
             ELSE
                NB = 64
             END IF
+         ELSE IF( C3.EQ.'SYL' ) THEN
+*           The upper bound is to prevent overly aggressive scaling.
+            IF( SNAME ) THEN
+               NB = MIN( MAX( 48, INT( ( MIN( N1, N2 ) * 16 ) / 100) ),
+     $                   240 )
+            ELSE
+               NB = MIN( MAX( 24, INT( ( MIN( N1, N2 ) * 8 ) / 100) ),
+     $                   80 )
+            END IF
          END IF
       ELSE IF( C2.EQ.'LA' ) THEN
          IF( C3.EQ.'UUM' ) THEN
@@ -477,6 +491,12 @@ INTEGER FUNCTION ILAENV( ISPEC, NAME, OPTS, N1, N2, N3, N4 )
             ELSE
                NB = 64
             END IF
+         ELSE IF( C3.EQ.'TRS' ) THEN
+            IF( SNAME ) THEN
+               NB = 32
+            ELSE
+               NB = 32
+            END IF
          END IF
       ELSE IF( SNAME .AND. C2.EQ.'ST' ) THEN
          IF( C3.EQ.'EBZ' ) THEN
@@ -526,7 +546,14 @@ INTEGER FUNCTION ILAENV( ISPEC, NAME, OPTS, N1, N2, N3, N4 )
             ELSE
                NBMIN = 2
             END IF
+         ELSE IF( SUBNAM( 4: 7 ).EQ.'QP3RK' ) THEN
+            IF( SNAME ) THEN
+               NBMIN = 2
+            ELSE
+               NBMIN = 2
+            END IF
          END IF
+
       ELSE IF( C2.EQ.'SY' ) THEN
          IF( C3.EQ.'TRF' ) THEN
             IF( SNAME ) THEN
@@ -603,6 +630,12 @@ INTEGER FUNCTION ILAENV( ISPEC, NAME, OPTS, N1, N2, N3, N4 )
             ELSE
                NX = 128
             END IF
+         ELSE IF( SUBNAM( 4: 7 ).EQ.'QP3RK' ) THEN
+            IF( SNAME ) THEN
+               NX = 128
+            ELSE
+               NX = 128
+            END IF
          END IF
       ELSE IF( C2.EQ.'SY' ) THEN
          IF( SNAME .AND. C3.EQ.'TRD' ) THEN
@@ -633,6 +666,10 @@ INTEGER FUNCTION ILAENV( ISPEC, NAME, OPTS, N1, N2, N3, N4 )
          IF( C3.EQ.'HD3' ) THEN
             NX = 128
          END IF
+      ELSE IF( C2.EQ.'LA' ) THEN
+         IF( C3.EQ.'RFT' ) THEN
+            NX = 64
+         END IF
       END IF
       ILAENV = NX
       RETURN
diff --git a/SRC/ilaenv2stage.f b/SRC/ilaenv2stage.f
index f2b105307e..115cdb7f96 100644
--- a/SRC/ilaenv2stage.f
+++ b/SRC/ilaenv2stage.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ILAENV2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ilaenv2stage.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ilaenv2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -66,8 +64,8 @@
 *>          = 2: the optimal blocksize ib for the eigenvectors
 *>               singular vectors update routine
 *>
-*>          = 3: The length of the array that store the Housholder 
-*>               representation for the second stage 
+*>          = 3: The length of the array that store the Housholder
+*>               representation for the second stage
 *>               Band to Tridiagonal or Bidiagonal
 *>
 *>          = 4: The workspace needed for the routine in input.
@@ -122,7 +120,7 @@
 *> \author NAG Ltd.
 *> \author Nick R. Papior
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup ilaenv2stage
 *
 *> \par Further Details:
 *  =====================
@@ -141,11 +139,13 @@
 *>      passed a value of -1.
 *>  3)  The parameter value returned by ILAENV2STAGE is checked for validity in
 *>      the calling subroutine.
-*>     
+*>
 *> \endverbatim
 *>
 *  =====================================================================
-      INTEGER FUNCTION ILAENV2STAGE( ISPEC, NAME, OPTS, N1, N2, N3, N4 )
+      INTEGER FUNCTION ILAENV2STAGE( ISPEC, NAME, OPTS, N1, N2, N3,
+     $                               N4 )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ilaprec.f b/SRC/ilaprec.f
index 6aea3e0f0b..4a53d3c6dd 100644
--- a/SRC/ilaprec.f
+++ b/SRC/ilaprec.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ILAPREC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ilaprec.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ilaprec.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -51,10 +49,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup ilaprec
 *
 *  =====================================================================
       INTEGER FUNCTION ILAPREC( PREC )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ilaslc.f b/SRC/ilaslc.f
index e299ff7c18..39a3da8be6 100644
--- a/SRC/ilaslc.f
+++ b/SRC/ilaslc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ILASLC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ilaslc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ilaslc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -71,10 +69,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup ilalc
 *
 *  =====================================================================
       INTEGER FUNCTION ILASLC( M, N, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ilaslr.f b/SRC/ilaslr.f
index 840a797f02..56687b534f 100644
--- a/SRC/ilaslr.f
+++ b/SRC/ilaslr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ILASLR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ilaslr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ilaslr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -71,10 +69,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup ilalr
 *
 *  =====================================================================
       INTEGER FUNCTION ILASLR( M, N, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ilatrans.f b/SRC/ilatrans.f
index e822261ef7..57722b607e 100644
--- a/SRC/ilatrans.f
+++ b/SRC/ilatrans.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ILATRANS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ilatrans.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ilatrans.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -51,10 +49,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup ilatrans
 *
 *  =====================================================================
       INTEGER FUNCTION ILATRANS( TRANS )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ilauplo.f b/SRC/ilauplo.f
index 8d5b1210be..63f3faf909 100644
--- a/SRC/ilauplo.f
+++ b/SRC/ilauplo.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ILAUPLO + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ilauplo.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ilauplo.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -51,10 +49,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup ilauplo
 *
 *  =====================================================================
       INTEGER FUNCTION ILAUPLO( UPLO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ilazlc.f b/SRC/ilazlc.f
index 8af3430e61..f9ccecb0cf 100644
--- a/SRC/ilazlc.f
+++ b/SRC/ilazlc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ILAZLC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ilazlc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ilazlc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -71,10 +69,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup ilalc
 *
 *  =====================================================================
       INTEGER FUNCTION ILAZLC( M, N, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ilazlr.f b/SRC/ilazlr.f
index e0134a6a35..983e983332 100644
--- a/SRC/ilazlr.f
+++ b/SRC/ilazlr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ILAZLR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ilazlr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ilazlr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -71,10 +69,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup ilalr
 *
 *  =====================================================================
       INTEGER FUNCTION ILAZLR( M, N, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/iparam2stage.F b/SRC/iparam2stage.F
index c153eef22b..14d46b4872 100644
--- a/SRC/iparam2stage.F
+++ b/SRC/iparam2stage.F
@@ -2,23 +2,21 @@
 *
 *  =========== DOCUMENTATION ===========
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
-*
-*> \htmlonly
-*> Download IPARAM2STAGE + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/iparam2stage.F"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/iparam2stage.F"> 
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download IPARAM2STAGE + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/iparam2stage.F">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/iparam2stage.F">
 *> [ZIP]</a>
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/iparam2stage.F"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/iparam2stage.F">
 *> [TXT]</a>
-*> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       INTEGER FUNCTION IPARAM2STAGE( ISPEC, NAME, OPTS, 
+*       INTEGER FUNCTION IPARAM2STAGE( ISPEC, NAME, OPTS,
 *                                    NI, NBI, IBI, NXI )
 *       #if defined(_OPENMP)
 *           use omp_lib
@@ -36,8 +34,8 @@
 *>
 *>      This program sets problem and machine dependent parameters
 *>      useful for xHETRD_2STAGE, xHETRD_HE2HB, xHETRD_HB2ST,
-*>      xGEBRD_2STAGE, xGEBRD_GE2GB, xGEBRD_GB2BD 
-*>      and related subroutines for eigenvalue problems. 
+*>      xGEBRD_2STAGE, xGEBRD_GE2GB, xGEBRD_GB2BD
+*>      and related subroutines for eigenvalue problems.
 *>      It is called whenever ILAENV is called with 17 <= ISPEC <= 21.
 *>      It is called whenever ILAENV2STAGE is called with 1 <= ISPEC <= 5
 *>      with a direct conversion ISPEC + 16.
@@ -58,8 +56,8 @@
 *>              ISPEC=18: the optimal blocksize ib for the eigenvectors
 *>                        singular vectors update routine
 *>
-*>              ISPEC=19: The length of the array that store the Housholder 
-*>                        representation for the second stage 
+*>              ISPEC=19: The length of the array that store the Housholder
+*>                        representation for the second stage
 *>                        Band to Tridiagonal or Bidiagonal
 *>
 *>              ISPEC=20: The workspace needed for the routine in input.
@@ -89,14 +87,14 @@
 *>
 *> \param[in] NBI
 *> \verbatim
-*>          NBI is INTEGER which is the used in the reduciton, 
+*>          NBI is INTEGER which is the used in the reduction,
 *>          (e.g., the size of the band), needed to compute workspace
 *>          and LHOUS2.
 *> \endverbatim
 *>
 *> \param[in] IBI
 *> \verbatim
-*>          IBI is INTEGER which represent the IB of the reduciton,
+*>          IBI is INTEGER which represent the IB of the reduction,
 *>          needed to compute workspace and LHOUS2.
 *> \endverbatim
 *>
@@ -108,12 +106,12 @@
 *  Authors:
 *  ========
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup iparam2stage
 *
 *> \par Further Details:
 *  =====================
@@ -133,7 +131,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -141,16 +139,16 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *>
 *  =====================================================================
-      INTEGER FUNCTION IPARAM2STAGE( ISPEC, NAME, OPTS, 
+      INTEGER FUNCTION IPARAM2STAGE( ISPEC, NAME, OPTS,
      $                              NI, NBI, IBI, NXI )
 #if defined(_OPENMP)
       use omp_lib
@@ -178,7 +176,8 @@ INTEGER FUNCTION IPARAM2STAGE( ISPEC, NAME, OPTS,
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      LOGICAL            LSAME
+      EXTERNAL           ILAENV, LSAME
 *     ..
 *     .. Executable Statements ..
 *
@@ -190,10 +189,10 @@ INTEGER FUNCTION IPARAM2STAGE( ISPEC, NAME, OPTS,
       ENDIF
 *
 *     Get the number of threads
-*      
+*
       NTHREADS = 1
 #if defined(_OPENMP)
-!$OMP PARALLEL 
+!$OMP PARALLEL
       NTHREADS = OMP_GET_NUM_THREADS()
 !$OMP END PARALLEL
 #endif
@@ -258,7 +257,7 @@ INTEGER FUNCTION IPARAM2STAGE( ISPEC, NAME, OPTS,
          CPREC = PREC.EQ.'C' .OR. PREC.EQ.'Z'
 *
 *        Invalid value for PRECISION
-*      
+*
          IF( .NOT.( RPREC .OR. CPREC ) ) THEN
              IPARAM2STAGE = -1
              RETURN
@@ -266,9 +265,9 @@ INTEGER FUNCTION IPARAM2STAGE( ISPEC, NAME, OPTS,
       ENDIF
 *      WRITE(*,*),'RPREC,CPREC ',RPREC,CPREC,
 *     $           '   ALGO ',ALGO,'    STAGE ',STAG
-*      
 *
-      IF (( ISPEC .EQ. 17 ) .OR. ( ISPEC .EQ. 18 )) THEN 
+*
+      IF (( ISPEC .EQ. 17 ) .OR. ( ISPEC .EQ. 18 )) THEN
 *
 *     ISPEC = 17, 18:  block size KD, IB
 *     Could be also dependent from N but for now it
@@ -304,13 +303,13 @@ INTEGER FUNCTION IPARAM2STAGE( ISPEC, NAME, OPTS,
 *
       ELSE IF ( ISPEC .EQ. 19 ) THEN
 *
-*     ISPEC = 19:  
+*     ISPEC = 19:
 *     LHOUS length of the Houselholder representation
 *     matrix (V,T) of the second stage. should be >= 1.
 *
 *     Will add the VECT OPTION HERE next release
          VECT  = OPTS(1:1)
-         IF( VECT.EQ.'N' ) THEN
+         IF( LSAME( VECT, 'N' ) ) THEN
             LHOUS = MAX( 1, 4*NI )
          ELSE
 *           This is not correct, it need to call the ALGO and the stage2
@@ -324,18 +323,18 @@ INTEGER FUNCTION IPARAM2STAGE( ISPEC, NAME, OPTS,
 *
       ELSE IF ( ISPEC .EQ. 20 ) THEN
 *
-*     ISPEC = 20: (21 for future use)  
-*     LWORK length of the workspace for 
+*     ISPEC = 20: (21 for future use)
+*     LWORK length of the workspace for
 *     either or both stages for TRD and BRD. should be >= 1.
 *     TRD:
 *     TRD_stage 1: = LT + LW + LS1 + LS2
-*                  = LDT*KD + N*KD + N*MAX(KD,FACTOPTNB) + LDS2*KD 
+*                  = LDT*KD + N*KD + N*MAX(KD,FACTOPTNB) + LDS2*KD
 *                    where LDT=LDS2=KD
 *                  = N*KD + N*max(KD,FACTOPTNB) + 2*KD*KD
 *     TRD_stage 2: = (2NB+1)*N + KD*NTHREADS
 *     TRD_both   : = max(stage1,stage2) + AB ( AB=(KD+1)*N )
-*                  = N*KD + N*max(KD+1,FACTOPTNB) 
-*                    + max(2*KD*KD, KD*NTHREADS) 
+*                  = N*KD + N*max(KD+1,FACTOPTNB)
+*                    + max(2*KD*KD, KD*NTHREADS)
 *                    + (KD+1)*N
          LWORK        = -1
          SUBNAM(1:1)  = PREC
@@ -347,8 +346,8 @@ INTEGER FUNCTION IPARAM2STAGE( ISPEC, NAME, OPTS,
          FACTOPTNB    = MAX(QROPTNB, LQOPTNB)
          IF( ALGO.EQ.'TRD' ) THEN
             IF( STAG.EQ.'2STAG' ) THEN
-               LWORK = NI*NBI + NI*MAX(NBI+1,FACTOPTNB) 
-     $              + MAX(2*NBI*NBI, NBI*NTHREADS) 
+               LWORK = NI*NBI + NI*MAX(NBI+1,FACTOPTNB)
+     $              + MAX(2*NBI*NBI, NBI*NTHREADS)
      $              + (NBI+1)*NI
             ELSE IF( (STAG.EQ.'HE2HB').OR.(STAG.EQ.'SY2SB') ) THEN
                LWORK = NI*NBI + NI*MAX(NBI,FACTOPTNB) + 2*NBI*NBI
@@ -357,8 +356,8 @@ INTEGER FUNCTION IPARAM2STAGE( ISPEC, NAME, OPTS,
             ENDIF
          ELSE IF( ALGO.EQ.'BRD' ) THEN
             IF( STAG.EQ.'2STAG' ) THEN
-               LWORK = 2*NI*NBI + NI*MAX(NBI+1,FACTOPTNB) 
-     $              + MAX(2*NBI*NBI, NBI*NTHREADS) 
+               LWORK = 2*NI*NBI + NI*MAX(NBI+1,FACTOPTNB)
+     $              + MAX(2*NBI*NBI, NBI*NTHREADS)
      $              + (NBI+1)*NI
             ELSE IF( STAG.EQ.'GE2GB' ) THEN
                LWORK = NI*NBI + NI*MAX(NBI,FACTOPTNB) + 2*NBI*NBI
@@ -376,7 +375,7 @@ INTEGER FUNCTION IPARAM2STAGE( ISPEC, NAME, OPTS,
 *
       ELSE IF ( ISPEC .EQ. 21 ) THEN
 *
-*     ISPEC = 21 for future use 
+*     ISPEC = 21 for future use
          IPARAM2STAGE = NXI
       ENDIF
 *
diff --git a/SRC/iparmq.f b/SRC/iparmq.f
index 54c05471ca..00513c6463 100644
--- a/SRC/iparmq.f
+++ b/SRC/iparmq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download IPARMQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/iparmq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/iparmq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,7 +149,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup iparmq
 *
 *> \par Further Details:
 *  =====================
@@ -226,7 +224,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      INTEGER FUNCTION IPARMQ( ISPEC, NAME, OPTS, N, ILO, IHI, LWORK )
+      INTEGER FUNCTION IPARMQ( ISPEC, NAME, OPTS, N, ILO, IHI,
+     $                         LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/izmax1.f b/SRC/izmax1.f
index 210652fd1c..cced4c1e33 100644
--- a/SRC/izmax1.f
+++ b/SRC/izmax1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download IZMAX1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/izmax1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/izmax1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -69,7 +67,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup imax1
 *
 *> \par Contributors:
 *  ==================
@@ -78,6 +76,7 @@
 *
 *  =====================================================================
       INTEGER FUNCTION IZMAX1( N, ZX, INCX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/la_constants.f90 b/SRC/la_constants.f90
index 26bec31687..3970e3a055 100644
--- a/SRC/la_constants.f90
+++ b/SRC/la_constants.f90
@@ -12,7 +12,7 @@
 !
 !> \date May 2016
 !
-!> \ingroup OTHERauxiliary
+!> \ingroup la_constants
 !
 !> \par Contributors:
 !  ==================
@@ -42,7 +42,7 @@ module LA_CONSTANTS
 !  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 !  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 
-!  Standard constants for 
+!  Standard constants for
    integer, parameter :: sp = kind(1.e0)
 
    real(sp), parameter :: szero = 0.0_sp
@@ -78,14 +78,14 @@ module LA_CONSTANTS
    real(sp), parameter :: stbig = real(radix(0._sp), sp)**floor( &
        (maxexponent(0._sp) - digits(0._sp) + 1) * 0.5_sp)
 !  ssml >= 1/s, where s was defined in https://doi.org/10.1145/355769.355771
-!  The correction was added in https://doi.org/10.1145/3061665 to scale denormalized numbers correctly 
+!  The correction was added in https://doi.org/10.1145/3061665 to scale denormalized numbers correctly
    real(sp), parameter :: sssml = real(radix(0._sp), sp)**( - floor( &
        (minexponent(0._sp) - digits(0._sp)) * 0.5_sp))
 !  sbig = 1/S, where S was defined in https://doi.org/10.1145/355769.355771
    real(sp), parameter :: ssbig = real(radix(0._sp), sp)**( - ceiling( &
        (maxexponent(0._sp) + digits(0._sp) - 1) * 0.5_sp))
 
-!  Standard constants for 
+!  Standard constants for
    integer, parameter :: dp = kind(1.d0)
 
    real(dp), parameter :: dzero = 0.0_dp
@@ -121,7 +121,7 @@ module LA_CONSTANTS
    real(dp), parameter :: dtbig = real(radix(0._dp), dp)**floor( &
        (maxexponent(0._dp) - digits(0._dp) + 1) * 0.5_dp)
 !  ssml >= 1/s, where s was defined in https://doi.org/10.1145/355769.355771
-!  The correction was added in https://doi.org/10.1145/3061665 to scale denormalized numbers correctly 
+!  The correction was added in https://doi.org/10.1145/3061665 to scale denormalized numbers correctly
    real(dp), parameter :: dssml = real(radix(0._dp), dp)**( - floor( &
        (minexponent(0._dp) - digits(0._dp)) * 0.5_dp))
 !  sbig = 1/S, where S was defined in https://doi.org/10.1145/355769.355771
diff --git a/SRC/lapack_64.h b/SRC/lapack_64.h
new file mode 100644
index 0000000000..3b9d4275a2
--- /dev/null
+++ b/SRC/lapack_64.h
@@ -0,0 +1,2293 @@
+#ifndef LAPACK_64_H
+#define LAPACK_64_H
+#ifdef LAPACK_64
+
+#define BLAS_CGBMV_X BLAS_CGBMV_X_64
+#define BLAS_CGEMV_X BLAS_CGEMV_X_64
+#define BLAS_CHEMV_X BLAS_CHEMV_X_64
+#define BLAS_CSYMV_X BLAS_CSYMV_X_64
+#define BLAS_DGBMV_X BLAS_DGBMV_X_64
+#define BLAS_DGEMV_X BLAS_DGEMV_X_64
+#define BLAS_DSYMV_X BLAS_DSYMV_X_64
+#define BLAS_SGBMV_X BLAS_SGBMV_X_64
+#define BLAS_SGEMV_X BLAS_SGEMV_X_64
+#define BLAS_SSYMV_X BLAS_SSYMV_X_64
+#define BLAS_ZGBMV_X BLAS_ZGBMV_X_64
+#define BLAS_ZGEMV_X BLAS_ZGEMV_X_64
+#define BLAS_ZHEMV_X BLAS_ZHEMV_X_64
+#define BLAS_ZSYMV_X BLAS_ZSYMV_X_64
+#define CAXPY CAXPY_64
+#define CBBCSD CBBCSD_64
+#define CBDSQR CBDSQR_64
+#define CCOPY CCOPY_64
+#define CDOTC CDOTC_64
+#define CDOTU CDOTU_64
+#define CGBBRD CGBBRD_64
+#define CGBCON CGBCON_64
+#define CGBEQU CGBEQU_64
+#define CGBEQUB CGBEQUB_64
+#define CGBMV CGBMV_64
+#define CGBRFS CGBRFS_64
+#define CGBRFSX CGBRFSX_64
+#define CGBSV CGBSV_64
+#define CGBSVX CGBSVX_64
+#define CGBSVXX CGBSVXX_64
+#define CGBTF2 CGBTF2_64
+#define CGBTRF CGBTRF_64
+#define CGBTRS CGBTRS_64
+#define CGEBAK CGEBAK_64
+#define CGEBAL CGEBAL_64
+#define CGEBD2 CGEBD2_64
+#define CGEBRD CGEBRD_64
+#define CGECON CGECON_64
+#define CGEDMD CGEDMD_64
+#define CGEDMDQ CGEDMDQ_64
+#define CGEEQU CGEEQU_64
+#define CGEEQUB CGEEQUB_64
+#define CGEES CGEES_64
+#define CGEESX CGEESX_64
+#define CGEEV CGEEV_64
+#define CGEEVX CGEEVX_64
+#define CGEGS CGEGS_64
+#define CGEGV CGEGV_64
+#define CGEHD2 CGEHD2_64
+#define CGEHRD CGEHRD_64
+#define CGEJSV CGEJSV_64
+#define CGELQ CGELQ_64
+#define CGELQ2 CGELQ2_64
+#define CGELQF CGELQF_64
+#define CGELQS CGELQS_64
+#define CGELQT CGELQT_64
+#define CGELQT3 CGELQT3_64
+#define CGELRS CGELRS_64
+#define CGELS CGELS_64
+#define CGELSD CGELSD_64
+#define CGELSS CGELSS_64
+#define CGELST CGELST_64
+#define CGELSX CGELSX_64
+#define CGELSY CGELSY_64
+#define CGEMLQ CGEMLQ_64
+#define CGEMLQT CGEMLQT_64
+#define CGEMM CGEMM_64
+#define CGEMQR CGEMQR_64
+#define CGEMQRT CGEMQRT_64
+#define CGEMV CGEMV_64
+#define CGEQL2 CGEQL2_64
+#define CGEQLF CGEQLF_64
+#define CGEQP3 CGEQP3_64
+#define CGEQP3RK CGEQP3RK_64
+#define CGEQPF CGEQPF_64
+#define CGEQR CGEQR_64
+#define CGEQR2 CGEQR2_64
+#define CGEQR2P CGEQR2P_64
+#define CGEQRF CGEQRF_64
+#define CGEQRF  CGEQRF_64
+#define CGEQRFP CGEQRFP_64
+#define CGEQRS CGEQRS_64
+#define CGEQRT CGEQRT_64
+#define CGEQRT2 CGEQRT2_64
+#define CGEQRT3 CGEQRT3_64
+#define CGERC CGERC_64
+#define CGERFS CGERFS_64
+#define CGERFSX CGERFSX_64
+#define CGERQ2 CGERQ2_64
+#define CGERQF CGERQF_64
+#define CGERU CGERU_64
+#define CGESC2 CGESC2_64
+#define CGESDD CGESDD_64
+#define CGESV CGESV_64
+#define CGESVD CGESVD_64
+#define CGESVDQ CGESVDQ_64
+#define CGESVDX CGESVDX_64
+#define CGESVJ CGESVJ_64
+#define CGESVX CGESVX_64
+#define CGESVXX CGESVXX_64
+#define CGETC2 CGETC2_64
+#define CGETF2 CGETF2_64
+#define CGETRF CGETRF_64
+#define CGETRF  CGETRF_64
+#define CGETRF2 CGETRF2_64
+#define CGETRI CGETRI_64
+#define CGETRS CGETRS_64
+#define CGETSLS CGETSLS_64
+#define CGETSQRHRT CGETSQRHRT_64
+#define CGGBAK CGGBAK_64
+#define CGGBAL CGGBAL_64
+#define CGGES CGGES_64
+#define CGGES3 CGGES3_64
+#define CGGESX CGGESX_64
+#define CGGEV CGGEV_64
+#define CGGEV3 CGGEV3_64
+#define CGGEVX CGGEVX_64
+#define CGGGLM CGGGLM_64
+#define CGGHD3 CGGHD3_64
+#define CGGHRD CGGHRD_64
+#define CGGLSE CGGLSE_64
+#define CGGQRF CGGQRF_64
+#define CGGRQF CGGRQF_64
+#define CGGSVD CGGSVD_64
+#define CGGSVD3 CGGSVD3_64
+#define CGGSVP CGGSVP_64
+#define CGGSVP3 CGGSVP3_64
+#define CGSVJ0 CGSVJ0_64
+#define CGSVJ1 CGSVJ1_64
+#define CGTCON CGTCON_64
+#define CGTRFS CGTRFS_64
+#define CGTSV CGTSV_64
+#define CGTSVX CGTSVX_64
+#define CGTTRF CGTTRF_64
+#define CGTTRS CGTTRS_64
+#define CGTTS2 CGTTS2_64
+#define CHB2ST_KERNELS CHB2ST_KERNELS_64
+#define CHBEV CHBEV_64
+#define CHBEV_2STAGE CHBEV_2STAGE_64
+#define CHBEVD CHBEVD_64
+#define CHBEVD_2STAGE CHBEVD_2STAGE_64
+#define CHBEVX CHBEVX_64
+#define CHBEVX_2STAGE CHBEVX_2STAGE_64
+#define CHBGST CHBGST_64
+#define CHBGV CHBGV_64
+#define CHBGVD CHBGVD_64
+#define CHBGVX CHBGVX_64
+#define CHBMV CHBMV_64
+#define CHBTRD CHBTRD_64
+#define CHECON CHECON_64
+#define CHECON_3 CHECON_3_64
+#define CHECON_ROOK CHECON_ROOK_64
+#define CHEEQUB CHEEQUB_64
+#define CHEEV CHEEV_64
+#define CHEEV_2STAGE CHEEV_2STAGE_64
+#define CHEEVD CHEEVD_64
+#define CHEEVD_2STAGE CHEEVD_2STAGE_64
+#define CHEEVR CHEEVR_64
+#define CHEEVR_2STAGE CHEEVR_2STAGE_64
+#define CHEEVX CHEEVX_64
+#define CHEEVX_2STAGE CHEEVX_2STAGE_64
+#define CHEGS2 CHEGS2_64
+#define CHEGST CHEGST_64
+#define CHEGV CHEGV_64
+#define CHEGV_2STAGE CHEGV_2STAGE_64
+#define CHEGVD CHEGVD_64
+#define CHEGVX CHEGVX_64
+#define CHEMM CHEMM_64
+#define CHEMV CHEMV_64
+#define CHER CHER_64
+#define CHER2 CHER2_64
+#define CHER2K CHER2K_64
+#define CHERFS CHERFS_64
+#define CHERFSX CHERFSX_64
+#define CHERK CHERK_64
+#define CHESV CHESV_64
+#define CHESV_AA CHESV_AA_64
+#define CHESV_AA_2STAGE CHESV_AA_2STAGE_64
+#define CHESV_RK CHESV_RK_64
+#define CHESV_ROOK CHESV_ROOK_64
+#define CHESVX CHESVX_64
+#define CHESVXX CHESVXX_64
+#define CHESWAPR CHESWAPR_64
+#define CHETD2 CHETD2_64
+#define CHETF2 CHETF2_64
+#define CHETF2_RK CHETF2_RK_64
+#define CHETF2_ROOK CHETF2_ROOK_64
+#define CHETRD CHETRD_64
+#define CHETRD_2STAGE CHETRD_2STAGE_64
+#define CHETRD_HB2ST CHETRD_HB2ST_64
+#define CHETRD_HE2HB CHETRD_HE2HB_64
+#define CHETRF CHETRF_64
+#define CHETRF_AA CHETRF_AA_64
+#define CHETRF_AA_2STAGE CHETRF_AA_2STAGE_64
+#define CHETRF_RK CHETRF_RK_64
+#define CHETRF_ROOK CHETRF_ROOK_64
+#define CHETRI CHETRI_64
+#define CHETRI2 CHETRI2_64
+#define CHETRI2X CHETRI2X_64
+#define CHETRI_3 CHETRI_3_64
+#define CHETRI_3X CHETRI_3X_64
+#define CHETRI_ROOK CHETRI_ROOK_64
+#define CHETRS CHETRS_64
+#define CHETRS2 CHETRS2_64
+#define CHETRS_3 CHETRS_3_64
+#define CHETRS_AA CHETRS_AA_64
+#define CHETRS_AA_2STAGE CHETRS_AA_2STAGE_64
+#define CHETRS_ROOK CHETRS_ROOK_64
+#define CHFRK CHFRK_64
+#define CHGEQZ CHGEQZ_64
+#define CHLA_TRANSTYPE CHLA_TRANSTYPE_64
+#define CHPCON CHPCON_64
+#define CHPEV CHPEV_64
+#define CHPEVD CHPEVD_64
+#define CHPEVX CHPEVX_64
+#define CHPGST CHPGST_64
+#define CHPGV CHPGV_64
+#define CHPGVD CHPGVD_64
+#define CHPGVX CHPGVX_64
+#define CHPMV CHPMV_64
+#define CHPR CHPR_64
+#define CHPR2 CHPR2_64
+#define CHPRFS CHPRFS_64
+#define CHPSV CHPSV_64
+#define CHPSVX CHPSVX_64
+#define CHPTRD CHPTRD_64
+#define CHPTRF CHPTRF_64
+#define CHPTRI CHPTRI_64
+#define CHPTRS CHPTRS_64
+#define CHSEIN CHSEIN_64
+#define CHSEQR CHSEQR_64
+#define CLABRD CLABRD_64
+#define CLACGV CLACGV_64
+#define CLACN2 CLACN2_64
+#define CLACON CLACON_64
+#define CLACP2 CLACP2_64
+#define CLACPY CLACPY_64
+#define CLACRM CLACRM_64
+#define CLACRT CLACRT_64
+#define CLADIV CLADIV_64
+#define CLAED0 CLAED0_64
+#define CLAED7 CLAED7_64
+#define CLAED8 CLAED8_64
+#define CLAEIN CLAEIN_64
+#define CLAESY CLAESY_64
+#define CLAEV2 CLAEV2_64
+#define CLAG2Z CLAG2Z_64
+#define CLA_GBAMV CLA_GBAMV_64
+#define CLA_GBRCOND_C CLA_GBRCOND_C_64
+#define CLA_GBRCOND_X CLA_GBRCOND_X_64
+#define CLA_GBRFSX_EXTENDED CLA_GBRFSX_EXTENDED_64
+#define CLA_GBRPVGRW CLA_GBRPVGRW_64
+#define CLA_GEAMV CLA_GEAMV_64
+#define CLA_GERCOND_C CLA_GERCOND_C_64
+#define CLA_GERCOND_X CLA_GERCOND_X_64
+#define CLA_GERFSX_EXTENDED CLA_GERFSX_EXTENDED_64
+#define CLA_GERPVGRW CLA_GERPVGRW_64
+#define CLAGS2 CLAGS2_64
+#define CLAGTM CLAGTM_64
+#define CLA_HEAMV CLA_HEAMV_64
+#define CLAHEF CLAHEF_64
+#define CLAHEF_AA CLAHEF_AA_64
+#define CLAHEF_RK CLAHEF_RK_64
+#define CLAHEF_ROOK CLAHEF_ROOK_64
+#define CLA_HERCOND_C CLA_HERCOND_C_64
+#define CLA_HERCOND_X CLA_HERCOND_X_64
+#define CLA_HERFSX_EXTENDED CLA_HERFSX_EXTENDED_64
+#define CLA_HERPVGRW CLA_HERPVGRW_64
+#define CLAHQR CLAHQR_64
+#define CLAHR2 CLAHR2_64
+#define CLAHRD CLAHRD_64
+#define CLAIC1 CLAIC1_64
+#define CLA_LIN_BERR CLA_LIN_BERR_64
+#define CLALS0 CLALS0_64
+#define CLALSA CLALSA_64
+#define CLALSD CLALSD_64
+#define CLAMSWLQ CLAMSWLQ_64
+#define CLAMTSQR CLAMTSQR_64
+#define CLANGB CLANGB_64
+#define CLANGE CLANGE_64
+#define CLANGT CLANGT_64
+#define CLANHB CLANHB_64
+#define CLANHE CLANHE_64
+#define CLANHF CLANHF_64
+#define CLANHP CLANHP_64
+#define CLANHS CLANHS_64
+#define CLANHT CLANHT_64
+#define CLANSB CLANSB_64
+#define CLANSP CLANSP_64
+#define CLANSY CLANSY_64
+#define CLANTB CLANTB_64
+#define CLANTP CLANTP_64
+#define CLANTR CLANTR_64
+#define CLAPLL CLAPLL_64
+#define CLAPMR CLAPMR_64
+#define CLAPMT CLAPMT_64
+#define CLA_PORCOND_C CLA_PORCOND_C_64
+#define CLA_PORCOND_X CLA_PORCOND_X_64
+#define CLA_PORFSX_EXTENDED CLA_PORFSX_EXTENDED_64
+#define CLA_PORPVGRW CLA_PORPVGRW_64
+#define CLAQGB CLAQGB_64
+#define CLAQGE CLAQGE_64
+#define CLAQHB CLAQHB_64
+#define CLAQHE CLAQHE_64
+#define CLAQHP CLAQHP_64
+#define CLAQP2 CLAQP2_64
+#define CLAQP2RK CLAQP2RK_64
+#define CLAQP3RK CLAQP3RK_64
+#define CLAQPS CLAQPS_64
+#define CLAQR0 CLAQR0_64
+#define CLAQR1 CLAQR1_64
+#define CLAQR2 CLAQR2_64
+#define CLAQR3 CLAQR3_64
+#define CLAQR4 CLAQR4_64
+#define CLAQR5 CLAQR5_64
+#define CLAQSB CLAQSB_64
+#define CLAQSP CLAQSP_64
+#define CLAQSY CLAQSY_64
+#define CLAQZ0 CLAQZ0_64
+#define CLAQZ1 CLAQZ1_64
+#define CLAQZ2 CLAQZ2_64
+#define CLAQZ3 CLAQZ3_64
+#define CLAR1V CLAR1V_64
+#define CLAR2V CLAR2V_64
+#define CLARCM CLARCM_64
+#define CLARF CLARF_64
+#define CLARF1F CLARF1F_64
+#define CLARF1L CLARF1L_64
+#define CLARFB CLARFB_64
+#define CLARFB_GETT CLARFB_GETT_64
+#define CLARFG CLARFG_64
+#define CLARFGP CLARFGP_64
+#define CLARFT CLARFT_64
+#define CLARFT_LVL2 CLARFT_LVL2_64
+#define CLARFX CLARFX_64
+#define CLARFY CLARFY_64
+#define CLARGV CLARGV_64
+#define CLARNV CLARNV_64
+#define CLARRV CLARRV_64
+#define CLARSCL2  CLARSCL2_64
+#define CLARTG CLARTG_64
+#define CLARTV CLARTV_64
+#define CLARZ CLARZ_64
+#define CLARZB CLARZB_64
+#define CLARZT CLARZT_64
+#define CLASCL CLASCL_64
+#define CLASCL2  CLASCL2_64
+#define CLASET CLASET_64
+#define CLASR CLASR_64
+#define CLASSQ CLASSQ_64
+#define CLASWLQ CLASWLQ_64
+#define CLASWP CLASWP_64
+#define CLA_SYAMV CLA_SYAMV_64
+#define CLASYF CLASYF_64
+#define CLASYF_AA CLASYF_AA_64
+#define CLASYF_RK CLASYF_RK_64
+#define CLASYF_ROOK CLASYF_ROOK_64
+#define CLA_SYRCOND_C CLA_SYRCOND_C_64
+#define CLA_SYRCOND_X CLA_SYRCOND_X_64
+#define CLA_SYRFSX_EXTENDED CLA_SYRFSX_EXTENDED_64
+#define CLA_SYRPVGRW CLA_SYRPVGRW_64
+#define CLATBS CLATBS_64
+#define CLATDF CLATDF_64
+#define CLATPS CLATPS_64
+#define CLATRD CLATRD_64
+#define CLATRS CLATRS_64
+#define CLATRS3 CLATRS3_64
+#define CLATRZ CLATRZ_64
+#define CLATSQR CLATSQR_64
+#define CLATZM CLATZM_64
+#define CLAUNHR_COL_GETRFNP CLAUNHR_COL_GETRFNP_64
+#define CLAUNHR_COL_GETRFNP2 CLAUNHR_COL_GETRFNP2_64
+#define CLAUU2 CLAUU2_64
+#define CLAUUM CLAUUM_64
+#define CLA_WWADDW CLA_WWADDW_64
+#define CPBCON CPBCON_64
+#define CPBEQU CPBEQU_64
+#define CPBRFS CPBRFS_64
+#define CPBSTF CPBSTF_64
+#define CPBSV CPBSV_64
+#define CPBSVX CPBSVX_64
+#define CPBTF2 CPBTF2_64
+#define CPBTRF CPBTRF_64
+#define CPBTRS CPBTRS_64
+#define CPFTRF CPFTRF_64
+#define CPFTRI CPFTRI_64
+#define CPFTRS CPFTRS_64
+#define CPOCON CPOCON_64
+#define CPOEQU CPOEQU_64
+#define CPOEQUB CPOEQUB_64
+#define CPORFS CPORFS_64
+#define CPORFSX CPORFSX_64
+#define CPOSV CPOSV_64
+#define CPOSVX CPOSVX_64
+#define CPOSVXX CPOSVXX_64
+#define CPOTF2 CPOTF2_64
+#define CPOTRF CPOTRF_64
+#define CPOTRF  CPOTRF_64
+#define CPOTRF2 CPOTRF2_64
+#define CPOTRI CPOTRI_64
+#define CPOTRS CPOTRS_64
+#define CPPCON CPPCON_64
+#define CPPEQU CPPEQU_64
+#define CPPRFS CPPRFS_64
+#define CPPSV CPPSV_64
+#define CPPSVX CPPSVX_64
+#define CPPTRF CPPTRF_64
+#define CPPTRI CPPTRI_64
+#define CPPTRS CPPTRS_64
+#define CPSTF2 CPSTF2_64
+#define CPSTRF CPSTRF_64
+#define CPTCON CPTCON_64
+#define CPTEQR CPTEQR_64
+#define CPTRFS CPTRFS_64
+#define CPTSV CPTSV_64
+#define CPTSVX CPTSVX_64
+#define CPTTRF CPTTRF_64
+#define CPTTRS CPTTRS_64
+#define CPTTS2 CPTTS2_64
+#define CROT CROT_64
+#define CRSCL CRSCL_64
+#define CSCAL CSCAL_64
+#define CSPCON CSPCON_64
+#define CSPMV CSPMV_64
+#define CSPR CSPR_64
+#define CSPRFS CSPRFS_64
+#define CSPSV CSPSV_64
+#define CSPSVX CSPSVX_64
+#define CSPTRF CSPTRF_64
+#define CSPTRI CSPTRI_64
+#define CSPTRS CSPTRS_64
+#define CSROT CSROT_64
+#define CSRSCL CSRSCL_64
+#define CSSCAL CSSCAL_64
+#define CSTEDC CSTEDC_64
+#define CSTEGR CSTEGR_64
+#define CSTEIN CSTEIN_64
+#define CSTEMR CSTEMR_64
+#define CSTEQR CSTEQR_64
+#define CSWAP CSWAP_64
+#define CSYCON CSYCON_64
+#define CSYCON_3 CSYCON_3_64
+#define CSYCON_ROOK CSYCON_ROOK_64
+#define CSYCONV CSYCONV_64
+#define CSYCONVF CSYCONVF_64
+#define CSYCONVF_ROOK CSYCONVF_ROOK_64
+#define CSYEQUB CSYEQUB_64
+#define CSYMV CSYMV_64
+#define CSYR CSYR_64
+#define CSYRFS CSYRFS_64
+#define CSYRFSX CSYRFSX_64
+#define CSYSV CSYSV_64
+#define CSYSV_AA CSYSV_AA_64
+#define CSYSV_AA_2STAGE CSYSV_AA_2STAGE_64
+#define CSYSV_RK CSYSV_RK_64
+#define CSYSV_ROOK CSYSV_ROOK_64
+#define CSYSVX CSYSVX_64
+#define CSYSVXX CSYSVXX_64
+#define CSYSWAPR CSYSWAPR_64
+#define CSYTF2 CSYTF2_64
+#define CSYTF2_RK CSYTF2_RK_64
+#define CSYTF2_ROOK CSYTF2_ROOK_64
+#define CSYTRF CSYTRF_64
+#define CSYTRF_AA CSYTRF_AA_64
+#define CSYTRF_AA_2STAGE CSYTRF_AA_2STAGE_64
+#define CSYTRF_RK CSYTRF_RK_64
+#define CSYTRF_ROOK CSYTRF_ROOK_64
+#define CSYTRI CSYTRI_64
+#define CSYTRI2 CSYTRI2_64
+#define CSYTRI2X CSYTRI2X_64
+#define CSYTRI_3 CSYTRI_3_64
+#define CSYTRI_3X CSYTRI_3X_64
+#define CSYTRI_ROOK CSYTRI_ROOK_64
+#define CSYTRS CSYTRS_64
+#define CSYTRS2 CSYTRS2_64
+#define CSYTRS_3 CSYTRS_3_64
+#define CSYTRS_AA CSYTRS_AA_64
+#define CSYTRS_AA_2STAGE CSYTRS_AA_2STAGE_64
+#define CSYTRS_ROOK CSYTRS_ROOK_64
+#define CTBCON CTBCON_64
+#define CTBMV CTBMV_64
+#define CTBRFS CTBRFS_64
+#define CTBSV CTBSV_64
+#define CTBTRS CTBTRS_64
+#define CTFSM CTFSM_64
+#define CTFTRI CTFTRI_64
+#define CTFTTP CTFTTP_64
+#define CTFTTR CTFTTR_64
+#define CTGEVC CTGEVC_64
+#define CTGEX2 CTGEX2_64
+#define CTGEXC CTGEXC_64
+#define CTGSEN CTGSEN_64
+#define CTGSJA CTGSJA_64
+#define CTGSNA CTGSNA_64
+#define CTGSY2 CTGSY2_64
+#define CTGSYL CTGSYL_64
+#define CTPCON CTPCON_64
+#define CTPLQT CTPLQT_64
+#define CTPLQT2 CTPLQT2_64
+#define CTPMLQT CTPMLQT_64
+#define CTPMQRT CTPMQRT_64
+#define CTPMV CTPMV_64
+#define CTPQRT CTPQRT_64
+#define CTPQRT2 CTPQRT2_64
+#define CTPRFB CTPRFB_64
+#define CTPRFS CTPRFS_64
+#define CTPSV CTPSV_64
+#define CTPTRI CTPTRI_64
+#define CTPTRS CTPTRS_64
+#define CTPTTF CTPTTF_64
+#define CTPTTR CTPTTR_64
+#define CTRCON CTRCON_64
+#define CTREVC CTREVC_64
+#define CTREVC3 CTREVC3_64
+#define CTREXC CTREXC_64
+#define CTRMM CTRMM_64
+#define CTRMV CTRMV_64
+#define CTRRFS CTRRFS_64
+#define CTRSEN CTRSEN_64
+#define CTRSM CTRSM_64
+#define CTRSNA CTRSNA_64
+#define CTRSV CTRSV_64
+#define CTRSYL CTRSYL_64
+#define CTRSYL3 CTRSYL3_64
+#define CTRTI2 CTRTI2_64
+#define CTRTRI CTRTRI_64
+#define CTRTRS CTRTRS_64
+#define CTRTTF CTRTTF_64
+#define CTRTTP CTRTTP_64
+#define CTZRQF CTZRQF_64
+#define CTZRZF CTZRZF_64
+#define CUNBDB CUNBDB_64
+#define CUNBDB1 CUNBDB1_64
+#define CUNBDB2 CUNBDB2_64
+#define CUNBDB3 CUNBDB3_64
+#define CUNBDB4 CUNBDB4_64
+#define CUNBDB5 CUNBDB5_64
+#define CUNBDB6 CUNBDB6_64
+#define CUNCSD CUNCSD_64
+#define CUNCSD2BY1 CUNCSD2BY1_64
+#define CUNG2L CUNG2L_64
+#define CUNG2R CUNG2R_64
+#define CUNGBR CUNGBR_64
+#define CUNGHR CUNGHR_64
+#define CUNGL2 CUNGL2_64
+#define CUNGLQ CUNGLQ_64
+#define CUNGQL CUNGQL_64
+#define CUNGQR CUNGQR_64
+#define CUNGR2 CUNGR2_64
+#define CUNGRQ CUNGRQ_64
+#define CUNGTR CUNGTR_64
+#define CUNGTSQR CUNGTSQR_64
+#define CUNGTSQR_ROW CUNGTSQR_ROW_64
+#define CUNHR_COL CUNHR_COL_64
+#define CUNM22 CUNM22_64
+#define CUNM2L CUNM2L_64
+#define CUNM2R CUNM2R_64
+#define CUNMBR CUNMBR_64
+#define CUNMHR CUNMHR_64
+#define CUNML2 CUNML2_64
+#define CUNMLQ CUNMLQ_64
+#define CUNMQL CUNMQL_64
+#define CUNMQR CUNMQR_64
+#define CUNMR2 CUNMR2_64
+#define CUNMR3 CUNMR3_64
+#define CUNMRQ CUNMRQ_64
+#define CUNMRZ CUNMRZ_64
+#define CUNMTR CUNMTR_64
+#define CUPGTR CUPGTR_64
+#define CUPMTR CUPMTR_64
+#define DASUM DASUM_64
+#define DAXPY DAXPY_64
+#define DBBCSD DBBCSD_64
+#define DBDSDC DBDSDC_64
+#define DBDSQR DBDSQR_64
+#define DBDSVDX DBDSVDX_64
+#define DCOPY DCOPY_64
+#define DDISNA DDISNA_64
+#define DDOT DDOT_64
+#define DGBBRD DGBBRD_64
+#define DGBCON DGBCON_64
+#define DGBEQU DGBEQU_64
+#define DGBEQUB DGBEQUB_64
+#define DGBMV DGBMV_64
+#define DGBRFS DGBRFS_64
+#define DGBRFSX DGBRFSX_64
+#define DGBSV DGBSV_64
+#define DGBSVX DGBSVX_64
+#define DGBSVXX DGBSVXX_64
+#define DGBTF2 DGBTF2_64
+#define DGBTRF DGBTRF_64
+#define DGBTRS DGBTRS_64
+#define DGEBAK DGEBAK_64
+#define DGEBAL DGEBAL_64
+#define DGEBD2 DGEBD2_64
+#define DGEBRD DGEBRD_64
+#define DGECON DGECON_64
+#define DGEDMD DGEDMD_64
+#define DGEDMD  DGEDMD_64
+#define DGEDMDQ DGEDMDQ_64
+#define DGEEQU DGEEQU_64
+#define DGEEQUB DGEEQUB_64
+#define DGEES DGEES_64
+#define DGEESX DGEESX_64
+#define DGEEV DGEEV_64
+#define DGEEVX DGEEVX_64
+#define DGEGS DGEGS_64
+#define DGEGV DGEGV_64
+#define DGEHD2 DGEHD2_64
+#define DGEHRD DGEHRD_64
+#define DGEJSV DGEJSV_64
+#define DGELQ DGELQ_64
+#define DGELQ2 DGELQ2_64
+#define DGELQF DGELQF_64
+#define DGELQS DGELQS_64
+#define DGELQT DGELQT_64
+#define DGELQT3 DGELQT3_64
+#define DGELRS DGELRS_64
+#define DGELS DGELS_64
+#define DGELSD DGELSD_64
+#define DGELSS DGELSS_64
+#define DGELST DGELST_64
+#define DGELSX DGELSX_64
+#define DGELSY DGELSY_64
+#define DGEMLQ DGEMLQ_64
+#define DGEMLQT DGEMLQT_64
+#define DGEMM DGEMM_64
+#define DGEMQR DGEMQR_64
+#define DGEMQRT DGEMQRT_64
+#define DGEMV DGEMV_64
+#define DGEQL2 DGEQL2_64
+#define DGEQLF DGEQLF_64
+#define DGEQP3 DGEQP3_64
+#define DGEQP3RK DGEQP3RK_64
+#define DGEQPF DGEQPF_64
+#define DGEQR DGEQR_64
+#define DGEQR2 DGEQR2_64
+#define DGEQR2P DGEQR2P_64
+#define DGEQRF DGEQRF_64
+#define DGEQRF  DGEQRF_64
+#define DGEQRFP DGEQRFP_64
+#define DGEQRS DGEQRS_64
+#define DGEQRT DGEQRT_64
+#define DGEQRT2 DGEQRT2_64
+#define DGEQRT3 DGEQRT3_64
+#define DGER DGER_64
+#define DGERFS DGERFS_64
+#define DGERFSX DGERFSX_64
+#define DGERQ2 DGERQ2_64
+#define DGERQF DGERQF_64
+#define DGESC2 DGESC2_64
+#define DGESDD DGESDD_64
+#define DGESV DGESV_64
+#define DGESVD DGESVD_64
+#define DGESVDQ DGESVDQ_64
+#define DGESVDX DGESVDX_64
+#define DGESVJ DGESVJ_64
+#define DGESVX DGESVX_64
+#define DGESVXX DGESVXX_64
+#define DGETC2 DGETC2_64
+#define DGETF2 DGETF2_64
+#define DGETRF DGETRF_64
+#define DGETRF  DGETRF_64
+#define DGETRF2 DGETRF2_64
+#define DGETRI DGETRI_64
+#define DGETRS DGETRS_64
+#define DGETSLS DGETSLS_64
+#define DGETSQRHRT DGETSQRHRT_64
+#define DGGBAK DGGBAK_64
+#define DGGBAL DGGBAL_64
+#define DGGES DGGES_64
+#define DGGES3 DGGES3_64
+#define DGGESX DGGESX_64
+#define DGGEV DGGEV_64
+#define DGGEV3 DGGEV3_64
+#define DGGEVX DGGEVX_64
+#define DGGGLM DGGGLM_64
+#define DGGHD3 DGGHD3_64
+#define DGGHRD DGGHRD_64
+#define DGGLSE DGGLSE_64
+#define DGGQRF DGGQRF_64
+#define DGGRQF DGGRQF_64
+#define DGGSVD DGGSVD_64
+#define DGGSVD3 DGGSVD3_64
+#define DGGSVP DGGSVP_64
+#define DGGSVP3 DGGSVP3_64
+#define DGSVJ0 DGSVJ0_64
+#define DGSVJ1 DGSVJ1_64
+#define DGTCON DGTCON_64
+#define DGTRFS DGTRFS_64
+#define DGTSV DGTSV_64
+#define DGTSVX DGTSVX_64
+#define DGTTRF DGTTRF_64
+#define DGTTRS DGTTRS_64
+#define DGTTS2 DGTTS2_64
+#define DHGEQZ DHGEQZ_64
+#define DHSEIN DHSEIN_64
+#define DHSEQR DHSEQR_64
+#define DISNAN DISNAN_64
+#define DLABAD DLABAD_64
+#define DLABRD DLABRD_64
+#define DLACN2 DLACN2_64
+#define DLACON DLACON_64
+#define DLACPY DLACPY_64
+#define DLADIV DLADIV_64
+#define DLADIV1 DLADIV1_64
+#define DLADIV2 DLADIV2_64
+#define DLAE2 DLAE2_64
+#define DLAEBZ DLAEBZ_64
+#define DLAED0 DLAED0_64
+#define DLAED1 DLAED1_64
+#define DLAED2 DLAED2_64
+#define DLAED3 DLAED3_64
+#define DLAED4 DLAED4_64
+#define DLAED5 DLAED5_64
+#define DLAED6 DLAED6_64
+#define DLAED7 DLAED7_64
+#define DLAED8 DLAED8_64
+#define DLAED9 DLAED9_64
+#define DLAEDA DLAEDA_64
+#define DLAEIN DLAEIN_64
+#define DLAEV2 DLAEV2_64
+#define DLAEXC DLAEXC_64
+#define DLAG2 DLAG2_64
+#define DLAG2S DLAG2S_64
+#define DLA_GBAMV DLA_GBAMV_64
+#define DLA_GBRCOND DLA_GBRCOND_64
+#define DLA_GBRFSX_EXTENDED DLA_GBRFSX_EXTENDED_64
+#define DLA_GBRPVGRW DLA_GBRPVGRW_64
+#define DLA_GEAMV  DLA_GEAMV_64
+#define DLA_GERCOND DLA_GERCOND_64
+#define DLA_GERFSX_EXTENDED DLA_GERFSX_EXTENDED_64
+#define DLA_GERPVGRW DLA_GERPVGRW_64
+#define DLAGS2 DLAGS2_64
+#define DLAGTF DLAGTF_64
+#define DLAGTM DLAGTM_64
+#define DLAGTS DLAGTS_64
+#define DLAGV2 DLAGV2_64
+#define DLAHQR DLAHQR_64
+#define DLAHR2 DLAHR2_64
+#define DLAHRD DLAHRD_64
+#define DLAIC1 DLAIC1_64
+#define DLAISNAN DLAISNAN_64
+#define DLA_LIN_BERR  DLA_LIN_BERR_64
+#define DLALN2 DLALN2_64
+#define DLALS0 DLALS0_64
+#define DLALSA DLALSA_64
+#define DLALSD DLALSD_64
+#define DLAMC3 DLAMC3_64
+#define DLAMCH DLAMCH_64
+#define DLAMRG DLAMRG_64
+#define DLAMSWLQ DLAMSWLQ_64
+#define DLAMTSQR DLAMTSQR_64
+#define DLANEG DLANEG_64
+#define DLANGB DLANGB_64
+#define DLANGE DLANGE_64
+#define DLANGT DLANGT_64
+#define DLANHS DLANHS_64
+#define DLANSB DLANSB_64
+#define DLANSF DLANSF_64
+#define DLANSP DLANSP_64
+#define DLANST DLANST_64
+#define DLANSY DLANSY_64
+#define DLANTB DLANTB_64
+#define DLANTP DLANTP_64
+#define DLANTR DLANTR_64
+#define DLANV2 DLANV2_64
+#define DLAORHR_COL_GETRFNP DLAORHR_COL_GETRFNP_64
+#define DLAORHR_COL_GETRFNP2 DLAORHR_COL_GETRFNP2_64
+#define DLAPLL DLAPLL_64
+#define DLAPMR DLAPMR_64
+#define DLAPMT DLAPMT_64
+#define DLA_PORCOND DLA_PORCOND_64
+#define DLA_PORFSX_EXTENDED DLA_PORFSX_EXTENDED_64
+#define DLA_PORPVGRW DLA_PORPVGRW_64
+#define DLAPY2 DLAPY2_64
+#define DLAPY3 DLAPY3_64
+#define DLAQGB DLAQGB_64
+#define DLAQGE DLAQGE_64
+#define DLAQP2 DLAQP2_64
+#define DLAQP2RK DLAQP2RK_64
+#define DLAQP3RK DLAQP3RK_64
+#define DLAQPS DLAQPS_64
+#define DLAQR0 DLAQR0_64
+#define DLAQR1 DLAQR1_64
+#define DLAQR2 DLAQR2_64
+#define DLAQR3 DLAQR3_64
+#define DLAQR4 DLAQR4_64
+#define DLAQR5 DLAQR5_64
+#define DLAQSB DLAQSB_64
+#define DLAQSP DLAQSP_64
+#define DLAQSY DLAQSY_64
+#define DLAQTR DLAQTR_64
+#define DLAQZ0 DLAQZ0_64
+#define DLAQZ1 DLAQZ1_64
+#define DLAQZ2 DLAQZ2_64
+#define DLAQZ3 DLAQZ3_64
+#define DLAQZ4 DLAQZ4_64
+#define DLAR1V DLAR1V_64
+#define DLAR2V DLAR2V_64
+#define DLARF DLARF_64
+#define DLARF1F DLARF1F_64
+#define DLARF1L DLARF1L_64
+#define DLARFB DLARFB_64
+#define DLARFB_GETT DLARFB_GETT_64
+#define DLARFG DLARFG_64
+#define DLARFGP DLARFGP_64
+#define DLARFT DLARFT_64
+#define DLARFT_LVL2 DLARFT_LVL2_64
+#define DLARFX DLARFX_64
+#define DLARFY DLARFY_64
+#define DLARGV DLARGV_64
+#define DLARMM DLARMM_64
+#define DLARNV DLARNV_64
+#define DLARRA DLARRA_64
+#define DLARRB DLARRB_64
+#define DLARRC DLARRC_64
+#define DLARRD DLARRD_64
+#define DLARRE DLARRE_64
+#define DLARRF DLARRF_64
+#define DLARRJ DLARRJ_64
+#define DLARRK DLARRK_64
+#define DLARRR DLARRR_64
+#define DLARRV DLARRV_64
+#define DLARSCL2  DLARSCL2_64
+#define DLARTG DLARTG_64
+#define DLARTGP DLARTGP_64
+#define DLARTGS DLARTGS_64
+#define DLARTV DLARTV_64
+#define DLARUV DLARUV_64
+#define DLARZ DLARZ_64
+#define DLARZB DLARZB_64
+#define DLARZT DLARZT_64
+#define DLAS2 DLAS2_64
+#define DLASCL DLASCL_64
+#define DLASCL2  DLASCL2_64
+#define DLASD0 DLASD0_64
+#define DLASD1 DLASD1_64
+#define DLASD2 DLASD2_64
+#define DLASD3 DLASD3_64
+#define DLASD4 DLASD4_64
+#define DLASD5 DLASD5_64
+#define DLASD6 DLASD6_64
+#define DLASD7 DLASD7_64
+#define DLASD8 DLASD8_64
+#define DLASDA DLASDA_64
+#define DLASDQ DLASDQ_64
+#define DLASDT DLASDT_64
+#define DLASET DLASET_64
+#define DLASQ1 DLASQ1_64
+#define DLASQ2 DLASQ2_64
+#define DLASQ3 DLASQ3_64
+#define DLASQ4 DLASQ4_64
+#define DLASQ5 DLASQ5_64
+#define DLASQ6 DLASQ6_64
+#define DLASR DLASR_64
+#define DLASRT DLASRT_64
+#define DLASSQ DLASSQ_64
+#define DLASV2 DLASV2_64
+#define DLASWLQ DLASWLQ_64
+#define DLASWP DLASWP_64
+#define DLASY2 DLASY2_64
+#define DLA_SYAMV DLA_SYAMV_64
+#define DLASYF DLASYF_64
+#define DLASYF_AA DLASYF_AA_64
+#define DLASYF_RK DLASYF_RK_64
+#define DLASYF_ROOK DLASYF_ROOK_64
+#define DLA_SYRCOND DLA_SYRCOND_64
+#define DLA_SYRFSX_EXTENDED DLA_SYRFSX_EXTENDED_64
+#define DLA_SYRPVGRW DLA_SYRPVGRW_64
+#define DLAT2S DLAT2S_64
+#define DLATBS DLATBS_64
+#define DLATDF DLATDF_64
+#define DLATPS DLATPS_64
+#define DLATRD DLATRD_64
+#define DLATRS DLATRS_64
+#define DLATRS3 DLATRS3_64
+#define DLATRZ DLATRZ_64
+#define DLATSQR DLATSQR_64
+#define DLATZM DLATZM_64
+#define DLAUU2 DLAUU2_64
+#define DLAUUM DLAUUM_64
+#define DLA_WWADDW DLA_WWADDW_64
+#define DNRM2 DNRM2_64
+#define DOPGTR DOPGTR_64
+#define DOPMTR DOPMTR_64
+#define DORBDB DORBDB_64
+#define DORBDB1 DORBDB1_64
+#define DORBDB2 DORBDB2_64
+#define DORBDB3 DORBDB3_64
+#define DORBDB4 DORBDB4_64
+#define DORBDB5 DORBDB5_64
+#define DORBDB6 DORBDB6_64
+#define DORCSD DORCSD_64
+#define DORCSD2BY1 DORCSD2BY1_64
+#define DORG2L DORG2L_64
+#define DORG2R DORG2R_64
+#define DORGBR DORGBR_64
+#define DORGHR DORGHR_64
+#define DORGL2 DORGL2_64
+#define DORGLQ DORGLQ_64
+#define DORGQL DORGQL_64
+#define DORGQR DORGQR_64
+#define DORGR2 DORGR2_64
+#define DORGRQ DORGRQ_64
+#define DORGTR DORGTR_64
+#define DORGTSQR DORGTSQR_64
+#define DORGTSQR_ROW DORGTSQR_ROW_64
+#define DORHR_COL DORHR_COL_64
+#define DORM22 DORM22_64
+#define DORM2L DORM2L_64
+#define DORM2R DORM2R_64
+#define DORMBR DORMBR_64
+#define DORMHR DORMHR_64
+#define DORML2 DORML2_64
+#define DORMLQ DORMLQ_64
+#define DORMQL DORMQL_64
+#define DORMQR DORMQR_64
+#define DORMR2 DORMR2_64
+#define DORMR3 DORMR3_64
+#define DORMRQ DORMRQ_64
+#define DORMRZ DORMRZ_64
+#define DORMTR DORMTR_64
+#define DPBCON DPBCON_64
+#define DPBEQU DPBEQU_64
+#define DPBRFS DPBRFS_64
+#define DPBSTF DPBSTF_64
+#define DPBSV DPBSV_64
+#define DPBSVX DPBSVX_64
+#define DPBTF2 DPBTF2_64
+#define DPBTRF DPBTRF_64
+#define DPBTRS DPBTRS_64
+#define DPFTRF DPFTRF_64
+#define DPFTRI DPFTRI_64
+#define DPFTRS DPFTRS_64
+#define DPOCON DPOCON_64
+#define DPOEQU DPOEQU_64
+#define DPOEQUB DPOEQUB_64
+#define DPORFS DPORFS_64
+#define DPORFSX DPORFSX_64
+#define DPOSV DPOSV_64
+#define DPOSVX DPOSVX_64
+#define DPOSVXX DPOSVXX_64
+#define DPOTF2 DPOTF2_64
+#define DPOTRF DPOTRF_64
+#define DPOTRF  DPOTRF_64
+#define DPOTRF2 DPOTRF2_64
+#define DPOTRI DPOTRI_64
+#define DPOTRS DPOTRS_64
+#define DPPCON DPPCON_64
+#define DPPEQU DPPEQU_64
+#define DPPRFS DPPRFS_64
+#define DPPSV DPPSV_64
+#define DPPSVX DPPSVX_64
+#define DPPTRF DPPTRF_64
+#define DPPTRI DPPTRI_64
+#define DPPTRS DPPTRS_64
+#define DPSTF2 DPSTF2_64
+#define DPSTRF DPSTRF_64
+#define DPTCON DPTCON_64
+#define DPTEQR DPTEQR_64
+#define DPTRFS DPTRFS_64
+#define DPTSV DPTSV_64
+#define DPTSVX DPTSVX_64
+#define DPTTRF DPTTRF_64
+#define DPTTRS DPTTRS_64
+#define DPTTS2 DPTTS2_64
+#define DROT DROT_64
+#define DROTM DROTM_64
+#define DROUNDUP_LWORK DROUNDUP_LWORK_64
+#define DRSCL DRSCL_64
+#define DSB2ST_KERNELS DSB2ST_KERNELS_64
+#define DSBEV DSBEV_64
+#define DSBEV_2STAGE DSBEV_2STAGE_64
+#define DSBEVD DSBEVD_64
+#define DSBEVD_2STAGE DSBEVD_2STAGE_64
+#define DSBEVX DSBEVX_64
+#define DSBEVX_2STAGE DSBEVX_2STAGE_64
+#define DSBGST DSBGST_64
+#define DSBGV DSBGV_64
+#define DSBGVD DSBGVD_64
+#define DSBGVX DSBGVX_64
+#define DSBMV DSBMV_64
+#define DSBTRD DSBTRD_64
+#define DSCAL DSCAL_64
+#define DSECND DSECND_64
+#define DSFRK DSFRK_64
+#define DSGESV DSGESV_64
+#define DSPCON DSPCON_64
+#define DSPEV DSPEV_64
+#define DSPEVD DSPEVD_64
+#define DSPEVX DSPEVX_64
+#define DSPGST DSPGST_64
+#define DSPGV DSPGV_64
+#define DSPGVD DSPGVD_64
+#define DSPGVX DSPGVX_64
+#define DSPMV DSPMV_64
+#define DSPOSV DSPOSV_64
+#define DSPR DSPR_64
+#define DSPR2 DSPR2_64
+#define DSPRFS DSPRFS_64
+#define DSPSV DSPSV_64
+#define DSPSVX DSPSVX_64
+#define DSPTRD DSPTRD_64
+#define DSPTRF DSPTRF_64
+#define DSPTRI DSPTRI_64
+#define DSPTRS DSPTRS_64
+#define DSTEBZ DSTEBZ_64
+#define DSTEDC DSTEDC_64
+#define DSTEGR DSTEGR_64
+#define DSTEIN DSTEIN_64
+#define DSTEMR DSTEMR_64
+#define DSTEQR DSTEQR_64
+#define DSTERF DSTERF_64
+#define DSTEV DSTEV_64
+#define DSTEVD DSTEVD_64
+#define DSTEVR DSTEVR_64
+#define DSTEVX DSTEVX_64
+#define DSWAP DSWAP_64
+#define DSYCON DSYCON_64
+#define DSYCON_3 DSYCON_3_64
+#define DSYCON_ROOK DSYCON_ROOK_64
+#define DSYCONV DSYCONV_64
+#define DSYCONVF DSYCONVF_64
+#define DSYCONVF_ROOK DSYCONVF_ROOK_64
+#define DSYEQUB DSYEQUB_64
+#define DSYEV DSYEV_64
+#define DSYEV_2STAGE DSYEV_2STAGE_64
+#define DSYEVD DSYEVD_64
+#define DSYEVD_2STAGE DSYEVD_2STAGE_64
+#define DSYEVR DSYEVR_64
+#define DSYEVR_2STAGE DSYEVR_2STAGE_64
+#define DSYEVX DSYEVX_64
+#define DSYEVX_2STAGE DSYEVX_2STAGE_64
+#define DSYGS2 DSYGS2_64
+#define DSYGST DSYGST_64
+#define DSYGV DSYGV_64
+#define DSYGV_2STAGE DSYGV_2STAGE_64
+#define DSYGVD DSYGVD_64
+#define DSYGVX DSYGVX_64
+#define DSYMM DSYMM_64
+#define DSYMV DSYMV_64
+#define DSYR DSYR_64
+#define DSYR2 DSYR2_64
+#define DSYR2K DSYR2K_64
+#define DSYRFS DSYRFS_64
+#define DSYRFSX DSYRFSX_64
+#define DSYRK DSYRK_64
+#define DSYSV DSYSV_64
+#define DSYSV_AA DSYSV_AA_64
+#define DSYSV_AA_2STAGE DSYSV_AA_2STAGE_64
+#define DSYSV_RK DSYSV_RK_64
+#define DSYSV_ROOK DSYSV_ROOK_64
+#define DSYSVX DSYSVX_64
+#define DSYSVXX DSYSVXX_64
+#define DSYSWAPR DSYSWAPR_64
+#define DSYTD2 DSYTD2_64
+#define DSYTF2 DSYTF2_64
+#define DSYTF2_RK DSYTF2_RK_64
+#define DSYTF2_ROOK DSYTF2_ROOK_64
+#define DSYTRD DSYTRD_64
+#define DSYTRD_2STAGE DSYTRD_2STAGE_64
+#define DSYTRD_SB2ST DSYTRD_SB2ST_64
+#define DSYTRD_SY2SB DSYTRD_SY2SB_64
+#define DSYTRF DSYTRF_64
+#define DSYTRF_AA DSYTRF_AA_64
+#define DSYTRF_AA_2STAGE DSYTRF_AA_2STAGE_64
+#define DSYTRF_RK DSYTRF_RK_64
+#define DSYTRF_ROOK DSYTRF_ROOK_64
+#define DSYTRI DSYTRI_64
+#define DSYTRI2 DSYTRI2_64
+#define DSYTRI2X DSYTRI2X_64
+#define DSYTRI_3 DSYTRI_3_64
+#define DSYTRI_3X DSYTRI_3X_64
+#define DSYTRI_ROOK DSYTRI_ROOK_64
+#define DSYTRS DSYTRS_64
+#define DSYTRS2 DSYTRS2_64
+#define DSYTRS_3 DSYTRS_3_64
+#define DSYTRS_AA DSYTRS_AA_64
+#define DSYTRS_AA_2STAGE DSYTRS_AA_2STAGE_64
+#define DSYTRS_ROOK DSYTRS_ROOK_64
+#define DTBCON DTBCON_64
+#define DTBMV DTBMV_64
+#define DTBRFS DTBRFS_64
+#define DTBSV DTBSV_64
+#define DTBTRS DTBTRS_64
+#define DTFSM DTFSM_64
+#define DTFTRI DTFTRI_64
+#define DTFTTP DTFTTP_64
+#define DTFTTR DTFTTR_64
+#define DTGEVC DTGEVC_64
+#define DTGEX2 DTGEX2_64
+#define DTGEXC DTGEXC_64
+#define DTGSEN DTGSEN_64
+#define DTGSJA DTGSJA_64
+#define DTGSNA DTGSNA_64
+#define DTGSY2 DTGSY2_64
+#define DTGSYL DTGSYL_64
+#define DTPCON DTPCON_64
+#define DTPLQT DTPLQT_64
+#define DTPLQT2 DTPLQT2_64
+#define DTPMLQT DTPMLQT_64
+#define DTPMQRT DTPMQRT_64
+#define DTPMV DTPMV_64
+#define DTPQRT DTPQRT_64
+#define DTPQRT2 DTPQRT2_64
+#define DTPRFB DTPRFB_64
+#define DTPRFS DTPRFS_64
+#define DTPSV DTPSV_64
+#define DTPTRI DTPTRI_64
+#define DTPTRS DTPTRS_64
+#define DTPTTF DTPTTF_64
+#define DTPTTR DTPTTR_64
+#define DTRCON DTRCON_64
+#define DTREVC DTREVC_64
+#define DTREVC3 DTREVC3_64
+#define DTREXC DTREXC_64
+#define DTRMM DTRMM_64
+#define DTRMV DTRMV_64
+#define DTRRFS DTRRFS_64
+#define DTRSEN DTRSEN_64
+#define DTRSM DTRSM_64
+#define DTRSNA DTRSNA_64
+#define DTRSV DTRSV_64
+#define DTRSYL DTRSYL_64
+#define DTRSYL3 DTRSYL3_64
+#define DTRTI2 DTRTI2_64
+#define DTRTRI DTRTRI_64
+#define DTRTRS DTRTRS_64
+#define DTRTTF DTRTTF_64
+#define DTRTTP DTRTTP_64
+#define DTZRQF DTZRQF_64
+#define DTZRZF DTZRZF_64
+#define DZASUM DZASUM_64
+#define DZNRM2 DZNRM2_64
+#define DZSUM1 DZSUM1_64
+#define ICAMAX ICAMAX_64
+#define ICMAX1 ICMAX1_64
+#define IDAMAX IDAMAX_64
+#define IEEECK IEEECK_64
+#define ILACLC ILACLC_64
+#define ILACLR ILACLR_64
+#define ILADIAG ILADIAG_64
+#define ILADLC ILADLC_64
+#define ILADLR ILADLR_64
+#define ILAENV ILAENV_64
+#define ILAENV2STAGE ILAENV2STAGE_64
+#define ILAPREC ILAPREC_64
+#define ILASLC ILASLC_64
+#define ILASLR ILASLR_64
+#define ILATRANS ILATRANS_64
+#define ILAUPLO ILAUPLO_64
+#define ILAVER ILAVER_64
+#define ILAZLC ILAZLC_64
+#define ILAZLR ILAZLR_64
+#define IPARAM2STAGE IPARAM2STAGE_64
+#define IPARMQ IPARMQ_64
+#define ISAMAX ISAMAX_64
+#define IZAMAX IZAMAX_64
+#define IZMAX1 IZMAX1_64
+#define LSAME LSAME_64
+#define LSAMEN LSAMEN_64
+#define SASUM SASUM_64
+#define SAXPY SAXPY_64
+#define SBBCSD SBBCSD_64
+#define SBDSDC SBDSDC_64
+#define SBDSQR SBDSQR_64
+#define SBDSVDX SBDSVDX_64
+#define SCASUM SCASUM_64
+#define SCNRM2 SCNRM2_64
+#define SCOPY SCOPY_64
+#define SCSUM1 SCSUM1_64
+#define SDISNA SDISNA_64
+#define SDOT SDOT_64
+#define SECOND SECOND_64
+#define SGBBRD SGBBRD_64
+#define SGBCON SGBCON_64
+#define SGBEQU SGBEQU_64
+#define SGBEQUB SGBEQUB_64
+#define SGBMV SGBMV_64
+#define SGBRFS SGBRFS_64
+#define SGBRFSX SGBRFSX_64
+#define SGBSV SGBSV_64
+#define SGBSVX SGBSVX_64
+#define SGBSVXX SGBSVXX_64
+#define SGBTF2 SGBTF2_64
+#define SGBTRF SGBTRF_64
+#define SGBTRS SGBTRS_64
+#define SGEBAK SGEBAK_64
+#define SGEBAL SGEBAL_64
+#define SGEBD2 SGEBD2_64
+#define SGEBRD SGEBRD_64
+#define SGECON SGECON_64
+#define SGEDMD SGEDMD_64
+#define SGEDMD  SGEDMD_64
+#define SGEDMDQ SGEDMDQ_64
+#define SGEEQU SGEEQU_64
+#define SGEEQUB SGEEQUB_64
+#define SGEES SGEES_64
+#define SGEESX SGEESX_64
+#define SGEEV SGEEV_64
+#define SGEEVX SGEEVX_64
+#define SGEGS SGEGS_64
+#define SGEGV SGEGV_64
+#define SGEHD2 SGEHD2_64
+#define SGEHRD SGEHRD_64
+#define SGEJSV SGEJSV_64
+#define SGELQ SGELQ_64
+#define SGELQ2 SGELQ2_64
+#define SGELQF SGELQF_64
+#define SGELQT SGELQT_64
+#define SGELQS SGELQS_64
+#define SGELQT3 SGELQT3_64
+#define SGELS SGELS_64
+#define SGELRS SGELRS_64
+#define SGELSD SGELSD_64
+#define SGELSS SGELSS_64
+#define SGELST SGELST_64
+#define SGELSX SGELSX_64
+#define SGELSY SGELSY_64
+#define SGEMLQ SGEMLQ_64
+#define SGEMLQT SGEMLQT_64
+#define SGEMM SGEMM_64
+#define SGEMQR SGEMQR_64
+#define SGEMQRT SGEMQRT_64
+#define SGEMV SGEMV_64
+#define SGEQL2 SGEQL2_64
+#define SGEQLF SGEQLF_64
+#define SGEQP3 SGEQP3_64
+#define SGEQP3RK SGEQP3RK_64
+#define SGEQPF SGEQPF_64
+#define SGEQR SGEQR_64
+#define SGEQR2 SGEQR2_64
+#define SGEQR2P SGEQR2P_64
+#define SGEQRF SGEQRF_64
+#define SGEQRF  SGEQRF_64
+#define SGEQRFP SGEQRFP_64
+#define SGEQRS SGEQRS_64
+#define SGEQRT SGEQRT_64
+#define SGEQRT2 SGEQRT2_64
+#define SGEQRT3 SGEQRT3_64
+#define SGER SGER_64
+#define SGERFS SGERFS_64
+#define SGERFSX SGERFSX_64
+#define SGERQ2 SGERQ2_64
+#define SGERQF SGERQF_64
+#define SGESC2 SGESC2_64
+#define SGESDD SGESDD_64
+#define SGESV SGESV_64
+#define SGESVD SGESVD_64
+#define SGESVDQ SGESVDQ_64
+#define SGESVDX SGESVDX_64
+#define SGESVJ SGESVJ_64
+#define SGESVX SGESVX_64
+#define SGESVXX SGESVXX_64
+#define SGETC2 SGETC2_64
+#define SGETF2 SGETF2_64
+#define SGETRF SGETRF_64
+#define SGETRF  SGETRF_64
+#define SGETRF2 SGETRF2_64
+#define SGETRI SGETRI_64
+#define SGETRS SGETRS_64
+#define SGETSLS SGETSLS_64
+#define SGETSQRHRT SGETSQRHRT_64
+#define SGGBAK SGGBAK_64
+#define SGGBAL SGGBAL_64
+#define SGGES SGGES_64
+#define SGGES3 SGGES3_64
+#define SGGESX SGGESX_64
+#define SGGEV SGGEV_64
+#define SGGEV3 SGGEV3_64
+#define SGGEVX SGGEVX_64
+#define SGGGLM SGGGLM_64
+#define SGGHD3 SGGHD3_64
+#define SGGHRD SGGHRD_64
+#define SGGLSE SGGLSE_64
+#define SGGQRF SGGQRF_64
+#define SGGRQF SGGRQF_64
+#define SGGSVD SGGSVD_64
+#define SGGSVD3 SGGSVD3_64
+#define SGGSVP SGGSVP_64
+#define SGGSVP3 SGGSVP3_64
+#define SGSVJ0 SGSVJ0_64
+#define SGSVJ1 SGSVJ1_64
+#define SGTCON SGTCON_64
+#define SGTRFS SGTRFS_64
+#define SGTSV SGTSV_64
+#define SGTSVX SGTSVX_64
+#define SGTTRF SGTTRF_64
+#define SGTTRS SGTTRS_64
+#define SGTTS2 SGTTS2_64
+#define SHGEQZ SHGEQZ_64
+#define SHSEIN SHSEIN_64
+#define SHSEQR SHSEQR_64
+#define SISNAN SISNAN_64
+#define SLABAD SLABAD_64
+#define SLABRD SLABRD_64
+#define SLACN2 SLACN2_64
+#define SLACON SLACON_64
+#define SLACPY SLACPY_64
+#define SLADIV SLADIV_64
+#define SLADIV1 SLADIV1_64
+#define SLADIV2 SLADIV2_64
+#define SLAE2 SLAE2_64
+#define SLAEBZ SLAEBZ_64
+#define SLAED0 SLAED0_64
+#define SLAED1 SLAED1_64
+#define SLAED2 SLAED2_64
+#define SLAED3 SLAED3_64
+#define SLAED4 SLAED4_64
+#define SLAED5 SLAED5_64
+#define SLAED6 SLAED6_64
+#define SLAED7 SLAED7_64
+#define SLAED8 SLAED8_64
+#define SLAED9 SLAED9_64
+#define SLAEDA SLAEDA_64
+#define SLAEIN SLAEIN_64
+#define SLAEV2 SLAEV2_64
+#define SLAEXC SLAEXC_64
+#define SLAG2 SLAG2_64
+#define SLAG2D SLAG2D_64
+#define SLA_GBAMV SLA_GBAMV_64
+#define SLA_GBRCOND SLA_GBRCOND_64
+#define SLA_GBRFSX_EXTENDED SLA_GBRFSX_EXTENDED_64
+#define SLA_GBRPVGRW SLA_GBRPVGRW_64
+#define SLA_GEAMV SLA_GEAMV_64
+#define SLA_GERCOND SLA_GERCOND_64
+#define SLA_GERFSX_EXTENDED SLA_GERFSX_EXTENDED_64
+#define SLA_GERPVGRW SLA_GERPVGRW_64
+#define SLAGS2 SLAGS2_64
+#define SLAGTF SLAGTF_64
+#define SLAGTM SLAGTM_64
+#define SLAGTS SLAGTS_64
+#define SLAGV2 SLAGV2_64
+#define SLAHQR SLAHQR_64
+#define SLAHR2 SLAHR2_64
+#define SLAHRD SLAHRD_64
+#define SLAIC1 SLAIC1_64
+#define SLAISNAN SLAISNAN_64
+#define SLA_LIN_BERR SLA_LIN_BERR_64
+#define SLALN2 SLALN2_64
+#define SLALS0 SLALS0_64
+#define SLALSA SLALSA_64
+#define SLALSD SLALSD_64
+#define SLAMC3 SLAMC3_64
+#define SLAMCH SLAMCH_64
+#define SLAMRG SLAMRG_64
+#define SLAMSWLQ SLAMSWLQ_64
+#define SLAMTSQR SLAMTSQR_64
+#define SLANEG SLANEG_64
+#define SLANGB SLANGB_64
+#define SLANGE SLANGE_64
+#define SLANGT SLANGT_64
+#define SLANHS SLANHS_64
+#define SLANSB SLANSB_64
+#define SLANSF SLANSF_64
+#define SLANSP SLANSP_64
+#define SLANST SLANST_64
+#define SLANSY SLANSY_64
+#define SLANTB SLANTB_64
+#define SLANTP SLANTP_64
+#define SLANTR SLANTR_64
+#define SLANV2 SLANV2_64
+#define SLAORHR_COL_GETRFNP SLAORHR_COL_GETRFNP_64
+#define SLAORHR_COL_GETRFNP2 SLAORHR_COL_GETRFNP2_64
+#define SLAPLL SLAPLL_64
+#define SLAPMR SLAPMR_64
+#define SLAPMT SLAPMT_64
+#define SLA_PORCOND SLA_PORCOND_64
+#define SLA_PORFSX_EXTENDED SLA_PORFSX_EXTENDED_64
+#define SLA_PORPVGRW SLA_PORPVGRW_64
+#define SLAPY2 SLAPY2_64
+#define SLAPY3 SLAPY3_64
+#define SLAQGB SLAQGB_64
+#define SLAQGE SLAQGE_64
+#define SLAQP2 SLAQP2_64
+#define SLAQP2RK SLAQP2RK_64
+#define SLAQP3RK SLAQP3RK_64
+#define SLAQPS SLAQPS_64
+#define SLAQR0 SLAQR0_64
+#define SLAQR1 SLAQR1_64
+#define SLAQR2 SLAQR2_64
+#define SLAQR3 SLAQR3_64
+#define SLAQR4 SLAQR4_64
+#define SLAQR5 SLAQR5_64
+#define SLAQSB SLAQSB_64
+#define SLAQSP SLAQSP_64
+#define SLAQSY SLAQSY_64
+#define SLAQTR SLAQTR_64
+#define SLAQZ0 SLAQZ0_64
+#define SLAQZ1 SLAQZ1_64
+#define SLAQZ2 SLAQZ2_64
+#define SLAQZ3 SLAQZ3_64
+#define SLAQZ4 SLAQZ4_64
+#define SLAR1V SLAR1V_64
+#define SLAR2V SLAR2V_64
+#define SLARF SLARF_64
+#define SLARF1F SLARF1F_64
+#define SLARF1L SLARF1L_64
+#define SLARFB SLARFB_64
+#define SLARFB_GETT SLARFB_GETT_64
+#define SLARFG SLARFG_64
+#define SLARFGP SLARFGP_64
+#define SLARFT SLARFT_64
+#define SLARFT_LVL2 SLARFT_LVL2_64
+#define SLARFX SLARFX_64
+#define SLARFY SLARFY_64
+#define SLARGV SLARGV_64
+#define SLARMM SLARMM_64
+#define SLARNV SLARNV_64
+#define SLARRA SLARRA_64
+#define SLARRB SLARRB_64
+#define SLARRC SLARRC_64
+#define SLARRD SLARRD_64
+#define SLARRE SLARRE_64
+#define SLARRF SLARRF_64
+#define SLARRJ SLARRJ_64
+#define SLARRK SLARRK_64
+#define SLARRR SLARRR_64
+#define SLARRV SLARRV_64
+#define SLARSCL2  SLARSCL2_64
+#define SLARTG SLARTG_64
+#define SLARTGP SLARTGP_64
+#define SLARTGS SLARTGS_64
+#define SLARTV SLARTV_64
+#define SLARUV SLARUV_64
+#define SLARZ SLARZ_64
+#define SLARZB SLARZB_64
+#define SLARZT SLARZT_64
+#define SLAS2 SLAS2_64
+#define SLASCL SLASCL_64
+#define SLASCL2  SLASCL2_64
+#define SLASD0 SLASD0_64
+#define SLASD1 SLASD1_64
+#define SLASD2 SLASD2_64
+#define SLASD3 SLASD3_64
+#define SLASD4 SLASD4_64
+#define SLASD5 SLASD5_64
+#define SLASD6 SLASD6_64
+#define SLASD7 SLASD7_64
+#define SLASD8 SLASD8_64
+#define SLASDA SLASDA_64
+#define SLASDQ SLASDQ_64
+#define SLASDT SLASDT_64
+#define SLASET SLASET_64
+#define SLASQ1 SLASQ1_64
+#define SLASQ2 SLASQ2_64
+#define SLASQ3 SLASQ3_64
+#define SLASQ4 SLASQ4_64
+#define SLASQ5 SLASQ5_64
+#define SLASQ6 SLASQ6_64
+#define SLASR SLASR_64
+#define SLASRT SLASRT_64
+#define SLASSQ SLASSQ_64
+#define SLASV2 SLASV2_64
+#define SLASWLQ SLASWLQ_64
+#define SLASWP SLASWP_64
+#define SLASY2 SLASY2_64
+#define SLA_SYAMV SLA_SYAMV_64
+#define SLASYF SLASYF_64
+#define SLASYF_AA SLASYF_AA_64
+#define SLASYF_RK SLASYF_RK_64
+#define SLASYF_ROOK SLASYF_ROOK_64
+#define SLA_SYRCOND SLA_SYRCOND_64
+#define SLA_SYRFSX_EXTENDED SLA_SYRFSX_EXTENDED_64
+#define SLA_SYRPVGRW SLA_SYRPVGRW_64
+#define SLATBS SLATBS_64
+#define SLATDF SLATDF_64
+#define SLATPS SLATPS_64
+#define SLATRD SLATRD_64
+#define SLATRS SLATRS_64
+#define SLATRS3 SLATRS3_64
+#define SLATRZ SLATRZ_64
+#define SLATSQR SLATSQR_64
+#define SLATZM SLATZM_64
+#define SLAUU2 SLAUU2_64
+#define SLAUUM SLAUUM_64
+#define SLA_WWADDW SLA_WWADDW_64
+#define SNRM2 SNRM2_64
+#define SOPGTR SOPGTR_64
+#define SOPMTR SOPMTR_64
+#define SORBDB SORBDB_64
+#define SORBDB1 SORBDB1_64
+#define SORBDB2 SORBDB2_64
+#define SORBDB3 SORBDB3_64
+#define SORBDB4 SORBDB4_64
+#define SORBDB5 SORBDB5_64
+#define SORBDB6 SORBDB6_64
+#define SORCSD SORCSD_64
+#define SORCSD2BY1 SORCSD2BY1_64
+#define SORG2L SORG2L_64
+#define SORG2R SORG2R_64
+#define SORGBR SORGBR_64
+#define SORGHR SORGHR_64
+#define SORGL2 SORGL2_64
+#define SORGLQ SORGLQ_64
+#define SORGQL SORGQL_64
+#define SORGQR SORGQR_64
+#define SORGR2 SORGR2_64
+#define SORGRQ SORGRQ_64
+#define SORGTR SORGTR_64
+#define SORGTSQR SORGTSQR_64
+#define SORGTSQR_ROW SORGTSQR_ROW_64
+#define SORHR_COL SORHR_COL_64
+#define SORM22 SORM22_64
+#define SORM2L SORM2L_64
+#define SORM2R SORM2R_64
+#define SORMBR SORMBR_64
+#define SORMHR SORMHR_64
+#define SORML2 SORML2_64
+#define SORMLQ SORMLQ_64
+#define SORMQL SORMQL_64
+#define SORMQR SORMQR_64
+#define SORMR2 SORMR2_64
+#define SORMR3 SORMR3_64
+#define SORMRQ SORMRQ_64
+#define SORMRZ SORMRZ_64
+#define SORMTR SORMTR_64
+#define SPBCON SPBCON_64
+#define SPBEQU SPBEQU_64
+#define SPBRFS SPBRFS_64
+#define SPBSTF SPBSTF_64
+#define SPBSV SPBSV_64
+#define SPBSVX SPBSVX_64
+#define SPBTF2 SPBTF2_64
+#define SPBTRF SPBTRF_64
+#define SPBTRS SPBTRS_64
+#define SPFTRF SPFTRF_64
+#define SPFTRI SPFTRI_64
+#define SPFTRS SPFTRS_64
+#define SPOCON SPOCON_64
+#define SPOEQU SPOEQU_64
+#define SPOEQUB SPOEQUB_64
+#define SPORFS SPORFS_64
+#define SPORFSX SPORFSX_64
+#define SPOSV SPOSV_64
+#define SPOSVX SPOSVX_64
+#define SPOSVXX SPOSVXX_64
+#define SPOTF2 SPOTF2_64
+#define SPOTRF SPOTRF_64
+#define SPOTRF  SPOTRF_64
+#define SPOTRF2 SPOTRF2_64
+#define SPOTRI SPOTRI_64
+#define SPOTRS SPOTRS_64
+#define SPPCON SPPCON_64
+#define SPPEQU SPPEQU_64
+#define SPPRFS SPPRFS_64
+#define SPPSV SPPSV_64
+#define SPPSVX SPPSVX_64
+#define SPPTRF SPPTRF_64
+#define SPPTRI SPPTRI_64
+#define SPPTRS SPPTRS_64
+#define SPSTF2 SPSTF2_64
+#define SPSTRF SPSTRF_64
+#define SPTCON SPTCON_64
+#define SPTEQR SPTEQR_64
+#define SPTRFS SPTRFS_64
+#define SPTSV SPTSV_64
+#define SPTSVX SPTSVX_64
+#define SPTTRF SPTTRF_64
+#define SPTTRS SPTTRS_64
+#define SPTTS2 SPTTS2_64
+#define SROT SROT_64
+#define SROTM SROTM_64
+#define SROUNDUP_LWORK SROUNDUP_LWORK_64
+#define SRSCL SRSCL_64
+#define SSB2ST_KERNELS SSB2ST_KERNELS_64
+#define SSBEV SSBEV_64
+#define SSBEV_2STAGE SSBEV_2STAGE_64
+#define SSBEVD SSBEVD_64
+#define SSBEVD_2STAGE SSBEVD_2STAGE_64
+#define SSBEVX SSBEVX_64
+#define SSBEVX_2STAGE SSBEVX_2STAGE_64
+#define SSBGST SSBGST_64
+#define SSBGV SSBGV_64
+#define SSBGVD SSBGVD_64
+#define SSBGVX SSBGVX_64
+#define SSBMV SSBMV_64
+#define SSBTRD SSBTRD_64
+#define SSCAL SSCAL_64
+#define SSFRK SSFRK_64
+#define SSPCON SSPCON_64
+#define SSPEV SSPEV_64
+#define SSPEVD SSPEVD_64
+#define SSPEVX SSPEVX_64
+#define SSPGST SSPGST_64
+#define SSPGV SSPGV_64
+#define SSPGVD SSPGVD_64
+#define SSPGVX SSPGVX_64
+#define SSPMV SSPMV_64
+#define SSPR SSPR_64
+#define SSPR2 SSPR2_64
+#define SSPRFS SSPRFS_64
+#define SSPSV SSPSV_64
+#define SSPSVX SSPSVX_64
+#define SSPTRD SSPTRD_64
+#define SSPTRF SSPTRF_64
+#define SSPTRI SSPTRI_64
+#define SSPTRS SSPTRS_64
+#define SSTEBZ SSTEBZ_64
+#define SSTEDC SSTEDC_64
+#define SSTEGR SSTEGR_64
+#define SSTEIN SSTEIN_64
+#define SSTEMR SSTEMR_64
+#define SSTEQR SSTEQR_64
+#define SSTERF SSTERF_64
+#define SSTEV SSTEV_64
+#define SSTEVD SSTEVD_64
+#define SSTEVR SSTEVR_64
+#define SSTEVX SSTEVX_64
+#define SSWAP SSWAP_64
+#define SSYCON SSYCON_64
+#define SSYCON_3 SSYCON_3_64
+#define SSYCON_ROOK SSYCON_ROOK_64
+#define SSYCONV SSYCONV_64
+#define SSYCONVF SSYCONVF_64
+#define SSYCONVF_ROOK SSYCONVF_ROOK_64
+#define SSYEQUB SSYEQUB_64
+#define SSYEV SSYEV_64
+#define SSYEV_2STAGE SSYEV_2STAGE_64
+#define SSYEVD SSYEVD_64
+#define SSYEVD_2STAGE SSYEVD_2STAGE_64
+#define SSYEVR SSYEVR_64
+#define SSYEVR_2STAGE SSYEVR_2STAGE_64
+#define SSYEVX SSYEVX_64
+#define SSYEVX_2STAGE SSYEVX_2STAGE_64
+#define SSYGS2 SSYGS2_64
+#define SSYGST SSYGST_64
+#define SSYGV SSYGV_64
+#define SSYGV_2STAGE SSYGV_2STAGE_64
+#define SSYGVD SSYGVD_64
+#define SSYGVX SSYGVX_64
+#define SSYMM SSYMM_64
+#define SSYMV SSYMV_64
+#define SSYR SSYR_64
+#define SSYR2 SSYR2_64
+#define SSYR2K SSYR2K_64
+#define SSYRFS SSYRFS_64
+#define SSYRFSX SSYRFSX_64
+#define SSYRK SSYRK_64
+#define SSYSV SSYSV_64
+#define SSYSV_AA SSYSV_AA_64
+#define SSYSV_AA_2STAGE SSYSV_AA_2STAGE_64
+#define SSYSV_RK SSYSV_RK_64
+#define SSYSV_ROOK SSYSV_ROOK_64
+#define SSYSVX SSYSVX_64
+#define SSYSVXX SSYSVXX_64
+#define SSYSWAPR SSYSWAPR_64
+#define SSYTD2 SSYTD2_64
+#define SSYTF2 SSYTF2_64
+#define SSYTF2_RK SSYTF2_RK_64
+#define SSYTF2_ROOK SSYTF2_ROOK_64
+#define SSYTRD SSYTRD_64
+#define SSYTRD_2STAGE SSYTRD_2STAGE_64
+#define SSYTRD_SB2ST SSYTRD_SB2ST_64
+#define SSYTRD_SY2SB SSYTRD_SY2SB_64
+#define SSYTRF SSYTRF_64
+#define SSYTRF_AA SSYTRF_AA_64
+#define SSYTRF_AA_2STAGE SSYTRF_AA_2STAGE_64
+#define SSYTRF_RK SSYTRF_RK_64
+#define SSYTRF_ROOK SSYTRF_ROOK_64
+#define SSYTRI SSYTRI_64
+#define SSYTRI2 SSYTRI2_64
+#define SSYTRI2X SSYTRI2X_64
+#define SSYTRI_3 SSYTRI_3_64
+#define SSYTRI_3X SSYTRI_3X_64
+#define SSYTRI_ROOK SSYTRI_ROOK_64
+#define SSYTRS SSYTRS_64
+#define SSYTRS2 SSYTRS2_64
+#define SSYTRS_3 SSYTRS_3_64
+#define SSYTRS_AA SSYTRS_AA_64
+#define SSYTRS_AA_2STAGE SSYTRS_AA_2STAGE_64
+#define SSYTRS_ROOK SSYTRS_ROOK_64
+#define STBCON STBCON_64
+#define STBMV STBMV_64
+#define STBRFS STBRFS_64
+#define STBSV STBSV_64
+#define STBTRS STBTRS_64
+#define STFSM STFSM_64
+#define STFTRI STFTRI_64
+#define STFTTP STFTTP_64
+#define STFTTR STFTTR_64
+#define STGEVC STGEVC_64
+#define STGEX2 STGEX2_64
+#define STGEXC STGEXC_64
+#define STGSEN STGSEN_64
+#define STGSJA STGSJA_64
+#define STGSNA STGSNA_64
+#define STGSY2 STGSY2_64
+#define STGSYL STGSYL_64
+#define STPCON STPCON_64
+#define STPLQT STPLQT_64
+#define STPLQT2 STPLQT2_64
+#define STPMLQT STPMLQT_64
+#define STPMQRT STPMQRT_64
+#define STPMV STPMV_64
+#define STPQRT STPQRT_64
+#define STPQRT2 STPQRT2_64
+#define STPRFB STPRFB_64
+#define STPRFS STPRFS_64
+#define STPSV STPSV_64
+#define STPTRI STPTRI_64
+#define STPTRS STPTRS_64
+#define STPTTF STPTTF_64
+#define STPTTR STPTTR_64
+#define STRCON STRCON_64
+#define STREVC STREVC_64
+#define STREVC3 STREVC3_64
+#define STREXC STREXC_64
+#define STRMM STRMM_64
+#define STRMV STRMV_64
+#define STRRFS STRRFS_64
+#define STRSEN STRSEN_64
+#define STRSM STRSM_64
+#define STRSNA STRSNA_64
+#define STRSV STRSV_64
+#define STRSYL STRSYL_64
+#define STRSYL3 STRSYL3_64
+#define STRTI2 STRTI2_64
+#define STRTRI STRTRI_64
+#define STRTRS STRTRS_64
+#define STRTTF STRTTF_64
+#define STRTTP STRTTP_64
+#define STZRQF STZRQF_64
+#define STZRZF STZRZF_64
+#define XERBLA XERBLA_64
+#define XERBLA_ARRAY XERBLA_ARRAY_64
+#define ZAXPY ZAXPY_64
+#define ZBBCSD ZBBCSD_64
+#define ZBDSQR ZBDSQR_64
+#define ZCGESV ZCGESV_64
+#define ZCOPY ZCOPY_64
+#define ZCPOSV ZCPOSV_64
+#define ZDOTC ZDOTC_64
+#define ZDOTU ZDOTU_64
+#define ZDROT ZDROT_64
+#define ZDRSCL ZDRSCL_64
+#define ZDSCAL ZDSCAL_64
+#define ZGBBRD ZGBBRD_64
+#define ZGBCON ZGBCON_64
+#define ZGBEQU ZGBEQU_64
+#define ZGBEQUB ZGBEQUB_64
+#define ZGBMV ZGBMV_64
+#define ZGBRFS ZGBRFS_64
+#define ZGBRFSX ZGBRFSX_64
+#define ZGBSV ZGBSV_64
+#define ZGBSVX ZGBSVX_64
+#define ZGBSVXX ZGBSVXX_64
+#define ZGBTF2 ZGBTF2_64
+#define ZGBTRF ZGBTRF_64
+#define ZGBTRS ZGBTRS_64
+#define ZGEBAK ZGEBAK_64
+#define ZGEBAL ZGEBAL_64
+#define ZGEBD2 ZGEBD2_64
+#define ZGEBRD ZGEBRD_64
+#define ZGECON ZGECON_64
+#define ZGEDMD ZGEDMD_64
+#define ZGEDMD  ZGEDMD_64
+#define ZGEDMDQ ZGEDMDQ_64
+#define ZGEEQU ZGEEQU_64
+#define ZGEEQUB ZGEEQUB_64
+#define ZGEES ZGEES_64
+#define ZGEESX ZGEESX_64
+#define ZGEEV ZGEEV_64
+#define ZGEEVX ZGEEVX_64
+#define ZGEGS ZGEGS_64
+#define ZGEGV ZGEGV_64
+#define ZGEHD2 ZGEHD2_64
+#define ZGEHRD ZGEHRD_64
+#define ZGEJSV ZGEJSV_64
+#define ZGELQ ZGELQ_64
+#define ZGELQ2 ZGELQ2_64
+#define ZGELQF ZGELQF_64
+#define ZGELQS ZGELQS_64
+#define ZGELQT ZGELQT_64
+#define ZGELQT3 ZGELQT3_64
+#define ZGELS ZGELS_64
+#define ZGELRS ZGELRS_64
+#define ZGELSD ZGELSD_64
+#define ZGELSS ZGELSS_64
+#define ZGELST ZGELST_64
+#define ZGELSX ZGELSX_64
+#define ZGELSY ZGELSY_64
+#define ZGEMLQ ZGEMLQ_64
+#define ZGEMLQT ZGEMLQT_64
+#define ZGEMM ZGEMM_64
+#define ZGEMQR ZGEMQR_64
+#define ZGEMQRT ZGEMQRT_64
+#define ZGEMV ZGEMV_64
+#define ZGEQL2 ZGEQL2_64
+#define ZGEQLF ZGEQLF_64
+#define ZGEQP3 ZGEQP3_64
+#define ZGEQP3RK ZGEQP3RK_64
+#define ZGEQPF ZGEQPF_64
+#define ZGEQR ZGEQR_64
+#define ZGEQR2 ZGEQR2_64
+#define ZGEQR2P ZGEQR2P_64
+#define ZGEQRF ZGEQRF_64
+#define ZGEQRF  ZGEQRF_64
+#define ZGEQRFP ZGEQRFP_64
+#define ZGEQRS ZGEQRS_64
+#define ZGEQRT ZGEQRT_64
+#define ZGEQRT2 ZGEQRT2_64
+#define ZGEQRT3 ZGEQRT3_64
+#define ZGERC ZGERC_64
+#define ZGERFS ZGERFS_64
+#define ZGERFSX ZGERFSX_64
+#define ZGERQ2 ZGERQ2_64
+#define ZGERQF ZGERQF_64
+#define ZGERU ZGERU_64
+#define ZGESC2 ZGESC2_64
+#define ZGESDD ZGESDD_64
+#define ZGESV ZGESV_64
+#define ZGESVD ZGESVD_64
+#define ZGESVDQ ZGESVDQ_64
+#define ZGESVDX ZGESVDX_64
+#define ZGESVJ ZGESVJ_64
+#define ZGESVX ZGESVX_64
+#define ZGESVXX ZGESVXX_64
+#define ZGETC2 ZGETC2_64
+#define ZGETF2 ZGETF2_64
+#define ZGETRF ZGETRF_64
+#define ZGETRF  ZGETRF_64
+#define ZGETRF2 ZGETRF2_64
+#define ZGETRI ZGETRI_64
+#define ZGETRS ZGETRS_64
+#define ZGETSLS ZGETSLS_64
+#define ZGETSQRHRT ZGETSQRHRT_64
+#define ZGGBAK ZGGBAK_64
+#define ZGGBAL ZGGBAL_64
+#define ZGGES ZGGES_64
+#define ZGGES3 ZGGES3_64
+#define ZGGESX ZGGESX_64
+#define ZGGEV ZGGEV_64
+#define ZGGEV3 ZGGEV3_64
+#define ZGGEVX ZGGEVX_64
+#define ZGGGLM ZGGGLM_64
+#define ZGGHD3 ZGGHD3_64
+#define ZGGHRD ZGGHRD_64
+#define ZGGLSE ZGGLSE_64
+#define ZGGQRF ZGGQRF_64
+#define ZGGRQF ZGGRQF_64
+#define ZGGSVD ZGGSVD_64
+#define ZGGSVD3 ZGGSVD3_64
+#define ZGGSVP ZGGSVP_64
+#define ZGGSVP3 ZGGSVP3_64
+#define ZGSVJ0 ZGSVJ0_64
+#define ZGSVJ1 ZGSVJ1_64
+#define ZGTCON ZGTCON_64
+#define ZGTRFS ZGTRFS_64
+#define ZGTSV ZGTSV_64
+#define ZGTSVX ZGTSVX_64
+#define ZGTTRF ZGTTRF_64
+#define ZGTTRS ZGTTRS_64
+#define ZGTTS2 ZGTTS2_64
+#define ZHB2ST_KERNELS ZHB2ST_KERNELS_64
+#define ZHBEV ZHBEV_64
+#define ZHBEV_2STAGE ZHBEV_2STAGE_64
+#define ZHBEVD ZHBEVD_64
+#define ZHBEVD_2STAGE ZHBEVD_2STAGE_64
+#define ZHBEVX ZHBEVX_64
+#define ZHBEVX_2STAGE ZHBEVX_2STAGE_64
+#define ZHBGST ZHBGST_64
+#define ZHBGV ZHBGV_64
+#define ZHBGVD ZHBGVD_64
+#define ZHBGVX ZHBGVX_64
+#define ZHBMV ZHBMV_64
+#define ZHBTRD ZHBTRD_64
+#define ZHECON ZHECON_64
+#define ZHECON_3 ZHECON_3_64
+#define ZHECON_ROOK ZHECON_ROOK_64
+#define ZHEEQUB ZHEEQUB_64
+#define ZHEEV ZHEEV_64
+#define ZHEEV_2STAGE ZHEEV_2STAGE_64
+#define ZHEEVD ZHEEVD_64
+#define ZHEEVD_2STAGE ZHEEVD_2STAGE_64
+#define ZHEEVR ZHEEVR_64
+#define ZHEEVR_2STAGE ZHEEVR_2STAGE_64
+#define ZHEEVX ZHEEVX_64
+#define ZHEEVX_2STAGE ZHEEVX_2STAGE_64
+#define ZHEGS2 ZHEGS2_64
+#define ZHEGST ZHEGST_64
+#define ZHEGV ZHEGV_64
+#define ZHEGV_2STAGE ZHEGV_2STAGE_64
+#define ZHEGVD ZHEGVD_64
+#define ZHEGVX ZHEGVX_64
+#define ZHEMM ZHEMM_64
+#define ZHEMV ZHEMV_64
+#define ZHER ZHER_64
+#define ZHER2 ZHER2_64
+#define ZHER2K ZHER2K_64
+#define ZHERFS ZHERFS_64
+#define ZHERFSX ZHERFSX_64
+#define ZHERK ZHERK_64
+#define ZHESV ZHESV_64
+#define ZHESV_AA ZHESV_AA_64
+#define ZHESV_AA_2STAGE ZHESV_AA_2STAGE_64
+#define ZHESV_RK ZHESV_RK_64
+#define ZHESV_ROOK ZHESV_ROOK_64
+#define ZHESVX ZHESVX_64
+#define ZHESVXX ZHESVXX_64
+#define ZHESWAPR ZHESWAPR_64
+#define ZHETD2 ZHETD2_64
+#define ZHETF2 ZHETF2_64
+#define ZHETF2_RK ZHETF2_RK_64
+#define ZHETF2_ROOK ZHETF2_ROOK_64
+#define ZHETRD ZHETRD_64
+#define ZHETRD_2STAGE ZHETRD_2STAGE_64
+#define ZHETRD_HB2ST ZHETRD_HB2ST_64
+#define ZHETRD_HE2HB ZHETRD_HE2HB_64
+#define ZHETRF ZHETRF_64
+#define ZHETRF_AA ZHETRF_AA_64
+#define ZHETRF_AA_2STAGE ZHETRF_AA_2STAGE_64
+#define ZHETRF_RK ZHETRF_RK_64
+#define ZHETRF_ROOK ZHETRF_ROOK_64
+#define ZHETRI ZHETRI_64
+#define ZHETRI2 ZHETRI2_64
+#define ZHETRI2X ZHETRI2X_64
+#define ZHETRI_3 ZHETRI_3_64
+#define ZHETRI_3X ZHETRI_3X_64
+#define ZHETRI_ROOK ZHETRI_ROOK_64
+#define ZHETRS ZHETRS_64
+#define ZHETRS2 ZHETRS2_64
+#define ZHETRS_3 ZHETRS_3_64
+#define ZHETRS_AA ZHETRS_AA_64
+#define ZHETRS_AA_2STAGE ZHETRS_AA_2STAGE_64
+#define ZHETRS_ROOK ZHETRS_ROOK_64
+#define ZHFRK ZHFRK_64
+#define ZHGEQZ ZHGEQZ_64
+#define ZHPCON ZHPCON_64
+#define ZHPEV ZHPEV_64
+#define ZHPEVD ZHPEVD_64
+#define ZHPEVX ZHPEVX_64
+#define ZHPGST ZHPGST_64
+#define ZHPGV ZHPGV_64
+#define ZHPGVD ZHPGVD_64
+#define ZHPGVX ZHPGVX_64
+#define ZHPMV ZHPMV_64
+#define ZHPR ZHPR_64
+#define ZHPR2 ZHPR2_64
+#define ZHPRFS ZHPRFS_64
+#define ZHPSV ZHPSV_64
+#define ZHPSVX ZHPSVX_64
+#define ZHPTRD ZHPTRD_64
+#define ZHPTRF ZHPTRF_64
+#define ZHPTRI ZHPTRI_64
+#define ZHPTRS ZHPTRS_64
+#define ZHSEIN ZHSEIN_64
+#define ZHSEQR ZHSEQR_64
+#define ZLABRD ZLABRD_64
+#define ZLACGV ZLACGV_64
+#define ZLACN2 ZLACN2_64
+#define ZLACON ZLACON_64
+#define ZLACP2 ZLACP2_64
+#define ZLACPY ZLACPY_64
+#define ZLACRM ZLACRM_64
+#define ZLACRT ZLACRT_64
+#define ZLADIV ZLADIV_64
+#define ZLAED0 ZLAED0_64
+#define ZLAED7 ZLAED7_64
+#define ZLAED8 ZLAED8_64
+#define ZLAEIN ZLAEIN_64
+#define ZLAESY ZLAESY_64
+#define ZLAEV2 ZLAEV2_64
+#define ZLAG2C ZLAG2C_64
+#define ZLA_GBAMV ZLA_GBAMV_64
+#define ZLA_GBRCOND_C ZLA_GBRCOND_C_64
+#define ZLA_GBRCOND_X ZLA_GBRCOND_X_64
+#define ZLA_GBRFSX_EXTENDED ZLA_GBRFSX_EXTENDED_64
+#define ZLA_GBRPVGRW ZLA_GBRPVGRW_64
+#define ZLA_GEAMV ZLA_GEAMV_64
+#define ZLA_GERCOND_C ZLA_GERCOND_C_64
+#define ZLA_GERCOND_X ZLA_GERCOND_X_64
+#define ZLA_GERFSX_EXTENDED ZLA_GERFSX_EXTENDED_64
+#define ZLA_GERPVGRW ZLA_GERPVGRW_64
+#define ZLAGS2 ZLAGS2_64
+#define ZLAGTM ZLAGTM_64
+#define ZLA_HEAMV ZLA_HEAMV_64
+#define ZLAHEF ZLAHEF_64
+#define ZLAHEF_AA ZLAHEF_AA_64
+#define ZLAHEF_RK ZLAHEF_RK_64
+#define ZLAHEF_ROOK ZLAHEF_ROOK_64
+#define ZLA_HERCOND_C ZLA_HERCOND_C_64
+#define ZLA_HERCOND_X ZLA_HERCOND_X_64
+#define ZLA_HERFSX_EXTENDED ZLA_HERFSX_EXTENDED_64
+#define ZLA_HERPVGRW ZLA_HERPVGRW_64
+#define ZLAHQR ZLAHQR_64
+#define ZLAHR2 ZLAHR2_64
+#define ZLAHRD ZLAHRD_64
+#define ZLAIC1 ZLAIC1_64
+#define ZLA_LIN_BERR ZLA_LIN_BERR_64
+#define ZLALS0 ZLALS0_64
+#define ZLALSA ZLALSA_64
+#define ZLALSD ZLALSD_64
+#define ZLAMSWLQ ZLAMSWLQ_64
+#define ZLAMTSQR ZLAMTSQR_64
+#define ZLANGB ZLANGB_64
+#define ZLANGE ZLANGE_64
+#define ZLANGT ZLANGT_64
+#define ZLANHB ZLANHB_64
+#define ZLANHE ZLANHE_64
+#define ZLANHF ZLANHF_64
+#define ZLANHP ZLANHP_64
+#define ZLANHS ZLANHS_64
+#define ZLANHT ZLANHT_64
+#define ZLANSB ZLANSB_64
+#define ZLANSP ZLANSP_64
+#define ZLANSY ZLANSY_64
+#define ZLANTB ZLANTB_64
+#define ZLANTP ZLANTP_64
+#define ZLANTR ZLANTR_64
+#define ZLAPLL ZLAPLL_64
+#define ZLAPMR ZLAPMR_64
+#define ZLAPMT ZLAPMT_64
+#define ZLA_PORCOND_C ZLA_PORCOND_C_64
+#define ZLA_PORCOND_X ZLA_PORCOND_X_64
+#define ZLA_PORFSX_EXTENDED ZLA_PORFSX_EXTENDED_64
+#define ZLA_PORPVGRW ZLA_PORPVGRW_64
+#define ZLAQGB ZLAQGB_64
+#define ZLAQGE ZLAQGE_64
+#define ZLAQHB ZLAQHB_64
+#define ZLAQHE ZLAQHE_64
+#define ZLAQHP ZLAQHP_64
+#define ZLAQP2 ZLAQP2_64
+#define ZLAQP2RK ZLAQP2RK_64
+#define ZLAQP3RK ZLAQP3RK_64
+#define ZLAQPS ZLAQPS_64
+#define ZLAQR0 ZLAQR0_64
+#define ZLAQR1 ZLAQR1_64
+#define ZLAQR2 ZLAQR2_64
+#define ZLAQR3 ZLAQR3_64
+#define ZLAQR4 ZLAQR4_64
+#define ZLAQR5 ZLAQR5_64
+#define ZLAQSB ZLAQSB_64
+#define ZLAQSP ZLAQSP_64
+#define ZLAQSY ZLAQSY_64
+#define ZLAQZ0 ZLAQZ0_64
+#define ZLAQZ1 ZLAQZ1_64
+#define ZLAQZ2 ZLAQZ2_64
+#define ZLAQZ3 ZLAQZ3_64
+#define ZLAR1V ZLAR1V_64
+#define ZLAR2V ZLAR2V_64
+#define ZLARCM ZLARCM_64
+#define ZLARF ZLARF_64
+#define ZLARF1F ZLARF1F_64
+#define ZLARF1L ZLARF1L_64
+#define ZLARFB ZLARFB_64
+#define ZLARFB_GETT ZLARFB_GETT_64
+#define ZLARFG ZLARFG_64
+#define ZLARFGP ZLARFGP_64
+#define ZLARFT ZLARFT_64
+#define ZLARFT_LVL2 ZLARFT_LVL2_64
+#define ZLARFX ZLARFX_64
+#define ZLARFY ZLARFY_64
+#define ZLARGV ZLARGV_64
+#define ZLARNV ZLARNV_64
+#define ZLARRV ZLARRV_64
+#define ZLARSCL2  ZLARSCL2_64
+#define ZLARTG ZLARTG_64
+#define ZLARTV ZLARTV_64
+#define ZLARZ ZLARZ_64
+#define ZLARZB ZLARZB_64
+#define ZLARZT ZLARZT_64
+#define ZLASCL ZLASCL_64
+#define ZLASCL2  ZLASCL2_64
+#define ZLASET ZLASET_64
+#define ZLASR ZLASR_64
+#define ZLASSQ ZLASSQ_64
+#define ZLASWLQ ZLASWLQ_64
+#define ZLASWP ZLASWP_64
+#define ZLA_SYAMV ZLA_SYAMV_64
+#define ZLASYF ZLASYF_64
+#define ZLASYF_AA ZLASYF_AA_64
+#define ZLASYF_RK ZLASYF_RK_64
+#define ZLASYF_ROOK ZLASYF_ROOK_64
+#define ZLA_SYRCOND_C ZLA_SYRCOND_C_64
+#define ZLA_SYRCOND_X ZLA_SYRCOND_X_64
+#define ZLA_SYRFSX_EXTENDED ZLA_SYRFSX_EXTENDED_64
+#define ZLA_SYRPVGRW ZLA_SYRPVGRW_64
+#define ZLAT2C ZLAT2C_64
+#define ZLATBS ZLATBS_64
+#define ZLATDF ZLATDF_64
+#define ZLATPS ZLATPS_64
+#define ZLATRD ZLATRD_64
+#define ZLATRS ZLATRS_64
+#define ZLATRS3 ZLATRS3_64
+#define ZLATRZ ZLATRZ_64
+#define ZLATSQR ZLATSQR_64
+#define ZLATZM ZLATZM_64
+#define ZLAUNHR_COL_GETRFNP ZLAUNHR_COL_GETRFNP_64
+#define ZLAUNHR_COL_GETRFNP2 ZLAUNHR_COL_GETRFNP2_64
+#define ZLAUU2 ZLAUU2_64
+#define ZLAUUM ZLAUUM_64
+#define ZLA_WWADDW ZLA_WWADDW_64
+#define ZPBCON ZPBCON_64
+#define ZPBEQU ZPBEQU_64
+#define ZPBRFS ZPBRFS_64
+#define ZPBSTF ZPBSTF_64
+#define ZPBSV ZPBSV_64
+#define ZPBSVX ZPBSVX_64
+#define ZPBTF2 ZPBTF2_64
+#define ZPBTRF ZPBTRF_64
+#define ZPBTRS ZPBTRS_64
+#define ZPFTRF ZPFTRF_64
+#define ZPFTRI ZPFTRI_64
+#define ZPFTRS ZPFTRS_64
+#define ZPOCON ZPOCON_64
+#define ZPOEQU ZPOEQU_64
+#define ZPOEQUB ZPOEQUB_64
+#define ZPORFS ZPORFS_64
+#define ZPORFSX ZPORFSX_64
+#define ZPOSV ZPOSV_64
+#define ZPOSVX ZPOSVX_64
+#define ZPOSVXX ZPOSVXX_64
+#define ZPOTF2 ZPOTF2_64
+#define ZPOTRF ZPOTRF_64
+#define ZPOTRF  ZPOTRF_64
+#define ZPOTRF2 ZPOTRF2_64
+#define ZPOTRI ZPOTRI_64
+#define ZPOTRS ZPOTRS_64
+#define ZPPCON ZPPCON_64
+#define ZPPEQU ZPPEQU_64
+#define ZPPRFS ZPPRFS_64
+#define ZPPSV ZPPSV_64
+#define ZPPSVX ZPPSVX_64
+#define ZPPTRF ZPPTRF_64
+#define ZPPTRI ZPPTRI_64
+#define ZPPTRS ZPPTRS_64
+#define ZPSTF2 ZPSTF2_64
+#define ZPSTRF ZPSTRF_64
+#define ZPTCON ZPTCON_64
+#define ZPTEQR ZPTEQR_64
+#define ZPTRFS ZPTRFS_64
+#define ZPTSV ZPTSV_64
+#define ZPTSVX ZPTSVX_64
+#define ZPTTRF ZPTTRF_64
+#define ZPTTRS ZPTTRS_64
+#define ZPTTS2 ZPTTS2_64
+#define ZROT ZROT_64
+#define ZRSCL ZRSCL_64
+#define ZSCAL ZSCAL_64
+#define ZSPCON ZSPCON_64
+#define ZSPMV ZSPMV_64
+#define ZSPR ZSPR_64
+#define ZSPRFS ZSPRFS_64
+#define ZSPSV ZSPSV_64
+#define ZSPSVX ZSPSVX_64
+#define ZSPTRF ZSPTRF_64
+#define ZSPTRI ZSPTRI_64
+#define ZSPTRS ZSPTRS_64
+#define ZSTEDC ZSTEDC_64
+#define ZSTEGR ZSTEGR_64
+#define ZSTEIN ZSTEIN_64
+#define ZSTEMR ZSTEMR_64
+#define ZSTEQR ZSTEQR_64
+#define ZSWAP ZSWAP_64
+#define ZSYCON ZSYCON_64
+#define ZSYCON_3 ZSYCON_3_64
+#define ZSYCON_ROOK ZSYCON_ROOK_64
+#define ZSYCONV ZSYCONV_64
+#define ZSYCONVF ZSYCONVF_64
+#define ZSYCONVF_ROOK ZSYCONVF_ROOK_64
+#define ZSYEQUB ZSYEQUB_64
+#define ZSYMV ZSYMV_64
+#define ZSYR ZSYR_64
+#define ZSYRFS ZSYRFS_64
+#define ZSYRFSX ZSYRFSX_64
+#define ZSYSV ZSYSV_64
+#define ZSYSV_AA ZSYSV_AA_64
+#define ZSYSV_AA_2STAGE ZSYSV_AA_2STAGE_64
+#define ZSYSV_RK ZSYSV_RK_64
+#define ZSYSV_ROOK ZSYSV_ROOK_64
+#define ZSYSVX ZSYSVX_64
+#define ZSYSVXX ZSYSVXX_64
+#define ZSYSWAPR ZSYSWAPR_64
+#define ZSYTF2 ZSYTF2_64
+#define ZSYTF2_RK ZSYTF2_RK_64
+#define ZSYTF2_ROOK ZSYTF2_ROOK_64
+#define ZSYTRF ZSYTRF_64
+#define ZSYTRF_AA ZSYTRF_AA_64
+#define ZSYTRF_AA_2STAGE ZSYTRF_AA_2STAGE_64
+#define ZSYTRF_RK ZSYTRF_RK_64
+#define ZSYTRF_ROOK ZSYTRF_ROOK_64
+#define ZSYTRI ZSYTRI_64
+#define ZSYTRI2 ZSYTRI2_64
+#define ZSYTRI2X ZSYTRI2X_64
+#define ZSYTRI_3 ZSYTRI_3_64
+#define ZSYTRI_3X ZSYTRI_3X_64
+#define ZSYTRI_ROOK ZSYTRI_ROOK_64
+#define ZSYTRS ZSYTRS_64
+#define ZSYTRS2 ZSYTRS2_64
+#define ZSYTRS_3 ZSYTRS_3_64
+#define ZSYTRS_AA ZSYTRS_AA_64
+#define ZSYTRS_AA_2STAGE ZSYTRS_AA_2STAGE_64
+#define ZSYTRS_ROOK ZSYTRS_ROOK_64
+#define ZTBCON ZTBCON_64
+#define ZTBMV ZTBMV_64
+#define ZTBRFS ZTBRFS_64
+#define ZTBSV ZTBSV_64
+#define ZTBTRS ZTBTRS_64
+#define ZTFSM ZTFSM_64
+#define ZTFTRI ZTFTRI_64
+#define ZTFTTP ZTFTTP_64
+#define ZTFTTR ZTFTTR_64
+#define ZTGEVC ZTGEVC_64
+#define ZTGEX2 ZTGEX2_64
+#define ZTGEXC ZTGEXC_64
+#define ZTGSEN ZTGSEN_64
+#define ZTGSJA ZTGSJA_64
+#define ZTGSNA ZTGSNA_64
+#define ZTGSY2 ZTGSY2_64
+#define ZTGSYL ZTGSYL_64
+#define ZTPCON ZTPCON_64
+#define ZTPLQT ZTPLQT_64
+#define ZTPLQT2 ZTPLQT2_64
+#define ZTPMLQT ZTPMLQT_64
+#define ZTPMQRT ZTPMQRT_64
+#define ZTPMV ZTPMV_64
+#define ZTPQRT ZTPQRT_64
+#define ZTPQRT2 ZTPQRT2_64
+#define ZTPRFB ZTPRFB_64
+#define ZTPRFS ZTPRFS_64
+#define ZTPSV ZTPSV_64
+#define ZTPTRI ZTPTRI_64
+#define ZTPTRS ZTPTRS_64
+#define ZTPTTF ZTPTTF_64
+#define ZTPTTR ZTPTTR_64
+#define ZTRCON ZTRCON_64
+#define ZTREVC ZTREVC_64
+#define ZTREVC3 ZTREVC3_64
+#define ZTREXC ZTREXC_64
+#define ZTRMM ZTRMM_64
+#define ZTRMV ZTRMV_64
+#define ZTRRFS ZTRRFS_64
+#define ZTRSEN ZTRSEN_64
+#define ZTRSM ZTRSM_64
+#define ZTRSNA ZTRSNA_64
+#define ZTRSV ZTRSV_64
+#define ZTRSYL ZTRSYL_64
+#define ZTRSYL3 ZTRSYL3_64
+#define ZTRTI2 ZTRTI2_64
+#define ZTRTRI ZTRTRI_64
+#define ZTRTRS ZTRTRS_64
+#define ZTRTTF ZTRTTF_64
+#define ZTRTTP ZTRTTP_64
+#define ZTZRQF ZTZRQF_64
+#define ZTZRZF ZTZRZF_64
+#define ZUNBDB ZUNBDB_64
+#define ZUNBDB1 ZUNBDB1_64
+#define ZUNBDB2 ZUNBDB2_64
+#define ZUNBDB3 ZUNBDB3_64
+#define ZUNBDB4 ZUNBDB4_64
+#define ZUNBDB5 ZUNBDB5_64
+#define ZUNBDB6 ZUNBDB6_64
+#define ZUNCSD ZUNCSD_64
+#define ZUNCSD2BY1 ZUNCSD2BY1_64
+#define ZUNG2L ZUNG2L_64
+#define ZUNG2R ZUNG2R_64
+#define ZUNGBR ZUNGBR_64
+#define ZUNGHR ZUNGHR_64
+#define ZUNGL2 ZUNGL2_64
+#define ZUNGLQ ZUNGLQ_64
+#define ZUNGQL ZUNGQL_64
+#define ZUNGQR ZUNGQR_64
+#define ZUNGR2 ZUNGR2_64
+#define ZUNGRQ ZUNGRQ_64
+#define ZUNGTR ZUNGTR_64
+#define ZUNGTSQR ZUNGTSQR_64
+#define ZUNGTSQR_ROW ZUNGTSQR_ROW_64
+#define ZUNHR_COL ZUNHR_COL_64
+#define ZUNM22 ZUNM22_64
+#define ZUNM2L ZUNM2L_64
+#define ZUNM2R ZUNM2R_64
+#define ZUNMBR ZUNMBR_64
+#define ZUNMHR ZUNMHR_64
+#define ZUNML2 ZUNML2_64
+#define ZUNMLQ ZUNMLQ_64
+#define ZUNMQL ZUNMQL_64
+#define ZUNMQR ZUNMQR_64
+#define ZUNMR2 ZUNMR2_64
+#define ZUNMR3 ZUNMR3_64
+#define ZUNMRQ ZUNMRQ_64
+#define ZUNMRZ ZUNMRZ_64
+#define ZUNMTR ZUNMTR_64
+#define ZUPGTR ZUPGTR_64
+#define ZUPMTR ZUPMTR_64
+
+#endif
+#endif
diff --git a/SRC/lsamen.f b/SRC/lsamen.f
index 59a81976fb..64957de0f0 100644
--- a/SRC/lsamen.f
+++ b/SRC/lsamen.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download LSAMEN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/lsamen.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/lsamen.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -67,10 +65,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lsamen
 *
 *  =====================================================================
       LOGICAL          FUNCTION LSAMEN( N, CA, CB )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sbbcsd.f b/SRC/sbbcsd.f
index d5720cb33b..f7e63ba415 100644
--- a/SRC/sbbcsd.f
+++ b/SRC/sbbcsd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SBBCSD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sbbcsd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sbbcsd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -322,13 +320,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup bbcsd
 *
 *  =====================================================================
-      SUBROUTINE SBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
+      SUBROUTINE SBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P,
+     $                   Q,
      $                   THETA, PHI, U1, LDU1, U2, LDU2, V1T, LDV1T,
      $                   V2T, LDV2T, B11D, B11E, B12D, B12E, B21D, B21E,
      $                   B22D, B22E, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -372,7 +372,8 @@ SUBROUTINE SBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
      $                   UNFL, X1, X2, Y1, Y2
 *
 *     .. External Subroutines ..
-      EXTERNAL           SLASR, SSCAL, SSWAP, SLARTGP, SLARTGS, SLAS2,
+      EXTERNAL           SLASR, SSCAL, SSWAP, SLARTGP, SLARTGS,
+     $                   SLAS2,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
@@ -417,7 +418,7 @@ SUBROUTINE SBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
 *
       IF( INFO .EQ. 0 .AND. Q .EQ. 0 ) THEN
          LWORKMIN = 1
-         WORK(1) = LWORKMIN
+         WORK(1) = REAL( LWORKMIN )
          RETURN
       END IF
 *
@@ -434,7 +435,7 @@ SUBROUTINE SBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
          IV2TSN = IV2TCS + Q
          LWORKOPT = IV2TSN + Q - 1
          LWORKMIN = LWORKOPT
-         WORK(1) = LWORKOPT
+         WORK(1) = REAL( LWORKOPT )
          IF( LWORK .LT. LWORKMIN .AND. .NOT. LQUERY ) THEN
             INFO = -28
          END IF
@@ -453,7 +454,7 @@ SUBROUTINE SBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
       UNFL = SLAMCH( 'Safe minimum' )
       TOLMUL = MAX( TEN, MIN( HUNDRED, EPS**MEIGHTH ) )
       TOL = TOLMUL*EPS
-      THRESH = MAX( TOL, MAXITR*Q*Q*UNFL )
+      THRESH = MAX( TOL, REAL( MAXITR*Q*Q )*UNFL )
 *
 *     Test for negligible sines or cosines
 *
@@ -559,9 +560,11 @@ SUBROUTINE SBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
 *
 *           Compute shifts for B11 and B21 and use the lesser
 *
-            CALL SLAS2( B11D(IMAX-1), B11E(IMAX-1), B11D(IMAX), SIGMA11,
+            CALL SLAS2( B11D(IMAX-1), B11E(IMAX-1), B11D(IMAX),
+     $                  SIGMA11,
      $                  DUMMY )
-            CALL SLAS2( B21D(IMAX-1), B21E(IMAX-1), B21D(IMAX), SIGMA21,
+            CALL SLAS2( B21D(IMAX-1), B21E(IMAX-1), B21D(IMAX),
+     $                  SIGMA21,
      $                  DUMMY )
 *
             IF( SIGMA11 .LE. SIGMA21 ) THEN
@@ -697,7 +700,8 @@ SUBROUTINE SBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
 *           chasing by applying the original shift again.
 *
             IF( .NOT. RESTART11 .AND. .NOT. RESTART21 ) THEN
-               CALL SLARTGP( X2, X1, WORK(IV1TSN+I-1), WORK(IV1TCS+I-1),
+               CALL SLARTGP( X2, X1, WORK(IV1TSN+I-1),
+     $                       WORK(IV1TCS+I-1),
      $                       R )
             ELSE IF( .NOT. RESTART11 .AND. RESTART21 ) THEN
                CALL SLARTGP( B11BULGE, B11E(I-1), WORK(IV1TSN+I-1),
@@ -724,10 +728,12 @@ SUBROUTINE SBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
                CALL SLARTGP( B22BULGE, B22D(I-1), WORK(IV2TSN+I-1-1),
      $                       WORK(IV2TCS+I-1-1), R )
             ELSE IF( NU .LT. MU ) THEN
-               CALL SLARTGS( B12E(I-1), B12D(I), NU, WORK(IV2TCS+I-1-1),
+               CALL SLARTGS( B12E(I-1), B12D(I), NU,
+     $                       WORK(IV2TCS+I-1-1),
      $                       WORK(IV2TSN+I-1-1) )
             ELSE
-               CALL SLARTGS( B22E(I-1), B22D(I), MU, WORK(IV2TCS+I-1-1),
+               CALL SLARTGS( B22E(I-1), B22D(I), MU,
+     $                       WORK(IV2TCS+I-1-1),
      $                       WORK(IV2TSN+I-1-1) )
             END IF
 *
@@ -780,7 +786,8 @@ SUBROUTINE SBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
 *           chasing by applying the original shift again.
 *
             IF( .NOT. RESTART11 .AND. .NOT. RESTART12 ) THEN
-               CALL SLARTGP( X2, X1, WORK(IU1SN+I-1), WORK(IU1CS+I-1),
+               CALL SLARTGP( X2, X1, WORK(IU1SN+I-1),
+     $                       WORK(IU1CS+I-1),
      $                       R )
             ELSE IF( .NOT. RESTART11 .AND. RESTART12 ) THEN
                CALL SLARTGP( B11BULGE, B11D(I), WORK(IU1SN+I-1),
@@ -796,7 +803,8 @@ SUBROUTINE SBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
      $                       WORK(IU1SN+I-1) )
             END IF
             IF( .NOT. RESTART21 .AND. .NOT. RESTART22 ) THEN
-               CALL SLARTGP( Y2, Y1, WORK(IU2SN+I-1), WORK(IU2CS+I-1),
+               CALL SLARTGP( Y2, Y1, WORK(IU2SN+I-1),
+     $                       WORK(IU2CS+I-1),
      $                       R )
             ELSE IF( .NOT. RESTART21 .AND. RESTART22 ) THEN
                CALL SLARTGP( B21BULGE, B21D(I), WORK(IU2SN+I-1),
@@ -862,10 +870,12 @@ SUBROUTINE SBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
             CALL SLARTGP( Y2, Y1, WORK(IV2TSN+IMAX-1-1),
      $                    WORK(IV2TCS+IMAX-1-1), R )
          ELSE IF( .NOT. RESTART12 .AND. RESTART22 ) THEN
-            CALL SLARTGP( B12BULGE, B12D(IMAX-1), WORK(IV2TSN+IMAX-1-1),
+            CALL SLARTGP( B12BULGE, B12D(IMAX-1),
+     $                    WORK(IV2TSN+IMAX-1-1),
      $                    WORK(IV2TCS+IMAX-1-1), R )
          ELSE IF( RESTART12 .AND. .NOT. RESTART22 ) THEN
-            CALL SLARTGP( B22BULGE, B22D(IMAX-1), WORK(IV2TSN+IMAX-1-1),
+            CALL SLARTGP( B22BULGE, B22D(IMAX-1),
+     $                    WORK(IV2TSN+IMAX-1-1),
      $                    WORK(IV2TCS+IMAX-1-1), R )
          ELSE IF( NU .LT. MU ) THEN
             CALL SLARTGS( B12E(IMAX-1), B12D(IMAX), NU,
@@ -1052,7 +1062,8 @@ SUBROUTINE SBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
                IF( WANTU2 )
      $            CALL SSWAP( M-P, U2(1,I), 1, U2(1,MINI), 1 )
                IF( WANTV1T )
-     $            CALL SSWAP( Q, V1T(I,1), LDV1T, V1T(MINI,1), LDV1T )
+     $            CALL SSWAP( Q, V1T(I,1), LDV1T, V1T(MINI,1),
+     $                        LDV1T )
                IF( WANTV2T )
      $            CALL SSWAP( M-Q, V2T(I,1), LDV2T, V2T(MINI,1),
      $               LDV2T )
diff --git a/SRC/sbdsdc.f b/SRC/sbdsdc.f
index 18a4044979..ba285eab46 100644
--- a/SRC/sbdsdc.f
+++ b/SRC/sbdsdc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SBDSDC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sbdsdc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sbdsdc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -45,13 +43,6 @@
 *> respectively. SBDSDC can be used to compute all singular values,
 *> and optionally, singular vectors or singular vectors in compact form.
 *>
-*> This code makes very mild assumptions about floating point
-*> arithmetic. It will work on machines with a guard digit in
-*> add/subtract, or on those binary machines without guard digits
-*> which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or Cray-2.
-*> It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.  See SLASD3 for details.
-*>
 *> The code currently calls SLASDQ if singular values only are desired.
 *> However, it can be slightly modified to compute singular values
 *> using the divide and conquer method.
@@ -191,7 +182,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup bdsdc
 *
 *> \par Contributors:
 *  ==================
@@ -200,8 +191,10 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE SBDSDC( UPLO, COMPQ, N, D, E, U, LDU, VT, LDVT, Q, IQ,
+      SUBROUTINE SBDSDC( UPLO, COMPQ, N, D, E, U, LDU, VT, LDVT, Q,
+     $                   IQ,
      $                   WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -240,7 +233,8 @@ SUBROUTINE SBDSDC( UPLO, COMPQ, N, D, E, U, LDU, VT, LDVT, Q, IQ,
       EXTERNAL           SLAMCH, SLANST, ILAENV, LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLARTG, SLASCL, SLASD0, SLASDA, SLASDQ,
+      EXTERNAL           SCOPY, SLARTG, SLASCL, SLASD0, SLASDA,
+     $                   SLASDQ,
      $                   SLASET, SLASR, SSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -347,14 +341,17 @@ SUBROUTINE SBDSDC( UPLO, COMPQ, N, D, E, U, LDU, VT, LDVT, Q, IQ,
          IF( ICOMPQ.EQ.2 ) THEN
             CALL SLASET( 'A', N, N, ZERO, ONE, U, LDU )
             CALL SLASET( 'A', N, N, ZERO, ONE, VT, LDVT )
-            CALL SLASDQ( 'U', 0, N, N, N, 0, D, E, VT, LDVT, U, LDU, U,
+            CALL SLASDQ( 'U', 0, N, N, N, 0, D, E, VT, LDVT, U, LDU,
+     $                   U,
      $                   LDU, WORK( WSTART ), INFO )
          ELSE IF( ICOMPQ.EQ.1 ) THEN
             IU = 1
             IVT = IU + N
-            CALL SLASET( 'A', N, N, ZERO, ONE, Q( IU+( QSTART-1 )*N ),
+            CALL SLASET( 'A', N, N, ZERO, ONE,
+     $                   Q( IU+( QSTART-1 )*N ),
      $                   N )
-            CALL SLASET( 'A', N, N, ZERO, ONE, Q( IVT+( QSTART-1 )*N ),
+            CALL SLASET( 'A', N, N, ZERO, ONE,
+     $                   Q( IVT+( QSTART-1 )*N ),
      $                   N )
             CALL SLASDQ( 'U', 0, N, N, N, 0, D, E,
      $                   Q( IVT+( QSTART-1 )*N ), N,
@@ -512,7 +509,8 @@ SUBROUTINE SBDSDC( UPLO, COMPQ, N, D, E, U, LDU, VT, LDVT, Q, IQ,
 *     which rotated B to be upper bidiagonal
 *
       IF( ( IUPLO.EQ.2 ) .AND. ( ICOMPQ.EQ.2 ) )
-     $   CALL SLASR( 'L', 'V', 'B', N, N, WORK( 1 ), WORK( N ), U, LDU )
+     $   CALL SLASR( 'L', 'V', 'B', N, N, WORK( 1 ), WORK( N ), U,
+     $               LDU )
 *
       RETURN
 *
diff --git a/SRC/sbdsqr.f b/SRC/sbdsqr.f
index c798baaf54..fc505211ff 100644
--- a/SRC/sbdsqr.f
+++ b/SRC/sbdsqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SBDSQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sbdsqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sbdsqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -166,7 +164,9 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is REAL array, dimension (4*N)
+*>          WORK is REAL array, dimension (LWORK)
+*>          LWORK = 4*N, if NCVT = NRU = NCC = 0, and
+*>          LWORK = 4*(N-1), otherwise
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -232,11 +232,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup bdsqr
 *
 *  =====================================================================
       SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $                   LDU, C, LDC, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -277,7 +278,7 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $                   MAXITDIVN, NM1, NM12, NM13, OLDLL, OLDM
       REAL               ABSE, ABSS, COSL, COSR, CS, EPS, F, G, H, MU,
      $                   OLDCS, OLDSN, R, SHIFT, SIGMN, SIGMX, SINL,
-     $                   SINR, SLL, SMAX, SMIN, SMINL,  SMINOA,
+     $                   SINR, SLL, SMAX, SMIN, SMINOA,
      $                   SN, THRESH, TOL, TOLMUL, UNFL
 *     ..
 *     .. External Functions ..
@@ -286,7 +287,8 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
       EXTERNAL           LSAME, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARTG, SLAS2, SLASQ1, SLASR, SLASV2, SROT,
+      EXTERNAL           SLARTG, SLAS2, SLASQ1, SLASR, SLASV2,
+     $                   SROT,
      $                   SSCAL, SSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -367,10 +369,12 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *        Update singular vectors if desired
 *
          IF( NRU.GT.0 )
-     $      CALL SLASR( 'R', 'V', 'F', NRU, N, WORK( 1 ), WORK( N ), U,
+     $      CALL SLASR( 'R', 'V', 'F', NRU, N, WORK( 1 ), WORK( N ),
+     $                  U,
      $                  LDU )
          IF( NCC.GT.0 )
-     $      CALL SLASR( 'L', 'V', 'F', N, NCC, WORK( 1 ), WORK( N ), C,
+     $      CALL SLASR( 'L', 'V', 'F', N, NCC, WORK( 1 ), WORK( N ),
+     $                  C,
      $                  LDC )
       END IF
 *
@@ -390,7 +394,7 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
       DO 30 I = 1, N - 1
          SMAX = MAX( SMAX, ABS( E( I ) ) )
    30 CONTINUE
-      SMINL = ZERO
+      SMIN = ZERO
       IF( TOL.GE.ZERO ) THEN
 *
 *        Relative accuracy desired
@@ -407,12 +411,13 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
    40    CONTINUE
    50    CONTINUE
          SMINOA = SMINOA / SQRT( REAL( N ) )
-         THRESH = MAX( TOL*SMINOA, MAXITR*(N*(N*UNFL)) )
+         THRESH = MAX( TOL*SMINOA, MAXITR*(REAL( N )*(REAL( N )*UNFL)) )
       ELSE
 *
 *        Absolute accuracy desired
 *
-         THRESH = MAX( ABS( TOL )*SMAX, MAXITR*(N*(N*UNFL)) )
+         THRESH = MAX( ABS( TOL )*SMAX, MAXITR*(REAL( N )*
+     $           (REAL( N )*UNFL)) )
       END IF
 *
 *     Prepare for main iteration loop for the singular values
@@ -450,7 +455,6 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
       IF( TOL.LT.ZERO .AND. ABS( D( M ) ).LE.THRESH )
      $   D( M ) = ZERO
       SMAX = ABS( D( M ) )
-      SMIN = SMAX
       DO 70 LLL = 1, M - 1
          LL = M - LLL
          ABSS = ABS( D( LL ) )
@@ -459,7 +463,6 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $      D( LL ) = ZERO
          IF( ABSE.LE.THRESH )
      $      GO TO 80
-         SMIN = MIN( SMIN, ABSS )
          SMAX = MAX( SMAX, ABSS, ABSE )
    70 CONTINUE
       LL = 0
@@ -494,10 +497,12 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *        Compute singular vectors, if desired
 *
          IF( NCVT.GT.0 )
-     $      CALL SROT( NCVT, VT( M-1, 1 ), LDVT, VT( M, 1 ), LDVT, COSR,
+     $      CALL SROT( NCVT, VT( M-1, 1 ), LDVT, VT( M, 1 ), LDVT,
+     $                 COSR,
      $                 SINR )
          IF( NRU.GT.0 )
-     $      CALL SROT( NRU, U( 1, M-1 ), 1, U( 1, M ), 1, COSL, SINL )
+     $      CALL SROT( NRU, U( 1, M-1 ), 1, U( 1, M ), 1, COSL,
+     $                 SINL )
          IF( NCC.GT.0 )
      $      CALL SROT( NCC, C( M-1, 1 ), LDC, C( M, 1 ), LDC, COSL,
      $                 SINL )
@@ -541,14 +546,14 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *           apply convergence criterion forward
 *
             MU = ABS( D( LL ) )
-            SMINL = MU
+            SMIN = MU
             DO 100 LLL = LL, M - 1
                IF( ABS( E( LLL ) ).LE.TOL*MU ) THEN
                   E( LLL ) = ZERO
                   GO TO 60
                END IF
                MU = ABS( D( LLL+1 ) )*( MU / ( MU+ABS( E( LLL ) ) ) )
-               SMINL = MIN( SMINL, MU )
+               SMIN = MIN( SMIN, MU )
   100       CONTINUE
          END IF
 *
@@ -569,14 +574,14 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *           apply convergence criterion backward
 *
             MU = ABS( D( M ) )
-            SMINL = MU
+            SMIN = MU
             DO 110 LLL = M - 1, LL, -1
                IF( ABS( E( LLL ) ).LE.TOL*MU ) THEN
                   E( LLL ) = ZERO
                   GO TO 60
                END IF
                MU = ABS( D( LLL ) )*( MU / ( MU+ABS( E( LLL ) ) ) )
-               SMINL = MIN( SMINL, MU )
+               SMIN = MIN( SMIN, MU )
   110       CONTINUE
          END IF
       END IF
@@ -586,7 +591,7 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *     Compute shift.  First, test if shifting would ruin relative
 *     accuracy, and if so set the shift to zero.
 *
-      IF( TOL.GE.ZERO .AND. N*TOL*( SMINL / SMAX ).LE.
+      IF( TOL.GE.ZERO .AND. REAL( N )*TOL*( SMIN / SMAX ).LE.
      $    MAX( EPS, HNDRTH*TOL ) ) THEN
 *
 *        Use a zero shift to avoid loss of relative accuracy
@@ -630,7 +635,8 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
                CALL SLARTG( D( I )*CS, E( I ), CS, SN, R )
                IF( I.GT.LL )
      $            E( I-1 ) = OLDSN*R
-               CALL SLARTG( OLDCS*R, D( I+1 )*SN, OLDCS, OLDSN, D( I ) )
+               CALL SLARTG( OLDCS*R, D( I+1 )*SN, OLDCS, OLDSN,
+     $                      D( I ) )
                WORK( I-LL+1 ) = CS
                WORK( I-LL+1+NM1 ) = SN
                WORK( I-LL+1+NM12 ) = OLDCS
@@ -646,10 +652,12 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $         CALL SLASR( 'L', 'V', 'F', M-LL+1, NCVT, WORK( 1 ),
      $                     WORK( N ), VT( LL, 1 ), LDVT )
             IF( NRU.GT.0 )
-     $         CALL SLASR( 'R', 'V', 'F', NRU, M-LL+1, WORK( NM12+1 ),
+     $         CALL SLASR( 'R', 'V', 'F', NRU, M-LL+1,
+     $                     WORK( NM12+1 ),
      $                     WORK( NM13+1 ), U( 1, LL ), LDU )
             IF( NCC.GT.0 )
-     $         CALL SLASR( 'L', 'V', 'F', M-LL+1, NCC, WORK( NM12+1 ),
+     $         CALL SLASR( 'L', 'V', 'F', M-LL+1, NCC,
+     $                     WORK( NM12+1 ),
      $                     WORK( NM13+1 ), C( LL, 1 ), LDC )
 *
 *           Test convergence
@@ -668,7 +676,8 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
                CALL SLARTG( D( I )*CS, E( I-1 ), CS, SN, R )
                IF( I.LT.M )
      $            E( I ) = OLDSN*R
-               CALL SLARTG( OLDCS*R, D( I-1 )*SN, OLDCS, OLDSN, D( I ) )
+               CALL SLARTG( OLDCS*R, D( I-1 )*SN, OLDCS, OLDSN,
+     $                      D( I ) )
                WORK( I-LL ) = CS
                WORK( I-LL+NM1 ) = -SN
                WORK( I-LL+NM12 ) = OLDCS
@@ -681,7 +690,8 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *           Update singular vectors
 *
             IF( NCVT.GT.0 )
-     $         CALL SLASR( 'L', 'V', 'B', M-LL+1, NCVT, WORK( NM12+1 ),
+     $         CALL SLASR( 'L', 'V', 'B', M-LL+1, NCVT,
+     $                     WORK( NM12+1 ),
      $                     WORK( NM13+1 ), VT( LL, 1 ), LDVT )
             IF( NRU.GT.0 )
      $         CALL SLASR( 'R', 'V', 'B', NRU, M-LL+1, WORK( 1 ),
@@ -736,10 +746,12 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $         CALL SLASR( 'L', 'V', 'F', M-LL+1, NCVT, WORK( 1 ),
      $                     WORK( N ), VT( LL, 1 ), LDVT )
             IF( NRU.GT.0 )
-     $         CALL SLASR( 'R', 'V', 'F', NRU, M-LL+1, WORK( NM12+1 ),
+     $         CALL SLASR( 'R', 'V', 'F', NRU, M-LL+1,
+     $                     WORK( NM12+1 ),
      $                     WORK( NM13+1 ), U( 1, LL ), LDU )
             IF( NCC.GT.0 )
-     $         CALL SLASR( 'L', 'V', 'F', M-LL+1, NCC, WORK( NM12+1 ),
+     $         CALL SLASR( 'L', 'V', 'F', M-LL+1, NCC,
+     $                     WORK( NM12+1 ),
      $                     WORK( NM13+1 ), C( LL, 1 ), LDC )
 *
 *           Test convergence
@@ -786,7 +798,8 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *           Update singular vectors if desired
 *
             IF( NCVT.GT.0 )
-     $         CALL SLASR( 'L', 'V', 'B', M-LL+1, NCVT, WORK( NM12+1 ),
+     $         CALL SLASR( 'L', 'V', 'B', M-LL+1, NCVT,
+     $                     WORK( NM12+1 ),
      $                     WORK( NM13+1 ), VT( LL, 1 ), LDVT )
             IF( NRU.GT.0 )
      $         CALL SLASR( 'R', 'V', 'B', NRU, M-LL+1, WORK( 1 ),
@@ -805,7 +818,14 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *
   160 CONTINUE
       DO 170 I = 1, N
+         IF( D( I ).EQ.ZERO ) THEN
+*
+*           Avoid -ZERO
+*
+            D( I ) = ZERO
+         END IF
          IF( D( I ).LT.ZERO ) THEN
+
             D( I ) = -D( I )
 *
 *           Change sign of singular vectors, if desired
@@ -842,7 +862,8 @@ SUBROUTINE SBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
             IF( NRU.GT.0 )
      $         CALL SSWAP( NRU, U( 1, ISUB ), 1, U( 1, N+1-I ), 1 )
             IF( NCC.GT.0 )
-     $         CALL SSWAP( NCC, C( ISUB, 1 ), LDC, C( N+1-I, 1 ), LDC )
+     $         CALL SSWAP( NCC, C( ISUB, 1 ), LDC, C( N+1-I, 1 ),
+     $                     LDC )
          END IF
   190 CONTINUE
       GO TO 220
diff --git a/SRC/sbdsvdx.f b/SRC/sbdsvdx.f
index dcd554f1d7..6c6bc27aea 100644
--- a/SRC/sbdsvdx.f
+++ b/SRC/sbdsvdx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SBDSVDX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sbdsvdx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sbdsvdx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -45,7 +43,7 @@
 *>
 *>  Given an upper bidiagonal B with diagonal D = [ d_1 d_2 ... d_N ]
 *>  and superdiagonal E = [ e_1 e_2 ... e_N-1 ], SBDSVDX computes the
-*>  singular value decompositon of B through the eigenvalues and
+*>  singular value decomposition of B through the eigenvalues and
 *>  eigenvectors of the N*2-by-N*2 tridiagonal matrix
 *>
 *>        |  0  d_1                |
@@ -218,11 +216,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup bdsvdx
 *
 *  =====================================================================
       SUBROUTINE SBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $                    NS, S, Z, LDZ, WORK, IWORK, INFO)
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -263,10 +262,12 @@ SUBROUTINE SBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
       LOGICAL            LSAME
       INTEGER            ISAMAX
       REAL               SDOT, SLAMCH, SNRM2
-      EXTERNAL           ISAMAX, LSAME, SAXPY, SDOT, SLAMCH, SNRM2
+      EXTERNAL           ISAMAX, LSAME, SAXPY, SDOT, SLAMCH,
+     $                   SNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLASET, SSCAL, SSWAP, SSTEVX, XERBLA
+      EXTERNAL           SCOPY, SLASET, SSCAL, SSWAP, SSTEVX,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, REAL, SIGN, SQRT
@@ -423,7 +424,8 @@ SUBROUTINE SBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
          IF( NS.EQ.0 ) THEN
             RETURN
          ELSE
-            IF( WANTZ ) CALL SLASET( 'F', N*2, NS, ZERO, ZERO, Z, LDZ )
+            IF( WANTZ ) CALL SLASET( 'F', N*2, NS, ZERO, ZERO, Z,
+     $          LDZ )
          END IF
       ELSE IF( INDSV ) THEN
 *
@@ -444,7 +446,7 @@ SUBROUTINE SBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $                VLTGK, VLTGK, ILTGK, ILTGK, ABSTOL, NS, S,
      $                Z, LDZ, WORK( ITEMP ), IWORK( IIWORK ),
      $                IWORK( IIFAIL ), INFO )
-         VLTGK = S( 1 ) - FUDGE*SMAX*ULP*N
+         VLTGK = S( 1 ) - FUDGE*SMAX*ULP*REAL( N )
          WORK( IDTGK:IDTGK+2*N-1 ) = ZERO
          CALL SCOPY( N, D, 1, WORK( IETGK ), 2 )
          CALL SCOPY( N-1, E, 1, WORK( IETGK+1 ), 2 )
@@ -452,7 +454,7 @@ SUBROUTINE SBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $                VUTGK, VUTGK, IUTGK, IUTGK, ABSTOL, NS, S,
      $                Z, LDZ, WORK( ITEMP ), IWORK( IIWORK ),
      $                IWORK( IIFAIL ), INFO )
-         VUTGK = S( 1 ) + FUDGE*SMAX*ULP*N
+         VUTGK = S( 1 ) + FUDGE*SMAX*ULP*REAL( N )
          VUTGK = MIN( VUTGK, ZERO )
 *
 *        If VLTGK=VUTGK, SSTEVX returns an error message,
@@ -460,7 +462,8 @@ SUBROUTINE SBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
 *
          IF( VLTGK.EQ.VUTGK ) VLTGK = VLTGK - TOL
 *
-         IF( WANTZ ) CALL SLASET( 'F', N*2, IU-IL+1, ZERO, ZERO, Z, LDZ)
+         IF( WANTZ ) CALL SLASET( 'F', N*2, IU-IL+1, ZERO, ZERO, Z,
+     $       LDZ)
       END IF
 *
 *     Initialize variables and pointers for S, Z, and WORK.
@@ -587,7 +590,8 @@ SUBROUTINE SBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
 *                 WORK( ITEMP: ): 2*5*NTGK
 *                 IWORK( 1: ): 2*6*NTGK
 *
-                  CALL SSTEVX( JOBZ, RNGVX, NTGK, WORK( IDTGK+ISPLT-1 ),
+                  CALL SSTEVX( JOBZ, RNGVX, NTGK,
+     $                         WORK( IDTGK+ISPLT-1 ),
      $                         WORK( IETGK+ISPLT-1 ), VLTGK, VUTGK,
      $                         ILTGK, IUTGK, ABSTOL, NSL, S( ISBEG ),
      $                         Z( IROWZ,ICOLZ ), LDZ, WORK( ITEMP ),
@@ -642,13 +646,15 @@ SUBROUTINE SBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $                      ABS( NRMU-ORTOL )*SQRT2.GT.ONE )
      $                      THEN
                            DO J = 0, I-1
-                              ZJTJI = -SDOT( NRU, Z( IROWU, ICOLZ+J ),
+                              ZJTJI = -SDOT( NRU, Z( IROWU,
+     $                                       ICOLZ+J ),
      $                                       2, Z( IROWU, ICOLZ+I ), 2 )
                               CALL SAXPY( NRU, ZJTJI,
      $                                    Z( IROWU, ICOLZ+J ), 2,
      $                                    Z( IROWU, ICOLZ+I ), 2 )
                            END DO
-                           NRMU = SNRM2( NRU, Z( IROWU, ICOLZ+I ), 2 )
+                           NRMU = SNRM2( NRU, Z( IROWU, ICOLZ+I ),
+     $                                   2 )
                            CALL SSCAL( NRU, ONE/NRMU,
      $                                 Z( IROWU,ICOLZ+I ), 2 )
                         END IF
@@ -665,13 +671,15 @@ SUBROUTINE SBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $                      ABS( NRMV-ORTOL )*SQRT2.GT.ONE )
      $                      THEN
                            DO J = 0, I-1
-                              ZJTJI = -SDOT( NRV, Z( IROWV, ICOLZ+J ),
+                              ZJTJI = -SDOT( NRV, Z( IROWV,
+     $                                       ICOLZ+J ),
      $                                       2, Z( IROWV, ICOLZ+I ), 2 )
                               CALL SAXPY( NRU, ZJTJI,
      $                                    Z( IROWV, ICOLZ+J ), 2,
      $                                    Z( IROWV, ICOLZ+I ), 2 )
                            END DO
-                           NRMV = SNRM2( NRV, Z( IROWV, ICOLZ+I ), 2 )
+                           NRMV = SNRM2( NRV, Z( IROWV, ICOLZ+I ),
+     $                                   2 )
                            CALL SSCAL( NRV, ONE/NRMV,
      $                                 Z( IROWV,ICOLZ+I ), 2 )
                         END IF
@@ -751,7 +759,8 @@ SUBROUTINE SBDSVDX( UPLO, JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
          IF( K.NE.NS+1-I ) THEN
             S( K ) = S( NS+1-I )
             S( NS+1-I ) = SMIN
-            IF( WANTZ ) CALL SSWAP( N*2, Z( 1,K ), 1, Z( 1,NS+1-I ), 1 )
+            IF( WANTZ ) CALL SSWAP( N*2, Z( 1,K ), 1, Z( 1,NS+1-I ),
+     $          1 )
          END IF
       END DO
 *
diff --git a/SRC/scsum1.f b/SRC/scsum1.f
index 2616e4b789..f4f14df56a 100644
--- a/SRC/scsum1.f
+++ b/SRC/scsum1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SCSUM1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/scsum1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/scsum1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -69,7 +67,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERauxiliary
+*> \ingroup sum1
 *
 *> \par Contributors:
 *  ==================
@@ -78,6 +76,7 @@
 *
 *  =====================================================================
       REAL             FUNCTION SCSUM1( N, CX, INCX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sdisna.f b/SRC/sdisna.f
index 004ceae673..bf0f1403ea 100644
--- a/SRC/sdisna.f
+++ b/SRC/sdisna.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SDISNA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sdisna.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sdisna.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -110,10 +108,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup disna
 *
 *  =====================================================================
       SUBROUTINE SDISNA( JOB, M, N, D, SEP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sgbbrd.f b/SRC/sgbbrd.f
index 74e9fe7675..c8b913e0ad 100644
--- a/SRC/sgbbrd.f
+++ b/SRC/sgbbrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGBBRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgbbrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgbbrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -179,11 +177,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBcomputational
+*> \ingroup gbbrd
 *
 *  =====================================================================
       SUBROUTINE SGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
      $                   LDQ, PT, LDPT, C, LDC, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -211,7 +210,8 @@ SUBROUTINE SGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
       REAL               RA, RB, RC, RS
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARGV, SLARTG, SLARTV, SLASET, SROT, XERBLA
+      EXTERNAL           SLARGV, SLARTG, SLARTV, SLASET, SROT,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -230,7 +230,8 @@ SUBROUTINE SGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
       WANTC = NCC.GT.0
       KLU1 = KL + KU + 1
       INFO = 0
-      IF( .NOT.WANTQ .AND. .NOT.WANTPT .AND. .NOT.LSAME( VECT, 'N' ) )
+      IF( .NOT.WANTQ .AND. .NOT.WANTPT .AND.
+     $ .NOT.LSAME( VECT, 'N' ) )
      $     THEN
          INFO = -1
       ELSE IF( M.LT.0 ) THEN
@@ -327,7 +328,8 @@ SUBROUTINE SGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
                      NRT = NR
                   END IF
                   IF( NRT.GT.0 )
-     $               CALL SLARTV( NRT, AB( KLU1-L, J1-KLM+L-1 ), INCA,
+     $               CALL SLARTV( NRT, AB( KLU1-L, J1-KLM+L-1 ),
+     $                            INCA,
      $                            AB( KLU1-L+1, J1-KLM+L-1 ), INCA,
      $                            WORK( MN+J1 ), WORK( J1 ), KB1 )
    10          CONTINUE
@@ -367,7 +369,8 @@ SUBROUTINE SGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
 *                 apply plane rotations to C
 *
                   DO 30 J = J1, J2, KB1
-                     CALL SROT( NCC, C( J-1, 1 ), LDC, C( J, 1 ), LDC,
+                     CALL SROT( NCC, C( J-1, 1 ), LDC, C( J, 1 ),
+     $                          LDC,
      $                          WORK( MN+J ), WORK( J ) )
    30             CONTINUE
                END IF
diff --git a/SRC/sgbcon.f b/SRC/sgbcon.f
index 1914f152cd..50fdc5dfed 100644
--- a/SRC/sgbcon.f
+++ b/SRC/sgbcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGBCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgbcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgbcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -138,11 +136,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBcomputational
+*> \ingroup gbcon
 *
 *  =====================================================================
-      SUBROUTINE SGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM, RCOND,
-     $                   WORK, IWORK, INFO )
+      SUBROUTINE SGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM,
+     $                   RCOND, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -180,7 +179,8 @@ SUBROUTINE SGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM, RCOND,
       EXTERNAL           LSAME, ISAMAX, SDOT, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SLACN2, SLATBS, SRSCL, XERBLA
+      EXTERNAL           SAXPY, SLACN2, SLATBS, SRSCL,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MIN
@@ -249,13 +249,15 @@ SUBROUTINE SGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM, RCOND,
                      WORK( JP ) = WORK( J )
                      WORK( J ) = T
                   END IF
-                  CALL SAXPY( LM, -T, AB( KD+1, J ), 1, WORK( J+1 ), 1 )
+                  CALL SAXPY( LM, -T, AB( KD+1, J ), 1,
+     $                     WORK( J+1 ), 1 )
    20          CONTINUE
             END IF
 *
 *           Multiply by inv(U).
 *
-            CALL SLATBS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL SLATBS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   KL+KU, AB, LDAB, WORK, SCALE, WORK( 2*N+1 ),
      $                   INFO )
          ELSE
diff --git a/SRC/sgbequ.f b/SRC/sgbequ.f
index b3c4dfd5db..926407805b 100644
--- a/SRC/sgbequ.f
+++ b/SRC/sgbequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGBEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgbequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgbequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -145,11 +143,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBcomputational
+*> \ingroup gbequ
 *
 *  =====================================================================
-      SUBROUTINE SGBEQU( M, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+      SUBROUTINE SGBEQU( M, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                   COLCND,
      $                   AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sgbequb.f b/SRC/sgbequb.f
index 206624d2a9..4aaf010f62 100644
--- a/SRC/sgbequb.f
+++ b/SRC/sgbequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGBEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgbequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgbequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -152,11 +150,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBcomputational
+*> \ingroup gbequb
 *
 *  =====================================================================
-      SUBROUTINE SGBEQUB( M, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+      SUBROUTINE SGBEQUB( M, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                    COLCND,
      $                    AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sgbrfs.f b/SRC/sgbrfs.f
index 2a8f3d1f2e..88d57973db 100644
--- a/SRC/sgbrfs.f
+++ b/SRC/sgbrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGBRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgbrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgbrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -196,12 +194,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBcomputational
+*> \ingroup gbrfs
 *
 *  =====================================================================
-      SUBROUTINE SGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
+      SUBROUTINE SGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
+     $                   LDAFB,
      $                   IPIV, B, LDB, X, LDX, FERR, BERR, WORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -241,7 +241,8 @@ SUBROUTINE SGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SGBMV, SGBTRS, SLACN2, XERBLA
+      EXTERNAL           SAXPY, SCOPY, SGBMV, SGBTRS, SLACN2,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN
@@ -303,7 +304,7 @@ SUBROUTINE SGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
       NZ = MIN( KL+KU+2, N+1 )
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -320,7 +321,8 @@ SUBROUTINE SGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
 *        where op(A) = A, A**T, or A**H, depending on TRANS.
 *
          CALL SCOPY( N, B( 1, J ), 1, WORK( N+1 ), 1 )
-         CALL SGBMV( TRANS, N, N, KL, KU, -ONE, AB, LDAB, X( 1, J ), 1,
+         CALL SGBMV( TRANS, N, N, KL, KU, -ONE, AB, LDAB, X( 1, J ),
+     $               1,
      $               ONE, WORK( N+1 ), 1 )
 *
 *        Compute componentwise relative backward error from formula
@@ -410,15 +412,17 @@ SUBROUTINE SGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
 *
          DO 90 I = 1, N
             IF( WORK( I ).GT.SAFE2 ) THEN
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I )
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
             ELSE
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I ) + SAFE1
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
+     $                     + SAFE1
             END IF
    90    CONTINUE
 *
          KASE = 0
   100    CONTINUE
-         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
diff --git a/SRC/sgbrfsx.f b/SRC/sgbrfsx.f
index 0193ba4f07..bb827d31fc 100644
--- a/SRC/sgbrfsx.f
+++ b/SRC/sgbrfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGBRFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgbrfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgbrfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -429,14 +427,16 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBcomputational
+*> \ingroup gbrfsx
 *
 *  =====================================================================
-      SUBROUTINE SGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
+      SUBROUTINE SGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB,
+     $                    AFB,
      $                    LDAFB, IPIV, R, C, B, LDB, X, LDX, RCOND,
      $                    BERR, N_ERR_BNDS, ERR_BNDS_NORM,
      $                    ERR_BNDS_COMP, NPARAMS, PARAMS, WORK, IWORK,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -647,14 +647,16 @@ SUBROUTINE SGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
          PREC_TYPE = ILAPREC( 'D' )
 
          IF ( NOTRAN ) THEN
-            CALL SLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE,  N, KL, KU,
+            CALL SLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE,  N, KL,
+     $                                KU,
      $           NRHS, AB, LDAB, AFB, LDAFB, IPIV, COLEQU, C, B,
      $           LDB, X, LDX, BERR, N_NORMS, ERR_BNDS_NORM,
      $           ERR_BNDS_COMP, WORK( N+1 ), WORK( 1 ), WORK( 2*N+1 ),
      $           WORK( 1 ), RCOND, ITHRESH, RTHRESH, UNSTABLE_THRESH,
      $           IGNORE_CWISE, INFO )
          ELSE
-            CALL SLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE,  N, KL, KU,
+            CALL SLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE,  N, KL,
+     $                                KU,
      $           NRHS, AB, LDAB, AFB, LDAFB, IPIV, ROWEQU, R, B,
      $           LDB, X, LDX, BERR, N_NORMS, ERR_BNDS_NORM,
      $           ERR_BNDS_COMP, WORK( N+1 ), WORK( 1 ), WORK( 2*N+1 ),
@@ -721,7 +723,8 @@ SUBROUTINE SGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
          DO J = 1, NRHS
             IF ( ERR_BNDS_COMP( J, LA_LINRX_ERR_I ) .LT. CWISE_WRONG )
      $     THEN
-               RCOND_TMP = SLA_GBRCOND( TRANS, N, KL, KU, AB, LDAB, AFB,
+               RCOND_TMP = SLA_GBRCOND( TRANS, N, KL, KU, AB, LDAB,
+     $                                  AFB,
      $              LDAFB, IPIV, 1, X( 1, J ), INFO, WORK, IWORK )
             ELSE
                RCOND_TMP = 0.0
diff --git a/SRC/sgbsv.f b/SRC/sgbsv.f
index d4af6dfe3f..84a45dda73 100644
--- a/SRC/sgbsv.f
+++ b/SRC/sgbsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGBSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgbsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgbsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,7 +131,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBsolve
+*> \ingroup gbsv
 *
 *> \par Further Details:
 *  =====================
@@ -158,7 +156,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SGBSV( N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB, INFO )
+      SUBROUTINE SGBSV( N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
+     $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -210,7 +210,8 @@ SUBROUTINE SGBSV( N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB, INFO )
 *
 *        Solve the system A*X = B, overwriting B with X.
 *
-         CALL SGBTRS( 'No transpose', N, KL, KU, NRHS, AB, LDAB, IPIV,
+         CALL SGBTRS( 'No transpose', N, KL, KU, NRHS, AB, LDAB,
+     $                IPIV,
      $                B, LDB, INFO )
       END IF
       RETURN
diff --git a/SRC/sgbsvx.f b/SRC/sgbsvx.f
index 40829a71b3..74df0533a6 100644
--- a/SRC/sgbsvx.f
+++ b/SRC/sgbsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGBSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgbsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgbsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -316,7 +314,7 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is REAL array, dimension (3*N)
+*>          WORK is REAL array, dimension (MAX(1,3*N))
 *>          On exit, WORK(1) contains the reciprocal pivot growth
 *>          factor norm(A)/norm(U). The "max absolute element" norm is
 *>          used. If WORK(1) is much less than 1, then the stability
@@ -359,12 +357,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBsolve
+*> \ingroup gbsvx
 *
 *  =====================================================================
       SUBROUTINE SGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
      $                   LDAFB, IPIV, EQUED, R, C, B, LDB, X, LDX,
      $                   RCOND, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -404,7 +403,8 @@ SUBROUTINE SGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
       EXTERNAL           LSAME, SLAMCH, SLANGB, SLANTB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGBCON, SGBEQU, SGBRFS, SGBTRF, SGBTRS,
+      EXTERNAL           SCOPY, SGBCON, SGBEQU, SGBRFS, SGBTRF,
+     $                   SGBTRS,
      $                   SLACPY, SLAQGB, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -429,7 +429,9 @@ SUBROUTINE SGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
       ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
@@ -505,7 +507,8 @@ SUBROUTINE SGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *
 *           Equilibrate the matrix.
 *
-            CALL SLAQGB( N, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+            CALL SLAQGB( N, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                   COLCND,
      $                   AMAX, EQUED )
             ROWEQU = LSAME( EQUED, 'R' ) .OR. LSAME( EQUED, 'B' )
             COLEQU = LSAME( EQUED, 'C' ) .OR. LSAME( EQUED, 'B' )
@@ -556,7 +559,8 @@ SUBROUTINE SGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
                   ANORM = MAX( ANORM, ABS( AB( I, J ) ) )
    80          CONTINUE
    90       CONTINUE
-            RPVGRW = SLANTB( 'M', 'U', 'N', INFO, MIN( INFO-1, KL+KU ),
+            RPVGRW = SLANTB( 'M', 'U', 'N', INFO, MIN( INFO-1,
+     $                       KL+KU ),
      $                       AFB( MAX( 1, KL+KU+2-INFO ), 1 ), LDAFB,
      $                       WORK )
             IF( RPVGRW.EQ.ZERO ) THEN
@@ -600,7 +604,8 @@ SUBROUTINE SGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *     Use iterative refinement to improve the computed solution and
 *     compute error bounds and backward error estimates for it.
 *
-      CALL SGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB, IPIV,
+      CALL SGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
+     $             IPIV,
      $             B, LDB, X, LDX, FERR, BERR, WORK, IWORK, INFO )
 *
 *     Transform the solution matrix X to a solution of the original
diff --git a/SRC/sgbsvxx.f b/SRC/sgbsvxx.f
index aef9034ae8..12b23025cf 100644
--- a/SRC/sgbsvxx.f
+++ b/SRC/sgbsvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGBSVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgbsvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgbsvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -552,14 +550,16 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBsolve
+*> \ingroup gbsvxx
 *
 *  =====================================================================
-      SUBROUTINE SGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
+      SUBROUTINE SGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB,
+     $                    AFB,
      $                    LDAFB, IPIV, EQUED, R, C, B, LDB, X, LDX,
      $                    RCOND, RPVGRW, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -606,7 +606,8 @@ SUBROUTINE SGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
       REAL               SLAMCH, SLA_GBRPVGRW
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGBEQUB, SGBTRF, SGBTRS, SLACPY, SLAQGB,
+      EXTERNAL           SGBEQUB, SGBTRF, SGBTRS, SLACPY,
+     $                   SLAQGB,
      $                   XERBLA, SLASCL2, SGBRFSX
 *     ..
 *     .. Intrinsic Functions ..
@@ -713,7 +714,8 @@ SUBROUTINE SGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *
 *     Equilibrate the matrix.
 *
-            CALL SLAQGB( N, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+            CALL SLAQGB( N, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                   COLCND,
      $           AMAX, EQUED )
             ROWEQU = LSAME( EQUED, 'R' ) .OR. LSAME( EQUED, 'B' )
             COLEQU = LSAME( EQUED, 'C' ) .OR. LSAME( EQUED, 'B' )
@@ -779,7 +781,8 @@ SUBROUTINE SGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *     Use iterative refinement to improve the computed solution and
 *     compute error bounds and backward error estimates for it.
 *
-      CALL SGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
+      CALL SGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
+     $              LDAFB,
      $     IPIV, R, C, B, LDB, X, LDX, RCOND, BERR,
      $     N_ERR_BNDS, ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $     WORK, IWORK, INFO )
diff --git a/SRC/sgbtf2.f b/SRC/sgbtf2.f
index 8bdea3902f..d8e3918f8b 100644
--- a/SRC/sgbtf2.f
+++ b/SRC/sgbtf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGBTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgbtf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgbtf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,7 +113,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBcomputational
+*> \ingroup gbtf2
 *
 *> \par Further Details:
 *  =====================
@@ -142,6 +140,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGBTF2( M, N, KL, KU, AB, LDAB, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -249,7 +248,8 @@ SUBROUTINE SGBTF2( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *              Compute multipliers.
 *
-               CALL SSCAL( KM, ONE / AB( KV+1, J ), AB( KV+2, J ), 1 )
+               CALL SSCAL( KM, ONE / AB( KV+1, J ), AB( KV+2, J ),
+     $                     1 )
 *
 *              Update trailing submatrix within the band.
 *
diff --git a/SRC/sgbtrf.f b/SRC/sgbtrf.f
index 56712f157e..322f4d6dbb 100644
--- a/SRC/sgbtrf.f
+++ b/SRC/sgbtrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGBTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgbtrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgbtrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,7 +113,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBcomputational
+*> \ingroup gbtrf
 *
 *> \par Further Details:
 *  =====================
@@ -141,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -176,7 +175,8 @@ SUBROUTINE SGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
       EXTERNAL           ILAENV, ISAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGBTF2, SGEMM, SGER, SLASWP, SSCAL,
+      EXTERNAL           SCOPY, SGBTF2, SGEMM, SGER, SLASWP,
+     $                   SSCAL,
      $                   SSWAP, STRSM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -324,7 +324,8 @@ SUBROUTINE SGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                 Compute multipliers
 *
-                  CALL SSCAL( KM, ONE / AB( KV+1, JJ ), AB( KV+2, JJ ),
+                  CALL SSCAL( KM, ONE / AB( KV+1, JJ ), AB( KV+2,
+     $                        JJ ),
      $                        1 )
 *
 *                 Update trailing submatrix within the band and within
@@ -393,7 +394,8 @@ SUBROUTINE SGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                 Update A12
 *
-                  CALL STRSM( 'Left', 'Lower', 'No transpose', 'Unit',
+                  CALL STRSM( 'Left', 'Lower', 'No transpose',
+     $                        'Unit',
      $                        JB, J2, ONE, AB( KV+1, J ), LDAB-1,
      $                        AB( KV+1-JB, J+JB ), LDAB-1 )
 *
@@ -401,7 +403,8 @@ SUBROUTINE SGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                    Update A22
 *
-                     CALL SGEMM( 'No transpose', 'No transpose', I2, J2,
+                     CALL SGEMM( 'No transpose', 'No transpose', I2,
+     $                           J2,
      $                           JB, -ONE, AB( KV+1+JB, J ), LDAB-1,
      $                           AB( KV+1-JB, J+JB ), LDAB-1, ONE,
      $                           AB( KV+1, J+JB ), LDAB-1 )
@@ -411,7 +414,8 @@ SUBROUTINE SGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                    Update A32
 *
-                     CALL SGEMM( 'No transpose', 'No transpose', I3, J2,
+                     CALL SGEMM( 'No transpose', 'No transpose', I3,
+     $                           J2,
      $                           JB, -ONE, WORK31, LDWORK,
      $                           AB( KV+1-JB, J+JB ), LDAB-1, ONE,
      $                           AB( KV+KL+1-JB, J+JB ), LDAB-1 )
@@ -431,7 +435,8 @@ SUBROUTINE SGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                 Update A13 in the work array
 *
-                  CALL STRSM( 'Left', 'Lower', 'No transpose', 'Unit',
+                  CALL STRSM( 'Left', 'Lower', 'No transpose',
+     $                        'Unit',
      $                        JB, J3, ONE, AB( KV+1, J ), LDAB-1,
      $                        WORK13, LDWORK )
 *
@@ -439,7 +444,8 @@ SUBROUTINE SGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                    Update A23
 *
-                     CALL SGEMM( 'No transpose', 'No transpose', I2, J3,
+                     CALL SGEMM( 'No transpose', 'No transpose', I2,
+     $                           J3,
      $                           JB, -ONE, AB( KV+1+JB, J ), LDAB-1,
      $                           WORK13, LDWORK, ONE, AB( 1+JB, J+KV ),
      $                           LDAB-1 )
@@ -449,7 +455,8 @@ SUBROUTINE SGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                    Update A33
 *
-                     CALL SGEMM( 'No transpose', 'No transpose', I3, J3,
+                     CALL SGEMM( 'No transpose', 'No transpose', I3,
+     $                           J3,
      $                           JB, -ONE, WORK31, LDWORK, WORK13,
      $                           LDWORK, ONE, AB( 1+KL, J+KV ), LDAB-1 )
                   END IF
diff --git a/SRC/sgbtrs.f b/SRC/sgbtrs.f
index fc4601b5f1..924c696737 100644
--- a/SRC/sgbtrs.f
+++ b/SRC/sgbtrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGBTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgbtrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgbtrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,11 +128,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBcomputational
+*> \ingroup gbtrs
 *
 *  =====================================================================
-      SUBROUTINE SGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
+      SUBROUTINE SGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B,
+     $                   LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -221,7 +221,8 @@ SUBROUTINE SGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
                L = IPIV( J )
                IF( L.NE.J )
      $            CALL SSWAP( NRHS, B( L, 1 ), LDB, B( J, 1 ), LDB )
-               CALL SGER( LM, NRHS, -ONE, AB( KD+1, J ), 1, B( J, 1 ),
+               CALL SGER( LM, NRHS, -ONE, AB( KD+1, J ), 1, B( J,
+     $                    1 ),
      $                    LDB, B( J+1, 1 ), LDB )
    10       CONTINUE
          END IF
@@ -230,7 +231,8 @@ SUBROUTINE SGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
 *
 *           Solve U*X = B, overwriting B with X.
 *
-            CALL STBSV( 'Upper', 'No transpose', 'Non-unit', N, KL+KU,
+            CALL STBSV( 'Upper', 'No transpose', 'Non-unit', N,
+     $                  KL+KU,
      $                  AB, LDAB, B( 1, I ), 1 )
    20    CONTINUE
 *
@@ -242,7 +244,8 @@ SUBROUTINE SGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
 *
 *           Solve U**T*X = B, overwriting B with X.
 *
-            CALL STBSV( 'Upper', 'Transpose', 'Non-unit', N, KL+KU, AB,
+            CALL STBSV( 'Upper', 'Transpose', 'Non-unit', N, KL+KU,
+     $                  AB,
      $                  LDAB, B( 1, I ), 1 )
    30    CONTINUE
 *
diff --git a/SRC/sgebak.f b/SRC/sgebak.f
index b51b611a95..a402845257 100644
--- a/SRC/sgebak.f
+++ b/SRC/sgebak.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEBAK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgebak.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgebak.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,11 +120,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup gebak
 *
 *  =====================================================================
       SUBROUTINE SGEBAK( JOB, SIDE, N, ILO, IHI, SCALE, M, V, LDV,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -169,8 +168,10 @@ SUBROUTINE SGEBAK( JOB, SIDE, N, ILO, IHI, SCALE, M, V, LDV,
       LEFTV = LSAME( SIDE, 'L' )
 *
       INFO = 0
-      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
-     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+      IF( .NOT.LSAME( JOB, 'N' ) .AND.
+     $    .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND.
+     $                .NOT.LSAME( JOB, 'B' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.RIGHTV .AND. .NOT.LEFTV ) THEN
          INFO = -2
@@ -236,7 +237,7 @@ SUBROUTINE SGEBAK( JOB, SIDE, N, ILO, IHI, SCALE, M, V, LDV,
      $            GO TO 40
                IF( I.LT.ILO )
      $            I = ILO - II
-               K = SCALE( I )
+               K = INT( SCALE( I ) )
                IF( K.EQ.I )
      $            GO TO 40
                CALL SSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
@@ -250,7 +251,7 @@ SUBROUTINE SGEBAK( JOB, SIDE, N, ILO, IHI, SCALE, M, V, LDV,
      $            GO TO 50
                IF( I.LT.ILO )
      $            I = ILO - II
-               K = SCALE( I )
+               K = INT( SCALE( I ) )
                IF( K.EQ.I )
      $            GO TO 50
                CALL SSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
diff --git a/SRC/sgebal.f b/SRC/sgebal.f
index f519c8c575..0bfcb02ed3 100644
--- a/SRC/sgebal.f
+++ b/SRC/sgebal.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEBAL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgebal.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgebal.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,7 +119,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup gebal
 *
 *> \par Further Details:
 *  =====================
@@ -153,10 +151,14 @@
 *>
 *>  Modified by Tzu-Yi Chen, Computer Science Division, University of
 *>    California at Berkeley, USA
+*>
+*>  Refactored by Evert Provoost, Department of Computer Science,
+*>    KU Leuven, Belgium
 *> \endverbatim
 *>
 *  =====================================================================
       SUBROUTINE SGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -181,8 +183,8 @@ SUBROUTINE SGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
       PARAMETER          ( FACTOR = 0.95E+0 )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            NOCONV
-      INTEGER            I, ICA, IEXC, IRA, J, K, L, M
+      LOGICAL            NOCONV, CANSWAP
+      INTEGER            I, ICA, IRA, J, K, L
       REAL               C, CA, F, G, R, RA, S, SFMAX1, SFMAX2, SFMIN1,
      $                   SFMIN2
 *     ..
@@ -190,19 +192,22 @@ SUBROUTINE SGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
       LOGICAL            SISNAN, LSAME
       INTEGER            ISAMAX
       REAL               SLAMCH, SNRM2
-      EXTERNAL           SISNAN, LSAME, ISAMAX, SLAMCH, SNRM2
+      EXTERNAL           SISNAN, LSAME, ISAMAX, SLAMCH,
+     $                   SNRM2
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SSCAL, SSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN
-*
+*     ..
 *     Test the input parameters
 *
       INFO = 0
-      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
-     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+      IF( .NOT.LSAME( JOB, 'N' ) .AND.
+     $    .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND.
+     $                .NOT.LSAME( JOB, 'B' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -214,176 +219,194 @@ SUBROUTINE SGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
          RETURN
       END IF
 *
-      K = 1
-      L = N
+*     Quick returns.
 *
-      IF( N.EQ.0 )
-     $   GO TO 210
+      IF( N.EQ.0 ) THEN
+         ILO = 1
+         IHI = 0
+         RETURN
+      END IF
 *
       IF( LSAME( JOB, 'N' ) ) THEN
-         DO 10 I = 1, N
+         DO I = 1, N
             SCALE( I ) = ONE
-   10    CONTINUE
-         GO TO 210
+         END DO
+         ILO = 1
+         IHI = N
+         RETURN
       END IF
 *
-      IF( LSAME( JOB, 'S' ) )
-     $   GO TO 120
-*
-*     Permutation to isolate eigenvalues if possible
-*
-      GO TO 50
-*
-*     Row and column exchange.
-*
-   20 CONTINUE
-      SCALE( M ) = J
-      IF( J.EQ.M )
-     $   GO TO 30
-*
-      CALL SSWAP( L, A( 1, J ), 1, A( 1, M ), 1 )
-      CALL SSWAP( N-K+1, A( J, K ), LDA, A( M, K ), LDA )
-*
-   30 CONTINUE
-      GO TO ( 40, 80 )IEXC
-*
-*     Search for rows isolating an eigenvalue and push them down.
-*
-   40 CONTINUE
-      IF( L.EQ.1 )
-     $   GO TO 210
-      L = L - 1
+*     Permutation to isolate eigenvalues if possible.
 *
-   50 CONTINUE
-      DO 70 J = L, 1, -1
-*
-         DO 60 I = 1, L
-            IF( I.EQ.J )
-     $         GO TO 60
-            IF( A( J, I ).NE.ZERO )
-     $         GO TO 70
-   60    CONTINUE
-*
-         M = L
-         IEXC = 1
-         GO TO 20
-   70 CONTINUE
-*
-      GO TO 90
+      K = 1
+      L = N
 *
-*     Search for columns isolating an eigenvalue and push them left.
+      IF( .NOT.LSAME( JOB, 'S' ) ) THEN
 *
-   80 CONTINUE
-      K = K + 1
+*        Row and column exchange.
 *
-   90 CONTINUE
-      DO 110 J = K, L
+         NOCONV = .TRUE.
+         DO WHILE( NOCONV )
+*
+*           Search for rows isolating an eigenvalue and push them down.
+*
+            NOCONV = .FALSE.
+            DO I = L, 1, -1
+               CANSWAP = .TRUE.
+               DO J = 1, L
+                  IF( I.NE.J .AND. A( I, J ).NE.ZERO ) THEN
+                     CANSWAP = .FALSE.
+                     EXIT
+                  END IF
+               END DO
+*
+               IF( CANSWAP ) THEN
+                  SCALE( L ) = REAL( I )
+                  IF( I.NE.L ) THEN
+                     CALL SSWAP( L, A( 1, I ), 1, A( 1, L ), 1 )
+                     CALL SSWAP( N-K+1, A( I, K ), LDA, A( L, K ),
+     $                           LDA )
+                  END IF
+                  NOCONV = .TRUE.
+*
+                  IF( L.EQ.1 ) THEN
+                     ILO = 1
+                     IHI = 1
+                     RETURN
+                  END IF
+*
+                  L = L - 1
+               END IF
+            END DO
+*
+         END DO
+
+         NOCONV = .TRUE.
+         DO WHILE( NOCONV )
+*
+*           Search for columns isolating an eigenvalue and push them left.
+*
+            NOCONV = .FALSE.
+            DO J = K, L
+               CANSWAP = .TRUE.
+               DO I = K, L
+                  IF( I.NE.J .AND. A( I, J ).NE.ZERO ) THEN
+                     CANSWAP = .FALSE.
+                     EXIT
+                  END IF
+               END DO
+*
+               IF( CANSWAP ) THEN
+                  SCALE( K ) = REAL( J )
+                  IF( J.NE.K ) THEN
+                     CALL SSWAP( L, A( 1, J ), 1, A( 1, K ), 1 )
+                     CALL SSWAP( N-K+1, A( J, K ), LDA, A( K, K ),
+     $                           LDA )
+                  END IF
+                  NOCONV = .TRUE.
+*
+                  K = K + 1
+               END IF
+            END DO
+*
+         END DO
 *
-         DO 100 I = K, L
-            IF( I.EQ.J )
-     $         GO TO 100
-            IF( A( I, J ).NE.ZERO )
-     $         GO TO 110
-  100    CONTINUE
+      END IF
 *
-         M = K
-         IEXC = 2
-         GO TO 20
-  110 CONTINUE
+*     Initialize SCALE for non-permuted submatrix.
 *
-  120 CONTINUE
-      DO 130 I = K, L
+      DO I = K, L
          SCALE( I ) = ONE
-  130 CONTINUE
+      END DO
 *
-      IF( LSAME( JOB, 'P' ) )
-     $   GO TO 210
+*     If we only had to permute, we are done.
+*
+      IF( LSAME( JOB, 'P' ) ) THEN
+         ILO = K
+         IHI = L
+         RETURN
+      END IF
 *
 *     Balance the submatrix in rows K to L.
 *
-*     Iterative loop for norm reduction
+*     Iterative loop for norm reduction.
 *
       SFMIN1 = SLAMCH( 'S' ) / SLAMCH( 'P' )
       SFMAX1 = ONE / SFMIN1
       SFMIN2 = SFMIN1*SCLFAC
       SFMAX2 = ONE / SFMIN2
-  140 CONTINUE
-      NOCONV = .FALSE.
-*
-      DO 200 I = K, L
-*
-         C = SNRM2( L-K+1, A( K, I ), 1 )
-         R = SNRM2( L-K+1, A( I, K ), LDA )
-         ICA = ISAMAX( L, A( 1, I ), 1 )
-         CA = ABS( A( ICA, I ) )
-         IRA = ISAMAX( N-K+1, A( I, K ), LDA )
-         RA = ABS( A( I, IRA+K-1 ) )
-*
-*        Guard against zero C or R due to underflow.
-*
-         IF( C.EQ.ZERO .OR. R.EQ.ZERO )
-     $      GO TO 200
-         G = R / SCLFAC
-         F = ONE
-         S = C + R
-  160    CONTINUE
-         IF( C.GE.G .OR. MAX( F, C, CA ).GE.SFMAX2 .OR.
-     $       MIN( R, G, RA ).LE.SFMIN2 )GO TO 170
-         F = F*SCLFAC
-         C = C*SCLFAC
-         CA = CA*SCLFAC
-         R = R / SCLFAC
-         G = G / SCLFAC
-         RA = RA / SCLFAC
-         GO TO 160
-*
-  170    CONTINUE
-         G = C / SCLFAC
-  180    CONTINUE
-         IF( G.LT.R .OR. MAX( R, RA ).GE.SFMAX2 .OR.
-     $       MIN( F, C, G, CA ).LE.SFMIN2 )GO TO 190
-            IF( SISNAN( C+F+CA+R+G+RA ) ) THEN
 *
-*           Exit if NaN to avoid infinite loop
+      NOCONV = .TRUE.
+      DO WHILE( NOCONV )
+         NOCONV = .FALSE.
 *
-            INFO = -3
-            CALL XERBLA( 'SGEBAL', -INFO )
-            RETURN
-         END IF
-         F = F / SCLFAC
-         C = C / SCLFAC
-         G = G / SCLFAC
-         CA = CA / SCLFAC
-         R = R*SCLFAC
-         RA = RA*SCLFAC
-         GO TO 180
-*
-*        Now balance.
-*
-  190    CONTINUE
-         IF( ( C+R ).GE.FACTOR*S )
-     $      GO TO 200
-         IF( F.LT.ONE .AND. SCALE( I ).LT.ONE ) THEN
-            IF( F*SCALE( I ).LE.SFMIN1 )
-     $         GO TO 200
-         END IF
-         IF( F.GT.ONE .AND. SCALE( I ).GT.ONE ) THEN
-            IF( SCALE( I ).GE.SFMAX1 / F )
-     $         GO TO 200
-         END IF
-         G = ONE / F
-         SCALE( I ) = SCALE( I )*F
-         NOCONV = .TRUE.
+         DO I = K, L
+*
+            C = SNRM2( L-K+1, A( K, I ), 1 )
+            R = SNRM2( L-K+1, A( I, K ), LDA )
+            ICA = ISAMAX( L, A( 1, I ), 1 )
+            CA = ABS( A( ICA, I ) )
+            IRA = ISAMAX( N-K+1, A( I, K ), LDA )
+            RA = ABS( A( I, IRA+K-1 ) )
 *
-         CALL SSCAL( N-K+1, G, A( I, K ), LDA )
-         CALL SSCAL( L, F, A( 1, I ), 1 )
+*           Guard against zero C or R due to underflow.
 *
-  200 CONTINUE
+            IF( C.EQ.ZERO .OR. R.EQ.ZERO ) CYCLE
+*
+*           Exit if NaN to avoid infinite loop
 *
-      IF( NOCONV )
-     $   GO TO 140
+            IF( SISNAN( C+CA+R+RA ) ) THEN
+               INFO = -3
+               CALL XERBLA( 'SGEBAL', -INFO )
+               RETURN
+            END IF
+*
+            G = R / SCLFAC
+            F = ONE
+            S = C + R
+*
+            DO WHILE( C.LT.G .AND. MAX( F, C, CA ).LT.SFMAX2 .AND.
+     $                MIN( R, G, RA ).GT.SFMIN2 )
+               F = F*SCLFAC
+               C = C*SCLFAC
+               CA = CA*SCLFAC
+               R = R / SCLFAC
+               G = G / SCLFAC
+               RA = RA / SCLFAC
+            END DO
+*
+            G = C / SCLFAC
+*
+            DO WHILE( G.GE.R .AND. MAX( R, RA ).LT.SFMAX2 .AND.
+     $                MIN( F, C, G, CA ).GT.SFMIN2 )
+               F = F / SCLFAC
+               C = C / SCLFAC
+               G = G / SCLFAC
+               CA = CA / SCLFAC
+               R = R*SCLFAC
+               RA = RA*SCLFAC
+            END DO
+*
+*           Now balance.
+*
+            IF( ( C+R ).GE.FACTOR*S ) CYCLE
+            IF( F.LT.ONE .AND. SCALE( I ).LT.ONE ) THEN
+               IF( F*SCALE( I ).LE.SFMIN1 ) CYCLE
+            END IF
+            IF( F.GT.ONE .AND. SCALE( I ).GT.ONE ) THEN
+               IF( SCALE( I ).GE.SFMAX1 / F ) CYCLE
+            END IF
+            G = ONE / F
+            SCALE( I ) = SCALE( I )*F
+            NOCONV = .TRUE.
+*
+            CALL SSCAL( N-K+1, G, A( I, K ), LDA )
+            CALL SSCAL( L, F, A( 1, I ), 1 )
+*
+         END DO
+*
+      END DO
 *
-  210 CONTINUE
       ILO = K
       IHI = L
 *
diff --git a/SRC/sgebd2.f b/SRC/sgebd2.f
index cb57ed6780..b49421b261 100644
--- a/SRC/sgebd2.f
+++ b/SRC/sgebd2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEBD2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgebd2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgebd2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup gebd2
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +184,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -209,7 +208,7 @@ SUBROUTINE SGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
       INTEGER            I
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, SLARFG, XERBLA
+      EXTERNAL           SLARF1F, SLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -242,14 +241,12 @@ SUBROUTINE SGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
             CALL SLARFG( M-I+1, A( I, I ), A( MIN( I+1, M ), I ), 1,
      $                   TAUQ( I ) )
             D( I ) = A( I, I )
-            A( I, I ) = ONE
 *
 *           Apply H(i) to A(i:m,i+1:n) from the left
 *
             IF( I.LT.N )
-     $         CALL SLARF( 'Left', M-I+1, N-I, A( I, I ), 1, TAUQ( I ),
-     $                     A( I, I+1 ), LDA, WORK )
-            A( I, I ) = D( I )
+     $         CALL SLARF1F( 'Left', M-I+1, N-I, A( I, I ), 1,
+     $                       TAUQ( I ), A( I, I+1 ), LDA, WORK )
 *
             IF( I.LT.N ) THEN
 *
@@ -259,13 +256,11 @@ SUBROUTINE SGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
                CALL SLARFG( N-I, A( I, I+1 ), A( I, MIN( I+2, N ) ),
      $                      LDA, TAUP( I ) )
                E( I ) = A( I, I+1 )
-               A( I, I+1 ) = ONE
 *
 *              Apply G(i) to A(i+1:m,i+1:n) from the right
 *
-               CALL SLARF( 'Right', M-I, N-I, A( I, I+1 ), LDA,
-     $                     TAUP( I ), A( I+1, I+1 ), LDA, WORK )
-               A( I, I+1 ) = E( I )
+               CALL SLARF1F( 'Right', M-I, N-I, A( I, I+1 ), LDA,
+     $                       TAUP( I ), A( I+1, I+1 ), LDA, WORK )
             ELSE
                TAUP( I ) = ZERO
             END IF
@@ -278,33 +273,31 @@ SUBROUTINE SGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
 *
 *           Generate elementary reflector G(i) to annihilate A(i,i+1:n)
 *
-            CALL SLARFG( N-I+1, A( I, I ), A( I, MIN( I+1, N ) ), LDA,
+            CALL SLARFG( N-I+1, A( I, I ), A( I, MIN( I+1, N ) ),
+     $                   LDA,
      $                   TAUP( I ) )
             D( I ) = A( I, I )
-            A( I, I ) = ONE
 *
 *           Apply G(i) to A(i+1:m,i:n) from the right
 *
             IF( I.LT.M )
-     $         CALL SLARF( 'Right', M-I, N-I+1, A( I, I ), LDA,
-     $                     TAUP( I ), A( I+1, I ), LDA, WORK )
-            A( I, I ) = D( I )
+     $         CALL SLARF1F( 'Right', M-I, N-I+1, A( I, I ), LDA,
+     $                       TAUP( I ), A( I+1, I ), LDA, WORK )
 *
             IF( I.LT.M ) THEN
 *
 *              Generate elementary reflector H(i) to annihilate
 *              A(i+2:m,i)
 *
-               CALL SLARFG( M-I, A( I+1, I ), A( MIN( I+2, M ), I ), 1,
+               CALL SLARFG( M-I, A( I+1, I ), A( MIN( I+2, M ), I ),
+     $                      1,
      $                      TAUQ( I ) )
                E( I ) = A( I+1, I )
-               A( I+1, I ) = ONE
 *
 *              Apply H(i) to A(i+1:m,i+1:n) from the left
 *
-               CALL SLARF( 'Left', M-I, N-I, A( I+1, I ), 1, TAUQ( I ),
-     $                     A( I+1, I+1 ), LDA, WORK )
-               A( I+1, I ) = E( I )
+               CALL SLARF1F( 'Left', M-I, N-I, A( I+1, I ), 1,
+     $                       TAUQ( I ), A( I+1, I+1 ), LDA, WORK )
             ELSE
                TAUQ( I ) = ZERO
             END IF
diff --git a/SRC/sgebrd.f b/SRC/sgebrd.f
index 08701164cf..b983e646ac 100644
--- a/SRC/sgebrd.f
+++ b/SRC/sgebrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEBRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgebrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgebrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,7 +120,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of the array WORK.  LWORK >= max(1,M,N).
+*>          The length of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= MAX(M,N), otherwise.
 *>          For optimum performance LWORK >= (M+N)*NB, where NB
 *>          is the optimal blocksize.
 *>
@@ -147,7 +146,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup gebrd
 *
 *> \par Further Details:
 *  =====================
@@ -202,6 +201,7 @@
 *  =====================================================================
       SUBROUTINE SGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,27 +223,35 @@ SUBROUTINE SGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY
-      INTEGER            I, IINFO, J, LDWRKX, LDWRKY, LWKOPT, MINMN, NB,
-     $                   NBMIN, NX, WS
+      INTEGER            I, IINFO, J, LDWRKX, LDWRKY, LWKMIN, LWKOPT,
+     $                   MINMN, NB, NBMIN, NX, WS
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SGEBD2, SGEMM, SLABRD, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN, REAL
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input parameters
 *
       INFO = 0
-      NB = MAX( 1, ILAENV( 1, 'SGEBRD', ' ', M, N, -1, -1 ) )
-      LWKOPT = ( M+N )*NB
-      WORK( 1 ) = REAL( LWKOPT )
+      MINMN = MIN( M, N )
+      IF( MINMN.EQ.0 ) THEN
+         LWKMIN = 1
+         LWKOPT = 1
+      ELSE
+         LWKMIN = MAX( M, N )
+         NB = MAX( 1, ILAENV( 1, 'SGEBRD', ' ', M, N, -1, -1 ) )
+         LWKOPT = ( M+N )*NB
+      ENDIF
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -251,7 +259,7 @@ SUBROUTINE SGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, M, N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -10
       END IF
       IF( INFO.LT.0 ) THEN
@@ -263,7 +271,6 @@ SUBROUTINE SGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *
 *     Quick return if possible
 *
-      MINMN = MIN( M, N )
       IF( MINMN.EQ.0 ) THEN
          WORK( 1 ) = 1
          RETURN
@@ -282,7 +289,7 @@ SUBROUTINE SGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *        Determine when to switch from blocked to unblocked code.
 *
          IF( NX.LT.MINMN ) THEN
-            WS = ( M+N )*NB
+            WS = LWKOPT
             IF( LWORK.LT.WS ) THEN
 *
 *              Not enough work space for the optimal NB, consider using
@@ -307,7 +314,8 @@ SUBROUTINE SGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *        the matrices X and Y which are needed to update the unreduced
 *        part of the matrix
 *
-         CALL SLABRD( M-I+1, N-I+1, NB, A( I, I ), LDA, D( I ), E( I ),
+         CALL SLABRD( M-I+1, N-I+1, NB, A( I, I ), LDA, D( I ),
+     $                E( I ),
      $                TAUQ( I ), TAUP( I ), WORK, LDWRKX,
      $                WORK( LDWRKX*NB+1 ), LDWRKY )
 *
@@ -318,7 +326,8 @@ SUBROUTINE SGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
      $               NB, -ONE, A( I+NB, I ), LDA,
      $               WORK( LDWRKX*NB+NB+1 ), LDWRKY, ONE,
      $               A( I+NB, I+NB ), LDA )
-         CALL SGEMM( 'No transpose', 'No transpose', M-I-NB+1, N-I-NB+1,
+         CALL SGEMM( 'No transpose', 'No transpose', M-I-NB+1,
+     $               N-I-NB+1,
      $               NB, -ONE, WORK( NB+1 ), LDWRKX, A( I, I+NB ), LDA,
      $               ONE, A( I+NB, I+NB ), LDA )
 *
@@ -341,7 +350,8 @@ SUBROUTINE SGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *
       CALL SGEBD2( M-I+1, N-I+1, A( I, I ), LDA, D( I ), E( I ),
      $             TAUQ( I ), TAUP( I ), WORK, IINFO )
-      WORK( 1 ) = WS
+*
+      WORK( 1 ) = SROUNDUP_LWORK( WS )
       RETURN
 *
 *     End of SGEBRD
diff --git a/SRC/sgecon.f b/SRC/sgecon.f
index a284b094be..745676cabb 100644
--- a/SRC/sgecon.f
+++ b/SRC/sgecon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGECON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgecon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgecon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -105,7 +103,15 @@
 *> \verbatim
 *>          INFO is INTEGER
 *>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>                NaNs are illegal values for ANORM, and they propagate to
+*>                the output parameter RCOND.
+*>                Infinity is illegal for ANORM, and it propagates to the output
+*>                parameter RCOND as 0.
+*>          = 1:  if RCOND = NaN, or
+*>                   RCOND = Inf, or
+*>                   the computed norm of the inverse of A is 0.
+*>                In the latter, RCOND = 0 is returned.
 *> \endverbatim
 *
 *  Authors:
@@ -116,11 +122,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup gecon
 *
 *  =====================================================================
       SUBROUTINE SGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -146,16 +153,16 @@ SUBROUTINE SGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, IWORK,
       LOGICAL            ONENRM
       CHARACTER          NORMIN
       INTEGER            IX, KASE, KASE1
-      REAL               AINVNM, SCALE, SL, SMLNUM, SU
+      REAL               AINVNM, SCALE, SL, SMLNUM, SU, HUGEVAL
 *     ..
 *     .. Local Arrays ..
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Functions ..
-      LOGICAL            LSAME
+      LOGICAL            LSAME, SISNAN
       INTEGER            ISAMAX
       REAL               SLAMCH
-      EXTERNAL           LSAME, ISAMAX, SLAMCH
+      EXTERNAL           LSAME, ISAMAX, SLAMCH, SISNAN
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SLACN2, SLATRS, SRSCL, XERBLA
@@ -164,6 +171,8 @@ SUBROUTINE SGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, IWORK,
       INTRINSIC          ABS, MAX
 *     ..
 *     .. Executable Statements ..
+*
+      HUGEVAL = SLAMCH( 'Overflow' )
 *
 *     Test the input parameters.
 *
@@ -191,6 +200,13 @@ SUBROUTINE SGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, IWORK,
          RETURN
       ELSE IF( ANORM.EQ.ZERO ) THEN
          RETURN
+      ELSE IF( SISNAN( ANORM ) ) THEN
+         RCOND = ANORM
+         INFO = -5
+         RETURN
+      ELSE IF( ANORM.GT.HUGEVAL ) THEN
+         INFO = -5
+         RETURN
       END IF
 *
       SMLNUM = SLAMCH( 'Safe minimum' )
@@ -212,18 +228,21 @@ SUBROUTINE SGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, IWORK,
 *
 *           Multiply by inv(L).
 *
-            CALL SLATRS( 'Lower', 'No transpose', 'Unit', NORMIN, N, A,
+            CALL SLATRS( 'Lower', 'No transpose', 'Unit', NORMIN, N,
+     $                   A,
      $                   LDA, WORK, SL, WORK( 2*N+1 ), INFO )
 *
 *           Multiply by inv(U).
 *
-            CALL SLATRS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL SLATRS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   A, LDA, WORK, SU, WORK( 3*N+1 ), INFO )
          ELSE
 *
 *           Multiply by inv(U**T).
 *
-            CALL SLATRS( 'Upper', 'Transpose', 'Non-unit', NORMIN, N, A,
+            CALL SLATRS( 'Upper', 'Transpose', 'Non-unit', NORMIN, N,
+     $                   A,
      $                   LDA, WORK, SU, WORK( 3*N+1 ), INFO )
 *
 *           Multiply by inv(L**T).
@@ -247,8 +266,17 @@ SUBROUTINE SGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, IWORK,
 *
 *     Compute the estimate of the reciprocal condition number.
 *
-      IF( AINVNM.NE.ZERO )
-     $   RCOND = ( ONE / AINVNM ) / ANORM
+      IF( AINVNM.NE.ZERO ) THEN
+         RCOND = ( ONE / AINVNM ) / ANORM
+      ELSE
+         INFO = 1
+         RETURN
+      END IF
+*
+*     Check for NaNs and Infs
+*
+      IF( SISNAN( RCOND ) .OR. RCOND.GT.HUGEVAL )
+     $   INFO = 1
 *
    20 CONTINUE
       RETURN
diff --git a/SRC/sgedmd.f90 b/SRC/sgedmd.f90
new file mode 100644
index 0000000000..68e85d8210
--- /dev/null
+++ b/SRC/sgedmd.f90
@@ -0,0 +1,1205 @@
+!> \brief \b SGEDMD computes the Dynamic Mode Decomposition (DMD) for a pair of data snapshot matrices.
+!
+!  =========== DOCUMENTATION ===========
+!
+!  Definition:
+!  ===========
+!
+!     SUBROUTINE SGEDMD( JOBS, JOBZ, JOBR, JOBF,  WHTSVD,  &
+!                        M, N, X, LDX, Y, LDY, NRNK, TOL,  &
+!                        K, REIG,  IMEIG,   Z, LDZ,  RES,  &
+!                        B, LDB, W,  LDW,   S, LDS,        &
+!                        WORK, LWORK, IWORK, LIWORK, INFO )
+!.....
+!     USE, INTRINSIC :: iso_fortran_env, only: real32
+!     IMPLICIT NONE
+!     INTEGER, PARAMETER :: WP = real32
+!.....
+!     Scalar arguments
+!     CHARACTER, INTENT(IN)   :: JOBS,   JOBZ,  JOBR,  JOBF
+!     INTEGER,   INTENT(IN)   :: WHTSVD, M, N,   LDX,  LDY, &
+!                                NRNK, LDZ, LDB, LDW,  LDS, &
+!                                LWORK,  LIWORK
+!     INTEGER,   INTENT(OUT)  :: K, INFO
+!     REAL(KIND=WP), INTENT(IN) ::  TOL
+!     Array arguments
+!     REAL(KIND=WP), INTENT(INOUT) :: X(LDX,*), Y(LDY,*)
+!     REAL(KIND=WP), INTENT(OUT)   :: Z(LDZ,*), B(LDB,*), &
+!                                     W(LDW,*), S(LDS,*)
+!     REAL(KIND=WP), INTENT(OUT)   :: REIG(*),  IMEIG(*), &
+!                                     RES(*)
+!     REAL(KIND=WP), INTENT(OUT)   :: WORK(*)
+!     INTEGER,       INTENT(OUT)   :: IWORK(*)
+!
+!............................................................
+!>    \par Purpose:
+!     =============
+!>    \verbatim
+!>    SGEDMD computes the Dynamic Mode Decomposition (DMD) for
+!>    a pair of data snapshot matrices. For the input matrices
+!>    X and Y such that Y = A*X with an unaccessible matrix
+!>    A, SGEDMD computes a certain number of Ritz pairs of A using
+!>    the standard Rayleigh-Ritz extraction from a subspace of
+!>    range(X) that is determined using the leading left singular
+!>    vectors of X. Optionally, SGEDMD returns the residuals
+!>    of the computed Ritz pairs, the information needed for
+!>    a refinement of the Ritz vectors, or the eigenvectors of
+!>    the Exact DMD.
+!>    For further details see the references listed
+!>    below. For more details of the implementation see [3].
+!>    \endverbatim
+!............................................................
+!>    \par References:
+!     ================
+!>    \verbatim
+!>    [1] P. Schmid: Dynamic mode decomposition of numerical
+!>        and experimental data,
+!>        Journal of Fluid Mechanics 656, 5-28, 2010.
+!>    [2] Z. Drmac, I. Mezic, R. Mohr: Data driven modal
+!>        decompositions: analysis and enhancements,
+!>        SIAM J. on Sci. Comp. 40 (4), A2253-A2285, 2018.
+!>    [3] Z. Drmac: A LAPACK implementation of the Dynamic
+!>        Mode Decomposition I. Technical report. AIMDyn Inc.
+!>        and LAPACK Working Note 298.
+!>    [4] J. Tu, C. W. Rowley, D. M. Luchtenburg, S. L.
+!>        Brunton, N. Kutz: On Dynamic Mode Decomposition:
+!>        Theory and Applications, Journal of Computational
+!>        Dynamics 1(2), 391 -421, 2014.
+!>    \endverbatim
+!......................................................................
+!>    \par Developed and supported by:
+!     ================================
+!>    \verbatim
+!>    Developed and coded by Zlatko Drmac, Faculty of Science,
+!>    University of Zagreb;  drmac@math.hr
+!>    In cooperation with
+!>    AIMdyn Inc., Santa Barbara, CA.
+!>    and supported by
+!>    - DARPA SBIR project "Koopman Operator-Based Forecasting
+!>    for Nonstationary Processes from Near-Term, Limited
+!>    Observational Data" Contract No: W31P4Q-21-C-0007
+!>    - DARPA PAI project "Physics-Informed Machine Learning
+!>    Methodologies" Contract No: HR0011-18-9-0033
+!>    - DARPA MoDyL project "A Data-Driven, Operator-Theoretic
+!>    Framework for Space-Time Analysis of Process Dynamics"
+!>    Contract No: HR0011-16-C-0116
+!>    Any opinions, findings and conclusions or recommendations
+!>    expressed in this material are those of the author and
+!>    do not necessarily reflect the views of the DARPA SBIR
+!>    Program Office
+!>    \endverbatim
+!......................................................................
+!>    \par Distribution Statement A:
+!     ==============================
+!>    \verbatim
+!>    Distribution Statement A:
+!>    Approved for Public Release, Distribution Unlimited.
+!>    Cleared by DARPA on September 29, 2022
+!>    \endverbatim
+!============================================================
+!     Arguments
+!     =========
+!
+!>    \param[in] JOBS
+!>    \verbatim
+!>    JOBS (input) CHARACTER*1
+!>    Determines whether the initial data snapshots are scaled
+!>    by a diagonal matrix.
+!>    'S' :: The data snapshots matrices X and Y are multiplied
+!>           with a diagonal matrix D so that X*D has unit
+!>           nonzero columns (in the Euclidean 2-norm)
+!>    'C' :: The snapshots are scaled as with the 'S' option.
+!>           If it is found that an i-th column of X is zero
+!>           vector and the corresponding i-th column of Y is
+!>           non-zero, then the i-th column of Y is set to
+!>           zero and a warning flag is raised.
+!>    'Y' :: The data snapshots matrices X and Y are multiplied
+!>           by a diagonal matrix D so that Y*D has unit
+!>           nonzero columns (in the Euclidean 2-norm)
+!>    'N' :: No data scaling.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBZ
+!>    \verbatim
+!>    JOBZ (input) CHARACTER*1
+!>    Determines whether the eigenvectors (Koopman modes) will
+!>    be computed.
+!>    'V' :: The eigenvectors (Koopman modes) will be computed
+!>           and returned in the matrix Z.
+!>           See the description of Z.
+!>    'F' :: The eigenvectors (Koopman modes) will be returned
+!>           in factored form as the product X(:,1:K)*W, where X
+!>           contains a POD basis (leading left singular vectors
+!>           of the data matrix X) and W contains the eigenvectors
+!>           of the corresponding Rayleigh quotient.
+!>           See the descriptions of K, X, W, Z.
+!>    'N' :: The eigenvectors are not computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBR
+!>    \verbatim
+!>    JOBR (input) CHARACTER*1
+!>    Determines whether to compute the residuals.
+!>    'R' :: The residuals for the computed eigenpairs will be
+!>           computed and stored in the array RES.
+!>           See the description of RES.
+!>           For this option to be legal, JOBZ must be 'V'.
+!>    'N' :: The residuals are not computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBF
+!>    \verbatim
+!>    JOBF (input) CHARACTER*1
+!>    Specifies whether to store information needed for post-
+!>    processing (e.g. computing refined Ritz vectors)
+!>    'R' :: The matrix needed for the refinement of the Ritz
+!>           vectors is computed and stored in the array B.
+!>           See the description of B.
+!>    'E' :: The unscaled eigenvectors of the Exact DMD are
+!>           computed and returned in the array B. See the
+!>           description of B.
+!>    'N' :: No eigenvector refinement data is computed.
+!>    \endverbatim
+!.....
+!>    \param[in] WHTSVD
+!>    \verbatim
+!>    WHTSVD (input) INTEGER, WHSTVD in { 1, 2, 3, 4 }
+!>    Allows for a selection of the SVD algorithm from the
+!>    LAPACK library.
+!>    1 :: SGESVD (the QR SVD algorithm)
+!>    2 :: SGESDD (the Divide and Conquer algorithm; if enough
+!>         workspace available, this is the fastest option)
+!>    3 :: SGESVDQ (the preconditioned QR SVD  ; this and 4
+!>         are the most accurate options)
+!>    4 :: SGEJSV (the preconditioned Jacobi SVD; this and 3
+!>         are the most accurate options)
+!>    For the four methods above, a significant difference in
+!>    the accuracy of small singular values is possible if
+!>    the snapshots vary in norm so that X is severely
+!>    ill-conditioned. If small (smaller than EPS*||X||)
+!>    singular values are of interest and JOBS=='N',  then
+!>    the options (3, 4) give the most accurate results, where
+!>    the option 4 is slightly better and with stronger
+!>    theoretical background.
+!>    If JOBS=='S', i.e. the columns of X will be normalized,
+!>    then all methods give nearly equally accurate results.
+!>    \endverbatim
+!.....
+!>    \param[in] M
+!>    \verbatim
+!>    M (input) INTEGER, M>= 0
+!>    The state space dimension (the row dimension of X, Y).
+!>    \endverbatim
+!.....
+!>    \param[in] N
+!>    \verbatim
+!>    N (input) INTEGER, 0 <= N <= M
+!>    The number of data snapshot pairs
+!>    (the number of columns of X and Y).
+!>    \endverbatim
+!.....
+!>    \param[in,out] X
+!>    \verbatim
+!>    X (input/output) REAL(KIND=WP) M-by-N array
+!>    > On entry, X contains the data snapshot matrix X. It is
+!>    assumed that the column norms of X are in the range of
+!>    the normalized floating point numbers.
+!>    < On exit, the leading K columns of X contain a POD basis,
+!>    i.e. the leading K left singular vectors of the input
+!>    data matrix X, U(:,1:K). All N columns of X contain all
+!>    left singular vectors of the input matrix X.
+!>    See the descriptions of K, Z and W.
+!>    \endverbatim
+!.....
+!>    \param[in] LDX
+!>    \verbatim
+!>    LDX (input) INTEGER, LDX >= M
+!>    The leading dimension of the array X.
+!>    \endverbatim
+!.....
+!>    \param[in,out] Y
+!>    \verbatim
+!>    Y (input/workspace/output) REAL(KIND=WP) M-by-N array
+!>    > On entry, Y contains the data snapshot matrix Y
+!>    < On exit,
+!>    If JOBR == 'R', the leading K columns of Y  contain
+!>    the residual vectors for the computed Ritz pairs.
+!>    See the description of RES.
+!>    If JOBR == 'N', Y contains the original input data,
+!>                    scaled according to the value of JOBS.
+!>    \endverbatim
+!.....
+!>    \param[in] LDY
+!>    \verbatim
+!>    LDY (input) INTEGER , LDY >= M
+!>    The leading dimension of the array Y.
+!>    \endverbatim
+!.....
+!>    \param[in] NRNK
+!>    \verbatim
+!>    NRNK (input) INTEGER
+!>    Determines the mode how to compute the numerical rank,
+!>    i.e. how to truncate small singular values of the input
+!>    matrix X. On input, if
+!>    NRNK = -1 :: i-th singular value sigma(i) is truncated
+!>                 if sigma(i) <= TOL*sigma(1)
+!>                 This option is recommended.
+!>    NRNK = -2 :: i-th singular value sigma(i) is truncated
+!>                 if sigma(i) <= TOL*sigma(i-1)
+!>                 This option is included for R&D purposes.
+!>                 It requires highly accurate SVD, which
+!>                 may not be feasible.
+!>    The numerical rank can be enforced by using positive
+!>    value of NRNK as follows:
+!>    0 < NRNK <= N :: at most NRNK largest singular values
+!>    will be used. If the number of the computed nonzero
+!>    singular values is less than NRNK, then only those
+!>    nonzero values will be used and the actually used
+!>    dimension is less than NRNK. The actual number of
+!>    the nonzero singular values is returned in the variable
+!>    K. See the descriptions of TOL and  K.
+!>    \endverbatim
+!.....
+!>    \param[in] TOL
+!>    \verbatim
+!>    TOL (input) REAL(KIND=WP), 0 <= TOL < 1
+!>    The tolerance for truncating small singular values.
+!>    See the description of NRNK.
+!>    \endverbatim
+!.....
+!>    \param[out] K
+!>    \verbatim
+!>    K (output) INTEGER,  0 <= K <= N
+!>    The dimension of the POD basis for the data snapshot
+!>    matrix X and the number of the computed Ritz pairs.
+!>    The value of K is determined according to the rule set
+!>    by the parameters NRNK and TOL.
+!>    See the descriptions of NRNK and TOL.
+!>    \endverbatim
+!.....
+!>    \param[out] REIG
+!>    \verbatim
+!>    REIG (output) REAL(KIND=WP) N-by-1 array
+!>    The leading K (K<=N) entries of REIG contain
+!>    the real parts of the computed eigenvalues
+!>    REIG(1:K) + sqrt(-1)*IMEIG(1:K).
+!>    See the descriptions of K, IMEIG, and Z.
+!>    \endverbatim
+!.....
+!>    \param[out] IMEIG
+!>    \verbatim
+!>    IMEIG (output) REAL(KIND=WP) N-by-1 array
+!>    The leading K (K<=N) entries of IMEIG contain
+!>    the imaginary parts of the computed eigenvalues
+!>    REIG(1:K) + sqrt(-1)*IMEIG(1:K).
+!>    The eigenvalues are determined as follows:
+!>    If IMEIG(i) == 0, then the corresponding eigenvalue is
+!>    real, LAMBDA(i) = REIG(i).
+!>    If IMEIG(i)>0, then the corresponding complex
+!>    conjugate pair of eigenvalues reads
+!>    LAMBDA(i)   = REIG(i) + sqrt(-1)*IMAG(i)
+!>    LAMBDA(i+1) = REIG(i) - sqrt(-1)*IMAG(i)
+!>    That is, complex conjugate pairs have consecutive
+!>    indices (i,i+1), with the positive imaginary part
+!>    listed first.
+!>    See the descriptions of K, REIG, and Z.
+!>    \endverbatim
+!.....
+!>    \param[out] Z
+!>    \verbatim
+!>    Z (workspace/output) REAL(KIND=WP)  M-by-N array
+!>    If JOBZ =='V' then
+!>       Z contains real Ritz vectors as follows:
+!>       If IMEIG(i)=0, then Z(:,i) is an eigenvector of
+!>       the i-th Ritz value; ||Z(:,i)||_2=1.
+!>       If IMEIG(i) > 0 (and IMEIG(i+1) < 0) then
+!>       [Z(:,i) Z(:,i+1)] span an invariant subspace and
+!>       the Ritz values extracted from this subspace are
+!>       REIG(i) + sqrt(-1)*IMEIG(i) and
+!>       REIG(i) - sqrt(-1)*IMEIG(i).
+!>       The corresponding eigenvectors are
+!>       Z(:,i) + sqrt(-1)*Z(:,i+1) and
+!>       Z(:,i) - sqrt(-1)*Z(:,i+1), respectively.
+!>       || Z(:,i:i+1)||_F = 1.
+!>    If JOBZ == 'F', then the above descriptions hold for
+!>    the columns of X(:,1:K)*W(1:K,1:K), where the columns
+!>    of W(1:k,1:K) are the computed eigenvectors of the
+!>    K-by-K Rayleigh quotient. The columns of W(1:K,1:K)
+!>    are similarly structured: If IMEIG(i) == 0 then
+!>    X(:,1:K)*W(:,i) is an eigenvector, and if IMEIG(i)>0
+!>    then X(:,1:K)*W(:,i)+sqrt(-1)*X(:,1:K)*W(:,i+1) and
+!>         X(:,1:K)*W(:,i)-sqrt(-1)*X(:,1:K)*W(:,i+1)
+!>    are the eigenvectors of LAMBDA(i), LAMBDA(i+1).
+!>    See the descriptions of REIG, IMEIG, X and W.
+!>    \endverbatim
+!.....
+!>    \param[in] LDZ
+!>    \verbatim
+!>    LDZ (input) INTEGER , LDZ >= M
+!>    The leading dimension of the array Z.
+!>    \endverbatim
+!.....
+!>    \param[out] RES
+!>    \verbatim
+!>    RES (output) REAL(KIND=WP) N-by-1 array
+!>    RES(1:K) contains the residuals for the K computed
+!>    Ritz pairs.
+!>    If LAMBDA(i) is real, then
+!>       RES(i) = || A * Z(:,i) - LAMBDA(i)*Z(:,i))||_2.
+!>    If [LAMBDA(i), LAMBDA(i+1)] is a complex conjugate pair
+!>    then
+!>    RES(i)=RES(i+1) = || A * Z(:,i:i+1) - Z(:,i:i+1) *B||_F
+!>    where B = [ real(LAMBDA(i)) imag(LAMBDA(i)) ]
+!>              [-imag(LAMBDA(i)) real(LAMBDA(i)) ].
+!>    It holds that
+!>    RES(i)   = || A*ZC(:,i)   - LAMBDA(i)  *ZC(:,i)   ||_2
+!>    RES(i+1) = || A*ZC(:,i+1) - LAMBDA(i+1)*ZC(:,i+1) ||_2
+!>    where ZC(:,i)   =  Z(:,i) + sqrt(-1)*Z(:,i+1)
+!>          ZC(:,i+1) =  Z(:,i) - sqrt(-1)*Z(:,i+1)
+!>    See the description of REIG, IMEIG and Z.
+!>    \endverbatim
+!.....
+!>    \param[out] B
+!>    \verbatim
+!>    B (output) REAL(KIND=WP)  M-by-N array.
+!>    IF JOBF =='R', B(1:M,1:K) contains A*U(:,1:K), and can
+!>    be used for computing the refined vectors; see further
+!>    details in the provided references.
+!>    If JOBF == 'E', B(1:M,1;K) contains
+!>    A*U(:,1:K)*W(1:K,1:K), which are the vectors from the
+!>    Exact DMD, up to scaling by the inverse eigenvalues.
+!>    If JOBF =='N', then B is not referenced.
+!>    See the descriptions of X, W, K.
+!>    \endverbatim
+!.....
+!>    \param[in] LDB
+!>    \verbatim
+!>    LDB (input) INTEGER, LDB >= M
+!>    The leading dimension of the array B.
+!>    \endverbatim
+!.....
+!>    \param[out] W
+!>    \verbatim
+!>    W (workspace/output) REAL(KIND=WP) N-by-N array
+!>    On exit, W(1:K,1:K) contains the K computed
+!>    eigenvectors of the matrix Rayleigh quotient (real and
+!>    imaginary parts for each complex conjugate pair of the
+!>    eigenvalues). The Ritz vectors (returned in Z) are the
+!>    product of X (containing a POD basis for the input
+!>    matrix X) and W. See the descriptions of K, S, X and Z.
+!>    W is also used as a workspace to temporarily store the
+!>    left singular vectors of X.
+!>    \endverbatim
+!.....
+!>    \param[in] LDW
+!>    \verbatim
+!>    LDW (input) INTEGER, LDW >= N
+!>    The leading dimension of the array W.
+!>    \endverbatim
+!.....
+!>    \param[out] S
+!>    \verbatim
+!>    S (workspace/output) REAL(KIND=WP) N-by-N array
+!>    The array S(1:K,1:K) is used for the matrix Rayleigh
+!>    quotient. This content is overwritten during
+!>    the eigenvalue decomposition by SGEEV.
+!>    See the description of K.
+!>    \endverbatim
+!.....
+!>    \param[in] LDS
+!>    \verbatim
+!>    LDS (input) INTEGER, LDS >= N
+!>    The leading dimension of the array S.
+!>    \endverbatim
+!.....
+!>    \param[out] WORK
+!>    \verbatim
+!>    WORK (workspace/output) REAL(KIND=WP) LWORK-by-1 array
+!>    On exit, WORK(1:N) contains the singular values of
+!>    X (for JOBS=='N') or column scaled X (JOBS=='S', 'C').
+!>    If WHTSVD==4, then WORK(N+1) and WORK(N+2) contain
+!>    scaling factor WORK(N+2)/WORK(N+1) used to scale X
+!>    and Y to avoid overflow in the SVD of X.
+!>    This may be of interest if the scaling option is off
+!>    and as many as possible smallest eigenvalues are
+!>    desired to the highest feasible accuracy.
+!>    If the call to SGEDMD is only workspace query, then
+!>    WORK(1) contains the minimal workspace length and
+!>    WORK(2) is the optimal workspace length. Hence, the
+!>    length of work is at least 2.
+!>    See the description of LWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LWORK
+!>    \verbatim
+!>    LWORK (input) INTEGER
+!>    The minimal length of the workspace vector WORK.
+!>    LWORK is calculated as follows:
+!>    If WHTSVD == 1 ::
+!>       If JOBZ == 'V', then
+!>       LWORK >= MAX(2, N + LWORK_SVD, N+MAX(1,4*N)).
+!>       If JOBZ == 'N'  then
+!>       LWORK >= MAX(2, N + LWORK_SVD, N+MAX(1,3*N)).
+!>       Here LWORK_SVD = MAX(1,3*N+M,5*N) is the minimal
+!>       workspace length of SGESVD.
+!>    If WHTSVD == 2 ::
+!>       If JOBZ == 'V', then
+!>       LWORK >= MAX(2, N + LWORK_SVD, N+MAX(1,4*N))
+!>       If JOBZ == 'N', then
+!>       LWORK >= MAX(2, N + LWORK_SVD, N+MAX(1,3*N))
+!>       Here LWORK_SVD = MAX(M, 5*N*N+4*N)+3*N*N is the
+!>       minimal workspace length of SGESDD.
+!>    If WHTSVD == 3 ::
+!>       If JOBZ == 'V', then
+!>       LWORK >= MAX(2, N+LWORK_SVD,N+MAX(1,4*N))
+!>       If JOBZ == 'N', then
+!>       LWORK >= MAX(2, N+LWORK_SVD,N+MAX(1,3*N))
+!>       Here LWORK_SVD = N+M+MAX(3*N+1,
+!>                       MAX(1,3*N+M,5*N),MAX(1,N))
+!>       is the minimal workspace length of SGESVDQ.
+!>    If WHTSVD == 4 ::
+!>       If JOBZ == 'V', then
+!>       LWORK >= MAX(2, N+LWORK_SVD,N+MAX(1,4*N))
+!>       If JOBZ == 'N', then
+!>       LWORK >= MAX(2, N+LWORK_SVD,N+MAX(1,3*N))
+!>       Here LWORK_SVD = MAX(7,2*M+N,6*N+2*N*N) is the
+!>       minimal workspace length of SGEJSV.
+!>    The above expressions are not simplified in order to
+!>    make the usage of WORK more transparent, and for
+!>    easier checking. In any case, LWORK >= 2.
+!>    If on entry LWORK = -1, then a workspace query is
+!>    assumed and the procedure only computes the minimal
+!>    and the optimal workspace lengths for both WORK and
+!>    IWORK. See the descriptions of WORK and IWORK.
+!>    \endverbatim
+!.....
+!>    \param[out] IWORK
+!>    \verbatim
+!>    IWORK (workspace/output) INTEGER LIWORK-by-1 array
+!>    Workspace that is required only if WHTSVD equals
+!>    2 , 3 or 4. (See the description of WHTSVD).
+!>    If on entry LWORK =-1 or LIWORK=-1, then the
+!>    minimal length of IWORK is computed and returned in
+!>    IWORK(1). See the description of LIWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LIWORK
+!>    \verbatim
+!>    LIWORK (input) INTEGER
+!>    The minimal length of the workspace vector IWORK.
+!>    If WHTSVD == 1, then only IWORK(1) is used; LIWORK >=1
+!>    If WHTSVD == 2, then LIWORK >= MAX(1,8*MIN(M,N))
+!>    If WHTSVD == 3, then LIWORK >= MAX(1,M+N-1)
+!>    If WHTSVD == 4, then LIWORK >= MAX(3,M+3*N)
+!>    If on entry LIWORK = -1, then a workspace query is
+!>    assumed and the procedure only computes the minimal
+!>    and the optimal workspace lengths for both WORK and
+!>    IWORK. See the descriptions of WORK and IWORK.
+!>    \endverbatim
+!.....
+!>    \param[out] INFO
+!>    \verbatim
+!>    INFO (output) INTEGER
+!>    -i < 0 :: On entry, the i-th argument had an
+!>              illegal value
+!>       = 0 :: Successful return.
+!>       = 1 :: Void input. Quick exit (M=0 or N=0).
+!>       = 2 :: The SVD computation of X did not converge.
+!>              Suggestion: Check the input data and/or
+!>              repeat with different WHTSVD.
+!>       = 3 :: The computation of the eigenvalues did not
+!>              converge.
+!>       = 4 :: If data scaling was requested on input and
+!>              the procedure found inconsistency in the data
+!>              such that for some column index i,
+!>              X(:,i) = 0 but Y(:,i) /= 0, then Y(:,i) is set
+!>              to zero if JOBS=='C'. The computation proceeds
+!>              with original or modified data and warning
+!>              flag is set with INFO=4.
+!>    \endverbatim
+!
+!  Authors:
+!  ========
+!
+!> \author Zlatko Drmac
+!
+!> \ingroup gedmd
+!
+!.............................................................
+!.............................................................
+      SUBROUTINE SGEDMD( JOBS, JOBZ, JOBR, JOBF,  WHTSVD,  &
+                         M, N, X, LDX, Y, LDY, NRNK, TOL,  &
+                         K, REIG,  IMEIG,   Z, LDZ,  RES,  &
+                         B, LDB, W,  LDW,   S, LDS,        &
+                         WORK, LWORK, IWORK, LIWORK, INFO )
+!
+!  -- LAPACK driver routine                                           --
+!
+!  -- LAPACK is a software package provided by University of          --
+!  -- Tennessee, University of California Berkeley, University of     --
+!  -- Colorado Denver and NAG Ltd..                                   --
+!
+!.....
+      USE, INTRINSIC :: iso_fortran_env, only: real32
+      IMPLICIT NONE
+      INTEGER, PARAMETER :: WP = real32
+!
+!     Scalar arguments
+!     ~~~~~~~~~~~~~~~~
+      CHARACTER, INTENT(IN)   :: JOBS,   JOBZ,  JOBR,  JOBF
+      INTEGER,   INTENT(IN)   :: WHTSVD, M, N,   LDX,  LDY, &
+                                 NRNK, LDZ, LDB, LDW,  LDS, &
+                                 LWORK,  LIWORK
+      INTEGER,   INTENT(OUT)  :: K, INFO
+      REAL(KIND=WP), INTENT(IN) ::  TOL
+!
+!     Array arguments
+!     ~~~~~~~~~~~~~~~
+      REAL(KIND=WP), INTENT(INOUT) :: X(LDX,*), Y(LDY,*)
+      REAL(KIND=WP), INTENT(OUT)   :: Z(LDZ,*), B(LDB,*), &
+                                      W(LDW,*), S(LDS,*)
+      REAL(KIND=WP), INTENT(OUT)   :: REIG(*),  IMEIG(*), &
+                                      RES(*)
+      REAL(KIND=WP), INTENT(OUT)   :: WORK(*)
+      INTEGER,       INTENT(OUT)   :: IWORK(*)
+!
+!     Parameters
+!     ~~~~~~~~~~
+      REAL(KIND=WP), PARAMETER ::  ONE = 1.0_WP
+      REAL(KIND=WP), PARAMETER :: ZERO = 0.0_WP
+!
+!     Local scalars
+!     ~~~~~~~~~~~~~
+      REAL(KIND=WP) :: OFL,   ROOTSC, SCALE,  SMALL,   &
+                       SSUM,  XSCL1,  XSCL2
+      INTEGER       ::  i,  j, IMINWR,  INFO1, INFO2,  &
+                       LWRKEV, LWRSDD, LWRSVD, &
+                       LWRSVQ, MLWORK, MWRKEV, MWRSDD, &
+                       MWRSVD, MWRSVJ, MWRSVQ, NUMRNK, &
+                       OLWORK
+      LOGICAL       ::  BADXY, LQUERY, SCCOLX, SCCOLY, &
+                        WNTEX, WNTREF, WNTRES, WNTVEC
+      CHARACTER     ::  JOBZL, T_OR_N
+      CHARACTER     ::  JSVOPT
+!
+!     Local arrays
+!     ~~~~~~~~~~~~
+      REAL(KIND=WP) :: AB(2,2), RDUMMY(2), RDUMMY2(2)
+!
+!     External functions (BLAS and LAPACK)
+!     ~~~~~~~~~~~~~~~~~
+      REAL(KIND=WP) SLANGE, SLAMCH, SNRM2
+      EXTERNAL      SLANGE, SLAMCH, SNRM2, ISAMAX
+      INTEGER       ISAMAX
+      LOGICAL       SISNAN, LSAME
+      EXTERNAL      SISNAN, LSAME
+!
+!     External subroutines (BLAS and LAPACK)
+!     ~~~~~~~~~~~~~~~~~~~~
+      EXTERNAL      SAXPY,  SGEMM,  SSCAL
+      EXTERNAL      SGEEV,  SGEJSV, SGESDD, SGESVD, SGESVDQ, &
+                    SLACPY, SLASCL, SLASSQ, XERBLA
+!
+!     Intrinsic functions
+!     ~~~~~~~~~~~~~~~~~~~
+      INTRINSIC     INT, FLOAT, MAX, SQRT
+!............................................................
+!
+!    Test the input arguments
+!
+      WNTRES = LSAME(JOBR,'R')
+      SCCOLX = LSAME(JOBS,'S') .OR. LSAME(JOBS,'C')
+      SCCOLY = LSAME(JOBS,'Y')
+      WNTVEC = LSAME(JOBZ,'V')
+      WNTREF = LSAME(JOBF,'R')
+      WNTEX  = LSAME(JOBF,'E')
+      INFO   = 0
+      LQUERY = ( ( LWORK == -1 ) .OR. ( LIWORK == -1 ) )
+!
+      IF ( .NOT. (SCCOLX .OR. SCCOLY .OR. &
+                                  LSAME(JOBS,'N')) )   THEN
+          INFO = -1
+      ELSE IF ( .NOT. (WNTVEC .OR. LSAME(JOBZ,'N')        &
+                              .OR. LSAME(JOBZ,'F')) )  THEN
+          INFO = -2
+      ELSE IF ( .NOT. (WNTRES .OR. LSAME(JOBR,'N')) .OR.  &
+                ( WNTRES .AND. (.NOT.WNTVEC) ) )       THEN
+          INFO = -3
+      ELSE IF ( .NOT. (WNTREF .OR. WNTEX .OR.             &
+                LSAME(JOBF,'N') ) )                    THEN
+          INFO = -4
+      ELSE IF ( .NOT.((WHTSVD == 1) .OR. (WHTSVD == 2) .OR.  &
+                      (WHTSVD == 3) .OR. (WHTSVD == 4) )) THEN
+          INFO = -5
+      ELSE IF ( M < 0 )   THEN
+          INFO = -6
+      ELSE IF ( ( N < 0 ) .OR. ( N > M ) ) THEN
+          INFO = -7
+      ELSE IF ( LDX < M ) THEN
+          INFO = -9
+      ELSE IF ( LDY < M ) THEN
+          INFO = -11
+      ELSE IF ( .NOT. (( NRNK == -2).OR.(NRNK == -1).OR. &
+                ((NRNK >= 1).AND.(NRNK <=N ))) )      THEN
+          INFO = -12
+      ELSE IF ( ( TOL < ZERO ) .OR. ( TOL >= ONE ) )  THEN
+          INFO = -13
+      ELSE IF ( LDZ < M ) THEN
+          INFO = -18
+      ELSE IF ( (WNTREF .OR. WNTEX ) .AND. ( LDB < M ) ) THEN
+          INFO = -21
+      ELSE IF ( LDW < N ) THEN
+          INFO = -23
+      ELSE IF ( LDS < N ) THEN
+          INFO = -25
+      END IF
+!
+      IF ( INFO == 0 ) THEN
+          ! Compute the minimal and the optimal workspace
+          ! requirements. Simulate running the code and
+          ! determine minimal and optimal sizes of the
+          ! workspace at any moment of the run.
+         IF ( N == 0 ) THEN
+             ! Quick return. All output except K is void.
+             ! INFO=1 signals the void input.
+             ! In case of a workspace query, the default
+             ! minimal workspace lengths are returned.
+            IF ( LQUERY ) THEN
+                IWORK(1) = 1
+                WORK(1)  = 2
+                WORK(2)  = 2
+            ELSE
+               K = 0
+            END IF
+            INFO = 1
+            RETURN
+         END IF
+         MLWORK = MAX(2,N)
+         OLWORK = MAX(2,N)
+         IMINWR = 1
+         SELECT CASE ( WHTSVD )
+         CASE (1)
+             ! The following is specified as the minimal
+             ! length of WORK in the definition of SGESVD:
+             ! MWRSVD = MAX(1,3*MIN(M,N)+MAX(M,N),5*MIN(M,N))
+             MWRSVD = MAX(1,3*MIN(M,N)+MAX(M,N),5*MIN(M,N))
+             MLWORK = MAX(MLWORK,N + MWRSVD)
+             IF ( LQUERY ) THEN
+                CALL SGESVD( 'O', 'S', M, N, X, LDX, WORK, &
+                           B, LDB, W, LDW, RDUMMY, -1, INFO1 )
+                LWRSVD = MAX( MWRSVD, INT( RDUMMY(1) ) )
+                OLWORK = MAX(OLWORK,N + LWRSVD)
+             END IF
+         CASE (2)
+             ! The following is specified as the minimal
+             ! length of WORK in the definition of SGESDD:
+             ! MWRSDD = 3*MIN(M,N)*MIN(M,N) +
+             ! MAX( MAX(M,N),5*MIN(M,N)*MIN(M,N)+4*MIN(M,N) )
+             ! IMINWR = 8*MIN(M,N)
+             MWRSDD = 3*MIN(M,N)*MIN(M,N) +                &
+              MAX( MAX(M,N),5*MIN(M,N)*MIN(M,N)+4*MIN(M,N) )
+             MLWORK = MAX(MLWORK,N + MWRSDD)
+             IMINWR = 8*MIN(M,N)
+             IF ( LQUERY ) THEN
+                CALL SGESDD( 'O', M, N, X, LDX, WORK, B,     &
+                     LDB, W, LDW, RDUMMY, -1, IWORK, INFO1 )
+                LWRSDD = MAX( MWRSDD, INT( RDUMMY(1) ) )
+                OLWORK = MAX(OLWORK,N + LWRSDD)
+             END IF
+         CASE (3)
+             !LWQP3 = 3*N+1
+             !LWORQ = MAX(N, 1)
+             !MWRSVD = MAX(1,3*MIN(M,N)+MAX(M,N),5*MIN(M,N))
+             !MWRSVQ = N + MAX( LWQP3, MWRSVD, LWORQ )+ MAX(M,2)
+             !MLWORK = N + MWRSVQ
+             !IMINWR = M+N-1
+             CALL SGESVDQ( 'H', 'P', 'N', 'R', 'R', M, N, &
+                          X, LDX, WORK, Z, LDZ, W, LDW,   &
+                             NUMRNK, IWORK, -1, RDUMMY,   &
+                             -1, RDUMMY2, -1, INFO1 )
+             IMINWR = IWORK(1)
+             MWRSVQ = INT(RDUMMY(2))
+             MLWORK = MAX(MLWORK,N+MWRSVQ+INT(RDUMMY2(1)))
+             IF ( LQUERY ) THEN
+                LWRSVQ = INT(RDUMMY(1))
+                OLWORK = MAX(OLWORK,N+LWRSVQ+INT(RDUMMY2(1)))
+             END IF
+         CASE (4)
+             JSVOPT = 'J'
+             !MWRSVJ = MAX( 7, 2*M+N, 6*N+2*N*N )! for JSVOPT='V'
+             MWRSVJ = MAX( 7, 2*M+N, 4*N+N*N, 2*N+N*N+6 )
+             MLWORK = MAX(MLWORK,N+MWRSVJ)
+             IMINWR = MAX( 3, M+3*N )
+             IF ( LQUERY ) THEN
+                OLWORK = MAX(OLWORK,N+MWRSVJ)
+             END IF
+         END SELECT
+         IF ( WNTVEC .OR. WNTEX .OR. LSAME(JOBZ,'F') ) THEN
+             JOBZL = 'V'
+         ELSE
+             JOBZL = 'N'
+         END IF
+         ! Workspace calculation to the SGEEV call
+         IF ( LSAME(JOBZL,'V') ) THEN
+             MWRKEV = MAX( 1, 4*N )
+         ELSE
+             MWRKEV = MAX( 1, 3*N )
+         END IF
+         MLWORK = MAX(MLWORK,N+MWRKEV)
+         IF ( LQUERY ) THEN
+                CALL SGEEV( 'N', JOBZL, N, S, LDS, REIG, &
+                    IMEIG, W, LDW, W, LDW, RDUMMY, -1, INFO1 )
+                LWRKEV = MAX( MWRKEV, INT(RDUMMY(1)) )
+                OLWORK = MAX( OLWORK, N+LWRKEV )
+         END IF
+!
+         IF ( LIWORK < IMINWR .AND. (.NOT.LQUERY) ) INFO = -29
+         IF (  LWORK < MLWORK .AND. (.NOT.LQUERY) ) INFO = -27
+      END IF
+!
+      IF( INFO /= 0 ) THEN
+         CALL XERBLA( 'SGEDMD', -INFO )
+         RETURN
+      ELSE IF ( LQUERY ) THEN
+!     Return minimal and optimal workspace sizes
+          IWORK(1) = IMINWR
+          WORK(1)  = REAL(MLWORK)
+          WORK(2)  = REAL(OLWORK)
+          RETURN
+      END IF
+!............................................................
+!
+      OFL   = SLAMCH('O')
+      SMALL = SLAMCH('S')
+      BADXY = .FALSE.
+!
+!     <1> Optional scaling of the snapshots (columns of X, Y)
+!     ==========================================================
+      IF ( SCCOLX ) THEN
+          ! The columns of X will be normalized.
+          ! To prevent overflows, the column norms of X are
+          ! carefully computed using SLASSQ.
+          K = 0
+          DO i = 1, N
+            !WORK(i) = DNRM2( M, X(1,i), 1 )
+            SSUM  = ONE
+            SCALE = ZERO
+            CALL SLASSQ( M, X(1,i), 1, SCALE, SSUM )
+            IF ( SISNAN(SCALE) .OR. SISNAN(SSUM) ) THEN
+                K    =  0
+                INFO = -8
+                CALL XERBLA('SGEDMD',-INFO)
+            END IF
+            IF ( (SCALE /= ZERO) .AND. (SSUM /= ZERO) ) THEN
+               ROOTSC = SQRT(SSUM)
+               IF ( SCALE .GE. (OFL / ROOTSC) ) THEN
+!                 Norm of X(:,i) overflows. First, X(:,i)
+!                 is scaled by
+!                 ( ONE / ROOTSC ) / SCALE = 1/||X(:,i)||_2.
+!                 Next, the norm of X(:,i) is stored without
+!                 overflow as WORK(i) = - SCALE * (ROOTSC/M),
+!                 the minus sign indicating the 1/M factor.
+!                 Scaling is performed without overflow, and
+!                 underflow may occur in the smallest entries
+!                 of X(:,i). The relative backward and forward
+!                 errors are small in the ell_2 norm.
+                  CALL SLASCL( 'G', 0, 0, SCALE, ONE/ROOTSC, &
+                               M, 1, X(1,i), M, INFO2 )
+                  WORK(i) = - SCALE * ( ROOTSC / FLOAT(M) )
+               ELSE
+!                 X(:,i) will be scaled to unit 2-norm
+                  WORK(i) =   SCALE * ROOTSC
+                  CALL SLASCL( 'G',0, 0, WORK(i), ONE, M, 1, &
+                               X(1,i), M, INFO2 )              ! LAPACK CALL
+!                 X(1:M,i) = (ONE/WORK(i)) * X(1:M,i)          ! INTRINSIC
+               END IF
+            ELSE
+               WORK(i) = ZERO
+               K = K + 1
+            END IF
+          END DO
+          IF ( K == N ) THEN
+          ! All columns of X are zero. Return error code -8.
+          ! (the 8th input variable had an illegal value)
+          K = 0
+          INFO = -8
+          CALL XERBLA('SGEDMD',-INFO)
+          RETURN
+          END IF
+          DO i = 1, N
+!           Now, apply the same scaling to the columns of Y.
+            IF ( WORK(i) >  ZERO ) THEN
+                CALL SSCAL( M, ONE/WORK(i), Y(1,i), 1 )  ! BLAS CALL
+!               Y(1:M,i) = (ONE/WORK(i)) * Y(1:M,i)      ! INTRINSIC
+            ELSE IF ( WORK(i) < ZERO ) THEN
+                CALL SLASCL( 'G', 0, 0, -WORK(i),          &
+                     ONE/FLOAT(M), M, 1, Y(1,i), M, INFO2 ) ! LAPACK CALL
+            ELSE IF ( Y(ISAMAX(M, Y(1,i),1),i )  &
+                                            /= ZERO ) THEN
+!               X(:,i) is zero vector. For consistency,
+!               Y(:,i) should also be zero. If Y(:,i) is not
+!               zero, then the data might be inconsistent or
+!               corrupted. If JOBS == 'C', Y(:,i) is set to
+!               zero and a warning flag is raised.
+!               The computation continues but the
+!               situation will be reported in the output.
+                BADXY = .TRUE.
+                IF ( LSAME(JOBS,'C')) &
+                CALL SSCAL( M, ZERO, Y(1,i), 1 )  ! BLAS CALL
+            END IF
+          END DO
+      END IF
+  !
+      IF ( SCCOLY ) THEN
+          ! The columns of Y will be normalized.
+          ! To prevent overflows, the column norms of Y are
+          ! carefully computed using SLASSQ.
+          DO i = 1, N
+            !WORK(i) = DNRM2( M, Y(1,i), 1 )
+            SSUM  = ONE
+            SCALE = ZERO
+            CALL SLASSQ( M, Y(1,i), 1, SCALE, SSUM )
+            IF ( SISNAN(SCALE) .OR. SISNAN(SSUM) ) THEN
+                K    =  0
+                INFO = -10
+                CALL XERBLA('SGEDMD',-INFO)
+            END IF
+            IF ( SCALE /= ZERO  .AND. (SSUM /= ZERO) ) THEN
+               ROOTSC = SQRT(SSUM)
+               IF ( SCALE .GE. (OFL / ROOTSC) ) THEN
+!                 Norm of Y(:,i) overflows. First, Y(:,i)
+!                 is scaled by
+!                 ( ONE / ROOTSC ) / SCALE = 1/||Y(:,i)||_2.
+!                 Next, the norm of Y(:,i) is stored without
+!                 overflow as WORK(i) = - SCALE * (ROOTSC/M),
+!                 the minus sign indicating the 1/M factor.
+!                 Scaling is performed without overflow, and
+!                 underflow may occur in the smallest entries
+!                 of Y(:,i). The relative backward and forward
+!                 errors are small in the ell_2 norm.
+                  CALL SLASCL( 'G', 0, 0, SCALE, ONE/ROOTSC, &
+                               M, 1, Y(1,i), M, INFO2 )
+                  WORK(i) = - SCALE * ( ROOTSC / FLOAT(M) )
+               ELSE
+!                 X(:,i) will be scaled to unit 2-norm
+                  WORK(i) =   SCALE * ROOTSC
+                  CALL SLASCL( 'G',0, 0, WORK(i), ONE, M, 1, &
+                               Y(1,i), M, INFO2 )              ! LAPACK CALL
+!                 Y(1:M,i) = (ONE/WORK(i)) * Y(1:M,i)          ! INTRINSIC
+               END IF
+            ELSE
+               WORK(i) = ZERO
+            END IF
+         END DO
+         DO i = 1, N
+!           Now, apply the same scaling to the columns of X.
+            IF ( WORK(i) >  ZERO ) THEN
+                CALL SSCAL( M, ONE/WORK(i), X(1,i), 1 )  ! BLAS CALL
+!               X(1:M,i) = (ONE/WORK(i)) * X(1:M,i)      ! INTRINSIC
+            ELSE IF ( WORK(i) < ZERO ) THEN
+                CALL SLASCL( 'G', 0, 0, -WORK(i),          &
+                     ONE/FLOAT(M), M, 1, X(1,i), M, INFO2 ) ! LAPACK CALL
+            ELSE IF ( X(ISAMAX(M, X(1,i),1),i )  &
+                                           /= ZERO ) THEN
+!               Y(:,i) is zero vector.  If X(:,i) is not
+!               zero, then a warning flag is raised.
+!               The computation continues but the
+!               situation will be reported in the output.
+                BADXY = .TRUE.
+            END IF
+         END DO
+       END IF
+!
+!     <2> SVD of the data snapshot matrix X.
+!     =====================================
+!     The left singular vectors are stored in the array X.
+!     The right singular vectors are in the array W.
+!     The array W will later on contain the eigenvectors
+!     of a Rayleigh quotient.
+      NUMRNK = N
+      SELECT CASE ( WHTSVD )
+         CASE (1)
+             CALL SGESVD( 'O', 'S', M, N, X, LDX, WORK, B, &
+                  LDB, W, LDW, WORK(N+1), LWORK-N, INFO1 ) ! LAPACK CALL
+             T_OR_N = 'T'
+         CASE (2)
+            CALL SGESDD( 'O', M, N, X, LDX, WORK, B, LDB, W, &
+                 LDW, WORK(N+1), LWORK-N, IWORK, INFO1 )   ! LAPACK CALL
+            T_OR_N = 'T'
+         CASE (3)
+              CALL SGESVDQ( 'H', 'P', 'N', 'R', 'R', M, N, &
+                   X, LDX, WORK, Z, LDZ, W, LDW, &
+                   NUMRNK, IWORK, LIWORK, WORK(N+MAX(2,M)+1),&
+                   LWORK-N-MAX(2,M), WORK(N+1), MAX(2,M), INFO1)     ! LAPACK CALL
+              CALL SLACPY( 'A', M, NUMRNK, Z, LDZ, X, LDX )   ! LAPACK CALL
+         T_OR_N = 'T'
+         CASE (4)
+              CALL SGEJSV( 'F', 'U', JSVOPT, 'N', 'N', 'P', M, &
+                   N, X, LDX, WORK, Z, LDZ, W, LDW, &
+                   WORK(N+1), LWORK-N, IWORK, INFO1 )    ! LAPACK CALL
+              CALL SLACPY( 'A', M, N, Z, LDZ, X, LDX )   ! LAPACK CALL
+              T_OR_N = 'N'
+              XSCL1 = WORK(N+1)
+              XSCL2 = WORK(N+2)
+              IF ( XSCL1 /=  XSCL2 ) THEN
+                 ! This is an exceptional situation. If the
+                 ! data matrices are not scaled and the
+                 ! largest singular value of X overflows.
+                 ! In that case SGEJSV can return the SVD
+                 ! in scaled form. The scaling factor can be used
+                 ! to rescale the data (X and Y).
+                 CALL SLASCL( 'G', 0, 0, XSCL1, XSCL2, M, N, Y, LDY, INFO2  )
+              END IF
+      END SELECT
+!
+      IF ( INFO1 > 0 ) THEN
+         ! The SVD selected subroutine did not converge.
+         ! Return with an error code.
+         INFO = 2
+         RETURN
+      END IF
+!
+      IF ( WORK(1) == ZERO ) THEN
+          ! The largest computed singular value of (scaled)
+          ! X is zero. Return error code -8
+          ! (the 8th input variable had an illegal value).
+          K = 0
+          INFO = -8
+          CALL XERBLA('SGEDMD',-INFO)
+          RETURN
+      END IF
+!
+      !<3> Determine the numerical rank of the data
+      !    snapshots matrix X. This depends on the
+      !    parameters NRNK and TOL.
+
+      SELECT CASE ( NRNK )
+          CASE ( -1 )
+               K = 1
+               DO i = 2, NUMRNK
+                 IF ( ( WORK(i) <= WORK(1)*TOL ) .OR. &
+                      ( WORK(i) <= SMALL ) ) EXIT
+                 K = K + 1
+               END DO
+          CASE ( -2 )
+               K = 1
+               DO i = 1, NUMRNK-1
+                 IF ( ( WORK(i+1) <= WORK(i)*TOL  ) .OR. &
+                      ( WORK(i) <= SMALL ) ) EXIT
+                 K = K + 1
+               END DO
+          CASE DEFAULT
+               K = 1
+               DO i = 2, NRNK
+                  IF ( WORK(i) <= SMALL ) EXIT
+                  K = K + 1
+               END DO
+          END SELECT
+      !   Now, U = X(1:M,1:K) is the SVD/POD basis for the
+      !   snapshot data in the input matrix X.
+
+      !<4> Compute the Rayleigh quotient S = U^T * A * U.
+      !    Depending on the requested outputs, the computation
+      !    is organized to compute additional auxiliary
+      !    matrices (for the residuals and refinements).
+      !
+      !    In all formulas below, we need V_k*Sigma_k^(-1)
+      !    where either V_k is in W(1:N,1:K), or V_k^T is in
+      !    W(1:K,1:N). Here Sigma_k=diag(WORK(1:K)).
+      IF ( LSAME(T_OR_N, 'N') ) THEN
+          DO i = 1, K
+           CALL SSCAL( N, ONE/WORK(i), W(1,i), 1 )    ! BLAS CALL
+           ! W(1:N,i) = (ONE/WORK(i)) * W(1:N,i)      ! INTRINSIC
+          END DO
+      ELSE
+          ! This non-unit stride access is due to the fact
+          ! that SGESVD, SGESVDQ and SGESDD return the
+          ! transposed matrix of the right singular vectors.
+          !DO i = 1, K
+          ! CALL SSCAL( N, ONE/WORK(i), W(i,1), LDW )    ! BLAS CALL
+          ! ! W(i,1:N) = (ONE/WORK(i)) * W(i,1:N)      ! INTRINSIC
+          !END DO
+          DO i = 1, K
+              WORK(N+i) = ONE/WORK(i)
+          END DO
+          DO j = 1, N
+             DO i = 1, K
+                 W(i,j) = (WORK(N+i))*W(i,j)
+             END DO
+          END DO
+      END IF
+!
+      IF ( WNTREF ) THEN
+         !
+         ! Need A*U(:,1:K)=Y*V_k*inv(diag(WORK(1:K)))
+         ! for computing the refined Ritz vectors
+         ! (optionally, outside SGEDMD).
+          CALL SGEMM( 'N', T_OR_N, M, K, N, ONE, Y, LDY, W, &
+                      LDW, ZERO, Z, LDZ )                        ! BLAS CALL
+          ! Z(1:M,1:K)=MATMUL(Y(1:M,1:N),TRANSPOSE(W(1:K,1:N)))  ! INTRINSIC, for T_OR_N=='T'
+          ! Z(1:M,1:K)=MATMUL(Y(1:M,1:N),W(1:N,1:K))             ! INTRINSIC, for T_OR_N=='N'
+          !
+          ! At this point Z contains
+          ! A * U(:,1:K) = Y * V_k * Sigma_k^(-1), and
+          ! this is needed for computing the residuals.
+          ! This matrix is  returned in the array B and
+          ! it can be used to compute refined Ritz vectors.
+          CALL SLACPY( 'A', M, K, Z, LDZ, B, LDB )   ! BLAS CALL
+          ! B(1:M,1:K) = Z(1:M,1:K)                  ! INTRINSIC
+
+          CALL SGEMM( 'T', 'N', K, K, M, ONE, X, LDX, Z, &
+                      LDZ, ZERO, S, LDS )                        ! BLAS CALL
+          ! S(1:K,1:K) = MATMUL(TANSPOSE(X(1:M,1:K)),Z(1:M,1:K)) ! INTRINSIC
+          ! At this point S = U^T * A * U is the Rayleigh quotient.
+      ELSE
+        ! A * U(:,1:K) is not explicitly needed and the
+        ! computation is organized differently. The Rayleigh
+        ! quotient is computed more efficiently.
+        CALL SGEMM( 'T', 'N', K, N, M, ONE, X, LDX, Y, LDY, &
+                   ZERO, Z, LDZ )                                   ! BLAS CALL
+        ! Z(1:K,1:N) = MATMUL( TRANSPOSE(X(1:M,1:K)), Y(1:M,1:N) )  ! INTRINSIC
+        ! In the two SGEMM calls here, can use K for LDZ
+        CALL SGEMM( 'N', T_OR_N, K, K, N, ONE, Z, LDZ, W, &
+                    LDW, ZERO, S, LDS )                         ! BLAS CALL
+        ! S(1:K,1:K) = MATMUL(Z(1:K,1:N),TRANSPOSE(W(1:K,1:N))) ! INTRINSIC, for T_OR_N=='T'
+        ! S(1:K,1:K) = MATMUL(Z(1:K,1:N),(W(1:N,1:K)))          ! INTRINSIC, for T_OR_N=='N'
+        ! At this point S = U^T * A * U is the Rayleigh quotient.
+        ! If the residuals are requested, save scaled V_k into Z.
+        ! Recall that V_k or V_k^T is stored in W.
+        IF ( WNTRES .OR. WNTEX ) THEN
+          IF ( LSAME(T_OR_N, 'N') ) THEN
+              CALL SLACPY( 'A', N, K, W, LDW, Z, LDZ )
+          ELSE
+              CALL SLACPY( 'A', K, N, W, LDW, Z, LDZ )
+          END IF
+        END IF
+      END IF
+!
+      !<5> Compute the Ritz values and (if requested) the
+      !   right eigenvectors of the Rayleigh quotient.
+      !
+      CALL SGEEV( 'N', JOBZL, K, S, LDS, REIG, IMEIG, W, &
+                  LDW, W, LDW, WORK(N+1), LWORK-N, INFO1 )   ! LAPACK CALL
+      !
+      ! W(1:K,1:K) contains the eigenvectors of the Rayleigh
+      ! quotient. Even in the case of complex spectrum, all
+      ! computation is done in real arithmetic. REIG and
+      ! IMEIG are the real and the imaginary parts of the
+      ! eigenvalues, so that the spectrum is given as
+      ! REIG(:) + sqrt(-1)*IMEIG(:). Complex conjugate pairs
+      ! are listed at consecutive positions. For such a
+      ! complex conjugate pair of the eigenvalues, the
+      ! corresponding eigenvectors are also a complex
+      ! conjugate pair with the real and imaginary parts
+      ! stored column-wise in W at the corresponding
+      ! consecutive column indices. See the description of Z.
+      ! Also, see the description of SGEEV.
+      IF ( INFO1 > 0 ) THEN
+         ! SGEEV failed to compute the eigenvalues and
+         ! eigenvectors of the Rayleigh quotient.
+         INFO = 3
+         RETURN
+      END IF
+!
+      ! <6> Compute the eigenvectors (if requested) and,
+      ! the residuals (if requested).
+      !
+      IF ( WNTVEC .OR. WNTEX ) THEN
+      IF ( WNTRES ) THEN
+          IF ( WNTREF ) THEN
+            ! Here, if the refinement is requested, we have
+            ! A*U(:,1:K) already computed and stored in Z.
+            ! For the residuals, need Y = A * U(:,1;K) * W.
+            CALL SGEMM( 'N', 'N', M, K, K, ONE, Z, LDZ, W, &
+                       LDW, ZERO, Y, LDY )               ! BLAS CALL
+            ! Y(1:M,1:K) = Z(1:M,1:K) * W(1:K,1:K)       ! INTRINSIC
+            ! This frees Z; Y contains A * U(:,1:K) * W.
+          ELSE
+            ! Compute S = V_k * Sigma_k^(-1) * W, where
+            ! V_k * Sigma_k^(-1) is stored in Z
+            CALL SGEMM( T_OR_N, 'N', N, K, K, ONE, Z, LDZ, &
+                       W, LDW, ZERO, S, LDS )
+            ! Then, compute Z = Y * S =
+            ! = Y * V_k * Sigma_k^(-1) * W(1:K,1:K) =
+            ! = A * U(:,1:K) * W(1:K,1:K)
+            CALL SGEMM( 'N', 'N', M, K, N, ONE, Y, LDY, S, &
+                       LDS, ZERO, Z, LDZ )
+            ! Save a copy of Z into Y and free Z for holding
+            ! the Ritz vectors.
+            CALL SLACPY( 'A', M, K, Z, LDZ, Y, LDY )
+            IF ( WNTEX ) CALL SLACPY( 'A', M, K, Z, LDZ, B, LDB )
+          END IF
+      ELSE IF ( WNTEX ) THEN
+          ! Compute S = V_k * Sigma_k^(-1) * W, where
+            ! V_k * Sigma_k^(-1) is stored in Z
+            CALL SGEMM( T_OR_N, 'N', N, K, K, ONE, Z, LDZ, &
+                       W, LDW, ZERO, S, LDS )
+            ! Then, compute Z = Y * S =
+            ! = Y * V_k * Sigma_k^(-1) * W(1:K,1:K) =
+            ! = A * U(:,1:K) * W(1:K,1:K)
+            CALL SGEMM( 'N', 'N', M, K, N, ONE, Y, LDY, S, &
+                       LDS, ZERO, B, LDB )
+            ! The above call replaces the following two calls
+            ! that were used in the developing-testing phase.
+            ! CALL SGEMM( 'N', 'N', M, K, N, ONE, Y, LDY, S, &
+            !           LDS, ZERO, Z, LDZ)
+            ! Save a copy of Z into B and free Z for holding
+            ! the Ritz vectors.
+            ! CALL SLACPY( 'A', M, K, Z, LDZ, B, LDB )
+      END IF
+!
+      ! Compute the real form of the Ritz vectors
+      IF ( WNTVEC ) CALL SGEMM( 'N', 'N', M, K, K, ONE, X, LDX, W, LDW, &
+                   ZERO, Z, LDZ )                           ! BLAS CALL
+      ! Z(1:M,1:K) = MATMUL(X(1:M,1:K), W(1:K,1:K))         ! INTRINSIC
+!
+      IF ( WNTRES ) THEN
+         i = 1
+         DO WHILE ( i <= K )
+            IF ( IMEIG(i) == ZERO ) THEN
+                ! have a real eigenvalue with real eigenvector
+                CALL SAXPY( M, -REIG(i), Z(1,i), 1, Y(1,i), 1 )       ! BLAS CALL
+                ! Y(1:M,i) = Y(1:M,i) - REIG(i) * Z(1:M,i)            ! INTRINSIC
+                RES(i) = SNRM2( M, Y(1,i), 1 )                         ! BLAS CALL
+                i = i + 1
+            ELSE
+               ! Have a complex conjugate pair
+               ! REIG(i) +- sqrt(-1)*IMEIG(i).
+               ! Since all computation is done in real
+               ! arithmetic, the formula for the residual
+               ! is recast for real representation of the
+               ! complex conjugate eigenpair. See the
+               ! description of RES.
+               AB(1,1) =  REIG(i)
+               AB(2,1) = -IMEIG(i)
+               AB(1,2) =  IMEIG(i)
+               AB(2,2) =  REIG(i)
+               CALL SGEMM( 'N', 'N', M, 2, 2, -ONE, Z(1,i), &
+                           LDZ, AB, 2, ONE, Y(1,i), LDY )          ! BLAS CALL
+               ! Y(1:M,i:i+1) = Y(1:M,i:i+1) - Z(1:M,i:i+1) * AB   ! INTRINSIC
+               RES(i)   = SLANGE( 'F', M, 2, Y(1,i), LDY, &
+                                  WORK(N+1) )                      ! LAPACK CALL
+               RES(i+1) = RES(i)
+               i = i + 2
+            END IF
+         END DO
+      END IF
+      END IF
+!
+      IF ( WHTSVD == 4 ) THEN
+          WORK(N+1) = XSCL1
+          WORK(N+2) = XSCL2
+      END IF
+!
+!     Successful exit.
+      IF ( .NOT. BADXY ) THEN
+         INFO = 0
+      ELSE
+         ! A warning on possible data inconsistency.
+         ! This should be a rare event.
+         INFO = 4
+      END IF
+!............................................................
+      RETURN
+!     ......
+      END SUBROUTINE SGEDMD
diff --git a/SRC/sgedmdq.f90 b/SRC/sgedmdq.f90
new file mode 100644
index 0000000000..6bb0a9ed0a
--- /dev/null
+++ b/SRC/sgedmdq.f90
@@ -0,0 +1,862 @@
+!> \brief \b SGEDMDQ computes the Dynamic Mode Decomposition (DMD) for a pair of data snapshot matrices.
+!
+!  =========== DOCUMENTATION ===========
+!
+!  Definition:
+!  ===========
+!
+!     SUBROUTINE SGEDMDQ( JOBS,  JOBZ, JOBR, JOBQ, JOBT, JOBF,   &
+!                         WHTSVD,   M, N, F, LDF,  X, LDX,  Y,   &
+!                         LDY,   NRNK,  TOL,   K,  REIG, IMEIG,  &
+!                         Z, LDZ, RES,  B,     LDB,   V, LDV,    &
+!                         S, LDS, WORK, LWORK, IWORK, LIWORK, INFO )
+!.....
+!     USE, INTRINSIC :: iso_fortran_env, only: real32
+!     IMPLICIT NONE
+!     INTEGER, PARAMETER :: WP = real32
+!.....
+!     Scalar arguments
+!     CHARACTER, INTENT(IN)  :: JOBS, JOBZ, JOBR, JOBQ,    &
+!                               JOBT, JOBF
+!     INTEGER,   INTENT(IN)  :: WHTSVD, M, N,   LDF, LDX,  &
+!                               LDY, NRNK, LDZ, LDB, LDV,  &
+!                               LDS, LWORK,  LIWORK
+!     INTEGER,   INTENT(OUT) :: INFO,   K
+!     REAL(KIND=WP), INTENT(IN)    ::   TOL
+!     Array arguments
+!     REAL(KIND=WP), INTENT(INOUT) :: F(LDF,*)
+!     REAL(KIND=WP), INTENT(OUT)   :: X(LDX,*), Y(LDY,*),  &
+!                                     Z(LDZ,*), B(LDB,*),  &
+!                                     V(LDV,*), S(LDS,*)
+!     REAL(KIND=WP), INTENT(OUT)   :: REIG(*),  IMEIG(*),  &
+!                                     RES(*)
+!     REAL(KIND=WP), INTENT(OUT)   :: WORK(*)
+!     INTEGER,       INTENT(OUT)   :: IWORK(*)
+!
+!............................................................
+!>    \par Purpose:
+!     =============
+!>    \verbatim
+!>    SGEDMDQ computes the Dynamic Mode Decomposition (DMD) for
+!>    a pair of data snapshot matrices, using a QR factorization
+!>    based compression of the data. For the input matrices
+!>    X and Y such that Y = A*X with an unaccessible matrix
+!>    A, SGEDMDQ computes a certain number of Ritz pairs of A using
+!>    the standard Rayleigh-Ritz extraction from a subspace of
+!>    range(X) that is determined using the leading left singular
+!>    vectors of X. Optionally, SGEDMDQ returns the residuals
+!>    of the computed Ritz pairs, the information needed for
+!>    a refinement of the Ritz vectors, or the eigenvectors of
+!>    the Exact DMD.
+!>    For further details see the references listed
+!>    below. For more details of the implementation see [3].
+!>    \endverbatim
+!............................................................
+!>    \par References:
+!     ================
+!>    \verbatim
+!>    [1] P. Schmid: Dynamic mode decomposition of numerical
+!>        and experimental data,
+!>        Journal of Fluid Mechanics 656, 5-28, 2010.
+!>    [2] Z. Drmac, I. Mezic, R. Mohr: Data driven modal
+!>        decompositions: analysis and enhancements,
+!>        SIAM J. on Sci. Comp. 40 (4), A2253-A2285, 2018.
+!>    [3] Z. Drmac: A LAPACK implementation of the Dynamic
+!>        Mode Decomposition I. Technical report. AIMDyn Inc.
+!>        and LAPACK Working Note 298.
+!>    [4] J. Tu, C. W. Rowley, D. M. Luchtenburg, S. L.
+!>        Brunton, N. Kutz: On Dynamic Mode Decomposition:
+!>        Theory and Applications, Journal of Computational
+!>        Dynamics 1(2), 391 -421, 2014.
+!>    \endverbatim
+!......................................................................
+!>    \par Developed and supported by:
+!     ================================
+!>    \verbatim
+!>    Developed and coded by Zlatko Drmac, Faculty of Science,
+!>    University of Zagreb;  drmac@math.hr
+!>    In cooperation with
+!>    AIMdyn Inc., Santa Barbara, CA.
+!>    and supported by
+!>    - DARPA SBIR project "Koopman Operator-Based Forecasting
+!>    for Nonstationary Processes from Near-Term, Limited
+!>    Observational Data" Contract No: W31P4Q-21-C-0007
+!>    - DARPA PAI project "Physics-Informed Machine Learning
+!>    Methodologies" Contract No: HR0011-18-9-0033
+!>    - DARPA MoDyL project "A Data-Driven, Operator-Theoretic
+!>    Framework for Space-Time Analysis of Process Dynamics"
+!>    Contract No: HR0011-16-C-0116
+!>    Any opinions, findings and conclusions or recommendations
+!>    expressed in this material are those of the author and
+!>    do not necessarily reflect the views of the DARPA SBIR
+!>    Program Office.
+!>    \endverbatim
+!......................................................................
+!>    \par Distribution Statement A:
+!     ==============================
+!>    \verbatim
+!>    Approved for Public Release, Distribution Unlimited.
+!>    Cleared by DARPA on September 29, 2022
+!>    \endverbatim
+!......................................................................
+!     Arguments
+!     =========
+!
+!>    \param[in] JOBS
+!>    \verbatim
+!>    JOBS (input) CHARACTER*1
+!>    Determines whether the initial data snapshots are scaled
+!>    by a diagonal matrix. The data snapshots are the columns
+!>    of F. The leading N-1 columns of F are denoted X and the
+!>    trailing N-1 columns are denoted Y.
+!>    'S' :: The data snapshots matrices X and Y are multiplied
+!>           with a diagonal matrix D so that X*D has unit
+!>           nonzero columns (in the Euclidean 2-norm)
+!>    'C' :: The snapshots are scaled as with the 'S' option.
+!>           If it is found that an i-th column of X is zero
+!>           vector and the corresponding i-th column of Y is
+!>           non-zero, then the i-th column of Y is set to
+!>           zero and a warning flag is raised.
+!>    'Y' :: The data snapshots matrices X and Y are multiplied
+!>           by a diagonal matrix D so that Y*D has unit
+!>           nonzero columns (in the Euclidean 2-norm)
+!>    'N' :: No data scaling.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBZ
+!>    \verbatim
+!>    JOBZ (input) CHARACTER*1
+!>    Determines whether the eigenvectors (Koopman modes) will
+!>    be computed.
+!>    'V' :: The eigenvectors (Koopman modes) will be computed
+!>           and returned in the matrix Z.
+!>           See the description of Z.
+!>    'F' :: The eigenvectors (Koopman modes) will be returned
+!>           in factored form as the product Z*V, where Z
+!>           is orthonormal and V contains the eigenvectors
+!>           of the corresponding Rayleigh quotient.
+!>           See the descriptions of F, V, Z.
+!>    'Q' :: The eigenvectors (Koopman modes) will be returned
+!>           in factored form as the product Q*Z, where Z
+!>           contains the eigenvectors of the compression of the
+!>           underlying discretized operator onto the span of
+!>           the data snapshots. See the descriptions of F, V, Z.
+!>           Q is from the initial QR factorization.
+!>    'N' :: The eigenvectors are not computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBR
+!>    \verbatim
+!>    JOBR (input) CHARACTER*1
+!>    Determines whether to compute the residuals.
+!>    'R' :: The residuals for the computed eigenpairs will
+!>           be computed and stored in the array RES.
+!>           See the description of RES.
+!>           For this option to be legal, JOBZ must be 'V'.
+!>    'N' :: The residuals are not computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBQ
+!>    \verbatim
+!>    JOBQ (input) CHARACTER*1
+!>    Specifies whether to explicitly compute and return the
+!>    orthogonal matrix from the QR factorization.
+!>    'Q' :: The matrix Q of the QR factorization of the data
+!>           snapshot matrix is computed and stored in the
+!>           array F. See the description of F.
+!>    'N' :: The matrix Q is not explicitly computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBT
+!>    \verbatim
+!>    JOBT (input) CHARACTER*1
+!>    Specifies whether to return the upper triangular factor
+!>    from the QR factorization.
+!>    'R' :: The matrix R of the QR factorization of the data
+!>           snapshot matrix F is returned in the array Y.
+!>           See the description of Y and Further details.
+!>    'N' :: The matrix R is not returned.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBF
+!>    \verbatim
+!>    JOBF (input) CHARACTER*1
+!>    Specifies whether to store information needed for post-
+!>    processing (e.g. computing refined Ritz vectors)
+!>    'R' :: The matrix needed for the refinement of the Ritz
+!>           vectors is computed and stored in the array B.
+!>           See the description of B.
+!>    'E' :: The unscaled eigenvectors of the Exact DMD are
+!>           computed and returned in the array B. See the
+!>           description of B.
+!>    'N' :: No eigenvector refinement data is computed.
+!>    To be useful on exit, this option needs JOBQ='Q'.
+!>    \endverbatim
+!.....
+!>    \param[in] WHTSVD
+!>    \verbatim
+!>    WHTSVD (input) INTEGER, WHSTVD in { 1, 2, 3, 4 }
+!>    Allows for a selection of the SVD algorithm from the
+!>    LAPACK library.
+!>    1 :: SGESVD (the QR SVD algorithm)
+!>    2 :: SGESDD (the Divide and Conquer algorithm; if enough
+!>         workspace available, this is the fastest option)
+!>    3 :: SGESVDQ (the preconditioned QR SVD  ; this and 4
+!>         are the most accurate options)
+!>    4 :: SGEJSV (the preconditioned Jacobi SVD; this and 3
+!>         are the most accurate options)
+!>    For the four methods above, a significant difference in
+!>    the accuracy of small singular values is possible if
+!>    the snapshots vary in norm so that X is severely
+!>    ill-conditioned. If small (smaller than EPS*||X||)
+!>    singular values are of interest and JOBS=='N',  then
+!>    the options (3, 4) give the most accurate results, where
+!>    the option 4 is slightly better and with stronger
+!>    theoretical background.
+!>    If JOBS=='S', i.e. the columns of X will be normalized,
+!>    then all methods give nearly equally accurate results.
+!>    \endverbatim
+!.....
+!>    \param[in] M
+!>    \verbatim
+!>    M (input) INTEGER, M >= 0
+!>    The state space dimension (the number of rows of F)
+!>    \endverbatim
+!.....
+!>    \param[in] N
+!>    \verbatim
+!>    N (input) INTEGER, 0 <= N <= M
+!>    The number of data snapshots from a single trajectory,
+!>    taken at equidistant discrete times. This is the
+!>    number of columns of F.
+!>    \endverbatim
+!.....
+!>    \param[in,out] F
+!>    \verbatim
+!>    F (input/output) REAL(KIND=WP) M-by-N array
+!>    > On entry,
+!>    the columns of F are the sequence of data snapshots
+!>    from a single trajectory, taken at equidistant discrete
+!>    times. It is assumed that the column norms of F are
+!>    in the range of the normalized floating point numbers.
+!>    < On exit,
+!>    If JOBQ == 'Q', the array F contains the orthogonal
+!>    matrix/factor of the QR factorization of the initial
+!>    data snapshots matrix F. See the description of JOBQ.
+!>    If JOBQ == 'N', the entries in F strictly below the main
+!>    diagonal contain, column-wise, the information on the
+!>    Householder vectors, as returned by SGEQRF. The
+!>    remaining information to restore the orthogonal matrix
+!>    of the initial QR factorization is stored in WORK(1:N).
+!>    See the description of WORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LDF
+!>    \verbatim
+!>    LDF (input) INTEGER, LDF >= M
+!>    The leading dimension of the array F.
+!>    \endverbatim
+!.....
+!>    \param[in,out] X
+!>    \verbatim
+!>    X (workspace/output) REAL(KIND=WP) MIN(M,N)-by-(N-1) array
+!>    X is used as workspace to hold representations of the
+!>    leading N-1 snapshots in the orthonormal basis computed
+!>    in the QR factorization of F.
+!>    On exit, the leading K columns of X contain the leading
+!>    K left singular vectors of the above described content
+!>    of X. To lift them to the space of the left singular
+!>    vectors U(:,1:K)of the input data, pre-multiply with the
+!>    Q factor from the initial QR factorization.
+!>    See the descriptions of F, K, V  and Z.
+!>    \endverbatim
+!.....
+!>    \param[in] LDX
+!>    \verbatim
+!>    LDX (input) INTEGER, LDX >= N
+!>    The leading dimension of the array X
+!>    \endverbatim
+!.....
+!>    \param[in,out] Y
+!>    \verbatim
+!>    Y (workspace/output) REAL(KIND=WP) MIN(M,N)-by-(N-1) array
+!>    Y is used as workspace to hold representations of the
+!>    trailing N-1 snapshots in the orthonormal basis computed
+!>    in the QR factorization of F.
+!>    On exit,
+!>    If JOBT == 'R', Y contains the MIN(M,N)-by-N upper
+!>    triangular factor from the QR factorization of the data
+!>    snapshot matrix F.
+!>    \endverbatim
+!.....
+!>    \param[in] LDY
+!>    \verbatim
+!>    LDY (input) INTEGER , LDY >= N
+!>    The leading dimension of the array Y
+!>    \endverbatim
+!.....
+!>    \param[in] NRNK
+!>    \verbatim
+!>    NRNK (input) INTEGER
+!>    Determines the mode how to compute the numerical rank,
+!>    i.e. how to truncate small singular values of the input
+!>    matrix X. On input, if
+!>    NRNK = -1 :: i-th singular value sigma(i) is truncated
+!>                 if sigma(i) <= TOL*sigma(1)
+!>                 This option is recommended.
+!>    NRNK = -2 :: i-th singular value sigma(i) is truncated
+!>                 if sigma(i) <= TOL*sigma(i-1)
+!>                 This option is included for R&D purposes.
+!>                 It requires highly accurate SVD, which
+!>                 may not be feasible.
+!>    The numerical rank can be enforced by using positive
+!>    value of NRNK as follows:
+!>    0 < NRNK <= N-1 :: at most NRNK largest singular values
+!>    will be used. If the number of the computed nonzero
+!>    singular values is less than NRNK, then only those
+!>    nonzero values will be used and the actually used
+!>    dimension is less than NRNK. The actual number of
+!>    the nonzero singular values is returned in the variable
+!>    K. See the description of K.
+!>    \endverbatim
+!.....
+!>    \param[in] TOL
+!>    \verbatim
+!>    TOL (input) REAL(KIND=WP), 0 <= TOL < 1
+!>    The tolerance for truncating small singular values.
+!>    See the description of NRNK.
+!>    \endverbatim
+!.....
+!>    \param[out] K
+!>    \verbatim
+!>    K (output) INTEGER,  0 <= K <= N
+!>    The dimension of the SVD/POD basis for the leading N-1
+!>    data snapshots (columns of F) and the number of the
+!>    computed Ritz pairs. The value of K is determined
+!>    according to the rule set by the parameters NRNK and
+!>    TOL. See the descriptions of NRNK and TOL.
+!>    \endverbatim
+!.....
+!>    \param[out] REIG
+!>    \verbatim
+!>    REIG (output) REAL(KIND=WP) (N-1)-by-1 array
+!>    The leading K (K<=N) entries of REIG contain
+!>    the real parts of the computed eigenvalues
+!>    REIG(1:K) + sqrt(-1)*IMEIG(1:K).
+!>    See the descriptions of K, IMEIG, Z.
+!>    \endverbatim
+!.....
+!>    \param[out] IMEIG
+!>    \verbatim
+!>    IMEIG (output) REAL(KIND=WP) (N-1)-by-1 array
+!>    The leading K (K<N) entries of REIG contain
+!>    the imaginary parts of the computed eigenvalues
+!>    REIG(1:K) + sqrt(-1)*IMEIG(1:K).
+!>    The eigenvalues are determined as follows:
+!>    If IMEIG(i) == 0, then the corresponding eigenvalue is
+!>    real, LAMBDA(i) = REIG(i).
+!>    If IMEIG(i)>0, then the corresponding complex
+!>    conjugate pair of eigenvalues reads
+!>    LAMBDA(i)   = REIG(i) + sqrt(-1)*IMAG(i)
+!>    LAMBDA(i+1) = REIG(i) - sqrt(-1)*IMAG(i)
+!>    That is, complex conjugate pairs have consecutive
+!>    indices (i,i+1), with the positive imaginary part
+!>    listed first.
+!>    See the descriptions of K, REIG, Z.
+!>    \endverbatim
+!.....
+!>    \param[out] Z
+!>    \verbatim
+!>    Z (workspace/output) REAL(KIND=WP)  M-by-(N-1) array
+!>    If JOBZ =='V' then
+!>       Z contains real Ritz vectors as follows:
+!>       If IMEIG(i)=0, then Z(:,i) is an eigenvector of
+!>       the i-th Ritz value.
+!>       If IMEIG(i) > 0 (and IMEIG(i+1) < 0) then
+!>       [Z(:,i) Z(:,i+1)] span an invariant subspace and
+!>       the Ritz values extracted from this subspace are
+!>       REIG(i) + sqrt(-1)*IMEIG(i) and
+!>       REIG(i) - sqrt(-1)*IMEIG(i).
+!>       The corresponding eigenvectors are
+!>       Z(:,i) + sqrt(-1)*Z(:,i+1) and
+!>       Z(:,i) - sqrt(-1)*Z(:,i+1), respectively.
+!>    If JOBZ == 'F', then the above descriptions hold for
+!>    the columns of Z*V, where the columns of V are the
+!>    eigenvectors of the K-by-K Rayleigh quotient, and Z is
+!>    orthonormal. The columns of V are similarly structured:
+!>    If IMEIG(i) == 0 then Z*V(:,i) is an eigenvector, and if
+!>    IMEIG(i) > 0 then Z*V(:,i)+sqrt(-1)*Z*V(:,i+1) and
+!>                      Z*V(:,i)-sqrt(-1)*Z*V(:,i+1)
+!>    are the eigenvectors of LAMBDA(i), LAMBDA(i+1).
+!>    See the descriptions of REIG, IMEIG, X and V.
+!>    \endverbatim
+!.....
+!>    \param[in] LDZ
+!>    \verbatim
+!>    LDZ (input) INTEGER , LDZ >= M
+!>    The leading dimension of the array Z.
+!>    \endverbatim
+!.....
+!>    \param[out] RES
+!>    \verbatim
+!>    RES (output) REAL(KIND=WP) (N-1)-by-1 array
+!>    RES(1:K) contains the residuals for the K computed
+!>    Ritz pairs.
+!>    If LAMBDA(i) is real, then
+!>       RES(i) = || A * Z(:,i) - LAMBDA(i)*Z(:,i))||_2.
+!>    If [LAMBDA(i), LAMBDA(i+1)] is a complex conjugate pair
+!>    then
+!>    RES(i)=RES(i+1) = || A * Z(:,i:i+1) - Z(:,i:i+1) *B||_F
+!>    where B = [ real(LAMBDA(i)) imag(LAMBDA(i)) ]
+!>              [-imag(LAMBDA(i)) real(LAMBDA(i)) ].
+!>    It holds that
+!>    RES(i)   = || A*ZC(:,i)   - LAMBDA(i)  *ZC(:,i)   ||_2
+!>    RES(i+1) = || A*ZC(:,i+1) - LAMBDA(i+1)*ZC(:,i+1) ||_2
+!>    where ZC(:,i)   =  Z(:,i) + sqrt(-1)*Z(:,i+1)
+!>          ZC(:,i+1) =  Z(:,i) - sqrt(-1)*Z(:,i+1)
+!>    See the description of Z.
+!>    \endverbatim
+!.....
+!>    \param[out] B
+!>    \verbatim
+!>    B (output) REAL(KIND=WP)  MIN(M,N)-by-(N-1) array.
+!>    IF JOBF =='R', B(1:N,1:K) contains A*U(:,1:K), and can
+!>    be used for computing the refined vectors; see further
+!>    details in the provided references.
+!>    If JOBF == 'E', B(1:N,1;K) contains
+!>    A*U(:,1:K)*W(1:K,1:K), which are the vectors from the
+!>    Exact DMD, up to scaling by the inverse eigenvalues.
+!>    In both cases, the content of B can be lifted to the
+!>    original dimension of the input data by pre-multiplying
+!>    with the Q factor from the initial QR factorization.
+!>    Here A denotes a compression of the underlying operator.
+!>    See the descriptions of F and X.
+!>    If JOBF =='N', then B is not referenced.
+!>    \endverbatim
+!.....
+!>    \param[in] LDB
+!>    \verbatim
+!>    LDB (input) INTEGER, LDB >= MIN(M,N)
+!>    The leading dimension of the array B.
+!>    \endverbatim
+!.....
+!>    \param[out] V
+!>    \verbatim
+!>    V (workspace/output) REAL(KIND=WP) (N-1)-by-(N-1) array
+!>    On exit, V(1:K,1:K) contains the K eigenvectors of
+!>    the Rayleigh quotient. The eigenvectors of a complex
+!>    conjugate pair of eigenvalues are returned in real form
+!>    as explained in the description of Z. The Ritz vectors
+!>    (returned in Z) are the product of X and V; see
+!>    the descriptions of X and Z.
+!>    \endverbatim
+!.....
+!>    \param[in] LDV
+!>    \verbatim
+!>    LDV (input) INTEGER, LDV >= N-1
+!>    The leading dimension of the array V.
+!>    \endverbatim
+!.....
+!>    \param[out] S
+!>    \verbatim
+!>    S (output) REAL(KIND=WP) (N-1)-by-(N-1) array
+!>    The array S(1:K,1:K) is used for the matrix Rayleigh
+!>    quotient. This content is overwritten during
+!>    the eigenvalue decomposition by SGEEV.
+!>    See the description of K.
+!>    \endverbatim
+!.....
+!>    \param[in] LDS
+!>    \verbatim
+!>    LDS (input) INTEGER, LDS >= N-1
+!>    The leading dimension of the array S.
+!>    \endverbatim
+!.....
+!>    \param[out] WORK
+!>    \verbatim
+!>    WORK (workspace/output) REAL(KIND=WP) LWORK-by-1 array
+!>    On exit,
+!>    WORK(1:MIN(M,N)) contains the scalar factors of the
+!>    elementary reflectors as returned by SGEQRF of the
+!>    M-by-N input matrix F.
+!>    WORK(MIN(M,N)+1:MIN(M,N)+N-1) contains the singular values of
+!>    the input submatrix F(1:M,1:N-1).
+!>    If the call to SGEDMDQ is only workspace query, then
+!>    WORK(1) contains the minimal workspace length and
+!>    WORK(2) is the optimal workspace length. Hence, the
+!>    length of work is at least 2.
+!>    See the description of LWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LWORK
+!>    \verbatim
+!>    LWORK (input) INTEGER
+!>    The minimal length of the  workspace vector WORK.
+!>    LWORK is calculated as follows:
+!>    Let MLWQR  = N (minimal workspace for SGEQRF[M,N])
+!>        MLWDMD = minimal workspace for SGEDMD (see the
+!>                 description of LWORK in SGEDMD) for
+!>                 snapshots of dimensions MIN(M,N)-by-(N-1)
+!>        MLWMQR = N (minimal workspace for
+!>                   SORMQR['L','N',M,N,N])
+!>        MLWGQR = N (minimal workspace for SORGQR[M,N,N])
+!>    Then
+!>    LWORK = MAX(N+MLWQR, N+MLWDMD)
+!>    is updated as follows:
+!>       if   JOBZ == 'V' or JOBZ == 'F' THEN
+!>            LWORK = MAX( LWORK,MIN(M,N)+N-1 +MLWMQR )
+!>       if   JOBQ == 'Q' THEN
+!>            LWORK = MAX( LWORK,MIN(M,N)+N-1+MLWGQR)
+!>    If on entry LWORK = -1, then a workspace query is
+!>    assumed and the procedure only computes the minimal
+!>    and the optimal workspace lengths for both WORK and
+!>    IWORK. See the descriptions of WORK and IWORK.
+!>    \endverbatim
+!.....
+!>    \param[out] IWORK
+!>    \verbatim
+!>    IWORK (workspace/output) INTEGER LIWORK-by-1 array
+!>    Workspace that is required only if WHTSVD equals
+!>    2 , 3 or 4. (See the description of WHTSVD).
+!>    If on entry LWORK =-1 or LIWORK=-1, then the
+!>    minimal length of IWORK is computed and returned in
+!>    IWORK(1). See the description of LIWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LIWORK
+!>    \verbatim
+!>    LIWORK (input) INTEGER
+!>    The minimal length of the workspace vector IWORK.
+!>    If WHTSVD == 1, then only IWORK(1) is used; LIWORK >=1
+!>    Let M1=MIN(M,N), N1=N-1. Then
+!>    If WHTSVD == 2, then LIWORK >= MAX(1,8*MIN(M1,N1))
+!>    If WHTSVD == 3, then LIWORK >= MAX(1,M1+N1-1)
+!>    If WHTSVD == 4, then LIWORK >= MAX(3,M1+3*N1)
+!>    If on entry LIWORK = -1, then a worskpace query is
+!>    assumed and the procedure only computes the minimal
+!>    and the optimal workspace lengths for both WORK and
+!>    IWORK. See the descriptions of WORK and IWORK.
+!>    \endverbatim
+!.....
+!>    \param[out] INFO
+!>    \verbatim
+!>    INFO (output) INTEGER
+!>    -i < 0 :: On entry, the i-th argument had an
+!>              illegal value
+!>       = 0 :: Successful return.
+!>       = 1 :: Void input. Quick exit (M=0 or N=0).
+!>       = 2 :: The SVD computation of X did not converge.
+!>              Suggestion: Check the input data and/or
+!>              repeat with different WHTSVD.
+!>       = 3 :: The computation of the eigenvalues did not
+!>              converge.
+!>       = 4 :: If data scaling was requested on input and
+!>              the procedure found inconsistency in the data
+!>              such that for some column index i,
+!>              X(:,i) = 0 but Y(:,i) /= 0, then Y(:,i) is set
+!>              to zero if JOBS=='C'. The computation proceeds
+!>              with original or modified data and warning
+!>              flag is set with INFO=4.
+!>    \endverbatim
+!
+!  Authors:
+!  ========
+!
+!> \author Zlatko Drmac
+!
+!> \ingroup gedmd
+!
+!.............................................................
+!.............................................................
+SUBROUTINE SGEDMDQ( JOBS,  JOBZ, JOBR, JOBQ, JOBT, JOBF,   &
+                    WHTSVD,   M, N, F, LDF,  X, LDX,  Y,   &
+                    LDY,   NRNK,  TOL,   K,  REIG, IMEIG,  &
+                    Z, LDZ, RES,  B,     LDB,   V, LDV,    &
+                    S, LDS, WORK, LWORK, IWORK, LIWORK, INFO )
+!
+!  -- LAPACK driver routine                                           --
+!
+!  -- LAPACK is a software package provided by University of          --
+!  -- Tennessee, University of California Berkeley, University of     --
+!  -- Colorado Denver and NAG Ltd..                                   --
+!
+!.....
+      USE, INTRINSIC :: iso_fortran_env, only: real32
+      IMPLICIT NONE
+      INTEGER, PARAMETER :: WP = real32
+!
+!     Scalar arguments
+!     ~~~~~~~~~~~~~~~~
+      CHARACTER, INTENT(IN)  :: JOBS, JOBZ, JOBR, JOBQ,    &
+                                JOBT, JOBF
+      INTEGER,   INTENT(IN)  :: WHTSVD, M, N,   LDF, LDX,  &
+                                LDY, NRNK, LDZ, LDB, LDV,  &
+                                LDS, LWORK,  LIWORK
+      INTEGER,   INTENT(OUT) :: INFO,   K
+      REAL(KIND=WP), INTENT(IN)    ::   TOL
+!
+!     Array arguments
+!     ~~~~~~~~~~~~~~~~
+      REAL(KIND=WP), INTENT(INOUT) :: F(LDF,*)
+      REAL(KIND=WP), INTENT(OUT)   :: X(LDX,*), Y(LDY,*),  &
+                                      Z(LDZ,*), B(LDB,*),  &
+                                      V(LDV,*), S(LDS,*)
+      REAL(KIND=WP), INTENT(OUT)   :: REIG(*),  IMEIG(*),  &
+                                      RES(*)
+      REAL(KIND=WP), INTENT(OUT)   :: WORK(*)
+      INTEGER,       INTENT(OUT)   :: IWORK(*)
+!
+!     Parameters
+!     ~~~~~~~~~~
+      REAL(KIND=WP), PARAMETER ::  ONE = 1.0_WP
+      REAL(KIND=WP), PARAMETER :: ZERO = 0.0_WP
+!
+!     Local scalars
+!     ~~~~~~~~~~~~~
+      INTEGER           :: IMINWR, INFO1,  MLWDMD, MLWGQR, &
+                           MLWMQR, MLWORK, MLWQR,  MINMN,  &
+                           OLWDMD, OLWGQR, OLWMQR, OLWORK, &
+                           OLWQR
+      LOGICAL           :: LQUERY, SCCOLX, SCCOLY, WANTQ,  &
+                           WNTTRF, WNTRES, WNTVEC, WNTVCF, &
+                           WNTVCQ, WNTREF, WNTEX
+      CHARACTER(LEN=1)  :: JOBVL
+!
+!     Local array
+!     ~~~~~~~~~~~
+      REAL(KIND=WP) :: RDUMMY(2)
+!
+!     External functions (BLAS and LAPACK)
+!     ~~~~~~~~~~~~~~~~~
+      LOGICAL       LSAME
+      EXTERNAL      LSAME
+!
+!     External subroutines (BLAS and LAPACK)
+!     ~~~~~~~~~~~~~~~~~~~~
+      EXTERNAL      SGEMM
+      EXTERNAL      SGEDMD, SGEQRF, SLACPY, SLASET, SORGQR, &
+                    SORMQR, XERBLA
+!
+!     Intrinsic functions
+!     ~~~~~~~~~~~~~~~~~~~
+      INTRINSIC      MAX, MIN, INT
+!..........................................................
+!
+!     Test the input arguments
+      WNTRES = LSAME(JOBR,'R')
+      SCCOLX = LSAME(JOBS,'S') .OR. LSAME( JOBS, 'C' )
+      SCCOLY = LSAME(JOBS,'Y')
+      WNTVEC = LSAME(JOBZ,'V')
+      WNTVCF = LSAME(JOBZ,'F')
+      WNTVCQ = LSAME(JOBZ,'Q')
+      WNTREF = LSAME(JOBF,'R')
+      WNTEX  = LSAME(JOBF,'E')
+      WANTQ  = LSAME(JOBQ,'Q')
+      WNTTRF = LSAME(JOBT,'R')
+      MINMN  = MIN(M,N)
+      INFO = 0
+      LQUERY = ( ( LWORK == -1 ) .OR. ( LIWORK == -1 ) )
+!
+      IF ( .NOT. (SCCOLX .OR. SCCOLY .OR. LSAME(JOBS,'N')) )  THEN
+          INFO = -1
+      ELSE IF ( .NOT. (WNTVEC .OR. WNTVCF .OR. WNTVCQ       &
+                              .OR. LSAME(JOBZ,'N')) ) THEN
+          INFO = -2
+      ELSE IF ( .NOT. (WNTRES .OR. LSAME(JOBR,'N')) .OR.    &
+          ( WNTRES .AND. LSAME(JOBZ,'N') ) ) THEN
+          INFO = -3
+      ELSE IF ( .NOT. (WANTQ .OR. LSAME(JOBQ,'N')) ) THEN
+          INFO = -4
+      ELSE IF ( .NOT. ( WNTTRF .OR. LSAME(JOBT,'N') ) )  THEN
+          INFO = -5
+      ELSE IF ( .NOT. (WNTREF .OR. WNTEX .OR.             &
+                LSAME(JOBF,'N') ) )                    THEN
+          INFO = -6
+      ELSE IF ( .NOT. ((WHTSVD == 1).OR.(WHTSVD == 2).OR.   &
+                       (WHTSVD == 3).OR.(WHTSVD == 4)) ) THEN
+          INFO = -7
+      ELSE IF ( M < 0 ) THEN
+          INFO = -8
+      ELSE IF ( ( N < 0 ) .OR. ( N > M+1 ) ) THEN
+          INFO = -9
+      ELSE IF ( LDF < M ) THEN
+          INFO = -11
+      ELSE IF ( LDX < MINMN ) THEN
+          INFO = -13
+      ELSE IF ( LDY < MINMN ) THEN
+          INFO = -15
+      ELSE IF ( .NOT. (( NRNK == -2).OR.(NRNK == -1).OR.    &
+                       ((NRNK >= 1).AND.(NRNK <=N ))) )  THEN
+          INFO = -16
+      ELSE IF ( ( TOL < ZERO ) .OR. ( TOL >= ONE ) ) THEN
+          INFO = -17
+      ELSE IF ( LDZ < M ) THEN
+          INFO = -22
+      ELSE IF ( (WNTREF.OR.WNTEX ).AND.( LDB < MINMN ) ) THEN
+          INFO = -25
+      ELSE IF ( LDV < N-1 ) THEN
+          INFO = -27
+      ELSE IF ( LDS < N-1 ) THEN
+          INFO = -29
+      END IF
+!
+      IF ( WNTVEC .OR. WNTVCF ) THEN
+          JOBVL = 'V'
+      ELSE
+          JOBVL = 'N'
+      END IF
+      IF ( INFO == 0 ) THEN
+          ! Compute the minimal and the optimal workspace
+          ! requirements. Simulate running the code and
+          ! determine minimal and optimal sizes of the
+          ! workspace at any moment of the run.
+         IF ( ( N == 0 ) .OR. ( N == 1 ) ) THEN
+             ! All output except K is void. INFO=1 signals
+             ! the void input. In case of a workspace query,
+             ! the minimal workspace lengths are returned.
+            IF ( LQUERY ) THEN
+               IWORK(1) = 1
+                WORK(1) = 2
+                WORK(2) = 2
+            ELSE
+               K = 0
+            END IF
+            INFO = 1
+            RETURN
+         END IF
+         MLWQR  = MAX(1,N)  ! Minimal workspace length for SGEQRF.
+         MLWORK = MIN(M,N) + MLWQR
+         IF ( LQUERY ) THEN
+             CALL SGEQRF( M, N, F, LDF, WORK, RDUMMY, -1, &
+                          INFO1 )
+             OLWQR = INT(RDUMMY(1))
+             OLWORK = MIN(M,N) + OLWQR
+         END IF
+         CALL SGEDMD( JOBS, JOBVL, JOBR, JOBF, WHTSVD, MINMN,&
+                      N-1, X, LDX, Y, LDY, NRNK, TOL, K,     &
+                      REIG, IMEIG, Z, LDZ, RES,  B, LDB,     &
+                      V, LDV, S, LDS, WORK, -1, IWORK,       &
+                      LIWORK, INFO1 )
+         MLWDMD = INT(WORK(1))
+         MLWORK = MAX(MLWORK, MINMN + MLWDMD)
+         IMINWR = IWORK(1)
+         IF ( LQUERY ) THEN
+             OLWDMD = INT(WORK(2))
+             OLWORK = MAX(OLWORK, MINMN+OLWDMD)
+         END IF
+         IF ( WNTVEC .OR. WNTVCF ) THEN
+            MLWMQR = MAX(1,N)
+            MLWORK = MAX(MLWORK,MINMN+N-1+MLWMQR)
+            IF ( LQUERY ) THEN
+               CALL SORMQR( 'L','N', M, N, MINMN, F, LDF,  &
+                            WORK, Z, LDZ, WORK, -1, INFO1 )
+               OLWMQR = INT(WORK(1))
+               OLWORK = MAX(OLWORK,MINMN+N-1+OLWMQR)
+            END IF
+         END IF
+         IF ( WANTQ ) THEN
+            MLWGQR = N
+            MLWORK = MAX(MLWORK,MINMN+N-1+MLWGQR)
+            IF ( LQUERY ) THEN
+                CALL SORGQR( M, MINMN, MINMN, F, LDF, WORK, &
+                             WORK, -1, INFO1 )
+                OLWGQR = INT(WORK(1))
+                OLWORK = MAX(OLWORK,MINMN+N-1+OLWGQR)
+            END IF
+         END IF
+         IMINWR = MAX( 1, IMINWR )
+         MLWORK = MAX( 2, MLWORK )
+         IF (  LWORK < MLWORK .AND. (.NOT.LQUERY) ) INFO = -31
+         IF ( LIWORK < IMINWR .AND. (.NOT.LQUERY) ) INFO = -33
+      END IF
+      IF( INFO /= 0 ) THEN
+         CALL XERBLA( 'SGEDMDQ', -INFO )
+         RETURN
+      ELSE IF ( LQUERY ) THEN
+!     Return minimal and optimal workspace sizes
+          IWORK(1) = IMINWR
+          WORK(1)  = REAL(MLWORK)
+          WORK(2)  = REAL(OLWORK)
+          RETURN
+      END IF
+!.....
+!     Initial QR factorization that is used to represent the
+!     snapshots as elements of lower dimensional subspace.
+!     For large scale computation with M >>N , at this place
+!     one can use an out of core QRF.
+!
+      CALL SGEQRF( M, N, F, LDF, WORK,         &
+                   WORK(MINMN+1), LWORK-MINMN, INFO1 )
+!
+!     Define X and Y as the snapshots representations in the
+!     orthogonal basis computed in the QR factorization.
+!     X corresponds to the leading N-1 and Y to the trailing
+!     N-1 snapshots.
+      CALL SLASET( 'L', MINMN, N-1, ZERO,  ZERO, X, LDX )
+      CALL SLACPY( 'U', MINMN, N-1, F,      LDF, X, LDX )
+      CALL SLACPY( 'A', MINMN, N-1, F(1,2), LDF, Y, LDY )
+      IF ( M >= 3 ) THEN
+          CALL SLASET( 'L', MINMN-2, N-2, ZERO,  ZERO, &
+                       Y(3,1), LDY )
+      END IF
+!
+!     Compute the DMD of the projected snapshot pairs (X,Y)
+      CALL SGEDMD( JOBS, JOBVL, JOBR, JOBF, WHTSVD, MINMN,  &
+                   N-1, X, LDX, Y, LDY, NRNK,   TOL, K,     &
+                   REIG, IMEIG, Z, LDZ, RES, B, LDB, V,     &
+                   LDV, S, LDS, WORK(MINMN+1), LWORK-MINMN, IWORK,  &
+                   LIWORK, INFO1 )
+      IF ( INFO1 == 2 .OR. INFO1 == 3 ) THEN
+          ! Return with error code.
+          INFO = INFO1
+          RETURN
+      ELSE
+          INFO = INFO1
+      END IF
+!
+!     The Ritz vectors (Koopman modes) can be explicitly
+!     formed or returned in factored form.
+      IF ( WNTVEC ) THEN
+        ! Compute the eigenvectors explicitly.
+        IF ( M > MINMN ) CALL SLASET( 'A', M-MINMN, K, ZERO, &
+                                     ZERO, Z(MINMN+1,1), LDZ )
+        CALL SORMQR( 'L','N', M, K, MINMN, F, LDF, WORK, Z,  &
+                     LDZ, WORK(MINMN+N), LWORK-(MINMN+N-1), INFO1 )
+      ELSE IF ( WNTVCF ) THEN
+        !   Return the Ritz vectors (eigenvectors) in factored
+        !   form Z*V, where Z contains orthonormal matrix (the
+        !   product of Q from the initial QR factorization and
+        !   the SVD/POD_basis returned by SGEDMD in X) and the
+        !   second factor (the eigenvectors of the Rayleigh
+        !   quotient) is in the array V, as returned by SGEDMD.
+        CALL SLACPY( 'A', N, K, X, LDX, Z, LDZ )
+        IF ( M > N ) CALL SLASET( 'A', M-N, K, ZERO, ZERO,   &
+                                  Z(N+1,1), LDZ )
+        CALL SORMQR( 'L','N', M, K, MINMN, F, LDF, WORK, Z,  &
+             LDZ, WORK(MINMN+N), LWORK-(MINMN+N-1), INFO1 )
+      END IF
+!
+!     Some optional output variables:
+!
+!     The upper triangular factor in the initial QR
+!     factorization is optionally returned in the array Y.
+!     This is useful if this call to SGEDMDQ is to be
+!     followed by a streaming DMD that is implemented in a
+!     QR compressed form.
+      IF ( WNTTRF ) THEN ! Return the upper triangular R in Y
+         CALL SLASET( 'A', MINMN, N, ZERO,  ZERO, Y, LDY )
+         CALL SLACPY( 'U', MINMN, N, F, LDF,      Y, LDY )
+      END IF
+!
+!     The orthonormal/orthogonal factor in the initial QR
+!     factorization is optionally returned in the array F.
+!     Same as with the triangular factor above, this is
+!     useful in a streaming DMD.
+      IF ( WANTQ ) THEN  ! Q overwrites F
+         CALL SORGQR( M, MINMN, MINMN, F, LDF, WORK, &
+              WORK(MINMN+N), LWORK-(MINMN+N-1), INFO1 )
+      END IF
+!
+      RETURN
+!
+      END SUBROUTINE SGEDMDQ
diff --git a/SRC/sgeequ.f b/SRC/sgeequ.f
index 9928eaf621..37decf6c18 100644
--- a/SRC/sgeequ.f
+++ b/SRC/sgeequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgeequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgeequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -131,11 +129,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup geequ
 *
 *  =====================================================================
       SUBROUTINE SGEEQU( M, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sgeequb.f b/SRC/sgeequb.f
index c669f4c0e0..3029946e88 100644
--- a/SRC/sgeequb.f
+++ b/SRC/sgeequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgeequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgeequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -138,11 +136,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup geequb
 *
 *  =====================================================================
       SUBROUTINE SGEEQUB( M, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sgees.f b/SRC/sgees.f
index d40503f899..d1b339ed6c 100644
--- a/SRC/sgees.f
+++ b/SRC/sgees.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEES + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgees.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgees.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -208,11 +206,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEeigen
+*> \ingroup gees
 *
 *  =====================================================================
       SUBROUTINE SGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
      $                  VS, LDVS, WORK, LWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -250,14 +249,16 @@ SUBROUTINE SGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
       REAL               DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEBAK, SGEBAL, SGEHRD, SHSEQR, SLABAD,
-     $                   SLACPY, SLASCL, SORGHR, SSWAP, STRSEN, XERBLA
+      EXTERNAL           SCOPY, SGEBAK, SGEBAL, SGEHRD, SHSEQR,
+     $                   SLACPY,
+     $                   SLASCL, SORGHR, SSWAP, STRSEN, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANGE
-      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANGE
+      REAL               SLAMCH, SLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
@@ -272,7 +273,8 @@ SUBROUTINE SGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
       WANTST = LSAME( SORT, 'S' )
       IF( ( .NOT.WANTVS ) .AND. ( .NOT.LSAME( JOBVS, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
          INFO = -4
@@ -300,9 +302,10 @@ SUBROUTINE SGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
             MAXWRK = 2*N + N*ILAENV( 1, 'SGEHRD', ' ', N, 1, N, 0 )
             MINWRK = 3*N
 *
-            CALL SHSEQR( 'S', JOBVS, N, 1, N, A, LDA, WR, WI, VS, LDVS,
+            CALL SHSEQR( 'S', JOBVS, N, 1, N, A, LDA, WR, WI, VS,
+     $                   LDVS,
      $             WORK, -1, IEVAL )
-            HSWORK = WORK( 1 )
+            HSWORK = INT( WORK( 1 ) )
 *
             IF( .NOT.WANTVS ) THEN
                MAXWRK = MAX( MAXWRK, N + HSWORK )
@@ -312,7 +315,7 @@ SUBROUTINE SGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
                MAXWRK = MAX( MAXWRK, N + HSWORK )
             END IF
          END IF
-         WORK( 1 ) = MAXWRK
+         WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
             INFO = -13
@@ -338,7 +341,6 @@ SUBROUTINE SGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -379,7 +381,8 @@ SUBROUTINE SGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
 *        Generate orthogonal matrix in VS
 *        (Workspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *
-         CALL SORGHR( N, ILO, IHI, VS, LDVS, WORK( ITAU ), WORK( IWRK ),
+         CALL SORGHR( N, ILO, IHI, VS, LDVS, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
       END IF
 *
@@ -420,7 +423,8 @@ SUBROUTINE SGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
 *        Undo balancing
 *        (Workspace: need N)
 *
-         CALL SGEBAK( 'P', 'R', N, ILO, IHI, WORK( IBAL ), N, VS, LDVS,
+         CALL SGEBAK( 'P', 'R', N, ILO, IHI, WORK( IBAL ), N, VS,
+     $                LDVS,
      $                IERR )
       END IF
 *
@@ -463,12 +467,14 @@ SUBROUTINE SGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
                      WI( I ) = ZERO
                      WI( I+1 ) = ZERO
                      IF( I.GT.1 )
-     $                  CALL SSWAP( I-1, A( 1, I ), 1, A( 1, I+1 ), 1 )
+     $                  CALL SSWAP( I-1, A( 1, I ), 1, A( 1, I+1 ),
+     $                              1 )
                      IF( N.GT.I+1 )
      $                  CALL SSWAP( N-I-1, A( I, I+2 ), LDA,
      $                              A( I+1, I+2 ), LDA )
                      IF( WANTVS ) THEN
-                        CALL SSWAP( N, VS( 1, I ), 1, VS( 1, I+1 ), 1 )
+                        CALL SSWAP( N, VS( 1, I ), 1, VS( 1, I+1 ),
+     $                              1 )
                      END IF
                      A( I, I+1 ) = A( I+1, I )
                      A( I+1, I ) = ZERO
@@ -524,7 +530,7 @@ SUBROUTINE SGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, WR, WI,
    30    CONTINUE
       END IF
 *
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
       RETURN
 *
 *     End of SGEES
diff --git a/SRC/sgeesx.f b/SRC/sgeesx.f
index 27c4338d40..ca324c0932 100644
--- a/SRC/sgeesx.f
+++ b/SRC/sgeesx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEESX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgeesx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgeesx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -272,12 +270,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEeigen
+*> \ingroup geesx
 *
 *  =====================================================================
       SUBROUTINE SGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
      $                   WR, WI, VS, LDVS, RCONDE, RCONDV, WORK, LWORK,
      $                   IWORK, LIWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -317,14 +316,16 @@ SUBROUTINE SGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
       REAL               DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEBAK, SGEBAL, SGEHRD, SHSEQR, SLABAD,
+      EXTERNAL           SCOPY, SGEBAK, SGEBAL, SGEHRD,
+     $                   SHSEQR,
      $                   SLACPY, SLASCL, SORGHR, SSWAP, STRSEN, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANGE
-      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANGE
+      REAL               SLAMCH, SLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SLAMCH,
+     $                   SLANGE, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
@@ -344,7 +345,8 @@ SUBROUTINE SGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
 *
       IF( ( .NOT.WANTVS ) .AND. ( .NOT.LSAME( JOBVS, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -2
       ELSE IF( .NOT.( WANTSN .OR. WANTSE .OR. WANTSV .OR. WANTSB ) .OR.
      $         ( .NOT.WANTST .AND. .NOT.WANTSN ) ) THEN
@@ -380,9 +382,10 @@ SUBROUTINE SGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
             MAXWRK = 2*N + N*ILAENV( 1, 'SGEHRD', ' ', N, 1, N, 0 )
             MINWRK = 3*N
 *
-            CALL SHSEQR( 'S', JOBVS, N, 1, N, A, LDA, WR, WI, VS, LDVS,
+            CALL SHSEQR( 'S', JOBVS, N, 1, N, A, LDA, WR, WI, VS,
+     $                   LDVS,
      $             WORK, -1, IEVAL )
-            HSWORK = WORK( 1 )
+            HSWORK = INT( WORK( 1 ) )
 *
             IF( .NOT.WANTVS ) THEN
                MAXWRK = MAX( MAXWRK, N + HSWORK )
@@ -398,7 +401,7 @@ SUBROUTINE SGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
      $         LIWRK = ( N*N )/4
          END IF
          IWORK( 1 ) = LIWRK
-         WORK( 1 ) = LWRK
+         WORK( 1 ) = SROUNDUP_LWORK(LWRK)
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
             INFO = -16
@@ -426,7 +429,6 @@ SUBROUTINE SGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -467,7 +469,8 @@ SUBROUTINE SGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
 *        Generate orthogonal matrix in VS
 *        (RWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *
-         CALL SORGHR( N, ILO, IHI, VS, LDVS, WORK( ITAU ), WORK( IWRK ),
+         CALL SORGHR( N, ILO, IHI, VS, LDVS, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
       END IF
 *
@@ -500,7 +503,8 @@ SUBROUTINE SGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
 *        (IWorkspace: if SENSE is 'V' or 'B', need SDIM*(N-SDIM)
 *                     otherwise, need 0 )
 *
-         CALL STRSEN( SENSE, JOBVS, BWORK, N, A, LDA, VS, LDVS, WR, WI,
+         CALL STRSEN( SENSE, JOBVS, BWORK, N, A, LDA, VS, LDVS, WR,
+     $                WI,
      $                SDIM, RCONDE, RCONDV, WORK( IWRK ), LWORK-IWRK+1,
      $                IWORK, LIWORK, ICOND )
          IF( .NOT.WANTSN )
@@ -528,7 +532,8 @@ SUBROUTINE SGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
 *        Undo balancing
 *        (RWorkspace: need N)
 *
-         CALL SGEBAK( 'P', 'R', N, ILO, IHI, WORK( IBAL ), N, VS, LDVS,
+         CALL SGEBAK( 'P', 'R', N, ILO, IHI, WORK( IBAL ), N, VS,
+     $                LDVS,
      $                IERR )
       END IF
 *
@@ -540,7 +545,8 @@ SUBROUTINE SGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
          CALL SCOPY( N, A, LDA+1, WR, 1 )
          IF( ( WANTSV .OR. WANTSB ) .AND. INFO.EQ.0 ) THEN
             DUM( 1 ) = RCONDV
-            CALL SLASCL( 'G', 0, 0, CSCALE, ANRM, 1, 1, DUM, 1, IERR )
+            CALL SLASCL( 'G', 0, 0, CSCALE, ANRM, 1, 1, DUM, 1,
+     $                   IERR )
             RCONDV = DUM( 1 )
          END IF
          IF( CSCALE.EQ.SMLNUM ) THEN
@@ -576,12 +582,14 @@ SUBROUTINE SGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
                      WI( I ) = ZERO
                      WI( I+1 ) = ZERO
                      IF( I.GT.1 )
-     $                  CALL SSWAP( I-1, A( 1, I ), 1, A( 1, I+1 ), 1 )
+     $                  CALL SSWAP( I-1, A( 1, I ), 1, A( 1, I+1 ),
+     $                              1 )
                      IF( N.GT.I+1 )
      $                  CALL SSWAP( N-I-1, A( I, I+2 ), LDA,
      $                              A( I+1, I+2 ), LDA )
                      IF( WANTVS ) THEN
-                       CALL SSWAP( N, VS( 1, I ), 1, VS( 1, I+1 ), 1 )
+                       CALL SSWAP( N, VS( 1, I ), 1, VS( 1, I+1 ),
+     $                             1 )
                      END IF
                      A( I, I+1 ) = A( I+1, I )
                      A( I+1, I ) = ZERO
@@ -634,7 +642,7 @@ SUBROUTINE SGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
    30    CONTINUE
       END IF
 *
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
       IF( WANTSV .OR. WANTSB ) THEN
          IWORK( 1 ) = SDIM*(N-SDIM)
       ELSE
diff --git a/SRC/sgeev.f b/SRC/sgeev.f
index ed17247219..074de68dc9 100644
--- a/SRC/sgeev.f
+++ b/SRC/sgeev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgeev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgeev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -184,10 +182,11 @@
 *
 *  @generated from dgeev.f, fortran d -> s, Tue Apr 19 01:47:44 2016
 *
-*> \ingroup realGEeigen
+*> \ingroup geev
 *
 *  =====================================================================
-      SUBROUTINE SGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
+      SUBROUTINE SGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL,
+     $                  VR,
      $                  LDVR, WORK, LWORK, INFO )
       implicit none
 *
@@ -223,16 +222,19 @@ SUBROUTINE SGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
       REAL   DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEBAK, SGEBAL, SGEHRD, SHSEQR, SLABAD, SLACPY,
-     $                   SLARTG, SLASCL, SORGHR, SROT, SSCAL, STREVC3,
-     $                   XERBLA
+      EXTERNAL           SGEBAK, SGEBAL, SGEHRD,
+     $                   SHSEQR, SLACPY, SLARTG,
+     $                   SLASCL, SORGHR, SROT,
+     $                   SSCAL, STREVC3, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ISAMAX, ILAENV
-      REAL   SLAMCH, SLANGE, SLAPY2, SNRM2
-      EXTERNAL           LSAME, ISAMAX, ILAENV, SLAMCH, SLANGE, SLAPY2,
-     $                   SNRM2
+      REAL               SLAMCH, SLANGE, SLAPY2, SNRM2,
+     $                   SROUNDUP_LWORK
+      EXTERNAL           LSAME, ISAMAX, ILAENV,
+     $                   SLAMCH, SLANGE, SLAPY2,
+     $                   SNRM2, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
@@ -247,7 +249,8 @@ SUBROUTINE SGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
       WANTVR = LSAME( JOBVR, 'V' )
       IF( ( .NOT.WANTVL ) .AND. ( .NOT.LSAME( JOBVL, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( ( .NOT.WANTVR ) .AND. ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTVR ) .AND.
+     $         ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
          INFO = -3
@@ -279,7 +282,8 @@ SUBROUTINE SGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
                MINWRK = 4*N
                MAXWRK = MAX( MAXWRK, 2*N + ( N - 1 )*ILAENV( 1,
      $                       'SORGHR', ' ', N, 1, N, -1 ) )
-               CALL SHSEQR( 'S', 'V', N, 1, N, A, LDA, WR, WI, VL, LDVL,
+               CALL SHSEQR( 'S', 'V', N, 1, N, A, LDA, WR, WI, VL,
+     $                      LDVL,
      $                      WORK, -1, INFO )
                HSWORK = INT( WORK(1) )
                MAXWRK = MAX( MAXWRK, N + 1, N + HSWORK )
@@ -293,7 +297,8 @@ SUBROUTINE SGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
                MINWRK = 4*N
                MAXWRK = MAX( MAXWRK, 2*N + ( N - 1 )*ILAENV( 1,
      $                       'SORGHR', ' ', N, 1, N, -1 ) )
-               CALL SHSEQR( 'S', 'V', N, 1, N, A, LDA, WR, WI, VR, LDVR,
+               CALL SHSEQR( 'S', 'V', N, 1, N, A, LDA, WR, WI, VR,
+     $                      LDVR,
      $                      WORK, -1, INFO )
                HSWORK = INT( WORK(1) )
                MAXWRK = MAX( MAXWRK, N + 1, N + HSWORK )
@@ -305,14 +310,15 @@ SUBROUTINE SGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
                MAXWRK = MAX( MAXWRK, 4*N )
             ELSE
                MINWRK = 3*N
-               CALL SHSEQR( 'E', 'N', N, 1, N, A, LDA, WR, WI, VR, LDVR,
+               CALL SHSEQR( 'E', 'N', N, 1, N, A, LDA, WR, WI, VR,
+     $                      LDVR,
      $                      WORK, -1, INFO )
                HSWORK = INT( WORK(1) )
                MAXWRK = MAX( MAXWRK, N + 1, N + HSWORK )
             END IF
             MAXWRK = MAX( MAXWRK, MINWRK )
          END IF
-         WORK( 1 ) = MAXWRK
+         WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
             INFO = -13
@@ -336,7 +342,6 @@ SUBROUTINE SGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -379,14 +384,16 @@ SUBROUTINE SGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
 *        Generate orthogonal matrix in VL
 *        (Workspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *
-         CALL SORGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ), WORK( IWRK ),
+         CALL SORGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
 *
 *        Perform QR iteration, accumulating Schur vectors in VL
 *        (Workspace: need N+1, prefer N+HSWORK (see comments) )
 *
          IWRK = ITAU
-         CALL SHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, WR, WI, VL, LDVL,
+         CALL SHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, WR, WI, VL,
+     $                LDVL,
      $                WORK( IWRK ), LWORK-IWRK+1, INFO )
 *
          IF( WANTVR ) THEN
@@ -409,14 +416,16 @@ SUBROUTINE SGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
 *        Generate orthogonal matrix in VR
 *        (Workspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *
-         CALL SORGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ), WORK( IWRK ),
+         CALL SORGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
 *
 *        Perform QR iteration, accumulating Schur vectors in VR
 *        (Workspace: need N+1, prefer N+HSWORK (see comments) )
 *
          IWRK = ITAU
-         CALL SHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, WR, WI, VR, LDVR,
+         CALL SHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, WR, WI, VR,
+     $                LDVR,
      $                WORK( IWRK ), LWORK-IWRK+1, INFO )
 *
       ELSE
@@ -425,7 +434,8 @@ SUBROUTINE SGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
 *        (Workspace: need N+1, prefer N+HSWORK (see comments) )
 *
          IWRK = ITAU
-         CALL SHSEQR( 'E', 'N', N, ILO, IHI, A, LDA, WR, WI, VR, LDVR,
+         CALL SHSEQR( 'E', 'N', N, ILO, IHI, A, LDA, WR, WI, VR,
+     $                LDVR,
      $                WORK( IWRK ), LWORK-IWRK+1, INFO )
       END IF
 *
@@ -439,7 +449,8 @@ SUBROUTINE SGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
 *        Compute left and/or right eigenvectors
 *        (Workspace: need 4*N, prefer N + N + 2*N*NB)
 *
-         CALL STREVC3( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR, LDVR,
+         CALL STREVC3( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR,
+     $                 LDVR,
      $                 N, NOUT, WORK( IWRK ), LWORK-IWRK+1, IERR )
       END IF
 *
@@ -448,7 +459,8 @@ SUBROUTINE SGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
 *        Undo balancing of left eigenvectors
 *        (Workspace: need N)
 *
-         CALL SGEBAK( 'B', 'L', N, ILO, IHI, WORK( IBAL ), N, VL, LDVL,
+         CALL SGEBAK( 'B', 'L', N, ILO, IHI, WORK( IBAL ), N, VL,
+     $                LDVL,
      $                IERR )
 *
 *        Normalize left eigenvectors and make largest component real
@@ -478,7 +490,8 @@ SUBROUTINE SGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
 *        Undo balancing of right eigenvectors
 *        (Workspace: need N)
 *
-         CALL SGEBAK( 'B', 'R', N, ILO, IHI, WORK( IBAL ), N, VR, LDVR,
+         CALL SGEBAK( 'B', 'R', N, ILO, IHI, WORK( IBAL ), N, VR,
+     $                LDVR,
      $                IERR )
 *
 *        Normalize right eigenvectors and make largest component real
@@ -507,9 +520,11 @@ SUBROUTINE SGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
 *
    50 CONTINUE
       IF( SCALEA ) THEN
-         CALL SLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1, WR( INFO+1 ),
+         CALL SLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1,
+     $                WR( INFO+1 ),
      $                MAX( N-INFO, 1 ), IERR )
-         CALL SLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1, WI( INFO+1 ),
+         CALL SLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1,
+     $                WI( INFO+1 ),
      $                MAX( N-INFO, 1 ), IERR )
          IF( INFO.GT.0 ) THEN
             CALL SLASCL( 'G', 0, 0, CSCALE, ANRM, ILO-1, 1, WR, N,
@@ -519,7 +534,7 @@ SUBROUTINE SGEEV( JOBVL, JOBVR, N, A, LDA, WR, WI, VL, LDVL, VR,
          END IF
       END IF
 *
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
       RETURN
 *
 *     End of SGEEV
diff --git a/SRC/sgeevx.f b/SRC/sgeevx.f
index ed1ea1cb98..d3c5700195 100644
--- a/SRC/sgeevx.f
+++ b/SRC/sgeevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgeevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgeevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -297,10 +295,11 @@
 *
 *  @generated from dgeevx.f, fortran d -> s, Tue Apr 19 01:47:44 2016
 *
-*> \ingroup realGEeigen
+*> \ingroup geevx
 *
 *  =====================================================================
-      SUBROUTINE SGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
+      SUBROUTINE SGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR,
+     $                   WI,
      $                   VL, LDVL, VR, LDVR, ILO, IHI, SCALE, ABNRM,
      $                   RCONDE, RCONDV, WORK, LWORK, IWORK, INFO )
       implicit none
@@ -341,16 +340,19 @@ SUBROUTINE SGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
       REAL               DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEBAK, SGEBAL, SGEHRD, SHSEQR, SLABAD, SLACPY,
+      EXTERNAL           SGEBAK, SGEBAL, SGEHRD, SHSEQR,
+     $                   SLACPY,
      $                   SLARTG, SLASCL, SORGHR, SROT, SSCAL, STREVC3,
      $                   STRSNA, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ISAMAX, ILAENV
-      REAL               SLAMCH, SLANGE, SLAPY2, SNRM2
-      EXTERNAL           LSAME, ISAMAX, ILAENV, SLAMCH, SLANGE, SLAPY2,
-     $                   SNRM2
+      REAL               SLAMCH, SLANGE, SLAPY2,
+     $                   SNRM2, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ISAMAX, ILAENV,
+     $                   SLAMCH, SLANGE, SLAPY2,
+     $                   SNRM2, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
@@ -368,12 +370,16 @@ SUBROUTINE SGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
       WNTSNV = LSAME( SENSE, 'V' )
       WNTSNB = LSAME( SENSE, 'B' )
       IF( .NOT.( LSAME( BALANC, 'N' ) .OR. LSAME( BALANC, 'S' )
-     $      .OR. LSAME( BALANC, 'P' ) .OR. LSAME( BALANC, 'B' ) ) )
+     $      .OR.
+     $                  LSAME( BALANC, 'P' ) .OR.
+     $                  LSAME( BALANC, 'B' ) ) )
      $     THEN
          INFO = -1
-      ELSE IF( ( .NOT.WANTVL ) .AND. ( .NOT.LSAME( JOBVL, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTVL ) .AND.
+     $         ( .NOT.LSAME( JOBVL, 'N' ) ) ) THEN
          INFO = -2
-      ELSE IF( ( .NOT.WANTVR ) .AND. ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTVR ) .AND.
+     $         ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( .NOT.( WNTSNN .OR. WNTSNE .OR. WNTSNB .OR. WNTSNV ) .OR.
      $         ( ( WNTSNE .OR. WNTSNB ) .AND. .NOT.( WANTVL .AND.
@@ -412,7 +418,8 @@ SUBROUTINE SGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
      $                       N, NOUT, WORK, -1, IERR )
                LWORK_TREVC = INT( WORK(1) )
                MAXWRK = MAX( MAXWRK, N + LWORK_TREVC )
-               CALL SHSEQR( 'S', 'V', N, 1, N, A, LDA, WR, WI, VL, LDVL,
+               CALL SHSEQR( 'S', 'V', N, 1, N, A, LDA, WR, WI, VL,
+     $                      LDVL,
      $                WORK, -1, INFO )
             ELSE IF( WANTVR ) THEN
                CALL STREVC3( 'R', 'B', SELECT, N, A, LDA,
@@ -420,7 +427,8 @@ SUBROUTINE SGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
      $                       N, NOUT, WORK, -1, IERR )
                LWORK_TREVC = INT( WORK(1) )
                MAXWRK = MAX( MAXWRK, N + LWORK_TREVC )
-               CALL SHSEQR( 'S', 'V', N, 1, N, A, LDA, WR, WI, VR, LDVR,
+               CALL SHSEQR( 'S', 'V', N, 1, N, A, LDA, WR, WI, VR,
+     $                      LDVR,
      $                WORK, -1, INFO )
             ELSE
                IF( WNTSNN ) THEN
@@ -445,7 +453,8 @@ SUBROUTINE SGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
                IF( ( .NOT.WNTSNN ) .AND. ( .NOT.WNTSNE ) )
      $            MINWRK = MAX( MINWRK, N*N + 6*N )
                MAXWRK = MAX( MAXWRK, HSWORK )
-               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1, 'SORGHR',
+               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1,
+     $                       'SORGHR',
      $                       ' ', N, 1, N, -1 ) )
                IF( ( .NOT.WNTSNN ) .AND. ( .NOT.WNTSNE ) )
      $            MAXWRK = MAX( MAXWRK, N*N + 6*N )
@@ -453,7 +462,7 @@ SUBROUTINE SGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
             END IF
             MAXWRK = MAX( MAXWRK, MINWRK )
          END IF
-         WORK( 1 ) = MAXWRK
+         WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
             INFO = -21
@@ -477,7 +486,6 @@ SUBROUTINE SGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -525,14 +533,16 @@ SUBROUTINE SGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
 *        Generate orthogonal matrix in VL
 *        (Workspace: need 2*N-1, prefer N+(N-1)*NB)
 *
-         CALL SORGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ), WORK( IWRK ),
+         CALL SORGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
 *
 *        Perform QR iteration, accumulating Schur vectors in VL
 *        (Workspace: need 1, prefer HSWORK (see comments) )
 *
          IWRK = ITAU
-         CALL SHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, WR, WI, VL, LDVL,
+         CALL SHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, WR, WI, VL,
+     $                LDVL,
      $                WORK( IWRK ), LWORK-IWRK+1, INFO )
 *
          IF( WANTVR ) THEN
@@ -555,14 +565,16 @@ SUBROUTINE SGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
 *        Generate orthogonal matrix in VR
 *        (Workspace: need 2*N-1, prefer N+(N-1)*NB)
 *
-         CALL SORGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ), WORK( IWRK ),
+         CALL SORGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
 *
 *        Perform QR iteration, accumulating Schur vectors in VR
 *        (Workspace: need 1, prefer HSWORK (see comments) )
 *
          IWRK = ITAU
-         CALL SHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, WR, WI, VR, LDVR,
+         CALL SHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, WR, WI, VR,
+     $                LDVR,
      $                WORK( IWRK ), LWORK-IWRK+1, INFO )
 *
       ELSE
@@ -579,7 +591,8 @@ SUBROUTINE SGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
 *        (Workspace: need 1, prefer HSWORK (see comments) )
 *
          IWRK = ITAU
-         CALL SHSEQR( JOB, 'N', N, ILO, IHI, A, LDA, WR, WI, VR, LDVR,
+         CALL SHSEQR( JOB, 'N', N, ILO, IHI, A, LDA, WR, WI, VR,
+     $                LDVR,
      $                WORK( IWRK ), LWORK-IWRK+1, INFO )
       END IF
 *
@@ -593,7 +606,8 @@ SUBROUTINE SGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
 *        Compute left and/or right eigenvectors
 *        (Workspace: need 3*N, prefer N + 2*N*NB)
 *
-         CALL STREVC3( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR, LDVR,
+         CALL STREVC3( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR,
+     $                 LDVR,
      $                 N, NOUT, WORK( IWRK ), LWORK-IWRK+1, IERR )
       END IF
 *
@@ -601,7 +615,8 @@ SUBROUTINE SGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
 *     (Workspace: need N*N+6*N unless SENSE = 'E')
 *
       IF( .NOT.WNTSNN ) THEN
-         CALL STRSNA( SENSE, 'A', SELECT, N, A, LDA, VL, LDVL, VR, LDVR,
+         CALL STRSNA( SENSE, 'A', SELECT, N, A, LDA, VL, LDVL, VR,
+     $                LDVR,
      $                RCONDE, RCONDV, N, NOUT, WORK( IWRK ), N, IWORK,
      $                ICOND )
       END IF
@@ -668,9 +683,11 @@ SUBROUTINE SGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
 *
    50 CONTINUE
       IF( SCALEA ) THEN
-         CALL SLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1, WR( INFO+1 ),
+         CALL SLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1,
+     $                WR( INFO+1 ),
      $                MAX( N-INFO, 1 ), IERR )
-         CALL SLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1, WI( INFO+1 ),
+         CALL SLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1,
+     $                WI( INFO+1 ),
      $                MAX( N-INFO, 1 ), IERR )
          IF( INFO.EQ.0 ) THEN
             IF( ( WNTSNV .OR. WNTSNB ) .AND. ICOND.EQ.0 )
@@ -684,7 +701,7 @@ SUBROUTINE SGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, WR, WI,
          END IF
       END IF
 *
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
       RETURN
 *
 *     End of SGEEVX
diff --git a/SRC/sgehd2.f b/SRC/sgehd2.f
index c7d8db19ec..bd3ff718b2 100644
--- a/SRC/sgehd2.f
+++ b/SRC/sgehd2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEHD2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgehd2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgehd2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,7 +104,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup gehd2
 *
 *> \par Further Details:
 *  =====================
@@ -146,6 +144,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGEHD2( N, ILO, IHI, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -160,16 +159,11 @@ SUBROUTINE SGEHD2( N, ILO, IHI, A, LDA, TAU, WORK, INFO )
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      REAL               ONE
-      PARAMETER          ( ONE = 1.0E+0 )
-*     ..
 *     .. Local Scalars ..
       INTEGER            I
-      REAL               AII
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, SLARFG, XERBLA
+      EXTERNAL           SLARF1F, SLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -199,20 +193,17 @@ SUBROUTINE SGEHD2( N, ILO, IHI, A, LDA, TAU, WORK, INFO )
 *
          CALL SLARFG( IHI-I, A( I+1, I ), A( MIN( I+2, N ), I ), 1,
      $                TAU( I ) )
-         AII = A( I+1, I )
-         A( I+1, I ) = ONE
 *
 *        Apply H(i) to A(1:ihi,i+1:ihi) from the right
 *
-         CALL SLARF( 'Right', IHI, IHI-I, A( I+1, I ), 1, TAU( I ),
-     $               A( 1, I+1 ), LDA, WORK )
+         CALL SLARF1F( 'Right', IHI, IHI-I, A( I+1, I ), 1, TAU( I ),
+     $                 A( 1, I+1 ), LDA, WORK )
 *
 *        Apply H(i) to A(i+1:ihi,i+1:n) from the left
 *
-         CALL SLARF( 'Left', IHI-I, N-I, A( I+1, I ), 1, TAU( I ),
-     $               A( I+1, I+1 ), LDA, WORK )
+         CALL SLARF1F( 'Left', IHI-I, N-I, A( I+1, I ), 1, TAU( I ),
+     $                 A( I+1, I+1 ), LDA, WORK )
 *
-         A( I+1, I ) = AII
    10 CONTINUE
 *
       RETURN
diff --git a/SRC/sgehrd.f b/SRC/sgehrd.f
index 41b9aa78e4..fa7c5ece96 100644
--- a/SRC/sgehrd.f
+++ b/SRC/sgehrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEHRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgehrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgehrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -89,7 +87,7 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is REAL array, dimension (LWORK)
+*>          WORK is REAL array, dimension (MAX(1,LWORK))
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
@@ -120,7 +118,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup gehrd
 *
 *> \par Further Details:
 *  =====================
@@ -163,7 +161,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE SGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -173,7 +173,7 @@ SUBROUTINE SGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
       INTEGER            IHI, ILO, INFO, LDA, LWORK, N
 *     ..
 *     .. Array Arguments ..
-      REAL              A( LDA, * ), TAU( * ), WORK( * )
+      REAL               A( LDA, * ), TAU( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
@@ -182,7 +182,7 @@ SUBROUTINE SGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
       INTEGER            NBMAX, LDT, TSIZE
       PARAMETER          ( NBMAX = 64, LDT = NBMAX+1,
      $                     TSIZE = LDT*NBMAX )
-      REAL              ZERO, ONE
+      REAL               ZERO, ONE
       PARAMETER          ( ZERO = 0.0E+0,
      $                     ONE = 1.0E+0 )
 *     ..
@@ -190,10 +190,11 @@ SUBROUTINE SGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
       LOGICAL            LQUERY
       INTEGER            I, IB, IINFO, IWT, J, LDWORK, LWKOPT, NB,
      $                   NBMIN, NH, NX
-      REAL              EI
+      REAL               EI
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SGEHD2, SGEMM, SLAHR2, SLARFB, STRMM,
+      EXTERNAL           SAXPY, SGEHD2, SGEMM, SLAHR2, SLARFB,
+     $                   STRMM,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -201,7 +202,8 @@ SUBROUTINE SGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -221,13 +223,19 @@ SUBROUTINE SGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -8
       END IF
 *
+      NH = IHI - ILO + 1
       IF( INFO.EQ.0 ) THEN
 *
 *       Compute the workspace requirements
 *
-         NB = MIN( NBMAX, ILAENV( 1, 'SGEHRD', ' ', N, ILO, IHI, -1 ) )
-         LWKOPT = N*NB + TSIZE
-         WORK( 1 ) = LWKOPT
+         IF( NH.LE.1 ) THEN
+            LWKOPT = 1
+         ELSE
+            NB = MIN( NBMAX, ILAENV( 1, 'SGEHRD', ' ', N, ILO, IHI,
+     $                              -1 ) )
+            LWKOPT = N*NB + TSIZE
+         ENDIF
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -248,7 +256,6 @@ SUBROUTINE SGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *     Quick return if possible
 *
-      NH = IHI - ILO + 1
       IF( NH.LE.1 ) THEN
          WORK( 1 ) = 1
          RETURN
@@ -268,7 +275,7 @@ SUBROUTINE SGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *           Determine if workspace is large enough for blocked code
 *
-            IF( LWORK.LT.N*NB+TSIZE ) THEN
+            IF( LWORK.LT.LWKOPT ) THEN
 *
 *              Not enough workspace to use optimal NB:  determine the
 *              minimum value of NB, and reduce NB or force use of
@@ -344,7 +351,8 @@ SUBROUTINE SGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *     Use unblocked code to reduce the rest of the matrix
 *
       CALL SGEHD2( N, I, IHI, A, LDA, TAU, WORK, IINFO )
-      WORK( 1 ) = LWKOPT
+*
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       RETURN
 *
diff --git a/SRC/sgejsv.f b/SRC/sgejsv.f
index 82ac6b94b5..229a356a72 100644
--- a/SRC/sgejsv.f
+++ b/SRC/sgejsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEJSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgejsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgejsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -21,9 +19,9 @@
 *       SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *                          M, N, A, LDA, SVA, U, LDU, V, LDV,
 *                          WORK, LWORK, IWORK, INFO )
+*       IMPLICIT NONE
 *
 *       .. Scalar Arguments ..
-*       IMPLICIT    NONE
 *       INTEGER     INFO, LDA, LDU, LDV, LWORK, M, N
 *       ..
 *       .. Array Arguments ..
@@ -224,7 +222,7 @@
 *>
 *> \param[out] U
 *> \verbatim
-*>          U is REAL array, dimension ( LDU, N )
+*>          U is REAL array, dimension ( LDU, N ) or ( LDU, M )
 *>          If JOBU = 'U', then U contains on exit the M-by-N matrix of
 *>                         the left singular vectors.
 *>          If JOBU = 'F', then U contains on exit the M-by-M matrix of
@@ -253,7 +251,7 @@
 *>          If JOBV = 'V', 'J' then V contains on exit the N-by-N matrix of
 *>                         the right singular vectors;
 *>          If JOBV = 'W', AND (JOBU = 'U' AND JOBT = 'T' AND M = N),
-*>                         then V is used as workspace if the pprocedure
+*>                         then V is used as workspace if the procedure
 *>                         replaces A with A^t. In that case, [U] is computed
 *>                         in V as right singular vectors of A^t and then
 *>                         copied back to the U array. This 'W' option is just
@@ -271,7 +269,7 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is REAL array, dimension (LWORK)
+*>          WORK is REAL array, dimension (MAX(7,LWORK))
 *>          On exit,
 *>          WORK(1) = SCALE = WORK(2) / WORK(1) is the scaling factor such
 *>                    that SCALE*SVA(1:N) are the computed singular values
@@ -318,36 +316,36 @@
 *>               LWORK >= max(2*M+N,4*N+1,7). This is the minimal requirement.
 *>               ->> For optimal performance (blocked code) the optimal value
 *>               is LWORK >= max(2*M+N,3*N+(N+1)*NB,7). Here NB is the optimal
-*>               block size for DGEQP3 and DGEQRF.
+*>               block size for SGEQP3 and SGEQRF.
 *>               In general, optimal LWORK is computed as
-*>               LWORK >= max(2*M+N,N+LWORK(DGEQP3),N+LWORK(DGEQRF), 7).
+*>               LWORK >= max(2*M+N,N+LWORK(SGEQP3),N+LWORK(SGEQRF), 7).
 *>            -> .. an estimate of the scaled condition number of A is
 *>               required (JOBA='E', 'G'). In this case, LWORK is the maximum
 *>               of the above and N*N+4*N, i.e. LWORK >= max(2*M+N,N*N+4*N,7).
 *>               ->> For optimal performance (blocked code) the optimal value
 *>               is LWORK >= max(2*M+N,3*N+(N+1)*NB, N*N+4*N, 7).
 *>               In general, the optimal length LWORK is computed as
-*>               LWORK >= max(2*M+N,N+LWORK(DGEQP3),N+LWORK(DGEQRF),
-*>                                                     N+N*N+LWORK(DPOCON),7).
+*>               LWORK >= max(2*M+N,N+LWORK(SGEQP3),N+LWORK(SGEQRF),
+*>                                                     N+N*N+LWORK(SPOCON),7).
 *>
 *>          If SIGMA and the right singular vectors are needed (JOBV = 'V'),
 *>            -> the minimal requirement is LWORK >= max(2*M+N,4*N+1,7).
 *>            -> For optimal performance, LWORK >= max(2*M+N,3*N+(N+1)*NB,7),
-*>               where NB is the optimal block size for DGEQP3, DGEQRF, DGELQ,
-*>               DORMLQ. In general, the optimal length LWORK is computed as
-*>               LWORK >= max(2*M+N,N+LWORK(DGEQP3), N+LWORK(DPOCON),
-*>                       N+LWORK(DGELQ), 2*N+LWORK(DGEQRF), N+LWORK(DORMLQ)).
+*>               where NB is the optimal block size for SGEQP3, SGEQRF, SGELQF,
+*>               SORMLQ. In general, the optimal length LWORK is computed as
+*>               LWORK >= max(2*M+N,N+LWORK(SGEQP3), N+LWORK(SPOCON),
+*>                       N+LWORK(SGELQF), 2*N+LWORK(SGEQRF), N+LWORK(SORMLQ)).
 *>
 *>          If SIGMA and the left singular vectors are needed
 *>            -> the minimal requirement is LWORK >= max(2*M+N,4*N+1,7).
 *>            -> For optimal performance:
 *>               if JOBU = 'U' :: LWORK >= max(2*M+N,3*N+(N+1)*NB,7),
 *>               if JOBU = 'F' :: LWORK >= max(2*M+N,3*N+(N+1)*NB,N+M*NB,7),
-*>               where NB is the optimal block size for DGEQP3, DGEQRF, DORMQR.
+*>               where NB is the optimal block size for SGEQP3, SGEQRF, SORMQR.
 *>               In general, the optimal length LWORK is computed as
-*>               LWORK >= max(2*M+N,N+LWORK(DGEQP3),N+LWORK(DPOCON),
-*>                        2*N+LWORK(DGEQRF), N+LWORK(DORMQR)).
-*>               Here LWORK(DORMQR) equals N*NB (for JOBU = 'U') or
+*>               LWORK >= max(2*M+N,N+LWORK(SGEQP3),N+LWORK(SPOCON),
+*>                        2*N+LWORK(SGEQRF), N+LWORK(SORMQR)).
+*>               Here LWORK(SORMQR) equals N*NB (for JOBU = 'U') or
 *>               M*NB (for JOBU = 'F').
 *>
 *>          If the full SVD is needed: (JOBU = 'U' or JOBU = 'F') and
@@ -357,12 +355,12 @@
 *>               LWORK >= max(2*M+N, 4*N+N*N,2*N+N*N+6).
 *>            -> For optimal performance, LWORK should be additionally
 *>               larger than N+M*NB, where NB is the optimal block size
-*>               for DORMQR.
+*>               for SORMQR.
 *> \endverbatim
 *>
 *> \param[out] IWORK
 *> \verbatim
-*>          IWORK is INTEGER array, dimension (M+3*N).
+*>          IWORK is INTEGER array, dimension (MAX(3,M+3*N)).
 *>          On exit,
 *>          IWORK(1) = the numerical rank determined after the initial
 *>                     QR factorization with pivoting. See the descriptions
@@ -391,7 +389,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEsing
+*> \ingroup gejsv
 *
 *> \par Further Details:
 *  =====================
@@ -473,13 +471,13 @@
       SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
      $                   M, N, A, LDA, SVA, U, LDU, V, LDV,
      $                   WORK, LWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
 *     .. Scalar Arguments ..
-      IMPLICIT    NONE
       INTEGER     INFO, LDA, LDU, LDV, LWORK, M, N
 *     ..
 *     .. Array Arguments ..
@@ -514,7 +512,8 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
       EXTERNAL  ISAMAX, LSAME, SLAMCH, SNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL  SCOPY,  SGELQF, SGEQP3, SGEQRF, SLACPY, SLASCL,
+      EXTERNAL  SCOPY,  SGELQF, SGEQP3, SGEQRF, SLACPY,
+     $                   SLASCL,
      $          SLASET, SLASSQ, SLASWP, SORGQR, SORMLQ,
      $          SORMQR, SPOCON, SSCAL,  SSWAP,  STRSM,  XERBLA
 *
@@ -692,8 +691,10 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
             CALL SLACPY( 'A', M, 1, A, LDA, U, LDU )
 *           computing all M left singular vectors of the M x 1 matrix
             IF ( N1 .NE. N  ) THEN
-               CALL SGEQRF( M, N, U,LDU, WORK, WORK(N+1),LWORK-N,IERR )
-               CALL SORGQR( M,N1,1, U,LDU,WORK,WORK(N+1),LWORK-N,IERR )
+               CALL SGEQRF( M, N, U,LDU, WORK, WORK(N+1),LWORK-N,
+     $                      IERR )
+               CALL SORGQR( M,N1,1, U,LDU,WORK,WORK(N+1),LWORK-N,
+     $                      IERR )
                CALL SCOPY( M, A(1,1), 1, U(1,1), 1 )
             END IF
          END IF
@@ -1115,7 +1116,8 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
  1949             CONTINUE
  1947          CONTINUE
             ELSE
-               CALL SLASET( 'U', NR-1, NR-1, ZERO, ZERO, A(1,2), LDA )
+               CALL SLASET( 'U', NR-1, NR-1, ZERO, ZERO, A(1,2),
+     $                      LDA )
             END IF
 *
 *           .. and one-sided Jacobi rotations are started on a lower
@@ -1139,7 +1141,8 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
             DO 1998 p = 1, NR
                CALL SCOPY( N-p+1, A(p,p), LDA, V(p,p), 1 )
  1998       CONTINUE
-            CALL SLASET( 'Upper', NR-1, NR-1, ZERO, ZERO, V(1,2), LDV )
+            CALL SLASET( 'Upper', NR-1, NR-1, ZERO, ZERO, V(1,2),
+     $                   LDV )
 *
             CALL SGESVJ( 'L','U','N', N, NR, V,LDV, SVA, NR, A,LDA,
      $                  WORK, LWORK, INFO )
@@ -1151,25 +1154,32 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *        .. two more QR factorizations ( one QRF is not enough, two require
 *        accumulated product of Jacobi rotations, three are perfect )
 *
-            CALL SLASET( 'Lower', NR-1, NR-1, ZERO, ZERO, A(2,1), LDA )
-            CALL SGELQF( NR, N, A, LDA, WORK, WORK(N+1), LWORK-N, IERR)
+            CALL SLASET( 'Lower', NR-1, NR-1, ZERO, ZERO, A(2,1),
+     $                   LDA )
+            CALL SGELQF( NR, N, A, LDA, WORK, WORK(N+1), LWORK-N,
+     $                   IERR)
             CALL SLACPY( 'Lower', NR, NR, A, LDA, V, LDV )
-            CALL SLASET( 'Upper', NR-1, NR-1, ZERO, ZERO, V(1,2), LDV )
+            CALL SLASET( 'Upper', NR-1, NR-1, ZERO, ZERO, V(1,2),
+     $                   LDV )
             CALL SGEQRF( NR, NR, V, LDV, WORK(N+1), WORK(2*N+1),
      $                   LWORK-2*N, IERR )
             DO 8998 p = 1, NR
                CALL SCOPY( NR-p+1, V(p,p), LDV, V(p,p), 1 )
  8998       CONTINUE
-            CALL SLASET( 'Upper', NR-1, NR-1, ZERO, ZERO, V(1,2), LDV )
+            CALL SLASET( 'Upper', NR-1, NR-1, ZERO, ZERO, V(1,2),
+     $                   LDV )
 *
             CALL SGESVJ( 'Lower', 'U','N', NR, NR, V,LDV, SVA, NR, U,
      $                  LDU, WORK(N+1), LWORK-N, INFO )
             SCALEM  = WORK(N+1)
             NUMRANK = NINT(WORK(N+2))
             IF ( NR .LT. N ) THEN
-               CALL SLASET( 'A',N-NR, NR, ZERO,ZERO, V(NR+1,1),   LDV )
-               CALL SLASET( 'A',NR, N-NR, ZERO,ZERO, V(1,NR+1),   LDV )
-               CALL SLASET( 'A',N-NR,N-NR,ZERO,ONE, V(NR+1,NR+1), LDV )
+               CALL SLASET( 'A',N-NR, NR, ZERO,ZERO, V(NR+1,1),
+     $                      LDV )
+               CALL SLASET( 'A',NR, N-NR, ZERO,ZERO, V(1,NR+1),
+     $                      LDV )
+               CALL SLASET( 'A',N-NR,N-NR,ZERO,ONE, V(NR+1,NR+1),
+     $                      LDV )
             END IF
 *
          CALL SORMLQ( 'Left', 'Transpose', N, N, NR, A, LDA, WORK,
@@ -1213,8 +1223,10 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
          IF ( NR .LT. M ) THEN
             CALL SLASET( 'A',  M-NR, NR,ZERO, ZERO, U(NR+1,1), LDU )
             IF ( NR .LT. N1 ) THEN
-               CALL SLASET( 'A',NR, N1-NR, ZERO, ZERO, U(1,NR+1), LDU )
-               CALL SLASET( 'A',M-NR,N1-NR,ZERO,ONE,U(NR+1,NR+1), LDU )
+               CALL SLASET( 'A',NR, N1-NR, ZERO, ZERO, U(1,NR+1),
+     $                      LDU )
+               CALL SLASET( 'A',M-NR,N1-NR,ZERO,ONE,U(NR+1,NR+1),
+     $                      LDU )
             END IF
          END IF
 *
@@ -1276,7 +1288,8 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
  2968             CONTINUE
  2969          CONTINUE
             ELSE
-               CALL SLASET( 'U', NR-1, NR-1, ZERO, ZERO, V(1,2), LDV )
+               CALL SLASET( 'U', NR-1, NR-1, ZERO, ZERO, V(1,2),
+     $                      LDV )
             END IF
 *
 *           Estimate the row scaled condition number of R1
@@ -1386,7 +1399,7 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                IF ( CONDR2 .GE. COND_OK ) THEN
 *                 .. save the Householder vectors used for Q3
 *                 (this overwrites the copy of R2, as it will not be
-*                 needed in this branch, but it does not overwritte the
+*                 needed in this branch, but it does not overwrite the
 *                 Huseholder vectors of Q2.).
                   CALL SLACPY( 'U', NR, NR, V, LDV, WORK(2*N+1), N )
 *                 .. and the rest of the information on Q3 is in
@@ -1409,7 +1422,7 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
             END IF
 *
 *        Second preconditioning finished; continue with Jacobi SVD
-*        The input matrix is lower trinagular.
+*        The input matrix is lower triangular.
 *
 *        Recover the right singular vectors as solution of a well
 *        conditioned triangular matrix equation.
@@ -1432,7 +1445,8 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *                 equation is Q2*V2 = the product of the Jacobi rotations
 *                 used in SGESVJ, premultiplied with the orthogonal matrix
 *                 from the second QR factorization.
-                  CALL STRSM( 'L','U','N','N', NR,NR,ONE, A,LDA, V,LDV )
+                  CALL STRSM( 'L','U','N','N', NR,NR,ONE, A,LDA, V,
+     $                        LDV )
                ELSE
 *                 .. R1 is well conditioned, but non-square. Transpose(R2)
 *                 is inverted to get the product of the Jacobi rotations
@@ -1443,7 +1457,8 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                   IF ( NR .LT. N ) THEN
                     CALL SLASET('A',N-NR,NR,ZERO,ZERO,V(NR+1,1),LDV)
                     CALL SLASET('A',NR,N-NR,ZERO,ZERO,V(1,NR+1),LDV)
-                    CALL SLASET('A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),LDV)
+                    CALL SLASET('A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),
+     $                           LDV)
                   END IF
                   CALL SORMQR('L','N',N,N,NR,WORK(2*N+1),N,WORK(N+1),
      $                 V,LDV,WORK(2*N+N*NR+NR+1),LWORK-2*N-N*NR-NR,IERR)
@@ -1454,10 +1469,11 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 * :)           .. the input matrix A is very likely a relative of
 *              the Kahan matrix :)
 *              The matrix R2 is inverted. The solution of the matrix equation
-*              is Q3^T*V3 = the product of the Jacobi rotations (appplied to
+*              is Q3^T*V3 = the product of the Jacobi rotations (applied to
 *              the lower triangular L3 from the LQ factorization of
 *              R2=L3*Q3), pre-multiplied with the transposed Q3.
-               CALL SGESVJ( 'L', 'U', 'N', NR, NR, V, LDV, SVA, NR, U,
+               CALL SGESVJ( 'L', 'U', 'N', NR, NR, V, LDV, SVA, NR,
+     $                      U,
      $              LDU, WORK(2*N+N*NR+NR+1), LWORK-2*N-N*NR-NR, INFO )
                SCALEM  = WORK(2*N+N*NR+NR+1)
                NUMRANK = NINT(WORK(2*N+N*NR+NR+2))
@@ -1465,7 +1481,8 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                   CALL SCOPY( NR, V(1,p), 1, U(1,p), 1 )
                   CALL SSCAL( NR, SVA(p),    U(1,p), 1 )
  3870          CONTINUE
-               CALL STRSM('L','U','N','N',NR,NR,ONE,WORK(2*N+1),N,U,LDU)
+               CALL STRSM('L','U','N','N',NR,NR,ONE,WORK(2*N+1),N,U,
+     $                     LDU)
 *              .. apply the permutation from the second QR factorization
                DO 873 q = 1, NR
                   DO 872 p = 1, NR
@@ -1478,7 +1495,8 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                IF ( NR .LT. N ) THEN
                   CALL SLASET( 'A',N-NR,NR,ZERO,ZERO,V(NR+1,1),LDV )
                   CALL SLASET( 'A',NR,N-NR,ZERO,ZERO,V(1,NR+1),LDV )
-                  CALL SLASET( 'A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),LDV )
+                  CALL SLASET( 'A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),
+     $                         LDV )
                END IF
                CALL SORMQR( 'L','N',N,N,NR,WORK(2*N+1),N,WORK(N+1),
      $              V,LDV,WORK(2*N+N*NR+NR+1),LWORK-2*N-N*NR-NR,IERR )
@@ -1494,14 +1512,16 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *              defense ensures that SGEJSV completes the task.
 *              Compute the full SVD of L3 using SGESVJ with explicit
 *              accumulation of Jacobi rotations.
-               CALL SGESVJ( 'L', 'U', 'V', NR, NR, V, LDV, SVA, NR, U,
+               CALL SGESVJ( 'L', 'U', 'V', NR, NR, V, LDV, SVA, NR,
+     $                      U,
      $              LDU, WORK(2*N+N*NR+NR+1), LWORK-2*N-N*NR-NR, INFO )
                SCALEM  = WORK(2*N+N*NR+NR+1)
                NUMRANK = NINT(WORK(2*N+N*NR+NR+2))
                IF ( NR .LT. N ) THEN
                   CALL SLASET( 'A',N-NR,NR,ZERO,ZERO,V(NR+1,1),LDV )
                   CALL SLASET( 'A',NR,N-NR,ZERO,ZERO,V(1,NR+1),LDV )
-                  CALL SLASET( 'A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),LDV )
+                  CALL SLASET( 'A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),
+     $                         LDV )
                END IF
                CALL SORMQR( 'L','N',N,N,NR,WORK(2*N+1),N,WORK(N+1),
      $              V,LDV,WORK(2*N+N*NR+NR+1),LWORK-2*N-N*NR-NR,IERR )
@@ -1539,10 +1559,12 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *           At this moment, V contains the right singular vectors of A.
 *           Next, assemble the left singular vector matrix U (M x N).
             IF ( NR .LT. M ) THEN
-               CALL SLASET( 'A', M-NR, NR, ZERO, ZERO, U(NR+1,1), LDU )
+               CALL SLASET( 'A', M-NR, NR, ZERO, ZERO, U(NR+1,1),
+     $                      LDU )
                IF ( NR .LT. N1 ) THEN
                   CALL SLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),LDU)
-                  CALL SLASET('A',M-NR,N1-NR,ZERO,ONE,U(NR+1,NR+1),LDU)
+                  CALL SLASET('A',M-NR,N1-NR,ZERO,ONE,U(NR+1,NR+1),
+     $                         LDU)
                END IF
             END IF
 *
@@ -1611,8 +1633,10 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
             IF ( N .LT. M ) THEN
                CALL SLASET( 'A',  M-N, N, ZERO, ZERO, U(N+1,1), LDU )
                IF ( N .LT. N1 ) THEN
-                  CALL SLASET( 'A',N,  N1-N, ZERO, ZERO,  U(1,N+1),LDU )
-                  CALL SLASET( 'A',M-N,N1-N, ZERO, ONE,U(N+1,N+1),LDU )
+                  CALL SLASET( 'A',N,  N1-N, ZERO, ZERO,  U(1,N+1),
+     $                         LDU )
+                  CALL SLASET( 'A',M-N,N1-N, ZERO, ONE,U(N+1,N+1),
+     $                         LDU )
                END IF
             END IF
             CALL SORMQR( 'Left', 'No Tr', M, N1, N, A, LDA, WORK, U,
@@ -1719,8 +1743,10 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
          IF ( NR .LT. M ) THEN
             CALL SLASET( 'A',  M-NR, NR, ZERO, ZERO, U(NR+1,1), LDU )
             IF ( NR .LT. N1 ) THEN
-               CALL SLASET( 'A',NR,  N1-NR, ZERO, ZERO,  U(1,NR+1),LDU )
-               CALL SLASET( 'A',M-NR,N1-NR, ZERO, ONE,U(NR+1,NR+1),LDU )
+               CALL SLASET( 'A',NR,  N1-NR, ZERO, ZERO,  U(1,NR+1),
+     $                      LDU )
+               CALL SLASET( 'A',M-NR,N1-NR, ZERO, ONE,U(NR+1,NR+1),
+     $                      LDU )
             END IF
          END IF
 *
@@ -1745,7 +1771,8 @@ SUBROUTINE SGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *     Undo scaling, if necessary (and possible)
 *
       IF ( USCAL2 .LE. (BIG/SVA(1))*USCAL1 ) THEN
-         CALL SLASCL( 'G', 0, 0, USCAL1, USCAL2, NR, 1, SVA, N, IERR )
+         CALL SLASCL( 'G', 0, 0, USCAL1, USCAL2, NR, 1, SVA, N,
+     $                IERR )
          USCAL1 = ONE
          USCAL2 = ONE
       END IF
diff --git a/SRC/sgelq.f b/SRC/sgelq.f
index 9209f918ec..d985d06504 100644
--- a/SRC/sgelq.f
+++ b/SRC/sgelq.f
@@ -98,7 +98,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1 or -2, then a workspace query is assumed. The routine
 *>          only calculates the sizes of the T and WORK arrays, returns these
 *>          values as the first entries of the T and WORK arrays, and no error
@@ -166,9 +166,12 @@
 *>  the LQ factorization.
 *> \endverbatim
 *>
+*> \ingroup gelq
+*>
 *  =====================================================================
       SUBROUTINE SGELQ( M, N, A, LDA, T, TSIZE, WORK, LWORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,7 +193,8 @@ SUBROUTINE SGELQ( M, N, A, LDA, T, TSIZE, WORK, LWORK,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SGELQT, SLASWLQ, XERBLA
@@ -285,16 +289,16 @@ SUBROUTINE SGELQ( M, N, A, LDA, T, TSIZE, WORK, LWORK,
 *
       IF( INFO.EQ.0 ) THEN
         IF( MINT ) THEN
-          T( 1 ) = MINTSZ
+          T( 1 ) = REAL( MINTSZ )
         ELSE
-          T( 1 ) = MB*M*NBLCKS + 5
+          T( 1 ) = REAL( MB*M*NBLCKS + 5 )
         END IF
-        T( 2 ) = MB
-        T( 3 ) = NB
+        T( 2 ) = REAL( MB )
+        T( 3 ) = REAL( NB )
         IF( MINW ) THEN
-          WORK( 1 ) = LWMIN
+          WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
         ELSE
-          WORK( 1 ) = LWREQ
+          WORK( 1 ) = SROUNDUP_LWORK( LWREQ )
         END IF
       END IF
       IF( INFO.NE.0 ) THEN
@@ -319,7 +323,7 @@ SUBROUTINE SGELQ( M, N, A, LDA, T, TSIZE, WORK, LWORK,
      $                LWORK, INFO )
       END IF
 *
-      WORK( 1 ) = LWREQ
+      WORK( 1 ) = SROUNDUP_LWORK( LWREQ )
       RETURN
 *
 *     End of SGELQ
diff --git a/SRC/sgelq2.f b/SRC/sgelq2.f
index 3e50beb13e..f0562432bf 100644
--- a/SRC/sgelq2.f
+++ b/SRC/sgelq2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGELQ2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgelq2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgelq2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -104,7 +102,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup gelq2
 *
 *> \par Further Details:
 *  =====================
@@ -126,6 +124,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGELQ2( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -140,16 +139,11 @@ SUBROUTINE SGELQ2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      REAL               ONE
-      PARAMETER          ( ONE = 1.0E+0 )
-*     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      REAL               AII
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, SLARFG, XERBLA
+      EXTERNAL           SLARF1F, SLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -183,11 +177,8 @@ SUBROUTINE SGELQ2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *           Apply H(i) to A(i+1:m,i:n) from the right
 *
-            AII = A( I, I )
-            A( I, I ) = ONE
-            CALL SLARF( 'Right', M-I, N-I+1, A( I, I ), LDA, TAU( I ),
-     $                  A( I+1, I ), LDA, WORK )
-            A( I, I ) = AII
+            CALL SLARF1F( 'Right', M-I, N-I+1, A( I, I ), LDA,
+     $                    TAU( I ), A( I+1, I ), LDA, WORK )
          END IF
    10 CONTINUE
       RETURN
diff --git a/SRC/sgelqf.f b/SRC/sgelqf.f
index 24d8ab19c0..9b068579bb 100644
--- a/SRC/sgelqf.f
+++ b/SRC/sgelqf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGELQF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgelqf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgelqf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -93,7 +91,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,M).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= M, otherwise.
 *>          For optimum performance LWORK >= M*NB, where NB is the
 *>          optimal blocksize.
 *>
@@ -118,7 +117,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup gelqf
 *
 *> \par Further Details:
 *  =====================
@@ -140,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -167,16 +167,16 @@ SUBROUTINE SGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input arguments
 *
       INFO = 0
+      K = MIN( M, N )
       NB = ILAENV( 1, 'SGELQF', ' ', M, N, -1, -1 )
-      LWKOPT = M*NB
-      WORK( 1 ) = LWKOPT
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -184,19 +184,25 @@ SUBROUTINE SGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, M ) .AND. .NOT.LQUERY ) THEN
-         INFO = -7
+      ELSE IF( .NOT.LQUERY ) THEN
+         IF( LWORK.LE.0 .OR. ( N.GT.0 .AND. LWORK.LT.MAX( 1, M ) ) )
+     $      INFO = -7
       END IF
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'SGELQF', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
+         IF( K.EQ.0 ) THEN
+            LWKOPT = 1
+         ELSE
+            LWKOPT = M*NB
+         END IF
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      K = MIN( M, N )
       IF( K.EQ.0 ) THEN
          WORK( 1 ) = 1
          RETURN
@@ -245,7 +251,8 @@ SUBROUTINE SGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *              Form the triangular factor of the block reflector
 *              H = H(i) H(i+1) . . . H(i+ib-1)
 *
-               CALL SLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I, I ),
+               CALL SLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I,
+     $                      I ),
      $                      LDA, TAU( I ), WORK, LDWORK )
 *
 *              Apply H to A(i+ib:m,i:n) from the right
@@ -266,7 +273,7 @@ SUBROUTINE SGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
      $   CALL SGELQ2( M-I+1, N-I+1, A( I, I ), LDA, TAU( I ), WORK,
      $                IINFO )
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK( IWS )
       RETURN
 *
 *     End of SGELQF
diff --git a/SRC/sgelqt.f b/SRC/sgelqt.f
index b5a4c21b30..642f6afb6c 100644
--- a/SRC/sgelqt.f
+++ b/SRC/sgelqt.f
@@ -18,7 +18,7 @@
 *>
 *> \verbatim
 *>
-*> DGELQT computes a blocked LQ factorization of a real M-by-N matrix A
+*> SGELQT computes a blocked LQ factorization of a real M-by-N matrix A
 *> using the compact WY representation of Q.
 *> \endverbatim
 *
@@ -40,7 +40,7 @@
 *> \param[in] MB
 *> \verbatim
 *>          MB is INTEGER
-*>          The block size to be used in the blocked QR.  MIN(M,N) >= MB >= 1.
+*>          The block size to be used in the blocked LQ.  MIN(M,N) >= MB >= 1.
 *> \endverbatim
 *>
 *> \param[in,out] A
@@ -75,7 +75,10 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is REAL array, dimension (MB*N)
+*>          WORK is REAL array, dimension (MB*M).
+*>          Note: A smaller workspace of MB*(M-MB) may also be sufficient, but
+*>          that is yet to be proven. MB*M is a conservative estimate and the
+*>          recommended value to use.
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -93,7 +96,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gelqt
 *
 *> \par Further Details:
 *  =====================
@@ -101,7 +104,7 @@
 *> \verbatim
 *>
 *>  The matrix V stores the elementary reflectors H(i) in the i-th row
-*>  above the diagonal. For example, if M=5 and N=3, the matrix V is
+*>  above the diagonal. For example, if M=3 and N=5, the matrix V is
 *>
 *>               V = (  1  v1 v1 v1 v1 )
 *>                   (     1  v2 v2 v2 )
@@ -121,6 +124,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGELQT( M, N, MB, A, LDA, T, LDT, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sgelqt3.f b/SRC/sgelqt3.f
index 23816b4c89..5ce30615d6 100644
--- a/SRC/sgelqt3.f
+++ b/SRC/sgelqt3.f
@@ -85,7 +85,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gelqt3
 *
 *> \par Further Details:
 *  =====================
@@ -113,6 +113,7 @@
 *>
 *  =====================================================================
       RECURSIVE SUBROUTINE SGELQT3( M, N, A, LDA, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -158,7 +159,8 @@ RECURSIVE SUBROUTINE SGELQT3( M, N, A, LDA, T, LDT, INFO )
 *
 *        Compute Householder transform when M=1
 *
-         CALL SLARFG( N, A, A( 1, MIN( 2, N ) ), LDA, T )
+         CALL SLARFG( N, A( 1, 1 ), A( 1, MIN( 2, N ) ), LDA,
+     &                T( 1, 1 ) )
 *
       ELSE
 *
diff --git a/SRC/sgels.f b/SRC/sgels.f
index ea02c3318b..e87e1fa947 100644
--- a/SRC/sgels.f
+++ b/SRC/sgels.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGELS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgels.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgels.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,17 @@
 *>
 *> SGELS solves overdetermined or underdetermined real linear systems
 *> involving an M-by-N matrix A, or its transpose, using a QR or LQ
-*> factorization of A.  It is assumed that A has full rank.
+*> factorization of A.
+*>
+*> It is assumed that A has full rank, and only a rudimentary protection
+*> against rank-deficient matrices is provided. This subroutine only detects
+*> exact rank-deficiency, where a diagonal element of the triangular factor
+*> of A is exactly zero.
+*>
+*> It is conceivable for one (or more) of the diagonal elements of the triangular
+*> factor of A to be subnormally tiny numbers without this subroutine signalling
+*> an error. The solutions computed for such almost-rank-deficient matrices may
+*> be less accurate due to a loss of numerical precision.
 *>
 *> The following options are provided:
 *>
@@ -162,7 +170,7 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO =  i, the i-th diagonal element of the
-*>                triangular factor of A is zero, so that A does not have
+*>                triangular factor of A is exactly zero, so that A does not have
 *>                full rank; the least squares solution could not be
 *>                computed.
 *> \endverbatim
@@ -175,11 +183,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEsolve
+*> \ingroup gels
 *
 *  =====================================================================
-      SUBROUTINE SGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
+      SUBROUTINE SGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK,
+     $                  LWORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -210,15 +220,17 @@ SUBROUTINE SGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANGE
-      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANGE
+      REAL               SLAMCH, SLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGELQF, SGEQRF, SLABAD, SLASCL, SLASET, SORMLQ,
+      EXTERNAL           SGELQF, SGEQRF, SLASCL, SLASET,
+     $                   SORMLQ,
      $                   SORMQR, STRTRS, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN, REAL
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
@@ -227,7 +239,8 @@ SUBROUTINE SGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
       INFO = 0
       MN = MIN( M, N )
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.( LSAME( TRANS, 'N' ) .OR. LSAME( TRANS, 'T' ) ) ) THEN
+      IF( .NOT.( LSAME( TRANS, 'N' ) .OR.
+     $    LSAME( TRANS, 'T' ) ) ) THEN
          INFO = -1
       ELSE IF( M.LT.0 ) THEN
          INFO = -2
@@ -273,7 +286,7 @@ SUBROUTINE SGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
          END IF
 *
          WSIZE = MAX( 1, MN + MAX( MN, NRHS )*NB )
-         WORK( 1 ) = REAL( WSIZE )
+         WORK( 1 ) = SROUNDUP_LWORK( WSIZE )
 *
       END IF
 *
@@ -295,7 +308,6 @@ SUBROUTINE SGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
       SMLNUM = SLAMCH( 'S' ) / SLAMCH( 'P' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A, B if max element outside range [SMLNUM,BIGNUM]
 *
@@ -346,7 +358,8 @@ SUBROUTINE SGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *        compute QR factorization of A
 *
-         CALL SGEQRF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ), LWORK-MN,
+         CALL SGEQRF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ),
+     $                LWORK-MN,
      $                INFO )
 *
 *        workspace at least N, optimally N*NB
@@ -365,7 +378,8 @@ SUBROUTINE SGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *           B(1:N,1:NRHS) := inv(R) * B(1:N,1:NRHS)
 *
-            CALL STRTRS( 'Upper', 'No transpose', 'Non-unit', N, NRHS,
+            CALL STRTRS( 'Upper', 'No transpose', 'Non-unit', N,
+     $                   NRHS,
      $                   A, LDA, B, LDB, INFO )
 *
             IF( INFO.GT.0 ) THEN
@@ -411,7 +425,8 @@ SUBROUTINE SGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *        Compute LQ factorization of A
 *
-         CALL SGELQF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ), LWORK-MN,
+         CALL SGELQF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ),
+     $                LWORK-MN,
      $                INFO )
 *
 *        workspace at least M, optimally M*NB.
@@ -422,7 +437,8 @@ SUBROUTINE SGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *           B(1:M,1:NRHS) := inv(L) * B(1:M,1:NRHS)
 *
-            CALL STRTRS( 'Lower', 'No transpose', 'Non-unit', M, NRHS,
+            CALL STRTRS( 'Lower', 'No transpose', 'Non-unit', M,
+     $                   NRHS,
      $                   A, LDA, B, LDB, INFO )
 *
             IF( INFO.GT.0 ) THEN
@@ -492,7 +508,7 @@ SUBROUTINE SGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
       END IF
 *
    50 CONTINUE
-      WORK( 1 ) = REAL( WSIZE )
+      WORK( 1 ) = SROUNDUP_LWORK( WSIZE )
 *
       RETURN
 *
diff --git a/SRC/sgelsd.f b/SRC/sgelsd.f
index f5f17d34c5..423450e1c4 100644
--- a/SRC/sgelsd.f
+++ b/SRC/sgelsd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGELSD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgelsd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgelsd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -59,12 +57,6 @@
 *> singular values which are less than RCOND times the largest singular
 *> value.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -195,7 +187,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEsolve
+*> \ingroup gelsd
 *
 *> \par Contributors:
 *  ==================
@@ -207,6 +199,7 @@
 *  =====================================================================
       SUBROUTINE SGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND,
      $                   RANK, WORK, LWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -235,13 +228,15 @@ SUBROUTINE SGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND,
       REAL               ANRM, BIGNUM, BNRM, EPS, SFMIN, SMLNUM
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEBRD, SGELQF, SGEQRF, SLABAD, SLACPY, SLALSD,
-     $                   SLASCL, SLASET, SORMBR, SORMLQ, SORMQR, XERBLA
+      EXTERNAL           SGEBRD, SGELQF, SGEQRF, SLACPY, SLALSD,
+     $                   SLASCL,
+     $                   SLASET, SORMBR, SORMLQ, SORMQR, XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANGE
-      EXTERNAL           SLAMCH, SLANGE, ILAENV
+      REAL               SLAMCH, SLANGE, SROUNDUP_LWORK
+      EXTERNAL           SLAMCH, SLANGE, ILAENV,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          INT, LOG, MAX, MIN, REAL
@@ -290,9 +285,11 @@ SUBROUTINE SGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND,
 *                        columns.
 *
                MM = N
-               MAXWRK = MAX( MAXWRK, N + N*ILAENV( 1, 'SGEQRF', ' ', M,
+               MAXWRK = MAX( MAXWRK, N + N*ILAENV( 1, 'SGEQRF', ' ',
+     $                       M,
      $                       N, -1, -1 ) )
-               MAXWRK = MAX( MAXWRK, N + NRHS*ILAENV( 1, 'SORMQR', 'LT',
+               MAXWRK = MAX( MAXWRK, N + NRHS*ILAENV( 1, 'SORMQR',
+     $                       'LT',
      $                       M, NRHS, N, -1 ) )
             END IF
             IF( M.GE.N ) THEN
@@ -324,7 +321,8 @@ SUBROUTINE SGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND,
      $                          'SGEBRD', ' ', M, M, -1, -1 ) )
                   MAXWRK = MAX( MAXWRK, M*M + 4*M + NRHS*ILAENV( 1,
      $                          'SORMBR', 'QLT', M, NRHS, M, -1 ) )
-                  MAXWRK = MAX( MAXWRK, M*M + 4*M + ( M - 1 )*ILAENV( 1,
+                  MAXWRK = MAX( MAXWRK,
+     $                          M*M + 4*M + ( M - 1 )*ILAENV( 1,
      $                          'SORMBR', 'PLN', M, NRHS, M, -1 ) )
                   IF( NRHS.GT.1 ) THEN
                      MAXWRK = MAX( MAXWRK, M*M + M + M*NRHS )
@@ -342,9 +340,11 @@ SUBROUTINE SGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND,
 *
 *                 Path 2 - remaining underdetermined cases.
 *
-                  MAXWRK = 3*M + ( N + M )*ILAENV( 1, 'SGEBRD', ' ', M,
+                  MAXWRK = 3*M + ( N + M )*ILAENV( 1, 'SGEBRD', ' ',
+     $                             M,
      $                     N, -1, -1 )
-                  MAXWRK = MAX( MAXWRK, 3*M + NRHS*ILAENV( 1, 'SORMBR',
+                  MAXWRK = MAX( MAXWRK, 3*M + NRHS*ILAENV( 1,
+     $                          'SORMBR',
      $                          'QLT', M, NRHS, N, -1 ) )
                   MAXWRK = MAX( MAXWRK, 3*M + M*ILAENV( 1, 'SORMBR',
      $                          'PLN', N, NRHS, M, -1 ) )
@@ -354,7 +354,7 @@ SUBROUTINE SGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND,
             END IF
          END IF
          MINWRK = MIN( MINWRK, MAXWRK )
-         WORK( 1 ) = MAXWRK
+         WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
          IWORK( 1 ) = LIWORK
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
@@ -382,7 +382,6 @@ SUBROUTINE SGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND,
       SFMIN = SLAMCH( 'S' )
       SMLNUM = SFMIN / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A if max entry outside range [SMLNUM,BIGNUM].
 *
@@ -418,13 +417,15 @@ SUBROUTINE SGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND,
 *
 *        Scale matrix norm up to SMLNUM.
 *
-         CALL SLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 1
       ELSE IF( BNRM.GT.BIGNUM ) THEN
 *
 *        Scale matrix norm down to BIGNUM.
 *
-         CALL SLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 2
       END IF
 *
@@ -457,13 +458,15 @@ SUBROUTINE SGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND,
 *           Multiply B by transpose(Q).
 *           (Workspace: need N+NRHS, prefer N+NRHS*NB)
 *
-            CALL SORMQR( 'L', 'T', M, NRHS, N, A, LDA, WORK( ITAU ), B,
+            CALL SORMQR( 'L', 'T', M, NRHS, N, A, LDA, WORK( ITAU ),
+     $                   B,
      $                   LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
 *           Zero out below R.
 *
             IF( N.GT.1 ) THEN
-               CALL SLASET( 'L', N-1, N-1, ZERO, ZERO, A( 2, 1 ), LDA )
+               CALL SLASET( 'L', N-1, N-1, ZERO, ZERO, A( 2, 1 ),
+     $                      LDA )
             END IF
          END IF
 *
@@ -482,7 +485,8 @@ SUBROUTINE SGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND,
 *        Multiply B by transpose of left bidiagonalizing vectors of R.
 *        (Workspace: need 3*N+NRHS, prefer 3*N+NRHS*NB)
 *
-         CALL SORMBR( 'Q', 'L', 'T', MM, NRHS, N, A, LDA, WORK( ITAUQ ),
+         CALL SORMBR( 'Q', 'L', 'T', MM, NRHS, N, A, LDA,
+     $                WORK( ITAUQ ),
      $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
 *        Solve the bidiagonal least squares problem.
@@ -495,7 +499,8 @@ SUBROUTINE SGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND,
 *
 *        Multiply B by right bidiagonalizing vectors of R.
 *
-         CALL SORMBR( 'P', 'L', 'N', N, NRHS, N, A, LDA, WORK( ITAUP ),
+         CALL SORMBR( 'P', 'L', 'N', N, NRHS, N, A, LDA,
+     $                WORK( ITAUP ),
      $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
       ELSE IF( N.GE.MNTHR .AND. LWORK.GE.4*M+M*M+
@@ -585,7 +590,8 @@ SUBROUTINE SGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND,
 *        Multiply B by transpose of left bidiagonalizing vectors.
 *        (Workspace: need 3*M+NRHS, prefer 3*M+NRHS*NB)
 *
-         CALL SORMBR( 'Q', 'L', 'T', M, NRHS, N, A, LDA, WORK( ITAUQ ),
+         CALL SORMBR( 'Q', 'L', 'T', M, NRHS, N, A, LDA,
+     $                WORK( ITAUQ ),
      $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
 *        Solve the bidiagonal least squares problem.
@@ -598,7 +604,8 @@ SUBROUTINE SGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND,
 *
 *        Multiply B by right bidiagonalizing vectors of A.
 *
-         CALL SORMBR( 'P', 'L', 'N', N, NRHS, M, A, LDA, WORK( ITAUP ),
+         CALL SORMBR( 'P', 'L', 'N', N, NRHS, M, A, LDA,
+     $                WORK( ITAUP ),
      $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
       END IF
@@ -606,22 +613,26 @@ SUBROUTINE SGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND,
 *     Undo scaling.
 *
       IF( IASCL.EQ.1 ) THEN
-         CALL SLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL SLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN, 1, S, MINMN,
      $                INFO )
       ELSE IF( IASCL.EQ.2 ) THEN
-         CALL SLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL SLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN, 1, S, MINMN,
      $                INFO )
       END IF
       IF( IBSCL.EQ.1 ) THEN
-         CALL SLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL SLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       END IF
 *
    10 CONTINUE
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
       IWORK( 1 ) = LIWORK
       RETURN
 *
diff --git a/SRC/sgelss.f b/SRC/sgelss.f
index be9e2ea116..99371e3248 100644
--- a/SRC/sgelss.f
+++ b/SRC/sgelss.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGELSS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgelss.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgelss.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -164,11 +162,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEsolve
+*> \ingroup gelss
 *
 *  =====================================================================
       SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -201,14 +200,16 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
       REAL               DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SBDSQR, SCOPY, SGEBRD, SGELQF, SGEMM, SGEMV,
-     $                   SGEQRF, SLABAD, SLACPY, SLASCL, SLASET, SORGBR,
+      EXTERNAL           SBDSQR, SCOPY, SGEBRD, SGELQF, SGEMM,
+     $                   SGEMV,
+     $                   SGEQRF, SLACPY, SLASCL, SLASET, SORGBR,
      $                   SORMBR, SORMLQ, SORMQR, SRSCL, XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANGE
-      EXTERNAL           ILAENV, SLAMCH, SLANGE
+      REAL               SLAMCH, SLANGE, SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SLAMCH, SLANGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -253,11 +254,11 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *              Compute space needed for SGEQRF
                CALL SGEQRF( M, N, A, LDA, DUM(1), DUM(1), -1, INFO )
-               LWORK_SGEQRF=DUM(1)
+               LWORK_SGEQRF = INT( DUM(1) )
 *              Compute space needed for SORMQR
                CALL SORMQR( 'L', 'T', M, NRHS, N, A, LDA, DUM(1), B,
      $                   LDB, DUM(1), -1, INFO )
-               LWORK_SORMQR=DUM(1)
+               LWORK_SORMQR = INT( DUM(1) )
                MM = N
                MAXWRK = MAX( MAXWRK, N + LWORK_SGEQRF )
                MAXWRK = MAX( MAXWRK, N + LWORK_SORMQR )
@@ -272,15 +273,16 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *              Compute space needed for SGEBRD
                CALL SGEBRD( MM, N, A, LDA, S, DUM(1), DUM(1),
      $                      DUM(1), DUM(1), -1, INFO )
-               LWORK_SGEBRD=DUM(1)
+               LWORK_SGEBRD = INT( DUM(1) )
 *              Compute space needed for SORMBR
-               CALL SORMBR( 'Q', 'L', 'T', MM, NRHS, N, A, LDA, DUM(1),
+               CALL SORMBR( 'Q', 'L', 'T', MM, NRHS, N, A, LDA,
+     $                      DUM(1),
      $                B, LDB, DUM(1), -1, INFO )
-               LWORK_SORMBR=DUM(1)
+               LWORK_SORMBR = INT( DUM(1) )
 *              Compute space needed for SORGBR
                CALL SORGBR( 'P', N, N, N, A, LDA, DUM(1),
      $                   DUM(1), -1, INFO )
-               LWORK_SORGBR=DUM(1)
+               LWORK_SORGBR = INT( DUM(1) )
 *              Compute total workspace needed
                MAXWRK = MAX( MAXWRK, 3*N + LWORK_SGEBRD )
                MAXWRK = MAX( MAXWRK, 3*N + LWORK_SORMBR )
@@ -304,19 +306,19 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *                 Compute space needed for SGEBRD
                   CALL SGEBRD( M, M, A, LDA, S, DUM(1), DUM(1),
      $                      DUM(1), DUM(1), -1, INFO )
-                  LWORK_SGEBRD=DUM(1)
+                  LWORK_SGEBRD = INT( DUM(1) )
 *                 Compute space needed for SORMBR
                   CALL SORMBR( 'Q', 'L', 'T', M, NRHS, N, A, LDA,
      $                DUM(1), B, LDB, DUM(1), -1, INFO )
-                  LWORK_SORMBR=DUM(1)
+                  LWORK_SORMBR = INT( DUM(1) )
 *                 Compute space needed for SORGBR
                   CALL SORGBR( 'P', M, M, M, A, LDA, DUM(1),
      $                   DUM(1), -1, INFO )
-                  LWORK_SORGBR=DUM(1)
+                  LWORK_SORGBR = INT( DUM(1) )
 *                 Compute space needed for SORMLQ
                   CALL SORMLQ( 'L', 'T', N, NRHS, M, A, LDA, DUM(1),
      $                 B, LDB, DUM(1), -1, INFO )
-                  LWORK_SORMLQ=DUM(1)
+                  LWORK_SORMLQ = INT( DUM(1) )
 *                 Compute total workspace needed
                   MAXWRK = M + M*ILAENV( 1, 'SGELQF', ' ', M, N, -1,
      $                                  -1 )
@@ -337,15 +339,15 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *                 Compute space needed for SGEBRD
                   CALL SGEBRD( M, N, A, LDA, S, DUM(1), DUM(1),
      $                      DUM(1), DUM(1), -1, INFO )
-                  LWORK_SGEBRD=DUM(1)
+                  LWORK_SGEBRD = INT( DUM(1) )
 *                 Compute space needed for SORMBR
                   CALL SORMBR( 'Q', 'L', 'T', M, NRHS, M, A, LDA,
      $                DUM(1), B, LDB, DUM(1), -1, INFO )
-                  LWORK_SORMBR=DUM(1)
+                  LWORK_SORMBR = INT( DUM(1) )
 *                 Compute space needed for SORGBR
                   CALL SORGBR( 'P', M, N, M, A, LDA, DUM(1),
      $                   DUM(1), -1, INFO )
-                  LWORK_SORGBR=DUM(1)
+                  LWORK_SORGBR = INT( DUM(1) )
                   MAXWRK = 3*M + LWORK_SGEBRD
                   MAXWRK = MAX( MAXWRK, 3*M + LWORK_SORMBR )
                   MAXWRK = MAX( MAXWRK, 3*M + LWORK_SORGBR )
@@ -355,7 +357,7 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
             END IF
             MAXWRK = MAX( MINWRK, MAXWRK )
          END IF
-         WORK( 1 ) = MAXWRK
+         WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY )
      $      INFO = -12
@@ -381,7 +383,6 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
       SFMIN = SLAMCH( 'S' )
       SMLNUM = SFMIN / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A if max element outside range [SMLNUM,BIGNUM]
 *
@@ -417,13 +418,15 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *        Scale matrix norm up to SMLNUM
 *
-         CALL SLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 1
       ELSE IF( BNRM.GT.BIGNUM ) THEN
 *
 *        Scale matrix norm down to BIGNUM
 *
-         CALL SLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 2
       END IF
 *
@@ -451,13 +454,15 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *           Multiply B by transpose(Q)
 *           (Workspace: need N+NRHS, prefer N+NRHS*NB)
 *
-            CALL SORMQR( 'L', 'T', M, NRHS, N, A, LDA, WORK( ITAU ), B,
+            CALL SORMQR( 'L', 'T', M, NRHS, N, A, LDA, WORK( ITAU ),
+     $                   B,
      $                   LDB, WORK( IWORK ), LWORK-IWORK+1, INFO )
 *
 *           Zero out below R
 *
             IF( N.GT.1 )
-     $         CALL SLASET( 'L', N-1, N-1, ZERO, ZERO, A( 2, 1 ), LDA )
+     $         CALL SLASET( 'L', N-1, N-1, ZERO, ZERO, A( 2, 1 ),
+     $                      LDA )
          END IF
 *
          IE = 1
@@ -475,7 +480,8 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        Multiply B by transpose of left bidiagonalizing vectors of R
 *        (Workspace: need 3*N+NRHS, prefer 3*N+NRHS*NB)
 *
-         CALL SORMBR( 'Q', 'L', 'T', MM, NRHS, N, A, LDA, WORK( ITAUQ ),
+         CALL SORMBR( 'Q', 'L', 'T', MM, NRHS, N, A, LDA,
+     $                WORK( ITAUQ ),
      $                B, LDB, WORK( IWORK ), LWORK-IWORK+1, INFO )
 *
 *        Generate right bidiagonalizing vectors of R in A
@@ -506,7 +512,8 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
                CALL SRSCL( NRHS, S( I ), B( I, 1 ), LDB )
                RANK = RANK + 1
             ELSE
-               CALL SLASET( 'F', 1, NRHS, ZERO, ZERO, B( I, 1 ), LDB )
+               CALL SLASET( 'F', 1, NRHS, ZERO, ZERO, B( I, 1 ),
+     $                      LDB )
             END IF
    10    CONTINUE
 *
@@ -514,18 +521,20 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (Workspace: need N, prefer N*NRHS)
 *
          IF( LWORK.GE.LDB*NRHS .AND. NRHS.GT.1 ) THEN
-            CALL SGEMM( 'T', 'N', N, NRHS, N, ONE, A, LDA, B, LDB, ZERO,
+            CALL SGEMM( 'T', 'N', N, NRHS, N, ONE, A, LDA, B, LDB,
+     $                  ZERO,
      $                  WORK, LDB )
             CALL SLACPY( 'G', N, NRHS, WORK, LDB, B, LDB )
          ELSE IF( NRHS.GT.1 ) THEN
             CHUNK = LWORK / N
             DO 20 I = 1, NRHS, CHUNK
                BL = MIN( NRHS-I+1, CHUNK )
-               CALL SGEMM( 'T', 'N', N, BL, N, ONE, A, LDA, B( 1, I ),
+               CALL SGEMM( 'T', 'N', N, BL, N, ONE, A, LDA, B( 1,
+     $                     I ),
      $                     LDB, ZERO, WORK, N )
                CALL SLACPY( 'G', N, BL, WORK, N, B( 1, I ), LDB )
    20       CONTINUE
-         ELSE
+         ELSE IF( NRHS.EQ.1 ) THEN
             CALL SGEMV( 'T', N, N, ONE, A, LDA, B, 1, ZERO, WORK, 1 )
             CALL SCOPY( N, WORK, 1, B, 1 )
          END IF
@@ -576,7 +585,8 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        Generate right bidiagonalizing vectors of R in WORK(IL)
 *        (Workspace: need M*M+5*M-1, prefer M*M+4*M+(M-1)*NB)
 *
-         CALL SORGBR( 'P', M, M, M, WORK( IL ), LDWORK, WORK( ITAUP ),
+         CALL SORGBR( 'P', M, M, M, WORK( IL ), LDWORK,
+     $                WORK( ITAUP ),
      $                WORK( IWORK ), LWORK-IWORK+1, INFO )
          IWORK = IE + M
 *
@@ -601,7 +611,8 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
                CALL SRSCL( NRHS, S( I ), B( I, 1 ), LDB )
                RANK = RANK + 1
             ELSE
-               CALL SLASET( 'F', 1, NRHS, ZERO, ZERO, B( I, 1 ), LDB )
+               CALL SLASET( 'F', 1, NRHS, ZERO, ZERO, B( I, 1 ),
+     $                      LDB )
             END IF
    30    CONTINUE
          IWORK = IE
@@ -610,21 +621,23 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (Workspace: need M*M+2*M, prefer M*M+M+M*NRHS)
 *
          IF( LWORK.GE.LDB*NRHS+IWORK-1 .AND. NRHS.GT.1 ) THEN
-            CALL SGEMM( 'T', 'N', M, NRHS, M, ONE, WORK( IL ), LDWORK,
+            CALL SGEMM( 'T', 'N', M, NRHS, M, ONE, WORK( IL ),
+     $                  LDWORK,
      $                  B, LDB, ZERO, WORK( IWORK ), LDB )
             CALL SLACPY( 'G', M, NRHS, WORK( IWORK ), LDB, B, LDB )
          ELSE IF( NRHS.GT.1 ) THEN
             CHUNK = ( LWORK-IWORK+1 ) / M
             DO 40 I = 1, NRHS, CHUNK
                BL = MIN( NRHS-I+1, CHUNK )
-               CALL SGEMM( 'T', 'N', M, BL, M, ONE, WORK( IL ), LDWORK,
+               CALL SGEMM( 'T', 'N', M, BL, M, ONE, WORK( IL ),
+     $                     LDWORK,
      $                     B( 1, I ), LDB, ZERO, WORK( IWORK ), M )
                CALL SLACPY( 'G', M, BL, WORK( IWORK ), M, B( 1, I ),
      $                      LDB )
    40       CONTINUE
-         ELSE
-            CALL SGEMV( 'T', M, M, ONE, WORK( IL ), LDWORK, B( 1, 1 ),
-     $                  1, ZERO, WORK( IWORK ), 1 )
+         ELSE IF( NRHS.EQ.1 ) THEN
+            CALL SGEMV( 'T', M, M, ONE, WORK( IL ), LDWORK, B( 1,
+     $                  1 ), 1, ZERO, WORK( IWORK ), 1 )
             CALL SCOPY( M, WORK( IWORK ), 1, B( 1, 1 ), 1 )
          END IF
 *
@@ -658,7 +671,8 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        Multiply B by transpose of left bidiagonalizing vectors
 *        (Workspace: need 3*M+NRHS, prefer 3*M+NRHS*NB)
 *
-         CALL SORMBR( 'Q', 'L', 'T', M, NRHS, N, A, LDA, WORK( ITAUQ ),
+         CALL SORMBR( 'Q', 'L', 'T', M, NRHS, N, A, LDA,
+     $                WORK( ITAUQ ),
      $                B, LDB, WORK( IWORK ), LWORK-IWORK+1, INFO )
 *
 *        Generate right bidiagonalizing vectors in A
@@ -689,7 +703,8 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
                CALL SRSCL( NRHS, S( I ), B( I, 1 ), LDB )
                RANK = RANK + 1
             ELSE
-               CALL SLASET( 'F', 1, NRHS, ZERO, ZERO, B( I, 1 ), LDB )
+               CALL SLASET( 'F', 1, NRHS, ZERO, ZERO, B( I, 1 ),
+     $                      LDB )
             END IF
    50    CONTINUE
 *
@@ -697,18 +712,20 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (Workspace: need N, prefer N*NRHS)
 *
          IF( LWORK.GE.LDB*NRHS .AND. NRHS.GT.1 ) THEN
-            CALL SGEMM( 'T', 'N', N, NRHS, M, ONE, A, LDA, B, LDB, ZERO,
+            CALL SGEMM( 'T', 'N', N, NRHS, M, ONE, A, LDA, B, LDB,
+     $                  ZERO,
      $                  WORK, LDB )
             CALL SLACPY( 'F', N, NRHS, WORK, LDB, B, LDB )
          ELSE IF( NRHS.GT.1 ) THEN
             CHUNK = LWORK / N
             DO 60 I = 1, NRHS, CHUNK
                BL = MIN( NRHS-I+1, CHUNK )
-               CALL SGEMM( 'T', 'N', N, BL, M, ONE, A, LDA, B( 1, I ),
+               CALL SGEMM( 'T', 'N', N, BL, M, ONE, A, LDA, B( 1,
+     $                     I ),
      $                     LDB, ZERO, WORK, N )
                CALL SLACPY( 'F', N, BL, WORK, N, B( 1, I ), LDB )
    60       CONTINUE
-         ELSE
+         ELSE IF( NRHS.EQ.1 ) THEN
             CALL SGEMV( 'T', M, N, ONE, A, LDA, B, 1, ZERO, WORK, 1 )
             CALL SCOPY( N, WORK, 1, B, 1 )
          END IF
@@ -717,22 +734,26 @@ SUBROUTINE SGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *     Undo scaling
 *
       IF( IASCL.EQ.1 ) THEN
-         CALL SLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL SLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN, 1, S, MINMN,
      $                INFO )
       ELSE IF( IASCL.EQ.2 ) THEN
-         CALL SLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL SLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN, 1, S, MINMN,
      $                INFO )
       END IF
       IF( IBSCL.EQ.1 ) THEN
-         CALL SLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL SLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       END IF
 *
    70 CONTINUE
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
       RETURN
 *
 *     End of SGELSS
diff --git a/SRC/sgelst.f b/SRC/sgelst.f
new file mode 100644
index 0000000000..92c37a370b
--- /dev/null
+++ b/SRC/sgelst.f
@@ -0,0 +1,545 @@
+*> \brief <b> SGELST solves overdetermined or underdetermined systems for GE matrices using QR or LQ factorization with compact WY representation of Q.</b>
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download SGELST + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgelst.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/sgelst.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgelst.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE SGELST( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
+*                          INFO )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          TRANS
+*       INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS
+*       ..
+*       .. Array Arguments ..
+*       REAL               A( LDA, * ), B( LDB, * ), WORK( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> SGELST solves overdetermined or underdetermined real linear systems
+*> involving an M-by-N matrix A, or its transpose, using a QR or LQ
+*> factorization of A with compact WY representation of Q.
+*>
+*> It is assumed that A has full rank, and only a rudimentary protection
+*> against rank-deficient matrices is provided. This subroutine only detects
+*> exact rank-deficiency, where a diagonal element of the triangular factor
+*> of A is exactly zero.
+*>
+*> It is conceivable for one (or more) of the diagonal elements of the triangular
+*> factor of A to be subnormally tiny numbers without this subroutine signalling
+*> an error. The solutions computed for such almost-rank-deficient matrices may
+*> be less accurate due to a loss of numerical precision.
+*>
+*> The following options are provided:
+*>
+*> 1. If TRANS = 'N' and m >= n:  find the least squares solution of
+*>    an overdetermined system, i.e., solve the least squares problem
+*>                 minimize || B - A*X ||.
+*>
+*> 2. If TRANS = 'N' and m < n:  find the minimum norm solution of
+*>    an underdetermined system A * X = B.
+*>
+*> 3. If TRANS = 'T' and m >= n:  find the minimum norm solution of
+*>    an underdetermined system A**T * X = B.
+*>
+*> 4. If TRANS = 'T' and m < n:  find the least squares solution of
+*>    an overdetermined system, i.e., solve the least squares problem
+*>                 minimize || B - A**T * X ||.
+*>
+*> Several right hand side vectors b and solution vectors x can be
+*> handled in a single call; they are stored as the columns of the
+*> M-by-NRHS right hand side matrix B and the N-by-NRHS solution
+*> matrix X.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] TRANS
+*> \verbatim
+*>          TRANS is CHARACTER*1
+*>          = 'N': the linear system involves A;
+*>          = 'T': the linear system involves A**T.
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of
+*>          columns of the matrices B and X. NRHS >=0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is REAL array, dimension (LDA,N)
+*>          On entry, the M-by-N matrix A.
+*>          On exit,
+*>            if M >= N, A is overwritten by details of its QR
+*>                       factorization as returned by SGEQRT;
+*>            if M <  N, A is overwritten by details of its LQ
+*>                       factorization as returned by SGELQT.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in,out] B
+*> \verbatim
+*>          B is REAL array, dimension (LDB,NRHS)
+*>          On entry, the matrix B of right hand side vectors, stored
+*>          columnwise; B is M-by-NRHS if TRANS = 'N', or N-by-NRHS
+*>          if TRANS = 'T'.
+*>          On exit, if INFO = 0, B is overwritten by the solution
+*>          vectors, stored columnwise:
+*>          if TRANS = 'N' and m >= n, rows 1 to n of B contain the least
+*>          squares solution vectors; the residual sum of squares for the
+*>          solution in each column is given by the sum of squares of
+*>          elements N+1 to M in that column;
+*>          if TRANS = 'N' and m < n, rows 1 to N of B contain the
+*>          minimum norm solution vectors;
+*>          if TRANS = 'T' and m >= n, rows 1 to M of B contain the
+*>          minimum norm solution vectors;
+*>          if TRANS = 'T' and m < n, rows 1 to M of B contain the
+*>          least squares solution vectors; the residual sum of squares
+*>          for the solution in each column is given by the sum of
+*>          squares of elements M+1 to N in that column.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= MAX(1,M,N).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is REAL array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          LWORK >= max( 1, MN + max( MN, NRHS ) ).
+*>          For optimal performance,
+*>          LWORK >= max( 1, (MN + max( MN, NRHS ))*NB ).
+*>          where MN = min(M,N) and NB is the optimum block size.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO =  i, the i-th diagonal element of the
+*>                triangular factor of A is exactly zero, so that A does not have
+*>                full rank; the least squares solution could not be
+*>                computed.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup gelst
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
+*>
+*>  November 2022,  Igor Kozachenko,
+*>                  Computer Science Division,
+*>                  University of California, Berkeley
+*> \endverbatim
+*
+*  =====================================================================
+      SUBROUTINE SGELST( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK,
+     $                   LWORK,
+     $                   INFO )
+      IMPLICIT NONE
+*
+*  -- LAPACK driver routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          TRANS
+      INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS
+*     ..
+*     .. Array Arguments ..
+      REAL               A( LDA, * ), B( LDB, * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      REAL               ZERO, ONE
+      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY, TPSD
+      INTEGER            BROW, I, IASCL, IBSCL, J, LWOPT, MN, MNNRHS,
+     $                   NB, NBMIN, SCLLEN
+      REAL               ANRM, BIGNUM, BNRM, SMLNUM
+*     ..
+*     .. Local Arrays ..
+      REAL               RWORK( 1 )
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      REAL               SLAMCH, SLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANGE,
+     $                   SROUNDUP_LWORK
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           SGELQT, SGEQRT, SGEMLQT, SGEMQRT,
+     $                   SLASCL, SLASET, STRTRS, XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input arguments.
+*
+      INFO = 0
+      MN = MIN( M, N )
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( .NOT.( LSAME( TRANS, 'N' ) .OR.
+     $    LSAME( TRANS, 'T' ) ) ) THEN
+         INFO = -1
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -6
+      ELSE IF( LDB.LT.MAX( 1, M, N ) ) THEN
+         INFO = -8
+      ELSE IF( LWORK.LT.MAX( 1, MN+MAX( MN, NRHS ) ) .AND. .NOT.LQUERY )
+     $          THEN
+         INFO = -10
+      END IF
+*
+*     Figure out optimal block size and optimal workspace size
+*
+      IF( INFO.EQ.0 .OR. INFO.EQ.-10 ) THEN
+*
+         TPSD = .TRUE.
+         IF( LSAME( TRANS, 'N' ) )
+     $      TPSD = .FALSE.
+*
+         NB = ILAENV( 1, 'SGELST', ' ', M, N, -1, -1 )
+*
+         MNNRHS = MAX( MN, NRHS )
+         LWOPT = MAX( 1, (MN+MNNRHS)*NB )
+         WORK( 1 ) = SROUNDUP_LWORK( LWOPT )
+*
+      END IF
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'SGELST ', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( MIN( M, N, NRHS ).EQ.0 ) THEN
+         CALL SLASET( 'Full', MAX( M, N ), NRHS, ZERO, ZERO, B, LDB )
+         WORK( 1 ) = SROUNDUP_LWORK( LWOPT )
+         RETURN
+      END IF
+*
+*     *GEQRT and *GELQT routines cannot accept NB larger than min(M,N)
+*
+      IF( NB.GT.MN ) NB = MN
+*
+*     Determine the block size from the supplied LWORK
+*     ( at this stage we know that LWORK >= (minimum required workspace,
+*     but it may be less than optimal)
+*
+      NB = MIN( NB, LWORK/( MN + MNNRHS ) )
+*
+*     The minimum value of NB, when blocked code is used
+*
+      NBMIN = MAX( 2, ILAENV( 2, 'SGELST', ' ', M, N, -1, -1 ) )
+*
+      IF( NB.LT.NBMIN ) THEN
+         NB = 1
+      END IF
+*
+*     Get machine parameters
+*
+      SMLNUM = SLAMCH( 'S' ) / SLAMCH( 'P' )
+      BIGNUM = ONE / SMLNUM
+*
+*     Scale A, B if max element outside range [SMLNUM,BIGNUM]
+*
+      ANRM = SLANGE( 'M', M, N, A, LDA, RWORK )
+      IASCL = 0
+      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
+*
+*        Scale matrix norm up to SMLNUM
+*
+         CALL SLASCL( 'G', 0, 0, ANRM, SMLNUM, M, N, A, LDA, INFO )
+         IASCL = 1
+      ELSE IF( ANRM.GT.BIGNUM ) THEN
+*
+*        Scale matrix norm down to BIGNUM
+*
+         CALL SLASCL( 'G', 0, 0, ANRM, BIGNUM, M, N, A, LDA, INFO )
+         IASCL = 2
+      ELSE IF( ANRM.EQ.ZERO ) THEN
+*
+*        Matrix all zero. Return zero solution.
+*
+         CALL SLASET( 'Full', MAX( M, N ), NRHS, ZERO, ZERO, B, LDB )
+         WORK( 1 ) = SROUNDUP_LWORK( LWOPT )
+         RETURN
+      END IF
+*
+      BROW = M
+      IF( TPSD )
+     $   BROW = N
+      BNRM = SLANGE( 'M', BROW, NRHS, B, LDB, RWORK )
+      IBSCL = 0
+      IF( BNRM.GT.ZERO .AND. BNRM.LT.SMLNUM ) THEN
+*
+*        Scale matrix norm up to SMLNUM
+*
+         CALL SLASCL( 'G', 0, 0, BNRM, SMLNUM, BROW, NRHS, B, LDB,
+     $                INFO )
+         IBSCL = 1
+      ELSE IF( BNRM.GT.BIGNUM ) THEN
+*
+*        Scale matrix norm down to BIGNUM
+*
+         CALL SLASCL( 'G', 0, 0, BNRM, BIGNUM, BROW, NRHS, B, LDB,
+     $                INFO )
+         IBSCL = 2
+      END IF
+*
+      IF( M.GE.N ) THEN
+*
+*        M > N:
+*        Compute the blocked QR factorization of A,
+*        using the compact WY representation of Q,
+*        workspace at least N, optimally N*NB.
+*
+         CALL SGEQRT( M, N, NB, A, LDA, WORK( 1 ), NB,
+     $                WORK( MN*NB+1 ), INFO )
+*
+         IF( .NOT.TPSD ) THEN
+*
+*           M > N, A is not transposed:
+*           Overdetermined system of equations,
+*           least-squares problem, min || A * X - B ||.
+*
+*           Compute B(1:M,1:NRHS) := Q**T * B(1:M,1:NRHS),
+*           using the compact WY representation of Q,
+*           workspace at least NRHS, optimally NRHS*NB.
+*
+            CALL SGEMQRT( 'Left', 'Transpose', M, NRHS, N, NB, A,
+     $                    LDA,
+     $                    WORK( 1 ), NB, B, LDB, WORK( MN*NB+1 ),
+     $                    INFO )
+*
+*           Compute B(1:N,1:NRHS) := inv(R) * B(1:N,1:NRHS)
+*
+            CALL STRTRS( 'Upper', 'No transpose', 'Non-unit', N,
+     $                   NRHS,
+     $                   A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
+*
+            SCLLEN = N
+*
+         ELSE
+*
+*           M > N, A is transposed:
+*           Underdetermined system of equations,
+*           minimum norm solution of A**T * X = B.
+*
+*           Compute B := inv(R**T) * B in two row blocks of B.
+*
+*           Block 1: B(1:N,1:NRHS) := inv(R**T) * B(1:N,1:NRHS)
+*
+            CALL STRTRS( 'Upper', 'Transpose', 'Non-unit', N, NRHS,
+     $                   A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
+*
+*           Block 2: Zero out all rows below the N-th row in B:
+*           B(N+1:M,1:NRHS) = ZERO
+*
+            DO  J = 1, NRHS
+               DO I = N + 1, M
+                  B( I, J ) = ZERO
+               END DO
+            END DO
+*
+*           Compute B(1:M,1:NRHS) := Q(1:N,:) * B(1:N,1:NRHS),
+*           using the compact WY representation of Q,
+*           workspace at least NRHS, optimally NRHS*NB.
+*
+            CALL SGEMQRT( 'Left', 'No transpose', M, NRHS, N, NB,
+     $                    A, LDA, WORK( 1 ), NB, B, LDB,
+     $                    WORK( MN*NB+1 ), INFO )
+*
+            SCLLEN = M
+*
+         END IF
+*
+      ELSE
+*
+*        M < N:
+*        Compute the blocked LQ factorization of A,
+*        using the compact WY representation of Q,
+*        workspace at least M, optimally M*NB.
+*
+         CALL SGELQT( M, N, NB, A, LDA, WORK( 1 ), NB,
+     $                WORK( MN*NB+1 ), INFO )
+*
+         IF( .NOT.TPSD ) THEN
+*
+*           M < N, A is not transposed:
+*           Underdetermined system of equations,
+*           minimum norm solution of A * X = B.
+*
+*           Compute B := inv(L) * B in two row blocks of B.
+*
+*           Block 1: B(1:M,1:NRHS) := inv(L) * B(1:M,1:NRHS)
+*
+            CALL STRTRS( 'Lower', 'No transpose', 'Non-unit', M,
+     $                   NRHS,
+     $                   A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
+*
+*           Block 2: Zero out all rows below the M-th row in B:
+*           B(M+1:N,1:NRHS) = ZERO
+*
+            DO J = 1, NRHS
+               DO I = M + 1, N
+                  B( I, J ) = ZERO
+               END DO
+            END DO
+*
+*           Compute B(1:N,1:NRHS) := Q(1:N,:)**T * B(1:M,1:NRHS),
+*           using the compact WY representation of Q,
+*           workspace at least NRHS, optimally NRHS*NB.
+*
+            CALL SGEMLQT( 'Left', 'Transpose', N, NRHS, M, NB, A,
+     $                    LDA,
+     $                   WORK( 1 ), NB, B, LDB,
+     $                   WORK( MN*NB+1 ), INFO )
+*
+            SCLLEN = N
+*
+         ELSE
+*
+*           M < N, A is transposed:
+*           Overdetermined system of equations,
+*           least-squares problem, min || A**T * X - B ||.
+*
+*           Compute B(1:N,1:NRHS) := Q * B(1:N,1:NRHS),
+*           using the compact WY representation of Q,
+*           workspace at least NRHS, optimally NRHS*NB.
+*
+            CALL SGEMLQT( 'Left', 'No transpose', N, NRHS, M, NB,
+     $                    A, LDA, WORK( 1 ), NB, B, LDB,
+     $                    WORK( MN*NB+1), INFO )
+*
+*           Compute B(1:M,1:NRHS) := inv(L**T) * B(1:M,1:NRHS)
+*
+            CALL STRTRS( 'Lower', 'Transpose', 'Non-unit', M, NRHS,
+     $                   A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
+*
+            SCLLEN = M
+*
+         END IF
+*
+      END IF
+*
+*     Undo scaling
+*
+      IF( IASCL.EQ.1 ) THEN
+         CALL SLASCL( 'G', 0, 0, ANRM, SMLNUM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      ELSE IF( IASCL.EQ.2 ) THEN
+         CALL SLASCL( 'G', 0, 0, ANRM, BIGNUM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      END IF
+      IF( IBSCL.EQ.1 ) THEN
+         CALL SLASCL( 'G', 0, 0, SMLNUM, BNRM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      ELSE IF( IBSCL.EQ.2 ) THEN
+         CALL SLASCL( 'G', 0, 0, BIGNUM, BNRM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      END IF
+*
+      WORK( 1 ) = SROUNDUP_LWORK( LWOPT )
+*
+      RETURN
+*
+*     End of SGELST
+*
+      END
diff --git a/SRC/sgelsy.f b/SRC/sgelsy.f
index 9c60f78a7a..bf83684146 100644
--- a/SRC/sgelsy.f
+++ b/SRC/sgelsy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGELSY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgelsy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgelsy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,6 +113,7 @@
 *>          B is REAL array, dimension (LDB,NRHS)
 *>          On entry, the M-by-NRHS right hand side matrix B.
 *>          On exit, the N-by-NRHS solution matrix X.
+*>          If M = 0 or N = 0, B is not referenced.
 *> \endverbatim
 *>
 *> \param[in] LDB
@@ -147,6 +146,7 @@
 *>          The effective rank of A, i.e., the order of the submatrix
 *>          R11.  This is the same as the order of the submatrix T11
 *>          in the complete orthogonal factorization of A.
+*>          If NRHS = 0, RANK = 0 on output.
 *> \endverbatim
 *>
 *> \param[out] WORK
@@ -189,7 +189,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEsolve
+*> \ingroup gelsy
 *
 *> \par Contributors:
 *  ==================
@@ -199,8 +199,10 @@
 *>    G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain \n
 *>
 *  =====================================================================
-      SUBROUTINE SGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
+      SUBROUTINE SGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND,
+     $                   RANK,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -232,11 +234,13 @@ SUBROUTINE SGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANGE
-      EXTERNAL           ILAENV, SLAMCH, SLANGE
+      REAL               SLAMCH, SLANGE, SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SLAMCH, SLANGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEQP3, SLABAD, SLAIC1, SLASCL, SLASET,
+      EXTERNAL           SCOPY, SGEQP3, SLAIC1, SLASCL,
+     $                   SLASET,
      $                   SORMQR, SORMRZ, STRSM, STZRZF, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -280,7 +284,7 @@ SUBROUTINE SGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
             LWKOPT = MAX( LWKMIN,
      $                    MN + 2*N + NB*( N + 1 ), 2*MN + NB*NRHS )
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
             INFO = -12
@@ -305,7 +309,6 @@ SUBROUTINE SGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
       SMLNUM = SLAMCH( 'S' ) / SLAMCH( 'P' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A, B if max entries outside range [SMLNUM,BIGNUM]
 *
@@ -338,13 +341,15 @@ SUBROUTINE SGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
 *        Scale matrix norm up to SMLNUM
 *
-         CALL SLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 1
       ELSE IF( BNRM.GT.BIGNUM ) THEN
 *
 *        Scale matrix norm down to BIGNUM
 *
-         CALL SLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 2
       END IF
 *
@@ -353,7 +358,7 @@ SUBROUTINE SGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
       CALL SGEQP3( M, N, A, LDA, JPVT, WORK( 1 ), WORK( MN+1 ),
      $             LWORK-MN, INFO )
-      WSIZE = MN + WORK( MN+1 )
+      WSIZE = REAL( MN ) + WORK( MN+1 )
 *
 *     workspace: MN+2*N+NB*(N+1).
 *     Details of Householder rotations stored in WORK(1:MN).
@@ -411,9 +416,10 @@ SUBROUTINE SGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
 *     B(1:M,1:NRHS) := Q**T * B(1:M,1:NRHS)
 *
-      CALL SORMQR( 'Left', 'Transpose', M, NRHS, MN, A, LDA, WORK( 1 ),
+      CALL SORMQR( 'Left', 'Transpose', M, NRHS, MN, A, LDA,
+     $             WORK( 1 ),
      $             B, LDB, WORK( 2*MN+1 ), LWORK-2*MN, INFO )
-      WSIZE = MAX( WSIZE, 2*MN+WORK( 2*MN+1 ) )
+      WSIZE = MAX( WSIZE, REAL( 2*MN )+WORK( 2*MN+1 ) )
 *
 *     workspace: 2*MN+NB*NRHS.
 *
@@ -452,22 +458,26 @@ SUBROUTINE SGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *     Undo scaling
 *
       IF( IASCL.EQ.1 ) THEN
-         CALL SLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL SLASCL( 'U', 0, 0, SMLNUM, ANRM, RANK, RANK, A, LDA,
      $                INFO )
       ELSE IF( IASCL.EQ.2 ) THEN
-         CALL SLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL SLASCL( 'U', 0, 0, BIGNUM, ANRM, RANK, RANK, A, LDA,
      $                INFO )
       END IF
       IF( IBSCL.EQ.1 ) THEN
-         CALL SLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL SLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL SLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       END IF
 *
    70 CONTINUE
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/sgemlq.f b/SRC/sgemlq.f
index 536abf1840..9c70f1b260 100644
--- a/SRC/sgemlq.f
+++ b/SRC/sgemlq.f
@@ -74,7 +74,7 @@
 *>          A is REAL array, dimension
 *>                               (LDA,M) if SIDE = 'L',
 *>                               (LDA,N) if SIDE = 'R'
-*>          Part of the data structure to represent Q as returned by DGELQ.
+*>          Part of the data structure to represent Q as returned by SGELQ.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -110,16 +110,17 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) REAL array, dimension (MAX(1,LWORK))
+*>          (workspace) DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1, then a workspace query is assumed. The routine
 *>          only calculates the size of the WORK array, returns this
-*>          value as WORK(1), and no error message related to WORK 
+*>          value as WORK(1), and no error message related to WORK
 *>          is issued by XERBLA.
 *> \endverbatim
 *>
@@ -143,7 +144,7 @@
 *>
 *> \verbatim
 *>
-*> These details are particular for this LAPACK implementation. Users should not 
+*> These details are particular for this LAPACK implementation. Users should not
 *> take them for granted. These details may change in the future, and are not likely
 *> true for another LAPACK implementation. These details are relevant if one wants
 *> to try to understand the code. They are not part of the interface.
@@ -159,14 +160,17 @@
 *>  block sizes MB and NB returned by ILAENV, SGELQ will use either
 *>  SLASWLQ (if the matrix is wide-and-short) or SGELQT to compute
 *>  the LQ factorization.
-*>  This version of SGEMLQ will use either SLAMSWLQ or SGEMLQT to 
+*>  This version of SGEMLQ will use either SLAMSWLQ or SGEMLQT to
 *>  multiply matrix Q by another matrix.
 *>  Further Details in SLAMSWLQ or SGEMLQT.
 *> \endverbatim
 *>
+*> \ingroup gemlq
+*>
 *  =====================================================================
       SUBROUTINE SGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
      $                   C, LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -185,12 +189,16 @@ SUBROUTINE SGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER            MB, NB, LW, NBLCKS, MN
+      INTEGER            MB, NB, LW, NBLCKS, MN, MINMNK, LWMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
+*     .. External Functions ..
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
+*     ..
 *     .. External Subroutines ..
       EXTERNAL           SLAMSWLQ, SGEMLQT, XERBLA
 *     ..
@@ -201,7 +209,7 @@ SUBROUTINE SGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *
 *     Test the input arguments
 *
-      LQUERY  = LWORK.EQ.-1
+      LQUERY  = ( LWORK.EQ.-1 )
       NOTRAN  = LSAME( TRANS, 'N' )
       TRAN    = LSAME( TRANS, 'T' )
       LEFT    = LSAME( SIDE, 'L' )
@@ -216,6 +224,13 @@ SUBROUTINE SGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
         LW = M * MB
         MN = N
       END IF
+*
+      MINMNK = MIN( M, N, K )
+      IF( MINMNK.EQ.0 ) THEN
+         LWMIN = 1
+      ELSE
+         LWMIN = MAX( 1, LW )
+      END IF
 *
       IF( ( NB.GT.K ) .AND. ( MN.GT.K ) ) THEN
         IF( MOD( MN - K, NB - K ) .EQ. 0 ) THEN
@@ -244,12 +259,12 @@ SUBROUTINE SGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
         INFO = -9
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
         INFO = -11
-      ELSE IF( ( LWORK.LT.MAX( 1, LW ) ) .AND. ( .NOT.LQUERY ) ) THEN
+      ELSE IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
         INFO = -13
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-        WORK( 1 ) = REAL( LW )
+        WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -261,7 +276,7 @@ SUBROUTINE SGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *
 *     Quick return if possible
 *
-      IF( MIN( M, N, K ).EQ.0 ) THEN
+      IF( MINMNK.EQ.0 ) THEN
         RETURN
       END IF
 *
@@ -274,7 +289,7 @@ SUBROUTINE SGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
      $                 MB, C, LDC, WORK, LWORK, INFO )
       END IF
 *
-      WORK( 1 ) = REAL( LW )
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
 *
       RETURN
 *
diff --git a/SRC/sgemlqt.f b/SRC/sgemlqt.f
index 2faed89bbf..82bc671d96 100644
--- a/SRC/sgemlqt.f
+++ b/SRC/sgemlqt.f
@@ -20,7 +20,7 @@
 *>
 *> \verbatim
 *>
-*> DGEMLQT overwrites the general real M-by-N matrix C with
+*> SGEMLQT overwrites the general real M-by-N matrix C with
 *>
 *>                 SIDE = 'L'     SIDE = 'R'
 *> TRANS = 'N':      Q C            C Q
@@ -145,11 +145,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gemlqt
 *
 *  =====================================================================
       SUBROUTINE SGEMLQT( SIDE, TRANS, M, N, K, MB, V, LDV, T, LDT,
      $                   C, LDC, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -168,7 +169,7 @@ SUBROUTINE SGEMLQT( SIDE, TRANS, M, N, K, MB, V, LDV, T, LDT,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, RIGHT, TRAN, NOTRAN
-      INTEGER            I, IB, LDWORK, KF
+      INTEGER            I, IB, LDWORK, KF, Q
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -192,8 +193,10 @@ SUBROUTINE SGEMLQT( SIDE, TRANS, M, N, K, MB, V, LDV, T, LDT,
 *
       IF( LEFT ) THEN
          LDWORK = MAX( 1, N )
+         Q = M
       ELSE IF ( RIGHT ) THEN
          LDWORK = MAX( 1, M )
+         Q = N
       END IF
       IF( .NOT.LEFT .AND. .NOT.RIGHT ) THEN
          INFO = -1
@@ -203,7 +206,7 @@ SUBROUTINE SGEMLQT( SIDE, TRANS, M, N, K, MB, V, LDV, T, LDT,
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
          INFO = -4
-      ELSE IF( K.LT.0) THEN
+      ELSE IF( K.LT.0 .OR. K.GT.Q ) THEN
          INFO = -5
       ELSE IF( MB.LT.1 .OR. (MB.GT.K .AND. K.GT.0)) THEN
          INFO = -6
diff --git a/SRC/sgemqr.f b/SRC/sgemqr.f
index 2a92574591..89502870ff 100644
--- a/SRC/sgemqr.f
+++ b/SRC/sgemqr.f
@@ -120,7 +120,7 @@
 *>          The dimension of the array WORK.
 *>          If LWORK = -1, then a workspace query is assumed. The routine
 *>          only calculates the size of the WORK array, returns this
-*>          value as WORK(1), and no error message related to WORK 
+*>          value as WORK(1), and no error message related to WORK
 *>          is issued by XERBLA.
 *> \endverbatim
 *>
@@ -144,7 +144,7 @@
 *>
 *> \verbatim
 *>
-*> These details are particular for this LAPACK implementation. Users should not 
+*> These details are particular for this LAPACK implementation. Users should not
 *> take them for granted. These details may change in the future, and are not likely
 *> true for another LAPACK implementation. These details are relevant if one wants
 *> to try to understand the code. They are not part of the interface.
@@ -160,15 +160,18 @@
 *>  block sizes MB and NB returned by ILAENV, SGEQR will use either
 *>  SLATSQR (if the matrix is tall-and-skinny) or SGEQRT to compute
 *>  the QR factorization.
-*>  This version of SGEMQR will use either SLAMTSQR or SGEMQRT to 
+*>  This version of SGEMQR will use either SLAMTSQR or SGEMQRT to
 *>  multiply matrix Q by another matrix.
 *>  Further Details in SLAMTSQR or SGEMQRT.
 *>
 *> \endverbatim
 *>
+*> \ingroup gemqr
+*>
 *  =====================================================================
       SUBROUTINE SGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
      $                   C, LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -187,11 +190,13 @@ SUBROUTINE SGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER            MB, NB, LW, NBLCKS, MN
+      INTEGER            MB, NB, LW, NBLCKS, MN, MINMNK, LWMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SGEMQRT, SLAMTSQR, XERBLA
@@ -203,7 +208,7 @@ SUBROUTINE SGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *
 *     Test the input arguments
 *
-      LQUERY  = LWORK.EQ.-1
+      LQUERY  = ( LWORK.EQ.-1 )
       NOTRAN  = LSAME( TRANS, 'N' )
       TRAN    = LSAME( TRANS, 'T' )
       LEFT    = LSAME( SIDE, 'L' )
@@ -218,6 +223,13 @@ SUBROUTINE SGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
         LW = MB * NB
         MN = N
       END IF
+*
+      MINMNK = MIN( M, N, K )
+      IF( MINMNK.EQ.0 ) THEN
+         LWMIN = 1
+      ELSE
+         LWMIN = MAX( 1, LW )
+      END IF
 *
       IF( ( MB.GT.K ) .AND. ( MN.GT.K ) ) THEN
         IF( MOD( MN - K, MB - K ).EQ.0 ) THEN
@@ -246,12 +258,12 @@ SUBROUTINE SGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
         INFO = -9
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
         INFO = -11
-      ELSE IF( ( LWORK.LT.MAX( 1, LW ) ) .AND. ( .NOT.LQUERY ) ) THEN
+      ELSE IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
         INFO = -13
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-        WORK( 1 ) = LW
+        WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -263,7 +275,7 @@ SUBROUTINE SGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *
 *     Quick return if possible
 *
-      IF( MIN( M, N, K ).EQ.0 ) THEN
+      IF( MINMNK.EQ.0 ) THEN
         RETURN
       END IF
 *
@@ -276,7 +288,7 @@ SUBROUTINE SGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
      $                 NB, C, LDC, WORK, LWORK, INFO )
       END IF
 *
-      WORK( 1 ) = LW
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
 *
       RETURN
 *
diff --git a/SRC/sgemqrt.f b/SRC/sgemqrt.f
index 2ebd7d5f84..55b04bb9ad 100644
--- a/SRC/sgemqrt.f
+++ b/SRC/sgemqrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEMQRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgemqrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgemqrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -94,7 +92,7 @@
 *>          NB is INTEGER
 *>          The block size used for the storage of T.  K >= NB >= 1.
 *>          This must be the same value of NB used to generate T
-*>          in CGEQRT.
+*>          in SGEQRT.
 *> \endverbatim
 *>
 *> \param[in] V
@@ -102,7 +100,7 @@
 *>          V is REAL array, dimension (LDV,K)
 *>          The i-th column must contain the vector which defines the
 *>          elementary reflector H(i), for i = 1,2,...,k, as returned by
-*>          CGEQRT in the first K columns of its array argument A.
+*>          SGEQRT in the first K columns of its array argument A.
 *> \endverbatim
 *>
 *> \param[in] LDV
@@ -117,7 +115,7 @@
 *> \verbatim
 *>          T is REAL array, dimension (LDT,K)
 *>          The upper triangular factors of the block reflectors
-*>          as returned by CGEQRT, stored as a NB-by-N matrix.
+*>          as returned by SGEQRT, stored as a NB-by-N matrix.
 *> \endverbatim
 *>
 *> \param[in] LDT
@@ -160,11 +158,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup gemqrt
 *
 *  =====================================================================
       SUBROUTINE SGEMQRT( SIDE, TRANS, M, N, K, NB, V, LDV, T, LDT,
      $                   C, LDC, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sgeql2.f b/SRC/sgeql2.f
index ea5ad6b82d..99d9f49ed4 100644
--- a/SRC/sgeql2.f
+++ b/SRC/sgeql2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEQL2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgeql2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgeql2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,7 +96,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup geql2
 *
 *> \par Further Details:
 *  =====================
@@ -120,6 +118,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGEQL2( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -134,16 +133,11 @@ SUBROUTINE SGEQL2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      REAL               ONE
-      PARAMETER          ( ONE = 1.0E+0 )
-*     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      REAL               AII
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, SLARFG, XERBLA
+      EXTERNAL           SLARF1L, SLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -177,11 +171,8 @@ SUBROUTINE SGEQL2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *        Apply H(i) to A(1:m-k+i,1:n-k+i-1) from the left
 *
-         AII = A( M-K+I, N-K+I )
-         A( M-K+I, N-K+I ) = ONE
-         CALL SLARF( 'Left', M-K+I, N-K+I-1, A( 1, N-K+I ), 1, TAU( I ),
-     $               A, LDA, WORK )
-         A( M-K+I, N-K+I ) = AII
+         CALL SLARF1L( 'Left', M-K+I, N-K+I-1, A( 1, N-K+I ), 1,
+     $                 TAU( I ), A, LDA, WORK )
    10 CONTINUE
       RETURN
 *
diff --git a/SRC/sgeqlf.f b/SRC/sgeqlf.f
index efecfbb3ca..88c7f4fc08 100644
--- a/SRC/sgeqlf.f
+++ b/SRC/sgeqlf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEQLF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgeqlf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgeqlf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,7 +86,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,N).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= N, otherwise.
 *>          For optimum performance LWORK >= N*NB, where NB is the
 *>          optimal blocksize.
 *>
@@ -113,7 +112,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup geqlf
 *
 *> \par Further Details:
 *  =====================
@@ -135,6 +134,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -162,7 +162,8 @@ SUBROUTINE SGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -186,10 +187,11 @@ SUBROUTINE SGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
             NB = ILAENV( 1, 'SGEQLF', ' ', M, N, -1, -1 )
             LWKOPT = N*NB
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
-         IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
-            INFO = -7
+         IF( .NOT.LQUERY ) THEN
+            IF( LWORK.LE.0 .OR. ( M.GT.0 .AND. LWORK.LT.MAX( 1, N ) ) )
+     $         INFO = -7
          END IF
       END IF
 *
@@ -246,7 +248,8 @@ SUBROUTINE SGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *           Compute the QL factorization of the current block
 *           A(1:m-k+i+ib-1,n-k+i:n-k+i+ib-1)
 *
-            CALL SGEQL2( M-K+I+IB-1, IB, A( 1, N-K+I ), LDA, TAU( I ),
+            CALL SGEQL2( M-K+I+IB-1, IB, A( 1, N-K+I ), LDA,
+     $                   TAU( I ),
      $                   WORK, IINFO )
             IF( N-K+I.GT.1 ) THEN
 *
@@ -276,7 +279,7 @@ SUBROUTINE SGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
       IF( MU.GT.0 .AND. NU.GT.0 )
      $   CALL SGEQL2( MU, NU, A, LDA, TAU, WORK, IINFO )
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK(IWS)
       RETURN
 *
 *     End of SGEQLF
diff --git a/SRC/sgeqp3.f b/SRC/sgeqp3.f
index 493bdae6af..3cc7a0eece 100644
--- a/SRC/sgeqp3.f
+++ b/SRC/sgeqp3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEQP3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgeqp3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgeqp3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,7 +118,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup geqp3
 *
 *> \par Further Details:
 *  =====================
@@ -148,6 +146,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -173,12 +172,13 @@ SUBROUTINE SGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, INFO )
      $                   NBMIN, NFXD, NX, SM, SMINMN, SN, TOPBMN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEQRF, SLAQP2, SLAQPS, SORMQR, SSWAP, XERBLA
+      EXTERNAL           SGEQRF, SLAQP2, SLAQPS, SORMQR, SSWAP,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      REAL               SNRM2
-      EXTERNAL           ILAENV, SNRM2
+      REAL               SNRM2, SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SNRM2, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          INT, MAX, MIN
@@ -205,7 +205,7 @@ SUBROUTINE SGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, INFO )
             NB = ILAENV( INB, 'SGEQRF', ' ', M, N, -1, -1 )
             LWKOPT = 2*N + ( N + 1 )*NB
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( ( LWORK.LT.IWS ) .AND. .NOT.LQUERY ) THEN
             INFO = -8
@@ -252,7 +252,8 @@ SUBROUTINE SGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, INFO )
          IF( NA.LT.N ) THEN
 *CC         CALL SORM2R( 'Left', 'Transpose', M, N-NA, NA, A, LDA,
 *CC  $                   TAU, A( 1, NA+1 ), LDA, WORK, INFO )
-            CALL SORMQR( 'Left', 'Transpose', M, N-NA, NA, A, LDA, TAU,
+            CALL SORMQR( 'Left', 'Transpose', M, N-NA, NA, A, LDA,
+     $                   TAU,
      $                   A( 1, NA+1 ), LDA, WORK, LWORK, INFO )
             IWS = MAX( IWS, INT( WORK( 1 ) ) )
          END IF
@@ -293,7 +294,8 @@ SUBROUTINE SGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, INFO )
 *                 determine the minimum value of NB.
 *
                   NB = ( LWORK-2*SN ) / ( SN+1 )
-                  NBMIN = MAX( 2, ILAENV( INBMIN, 'SGEQRF', ' ', SM, SN,
+                  NBMIN = MAX( 2, ILAENV( INBMIN, 'SGEQRF', ' ', SM,
+     $                         SN,
      $                    -1, -1 ) )
 *
 *
@@ -347,7 +349,7 @@ SUBROUTINE SGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, INFO )
 *
       END IF
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK(IWS)
       RETURN
 *
 *     End of SGEQP3
diff --git a/SRC/sgeqp3rk.f b/SRC/sgeqp3rk.f
new file mode 100644
index 0000000000..9f0b76328d
--- /dev/null
+++ b/SRC/sgeqp3rk.f
@@ -0,0 +1,1074 @@
+*> \brief \b SGEQP3RK computes a truncated Householder QR factorization with column pivoting of a real m-by-n matrix A by using Level 3 BLAS and overwrites a real m-by-nrhs matrix B with Q**T * B.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download SGEQP3RK + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgeqp3rk.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/sgeqp3rk.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgeqp3rk.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE SGEQP3RK( M, N, NRHS, KMAX, ABSTOL, RELTOL, A, LDA,
+*      $                     K, MAXC2NRMK, RELMAXC2NRMK, JPIV, TAU,
+*      $                     WORK, LWORK, IWORK, INFO )
+*       IMPLICIT NONE
+*
+*      .. Scalar Arguments ..
+*       INTEGER            INFO, K, KMAX, LDA, LWORK, M, N, NRHS
+*       REAL               ABSTOL, MAXC2NRMK, RELMAXC2NRMK, RELTOL
+*      ..
+*      .. Array Arguments ..
+*       INTEGER            IWORK( * ), JPIV( * )
+*       REAL               A( LDA, * ), TAU( * ), WORK( * )
+*      ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> SGEQP3RK performs two tasks simultaneously:
+*>
+*> Task 1: The routine computes a truncated (rank K) or full rank
+*> Householder QR factorization with column pivoting of a real
+*> M-by-N matrix A using Level 3 BLAS. K is the number of columns
+*> that were factorized, i.e. factorization rank of the
+*> factor R, K <= min(M,N).
+*>
+*>  A * P(K) = Q(K) * R(K)  =
+*>
+*>        = Q(K) * ( R11(K) R12(K) ) = Q(K) * (   R(K)_approx    )
+*>                 ( 0      R22(K) )          ( 0  R(K)_residual ),
+*>
+*> where:
+*>
+*>  P(K)            is an N-by-N permutation matrix;
+*>  Q(K)            is an M-by-M orthogonal matrix;
+*>  R(K)_approx   = ( R11(K), R12(K) ) is a rank K approximation of the
+*>                    full rank factor R with K-by-K upper-triangular
+*>                    R11(K) and K-by-N rectangular R12(K). The diagonal
+*>                    entries of R11(K) appear in non-increasing order
+*>                    of absolute value, and absolute values of all of
+*>                    them exceed the maximum column 2-norm of R22(K)
+*>                    up to roundoff error.
+*>  R(K)_residual = R22(K) is the residual of a rank K approximation
+*>                    of the full rank factor R. It is a
+*>                    an (M-K)-by-(N-K) rectangular matrix;
+*>  0               is a an (M-K)-by-K zero matrix.
+*>
+*> Task 2: At the same time, the routine overwrites a real M-by-NRHS
+*> matrix B with  Q(K)**T * B  using Level 3 BLAS.
+*>
+*> =====================================================================
+*>
+*> The matrices A and B are stored on input in the array A as
+*> the left and right blocks A(1:M,1:N) and A(1:M, N+1:N+NRHS)
+*> respectively.
+*>
+*>                                  N     NRHS
+*>             array_A   =   M  [ mat_A, mat_B ]
+*>
+*> The truncation criteria (i.e. when to stop the factorization)
+*> can be any of the following:
+*>
+*>   1) The input parameter KMAX, the maximum number of columns
+*>      KMAX to factorize, i.e. the factorization rank is limited
+*>      to KMAX. If KMAX >= min(M,N), the criterion is not used.
+*>
+*>   2) The input parameter ABSTOL, the absolute tolerance for
+*>      the maximum column 2-norm of the residual matrix R22(K). This
+*>      means that the factorization stops if this norm is less or
+*>      equal to ABSTOL. If ABSTOL < 0.0, the criterion is not used.
+*>
+*>   3) The input parameter RELTOL, the tolerance for the maximum
+*>      column 2-norm matrix of the residual matrix R22(K) divided
+*>      by the maximum column 2-norm of the original matrix A, which
+*>      is equal to abs(R(1,1)). This means that the factorization stops
+*>      when the ratio of the maximum column 2-norm of R22(K) to
+*>      the maximum column 2-norm of A is less than or equal to RELTOL.
+*>      If RELTOL < 0.0, the criterion is not used.
+*>
+*>   4) In case both stopping criteria ABSTOL or RELTOL are not used,
+*>      and when the residual matrix R22(K) is a zero matrix in some
+*>      factorization step K. ( This stopping criterion is implicit. )
+*>
+*>  The algorithm stops when any of these conditions is first
+*>  satisfied, otherwise the whole matrix A is factorized.
+*>
+*>  To factorize the whole matrix A, use the values
+*>  KMAX >= min(M,N), ABSTOL < 0.0 and RELTOL < 0.0.
+*>
+*>  The routine returns:
+*>     a) Q(K), R(K)_approx = ( R11(K), R12(K) ),
+*>        R(K)_residual = R22(K), P(K), i.e. the resulting matrices
+*>        of the factorization; P(K) is represented by JPIV,
+*>        ( if K = min(M,N), R(K)_approx is the full factor R,
+*>        and there is no residual matrix R(K)_residual);
+*>     b) K, the number of columns that were factorized,
+*>        i.e. factorization rank;
+*>     c) MAXC2NRMK, the maximum column 2-norm of the residual
+*>        matrix R(K)_residual = R22(K),
+*>        ( if K = min(M,N), MAXC2NRMK = 0.0 );
+*>     d) RELMAXC2NRMK equals MAXC2NRMK divided by MAXC2NRM, the maximum
+*>        column 2-norm of the original matrix A, which is equal
+*>        to abs(R(1,1)), ( if K = min(M,N), RELMAXC2NRMK = 0.0 );
+*>     e) Q(K)**T * B, the matrix B with the orthogonal
+*>        transformation Q(K)**T applied on the left.
+*>
+*> The N-by-N permutation matrix P(K) is stored in a compact form in
+*> the integer array JPIV. For 1 <= j <= N, column j
+*> of the matrix A was interchanged with column JPIV(j).
+*>
+*> The M-by-M orthogonal matrix Q is represented as a product
+*> of elementary Householder reflectors
+*>
+*>     Q(K) = H(1) *  H(2) * . . . * H(K),
+*>
+*> where K is the number of columns that were factorized.
+*>
+*> Each H(j) has the form
+*>
+*>     H(j) = I - tau * v * v**T,
+*>
+*> where 1 <= j <= K and
+*>   I    is an M-by-M identity matrix,
+*>   tau  is a real scalar,
+*>   v    is a real vector with v(1:j-1) = 0 and v(j) = 1.
+*>
+*> v(j+1:M) is stored on exit in A(j+1:M,j) and tau in TAU(j).
+*>
+*> See the Further Details section for more information.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e. the number of
+*>          columns of the matrix B. NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] KMAX
+*> \verbatim
+*>          KMAX is INTEGER
+*>
+*>          The first factorization stopping criterion. KMAX >= 0.
+*>
+*>          The maximum number of columns of the matrix A to factorize,
+*>          i.e. the maximum factorization rank.
+*>
+*>          a) If KMAX >= min(M,N), then this stopping criterion
+*>                is not used, the routine factorizes columns
+*>                depending on ABSTOL and RELTOL.
+*>
+*>          b) If KMAX = 0, then this stopping criterion is
+*>                satisfied on input and the routine exits immediately.
+*>                This means that the factorization is not performed,
+*>                the matrices A and B are not modified, and
+*>                the matrix A is itself the residual.
+*> \endverbatim
+*>
+*> \param[in] ABSTOL
+*> \verbatim
+*>          ABSTOL is REAL
+*>
+*>          The second factorization stopping criterion, cannot be NaN.
+*>
+*>          The absolute tolerance (stopping threshold) for
+*>          maximum column 2-norm of the residual matrix R22(K).
+*>          The algorithm converges (stops the factorization) when
+*>          the maximum column 2-norm of the residual matrix R22(K)
+*>          is less than or equal to ABSTOL. Let SAFMIN = SLAMCH('S').
+*>
+*>          a) If ABSTOL is NaN, then no computation is performed
+*>                and an error message ( INFO = -5 ) is issued
+*>                by XERBLA.
+*>
+*>          b) If ABSTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on KMAX and RELTOL.
+*>                This includes the case ABSTOL = -Inf.
+*>
+*>          c) If 0.0 <= ABSTOL < 2*SAFMIN, then ABSTOL = 2*SAFMIN
+*>                is used. This includes the case ABSTOL = -0.0.
+*>
+*>          d) If 2*SAFMIN <= ABSTOL then the input value
+*>                of ABSTOL is used.
+*>
+*>          Let MAXC2NRM be the maximum column 2-norm of the
+*>          whole original matrix A.
+*>          If ABSTOL chosen above is >= MAXC2NRM, then this
+*>          stopping criterion is satisfied on input and routine exits
+*>          immediately after MAXC2NRM is computed. The routine
+*>          returns MAXC2NRM in MAXC2NORMK,
+*>          and 1.0 in RELMAXC2NORMK.
+*>          This includes the case ABSTOL = +Inf. This means that the
+*>          factorization is not performed, the matrices A and B are not
+*>          modified, and the matrix A is itself the residual.
+*> \endverbatim
+*>
+*> \param[in] RELTOL
+*> \verbatim
+*>          RELTOL is REAL
+*>
+*>          The third factorization stopping criterion, cannot be NaN.
+*>
+*>          The tolerance (stopping threshold) for the ratio
+*>          abs(R(K+1,K+1))/abs(R(1,1)) of the maximum column 2-norm of
+*>          the residual matrix R22(K) to the maximum column 2-norm of
+*>          the original matrix A. The algorithm converges (stops the
+*>          factorization), when abs(R(K+1,K+1))/abs(R(1,1)) A is less
+*>          than or equal to RELTOL. Let EPS = SLAMCH('E').
+*>
+*>          a) If RELTOL is NaN, then no computation is performed
+*>                and an error message ( INFO = -6 ) is issued
+*>                by XERBLA.
+*>
+*>          b) If RELTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on KMAX and ABSTOL.
+*>                This includes the case RELTOL = -Inf.
+*>
+*>          c) If 0.0 <= RELTOL < EPS, then RELTOL = EPS is used.
+*>                This includes the case RELTOL = -0.0.
+*>
+*>          d) If EPS <= RELTOL then the input value of RELTOL
+*>                is used.
+*>
+*>          Let MAXC2NRM be the maximum column 2-norm of the
+*>          whole original matrix A.
+*>          If RELTOL chosen above is >= 1.0, then this stopping
+*>          criterion is satisfied on input and routine exits
+*>          immediately after MAXC2NRM is computed.
+*>          The routine returns MAXC2NRM in MAXC2NORMK,
+*>          and 1.0 in RELMAXC2NORMK.
+*>          This includes the case RELTOL = +Inf. This means that the
+*>          factorization is not performed, the matrices A and B are not
+*>          modified, and the matrix A is itself the residual.
+*>
+*>          NOTE: We recommend that RELTOL satisfy
+*>                min( max(M,N)*EPS, sqrt(EPS) ) <= RELTOL
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is REAL array, dimension (LDA,N+NRHS)
+*>
+*>          On entry:
+*>
+*>          a) The subarray A(1:M,1:N) contains the M-by-N matrix A.
+*>          b) The subarray A(1:M,N+1:N+NRHS) contains the M-by-NRHS
+*>             matrix B.
+*>
+*>                                  N     NRHS
+*>              array_A   =   M  [ mat_A, mat_B ]
+*>
+*>          On exit:
+*>
+*>          a) The subarray A(1:M,1:N) contains parts of the factors
+*>             of the matrix A:
+*>
+*>            1) If K = 0, A(1:M,1:N) contains the original matrix A.
+*>            2) If K > 0, A(1:M,1:N) contains parts of the
+*>            factors:
+*>
+*>              1. The elements below the diagonal of the subarray
+*>                 A(1:M,1:K) together with TAU(1:K) represent the
+*>                 orthogonal matrix Q(K) as a product of K Householder
+*>                 elementary reflectors.
+*>
+*>              2. The elements on and above the diagonal of
+*>                 the subarray A(1:K,1:N) contain K-by-N
+*>                 upper-trapezoidal matrix
+*>                 R(K)_approx = ( R11(K), R12(K) ).
+*>                 NOTE: If K=min(M,N), i.e. full rank factorization,
+*>                       then R_approx(K) is the full factor R which
+*>                       is upper-trapezoidal. If, in addition, M>=N,
+*>                       then R is upper-triangular.
+*>
+*>              3. The subarray A(K+1:M,K+1:N) contains (M-K)-by-(N-K)
+*>                 rectangular matrix R(K)_residual = R22(K).
+*>
+*>          b) If NRHS > 0, the subarray A(1:M,N+1:N+NRHS) contains
+*>             the M-by-NRHS product Q(K)**T * B.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*>          This is the leading dimension for both matrices, A and B.
+*> \endverbatim
+*>
+*> \param[out] K
+*> \verbatim
+*>          K is INTEGER
+*>          Factorization rank of the matrix A, i.e. the rank of
+*>          the factor R, which is the same as the number of non-zero
+*>          rows of the factor R. 0 <= K <= min(M,KMAX,N).
+*>
+*>          K also represents the number of non-zero Householder
+*>          vectors.
+*>
+*>          NOTE: If K = 0, a) the arrays A and B are not modified;
+*>                          b) the array TAU(1:min(M,N)) is set to ZERO,
+*>                             if the matrix A does not contain NaN,
+*>                             otherwise the elements TAU(1:min(M,N))
+*>                             are undefined;
+*>                          c) the elements of the array JPIV are set
+*>                             as follows: for j = 1:N, JPIV(j) = j.
+*> \endverbatim
+*>
+*> \param[out] MAXC2NRMK
+*> \verbatim
+*>          MAXC2NRMK is REAL
+*>          The maximum column 2-norm of the residual matrix R22(K),
+*>          when the factorization stopped at rank K. MAXC2NRMK >= 0.
+*>
+*>          a) If K = 0, i.e. the factorization was not performed,
+*>             the matrix A was not modified and is itself a residual
+*>             matrix, then MAXC2NRMK equals the maximum column 2-norm
+*>             of the original matrix A.
+*>
+*>          b) If 0 < K < min(M,N), then MAXC2NRMK is returned.
+*>
+*>          c) If K = min(M,N), i.e. the whole matrix A was
+*>             factorized and there is no residual matrix,
+*>             then MAXC2NRMK = 0.0.
+*>
+*>          NOTE: MAXC2NRMK in the factorization step K would equal
+*>                R(K+1,K+1) in the next factorization step K+1.
+*> \endverbatim
+*>
+*> \param[out] RELMAXC2NRMK
+*> \verbatim
+*>          RELMAXC2NRMK is REAL
+*>          The ratio MAXC2NRMK / MAXC2NRM of the maximum column
+*>          2-norm of the residual matrix R22(K) (when the factorization
+*>          stopped at rank K) to the maximum column 2-norm of the
+*>          whole original matrix A. RELMAXC2NRMK >= 0.
+*>
+*>          a) If K = 0, i.e. the factorization was not performed,
+*>             the matrix A was not modified and is itself a residual
+*>             matrix, then RELMAXC2NRMK = 1.0.
+*>
+*>          b) If 0 < K < min(M,N), then
+*>                RELMAXC2NRMK = MAXC2NRMK / MAXC2NRM is returned.
+*>
+*>          c) If K = min(M,N), i.e. the whole matrix A was
+*>             factorized and there is no residual matrix,
+*>             then RELMAXC2NRMK = 0.0.
+*>
+*>         NOTE: RELMAXC2NRMK in the factorization step K would equal
+*>               abs(R(K+1,K+1))/abs(R(1,1)) in the next factorization
+*>               step K+1.
+*> \endverbatim
+*>
+*> \param[out] JPIV
+*> \verbatim
+*>          JPIV is INTEGER array, dimension (N)
+*>          Column pivot indices. For 1 <= j <= N, column j
+*>          of the matrix A was interchanged with column JPIV(j).
+*>
+*>          The elements of the array JPIV(1:N) are always set
+*>          by the routine, for example, even  when no columns
+*>          were factorized, i.e. when K = 0, the elements are
+*>          set as JPIV(j) = j for j = 1:N.
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is REAL array, dimension (min(M,N))
+*>          The scalar factors of the elementary reflectors.
+*>
+*>          If 0 < K <= min(M,N), only the elements TAU(1:K) of
+*>          the array TAU are modified by the factorization.
+*>          After the factorization computed, if no NaN was found
+*>          during the factorization, the remaining elements
+*>          TAU(K+1:min(M,N)) are set to zero, otherwise the
+*>          elements TAU(K+1:min(M,N)) are not set and therefore
+*>          undefined.
+*>          ( If K = 0, all elements of TAU are set to zero, if
+*>          the matrix A does not contain NaN. )
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is REAL array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and
+*>          LWORK >= (3*N+NRHS-1), otherwise.
+*>          For optimal performance LWORK >= (2*N + NB*( N+NRHS+1 )),
+*>          where NB is the optimal block size for SGEQP3RK returned
+*>          by ILAENV. Minimal block size MINNB=2.
+*>
+*>          NOTE: The decision, whether to use unblocked BLAS 2
+*>          or blocked BLAS 3 code is based not only on the dimension
+*>          LWORK of the availbale workspace WORK, but also also on the
+*>          matrix A dimension N via crossover point NX returned
+*>          by ILAENV. (For N less than NX, unblocked code should be
+*>          used.)
+*>
+*>          If LWORK = -1, then a workspace query is assumed;
+*>          the routine only calculates the optimal size of the WORK
+*>          array, returns this value as the first entry of the WORK
+*>          array, and no error message related to LWORK is issued
+*>          by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (N-1).
+*>          Is a work array. ( IWORK is used to store indices
+*>          of "bad" columns for norm downdating in the residual
+*>          matrix in the blocked step auxiliary subroutine SLAQP3RK ).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          1) INFO = 0: successful exit.
+*>          2) INFO < 0: if INFO = -i, the i-th argument had an
+*>                       illegal value.
+*>          3) If INFO = j_1, where 1 <= j_1 <= N, then NaN was
+*>             detected and the routine stops the computation.
+*>             The j_1-th column of the matrix A or the j_1-th
+*>             element of array TAU contains the first occurrence
+*>             of NaN in the factorization step K+1 ( when K columns
+*>             have been factorized ).
+*>
+*>             On exit:
+*>             K                  is set to the number of
+*>                                   factorized columns without
+*>                                   exception.
+*>             MAXC2NRMK          is set to NaN.
+*>             RELMAXC2NRMK       is set to NaN.
+*>             TAU(K+1:min(M,N))  is not set and contains undefined
+*>                                   elements. If j_1=K+1, TAU(K+1)
+*>                                   may contain NaN.
+*>          4) If INFO = j_2, where N+1 <= j_2 <= 2*N, then no NaN
+*>             was detected, but +Inf (or -Inf) was detected and
+*>             the routine continues the computation until completion.
+*>             The (j_2-N)-th column of the matrix A contains the first
+*>             occurrence of +Inf (or -Inf) in the factorization
+*>             step K+1 ( when K columns have been factorized ).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup geqp3rk
+*
+*> \par Further Details:
+*  =====================
+*
+*> \verbatim
+*> SGEQP3RK is based on the same BLAS3 Householder QR factorization
+*> algorithm with column pivoting as in SGEQP3 routine which uses
+*> SLARFG routine to generate Householder reflectors
+*> for QR factorization.
+*>
+*> We can also write:
+*>
+*>   A = A_approx(K) + A_residual(K)
+*>
+*> The low rank approximation matrix A(K)_approx from
+*> the truncated QR factorization of rank K of the matrix A is:
+*>
+*>   A(K)_approx = Q(K) * ( R(K)_approx ) * P(K)**T
+*>                        (     0     0 )
+*>
+*>               = Q(K) * ( R11(K) R12(K) ) * P(K)**T
+*>                        (      0      0 )
+*>
+*> The residual A_residual(K) of the matrix A is:
+*>
+*>   A_residual(K) = Q(K) * ( 0              0 ) * P(K)**T =
+*>                          ( 0  R(K)_residual )
+*>
+*>                 = Q(K) * ( 0        0 ) * P(K)**T
+*>                          ( 0   R22(K) )
+*>
+*> The truncated (rank K) factorization guarantees that
+*> the maximum column 2-norm of A_residual(K) is less than
+*> or equal to MAXC2NRMK up to roundoff error.
+*>
+*> NOTE: An approximation of the null vectors
+*>       of A can be easily computed from R11(K)
+*>       and R12(K):
+*>
+*>       Null( A(K) )_approx = P * ( inv(R11(K)) * R12(K) )
+*>                                 (         -I           )
+*>
+*> \endverbatim
+*
+*> \par References:
+*  ================
+*> [1] A Level 3 BLAS QR factorization algorithm with column pivoting developed in 1996.
+*> G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain.
+*> X. Sun, Computer Science Dept., Duke University, USA.
+*> C. H. Bischof, Math. and Comp. Sci. Div., Argonne National Lab, USA.
+*> A BLAS-3 version of the QR factorization with column pivoting.
+*> LAPACK Working Note 114
+*> <a href="https://www.netlib.org/lapack/lawnspdf/lawn114.pdf">https://www.netlib.org/lapack/lawnspdf/lawn114.pdf</a>
+*> and in
+*> SIAM J. Sci. Comput., 19(5):1486-1494, Sept. 1998.
+*> <a href="https://doi.org/10.1137/S1064827595296732">https://doi.org/10.1137/S1064827595296732</a>
+*>
+*> [2] A partial column norm updating strategy developed in 2006.
+*> Z. Drmac and Z. Bujanovic, Dept. of Math., University of Zagreb, Croatia.
+*> On the failure of rank revealing QR factorization software – a case study.
+*> LAPACK Working Note 176.
+*> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">http://www.netlib.org/lapack/lawnspdf/lawn176.pdf</a>
+*> and in
+*> ACM Trans. Math. Softw. 35, 2, Article 12 (July 2008), 28 pages.
+*> <a href="https://doi.org/10.1145/1377612.1377616">https://doi.org/10.1145/1377612.1377616</a>
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
+*>
+*>  November  2023, Igor Kozachenko, James Demmel,
+*>                  EECS Department,
+*>                  University of California, Berkeley, USA.
+*>
+*> \endverbatim
+*
+*  =====================================================================
+      SUBROUTINE SGEQP3RK( M, N, NRHS, KMAX, ABSTOL, RELTOL, A, LDA,
+     $                     K, MAXC2NRMK, RELMAXC2NRMK, JPIV, TAU,
+     $                     WORK, LWORK, IWORK, INFO )
+      IMPLICIT NONE
+*
+*  -- LAPACK computational routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            INFO, K, KF, KMAX, LDA, LWORK, M, N, NRHS
+      REAL               ABSTOL,  MAXC2NRMK, RELMAXC2NRMK, RELTOL
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IWORK( * ), JPIV( * )
+      REAL               A( LDA, * ), TAU( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      INTEGER            INB, INBMIN, IXOVER
+      PARAMETER          ( INB = 1, INBMIN = 2, IXOVER = 3 )
+      REAL               ZERO, ONE, TWO
+      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0, TWO = 2.0E+0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY, DONE
+      INTEGER            IINFO, IOFFSET, IWS, J, JB, JBF, JMAXB, JMAX,
+     $                   JMAXC2NRM, KP1, LWKOPT, MINMN, N_SUB, NB,
+     $                   NBMIN, NX
+      REAL               EPS, HUGEVAL, MAXC2NRM, SAFMIN
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           SLAQP2RK, SLAQP3RK, XERBLA
+*     ..
+*     .. External Functions ..
+      LOGICAL            SISNAN
+      INTEGER            ISAMAX, ILAENV
+      REAL               SLAMCH, SNRM2, SROUNDUP_LWORK
+      EXTERNAL           SISNAN, SLAMCH, SNRM2, ISAMAX, ILAENV,
+     $                   SROUNDUP_LWORK
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          REAL, MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Test input arguments
+*     ====================
+*
+      INFO = 0
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( KMAX.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( SISNAN( ABSTOL ) ) THEN
+         INFO = -5
+      ELSE IF( SISNAN( RELTOL ) ) THEN
+         INFO = -6
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -8
+      END IF
+*
+*     If the input parameters M, N, NRHS, KMAX, LDA are valid:
+*       a) Test the input workspace size LWORK for the minimum
+*          size requirement IWS.
+*       b) Determine the optimal block size NB and optimal
+*          workspace size LWKOPT to be returned in WORK(1)
+*          in case of (1) LWORK < IWS, (2) LQUERY = .TRUE.,
+*          (3) when routine exits.
+*     Here, IWS is the miminum workspace required for unblocked
+*     code.
+*
+      IF( INFO.EQ.0 ) THEN
+         MINMN = MIN( M, N )
+         IF( MINMN.EQ.0 ) THEN
+            IWS = 1
+            LWKOPT = 1
+         ELSE
+*
+*           Minimal workspace size in case of using only unblocked
+*           BLAS 2 code in SLAQP2RK.
+*           1) SGEQP3RK and SLAQP2RK: 2*N to store full and partial
+*              column 2-norms.
+*           2) SLAQP2RK: N+NRHS-1 to use in WORK array that is used
+*              in SLARF1F subroutine inside SLAQP2RK to apply an
+*              elementary reflector from the left.
+*           TOTAL_WORK_SIZE = 3*N + NRHS - 1
+*
+            IWS = 3*N + NRHS - 1
+*
+*           Assign to NB optimal block size.
+*
+            NB = ILAENV( INB, 'SGEQP3RK', ' ', M, N, -1, -1 )
+*
+*           A formula for the optimal workspace size in case of using
+*           both unblocked BLAS 2 in SLAQP2RK and blocked BLAS 3 code
+*           in SLAQP3RK.
+*           1) SGEQP3RK, SLAQP2RK, SLAQP3RK: 2*N to store full and
+*              partial column 2-norms.
+*           2) SLAQP2RK: N+NRHS-1 to use in WORK array that is used
+*              in SLARF1F subroutine to apply an elementary reflector
+*              from the left.
+*           3) SLAQP3RK: NB*(N+NRHS) to use in the work array F that
+*              is used to apply a block reflector from
+*              the left.
+*           4) SLAQP3RK: NB to use in the auxilixary array AUX.
+*           Sizes (2) and ((3) + (4)) should intersect, therefore
+*           TOTAL_WORK_SIZE = 2*N + NB*( N+NRHS+1 ), given NBMIN=2.
+*
+            LWKOPT = 2*N + NB*( N+NRHS+1 )
+         END IF
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+*
+         IF( ( LWORK.LT.IWS ) .AND. .NOT.LQUERY ) THEN
+            INFO = -15
+         END IF
+      END IF
+*
+*      NOTE: The optimal workspace size is returned in WORK(1), if
+*            the input parameters M, N, NRHS, KMAX, LDA are valid.
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'SGEQP3RK', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible for M=0 or N=0.
+*
+      IF( MINMN.EQ.0 ) THEN
+         K = 0
+         MAXC2NRMK = ZERO
+         RELMAXC2NRMK = ZERO
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+         RETURN
+      END IF
+*
+*     ==================================================================
+*
+*     Initialize column pivot array JPIV.
+*
+      DO J = 1, N
+         JPIV( J ) = J
+      END DO
+*
+*     ==================================================================
+*
+*     Initialize storage for partial and exact column 2-norms.
+*     a) The elements WORK(1:N) are used to store partial column
+*        2-norms of the matrix A, and may decrease in each computation
+*        step; initialize to the values of complete columns 2-norms.
+*     b) The elements WORK(N+1:2*N) are used to store complete column
+*        2-norms of the matrix A, they are not changed during the
+*        computation; initialize the values of complete columns 2-norms.
+*
+      DO J = 1, N
+         WORK( J ) = SNRM2( M, A( 1, J ), 1 )
+         WORK( N+J ) = WORK( J )
+      END DO
+*
+*     ==================================================================
+*
+*     Compute the pivot column index and the maximum column 2-norm
+*     for the whole original matrix stored in A(1:M,1:N).
+*
+      KP1 = ISAMAX( N, WORK( 1 ), 1 )
+      MAXC2NRM = WORK( KP1 )
+*
+*     ==================================================================.
+*
+      IF( SISNAN( MAXC2NRM ) ) THEN
+*
+*        Check if the matrix A contains NaN, set INFO parameter
+*        to the column number where the first NaN is found and return
+*        from the routine.
+*
+         K = 0
+         INFO = KP1
+*
+*        Set MAXC2NRMK and  RELMAXC2NRMK to NaN.
+*
+         MAXC2NRMK = MAXC2NRM
+         RELMAXC2NRMK = MAXC2NRM
+*
+*        Array TAU is not set and contains undefined elements.
+*
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+         RETURN
+      END IF
+*
+*     ===================================================================
+*
+      IF( MAXC2NRM.EQ.ZERO ) THEN
+*
+*        Check is the matrix A is a zero matrix, set array TAU and
+*        return from the routine.
+*
+         K = 0
+         MAXC2NRMK = ZERO
+         RELMAXC2NRMK = ZERO
+*
+         DO J = 1, MINMN
+            TAU( J ) = ZERO
+         END DO
+*
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+         RETURN
+*
+      END IF
+*
+*     ===================================================================
+*
+      HUGEVAL = SLAMCH( 'Overflow' )
+*
+      IF( MAXC2NRM.GT.HUGEVAL ) THEN
+*
+*        Check if the matrix A contains +Inf or -Inf, set INFO parameter
+*        to the column number, where the first +/-Inf  is found plus N,
+*        and continue the computation.
+*
+         INFO = N + KP1
+*
+      END IF
+*
+*     ==================================================================
+*
+*     Quick return if possible for the case when the first
+*     stopping criterion is satisfied, i.e. KMAX = 0.
+*
+      IF( KMAX.EQ.0 ) THEN
+         K = 0
+         MAXC2NRMK = MAXC2NRM
+         RELMAXC2NRMK = ONE
+         DO J = 1, MINMN
+            TAU( J ) = ZERO
+         END DO
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+         RETURN
+      END IF
+*
+*     ==================================================================
+*
+      EPS = SLAMCH('Epsilon')
+*
+*     Adjust ABSTOL
+*
+      IF( ABSTOL.GE.ZERO ) THEN
+         SAFMIN = SLAMCH('Safe minimum')
+         ABSTOL = MAX( ABSTOL, TWO*SAFMIN )
+      END IF
+*
+*     Adjust RELTOL
+*
+      IF( RELTOL.GE.ZERO ) THEN
+         RELTOL = MAX( RELTOL, EPS )
+      END IF
+*
+*     ===================================================================
+*
+*     JMAX is the maximum index of the column to be factorized,
+*     which is also limited by the first stopping criterion KMAX.
+*
+      JMAX = MIN( KMAX, MINMN )
+*
+*     ===================================================================
+*
+*     Quick return if possible for the case when the second or third
+*     stopping criterion for the whole original matrix is satified,
+*     i.e. MAXC2NRM <= ABSTOL or RELMAXC2NRM <= RELTOL
+*     (which is ONE <= RELTOL).
+*
+      IF( MAXC2NRM.LE.ABSTOL .OR. ONE.LE.RELTOL ) THEN
+*
+         K = 0
+         MAXC2NRMK = MAXC2NRM
+         RELMAXC2NRMK = ONE
+*
+         DO J = 1, MINMN
+            TAU( J ) = ZERO
+         END DO
+*
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+         RETURN
+      END IF
+*
+*     ==================================================================
+*     Factorize columns
+*     ==================================================================
+*
+*     Determine the block size.
+*
+      NBMIN = 2
+      NX = 0
+*
+      IF( ( NB.GT.1 ) .AND. ( NB.LT.MINMN ) ) THEN
+*
+*        Determine when to cross over from blocked to unblocked code.
+*        (for N less than NX, unblocked code should be used).
+*
+         NX = MAX( 0, ILAENV( IXOVER, 'SGEQP3RK', ' ', M, N, -1,
+     $                        -1 ))
+*
+         IF( NX.LT.MINMN ) THEN
+*
+*           Determine if workspace is large enough for blocked code.
+*
+            IF( LWORK.LT.LWKOPT ) THEN
+*
+*              Not enough workspace to use optimal block size that
+*              is currently stored in NB.
+*              Reduce NB and determine the minimum value of NB.
+*
+               NB = ( LWORK-2*N ) / ( N+1 )
+               NBMIN = MAX( 2, ILAENV( INBMIN, 'SGEQP3RK', ' ', M, N,
+     $                 -1, -1 ) )
+*
+            END IF
+         END IF
+      END IF
+*
+*     ==================================================================
+*
+*     DONE is the boolean flag to rerpresent the case when the
+*     factorization completed in the block factorization routine,
+*     before the end of the block.
+*
+      DONE = .FALSE.
+*
+*     J is the column index.
+*
+      J = 1
+*
+*     (1) Use blocked code initially.
+*
+*     JMAXB is the maximum column index of the block, when the
+*     blocked code is used, is also limited by the first stopping
+*     criterion KMAX.
+*
+      JMAXB = MIN( KMAX, MINMN - NX )
+*
+      IF( NB.GE.NBMIN .AND. NB.LT.JMAX .AND. JMAXB.GT.0 ) THEN
+*
+*        Loop over the column blocks of the matrix A(1:M,1:JMAXB). Here:
+*        J   is the column index of a column block;
+*        JB  is the column block size to pass to block factorization
+*            routine in a loop step;
+*        JBF is the number of columns that were actually factorized
+*            that was returned by the block factorization routine
+*            in a loop step, JBF <= JB;
+*        N_SUB is the number of columns in the submatrix;
+*        IOFFSET is the number of rows that should not be factorized.
+*
+         DO WHILE( J.LE.JMAXB )
+*
+            JB = MIN( NB, JMAXB-J+1 )
+            N_SUB = N-J+1
+            IOFFSET = J-1
+*
+*           Factorize JB columns among the columns A(J:N).
+*
+            CALL SLAQP3RK( M, N_SUB, NRHS, IOFFSET, JB, ABSTOL,
+     $                     RELTOL, KP1, MAXC2NRM, A( 1, J ), LDA,
+     $                     DONE, JBF, MAXC2NRMK, RELMAXC2NRMK,
+     $                     JPIV( J ), TAU( J ),
+     $                     WORK( J ), WORK( N+J ),
+     $                     WORK( 2*N+1 ), WORK( 2*N+JB+1 ),
+     $                     N+NRHS-J+1, IWORK, IINFO )
+*
+*           Set INFO on the first occurence of Inf.
+*
+            IF( IINFO.GT.N_SUB .AND. INFO.EQ.0 ) THEN
+               INFO = 2*IOFFSET + IINFO
+            END IF
+*
+            IF( DONE ) THEN
+*
+*              Either the submatrix is zero before the end of the
+*              column block, or ABSTOL or RELTOL criterion is
+*              satisfied before the end of the column block, we can
+*              return from the routine. Perform the following before
+*              returning:
+*                a) Set the number of factorized columns K,
+*                   K = IOFFSET + JBF from the last call of blocked
+*                   routine.
+*                NOTE: 1) MAXC2NRMK and RELMAXC2NRMK are returned
+*                         by the block factorization routine;
+*                      2) The remaining TAUs are set to ZERO by the
+*                         block factorization routine.
+*
+               K = IOFFSET + JBF
+*
+*              Set INFO on the first occurrence of NaN, NaN takes
+*              prcedence over Inf.
+*
+               IF( IINFO.LE.N_SUB .AND. IINFO.GT.0 ) THEN
+                  INFO = IOFFSET + IINFO
+               END IF
+*
+*              Return from the routine.
+*
+               WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+*
+               RETURN
+*
+            END IF
+*
+            J = J + JBF
+*
+         END DO
+*
+      END IF
+*
+*     Use unblocked code to factor the last or only block.
+*     J = JMAX+1 means we factorized the maximum possible number of
+*     columns, that is in ELSE clause we need to compute
+*     the MAXC2NORM and RELMAXC2NORM to return after we processed
+*     the blocks.
+*
+      IF( J.LE.JMAX ) THEN
+*
+*        N_SUB is the number of columns in the submatrix;
+*        IOFFSET is the number of rows that should not be factorized.
+*
+         N_SUB = N-J+1
+         IOFFSET = J-1
+*
+         CALL SLAQP2RK( M, N_SUB, NRHS, IOFFSET, JMAX-J+1,
+     $                  ABSTOL, RELTOL, KP1, MAXC2NRM, A( 1, J ), LDA,
+     $                  KF, MAXC2NRMK, RELMAXC2NRMK, JPIV( J ),
+     $                  TAU( J ), WORK( J ), WORK( N+J ),
+     $                  WORK( 2*N+1 ), IINFO )
+*
+*        ABSTOL or RELTOL criterion is satisfied when the number of
+*        the factorized columns KF is smaller then the  number
+*        of columns JMAX-J+1 supplied to be factorized by the
+*        unblocked routine, we can return from
+*        the routine. Perform the following before returning:
+*           a) Set the number of factorized columns K,
+*           b) MAXC2NRMK and RELMAXC2NRMK are returned by the
+*              unblocked factorization routine above.
+*
+         K = J - 1 + KF
+*
+*        Set INFO on the first exception occurence.
+*
+*        Set INFO on the first exception occurence of Inf or NaN,
+*        (NaN takes precedence over Inf).
+*
+         IF( IINFO.GT.N_SUB .AND. INFO.EQ.0 ) THEN
+            INFO = 2*IOFFSET + IINFO
+         ELSE IF( IINFO.LE.N_SUB .AND. IINFO.GT.0 ) THEN
+            INFO = IOFFSET + IINFO
+         END IF
+*
+      ELSE
+*
+*        Compute the return values for blocked code.
+*
+*        Set the number of factorized columns if the unblocked routine
+*        was not called.
+*
+            K = JMAX
+*
+*        If there exits a residual matrix after the blocked code:
+*           1) compute the values of MAXC2NRMK, RELMAXC2NRMK of the
+*              residual matrix, otherwise set them to ZERO;
+*           2) Set TAU(K+1:MINMN) to ZERO.
+*
+         IF( K.LT.MINMN ) THEN
+            JMAXC2NRM = K + ISAMAX( N-K, WORK( K+1 ), 1 )
+            MAXC2NRMK = WORK( JMAXC2NRM )
+            IF( K.EQ.0 ) THEN
+               RELMAXC2NRMK = ONE
+            ELSE
+               RELMAXC2NRMK = MAXC2NRMK / MAXC2NRM
+            END IF
+*
+            DO J = K + 1, MINMN
+               TAU( J ) = ZERO
+            END DO
+*
+         END IF
+*
+*     END IF( J.LE.JMAX ) THEN
+*
+      END IF
+*
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+*
+      RETURN
+*
+*     End of SGEQP3RK
+*
+      END
diff --git a/SRC/sgeqr.f b/SRC/sgeqr.f
index 6f41a92ead..b4403b6790 100644
--- a/SRC/sgeqr.f
+++ b/SRC/sgeqr.f
@@ -99,7 +99,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1 or -2, then a workspace query is assumed. The routine
 *>          only calculates the sizes of the T and WORK arrays, returns these
 *>          values as the first entries of the T and WORK arrays, and no error
@@ -168,9 +168,12 @@
 *>
 *> \endverbatim
 *>
+*> \ingroup geqr
+*>
 *  =====================================================================
       SUBROUTINE SGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,11 +191,13 @@ SUBROUTINE SGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, LMINWS, MINT, MINW
-      INTEGER            MB, NB, MINTSZ, NBLCKS
+      INTEGER            MB, NB, MINTSZ, NBLCKS, LWMIN, LWREQ
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SLATSQR, SGEQRT, XERBLA
@@ -244,8 +249,10 @@ SUBROUTINE SGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
 *
 *     Determine if the workspace size satisfies minimal size
 *
+      LWMIN = MAX( 1, N )
+      LWREQ = MAX( 1, N*NB )
       LMINWS = .FALSE.
-      IF( ( TSIZE.LT.MAX( 1, NB*N*NBLCKS + 5 ) .OR. LWORK.LT.NB*N )
+      IF( ( TSIZE.LT.MAX( 1, NB*N*NBLCKS + 5 ) .OR. LWORK.LT.LWREQ )
      $    .AND. ( LWORK.GE.N ) .AND. ( TSIZE.GE.MINTSZ )
      $    .AND. ( .NOT.LQUERY ) ) THEN
         IF( TSIZE.LT.MAX( 1, NB*N*NBLCKS + 5 ) ) THEN
@@ -253,7 +260,7 @@ SUBROUTINE SGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
           NB = 1
           MB = M
         END IF
-        IF( LWORK.LT.NB*N ) THEN
+        IF( LWORK.LT.LWREQ ) THEN
           LMINWS = .TRUE.
           NB = 1
         END IF
@@ -268,23 +275,23 @@ SUBROUTINE SGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
       ELSE IF( TSIZE.LT.MAX( 1, NB*N*NBLCKS + 5 )
      $   .AND. ( .NOT.LQUERY ) .AND. ( .NOT.LMINWS ) ) THEN
         INFO = -6
-      ELSE IF( ( LWORK.LT.MAX( 1, N*NB ) ) .AND. ( .NOT.LQUERY )
+      ELSE IF( ( LWORK.LT.LWREQ ) .AND. ( .NOT.LQUERY )
      $   .AND. ( .NOT.LMINWS ) ) THEN
         INFO = -8
       END IF
 *
       IF( INFO.EQ.0 ) THEN
         IF( MINT ) THEN
-          T( 1 ) = MINTSZ
+          T( 1 ) = REAL( MINTSZ )
         ELSE
-          T( 1 ) = NB*N*NBLCKS + 5
+          T( 1 ) = REAL( NB*N*NBLCKS + 5 )
         END IF
-        T( 2 ) = MB
-        T( 3 ) = NB
+        T( 2 ) = REAL( MB )
+        T( 3 ) = REAL( NB )
         IF( MINW ) THEN
-          WORK( 1 ) = MAX( 1, N )
+          WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
         ELSE
-          WORK( 1 ) = MAX( 1, NB*N )
+          WORK( 1 ) = SROUNDUP_LWORK( LWREQ )
         END IF
       END IF
       IF( INFO.NE.0 ) THEN
@@ -309,7 +316,7 @@ SUBROUTINE SGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
      $                LWORK, INFO )
       END IF
 *
-      WORK( 1 ) = MAX( 1, NB*N )
+      WORK( 1 ) = SROUNDUP_LWORK( LWREQ )
 *
       RETURN
 *
diff --git a/SRC/sgeqr2.f b/SRC/sgeqr2.f
index 5eef521f27..0a9c3936df 100644
--- a/SRC/sgeqr2.f
+++ b/SRC/sgeqr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEQR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgeqr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgeqr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -105,7 +103,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup geqr2
 *
 *> \par Further Details:
 *  =====================
@@ -127,6 +125,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGEQR2( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -141,16 +140,11 @@ SUBROUTINE SGEQR2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      REAL               ONE
-      PARAMETER          ( ONE = 1.0E+0 )
-*     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      REAL               AII
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, SLARFG, XERBLA
+      EXTERNAL           SLARF1F, SLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -184,11 +178,8 @@ SUBROUTINE SGEQR2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *           Apply H(i) to A(i:m,i+1:n) from the left
 *
-            AII = A( I, I )
-            A( I, I ) = ONE
-            CALL SLARF( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
-     $                  A( I, I+1 ), LDA, WORK )
-            A( I, I ) = AII
+            CALL SLARF1F( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
+     $                    A( I, I+1 ), LDA, WORK )
          END IF
    10 CONTINUE
       RETURN
diff --git a/SRC/sgeqr2p.f b/SRC/sgeqr2p.f
index 0d270e9aa8..1e8c1f3e43 100644
--- a/SRC/sgeqr2p.f
+++ b/SRC/sgeqr2p.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEQR2P + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgeqr2p.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgeqr2p.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup geqr2p
 *
 *> \par Further Details:
 *  =====================
@@ -131,6 +129,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGEQR2P( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -145,16 +144,11 @@ SUBROUTINE SGEQR2P( M, N, A, LDA, TAU, WORK, INFO )
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      REAL               ONE
-      PARAMETER          ( ONE = 1.0E+0 )
-*     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      REAL               AII
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, SLARFGP, XERBLA
+      EXTERNAL           SLARF1F, SLARFGP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -188,11 +182,8 @@ SUBROUTINE SGEQR2P( M, N, A, LDA, TAU, WORK, INFO )
 *
 *           Apply H(i) to A(i:m,i+1:n) from the left
 *
-            AII = A( I, I )
-            A( I, I ) = ONE
-            CALL SLARF( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
-     $                  A( I, I+1 ), LDA, WORK )
-            A( I, I ) = AII
+            CALL SLARF1F( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
+     $                    A( I, I+1 ), LDA, WORK )
          END IF
    10 CONTINUE
       RETURN
diff --git a/SRC/sgeqrf.f b/SRC/sgeqrf.f
index 0fc5ba11a9..06a90db66e 100644
--- a/SRC/sgeqrf.f
+++ b/SRC/sgeqrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEQRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgeqrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgeqrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,7 +93,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,N).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= N, otherwise.
 *>          For optimum performance LWORK >= N*NB, where NB is
 *>          the optimal blocksize.
 *>
@@ -120,7 +119,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup geqrf
 *
 *> \par Further Details:
 *  =====================
@@ -142,6 +141,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -169,16 +169,16 @@ SUBROUTINE SGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input arguments
 *
+      K = MIN( M, N )
       INFO = 0
       NB = ILAENV( 1, 'SGEQRF', ' ', M, N, -1, -1 )
-      LWKOPT = N*NB
-      WORK( 1 ) = LWKOPT
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -186,19 +186,25 @@ SUBROUTINE SGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
-         INFO = -7
+      ELSE IF( .NOT.LQUERY ) THEN
+         IF( LWORK.LE.0 .OR. ( M.GT.0 .AND. LWORK.LT.MAX( 1, N ) ) )
+     $      INFO = -7
       END IF
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'SGEQRF', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
+         IF( K.EQ.0 ) THEN
+            LWKOPT = 1
+         ELSE
+            LWKOPT = N*NB
+         END IF
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
          RETURN
       END IF
 *
 *     Quick return if possible
-*
-      K = MIN( M, N )
+*     
       IF( K.EQ.0 ) THEN
          WORK( 1 ) = 1
          RETURN
@@ -268,7 +274,7 @@ SUBROUTINE SGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
      $   CALL SGEQR2( M-I+1, N-I+1, A( I, I ), LDA, TAU( I ), WORK,
      $                IINFO )
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK(IWS)
       RETURN
 *
 *     End of SGEQRF
diff --git a/SRC/sgeqrfp.f b/SRC/sgeqrfp.f
index 03d33654ba..db7a65465f 100644
--- a/SRC/sgeqrfp.f
+++ b/SRC/sgeqrfp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEQRFP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgeqrfp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgeqrfp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,7 +95,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,N).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= N, otherwise.
 *>          For optimum performance LWORK >= N*NB, where NB is
 *>          the optimal blocksize.
 *>
@@ -122,7 +121,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup geqrfp
 *
 *> \par Further Details:
 *  =====================
@@ -146,6 +145,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -162,8 +162,8 @@ SUBROUTINE SGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *     .. Local Scalars ..
       LOGICAL            LQUERY
-      INTEGER            I, IB, IINFO, IWS, K, LDWORK, LWKOPT, NB,
-     $                   NBMIN, NX
+      INTEGER            I, IB, IINFO, IWS, K, LDWORK, LWKMIN, LWKOPT,
+     $                   NB, NBMIN, NX
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SGEQR2P, SLARFB, SLARFT, XERBLA
@@ -174,6 +174,8 @@ SUBROUTINE SGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     .. External Functions ..
       INTEGER            ILAENV
       EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -181,8 +183,16 @@ SUBROUTINE SGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
       INFO = 0
       NB = ILAENV( 1, 'SGEQRF', ' ', M, N, -1, -1 )
-      LWKOPT = N*NB
-      WORK( 1 ) = LWKOPT
+      K = MIN( M, N )
+      IF( K.EQ.0 ) THEN
+         LWKMIN = 1
+         LWKOPT = 1
+      ELSE
+         LWKMIN = N
+         LWKOPT = N*NB
+      END IF
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+*
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -190,7 +200,7 @@ SUBROUTINE SGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -7
       END IF
       IF( INFO.NE.0 ) THEN
@@ -210,7 +220,7 @@ SUBROUTINE SGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
       NBMIN = 2
       NX = 0
-      IWS = N
+      IWS = LWKMIN
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
 *
 *        Determine when to cross over from blocked to unblocked code.
@@ -272,7 +282,7 @@ SUBROUTINE SGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
      $   CALL SGEQR2P( M-I+1, N-I+1, A( I, I ), LDA, TAU( I ), WORK,
      $                IINFO )
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK( IWS )
       RETURN
 *
 *     End of SGEQRFP
diff --git a/SRC/sgeqrt.f b/SRC/sgeqrt.f
index 926e4a6541..6994376fc0 100644
--- a/SRC/sgeqrt.f
+++ b/SRC/sgeqrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEQRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgeqrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgeqrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,7 +106,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup geqrt
 *
 *> \par Further Details:
 *  =====================
@@ -138,6 +136,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGEQRT( M, N, NB, A, LDA, T, LDT, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -195,9 +194,11 @@ SUBROUTINE SGEQRT( M, N, NB, A, LDA, T, LDT, WORK, INFO )
 *     Compute the QR factorization of the current block A(I:M,I:I+IB-1)
 *
          IF( USE_RECURSIVE_QR ) THEN
-            CALL SGEQRT3( M-I+1, IB, A(I,I), LDA, T(1,I), LDT, IINFO )
+            CALL SGEQRT3( M-I+1, IB, A(I,I), LDA, T(1,I), LDT,
+     $                    IINFO )
          ELSE
-            CALL SGEQRT2( M-I+1, IB, A(I,I), LDA, T(1,I), LDT, IINFO )
+            CALL SGEQRT2( M-I+1, IB, A(I,I), LDA, T(1,I), LDT,
+     $                    IINFO )
          END IF
          IF( I+IB.LE.N ) THEN
 *
diff --git a/SRC/sgeqrt2.f b/SRC/sgeqrt2.f
index 982d67be85..ef6e66383b 100644
--- a/SRC/sgeqrt2.f
+++ b/SRC/sgeqrt2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEQRT2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgeqrt2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgeqrt2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,7 +95,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup geqrt2
 *
 *> \par Further Details:
 *  =====================
@@ -124,6 +122,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGEQRT2( M, N, A, LDA, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -154,10 +153,10 @@ SUBROUTINE SGEQRT2( M, N, A, LDA, T, LDT, INFO )
 *     Test the input arguments
 *
       INFO = 0
-      IF( M.LT.0 ) THEN
-         INFO = -1
-      ELSE IF( N.LT.0 ) THEN
+      IF( N.LT.0 ) THEN
          INFO = -2
+      ELSE IF( M.LT.N ) THEN
+         INFO = -1
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
       ELSE IF( LDT.LT.MAX( 1, N ) ) THEN
diff --git a/SRC/sgeqrt3.f b/SRC/sgeqrt3.f
index 301bad2148..ee60e3db01 100644
--- a/SRC/sgeqrt3.f
+++ b/SRC/sgeqrt3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGEQRT3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgeqrt3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgeqrt3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -100,7 +98,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup geqrt3
 *
 *> \par Further Details:
 *  =====================
@@ -129,6 +127,7 @@
 *>
 *  =====================================================================
       RECURSIVE SUBROUTINE SGEQRT3( M, N, A, LDA, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sgerfs.f b/SRC/sgerfs.f
index c31ea1bd64..22bc6c2703 100644
--- a/SRC/sgerfs.f
+++ b/SRC/sgerfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGERFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgerfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgerfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -177,11 +175,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup gerfs
 *
 *  =====================================================================
-      SUBROUTINE SGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
+      SUBROUTINE SGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
+     $                   LDB,
      $                   X, LDX, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -221,7 +221,8 @@ SUBROUTINE SGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SGEMV, SGETRS, SLACN2, XERBLA
+      EXTERNAL           SAXPY, SCOPY, SGEMV, SGETRS, SLACN2,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -279,7 +280,7 @@ SUBROUTINE SGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
       NZ = N + 1
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -384,22 +385,25 @@ SUBROUTINE SGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
 *
          DO 90 I = 1, N
             IF( WORK( I ).GT.SAFE2 ) THEN
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I )
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
             ELSE
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I ) + SAFE1
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
+     $                     + SAFE1
             END IF
    90    CONTINUE
 *
          KASE = 0
   100    CONTINUE
-         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
 *
 *              Multiply by diag(W)*inv(op(A)**T).
 *
-               CALL SGETRS( TRANST, N, 1, AF, LDAF, IPIV, WORK( N+1 ),
+               CALL SGETRS( TRANST, N, 1, AF, LDAF, IPIV,
+     $                      WORK( N+1 ),
      $                      N, INFO )
                DO 110 I = 1, N
                   WORK( N+I ) = WORK( I )*WORK( N+I )
@@ -411,7 +415,8 @@ SUBROUTINE SGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
                DO 120 I = 1, N
                   WORK( N+I ) = WORK( I )*WORK( N+I )
   120          CONTINUE
-               CALL SGETRS( TRANS, N, 1, AF, LDAF, IPIV, WORK( N+1 ), N,
+               CALL SGETRS( TRANS, N, 1, AF, LDAF, IPIV, WORK( N+1 ),
+     $                      N,
      $                      INFO )
             END IF
             GO TO 100
diff --git a/SRC/sgerfsx.f b/SRC/sgerfsx.f
index b5d044872a..c8d518cc74 100644
--- a/SRC/sgerfsx.f
+++ b/SRC/sgerfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGERFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgerfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgerfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -404,13 +402,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup gerfsx
 *
 *  =====================================================================
-      SUBROUTINE SGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE SGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    R, C, B, LDB, X, LDX, RCOND, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -606,7 +606,8 @@ SUBROUTINE SGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
          NORM = '1'
       END IF
       ANORM = SLANGE( NORM, N, N, A, LDA, WORK )
-      CALL SGECON( NORM, N, AF, LDAF, ANORM, RCOND, WORK, IWORK, INFO )
+      CALL SGECON( NORM, N, AF, LDAF, ANORM, RCOND, WORK, IWORK,
+     $             INFO )
 *
 *     Perform refinement on each right-hand side
 *
@@ -637,13 +638,16 @@ SUBROUTINE SGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *     Compute scaled normwise condition number cond(A*C).
 *
          IF ( COLEQU .AND. NOTRAN ) THEN
-            RCOND_TMP = SLA_GERCOND( TRANS, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = SLA_GERCOND( TRANS, N, A, LDA, AF, LDAF,
+     $                               IPIV,
      $           -1, C, INFO, WORK, IWORK )
          ELSE IF ( ROWEQU .AND. .NOT. NOTRAN ) THEN
-            RCOND_TMP = SLA_GERCOND( TRANS, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = SLA_GERCOND( TRANS, N, A, LDA, AF, LDAF,
+     $                               IPIV,
      $           -1, R, INFO, WORK, IWORK )
          ELSE
-            RCOND_TMP = SLA_GERCOND( TRANS, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = SLA_GERCOND( TRANS, N, A, LDA, AF, LDAF,
+     $                               IPIV,
      $           0, R, INFO, WORK, IWORK )
          END IF
          DO J = 1, NRHS
diff --git a/SRC/sgerq2.f b/SRC/sgerq2.f
index d86905c033..14c8cf0517 100644
--- a/SRC/sgerq2.f
+++ b/SRC/sgerq2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGERQ2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgerq2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgerq2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,7 +96,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup gerq2
 *
 *> \par Further Details:
 *  =====================
@@ -120,6 +118,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGERQ2( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -134,16 +133,11 @@ SUBROUTINE SGERQ2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      REAL               ONE
-      PARAMETER          ( ONE = 1.0E+0 )
-*     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      REAL               AII
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, SLARFG, XERBLA
+      EXTERNAL           SLARF1L, SLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -177,11 +171,8 @@ SUBROUTINE SGERQ2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *        Apply H(i) to A(1:m-k+i-1,1:n-k+i) from the right
 *
-         AII = A( M-K+I, N-K+I )
-         A( M-K+I, N-K+I ) = ONE
-         CALL SLARF( 'Right', M-K+I-1, N-K+I, A( M-K+I, 1 ), LDA,
-     $               TAU( I ), A, LDA, WORK )
-         A( M-K+I, N-K+I ) = AII
+         CALL SLARF1L( 'Right', M-K+I-1, N-K+I, A( M-K+I, 1 ), LDA,
+     $                 TAU( I ), A, LDA, WORK )
    10 CONTINUE
       RETURN
 *
diff --git a/SRC/sgerqf.f b/SRC/sgerqf.f
index 24ff42b4c5..4cedce8c2b 100644
--- a/SRC/sgerqf.f
+++ b/SRC/sgerqf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGERQF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgerqf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgerqf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,7 +86,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,M).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= M, otherwise.
 *>          For optimum performance LWORK >= M*NB, where NB is
 *>          the optimal blocksize.
 *>
@@ -113,7 +112,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup gerqf
 *
 *> \par Further Details:
 *  =====================
@@ -135,6 +134,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SGERQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -162,7 +162,8 @@ SUBROUTINE SGERQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -176,8 +177,6 @@ SUBROUTINE SGERQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, M ) .AND. .NOT.LQUERY ) THEN
-         INFO = -7
       END IF
 *
       IF( INFO.EQ.0 ) THEN
@@ -187,12 +186,12 @@ SUBROUTINE SGERQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          ELSE
             NB = ILAENV( 1, 'SGERQF', ' ', M, N, -1, -1 )
             LWKOPT = M*NB
-            WORK( 1 ) = LWKOPT
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
-         IF( LWORK.LT.MAX( 1, M ) .AND. .NOT.LQUERY ) THEN
-            INFO = -7
+         IF ( .NOT.LQUERY ) THEN
+            IF( LWORK.LE.0 .OR. ( N.GT.0 .AND. LWORK.LT.MAX( 1, M ) ) )
+     $         INFO = -7
          END IF
       END IF
 *
@@ -249,7 +248,8 @@ SUBROUTINE SGERQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *           Compute the RQ factorization of the current block
 *           A(m-k+i:m-k+i+ib-1,1:n-k+i+ib-1)
 *
-            CALL SGERQ2( IB, N-K+I+IB-1, A( M-K+I, 1 ), LDA, TAU( I ),
+            CALL SGERQ2( IB, N-K+I+IB-1, A( M-K+I, 1 ), LDA,
+     $                   TAU( I ),
      $                   WORK, IINFO )
             IF( M-K+I.GT.1 ) THEN
 *
@@ -279,7 +279,7 @@ SUBROUTINE SGERQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
       IF( MU.GT.0 .AND. NU.GT.0 )
      $   CALL SGERQ2( MU, NU, A, LDA, TAU, WORK, IINFO )
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK(IWS)
       RETURN
 *
 *     End of SGERQF
diff --git a/SRC/sgesc2.f b/SRC/sgesc2.f
index 2de2ed7ccb..050621569a 100644
--- a/SRC/sgesc2.f
+++ b/SRC/sgesc2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGESC2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgesc2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgesc2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,7 +99,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEauxiliary
+*> \ingroup gesc2
 *
 *> \par Contributors:
 *  ==================
@@ -111,6 +109,7 @@
 *
 *  =====================================================================
       SUBROUTINE SGESC2( N, A, LDA, RHS, IPIV, JPIV, SCALE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -136,7 +135,7 @@ SUBROUTINE SGESC2( N, A, LDA, RHS, IPIV, JPIV, SCALE )
       REAL               BIGNUM, EPS, SMLNUM, TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLABAD, SLASWP, SSCAL
+      EXTERNAL           SLASWP, SSCAL
 *     ..
 *     .. External Functions ..
       INTEGER            ISAMAX
@@ -153,7 +152,6 @@ SUBROUTINE SGESC2( N, A, LDA, RHS, IPIV, JPIV, SCALE )
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Apply permutations IPIV to RHS
 *
diff --git a/SRC/sgesdd.f b/SRC/sgesdd.f
index 4f9100d43c..23cc9e63de 100644
--- a/SRC/sgesdd.f
+++ b/SRC/sgesdd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGESDD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgesdd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgesdd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -55,12 +53,6 @@
 *>
 *> Note that the routine returns VT = V**T, not V.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -205,7 +197,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEsing
+*> \ingroup gesdd
 *
 *> \par Contributors:
 *  ==================
@@ -260,7 +252,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
       REAL               DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SBDSDC, SGEBRD, SGELQF, SGEMM, SGEQRF, SLACPY,
+      EXTERNAL           SBDSDC, SGEBRD, SGELQF, SGEMM, SGEQRF,
+     $                   SLACPY,
      $                   SLASCL, SLASET, SORGBR, SORGLQ, SORGQR, SORMBR,
      $                   XERBLA
 *     ..
@@ -314,7 +307,7 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
          MINWRK = 1
          MAXWRK = 1
          BDSPAC = 0
-         MNTHR  = INT( MINMN*11.0E0 / 6.0E0 )
+         MNTHR  = INT( REAL( MINMN )*11.0E0 / 6.0E0 )
          IF( M.GE.N .AND. MINMN.GT.0 ) THEN
 *
 *           Compute space needed for SBDSDC
@@ -343,10 +336,12 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
      $                   IERR )
             LWORK_SORGBR_Q_NN = INT( DUM(1) )
 *
-            CALL SORGQR( M, M, N, DUM(1), M, DUM(1), DUM(1), -1, IERR )
+            CALL SORGQR( M, M, N, DUM(1), M, DUM(1), DUM(1), -1,
+     $                   IERR )
             LWORK_SORGQR_MM = INT( DUM(1) )
 *
-            CALL SORGQR( M, N, N, DUM(1), M, DUM(1), DUM(1), -1, IERR )
+            CALL SORGQR( M, N, N, DUM(1), M, DUM(1), DUM(1), -1,
+     $                   IERR )
             LWORK_SORGQR_MN = INT( DUM(1) )
 *
             CALL SORMBR( 'P', 'R', 'T', N, N, N, DUM(1), N,
@@ -465,13 +460,15 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
             CALL SGELQF( M, N, A, M, DUM(1), DUM(1), -1, IERR )
             LWORK_SGELQF_MN = INT( DUM(1) )
 *
-            CALL SORGLQ( N, N, M, DUM(1), N, DUM(1), DUM(1), -1, IERR )
+            CALL SORGLQ( N, N, M, DUM(1), N, DUM(1), DUM(1), -1,
+     $                   IERR )
             LWORK_SORGLQ_NN = INT( DUM(1) )
 *
             CALL SORGLQ( M, N, M, A, M, DUM(1), DUM(1), -1, IERR )
             LWORK_SORGLQ_MN = INT( DUM(1) )
 *
-            CALL SORGBR( 'P', M, M, M, A, N, DUM(1), DUM(1), -1, IERR )
+            CALL SORGBR( 'P', M, M, M, A, N, DUM(1), DUM(1), -1,
+     $                   IERR )
             LWORK_SORGBR_P_MM = INT( DUM(1) )
 *
             CALL SORMBR( 'P', 'R', 'T', M, M, M, DUM(1), M,
@@ -631,12 +628,14 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   N [tau] + N    [work]
 *              Workspace: prefer N [tau] + N*NB [work]
 *
-               CALL SGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL SGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
 *              Zero out below R
 *
-               CALL SLASET( 'L', N-1, N-1, ZERO, ZERO, A( 2, 1 ), LDA )
+               CALL SLASET( 'L', N-1, N-1, ZERO, ZERO, A( 2, 1 ),
+     $                      LDA )
                IE = 1
                ITAUQ = IE + N
                ITAUP = ITAUQ + N
@@ -646,7 +645,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   3*N [e, tauq, taup] + N      [work]
 *              Workspace: prefer 3*N [e, tauq, taup] + 2*N*NB [work]
 *
-               CALL SGEBRD( N, N, A, LDA, S, WORK( IE ), WORK( ITAUQ ),
+               CALL SGEBRD( N, N, A, LDA, S, WORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
      $                      IERR )
                NWORK = IE + N
@@ -654,7 +654,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Perform bidiagonal SVD, computing singular values only
 *              Workspace: need   N [e] + BDSPAC
 *
-               CALL SBDSDC( 'U', 'N', N, S, WORK( IE ), DUM, 1, DUM, 1,
+               CALL SBDSDC( 'U', 'N', N, S, WORK( IE ), DUM, 1, DUM,
+     $                      1,
      $                      DUM, IDUM, WORK( NWORK ), IWORK, INFO )
 *
             ELSE IF( WNTQO ) THEN
@@ -679,13 +680,15 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   N*N [R] + N [tau] + N    [work]
 *              Workspace: prefer N*N [R] + N [tau] + N*NB [work]
 *
-               CALL SGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL SGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
 *              Copy R to WORK(IR), zeroing out below it
 *
                CALL SLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
-               CALL SLASET( 'L', N - 1, N - 1, ZERO, ZERO, WORK(IR+1),
+               CALL SLASET( 'L', N - 1, N - 1, ZERO, ZERO,
+     $                      WORK(IR+1),
      $                      LDWRKR )
 *
 *              Generate Q in A
@@ -717,7 +720,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              singular vectors of bidiagonal matrix in VT
 *              Workspace: need   N*N [R] + 3*N [e, tauq, taup] + N*N [U] + BDSPAC
 *
-               CALL SBDSDC( 'U', 'I', N, S, WORK( IE ), WORK( IU ), N,
+               CALL SBDSDC( 'U', 'I', N, S, WORK( IE ), WORK( IU ),
+     $                      N,
      $                      VT, LDVT, DUM, IDUM, WORK( NWORK ), IWORK,
      $                      INFO )
 *
@@ -726,10 +730,12 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   N*N [R] + 3*N [e, tauq, taup] + N*N [U] + N    [work]
 *              Workspace: prefer N*N [R] + 3*N [e, tauq, taup] + N*N [U] + N*NB [work]
 *
-               CALL SORMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ), LDWRKR,
+               CALL SORMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ),
+     $                      LDWRKR,
      $                      WORK( ITAUQ ), WORK( IU ), N, WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
-               CALL SORMBR( 'P', 'R', 'T', N, N, N, WORK( IR ), LDWRKR,
+               CALL SORMBR( 'P', 'R', 'T', N, N, N, WORK( IR ),
+     $                      LDWRKR,
      $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
@@ -765,13 +771,15 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   N*N [R] + N [tau] + N    [work]
 *              Workspace: prefer N*N [R] + N [tau] + N*NB [work]
 *
-               CALL SGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL SGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
 *              Copy R to WORK(IR), zeroing out below it
 *
                CALL SLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
-               CALL SLASET( 'L', N - 1, N - 1, ZERO, ZERO, WORK(IR+1),
+               CALL SLASET( 'L', N - 1, N - 1, ZERO, ZERO,
+     $                      WORK(IR+1),
      $                      LDWRKR )
 *
 *              Generate Q in A
@@ -807,11 +815,13 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   N*N [R] + 3*N [e, tauq, taup] + N    [work]
 *              Workspace: prefer N*N [R] + 3*N [e, tauq, taup] + N*NB [work]
 *
-               CALL SORMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ), LDWRKR,
+               CALL SORMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ),
+     $                      LDWRKR,
      $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
-               CALL SORMBR( 'P', 'R', 'T', N, N, N, WORK( IR ), LDWRKR,
+               CALL SORMBR( 'P', 'R', 'T', N, N, N, WORK( IR ),
+     $                      LDWRKR,
      $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
@@ -820,7 +830,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   N*N [R]
 *
                CALL SLACPY( 'F', N, N, U, LDU, WORK( IR ), LDWRKR )
-               CALL SGEMM( 'N', 'N', M, N, N, ONE, A, LDA, WORK( IR ),
+               CALL SGEMM( 'N', 'N', M, N, N, ONE, A, LDA,
+     $                     WORK( IR ),
      $                     LDWRKR, ZERO, U, LDU )
 *
             ELSE IF( WNTQA ) THEN
@@ -841,7 +852,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   N*N [U] + N [tau] + N    [work]
 *              Workspace: prefer N*N [U] + N [tau] + N*NB [work]
 *
-               CALL SGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL SGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
                CALL SLACPY( 'L', M, N, A, LDA, U, LDU )
 *
@@ -853,7 +865,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
 *              Produce R in A, zeroing out other entries
 *
-               CALL SLASET( 'L', N-1, N-1, ZERO, ZERO, A( 2, 1 ), LDA )
+               CALL SLASET( 'L', N-1, N-1, ZERO, ZERO, A( 2, 1 ),
+     $                      LDA )
                IE = ITAU
                ITAUQ = IE + N
                ITAUP = ITAUQ + N
@@ -863,7 +876,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   N*N [U] + 3*N [e, tauq, taup] + N      [work]
 *              Workspace: prefer N*N [U] + 3*N [e, tauq, taup] + 2*N*NB [work]
 *
-               CALL SGEBRD( N, N, A, LDA, S, WORK( IE ), WORK( ITAUQ ),
+               CALL SGEBRD( N, N, A, LDA, S, WORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
      $                      IERR )
 *
@@ -872,7 +886,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              singular vectors of bidiagonal matrix in VT
 *              Workspace: need   N*N [U] + 3*N [e, tauq, taup] + BDSPAC
 *
-               CALL SBDSDC( 'U', 'I', N, S, WORK( IE ), WORK( IU ), N,
+               CALL SBDSDC( 'U', 'I', N, S, WORK( IE ), WORK( IU ),
+     $                      N,
      $                      VT, LDVT, DUM, IDUM, WORK( NWORK ), IWORK,
      $                      INFO )
 *
@@ -892,7 +907,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              WORK(IU), storing result in A
 *              Workspace: need   N*N [U]
 *
-               CALL SGEMM( 'N', 'N', M, N, N, ONE, U, LDU, WORK( IU ),
+               CALL SGEMM( 'N', 'N', M, N, N, ONE, U, LDU,
+     $                     WORK( IU ),
      $                     LDWRKU, ZERO, A, LDA )
 *
 *              Copy left singular vectors of A from A to U
@@ -926,7 +942,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Perform bidiagonal SVD, only computing singular values
 *              Workspace: need   3*N [e, tauq, taup] + BDSPAC
 *
-               CALL SBDSDC( 'U', 'N', N, S, WORK( IE ), DUM, 1, DUM, 1,
+               CALL SBDSDC( 'U', 'N', N, S, WORK( IE ), DUM, 1, DUM,
+     $                      1,
      $                      DUM, IDUM, WORK( NWORK ), IWORK, INFO )
             ELSE IF( WNTQO ) THEN
 *              Path 5o (M >= N, JOBZ='O')
@@ -985,7 +1002,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
 *                 Copy left singular vectors of A from WORK(IU) to A
 *
-                  CALL SLACPY( 'F', M, N, WORK( IU ), LDWRKU, A, LDA )
+                  CALL SLACPY( 'F', M, N, WORK( IU ), LDWRKU, A,
+     $                         LDA )
                ELSE
 *
 *                 Path 5o-slow
@@ -1004,7 +1022,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                   DO 20 I = 1, M, LDWRKR
                      CHUNK = MIN( M - I + 1, LDWRKR )
-                     CALL SGEMM( 'N', 'N', CHUNK, N, N, ONE, A( I, 1 ),
+                     CALL SGEMM( 'N', 'N', CHUNK, N, N, ONE, A( I,
+     $                           1 ),
      $                           LDA, WORK( IU ), LDWRKU, ZERO,
      $                           WORK( IR ), LDWRKR )
                      CALL SLACPY( 'F', CHUNK, N, WORK( IR ), LDWRKR,
@@ -1052,7 +1071,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Set the right corner of U to identity matrix
 *
                IF( M.GT.N ) THEN
-                  CALL SLASET( 'F', M - N, M - N, ZERO, ONE, U(N+1,N+1),
+                  CALL SLASET( 'F', M - N, M - N, ZERO, ONE, U(N+1,
+     $                         N+1),
      $                         LDU )
                END IF
 *
@@ -1091,12 +1111,14 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   M [tau] + M [work]
 *              Workspace: prefer M [tau] + M*NB [work]
 *
-               CALL SGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL SGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
 *              Zero out above L
 *
-               CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ), LDA )
+               CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ),
+     $                      LDA )
                IE = 1
                ITAUQ = IE + M
                ITAUP = ITAUQ + M
@@ -1106,7 +1128,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   3*M [e, tauq, taup] + M      [work]
 *              Workspace: prefer 3*M [e, tauq, taup] + 2*M*NB [work]
 *
-               CALL SGEBRD( M, M, A, LDA, S, WORK( IE ), WORK( ITAUQ ),
+               CALL SGEBRD( M, M, A, LDA, S, WORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
      $                      IERR )
                NWORK = IE + M
@@ -1114,7 +1137,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Perform bidiagonal SVD, computing singular values only
 *              Workspace: need   M [e] + BDSPAC
 *
-               CALL SBDSDC( 'U', 'N', M, S, WORK( IE ), DUM, 1, DUM, 1,
+               CALL SBDSDC( 'U', 'N', M, S, WORK( IE ), DUM, 1, DUM,
+     $                      1,
      $                      DUM, IDUM, WORK( NWORK ), IWORK, INFO )
 *
             ELSE IF( WNTQO ) THEN
@@ -1143,7 +1167,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   M*M [VT] + M*M [L] + M [tau] + M    [work]
 *              Workspace: prefer M*M [VT] + M*M [L] + M [tau] + M*NB [work]
 *
-               CALL SGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL SGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
 *              Copy L to WORK(IL), zeroing about above it
@@ -1185,10 +1210,12 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   M*M [VT] + M*M [L] + 3*M [e, tauq, taup] + M    [work]
 *              Workspace: prefer M*M [VT] + M*M [L] + 3*M [e, tauq, taup] + M*NB [work]
 *
-               CALL SORMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ), LDWRKL,
+               CALL SORMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ),
+     $                      LDWRKL,
      $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
-               CALL SORMBR( 'P', 'R', 'T', M, M, M, WORK( IL ), LDWRKL,
+               CALL SORMBR( 'P', 'R', 'T', M, M, M, WORK( IL ),
+     $                      LDWRKL,
      $                      WORK( ITAUP ), WORK( IVT ), M,
      $                      WORK( NWORK ), LWORK - NWORK + 1, IERR )
 *
@@ -1200,7 +1227,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                DO 30 I = 1, N, CHUNK
                   BLK = MIN( N - I + 1, CHUNK )
-                  CALL SGEMM( 'N', 'N', M, BLK, M, ONE, WORK( IVT ), M,
+                  CALL SGEMM( 'N', 'N', M, BLK, M, ONE, WORK( IVT ),
+     $                        M,
      $                        A( 1, I ), LDA, ZERO, WORK( IL ), LDWRKL )
                   CALL SLACPY( 'F', M, BLK, WORK( IL ), LDWRKL,
      $                         A( 1, I ), LDA )
@@ -1224,7 +1252,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   M*M [L] + M [tau] + M    [work]
 *              Workspace: prefer M*M [L] + M [tau] + M*NB [work]
 *
-               CALL SGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL SGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
 *              Copy L to WORK(IL), zeroing out above it
@@ -1266,10 +1295,12 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   M*M [L] + 3*M [e, tauq, taup] + M    [work]
 *              Workspace: prefer M*M [L] + 3*M [e, tauq, taup] + M*NB [work]
 *
-               CALL SORMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ), LDWRKL,
+               CALL SORMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ),
+     $                      LDWRKL,
      $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
-               CALL SORMBR( 'P', 'R', 'T', M, M, M, WORK( IL ), LDWRKL,
+               CALL SORMBR( 'P', 'R', 'T', M, M, M, WORK( IL ),
+     $                      LDWRKL,
      $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
 *
@@ -1278,7 +1309,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   M*M [L]
 *
                CALL SLACPY( 'F', M, M, VT, LDVT, WORK( IL ), LDWRKL )
-               CALL SGEMM( 'N', 'N', M, N, M, ONE, WORK( IL ), LDWRKL,
+               CALL SGEMM( 'N', 'N', M, N, M, ONE, WORK( IL ),
+     $                     LDWRKL,
      $                     A, LDA, ZERO, VT, LDVT )
 *
             ELSE IF( WNTQA ) THEN
@@ -1299,7 +1331,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   M*M [VT] + M [tau] + M    [work]
 *              Workspace: prefer M*M [VT] + M [tau] + M*NB [work]
 *
-               CALL SGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL SGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK - NWORK + 1, IERR )
                CALL SLACPY( 'U', M, N, A, LDA, VT, LDVT )
 *
@@ -1312,7 +1345,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
 *              Produce L in A, zeroing out other entries
 *
-               CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ), LDA )
+               CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ),
+     $                      LDA )
                IE = ITAU
                ITAUQ = IE + M
                ITAUP = ITAUQ + M
@@ -1322,7 +1356,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Workspace: need   M*M [VT] + 3*M [e, tauq, taup] + M      [work]
 *              Workspace: prefer M*M [VT] + 3*M [e, tauq, taup] + 2*M*NB [work]
 *
-               CALL SGEBRD( M, M, A, LDA, S, WORK( IE ), WORK( ITAUQ ),
+               CALL SGEBRD( M, M, A, LDA, S, WORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
      $                      IERR )
 *
@@ -1351,7 +1386,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Q in VT, storing result in A
 *              Workspace: need   M*M [VT]
 *
-               CALL SGEMM( 'N', 'N', M, N, M, ONE, WORK( IVT ), LDWKVT,
+               CALL SGEMM( 'N', 'N', M, N, M, ONE, WORK( IVT ),
+     $                     LDWKVT,
      $                     VT, LDVT, ZERO, A, LDA )
 *
 *              Copy right singular vectors of A from A to VT
@@ -1385,7 +1421,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Perform bidiagonal SVD, only computing singular values
 *              Workspace: need   3*M [e, tauq, taup] + BDSPAC
 *
-               CALL SBDSDC( 'L', 'N', M, S, WORK( IE ), DUM, 1, DUM, 1,
+               CALL SBDSDC( 'L', 'N', M, S, WORK( IE ), DUM, 1, DUM,
+     $                      1,
      $                      DUM, IDUM, WORK( NWORK ), IWORK, INFO )
             ELSE IF( WNTQO ) THEN
 *              Path 5to (N > M, JOBZ='O')
@@ -1442,7 +1479,8 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
 *                 Copy right singular vectors of A from WORK(IVT) to A
 *
-                  CALL SLACPY( 'F', M, N, WORK( IVT ), LDWKVT, A, LDA )
+                  CALL SLACPY( 'F', M, N, WORK( IVT ), LDWKVT, A,
+     $                         LDA )
                ELSE
 *
 *                 Path 5to-slow
@@ -1461,10 +1499,12 @@ SUBROUTINE SGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                   DO 40 I = 1, N, CHUNK
                      BLK = MIN( N - I + 1, CHUNK )
-                     CALL SGEMM( 'N', 'N', M, BLK, M, ONE, WORK( IVT ),
+                     CALL SGEMM( 'N', 'N', M, BLK, M, ONE,
+     $                           WORK( IVT ),
      $                           LDWKVT, A( 1, I ), LDA, ZERO,
      $                           WORK( IL ), M )
-                     CALL SLACPY( 'F', M, BLK, WORK( IL ), M, A( 1, I ),
+                     CALL SLACPY( 'F', M, BLK, WORK( IL ), M, A( 1,
+     $                            I ),
      $                            LDA )
    40             CONTINUE
                END IF
diff --git a/SRC/sgesv.f b/SRC/sgesv.f
index 4f4fe5215f..dc8cb2b0f8 100644
--- a/SRC/sgesv.f
+++ b/SRC/sgesv.f
@@ -1,3 +1,5 @@
+*> \addtogroup gesv
+*>
 *> \brief <b> SGESV computes the solution to system of linear equations A * X = B for GE matrices</b> (simple driver)
 *
 *  =========== DOCUMENTATION ===========
@@ -5,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGESV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgesv.f">
 *> [TGZ]</a>
@@ -13,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgesv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,10 +115,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEsolve
+*> \ingroup gesv
 *
 *  =====================================================================
       SUBROUTINE SGESV( N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sgesvd.f b/SRC/sgesvd.f
index 83321ffaa1..afe6da1627 100644
--- a/SRC/sgesvd.f
+++ b/SRC/sgesvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGESVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgesvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgesvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -203,11 +201,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEsing
+*> \ingroup gesvd
 *
 *  =====================================================================
-      SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
+      SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT,
+     $                   LDVT,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -244,15 +244,17 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
       REAL               DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SBDSQR, SGEBRD, SGELQF, SGEMM, SGEQRF, SLACPY,
+      EXTERNAL           SBDSQR, SGEBRD, SGELQF, SGEMM, SGEQRF,
+     $                   SLACPY,
      $                   SLASCL, SLASET, SORGBR, SORGLQ, SORGQR, SORMBR,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANGE
-      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANGE
+      REAL               SLAMCH, SLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN, SQRT
@@ -474,7 +476,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
             CALL SGELQF( M, N, A, LDA, DUM(1), DUM(1), -1, IERR )
             LWORK_SGELQF = INT( DUM(1) )
 *           Compute space needed for SORGLQ
-            CALL SORGLQ( N, N, M, DUM(1), N, DUM(1), DUM(1), -1, IERR )
+            CALL SORGLQ( N, N, M, DUM(1), N, DUM(1), DUM(1), -1,
+     $                   IERR )
             LWORK_SORGLQ_N = INT( DUM(1) )
             CALL SORGLQ( M, N, M, A, LDA, DUM(1), DUM(1), -1, IERR )
             LWORK_SORGLQ_M = INT( DUM(1) )
@@ -628,7 +631,7 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
             END IF
          END IF
          MAXWRK = MAX( MAXWRK, MINWRK )
-         WORK( 1 ) = MAXWRK
+         WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
             INFO = -13
@@ -685,7 +688,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Compute A=Q*R
 *              (Workspace: need 2*N, prefer N+N*NB)
 *
-               CALL SGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( IWORK ),
+               CALL SGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( IWORK ),
      $                      LWORK-IWORK+1, IERR )
 *
 *              Zero out below R
@@ -702,7 +706,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Bidiagonalize R in A
 *              (Workspace: need 4*N, prefer 3*N+2*N*NB)
 *
-               CALL SGEBRD( N, N, A, LDA, S, WORK( IE ), WORK( ITAUQ ),
+               CALL SGEBRD( N, N, A, LDA, S, WORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( IWORK ), LWORK-IWORK+1,
      $                      IERR )
                NCVT = 0
@@ -721,7 +726,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              singular vectors of A in A if desired
 *              (Workspace: need BDSPAC)
 *
-               CALL SBDSQR( 'U', N, NCVT, 0, 0, S, WORK( IE ), A, LDA,
+               CALL SBDSQR( 'U', N, NCVT, 0, 0, S, WORK( IE ), A,
+     $                      LDA,
      $                      DUM, 1, DUM, 1, WORK( IWORK ), INFO )
 *
 *              If right singular vectors desired in VT, copy them there
@@ -770,8 +776,10 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
 *                 Copy R to WORK(IR) and zero out below it
 *
-                  CALL SLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
-                  CALL SLASET( 'L', N-1, N-1, ZERO, ZERO, WORK( IR+1 ),
+                  CALL SLACPY( 'U', N, N, A, LDA, WORK( IR ),
+     $                         LDWRKR )
+                  CALL SLASET( 'L', N-1, N-1, ZERO, ZERO,
+     $                         WORK( IR+1 ),
      $                         LDWRKR )
 *
 *                 Generate Q in A
@@ -787,7 +795,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 Bidiagonalize R in WORK(IR)
 *                 (Workspace: need N*N+4*N, prefer N*N+3*N+2*N*NB)
 *
-                  CALL SGEBRD( N, N, WORK( IR ), LDWRKR, S, WORK( IE ),
+                  CALL SGEBRD( N, N, WORK( IR ), LDWRKR, S,
+     $                         WORK( IE ),
      $                         WORK( ITAUQ ), WORK( ITAUP ),
      $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
@@ -803,7 +812,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 singular vectors of R in WORK(IR)
 *                 (Workspace: need N*N+BDSPAC)
 *
-                  CALL SBDSQR( 'U', N, 0, N, 0, S, WORK( IE ), DUM, 1,
+                  CALL SBDSQR( 'U', N, 0, N, 0, S, WORK( IE ), DUM,
+     $                         1,
      $                         WORK( IR ), LDWRKR, DUM, 1,
      $                         WORK( IWORK ), INFO )
                   IU = IE + N
@@ -814,7 +824,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                   DO 10 I = 1, M, LDWRKU
                      CHUNK = MIN( M-I+1, LDWRKU )
-                     CALL SGEMM( 'N', 'N', CHUNK, N, N, ONE, A( I, 1 ),
+                     CALL SGEMM( 'N', 'N', CHUNK, N, N, ONE, A( I,
+     $                           1 ),
      $                           LDA, WORK( IR ), LDWRKR, ZERO,
      $                           WORK( IU ), LDWRKU )
                      CALL SLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
@@ -848,7 +859,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 singular vectors of A in A
 *                 (Workspace: need BDSPAC)
 *
-                  CALL SBDSQR( 'U', N, 0, M, 0, S, WORK( IE ), DUM, 1,
+                  CALL SBDSQR( 'U', N, 0, M, 0, S, WORK( IE ), DUM,
+     $                         1,
      $                         A, LDA, DUM, 1, WORK( IWORK ), INFO )
 *
                END IF
@@ -915,7 +927,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
                   CALL SGEBRD( N, N, VT, LDVT, S, WORK( IE ),
      $                         WORK( ITAUQ ), WORK( ITAUP ),
      $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  CALL SLACPY( 'L', N, N, VT, LDVT, WORK( IR ), LDWRKR )
+                  CALL SLACPY( 'L', N, N, VT, LDVT, WORK( IR ),
+     $                         LDWRKR )
 *
 *                 Generate left vectors bidiagonalizing R in WORK(IR)
 *                 (Workspace: need N*N+4*N, prefer N*N+3*N+N*NB)
@@ -936,7 +949,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 singular vectors of R in VT
 *                 (Workspace: need N*N+BDSPAC)
 *
-                  CALL SBDSQR( 'U', N, N, N, 0, S, WORK( IE ), VT, LDVT,
+                  CALL SBDSQR( 'U', N, N, N, 0, S, WORK( IE ), VT,
+     $                         LDVT,
      $                         WORK( IR ), LDWRKR, DUM, 1,
      $                         WORK( IWORK ), INFO )
                   IU = IE + N
@@ -947,7 +961,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                   DO 20 I = 1, M, LDWRKU
                      CHUNK = MIN( M-I+1, LDWRKU )
-                     CALL SGEMM( 'N', 'N', CHUNK, N, N, ONE, A( I, 1 ),
+                     CALL SGEMM( 'N', 'N', CHUNK, N, N, ONE, A( I,
+     $                           1 ),
      $                           LDA, WORK( IR ), LDWRKR, ZERO,
      $                           WORK( IU ), LDWRKU )
                      CALL SLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
@@ -1010,7 +1025,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 singular vectors of A in VT
 *                 (Workspace: need BDSPAC)
 *
-                  CALL SBDSQR( 'U', N, N, M, 0, S, WORK( IE ), VT, LDVT,
+                  CALL SBDSQR( 'U', N, N, M, 0, S, WORK( IE ), VT,
+     $                         LDVT,
      $                         A, LDA, DUM, 1, WORK( IWORK ), INFO )
 *
                END IF
@@ -1085,7 +1101,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    singular vectors of R in WORK(IR)
 *                    (Workspace: need N*N+BDSPAC)
 *
-                     CALL SBDSQR( 'U', N, 0, N, 0, S, WORK( IE ), DUM,
+                     CALL SBDSQR( 'U', N, 0, N, 0, S, WORK( IE ),
+     $                            DUM,
      $                            1, WORK( IR ), LDWRKR, DUM, 1,
      $                            WORK( IWORK ), INFO )
 *
@@ -1146,7 +1163,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    singular vectors of A in U
 *                    (Workspace: need BDSPAC)
 *
-                     CALL SBDSQR( 'U', N, 0, M, 0, S, WORK( IE ), DUM,
+                     CALL SBDSQR( 'U', N, 0, M, 0, S, WORK( IE ),
+     $                            DUM,
      $                            1, U, LDU, DUM, 1, WORK( IWORK ),
      $                            INFO )
 *
@@ -1309,7 +1327,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    Generate right vectors bidiagonalizing R in A
 *                    (Workspace: need 4*N-1, prefer 3*N+(N-1)*NB)
 *
-                     CALL SORGBR( 'P', N, N, N, A, LDA, WORK( ITAUP ),
+                     CALL SORGBR( 'P', N, N, N, A, LDA,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + N
 *
@@ -1394,7 +1413,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (Workspace: need N*N+4*N-1,
 *                                prefer N*N+3*N+(N-1)*NB)
 *
-                     CALL SORGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+                     CALL SORGBR( 'P', N, N, N, VT, LDVT,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + N
 *
@@ -1463,7 +1483,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    Generate right bidiagonalizing vectors in VT
 *                    (Workspace: need 4*N-1, prefer 3*N+(N-1)*NB)
 *
-                     CALL SORGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+                     CALL SORGBR( 'P', N, N, N, VT, LDVT,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + N
 *
@@ -1551,7 +1572,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    singular vectors of R in WORK(IR)
 *                    (Workspace: need N*N+BDSPAC)
 *
-                     CALL SBDSQR( 'U', N, 0, N, 0, S, WORK( IE ), DUM,
+                     CALL SBDSQR( 'U', N, 0, N, 0, S, WORK( IE ),
+     $                            DUM,
      $                            1, WORK( IR ), LDWRKR, DUM, 1,
      $                            WORK( IWORK ), INFO )
 *
@@ -1617,7 +1639,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    singular vectors of A in U
 *                    (Workspace: need BDSPAC)
 *
-                     CALL SBDSQR( 'U', N, 0, M, 0, S, WORK( IE ), DUM,
+                     CALL SBDSQR( 'U', N, 0, M, 0, S, WORK( IE ),
+     $                            DUM,
      $                            1, U, LDU, DUM, 1, WORK( IWORK ),
      $                            INFO )
 *
@@ -1785,7 +1808,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    Generate right bidiagonalizing vectors in A
 *                    (Workspace: need 4*N-1, prefer 3*N+(N-1)*NB)
 *
-                     CALL SORGBR( 'P', N, N, N, A, LDA, WORK( ITAUP ),
+                     CALL SORGBR( 'P', N, N, N, A, LDA,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + N
 *
@@ -1871,7 +1895,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    (Workspace: need N*N+4*N-1,
 *                                prefer N*N+3*N+(N-1)*NB)
 *
-                     CALL SORGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+                     CALL SORGBR( 'P', N, N, N, VT, LDVT,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + N
 *
@@ -1944,7 +1969,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    Generate right bidiagonalizing vectors in VT
 *                    (Workspace: need 4*N-1, prefer 3*N+(N-1)*NB)
 *
-                     CALL SORGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+                     CALL SORGBR( 'P', N, N, N, VT, LDVT,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + N
 *
@@ -2048,7 +2074,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              vectors in A
 *              (Workspace: need BDSPAC)
 *
-               CALL SBDSQR( 'U', N, NCVT, NRU, 0, S, WORK( IE ), A, LDA,
+               CALL SBDSQR( 'U', N, NCVT, NRU, 0, S, WORK( IE ), A,
+     $                      LDA,
      $                      U, LDU, DUM, 1, WORK( IWORK ), INFO )
             ELSE
 *
@@ -2082,12 +2109,14 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Compute A=L*Q
 *              (Workspace: need 2*M, prefer M+M*NB)
 *
-               CALL SGELQF( M, N, A, LDA, WORK( ITAU ), WORK( IWORK ),
+               CALL SGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( IWORK ),
      $                      LWORK-IWORK+1, IERR )
 *
 *              Zero out above L
 *
-               CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ), LDA )
+               CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ),
+     $                      LDA )
                IE = 1
                ITAUQ = IE + M
                ITAUP = ITAUQ + M
@@ -2096,7 +2125,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              Bidiagonalize L in A
 *              (Workspace: need 4*M, prefer 3*M+2*M*NB)
 *
-               CALL SGEBRD( M, M, A, LDA, S, WORK( IE ), WORK( ITAUQ ),
+               CALL SGEBRD( M, M, A, LDA, S, WORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( IWORK ), LWORK-IWORK+1,
      $                      IERR )
                IF( WNTUO .OR. WNTUAS ) THEN
@@ -2116,7 +2146,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              vectors of A in A if desired
 *              (Workspace: need BDSPAC)
 *
-               CALL SBDSQR( 'U', M, 0, NRU, 0, S, WORK( IE ), DUM, 1, A,
+               CALL SBDSQR( 'U', M, 0, NRU, 0, S, WORK( IE ), DUM, 1,
+     $                      A,
      $                      LDA, DUM, 1, WORK( IWORK ), INFO )
 *
 *              If left singular vectors desired in U, copy them there
@@ -2168,7 +2199,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
 *                 Copy L to WORK(IR) and zero out above it
 *
-                  CALL SLACPY( 'L', M, M, A, LDA, WORK( IR ), LDWRKR )
+                  CALL SLACPY( 'L', M, M, A, LDA, WORK( IR ),
+     $                         LDWRKR )
                   CALL SLASET( 'U', M-1, M-1, ZERO, ZERO,
      $                         WORK( IR+LDWRKR ), LDWRKR )
 *
@@ -2185,7 +2217,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 Bidiagonalize L in WORK(IR)
 *                 (Workspace: need M*M+4*M, prefer M*M+3*M+2*M*NB)
 *
-                  CALL SGEBRD( M, M, WORK( IR ), LDWRKR, S, WORK( IE ),
+                  CALL SGEBRD( M, M, WORK( IR ), LDWRKR, S,
+     $                         WORK( IE ),
      $                         WORK( ITAUQ ), WORK( ITAUP ),
      $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
@@ -2212,7 +2245,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                   DO 30 I = 1, N, CHUNK
                      BLK = MIN( N-I+1, CHUNK )
-                     CALL SGEMM( 'N', 'N', M, BLK, M, ONE, WORK( IR ),
+                     CALL SGEMM( 'N', 'N', M, BLK, M, ONE,
+     $                           WORK( IR ),
      $                           LDWRKR, A( 1, I ), LDA, ZERO,
      $                           WORK( IU ), LDWRKU )
                      CALL SLACPY( 'F', M, BLK, WORK( IU ), LDWRKU,
@@ -2246,7 +2280,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 singular vectors of A in A
 *                 (Workspace: need BDSPAC)
 *
-                  CALL SBDSQR( 'L', M, N, 0, 0, S, WORK( IE ), A, LDA,
+                  CALL SBDSQR( 'L', M, N, 0, 0, S, WORK( IE ), A,
+     $                         LDA,
      $                         DUM, 1, DUM, 1, WORK( IWORK ), INFO )
 *
                END IF
@@ -2315,7 +2350,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
                   CALL SGEBRD( M, M, U, LDU, S, WORK( IE ),
      $                         WORK( ITAUQ ), WORK( ITAUP ),
      $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  CALL SLACPY( 'U', M, M, U, LDU, WORK( IR ), LDWRKR )
+                  CALL SLACPY( 'U', M, M, U, LDU, WORK( IR ),
+     $                         LDWRKR )
 *
 *                 Generate right vectors bidiagonalizing L in WORK(IR)
 *                 (Workspace: need M*M+4*M-1, prefer M*M+3*M+(M-1)*NB)
@@ -2347,7 +2383,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                   DO 40 I = 1, N, CHUNK
                      BLK = MIN( N-I+1, CHUNK )
-                     CALL SGEMM( 'N', 'N', M, BLK, M, ONE, WORK( IR ),
+                     CALL SGEMM( 'N', 'N', M, BLK, M, ONE,
+     $                           WORK( IR ),
      $                           LDWRKR, A( 1, I ), LDA, ZERO,
      $                           WORK( IU ), LDWRKU )
                      CALL SLACPY( 'F', M, BLK, WORK( IU ), LDWRKU,
@@ -2409,7 +2446,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 singular vectors of A in A
 *                 (Workspace: need BDSPAC)
 *
-                  CALL SBDSQR( 'U', M, N, M, 0, S, WORK( IE ), A, LDA,
+                  CALL SBDSQR( 'U', M, N, M, 0, S, WORK( IE ), A,
+     $                         LDA,
      $                         U, LDU, DUM, 1, WORK( IWORK ), INFO )
 *
                END IF
@@ -2525,7 +2563,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
 *                    Zero out above L in A
 *
-                     CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ),
+                     CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1,
+     $                            2 ),
      $                            LDA )
 *
 *                    Bidiagonalize L in A
@@ -2688,7 +2727,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
 *                    Zero out above L in A
 *
-                     CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ),
+                     CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1,
+     $                            2 ),
      $                            LDA )
 *
 *                    Bidiagonalize L in A
@@ -2708,7 +2748,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    Generate left bidiagonalizing vectors of L in A
 *                    (Workspace: need 4*M, prefer 3*M+M*NB)
 *
-                     CALL SORGBR( 'Q', M, M, M, A, LDA, WORK( ITAUQ ),
+                     CALL SORGBR( 'Q', M, M, M, A, LDA,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + M
 *
@@ -2793,7 +2834,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    Generate left bidiagonalizing vectors in U
 *                    (Workspace: need M*M+4*M, prefer M*M+3*M+M*NB)
 *
-                     CALL SORGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL SORGBR( 'Q', M, M, M, U, LDU,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + M
 *
@@ -2836,7 +2878,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    Copy L to U, zeroing out above it
 *
                      CALL SLACPY( 'L', M, M, A, LDA, U, LDU )
-                     CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, U( 1, 2 ),
+                     CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, U( 1,
+     $                            2 ),
      $                            LDU )
                      IE = ITAU
                      ITAUQ = IE + M
@@ -2861,7 +2904,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    Generate left bidiagonalizing vectors in U
 *                    (Workspace: need 4*M, prefer 3*M+M*NB)
 *
-                     CALL SORGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL SORGBR( 'Q', M, M, M, U, LDU,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + M
 *
@@ -2991,7 +3035,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
 *                    Zero out above L in A
 *
-                     CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ),
+                     CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1,
+     $                            2 ),
      $                            LDA )
 *
 *                    Bidiagonalize L in A
@@ -3159,7 +3204,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
 *                    Zero out above L in A
 *
-                     CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1, 2 ),
+                     CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, A( 1,
+     $                            2 ),
      $                            LDA )
 *
 *                    Bidiagonalize L in A
@@ -3180,7 +3226,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    Generate left bidiagonalizing vectors in A
 *                    (Workspace: need 4*M, prefer 3*M+M*NB)
 *
-                     CALL SORGBR( 'Q', M, M, M, A, LDA, WORK( ITAUQ ),
+                     CALL SORGBR( 'Q', M, M, M, A, LDA,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + M
 *
@@ -3265,7 +3312,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    Generate left bidiagonalizing vectors in U
 *                    (Workspace: need M*M+4*M, prefer M*M+3*M+M*NB)
 *
-                     CALL SORGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL SORGBR( 'Q', M, M, M, U, LDU,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + M
 *
@@ -3312,7 +3360,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    Copy L to U, zeroing out above it
 *
                      CALL SLACPY( 'L', M, M, A, LDA, U, LDU )
-                     CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, U( 1, 2 ),
+                     CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, U( 1,
+     $                            2 ),
      $                            LDU )
                      IE = ITAU
                      ITAUQ = IE + M
@@ -3337,7 +3386,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                    Generate left bidiagonalizing vectors in U
 *                    (Workspace: need 4*M, prefer 3*M+M*NB)
 *
-                     CALL SORGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL SORGBR( 'Q', M, M, M, U, LDU,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IWORK = IE + M
 *
@@ -3441,7 +3491,8 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              vectors in A
 *              (Workspace: need BDSPAC)
 *
-               CALL SBDSQR( 'L', M, NCVT, NRU, 0, S, WORK( IE ), A, LDA,
+               CALL SBDSQR( 'L', M, NCVT, NRU, 0, S, WORK( IE ), A,
+     $                      LDA,
      $                      U, LDU, DUM, 1, WORK( IWORK ), INFO )
             ELSE
 *
@@ -3481,19 +3532,21 @@ SUBROUTINE SGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
      $      CALL SLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN, 1, S, MINMN,
      $                   IERR )
          IF( INFO.NE.0 .AND. ANRM.GT.BIGNUM )
-     $      CALL SLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN-1, 1, WORK( 2 ),
+     $      CALL SLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN-1, 1,
+     $                   WORK( 2 ),
      $                   MINMN, IERR )
          IF( ANRM.LT.SMLNUM )
      $      CALL SLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN, 1, S, MINMN,
      $                   IERR )
          IF( INFO.NE.0 .AND. ANRM.LT.SMLNUM )
-     $      CALL SLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN-1, 1, WORK( 2 ),
+     $      CALL SLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN-1, 1,
+     $                   WORK( 2 ),
      $                   MINMN, IERR )
       END IF
 *
 *     Return optimal workspace in WORK(1)
 *
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
 *
       RETURN
 *
diff --git a/SRC/sgesvdq.f b/SRC/sgesvdq.f
index ebbfc70b15..1dc1c57170 100644
--- a/SRC/sgesvdq.f
+++ b/SRC/sgesvdq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGESVDQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgesvdq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgesvdq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -365,7 +363,7 @@
 *>   an optimal implementation would do all necessary scaling before calling
 *>   CGESVD and the scaling in CGESVD can be switched off.
 *>   3. Other comments related to code optimization are given in comments in the
-*>   code, enlosed in [[double brackets]].
+*>   code, enclosed in [[double brackets]].
 *> \endverbatim
 *
 *> \par Bugs, examples and comments
@@ -406,14 +404,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEsing
+*> \ingroup gesvdq
 *
 *  =====================================================================
       SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
      $                    S, U, LDU, V, LDV, NUMRANK, IWORK, LIWORK,
      $                    WORK, LWORK, RWORK, LRWORK, INFO )
+      IMPLICIT NONE
 *     .. Scalar Arguments ..
-      IMPLICIT    NONE
       CHARACTER   JOBA, JOBP, JOBR, JOBU, JOBV
       INTEGER     M, N, LDA, LDU, LDV, NUMRANK, LIWORK, LWORK, LRWORK,
      $            INFO
@@ -445,9 +443,9 @@ SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
       REAL        RDUMMY(1)
 *     ..
 *     .. External Subroutines (BLAS, LAPACK)
-      EXTERNAL    SGELQF, SGEQP3, SGEQRF, SGESVD, SLACPY, SLAPMT,
-     $            SLASCL, SLASET, SLASWP, SSCAL,  SPOCON, SORMLQ,
-     $            SORMQR, XERBLA
+      EXTERNAL    SGELQF, SGEQP3, SGEQRF, SGESVD, SLACPY,
+     $            SLAPMT, SLASCL, SLASET, SLASWP, SSCAL,
+     $            SPOCON, SORMLQ, SORMQR, XERBLA
 *     ..
 *     .. External Functions (BLAS, LAPACK)
       LOGICAL    LSAME
@@ -678,10 +676,12 @@ SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                    IF ( WNTVA ) THEN
                        CALL SGEQRF(N,N/2,U,LDU,RDUMMY,RDUMMY,-1,IERR)
                        LWRK_SGEQRF = INT( RDUMMY(1) )
-                       CALL SGESVD( 'S', 'O', N/2,N/2, V,LDV, S, U,LDU,
+                       CALL SGESVD( 'S', 'O', N/2,N/2, V,LDV, S, U,
+     $                              LDU,
      $                      V, LDV, RDUMMY, -1, IERR )
                        LWRK_SGESVD2 = INT( RDUMMY(1) )
-                       CALL SORMQR( 'R', 'C', N, N, N/2, U, LDU, RDUMMY,
+                       CALL SORMQR( 'R', 'C', N, N, N/2, U, LDU,
+     $                              RDUMMY,
      $                      V, LDV, RDUMMY, -1, IERR )
                        LWRK_SORMQR2 = INT( RDUMMY(1) )
                        OPTWRK2 = MAX( LWRK_SGEQP3, N/2+LWRK_SGEQRF,
@@ -700,10 +700,12 @@ SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                    IF ( WNTVA ) THEN
                       CALL SGELQF(N/2,N,U,LDU,RDUMMY,RDUMMY,-1,IERR)
                       LWRK_SGELQF = INT( RDUMMY(1) )
-                      CALL SGESVD( 'S','O', N/2,N/2, V, LDV, S, U, LDU,
+                      CALL SGESVD( 'S','O', N/2,N/2, V, LDV, S, U,
+     $                             LDU,
      $                     V, LDV, RDUMMY, -1, IERR )
                       LWRK_SGESVD2 = INT( RDUMMY(1) )
-                      CALL SORMLQ( 'R', 'N', N, N, N/2, U, LDU, RDUMMY,
+                      CALL SORMLQ( 'R', 'N', N, N, N/2, U, LDU,
+     $                             RDUMMY,
      $                     V, LDV, RDUMMY,-1,IERR )
                       LWRK_SORMLQ = INT( RDUMMY(1) )
                       OPTWRK2 = MAX( LWRK_SGEQP3, N/2+LWRK_SGELQF,
@@ -733,9 +735,9 @@ SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *     Return optimal workspace
 *
           IWORK(1) = IMINWRK
-          WORK(1) = OPTWRK
-          WORK(2) = MINWRK
-          RWORK(1) = RMINWRK
+          WORK(1) = REAL( OPTWRK )
+          WORK(2) = REAL( MINWRK )
+          RWORK(1) = REAL( RMINWRK )
           RETURN
       END IF
 *
@@ -803,7 +805,8 @@ SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
             IF ( RWORK(1) .GT. BIG / SQRT(REAL(M)) ) THEN
 *               .. to prevent overflow in the QR factorization, scale the
 *               matrix by 1/sqrt(M) if too large entry detected
-                CALL SLASCL('G',0,0,SQRT(REAL(M)),ONE, M,N, A,LDA, IERR)
+                CALL SLASCL('G',0,0,SQRT(REAL(M)),ONE, M,N, A,LDA,
+     $                       IERR)
                 ASCALED = .TRUE.
             END IF
             CALL SLASWP( N, A, LDA, 1, M-1, IWORK(N+1), 1 )
@@ -825,7 +828,8 @@ SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
           IF ( RTMP .GT. BIG / SQRT(REAL(M)) ) THEN
 *             .. to prevent overflow in the QR factorization, scale the
 *             matrix by 1/sqrt(M) if too large entry detected
-              CALL SLASCL('G',0,0, SQRT(REAL(M)),ONE, M,N, A,LDA, IERR)
+              CALL SLASCL('G',0,0, SQRT(REAL(M)),ONE, M,N, A,LDA,
+     $                     IERR)
               ASCALED = .TRUE.
           END IF
       END IF
@@ -993,7 +997,8 @@ SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *            .. copy R into [U] and overwrite [U] with the left singular vectors
              CALL SLACPY( 'U', NR, N, A, LDA, U, LDU )
              IF ( NR .GT. 1 )
-     $         CALL SLASET( 'L', NR-1, NR-1, ZERO, ZERO, U(2,1), LDU )
+     $         CALL SLASET( 'L', NR-1, NR-1, ZERO, ZERO, U(2,1),
+     $                      LDU )
 *            .. the right singular vectors not computed, the NR left singular
 *            vectors overwrite [U](1:NR,1:NR)
                 CALL SGESVD( 'O', 'N', NR, N, U, LDU, S, U, LDU,
@@ -1084,7 +1089,8 @@ SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *            .. copy R into V and overwrite V with the right singular vectors
              CALL SLACPY( 'U', NR, N, A, LDA, V, LDV )
              IF ( NR .GT. 1 )
-     $         CALL SLASET( 'L', NR-1, NR-1, ZERO, ZERO, V(2,1), LDV )
+     $         CALL SLASET( 'L', NR-1, NR-1, ZERO, ZERO, V(2,1),
+     $                      LDV )
 *            .. the right singular vectors overwrite V, the NR left singular
 *            vectors stored in U(1:NR,1:NR)
              IF ( WNTVR .OR. ( NR .EQ. N ) ) THEN
@@ -1156,9 +1162,11 @@ SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
  1117           CONTINUE
 *
                 IF ( ( NR .LT. M ) .AND. .NOT.(WNTUF)) THEN
-                  CALL SLASET('A', M-NR,NR, ZERO,ZERO, U(NR+1,1), LDU)
+                  CALL SLASET('A', M-NR,NR, ZERO,ZERO, U(NR+1,1),
+     $                         LDU)
                   IF ( NR .LT. N1 ) THEN
-                     CALL SLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),LDU)
+                     CALL SLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),
+     $                            LDU)
                      CALL SLASET( 'A',M-NR,N1-NR,ZERO,ONE,
      $                    U(NR+1,NR+1), LDU )
                   END IF
@@ -1209,7 +1217,8 @@ SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                    IF ( ( N .LT. M ) .AND. .NOT.(WNTUF)) THEN
                       CALL SLASET('A',M-N,N,ZERO,ZERO,U(N+1,1),LDU)
                       IF ( N .LT. N1 ) THEN
-                        CALL SLASET('A',N,N1-N,ZERO,ZERO,U(1,N+1),LDU)
+                        CALL SLASET('A',N,N1-N,ZERO,ZERO,U(1,N+1),
+     $                               LDU)
                         CALL SLASET('A',M-N,N1-N,ZERO,ONE,
      $                       U(N+1,N+1), LDU )
                       END IF
@@ -1236,7 +1245,8 @@ SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
      $                 V,LDV, WORK(N+NR+1),LWORK-N-NR, INFO )
                   CALL SLASET('A',N-NR,NR,ZERO,ZERO,V(NR+1,1),LDV)
                   CALL SLASET('A',NR,N-NR,ZERO,ZERO,V(1,NR+1),LDV)
-                  CALL SLASET('A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),LDV)
+                  CALL SLASET('A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),
+     $                         LDV)
                   CALL SORMQR('R','C', N, N, NR, U(1,NR+1), LDU,
      $                 WORK(N+1),V,LDV,WORK(N+NR+1),LWORK-N-NR,IERR)
                   CALL SLAPMT( .FALSE., N, N, V, LDV, IWORK )
@@ -1245,7 +1255,8 @@ SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                   IF ( ( NR .LT. M ) .AND. .NOT.(WNTUF)) THEN
                      CALL SLASET('A',M-NR,NR,ZERO,ZERO,U(NR+1,1),LDU)
                      IF ( NR .LT. N1 ) THEN
-                     CALL SLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),LDU)
+                     CALL SLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),
+     $                            LDU)
                      CALL SLASET( 'A',M-NR,N1-NR,ZERO,ONE,
      $                    U(NR+1,NR+1),LDU)
                      END IF
@@ -1271,9 +1282,11 @@ SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *               .. assemble the left singular vector matrix U of dimensions
 *              (M x NR) or (M x N) or (M x M).
                IF ( ( NR .LT. M ) .AND. .NOT.(WNTUF)) THEN
-                  CALL SLASET('A', M-NR,NR, ZERO,ZERO, U(NR+1,1), LDU)
+                  CALL SLASET('A', M-NR,NR, ZERO,ZERO, U(NR+1,1),
+     $                         LDU)
                   IF ( NR .LT. N1 ) THEN
-                     CALL SLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),LDU)
+                     CALL SLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),
+     $                            LDU)
                      CALL SLASET( 'A',M-NR,N1-NR,ZERO,ONE,
      $                    U(NR+1,NR+1), LDU )
                   END IF
@@ -1307,7 +1320,8 @@ SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                   IF ( ( N .LT. M ) .AND. .NOT.(WNTUF)) THEN
                       CALL SLASET('A',M-N,N,ZERO,ZERO,U(N+1,1),LDU)
                       IF ( N .LT. N1 ) THEN
-                        CALL SLASET('A',N,N1-N,ZERO,ZERO,U(1,N+1),LDU)
+                        CALL SLASET('A',N,N1-N,ZERO,ZERO,U(1,N+1),
+     $                               LDU)
                         CALL SLASET( 'A',M-N,N1-N,ZERO,ONE,
      $                       U(N+1,N+1), LDU )
                       END IF
@@ -1325,7 +1339,8 @@ SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
      $                 V, LDV, WORK(N+NR+1), LWORK-N-NR, INFO )
                   CALL SLASET('A',N-NR,NR,ZERO,ZERO,V(NR+1,1),LDV)
                   CALL SLASET('A',NR,N-NR,ZERO,ZERO,V(1,NR+1),LDV)
-                  CALL SLASET('A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),LDV)
+                  CALL SLASET('A',N-NR,N-NR,ZERO,ONE,V(NR+1,NR+1),
+     $                         LDV)
                   CALL SORMLQ('R','N',N,N,NR,U(NR+1,1),LDU,WORK(N+1),
      $                 V, LDV, WORK(N+NR+1),LWORK-N-NR,IERR)
                   CALL SLAPMT( .FALSE., N, N, V, LDV, IWORK )
@@ -1334,7 +1349,8 @@ SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                   IF ( ( NR .LT. M ) .AND. .NOT.(WNTUF)) THEN
                      CALL SLASET('A',M-NR,NR,ZERO,ZERO,U(NR+1,1),LDU)
                      IF ( NR .LT. N1 ) THEN
-                     CALL SLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),LDU)
+                     CALL SLASET('A',NR,N1-NR,ZERO,ZERO,U(1,NR+1),
+     $                            LDU)
                      CALL SLASET( 'A',M-NR,N1-NR,ZERO,ONE,
      $                    U(NR+1,NR+1), LDU )
                      END IF
@@ -1367,13 +1383,14 @@ SUBROUTINE SGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *
 *     .. if numerical rank deficiency is detected, the truncated
 *     singular values are set to zero.
-      IF ( NR .LT. N ) CALL SLASET( 'G', N-NR,1, ZERO,ZERO, S(NR+1), N )
+      IF ( NR .LT. N ) CALL SLASET( 'G', N-NR,1, ZERO,ZERO, S(NR+1),
+     $     N )
 *     .. undo scaling; this may cause overflow in the largest singular
 *     values.
       IF ( ASCALED )
      $   CALL SLASCL( 'G',0,0, ONE,SQRT(REAL(M)), NR,1, S, N, IERR )
       IF ( CONDA ) RWORK(1) = SCONDA
-      RWORK(2) = p - NR
+      RWORK(2) = REAL( p - NR )
 *     .. p-NR is the number of singular values that are computed as
 *     exact zeros in SGESVD() applied to the (possibly truncated)
 *     full row rank triangular (trapezoidal) factor of A.
diff --git a/SRC/sgesvdx.f b/SRC/sgesvdx.f
index b6495dbd4b..287a8c9f19 100644
--- a/SRC/sgesvdx.f
+++ b/SRC/sgesvdx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGESVDX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgesvdx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgesvdx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -254,12 +252,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEsing
+*> \ingroup gesvdx
 *
 *  =====================================================================
       SUBROUTINE SGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
      $                    IL, IU, NS, S, U, LDU, VT, LDVT, WORK,
      $                    LWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -294,15 +293,17 @@ SUBROUTINE SGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
       REAL               DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SBDSVDX, SGEBRD, SGELQF, SGEQRF, SLACPY,
+      EXTERNAL           SBDSVDX, SGEBRD, SGELQF, SGEQRF,
+     $                   SLACPY,
      $                   SLASCL, SLASET, SORMBR, SORMLQ, SORMQR,
      $                   SCOPY, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANGE
-      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANGE
+      REAL               SLAMCH, SLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN, SQRT
@@ -384,7 +385,8 @@ SUBROUTINE SGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
          MAXWRK = 1
          IF( MINMN.GT.0 ) THEN
             IF( M.GE.N ) THEN
-               MNTHR = ILAENV( 6, 'SGESVD', JOBU // JOBVT, M, N, 0, 0 )
+               MNTHR = ILAENV( 6, 'SGESVD', JOBU // JOBVT, M, N, 0,
+     $                         0 )
                IF( M.GE.MNTHR ) THEN
 *
 *                 Path 1 (M much larger than N)
@@ -419,7 +421,8 @@ SUBROUTINE SGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   MINWRK = MAX(N*(N*2+19),4*N+M)
                END IF
             ELSE
-               MNTHR = ILAENV( 6, 'SGESVD', JOBU // JOBVT, M, N, 0, 0 )
+               MNTHR = ILAENV( 6, 'SGESVD', JOBU // JOBVT, M, N, 0,
+     $                         0 )
                IF( N.GE.MNTHR ) THEN
 *
 *                 Path 1t (N much larger than M)
@@ -456,7 +459,7 @@ SUBROUTINE SGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
             END IF
          END IF
          MAXWRK = MAX( MAXWRK, MINWRK )
-         WORK( 1 ) = REAL( MAXWRK )
+         WORK( 1 ) = SROUNDUP_LWORK( MAXWRK )
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
              INFO = -19
@@ -541,8 +544,10 @@ SUBROUTINE SGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
             ITAUP = ITAUQ + N
             ITEMP = ITAUP + N
             CALL SLACPY( 'U', N, N, A, LDA, WORK( IQRF ), N )
-            CALL SLASET( 'L', N-1, N-1, ZERO, ZERO, WORK( IQRF+1 ), N )
-            CALL SGEBRD( N, N, WORK( IQRF ), N, WORK( ID ), WORK( IE ),
+            CALL SLASET( 'L', N-1, N-1, ZERO, ZERO, WORK( IQRF+1 ),
+     $                   N )
+            CALL SGEBRD( N, N, WORK( IQRF ), N, WORK( ID ),
+     $                   WORK( IE ),
      $                   WORK( ITAUQ ), WORK( ITAUP ), WORK( ITEMP ),
      $                   LWORK-ITEMP+1, INFO )
 *
@@ -551,7 +556,8 @@ SUBROUTINE SGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
 *
             ITGKZ = ITEMP
             ITEMP = ITGKZ + N*(N*2+1)
-            CALL SBDSVDX( 'U', JOBZ, RNGTGK, N, WORK( ID ), WORK( IE ),
+            CALL SBDSVDX( 'U', JOBZ, RNGTGK, N, WORK( ID ),
+     $                    WORK( IE ),
      $                    VL, VU, ILTGK, IUTGK, NS, S, WORK( ITGKZ ),
      $                    N*2, WORK( ITEMP ), IWORK, INFO)
 *
@@ -563,7 +569,8 @@ SUBROUTINE SGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   CALL SCOPY( N, WORK( J ), 1, U( 1,I ), 1 )
                   J = J + N*2
                END DO
-               CALL SLASET( 'A', M-N, NS, ZERO, ZERO, U( N+1,1 ), LDU )
+               CALL SLASET( 'A', M-N, NS, ZERO, ZERO, U( N+1,1 ),
+     $                      LDU )
 *
 *              Call SORMBR to compute QB*UB.
 *              (Workspace in WORK( ITEMP ): need N, prefer N*NB)
@@ -620,7 +627,8 @@ SUBROUTINE SGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
 *
             ITGKZ = ITEMP
             ITEMP = ITGKZ + N*(N*2+1)
-            CALL SBDSVDX( 'U', JOBZ, RNGTGK, N, WORK( ID ), WORK( IE ),
+            CALL SBDSVDX( 'U', JOBZ, RNGTGK, N, WORK( ID ),
+     $                    WORK( IE ),
      $                    VL, VU, ILTGK, IUTGK, NS, S, WORK( ITGKZ ),
      $                    N*2, WORK( ITEMP ), IWORK, INFO)
 *
@@ -632,7 +640,8 @@ SUBROUTINE SGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   CALL SCOPY( N, WORK( J ), 1, U( 1,I ), 1 )
                   J = J + N*2
                END DO
-               CALL SLASET( 'A', M-N, NS, ZERO, ZERO, U( N+1,1 ), LDU )
+               CALL SLASET( 'A', M-N, NS, ZERO, ZERO, U( N+1,1 ),
+     $                      LDU )
 *
 *              Call SORMBR to compute QB*UB.
 *              (Workspace in WORK( ITEMP ): need N, prefer N*NB)
@@ -689,8 +698,10 @@ SUBROUTINE SGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
             ITAUP = ITAUQ + M
             ITEMP = ITAUP + M
             CALL SLACPY( 'L', M, M, A, LDA, WORK( ILQF ), M )
-            CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, WORK( ILQF+M ), M )
-            CALL SGEBRD( M, M, WORK( ILQF ), M, WORK( ID ), WORK( IE ),
+            CALL SLASET( 'U', M-1, M-1, ZERO, ZERO, WORK( ILQF+M ),
+     $                   M )
+            CALL SGEBRD( M, M, WORK( ILQF ), M, WORK( ID ),
+     $                   WORK( IE ),
      $                   WORK( ITAUQ ), WORK( ITAUP ), WORK( ITEMP ),
      $                   LWORK-ITEMP+1, INFO )
 *
@@ -699,7 +710,8 @@ SUBROUTINE SGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
 *
             ITGKZ = ITEMP
             ITEMP = ITGKZ + M*(M*2+1)
-            CALL SBDSVDX( 'U', JOBZ, RNGTGK, M, WORK( ID ), WORK( IE ),
+            CALL SBDSVDX( 'U', JOBZ, RNGTGK, M, WORK( ID ),
+     $                    WORK( IE ),
      $                    VL, VU, ILTGK, IUTGK, NS, S, WORK( ITGKZ ),
      $                    M*2, WORK( ITEMP ), IWORK, INFO)
 *
@@ -728,7 +740,8 @@ SUBROUTINE SGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   CALL SCOPY( M, WORK( J ), 1, VT( I,1 ), LDVT )
                   J = J + M*2
                END DO
-               CALL SLASET( 'A', NS, N-M, ZERO, ZERO, VT( 1,M+1 ), LDVT)
+               CALL SLASET( 'A', NS, N-M, ZERO, ZERO, VT( 1,M+1 ),
+     $                      LDVT)
 *
 *              Call SORMBR to compute (VB**T)*(PB**T)
 *              (Workspace in WORK( ITEMP ): need M, prefer M*NB)
@@ -768,7 +781,8 @@ SUBROUTINE SGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
 *
             ITGKZ = ITEMP
             ITEMP = ITGKZ + M*(M*2+1)
-            CALL SBDSVDX( 'L', JOBZ, RNGTGK, M, WORK( ID ), WORK( IE ),
+            CALL SBDSVDX( 'L', JOBZ, RNGTGK, M, WORK( ID ),
+     $                    WORK( IE ),
      $                    VL, VU, ILTGK, IUTGK, NS, S, WORK( ITGKZ ),
      $                    M*2, WORK( ITEMP ), IWORK, INFO)
 *
@@ -797,7 +811,8 @@ SUBROUTINE SGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   CALL SCOPY( M, WORK( J ), 1, VT( I,1 ), LDVT )
                   J = J + M*2
                END DO
-               CALL SLASET( 'A', NS, N-M, ZERO, ZERO, VT( 1,M+1 ), LDVT)
+               CALL SLASET( 'A', NS, N-M, ZERO, ZERO, VT( 1,M+1 ),
+     $                      LDVT)
 *
 *              Call SORMBR to compute VB**T * PB**T
 *              (Workspace in WORK( ITEMP ): need M, prefer M*NB)
@@ -822,7 +837,7 @@ SUBROUTINE SGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
 *
 *     Return optimal workspace in WORK(1)
 *
-      WORK( 1 ) = REAL( MAXWRK )
+      WORK( 1 ) = SROUNDUP_LWORK( MAXWRK )
 *
       RETURN
 *
diff --git a/SRC/sgesvj.f b/SRC/sgesvj.f
index 3f53a5a152..ce822e2220 100644
--- a/SRC/sgesvj.f
+++ b/SRC/sgesvj.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGESVJ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgesvj.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgesvj.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -208,7 +206,7 @@
 *>
 *> \param[in,out] WORK
 *> \verbatim
-*>          WORK is REAL array, dimension (LWORK)
+*>          WORK is REAL array, dimension (MAX(1,LWORK))
 *>          On entry,
 *>          If JOBU = 'C' :
 *>          WORK(1) = CTOL, where CTOL defines the threshold for convergence.
@@ -239,7 +237,12 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>         length of WORK, WORK >= MAX(6,M+N)
+*>          Length of WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= MAX(6,M+N), otherwise.
+*>
+*>          If on entry LWORK = -1, then a workspace query is assumed and
+*>          no computation is done; WORK(1) is set to the minial (and optimal)
+*>          length of WORK.
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -260,7 +263,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup gesvj
 *
 *> \par Further Details:
 *  =====================
@@ -320,6 +323,7 @@
 *  =====================================================================
       SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
      $                   LDV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -351,9 +355,9 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
       INTEGER            BLSKIP, EMPTSW, i, ibr, IERR, igl, IJBLSK, ir1,
      $                   ISWROT, jbc, jgl, KBL, LKAHEAD, MVL, N2, N34,
      $                   N4, NBL, NOTROT, p, PSKIPPED, q, ROWSKIP,
-     $                   SWBAND
-      LOGICAL            APPLV, GOSCALE, LOWER, LSVEC, NOSCALE, ROTOK,
-     $                   RSVEC, UCTOL, UPPER
+     $                   SWBAND, MINMN, LWMIN
+      LOGICAL            APPLV, GOSCALE, LOWER, LQUERY, LSVEC, NOSCALE,
+     $                   ROTOK, RSVEC, UCTOL, UPPER
 *     ..
 *     .. Local Arrays ..
       REAL               FASTR( 5 )
@@ -369,8 +373,8 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
       INTEGER            ISAMAX
       EXTERNAL           ISAMAX
 *     from LAPACK
-      REAL               SLAMCH
-      EXTERNAL           SLAMCH
+      REAL               SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           SLAMCH, SROUNDUP_LWORK
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
@@ -394,11 +398,23 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
       UPPER = LSAME( JOBA, 'U' )
       LOWER = LSAME( JOBA, 'L' )
 *
+      MINMN = MIN( M, N )
+      IF( MINMN.EQ.0 ) THEN
+         LWMIN = 1
+      ELSE
+         LWMIN = MAX( 6, M+N )
+      END IF
+*
+      LQUERY = ( LWORK.EQ.-1 )
       IF( .NOT.( UPPER .OR. LOWER .OR. LSAME( JOBA, 'G' ) ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.( LSVEC .OR. UCTOL .OR. LSAME( JOBU, 'N' ) ) ) THEN
+      ELSE IF( .NOT.( LSVEC .OR.
+     $         UCTOL .OR.
+     $         LSAME( JOBU, 'N' ) ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.( RSVEC .OR. APPLV .OR. LSAME( JOBV, 'N' ) ) ) THEN
+      ELSE IF( .NOT.( RSVEC .OR.
+     $         APPLV .OR.
+     $         LSAME( JOBV, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( M.LT.0 ) THEN
          INFO = -4
@@ -413,7 +429,7 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
          INFO = -11
       ELSE IF( UCTOL .AND. ( WORK( 1 ).LE.ONE ) ) THEN
          INFO = -12
-      ELSE IF( LWORK.LT.MAX( M+N, 6 ) ) THEN
+      ELSE IF( LWORK.LT.LWMIN .AND. ( .NOT.LQUERY ) ) THEN
          INFO = -13
       ELSE
          INFO = 0
@@ -423,11 +439,14 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'SGESVJ', -INFO )
          RETURN
+      ELSE IF( LQUERY ) THEN
+         WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
+         RETURN
       END IF
 *
 * #:) Quick return for void matrix
 *
-      IF( ( M.EQ.0 ) .OR. ( N.EQ.0 ) )RETURN
+      IF( MINMN.EQ.0 ) RETURN
 *
 *     Set numerical parameters
 *     The stopping criterion for Jacobi rotations is
@@ -751,11 +770,13 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
          ELSE IF( UPPER ) THEN
 *
 *
-            CALL SGSVJ0( JOBV, N4, N4, A, LDA, WORK, SVA, MVL, V, LDV,
+            CALL SGSVJ0( JOBV, N4, N4, A, LDA, WORK, SVA, MVL, V,
+     $                   LDV,
      $                   EPSLN, SFMIN, TOL, 2, WORK( N+1 ), LWORK-N,
      $                   IERR )
 *
-            CALL SGSVJ0( JOBV, N2, N4, A( 1, N4+1 ), LDA, WORK( N4+1 ),
+            CALL SGSVJ0( JOBV, N2, N4, A( 1, N4+1 ), LDA,
+     $                   WORK( N4+1 ),
      $                   SVA( N4+1 ), MVL, V( N4*q+1, N4+1 ), LDV,
      $                   EPSLN, SFMIN, TOL, 1, WORK( N+1 ), LWORK-N,
      $                   IERR )
@@ -858,7 +879,8 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                            IF( AAQQ.GE.ONE ) THEN
                               ROTOK = ( SMALL*AAPP ).LE.AAQQ
                               IF( AAPP.LT.( BIG / AAQQ ) ) THEN
-                                 AAPQ = ( SDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( SDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*WORK( p )*WORK( q ) /
      $                                  AAQQ ) / AAPP
                               ELSE
@@ -873,7 +895,8 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                            ELSE
                               ROTOK = AAPP.LE.( AAQQ / SMALL )
                               IF( AAPP.GT.( SMALL / AAQQ ) ) THEN
-                                 AAPQ = ( SDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( SDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*WORK( p )*WORK( q ) /
      $                                  AAQQ ) / AAPP
                               ELSE
@@ -950,7 +973,8 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                           FASTR( 4 ) = -T*AQOAP
                                           WORK( p ) = WORK( p )*CS
                                           WORK( q ) = WORK( q )*CS
-                                          CALL SROTM( M, A( 1, p ), 1,
+                                          CALL SROTM( M, A( 1, p ),
+     $                                                1,
      $                                                A( 1, q ), 1,
      $                                                FASTR )
                                           IF( RSVEC )CALL SROTM( MVL,
@@ -966,7 +990,8 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                           WORK( p ) = WORK( p )*CS
                                           WORK( q ) = WORK( q ) / CS
                                           IF( RSVEC ) THEN
-                                             CALL SAXPY( MVL, -T*AQOAP,
+                                             CALL SAXPY( MVL,
+     $                                                   -T*AQOAP,
      $                                                   V( 1, q ), 1,
      $                                                   V( 1, p ), 1 )
                                              CALL SAXPY( MVL,
@@ -980,13 +1005,15 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                           CALL SAXPY( M, T*APOAQ,
      $                                                A( 1, p ), 1,
      $                                                A( 1, q ), 1 )
-                                          CALL SAXPY( M, -CS*SN*AQOAP,
+                                          CALL SAXPY( M,
+     $                                                -CS*SN*AQOAP,
      $                                                A( 1, q ), 1,
      $                                                A( 1, p ), 1 )
                                           WORK( p ) = WORK( p ) / CS
                                           WORK( q ) = WORK( q )*CS
                                           IF( RSVEC ) THEN
-                                             CALL SAXPY( MVL, T*APOAQ,
+                                             CALL SAXPY( MVL,
+     $                                                   T*APOAQ,
      $                                                   V( 1, p ), 1,
      $                                                   V( 1, q ), 1 )
                                              CALL SAXPY( MVL,
@@ -1000,7 +1027,8 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                              CALL SAXPY( M, -T*AQOAP,
      $                                                   A( 1, q ), 1,
      $                                                   A( 1, p ), 1 )
-                                             CALL SAXPY( M, CS*SN*APOAQ,
+                                             CALL SAXPY( M,
+     $                                                   CS*SN*APOAQ,
      $                                                   A( 1, p ), 1,
      $                                                   A( 1, q ), 1 )
                                              WORK( p ) = WORK( p )*CS
@@ -1043,15 +1071,19 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
 *              .. have to use modified Gram-Schmidt like transformation
                                  CALL SCOPY( M, A( 1, p ), 1,
      $                                       WORK( N+1 ), 1 )
-                                 CALL SLASCL( 'G', 0, 0, AAPP, ONE, M,
+                                 CALL SLASCL( 'G', 0, 0, AAPP, ONE,
+     $                                        M,
      $                                        1, WORK( N+1 ), LDA,
      $                                        IERR )
-                                 CALL SLASCL( 'G', 0, 0, AAQQ, ONE, M,
+                                 CALL SLASCL( 'G', 0, 0, AAQQ, ONE,
+     $                                        M,
      $                                        1, A( 1, q ), LDA, IERR )
                                  TEMP1 = -AAPQ*WORK( p ) / WORK( q )
-                                 CALL SAXPY( M, TEMP1, WORK( N+1 ), 1,
+                                 CALL SAXPY( M, TEMP1, WORK( N+1 ),
+     $                                       1,
      $                                       A( 1, q ), 1 )
-                                 CALL SLASCL( 'G', 0, 0, ONE, AAQQ, M,
+                                 CALL SLASCL( 'G', 0, 0, ONE, AAQQ,
+     $                                        M,
      $                                        1, A( 1, q ), LDA, IERR )
                                  SVA( q ) = AAQQ*SQRT( MAX( ZERO,
      $                                      ONE-AAPQ*AAPQ ) )
@@ -1066,7 +1098,8 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = SNRM2( M, A( 1, q ), 1 )*
+                                    SVA( q ) = SNRM2( M, A( 1, q ),
+     $                                   1 )*
      $                                         WORK( q )
                                  ELSE
                                     T = ZERO
@@ -1165,7 +1198,8 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                  ROTOK = ( SMALL*AAQQ ).LE.AAPP
                               END IF
                               IF( AAPP.LT.( BIG / AAQQ ) ) THEN
-                                 AAPQ = ( SDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( SDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*WORK( p )*WORK( q ) /
      $                                  AAQQ ) / AAPP
                               ELSE
@@ -1184,7 +1218,8 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                  ROTOK = AAQQ.LE.( AAPP / SMALL )
                               END IF
                               IF( AAPP.GT.( SMALL / AAQQ ) ) THEN
-                                 AAPQ = ( SDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( SDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*WORK( p )*WORK( q ) /
      $                                  AAQQ ) / AAPP
                               ELSE
@@ -1256,7 +1291,8 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                           FASTR( 4 ) = -T*AQOAP
                                           WORK( p ) = WORK( p )*CS
                                           WORK( q ) = WORK( q )*CS
-                                          CALL SROTM( M, A( 1, p ), 1,
+                                          CALL SROTM( M, A( 1, p ),
+     $                                                1,
      $                                                A( 1, q ), 1,
      $                                                FASTR )
                                           IF( RSVEC )CALL SROTM( MVL,
@@ -1270,7 +1306,8 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
      $                                                A( 1, p ), 1,
      $                                                A( 1, q ), 1 )
                                           IF( RSVEC ) THEN
-                                             CALL SAXPY( MVL, -T*AQOAP,
+                                             CALL SAXPY( MVL,
+     $                                                   -T*AQOAP,
      $                                                   V( 1, q ), 1,
      $                                                   V( 1, p ), 1 )
                                              CALL SAXPY( MVL,
@@ -1286,11 +1323,13 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                           CALL SAXPY( M, T*APOAQ,
      $                                                A( 1, p ), 1,
      $                                                A( 1, q ), 1 )
-                                          CALL SAXPY( M, -CS*SN*AQOAP,
+                                          CALL SAXPY( M,
+     $                                                -CS*SN*AQOAP,
      $                                                A( 1, q ), 1,
      $                                                A( 1, p ), 1 )
                                           IF( RSVEC ) THEN
-                                             CALL SAXPY( MVL, T*APOAQ,
+                                             CALL SAXPY( MVL,
+     $                                                   T*APOAQ,
      $                                                   V( 1, p ), 1,
      $                                                   V( 1, q ), 1 )
                                              CALL SAXPY( MVL,
@@ -1306,7 +1345,8 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                              CALL SAXPY( M, -T*AQOAP,
      $                                                   A( 1, q ), 1,
      $                                                   A( 1, p ), 1 )
-                                             CALL SAXPY( M, CS*SN*APOAQ,
+                                             CALL SAXPY( M,
+     $                                                   CS*SN*APOAQ,
      $                                                   A( 1, p ), 1,
      $                                                   A( 1, q ), 1 )
                                              WORK( p ) = WORK( p )*CS
@@ -1349,16 +1389,20 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                  IF( AAPP.GT.AAQQ ) THEN
                                     CALL SCOPY( M, A( 1, p ), 1,
      $                                          WORK( N+1 ), 1 )
-                                    CALL SLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL SLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, WORK( N+1 ), LDA,
      $                                           IERR )
-                                    CALL SLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL SLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     TEMP1 = -AAPQ*WORK( p ) / WORK( q )
-                                    CALL SAXPY( M, TEMP1, WORK( N+1 ),
+                                    CALL SAXPY( M, TEMP1,
+     $                                          WORK( N+1 ),
      $                                          1, A( 1, q ), 1 )
-                                    CALL SLASCL( 'G', 0, 0, ONE, AAQQ,
+                                    CALL SLASCL( 'G', 0, 0, ONE,
+     $                                           AAQQ,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     SVA( q ) = AAQQ*SQRT( MAX( ZERO,
@@ -1367,16 +1411,20 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                  ELSE
                                     CALL SCOPY( M, A( 1, q ), 1,
      $                                          WORK( N+1 ), 1 )
-                                    CALL SLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL SLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, WORK( N+1 ), LDA,
      $                                           IERR )
-                                    CALL SLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL SLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     TEMP1 = -AAPQ*WORK( q ) / WORK( p )
-                                    CALL SAXPY( M, TEMP1, WORK( N+1 ),
+                                    CALL SAXPY( M, TEMP1,
+     $                                          WORK( N+1 ),
      $                                          1, A( 1, p ), 1 )
-                                    CALL SLASCL( 'G', 0, 0, ONE, AAPP,
+                                    CALL SLASCL( 'G', 0, 0, ONE,
+     $                                           AAPP,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     SVA( p ) = AAPP*SQRT( MAX( ZERO,
@@ -1392,7 +1440,8 @@ SUBROUTINE SGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = SNRM2( M, A( 1, q ), 1 )*
+                                    SVA( q ) = SNRM2( M, A( 1, q ),
+     $                                   1 )*
      $                                         WORK( q )
                                  ELSE
                                     T = ZERO
diff --git a/SRC/sgesvx.f b/SRC/sgesvx.f
index 930b88c336..a1ed6a727b 100644
--- a/SRC/sgesvx.f
+++ b/SRC/sgesvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGESVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgesvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgesvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -296,7 +294,7 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is REAL array, dimension (4*N)
+*>          WORK is REAL array, dimension (MAX(1,4*N))
 *>          On exit, WORK(1) contains the reciprocal pivot growth
 *>          factor norm(A)/norm(U). The "max absolute element" norm is
 *>          used. If WORK(1) is much less than 1, then the stability
@@ -340,12 +338,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEsolve
+*> \ingroup gesvx
 *
 *  =====================================================================
-      SUBROUTINE SGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE SGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF,
+     $                   IPIV,
      $                   EQUED, R, C, B, LDB, X, LDX, RCOND, FERR, BERR,
      $                   WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -382,7 +382,8 @@ SUBROUTINE SGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
       EXTERNAL           LSAME, SLAMCH, SLANGE, SLANTR
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGECON, SGEEQU, SGERFS, SGETRF, SGETRS, SLACPY,
+      EXTERNAL           SGECON, SGEEQU, SGERFS, SGETRF, SGETRS,
+     $                   SLACPY,
      $                   SLAQGE, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -407,7 +408,9 @@ SUBROUTINE SGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
       ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
@@ -473,7 +476,8 @@ SUBROUTINE SGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *        Compute row and column scalings to equilibrate the matrix A.
 *
-         CALL SGEEQU( N, N, A, LDA, R, C, ROWCND, COLCND, AMAX, INFEQU )
+         CALL SGEEQU( N, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
+     $                INFEQU )
          IF( INFEQU.EQ.0 ) THEN
 *
 *           Equilibrate the matrix.
@@ -548,7 +552,8 @@ SUBROUTINE SGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL SGECON( NORM, N, AF, LDAF, ANORM, RCOND, WORK, IWORK, INFO )
+      CALL SGECON( NORM, N, AF, LDAF, ANORM, RCOND, WORK, IWORK,
+     $             INFO )
 *
 *     Compute the solution matrix X.
 *
diff --git a/SRC/sgesvxx.f b/SRC/sgesvxx.f
index 35eff717aa..fcdf69f09c 100644
--- a/SRC/sgesvxx.f
+++ b/SRC/sgesvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGESVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgesvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgesvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -532,14 +530,16 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEsolve
+*> \ingroup gesvxx
 *
 *  =====================================================================
-      SUBROUTINE SGESVXX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE SGESVXX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    EQUED, R, C, B, LDB, X, LDX, RCOND, RPVGRW,
      $                    BERR, N_ERR_BNDS, ERR_BNDS_NORM,
      $                    ERR_BNDS_COMP, NPARAMS, PARAMS, WORK, IWORK,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -586,7 +586,8 @@ SUBROUTINE SGESVXX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
       REAL               SLAMCH, SLA_GERPVGRW
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEEQUB, SGETRF, SGETRS, SLACPY, SLAQGE,
+      EXTERNAL           SGEEQUB, SGETRF, SGETRS, SLACPY,
+     $                   SLAQGE,
      $                   XERBLA, SLASCL2, SGERFSX
 *     ..
 *     .. Intrinsic Functions ..
diff --git a/SRC/sgetc2.f b/SRC/sgetc2.f
index a871a03ff3..55511ac713 100644
--- a/SRC/sgetc2.f
+++ b/SRC/sgetc2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGETC2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgetc2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgetc2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,7 +96,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEauxiliary
+*> \ingroup getc2
 *
 *> \par Contributors:
 *  ==================
@@ -108,6 +106,7 @@
 *
 *  =====================================================================
       SUBROUTINE SGETC2( N, A, LDA, IPIV, JPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -132,7 +131,7 @@ SUBROUTINE SGETC2( N, A, LDA, IPIV, JPIV, INFO )
       REAL               BIGNUM, EPS, SMIN, SMLNUM, XMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGER, SLABAD, SSWAP
+      EXTERNAL           SGER, SSWAP
 *     ..
 *     .. External Functions ..
       REAL               SLAMCH
@@ -155,7 +154,6 @@ SUBROUTINE SGETC2( N, A, LDA, IPIV, JPIV, INFO )
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Handle the case N=1 by itself
 *
@@ -177,8 +175,8 @@ SUBROUTINE SGETC2( N, A, LDA, IPIV, JPIV, INFO )
 *        Find max element in matrix A
 *
          XMAX = ZERO
-         DO 20 IP = I, N
-            DO 10 JP = I, N
+         DO 20 JP = I, N
+            DO 10 IP = I, N
                IF( ABS( A( IP, JP ) ).GE.XMAX ) THEN
                   XMAX = ABS( A( IP, JP ) )
                   IPV = IP
diff --git a/SRC/sgetf2.f b/SRC/sgetf2.f
index d38c124c7a..28f9cd8e83 100644
--- a/SRC/sgetf2.f
+++ b/SRC/sgetf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGETF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgetf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgetf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup getf2
 *
 *  =====================================================================
       SUBROUTINE SGETF2( M, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -199,7 +198,8 @@ SUBROUTINE SGETF2( M, N, A, LDA, IPIV, INFO )
 *
 *           Update trailing submatrix.
 *
-            CALL SGER( M-J, N-J, -ONE, A( J+1, J ), 1, A( J, J+1 ), LDA,
+            CALL SGER( M-J, N-J, -ONE, A( J+1, J ), 1, A( J, J+1 ),
+     $                 LDA,
      $                 A( J+1, J+1 ), LDA )
          END IF
    10 CONTINUE
diff --git a/SRC/sgetrf.f b/SRC/sgetrf.f
index 7a4a2aa5a7..4676ca3cd7 100644
--- a/SRC/sgetrf.f
+++ b/SRC/sgetrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGETRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgetrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgetrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup getrf
 *
 *  =====================================================================
       SUBROUTINE SGETRF( M, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -128,7 +127,8 @@ SUBROUTINE SGETRF( M, N, A, LDA, IPIV, INFO )
       INTEGER            I, IINFO, J, JB, NB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMM, SGETRF2, SLASWP, STRSM, XERBLA
+      EXTERNAL           SGEMM, SGETRF2, SLASWP, STRSM,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
@@ -177,7 +177,8 @@ SUBROUTINE SGETRF( M, N, A, LDA, IPIV, INFO )
 *           Factor diagonal and subdiagonal blocks and test for exact
 *           singularity.
 *
-            CALL SGETRF2( M-J+1, JB, A( J, J ), LDA, IPIV( J ), IINFO )
+            CALL SGETRF2( M-J+1, JB, A( J, J ), LDA, IPIV( J ),
+     $                    IINFO )
 *
 *           Adjust INFO and the pivot indices.
 *
@@ -200,14 +201,16 @@ SUBROUTINE SGETRF( M, N, A, LDA, IPIV, INFO )
 *
 *              Compute block row of U.
 *
-               CALL STRSM( 'Left', 'Lower', 'No transpose', 'Unit', JB,
+               CALL STRSM( 'Left', 'Lower', 'No transpose', 'Unit',
+     $                     JB,
      $                     N-J-JB+1, ONE, A( J, J ), LDA, A( J, J+JB ),
      $                     LDA )
                IF( J+JB.LE.M ) THEN
 *
 *                 Update trailing submatrix.
 *
-                  CALL SGEMM( 'No transpose', 'No transpose', M-J-JB+1,
+                  CALL SGEMM( 'No transpose', 'No transpose',
+     $                        M-J-JB+1,
      $                        N-J-JB+1, JB, -ONE, A( J+JB, J ), LDA,
      $                        A( J, J+JB ), LDA, ONE, A( J+JB, J+JB ),
      $                        LDA )
diff --git a/SRC/sgetrf2.f b/SRC/sgetrf2.f
index 68ebfac46c..7ba5a22708 100644
--- a/SRC/sgetrf2.f
+++ b/SRC/sgetrf2.f
@@ -106,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup getrf2
 *
 *  =====================================================================
       RECURSIVE SUBROUTINE SGETRF2( M, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sgetri.f b/SRC/sgetri.f
index 749ede9a77..b73ff5c5ad 100644
--- a/SRC/sgetri.f
+++ b/SRC/sgetri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGETRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgetri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgetri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup getri
 *
 *  =====================================================================
       SUBROUTINE SGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -138,9 +137,12 @@ SUBROUTINE SGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
 *     .. External Functions ..
       INTEGER            ILAENV
       EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMM, SGEMV, SSWAP, STRSM, STRTRI, XERBLA
+      EXTERNAL           SGEMM, SGEMV, SSWAP, STRSM, STRTRI,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -151,8 +153,9 @@ SUBROUTINE SGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
 *
       INFO = 0
       NB = ILAENV( 1, 'SGETRI', ' ', N, -1, -1, -1 )
-      LWKOPT = N*NB
-      WORK( 1 ) = LWKOPT
+      LWKOPT = MAX( 1, N*NB )
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+*
       LQUERY = ( LWORK.EQ.-1 )
       IF( N.LT.0 ) THEN
          INFO = -1
@@ -186,7 +189,8 @@ SUBROUTINE SGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
          IWS = MAX( LDWORK*NB, 1 )
          IF( LWORK.LT.IWS ) THEN
             NB = LWORK / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'SGETRI', ' ', N, -1, -1, -1 ) )
+            NBMIN = MAX( 2, ILAENV( 2, 'SGETRI', ' ', N, -1, -1,
+     $                   -1 ) )
          END IF
       ELSE
          IWS = N
@@ -237,7 +241,8 @@ SUBROUTINE SGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
      $         CALL SGEMM( 'No transpose', 'No transpose', N, JB,
      $                     N-J-JB+1, -ONE, A( 1, J+JB ), LDA,
      $                     WORK( J+JB ), LDWORK, ONE, A( 1, J ), LDA )
-            CALL STRSM( 'Right', 'Lower', 'No transpose', 'Unit', N, JB,
+            CALL STRSM( 'Right', 'Lower', 'No transpose', 'Unit', N,
+     $                  JB,
      $                  ONE, WORK( J ), LDWORK, A( 1, J ), LDA )
    50    CONTINUE
       END IF
@@ -250,7 +255,7 @@ SUBROUTINE SGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
      $      CALL SSWAP( N, A( 1, J ), 1, A( 1, JP ), 1 )
    60 CONTINUE
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK( IWS )
       RETURN
 *
 *     End of SGETRI
diff --git a/SRC/sgetrs.f b/SRC/sgetrs.f
index e5f3e3a90f..66916d6dbe 100644
--- a/SRC/sgetrs.f
+++ b/SRC/sgetrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGETRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgetrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgetrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -114,10 +112,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup getrs
 *
 *  =====================================================================
       SUBROUTINE SGETRS( TRANS, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -189,7 +188,8 @@ SUBROUTINE SGETRS( TRANS, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *
 *        Solve L*X = B, overwriting B with X.
 *
-         CALL STRSM( 'Left', 'Lower', 'No transpose', 'Unit', N, NRHS,
+         CALL STRSM( 'Left', 'Lower', 'No transpose', 'Unit', N,
+     $               NRHS,
      $               ONE, A, LDA, B, LDB )
 *
 *        Solve U*X = B, overwriting B with X.
@@ -202,12 +202,14 @@ SUBROUTINE SGETRS( TRANS, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *
 *        Solve U**T *X = B, overwriting B with X.
 *
-         CALL STRSM( 'Left', 'Upper', 'Transpose', 'Non-unit', N, NRHS,
+         CALL STRSM( 'Left', 'Upper', 'Transpose', 'Non-unit', N,
+     $               NRHS,
      $               ONE, A, LDA, B, LDB )
 *
 *        Solve L**T *X = B, overwriting B with X.
 *
-         CALL STRSM( 'Left', 'Lower', 'Transpose', 'Unit', N, NRHS, ONE,
+         CALL STRSM( 'Left', 'Lower', 'Transpose', 'Unit', N, NRHS,
+     $               ONE,
      $               A, LDA, B, LDB )
 *
 *        Apply row interchanges to the solution vectors.
diff --git a/SRC/sgetsls.f b/SRC/sgetsls.f
index 3d1f6e02cf..246d544f63 100644
--- a/SRC/sgetsls.f
+++ b/SRC/sgetsls.f
@@ -22,8 +22,17 @@
 *>
 *> SGETSLS solves overdetermined or underdetermined real linear systems
 *> involving an M-by-N matrix A, using a tall skinny QR or short wide LQ
-*> factorization of A.  It is assumed that A has full rank.
+*> factorization of A.
 *>
+*> It is assumed that A has full rank, and only a rudimentary protection
+*> against rank-deficient matrices is provided. This subroutine only detects
+*> exact rank-deficiency, where a diagonal element of the triangular factor
+*> of A is exactly zero.
+*>
+*> It is conceivable for one (or more) of the diagonal elements of the triangular
+*> factor of A to be subnormally tiny numbers without this subroutine signalling
+*> an error. The solutions computed for such almost-rank-deficient matrices may
+*> be less accurate due to a loss of numerical precision.
 *>
 *>
 *> The following options are provided:
@@ -127,7 +136,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1 or -2, then a workspace query is assumed.
 *>          If LWORK = -1, the routine calculates optimal size of WORK for the
 *>          optimal performance and returns this value in WORK(1).
@@ -141,7 +150,7 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO =  i, the i-th diagonal element of the
-*>                triangular factor of A is zero, so that A does not have
+*>                triangular factor of A is exactly zero, so that A does not have
 *>                full rank; the least squares solution could not be
 *>                computed.
 *> \endverbatim
@@ -154,11 +163,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEsolve
+*> \ingroup getsls
 *
 *  =====================================================================
       SUBROUTINE SGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
      $                    WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -181,32 +191,30 @@ SUBROUTINE SGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, TRAN
-      INTEGER            I, IASCL, IBSCL, J, MINMN, MAXMN, BROW,
-     $                   SCLLEN, MNK, TSZO, TSZM, LWO, LWM, LW1, LW2,
+      INTEGER            I, IASCL, IBSCL, J, MAXMN, BROW,
+     $                   SCLLEN, TSZO, TSZM, LWO, LWM, LW1, LW2,
      $                   WSIZEO, WSIZEM, INFO2
       REAL               ANRM, BIGNUM, BNRM, SMLNUM, TQ( 5 ), WORKQ( 1 )
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      INTEGER            ILAENV
-      REAL               SLAMCH, SLANGE
-      EXTERNAL           LSAME, ILAENV, SLABAD, SLAMCH, SLANGE
+      REAL               SLAMCH, SLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, SLANGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SGEQR, SGEMQR, SLASCL, SLASET,
      $                   STRTRS, XERBLA, SGELQ, SGEMLQ
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          REAL, MAX, MIN, INT
+      INTRINSIC          MAX, MIN, INT
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input arguments.
 *
       INFO = 0
-      MINMN = MIN( M, N )
       MAXMN = MAX( M, N )
-      MNK   = MAX( MINMN, NRHS )
       TRAN  = LSAME( TRANS, 'T' )
 *
       LQUERY = ( LWORK.EQ.-1 .OR. LWORK.EQ.-2 )
@@ -227,9 +235,12 @@ SUBROUTINE SGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
 *
       IF( INFO.EQ.0 ) THEN
 *
-*     Determine the block size and minimum LWORK
+*     Determine the optimum and minimum LWORK
 *
-       IF( M.GE.N ) THEN
+       IF( MIN( M, N, NRHS ).EQ.0 ) THEN
+         WSIZEO = 1
+         WSIZEM = 1
+       ELSE IF( M.GE.N ) THEN
          CALL SGEQR( M, N, A, LDA, TQ, -1, WORKQ, -1, INFO2 )
          TSZO = INT( TQ( 1 ) )
          LWO  = INT( WORKQ( 1 ) )
@@ -264,17 +275,17 @@ SUBROUTINE SGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
        IF( ( LWORK.LT.WSIZEM ).AND.( .NOT.LQUERY ) ) THEN
           INFO = -10
        END IF
+*
+       WORK( 1 ) = SROUNDUP_LWORK( WSIZEO )
 *
       END IF
 *
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'SGETSLS', -INFO )
-        WORK( 1 ) = REAL( WSIZEO )
         RETURN
       END IF
       IF( LQUERY ) THEN
-        IF( LWORK.EQ.-1 ) WORK( 1 ) = REAL( WSIZEO )
-        IF( LWORK.EQ.-2 ) WORK( 1 ) = REAL( WSIZEM )
+        IF( LWORK.EQ.-2 ) WORK( 1 ) = SROUNDUP_LWORK( WSIZEM )
         RETURN
       END IF
       IF( LWORK.LT.WSIZEO ) THEN
@@ -297,7 +308,6 @@ SUBROUTINE SGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
 *
        SMLNUM = SLAMCH( 'S' ) / SLAMCH( 'P' )
        BIGNUM = ONE / SMLNUM
-       CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A, B if max element outside range [SMLNUM,BIGNUM]
 *
@@ -485,7 +495,7 @@ SUBROUTINE SGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
       END IF
 *
    50 CONTINUE
-      WORK( 1 ) = REAL( TSZO + LWO )
+      WORK( 1 ) = SROUNDUP_LWORK( TSZO + LWO )
       RETURN
 *
 *     End of SGETSLS
diff --git a/SRC/sgetsqrhrt.f b/SRC/sgetsqrhrt.f
index f9580da7b4..efc9a64cb1 100644
--- a/SRC/sgetsqrhrt.f
+++ b/SRC/sgetsqrhrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGETSQRHRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgetsqrhrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgetsqrhrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,14 +128,17 @@
 *>
 *> \param[in] LWORK
 *> \verbatim
+*>          LWORK is INTEGER
 *>          The dimension of the array WORK.
-*>          LWORK >= MAX( LWT + LW1, MAX( LWT+N*N+LW2, LWT+N*N+N ) ),
+*>          If MIN(M,N) = 0, LWORK >= 1, else
+*>          LWORK >= MAX( 1, LWT + LW1, MAX( LWT+N*N+LW2, LWT+N*N+N ) ),
 *>          where
 *>             NUM_ALL_ROW_BLOCKS = CEIL((M-N)/(MB1-N)),
 *>             NB1LOCAL = MIN(NB1,N).
 *>             LWT = NUM_ALL_ROW_BLOCKS * N * NB1LOCAL,
 *>             LW1 = NB1LOCAL * N,
-*>             LW2 = NB1LOCAL * MAX( NB1LOCAL, ( N - NB1LOCAL ) ),
+*>             LW2 = NB1LOCAL * MAX( NB1LOCAL, ( N - NB1LOCAL ) ).
+*>
 *>          If LWORK = -1, then a workspace query is assumed.
 *>          The routine only calculates the optimal size of the WORK
 *>          array, returns this value as the first entry of the WORK
@@ -160,7 +161,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup singleOTHERcomputational
+*> \ingroup getsqrhrt
 *
 *> \par Contributors:
 *  ==================
@@ -174,7 +175,8 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
+      SUBROUTINE SGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT,
+     $                       WORK,
      $                       LWORK, INFO )
       IMPLICIT NONE
 *
@@ -200,8 +202,13 @@ SUBROUTINE SGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
       INTEGER            I, IINFO, J, LW1, LW2, LWT, LDWT, LWORKOPT,
      $                   NB1LOCAL, NB2LOCAL, NUM_ALL_ROW_BLOCKS
 *     ..
+*     .. External Functions ..
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
+*     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLATSQR, SORGTSQR_ROW, SORHR_COL,
+      EXTERNAL           SCOPY, SLATSQR, SORGTSQR_ROW,
+     $                   SORHR_COL,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -212,7 +219,7 @@ SUBROUTINE SGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
 *     Test the input arguments
 *
       INFO = 0
-      LQUERY  = LWORK.EQ.-1
+      LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
       ELSE IF( N.LT.0 .OR. M.LT.N ) THEN
@@ -225,7 +232,7 @@ SUBROUTINE SGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
          INFO = -5
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -7
-      ELSE IF( LDT.LT.MAX( 1,  MIN( NB2, N ) ) ) THEN
+      ELSE IF( LDT.LT.MAX( 1, MIN( NB2, N ) ) ) THEN
          INFO = -9
       ELSE
 *
@@ -263,8 +270,9 @@ SUBROUTINE SGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
             LW2 = NB1LOCAL * MAX( NB1LOCAL, ( N - NB1LOCAL ) )
 *
             LWORKOPT = MAX( LWT + LW1, MAX( LWT+N*N+LW2, LWT+N*N+N ) )
+            LWORKOPT = MAX( 1, LWORKOPT )
 *
-            IF( ( LWORK.LT.MAX( 1, LWORKOPT ) ).AND.(.NOT.LQUERY) ) THEN
+            IF( LWORK.LT.LWORKOPT .AND. .NOT.LQUERY ) THEN
                INFO = -11
             END IF
 *
@@ -277,14 +285,14 @@ SUBROUTINE SGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
          CALL XERBLA( 'SGETSQRHRT', -INFO )
          RETURN
       ELSE IF ( LQUERY ) THEN
-         WORK( 1 ) = REAL( LWORKOPT )
+         WORK( 1 ) = SROUNDUP_LWORK( LWORKOPT )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
       IF( MIN( M, N ).EQ.0 ) THEN
-         WORK( 1 ) = REAL( LWORKOPT )
+         WORK( 1 ) = SROUNDUP_LWORK( LWORKOPT )
          RETURN
       END IF
 *
@@ -337,13 +345,14 @@ SUBROUTINE SGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
                A( I, J ) = -ONE * WORK( LWT+N*(J-1)+I )
             END DO
          ELSE
-            CALL SCOPY( N-I+1, WORK(LWT+N*(I-1)+I), N, A( I, I ), LDA )
+            CALL SCOPY( N-I+1, WORK(LWT+N*(I-1)+I), N, A( I, I ),
+     $                  LDA )
          END IF
       END DO
 *
-      WORK( 1 ) = REAL( LWORKOPT )
+      WORK( 1 ) = SROUNDUP_LWORK( LWORKOPT )
       RETURN
 *
 *     End of SGETSQRHRT
 *
-      END
\ No newline at end of file
+      END
diff --git a/SRC/sggbak.f b/SRC/sggbak.f
index bb7f360112..e0a09c7866 100644
--- a/SRC/sggbak.f
+++ b/SRC/sggbak.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGBAK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sggbak.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sggbak.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,7 +128,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBcomputational
+*> \ingroup ggbak
 *
 *> \par Further Details:
 *  =====================
@@ -142,8 +140,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
+      SUBROUTINE SGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M,
+     $                   V,
      $                   LDV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -181,8 +181,10 @@ SUBROUTINE SGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
       LEFTV = LSAME( SIDE, 'L' )
 *
       INFO = 0
-      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
-     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+      IF( .NOT.LSAME( JOB, 'N' ) .AND.
+     $    .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND.
+     $                .NOT.LSAME( JOB, 'B' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.RIGHTV .AND. .NOT.LEFTV ) THEN
          INFO = -2
@@ -252,7 +254,7 @@ SUBROUTINE SGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
      $         GO TO 50
 *
             DO 40 I = ILO - 1, 1, -1
-               K = RSCALE( I )
+               K = INT( RSCALE( I ) )
                IF( K.EQ.I )
      $            GO TO 40
                CALL SSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
@@ -262,7 +264,7 @@ SUBROUTINE SGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
             IF( IHI.EQ.N )
      $         GO TO 70
             DO 60 I = IHI + 1, N
-               K = RSCALE( I )
+               K = INT( RSCALE( I ) )
                IF( K.EQ.I )
      $            GO TO 60
                CALL SSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
@@ -276,7 +278,7 @@ SUBROUTINE SGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
             IF( ILO.EQ.1 )
      $         GO TO 90
             DO 80 I = ILO - 1, 1, -1
-               K = LSCALE( I )
+               K = INT( LSCALE( I ) )
                IF( K.EQ.I )
      $            GO TO 80
                CALL SSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
@@ -286,7 +288,7 @@ SUBROUTINE SGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
             IF( IHI.EQ.N )
      $         GO TO 110
             DO 100 I = IHI + 1, N
-               K = LSCALE( I )
+               K = INT( LSCALE( I ) )
                IF( K.EQ.I )
      $            GO TO 100
                CALL SSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
diff --git a/SRC/sggbal.f b/SRC/sggbal.f
index 6cfdbcdba7..6eafc67d75 100644
--- a/SRC/sggbal.f
+++ b/SRC/sggbal.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGBAL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sggbal.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sggbal.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,7 +158,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBcomputational
+*> \ingroup ggbal
 *
 *> \par Further Details:
 *  =====================
@@ -174,6 +172,7 @@
 *  =====================================================================
       SUBROUTINE SGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
      $                   RSCALE, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -221,8 +220,10 @@ SUBROUTINE SGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
 *     Test the input parameters
 *
       INFO = 0
-      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
-     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+      IF( .NOT.LSAME( JOB, 'N' ) .AND.
+     $    .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND.
+     $                .NOT.LSAME( JOB, 'B' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -337,7 +338,7 @@ SUBROUTINE SGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
 *     Permute rows M and I
 *
   160 CONTINUE
-      LSCALE( M ) = I
+      LSCALE( M ) = REAL( I )
       IF( I.EQ.M )
      $   GO TO 170
       CALL SSWAP( N-K+1, A( I, K ), LDA, A( M, K ), LDA )
@@ -346,7 +347,7 @@ SUBROUTINE SGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
 *     Permute columns M and J
 *
   170 CONTINUE
-      RSCALE( M ) = J
+      RSCALE( M ) = REAL( J )
       IF( J.EQ.M )
      $   GO TO 180
       CALL SSWAP( L, A( 1, J ), 1, A( 1, M ), 1 )
@@ -501,8 +502,10 @@ SUBROUTINE SGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
       IF( CMAX.LT.HALF )
      $   GO TO 350
 *
-      CALL SAXPY( NR, -ALPHA, WORK( ILO+2*N ), 1, WORK( ILO+4*N ), 1 )
-      CALL SAXPY( NR, -ALPHA, WORK( ILO+3*N ), 1, WORK( ILO+5*N ), 1 )
+      CALL SAXPY( NR, -ALPHA, WORK( ILO+2*N ), 1, WORK( ILO+4*N ),
+     $            1 )
+      CALL SAXPY( NR, -ALPHA, WORK( ILO+3*N ), 1, WORK( ILO+5*N ),
+     $            1 )
 *
       PGAMMA = GAMMA
       IT = IT + 1
@@ -522,7 +525,7 @@ SUBROUTINE SGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
          IRAB = ISAMAX( N-ILO+1, B( I, ILO ), LDB )
          RAB = MAX( RAB, ABS( B( I, IRAB+ILO-1 ) ) )
          LRAB = INT( LOG10( RAB+SFMIN ) / BASL+ONE )
-         IR = LSCALE( I ) + SIGN( HALF, LSCALE( I ) )
+         IR = INT( LSCALE( I ) + SIGN( HALF, LSCALE( I ) ) )
          IR = MIN( MAX( IR, LSFMIN ), LSFMAX, LSFMAX-LRAB )
          LSCALE( I ) = SCLFAC**IR
          ICAB = ISAMAX( IHI, A( 1, I ), 1 )
@@ -530,7 +533,7 @@ SUBROUTINE SGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
          ICAB = ISAMAX( IHI, B( 1, I ), 1 )
          CAB = MAX( CAB, ABS( B( ICAB, I ) ) )
          LCAB = INT( LOG10( CAB+SFMIN ) / BASL+ONE )
-         JC = RSCALE( I ) + SIGN( HALF, RSCALE( I ) )
+         JC = INT( RSCALE( I ) + SIGN( HALF, RSCALE( I ) ) )
          JC = MIN( MAX( JC, LSFMIN ), LSFMAX, LSFMAX-LCAB )
          RSCALE( I ) = SCLFAC**JC
   360 CONTINUE
diff --git a/SRC/sgges.f b/SRC/sgges.f
index 3834aea000..074e6a5b07 100644
--- a/SRC/sgges.f
+++ b/SRC/sgges.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGES + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgges.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgges.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -275,12 +273,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEeigen
+*> \ingroup gges
 *
 *  =====================================================================
-      SUBROUTINE SGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
+      SUBROUTINE SGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
+     $                  LDB,
      $                  SDIM, ALPHAR, ALPHAI, BETA, VSL, LDVSL, VSR,
      $                  LDVSR, WORK, LWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -321,15 +321,16 @@ SUBROUTINE SGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
       REAL               DIF( 2 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEQRF, SGGBAK, SGGBAL, SGGHRD, SHGEQZ, SLABAD,
-     $                   SLACPY, SLASCL, SLASET, SORGQR, SORMQR, STGSEN,
-     $                   XERBLA
+      EXTERNAL           SGEQRF, SGGBAK, SGGBAL, SGGHRD, SHGEQZ,
+     $                   SLACPY,
+     $                   SLASCL, SLASET, SORGQR, SORMQR, STGSEN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANGE
-      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANGE
+      REAL               SLAMCH, SLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
@@ -370,7 +371,8 @@ SUBROUTINE SGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
          INFO = -1
       ELSE IF( IJOBVR.LE.0 ) THEN
          INFO = -2
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
          INFO = -5
@@ -400,13 +402,14 @@ SUBROUTINE SGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
      $                    N*ILAENV( 1, 'SORMQR', ' ', N, 1, N, -1 ) )
             IF( ILVSL ) THEN
                MAXWRK = MAX( MAXWRK, MINWRK - N +
-     $                       N*ILAENV( 1, 'SORGQR', ' ', N, 1, N, -1 ) )
+     $                       N*ILAENV( 1, 'SORGQR', ' ', N, 1, N,
+     $                                 -1 ) )
             END IF
          ELSE
             MINWRK = 1
             MAXWRK = 1
          END IF
-         WORK( 1 ) = MAXWRK
+         WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY )
      $      INFO = -19
@@ -431,7 +434,6 @@ SUBROUTINE SGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
       EPS = SLAMCH( 'P' )
       SAFMIN = SLAMCH( 'S' )
       SAFMAX = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       SMLNUM = SQRT( SAFMIN ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -546,15 +548,18 @@ SUBROUTINE SGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
      $                   IERR )
          END IF
          IF( ILBSCL )
-     $      CALL SLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N, IERR )
+     $      CALL SLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N,
+     $                   IERR )
 *
 *        Select eigenvalues
 *
          DO 10 I = 1, N
-            BWORK( I ) = SELCTG( ALPHAR( I ), ALPHAI( I ), BETA( I ) )
+            BWORK( I ) = SELCTG( ALPHAR( I ), ALPHAI( I ),
+     $             BETA( I ) )
    10    CONTINUE
 *
-         CALL STGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB, ALPHAR,
+         CALL STGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB,
+     $                ALPHAR,
      $                ALPHAI, BETA, VSL, LDVSL, VSR, LDVSR, SDIM, PVSL,
      $                PVSR, DIF, WORK( IWRK ), LWORK-IWRK+1, IDUM, 1,
      $                IERR )
@@ -616,8 +621,10 @@ SUBROUTINE SGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
 *
       IF( ILASCL ) THEN
          CALL SLASCL( 'H', 0, 0, ANRMTO, ANRM, N, N, A, LDA, IERR )
-         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N, IERR )
-         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N, IERR )
+         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N,
+     $                IERR )
+         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N,
+     $                IERR )
       END IF
 *
       IF( ILBSCL ) THEN
@@ -668,7 +675,7 @@ SUBROUTINE SGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
 *
    40 CONTINUE
 *
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
 *
       RETURN
 *
diff --git a/SRC/sgges3.f b/SRC/sgges3.f
index b27704ff50..639efbee21 100644
--- a/SRC/sgges3.f
+++ b/SRC/sgges3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGES3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgges3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgges3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -234,6 +232,8 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK.
+*>          If N = 0, LWORK >= 1, else LWORK >= 6*N+16.
+*>          For good performance, LWORK must generally be larger.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -273,12 +273,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEeigen
+*> \ingroup gges3
 *
 *  =====================================================================
       SUBROUTINE SGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
      $                   LDB, SDIM, ALPHAR, ALPHAI, BETA, VSL, LDVSL,
      $                   VSR, LDVSR, WORK, LWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -309,7 +310,8 @@ SUBROUTINE SGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
       LOGICAL            CURSL, ILASCL, ILBSCL, ILVSL, ILVSR, LASTSL,
      $                   LQUERY, LST2SL, WANTST
       INTEGER            I, ICOLS, IERR, IHI, IJOBVL, IJOBVR, ILEFT,
-     $                   ILO, IP, IRIGHT, IROWS, ITAU, IWRK, LWKOPT
+     $                   ILO, IP, IRIGHT, IROWS, ITAU, IWRK, LWKOPT,
+     $                   LWKMIN
       REAL               ANRM, ANRMTO, BIGNUM, BNRM, BNRMTO, EPS, PVSL,
      $                   PVSR, SAFMAX, SAFMIN, SMLNUM
 *     ..
@@ -318,14 +320,15 @@ SUBROUTINE SGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
       REAL               DIF( 2 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEQRF, SGGBAK, SGGBAL, SGGHD3, SLAQZ0, SLABAD,
-     $                   SLACPY, SLASCL, SLASET, SORGQR, SORMQR, STGSEN,
-     $                   XERBLA
+      EXTERNAL           SGEQRF, SGGBAK, SGGBAL, SGGHD3, SLAQZ0,
+     $                   SLACPY,
+     $                   SLASCL, SLASET, SORGQR, SORMQR, STGSEN, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               SLAMCH, SLANGE
-      EXTERNAL           LSAME, SLAMCH, SLANGE
+      REAL               SLAMCH, SLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, SLANGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
@@ -362,11 +365,18 @@ SUBROUTINE SGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
+      IF( N.EQ.0 ) THEN
+         LWKMIN = 1
+      ELSE
+         LWKMIN = 6*N+16
+      END IF
+*
       IF( IJOBVL.LE.0 ) THEN
          INFO = -1
       ELSE IF( IJOBVR.LE.0 ) THEN
          INFO = -2
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
          INFO = -5
@@ -378,7 +388,7 @@ SUBROUTINE SGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
          INFO = -15
       ELSE IF( LDVSR.LT.1 .OR. ( ILVSR .AND. LDVSR.LT.N ) ) THEN
          INFO = -17
-      ELSE IF( LWORK.LT.6*N+16 .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -19
       END IF
 *
@@ -386,7 +396,7 @@ SUBROUTINE SGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
 *
       IF( INFO.EQ.0 ) THEN
          CALL SGEQRF( N, N, B, LDB, WORK, WORK, -1, IERR )
-         LWKOPT = MAX( 6*N+16, 3*N+INT( WORK( 1 ) ) )
+         LWKOPT = MAX( LWKMIN, 3*N+INT( WORK( 1 ) ) )
          CALL SORMQR( 'L', 'T', N, N, N, B, LDB, WORK, A, LDA, WORK,
      $                -1, IERR )
          LWKOPT = MAX( LWKOPT, 3*N+INT( WORK( 1 ) ) )
@@ -408,7 +418,11 @@ SUBROUTINE SGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
      $                   IERR )
             LWKOPT = MAX( LWKOPT, 2*N+INT( WORK( 1 ) ) )
          END IF
-         WORK( 1 ) = LWKOPT
+         IF( N.EQ.0 ) THEN
+            WORK( 1 ) = 1
+         ELSE
+            WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+         END IF
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -422,6 +436,7 @@ SUBROUTINE SGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
 *
       IF( N.EQ.0 ) THEN
          SDIM = 0
+         WORK( 1 ) = 1
          RETURN
       END IF
 *
@@ -430,7 +445,6 @@ SUBROUTINE SGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
       EPS = SLAMCH( 'P' )
       SAFMIN = SLAMCH( 'S' )
       SAFMAX = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       SMLNUM = SQRT( SAFMIN ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -538,15 +552,18 @@ SUBROUTINE SGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
      $                   IERR )
          END IF
          IF( ILBSCL )
-     $      CALL SLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N, IERR )
+     $      CALL SLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N,
+     $                   IERR )
 *
 *        Select eigenvalues
 *
          DO 10 I = 1, N
-            BWORK( I ) = SELCTG( ALPHAR( I ), ALPHAI( I ), BETA( I ) )
+            BWORK( I ) = SELCTG( ALPHAR( I ), ALPHAI( I ),
+     $             BETA( I ) )
    10    CONTINUE
 *
-         CALL STGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB, ALPHAR,
+         CALL STGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB,
+     $                ALPHAR,
      $                ALPHAI, BETA, VSL, LDVSL, VSR, LDVSR, SDIM, PVSL,
      $                PVSR, DIF, WORK( IWRK ), LWORK-IWRK+1, IDUM, 1,
      $                IERR )
@@ -607,8 +624,10 @@ SUBROUTINE SGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
 *
       IF( ILASCL ) THEN
          CALL SLASCL( 'H', 0, 0, ANRMTO, ANRM, N, N, A, LDA, IERR )
-         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N, IERR )
-         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N, IERR )
+         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N,
+     $                IERR )
+         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N,
+     $                IERR )
       END IF
 *
       IF( ILBSCL ) THEN
@@ -659,7 +678,7 @@ SUBROUTINE SGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
 *
    40 CONTINUE
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       RETURN
 *
diff --git a/SRC/sggesx.f b/SRC/sggesx.f
index a6c0443bac..3b7456c5db 100644
--- a/SRC/sggesx.f
+++ b/SRC/sggesx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGESX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sggesx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sggesx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -337,7 +335,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEeigen
+*> \ingroup ggesx
 *
 *> \par Further Details:
 *  =====================
@@ -358,10 +356,12 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
+      SUBROUTINE SGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A,
+     $                   LDA,
      $                   B, LDB, SDIM, ALPHAR, ALPHAI, BETA, VSL, LDVSL,
      $                   VSR, LDVSR, RCONDE, RCONDV, WORK, LWORK, IWORK,
      $                   LIWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -405,15 +405,16 @@ SUBROUTINE SGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
       REAL               DIF( 2 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEQRF, SGGBAK, SGGBAL, SGGHRD, SHGEQZ, SLABAD,
-     $                   SLACPY, SLASCL, SLASET, SORGQR, SORMQR, STGSEN,
-     $                   XERBLA
+      EXTERNAL           SGEQRF, SGGBAK, SGGBAL, SGGHRD, SHGEQZ,
+     $                   SLACPY,
+     $                   SLASCL, SLASET, SORGQR, SORMQR, STGSEN, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANGE
-      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANGE
+      REAL               SLAMCH, SLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
@@ -467,7 +468,8 @@ SUBROUTINE SGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
          INFO = -1
       ELSE IF( IJOBVR.LE.0 ) THEN
          INFO = -2
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( .NOT.( WANTSN .OR. WANTSE .OR. WANTSV .OR. WANTSB ) .OR.
      $         ( .NOT.WANTST .AND. .NOT.WANTSN ) ) THEN
@@ -510,7 +512,7 @@ SUBROUTINE SGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
             MAXWRK = 1
             LWRK   = 1
          END IF
-         WORK( 1 ) = LWRK
+         WORK( 1 ) = SROUNDUP_LWORK(LWRK)
          IF( WANTSN .OR. N.EQ.0 ) THEN
             LIWMIN = 1
          ELSE
@@ -544,7 +546,6 @@ SUBROUTINE SGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
       EPS = SLAMCH( 'P' )
       SAFMIN = SLAMCH( 'S' )
       SAFMAX = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       SMLNUM = SQRT( SAFMIN ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -662,12 +663,14 @@ SUBROUTINE SGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
      $                   IERR )
          END IF
          IF( ILBSCL )
-     $      CALL SLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N, IERR )
+     $      CALL SLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N,
+     $                   IERR )
 *
 *        Select eigenvalues
 *
          DO 10 I = 1, N
-            BWORK( I ) = SELCTG( ALPHAR( I ), ALPHAI( I ), BETA( I ) )
+            BWORK( I ) = SELCTG( ALPHAR( I ), ALPHAI( I ),
+     $             BETA( I ) )
    10    CONTINUE
 *
 *        Reorder eigenvalues, transform Generalized Schur vectors, and
@@ -755,8 +758,10 @@ SUBROUTINE SGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
 *
       IF( ILASCL ) THEN
          CALL SLASCL( 'H', 0, 0, ANRMTO, ANRM, N, N, A, LDA, IERR )
-         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N, IERR )
-         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N, IERR )
+         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N,
+     $                IERR )
+         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N,
+     $                IERR )
       END IF
 *
       IF( ILBSCL ) THEN
@@ -807,7 +812,7 @@ SUBROUTINE SGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
 *
    50 CONTINUE
 *
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/sggev.f b/SRC/sggev.f
index 69744b72b4..2402851d54 100644
--- a/SRC/sggev.f
+++ b/SRC/sggev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sggev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sggev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -218,11 +216,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEeigen
+*> \ingroup ggev
 *
 *  =====================================================================
-      SUBROUTINE SGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
+      SUBROUTINE SGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
+     $                  ALPHAI,
      $                  BETA, VL, LDVL, VR, LDVR, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -257,15 +257,16 @@ SUBROUTINE SGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
       LOGICAL            LDUMMA( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEQRF, SGGBAK, SGGBAL, SGGHRD, SHGEQZ, SLABAD,
-     $                   SLACPY, SLASCL, SLASET, SORGQR, SORMQR, STGEVC,
-     $                   XERBLA
+      EXTERNAL           SGEQRF, SGGBAK, SGGBAL, SGGHRD, SHGEQZ,
+     $                   SLACPY,
+     $                   SLASCL, SLASET, SORGQR, SORMQR, STGEVC, XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANGE
-      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANGE
+      REAL               SLAMCH, SLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SLAMCH,
+     $                   SLANGE, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
@@ -335,7 +336,7 @@ SUBROUTINE SGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
             MAXWRK = MAX( MAXWRK, N*( 7 +
      $                 ILAENV( 1, 'SORGQR', ' ', N, 1, N, -1 ) ) )
          END IF
-         WORK( 1 ) = MAXWRK
+         WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY )
      $      INFO = -16
@@ -358,7 +359,6 @@ SUBROUTINE SGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -489,7 +489,8 @@ SUBROUTINE SGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
          ELSE
             CHTEMP = 'R'
          END IF
-         CALL STGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL, LDVL,
+         CALL STGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL,
+     $                LDVL,
      $                VR, LDVR, N, IN, WORK( IWRK ), IERR )
          IF( IERR.NE.0 ) THEN
             INFO = N + 2
@@ -573,15 +574,17 @@ SUBROUTINE SGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
   110 CONTINUE
 *
       IF( ILASCL ) THEN
-         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N, IERR )
-         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N, IERR )
+         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N,
+     $                IERR )
+         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N,
+     $                IERR )
       END IF
 *
       IF( ILBSCL ) THEN
          CALL SLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N, IERR )
       END IF
 *
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
       RETURN
 *
 *     End of SGGEV
diff --git a/SRC/sggev3.f b/SRC/sggev3.f
index 945c3a017d..2935541d54 100644
--- a/SRC/sggev3.f
+++ b/SRC/sggev3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGEV3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sggev3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sggev3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -189,6 +187,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
+*>          The dimension of the array WORK. LWORK >= MAX(1,8*N).
+*>          For good performance, LWORK should generally be larger.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -217,12 +217,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEeigen
+*> \ingroup ggev3
 *
 *  =====================================================================
       SUBROUTINE SGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
      $                   ALPHAI, BETA, VL, LDVL, VR, LDVR, WORK, LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -248,7 +249,8 @@ SUBROUTINE SGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
       LOGICAL            ILASCL, ILBSCL, ILV, ILVL, ILVR, LQUERY
       CHARACTER          CHTEMP
       INTEGER            ICOLS, IERR, IHI, IJOBVL, IJOBVR, ILEFT, ILO,
-     $                   IN, IRIGHT, IROWS, ITAU, IWRK, JC, JR, LWKOPT
+     $                   IN, IRIGHT, IROWS, ITAU, IWRK, JC, JR, LWKOPT,
+     $                   LWKMIN
       REAL               ANRM, ANRMTO, BIGNUM, BNRM, BNRMTO, EPS,
      $                   SMLNUM, TEMP
 *     ..
@@ -256,14 +258,16 @@ SUBROUTINE SGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
       LOGICAL            LDUMMA( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEQRF, SGGBAK, SGGBAL, SGGHD3, SLAQZ0, SLABAD,
-     $                   SLACPY, SLASCL, SLASET, SORGQR, SORMQR, STGEVC,
-     $                   XERBLA
+      EXTERNAL           SGEQRF, SGGBAK, SGGBAL,
+     $                   SGGHD3, SLAQZ0, SLACPY,
+     $                   SLASCL, SLASET, SORGQR,
+     $                   SORMQR, STGEVC
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               SLAMCH, SLANGE
-      EXTERNAL           LSAME, SLAMCH, SLANGE
+      REAL               SLAMCH, SLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, SLANGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
@@ -299,6 +303,7 @@ SUBROUTINE SGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
+      LWKMIN = MAX( 1, 8*N )
       IF( IJOBVL.LE.0 ) THEN
          INFO = -1
       ELSE IF( IJOBVR.LE.0 ) THEN
@@ -313,7 +318,7 @@ SUBROUTINE SGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
          INFO = -12
       ELSE IF( LDVR.LT.1 .OR. ( ILVR .AND. LDVR.LT.N ) ) THEN
          INFO = -14
-      ELSE IF( LWORK.LT.MAX( 1, 8*N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -16
       END IF
 *
@@ -321,28 +326,32 @@ SUBROUTINE SGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
 *
       IF( INFO.EQ.0 ) THEN
          CALL SGEQRF( N, N, B, LDB, WORK, WORK, -1, IERR )
-         LWKOPT = MAX( 1, 8*N, 3*N+INT ( WORK( 1 ) ) )
+         LWKOPT = MAX( LWKMIN, 3*N+INT( WORK( 1 ) ) )
          CALL SORMQR( 'L', 'T', N, N, N, B, LDB, WORK, A, LDA, WORK,
      $                -1, IERR )
-         LWKOPT = MAX( LWKOPT, 3*N+INT ( WORK( 1 ) ) )
-         CALL SGGHD3( JOBVL, JOBVR, N, 1, N, A, LDA, B, LDB, VL, LDVL,
+         LWKOPT = MAX( LWKOPT, 3*N+INT( WORK( 1 ) ) )
+         CALL SGGHD3( JOBVL, JOBVR, N, 1, N, A, LDA,
+     $                B, LDB, VL, LDVL,
      $                VR, LDVR, WORK, -1, IERR )
-         LWKOPT = MAX( LWKOPT, 3*N+INT ( WORK( 1 ) ) )
+         LWKOPT = MAX( LWKOPT, 3*N+INT( WORK( 1 ) ) )
          IF( ILVL ) THEN
             CALL SORGQR( N, N, N, VL, LDVL, WORK, WORK, -1, IERR )
-            LWKOPT = MAX( LWKOPT, 3*N+INT ( WORK( 1 ) ) )
+            LWKOPT = MAX( LWKOPT, 3*N+INT( WORK( 1 ) ) )
             CALL SLAQZ0( 'S', JOBVL, JOBVR, N, 1, N, A, LDA, B, LDB,
      $                   ALPHAR, ALPHAI, BETA, VL, LDVL, VR, LDVR,
      $                   WORK, -1, 0, IERR )
-            LWKOPT = MAX( LWKOPT, 2*N+INT ( WORK( 1 ) ) )
+            LWKOPT = MAX( LWKOPT, 2*N+INT( WORK( 1 ) ) )
          ELSE
             CALL SLAQZ0( 'E', JOBVL, JOBVR, N, 1, N, A, LDA, B, LDB,
      $                   ALPHAR, ALPHAI, BETA, VL, LDVL, VR, LDVR,
      $                   WORK, -1, 0, IERR )
-            LWKOPT = MAX( LWKOPT, 2*N+INT ( WORK( 1 ) ) )
+            LWKOPT = MAX( LWKOPT, 2*N+INT( WORK( 1 ) ) )
+         END IF
+         IF( N.EQ.0 ) THEN
+            WORK( 1 ) = 1
+         ELSE
+            WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
          END IF
-         WORK( 1 ) = REAL( LWKOPT )
-*
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -362,7 +371,6 @@ SUBROUTINE SGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -426,7 +434,8 @@ SUBROUTINE SGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
       IF( ILVL ) THEN
          CALL SLASET( 'Full', N, N, ZERO, ONE, VL, LDVL )
          IF( IROWS.GT.1 ) THEN
-            CALL SLACPY( 'L', IROWS-1, IROWS-1, B( ILO+1, ILO ), LDB,
+            CALL SLACPY( 'L', IROWS-1, IROWS-1,
+     $                   B( ILO+1, ILO ), LDB,
      $                   VL( ILO+1, ILO ), LDVL )
          END IF
          CALL SORGQR( IROWS, IROWS, IROWS, VL( ILO, ILO ), LDVL,
@@ -444,11 +453,16 @@ SUBROUTINE SGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
 *
 *        Eigenvectors requested -- work on whole matrix.
 *
-         CALL SGGHD3( JOBVL, JOBVR, N, ILO, IHI, A, LDA, B, LDB, VL,
-     $                LDVL, VR, LDVR, WORK( IWRK ), LWORK+1-IWRK, IERR )
+         CALL SGGHD3( JOBVL, JOBVR, N, ILO, IHI,
+     $                A, LDA,
+     $                B, LDB, VL,
+     $                LDVL, VR, LDVR,
+     $                WORK( IWRK ), LWORK+1-IWRK, IERR )
       ELSE
-         CALL SGGHD3( 'N', 'N', IROWS, 1, IROWS, A( ILO, ILO ), LDA,
-     $                B( ILO, ILO ), LDB, VL, LDVL, VR, LDVR,
+         CALL SGGHD3( 'N', 'N', IROWS, 1, IROWS,
+     $                A( ILO, ILO ), LDA,
+     $                B( ILO, ILO ), LDB, VL,
+     $                LDVL, VR, LDVR,
      $                WORK( IWRK ), LWORK+1-IWRK, IERR )
       END IF
 *
@@ -487,7 +501,8 @@ SUBROUTINE SGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
          ELSE
             CHTEMP = 'R'
          END IF
-         CALL STGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL, LDVL,
+         CALL STGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL,
+     $                LDVL,
      $                VR, LDVR, N, IN, WORK( IWRK ), IERR )
          IF( IERR.NE.0 ) THEN
             INFO = N + 2
@@ -570,15 +585,17 @@ SUBROUTINE SGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
   110 CONTINUE
 *
       IF( ILASCL ) THEN
-         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N, IERR )
-         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N, IERR )
+         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N,
+     $                IERR )
+         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N,
+     $                IERR )
       END IF
 *
       IF( ILBSCL ) THEN
          CALL SLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N, IERR )
       END IF
 *
-      WORK( 1 ) = REAL( LWKOPT )
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       RETURN
 *
 *     End of SGGEV3
diff --git a/SRC/sggevx.f b/SRC/sggevx.f
index bb05f499af..c3910817f3 100644
--- a/SRC/sggevx.f
+++ b/SRC/sggevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sggevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sggevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -352,7 +350,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEeigen
+*> \ingroup ggevx
 *
 *> \par Further Details:
 *  =====================
@@ -384,10 +382,12 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
+      SUBROUTINE SGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B,
+     $                   LDB,
      $                   ALPHAR, ALPHAI, BETA, VL, LDVL, VR, LDVR, ILO,
      $                   IHI, LSCALE, RSCALE, ABNRM, BBNRM, RCONDE,
      $                   RCONDV, WORK, LWORK, IWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -427,15 +427,17 @@ SUBROUTINE SGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
       LOGICAL            LDUMMA( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEQRF, SGGBAK, SGGBAL, SGGHRD, SHGEQZ, SLABAD,
-     $                   SLACPY, SLASCL, SLASET, SORGQR, SORMQR, STGEVC,
-     $                   STGSNA, XERBLA
+      EXTERNAL           SGEQRF, SGGBAK, SGGBAL, SGGHRD, SHGEQZ,
+     $                   SLACPY,
+     $                   SLASCL, SLASET, SORGQR, SORMQR, STGEVC, STGSNA,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANGE
-      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANGE
+      REAL               SLAMCH, SLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SLAMCH,
+     $                   SLANGE, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
@@ -524,15 +526,18 @@ SUBROUTINE SGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
             END IF
             MAXWRK = MINWRK
             MAXWRK = MAX( MAXWRK,
-     $                    N + N*ILAENV( 1, 'SGEQRF', ' ', N, 1, N, 0 ) )
+     $                    N + N*ILAENV( 1, 'SGEQRF', ' ', N, 1, N,
+     $                                  0 ) )
             MAXWRK = MAX( MAXWRK,
-     $                    N + N*ILAENV( 1, 'SORMQR', ' ', N, 1, N, 0 ) )
+     $                    N + N*ILAENV( 1, 'SORMQR', ' ', N, 1, N,
+     $                                  0 ) )
             IF( ILVL ) THEN
                MAXWRK = MAX( MAXWRK, N +
-     $                       N*ILAENV( 1, 'SORGQR', ' ', N, 1, N, 0 ) )
+     $                       N*ILAENV( 1, 'SORGQR', ' ', N, 1, N,
+     $                                 0 ) )
             END IF
          END IF
-         WORK( 1 ) = MAXWRK
+         WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
 *
          IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
             INFO = -26
@@ -557,7 +562,6 @@ SUBROUTINE SGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -592,7 +596,8 @@ SUBROUTINE SGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
 *     Permute and/or balance the matrix pair (A,B)
 *     (Workspace: need 6*N if BALANC = 'S' or 'B', 1 otherwise)
 *
-      CALL SGGBAL( BALANC, N, A, LDA, B, LDB, ILO, IHI, LSCALE, RSCALE,
+      CALL SGGBAL( BALANC, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
+     $             RSCALE,
      $             WORK, IERR )
 *
 *     Compute ABNRM and BBNRM
@@ -777,7 +782,8 @@ SUBROUTINE SGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
 *     (Workspace: none needed)
 *
       IF( ILVL ) THEN
-         CALL SGGBAK( BALANC, 'L', N, ILO, IHI, LSCALE, RSCALE, N, VL,
+         CALL SGGBAK( BALANC, 'L', N, ILO, IHI, LSCALE, RSCALE, N,
+     $                VL,
      $                LDVL, IERR )
 *
          DO 70 JC = 1, N
@@ -810,7 +816,8 @@ SUBROUTINE SGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
    70    CONTINUE
       END IF
       IF( ILVR ) THEN
-         CALL SGGBAK( BALANC, 'R', N, ILO, IHI, LSCALE, RSCALE, N, VR,
+         CALL SGGBAK( BALANC, 'R', N, ILO, IHI, LSCALE, RSCALE, N,
+     $                VR,
      $                LDVR, IERR )
          DO 120 JC = 1, N
             IF( ALPHAI( JC ).LT.ZERO )
@@ -847,15 +854,17 @@ SUBROUTINE SGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
   130 CONTINUE
 *
       IF( ILASCL ) THEN
-         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N, IERR )
-         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N, IERR )
+         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAR, N,
+     $                IERR )
+         CALL SLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHAI, N,
+     $                IERR )
       END IF
 *
       IF( ILBSCL ) THEN
          CALL SLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N, IERR )
       END IF
 *
-      WORK( 1 ) = MAXWRK
+      WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
       RETURN
 *
 *     End of SGGEVX
diff --git a/SRC/sggglm.f b/SRC/sggglm.f
index bbd032beb6..10aea9a4ff 100644
--- a/SRC/sggglm.f
+++ b/SRC/sggglm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGGLM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sggglm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sggglm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -61,6 +59,16 @@
 *>                  x
 *>
 *> where inv(B) denotes the inverse of B.
+*>
+*> Callers of this subroutine should note that the singularity/rank-deficiency checks
+*> implemented in this subroutine are rudimentary. The STRTRS subroutine called by this
+*> subroutine only signals a failure due to singularity if the problem is exactly singular.
+*>
+*> It is conceivable for one (or more) of the factors involved in the generalized QR
+*> factorization of the pair (A, B) to be subnormally close to singularity without this
+*> subroutine signalling an error. The solutions computed for such almost-rank-deficient
+*> problems may be less accurate due to a loss of numerical precision.
+*> 
 *> \endverbatim
 *
 *  Arguments:
@@ -159,12 +167,12 @@
 *>          = 0:  successful exit.
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value.
 *>          = 1:  the upper triangular factor R associated with A in the
-*>                generalized QR factorization of the pair (A, B) is
+*>                generalized QR factorization of the pair (A, B) is exactly
 *>                singular, so that rank(A) < M; the least squares
 *>                solution could not be computed.
 *>          = 2:  the bottom (N-M) by (N-M) part of the upper trapezoidal
 *>                factor T associated with B in the generalized QR
-*>                factorization of the pair (A, B) is singular, so that
+*>                factorization of the pair (A, B) is exactly singular, so that
 *>                rank( A B ) < N; the least squares solution could not
 *>                be computed.
 *> \endverbatim
@@ -177,11 +185,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup ggglm
 *
 *  =====================================================================
-      SUBROUTINE SGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
+      SUBROUTINE SGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK,
+     $                   LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -207,12 +217,14 @@ SUBROUTINE SGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
      $                   NB4, NP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEMV, SGGQRF, SORMQR, SORMRQ, STRTRS,
+      EXTERNAL           SCOPY, SGEMV, SGGQRF, SORMQR, SORMRQ,
+     $                   STRTRS,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          INT, MAX, MIN
@@ -251,7 +263,7 @@ SUBROUTINE SGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
             LWKMIN = M + N + P
             LWKOPT = M + NP + MAX( N, P )*NB
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
             INFO = -12
@@ -288,7 +300,7 @@ SUBROUTINE SGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
 *
       CALL SGGQRF( N, M, P, A, LDA, WORK, B, LDB, WORK( M+1 ),
      $             WORK( M+NP+1 ), LWORK-M-NP, INFO )
-      LOPT = WORK( M+NP+1 )
+      LOPT = INT( WORK( M+NP+1 ) )
 *
 *     Update left-hand-side vector d = Q**T*d = ( d1 ) M
 *                                               ( d2 ) N-M
@@ -325,7 +337,8 @@ SUBROUTINE SGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
 *     Solve triangular system: R11*x = d1
 *
       IF( M.GT.0 ) THEN
-         CALL STRTRS( 'Upper', 'No Transpose', 'Non unit', M, 1, A, LDA,
+         CALL STRTRS( 'Upper', 'No Transpose', 'Non unit', M, 1, A,
+     $                LDA,
      $                D, M, INFO )
 *
          IF( INFO.GT.0 ) THEN
@@ -343,7 +356,7 @@ SUBROUTINE SGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
       CALL SORMRQ( 'Left', 'Transpose', P, 1, NP,
      $             B( MAX( 1, N-P+1 ), 1 ), LDB, WORK( M+1 ), Y,
      $             MAX( 1, P ), WORK( M+NP+1 ), LWORK-M-NP, INFO )
-      WORK( 1 ) = M + NP + MAX( LOPT, INT( WORK( M+NP+1 ) ) )
+      WORK( 1 ) = REAL( M + NP + MAX( LOPT, INT( WORK( M+NP+1 ) ) ) )
 *
       RETURN
 *
diff --git a/SRC/sgghd3.f b/SRC/sgghd3.f
index 23acf6ec5c..7438de175e 100644
--- a/SRC/sgghd3.f
+++ b/SRC/sgghd3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGHD3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgghd3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgghd3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -179,14 +177,14 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is REAL array, dimension (LWORK)
+*>          WORK is REAL array, dimension (MAX(1,LWORK))
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
-*> \param[in]  LWORK
+*> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of the array WORK.  LWORK >= 1.
+*>          The length of the array WORK. LWORK >= 1.
 *>          For optimum performance LWORK >= 6*N*NB, where NB is the
 *>          optimal blocksize.
 *>
@@ -211,7 +209,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup gghd3
 *
 *> \par Further Details:
 *  =====================
@@ -225,7 +223,8 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
+      SUBROUTINE SGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB,
+     $                   Q,
      $                   LDQ, Z, LDZ, WORK, LWORK, INFO )
 *
 *  -- LAPACK computational routine --
@@ -260,14 +259,16 @@ SUBROUTINE SGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           ILAENV, LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGGHRD, SLARTG, SLASET, SORM22, SROT, SGEMM,
+      EXTERNAL           SGGHRD, SLARTG, SLASET, SORM22, SROT,
+     $                   SGEMM,
      $                   SGEMV, STRMV, SLACPY, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          REAL, MAX
+      INTRINSIC          MAX
 *     ..
 *     .. Executable Statements ..
 *
@@ -275,8 +276,13 @@ SUBROUTINE SGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
       INFO = 0
       NB = ILAENV( 1, 'SGGHD3', ' ', N, ILO, IHI, -1 )
-      LWKOPT = MAX( 6*N*NB, 1 )
-      WORK( 1 ) = REAL( LWKOPT )
+      NH = IHI - ILO + 1
+      IF( NH.LE.1 ) THEN
+         LWKOPT = 1
+      ELSE
+         LWKOPT = 6*N*NB
+      END IF
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       INITQ = LSAME( COMPQ, 'I' )
       WANTQ = INITQ .OR. LSAME( COMPQ, 'V' )
       INITZ = LSAME( COMPZ, 'I' )
@@ -325,7 +331,6 @@ SUBROUTINE SGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
 *     Quick return if possible
 *
-      NH = IHI - ILO + 1
       IF( NH.LE.1 ) THEN
          WORK( 1 ) = ONE
          RETURN
@@ -383,7 +388,8 @@ SUBROUTINE SGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
             N2NB = ( IHI-JCOL-1 ) / NNB - 1
             NBLST = IHI - JCOL - N2NB*NNB
-            CALL SLASET( 'All', NBLST, NBLST, ZERO, ONE, WORK, NBLST )
+            CALL SLASET( 'All', NBLST, NBLST, ZERO, ONE, WORK,
+     $                   NBLST )
             PW = NBLST * NBLST + 1
             DO I = 1, N2NB
                CALL SLASET( 'All', 2*NNB, 2*NNB, ZERO, ONE,
@@ -580,10 +586,12 @@ SUBROUTINE SGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
                         WORK( PPW ) = A( I, J+1 )
                         PPW = PPW + 1
                      END DO
-                     CALL STRMV( 'Upper', 'Transpose', 'Non-unit', LEN,
+                     CALL STRMV( 'Upper', 'Transpose', 'Non-unit',
+     $                           LEN,
      $                           WORK( PPWO + NNB ), 2*NNB, WORK( PW ),
      $                           1 )
-                     CALL STRMV( 'Lower', 'Transpose', 'Non-unit', NNB,
+                     CALL STRMV( 'Lower', 'Transpose', 'Non-unit',
+     $                           NNB,
      $                           WORK( PPWO + 2*LEN*NNB ),
      $                           2*NNB, WORK( PW + LEN ), 1 )
                      CALL SGEMV( 'Transpose', NNB, LEN, ONE,
@@ -772,7 +780,8 @@ SUBROUTINE SGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
 *                    Exploit the structure of U.
 *
-                     CALL SORM22( 'Right', 'No Transpose', TOP, 2*NNB,
+                     CALL SORM22( 'Right', 'No Transpose', TOP,
+     $                            2*NNB,
      $                            NNB, NNB, WORK( PPWO ), 2*NNB,
      $                            A( 1, J ), LDA, WORK( PW ),
      $                            LWORK-PW+1, IERR )
@@ -803,7 +812,8 @@ SUBROUTINE SGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
 *                    Exploit the structure of U.
 *
-                     CALL SORM22( 'Right', 'No Transpose', TOP, 2*NNB,
+                     CALL SORM22( 'Right', 'No Transpose', TOP,
+     $                            2*NNB,
      $                            NNB, NNB, WORK( PPWO ), 2*NNB,
      $                            B( 1, J ), LDB, WORK( PW ),
      $                            LWORK-PW+1, IERR )
@@ -883,9 +893,11 @@ SUBROUTINE SGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
       END IF
 *
       IF ( JCOL.LT.IHI )
-     $   CALL SGGHRD( COMPQ2, COMPZ2, N, JCOL, IHI, A, LDA, B, LDB, Q,
+     $   CALL SGGHRD( COMPQ2, COMPZ2, N, JCOL, IHI, A, LDA, B, LDB,
+     $                Q,
      $                LDQ, Z, LDZ, IERR )
-      WORK( 1 ) = REAL( LWKOPT )
+*
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       RETURN
 *
diff --git a/SRC/sgghrd.f b/SRC/sgghrd.f
index 210b4dae33..389cc02895 100644
--- a/SRC/sgghrd.f
+++ b/SRC/sgghrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGHRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgghrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgghrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -189,7 +187,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup gghrd
 *
 *> \par Further Details:
 *  =====================
@@ -202,8 +200,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SGGHRD( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
+      SUBROUTINE SGGHRD( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB,
+     $                   Q,
      $                   LDQ, Z, LDZ, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -335,7 +335,8 @@ SUBROUTINE SGGHRD( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
             CALL SROT( N+2-JROW, B( JROW-1, JROW-1 ), LDB,
      $                 B( JROW, JROW-1 ), LDB, C, S )
             IF( ILQ )
-     $         CALL SROT( N, Q( 1, JROW-1 ), 1, Q( 1, JROW ), 1, C, S )
+     $         CALL SROT( N, Q( 1, JROW-1 ), 1, Q( 1, JROW ), 1, C,
+     $                    S )
 *
 *           Step 2: rotate columns JROW, JROW-1 to kill B(JROW,JROW-1)
 *
@@ -343,11 +344,13 @@ SUBROUTINE SGGHRD( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
             CALL SLARTG( TEMP, B( JROW, JROW-1 ), C, S,
      $                   B( JROW, JROW ) )
             B( JROW, JROW-1 ) = ZERO
-            CALL SROT( IHI, A( 1, JROW ), 1, A( 1, JROW-1 ), 1, C, S )
+            CALL SROT( IHI, A( 1, JROW ), 1, A( 1, JROW-1 ), 1, C,
+     $                 S )
             CALL SROT( JROW-1, B( 1, JROW ), 1, B( 1, JROW-1 ), 1, C,
      $                 S )
             IF( ILZ )
-     $         CALL SROT( N, Z( 1, JROW ), 1, Z( 1, JROW-1 ), 1, C, S )
+     $         CALL SROT( N, Z( 1, JROW ), 1, Z( 1, JROW-1 ), 1, C,
+     $                    S )
    30    CONTINUE
    40 CONTINUE
 *
diff --git a/SRC/sgglse.f b/SRC/sgglse.f
index 7ef8782b01..c14fddb3e1 100644
--- a/SRC/sgglse.f
+++ b/SRC/sgglse.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGLSE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgglse.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgglse.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -52,6 +50,16 @@
 *> matrices (B, A) given by
 *>
 *>    B = (0 R)*Q,   A = Z*T*Q.
+*>
+*> Callers of this subroutine should note that the singularity/rank-deficiency checks
+*> implemented in this subroutine are rudimentary. The STRTRS subroutine called by this
+*> subroutine only signals a failure due to singularity if the problem is exactly singular.
+*>
+*> It is conceivable for one (or more) of the factors involved in the generalized RQ
+*> factorization of the pair (B, A) to be subnormally close to singularity without this
+*> subroutine signalling an error. The solutions computed for such almost-rank-deficient
+*> problems may be less accurate due to a loss of numerical precision.
+*> 
 *> \endverbatim
 *
 *  Arguments:
@@ -153,12 +161,12 @@
 *>          = 0:  successful exit.
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value.
 *>          = 1:  the upper triangular factor R associated with B in the
-*>                generalized RQ factorization of the pair (B, A) is
+*>                generalized RQ factorization of the pair (B, A) is exactly
 *>                singular, so that rank(B) < P; the least squares
 *>                solution could not be computed.
 *>          = 2:  the (N-P) by (N-P) part of the upper trapezoidal factor
 *>                T associated with A in the generalized RQ factorization
-*>                of the pair (B, A) is singular, so that
+*>                of the pair (B, A) is exactly singular, so that
 *>                rank( (A) ) < N; the least squares solution could not
 *>                    ( (B) )
 *>                be computed.
@@ -172,11 +180,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERsolve
+*> \ingroup gglse
 *
 *  =====================================================================
-      SUBROUTINE SGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
+      SUBROUTINE SGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK,
+     $                   LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -202,12 +212,14 @@ SUBROUTINE SGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
      $                   NB4, NR
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SGEMV, SGGRQF, SORMQR, SORMRQ,
+      EXTERNAL           SAXPY, SCOPY, SGEMV, SGGRQF, SORMQR,
+     $                   SORMRQ,
      $                   STRMV, STRTRS, XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          INT, MAX, MIN
@@ -246,7 +258,7 @@ SUBROUTINE SGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
             LWKMIN = M + N + P
             LWKOPT = P + MN + MAX( M, N )*NB
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
             INFO = -12
@@ -276,12 +288,13 @@ SUBROUTINE SGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
 *
       CALL SGGRQF( P, M, N, B, LDB, WORK, A, LDA, WORK( P+1 ),
      $             WORK( P+MN+1 ), LWORK-P-MN, INFO )
-      LOPT = WORK( P+MN+1 )
+      LOPT = INT( WORK( P+MN+1 ) )
 *
 *     Update c = Z**T *c = ( c1 ) N-P
 *                          ( c2 ) M+P-N
 *
-      CALL SORMQR( 'Left', 'Transpose', M, 1, MN, A, LDA, WORK( P+1 ),
+      CALL SORMQR( 'Left', 'Transpose', M, 1, MN, A, LDA,
+     $             WORK( P+1 ),
      $             C, MAX( 1, M ), WORK( P+MN+1 ), LWORK-P-MN, INFO )
       LOPT = MAX( LOPT, INT( WORK( P+MN+1 ) ) )
 *
@@ -302,7 +315,8 @@ SUBROUTINE SGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
 *
 *        Update c1
 *
-         CALL SGEMV( 'No transpose', N-P, P, -ONE, A( 1, N-P+1 ), LDA,
+         CALL SGEMV( 'No transpose', N-P, P, -ONE, A( 1, N-P+1 ),
+     $               LDA,
      $               D, 1, ONE, C, 1 )
       END IF
 *
@@ -327,7 +341,8 @@ SUBROUTINE SGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
       IF( M.LT.N ) THEN
          NR = M + P - N
          IF( NR.GT.0 )
-     $      CALL SGEMV( 'No transpose', NR, N-M, -ONE, A( N-P+1, M+1 ),
+     $      CALL SGEMV( 'No transpose', NR, N-M, -ONE, A( N-P+1,
+     $                  M+1 ),
      $                  LDA, D( NR+1 ), 1, ONE, C( N-P+1 ), 1 )
       ELSE
          NR = P
@@ -340,9 +355,10 @@ SUBROUTINE SGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
 *
 *     Backward transformation x = Q**T*x
 *
-      CALL SORMRQ( 'Left', 'Transpose', N, 1, P, B, LDB, WORK( 1 ), X,
+      CALL SORMRQ( 'Left', 'Transpose', N, 1, P, B, LDB, WORK( 1 ),
+     $             X,
      $             N, WORK( P+MN+1 ), LWORK-P-MN, INFO )
-      WORK( 1 ) = P + MN + MAX( LOPT, INT( WORK( P+MN+1 ) ) )
+      WORK( 1 ) = REAL( P + MN + MAX( LOPT, INT( WORK( P+MN+1 ) ) ) )
 *
       RETURN
 *
diff --git a/SRC/sggqrf.f b/SRC/sggqrf.f
index c57b16a563..2f2e114e23 100644
--- a/SRC/sggqrf.f
+++ b/SRC/sggqrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGQRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sggqrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sggqrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -173,7 +171,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup ggqrf
 *
 *> \par Further Details:
 *  =====================
@@ -212,6 +210,7 @@
 *  =====================================================================
       SUBROUTINE SGGQRF( N, M, P, A, LDA, TAUA, B, LDB, TAUB, WORK,
      $                   LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -237,6 +236,8 @@ SUBROUTINE SGGQRF( N, M, P, A, LDA, TAUA, B, LDB, TAUB, WORK,
 *     .. External Functions ..
       INTEGER            ILAENV
       EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          INT, MAX, MIN
@@ -250,8 +251,9 @@ SUBROUTINE SGGQRF( N, M, P, A, LDA, TAUA, B, LDB, TAUB, WORK,
       NB2 = ILAENV( 1, 'SGERQF', ' ', N, P, -1, -1 )
       NB3 = ILAENV( 1, 'SORMQR', ' ', N, M, P, -1 )
       NB = MAX( NB1, NB2, NB3 )
-      LWKOPT = MAX( N, M, P )*NB
-      WORK( 1 ) = LWKOPT
+      LWKOPT = MAX( 1, MAX( N, M, P )*NB )
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
+*
       LQUERY = ( LWORK.EQ.-1 )
       IF( N.LT.0 ) THEN
          INFO = -1
@@ -276,18 +278,21 @@ SUBROUTINE SGGQRF( N, M, P, A, LDA, TAUA, B, LDB, TAUB, WORK,
 *     QR factorization of N-by-M matrix A: A = Q*R
 *
       CALL SGEQRF( N, M, A, LDA, TAUA, WORK, LWORK, INFO )
-      LOPT = WORK( 1 )
+      LOPT = INT( WORK( 1 ) )
 *
 *     Update B := Q**T*B.
 *
-      CALL SORMQR( 'Left', 'Transpose', N, P, MIN( N, M ), A, LDA, TAUA,
+      CALL SORMQR( 'Left', 'Transpose', N, P, MIN( N, M ), A, LDA,
+     $             TAUA,
      $             B, LDB, WORK, LWORK, INFO )
       LOPT = MAX( LOPT, INT( WORK( 1 ) ) )
 *
 *     RQ factorization of N-by-P matrix B: B = T*Z.
 *
       CALL SGERQF( N, P, B, LDB, TAUB, WORK, LWORK, INFO )
-      WORK( 1 ) = MAX( LOPT, INT( WORK( 1 ) ) )
+      LWKOPT = MAX( LOPT, INT( WORK( 1 ) ) )
+*
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       RETURN
 *
diff --git a/SRC/sggrqf.f b/SRC/sggrqf.f
index c4a78c3477..ef673fb243 100644
--- a/SRC/sggrqf.f
+++ b/SRC/sggrqf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGRQF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sggrqf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sggrqf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -172,7 +170,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup ggrqf
 *
 *> \par Further Details:
 *  =====================
@@ -211,6 +209,7 @@
 *  =====================================================================
       SUBROUTINE SGGRQF( M, P, N, A, LDA, TAUA, B, LDB, TAUB, WORK,
      $                   LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -235,7 +234,8 @@ SUBROUTINE SGGRQF( M, P, N, A, LDA, TAUA, B, LDB, TAUB, WORK,
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          INT, MAX, MIN
@@ -249,8 +249,8 @@ SUBROUTINE SGGRQF( M, P, N, A, LDA, TAUA, B, LDB, TAUB, WORK,
       NB2 = ILAENV( 1, 'SGEQRF', ' ', P, N, -1, -1 )
       NB3 = ILAENV( 1, 'SORMRQ', ' ', M, N, P, -1 )
       NB = MAX( NB1, NB2, NB3 )
-      LWKOPT = MAX( N, M, P)*NB
-      WORK( 1 ) = LWKOPT
+      LWKOPT = MAX( 1, MAX( N, M, P )*NB )
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -275,7 +275,7 @@ SUBROUTINE SGGRQF( M, P, N, A, LDA, TAUA, B, LDB, TAUB, WORK,
 *     RQ factorization of M-by-N matrix A: A = R*Q
 *
       CALL SGERQF( M, N, A, LDA, TAUA, WORK, LWORK, INFO )
-      LOPT = WORK( 1 )
+      LOPT = INT( WORK( 1 ) )
 *
 *     Update B := B*Q**T
 *
@@ -287,7 +287,8 @@ SUBROUTINE SGGRQF( M, P, N, A, LDA, TAUA, B, LDB, TAUB, WORK,
 *     QR factorization of P-by-N matrix B: B = Z*T
 *
       CALL SGEQRF( P, N, B, LDB, TAUB, WORK, LWORK, INFO )
-      WORK( 1 ) = MAX( LOPT, INT( WORK( 1 ) ) )
+      LWKOPT = MAX( LOPT, INT( WORK( 1 ) ) )
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       RETURN
 *
diff --git a/SRC/sggsvd3.f b/SRC/sggsvd3.f
index 9077f2ea81..c3cf649384 100644
--- a/SRC/sggsvd3.f
+++ b/SRC/sggsvd3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGSVD3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sggsvd3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sggsvd3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -278,7 +276,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -328,7 +326,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEsing
+*> \ingroup ggsvd3
 *
 *> \par Contributors:
 *  ==================
@@ -346,6 +344,7 @@
       SUBROUTINE SGGSVD3( JOBU, JOBV, JOBQ, M, N, P, K, L, A, LDA, B,
      $                    LDB, ALPHA, BETA, U, LDU, V, LDV, Q, LDQ,
      $                    WORK, LWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -372,8 +371,9 @@ SUBROUTINE SGGSVD3( JOBU, JOBV, JOBQ, M, N, P, K, L, A, LDA, B,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               SLAMCH, SLANGE
-      EXTERNAL           LSAME, SLAMCH, SLANGE
+      REAL               SLAMCH, SLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, SLANGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SCOPY, SGGSVP3, STGSJA, XERBLA
@@ -423,13 +423,14 @@ SUBROUTINE SGGSVD3( JOBU, JOBV, JOBQ, M, N, P, K, L, A, LDA, B,
 *     Compute workspace
 *
       IF( INFO.EQ.0 ) THEN
-         CALL SGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB, TOLA,
+         CALL SGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
+     $                 TOLA,
      $                 TOLB, K, L, U, LDU, V, LDV, Q, LDQ, IWORK, WORK,
      $                 WORK, -1, INFO )
          LWKOPT = N + INT( WORK( 1 ) )
          LWKOPT = MAX( 2*N, LWKOPT )
          LWKOPT = MAX( 1, LWKOPT )
-         WORK( 1 ) = REAL( LWKOPT )
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -450,8 +451,8 @@ SUBROUTINE SGGSVD3( JOBU, JOBV, JOBQ, M, N, P, K, L, A, LDA, B,
 *
       ULP = SLAMCH( 'Precision' )
       UNFL = SLAMCH( 'Safe Minimum' )
-      TOLA = MAX( M, N )*MAX( ANORM, UNFL )*ULP
-      TOLB = MAX( P, N )*MAX( BNORM, UNFL )*ULP
+      TOLA = REAL( MAX( M, N ) )*MAX( ANORM, UNFL )*ULP
+      TOLB = REAL( MAX( P, N ) )*MAX( BNORM, UNFL )*ULP
 *
 *     Preprocessing
 *
@@ -492,7 +493,7 @@ SUBROUTINE SGGSVD3( JOBU, JOBV, JOBQ, M, N, P, K, L, A, LDA, B,
          END IF
    20 CONTINUE
 *
-      WORK( 1 ) = REAL( LWKOPT )
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       RETURN
 *
 *     End of SGGSVD3
diff --git a/SRC/sggsvp3.f b/SRC/sggsvp3.f
index 4f76b32bc0..018bfaef94 100644
--- a/SRC/sggsvp3.f
+++ b/SRC/sggsvp3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGGSVP3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sggsvp3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sggsvp3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -227,7 +225,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -250,7 +248,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup ggsvp3
 *
 *> \par Further Details:
 *  =====================
@@ -301,9 +299,12 @@ SUBROUTINE SGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEQP3, SGEQR2, SGERQ2, SLACPY, SLAPMT,
+      EXTERNAL           SGEQP3, SGEQR2, SGERQ2, SLACPY,
+     $                   SLAPMT,
      $                   SLASET, SORG2R, SORM2R, SORMR2, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -365,7 +366,7 @@ SUBROUTINE SGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
          CALL SGEQP3( M, N, A, LDA, IWORK, TAU, WORK, -1, INFO )
          LWKOPT = MAX( LWKOPT, INT( WORK ( 1 ) ) )
          LWKOPT = MAX( 1, LWKOPT )
-         WORK( 1 ) = REAL( LWKOPT )
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -440,7 +441,8 @@ SUBROUTINE SGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update Q := Q*Z**T
 *
-            CALL SORMR2( 'Right', 'Transpose', N, N, L, B, LDB, TAU, Q,
+            CALL SORMR2( 'Right', 'Transpose', N, N, L, B, LDB, TAU,
+     $                   Q,
      $                   LDQ, WORK, INFO )
          END IF
 *
@@ -487,7 +489,8 @@ SUBROUTINE SGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
          CALL SLASET( 'Full', M, M, ZERO, ZERO, U, LDU )
          IF( M.GT.1 )
-     $      CALL SLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA, U( 2, 1 ),
+     $      CALL SLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA, U( 2,
+     $                   1 ),
      $                   LDU )
          CALL SORG2R( M, M, MIN( M, N-L ), U, LDU, TAU, WORK, INFO )
       END IF
@@ -508,7 +511,8 @@ SUBROUTINE SGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
    90    CONTINUE
   100 CONTINUE
       IF( M.GT.K )
-     $   CALL SLASET( 'Full', M-K, N-L, ZERO, ZERO, A( K+1, 1 ), LDA )
+     $   CALL SLASET( 'Full', M-K, N-L, ZERO, ZERO, A( K+1, 1 ),
+     $                LDA )
 *
       IF( N-L.GT.K ) THEN
 *
@@ -520,7 +524,8 @@ SUBROUTINE SGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update Q( 1:N,1:N-L ) = Q( 1:N,1:N-L )*Z1**T
 *
-            CALL SORMR2( 'Right', 'Transpose', N, N-L, K, A, LDA, TAU,
+            CALL SORMR2( 'Right', 'Transpose', N, N-L, K, A, LDA,
+     $                   TAU,
      $                   Q, LDQ, WORK, INFO )
          END IF
 *
@@ -545,7 +550,8 @@ SUBROUTINE SGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update U(:,K+1:M) := U(:,K+1:M)*U1
 *
-            CALL SORM2R( 'Right', 'No transpose', M, M-K, MIN( M-K, L ),
+            CALL SORM2R( 'Right', 'No transpose', M, M-K, MIN( M-K,
+     $                   L ),
      $                   A( K+1, N-L+1 ), LDA, TAU, U( 1, K+1 ), LDU,
      $                   WORK, INFO )
          END IF
@@ -560,7 +566,7 @@ SUBROUTINE SGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
       END IF
 *
-      WORK( 1 ) = REAL( LWKOPT )
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       RETURN
 *
 *     End of SGGSVP3
diff --git a/SRC/sgsvj0.f b/SRC/sgsvj0.f
index 23b6f0077f..7fe8cdadff 100644
--- a/SRC/sgsvj0.f
+++ b/SRC/sgsvj0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGSVJ0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgsvj0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgsvj0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -52,10 +50,10 @@
 *>          Specifies whether the output from this procedure is used
 *>          to compute the matrix V:
 *>          = 'V': the product of the Jacobi rotations is accumulated
-*>                 by postmulyiplying the N-by-N array V.
+*>                 by postmultiplying the N-by-N array V.
 *>                (See the description of V.)
 *>          = 'A': the product of the Jacobi rotations is accumulated
-*>                 by postmulyiplying the MV-by-N array V.
+*>                 by postmultiplying the MV-by-N array V.
 *>                (See the descriptions of MV and V.)
 *>          = 'N': the Jacobi rotations are not accumulated.
 *> \endverbatim
@@ -117,7 +115,7 @@
 *> \param[in] MV
 *> \verbatim
 *>          MV is INTEGER
-*>          If JOBV = 'A', then MV rows of V are post-multipled by a
+*>          If JOBV = 'A', then MV rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
 *>          If JOBV = 'N',   then MV is not referenced.
 *> \endverbatim
@@ -125,9 +123,9 @@
 *> \param[in,out] V
 *> \verbatim
 *>          V is REAL array, dimension (LDV,N)
-*>          If JOBV = 'V' then N rows of V are post-multipled by a
+*>          If JOBV = 'V' then N rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
-*>          If JOBV = 'A' then MV rows of V are post-multipled by a
+*>          If JOBV = 'A' then MV rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
 *>          If JOBV = 'N',   then V is not referenced.
 *> \endverbatim
@@ -193,7 +191,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup gsvj0
 *
 *> \par Further Details:
 *  =====================
@@ -215,6 +213,7 @@
 *  =====================================================================
       SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
      $                   SFMIN, TOL, NSWEEP, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -259,7 +258,8 @@ SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
       EXTERNAL           ISAMAX, LSAME, SDOT, SNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SLASCL, SLASSQ, SROTM, SSWAP,
+      EXTERNAL           SAXPY, SCOPY, SLASCL, SLASSQ, SROTM,
+     $                   SSWAP,
      $                   XERBLA
 *     ..
 *     .. Executable Statements ..
@@ -424,12 +424,15 @@ SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                            IF( AAQQ.GE.ONE ) THEN
                               ROTOK = ( SMALL*AAPP ).LE.AAQQ
                               IF( AAPP.LT.( BIG / AAQQ ) ) THEN
-                                 AAPQ = ( SDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( SDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*D( p )*D( q ) / AAQQ )
      $                                  / AAPP
                               ELSE
-                                 CALL SCOPY( M, A( 1, p ), 1, WORK, 1 )
-                                 CALL SLASCL( 'G', 0, 0, AAPP, D( p ),
+                                 CALL SCOPY( M, A( 1, p ), 1, WORK,
+     $                                       1 )
+                                 CALL SLASCL( 'G', 0, 0, AAPP,
+     $                                        D( p ),
      $                                        M, 1, WORK, LDA, IERR )
                                  AAPQ = SDOT( M, WORK, 1, A( 1, q ),
      $                                  1 )*D( q ) / AAQQ
@@ -437,12 +440,15 @@ SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                            ELSE
                               ROTOK = AAPP.LE.( AAQQ / SMALL )
                               IF( AAPP.GT.( SMALL / AAQQ ) ) THEN
-                                 AAPQ = ( SDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( SDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*D( p )*D( q ) / AAQQ )
      $                                  / AAPP
                               ELSE
-                                 CALL SCOPY( M, A( 1, q ), 1, WORK, 1 )
-                                 CALL SLASCL( 'G', 0, 0, AAQQ, D( q ),
+                                 CALL SCOPY( M, A( 1, q ), 1, WORK,
+     $                                       1 )
+                                 CALL SLASCL( 'G', 0, 0, AAQQ,
+     $                                        D( q ),
      $                                        M, 1, WORK, LDA, IERR )
                                  AAPQ = SDOT( M, WORK, 1, A( 1, p ),
      $                                  1 )*D( p ) / AAPP
@@ -511,7 +517,8 @@ SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                           FASTR( 4 ) = -T*AQOAP
                                           D( p ) = D( p )*CS
                                           D( q ) = D( q )*CS
-                                          CALL SROTM( M, A( 1, p ), 1,
+                                          CALL SROTM( M, A( 1, p ),
+     $                                                1,
      $                                                A( 1, q ), 1,
      $                                                FASTR )
                                           IF( RSVEC )CALL SROTM( MVL,
@@ -527,7 +534,8 @@ SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                           D( p ) = D( p )*CS
                                           D( q ) = D( q ) / CS
                                           IF( RSVEC ) THEN
-                                             CALL SAXPY( MVL, -T*AQOAP,
+                                             CALL SAXPY( MVL,
+     $                                                   -T*AQOAP,
      $                                                   V( 1, q ), 1,
      $                                                   V( 1, p ), 1 )
                                              CALL SAXPY( MVL,
@@ -541,13 +549,15 @@ SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                           CALL SAXPY( M, T*APOAQ,
      $                                                A( 1, p ), 1,
      $                                                A( 1, q ), 1 )
-                                          CALL SAXPY( M, -CS*SN*AQOAP,
+                                          CALL SAXPY( M,
+     $                                                -CS*SN*AQOAP,
      $                                                A( 1, q ), 1,
      $                                                A( 1, p ), 1 )
                                           D( p ) = D( p ) / CS
                                           D( q ) = D( q )*CS
                                           IF( RSVEC ) THEN
-                                             CALL SAXPY( MVL, T*APOAQ,
+                                             CALL SAXPY( MVL,
+     $                                                   T*APOAQ,
      $                                                   V( 1, p ), 1,
      $                                                   V( 1, q ), 1 )
                                              CALL SAXPY( MVL,
@@ -560,7 +570,8 @@ SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                              CALL SAXPY( M, -T*AQOAP,
      $                                                   A( 1, q ), 1,
      $                                                   A( 1, p ), 1 )
-                                             CALL SAXPY( M, CS*SN*APOAQ,
+                                             CALL SAXPY( M,
+     $                                                   CS*SN*APOAQ,
      $                                                   A( 1, p ), 1,
      $                                                   A( 1, q ), 1 )
                                              D( p ) = D( p )*CS
@@ -601,15 +612,19 @@ SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
 *
                               ELSE
 *              .. have to use modified Gram-Schmidt like transformation
-                                 CALL SCOPY( M, A( 1, p ), 1, WORK, 1 )
-                                 CALL SLASCL( 'G', 0, 0, AAPP, ONE, M,
+                                 CALL SCOPY( M, A( 1, p ), 1, WORK,
+     $                                       1 )
+                                 CALL SLASCL( 'G', 0, 0, AAPP, ONE,
+     $                                        M,
      $                                        1, WORK, LDA, IERR )
-                                 CALL SLASCL( 'G', 0, 0, AAQQ, ONE, M,
+                                 CALL SLASCL( 'G', 0, 0, AAQQ, ONE,
+     $                                        M,
      $                                        1, A( 1, q ), LDA, IERR )
                                  TEMP1 = -AAPQ*D( p ) / D( q )
                                  CALL SAXPY( M, TEMP1, WORK, 1,
      $                                       A( 1, q ), 1 )
-                                 CALL SLASCL( 'G', 0, 0, ONE, AAQQ, M,
+                                 CALL SLASCL( 'G', 0, 0, ONE, AAQQ,
+     $                                        M,
      $                                        1, A( 1, q ), LDA, IERR )
                                  SVA( q ) = AAQQ*SQRT( MAX( ZERO,
      $                                      ONE-AAPQ*AAPQ ) )
@@ -623,7 +638,8 @@ SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = SNRM2( M, A( 1, q ), 1 )*
+                                    SVA( q ) = SNRM2( M, A( 1, q ),
+     $                                   1 )*
      $                                         D( q )
                                  ELSE
                                     T = ZERO
@@ -724,12 +740,15 @@ SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                  ROTOK = ( SMALL*AAQQ ).LE.AAPP
                               END IF
                               IF( AAPP.LT.( BIG / AAQQ ) ) THEN
-                                 AAPQ = ( SDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( SDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*D( p )*D( q ) / AAQQ )
      $                                  / AAPP
                               ELSE
-                                 CALL SCOPY( M, A( 1, p ), 1, WORK, 1 )
-                                 CALL SLASCL( 'G', 0, 0, AAPP, D( p ),
+                                 CALL SCOPY( M, A( 1, p ), 1, WORK,
+     $                                       1 )
+                                 CALL SLASCL( 'G', 0, 0, AAPP,
+     $                                        D( p ),
      $                                        M, 1, WORK, LDA, IERR )
                                  AAPQ = SDOT( M, WORK, 1, A( 1, q ),
      $                                  1 )*D( q ) / AAQQ
@@ -741,12 +760,15 @@ SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                  ROTOK = AAQQ.LE.( AAPP / SMALL )
                               END IF
                               IF( AAPP.GT.( SMALL / AAQQ ) ) THEN
-                                 AAPQ = ( SDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( SDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*D( p )*D( q ) / AAQQ )
      $                                  / AAPP
                               ELSE
-                                 CALL SCOPY( M, A( 1, q ), 1, WORK, 1 )
-                                 CALL SLASCL( 'G', 0, 0, AAQQ, D( q ),
+                                 CALL SCOPY( M, A( 1, q ), 1, WORK,
+     $                                       1 )
+                                 CALL SLASCL( 'G', 0, 0, AAQQ,
+     $                                        D( q ),
      $                                        M, 1, WORK, LDA, IERR )
                                  AAPQ = SDOT( M, WORK, 1, A( 1, p ),
      $                                  1 )*D( p ) / AAPP
@@ -810,7 +832,8 @@ SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                           FASTR( 4 ) = -T*AQOAP
                                           D( p ) = D( p )*CS
                                           D( q ) = D( q )*CS
-                                          CALL SROTM( M, A( 1, p ), 1,
+                                          CALL SROTM( M, A( 1, p ),
+     $                                                1,
      $                                                A( 1, q ), 1,
      $                                                FASTR )
                                           IF( RSVEC )CALL SROTM( MVL,
@@ -824,7 +847,8 @@ SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
      $                                                A( 1, p ), 1,
      $                                                A( 1, q ), 1 )
                                           IF( RSVEC ) THEN
-                                             CALL SAXPY( MVL, -T*AQOAP,
+                                             CALL SAXPY( MVL,
+     $                                                   -T*AQOAP,
      $                                                   V( 1, q ), 1,
      $                                                   V( 1, p ), 1 )
                                              CALL SAXPY( MVL,
@@ -840,11 +864,13 @@ SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                           CALL SAXPY( M, T*APOAQ,
      $                                                A( 1, p ), 1,
      $                                                A( 1, q ), 1 )
-                                          CALL SAXPY( M, -CS*SN*AQOAP,
+                                          CALL SAXPY( M,
+     $                                                -CS*SN*AQOAP,
      $                                                A( 1, q ), 1,
      $                                                A( 1, p ), 1 )
                                           IF( RSVEC ) THEN
-                                             CALL SAXPY( MVL, T*APOAQ,
+                                             CALL SAXPY( MVL,
+     $                                                   T*APOAQ,
      $                                                   V( 1, p ), 1,
      $                                                   V( 1, q ), 1 )
                                              CALL SAXPY( MVL,
@@ -859,7 +885,8 @@ SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                              CALL SAXPY( M, -T*AQOAP,
      $                                                   A( 1, q ), 1,
      $                                                   A( 1, p ), 1 )
-                                             CALL SAXPY( M, CS*SN*APOAQ,
+                                             CALL SAXPY( M,
+     $                                                   CS*SN*APOAQ,
      $                                                   A( 1, p ), 1,
      $                                                   A( 1, q ), 1 )
                                              D( p ) = D( p )*CS
@@ -900,34 +927,42 @@ SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
 *
                               ELSE
                                  IF( AAPP.GT.AAQQ ) THEN
-                                    CALL SCOPY( M, A( 1, p ), 1, WORK,
+                                    CALL SCOPY( M, A( 1, p ), 1,
+     $                                          WORK,
      $                                          1 )
-                                    CALL SLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL SLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, WORK, LDA, IERR )
-                                    CALL SLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL SLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     TEMP1 = -AAPQ*D( p ) / D( q )
                                     CALL SAXPY( M, TEMP1, WORK, 1,
      $                                          A( 1, q ), 1 )
-                                    CALL SLASCL( 'G', 0, 0, ONE, AAQQ,
+                                    CALL SLASCL( 'G', 0, 0, ONE,
+     $                                           AAQQ,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     SVA( q ) = AAQQ*SQRT( MAX( ZERO,
      $                                         ONE-AAPQ*AAPQ ) )
                                     MXSINJ = MAX( MXSINJ, SFMIN )
                                  ELSE
-                                    CALL SCOPY( M, A( 1, q ), 1, WORK,
+                                    CALL SCOPY( M, A( 1, q ), 1,
+     $                                          WORK,
      $                                          1 )
-                                    CALL SLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL SLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, WORK, LDA, IERR )
-                                    CALL SLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL SLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     TEMP1 = -AAPQ*D( q ) / D( p )
                                     CALL SAXPY( M, TEMP1, WORK, 1,
      $                                          A( 1, p ), 1 )
-                                    CALL SLASCL( 'G', 0, 0, ONE, AAPP,
+                                    CALL SLASCL( 'G', 0, 0, ONE,
+     $                                           AAPP,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     SVA( p ) = AAPP*SQRT( MAX( ZERO,
@@ -943,7 +978,8 @@ SUBROUTINE SGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = SNRM2( M, A( 1, q ), 1 )*
+                                    SVA( q ) = SNRM2( M, A( 1, q ),
+     $                                   1 )*
      $                                         D( q )
                                  ELSE
                                     T = ZERO
diff --git a/SRC/sgsvj1.f b/SRC/sgsvj1.f
index 0345ccb421..a37d434bb9 100644
--- a/SRC/sgsvj1.f
+++ b/SRC/sgsvj1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGSVJ1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgsvj1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgsvj1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -75,10 +73,10 @@
 *>          Specifies whether the output from this procedure is used
 *>          to compute the matrix V:
 *>          = 'V': the product of the Jacobi rotations is accumulated
-*>                 by postmulyiplying the N-by-N array V.
+*>                 by postmultiplying the N-by-N array V.
 *>                (See the description of V.)
 *>          = 'A': the product of the Jacobi rotations is accumulated
-*>                 by postmulyiplying the MV-by-N array V.
+*>                 by postmultiplying the MV-by-N array V.
 *>                (See the descriptions of MV and V.)
 *>          = 'N': the Jacobi rotations are not accumulated.
 *> \endverbatim
@@ -147,7 +145,7 @@
 *> \param[in] MV
 *> \verbatim
 *>          MV is INTEGER
-*>          If JOBV = 'A', then MV rows of V are post-multipled by a
+*>          If JOBV = 'A', then MV rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
 *>          If JOBV = 'N',   then MV is not referenced.
 *> \endverbatim
@@ -155,9 +153,9 @@
 *> \param[in,out] V
 *> \verbatim
 *>          V is REAL array, dimension (LDV,N)
-*>          If JOBV = 'V' then N rows of V are post-multipled by a
+*>          If JOBV = 'V' then N rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
-*>          If JOBV = 'A' then MV rows of V are post-multipled by a
+*>          If JOBV = 'A' then MV rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
 *>          If JOBV = 'N',   then V is not referenced.
 *> \endverbatim
@@ -223,7 +221,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup gsvj1
 *
 *> \par Contributors:
 *  ==================
@@ -233,6 +231,7 @@
 *  =====================================================================
       SUBROUTINE SGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
      $                   EPS, SFMIN, TOL, NSWEEP, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -277,7 +276,8 @@ SUBROUTINE SGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
       EXTERNAL           ISAMAX, LSAME, SDOT, SNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SLASCL, SLASSQ, SROTM, SSWAP,
+      EXTERNAL           SAXPY, SCOPY, SLASCL, SLASSQ, SROTM,
+     $                   SSWAP,
      $                   XERBLA
 *     ..
 *     .. Executable Statements ..
@@ -423,12 +423,15 @@ SUBROUTINE SGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                  ROTOK = ( SMALL*AAQQ ).LE.AAPP
                               END IF
                               IF( AAPP.LT.( BIG / AAQQ ) ) THEN
-                                 AAPQ = ( SDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( SDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*D( p )*D( q ) / AAQQ )
      $                                  / AAPP
                               ELSE
-                                 CALL SCOPY( M, A( 1, p ), 1, WORK, 1 )
-                                 CALL SLASCL( 'G', 0, 0, AAPP, D( p ),
+                                 CALL SCOPY( M, A( 1, p ), 1, WORK,
+     $                                       1 )
+                                 CALL SLASCL( 'G', 0, 0, AAPP,
+     $                                        D( p ),
      $                                        M, 1, WORK, LDA, IERR )
                                  AAPQ = SDOT( M, WORK, 1, A( 1, q ),
      $                                  1 )*D( q ) / AAQQ
@@ -440,12 +443,15 @@ SUBROUTINE SGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                  ROTOK = AAQQ.LE.( AAPP / SMALL )
                               END IF
                               IF( AAPP.GT.( SMALL / AAQQ ) ) THEN
-                                 AAPQ = ( SDOT( M, A( 1, p ), 1, A( 1,
+                                 AAPQ = ( SDOT( M, A( 1, p ), 1,
+     $                                    A( 1,
      $                                  q ), 1 )*D( p )*D( q ) / AAQQ )
      $                                  / AAPP
                               ELSE
-                                 CALL SCOPY( M, A( 1, q ), 1, WORK, 1 )
-                                 CALL SLASCL( 'G', 0, 0, AAQQ, D( q ),
+                                 CALL SCOPY( M, A( 1, q ), 1, WORK,
+     $                                       1 )
+                                 CALL SLASCL( 'G', 0, 0, AAQQ,
+     $                                        D( q ),
      $                                        M, 1, WORK, LDA, IERR )
                                  AAPQ = SDOT( M, WORK, 1, A( 1, p ),
      $                                  1 )*D( p ) / AAPP
@@ -509,7 +515,8 @@ SUBROUTINE SGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                           FASTR( 4 ) = -T*AQOAP
                                           D( p ) = D( p )*CS
                                           D( q ) = D( q )*CS
-                                          CALL SROTM( M, A( 1, p ), 1,
+                                          CALL SROTM( M, A( 1, p ),
+     $                                                1,
      $                                                A( 1, q ), 1,
      $                                                FASTR )
                                           IF( RSVEC )CALL SROTM( MVL,
@@ -523,7 +530,8 @@ SUBROUTINE SGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
      $                                                A( 1, p ), 1,
      $                                                A( 1, q ), 1 )
                                           IF( RSVEC ) THEN
-                                             CALL SAXPY( MVL, -T*AQOAP,
+                                             CALL SAXPY( MVL,
+     $                                                   -T*AQOAP,
      $                                                   V( 1, q ), 1,
      $                                                   V( 1, p ), 1 )
                                              CALL SAXPY( MVL,
@@ -539,11 +547,13 @@ SUBROUTINE SGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                           CALL SAXPY( M, T*APOAQ,
      $                                                A( 1, p ), 1,
      $                                                A( 1, q ), 1 )
-                                          CALL SAXPY( M, -CS*SN*AQOAP,
+                                          CALL SAXPY( M,
+     $                                                -CS*SN*AQOAP,
      $                                                A( 1, q ), 1,
      $                                                A( 1, p ), 1 )
                                           IF( RSVEC ) THEN
-                                             CALL SAXPY( MVL, T*APOAQ,
+                                             CALL SAXPY( MVL,
+     $                                                   T*APOAQ,
      $                                                   V( 1, p ), 1,
      $                                                   V( 1, q ), 1 )
                                              CALL SAXPY( MVL,
@@ -558,7 +568,8 @@ SUBROUTINE SGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                              CALL SAXPY( M, -T*AQOAP,
      $                                                   A( 1, q ), 1,
      $                                                   A( 1, p ), 1 )
-                                             CALL SAXPY( M, CS*SN*APOAQ,
+                                             CALL SAXPY( M,
+     $                                                   CS*SN*APOAQ,
      $                                                   A( 1, p ), 1,
      $                                                   A( 1, q ), 1 )
                                              D( p ) = D( p )*CS
@@ -599,34 +610,42 @@ SUBROUTINE SGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
 
                               ELSE
                                  IF( AAPP.GT.AAQQ ) THEN
-                                    CALL SCOPY( M, A( 1, p ), 1, WORK,
+                                    CALL SCOPY( M, A( 1, p ), 1,
+     $                                          WORK,
      $                                          1 )
-                                    CALL SLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL SLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, WORK, LDA, IERR )
-                                    CALL SLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL SLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     TEMP1 = -AAPQ*D( p ) / D( q )
                                     CALL SAXPY( M, TEMP1, WORK, 1,
      $                                          A( 1, q ), 1 )
-                                    CALL SLASCL( 'G', 0, 0, ONE, AAQQ,
+                                    CALL SLASCL( 'G', 0, 0, ONE,
+     $                                           AAQQ,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     SVA( q ) = AAQQ*SQRT( MAX( ZERO,
      $                                         ONE-AAPQ*AAPQ ) )
                                     MXSINJ = MAX( MXSINJ, SFMIN )
                                  ELSE
-                                    CALL SCOPY( M, A( 1, q ), 1, WORK,
+                                    CALL SCOPY( M, A( 1, q ), 1,
+     $                                          WORK,
      $                                          1 )
-                                    CALL SLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL SLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, WORK, LDA, IERR )
-                                    CALL SLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL SLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     TEMP1 = -AAPQ*D( q ) / D( p )
                                     CALL SAXPY( M, TEMP1, WORK, 1,
      $                                          A( 1, p ), 1 )
-                                    CALL SLASCL( 'G', 0, 0, ONE, AAPP,
+                                    CALL SLASCL( 'G', 0, 0, ONE,
+     $                                           AAPP,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     SVA( p ) = AAPP*SQRT( MAX( ZERO,
@@ -642,7 +661,8 @@ SUBROUTINE SGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = SNRM2( M, A( 1, q ), 1 )*
+                                    SVA( q ) = SNRM2( M, A( 1, q ),
+     $                                   1 )*
      $                                         D( q )
                                  ELSE
                                     T = ZERO
diff --git a/SRC/sgtcon.f b/SRC/sgtcon.f
index 65accb1221..4140d82b23 100644
--- a/SRC/sgtcon.f
+++ b/SRC/sgtcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGTCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgtcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgtcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -138,11 +136,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGTcomputational
+*> \ingroup gtcon
 *
 *  =====================================================================
       SUBROUTINE SGTCON( NORM, N, DL, D, DU, DU2, IPIV, ANORM, RCOND,
      $                   WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -234,7 +233,8 @@ SUBROUTINE SGTCON( NORM, N, DL, D, DU, DU2, IPIV, ANORM, RCOND,
 *
 *           Multiply by inv(L**T)*inv(U**T).
 *
-            CALL SGTTRS( 'Transpose', N, 1, DL, D, DU, DU2, IPIV, WORK,
+            CALL SGTTRS( 'Transpose', N, 1, DL, D, DU, DU2, IPIV,
+     $                   WORK,
      $                   N, INFO )
          END IF
          GO TO 20
diff --git a/SRC/sgtrfs.f b/SRC/sgtrfs.f
index 29c0be89d4..8b0a25854e 100644
--- a/SRC/sgtrfs.f
+++ b/SRC/sgtrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGTRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgtrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgtrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -200,12 +198,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGTcomputational
+*> \ingroup gtrfs
 *
 *  =====================================================================
-      SUBROUTINE SGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
+      SUBROUTINE SGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
+     $                   DU2,
      $                   IPIV, B, LDB, X, LDX, FERR, BERR, WORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -244,7 +244,8 @@ SUBROUTINE SGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SGTTRS, SLACN2, SLAGTM, XERBLA
+      EXTERNAL           SAXPY, SCOPY, SGTTRS, SLACN2, SLAGTM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -300,7 +301,7 @@ SUBROUTINE SGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
       NZ = 4
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -317,7 +318,8 @@ SUBROUTINE SGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
 *        where op(A) = A, A**T, or A**H, depending on TRANS.
 *
          CALL SCOPY( N, B( 1, J ), 1, WORK( N+1 ), 1 )
-         CALL SLAGTM( TRANS, N, 1, -ONE, DL, D, DU, X( 1, J ), LDX, ONE,
+         CALL SLAGTM( TRANS, N, 1, -ONE, DL, D, DU, X( 1, J ), LDX,
+     $                ONE,
      $                WORK( N+1 ), N )
 *
 *        Compute abs(op(A))*abs(x) + abs(b) for use in the backward
@@ -420,15 +422,17 @@ SUBROUTINE SGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
 *
          DO 60 I = 1, N
             IF( WORK( I ).GT.SAFE2 ) THEN
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I )
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
             ELSE
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I ) + SAFE1
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
+     $                     + SAFE1
             END IF
    60    CONTINUE
 *
          KASE = 0
    70    CONTINUE
-         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
diff --git a/SRC/sgtsv.f b/SRC/sgtsv.f
index ac903ab3dd..25838c2232 100644
--- a/SRC/sgtsv.f
+++ b/SRC/sgtsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGTSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgtsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgtsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,10 +118,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGTsolve
+*> \ingroup gtsv
 *
 *  =====================================================================
       SUBROUTINE SGTSV( N, NRHS, DL, D, DU, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sgtsvx.f b/SRC/sgtsvx.f
index a251302ca8..b32ec03906 100644
--- a/SRC/sgtsvx.f
+++ b/SRC/sgtsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGTSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgtsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgtsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -284,12 +282,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGTsolve
+*> \ingroup gtsvx
 *
 *  =====================================================================
-      SUBROUTINE SGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
+      SUBROUTINE SGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF,
+     $                   DUF,
      $                   DU2, IPIV, B, LDB, X, LDX, RCOND, FERR, BERR,
      $                   WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -324,7 +324,8 @@ SUBROUTINE SGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
       EXTERNAL           LSAME, SLAMCH, SLANGT
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGTCON, SGTRFS, SGTTRF, SGTTRS, SLACPY,
+      EXTERNAL           SCOPY, SGTCON, SGTRFS, SGTTRF, SGTTRS,
+     $                   SLACPY,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -384,7 +385,8 @@ SUBROUTINE SGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL SGTCON( NORM, N, DLF, DF, DUF, DU2, IPIV, ANORM, RCOND, WORK,
+      CALL SGTCON( NORM, N, DLF, DF, DUF, DU2, IPIV, ANORM, RCOND,
+     $             WORK,
      $             IWORK, INFO )
 *
 *     Compute the solution vectors X.
@@ -396,7 +398,8 @@ SUBROUTINE SGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
 *     Use iterative refinement to improve the computed solutions and
 *     compute error bounds and backward error estimates for them.
 *
-      CALL SGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2, IPIV,
+      CALL SGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
+     $             IPIV,
      $             B, LDB, X, LDX, FERR, BERR, WORK, IWORK, INFO )
 *
 *     Set INFO = N+1 if the matrix is singular to working precision.
diff --git a/SRC/sgttrf.f b/SRC/sgttrf.f
index 5df0367fe0..14fba734dc 100644
--- a/SRC/sgttrf.f
+++ b/SRC/sgttrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGTTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgttrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgttrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,10 +115,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGTcomputational
+*> \ingroup gttrf
 *
 *  =====================================================================
       SUBROUTINE SGTTRF( N, DL, D, DU, DU2, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sgttrs.f b/SRC/sgttrs.f
index f1e47a7941..306c8f1bcb 100644
--- a/SRC/sgttrs.f
+++ b/SRC/sgttrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGTTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgttrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgttrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,11 +128,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGTcomputational
+*> \ingroup gttrs
 *
 *  =====================================================================
-      SUBROUTINE SGTTRS( TRANS, N, NRHS, DL, D, DU, DU2, IPIV, B, LDB,
+      SUBROUTINE SGTTRS( TRANS, N, NRHS, DL, D, DU, DU2, IPIV, B,
+     $                   LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -210,7 +210,8 @@ SUBROUTINE SGTTRS( TRANS, N, NRHS, DL, D, DU, DU2, IPIV, B, LDB,
       ELSE
          DO 10 J = 1, NRHS, NB
             JB = MIN( NRHS-J+1, NB )
-            CALL SGTTS2( ITRANS, N, JB, DL, D, DU, DU2, IPIV, B( 1, J ),
+            CALL SGTTS2( ITRANS, N, JB, DL, D, DU, DU2, IPIV, B( 1,
+     $                   J ),
      $                   LDB )
    10    CONTINUE
       END IF
diff --git a/SRC/sgtts2.f b/SRC/sgtts2.f
index 4820487de3..eb8b64c982 100644
--- a/SRC/sgtts2.f
+++ b/SRC/sgtts2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SGTTS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sgtts2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sgtts2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGTcomputational
+*> \ingroup gtts2
 *
 *  =====================================================================
-      SUBROUTINE SGTTS2( ITRANS, N, NRHS, DL, D, DU, DU2, IPIV, B, LDB )
+      SUBROUTINE SGTTS2( ITRANS, N, NRHS, DL, D, DU, DU2, IPIV, B,
+     $                   LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/shgeqz.f b/SRC/shgeqz.f
index 79a9c60925..e811566686 100644
--- a/SRC/shgeqz.f
+++ b/SRC/shgeqz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SHGEQZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/shgeqz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/shgeqz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -282,7 +280,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup hgeqz
 *
 *> \par Further Details:
 *  =====================
@@ -298,9 +296,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
+      SUBROUTINE SHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T,
+     $                   LDT,
      $                   ALPHAR, ALPHAI, BETA, Q, LDQ, Z, LDZ, WORK,
      $                   LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -337,20 +337,23 @@ SUBROUTINE SHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
      $                   BTOL, C, C11I, C11R, C12, C21, C22I, C22R, CL,
      $                   CQ, CR, CZ, ESHIFT, S, S1, S1INV, S2, SAFMAX,
      $                   SAFMIN, SCALE, SL, SQI, SQR, SR, SZI, SZR, T1,
-     $                   TAU, TEMP, TEMP2, TEMPI, TEMPR, U1, U12, U12L,
-     $                   U2, ULP, VS, W11, W12, W21, W22, WABS, WI, WR,
-     $                   WR2
+     $                   T2, T3, TAU, TEMP, TEMP2, TEMPI, TEMPR, U1,
+     $                   U12, U12L, U2, ULP, VS, W11, W12, W21, W22,
+     $                   WABS, WI, WR, WR2
 *     ..
 *     .. Local Arrays ..
       REAL               V( 3 )
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               SLAMCH, SLANHS, SLAPY2, SLAPY3
-      EXTERNAL           LSAME, SLAMCH, SLANHS, SLAPY2, SLAPY3
+      REAL               SLAMCH, SLANHS, SLAPY2,
+     $                   SLAPY3, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, SLANHS,
+     $                   SLAPY2, SLAPY3, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLAG2, SLARFG, SLARTG, SLASET, SLASV2, SROT,
+      EXTERNAL           SLAG2, SLARFG, SLARTG, SLASET, SLASV2,
+     $                   SROT,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -399,7 +402,7 @@ SUBROUTINE SHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
 *     Check Argument Values
 *
       INFO = 0
-      WORK( 1 ) = MAX( 1, N )
+      WORK( 1 ) = REAL( MAX( 1, N ) )
       LQUERY = ( LWORK.EQ.-1 )
       IF( ISCHUR.EQ.0 ) THEN
          INFO = -1
@@ -536,9 +539,7 @@ SUBROUTINE SHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
             END IF
          END IF
 *
-         IF( ABS( T( ILAST, ILAST ) ).LE.MAX( SAFMIN, ULP*( 
-     $         ABS( T( ILAST - 1, ILAST ) ) + ABS( T( ILAST-1, ILAST-1 )
-     $          ) ) ) ) THEN
+         IF( ABS( T( ILAST, ILAST ) ).LE.BTOL ) THEN
             T( ILAST, ILAST ) = ZERO
             GO TO 70
          END IF
@@ -564,10 +565,7 @@ SUBROUTINE SHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
 *
 *           Test 2: for T(j,j)=0
 *
-            TEMP = ABS ( T( J, J + 1 ) )
-            IF ( J .GT. ILO )
-     $           TEMP = TEMP + ABS ( T( J - 1, J ) )
-            IF( ABS( T( J, J ) ).LT.MAX( SAFMIN,ULP*TEMP ) ) THEN
+            IF( ABS( T( J, J ) ).LT.BTOL ) THEN
                T( J, J ) = ZERO
 *
 *              Test 1a: Check for 2 consecutive small subdiagonals in A
@@ -602,7 +600,8 @@ SUBROUTINE SHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
                      CALL SROT( ILASTM-JCH, T( JCH, JCH+1 ), LDT,
      $                          T( JCH+1, JCH+1 ), LDT, C, S )
                      IF( ILQ )
-     $                  CALL SROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ), 1,
+     $                  CALL SROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ),
+     $                             1,
      $                             C, S )
                      IF( ILAZR2 )
      $                  H( JCH, JCH-1 ) = H( JCH, JCH-1 )*C
@@ -629,12 +628,14 @@ SUBROUTINE SHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
      $                            T( JCH, JCH+1 ) )
                      T( JCH+1, JCH+1 ) = ZERO
                      IF( JCH.LT.ILASTM-1 )
-     $                  CALL SROT( ILASTM-JCH-1, T( JCH, JCH+2 ), LDT,
+     $                  CALL SROT( ILASTM-JCH-1, T( JCH, JCH+2 ),
+     $                             LDT,
      $                             T( JCH+1, JCH+2 ), LDT, C, S )
                      CALL SROT( ILASTM-JCH+2, H( JCH, JCH-1 ), LDH,
      $                          H( JCH+1, JCH-1 ), LDH, C, S )
                      IF( ILQ )
-     $                  CALL SROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ), 1,
+     $                  CALL SROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ),
+     $                             1,
      $                             C, S )
                      TEMP = H( JCH+1, JCH )
                      CALL SLARTG( TEMP, H( JCH+1, JCH-1 ), C, S,
@@ -645,7 +646,8 @@ SUBROUTINE SHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
                      CALL SROT( JCH-IFRSTM, T( IFRSTM, JCH ), 1,
      $                          T( IFRSTM, JCH-1 ), 1, C, S )
                      IF( ILZ )
-     $                  CALL SROT( N, Z( 1, JCH ), 1, Z( 1, JCH-1 ), 1,
+     $                  CALL SROT( N, Z( 1, JCH ), 1, Z( 1, JCH-1 ),
+     $                             1,
      $                             C, S )
    50             CONTINUE
                   GO TO 70
@@ -680,7 +682,8 @@ SUBROUTINE SHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
          CALL SROT( ILAST-IFRSTM, T( IFRSTM, ILAST ), 1,
      $              T( IFRSTM, ILAST-1 ), 1, C, S )
          IF( ILZ )
-     $      CALL SROT( N, Z( 1, ILAST ), 1, Z( 1, ILAST-1 ), 1, C, S )
+     $      CALL SROT( N, Z( 1, ILAST ), 1, Z( 1, ILAST-1 ), 1, C,
+     $                 S )
 *
 *        H(ILAST,ILAST-1)=0 -- Standardize B, set ALPHAR, ALPHAI,
 *                              and BETA
@@ -912,10 +915,12 @@ SUBROUTINE SHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
      $                    T( IFRSTM, ILAST ), 1, CR, SR )
 *
             IF( ILQ )
-     $         CALL SROT( N, Q( 1, ILAST-1 ), 1, Q( 1, ILAST ), 1, CL,
+     $         CALL SROT( N, Q( 1, ILAST-1 ), 1, Q( 1, ILAST ), 1,
+     $                    CL,
      $                    SL )
             IF( ILZ )
-     $         CALL SROT( N, Z( 1, ILAST-1 ), 1, Z( 1, ILAST ), 1, CR,
+     $         CALL SROT( N, Z( 1, ILAST-1 ), 1, Z( 1, ILAST ), 1,
+     $                    CR,
      $                    SR )
 *
             T( ILAST-1, ILAST-1 ) = B11
@@ -1132,25 +1137,27 @@ SUBROUTINE SHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
                   H( J+2, J-1 ) = ZERO
                END IF
 *
+               T2 = TAU * V( 2 )
+               T3 = TAU * V( 3 )
                DO 230 JC = J, ILASTM
-                  TEMP = TAU*( H( J, JC )+V( 2 )*H( J+1, JC )+V( 3 )*
-     $                   H( J+2, JC ) )
-                  H( J, JC ) = H( J, JC ) - TEMP
-                  H( J+1, JC ) = H( J+1, JC ) - TEMP*V( 2 )
-                  H( J+2, JC ) = H( J+2, JC ) - TEMP*V( 3 )
-                  TEMP2 = TAU*( T( J, JC )+V( 2 )*T( J+1, JC )+V( 3 )*
-     $                    T( J+2, JC ) )
-                  T( J, JC ) = T( J, JC ) - TEMP2
-                  T( J+1, JC ) = T( J+1, JC ) - TEMP2*V( 2 )
-                  T( J+2, JC ) = T( J+2, JC ) - TEMP2*V( 3 )
+                  TEMP = H( J, JC )+V( 2 )*H( J+1, JC )+V( 3 )*
+     $                   H( J+2, JC )
+                  H( J, JC ) = H( J, JC ) - TEMP*TAU
+                  H( J+1, JC ) = H( J+1, JC ) - TEMP*T2
+                  H( J+2, JC ) = H( J+2, JC ) - TEMP*T3
+                  TEMP2 = T( J, JC )+V( 2 )*T( J+1, JC )+V( 3 )*
+     $                    T( J+2, JC )
+                  T( J, JC ) = T( J, JC ) - TEMP2*TAU
+                  T( J+1, JC ) = T( J+1, JC ) - TEMP2*T2
+                  T( J+2, JC ) = T( J+2, JC ) - TEMP2*T3
   230          CONTINUE
                IF( ILQ ) THEN
                   DO 240 JR = 1, N
-                     TEMP = TAU*( Q( JR, J )+V( 2 )*Q( JR, J+1 )+V( 3 )*
-     $                      Q( JR, J+2 ) )
-                     Q( JR, J ) = Q( JR, J ) - TEMP
-                     Q( JR, J+1 ) = Q( JR, J+1 ) - TEMP*V( 2 )
-                     Q( JR, J+2 ) = Q( JR, J+2 ) - TEMP*V( 3 )
+                     TEMP = Q( JR, J )+V( 2 )*Q( JR, J+1 )+V( 3 )*
+     $                      Q( JR, J+2 )
+                     Q( JR, J ) = Q( JR, J ) - TEMP*TAU
+                     Q( JR, J+1 ) = Q( JR, J+1 ) - TEMP*T2
+                     Q( JR, J+2 ) = Q( JR, J+2 ) - TEMP*T3
   240             CONTINUE
                END IF
 *
@@ -1238,27 +1245,29 @@ SUBROUTINE SHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
 *
 *              Apply transformations from the right.
 *
+               T2 = TAU*V( 2 )
+               T3 = TAU*V( 3 )
                DO 260 JR = IFRSTM, MIN( J+3, ILAST )
-                  TEMP = TAU*( H( JR, J )+V( 2 )*H( JR, J+1 )+V( 3 )*
-     $                   H( JR, J+2 ) )
-                  H( JR, J ) = H( JR, J ) - TEMP
-                  H( JR, J+1 ) = H( JR, J+1 ) - TEMP*V( 2 )
-                  H( JR, J+2 ) = H( JR, J+2 ) - TEMP*V( 3 )
+                  TEMP = H( JR, J )+V( 2 )*H( JR, J+1 )+V( 3 )*
+     $                   H( JR, J+2 )
+                  H( JR, J ) = H( JR, J ) - TEMP*TAU
+                  H( JR, J+1 ) = H( JR, J+1 ) - TEMP*T2
+                  H( JR, J+2 ) = H( JR, J+2 ) - TEMP*T3
   260          CONTINUE
                DO 270 JR = IFRSTM, J + 2
-                  TEMP = TAU*( T( JR, J )+V( 2 )*T( JR, J+1 )+V( 3 )*
-     $                   T( JR, J+2 ) )
-                  T( JR, J ) = T( JR, J ) - TEMP
-                  T( JR, J+1 ) = T( JR, J+1 ) - TEMP*V( 2 )
-                  T( JR, J+2 ) = T( JR, J+2 ) - TEMP*V( 3 )
+                  TEMP = T( JR, J )+V( 2 )*T( JR, J+1 )+V( 3 )*
+     $                   T( JR, J+2 )
+                  T( JR, J ) = T( JR, J ) - TEMP*TAU
+                  T( JR, J+1 ) = T( JR, J+1 ) - TEMP*T2
+                  T( JR, J+2 ) = T( JR, J+2 ) - TEMP*T3
   270          CONTINUE
                IF( ILZ ) THEN
                   DO 280 JR = 1, N
-                     TEMP = TAU*( Z( JR, J )+V( 2 )*Z( JR, J+1 )+V( 3 )*
-     $                      Z( JR, J+2 ) )
-                     Z( JR, J ) = Z( JR, J ) - TEMP
-                     Z( JR, J+1 ) = Z( JR, J+1 ) - TEMP*V( 2 )
-                     Z( JR, J+2 ) = Z( JR, J+2 ) - TEMP*V( 3 )
+                     TEMP = Z( JR, J )+V( 2 )*Z( JR, J+1 )+V( 3 )*
+     $                      Z( JR, J+2 )
+                     Z( JR, J ) = Z( JR, J ) - TEMP*TAU
+                     Z( JR, J+1 ) = Z( JR, J+1 ) - TEMP*T2
+                     Z( JR, J+2 ) = Z( JR, J+2 ) - TEMP*T3
   280             CONTINUE
                END IF
                T( J+1, J ) = ZERO
@@ -1365,7 +1374,7 @@ SUBROUTINE SHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
 *     Exit (other than argument error) -- return optimal workspace size
 *
   420 CONTINUE
-      WORK( 1 ) = REAL( N )
+      WORK( 1 ) = SROUNDUP_LWORK( N )
       RETURN
 *
 *     End of SHGEQZ
diff --git a/SRC/shsein.f b/SRC/shsein.f
index f1983d541a..59c63d71be 100644
--- a/SRC/shsein.f
+++ b/SRC/shsein.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SHSEIN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/shsein.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/shsein.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -244,7 +242,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup hsein
 *
 *> \par Further Details:
 *  =====================
@@ -257,9 +255,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, WR, WI,
+      SUBROUTINE SHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, WR,
+     $                   WI,
      $                   VL, LDVL, VR, LDVR, MM, M, WORK, IFAILL,
      $                   IFAILR, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -366,7 +366,7 @@ SUBROUTINE SHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, WR, WI,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       ULP = SLAMCH( 'Precision' )
-      SMLNUM = UNFL*( N / ULP )
+      SMLNUM = UNFL*( REAL( N ) / ULP )
       BIGNUM = ( ONE-ULP ) / SMLNUM
 *
       LDWORK = N + 1
@@ -457,7 +457,8 @@ SUBROUTINE SHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, WR, WI,
 *
 *              Compute left eigenvector.
 *
-               CALL SLAEIN( .FALSE., NOINIT, N-KL+1, H( KL, KL ), LDH,
+               CALL SLAEIN( .FALSE., NOINIT, N-KL+1, H( KL, KL ),
+     $                      LDH,
      $                      WKR, WKI, VL( KL, KSR ), VL( KL, KSI ),
      $                      WORK, LDWORK, WORK( N*N+N+1 ), EPS3, SMLNUM,
      $                      BIGNUM, IINFO )
diff --git a/SRC/shseqr.f b/SRC/shseqr.f
index 3b8d4c4d8b..eced809495 100644
--- a/SRC/shseqr.f
+++ b/SRC/shseqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SHSEQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/shseqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/shseqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -233,7 +231,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup hseqr
 *
 *> \par Contributors:
 *  ==================
@@ -313,6 +311,7 @@
 *  =====================================================================
       SUBROUTINE SHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, WR, WI, Z,
      $                   LDZ, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -358,10 +357,12 @@ SUBROUTINE SHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, WR, WI, Z,
 *     .. External Functions ..
       INTEGER            ILAENV
       LOGICAL            LSAME
-      EXTERNAL           ILAENV, LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLACPY, SLAHQR, SLAQR0, SLASET, XERBLA
+      EXTERNAL           SLACPY, SLAHQR, SLAQR0, SLASET,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN, REAL
@@ -373,7 +374,7 @@ SUBROUTINE SHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, WR, WI, Z,
       WANTT = LSAME( JOB, 'S' )
       INITZ = LSAME( COMPZ, 'I' )
       WANTZ = INITZ .OR. LSAME( COMPZ, 'V' )
-      WORK( 1 ) = REAL( MAX( 1, N ) )
+      WORK( 1 ) = SROUNDUP_LWORK( MAX( 1, N ) )
       LQUERY = LWORK.EQ.-1
 *
       INFO = 0
@@ -454,13 +455,15 @@ SUBROUTINE SHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, WR, WI, Z,
 *        ==== SLAQR0 for big matrices; SLAHQR for small ones ====
 *
          IF( N.GT.NMIN ) THEN
-            CALL SLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI, ILO,
+            CALL SLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
+     $                   ILO,
      $                   IHI, Z, LDZ, WORK, LWORK, INFO )
          ELSE
 *
 *           ==== Small matrix ====
 *
-            CALL SLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI, ILO,
+            CALL SLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
+     $                   ILO,
      $                   IHI, Z, LDZ, INFO )
 *
             IF( INFO.GT.0 ) THEN
@@ -475,7 +478,8 @@ SUBROUTINE SHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, WR, WI, Z,
 *                 ==== Larger matrices have enough subdiagonal scratch
 *                 .    space to call SLAQR0 directly. ====
 *
-                  CALL SLAQR0( WANTT, WANTZ, N, ILO, KBOT, H, LDH, WR,
+                  CALL SLAQR0( WANTT, WANTZ, N, ILO, KBOT, H, LDH,
+     $                         WR,
      $                         WI, ILO, IHI, Z, LDZ, WORK, LWORK, INFO )
 *
                ELSE
@@ -487,9 +491,11 @@ SUBROUTINE SHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, WR, WI, Z,
 *
                   CALL SLACPY( 'A', N, N, H, LDH, HL, NL )
                   HL( N+1, N ) = ZERO
-                  CALL SLASET( 'A', NL, NL-N, ZERO, ZERO, HL( 1, N+1 ),
+                  CALL SLASET( 'A', NL, NL-N, ZERO, ZERO, HL( 1,
+     $                         N+1 ),
      $                         NL )
-                  CALL SLAQR0( WANTT, WANTZ, NL, ILO, KBOT, HL, NL, WR,
+                  CALL SLAQR0( WANTT, WANTZ, NL, ILO, KBOT, HL, NL,
+     $                         WR,
      $                         WI, ILO, IHI, Z, LDZ, WORKL, NL, INFO )
                   IF( WANTT .OR. INFO.NE.0 )
      $               CALL SLACPY( 'A', N, N, HL, NL, H, LDH )
diff --git a/SRC/sisnan.f b/SRC/sisnan.f
index edde0651e9..d412003797 100644
--- a/SRC/sisnan.f
+++ b/SRC/sisnan.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SISNAN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sisnan.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sisnan.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -52,10 +50,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup isnan
 *
 *  =====================================================================
       LOGICAL FUNCTION SISNAN( SIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sla_gbamv.f b/SRC/sla_gbamv.f
index c584466121..c1714cd18f 100644
--- a/SRC/sla_gbamv.f
+++ b/SRC/sla_gbamv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLA_GBAMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sla_gbamv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sla_gbamv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -157,6 +155,8 @@
 *>           Before entry with BETA non-zero, the incremented array Y
 *>           must contain the vector y. On exit, Y is overwritten by the
 *>           updated vector y.
+*>           If either m or n is zero, then Y not referenced and the function
+*>           performs a quick return.
 *> \endverbatim
 *>
 *> \param[in] INCY
@@ -177,11 +177,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBcomputational
+*> \ingroup la_gbamv
 *
 *  =====================================================================
       SUBROUTINE SLA_GBAMV( TRANS, M, N, KL, KU, ALPHA, AB, LDAB, X,
      $                      INCX, BETA, Y, INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sla_gbrcond.f b/SRC/sla_gbrcond.f
index 5e1e5ef601..d3df620e21 100644
--- a/SRC/sla_gbrcond.f
+++ b/SRC/sla_gbrcond.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLA_GBRCOND + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sla_gbrcond.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sla_gbrcond.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,11 +158,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBcomputational
+*> \ingroup la_gbrcond
 *
 *  =====================================================================
-      REAL FUNCTION SLA_GBRCOND( TRANS, N, KL, KU, AB, LDAB, AFB, LDAFB,
+      REAL FUNCTION SLA_GBRCOND( TRANS, N, KL, KU, AB, LDAB, AFB,
+     $                           LDAFB,
      $                           IPIV, CMODE, C, INFO, WORK, IWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -292,7 +292,8 @@ REAL FUNCTION SLA_GBRCOND( TRANS, N, KL, KU, AB, LDAB, AFB, LDAFB,
                CALL SGBTRS( 'No transpose', N, KL, KU, 1, AFB, LDAFB,
      $              IPIV, WORK, N, INFO )
             ELSE
-               CALL SGBTRS( 'Transpose', N, KL, KU, 1, AFB, LDAFB, IPIV,
+               CALL SGBTRS( 'Transpose', N, KL, KU, 1, AFB, LDAFB,
+     $                      IPIV,
      $              WORK, N, INFO )
             END IF
 *
@@ -322,7 +323,8 @@ REAL FUNCTION SLA_GBRCOND( TRANS, N, KL, KU, AB, LDAB, AFB, LDAFB,
             END IF
 
             IF ( NOTRANS ) THEN
-               CALL SGBTRS( 'Transpose', N, KL, KU, 1, AFB, LDAFB, IPIV,
+               CALL SGBTRS( 'Transpose', N, KL, KU, 1, AFB, LDAFB,
+     $                      IPIV,
      $              WORK, N, INFO )
             ELSE
                CALL SGBTRS( 'No transpose', N, KL, KU, 1, AFB, LDAFB,
diff --git a/SRC/sla_gbrfsx_extended.f b/SRC/sla_gbrfsx_extended.f
index 036f76b3b2..a78e997c27 100644
--- a/SRC/sla_gbrfsx_extended.f
+++ b/SRC/sla_gbrfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLA_GBRFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sla_gbrfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sla_gbrfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -54,7 +52,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERR_BNDS_NORM
 *> and ERR_BNDS_COMP for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERR_BNDS_NORM and ERR_BNDS_COMP.
 *> \endverbatim
 *
@@ -397,16 +395,18 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBcomputational
+*> \ingroup la_gbrfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE SLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL, KU,
+      SUBROUTINE SLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL,
+     $                                KU,
      $                                NRHS, AB, LDAB, AFB, LDAFB, IPIV,
      $                                COLEQU, C, B, LDB, Y, LDY,
      $                                BERR_OUT, N_NORMS, ERR_BNDS_NORM,
      $                                ERR_BNDS_COMP, RES, AYB, DY,
      $                                Y_TAIL, RCOND, ITHRESH, RTHRESH,
      $                                DZ_UB, IGNORE_CWISE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -465,7 +465,8 @@ SUBROUTINE SLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL, KU,
       PARAMETER          ( LA_LINRX_RCOND_I = 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SGBTRS, SGBMV, BLAS_SGBMV_X,
+      EXTERNAL           SAXPY, SCOPY, SGBTRS, SGBMV,
+     $                   BLAS_SGBMV_X,
      $                   BLAS_SGBMV2_X, SLA_GBAMV, SLA_WWADDW, SLAMCH,
      $                   CHLA_TRANSTYPE, SLA_LIN_BERR
       REAL               SLAMCH
@@ -530,7 +531,8 @@ SUBROUTINE SLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL, KU,
 
 !        XXX: RES is no longer needed.
             CALL SCOPY( N, RES, 1, DY, 1 )
-            CALL SGBTRS( TRANS, N, KL, KU, 1, AFB, LDAFB, IPIV, DY, N,
+            CALL SGBTRS( TRANS, N, KL, KU, 1, AFB, LDAFB, IPIV, DY,
+     $                   N,
      $           INFO )
 *
 *         Calculate relative changes DX_X, DZ_Z and ratios DXRAT, DZRAT.
@@ -644,7 +646,7 @@ SUBROUTINE SLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL, KU,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF (Y_PREC_STATE .LT. EXTRA_Y) THEN
                CALL SAXPY( N, 1.0, DY, 1, Y(1,J), 1 )
diff --git a/SRC/sla_gbrpvgrw.f b/SRC/sla_gbrpvgrw.f
index 5c8af01723..a35a162531 100644
--- a/SRC/sla_gbrpvgrw.f
+++ b/SRC/sla_gbrpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLA_GBRPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sla_gbrpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sla_gbrpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -109,11 +107,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBcomputational
+*> \ingroup la_gbrpvgrw
 *
 *  =====================================================================
       REAL FUNCTION SLA_GBRPVGRW( N, KL, KU, NCOLS, AB, LDAB, AFB,
      $                            LDAFB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sla_geamv.f b/SRC/sla_geamv.f
index 0fcb80241d..957fe3ff5a 100644
--- a/SRC/sla_geamv.f
+++ b/SRC/sla_geamv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLA_GEAMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sla_geamv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sla_geamv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -146,6 +144,8 @@
 *>           Before entry with BETA non-zero, the incremented array Y
 *>           must contain the vector y. On exit, Y is overwritten by the
 *>           updated vector y.
+*>           If either m or n is zero, then Y not referenced and the function
+*>           performs a quick return.
 *> \endverbatim
 *>
 *> \param[in] INCY
@@ -166,11 +166,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup la_geamv
 *
 *  =====================================================================
-      SUBROUTINE SLA_GEAMV( TRANS, M, N, ALPHA, A, LDA, X, INCX, BETA,
+      SUBROUTINE SLA_GEAMV( TRANS, M, N, ALPHA, A, LDA, X, INCX,
+     $                      BETA,
      $                      Y, INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sla_gercond.f b/SRC/sla_gercond.f
index 44dba01c60..f71673d782 100644
--- a/SRC/sla_gercond.f
+++ b/SRC/sla_gercond.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLA_GERCOND + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sla_gercond.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sla_gercond.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -142,11 +140,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup la_gercond
 *
 *  =====================================================================
       REAL FUNCTION SLA_GERCOND( TRANS, N, A, LDA, AF, LDAF, IPIV,
      $                           CMODE, C, INFO, WORK, IWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sla_gerfsx_extended.f b/SRC/sla_gerfsx_extended.f
index 5149b33937..eceb62d874 100644
--- a/SRC/sla_gerfsx_extended.f
+++ b/SRC/sla_gerfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLA_GERFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sla_gerfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sla_gerfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -54,7 +52,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERRS_N
 *> and ERRS_C for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERRS_N and ERRS_C.
 *> \endverbatim
 *
@@ -385,16 +383,18 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup la_gerfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE SLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
+      SUBROUTINE SLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS,
+     $                                A,
      $                                LDA, AF, LDAF, IPIV, COLEQU, C, B,
      $                                LDB, Y, LDY, BERR_OUT, N_NORMS,
      $                                ERRS_N, ERRS_C, RES,
      $                                AYB, DY, Y_TAIL, RCOND, ITHRESH,
      $                                RTHRESH, DZ_UB, IGNORE_CWISE,
      $                                INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -453,7 +453,8 @@ SUBROUTINE SLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
       PARAMETER          ( LA_LINRX_RCOND_I = 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SGETRS, SGEMV, BLAS_SGEMV_X,
+      EXTERNAL           SAXPY, SCOPY, SGETRS, SGEMV,
+     $                   BLAS_SGEMV_X,
      $                   BLAS_SGEMV2_X, SLA_GEAMV, SLA_WWADDW, SLAMCH,
      $                   CHLA_TRANSTYPE, SLA_LIN_BERR
       REAL               SLAMCH
@@ -628,7 +629,7 @@ SUBROUTINE SLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF ( Y_PREC_STATE .LT. EXTRA_Y ) THEN
                CALL SAXPY( N, 1.0, DY, 1, Y( 1, J ), 1 )
@@ -665,7 +666,8 @@ SUBROUTINE SLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
 *             op(A) = A, A**T, or A**H depending on TRANS (and type).
 *
          CALL SCOPY( N, B( 1, J ), 1, RES, 1 )
-         CALL SGEMV( TRANS, N, N, -1.0, A, LDA, Y(1,J), 1, 1.0, RES, 1 )
+         CALL SGEMV( TRANS, N, N, -1.0, A, LDA, Y(1,J), 1, 1.0, RES,
+     $               1 )
 
          DO I = 1, N
             AYB( I ) = ABS( B( I, J ) )
diff --git a/SRC/sla_gerpvgrw.f b/SRC/sla_gerpvgrw.f
index 05a61dc701..00d17ca829 100644
--- a/SRC/sla_gerpvgrw.f
+++ b/SRC/sla_gerpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLA_GERPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sla_gerpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sla_gerpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -90,10 +88,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup la_gerpvgrw
 *
 *  =====================================================================
       REAL FUNCTION SLA_GERPVGRW( N, NCOLS, A, LDA, AF, LDAF )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sla_lin_berr.f b/SRC/sla_lin_berr.f
index befc1fc143..3742eb656b 100644
--- a/SRC/sla_lin_berr.f
+++ b/SRC/sla_lin_berr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLA_LIN_BERR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sla_lin_berr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sla_lin_berr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -94,10 +92,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup la_lin_berr
 *
 *  =====================================================================
       SUBROUTINE SLA_LIN_BERR( N, NZ, NRHS, RES, AYB, BERR )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sla_porcond.f b/SRC/sla_porcond.f
index 2506401166..f3a1201043 100644
--- a/SRC/sla_porcond.f
+++ b/SRC/sla_porcond.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLA_PORCOND + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sla_porcond.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sla_porcond.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,11 +130,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPOcomputational
+*> \ingroup la_porcond
 *
 *  =====================================================================
       REAL FUNCTION SLA_PORCOND( UPLO, N, A, LDA, AF, LDAF, CMODE, C,
      $                           INFO, WORK, IWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sla_porfsx_extended.f b/SRC/sla_porfsx_extended.f
index bb67bf4531..d7b29e4fa8 100644
--- a/SRC/sla_porfsx_extended.f
+++ b/SRC/sla_porfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLA_PORFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sla_porfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sla_porfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -54,7 +52,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERR_BNDS_NORM
 *> and ERR_BNDS_COMP for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERR_BNDS_NORM and ERR_BNDS_COMP.
 *> \endverbatim
 *
@@ -374,16 +372,18 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPOcomputational
+*> \ingroup la_porfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE SLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
+      SUBROUTINE SLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A,
+     $                                LDA,
      $                                AF, LDAF, COLEQU, C, B, LDB, Y,
      $                                LDY, BERR_OUT, N_NORMS,
      $                                ERR_BNDS_NORM, ERR_BNDS_COMP, RES,
      $                                AYB, DY, Y_TAIL, RCOND, ITHRESH,
      $                                RTHRESH, DZ_UB, IGNORE_CWISE,
      $                                INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -446,7 +446,8 @@ SUBROUTINE SLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
       INTEGER            ILAUPLO
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL          SAXPY, SCOPY, SPOTRS, SSYMV, BLAS_SSYMV_X,
+      EXTERNAL          SAXPY, SCOPY, SPOTRS, SSYMV,
+     $                   BLAS_SSYMV_X,
      $                  BLAS_SSYMV2_X, SLA_SYAMV, SLA_WWADDW,
      $                  SLA_LIN_BERR
       REAL              SLAMCH
@@ -617,7 +618,7 @@ SUBROUTINE SLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF (Y_PREC_STATE .LT. EXTRA_Y) THEN
                CALL SAXPY( N, 1.0, DY, 1, Y(1,J), 1 )
diff --git a/SRC/sla_porpvgrw.f b/SRC/sla_porpvgrw.f
index a97e7f72a5..f653937d0a 100644
--- a/SRC/sla_porpvgrw.f
+++ b/SRC/sla_porpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLA_PORPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sla_porpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sla_porpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPOcomputational
+*> \ingroup la_porpvgrw
 *
 *  =====================================================================
-      REAL FUNCTION SLA_PORPVGRW( UPLO, NCOLS, A, LDA, AF, LDAF, WORK )
+      REAL FUNCTION SLA_PORPVGRW( UPLO, NCOLS, A, LDA, AF, LDAF,
+     $                            WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -132,9 +132,9 @@ REAL FUNCTION SLA_PORPVGRW( UPLO, NCOLS, A, LDA, AF, LDAF, WORK )
 *
       UPPER = LSAME( 'Upper', UPLO )
 *
-*     SPOTRF will have factored only the NCOLSxNCOLS leading minor, so
-*     we restrict the growth search to that minor and use only the first
-*     2*NCOLS workspace entries.
+*     SPOTRF will have factored only the NCOLSxNCOLS leading submatrix,
+*     so we restrict the growth search to that submatrix and use only
+*     the first 2*NCOLS workspace entries.
 *
       RPVGRW = 1.0
       DO I = 1, 2*NCOLS
diff --git a/SRC/sla_syamv.f b/SRC/sla_syamv.f
index a44cc6e0d2..39fd3062d4 100644
--- a/SRC/sla_syamv.f
+++ b/SRC/sla_syamv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLA_SYAMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sla_syamv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sla_syamv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -153,7 +151,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup la_heamv
 *
 *> \par Further Details:
 *  =====================
@@ -174,6 +172,7 @@
 *  =====================================================================
       SUBROUTINE SLA_SYAMV( UPLO, N, ALPHA, A, LDA, X, INCX, BETA, Y,
      $                      INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sla_syrcond.f b/SRC/sla_syrcond.f
index 95dd9a81f9..93f0ee200c 100644
--- a/SRC/sla_syrcond.f
+++ b/SRC/sla_syrcond.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLA_SYRCOND + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sla_syrcond.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sla_syrcond.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -138,11 +136,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup la_hercond
 *
 *  =====================================================================
-      REAL FUNCTION SLA_SYRCOND( UPLO, N, A, LDA, AF, LDAF, IPIV, CMODE,
+      REAL FUNCTION SLA_SYRCOND( UPLO, N, A, LDA, AF, LDAF, IPIV,
+     $                           CMODE,
      $                           C, INFO, WORK, IWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -280,9 +280,11 @@ REAL FUNCTION SLA_SYRCOND( UPLO, N, A, LDA, AF, LDAF, IPIV, CMODE,
             END DO
 
             IF ( UP ) THEN
-               CALL SSYTRS( 'U', N, 1, AF, LDAF, IPIV, WORK, N, INFO )
+               CALL SSYTRS( 'U', N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
             ELSE
-               CALL SSYTRS( 'L', N, 1, AF, LDAF, IPIV, WORK, N, INFO )
+               CALL SSYTRS( 'L', N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
             ENDIF
 *
 *           Multiply by inv(C).
@@ -311,9 +313,11 @@ REAL FUNCTION SLA_SYRCOND( UPLO, N, A, LDA, AF, LDAF, IPIV, CMODE,
             END IF
 
             IF ( UP ) THEN
-               CALL SSYTRS( 'U', N, 1, AF, LDAF, IPIV, WORK, N, INFO )
+               CALL SSYTRS( 'U', N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
             ELSE
-               CALL SSYTRS( 'L', N, 1, AF, LDAF, IPIV, WORK, N, INFO )
+               CALL SSYTRS( 'L', N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
             ENDIF
 *
 *           Multiply by R.
diff --git a/SRC/sla_syrfsx_extended.f b/SRC/sla_syrfsx_extended.f
index 9bd878c255..edb7dbfed0 100644
--- a/SRC/sla_syrfsx_extended.f
+++ b/SRC/sla_syrfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLA_SYRFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sla_syrfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sla_syrfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -56,7 +54,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERR_BNDS_NORM
 *> and ERR_BNDS_COMP for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERR_BNDS_NORM and ERR_BNDS_COMP.
 *> \endverbatim
 *
@@ -383,16 +381,18 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup la_herfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE SLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
+      SUBROUTINE SLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A,
+     $                                LDA,
      $                                AF, LDAF, IPIV, COLEQU, C, B, LDB,
      $                                Y, LDY, BERR_OUT, N_NORMS,
      $                                ERR_BNDS_NORM, ERR_BNDS_COMP, RES,
      $                                AYB, DY, Y_TAIL, RCOND, ITHRESH,
      $                                RTHRESH, DZ_UB, IGNORE_CWISE,
      $                                INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -456,7 +456,8 @@ SUBROUTINE SLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
       INTEGER            ILAUPLO
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SSYTRS, SSYMV, BLAS_SSYMV_X,
+      EXTERNAL           SAXPY, SCOPY, SSYTRS, SSYMV,
+     $                   BLAS_SSYMV_X,
      $                   BLAS_SSYMV2_X, SLA_SYAMV, SLA_WWADDW,
      $                   SLA_LIN_BERR
       REAL               SLAMCH
@@ -647,7 +648,7 @@ SUBROUTINE SLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF (Y_PREC_STATE .LT. EXTRA_Y) THEN
                CALL SAXPY( N, 1.0, DY, 1, Y(1,J), 1 )
diff --git a/SRC/sla_syrpvgrw.f b/SRC/sla_syrpvgrw.f
index 88c61ec56c..e9a7d88cad 100644
--- a/SRC/sla_syrpvgrw.f
+++ b/SRC/sla_syrpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLA_SYRPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sla_syrpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sla_syrpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -114,11 +112,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup la_herpvgrw
 *
 *  =====================================================================
-      REAL FUNCTION SLA_SYRPVGRW( UPLO, N, INFO, A, LDA, AF, LDAF, IPIV,
+      REAL FUNCTION SLA_SYRPVGRW( UPLO, N, INFO, A, LDA, AF, LDAF,
+     $                            IPIV,
      $                            WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sla_wwaddw.f b/SRC/sla_wwaddw.f
index 925dae8649..853c5d4ede 100644
--- a/SRC/sla_wwaddw.f
+++ b/SRC/sla_wwaddw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLA_WWADDW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sla_wwaddw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sla_wwaddw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -74,10 +72,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup la_wwaddw
 *
 *  =====================================================================
       SUBROUTINE SLA_WWADDW( N, X, Y, W )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slabad.f b/SRC/slabad.f
index cb223594f4..31be485ac6 100644
--- a/SRC/slabad.f
+++ b/SRC/slabad.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLABAD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slabad.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slabad.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -30,14 +28,9 @@
 *>
 *> \verbatim
 *>
-*> SLABAD takes as input the values computed by SLAMCH for underflow and
-*> overflow, and returns the square root of each of these values if the
-*> log of LARGE is sufficiently large.  This subroutine is intended to
-*> identify machines with a large exponent range, such as the Crays, and
-*> redefine the underflow and overflow limits to be the square roots of
-*> the values computed by SLAMCH.  This subroutine is needed because
-*> SLAMCH does not compensate for poor arithmetic in the upper half of
-*> the exponent range, as is found on a Cray.
+*> SLABAD is a no-op and kept for compatibility reasons. It used
+*> to correct the overflow/underflow behavior of machines that
+*> are not IEEE-754 compliant.
 *> \endverbatim
 *
 *  Arguments:
@@ -47,16 +40,14 @@
 *> \verbatim
 *>          SMALL is REAL
 *>          On entry, the underflow threshold as computed by SLAMCH.
-*>          On exit, if LOG10(LARGE) is sufficiently large, the square
-*>          root of SMALL, otherwise unchanged.
+*>          On exit, the unchanged value SMALL.
 *> \endverbatim
 *>
 *> \param[in,out] LARGE
 *> \verbatim
 *>          LARGE is REAL
 *>          On entry, the overflow threshold as computed by SLAMCH.
-*>          On exit, if LOG10(LARGE) is sufficiently large, the square
-*>          root of LARGE, otherwise unchanged.
+*>          On exit, the unchanged value LARGE.
 *> \endverbatim
 *
 *  Authors:
@@ -67,10 +58,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup labad
 *
 *  =====================================================================
       SUBROUTINE SLABAD( SMALL, LARGE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -90,10 +82,10 @@ SUBROUTINE SLABAD( SMALL, LARGE )
 *     If it looks like we're on a Cray, take the square root of
 *     SMALL and LARGE to avoid overflow and underflow problems.
 *
-      IF( LOG10( LARGE ).GT.2000. ) THEN
-         SMALL = SQRT( SMALL )
-         LARGE = SQRT( LARGE )
-      END IF
+*      IF( LOG10( LARGE ).GT.2000. ) THEN
+*         SMALL = SQRT( SMALL )
+*         LARGE = SQRT( LARGE )
+*      END IF
 *
       RETURN
 *
diff --git a/SRC/slabrd.f b/SRC/slabrd.f
index 808d45cc12..c639ae8f3d 100644
--- a/SRC/slabrd.f
+++ b/SRC/slabrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLABRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slabrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slabrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -156,7 +154,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup labrd
 *
 *> \par Further Details:
 *  =====================
@@ -205,8 +203,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
+      SUBROUTINE SLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX,
+     $                   Y,
      $                   LDY )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -267,11 +267,14 @@ SUBROUTINE SLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
 *
                CALL SGEMV( 'Transpose', M-I+1, N-I, ONE, A( I, I+1 ),
      $                     LDA, A( I, I ), 1, ZERO, Y( I+1, I ), 1 )
-               CALL SGEMV( 'Transpose', M-I+1, I-1, ONE, A( I, 1 ), LDA,
+               CALL SGEMV( 'Transpose', M-I+1, I-1, ONE, A( I, 1 ),
+     $                     LDA,
      $                     A( I, I ), 1, ZERO, Y( 1, I ), 1 )
-               CALL SGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1, 1 ),
+               CALL SGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1,
+     $                     1 ),
      $                     LDY, Y( 1, I ), 1, ONE, Y( I+1, I ), 1 )
-               CALL SGEMV( 'Transpose', M-I+1, I-1, ONE, X( I, 1 ), LDX,
+               CALL SGEMV( 'Transpose', M-I+1, I-1, ONE, X( I, 1 ),
+     $                     LDX,
      $                     A( I, I ), 1, ZERO, Y( 1, I ), 1 )
                CALL SGEMV( 'Transpose', I-1, N-I, -ONE, A( 1, I+1 ),
      $                     LDA, Y( 1, I ), 1, ONE, Y( I+1, I ), 1 )
@@ -293,15 +296,19 @@ SUBROUTINE SLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
 *
 *              Compute X(i+1:m,i)
 *
-               CALL SGEMV( 'No transpose', M-I, N-I, ONE, A( I+1, I+1 ),
+               CALL SGEMV( 'No transpose', M-I, N-I, ONE, A( I+1,
+     $                     I+1 ),
      $                     LDA, A( I, I+1 ), LDA, ZERO, X( I+1, I ), 1 )
-               CALL SGEMV( 'Transpose', N-I, I, ONE, Y( I+1, 1 ), LDY,
+               CALL SGEMV( 'Transpose', N-I, I, ONE, Y( I+1, 1 ),
+     $                     LDY,
      $                     A( I, I+1 ), LDA, ZERO, X( 1, I ), 1 )
                CALL SGEMV( 'No transpose', M-I, I, -ONE, A( I+1, 1 ),
      $                     LDA, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
-               CALL SGEMV( 'No transpose', I-1, N-I, ONE, A( 1, I+1 ),
+               CALL SGEMV( 'No transpose', I-1, N-I, ONE, A( 1,
+     $                     I+1 ),
      $                     LDA, A( I, I+1 ), LDA, ZERO, X( 1, I ), 1 )
-               CALL SGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1, 1 ),
+               CALL SGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1,
+     $                     1 ),
      $                     LDX, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
                CALL SSCAL( M-I, TAUP( I ), X( I+1, I ), 1 )
             END IF
@@ -316,12 +323,14 @@ SUBROUTINE SLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
 *
             CALL SGEMV( 'No transpose', N-I+1, I-1, -ONE, Y( I, 1 ),
      $                  LDY, A( I, 1 ), LDA, ONE, A( I, I ), LDA )
-            CALL SGEMV( 'Transpose', I-1, N-I+1, -ONE, A( 1, I ), LDA,
+            CALL SGEMV( 'Transpose', I-1, N-I+1, -ONE, A( 1, I ),
+     $                  LDA,
      $                  X( I, 1 ), LDX, ONE, A( I, I ), LDA )
 *
 *           Generate reflection P(i) to annihilate A(i,i+1:n)
 *
-            CALL SLARFG( N-I+1, A( I, I ), A( I, MIN( I+1, N ) ), LDA,
+            CALL SLARFG( N-I+1, A( I, I ), A( I, MIN( I+1, N ) ),
+     $                   LDA,
      $                   TAUP( I ) )
             D( I ) = A( I, I )
             IF( I.LT.M ) THEN
@@ -329,28 +338,35 @@ SUBROUTINE SLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
 *
 *              Compute X(i+1:m,i)
 *
-               CALL SGEMV( 'No transpose', M-I, N-I+1, ONE, A( I+1, I ),
+               CALL SGEMV( 'No transpose', M-I, N-I+1, ONE, A( I+1,
+     $                     I ),
      $                     LDA, A( I, I ), LDA, ZERO, X( I+1, I ), 1 )
-               CALL SGEMV( 'Transpose', N-I+1, I-1, ONE, Y( I, 1 ), LDY,
+               CALL SGEMV( 'Transpose', N-I+1, I-1, ONE, Y( I, 1 ),
+     $                     LDY,
      $                     A( I, I ), LDA, ZERO, X( 1, I ), 1 )
-               CALL SGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1, 1 ),
+               CALL SGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1,
+     $                     1 ),
      $                     LDA, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
-               CALL SGEMV( 'No transpose', I-1, N-I+1, ONE, A( 1, I ),
+               CALL SGEMV( 'No transpose', I-1, N-I+1, ONE, A( 1,
+     $                     I ),
      $                     LDA, A( I, I ), LDA, ZERO, X( 1, I ), 1 )
-               CALL SGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1, 1 ),
+               CALL SGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1,
+     $                     1 ),
      $                     LDX, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
                CALL SSCAL( M-I, TAUP( I ), X( I+1, I ), 1 )
 *
 *              Update A(i+1:m,i)
 *
-               CALL SGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1, 1 ),
+               CALL SGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1,
+     $                     1 ),
      $                     LDA, Y( I, 1 ), LDY, ONE, A( I+1, I ), 1 )
                CALL SGEMV( 'No transpose', M-I, I, -ONE, X( I+1, 1 ),
      $                     LDX, A( 1, I ), 1, ONE, A( I+1, I ), 1 )
 *
 *              Generate reflection Q(i) to annihilate A(i+2:m,i)
 *
-               CALL SLARFG( M-I, A( I+1, I ), A( MIN( I+2, M ), I ), 1,
+               CALL SLARFG( M-I, A( I+1, I ), A( MIN( I+2, M ), I ),
+     $                      1,
      $                      TAUQ( I ) )
                E( I ) = A( I+1, I )
                A( I+1, I ) = ONE
@@ -359,13 +375,17 @@ SUBROUTINE SLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
 *
                CALL SGEMV( 'Transpose', M-I, N-I, ONE, A( I+1, I+1 ),
      $                     LDA, A( I+1, I ), 1, ZERO, Y( I+1, I ), 1 )
-               CALL SGEMV( 'Transpose', M-I, I-1, ONE, A( I+1, 1 ), LDA,
+               CALL SGEMV( 'Transpose', M-I, I-1, ONE, A( I+1, 1 ),
+     $                     LDA,
      $                     A( I+1, I ), 1, ZERO, Y( 1, I ), 1 )
-               CALL SGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1, 1 ),
+               CALL SGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1,
+     $                     1 ),
      $                     LDY, Y( 1, I ), 1, ONE, Y( I+1, I ), 1 )
-               CALL SGEMV( 'Transpose', M-I, I, ONE, X( I+1, 1 ), LDX,
+               CALL SGEMV( 'Transpose', M-I, I, ONE, X( I+1, 1 ),
+     $                     LDX,
      $                     A( I+1, I ), 1, ZERO, Y( 1, I ), 1 )
-               CALL SGEMV( 'Transpose', I, N-I, -ONE, A( 1, I+1 ), LDA,
+               CALL SGEMV( 'Transpose', I, N-I, -ONE, A( 1, I+1 ),
+     $                     LDA,
      $                     Y( 1, I ), 1, ONE, Y( I+1, I ), 1 )
                CALL SSCAL( N-I, TAUQ( I ), Y( I+1, I ), 1 )
             END IF
diff --git a/SRC/slacn2.f b/SRC/slacn2.f
index 1d6217a7cb..7fac3bc367 100644
--- a/SRC/slacn2.f
+++ b/SRC/slacn2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLACN2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slacn2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slacn2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,7 +99,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lacn2
 *
 *> \par Further Details:
 *  =====================
@@ -133,6 +131,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLACN2( N, V, X, ISGN, EST, KASE, ISAVE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slacon.f b/SRC/slacon.f
index 8e3cc73553..a736471279 100644
--- a/SRC/slacon.f
+++ b/SRC/slacon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLACON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slacon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slacon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,7 +93,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lacon
 *
 *> \par Contributors:
 *  ==================
@@ -112,6 +110,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLACON( N, V, X, ISGN, EST, KASE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slacpy.f b/SRC/slacpy.f
index a33a3c67b7..b7a028e449 100644
--- a/SRC/slacpy.f
+++ b/SRC/slacpy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLACPY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slacpy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slacpy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -96,10 +94,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lacpy
 *
 *  =====================================================================
       SUBROUTINE SLACPY( UPLO, M, N, A, LDA, B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sladiv.f b/SRC/sladiv.f
index ff60432fed..eae58951f6 100644
--- a/SRC/sladiv.f
+++ b/SRC/sladiv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLADIV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sladiv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sladiv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -84,10 +82,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup ladiv
 *
 *  =====================================================================
       SUBROUTINE SLADIV( A, B, C, D, P, Q )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -170,10 +169,11 @@ SUBROUTINE SLADIV( A, B, C, D, P, Q )
 *
       END
 
-*> \ingroup realOTHERauxiliary
+*> \ingroup ladiv
 
 
       SUBROUTINE SLADIV1( A, B, C, D, P, Q )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -210,7 +210,7 @@ SUBROUTINE SLADIV1( A, B, C, D, P, Q )
 *
       END
 
-*> \ingroup realOTHERauxiliary
+*> \ingroup ladiv
 
       REAL FUNCTION SLADIV2( A, B, C, D, R, T )
 *
diff --git a/SRC/slae2.f b/SRC/slae2.f
index c6a4f12b29..2e3b9ac674 100644
--- a/SRC/slae2.f
+++ b/SRC/slae2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAE2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slae2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slae2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -78,7 +76,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lae2
 *
 *> \par Further Details:
 *  =====================
@@ -99,6 +97,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLAE2( A, B, C, RT1, RT2 )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slaebz.f b/SRC/slaebz.f
index 4eb8e8b7dc..58c913ef19 100644
--- a/SRC/slaebz.f
+++ b/SRC/slaebz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAEBZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaebz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaebz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -273,7 +271,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup laebz
 *
 *> \par Further Details:
 *  =====================
@@ -316,6 +314,7 @@
       SUBROUTINE SLAEBZ( IJOB, NITMAX, N, MMAX, MINP, NBMIN, ABSTOL,
      $                   RELTOL, PIVMIN, D, E, E2, NVAL, AB, C, MOUT,
      $                   NAB, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slaed0.f b/SRC/slaed0.f
index 42cdd2ceb5..8bf878a0bb 100644
--- a/SRC/slaed0.f
+++ b/SRC/slaed0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAED0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaed0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaed0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -158,7 +156,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed0
 *
 *> \par Contributors:
 *  ==================
@@ -169,6 +167,7 @@
 *  =====================================================================
       SUBROUTINE SLAED0( ICOMPQ, QSIZ, N, D, E, Q, LDQ, QSTORE, LDQS,
      $                   WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -197,7 +196,8 @@ SUBROUTINE SLAED0( ICOMPQ, QSIZ, N, D, E, Q, LDQ, QSTORE, LDQS,
       REAL               TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEMM, SLACPY, SLAED1, SLAED7, SSTEQR,
+      EXTERNAL           SCOPY, SGEMM, SLACPY, SLAED1, SLAED7,
+     $                   SSTEQR,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
@@ -373,7 +373,8 @@ SUBROUTINE SLAED0( ICOMPQ, QSIZ, N, D, E, Q, LDQ, QSTORE, LDQS,
      $                      E( SUBMAT+MSD2-1 ), MSD2, WORK,
      $                      IWORK( SUBPBS+1 ), INFO )
             ELSE
-               CALL SLAED7( ICOMPQ, MATSIZ, QSIZ, TLVLS, CURLVL, CURPRB,
+               CALL SLAED7( ICOMPQ, MATSIZ, QSIZ, TLVLS, CURLVL,
+     $                      CURPRB,
      $                      D( SUBMAT ), QSTORE( 1, SUBMAT ), LDQS,
      $                      IWORK( INDXQ+SUBMAT ), E( SUBMAT+MSD2-1 ),
      $                      MSD2, WORK( IQ ), IWORK( IQPTR ),
diff --git a/SRC/slaed1.f b/SRC/slaed1.f
index 1f13c1fd1e..20a196480a 100644
--- a/SRC/slaed1.f
+++ b/SRC/slaed1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAED1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaed1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaed1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -148,7 +146,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed1
 *
 *> \par Contributors:
 *  ==================
@@ -158,8 +156,10 @@
 *>  Modified by Francoise Tisseur, University of Tennessee
 *>
 *  =====================================================================
-      SUBROUTINE SLAED1( N, D, Q, LDQ, INDXQ, RHO, CUTPNT, WORK, IWORK,
+      SUBROUTINE SLAED1( N, D, Q, LDQ, INDXQ, RHO, CUTPNT, WORK,
+     $                   IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -181,7 +181,8 @@ SUBROUTINE SLAED1( N, D, Q, LDQ, INDXQ, RHO, CUTPNT, WORK, IWORK,
      $                   IQ2, IS, IW, IZ, K, N1, N2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLAED2, SLAED3, SLAMRG, XERBLA
+      EXTERNAL           SCOPY, SLAED2, SLAED3, SLAMRG,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -229,7 +230,8 @@ SUBROUTINE SLAED1( N, D, Q, LDQ, INDXQ, RHO, CUTPNT, WORK, IWORK,
 *
       CALL SCOPY( CUTPNT, Q( CUTPNT, 1 ), LDQ, WORK( IZ ), 1 )
       CPP1 = CUTPNT + 1
-      CALL SCOPY( N-CUTPNT, Q( CPP1, CPP1 ), LDQ, WORK( IZ+CUTPNT ), 1 )
+      CALL SCOPY( N-CUTPNT, Q( CPP1, CPP1 ), LDQ, WORK( IZ+CUTPNT ),
+     $            1 )
 *
 *     Deflate eigenvalues.
 *
diff --git a/SRC/slaed2.f b/SRC/slaed2.f
index 16500e74cd..7b02fd6165 100644
--- a/SRC/slaed2.f
+++ b/SRC/slaed2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAED2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaed2.f">
 *> [TGZ]</a>
@@ -13,12 +12,11 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaed2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE SLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
+*       SUBROUTINE SLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMBDA, W,
 *                          Q2, INDX, INDXC, INDXP, COLTYP, INFO )
 *
 *       .. Scalar Arguments ..
@@ -28,7 +26,7 @@
 *       .. Array Arguments ..
 *       INTEGER            COLTYP( * ), INDX( * ), INDXC( * ), INDXP( * ),
 *      $                   INDXQ( * )
-*       REAL               D( * ), DLAMDA( * ), Q( LDQ, * ), Q2( * ),
+*       REAL               D( * ), DLAMBDA( * ), Q( LDQ, * ), Q2( * ),
 *      $                   W( * ), Z( * )
 *       ..
 *
@@ -123,9 +121,9 @@
 *>         process.
 *> \endverbatim
 *>
-*> \param[out] DLAMDA
+*> \param[out] DLAMBDA
 *> \verbatim
-*>          DLAMDA is REAL array, dimension (N)
+*>          DLAMBDA is REAL array, dimension (N)
 *>         A copy of the first K eigenvalues which will be used by
 *>         SLAED3 to form the secular equation.
 *> \endverbatim
@@ -148,7 +146,7 @@
 *> \param[out] INDX
 *> \verbatim
 *>          INDX is INTEGER array, dimension (N)
-*>         The permutation used to sort the contents of DLAMDA into
+*>         The permutation used to sort the contents of DLAMBDA into
 *>         ascending order.
 *> \endverbatim
 *>
@@ -197,7 +195,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed2
 *
 *> \par Contributors:
 *  ==================
@@ -207,8 +205,10 @@
 *>  Modified by Francoise Tisseur, University of Tennessee
 *>
 *  =====================================================================
-      SUBROUTINE SLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
+      SUBROUTINE SLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMBDA,
+     $                   W,
      $                   Q2, INDX, INDXC, INDXP, COLTYP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -221,7 +221,7 @@ SUBROUTINE SLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
 *     .. Array Arguments ..
       INTEGER            COLTYP( * ), INDX( * ), INDXC( * ), INDXP( * ),
      $                   INDXQ( * )
-      REAL               D( * ), DLAMDA( * ), Q( LDQ, * ), Q2( * ),
+      REAL               D( * ), DLAMBDA( * ), Q( LDQ, * ), Q2( * ),
      $                   W( * ), Z( * )
 *     ..
 *
@@ -246,7 +246,8 @@ SUBROUTINE SLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
       EXTERNAL           ISAMAX, SLAMCH, SLAPY2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLACPY, SLAMRG, SROT, SSCAL, XERBLA
+      EXTERNAL           SCOPY, SLACPY, SLAMRG, SROT, SSCAL,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, SQRT
@@ -300,9 +301,9 @@ SUBROUTINE SLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
 *     re-integrate the deflated parts from the last pass
 *
       DO 20 I = 1, N
-         DLAMDA( I ) = D( INDXQ( I ) )
+         DLAMBDA( I ) = D( INDXQ( I ) )
    20 CONTINUE
-      CALL SLAMRG( N1, N2, DLAMDA, 1, 1, INDXC )
+      CALL SLAMRG( N1, N2, DLAMBDA, 1, 1, INDXC )
       DO 30 I = 1, N
          INDX( I ) = INDXQ( INDXC( I ) )
    30 CONTINUE
@@ -324,11 +325,11 @@ SUBROUTINE SLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
          DO 40 J = 1, N
             I = INDX( J )
             CALL SCOPY( N, Q( 1, I ), 1, Q2( IQ2 ), 1 )
-            DLAMDA( J ) = D( I )
+            DLAMBDA( J ) = D( I )
             IQ2 = IQ2 + N
    40    CONTINUE
          CALL SLACPY( 'A', N, N, Q2, N, Q, LDQ )
-         CALL SCOPY( N, DLAMDA, 1, D, 1 )
+         CALL SCOPY( N, DLAMBDA, 1, D, 1 )
          GO TO 190
       END IF
 *
@@ -421,7 +422,7 @@ SUBROUTINE SLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
             PJ = NJ
          ELSE
             K = K + 1
-            DLAMDA( K ) = D( PJ )
+            DLAMBDA( K ) = D( PJ )
             W( K ) = Z( PJ )
             INDXP( K ) = PJ
             PJ = NJ
@@ -433,7 +434,7 @@ SUBROUTINE SLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
 *     Record the last eigenvalue.
 *
       K = K + 1
-      DLAMDA( K ) = D( PJ )
+      DLAMBDA( K ) = D( PJ )
       W( K ) = Z( PJ )
       INDXP( K ) = PJ
 *
@@ -470,9 +471,9 @@ SUBROUTINE SLAED2( K, N, N1, D, Q, LDQ, INDXQ, RHO, Z, DLAMDA, W,
          PSM( CT ) = PSM( CT ) + 1
   130 CONTINUE
 *
-*     Sort the eigenvalues and corresponding eigenvectors into DLAMDA
+*     Sort the eigenvalues and corresponding eigenvectors into DLAMBDA
 *     and Q2 respectively.  The eigenvalues/vectors which were not
-*     deflated go into the first K slots of DLAMDA and Q2 respectively,
+*     deflated go into the first K slots of DLAMBDA and Q2 respectively,
 *     while those which were deflated go into the last N - K slots.
 *
       I = 1
diff --git a/SRC/slaed3.f b/SRC/slaed3.f
index e84f22be1f..1a50aba717 100644
--- a/SRC/slaed3.f
+++ b/SRC/slaed3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAED3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaed3.f">
 *> [TGZ]</a>
@@ -13,12 +12,11 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaed3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE SLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMDA, Q2, INDX,
+*       SUBROUTINE SLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMBDA, Q2, INDX,
 *                          CTOT, W, S, INFO )
 *
 *       .. Scalar Arguments ..
@@ -27,7 +25,7 @@
 *       ..
 *       .. Array Arguments ..
 *       INTEGER            CTOT( * ), INDX( * )
-*       REAL               D( * ), DLAMDA( * ), Q( LDQ, * ), Q2( * ),
+*       REAL               D( * ), DLAMBDA( * ), Q( LDQ, * ), Q2( * ),
 *      $                   S( * ), W( * )
 *       ..
 *
@@ -44,12 +42,6 @@
 *> being combined by the matrix of eigenvectors of the K-by-K system
 *> which is solved here.
 *>
-*> This code makes very mild assumptions about floating point
-*> arithmetic. It will work on machines with a guard digit in
-*> add/subtract, or on those binary machines without guard digits
-*> which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or Cray-2.
-*> It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -104,14 +96,12 @@
 *>          RHO >= 0 required.
 *> \endverbatim
 *>
-*> \param[in,out] DLAMDA
+*> \param[in] DLAMBDA
 *> \verbatim
-*>          DLAMDA is REAL array, dimension (K)
+*>          DLAMBDA is REAL array, dimension (K)
 *>          The first K elements of this array contain the old roots
 *>          of the deflated updating problem.  These are the poles
-*>          of the secular equation. May be changed on output by
-*>          having lowest order bit set to zero on Cray X-MP, Cray Y-MP,
-*>          Cray-2, or Cray C-90, as described above.
+*>          of the secular equation.
 *> \endverbatim
 *>
 *> \param[in] Q2
@@ -170,7 +160,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed3
 *
 *> \par Contributors:
 *  ==================
@@ -180,8 +170,9 @@
 *>  Modified by Francoise Tisseur, University of Tennessee
 *>
 *  =====================================================================
-      SUBROUTINE SLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMDA, Q2, INDX,
+      SUBROUTINE SLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMBDA, Q2, INDX,
      $                   CTOT, W, S, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -193,7 +184,7 @@ SUBROUTINE SLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMDA, Q2, INDX,
 *     ..
 *     .. Array Arguments ..
       INTEGER            CTOT( * ), INDX( * )
-      REAL               D( * ), DLAMDA( * ), Q( LDQ, * ), Q2( * ),
+      REAL               D( * ), DLAMBDA( * ), Q( LDQ, * ), Q2( * ),
      $                   S( * ), W( * )
 *     ..
 *
@@ -208,11 +199,12 @@ SUBROUTINE SLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMDA, Q2, INDX,
       REAL               TEMP
 *     ..
 *     .. External Functions ..
-      REAL               SLAMC3, SNRM2
-      EXTERNAL           SLAMC3, SNRM2
+      REAL               SNRM2
+      EXTERNAL           SNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEMM, SLACPY, SLAED4, SLASET, XERBLA
+      EXTERNAL           SCOPY, SGEMM, SLACPY, SLAED4, SLASET,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SIGN, SQRT
@@ -239,30 +231,10 @@ SUBROUTINE SLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMDA, Q2, INDX,
 *
       IF( K.EQ.0 )
      $   RETURN
-*
-*     Modify values DLAMDA(i) to make sure all DLAMDA(i)-DLAMDA(j) can
-*     be computed with high relative accuracy (barring over/underflow).
-*     This is a problem on machines without a guard digit in
-*     add/subtract (Cray XMP, Cray YMP, Cray C 90 and Cray 2).
-*     The following code replaces DLAMDA(I) by 2*DLAMDA(I)-DLAMDA(I),
-*     which on any of these machines zeros out the bottommost
-*     bit of DLAMDA(I) if it is 1; this makes the subsequent
-*     subtractions DLAMDA(I)-DLAMDA(J) unproblematic when cancellation
-*     occurs. On binary machines with a guard digit (almost all
-*     machines) it does not change DLAMDA(I) at all. On hexadecimal
-*     and decimal machines with a guard digit, it slightly
-*     changes the bottommost bits of DLAMDA(I). It does not account
-*     for hexadecimal or decimal machines without guard digits
-*     (we know of none). We use a subroutine call to compute
-*     2*DLAMBDA(I) to prevent optimizing compilers from eliminating
-*     this code.
-*
-      DO 10 I = 1, K
-         DLAMDA( I ) = SLAMC3( DLAMDA( I ), DLAMDA( I ) ) - DLAMDA( I )
-   10 CONTINUE
 *
       DO 20 J = 1, K
-         CALL SLAED4( K, J, DLAMDA, W, Q( 1, J ), RHO, D( J ), INFO )
+         CALL SLAED4( K, J, DLAMBDA, W, Q( 1, J ), RHO, D( J ),
+     $                INFO )
 *
 *        If the zero finder fails, the computation is terminated.
 *
@@ -293,10 +265,10 @@ SUBROUTINE SLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMDA, Q2, INDX,
       CALL SCOPY( K, Q, LDQ+1, W, 1 )
       DO 60 J = 1, K
          DO 40 I = 1, J - 1
-            W( I ) = W( I )*( Q( I, J ) / ( DLAMDA( I )-DLAMDA( J ) ) )
+            W( I ) = W( I )*( Q( I, J )/( DLAMBDA( I )-DLAMBDA( J ) ) )
    40    CONTINUE
          DO 50 I = J + 1, K
-            W( I ) = W( I )*( Q( I, J ) / ( DLAMDA( I )-DLAMDA( J ) ) )
+            W( I ) = W( I )*( Q( I, J )/( DLAMBDA( I )-DLAMBDA( J ) ) )
    50    CONTINUE
    60 CONTINUE
       DO 70 I = 1, K
@@ -327,7 +299,8 @@ SUBROUTINE SLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMDA, Q2, INDX,
       CALL SLACPY( 'A', N23, K, Q( CTOT( 1 )+1, 1 ), LDQ, S, N23 )
       IQ2 = N1*N12 + 1
       IF( N23.NE.0 ) THEN
-         CALL SGEMM( 'N', 'N', N2, K, N23, ONE, Q2( IQ2 ), N2, S, N23,
+         CALL SGEMM( 'N', 'N', N2, K, N23, ONE, Q2( IQ2 ), N2, S,
+     $               N23,
      $               ZERO, Q( N1+1, 1 ), LDQ )
       ELSE
          CALL SLASET( 'A', N2, K, ZERO, ZERO, Q( N1+1, 1 ), LDQ )
@@ -335,7 +308,8 @@ SUBROUTINE SLAED3( K, N, N1, D, Q, LDQ, RHO, DLAMDA, Q2, INDX,
 *
       CALL SLACPY( 'A', N12, K, Q, LDQ, S, N12 )
       IF( N12.NE.0 ) THEN
-         CALL SGEMM( 'N', 'N', N1, K, N12, ONE, Q2, N1, S, N12, ZERO, Q,
+         CALL SGEMM( 'N', 'N', N1, K, N12, ONE, Q2, N1, S, N12, ZERO,
+     $               Q,
      $               LDQ )
       ELSE
          CALL SLASET( 'A', N1, K, ZERO, ZERO, Q( 1, 1 ), LDQ )
diff --git a/SRC/slaed4.f b/SRC/slaed4.f
index f056746d80..3f431d2186 100644
--- a/SRC/slaed4.f
+++ b/SRC/slaed4.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAED4 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaed4.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaed4.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed4
 *
 *> \par Contributors:
 *  ==================
@@ -142,6 +140,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLAED4( N, I, D, Z, DELTA, RHO, DLAM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -328,9 +327,12 @@ SUBROUTINE SLAED4( N, I, D, Z, DELTA, RHO, DLAM, INFO )
          IF( C.LT.ZERO )
      $      C = ABS( C )
          IF( C.EQ.ZERO ) THEN
-*          ETA = B/A
+*           ETA = B/A
 *           ETA = RHO - TAU
-            ETA = DLTUB - TAU
+*           ETA = DLTUB - TAU
+*
+*           Update proposed by Li, Ren-Cang:
+            ETA = -W / ( DPSI+DPHI )
          ELSE IF( A.GE.ZERO ) THEN
             ETA = ( A+SQRT( ABS( A*A-FOUR*B*C ) ) ) / ( TWO*C )
          ELSE
@@ -829,7 +831,8 @@ SUBROUTINE SLAED4( N, I, D, Z, DELTA, RHO, DLAM, INFO )
                      ZZ( 3 ) = Z( IIP1 )*Z( IIP1 )
                   END IF
                END IF
-               CALL SLAED6( NITER, ORGATI, C, DELTA( IIM1 ), ZZ, W, ETA,
+               CALL SLAED6( NITER, ORGATI, C, DELTA( IIM1 ), ZZ, W,
+     $                      ETA,
      $                      INFO )
                IF( INFO.NE.0 )
      $            GO TO 250
diff --git a/SRC/slaed5.f b/SRC/slaed5.f
index ddf9fb72e7..9bde8c892a 100644
--- a/SRC/slaed5.f
+++ b/SRC/slaed5.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAED5 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaed5.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaed5.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,7 +93,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed5
 *
 *> \par Contributors:
 *  ==================
@@ -105,6 +103,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLAED5( I, D, Z, DELTA, RHO, DLAM )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slaed6.f b/SRC/slaed6.f
index ec715518eb..8c9445da42 100644
--- a/SRC/slaed6.f
+++ b/SRC/slaed6.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAED6 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaed6.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaed6.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,7 +113,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed6
 *
 *> \par Further Details:
 *  =====================
@@ -136,7 +134,9 @@
 *>     at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE SLAED6( KNITER, ORGATI, RHO, D, Z, FINIT, TAU, INFO )
+      SUBROUTINE SLAED6( KNITER, ORGATI, RHO, D, Z, FINIT, TAU,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slaed7.f b/SRC/slaed7.f
index 3572342c0e..d9c4e5ee49 100644
--- a/SRC/slaed7.f
+++ b/SRC/slaed7.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAED7 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaed7.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaed7.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -244,7 +242,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed7
 *
 *> \par Contributors:
 *  ==================
@@ -253,10 +251,12 @@
 *> at Berkeley, USA
 *
 *  =====================================================================
-      SUBROUTINE SLAED7( ICOMPQ, N, QSIZ, TLVLS, CURLVL, CURPBM, D, Q,
+      SUBROUTINE SLAED7( ICOMPQ, N, QSIZ, TLVLS, CURLVL, CURPBM, D,
+     $                   Q,
      $                   LDQ, INDXQ, RHO, CUTPNT, QSTORE, QPTR, PRMPTR,
      $                   PERM, GIVPTR, GIVCOL, GIVNUM, WORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -285,7 +285,8 @@ SUBROUTINE SLAED7( ICOMPQ, N, QSIZ, TLVLS, CURLVL, CURPBM, D, Q,
      $                   IQ2, IS, IW, IZ, K, LDQ2, N1, N2, PTR
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMM, SLAED8, SLAED9, SLAEDA, SLAMRG, XERBLA
+      EXTERNAL           SGEMM, SLAED8, SLAED9, SLAEDA, SLAMRG,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -374,7 +375,8 @@ SUBROUTINE SLAED7( ICOMPQ, N, QSIZ, TLVLS, CURLVL, CURPBM, D, Q,
 *     Solve Secular Equation.
 *
       IF( K.NE.0 ) THEN
-         CALL SLAED9( K, 1, K, N, D, WORK( IS ), K, RHO, WORK( IDLMDA ),
+         CALL SLAED9( K, 1, K, N, D, WORK( IS ), K, RHO,
+     $                WORK( IDLMDA ),
      $                WORK( IW ), QSTORE( QPTR( CURR ) ), K, INFO )
          IF( INFO.NE.0 )
      $      GO TO 30
diff --git a/SRC/slaed8.f b/SRC/slaed8.f
index 9c8ba440c6..7af6705312 100644
--- a/SRC/slaed8.f
+++ b/SRC/slaed8.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAED8 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaed8.f">
 *> [TGZ]</a>
@@ -13,13 +12,12 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaed8.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
 *       SUBROUTINE SLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
-*                          CUTPNT, Z, DLAMDA, Q2, LDQ2, W, PERM, GIVPTR,
+*                          CUTPNT, Z, DLAMBDA, Q2, LDQ2, W, PERM, GIVPTR,
 *                          GIVCOL, GIVNUM, INDXP, INDX, INFO )
 *
 *       .. Scalar Arguments ..
@@ -30,7 +28,7 @@
 *       .. Array Arguments ..
 *       INTEGER            GIVCOL( 2, * ), INDX( * ), INDXP( * ),
 *      $                   INDXQ( * ), PERM( * )
-*       REAL               D( * ), DLAMDA( * ), GIVNUM( 2, * ),
+*       REAL               D( * ), DLAMBDA( * ), GIVNUM( 2, * ),
 *      $                   Q( LDQ, * ), Q2( LDQ2, * ), W( * ), Z( * )
 *       ..
 *
@@ -141,9 +139,9 @@
 *>         process.
 *> \endverbatim
 *>
-*> \param[out] DLAMDA
+*> \param[out] DLAMBDA
 *> \verbatim
-*>          DLAMDA is REAL array, dimension (N)
+*>          DLAMBDA is REAL array, dimension (N)
 *>         A copy of the first K eigenvalues which will be used by
 *>         SLAED3 to form the secular equation.
 *> \endverbatim
@@ -228,7 +226,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed8
 *
 *> \par Contributors:
 *  ==================
@@ -238,8 +236,9 @@
 *
 *  =====================================================================
       SUBROUTINE SLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
-     $                   CUTPNT, Z, DLAMDA, Q2, LDQ2, W, PERM, GIVPTR,
+     $                   CUTPNT, Z, DLAMBDA, Q2, LDQ2, W, PERM, GIVPTR,
      $                   GIVCOL, GIVNUM, INDXP, INDX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -253,7 +252,7 @@ SUBROUTINE SLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
 *     .. Array Arguments ..
       INTEGER            GIVCOL( 2, * ), INDX( * ), INDXP( * ),
      $                   INDXQ( * ), PERM( * )
-      REAL               D( * ), DLAMDA( * ), GIVNUM( 2, * ),
+      REAL               D( * ), DLAMBDA( * ), GIVNUM( 2, * ),
      $                   Q( LDQ, * ), Q2( LDQ2, * ), W( * ), Z( * )
 *     ..
 *
@@ -275,7 +274,8 @@ SUBROUTINE SLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
       EXTERNAL           ISAMAX, SLAMCH, SLAPY2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLACPY, SLAMRG, SROT, SSCAL, XERBLA
+      EXTERNAL           SCOPY, SLACPY, SLAMRG, SROT, SSCAL,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, SQRT
@@ -339,14 +339,14 @@ SUBROUTINE SLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
          INDXQ( I ) = INDXQ( I ) + CUTPNT
    20 CONTINUE
       DO 30 I = 1, N
-         DLAMDA( I ) = D( INDXQ( I ) )
+         DLAMBDA( I ) = D( INDXQ( I ) )
          W( I ) = Z( INDXQ( I ) )
    30 CONTINUE
       I = 1
       J = CUTPNT + 1
-      CALL SLAMRG( N1, N2, DLAMDA, 1, 1, INDX )
+      CALL SLAMRG( N1, N2, DLAMBDA, 1, 1, INDX )
       DO 40 I = 1, N
-         D( I ) = DLAMDA( INDX( I ) )
+         D( I ) = DLAMBDA( INDX( I ) )
          Z( I ) = W( INDX( I ) )
    40 CONTINUE
 *
@@ -370,7 +370,8 @@ SUBROUTINE SLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
          ELSE
             DO 60 J = 1, N
                PERM( J ) = INDXQ( INDX( J ) )
-               CALL SCOPY( QSIZ, Q( 1, PERM( J ) ), 1, Q2( 1, J ), 1 )
+               CALL SCOPY( QSIZ, Q( 1, PERM( J ) ), 1, Q2( 1, J ),
+     $                     1 )
    60       CONTINUE
             CALL SLACPY( 'A', QSIZ, N, Q2( 1, 1 ), LDQ2, Q( 1, 1 ),
      $                   LDQ )
@@ -464,7 +465,7 @@ SUBROUTINE SLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
          ELSE
             K = K + 1
             W( K ) = Z( JLAM )
-            DLAMDA( K ) = D( JLAM )
+            DLAMBDA( K ) = D( JLAM )
             INDXP( K ) = JLAM
             JLAM = J
          END IF
@@ -476,26 +477,26 @@ SUBROUTINE SLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
 *
       K = K + 1
       W( K ) = Z( JLAM )
-      DLAMDA( K ) = D( JLAM )
+      DLAMBDA( K ) = D( JLAM )
       INDXP( K ) = JLAM
 *
   110 CONTINUE
 *
-*     Sort the eigenvalues and corresponding eigenvectors into DLAMDA
+*     Sort the eigenvalues and corresponding eigenvectors into DLAMBDA
 *     and Q2 respectively.  The eigenvalues/vectors which were not
-*     deflated go into the first K slots of DLAMDA and Q2 respectively,
+*     deflated go into the first K slots of DLAMBDA and Q2 respectively,
 *     while those which were deflated go into the last N - K slots.
 *
       IF( ICOMPQ.EQ.0 ) THEN
          DO 120 J = 1, N
             JP = INDXP( J )
-            DLAMDA( J ) = D( JP )
+            DLAMBDA( J ) = D( JP )
             PERM( J ) = INDXQ( INDX( JP ) )
   120    CONTINUE
       ELSE
          DO 130 J = 1, N
             JP = INDXP( J )
-            DLAMDA( J ) = D( JP )
+            DLAMBDA( J ) = D( JP )
             PERM( J ) = INDXQ( INDX( JP ) )
             CALL SCOPY( QSIZ, Q( 1, PERM( J ) ), 1, Q2( 1, J ), 1 )
   130    CONTINUE
@@ -506,9 +507,9 @@ SUBROUTINE SLAED8( ICOMPQ, K, N, QSIZ, D, Q, LDQ, INDXQ, RHO,
 *
       IF( K.LT.N ) THEN
          IF( ICOMPQ.EQ.0 ) THEN
-            CALL SCOPY( N-K, DLAMDA( K+1 ), 1, D( K+1 ), 1 )
+            CALL SCOPY( N-K, DLAMBDA( K+1 ), 1, D( K+1 ), 1 )
          ELSE
-            CALL SCOPY( N-K, DLAMDA( K+1 ), 1, D( K+1 ), 1 )
+            CALL SCOPY( N-K, DLAMBDA( K+1 ), 1, D( K+1 ), 1 )
             CALL SLACPY( 'A', QSIZ, N-K, Q2( 1, K+1 ), LDQ2,
      $                   Q( 1, K+1 ), LDQ )
          END IF
diff --git a/SRC/slaed9.f b/SRC/slaed9.f
index 4d07416e9f..8b60ca6b06 100644
--- a/SRC/slaed9.f
+++ b/SRC/slaed9.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAED9 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaed9.f">
 *> [TGZ]</a>
@@ -13,20 +12,19 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaed9.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE SLAED9( K, KSTART, KSTOP, N, D, Q, LDQ, RHO, DLAMDA, W,
-*                          S, LDS, INFO )
+*       SUBROUTINE SLAED9( K, KSTART, KSTOP, N, D, Q, LDQ, RHO, DLAMBDA,
+*                          W, S, LDS, INFO )
 *
 *       .. Scalar Arguments ..
 *       INTEGER            INFO, K, KSTART, KSTOP, LDQ, LDS, N
 *       REAL               RHO
 *       ..
 *       .. Array Arguments ..
-*       REAL               D( * ), DLAMDA( * ), Q( LDQ, * ), S( LDS, * ),
+*       REAL               D( * ), DLAMBDA( * ), Q( LDQ, * ), S( LDS, * ),
 *      $                   W( * )
 *       ..
 *
@@ -96,9 +94,9 @@
 *>          RHO >= 0 required.
 *> \endverbatim
 *>
-*> \param[in] DLAMDA
+*> \param[in] DLAMBDA
 *> \verbatim
-*>          DLAMDA is REAL array, dimension (K)
+*>          DLAMBDA is REAL array, dimension (K)
 *>          The first K elements of this array contain the old roots
 *>          of the deflated updating problem.  These are the poles
 *>          of the secular equation.
@@ -142,7 +140,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laed9
 *
 *> \par Contributors:
 *  ==================
@@ -151,8 +149,10 @@
 *> at Berkeley, USA
 *
 *  =====================================================================
-      SUBROUTINE SLAED9( K, KSTART, KSTOP, N, D, Q, LDQ, RHO, DLAMDA, W,
-     $                   S, LDS, INFO )
+      SUBROUTINE SLAED9( K, KSTART, KSTOP, N, D, Q, LDQ, RHO,
+     $                   DLAMBDA,
+     $                   W, S, LDS, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -163,7 +163,7 @@ SUBROUTINE SLAED9( K, KSTART, KSTOP, N, D, Q, LDQ, RHO, DLAMDA, W,
       REAL               RHO
 *     ..
 *     .. Array Arguments ..
-      REAL               D( * ), DLAMDA( * ), Q( LDQ, * ), S( LDS, * ),
+      REAL               D( * ), DLAMBDA( * ), Q( LDQ, * ), S( LDS, * ),
      $                   W( * )
 *     ..
 *
@@ -174,8 +174,8 @@ SUBROUTINE SLAED9( K, KSTART, KSTOP, N, D, Q, LDQ, RHO, DLAMDA, W,
       REAL               TEMP
 *     ..
 *     .. External Functions ..
-      REAL               SLAMC3, SNRM2
-      EXTERNAL           SLAMC3, SNRM2
+      REAL               SNRM2
+      EXTERNAL           SNRM2
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SCOPY, SLAED4, XERBLA
@@ -212,30 +212,10 @@ SUBROUTINE SLAED9( K, KSTART, KSTOP, N, D, Q, LDQ, RHO, DLAMDA, W,
 *
       IF( K.EQ.0 )
      $   RETURN
-*
-*     Modify values DLAMDA(i) to make sure all DLAMDA(i)-DLAMDA(j) can
-*     be computed with high relative accuracy (barring over/underflow).
-*     This is a problem on machines without a guard digit in
-*     add/subtract (Cray XMP, Cray YMP, Cray C 90 and Cray 2).
-*     The following code replaces DLAMDA(I) by 2*DLAMDA(I)-DLAMDA(I),
-*     which on any of these machines zeros out the bottommost
-*     bit of DLAMDA(I) if it is 1; this makes the subsequent
-*     subtractions DLAMDA(I)-DLAMDA(J) unproblematic when cancellation
-*     occurs. On binary machines with a guard digit (almost all
-*     machines) it does not change DLAMDA(I) at all. On hexadecimal
-*     and decimal machines with a guard digit, it slightly
-*     changes the bottommost bits of DLAMDA(I). It does not account
-*     for hexadecimal or decimal machines without guard digits
-*     (we know of none). We use a subroutine call to compute
-*     2*DLAMBDA(I) to prevent optimizing compilers from eliminating
-*     this code.
-*
-      DO 10 I = 1, N
-         DLAMDA( I ) = SLAMC3( DLAMDA( I ), DLAMDA( I ) ) - DLAMDA( I )
-   10 CONTINUE
 *
       DO 20 J = KSTART, KSTOP
-         CALL SLAED4( K, J, DLAMDA, W, Q( 1, J ), RHO, D( J ), INFO )
+         CALL SLAED4( K, J, DLAMBDA, W, Q( 1, J ), RHO, D( J ),
+     $                INFO )
 *
 *        If the zero finder fails, the computation is terminated.
 *
@@ -261,10 +241,10 @@ SUBROUTINE SLAED9( K, KSTART, KSTOP, N, D, Q, LDQ, RHO, DLAMDA, W,
       CALL SCOPY( K, Q, LDQ+1, W, 1 )
       DO 70 J = 1, K
          DO 50 I = 1, J - 1
-            W( I ) = W( I )*( Q( I, J ) / ( DLAMDA( I )-DLAMDA( J ) ) )
+            W( I ) = W( I )*( Q( I, J )/( DLAMBDA( I )-DLAMBDA( J ) ) )
    50    CONTINUE
          DO 60 I = J + 1, K
-            W( I ) = W( I )*( Q( I, J ) / ( DLAMDA( I )-DLAMDA( J ) ) )
+            W( I ) = W( I )*( Q( I, J )/( DLAMBDA( I )-DLAMBDA( J ) ) )
    60    CONTINUE
    70 CONTINUE
       DO 80 I = 1, K
diff --git a/SRC/slaeda.f b/SRC/slaeda.f
index f7ed96a12b..9f730f12c7 100644
--- a/SRC/slaeda.f
+++ b/SRC/slaeda.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAEDA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaeda.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaeda.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -152,7 +150,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup laeda
 *
 *> \par Contributors:
 *  ==================
@@ -161,8 +159,10 @@
 *> at Berkeley, USA
 *
 *  =====================================================================
-      SUBROUTINE SLAEDA( N, TLVLS, CURLVL, CURPBM, PRMPTR, PERM, GIVPTR,
+      SUBROUTINE SLAEDA( N, TLVLS, CURLVL, CURPBM, PRMPTR, PERM,
+     $                   GIVPTR,
      $                   GIVCOL, GIVNUM, Q, QPTR, Z, ZTEMP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -286,7 +286,8 @@ SUBROUTINE SLAEDA( N, TLVLS, CURLVL, CURPBM, PRMPTR, PERM, GIVPTR,
             CALL SGEMV( 'T', BSIZ1, BSIZ1, ONE, Q( QPTR( CURR ) ),
      $                  BSIZ1, ZTEMP( 1 ), 1, ZERO, Z( ZPTR1 ), 1 )
          END IF
-         CALL SCOPY( PSIZ1-BSIZ1, ZTEMP( BSIZ1+1 ), 1, Z( ZPTR1+BSIZ1 ),
+         CALL SCOPY( PSIZ1-BSIZ1, ZTEMP( BSIZ1+1 ), 1,
+     $               Z( ZPTR1+BSIZ1 ),
      $               1 )
          IF( BSIZ2.GT.0 ) THEN
             CALL SGEMV( 'T', BSIZ2, BSIZ2, ONE, Q( QPTR( CURR+1 ) ),
diff --git a/SRC/slaein.f b/SRC/slaein.f
index caee5aa1b3..e6e2065f58 100644
--- a/SRC/slaein.f
+++ b/SRC/slaein.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAEIN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaein.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaein.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -164,11 +162,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup laein
 *
 *  =====================================================================
-      SUBROUTINE SLAEIN( RIGHTV, NOINIT, N, H, LDH, WR, WI, VR, VI, B,
+      SUBROUTINE SLAEIN( RIGHTV, NOINIT, N, H, LDH, WR, WI, VR, VI,
+     $                   B,
      $                   LDB, WORK, EPS3, SMLNUM, BIGNUM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -332,7 +332,8 @@ SUBROUTINE SLAEIN( RIGHTV, NOINIT, N, H, LDH, WR, WI, VR, VI, B,
 *             or U**T*x = scale*v for a left eigenvector,
 *           overwriting x on v.
 *
-            CALL SLATRS( 'Upper', TRANS, 'Nonunit', NORMIN, N, B, LDB,
+            CALL SLATRS( 'Upper', TRANS, 'Nonunit', NORMIN, N, B,
+     $                   LDB,
      $                   VR, SCALE, WORK, IERR )
             NORMIN = 'Y'
 *
@@ -378,7 +379,8 @@ SUBROUTINE SLAEIN( RIGHTV, NOINIT, N, H, LDH, WR, WI, VR, VI, B,
 *
 *           Scale supplied initial vector.
 *
-            NORM = SLAPY2( SNRM2( N, VR, 1 ), SNRM2( N, VI, 1 ) )
+            NORM = SLAPY2( SNRM2( N, VR, 1 ),
+     $                     SNRM2( N, VI, 1 ) )
             REC = ( EPS3*ROOTN ) / MAX( NORM, NRMSML )
             CALL SSCAL( N, REC, VR, 1 )
             CALL SSCAL( N, REC, VI, 1 )
@@ -569,7 +571,8 @@ SUBROUTINE SLAEIN( RIGHTV, NOINIT, N, H, LDH, WR, WI, VR, VI, B,
 *
 *                 Divide by diagonal element of B.
 *
-                  CALL SLADIV( XR, XI, B( I, I ), B( I+1, I ), VR( I ),
+                  CALL SLADIV( XR, XI, B( I, I ), B( I+1, I ),
+     $                         VR( I ),
      $                         VI( I ) )
                   VMAX = MAX( ABS( VR( I ) )+ABS( VI( I ) ), VMAX )
                   VCRIT = BIGNUM / VMAX
diff --git a/SRC/slaev2.f b/SRC/slaev2.f
index 442779a44e..ed40301981 100644
--- a/SRC/slaev2.f
+++ b/SRC/slaev2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAEV2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaev2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaev2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -94,7 +92,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup laev2
 *
 *> \par Further Details:
 *  =====================
@@ -117,6 +115,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLAEV2( A, B, C, RT1, RT2, CS1, SN1 )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slaexc.f b/SRC/slaexc.f
index 49b0329601..a234300ead 100644
--- a/SRC/slaexc.f
+++ b/SRC/slaexc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAEXC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaexc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaexc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,11 +128,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup laexc
 *
 *  =====================================================================
       SUBROUTINE SLAEXC( WANTQ, N, T, LDT, Q, LDQ, J1, N1, N2, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -173,7 +172,8 @@ SUBROUTINE SLAEXC( WANTQ, N, T, LDT, Q, LDQ, J1, N1, N2, WORK,
       EXTERNAL           SLAMCH, SLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLACPY, SLANV2, SLARFG, SLARFX, SLARTG, SLASY2,
+      EXTERNAL           SLACPY, SLANV2, SLARFG, SLARFX, SLARTG,
+     $                   SLASY2,
      $                   SROT
 *     ..
 *     .. Intrinsic Functions ..
@@ -208,7 +208,8 @@ SUBROUTINE SLAEXC( WANTQ, N, T, LDT, Q, LDQ, J1, N1, N2, WORK,
 *        Apply transformation to the matrix T.
 *
          IF( J3.LE.N )
-     $      CALL SROT( N-J1-1, T( J1, J3 ), LDT, T( J2, J3 ), LDT, CS,
+     $      CALL SROT( N-J1-1, T( J1, J3 ), LDT, T( J2, J3 ), LDT,
+     $                 CS,
      $                 SN )
          CALL SROT( J1-1, T( 1, J1 ), 1, T( 1, J2 ), 1, CS, SN )
 *
@@ -276,7 +277,8 @@ SUBROUTINE SLAEXC( WANTQ, N, T, LDT, Q, LDQ, J1, N1, N2, WORK,
 *
 *        Accept swap: apply transformation to the entire matrix T.
 *
-         CALL SLARFX( 'L', 3, N-J1+1, U, TAU, T( J1, J1 ), LDT, WORK )
+         CALL SLARFX( 'L', 3, N-J1+1, U, TAU, T( J1, J1 ), LDT,
+     $                WORK )
          CALL SLARFX( 'R', J2, 3, U, TAU, T( 1, J1 ), LDT, WORK )
 *
          T( J3, J1 ) = ZERO
@@ -370,9 +372,11 @@ SUBROUTINE SLAEXC( WANTQ, N, T, LDT, Q, LDQ, J1, N1, N2, WORK,
 *
 *        Accept swap: apply transformation to the entire matrix T.
 *
-         CALL SLARFX( 'L', 3, N-J1+1, U1, TAU1, T( J1, J1 ), LDT, WORK )
+         CALL SLARFX( 'L', 3, N-J1+1, U1, TAU1, T( J1, J1 ), LDT,
+     $                WORK )
          CALL SLARFX( 'R', J4, 3, U1, TAU1, T( 1, J1 ), LDT, WORK )
-         CALL SLARFX( 'L', 3, N-J1+1, U2, TAU2, T( J2, J1 ), LDT, WORK )
+         CALL SLARFX( 'L', 3, N-J1+1, U2, TAU2, T( J2, J1 ), LDT,
+     $                WORK )
          CALL SLARFX( 'R', J4, 3, U2, TAU2, T( 1, J2 ), LDT, WORK )
 *
          T( J3, J1 ) = ZERO
@@ -396,7 +400,8 @@ SUBROUTINE SLAEXC( WANTQ, N, T, LDT, Q, LDQ, J1, N1, N2, WORK,
 *
             CALL SLANV2( T( J1, J1 ), T( J1, J2 ), T( J2, J1 ),
      $                   T( J2, J2 ), WR1, WI1, WR2, WI2, CS, SN )
-            CALL SROT( N-J1-1, T( J1, J1+2 ), LDT, T( J2, J1+2 ), LDT,
+            CALL SROT( N-J1-1, T( J1, J1+2 ), LDT, T( J2, J1+2 ),
+     $                 LDT,
      $                 CS, SN )
             CALL SROT( J1-1, T( 1, J1 ), 1, T( 1, J2 ), 1, CS, SN )
             IF( WANTQ )
diff --git a/SRC/slag2.f b/SRC/slag2.f
index eddf669133..fd56910d40 100644
--- a/SRC/slag2.f
+++ b/SRC/slag2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAG2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slag2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slag2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -148,11 +146,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lag2
 *
 *  =====================================================================
       SUBROUTINE SLAG2( A, LDA, B, LDB, SAFMIN, SCALE1, SCALE2, WR1,
      $                  WR2, WI )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slag2d.f b/SRC/slag2d.f
index dbd8ee1abf..6f92f33c9a 100644
--- a/SRC/slag2d.f
+++ b/SRC/slag2d.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAG2D + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slag2d.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slag2d.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup _lag2_
 *
 *  =====================================================================
       SUBROUTINE SLAG2D( M, N, SA, LDSA, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slags2.f b/SRC/slags2.f
index 67e33f6370..59e1a6f79c 100644
--- a/SRC/slags2.f
+++ b/SRC/slags2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAGS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slags2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slags2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,11 +142,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lags2
 *
 *  =====================================================================
-      SUBROUTINE SLAGS2( UPPER, A1, A2, A3, B1, B2, B3, CSU, SNU, CSV,
+      SUBROUTINE SLAGS2( UPPER, A1, A2, A3, B1, B2, B3, CSU, SNU,
+     $                   CSV,
      $                   SNV, CSQ, SNQ )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slagtf.f b/SRC/slagtf.f
index ecc02eeb34..6fe62c4315 100644
--- a/SRC/slagtf.f
+++ b/SRC/slagtf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAGTF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slagtf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slagtf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -149,10 +147,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lagtf
 *
 *  =====================================================================
       SUBROUTINE SLAGTF( N, A, LAMBDA, B, C, TOL, D, IN, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slagtm.f b/SRC/slagtm.f
index 2beae90787..1302962810 100644
--- a/SRC/slagtm.f
+++ b/SRC/slagtm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAGTM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slagtm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slagtm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,7 @@
 *>
 *> \verbatim
 *>
-*> SLAGTM performs a matrix-vector product of the form
+*> SLAGTM performs a matrix-matrix product of the form
 *>
 *>    B := alpha * A * X + beta * B
 *>
@@ -137,11 +135,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lagtm
 *
 *  =====================================================================
-      SUBROUTINE SLAGTM( TRANS, N, NRHS, ALPHA, DL, D, DU, X, LDX, BETA,
+      SUBROUTINE SLAGTM( TRANS, N, NRHS, ALPHA, DL, D, DU, X, LDX,
+     $                   BETA,
      $                   B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slagts.f b/SRC/slagts.f
index 255f5aa488..33301a098a 100644
--- a/SRC/slagts.f
+++ b/SRC/slagts.f
@@ -1,11 +1,12 @@
-*> \brief \b SLAGTS solves the system of equations (T-λI)x = y or (T-λI)Tx = y,where T is a general tridiagonal matrix and λ a scalar, using the LU factorization computed by slagtf.
+*> \brief \b SLAGTS solves the system of equations (T-λI)x = y
+*> or (T-λI)^Tx = y, where T is a general tridiagonal matrix
+*> and λ a scalar, using the LU factorization computed by slagtf.
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAGTS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slagts.f">
 *> [TGZ]</a>
@@ -13,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slagts.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -154,10 +154,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lagts
 *
 *  =====================================================================
       SUBROUTINE SLAGTS( JOB, N, A, B, C, D, IN, Y, TOL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slagv2.f b/SRC/slagv2.f
index 410cbf4c02..c71213682d 100644
--- a/SRC/slagv2.f
+++ b/SRC/slagv2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAGV2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slagv2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slagv2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,7 +142,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lagv2
 *
 *> \par Contributors:
 *  ==================
@@ -152,8 +150,10 @@
 *>     Mark Fahey, Department of Mathematics, Univ. of Kentucky, USA
 *
 *  =====================================================================
-      SUBROUTINE SLAGV2( A, LDA, B, LDB, ALPHAR, ALPHAI, BETA, CSL, SNL,
+      SUBROUTINE SLAGV2( A, LDA, B, LDB, ALPHAR, ALPHAI, BETA, CSL,
+     $                   SNL,
      $                   CSR, SNR )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -253,7 +253,8 @@ SUBROUTINE SLAGV2( A, LDA, B, LDB, ALPHAR, ALPHAI, BETA, CSL, SNL,
 *
 *        B is nonsingular, first compute the eigenvalues of (A,B)
 *
-         CALL SLAG2( A, LDA, B, LDB, SAFMIN, SCALE1, SCALE2, WR1, WR2,
+         CALL SLAG2( A, LDA, B, LDB, SAFMIN, SCALE1, SCALE2, WR1,
+     $               WR2,
      $               WI )
 *
          IF( WI.EQ.ZERO ) THEN
diff --git a/SRC/slahqr.f b/SRC/slahqr.f
index 4e00f315a6..476fe5be2a 100644
--- a/SRC/slahqr.f
+++ b/SRC/slahqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAHQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slahqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slahqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -183,7 +181,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lahqr
 *
 *> \par Further Details:
 *  =====================
@@ -244,7 +242,7 @@ SUBROUTINE SLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
       EXTERNAL           SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLABAD, SLANV2, SLARFG, SROT
+      EXTERNAL           SCOPY, SLANV2, SLARFG, SROT
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, REAL, SQRT
@@ -278,7 +276,6 @@ SUBROUTINE SLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
 *
       SAFMIN = SLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULP = SLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( REAL( NH ) / ULP )
 *
@@ -596,13 +593,15 @@ SUBROUTINE SLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
             IF( I2.GT.I )
      $         CALL SROT( I2-I, H( I-1, I+1 ), LDH, H( I, I+1 ), LDH,
      $                    CS, SN )
-            CALL SROT( I-I1-1, H( I1, I-1 ), 1, H( I1, I ), 1, CS, SN )
+            CALL SROT( I-I1-1, H( I1, I-1 ), 1, H( I1, I ), 1, CS,
+     $                 SN )
          END IF
          IF( WANTZ ) THEN
 *
 *           Apply the transformation to Z.
 *
-            CALL SROT( NZ, Z( ILOZ, I-1 ), 1, Z( ILOZ, I ), 1, CS, SN )
+            CALL SROT( NZ, Z( ILOZ, I-1 ), 1, Z( ILOZ, I ), 1, CS,
+     $                 SN )
          END IF
       END IF
 *     reset deflation counter
diff --git a/SRC/slahr2.f b/SRC/slahr2.f
index 458da48e4e..074f935423 100644
--- a/SRC/slahr2.f
+++ b/SRC/slahr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAHR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slahr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slahr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,7 +121,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lahr2
 *
 *> \par Further Details:
 *  =====================
@@ -178,6 +176,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLAHR2( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,7 +222,8 @@ SUBROUTINE SLAHR2( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *
 *           Update I-th column of A - Y * V**T
 *
-            CALL SGEMV( 'NO TRANSPOSE', N-K, I-1, -ONE, Y(K+1,1), LDY,
+            CALL SGEMV( 'NO TRANSPOSE', N-K, I-1, -ONE, Y(K+1,1),
+     $                  LDY,
      $                  A( K+I-1, 1 ), LDA, ONE, A( K+1, I ), 1 )
 *
 *           Apply I - V * T**T * V**T to this column (call it b) from the
@@ -272,7 +272,8 @@ SUBROUTINE SLAHR2( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *        Generate the elementary reflector H(I) to annihilate
 *        A(K+I+1:N,I)
 *
-         CALL SLARFG( N-K-I+1, A( K+I, I ), A( MIN( K+I+1, N ), I ), 1,
+         CALL SLARFG( N-K-I+1, A( K+I, I ), A( MIN( K+I+1, N ), I ),
+     $                1,
      $                TAU( I ) )
          EI = A( K+I, I )
          A( K+I, I ) = ONE
diff --git a/SRC/slaic1.f b/SRC/slaic1.f
index 65107002cc..07101bcc46 100644
--- a/SRC/slaic1.f
+++ b/SRC/slaic1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAIC1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaic1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaic1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,10 +125,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup laic1
 *
 *  =====================================================================
       SUBROUTINE SLAIC1( JOB, J, X, SEST, W, GAMMA, SESTPR, S, C )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slaisnan.f b/SRC/slaisnan.f
index 76c2a59964..dec47b10fa 100644
--- a/SRC/slaisnan.f
+++ b/SRC/slaisnan.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAISNAN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaisnan.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaisnan.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -67,10 +65,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup laisnan
 *
 *  =====================================================================
       LOGICAL FUNCTION SLAISNAN( SIN1, SIN2 )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slaln2.f b/SRC/slaln2.f
index 826eb1fc1e..1b04f2d0ea 100644
--- a/SRC/slaln2.f
+++ b/SRC/slaln2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLALN2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaln2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaln2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -210,11 +208,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup laln2
 *
 *  =====================================================================
       SUBROUTINE SLALN2( LTRANS, NA, NW, SMIN, CA, A, LDA, D1, D2, B,
      $                   LDB, WR, WI, X, LDX, SCALE, XNORM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slals0.f b/SRC/slals0.f
index 7d44e28643..ee9cd2315d 100644
--- a/SRC/slals0.f
+++ b/SRC/slals0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLALS0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slals0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slals0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -252,7 +250,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup lals0
 *
 *> \par Contributors:
 *  ==================
@@ -262,9 +260,11 @@
 *>     Osni Marques, LBNL/NERSC, USA \n
 *
 *  =====================================================================
-      SUBROUTINE SLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
+      SUBROUTINE SLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX,
+     $                   LDBX,
      $                   PERM, GIVPTR, GIVCOL, LDGCOL, GIVNUM, LDGNUM,
      $                   POLES, DIFL, DIFR, Z, K, C, S, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -293,7 +293,8 @@ SUBROUTINE SLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
       REAL               DIFLJ, DIFRJ, DJ, DSIGJ, DSIGJP, TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEMV, SLACPY, SLASCL, SROT, SSCAL,
+      EXTERNAL           SCOPY, SGEMV, SLACPY, SLASCL, SROT,
+     $                   SSCAL,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
@@ -357,7 +358,8 @@ SUBROUTINE SLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
 *
          CALL SCOPY( NRHS, B( NLP1, 1 ), LDB, BX( 1, 1 ), LDBX )
          DO 20 I = 2, N
-            CALL SCOPY( NRHS, B( PERM( I ), 1 ), LDB, BX( I, 1 ), LDBX )
+            CALL SCOPY( NRHS, B( PERM( I ), 1 ), LDB, BX( I, 1 ),
+     $                  LDBX )
    20    CONTINUE
 *
 *        Step (3L): apply the inverse of the left singular vector
@@ -389,6 +391,11 @@ SUBROUTINE SLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
      $                ( POLES( I, 2 ).EQ.ZERO ) ) THEN
                      WORK( I ) = ZERO
                   ELSE
+*
+*                    Use calls to the subroutine SLAMC3 to enforce the
+*                    parentheses (x+y)+z. The goal is to prevent
+*                    optimizing compilers from doing x+(y+z).
+*
                      WORK( I ) = POLES( I, 2 )*Z( I ) /
      $                           ( SLAMC3( POLES( I, 2 ), DSIGJ )-
      $                           DIFLJ ) / ( POLES( I, 2 )+DJ )
@@ -406,7 +413,8 @@ SUBROUTINE SLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
    40          CONTINUE
                WORK( 1 ) = NEGONE
                TEMP = SNRM2( K, WORK, 1 )
-               CALL SGEMV( 'T', K, NRHS, ONE, BX, LDBX, WORK, 1, ZERO,
+               CALL SGEMV( 'T', K, NRHS, ONE, BX, LDBX, WORK, 1,
+     $                     ZERO,
      $                     B( J, 1 ), LDB )
                CALL SLASCL( 'G', 0, 0, TEMP, ONE, 1, NRHS, B( J, 1 ),
      $                      LDB, INFO )
@@ -440,7 +448,13 @@ SUBROUTINE SLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
                   IF( Z( J ).EQ.ZERO ) THEN
                      WORK( I ) = ZERO
                   ELSE
-                     WORK( I ) = Z( J ) / ( SLAMC3( DSIGJ, -POLES( I+1,
+*
+*                    Use calls to the subroutine SLAMC3 to enforce the
+*                    parentheses (x+y)+z. The goal is to prevent
+*                    optimizing compilers from doing x+(y+z).
+*
+                     WORK( I ) = Z( J ) / ( SLAMC3( DSIGJ,
+     $                     -POLES( I+1,
      $                           2 ) )-DIFR( I, 1 ) ) /
      $                           ( DSIGJ+POLES( I, 1 ) ) / DIFR( I, 2 )
                   END IF
@@ -464,10 +478,12 @@ SUBROUTINE SLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
 *
          IF( SQRE.EQ.1 ) THEN
             CALL SCOPY( NRHS, B( M, 1 ), LDB, BX( M, 1 ), LDBX )
-            CALL SROT( NRHS, BX( 1, 1 ), LDBX, BX( M, 1 ), LDBX, C, S )
+            CALL SROT( NRHS, BX( 1, 1 ), LDBX, BX( M, 1 ), LDBX, C,
+     $                 S )
          END IF
          IF( K.LT.MAX( M, N ) )
-     $      CALL SLACPY( 'A', N-K, NRHS, B( K+1, 1 ), LDB, BX( K+1, 1 ),
+     $      CALL SLACPY( 'A', N-K, NRHS, B( K+1, 1 ), LDB, BX( K+1,
+     $                   1 ),
      $                   LDBX )
 *
 *        Step (3R): permute rows of B.
@@ -477,7 +493,8 @@ SUBROUTINE SLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
             CALL SCOPY( NRHS, BX( M, 1 ), LDBX, B( M, 1 ), LDB )
          END IF
          DO 90 I = 2, N
-            CALL SCOPY( NRHS, BX( I, 1 ), LDBX, B( PERM( I ), 1 ), LDB )
+            CALL SCOPY( NRHS, BX( I, 1 ), LDBX, B( PERM( I ), 1 ),
+     $                  LDB )
    90    CONTINUE
 *
 *        Step (4R): apply back the Givens rotations performed.
diff --git a/SRC/slalsa.f b/SRC/slalsa.f
index 465455e4a1..87db425e7b 100644
--- a/SRC/slalsa.f
+++ b/SRC/slalsa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLALSA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slalsa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slalsa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -43,9 +41,9 @@
 *>
 *> \verbatim
 *>
-*> SLALSA is an itermediate step in solving the least squares problem
+*> SLALSA is an intermediate step in solving the least squares problem
 *> by computing the SVD of the coefficient matrix in compact form (The
-*> singular vectors are computed as products of simple orthorgonal
+*> singular vectors are computed as products of simple orthogonal
 *> matrices.).
 *>
 *> If ICOMPQ = 0, SLALSA applies the inverse of the left singular vector
@@ -250,7 +248,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup lalsa
 *
 *> \par Contributors:
 *  ==================
@@ -260,10 +258,12 @@
 *>     Osni Marques, LBNL/NERSC, USA \n
 *
 *  =====================================================================
-      SUBROUTINE SLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
+      SUBROUTINE SLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX,
+     $                   U,
      $                   LDU, VT, K, DIFL, DIFR, Z, POLES, GIVPTR,
      $                   GIVCOL, LDGCOL, PERM, GIVNUM, C, S, WORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -295,7 +295,8 @@ SUBROUTINE SLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
      $                   NR, NRF, NRP1, SQRE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEMM, SLALS0, SLASDT, XERBLA
+      EXTERNAL           SCOPY, SGEMM, SLALS0, SLASDT,
+     $                   XERBLA
 *     ..
 *     .. Executable Statements ..
 *
@@ -402,7 +403,8 @@ SUBROUTINE SLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
             NLF = IC - NL
             NRF = IC + 1
             J = J - 1
-            CALL SLALS0( ICOMPQ, NL, NR, SQRE, NRHS, BX( NLF, 1 ), LDBX,
+            CALL SLALS0( ICOMPQ, NL, NR, SQRE, NRHS, BX( NLF, 1 ),
+     $                   LDBX,
      $                   B( NLF, 1 ), LDB, PERM( NLF, LVL ),
      $                   GIVPTR( J ), GIVCOL( NLF, LVL2 ), LDGCOL,
      $                   GIVNUM( NLF, LVL2 ), LDU, POLES( NLF, LVL2 ),
@@ -447,7 +449,8 @@ SUBROUTINE SLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
                SQRE = 1
             END IF
             J = J + 1
-            CALL SLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B( NLF, 1 ), LDB,
+            CALL SLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B( NLF, 1 ),
+     $                   LDB,
      $                   BX( NLF, 1 ), LDBX, PERM( NLF, LVL ),
      $                   GIVPTR( J ), GIVCOL( NLF, LVL2 ), LDGCOL,
      $                   GIVNUM( NLF, LVL2 ), LDU, POLES( NLF, LVL2 ),
@@ -475,9 +478,11 @@ SUBROUTINE SLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
          END IF
          NLF = IC - NL
          NRF = IC + 1
-         CALL SGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ), LDU,
+         CALL SGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ),
+     $               LDU,
      $               B( NLF, 1 ), LDB, ZERO, BX( NLF, 1 ), LDBX )
-         CALL SGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ), LDU,
+         CALL SGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ),
+     $               LDU,
      $               B( NRF, 1 ), LDB, ZERO, BX( NRF, 1 ), LDBX )
    80 CONTINUE
 *
diff --git a/SRC/slalsd.f b/SRC/slalsd.f
index 2197f728e0..59e22236a0 100644
--- a/SRC/slalsd.f
+++ b/SRC/slalsd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLALSD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slalsd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slalsd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -47,12 +45,6 @@
 *> problem; in this case a minimum norm solution is returned.
 *> The actual singular values are returned in D in ascending order.
 *>
-*> This code makes very mild assumptions about floating point
-*> arithmetic. It will work on machines with a guard digit in
-*> add/subtract, or on those binary machines without guard digits
-*> which subtract like the Cray XMP, Cray YMP, Cray C 90, or Cray 2.
-*> It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -164,7 +156,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup lalsd
 *
 *> \par Contributors:
 *  ==================
@@ -176,6 +168,7 @@
 *  =====================================================================
       SUBROUTINE SLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
      $                   RANK, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -210,7 +203,8 @@ SUBROUTINE SLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
       EXTERNAL           ISAMAX, SLAMCH, SLANST
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEMM, SLACPY, SLALSA, SLARTG, SLASCL,
+      EXTERNAL           SCOPY, SGEMM, SLACPY, SLALSA, SLARTG,
+     $                   SLASCL,
      $                   SLASDA, SLASDQ, SLASET, SLASRT, SROT, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -255,7 +249,8 @@ SUBROUTINE SLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
             CALL SLASET( 'A', 1, NRHS, ZERO, ZERO, B, LDB )
          ELSE
             RANK = 1
-            CALL SLASCL( 'G', 0, 0, D( 1 ), ONE, 1, NRHS, B, LDB, INFO )
+            CALL SLASCL( 'G', 0, 0, D( 1 ), ONE, 1, NRHS, B, LDB,
+     $                   INFO )
             D( 1 ) = ABS( D( 1 ) )
          END IF
          RETURN
@@ -281,7 +276,8 @@ SUBROUTINE SLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
                DO 20 J = 1, N - 1
                   CS = WORK( J*2-1 )
                   SN = WORK( J*2 )
-                  CALL SROT( 1, B( J, I ), 1, B( J+1, I ), 1, CS, SN )
+                  CALL SROT( 1, B( J, I ), 1, B( J+1, I ), 1, CS,
+     $                       SN )
    20          CONTINUE
    30       CONTINUE
          END IF
@@ -305,7 +301,8 @@ SUBROUTINE SLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
       IF( N.LE.SMLSIZ ) THEN
          NWORK = 1 + N*N
          CALL SLASET( 'A', N, N, ZERO, ONE, WORK, N )
-         CALL SLASDQ( 'U', 0, N, N, 0, NRHS, D, E, WORK, N, WORK, N, B,
+         CALL SLASDQ( 'U', 0, N, N, 0, NRHS, D, E, WORK, N, WORK, N,
+     $                B,
      $                LDB, WORK( NWORK ), INFO )
          IF( INFO.NE.0 ) THEN
             RETURN
@@ -313,14 +310,17 @@ SUBROUTINE SLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
          TOL = RCND*ABS( D( ISAMAX( N, D, 1 ) ) )
          DO 40 I = 1, N
             IF( D( I ).LE.TOL ) THEN
-               CALL SLASET( 'A', 1, NRHS, ZERO, ZERO, B( I, 1 ), LDB )
+               CALL SLASET( 'A', 1, NRHS, ZERO, ZERO, B( I, 1 ),
+     $                      LDB )
             ELSE
-               CALL SLASCL( 'G', 0, 0, D( I ), ONE, 1, NRHS, B( I, 1 ),
+               CALL SLASCL( 'G', 0, 0, D( I ), ONE, 1, NRHS, B( I,
+     $                      1 ),
      $                      LDB, INFO )
                RANK = RANK + 1
             END IF
    40    CONTINUE
-         CALL SGEMM( 'T', 'N', N, NRHS, N, ONE, WORK, N, B, LDB, ZERO,
+         CALL SGEMM( 'T', 'N', N, NRHS, N, ONE, WORK, N, B, LDB,
+     $               ZERO,
      $               WORK( NWORK ), N )
          CALL SLACPY( 'A', N, NRHS, WORK( NWORK ), N, B, LDB )
 *
@@ -468,7 +468,8 @@ SUBROUTINE SLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
 *        subproblems were not solved explicitly.
 *
          IF( ABS( D( I ) ).LE.TOL ) THEN
-            CALL SLASET( 'A', 1, NRHS, ZERO, ZERO, WORK( BX+I-1 ), N )
+            CALL SLASET( 'A', 1, NRHS, ZERO, ZERO, WORK( BX+I-1 ),
+     $                   N )
          ELSE
             RANK = RANK + 1
             CALL SLASCL( 'G', 0, 0, D( I ), ONE, 1, NRHS,
@@ -492,7 +493,8 @@ SUBROUTINE SLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
      $                  WORK( VT+ST1 ), N, WORK( BXST ), N, ZERO,
      $                  B( ST, 1 ), LDB )
          ELSE
-            CALL SLALSA( ICMPQ2, SMLSIZ, NSIZE, NRHS, WORK( BXST ), N,
+            CALL SLALSA( ICMPQ2, SMLSIZ, NSIZE, NRHS, WORK( BXST ),
+     $                   N,
      $                   B( ST, 1 ), LDB, WORK( U+ST1 ), N,
      $                   WORK( VT+ST1 ), IWORK( K+ST1 ),
      $                   WORK( DIFL+ST1 ), WORK( DIFR+ST1 ),
diff --git a/SRC/slamrg.f b/SRC/slamrg.f
index a29802e220..ae8426ebb6 100644
--- a/SRC/slamrg.f
+++ b/SRC/slamrg.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAMRG + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slamrg.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slamrg.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -92,10 +90,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lamrg
 *
 *  =====================================================================
       SUBROUTINE SLAMRG( N1, N2, A, STRD1, STRD2, INDEX )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slamswlq.f b/SRC/slamswlq.f
index 2929941792..aa12d59641 100644
--- a/SRC/slamswlq.f
+++ b/SRC/slamswlq.f
@@ -56,7 +56,7 @@
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix C. N >= M.
+*>          The number of columns of the matrix C. N >= 0.
 *> \endverbatim
 *>
 *> \param[in] K
@@ -70,14 +70,14 @@
 *> \param[in] MB
 *> \verbatim
 *>          MB is INTEGER
-*>          The row block size to be used in the blocked QR.
+*>          The row block size to be used in the blocked LQ.
 *>          M >= MB >= 1
 *> \endverbatim
 *>
 *> \param[in] NB
 *> \verbatim
 *>          NB is INTEGER
-*>          The column block size to be used in the blocked QR.
+*>          The column block size to be used in the blocked LQ.
 *>          NB > M.
 *> \endverbatim
 *>
@@ -94,9 +94,7 @@
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.
-*>          If SIDE = 'L', LDA >= max(1,M);
-*>          if SIDE = 'R', LDA >= max(1,N).
+*>          The leading dimension of the array A. LDA >= max(1,K).
 *> \endverbatim
 *>
 *> \param[in] T
@@ -129,17 +127,20 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) REAL array, dimension (MAX(1,LWORK))
+*>          (workspace) REAL array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK.
-*>          If SIDE = 'L', LWORK >= max(1,NB) * MB;
-*>          if SIDE = 'R', LWORK >= max(1,M) * MB.
+*>
+*>          If MIN(M,N,K) = 0, LWORK >= 1.
+*>          If SIDE = 'L', LWORK >= max(1,NB*MB).
+*>          If SIDE = 'R', LWORK >= max(1,M*MB).
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
+*>          only calculates the minimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
@@ -181,7 +182,7 @@
 *> stored in columns [(i-1)*(NB-M)+M+1:i*(NB-M)+M] of A, and by upper triangular
 *> block reflectors, stored in array T(1:LDT,(i-1)*M+1:i*M).
 *> The last Q(k) may use fewer rows.
-*> For more information see Further Details in TPQRT.
+*> For more information see Further Details in TPLQT.
 *>
 *> For more details of the overall algorithm, see the description of
 *> Sequential TSQR in Section 2.2 of [1].
@@ -191,33 +192,39 @@
 *>     SIAM J. Sci. Comput, vol. 34, no. 1, 2012
 *> \endverbatim
 *>
+*> \ingroup lamswlq
+*>
 *  =====================================================================
       SUBROUTINE SLAMSWLQ( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
-     $    LDT, C, LDC, WORK, LWORK, INFO )
+     $                     LDT, C, LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
 *     .. Scalar Arguments ..
-      CHARACTER         SIDE, TRANS
-      INTEGER           INFO, LDA, M, N, K, MB, NB, LDT, LWORK, LDC
+      CHARACTER          SIDE, TRANS
+      INTEGER            INFO, LDA, M, N, K, MB, NB, LDT, LWORK, LDC
 *     ..
 *     .. Array Arguments ..
-      REAL              A( LDA, * ), WORK( * ), C(LDC, * ),
-     $      T( LDT, * )
+      REAL               A( LDA, * ), WORK( * ), C( LDC, * ),
+     $                   T( LDT, * )
 *     ..
 *
 * =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
-      LOGICAL    LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER    I, II, KK, LW, CTR
+      LOGICAL            LEFT, RIGHT, TRAN, NOTRAN, LQUERY
+      INTEGER            I, II, KK, LW, CTR, MINMNK, LWMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
+*     ..
 *     .. External Subroutines ..
       EXTERNAL           STPMLQT, SGEMLQT, XERBLA
 *     ..
@@ -225,50 +232,60 @@ SUBROUTINE SLAMSWLQ( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
 *
 *     Test the input arguments
 *
-      LQUERY  = LWORK.LT.0
+      LQUERY  = ( LWORK.EQ.-1 )
       NOTRAN  = LSAME( TRANS, 'N' )
       TRAN    = LSAME( TRANS, 'T' )
       LEFT    = LSAME( SIDE, 'L' )
       RIGHT   = LSAME( SIDE, 'R' )
-      IF (LEFT) THEN
+      IF( LEFT ) THEN
         LW = N * MB
       ELSE
         LW = M * MB
       END IF
+*
+      MINMNK = MIN( M, N, K )
+      IF( MINMNK.EQ.0 ) THEN
+        LWMIN = 1
+      ELSE
+        LWMIN = MAX( 1, LW )
+      END IF
 *
       INFO = 0
       IF( .NOT.LEFT .AND. .NOT.RIGHT ) THEN
-         INFO = -1
+        INFO = -1
       ELSE IF( .NOT.TRAN .AND. .NOT.NOTRAN ) THEN
-         INFO = -2
-      ELSE IF( M.LT.0 ) THEN
+        INFO = -2
+      ELSE IF( K.LT.0 ) THEN
+        INFO = -5
+      ELSE IF( M.LT.K ) THEN
         INFO = -3
       ELSE IF( N.LT.0 ) THEN
         INFO = -4
-      ELSE IF( K.LT.0 ) THEN
-        INFO = -5
+      ELSE IF( K.LT.MB .OR. MB.LT.1 ) THEN
+        INFO = -6
       ELSE IF( LDA.LT.MAX( 1, K ) ) THEN
         INFO = -9
-      ELSE IF( LDT.LT.MAX( 1, MB) ) THEN
+      ELSE IF( LDT.LT.MAX( 1, MB ) ) THEN
         INFO = -11
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
-         INFO = -13
-      ELSE IF(( LWORK.LT.MAX(1,LW)).AND.(.NOT.LQUERY)) THEN
+        INFO = -13
+      ELSE IF( LWORK.LT.LWMIN .AND. (.NOT.LQUERY) ) THEN
         INFO = -15
       END IF
 *
+      IF( INFO.EQ.0 ) THEN
+        WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
+      END IF
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'SLAMSWLQ', -INFO )
-        WORK(1) = LW
         RETURN
-      ELSE IF (LQUERY) THEN
-        WORK(1) = LW
+      ELSE IF( LQUERY ) THEN
         RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( MIN(M,N,K).EQ.0 ) THEN
+      IF( MINMNK.EQ.0 ) THEN
         RETURN
       END IF
 *
@@ -402,7 +419,7 @@ SUBROUTINE SLAMSWLQ( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
 *
       END IF
 *
-      WORK(1) = LW
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       RETURN
 *
 *     End of SLAMSWLQ
diff --git a/SRC/slamtsqr.f b/SRC/slamtsqr.f
index 22eedfa78a..281e5ef26e 100644
--- a/SRC/slamtsqr.f
+++ b/SRC/slamtsqr.f
@@ -27,7 +27,7 @@
 *> TRANS = 'T':      Q**T * C       C * Q**T
 *>      where Q is a real orthogonal matrix defined as the product
 *>      of blocked elementary reflectors computed by tall skinny
-*>      QR factorization (DLATSQR)
+*>      QR factorization (SLATSQR)
 *> \endverbatim
 *
 *  Arguments:
@@ -56,15 +56,14 @@
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix C. M >= N >= 0.
+*>          The number of columns of the matrix C. N >= 0.
 *> \endverbatim
 *>
 *> \param[in] K
 *> \verbatim
 *>          K is INTEGER
 *>          The number of elementary reflectors whose product defines
-*>          the matrix Q.
-*>          N >= K >= 0;
+*>          the matrix Q. M >= K >= 0;
 *>
 *> \endverbatim
 *>
@@ -72,7 +71,7 @@
 *> \verbatim
 *>          MB is INTEGER
 *>          The block size to be used in the blocked QR.
-*>          MB > N. (must be the same as DLATSQR)
+*>          MB > N. (must be the same as SLATSQR)
 *> \endverbatim
 *>
 *> \param[in] NB
@@ -87,7 +86,7 @@
 *>          A is REAL array, dimension (LDA,K)
 *>          The i-th column must contain the vector which defines the
 *>          blockedelementary reflector H(i), for i = 1,2,...,k, as
-*>          returned by DLATSQR in the first k columns of
+*>          returned by SLATSQR in the first k columns of
 *>          its array argument A.
 *> \endverbatim
 *>
@@ -129,22 +128,24 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) REAL array, dimension (MAX(1,LWORK))
-*>
+*>          (workspace) REAL array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
+*>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK.
+*>          If MIN(M,N,K) = 0, LWORK >= 1.
+*>          If SIDE = 'L', LWORK >= max(1,N*NB).
+*>          If SIDE = 'R', LWORK >= max(1,MB*NB).
 *>
-*>          If SIDE = 'L', LWORK >= max(1,N)*NB;
-*>          if SIDE = 'R', LWORK >= max(1,MB)*NB.
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
+*>          only calculates the minimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
-*>
 *> \endverbatim
+*>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
@@ -192,33 +193,39 @@
 *>     SIAM J. Sci. Comput, vol. 34, no. 1, 2012
 *> \endverbatim
 *>
+*> \ingroup lamtsqr
+*>
 *  =====================================================================
       SUBROUTINE SLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
-     $        LDT, C, LDC, WORK, LWORK, INFO )
+     $                     LDT, C, LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
 *     .. Scalar Arguments ..
-      CHARACTER         SIDE, TRANS
-      INTEGER           INFO, LDA, M, N, K, MB, NB, LDT, LWORK, LDC
+      CHARACTER          SIDE, TRANS
+      INTEGER            INFO, LDA, M, N, K, MB, NB, LDT, LWORK, LDC
 *     ..
 *     .. Array Arguments ..
-      REAL              A( LDA, * ), WORK( * ), C(LDC, * ),
-     $                T( LDT, * )
+      REAL               A( LDA, * ), WORK( * ), C( LDC, * ),
+     $                   T( LDT, * )
 *     ..
 *
 * =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
-      LOGICAL    LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER    I, II, KK, LW, CTR
+      LOGICAL            LEFT, RIGHT, TRAN, NOTRAN, LQUERY
+      INTEGER            I, II, KK, LW, CTR, Q, MINMNK, LWMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
+*     ..
 *     .. External Subroutines ..
       EXTERNAL           SGEMQRT, STPMQRT, XERBLA
 *     ..
@@ -226,62 +233,73 @@ SUBROUTINE SLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
 *
 *     Test the input arguments
 *
-      LQUERY  = LWORK.LT.0
+      INFO = 0
+      LQUERY  = ( LWORK.EQ.-1 )
       NOTRAN  = LSAME( TRANS, 'N' )
       TRAN    = LSAME( TRANS, 'T' )
       LEFT    = LSAME( SIDE, 'L' )
       RIGHT   = LSAME( SIDE, 'R' )
-      IF (LEFT) THEN
+      IF( LEFT ) THEN
         LW = N * NB
+        Q = M
       ELSE
         LW = MB * NB
+        Q = N
+      END IF
+*
+      MINMNK = MIN( M, N, K )
+      IF( MINMNK.EQ.0 ) THEN
+        LWMIN = 1
+      ELSE
+        LWMIN = MAX( 1, LW )
       END IF
 *
-      INFO = 0
       IF( .NOT.LEFT .AND. .NOT.RIGHT ) THEN
-         INFO = -1
+        INFO = -1
       ELSE IF( .NOT.TRAN .AND. .NOT.NOTRAN ) THEN
-         INFO = -2
-      ELSE IF( M.LT.0 ) THEN
+        INFO = -2
+      ELSE IF( M.LT.K ) THEN
         INFO = -3
       ELSE IF( N.LT.0 ) THEN
         INFO = -4
       ELSE IF( K.LT.0 ) THEN
         INFO = -5
-      ELSE IF( LDA.LT.MAX( 1, K ) ) THEN
+      ELSE IF( K.LT.NB .OR. NB.LT.1 ) THEN
+        INFO = -7
+      ELSE IF( LDA.LT.MAX( 1, Q ) ) THEN
         INFO = -9
-      ELSE IF( LDT.LT.MAX( 1, NB) ) THEN
+      ELSE IF( LDT.LT.MAX( 1, NB ) ) THEN
         INFO = -11
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
-         INFO = -13
-      ELSE IF(( LWORK.LT.MAX(1,LW)).AND.(.NOT.LQUERY)) THEN
+        INFO = -13
+      ELSE IF( LWORK.LT.LWMIN. AND. (.NOT.LQUERY) ) THEN
         INFO = -15
       END IF
 *
-*     Determine the block size if it is tall skinny or short and wide
-*
-      IF( INFO.EQ.0)  THEN
-          WORK(1) = LW
+      IF( INFO.EQ.0 ) THEN
+        WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       END IF
 *
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'SLAMTSQR', -INFO )
         RETURN
-      ELSE IF (LQUERY) THEN
-       RETURN
+      ELSE IF( LQUERY ) THEN
+        RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( MIN(M,N,K).EQ.0 ) THEN
+      IF( MINMNK.EQ.0 ) THEN
         RETURN
       END IF
+*
+*     Determine the block size if it is tall skinny or short and wide
 *
       IF((MB.LE.K).OR.(MB.GE.MAX(M,N,K))) THEN
         CALL SGEMQRT( SIDE, TRANS, M, N, K, NB, A, LDA,
-     $        T, LDT, C, LDC, WORK, INFO)
+     $        T, LDT, C, LDC, WORK, INFO )
         RETURN
-       END IF
+      END IF
 *
       IF(LEFT.AND.NOTRAN) THEN
 *
@@ -407,7 +425,7 @@ SUBROUTINE SLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
 *
       END IF
 *
-      WORK(1) = LW
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       RETURN
 *
 *     End of SLAMTSQR
diff --git a/SRC/slaneg.f b/SRC/slaneg.f
index 26e7a78ac0..f04d259ccd 100644
--- a/SRC/slaneg.f
+++ b/SRC/slaneg.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLANEG + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaneg.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaneg.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -104,7 +102,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup laneg
 *
 *> \par Contributors:
 *  ==================
@@ -115,6 +113,7 @@
 *>
 *  =====================================================================
       INTEGER FUNCTION SLANEG( N, D, LLD, SIGMA, PIVMIN, R )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slangb.f b/SRC/slangb.f
index a240092854..4d67e0e5ae 100644
--- a/SRC/slangb.f
+++ b/SRC/slangb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLANGB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slangb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slangb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -116,11 +114,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBauxiliary
+*> \ingroup langb
 *
 *  =====================================================================
       REAL             FUNCTION SLANGB( NORM, N, KL, KU, AB, LDAB,
      $                 WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -200,7 +199,8 @@ REAL             FUNCTION SLANGB( NORM, N, KL, KU, AB, LDAB,
             TEMP = WORK( I )
             IF( VALUE.LT.TEMP .OR. SISNAN( TEMP ) ) VALUE = TEMP
    80    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
@@ -209,7 +209,8 @@ REAL             FUNCTION SLANGB( NORM, N, KL, KU, AB, LDAB,
          DO 90 J = 1, N
             L = MAX( 1, J-KU )
             K = KU + 1 - J + L
-            CALL SLASSQ( MIN( N, J+KL )-L+1, AB( K, J ), 1, SCALE, SUM )
+            CALL SLASSQ( MIN( N, J+KL )-L+1, AB( K, J ), 1, SCALE,
+     $                   SUM )
    90    CONTINUE
          VALUE = SCALE*SQRT( SUM )
       END IF
diff --git a/SRC/slange.f b/SRC/slange.f
index 79eef87261..41740f9060 100644
--- a/SRC/slange.f
+++ b/SRC/slange.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLANGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slange.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slange.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEauxiliary
+*> \ingroup lange
 *
 *  =====================================================================
       REAL             FUNCTION SLANGE( NORM, M, N, A, LDA, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,7 +187,8 @@ REAL             FUNCTION SLANGE( NORM, M, N, A, LDA, WORK )
             TEMP = WORK( I )
             IF( VALUE.LT.TEMP .OR. SISNAN( TEMP ) ) VALUE = TEMP
    80    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/slangt.f b/SRC/slangt.f
index 65957f8ec7..b2149db15b 100644
--- a/SRC/slangt.f
+++ b/SRC/slangt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLANGT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slangt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slangt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -99,10 +97,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup langt
 *
 *  =====================================================================
       REAL             FUNCTION SLANGT( NORM, N, DL, D, DU )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -146,11 +145,13 @@ REAL             FUNCTION SLANGT( NORM, N, DL, D, DU )
 *
          ANORM = ABS( D( N ) )
          DO 10 I = 1, N - 1
-            IF( ANORM.LT.ABS( DL( I ) ) .OR. SISNAN( ABS( DL( I ) ) ) )
+            IF( ANORM.LT.ABS( DL( I ) ) .OR.
+     $          SISNAN( ABS( DL( I ) ) ) )
      $           ANORM = ABS(DL(I))
             IF( ANORM.LT.ABS( D( I ) ) .OR. SISNAN( ABS( D( I ) ) ) )
      $           ANORM = ABS(D(I))
-            IF( ANORM.LT.ABS( DU( I ) ) .OR. SISNAN (ABS( DU( I ) ) ) )
+            IF( ANORM.LT.ABS( DU( I ) ) .OR.
+     $          SISNAN (ABS( DU( I ) ) ) )
      $           ANORM = ABS(DU(I))
    10    CONTINUE
       ELSE IF( LSAME( NORM, 'O' ) .OR. NORM.EQ.'1' ) THEN
@@ -183,7 +184,8 @@ REAL             FUNCTION SLANGT( NORM, N, DL, D, DU )
                IF( ANORM .LT. TEMP .OR. SISNAN( TEMP ) ) ANORM = TEMP
    30       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/slanhs.f b/SRC/slanhs.f
index e913806918..eba753ce2f 100644
--- a/SRC/slanhs.f
+++ b/SRC/slanhs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLANHS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slanhs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slanhs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lanhs
 *
 *  =====================================================================
       REAL             FUNCTION SLANHS( NORM, N, A, LDA, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -182,7 +181,8 @@ REAL             FUNCTION SLANHS( NORM, N, A, LDA, WORK )
             SUM = WORK( I )
             IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
    80    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/slansb.f b/SRC/slansb.f
index eb89d94cb6..3bfc3242cc 100644
--- a/SRC/slansb.f
+++ b/SRC/slansb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLANSB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slansb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slansb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,11 +119,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lanhb
 *
 *  =====================================================================
       REAL             FUNCTION SLANSB( NORM, UPLO, N, K, AB, LDAB,
      $                 WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,7 +182,8 @@ REAL             FUNCTION SLANSB( NORM, UPLO, N, K, AB, LDAB,
    30          CONTINUE
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is symmetric).
@@ -219,7 +219,8 @@ REAL             FUNCTION SLANSB( NORM, UPLO, N, K, AB, LDAB,
                IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
@@ -228,7 +229,8 @@ REAL             FUNCTION SLANSB( NORM, UPLO, N, K, AB, LDAB,
          IF( K.GT.0 ) THEN
             IF( LSAME( UPLO, 'U' ) ) THEN
                DO 110 J = 2, N
-                  CALL SLASSQ( MIN( J-1, K ), AB( MAX( K+2-J, 1 ), J ),
+                  CALL SLASSQ( MIN( J-1, K ), AB( MAX( K+2-J, 1 ),
+     $                         J ),
      $                         1, SCALE, SUM )
   110          CONTINUE
                L = K + 1
diff --git a/SRC/slansf.f b/SRC/slansf.f
index 5d480958f5..5e860efbe4 100644
--- a/SRC/slansf.f
+++ b/SRC/slansf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLANSF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slansf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slansf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,7 +113,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup lanhf
 *
 *> \par Further Details:
 *  =====================
@@ -206,6 +204,7 @@
 *
 *  =====================================================================
       REAL FUNCTION SLANSF( NORM, TRANSR, UPLO, N, A, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -333,7 +332,8 @@ REAL FUNCTION SLANSF( NORM, TRANSR, UPLO, N, A, WORK )
                END DO
             END IF
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is symmetric).
@@ -778,7 +778,8 @@ REAL FUNCTION SLANSF( NORM, TRANSR, UPLO, N, A, WORK )
                END IF
             END IF
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *       Find normF(A).
 *
@@ -792,7 +793,8 @@ REAL FUNCTION SLANSF( NORM, TRANSR, UPLO, N, A, WORK )
                IF( ILU.EQ.0 ) THEN
 *                 A is upper
                   DO J = 0, K - 3
-                     CALL SLASSQ( K-J-2, A( K+J+1+J*LDA ), 1, SCALE, S )
+                     CALL SLASSQ( K-J-2, A( K+J+1+J*LDA ), 1, SCALE,
+     $                            S )
 *                    L at A(k,0)
                   END DO
                   DO J = 0, K - 1
@@ -808,11 +810,13 @@ REAL FUNCTION SLANSF( NORM, TRANSR, UPLO, N, A, WORK )
                ELSE
 *                 ilu=1 & A is lower
                   DO J = 0, K - 1
-                     CALL SLASSQ( N-J-1, A( J+1+J*LDA ), 1, SCALE, S )
+                     CALL SLASSQ( N-J-1, A( J+1+J*LDA ), 1, SCALE,
+     $                            S )
 *                    trap L at A(0,0)
                   END DO
                   DO J = 0, K - 2
-                     CALL SLASSQ( J, A( 0+( 1+J )*LDA ), 1, SCALE, S )
+                     CALL SLASSQ( J, A( 0+( 1+J )*LDA ), 1, SCALE,
+     $                            S )
 *                    U at A(0,1)
                   END DO
                   S = S + S
@@ -827,7 +831,8 @@ REAL FUNCTION SLANSF( NORM, TRANSR, UPLO, N, A, WORK )
                IF( ILU.EQ.0 ) THEN
 *                 A**T is upper
                   DO J = 1, K - 2
-                     CALL SLASSQ( J, A( 0+( K+J )*LDA ), 1, SCALE, S )
+                     CALL SLASSQ( J, A( 0+( K+J )*LDA ), 1, SCALE,
+     $                            S )
 *                    U at A(0,k)
                   END DO
                   DO J = 0, K - 2
@@ -843,7 +848,8 @@ REAL FUNCTION SLANSF( NORM, TRANSR, UPLO, N, A, WORK )
 *                 double s for the off diagonal elements
                   CALL SLASSQ( K-1, A( 0+K*LDA ), LDA+1, SCALE, S )
 *                 tri U at A(0,k)
-                  CALL SLASSQ( K, A( 0+( K-1 )*LDA ), LDA+1, SCALE, S )
+                  CALL SLASSQ( K, A( 0+( K-1 )*LDA ), LDA+1, SCALE,
+     $                         S )
 *                 tri L at A(0,k-1)
                ELSE
 *                 A**T is lower
@@ -856,7 +862,8 @@ REAL FUNCTION SLANSF( NORM, TRANSR, UPLO, N, A, WORK )
 *                    k by k-1 rect. at A(0,k)
                   END DO
                   DO J = 0, K - 3
-                     CALL SLASSQ( K-J-2, A( J+2+J*LDA ), 1, SCALE, S )
+                     CALL SLASSQ( K-J-2, A( J+2+J*LDA ), 1, SCALE,
+     $                            S )
 *                    L at A(1,0)
                   END DO
                   S = S + S
@@ -874,7 +881,8 @@ REAL FUNCTION SLANSF( NORM, TRANSR, UPLO, N, A, WORK )
                IF( ILU.EQ.0 ) THEN
 *                 A is upper
                   DO J = 0, K - 2
-                     CALL SLASSQ( K-J-1, A( K+J+2+J*LDA ), 1, SCALE, S )
+                     CALL SLASSQ( K-J-1, A( K+J+2+J*LDA ), 1, SCALE,
+     $                            S )
 *                    L at A(k+1,0)
                   END DO
                   DO J = 0, K - 1
@@ -890,7 +898,8 @@ REAL FUNCTION SLANSF( NORM, TRANSR, UPLO, N, A, WORK )
                ELSE
 *                 ilu=1 & A is lower
                   DO J = 0, K - 1
-                     CALL SLASSQ( N-J-1, A( J+2+J*LDA ), 1, SCALE, S )
+                     CALL SLASSQ( N-J-1, A( J+2+J*LDA ), 1, SCALE,
+     $                            S )
 *                    trap L at A(1,0)
                   END DO
                   DO J = 1, K - 1
@@ -909,7 +918,8 @@ REAL FUNCTION SLANSF( NORM, TRANSR, UPLO, N, A, WORK )
                IF( ILU.EQ.0 ) THEN
 *                 A**T is upper
                   DO J = 1, K - 1
-                     CALL SLASSQ( J, A( 0+( K+1+J )*LDA ), 1, SCALE, S )
+                     CALL SLASSQ( J, A( 0+( K+1+J )*LDA ), 1, SCALE,
+     $                            S )
 *                    U at A(0,k+1)
                   END DO
                   DO J = 0, K - 1
@@ -917,20 +927,23 @@ REAL FUNCTION SLANSF( NORM, TRANSR, UPLO, N, A, WORK )
 *                    k by k rect. at A(0,0)
                   END DO
                   DO J = 0, K - 2
-                     CALL SLASSQ( K-J-1, A( J+1+( J+K )*LDA ), 1, SCALE,
+                     CALL SLASSQ( K-J-1, A( J+1+( J+K )*LDA ), 1,
+     $                            SCALE,
      $                            S )
 *                    L at A(0,k)
                   END DO
                   S = S + S
 *                 double s for the off diagonal elements
-                  CALL SLASSQ( K, A( 0+( K+1 )*LDA ), LDA+1, SCALE, S )
+                  CALL SLASSQ( K, A( 0+( K+1 )*LDA ), LDA+1, SCALE,
+     $                         S )
 *                 tri U at A(0,k+1)
                   CALL SLASSQ( K, A( 0+K*LDA ), LDA+1, SCALE, S )
 *                 tri L at A(0,k)
                ELSE
 *                 A**T is lower
                   DO J = 1, K - 1
-                     CALL SLASSQ( J, A( 0+( J+1 )*LDA ), 1, SCALE, S )
+                     CALL SLASSQ( J, A( 0+( J+1 )*LDA ), 1, SCALE,
+     $                            S )
 *                    U at A(0,1)
                   END DO
                   DO J = K + 1, N
@@ -938,7 +951,8 @@ REAL FUNCTION SLANSF( NORM, TRANSR, UPLO, N, A, WORK )
 *                    k by k rect. at A(0,k+1)
                   END DO
                   DO J = 0, K - 2
-                     CALL SLASSQ( K-J-1, A( J+1+J*LDA ), 1, SCALE, S )
+                     CALL SLASSQ( K-J-1, A( J+1+J*LDA ), 1, SCALE,
+     $                            S )
 *                    L at A(0,0)
                   END DO
                   S = S + S
diff --git a/SRC/slansp.f b/SRC/slansp.f
index 2189510a6e..63a05c2e99 100644
--- a/SRC/slansp.f
+++ b/SRC/slansp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLANSP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slansp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slansp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lanhp
 *
 *  =====================================================================
       REAL             FUNCTION SLANSP( NORM, UPLO, N, AP, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,7 +171,8 @@ REAL             FUNCTION SLANSP( NORM, UPLO, N, AP, WORK )
                K = K + N - J + 1
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is symmetric).
@@ -211,7 +211,8 @@ REAL             FUNCTION SLANSP( NORM, UPLO, N, AP, WORK )
                IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/slanst.f b/SRC/slanst.f
index dfe12a5f70..aefd8a08ae 100644
--- a/SRC/slanst.f
+++ b/SRC/slanst.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLANST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slanst.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slanst.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -93,10 +91,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lanht
 *
 *  =====================================================================
       REAL             FUNCTION SLANST( NORM, N, D, E )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -161,7 +160,8 @@ REAL             FUNCTION SLANST( NORM, N, D, E )
                IF( ANORM .LT. SUM .OR. SISNAN( SUM ) ) ANORM = SUM
    20       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/slansy.f b/SRC/slansy.f
index 4a23a42f2c..dcb94fbf1e 100644
--- a/SRC/slansy.f
+++ b/SRC/slansy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLANSY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slansy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slansy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,10 +113,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYauxiliary
+*> \ingroup lanhe
 *
 *  =====================================================================
       REAL             FUNCTION SLANSY( NORM, UPLO, N, A, LDA, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -176,7 +175,8 @@ REAL             FUNCTION SLANSY( NORM, UPLO, N, A, LDA, WORK )
    30          CONTINUE
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is symmetric).
@@ -210,7 +210,8 @@ REAL             FUNCTION SLANSY( NORM, UPLO, N, A, LDA, WORK )
                IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/slantb.f b/SRC/slantb.f
index c29db2416b..02393c1ddf 100644
--- a/SRC/slantb.f
+++ b/SRC/slantb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLANTB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slantb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slantb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,11 +130,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lantb
 *
 *  =====================================================================
       REAL             FUNCTION SLANTB( NORM, UPLO, DIAG, N, K, AB,
      $                 LDAB, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -185,14 +184,16 @@ REAL             FUNCTION SLANTB( NORM, UPLO, DIAG, N, K, AB,
                DO 20 J = 1, N
                   DO 10 I = MAX( K+2-J, 1 ), K
                      SUM = ABS( AB( I, J ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    10             CONTINUE
    20          CONTINUE
             ELSE
                DO 40 J = 1, N
                   DO 30 I = 2, MIN( N+1-J, K+1 )
                      SUM = ABS( AB( I, J ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    30             CONTINUE
    40          CONTINUE
             END IF
@@ -202,14 +203,16 @@ REAL             FUNCTION SLANTB( NORM, UPLO, DIAG, N, K, AB,
                DO 60 J = 1, N
                   DO 50 I = MAX( K+2-J, 1 ), K + 1
                      SUM = ABS( AB( I, J ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    50             CONTINUE
    60          CONTINUE
             ELSE
                DO 80 J = 1, N
                   DO 70 I = 1, MIN( N+1-J, K+1 )
                      SUM = ABS( AB( I, J ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    70             CONTINUE
    80          CONTINUE
             END IF
@@ -305,14 +308,15 @@ REAL             FUNCTION SLANTB( NORM, UPLO, DIAG, N, K, AB,
             SUM = WORK( I )
             IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
   270    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
          IF( LSAME( UPLO, 'U' ) ) THEN
             IF( LSAME( DIAG, 'U' ) ) THEN
                SCALE = ONE
-               SUM = N
+               SUM = REAL( N )
                IF( K.GT.0 ) THEN
                   DO 280 J = 2, N
                      CALL SLASSQ( MIN( J-1, K ),
@@ -324,17 +328,19 @@ REAL             FUNCTION SLANTB( NORM, UPLO, DIAG, N, K, AB,
                SCALE = ZERO
                SUM = ONE
                DO 290 J = 1, N
-                  CALL SLASSQ( MIN( J, K+1 ), AB( MAX( K+2-J, 1 ), J ),
+                  CALL SLASSQ( MIN( J, K+1 ), AB( MAX( K+2-J, 1 ),
+     $                         J ),
      $                         1, SCALE, SUM )
   290          CONTINUE
             END IF
          ELSE
             IF( LSAME( DIAG, 'U' ) ) THEN
                SCALE = ONE
-               SUM = N
+               SUM = REAL( N )
                IF( K.GT.0 ) THEN
                   DO 300 J = 1, N - 1
-                     CALL SLASSQ( MIN( N-J, K ), AB( 2, J ), 1, SCALE,
+                     CALL SLASSQ( MIN( N-J, K ), AB( 2, J ), 1,
+     $                            SCALE,
      $                            SUM )
   300             CONTINUE
                END IF
@@ -342,7 +348,8 @@ REAL             FUNCTION SLANTB( NORM, UPLO, DIAG, N, K, AB,
                SCALE = ZERO
                SUM = ONE
                DO 310 J = 1, N
-                  CALL SLASSQ( MIN( N-J+1, K+1 ), AB( 1, J ), 1, SCALE,
+                  CALL SLASSQ( MIN( N-J+1, K+1 ), AB( 1, J ), 1,
+     $                         SCALE,
      $                         SUM )
   310          CONTINUE
             END IF
diff --git a/SRC/slantp.f b/SRC/slantp.f
index 00fe42a53f..b29ad9b94c 100644
--- a/SRC/slantp.f
+++ b/SRC/slantp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLANTP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slantp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slantp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,10 +115,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lantp
 *
 *  =====================================================================
-      REAL             FUNCTION SLANTP( NORM, UPLO, DIAG, N, AP, WORK )
+      REAL             FUNCTION SLANTP( NORM, UPLO, DIAG, N, AP,
+     $                                  WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -170,7 +170,8 @@ REAL             FUNCTION SLANTP( NORM, UPLO, DIAG, N, AP, WORK )
                DO 20 J = 1, N
                   DO 10 I = K, K + J - 2
                      SUM = ABS( AP( I ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    10             CONTINUE
                   K = K + J
    20          CONTINUE
@@ -178,7 +179,8 @@ REAL             FUNCTION SLANTP( NORM, UPLO, DIAG, N, AP, WORK )
                DO 40 J = 1, N
                   DO 30 I = K + 1, K + N - J
                      SUM = ABS( AP( I ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    30             CONTINUE
                   K = K + N - J + 1
    40          CONTINUE
@@ -189,7 +191,8 @@ REAL             FUNCTION SLANTP( NORM, UPLO, DIAG, N, AP, WORK )
                DO 60 J = 1, N
                   DO 50 I = K, K + J - 1
                      SUM = ABS( AP( I ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    50             CONTINUE
                   K = K + J
    60          CONTINUE
@@ -197,7 +200,8 @@ REAL             FUNCTION SLANTP( NORM, UPLO, DIAG, N, AP, WORK )
                DO 80 J = 1, N
                   DO 70 I = K, K + N - J
                      SUM = ABS( AP( I ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    70             CONTINUE
                   K = K + N - J + 1
    80          CONTINUE
@@ -300,14 +304,15 @@ REAL             FUNCTION SLANTP( NORM, UPLO, DIAG, N, AP, WORK )
             SUM = WORK( I )
             IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
   270    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
          IF( LSAME( UPLO, 'U' ) ) THEN
             IF( LSAME( DIAG, 'U' ) ) THEN
                SCALE = ONE
-               SUM = N
+               SUM = REAL( N )
                K = 2
                DO 280 J = 2, N
                   CALL SLASSQ( J-1, AP( K ), 1, SCALE, SUM )
@@ -325,7 +330,7 @@ REAL             FUNCTION SLANTP( NORM, UPLO, DIAG, N, AP, WORK )
          ELSE
             IF( LSAME( DIAG, 'U' ) ) THEN
                SCALE = ONE
-               SUM = N
+               SUM = REAL( N )
                K = 2
                DO 300 J = 1, N - 1
                   CALL SLASSQ( N-J, AP( K ), 1, SCALE, SUM )
diff --git a/SRC/slantr.f b/SRC/slantr.f
index 384f58550b..c4bcedc268 100644
--- a/SRC/slantr.f
+++ b/SRC/slantr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLANTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slantr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slantr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,11 +131,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lantr
 *
 *  =====================================================================
-      REAL             FUNCTION SLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
+      REAL             FUNCTION SLANTR( NORM, UPLO, DIAG, M, N, A,
+     $                                  LDA,
      $                 WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -186,14 +186,16 @@ REAL             FUNCTION SLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
                DO 20 J = 1, N
                   DO 10 I = 1, MIN( M, J-1 )
                      SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    10             CONTINUE
    20          CONTINUE
             ELSE
                DO 40 J = 1, N
                   DO 30 I = J + 1, M
                      SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    30             CONTINUE
    40          CONTINUE
             END IF
@@ -203,14 +205,16 @@ REAL             FUNCTION SLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
                DO 60 J = 1, N
                   DO 50 I = 1, MIN( M, J )
                      SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    50             CONTINUE
    60          CONTINUE
             ELSE
                DO 80 J = 1, N
                   DO 70 I = J, M
                      SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   SISNAN( SUM ) ) VALUE = SUM
    70             CONTINUE
    80          CONTINUE
             END IF
@@ -305,28 +309,31 @@ REAL             FUNCTION SLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
             SUM = WORK( I )
             IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM
   280    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
          IF( LSAME( UPLO, 'U' ) ) THEN
             IF( LSAME( DIAG, 'U' ) ) THEN
                SCALE = ONE
-               SUM = MIN( M, N )
+               SUM = REAL( MIN( M, N ) )
                DO 290 J = 2, N
-                  CALL SLASSQ( MIN( M, J-1 ), A( 1, J ), 1, SCALE, SUM )
+                  CALL SLASSQ( MIN( M, J-1 ), A( 1, J ), 1, SCALE,
+     $                         SUM )
   290          CONTINUE
             ELSE
                SCALE = ZERO
                SUM = ONE
                DO 300 J = 1, N
-                  CALL SLASSQ( MIN( M, J ), A( 1, J ), 1, SCALE, SUM )
+                  CALL SLASSQ( MIN( M, J ), A( 1, J ), 1, SCALE,
+     $                         SUM )
   300          CONTINUE
             END IF
          ELSE
             IF( LSAME( DIAG, 'U' ) ) THEN
                SCALE = ONE
-               SUM = MIN( M, N )
+               SUM = REAL( MIN( M, N ) )
                DO 310 J = 1, N
                   CALL SLASSQ( M-J, A( MIN( M, J+1 ), J ), 1, SCALE,
      $                         SUM )
diff --git a/SRC/slanv2.f b/SRC/slanv2.f
index 6753012e75..752552cdf1 100644
--- a/SRC/slanv2.f
+++ b/SRC/slanv2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLANV2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slanv2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slanv2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -109,7 +107,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lanv2
 *
 *> \par Further Details:
 *  =====================
@@ -124,6 +122,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLANV2( A, B, C, D, RT1R, RT1I, RT2R, RT2I, CS, SN )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -144,7 +143,7 @@ SUBROUTINE SLANV2( A, B, C, D, RT1R, RT1I, RT2R, RT2I, CS, SN )
 *     ..
 *     .. Local Scalars ..
       REAL               AA, BB, BCMAX, BCMIS, CC, CS1, DD, EPS, P, SAB,
-     $                   SAC, SCALE, SIGMA, SN1, TAU, TEMP, Z, SAFMIN, 
+     $                   SAC, SCALE, SIGMA, SN1, TAU, TEMP, Z, SAFMIN,
      $                   SAFMN2, SAFMX2
       INTEGER            COUNT
 *     ..
@@ -248,10 +247,14 @@ SUBROUTINE SLANV2( A, B, C, D, RT1R, RT1I, RT2R, RT2I, CS, SN )
 *
 *           Compute [ A  B ] = [ CS  SN ] [ AA  BB ]
 *                   [ C  D ]   [-SN  CS ] [ CC  DD ]
+*
+*           Note: Some of the multiplications are wrapped in parentheses to
+*                 prevent compilers from using FMA instructions. See
+*                 https://github.com/Reference-LAPACK/lapack/issues/1031.
 *
             A = AA*CS + CC*SN
-            B = BB*CS + DD*SN
-            C = -AA*SN + CC*CS
+            B = ( BB*CS ) + ( DD*SN )
+            C = -( AA*SN ) + ( CC*CS )
             D = -BB*SN + DD*CS
 *
             TEMP = HALF*( A+D )
diff --git a/SRC/slaorhr_col_getrfnp.f b/SRC/slaorhr_col_getrfnp.f
index ff890beece..42b9da8ab5 100644
--- a/SRC/slaorhr_col_getrfnp.f
+++ b/SRC/slaorhr_col_getrfnp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAORHR_COL_GETRFNP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaorhr_col_getrfnp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaorhr_col_getrfnp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -128,7 +126,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup launhr_col_getrfnp
 *
 *> \par Contributors:
 *  ==================
@@ -166,7 +164,8 @@ SUBROUTINE SLAORHR_COL_GETRFNP( M, N, A, LDA, D, INFO )
       INTEGER            IINFO, J, JB, NB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMM, SLAORHR_COL_GETRFNP2, STRSM, XERBLA
+      EXTERNAL           SGEMM, SLAORHR_COL_GETRFNP2, STRSM,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
@@ -223,14 +222,16 @@ SUBROUTINE SLAORHR_COL_GETRFNP( M, N, A, LDA, D, INFO )
 *
 *              Compute block row of U.
 *
-               CALL STRSM( 'Left', 'Lower', 'No transpose', 'Unit', JB,
+               CALL STRSM( 'Left', 'Lower', 'No transpose', 'Unit',
+     $                     JB,
      $                     N-J-JB+1, ONE, A( J, J ), LDA, A( J, J+JB ),
      $                     LDA )
                IF( J+JB.LE.M ) THEN
 *
 *                 Update trailing submatrix.
 *
-                  CALL SGEMM( 'No transpose', 'No transpose', M-J-JB+1,
+                  CALL SGEMM( 'No transpose', 'No transpose',
+     $                        M-J-JB+1,
      $                        N-J-JB+1, JB, -ONE, A( J+JB, J ), LDA,
      $                        A( J, J+JB ), LDA, ONE, A( J+JB, J+JB ),
      $                        LDA )
diff --git a/SRC/slaorhr_col_getrfnp2.f b/SRC/slaorhr_col_getrfnp2.f
index 621e9a3148..70b4681ce3 100644
--- a/SRC/slaorhr_col_getrfnp2.f
+++ b/SRC/slaorhr_col_getrfnp2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DLAORHR_GETRF2NP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaorhr_col_getrfnp2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaorhr_col_getrfnp2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -149,7 +147,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup launhr_col_getrfnp2
 *
 *> \par Contributors:
 *  ==================
@@ -163,7 +161,8 @@
 *> \endverbatim
 *
 *  =====================================================================
-      RECURSIVE SUBROUTINE SLAORHR_COL_GETRFNP2( M, N, A, LDA, D, INFO )
+      RECURSIVE SUBROUTINE SLAORHR_COL_GETRFNP2( M, N, A, LDA, D,
+     $                                           INFO )
       IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
diff --git a/SRC/slapll.f b/SRC/slapll.f
index a71c9f3910..03aa19e9d2 100644
--- a/SRC/slapll.f
+++ b/SRC/slapll.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAPLL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slapll.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slapll.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,10 +93,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lapll
 *
 *  =====================================================================
       SUBROUTINE SLAPLL( N, X, INCX, Y, INCY, SSMIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slapmr.f b/SRC/slapmr.f
index c91a23ba00..d8150e2ebb 100644
--- a/SRC/slapmr.f
+++ b/SRC/slapmr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAPMR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slapmr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slapmr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lapmr
 *
 *  =====================================================================
       SUBROUTINE SLAPMR( FORWRD, M, N, X, LDX, K )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slapmt.f b/SRC/slapmt.f
index 8c71dfcfb1..259fd14b5b 100644
--- a/SRC/slapmt.f
+++ b/SRC/slapmt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAPMT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slapmt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slapmt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lapmt
 *
 *  =====================================================================
       SUBROUTINE SLAPMT( FORWRD, M, N, X, LDX, K )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slapy2.f b/SRC/slapy2.f
index e1364f6980..9937bc7cc7 100644
--- a/SRC/slapy2.f
+++ b/SRC/slapy2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAPY2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slapy2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slapy2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -56,10 +54,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lapy2
 *
 *  =====================================================================
       REAL             FUNCTION SLAPY2( X, Y )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slapy3.f b/SRC/slapy3.f
index 5a3999f9d9..c1c4bd6724 100644
--- a/SRC/slapy3.f
+++ b/SRC/slapy3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAPY3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slapy3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slapy3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -61,10 +59,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lapy3
 *
 *  =====================================================================
       REAL             FUNCTION SLAPY3( X, Y, Z )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slaqgb.f b/SRC/slaqgb.f
index 5527c73679..27ea3cd6bc 100644
--- a/SRC/slaqgb.f
+++ b/SRC/slaqgb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQGB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqgb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqgb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,11 +149,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBauxiliary
+*> \ingroup laqgb
 *
 *  =====================================================================
-      SUBROUTINE SLAQGB( M, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+      SUBROUTINE SLAQGB( M, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                   COLCND,
      $                   AMAX, EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slaqge.f b/SRC/slaqge.f
index 134035707a..7053e308eb 100644
--- a/SRC/slaqge.f
+++ b/SRC/slaqge.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqge.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqge.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -134,11 +132,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEauxiliary
+*> \ingroup laqge
 *
 *  =====================================================================
       SUBROUTINE SLAQGE( M, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
      $                   EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slaqp2.f b/SRC/slaqp2.f
index 595fb8c340..530d1913d6 100644
--- a/SRC/slaqp2.f
+++ b/SRC/slaqp2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQP2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqp2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqp2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,7 +120,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup laqp2
 *
 *> \par Contributors:
 *  ==================
@@ -139,13 +137,12 @@
 *>
 *> LAPACK Working Note 176
 *
-*> \htmlonly
 *> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">[PDF]</a>
-*> \endhtmlonly
 *
 *  =====================================================================
       SUBROUTINE SLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
      $                   WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -168,10 +165,10 @@ SUBROUTINE SLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
 *     ..
 *     .. Local Scalars ..
       INTEGER            I, ITEMP, J, MN, OFFPI, PVT
-      REAL               AII, TEMP, TEMP2, TOL3Z
+      REAL               TEMP, TEMP2, TOL3Z
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, SLARFG, SSWAP
+      EXTERNAL           SLARF1F, SLARFG, SSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, SQRT
@@ -208,7 +205,8 @@ SUBROUTINE SLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
 *        Generate elementary reflector H(i).
 *
          IF( OFFPI.LT.M ) THEN
-            CALL SLARFG( M-OFFPI+1, A( OFFPI, I ), A( OFFPI+1, I ), 1,
+            CALL SLARFG( M-OFFPI+1, A( OFFPI, I ), A( OFFPI+1, I ),
+     $                   1,
      $                   TAU( I ) )
          ELSE
             CALL SLARFG( 1, A( M, I ), A( M, I ), 1, TAU( I ) )
@@ -218,11 +216,8 @@ SUBROUTINE SLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
 *
 *           Apply H(i)**T to A(offset+i:m,i+1:n) from the left.
 *
-            AII = A( OFFPI, I )
-            A( OFFPI, I ) = ONE
-            CALL SLARF( 'Left', M-OFFPI+1, N-I, A( OFFPI, I ), 1,
-     $                  TAU( I ), A( OFFPI, I+1 ), LDA, WORK( 1 ) )
-            A( OFFPI, I ) = AII
+            CALL SLARF1F( 'Left', M-OFFPI+1, N-I, A( OFFPI, I ), 1,
+     $                    TAU( I ), A( OFFPI, I+1 ), LDA, WORK( 1 ) )
          END IF
 *
 *        Update partial column norms.
diff --git a/SRC/slaqp2rk.f b/SRC/slaqp2rk.f
new file mode 100644
index 0000000000..619083358c
--- /dev/null
+++ b/SRC/slaqp2rk.f
@@ -0,0 +1,700 @@
+*> \brief \b SLAQP2RK computes truncated QR factorization with column pivoting of a real matrix block using Level 2 BLAS and overwrites a real m-by-nrhs matrix B with Q**T * B.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download SLAQP2RK + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqp2rk.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/slaqp2rk.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqp2rk.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*      SUBROUTINE SLAQP2RK( M, N, NRHS, IOFFSET, KMAX, ABSTOL, RELTOL,
+*     $                     KP1, MAXC2NRM, A, LDA, K, MAXC2NRMK,
+*     $                     RELMAXC2NRMK, JPIV, TAU, VN1, VN2, WORK,
+*     $                     INFO )
+*      IMPLICIT NONE
+*
+*     .. Scalar Arguments ..
+*      INTEGER            INFO, IOFFSET, KP1, K, KMAX, LDA, M, N, NRHS
+*      REAL               ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+*     $                   RELTOL
+*     ..
+*     .. Array Arguments ..
+*      INTEGER            JPIV( * )
+*      REAL               A( LDA, * ), TAU( * ), VN1( * ), VN2( * ),
+*     $                   WORK( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> SLAQP2RK computes a truncated (rank K) or full rank Householder QR
+*> factorization with column pivoting of a real matrix
+*> block A(IOFFSET+1:M,1:N) as
+*>
+*>   A * P(K) = Q(K) * R(K).
+*>
+*> The routine uses Level 2 BLAS. The block A(1:IOFFSET,1:N)
+*> is accordingly pivoted, but not factorized.
+*>
+*> The routine also overwrites the right-hand-sides matrix block B
+*> stored in A(IOFFSET+1:M,N+1:N+NRHS) with Q(K)**T * B.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of
+*>          columns of the matrix B. NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] IOFFSET
+*> \verbatim
+*>          IOFFSET is INTEGER
+*>          The number of rows of the matrix A that must be pivoted
+*>          but not factorized. IOFFSET >= 0.
+*>
+*>          IOFFSET also represents the number of columns of the whole
+*>          original matrix A_orig that have been factorized
+*>          in the previous steps.
+*> \endverbatim
+*>
+*> \param[in] KMAX
+*> \verbatim
+*>          KMAX is INTEGER
+*>
+*>          The first factorization stopping criterion. KMAX >= 0.
+*>
+*>          The maximum number of columns of the matrix A to factorize,
+*>          i.e. the maximum factorization rank.
+*>
+*>          a) If KMAX >= min(M-IOFFSET,N), then this stopping
+*>                criterion is not used, factorize columns
+*>                depending on ABSTOL and RELTOL.
+*>
+*>          b) If KMAX = 0, then this stopping criterion is
+*>             satisfied on input and the routine exits immediately.
+*>             This means that the factorization is not performed,
+*>             the matrices A and B and the arrays TAU, IPIV
+*>             are not modified.
+*> \endverbatim
+*>
+*> \param[in] ABSTOL
+*> \verbatim
+*>          ABSTOL is DOUBLE PRECISION, cannot be NaN.
+*>
+*>          The second factorization stopping criterion.
+*>
+*>          The absolute tolerance (stopping threshold) for
+*>          maximum column 2-norm of the residual matrix.
+*>          The algorithm converges (stops the factorization) when
+*>          the maximum column 2-norm of the residual matrix
+*>          is less than or equal to ABSTOL.
+*>
+*>          a) If ABSTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on KMAX and RELTOL.
+*>                This includes the case ABSTOL = -Inf.
+*>
+*>          b) If 0.0 <= ABSTOL then the input value
+*>                of ABSTOL is used.
+*> \endverbatim
+*>
+*> \param[in] RELTOL
+*> \verbatim
+*>          RELTOL is DOUBLE PRECISION, cannot be NaN.
+*>
+*>          The third factorization stopping criterion.
+*>
+*>          The tolerance (stopping threshold) for the ratio of the
+*>          maximum column 2-norm of the residual matrix to the maximum
+*>          column 2-norm of the original matrix A_orig. The algorithm
+*>          converges (stops the factorization), when this ratio is
+*>          less than or equal to RELTOL.
+*>
+*>          a) If RELTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on KMAX and ABSTOL.
+*>                This includes the case RELTOL = -Inf.
+*>
+*>          d) If 0.0 <= RELTOL then the input value of RELTOL
+*>                is used.
+*> \endverbatim
+*>
+*> \param[in] KP1
+*> \verbatim
+*>          KP1 is INTEGER
+*>          The index of the column with the maximum 2-norm in
+*>          the whole original matrix A_orig determined in the
+*>          main routine SGEQP3RK. 1 <= KP1 <= N_orig_mat.
+*> \endverbatim
+*>
+*> \param[in] MAXC2NRM
+*> \verbatim
+*>          MAXC2NRM is DOUBLE PRECISION
+*>          The maximum column 2-norm of the whole original
+*>          matrix A_orig computed in the main routine SGEQP3RK.
+*>          MAXC2NRM >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is REAL array, dimension (LDA,N+NRHS)
+*>          On entry:
+*>              the M-by-N matrix A and M-by-NRHS matrix B, as in
+*>
+*>                                  N     NRHS
+*>              array_A   =   M  [ mat_A, mat_B ]
+*>
+*>          On exit:
+*>          1. The elements in block A(IOFFSET+1:M,1:K) below
+*>             the diagonal together with the array TAU represent
+*>             the orthogonal matrix Q(K) as a product of elementary
+*>             reflectors.
+*>          2. The upper triangular block of the matrix A stored
+*>             in A(IOFFSET+1:M,1:K) is the triangular factor obtained.
+*>          3. The block of the matrix A stored in A(1:IOFFSET,1:N)
+*>             has been accordingly pivoted, but not factorized.
+*>          4. The rest of the array A, block A(IOFFSET+1:M,K+1:N+NRHS).
+*>             The left part A(IOFFSET+1:M,K+1:N) of this block
+*>             contains the residual of the matrix A, and,
+*>             if NRHS > 0, the right part of the block
+*>             A(IOFFSET+1:M,N+1:N+NRHS) contains the block of
+*>             the right-hand-side matrix B. Both these blocks have been
+*>             updated by multiplication from the left by Q(K)**T.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] K
+*> \verbatim
+*>          K is INTEGER
+*>          Factorization rank of the matrix A, i.e. the rank of
+*>          the factor R, which is the same as the number of non-zero
+*>          rows of the factor R. 0 <= K <= min(M-IOFFSET,KMAX,N).
+*>
+*>          K also represents the number of non-zero Householder
+*>          vectors.
+*> \endverbatim
+*>
+*> \param[out] MAXC2NRMK
+*> \verbatim
+*>          MAXC2NRMK is DOUBLE PRECISION
+*>          The maximum column 2-norm of the residual matrix,
+*>          when the factorization stopped at rank K. MAXC2NRMK >= 0.
+*> \endverbatim
+*>
+*> \param[out] RELMAXC2NRMK
+*> \verbatim
+*>          RELMAXC2NRMK is DOUBLE PRECISION
+*>          The ratio MAXC2NRMK / MAXC2NRM of the maximum column
+*>          2-norm of the residual matrix (when the factorization
+*>          stopped at rank K) to the maximum column 2-norm of the
+*>          whole original matrix A. RELMAXC2NRMK >= 0.
+*> \endverbatim
+*>
+*> \param[out] JPIV
+*> \verbatim
+*>          JPIV is INTEGER array, dimension (N)
+*>          Column pivot indices, for 1 <= j <= N, column j
+*>          of the matrix A was interchanged with column JPIV(j).
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is REAL array, dimension (min(M-IOFFSET,N))
+*>          The scalar factors of the elementary reflectors.
+*> \endverbatim
+*>
+*> \param[in,out] VN1
+*> \verbatim
+*>          VN1 is REAL array, dimension (N)
+*>          The vector with the partial column norms.
+*> \endverbatim
+*>
+*> \param[in,out] VN2
+*> \verbatim
+*>          VN2 is REAL array, dimension (N)
+*>          The vector with the exact column norms.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is REAL array, dimension (N-1)
+*>          Used in SLARF1F subroutine to apply an elementary
+*>          reflector from the left.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          1) INFO = 0: successful exit.
+*>          2) If INFO = j_1, where 1 <= j_1 <= N, then NaN was
+*>             detected and the routine stops the computation.
+*>             The j_1-th column of the matrix A or the j_1-th
+*>             element of array TAU contains the first occurrence
+*>             of NaN in the factorization step K+1 ( when K columns
+*>             have been factorized ).
+*>
+*>             On exit:
+*>             K                  is set to the number of
+*>                                   factorized columns without
+*>                                   exception.
+*>             MAXC2NRMK          is set to NaN.
+*>             RELMAXC2NRMK       is set to NaN.
+*>             TAU(K+1:min(M,N))  is not set and contains undefined
+*>                                   elements. If j_1=K+1, TAU(K+1)
+*>                                   may contain NaN.
+*>          3) If INFO = j_2, where N+1 <= j_2 <= 2*N, then no NaN
+*>             was detected, but +Inf (or -Inf) was detected and
+*>             the routine continues the computation until completion.
+*>             The (j_2-N)-th column of the matrix A contains the first
+*>             occurrence of +Inf (or -Inf) in the factorization
+*>             step K+1 ( when K columns have been factorized ).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup laqp2rk
+*
+*> \par References:
+*  ================
+*> [1] A Level 3 BLAS QR factorization algorithm with column pivoting developed in 1996.
+*> G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain.
+*> X. Sun, Computer Science Dept., Duke University, USA.
+*> C. H. Bischof, Math. and Comp. Sci. Div., Argonne National Lab, USA.
+*> A BLAS-3 version of the QR factorization with column pivoting.
+*> LAPACK Working Note 114
+*> <a href="https://www.netlib.org/lapack/lawnspdf/lawn114.pdf">https://www.netlib.org/lapack/lawnspdf/lawn114.pdf</a>
+*> and in
+*> SIAM J. Sci. Comput., 19(5):1486-1494, Sept. 1998.
+*> <a href="https://doi.org/10.1137/S1064827595296732">https://doi.org/10.1137/S1064827595296732</a>
+*>
+*> [2] A partial column norm updating strategy developed in 2006.
+*> Z. Drmac and Z. Bujanovic, Dept. of Math., University of Zagreb, Croatia.
+*> On the failure of rank revealing QR factorization software – a case study.
+*> LAPACK Working Note 176.
+*> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">http://www.netlib.org/lapack/lawnspdf/lawn176.pdf</a>
+*> and in
+*> ACM Trans. Math. Softw. 35, 2, Article 12 (July 2008), 28 pages.
+*> <a href="https://doi.org/10.1145/1377612.1377616">https://doi.org/10.1145/1377612.1377616</a>
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
+*>
+*>  November  2023, Igor Kozachenko, James Demmel,
+*>                  EECS Department,
+*>                  University of California, Berkeley, USA.
+*>
+*> \endverbatim
+*
+*  =====================================================================
+      SUBROUTINE SLAQP2RK( M, N, NRHS, IOFFSET, KMAX, ABSTOL, RELTOL,
+     $                     KP1, MAXC2NRM, A, LDA, K, MAXC2NRMK,
+     $                     RELMAXC2NRMK, JPIV, TAU, VN1, VN2, WORK,
+     $                     INFO )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            INFO, IOFFSET, KP1, K, KMAX, LDA, M, N, NRHS
+      REAL               ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+     $                   RELTOL
+*     ..
+*     .. Array Arguments ..
+      INTEGER            JPIV( * )
+      REAL               A( LDA, * ), TAU( * ), VN1( * ), VN2( * ),
+     $                   WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      REAL               ZERO, ONE
+      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, ITEMP, J, JMAXC2NRM, KK, KP, MINMNFACT,
+     $                   MINMNUPDT
+      REAL               HUGEVAL, TEMP, TEMP2, TOL3Z
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           SLARF1F, SLARFG, SSWAP
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, MIN, SQRT
+*     ..
+*     .. External Functions ..
+      LOGICAL            SISNAN
+      INTEGER            ISAMAX
+      REAL               SLAMCH, SNRM2
+      EXTERNAL           SISNAN, SLAMCH, ISAMAX, SNRM2
+*     ..
+*     .. Executable Statements ..
+*
+*     Initialize INFO
+*
+      INFO = 0
+*
+*     MINMNFACT in the smallest dimension of the submatrix
+*     A(IOFFSET+1:M,1:N) to be factorized.
+*
+*     MINMNUPDT is the smallest dimension
+*     of the subarray A(IOFFSET+1:M,1:N+NRHS) to be udated, which
+*     contains the submatrices A(IOFFSET+1:M,1:N) and
+*     B(IOFFSET+1:M,1:NRHS) as column blocks.
+*
+      MINMNFACT = MIN( M-IOFFSET, N )
+      MINMNUPDT = MIN( M-IOFFSET, N+NRHS )
+      KMAX = MIN( KMAX, MINMNFACT )
+      TOL3Z = SQRT( SLAMCH( 'Epsilon' ) )
+      HUGEVAL = SLAMCH( 'Overflow' )
+*
+*     Compute the factorization, KK is the lomn loop index.
+*
+      DO KK = 1, KMAX
+*
+         I = IOFFSET + KK
+*
+         IF( I.EQ.1 ) THEN
+*
+*           ============================================================
+*
+*           We are at the first column of the original whole matrix A,
+*           therefore we use the computed KP1 and MAXC2NRM from the
+*           main routine.
+*
+
+            KP = KP1
+*
+*           ============================================================
+*
+         ELSE
+*
+*           ============================================================
+*
+*           Determine the pivot column in KK-th step, i.e. the index
+*           of the column with the maximum 2-norm in the
+*           submatrix A(I:M,K:N).
+*
+            KP = ( KK-1 ) + ISAMAX( N-KK+1, VN1( KK ), 1 )
+*
+*           Determine the maximum column 2-norm and the relative maximum
+*           column 2-norm of the submatrix A(I:M,KK:N) in step KK.
+*           RELMAXC2NRMK  will be computed later, after somecondition
+*           checks on MAXC2NRMK.
+*
+            MAXC2NRMK = VN1( KP )
+*
+*           ============================================================
+*
+*           Check if the submatrix A(I:M,KK:N) contains NaN, and set
+*           INFO parameter to the column number, where the first NaN
+*           is found and return from the routine.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( SISNAN( MAXC2NRMK ) ) THEN
+*
+*              Set K, the number of factorized columns.
+*              that are not zero.
+*
+                K = KK - 1
+                INFO = K + KP
+*
+*               Set RELMAXC2NRMK to NaN.
+*
+                RELMAXC2NRMK = MAXC2NRMK
+*
+*               Array TAU(K+1:MINMNFACT) is not set and contains
+*               undefined elements.
+*
+               RETURN
+            END IF
+*
+*           ============================================================
+*
+*           Quick return, if the submatrix A(I:M,KK:N) is
+*           a zero matrix.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( MAXC2NRMK.EQ.ZERO ) THEN
+*
+*              Set K, the number of factorized columns.
+*              that are not zero.
+*
+               K = KK - 1
+               RELMAXC2NRMK = ZERO
+*
+*              Set TAUs corresponding to the columns that were not
+*              factorized to ZERO, i.e. set TAU(KK:MINMNFACT) to ZERO.
+*
+               DO J = KK, MINMNFACT
+                  TAU( J ) = ZERO
+               END DO
+*
+*              Return from the routine.
+*
+               RETURN
+*
+            END IF
+*
+*           ============================================================
+*
+*           Check if the submatrix A(I:M,KK:N) contains Inf,
+*           set INFO parameter to the column number, where
+*           the first Inf is found plus N, and continue
+*           the computation.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( INFO.EQ.0 .AND. MAXC2NRMK.GT.HUGEVAL ) THEN
+               INFO = N + KK - 1 + KP
+            END IF
+*
+*           ============================================================
+*
+*           Test for the second and third stopping criteria.
+*           NOTE: There is no need to test for ABSTOL >= ZERO, since
+*           MAXC2NRMK is non-negative. Similarly, there is no need
+*           to test for RELTOL >= ZERO, since RELMAXC2NRMK is
+*           non-negative.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+
+            RELMAXC2NRMK =  MAXC2NRMK / MAXC2NRM
+*
+            IF( MAXC2NRMK.LE.ABSTOL .OR. RELMAXC2NRMK.LE.RELTOL ) THEN
+*
+*              Set K, the number of factorized columns.
+*
+               K = KK - 1
+*
+*              Set TAUs corresponding to the columns that were not
+*              factorized to ZERO, i.e. set TAU(KK:MINMNFACT) to ZERO.
+*
+               DO J = KK, MINMNFACT
+                  TAU( J ) = ZERO
+               END DO
+*
+*              Return from the routine.
+*
+               RETURN
+*
+            END IF
+*
+*           ============================================================
+*
+*           End ELSE of IF(I.EQ.1)
+*
+         END IF
+*
+*        ===============================================================
+*
+*        If the pivot column is not the first column of the
+*        subblock A(1:M,KK:N):
+*        1) swap the KK-th column and the KP-th pivot column
+*           in A(1:M,1:N);
+*        2) copy the KK-th element into the KP-th element of the partial
+*           and exact 2-norm vectors VN1 and VN2. ( Swap is not needed
+*           for VN1 and VN2 since we use the element with the index
+*           larger than KK in the next loop step.)
+*        3) Save the pivot interchange with the indices relative to the
+*           the original matrix A, not the block A(1:M,1:N).
+*
+         IF( KP.NE.KK ) THEN
+            CALL SSWAP( M, A( 1, KP ), 1, A( 1, KK ), 1 )
+            VN1( KP ) = VN1( KK )
+            VN2( KP ) = VN2( KK )
+            ITEMP = JPIV( KP )
+            JPIV( KP ) = JPIV( KK )
+            JPIV( KK ) = ITEMP
+         END IF
+*
+*        Generate elementary reflector H(KK) using the column A(I:M,KK),
+*        if the column has more than one element, otherwise
+*        the elementary reflector would be an identity matrix,
+*        and TAU(KK) = ZERO.
+*
+         IF( I.LT.M ) THEN
+            CALL SLARFG( M-I+1, A( I, KK ), A( I+1, KK ), 1,
+     $                   TAU( KK ) )
+         ELSE
+            TAU( KK ) = ZERO
+         END IF
+*
+*        Check if TAU(KK) contains NaN, set INFO parameter
+*        to the column number where NaN is found and return from
+*        the routine.
+*        NOTE: There is no need to check TAU(KK) for Inf,
+*        since SLARFG cannot produce TAU(KK) or Householder vector
+*        below the diagonal containing Inf. Only BETA on the diagonal,
+*        returned by SLARFG can contain Inf, which requires
+*        TAU(KK) to contain NaN. Therefore, this case of generating Inf
+*        by SLARFG is covered by checking TAU(KK) for NaN.
+*
+         IF( SISNAN( TAU(KK) ) ) THEN
+            K = KK - 1
+            INFO = KK
+*
+*           Set MAXC2NRMK and  RELMAXC2NRMK to NaN.
+*
+            MAXC2NRMK = TAU( KK )
+            RELMAXC2NRMK = TAU( KK )
+*
+*           Array TAU(KK:MINMNFACT) is not set and contains
+*           undefined elements, except the first element TAU(KK) = NaN.
+*
+            RETURN
+         END IF
+*
+*        Apply H(KK)**T to A(I:M,KK+1:N+NRHS) from the left.
+*        ( If M >= N, then at KK = N there is no residual matrix,
+*         i.e. no columns of A to update, only columns of B.
+*         If M < N, then at KK = M-IOFFSET, I = M and we have a
+*         one-row residual matrix in A and the elementary
+*         reflector is a unit matrix, TAU(KK) = ZERO, i.e. no update
+*         is needed for the residual matrix in A and the
+*         right-hand-side-matrix in B.
+*         Therefore, we update only if
+*         KK < MINMNUPDT = min(M-IOFFSET, N+NRHS)
+*         condition is satisfied, not only KK < N+NRHS )
+*
+         IF( KK.LT.MINMNUPDT ) THEN
+            CALL SLARF1F( 'Left', M-I+1, N+NRHS-KK, A( I, KK ), 1,
+     $                    TAU( KK ), A( I, KK+1 ), LDA, WORK( 1 ) )
+         END IF
+*
+         IF( KK.LT.MINMNFACT ) THEN
+*
+*           Update the partial column 2-norms for the residual matrix,
+*           only if the residual matrix A(I+1:M,KK+1:N) exists, i.e.
+*           when KK < min(M-IOFFSET, N).
+*
+            DO J = KK + 1, N
+               IF( VN1( J ).NE.ZERO ) THEN
+*
+*                 NOTE: The following lines follow from the analysis in
+*                 Lapack Working Note 176.
+*
+                  TEMP = ONE - ( ABS( A( I, J ) ) / VN1( J ) )**2
+                  TEMP = MAX( TEMP, ZERO )
+                  TEMP2 = TEMP*( VN1( J ) / VN2( J ) )**2
+                  IF( TEMP2 .LE. TOL3Z ) THEN
+*
+*                    Compute the column 2-norm for the partial
+*                    column A(I+1:M,J) by explicitly computing it,
+*                    and store it in both partial 2-norm vector VN1
+*                    and exact column 2-norm vector VN2.
+*
+                     VN1( J ) = SNRM2( M-I, A( I+1, J ), 1 )
+                     VN2( J ) = VN1( J )
+*
+                  ELSE
+*
+*                    Update the column 2-norm for the partial
+*                    column A(I+1:M,J) by removing one
+*                    element A(I,J) and store it in partial
+*                    2-norm vector VN1.
+*
+                     VN1( J ) = VN1( J )*SQRT( TEMP )
+*
+                  END IF
+               END IF
+            END DO
+*
+         END IF
+*
+*     End factorization loop
+*
+      END DO
+*
+*     If we reached this point, all colunms have been factorized,
+*     i.e. no condition was triggered to exit the routine.
+*     Set the number of factorized columns.
+*
+      K = KMAX
+*
+*     We reached the end of the loop, i.e. all KMAX columns were
+*     factorized, we need to set MAXC2NRMK and RELMAXC2NRMK before
+*     we return.
+*
+      IF( K.LT.MINMNFACT ) THEN
+*
+         JMAXC2NRM = K + ISAMAX( N-K, VN1( K+1 ), 1 )
+         MAXC2NRMK = VN1( JMAXC2NRM )
+*
+         IF( K.EQ.0 ) THEN
+            RELMAXC2NRMK = ONE
+         ELSE
+            RELMAXC2NRMK = MAXC2NRMK / MAXC2NRM
+         END IF
+*
+      ELSE
+         MAXC2NRMK = ZERO
+         RELMAXC2NRMK = ZERO
+      END IF
+*
+*     We reached the end of the loop, i.e. all KMAX columns were
+*     factorized, set TAUs corresponding to the columns that were
+*     not factorized to ZERO, i.e. TAU(K+1:MINMNFACT) set to ZERO.
+*
+      DO J = K + 1, MINMNFACT
+         TAU( J ) = ZERO
+      END DO
+*
+      RETURN
+*
+*     End of SLAQP2RK
+*
+      END
diff --git a/SRC/slaqp3rk.f b/SRC/slaqp3rk.f
new file mode 100644
index 0000000000..7c8edbac2c
--- /dev/null
+++ b/SRC/slaqp3rk.f
@@ -0,0 +1,925 @@
+*> \brief \b SLAQP3RK computes a step of truncated QR factorization with column pivoting of a real m-by-n matrix A using Level 3 BLAS and overwrites a real m-by-nrhs matrix B with Q**T * B.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download SLAQP3RK + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqp3rk.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/slaqp3rk.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqp3rk.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*      SUBROUTINE SLAQP3RK( M, N, NRHS, IOFFSET, NB, ABSTOL,
+*     $                     RELTOL, KP1, MAXC2NRM, A, LDA, DONE, KB,
+*     $                     MAXC2NRMK, RELMAXC2NRMK, JPIV, TAU,
+*     $                     VN1, VN2, AUXV, F, LDF, IWORK, INFO )
+*      IMPLICIT NONE
+*      LOGICAL            DONE
+*      INTEGER            INFO, IOFFSET, KB, KP1, LDA, LDF, M, N,
+*     $                   NB, NRHS
+*      REAL               ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+*     $                   RELTOL
+*
+*     .. Scalar Arguments ..
+*      LOGICAL            DONE
+*      INTEGER            KB, LDA, LDF, M, N, NB, NRHS, IOFFSET
+*      REAL               ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+*     $                   RELTOL
+*     ..
+*     .. Array Arguments ..
+*      INTEGER            IWORK( * ), JPIV( * )
+*      REAL               A( LDA, * ), AUXV( * ), F( LDF, * ), TAU( * ),
+*     $                   VN1( * ), VN2( * )
+*     ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> SLAQP3RK computes a step of truncated QR factorization with column
+*> pivoting of a real M-by-N matrix A block A(IOFFSET+1:M,1:N)
+*> by using Level 3 BLAS as
+*>
+*>   A * P(KB) = Q(KB) * R(KB).
+*>
+*> The routine tries to factorize NB columns from A starting from
+*> the row IOFFSET+1 and updates the residual matrix with BLAS 3
+*> xGEMM. The number of actually factorized columns is returned
+*> is smaller than NB.
+*>
+*> Block A(1:IOFFSET,1:N) is accordingly pivoted, but not factorized.
+*>
+*> The routine also overwrites the right-hand-sides B matrix stored
+*> in A(IOFFSET+1:M,1:N+1:N+NRHS) with Q(KB)**T * B.
+*>
+*> Cases when the number of factorized columns KB < NB:
+*>
+*> (1) In some cases, due to catastrophic cancellations, it cannot
+*> factorize all NB columns and need to update the residual matrix.
+*> Hence, the actual number of factorized columns in the block returned
+*> in KB is smaller than NB. The logical DONE is returned as FALSE.
+*> The factorization of the whole original matrix A_orig must proceed
+*> with the next block.
+*>
+*> (2) Whenever the stopping criterion ABSTOL or RELTOL is satisfied,
+*> the factorization of the whole original matrix A_orig is stopped,
+*> the logical DONE is returned as TRUE. The number of factorized
+*> columns which is smaller than NB is returned in KB.
+*>
+*> (3) In case both stopping criteria ABSTOL or RELTOL are not used,
+*> and when the residual matrix is a zero matrix in some factorization
+*> step KB, the factorization of the whole original matrix A_orig is
+*> stopped, the logical DONE is returned as TRUE. The number of
+*> factorized columns which is smaller than NB is returned in KB.
+*>
+*> (4) Whenever NaN is detected in the matrix A or in the array TAU,
+*> the factorization of the whole original matrix A_orig is stopped,
+*> the logical DONE is returned as TRUE. The number of factorized
+*> columns which is smaller than NB is returned in KB. The INFO
+*> parameter is set to the column index of the first NaN occurrence.
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A. N >= 0
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of
+*>          columns of the matrix B. NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] IOFFSET
+*> \verbatim
+*>          IOFFSET is INTEGER
+*>          The number of rows of the matrix A that must be pivoted
+*>          but not factorized. IOFFSET >= 0.
+*>
+*>          IOFFSET also represents the number of columns of the whole
+*>          original matrix A_orig that have been factorized
+*>          in the previous steps.
+*> \endverbatim
+*>
+*> \param[in] NB
+*> \verbatim
+*>          NB is INTEGER
+*>          Factorization block size, i.e the number of columns
+*>          to factorize in the matrix A. 0 <= NB
+*>
+*>          If NB = 0, then the routine exits immediately.
+*>             This means that the factorization is not performed,
+*>             the matrices A and B and the arrays TAU, IPIV
+*>             are not modified.
+*> \endverbatim
+*>
+*> \param[in] ABSTOL
+*> \verbatim
+*>          ABSTOL is REAL, cannot be NaN.
+*>
+*>          The absolute tolerance (stopping threshold) for
+*>          maximum column 2-norm of the residual matrix.
+*>          The algorithm converges (stops the factorization) when
+*>          the maximum column 2-norm of the residual matrix
+*>          is less than or equal to ABSTOL.
+*>
+*>          a) If ABSTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on NB and RELTOL.
+*>                This includes the case ABSTOL = -Inf.
+*>
+*>          b) If 0.0 <= ABSTOL then the input value
+*>                of ABSTOL is used.
+*> \endverbatim
+*>
+*> \param[in] RELTOL
+*> \verbatim
+*>          RELTOL is REAL, cannot be NaN.
+*>
+*>          The tolerance (stopping threshold) for the ratio of the
+*>          maximum column 2-norm of the residual matrix to the maximum
+*>          column 2-norm of the original matrix A_orig. The algorithm
+*>          converges (stops the factorization), when this ratio is
+*>          less than or equal to RELTOL.
+*>
+*>          a) If RELTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on NB and ABSTOL.
+*>                This includes the case RELTOL = -Inf.
+*>
+*>          d) If 0.0 <= RELTOL then the input value of RELTOL
+*>                is used.
+*> \endverbatim
+*>
+*> \param[in] KP1
+*> \verbatim
+*>          KP1 is INTEGER
+*>          The index of the column with the maximum 2-norm in
+*>          the whole original matrix A_orig determined in the
+*>          main routine SGEQP3RK. 1 <= KP1 <= N_orig.
+*> \endverbatim
+*>
+*> \param[in] MAXC2NRM
+*> \verbatim
+*>          MAXC2NRM is REAL
+*>          The maximum column 2-norm of the whole original
+*>          matrix A_orig computed in the main routine SGEQP3RK.
+*>          MAXC2NRM >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is REAL array, dimension (LDA,N+NRHS)
+*>          On entry:
+*>              the M-by-N matrix A and M-by-NRHS matrix B, as in
+*>
+*>                                  N     NRHS
+*>              array_A   =   M  [ mat_A, mat_B ]
+*>
+*>          On exit:
+*>          1. The elements in block A(IOFFSET+1:M,1:KB) below
+*>             the diagonal together with the array TAU represent
+*>             the orthogonal matrix Q(KB) as a product of elementary
+*>             reflectors.
+*>          2. The upper triangular block of the matrix A stored
+*>             in A(IOFFSET+1:M,1:KB) is the triangular factor obtained.
+*>          3. The block of the matrix A stored in A(1:IOFFSET,1:N)
+*>             has been accordingly pivoted, but not factorized.
+*>          4. The rest of the array A, block A(IOFFSET+1:M,KB+1:N+NRHS).
+*>             The left part A(IOFFSET+1:M,KB+1:N) of this block
+*>             contains the residual of the matrix A, and,
+*>             if NRHS > 0, the right part of the block
+*>             A(IOFFSET+1:M,N+1:N+NRHS) contains the block of
+*>             the right-hand-side matrix B. Both these blocks have been
+*>             updated by multiplication from the left by Q(KB)**T.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] DONE
+*> \verbatim
+*>          DONE is LOGICAL
+*>          TRUE: a) if the factorization completed before processing
+*>                   all min(M-IOFFSET,NB,N) columns due to ABSTOL
+*>                   or RELTOL criterion,
+*>                b) if the factorization completed before processing
+*>                   all min(M-IOFFSET,NB,N) columns due to the
+*>                   residual matrix being a ZERO matrix.
+*>                c) when NaN was detected in the matrix A
+*>                   or in the array TAU.
+*>          FALSE: otherwise.
+*> \endverbatim
+*>
+*> \param[out] KB
+*> \verbatim
+*>          KB is INTEGER
+*>          Factorization rank of the matrix A, i.e. the rank of
+*>          the factor R, which is the same as the number of non-zero
+*>          rows of the factor R.  0 <= KB <= min(M-IOFFSET,NB,N).
+*>
+*>          KB also represents the number of non-zero Householder
+*>          vectors.
+*> \endverbatim
+*>
+*> \param[out] MAXC2NRMK
+*> \verbatim
+*>          MAXC2NRMK is REAL
+*>          The maximum column 2-norm of the residual matrix,
+*>          when the factorization stopped at rank KB. MAXC2NRMK >= 0.
+*> \endverbatim
+*>
+*> \param[out] RELMAXC2NRMK
+*> \verbatim
+*>          RELMAXC2NRMK is REAL
+*>          The ratio MAXC2NRMK / MAXC2NRM of the maximum column
+*>          2-norm of the residual matrix (when the factorization
+*>          stopped at rank KB) to the maximum column 2-norm of the
+*>          original matrix A_orig. RELMAXC2NRMK >= 0.
+*> \endverbatim
+*>
+*> \param[out] JPIV
+*> \verbatim
+*>          JPIV is INTEGER array, dimension (N)
+*>          Column pivot indices, for 1 <= j <= N, column j
+*>          of the matrix A was interchanged with column JPIV(j).
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is REAL array, dimension (min(M-IOFFSET,N))
+*>          The scalar factors of the elementary reflectors.
+*> \endverbatim
+*>
+*> \param[in,out] VN1
+*> \verbatim
+*>          VN1 is REAL array, dimension (N)
+*>          The vector with the partial column norms.
+*> \endverbatim
+*>
+*> \param[in,out] VN2
+*> \verbatim
+*>          VN2 is REAL array, dimension (N)
+*>          The vector with the exact column norms.
+*> \endverbatim
+*>
+*> \param[out] AUXV
+*> \verbatim
+*>          AUXV is REAL array, dimension (NB)
+*>          Auxiliary vector.
+*> \endverbatim
+*>
+*> \param[out] F
+*> \verbatim
+*>          F is REAL array, dimension (LDF,NB)
+*>          Matrix F**T = L*(Y**T)*A.
+*> \endverbatim
+*>
+*> \param[in] LDF
+*> \verbatim
+*>          LDF is INTEGER
+*>          The leading dimension of the array F. LDF >= max(1,N+NRHS).
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (N-1).
+*>          Is a work array. ( IWORK is used to store indices
+*>          of "bad" columns for norm downdating in the residual
+*>          matrix ).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          1) INFO = 0: successful exit.
+*>          2) If INFO = j_1, where 1 <= j_1 <= N, then NaN was
+*>             detected and the routine stops the computation.
+*>             The j_1-th column of the matrix A or the j_1-th
+*>             element of array TAU contains the first occurrence
+*>             of NaN in the factorization step KB+1 ( when KB columns
+*>             have been factorized ).
+*>
+*>             On exit:
+*>             KB                  is set to the number of
+*>                                    factorized columns without
+*>                                    exception.
+*>             MAXC2NRMK           is set to NaN.
+*>             RELMAXC2NRMK        is set to NaN.
+*>             TAU(KB+1:min(M,N))     is not set and contains undefined
+*>                                    elements. If j_1=KB+1, TAU(KB+1)
+*>                                    may contain NaN.
+*>          3) If INFO = j_2, where N+1 <= j_2 <= 2*N, then no NaN
+*>             was detected, but +Inf (or -Inf) was detected and
+*>             the routine continues the computation until completion.
+*>             The (j_2-N)-th column of the matrix A contains the first
+*>             occurrence of +Inf (or -Inf) in the actorization
+*>             step KB+1 ( when KB columns have been factorized ).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup laqp3rk
+*
+*> \par References:
+*  ================
+*> [1] A Level 3 BLAS QR factorization algorithm with column pivoting developed in 1996.
+*> G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain.
+*> X. Sun, Computer Science Dept., Duke University, USA.
+*> C. H. Bischof, Math. and Comp. Sci. Div., Argonne National Lab, USA.
+*> A BLAS-3 version of the QR factorization with column pivoting.
+*> LAPACK Working Note 114
+*> <a href="https://www.netlib.org/lapack/lawnspdf/lawn114.pdf">https://www.netlib.org/lapack/lawnspdf/lawn114.pdf</a>
+*> and in
+*> SIAM J. Sci. Comput., 19(5):1486-1494, Sept. 1998.
+*> <a href="https://doi.org/10.1137/S1064827595296732">https://doi.org/10.1137/S1064827595296732</a>
+*>
+*> [2] A partial column norm updating strategy developed in 2006.
+*> Z. Drmac and Z. Bujanovic, Dept. of Math., University of Zagreb, Croatia.
+*> On the failure of rank revealing QR factorization software – a case study.
+*> LAPACK Working Note 176.
+*> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">http://www.netlib.org/lapack/lawnspdf/lawn176.pdf</a>
+*> and in
+*> ACM Trans. Math. Softw. 35, 2, Article 12 (July 2008), 28 pages.
+*> <a href="https://doi.org/10.1145/1377612.1377616">https://doi.org/10.1145/1377612.1377616</a>
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
+*>
+*>  November  2023, Igor Kozachenko, James Demmel,
+*>                  EECS Department,
+*>                  University of California, Berkeley, USA.
+*>
+*> \endverbatim
+*
+*  =====================================================================
+      SUBROUTINE SLAQP3RK( M, N, NRHS, IOFFSET, NB, ABSTOL,
+     $                     RELTOL, KP1, MAXC2NRM, A, LDA, DONE, KB,
+     $                     MAXC2NRMK, RELMAXC2NRMK, JPIV, TAU,
+     $                     VN1, VN2, AUXV, F, LDF, IWORK, INFO )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      LOGICAL            DONE
+      INTEGER            INFO, IOFFSET, KB, KP1, LDA, LDF, M, N,
+     $                   NB, NRHS
+      REAL               ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+     $                   RELTOL
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IWORK( * ), JPIV( * )
+      REAL               A( LDA, * ), AUXV( * ), F( LDF, * ), TAU( * ),
+     $                   VN1( * ), VN2( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      REAL               ZERO, ONE
+      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            ITEMP, J, K, MINMNFACT, MINMNUPDT,
+     $                   LSTICC, KP, I, IF
+      REAL               AIK, HUGEVAL, TEMP, TEMP2, TOL3Z
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           SGEMM, SGEMV, SLARFG, SSWAP
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, MIN, SQRT
+*     ..
+*     .. External Functions ..
+      LOGICAL            SISNAN
+      INTEGER            ISAMAX
+      REAL               SLAMCH, SNRM2
+      EXTERNAL           SISNAN, SLAMCH, ISAMAX, SNRM2
+*     ..
+*     .. Executable Statements ..
+*
+*     Initialize INFO
+*
+      INFO = 0
+*
+*     MINMNFACT in the smallest dimension of the submatrix
+*     A(IOFFSET+1:M,1:N) to be factorized.
+*
+      MINMNFACT = MIN( M-IOFFSET, N )
+      MINMNUPDT = MIN( M-IOFFSET, N+NRHS )
+      NB = MIN( NB, MINMNFACT )
+      TOL3Z = SQRT( SLAMCH( 'Epsilon' ) )
+      HUGEVAL = SLAMCH( 'Overflow' )
+*
+*     Compute factorization in a while loop over NB columns,
+*     K is the column index in the block A(1:M,1:N).
+*
+      K = 0
+      LSTICC = 0
+      DONE = .FALSE.
+*
+      DO WHILE ( K.LT.NB .AND. LSTICC.EQ.0 )
+         K = K + 1
+         I = IOFFSET + K
+*
+         IF( I.EQ.1 ) THEN
+*
+*           We are at the first column of the original whole matrix A_orig,
+*           therefore we use the computed KP1 and MAXC2NRM from the
+*           main routine.
+*
+            KP = KP1
+*
+         ELSE
+*
+*           Determine the pivot column in K-th step, i.e. the index
+*           of the column with the maximum 2-norm in the
+*           submatrix A(I:M,K:N).
+*
+            KP = ( K-1 ) + ISAMAX( N-K+1, VN1( K ), 1 )
+*
+*           Determine the maximum column 2-norm and the relative maximum
+*           column 2-norm of the submatrix A(I:M,K:N) in step K.
+*
+            MAXC2NRMK = VN1( KP )
+*
+*           ============================================================
+*
+*           Check if the submatrix A(I:M,K:N) contains NaN, set
+*           INFO parameter to the column number, where the first NaN
+*           is found and return from the routine.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( SISNAN( MAXC2NRMK ) ) THEN
+*
+               DONE = .TRUE.
+*
+*              Set KB, the number of factorized partial columns
+*                      that are non-zero in each step in the block,
+*                      i.e. the rank of the factor R.
+*              Set IF, the number of processed rows in the block, which
+*                      is the same as the number of processed rows in
+*                      the original whole matrix A_orig.
+*
+               KB = K - 1
+               IF = I - 1
+               INFO = KB + KP
+*
+*              Set RELMAXC2NRMK to NaN.
+*
+               RELMAXC2NRMK = MAXC2NRMK
+*
+*              There is no need to apply the block reflector to the
+*              residual of the matrix A stored in A(KB+1:M,KB+1:N),
+*              since the submatrix contains NaN and we stop
+*              the computation.
+*              But, we need to apply the block reflector to the residual
+*              right hand sides stored in A(KB+1:M,N+1:N+NRHS), if the
+*              residual right hand sides exist.  This occurs
+*              when ( NRHS != 0 AND KB <= (M-IOFFSET) ):
+*
+*              A(I+1:M,N+1:N+NRHS) := A(I+1:M,N+1:N+NRHS) -
+*                               A(I+1:M,1:KB) * F(N+1:N+NRHS,1:KB)**T.
+
+               IF( NRHS.GT.0 .AND. KB.LT.(M-IOFFSET) ) THEN
+                  CALL SGEMM( 'No transpose', 'Transpose',
+     $                  M-IF, NRHS, KB, -ONE, A( IF+1, 1 ), LDA,
+     $                  F( N+1, 1 ), LDF, ONE, A( IF+1, N+1 ), LDA )
+               END IF
+*
+*              There is no need to recompute the 2-norm of the
+*              difficult columns, since we stop the factorization.
+*
+*              Array TAU(KF+1:MINMNFACT) is not set and contains
+*              undefined elements.
+*
+*              Return from the routine.
+*
+               RETURN
+            END IF
+*
+*           Quick return, if the submatrix A(I:M,K:N) is
+*           a zero matrix. We need to check it only if the column index
+*           (same as row index) is larger than 1, since the condition
+*           for the whole original matrix A_orig is checked in the main
+*           routine.
+*
+            IF( MAXC2NRMK.EQ.ZERO ) THEN
+*
+               DONE = .TRUE.
+*
+*              Set KB, the number of factorized partial columns
+*                      that are non-zero in each step in the block,
+*                      i.e. the rank of the factor R.
+*              Set IF, the number of processed rows in the block, which
+*                      is the same as the number of processed rows in
+*                      the original whole matrix A_orig.
+*
+               KB = K - 1
+               IF = I - 1
+               RELMAXC2NRMK = ZERO
+*
+*              There is no need to apply the block reflector to the
+*              residual of the matrix A stored in A(KB+1:M,KB+1:N),
+*              since the submatrix is zero and we stop the computation.
+*              But, we need to apply the block reflector to the residual
+*              right hand sides stored in A(KB+1:M,N+1:N+NRHS), if the
+*              residual right hand sides exist.  This occurs
+*              when ( NRHS != 0 AND KB <= (M-IOFFSET) ):
+*
+*              A(I+1:M,N+1:N+NRHS) := A(I+1:M,N+1:N+NRHS) -
+*                               A(I+1:M,1:KB) * F(N+1:N+NRHS,1:KB)**T.
+*
+               IF( NRHS.GT.0 .AND. KB.LT.(M-IOFFSET) ) THEN
+                  CALL SGEMM( 'No transpose', 'Transpose',
+     $                  M-IF, NRHS, KB, -ONE, A( IF+1, 1 ), LDA,
+     $                  F( N+1, 1 ), LDF, ONE, A( IF+1, N+1 ), LDA )
+               END IF
+*
+*              There is no need to recompute the 2-norm of the
+*              difficult columns, since we stop the factorization.
+*
+*              Set TAUs corresponding to the columns that were not
+*              factorized to ZERO, i.e. set TAU(KB+1:MINMNFACT) = ZERO,
+*              which is equivalent to seting TAU(K:MINMNFACT) = ZERO.
+*
+               DO J = K, MINMNFACT
+                  TAU( J ) = ZERO
+               END DO
+*
+*              Return from the routine.
+*
+               RETURN
+*
+            END IF
+*
+*           ============================================================
+*
+*           Check if the submatrix A(I:M,K:N) contains Inf,
+*           set INFO parameter to the column number, where
+*           the first Inf is found plus N, and continue
+*           the computation.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( INFO.EQ.0 .AND. MAXC2NRMK.GT.HUGEVAL ) THEN
+               INFO = N + K - 1 + KP
+            END IF
+*
+*           ============================================================
+*
+*           Test for the second and third tolerance stopping criteria.
+*           NOTE: There is no need to test for ABSTOL.GE.ZERO, since
+*           MAXC2NRMK is non-negative. Similarly, there is no need
+*           to test for RELTOL.GE.ZERO, since RELMAXC2NRMK is
+*           non-negative.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            RELMAXC2NRMK =  MAXC2NRMK / MAXC2NRM
+*
+            IF( MAXC2NRMK.LE.ABSTOL .OR. RELMAXC2NRMK.LE.RELTOL ) THEN
+*
+               DONE = .TRUE.
+*
+*              Set KB, the number of factorized partial columns
+*                      that are non-zero in each step in the block,
+*                      i.e. the rank of the factor R.
+*              Set IF, the number of processed rows in the block, which
+*                      is the same as the number of processed rows in
+*                      the original whole matrix A_orig;
+*
+                  KB = K - 1
+                  IF = I - 1
+*
+*              Apply the block reflector to the residual of the
+*              matrix A and the residual of the right hand sides B, if
+*              the residual matrix and and/or the residual of the right
+*              hand sides exist,  i.e. if the submatrix
+*              A(I+1:M,KB+1:N+NRHS) exists.  This occurs when
+*                 KB < MINMNUPDT = min( M-IOFFSET, N+NRHS ):
+*
+*              A(IF+1:M,K+1:N+NRHS) := A(IF+1:M,KB+1:N+NRHS) -
+*                             A(IF+1:M,1:KB) * F(KB+1:N+NRHS,1:KB)**T.
+*
+               IF( KB.LT.MINMNUPDT ) THEN
+                  CALL SGEMM( 'No transpose', 'Transpose',
+     $                  M-IF, N+NRHS-KB, KB,-ONE, A( IF+1, 1 ), LDA,
+     $                  F( KB+1, 1 ), LDF, ONE, A( IF+1, KB+1 ), LDA )
+               END IF
+*
+*              There is no need to recompute the 2-norm of the
+*              difficult columns, since we stop the factorization.
+*
+*              Set TAUs corresponding to the columns that were not
+*              factorized to ZERO, i.e. set TAU(KB+1:MINMNFACT) = ZERO,
+*              which is equivalent to seting TAU(K:MINMNFACT) = ZERO.
+*
+               DO J = K, MINMNFACT
+                  TAU( J ) = ZERO
+               END DO
+*
+*              Return from the routine.
+*
+               RETURN
+*
+            END IF
+*
+*           ============================================================
+*
+*           End ELSE of IF(I.EQ.1)
+*
+         END IF
+*
+*        ===============================================================
+*
+*        If the pivot column is not the first column of the
+*        subblock A(1:M,K:N):
+*        1) swap the K-th column and the KP-th pivot column
+*           in A(1:M,1:N);
+*        2) swap the K-th row and the KP-th row in F(1:N,1:K-1)
+*        3) copy the K-th element into the KP-th element of the partial
+*           and exact 2-norm vectors VN1 and VN2. (Swap is not needed
+*           for VN1 and VN2 since we use the element with the index
+*           larger than K in the next loop step.)
+*        4) Save the pivot interchange with the indices relative to the
+*           the original matrix A_orig, not the block A(1:M,1:N).
+*
+         IF( KP.NE.K ) THEN
+            CALL SSWAP( M, A( 1, KP ), 1, A( 1, K ), 1 )
+            CALL SSWAP( K-1, F( KP, 1 ), LDF, F( K, 1 ), LDF )
+            VN1( KP ) = VN1( K )
+            VN2( KP ) = VN2( K )
+            ITEMP = JPIV( KP )
+            JPIV( KP ) = JPIV( K )
+            JPIV( K ) = ITEMP
+         END IF
+*
+*        Apply previous Householder reflectors to column K:
+*        A(I:M,K) := A(I:M,K) - A(I:M,1:K-1)*F(K,1:K-1)**T.
+*
+         IF( K.GT.1 ) THEN
+            CALL SGEMV( 'No transpose', M-I+1, K-1, -ONE, A( I, 1 ),
+     $                  LDA, F( K, 1 ), LDF, ONE, A( I, K ), 1 )
+         END IF
+*
+*        Generate elementary reflector H(k) using the column A(I:M,K).
+*
+         IF( I.LT.M ) THEN
+            CALL SLARFG( M-I+1, A( I, K ), A( I+1, K ), 1, TAU( K ) )
+         ELSE
+            TAU( K ) = ZERO
+         END IF
+*
+*        Check if TAU(K) contains NaN, set INFO parameter
+*        to the column number where NaN is found and return from
+*        the routine.
+*        NOTE: There is no need to check TAU(K) for Inf,
+*        since SLARFG cannot produce TAU(K) or Householder vector
+*        below the diagonal containing Inf. Only BETA on the diagonal,
+*        returned by SLARFG can contain Inf, which requires
+*        TAU(K) to contain NaN. Therefore, this case of generating Inf
+*        by SLARFG is covered by checking TAU(K) for NaN.
+*
+         IF( SISNAN( TAU(K) ) ) THEN
+*
+            DONE = .TRUE.
+*
+*           Set KB, the number of factorized partial columns
+*                   that are non-zero in each step in the block,
+*                   i.e. the rank of the factor R.
+*           Set IF, the number of processed rows in the block, which
+*                   is the same as the number of processed rows in
+*                   the original whole matrix A_orig.
+*
+            KB = K - 1
+            IF = I - 1
+            INFO = K
+*
+*           Set MAXC2NRMK and  RELMAXC2NRMK to NaN.
+*
+            MAXC2NRMK = TAU( K )
+            RELMAXC2NRMK = TAU( K )
+*
+*           There is no need to apply the block reflector to the
+*           residual of the matrix A stored in A(KB+1:M,KB+1:N),
+*           since the submatrix contains NaN and we stop
+*           the computation.
+*           But, we need to apply the block reflector to the residual
+*           right hand sides stored in A(KB+1:M,N+1:N+NRHS), if the
+*           residual right hand sides exist.  This occurs
+*           when ( NRHS != 0 AND KB <= (M-IOFFSET) ):
+*
+*           A(I+1:M,N+1:N+NRHS) := A(I+1:M,N+1:N+NRHS) -
+*                            A(I+1:M,1:KB) * F(N+1:N+NRHS,1:KB)**T.
+*
+            IF( NRHS.GT.0 .AND. KB.LT.(M-IOFFSET) ) THEN
+               CALL SGEMM( 'No transpose', 'Transpose',
+     $               M-IF, NRHS, KB, -ONE, A( IF+1, 1 ), LDA,
+     $               F( N+1, 1 ), LDF, ONE, A( IF+1, N+1 ), LDA )
+            END IF
+*
+*           There is no need to recompute the 2-norm of the
+*           difficult columns, since we stop the factorization.
+*
+*           Array TAU(KF+1:MINMNFACT) is not set and contains
+*           undefined elements.
+*
+*           Return from the routine.
+*
+            RETURN
+         END IF
+*
+*        ===============================================================
+*
+         AIK = A( I, K )
+         A( I, K ) = ONE
+*
+*        ===============================================================
+*
+*        Compute the current K-th column of F:
+*          1) F(K+1:N,K) := tau(K) * A(I:M,K+1:N)**T * A(I:M,K).
+*
+         IF( K.LT.N+NRHS ) THEN
+            CALL SGEMV( 'Transpose', M-I+1, N+NRHS-K,
+     $                  TAU( K ), A( I, K+1 ), LDA, A( I, K ), 1,
+     $                  ZERO, F( K+1, K ), 1 )
+         END IF
+*
+*           2) Zero out elements above and on the diagonal of the
+*              column K in matrix F, i.e elements F(1:K,K).
+*
+         DO J = 1, K
+            F( J, K ) = ZERO
+         END DO
+*
+*         3) Incremental updating of the K-th column of F:
+*        F(1:N,K) := F(1:N,K) - tau(K) * F(1:N,1:K-1) * A(I:M,1:K-1)**T
+*                    * A(I:M,K).
+*
+         IF( K.GT.1 ) THEN
+            CALL SGEMV( 'Transpose', M-I+1, K-1, -TAU( K ),
+     $                  A( I, 1 ), LDA, A( I, K ), 1, ZERO,
+     $                  AUXV( 1 ), 1 )
+*
+            CALL SGEMV( 'No transpose', N+NRHS, K-1, ONE,
+     $                  F( 1, 1 ), LDF, AUXV( 1 ), 1, ONE,
+     $                  F( 1, K ), 1 )
+         END IF
+*
+*        ===============================================================
+*
+*        Update the current I-th row of A:
+*        A(I,K+1:N+NRHS) := A(I,K+1:N+NRHS)
+*                         - A(I,1:K)*F(K+1:N+NRHS,1:K)**T.
+*
+         IF( K.LT.N+NRHS ) THEN
+            CALL SGEMV( 'No transpose', N+NRHS-K, K, -ONE,
+     $                  F( K+1, 1 ), LDF, A( I, 1 ), LDA, ONE,
+     $                  A( I, K+1 ), LDA )
+         END IF
+*
+         A( I, K ) = AIK
+*
+*        Update the partial column 2-norms for the residual matrix,
+*        only if the residual matrix A(I+1:M,K+1:N) exists, i.e.
+*        when K < MINMNFACT = min( M-IOFFSET, N ).
+*
+         IF( K.LT.MINMNFACT ) THEN
+*
+            DO J = K + 1, N
+               IF( VN1( J ).NE.ZERO ) THEN
+*
+*                 NOTE: The following lines follow from the analysis in
+*                 Lapack Working Note 176.
+*
+                  TEMP = ABS( A( I, J ) ) / VN1( J )
+                  TEMP = MAX( ZERO, ( ONE+TEMP )*( ONE-TEMP ) )
+                  TEMP2 = TEMP*( VN1( J ) / VN2( J ) )**2
+                  IF( TEMP2.LE.TOL3Z ) THEN
+*
+*                    At J-index, we have a difficult column for the
+*                    update of the 2-norm. Save the index of the previous
+*                    difficult column in IWORK(J-1).
+*                    NOTE: ILSTCC > 1, threfore we can use IWORK only
+*                    with N-1 elements, where the elements are
+*                    shifted by 1 to the left.
+*
+                     IWORK( J-1 ) = LSTICC
+*
+*                    Set the index of the last difficult column LSTICC.
+*
+                     LSTICC = J
+*
+                  ELSE
+                     VN1( J ) = VN1( J )*SQRT( TEMP )
+                  END IF
+               END IF
+            END DO
+*
+         END IF
+*
+*        End of while loop.
+*
+      END DO
+*
+*     Now, afler the loop:
+*        Set KB, the number of factorized columns in the block;
+*        Set IF, the number of processed rows in the block, which
+*                is the same as the number of processed rows in
+*                the original whole matrix A_orig, IF = IOFFSET + KB.
+*
+      KB = K
+      IF = I
+*
+*     Apply the block reflector to the residual of the matrix A
+*     and the residual of the right hand sides B, if the residual
+*     matrix and and/or the residual of the right hand sides
+*     exist,  i.e. if the submatrix A(I+1:M,KB+1:N+NRHS) exists.
+*     This occurs when KB < MINMNUPDT = min( M-IOFFSET, N+NRHS ):
+*
+*     A(IF+1:M,K+1:N+NRHS) := A(IF+1:M,KB+1:N+NRHS) -
+*                         A(IF+1:M,1:KB) * F(KB+1:N+NRHS,1:KB)**T.
+*
+      IF( KB.LT.MINMNUPDT ) THEN
+         CALL SGEMM( 'No transpose', 'Transpose',
+     $         M-IF, N+NRHS-KB, KB, -ONE, A( IF+1, 1 ), LDA,
+     $         F( KB+1, 1 ), LDF, ONE, A( IF+1, KB+1 ), LDA )
+      END IF
+*
+*     Recompute the 2-norm of the difficult columns.
+*     Loop over the index of the difficult columns from the largest
+*     to the smallest index.
+*
+      DO WHILE( LSTICC.GT.0 )
+*
+*        LSTICC is the index of the last difficult column is greater
+*        than 1.
+*        ITEMP is the index of the previous difficult column.
+*
+         ITEMP = IWORK( LSTICC-1 )
+*
+*        Compute the 2-norm explicilty for the last difficult column and
+*        save it in the partial and exact 2-norm vectors VN1 and VN2.
+*
+*        NOTE: The computation of VN1( LSTICC ) relies on the fact that
+*        SNRM2 does not fail on vectors with norm below the value of
+*        SQRT(SLAMCH('S'))
+*
+         VN1( LSTICC ) = SNRM2( M-IF, A( IF+1, LSTICC ), 1 )
+         VN2( LSTICC ) = VN1( LSTICC )
+*
+*        Downdate the index of the last difficult column to
+*        the index of the previous difficult column.
+*
+         LSTICC = ITEMP
+*
+      END DO
+*
+      RETURN
+*
+*     End of SLAQP3RK
+*
+      END
diff --git a/SRC/slaqps.f b/SRC/slaqps.f
index 0de94ced33..cf49e5d22a 100644
--- a/SRC/slaqps.f
+++ b/SRC/slaqps.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQPS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqps.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqps.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -150,7 +148,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup laqps
 *
 *> \par Contributors:
 *  ==================
@@ -168,13 +166,13 @@
 *>
 *> LAPACK Working Note 176
 *
-*> \htmlonly
 *> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">[PDF]</a>
-*> \endhtmlonly
 *
 *  =====================================================================
-      SUBROUTINE SLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
+      SUBROUTINE SLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU,
+     $                   VN1,
      $                   VN2, AUXV, F, LDF )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -241,14 +239,16 @@ SUBROUTINE SLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
 *        A(RK:M,K) := A(RK:M,K) - A(RK:M,1:K-1)*F(K,1:K-1)**T.
 *
          IF( K.GT.1 ) THEN
-            CALL SGEMV( 'No transpose', M-RK+1, K-1, -ONE, A( RK, 1 ),
+            CALL SGEMV( 'No transpose', M-RK+1, K-1, -ONE, A( RK,
+     $                  1 ),
      $                  LDA, F( K, 1 ), LDF, ONE, A( RK, K ), 1 )
          END IF
 *
 *        Generate elementary reflector H(k).
 *
          IF( RK.LT.M ) THEN
-            CALL SLARFG( M-RK+1, A( RK, K ), A( RK+1, K ), 1, TAU( K ) )
+            CALL SLARFG( M-RK+1, A( RK, K ), A( RK+1, K ), 1,
+     $                   TAU( K ) )
          ELSE
             CALL SLARFG( 1, A( RK, K ), A( RK, K ), 1, TAU( K ) )
          END IF
@@ -277,7 +277,8 @@ SUBROUTINE SLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
 *                    *A(RK:M,K).
 *
          IF( K.GT.1 ) THEN
-            CALL SGEMV( 'Transpose', M-RK+1, K-1, -TAU( K ), A( RK, 1 ),
+            CALL SGEMV( 'Transpose', M-RK+1, K-1, -TAU( K ), A( RK,
+     $                  1 ),
      $                  LDA, A( RK, K ), 1, ZERO, AUXV( 1 ), 1 )
 *
             CALL SGEMV( 'No transpose', N, K-1, ONE, F( 1, 1 ), LDF,
@@ -288,7 +289,8 @@ SUBROUTINE SLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
 *        A(RK,K+1:N) := A(RK,K+1:N) - A(RK,1:K)*F(K+1:N,1:K)**T.
 *
          IF( K.LT.N ) THEN
-            CALL SGEMV( 'No transpose', N-K, K, -ONE, F( K+1, 1 ), LDF,
+            CALL SGEMV( 'No transpose', N-K, K, -ONE, F( K+1, 1 ),
+     $                  LDF,
      $                  A( RK, 1 ), LDA, ONE, A( RK, K+1 ), LDA )
          END IF
 *
@@ -328,7 +330,8 @@ SUBROUTINE SLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
 *                         A(OFFSET+KB+1:M,1:KB)*F(KB+1:N,1:KB)**T.
 *
       IF( KB.LT.MIN( N, M-OFFSET ) ) THEN
-         CALL SGEMM( 'No transpose', 'Transpose', M-RK, N-KB, KB, -ONE,
+         CALL SGEMM( 'No transpose', 'Transpose', M-RK, N-KB, KB,
+     $               -ONE,
      $               A( RK+1, 1 ), LDA, F( KB+1, 1 ), LDF, ONE,
      $               A( RK+1, KB+1 ), LDA )
       END IF
diff --git a/SRC/slaqr0.f b/SRC/slaqr0.f
index ea533b3bd3..10e5179e05 100644
--- a/SRC/slaqr0.f
+++ b/SRC/slaqr0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQR0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqr0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqr0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -230,7 +228,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup laqr0
 *
 *> \par Contributors:
 *  ==================
@@ -253,6 +251,7 @@
 *  =====================================================================
       SUBROUTINE SLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
      $                   ILOZ, IHIZ, Z, LDZ, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -312,7 +311,8 @@ SUBROUTINE SLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
       REAL               ZDUM( 1, 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLACPY, SLAHQR, SLANV2, SLAQR3, SLAQR4, SLAQR5
+      EXTERNAL           SLACPY, SLAHQR, SLANV2, SLAQR3, SLAQR4,
+     $                   SLAQR5
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, INT, MAX, MIN, MOD, REAL
@@ -515,7 +515,8 @@ SUBROUTINE SLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
 *
 *           ==== Aggressive early deflation ====
 *
-            CALL SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+            CALL SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH,
+     $                   ILOZ,
      $                   IHIZ, Z, LDZ, LS, LD, WR, WI, H( KV, 1 ), LDH,
      $                   NHO, H( KV, KT ), LDH, NVE, H( KWV, 1 ), LDH,
      $                   WORK, LWORK )
@@ -559,7 +560,8 @@ SUBROUTINE SLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
                      BB = SS
                      CC = WILK2*SS
                      DD = AA
-                     CALL SLANV2( AA, BB, CC, DD, WR( I-1 ), WI( I-1 ),
+                     CALL SLANV2( AA, BB, CC, DD, WR( I-1 ),
+     $                            WI( I-1 ),
      $                            WR( I ), WI( I ), CS, SN )
    30             CONTINUE
                   IF( KS.EQ.KTOP ) THEN
diff --git a/SRC/slaqr1.f b/SRC/slaqr1.f
index 59f317b2b2..3479aa00c0 100644
--- a/SRC/slaqr1.f
+++ b/SRC/slaqr1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQR1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqr1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqr1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,7 +106,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup laqr1
 *
 *> \par Contributors:
 *  ==================
@@ -118,6 +116,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLAQR1( N, H, LDH, SR1, SI1, SR2, SI2, V )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slaqr2.f b/SRC/slaqr2.f
index 62c4ef5ebc..9ee1f8b6e2 100644
--- a/SRC/slaqr2.f
+++ b/SRC/slaqr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -263,7 +261,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup laqr2
 *
 *> \par Contributors:
 *  ==================
@@ -272,9 +270,11 @@
 *>       University of Kansas, USA
 *>
 *  =====================================================================
-      SUBROUTINE SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+      SUBROUTINE SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH,
+     $                   ILOZ,
      $                   IHIZ, Z, LDZ, NS, ND, SR, SI, V, LDV, NH, T,
      $                   LDT, NV, WV, LDWV, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -297,7 +297,7 @@ SUBROUTINE SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
       PARAMETER          ( ZERO = 0.0e0, ONE = 1.0e0 )
 *     ..
 *     .. Local Scalars ..
-      REAL               AA, BB, BETA, CC, CS, DD, EVI, EVK, FOO, S,
+      REAL               AA, BB, CC, CS, DD, EVI, EVK, FOO, S,
      $                   SAFMAX, SAFMIN, SMLNUM, SN, TAU, ULP
       INTEGER            I, IFST, ILST, INFO, INFQR, J, JW, K, KCOL,
      $                   KEND, KLN, KROW, KWTOP, LTOP, LWK1, LWK2,
@@ -305,12 +305,14 @@ SUBROUTINE SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
       LOGICAL            BULGE, SORTED
 *     ..
 *     .. External Functions ..
-      REAL               SLAMCH
-      EXTERNAL           SLAMCH
+      REAL               SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           SLAMCH, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEHRD, SGEMM, SLABAD, SLACPY, SLAHQR,
-     $                   SLANV2, SLARF, SLARFG, SLASET, SORMHR, STREXC
+      EXTERNAL           SCOPY, SGEHRD, SGEMM, SLACPY,
+     $                   SLAHQR,
+     $                   SLANV2, SLARF1L, SLARFG, SLASET, SORMHR,
+     $                   STREXC
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, INT, MAX, MIN, REAL, SQRT
@@ -331,7 +333,8 @@ SUBROUTINE SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
 *        ==== Workspace query call to SORMHR ====
 *
-         CALL SORMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V, LDV,
+         CALL SORMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V,
+     $                LDV,
      $                WORK, -1, INFO )
          LWK2 = INT( WORK( 1 ) )
 *
@@ -343,7 +346,7 @@ SUBROUTINE SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *     ==== Quick return in case of workspace query. ====
 *
       IF( LWORK.EQ.-1 ) THEN
-         WORK( 1 ) = REAL( LWKOPT )
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
          RETURN
       END IF
 *
@@ -362,7 +365,6 @@ SUBROUTINE SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
       SAFMIN = SLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULP = SLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( REAL( N ) / ULP )
 *
@@ -402,7 +404,8 @@ SUBROUTINE SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *     .    here and there to keep track.) ====
 *
       CALL SLACPY( 'U', JW, JW, H( KWTOP, KWTOP ), LDH, T, LDT )
-      CALL SCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ), LDT+1 )
+      CALL SCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ),
+     $            LDT+1 )
 *
       CALL SLASET( 'A', JW, JW, ZERO, ONE, V, LDV )
       CALL SLAHQR( .true., .true., JW, 1, JW, T, LDT, SR( KWTOP ),
@@ -449,7 +452,8 @@ SUBROUTINE SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *              .    (STREXC can not fail in this case.) ====
 *
                IFST = NS
-               CALL STREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, WORK,
+               CALL STREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST,
+     $                      WORK,
      $                      INFO )
                ILST = ILST + 1
             END IF
@@ -474,7 +478,8 @@ SUBROUTINE SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *              .    ILST in case of a rare exchange failure. ====
 *
                IFST = NS
-               CALL STREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, WORK,
+               CALL STREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST,
+     $                      WORK,
      $                      INFO )
                ILST = ILST + 2
             END IF
@@ -536,7 +541,8 @@ SUBROUTINE SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
                SORTED = .false.
                IFST = I
                ILST = K
-               CALL STREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, WORK,
+               CALL STREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST,
+     $                      WORK,
      $                      INFO )
                IF( INFO.EQ.0 ) THEN
                   I = ILST
@@ -589,18 +595,17 @@ SUBROUTINE SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *           ==== Reflect spike back into lower triangle ====
 *
             CALL SCOPY( NS, V, LDV, WORK, 1 )
-            BETA = WORK( 1 )
-            CALL SLARFG( NS, BETA, WORK( 2 ), 1, TAU )
-            WORK( 1 ) = ONE
+            CALL SLARFG( NS, WORK( 1 ), WORK( 2 ), 1, TAU )
 *
-            CALL SLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ), LDT )
+            CALL SLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ),
+     $                   LDT )
 *
-            CALL SLARF( 'L', NS, JW, WORK, 1, TAU, T, LDT,
-     $                  WORK( JW+1 ) )
-            CALL SLARF( 'R', NS, NS, WORK, 1, TAU, T, LDT,
-     $                  WORK( JW+1 ) )
-            CALL SLARF( 'R', JW, NS, WORK, 1, TAU, V, LDV,
-     $                  WORK( JW+1 ) )
+            CALL SLARF1F( 'L', NS, JW, WORK, 1, TAU, T, LDT,
+     $                    WORK( JW+1 ) )
+            CALL SLARF1F( 'R', NS, NS, WORK, 1, TAU, T, LDT,
+     $                    WORK( JW+1 ) )
+            CALL SLARF1F( 'R', JW, NS, WORK, 1, TAU, V, LDV,
+     $                    WORK( JW+1 ) )
 *
             CALL SGEHRD( JW, 1, NS, T, LDT, WORK, WORK( JW+1 ),
      $                   LWORK-JW, INFO )
@@ -618,7 +623,8 @@ SUBROUTINE SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *        .    H and Z, if requested.  ====
 *
          IF( NS.GT.1 .AND. S.NE.ZERO )
-     $      CALL SORMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V, LDV,
+     $      CALL SORMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V,
+     $                   LDV,
      $                   WORK( JW+1 ), LWORK-JW, INFO )
 *
 *        ==== Update vertical slab in H ====
@@ -632,7 +638,8 @@ SUBROUTINE SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
             KLN = MIN( NV, KWTOP-KROW )
             CALL SGEMM( 'N', 'N', KLN, JW, JW, ONE, H( KROW, KWTOP ),
      $                  LDH, V, LDV, ZERO, WV, LDWV )
-            CALL SLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ), LDH )
+            CALL SLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ),
+     $                   LDH )
    70    CONTINUE
 *
 *        ==== Update horizontal slab in H ====
@@ -652,7 +659,8 @@ SUBROUTINE SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
          IF( WANTZ ) THEN
             DO 90 KROW = ILOZ, IHIZ, NV
                KLN = MIN( NV, IHIZ-KROW+1 )
-               CALL SGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW, KWTOP ),
+               CALL SGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW,
+     $                     KWTOP ),
      $                     LDZ, V, LDV, ZERO, WV, LDWV )
                CALL SLACPY( 'A', KLN, JW, WV, LDWV, Z( KROW, KWTOP ),
      $                      LDZ )
@@ -674,7 +682,7 @@ SUBROUTINE SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
 *      ==== Return optimal workspace. ====
 *
-      WORK( 1 ) = REAL( LWKOPT )
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
 *     ==== End of SLAQR2 ====
 *
diff --git a/SRC/slaqr3.f b/SRC/slaqr3.f
index 519ccd6ede..f9f8090a3a 100644
--- a/SRC/slaqr3.f
+++ b/SRC/slaqr3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQR3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqr3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqr3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -260,7 +258,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup laqr3
 *
 *> \par Contributors:
 *  ==================
@@ -269,9 +267,11 @@
 *>       University of Kansas, USA
 *>
 *  =====================================================================
-      SUBROUTINE SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+      SUBROUTINE SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH,
+     $                   ILOZ,
      $                   IHIZ, Z, LDZ, NS, ND, SR, SI, V, LDV, NH, T,
      $                   LDT, NV, WV, LDWV, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -294,7 +294,7 @@ SUBROUTINE SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
       PARAMETER          ( ZERO = 0.0e0, ONE = 1.0e0 )
 *     ..
 *     .. Local Scalars ..
-      REAL               AA, BB, BETA, CC, CS, DD, EVI, EVK, FOO, S,
+      REAL               AA, BB, CC, CS, DD, EVI, EVK, FOO, S,
      $                   SAFMAX, SAFMIN, SMLNUM, SN, TAU, ULP
       INTEGER            I, IFST, ILST, INFO, INFQR, J, JW, K, KCOL,
      $                   KEND, KLN, KROW, KWTOP, LTOP, LWK1, LWK2, LWK3,
@@ -302,13 +302,14 @@ SUBROUTINE SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
       LOGICAL            BULGE, SORTED
 *     ..
 *     .. External Functions ..
-      REAL               SLAMCH
+      REAL               SLAMCH, SROUNDUP_LWORK
       INTEGER            ILAENV
-      EXTERNAL           SLAMCH, ILAENV
+      EXTERNAL           SLAMCH, SROUNDUP_LWORK, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEHRD, SGEMM, SLABAD, SLACPY, SLAHQR,
-     $                   SLANV2, SLAQR4, SLARF, SLARFG, SLASET, SORMHR,
+      EXTERNAL           SCOPY, SGEHRD, SGEMM, SLACPY, SLAHQR,
+     $                   SLANV2,
+     $                   SLAQR4, SLARF1F, SLARFG, SLASET, SORMHR,
      $                   STREXC
 *     ..
 *     .. Intrinsic Functions ..
@@ -330,13 +331,15 @@ SUBROUTINE SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
 *        ==== Workspace query call to SORMHR ====
 *
-         CALL SORMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V, LDV,
+         CALL SORMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V,
+     $                LDV,
      $                WORK, -1, INFO )
          LWK2 = INT( WORK( 1 ) )
 *
 *        ==== Workspace query call to SLAQR4 ====
 *
-         CALL SLAQR4( .true., .true., JW, 1, JW, T, LDT, SR, SI, 1, JW,
+         CALL SLAQR4( .true., .true., JW, 1, JW, T, LDT, SR, SI, 1,
+     $                JW,
      $                V, LDV, WORK, -1, INFQR )
          LWK3 = INT( WORK( 1 ) )
 *
@@ -348,7 +351,7 @@ SUBROUTINE SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *     ==== Quick return in case of workspace query. ====
 *
       IF( LWORK.EQ.-1 ) THEN
-         WORK( 1 ) = REAL( LWKOPT )
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
          RETURN
       END IF
 *
@@ -367,7 +370,6 @@ SUBROUTINE SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
       SAFMIN = SLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULP = SLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( REAL( N ) / ULP )
 *
@@ -407,7 +409,8 @@ SUBROUTINE SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *     .    here and there to keep track.) ====
 *
       CALL SLACPY( 'U', JW, JW, H( KWTOP, KWTOP ), LDH, T, LDT )
-      CALL SCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ), LDT+1 )
+      CALL SCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ),
+     $            LDT+1 )
 *
       CALL SLASET( 'A', JW, JW, ZERO, ONE, V, LDV )
       NMIN = ILAENV( 12, 'SLAQR3', 'SV', JW, 1, JW, LWORK )
@@ -460,7 +463,8 @@ SUBROUTINE SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *              .    (STREXC can not fail in this case.) ====
 *
                IFST = NS
-               CALL STREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, WORK,
+               CALL STREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST,
+     $                      WORK,
      $                      INFO )
                ILST = ILST + 1
             END IF
@@ -485,7 +489,8 @@ SUBROUTINE SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *              .    ILST in case of a rare exchange failure. ====
 *
                IFST = NS
-               CALL STREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, WORK,
+               CALL STREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST,
+     $                      WORK,
      $                      INFO )
                ILST = ILST + 2
             END IF
@@ -547,7 +552,8 @@ SUBROUTINE SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
                SORTED = .false.
                IFST = I
                ILST = K
-               CALL STREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, WORK,
+               CALL STREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST,
+     $                      WORK,
      $                      INFO )
                IF( INFO.EQ.0 ) THEN
                   I = ILST
@@ -600,18 +606,17 @@ SUBROUTINE SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *           ==== Reflect spike back into lower triangle ====
 *
             CALL SCOPY( NS, V, LDV, WORK, 1 )
-            BETA = WORK( 1 )
-            CALL SLARFG( NS, BETA, WORK( 2 ), 1, TAU )
-            WORK( 1 ) = ONE
+            CALL SLARFG( NS, WORK( 1 ), WORK( 2 ), 1, TAU )
 *
-            CALL SLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ), LDT )
+            CALL SLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ),
+     $                   LDT )
 *
-            CALL SLARF( 'L', NS, JW, WORK, 1, TAU, T, LDT,
-     $                  WORK( JW+1 ) )
-            CALL SLARF( 'R', NS, NS, WORK, 1, TAU, T, LDT,
-     $                  WORK( JW+1 ) )
-            CALL SLARF( 'R', JW, NS, WORK, 1, TAU, V, LDV,
-     $                  WORK( JW+1 ) )
+            CALL SLARF1F( 'L', NS, JW, WORK, 1, TAU, T, LDT,
+     $                    WORK( JW+1 ) )
+            CALL SLARF1F( 'R', NS, NS, WORK, 1, TAU, T, LDT,
+     $                    WORK( JW+1 ) )
+            CALL SLARF1F( 'R', JW, NS, WORK, 1, TAU, V, LDV,
+     $                    WORK( JW+1 ) )
 *
             CALL SGEHRD( JW, 1, NS, T, LDT, WORK, WORK( JW+1 ),
      $                   LWORK-JW, INFO )
@@ -629,7 +634,8 @@ SUBROUTINE SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *        .    H and Z, if requested.  ====
 *
          IF( NS.GT.1 .AND. S.NE.ZERO )
-     $      CALL SORMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V, LDV,
+     $      CALL SORMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V,
+     $                   LDV,
      $                   WORK( JW+1 ), LWORK-JW, INFO )
 *
 *        ==== Update vertical slab in H ====
@@ -643,7 +649,8 @@ SUBROUTINE SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
             KLN = MIN( NV, KWTOP-KROW )
             CALL SGEMM( 'N', 'N', KLN, JW, JW, ONE, H( KROW, KWTOP ),
      $                  LDH, V, LDV, ZERO, WV, LDWV )
-            CALL SLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ), LDH )
+            CALL SLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ),
+     $                   LDH )
    70    CONTINUE
 *
 *        ==== Update horizontal slab in H ====
@@ -663,7 +670,8 @@ SUBROUTINE SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
          IF( WANTZ ) THEN
             DO 90 KROW = ILOZ, IHIZ, NV
                KLN = MIN( NV, IHIZ-KROW+1 )
-               CALL SGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW, KWTOP ),
+               CALL SGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW,
+     $                     KWTOP ),
      $                     LDZ, V, LDV, ZERO, WV, LDWV )
                CALL SLACPY( 'A', KLN, JW, WV, LDWV, Z( KROW, KWTOP ),
      $                      LDZ )
@@ -685,7 +693,7 @@ SUBROUTINE SLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
 *      ==== Return optimal workspace. ====
 *
-      WORK( 1 ) = REAL( LWKOPT )
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
 *     ==== End of SLAQR3 ====
 *
diff --git a/SRC/slaqr4.f b/SRC/slaqr4.f
index 1f0a51c85f..a4c3009775 100644
--- a/SRC/slaqr4.f
+++ b/SRC/slaqr4.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQR4 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqr4.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqr4.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -239,7 +237,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup laqr4
 *
 *> \par Contributors:
 *  ==================
@@ -262,6 +260,7 @@
 *  =====================================================================
       SUBROUTINE SLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
      $                   ILOZ, IHIZ, Z, LDZ, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -316,16 +315,18 @@ SUBROUTINE SLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Local Arrays ..
       REAL               ZDUM( 1, 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLACPY, SLAHQR, SLANV2, SLAQR2, SLAQR5
+      EXTERNAL           SLACPY, SLAHQR, SLANV2, SLAQR2,
+     $                   SLAQR5
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          ABS, INT, MAX, MIN, MOD, REAL
+      INTRINSIC          ABS, INT, MAX, MIN, MOD
 *     ..
 *     .. Executable Statements ..
       INFO = 0
@@ -401,7 +402,7 @@ SUBROUTINE SLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
 *        ==== Quick return in case of workspace query. ====
 *
          IF( LWORK.EQ.-1 ) THEN
-            WORK( 1 ) = REAL( LWKOPT )
+            WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
             RETURN
          END IF
 *
@@ -525,7 +526,8 @@ SUBROUTINE SLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
 *
 *           ==== Aggressive early deflation ====
 *
-            CALL SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+            CALL SLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH,
+     $                   ILOZ,
      $                   IHIZ, Z, LDZ, LS, LD, WR, WI, H( KV, 1 ), LDH,
      $                   NHO, H( KV, KT ), LDH, NVE, H( KWV, 1 ), LDH,
      $                   WORK, LWORK )
@@ -569,7 +571,8 @@ SUBROUTINE SLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
                      BB = SS
                      CC = WILK2*SS
                      DD = AA
-                     CALL SLANV2( AA, BB, CC, DD, WR( I-1 ), WI( I-1 ),
+                     CALL SLANV2( AA, BB, CC, DD, WR( I-1 ),
+     $                            WI( I-1 ),
      $                            WR( I ), WI( I ), CS, SN )
    30             CONTINUE
                   IF( KS.EQ.KTOP ) THEN
@@ -732,7 +735,7 @@ SUBROUTINE SLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
 *
 *     ==== Return the optimal value of LWORK. ====
 *
-      WORK( 1 ) = REAL( LWKOPT )
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
 *     ==== End of SLAQR4 ====
 *
diff --git a/SRC/slaqr5.f b/SRC/slaqr5.f
index b9bae9376b..aed50f6181 100644
--- a/SRC/slaqr5.f
+++ b/SRC/slaqr5.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQR5 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqr5.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqr5.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -233,7 +231,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup laqr5
 *
 *> \par Contributors:
 *  ==================
@@ -286,8 +284,8 @@ SUBROUTINE SLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *     ..
 *     .. Local Scalars ..
       REAL               ALPHA, BETA, H11, H12, H21, H22, REFSUM,
-     $                   SAFMAX, SAFMIN, SCL, SMLNUM, SWAP, TST1, TST2,
-     $                   ULP
+     $                   SAFMAX, SAFMIN, SCL, SMLNUM, SWAP, T1, T2,
+     $                   T3, TST1, TST2, ULP
       INTEGER            I, I2, I4, INCOL, J, JBOT, JCOL, JLEN,
      $                   JROW, JTOP, K, K1, KDU, KMS, KRCOL,
      $                   M, M22, MBOT, MTOP, NBMPS, NDCOL,
@@ -306,7 +304,7 @@ SUBROUTINE SLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
       REAL               VT( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMM, SLABAD, SLACPY, SLAQR1, SLARFG, SLASET,
+      EXTERNAL           SGEMM, SLACPY, SLAQR1, SLARFG, SLASET,
      $                   STRMM
 *     ..
 *     .. Executable Statements ..
@@ -353,7 +351,6 @@ SUBROUTINE SLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *
       SAFMIN = SLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULP = SLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( REAL( N ) / ULP )
 *
@@ -447,11 +444,12 @@ SUBROUTINE SLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *              ==== Perform update from right within 
 *              .    computational window. ====
 *
+               T1 = V( 1, M22 )
+               T2 = T1*V( 2, M22 )
                DO 30 J = JTOP, MIN( KBOT, K+3 )
-                  REFSUM = V( 1, M22 )*( H( J, K+1 )+V( 2, M22 )*
-     $                     H( J, K+2 ) )
-                  H( J, K+1 ) = H( J, K+1 ) - REFSUM
-                  H( J, K+2 ) = H( J, K+2 ) - REFSUM*V( 2, M22 )
+                  REFSUM = H( J, K+1 ) + V( 2, M22 )*H( J, K+2 )
+                  H( J, K+1 ) = H( J, K+1 ) - REFSUM*T1
+                  H( J, K+2 ) = H( J, K+2 ) - REFSUM*T2
    30          CONTINUE
 *
 *              ==== Perform update from left within 
@@ -464,11 +462,12 @@ SUBROUTINE SLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
                ELSE
                   JBOT = KBOT
                END IF
+               T1 = V( 1, M22 )
+               T2 = T1*V( 2, M22 )
                DO 40 J = K+1, JBOT
-                  REFSUM = V( 1, M22 )*( H( K+1, J )+V( 2, M22 )*
-     $                     H( K+2, J ) )
-                  H( K+1, J ) = H( K+1, J ) - REFSUM
-                  H( K+2, J ) = H( K+2, J ) - REFSUM*V( 2, M22 )
+                  REFSUM = H( K+1, J ) + V( 2, M22 )*H( K+2, J )
+                  H( K+1, J ) = H( K+1, J ) - REFSUM*T1
+                  H( K+2, J ) = H( K+2, J ) - REFSUM*T2
    40          CONTINUE
 *
 *              ==== The following convergence test requires that
@@ -522,18 +521,20 @@ SUBROUTINE SLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *
                IF( ACCUM ) THEN
                   KMS = K - INCOL
+                  T1 = V( 1, M22 )
+                  T2 = T1*V( 2, M22 )
                   DO 50 J = MAX( 1, KTOP-INCOL ), KDU
-                     REFSUM = V( 1, M22 )*( U( J, KMS+1 )+
-     $                        V( 2, M22 )*U( J, KMS+2 ) )
-                     U( J, KMS+1 ) = U( J, KMS+1 ) - REFSUM
-                     U( J, KMS+2 ) = U( J, KMS+2 ) - REFSUM*V( 2, M22 )
+                     REFSUM = U( J, KMS+1 ) + V( 2, M22 )*U( J, KMS+2 )
+                     U( J, KMS+1 ) = U( J, KMS+1 ) - REFSUM*T1
+                     U( J, KMS+2 ) = U( J, KMS+2 ) - REFSUM*T2
   50                 CONTINUE
                ELSE IF( WANTZ ) THEN
+                  T1 = V( 1, M22 )
+                  T2 = T1*V( 2, M22 )
                   DO 60 J = ILOZ, IHIZ
-                     REFSUM = V( 1, M22 )*( Z( J, K+1 )+V( 2, M22 )*
-     $                        Z( J, K+2 ) )
-                     Z( J, K+1 ) = Z( J, K+1 ) - REFSUM
-                     Z( J, K+2 ) = Z( J, K+2 ) - REFSUM*V( 2, M22 )
+                     REFSUM = Z( J, K+1 )+V( 2, M22 )*Z( J, K+2 )
+                     Z( J, K+1 ) = Z( J, K+1 ) - REFSUM*T1
+                     Z( J, K+2 ) = Z( J, K+2 ) - REFSUM*T2
   60              CONTINUE
                END IF
             END IF
@@ -554,10 +555,13 @@ SUBROUTINE SLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *                 .    Mth bulge. Exploit fact that first two elements
 *                 .    of row are actually zero. ====
 *
-                  REFSUM = V( 1, M )*V( 3, M )*H( K+3, K+2 )
-                  H( K+3, K   ) = -REFSUM
-                  H( K+3, K+1 ) = -REFSUM*V( 2, M )
-                  H( K+3, K+2 ) = H( K+3, K+2 ) - REFSUM*V( 3, M )
+                  T1 = V( 1, M )
+                  T2 = T1*V( 2, M )
+                  T3 = T1*V( 3, M )
+                  REFSUM = V( 3, M )*H( K+3, K+2 )
+                  H( K+3, K   ) = -REFSUM*T1
+                  H( K+3, K+1 ) = -REFSUM*T2
+                  H( K+3, K+2 ) = H( K+3, K+2 ) - REFSUM*T3
 *
 *                 ==== Calculate reflection to move
 *                 .    Mth bulge one step. ====
@@ -593,11 +597,13 @@ SUBROUTINE SLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
      $                            VT )
                      ALPHA = VT( 1 )
                      CALL SLARFG( 3, ALPHA, VT( 2 ), 1, VT( 1 ) )
-                     REFSUM = VT( 1 )*( H( K+1, K )+VT( 2 )*
-     $                        H( K+2, K ) )
+                     T1 = VT( 1 )
+                     T2 = T1*VT( 2 )
+                     T3 = T2*VT( 3 )
+                     REFSUM = H( K+1, K )+VT( 2 )*H( K+2, K )
 *
-                     IF( ABS( H( K+2, K )-REFSUM*VT( 2 ) )+
-     $                   ABS( REFSUM*VT( 3 ) ).GT.ULP*
+                     IF( ABS( H( K+2, K )-REFSUM*T2 )+
+     $                   ABS( REFSUM*T3 ).GT.ULP*
      $                   ( ABS( H( K, K ) )+ABS( H( K+1,
      $                   K+1 ) )+ABS( H( K+2, K+2 ) ) ) ) THEN
 *
@@ -615,7 +621,7 @@ SUBROUTINE SLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *                       .    Replace the old reflector with
 *                       .    the new one. ====
 *
-                        H( K+1, K ) = H( K+1, K ) - REFSUM
+                        H( K+1, K ) = H( K+1, K ) - REFSUM*T1
                         H( K+2, K ) = ZERO
                         H( K+3, K ) = ZERO
                         V( 1, M ) = VT( 1 )
@@ -631,22 +637,25 @@ SUBROUTINE SLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *              .     deflation check. We still delay most of the
 *              .     updates from the left for efficiency. ====      
 *
+               T1 = V( 1, M )
+               T2 = T1*V( 2, M )
+               T3 = T1*V( 3, M )
                DO 70 J = JTOP, MIN( KBOT, K+3 )
-                  REFSUM = V( 1, M )*( H( J, K+1 )+V( 2, M )*
-     $                        H( J, K+2 )+V( 3, M )*H( J, K+3 ) )
-                  H( J, K+1 ) = H( J, K+1 ) - REFSUM
-                  H( J, K+2 ) = H( J, K+2 ) - REFSUM*V( 2, M )
-                  H( J, K+3 ) = H( J, K+3 ) - REFSUM*V( 3, M )
+                  REFSUM = H( J, K+1 ) + V( 2, M )*H( J, K+2 )
+     $                     + V( 3, M )*H( J, K+3 )
+                  H( J, K+1 ) = H( J, K+1 ) - REFSUM*T1
+                  H( J, K+2 ) = H( J, K+2 ) - REFSUM*T2
+                  H( J, K+3 ) = H( J, K+3 ) - REFSUM*T3
    70          CONTINUE
 *
 *              ==== Perform update from left for subsequent
 *              .    column. ====
 *
-               REFSUM = V( 1, M )*( H( K+1, K+1 )+V( 2, M )*
-     $                  H( K+2, K+1 )+V( 3, M )*H( K+3, K+1 ) )
-               H( K+1, K+1 ) = H( K+1, K+1 ) - REFSUM
-               H( K+2, K+1 ) = H( K+2, K+1 ) - REFSUM*V( 2, M )
-               H( K+3, K+1 ) = H( K+3, K+1 ) - REFSUM*V( 3, M )
+               REFSUM = H( K+1, K+1 ) + V( 2, M )*H( K+2, K+1 )
+     $                  + V( 3, M )*H( K+3, K+1 )
+               H( K+1, K+1 ) = H( K+1, K+1 ) - REFSUM*T1
+               H( K+2, K+1 ) = H( K+2, K+1 ) - REFSUM*T2
+               H( K+3, K+1 ) = H( K+3, K+1 ) - REFSUM*T3
 *
 *              ==== The following convergence test requires that
 *              .    the tradition small-compared-to-nearby-diagonals
@@ -706,12 +715,15 @@ SUBROUTINE SLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *
             DO 100 M = MBOT, MTOP, -1
                K = KRCOL + 2*( M-1 )
+               T1 = V( 1, M )
+               T2 = T1*V( 2, M )
+               T3 = T1*V( 3, M )
                DO 90 J = MAX( KTOP, KRCOL + 2*M ), JBOT
-                  REFSUM = V( 1, M )*( H( K+1, J )+V( 2, M )*
-     $                     H( K+2, J )+V( 3, M )*H( K+3, J ) )
-                  H( K+1, J ) = H( K+1, J ) - REFSUM
-                  H( K+2, J ) = H( K+2, J ) - REFSUM*V( 2, M )
-                  H( K+3, J ) = H( K+3, J ) - REFSUM*V( 3, M )
+                  REFSUM = H( K+1, J ) + V( 2, M )*H( K+2, J )
+     $                     + V( 3, M )*H( K+3, J )
+                  H( K+1, J ) = H( K+1, J ) - REFSUM*T1
+                  H( K+2, J ) = H( K+2, J ) - REFSUM*T2
+                  H( K+3, J ) = H( K+3, J ) - REFSUM*T3
    90          CONTINUE
   100       CONTINUE
 *
@@ -729,12 +741,15 @@ SUBROUTINE SLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
                   I2 = MAX( 1, KTOP-INCOL )
                   I2 = MAX( I2, KMS-(KRCOL-INCOL)+1 )
                   I4 = MIN( KDU, KRCOL + 2*( MBOT-1 ) - INCOL + 5 )
+                  T1 = V( 1, M )
+                  T2 = T1*V( 2, M )
+                  T3 = T1*V( 3, M )
                   DO 110 J = I2, I4
-                     REFSUM = V( 1, M )*( U( J, KMS+1 )+V( 2, M )*
-     $                        U( J, KMS+2 )+V( 3, M )*U( J, KMS+3 ) )
-                     U( J, KMS+1 ) = U( J, KMS+1 ) - REFSUM
-                     U( J, KMS+2 ) = U( J, KMS+2 ) - REFSUM*V( 2, M )
-                     U( J, KMS+3 ) = U( J, KMS+3 ) - REFSUM*V( 3, M )
+                     REFSUM = U( J, KMS+1 ) + V( 2, M )*U( J, KMS+2 )
+     $                        + V( 3, M )*U( J, KMS+3 )
+                     U( J, KMS+1 ) = U( J, KMS+1 ) - REFSUM*T1
+                     U( J, KMS+2 ) = U( J, KMS+2 ) - REFSUM*T2
+                     U( J, KMS+3 ) = U( J, KMS+3 ) - REFSUM*T3
   110             CONTINUE
   120          CONTINUE
             ELSE IF( WANTZ ) THEN
@@ -745,12 +760,15 @@ SUBROUTINE SLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
 *
                DO 140 M = MBOT, MTOP, -1
                   K = KRCOL + 2*( M-1 )
+                  T1 = V( 1, M )
+                  T2 = T1*V( 2, M )
+                  T3 = T1*V( 3, M )
                   DO 130 J = ILOZ, IHIZ
-                     REFSUM = V( 1, M )*( Z( J, K+1 )+V( 2, M )*
-     $                        Z( J, K+2 )+V( 3, M )*Z( J, K+3 ) )
-                     Z( J, K+1 ) = Z( J, K+1 ) - REFSUM
-                     Z( J, K+2 ) = Z( J, K+2 ) - REFSUM*V( 2, M )
-                     Z( J, K+3 ) = Z( J, K+3 ) - REFSUM*V( 3, M )
+                     REFSUM = Z( J, K+1 ) + V( 2, M )*Z( J, K+2 )
+     $                        + V( 3, M )*Z( J, K+3 )
+                     Z( J, K+1 ) = Z( J, K+1 ) - REFSUM*T1
+                     Z( J, K+2 ) = Z( J, K+2 ) - REFSUM*T2
+                     Z( J, K+3 ) = Z( J, K+3 ) - REFSUM*T3
   130             CONTINUE
   140          CONTINUE
             END IF
diff --git a/SRC/slaqsb.f b/SRC/slaqsb.f
index 32c93911d6..1ba08e804b 100644
--- a/SRC/slaqsb.f
+++ b/SRC/slaqsb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQSB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqsb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqsb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,10 +131,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup laqhb
 *
 *  =====================================================================
-      SUBROUTINE SLAQSB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX, EQUED )
+      SUBROUTINE SLAQSB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX,
+     $                   EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slaqsp.f b/SRC/slaqsp.f
index 604d4b248d..f38e34a0a1 100644
--- a/SRC/slaqsp.f
+++ b/SRC/slaqsp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQSP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqsp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqsp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -118,10 +116,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup laqhp
 *
 *  =====================================================================
       SUBROUTINE SLAQSP( UPLO, N, AP, S, SCOND, AMAX, EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slaqsy.f b/SRC/slaqsy.f
index c592a4c33d..8217466e86 100644
--- a/SRC/slaqsy.f
+++ b/SRC/slaqsy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQSY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqsy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqsy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -126,10 +124,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYauxiliary
+*> \ingroup laqhe
 *
 *  =====================================================================
       SUBROUTINE SLAQSY( UPLO, N, A, LDA, S, SCOND, AMAX, EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slaqtr.f b/SRC/slaqtr.f
index 5720cf2bb1..f8de103deb 100644
--- a/SRC/slaqtr.f
+++ b/SRC/slaqtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -157,11 +155,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup laqtr
 *
 *  =====================================================================
-      SUBROUTINE SLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X, WORK,
+      SUBROUTINE SLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X,
+     $                   WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -314,7 +314,8 @@ SUBROUTINE SLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X, WORK,
                      END IF
                   END IF
                   IF( J1.GT.1 ) THEN
-                     CALL SAXPY( J1-1, -X( J1 ), T( 1, J1 ), 1, X, 1 )
+                     CALL SAXPY( J1-1, -X( J1 ), T( 1, J1 ), 1, X,
+     $                           1 )
                      K = ISAMAX( J1-1, X, 1 )
                      XMAX = ABS( X( K ) )
                   END IF
@@ -357,8 +358,10 @@ SUBROUTINE SLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X, WORK,
 *                 Update right-hand side
 *
                   IF( J1.GT.1 ) THEN
-                     CALL SAXPY( J1-1, -X( J1 ), T( 1, J1 ), 1, X, 1 )
-                     CALL SAXPY( J1-1, -X( J2 ), T( 1, J2 ), 1, X, 1 )
+                     CALL SAXPY( J1-1, -X( J1 ), T( 1, J1 ), 1, X,
+     $                           1 )
+                     CALL SAXPY( J1-1, -X( J2 ), T( 1, J2 ), 1, X,
+     $                           1 )
                      K = ISAMAX( J1-1, X, 1 )
                      XMAX = ABS( X( K ) )
                   END IF
@@ -402,7 +405,8 @@ SUBROUTINE SLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X, WORK,
                      END IF
                   END IF
 *
-                  X( J1 ) = X( J1 ) - SDOT( J1-1, T( 1, J1 ), 1, X, 1 )
+                  X( J1 ) = X( J1 ) - SDOT( J1-1, T( 1, J1 ), 1, X,
+     $               1 )
 *
                   XJ = ABS( X( J1 ) )
                   TJJ = ABS( T( J1, J1 ) )
@@ -532,7 +536,8 @@ SUBROUTINE SLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X, WORK,
                   END IF
 *
                   IF( J1.GT.1 ) THEN
-                     CALL SAXPY( J1-1, -X( J1 ), T( 1, J1 ), 1, X, 1 )
+                     CALL SAXPY( J1-1, -X( J1 ), T( 1, J1 ), 1, X,
+     $                           1 )
                      CALL SAXPY( J1-1, -X( N+J1 ), T( 1, J1 ), 1,
      $                           X( N+1 ), 1 )
 *
@@ -554,7 +559,8 @@ SUBROUTINE SLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X, WORK,
                   D( 2, 1 ) = X( J2 )
                   D( 1, 2 ) = X( N+J1 )
                   D( 2, 2 ) = X( N+J2 )
-                  CALL SLALN2( .FALSE., 2, 2, SMINW, ONE, T( J1, J1 ),
+                  CALL SLALN2( .FALSE., 2, 2, SMINW, ONE, T( J1,
+     $                         J1 ),
      $                         LDT, ONE, ONE, D, 2, ZERO, -W, V, 2,
      $                         SCALOC, XNORM, IERR )
                   IF( IERR.NE.0 )
@@ -586,8 +592,10 @@ SUBROUTINE SLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X, WORK,
 *                 Update the right-hand side.
 *
                   IF( J1.GT.1 ) THEN
-                     CALL SAXPY( J1-1, -X( J1 ), T( 1, J1 ), 1, X, 1 )
-                     CALL SAXPY( J1-1, -X( J2 ), T( 1, J2 ), 1, X, 1 )
+                     CALL SAXPY( J1-1, -X( J1 ), T( 1, J1 ), 1, X,
+     $                           1 )
+                     CALL SAXPY( J1-1, -X( J2 ), T( 1, J2 ), 1, X,
+     $                           1 )
 *
                      CALL SAXPY( J1-1, -X( N+J1 ), T( 1, J1 ), 1,
      $                           X( N+1 ), 1 )
@@ -644,7 +652,8 @@ SUBROUTINE SLAQTR( LTRAN, LREAL, N, T, LDT, B, W, SCALE, X, WORK,
                      END IF
                   END IF
 *
-                  X( J1 ) = X( J1 ) - SDOT( J1-1, T( 1, J1 ), 1, X, 1 )
+                  X( J1 ) = X( J1 ) - SDOT( J1-1, T( 1, J1 ), 1, X,
+     $               1 )
                   X( N+J1 ) = X( N+J1 ) - SDOT( J1-1, T( 1, J1 ), 1,
      $                        X( N+1 ), 1 )
                   IF( J1.GT.1 ) THEN
diff --git a/SRC/slaqz0.f b/SRC/slaqz0.f
index 15913be88c..f3f2a7388a 100644
--- a/SRC/slaqz0.f
+++ b/SRC/slaqz0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQZ0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqz0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqz0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -100,7 +98,7 @@
 *>      Anal., 29(2006), pp. 199--227.
 *>
 *> Ref: T. Steel, D. Camps, K. Meerbergen, R. Vandebril "A multishift,
-*>      multipole rational QZ method with agressive early deflation"
+*>      multipole rational QZ method with aggressive early deflation"
 *> \endverbatim
 *
 *  Arguments:
@@ -294,10 +292,11 @@
 *
 *> \date May 2020
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup laqz0
 *>
 *  =====================================================================
-      RECURSIVE SUBROUTINE SLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
+      RECURSIVE SUBROUTINE SLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI,
+     $                             A,
      $                             LDA, B, LDB, ALPHAR, ALPHAI, BETA,
      $                             Q, LDQ, Z, LDZ, WORK, LWORK, REC,
      $                             INFO )
@@ -318,7 +317,8 @@ RECURSIVE SUBROUTINE SLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
       PARAMETER( ZERO = 0.0, ONE = 1.0, HALF = 0.5 )
 
 *     Local scalars
-      REAL :: SMLNUM, ULP, ESHIFT, SAFMIN, SAFMAX, C1, S1, TEMP, SWAP
+      REAL :: SMLNUM, ULP, ESHIFT, SAFMIN, SAFMAX, C1, S1, TEMP, SWAP,
+     $        BNORM, BTOL 
       INTEGER :: ISTART, ISTOP, IITER, MAXIT, ISTART2, K, LD, NSHIFTS,
      $           NBLOCK, NW, NMIN, NIBBLE, N_UNDEFLATED, N_DEFLATED,
      $           NS, SWEEP_INFO, SHIFTPOS, LWORKREQ, K2, ISTARTM,
@@ -328,9 +328,9 @@ RECURSIVE SUBROUTINE SLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
       CHARACTER :: JBCMPZ*3
 
 *     External Functions
-      EXTERNAL :: XERBLA, SHGEQZ, SLAQZ3, SLAQZ4, SLASET, SLABAD,
+      EXTERNAL :: XERBLA, SHGEQZ, SLAQZ3, SLAQZ4, SLASET,
      $            SLARTG, SROT
-      REAL, EXTERNAL :: SLAMCH
+      REAL, EXTERNAL :: SLAMCH, SLANHS, SROUNDUP_LWORK
       LOGICAL, EXTERNAL :: LSAME
       INTEGER, EXTERNAL :: ILAENV
 
@@ -430,12 +430,14 @@ RECURSIVE SUBROUTINE SLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
       NSR = MAX( 2, NSR-MOD( NSR, 2 ) )
 
       RCOST = ILAENV( 17, 'SLAQZ0', JBCMPZ, N, ILO, IHI, LWORK )
-      ITEMP1 = INT( NSR/SQRT( 1+2*NSR/( REAL( RCOST )/100*N ) ) )
+      ITEMP1 = INT( REAL( NSR )/SQRT( 1+2*REAL( NSR )/
+     $         ( REAL( RCOST )/100*REAL( N ) ) ) )
       ITEMP1 = ( ( ITEMP1-1 )/4 )*4+4
       NBR = NSR+ITEMP1
 
       IF( N .LT. NMIN .OR. REC .GE. 2 ) THEN
-         CALL SHGEQZ( WANTS, WANTQ, WANTZ, N, ILO, IHI, A, LDA, B, LDB,
+         CALL SHGEQZ( WANTS, WANTQ, WANTZ, N, ILO, IHI, A, LDA, B,
+     $                LDB,
      $                ALPHAR, ALPHAI, BETA, Q, LDQ, Z, LDZ, WORK,
      $                LWORK, INFO )
          RETURN
@@ -447,7 +449,8 @@ RECURSIVE SUBROUTINE SLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 
 *     Workspace query to slaqz3
       NW = MAX( NWR, NMIN )
-      CALL SLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW, A, LDA, B, LDB,
+      CALL SLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW, A, LDA, B,
+     $             LDB,
      $             Q, LDQ, Z, LDZ, N_UNDEFLATED, N_DEFLATED, ALPHAR,
      $             ALPHAI, BETA, WORK, NW, WORK, NW, WORK, -1, REC,
      $             AED_INFO )
@@ -460,7 +463,7 @@ RECURSIVE SUBROUTINE SLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 
       LWORKREQ = MAX( ITEMP1+2*NW**2, ITEMP2+2*NBR**2 )
       IF ( LWORK .EQ.-1 ) THEN
-         WORK( 1 ) = REAL( LWORKREQ )
+         WORK( 1 ) = SROUNDUP_LWORK( LWORKREQ )
          RETURN
       ELSE IF ( LWORK .LT. LWORKREQ ) THEN
          INFO = -19
@@ -472,16 +475,20 @@ RECURSIVE SUBROUTINE SLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 *
 *     Initialize Q and Z
 *
-      IF( IWANTQ.EQ.3 ) CALL SLASET( 'FULL', N, N, ZERO, ONE, Q, LDQ )
-      IF( IWANTZ.EQ.3 ) CALL SLASET( 'FULL', N, N, ZERO, ONE, Z, LDZ )
+      IF( IWANTQ.EQ.3 ) CALL SLASET( 'FULL', N, N, ZERO, ONE, Q,
+     $    LDQ )
+      IF( IWANTZ.EQ.3 ) CALL SLASET( 'FULL', N, N, ZERO, ONE, Z,
+     $    LDZ )
 
 *     Get machine constants
       SAFMIN = SLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE/SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULP = SLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( REAL( N )/ULP )
 
+      BNORM = SLANHS( 'F', IHI-ILO+1, B( ILO, ILO ), LDB, WORK )
+      BTOL = MAX( SAFMIN, ULP*BNORM )
+
       ISTART = ILO
       ISTOP = IHI
       MAXIT = 3*( IHI-ILO+1 )
@@ -558,30 +565,26 @@ RECURSIVE SUBROUTINE SLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 *        slow down the method when many infinite eigenvalues are present
          K = ISTOP
          DO WHILE ( K.GE.ISTART2 )
-            TEMP = ZERO
-            IF( K .LT. ISTOP ) THEN
-               TEMP = TEMP+ABS( B( K, K+1 ) )
-            END IF
-            IF( K .GT. ISTART2 ) THEN
-               TEMP = TEMP+ABS( B( K-1, K ) )
-            END IF
 
-            IF( ABS( B( K, K ) ) .LT. MAX( SMLNUM, ULP*TEMP ) ) THEN
-*              A diagonal element of B is negligable, move it
+            IF( ABS( B( K, K ) ) .LT. BTOL ) THEN
+*              A diagonal element of B is negligible, move it
 *              to the top and deflate it
                
                DO K2 = K, ISTART2+1, -1
-                  CALL SLARTG( B( K2-1, K2 ), B( K2-1, K2-1 ), C1, S1,
+                  CALL SLARTG( B( K2-1, K2 ), B( K2-1, K2-1 ), C1,
+     $                         S1,
      $                         TEMP )
                   B( K2-1, K2 ) = TEMP
                   B( K2-1, K2-1 ) = ZERO
 
                   CALL SROT( K2-2-ISTARTM+1, B( ISTARTM, K2 ), 1,
      $                       B( ISTARTM, K2-1 ), 1, C1, S1 )
-                  CALL SROT( MIN( K2+1, ISTOP )-ISTARTM+1, A( ISTARTM,
+                  CALL SROT( MIN( K2+1, ISTOP )-ISTARTM+1,
+     $                       A( ISTARTM,
      $                       K2 ), 1, A( ISTARTM, K2-1 ), 1, C1, S1 )
                   IF ( ILZ ) THEN
-                     CALL SROT( N, Z( 1, K2 ), 1, Z( 1, K2-1 ), 1, C1,
+                     CALL SROT( N, Z( 1, K2 ), 1, Z( 1, K2-1 ), 1,
+     $                          C1,
      $                          S1 )
                   END IF
 
@@ -591,9 +594,11 @@ RECURSIVE SUBROUTINE SLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
                      A( K2, K2-1 ) = TEMP
                      A( K2+1, K2-1 ) = ZERO
 
-                     CALL SROT( ISTOPM-K2+1, A( K2, K2 ), LDA, A( K2+1,
+                     CALL SROT( ISTOPM-K2+1, A( K2, K2 ), LDA,
+     $                          A( K2+1,
      $                          K2 ), LDA, C1, S1 )
-                     CALL SROT( ISTOPM-K2+1, B( K2, K2 ), LDB, B( K2+1,
+                     CALL SROT( ISTOPM-K2+1, B( K2, K2 ), LDB,
+     $                          B( K2+1,
      $                          K2 ), LDB, C1, S1 )
                      IF( ILQ ) THEN
                         CALL SROT( N, Q( 1, K2 ), 1, Q( 1, K2+1 ), 1,
@@ -655,7 +660,8 @@ RECURSIVE SUBROUTINE SLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 *
 *        Time for AED
 *
-         CALL SLAQZ3( ILSCHUR, ILQ, ILZ, N, ISTART2, ISTOP, NW, A, LDA,
+         CALL SLAQZ3( ILSCHUR, ILQ, ILZ, N, ISTART2, ISTOP, NW, A,
+     $                LDA,
      $                B, LDB, Q, LDQ, Z, LDZ, N_UNDEFLATED, N_DEFLATED,
      $                ALPHAR, ALPHAI, BETA, WORK, NW, WORK( NW**2+1 ),
      $                NW, WORK( 2*NW**2+1 ), LWORK-2*NW**2, REC,
@@ -678,7 +684,7 @@ RECURSIVE SUBROUTINE SLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 
          NS = MIN( NSHIFTS, ISTOP-ISTART2 )
          NS = MIN( NS, N_UNDEFLATED )
-         SHIFTPOS = ISTOP-N_DEFLATED-N_UNDEFLATED+1
+         SHIFTPOS = ISTOP-N_UNDEFLATED+1
 *
 *        Shuffle shifts to put double shifts in front
 *        This ensures that we don't split up a double shift
@@ -725,7 +731,8 @@ RECURSIVE SUBROUTINE SLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 *
 *        Time for a QZ sweep
 *
-         CALL SLAQZ4( ILSCHUR, ILQ, ILZ, N, ISTART2, ISTOP, NS, NBLOCK,
+         CALL SLAQZ4( ILSCHUR, ILQ, ILZ, N, ISTART2, ISTOP, NS,
+     $                NBLOCK,
      $                ALPHAR( SHIFTPOS ), ALPHAI( SHIFTPOS ),
      $                BETA( SHIFTPOS ), A, LDA, B, LDB, Q, LDQ, Z, LDZ,
      $                WORK, NBLOCK, WORK( NBLOCK**2+1 ), NBLOCK,
diff --git a/SRC/slaqz1.f b/SRC/slaqz1.f
index 9141d360b6..e4c73fbf3d 100644
--- a/SRC/slaqz1.f
+++ b/SRC/slaqz1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQZ1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqz1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqz1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,7 +117,7 @@
 *
 *> \date May 2020
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup laqz1
 *>
 *  =====================================================================
       SUBROUTINE SLAQZ1( A, LDA, B, LDB, SR1, SR2, SI, BETA1, BETA2,
diff --git a/SRC/slaqz2.f b/SRC/slaqz2.f
index 48b74432f5..209179d332 100644
--- a/SRC/slaqz2.f
+++ b/SRC/slaqz2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQZ2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqz2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqz2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -165,10 +163,11 @@
 *
 *> \date May 2020
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup laqz2
 *>
 *  =====================================================================
-      SUBROUTINE SLAQZ2( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
+      SUBROUTINE SLAQZ2( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA,
+     $                   B,
      $                   LDB, NQ, QSTART, Q, LDQ, NZ, ZSTART, Z, LDZ )
       IMPLICIT NONE
 *
@@ -203,16 +202,19 @@ SUBROUTINE SLAQZ2( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
 *
          CALL SROT( IHI-ISTARTM+1, B( ISTARTM, IHI ), 1, B( ISTARTM,
      $              IHI-1 ), 1, C1, S1 )
-         CALL SROT( IHI-ISTARTM+1, B( ISTARTM, IHI-1 ), 1, B( ISTARTM,
+         CALL SROT( IHI-ISTARTM+1, B( ISTARTM, IHI-1 ), 1,
+     $              B( ISTARTM,
      $              IHI-2 ), 1, C2, S2 )
          B( IHI-1, IHI-2 ) = ZERO
          B( IHI, IHI-2 ) = ZERO
          CALL SROT( IHI-ISTARTM+1, A( ISTARTM, IHI ), 1, A( ISTARTM,
      $              IHI-1 ), 1, C1, S1 )
-         CALL SROT( IHI-ISTARTM+1, A( ISTARTM, IHI-1 ), 1, A( ISTARTM,
+         CALL SROT( IHI-ISTARTM+1, A( ISTARTM, IHI-1 ), 1,
+     $              A( ISTARTM,
      $              IHI-2 ), 1, C2, S2 )
          IF ( ILZ ) THEN
-            CALL SROT( NZ, Z( 1, IHI-ZSTART+1 ), 1, Z( 1, IHI-1-ZSTART+
+            CALL SROT( NZ, Z( 1, IHI-ZSTART+1 ), 1, Z( 1,
+     $                 IHI-1-ZSTART+
      $                 1 ), 1, C1, S1 )
             CALL SROT( NZ, Z( 1, IHI-1-ZSTART+1 ), 1, Z( 1,
      $                 IHI-2-ZSTART+1 ), 1, C2, S2 )
@@ -227,7 +229,8 @@ SUBROUTINE SLAQZ2( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
          CALL SROT( ISTOPM-IHI+2, B( IHI-1, IHI-1 ), LDB, B( IHI,
      $              IHI-1 ), LDB, C1, S1 )
          IF ( ILQ ) THEN
-            CALL SROT( NQ, Q( 1, IHI-1-QSTART+1 ), 1, Q( 1, IHI-QSTART+
+            CALL SROT( NQ, Q( 1, IHI-1-QSTART+1 ), 1, Q( 1,
+     $                 IHI-QSTART+
      $                 1 ), 1, C1, S1 )
          END IF
 *
@@ -239,7 +242,8 @@ SUBROUTINE SLAQZ2( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
          CALL SROT( IHI-ISTARTM+1, A( ISTARTM, IHI ), 1, A( ISTARTM,
      $              IHI-1 ), 1, C1, S1 )
          IF ( ILZ ) THEN
-            CALL SROT( NZ, Z( 1, IHI-ZSTART+1 ), 1, Z( 1, IHI-1-ZSTART+
+            CALL SROT( NZ, Z( 1, IHI-ZSTART+1 ), 1, Z( 1,
+     $                 IHI-1-ZSTART+
      $                 1 ), 1, C1, S1 )
          END IF
 *
@@ -275,7 +279,8 @@ SUBROUTINE SLAQZ2( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
          IF ( ILZ ) THEN
             CALL SROT( NZ, Z( 1, K+2-ZSTART+1 ), 1, Z( 1, K+1-ZSTART+
      $                 1 ), 1, C1, S1 )
-            CALL SROT( NZ, Z( 1, K+1-ZSTART+1 ), 1, Z( 1, K-ZSTART+1 ),
+            CALL SROT( NZ, Z( 1, K+1-ZSTART+1 ), 1, Z( 1,
+     $                 K-ZSTART+1 ),
      $                 1, C2, S2 )
          END IF
          B( K+1, K ) = ZERO
diff --git a/SRC/slaqz3.f b/SRC/slaqz3.f
index edb8a6012c..098e69c06f 100644
--- a/SRC/slaqz3.f
+++ b/SRC/slaqz3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQZ3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqz3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqz3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -228,10 +226,11 @@
 *
 *> \date May 2020
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup laqz3
 *>
 *  =====================================================================
-      RECURSIVE SUBROUTINE SLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
+      RECURSIVE SUBROUTINE SLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI,
+     $                             NW,
      $                             A, LDA, B, LDB, Q, LDQ, Z, LDZ, NS,
      $                             ND, ALPHAR, ALPHAI, BETA, QC, LDQC,
      $                             ZC, LDZC, WORK, LWORK, REC, INFO )
@@ -258,9 +257,9 @@ RECURSIVE SUBROUTINE SLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
       REAL :: S, SMLNUM, ULP, SAFMIN, SAFMAX, C1, S1, TEMP
 
 *     External Functions
-      EXTERNAL :: XERBLA, STGEXC, SLABAD, SLAQZ0, SLACPY, SLASET,
+      EXTERNAL :: XERBLA, STGEXC, SLAQZ0, SLACPY, SLASET,
      $            SLAQZ2, SROT, SLARTG, SLAG2, SGEMM
-      REAL, EXTERNAL :: SLAMCH
+      REAL, EXTERNAL :: SLAMCH, SROUNDUP_LWORK
 
       INFO = 0
 
@@ -286,7 +285,7 @@ RECURSIVE SUBROUTINE SLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
       LWORKREQ = MAX( LWORKREQ, N*NW, 2*NW**2+N )
       IF ( LWORK .EQ.-1 ) THEN
 *        workspace query, quick return
-         WORK( 1 ) = LWORKREQ
+         WORK( 1 ) = SROUNDUP_LWORK(LWORKREQ)
          RETURN
       ELSE IF ( LWORK .LT. LWORKREQ ) THEN
          INFO = -26
@@ -300,7 +299,6 @@ RECURSIVE SUBROUTINE SLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
 *     Get machine constants
       SAFMIN = SLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE/SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULP = SLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( REAL( N )/ULP )
 
@@ -324,7 +322,8 @@ RECURSIVE SUBROUTINE SLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
 
 *     Store window in case of convergence failure
       CALL SLACPY( 'ALL', JW, JW, A( KWTOP, KWTOP ), LDA, WORK, JW )
-      CALL SLACPY( 'ALL', JW, JW, B( KWTOP, KWTOP ), LDB, WORK( JW**2+
+      CALL SLACPY( 'ALL', JW, JW, B( KWTOP, KWTOP ), LDB,
+     $             WORK( JW**2+
      $             1 ), JW )
 
 *     Transform window to real schur form
@@ -339,7 +338,8 @@ RECURSIVE SUBROUTINE SLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
 *        Convergence failure, restore the window and exit
          ND = 0
          NS = JW-QZ_SMALL_INFO
-         CALL SLACPY( 'ALL', JW, JW, WORK, JW, A( KWTOP, KWTOP ), LDA )
+         CALL SLACPY( 'ALL', JW, JW, WORK, JW, A( KWTOP, KWTOP ),
+     $                LDA )
          CALL SLACPY( 'ALL', JW, JW, WORK( JW**2+1 ), JW, B( KWTOP,
      $                KWTOP ), LDB )
          RETURN
@@ -446,11 +446,14 @@ RECURSIVE SUBROUTINE SLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
             A( K, KWTOP-1 ) = TEMP
             A( K+1, KWTOP-1 ) = ZERO
             K2 = MAX( KWTOP, K-1 )
-            CALL SROT( IHI-K2+1, A( K, K2 ), LDA, A( K+1, K2 ), LDA, C1,
+            CALL SROT( IHI-K2+1, A( K, K2 ), LDA, A( K+1, K2 ), LDA,
+     $                 C1,
      $                 S1 )
-            CALL SROT( IHI-( K-1 )+1, B( K, K-1 ), LDB, B( K+1, K-1 ),
+            CALL SROT( IHI-( K-1 )+1, B( K, K-1 ), LDB, B( K+1,
+     $                 K-1 ),
      $                 LDB, C1, S1 )
-            CALL SROT( JW, QC( 1, K-KWTOP+1 ), 1, QC( 1, K+1-KWTOP+1 ),
+            CALL SROT( JW, QC( 1, K-KWTOP+1 ), 1, QC( 1,
+     $                 K+1-KWTOP+1 ),
      $                 1, C1, S1 )
          END DO
 
@@ -475,7 +478,8 @@ RECURSIVE SUBROUTINE SLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
                DO K2 = K, KWBOT-2
 
 *                 Move shift down
-                  CALL SLARTG( B( K2+1, K2+1 ), B( K2+1, K2 ), C1, S1,
+                  CALL SLARTG( B( K2+1, K2+1 ), B( K2+1, K2 ), C1,
+     $                         S1,
      $                         TEMP )
                   B( K2+1, K2+1 ) = TEMP
                   B( K2+1, K2 ) = ZERO
@@ -490,9 +494,11 @@ RECURSIVE SUBROUTINE SLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
      $                         TEMP )
                   A( K2+1, K2 ) = TEMP
                   A( K2+2, K2 ) = ZERO
-                  CALL SROT( ISTOPM-K2, A( K2+1, K2+1 ), LDA, A( K2+2,
+                  CALL SROT( ISTOPM-K2, A( K2+1, K2+1 ), LDA,
+     $                       A( K2+2,
      $                       K2+1 ), LDA, C1, S1 )
-                  CALL SROT( ISTOPM-K2, B( K2+1, K2+1 ), LDB, B( K2+2,
+                  CALL SROT( ISTOPM-K2, B( K2+1, K2+1 ), LDB,
+     $                       B( K2+2,
      $                       K2+1 ), LDB, C1, S1 )
                   CALL SROT( JW, QC( 1, K2+1-KWTOP+1 ), 1, QC( 1,
      $                       K2+2-KWTOP+1 ), 1, C1, S1 )
@@ -500,7 +506,8 @@ RECURSIVE SUBROUTINE SLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
                END DO
 
 *              Remove the shift
-               CALL SLARTG( B( KWBOT, KWBOT ), B( KWBOT, KWBOT-1 ), C1,
+               CALL SLARTG( B( KWBOT, KWBOT ), B( KWBOT, KWBOT-1 ),
+     $                      C1,
      $                      S1, TEMP )
                B( KWBOT, KWBOT ) = TEMP
                B( KWBOT, KWBOT-1 ) = ZERO
@@ -537,25 +544,29 @@ RECURSIVE SUBROUTINE SLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
      $                IHI+1 ), LDB )
       END IF
       IF ( ILQ ) THEN
-         CALL SGEMM( 'N', 'N', N, JW, JW, ONE, Q( 1, KWTOP ), LDQ, QC,
+         CALL SGEMM( 'N', 'N', N, JW, JW, ONE, Q( 1, KWTOP ), LDQ,
+     $               QC,
      $               LDQC, ZERO, WORK, N )
          CALL SLACPY( 'ALL', N, JW, WORK, N, Q( 1, KWTOP ), LDQ )
       END IF
 
       IF ( KWTOP-1-ISTARTM+1 > 0 ) THEN
-         CALL SGEMM( 'N', 'N', KWTOP-ISTARTM, JW, JW, ONE, A( ISTARTM,
+         CALL SGEMM( 'N', 'N', KWTOP-ISTARTM, JW, JW, ONE,
+     $               A( ISTARTM,
      $               KWTOP ), LDA, ZC, LDZC, ZERO, WORK,
      $               KWTOP-ISTARTM )
          CALL SLACPY( 'ALL', KWTOP-ISTARTM, JW, WORK, KWTOP-ISTARTM,
      $                A( ISTARTM, KWTOP ), LDA )
-         CALL SGEMM( 'N', 'N', KWTOP-ISTARTM, JW, JW, ONE, B( ISTARTM,
+         CALL SGEMM( 'N', 'N', KWTOP-ISTARTM, JW, JW, ONE,
+     $               B( ISTARTM,
      $               KWTOP ), LDB, ZC, LDZC, ZERO, WORK,
      $               KWTOP-ISTARTM )
          CALL SLACPY( 'ALL', KWTOP-ISTARTM, JW, WORK, KWTOP-ISTARTM,
      $                B( ISTARTM, KWTOP ), LDB )
       END IF
       IF ( ILZ ) THEN
-         CALL SGEMM( 'N', 'N', N, JW, JW, ONE, Z( 1, KWTOP ), LDZ, ZC,
+         CALL SGEMM( 'N', 'N', N, JW, JW, ONE, Z( 1, KWTOP ), LDZ,
+     $               ZC,
      $               LDZC, ZERO, WORK, N )
          CALL SLACPY( 'ALL', N, JW, WORK, N, Z( 1, KWTOP ), LDZ )
       END IF
diff --git a/SRC/slaqz4.f b/SRC/slaqz4.f
index 3c307dd474..20374960bd 100644
--- a/SRC/slaqz4.f
+++ b/SRC/slaqz4.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAQZ4 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaqz4.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaqz4.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -204,7 +202,7 @@
 *
 *> \date May 2020
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup laqz4
 *>
 *  =====================================================================
       SUBROUTINE SLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
@@ -236,6 +234,7 @@ SUBROUTINE SLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
 *     External functions
       EXTERNAL :: XERBLA, SGEMM, SLAQZ1, SLAQZ2, SLASET, SLARTG, SROT,
      $            SLACPY
+      REAL, EXTERNAL :: SROUNDUP_LWORK
 
       INFO = 0
       IF ( NBLOCK_DESIRED .LT. NSHIFTS+1 ) THEN
@@ -243,7 +242,7 @@ SUBROUTINE SLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       END IF
       IF ( LWORK .EQ.-1 ) THEN
 *        workspace query, quick return
-         WORK( 1 ) = N*NBLOCK_DESIRED
+         WORK( 1 ) = SROUNDUP_LWORK(N*NBLOCK_DESIRED)
          RETURN
       ELSE IF ( LWORK .LT. N*NBLOCK_DESIRED ) THEN
          INFO = -25
@@ -315,18 +314,21 @@ SUBROUTINE SLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
 
       DO I = 1, NS, 2
 *        Introduce the shift
-         CALL SLAQZ1( A( ILO, ILO ), LDA, B( ILO, ILO ), LDB, SR( I ),
+         CALL SLAQZ1( A( ILO, ILO ), LDA, B( ILO, ILO ), LDB,
+     $                SR( I ),
      $                SR( I+1 ), SI( I ), SS( I ), SS( I+1 ), V )
 
          TEMP = V( 2 )
          CALL SLARTG( TEMP, V( 3 ), C1, S1, V( 2 ) )
          CALL SLARTG( V( 1 ), V( 2 ), C2, S2, TEMP )
 
-         CALL SROT( NS, A( ILO+1, ILO ), LDA, A( ILO+2, ILO ), LDA, C1,
+         CALL SROT( NS, A( ILO+1, ILO ), LDA, A( ILO+2, ILO ), LDA,
+     $              C1,
      $              S1 )
          CALL SROT( NS, A( ILO, ILO ), LDA, A( ILO+1, ILO ), LDA, C2,
      $              S2 )
-         CALL SROT( NS, B( ILO+1, ILO ), LDB, B( ILO+2, ILO ), LDB, C1,
+         CALL SROT( NS, B( ILO+1, ILO ), LDB, B( ILO+2, ILO ), LDB,
+     $              C1,
      $              S1 )
          CALL SROT( NS, B( ILO, ILO ), LDB, B( ILO+1, ILO ), LDB, C2,
      $              S2 )
@@ -351,11 +353,13 @@ SUBROUTINE SLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       SHEIGHT = NS+1
       SWIDTH = ISTOPM-( ILO+NS )+1
       IF ( SWIDTH > 0 ) THEN
-         CALL SGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC, LDQC,
+         CALL SGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC,
+     $               LDQC,
      $               A( ILO, ILO+NS ), LDA, ZERO, WORK, SHEIGHT )
          CALL SLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, A( ILO,
      $                ILO+NS ), LDA )
-         CALL SGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC, LDQC,
+         CALL SGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC,
+     $               LDQC,
      $               B( ILO, ILO+NS ), LDB, ZERO, WORK, SHEIGHT )
          CALL SLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, B( ILO,
      $                ILO+NS ), LDB )
@@ -371,17 +375,22 @@ SUBROUTINE SLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       SHEIGHT = ILO-1-ISTARTM+1
       SWIDTH = NS
       IF ( SHEIGHT > 0 ) THEN
-         CALL SGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, ONE, A( ISTARTM,
+         CALL SGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, ONE,
+     $               A( ISTARTM,
      $               ILO ), LDA, ZC, LDZC, ZERO, WORK, SHEIGHT )
-         CALL SLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, A( ISTARTM,
+         CALL SLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                A( ISTARTM,
      $                ILO ), LDA )
-         CALL SGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, ONE, B( ISTARTM,
+         CALL SGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, ONE,
+     $               B( ISTARTM,
      $               ILO ), LDB, ZC, LDZC, ZERO, WORK, SHEIGHT )
-         CALL SLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, B( ISTARTM,
+         CALL SLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                B( ISTARTM,
      $                ILO ), LDB )
       END IF
       IF ( ILZ ) THEN
-         CALL SGEMM( 'N', 'N', N, SWIDTH, SWIDTH, ONE, Z( 1, ILO ), LDZ,
+         CALL SGEMM( 'N', 'N', N, SWIDTH, SWIDTH, ONE, Z( 1, ILO ),
+     $               LDZ,
      $               ZC, LDZC, ZERO, WORK, N )
          CALL SLACPY( 'ALL', N, SWIDTH, WORK, N, Z( 1, ILO ), LDZ )
       END IF
@@ -426,18 +435,22 @@ SUBROUTINE SLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
             CALL SGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC,
      $                  LDQC, A( K+1, K+NS+NP ), LDA, ZERO, WORK,
      $                  SHEIGHT )
-            CALL SLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, A( K+1,
+            CALL SLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                   A( K+1,
      $                   K+NS+NP ), LDA )
             CALL SGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC,
      $                  LDQC, B( K+1, K+NS+NP ), LDB, ZERO, WORK,
      $                  SHEIGHT )
-            CALL SLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, B( K+1,
+            CALL SLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                   B( K+1,
      $                   K+NS+NP ), LDB )
          END IF
          IF ( ILQ ) THEN
-            CALL SGEMM( 'N', 'N', N, NBLOCK, NBLOCK, ONE, Q( 1, K+1 ),
+            CALL SGEMM( 'N', 'N', N, NBLOCK, NBLOCK, ONE, Q( 1,
+     $                  K+1 ),
      $                  LDQ, QC, LDQC, ZERO, WORK, N )
-            CALL SLACPY( 'ALL', N, NBLOCK, WORK, N, Q( 1, K+1 ), LDQ )
+            CALL SLACPY( 'ALL', N, NBLOCK, WORK, N, Q( 1, K+1 ),
+     $                   LDQ )
          END IF
 
 *        Update A(istartm:k,k:k+ns+npos-1) and B(istartm:k,k:k+ns+npos-1)
@@ -480,7 +493,8 @@ SUBROUTINE SLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       DO I = 1, NS, 2
 *        Chase the shift down to the bottom right corner
          DO ISHIFT = IHI-I-1, IHI-2
-            CALL SLAQZ2( .TRUE., .TRUE., ISHIFT, ISTARTB, ISTOPB, IHI,
+            CALL SLAQZ2( .TRUE., .TRUE., ISHIFT, ISTARTB, ISTOPB,
+     $                   IHI,
      $                   A, LDA, B, LDB, NS, IHI-NS+1, QC, LDQC, NS+1,
      $                   IHI-NS, ZC, LDZC )
          END DO
@@ -494,11 +508,13 @@ SUBROUTINE SLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       SHEIGHT = NS
       SWIDTH = ISTOPM-( IHI+1 )+1
       IF ( SWIDTH > 0 ) THEN
-         CALL SGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC, LDQC,
+         CALL SGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC,
+     $               LDQC,
      $               A( IHI-NS+1, IHI+1 ), LDA, ZERO, WORK, SHEIGHT )
          CALL SLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
      $                A( IHI-NS+1, IHI+1 ), LDA )
-         CALL SGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC, LDQC,
+         CALL SGEMM( 'T', 'N', SHEIGHT, SWIDTH, SHEIGHT, ONE, QC,
+     $               LDQC,
      $               B( IHI-NS+1, IHI+1 ), LDB, ZERO, WORK, SHEIGHT )
          CALL SLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
      $                B( IHI-NS+1, IHI+1 ), LDB )
@@ -514,17 +530,22 @@ SUBROUTINE SLAQZ4( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       SHEIGHT = IHI-NS-ISTARTM+1
       SWIDTH = NS+1
       IF ( SHEIGHT > 0 ) THEN
-         CALL SGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, ONE, A( ISTARTM,
+         CALL SGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, ONE,
+     $               A( ISTARTM,
      $               IHI-NS ), LDA, ZC, LDZC, ZERO, WORK, SHEIGHT )
-         CALL SLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, A( ISTARTM,
+         CALL SLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                A( ISTARTM,
      $                IHI-NS ), LDA )
-         CALL SGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, ONE, B( ISTARTM,
+         CALL SGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, ONE,
+     $               B( ISTARTM,
      $               IHI-NS ), LDB, ZC, LDZC, ZERO, WORK, SHEIGHT )
-         CALL SLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, B( ISTARTM,
+         CALL SLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                B( ISTARTM,
      $                IHI-NS ), LDB )
       END IF
       IF ( ILZ ) THEN
-      CALL SGEMM( 'N', 'N', N, NS+1, NS+1, ONE, Z( 1, IHI-NS ), LDZ, ZC,
+      CALL SGEMM( 'N', 'N', N, NS+1, NS+1, ONE, Z( 1, IHI-NS ), LDZ,
+     $            ZC,
      $            LDZC, ZERO, WORK, N )
          CALL SLACPY( 'ALL', N, NS+1, WORK, N, Z( 1, IHI-NS ), LDZ )
       END IF
diff --git a/SRC/slar1v.f b/SRC/slar1v.f
index 36c2d8e9d5..ca81eed692 100644
--- a/SRC/slar1v.f
+++ b/SRC/slar1v.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAR1V + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slar1v.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slar1v.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -212,7 +210,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lar1v
 *
 *> \par Contributors:
 *  ==================
@@ -227,6 +225,7 @@
       SUBROUTINE SLAR1V( N, B1, BN, LAMBDA, D, L, LD, LLD,
      $           PIVMIN, GAPTOL, Z, WANTNC, NEGCNT, ZTZ, MINGMA,
      $           R, ISUPPZ, NRMINV, RESID, RQCORR, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slar2v.f b/SRC/slar2v.f
index ae5eb2e252..04a80d61f9 100644
--- a/SRC/slar2v.f
+++ b/SRC/slar2v.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAR2V + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slar2v.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slar2v.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -103,10 +101,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lar2v
 *
 *  =====================================================================
       SUBROUTINE SLAR2V( N, X, Y, Z, INCX, C, S, INCC )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slarf.f b/SRC/slarf.f
index 497dad7602..725ab2873a 100644
--- a/SRC/slarf.f
+++ b/SRC/slarf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,10 +115,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup larf
 *
 *  =====================================================================
       SUBROUTINE SLARF( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -194,7 +193,8 @@ SUBROUTINE SLARF( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
 *
 *           w(1:lastc,1) := C(1:lastv,1:lastc)**T * v(1:lastv,1)
 *
-            CALL SGEMV( 'Transpose', LASTV, LASTC, ONE, C, LDC, V, INCV,
+            CALL SGEMV( 'Transpose', LASTV, LASTC, ONE, C, LDC, V,
+     $                  INCV,
      $           ZERO, WORK, 1 )
 *
 *           C(1:lastv,1:lastc) := C(...) - v(1:lastv,1) * w(1:lastc,1)**T
diff --git a/SRC/slarf1f.f b/SRC/slarf1f.f
new file mode 100644
index 0000000000..d0c015eacf
--- /dev/null
+++ b/SRC/slarf1f.f
@@ -0,0 +1,254 @@
+*> \brief \b SLARF1F applies an elementary reflector to a general rectangular
+*              matrix assuming v(1) = 1.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download SLARF1F + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarf1f.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/slarf1f.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarf1f.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE SLARF1F( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          SIDE
+*       INTEGER            INCV, LDC, M, N
+*       REAL               TAU
+*       ..
+*       .. Array Arguments ..
+*       REAL               C( LDC, * ), V( * ), WORK( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> SLARF1F applies a real elementary reflector H to a real m by n matrix
+*> C, from either the left or the right. H is represented in the form
+*>
+*>       H = I - tau * v * v**T
+*>
+*> where tau is a real scalar and v is a real vector assuming v(1) = 1.
+*>
+*> If tau = 0, then H is taken to be the unit matrix.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'L': form  H * C
+*>          = 'R': form  C * H
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is REAL array, dimension
+*>                     (1 + (M-1)*abs(INCV)) if SIDE = 'L'
+*>                  or (1 + (N-1)*abs(INCV)) if SIDE = 'R'
+*>          The vector v in the representation of H. V is not used if
+*>          TAU = 0.
+*> \endverbatim
+*>
+*> \param[in] INCV
+*> \verbatim
+*>          INCV is INTEGER
+*>          The increment between elements of v. INCV <> 0.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is REAL
+*>          The value tau in the representation of H.
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is REAL array, dimension (LDC,N)
+*>          On entry, the m by n matrix C.
+*>          On exit, C is overwritten by the matrix H * C if SIDE = 'L',
+*>          or C * H if SIDE = 'R'.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is REAL array, dimension
+*>                         (N) if SIDE = 'L'
+*>                      or (M) if SIDE = 'R'
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup larf1f
+*
+*  =====================================================================
+      SUBROUTINE SLARF1F( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          SIDE
+      INTEGER            INCV, LDC, M, N
+      REAL               TAU
+*     ..
+*     .. Array Arguments ..
+      REAL               C( LDC, * ), V( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      REAL               ONE, ZERO
+      PARAMETER          ( ONE = 1.0E+0, ZERO = 0.0E+0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            APPLYLEFT
+      INTEGER            I, LASTV, LASTC
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           SGEMV, SGER, SAXPY, SSCAL
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILASLR, ILASLC
+      EXTERNAL           LSAME, ILASLR, ILASLC
+*     ..
+*     .. Executable Statements ..
+*
+      APPLYLEFT = LSAME( SIDE, 'L' )
+      LASTV = 1
+      LASTC = 0
+      IF( TAU.NE.ZERO ) THEN
+!     Set up variables for scanning V.  LASTV begins pointing to the end
+!     of V up to V(1).
+         IF( APPLYLEFT ) THEN
+            LASTV = M
+         ELSE
+            LASTV = N
+         END IF
+         IF( INCV.GT.0 ) THEN
+            I = 1 + (LASTV-1) * INCV
+         ELSE
+            I = 1
+         END IF
+!     Look for the last non-zero row in V.
+         DO WHILE( LASTV.GT.1 .AND. V( I ).EQ.ZERO )
+            LASTV = LASTV - 1
+            I = I - INCV
+         END DO
+         IF( APPLYLEFT ) THEN
+!     Scan for the last non-zero column in C(1:lastv,:).
+            LASTC = ILASLC(LASTV, N, C, LDC)
+         ELSE
+!     Scan for the last non-zero row in C(:,1:lastv).
+            LASTC = ILASLR(M, LASTV, C, LDC)
+         END IF
+      END IF
+      IF( LASTC.EQ.0 ) THEN
+         RETURN
+      END IF
+      IF( APPLYLEFT ) THEN
+*
+*        Form  H * C
+*
+         IF( LASTV.EQ.1 ) THEN
+*
+*           C(1,1:lastc) := ( 1 - tau ) * C(1,1:lastc)
+*
+            CALL SSCAL( LASTC, ONE - TAU, C, LDC )
+         ELSE
+*
+*        w(1:lastc,1) := C(2:lastv,1:lastc)**T * v(2:lastv,1)
+*
+         CALL SGEMV( 'Transpose', LASTV - 1, LASTC, ONE, C( 2, 1 ),
+     $               LDC, V( 1 + INCV ), INCV, ZERO, WORK, 1 )
+*
+*        w(1:lastc,1) += v(1,1) * C(1,1:lastc)**T
+*
+         CALL SAXPY( LASTC, ONE, C, LDC, WORK, 1 )
+*
+*        C(1, 1:lastc) += - tau * v(1,1) * w(1:lastc,1)**T
+*
+         CALL SAXPY( LASTC, -TAU, WORK, 1, C, LDC )
+*
+*        C(2:lastv,1:lastc) += - tau * v(2:lastv,1) * w(1:lastc,1)**T
+*
+         CALL SGER( LASTV - 1, LASTC, -TAU, V( 1 + INCV ), INCV,
+     $              WORK, 1, C( 2, 1 ), LDC )
+            END IF
+      ELSE
+*
+*        Form  C * H
+*
+         IF( LASTV.EQ.1 ) THEN
+*
+*           C(1:lastc,1) := ( 1 - tau ) * C(1:lastc,1)
+*
+            CALL SSCAL( LASTC, ONE - TAU, C, 1 )
+         ELSE
+*
+*           w(1:lastc,1) := C(1:lastc,2:lastv) * v(2:lastv,1)
+*
+            CALL SGEMV( 'No transpose', LASTC, LASTV - 1, ONE,
+     $                  C( 1, 2 ), LDC, V( 1 + INCV ), INCV, ZERO,
+     $                  WORK, 1 )
+*
+*           w(1:lastc,1) += v(1,1) * C(1:lastc,1)
+*
+            CALL SAXPY( LASTC, ONE, C, 1, WORK, 1 )
+*
+*           C(1:lastc,1) += - tau * v(1,1) * w(1:lastc,1)
+*
+            CALL SAXPY( LASTC, -TAU, WORK, 1, C, 1 )
+*
+*           C(1:lastc,2:lastv) += - tau * w(1:lastc,1) * v(2:lastv)**T
+*
+            CALL SGER( LASTC, LASTV - 1, -TAU, WORK, 1,
+     $                 V( 1 + INCV ), INCV, C( 1, 2 ), LDC )
+         END IF
+      END IF
+      RETURN
+*
+*     End of SLARF1F
+*
+      END
diff --git a/SRC/slarf1l.f b/SRC/slarf1l.f
new file mode 100644
index 0000000000..d4fbb60108
--- /dev/null
+++ b/SRC/slarf1l.f
@@ -0,0 +1,253 @@
+*> \brief \b SLARF1L applies an elementary reflector to a general rectangular
+*              matrix assuming v(lastv) = 1, where lastv is the last non-zero
+*              element
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download SLARF1L + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarf1l.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/slarf1l.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarf1l.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE SLARF1L( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          SIDE
+*       INTEGER            INCV, LDC, M, N
+*       REAL               TAU
+*       ..
+*       .. Array Arguments ..
+*       REAL               C( LDC, * ), V( * ), WORK( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> SLARF1L applies a real elementary reflector H to a real m by n matrix
+*> C, from either the left or the right. H is represented in the form
+*>
+*>       H = I - tau * v * v**T
+*>
+*> where tau is a real scalar and v is a real vector assuming v(lastv) = 1,
+*> where lastv is the last non-zero element.
+*>
+*> If tau = 0, then H is taken to be the unit matrix.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'L': form  H * C
+*>          = 'R': form  C * H
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is REAL array, dimension
+*>                     (1 + (M-1)*abs(INCV)) if SIDE = 'L'
+*>                  or (1 + (N-1)*abs(INCV)) if SIDE = 'R'
+*>          The vector v in the representation of H. V is not used if
+*>          TAU = 0.
+*> \endverbatim
+*>
+*> \param[in] INCV
+*> \verbatim
+*>          INCV is INTEGER
+*>          The increment between elements of v. INCV > 0.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is REAL
+*>          The value tau in the representation of H.
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is REAL array, dimension (LDC,N)
+*>          On entry, the m by n matrix C.
+*>          On exit, C is overwritten by the matrix H * C if SIDE = 'L',
+*>          or C * H if SIDE = 'R'.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is REAL array, dimension
+*>                         (N) if SIDE = 'L'
+*>                      or (M) if SIDE = 'R'
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup larf1l
+*
+*  =====================================================================
+      SUBROUTINE SLARF1L( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          SIDE
+      INTEGER            INCV, LDC, M, N
+      REAL               TAU
+*     ..
+*     .. Array Arguments ..
+      REAL               C( LDC, * ), V( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      REAL               ONE, ZERO
+      PARAMETER          ( ONE = 1.0E+0, ZERO = 0.0E+0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            APPLYLEFT
+      INTEGER            I, LASTV, LASTC, FIRSTV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           SGEMV, SGER, SAXPY, SSCAL
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILASLR, ILASLC
+      EXTERNAL           LSAME, ILASLR, ILASLC
+*     ..
+*     .. Executable Statements ..
+*
+      APPLYLEFT = LSAME( SIDE, 'L' )
+      FIRSTV = 1
+      LASTC = 0
+      IF( TAU.NE.ZERO ) THEN
+!     Set up variables for scanning V.  LASTV begins pointing to the end
+!     of V up to V(1).
+         IF( APPLYLEFT ) THEN
+            LASTV = M
+         ELSE
+            LASTV = N
+         END IF
+         I = 1
+!     Look for the last non-zero row in V.
+         DO WHILE( LASTV.GT.FIRSTV .AND. V( I ).EQ.ZERO )
+            FIRSTV = FIRSTV + 1
+            I = I + INCV
+         END DO
+         IF( APPLYLEFT ) THEN
+!     Scan for the last non-zero column in C(1:lastv,:).
+            LASTC = ILASLC(LASTV, N, C, LDC)
+         ELSE
+!     Scan for the last non-zero row in C(:,1:lastv).
+            LASTC = ILASLR(M, LASTV, C, LDC)
+         END IF
+      END IF
+      IF( LASTC.EQ.0 ) THEN
+         RETURN
+      END IF
+      IF( APPLYLEFT ) THEN
+*
+*        Form  H * C
+*
+         IF( LASTV.EQ.FIRSTV ) THEN        
+*
+*           C(lastv,1:lastc) := ( 1 - tau ) * C(lastv,1:lastc)
+*
+            CALL SSCAL( LASTC, ONE - TAU, C( LASTV, 1 ), LDC )
+         ELSE
+*
+*           w(1:lastc,1) := C(firstv:lastv-1,1:lastc)**T * v(firstv:lastv-1,1)
+*
+            CALL SGEMV( 'Transpose', LASTV - FIRSTV, LASTC, ONE,
+     $                  C( FIRSTV, 1 ), LDC, V( I ), INCV, ZERO,
+     $                  WORK, 1 )
+*
+*           w(1:lastc,1) += C(lastv,1:lastc)**T * v(lastv,1)
+*
+            CALL SAXPY( LASTC, ONE, C( LASTV, 1 ), LDC, WORK, 1 )
+*
+*           C(lastv,1:lastc) += - tau * v(lastv,1) * w(1:lastc,1)**T
+*
+            CALL SAXPY( LASTC, -TAU, WORK, 1, C( LASTV, 1 ), LDC )
+*
+*           C(firstv:lastv-1,1:lastc) += - tau * v(firstv:lastv-1,1) * w(1:lastc,1)**T
+*
+            CALL SGER( LASTV - FIRSTV, LASTC, -TAU, V( I ), INCV,
+     $                 WORK, 1, C( FIRSTV, 1 ), LDC)
+         END IF
+      ELSE
+*
+*        Form  C * H
+*
+         IF( LASTV.EQ.FIRSTV ) THEN
+*
+*           C(1:lastc,lastv) := ( 1 - tau ) * C(1:lastc,lastv)
+*
+            CALL SSCAL( LASTC, ONE - TAU, C( 1, LASTV ), 1 )
+         ELSE
+*
+*           w(1:lastc,1) := C(1:lastc,firstv:lastv-1) * v(firstv:lastv-1,1)
+*
+            CALL SGEMV( 'No transpose', LASTC, LASTV - FIRSTV, ONE,
+     $                  C( 1, FIRSTV ), LDC, V( I ), INCV, ZERO,
+     $                  WORK, 1 )
+*
+*           w(1:lastc,1) += C(1:lastc,lastv) * v(lastv,1)
+*
+            CALL SAXPY( LASTC, ONE, C( 1, LASTV ), 1, WORK, 1 )
+*
+*           C(1:lastc,lastv) += - tau * v(lastv,1) * w(1:lastc,1)
+*
+            CALL SAXPY( LASTC, -TAU, WORK, 1, C( 1, LASTV ), 1 )
+*
+*           C(1:lastc,firstv:lastv-1) += - tau * w(1:lastc,1) * v(firstv:lastv-1)**T
+*
+            CALL SGER( LASTC, LASTV - FIRSTV, -TAU, WORK, 1, V( I ),
+     $                 INCV, C( 1, FIRSTV ), LDC )
+         END IF
+      END IF
+      RETURN
+*
+*     End of SLARF1L
+*
+      END
diff --git a/SRC/slarfb.f b/SRC/slarfb.f
index a065e4e259..01dc932f03 100644
--- a/SRC/slarfb.f
+++ b/SRC/slarfb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARFB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarfb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarfb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -161,7 +159,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup larfb
 *
 *> \par Further Details:
 *  =====================
@@ -170,9 +168,8 @@
 *>
 *>  The shape of the matrix V and the storage of the vectors which define
 *>  the H(i) is best illustrated by the following example with n = 5 and
-*>  k = 3. The elements equal to 1 are not stored; the corresponding
-*>  array elements are modified but restored on exit. The rest of the
-*>  array is not used.
+*>  k = 3. The triangular part of V (including its diagonal) is not
+*>  referenced.
 *>
 *>  DIRECT = 'F' and STOREV = 'C':         DIRECT = 'F' and STOREV = 'R':
 *>
@@ -192,8 +189,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
+      SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V,
+     $                   LDV,
      $                   T, LDT, C, LDC, WORK, LDWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -261,7 +260,8 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1
 *
-               CALL STRMM( 'Right', 'Lower', 'No transpose', 'Unit', N,
+               CALL STRMM( 'Right', 'Lower', 'No transpose', 'Unit',
+     $                     N,
      $                     K, ONE, V, LDV, WORK, LDWORK )
                IF( M.GT.K ) THEN
 *
@@ -274,7 +274,8 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * T**T  or  W * T
 *
-               CALL STRMM( 'Right', 'Upper', TRANST, 'Non-unit', N, K,
+               CALL STRMM( 'Right', 'Upper', TRANST, 'Non-unit', N,
+     $                     K,
      $                     ONE, T, LDT, WORK, LDWORK )
 *
 *              C := C - V * W**T
@@ -290,7 +291,8 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1**T
 *
-               CALL STRMM( 'Right', 'Lower', 'Transpose', 'Unit', N, K,
+               CALL STRMM( 'Right', 'Lower', 'Transpose', 'Unit', N,
+     $                     K,
      $                     ONE, V, LDV, WORK, LDWORK )
 *
 *              C1 := C1 - W**T
@@ -315,13 +317,15 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1
 *
-               CALL STRMM( 'Right', 'Lower', 'No transpose', 'Unit', M,
+               CALL STRMM( 'Right', 'Lower', 'No transpose', 'Unit',
+     $                     M,
      $                     K, ONE, V, LDV, WORK, LDWORK )
                IF( N.GT.K ) THEN
 *
 *                 W := W + C2 * V2
 *
-                  CALL SGEMM( 'No transpose', 'No transpose', M, K, N-K,
+                  CALL SGEMM( 'No transpose', 'No transpose', M, K,
+     $                        N-K,
      $                        ONE, C( 1, K+1 ), LDC, V( K+1, 1 ), LDV,
      $                        ONE, WORK, LDWORK )
                END IF
@@ -344,7 +348,8 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1**T
 *
-               CALL STRMM( 'Right', 'Lower', 'Transpose', 'Unit', M, K,
+               CALL STRMM( 'Right', 'Lower', 'Transpose', 'Unit', M,
+     $                     K,
      $                     ONE, V, LDV, WORK, LDWORK )
 *
 *              C1 := C1 - W
@@ -372,12 +377,14 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *              W := C2**T
 *
                DO 70 J = 1, K
-                  CALL SCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ), 1 )
+                  CALL SCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ),
+     $                        1 )
    70          CONTINUE
 *
 *              W := W * V2
 *
-               CALL STRMM( 'Right', 'Upper', 'No transpose', 'Unit', N,
+               CALL STRMM( 'Right', 'Upper', 'No transpose', 'Unit',
+     $                     N,
      $                     K, ONE, V( M-K+1, 1 ), LDV, WORK, LDWORK )
                IF( M.GT.K ) THEN
 *
@@ -389,7 +396,8 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * T**T  or  W * T
 *
-               CALL STRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K,
+               CALL STRMM( 'Right', 'Lower', TRANST, 'Non-unit', N,
+     $                     K,
      $                     ONE, T, LDT, WORK, LDWORK )
 *
 *              C := C - V * W**T
@@ -404,7 +412,8 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V2**T
 *
-               CALL STRMM( 'Right', 'Upper', 'Transpose', 'Unit', N, K,
+               CALL STRMM( 'Right', 'Upper', 'Transpose', 'Unit', N,
+     $                     K,
      $                     ONE, V( M-K+1, 1 ), LDV, WORK, LDWORK )
 *
 *              C2 := C2 - W**T
@@ -429,13 +438,15 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V2
 *
-               CALL STRMM( 'Right', 'Upper', 'No transpose', 'Unit', M,
+               CALL STRMM( 'Right', 'Upper', 'No transpose', 'Unit',
+     $                     M,
      $                     K, ONE, V( N-K+1, 1 ), LDV, WORK, LDWORK )
                IF( N.GT.K ) THEN
 *
 *                 W := W + C1 * V1
 *
-                  CALL SGEMM( 'No transpose', 'No transpose', M, K, N-K,
+                  CALL SGEMM( 'No transpose', 'No transpose', M, K,
+     $                        N-K,
      $                        ONE, C, LDC, V, LDV, ONE, WORK, LDWORK )
                END IF
 *
@@ -456,7 +467,8 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V2**T
 *
-               CALL STRMM( 'Right', 'Upper', 'Transpose', 'Unit', M, K,
+               CALL STRMM( 'Right', 'Upper', 'Transpose', 'Unit', M,
+     $                     K,
      $                     ONE, V( N-K+1, 1 ), LDV, WORK, LDWORK )
 *
 *              C2 := C2 - W
@@ -491,20 +503,23 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1**T
 *
-               CALL STRMM( 'Right', 'Upper', 'Transpose', 'Unit', N, K,
+               CALL STRMM( 'Right', 'Upper', 'Transpose', 'Unit', N,
+     $                     K,
      $                     ONE, V, LDV, WORK, LDWORK )
                IF( M.GT.K ) THEN
 *
 *                 W := W + C2**T * V2**T
 *
-                  CALL SGEMM( 'Transpose', 'Transpose', N, K, M-K, ONE,
+                  CALL SGEMM( 'Transpose', 'Transpose', N, K, M-K,
+     $                        ONE,
      $                        C( K+1, 1 ), LDC, V( 1, K+1 ), LDV, ONE,
      $                        WORK, LDWORK )
                END IF
 *
 *              W := W * T**T  or  W * T
 *
-               CALL STRMM( 'Right', 'Upper', TRANST, 'Non-unit', N, K,
+               CALL STRMM( 'Right', 'Upper', TRANST, 'Non-unit', N,
+     $                     K,
      $                     ONE, T, LDT, WORK, LDWORK )
 *
 *              C := C - V**T * W**T
@@ -513,14 +528,16 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 C2 := C2 - V2**T * W**T
 *
-                  CALL SGEMM( 'Transpose', 'Transpose', M-K, N, K, -ONE,
+                  CALL SGEMM( 'Transpose', 'Transpose', M-K, N, K,
+     $                        -ONE,
      $                        V( 1, K+1 ), LDV, WORK, LDWORK, ONE,
      $                        C( K+1, 1 ), LDC )
                END IF
 *
 *              W := W * V1
 *
-               CALL STRMM( 'Right', 'Upper', 'No transpose', 'Unit', N,
+               CALL STRMM( 'Right', 'Upper', 'No transpose', 'Unit',
+     $                     N,
      $                     K, ONE, V, LDV, WORK, LDWORK )
 *
 *              C1 := C1 - W**T
@@ -545,7 +562,8 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1**T
 *
-               CALL STRMM( 'Right', 'Upper', 'Transpose', 'Unit', M, K,
+               CALL STRMM( 'Right', 'Upper', 'Transpose', 'Unit', M,
+     $                     K,
      $                     ONE, V, LDV, WORK, LDWORK )
                IF( N.GT.K ) THEN
 *
@@ -567,14 +585,16 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 C2 := C2 - W * V2
 *
-                  CALL SGEMM( 'No transpose', 'No transpose', M, N-K, K,
+                  CALL SGEMM( 'No transpose', 'No transpose', M, N-K,
+     $                        K,
      $                        -ONE, WORK, LDWORK, V( 1, K+1 ), LDV, ONE,
      $                        C( 1, K+1 ), LDC )
                END IF
 *
 *              W := W * V1
 *
-               CALL STRMM( 'Right', 'Upper', 'No transpose', 'Unit', M,
+               CALL STRMM( 'Right', 'Upper', 'No transpose', 'Unit',
+     $                     M,
      $                     K, ONE, V, LDV, WORK, LDWORK )
 *
 *              C1 := C1 - W
@@ -602,24 +622,28 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *              W := C2**T
 *
                DO 190 J = 1, K
-                  CALL SCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ), 1 )
+                  CALL SCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ),
+     $                        1 )
   190          CONTINUE
 *
 *              W := W * V2**T
 *
-               CALL STRMM( 'Right', 'Lower', 'Transpose', 'Unit', N, K,
+               CALL STRMM( 'Right', 'Lower', 'Transpose', 'Unit', N,
+     $                     K,
      $                     ONE, V( 1, M-K+1 ), LDV, WORK, LDWORK )
                IF( M.GT.K ) THEN
 *
 *                 W := W + C1**T * V1**T
 *
-                  CALL SGEMM( 'Transpose', 'Transpose', N, K, M-K, ONE,
+                  CALL SGEMM( 'Transpose', 'Transpose', N, K, M-K,
+     $                        ONE,
      $                        C, LDC, V, LDV, ONE, WORK, LDWORK )
                END IF
 *
 *              W := W * T**T  or  W * T
 *
-               CALL STRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K,
+               CALL STRMM( 'Right', 'Lower', TRANST, 'Non-unit', N,
+     $                     K,
      $                     ONE, T, LDT, WORK, LDWORK )
 *
 *              C := C - V**T * W**T
@@ -628,13 +652,15 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 C1 := C1 - V1**T * W**T
 *
-                  CALL SGEMM( 'Transpose', 'Transpose', M-K, N, K, -ONE,
+                  CALL SGEMM( 'Transpose', 'Transpose', M-K, N, K,
+     $                        -ONE,
      $                        V, LDV, WORK, LDWORK, ONE, C, LDC )
                END IF
 *
 *              W := W * V2
 *
-               CALL STRMM( 'Right', 'Lower', 'No transpose', 'Unit', N,
+               CALL STRMM( 'Right', 'Lower', 'No transpose', 'Unit',
+     $                     N,
      $                     K, ONE, V( 1, M-K+1 ), LDV, WORK, LDWORK )
 *
 *              C2 := C2 - W**T
@@ -659,7 +685,8 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V2**T
 *
-               CALL STRMM( 'Right', 'Lower', 'Transpose', 'Unit', M, K,
+               CALL STRMM( 'Right', 'Lower', 'Transpose', 'Unit', M,
+     $                     K,
      $                     ONE, V( 1, N-K+1 ), LDV, WORK, LDWORK )
                IF( N.GT.K ) THEN
 *
@@ -680,13 +707,15 @@ SUBROUTINE SLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 C1 := C1 - W * V1
 *
-                  CALL SGEMM( 'No transpose', 'No transpose', M, N-K, K,
+                  CALL SGEMM( 'No transpose', 'No transpose', M, N-K,
+     $                        K,
      $                        -ONE, WORK, LDWORK, V, LDV, ONE, C, LDC )
                END IF
 *
 *              W := W * V2
 *
-               CALL STRMM( 'Right', 'Lower', 'No transpose', 'Unit', M,
+               CALL STRMM( 'Right', 'Lower', 'No transpose', 'Unit',
+     $                     M,
      $                     K, ONE, V( 1, N-K+1 ), LDV, WORK, LDWORK )
 *
 *              C1 := C1 - W
diff --git a/SRC/slarfb_gett.f b/SRC/slarfb_gett.f
index 7719f2965c..73fba1e695 100644
--- a/SRC/slarfb_gett.f
+++ b/SRC/slarfb_gett.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARFB_GETT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarfb_gett.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarfb_gett.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -157,7 +155,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup singleOTHERauxiliary
+*> \ingroup larfb_gett
 *
 *> \par Contributors:
 *  ==================
@@ -451,7 +449,7 @@ SUBROUTINE SLARFB_GETT( IDENT, M, N, K, T, LDT, A, LDA, B, LDB,
          IF( LNOTIDENT ) THEN
 *
 *           col2_(2) Compute W2: = (V1**T) * W2 = (A1**T) * W2,
-*           V1 is not an identy matrix, but unit lower-triangular
+*           V1 is not an identity matrix, but unit lower-triangular
 *           V1 stored in A1 (diagonal ones are not stored).
 *
 *
diff --git a/SRC/slarfg.f b/SRC/slarfg.f
index 35d72389d7..a0893439d1 100644
--- a/SRC/slarfg.f
+++ b/SRC/slarfg.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARFG + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarfg.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarfg.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -99,10 +97,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup larfg
 *
 *  =====================================================================
       SUBROUTINE SLARFG( N, ALPHA, X, INCX, TAU )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slarfgp.f b/SRC/slarfgp.f
index df42980c4e..f411819cdd 100644
--- a/SRC/slarfgp.f
+++ b/SRC/slarfgp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARFGP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarfgp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarfgp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup larfgp
 *
 *  =====================================================================
       SUBROUTINE SLARFGP( N, ALPHA, X, INCX, TAU )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -122,7 +121,7 @@ SUBROUTINE SLARFGP( N, ALPHA, X, INCX, TAU )
 *     ..
 *     .. Local Scalars ..
       INTEGER            J, KNT
-      REAL               BETA, BIGNUM, SAVEALPHA, SMLNUM, XNORM
+      REAL               BETA, BIGNUM, EPS, SAVEALPHA, SMLNUM, XNORM
 *     ..
 *     .. External Functions ..
       REAL               SLAMCH, SLAPY2, SNRM2
@@ -141,9 +140,10 @@ SUBROUTINE SLARFGP( N, ALPHA, X, INCX, TAU )
          RETURN
       END IF
 *
+      EPS = SLAMCH( 'Precision' )
       XNORM = SNRM2( N-1, X, INCX )
 *
-      IF( XNORM.EQ.ZERO ) THEN
+      IF( XNORM.LE.EPS*ABS(ALPHA) ) THEN
 *
 *        H  =  [+/-1, 0; I], sign chosen so ALPHA >= 0.
 *
diff --git a/SRC/slarft.f b/SRC/slarft.f
index 9cfe0ad3f9..3e0eac751e 100644
--- a/SRC/slarft.f
+++ b/SRC/slarft.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARFT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarft.f">
 *> [TGZ]</a>
@@ -13,12 +12,11 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarft.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE SLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+*       RECURSIVE SUBROUTINE SLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
 *
 *       .. Scalar Arguments ..
 *       CHARACTER          DIRECT, STOREV
@@ -127,10 +125,10 @@
 *
 *> \author Univ. of Tennessee
 *> \author Univ. of California Berkeley
-*> \author Univ. of Colorado Denver
+*> \author Johnathan Rhyne, Univ. of Colorado Denver (original author, 2024)
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup larft
 *
 *> \par Further Details:
 *  =====================
@@ -159,165 +157,480 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+      RECURSIVE SUBROUTINE SLARFT( DIRECT, STOREV, N, K, V, LDV,
+     $                             TAU, T, LDT )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
-*     .. Scalar Arguments ..
+*        .. Scalar Arguments
+*
       CHARACTER          DIRECT, STOREV
       INTEGER            K, LDT, LDV, N
 *     ..
 *     .. Array Arguments ..
+*
       REAL               T( LDT, * ), TAU( * ), V( LDV, * )
 *     ..
 *
-*  =====================================================================
-*
 *     .. Parameters ..
-      REAL               ONE, ZERO
-      PARAMETER          ( ONE = 1.0E+0, ZERO = 0.0E+0 )
-*     ..
+*
+      REAL               ONE, NEG_ONE, ZERO
+      PARAMETER(ONE=1.0E+0, ZERO = 0.0E+0, NEG_ONE=-1.0E+0)
+*
 *     .. Local Scalars ..
-      INTEGER            I, J, PREVLASTV, LASTV
-*     ..
+*
+      INTEGER            I,J,L,NX
+      LOGICAL            QR,LQ,QL,DIRF,COLV
+*
 *     .. External Subroutines ..
-      EXTERNAL           SGEMV, STRMV
-*     ..
-*     .. External Functions ..
+*
+      EXTERNAL           STRMM,SGEMM,SLACPY
+*
+*     .. External Functions..
+*
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      INTEGER            ILAENV
+      EXTERNAL           LSAME, ILAENV
+*     
+*     The general scheme used is inspired by the approach inside DGEQRT3
+*     which was (at the time of writing this code):
+*     Based on the algorithm of Elmroth and Gustavson,
+*     IBM J. Res. Develop. Vol 44 No. 4 July 2000.
 *     ..
 *     .. Executable Statements ..
 *
 *     Quick return if possible
 *
-      IF( N.EQ.0 )
-     $   RETURN
-*
-      IF( LSAME( DIRECT, 'F' ) ) THEN
-         PREVLASTV = N
-         DO I = 1, K
-            PREVLASTV = MAX( I, PREVLASTV )
-            IF( TAU( I ).EQ.ZERO ) THEN
-*
-*              H(i)  =  I
-*
-               DO J = 1, I
-                  T( J, I ) = ZERO
-               END DO
-            ELSE
-*
-*              general case
-*
-               IF( LSAME( STOREV, 'C' ) ) THEN
-*                 Skip any trailing zeros.
-                  DO LASTV = N, I+1, -1
-                     IF( V( LASTV, I ).NE.ZERO ) EXIT
-                  END DO
-                  DO J = 1, I-1
-                     T( J, I ) = -TAU( I ) * V( I , J )
-                  END DO
-                  J = MIN( LASTV, PREVLASTV )
-*
-*                 T(1:i-1,i) := - tau(i) * V(i:j,1:i-1)**T * V(i:j,i)
-*
-                  CALL SGEMV( 'Transpose', J-I, I-1, -TAU( I ),
-     $                        V( I+1, 1 ), LDV, V( I+1, I ), 1, ONE,
-     $                        T( 1, I ), 1 )
-               ELSE
-*                 Skip any trailing zeros.
-                  DO LASTV = N, I+1, -1
-                     IF( V( I, LASTV ).NE.ZERO ) EXIT
-                  END DO
-                  DO J = 1, I-1
-                     T( J, I ) = -TAU( I ) * V( J , I )
-                  END DO
-                  J = MIN( LASTV, PREVLASTV )
-*
-*                 T(1:i-1,i) := - tau(i) * V(1:i-1,i:j) * V(i,i:j)**T
-*
-                  CALL SGEMV( 'No transpose', I-1, J-I, -TAU( I ),
-     $                        V( 1, I+1 ), LDV, V( I, I+1 ), LDV,
-     $                        ONE, T( 1, I ), 1 )
-               END IF
-*
-*              T(1:i-1,i) := T(1:i-1,1:i-1) * T(1:i-1,i)
-*
-               CALL STRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T,
-     $                     LDT, T( 1, I ), 1 )
-               T( I, I ) = TAU( I )
-               IF( I.GT.1 ) THEN
-                  PREVLASTV = MAX( PREVLASTV, LASTV )
-               ELSE
-                  PREVLASTV = LASTV
-               END IF
-            END IF
+      IF(N.EQ.0.OR.K.EQ.0) THEN
+         RETURN
+      END IF
+*
+*     Base case
+*
+      IF(N.EQ.1.OR.K.EQ.1) THEN
+         T(1,1) = TAU(1)
+         RETURN
+      END IF
+*
+*     Determine when to cross over into the level 2 based implementation
+*
+      NX = ILAENV(3, "SLARFT", DIRECT // STOREV, N, K, -1, -1)
+      IF(K.LT.NX) THEN
+         CALL SLARFT_LVL2(DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT)
+         RETURN
+      END IF
+*
+*     Beginning of executable statements
+*
+      L = K / 2
+*
+*     Determine what kind of Q we need to compute
+*     We assume that if the user doesn't provide 'F' for DIRECT,
+*     then they meant to provide 'B' and if they don't provide
+*     'C' for STOREV, then they meant to provide 'R'
+*
+      DIRF = LSAME(DIRECT,'F')
+      COLV = LSAME(STOREV,'C')
+*
+*     QR happens when we have forward direction in column storage
+*
+      QR = DIRF.AND.COLV
+*
+*     LQ happens when we have forward direction in row storage
+*
+      LQ = DIRF.AND.(.NOT.COLV)
+*
+*     QL happens when we have backward direction in column storage
+*
+      QL = (.NOT.DIRF).AND.COLV
+*
+*     The last case is RQ. Due to how we structured this, if the
+*     above 3 are false, then RQ must be true, so we never store 
+*     this
+*     RQ happens when we have backward direction in row storage
+*     RQ = (.NOT.DIRF).AND.(.NOT.COLV)
+*
+      IF(QR) THEN
+*
+*        Break V apart into 6 components
+*
+*        V = |---------------|
+*            |V_{1,1} 0      |
+*            |V_{2,1} V_{2,2}|
+*            |V_{3,1} V_{3,2}|
+*            |---------------|
+*
+*        V_{1,1}\in\R^{l,l}      unit lower triangular
+*        V_{2,1}\in\R^{k-l,l}    rectangular
+*        V_{3,1}\in\R^{n-k,l}    rectangular
+*        
+*        V_{2,2}\in\R^{k-l,k-l}  unit lower triangular
+*        V_{3,2}\in\R^{n-k,k-l}  rectangular
+*
+*        We will construct the T matrix 
+*        T = |---------------|
+*            |T_{1,1} T_{1,2}|
+*            |0       T_{2,2}|
+*            |---------------|
+*
+*        T is the triangular factor obtained from block reflectors. 
+*        To motivate the structure, assume we have already computed T_{1,1}
+*        and T_{2,2}. Then collect the associated reflectors in V_1 and V_2
+*
+*        T_{1,1}\in\R^{l, l}     upper triangular
+*        T_{2,2}\in\R^{k-l, k-l} upper triangular
+*        T_{1,2}\in\R^{l, k-l}   rectangular
+*
+*        Where l = floor(k/2)
+*
+*        Then, consider the product:
+*        
+*        (I - V_1*T_{1,1}*V_1')*(I - V_2*T_{2,2}*V_2')
+*        = I - V_1*T_{1,1}*V_1' - V_2*T_{2,2}*V_2' + V_1*T_{1,1}*V_1'*V_2*T_{2,2}*V_2'
+*        
+*        Define T_{1,2} = -T_{1,1}*V_1'*V_2*T_{2,2}
+*        
+*        Then, we can define the matrix V as 
+*        V = |-------|
+*            |V_1 V_2|
+*            |-------|
+*        
+*        So, our product is equivalent to the matrix product
+*        I - V*T*V'
+*        This means, we can compute T_{1,1} and T_{2,2}, then use this information
+*        to compute T_{1,2}
+*
+*        Compute T_{1,1} recursively
+*
+         CALL SLARFT(DIRECT, STOREV, N, L, V, LDV, TAU, T, LDT)
+*
+*        Compute T_{2,2} recursively
+*
+         CALL SLARFT(DIRECT, STOREV, N-L, K-L, V(L+1, L+1), LDV, 
+     $               TAU(L+1), T(L+1, L+1), LDT)
+*
+*        Compute T_{1,2} 
+*        T_{1,2} = V_{2,1}'
+*
+         DO J = 1, L
+            DO I = 1, K-L
+               T(J, L+I) = V(L+I, J)
+            END DO
          END DO
-      ELSE
-         PREVLASTV = 1
-         DO I = K, 1, -1
-            IF( TAU( I ).EQ.ZERO ) THEN
-*
-*              H(i)  =  I
-*
-               DO J = I, K
-                  T( J, I ) = ZERO
-               END DO
-            ELSE
-*
-*              general case
-*
-               IF( I.LT.K ) THEN
-                  IF( LSAME( STOREV, 'C' ) ) THEN
-*                    Skip any leading zeros.
-                     DO LASTV = 1, I-1
-                        IF( V( LASTV, I ).NE.ZERO ) EXIT
-                     END DO
-                     DO J = I+1, K
-                        T( J, I ) = -TAU( I ) * V( N-K+I , J )
-                     END DO
-                     J = MAX( LASTV, PREVLASTV )
-*
-*                    T(i+1:k,i) = -tau(i) * V(j:n-k+i,i+1:k)**T * V(j:n-k+i,i)
-*
-                     CALL SGEMV( 'Transpose', N-K+I-J, K-I, -TAU( I ),
-     $                           V( J, I+1 ), LDV, V( J, I ), 1, ONE,
-     $                           T( I+1, I ), 1 )
-                  ELSE
-*                    Skip any leading zeros.
-                     DO LASTV = 1, I-1
-                        IF( V( I, LASTV ).NE.ZERO ) EXIT
-                     END DO
-                     DO J = I+1, K
-                        T( J, I ) = -TAU( I ) * V( J, N-K+I )
-                     END DO
-                     J = MAX( LASTV, PREVLASTV )
-*
-*                    T(i+1:k,i) = -tau(i) * V(i+1:k,j:n-k+i) * V(i,j:n-k+i)**T
-*
-                     CALL SGEMV( 'No transpose', K-I, N-K+I-J,
-     $                    -TAU( I ), V( I+1, J ), LDV, V( I, J ), LDV,
-     $                    ONE, T( I+1, I ), 1 )
-                  END IF
-*
-*                 T(i+1:k,i) := T(i+1:k,i+1:k) * T(i+1:k,i)
-*
-                  CALL STRMV( 'Lower', 'No transpose', 'Non-unit', K-I,
-     $                        T( I+1, I+1 ), LDT, T( I+1, I ), 1 )
-                  IF( I.GT.1 ) THEN
-                     PREVLASTV = MIN( PREVLASTV, LASTV )
-                  ELSE
-                     PREVLASTV = LASTV
-                  END IF
-               END IF
-               T( I, I ) = TAU( I )
-            END IF
+*
+*        T_{1,2} = T_{1,2}*V_{2,2}
+*
+         CALL STRMM('Right', 'Lower', 'No transpose', 'Unit', L,
+     $               K-L, ONE, V(L+1, L+1), LDV, T(1, L+1), LDT)
+
+*
+*        T_{1,2} = V_{3,1}'*V_{3,2} + T_{1,2}
+*        Note: We assume K <= N, and GEMM will do nothing if N=K
+*
+         CALL SGEMM('Transpose', 'No transpose', L, K-L, N-K, ONE, 
+     $               V(K+1, 1), LDV, V(K+1, L+1), LDV, ONE, 
+     $               T(1, L+1), LDT)
+*
+*        At this point, we have that T_{1,2} = V_1'*V_2
+*        All that is left is to pre and post multiply by -T_{1,1} and T_{2,2}
+*        respectively.
+*
+*        T_{1,2} = -T_{1,1}*T_{1,2}
+*
+         CALL STRMM('Left', 'Upper', 'No transpose', 'Non-unit', L,
+     $               K-L, NEG_ONE, T, LDT, T(1, L+1), LDT)
+*
+*        T_{1,2} = T_{1,2}*T_{2,2}
+*
+         CALL STRMM('Right', 'Upper', 'No transpose', 'Non-unit', L, 
+     $               K-L, ONE, T(L+1, L+1), LDT, T(1, L+1), LDT)
+
+      ELSE IF(LQ) THEN
+*
+*        Break V apart into 6 components
+*
+*        V = |----------------------|
+*            |V_{1,1} V_{1,2} V{1,3}|
+*            |0       V_{2,2} V{2,3}|
+*            |----------------------|
+*
+*        V_{1,1}\in\R^{l,l}      unit upper triangular
+*        V_{1,2}\in\R^{l,k-l}    rectangular
+*        V_{1,3}\in\R^{l,n-k}    rectangular
+*        
+*        V_{2,2}\in\R^{k-l,k-l}  unit upper triangular
+*        V_{2,3}\in\R^{k-l,n-k}  rectangular
+*
+*        Where l = floor(k/2)
+*
+*        We will construct the T matrix 
+*        T = |---------------|
+*            |T_{1,1} T_{1,2}|
+*            |0       T_{2,2}|
+*            |---------------|
+*
+*        T is the triangular factor obtained from block reflectors. 
+*        To motivate the structure, assume we have already computed T_{1,1}
+*        and T_{2,2}. Then collect the associated reflectors in V_1 and V_2
+*
+*        T_{1,1}\in\R^{l, l}     upper triangular
+*        T_{2,2}\in\R^{k-l, k-l} upper triangular
+*        T_{1,2}\in\R^{l, k-l}   rectangular
+*
+*        Then, consider the product:
+*        
+*        (I - V_1'*T_{1,1}*V_1)*(I - V_2'*T_{2,2}*V_2)
+*        = I - V_1'*T_{1,1}*V_1 - V_2'*T_{2,2}*V_2 + V_1'*T_{1,1}*V_1*V_2'*T_{2,2}*V_2
+*        
+*        Define T_{1,2} = -T_{1,1}*V_1*V_2'*T_{2,2}
+*        
+*        Then, we can define the matrix V as 
+*        V = |---|
+*            |V_1|
+*            |V_2|
+*            |---|
+*        
+*        So, our product is equivalent to the matrix product
+*        I - V'*T*V
+*        This means, we can compute T_{1,1} and T_{2,2}, then use this information
+*        to compute T_{1,2}
+*
+*        Compute T_{1,1} recursively
+*
+         CALL SLARFT(DIRECT, STOREV, N, L, V, LDV, TAU, T, LDT)
+*
+*        Compute T_{2,2} recursively
+*
+         CALL SLARFT(DIRECT, STOREV, N-L, K-L, V(L+1, L+1), LDV, 
+     $               TAU(L+1), T(L+1, L+1), LDT)
+
+*
+*        Compute T_{1,2}
+*        T_{1,2} = V_{1,2}
+*
+         CALL SLACPY('All', L, K-L, V(1, L+1), LDV, T(1, L+1), LDT)
+*
+*        T_{1,2} = T_{1,2}*V_{2,2}'
+*
+         CALL STRMM('Right', 'Upper', 'Transpose', 'Unit', L, K-L,
+     $               ONE, V(L+1, L+1), LDV, T(1, L+1), LDT)
+
+*
+*        T_{1,2} = V_{1,3}*V_{2,3}' + T_{1,2}
+*        Note: We assume K <= N, and GEMM will do nothing if N=K
+*
+         CALL SGEMM('No transpose', 'Transpose', L, K-L, N-K, ONE,
+     $               V(1, K+1), LDV, V(L+1, K+1), LDV, ONE, 
+     $               T(1, L+1), LDT)
+*
+*        At this point, we have that T_{1,2} = V_1*V_2'
+*        All that is left is to pre and post multiply by -T_{1,1} and T_{2,2}
+*        respectively.
+*
+*        T_{1,2} = -T_{1,1}*T_{1,2}
+*
+         CALL STRMM('Left', 'Upper', 'No transpose', 'Non-unit', L,
+     $               K-L, NEG_ONE, T, LDT, T(1, L+1), LDT)
+
+*
+*        T_{1,2} = T_{1,2}*T_{2,2}
+*
+         CALL STRMM('Right', 'Upper', 'No transpose', 'Non-unit', L,
+     $               K-L, ONE, T(L+1, L+1), LDT, T(1, L+1), LDT)
+      ELSE IF(QL) THEN
+*
+*        Break V apart into 6 components
+*
+*        V = |---------------|
+*            |V_{1,1} V_{1,2}|
+*            |V_{2,1} V_{2,2}|
+*            |0       V_{3,2}|
+*            |---------------|
+*
+*        V_{1,1}\in\R^{n-k,k-l}  rectangular
+*        V_{2,1}\in\R^{k-l,k-l}  unit upper triangular
+*        
+*        V_{1,2}\in\R^{n-k,l}    rectangular
+*        V_{2,2}\in\R^{k-l,l}    rectangular
+*        V_{3,2}\in\R^{l,l}      unit upper triangular
+*
+*        We will construct the T matrix 
+*        T = |---------------|
+*            |T_{1,1} 0      |
+*            |T_{2,1} T_{2,2}|
+*            |---------------|
+*
+*        T is the triangular factor obtained from block reflectors. 
+*        To motivate the structure, assume we have already computed T_{1,1}
+*        and T_{2,2}. Then collect the associated reflectors in V_1 and V_2
+*
+*        T_{1,1}\in\R^{k-l, k-l} non-unit lower triangular
+*        T_{2,2}\in\R^{l, l}     non-unit lower triangular
+*        T_{2,1}\in\R^{k-l, l}   rectangular
+*
+*        Where l = floor(k/2)
+*
+*        Then, consider the product:
+*        
+*        (I - V_2*T_{2,2}*V_2')*(I - V_1*T_{1,1}*V_1')
+*        = I - V_2*T_{2,2}*V_2' - V_1*T_{1,1}*V_1' + V_2*T_{2,2}*V_2'*V_1*T_{1,1}*V_1'
+*        
+*        Define T_{2,1} = -T_{2,2}*V_2'*V_1*T_{1,1}
+*        
+*        Then, we can define the matrix V as 
+*        V = |-------|
+*            |V_1 V_2|
+*            |-------|
+*        
+*        So, our product is equivalent to the matrix product
+*        I - V*T*V'
+*        This means, we can compute T_{1,1} and T_{2,2}, then use this information
+*        to compute T_{2,1}
+*
+*        Compute T_{1,1} recursively
+*
+         CALL SLARFT(DIRECT, STOREV, N-L, K-L, V, LDV, TAU, T, LDT)
+*
+*        Compute T_{2,2} recursively
+*
+         CALL SLARFT(DIRECT, STOREV, N, L, V(1, K-L+1), LDV,
+     $               TAU(K-L+1), T(K-L+1, K-L+1), LDT)
+*
+*        Compute T_{2,1}
+*        T_{2,1} = V_{2,2}'
+*
+         DO J = 1, K-L
+            DO I = 1, L
+               T(K-L+I, J) = V(N-K+J, K-L+I)
+            END DO
          END DO
-      END IF
-      RETURN
 *
-*     End of SLARFT
+*        T_{2,1} = T_{2,1}*V_{2,1}
+*
+         CALL STRMM('Right', 'Upper', 'No transpose', 'Unit', L,
+     $               K-L, ONE, V(N-K+1, 1), LDV, T(K-L+1, 1), LDT)
+
+*
+*        T_{2,1} = V_{2,2}'*V_{2,1} + T_{2,1}
+*        Note: We assume K <= N, and GEMM will do nothing if N=K
+*
+         CALL SGEMM('Transpose', 'No transpose', L, K-L, N-K, ONE,
+     $               V(1, K-L+1), LDV, V, LDV, ONE, T(K-L+1, 1), 
+     $               LDT)
+*
+*        At this point, we have that T_{2,1} = V_2'*V_1
+*        All that is left is to pre and post multiply by -T_{2,2} and T_{1,1}
+*        respectively.
+*
+*        T_{2,1} = -T_{2,2}*T_{2,1}
+*
+         CALL STRMM('Left', 'Lower', 'No transpose', 'Non-unit', L,
+     $               K-L, NEG_ONE, T(K-L+1, K-L+1), LDT, 
+     $               T(K-L+1, 1), LDT)
 *
-      END
+*        T_{2,1} = T_{2,1}*T_{1,1}
+*
+         CALL STRMM('Right', 'Lower', 'No transpose', 'Non-unit', L,
+     $               K-L, ONE, T, LDT, T(K-L+1, 1), LDT)
+      ELSE
+*
+*        Else means RQ case
+*
+*        Break V apart into 6 components
+*
+*        V = |-----------------------|
+*            |V_{1,1} V_{1,2} 0      |
+*            |V_{2,1} V_{2,2} V_{2,3}|
+*            |-----------------------|
+*
+*        V_{1,1}\in\R^{k-l,n-k}  rectangular
+*        V_{1,2}\in\R^{k-l,k-l}  unit lower triangular
+*
+*        V_{2,1}\in\R^{l,n-k}    rectangular
+*        V_{2,2}\in\R^{l,k-l}    rectangular
+*        V_{2,3}\in\R^{l,l}      unit lower triangular
+*
+*        We will construct the T matrix 
+*        T = |---------------|
+*            |T_{1,1} 0      |
+*            |T_{2,1} T_{2,2}|
+*            |---------------|
+*
+*        T is the triangular factor obtained from block reflectors. 
+*        To motivate the structure, assume we have already computed T_{1,1}
+*        and T_{2,2}. Then collect the associated reflectors in V_1 and V_2
+*
+*        T_{1,1}\in\R^{k-l, k-l} non-unit lower triangular
+*        T_{2,2}\in\R^{l, l}     non-unit lower triangular
+*        T_{2,1}\in\R^{k-l, l}   rectangular
+*
+*        Where l = floor(k/2)
+*
+*        Then, consider the product:
+*        
+*        (I - V_2'*T_{2,2}*V_2)*(I - V_1'*T_{1,1}*V_1)
+*        = I - V_2'*T_{2,2}*V_2 - V_1'*T_{1,1}*V_1 + V_2'*T_{2,2}*V_2*V_1'*T_{1,1}*V_1
+*        
+*        Define T_{2,1} = -T_{2,2}*V_2*V_1'*T_{1,1}
+*        
+*        Then, we can define the matrix V as 
+*        V = |---|
+*            |V_1|
+*            |V_2|
+*            |---|
+*        
+*        So, our product is equivalent to the matrix product
+*        I - V'TV
+*        This means, we can compute T_{1,1} and T_{2,2}, then use this information
+*        to compute T_{2,1}
+*
+*        Compute T_{1,1} recursively
+*
+         CALL SLARFT(DIRECT, STOREV, N-L, K-L, V, LDV, TAU, T, LDT)
+*
+*        Compute T_{2,2} recursively
+*
+         CALL SLARFT(DIRECT, STOREV, N, L, V(K-L+1, 1), LDV,
+     $               TAU(K-L+1), T(K-L+1, K-L+1), LDT)
+*
+*        Compute T_{2,1}
+*        T_{2,1} = V_{2,2}
+*
+         CALL SLACPY('All', L, K-L, V(K-L+1, N-K+1), LDV,
+     $      T(K-L+1, 1), LDT)
+
+*
+*        T_{2,1} = T_{2,1}*V_{1,2}'
+*
+         CALL STRMM('Right', 'Lower', 'Transpose', 'Unit', L, K-L,
+     $               ONE, V(1, N-K+1), LDV, T(K-L+1, 1), LDT)
+
+*
+*        T_{2,1} = V_{2,1}*V_{1,1}' + T_{2,1} 
+*        Note: We assume K <= N, and GEMM will do nothing if N=K
+*
+         CALL SGEMM('No transpose', 'Transpose', L, K-L, N-K, ONE, 
+     $               V(K-L+1, 1), LDV, V, LDV, ONE, T(K-L+1, 1),
+     $               LDT)
+
+*
+*        At this point, we have that T_{2,1} = V_2*V_1'
+*        All that is left is to pre and post multiply by -T_{2,2} and T_{1,1}
+*        respectively.
+*
+*        T_{2,1} = -T_{2,2}*T_{2,1}
+*
+         CALL STRMM('Left', 'Lower', 'No tranpose', 'Non-unit', L,
+     $               K-L, NEG_ONE, T(K-L+1, K-L+1), LDT, 
+     $               T(K-L+1, 1), LDT)
+
+*
+*        T_{2,1} = T_{2,1}*T_{1,1}
+*
+         CALL STRMM('Right', 'Lower', 'No tranpose', 'Non-unit', L,
+     $               K-L, ONE, T, LDT, T(K-L+1, 1), LDT)
+      END IF
+      END SUBROUTINE
diff --git a/SRC/slarft_lvl2.f b/SRC/slarft_lvl2.f
new file mode 100644
index 0000000000..7107a91d5d
--- /dev/null
+++ b/SRC/slarft_lvl2.f
@@ -0,0 +1,326 @@
+*> \brief \b SLARFT_LVL2: Level 2 BLAS version for terminating case of SLARFT.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download SLARFT_LVL2 + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarft.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/slarft.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarft.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE SLARFT_LVL2( DIRECT, STOREV, N, K, V, LDV, TAU,
+*                    T, LDT )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          DIRECT, STOREV
+*       INTEGER            K, LDT, LDV, N
+*       ..
+*       .. Array Arguments ..
+*       REAL               T( LDT, * ), TAU( * ), V( LDV, * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> SLARFT_LVL2 forms the triangular factor T of a real block reflector H
+*> of order n, which is defined as a product of k elementary reflectors.
+*>
+*> If DIRECT = 'F', H = H(1) H(2) . . . H(k) and T is upper triangular;
+*>
+*> If DIRECT = 'B', H = H(k) . . . H(2) H(1) and T is lower triangular.
+*>
+*> If STOREV = 'C', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th column of the array V, and
+*>
+*>    H  =  I - V * T * V**T
+*>
+*> If STOREV = 'R', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th row of the array V, and
+*>
+*>    H  =  I - V**T * T * V
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] DIRECT
+*> \verbatim
+*>          DIRECT is CHARACTER*1
+*>          Specifies the order in which the elementary reflectors are
+*>          multiplied to form the block reflector:
+*>          = 'F': H = H(1) H(2) . . . H(k) (Forward)
+*>          = 'B': H = H(k) . . . H(2) H(1) (Backward)
+*> \endverbatim
+*>
+*> \param[in] STOREV
+*> \verbatim
+*>          STOREV is CHARACTER*1
+*>          Specifies how the vectors which define the elementary
+*>          reflectors are stored (see also Further Details):
+*>          = 'C': columnwise
+*>          = 'R': rowwise
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the block reflector H. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The order of the triangular factor T (= the number of
+*>          elementary reflectors). K >= 1.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is REAL array, dimension
+*>                               (LDV,K) if STOREV = 'C'
+*>                               (LDV,N) if STOREV = 'R'
+*>          The matrix V. See further details.
+*> \endverbatim
+*>
+*> \param[in] LDV
+*> \verbatim
+*>          LDV is INTEGER
+*>          The leading dimension of the array V.
+*>          If STOREV = 'C', LDV >= max(1,N); if STOREV = 'R', LDV >= K.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is REAL array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i).
+*> \endverbatim
+*>
+*> \param[out] T
+*> \verbatim
+*>          T is REAL array, dimension (LDT,K)
+*>          The k by k triangular factor T of the block reflector.
+*>          If DIRECT = 'F', T is upper triangular; if DIRECT = 'B', T is
+*>          lower triangular. The rest of the array is not used.
+*> \endverbatim
+*>
+*> \param[in] LDT
+*> \verbatim
+*>          LDT is INTEGER
+*>          The leading dimension of the array T. LDT >= K.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup larft
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The shape of the matrix V and the storage of the vectors which define
+*>  the H(i) is best illustrated by the following example with n = 5 and
+*>  k = 3. The elements equal to 1 are not stored.
+*>
+*>  DIRECT = 'F' and STOREV = 'C':         DIRECT = 'F' and STOREV = 'R':
+*>
+*>               V = (  1       )                 V = (  1 v1 v1 v1 v1 )
+*>                   ( v1  1    )                     (     1 v2 v2 v2 )
+*>                   ( v1 v2  1 )                     (        1 v3 v3 )
+*>                   ( v1 v2 v3 )
+*>                   ( v1 v2 v3 )
+*>
+*>  DIRECT = 'B' and STOREV = 'C':         DIRECT = 'B' and STOREV = 'R':
+*>
+*>               V = ( v1 v2 v3 )                 V = ( v1 v1  1       )
+*>                   ( v1 v2 v3 )                     ( v2 v2 v2  1    )
+*>                   (  1 v2 v3 )                     ( v3 v3 v3 v3  1 )
+*>                   (     1 v3 )
+*>                   (        1 )
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE SLARFT_LVL2( DIRECT, STOREV, N, K, V, LDV, TAU,
+     $            T, LDT )
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          DIRECT, STOREV
+      INTEGER            K, LDT, LDV, N
+*     ..
+*     .. Array Arguments ..
+      REAL               T( LDT, * ), TAU( * ), V( LDV, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      REAL               ONE, ZERO
+      PARAMETER          ( ONE = 1.0E+0, ZERO = 0.0E+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J, PREVLASTV, LASTV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           SGEMV, STRMV
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+*
+      IF( LSAME( DIRECT, 'F' ) ) THEN
+         PREVLASTV = N
+         DO I = 1, K
+            PREVLASTV = MAX( I, PREVLASTV )
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = 1, I
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( LSAME( STOREV, 'C' ) ) THEN
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( LASTV, I ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * V( I , J )
+                  END DO
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(i:j,1:i-1)**T * V(i:j,i)
+*
+                  CALL SGEMV( 'Transpose', J-I, I-1, -TAU( I ),
+     $                        V( I+1, 1 ), LDV, V( I+1, I ), 1, ONE,
+     $                        T( 1, I ), 1 )
+               ELSE
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( I, LASTV ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * V( J , I )
+                  END DO
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(1:i-1,i:j) * V(i,i:j)**T
+*
+                  CALL SGEMV( 'No transpose', I-1, J-I, -TAU( I ),
+     $                        V( 1, I+1 ), LDV, V( I, I+1 ), LDV,
+     $                        ONE, T( 1, I ), 1 )
+               END IF
+*
+*              T(1:i-1,i) := T(1:i-1,1:i-1) * T(1:i-1,i)
+*
+               CALL STRMV( 'Upper', 'No transpose', 'Non-unit', I-1,
+     $                     T,
+     $                     LDT, T( 1, I ), 1 )
+               T( I, I ) = TAU( I )
+               IF( I.GT.1 ) THEN
+                  PREVLASTV = MAX( PREVLASTV, LASTV )
+               ELSE
+                  PREVLASTV = LASTV
+               END IF
+            END IF
+         END DO
+      ELSE
+         PREVLASTV = 1
+         DO I = K, 1, -1
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = I, K
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( I.LT.K ) THEN
+                  IF( LSAME( STOREV, 'C' ) ) THEN
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( LASTV, I ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * V( N-K+I , J )
+                     END DO
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(j:n-k+i,i+1:k)**T * V(j:n-k+i,i)
+*
+                     CALL SGEMV( 'Transpose', N-K+I-J, K-I,
+     $                           -TAU( I ),
+     $                           V( J, I+1 ), LDV, V( J, I ), 1, ONE,
+     $                           T( I+1, I ), 1 )
+                  ELSE
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( I, LASTV ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * V( J, N-K+I )
+                     END DO
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(i+1:k,j:n-k+i) * V(i,j:n-k+i)**T
+*
+                     CALL SGEMV( 'No transpose', K-I, N-K+I-J,
+     $                    -TAU( I ), V( I+1, J ), LDV, V( I, J ), LDV,
+     $                    ONE, T( I+1, I ), 1 )
+                  END IF
+*
+*                 T(i+1:k,i) := T(i+1:k,i+1:k) * T(i+1:k,i)
+*
+                  CALL STRMV( 'Lower', 'No transpose', 'Non-unit',
+     $                        K-I,
+     $                        T( I+1, I+1 ), LDT, T( I+1, I ), 1 )
+                  IF( I.GT.1 ) THEN
+                     PREVLASTV = MIN( PREVLASTV, LASTV )
+                  ELSE
+                     PREVLASTV = LASTV
+                  END IF
+               END IF
+               T( I, I ) = TAU( I )
+            END IF
+         END DO
+      END IF
+      RETURN
+*
+*     End of SLARFT_LVL2
+*
+      END
diff --git a/SRC/slarfx.f b/SRC/slarfx.f
index 4f820331db..f02774740a 100644
--- a/SRC/slarfx.f
+++ b/SRC/slarfx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARFX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarfx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarfx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,10 +111,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup larfx
 *
 *  =====================================================================
       SUBROUTINE SLARFX( SIDE, M, N, V, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slarfy.f b/SRC/slarfy.f
index 39ba4d977f..362ea6e6ba 100644
--- a/SRC/slarfy.f
+++ b/SRC/slarfy.f
@@ -101,10 +101,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup larfy
 *
 *  =====================================================================
       SUBROUTINE SLARFY( UPLO, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slargv.f b/SRC/slargv.f
index e2572126eb..784fb15d2c 100644
--- a/SRC/slargv.f
+++ b/SRC/slargv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slargv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slargv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup largv
 *
 *  =====================================================================
       SUBROUTINE SLARGV( N, X, INCX, Y, INCY, C, INCC )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slarmm.f b/SRC/slarmm.f
new file mode 100644
index 0000000000..91462e1028
--- /dev/null
+++ b/SRC/slarmm.f
@@ -0,0 +1,99 @@
+*> \brief \b SLARMM
+*
+*  Definition:
+*  ===========
+*
+*      REAL FUNCTION SLARMM( ANORM, BNORM, CNORM )
+*
+*     .. Scalar Arguments ..
+*      REAL               ANORM, BNORM, CNORM
+*     ..
+*
+*>  \par Purpose:
+*  =======
+*>
+*> \verbatim
+*>
+*> SLARMM returns a factor s in (0, 1] such that the linear updates
+*>
+*>    (s * C) - A * (s * B)  and  (s * C) - (s * A) * B
+*>
+*> cannot overflow, where A, B, and C are matrices of conforming
+*> dimensions.
+*>
+*> This is an auxiliary routine so there is no argument checking.
+*> \endverbatim
+*
+*  Arguments:
+*  =========
+*
+*> \param[in] ANORM
+*> \verbatim
+*>          ANORM is REAL
+*>          The infinity norm of A. ANORM >= 0.
+*>          The number of rows of the matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] BNORM
+*> \verbatim
+*>          BNORM is REAL
+*>          The infinity norm of B. BNORM >= 0.
+*> \endverbatim
+*>
+*> \param[in] CNORM
+*> \verbatim
+*>          CNORM is REAL
+*>          The infinity norm of C. CNORM >= 0.
+*> \endverbatim
+*>
+*>
+*  =====================================================================
+*>  References:
+*>    C. C. Kjelgaard Mikkelsen and L. Karlsson, Blocked Algorithms for
+*>    Robust Solution of Triangular Linear Systems. In: International
+*>    Conference on Parallel Processing and Applied Mathematics, pages
+*>    68--78. Springer, 2017.
+*>
+*> \ingroup larmm
+*  =====================================================================
+
+      REAL FUNCTION SLARMM( ANORM, BNORM, CNORM )
+      IMPLICIT NONE
+*     .. Scalar Arguments ..
+      REAL               ANORM, BNORM, CNORM
+*     .. Parameters ..
+      REAL               ONE, HALF, FOUR
+      PARAMETER          ( ONE = 1.0E0, HALF = 0.5E+0, FOUR = 4.0E+0 )
+*     ..
+*     .. Local Scalars ..
+      REAL               BIGNUM, SMLNUM
+*     ..
+*     .. External Functions ..
+      REAL               SLAMCH
+      EXTERNAL           SLAMCH
+*     ..
+*     .. Executable Statements ..
+*
+*
+*     Determine machine dependent parameters to control overflow.
+*
+      SMLNUM = SLAMCH( 'Safe minimum' ) / SLAMCH( 'Precision' )
+      BIGNUM = ( ONE / SMLNUM ) / FOUR
+*
+*     Compute a scale factor.
+*
+      SLARMM = ONE
+      IF( BNORM .LE. ONE ) THEN
+         IF( ANORM * BNORM .GT. BIGNUM - CNORM ) THEN
+            SLARMM = HALF
+         END IF
+      ELSE
+         IF( ANORM .GT. (BIGNUM - CNORM) / BNORM ) THEN
+            SLARMM = HALF / BNORM
+         END IF
+      END IF
+      RETURN
+*
+*     ==== End of SLARMM ====
+*
+      END
diff --git a/SRC/slarnv.f b/SRC/slarnv.f
index 8b927fbdba..4831e9f8b8 100644
--- a/SRC/slarnv.f
+++ b/SRC/slarnv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARNV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarnv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarnv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -79,7 +77,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larnv
 *
 *> \par Further Details:
 *  =====================
@@ -94,6 +92,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLARNV( IDIST, ISEED, N, X )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slarra.f b/SRC/slarra.f
index be81b0f691..b4154b5c6e 100644
--- a/SRC/slarra.f
+++ b/SRC/slarra.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARRA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarra.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarra.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,7 +117,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larra
 *
 *> \par Contributors:
 *  ==================
@@ -133,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE SLARRA( N, D, E, E2, SPLTOL, TNRM,
      $                    NSPLIT, ISPLIT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -164,6 +163,7 @@ SUBROUTINE SLARRA( N, D, E, E2, SPLTOL, TNRM,
 *     .. Executable Statements ..
 *
       INFO = 0
+      NSPLIT = 1
 *
 *     Quick return if possible
 *
@@ -172,7 +172,6 @@ SUBROUTINE SLARRA( N, D, E, E2, SPLTOL, TNRM,
       END IF
 *
 *     Compute splitting points
-      NSPLIT = 1
       IF(SPLTOL.LT.ZERO) THEN
 *        Criterion based on absolute off-diagonal value
          TMP1 = ABS(SPLTOL)* TNRM
diff --git a/SRC/slarrb.f b/SRC/slarrb.f
index cf670dad9a..6e43f126f8 100644
--- a/SRC/slarrb.f
+++ b/SRC/slarrb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARRB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarrb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarrb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -178,7 +176,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larrb
 *
 *> \par Contributors:
 *  ==================
@@ -193,6 +191,7 @@
       SUBROUTINE SLARRB( N, D, LLD, IFIRST, ILAST, RTOL1,
      $                   RTOL2, OFFSET, W, WGAP, WERR, WORK, IWORK,
      $                   PIVMIN, SPDIAM, TWIST, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slarrc.f b/SRC/slarrc.f
index 060051539f..bf5a3e65f9 100644
--- a/SRC/slarrc.f
+++ b/SRC/slarrc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARRC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarrc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarrc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,7 +118,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larrc
 *
 *> \par Contributors:
 *  ==================
@@ -134,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE SLARRC( JOBT, N, VL, VU, D, E, PIVMIN,
      $                            EIGCNT, LCNT, RCNT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -167,6 +166,9 @@ SUBROUTINE SLARRC( JOBT, N, VL, VU, D, E, PIVMIN,
 *     .. Executable Statements ..
 *
       INFO = 0
+      LCNT = 0
+      RCNT = 0
+      EIGCNT = 0
 *
 *     Quick return if possible
 *
@@ -174,9 +176,6 @@ SUBROUTINE SLARRC( JOBT, N, VL, VU, D, E, PIVMIN,
          RETURN
       END IF
 *
-      LCNT = 0
-      RCNT = 0
-      EIGCNT = 0
       MATT = LSAME( JOBT, 'T' )
 
 
diff --git a/SRC/slarrd.f b/SRC/slarrd.f
index 7df8e95fca..89c9aed4a5 100644
--- a/SRC/slarrd.f
+++ b/SRC/slarrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -319,13 +317,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larrd
 *
 *  =====================================================================
       SUBROUTINE SLARRD( RANGE, ORDER, N, VL, VU, IL, IU, GERS,
      $                    RELTOL, D, E, E2, PIVMIN, NSPLIT, ISPLIT,
      $                    M, W, WERR, WL, WU, IBLOCK, INDEXW,
      $                    WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -381,6 +380,7 @@ SUBROUTINE SLARRD( RANGE, ORDER, N, VL, VU, IL, IU, GERS,
 *     .. Executable Statements ..
 *
       INFO = 0
+      M = 0
 *
 *     Quick return if possible
 *
@@ -424,14 +424,9 @@ SUBROUTINE SLARRD( RANGE, ORDER, N, VL, VU, IL, IU, GERS,
       END IF
 
 *     Initialize error flags
-      INFO = 0
       NCNVRG = .FALSE.
       TOOFEW = .FALSE.
 
-*     Quick return if possible
-      M = 0
-      IF( N.EQ.0 ) RETURN
-
 *     Simplification:
       IF( IRANGE.EQ.INDRNG .AND. IL.EQ.1 .AND. IU.EQ.N ) IRANGE = 1
 
@@ -470,8 +465,8 @@ SUBROUTINE SLARRD( RANGE, ORDER, N, VL, VU, IL, IU, GERS,
  5    CONTINUE
 *     Compute global Gerschgorin bounds and spectral diameter
       TNORM = MAX( ABS( GL ), ABS( GU ) )
-      GL = GL - FUDGE*TNORM*EPS*N - FUDGE*TWO*PIVMIN
-      GU = GU + FUDGE*TNORM*EPS*N + FUDGE*TWO*PIVMIN
+      GL = GL - FUDGE*TNORM*EPS*REAL( N ) - FUDGE*TWO*PIVMIN
+      GU = GU + FUDGE*TNORM*EPS*REAL( N ) + FUDGE*TWO*PIVMIN
 *     [JAN/28/2009] remove the line below since SPDIAM variable not use
 *     SPDIAM = GU - GL
 *     Input arguments for SLAEBZ:
@@ -644,8 +639,8 @@ SUBROUTINE SLARRD( RANGE, ORDER, N, VL, VU, IL, IU, GERS,
 *           SPDIAM = GU - GL
 *           GL = GL - FUDGE*SPDIAM*EPS*IN - FUDGE*PIVMIN
 *           GU = GU + FUDGE*SPDIAM*EPS*IN + FUDGE*PIVMIN
-            GL = GL - FUDGE*TNORM*EPS*IN - FUDGE*PIVMIN
-            GU = GU + FUDGE*TNORM*EPS*IN + FUDGE*PIVMIN
+            GL = GL - FUDGE*TNORM*EPS*REAL( IN ) - FUDGE*PIVMIN
+            GU = GU + FUDGE*TNORM*EPS*REAL( IN ) + FUDGE*PIVMIN
 *
             IF( IRANGE.GT.1 ) THEN
                IF( GU.LT.WL ) THEN
@@ -680,7 +675,8 @@ SUBROUTINE SLARRD( RANGE, ORDER, N, VL, VU, IL, IU, GERS,
 *           Compute Eigenvalues
             ITMAX = INT( ( LOG( GU-GL+PIVMIN )-LOG( PIVMIN ) ) /
      $              LOG( TWO ) ) + 2
-            CALL SLAEBZ( 2, ITMAX, IN, IN, 1, NB, ATOLI, RTOLI, PIVMIN,
+            CALL SLAEBZ( 2, ITMAX, IN, IN, 1, NB, ATOLI, RTOLI,
+     $                   PIVMIN,
      $                   D( IBEGIN ), E( IBEGIN ), E2( IBEGIN ),
      $                   IDUMMA, WORK( N+1 ), WORK( N+2*IN+1 ), IOUT,
      $                   IWORK, W( M+1 ), IBLOCK( M+1 ), IINFO )
diff --git a/SRC/slarre.f b/SRC/slarre.f
index 34dd71fd9d..4f50f40cf1 100644
--- a/SRC/slarre.f
+++ b/SRC/slarre.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARRE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarre.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarre.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -51,7 +49,7 @@
 *> SSTEMR to compute the eigenvectors of T.
 *> The accuracy varies depending on whether bisection is used to
 *> find a few eigenvalues or the dqds algorithm (subroutine SLASQ2) to
-*> conpute all and then discard any unwanted one.
+*> compute all and then discard any unwanted one.
 *> As an added benefit, SLARRE also outputs the n
 *> Gerschgorin intervals for the matrices L_i D_i L_i^T.
 *> \endverbatim
@@ -276,7 +274,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larre
 *
 *> \par Further Details:
 *  =====================
@@ -302,6 +300,7 @@ SUBROUTINE SLARRE( RANGE, N, VL, VU, IL, IU, D, E, E2,
      $                    RTOL1, RTOL2, SPLTOL, NSPLIT, ISPLIT, M,
      $                    W, WERR, WGAP, IBLOCK, INDEXW, GERS, PIVMIN,
      $                    WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -356,7 +355,8 @@ SUBROUTINE SLARRE( RANGE, N, VL, VU, IL, IU, D, E, E2,
 
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLARNV, SLARRA, SLARRB, SLARRC, SLARRD,
+      EXTERNAL           SCOPY, SLARNV, SLARRA, SLARRB, SLARRC,
+     $                   SLARRD,
      $                   SLASQ2, SLARRK
 *     ..
 *     .. Intrinsic Functions ..
@@ -367,6 +367,8 @@ SUBROUTINE SLARRE( RANGE, N, VL, VU, IL, IU, D, E, E2,
 *
 
       INFO = 0
+      NSPLIT = 0
+      M = 0
 *
 *     Quick return if possible
 *
@@ -384,8 +386,6 @@ SUBROUTINE SLARRE( RANGE, N, VL, VU, IL, IU, D, E, E2,
          IRANGE = INDRNG
       END IF
 
-      M = 0
-
 *     Get machine constants
       SAFMIN = SLAMCH( 'S' )
       EPS = SLAMCH( 'P' )
@@ -553,7 +553,8 @@ SUBROUTINE SLARRE( RANGE, N, VL, VU, IL, IU, D, E, E2,
             ELSE
 
 *              Decide whether dqds or bisection is more efficient
-               USEDQD = ( (MB .GT. FAC*IN) .AND. (.NOT.FORCEB) )
+               USEDQD = ( (REAL( MB ) .GT. FAC*REAL( IN )) .AND.
+     $                  (.NOT.FORCEB) )
                WEND = WBEGIN + MB - 1
 *              Calculate gaps for the current block
 *              In later stages, when representations for individual
@@ -682,7 +683,7 @@ SUBROUTINE SLARRE( RANGE, N, VL, VU, IL, IU, D, E, E2,
          IF( USEDQD ) THEN
 *           The initial SIGMA was to the outer end of the spectrum
 *           the matrix is definite and we need not retreat.
-            TAU = SPDIAM*EPS*N + TWO*PIVMIN
+            TAU = SPDIAM*EPS*REAL( N ) + TWO*PIVMIN
             TAU = MAX( TAU,TWO*EPS*ABS(SIGMA) )
          ELSE
             IF(MB.GT.1) THEN
@@ -739,10 +740,12 @@ SUBROUTINE SLARRE( RANGE, N, VL, VU, IL, IU, D, E, E2,
                   IF( SGNDEF.EQ.ONE ) THEN
 *                    The fudged Gerschgorin shift should succeed
                      SIGMA =
-     $                    GL - FUDGE*SPDIAM*EPS*N - FUDGE*TWO*PIVMIN
+     $                    GL - FUDGE*SPDIAM*EPS*REAL( N ) -
+     $                    FUDGE*TWO*PIVMIN
                   ELSE
                      SIGMA =
-     $                    GU + FUDGE*SPDIAM*EPS*N + FUDGE*TWO*PIVMIN
+     $                    GU + FUDGE*SPDIAM*EPS*REAL( N ) +
+     $                    FUDGE*TWO*PIVMIN
                   END IF
                ELSE
                   SIGMA = SIGMA - SGNDEF * TAU
diff --git a/SRC/slarrf.f b/SRC/slarrf.f
index 3a6bea32d5..33486f73ea 100644
--- a/SRC/slarrf.f
+++ b/SRC/slarrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -174,7 +172,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larrf
 *
 *> \par Contributors:
 *  ==================
@@ -190,6 +188,7 @@ SUBROUTINE SLARRF( N, D, L, LD, CLSTRT, CLEND,
      $                   W, WGAP, WERR,
      $                   SPDIAM, CLGAPL, CLGAPR, PIVMIN, SIGMA,
      $                   DPLUS, LPLUS, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slarrj.f b/SRC/slarrj.f
index d56e62c1d6..6cfb2eec87 100644
--- a/SRC/slarrj.f
+++ b/SRC/slarrj.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARRJ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarrj.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarrj.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -150,7 +148,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larrj
 *
 *> \par Contributors:
 *  ==================
@@ -165,6 +163,7 @@
       SUBROUTINE SLARRJ( N, D, E2, IFIRST, ILAST,
      $                   RTOL, OFFSET, W, WERR, WORK, IWORK,
      $                   PIVMIN, SPDIAM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slarrk.f b/SRC/slarrk.f
index e553d84524..010df87e38 100644
--- a/SRC/slarrk.f
+++ b/SRC/slarrk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARRK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarrk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarrk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -137,11 +135,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larrk
 *
 *  =====================================================================
       SUBROUTINE SLARRK( N, IW, GL, GU,
      $                    D, E2, PIVMIN, RELTOL, W, WERR, INFO)
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -195,8 +194,8 @@ SUBROUTINE SLARRK( N, IW, GL, GU,
 
       INFO = -1
 
-      LEFT = GL - FUDGE*TNORM*EPS*N - FUDGE*TWO*PIVMIN
-      RIGHT = GU + FUDGE*TNORM*EPS*N + FUDGE*TWO*PIVMIN
+      LEFT = GL - FUDGE*TNORM*EPS*REAL( N ) - FUDGE*TWO*PIVMIN
+      RIGHT = GU + FUDGE*TNORM*EPS*REAL( N ) + FUDGE*TWO*PIVMIN
       IT = 0
 
  10   CONTINUE
diff --git a/SRC/slarrr.f b/SRC/slarrr.f
index d18465bc8b..520ef6fba2 100644
--- a/SRC/slarrr.f
+++ b/SRC/slarrr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARRR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarrr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarrr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -78,7 +76,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup larrr
 *
 *> \par Contributors:
 *  ==================
@@ -91,6 +89,7 @@
 *
 *  =====================================================================
       SUBROUTINE SLARRR( N, D, E, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slarrv.f b/SRC/slarrv.f
index 9d72b339a9..59ad497704 100644
--- a/SRC/slarrv.f
+++ b/SRC/slarrv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARRV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarrv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarrv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -272,7 +270,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup larrv
 *
 *> \par Contributors:
 *  ==================
@@ -289,6 +287,7 @@ SUBROUTINE SLARRV( N, VL, VU, D, L, PIVMIN,
      $                   RTOL1, RTOL2, W, WERR, WGAP,
      $                   IBLOCK, INDEXW, GERS, Z, LDZ, ISUPPZ,
      $                   WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -337,7 +336,8 @@ SUBROUTINE SLARRV( N, VL, VU, D, L, PIVMIN,
       EXTERNAL           SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLAR1V, SLARRB, SLARRF, SLASET,
+      EXTERNAL           SCOPY, SLAR1V, SLARRB, SLARRF,
+     $                   SLASET,
      $                   SSCAL
 *     ..
 *     .. Intrinsic Functions ..
@@ -350,7 +350,7 @@ SUBROUTINE SLARRV( N, VL, VU, D, L, PIVMIN,
 *
 *     Quick return if possible
 *
-      IF( N.LE.0 ) THEN
+      IF( (N.LE.0).OR.(M.LE.0) ) THEN
          RETURN
       END IF
 *
diff --git a/SRC/slarscl2.f b/SRC/slarscl2.f
index 5726f12cd5..ce5cbbbfc3 100644
--- a/SRC/slarscl2.f
+++ b/SRC/slarscl2.f
@@ -1,11 +1,10 @@
-*> \brief \b SLARSCL2 performs reciprocal diagonal scaling on a vector.
+*> \brief \b SLARSCL2 performs reciprocal diagonal scaling on a matrix.
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARSCL2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarscl2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarscl2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -33,7 +31,7 @@
 *>
 *> \verbatim
 *>
-*> SLARSCL2 performs a reciprocal diagonal scaling on an vector:
+*> SLARSCL2 performs a reciprocal diagonal scaling on a matrix:
 *>   x <-- inv(D) * x
 *> where the diagonal matrix D is stored as a vector.
 *>
@@ -65,14 +63,14 @@
 *> \param[in,out] X
 *> \verbatim
 *>          X is REAL array, dimension (LDX,N)
-*>     On entry, the vector X to be scaled by D.
-*>     On exit, the scaled vector.
+*>     On entry, the matrix X to be scaled by D.
+*>     On exit, the scaled matrix.
 *> \endverbatim
 *>
 *> \param[in] LDX
 *> \verbatim
 *>          LDX is INTEGER
-*>     The leading dimension of the vector X. LDX >= M.
+*>     The leading dimension of the matrix X. LDX >= M.
 *> \endverbatim
 *
 *  Authors:
@@ -83,10 +81,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup larscl2
 *
 *  =====================================================================
       SUBROUTINE SLARSCL2 ( M, N, D, X, LDX )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slartg.f90 b/SRC/slartg.f90
index 2a936a919f..132872f226 100644
--- a/SRC/slartg.f90
+++ b/SRC/slartg.f90
@@ -35,7 +35,7 @@
 !> square root of the sum of squares.
 !>
 !> This version is discontinuous in R at F = 0 but it returns the same
-!> C and S as SLARTG for complex inputs (F,0) and (G,0).
+!> C and S as CLARTG for complex inputs (F,0) and (G,0).
 !>
 !> This is a more accurate version of the BLAS1 routine SROTG,
 !> with the following other differences:
@@ -45,8 +45,6 @@
 !>       floating point operations (saves work in SBDSQR when
 !>       there are zeros on the diagonal).
 !>
-!> If F exceeds G in magnitude, C will be positive.
-!>
 !> Below, wp=>sp stands for single precision from LA_CONSTANTS module.
 !> \endverbatim
 !
@@ -90,7 +88,7 @@
 !
 !> \date July 2016
 !
-!> \ingroup OTHERauxiliary
+!> \ingroup lartg
 !
 !> \par Contributors:
 !  ==================
@@ -112,9 +110,10 @@
 subroutine SLARTG( f, g, c, s, r )
    use LA_CONSTANTS, &
    only: wp=>sp, zero=>szero, half=>shalf, one=>sone, &
-         rtmin=>srtmin, rtmax=>srtmax, safmin=>ssafmin, safmax=>ssafmax
+         safmin=>ssafmin, safmax=>ssafmax
+   implicit none
 !
-!  -- LAPACK auxiliary routine (version 3.10.0) --
+!  -- LAPACK auxiliary routine --
 !  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 !  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 !     February 2021
@@ -123,11 +122,15 @@ subroutine SLARTG( f, g, c, s, r )
    real(wp) :: c, f, g, r, s
 !  ..
 !  .. Local Scalars ..
-   real(wp) :: d, f1, fs, g1, gs, p, u, uu
+   real(wp) :: d, f1, fs, g1, gs, u, rtmin, rtmax
 !  ..
 !  .. Intrinsic Functions ..
    intrinsic :: abs, sign, sqrt
 !  ..
+!  .. Constants ..
+   rtmin = sqrt( safmin )
+   rtmax = sqrt( safmax/2 )
+!  ..
 !  .. Executable Statements ..
 !
    f1 = abs( f )
@@ -143,20 +146,18 @@ subroutine SLARTG( f, g, c, s, r )
    else if( f1 > rtmin .and. f1 < rtmax .and. &
             g1 > rtmin .and. g1 < rtmax ) then
       d = sqrt( f*f + g*g )
-      p = one / d
-      c = f1*p
-      s = g*sign( p, f )
+      c = f1 / d
       r = sign( d, f )
+      s = g / r
    else
       u = min( safmax, max( safmin, f1, g1 ) )
-      uu = one / u
-      fs = f*uu
-      gs = g*uu
+      fs = f / u
+      gs = g / u
       d = sqrt( fs*fs + gs*gs )
-      p = one / d
-      c = abs( fs )*p
-      s = gs*sign( p, f )
-      r = sign( d, f )*u
+      c = abs( fs ) / d
+      r = sign( d, f )
+      s = gs / r
+      r = r*u
    end if
    return
 end subroutine
diff --git a/SRC/slartgp.f b/SRC/slartgp.f
index 8d98db4199..e74f107516 100644
--- a/SRC/slartgp.f
+++ b/SRC/slartgp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARTGP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slartgp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slartgp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,10 +86,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lartgp
 *
 *  =====================================================================
       SUBROUTINE SLARTGP( F, G, CS, SN, R )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slartgs.f b/SRC/slartgs.f
index dfc1a25c88..3c1660a2b4 100644
--- a/SRC/slartgs.f
+++ b/SRC/slartgs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARTGS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slartgs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slartgs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -83,10 +81,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lartgs
 *
 *  =====================================================================
       SUBROUTINE SLARTGS( X, Y, SIGMA, CS, SN )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slartv.f b/SRC/slartv.f
index 200e608805..bf9b0e13d8 100644
--- a/SRC/slartv.f
+++ b/SRC/slartv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARTV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slartv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slartv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lartv
 *
 *  =====================================================================
       SUBROUTINE SLARTV( N, X, INCX, Y, INCY, C, S, INCC )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slaruv.f b/SRC/slaruv.f
index c25dc2e2f0..0a1ecb210a 100644
--- a/SRC/slaruv.f
+++ b/SRC/slaruv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARUV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaruv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaruv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -72,7 +70,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup laruv
 *
 *> \par Further Details:
 *  =====================
@@ -92,6 +90,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLARUV( ISEED, N, X )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -382,6 +381,11 @@ SUBROUTINE SLARUV( ISEED, N, X )
      $                   1537 /
 *     ..
 *     .. Executable Statements ..
+*
+*     Quick return for N < 1
+      IF ( N < 1 ) THEN
+         RETURN
+      END IF
 *
       I1 = ISEED( 1 )
       I2 = ISEED( 2 )
diff --git a/SRC/slarz.f b/SRC/slarz.f
index 549a10fb17..af54724a8d 100644
--- a/SRC/slarz.f
+++ b/SRC/slarz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,7 +125,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup larz
 *
 *> \par Contributors:
 *  ==================
@@ -142,6 +140,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLARZ( SIDE, M, N, L, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,7 +182,8 @@ SUBROUTINE SLARZ( SIDE, M, N, L, V, INCV, TAU, C, LDC, WORK )
 *
 *           w( 1:n ) = w( 1:n ) + C( m-l+1:m, 1:n )**T * v( 1:l )
 *
-            CALL SGEMV( 'Transpose', L, N, ONE, C( M-L+1, 1 ), LDC, V,
+            CALL SGEMV( 'Transpose', L, N, ONE, C( M-L+1, 1 ), LDC,
+     $                  V,
      $                  INCV, ONE, WORK, 1 )
 *
 *           C( 1, 1:n ) = C( 1, 1:n ) - tau * w( 1:n )
@@ -209,7 +209,8 @@ SUBROUTINE SLARZ( SIDE, M, N, L, V, INCV, TAU, C, LDC, WORK )
 *
 *           w( 1:m ) = w( 1:m ) + C( 1:m, n-l+1:n, 1:n ) * v( 1:l )
 *
-            CALL SGEMV( 'No transpose', M, L, ONE, C( 1, N-L+1 ), LDC,
+            CALL SGEMV( 'No transpose', M, L, ONE, C( 1, N-L+1 ),
+     $                  LDC,
      $                  V, INCV, ONE, WORK, 1 )
 *
 *           C( 1:m, 1 ) = C( 1:m, 1 ) - tau * w( 1:m )
diff --git a/SRC/slarzb.f b/SRC/slarzb.f
index 93154c4c98..4401391568 100644
--- a/SRC/slarzb.f
+++ b/SRC/slarzb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARZB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarzb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarzb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -164,7 +162,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup larzb
 *
 *> \par Contributors:
 *  ==================
@@ -180,6 +178,7 @@
 *  =====================================================================
       SUBROUTINE SLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
      $                   LDV, T, LDT, C, LDC, WORK, LDWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -256,7 +255,8 @@ SUBROUTINE SLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
 *
 *        W( 1:n, 1:k ) = W( 1:n, 1:k ) * T**T  or  W( 1:m, 1:k ) * T
 *
-         CALL STRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K, ONE, T,
+         CALL STRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K, ONE,
+     $               T,
      $               LDT, WORK, LDWORK )
 *
 *        C( 1:k, 1:n ) = C( 1:k, 1:n ) - W( 1:n, 1:k )**T
@@ -271,7 +271,8 @@ SUBROUTINE SLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
 *                            V( 1:k, 1:l )**T * W( 1:n, 1:k )**T
 *
          IF( L.GT.0 )
-     $      CALL SGEMM( 'Transpose', 'Transpose', L, N, K, -ONE, V, LDV,
+     $      CALL SGEMM( 'Transpose', 'Transpose', L, N, K, -ONE, V,
+     $                  LDV,
      $                  WORK, LDWORK, ONE, C( M-L+1, 1 ), LDC )
 *
       ELSE IF( LSAME( SIDE, 'R' ) ) THEN
@@ -293,7 +294,8 @@ SUBROUTINE SLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
 *
 *        W( 1:m, 1:k ) = W( 1:m, 1:k ) * T  or  W( 1:m, 1:k ) * T**T
 *
-         CALL STRMM( 'Right', 'Lower', TRANS, 'Non-unit', M, K, ONE, T,
+         CALL STRMM( 'Right', 'Lower', TRANS, 'Non-unit', M, K, ONE,
+     $               T,
      $               LDT, WORK, LDWORK )
 *
 *        C( 1:m, 1:k ) = C( 1:m, 1:k ) - W( 1:m, 1:k )
@@ -308,7 +310,8 @@ SUBROUTINE SLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
 *                            W( 1:m, 1:k ) * V( 1:k, 1:l )
 *
          IF( L.GT.0 )
-     $      CALL SGEMM( 'No transpose', 'No transpose', M, L, K, -ONE,
+     $      CALL SGEMM( 'No transpose', 'No transpose', M, L, K,
+     $                  -ONE,
      $                  WORK, LDWORK, V, LDV, ONE, C( 1, N-L+1 ), LDC )
 *
       END IF
diff --git a/SRC/slarzt.f b/SRC/slarzt.f
index fc3e8175ca..5c3ebaddc7 100644
--- a/SRC/slarzt.f
+++ b/SRC/slarzt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLARZT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slarzt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slarzt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,7 +131,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup larzt
 *
 *> \par Contributors:
 *  ==================
@@ -182,6 +180,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLARZT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slas2.f b/SRC/slas2.f
index 6ae86204cb..9141670915 100644
--- a/SRC/slas2.f
+++ b/SRC/slas2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slas2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slas2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -78,7 +76,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup las2
 *
 *> \par Further Details:
 *  =====================
@@ -93,9 +91,7 @@
 *>  infinite.
 *>
 *>  Overflow will not occur unless the largest singular value itself
-*>  overflows, or is within a few ulps of overflow. (On machines with
-*>  partial overflow, like the Cray, overflow may occur if the largest
-*>  singular value is within a factor of 2 of overflow.)
+*>  overflows, or is within a few ulps of overflow.
 *>
 *>  Underflow is harmless if underflow is gradual. Otherwise, results
 *>  may correspond to a matrix modified by perturbations of size near
@@ -104,6 +100,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLAS2( F, G, H, SSMIN, SSMAX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slascl.f b/SRC/slascl.f
index e1cb420ea9..c9b8d3e7ba 100644
--- a/SRC/slascl.f
+++ b/SRC/slascl.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASCL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slascl.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slascl.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -136,10 +134,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lascl
 *
 *  =====================================================================
-      SUBROUTINE SLASCL( TYPE, KL, KU, CFROM, CTO, M, N, A, LDA, INFO )
+      SUBROUTINE SLASCL( TYPE, KL, KU, CFROM, CTO, M, N, A, LDA,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -272,6 +272,8 @@ SUBROUTINE SLASCL( TYPE, KL, KU, CFROM, CTO, M, N, A, LDA, INFO )
          ELSE
             MUL = CTOC / CFROMC
             DONE = .TRUE.
+            IF (MUL .EQ. ONE)
+     $         RETURN
          END IF
       END IF
 *
diff --git a/SRC/slascl2.f b/SRC/slascl2.f
index 07b506a8c1..0e2b722ce3 100644
--- a/SRC/slascl2.f
+++ b/SRC/slascl2.f
@@ -1,11 +1,10 @@
-*> \brief \b SLASCL2 performs diagonal scaling on a vector.
+*> \brief \b SLASCL2 performs diagonal scaling on a matrix.
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASCL2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slascl2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slascl2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -33,7 +31,7 @@
 *>
 *> \verbatim
 *>
-*> SLASCL2 performs a diagonal scaling on a vector:
+*> SLASCL2 performs a diagonal scaling on a matrix:
 *>   x <-- D * x
 *> where the diagonal matrix D is stored as a vector.
 *>
@@ -65,14 +63,14 @@
 *> \param[in,out] X
 *> \verbatim
 *>          X is REAL array, dimension (LDX,N)
-*>     On entry, the vector X to be scaled by D.
-*>     On exit, the scaled vector.
+*>     On entry, the matrix X to be scaled by D.
+*>     On exit, the scaled matrix.
 *> \endverbatim
 *>
 *> \param[in] LDX
 *> \verbatim
 *>          LDX is INTEGER
-*>     The leading dimension of the vector X. LDX >= M.
+*>     The leading dimension of the matrix X. LDX >= M.
 *> \endverbatim
 *
 *  Authors:
@@ -83,10 +81,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup lascl2
 *
 *  =====================================================================
       SUBROUTINE SLASCL2 ( M, N, D, X, LDX )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slasd0.f b/SRC/slasd0.f
index a45f741a97..ec6b49ff9e 100644
--- a/SRC/slasd0.f
+++ b/SRC/slasd0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASD0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasd0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasd0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -79,10 +77,11 @@
 *>         On exit, E has been destroyed.
 *> \endverbatim
 *>
-*> \param[out] U
+*> \param[in,out] U
 *> \verbatim
 *>          U is REAL array, dimension (LDU, N)
-*>         On exit, U contains the left singular vectors.
+*>         On exit, U contains the left singular vectors,
+*>          if U passed in as (N, N) Identity.
 *> \endverbatim
 *>
 *> \param[in] LDU
@@ -91,10 +90,11 @@
 *>         On entry, leading dimension of U.
 *> \endverbatim
 *>
-*> \param[out] VT
+*> \param[in,out] VT
 *> \verbatim
 *>          VT is REAL array, dimension (LDVT, M)
-*>         On exit, VT**T contains the right singular vectors.
+*>         On exit, VT**T contains the right singular vectors,
+*>          if VT passed in as (M, M) Identity.
 *> \endverbatim
 *>
 *> \param[in] LDVT
@@ -136,7 +136,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd0
 *
 *> \par Contributors:
 *  ==================
@@ -145,8 +145,10 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE SLASD0( N, SQRE, D, E, U, LDU, VT, LDVT, SMLSIZ, IWORK,
+      SUBROUTINE SLASD0( N, SQRE, D, E, U, LDU, VT, LDVT, SMLSIZ,
+     $                   IWORK,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -201,7 +203,8 @@ SUBROUTINE SLASD0( N, SQRE, D, E, U, LDU, VT, LDVT, SMLSIZ, IWORK,
 *     If the input matrix is too small, call SLASDQ to find the SVD.
 *
       IF( N.LE.SMLSIZ ) THEN
-         CALL SLASDQ( 'U', SQRE, N, M, N, 0, D, E, VT, LDVT, U, LDU, U,
+         CALL SLASDQ( 'U', SQRE, N, M, N, 0, D, E, VT, LDVT, U, LDU,
+     $                U,
      $                LDU, WORK, INFO )
          RETURN
       END IF
@@ -238,7 +241,8 @@ SUBROUTINE SLASD0( N, SQRE, D, E, U, LDU, VT, LDVT, SMLSIZ, IWORK,
          NLF = IC - NL
          NRF = IC + 1
          SQREI = 1
-         CALL SLASDQ( 'U', SQREI, NL, NLP1, NL, NCC, D( NLF ), E( NLF ),
+         CALL SLASDQ( 'U', SQREI, NL, NLP1, NL, NCC, D( NLF ),
+     $                E( NLF ),
      $                VT( NLF, NLF ), LDVT, U( NLF, NLF ), LDU,
      $                U( NLF, NLF ), LDU, WORK, INFO )
          IF( INFO.NE.0 ) THEN
@@ -254,7 +258,8 @@ SUBROUTINE SLASD0( N, SQRE, D, E, U, LDU, VT, LDVT, SMLSIZ, IWORK,
             SQREI = 1
          END IF
          NRP1 = NR + SQREI
-         CALL SLASDQ( 'U', SQREI, NR, NRP1, NR, NCC, D( NRF ), E( NRF ),
+         CALL SLASDQ( 'U', SQREI, NR, NRP1, NR, NCC, D( NRF ),
+     $                E( NRF ),
      $                VT( NRF, NRF ), LDVT, U( NRF, NRF ), LDU,
      $                U( NRF, NRF ), LDU, WORK, INFO )
          IF( INFO.NE.0 ) THEN
diff --git a/SRC/slasd1.f b/SRC/slasd1.f
index 8e4460aaa0..d123b4a3cf 100644
--- a/SRC/slasd1.f
+++ b/SRC/slasd1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASD1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasd1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasd1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -190,7 +188,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd1
 *
 *> \par Contributors:
 *  ==================
@@ -199,8 +197,10 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE SLASD1( NL, NR, SQRE, D, ALPHA, BETA, U, LDU, VT, LDVT,
+      SUBROUTINE SLASD1( NL, NR, SQRE, D, ALPHA, BETA, U, LDU, VT,
+     $                   LDVT,
      $                   IDXQ, IWORK, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -228,7 +228,8 @@ SUBROUTINE SLASD1( NL, NR, SQRE, D, ALPHA, BETA, U, LDU, VT, LDVT,
       REAL               ORGNRM
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLAMRG, SLASCL, SLASD2, SLASD3, XERBLA
+      EXTERNAL           SLAMRG, SLASCL, SLASD2, SLASD3,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -287,7 +288,8 @@ SUBROUTINE SLASD1( NL, NR, SQRE, D, ALPHA, BETA, U, LDU, VT, LDVT,
 *
 *     Deflate singular values.
 *
-      CALL SLASD2( NL, NR, SQRE, K, D, WORK( IZ ), ALPHA, BETA, U, LDU,
+      CALL SLASD2( NL, NR, SQRE, K, D, WORK( IZ ), ALPHA, BETA, U,
+     $             LDU,
      $             VT, LDVT, WORK( ISIGMA ), WORK( IU2 ), LDU2,
      $             WORK( IVT2 ), LDVT2, IWORK( IDXP ), IWORK( IDX ),
      $             IWORK( IDXC ), IDXQ, IWORK( COLTYP ), INFO )
@@ -295,7 +297,8 @@ SUBROUTINE SLASD1( NL, NR, SQRE, D, ALPHA, BETA, U, LDU, VT, LDVT,
 *     Solve Secular Equation and update singular vectors.
 *
       LDQ = K
-      CALL SLASD3( NL, NR, SQRE, K, D, WORK( IQ ), LDQ, WORK( ISIGMA ),
+      CALL SLASD3( NL, NR, SQRE, K, D, WORK( IQ ), LDQ,
+     $             WORK( ISIGMA ),
      $             U, LDU, WORK( IU2 ), LDU2, VT, LDVT, WORK( IVT2 ),
      $             LDVT2, IWORK( IDXC ), IWORK( COLTYP ), WORK( IZ ),
      $             INFO )
diff --git a/SRC/slasd2.f b/SRC/slasd2.f
index 1902242c77..277d2675ec 100644
--- a/SRC/slasd2.f
+++ b/SRC/slasd2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASD2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasd2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasd2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -254,7 +252,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd2
 *
 *> \par Contributors:
 *  ==================
@@ -263,9 +261,11 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE SLASD2( NL, NR, SQRE, K, D, Z, ALPHA, BETA, U, LDU, VT,
+      SUBROUTINE SLASD2( NL, NR, SQRE, K, D, Z, ALPHA, BETA, U, LDU,
+     $                   VT,
      $                   LDVT, DSIGMA, U2, LDU2, VT2, LDVT2, IDXP, IDX,
      $                   IDXC, IDXQ, COLTYP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -303,7 +303,8 @@ SUBROUTINE SLASD2( NL, NR, SQRE, K, D, Z, ALPHA, BETA, U, LDU, VT,
       EXTERNAL           SLAMCH, SLAPY2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLACPY, SLAMRG, SLASET, SROT, XERBLA
+      EXTERNAL           SCOPY, SLACPY, SLAMRG, SLASET, SROT,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -479,7 +480,8 @@ SUBROUTINE SLASD2( NL, NR, SQRE, K, D, Z, ALPHA, BETA, U, LDU, VT,
                IDXJ = IDXJ - 1
             END IF
             CALL SROT( N, U( 1, IDXJP ), 1, U( 1, IDXJ ), 1, C, S )
-            CALL SROT( M, VT( IDXJP, 1 ), LDVT, VT( IDXJ, 1 ), LDVT, C,
+            CALL SROT( M, VT( IDXJP, 1 ), LDVT, VT( IDXJ, 1 ), LDVT,
+     $                 C,
      $                 S )
             IF( COLTYP( J ).NE.COLTYP( JPREV ) ) THEN
                COLTYP( J ) = 3
@@ -614,7 +616,8 @@ SUBROUTINE SLASD2( NL, NR, SQRE, K, D, Z, ALPHA, BETA, U, LDU, VT,
          CALL SCOPY( N-K, DSIGMA( K+1 ), 1, D( K+1 ), 1 )
          CALL SLACPY( 'A', N, N-K, U2( 1, K+1 ), LDU2, U( 1, K+1 ),
      $                LDU )
-         CALL SLACPY( 'A', N-K, M, VT2( K+1, 1 ), LDVT2, VT( K+1, 1 ),
+         CALL SLACPY( 'A', N-K, M, VT2( K+1, 1 ), LDVT2, VT( K+1,
+     $                1 ),
      $                LDVT )
       END IF
 *
diff --git a/SRC/slasd3.f b/SRC/slasd3.f
index f9420f88aa..b4836b5218 100644
--- a/SRC/slasd3.f
+++ b/SRC/slasd3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASD3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasd3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasd3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -44,13 +42,6 @@
 *> appropriate calls to SLASD4 and then updates the singular
 *> vectors by matrix multiplication.
 *>
-*> This code makes very mild assumptions about floating point
-*> arithmetic. It will work on machines with a guard digit in
-*> add/subtract, or on those binary machines without guard digits
-*> which subtract like the Cray XMP, Cray YMP, Cray C 90, or Cray 2.
-*> It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
-*>
 *> SLASD3 is called from SLASD1.
 *> \endverbatim
 *
@@ -103,7 +94,7 @@
 *>         The leading dimension of the array Q.  LDQ >= K.
 *> \endverbatim
 *>
-*> \param[in,out] DSIGMA
+*> \param[in] DSIGMA
 *> \verbatim
 *>          DSIGMA is REAL array, dimension(K)
 *>         The first K elements of this array contain the old roots
@@ -209,7 +200,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd3
 *
 *> \par Contributors:
 *  ==================
@@ -218,9 +209,11 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE SLASD3( NL, NR, SQRE, K, D, Q, LDQ, DSIGMA, U, LDU, U2,
+      SUBROUTINE SLASD3( NL, NR, SQRE, K, D, Q, LDQ, DSIGMA, U, LDU,
+     $                   U2,
      $                   LDU2, VT, LDVT, VT2, LDVT2, IDXC, CTOT, Z,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -249,11 +242,12 @@ SUBROUTINE SLASD3( NL, NR, SQRE, K, D, Q, LDQ, DSIGMA, U, LDU, U2,
       REAL               RHO, TEMP
 *     ..
 *     .. External Functions ..
-      REAL               SLAMC3, SNRM2
-      EXTERNAL           SLAMC3, SNRM2
+      REAL               SNRM2
+      EXTERNAL           SNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEMM, SLACPY, SLASCL, SLASD4, XERBLA
+      EXTERNAL           SCOPY, SGEMM, SLACPY, SLASCL, SLASD4,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, SIGN, SQRT
@@ -310,27 +304,6 @@ SUBROUTINE SLASD3( NL, NR, SQRE, K, D, Q, LDQ, DSIGMA, U, LDU, U2,
          RETURN
       END IF
 *
-*     Modify values DSIGMA(i) to make sure all DSIGMA(i)-DSIGMA(j) can
-*     be computed with high relative accuracy (barring over/underflow).
-*     This is a problem on machines without a guard digit in
-*     add/subtract (Cray XMP, Cray YMP, Cray C 90 and Cray 2).
-*     The following code replaces DSIGMA(I) by 2*DSIGMA(I)-DSIGMA(I),
-*     which on any of these machines zeros out the bottommost
-*     bit of DSIGMA(I) if it is 1; this makes the subsequent
-*     subtractions DSIGMA(I)-DSIGMA(J) unproblematic when cancellation
-*     occurs. On binary machines with a guard digit (almost all
-*     machines) it does not change DSIGMA(I) at all. On hexadecimal
-*     and decimal machines with a guard digit, it slightly
-*     changes the bottommost bits of DSIGMA(I). It does not account
-*     for hexadecimal or decimal machines without guard digits
-*     (we know of none). We use a subroutine call to compute
-*     2*DSIGMA(I) to prevent optimizing compilers from eliminating
-*     this code.
-*
-      DO 20 I = 1, K
-         DSIGMA( I ) = SLAMC3( DSIGMA( I ), DSIGMA( I ) ) - DSIGMA( I )
-   20 CONTINUE
-*
 *     Keep a copy of Z.
 *
       CALL SCOPY( K, Z, 1, Q, 1 )
@@ -392,16 +365,19 @@ SUBROUTINE SLASD3( NL, NR, SQRE, K, D, Q, LDQ, DSIGMA, U, LDU, U2,
 *     Update the left singular vector matrix.
 *
       IF( K.EQ.2 ) THEN
-         CALL SGEMM( 'N', 'N', N, K, K, ONE, U2, LDU2, Q, LDQ, ZERO, U,
+         CALL SGEMM( 'N', 'N', N, K, K, ONE, U2, LDU2, Q, LDQ, ZERO,
+     $               U,
      $               LDU )
          GO TO 100
       END IF
       IF( CTOT( 1 ).GT.0 ) THEN
-         CALL SGEMM( 'N', 'N', NL, K, CTOT( 1 ), ONE, U2( 1, 2 ), LDU2,
+         CALL SGEMM( 'N', 'N', NL, K, CTOT( 1 ), ONE, U2( 1, 2 ),
+     $               LDU2,
      $               Q( 2, 1 ), LDQ, ZERO, U( 1, 1 ), LDU )
          IF( CTOT( 3 ).GT.0 ) THEN
             KTEMP = 2 + CTOT( 1 ) + CTOT( 2 )
-            CALL SGEMM( 'N', 'N', NL, K, CTOT( 3 ), ONE, U2( 1, KTEMP ),
+            CALL SGEMM( 'N', 'N', NL, K, CTOT( 3 ), ONE, U2( 1,
+     $                  KTEMP ),
      $                  LDU2, Q( KTEMP, 1 ), LDQ, ONE, U( 1, 1 ), LDU )
          END IF
       ELSE IF( CTOT( 3 ).GT.0 ) THEN
@@ -414,7 +390,8 @@ SUBROUTINE SLASD3( NL, NR, SQRE, K, D, Q, LDQ, DSIGMA, U, LDU, U2,
       CALL SCOPY( K, Q( 1, 1 ), LDQ, U( NLP1, 1 ), LDU )
       KTEMP = 2 + CTOT( 1 )
       CTEMP = CTOT( 2 ) + CTOT( 3 )
-      CALL SGEMM( 'N', 'N', NR, K, CTEMP, ONE, U2( NLP2, KTEMP ), LDU2,
+      CALL SGEMM( 'N', 'N', NR, K, CTEMP, ONE, U2( NLP2, KTEMP ),
+     $            LDU2,
      $            Q( KTEMP, 1 ), LDQ, ZERO, U( NLP2, 1 ), LDU )
 *
 *     Generate the right singular vectors.
@@ -432,7 +409,8 @@ SUBROUTINE SLASD3( NL, NR, SQRE, K, D, Q, LDQ, DSIGMA, U, LDU, U2,
 *     Update the right singular vector matrix.
 *
       IF( K.EQ.2 ) THEN
-         CALL SGEMM( 'N', 'N', K, M, K, ONE, Q, LDQ, VT2, LDVT2, ZERO,
+         CALL SGEMM( 'N', 'N', K, M, K, ONE, Q, LDQ, VT2, LDVT2,
+     $               ZERO,
      $               VT, LDVT )
          RETURN
       END IF
@@ -441,7 +419,8 @@ SUBROUTINE SLASD3( NL, NR, SQRE, K, D, Q, LDQ, DSIGMA, U, LDU, U2,
      $            VT2( 1, 1 ), LDVT2, ZERO, VT( 1, 1 ), LDVT )
       KTEMP = 2 + CTOT( 1 ) + CTOT( 2 )
       IF( KTEMP.LE.LDVT2 )
-     $   CALL SGEMM( 'N', 'N', K, NLP1, CTOT( 3 ), ONE, Q( 1, KTEMP ),
+     $   CALL SGEMM( 'N', 'N', K, NLP1, CTOT( 3 ), ONE, Q( 1,
+     $               KTEMP ),
      $               LDQ, VT2( KTEMP, 1 ), LDVT2, ONE, VT( 1, 1 ),
      $               LDVT )
 *
diff --git a/SRC/slasd4.f b/SRC/slasd4.f
index f949094f5c..e50a911412 100644
--- a/SRC/slasd4.f
+++ b/SRC/slasd4.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASD4 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasd4.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasd4.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -140,7 +138,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd4
 *
 *> \par Contributors:
 *  ==================
@@ -150,6 +148,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLASD4( N, I, D, Z, DELTA, RHO, SIGMA, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slasd5.f b/SRC/slasd5.f
index 9a0a077102..e4154d32d0 100644
--- a/SRC/slasd5.f
+++ b/SRC/slasd5.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASD5 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasd5.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasd5.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -103,7 +101,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd5
 *
 *> \par Contributors:
 *  ==================
@@ -113,6 +111,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLASD5( I, D, Z, DELTA, RHO, DSIGMA, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slasd6.f b/SRC/slasd6.f
index f4cbeb25d4..63ff6184a5 100644
--- a/SRC/slasd6.f
+++ b/SRC/slasd6.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASD6 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasd6.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasd6.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -297,7 +295,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd6
 *
 *> \par Contributors:
 *  ==================
@@ -306,10 +304,12 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE SLASD6( ICOMPQ, NL, NR, SQRE, D, VF, VL, ALPHA, BETA,
+      SUBROUTINE SLASD6( ICOMPQ, NL, NR, SQRE, D, VF, VL, ALPHA,
+     $                   BETA,
      $                   IDXQ, PERM, GIVPTR, GIVCOL, LDGCOL, GIVNUM,
      $                   LDGNUM, POLES, DIFL, DIFR, Z, K, C, S, WORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -340,7 +340,8 @@ SUBROUTINE SLASD6( ICOMPQ, NL, NR, SQRE, D, VF, VL, ALPHA, BETA,
       REAL               ORGNRM
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLAMRG, SLASCL, SLASD7, SLASD8, XERBLA
+      EXTERNAL           SCOPY, SLAMRG, SLASCL, SLASD7, SLASD8,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
diff --git a/SRC/slasd7.f b/SRC/slasd7.f
index efd1f59d08..b5707e21cb 100644
--- a/SRC/slasd7.f
+++ b/SRC/slasd7.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASD7 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasd7.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasd7.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -264,7 +262,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd7
 *
 *> \par Contributors:
 *  ==================
@@ -273,10 +271,12 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE SLASD7( ICOMPQ, NL, NR, SQRE, K, D, Z, ZW, VF, VFW, VL,
+      SUBROUTINE SLASD7( ICOMPQ, NL, NR, SQRE, K, D, Z, ZW, VF, VFW,
+     $                   VL,
      $                   VLW, ALPHA, BETA, DSIGMA, IDX, IDXP, IDXQ,
      $                   PERM, GIVPTR, GIVCOL, LDGCOL, GIVNUM, LDGNUM,
      $                   C, S, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slasd8.f b/SRC/slasd8.f
index 43b171e5f9..d0f2291d48 100644
--- a/SRC/slasd8.f
+++ b/SRC/slasd8.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASD8 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasd8.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasd8.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,14 +119,12 @@
 *>          The leading dimension of DIFR, must be at least K.
 *> \endverbatim
 *>
-*> \param[in,out] DSIGMA
+*> \param[in] DSIGMA
 *> \verbatim
 *>          DSIGMA is REAL array, dimension ( K )
 *>          On entry, the first K elements of this array contain the old
 *>          roots of the deflated updating problem.  These are the poles
 *>          of the secular equation.
-*>          On exit, the elements of DSIGMA may be very slightly altered
-*>          in value.
 *> \endverbatim
 *>
 *> \param[out] WORK
@@ -152,7 +148,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasd8
 *
 *> \par Contributors:
 *  ==================
@@ -163,6 +159,7 @@
 *  =====================================================================
       SUBROUTINE SLASD8( ICOMPQ, K, D, Z, VF, VL, DIFL, DIFR, LDDIFR,
      $                   DSIGMA, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,7 +185,8 @@ SUBROUTINE SLASD8( ICOMPQ, K, D, Z, VF, VL, DIFL, DIFR, LDDIFR,
       REAL               DIFLJ, DIFRJ, DJ, DSIGJ, DSIGJP, RHO, TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLASCL, SLASD4, SLASET, XERBLA
+      EXTERNAL           SCOPY, SLASCL, SLASD4, SLASET,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       REAL               SDOT, SLAMC3, SNRM2
@@ -227,27 +225,6 @@ SUBROUTINE SLASD8( ICOMPQ, K, D, Z, VF, VL, DIFL, DIFR, LDDIFR,
          RETURN
       END IF
 *
-*     Modify values DSIGMA(i) to make sure all DSIGMA(i)-DSIGMA(j) can
-*     be computed with high relative accuracy (barring over/underflow).
-*     This is a problem on machines without a guard digit in
-*     add/subtract (Cray XMP, Cray YMP, Cray C 90 and Cray 2).
-*     The following code replaces DSIGMA(I) by 2*DSIGMA(I)-DSIGMA(I),
-*     which on any of these machines zeros out the bottommost
-*     bit of DSIGMA(I) if it is 1; this makes the subsequent
-*     subtractions DSIGMA(I)-DSIGMA(J) unproblematic when cancellation
-*     occurs. On binary machines with a guard digit (almost all
-*     machines) it does not change DSIGMA(I) at all. On hexadecimal
-*     and decimal machines with a guard digit, it slightly
-*     changes the bottommost bits of DSIGMA(I). It does not account
-*     for hexadecimal or decimal machines without guard digits
-*     (we know of none). We use a subroutine call to compute
-*     2*DLAMBDA(I) to prevent optimizing compilers from eliminating
-*     this code.
-*
-      DO 10 I = 1, K
-         DSIGMA( I ) = SLAMC3( DSIGMA( I ), DSIGMA( I ) ) - DSIGMA( I )
-   10 CONTINUE
-*
 *     Book keeping.
 *
       IWK1 = 1
@@ -312,12 +289,19 @@ SUBROUTINE SLASD8( ICOMPQ, K, D, Z, VF, VL, DIFL, DIFR, LDDIFR,
             DSIGJP = -DSIGMA( J+1 )
          END IF
          WORK( J ) = -Z( J ) / DIFLJ / ( DSIGMA( J )+DJ )
+*
+*        Use calls to the subroutine SLAMC3 to enforce the parentheses
+*        (x+y)+z. The goal is to prevent optimizing compilers
+*        from doing x+(y+z).
+*
          DO 60 I = 1, J - 1
-            WORK( I ) = Z( I ) / ( SLAMC3( DSIGMA( I ), DSIGJ )-DIFLJ )
+            WORK( I ) = Z( I ) / ( SLAMC3( DSIGMA( I ),
+     $            DSIGJ )-DIFLJ )
      $                   / ( DSIGMA( I )+DJ )
    60    CONTINUE
          DO 70 I = J + 1, K
-            WORK( I ) = Z( I ) / ( SLAMC3( DSIGMA( I ), DSIGJP )+DIFRJ )
+            WORK( I ) = Z( I ) / ( SLAMC3( DSIGMA( I ),
+     $            DSIGJP )+DIFRJ )
      $                   / ( DSIGMA( I )+DJ )
    70    CONTINUE
          TEMP = SNRM2( K, WORK, 1 )
diff --git a/SRC/slasda.f b/SRC/slasda.f
index 20f01ee486..8701abb277 100644
--- a/SRC/slasda.f
+++ b/SRC/slasda.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASDA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasda.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasda.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -258,7 +256,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasda
 *
 *> \par Contributors:
 *  ==================
@@ -267,9 +265,11 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE SLASDA( ICOMPQ, SMLSIZ, N, SQRE, D, E, U, LDU, VT, K,
+      SUBROUTINE SLASDA( ICOMPQ, SMLSIZ, N, SQRE, D, E, U, LDU, VT,
+     $                   K,
      $                   DIFL, DIFR, Z, POLES, GIVPTR, GIVCOL, LDGCOL,
      $                   PERM, GIVNUM, C, S, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -301,7 +301,8 @@ SUBROUTINE SLASDA( ICOMPQ, SMLSIZ, N, SQRE, D, E, U, LDU, VT, K,
       REAL               ALPHA, BETA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLASD6, SLASDQ, SLASDT, SLASET, XERBLA
+      EXTERNAL           SCOPY, SLASD6, SLASDQ, SLASDT, SLASET,
+     $                   XERBLA
 *     ..
 *     .. Executable Statements ..
 *
@@ -333,10 +334,12 @@ SUBROUTINE SLASDA( ICOMPQ, SMLSIZ, N, SQRE, D, E, U, LDU, VT, K,
 *
       IF( N.LE.SMLSIZ ) THEN
          IF( ICOMPQ.EQ.0 ) THEN
-            CALL SLASDQ( 'U', SQRE, N, 0, 0, 0, D, E, VT, LDU, U, LDU,
+            CALL SLASDQ( 'U', SQRE, N, 0, 0, 0, D, E, VT, LDU, U,
+     $                   LDU,
      $                   U, LDU, WORK, INFO )
          ELSE
-            CALL SLASDQ( 'U', SQRE, N, M, N, 0, D, E, VT, LDU, U, LDU,
+            CALL SLASDQ( 'U', SQRE, N, M, N, 0, D, E, VT, LDU, U,
+     $                   LDU,
      $                   U, LDU, WORK, INFO )
          END IF
          RETURN
@@ -397,7 +400,8 @@ SUBROUTINE SLASDA( ICOMPQ, SMLSIZ, N, SQRE, D, E, U, LDU, VT, K,
             CALL SCOPY( NLP1, WORK( ITEMP ), 1, WORK( VLI ), 1 )
          ELSE
             CALL SLASET( 'A', NL, NL, ZERO, ONE, U( NLF, 1 ), LDU )
-            CALL SLASET( 'A', NLP1, NLP1, ZERO, ONE, VT( NLF, 1 ), LDU )
+            CALL SLASET( 'A', NLP1, NLP1, ZERO, ONE, VT( NLF, 1 ),
+     $                   LDU )
             CALL SLASDQ( 'U', SQREI, NL, NLP1, NL, NCC, D( NLF ),
      $                   E( NLF ), VT( NLF, 1 ), LDU, U( NLF, 1 ), LDU,
      $                   U( NLF, 1 ), LDU, WORK( NWORK1 ), INFO )
@@ -431,7 +435,8 @@ SUBROUTINE SLASDA( ICOMPQ, SMLSIZ, N, SQRE, D, E, U, LDU, VT, K,
             CALL SCOPY( NRP1, WORK( ITEMP ), 1, WORK( VLI ), 1 )
          ELSE
             CALL SLASET( 'A', NR, NR, ZERO, ONE, U( NRF, 1 ), LDU )
-            CALL SLASET( 'A', NRP1, NRP1, ZERO, ONE, VT( NRF, 1 ), LDU )
+            CALL SLASET( 'A', NRP1, NRP1, ZERO, ONE, VT( NRF, 1 ),
+     $                   LDU )
             CALL SLASDQ( 'U', SQREI, NR, NRP1, NR, NCC, D( NRF ),
      $                   E( NRF ), VT( NRF, 1 ), LDU, U( NRF, 1 ), LDU,
      $                   U( NRF, 1 ), LDU, WORK( NWORK1 ), INFO )
diff --git a/SRC/slasdq.f b/SRC/slasdq.f
index 8561422009..422e10d797 100644
--- a/SRC/slasdq.f
+++ b/SRC/slasdq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASDQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasdq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasdq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -197,7 +195,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasdq
 *
 *> \par Contributors:
 *  ==================
@@ -206,8 +204,10 @@
 *>     California at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE SLASDQ( UPLO, SQRE, N, NCVT, NRU, NCC, D, E, VT, LDVT,
+      SUBROUTINE SLASDQ( UPLO, SQRE, N, NCVT, NRU, NCC, D, E, VT,
+     $                   LDVT,
      $                   U, LDU, C, LDC, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -234,7 +234,8 @@ SUBROUTINE SLASDQ( UPLO, SQRE, N, NCVT, NRU, NCC, D, E, VT, LDVT,
       REAL               CS, R, SMIN, SN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SBDSQR, SLARTG, SLASR, SSWAP, XERBLA
+      EXTERNAL           SBDSQR, SLARTG, SLASR, SSWAP,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -395,7 +396,8 @@ SUBROUTINE SLASDQ( UPLO, SQRE, N, NCVT, NRU, NCC, D, E, VT, LDVT,
             D( ISUB ) = D( I )
             D( I ) = SMIN
             IF( NCVT.GT.0 )
-     $         CALL SSWAP( NCVT, VT( ISUB, 1 ), LDVT, VT( I, 1 ), LDVT )
+     $         CALL SSWAP( NCVT, VT( ISUB, 1 ), LDVT, VT( I, 1 ),
+     $                     LDVT )
             IF( NRU.GT.0 )
      $         CALL SSWAP( NRU, U( 1, ISUB ), 1, U( 1, I ), 1 )
             IF( NCC.GT.0 )
diff --git a/SRC/slasdt.f b/SRC/slasdt.f
index 4125472683..e72d7de492 100644
--- a/SRC/slasdt.f
+++ b/SRC/slasdt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASDT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasdt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasdt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -92,7 +90,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasdt
 *
 *> \par Contributors:
 *  ==================
@@ -102,6 +100,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLASDT( N, LVL, ND, INODE, NDIML, NDIMR, MSUB )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slaset.f b/SRC/slaset.f
index c43757e010..dc88b5dafd 100644
--- a/SRC/slaset.f
+++ b/SRC/slaset.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASET + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaset.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaset.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -103,10 +101,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup laset
 *
 *  =====================================================================
       SUBROUTINE SLASET( UPLO, M, N, ALPHA, BETA, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slasq1.f b/SRC/slasq1.f
index 1ba7a8aaeb..4d83808748 100644
--- a/SRC/slasq1.f
+++ b/SRC/slasq1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASQ1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasq1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasq1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lasq1
 *
 *  =====================================================================
       SUBROUTINE SLASQ1( N, D, E, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -128,7 +127,8 @@ SUBROUTINE SLASQ1( N, D, E, WORK, INFO )
       REAL               EPS, SCALE, SAFMIN, SIGMN, SIGMX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLAS2, SLASCL, SLASQ2, SLASRT, XERBLA
+      EXTERNAL           SCOPY, SLAS2, SLASCL, SLASQ2, SLASRT,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       REAL               SLAMCH
diff --git a/SRC/slasq2.f b/SRC/slasq2.f
index c7909d83bd..8e9cc88485 100644
--- a/SRC/slasq2.f
+++ b/SRC/slasq2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASQ2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasq2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasq2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,7 +93,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lasq2
 *
 *> \par Further Details:
 *  =====================
@@ -109,6 +107,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLASQ2( N, Z, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -467,7 +466,8 @@ SUBROUTINE SLASQ2( N, Z, INFO )
 *
 *           While submatrix unfinished take a good dqds step.
 *
-            CALL SLASQ3( I0, N0, Z, PP, DMIN, SIGMA, DESIG, QMAX, NFAIL,
+            CALL SLASQ3( I0, N0, Z, PP, DMIN, SIGMA, DESIG, QMAX,
+     $                   NFAIL,
      $                   ITER, NDIV, IEEE, TTYPE, DMIN1, DMIN2, DN, DN1,
      $                   DN2, G, TAU )
 *
@@ -584,7 +584,7 @@ SUBROUTINE SLASQ2( N, Z, INFO )
       Z( 2*N+2 ) = E
       Z( 2*N+3 ) = REAL( ITER )
       Z( 2*N+4 ) = REAL( NDIV ) / REAL( N**2 )
-      Z( 2*N+5 ) = HUNDRD*NFAIL / REAL( ITER )
+      Z( 2*N+5 ) = HUNDRD*REAL( NFAIL / ITER )
       RETURN
 *
 *     End of SLASQ2
diff --git a/SRC/slasq3.f b/SRC/slasq3.f
index cd86ce8962..37d40f85e9 100644
--- a/SRC/slasq3.f
+++ b/SRC/slasq3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASQ3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasq3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasq3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -173,12 +171,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lasq3
 *
 *  =====================================================================
-      SUBROUTINE SLASQ3( I0, N0, Z, PP, DMIN, SIGMA, DESIG, QMAX, NFAIL,
+      SUBROUTINE SLASQ3( I0, N0, Z, PP, DMIN, SIGMA, DESIG, QMAX,
+     $                   NFAIL,
      $                   ITER, NDIV, IEEE, TTYPE, DMIN1, DMIN2, DN, DN1,
      $                   DN2, G, TAU )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slasq4.f b/SRC/slasq4.f
index 68a840fccc..38768aeb37 100644
--- a/SRC/slasq4.f
+++ b/SRC/slasq4.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASQ4 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasq4.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasq4.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,7 +133,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lasq4
 *
 *> \par Further Details:
 *  =====================
@@ -148,6 +146,7 @@
 *  =====================================================================
       SUBROUTINE SLASQ4( I0, N0, Z, PP, N0IN, DMIN, DMIN1, DMIN2, DN,
      $                   DN1, DN2, TAU, TTYPE, G )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slasq5.f b/SRC/slasq5.f
index d94b3cd8a2..7ebca9c189 100644
--- a/SRC/slasq5.f
+++ b/SRC/slasq5.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASQ5 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasq5.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasq5.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -136,11 +134,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lasq5
 *
 *  =====================================================================
-      SUBROUTINE SLASQ5( I0, N0, Z, PP, TAU, SIGMA, DMIN, DMIN1, DMIN2,
+      SUBROUTINE SLASQ5( I0, N0, Z, PP, TAU, SIGMA, DMIN, DMIN1,
+     $                   DMIN2,
      $                   DN, DNM1, DNM2, IEEE, EPS )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slasq6.f b/SRC/slasq6.f
index 5e3df7b143..100a28074f 100644
--- a/SRC/slasq6.f
+++ b/SRC/slasq6.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASQ6 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasq6.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasq6.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -111,11 +109,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lasq6
 *
 *  =====================================================================
       SUBROUTINE SLASQ6( I0, N0, Z, PP, DMIN, DMIN1, DMIN2, DN,
      $                   DNM1, DNM2 )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slasr.f b/SRC/slasr.f
index adcea12c99..53eded929d 100644
--- a/SRC/slasr.f
+++ b/SRC/slasr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -192,10 +190,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasr
 *
 *  =====================================================================
       SUBROUTINE SLASR( SIDE, PIVOT, DIRECT, M, N, C, S, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -234,12 +233,14 @@ SUBROUTINE SLASR( SIDE, PIVOT, DIRECT, M, N, C, S, A, LDA )
 *     Test the input parameters
 *
       INFO = 0
-      IF( .NOT.( LSAME( SIDE, 'L' ) .OR. LSAME( SIDE, 'R' ) ) ) THEN
+      IF( .NOT.( LSAME( SIDE, 'L' ) .OR.
+     $    LSAME( SIDE, 'R' ) ) ) THEN
          INFO = 1
       ELSE IF( .NOT.( LSAME( PIVOT, 'V' ) .OR. LSAME( PIVOT,
      $         'T' ) .OR. LSAME( PIVOT, 'B' ) ) ) THEN
          INFO = 2
-      ELSE IF( .NOT.( LSAME( DIRECT, 'F' ) .OR. LSAME( DIRECT, 'B' ) ) )
+      ELSE IF( .NOT.( LSAME( DIRECT, 'F' ) .OR.
+     $         LSAME( DIRECT, 'B' ) ) )
      $          THEN
          INFO = 3
       ELSE IF( M.LT.0 ) THEN
diff --git a/SRC/slasrt.f b/SRC/slasrt.f
index 132e03db61..4afe57fef3 100644
--- a/SRC/slasrt.f
+++ b/SRC/slasrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -81,10 +79,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup lasrt
 *
 *  =====================================================================
       SUBROUTINE SLASRT( ID, N, D, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slassq.f90 b/SRC/slassq.f90
index 19f49402b1..ebf193703f 100644
--- a/SRC/slassq.f90
+++ b/SRC/slassq.f90
@@ -5,7 +5,6 @@
 ! Online html documentation available at
 !            http://www.netlib.org/lapack/explore-html/
 !
-!> \htmlonly
 !> Download SLASSQ + dependencies
 !> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slassq.f90">
 !> [TGZ]</a>
@@ -13,7 +12,6 @@
 !> [ZIP]</a>
 !> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slassq.f90">
 !> [TXT]</a>
-!> \endhtmlonly
 !
 !  Definition:
 !  ===========
@@ -34,28 +32,15 @@
 !>
 !> \verbatim
 !>
-!> SLASSQ  returns the values  scl  and  smsq  such that
+!> SLASSQ returns the values scale_out and sumsq_out such that
 !>
-!>    ( scl**2 )*smsq = x( 1 )**2 +...+ x( n )**2 + ( scale**2 )*sumsq,
+!>    (scale_out**2)*sumsq_out = x( 1 )**2 +...+ x( n )**2 + (scale**2)*sumsq,
 !>
-!> where  x( i ) = X( 1 + ( i - 1 )*INCX ). The value of  sumsq  is
+!> where x( i ) = X( 1 + ( i - 1 )*INCX ). The value of sumsq is
 !> assumed to be non-negative.
 !>
 !> scale and sumsq must be supplied in SCALE and SUMSQ and
-!> scl and smsq are overwritten on SCALE and SUMSQ respectively.
-!>
-!> If scale * sqrt( sumsq ) > tbig then
-!>    we require:   scale >= sqrt( TINY*EPS ) / sbig   on entry,
-!> and if 0 < scale * sqrt( sumsq ) < tsml then
-!>    we require:   scale <= sqrt( HUGE ) / ssml       on entry,
-!> where
-!>    tbig -- upper threshold for values whose square is representable;
-!>    sbig -- scaling constant for big numbers; \see la_constants.f90
-!>    tsml -- lower threshold for values whose square is representable;
-!>    ssml -- scaling constant for small numbers; \see la_constants.f90
-!> and
-!>    TINY*EPS -- tiniest representable number;
-!>    HUGE     -- biggest representable number.
+!> scale_out and sumsq_out are overwritten on SCALE and SUMSQ respectively.
 !>
 !> \endverbatim
 !
@@ -72,7 +57,7 @@
 !> \verbatim
 !>          X is REAL array, dimension (1+(N-1)*abs(INCX))
 !>          The vector for which a scaled sum of squares is computed.
-!>             x( i )  = X( 1 + ( i - 1 )*INCX ), 1 <= i <= n.
+!>             x( i ) = X( 1 + ( i - 1 )*INCX ), 1 <= i <= n.
 !> \endverbatim
 !>
 !> \param[in] INCX
@@ -82,24 +67,24 @@
 !>          If INCX > 0, X(1+(i-1)*INCX) = x(i) for 1 <= i <= n
 !>          If INCX < 0, X(1-(n-i)*INCX) = x(i) for 1 <= i <= n
 !>          If INCX = 0, x isn't a vector so there is no need to call
-!>          this subroutine.  If you call it anyway, it will count x(1)
+!>          this subroutine. If you call it anyway, it will count x(1)
 !>          in the vector norm N times.
 !> \endverbatim
 !>
 !> \param[in,out] SCALE
 !> \verbatim
 !>          SCALE is REAL
-!>          On entry, the value  scale  in the equation above.
-!>          On exit, SCALE is overwritten with  scl , the scaling factor
+!>          On entry, the value scale in the equation above.
+!>          On exit, SCALE is overwritten by scale_out, the scaling factor
 !>          for the sum of squares.
 !> \endverbatim
 !>
 !> \param[in,out] SUMSQ
 !> \verbatim
 !>          SUMSQ is REAL
-!>          On entry, the value  sumsq  in the equation above.
-!>          On exit, SUMSQ is overwritten with  smsq , the basic sum of
-!>          squares from which  scl  has been factored out.
+!>          On entry, the value sumsq in the equation above.
+!>          On exit, SUMSQ is overwritten by sumsq_out, the basic sum of
+!>          squares from which scale_out has been factored out.
 !> \endverbatim
 !
 !  Authors:
@@ -130,14 +115,15 @@
 !>
 !> \endverbatim
 !
-!> \ingroup OTHERauxiliary
+!> \ingroup lassq
 !
 !  =====================================================================
-subroutine SLASSQ( n, x, incx, scl, sumsq )
+subroutine SLASSQ( n, x, incx, scale, sumsq )
    use LA_CONSTANTS, &
       only: wp=>sp, zero=>szero, one=>sone, &
             sbig=>ssbig, ssml=>sssml, tbig=>stbig, tsml=>stsml
    use LA_XISNAN
+   implicit none
 !
 !  -- LAPACK auxiliary routine --
 !  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -145,7 +131,7 @@ subroutine SLASSQ( n, x, incx, scl, sumsq )
 !
 !  .. Scalar Arguments ..
    integer :: incx, n
-   real(wp) :: scl, sumsq
+   real(wp) :: scale, sumsq
 !  ..
 !  .. Array Arguments ..
    real(wp) :: x(*)
@@ -158,10 +144,10 @@ subroutine SLASSQ( n, x, incx, scl, sumsq )
 !
 !  Quick return if possible
 !
-   if( LA_ISNAN(scl) .or. LA_ISNAN(sumsq) ) return
-   if( sumsq == zero ) scl = one
-   if( scl == zero ) then
-      scl = one
+   if( LA_ISNAN(scale) .or. LA_ISNAN(sumsq) ) return
+   if( sumsq == zero ) scale = one
+   if( scale == zero ) then
+      scale = one
       sumsq = zero
    end if
    if (n <= 0) then
@@ -198,15 +184,27 @@ subroutine SLASSQ( n, x, incx, scl, sumsq )
 !  Put the existing sum of squares into one of the accumulators
 !
    if( sumsq > zero ) then
-      ax = scl*sqrt( sumsq )
+      ax = scale*sqrt( sumsq )
       if (ax > tbig) then
-!        We assume scl >= sqrt( TINY*EPS ) / sbig
-         abig = abig + (scl*sbig)**2 * sumsq
+         if (scale > one) then
+            scale = scale * sbig
+            abig = abig + scale * (scale * sumsq)
+         else
+            ! sumsq > tbig^2 => (sbig * (sbig * sumsq)) is representable
+            abig = abig + scale * (scale * (sbig * (sbig * sumsq)))
+         end if
       else if (ax < tsml) then
-!        We assume scl <= sqrt( HUGE ) / ssml
-         if (notbig) asml = asml + (scl*ssml)**2 * sumsq
+         if (notbig) then
+            if (scale < one) then
+               scale = scale * ssml
+               asml = asml + scale * (scale * sumsq)
+            else
+               ! sumsq < tsml^2 => (ssml * (ssml * sumsq)) is representable
+               asml = asml + scale * (scale * (ssml * (ssml * sumsq)))
+            end if
+         end if
       else
-         amed = amed + scl**2 * sumsq
+         amed = amed + scale * (scale * sumsq)
       end if
    end if
 !
@@ -220,7 +218,7 @@ subroutine SLASSQ( n, x, incx, scl, sumsq )
       if (amed > zero .or. LA_ISNAN(amed)) then
          abig = abig + (amed*sbig)*sbig
       end if
-      scl = one / sbig
+      scale = one / sbig
       sumsq = abig
    else if (asml > zero) then
 !
@@ -236,17 +234,17 @@ subroutine SLASSQ( n, x, incx, scl, sumsq )
             ymin = asml
             ymax = amed
          end if
-         scl = one
+         scale = one
          sumsq = ymax**2*( one + (ymin/ymax)**2 )
       else
-         scl = one / ssml
+         scale = one / ssml
          sumsq = asml
       end if
    else
 !
 !     Otherwise all values are mid-range or zero
 !
-      scl = one
+      scale = one
       sumsq = amed
    end if
    return
diff --git a/SRC/slasv2.f b/SRC/slasv2.f
index 6b98e9a0c5..786d28db0c 100644
--- a/SRC/slasv2.f
+++ b/SRC/slasv2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASV2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasv2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasv2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup lasv2
 *
 *> \par Further Details:
 *  =====================
@@ -124,9 +122,7 @@
 *>  infinite.
 *>
 *>  Overflow will not occur unless the largest singular value itself
-*>  overflows or is within a few ulps of overflow. (On machines with
-*>  partial overflow, like the Cray, overflow may occur if the largest
-*>  singular value is within a factor of 2 of overflow.)
+*>  overflows or is within a few ulps of overflow.
 *>
 *>  Underflow is harmless if underflow is gradual. Otherwise, results
 *>  may correspond to a matrix modified by perturbations of size near
@@ -135,6 +131,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLASV2( F, G, H, SSMIN, SSMAX, SNR, CSR, SNL, CSL )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slaswlq.f b/SRC/slaswlq.f
index 4f56a46eca..08e7f3b9c1 100644
--- a/SRC/slaswlq.f
+++ b/SRC/slaswlq.f
@@ -60,7 +60,7 @@
 *> \verbatim
 *>          NB is INTEGER
 *>          The column block size to be used in the blocked QR.
-*>          NB > M.
+*>          NB > 0.
 *> \endverbatim
 *>
 *> \param[in,out] A
@@ -96,21 +96,24 @@
 *>          The leading dimension of the array T.  LDT >= MB.
 *> \endverbatim
 *>
-*>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) REAL array, dimension (MAX(1,LWORK))
-*>
+*>          (workspace) REAL array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
+*>
 *> \param[in] LWORK
 *> \verbatim
-*>          The dimension of the array WORK.  LWORK >= MB * M.
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= MB*M, otherwise.
+*>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
+*>          only calculates the minimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
-*>
 *> \endverbatim
+
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
@@ -158,33 +161,40 @@
 *>     SIAM J. Sci. Comput, vol. 34, no. 1, 2012
 *> \endverbatim
 *>
+*> \ingroup laswlq
+*>
 *  =====================================================================
       SUBROUTINE SLASWLQ( M, N, MB, NB, A, LDA, T, LDT, WORK, LWORK,
-     $                  INFO)
+     $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd. --
 *
 *     .. Scalar Arguments ..
-      INTEGER           INFO, LDA, M, N, MB, NB, LWORK, LDT
+      INTEGER            INFO, LDA, M, N, MB, NB, LWORK, LDT
 *     ..
 *     .. Array Arguments ..
-      REAL              A( LDA, * ), WORK( * ), T( LDT, *)
+      REAL               A( LDA, * ), WORK( * ), T( LDT, * )
 *     ..
 *
 *  =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
-      LOGICAL    LQUERY
-      INTEGER    I, II, KK, CTR
+      LOGICAL            LQUERY
+      INTEGER            I, II, KK, CTR, MINMN, LWMIN
 *     ..
 *     .. EXTERNAL FUNCTIONS ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
+*     ..
 *     .. EXTERNAL SUBROUTINES ..
       EXTERNAL           SGELQT, SGEQRT, STPLQT, STPQRT, XERBLA
+*     ..
 *     .. INTRINSIC FUNCTIONS ..
       INTRINSIC          MAX, MIN, MOD
 *     ..
@@ -195,73 +205,80 @@ SUBROUTINE SLASWLQ( M, N, MB, NB, A, LDA, T, LDT, WORK, LWORK,
       INFO = 0
 *
       LQUERY = ( LWORK.EQ.-1 )
+*
+      MINMN = MIN( M, N )
+      IF( MINMN.EQ.0 ) THEN
+        LWMIN = 1
+      ELSE
+        LWMIN = M*MB
+      END IF
 *
       IF( M.LT.0 ) THEN
         INFO = -1
       ELSE IF( N.LT.0 .OR. N.LT.M ) THEN
         INFO = -2
-      ELSE IF( MB.LT.1 .OR. ( MB.GT.M .AND. M.GT.0 )) THEN
+      ELSE IF( MB.LT.1 .OR. ( MB.GT.M .AND. M.GT.0 ) ) THEN
         INFO = -3
-      ELSE IF( NB.LE.M ) THEN
+      ELSE IF( NB.LE.0 ) THEN
         INFO = -4
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-        INFO = -5
+        INFO = -6
       ELSE IF( LDT.LT.MB ) THEN
         INFO = -8
-      ELSE IF( ( LWORK.LT.M*MB) .AND. (.NOT.LQUERY) ) THEN
+      ELSE IF( LWORK.LT.LWMIN .AND. (.NOT.LQUERY) ) THEN
         INFO = -10
       END IF
-      IF( INFO.EQ.0)  THEN
-      WORK(1) = MB*M
+      IF( INFO.EQ.0 ) THEN
+        WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       END IF
 *
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'SLASWLQ', -INFO )
         RETURN
-      ELSE IF (LQUERY) THEN
-       RETURN
+      ELSE IF( LQUERY ) THEN
+        RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( MIN(M,N).EQ.0 ) THEN
-          RETURN
+      IF( MINMN.EQ.0 ) THEN
+        RETURN
       END IF
 *
 *     The LQ Decomposition
 *
-       IF((M.GE.N).OR.(NB.LE.M).OR.(NB.GE.N)) THEN
-        CALL SGELQT( M, N, MB, A, LDA, T, LDT, WORK, INFO)
+      IF( (M.GE.N) .OR. (NB.LE.M) .OR. (NB.GE.N) ) THEN
+        CALL SGELQT( M, N, MB, A, LDA, T, LDT, WORK, INFO )
         RETURN
-       END IF
+      END IF
 *
-       KK = MOD((N-M),(NB-M))
-       II=N-KK+1
+      KK = MOD((N-M),(NB-M))
+      II = N-KK+1
 *
-*      Compute the LQ factorization of the first block A(1:M,1:NB)
+*     Compute the LQ factorization of the first block A(1:M,1:NB)
 *
-       CALL SGELQT( M, NB, MB, A(1,1), LDA, T, LDT, WORK, INFO)
-       CTR = 1
+      CALL SGELQT( M, NB, MB, A(1,1), LDA, T, LDT, WORK, INFO )
+      CTR = 1
 *
-       DO I = NB+1, II-NB+M , (NB-M)
+      DO I = NB+1, II-NB+M, (NB-M)
 *
-*      Compute the QR factorization of the current block A(1:M,I:I+NB-M)
+*       Compute the QR factorization of the current block A(1:M,I:I+NB-M)
 *
-         CALL STPLQT( M, NB-M, 0, MB, A(1,1), LDA, A( 1, I ),
-     $                  LDA, T(1, CTR * M + 1),
-     $                  LDT, WORK, INFO )
-         CTR = CTR + 1
-       END DO
+        CALL STPLQT( M, NB-M, 0, MB, A(1,1), LDA, A( 1, I ),
+     $                 LDA, T(1, CTR * M + 1),
+     $                 LDT, WORK, INFO )
+        CTR = CTR + 1
+      END DO
 *
 *     Compute the QR factorization of the last block A(1:M,II:N)
 *
-       IF (II.LE.N) THEN
+      IF( II.LE.N ) THEN
         CALL STPLQT( M, KK, 0, MB, A(1,1), LDA, A( 1, II ),
-     $                  LDA, T(1, CTR * M + 1), LDT,
-     $                  WORK, INFO )
-       END IF
+     $                 LDA, T(1, CTR * M + 1), LDT,
+     $                 WORK, INFO )
+      END IF
 *
-      WORK( 1 ) = M * MB
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       RETURN
 *
 *     End of SLASWLQ
diff --git a/SRC/slaswp.f b/SRC/slaswp.f
index 20e29d62ac..1670e21797 100644
--- a/SRC/slaswp.f
+++ b/SRC/slaswp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASWP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slaswp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slaswp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -99,7 +97,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup laswp
 *
 *> \par Further Details:
 *  =====================
@@ -112,6 +110,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLASWP( N, A, LDA, K1, K2, IPIV, INCX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slasy2.f b/SRC/slasy2.f
index 2a458ba70b..d9366a3cb1 100644
--- a/SRC/slasy2.f
+++ b/SRC/slasy2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASY2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasy2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasy2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -166,11 +164,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYauxiliary
+*> \ingroup lasy2
 *
 *  =====================================================================
       SUBROUTINE SLASY2( LTRANL, LTRANR, ISGN, N1, N2, TL, LDTL, TR,
      $                   LDTR, B, LDB, SCALE, X, LDX, XNORM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -238,7 +237,7 @@ SUBROUTINE SLASY2( LTRANL, LTRANR, ISGN, N1, N2, TL, LDTL, TR,
 *
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' ) / EPS
-      SGN = ISGN
+      SGN = REAL( ISGN )
 *
       K = N1 + N1 + N2 - 2
       GO TO ( 10, 20, 30, 50 )K
diff --git a/SRC/slasyf.f b/SRC/slasyf.f
index c551c1460f..129607a2bd 100644
--- a/SRC/slasyf.f
+++ b/SRC/slasyf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASYF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasyf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasyf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -159,7 +157,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup lahef
 *
 *> \par Contributors:
 *  ==================
@@ -172,7 +170,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE SLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
+      SUBROUTINE SLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -196,7 +196,7 @@ SUBROUTINE SLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
       PARAMETER          ( EIGHT = 8.0E+0, SEVTEN = 17.0E+0 )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            IMAX, J, JB, JJ, JMAX, JP, K, KK, KKW, KP,
+      INTEGER            IMAX, J, JJ, JMAX, JP, K, KK, KKW, KP,
      $                   KSTEP, KW
       REAL               ABSAKK, ALPHA, COLMAX, D11, D21, D22, R1,
      $                   ROWMAX, T
@@ -207,7 +207,7 @@ SUBROUTINE SLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
       EXTERNAL           LSAME, ISAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEMM, SGEMV, SSCAL, SSWAP
+      EXTERNAL           SCOPY, SGEMMTR, SGEMV, SSCAL, SSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, SQRT
@@ -243,7 +243,8 @@ SUBROUTINE SLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
          CALL SCOPY( K, A( 1, K ), 1, W( 1, KW ), 1 )
          IF( K.LT.N )
-     $      CALL SGEMV( 'No transpose', K, N-K, -ONE, A( 1, K+1 ), LDA,
+     $      CALL SGEMV( 'No transpose', K, N-K, -ONE, A( 1, K+1 ),
+     $                  LDA,
      $                  W( K, KW+1 ), LDW, ONE, W( 1, KW ), 1 )
 *
          KSTEP = 1
@@ -285,7 +286,8 @@ SUBROUTINE SLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
                CALL SCOPY( K-IMAX, A( IMAX, IMAX+1 ), LDA,
      $                     W( IMAX+1, KW-1 ), 1 )
                IF( K.LT.N )
-     $            CALL SGEMV( 'No transpose', K, N-K, -ONE, A( 1, K+1 ),
+     $            CALL SGEMV( 'No transpose', K, N-K, -ONE, A( 1,
+     $                        K+1 ),
      $                        LDA, W( IMAX, KW+1 ), LDW, ONE,
      $                        W( 1, KW-1 ), 1 )
 *
@@ -471,25 +473,9 @@ SUBROUTINE SLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *        A11 := A11 - U12*D*U12**T = A11 - U12*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 50 J = ( ( K-1 ) / NB )*NB + 1, 1, -NB
-            JB = MIN( NB, K-J+1 )
-*
-*           Update the upper triangle of the diagonal block
-*
-            DO 40 JJ = J, J + JB - 1
-               CALL SGEMV( 'No transpose', JJ-J+1, N-K, -ONE,
-     $                     A( J, K+1 ), LDA, W( JJ, KW+1 ), LDW, ONE,
-     $                     A( J, JJ ), 1 )
-   40       CONTINUE
-*
-*           Update the rectangular superdiagonal block
-*
-            CALL SGEMM( 'No transpose', 'Transpose', J-1, JB, N-K, -ONE,
-     $                  A( 1, K+1 ), LDA, W( J, KW+1 ), LDW, ONE,
-     $                  A( 1, J ), LDA )
-   50    CONTINUE
+         CALL SGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
+     $                 -ONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
+     $                 ONE, A( 1, 1 ), LDA )
 *
 *        Put U12 in standard form by partially undoing the interchanges
 *        in columns k+1:n looping backwards from k+1 to n
@@ -539,7 +525,8 @@ SUBROUTINE SLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *        Copy column K of A to column K of W and update it
 *
          CALL SCOPY( N-K+1, A( K, K ), 1, W( K, K ), 1 )
-         CALL SGEMV( 'No transpose', N-K+1, K-1, -ONE, A( K, 1 ), LDA,
+         CALL SGEMV( 'No transpose', N-K+1, K-1, -ONE, A( K, 1 ),
+     $               LDA,
      $               W( K, 1 ), LDW, ONE, W( K, K ), 1 )
 *
          KSTEP = 1
@@ -577,10 +564,13 @@ SUBROUTINE SLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *              Copy column IMAX to column K+1 of W and update it
 *
-               CALL SCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1 )
-               CALL SCOPY( N-IMAX+1, A( IMAX, IMAX ), 1, W( IMAX, K+1 ),
+               CALL SCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                     1 )
+               CALL SCOPY( N-IMAX+1, A( IMAX, IMAX ), 1, W( IMAX,
+     $                     K+1 ),
      $                     1 )
-               CALL SGEMV( 'No transpose', N-K+1, K-1, -ONE, A( K, 1 ),
+               CALL SGEMV( 'No transpose', N-K+1, K-1, -ONE, A( K,
+     $                     1 ),
      $                     LDA, W( IMAX, 1 ), LDW, ONE, W( K, K+1 ), 1 )
 *
 *              JMAX is the column-index of the largest off-diagonal
@@ -638,7 +628,8 @@ SUBROUTINE SLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
                CALL SCOPY( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
      $                     LDA )
                IF( KP.LT.N )
-     $            CALL SCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL SCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
 *
 *              Interchange rows KK and KP in first K-1 columns of A
 *              (columns K (or K and K+1 for 2-by-2 pivot) of A will be
@@ -761,26 +752,9 @@ SUBROUTINE SLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *        A22 := A22 - L21*D*L21**T = A22 - L21*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 110 J = K, N, NB
-            JB = MIN( NB, N-J+1 )
-*
-*           Update the lower triangle of the diagonal block
-*
-            DO 100 JJ = J, J + JB - 1
-               CALL SGEMV( 'No transpose', J+JB-JJ, K-1, -ONE,
-     $                     A( JJ, 1 ), LDA, W( JJ, 1 ), LDW, ONE,
-     $                     A( JJ, JJ ), 1 )
-  100       CONTINUE
-*
-*           Update the rectangular subdiagonal block
-*
-            IF( J+JB.LE.N )
-     $         CALL SGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
-     $                     K-1, -ONE, A( J+JB, 1 ), LDA, W( J, 1 ), LDW,
-     $                     ONE, A( J+JB, J ), LDA )
-  110    CONTINUE
+         CALL SGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
+     $                 K-1, -ONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
+     $                 ONE, A( K, K ), LDA )
 *
 *        Put L21 in standard form by partially undoing the interchanges
 *        of rows in columns 1:k-1 looping backwards from k-1 to 1
diff --git a/SRC/slasyf_aa.f b/SRC/slasyf_aa.f
index 8c8bdf7d1d..d45bbb99c2 100644
--- a/SRC/slasyf_aa.f
+++ b/SRC/slasyf_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASYF_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasyf_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasyf_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -136,7 +134,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup lahef_aa
 *
 *  =====================================================================
       SUBROUTINE SLASYF_AA( UPLO, J1, M, NB, A, LDA, IPIV,
@@ -172,7 +170,8 @@ SUBROUTINE SLASYF_AA( UPLO, J1, M, NB, A, LDA, IPIV,
       EXTERNAL           LSAME, ILAENV, ISAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SGEMV, SSCAL, SCOPY, SSWAP, SLASET,
+      EXTERNAL           SAXPY, SGEMV, SSCAL, SCOPY, SSWAP,
+     $                   SLASET,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
diff --git a/SRC/slasyf_rk.f b/SRC/slasyf_rk.f
index 1960bd1108..9cbc9ff1b0 100644
--- a/SRC/slasyf_rk.f
+++ b/SRC/slasyf_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASYF_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasyf_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasyf_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -239,7 +237,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup singleSYcomputational
+*> \ingroup lahef_rk
 *
 *> \par Contributors:
 *  ==================
@@ -259,6 +257,7 @@
 *  =====================================================================
       SUBROUTINE SLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
      $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -295,7 +294,7 @@ SUBROUTINE SLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
       EXTERNAL           LSAME, ISAMAX, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEMM, SGEMV, SSCAL, SSWAP
+      EXTERNAL           SCOPY, SGEMMTR, SGEMV, SSCAL, SSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, SQRT
@@ -405,7 +404,8 @@ SUBROUTINE SLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column KW-1 of W and update it
 *
-                  CALL SCOPY( IMAX, A( 1, IMAX ), 1, W( 1, KW-1 ), 1 )
+                  CALL SCOPY( IMAX, A( 1, IMAX ), 1, W( 1, KW-1 ),
+     $                        1 )
                   CALL SCOPY( K-IMAX, A( IMAX, IMAX+1 ), LDA,
      $                        W( IMAX+1, KW-1 ), 1 )
 *
@@ -504,7 +504,8 @@ SUBROUTINE SLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *              and last N-K+2 columns of W
 *
                CALL SSWAP( N-K+1, A( K, K ), LDA, A( P, K ), LDA )
-               CALL SSWAP( N-KK+1, W( K, KKW ), LDW, W( P, KKW ), LDW )
+               CALL SSWAP( N-KK+1, W( K, KKW ), LDW, W( P, KKW ),
+     $                     LDW )
             END IF
 *
 *           Updated column KP is already stored in column KKW of W
@@ -521,7 +522,8 @@ SUBROUTINE SLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *              Interchange rows KK and KP in last N-KK+1 columns
 *              of A and W
 *
-               CALL SSWAP( N-KK+1, A( KK, KK ), LDA, A( KP, KK ), LDA )
+               CALL SSWAP( N-KK+1, A( KK, KK ), LDA, A( KP, KK ),
+     $                     LDA )
                CALL SSWAP( N-KK+1, W( KK, KKW ), LDW, W( KP, KKW ),
      $                     LDW )
             END IF
@@ -615,26 +617,9 @@ SUBROUTINE SLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *        A11 := A11 - U12*D*U12**T = A11 - U12*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 50 J = ( ( K-1 ) / NB )*NB + 1, 1, -NB
-            JB = MIN( NB, K-J+1 )
-*
-*           Update the upper triangle of the diagonal block
-*
-            DO 40 JJ = J, J + JB - 1
-               CALL SGEMV( 'No transpose', JJ-J+1, N-K, -ONE,
-     $                     A( J, K+1 ), LDA, W( JJ, KW+1 ), LDW, ONE,
-     $                     A( J, JJ ), 1 )
-   40       CONTINUE
-*
-*           Update the rectangular superdiagonal block
-*
-            IF( J.GE.2 )
-     $         CALL SGEMM( 'No transpose', 'Transpose', J-1, JB,
-     $                  N-K, -ONE, A( 1, K+1 ), LDA, W( J, KW+1 ),
-     $                  LDW, ONE, A( 1, J ), LDA )
-   50    CONTINUE
+         CALL SGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
+     $                 -ONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
+     $                 ONE, A( 1, 1 ), LDA )
 *
 *        Set KB to the number of columns factorized
 *
@@ -728,7 +713,8 @@ SUBROUTINE SLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column K+1 of W and update it
 *
-                  CALL SCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1)
+                  CALL SCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                        1)
                   CALL SCOPY( N-IMAX+1, A( IMAX, IMAX ), 1,
      $                        W( IMAX, K+1 ), 1 )
                   IF( K.GT.1 )
@@ -748,7 +734,8 @@ SUBROUTINE SLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + ISAMAX( N-IMAX, W( IMAX+1, K+1 ), 1)
+                     ITEMP = IMAX + ISAMAX( N-IMAX, W( IMAX+1, K+1 ),
+     $                                      1)
                      STEMP = ABS( W( ITEMP, K+1 ) )
                      IF( STEMP.GT.ROWMAX ) THEN
                         ROWMAX = STEMP
@@ -770,7 +757,8 @@ SUBROUTINE SLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                    copy column K+1 of W to column K of W
 *
-                     CALL SCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL SCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                      DONE = .TRUE.
 *
@@ -796,7 +784,8 @@ SUBROUTINE SLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                    Copy updated JMAXth (next IMAXth) column to Kth of W
 *
-                     CALL SCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL SCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                   END IF
 *
@@ -831,7 +820,8 @@ SUBROUTINE SLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *              Copy non-updated column KK to column KP
 *
                A( KP, K ) = A( KK, K )
-               CALL SCOPY( KP-K-1, A( K+1, KK ), 1, A( KP, K+1 ), LDA )
+               CALL SCOPY( KP-K-1, A( K+1, KK ), 1, A( KP, K+1 ),
+     $                     LDA )
                CALL SCOPY( N-KP+1, A( KP, KK ), 1, A( KP, KP ), 1 )
 *
 *              Interchange rows KK and KP in first KK columns of A and W
@@ -928,26 +918,9 @@ SUBROUTINE SLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *        A22 := A22 - L21*D*L21**T = A22 - L21*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 110 J = K, N, NB
-            JB = MIN( NB, N-J+1 )
-*
-*           Update the lower triangle of the diagonal block
-*
-            DO 100 JJ = J, J + JB - 1
-               CALL SGEMV( 'No transpose', J+JB-JJ, K-1, -ONE,
-     $                     A( JJ, 1 ), LDA, W( JJ, 1 ), LDW, ONE,
-     $                     A( JJ, JJ ), 1 )
-  100       CONTINUE
-*
-*           Update the rectangular subdiagonal block
-*
-            IF( J+JB.LE.N )
-     $         CALL SGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
-     $                     K-1, -ONE, A( J+JB, 1 ), LDA, W( J, 1 ),
-     $                     LDW, ONE, A( J+JB, J ), LDA )
-  110    CONTINUE
+         CALL SGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
+     $                 K-1, -ONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
+     $                 ONE, A( K, K ), LDA )
 *
 *        Set KB to the number of columns factorized
 *
diff --git a/SRC/slasyf_rook.f b/SRC/slasyf_rook.f
index 7764f69350..2776e6a13c 100644
--- a/SRC/slasyf_rook.f
+++ b/SRC/slasyf_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLASYF_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slasyf_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slasyf_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -161,7 +159,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup lahef_rook
 *
 *> \par Contributors:
 *  ==================
@@ -181,6 +179,7 @@
 *  =====================================================================
       SUBROUTINE SLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
      $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -205,7 +204,7 @@ SUBROUTINE SLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            DONE
-      INTEGER            IMAX, ITEMP, J, JB, JJ, JMAX, JP1, JP2, K, KK,
+      INTEGER            IMAX, ITEMP, J, JJ, JMAX, JP1, JP2, K, KK,
      $                   KW, KKW, KP, KSTEP, P, II
 
       REAL               ABSAKK, ALPHA, COLMAX, D11, D12, D21, D22,
@@ -218,7 +217,7 @@ SUBROUTINE SLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
       EXTERNAL           LSAME, ISAMAX, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEMM, SGEMV, SSCAL, SSWAP
+      EXTERNAL           SCOPY, SGEMMTR, SGEMV, SSCAL, SSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, SQRT
@@ -317,7 +316,8 @@ SUBROUTINE SLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column KW-1 of W and update it
 *
-                  CALL SCOPY( IMAX, A( 1, IMAX ), 1, W( 1, KW-1 ), 1 )
+                  CALL SCOPY( IMAX, A( 1, IMAX ), 1, W( 1, KW-1 ),
+     $                        1 )
                   CALL SCOPY( K-IMAX, A( IMAX, IMAX+1 ), LDA,
      $                        W( IMAX+1, KW-1 ), 1 )
 *
@@ -416,7 +416,8 @@ SUBROUTINE SLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *              and last N-K+2 columns of W
 *
                CALL SSWAP( N-K+1, A( K, K ), LDA, A( P, K ), LDA )
-               CALL SSWAP( N-KK+1, W( K, KKW ), LDW, W( P, KKW ), LDW )
+               CALL SSWAP( N-KK+1, W( K, KKW ), LDW, W( P, KKW ),
+     $                     LDW )
             END IF
 *
 *           Updated column KP is already stored in column KKW of W
@@ -433,7 +434,8 @@ SUBROUTINE SLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *              Interchange rows KK and KP in last N-KK+1 columns
 *              of A and W
 *
-               CALL SSWAP( N-KK+1, A( KK, KK ), LDA, A( KP, KK ), LDA )
+               CALL SSWAP( N-KK+1, A( KK, KK ), LDA, A( KP, KK ),
+     $                     LDA )
                CALL SSWAP( N-KK+1, W( KK, KKW ), LDW, W( KP, KKW ),
      $                     LDW )
             END IF
@@ -514,26 +516,9 @@ SUBROUTINE SLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *        A11 := A11 - U12*D*U12**T = A11 - U12*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 50 J = ( ( K-1 ) / NB )*NB + 1, 1, -NB
-            JB = MIN( NB, K-J+1 )
-*
-*           Update the upper triangle of the diagonal block
-*
-            DO 40 JJ = J, J + JB - 1
-               CALL SGEMV( 'No transpose', JJ-J+1, N-K, -ONE,
-     $                     A( J, K+1 ), LDA, W( JJ, KW+1 ), LDW, ONE,
-     $                     A( J, JJ ), 1 )
-   40       CONTINUE
-*
-*           Update the rectangular superdiagonal block
-*
-            IF( J.GE.2 )
-     $         CALL SGEMM( 'No transpose', 'Transpose', J-1, JB,
-     $                  N-K, -ONE, A( 1, K+1 ), LDA, W( J, KW+1 ), LDW,
-     $                  ONE, A( 1, J ), LDA )
-   50    CONTINUE
+         CALL SGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
+     $                 -ONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
+     $                 ONE, A( 1, 1 ), LDA )
 *
 *        Put U12 in standard form by partially undoing the interchanges
 *        in columns k+1:n
@@ -643,7 +628,8 @@ SUBROUTINE SLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column K+1 of W and update it
 *
-                  CALL SCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1)
+                  CALL SCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                        1)
                   CALL SCOPY( N-IMAX+1, A( IMAX, IMAX ), 1,
      $                        W( IMAX, K+1 ), 1 )
                   IF( K.GT.1 )
@@ -663,7 +649,8 @@ SUBROUTINE SLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + ISAMAX( N-IMAX, W( IMAX+1, K+1 ), 1)
+                     ITEMP = IMAX + ISAMAX( N-IMAX, W( IMAX+1, K+1 ),
+     $                                      1)
                      STEMP = ABS( W( ITEMP, K+1 ) )
                      IF( STEMP.GT.ROWMAX ) THEN
                         ROWMAX = STEMP
@@ -685,7 +672,8 @@ SUBROUTINE SLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                    copy column K+1 of W to column K of W
 *
-                     CALL SCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL SCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                      DONE = .TRUE.
 *
@@ -711,7 +699,8 @@ SUBROUTINE SLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                    Copy updated JMAXth (next IMAXth) column to Kth of W
 *
-                     CALL SCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL SCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                   END IF
 *
@@ -746,7 +735,8 @@ SUBROUTINE SLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *              Copy non-updated column KK to column KP
 *
                A( KP, K ) = A( KK, K )
-               CALL SCOPY( KP-K-1, A( K+1, KK ), 1, A( KP, K+1 ), LDA )
+               CALL SCOPY( KP-K-1, A( K+1, KK ), 1, A( KP, K+1 ),
+     $                     LDA )
                CALL SCOPY( N-KP+1, A( KP, KK ), 1, A( KP, KP ), 1 )
 *
 *              Interchange rows KK and KP in first KK columns of A and W
@@ -830,26 +820,9 @@ SUBROUTINE SLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *        A22 := A22 - L21*D*L21**T = A22 - L21*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 110 J = K, N, NB
-            JB = MIN( NB, N-J+1 )
-*
-*           Update the lower triangle of the diagonal block
-*
-            DO 100 JJ = J, J + JB - 1
-               CALL SGEMV( 'No transpose', J+JB-JJ, K-1, -ONE,
-     $                     A( JJ, 1 ), LDA, W( JJ, 1 ), LDW, ONE,
-     $                     A( JJ, JJ ), 1 )
-  100       CONTINUE
-*
-*           Update the rectangular subdiagonal block
-*
-            IF( J+JB.LE.N )
-     $         CALL SGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
-     $                     K-1, -ONE, A( J+JB, 1 ), LDA, W( J, 1 ), LDW,
-     $                     ONE, A( J+JB, J ), LDA )
-  110    CONTINUE
+         CALL SGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
+     $                 K-1, -ONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
+     $                 ONE, A( K, K ), LDA )
 *
 *        Put L21 in standard form by partially undoing the interchanges
 *        in columns 1:k-1
diff --git a/SRC/slatbs.f b/SRC/slatbs.f
index 617d0b2f50..9b1874030a 100644
--- a/SRC/slatbs.f
+++ b/SRC/slatbs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLATBS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slatbs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slatbs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -162,7 +160,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup latbs
 *
 *> \par Further Details:
 *  =====================
@@ -237,8 +235,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB, X,
+      SUBROUTINE SLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB,
+     $                   X,
      $                   SCALE, CNORM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -310,6 +310,7 @@ SUBROUTINE SLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB, X,
 *
 *     Quick return if possible
 *
+      SCALE = ONE
       IF( N.EQ.0 )
      $   RETURN
 *
@@ -317,7 +318,6 @@ SUBROUTINE SLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB, X,
 *
       SMLNUM = SLAMCH( 'Safe minimum' ) / SLAMCH( 'Precision' )
       BIGNUM = ONE / SMLNUM
-      SCALE = ONE
 *
       IF( LSAME( NORMIN, 'N' ) ) THEN
 *
@@ -702,7 +702,8 @@ SUBROUTINE SLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB, X,
                   ELSE
                      JLEN = MIN( KD, N-J )
                      IF( JLEN.GT.0 )
-     $                  SUMJ = SDOT( JLEN, AB( 2, J ), 1, X( J+1 ), 1 )
+     $                  SUMJ = SDOT( JLEN, AB( 2, J ), 1, X( J+1 ),
+     $                               1 )
                   END IF
                ELSE
 *
diff --git a/SRC/slatdf.f b/SRC/slatdf.f
index 2eaacbd9cc..5bf210d0c7 100644
--- a/SRC/slatdf.f
+++ b/SRC/slatdf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLATDF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slatdf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slatdf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,7 +131,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup latdf
 *
 *> \par Further Details:
 *  =====================
@@ -168,6 +166,7 @@
 *  =====================================================================
       SUBROUTINE SLATDF( IJOB, N, Z, LDZ, RHS, RDSUM, RDSCAL, IPIV,
      $                   JPIV )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -199,7 +198,8 @@ SUBROUTINE SLATDF( IJOB, N, Z, LDZ, RHS, RDSUM, RDSCAL, IPIV,
       REAL               WORK( 4*MAXDIM ), XM( MAXDIM ), XP( MAXDIM )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SGECON, SGESC2, SLASSQ, SLASWP,
+      EXTERNAL           SAXPY, SCOPY, SGECON, SGESC2, SLASSQ,
+     $                   SLASWP,
      $                   SSCAL
 *     ..
 *     .. External Functions ..
@@ -229,7 +229,8 @@ SUBROUTINE SLATDF( IJOB, N, Z, LDZ, RHS, RDSUM, RDSCAL, IPIV,
 *           Look-ahead for L-part RHS(1:N-1) = + or -1, SPLUS and
 *           SMIN computed more efficiently than in BSOLVE [1].
 *
-            SPLUS = SPLUS + SDOT( N-J, Z( J+1, J ), 1, Z( J+1, J ), 1 )
+            SPLUS = SPLUS + SDOT( N-J, Z( J+1, J ), 1, Z( J+1, J ),
+     $                            1 )
             SMINU = SDOT( N-J, Z( J+1, J ), 1, RHS( J+1 ), 1 )
             SPLUS = SPLUS*RHS( J )
             IF( SPLUS.GT.SMINU ) THEN
diff --git a/SRC/slatps.f b/SRC/slatps.f
index 2bce76f065..0fe7485b72 100644
--- a/SRC/slatps.f
+++ b/SRC/slatps.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLATPS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slatps.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slatps.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -149,7 +147,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup latps
 *
 *> \par Further Details:
 *  =====================
@@ -226,6 +224,7 @@
 *  =====================================================================
       SUBROUTINE SLATPS( UPLO, TRANS, DIAG, NORMIN, N, AP, X, SCALE,
      $                   CNORM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -617,7 +616,8 @@ SUBROUTINE SLATPS( UPLO, TRANS, DIAG, NORMIN, N, AP, X, SCALE,
 *                    Compute the update
 *                       x(1:j-1) := x(1:j-1) - x(j) * A(1:j-1,j)
 *
-                     CALL SAXPY( J-1, -X( J )*TSCAL, AP( IP-J+1 ), 1, X,
+                     CALL SAXPY( J-1, -X( J )*TSCAL, AP( IP-J+1 ), 1,
+     $                           X,
      $                           1 )
                      I = ISAMAX( J-1, X, 1 )
                      XMAX = ABS( X( I ) )
diff --git a/SRC/slatrd.f b/SRC/slatrd.f
index 1cdb13c394..73e4ffb2f5 100644
--- a/SRC/slatrd.f
+++ b/SRC/slatrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLATRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slatrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slatrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -139,7 +137,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERauxiliary
+*> \ingroup latrd
 *
 *> \par Further Details:
 *  =====================
@@ -195,6 +193,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -248,7 +247,8 @@ SUBROUTINE SLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
 *
                CALL SGEMV( 'No transpose', I, N-I, -ONE, A( 1, I+1 ),
      $                     LDA, W( I, IW+1 ), LDW, ONE, A( 1, I ), 1 )
-               CALL SGEMV( 'No transpose', I, N-I, -ONE, W( 1, IW+1 ),
+               CALL SGEMV( 'No transpose', I, N-I, -ONE, W( 1,
+     $                     IW+1 ),
      $                     LDW, A( I, I+1 ), LDA, ONE, A( 1, I ), 1 )
             END IF
             IF( I.GT.1 ) THEN
@@ -256,7 +256,8 @@ SUBROUTINE SLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
 *              Generate elementary reflector H(i) to annihilate
 *              A(1:i-2,i)
 *
-               CALL SLARFG( I-1, A( I-1, I ), A( 1, I ), 1, TAU( I-1 ) )
+               CALL SLARFG( I-1, A( I-1, I ), A( 1, I ), 1,
+     $                      TAU( I-1 ) )
                E( I-1 ) = A( I-1, I )
                A( I-1, I ) = ONE
 *
@@ -265,12 +266,14 @@ SUBROUTINE SLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
                CALL SSYMV( 'Upper', I-1, ONE, A, LDA, A( 1, I ), 1,
      $                     ZERO, W( 1, IW ), 1 )
                IF( I.LT.N ) THEN
-                  CALL SGEMV( 'Transpose', I-1, N-I, ONE, W( 1, IW+1 ),
+                  CALL SGEMV( 'Transpose', I-1, N-I, ONE, W( 1,
+     $                        IW+1 ),
      $                        LDW, A( 1, I ), 1, ZERO, W( I+1, IW ), 1 )
                   CALL SGEMV( 'No transpose', I-1, N-I, -ONE,
      $                        A( 1, I+1 ), LDA, W( I+1, IW ), 1, ONE,
      $                        W( 1, IW ), 1 )
-                  CALL SGEMV( 'Transpose', I-1, N-I, ONE, A( 1, I+1 ),
+                  CALL SGEMV( 'Transpose', I-1, N-I, ONE, A( 1,
+     $                        I+1 ),
      $                        LDA, A( 1, I ), 1, ZERO, W( I+1, IW ), 1 )
                   CALL SGEMV( 'No transpose', I-1, N-I, -ONE,
      $                        W( 1, IW+1 ), LDW, W( I+1, IW ), 1, ONE,
@@ -300,7 +303,8 @@ SUBROUTINE SLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
 *              Generate elementary reflector H(i) to annihilate
 *              A(i+2:n,i)
 *
-               CALL SLARFG( N-I, A( I+1, I ), A( MIN( I+2, N ), I ), 1,
+               CALL SLARFG( N-I, A( I+1, I ), A( MIN( I+2, N ), I ),
+     $                      1,
      $                      TAU( I ) )
                E( I ) = A( I+1, I )
                A( I+1, I ) = ONE
@@ -309,18 +313,23 @@ SUBROUTINE SLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
 *
                CALL SSYMV( 'Lower', N-I, ONE, A( I+1, I+1 ), LDA,
      $                     A( I+1, I ), 1, ZERO, W( I+1, I ), 1 )
-               CALL SGEMV( 'Transpose', N-I, I-1, ONE, W( I+1, 1 ), LDW,
+               CALL SGEMV( 'Transpose', N-I, I-1, ONE, W( I+1, 1 ),
+     $                     LDW,
      $                     A( I+1, I ), 1, ZERO, W( 1, I ), 1 )
-               CALL SGEMV( 'No transpose', N-I, I-1, -ONE, A( I+1, 1 ),
+               CALL SGEMV( 'No transpose', N-I, I-1, -ONE, A( I+1,
+     $                     1 ),
      $                     LDA, W( 1, I ), 1, ONE, W( I+1, I ), 1 )
-               CALL SGEMV( 'Transpose', N-I, I-1, ONE, A( I+1, 1 ), LDA,
+               CALL SGEMV( 'Transpose', N-I, I-1, ONE, A( I+1, 1 ),
+     $                     LDA,
      $                     A( I+1, I ), 1, ZERO, W( 1, I ), 1 )
-               CALL SGEMV( 'No transpose', N-I, I-1, -ONE, W( I+1, 1 ),
+               CALL SGEMV( 'No transpose', N-I, I-1, -ONE, W( I+1,
+     $                     1 ),
      $                     LDW, W( 1, I ), 1, ONE, W( I+1, I ), 1 )
                CALL SSCAL( N-I, TAU( I ), W( I+1, I ), 1 )
                ALPHA = -HALF*TAU( I )*SDOT( N-I, W( I+1, I ), 1,
      $                 A( I+1, I ), 1 )
-               CALL SAXPY( N-I, ALPHA, A( I+1, I ), 1, W( I+1, I ), 1 )
+               CALL SAXPY( N-I, ALPHA, A( I+1, I ), 1, W( I+1, I ),
+     $                     1 )
             END IF
 *
    20    CONTINUE
diff --git a/SRC/slatrs.f b/SRC/slatrs.f
index 94e0e88bc6..0e26fbda22 100644
--- a/SRC/slatrs.f
+++ b/SRC/slatrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLATRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slatrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slatrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -158,7 +156,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup latrs
 *
 *> \par Further Details:
 *  =====================
@@ -233,8 +231,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
+      SUBROUTINE SLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X,
+     $                   SCALE,
      $                   CNORM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -261,11 +261,15 @@ SUBROUTINE SLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
       REAL               BIGNUM, GROW, REC, SMLNUM, SUMJ, TJJ, TJJS,
      $                   TMAX, TSCAL, USCAL, XBND, XJ, XMAX
 *     ..
+*     .. Local Arrays ..
+      REAL               WORK(1)
+*     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ISAMAX
-      REAL               SASUM, SDOT, SLAMCH
-      EXTERNAL           LSAME, ISAMAX, SASUM, SDOT, SLAMCH
+      REAL               SASUM, SDOT, SLAMCH, SLANGE
+      EXTERNAL           LSAME, ISAMAX, SASUM, SDOT, SLAMCH,
+     $                   SLANGE
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SAXPY, SSCAL, STRSV, XERBLA
@@ -304,6 +308,7 @@ SUBROUTINE SLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
 *
 *     Quick return if possible
 *
+      SCALE = ONE
       IF( N.EQ.0 )
      $   RETURN
 *
@@ -311,7 +316,6 @@ SUBROUTINE SLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
 *
       SMLNUM = SLAMCH( 'Safe minimum' ) / SLAMCH( 'Precision' )
       BIGNUM = ONE / SMLNUM
-      SCALE = ONE
 *
       IF( LSAME( NORMIN, 'N' ) ) THEN
 *
@@ -343,8 +347,67 @@ SUBROUTINE SLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
       IF( TMAX.LE.BIGNUM ) THEN
          TSCAL = ONE
       ELSE
-         TSCAL = ONE / ( SMLNUM*TMAX )
-         CALL SSCAL( N, TSCAL, CNORM, 1 )
+*
+*        Avoid NaN generation if entries in CNORM exceed the
+*        overflow threshold
+*
+         IF ( TMAX.LE.SLAMCH('Overflow') ) THEN
+*           Case 1: All entries in CNORM are valid floating-point numbers
+            TSCAL = ONE / ( SMLNUM*TMAX )
+            CALL SSCAL( N, TSCAL, CNORM, 1 )
+         ELSE
+*           Case 2: At least one column norm of A cannot be represented
+*           as floating-point number. Find the offdiagonal entry A( I, J )
+*           with the largest absolute value. If this entry is not +/- Infinity,
+*           use this value as TSCAL.
+            TMAX = ZERO
+            IF( UPPER ) THEN
+*
+*              A is upper triangular.
+*
+               DO J = 2, N
+                  TMAX = MAX( SLANGE( 'M', J-1, 1, A( 1, J ), 1,
+     $                        WORK ), TMAX )
+               END DO
+            ELSE
+*
+*              A is lower triangular.
+*
+               DO J = 1, N - 1
+                  TMAX = MAX( SLANGE( 'M', N-J, 1, A( J+1, J ), 1,
+     $                        WORK ), TMAX )
+               END DO
+            END IF
+*
+            IF( TMAX.LE.SLAMCH('Overflow') ) THEN
+               TSCAL = ONE / ( SMLNUM*TMAX )
+               DO J = 1, N
+                  IF( CNORM( J ).LE.SLAMCH('Overflow') ) THEN
+                     CNORM( J ) = CNORM( J )*TSCAL
+                  ELSE
+*                    Recompute the 1-norm without introducing Infinity
+*                    in the summation
+                     CNORM( J ) = ZERO
+                     IF( UPPER ) THEN
+                        DO I = 1, J - 1
+                           CNORM( J ) = CNORM( J ) +
+     $                                  TSCAL * ABS( A( I, J ) )
+                        END DO
+                     ELSE
+                        DO I = J + 1, N
+                           CNORM( J ) = CNORM( J ) +
+     $                                  TSCAL * ABS( A( I, J ) )
+                        END DO
+                     END IF
+                  END IF
+               END DO
+            ELSE
+*              At least one entry of A is not a valid floating-point entry.
+*              Rely on TRSV to propagate Inf and NaN.
+               CALL STRSV( UPLO, TRANS, DIAG, N, A, LDA, X, 1 )
+               RETURN
+            END IF
+         END IF
       END IF
 *
 *     Compute a bound on the computed solution vector to see if the
diff --git a/SRC/slatrs3.f b/SRC/slatrs3.f
new file mode 100644
index 0000000000..a01be4aa37
--- /dev/null
+++ b/SRC/slatrs3.f
@@ -0,0 +1,678 @@
+*> \brief \b SLATRS3 solves a triangular system of equations with the scale factors set to prevent overflow.
+*
+*  Definition:
+*  ===========
+*
+*      SUBROUTINE SLATRS3( UPLO, TRANS, DIAG, NORMIN, N, NRHS, A, LDA,
+*                          X, LDX, SCALE, CNORM, WORK, LWORK, INFO )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          DIAG, NORMIN, TRANS, UPLO
+*       INTEGER            INFO, LDA, LWORK, LDX, N, NRHS
+*       ..
+*       .. Array Arguments ..
+*       REAL               A( LDA, * ), CNORM( * ), SCALE( * ), 
+*                          WORK( * ), X( LDX, * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> SLATRS3 solves one of the triangular systems
+*>
+*>    A * X = B * diag(scale)  or  A**T * X = B * diag(scale)
+*>
+*> with scaling to prevent overflow.  Here A is an upper or lower
+*> triangular matrix, A**T denotes the transpose of A. X and B are
+*> n by nrhs matrices and scale is an nrhs element vector of scaling
+*> factors. A scaling factor scale(j) is usually less than or equal
+*> to 1, chosen such that X(:,j) is less than the overflow threshold.
+*> If the matrix A is singular (A(j,j) = 0 for some j), then
+*> a non-trivial solution to A*X = 0 is returned. If the system is
+*> so badly scaled that the solution cannot be represented as
+*> (1/scale(k))*X(:,k), then x(:,k) = 0 and scale(k) is returned.
+*>
+*> This is a BLAS-3 version of LATRS for solving several right
+*> hand sides simultaneously.
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>          Specifies whether the matrix A is upper or lower triangular.
+*>          = 'U':  Upper triangular
+*>          = 'L':  Lower triangular
+*> \endverbatim
+*>
+*> \param[in] TRANS
+*> \verbatim
+*>          TRANS is CHARACTER*1
+*>          Specifies the operation applied to A.
+*>          = 'N':  Solve A * x = s*b  (No transpose)
+*>          = 'T':  Solve A**T* x = s*b  (Transpose)
+*>          = 'C':  Solve A**T* x = s*b  (Conjugate transpose = Transpose)
+*> \endverbatim
+*>
+*> \param[in] DIAG
+*> \verbatim
+*>          DIAG is CHARACTER*1
+*>          Specifies whether or not the matrix A is unit triangular.
+*>          = 'N':  Non-unit triangular
+*>          = 'U':  Unit triangular
+*> \endverbatim
+*>
+*> \param[in] NORMIN
+*> \verbatim
+*>          NORMIN is CHARACTER*1
+*>          Specifies whether CNORM has been set or not.
+*>          = 'Y':  CNORM contains the column norms on entry
+*>          = 'N':  CNORM is not set on entry.  On exit, the norms will
+*>                  be computed and stored in CNORM.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of columns of X.  NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is REAL array, dimension (LDA,N)
+*>          The triangular matrix A.  If UPLO = 'U', the leading n by n
+*>          upper triangular part of the array A contains the upper
+*>          triangular matrix, and the strictly lower triangular part of
+*>          A is not referenced.  If UPLO = 'L', the leading n by n lower
+*>          triangular part of the array A contains the lower triangular
+*>          matrix, and the strictly upper triangular part of A is not
+*>          referenced.  If DIAG = 'U', the diagonal elements of A are
+*>          also not referenced and are assumed to be 1.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max (1,N).
+*> \endverbatim
+*>
+*> \param[in,out] X
+*> \verbatim
+*>          X is REAL array, dimension (LDX,NRHS)
+*>          On entry, the right hand side B of the triangular system.
+*>          On exit, X is overwritten by the solution matrix X.
+*> \endverbatim
+*>
+*> \param[in] LDX
+*> \verbatim
+*>          LDX is INTEGER
+*>          The leading dimension of the array X.  LDX >= max (1,N).
+*> \endverbatim
+*>
+*> \param[out] SCALE
+*> \verbatim
+*>          SCALE is REAL array, dimension (NRHS)
+*>          The scaling factor s(k) is for the triangular system
+*>          A * x(:,k) = s(k)*b(:,k)  or  A**T* x(:,k) = s(k)*b(:,k).
+*>          If SCALE = 0, the matrix A is singular or badly scaled.
+*>          If A(j,j) = 0 is encountered, a non-trivial vector x(:,k)
+*>          that is an exact or approximate solution to A*x(:,k) = 0
+*>          is returned. If the system so badly scaled that solution
+*>          cannot be presented as x(:,k) * 1/s(k), then x(:,k) = 0
+*>          is returned.
+*> \endverbatim
+*>
+*> \param[in,out] CNORM
+*> \verbatim
+*>          CNORM is REAL array, dimension (N)
+*>
+*>          If NORMIN = 'Y', CNORM is an input argument and CNORM(j)
+*>          contains the norm of the off-diagonal part of the j-th column
+*>          of A.  If TRANS = 'N', CNORM(j) must be greater than or equal
+*>          to the infinity-norm, and if TRANS = 'T' or 'C', CNORM(j)
+*>          must be greater than or equal to the 1-norm.
+*>
+*>          If NORMIN = 'N', CNORM is an output argument and CNORM(j)
+*>          returns the 1-norm of the offdiagonal part of the j-th column
+*>          of A.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is REAL array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>
+*>          If MIN(N,NRHS) = 0, LWORK >= 1, else
+*>          LWORK >= MAX(1, 2*NBA * MAX(NBA, MIN(NRHS, 32)), where
+*>          NBA = (N + NB - 1)/NB and NB is the optimal block size.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal dimensions of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -k, the k-th argument had an illegal value
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup latrs3
+*> \par Further Details:
+*  =====================
+*  \verbatim
+*  The algorithm follows the structure of a block triangular solve.
+*  The diagonal block is solved with a call to the robust the triangular
+*  solver LATRS for every right-hand side RHS = 1, ..., NRHS
+*     op(A( J, J )) * x( J, RHS ) = SCALOC * b( J, RHS ),
+*  where op( A ) = A or op( A ) = A**T.
+*  The linear block updates operate on block columns of X,
+*     B( I, K ) - op(A( I, J )) * X( J, K )
+*  and use GEMM. To avoid overflow in the linear block update, the worst case
+*  growth is estimated. For every RHS, a scale factor s <= 1.0 is computed
+*  such that
+*     || s * B( I, RHS )||_oo
+*   + || op(A( I, J )) ||_oo * || s *  X( J, RHS ) ||_oo <= Overflow threshold
+*
+*  Once all columns of a block column have been rescaled (BLAS-1), the linear
+*  update is executed with GEMM without overflow.
+*
+*  To limit rescaling, local scale factors track the scaling of column segments.
+*  There is one local scale factor s( I, RHS ) per block row I = 1, ..., NBA
+*  per right-hand side column RHS = 1, ..., NRHS. The global scale factor
+*  SCALE( RHS ) is chosen as the smallest local scale factor s( I, RHS )
+*  I = 1, ..., NBA.
+*  A triangular solve op(A( J, J )) * x( J, RHS ) = SCALOC * b( J, RHS )
+*  updates the local scale factor s( J, RHS ) := s( J, RHS ) * SCALOC. The
+*  linear update of potentially inconsistently scaled vector segments
+*     s( I, RHS ) * b( I, RHS ) - op(A( I, J )) * ( s( J, RHS )* x( J, RHS ) )
+*  computes a consistent scaling SCAMIN = MIN( s(I, RHS ), s(J, RHS) ) and,
+*  if necessary, rescales the blocks prior to calling GEMM.
+*
+*  \endverbatim
+*  =====================================================================
+*  References:
+*  C. C. Kjelgaard Mikkelsen, A. B. Schwarz and L. Karlsson (2019).
+*  Parallel robust solution of triangular linear systems. Concurrency
+*  and Computation: Practice and Experience, 31(19), e5064.
+*
+*  Contributor:
+*   Angelika Schwarz, Umea University, Sweden.
+*
+*  =====================================================================
+      SUBROUTINE SLATRS3( UPLO, TRANS, DIAG, NORMIN, N, NRHS, A, LDA,
+     $                    X, LDX, SCALE, CNORM, WORK, LWORK, INFO )
+      IMPLICIT NONE
+*
+*     .. Scalar Arguments ..
+      CHARACTER          DIAG, TRANS, NORMIN, UPLO
+      INTEGER            INFO, LDA, LWORK, LDX, N, NRHS
+*     ..
+*     .. Array Arguments ..
+      REAL               A( LDA, * ), CNORM( * ), X( LDX, * ),
+     $                   SCALE( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      REAL               ZERO, ONE
+      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0 )
+      INTEGER            NBMAX, NBMIN, NBRHS, NRHSMIN
+      PARAMETER          ( NRHSMIN = 2, NBRHS = 32 )
+      PARAMETER          ( NBMIN = 8, NBMAX = 64 )
+*     ..
+*     .. Local Arrays ..
+      REAL               W( NBMAX ), XNRM( NBRHS )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY, NOTRAN, NOUNIT, UPPER
+      INTEGER            AWRK, I, IFIRST, IINC, ILAST, II, I1, I2, J,
+     $                   JFIRST, JINC, JLAST, J1, J2, K, KK, K1, K2,
+     $                   LANRM, LDS, LSCALE, NB, NBA, NBX, RHS, LWMIN
+      REAL               ANRM, BIGNUM, BNRM, RSCAL, SCAL, SCALOC,
+     $                   SCAMIN, SMLNUM, TMAX
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      REAL               SLAMCH, SLANGE, SLARMM
+      EXTERNAL           ILAENV, LSAME, SLAMCH, SLANGE,
+     $                   SLARMM
+*     ..
+*     .. External Subroutines ..
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SLATRS, SSCAL, SROUNDUP_LWORK, XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+      INFO = 0
+      UPPER = LSAME( UPLO, 'U' )
+      NOTRAN = LSAME( TRANS, 'N' )
+      NOUNIT = LSAME( DIAG, 'N' )
+      LQUERY = ( LWORK.EQ.-1 )
+*
+*     Partition A and X into blocks.
+*
+      NB = MAX( 8, ILAENV( 1, 'SLATRS', '', N, N, -1, -1 ) )
+      NB = MIN( NBMAX, NB )
+      NBA = MAX( 1, (N + NB - 1) / NB )
+      NBX = MAX( 1, (NRHS + NBRHS - 1) / NBRHS )
+*
+*     Compute the workspace
+*
+*     The workspace comprises two parts.
+*     The first part stores the local scale factors. Each simultaneously
+*     computed right-hand side requires one local scale factor per block
+*     row. WORK( I + KK * LDS ) is the scale factor of the vector
+*     segment associated with the I-th block row and the KK-th vector
+*     in the block column.
+*
+      LSCALE = NBA * MAX( NBA, MIN( NRHS, NBRHS ) )
+      LDS = NBA
+*
+*     The second part stores upper bounds of the triangular A. There are
+*     a total of NBA x NBA blocks, of which only the upper triangular
+*     part or the lower triangular part is referenced. The upper bound of
+*     the block A( I, J ) is stored as WORK( AWRK + I + J * NBA ).
+*
+      LANRM = NBA * NBA
+      AWRK = LSCALE
+*
+      IF( MIN( N, NRHS ).EQ.0 ) THEN
+         LWMIN = 1
+      ELSE
+         LWMIN = LSCALE + LANRM
+      END IF
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
+*
+*     Test the input parameters.
+*
+      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
+     $         LSAME( TRANS, 'C' ) ) THEN
+         INFO = -2
+      ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
+         INFO = -3
+      ELSE IF( .NOT.LSAME( NORMIN, 'Y' ) .AND. .NOT.
+     $         LSAME( NORMIN, 'N' ) ) THEN
+         INFO = -4
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -5
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -6
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -8
+      ELSE IF( LDX.LT.MAX( 1, N ) ) THEN
+         INFO = -10
+      ELSE IF( .NOT.LQUERY .AND. LWORK.LT.LWMIN ) THEN
+         INFO = -14
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'SLATRS3', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Initialize scaling factors
+*
+      DO KK = 1, NRHS
+         SCALE( KK ) = ONE
+      END DO
+*
+*     Quick return if possible
+*
+      IF( MIN( N, NRHS ).EQ.0 )
+     $   RETURN
+*
+*     Determine machine dependent constant to control overflow.
+*
+      BIGNUM = SLAMCH( 'Overflow' )
+      SMLNUM = SLAMCH( 'Safe Minimum' )
+*
+*     Use unblocked code for small problems
+*
+      IF( NRHS.LT.NRHSMIN ) THEN
+         CALL SLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X( 1, 1),
+     $                SCALE( 1 ), CNORM, INFO )
+         DO K = 2, NRHS
+            CALL SLATRS( UPLO, TRANS, DIAG, 'Y', N, A, LDA, X( 1,
+     $                   K ),
+     $                   SCALE( K ), CNORM, INFO )
+         END DO
+         RETURN
+      END IF
+*
+*     Compute norms of blocks of A excluding diagonal blocks and find
+*     the block with the largest norm TMAX.
+*
+      TMAX = ZERO
+      DO J = 1, NBA
+         J1 = (J-1)*NB + 1
+         J2 = MIN( J*NB, N ) + 1
+         IF ( UPPER ) THEN
+            IFIRST = 1
+            ILAST = J - 1
+         ELSE
+            IFIRST = J + 1
+            ILAST = NBA
+         END IF
+         DO I = IFIRST, ILAST
+            I1 = (I-1)*NB + 1
+            I2 = MIN( I*NB, N ) + 1
+*
+*           Compute upper bound of A( I1:I2-1, J1:J2-1 ).
+*
+            IF( NOTRAN ) THEN
+               ANRM = SLANGE( 'I', I2-I1, J2-J1, A( I1, J1 ), LDA,
+     $                        W )
+               WORK( AWRK + I+(J-1)*NBA ) = ANRM
+            ELSE
+               ANRM = SLANGE( '1', I2-I1, J2-J1, A( I1, J1 ), LDA,
+     $                        W )
+               WORK( AWRK + J+(I-1)*NBA ) = ANRM
+            END IF
+            TMAX = MAX( TMAX, ANRM )
+         END DO
+      END DO
+*
+      IF( .NOT. TMAX.LE.SLAMCH('Overflow') ) THEN
+*
+*        Some matrix entries have huge absolute value. At least one upper
+*        bound norm( A(I1:I2-1, J1:J2-1), 'I') is not a valid floating-point
+*        number, either due to overflow in LANGE or due to Inf in A.
+*        Fall back to LATRS. Set normin = 'N' for every right-hand side to
+*        force computation of TSCAL in LATRS to avoid the likely overflow
+*        in the computation of the column norms CNORM.
+*
+         DO K = 1, NRHS
+            CALL SLATRS( UPLO, TRANS, DIAG, 'N', N, A, LDA, X( 1,
+     $                   K ),
+     $                   SCALE( K ), CNORM, INFO )
+         END DO
+         RETURN
+      END IF
+*
+*     Every right-hand side requires workspace to store NBA local scale
+*     factors. To save workspace, X is computed successively in block columns
+*     of width NBRHS, requiring a total of NBA x NBRHS space. If sufficient
+*     workspace is available, larger values of NBRHS or NBRHS = NRHS are viable.
+      DO K = 1, NBX
+*        Loop over block columns (index = K) of X and, for column-wise scalings,
+*        over individual columns (index = KK).
+*        K1: column index of the first column in X( J, K )
+*        K2: column index of the first column in X( J, K+1 )
+*        so the K2 - K1 is the column count of the block X( J, K )
+         K1 = (K-1)*NBRHS + 1
+         K2 = MIN( K*NBRHS, NRHS ) + 1
+*
+*        Initialize local scaling factors of current block column X( J, K )
+*
+         DO KK = 1, K2 - K1
+            DO I = 1, NBA
+               WORK( I+KK*LDS ) = ONE
+            END DO
+         END DO
+*
+         IF( NOTRAN ) THEN
+*
+*           Solve A * X(:, K1:K2-1) = B * diag(scale(K1:K2-1))
+*
+            IF( UPPER ) THEN
+               JFIRST = NBA
+               JLAST = 1
+               JINC = -1
+            ELSE
+               JFIRST = 1
+               JLAST = NBA
+               JINC = 1
+            END IF
+         ELSE
+*
+*           Solve A**T * X(:, K1:K2-1) = B * diag(scale(K1:K2-1))
+*
+            IF( UPPER ) THEN
+               JFIRST = 1
+               JLAST = NBA
+               JINC = 1
+            ELSE
+               JFIRST = NBA
+               JLAST = 1
+               JINC = -1
+            END IF
+         END IF
+*
+         DO J = JFIRST, JLAST, JINC
+*           J1: row index of the first row in A( J, J )
+*           J2: row index of the first row in A( J+1, J+1 )
+*           so that J2 - J1 is the row count of the block A( J, J )
+            J1 = (J-1)*NB + 1
+            J2 = MIN( J*NB, N ) + 1
+*
+*           Solve op(A( J, J )) * X( J, RHS ) = SCALOC * B( J, RHS )
+*           for all right-hand sides in the current block column,
+*           one RHS at a time.
+*
+            DO KK = 1, K2-K1
+               RHS = K1 + KK - 1
+               IF( KK.EQ.1 ) THEN
+                  CALL SLATRS( UPLO, TRANS, DIAG, 'N', J2-J1,
+     $                         A( J1, J1 ), LDA, X( J1, RHS ),
+     $                         SCALOC, CNORM, INFO )
+               ELSE
+                  CALL SLATRS( UPLO, TRANS, DIAG, 'Y', J2-J1,
+     $                         A( J1, J1 ), LDA, X( J1, RHS ),
+     $                         SCALOC, CNORM, INFO )
+               END IF
+*              Find largest absolute value entry in the vector segment
+*              X( J1:J2-1, RHS ) as an upper bound for the worst case
+*              growth in the linear updates.
+               XNRM( KK ) = SLANGE( 'I', J2-J1, 1, X( J1, RHS ),
+     $                              LDX, W )
+*
+               IF( SCALOC .EQ. ZERO ) THEN
+*                 LATRS found that A is singular through A(j,j) = 0.
+*                 Reset the computation x(1:n) = 0, x(j) = 1, SCALE = 0
+*                 and compute A*x = 0 (or A**T*x = 0). Note that
+*                 X(J1:J2-1, KK) is set by LATRS.
+                  SCALE( RHS ) = ZERO
+                  DO II = 1, J1-1
+                     X( II, KK ) = ZERO
+                  END DO
+                  DO II = J2, N
+                     X( II, KK ) = ZERO
+                  END DO
+*                 Discard the local scale factors.
+                  DO II = 1, NBA
+                     WORK( II+KK*LDS ) = ONE
+                  END DO
+                  SCALOC = ONE
+               ELSE IF( SCALOC*WORK( J+KK*LDS ) .EQ. ZERO ) THEN
+*                 LATRS computed a valid scale factor, but combined with
+*                 the current scaling the solution does not have a
+*                 scale factor > 0.
+*
+*                 Set WORK( J+KK*LDS ) to smallest valid scale
+*                 factor and increase SCALOC accordingly.
+                  SCAL = WORK( J+KK*LDS ) / SMLNUM
+                  SCALOC = SCALOC * SCAL
+                  WORK( J+KK*LDS ) = SMLNUM
+*                 If LATRS overestimated the growth, x may be
+*                 rescaled to preserve a valid combined scale
+*                 factor WORK( J, KK ) > 0.
+                  RSCAL = ONE / SCALOC
+                  IF( XNRM( KK )*RSCAL .LE. BIGNUM ) THEN
+                     XNRM( KK ) = XNRM( KK ) * RSCAL
+                     CALL SSCAL( J2-J1, RSCAL, X( J1, RHS ), 1 )
+                     SCALOC = ONE
+                  ELSE
+*                    The system op(A) * x = b is badly scaled and its
+*                    solution cannot be represented as (1/scale) * x.
+*                    Set x to zero. This approach deviates from LATRS
+*                    where a completely meaningless non-zero vector
+*                    is returned that is not a solution to op(A) * x = b.
+                     SCALE( RHS ) = ZERO
+                     DO II = 1, N
+                        X( II, KK ) = ZERO
+                     END DO
+*                    Discard the local scale factors.
+                     DO II = 1, NBA
+                        WORK( II+KK*LDS ) = ONE
+                     END DO
+                     SCALOC = ONE
+                  END IF
+               END IF
+               SCALOC = SCALOC * WORK( J+KK*LDS )
+               WORK( J+KK*LDS ) = SCALOC
+            END DO
+*
+*           Linear block updates
+*
+            IF( NOTRAN ) THEN
+               IF( UPPER ) THEN
+                  IFIRST = J - 1
+                  ILAST = 1
+                  IINC = -1
+               ELSE
+                  IFIRST = J + 1
+                  ILAST = NBA
+                  IINC = 1
+               END IF
+            ELSE
+               IF( UPPER ) THEN
+                  IFIRST = J + 1
+                  ILAST = NBA
+                  IINC = 1
+               ELSE
+                  IFIRST = J - 1
+                  ILAST = 1
+                  IINC = -1
+               END IF
+            END IF
+*
+            DO I = IFIRST, ILAST, IINC
+*              I1: row index of the first column in X( I, K )
+*              I2: row index of the first column in X( I+1, K )
+*              so the I2 - I1 is the row count of the block X( I, K )
+               I1 = (I-1)*NB + 1
+               I2 = MIN( I*NB, N ) + 1
+*
+*              Prepare the linear update to be executed with GEMM.
+*              For each column, compute a consistent scaling, a
+*              scaling factor to survive the linear update, and
+*              rescale the column segments, if necessary. Then
+*              the linear update is safely executed.
+*
+               DO KK = 1, K2-K1
+                  RHS = K1 + KK - 1
+*                 Compute consistent scaling
+                  SCAMIN = MIN( WORK( I+KK*LDS), WORK( J+KK*LDS ) )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  BNRM = SLANGE( 'I', I2-I1, 1, X( I1, RHS ), LDX,
+     $                           W )
+                  BNRM = BNRM*( SCAMIN / WORK( I+KK*LDS ) )
+                  XNRM( KK ) = XNRM( KK )*(SCAMIN / WORK( J+KK*LDS ))
+                  ANRM = WORK( AWRK + I+(J-1)*NBA )
+                  SCALOC = SLARMM( ANRM, XNRM( KK ), BNRM )
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to B( I, KK ) and B( J, KK ).
+*
+                  SCAL = ( SCAMIN / WORK( I+KK*LDS) )*SCALOC
+                  IF( SCAL.NE.ONE ) THEN
+                     CALL SSCAL( I2-I1, SCAL, X( I1, RHS ), 1 )
+                     WORK( I+KK*LDS ) = SCAMIN*SCALOC
+                  END IF
+*
+                  SCAL = ( SCAMIN / WORK( J+KK*LDS ) )*SCALOC
+                  IF( SCAL.NE.ONE ) THEN
+                     CALL SSCAL( J2-J1, SCAL, X( J1, RHS ), 1 )
+                     WORK( J+KK*LDS ) = SCAMIN*SCALOC
+                  END IF
+               END DO
+*
+               IF( NOTRAN ) THEN
+*
+*                 B( I, K ) := B( I, K ) - A( I, J ) * X( J, K )
+*
+                  CALL SGEMM( 'N', 'N', I2-I1, K2-K1, J2-J1, -ONE,
+     $                        A( I1, J1 ), LDA, X( J1, K1 ), LDX,
+     $                        ONE, X( I1, K1 ), LDX )
+               ELSE
+*
+*                 B( I, K ) := B( I, K ) - A( I, J )**T * X( J, K )
+*
+                  CALL SGEMM( 'T', 'N', I2-I1, K2-K1, J2-J1, -ONE,
+     $                        A( J1, I1 ), LDA, X( J1, K1 ), LDX,
+     $                        ONE, X( I1, K1 ), LDX )
+               END IF
+            END DO
+         END DO
+*
+*        Reduce local scaling factors
+*
+         DO KK = 1, K2-K1
+            RHS = K1 + KK - 1
+            DO I = 1, NBA
+               SCALE( RHS ) = MIN( SCALE( RHS ), WORK( I+KK*LDS ) )
+            END DO
+         END DO
+*
+*        Realize consistent scaling
+*
+         DO KK = 1, K2-K1
+            RHS = K1 + KK - 1
+            IF( SCALE( RHS ).NE.ONE .AND. SCALE( RHS ).NE. ZERO ) THEN
+               DO I = 1, NBA
+                  I1 = (I-1)*NB + 1
+                  I2 = MIN( I*NB, N ) + 1
+                  SCAL = SCALE( RHS ) / WORK( I+KK*LDS )
+                  IF( SCAL.NE.ONE )
+     $               CALL SSCAL( I2-I1, SCAL, X( I1, RHS ), 1 )
+               END DO
+            END IF
+         END DO
+      END DO
+      RETURN
+*
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
+*
+*     End of SLATRS3
+*
+      END
diff --git a/SRC/slatrz.f b/SRC/slatrz.f
index 6f5fe08912..35035346ad 100644
--- a/SRC/slatrz.f
+++ b/SRC/slatrz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLATRZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slatrz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slatrz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,7 +95,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup latrz
 *
 *> \par Contributors:
 *  ==================
@@ -137,6 +135,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SLATRZ( M, N, L, A, LDA, TAU, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/slatsqr.f b/SRC/slatsqr.f
index 161ab33258..daeaf61b84 100644
--- a/SRC/slatsqr.f
+++ b/SRC/slatsqr.f
@@ -101,14 +101,18 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) REAL array, dimension (MAX(1,LWORK))
+*>          (workspace) REAL array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
-*>          The dimension of the array WORK.  LWORK >= NB*N.
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= NB*N, otherwise.
+*>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
+*>          only calculates the minimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
@@ -160,33 +164,40 @@
 *>     SIAM J. Sci. Comput, vol. 34, no. 1, 2012
 *> \endverbatim
 *>
+*> \ingroup latsqr
+*>
 *  =====================================================================
       SUBROUTINE SLATSQR( M, N, MB, NB, A, LDA, T, LDT, WORK,
-     $                    LWORK, INFO)
+     $                    LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd. --
 *
 *     .. Scalar Arguments ..
-      INTEGER           INFO, LDA, M, N, MB, NB, LDT, LWORK
+      INTEGER            INFO, LDA, M, N, MB, NB, LDT, LWORK
 *     ..
 *     .. Array Arguments ..
-      REAL  A( LDA, * ), WORK( * ), T(LDT, *)
+      REAL               A( LDA, * ), WORK( * ), T( LDT, * )
 *     ..
 *
 *  =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
-      LOGICAL    LQUERY
-      INTEGER    I, II, KK, CTR
+      LOGICAL            LQUERY
+      INTEGER            I, II, KK, CTR, MINMN, LWMIN
 *     ..
 *     .. EXTERNAL FUNCTIONS ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
+*     ..
 *     .. EXTERNAL SUBROUTINES ..
       EXTERNAL           SGEQRT, STPQRT, XERBLA
+*     ..
 *     .. INTRINSIC FUNCTIONS ..
       INTRINSIC          MAX, MIN, MOD
 *     ..
@@ -197,71 +208,79 @@ SUBROUTINE SLATSQR( M, N, MB, NB, A, LDA, T, LDT, WORK,
       INFO = 0
 *
       LQUERY = ( LWORK.EQ.-1 )
+*
+      MINMN = MIN( M, N )
+      IF( MINMN.EQ.0 ) THEN
+        LWMIN = 1
+      ELSE
+        LWMIN = N*NB
+      END IF
 *
       IF( M.LT.0 ) THEN
         INFO = -1
       ELSE IF( N.LT.0 .OR. M.LT.N ) THEN
         INFO = -2
-      ELSE IF( MB.LE.N ) THEN
+      ELSE IF( MB.LT.1 ) THEN
         INFO = -3
-      ELSE IF( NB.LT.1 .OR. ( NB.GT.N .AND. N.GT.0 )) THEN
+      ELSE IF( NB.LT.1 .OR. ( NB.GT.N .AND. N.GT.0 ) ) THEN
         INFO = -4
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-        INFO = -5
+        INFO = -6
       ELSE IF( LDT.LT.NB ) THEN
         INFO = -8
-      ELSE IF( LWORK.LT.(N*NB) .AND. (.NOT.LQUERY) ) THEN
+      ELSE IF( LWORK.LT.LWMIN .AND. (.NOT.LQUERY) ) THEN
         INFO = -10
       END IF
-      IF( INFO.EQ.0)  THEN
-        WORK(1) = NB*N
+*
+      IF( INFO.EQ.0 )  THEN
+        WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       END IF
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'SLATSQR', -INFO )
         RETURN
-      ELSE IF (LQUERY) THEN
-       RETURN
+      ELSE IF( LQUERY ) THEN
+        RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( MIN(M,N).EQ.0 ) THEN
-          RETURN
+      IF( MINMN.EQ.0 ) THEN
+        RETURN
       END IF
 *
 *     The QR Decomposition
 *
-       IF ((MB.LE.N).OR.(MB.GE.M)) THEN
-         CALL SGEQRT( M, N, NB, A, LDA, T, LDT, WORK, INFO)
-         RETURN
-       END IF
-       KK = MOD((M-N),(MB-N))
-       II=M-KK+1
+      IF( (MB.LE.N) .OR. (MB.GE.M) ) THEN
+        CALL SGEQRT( M, N, NB, A, LDA, T, LDT, WORK, INFO )
+        RETURN
+      END IF
+      KK = MOD((M-N),(MB-N))
+      II = M-KK+1
 *
-*      Compute the QR factorization of the first block A(1:MB,1:N)
+*     Compute the QR factorization of the first block A(1:MB,1:N)
 *
-       CALL SGEQRT( MB, N, NB, A(1,1), LDA, T, LDT, WORK, INFO )
+      CALL SGEQRT( MB, N, NB, A(1,1), LDA, T, LDT, WORK, INFO )
 *
-       CTR = 1
-       DO I = MB+1, II-MB+N ,  (MB-N)
+      CTR = 1
+      DO I = MB+1, II-MB+N, (MB-N)
 *
-*      Compute the QR factorization of the current block A(I:I+MB-N,1:N)
+*       Compute the QR factorization of the current block A(I:I+MB-N,1:N)
 *
-         CALL STPQRT( MB-N, N, 0, NB, A(1,1), LDA, A( I, 1 ), LDA,
-     $                 T(1, CTR * N + 1),
-     $                  LDT, WORK, INFO )
-         CTR = CTR + 1
-       END DO
+        CALL STPQRT( MB-N, N, 0, NB, A(1,1), LDA, A( I, 1 ), LDA,
+     $                T(1, CTR * N + 1),
+     $                LDT, WORK, INFO )
+        CTR = CTR + 1
+      END DO
 *
-*      Compute the QR factorization of the last block A(II:M,1:N)
+*     Compute the QR factorization of the last block A(II:M,1:N)
 *
-       IF (II.LE.M) THEN
-         CALL STPQRT( KK, N, 0, NB, A(1,1), LDA, A( II, 1 ), LDA,
-     $                 T(1, CTR * N + 1), LDT,
-     $                  WORK, INFO )
-       END IF
+      IF( II.LE.M ) THEN
+        CALL STPQRT( KK, N, 0, NB, A(1,1), LDA, A( II, 1 ), LDA,
+     $                T(1, CTR * N + 1), LDT,
+     $                WORK, INFO )
+      END IF
 *
-      work( 1 ) = N*NB
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       RETURN
 *
 *     End of SLATSQR
diff --git a/SRC/slauu2.f b/SRC/slauu2.f
index efe5e47efb..b328a2f5b2 100644
--- a/SRC/slauu2.f
+++ b/SRC/slauu2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAUU2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slauu2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slauu2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,10 +93,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lauu2
 *
 *  =====================================================================
       SUBROUTINE SLAUU2( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -164,8 +163,10 @@ SUBROUTINE SLAUU2( UPLO, N, A, LDA, INFO )
          DO 10 I = 1, N
             AII = A( I, I )
             IF( I.LT.N ) THEN
-               A( I, I ) = SDOT( N-I+1, A( I, I ), LDA, A( I, I ), LDA )
-               CALL SGEMV( 'No transpose', I-1, N-I, ONE, A( 1, I+1 ),
+               A( I, I ) = SDOT( N-I+1, A( I, I ), LDA, A( I, I ),
+     $            LDA )
+               CALL SGEMV( 'No transpose', I-1, N-I, ONE, A( 1,
+     $                     I+1 ),
      $                     LDA, A( I, I+1 ), LDA, AII, A( 1, I ), 1 )
             ELSE
                CALL SSCAL( I, AII, A( 1, I ), 1 )
@@ -180,7 +181,8 @@ SUBROUTINE SLAUU2( UPLO, N, A, LDA, INFO )
             AII = A( I, I )
             IF( I.LT.N ) THEN
                A( I, I ) = SDOT( N-I+1, A( I, I ), 1, A( I, I ), 1 )
-               CALL SGEMV( 'Transpose', N-I, I-1, ONE, A( I+1, 1 ), LDA,
+               CALL SGEMV( 'Transpose', N-I, I-1, ONE, A( I+1, 1 ),
+     $                     LDA,
      $                     A( I+1, I ), 1, AII, A( I, 1 ), LDA )
             ELSE
                CALL SSCAL( I, AII, A( I, 1 ), LDA )
diff --git a/SRC/slauum.f b/SRC/slauum.f
index a7b69432df..f4e1d9df6d 100644
--- a/SRC/slauum.f
+++ b/SRC/slauum.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SLAUUM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/slauum.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/slauum.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,10 +93,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup lauum
 *
 *  =====================================================================
       SUBROUTINE SLAUUM( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -194,14 +193,16 @@ SUBROUTINE SLAUUM( UPLO, N, A, LDA, INFO )
 *
             DO 20 I = 1, N, NB
                IB = MIN( NB, N-I+1 )
-               CALL STRMM( 'Left', 'Lower', 'Transpose', 'Non-unit', IB,
+               CALL STRMM( 'Left', 'Lower', 'Transpose', 'Non-unit',
+     $                     IB,
      $                     I-1, ONE, A( I, I ), LDA, A( I, 1 ), LDA )
                CALL SLAUU2( 'Lower', IB, A( I, I ), LDA, INFO )
                IF( I+IB.LE.N ) THEN
                   CALL SGEMM( 'Transpose', 'No transpose', IB, I-1,
      $                        N-I-IB+1, ONE, A( I+IB, I ), LDA,
      $                        A( I+IB, 1 ), LDA, ONE, A( I, 1 ), LDA )
-                  CALL SSYRK( 'Lower', 'Transpose', IB, N-I-IB+1, ONE,
+                  CALL SSYRK( 'Lower', 'Transpose', IB, N-I-IB+1,
+     $                        ONE,
      $                        A( I+IB, I ), LDA, ONE, A( I, I ), LDA )
                END IF
    20       CONTINUE
diff --git a/SRC/sopgtr.f b/SRC/sopgtr.f
index 1ab657acce..7674b231f4 100644
--- a/SRC/sopgtr.f
+++ b/SRC/sopgtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SOPGTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sopgtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sopgtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup upgtr
 *
 *  =====================================================================
       SUBROUTINE SOPGTR( UPLO, N, AP, TAU, Q, LDQ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sopmtr.f b/SRC/sopmtr.f
index c1148e01f4..19e9f6af3a 100644
--- a/SRC/sopmtr.f
+++ b/SRC/sopmtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SOPMTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sopmtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sopmtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -142,11 +140,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup upmtr
 *
 *  =====================================================================
-      SUBROUTINE SOPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC, WORK,
+      SUBROUTINE SOPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC,
+     $                   WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -162,21 +162,16 @@ SUBROUTINE SOPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC, WORK,
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      REAL               ONE
-      PARAMETER          ( ONE = 1.0E+0 )
-*     ..
 *     .. Local Scalars ..
       LOGICAL            FORWRD, LEFT, NOTRAN, UPPER
       INTEGER            I, I1, I2, I3, IC, II, JC, MI, NI, NQ
-      REAL               AII
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, XERBLA
+      EXTERNAL           SLARF1F, SLARF1L, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -260,11 +255,8 @@ SUBROUTINE SOPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC, WORK,
 *
 *           Apply H(i)
 *
-            AII = AP( II )
-            AP( II ) = ONE
-            CALL SLARF( SIDE, MI, NI, AP( II-I+1 ), 1, TAU( I ), C, LDC,
-     $                  WORK )
-            AP( II ) = AII
+            CALL SLARF1L( SIDE, MI, NI, AP( II-I+1 ), 1, TAU( I ), C,
+     $                    LDC, WORK )
 *
             IF( FORWRD ) THEN
                II = II + I + 2
@@ -300,8 +292,6 @@ SUBROUTINE SOPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC, WORK,
          END IF
 *
          DO 20 I = I1, I2, I3
-            AII = AP( II )
-            AP( II ) = ONE
             IF( LEFT ) THEN
 *
 *              H(i) is applied to C(i+1:m,1:n)
@@ -318,9 +308,8 @@ SUBROUTINE SOPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC, WORK,
 *
 *           Apply H(i)
 *
-            CALL SLARF( SIDE, MI, NI, AP( II ), 1, TAU( I ),
-     $                  C( IC, JC ), LDC, WORK )
-            AP( II ) = AII
+            CALL SLARF1F( SIDE, MI, NI, AP( II ), 1, TAU( I ),
+     $                    C( IC, JC ), LDC, WORK )
 *
             IF( FORWRD ) THEN
                II = II + NQ - I + 1
diff --git a/SRC/sorbdb.f b/SRC/sorbdb.f
index 351172ff16..17aba5db49 100644
--- a/SRC/sorbdb.f
+++ b/SRC/sorbdb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORBDB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorbdb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorbdb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -255,7 +253,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unbdb
 *
 *> \par Further Details:
 *  =====================
@@ -281,9 +279,11 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
+      SUBROUTINE SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12,
+     $                   LDX12,
      $                   X21, LDX21, X22, LDX22, THETA, PHI, TAUP1,
      $                   TAUP2, TAUQ1, TAUQ2, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -306,8 +306,6 @@ SUBROUTINE SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
 *     .. Parameters ..
       REAL               REALONE
       PARAMETER          ( REALONE = 1.0E0 )
-      REAL               ONE
-      PARAMETER          ( ONE = 1.0E0 )
 *     ..
 *     .. Local Scalars ..
       LOGICAL            COLMAJOR, LQUERY
@@ -315,7 +313,8 @@ SUBROUTINE SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
       REAL               Z1, Z2, Z3, Z4
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SLARF, SLARFGP, SSCAL, XERBLA
+      EXTERNAL           SAXPY, SLARF1F, SLARFGP, SSCAL,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       REAL               SNRM2
@@ -374,7 +373,7 @@ SUBROUTINE SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
       IF( INFO .EQ. 0 ) THEN
          LWORKOPT = M - Q
          LWORKMIN = M - Q
-         WORK(1) = LWORKOPT
+         WORK(1) = REAL( LWORKOPT )
          IF( LWORK .LT. LWORKMIN .AND. .NOT. LQUERY ) THEN
             INFO = -21
          END IF
@@ -398,14 +397,16 @@ SUBROUTINE SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL SSCAL( P-I+1, Z1, X11(I,I), 1 )
             ELSE
                CALL SSCAL( P-I+1, Z1*COS(PHI(I-1)), X11(I,I), 1 )
-               CALL SAXPY( P-I+1, -Z1*Z3*Z4*SIN(PHI(I-1)), X12(I,I-1),
+               CALL SAXPY( P-I+1, -Z1*Z3*Z4*SIN(PHI(I-1)), X12(I,
+     $                     I-1),
      $                     1, X11(I,I), 1 )
             END IF
             IF( I .EQ. 1 ) THEN
                CALL SSCAL( M-P-I+1, Z2, X21(I,I), 1 )
             ELSE
                CALL SSCAL( M-P-I+1, Z2*COS(PHI(I-1)), X21(I,I), 1 )
-               CALL SAXPY( M-P-I+1, -Z2*Z3*Z4*SIN(PHI(I-1)), X22(I,I-1),
+               CALL SAXPY( M-P-I+1, -Z2*Z3*Z4*SIN(PHI(I-1)), X22(I,
+     $                     I-1),
      $                     1, X21(I,I), 1 )
             END IF
 *
@@ -413,44 +414,47 @@ SUBROUTINE SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
      $                 SNRM2( P-I+1, X11(I,I), 1 ) )
 *
             IF( P .GT. I ) THEN
-               CALL SLARFGP( P-I+1, X11(I,I), X11(I+1,I), 1, TAUP1(I) )
+               CALL SLARFGP( P-I+1, X11(I,I), X11(I+1,I), 1,
+     $                       TAUP1(I) )
             ELSE IF( P .EQ. I ) THEN
                CALL SLARFGP( P-I+1, X11(I,I), X11(I,I), 1, TAUP1(I) )
             END IF
-            X11(I,I) = ONE
             IF ( M-P .GT. I ) THEN
                CALL SLARFGP( M-P-I+1, X21(I,I), X21(I+1,I), 1,
      $                       TAUP2(I) )
             ELSE IF ( M-P .EQ. I ) THEN
-               CALL SLARFGP( M-P-I+1, X21(I,I), X21(I,I), 1, TAUP2(I) )
+               CALL SLARFGP( M-P-I+1, X21(I,I), X21(I,I), 1,
+     $                       TAUP2(I) )
             END IF
-            X21(I,I) = ONE
 *
             IF ( Q .GT. I ) THEN
-               CALL SLARF( 'L', P-I+1, Q-I, X11(I,I), 1, TAUP1(I),
-     $                     X11(I,I+1), LDX11, WORK )
+               CALL SLARF1F( 'L', P-I+1, Q-I, X11(I,I), 1, TAUP1(I),
+     $                       X11(I,I+1), LDX11, WORK )
             END IF
             IF ( M-Q+1 .GT. I ) THEN
-               CALL SLARF( 'L', P-I+1, M-Q-I+1, X11(I,I), 1, TAUP1(I),
-     $                     X12(I,I), LDX12, WORK )
+               CALL SLARF1F( 'L', P-I+1, M-Q-I+1, X11(I,I), 1,
+     $                       TAUP1(I), X12(I,I), LDX12, WORK )
             END IF
             IF ( Q .GT. I ) THEN
-               CALL SLARF( 'L', M-P-I+1, Q-I, X21(I,I), 1, TAUP2(I),
-     $                     X21(I,I+1), LDX21, WORK )
+               CALL SLARF1F( 'L', M-P-I+1, Q-I, X21(I,I), 1,
+     $                       TAUP2(I), X21(I,I+1), LDX21, WORK )
             END IF
             IF ( M-Q+1 .GT. I ) THEN
-               CALL SLARF( 'L', M-P-I+1, M-Q-I+1, X21(I,I), 1, TAUP2(I),
-     $                     X22(I,I), LDX22, WORK )
+               CALL SLARF1F( 'L', M-P-I+1, M-Q-I+1, X21(I,I), 1,
+     $                       TAUP2(I), X22(I,I), LDX22, WORK )
             END IF
 *
             IF( I .LT. Q ) THEN
                CALL SSCAL( Q-I, -Z1*Z3*SIN(THETA(I)), X11(I,I+1),
      $                     LDX11 )
-               CALL SAXPY( Q-I, Z2*Z3*COS(THETA(I)), X21(I,I+1), LDX21,
+               CALL SAXPY( Q-I, Z2*Z3*COS(THETA(I)), X21(I,I+1),
+     $                     LDX21,
      $                     X11(I,I+1), LDX11 )
             END IF
-            CALL SSCAL( M-Q-I+1, -Z1*Z4*SIN(THETA(I)), X12(I,I), LDX12 )
-            CALL SAXPY( M-Q-I+1, Z2*Z4*COS(THETA(I)), X22(I,I), LDX22,
+            CALL SSCAL( M-Q-I+1, -Z1*Z4*SIN(THETA(I)), X12(I,I),
+     $                  LDX12 )
+            CALL SAXPY( M-Q-I+1, Z2*Z4*COS(THETA(I)), X22(I,I),
+     $                  LDX22,
      $                  X12(I,I), LDX12 )
 *
             IF( I .LT. Q )
@@ -465,7 +469,6 @@ SUBROUTINE SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                   CALL SLARFGP( Q-I, X11(I,I+1), X11(I,I+2), LDX11,
      $                          TAUQ1(I) )
                END IF
-               X11(I,I+1) = ONE
             END IF
             IF ( Q+I-1 .LT. M ) THEN
                IF ( M-Q .EQ. I ) THEN
@@ -476,21 +479,20 @@ SUBROUTINE SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
      $                          TAUQ2(I) )
                END IF
             END IF
-            X12(I,I) = ONE
 *
             IF( I .LT. Q ) THEN
-               CALL SLARF( 'R', P-I, Q-I, X11(I,I+1), LDX11, TAUQ1(I),
-     $                     X11(I+1,I+1), LDX11, WORK )
-               CALL SLARF( 'R', M-P-I, Q-I, X11(I,I+1), LDX11, TAUQ1(I),
-     $                     X21(I+1,I+1), LDX21, WORK )
+               CALL SLARF1F( 'R', P-I, Q-I, X11(I,I+1), LDX11,
+     $                       TAUQ1(I), X11(I+1,I+1), LDX11, WORK )
+               CALL SLARF1F( 'R', M-P-I, Q-I, X11(I,I+1), LDX11,
+     $                       TAUQ1(I), X21(I+1,I+1), LDX21, WORK )
             END IF
             IF ( P .GT. I ) THEN
-               CALL SLARF( 'R', P-I, M-Q-I+1, X12(I,I), LDX12, TAUQ2(I),
-     $                     X12(I+1,I), LDX12, WORK )
+               CALL SLARF1F( 'R', P-I, M-Q-I+1, X12(I,I), LDX12,
+     $                       TAUQ2(I), X12(I+1,I), LDX12, WORK )
             END IF
             IF ( M-P .GT. I ) THEN
-               CALL SLARF( 'R', M-P-I, M-Q-I+1, X12(I,I), LDX12,
-     $                     TAUQ2(I), X22(I+1,I), LDX22, WORK )
+               CALL SLARF1F( 'R', M-P-I, M-Q-I+1, X12(I,I), LDX12,
+     $                       TAUQ2(I), X22(I+1,I), LDX22, WORK )
             END IF
 *
          END DO
@@ -507,15 +509,14 @@ SUBROUTINE SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL SLARFGP( M-Q-I+1, X12(I,I), X12(I,I+1), LDX12,
      $                       TAUQ2(I) )
             END IF
-            X12(I,I) = ONE
 *
             IF ( P .GT. I ) THEN
-               CALL SLARF( 'R', P-I, M-Q-I+1, X12(I,I), LDX12, TAUQ2(I),
-     $                     X12(I+1,I), LDX12, WORK )
+               CALL SLARF1F( 'R', P-I, M-Q-I+1, X12(I,I), LDX12,
+     $                       TAUQ2(I), X12(I+1,I), LDX12, WORK )
             END IF
             IF( M-P-Q .GE. 1 )
-     $         CALL SLARF( 'R', M-P-Q, M-Q-I+1, X12(I,I), LDX12,
-     $                     TAUQ2(I), X22(Q+1,I), LDX22, WORK )
+     $         CALL SLARF1F( 'R', M-P-Q, M-Q-I+1, X12(I,I), LDX12,
+     $                       TAUQ2(I), X22(Q+1,I), LDX22, WORK )
 *
          END DO
 *
@@ -531,10 +532,10 @@ SUBROUTINE SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL SLARFGP( M-P-Q-I+1, X22(Q+I,P+I), X22(Q+I,P+I+1),
      $                       LDX22, TAUQ2(P+I) )
             END IF
-            X22(Q+I,P+I) = ONE
             IF ( I .LT. M-P-Q ) THEN
-               CALL SLARF( 'R', M-P-Q-I, M-P-Q-I+1, X22(Q+I,P+I), LDX22,
-     $                     TAUQ2(P+I), X22(Q+I+1,P+I), LDX22, WORK )
+               CALL SLARF1F( 'R', M-P-Q-I, M-P-Q-I+1, X22(Q+I,P+I),
+     $                       LDX22, TAUQ2(P+I), X22(Q+I+1,P+I),
+     $                       LDX22, WORK )
             END IF
 *
          END DO
@@ -549,22 +550,25 @@ SUBROUTINE SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL SSCAL( P-I+1, Z1, X11(I,I), LDX11 )
             ELSE
                CALL SSCAL( P-I+1, Z1*COS(PHI(I-1)), X11(I,I), LDX11 )
-               CALL SAXPY( P-I+1, -Z1*Z3*Z4*SIN(PHI(I-1)), X12(I-1,I),
+               CALL SAXPY( P-I+1, -Z1*Z3*Z4*SIN(PHI(I-1)), X12(I-1,
+     $                     I),
      $                     LDX12, X11(I,I), LDX11 )
             END IF
             IF( I .EQ. 1 ) THEN
                CALL SSCAL( M-P-I+1, Z2, X21(I,I), LDX21 )
             ELSE
-               CALL SSCAL( M-P-I+1, Z2*COS(PHI(I-1)), X21(I,I), LDX21 )
-               CALL SAXPY( M-P-I+1, -Z2*Z3*Z4*SIN(PHI(I-1)), X22(I-1,I),
+               CALL SSCAL( M-P-I+1, Z2*COS(PHI(I-1)), X21(I,I),
+     $                     LDX21 )
+               CALL SAXPY( M-P-I+1, -Z2*Z3*Z4*SIN(PHI(I-1)), X22(I-1,
+     $                     I),
      $                     LDX22, X21(I,I), LDX21 )
             END IF
 *
             THETA(I) = ATAN2( SNRM2( M-P-I+1, X21(I,I), LDX21 ),
      $                 SNRM2( P-I+1, X11(I,I), LDX11 ) )
 *
-            CALL SLARFGP( P-I+1, X11(I,I), X11(I,I+1), LDX11, TAUP1(I) )
-            X11(I,I) = ONE
+            CALL SLARFGP( P-I+1, X11(I,I), X11(I,I+1), LDX11,
+     $                    TAUP1(I) )
             IF ( I .EQ. M-P ) THEN
                CALL SLARFGP( M-P-I+1, X21(I,I), X21(I,I), LDX21,
      $                       TAUP2(I) )
@@ -572,23 +576,22 @@ SUBROUTINE SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL SLARFGP( M-P-I+1, X21(I,I), X21(I,I+1), LDX21,
      $                       TAUP2(I) )
             END IF
-            X21(I,I) = ONE
 *
             IF ( Q .GT. I ) THEN
-               CALL SLARF( 'R', Q-I, P-I+1, X11(I,I), LDX11, TAUP1(I),
-     $                     X11(I+1,I), LDX11, WORK )
+               CALL SLARF1F( 'R', Q-I, P-I+1, X11(I,I), LDX11,
+     $                       TAUP1(I), X11(I+1,I), LDX11, WORK )
             END IF
             IF ( M-Q+1 .GT. I ) THEN
-               CALL SLARF( 'R', M-Q-I+1, P-I+1, X11(I,I), LDX11,
-     $                     TAUP1(I), X12(I,I), LDX12, WORK )
+               CALL SLARF1F( 'R', M-Q-I+1, P-I+1, X11(I,I), LDX11,
+     $                       TAUP1(I), X12(I,I), LDX12, WORK )
             END IF
             IF ( Q .GT. I ) THEN
-               CALL SLARF( 'R', Q-I, M-P-I+1, X21(I,I), LDX21, TAUP2(I),
-     $                     X21(I+1,I), LDX21, WORK )
+               CALL SLARF1F( 'R', Q-I, M-P-I+1, X21(I,I), LDX21,
+     $                       TAUP2(I), X21(I+1,I), LDX21, WORK )
             END IF
             IF ( M-Q+1 .GT. I ) THEN
-               CALL SLARF( 'R', M-Q-I+1, M-P-I+1, X21(I,I), LDX21,
-     $                     TAUP2(I), X22(I,I), LDX22, WORK )
+               CALL SLARF1F( 'R', M-Q-I+1, M-P-I+1, X21(I,I), LDX21,
+     $                       TAUP2(I), X22(I,I), LDX22, WORK )
             END IF
 *
             IF( I .LT. Q ) THEN
@@ -612,7 +615,6 @@ SUBROUTINE SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                   CALL SLARFGP( Q-I, X11(I+1,I), X11(I+2,I), 1,
      $                          TAUQ1(I) )
                END IF
-               X11(I+1,I) = ONE
             END IF
             IF ( M-Q .GT. I ) THEN
                CALL SLARFGP( M-Q-I+1, X12(I,I), X12(I+1,I), 1,
@@ -621,19 +623,18 @@ SUBROUTINE SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL SLARFGP( M-Q-I+1, X12(I,I), X12(I,I), 1,
      $                       TAUQ2(I) )
             END IF
-            X12(I,I) = ONE
 *
             IF( I .LT. Q ) THEN
-               CALL SLARF( 'L', Q-I, P-I, X11(I+1,I), 1, TAUQ1(I),
-     $                     X11(I+1,I+1), LDX11, WORK )
-               CALL SLARF( 'L', Q-I, M-P-I, X11(I+1,I), 1, TAUQ1(I),
-     $                     X21(I+1,I+1), LDX21, WORK )
+               CALL SLARF1F( 'L', Q-I, P-I, X11(I+1,I), 1, TAUQ1(I),
+     $                       X11(I+1,I+1), LDX11, WORK )
+               CALL SLARF1F( 'L', Q-I, M-P-I, X11(I+1,I), 1,
+     $                       TAUQ1(I), X21(I+1,I+1), LDX21, WORK )
             END IF
-            CALL SLARF( 'L', M-Q-I+1, P-I, X12(I,I), 1, TAUQ2(I),
-     $                  X12(I,I+1), LDX12, WORK )
+            CALL SLARF1F( 'L', M-Q-I+1, P-I, X12(I,I), 1, TAUQ2(I),
+     $                    X12(I,I+1), LDX12, WORK )
             IF ( M-P-I .GT. 0 ) THEN
-               CALL SLARF( 'L', M-Q-I+1, M-P-I, X12(I,I), 1, TAUQ2(I),
-     $                     X22(I,I+1), LDX22, WORK )
+               CALL SLARF1F( 'L', M-Q-I+1, M-P-I, X12(I,I), 1,
+     $                       TAUQ2(I), X22(I,I+1), LDX22, WORK )
             END IF
 *
          END DO
@@ -643,16 +644,16 @@ SUBROUTINE SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
          DO I = Q + 1, P
 *
             CALL SSCAL( M-Q-I+1, -Z1*Z4, X12(I,I), 1 )
-            CALL SLARFGP( M-Q-I+1, X12(I,I), X12(I+1,I), 1, TAUQ2(I) )
-            X12(I,I) = ONE
+            CALL SLARFGP( M-Q-I+1, X12(I,I), X12(I+1,I), 1,
+     $                    TAUQ2(I) )
 *
             IF ( P .GT. I ) THEN
-               CALL SLARF( 'L', M-Q-I+1, P-I, X12(I,I), 1, TAUQ2(I),
-     $                     X12(I,I+1), LDX12, WORK )
+               CALL SLARF1F( 'L', M-Q-I+1, P-I, X12(I,I), 1,
+     $                       TAUQ2(I), X12(I,I+1), LDX12, WORK )
             END IF
             IF( M-P-Q .GE. 1 )
-     $         CALL SLARF( 'L', M-Q-I+1, M-P-Q, X12(I,I), 1, TAUQ2(I),
-     $                     X22(I,Q+1), LDX22, WORK )
+     $         CALL SLARF1F( 'L', M-Q-I+1, M-P-Q, X12(I,I), 1,
+     $                       TAUQ2(I), X22(I,Q+1), LDX22, WORK )
 *
          END DO
 *
@@ -662,15 +663,16 @@ SUBROUTINE SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
 *
             CALL SSCAL( M-P-Q-I+1, Z2*Z4, X22(P+I,Q+I), 1 )
             IF ( M-P-Q .EQ. I ) THEN
-               CALL SLARFGP( M-P-Q-I+1, X22(P+I,Q+I), X22(P+I,Q+I), 1,
+               CALL SLARFGP( M-P-Q-I+1, X22(P+I,Q+I), X22(P+I,Q+I),
+     $                       1,
      $                       TAUQ2(P+I) )
-               X22(P+I,Q+I) = ONE
             ELSE
-               CALL SLARFGP( M-P-Q-I+1, X22(P+I,Q+I), X22(P+I+1,Q+I), 1,
+               CALL SLARFGP( M-P-Q-I+1, X22(P+I,Q+I), X22(P+I+1,Q+I),
+     $                       1,
      $                       TAUQ2(P+I) )
-               X22(P+I,Q+I) = ONE
-               CALL SLARF( 'L', M-P-Q-I+1, M-P-Q-I, X22(P+I,Q+I), 1,
-     $                     TAUQ2(P+I), X22(P+I,Q+I+1), LDX22, WORK )
+               CALL SLARF1F( 'L', M-P-Q-I+1, M-P-Q-I, X22(P+I,Q+I),
+     $                       1, TAUQ2(P+I), X22(P+I,Q+I+1), LDX22,
+     $                       WORK )
             END IF
 *
 *
diff --git a/SRC/sorbdb1.f b/SRC/sorbdb1.f
index c860f43665..52fb3c7b58 100644
--- a/SRC/sorbdb1.f
+++ b/SRC/sorbdb1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORBDB1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorbdb1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorbdb1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,7 @@
 *>\verbatim
 *>
 *> SORBDB1 simultaneously bidiagonalizes the blocks of a tall and skinny
-*> matrix X with orthonomal columns:
+*> matrix X with orthonormal columns:
 *>
 *>                            [ B11 ]
 *>      [ X11 ]   [ P1 |    ] [  0  ]
@@ -174,7 +172,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unbdb1
 *
 *> \par Further Details:
 *  =====================
@@ -198,8 +196,10 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE SORBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
+      SUBROUTINE SORBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    PHI,
      $                    TAUP1, TAUP2, TAUQ1, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -216,10 +216,6 @@ SUBROUTINE SORBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *
 *  ====================================================================
 *
-*     .. Parameters ..
-      REAL               ONE
-      PARAMETER          ( ONE = 1.0E0 )
-*     ..
 *     .. Local Scalars ..
       REAL               C, S
       INTEGER            CHILDINFO, I, ILARF, IORBDB5, LLARF, LORBDB5,
@@ -227,7 +223,8 @@ SUBROUTINE SORBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       LOGICAL            LQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, SLARFGP, SORBDB5, SROT, XERBLA
+      EXTERNAL           SLARF1F, SLARFGP, SORBDB5, SROT,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       REAL               SNRM2
@@ -264,7 +261,7 @@ SUBROUTINE SORBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
          LORBDB5 = Q-2
          LWORKOPT = MAX( ILARF+LLARF-1, IORBDB5+LORBDB5-1 )
          LWORKMIN = LWORKOPT
-         WORK(1) = LWORKOPT
+         WORK(1) = REAL( LWORKOPT )
          IF( LWORK .LT. LWORKMIN .AND. .NOT.LQUERY ) THEN
            INFO = -14
          END IF
@@ -285,22 +282,22 @@ SUBROUTINE SORBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
          THETA(I) = ATAN2( X21(I,I), X11(I,I) )
          C = COS( THETA(I) )
          S = SIN( THETA(I) )
-         X11(I,I) = ONE
-         X21(I,I) = ONE
-         CALL SLARF( 'L', P-I+1, Q-I, X11(I,I), 1, TAUP1(I), X11(I,I+1),
-     $               LDX11, WORK(ILARF) )
-         CALL SLARF( 'L', M-P-I+1, Q-I, X21(I,I), 1, TAUP2(I),
-     $               X21(I,I+1), LDX21, WORK(ILARF) )
+         CALL SLARF1F( 'L', P-I+1, Q-I, X11(I,I), 1, TAUP1(I), X11(I,
+     $                 I+1), LDX11, WORK(ILARF) )
+         CALL SLARF1F( 'L', M-P-I+1, Q-I, X21(I,I), 1, TAUP2(I),
+     $                 X21(I,I+1), LDX21, WORK(ILARF) )
 *
          IF( I .LT. Q ) THEN
-            CALL SROT( Q-I, X11(I,I+1), LDX11, X21(I,I+1), LDX21, C, S )
-            CALL SLARFGP( Q-I, X21(I,I+1), X21(I,I+2), LDX21, TAUQ1(I) )
+            CALL SROT( Q-I, X11(I,I+1), LDX11, X21(I,I+1), LDX21, C,
+     $                 S )
+            CALL SLARFGP( Q-I, X21(I,I+1), X21(I,I+2), LDX21,
+     $                    TAUQ1(I) )
             S = X21(I,I+1)
-            X21(I,I+1) = ONE
-            CALL SLARF( 'R', P-I, Q-I, X21(I,I+1), LDX21, TAUQ1(I),
-     $                  X11(I+1,I+1), LDX11, WORK(ILARF) )
-            CALL SLARF( 'R', M-P-I, Q-I, X21(I,I+1), LDX21, TAUQ1(I),
-     $                  X21(I+1,I+1), LDX21, WORK(ILARF) )
+            CALL SLARF1F( 'R', P-I, Q-I, X21(I,I+1), LDX21, TAUQ1(I),
+     $                    X11(I+1,I+1), LDX11, WORK(ILARF) )
+            CALL SLARF1F( 'R', M-P-I, Q-I, X21(I,I+1), LDX21,
+     $                    TAUQ1(I), X21(I+1,I+1), LDX21,
+     $                    WORK(ILARF) )
             C = SQRT( SNRM2( P-I, X11(I+1,I+1), 1 )**2
      $              + SNRM2( M-P-I, X21(I+1,I+1), 1 )**2 )
             PHI(I) = ATAN2( S, C )
diff --git a/SRC/sorbdb2.f b/SRC/sorbdb2.f
index ad3eb269dd..f4107d0d1f 100644
--- a/SRC/sorbdb2.f
+++ b/SRC/sorbdb2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORBDB2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorbdb2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorbdb2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,7 @@
 *>\verbatim
 *>
 *> SORBDB2 simultaneously bidiagonalizes the blocks of a tall and skinny
-*> matrix X with orthonomal columns:
+*> matrix X with orthonormal columns:
 *>
 *>                            [ B11 ]
 *>      [ X11 ]   [ P1 |    ] [  0  ]
@@ -122,14 +120,14 @@
 *>
 *> \param[out] TAUP1
 *> \verbatim
-*>          TAUP1 is REAL array, dimension (P)
+*>          TAUP1 is REAL array, dimension (P-1)
 *>           The scalar factors of the elementary reflectors that define
 *>           P1.
 *> \endverbatim
 *>
 *> \param[out] TAUP2
 *> \verbatim
-*>          TAUP2 is REAL array, dimension (M-P)
+*>          TAUP2 is REAL array, dimension (Q)
 *>           The scalar factors of the elementary reflectors that define
 *>           P2.
 *> \endverbatim
@@ -172,7 +170,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unbdb2
 *
 *> \par Further Details:
 *  =====================
@@ -196,8 +194,10 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE SORBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
+      SUBROUTINE SORBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    PHI,
      $                    TAUP1, TAUP2, TAUQ1, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -215,8 +215,8 @@ SUBROUTINE SORBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *  ====================================================================
 *
 *     .. Parameters ..
-      REAL               NEGONE, ONE
-      PARAMETER          ( NEGONE = -1.0E0, ONE = 1.0E0 )
+      REAL               NEGONE
+      PARAMETER          ( NEGONE = -1.0E0 )
 *     ..
 *     .. Local Scalars ..
       REAL               C, S
@@ -225,7 +225,8 @@ SUBROUTINE SORBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       LOGICAL            LQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, SLARFGP, SORBDB5, SROT, SSCAL, XERBLA
+      EXTERNAL           SLARF1F, SLARFGP, SORBDB5, SROT, SSCAL,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       REAL               SNRM2
@@ -262,7 +263,7 @@ SUBROUTINE SORBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
          LORBDB5 = Q-1
          LWORKOPT = MAX( ILARF+LLARF-1, IORBDB5+LORBDB5-1 )
          LWORKMIN = LWORKOPT
-         WORK(1) = LWORKOPT
+         WORK(1) = REAL( LWORKOPT )
          IF( LWORK .LT. LWORKMIN .AND. .NOT.LQUERY ) THEN
            INFO = -14
          END IF
@@ -279,15 +280,15 @@ SUBROUTINE SORBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       DO I = 1, P
 *
          IF( I .GT. 1 ) THEN
-            CALL SROT( Q-I+1, X11(I,I), LDX11, X21(I-1,I), LDX21, C, S )
+            CALL SROT( Q-I+1, X11(I,I), LDX11, X21(I-1,I), LDX21, C,
+     $                 S )
          END IF
          CALL SLARFGP( Q-I+1, X11(I,I), X11(I,I+1), LDX11, TAUQ1(I) )
          C = X11(I,I)
-         X11(I,I) = ONE
-         CALL SLARF( 'R', P-I, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
-     $               X11(I+1,I), LDX11, WORK(ILARF) )
-         CALL SLARF( 'R', M-P-I+1, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
-     $               X21(I,I), LDX21, WORK(ILARF) )
+         CALL SLARF1F( 'R', P-I, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
+     $                 X11(I+1,I), LDX11, WORK(ILARF) )
+         CALL SLARF1F( 'R', M-P-I+1, Q-I+1, X11(I,I), LDX11,
+     $                 TAUQ1(I), X21(I,I), LDX21, WORK(ILARF) )
          S = SQRT( SNRM2( P-I, X11(I+1,I), 1 )**2
      $           + SNRM2( M-P-I+1, X21(I,I), 1 )**2 )
          THETA(I) = ATAN2( S, C )
@@ -302,13 +303,11 @@ SUBROUTINE SORBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
             PHI(I) = ATAN2( X11(I+1,I), X21(I,I) )
             C = COS( PHI(I) )
             S = SIN( PHI(I) )
-            X11(I+1,I) = ONE
-            CALL SLARF( 'L', P-I, Q-I, X11(I+1,I), 1, TAUP1(I),
-     $                  X11(I+1,I+1), LDX11, WORK(ILARF) )
+            CALL SLARF1F( 'L', P-I, Q-I, X11(I+1,I), 1, TAUP1(I),
+     $                    X11(I+1,I+1), LDX11, WORK(ILARF) )
          END IF
-         X21(I,I) = ONE
-         CALL SLARF( 'L', M-P-I+1, Q-I, X21(I,I), 1, TAUP2(I),
-     $               X21(I,I+1), LDX21, WORK(ILARF) )
+         CALL SLARF1F( 'L', M-P-I+1, Q-I, X21(I,I), 1, TAUP2(I),
+     $                 X21(I,I+1), LDX21, WORK(ILARF) )
 *
       END DO
 *
@@ -316,9 +315,8 @@ SUBROUTINE SORBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *
       DO I = P + 1, Q
          CALL SLARFGP( M-P-I+1, X21(I,I), X21(I+1,I), 1, TAUP2(I) )
-         X21(I,I) = ONE
-         CALL SLARF( 'L', M-P-I+1, Q-I, X21(I,I), 1, TAUP2(I),
-     $               X21(I,I+1), LDX21, WORK(ILARF) )
+         CALL SLARF1F( 'L', M-P-I+1, Q-I, X21(I,I), 1, TAUP2(I),
+     $                 X21(I,I+1), LDX21, WORK(ILARF) )
       END DO
 *
       RETURN
diff --git a/SRC/sorbdb3.f b/SRC/sorbdb3.f
index 6209b24ee0..3cf8f97355 100644
--- a/SRC/sorbdb3.f
+++ b/SRC/sorbdb3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORBDB3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorbdb3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorbdb3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,7 @@
 *>\verbatim
 *>
 *> SORBDB3 simultaneously bidiagonalizes the blocks of a tall and skinny
-*> matrix X with orthonomal columns:
+*> matrix X with orthonormal columns:
 *>
 *>                            [ B11 ]
 *>      [ X11 ]   [ P1 |    ] [  0  ]
@@ -173,7 +171,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unbdb3
 *
 *> \par Further Details:
 *  =====================
@@ -197,8 +195,10 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE SORBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
+      SUBROUTINE SORBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    PHI,
      $                    TAUP1, TAUP2, TAUQ1, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -215,10 +215,6 @@ SUBROUTINE SORBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *
 *  ====================================================================
 *
-*     .. Parameters ..
-      REAL               ONE
-      PARAMETER          ( ONE = 1.0E0 )
-*     ..
 *     .. Local Scalars ..
       REAL               C, S
       INTEGER            CHILDINFO, I, ILARF, IORBDB5, LLARF, LORBDB5,
@@ -226,7 +222,8 @@ SUBROUTINE SORBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       LOGICAL            LQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, SLARFGP, SORBDB5, SROT, XERBLA
+      EXTERNAL           SLARF1F, SLARFGP, SORBDB5, SROT,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       REAL               SNRM2
@@ -263,7 +260,7 @@ SUBROUTINE SORBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
          LORBDB5 = Q-1
          LWORKOPT = MAX( ILARF+LLARF-1, IORBDB5+LORBDB5-1 )
          LWORKMIN = LWORKOPT
-         WORK(1) = LWORKOPT
+         WORK(1) = REAL( LWORKOPT )
          IF( LWORK .LT. LWORKMIN .AND. .NOT.LQUERY ) THEN
            INFO = -14
          END IF
@@ -280,16 +277,16 @@ SUBROUTINE SORBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       DO I = 1, M-P
 *
          IF( I .GT. 1 ) THEN
-            CALL SROT( Q-I+1, X11(I-1,I), LDX11, X21(I,I), LDX11, C, S )
+            CALL SROT( Q-I+1, X11(I-1,I), LDX11, X21(I,I), LDX11, C,
+     $                 S )
          END IF
 *
          CALL SLARFGP( Q-I+1, X21(I,I), X21(I,I+1), LDX21, TAUQ1(I) )
          S = X21(I,I)
-         X21(I,I) = ONE
-         CALL SLARF( 'R', P-I+1, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
-     $               X11(I,I), LDX11, WORK(ILARF) )
-         CALL SLARF( 'R', M-P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
-     $               X21(I+1,I), LDX21, WORK(ILARF) )
+         CALL SLARF1F( 'R', P-I+1, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
+     $                 X11(I,I), LDX11, WORK(ILARF) )
+         CALL SLARF1F( 'R', M-P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
+     $                 X21(I+1,I), LDX21, WORK(ILARF) )
          C = SQRT( SNRM2( P-I+1, X11(I,I), 1 )**2
      $           + SNRM2( M-P-I, X21(I+1,I), 1 )**2 )
          THETA(I) = ATAN2( S, C )
@@ -299,17 +296,16 @@ SUBROUTINE SORBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
      $                 WORK(IORBDB5), LORBDB5, CHILDINFO )
          CALL SLARFGP( P-I+1, X11(I,I), X11(I+1,I), 1, TAUP1(I) )
          IF( I .LT. M-P ) THEN
-            CALL SLARFGP( M-P-I, X21(I+1,I), X21(I+2,I), 1, TAUP2(I) )
+            CALL SLARFGP( M-P-I, X21(I+1,I), X21(I+2,I), 1,
+     $                    TAUP2(I) )
             PHI(I) = ATAN2( X21(I+1,I), X11(I,I) )
             C = COS( PHI(I) )
             S = SIN( PHI(I) )
-            X21(I+1,I) = ONE
-            CALL SLARF( 'L', M-P-I, Q-I, X21(I+1,I), 1, TAUP2(I),
-     $                  X21(I+1,I+1), LDX21, WORK(ILARF) )
+            CALL SLARF1F( 'L', M-P-I, Q-I, X21(I+1,I), 1, TAUP2(I),
+     $                    X21(I+1,I+1), LDX21, WORK(ILARF) )
          END IF
-         X11(I,I) = ONE
-         CALL SLARF( 'L', P-I+1, Q-I, X11(I,I), 1, TAUP1(I), X11(I,I+1),
-     $               LDX11, WORK(ILARF) )
+         CALL SLARF1F( 'L', P-I+1, Q-I, X11(I,I), 1, TAUP1(I), X11(I,
+     $                 I+1), LDX11, WORK(ILARF) )
 *
       END DO
 *
@@ -317,9 +313,8 @@ SUBROUTINE SORBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *
       DO I = M-P + 1, Q
          CALL SLARFGP( P-I+1, X11(I,I), X11(I+1,I), 1, TAUP1(I) )
-         X11(I,I) = ONE
-         CALL SLARF( 'L', P-I+1, Q-I, X11(I,I), 1, TAUP1(I), X11(I,I+1),
-     $               LDX11, WORK(ILARF) )
+         CALL SLARF1F( 'L', P-I+1, Q-I, X11(I,I), 1, TAUP1(I), X11(I,
+     $                 I+1), LDX11, WORK(ILARF) )
       END DO
 *
       RETURN
diff --git a/SRC/sorbdb4.f b/SRC/sorbdb4.f
index b18ed3b270..4bd1affa45 100644
--- a/SRC/sorbdb4.f
+++ b/SRC/sorbdb4.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORBDB4 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorbdb4.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorbdb4.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -38,7 +36,7 @@
 *>\verbatim
 *>
 *> SORBDB4 simultaneously bidiagonalizes the blocks of a tall and skinny
-*> matrix X with orthonomal columns:
+*> matrix X with orthonormal columns:
 *>
 *>                            [ B11 ]
 *>      [ X11 ]   [ P1 |    ] [  0  ]
@@ -124,14 +122,14 @@
 *>
 *> \param[out] TAUP1
 *> \verbatim
-*>          TAUP1 is REAL array, dimension (P)
+*>          TAUP1 is REAL array, dimension (M-Q)
 *>           The scalar factors of the elementary reflectors that define
 *>           P1.
 *> \endverbatim
 *>
 *> \param[out] TAUP2
 *> \verbatim
-*>          TAUP2 is REAL array, dimension (M-P)
+*>          TAUP2 is REAL array, dimension (M-Q)
 *>           The scalar factors of the elementary reflectors that define
 *>           P2.
 *> \endverbatim
@@ -184,7 +182,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unbdb4
 *
 *> \par Further Details:
 *  =====================
@@ -208,9 +206,11 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE SORBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
+      SUBROUTINE SORBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    PHI,
      $                    TAUP1, TAUP2, TAUQ1, PHANTOM, WORK, LWORK,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -228,8 +228,8 @@ SUBROUTINE SORBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *  ====================================================================
 *
 *     .. Parameters ..
-      REAL               NEGONE, ONE, ZERO
-      PARAMETER          ( NEGONE = -1.0E0, ONE = 1.0E0, ZERO = 0.0E0 )
+      REAL               NEGONE, ZERO
+      PARAMETER          ( NEGONE = -1.0E0, ZERO = 0.0E0 )
 *     ..
 *     .. Local Scalars ..
       REAL               C, S
@@ -238,7 +238,8 @@ SUBROUTINE SORBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       LOGICAL            LQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, SLARFGP, SORBDB5, SROT, SSCAL, XERBLA
+      EXTERNAL           SLARF1F, SLARFGP, SORBDB5, SROT, SSCAL,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       REAL               SNRM2
@@ -276,7 +277,7 @@ SUBROUTINE SORBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
          LWORKOPT = ILARF + LLARF - 1
          LWORKOPT = MAX( LWORKOPT, IORBDB5 + LORBDB5 - 1 )
          LWORKMIN = LWORKOPT
-         WORK(1) = LWORKOPT
+         WORK(1) = REAL( LWORKOPT )
          IF( LWORK .LT. LWORKMIN .AND. .NOT.LQUERY ) THEN
            INFO = -14
          END IF
@@ -301,43 +302,40 @@ SUBROUTINE SORBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
      $                    LORBDB5, CHILDINFO )
             CALL SSCAL( P, NEGONE, PHANTOM(1), 1 )
             CALL SLARFGP( P, PHANTOM(1), PHANTOM(2), 1, TAUP1(1) )
-            CALL SLARFGP( M-P, PHANTOM(P+1), PHANTOM(P+2), 1, TAUP2(1) )
+            CALL SLARFGP( M-P, PHANTOM(P+1), PHANTOM(P+2), 1,
+     $                    TAUP2(1) )
             THETA(I) = ATAN2( PHANTOM(1), PHANTOM(P+1) )
             C = COS( THETA(I) )
             S = SIN( THETA(I) )
-            PHANTOM(1) = ONE
-            PHANTOM(P+1) = ONE
-            CALL SLARF( 'L', P, Q, PHANTOM(1), 1, TAUP1(1), X11, LDX11,
-     $                  WORK(ILARF) )
-            CALL SLARF( 'L', M-P, Q, PHANTOM(P+1), 1, TAUP2(1), X21,
-     $                  LDX21, WORK(ILARF) )
+            CALL SLARF1F( 'L', P, Q, PHANTOM(1), 1, TAUP1(1), X11,
+     $                    LDX11, WORK(ILARF) )
+            CALL SLARF1F( 'L', M-P, Q, PHANTOM(P+1), 1, TAUP2(1),
+     $                    X21, LDX21, WORK(ILARF) )
          ELSE
             CALL SORBDB5( P-I+1, M-P-I+1, Q-I+1, X11(I,I-1), 1,
      $                    X21(I,I-1), 1, X11(I,I), LDX11, X21(I,I),
      $                    LDX21, WORK(IORBDB5), LORBDB5, CHILDINFO )
             CALL SSCAL( P-I+1, NEGONE, X11(I,I-1), 1 )
-            CALL SLARFGP( P-I+1, X11(I,I-1), X11(I+1,I-1), 1, TAUP1(I) )
+            CALL SLARFGP( P-I+1, X11(I,I-1), X11(I+1,I-1), 1,
+     $                    TAUP1(I) )
             CALL SLARFGP( M-P-I+1, X21(I,I-1), X21(I+1,I-1), 1,
      $                    TAUP2(I) )
             THETA(I) = ATAN2( X11(I,I-1), X21(I,I-1) )
             C = COS( THETA(I) )
             S = SIN( THETA(I) )
-            X11(I,I-1) = ONE
-            X21(I,I-1) = ONE
-            CALL SLARF( 'L', P-I+1, Q-I+1, X11(I,I-1), 1, TAUP1(I),
-     $                  X11(I,I), LDX11, WORK(ILARF) )
-            CALL SLARF( 'L', M-P-I+1, Q-I+1, X21(I,I-1), 1, TAUP2(I),
-     $                  X21(I,I), LDX21, WORK(ILARF) )
+            CALL SLARF1F( 'L', P-I+1, Q-I+1, X11(I,I-1), 1, TAUP1(I),
+     $                    X11(I,I), LDX11, WORK(ILARF) )
+            CALL SLARF1F( 'L', M-P-I+1, Q-I+1, X21(I,I-1), 1,
+     $                    TAUP2(I), X21(I,I), LDX21, WORK(ILARF) )
          END IF
 *
          CALL SROT( Q-I+1, X11(I,I), LDX11, X21(I,I), LDX21, S, -C )
          CALL SLARFGP( Q-I+1, X21(I,I), X21(I,I+1), LDX21, TAUQ1(I) )
          C = X21(I,I)
-         X21(I,I) = ONE
-         CALL SLARF( 'R', P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
-     $               X11(I+1,I), LDX11, WORK(ILARF) )
-         CALL SLARF( 'R', M-P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
-     $               X21(I+1,I), LDX21, WORK(ILARF) )
+         CALL SLARF1F( 'R', P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
+     $                 X11(I+1,I), LDX11, WORK(ILARF) )
+         CALL SLARF1F( 'R', M-P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
+     $                 X21(I+1,I), LDX21, WORK(ILARF) )
          IF( I .LT. M-Q ) THEN
             S = SQRT( SNRM2( P-I, X11(I+1,I), 1 )**2
      $              + SNRM2( M-P-I, X21(I+1,I), 1 )**2 )
@@ -350,21 +348,21 @@ SUBROUTINE SORBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *
       DO I = M - Q + 1, P
          CALL SLARFGP( Q-I+1, X11(I,I), X11(I,I+1), LDX11, TAUQ1(I) )
-         X11(I,I) = ONE
-         CALL SLARF( 'R', P-I, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
-     $               X11(I+1,I), LDX11, WORK(ILARF) )
-         CALL SLARF( 'R', Q-P, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
-     $               X21(M-Q+1,I), LDX21, WORK(ILARF) )
+         CALL SLARF1F( 'R', P-I, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
+     $                 X11(I+1,I), LDX11, WORK(ILARF) )
+         CALL SLARF1F( 'R', Q-P, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
+     $                 X21(M-Q+1,I), LDX21, WORK(ILARF) )
       END DO
 *
 *     Reduce the bottom-right portion of X21 to [ 0 I ]
 *
       DO I = P + 1, Q
-         CALL SLARFGP( Q-I+1, X21(M-Q+I-P,I), X21(M-Q+I-P,I+1), LDX21,
+         CALL SLARFGP( Q-I+1, X21(M-Q+I-P,I), X21(M-Q+I-P,I+1),
+     $                 LDX21,
      $                 TAUQ1(I) )
-         X21(M-Q+I-P,I) = ONE
-         CALL SLARF( 'R', Q-I, Q-I+1, X21(M-Q+I-P,I), LDX21, TAUQ1(I),
-     $               X21(M-Q+I-P+1,I), LDX21, WORK(ILARF) )
+         CALL SLARF1F( 'R', Q-I, Q-I+1, X21(M-Q+I-P,I), LDX21,
+     $                 TAUQ1(I), X21(M-Q+I-P+1,I), LDX21,
+     $                 WORK(ILARF) )
       END DO
 *
       RETURN
diff --git a/SRC/sorbdb5.f b/SRC/sorbdb5.f
index 8c67aedfb1..746758acaa 100644
--- a/SRC/sorbdb5.f
+++ b/SRC/sorbdb5.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORBDB5 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorbdb5.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorbdb5.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -148,11 +146,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unbdb5
 *
 *  =====================================================================
-      SUBROUTINE SORBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
+      SUBROUTINE SORBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1,
+     $                    Q2,
      $                    LDQ2, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -169,18 +169,21 @@ SUBROUTINE SORBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
 *  =====================================================================
 *
 *     .. Parameters ..
+      REAL               REALZERO
+      PARAMETER          ( REALZERO = 0.0E0 )
       REAL               ONE, ZERO
       PARAMETER          ( ONE = 1.0E0, ZERO = 0.0E0 )
 *     ..
 *     .. Local Scalars ..
       INTEGER            CHILDINFO, I, J
+      REAL               EPS, NORM, SCL, SSQ
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SORBDB6, XERBLA
+      EXTERNAL           SLASSQ, SORBDB6, SSCAL, XERBLA
 *     ..
 *     .. External Functions ..
-      REAL               SNRM2
-      EXTERNAL           SNRM2
+      REAL               SLAMCH, SNRM2
+      EXTERNAL           SLAMCH, SNRM2
 *     ..
 *     .. Intrinsic Function ..
       INTRINSIC          MAX
@@ -213,16 +216,33 @@ SUBROUTINE SORBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
          RETURN
       END IF
 *
-*     Project X onto the orthogonal complement of Q
+      EPS = SLAMCH( 'Precision' )
 *
-      CALL SORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2, LDQ2,
-     $              WORK, LWORK, CHILDINFO )
+*     Project X onto the orthogonal complement of Q if X is nonzero
 *
-*     If the projection is nonzero, then return
+      SCL = REALZERO
+      SSQ = REALZERO
+      CALL SLASSQ( M1, X1, INCX1, SCL, SSQ )
+      CALL SLASSQ( M2, X2, INCX2, SCL, SSQ )
+      NORM = SCL * SQRT( SSQ )
 *
-      IF( SNRM2(M1,X1,INCX1) .NE. ZERO
-     $    .OR. SNRM2(M2,X2,INCX2) .NE. ZERO ) THEN
-         RETURN
+      IF( NORM .GT. REAL( N ) * EPS ) THEN
+*        Scale vector to unit norm to avoid problems in the caller code.
+*        Computing the reciprocal is undesirable but
+*         * xLASCL cannot be used because of the vector increments and
+*         * the round-off error has a negligible impact on
+*           orthogonalization.
+         CALL SSCAL( M1, ONE / NORM, X1, INCX1 )
+         CALL SSCAL( M2, ONE / NORM, X2, INCX2 )
+         CALL SORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
+     $              LDQ2, WORK, LWORK, CHILDINFO )
+*
+*        If the projection is nonzero, then return
+*
+         IF( SNRM2(M1,X1,INCX1) .NE. REALZERO
+     $       .OR. SNRM2(M2,X2,INCX2) .NE. REALZERO ) THEN
+            RETURN
+         END IF
       END IF
 *
 *     Project each standard basis vector e_1,...,e_M1 in turn, stopping
@@ -238,8 +258,8 @@ SUBROUTINE SORBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
          END DO
          CALL SORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
      $                 LDQ2, WORK, LWORK, CHILDINFO )
-         IF( SNRM2(M1,X1,INCX1) .NE. ZERO
-     $       .OR. SNRM2(M2,X2,INCX2) .NE. ZERO ) THEN
+         IF( SNRM2(M1,X1,INCX1) .NE. REALZERO
+     $       .OR. SNRM2(M2,X2,INCX2) .NE. REALZERO ) THEN
             RETURN
          END IF
       END DO
@@ -257,8 +277,8 @@ SUBROUTINE SORBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
          X2(I) = ONE
          CALL SORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
      $                 LDQ2, WORK, LWORK, CHILDINFO )
-         IF( SNRM2(M1,X1,INCX1) .NE. ZERO
-     $       .OR. SNRM2(M2,X2,INCX2) .NE. ZERO ) THEN
+         IF( SNRM2(M1,X1,INCX1) .NE. REALZERO
+     $       .OR. SNRM2(M2,X2,INCX2) .NE. REALZERO ) THEN
             RETURN
          END IF
       END DO
diff --git a/SRC/sorbdb6.f b/SRC/sorbdb6.f
index a23b42bebc..9fb29b0383 100644
--- a/SRC/sorbdb6.f
+++ b/SRC/sorbdb6.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORBDB6 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorbdb6.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorbdb6.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -41,10 +39,15 @@
 *> with respect to the columns of
 *>      Q = [ Q1 ] .
 *>          [ Q2 ]
-*> The columns of Q must be orthonormal.
+*> The columns of Q must be orthonormal. The orthogonalized vector will
+*> be zero if and only if it lies entirely in the range of Q.
 *>
-*> If the projection is zero according to Kahan's "twice is enough"
-*> criterion, then the zero vector is returned.
+*> The projection is computed with at most two iterations of the
+*> classical Gram-Schmidt algorithm, see
+*> * L. Giraud, J. Langou, M. Rozložník. "On the round-off error
+*>   analysis of the Gram-Schmidt algorithm with reorthogonalization."
+*>   2002. CERFACS Technical Report No. TR/PA/02/33. URL:
+*>   https://www.cerfacs.fr/algor/reports/2002/TR_PA_02_33.pdf
 *>
 *>\endverbatim
 *
@@ -146,11 +149,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unbdb6
 *
 *  =====================================================================
-      SUBROUTINE SORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
+      SUBROUTINE SORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1,
+     $                    Q2,
      $                    LDQ2, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -167,15 +172,18 @@ SUBROUTINE SORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
 *  =====================================================================
 *
 *     .. Parameters ..
-      REAL               ALPHASQ, REALONE, REALZERO
-      PARAMETER          ( ALPHASQ = 0.01E0, REALONE = 1.0E0,
+      REAL               ALPHA, REALONE, REALZERO
+      PARAMETER          ( ALPHA = 0.83E0, REALONE = 1.0E0,
      $                     REALZERO = 0.0E0 )
       REAL               NEGONE, ONE, ZERO
       PARAMETER          ( NEGONE = -1.0E0, ONE = 1.0E0, ZERO = 0.0E0 )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I
-      REAL               NORMSQ1, NORMSQ2, SCL1, SCL2, SSQ1, SSQ2
+      INTEGER            I, IX
+      REAL               EPS, NORM, NORM_NEW, SCL, SSQ
+*     ..
+*     .. External Functions ..
+      REAL               SLAMCH
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SGEMV, SLASSQ, XERBLA
@@ -210,55 +218,63 @@ SUBROUTINE SORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
          CALL XERBLA( 'SORBDB6', -INFO )
          RETURN
       END IF
+*
+      EPS = SLAMCH( 'Precision' )
+*
+*     Compute the Euclidean norm of X
+*
+      SCL = REALZERO
+      SSQ = REALZERO
+      CALL SLASSQ( M1, X1, INCX1, SCL, SSQ )
+      CALL SLASSQ( M2, X2, INCX2, SCL, SSQ )
+      NORM = SCL * SQRT( SSQ )
 *
 *     First, project X onto the orthogonal complement of Q's column
 *     space
-*
-      SCL1 = REALZERO
-      SSQ1 = REALONE
-      CALL SLASSQ( M1, X1, INCX1, SCL1, SSQ1 )
-      SCL2 = REALZERO
-      SSQ2 = REALONE
-      CALL SLASSQ( M2, X2, INCX2, SCL2, SSQ2 )
-      NORMSQ1 = SCL1**2*SSQ1 + SCL2**2*SSQ2
 *
       IF( M1 .EQ. 0 ) THEN
          DO I = 1, N
             WORK(I) = ZERO
          END DO
       ELSE
-         CALL SGEMV( 'C', M1, N, ONE, Q1, LDQ1, X1, INCX1, ZERO, WORK,
+         CALL SGEMV( 'C', M1, N, ONE, Q1, LDQ1, X1, INCX1, ZERO,
+     $               WORK,
      $               1 )
       END IF
 *
-      CALL SGEMV( 'C', M2, N, ONE, Q2, LDQ2, X2, INCX2, ONE, WORK, 1 )
+      CALL SGEMV( 'C', M2, N, ONE, Q2, LDQ2, X2, INCX2, ONE, WORK,
+     $            1 )
 *
       CALL SGEMV( 'N', M1, N, NEGONE, Q1, LDQ1, WORK, 1, ONE, X1,
      $            INCX1 )
       CALL SGEMV( 'N', M2, N, NEGONE, Q2, LDQ2, WORK, 1, ONE, X2,
      $            INCX2 )
 *
-      SCL1 = REALZERO
-      SSQ1 = REALONE
-      CALL SLASSQ( M1, X1, INCX1, SCL1, SSQ1 )
-      SCL2 = REALZERO
-      SSQ2 = REALONE
-      CALL SLASSQ( M2, X2, INCX2, SCL2, SSQ2 )
-      NORMSQ2 = SCL1**2*SSQ1 + SCL2**2*SSQ2
+      SCL = REALZERO
+      SSQ = REALZERO
+      CALL SLASSQ( M1, X1, INCX1, SCL, SSQ )
+      CALL SLASSQ( M2, X2, INCX2, SCL, SSQ )
+      NORM_NEW = SCL * SQRT(SSQ)
 *
 *     If projection is sufficiently large in norm, then stop.
 *     If projection is zero, then stop.
 *     Otherwise, project again.
 *
-      IF( NORMSQ2 .GE. ALPHASQ*NORMSQ1 ) THEN
+      IF( NORM_NEW .GE. ALPHA * NORM ) THEN
          RETURN
       END IF
 *
-      IF( NORMSQ2 .EQ. ZERO ) THEN
+      IF( NORM_NEW .LE. REAL( N ) * EPS * NORM ) THEN
+         DO IX = 1, 1 + (M1-1)*INCX1, INCX1
+           X1( IX ) = ZERO
+         END DO
+         DO IX = 1, 1 + (M2-1)*INCX2, INCX2
+           X2( IX ) = ZERO
+         END DO
          RETURN
       END IF
 *
-      NORMSQ1 = NORMSQ2
+      NORM = NORM_NEW
 *
       DO I = 1, N
          WORK(I) = ZERO
@@ -269,35 +285,35 @@ SUBROUTINE SORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
             WORK(I) = ZERO
          END DO
       ELSE
-         CALL SGEMV( 'C', M1, N, ONE, Q1, LDQ1, X1, INCX1, ZERO, WORK,
+         CALL SGEMV( 'C', M1, N, ONE, Q1, LDQ1, X1, INCX1, ZERO,
+     $               WORK,
      $               1 )
       END IF
 *
-      CALL SGEMV( 'C', M2, N, ONE, Q2, LDQ2, X2, INCX2, ONE, WORK, 1 )
+      CALL SGEMV( 'C', M2, N, ONE, Q2, LDQ2, X2, INCX2, ONE, WORK,
+     $            1 )
 *
       CALL SGEMV( 'N', M1, N, NEGONE, Q1, LDQ1, WORK, 1, ONE, X1,
      $            INCX1 )
       CALL SGEMV( 'N', M2, N, NEGONE, Q2, LDQ2, WORK, 1, ONE, X2,
      $            INCX2 )
 *
-      SCL1 = REALZERO
-      SSQ1 = REALONE
-      CALL SLASSQ( M1, X1, INCX1, SCL1, SSQ1 )
-      SCL2 = REALZERO
-      SSQ2 = REALONE
-      CALL SLASSQ( M1, X1, INCX1, SCL1, SSQ1 )
-      NORMSQ2 = SCL1**2*SSQ1 + SCL2**2*SSQ2
+      SCL = REALZERO
+      SSQ = REALZERO
+      CALL SLASSQ( M1, X1, INCX1, SCL, SSQ )
+      CALL SLASSQ( M2, X2, INCX2, SCL, SSQ )
+      NORM_NEW = SCL * SQRT(SSQ)
 *
 *     If second projection is sufficiently large in norm, then do
 *     nothing more. Alternatively, if it shrunk significantly, then
 *     truncate it to zero.
 *
-      IF( NORMSQ2 .LT. ALPHASQ*NORMSQ1 ) THEN
-         DO I = 1, M1
-            X1(I) = ZERO
+      IF( NORM_NEW .LT. ALPHA * NORM ) THEN
+         DO IX = 1, 1 + (M1-1)*INCX1, INCX1
+            X1(IX) = ZERO
          END DO
-         DO I = 1, M2
-            X2(I) = ZERO
+         DO IX = 1, 1 + (M2-1)*INCX2, INCX2
+            X2(IX) = ZERO
          END DO
       END IF
 *
@@ -306,4 +322,3 @@ SUBROUTINE SORBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
 *     End of SORBDB6
 *
       END
-
diff --git a/SRC/sorcsd.f b/SRC/sorcsd.f
index 30bee7a79f..eb91d1757f 100644
--- a/SRC/sorcsd.f
+++ b/SRC/sorcsd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORCSD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorcsd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorcsd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -289,14 +287,16 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup uncsd
 *
 *  =====================================================================
-      RECURSIVE SUBROUTINE SORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
+      RECURSIVE SUBROUTINE SORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T,
+     $                             TRANS,
      $                             SIGNS, M, P, Q, X11, LDX11, X12,
      $                             LDX12, X21, LDX21, X22, LDX22, THETA,
      $                             U1, LDU1, U2, LDU2, V1T, LDV1T, V2T,
      $                             LDV2T, WORK, LWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -407,7 +407,8 @@ RECURSIVE SUBROUTINE SORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
          ELSE
             SIGNST = 'D'
          END IF
-         CALL SORCSD( JOBV1T, JOBV2T, JOBU1, JOBU2, TRANST, SIGNST, M,
+         CALL SORCSD( JOBV1T, JOBV2T, JOBU1, JOBU2, TRANST, SIGNST,
+     $                M,
      $                Q, P, X11, LDX11, X21, LDX21, X12, LDX12, X22,
      $                LDX22, THETA, V1T, LDV1T, V2T, LDV2T, U1, LDU1,
      $                U2, LDU2, WORK, LWORK, IWORK, INFO )
@@ -440,12 +441,14 @@ RECURSIVE SUBROUTINE SORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
          ITAUQ1 = ITAUP2 + MAX( 1, M - P )
          ITAUQ2 = ITAUQ1 + MAX( 1, Q )
          IORGQR = ITAUQ2 + MAX( 1, M - Q )
-         CALL SORGQR( M-Q, M-Q, M-Q, DUMMY, MAX(1,M-Q), DUMMY, WORK, -1,
+         CALL SORGQR( M-Q, M-Q, M-Q, DUMMY, MAX(1,M-Q), DUMMY, WORK,
+     $                -1,
      $                CHILDINFO )
          LORGQRWORKOPT = INT( WORK(1) )
          LORGQRWORKMIN = MAX( 1, M - Q )
          IORGLQ = ITAUQ2 + MAX( 1, M - Q )
-         CALL SORGLQ( M-Q, M-Q, M-Q, DUMMY, MAX(1,M-Q), DUMMY, WORK, -1,
+         CALL SORGLQ( M-Q, M-Q, M-Q, DUMMY, MAX(1,M-Q), DUMMY, WORK,
+     $                -1,
      $                CHILDINFO )
          LORGLQWORKOPT = INT( WORK(1) )
          LORGLQWORKMIN = MAX( 1, M - Q )
@@ -474,7 +477,7 @@ RECURSIVE SUBROUTINE SORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
      $              IORBDB + LORBDBWORKOPT, IBBCSD + LBBCSDWORKOPT ) - 1
          LWORKMIN = MAX( IORGQR + LORGQRWORKMIN, IORGLQ + LORGLQWORKMIN,
      $              IORBDB + LORBDBWORKOPT, IBBCSD + LBBCSDWORKMIN ) - 1
-         WORK(1) = MAX(LWORKOPT,LWORKMIN)
+         WORK(1) = REAL( MAX(LWORKOPT,LWORKMIN) )
 *
          IF( LWORK .LT. LWORKMIN .AND. .NOT. LQUERY ) THEN
             INFO = -22
@@ -497,7 +500,8 @@ RECURSIVE SUBROUTINE SORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
 *
 *     Transform to bidiagonal block form
 *
-      CALL SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12, X21,
+      CALL SORBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
+     $             X21,
      $             LDX21, X22, LDX22, THETA, WORK(IPHI), WORK(ITAUP1),
      $             WORK(ITAUP2), WORK(ITAUQ1), WORK(ITAUQ2),
      $             WORK(IORBDB), LORBDBWORK, CHILDINFO )
@@ -507,7 +511,8 @@ RECURSIVE SUBROUTINE SORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
       IF( COLMAJOR ) THEN
          IF( WANTU1 .AND. P .GT. 0 ) THEN
             CALL SLACPY( 'L', P, Q, X11, LDX11, U1, LDU1 )
-            CALL SORGQR( P, P, Q, U1, LDU1, WORK(ITAUP1), WORK(IORGQR),
+            CALL SORGQR( P, P, Q, U1, LDU1, WORK(ITAUP1),
+     $                   WORK(IORGQR),
      $                   LORGQRWORK, INFO)
          END IF
          IF( WANTU2 .AND. M-P .GT. 0 ) THEN
@@ -523,7 +528,8 @@ RECURSIVE SUBROUTINE SORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
                V1T(1,J) = ZERO
                V1T(J,1) = ZERO
             END DO
-            CALL SORGLQ( Q-1, Q-1, Q-1, V1T(2,2), LDV1T, WORK(ITAUQ1),
+            CALL SORGLQ( Q-1, Q-1, Q-1, V1T(2,2), LDV1T,
+     $                   WORK(ITAUQ1),
      $                   WORK(IORGLQ), LORGLQWORK, INFO )
          END IF
          IF( WANTV2T .AND. M-Q .GT. 0 ) THEN
@@ -536,7 +542,8 @@ RECURSIVE SUBROUTINE SORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
       ELSE
          IF( WANTU1 .AND. P .GT. 0 ) THEN
             CALL SLACPY( 'U', Q, P, X11, LDX11, U1, LDU1 )
-            CALL SORGLQ( P, P, Q, U1, LDU1, WORK(ITAUP1), WORK(IORGLQ),
+            CALL SORGLQ( P, P, Q, U1, LDU1, WORK(ITAUP1),
+     $                   WORK(IORGLQ),
      $                   LORGLQWORK, INFO)
          END IF
          IF( WANTU2 .AND. M-P .GT. 0 ) THEN
@@ -552,7 +559,8 @@ RECURSIVE SUBROUTINE SORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
                V1T(1,J) = ZERO
                V1T(J,1) = ZERO
             END DO
-            CALL SORGQR( Q-1, Q-1, Q-1, V1T(2,2), LDV1T, WORK(ITAUQ1),
+            CALL SORGQR( Q-1, Q-1, Q-1, V1T(2,2), LDV1T,
+     $                   WORK(ITAUQ1),
      $                   WORK(IORGQR), LORGQRWORK, INFO )
          END IF
          IF( WANTV2T .AND. M-Q .GT. 0 ) THEN
@@ -566,7 +574,8 @@ RECURSIVE SUBROUTINE SORCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
 *
 *     Compute the CSD of the matrix in bidiagonal-block form
 *
-      CALL SBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q, THETA,
+      CALL SBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
+     $             THETA,
      $             WORK(IPHI), U1, LDU1, U2, LDU2, V1T, LDV1T, V2T,
      $             LDV2T, WORK(IB11D), WORK(IB11E), WORK(IB12D),
      $             WORK(IB12E), WORK(IB21D), WORK(IB21E), WORK(IB22D),
diff --git a/SRC/sorcsd2by1.f b/SRC/sorcsd2by1.f
index 25c317f6f6..c8af642c85 100644
--- a/SRC/sorcsd2by1.f
+++ b/SRC/sorcsd2by1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORCSD2BY1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorcsd2by1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorcsd2by1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -224,12 +222,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup uncsd2by1
 *
 *  =====================================================================
-      SUBROUTINE SORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
+      SUBROUTINE SORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11,
+     $                       LDX11,
      $                       X21, LDX21, THETA, U1, LDU1, U2, LDU2, V1T,
      $                       LDV1T, WORK, LWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -266,7 +266,8 @@ SUBROUTINE SORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
       REAL               DUM1(1), DUM2(1,1)
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SBBCSD, SCOPY, SLACPY, SLAPMR, SLAPMT, SORBDB1,
+      EXTERNAL           SBBCSD, SCOPY, SLACPY, SLAPMR, SLAPMT,
+     $                   SORBDB1,
      $                   SORBDB2, SORBDB3, SORBDB4, SORGLQ, SORGQR,
      $                   XERBLA
 *     ..
@@ -370,7 +371,8 @@ SUBROUTINE SORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
                LORGLQMIN = MAX( LORGLQMIN, Q-1 )
                LORGLQOPT = MAX( LORGLQOPT, INT( WORK(1) ) )
             END IF
-            CALL SBBCSD( JOBU1, JOBU2, JOBV1T, 'N', 'N', M, P, Q, THETA,
+            CALL SBBCSD( JOBU1, JOBU2, JOBV1T, 'N', 'N', M, P, Q,
+     $                   THETA,
      $                   DUM1, U1, LDU1, U2, LDU2, V1T, LDV1T, DUM2,
      $                   1, DUM1, DUM1, DUM1, DUM1, DUM1,
      $                   DUM1, DUM1, DUM1, WORK(1), -1, CHILDINFO
@@ -399,7 +401,8 @@ SUBROUTINE SORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
                LORGLQMIN = MAX( LORGLQMIN, Q )
                LORGLQOPT = MAX( LORGLQOPT, INT( WORK(1) ) )
             END IF
-            CALL SBBCSD( JOBV1T, 'N', JOBU1, JOBU2, 'T', M, Q, P, THETA,
+            CALL SBBCSD( JOBV1T, 'N', JOBU1, JOBU2, 'T', M, Q, P,
+     $                   THETA,
      $                   DUM1, V1T, LDV1T, DUM2, 1, U1, LDU1, U2,
      $                   LDU2, DUM1, DUM1, DUM1, DUM1, DUM1,
      $                   DUM1, DUM1, DUM1, WORK(1), -1, CHILDINFO
@@ -472,7 +475,7 @@ SUBROUTINE SORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
      $                   IORGQR+LORGQROPT-1,
      $                   IORGLQ+LORGLQOPT-1,
      $                   IBBCSD+LBBCSD-1 )
-         WORK(1) = LWORKOPT
+         WORK(1) = REAL( LWORKOPT )
          IF( LWORK .LT. LWORKMIN .AND. .NOT.LQUERY ) THEN
             INFO = -19
          END IF
@@ -503,7 +506,8 @@ SUBROUTINE SORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
 *
          IF( WANTU1 .AND. P .GT. 0 ) THEN
             CALL SLACPY( 'L', P, Q, X11, LDX11, U1, LDU1 )
-            CALL SORGQR( P, P, Q, U1, LDU1, WORK(ITAUP1), WORK(IORGQR),
+            CALL SORGQR( P, P, Q, U1, LDU1, WORK(ITAUP1),
+     $                   WORK(IORGQR),
      $                   LORGQR, CHILDINFO )
          END IF
          IF( WANTU2 .AND. M-P .GT. 0 ) THEN
@@ -519,7 +523,8 @@ SUBROUTINE SORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
             END DO
             CALL SLACPY( 'U', Q-1, Q-1, X21(1,2), LDX21, V1T(2,2),
      $                   LDV1T )
-            CALL SORGLQ( Q-1, Q-1, Q-1, V1T(2,2), LDV1T, WORK(ITAUQ1),
+            CALL SORGLQ( Q-1, Q-1, Q-1, V1T(2,2), LDV1T,
+     $                   WORK(ITAUQ1),
      $                   WORK(IORGLQ), LORGLQ, CHILDINFO )
          END IF
 *
@@ -562,7 +567,8 @@ SUBROUTINE SORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
                U1(1,J) = ZERO
                U1(J,1) = ZERO
             END DO
-            CALL SLACPY( 'L', P-1, P-1, X11(2,1), LDX11, U1(2,2), LDU1 )
+            CALL SLACPY( 'L', P-1, P-1, X11(2,1), LDX11, U1(2,2),
+     $                   LDU1 )
             CALL SORGQR( P-1, P-1, P-1, U1(2,2), LDU1, WORK(ITAUP1),
      $                   WORK(IORGQR), LORGQR, CHILDINFO )
          END IF
@@ -612,7 +618,8 @@ SUBROUTINE SORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
 *
          IF( WANTU1 .AND. P .GT. 0 ) THEN
             CALL SLACPY( 'L', P, Q, X11, LDX11, U1, LDU1 )
-            CALL SORGQR( P, P, Q, U1, LDU1, WORK(ITAUP1), WORK(IORGQR),
+            CALL SORGQR( P, P, Q, U1, LDU1, WORK(ITAUP1),
+     $                   WORK(IORGQR),
      $                   LORGQR, CHILDINFO )
          END IF
          IF( WANTU2 .AND. M-P .GT. 0 ) THEN
@@ -695,7 +702,8 @@ SUBROUTINE SORCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
          END IF
          IF( WANTV1T .AND. Q .GT. 0 ) THEN
             CALL SLACPY( 'U', M-Q, Q, X21, LDX21, V1T, LDV1T )
-            CALL SLACPY( 'U', P-(M-Q), Q-(M-Q), X11(M-Q+1,M-Q+1), LDX11,
+            CALL SLACPY( 'U', P-(M-Q), Q-(M-Q), X11(M-Q+1,M-Q+1),
+     $                   LDX11,
      $                   V1T(M-Q+1,M-Q+1), LDV1T )
             CALL SLACPY( 'U', -P+Q, Q-P, X21(M-Q+1,P+1), LDX21,
      $                   V1T(P+1,P+1), LDV1T )
diff --git a/SRC/sorg2l.f b/SRC/sorg2l.f
index aa0dd0a08e..bf5c9b0ec7 100644
--- a/SRC/sorg2l.f
+++ b/SRC/sorg2l.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORG2L + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorg2l.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorg2l.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup ung2l
 *
 *  =====================================================================
       SUBROUTINE SORG2L( M, N, K, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -133,7 +132,7 @@ SUBROUTINE SORG2L( M, N, K, A, LDA, TAU, WORK, INFO )
       INTEGER            I, II, J, L
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, SSCAL, XERBLA
+      EXTERNAL           SLARF1L, SSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -177,8 +176,8 @@ SUBROUTINE SORG2L( M, N, K, A, LDA, TAU, WORK, INFO )
 *        Apply H(i) to A(1:m-k+i,1:n-k+i) from the left
 *
          A( M-N+II, II ) = ONE
-         CALL SLARF( 'Left', M-N+II, II-1, A( 1, II ), 1, TAU( I ), A,
-     $               LDA, WORK )
+         CALL SLARF1L( 'Left', M-N+II, II-1, A( 1, II ), 1, TAU( I ),
+     $                 A, LDA, WORK )
          CALL SSCAL( M-N+II-1, -TAU( I ), A( 1, II ), 1 )
          A( M-N+II, II ) = ONE - TAU( I )
 *
diff --git a/SRC/sorg2r.f b/SRC/sorg2r.f
index 3a8aa33a02..c6bbe7506a 100644
--- a/SRC/sorg2r.f
+++ b/SRC/sorg2r.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORG2R + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorg2r.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorg2r.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup ung2r
 *
 *  =====================================================================
       SUBROUTINE SORG2R( M, N, K, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -133,7 +132,7 @@ SUBROUTINE SORG2R( M, N, K, A, LDA, TAU, WORK, INFO )
       INTEGER            I, J, L
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, SSCAL, XERBLA
+      EXTERNAL           SLARF1F, SSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -176,9 +175,8 @@ SUBROUTINE SORG2R( M, N, K, A, LDA, TAU, WORK, INFO )
 *        Apply H(i) to A(i:m,i:n) from the left
 *
          IF( I.LT.N ) THEN
-            A( I, I ) = ONE
-            CALL SLARF( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
-     $                  A( I, I+1 ), LDA, WORK )
+            CALL SLARF1F( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
+     $                    A( I, I+1 ), LDA, WORK )
          END IF
          IF( I.LT.M )
      $      CALL SSCAL( M-I, -TAU( I ), A( I+1, I ), 1 )
diff --git a/SRC/sorgbr.f b/SRC/sorgbr.f
index 8f15523d4b..b61e998748 100644
--- a/SRC/sorgbr.f
+++ b/SRC/sorgbr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORGBR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorgbr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorgbr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -150,10 +148,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGBcomputational
+*> \ingroup ungbr
 *
 *  =====================================================================
-      SUBROUTINE SORGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE SORGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -179,7 +179,8 @@ SUBROUTINE SORGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SORGLQ, SORGQR, XERBLA
@@ -232,7 +233,7 @@ SUBROUTINE SORGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
                END IF
             END IF
          END IF
-         LWKOPT = WORK( 1 )
+         LWKOPT = INT( WORK( 1 ) )
          LWKOPT = MAX (LWKOPT, MN)
       END IF
 *
@@ -240,7 +241,7 @@ SUBROUTINE SORGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
          CALL XERBLA( 'SORGBR', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
          RETURN
       END IF
 *
@@ -326,7 +327,7 @@ SUBROUTINE SORGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
             END IF
          END IF
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of SORGBR
diff --git a/SRC/sorghr.f b/SRC/sorghr.f
index f65cd898c2..32ebd853bb 100644
--- a/SRC/sorghr.f
+++ b/SRC/sorghr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORGHR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorghr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorghr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,10 +117,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unghr
 *
 *  =====================================================================
-      SUBROUTINE SORGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE SORGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -150,7 +150,8 @@ SUBROUTINE SORGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -177,7 +178,7 @@ SUBROUTINE SORGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
       IF( INFO.EQ.0 ) THEN
          NB = ILAENV( 1, 'SORGQR', ' ', NH, NH, NH, -1 )
          LWKOPT = MAX( 1, NH )*NB
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -229,7 +230,7 @@ SUBROUTINE SORGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
          CALL SORGQR( NH, NH, NH, A( ILO+1, ILO+1 ), LDA, TAU( ILO ),
      $                WORK, LWORK, IINFO )
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of SORGHR
diff --git a/SRC/sorgl2.f b/SRC/sorgl2.f
index d85c388749..2bea2836f9 100644
--- a/SRC/sorgl2.f
+++ b/SRC/sorgl2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORGL2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorgl2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorgl2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,10 +104,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup ungl2
 *
 *  =====================================================================
       SUBROUTINE SORGL2( M, N, K, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -132,7 +131,7 @@ SUBROUTINE SORGL2( M, N, K, A, LDA, TAU, WORK, INFO )
       INTEGER            I, J, L
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, SSCAL, XERBLA
+      EXTERNAL           SLARF1F, SSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -180,9 +179,8 @@ SUBROUTINE SORGL2( M, N, K, A, LDA, TAU, WORK, INFO )
 *
          IF( I.LT.N ) THEN
             IF( I.LT.M ) THEN
-               A( I, I ) = ONE
-               CALL SLARF( 'Right', M-I, N-I+1, A( I, I ), LDA,
-     $                     TAU( I ), A( I+1, I ), LDA, WORK )
+               CALL SLARF1F( 'Right', M-I, N-I+1, A( I, I ), LDA,
+     $                       TAU( I ), A( I+1, I ), LDA, WORK )
             END IF
             CALL SSCAL( N-I, -TAU( I ), A( I, I+1 ), LDA )
          END IF
diff --git a/SRC/sorglq.f b/SRC/sorglq.f
index b1d107964c..12dbc5503f 100644
--- a/SRC/sorglq.f
+++ b/SRC/sorglq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORGLQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorglq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorglq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,10 +118,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unglq
 *
 *  =====================================================================
       SUBROUTINE SORGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -155,7 +154,8 @@ SUBROUTINE SORGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -164,7 +164,7 @@ SUBROUTINE SORGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
       INFO = 0
       NB = ILAENV( 1, 'SORGLQ', ' ', M, N, K, -1 )
       LWKOPT = MAX( 1, M )*NB
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -211,7 +211,8 @@ SUBROUTINE SORGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              determine the minimum value of NB.
 *
                NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'SORGLQ', ' ', M, N, K, -1 ) )
+               NBMIN = MAX( 2, ILAENV( 2, 'SORGLQ', ' ', M, N, K,
+     $                      -1 ) )
             END IF
          END IF
       END IF
@@ -252,12 +253,14 @@ SUBROUTINE SORGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              Form the triangular factor of the block reflector
 *              H = H(i) H(i+1) . . . H(i+ib-1)
 *
-               CALL SLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I, I ),
+               CALL SLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I,
+     $                      I ),
      $                      LDA, TAU( I ), WORK, LDWORK )
 *
 *              Apply H**T to A(i+ib:m,i:n) from the right
 *
-               CALL SLARFB( 'Right', 'Transpose', 'Forward', 'Rowwise',
+               CALL SLARFB( 'Right', 'Transpose', 'Forward',
+     $                      'Rowwise',
      $                      M-I-IB+1, N-I+1, IB, A( I, I ), LDA, WORK,
      $                      LDWORK, A( I+IB, I ), LDA, WORK( IB+1 ),
      $                      LDWORK )
@@ -265,7 +268,8 @@ SUBROUTINE SORGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *           Apply H**T to columns i:n of current block
 *
-            CALL SORGL2( IB, N-I+1, IB, A( I, I ), LDA, TAU( I ), WORK,
+            CALL SORGL2( IB, N-I+1, IB, A( I, I ), LDA, TAU( I ),
+     $                   WORK,
      $                   IINFO )
 *
 *           Set columns 1:i-1 of current block to zero
@@ -278,7 +282,7 @@ SUBROUTINE SORGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
    50    CONTINUE
       END IF
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK(IWS)
       RETURN
 *
 *     End of SORGLQ
diff --git a/SRC/sorgql.f b/SRC/sorgql.f
index 34ab5edefe..6fab92c4b8 100644
--- a/SRC/sorgql.f
+++ b/SRC/sorgql.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORGQL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorgql.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorgql.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup ungql
 *
 *  =====================================================================
       SUBROUTINE SORGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -156,7 +155,8 @@ SUBROUTINE SORGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -181,7 +181,7 @@ SUBROUTINE SORGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
             NB = ILAENV( 1, 'SORGQL', ' ', M, N, K, -1 )
             LWKOPT = N*NB
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
             INFO = -8
@@ -221,7 +221,8 @@ SUBROUTINE SORGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              determine the minimum value of NB.
 *
                NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'SORGQL', ' ', M, N, K, -1 ) )
+               NBMIN = MAX( 2, ILAENV( 2, 'SORGQL', ' ', M, N, K,
+     $                      -1 ) )
             END IF
          END IF
       END IF
@@ -285,7 +286,7 @@ SUBROUTINE SORGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
    50    CONTINUE
       END IF
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK(IWS)
       RETURN
 *
 *     End of SORGQL
diff --git a/SRC/sorgqr.f b/SRC/sorgqr.f
index 056de54d79..d793874a28 100644
--- a/SRC/sorgqr.f
+++ b/SRC/sorgqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORGQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorgqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorgqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup ungqr
 *
 *  =====================================================================
       SUBROUTINE SORGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -156,7 +155,8 @@ SUBROUTINE SORGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -165,7 +165,7 @@ SUBROUTINE SORGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
       INFO = 0
       NB = ILAENV( 1, 'SORGQR', ' ', M, N, K, -1 )
       LWKOPT = MAX( 1, N )*NB
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -212,7 +212,8 @@ SUBROUTINE SORGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              determine the minimum value of NB.
 *
                NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'SORGQR', ' ', M, N, K, -1 ) )
+               NBMIN = MAX( 2, ILAENV( 2, 'SORGQR', ' ', M, N, K,
+     $                      -1 ) )
             END IF
          END IF
       END IF
@@ -266,7 +267,8 @@ SUBROUTINE SORGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *           Apply H to rows i:m of current block
 *
-            CALL SORG2R( M-I+1, IB, IB, A( I, I ), LDA, TAU( I ), WORK,
+            CALL SORG2R( M-I+1, IB, IB, A( I, I ), LDA, TAU( I ),
+     $                   WORK,
      $                   IINFO )
 *
 *           Set rows 1:i-1 of current block to zero
@@ -279,7 +281,7 @@ SUBROUTINE SORGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
    50    CONTINUE
       END IF
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK(IWS)
       RETURN
 *
 *     End of SORGQR
diff --git a/SRC/sorgr2.f b/SRC/sorgr2.f
index 12bb90c782..aca697e0cd 100644
--- a/SRC/sorgr2.f
+++ b/SRC/sorgr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORGR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorgr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorgr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup ungr2
 *
 *  =====================================================================
       SUBROUTINE SORGR2( M, N, K, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -133,7 +132,7 @@ SUBROUTINE SORGR2( M, N, K, A, LDA, TAU, WORK, INFO )
       INTEGER            I, II, J, L
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, SSCAL, XERBLA
+      EXTERNAL           SLARF1L, SSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -181,8 +180,8 @@ SUBROUTINE SORGR2( M, N, K, A, LDA, TAU, WORK, INFO )
 *        Apply H(i) to A(1:m-k+i,1:n-k+i) from the right
 *
          A( II, N-M+II ) = ONE
-         CALL SLARF( 'Right', II-1, N-M+II, A( II, 1 ), LDA, TAU( I ),
-     $               A, LDA, WORK )
+         CALL SLARF1L( 'Right', II-1, N-M+II, A( II, 1 ), LDA,
+     $                 TAU( I ), A, LDA, WORK )
          CALL SSCAL( N-M+II-1, -TAU( I ), A( II, 1 ), LDA )
          A( II, N-M+II ) = ONE - TAU( I )
 *
diff --git a/SRC/sorgrq.f b/SRC/sorgrq.f
index d9b6ccbe6c..38173a1f7c 100644
--- a/SRC/sorgrq.f
+++ b/SRC/sorgrq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORGRQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorgrq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorgrq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup ungrq
 *
 *  =====================================================================
       SUBROUTINE SORGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -156,7 +155,8 @@ SUBROUTINE SORGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -181,7 +181,7 @@ SUBROUTINE SORGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
             NB = ILAENV( 1, 'SORGRQ', ' ', M, N, K, -1 )
             LWKOPT = M*NB
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.MAX( 1, M ) .AND. .NOT.LQUERY ) THEN
             INFO = -8
@@ -221,7 +221,8 @@ SUBROUTINE SORGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              determine the minimum value of NB.
 *
                NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'SORGRQ', ' ', M, N, K, -1 ) )
+               NBMIN = MAX( 2, ILAENV( 2, 'SORGRQ', ' ', M, N, K,
+     $                      -1 ) )
             END IF
          END IF
       END IF
@@ -265,14 +266,16 @@ SUBROUTINE SORGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *              Apply H**T to A(1:m-k+i-1,1:n-k+i+ib-1) from the right
 *
-               CALL SLARFB( 'Right', 'Transpose', 'Backward', 'Rowwise',
+               CALL SLARFB( 'Right', 'Transpose', 'Backward',
+     $                      'Rowwise',
      $                      II-1, N-K+I+IB-1, IB, A( II, 1 ), LDA, WORK,
      $                      LDWORK, A, LDA, WORK( IB+1 ), LDWORK )
             END IF
 *
 *           Apply H**T to columns 1:n-k+i+ib-1 of current block
 *
-            CALL SORGR2( IB, N-K+I+IB-1, IB, A( II, 1 ), LDA, TAU( I ),
+            CALL SORGR2( IB, N-K+I+IB-1, IB, A( II, 1 ), LDA,
+     $                   TAU( I ),
      $                   WORK, IINFO )
 *
 *           Set columns n-k+i+ib:n of current block to zero
@@ -285,7 +288,7 @@ SUBROUTINE SORGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
    50    CONTINUE
       END IF
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = SROUNDUP_LWORK(IWS)
       RETURN
 *
 *     End of SORGRQ
diff --git a/SRC/sorgtr.f b/SRC/sorgtr.f
index 67bde00cbc..b80204c4db 100644
--- a/SRC/sorgtr.f
+++ b/SRC/sorgtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORGTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorgtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorgtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -116,10 +114,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup ungtr
 *
 *  =====================================================================
       SUBROUTINE SORGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -146,7 +145,8 @@ SUBROUTINE SORGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           ILAENV, LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SORGQL, SORGQR, XERBLA
@@ -178,7 +178,7 @@ SUBROUTINE SORGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
            NB = ILAENV( 1, 'SORGQR', ' ', N-1, N-1, N-1, -1 )
          END IF
          LWKOPT = MAX( 1, N-1 )*NB
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -216,7 +216,8 @@ SUBROUTINE SORGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *        Generate Q(1:n-1,1:n-1)
 *
-         CALL SORGQL( N-1, N-1, N-1, A, LDA, TAU, WORK, LWORK, IINFO )
+         CALL SORGQL( N-1, N-1, N-1, A, LDA, TAU, WORK, LWORK,
+     $                IINFO )
 *
       ELSE
 *
@@ -244,7 +245,7 @@ SUBROUTINE SORGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
      $                   LWORK, IINFO )
          END IF
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of SORGTR
diff --git a/SRC/sorgtsqr.f b/SRC/sorgtsqr.f
index 67bda2b6cc..b3184d4f02 100644
--- a/SRC/sorgtsqr.f
+++ b/SRC/sorgtsqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORGTSQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorgtsqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorgtsqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,6 +131,7 @@
 *>
 *> \param[in] LWORK
 *> \verbatim
+*>          LWORK is INTEGER
 *>          The dimension of the array WORK.  LWORK >= (M+NB)*N.
 *>          If LWORK = -1, then a workspace query is assumed.
 *>          The routine only calculates the optimal size of the WORK
@@ -156,7 +155,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup singleOTHERcomputational
+*> \ingroup ungtsqr
 *
 *> \par Contributors:
 *  ==================
@@ -195,11 +194,15 @@ SUBROUTINE SORGTSQR( M, N, MB, NB, A, LDA, T, LDT, WORK, LWORK,
       LOGICAL            LQUERY
       INTEGER            IINFO, LDC, LWORKOPT, LC, LW, NBLOCAL, J
 *     ..
+*     .. External Functions ..
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
+*     ..
 *     .. External Subroutines ..
       EXTERNAL           SCOPY, SLAMTSQR, SLASET, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          REAL, MAX, MIN
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
@@ -256,14 +259,14 @@ SUBROUTINE SORGTSQR( M, N, MB, NB, A, LDA, T, LDT, WORK, LWORK,
          CALL XERBLA( 'SORGTSQR', -INFO )
          RETURN
       ELSE IF ( LQUERY ) THEN
-         WORK( 1 ) = REAL( LWORKOPT )
+         WORK( 1 ) = SROUNDUP_LWORK( LWORKOPT )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
       IF( MIN( M, N ).EQ.0 ) THEN
-         WORK( 1 ) = REAL( LWORKOPT )
+         WORK( 1 ) = SROUNDUP_LWORK( LWORKOPT )
          RETURN
       END IF
 *
@@ -296,7 +299,7 @@ SUBROUTINE SORGTSQR( M, N, MB, NB, A, LDA, T, LDT, WORK, LWORK,
          CALL SCOPY( M, WORK( (J-1)*LDC + 1 ), 1, A( 1, J ), 1 )
       END DO
 *
-      WORK( 1 ) = REAL( LWORKOPT )
+      WORK( 1 ) = SROUNDUP_LWORK( LWORKOPT )
       RETURN
 *
 *     End of SORGTSQR
diff --git a/SRC/sorgtsqr_row.f b/SRC/sorgtsqr_row.f
index d2a2150cd9..070a6c3d9a 100644
--- a/SRC/sorgtsqr_row.f
+++ b/SRC/sorgtsqr_row.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORGTSQR_ROW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorgtsqr_row.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorgtsqr_row.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,6 +142,7 @@
 *>
 *> \param[in] LWORK
 *> \verbatim
+*>          LWORK is INTEGER
 *>          The dimension of the array WORK.
 *>          LWORK >= NBLOCAL * MAX(NBLOCAL,(N-NBLOCAL)),
 *>          where NBLOCAL=MIN(NB,N).
@@ -169,7 +168,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup sigleOTHERcomputational
+*> \ingroup ungtsqr_row
 *
 *> \par Contributors:
 *  ==================
@@ -213,11 +212,15 @@ SUBROUTINE SORGTSQR_ROW( M, N, MB, NB, A, LDA, T, LDT, WORK,
 *     .. Local Arrays ..
       REAL               DUMMY( 1, 1 )
 *     ..
+*     .. External Functions ..
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
+*     ..
 *     .. External Subroutines ..
       EXTERNAL           SLARFB_GETT, SLASET, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          REAL, MAX, MIN
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
@@ -255,14 +258,14 @@ SUBROUTINE SORGTSQR_ROW( M, N, MB, NB, A, LDA, T, LDT, WORK,
          CALL XERBLA( 'SORGTSQR_ROW', -INFO )
          RETURN
       ELSE IF ( LQUERY ) THEN
-         WORK( 1 ) = REAL( LWORKOPT )
+         WORK( 1 ) = SROUNDUP_LWORK( LWORKOPT )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
       IF( MIN( M, N ).EQ.0 ) THEN
-         WORK( 1 ) = REAL( LWORKOPT )
+         WORK( 1 ) = SROUNDUP_LWORK( LWORKOPT )
          RETURN
       END IF
 *
@@ -371,7 +374,7 @@ SUBROUTINE SORGTSQR_ROW( M, N, MB, NB, A, LDA, T, LDT, WORK,
 *
       END DO
 *
-      WORK( 1 ) = REAL( LWORKOPT )
+      WORK( 1 ) = SROUNDUP_LWORK( LWORKOPT )
       RETURN
 *
 *     End of SORGTSQR_ROW
diff --git a/SRC/sorhr_col.f b/SRC/sorhr_col.f
index c4e47b84c8..d998f3c850 100644
--- a/SRC/sorhr_col.f
+++ b/SRC/sorhr_col.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORHR_COL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorhr_col.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorhr_col.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -241,7 +239,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup singleOTHERcomputational
+*> \ingroup unhr_col
 *
 *> \par Contributors:
 *  ==================
@@ -280,7 +278,8 @@ SUBROUTINE SORHR_COL( M, N, NB, A, LDA, T, LDT, D, INFO )
      $                   NPLUSONE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLAORHR_COL_GETRFNP, SSCAL, STRSM,
+      EXTERNAL           SCOPY, SLAORHR_COL_GETRFNP, SSCAL,
+     $                   STRSM,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -419,7 +418,7 @@ SUBROUTINE SORHR_COL( M, N, NB, A, LDA, T, LDT, D, INFO )
 *
          JBTEMP2 = JB - 2
          DO J = JB, JB+JNB-2
-            DO I = J-JBTEMP2, NB
+            DO I = J-JBTEMP2, MIN( NB, N )
                T( I, J ) = ZERO
             END DO
          END DO
diff --git a/SRC/sorm22.f b/SRC/sorm22.f
index 15096870a0..55347c3771 100644
--- a/SRC/sorm22.f
+++ b/SRC/sorm22.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORM22 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorm22.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorm22.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -155,7 +153,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unm22
 *
 *  =====================================================================
       SUBROUTINE SORM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
@@ -187,13 +185,14 @@ SUBROUTINE SORM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SGEMM, SLACPY, STRMM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          REAL, MAX, MIN
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
@@ -216,7 +215,8 @@ SUBROUTINE SORM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
       IF( N1.EQ.0 .OR. N2.EQ.0 ) NW = 1
       IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.LSAME( TRANS, 'T' ) )
+      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND.
+     $         .NOT.LSAME( TRANS, 'T' ) )
      $          THEN
          INFO = -2
       ELSE IF( M.LT.0 ) THEN
@@ -237,7 +237,7 @@ SUBROUTINE SORM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *
       IF( INFO.EQ.0 ) THEN
          LWKOPT = M*N
-         WORK( 1 ) = REAL( LWKOPT )
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -282,13 +282,15 @@ SUBROUTINE SORM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *
                CALL SLACPY( 'All', N1, LEN, C( N2+1, I ), LDC, WORK,
      $                      LDWORK )
-               CALL STRMM( 'Left', 'Lower', 'No Transpose', 'Non-Unit',
+               CALL STRMM( 'Left', 'Lower', 'No Transpose',
+     $                     'Non-Unit',
      $                     N1, LEN, ONE, Q( 1, N2+1 ), LDQ, WORK,
      $                     LDWORK )
 *
 *              Multiply top part of C by Q11.
 *
-               CALL SGEMM( 'No Transpose', 'No Transpose', N1, LEN, N2,
+               CALL SGEMM( 'No Transpose', 'No Transpose', N1, LEN,
+     $                     N2,
      $                     ONE, Q, LDQ, C( 1, I ), LDC, ONE, WORK,
      $                     LDWORK )
 *
@@ -296,13 +298,15 @@ SUBROUTINE SORM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *
                CALL SLACPY( 'All', N2, LEN, C( 1, I ), LDC,
      $                      WORK( N1+1 ), LDWORK )
-               CALL STRMM( 'Left', 'Upper', 'No Transpose', 'Non-Unit',
+               CALL STRMM( 'Left', 'Upper', 'No Transpose',
+     $                     'Non-Unit',
      $                     N2, LEN, ONE, Q( N1+1, 1 ), LDQ,
      $                     WORK( N1+1 ), LDWORK )
 *
 *              Multiply bottom part of C by Q22.
 *
-               CALL SGEMM( 'No Transpose', 'No Transpose', N2, LEN, N1,
+               CALL SGEMM( 'No Transpose', 'No Transpose', N2, LEN,
+     $                     N1,
      $                     ONE, Q( N1+1, N2+1 ), LDQ, C( N2+1, I ), LDC,
      $                     ONE, WORK( N1+1 ), LDWORK )
 *
@@ -360,13 +364,15 @@ SUBROUTINE SORM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *
                CALL SLACPY( 'All', LEN, N2, C( I, N1+1 ), LDC, WORK,
      $                      LDWORK )
-               CALL STRMM( 'Right', 'Upper', 'No Transpose', 'Non-Unit',
+               CALL STRMM( 'Right', 'Upper', 'No Transpose',
+     $                     'Non-Unit',
      $                     LEN, N2, ONE, Q( N1+1, 1 ), LDQ, WORK,
      $                     LDWORK )
 *
 *              Multiply left part of C by Q11.
 *
-               CALL SGEMM( 'No Transpose', 'No Transpose', LEN, N2, N1,
+               CALL SGEMM( 'No Transpose', 'No Transpose', LEN, N2,
+     $                     N1,
      $                     ONE, C( I, 1 ), LDC, Q, LDQ, ONE, WORK,
      $                     LDWORK )
 *
@@ -374,13 +380,15 @@ SUBROUTINE SORM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *
                CALL SLACPY( 'All', LEN, N1, C( I, 1 ), LDC,
      $                      WORK( 1 + N2*LDWORK ), LDWORK )
-               CALL STRMM( 'Right', 'Lower', 'No Transpose', 'Non-Unit',
+               CALL STRMM( 'Right', 'Lower', 'No Transpose',
+     $                     'Non-Unit',
      $                     LEN, N1, ONE, Q( 1, N2+1 ), LDQ,
      $                     WORK( 1 + N2*LDWORK ), LDWORK )
 *
 *              Multiply right part of C by Q22.
 *
-               CALL SGEMM( 'No Transpose', 'No Transpose', LEN, N1, N2,
+               CALL SGEMM( 'No Transpose', 'No Transpose', LEN, N1,
+     $                     N2,
      $                     ONE, C( I, N1+1 ), LDC, Q( N1+1, N2+1 ), LDQ,
      $                     ONE, WORK( 1 + N2*LDWORK ), LDWORK )
 *
@@ -430,7 +438,7 @@ SUBROUTINE SORM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
          END IF
       END IF
 *
-      WORK( 1 ) = REAL( LWKOPT )
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       RETURN
 *
 *     End of SORM22
diff --git a/SRC/sorm2l.f b/SRC/sorm2l.f
index 2f6e3abbc3..6de9c5d8e2 100644
--- a/SRC/sorm2l.f
+++ b/SRC/sorm2l.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORM2L + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorm2l.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorm2l.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,11 +149,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unm2l
 *
 *  =====================================================================
       SUBROUTINE SORM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,21 +170,16 @@ SUBROUTINE SORM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      REAL               ONE
-      PARAMETER          ( ONE = 1.0E+0 )
-*     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, NOTRAN
       INTEGER            I, I1, I2, I3, MI, NI, NQ
-      REAL               AII
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, XERBLA
+      EXTERNAL           SLARF1L, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -262,11 +256,8 @@ SUBROUTINE SORM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Apply H(i)
 *
-         AII = A( NQ-K+I, I )
-         A( NQ-K+I, I ) = ONE
-         CALL SLARF( SIDE, MI, NI, A( 1, I ), 1, TAU( I ), C, LDC,
+         CALL SLARF1L( SIDE, MI, NI, A( 1, I ), 1, TAU( I ), C, LDC,
      $               WORK )
-         A( NQ-K+I, I ) = AII
    10 CONTINUE
       RETURN
 *
diff --git a/SRC/sorm2r.f b/SRC/sorm2r.f
index 0e0747a005..b1fd6263f6 100644
--- a/SRC/sorm2r.f
+++ b/SRC/sorm2r.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORM2R + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorm2r.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorm2r.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,11 +149,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unm2r
 *
 *  =====================================================================
       SUBROUTINE SORM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,21 +170,16 @@ SUBROUTINE SORM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      REAL               ONE
-      PARAMETER          ( ONE = 1.0E+0 )
-*     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, NOTRAN
       INTEGER            I, I1, I2, I3, IC, JC, MI, NI, NQ
-      REAL               AII
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, XERBLA
+      EXTERNAL           SLARF1F, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -266,11 +260,8 @@ SUBROUTINE SORM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Apply H(i)
 *
-         AII = A( I, I )
-         A( I, I ) = ONE
-         CALL SLARF( SIDE, MI, NI, A( I, I ), 1, TAU( I ), C( IC, JC ),
-     $               LDC, WORK )
-         A( I, I ) = AII
+         CALL SLARF1F( SIDE, MI, NI, A( I, I ), 1, TAU( I ), C( IC,
+     $               JC ), LDC, WORK )
    10 CONTINUE
       RETURN
 *
diff --git a/SRC/sormbr.f b/SRC/sormbr.f
index efe5be41a8..e8b73c18db 100644
--- a/SRC/sormbr.f
+++ b/SRC/sormbr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORMBR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sormbr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sormbr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -188,11 +186,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unmbr
 *
 *  =====================================================================
       SUBROUTINE SORMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
      $                   LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -217,7 +216,8 @@ SUBROUTINE SORMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           ILAENV, LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SORMLQ, SORMQR, XERBLA
@@ -285,7 +285,7 @@ SUBROUTINE SORMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
             END IF
          END IF
          LWKOPT = NW*NB
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -326,7 +326,8 @@ SUBROUTINE SORMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
                I1 = 1
                I2 = 2
             END IF
-            CALL SORMQR( SIDE, TRANS, MI, NI, NQ-1, A( 2, 1 ), LDA, TAU,
+            CALL SORMQR( SIDE, TRANS, MI, NI, NQ-1, A( 2, 1 ), LDA,
+     $                   TAU,
      $                   C( I1, I2 ), LDC, WORK, LWORK, IINFO )
          END IF
       ELSE
@@ -363,7 +364,7 @@ SUBROUTINE SORMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
      $                   TAU, C( I1, I2 ), LDC, WORK, LWORK, IINFO )
          END IF
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of SORMBR
diff --git a/SRC/sormhr.f b/SRC/sormhr.f
index 2d2053af4c..b9642bc762 100644
--- a/SRC/sormhr.f
+++ b/SRC/sormhr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORMHR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sormhr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sormhr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -171,11 +169,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unmhr
 *
 *  =====================================================================
       SUBROUTINE SORMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
      $                   LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -199,7 +198,8 @@ SUBROUTINE SORMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           ILAENV, LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SORMQR, XERBLA
@@ -227,7 +227,8 @@ SUBROUTINE SORMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
       END IF
       IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.LSAME( TRANS, 'T' ) )
+      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND.
+     $         .NOT.LSAME( TRANS, 'T' ) )
      $          THEN
          INFO = -2
       ELSE IF( M.LT.0 ) THEN
@@ -253,7 +254,7 @@ SUBROUTINE SORMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
             NB = ILAENV( 1, 'SORMQR', SIDE // TRANS, M, NH, NH, -1 )
          END IF
          LWKOPT = NW*NB
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -285,7 +286,7 @@ SUBROUTINE SORMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
       CALL SORMQR( SIDE, TRANS, MI, NI, NH, A( ILO+1, ILO ), LDA,
      $             TAU( ILO ), C( I1, I2 ), LDC, WORK, LWORK, IINFO )
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of SORMHR
diff --git a/SRC/sorml2.f b/SRC/sorml2.f
index c5705c799e..0f79de7df1 100644
--- a/SRC/sorml2.f
+++ b/SRC/sorml2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORML2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sorml2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sorml2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,11 +149,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unml2
 *
 *  =====================================================================
       SUBROUTINE SORML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,21 +170,16 @@ SUBROUTINE SORML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      REAL               ONE
-      PARAMETER          ( ONE = 1.0E+0 )
-*     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, NOTRAN
       INTEGER            I, I1, I2, I3, IC, JC, MI, NI, NQ
-      REAL               AII
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, XERBLA
+      EXTERNAL           SLARF1F, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -266,11 +260,8 @@ SUBROUTINE SORML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Apply H(i)
 *
-         AII = A( I, I )
-         A( I, I ) = ONE
-         CALL SLARF( SIDE, MI, NI, A( I, I ), LDA, TAU( I ),
-     $               C( IC, JC ), LDC, WORK )
-         A( I, I ) = AII
+         CALL SLARF1F( SIDE, MI, NI, A( I, I ), LDA, TAU( I ),
+     $                 C( IC, JC ), LDC, WORK )
    10 CONTINUE
       RETURN
 *
diff --git a/SRC/sormlq.f b/SRC/sormlq.f
index ee996e5602..fa3972189d 100644
--- a/SRC/sormlq.f
+++ b/SRC/sormlq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORMLQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sormlq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sormlq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,11 +158,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unmlq
 *
 *  =====================================================================
       SUBROUTINE SORMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -195,7 +194,8 @@ SUBROUTINE SORMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SLARFB, SLARFT, SORML2, XERBLA
@@ -243,10 +243,11 @@ SUBROUTINE SORMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Compute the workspace requirements
 *
-         NB = MIN( NBMAX, ILAENV( 1, 'SORMLQ', SIDE // TRANS, M, N, K,
+         NB = MIN( NBMAX, ILAENV( 1, 'SORMLQ', SIDE // TRANS, M, N,
+     $             K,
      $             -1 ) )
          LWKOPT = NW*NB + TSIZE
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -268,7 +269,8 @@ SUBROUTINE SORMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'SORMLQ', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'SORMLQ', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -277,7 +279,8 @@ SUBROUTINE SORMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Use unblocked code
 *
-         CALL SORML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+         CALL SORML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                WORK,
      $                IINFO )
       ELSE
 *
@@ -333,12 +336,13 @@ SUBROUTINE SORMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *           Apply H or H**T
 *
-            CALL SLARFB( SIDE, TRANST, 'Forward', 'Rowwise', MI, NI, IB,
+            CALL SLARFB( SIDE, TRANST, 'Forward', 'Rowwise', MI, NI,
+     $                   IB,
      $                   A( I, I ), LDA, WORK( IWT ), LDT,
      $                   C( IC, JC ), LDC, WORK, LDWORK )
    10    CONTINUE
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of SORMLQ
diff --git a/SRC/sormql.f b/SRC/sormql.f
index 72a8d22eea..c831e02422 100644
--- a/SRC/sormql.f
+++ b/SRC/sormql.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORMQL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sormql.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sormql.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,11 +158,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unmql
 *
 *  =====================================================================
       SUBROUTINE SORMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -194,7 +193,8 @@ SUBROUTINE SORMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SLARFB, SLARFT, SORM2L, XERBLA
@@ -245,11 +245,12 @@ SUBROUTINE SORMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
          IF( M.EQ.0 .OR. N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            NB = MIN( NBMAX, ILAENV( 1, 'SORMQL', SIDE // TRANS, M, N,
+            NB = MIN( NBMAX, ILAENV( 1, 'SORMQL', SIDE // TRANS, M,
+     $                N,
      $                               K, -1 ) )
             LWKOPT = NW*NB + TSIZE
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -270,7 +271,8 @@ SUBROUTINE SORMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'SORMQL', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'SORMQL', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -279,7 +281,8 @@ SUBROUTINE SORMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Use unblocked code
 *
-         CALL SORM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+         CALL SORM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                WORK,
      $                IINFO )
       ELSE
 *
@@ -325,12 +328,13 @@ SUBROUTINE SORMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *           Apply H or H**T
 *
-            CALL SLARFB( SIDE, TRANS, 'Backward', 'Columnwise', MI, NI,
+            CALL SLARFB( SIDE, TRANS, 'Backward', 'Columnwise', MI,
+     $                   NI,
      $                   IB, A( 1, I ), LDA, WORK( IWT ), LDT, C, LDC,
      $                   WORK, LDWORK )
    10    CONTINUE
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of SORMQL
diff --git a/SRC/sormqr.f b/SRC/sormqr.f
index 5d4256f09c..0a5d20723e 100644
--- a/SRC/sormqr.f
+++ b/SRC/sormqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORMQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sormqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sormqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,11 +158,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unmqr
 *
 *  =====================================================================
       SUBROUTINE SORMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -194,7 +193,8 @@ SUBROUTINE SORMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SLARFB, SLARFT, SORM2R, XERBLA
@@ -242,10 +242,11 @@ SUBROUTINE SORMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Compute the workspace requirements
 *
-         NB = MIN( NBMAX, ILAENV( 1, 'SORMQR', SIDE // TRANS, M, N, K,
+         NB = MIN( NBMAX, ILAENV( 1, 'SORMQR', SIDE // TRANS, M, N,
+     $             K,
      $        -1 ) )
          LWKOPT = NW*NB + TSIZE
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -267,7 +268,8 @@ SUBROUTINE SORMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'SORMQR', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'SORMQR', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -276,7 +278,8 @@ SUBROUTINE SORMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Use unblocked code
 *
-         CALL SORM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+         CALL SORM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                WORK,
      $                IINFO )
       ELSE
 *
@@ -308,7 +311,8 @@ SUBROUTINE SORMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *           Form the triangular factor of the block reflector
 *           H = H(i) H(i+1) . . . H(i+ib-1)
 *
-            CALL SLARFT( 'Forward', 'Columnwise', NQ-I+1, IB, A( I, I ),
+            CALL SLARFT( 'Forward', 'Columnwise', NQ-I+1, IB, A( I,
+     $                   I ),
      $                   LDA, TAU( I ), WORK( IWT ), LDT )
             IF( LEFT ) THEN
 *
@@ -326,12 +330,13 @@ SUBROUTINE SORMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *           Apply H or H**T
 *
-            CALL SLARFB( SIDE, TRANS, 'Forward', 'Columnwise', MI, NI,
+            CALL SLARFB( SIDE, TRANS, 'Forward', 'Columnwise', MI,
+     $                   NI,
      $                   IB, A( I, I ), LDA, WORK( IWT ), LDT,
      $                   C( IC, JC ), LDC, WORK, LDWORK )
    10    CONTINUE
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of SORMQR
diff --git a/SRC/sormr2.f b/SRC/sormr2.f
index cefe1d3092..c170f63c77 100644
--- a/SRC/sormr2.f
+++ b/SRC/sormr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORMR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sormr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sormr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,11 +149,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unmr2
 *
 *  =====================================================================
       SUBROUTINE SORMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,21 +170,16 @@ SUBROUTINE SORMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      REAL               ONE
-      PARAMETER          ( ONE = 1.0E+0 )
-*     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, NOTRAN
       INTEGER            I, I1, I2, I3, MI, NI, NQ
-      REAL               AII
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARF, XERBLA
+      EXTERNAL           SLARF1L, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -262,11 +256,8 @@ SUBROUTINE SORMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Apply H(i)
 *
-         AII = A( I, NQ-K+I )
-         A( I, NQ-K+I ) = ONE
-         CALL SLARF( SIDE, MI, NI, A( I, 1 ), LDA, TAU( I ), C, LDC,
-     $               WORK )
-         A( I, NQ-K+I ) = AII
+         CALL SLARF1L( SIDE, MI, NI, A( I, 1 ), LDA, TAU( I ), C,
+     $                 LDC, WORK )
    10 CONTINUE
       RETURN
 *
diff --git a/SRC/sormr3.f b/SRC/sormr3.f
index 18d66e3238..2c37689fbf 100644
--- a/SRC/sormr3.f
+++ b/SRC/sormr3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORMR3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sormr3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sormr3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -159,7 +157,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unmr3
 *
 *> \par Contributors:
 *  ==================
@@ -173,8 +171,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SORMR3( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
+      SUBROUTINE SORMR3( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C,
+     $                   LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sormrq.f b/SRC/sormrq.f
index 62fcdacdb9..530f9cc864 100644
--- a/SRC/sormrq.f
+++ b/SRC/sormrq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORMRQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sormrq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sormrq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,11 +158,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unmrq
 *
 *  =====================================================================
       SUBROUTINE SORMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -195,7 +194,8 @@ SUBROUTINE SORMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SLARFB, SLARFT, SORMR2, XERBLA
@@ -246,11 +246,12 @@ SUBROUTINE SORMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
          IF( M.EQ.0 .OR. N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            NB = MIN( NBMAX, ILAENV( 1, 'SORMRQ', SIDE // TRANS, M, N,
+            NB = MIN( NBMAX, ILAENV( 1, 'SORMRQ', SIDE // TRANS, M,
+     $                N,
      $                               K, -1 ) )
             LWKOPT = NW*NB + TSIZE
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -271,7 +272,8 @@ SUBROUTINE SORMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'SORMRQ', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'SORMRQ', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -280,7 +282,8 @@ SUBROUTINE SORMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Use unblocked code
 *
-         CALL SORMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+         CALL SORMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                WORK,
      $                IINFO )
       ELSE
 *
@@ -337,7 +340,7 @@ SUBROUTINE SORMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LDWORK )
    10    CONTINUE
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of SORMRQ
diff --git a/SRC/sormrz.f b/SRC/sormrz.f
index cdadd62b51..d8d35bef42 100644
--- a/SRC/sormrz.f
+++ b/SRC/sormrz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORMRZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sormrz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sormrz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -168,7 +166,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unmrz
 *
 *> \par Contributors:
 *  ==================
@@ -182,8 +180,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SORMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
+      SUBROUTINE SORMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C,
+     $                   LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -213,7 +213,8 @@ SUBROUTINE SORMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SLARZB, SLARZT, SORMR3, XERBLA
@@ -267,11 +268,12 @@ SUBROUTINE SORMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
          IF( M.EQ.0 .OR. N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            NB = MIN( NBMAX, ILAENV( 1, 'SORMRQ', SIDE // TRANS, M, N,
+            NB = MIN( NBMAX, ILAENV( 1, 'SORMRQ', SIDE // TRANS, M,
+     $                N,
      $                               K, -1 ) )
             LWKOPT = NW*NB + TSIZE
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -292,7 +294,8 @@ SUBROUTINE SORMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'SORMRQ', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'SORMRQ', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -341,7 +344,8 @@ SUBROUTINE SORMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
 *           Form the triangular factor of the block reflector
 *           H = H(i+ib-1) . . . H(i+1) H(i)
 *
-            CALL SLARZT( 'Backward', 'Rowwise', L, IB, A( I, JA ), LDA,
+            CALL SLARZT( 'Backward', 'Rowwise', L, IB, A( I, JA ),
+     $                   LDA,
      $                   TAU( I ), WORK( IWT ), LDT )
 *
             IF( LEFT ) THEN
@@ -367,7 +371,7 @@ SUBROUTINE SORMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/sormtr.f b/SRC/sormtr.f
index 3ba749fee6..42c6e3dab7 100644
--- a/SRC/sormtr.f
+++ b/SRC/sormtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SORMTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sormtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sormtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -164,11 +162,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup unmtr
 *
 *  =====================================================================
-      SUBROUTINE SORMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
+      SUBROUTINE SORMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C,
+     $                   LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -192,7 +192,8 @@ SUBROUTINE SORMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           ILAENV, LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SORMQL, SORMQR, XERBLA
@@ -222,7 +223,8 @@ SUBROUTINE SORMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
          INFO = -1
       ELSE IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.LSAME( TRANS, 'T' ) )
+      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND.
+     $         .NOT.LSAME( TRANS, 'T' ) )
      $          THEN
          INFO = -3
       ELSE IF( M.LT.0 ) THEN
@@ -256,7 +258,7 @@ SUBROUTINE SORMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
             END IF
          END IF
          LWKOPT = NW*NB
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -285,7 +287,8 @@ SUBROUTINE SORMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
 *
 *        Q was determined by a call to SSYTRD with UPLO = 'U'
 *
-         CALL SORMQL( SIDE, TRANS, MI, NI, NQ-1, A( 1, 2 ), LDA, TAU, C,
+         CALL SORMQL( SIDE, TRANS, MI, NI, NQ-1, A( 1, 2 ), LDA, TAU,
+     $                C,
      $                LDC, WORK, LWORK, IINFO )
       ELSE
 *
@@ -301,7 +304,7 @@ SUBROUTINE SORMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
          CALL SORMQR( SIDE, TRANS, MI, NI, NQ-1, A( 2, 1 ), LDA, TAU,
      $                C( I1, I2 ), LDC, WORK, LWORK, IINFO )
       END IF
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of SORMTR
diff --git a/SRC/spbcon.f b/SRC/spbcon.f
index 84c97b1cbc..8ca1f75170 100644
--- a/SRC/spbcon.f
+++ b/SRC/spbcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPBCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spbcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spbcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -124,11 +122,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup pbcon
 *
 *  =====================================================================
       SUBROUTINE SPBCON( UPLO, N, KD, AB, LDAB, ANORM, RCOND, WORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,14 +222,16 @@ SUBROUTINE SPBCON( UPLO, N, KD, AB, LDAB, ANORM, RCOND, WORK,
 *
 *           Multiply by inv(U).
 *
-            CALL SLATBS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL SLATBS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   KD, AB, LDAB, WORK, SCALEU, WORK( 2*N+1 ),
      $                   INFO )
          ELSE
 *
 *           Multiply by inv(L).
 *
-            CALL SLATBS( 'Lower', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL SLATBS( 'Lower', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   KD, AB, LDAB, WORK, SCALEL, WORK( 2*N+1 ),
      $                   INFO )
             NORMIN = 'Y'
diff --git a/SRC/spbequ.f b/SRC/spbequ.f
index df2c3a19c6..9ae4165088 100644
--- a/SRC/spbequ.f
+++ b/SRC/spbequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPBEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spbequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spbequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,10 +120,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup pbequ
 *
 *  =====================================================================
-      SUBROUTINE SPBEQU( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX, INFO )
+      SUBROUTINE SPBEQU( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/spbrfs.f b/SRC/spbrfs.f
index f13aaee016..ea52ebea90 100644
--- a/SRC/spbrfs.f
+++ b/SRC/spbrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPBRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spbrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spbrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -181,11 +179,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup pbrfs
 *
 *  =====================================================================
       SUBROUTINE SPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
      $                   LDB, X, LDX, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -224,7 +223,8 @@ SUBROUTINE SPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SLACN2, SPBTRS, SSBMV, XERBLA
+      EXTERNAL           SAXPY, SCOPY, SLACN2, SPBTRS, SSBMV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN
@@ -277,7 +277,7 @@ SUBROUTINE SPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
       NZ = MIN( N+1, 2*KD+2 )
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -389,22 +389,25 @@ SUBROUTINE SPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
 *
          DO 90 I = 1, N
             IF( WORK( I ).GT.SAFE2 ) THEN
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I )
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
             ELSE
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I ) + SAFE1
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
+     $                     + SAFE1
             END IF
    90    CONTINUE
 *
          KASE = 0
   100    CONTINUE
-         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
 *
 *              Multiply by diag(W)*inv(A**T).
 *
-               CALL SPBTRS( UPLO, N, KD, 1, AFB, LDAFB, WORK( N+1 ), N,
+               CALL SPBTRS( UPLO, N, KD, 1, AFB, LDAFB, WORK( N+1 ),
+     $                      N,
      $                      INFO )
                DO 110 I = 1, N
                   WORK( N+I ) = WORK( N+I )*WORK( I )
@@ -416,7 +419,8 @@ SUBROUTINE SPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
                DO 120 I = 1, N
                   WORK( N+I ) = WORK( N+I )*WORK( I )
   120          CONTINUE
-               CALL SPBTRS( UPLO, N, KD, 1, AFB, LDAFB, WORK( N+1 ), N,
+               CALL SPBTRS( UPLO, N, KD, 1, AFB, LDAFB, WORK( N+1 ),
+     $                      N,
      $                      INFO )
             END IF
             GO TO 100
diff --git a/SRC/spbstf.f b/SRC/spbstf.f
index 909c165f3c..30daa27fa2 100644
--- a/SRC/spbstf.f
+++ b/SRC/spbstf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPBSTF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spbstf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spbstf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -110,7 +108,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup pbstf
 *
 *> \par Further Details:
 *  =====================
@@ -149,6 +147,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SPBSTF( UPLO, N, KD, AB, LDAB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/spbsv.f b/SRC/spbsv.f
index 2d084424e6..c66cbbc0b8 100644
--- a/SRC/spbsv.f
+++ b/SRC/spbsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPBSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spbsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spbsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,9 +117,9 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i of A is not
-*>                positive definite, so the factorization could not be
-*>                completed, and the solution has not been computed.
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                of A is not positive, so the factorization could not
+*>                be completed, and the solution has not been computed.
 *> \endverbatim
 *
 *  Authors:
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERsolve
+*> \ingroup pbsv
 *
 *> \par Further Details:
 *  =====================
@@ -161,6 +159,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SPBSV( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -191,7 +190,8 @@ SUBROUTINE SPBSV( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/spbsvx.f b/SRC/spbsvx.f
index 27907eb854..08dcb93740 100644
--- a/SRC/spbsvx.f
+++ b/SRC/spbsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPBSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spbsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spbsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -71,7 +69,7 @@
 *>    where U is an upper triangular band matrix, and L is a lower
 *>    triangular band matrix.
 *>
-*> 3. If the leading i-by-i principal minor is not positive definite,
+*> 3. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A.  If the reciprocal of the condition number is less than machine
@@ -281,10 +279,10 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO = i, and i is
-*>                <= N:  the leading minor of order i of A is
-*>                       not positive definite, so the factorization
-*>                       could not be completed, and the solution has not
-*>                       been computed. RCOND = 0 is returned.
+*>                <= N:  the leading principal minor of order i of A
+*>                       is not positive, so the factorization could not
+*>                       be completed, and the solution has not been
+*>                       computed. RCOND = 0 is returned.
 *>                = N+1: U is nonsingular, but RCOND is less than machine
 *>                       precision, meaning that the matrix is singular
 *>                       to working precision.  Nevertheless, the
@@ -302,7 +300,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERsolve
+*> \ingroup pbsvx
 *
 *> \par Further Details:
 *  =====================
@@ -337,9 +335,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
+      SUBROUTINE SPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB,
+     $                   LDAFB,
      $                   EQUED, S, B, LDB, X, LDX, RCOND, FERR, BERR,
      $                   WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -374,7 +374,8 @@ SUBROUTINE SPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
       EXTERNAL           LSAME, SLAMCH, SLANSB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLACPY, SLAQSB, SPBCON, SPBEQU, SPBRFS,
+      EXTERNAL           SCOPY, SLACPY, SLAQSB, SPBCON, SPBEQU,
+     $                   SPBRFS,
      $                   SPBTRF, SPBTRS, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -397,7 +398,9 @@ SUBROUTINE SPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
       ELSE IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
@@ -454,7 +457,8 @@ SUBROUTINE SPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
 *
 *           Equilibrate the matrix.
 *
-            CALL SLAQSB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX, EQUED )
+            CALL SLAQSB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX,
+     $                   EQUED )
             RCEQU = LSAME( EQUED, 'Y' )
          END IF
       END IF
@@ -502,7 +506,8 @@ SUBROUTINE SPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL SPBCON( UPLO, N, KD, AFB, LDAFB, ANORM, RCOND, WORK, IWORK,
+      CALL SPBCON( UPLO, N, KD, AFB, LDAFB, ANORM, RCOND, WORK,
+     $             IWORK,
      $             INFO )
 *
 *     Compute the solution matrix X.
@@ -513,7 +518,8 @@ SUBROUTINE SPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
 *     Use iterative refinement to improve the computed solution and
 *     compute error bounds and backward error estimates for it.
 *
-      CALL SPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B, LDB, X,
+      CALL SPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B, LDB,
+     $             X,
      $             LDX, FERR, BERR, WORK, IWORK, INFO )
 *
 *     Transform the solution matrix X to a solution of the original
diff --git a/SRC/spbtf2.f b/SRC/spbtf2.f
index ff08bc3272..2dffd522f8 100644
--- a/SRC/spbtf2.f
+++ b/SRC/spbtf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPBTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spbtf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spbtf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,8 +95,8 @@
 *>          INFO is INTEGER
 *>          = 0: successful exit
 *>          < 0: if INFO = -k, the k-th argument had an illegal value
-*>          > 0: if INFO = k, the leading minor of order k is not
-*>               positive definite, and the factorization could not be
+*>          > 0: if INFO = k, the leading principal minor of order k
+*>               is not positive, and the factorization could not be
 *>               completed.
 *> \endverbatim
 *
@@ -110,7 +108,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup pbtf2
 *
 *> \par Further Details:
 *  =====================
@@ -139,6 +137,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SPBTF2( UPLO, N, KD, AB, LDAB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/spbtrf.f b/SRC/spbtrf.f
index ef5dcbb986..ed4ab9993c 100644
--- a/SRC/spbtrf.f
+++ b/SRC/spbtrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPBTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spbtrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spbtrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -92,8 +90,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *> \endverbatim
 *
@@ -105,7 +103,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup pbtrf
 *
 *> \par Further Details:
 *  =====================
@@ -139,6 +137,7 @@
 *
 *  =====================================================================
       SUBROUTINE SPBTRF( UPLO, N, KD, AB, LDAB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,7 +171,8 @@ SUBROUTINE SPBTRF( UPLO, N, KD, AB, LDAB, INFO )
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMM, SPBTF2, SPOTF2, SSYRK, STRSM, XERBLA
+      EXTERNAL           SGEMM, SPBTF2, SPOTF2, SSYRK, STRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MIN
@@ -299,7 +299,8 @@ SUBROUTINE SPBTRF( UPLO, N, KD, AB, LDAB, INFO )
 *                    Update A23
 *
                      IF( I2.GT.0 )
-     $                  CALL SGEMM( 'Transpose', 'No Transpose', I2, I3,
+     $                  CALL SGEMM( 'Transpose', 'No Transpose', I2,
+     $                              I3,
      $                              IB, -ONE, AB( KD+1-IB, I+IB ),
      $                              LDAB-1, WORK, LDWORK, ONE,
      $                              AB( 1+IB, I+KD ), LDAB-1 )
@@ -375,7 +376,8 @@ SUBROUTINE SPBTRF( UPLO, N, KD, AB, LDAB, INFO )
 *
 *                    Update A22
 *
-                     CALL SSYRK( 'Lower', 'No Transpose', I2, IB, -ONE,
+                     CALL SSYRK( 'Lower', 'No Transpose', I2, IB,
+     $                           -ONE,
      $                           AB( 1+IB, I ), LDAB-1, ONE,
      $                           AB( 1, I+IB ), LDAB-1 )
                   END IF
@@ -399,14 +401,16 @@ SUBROUTINE SPBTRF( UPLO, N, KD, AB, LDAB, INFO )
 *                    Update A32
 *
                      IF( I2.GT.0 )
-     $                  CALL SGEMM( 'No transpose', 'Transpose', I3, I2,
+     $                  CALL SGEMM( 'No transpose', 'Transpose', I3,
+     $                              I2,
      $                              IB, -ONE, WORK, LDWORK,
      $                              AB( 1+IB, I ), LDAB-1, ONE,
      $                              AB( 1+KD-IB, I+IB ), LDAB-1 )
 *
 *                    Update A33
 *
-                     CALL SSYRK( 'Lower', 'No Transpose', I3, IB, -ONE,
+                     CALL SSYRK( 'Lower', 'No Transpose', I3, IB,
+     $                           -ONE,
      $                           WORK, LDWORK, ONE, AB( 1, I+KD ),
      $                           LDAB-1 )
 *
diff --git a/SRC/spbtrs.f b/SRC/spbtrs.f
index bc33819569..5350859a27 100644
--- a/SRC/spbtrs.f
+++ b/SRC/spbtrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPBTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spbtrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spbtrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -114,10 +112,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup pbtrs
 *
 *  =====================================================================
       SUBROUTINE SPBTRS( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -189,7 +188,8 @@ SUBROUTINE SPBTRS( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
 *
 *           Solve U*X = B, overwriting B with X.
 *
-            CALL STBSV( 'Upper', 'No transpose', 'Non-unit', N, KD, AB,
+            CALL STBSV( 'Upper', 'No transpose', 'Non-unit', N, KD,
+     $                  AB,
      $                  LDAB, B( 1, J ), 1 )
    10    CONTINUE
       ELSE
@@ -200,7 +200,8 @@ SUBROUTINE SPBTRS( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
 *
 *           Solve L*X = B, overwriting B with X.
 *
-            CALL STBSV( 'Lower', 'No transpose', 'Non-unit', N, KD, AB,
+            CALL STBSV( 'Lower', 'No transpose', 'Non-unit', N, KD,
+     $                  AB,
      $                  LDAB, B( 1, J ), 1 )
 *
 *           Solve L**T *X = B, overwriting B with X.
diff --git a/SRC/spftrf.f b/SRC/spftrf.f
index 9e2c11eeae..125ffadd11 100644
--- a/SRC/spftrf.f
+++ b/SRC/spftrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPFTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spftrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spftrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -91,8 +89,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *> \endverbatim
 *
@@ -104,7 +102,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup pftrf
 *
 *> \par Further Details:
 *  =====================
@@ -195,6 +193,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SPFTRF( TRANSR, UPLO, N, A, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -290,7 +289,8 @@ SUBROUTINE SPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL SPOTRF( 'L', N1, A( 0 ), N, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL STRSM( 'R', 'L', 'T', 'N', N2, N1, ONE, A( 0 ), N,
+               CALL STRSM( 'R', 'L', 'T', 'N', N2, N1, ONE, A( 0 ),
+     $                     N,
      $                     A( N1 ), N )
                CALL SSYRK( 'U', 'N', N2, N1, -ONE, A( N1 ), N, ONE,
      $                     A( N ), N )
@@ -307,7 +307,8 @@ SUBROUTINE SPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL SPOTRF( 'L', N1, A( N2 ), N, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL STRSM( 'L', 'L', 'N', 'N', N1, N2, ONE, A( N2 ), N,
+               CALL STRSM( 'L', 'L', 'N', 'N', N1, N2, ONE, A( N2 ),
+     $                     N,
      $                     A( 0 ), N )
                CALL SSYRK( 'U', 'T', N2, N1, -ONE, A( 0 ), N, ONE,
      $                     A( N1 ), N )
@@ -330,9 +331,11 @@ SUBROUTINE SPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL SPOTRF( 'U', N1, A( 0 ), N1, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL STRSM( 'L', 'U', 'T', 'N', N1, N2, ONE, A( 0 ), N1,
+               CALL STRSM( 'L', 'U', 'T', 'N', N1, N2, ONE, A( 0 ),
+     $                     N1,
      $                     A( N1*N1 ), N1 )
-               CALL SSYRK( 'L', 'T', N2, N1, -ONE, A( N1*N1 ), N1, ONE,
+               CALL SSYRK( 'L', 'T', N2, N1, -ONE, A( N1*N1 ), N1,
+     $                     ONE,
      $                     A( 1 ), N1 )
                CALL SPOTRF( 'L', N2, A( 1 ), N1, INFO )
                IF( INFO.GT.0 )
@@ -347,7 +350,8 @@ SUBROUTINE SPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL SPOTRF( 'U', N1, A( N2*N2 ), N2, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL STRSM( 'R', 'U', 'N', 'N', N2, N1, ONE, A( N2*N2 ),
+               CALL STRSM( 'R', 'U', 'N', 'N', N2, N1, ONE,
+     $                     A( N2*N2 ),
      $                     N2, A( 0 ), N2 )
                CALL SSYRK( 'L', 'N', N2, N1, -ONE, A( 0 ), N2, ONE,
      $                     A( N1*N2 ), N2 )
@@ -376,7 +380,8 @@ SUBROUTINE SPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL SPOTRF( 'L', K, A( 1 ), N+1, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL STRSM( 'R', 'L', 'T', 'N', K, K, ONE, A( 1 ), N+1,
+               CALL STRSM( 'R', 'L', 'T', 'N', K, K, ONE, A( 1 ),
+     $                     N+1,
      $                     A( K+1 ), N+1 )
                CALL SSYRK( 'U', 'N', K, K, -ONE, A( K+1 ), N+1, ONE,
      $                     A( 0 ), N+1 )
@@ -418,7 +423,8 @@ SUBROUTINE SPFTRF( TRANSR, UPLO, N, A, INFO )
      $            RETURN
                CALL STRSM( 'L', 'U', 'T', 'N', K, K, ONE, A( K ), N1,
      $                     A( K*( K+1 ) ), K )
-               CALL SSYRK( 'L', 'T', K, K, -ONE, A( K*( K+1 ) ), K, ONE,
+               CALL SSYRK( 'L', 'T', K, K, -ONE, A( K*( K+1 ) ), K,
+     $                     ONE,
      $                     A( 0 ), K )
                CALL SPOTRF( 'L', K, A( 0 ), K, INFO )
                IF( INFO.GT.0 )
diff --git a/SRC/spftri.f b/SRC/spftri.f
index 4e82bb183e..6cdae73cb0 100644
--- a/SRC/spftri.f
+++ b/SRC/spftri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPFTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spftri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spftri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,7 +95,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup pftri
 *
 *> \par Further Details:
 *  =====================
@@ -188,6 +186,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SPFTRI( TRANSR, UPLO, N, A, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -215,7 +214,8 @@ SUBROUTINE SPFTRI( TRANSR, UPLO, N, A, INFO )
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, STFTRI, SLAUUM, STRMM, SSYRK
+      EXTERNAL           XERBLA, STFTRI, SLAUUM, STRMM,
+     $                   SSYRK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MOD
@@ -290,7 +290,8 @@ SUBROUTINE SPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL SLAUUM( 'L', N1, A( 0 ), N, INFO )
                CALL SSYRK( 'L', 'T', N1, N2, ONE, A( N1 ), N, ONE,
      $                     A( 0 ), N )
-               CALL STRMM( 'L', 'U', 'N', 'N', N2, N1, ONE, A( N ), N,
+               CALL STRMM( 'L', 'U', 'N', 'N', N2, N1, ONE, A( N ),
+     $                     N,
      $                     A( N1 ), N )
                CALL SLAUUM( 'U', N2, A( N ), N, INFO )
 *
@@ -303,7 +304,8 @@ SUBROUTINE SPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL SLAUUM( 'L', N1, A( N2 ), N, INFO )
                CALL SSYRK( 'L', 'N', N1, N2, ONE, A( 0 ), N, ONE,
      $                     A( N2 ), N )
-               CALL STRMM( 'R', 'U', 'T', 'N', N1, N2, ONE, A( N1 ), N,
+               CALL STRMM( 'R', 'U', 'T', 'N', N1, N2, ONE, A( N1 ),
+     $                     N,
      $                     A( 0 ), N )
                CALL SLAUUM( 'U', N2, A( N1 ), N, INFO )
 *
@@ -319,9 +321,11 @@ SUBROUTINE SPFTRI( TRANSR, UPLO, N, A, INFO )
 *              T1 -> a(0), T2 -> a(1), S -> a(0+N1*N1)
 *
                CALL SLAUUM( 'U', N1, A( 0 ), N1, INFO )
-               CALL SSYRK( 'U', 'N', N1, N2, ONE, A( N1*N1 ), N1, ONE,
+               CALL SSYRK( 'U', 'N', N1, N2, ONE, A( N1*N1 ), N1,
+     $                     ONE,
      $                     A( 0 ), N1 )
-               CALL STRMM( 'R', 'L', 'N', 'N', N1, N2, ONE, A( 1 ), N1,
+               CALL STRMM( 'R', 'L', 'N', 'N', N1, N2, ONE, A( 1 ),
+     $                     N1,
      $                     A( N1*N1 ), N1 )
                CALL SLAUUM( 'L', N2, A( 1 ), N1, INFO )
 *
@@ -333,7 +337,8 @@ SUBROUTINE SPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL SLAUUM( 'U', N1, A( N2*N2 ), N2, INFO )
                CALL SSYRK( 'U', 'T', N1, N2, ONE, A( 0 ), N2, ONE,
      $                     A( N2*N2 ), N2 )
-               CALL STRMM( 'L', 'L', 'T', 'N', N2, N1, ONE, A( N1*N2 ),
+               CALL STRMM( 'L', 'L', 'T', 'N', N2, N1, ONE,
+     $                     A( N1*N2 ),
      $                     N2, A( 0 ), N2 )
                CALL SLAUUM( 'L', N2, A( N1*N2 ), N2, INFO )
 *
@@ -358,7 +363,8 @@ SUBROUTINE SPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL SLAUUM( 'L', K, A( 1 ), N+1, INFO )
                CALL SSYRK( 'L', 'T', K, K, ONE, A( K+1 ), N+1, ONE,
      $                     A( 1 ), N+1 )
-               CALL STRMM( 'L', 'U', 'N', 'N', K, K, ONE, A( 0 ), N+1,
+               CALL STRMM( 'L', 'U', 'N', 'N', K, K, ONE, A( 0 ),
+     $                     N+1,
      $                     A( K+1 ), N+1 )
                CALL SLAUUM( 'U', K, A( 0 ), N+1, INFO )
 *
@@ -371,7 +377,8 @@ SUBROUTINE SPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL SLAUUM( 'L', K, A( K+1 ), N+1, INFO )
                CALL SSYRK( 'L', 'N', K, K, ONE, A( 0 ), N+1, ONE,
      $                     A( K+1 ), N+1 )
-               CALL STRMM( 'R', 'U', 'T', 'N', K, K, ONE, A( K ), N+1,
+               CALL STRMM( 'R', 'U', 'T', 'N', K, K, ONE, A( K ),
+     $                     N+1,
      $                     A( 0 ), N+1 )
                CALL SLAUUM( 'U', K, A( K ), N+1, INFO )
 *
@@ -388,7 +395,8 @@ SUBROUTINE SPFTRI( TRANSR, UPLO, N, A, INFO )
 *              T1 -> a(0+k), T2 -> a(0+0), S -> a(0+k*(k+1)); lda=k
 *
                CALL SLAUUM( 'U', K, A( K ), K, INFO )
-               CALL SSYRK( 'U', 'N', K, K, ONE, A( K*( K+1 ) ), K, ONE,
+               CALL SSYRK( 'U', 'N', K, K, ONE, A( K*( K+1 ) ), K,
+     $                     ONE,
      $                     A( K ), K )
                CALL STRMM( 'R', 'L', 'N', 'N', K, K, ONE, A( 0 ), K,
      $                     A( K*( K+1 ) ), K )
@@ -403,7 +411,8 @@ SUBROUTINE SPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL SLAUUM( 'U', K, A( K*( K+1 ) ), K, INFO )
                CALL SSYRK( 'U', 'T', K, K, ONE, A( 0 ), K, ONE,
      $                     A( K*( K+1 ) ), K )
-               CALL STRMM( 'L', 'L', 'T', 'N', K, K, ONE, A( K*K ), K,
+               CALL STRMM( 'L', 'L', 'T', 'N', K, K, ONE, A( K*K ),
+     $                     K,
      $                     A( 0 ), K )
                CALL SLAUUM( 'L', K, A( K*K ), K, INFO )
 *
diff --git a/SRC/spftrs.f b/SRC/spftrs.f
index fec7eff767..3557a4d1a8 100644
--- a/SRC/spftrs.f
+++ b/SRC/spftrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPFTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spftrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spftrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -105,7 +103,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup pftrs
 *
 *> \par Further Details:
 *  =====================
@@ -196,6 +194,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SPFTRS( TRANSR, UPLO, N, NRHS, A, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/spocon.f b/SRC/spocon.f
index 8b4e85b3d6..790497c414 100644
--- a/SRC/spocon.f
+++ b/SRC/spocon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPOCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spocon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spocon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,11 +111,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPOcomputational
+*> \ingroup pocon
 *
 *  =====================================================================
       SUBROUTINE SPOCON( UPLO, N, A, LDA, ANORM, RCOND, WORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -203,25 +202,29 @@ SUBROUTINE SPOCON( UPLO, N, A, LDA, ANORM, RCOND, WORK, IWORK,
 *
 *           Multiply by inv(U**T).
 *
-            CALL SLATRS( 'Upper', 'Transpose', 'Non-unit', NORMIN, N, A,
+            CALL SLATRS( 'Upper', 'Transpose', 'Non-unit', NORMIN, N,
+     $                   A,
      $                   LDA, WORK, SCALEL, WORK( 2*N+1 ), INFO )
             NORMIN = 'Y'
 *
 *           Multiply by inv(U).
 *
-            CALL SLATRS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL SLATRS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   A, LDA, WORK, SCALEU, WORK( 2*N+1 ), INFO )
          ELSE
 *
 *           Multiply by inv(L).
 *
-            CALL SLATRS( 'Lower', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL SLATRS( 'Lower', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   A, LDA, WORK, SCALEL, WORK( 2*N+1 ), INFO )
             NORMIN = 'Y'
 *
 *           Multiply by inv(L**T).
 *
-            CALL SLATRS( 'Lower', 'Transpose', 'Non-unit', NORMIN, N, A,
+            CALL SLATRS( 'Lower', 'Transpose', 'Non-unit', NORMIN, N,
+     $                   A,
      $                   LDA, WORK, SCALEU, WORK( 2*N+1 ), INFO )
          END IF
 *
diff --git a/SRC/spoequ.f b/SRC/spoequ.f
index 45c61d6454..9b2d5e88e7 100644
--- a/SRC/spoequ.f
+++ b/SRC/spoequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPOEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spoequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spoequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -105,10 +103,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPOcomputational
+*> \ingroup poequ
 *
 *  =====================================================================
       SUBROUTINE SPOEQU( N, A, LDA, S, SCOND, AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/spoequb.f b/SRC/spoequb.f
index e221cdb6da..cd37aef80c 100644
--- a/SRC/spoequb.f
+++ b/SRC/spoequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPOEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spoequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spoequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -111,10 +109,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPOcomputational
+*> \ingroup poequb
 *
 *  =====================================================================
       SUBROUTINE SPOEQUB( N, A, LDA, S, SCOND, AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sporfs.f b/SRC/sporfs.f
index 4390b1d42b..be4b78517e 100644
--- a/SRC/sporfs.f
+++ b/SRC/sporfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPORFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sporfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sporfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -175,11 +173,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPOcomputational
+*> \ingroup porfs
 *
 *  =====================================================================
       SUBROUTINE SPORFS( UPLO, N, NRHS, A, LDA, AF, LDAF, B, LDB, X,
      $                   LDX, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -218,7 +217,8 @@ SUBROUTINE SPORFS( UPLO, N, NRHS, A, LDA, AF, LDAF, B, LDB, X,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SLACN2, SPOTRS, SSYMV, XERBLA
+      EXTERNAL           SAXPY, SCOPY, SLACN2, SPOTRS, SSYMV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -269,7 +269,7 @@ SUBROUTINE SPORFS( UPLO, N, NRHS, A, LDA, AF, LDAF, B, LDB, X,
       NZ = N + 1
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -378,22 +378,25 @@ SUBROUTINE SPORFS( UPLO, N, NRHS, A, LDA, AF, LDAF, B, LDB, X,
 *
          DO 90 I = 1, N
             IF( WORK( I ).GT.SAFE2 ) THEN
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I )
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
             ELSE
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I ) + SAFE1
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
+     $                     + SAFE1
             END IF
    90    CONTINUE
 *
          KASE = 0
   100    CONTINUE
-         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
 *
 *              Multiply by diag(W)*inv(A**T).
 *
-               CALL SPOTRS( UPLO, N, 1, AF, LDAF, WORK( N+1 ), N, INFO )
+               CALL SPOTRS( UPLO, N, 1, AF, LDAF, WORK( N+1 ), N,
+     $                      INFO )
                DO 110 I = 1, N
                   WORK( N+I ) = WORK( I )*WORK( N+I )
   110          CONTINUE
@@ -404,7 +407,8 @@ SUBROUTINE SPORFS( UPLO, N, NRHS, A, LDA, AF, LDAF, B, LDB, X,
                DO 120 I = 1, N
                   WORK( N+I ) = WORK( I )*WORK( N+I )
   120          CONTINUE
-               CALL SPOTRS( UPLO, N, 1, AF, LDAF, WORK( N+1 ), N, INFO )
+               CALL SPOTRS( UPLO, N, 1, AF, LDAF, WORK( N+1 ), N,
+     $                      INFO )
             END IF
             GO TO 100
          END IF
diff --git a/SRC/sporfsx.f b/SRC/sporfsx.f
index 8f69bc77ed..abdbe16a15 100644
--- a/SRC/sporfsx.f
+++ b/SRC/sporfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPORFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sporfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sporfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -384,13 +382,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPOcomputational
+*> \ingroup porfsx
 *
 *  =====================================================================
-      SUBROUTINE SPORFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, S, B,
+      SUBROUTINE SPORFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, S,
+     $                    B,
      $                    LDB, X, LDX, RCOND, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sposv.f b/SRC/sposv.f
index fe0a35a568..27bb40c0cd 100644
--- a/SRC/sposv.f
+++ b/SRC/sposv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPOSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sposv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sposv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -110,9 +108,9 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i of A is not
-*>                positive definite, so the factorization could not be
-*>                completed, and the solution has not been computed.
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                of A is not positive, so the factorization could not
+*>                be completed, and the solution has not been computed.
 *> \endverbatim
 *
 *  Authors:
@@ -123,10 +121,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPOsolve
+*> \ingroup posv
 *
 *  =====================================================================
       SUBROUTINE SPOSV( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -157,7 +156,8 @@ SUBROUTINE SPOSV( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/sposvx.f b/SRC/sposvx.f
index bcf38c7eaf..44b1e916b0 100644
--- a/SRC/sposvx.f
+++ b/SRC/sposvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPOSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sposvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sposvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -71,7 +69,7 @@
 *>    where U is an upper triangular matrix and L is a lower triangular
 *>    matrix.
 *>
-*> 3. If the leading i-by-i principal minor is not positive definite,
+*> 3. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A.  If the reciprocal of the condition number is less than machine
@@ -277,10 +275,10 @@
 *>          = 0: successful exit
 *>          < 0: if INFO = -i, the i-th argument had an illegal value
 *>          > 0: if INFO = i, and i is
-*>                <= N:  the leading minor of order i of A is
-*>                       not positive definite, so the factorization
-*>                       could not be completed, and the solution has not
-*>                       been computed. RCOND = 0 is returned.
+*>                <= N:  the leading principal minor of order i of A
+*>                       is not positive, so the factorization could not
+*>                       be completed, and the solution has not been
+*>                       computed. RCOND = 0 is returned.
 *>                = N+1: U is nonsingular, but RCOND is less than machine
 *>                       precision, meaning that the matrix is singular
 *>                       to working precision.  Nevertheless, the
@@ -298,12 +296,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPOsolve
+*> \ingroup posvx
 *
 *  =====================================================================
-      SUBROUTINE SPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
+      SUBROUTINE SPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF,
+     $                   EQUED,
      $                   S, B, LDB, X, LDX, RCOND, FERR, BERR, WORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -338,7 +338,8 @@ SUBROUTINE SPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
       EXTERNAL           LSAME, SLAMCH, SLANSY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLACPY, SLAQSY, SPOCON, SPOEQU, SPORFS, SPOTRF,
+      EXTERNAL           SLACPY, SLAQSY, SPOCON, SPOEQU, SPORFS,
+     $                   SPOTRF,
      $                   SPOTRS, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -360,10 +361,13 @@ SUBROUTINE SPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -452,7 +456,8 @@ SUBROUTINE SPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL SPOCON( UPLO, N, AF, LDAF, ANORM, RCOND, WORK, IWORK, INFO )
+      CALL SPOCON( UPLO, N, AF, LDAF, ANORM, RCOND, WORK, IWORK,
+     $             INFO )
 *
 *     Compute the solution matrix X.
 *
diff --git a/SRC/sposvxx.f b/SRC/sposvxx.f
index 08adf1d588..f9b02cfcb4 100644
--- a/SRC/sposvxx.f
+++ b/SRC/sposvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPOSVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sposvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sposvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,7 +86,7 @@
 *>    where U is an upper triangular matrix and L is a lower triangular
 *>    matrix.
 *>
-*>    3. If the leading i-by-i principal minor is not positive definite,
+*>    3. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A (see argument RCOND).  If the reciprocal of the condition number
@@ -487,13 +485,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPOsolve
+*> \ingroup posvxx
 *
 *  =====================================================================
-      SUBROUTINE SPOSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
+      SUBROUTINE SPOSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF,
+     $                    EQUED,
      $                    S, B, LDB, X, LDX, RCOND, RPVGRW, BERR,
      $                    N_ERR_BNDS, ERR_BNDS_NORM, ERR_BNDS_COMP,
      $                    NPARAMS, PARAMS, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -540,7 +540,8 @@ SUBROUTINE SPOSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
       REAL               SLAMCH, SLA_PORPVGRW
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SPOEQUB, SPOTRF, SPOTRS, SLACPY, SLAQSY,
+      EXTERNAL           SPOEQUB, SPOTRF, SPOTRS, SLACPY,
+     $                   SLAQSY,
      $                   XERBLA, SLASCL2, SPORFSX
 *     ..
 *     .. Intrinsic Functions ..
@@ -648,7 +649,8 @@ SUBROUTINE SPOSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
 *           Compute the reciprocal pivot growth factor of the
 *           leading rank-deficient INFO columns of A.
 *
-            RPVGRW = SLA_PORPVGRW( UPLO, INFO, A, LDA, AF, LDAF, WORK )
+            RPVGRW = SLA_PORPVGRW( UPLO, INFO, A, LDA, AF, LDAF,
+     $                             WORK )
             RETURN
          ENDIF
       END IF
diff --git a/SRC/spotf2.f b/SRC/spotf2.f
index 5b35048345..ef90dd9fc8 100644
--- a/SRC/spotf2.f
+++ b/SRC/spotf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPOTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spotf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spotf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -89,8 +87,8 @@
 *>          INFO is INTEGER
 *>          = 0: successful exit
 *>          < 0: if INFO = -k, the k-th argument had an illegal value
-*>          > 0: if INFO = k, the leading minor of order k is not
-*>               positive definite, and the factorization could not be
+*>          > 0: if INFO = k, the leading principal minor of order k
+*>               is not positive, and the factorization could not be
 *>               completed.
 *> \endverbatim
 *
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPOcomputational
+*> \ingroup potf2
 *
 *  =====================================================================
       SUBROUTINE SPOTF2( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -208,7 +207,8 @@ SUBROUTINE SPOTF2( UPLO, N, A, LDA, INFO )
 *           Compute elements J+1:N of column J.
 *
             IF( J.LT.N ) THEN
-               CALL SGEMV( 'No transpose', N-J, J-1, -ONE, A( J+1, 1 ),
+               CALL SGEMV( 'No transpose', N-J, J-1, -ONE, A( J+1,
+     $                     1 ),
      $                     LDA, A( J, 1 ), LDA, ONE, A( J+1, J ), 1 )
                CALL SSCAL( N-J, ONE / AJJ, A( J+1, J ), 1 )
             END IF
diff --git a/SRC/spotrf.f b/SRC/spotrf.f
index 5d5771c86a..d9b775ffd5 100644
--- a/SRC/spotrf.f
+++ b/SRC/spotrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPOTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spotrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spotrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -87,8 +85,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *> \endverbatim
 *
@@ -100,10 +98,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPOcomputational
+*> \ingroup potrf
 *
 *  =====================================================================
       SUBROUTINE SPOTRF( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -133,7 +132,8 @@ SUBROUTINE SPOTRF( UPLO, N, A, LDA, INFO )
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMM, SPOTRF2, SSYRK, STRSM, XERBLA
+      EXTERNAL           SGEMM, SPOTRF2, SSYRK, STRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -192,10 +192,12 @@ SUBROUTINE SPOTRF( UPLO, N, A, LDA, INFO )
 *
 *                 Compute the current block row.
 *
-                  CALL SGEMM( 'Transpose', 'No transpose', JB, N-J-JB+1,
+                  CALL SGEMM( 'Transpose', 'No transpose', JB,
+     $                        N-J-JB+1,
      $                        J-1, -ONE, A( 1, J ), LDA, A( 1, J+JB ),
      $                        LDA, ONE, A( J, J+JB ), LDA )
-                  CALL STRSM( 'Left', 'Upper', 'Transpose', 'Non-unit',
+                  CALL STRSM( 'Left', 'Upper', 'Transpose',
+     $                        'Non-unit',
      $                        JB, N-J-JB+1, ONE, A( J, J ), LDA,
      $                        A( J, J+JB ), LDA )
                END IF
@@ -220,10 +222,12 @@ SUBROUTINE SPOTRF( UPLO, N, A, LDA, INFO )
 *
 *                 Compute the current block column.
 *
-                  CALL SGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
+                  CALL SGEMM( 'No transpose', 'Transpose', N-J-JB+1,
+     $                        JB,
      $                        J-1, -ONE, A( J+JB, 1 ), LDA, A( J, 1 ),
      $                        LDA, ONE, A( J+JB, J ), LDA )
-                  CALL STRSM( 'Right', 'Lower', 'Transpose', 'Non-unit',
+                  CALL STRSM( 'Right', 'Lower', 'Transpose',
+     $                        'Non-unit',
      $                        N-J-JB+1, JB, ONE, A( J, J ), LDA,
      $                        A( J+JB, J ), LDA )
                END IF
diff --git a/SRC/spotrf2.f b/SRC/spotrf2.f
index ae0484ce16..0b0244a639 100644
--- a/SRC/spotrf2.f
+++ b/SRC/spotrf2.f
@@ -86,8 +86,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *> \endverbatim
 *
@@ -99,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPOcomputational
+*> \ingroup potrf2
 *
 *  =====================================================================
       RECURSIVE SUBROUTINE SPOTRF2( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/spotri.f b/SRC/spotri.f
index 5e9944847f..23d2cd870b 100644
--- a/SRC/spotri.f
+++ b/SRC/spotri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPOTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spotri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spotri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,10 +86,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPOcomputational
+*> \ingroup potri
 *
 *  =====================================================================
       SUBROUTINE SPOTRI( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -122,7 +121,8 @@ SUBROUTINE SPOTRI( UPLO, N, A, LDA, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/spotrs.f b/SRC/spotrs.f
index 6bd662a522..3ced5bd8db 100644
--- a/SRC/spotrs.f
+++ b/SRC/spotrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPOTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spotrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spotrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -103,10 +101,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPOcomputational
+*> \ingroup potrs
 *
 *  =====================================================================
       SUBROUTINE SPOTRS( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,7 +171,8 @@ SUBROUTINE SPOTRS( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
 *
 *        Solve U**T *X = B, overwriting B with X.
 *
-         CALL STRSM( 'Left', 'Upper', 'Transpose', 'Non-unit', N, NRHS,
+         CALL STRSM( 'Left', 'Upper', 'Transpose', 'Non-unit', N,
+     $               NRHS,
      $               ONE, A, LDA, B, LDB )
 *
 *        Solve U*X = B, overwriting B with X.
@@ -190,7 +190,8 @@ SUBROUTINE SPOTRS( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
 *
 *        Solve L**T *X = B, overwriting B with X.
 *
-         CALL STRSM( 'Left', 'Lower', 'Transpose', 'Non-unit', N, NRHS,
+         CALL STRSM( 'Left', 'Lower', 'Transpose', 'Non-unit', N,
+     $               NRHS,
      $               ONE, A, LDA, B, LDB )
       END IF
 *
diff --git a/SRC/sppcon.f b/SRC/sppcon.f
index 333520ea3d..4c0a94a48f 100644
--- a/SRC/sppcon.f
+++ b/SRC/sppcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPPCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sppcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sppcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -111,10 +109,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup ppcon
 *
 *  =====================================================================
-      SUBROUTINE SPPCON( UPLO, N, AP, ANORM, RCOND, WORK, IWORK, INFO )
+      SUBROUTINE SPPCON( UPLO, N, AP, ANORM, RCOND, WORK, IWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -204,13 +204,15 @@ SUBROUTINE SPPCON( UPLO, N, AP, ANORM, RCOND, WORK, IWORK, INFO )
 *
 *           Multiply by inv(U).
 *
-            CALL SLATPS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL SLATPS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   AP, WORK, SCALEU, WORK( 2*N+1 ), INFO )
          ELSE
 *
 *           Multiply by inv(L).
 *
-            CALL SLATPS( 'Lower', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL SLATPS( 'Lower', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   AP, WORK, SCALEL, WORK( 2*N+1 ), INFO )
             NORMIN = 'Y'
 *
diff --git a/SRC/sppequ.f b/SRC/sppequ.f
index 71ed8c0e74..39fb022967 100644
--- a/SRC/sppequ.f
+++ b/SRC/sppequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPPEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sppequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sppequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -109,10 +107,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup ppequ
 *
 *  =====================================================================
       SUBROUTINE SPPEQU( UPLO, N, AP, S, SCOND, AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/spprfs.f b/SRC/spprfs.f
index 5fa8fe2af7..0b054a1038 100644
--- a/SRC/spprfs.f
+++ b/SRC/spprfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPPRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spprfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spprfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,11 +161,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup pprfs
 *
 *  =====================================================================
-      SUBROUTINE SPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
+      SUBROUTINE SPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX,
+     $                   FERR,
      $                   BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -206,7 +206,8 @@ SUBROUTINE SPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SLACN2, SPPTRS, SSPMV, XERBLA
+      EXTERNAL           SAXPY, SCOPY, SLACN2, SPPTRS, SSPMV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -253,7 +254,7 @@ SUBROUTINE SPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
       NZ = N + 1
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -269,7 +270,8 @@ SUBROUTINE SPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
 *        Compute residual R = B - A * X
 *
          CALL SCOPY( N, B( 1, J ), 1, WORK( N+1 ), 1 )
-         CALL SSPMV( UPLO, N, -ONE, AP, X( 1, J ), 1, ONE, WORK( N+1 ),
+         CALL SSPMV( UPLO, N, -ONE, AP, X( 1, J ), 1, ONE,
+     $               WORK( N+1 ),
      $               1 )
 *
 *        Compute componentwise relative backward error from formula
@@ -369,15 +371,17 @@ SUBROUTINE SPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
 *
          DO 90 I = 1, N
             IF( WORK( I ).GT.SAFE2 ) THEN
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I )
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
             ELSE
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I ) + SAFE1
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
+     $                     + SAFE1
             END IF
    90    CONTINUE
 *
          KASE = 0
   100    CONTINUE
-         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
diff --git a/SRC/sppsv.f b/SRC/sppsv.f
index 2d3fb3d91b..26b2d384be 100644
--- a/SRC/sppsv.f
+++ b/SRC/sppsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPPSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sppsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sppsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -104,9 +102,9 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i of A is not
-*>                positive definite, so the factorization could not be
-*>                completed, and the solution has not been computed.
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                of A is not positive, so the factorization could not
+*>                be completed, and the solution has not been computed.
 *> \endverbatim
 *
 *  Authors:
@@ -117,7 +115,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERsolve
+*> \ingroup ppsv
 *
 *> \par Further Details:
 *  =====================
@@ -141,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SPPSV( UPLO, N, NRHS, AP, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,7 +170,8 @@ SUBROUTINE SPPSV( UPLO, N, NRHS, AP, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/sppsvx.f b/SRC/sppsvx.f
index 7d71efcd5c..7a99a218bf 100644
--- a/SRC/sppsvx.f
+++ b/SRC/sppsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPPSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sppsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sppsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -69,7 +67,7 @@
 *>    where U is an upper triangular matrix and L is a lower triangular
 *>    matrix.
 *>
-*> 3. If the leading i-by-i principal minor is not positive definite,
+*> 3. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A.  If the reciprocal of the condition number is less than machine
@@ -262,10 +260,10 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO = i, and i is
-*>                <= N:  the leading minor of order i of A is
-*>                       not positive definite, so the factorization
-*>                       could not be completed, and the solution has not
-*>                       been computed. RCOND = 0 is returned.
+*>                <= N:  the leading principal minor of order i of A
+*>                       is not positive, so the factorization could not
+*>                       be completed, and the solution has not been
+*>                       computed. RCOND = 0 is returned.
 *>                = N+1: U is nonsingular, but RCOND is less than machine
 *>                       precision, meaning that the matrix is singular
 *>                       to working precision.  Nevertheless, the
@@ -283,7 +281,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERsolve
+*> \ingroup ppsvx
 *
 *> \par Further Details:
 *  =====================
@@ -306,8 +304,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B, LDB,
+      SUBROUTINE SPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B,
+     $                   LDB,
      $                   X, LDX, RCOND, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -341,7 +341,8 @@ SUBROUTINE SPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B, LDB,
       EXTERNAL           LSAME, SLAMCH, SLANSP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLACPY, SLAQSP, SPPCON, SPPEQU, SPPRFS,
+      EXTERNAL           SCOPY, SLACPY, SLAQSP, SPPCON, SPPEQU,
+     $                   SPPRFS,
      $                   SPPTRF, SPPTRS, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -363,10 +364,13 @@ SUBROUTINE SPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B, LDB,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -461,7 +465,8 @@ SUBROUTINE SPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B, LDB,
 *     Use iterative refinement to improve the computed solution and
 *     compute error bounds and backward error estimates for it.
 *
-      CALL SPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR, BERR,
+      CALL SPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
+     $             BERR,
      $             WORK, IWORK, INFO )
 *
 *     Transform the solution matrix X to a solution of the original
diff --git a/SRC/spptrf.f b/SRC/spptrf.f
index 0f90399cca..89646f06d3 100644
--- a/SRC/spptrf.f
+++ b/SRC/spptrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPPTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spptrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spptrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -79,8 +77,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *> \endverbatim
 *
@@ -92,7 +90,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup pptrf
 *
 *> \par Further Details:
 *  =====================
@@ -116,6 +114,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SPPTRF( UPLO, N, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/spptri.f b/SRC/spptri.f
index 8d2204baee..7406311545 100644
--- a/SRC/spptri.f
+++ b/SRC/spptri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPPTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spptri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spptri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -86,10 +84,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup pptri
 *
 *  =====================================================================
       SUBROUTINE SPPTRI( UPLO, N, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/spptrs.f b/SRC/spptrs.f
index ac33797312..db74fac441 100644
--- a/SRC/spptrs.f
+++ b/SRC/spptrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPPTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spptrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spptrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup pptrs
 *
 *  =====================================================================
       SUBROUTINE SPPTRS( UPLO, N, NRHS, AP, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/spstf2.f b/SRC/spstf2.f
index efd58a3e6e..46ceb12851 100644
--- a/SRC/spstf2.f
+++ b/SRC/spstf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPSTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spstf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spstf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -134,10 +132,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup pstf2
 *
 *  =====================================================================
-      SUBROUTINE SPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
+      SUBROUTINE SPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,7 +223,7 @@ SUBROUTINE SPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *     Compute stopping value if not supplied
 *
       IF( TOL.LT.ZERO ) THEN
-         SSTOP = N * SLAMCH( 'Epsilon' ) * AJJ
+         SSTOP = REAL( N ) * SLAMCH( 'Epsilon' ) * AJJ
       ELSE
          SSTOP = TOL
       END IF
@@ -272,7 +272,8 @@ SUBROUTINE SPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
                IF( PVT.LT.N )
      $            CALL SSWAP( N-PVT, A( J, PVT+1 ), LDA,
      $                        A( PVT, PVT+1 ), LDA )
-               CALL SSWAP( PVT-J-1, A( J, J+1 ), LDA, A( J+1, PVT ), 1 )
+               CALL SSWAP( PVT-J-1, A( J, J+1 ), LDA, A( J+1, PVT ),
+     $                     1 )
 *
 *              Swap dot products and PIV
 *
@@ -333,9 +334,11 @@ SUBROUTINE SPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
                A( PVT, PVT ) = A( J, J )
                CALL SSWAP( J-1, A( J, 1 ), LDA, A( PVT, 1 ), LDA )
                IF( PVT.LT.N )
-     $            CALL SSWAP( N-PVT, A( PVT+1, J ), 1, A( PVT+1, PVT ),
+     $            CALL SSWAP( N-PVT, A( PVT+1, J ), 1, A( PVT+1,
+     $                        PVT ),
      $                        1 )
-               CALL SSWAP( PVT-J-1, A( J+1, J ), 1, A( PVT, J+1 ), LDA )
+               CALL SSWAP( PVT-J-1, A( J+1, J ), 1, A( PVT, J+1 ),
+     $                     LDA )
 *
 *              Swap dot products and PIV
 *
@@ -353,7 +356,8 @@ SUBROUTINE SPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *           Compute elements J+1:N of column J
 *
             IF( J.LT.N ) THEN
-               CALL SGEMV( 'No Trans', N-J, J-1, -ONE, A( J+1, 1 ), LDA,
+               CALL SGEMV( 'No Trans', N-J, J-1, -ONE, A( J+1, 1 ),
+     $                     LDA,
      $                     A( J, 1 ), LDA, ONE, A( J+1, J ), 1 )
                CALL SSCAL( N-J, ONE / AJJ, A( J+1, J ), 1 )
             END IF
diff --git a/SRC/spstrf.f b/SRC/spstrf.f
index 70ec9484a1..6d8427daf6 100644
--- a/SRC/spstrf.f
+++ b/SRC/spstrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPSTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spstrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spstrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -134,10 +132,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup pstrf
 *
 *  =====================================================================
-      SUBROUTINE SPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
+      SUBROUTINE SPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,7 +171,8 @@ SUBROUTINE SPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
       EXTERNAL           SLAMCH, ILAENV, LSAME, SISNAN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMV, SPSTF2, SSCAL, SSWAP, SSYRK, XERBLA
+      EXTERNAL           SGEMV, SPSTF2, SSCAL, SSWAP, SSYRK,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN, SQRT, MAXLOC
@@ -237,7 +238,7 @@ SUBROUTINE SPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *     Compute stopping value if not supplied
 *
          IF( TOL.LT.ZERO ) THEN
-            SSTOP = N * SLAMCH( 'Epsilon' ) * AJJ
+            SSTOP = REAL( N ) * SLAMCH( 'Epsilon' ) * AJJ
          ELSE
             SSTOP = TOL
          END IF
@@ -313,7 +314,8 @@ SUBROUTINE SPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *                 Compute elements J+1:N of row J.
 *
                   IF( J.LT.N ) THEN
-                     CALL SGEMV( 'Trans', J-K, N-J, -ONE, A( K, J+1 ),
+                     CALL SGEMV( 'Trans', J-K, N-J, -ONE, A( K,
+     $                           J+1 ),
      $                           LDA, A( K, J ), 1, ONE, A( J, J+1 ),
      $                           LDA )
                      CALL SSCAL( N-J, ONE / AJJ, A( J, J+1 ), LDA )
@@ -377,11 +379,13 @@ SUBROUTINE SPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *                    Pivot OK, so can now swap pivot rows and columns
 *
                      A( PVT, PVT ) = A( J, J )
-                     CALL SSWAP( J-1, A( J, 1 ), LDA, A( PVT, 1 ), LDA )
+                     CALL SSWAP( J-1, A( J, 1 ), LDA, A( PVT, 1 ),
+     $                           LDA )
                      IF( PVT.LT.N )
      $                  CALL SSWAP( N-PVT, A( PVT+1, J ), 1,
      $                              A( PVT+1, PVT ), 1 )
-                     CALL SSWAP( PVT-J-1, A( J+1, J ), 1, A( PVT, J+1 ),
+                     CALL SSWAP( PVT-J-1, A( J+1, J ), 1, A( PVT,
+     $                           J+1 ),
      $                           LDA )
 *
 *                    Swap dot products and PIV
diff --git a/SRC/sptcon.f b/SRC/sptcon.f
index 1088e09e75..fe1de986b6 100644
--- a/SRC/sptcon.f
+++ b/SRC/sptcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPTCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sptcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sptcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,7 +99,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPTcomputational
+*> \ingroup ptcon
 *
 *> \par Further Details:
 *  =====================
@@ -115,6 +113,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SPTCON( N, D, E, ANORM, RCOND, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/spteqr.f b/SRC/spteqr.f
index 0d6bf911bf..3e837e153c 100644
--- a/SRC/spteqr.f
+++ b/SRC/spteqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPTEQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spteqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spteqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,8 +121,8 @@
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value.
 *>          > 0:  if INFO = i, and i is:
 *>                <= N  the Cholesky factorization of the matrix could
-*>                      not be performed because the i-th principal minor
-*>                      was not positive definite.
+*>                      not be performed because the leading principal
+*>                      minor of order i was not positive.
 *>                > N   the SVD algorithm failed to converge;
 *>                      if INFO = N+i, i off-diagonal elements of the
 *>                      bidiagonal factor did not converge to zero.
@@ -138,10 +136,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPTcomputational
+*> \ingroup pteqr
 *
 *  =====================================================================
       SUBROUTINE SPTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sptrfs.f b/SRC/sptrfs.f
index 66d152b3a2..9815dd49f6 100644
--- a/SRC/sptrfs.f
+++ b/SRC/sptrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPTRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sptrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sptrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -155,11 +153,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPTcomputational
+*> \ingroup ptrfs
 *
 *  =====================================================================
       SUBROUTINE SPTRFS( N, NRHS, D, E, DF, EF, B, LDB, X, LDX, FERR,
      $                   BERR, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -238,7 +237,7 @@ SUBROUTINE SPTRFS( N, NRHS, D, E, DF, EF, B, LDB, X, LDX, FERR,
       NZ = 4
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -338,9 +337,10 @@ SUBROUTINE SPTRFS( N, NRHS, D, E, DF, EF, B, LDB, X, LDX, FERR,
 *
          DO 50 I = 1, N
             IF( WORK( I ).GT.SAFE2 ) THEN
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I )
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
             ELSE
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I ) + SAFE1
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
+     $                     + SAFE1
             END IF
    50    CONTINUE
          IX = ISAMAX( N, WORK, 1 )
diff --git a/SRC/sptsv.f b/SRC/sptsv.f
index 46aadf4c38..6d9a8442ef 100644
--- a/SRC/sptsv.f
+++ b/SRC/sptsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPTSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sptsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sptsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -93,8 +91,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the solution has not been
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the solution has not been
 *>                computed.  The factorization has not been completed
 *>                unless i = N.
 *> \endverbatim
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPTsolve
+*> \ingroup ptsv
 *
 *  =====================================================================
       SUBROUTINE SPTSV( N, NRHS, D, E, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sptsvx.f b/SRC/sptsvx.f
index 8dd04b054c..35f18134e2 100644
--- a/SRC/sptsvx.f
+++ b/SRC/sptsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPTSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sptsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sptsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -59,7 +57,7 @@
 *>    factorization can also be regarded as having the form
 *>    A = U**T*D*U.
 *>
-*> 2. If the leading i-by-i principal minor is not positive definite,
+*> 2. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A.  If the reciprocal of the condition number is less than machine
@@ -199,10 +197,10 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO = i, and i is
-*>                <= N:  the leading minor of order i of A is
-*>                       not positive definite, so the factorization
-*>                       could not be completed, and the solution has not
-*>                       been computed. RCOND = 0 is returned.
+*>                <= N:  the leading principal minor of order i of A
+*>                       is not positive, so the factorization could not
+*>                       be completed, and the solution has not been
+*>                       computed. RCOND = 0 is returned.
 *>                = N+1: U is nonsingular, but RCOND is less than machine
 *>                       precision, meaning that the matrix is singular
 *>                       to working precision.  Nevertheless, the
@@ -220,11 +218,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPTsolve
+*> \ingroup ptsvx
 *
 *  =====================================================================
       SUBROUTINE SPTSVX( FACT, N, NRHS, D, E, DF, EF, B, LDB, X, LDX,
      $                   RCOND, FERR, BERR, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -257,7 +256,8 @@ SUBROUTINE SPTSVX( FACT, N, NRHS, D, E, DF, EF, B, LDB, X, LDX,
       EXTERNAL           LSAME, SLAMCH, SLANST
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLACPY, SPTCON, SPTRFS, SPTTRF, SPTTRS,
+      EXTERNAL           SCOPY, SLACPY, SPTCON, SPTRFS, SPTTRF,
+     $                   SPTTRS,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
diff --git a/SRC/spttrf.f b/SRC/spttrf.f
index 2217a73384..da2d0a6b1b 100644
--- a/SRC/spttrf.f
+++ b/SRC/spttrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPTTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spttrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spttrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -70,8 +68,8 @@
 *>          INFO is INTEGER
 *>          = 0: successful exit
 *>          < 0: if INFO = -k, the k-th argument had an illegal value
-*>          > 0: if INFO = k, the leading minor of order k is not
-*>               positive definite; if k < N, the factorization could not
+*>          > 0: if INFO = k, the leading principal minor of order k
+*>               is not positive; if k < N, the factorization could not
 *>               be completed, while if k = N, the factorization was
 *>               completed, but D(N) <= 0.
 *> \endverbatim
@@ -84,10 +82,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup pttrf
 *
 *  =====================================================================
       SUBROUTINE SPTTRF( N, D, E, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/spttrs.f b/SRC/spttrs.f
index 3b5340104a..e78ec57013 100644
--- a/SRC/spttrs.f
+++ b/SRC/spttrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPTTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/spttrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/spttrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPTcomputational
+*> \ingroup pttrs
 *
 *  =====================================================================
       SUBROUTINE SPTTRS( N, NRHS, D, E, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sptts2.f b/SRC/sptts2.f
index 93f41d1b12..2f6870ed00 100644
--- a/SRC/sptts2.f
+++ b/SRC/sptts2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SPTTS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sptts2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sptts2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,10 +93,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realPTcomputational
+*> \ingroup ptts2
 *
 *  =====================================================================
       SUBROUTINE SPTTS2( N, NRHS, D, E, B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/srscl.f b/SRC/srscl.f
index 7f2b3bc4f4..c08c3f1105 100644
--- a/SRC/srscl.f
+++ b/SRC/srscl.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SRSCL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/srscl.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/srscl.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -77,10 +75,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup rscl
 *
 *  =====================================================================
       SUBROUTINE SRSCL( N, SA, SX, INCX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -109,7 +108,7 @@ SUBROUTINE SRSCL( N, SA, SX, INCX )
       EXTERNAL           SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLABAD, SSCAL
+      EXTERNAL           SSCAL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS
@@ -125,7 +124,6 @@ SUBROUTINE SRSCL( N, SA, SX, INCX )
 *
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Initialize the denominator to SA and the numerator to 1.
 *
diff --git a/SRC/ssb2st_kernels.f b/SRC/ssb2st_kernels.f
index 23f77d0dae..6ae784ace5 100644
--- a/SRC/ssb2st_kernels.f
+++ b/SRC/ssb2st_kernels.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSB2ST_KERNELS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssb2st_kernels.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssb2st_kernels.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -164,6 +162,8 @@
 *>
 *> \endverbatim
 *>
+*> \ingroup hb2st_kernels
+*>
 *  =====================================================================
       SUBROUTINE  SSB2ST_KERNELS( UPLO, WANTZ, TTYPE,
      $                            ST, ED, SWEEP, N, NB, IB,
@@ -286,7 +286,8 @@ SUBROUTINE  SSB2ST_KERNELS( UPLO, WANTZ, TTYPE,
                       A( DPOS-NB-I, J1+I ) = ZERO
    30             CONTINUE
                   CTMP = ( A( DPOS-NB, J1 ) )
-                  CALL SLARFG( LM, CTMP, V( VPOS+1 ), 1, TAU( TAUPOS ) )
+                  CALL SLARFG( LM, CTMP, V( VPOS+1 ), 1,
+     $                         TAU( TAUPOS ) )
                   A( DPOS-NB, J1 ) = CTMP
 *
                   CALL SLARFX( 'Right', LN-1, LM, V( VPOS ),
diff --git a/SRC/ssbev.f b/SRC/ssbev.f
index d4cf6c08fb..ee491d4259 100644
--- a/SRC/ssbev.f
+++ b/SRC/ssbev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSBEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssbev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssbev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -138,11 +136,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup hbev
 *
 *  =====================================================================
       SUBROUTINE SSBEV( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -174,7 +173,8 @@ SUBROUTINE SSBEV( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       EXTERNAL           LSAME, SLAMCH, SLANSB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLASCL, SSBTRD, SSCAL, SSTEQR, SSTERF, XERBLA
+      EXTERNAL           SLASCL, SSBTRD, SSCAL, SSTEQR, SSTERF,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          SQRT
@@ -244,9 +244,11 @@ SUBROUTINE SSBEV( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL SLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL SLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL SLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL SLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
       END IF
 *
@@ -254,7 +256,8 @@ SUBROUTINE SSBEV( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
 *
       INDE = 1
       INDWRK = INDE + N
-      CALL SSBTRD( JOBZ, UPLO, N, KD, AB, LDAB, W, WORK( INDE ), Z, LDZ,
+      CALL SSBTRD( JOBZ, UPLO, N, KD, AB, LDAB, W, WORK( INDE ), Z,
+     $             LDZ,
      $             WORK( INDWRK ), IINFO )
 *
 *     For eigenvalues only, call SSTERF.  For eigenvectors, call SSTEQR.
@@ -262,7 +265,8 @@ SUBROUTINE SSBEV( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       IF( .NOT.WANTZ ) THEN
          CALL SSTERF( N, W, WORK( INDE ), INFO )
       ELSE
-         CALL SSTEQR( JOBZ, N, W, WORK( INDE ), Z, LDZ, WORK( INDWRK ),
+         CALL SSTEQR( JOBZ, N, W, WORK( INDE ), Z, LDZ,
+     $                WORK( INDWRK ),
      $                INFO )
       END IF
 *
diff --git a/SRC/ssbev_2stage.f b/SRC/ssbev_2stage.f
index 5752c1ecc0..341fc9a6f7 100644
--- a/SRC/ssbev_2stage.f
+++ b/SRC/ssbev_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSBEV_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssbev_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssbev_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -131,7 +129,7 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = (2KD+1)*N + KD*NTHREADS + N
@@ -164,7 +162,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup hbev_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -182,7 +180,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -190,16 +188,17 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE SSBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
+      SUBROUTINE SSBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z,
+     $                         LDZ,
      $                         WORK, LWORK, INFO )
 *
       IMPLICIT NONE
@@ -232,12 +231,14 @@ SUBROUTINE SSBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV2STAGE
-      REAL               SLAMCH, SLANSB
-      EXTERNAL           LSAME, SLAMCH, SLANSB, ILAENV2STAGE
+      REAL               SLAMCH, SLANSB, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, SLANSB, ILAENV2STAGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLASCL, SSCAL, SSTEQR, SSTERF, XERBLA,
-     $                   SSYTRD_SB2ST 
+      EXTERNAL           SLASCL, SSCAL, SSTEQR, SSTERF,
+     $                   XERBLA,
+     $                   SSYTRD_SB2ST
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          SQRT
@@ -268,7 +269,7 @@ SUBROUTINE SSBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       IF( INFO.EQ.0 ) THEN
          IF( N.LE.1 ) THEN
             LWMIN = 1
-            WORK( 1 ) = LWMIN
+            WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
          ELSE
             IB    = ILAENV2STAGE( 2, 'SSYTRD_SB2ST', JOBZ,
      $                            N, KD, -1, -1 )
@@ -277,7 +278,7 @@ SUBROUTINE SSBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
             LWTRD = ILAENV2STAGE( 4, 'SSYTRD_SB2ST', JOBZ,
      $                            N, KD, IB, -1 )
             LWMIN = N + LHTRD + LWTRD
-            WORK( 1 )  = LWMIN
+            WORK( 1 )  = SROUNDUP_LWORK(LWMIN)
          ENDIF
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY )
@@ -329,9 +330,11 @@ SUBROUTINE SSBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL SLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL SLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL SLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL SLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
       END IF
 *
@@ -343,7 +346,7 @@ SUBROUTINE SSBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       LLWORK  = LWORK - INDWRK + 1
 *
       CALL SSYTRD_SB2ST( "N", JOBZ, UPLO, N, KD, AB, LDAB, W,
-     $                    WORK( INDE ), WORK( INDHOUS ), LHTRD, 
+     $                    WORK( INDE ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWRK ), LLWORK, IINFO )
 *
 *     For eigenvalues only, call SSTERF.  For eigenvectors, call SSTEQR.
@@ -351,7 +354,8 @@ SUBROUTINE SSBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       IF( .NOT.WANTZ ) THEN
          CALL SSTERF( N, W, WORK( INDE ), INFO )
       ELSE
-         CALL SSTEQR( JOBZ, N, W, WORK( INDE ), Z, LDZ, WORK( INDWRK ),
+         CALL SSTEQR( JOBZ, N, W, WORK( INDE ), Z, LDZ,
+     $                WORK( INDWRK ),
      $                INFO )
       END IF
 *
@@ -368,7 +372,7 @@ SUBROUTINE SSBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
 *
 *     Set WORK(1) to optimal workspace size.
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
 *
       RETURN
 *
diff --git a/SRC/ssbevd.f b/SRC/ssbevd.f
index bcf14ce85e..2c688596fc 100644
--- a/SRC/ssbevd.f
+++ b/SRC/ssbevd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSBEVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssbevd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssbevd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -40,12 +38,6 @@
 *> a real symmetric band matrix A. If eigenvectors are desired, it uses
 *> a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -185,11 +177,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup hbevd
 *
 *  =====================================================================
-      SUBROUTINE SSBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
+      SUBROUTINE SSBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
+     $                   WORK,
      $                   LWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -219,11 +213,13 @@ SUBROUTINE SSBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               SLAMCH, SLANSB
-      EXTERNAL           LSAME, SLAMCH, SLANSB
+      REAL               SLAMCH, SLANSB, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, SLANSB,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMM, SLACPY, SLASCL, SSBTRD, SSCAL, SSTEDC,
+      EXTERNAL           SGEMM, SLACPY, SLASCL, SSBTRD, SSCAL,
+     $                   SSTEDC,
      $                   SSTERF, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -265,7 +261,7 @@ SUBROUTINE SSBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         WORK( 1 ) = LWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -316,9 +312,11 @@ SUBROUTINE SSBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL SLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL SLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL SLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL SLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
       END IF
 *
@@ -328,7 +326,8 @@ SUBROUTINE SSBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       INDWRK = INDE + N
       INDWK2 = INDWRK + N*N
       LLWRK2 = LWORK - INDWK2 + 1
-      CALL SSBTRD( JOBZ, UPLO, N, KD, AB, LDAB, W, WORK( INDE ), Z, LDZ,
+      CALL SSBTRD( JOBZ, UPLO, N, KD, AB, LDAB, W, WORK( INDE ), Z,
+     $             LDZ,
      $             WORK( INDWRK ), IINFO )
 *
 *     For eigenvalues only, call SSTERF.  For eigenvectors, call SSTEDC.
@@ -338,7 +337,8 @@ SUBROUTINE SSBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       ELSE
          CALL SSTEDC( 'I', N, W, WORK( INDE ), WORK( INDWRK ), N,
      $                WORK( INDWK2 ), LLWRK2, IWORK, LIWORK, INFO )
-         CALL SGEMM( 'N', 'N', N, N, N, ONE, Z, LDZ, WORK( INDWRK ), N,
+         CALL SGEMM( 'N', 'N', N, N, N, ONE, Z, LDZ, WORK( INDWRK ),
+     $               N,
      $               ZERO, WORK( INDWK2 ), N )
          CALL SLACPY( 'A', N, N, WORK( INDWK2 ), N, Z, LDZ )
       END IF
@@ -348,7 +348,7 @@ SUBROUTINE SSBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       IF( ISCALE.EQ.1 )
      $   CALL SSCAL( N, ONE / SIGMA, W, 1 )
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       IWORK( 1 ) = LIWMIN
       RETURN
 *
diff --git a/SRC/ssbevd_2stage.f b/SRC/ssbevd_2stage.f
index 9687ee0243..6048153b90 100644
--- a/SRC/ssbevd_2stage.f
+++ b/SRC/ssbevd_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSBEVD_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssbevd_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssbevd_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -45,12 +43,6 @@
 *> the reduction to tridiagonal. If eigenvectors are desired, it uses
 *> a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -140,7 +132,7 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = (2KD+1)*N + KD*NTHREADS + N
@@ -194,7 +186,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup hbevd_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -212,7 +204,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -220,16 +212,17 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE SSBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
+      SUBROUTINE SSBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z,
+     $                          LDZ,
      $                          WORK, LWORK, IWORK, LIWORK, INFO )
 *
       IMPLICIT NONE
@@ -264,11 +257,13 @@ SUBROUTINE SSBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV2STAGE
-      REAL               SLAMCH, SLANSB
-      EXTERNAL           LSAME, SLAMCH, SLANSB, ILAENV2STAGE
+      REAL               SLAMCH, SLANSB, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, SLANSB, ILAENV2STAGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMM, SLACPY, SLASCL, SSCAL, SSTEDC,
+      EXTERNAL           SGEMM, SLACPY, SLASCL, SSCAL,
+     $                   SSTEDC,
      $                   SSTERF, XERBLA, SSYTRD_SB2ST
 *     ..
 *     .. Intrinsic Functions ..
@@ -287,9 +282,12 @@ SUBROUTINE SSBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
          LIWMIN = 1
          LWMIN = 1
       ELSE
-         IB    = ILAENV2STAGE( 2, 'SSYTRD_SB2ST', JOBZ, N, KD, -1, -1 )
-         LHTRD = ILAENV2STAGE( 3, 'SSYTRD_SB2ST', JOBZ, N, KD, IB, -1 )
-         LWTRD = ILAENV2STAGE( 4, 'SSYTRD_SB2ST', JOBZ, N, KD, IB, -1 )
+         IB    = ILAENV2STAGE( 2, 'SSYTRD_SB2ST', JOBZ, N, KD, -1,
+     $                         -1 )
+         LHTRD = ILAENV2STAGE( 3, 'SSYTRD_SB2ST', JOBZ, N, KD, IB,
+     $                         -1 )
+         LWTRD = ILAENV2STAGE( 4, 'SSYTRD_SB2ST', JOBZ, N, KD, IB,
+     $                         -1 )
          IF( WANTZ ) THEN
             LIWMIN = 3 + 5*N
             LWMIN = 1 + 5*N + 2*N**2
@@ -313,7 +311,7 @@ SUBROUTINE SSBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         WORK( 1 )  = LWMIN
+         WORK( 1 )  = SROUNDUP_LWORK(LWMIN)
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -364,9 +362,11 @@ SUBROUTINE SSBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL SLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL SLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL SLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL SLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
       END IF
 *
@@ -380,7 +380,7 @@ SUBROUTINE SSBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       LLWRK2  = LWORK - INDWK2 + 1
 *
       CALL SSYTRD_SB2ST( "N", JOBZ, UPLO, N, KD, AB, LDAB, W,
-     $                    WORK( INDE ), WORK( INDHOUS ), LHTRD, 
+     $                    WORK( INDE ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWRK ), LLWORK, IINFO )
 *
 *     For eigenvalues only, call SSTERF.  For eigenvectors, call SSTEDC.
@@ -390,7 +390,8 @@ SUBROUTINE SSBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       ELSE
          CALL SSTEDC( 'I', N, W, WORK( INDE ), WORK( INDWRK ), N,
      $                WORK( INDWK2 ), LLWRK2, IWORK, LIWORK, INFO )
-         CALL SGEMM( 'N', 'N', N, N, N, ONE, Z, LDZ, WORK( INDWRK ), N,
+         CALL SGEMM( 'N', 'N', N, N, N, ONE, Z, LDZ, WORK( INDWRK ),
+     $               N,
      $               ZERO, WORK( INDWK2 ), N )
          CALL SLACPY( 'A', N, N, WORK( INDWK2 ), N, Z, LDZ )
       END IF
@@ -400,7 +401,7 @@ SUBROUTINE SSBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       IF( ISCALE.EQ.1 )
      $   CALL SSCAL( N, ONE / SIGMA, W, 1 )
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       IWORK( 1 ) = LIWMIN
       RETURN
 *
diff --git a/SRC/ssbevx.f b/SRC/ssbevx.f
index 313d29e12a..6082c4bc37 100644
--- a/SRC/ssbevx.f
+++ b/SRC/ssbevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSBEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssbevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssbevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -256,12 +254,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup hbevx
 *
 *  =====================================================================
-      SUBROUTINE SSBEVX( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q, LDQ, VL,
+      SUBROUTINE SSBEVX( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q, LDQ,
+     $                   VL,
      $                   VU, IL, IU, ABSTOL, M, W, Z, LDZ, WORK, IWORK,
      $                   IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -299,7 +299,8 @@ SUBROUTINE SSBEVX( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q, LDQ, VL,
       EXTERNAL           LSAME, SLAMCH, SLANSB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEMV, SLACPY, SLASCL, SSBTRD, SSCAL,
+      EXTERNAL           SCOPY, SGEMV, SLACPY, SLASCL, SSBTRD,
+     $                   SSCAL,
      $                   SSTEBZ, SSTEIN, SSTEQR, SSTERF, SSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -407,9 +408,11 @@ SUBROUTINE SSBEVX( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q, LDQ, VL,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL SLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL SLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL SLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL SLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
          IF( ABSTOL.GT.0 )
      $      ABSTLL = ABSTOL*SIGMA
diff --git a/SRC/ssbevx_2stage.f b/SRC/ssbevx_2stage.f
index 224b676b74..b5421237a9 100644
--- a/SRC/ssbevx_2stage.f
+++ b/SRC/ssbevx_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSBEVX_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssbevx_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssbevx_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -235,7 +233,7 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, 7*N, dimension) where
 *>                                   dimension = (2KD+1)*N + KD*NTHREADS + 2*N
@@ -281,7 +279,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup hbevx_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -299,7 +297,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -307,16 +305,17 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE SSBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q,
+      SUBROUTINE SSBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB,
+     $                          Q,
      $                          LDQ, VL, VU, IL, IU, ABSTOL, M, W, Z,
      $                          LDZ, WORK, LWORK, IWORK, IFAIL, INFO )
 *
@@ -357,11 +356,13 @@ SUBROUTINE SSBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV2STAGE
-      REAL               SLAMCH, SLANSB
-      EXTERNAL           LSAME, SLAMCH, SLANSB, ILAENV2STAGE
+      REAL               SLAMCH, SLANSB, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, SLANSB, ILAENV2STAGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEMV, SLACPY, SLASCL, SSCAL,
+      EXTERNAL           SCOPY, SGEMV, SLACPY, SLASCL,
+     $                   SSCAL,
      $                   SSTEBZ, SSTEIN, SSTEQR, SSTERF, SSWAP, XERBLA,
      $                   SSYTRD_SB2ST
 *     ..
@@ -414,7 +415,7 @@ SUBROUTINE SSBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q,
       IF( INFO.EQ.0 ) THEN
          IF( N.LE.1 ) THEN
             LWMIN = 1
-            WORK( 1 ) = LWMIN
+            WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
          ELSE
             IB    = ILAENV2STAGE( 2, 'SSYTRD_SB2ST', JOBZ,
      $                            N, KD, -1, -1 )
@@ -423,7 +424,7 @@ SUBROUTINE SSBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q,
             LWTRD = ILAENV2STAGE( 4, 'SSYTRD_SB2ST', JOBZ,
      $                            N, KD, IB, -1 )
             LWMIN = 2*N + LHTRD + LWTRD
-            WORK( 1 )  = LWMIN
+            WORK( 1 )  = SROUNDUP_LWORK(LWMIN)
          ENDIF
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY )
@@ -492,9 +493,11 @@ SUBROUTINE SSBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL SLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL SLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL SLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL SLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
          IF( ABSTOL.GT.0 )
      $      ABSTLL = ABSTOL*SIGMA
@@ -512,8 +515,9 @@ SUBROUTINE SSBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q,
       INDWRK  = INDHOUS + LHTRD
       LLWORK  = LWORK - INDWRK + 1
 *
-      CALL SSYTRD_SB2ST( "N", JOBZ, UPLO, N, KD, AB, LDAB, WORK( INDD ),
-     $                    WORK( INDE ), WORK( INDHOUS ), LHTRD, 
+      CALL SSYTRD_SB2ST( "N", JOBZ, UPLO, N, KD, AB, LDAB,
+     $                   WORK( INDD ),
+     $                    WORK( INDE ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWRK ), LLWORK, IINFO )
 *
 *     If all eigenvalues are desired and ABSTOL is less than or equal
@@ -624,7 +628,7 @@ SUBROUTINE SSBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q,
 *
 *     Set WORK(1) to optimal workspace size.
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
 *
       RETURN
 *
diff --git a/SRC/ssbgst.f b/SRC/ssbgst.f
index 9faea00dca..2b65ee326a 100644
--- a/SRC/ssbgst.f
+++ b/SRC/ssbgst.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSBGST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssbgst.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssbgst.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,11 +149,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup hbgst
 *
 *  =====================================================================
-      SUBROUTINE SSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
+      SUBROUTINE SSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB,
+     $                   X,
      $                   LDX, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -187,7 +187,8 @@ SUBROUTINE SSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGER, SLAR2V, SLARGV, SLARTG, SLARTV, SLASET,
+      EXTERNAL           SGER, SLAR2V, SLARGV, SLARTG, SLARTV,
+     $                   SLASET,
      $                   SROT, SSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -427,7 +428,8 @@ SUBROUTINE SSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *           have been created outside the band
 *
             IF( NRT.GT.0 )
-     $         CALL SLARGV( NRT, AB( 1, J2T ), INCA, WORK( J2T-M ), KA1,
+     $         CALL SLARGV( NRT, AB( 1, J2T ), INCA, WORK( J2T-M ),
+     $                      KA1,
      $                      WORK( N+J2T-M ), KA1 )
             IF( NR.GT.0 ) THEN
 *
@@ -651,7 +653,8 @@ SUBROUTINE SSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *
 *                 generate rotation to annihilate a(i-k+ka+1,i)
 *
-                  CALL SLARTG( AB( KA1-K, I ), RA1, WORK( N+I-K+KA-M ),
+                  CALL SLARTG( AB( KA1-K, I ), RA1,
+     $                         WORK( N+I-K+KA-M ),
      $                         WORK( I-K+KA-M ), RA )
 *
 *                 create nonzero element a(i-k+ka+1,i-k) outside the
@@ -687,7 +690,8 @@ SUBROUTINE SSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *           have been created outside the band
 *
             IF( NRT.GT.0 )
-     $         CALL SLARGV( NRT, AB( KA1, J2T-KA ), INCA, WORK( J2T-M ),
+     $         CALL SLARGV( NRT, AB( KA1, J2T-KA ), INCA,
+     $                      WORK( J2T-M ),
      $                      KA1, WORK( N+J2T-M ), KA1 )
             IF( NR.GT.0 ) THEN
 *
@@ -702,7 +706,8 @@ SUBROUTINE SSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              apply rotations in 1st set from both sides to diagonal
 *              blocks
 *
-               CALL SLAR2V( NR, AB( 1, J2 ), AB( 1, J2+1 ), AB( 2, J2 ),
+               CALL SLAR2V( NR, AB( 1, J2 ), AB( 1, J2+1 ), AB( 2,
+     $                      J2 ),
      $                      INCA, WORK( N+J2-M ), WORK( J2-M ), KA1 )
 *
             END IF
@@ -783,7 +788,8 @@ SUBROUTINE SSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              generate rotations in 2nd set to annihilate elements
 *              which have been created outside the band
 *
-               CALL SLARGV( NR, AB( KA1, J2-KA ), INCA, WORK( J2 ), KA1,
+               CALL SLARGV( NR, AB( KA1, J2-KA ), INCA, WORK( J2 ),
+     $                      KA1,
      $                      WORK( N+J2 ), KA1 )
 *
 *              apply rotations in 2nd set from the left
@@ -797,7 +803,8 @@ SUBROUTINE SSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              apply rotations in 2nd set from both sides to diagonal
 *              blocks
 *
-               CALL SLAR2V( NR, AB( 1, J2 ), AB( 1, J2+1 ), AB( 2, J2 ),
+               CALL SLAR2V( NR, AB( 1, J2 ), AB( 1, J2+1 ), AB( 2,
+     $                      J2 ),
      $                      INCA, WORK( N+J2 ), WORK( J2 ), KA1 )
 *
             END IF
@@ -936,7 +943,8 @@ SUBROUTINE SSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *
                CALL SSCAL( NX, ONE / BII, X( 1, I ), 1 )
                IF( KBT.GT.0 )
-     $            CALL SGER( NX, KBT, -ONE, X( 1, I ), 1, BB( KB, I+1 ),
+     $            CALL SGER( NX, KBT, -ONE, X( 1, I ), 1, BB( KB,
+     $                       I+1 ),
      $                       LDBB-1, X( 1, I+1 ), LDX )
             END IF
 *
@@ -994,7 +1002,8 @@ SUBROUTINE SSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *           have been created outside the band
 *
             IF( NRT.GT.0 )
-     $         CALL SLARGV( NRT, AB( 1, J1+KA ), INCA, WORK( J1 ), KA1,
+     $         CALL SLARGV( NRT, AB( 1, J1+KA ), INCA, WORK( J1 ),
+     $                      KA1,
      $                      WORK( N+J1 ), KA1 )
             IF( NR.GT.0 ) THEN
 *
@@ -1094,7 +1103,8 @@ SUBROUTINE SSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              generate rotations in 2nd set to annihilate elements
 *              which have been created outside the band
 *
-               CALL SLARGV( NR, AB( 1, J1+KA ), INCA, WORK( M-KB+J1 ),
+               CALL SLARGV( NR, AB( 1, J1+KA ), INCA,
+     $                      WORK( M-KB+J1 ),
      $                      KA1, WORK( N+M-KB+J1 ), KA1 )
 *
 *              apply rotations in 2nd set from the left
@@ -1200,7 +1210,8 @@ SUBROUTINE SSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *
                CALL SSCAL( NX, ONE / BII, X( 1, I ), 1 )
                IF( KBT.GT.0 )
-     $            CALL SGER( NX, KBT, -ONE, X( 1, I ), 1, BB( 2, I ), 1,
+     $            CALL SGER( NX, KBT, -ONE, X( 1, I ), 1, BB( 2, I ),
+     $                       1,
      $                       X( 1, I+1 ), LDX )
             END IF
 *
@@ -1258,14 +1269,16 @@ SUBROUTINE SSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *           have been created outside the band
 *
             IF( NRT.GT.0 )
-     $         CALL SLARGV( NRT, AB( KA1, J1 ), INCA, WORK( J1 ), KA1,
+     $         CALL SLARGV( NRT, AB( KA1, J1 ), INCA, WORK( J1 ),
+     $                      KA1,
      $                      WORK( N+J1 ), KA1 )
             IF( NR.GT.0 ) THEN
 *
 *              apply rotations in 1st set from the right
 *
                DO 810 L = 1, KA - 1
-                  CALL SLARTV( NR, AB( L+1, J1 ), INCA, AB( L+2, J1-1 ),
+                  CALL SLARTV( NR, AB( L+1, J1 ), INCA, AB( L+2,
+     $                         J1-1 ),
      $                         INCA, WORK( N+J1 ), WORK( J1 ), KA1 )
   810          CONTINUE
 *
@@ -1363,7 +1376,8 @@ SUBROUTINE SSBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              apply rotations in 2nd set from the right
 *
                DO 890 L = 1, KA - 1
-                  CALL SLARTV( NR, AB( L+1, J1 ), INCA, AB( L+2, J1-1 ),
+                  CALL SLARTV( NR, AB( L+1, J1 ), INCA, AB( L+2,
+     $                         J1-1 ),
      $                         INCA, WORK( N+M-KB+J1 ), WORK( M-KB+J1 ),
      $                         KA1 )
   890          CONTINUE
diff --git a/SRC/ssbgv.f b/SRC/ssbgv.f
index 0a7f73e0a8..40a0017f48 100644
--- a/SRC/ssbgv.f
+++ b/SRC/ssbgv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSBGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssbgv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssbgv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -169,11 +167,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup hbgv
 *
 *  =====================================================================
-      SUBROUTINE SSBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W, Z,
+      SUBROUTINE SSBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
+     $                  Z,
      $                  LDZ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -200,7 +200,8 @@ SUBROUTINE SSBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W, Z,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SPBSTF, SSBGST, SSBTRD, SSTEQR, SSTERF, XERBLA
+      EXTERNAL           SPBSTF, SSBGST, SSBTRD, SSTEQR, SSTERF,
+     $                   XERBLA
 *     ..
 *     .. Executable Statements ..
 *
@@ -228,7 +229,7 @@ SUBROUTINE SSBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W, Z,
          INFO = -12
       END IF
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'SSBGV ', -INFO )
+         CALL XERBLA( 'SSBGV', -INFO )
          RETURN
       END IF
 *
@@ -259,7 +260,8 @@ SUBROUTINE SSBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W, Z,
       ELSE
          VECT = 'N'
       END IF
-      CALL SSBTRD( VECT, UPLO, N, KA, AB, LDAB, W, WORK( INDE ), Z, LDZ,
+      CALL SSBTRD( VECT, UPLO, N, KA, AB, LDAB, W, WORK( INDE ), Z,
+     $             LDZ,
      $             WORK( INDWRK ), IINFO )
 *
 *     For eigenvalues only, call SSTERF.  For eigenvectors, call SSTEQR.
@@ -267,7 +269,8 @@ SUBROUTINE SSBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W, Z,
       IF( .NOT.WANTZ ) THEN
          CALL SSTERF( N, W, WORK( INDE ), INFO )
       ELSE
-         CALL SSTEQR( JOBZ, N, W, WORK( INDE ), Z, LDZ, WORK( INDWRK ),
+         CALL SSTEQR( JOBZ, N, W, WORK( INDE ), Z, LDZ,
+     $                WORK( INDWRK ),
      $                INFO )
       END IF
       RETURN
diff --git a/SRC/ssbgvd.f b/SRC/ssbgvd.f
index 6dd1fe952b..6138b79485 100644
--- a/SRC/ssbgvd.f
+++ b/SRC/ssbgvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSBGVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssbgvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssbgvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -43,12 +41,6 @@
 *> banded, and B is also positive definite.  If eigenvectors are
 *> desired, it uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -214,7 +206,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup hbgvd
 *
 *> \par Contributors:
 *  ==================
@@ -222,8 +214,10 @@
 *>     Mark Fahey, Department of Mathematics, Univ. of Kentucky, USA
 *
 *  =====================================================================
-      SUBROUTINE SSBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
+      SUBROUTINE SSBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB,
+     $                   W,
      $                   Z, LDZ, WORK, LWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -253,10 +247,12 @@ SUBROUTINE SSBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMM, SLACPY, SPBSTF, SSBGST, SSBTRD, SSTEDC,
+      EXTERNAL           SGEMM, SLACPY, SPBSTF, SSBGST, SSBTRD,
+     $                   SSTEDC,
      $                   SSTERF, XERBLA
 *     ..
 *     .. Executable Statements ..
@@ -298,7 +294,7 @@ SUBROUTINE SSBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         WORK( 1 ) = LWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -344,7 +340,8 @@ SUBROUTINE SSBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
       ELSE
          VECT = 'N'
       END IF
-      CALL SSBTRD( VECT, UPLO, N, KA, AB, LDAB, W, WORK( INDE ), Z, LDZ,
+      CALL SSBTRD( VECT, UPLO, N, KA, AB, LDAB, W, WORK( INDE ), Z,
+     $             LDZ,
      $             WORK( INDWRK ), IINFO )
 *
 *     For eigenvalues only, call SSTERF. For eigenvectors, call SSTEDC.
@@ -354,12 +351,13 @@ SUBROUTINE SSBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
       ELSE
          CALL SSTEDC( 'I', N, W, WORK( INDE ), WORK( INDWRK ), N,
      $                WORK( INDWK2 ), LLWRK2, IWORK, LIWORK, INFO )
-         CALL SGEMM( 'N', 'N', N, N, N, ONE, Z, LDZ, WORK( INDWRK ), N,
+         CALL SGEMM( 'N', 'N', N, N, N, ONE, Z, LDZ, WORK( INDWRK ),
+     $               N,
      $               ZERO, WORK( INDWK2 ), N )
          CALL SLACPY( 'A', N, N, WORK( INDWK2 ), N, Z, LDZ )
       END IF
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/ssbgvx.f b/SRC/ssbgvx.f
index 64a67534e1..52191190b9 100644
--- a/SRC/ssbgvx.f
+++ b/SRC/ssbgvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSBGVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssbgvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssbgvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -267,7 +265,7 @@
 *>                  Their indices are stored in IFAIL.
 *>          > N:  SPBSTF returned an error code; i.e.,
 *>                if INFO = N + i, for 1 <= i <= N, then the leading
-*>                minor of order i of B is not positive definite.
+*>                principal minor of order i of B is not positive.
 *>                The factorization of B could not be completed and
 *>                no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -280,7 +278,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup hbgvx
 *
 *> \par Contributors:
 *  ==================
@@ -291,6 +289,7 @@
       SUBROUTINE SSBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
      $                   LDBB, Q, LDQ, VL, VU, IL, IU, ABSTOL, M, W, Z,
      $                   LDZ, WORK, IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -317,7 +316,7 @@ SUBROUTINE SSBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
 *     .. Local Scalars ..
       LOGICAL            ALLEIG, INDEIG, TEST, UPPER, VALEIG, WANTZ
       CHARACTER          ORDER, VECT
-      INTEGER            I, IINFO, INDD, INDE, INDEE, INDIBL, INDISP,
+      INTEGER            I, IINFO, INDD, INDE, INDEE, INDISP,
      $                   INDIWO, INDWRK, ITMP1, J, JJ, NSPLIT
       REAL               TMP1
 *     ..
@@ -326,7 +325,8 @@ SUBROUTINE SSBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEMV, SLACPY, SPBSTF, SSBGST, SSBTRD,
+      EXTERNAL           SCOPY, SGEMV, SLACPY, SPBSTF, SSBGST,
+     $                   SSBTRD,
      $                   SSTEBZ, SSTEIN, SSTEQR, SSTERF, SSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -457,17 +457,16 @@ SUBROUTINE SSBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
       ELSE
          ORDER = 'E'
       END IF
-      INDIBL = 1
-      INDISP = INDIBL + N
+      INDISP = 1 + N
       INDIWO = INDISP + N
       CALL SSTEBZ( RANGE, ORDER, N, VL, VU, IL, IU, ABSTOL,
      $             WORK( INDD ), WORK( INDE ), M, NSPLIT, W,
-     $             IWORK( INDIBL ), IWORK( INDISP ), WORK( INDWRK ),
+     $             IWORK( 1 ), IWORK( INDISP ), WORK( INDWRK ),
      $             IWORK( INDIWO ), INFO )
 *
       IF( WANTZ ) THEN
          CALL SSTEIN( N, WORK( INDD ), WORK( INDE ), M, W,
-     $                IWORK( INDIBL ), IWORK( INDISP ), Z, LDZ,
+     $                IWORK( 1 ), IWORK( INDISP ), Z, LDZ,
      $                WORK( INDWRK ), IWORK( INDIWO ), IFAIL, INFO )
 *
 *        Apply transformation matrix used in reduction to tridiagonal
@@ -497,11 +496,11 @@ SUBROUTINE SSBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
    40       CONTINUE
 *
             IF( I.NE.0 ) THEN
-               ITMP1 = IWORK( INDIBL+I-1 )
+               ITMP1 = IWORK( 1 + I-1 )
                W( I ) = W( J )
-               IWORK( INDIBL+I-1 ) = IWORK( INDIBL+J-1 )
+               IWORK( 1 + I-1 ) = IWORK( 1 + J-1 )
                W( J ) = TMP1
-               IWORK( INDIBL+J-1 ) = ITMP1
+               IWORK( 1 + J-1 ) = ITMP1
                CALL SSWAP( N, Z( 1, I ), 1, Z( 1, J ), 1 )
                IF( INFO.NE.0 ) THEN
                   ITMP1 = IFAIL( I )
diff --git a/SRC/ssbtrd.f b/SRC/ssbtrd.f
index f0d1720352..5a1780472f 100644
--- a/SRC/ssbtrd.f
+++ b/SRC/ssbtrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSBTRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssbtrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssbtrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -147,7 +145,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup hbtrd
 *
 *> \par Further Details:
 *  =====================
@@ -160,6 +158,7 @@
 *  =====================================================================
       SUBROUTINE SSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,7 +187,8 @@ SUBROUTINE SSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
       REAL               TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLAR2V, SLARGV, SLARTG, SLARTV, SLASET, SROT,
+      EXTERNAL           SLAR2V, SLARGV, SLARTG, SLARTV, SLASET,
+     $                   SROT,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -270,7 +270,8 @@ SUBROUTINE SSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
 *                    generate plane rotations to annihilate nonzero
 *                    elements which have been created outside the band
 *
-                     CALL SLARGV( NR, AB( 1, J1-1 ), INCA, WORK( J1 ),
+                     CALL SLARGV( NR, AB( 1, J1-1 ), INCA,
+     $                            WORK( J1 ),
      $                            KD1, D( J1 ), KD1 )
 *
 *                    apply rotations from the right
@@ -341,7 +342,8 @@ SUBROUTINE SSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                               NRT = NR
                            END IF
                            IF( NRT.GT.0 )
-     $                        CALL SLARTV( NRT, AB( KD-L, J1+L ), INCA,
+     $                        CALL SLARTV( NRT, AB( KD-L, J1+L ),
+     $                                     INCA,
      $                                     AB( KD-L+1, J1+L ), INCA,
      $                                     D( J1 ), WORK( J1 ), KD1 )
    30                   CONTINUE
@@ -349,7 +351,8 @@ SUBROUTINE SSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                         J1END = J1 + KD1*( NR-2 )
                         IF( J1END.GE.J1 ) THEN
                            DO 40 JIN = J1, J1END, KD1
-                              CALL SROT( KD-1, AB( KD-1, JIN+1 ), INCX,
+                              CALL SROT( KD-1, AB( KD-1, JIN+1 ),
+     $                                   INCX,
      $                                   AB( KD, JIN+1 ), INCX,
      $                                   D( JIN ), WORK( JIN ) )
    40                      CONTINUE
@@ -384,13 +387,15 @@ SUBROUTINE SSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                            IQB = MAX( 1, J-IBL )
                            NQ = 1 + IQAEND - IQB
                            IQAEND = MIN( IQAEND+KD, IQEND )
-                           CALL SROT( NQ, Q( IQB, J-1 ), 1, Q( IQB, J ),
+                           CALL SROT( NQ, Q( IQB, J-1 ), 1, Q( IQB,
+     $                                J ),
      $                                1, D( J ), WORK( J ) )
    50                   CONTINUE
                      ELSE
 *
                         DO 60 J = J1, J2, KD1
-                           CALL SROT( N, Q( 1, J-1 ), 1, Q( 1, J ), 1,
+                           CALL SROT( N, Q( 1, J-1 ), 1, Q( 1, J ),
+     $                                1,
      $                                D( J ), WORK( J ) )
    60                   CONTINUE
                      END IF
@@ -473,7 +478,8 @@ SUBROUTINE SSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
 *
                      IF( NR.GT.2*KD-1 ) THEN
                         DO 130 L = 1, KD - 1
-                           CALL SLARTV( NR, AB( KD1-L, J1-KD1+L ), INCA,
+                           CALL SLARTV( NR, AB( KD1-L, J1-KD1+L ),
+     $                                  INCA,
      $                                  AB( KD1-L+1, J1-KD1+L ), INCA,
      $                                  D( J1 ), WORK( J1 ), KD1 )
   130                   CONTINUE
@@ -531,7 +537,8 @@ SUBROUTINE SSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                               NRT = NR
                            END IF
                            IF( NRT.GT.0 )
-     $                        CALL SLARTV( NRT, AB( L+2, J1-1 ), INCA,
+     $                        CALL SLARTV( NRT, AB( L+2, J1-1 ),
+     $                                     INCA,
      $                                     AB( L+1, J1 ), INCA, D( J1 ),
      $                                     WORK( J1 ), KD1 )
   150                   CONTINUE
@@ -576,13 +583,15 @@ SUBROUTINE SSBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                            IQB = MAX( 1, J-IBL )
                            NQ = 1 + IQAEND - IQB
                            IQAEND = MIN( IQAEND+KD, IQEND )
-                           CALL SROT( NQ, Q( IQB, J-1 ), 1, Q( IQB, J ),
+                           CALL SROT( NQ, Q( IQB, J-1 ), 1, Q( IQB,
+     $                                J ),
      $                                1, D( J ), WORK( J ) )
   170                   CONTINUE
                      ELSE
 *
                         DO 180 J = J1, J2, KD1
-                           CALL SROT( N, Q( 1, J-1 ), 1, Q( 1, J ), 1,
+                           CALL SROT( N, Q( 1, J-1 ), 1, Q( 1, J ),
+     $                                1,
      $                                D( J ), WORK( J ) )
   180                   CONTINUE
                      END IF
diff --git a/SRC/ssfrk.f b/SRC/ssfrk.f
index ff477fc4c6..0452e95880 100644
--- a/SRC/ssfrk.f
+++ b/SRC/ssfrk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSFRK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssfrk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssfrk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -158,11 +156,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup hfrk
 *
 *  =====================================================================
-      SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
+      SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA,
+     $                  BETA,
      $                  C )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -281,9 +281,11 @@ SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL SSYRK( 'L', 'N', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 1 ), N )
-                  CALL SSYRK( 'U', 'N', N2, K, ALPHA, A( N1+1, 1 ), LDA,
+                  CALL SSYRK( 'U', 'N', N2, K, ALPHA, A( N1+1, 1 ),
+     $                        LDA,
      $                        BETA, C( N+1 ), N )
-                  CALL SGEMM( 'N', 'T', N2, N1, K, ALPHA, A( N1+1, 1 ),
+                  CALL SGEMM( 'N', 'T', N2, N1, K, ALPHA, A( N1+1,
+     $                        1 ),
      $                        LDA, A( 1, 1 ), LDA, BETA, C( N1+1 ), N )
 *
                ELSE
@@ -292,9 +294,11 @@ SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL SSYRK( 'L', 'T', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 1 ), N )
-                  CALL SSYRK( 'U', 'T', N2, K, ALPHA, A( 1, N1+1 ), LDA,
+                  CALL SSYRK( 'U', 'T', N2, K, ALPHA, A( 1, N1+1 ),
+     $                        LDA,
      $                        BETA, C( N+1 ), N )
-                  CALL SGEMM( 'T', 'N', N2, N1, K, ALPHA, A( 1, N1+1 ),
+                  CALL SGEMM( 'T', 'N', N2, N1, K, ALPHA, A( 1,
+     $                        N1+1 ),
      $                        LDA, A( 1, 1 ), LDA, BETA, C( N1+1 ), N )
 *
                END IF
@@ -309,7 +313,8 @@ SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL SSYRK( 'L', 'N', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( N2+1 ), N )
-                  CALL SSYRK( 'U', 'N', N2, K, ALPHA, A( N2, 1 ), LDA,
+                  CALL SSYRK( 'U', 'N', N2, K, ALPHA, A( N2, 1 ),
+     $                        LDA,
      $                        BETA, C( N1+1 ), N )
                   CALL SGEMM( 'N', 'T', N1, N2, K, ALPHA, A( 1, 1 ),
      $                        LDA, A( N2, 1 ), LDA, BETA, C( 1 ), N )
@@ -320,7 +325,8 @@ SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL SSYRK( 'L', 'T', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( N2+1 ), N )
-                  CALL SSYRK( 'U', 'T', N2, K, ALPHA, A( 1, N2 ), LDA,
+                  CALL SSYRK( 'U', 'T', N2, K, ALPHA, A( 1, N2 ),
+     $                        LDA,
      $                        BETA, C( N1+1 ), N )
                   CALL SGEMM( 'T', 'N', N1, N2, K, ALPHA, A( 1, 1 ),
      $                        LDA, A( 1, N2 ), LDA, BETA, C( 1 ), N )
@@ -343,7 +349,8 @@ SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL SSYRK( 'U', 'N', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 1 ), N1 )
-                  CALL SSYRK( 'L', 'N', N2, K, ALPHA, A( N1+1, 1 ), LDA,
+                  CALL SSYRK( 'L', 'N', N2, K, ALPHA, A( N1+1, 1 ),
+     $                        LDA,
      $                        BETA, C( 2 ), N1 )
                   CALL SGEMM( 'N', 'T', N1, N2, K, ALPHA, A( 1, 1 ),
      $                        LDA, A( N1+1, 1 ), LDA, BETA,
@@ -355,7 +362,8 @@ SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL SSYRK( 'U', 'T', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 1 ), N1 )
-                  CALL SSYRK( 'L', 'T', N2, K, ALPHA, A( 1, N1+1 ), LDA,
+                  CALL SSYRK( 'L', 'T', N2, K, ALPHA, A( 1, N1+1 ),
+     $                        LDA,
      $                        BETA, C( 2 ), N1 )
                   CALL SGEMM( 'T', 'N', N1, N2, K, ALPHA, A( 1, 1 ),
      $                        LDA, A( 1, N1+1 ), LDA, BETA,
@@ -373,9 +381,11 @@ SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL SSYRK( 'U', 'N', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( N2*N2+1 ), N2 )
-                  CALL SSYRK( 'L', 'N', N2, K, ALPHA, A( N1+1, 1 ), LDA,
+                  CALL SSYRK( 'L', 'N', N2, K, ALPHA, A( N1+1, 1 ),
+     $                        LDA,
      $                        BETA, C( N1*N2+1 ), N2 )
-                  CALL SGEMM( 'N', 'T', N2, N1, K, ALPHA, A( N1+1, 1 ),
+                  CALL SGEMM( 'N', 'T', N2, N1, K, ALPHA, A( N1+1,
+     $                        1 ),
      $                        LDA, A( 1, 1 ), LDA, BETA, C( 1 ), N2 )
 *
                ELSE
@@ -384,9 +394,11 @@ SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL SSYRK( 'U', 'T', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( N2*N2+1 ), N2 )
-                  CALL SSYRK( 'L', 'T', N2, K, ALPHA, A( 1, N1+1 ), LDA,
+                  CALL SSYRK( 'L', 'T', N2, K, ALPHA, A( 1, N1+1 ),
+     $                        LDA,
      $                        BETA, C( N1*N2+1 ), N2 )
-                  CALL SGEMM( 'T', 'N', N2, N1, K, ALPHA, A( 1, N1+1 ),
+                  CALL SGEMM( 'T', 'N', N2, N1, K, ALPHA, A( 1,
+     $                        N1+1 ),
      $                        LDA, A( 1, 1 ), LDA, BETA, C( 1 ), N2 )
 *
                END IF
@@ -413,9 +425,11 @@ SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL SSYRK( 'L', 'N', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 2 ), N+1 )
-                  CALL SSYRK( 'U', 'N', NK, K, ALPHA, A( NK+1, 1 ), LDA,
+                  CALL SSYRK( 'U', 'N', NK, K, ALPHA, A( NK+1, 1 ),
+     $                        LDA,
      $                        BETA, C( 1 ), N+1 )
-                  CALL SGEMM( 'N', 'T', NK, NK, K, ALPHA, A( NK+1, 1 ),
+                  CALL SGEMM( 'N', 'T', NK, NK, K, ALPHA, A( NK+1,
+     $                        1 ),
      $                        LDA, A( 1, 1 ), LDA, BETA, C( NK+2 ),
      $                        N+1 )
 *
@@ -425,9 +439,11 @@ SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL SSYRK( 'L', 'T', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 2 ), N+1 )
-                  CALL SSYRK( 'U', 'T', NK, K, ALPHA, A( 1, NK+1 ), LDA,
+                  CALL SSYRK( 'U', 'T', NK, K, ALPHA, A( 1, NK+1 ),
+     $                        LDA,
      $                        BETA, C( 1 ), N+1 )
-                  CALL SGEMM( 'T', 'N', NK, NK, K, ALPHA, A( 1, NK+1 ),
+                  CALL SGEMM( 'T', 'N', NK, NK, K, ALPHA, A( 1,
+     $                        NK+1 ),
      $                        LDA, A( 1, 1 ), LDA, BETA, C( NK+2 ),
      $                        N+1 )
 *
@@ -443,7 +459,8 @@ SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL SSYRK( 'L', 'N', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK+2 ), N+1 )
-                  CALL SSYRK( 'U', 'N', NK, K, ALPHA, A( NK+1, 1 ), LDA,
+                  CALL SSYRK( 'U', 'N', NK, K, ALPHA, A( NK+1, 1 ),
+     $                        LDA,
      $                        BETA, C( NK+1 ), N+1 )
                   CALL SGEMM( 'N', 'T', NK, NK, K, ALPHA, A( 1, 1 ),
      $                        LDA, A( NK+1, 1 ), LDA, BETA, C( 1 ),
@@ -455,7 +472,8 @@ SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL SSYRK( 'L', 'T', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK+2 ), N+1 )
-                  CALL SSYRK( 'U', 'T', NK, K, ALPHA, A( 1, NK+1 ), LDA,
+                  CALL SSYRK( 'U', 'T', NK, K, ALPHA, A( 1, NK+1 ),
+     $                        LDA,
      $                        BETA, C( NK+1 ), N+1 )
                   CALL SGEMM( 'T', 'N', NK, NK, K, ALPHA, A( 1, 1 ),
      $                        LDA, A( 1, NK+1 ), LDA, BETA, C( 1 ),
@@ -479,7 +497,8 @@ SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL SSYRK( 'U', 'N', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK+1 ), NK )
-                  CALL SSYRK( 'L', 'N', NK, K, ALPHA, A( NK+1, 1 ), LDA,
+                  CALL SSYRK( 'L', 'N', NK, K, ALPHA, A( NK+1, 1 ),
+     $                        LDA,
      $                        BETA, C( 1 ), NK )
                   CALL SGEMM( 'N', 'T', NK, NK, K, ALPHA, A( 1, 1 ),
      $                        LDA, A( NK+1, 1 ), LDA, BETA,
@@ -491,7 +510,8 @@ SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL SSYRK( 'U', 'T', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK+1 ), NK )
-                  CALL SSYRK( 'L', 'T', NK, K, ALPHA, A( 1, NK+1 ), LDA,
+                  CALL SSYRK( 'L', 'T', NK, K, ALPHA, A( 1, NK+1 ),
+     $                        LDA,
      $                        BETA, C( 1 ), NK )
                   CALL SGEMM( 'T', 'N', NK, NK, K, ALPHA, A( 1, 1 ),
      $                        LDA, A( 1, NK+1 ), LDA, BETA,
@@ -509,9 +529,11 @@ SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL SSYRK( 'U', 'N', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK*( NK+1 )+1 ), NK )
-                  CALL SSYRK( 'L', 'N', NK, K, ALPHA, A( NK+1, 1 ), LDA,
+                  CALL SSYRK( 'L', 'N', NK, K, ALPHA, A( NK+1, 1 ),
+     $                        LDA,
      $                        BETA, C( NK*NK+1 ), NK )
-                  CALL SGEMM( 'N', 'T', NK, NK, K, ALPHA, A( NK+1, 1 ),
+                  CALL SGEMM( 'N', 'T', NK, NK, K, ALPHA, A( NK+1,
+     $                        1 ),
      $                        LDA, A( 1, 1 ), LDA, BETA, C( 1 ), NK )
 *
                ELSE
@@ -520,9 +542,11 @@ SUBROUTINE SSFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL SSYRK( 'U', 'T', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK*( NK+1 )+1 ), NK )
-                  CALL SSYRK( 'L', 'T', NK, K, ALPHA, A( 1, NK+1 ), LDA,
+                  CALL SSYRK( 'L', 'T', NK, K, ALPHA, A( 1, NK+1 ),
+     $                        LDA,
      $                        BETA, C( NK*NK+1 ), NK )
-                  CALL SGEMM( 'T', 'N', NK, NK, K, ALPHA, A( 1, NK+1 ),
+                  CALL SGEMM( 'T', 'N', NK, NK, K, ALPHA, A( 1,
+     $                        NK+1 ),
      $                        LDA, A( 1, 1 ), LDA, BETA, C( 1 ), NK )
 *
                END IF
diff --git a/SRC/sspcon.f b/SRC/sspcon.f
index a9ac881d32..cbec3e2801 100644
--- a/SRC/sspcon.f
+++ b/SRC/sspcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSPCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sspcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sspcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,11 +115,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup hpcon
 *
 *  =====================================================================
-      SUBROUTINE SSPCON( UPLO, N, AP, IPIV, ANORM, RCOND, WORK, IWORK,
+      SUBROUTINE SSPCON( UPLO, N, AP, IPIV, ANORM, RCOND, WORK,
+     $                   IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sspev.f b/SRC/sspev.f
index 8fb6a2d9d9..739a970412 100644
--- a/SRC/sspev.f
+++ b/SRC/sspev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSPEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sspev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sspev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,10 +121,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup hpev
 *
 *  =====================================================================
       SUBROUTINE SSPEV( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -158,7 +157,8 @@ SUBROUTINE SSPEV( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, INFO )
       EXTERNAL           LSAME, SLAMCH, SLANSP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SOPGTR, SSCAL, SSPTRD, SSTEQR, SSTERF, XERBLA
+      EXTERNAL           SOPGTR, SSCAL, SSPTRD, SSTEQR, SSTERF,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          SQRT
@@ -172,7 +172,8 @@ SUBROUTINE SSPEV( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, INFO )
       INFO = 0
       IF( .NOT.( WANTZ .OR. LSAME( JOBZ, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.( LSAME( UPLO, 'U' ) .OR. LSAME( UPLO, 'L' ) ) )
+      ELSE IF( .NOT.( LSAME( UPLO, 'U' ) .OR.
+     $         LSAME( UPLO, 'L' ) ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -226,7 +227,8 @@ SUBROUTINE SSPEV( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, INFO )
 *
       INDE = 1
       INDTAU = INDE + N
-      CALL SSPTRD( UPLO, N, AP, W, WORK( INDE ), WORK( INDTAU ), IINFO )
+      CALL SSPTRD( UPLO, N, AP, W, WORK( INDE ), WORK( INDTAU ),
+     $             IINFO )
 *
 *     For eigenvalues only, call SSTERF.  For eigenvectors, first call
 *     SOPGTR to generate the orthogonal matrix, then call SSTEQR.
@@ -237,7 +239,8 @@ SUBROUTINE SSPEV( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, INFO )
          INDWRK = INDTAU + N
          CALL SOPGTR( UPLO, N, AP, WORK( INDTAU ), Z, LDZ,
      $                WORK( INDWRK ), IINFO )
-         CALL SSTEQR( JOBZ, N, W, WORK( INDE ), Z, LDZ, WORK( INDTAU ),
+         CALL SSTEQR( JOBZ, N, W, WORK( INDE ), Z, LDZ,
+     $                WORK( INDTAU ),
      $                INFO )
       END IF
 *
diff --git a/SRC/sspevd.f b/SRC/sspevd.f
index 56329da341..8b7d768ffa 100644
--- a/SRC/sspevd.f
+++ b/SRC/sspevd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSPEVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sspevd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sspevd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -40,12 +38,6 @@
 *> of a real symmetric matrix A in packed storage. If eigenvectors are
 *> desired, it uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -170,11 +162,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup hpevd
 *
 *  =====================================================================
       SUBROUTINE SSPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
      $                   IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -204,11 +197,13 @@ SUBROUTINE SSPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               SLAMCH, SLANSP
-      EXTERNAL           LSAME, SLAMCH, SLANSP
+      REAL               SLAMCH, SLANSP, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, SLANSP,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SOPMTR, SSCAL, SSPTRD, SSTEDC, SSTERF, XERBLA
+      EXTERNAL           SOPMTR, SSCAL, SSPTRD, SSTEDC, SSTERF,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          SQRT
@@ -223,7 +218,8 @@ SUBROUTINE SSPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
       INFO = 0
       IF( .NOT.( WANTZ .OR. LSAME( JOBZ, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.( LSAME( UPLO, 'U' ) .OR. LSAME( UPLO, 'L' ) ) )
+      ELSE IF( .NOT.( LSAME( UPLO, 'U' ) .OR.
+     $         LSAME( UPLO, 'L' ) ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -246,7 +242,7 @@ SUBROUTINE SSPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
             END IF
          END IF
          IWORK( 1 ) = LIWMIN
-         WORK( 1 ) = LWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
             INFO = -9
@@ -302,7 +298,8 @@ SUBROUTINE SSPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
 *
       INDE = 1
       INDTAU = INDE + N
-      CALL SSPTRD( UPLO, N, AP, W, WORK( INDE ), WORK( INDTAU ), IINFO )
+      CALL SSPTRD( UPLO, N, AP, W, WORK( INDE ), WORK( INDTAU ),
+     $             IINFO )
 *
 *     For eigenvalues only, call SSTERF.  For eigenvectors, first call
 *     SSTEDC to generate the eigenvector matrix, WORK(INDWRK), of the
@@ -314,9 +311,11 @@ SUBROUTINE SSPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
       ELSE
          INDWRK = INDTAU + N
          LLWORK = LWORK - INDWRK + 1
-         CALL SSTEDC( 'I', N, W, WORK( INDE ), Z, LDZ, WORK( INDWRK ),
+         CALL SSTEDC( 'I', N, W, WORK( INDE ), Z, LDZ,
+     $                WORK( INDWRK ),
      $                LLWORK, IWORK, LIWORK, INFO )
-         CALL SOPMTR( 'L', UPLO, 'N', N, N, AP, WORK( INDTAU ), Z, LDZ,
+         CALL SOPMTR( 'L', UPLO, 'N', N, N, AP, WORK( INDTAU ), Z,
+     $                LDZ,
      $                WORK( INDWRK ), IINFO )
       END IF
 *
@@ -325,7 +324,7 @@ SUBROUTINE SSPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
       IF( ISCALE.EQ.1 )
      $   CALL SSCAL( N, ONE / SIGMA, W, 1 )
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       IWORK( 1 ) = LIWMIN
       RETURN
 *
diff --git a/SRC/sspevx.f b/SRC/sspevx.f
index e33712d58f..3c66d47600 100644
--- a/SRC/sspevx.f
+++ b/SRC/sspevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSPEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sspevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sspevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -225,12 +223,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup hpevx
 *
 *  =====================================================================
       SUBROUTINE SSPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
      $                   ABSTOL, M, W, Z, LDZ, WORK, IWORK, IFAIL,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -255,7 +254,7 @@ SUBROUTINE SSPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
 *     .. Local Scalars ..
       LOGICAL            ALLEIG, INDEIG, TEST, VALEIG, WANTZ
       CHARACTER          ORDER
-      INTEGER            I, IINFO, IMAX, INDD, INDE, INDEE, INDIBL,
+      INTEGER            I, IINFO, IMAX, INDD, INDE, INDEE,
      $                   INDISP, INDIWO, INDTAU, INDWRK, ISCALE, ITMP1,
      $                   J, JJ, NSPLIT
       REAL               ABSTLL, ANRM, BIGNUM, EPS, RMAX, RMIN, SAFMIN,
@@ -267,7 +266,8 @@ SUBROUTINE SSPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
       EXTERNAL           LSAME, SLAMCH, SLANSP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SOPGTR, SOPMTR, SSCAL, SSPTRD, SSTEBZ,
+      EXTERNAL           SCOPY, SOPGTR, SOPMTR, SSCAL, SSPTRD,
+     $                   SSTEBZ,
      $                   SSTEIN, SSTEQR, SSTERF, SSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -287,7 +287,8 @@ SUBROUTINE SSPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
          INFO = -1
       ELSE IF( .NOT.( ALLEIG .OR. VALEIG .OR. INDEIG ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.( LSAME( UPLO, 'L' ) .OR. LSAME( UPLO, 'U' ) ) )
+      ELSE IF( .NOT.( LSAME( UPLO, 'L' ) .OR.
+     $         LSAME( UPLO, 'U' ) ) )
      $          THEN
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
@@ -424,23 +425,23 @@ SUBROUTINE SSPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
       ELSE
          ORDER = 'E'
       END IF
-      INDIBL = 1
-      INDISP = INDIBL + N
+      INDISP = 1 + N
       INDIWO = INDISP + N
       CALL SSTEBZ( RANGE, ORDER, N, VLL, VUU, IL, IU, ABSTLL,
      $             WORK( INDD ), WORK( INDE ), M, NSPLIT, W,
-     $             IWORK( INDIBL ), IWORK( INDISP ), WORK( INDWRK ),
+     $             IWORK( 1 ), IWORK( INDISP ), WORK( INDWRK ),
      $             IWORK( INDIWO ), INFO )
 *
       IF( WANTZ ) THEN
          CALL SSTEIN( N, WORK( INDD ), WORK( INDE ), M, W,
-     $                IWORK( INDIBL ), IWORK( INDISP ), Z, LDZ,
+     $                IWORK( 1 ), IWORK( INDISP ), Z, LDZ,
      $                WORK( INDWRK ), IWORK( INDIWO ), IFAIL, INFO )
 *
 *        Apply orthogonal matrix used in reduction to tridiagonal
 *        form to eigenvectors returned by SSTEIN.
 *
-         CALL SOPMTR( 'L', UPLO, 'N', N, M, AP, WORK( INDTAU ), Z, LDZ,
+         CALL SOPMTR( 'L', UPLO, 'N', N, M, AP, WORK( INDTAU ), Z,
+     $                LDZ,
      $                WORK( INDWRK ), IINFO )
       END IF
 *
@@ -471,11 +472,11 @@ SUBROUTINE SSPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
    30       CONTINUE
 *
             IF( I.NE.0 ) THEN
-               ITMP1 = IWORK( INDIBL+I-1 )
+               ITMP1 = IWORK( 1 + I-1 )
                W( I ) = W( J )
-               IWORK( INDIBL+I-1 ) = IWORK( INDIBL+J-1 )
+               IWORK( 1 + I-1 ) = IWORK( 1 + J-1 )
                W( J ) = TMP1
-               IWORK( INDIBL+J-1 ) = ITMP1
+               IWORK( 1 + J-1 ) = ITMP1
                CALL SSWAP( N, Z( 1, I ), 1, Z( 1, J ), 1 )
                IF( INFO.NE.0 ) THEN
                   ITMP1 = IFAIL( I )
diff --git a/SRC/sspgst.f b/SRC/sspgst.f
index 5e2e873c68..0bec0a3cc2 100644
--- a/SRC/sspgst.f
+++ b/SRC/sspgst.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSPGST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sspgst.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sspgst.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,10 +104,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup hpgst
 *
 *  =====================================================================
       SUBROUTINE SSPGST( ITYPE, UPLO, N, AP, BP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -135,7 +134,8 @@ SUBROUTINE SSPGST( ITYPE, UPLO, N, AP, BP, INFO )
       REAL               AJJ, AKK, BJJ, BKK, CT
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SSCAL, SSPMV, SSPR2, STPMV, STPSV,
+      EXTERNAL           SAXPY, SSCAL, SSPMV, SSPR2, STPMV,
+     $                   STPSV,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
@@ -181,7 +181,8 @@ SUBROUTINE SSPGST( ITYPE, UPLO, N, AP, BP, INFO )
                CALL SSPMV( UPLO, J-1, -ONE, AP, BP( J1 ), 1, ONE,
      $                     AP( J1 ), 1 )
                CALL SSCAL( J-1, ONE / BJJ, AP( J1 ), 1 )
-               AP( JJ ) = ( AP( JJ )-SDOT( J-1, AP( J1 ), 1, BP( J1 ),
+               AP( JJ ) = ( AP( JJ )-SDOT( J-1, AP( J1 ), 1,
+     $             BP( J1 ),
      $                    1 ) ) / BJJ
    10       CONTINUE
          ELSE
diff --git a/SRC/sspgv.f b/SRC/sspgv.f
index c73e94e603..856adc692e 100644
--- a/SRC/sspgv.f
+++ b/SRC/sspgv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSPGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sspgv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sspgv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -139,7 +137,7 @@
 *>                    i off-diagonal elements of an intermediate
 *>                    tridiagonal form did not converge to zero.
 *>             > N:   if INFO = n + i, for 1 <= i <= n, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -152,11 +150,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup hpgv
 *
 *  =====================================================================
-      SUBROUTINE SSPGV( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
+      SUBROUTINE SSPGV( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ,
+     $                  WORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,7 +183,8 @@ SUBROUTINE SSPGV( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SPPTRF, SSPEV, SSPGST, STPMV, STPSV, XERBLA
+      EXTERNAL           SPPTRF, SSPEV, SSPGST, STPMV, STPSV,
+     $                   XERBLA
 *     ..
 *     .. Executable Statements ..
 *
diff --git a/SRC/sspgvd.f b/SRC/sspgvd.f
index 9db8de08c9..91067e418a 100644
--- a/SRC/sspgvd.f
+++ b/SRC/sspgvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSPGVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sspgvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sspgvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -44,12 +42,6 @@
 *> positive definite.
 *> If eigenvectors are desired, it uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -184,7 +176,7 @@
 *>                    i off-diagonal elements of an intermediate
 *>                    tridiagonal form did not converge to zero;
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -197,7 +189,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup hpgvd
 *
 *> \par Contributors:
 *  ==================
@@ -205,8 +197,10 @@
 *>     Mark Fahey, Department of Mathematics, Univ. of Kentucky, USA
 *
 *  =====================================================================
-      SUBROUTINE SSPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
+      SUBROUTINE SSPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ,
+     $                   WORK,
      $                   LWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -231,10 +225,12 @@ SUBROUTINE SSPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SPPTRF, SSPEVD, SSPGST, STPMV, STPSV, XERBLA
+      EXTERNAL           SPPTRF, SSPEVD, SSPGST, STPMV, STPSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, REAL
@@ -273,7 +269,7 @@ SUBROUTINE SSPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
                LWMIN = 2*N
             END IF
          END IF
-         WORK( 1 ) = LWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
          IWORK( 1 ) = LIWMIN
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
             INFO = -11
@@ -307,8 +303,8 @@ SUBROUTINE SSPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
       CALL SSPGST( ITYPE, UPLO, N, AP, BP, INFO )
       CALL SSPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK, IWORK,
      $             LIWORK, INFO )
-      LWMIN = MAX( REAL( LWMIN ), REAL( WORK( 1 ) ) )
-      LIWMIN = MAX( REAL( LIWMIN ), REAL( IWORK( 1 ) ) )
+      LWMIN = INT( MAX( REAL( LWMIN ), REAL( WORK( 1 ) ) ) )
+      LIWMIN = INT( MAX( REAL( LIWMIN ), REAL( IWORK( 1 ) ) ) )
 *
       IF( WANTZ ) THEN
 *
@@ -351,7 +347,7 @@ SUBROUTINE SSPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
          END IF
       END IF
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/sspgvx.f b/SRC/sspgvx.f
index de581543a7..86ff8743bc 100644
--- a/SRC/sspgvx.f
+++ b/SRC/sspgvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSPGVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sspgvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sspgvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -245,7 +243,7 @@
 *>                    i eigenvectors failed to converge.  Their indices
 *>                    are stored in array IFAIL.
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -258,7 +256,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup hpgvx
 *
 *> \par Contributors:
 *  ==================
@@ -269,6 +267,7 @@
       SUBROUTINE SSPGVX( ITYPE, JOBZ, RANGE, UPLO, N, AP, BP, VL, VU,
      $                   IL, IU, ABSTOL, M, W, Z, LDZ, WORK, IWORK,
      $                   IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -297,7 +296,8 @@ SUBROUTINE SSPGVX( ITYPE, JOBZ, RANGE, UPLO, N, AP, BP, VL, VU,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SPPTRF, SSPEVX, SSPGST, STPMV, STPSV, XERBLA
+      EXTERNAL           SPPTRF, SSPEVX, SSPGST, STPMV, STPSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MIN
@@ -364,7 +364,8 @@ SUBROUTINE SSPGVX( ITYPE, JOBZ, RANGE, UPLO, N, AP, BP, VL, VU,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL SSPGST( ITYPE, UPLO, N, AP, BP, INFO )
-      CALL SSPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU, ABSTOL, M,
+      CALL SSPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU, ABSTOL,
+     $             M,
      $             W, Z, LDZ, WORK, IWORK, IFAIL, INFO )
 *
       IF( WANTZ ) THEN
diff --git a/SRC/ssprfs.f b/SRC/ssprfs.f
index 6f105bb13a..7428dd1352 100644
--- a/SRC/ssprfs.f
+++ b/SRC/ssprfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSPRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssprfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssprfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -171,11 +169,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup hprfs
 *
 *  =====================================================================
-      SUBROUTINE SSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
+      SUBROUTINE SSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
+     $                   LDX,
      $                   FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -214,7 +214,8 @@ SUBROUTINE SSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SLACN2, SSPMV, SSPTRS, XERBLA
+      EXTERNAL           SAXPY, SCOPY, SLACN2, SSPMV, SSPTRS,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -261,7 +262,7 @@ SUBROUTINE SSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
       NZ = N + 1
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -277,7 +278,8 @@ SUBROUTINE SSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
 *        Compute residual R = B - A * X
 *
          CALL SCOPY( N, B( 1, J ), 1, WORK( N+1 ), 1 )
-         CALL SSPMV( UPLO, N, -ONE, AP, X( 1, J ), 1, ONE, WORK( N+1 ),
+         CALL SSPMV( UPLO, N, -ONE, AP, X( 1, J ), 1, ONE,
+     $               WORK( N+1 ),
      $               1 )
 *
 *        Compute componentwise relative backward error from formula
@@ -346,7 +348,8 @@ SUBROUTINE SSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
 *
 *           Update solution and try again.
 *
-            CALL SSPTRS( UPLO, N, 1, AFP, IPIV, WORK( N+1 ), N, INFO )
+            CALL SSPTRS( UPLO, N, 1, AFP, IPIV, WORK( N+1 ), N,
+     $                   INFO )
             CALL SAXPY( N, ONE, WORK( N+1 ), 1, X( 1, J ), 1 )
             LSTRES = BERR( J )
             COUNT = COUNT + 1
@@ -377,15 +380,17 @@ SUBROUTINE SSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
 *
          DO 90 I = 1, N
             IF( WORK( I ).GT.SAFE2 ) THEN
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I )
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
             ELSE
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I ) + SAFE1
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
+     $                     + SAFE1
             END IF
    90    CONTINUE
 *
          KASE = 0
   100    CONTINUE
-         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
diff --git a/SRC/sspsv.f b/SRC/sspsv.f
index 7feafd35b0..e36ee06d05 100644
--- a/SRC/sspsv.f
+++ b/SRC/sspsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSPSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sspsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sspsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,7 +133,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERsolve
+*> \ingroup hpsv
 *
 *> \par Further Details:
 *  =====================
@@ -159,6 +157,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SSPSV( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,7 +189,8 @@ SUBROUTINE SSPSV( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/sspsvx.f b/SRC/sspsvx.f
index 3a24bc023e..1284b4a7db 100644
--- a/SRC/sspsvx.f
+++ b/SRC/sspsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSPSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sspsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sspsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -248,7 +246,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERsolve
+*> \ingroup hpsvx
 *
 *> \par Further Details:
 *  =====================
@@ -271,8 +269,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
+      SUBROUTINE SSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB,
+     $                   X,
      $                   LDX, RCOND, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -305,7 +305,8 @@ SUBROUTINE SSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
       EXTERNAL           LSAME, SLAMCH, SLANSP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLACPY, SSPCON, SSPRFS, SSPTRF, SSPTRS,
+      EXTERNAL           SCOPY, SLACPY, SSPCON, SSPRFS, SSPTRF,
+     $                   SSPTRS,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -319,7 +320,8 @@ SUBROUTINE SSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
       NOFACT = LSAME( FACT, 'N' )
       IF( .NOT.NOFACT .AND. .NOT.LSAME( FACT, 'F' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -357,7 +359,8 @@ SUBROUTINE SSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL SSPCON( UPLO, N, AFP, IPIV, ANORM, RCOND, WORK, IWORK, INFO )
+      CALL SSPCON( UPLO, N, AFP, IPIV, ANORM, RCOND, WORK, IWORK,
+     $             INFO )
 *
 *     Compute the solution vectors X.
 *
@@ -367,7 +370,8 @@ SUBROUTINE SSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
 *     Use iterative refinement to improve the computed solutions and
 *     compute error bounds and backward error estimates for them.
 *
-      CALL SSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX, FERR,
+      CALL SSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
+     $             FERR,
      $             BERR, WORK, IWORK, INFO )
 *
 *     Set INFO = N+1 if the matrix is singular to working precision.
diff --git a/SRC/ssptrd.f b/SRC/ssptrd.f
index e9c104f281..53a3692bbf 100644
--- a/SRC/ssptrd.f
+++ b/SRC/ssptrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSPTRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssptrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssptrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -111,7 +109,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup hptrd
 *
 *> \par Further Details:
 *  =====================
@@ -147,6 +145,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SSPTRD( UPLO, N, AP, D, E, TAU, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -265,7 +264,8 @@ SUBROUTINE SSPTRD( UPLO, N, AP, D, E, TAU, INFO )
 *
 *              Compute  y := tau * A * v  storing y in TAU(i:n-1)
 *
-               CALL SSPMV( UPLO, N-I, TAUI, AP( I1I1 ), AP( II+1 ), 1,
+               CALL SSPMV( UPLO, N-I, TAUI, AP( I1I1 ), AP( II+1 ),
+     $                     1,
      $                     ZERO, TAU( I ), 1 )
 *
 *              Compute  w := y - 1/2 * tau * (y**T *v) * v
@@ -277,7 +277,8 @@ SUBROUTINE SSPTRD( UPLO, N, AP, D, E, TAU, INFO )
 *              Apply the transformation as a rank-2 update:
 *                 A := A - v * w**T - w * v**T
 *
-               CALL SSPR2( UPLO, N-I, -ONE, AP( II+1 ), 1, TAU( I ), 1,
+               CALL SSPR2( UPLO, N-I, -ONE, AP( II+1 ), 1, TAU( I ),
+     $                     1,
      $                     AP( I1I1 ) )
 *
                AP( II+1 ) = E( I )
diff --git a/SRC/ssptrf.f b/SRC/ssptrf.f
index 4a25e3d073..5900caf7e0 100644
--- a/SRC/ssptrf.f
+++ b/SRC/ssptrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSPTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssptrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssptrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup hptrf
 *
 *> \par Further Details:
 *  =====================
@@ -154,6 +152,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SSPTRF( UPLO, N, AP, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -498,7 +497,8 @@ SUBROUTINE SSPTRF( UPLO, N, AP, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL SSWAP( N-KP, AP( KNC+KP-KK+1 ), 1, AP( KPC+1 ),
+     $            CALL SSWAP( N-KP, AP( KNC+KP-KK+1 ), 1,
+     $                        AP( KPC+1 ),
      $                        1 )
                KX = KNC + KP - KK
                DO 80 J = KK + 1, KP - 1
diff --git a/SRC/ssptri.f b/SRC/ssptri.f
index ce9b971b58..06c6485795 100644
--- a/SRC/ssptri.f
+++ b/SRC/ssptri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSPTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssptri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssptri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup hptri
 *
 *  =====================================================================
       SUBROUTINE SSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -217,7 +216,8 @@ SUBROUTINE SSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
 *
             IF( K.GT.1 ) THEN
                CALL SCOPY( K-1, AP( KC ), 1, WORK, 1 )
-               CALL SSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO, AP( KC ),
+               CALL SSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO,
+     $                     AP( KC ),
      $                     1 )
                AP( KC+K-1 ) = AP( KC+K-1 ) -
      $                        SDOT( K-1, WORK, 1, AP( KC ), 1 )
@@ -242,12 +242,14 @@ SUBROUTINE SSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
 *
             IF( K.GT.1 ) THEN
                CALL SCOPY( K-1, AP( KC ), 1, WORK, 1 )
-               CALL SSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO, AP( KC ),
+               CALL SSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO,
+     $                     AP( KC ),
      $                     1 )
                AP( KC+K-1 ) = AP( KC+K-1 ) -
      $                        SDOT( K-1, WORK, 1, AP( KC ), 1 )
                AP( KCNEXT+K-1 ) = AP( KCNEXT+K-1 ) -
-     $                            SDOT( K-1, AP( KC ), 1, AP( KCNEXT ),
+     $                            SDOT( K-1, AP( KC ), 1,
+     $                                  AP( KCNEXT ),
      $                            1 )
                CALL SCOPY( K-1, AP( KCNEXT ), 1, WORK, 1 )
                CALL SSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO,
@@ -321,7 +323,8 @@ SUBROUTINE SSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
                CALL SCOPY( N-K, AP( KC+1 ), 1, WORK, 1 )
                CALL SSPMV( UPLO, N-K, -ONE, AP( KC+N-K+1 ), WORK, 1,
      $                     ZERO, AP( KC+1 ), 1 )
-               AP( KC ) = AP( KC ) - SDOT( N-K, WORK, 1, AP( KC+1 ), 1 )
+               AP( KC ) = AP( KC ) - SDOT( N-K, WORK, 1, AP( KC+1 ),
+     $             1 )
             END IF
             KSTEP = 1
          ELSE
@@ -343,14 +346,17 @@ SUBROUTINE SSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL SCOPY( N-K, AP( KC+1 ), 1, WORK, 1 )
-               CALL SSPMV( UPLO, N-K, -ONE, AP( KC+( N-K+1 ) ), WORK, 1,
+               CALL SSPMV( UPLO, N-K, -ONE, AP( KC+( N-K+1 ) ), WORK,
+     $                     1,
      $                     ZERO, AP( KC+1 ), 1 )
-               AP( KC ) = AP( KC ) - SDOT( N-K, WORK, 1, AP( KC+1 ), 1 )
+               AP( KC ) = AP( KC ) - SDOT( N-K, WORK, 1, AP( KC+1 ),
+     $             1 )
                AP( KCNEXT+1 ) = AP( KCNEXT+1 ) -
      $                          SDOT( N-K, AP( KC+1 ), 1,
      $                          AP( KCNEXT+2 ), 1 )
                CALL SCOPY( N-K, AP( KCNEXT+2 ), 1, WORK, 1 )
-               CALL SSPMV( UPLO, N-K, -ONE, AP( KC+( N-K+1 ) ), WORK, 1,
+               CALL SSPMV( UPLO, N-K, -ONE, AP( KC+( N-K+1 ) ), WORK,
+     $                     1,
      $                     ZERO, AP( KCNEXT+2 ), 1 )
                AP( KCNEXT ) = AP( KCNEXT ) -
      $                        SDOT( N-K, WORK, 1, AP( KCNEXT+2 ), 1 )
diff --git a/SRC/ssptrs.f b/SRC/ssptrs.f
index 9a25ec9f6c..a46f58d5c9 100644
--- a/SRC/ssptrs.f
+++ b/SRC/ssptrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSPTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssptrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssptrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup hptrs
 *
 *  =====================================================================
       SUBROUTINE SSPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -267,7 +266,8 @@ SUBROUTINE SSPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *           Multiply by inv(U**T(K)), where U(K) is the transformation
 *           stored in column K of A.
 *
-            CALL SGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, AP( KC ),
+            CALL SGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB,
+     $                  AP( KC ),
      $                  1, ONE, B( K, 1 ), LDB )
 *
 *           Interchange rows K and IPIV(K).
@@ -284,7 +284,8 @@ SUBROUTINE SSPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *           Multiply by inv(U**T(K+1)), where U(K+1) is the transformation
 *           stored in columns K and K+1 of A.
 *
-            CALL SGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, AP( KC ),
+            CALL SGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB,
+     $                  AP( KC ),
      $                  1, ONE, B( K, 1 ), LDB )
             CALL SGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB,
      $                  AP( KC+K ), 1, ONE, B( K+1, 1 ), LDB )
@@ -355,7 +356,8 @@ SUBROUTINE SSPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL SGER( N-K-1, NRHS, -ONE, AP( KC+2 ), 1, B( K, 1 ),
+               CALL SGER( N-K-1, NRHS, -ONE, AP( KC+2 ), 1, B( K,
+     $                    1 ),
      $                    LDB, B( K+2, 1 ), LDB )
                CALL SGER( N-K-1, NRHS, -ONE, AP( KC+N-K+2 ), 1,
      $                    B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
diff --git a/SRC/sstebz.f b/SRC/sstebz.f
index 13e7cde43c..1a8953fffe 100644
--- a/SRC/sstebz.f
+++ b/SRC/sstebz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSTEBZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sstebz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sstebz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -264,12 +262,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup stebz
 *
 *  =====================================================================
-      SUBROUTINE SSTEBZ( RANGE, ORDER, N, VL, VU, IL, IU, ABSTOL, D, E,
+      SUBROUTINE SSTEBZ( RANGE, ORDER, N, VL, VU, IL, IU, ABSTOL, D,
+     $                   E,
      $                   M, NSPLIT, W, IBLOCK, ISPLIT, WORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -454,8 +454,8 @@ SUBROUTINE SSTEBZ( RANGE, ORDER, N, VL, VU, IL, IU, ABSTOL, D, E,
          GU = MAX( GU, D( N )+TMP1 )
          GL = MIN( GL, D( N )-TMP1 )
          TNORM = MAX( ABS( GL ), ABS( GU ) )
-         GL = GL - FUDGE*TNORM*ULP*N - FUDGE*TWO*PIVMIN
-         GU = GU + FUDGE*TNORM*ULP*N + FUDGE*PIVMIN
+         GL = GL - FUDGE*TNORM*ULP*REAL( N ) - FUDGE*TWO*PIVMIN
+         GU = GU + FUDGE*TNORM*ULP*REAL( N ) + FUDGE*PIVMIN
 *
 *        Compute Iteration parameters
 *
@@ -480,7 +480,8 @@ SUBROUTINE SSTEBZ( RANGE, ORDER, N, VL, VU, IL, IU, ABSTOL, D, E,
          IWORK( 5 ) = IL - 1
          IWORK( 6 ) = IU
 *
-         CALL SLAEBZ( 3, ITMAX, N, 2, 2, NB, ATOLI, RTOLI, PIVMIN, D, E,
+         CALL SLAEBZ( 3, ITMAX, N, 2, 2, NB, ATOLI, RTOLI, PIVMIN, D,
+     $                E,
      $                WORK, IWORK( 5 ), WORK( N+1 ), WORK( N+5 ), IOUT,
      $                IWORK, W, IBLOCK, IINFO )
 *
@@ -582,8 +583,8 @@ SUBROUTINE SSTEBZ( RANGE, ORDER, N, VL, VU, IL, IU, ABSTOL, D, E,
             GU = MAX( GU, D( IEND )+TMP1 )
             GL = MIN( GL, D( IEND )-TMP1 )
             BNORM = MAX( ABS( GL ), ABS( GU ) )
-            GL = GL - FUDGE*BNORM*ULP*IN - FUDGE*PIVMIN
-            GU = GU + FUDGE*BNORM*ULP*IN + FUDGE*PIVMIN
+            GL = GL - FUDGE*BNORM*ULP*REAL( IN ) - FUDGE*PIVMIN
+            GU = GU + FUDGE*BNORM*ULP*REAL( IN ) + FUDGE*PIVMIN
 *
 *           Compute ATOLI for the current submatrix
 *
@@ -622,7 +623,8 @@ SUBROUTINE SSTEBZ( RANGE, ORDER, N, VL, VU, IL, IU, ABSTOL, D, E,
 *
             ITMAX = INT( ( LOG( GU-GL+PIVMIN )-LOG( PIVMIN ) ) /
      $              LOG( TWO ) ) + 2
-            CALL SLAEBZ( 2, ITMAX, IN, IN, 1, NB, ATOLI, RTOLI, PIVMIN,
+            CALL SLAEBZ( 2, ITMAX, IN, IN, 1, NB, ATOLI, RTOLI,
+     $                   PIVMIN,
      $                   D( IBEGIN ), E( IBEGIN ), WORK( IBEGIN ),
      $                   IDUMMA, WORK( N+1 ), WORK( N+2*IN+1 ), IOUT,
      $                   IWORK, W( M+1 ), IBLOCK( M+1 ), IINFO )
diff --git a/SRC/sstedc.f b/SRC/sstedc.f
index 925b03422e..140a51a88f 100644
--- a/SRC/sstedc.f
+++ b/SRC/sstedc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSTEDC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sstedc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sstedc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -42,12 +40,6 @@
 *> found if SSYTRD or SSPTRD or SSBTRD has been used to reduce this
 *> matrix to tridiagonal form.
 *>
-*> This code makes very mild assumptions about floating point
-*> arithmetic. It will work on machines with a guard digit in
-*> add/subtract, or on those binary machines without guard digits
-*> which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or Cray-2.
-*> It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.  See SLAED3 for details.
 *> \endverbatim
 *
 *  Arguments:
@@ -173,7 +165,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup stedc
 *
 *> \par Contributors:
 *  ==================
@@ -185,6 +177,7 @@
 *  =====================================================================
       SUBROUTINE SSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
      $                   LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -214,11 +207,13 @@ SUBROUTINE SSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANST
-      EXTERNAL           ILAENV, LSAME, SLAMCH, SLANST
+      REAL               SLAMCH, SLANST, SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SLAMCH, SLANST,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMM, SLACPY, SLAED0, SLASCL, SLASET, SLASRT,
+      EXTERNAL           SGEMM, SLACPY, SLAED0, SLASCL, SLASET,
+     $                   SLASRT,
      $                   SSTEQR, SSTERF, SSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -274,7 +269,7 @@ SUBROUTINE SSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
                LIWMIN = 3 + 5*N
             END IF
          END IF
-         WORK( 1 ) = LWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT. LQUERY ) THEN
@@ -383,9 +378,11 @@ SUBROUTINE SSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
 *              Scale.
 *
                ORGNRM = SLANST( 'M', M, D( START ), E( START ) )
-               CALL SLASCL( 'G', 0, 0, ORGNRM, ONE, M, 1, D( START ), M,
+               CALL SLASCL( 'G', 0, 0, ORGNRM, ONE, M, 1, D( START ),
+     $                      M,
      $                      INFO )
-               CALL SLASCL( 'G', 0, 0, ORGNRM, ONE, M-1, 1, E( START ),
+               CALL SLASCL( 'G', 0, 0, ORGNRM, ONE, M-1, 1,
+     $                      E( START ),
      $                      M-1, INFO )
 *
                IF( ICOMPZ.EQ.1 ) THEN
@@ -404,7 +401,8 @@ SUBROUTINE SSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
 *
 *              Scale back.
 *
-               CALL SLASCL( 'G', 0, 0, ONE, ORGNRM, M, 1, D( START ), M,
+               CALL SLASCL( 'G', 0, 0, ONE, ORGNRM, M, 1, D( START ),
+     $                      M,
      $                      INFO )
 *
             ELSE
@@ -414,7 +412,8 @@ SUBROUTINE SSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
 *                 the length of D, we must solve the sub-problem in a
 *                 workspace and then multiply back into Z.
 *
-                  CALL SSTEQR( 'I', M, D( START ), E( START ), WORK, M,
+                  CALL SSTEQR( 'I', M, D( START ), E( START ), WORK,
+     $                         M,
      $                         WORK( M*M+1 ), INFO )
                   CALL SLACPY( 'A', N, M, Z( 1, START ), LDZ,
      $                         WORK( STOREZ ), N )
@@ -469,7 +468,7 @@ SUBROUTINE SSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
       END IF
 *
    50 CONTINUE
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/sstegr.f b/SRC/sstegr.f
index 2e2975fdf5..a8aba3ee5e 100644
--- a/SRC/sstegr.f
+++ b/SRC/sstegr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSTEGR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sstegr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sstegr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -56,7 +54,7 @@
 *>
 *> Note : SSTEGR and SSTEMR work only on machines which follow
 *> IEEE-754 floating-point standard in their handling of infinities and
-*> NaNs.  Normal execution may create these exceptiona values and hence
+*> NaNs.  Normal execution may create these exceptional values and hence
 *> may abort due to a floating point exception in environments which
 *> do not conform to the IEEE-754 standard.
 *> \endverbatim
@@ -249,7 +247,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup stegr
 *
 *> \par Contributors:
 *  ==================
@@ -262,6 +260,7 @@
       SUBROUTINE SSTEGR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $           ABSTOL, M, W, Z, LDZ, ISUPPZ, WORK, LWORK, IWORK,
      $           LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sstein.f b/SRC/sstein.f
index d944c0b112..471d31220d 100644
--- a/SRC/sstein.f
+++ b/SRC/sstein.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSTEIN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sstein.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sstein.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -166,11 +164,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup stein
 *
 *  =====================================================================
       SUBROUTINE SSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
      $                   IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -210,7 +209,8 @@ SUBROUTINE SSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
       EXTERNAL           ISAMAX, SDOT, SLAMCH, SNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SLAGTF, SLAGTS, SLARNV, SSCAL,
+      EXTERNAL           SAXPY, SCOPY, SLAGTF, SLAGTS, SLARNV,
+     $                   SSCAL,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -306,7 +306,7 @@ SUBROUTINE SSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
    50    CONTINUE
          ORTOL = ODM3*ONENRM
 *
-         STPCRT = SQRT( ODM1 / BLKSIZ )
+         STPCRT = SQRT( ODM1 / REAL( BLKSIZ ) )
 *
 *        Loop through eigenvalues of block nblk.
 *
@@ -354,7 +354,8 @@ SUBROUTINE SSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
 *           Compute LU factors with partial pivoting  ( PT = LU )
 *
             TOL = ZERO
-            CALL SLAGTF( BLKSIZ, WORK( INDRV4+1 ), XJ, WORK( INDRV2+2 ),
+            CALL SLAGTF( BLKSIZ, WORK( INDRV4+1 ), XJ,
+     $                   WORK( INDRV2+2 ),
      $                   WORK( INDRV3+1 ), TOL, WORK( INDRV5+1 ), IWORK,
      $                   IINFO )
 *
@@ -368,14 +369,15 @@ SUBROUTINE SSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
 *           Normalize and scale the righthand side vector Pb.
 *
             JMAX = ISAMAX( BLKSIZ, WORK( INDRV1+1 ), 1 )
-            SCL = BLKSIZ*ONENRM*MAX( EPS,
+            SCL = REAL( BLKSIZ )*ONENRM*MAX( EPS,
      $            ABS( WORK( INDRV4+BLKSIZ ) ) ) /
      $            ABS( WORK( INDRV1+JMAX ) )
             CALL SSCAL( BLKSIZ, SCL, WORK( INDRV1+1 ), 1 )
 *
 *           Solve the system LU = Pb.
 *
-            CALL SLAGTS( -1, BLKSIZ, WORK( INDRV4+1 ), WORK( INDRV2+2 ),
+            CALL SLAGTS( -1, BLKSIZ, WORK( INDRV4+1 ),
+     $                   WORK( INDRV2+2 ),
      $                   WORK( INDRV3+1 ), WORK( INDRV5+1 ), IWORK,
      $                   WORK( INDRV1+1 ), TOL, IINFO )
 *
@@ -388,7 +390,8 @@ SUBROUTINE SSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
      $         GPIND = J
             IF( GPIND.NE.J ) THEN
                DO 80 I = GPIND, J - 1
-                  CTR = -SDOT( BLKSIZ, WORK( INDRV1+1 ), 1, Z( B1, I ),
+                  CTR = -SDOT( BLKSIZ, WORK( INDRV1+1 ), 1, Z( B1,
+     $                         I ),
      $                  1 )
                   CALL SAXPY( BLKSIZ, CTR, Z( B1, I ), 1,
      $                        WORK( INDRV1+1 ), 1 )
diff --git a/SRC/sstemr.f b/SRC/sstemr.f
index 3a9bbe7846..8fe8292a55 100644
--- a/SRC/sstemr.f
+++ b/SRC/sstemr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSTEMR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sstemr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sstemr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -303,7 +301,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup stemr
 *
 *> \par Contributors:
 *  ==================
@@ -312,12 +310,14 @@
 *> Jim Demmel, University of California, Berkeley, USA \n
 *> Inderjit Dhillon, University of Texas, Austin, USA \n
 *> Osni Marques, LBNL/NERSC, USA \n
-*> Christof Voemel, University of California, Berkeley, USA
+*> Christof Voemel, University of California, Berkeley, USA \n
+*> Aravindh Krishnamoorthy, FAU, Erlangen, Germany \n
 *
 *  =====================================================================
       SUBROUTINE SSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $                   M, W, Z, LDZ, NZC, ISUPPZ, TRYRAC, WORK, LWORK,
      $                   IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -344,7 +344,8 @@ SUBROUTINE SSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $                     MINRGP = 3.0E-3 )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            ALLEIG, INDEIG, LQUERY, VALEIG, WANTZ, ZQUERY
+      LOGICAL            ALLEIG, INDEIG, LQUERY, VALEIG, WANTZ, ZQUERY,
+     $                   LAESWAP
       INTEGER            I, IBEGIN, IEND, IFIRST, IIL, IINDBL, IINDW,
      $                   IINDWK, IINFO, IINSPL, IIU, ILAST, IN, INDD,
      $                   INDE2, INDERR, INDGP, INDGRS, INDWRK, ITMP,
@@ -357,11 +358,12 @@ SUBROUTINE SSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               SLAMCH, SLANST
-      EXTERNAL           LSAME, SLAMCH, SLANST
+      REAL               SLAMCH, SLANST, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, SLANST, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLAE2, SLAEV2, SLARRC, SLARRE, SLARRJ,
+      EXTERNAL           SCOPY, SLAE2, SLAEV2, SLARRC, SLARRE,
+     $                   SLARRJ,
      $                   SLARRR, SLARRV, SLASRT, SSCAL, SSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -378,6 +380,7 @@ SUBROUTINE SSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
 *
       LQUERY = ( ( LWORK.EQ.-1 ).OR.( LIWORK.EQ.-1 ) )
       ZQUERY = ( NZC.EQ.-1 )
+      LAESWAP = .FALSE.
 
 *     SSTEMR needs WORK of size 6*N, IWORK of size 3*N.
 *     In addition, SLARRE needs WORK of size 6*N, IWORK of size 5*N.
@@ -440,7 +443,7 @@ SUBROUTINE SSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
       RMAX = MIN( SQRT( BIGNUM ), ONE / SQRT( SQRT( SAFMIN ) ) )
 *
       IF( INFO.EQ.0 ) THEN
-         WORK( 1 ) = LWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
          IWORK( 1 ) = LIWMIN
 *
          IF( WANTZ .AND. ALLEIG ) THEN
@@ -455,7 +458,7 @@ SUBROUTINE SSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
             NZCMIN = 0
          ENDIF
          IF( ZQUERY .AND. INFO.EQ.0 ) THEN
-            Z( 1,1 ) = NZCMIN
+            Z( 1,1 ) = REAL( NZCMIN )
          ELSE IF( NZC.LT.NZCMIN .AND. .NOT.ZQUERY ) THEN
             INFO = -14
          END IF
@@ -500,6 +503,15 @@ SUBROUTINE SSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
          ELSE IF( WANTZ.AND.(.NOT.ZQUERY) ) THEN
             CALL SLAEV2( D(1), E(1), D(2), R1, R2, CS, SN )
          END IF
+*        D/S/LAE2 and D/S/LAEV2 outputs satisfy |R1| >= |R2|. However,
+*        the following code requires R1 >= R2. Hence, we correct
+*        the order of R1, R2, CS, SN if R1 < R2 before further processing.
+         IF( R1.LT.R2 ) THEN
+            E(2) = R1
+            R1 = R2
+            R2 = E(2)
+            LAESWAP = .TRUE.
+         ENDIF
          IF( ALLEIG.OR.
      $      (VALEIG.AND.(R2.GT.WL).AND.
      $                  (R2.LE.WU)).OR.
@@ -507,8 +519,13 @@ SUBROUTINE SSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
             M = M+1
             W( M ) = R2
             IF( WANTZ.AND.(.NOT.ZQUERY) ) THEN
-               Z( 1, M ) = -SN
-               Z( 2, M ) = CS
+               IF( LAESWAP ) THEN
+                  Z( 1, M ) = CS
+                  Z( 2, M ) = SN
+               ELSE
+                  Z( 1, M ) = -SN
+                  Z( 2, M ) = CS
+               ENDIF
 *              Note: At most one of SN and CS can be zero.
                IF (SN.NE.ZERO) THEN
                   IF (CS.NE.ZERO) THEN
@@ -531,8 +548,13 @@ SUBROUTINE SSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
             M = M+1
             W( M ) = R1
             IF( WANTZ.AND.(.NOT.ZQUERY) ) THEN
-               Z( 1, M ) = CS
-               Z( 2, M ) = SN
+               IF( LAESWAP ) THEN
+                  Z( 1, M ) = -SN
+                  Z( 2, M ) = CS
+               ELSE
+                  Z( 1, M ) = CS
+                  Z( 2, M ) = SN
+               ENDIF
 *              Note: At most one of SN and CS can be zero.
                IF (SN.NE.ZERO) THEN
                   IF (CS.NE.ZERO) THEN
@@ -760,7 +782,7 @@ SUBROUTINE SSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
       ENDIF
 *
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       IWORK( 1 ) = LIWMIN
       RETURN
 *
diff --git a/SRC/ssteqr.f b/SRC/ssteqr.f
index 364428a0c7..5bd2808485 100644
--- a/SRC/ssteqr.f
+++ b/SRC/ssteqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSTEQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssteqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssteqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -124,10 +122,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup steqr
 *
 *  =====================================================================
       SUBROUTINE SSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -163,7 +162,8 @@ SUBROUTINE SSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
       EXTERNAL           LSAME, SLAMCH, SLANST, SLAPY2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLAE2, SLAEV2, SLARTG, SLASCL, SLASET, SLASR,
+      EXTERNAL           SLAE2, SLAEV2, SLARTG, SLASCL, SLASET,
+     $                   SLASR,
      $                   SLASRT, SSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -269,13 +269,15 @@ SUBROUTINE SSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
      $   GO TO 10
       IF( ANORM.GT.SSFMAX ) THEN
          ISCALE = 1
-         CALL SLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L+1, 1, D( L ), N,
+         CALL SLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L+1, 1, D( L ),
+     $                N,
      $                INFO )
          CALL SLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L, 1, E( L ), N,
      $                INFO )
       ELSE IF( ANORM.LT.SSFMIN ) THEN
          ISCALE = 2
-         CALL SLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L+1, 1, D( L ), N,
+         CALL SLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L+1, 1, D( L ),
+     $                N,
      $                INFO )
          CALL SLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L, 1, E( L ), N,
      $                INFO )
@@ -318,7 +320,8 @@ SUBROUTINE SSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
 *
          IF( M.EQ.L+1 ) THEN
             IF( ICOMPZ.GT.0 ) THEN
-               CALL SLAEV2( D( L ), E( L ), D( L+1 ), RT1, RT2, C, S )
+               CALL SLAEV2( D( L ), E( L ), D( L+1 ), RT1, RT2, C,
+     $                      S )
                WORK( L ) = C
                WORK( N-1+L ) = S
                CALL SLASR( 'R', 'V', 'B', N, 2, WORK( L ),
@@ -377,7 +380,8 @@ SUBROUTINE SSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
 *
          IF( ICOMPZ.GT.0 ) THEN
             MM = M - L + 1
-            CALL SLASR( 'R', 'V', 'B', N, MM, WORK( L ), WORK( N-1+L ),
+            CALL SLASR( 'R', 'V', 'B', N, MM, WORK( L ),
+     $                  WORK( N-1+L ),
      $                  Z( 1, L ), LDZ )
          END IF
 *
@@ -425,7 +429,8 @@ SUBROUTINE SSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
 *
          IF( M.EQ.L-1 ) THEN
             IF( ICOMPZ.GT.0 ) THEN
-               CALL SLAEV2( D( L-1 ), E( L-1 ), D( L ), RT1, RT2, C, S )
+               CALL SLAEV2( D( L-1 ), E( L-1 ), D( L ), RT1, RT2, C,
+     $                      S )
                WORK( M ) = C
                WORK( N-1+M ) = S
                CALL SLASR( 'R', 'V', 'F', N, 2, WORK( M ),
@@ -484,7 +489,8 @@ SUBROUTINE SSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
 *
          IF( ICOMPZ.GT.0 ) THEN
             MM = L - M + 1
-            CALL SLASR( 'R', 'V', 'F', N, MM, WORK( M ), WORK( N-1+M ),
+            CALL SLASR( 'R', 'V', 'F', N, MM, WORK( M ),
+     $                  WORK( N-1+M ),
      $                  Z( 1, M ), LDZ )
          END IF
 *
@@ -510,12 +516,14 @@ SUBROUTINE SSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
       IF( ISCALE.EQ.1 ) THEN
          CALL SLASCL( 'G', 0, 0, SSFMAX, ANORM, LENDSV-LSV+1, 1,
      $                D( LSV ), N, INFO )
-         CALL SLASCL( 'G', 0, 0, SSFMAX, ANORM, LENDSV-LSV, 1, E( LSV ),
+         CALL SLASCL( 'G', 0, 0, SSFMAX, ANORM, LENDSV-LSV, 1,
+     $                E( LSV ),
      $                N, INFO )
       ELSE IF( ISCALE.EQ.2 ) THEN
          CALL SLASCL( 'G', 0, 0, SSFMIN, ANORM, LENDSV-LSV+1, 1,
      $                D( LSV ), N, INFO )
-         CALL SLASCL( 'G', 0, 0, SSFMIN, ANORM, LENDSV-LSV, 1, E( LSV ),
+         CALL SLASCL( 'G', 0, 0, SSFMIN, ANORM, LENDSV-LSV, 1,
+     $                E( LSV ),
      $                N, INFO )
       END IF
 *
diff --git a/SRC/ssterf.f b/SRC/ssterf.f
index ec038207fd..1974db4ddc 100644
--- a/SRC/ssterf.f
+++ b/SRC/ssterf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSTERF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssterf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssterf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -79,10 +77,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup auxOTHERcomputational
+*> \ingroup sterf
 *
 *  =====================================================================
       SUBROUTINE SSTERF( N, D, E, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -189,13 +188,15 @@ SUBROUTINE SSTERF( N, D, E, INFO )
      $   GO TO 10
       IF( ANORM.GT.SSFMAX ) THEN
          ISCALE = 1
-         CALL SLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L+1, 1, D( L ), N,
+         CALL SLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L+1, 1, D( L ),
+     $                N,
      $                INFO )
          CALL SLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L, 1, E( L ), N,
      $                INFO )
       ELSE IF( ANORM.LT.SSFMIN ) THEN
          ISCALE = 2
-         CALL SLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L+1, 1, D( L ), N,
+         CALL SLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L+1, 1, D( L ),
+     $                N,
      $                INFO )
          CALL SLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L, 1, E( L ), N,
      $                INFO )
diff --git a/SRC/sstev.f b/SRC/sstev.f
index 8742b85384..d64a998c2e 100644
--- a/SRC/sstev.f
+++ b/SRC/sstev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSTEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sstev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sstev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -109,10 +107,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup stev
 *
 *  =====================================================================
       SUBROUTINE SSTEV( JOBZ, N, D, E, Z, LDZ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/sstevd.f b/SRC/sstevd.f
index bc5b5aaab7..1bc804e709 100644
--- a/SRC/sstevd.f
+++ b/SRC/sstevd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSTEVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sstevd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sstevd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -40,12 +38,6 @@
 *> real symmetric tridiagonal matrix. If eigenvectors are desired, it
 *> uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -155,11 +147,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup stevd
 *
 *  =====================================================================
       SUBROUTINE SSTEVD( JOBZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
      $                   LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,8 +181,9 @@ SUBROUTINE SSTEVD( JOBZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               SLAMCH, SLANST
-      EXTERNAL           LSAME, SLAMCH, SLANST
+      REAL               SLAMCH, SLANST, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, SLANST,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SSCAL, SSTEDC, SSTERF, XERBLA
@@ -221,7 +215,7 @@ SUBROUTINE SSTEVD( JOBZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         WORK( 1 ) = LWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -280,7 +274,8 @@ SUBROUTINE SSTEVD( JOBZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
       IF( .NOT.WANTZ ) THEN
          CALL SSTERF( N, D, E, INFO )
       ELSE
-         CALL SSTEDC( 'I', N, D, E, Z, LDZ, WORK, LWORK, IWORK, LIWORK,
+         CALL SSTEDC( 'I', N, D, E, Z, LDZ, WORK, LWORK, IWORK,
+     $                LIWORK,
      $                INFO )
       END IF
 *
@@ -289,7 +284,7 @@ SUBROUTINE SSTEVD( JOBZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
       IF( ISCALE.EQ.1 )
      $   CALL SSCAL( N, ONE / SIGMA, D, 1 )
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/sstevr.f b/SRC/sstevr.f
index 2ab63eb3e9..0b72c2f0e5 100644
--- a/SRC/sstevr.f
+++ b/SRC/sstevr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSTEVR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sstevr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sstevr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -287,7 +285,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup stevr
 *
 *> \par Contributors:
 *  ==================
@@ -300,9 +298,11 @@
 *>       California at Berkeley, USA \n
 *>
 *  =====================================================================
-      SUBROUTINE SSTEVR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
+      SUBROUTINE SSTEVR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
+     $                   ABSTOL,
      $                   M, W, Z, LDZ, ISUPPZ, WORK, LWORK, IWORK,
      $                   LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -336,11 +336,13 @@ SUBROUTINE SSTEVR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANST
-      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANST
+      REAL               SLAMCH, SLANST, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANST,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SSCAL, SSTEBZ, SSTEMR, SSTEIN, SSTERF,
+      EXTERNAL           SCOPY, SSCAL, SSTEBZ, SSTEMR, SSTEIN,
+     $                   SSTERF,
      $                   SSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -389,7 +391,7 @@ SUBROUTINE SSTEVR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         WORK( 1 ) = LWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -497,7 +499,7 @@ SUBROUTINE SSTEVR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
             CALL SSTERF( N, W, WORK, INFO )
          ELSE
             CALL SCOPY( N, D, 1, WORK( N+1 ), 1 )
-            IF (ABSTOL .LE. TWO*N*EPS) THEN
+            IF (ABSTOL .LE. TWO*REAL( N )*EPS) THEN
                TRYRAC = .TRUE.
             ELSE
                TRYRAC = .FALSE.
@@ -522,12 +524,14 @@ SUBROUTINE SSTEVR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
          ORDER = 'E'
       END IF
 
-      CALL SSTEBZ( RANGE, ORDER, N, VLL, VUU, IL, IU, ABSTOL, D, E, M,
+      CALL SSTEBZ( RANGE, ORDER, N, VLL, VUU, IL, IU, ABSTOL, D, E,
+     $             M,
      $             NSPLIT, W, IWORK( INDIBL ), IWORK( INDISP ), WORK,
      $             IWORK( INDIWO ), INFO )
 *
       IF( WANTZ ) THEN
-         CALL SSTEIN( N, D, E, M, W, IWORK( INDIBL ), IWORK( INDISP ),
+         CALL SSTEIN( N, D, E, M, W, IWORK( INDIBL ),
+     $                IWORK( INDISP ),
      $                Z, LDZ, WORK, IWORK( INDIWO ), IWORK( INDIFL ),
      $                INFO )
       END IF
@@ -570,7 +574,7 @@ SUBROUTINE SSTEVR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
 *      IF (wantz .and. INDEIG ) Z( 1,1) = Z(1,1) / 1.002 + .002
 *
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       IWORK( 1 ) = LIWMIN
       RETURN
 *
diff --git a/SRC/sstevx.f b/SRC/sstevx.f
index 570864e6e0..763f397ed1 100644
--- a/SRC/sstevx.f
+++ b/SRC/sstevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSTEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/sstevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/sstevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -219,11 +217,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHEReigen
+*> \ingroup stevx
 *
 *  =====================================================================
-      SUBROUTINE SSTEVX( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
+      SUBROUTINE SSTEVX( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
+     $                   ABSTOL,
      $                   M, W, Z, LDZ, WORK, IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -248,7 +248,7 @@ SUBROUTINE SSTEVX( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
 *     .. Local Scalars ..
       LOGICAL            ALLEIG, INDEIG, TEST, VALEIG, WANTZ
       CHARACTER          ORDER
-      INTEGER            I, IMAX, INDIBL, INDISP, INDIWO, INDWRK,
+      INTEGER            I, IMAX, INDISP, INDIWO, INDWRK,
      $                   ISCALE, ITMP1, J, JJ, NSPLIT
       REAL               BIGNUM, EPS, RMAX, RMIN, SAFMIN, SIGMA, SMLNUM,
      $                   TMP1, TNRM, VLL, VUU
@@ -259,7 +259,8 @@ SUBROUTINE SSTEVX( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
       EXTERNAL           LSAME, SLAMCH, SLANST
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SSCAL, SSTEBZ, SSTEIN, SSTEQR, SSTERF,
+      EXTERNAL           SCOPY, SSCAL, SSTEBZ, SSTEIN, SSTEQR,
+     $                   SSTERF,
      $                   SSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -377,7 +378,8 @@ SUBROUTINE SSTEVX( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
          IF( .NOT.WANTZ ) THEN
             CALL SSTERF( N, W, WORK, INFO )
          ELSE
-            CALL SSTEQR( 'I', N, W, WORK, Z, LDZ, WORK( INDWRK ), INFO )
+            CALL SSTEQR( 'I', N, W, WORK, Z, LDZ, WORK( INDWRK ),
+     $                   INFO )
             IF( INFO.EQ.0 ) THEN
                DO 10 I = 1, N
                   IFAIL( I ) = 0
@@ -399,15 +401,15 @@ SUBROUTINE SSTEVX( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
          ORDER = 'E'
       END IF
       INDWRK = 1
-      INDIBL = 1
-      INDISP = INDIBL + N
+      INDISP = 1 + N
       INDIWO = INDISP + N
-      CALL SSTEBZ( RANGE, ORDER, N, VLL, VUU, IL, IU, ABSTOL, D, E, M,
-     $             NSPLIT, W, IWORK( INDIBL ), IWORK( INDISP ),
+      CALL SSTEBZ( RANGE, ORDER, N, VLL, VUU, IL, IU, ABSTOL, D, E,
+     $             M,
+     $             NSPLIT, W, IWORK( 1 ), IWORK( INDISP ),
      $             WORK( INDWRK ), IWORK( INDIWO ), INFO )
 *
       IF( WANTZ ) THEN
-         CALL SSTEIN( N, D, E, M, W, IWORK( INDIBL ), IWORK( INDISP ),
+         CALL SSTEIN( N, D, E, M, W, IWORK( 1 ), IWORK( INDISP ),
      $                Z, LDZ, WORK( INDWRK ), IWORK( INDIWO ), IFAIL,
      $                INFO )
       END IF
@@ -439,11 +441,11 @@ SUBROUTINE SSTEVX( JOBZ, RANGE, N, D, E, VL, VU, IL, IU, ABSTOL,
    30       CONTINUE
 *
             IF( I.NE.0 ) THEN
-               ITMP1 = IWORK( INDIBL+I-1 )
+               ITMP1 = IWORK( 1 + I-1 )
                W( I ) = W( J )
-               IWORK( INDIBL+I-1 ) = IWORK( INDIBL+J-1 )
+               IWORK( 1 + I-1 ) = IWORK( 1 + J-1 )
                W( J ) = TMP1
-               IWORK( INDIBL+J-1 ) = ITMP1
+               IWORK( 1 + J-1 ) = ITMP1
                CALL SSWAP( N, Z( 1, I ), 1, Z( 1, J ), 1 )
                IF( INFO.NE.0 ) THEN
                   ITMP1 = IFAIL( I )
diff --git a/SRC/ssycon.f b/SRC/ssycon.f
index 4ce23a2140..353e2341be 100644
--- a/SRC/ssycon.f
+++ b/SRC/ssycon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssycon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssycon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,11 +120,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hecon
 *
 *  =====================================================================
       SUBROUTINE SSYCON( UPLO, N, A, LDA, IPIV, ANORM, RCOND, WORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ssycon_3.f b/SRC/ssycon_3.f
index 9f36645d76..e642acd13c 100644
--- a/SRC/ssycon_3.f
+++ b/SRC/ssycon_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYCON_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssycon_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssycon_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -149,7 +147,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup singleSYcomputational
+*> \ingroup hecon_3
 *
 *> \par Contributors:
 *  ==================
@@ -168,6 +166,7 @@
 *  =====================================================================
       SUBROUTINE SSYCON_3( UPLO, N, A, LDA, E, IPIV, ANORM, RCOND,
      $                     WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ssycon_rook.f b/SRC/ssycon_rook.f
index c67b35dbc1..81c00506dd 100644
--- a/SRC/ssycon_rook.f
+++ b/SRC/ssycon_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYCON_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssycon_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssycon_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,7 +120,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hecon_rook
 *
 *> \par Contributors:
 *  ==================
@@ -139,8 +137,10 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE SSYCON_ROOK( UPLO, N, A, LDA, IPIV, ANORM, RCOND, WORK,
+      SUBROUTINE SSYCON_ROOK( UPLO, N, A, LDA, IPIV, ANORM, RCOND,
+     $                        WORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ssyconv.f b/SRC/ssyconv.f
index 8b772f1f73..d4600959f8 100644
--- a/SRC/ssyconv.f
+++ b/SRC/ssyconv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYCONV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssyconv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssyconv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup syconv
 *
 *  =====================================================================
       SUBROUTINE SSYCONV( UPLO, WAY, N, A, LDA, IPIV, E, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ssyconvf.f b/SRC/ssyconvf.f
index 6defc1f0eb..d2fcf953a1 100644
--- a/SRC/ssyconvf.f
+++ b/SRC/ssyconvf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYCONVF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssyconvf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssyconvf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -39,7 +37,7 @@
 *> SSYTRF provided on entry in parameter A into the factorization
 *> output format used in SSYTRF_RK (or SSYTRF_BK) that is stored
 *> on exit in parameters A and E. It also converts in place details of
-*> the intechanges stored in IPIV from the format used in SSYTRF into
+*> the interchanges stored in IPIV from the format used in SSYTRF into
 *> the format used in SSYTRF_RK (or SSYTRF_BK).
 *>
 *> If parameter WAY = 'R':
@@ -48,7 +46,7 @@
 *> (or SSYTRF_BK) provided on entry in parameters A and E into
 *> the factorization output format used in SSYTRF that is stored
 *> on exit in parameter A. It also converts in place details of
-*> the intechanges stored in IPIV from the format used in SSYTRF_RK
+*> the interchanges stored in IPIV from the format used in SSYTRF_RK
 *> (or SSYTRF_BK) into the format used in SSYTRF.
 *> \endverbatim
 *
@@ -189,7 +187,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup singleSYcomputational
+*> \ingroup syconvf
 *
 *> \par Contributors:
 *  ==================
@@ -203,6 +201,7 @@
 *> \endverbatim
 *  =====================================================================
       SUBROUTINE SSYCONVF( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -322,7 +321,7 @@ SUBROUTINE SSYCONVF( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
                   END IF
 *
 *                 Convert IPIV
-*                 There is no interchnge of rows i and and IPIV(i),
+*                 There is no interchange of rows i and and IPIV(i),
 *                 so this should be reflected in IPIV format for
 *                 *SYTRF_RK ( or *SYTRF_BK)
 *
@@ -466,7 +465,7 @@ SUBROUTINE SSYCONVF( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
                   END IF
 *
 *                 Convert IPIV
-*                 There is no interchnge of rows i and and IPIV(i),
+*                 There is no interchange of rows i and and IPIV(i),
 *                 so this should be reflected in IPIV format for
 *                 *SYTRF_RK ( or *SYTRF_BK)
 *
@@ -532,7 +531,7 @@ SUBROUTINE SSYCONVF( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
 *
 *           Revert VALUE
 *           Assign subdiagonal entries of D from array E to
-*           subgiagonal entries of A.
+*           subdiagonal entries of A.
 *
             I = 1
             DO WHILE ( I.LE.N-1 )
diff --git a/SRC/ssyconvf_rook.f b/SRC/ssyconvf_rook.f
index c59f257bbb..32f296e2dc 100644
--- a/SRC/ssyconvf_rook.f
+++ b/SRC/ssyconvf_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYCONVF_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssyconvf_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssyconvf_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -180,7 +178,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup singleSYcomputational
+*> \ingroup syconvf_rook
 *
 *> \par Contributors:
 *  ==================
@@ -194,6 +192,7 @@
 *> \endverbatim
 *  =====================================================================
       SUBROUTINE SSYCONVF_ROOK( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -517,7 +516,7 @@ SUBROUTINE SSYCONVF_ROOK( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
 *
 *           Revert VALUE
 *           Assign subdiagonal entries of D from array E to
-*           subgiagonal entries of A.
+*           subdiagonal entries of A.
 *
             I = 1
             DO WHILE ( I.LE.N-1 )
diff --git a/SRC/ssyequb.f b/SRC/ssyequb.f
index c6efb751b6..a0883616eb 100644
--- a/SRC/ssyequb.f
+++ b/SRC/ssyequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssyequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssyequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -116,7 +114,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup heequb
 *
 *> \par References:
 *  ================
@@ -127,7 +125,9 @@
 *>  Tech report version: http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.3.1679
 *>
 *  =====================================================================
-      SUBROUTINE SSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
+      SUBROUTINE SSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK,
+     $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,7 +172,8 @@ SUBROUTINE SSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF ( .NOT. ( LSAME( UPLO, 'U' ) .OR. LSAME( UPLO, 'L' ) ) ) THEN
+      IF ( .NOT. ( LSAME( UPLO, 'U' ) .OR.
+     $     LSAME( UPLO, 'L' ) ) ) THEN
          INFO = -1
       ELSE IF ( N .LT. 0 ) THEN
          INFO = -2
@@ -224,7 +225,7 @@ SUBROUTINE SSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
          S( J ) = 1.0E0 / S( J )
       END DO
 
-      TOL = ONE / SQRT( 2.0E0 * N )
+      TOL = ONE / SQRT( 2.0E0 * REAL( N ) )
 
       DO ITER = 1, MAX_ITER
          SCALE = 0.0E0
@@ -256,23 +257,23 @@ SUBROUTINE SSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
          DO I = 1, N
             AVG = AVG + S( I )*WORK( I )
          END DO
-         AVG = AVG / N
+         AVG = AVG / REAL( N )
 
          STD = 0.0E0
          DO I = N+1, 2*N
             WORK( I ) = S( I-N ) * WORK( I-N ) - AVG
          END DO
          CALL SLASSQ( N, WORK( N+1 ), 1, SCALE, SUMSQ )
-         STD = SCALE * SQRT( SUMSQ / N )
+         STD = SCALE * SQRT( SUMSQ / REAL( N ) )
 
          IF ( STD .LT. TOL * AVG ) GOTO 999
 
          DO I = 1, N
             T = ABS( A( I, I ) )
             SI = S( I )
-            C2 = ( N-1 ) * T
-            C1 = ( N-2 ) * ( WORK( I ) - T*SI )
-            C0 = -(T*SI)*SI + 2*WORK( I )*SI - N*AVG
+            C2 = REAL( N-1 ) * T
+            C1 = REAL( N-2 ) * ( WORK( I ) - T*SI )
+            C0 = -(T*SI)*SI + 2*WORK( I )*SI - REAL( N )*AVG
             D = C1*C1 - 4*C0*C2
 
             IF ( D .LE. 0 ) THEN
@@ -307,7 +308,7 @@ SUBROUTINE SSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
                END DO
             END IF
 
-            AVG = AVG + ( U + WORK( I ) ) * D / N
+            AVG = AVG + ( U + WORK( I ) ) * D / REAL( N )
             S( I ) = SI
          END DO
       END DO
diff --git a/SRC/ssyev.f b/SRC/ssyev.f
index 03ed326b84..7f4918bad3 100644
--- a/SRC/ssyev.f
+++ b/SRC/ssyev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssyev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssyev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -125,10 +123,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYeigen
+*> \ingroup heev
 *
 *  =====================================================================
       SUBROUTINE SSYEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -158,11 +157,13 @@ SUBROUTINE SSYEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, INFO )
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANSY
-      EXTERNAL           ILAENV, LSAME, SLAMCH, SLANSY
+      REAL               SLAMCH, SLANSY, SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SLAMCH, SLANSY,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLASCL, SORGTR, SSCAL, SSTEQR, SSTERF, SSYTRD,
+      EXTERNAL           SLASCL, SORGTR, SSCAL, SSTEQR, SSTERF,
+     $                   SSYTRD,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -190,7 +191,7 @@ SUBROUTINE SSYEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, INFO )
       IF( INFO.EQ.0 ) THEN
          NB = ILAENV( 1, 'SSYTRD', UPLO, N, -1, -1, -1 )
          LWKOPT = MAX( 1, ( NB+2 )*N )
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.MAX( 1, 3*N-1 ) .AND. .NOT.LQUERY )
      $      INFO = -8
@@ -255,9 +256,11 @@ SUBROUTINE SSYEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, INFO )
       IF( .NOT.WANTZ ) THEN
          CALL SSTERF( N, W, WORK( INDE ), INFO )
       ELSE
-         CALL SORGTR( UPLO, N, A, LDA, WORK( INDTAU ), WORK( INDWRK ),
+         CALL SORGTR( UPLO, N, A, LDA, WORK( INDTAU ),
+     $                WORK( INDWRK ),
      $                LLWORK, IINFO )
-         CALL SSTEQR( JOBZ, N, W, WORK( INDE ), A, LDA, WORK( INDTAU ),
+         CALL SSTEQR( JOBZ, N, W, WORK( INDE ), A, LDA,
+     $                WORK( INDTAU ),
      $                INFO )
       END IF
 *
@@ -274,7 +277,7 @@ SUBROUTINE SSYEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, INFO )
 *
 *     Set WORK(1) to optimal workspace size.
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/ssyev_2stage.f b/SRC/ssyev_2stage.f
index a6fa30cc81..2eedfe10cf 100644
--- a/SRC/ssyev_2stage.f
+++ b/SRC/ssyev_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYEV_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssyev_2stage.f">
 *> [TGZ]</a>
@@ -15,12 +14,11 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssyev_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE SSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, 
+*       SUBROUTINE SSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
 *                                INFO )
 *
 *       IMPLICIT NONE
@@ -105,12 +103,12 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + 2*N
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + 2*N
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -143,7 +141,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYeigen
+*> \ingroup heev_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -161,7 +159,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -169,16 +167,16 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE SSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, 
+      SUBROUTINE SSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
      $                         INFO )
 *
       IMPLICIT NONE
@@ -211,11 +209,13 @@ SUBROUTINE SSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV2STAGE
-      REAL               SLAMCH, SLANSY
-      EXTERNAL           LSAME, SLAMCH, SLANSY, ILAENV2STAGE
+      REAL               SLAMCH, SLANSY, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, SLANSY, ILAENV2STAGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLASCL, SORGTR, SSCAL, SSTEQR, SSTERF,
+      EXTERNAL           SLASCL, SORGTR, SSCAL, SSTEQR,
+     $                   SSTERF,
      $                   XERBLA, SSYTRD_2STAGE
 *     ..
 *     .. Intrinsic Functions ..
@@ -241,12 +241,16 @@ SUBROUTINE SSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         KD    = ILAENV2STAGE( 1, 'SSYTRD_2STAGE', JOBZ, N, -1, -1, -1 )
-         IB    = ILAENV2STAGE( 2, 'SSYTRD_2STAGE', JOBZ, N, KD, -1, -1 )
-         LHTRD = ILAENV2STAGE( 3, 'SSYTRD_2STAGE', JOBZ, N, KD, IB, -1 )
-         LWTRD = ILAENV2STAGE( 4, 'SSYTRD_2STAGE', JOBZ, N, KD, IB, -1 )
+         KD    = ILAENV2STAGE( 1, 'SSYTRD_2STAGE', JOBZ, N, -1, -1,
+     $                         -1 )
+         IB    = ILAENV2STAGE( 2, 'SSYTRD_2STAGE', JOBZ, N, KD, -1,
+     $                         -1 )
+         LHTRD = ILAENV2STAGE( 3, 'SSYTRD_2STAGE', JOBZ, N, KD, IB,
+     $                         -1 )
+         LWTRD = ILAENV2STAGE( 4, 'SSYTRD_2STAGE', JOBZ, N, KD, IB,
+     $                         -1 )
          LWMIN = 2*N + LHTRD + LWTRD
-         WORK( 1 )  = LWMIN
+         WORK( 1 )  = REAL( LWMIN )
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY )
      $      INFO = -8
@@ -305,7 +309,7 @@ SUBROUTINE SSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       LLWORK  = LWORK - INDWRK + 1
 *
       CALL SSYTRD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK( INDE ),
-     $                    WORK( INDTAU ), WORK( INDHOUS ), LHTRD, 
+     $                    WORK( INDTAU ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWRK ), LLWORK, IINFO )
 *
 *     For eigenvalues only, call SSTERF.  For eigenvectors, first call
@@ -317,9 +321,11 @@ SUBROUTINE SSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
 *        Not available in this release, and argument checking should not
 *        let it getting here
          RETURN
-         CALL SORGTR( UPLO, N, A, LDA, WORK( INDTAU ), WORK( INDWRK ),
+         CALL SORGTR( UPLO, N, A, LDA, WORK( INDTAU ),
+     $                WORK( INDWRK ),
      $                LLWORK, IINFO )
-         CALL SSTEQR( JOBZ, N, W, WORK( INDE ), A, LDA, WORK( INDTAU ),
+         CALL SSTEQR( JOBZ, N, W, WORK( INDE ), A, LDA,
+     $                WORK( INDTAU ),
      $                INFO )
       END IF
 *
@@ -336,7 +342,7 @@ SUBROUTINE SSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
 *
 *     Set WORK(1) to optimal workspace size.
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
 *
       RETURN
 *
diff --git a/SRC/ssyevd.f b/SRC/ssyevd.f
index 8b90d9263c..5649aff198 100644
--- a/SRC/ssyevd.f
+++ b/SRC/ssyevd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYEVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssyevd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssyevd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -40,13 +38,6 @@
 *> real symmetric matrix A. If eigenvectors are desired, it uses a
 *> divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
-*>
 *> Because of large use of BLAS of level 3, SSYEVD needs N**2 more
 *> workspace than SSYEVX.
 *> \endverbatim
@@ -103,8 +94,7 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is REAL array,
-*>                                         dimension (LWORK)
+*>          WORK is REAL array, dimension (MAX(1,LWORK))
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
@@ -167,7 +157,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYeigen
+*> \ingroup heevd
 *
 *> \par Contributors:
 *  ==================
@@ -178,8 +168,10 @@
 *>  Modified description of INFO. Sven, 16 Feb 05. \n
 *>
 *  =====================================================================
-      SUBROUTINE SSYEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, IWORK,
+      SUBROUTINE SSYEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
+     $                   IWORK,
      $                   LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -211,11 +203,13 @@ SUBROUTINE SSYEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, IWORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANSY
-      EXTERNAL           ILAENV, LSAME, SLAMCH, SLANSY
+      REAL               SLAMCH, SLANSY, SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SLAMCH,
+     $                   SLANSY, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLACPY, SLASCL, SORMTR, SSCAL, SSTEDC, SSTERF,
+      EXTERNAL           SLACPY, SLASCL, SORMTR, SSCAL, SSTEDC,
+     $                   SSTERF,
      $                   SSYTRD, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -255,10 +249,11 @@ SUBROUTINE SSYEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, IWORK,
                LWMIN = 2*N + 1
             END IF
             LOPT = MAX( LWMIN, 2*N +
-     $                  ILAENV( 1, 'SSYTRD', UPLO, N, -1, -1, -1 ) )
+     $                  N*ILAENV( 1, 'SSYTRD', UPLO, N, -1, -1,
+     $                            -1 ) )
             LIOPT = LIWMIN
          END IF
-         WORK( 1 ) = LOPT
+         WORK( 1 ) = SROUNDUP_LWORK( LOPT )
          IWORK( 1 ) = LIOPT
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -342,7 +337,7 @@ SUBROUTINE SSYEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, IWORK,
       IF( ISCALE.EQ.1 )
      $   CALL SSCAL( N, ONE / SIGMA, W, 1 )
 *
-      WORK( 1 ) = LOPT
+      WORK( 1 ) = SROUNDUP_LWORK( LOPT )
       IWORK( 1 ) = LIOPT
 *
       RETURN
diff --git a/SRC/ssyevd_2stage.f b/SRC/ssyevd_2stage.f
index f3fde6b4a1..758968ba89 100644
--- a/SRC/ssyevd_2stage.f
+++ b/SRC/ssyevd_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYEVD_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssyevd_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssyevd_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -45,12 +43,6 @@
 *> the reduction to tridiagonal. If eigenvectors are desired, it uses a
 *> divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -119,8 +111,8 @@
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + 2*N+1
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + 2*N+1
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -180,7 +172,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYeigen
+*> \ingroup heevd_2stage
 *
 *> \par Contributors:
 *  ==================
@@ -205,7 +197,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -213,16 +205,17 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE SSYEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
+      SUBROUTINE SSYEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK,
+     $                          LWORK,
      $                          IWORK, LIWORK, INFO )
 *
       IMPLICIT NONE
@@ -262,7 +255,8 @@ SUBROUTINE SSYEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       EXTERNAL           LSAME, SLAMCH, SLANSY, ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLACPY, SLASCL, SORMTR, SSCAL, SSTEDC, SSTERF,
+      EXTERNAL           SLACPY, SLASCL, SORMTR, SSCAL, SSTEDC,
+     $                   SSTERF,
      $                   SSYTRD_2STAGE, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -308,7 +302,7 @@ SUBROUTINE SSYEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
                LWMIN = 2*N + 1 + LHTRD + LWTRD
             END IF
          END IF
-         WORK( 1 )  = LWMIN
+         WORK( 1 )  = REAL( LWMIN )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -371,7 +365,7 @@ SUBROUTINE SSYEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       LLWRK2  = LWORK - INDWK2 + 1
 *
       CALL SSYTRD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK( INDE ),
-     $                    WORK( INDTAU ), WORK( INDHOUS ), LHTRD, 
+     $                    WORK( INDTAU ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWRK ), LLWORK, IINFO )
 *
 *     For eigenvalues only, call SSTERF.  For eigenvectors, first call
@@ -397,7 +391,7 @@ SUBROUTINE SSYEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       IF( ISCALE.EQ.1 )
      $   CALL SSCAL( N, ONE / SIGMA, W, 1 )
 *
-      WORK( 1 )  = LWMIN
+      WORK( 1 )  = REAL( LWMIN )
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/ssyevr.f b/SRC/ssyevr.f
index d8e4ce3ea6..6a848bb1cb 100644
--- a/SRC/ssyevr.f
+++ b/SRC/ssyevr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYEVR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssyevr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssyevr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -39,9 +37,16 @@
 *> \verbatim
 *>
 *> SSYEVR computes selected eigenvalues and, optionally, eigenvectors
-*> of a real symmetric matrix A.  Eigenvalues and eigenvectors can be
-*> selected by specifying either a range of values or a range of
-*> indices for the desired eigenvalues.
+*> of a real symmetric matrix A. Eigenvalues and eigenvectors can be
+*> selected by specifying either a range of values or a range of indices
+*> for the desired eigenvalues. Invocations with different choices for
+*> these parameters may result in the computation of slightly different
+*> eigenvalues and/or eigenvectors for the same matrix. The reason for
+*> this behavior is that there exists a variety of algorithms (each
+*> performing best for a particular set of options) with SSYEVR
+*> attempting to select the best based on the various parameters. In all
+*> cases, the computed values are accurate within the limits of finite
+*> precision arithmetic.
 *>
 *> SSYEVR first reduces the matrix A to tridiagonal form T with a call
 *> to SSYTRD.  Then, whenever possible, SSYEVR calls SSTEMR to compute
@@ -105,6 +110,9 @@
 *>          JOBZ is CHARACTER*1
 *>          = 'N':  Compute eigenvalues only;
 *>          = 'V':  Compute eigenvalues and eigenvectors.
+*>
+*>          This parameter influences the choice of the algorithm and
+*>          may alter the computed values.
 *> \endverbatim
 *>
 *> \param[in] RANGE
@@ -116,6 +124,9 @@
 *>          = 'I': the IL-th through IU-th eigenvalues will be found.
 *>          For RANGE = 'V' or 'I' and IU - IL < N - 1, SSTEBZ and
 *>          SSTEIN are called
+*>
+*>          This parameter influences the choice of the algorithm and
+*>          may alter the computed values.
 *> \endverbatim
 *>
 *> \param[in] UPLO
@@ -271,7 +282,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,26*N).
+*>          The dimension of the array WORK.
+*>          If N <= 1, LWORK >= 1, else LWORK >= 26*N.
 *>          For optimal efficiency, LWORK >= (NB+6)*N,
 *>          where NB is the max of the blocksize for SSYTRD and SORMTR
 *>          returned by ILAENV.
@@ -292,7 +304,8 @@
 *> \param[in] LIWORK
 *> \verbatim
 *>          LIWORK is INTEGER
-*>          The dimension of the array IWORK.  LIWORK >= max(1,10*N).
+*>          The dimension of the array IWORK.
+*>          If N <= 1, LIWORK >= 1, else LIWORK >= 10*N.
 *>
 *>          If LIWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal sizes of the WORK and
@@ -317,7 +330,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYeigen
+*> \ingroup heevr
 *
 *> \par Contributors:
 *  ==================
@@ -330,9 +343,11 @@
 *>       California at Berkeley, USA \n
 *>
 *  =====================================================================
-      SUBROUTINE SSYEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
+      SUBROUTINE SSYEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL,
+     $                   IU,
      $                   ABSTOL, M, W, Z, LDZ, ISUPPZ, WORK, LWORK,
      $                   IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -368,11 +383,13 @@ SUBROUTINE SSYEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANSY
-      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANSY
+      REAL               SLAMCH, SLANSY, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SLAMCH,
+     $                   SLANSY, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SORMTR, SSCAL, SSTEBZ, SSTEMR, SSTEIN,
+      EXTERNAL           SCOPY, SORMTR, SSCAL, SSTEBZ, SSTEMR,
+     $                   SSTEIN,
      $                   SSTERF, SSWAP, SSYTRD, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -392,8 +409,13 @@ SUBROUTINE SSYEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *
       LQUERY = ( ( LWORK.EQ.-1 ) .OR. ( LIWORK.EQ.-1 ) )
 *
-      LWMIN = MAX( 1, 26*N )
-      LIWMIN = MAX( 1, 10*N )
+      IF( N.LE.1 ) THEN
+         LWMIN  = 1
+         LIWMIN = 1
+      ELSE
+         LWMIN  = 26*N
+         LIWMIN = 10*N
+      END IF
 *
       INFO = 0
       IF( .NOT.( WANTZ .OR. LSAME( JOBZ, 'N' ) ) ) THEN
@@ -428,7 +450,7 @@ SUBROUTINE SSYEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
          NB = ILAENV( 1, 'SSYTRD', UPLO, N, -1, -1, -1 )
          NB = MAX( NB, ILAENV( 1, 'SORMTR', UPLO, N, -1, -1, -1 ) )
          LWKOPT = MAX( ( NB+1 )*N, LWMIN )
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -575,7 +597,7 @@ SUBROUTINE SSYEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
             CALL SCOPY( N-1, WORK( INDE ), 1, WORK( INDEE ), 1 )
             CALL SCOPY( N, WORK( INDD ), 1, WORK( INDDD ), 1 )
 *
-            IF (ABSTOL .LE. TWO*N*EPS) THEN
+            IF (ABSTOL .LE. TWO*REAL( N )*EPS) THEN
                TRYRAC = .TRUE.
             ELSE
                TRYRAC = .FALSE.
@@ -634,7 +656,8 @@ SUBROUTINE SSYEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *
          INDWKN = INDE
          LLWRKN = LWORK - INDWKN + 1
-         CALL SORMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ), Z,
+         CALL SORMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ),
+     $                Z,
      $                LDZ, WORK( INDWKN ), LLWRKN, IINFO )
       END IF
 *
@@ -677,7 +700,7 @@ SUBROUTINE SSYEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *
 *     Set WORK(1) to optimal workspace size.
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/ssyevr_2stage.f b/SRC/ssyevr_2stage.f
index 8ab2844c65..63f0023886 100644
--- a/SRC/ssyevr_2stage.f
+++ b/SRC/ssyevr_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYEVR_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssyevr_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssyevr_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -263,7 +261,7 @@
 *>          indicating the nonzero elements in Z. The i-th eigenvector
 *>          is nonzero only in elements ISUPPZ( 2*i-1 ) through
 *>          ISUPPZ( 2*i ). This is an output of SSTEMR (tridiagonal
-*>          matrix). The support of the eigenvectors of A is typically 
+*>          matrix). The support of the eigenvectors of A is typically
 *>          1:N because of the orthogonal transformations applied by SORMTR.
 *>          Implemented only for RANGE = 'A' or 'I' and IU - IL = N - 1
 *> \endverbatim
@@ -277,12 +275,13 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  
+*>          The dimension of the array WORK.
+*>          If N <= 1,               LWORK must be at least 1.
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, 26*N, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + 5*N
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + 5*N
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -300,13 +299,14 @@
 *> \param[out] IWORK
 *> \verbatim
 *>          IWORK is INTEGER array, dimension (MAX(1,LIWORK))
-*>          On exit, if INFO = 0, IWORK(1) returns the optimal LWORK.
+*>          On exit, if INFO = 0, IWORK(1) returns the optimal LIWORK.
 *> \endverbatim
 *>
 *> \param[in] LIWORK
 *> \verbatim
 *>          LIWORK is INTEGER
-*>          The dimension of the array IWORK.  LIWORK >= max(1,10*N).
+*>          The dimension of the array IWORK.
+*>          If N <= 1, LIWORK >= 1, else LIWORK >= 10*N.
 *>
 *>          If LIWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal size of the IWORK array,
@@ -330,7 +330,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYeigen
+*> \ingroup heevr_2stage
 *
 *> \par Contributors:
 *  ==================
@@ -358,7 +358,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -366,11 +366,11 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
@@ -416,11 +416,14 @@ SUBROUTINE SSYEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV, ILAENV2STAGE
-      REAL               SLAMCH, SLANSY
-      EXTERNAL           LSAME, SLAMCH, SLANSY, ILAENV, ILAENV2STAGE
+      REAL               SLAMCH, SLANSY, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, SLANSY,
+     $                   SROUNDUP_LWORK, ILAENV,
+     $                   ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SORMTR, SSCAL, SSTEBZ, SSTEMR, SSTEIN,
+      EXTERNAL           SCOPY, SORMTR, SSCAL, SSTEBZ, SSTEMR,
+     $                   SSTEIN,
      $                   SSTERF, SSWAP, SSYTRD_2STAGE, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -440,12 +443,22 @@ SUBROUTINE SSYEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *
       LQUERY = ( ( LWORK.EQ.-1 ) .OR. ( LIWORK.EQ.-1 ) )
 *
-      KD     = ILAENV2STAGE( 1, 'SSYTRD_2STAGE', JOBZ, N, -1, -1, -1 )
-      IB     = ILAENV2STAGE( 2, 'SSYTRD_2STAGE', JOBZ, N, KD, -1, -1 )
-      LHTRD  = ILAENV2STAGE( 3, 'SSYTRD_2STAGE', JOBZ, N, KD, IB, -1 )
-      LWTRD  = ILAENV2STAGE( 4, 'SSYTRD_2STAGE', JOBZ, N, KD, IB, -1 )
-      LWMIN  = MAX( 26*N, 5*N + LHTRD + LWTRD )
-      LIWMIN = MAX( 1, 10*N )
+      KD     = ILAENV2STAGE( 1, 'SSYTRD_2STAGE', JOBZ, N, -1, -1,
+     $                      -1 )
+      IB     = ILAENV2STAGE( 2, 'SSYTRD_2STAGE', JOBZ, N, KD, -1,
+     $                      -1 )
+      LHTRD  = ILAENV2STAGE( 3, 'SSYTRD_2STAGE', JOBZ, N, KD, IB,
+     $                      -1 )
+      LWTRD  = ILAENV2STAGE( 4, 'SSYTRD_2STAGE', JOBZ, N, KD, IB,
+     $                      -1 )
+*
+      IF( N.LE.1 ) THEN
+         LWMIN  = 1
+         LIWMIN = 1
+      ELSE
+         LWMIN  = MAX( 26*N, 5*N + LHTRD + LWTRD )
+         LIWMIN = 10*N
+      END IF
 *
       INFO = 0
       IF( .NOT.( LSAME( JOBZ, 'N' ) ) ) THEN
@@ -484,7 +497,7 @@ SUBROUTINE SSYEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *         NB = ILAENV( 1, 'SSYTRD', UPLO, N, -1, -1, -1 )
 *         NB = MAX( NB, ILAENV( 1, 'SORMTR', UPLO, N, -1, -1, -1 ) )
 *         LWKOPT = MAX( ( NB+1 )*N, LWMIN )
-         WORK( 1 ) = LWMIN
+         WORK( 1 )  = SROUNDUP_LWORK( LWMIN )
          IWORK( 1 ) = LIWMIN
       END IF
 *
@@ -504,7 +517,7 @@ SUBROUTINE SSYEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       END IF
 *
       IF( N.EQ.1 ) THEN
-         WORK( 1 ) = 26
+         WORK( 1 ) = 1
          IF( ALLEIG .OR. INDEIG ) THEN
             M = 1
             W( 1 ) = A( 1, 1 )
@@ -608,7 +621,7 @@ SUBROUTINE SSYEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *     Call SSYTRD_2STAGE to reduce symmetric matrix to tridiagonal form.
 *
 *
-      CALL SSYTRD_2STAGE( JOBZ, UPLO, N, A, LDA, WORK( INDD ), 
+      CALL SSYTRD_2STAGE( JOBZ, UPLO, N, A, LDA, WORK( INDD ),
      $                    WORK( INDE ), WORK( INDTAU ), WORK( INDHOUS ),
      $                    LHTRD, WORK( INDWK ), LLWORK, IINFO )
 *
@@ -630,7 +643,7 @@ SUBROUTINE SSYEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
             CALL SCOPY( N-1, WORK( INDE ), 1, WORK( INDEE ), 1 )
             CALL SCOPY( N, WORK( INDD ), 1, WORK( INDDD ), 1 )
 *
-            IF (ABSTOL .LE. TWO*N*EPS) THEN
+            IF (ABSTOL .LE. TWO*REAL( N )*EPS) THEN
                TRYRAC = .TRUE.
             ELSE
                TRYRAC = .FALSE.
@@ -689,7 +702,8 @@ SUBROUTINE SSYEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *
          INDWKN = INDE
          LLWRKN = LWORK - INDWKN + 1
-         CALL SORMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ), Z,
+         CALL SORMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ),
+     $                Z,
      $                LDZ, WORK( INDWKN ), LLWRKN, IINFO )
       END IF
 *
@@ -732,7 +746,7 @@ SUBROUTINE SSYEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *
 *     Set WORK(1) to optimal workspace size.
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 )  = SROUNDUP_LWORK( LWMIN )
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/ssyevx.f b/SRC/ssyevx.f
index 11776e8c55..3774536d30 100644
--- a/SRC/ssyevx.f
+++ b/SRC/ssyevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssyevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssyevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -244,12 +242,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYeigen
+*> \ingroup heevx
 *
 *  =====================================================================
-      SUBROUTINE SSYEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
+      SUBROUTINE SSYEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL,
+     $                   IU,
      $                   ABSTOL, M, W, Z, LDZ, WORK, LWORK, IWORK,
      $                   IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -285,11 +285,13 @@ SUBROUTINE SSYEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANSY
-      EXTERNAL           LSAME, ILAENV, SLAMCH, SLANSY
+      REAL               SLAMCH, SLANSY, SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SLAMCH,
+     $                   SLANSY, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLACPY, SORGTR, SORMTR, SSCAL, SSTEBZ,
+      EXTERNAL           SCOPY, SLACPY, SORGTR, SORMTR, SSCAL,
+     $                   SSTEBZ,
      $                   SSTEIN, SSTEQR, SSTERF, SSWAP, SSYTRD, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -338,14 +340,15 @@ SUBROUTINE SSYEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
       IF( INFO.EQ.0 ) THEN
          IF( N.LE.1 ) THEN
             LWKMIN = 1
-            WORK( 1 ) = LWKMIN
+            LWKOPT = 1
          ELSE
             LWKMIN = 8*N
             NB = ILAENV( 1, 'SSYTRD', UPLO, N, -1, -1, -1 )
-            NB = MAX( NB, ILAENV( 1, 'SORMTR', UPLO, N, -1, -1, -1 ) )
+            NB = MAX( NB, ILAENV( 1, 'SORMTR', UPLO, N, -1, -1,
+     $                -1 ) )
             LWKOPT = MAX( LWKMIN, ( NB + 3 )*N )
-            WORK( 1 ) = LWKOPT
          END IF
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
          IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY )
      $      INFO = -17
@@ -494,7 +497,8 @@ SUBROUTINE SSYEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *
          INDWKN = INDE
          LLWRKN = LWORK - INDWKN + 1
-         CALL SORMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ), Z,
+         CALL SORMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ),
+     $                Z,
      $                LDZ, WORK( INDWKN ), LLWRKN, IINFO )
       END IF
 *
@@ -542,7 +546,7 @@ SUBROUTINE SSYEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *
 *     Set WORK(1) to optimal workspace size.
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       RETURN
 *
diff --git a/SRC/ssyevx_2stage.f b/SRC/ssyevx_2stage.f
index 1a2225c875..1cf1d0c6b0 100644
--- a/SRC/ssyevx_2stage.f
+++ b/SRC/ssyevx_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYEVX_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssyevx_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssyevx_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -208,12 +206,12 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, 8*N, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + 3*N
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + 3*N
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -259,7 +257,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYeigen
+*> \ingroup heevx_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -277,7 +275,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -285,11 +283,11 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
@@ -334,11 +332,13 @@ SUBROUTINE SSYEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV2STAGE
-      REAL               SLAMCH, SLANSY
-      EXTERNAL           LSAME, SLAMCH, SLANSY, ILAENV2STAGE
+      REAL               SLAMCH, SLANSY, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLAMCH, SLANSY, ILAENV2STAGE,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLACPY, SORGTR, SORMTR, SSCAL, SSTEBZ,
+      EXTERNAL           SCOPY, SLACPY, SORGTR, SORMTR, SSCAL,
+     $                   SSTEBZ,
      $                   SSTEIN, SSTEQR, SSTERF, SSWAP, XERBLA,
      $                   SSYTRD_2STAGE
 *     ..
@@ -388,7 +388,7 @@ SUBROUTINE SSYEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       IF( INFO.EQ.0 ) THEN
          IF( N.LE.1 ) THEN
             LWMIN = 1
-            WORK( 1 ) = LWMIN
+            WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
          ELSE
             KD    = ILAENV2STAGE( 1, 'SSYTRD_2STAGE', JOBZ,
      $                            N, -1, -1, -1 )
@@ -399,7 +399,7 @@ SUBROUTINE SSYEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
             LWTRD = ILAENV2STAGE( 4, 'SSYTRD_2STAGE', JOBZ,
      $                            N, KD, IB, -1 )
             LWMIN = MAX( 8*N, 3*N + LHTRD + LWTRD )
-            WORK( 1 )  = LWMIN
+            WORK( 1 )  = REAL( LWMIN )
          END IF
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY )
@@ -487,7 +487,7 @@ SUBROUTINE SSYEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       INDWRK  = INDHOUS + LHTRD
       LLWORK  = LWORK - INDWRK + 1
 *
-      CALL SSYTRD_2STAGE( JOBZ, UPLO, N, A, LDA, WORK( INDD ), 
+      CALL SSYTRD_2STAGE( JOBZ, UPLO, N, A, LDA, WORK( INDD ),
      $                    WORK( INDE ), WORK( INDTAU ), WORK( INDHOUS ),
      $                    LHTRD, WORK( INDWRK ), LLWORK, IINFO )
 *
@@ -552,7 +552,8 @@ SUBROUTINE SSYEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *
          INDWKN = INDE
          LLWRKN = LWORK - INDWKN + 1
-         CALL SORMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ), Z,
+         CALL SORMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ),
+     $                Z,
      $                LDZ, WORK( INDWKN ), LLWRKN, IINFO )
       END IF
 *
@@ -600,7 +601,7 @@ SUBROUTINE SSYEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *
 *     Set WORK(1) to optimal workspace size.
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
 *
       RETURN
 *
diff --git a/SRC/ssygs2.f b/SRC/ssygs2.f
index b27b473b06..0a889e3cea 100644
--- a/SRC/ssygs2.f
+++ b/SRC/ssygs2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYGS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssygs2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssygs2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,10 +118,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hegs2
 *
 *  =====================================================================
       SUBROUTINE SSYGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -149,7 +148,8 @@ SUBROUTINE SSYGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
       REAL               AKK, BKK, CT
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SSCAL, SSYR2, STRMV, STRSV, XERBLA
+      EXTERNAL           SAXPY, SSCAL, SSYR2, STRMV, STRSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -221,10 +221,12 @@ SUBROUTINE SSYGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
                IF( K.LT.N ) THEN
                   CALL SSCAL( N-K, ONE / BKK, A( K+1, K ), 1 )
                   CT = -HALF*AKK
-                  CALL SAXPY( N-K, CT, B( K+1, K ), 1, A( K+1, K ), 1 )
+                  CALL SAXPY( N-K, CT, B( K+1, K ), 1, A( K+1, K ),
+     $                        1 )
                   CALL SSYR2( UPLO, N-K, -ONE, A( K+1, K ), 1,
      $                        B( K+1, K ), 1, A( K+1, K+1 ), LDA )
-                  CALL SAXPY( N-K, CT, B( K+1, K ), 1, A( K+1, K ), 1 )
+                  CALL SAXPY( N-K, CT, B( K+1, K ), 1, A( K+1, K ),
+     $                        1 )
                   CALL STRSV( UPLO, 'No transpose', 'Non-unit', N-K,
      $                        B( K+1, K+1 ), LDB, A( K+1, K ), 1 )
                END IF
@@ -245,7 +247,8 @@ SUBROUTINE SSYGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
      $                     LDB, A( 1, K ), 1 )
                CT = HALF*AKK
                CALL SAXPY( K-1, CT, B( 1, K ), 1, A( 1, K ), 1 )
-               CALL SSYR2( UPLO, K-1, ONE, A( 1, K ), 1, B( 1, K ), 1,
+               CALL SSYR2( UPLO, K-1, ONE, A( 1, K ), 1, B( 1, K ),
+     $                     1,
      $                     A, LDA )
                CALL SAXPY( K-1, CT, B( 1, K ), 1, A( 1, K ), 1 )
                CALL SSCAL( K-1, BKK, A( 1, K ), 1 )
@@ -261,7 +264,8 @@ SUBROUTINE SSYGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
 *
                AKK = A( K, K )
                BKK = B( K, K )
-               CALL STRMV( UPLO, 'Transpose', 'Non-unit', K-1, B, LDB,
+               CALL STRMV( UPLO, 'Transpose', 'Non-unit', K-1, B,
+     $                     LDB,
      $                     A( K, 1 ), LDA )
                CT = HALF*AKK
                CALL SAXPY( K-1, CT, B( K, 1 ), LDB, A( K, 1 ), LDA )
diff --git a/SRC/ssygst.f b/SRC/ssygst.f
index a517a8c124..668d018752 100644
--- a/SRC/ssygst.f
+++ b/SRC/ssygst.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYGST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssygst.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssygst.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,10 +118,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hegst
 *
 *  =====================================================================
       SUBROUTINE SSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -148,7 +147,8 @@ SUBROUTINE SSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
       INTEGER            K, KB, NB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SSYGS2, SSYMM, SSYR2K, STRMM, STRSM, XERBLA
+      EXTERNAL           SSYGS2, SSYMM, SSYR2K, STRMM, STRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -211,13 +211,15 @@ SUBROUTINE SSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
                   CALL SSYGS2( ITYPE, UPLO, KB, A( K, K ), LDA,
      $                         B( K, K ), LDB, INFO )
                   IF( K+KB.LE.N ) THEN
-                     CALL STRSM( 'Left', UPLO, 'Transpose', 'Non-unit',
+                     CALL STRSM( 'Left', UPLO, 'Transpose',
+     $                           'Non-unit',
      $                           KB, N-K-KB+1, ONE, B( K, K ), LDB,
      $                           A( K, K+KB ), LDA )
                      CALL SSYMM( 'Left', UPLO, KB, N-K-KB+1, -HALF,
      $                           A( K, K ), LDA, B( K, K+KB ), LDB, ONE,
      $                           A( K, K+KB ), LDA )
-                     CALL SSYR2K( UPLO, 'Transpose', N-K-KB+1, KB, -ONE,
+                     CALL SSYR2K( UPLO, 'Transpose', N-K-KB+1, KB,
+     $                            -ONE,
      $                            A( K, K+KB ), LDA, B( K, K+KB ), LDB,
      $                            ONE, A( K+KB, K+KB ), LDA )
                      CALL SSYMM( 'Left', UPLO, KB, N-K-KB+1, -HALF,
@@ -241,7 +243,8 @@ SUBROUTINE SSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
                   CALL SSYGS2( ITYPE, UPLO, KB, A( K, K ), LDA,
      $                         B( K, K ), LDB, INFO )
                   IF( K+KB.LE.N ) THEN
-                     CALL STRSM( 'Right', UPLO, 'Transpose', 'Non-unit',
+                     CALL STRSM( 'Right', UPLO, 'Transpose',
+     $                           'Non-unit',
      $                           N-K-KB+1, KB, ONE, B( K, K ), LDB,
      $                           A( K+KB, K ), LDA )
                      CALL SSYMM( 'Right', UPLO, N-K-KB+1, KB, -HALF,
@@ -270,14 +273,17 @@ SUBROUTINE SSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
 *
 *                 Update the upper triangle of A(1:k+kb-1,1:k+kb-1)
 *
-                  CALL STRMM( 'Left', UPLO, 'No transpose', 'Non-unit',
+                  CALL STRMM( 'Left', UPLO, 'No transpose',
+     $                        'Non-unit',
      $                        K-1, KB, ONE, B, LDB, A( 1, K ), LDA )
-                  CALL SSYMM( 'Right', UPLO, K-1, KB, HALF, A( K, K ),
+                  CALL SSYMM( 'Right', UPLO, K-1, KB, HALF, A( K,
+     $                        K ),
      $                        LDA, B( 1, K ), LDB, ONE, A( 1, K ), LDA )
                   CALL SSYR2K( UPLO, 'No transpose', K-1, KB, ONE,
      $                         A( 1, K ), LDA, B( 1, K ), LDB, ONE, A,
      $                         LDA )
-                  CALL SSYMM( 'Right', UPLO, K-1, KB, HALF, A( K, K ),
+                  CALL SSYMM( 'Right', UPLO, K-1, KB, HALF, A( K,
+     $                        K ),
      $                        LDA, B( 1, K ), LDB, ONE, A( 1, K ), LDA )
                   CALL STRMM( 'Right', UPLO, 'Transpose', 'Non-unit',
      $                        K-1, KB, ONE, B( K, K ), LDB, A( 1, K ),
@@ -294,7 +300,8 @@ SUBROUTINE SSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
 *
 *                 Update the lower triangle of A(1:k+kb-1,1:k+kb-1)
 *
-                  CALL STRMM( 'Right', UPLO, 'No transpose', 'Non-unit',
+                  CALL STRMM( 'Right', UPLO, 'No transpose',
+     $                        'Non-unit',
      $                        KB, K-1, ONE, B, LDB, A( K, 1 ), LDA )
                   CALL SSYMM( 'Left', UPLO, KB, K-1, HALF, A( K, K ),
      $                        LDA, B( K, 1 ), LDB, ONE, A( K, 1 ), LDA )
@@ -303,7 +310,8 @@ SUBROUTINE SSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
      $                         LDA )
                   CALL SSYMM( 'Left', UPLO, KB, K-1, HALF, A( K, K ),
      $                        LDA, B( K, 1 ), LDB, ONE, A( K, 1 ), LDA )
-                  CALL STRMM( 'Left', UPLO, 'Transpose', 'Non-unit', KB,
+                  CALL STRMM( 'Left', UPLO, 'Transpose', 'Non-unit',
+     $                        KB,
      $                        K-1, ONE, B( K, K ), LDB, A( K, 1 ), LDA )
                   CALL SSYGS2( ITYPE, UPLO, KB, A( K, K ), LDA,
      $                         B( K, K ), LDB, INFO )
diff --git a/SRC/ssygv.f b/SRC/ssygv.f
index 270957fcee..aaf2cbbae6 100644
--- a/SRC/ssygv.f
+++ b/SRC/ssygv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssygv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssygv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -154,7 +152,7 @@
 *>                    i off-diagonal elements of an intermediate
 *>                    tridiagonal form did not converge to zero;
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -167,11 +165,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYeigen
+*> \ingroup hegv
 *
 *  =====================================================================
-      SUBROUTINE SSYGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
+      SUBROUTINE SSYGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
+     $                  WORK,
      $                  LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -199,10 +199,12 @@ SUBROUTINE SSYGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           ILAENV, LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SPOTRF, SSYEV, SSYGST, STRMM, STRSM, XERBLA
+      EXTERNAL           SPOTRF, SSYEV, SSYGST, STRMM, STRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -234,7 +236,7 @@ SUBROUTINE SSYGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
          LWKMIN = MAX( 1, 3*N - 1 )
          NB = ILAENV( 1, 'SSYTRD', UPLO, N, -1, -1, -1 )
          LWKOPT = MAX( LWKMIN, ( NB + 2 )*N )
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
             INFO = -11
@@ -284,7 +286,8 @@ SUBROUTINE SSYGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
                TRANS = 'T'
             END IF
 *
-            CALL STRSM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG, ONE,
+            CALL STRSM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG,
+     $                  ONE,
      $                  B, LDB, A, LDA )
 *
          ELSE IF( ITYPE.EQ.3 ) THEN
@@ -298,12 +301,13 @@ SUBROUTINE SSYGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
                TRANS = 'N'
             END IF
 *
-            CALL STRMM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG, ONE,
+            CALL STRMM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG,
+     $                  ONE,
      $                  B, LDB, A, LDA )
          END IF
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of SSYGV
diff --git a/SRC/ssygv_2stage.f b/SRC/ssygv_2stage.f
index 49f357d908..5ce4ede155 100644
--- a/SRC/ssygv_2stage.f
+++ b/SRC/ssygv_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYGV_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssygv_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssygv_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -143,12 +141,12 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + 2*N
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + 2*N
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -173,7 +171,7 @@
 *>                    i off-diagonal elements of an intermediate
 *>                    tridiagonal form did not converge to zero;
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -186,7 +184,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYeigen
+*> \ingroup hegv_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -204,7 +202,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -212,16 +210,17 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE SSYGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
+      SUBROUTINE SSYGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB,
+     $                         W,
      $                         WORK, LWORK, INFO )
 *
       IMPLICIT NONE
@@ -252,10 +251,12 @@ SUBROUTINE SSYGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV2STAGE
-      EXTERNAL           LSAME, ILAENV2STAGE
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV2STAGE, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SPOTRF, SSYGST, STRMM, STRSM, XERBLA,
+      EXTERNAL           SPOTRF, SSYGST, STRMM, STRSM,
+     $                   XERBLA,
      $                   SSYEV_2STAGE
 *     ..
 *     .. Intrinsic Functions ..
@@ -285,12 +286,16 @@ SUBROUTINE SSYGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         KD    = ILAENV2STAGE( 1, 'SSYTRD_2STAGE', JOBZ, N, -1, -1, -1 )
-         IB    = ILAENV2STAGE( 2, 'SSYTRD_2STAGE', JOBZ, N, KD, -1, -1 )
-         LHTRD = ILAENV2STAGE( 3, 'SSYTRD_2STAGE', JOBZ, N, KD, IB, -1 )
-         LWTRD = ILAENV2STAGE( 4, 'SSYTRD_2STAGE', JOBZ, N, KD, IB, -1 )
+         KD    = ILAENV2STAGE( 1, 'SSYTRD_2STAGE', JOBZ, N, -1, -1,
+     $                         -1 )
+         IB    = ILAENV2STAGE( 2, 'SSYTRD_2STAGE', JOBZ, N, KD, -1,
+     $                         -1 )
+         LHTRD = ILAENV2STAGE( 3, 'SSYTRD_2STAGE', JOBZ, N, KD, IB,
+     $                         -1 )
+         LWTRD = ILAENV2STAGE( 4, 'SSYTRD_2STAGE', JOBZ, N, KD, IB,
+     $                         -1 )
          LWMIN = 2*N + LHTRD + LWTRD
-         WORK( 1 )  = LWMIN
+         WORK( 1 )  = REAL( LWMIN )
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
             INFO = -11
@@ -320,7 +325,8 @@ SUBROUTINE SSYGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL SSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
-      CALL SSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, INFO )
+      CALL SSYEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
+     $                   INFO )
 *
       IF( WANTZ ) THEN
 *
@@ -340,7 +346,8 @@ SUBROUTINE SSYGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
                TRANS = 'T'
             END IF
 *
-            CALL STRSM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG, ONE,
+            CALL STRSM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG,
+     $                  ONE,
      $                  B, LDB, A, LDA )
 *
          ELSE IF( ITYPE.EQ.3 ) THEN
@@ -354,12 +361,13 @@ SUBROUTINE SSYGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
                TRANS = 'N'
             END IF
 *
-            CALL STRMM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG, ONE,
+            CALL STRMM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG,
+     $                  ONE,
      $                  B, LDB, A, LDA )
          END IF
       END IF
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       RETURN
 *
 *     End of SSYGV_2STAGE
diff --git a/SRC/ssygvd.f b/SRC/ssygvd.f
index 9002df2374..aacf9d3ad5 100644
--- a/SRC/ssygvd.f
+++ b/SRC/ssygvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYGVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssygvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssygvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -42,12 +40,6 @@
 *> B are assumed to be symmetric and B is also positive definite.
 *> If eigenvectors are desired, it uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -190,7 +182,7 @@
 *>                    the submatrix lying in rows and columns INFO/(N+1)
 *>                    through mod(INFO,N+1);
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -203,7 +195,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYeigen
+*> \ingroup hegvd
 *
 *> \par Further Details:
 *  =====================
@@ -222,8 +214,10 @@
 *>     Mark Fahey, Department of Mathematics, Univ. of Kentucky, USA
 *>
 *  =====================================================================
-      SUBROUTINE SSYGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
+      SUBROUTINE SSYGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
+     $                   WORK,
      $                   LWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -251,10 +245,12 @@ SUBROUTINE SSYGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SPOTRF, SSYEVD, SSYGST, STRMM, STRSM, XERBLA
+      EXTERNAL           SPOTRF, SSYEVD, SSYGST, STRMM, STRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, REAL
@@ -295,7 +291,7 @@ SUBROUTINE SSYGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         WORK( 1 ) = LOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LOPT)
          IWORK( 1 ) = LIOPT
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -328,10 +324,11 @@ SUBROUTINE SSYGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL SSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
-      CALL SSYEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, IWORK, LIWORK,
+      CALL SSYEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, IWORK,
+     $             LIWORK,
      $             INFO )
-      LOPT = MAX( REAL( LOPT ), REAL( WORK( 1 ) ) )
-      LIOPT = MAX( REAL( LIOPT ), REAL( IWORK( 1 ) ) )
+      LOPT = INT( MAX( REAL( LOPT ), REAL( WORK( 1 ) ) ) )
+      LIOPT = INT( MAX( REAL( LIOPT ), REAL( IWORK( 1 ) ) ) )
 *
       IF( WANTZ .AND. INFO.EQ.0 ) THEN
 *
@@ -367,7 +364,7 @@ SUBROUTINE SSYGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
          END IF
       END IF
 *
-      WORK( 1 ) = LOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LOPT)
       IWORK( 1 ) = LIOPT
 *
       RETURN
diff --git a/SRC/ssygvx.f b/SRC/ssygvx.f
index e93da60cc3..e4c68ede61 100644
--- a/SRC/ssygvx.f
+++ b/SRC/ssygvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYGVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssygvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssygvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -270,7 +268,7 @@
 *>                    i eigenvectors failed to converge.  Their indices
 *>                    are stored in array IFAIL.
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -283,7 +281,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYeigen
+*> \ingroup hegvx
 *
 *> \par Contributors:
 *  ==================
@@ -294,6 +292,7 @@
       SUBROUTINE SSYGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
      $                   VL, VU, IL, IU, ABSTOL, M, W, Z, LDZ, WORK,
      $                   LWORK, IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -324,10 +323,12 @@ SUBROUTINE SSYGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           ILAENV, LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SPOTRF, SSYEVX, SSYGST, STRMM, STRSM, XERBLA
+      EXTERNAL           SPOTRF, SSYEVX, SSYGST, STRMM, STRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -380,7 +381,7 @@ SUBROUTINE SSYGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
          LWKMIN = MAX( 1, 8*N )
          NB = ILAENV( 1, 'SSYTRD', UPLO, N, -1, -1, -1 )
          LWKOPT = MAX( LWKMIN, ( NB + 3 )*N )
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
             INFO = -20
@@ -412,7 +413,8 @@ SUBROUTINE SSYGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL SSYGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
-      CALL SSYEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU, ABSTOL,
+      CALL SSYEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
+     $             ABSTOL,
      $             M, W, Z, LDZ, WORK, LWORK, IWORK, IFAIL, INFO )
 *
       IF( WANTZ ) THEN
@@ -432,7 +434,8 @@ SUBROUTINE SSYGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
                TRANS = 'T'
             END IF
 *
-            CALL STRSM( 'Left', UPLO, TRANS, 'Non-unit', N, M, ONE, B,
+            CALL STRSM( 'Left', UPLO, TRANS, 'Non-unit', N, M, ONE,
+     $                  B,
      $                  LDB, Z, LDZ )
 *
          ELSE IF( ITYPE.EQ.3 ) THEN
@@ -446,14 +449,15 @@ SUBROUTINE SSYGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
                TRANS = 'N'
             END IF
 *
-            CALL STRMM( 'Left', UPLO, TRANS, 'Non-unit', N, M, ONE, B,
+            CALL STRMM( 'Left', UPLO, TRANS, 'Non-unit', N, M, ONE,
+     $                  B,
      $                  LDB, Z, LDZ )
          END IF
       END IF
 *
 *     Set WORK(1) to optimal workspace size.
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/ssyrfs.f b/SRC/ssyrfs.f
index 77ffdb94d5..21d4198eee 100644
--- a/SRC/ssyrfs.f
+++ b/SRC/ssyrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssyrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssyrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -183,11 +181,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup herfs
 *
 *  =====================================================================
-      SUBROUTINE SSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
+      SUBROUTINE SSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
+     $                   LDB,
      $                   X, LDX, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -226,7 +226,8 @@ SUBROUTINE SSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SLACN2, SSYMV, SSYTRS, XERBLA
+      EXTERNAL           SAXPY, SCOPY, SLACN2, SSYMV, SSYTRS,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -277,7 +278,7 @@ SUBROUTINE SSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
       NZ = N + 1
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -387,22 +388,25 @@ SUBROUTINE SSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
 *
          DO 90 I = 1, N
             IF( WORK( I ).GT.SAFE2 ) THEN
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I )
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
             ELSE
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I ) + SAFE1
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
+     $                     + SAFE1
             END IF
    90    CONTINUE
 *
          KASE = 0
   100    CONTINUE
-         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
 *
 *              Multiply by diag(W)*inv(A**T).
 *
-               CALL SSYTRS( UPLO, N, 1, AF, LDAF, IPIV, WORK( N+1 ), N,
+               CALL SSYTRS( UPLO, N, 1, AF, LDAF, IPIV, WORK( N+1 ),
+     $                      N,
      $                      INFO )
                DO 110 I = 1, N
                   WORK( N+I ) = WORK( I )*WORK( N+I )
@@ -414,7 +418,8 @@ SUBROUTINE SSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
                DO 120 I = 1, N
                   WORK( N+I ) = WORK( I )*WORK( N+I )
   120          CONTINUE
-               CALL SSYTRS( UPLO, N, 1, AF, LDAF, IPIV, WORK( N+1 ), N,
+               CALL SSYTRS( UPLO, N, 1, AF, LDAF, IPIV, WORK( N+1 ),
+     $                      N,
      $                      INFO )
             END IF
             GO TO 100
diff --git a/SRC/ssyrfsx.f b/SRC/ssyrfsx.f
index 43215902fb..6a47f11687 100644
--- a/SRC/ssyrfsx.f
+++ b/SRC/ssyrfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYRFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssyrfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssyrfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -392,13 +390,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup herfsx
 *
 *  =====================================================================
-      SUBROUTINE SSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE SSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    S, B, LDB, X, LDX, RCOND, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -517,7 +517,8 @@ SUBROUTINE SSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Test input parameters.
 *
-      IF ( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF ( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $     .NOT.LSAME( UPLO, 'L' ) ) THEN
         INFO = -1
       ELSE IF( .NOT.RCEQU .AND. .NOT.LSAME( EQUED, 'N' ) ) THEN
         INFO = -2
@@ -656,7 +657,8 @@ SUBROUTINE SSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
          DO J = 1, NRHS
             IF ( ERR_BNDS_COMP( J, LA_LINRX_ERR_I ) .LT. CWISE_WRONG )
      $     THEN
-               RCOND_TMP = SLA_SYRCOND( UPLO, N, A, LDA, AF, LDAF, IPIV,
+               RCOND_TMP = SLA_SYRCOND( UPLO, N, A, LDA, AF, LDAF,
+     $                                  IPIV,
      $              1, X(1,J), INFO, WORK, IWORK )
             ELSE
                RCOND_TMP = 0.0
diff --git a/SRC/ssysv.f b/SRC/ssysv.f
index 5f4062e9ae..1a271e337c 100644
--- a/SRC/ssysv.f
+++ b/SRC/ssysv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssysv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssysv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,11 +161,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYsolve
+*> \ingroup hesv
 *
 *  =====================================================================
       SUBROUTINE SSYSV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
      $                  LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,7 +189,8 @@ SUBROUTINE SSYSV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           XERBLA, SSYTRF, SSYTRS, SSYTRS2
@@ -204,7 +204,8 @@ SUBROUTINE SSYSV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -223,9 +224,9 @@ SUBROUTINE SSYSV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
             LWKOPT = 1
          ELSE
             CALL SSYTRF( UPLO, N, A, LDA, IPIV, WORK, -1, INFO )
-            LWKOPT = WORK(1)
+            LWKOPT = INT( WORK( 1 ) )
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -258,7 +259,7 @@ SUBROUTINE SSYSV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/ssysv_aa.f b/SRC/ssysv_aa.f
index 5661332c5f..7a33eb4ff8 100644
--- a/SRC/ssysv_aa.f
+++ b/SRC/ssysv_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYSV_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssysv_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssysv_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -154,11 +152,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYsolve
+*> \ingroup hesv_aa
 *
 *  =====================================================================
       SUBROUTINE SSYSV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
      $                     LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -177,11 +176,13 @@ SUBROUTINE SSYSV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
 *     .. Local Scalars ..
       LOGICAL            LQUERY
-      INTEGER            LWKOPT, LWKOPT_SYTRF, LWKOPT_SYTRS
+      INTEGER            LWKMIN, LWKOPT, LWKOPT_SYTRF, LWKOPT_SYTRS
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           XERBLA, SSYTRS_AA, SSYTRF_AA
@@ -195,7 +196,9 @@ SUBROUTINE SSYSV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      LWKMIN = MAX( 1, 2*N, 3*N-2 )
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -205,18 +208,18 @@ SUBROUTINE SSYSV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
          INFO = -5
       ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
          INFO = -8
-      ELSE IF( LWORK.LT.MAX(2*N, 3*N-2) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -10
       END IF
 *
       IF( INFO.EQ.0 ) THEN
          CALL SSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, -1, INFO )
-         LWKOPT_SYTRF = INT( WORK(1) )
+         LWKOPT_SYTRF = INT( WORK( 1 ) )
          CALL SSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
      $                   -1, INFO )
-         LWKOPT_SYTRS = INT( WORK(1) )
-         LWKOPT = MAX( LWKOPT_SYTRF, LWKOPT_SYTRS )
-         WORK( 1 ) = LWKOPT
+         LWKOPT_SYTRS = INT( WORK( 1 ) )
+         LWKOPT = MAX( LWKMIN, LWKOPT_SYTRF, LWKOPT_SYTRS )
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -238,7 +241,7 @@ SUBROUTINE SSYSV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       RETURN
 *
diff --git a/SRC/ssysv_aa_2stage.f b/SRC/ssysv_aa_2stage.f
index b9eac83421..0831b4ad33 100644
--- a/SRC/ssysv_aa_2stage.f
+++ b/SRC/ssysv_aa_2stage.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYSV_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssysv_aa_2stage.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssysv_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,7 +86,7 @@
 *>          triangular part of the matrix A, and the strictly upper
 *>          triangular part of A is not referenced.
 *>
-*>          On exit, L is stored below (or above) the subdiaonal blocks,
+*>          On exit, L is stored below (or above) the subdiagonal blocks,
 *>          when UPLO  is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -100,14 +98,14 @@
 *>
 *> \param[out] TB
 *> \verbatim
-*>          TB is REAL array, dimension (LTB)
+*>          TB is REAL array, dimension (MAX(1,LTB))
 *>          On exit, details of the LU factorization of the band matrix.
 *> \endverbatim
 *>
 *> \param[in] LTB
 *> \verbatim
 *>          LTB is INTEGER
-*>          The size of the array TB. LTB >= 4*N, internally
+*>          The size of the array TB. LTB >= MAX(1,4*N), internally
 *>          used to select NB such that LTB >= (3*NB+1)*N.
 *>
 *>          If LTB = -1, then a workspace query is assumed; the
@@ -147,14 +145,15 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is REAL workspace of size LWORK
+*>          WORK is REAL workspace of size (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The size of WORK. LWORK >= N, internally used to select NB
-*>          such that LWORK >= N*NB.
+*>          The size of WORK. LWORK >= MAX(1,N), internally used to
+*>          select NB such that LWORK >= N*NB.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal size of the WORK array,
@@ -178,7 +177,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYsolve
+*> \ingroup hesv_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE SSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
@@ -204,11 +203,13 @@ SUBROUTINE SSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            UPPER, TQUERY, WQUERY
-      INTEGER            LWKOPT
+      INTEGER            LWKMIN, LWKOPT
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SSYTRF_AA_2STAGE, SSYTRS_AA_2STAGE,
@@ -225,6 +226,7 @@ SUBROUTINE SSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
       UPPER = LSAME( UPLO, 'U' )
       WQUERY = ( LWORK.EQ.-1 )
       TQUERY = ( LTB.EQ.-1 )
+      LWKMIN = MAX( 1, N )
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
@@ -233,18 +235,19 @@ SUBROUTINE SSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
          INFO = -3
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -5
-      ELSE IF( LTB.LT.( 4*N ) .AND. .NOT.TQUERY ) THEN
+      ELSE IF( LTB.LT.MAX( 1, 4*N ) .AND. .NOT.TQUERY ) THEN
          INFO = -7
       ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
          INFO = -11
-      ELSE IF( LWORK.LT.N .AND. .NOT.WQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.WQUERY ) THEN
          INFO = -13
       END IF
 *
       IF( INFO.EQ.0 ) THEN
          CALL SSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, -1, IPIV,
      $                          IPIV2, WORK, -1, INFO )
-         LWKOPT = INT( WORK(1) )
+         LWKOPT = MAX( LWKMIN, INT( WORK( 1 ) ) )
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -254,7 +257,6 @@ SUBROUTINE SSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
          RETURN
       END IF
 *
-*
 *     Compute the factorization A = U**T*T*U or A = L*T*L**T.
 *
       CALL SSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV, IPIV2,
@@ -268,7 +270,7 @@ SUBROUTINE SSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       RETURN
 *
diff --git a/SRC/ssysv_rk.f b/SRC/ssysv_rk.f
index 9e0487623c..27adddf7cf 100644
--- a/SRC/ssysv_rk.f
+++ b/SRC/ssysv_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYSV_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssysv_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssysv_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -205,7 +203,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup singleSYsolve
+*> \ingroup hesv_rk
 *
 *> \par Contributors:
 *  ==================
@@ -225,6 +223,7 @@
 *  =====================================================================
       SUBROUTINE SSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
      $                     WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -247,7 +246,8 @@ SUBROUTINE SSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           XERBLA, SSYTRF_RK, SSYTRS_3
@@ -261,7 +261,8 @@ SUBROUTINE SSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -279,10 +280,11 @@ SUBROUTINE SSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
          IF( N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            CALL SSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, -1, INFO )
-            LWKOPT = WORK(1)
+            CALL SSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, -1,
+     $                      INFO )
+            LWKOPT = INT( WORK( 1 ) )
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -301,11 +303,12 @@ SUBROUTINE SSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Solve the system A*X = B with BLAS3 solver, overwriting B with X.
 *
-         CALL SSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, INFO )
+         CALL SSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
+     $                  INFO )
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/ssysv_rook.f b/SRC/ssysv_rook.f
index b4da1101c8..8f58884a2b 100644
--- a/SRC/ssysv_rook.f
+++ b/SRC/ssysv_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYSV_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssysv_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssysv_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -181,7 +179,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYsolve
+*> \ingroup hesv_rook
 *
 *> \par Contributors:
 *  ==================
@@ -199,8 +197,10 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE SSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
+      SUBROUTINE SSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
+     $                       WORK,
      $                  LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,7 +223,8 @@ SUBROUTINE SSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           XERBLA, SSYTRF_ROOK, SSYTRS_ROOK
@@ -237,7 +238,8 @@ SUBROUTINE SSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -256,9 +258,9 @@ SUBROUTINE SSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
             LWKOPT = 1
          ELSE
             CALL SSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, -1, INFO )
-            LWKOPT = WORK(1)
+            LWKOPT = INT( WORK( 1 ) )
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -277,11 +279,12 @@ SUBROUTINE SSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
 *        Solve with TRS_ROOK ( Use Level 2 BLAS)
 *
-         CALL SSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+         CALL SSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
+     $                     INFO )
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/ssysvx.f b/SRC/ssysvx.f
index b19ce26417..ad2793f9d9 100644
--- a/SRC/ssysvx.f
+++ b/SRC/ssysvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssysvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssysvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -275,12 +273,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYsolve
+*> \ingroup hesvx
 *
 *  =====================================================================
-      SUBROUTINE SSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
+      SUBROUTINE SSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
+     $                   B,
      $                   LDB, X, LDX, RCOND, FERR, BERR, WORK, LWORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -305,17 +305,19 @@ SUBROUTINE SSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, NOFACT
-      INTEGER            LWKOPT, NB
+      INTEGER            LWKMIN, LWKOPT, NB
       REAL               ANORM
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      REAL               SLAMCH, SLANSY
-      EXTERNAL           ILAENV, LSAME, SLAMCH, SLANSY
+      REAL               SLAMCH, SLANSY, SROUNDUP_LWORK
+      EXTERNAL           ILAENV, LSAME, SLAMCH,
+     $                   SLANSY, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLACPY, SSYCON, SSYRFS, SSYTRF, SSYTRS, XERBLA
+      EXTERNAL           SLACPY, SSYCON, SSYRFS, SSYTRF, SSYTRS,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -327,9 +329,11 @@ SUBROUTINE SSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
       INFO = 0
       NOFACT = LSAME( FACT, 'N' )
       LQUERY = ( LWORK.EQ.-1 )
+      LWKMIN = MAX( 1, 3*N )
       IF( .NOT.NOFACT .AND. .NOT.LSAME( FACT, 'F' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -344,17 +348,17 @@ SUBROUTINE SSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
          INFO = -11
       ELSE IF( LDX.LT.MAX( 1, N ) ) THEN
          INFO = -13
-      ELSE IF( LWORK.LT.MAX( 1, 3*N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -18
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         LWKOPT = MAX( 1, 3*N )
+         LWKOPT = LWKMIN
          IF( NOFACT ) THEN
             NB = ILAENV( 1, 'SSYTRF', UPLO, N, -1, -1, -1 )
             LWKOPT = MAX( LWKOPT, N*NB )
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -385,7 +389,8 @@ SUBROUTINE SSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL SSYCON( UPLO, N, AF, LDAF, IPIV, ANORM, RCOND, WORK, IWORK,
+      CALL SSYCON( UPLO, N, AF, LDAF, IPIV, ANORM, RCOND, WORK,
+     $             IWORK,
      $             INFO )
 *
 *     Compute the solution vectors X.
@@ -404,7 +409,7 @@ SUBROUTINE SSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
       IF( RCOND.LT.SLAMCH( 'Epsilon' ) )
      $   INFO = N + 1
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/ssysvxx.f b/SRC/ssysvxx.f
index e0a869e816..d73cf83bb5 100644
--- a/SRC/ssysvxx.f
+++ b/SRC/ssysvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYSVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssysvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssysvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -498,13 +496,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYsolve
+*> \ingroup hesvxx
 *
 *  =====================================================================
-      SUBROUTINE SSYSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE SSYSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    EQUED, S, B, LDB, X, LDX, RCOND, RPVGRW, BERR,
      $                    N_ERR_BNDS, ERR_BNDS_NORM, ERR_BNDS_COMP,
      $                    NPARAMS, PARAMS, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -629,7 +629,8 @@ SUBROUTINE SSYSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Compute row and column scalings to equilibrate the matrix A.
 *
-         CALL SSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFEQU )
+         CALL SSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK,
+     $                 INFEQU )
          IF( INFEQU.EQ.0 ) THEN
 *
 *     Equilibrate the matrix.
@@ -648,7 +649,8 @@ SUBROUTINE SSYSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *        Compute the LDL^T or UDU^T factorization of A.
 *
          CALL SLACPY( UPLO, N, N, A, LDA, AF, LDAF )
-         CALL SSYTRF( UPLO, N, AF, LDAF, IPIV, WORK, 5*MAX(1,N), INFO )
+         CALL SSYTRF( UPLO, N, AF, LDAF, IPIV, WORK, 5*MAX(1,N),
+     $                INFO )
 *
 *        Return if INFO is non-zero.
 *
diff --git a/SRC/ssyswapr.f b/SRC/ssyswapr.f
index 5e4265d7a8..2ff7843701 100644
--- a/SRC/ssyswapr.f
+++ b/SRC/ssyswapr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYSWAPR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssyswapr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssyswapr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -57,16 +55,14 @@
 *>
 *> \param[in,out] A
 *> \verbatim
-*>          A is REAL array, dimension (LDA,N)
-*>          On entry, the NB diagonal matrix D and the multipliers
-*>          used to obtain the factor U or L as computed by SSYTRF.
-*>
-*>          On exit, if INFO = 0, the (symmetric) inverse of the original
-*>          matrix.  If UPLO = 'U', the upper triangular part of the
-*>          inverse is formed and the part of A below the diagonal is not
-*>          referenced; if UPLO = 'L' the lower triangular part of the
-*>          inverse is formed and the part of A above the diagonal is
-*>          not referenced.
+*>          A is REAL array, dimension (LDA,*)
+*>          On entry, the N-by-N matrix A. On exit, the permuted matrix
+*>          where the rows I1 and I2 and columns I1 and I2 are interchanged.
+*>          If UPLO = 'U', the interchanges are applied to the upper
+*>          triangular part and the strictly lower triangular part of A is
+*>          not referenced; if UPLO = 'L', the interchanges are applied to
+*>          the lower triangular part and the part of A above the diagonal
+*>          is not referenced.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -95,10 +91,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYauxiliary
+*> \ingroup heswapr
 *
 *  =====================================================================
       SUBROUTINE SSYSWAPR( UPLO, N, A, LDA, I1, I2)
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -109,14 +106,13 @@ SUBROUTINE SSYSWAPR( UPLO, N, A, LDA, I1, I2)
       INTEGER          I1, I2, LDA, N
 *     ..
 *     .. Array Arguments ..
-      REAL             A( LDA, N )
+      REAL             A( LDA, * )
 *
 *  =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
       LOGICAL            UPPER
-      INTEGER            I
       REAL               TMP
 *
 *     .. External Functions ..
@@ -143,19 +139,12 @@ SUBROUTINE SSYSWAPR( UPLO, N, A, LDA, I1, I2)
          A(I1,I1)=A(I2,I2)
          A(I2,I2)=TMP
 *
-         DO I=1,I2-I1-1
-            TMP=A(I1,I1+I)
-            A(I1,I1+I)=A(I1+I,I2)
-            A(I1+I,I2)=TMP
-         END DO
+         CALL SSWAP( I2-I1-1, A(I1,I1+1), LDA, A(I1+1,I2), 1 )
 *
 *          third swap
 *          - swap row I1 and I2 from I2+1 to N
-         DO I=I2+1,N
-            TMP=A(I1,I)
-            A(I1,I)=A(I2,I)
-            A(I2,I)=TMP
-         END DO
+         IF ( I2.LT.N )
+     $      CALL SSWAP( N-I2, A(I1,I2+1), LDA, A(I2,I2+1), LDA )
 *
         ELSE
 *
@@ -171,19 +160,12 @@ SUBROUTINE SSYSWAPR( UPLO, N, A, LDA, I1, I2)
           A(I1,I1)=A(I2,I2)
           A(I2,I2)=TMP
 *
-          DO I=1,I2-I1-1
-             TMP=A(I1+I,I1)
-             A(I1+I,I1)=A(I2,I1+I)
-             A(I2,I1+I)=TMP
-          END DO
+          CALL SSWAP( I2-I1-1, A(I1+1,I1), 1, A(I2,I1+1), LDA )
 *
 *         third swap
 *          - swap col I1 and I2 from I2+1 to N
-          DO I=I2+1,N
-             TMP=A(I,I1)
-             A(I,I1)=A(I,I2)
-             A(I,I2)=TMP
-          END DO
+         IF ( I2.LT.N )
+     $      CALL SSWAP( N-I2, A(I2+1,I1), 1, A(I2+1,I2), 1 )
 *
       ENDIF
       END SUBROUTINE SSYSWAPR
diff --git a/SRC/ssytd2.f b/SRC/ssytd2.f
index 8d5b3858fc..97baf3c0ac 100644
--- a/SRC/ssytd2.f
+++ b/SRC/ssytd2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTD2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytd2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytd2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,7 +118,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetd2
 *
 *> \par Further Details:
 *  =====================
@@ -170,6 +168,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SSYTD2( UPLO, N, A, LDA, D, E, TAU, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -248,7 +247,8 @@ SUBROUTINE SSYTD2( UPLO, N, A, LDA, D, E, TAU, INFO )
 *
 *              Compute  x := tau * A * v  storing x in TAU(1:i)
 *
-               CALL SSYMV( UPLO, I, TAUI, A, LDA, A( 1, I+1 ), 1, ZERO,
+               CALL SSYMV( UPLO, I, TAUI, A, LDA, A( 1, I+1 ), 1,
+     $                     ZERO,
      $                     TAU, 1 )
 *
 *              Compute  w := x - 1/2 * tau * (x**T * v) * v
@@ -294,14 +294,16 @@ SUBROUTINE SSYTD2( UPLO, N, A, LDA, D, E, TAU, INFO )
 *
 *              Compute  w := x - 1/2 * tau * (x**T * v) * v
 *
-               ALPHA = -HALF*TAUI*SDOT( N-I, TAU( I ), 1, A( I+1, I ),
+               ALPHA = -HALF*TAUI*SDOT( N-I, TAU( I ), 1, A( I+1,
+     $                                  I ),
      $                 1 )
                CALL SAXPY( N-I, ALPHA, A( I+1, I ), 1, TAU( I ), 1 )
 *
 *              Apply the transformation as a rank-2 update:
 *                 A := A - v * w**T - w * v**T
 *
-               CALL SSYR2( UPLO, N-I, -ONE, A( I+1, I ), 1, TAU( I ), 1,
+               CALL SSYR2( UPLO, N-I, -ONE, A( I+1, I ), 1, TAU( I ),
+     $                     1,
      $                     A( I+1, I+1 ), LDA )
 *
                A( I+1, I ) = E( I )
diff --git a/SRC/ssytf2.f b/SRC/ssytf2.f
index 1e8087996d..d5defcccc2 100644
--- a/SRC/ssytf2.f
+++ b/SRC/ssytf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,7 +125,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetf2
 *
 *> \par Further Details:
 *  =====================
@@ -192,6 +190,7 @@
 *
 *  =====================================================================
       SUBROUTINE SSYTF2( UPLO, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -285,7 +284,8 @@ SUBROUTINE SSYTF2( UPLO, N, A, LDA, IPIV, INFO )
             COLMAX = ZERO
          END IF
 *
-         IF( (MAX( ABSAKK, COLMAX ).EQ.ZERO) .OR. SISNAN(ABSAKK) ) THEN
+         IF( (MAX( ABSAKK, COLMAX ).EQ.ZERO) .OR.
+     $       SISNAN(ABSAKK) ) THEN
 *
 *           Column K is zero or underflow, or contains a NaN:
 *           set INFO and continue
@@ -455,7 +455,8 @@ SUBROUTINE SSYTF2( UPLO, N, A, LDA, IPIV, INFO )
             COLMAX = ZERO
          END IF
 *
-         IF( (MAX( ABSAKK, COLMAX ).EQ.ZERO) .OR. SISNAN(ABSAKK) ) THEN
+         IF( (MAX( ABSAKK, COLMAX ).EQ.ZERO) .OR.
+     $       SISNAN(ABSAKK) ) THEN
 *
 *           Column K is zero or underflow, or contains a NaN:
 *           set INFO and continue
@@ -477,7 +478,8 @@ SUBROUTINE SSYTF2( UPLO, N, A, LDA, IPIV, INFO )
                JMAX = K - 1 + ISAMAX( IMAX-K, A( IMAX, K ), LDA )
                ROWMAX = ABS( A( IMAX, JMAX ) )
                IF( IMAX.LT.N ) THEN
-                  JMAX = IMAX + ISAMAX( N-IMAX, A( IMAX+1, IMAX ), 1 )
+                  JMAX = IMAX + ISAMAX( N-IMAX, A( IMAX+1, IMAX ),
+     $                                  1 )
                   ROWMAX = MAX( ROWMAX, ABS( A( JMAX, IMAX ) ) )
                END IF
 *
@@ -509,7 +511,8 @@ SUBROUTINE SSYTF2( UPLO, N, A, LDA, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL SSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL SSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
                CALL SSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
      $                     LDA )
                T = A( KK, KK )
diff --git a/SRC/ssytf2_rk.f b/SRC/ssytf2_rk.f
index 51130acd37..d78f621f03 100644
--- a/SRC/ssytf2_rk.f
+++ b/SRC/ssytf2_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTF2_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytf2_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytf2_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -208,7 +206,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup singleSYcomputational
+*> \ingroup hetf2_rk
 *
 *> \par Further Details:
 *  =====================
@@ -238,6 +236,7 @@
 *
 *  =====================================================================
       SUBROUTINE SSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -460,7 +459,8 @@ SUBROUTINE SSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *              the interchanges in columns k+1:N.
 *
                IF( K.LT.N )
-     $            CALL SSWAP( N-K, A( K, K+1 ), LDA, A( P, K+1 ), LDA )
+     $            CALL SSWAP( N-K, A( K, K+1 ), LDA, A( P, K+1 ),
+     $                        LDA )
 *
             END IF
 *
@@ -475,7 +475,8 @@ SUBROUTINE SSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
                IF( KP.GT.1 )
      $            CALL SSWAP( KP-1, A( 1, KK ), 1, A( 1, KP ), 1 )
                IF( ( KK.GT.1 ) .AND. ( KP.LT.(KK-1) ) )
-     $            CALL SSWAP( KK-KP-1, A( KP+1, KK ), 1, A( KP, KP+1 ),
+     $            CALL SSWAP( KK-KP-1, A( KP+1, KK ), 1, A( KP,
+     $                        KP+1 ),
      $                     LDA )
                T = A( KK, KK )
                A( KK, KK ) = A( KP, KP )
@@ -517,7 +518,8 @@ SUBROUTINE SSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                       = A - W(k)*1/D(k)*W(k)**T
 *
                      D11 = ONE / A( K, K )
-                     CALL SSYR( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL SSYR( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
 *
 *                    Store U(k) in column k
 *
@@ -536,7 +538,8 @@ SUBROUTINE SSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                       = A - W(k)*(1/D(k))*W(k)**T
 *                       = A - (W(k)/D(k))*(D(k))*(W(k)/D(K))**T
 *
-                     CALL SSYR( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL SSYR( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
                   END IF
 *
 *                 Store the superdiagonal element of D in array E
@@ -694,14 +697,16 @@ SUBROUTINE SSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                 Determine both ROWMAX and JMAX.
 *
                   IF( IMAX.NE.K ) THEN
-                     JMAX = K - 1 + ISAMAX( IMAX-K, A( IMAX, K ), LDA )
+                     JMAX = K - 1 + ISAMAX( IMAX-K, A( IMAX, K ),
+     $                                      LDA )
                      ROWMAX = ABS( A( IMAX, JMAX ) )
                   ELSE
                      ROWMAX = ZERO
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + ISAMAX( N-IMAX, A( IMAX+1, IMAX ),
+                     ITEMP = IMAX + ISAMAX( N-IMAX, A( IMAX+1,
+     $                                      IMAX ),
      $                                     1 )
                      STEMP = ABS( A( ITEMP, IMAX ) )
                      IF( STEMP.GT.ROWMAX ) THEN
@@ -760,7 +765,8 @@ SUBROUTINE SSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
                IF( P.LT.N )
      $            CALL SSWAP( N-P, A( P+1, K ), 1, A( P+1, P ), 1 )
                IF( P.GT.(K+1) )
-     $            CALL SSWAP( P-K-1, A( K+1, K ), 1, A( P, K+1 ), LDA )
+     $            CALL SSWAP( P-K-1, A( K+1, K ), 1, A( P, K+1 ),
+     $                        LDA )
                T = A( K, K )
                A( K, K ) = A( P, P )
                A( P, P ) = T
@@ -782,9 +788,11 @@ SUBROUTINE SSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL SSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL SSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
                IF( ( KK.LT.N ) .AND. ( KP.GT.(KK+1) ) )
-     $            CALL SSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
+     $            CALL SSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP,
+     $                        KK+1 ),
      $                     LDA )
                T = A( KK, KK )
                A( KK, KK ) = A( KP, KP )
diff --git a/SRC/ssytf2_rook.f b/SRC/ssytf2_rook.f
index 34dc12c732..9e64887282 100644
--- a/SRC/ssytf2_rook.f
+++ b/SRC/ssytf2_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTF2_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytf2_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytf2_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -129,7 +127,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetf2_rook
 *
 *> \par Further Details:
 *  =====================
@@ -191,6 +189,7 @@
 *
 *  =====================================================================
       SUBROUTINE SSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -410,7 +409,8 @@ SUBROUTINE SSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
                IF( KP.GT.1 )
      $            CALL SSWAP( KP-1, A( 1, KK ), 1, A( 1, KP ), 1 )
                IF( ( KK.GT.1 ) .AND. ( KP.LT.(KK-1) ) )
-     $            CALL SSWAP( KK-KP-1, A( KP+1, KK ), 1, A( KP, KP+1 ),
+     $            CALL SSWAP( KK-KP-1, A( KP+1, KK ), 1, A( KP,
+     $                        KP+1 ),
      $                     LDA )
                T = A( KK, KK )
                A( KK, KK ) = A( KP, KP )
@@ -444,7 +444,8 @@ SUBROUTINE SSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                       = A - W(k)*1/D(k)*W(k)**T
 *
                      D11 = ONE / A( K, K )
-                     CALL SSYR( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL SSYR( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
 *
 *                    Store U(k) in column k
 *
@@ -463,7 +464,8 @@ SUBROUTINE SSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                       = A - W(k)*(1/D(k))*W(k)**T
 *                       = A - (W(k)/D(k))*(D(k))*(W(k)/D(K))**T
 *
-                     CALL SSYR( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL SSYR( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
                   END IF
                END IF
 *
@@ -593,14 +595,16 @@ SUBROUTINE SSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                 Determine both ROWMAX and JMAX.
 *
                   IF( IMAX.NE.K ) THEN
-                     JMAX = K - 1 + ISAMAX( IMAX-K, A( IMAX, K ), LDA )
+                     JMAX = K - 1 + ISAMAX( IMAX-K, A( IMAX, K ),
+     $                                      LDA )
                      ROWMAX = ABS( A( IMAX, JMAX ) )
                   ELSE
                      ROWMAX = ZERO
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + ISAMAX( N-IMAX, A( IMAX+1, IMAX ),
+                     ITEMP = IMAX + ISAMAX( N-IMAX, A( IMAX+1,
+     $                                      IMAX ),
      $                                     1 )
                      STEMP = ABS( A( ITEMP, IMAX ) )
                      IF( STEMP.GT.ROWMAX ) THEN
@@ -659,7 +663,8 @@ SUBROUTINE SSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
                IF( P.LT.N )
      $            CALL SSWAP( N-P, A( P+1, K ), 1, A( P+1, P ), 1 )
                IF( P.GT.(K+1) )
-     $            CALL SSWAP( P-K-1, A( K+1, K ), 1, A( P, K+1 ), LDA )
+     $            CALL SSWAP( P-K-1, A( K+1, K ), 1, A( P, K+1 ),
+     $                        LDA )
                T = A( K, K )
                A( K, K ) = A( P, P )
                A( P, P ) = T
@@ -674,9 +679,11 @@ SUBROUTINE SSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL SSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL SSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
                IF( ( KK.LT.N ) .AND. ( KP.GT.(KK+1) ) )
-     $            CALL SSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
+     $            CALL SSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP,
+     $                        KK+1 ),
      $                     LDA )
                T = A( KK, KK )
                A( KK, KK ) = A( KP, KP )
diff --git a/SRC/ssytrd.f b/SRC/ssytrd.f
index f09ad9ab4d..32eaf99f8d 100644
--- a/SRC/ssytrd.f
+++ b/SRC/ssytrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -139,7 +137,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetrd
 *
 *> \par Further Details:
 *  =====================
@@ -188,7 +186,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SSYTRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
+      SUBROUTINE SSYTRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,7 +223,8 @@ SUBROUTINE SSYTRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -247,8 +248,8 @@ SUBROUTINE SSYTRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
 *        Determine the block size.
 *
          NB = ILAENV( 1, 'SSYTRD', UPLO, N, -1, -1, -1 )
-         LWKOPT = N*NB
-         WORK( 1 ) = LWKOPT
+         LWKOPT = MAX( 1, N*NB )
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -315,7 +316,8 @@ SUBROUTINE SSYTRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
 *           Update the unreduced submatrix A(1:i-1,1:i-1), using an
 *           update of the form:  A := A - V*W**T - W*V**T
 *
-            CALL SSYR2K( UPLO, 'No transpose', I-1, NB, -ONE, A( 1, I ),
+            CALL SSYR2K( UPLO, 'No transpose', I-1, NB, -ONE, A( 1,
+     $                   I ),
      $                   LDA, WORK, LDWORK, ONE, A, LDA )
 *
 *           Copy superdiagonal elements back into A, and diagonal
@@ -365,7 +367,7 @@ SUBROUTINE SSYTRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
      $                TAU( I ), IINFO )
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
       RETURN
 *
 *     End of SSYTRD
diff --git a/SRC/ssytrd_2stage.f b/SRC/ssytrd_2stage.f
index 5d70ae0d4a..1a12a7a1e6 100644
--- a/SRC/ssytrd_2stage.f
+++ b/SRC/ssytrd_2stage.f
@@ -4,23 +4,21 @@
 *
 *  =========== DOCUMENTATION ===========
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
-*
-*> \htmlonly
-*> Download SSYTRD_2STAGE + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytrd_2stage.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ssytrd_2stage.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytrd_2stage.f"> 
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download SSYTRD_2STAGE + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytrd_2stage.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ssytrd_2stage.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytrd_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE SSYTRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU, 
+*       SUBROUTINE SSYTRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
 *                                 HOUS2, LHOUS2, WORK, LWORK, INFO )
 *
 *       IMPLICIT NONE
@@ -34,7 +32,7 @@
 *       REAL               A( LDA, * ), TAU( * ),
 *                          HOUS2( * ), WORK( * )
 *       ..
-*  
+*
 *
 *> \par Purpose:
 *  =============
@@ -52,11 +50,11 @@
 *> \param[in] VECT
 *> \verbatim
 *>          VECT is CHARACTER*1
-*>          = 'N':  No need for the Housholder representation, 
+*>          = 'N':  No need for the Housholder representation,
 *>                  in particular for the second stage (Band to
 *>                  tridiagonal) and thus LHOUS2 is of size max(1, 4*N);
-*>          = 'V':  the Householder representation is needed to 
-*>                  either generate Q1 Q2 or to apply Q1 Q2, 
+*>          = 'V':  the Householder representation is needed to
+*>                  either generate Q1 Q2 or to apply Q1 Q2,
 *>                  then LHOUS2 is to be queried and computed.
 *>                  (NOT AVAILABLE IN THIS RELEASE).
 *> \endverbatim
@@ -86,7 +84,7 @@
 *>          triangular part of A is not referenced.
 *>          On exit, if UPLO = 'U', the band superdiagonal
 *>          of A are overwritten by the corresponding elements of the
-*>          internal band-diagonal matrix AB, and the elements above 
+*>          internal band-diagonal matrix AB, and the elements above
 *>          the KD superdiagonal, with the array TAU, represent the orthogonal
 *>          matrix Q1 as a product of elementary reflectors; if UPLO
 *>          = 'L', the diagonal and band subdiagonal of A are over-
@@ -117,13 +115,13 @@
 *> \param[out] TAU
 *> \verbatim
 *>          TAU is REAL array, dimension (N-KD)
-*>          The scalar factors of the elementary reflectors of 
+*>          The scalar factors of the elementary reflectors of
 *>          the first stage (see Further Details).
 *> \endverbatim
 *>
 *> \param[out] HOUS2
 *> \verbatim
-*>          HOUS2 is REAL array, dimension (LHOUS2)
+*>          HOUS2 is REAL array, dimension (MAX(1,LHOUS2))
 *>          Stores the Householder representation of the stage2
 *>          band to tridiagonal.
 *> \endverbatim
@@ -132,6 +130,8 @@
 *> \verbatim
 *>          LHOUS2 is INTEGER
 *>          The dimension of the array HOUS2.
+*>          LHOUS2 >= 1.
+*>
 *>          If LWORK = -1, or LHOUS2 = -1,
 *>          then a query is assumed; the routine
 *>          only calculates the optimal size of the HOUS2 array, returns
@@ -149,17 +149,19 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK = MAX(1, dimension)
-*>          If LWORK = -1, or LHOUS2=-1,
+*>          The dimension of the array WORK.
+*>          If N = 0, LWORK >= 1, else LWORK = MAX(1, dimension).
+*>
+*>          If LWORK = -1, or LHOUS2 = -1,
 *>          then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
 *>          LWORK = MAX(1, dimension) where
 *>          dimension   = max(stage1,stage2) + (KD+1)*N
-*>                      = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                        + max(2*KD*KD, KD*NTHREADS) 
-*>                        + (KD+1)*N 
+*>                      = N*KD + N*max(KD+1,FACTOPTNB)
+*>                        + max(2*KD*KD, KD*NTHREADS)
+*>                        + (KD+1)*N
 *>          where KD is the blocking size of the reduction,
 *>          FACTOPTNB is the blocking used by the QR or LQ
 *>          algorithm, usually FACTOPTNB=128 is a good choice
@@ -177,12 +179,12 @@
 *  Authors:
 *  ========
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetrd_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -202,7 +204,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -210,16 +212,16 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SSYTRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU, 
+      SUBROUTINE SSYTRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
      $                          HOUS2, LHOUS2, WORK, LWORK, INFO )
 *
       IMPLICIT NONE
@@ -263,12 +265,19 @@ SUBROUTINE SSYTRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
 *
 *     Determine the block size, the workspace size and the hous size.
 *
-      KD     = ILAENV2STAGE( 1, 'SSYTRD_2STAGE', VECT, N, -1, -1, -1 )
-      IB     = ILAENV2STAGE( 2, 'SSYTRD_2STAGE', VECT, N, KD, -1, -1 )
-      LHMIN  = ILAENV2STAGE( 3, 'SSYTRD_2STAGE', VECT, N, KD, IB, -1 )
-      LWMIN  = ILAENV2STAGE( 4, 'SSYTRD_2STAGE', VECT, N, KD, IB, -1 )
-*      WRITE(*,*),'SSYTRD_2STAGE N KD UPLO LHMIN LWMIN ',N, KD, UPLO,
-*     $            LHMIN, LWMIN
+      KD     = ILAENV2STAGE( 1, 'SSYTRD_2STAGE', VECT, N, -1, -1,
+     $                      -1 )
+      IB     = ILAENV2STAGE( 2, 'SSYTRD_2STAGE', VECT, N, KD, -1,
+     $                      -1 )
+      IF( N.EQ.0 ) THEN
+         LHMIN = 1
+         LWMIN = 1
+      ELSE
+         LHMIN = ILAENV2STAGE( 3, 'SSYTRD_2STAGE', VECT, N, KD, IB,
+     $                        -1 )
+         LWMIN = ILAENV2STAGE( 4, 'SSYTRD_2STAGE', VECT, N, KD, IB,
+     $                        -1 )
+      END IF
 *
       IF( .NOT.LSAME( VECT, 'N' ) ) THEN
          INFO = -1
@@ -285,8 +294,8 @@ SUBROUTINE SSYTRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         HOUS2( 1 ) = LHMIN
-         WORK( 1 )  = LWMIN
+         HOUS2( 1 ) = REAL( LHMIN )
+         WORK( 1 )  = REAL( LWMIN )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -309,14 +318,14 @@ SUBROUTINE SSYTRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
       LWRK  = LWORK-LDAB*N
       ABPOS = 1
       WPOS  = ABPOS + LDAB*N
-      CALL SSYTRD_SY2SB( UPLO, N, KD, A, LDA, WORK( ABPOS ), LDAB, 
+      CALL SSYTRD_SY2SB( UPLO, N, KD, A, LDA, WORK( ABPOS ), LDAB,
      $                   TAU, WORK( WPOS ), LWRK, INFO )
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'SSYTRD_SY2SB', -INFO )
          RETURN
       END IF
-      CALL SSYTRD_SB2ST( 'Y', VECT, UPLO, N, KD, 
-     $                   WORK( ABPOS ), LDAB, D, E, 
+      CALL SSYTRD_SB2ST( 'Y', VECT, UPLO, N, KD,
+     $                   WORK( ABPOS ), LDAB, D, E,
      $                   HOUS2, LHOUS2, WORK( WPOS ), LWRK, INFO )
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'SSYTRD_SB2ST', -INFO )
@@ -324,8 +333,7 @@ SUBROUTINE SSYTRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
       END IF
 *
 *
-      HOUS2( 1 ) = LHMIN
-      WORK( 1 )  = LWMIN
+      WORK( 1 ) = REAL( LWMIN )
       RETURN
 *
 *     End of SSYTRD_2STAGE
diff --git a/SRC/ssytrd_sb2st.F b/SRC/ssytrd_sb2st.F
index faeeff5f48..f359ce5216 100644
--- a/SRC/ssytrd_sb2st.F
+++ b/SRC/ssytrd_sb2st.F
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRD_SB2ST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytrd_sb2st.f">
 *> [TGZ]</a>
@@ -13,12 +12,11 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytrd_sb2st.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB, 
+*       SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *                               D, E, HOUS, LHOUS, WORK, LWORK, INFO )
 *
 *       #if defined(_OPENMP)
@@ -53,12 +51,12 @@
 *> \param[in] STAGE1
 *> \verbatim
 *>          STAGE1 is CHARACTER*1
-*>          = 'N':  "No": to mention that the stage 1 of the reduction  
+*>          = 'N':  "No": to mention that the stage 1 of the reduction
 *>                  from dense to band using the ssytrd_sy2sb routine
-*>                  was not called before this routine to reproduce AB. 
-*>                  In other term this routine is called as standalone. 
-*>          = 'Y':  "Yes": to mention that the stage 1 of the 
-*>                  reduction from dense to band using the ssytrd_sy2sb 
+*>                  was not called before this routine to reproduce AB.
+*>                  In other term this routine is called as standalone.
+*>          = 'Y':  "Yes": to mention that the stage 1 of the
+*>                  reduction from dense to band using the ssytrd_sy2sb
 *>                  routine has been called to produce AB (e.g., AB is
 *>                  the output of ssytrd_sy2sb.
 *> \endverbatim
@@ -66,10 +64,10 @@
 *> \param[in] VECT
 *> \verbatim
 *>          VECT is CHARACTER*1
-*>          = 'N':  No need for the Housholder representation, 
+*>          = 'N':  No need for the Housholder representation,
 *>                  and thus LHOUS is of size max(1, 4*N);
-*>          = 'V':  the Householder representation is needed to 
-*>                  either generate or to apply Q later on, 
+*>          = 'V':  the Householder representation is needed to
+*>                  either generate or to apply Q later on,
 *>                  then LHOUS is to be queried and computed.
 *>                  (NOT AVAILABLE IN THIS RELEASE).
 *> \endverbatim
@@ -132,34 +130,39 @@
 *>
 *> \param[out] HOUS
 *> \verbatim
-*>          HOUS is REAL array, dimension LHOUS, that
-*>          store the Householder representation.
+*>          HOUS is REAL array, dimension (MAX(1,LHOUS))
+*>          Stores the Householder representation.
 *> \endverbatim
 *>
 *> \param[in] LHOUS
 *> \verbatim
 *>          LHOUS is INTEGER
-*>          The dimension of the array HOUS. LHOUS = MAX(1, dimension)
-*>          If LWORK = -1, or LHOUS=-1,
+*>          The dimension of the array HOUS.
+*>          If N = 0 or KD <= 1, LHOUS >= 1, else LHOUS = MAX(1, dimension)
+*>
+*>          If LWORK = -1, or LHOUS = -1,
 *>          then a query is assumed; the routine
 *>          only calculates the optimal size of the HOUS array, returns
 *>          this value as the first entry of the HOUS array, and no error
 *>          message related to LHOUS is issued by XERBLA.
 *>          LHOUS = MAX(1, dimension) where
 *>          dimension = 4*N if VECT='N'
-*>          not available now if VECT='H'     
+*>          not available now if VECT='H'
 *> \endverbatim
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is REAL array, dimension LWORK.
+*>          WORK is REAL array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK = MAX(1, dimension)
-*>          If LWORK = -1, or LHOUS=-1,
+*>          The dimension of the array WORK.
+*>          IF N = 0 or KD <= 1, LWORK >= 1, else LWORK = MAX(1, dimension)
+*>
+*>          If LWORK = -1, or LHOUS = -1,
 *>          then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
@@ -188,7 +191,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup real16OTHERcomputational
+*> \ingroup hetrd_hb2st
 *
 *> \par Further Details:
 *  =====================
@@ -208,7 +211,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -216,16 +219,16 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB, 
+      SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
      $                         D, E, HOUS, LHOUS, WORK, LWORK, INFO )
 *
 #if defined(_OPENMP)
@@ -258,31 +261,32 @@ SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, WANTQ, UPPER, AFTERS1
-      INTEGER            I, M, K, IB, SWEEPID, MYID, SHIFT, STT, ST, 
+      INTEGER            I, M, K, IB, SWEEPID, MYID, SHIFT, STT, ST,
      $                   ED, STIND, EDIND, BLKLASTIND, COLPT, THED,
      $                   STEPERCOL, GRSIZ, THGRSIZ, THGRNB, THGRID,
-     $                   NBTILES, TTYPE, TID, NTHREADS, DEBUG,
-     $                   ABDPOS, ABOFDPOS, DPOS, OFDPOS, AWPOS, 
+     $                   NBTILES, TTYPE, TID, NTHREADS,
+     $                   ABDPOS, ABOFDPOS, DPOS, OFDPOS, AWPOS,
      $                   INDA, INDW, APOS, SIZEA, LDA, INDV, INDTAU,
      $                   SISEV, SIZETAU, LDV, LHMIN, LWMIN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SSB2ST_KERNELS, SLACPY, SLASET, XERBLA
+      EXTERNAL           SSB2ST_KERNELS, SLACPY,
+     $                   SLASET, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MIN, MAX, CEILING, REAL
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      INTEGER            ILAENV2STAGE 
-      EXTERNAL           LSAME, ILAENV2STAGE
+      INTEGER            ILAENV2STAGE
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV2STAGE, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
 *     Determine the minimal workspace size required.
 *     Test the input parameters
 *
-      DEBUG   = 0
       INFO    = 0
       AFTERS1 = LSAME( STAGE1, 'Y' )
       WANTQ   = LSAME( VECT, 'V' )
@@ -291,9 +295,17 @@ SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *
 *     Determine the block size, the workspace size and the hous size.
 *
-      IB     = ILAENV2STAGE( 2, 'SSYTRD_SB2ST', VECT, N, KD, -1, -1 )
-      LHMIN  = ILAENV2STAGE( 3, 'SSYTRD_SB2ST', VECT, N, KD, IB, -1 )
-      LWMIN  = ILAENV2STAGE( 4, 'SSYTRD_SB2ST', VECT, N, KD, IB, -1 )
+      IB       = ILAENV2STAGE( 2, 'SSYTRD_SB2ST', VECT, N, KD,
+     $                         -1, -1 )
+      IF( N.EQ.0 .OR. KD.LE.1 ) THEN
+         LHMIN = 1
+         LWMIN = 1
+      ELSE
+         LHMIN = ILAENV2STAGE( 3, 'SSYTRD_SB2ST', VECT, N, KD, IB,
+     $                        -1 )
+         LWMIN = ILAENV2STAGE( 4, 'SSYTRD_SB2ST', VECT, N, KD, IB,
+     $                        -1 )
+      END IF
 *
       IF( .NOT.AFTERS1 .AND. .NOT.LSAME( STAGE1, 'N' ) ) THEN
          INFO = -1
@@ -314,8 +326,8 @@ SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         HOUS( 1 ) = LHMIN
-         WORK( 1 ) = LWMIN
+         HOUS( 1 ) = SROUNDUP_LWORK( LHMIN )
+         WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -355,7 +367,7 @@ SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
           ABDPOS   = KD + 1
           ABOFDPOS = KD
       ELSE
-          APOS     = INDA 
+          APOS     = INDA
           AWPOS    = INDA + KD + 1
           DPOS     = APOS
           OFDPOS   = DPOS + 1
@@ -363,11 +375,11 @@ SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
           ABOFDPOS = 2
 
       ENDIF
-*      
-*     Case KD=0: 
-*     The matrix is diagonal. We just copy it (convert to "real" for 
-*     real because D is double and the imaginary part should be 0) 
-*     and store it in D. A sequential code here is better or 
+*
+*     Case KD=0:
+*     The matrix is diagonal. We just copy it (convert to "real" for
+*     real because D is double and the imaginary part should be 0)
+*     and store it in D. A sequential code here is better or
 *     in a parallel environment it might need two cores for D and E
 *
       IF( KD.EQ.0 ) THEN
@@ -382,17 +394,17 @@ SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
           WORK( 1 ) = 1
           RETURN
       END IF
-*      
-*     Case KD=1: 
-*     The matrix is already Tridiagonal. We have to make diagonal 
+*
+*     Case KD=1:
+*     The matrix is already Tridiagonal. We have to make diagonal
 *     and offdiagonal elements real, and store them in D and E.
-*     For that, for real precision just copy the diag and offdiag 
-*     to D and E while for the COMPLEX case the bulge chasing is  
-*     performed to convert the hermetian tridiagonal to symmetric 
-*     tridiagonal. A simpler conversion formula might be used, but then 
+*     For that, for real precision just copy the diag and offdiag
+*     to D and E while for the COMPLEX case the bulge chasing is
+*     performed to convert the hermetian tridiagonal to symmetric
+*     tridiagonal. A simpler conversion formula might be used, but then
 *     updating the Q matrix will be required and based if Q is generated
-*     or not this might complicate the story. 
-*      
+*     or not this might complicate the story.
+*
       IF( KD.EQ.1 ) THEN
           DO 50 I = 1, N
               D( I ) = ( AB( ABDPOS, I ) )
@@ -413,7 +425,7 @@ SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
           RETURN
       END IF
 *
-*     Main code start here. 
+*     Main code start here.
 *     Reduce the symmetric band of A to a tridiagonal matrix.
 *
       THGRSIZ   = N
@@ -422,7 +434,7 @@ SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
       NBTILES   = CEILING( REAL(N)/REAL(KD) )
       STEPERCOL = CEILING( REAL(SHIFT)/REAL(GRSIZ) )
       THGRNB    = CEILING( REAL(N-1)/REAL(THGRSIZ) )
-*      
+*
       CALL SLACPY( "A", KD+1, N, AB, LDAB, WORK( APOS ), LDA )
       CALL SLASET( "A", KD,   N, ZERO, ZERO, WORK( AWPOS ), LDA )
 *
@@ -431,7 +443,7 @@ SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *
 #if defined(_OPENMP)
 !$OMP PARALLEL PRIVATE( TID, THGRID, BLKLASTIND )
-!$OMP$         PRIVATE( THED, I, M, K, ST, ED, STT, SWEEPID ) 
+!$OMP$         PRIVATE( THED, I, M, K, ST, ED, STT, SWEEPID )
 !$OMP$         PRIVATE( MYID, TTYPE, COLPT, STIND, EDIND )
 !$OMP$         SHARED ( UPLO, WANTQ, INDV, INDTAU, HOUS, WORK)
 !$OMP$         SHARED ( N, KD, IB, NBTILES, LDA, LDV, INDA )
@@ -440,7 +452,7 @@ SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 #endif
 *
 *     main bulge chasing loop
-*      
+*
       DO 100 THGRID = 1, THGRNB
           STT  = (THGRID-1)*THGRSIZ+1
           THED = MIN( (STT + THGRSIZ -1), (N-1))
@@ -451,7 +463,7 @@ SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
                   ST = STT
                   DO 130 SWEEPID = ST, ED
                       DO 140 K = 1, GRSIZ
-                          MYID  = (I-SWEEPID)*(STEPERCOL*GRSIZ) 
+                          MYID  = (I-SWEEPID)*(STEPERCOL*GRSIZ)
      $                           + (M-1)*GRSIZ + K
                           IF ( MYID.EQ.1 ) THEN
                               TTYPE = 1
@@ -477,16 +489,17 @@ SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
                           ENDIF
 *
 *                         Call the kernel
-*                             
+*
 #if defined(_OPENMP) && _OPENMP >= 201307
-                          IF( TTYPE.NE.1 ) THEN      
+                          IF( TTYPE.NE.1 ) THEN
 !$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1))
 !$OMP$     DEPEND(in:WORK(MYID-1))
 !$OMP$     DEPEND(out:WORK(MYID))
                               TID      = OMP_GET_THREAD_NUM()
-                              CALL SSB2ST_KERNELS( UPLO, WANTQ, TTYPE, 
+                              CALL SSB2ST_KERNELS(
+     $                             UPLO, WANTQ, TTYPE,
      $                             STIND, EDIND, SWEEPID, N, KD, IB,
-     $                             WORK ( INDA ), LDA, 
+     $                             WORK ( INDA ), LDA,
      $                             HOUS( INDV ), HOUS( INDTAU ), LDV,
      $                             WORK( INDW + TID*KD ) )
 !$OMP END TASK
@@ -494,20 +507,22 @@ SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 !$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1))
 !$OMP$     DEPEND(out:WORK(MYID))
                               TID      = OMP_GET_THREAD_NUM()
-                              CALL SSB2ST_KERNELS( UPLO, WANTQ, TTYPE, 
+                              CALL SSB2ST_KERNELS(
+     $                             UPLO, WANTQ, TTYPE,
      $                             STIND, EDIND, SWEEPID, N, KD, IB,
-     $                             WORK ( INDA ), LDA, 
+     $                             WORK ( INDA ), LDA,
      $                             HOUS( INDV ), HOUS( INDTAU ), LDV,
      $                             WORK( INDW + TID*KD ) )
 !$OMP END TASK
                           ENDIF
 #else
-                          CALL SSB2ST_KERNELS( UPLO, WANTQ, TTYPE, 
+                          CALL SSB2ST_KERNELS(
+     $                         UPLO, WANTQ, TTYPE,
      $                         STIND, EDIND, SWEEPID, N, KD, IB,
-     $                         WORK ( INDA ), LDA, 
+     $                         WORK ( INDA ), LDA,
      $                         HOUS( INDV ), HOUS( INDTAU ), LDV,
-     $                         WORK( INDW + TID*KD ) )
-#endif 
+     $                         WORK( INDW ) )
+#endif
                           IF ( BLKLASTIND.GE.(N-1) ) THEN
                               STT = STT + 1
                               EXIT
@@ -522,14 +537,14 @@ SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 !$OMP END MASTER
 !$OMP END PARALLEL
 #endif
-*      
+*
 *     Copy the diagonal from A to D. Note that D is REAL thus only
 *     the Real part is needed, the imaginary part should be zero.
 *
       DO 150 I = 1, N
           D( I ) = ( WORK( DPOS+(I-1)*LDA ) )
   150 CONTINUE
-*      
+*
 *     Copy the off diagonal from A to E. Note that E is REAL thus only
 *     the Real part is needed, the imaginary part should be zero.
 *
@@ -543,11 +558,10 @@ SUBROUTINE SSYTRD_SB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
   170     CONTINUE
       ENDIF
 *
-      HOUS( 1 ) = LHMIN
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       RETURN
 *
 *     End of SSYTRD_SB2ST
 *
       END
-      
+
diff --git a/SRC/ssytrd_sy2sb.f b/SRC/ssytrd_sy2sb.f
index 2c92cd14a8..8d5d5c7b0e 100644
--- a/SRC/ssytrd_sy2sb.f
+++ b/SRC/ssytrd_sy2sb.f
@@ -7,7 +7,6 @@
 * Online html documentation available at 
 *            http://www.netlib.org/lapack/explore-html/ 
 *
-*> \htmlonly
 *> Download SSYTRD_SY2SB + dependencies 
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytrd_sy2sb.f"> 
 *> [TGZ]</a> 
@@ -15,7 +14,6 @@
 *> [ZIP]</a> 
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytrd_sy2sb.f"> 
 *> [TXT]</a>
-*> \endhtmlonly 
 *
 *  Definition:
 *  ===========
@@ -124,7 +122,7 @@
 *> \param[out] WORK
 *> \verbatim
 *>          WORK is REAL array, dimension (LWORK)
-*>          On exit, if INFO = 0, or if LWORK=-1, 
+*>          On exit, if INFO = 0, or if LWORK = -1,
 *>          WORK(1) returns the size of LWORK.
 *> \endverbatim
 *>
@@ -132,7 +130,9 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK which should be calculated
-*>          by a workspace query. LWORK = MAX(1, LWORK_QUERY)
+*>          by a workspace query.
+*>          If N <= KD+1, LWORK >= 1, else LWORK = MAX(1, LWORK_QUERY)
+*>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
@@ -158,7 +158,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetrd_he2hb
 *
 *> \par Further Details:
 *  =====================
@@ -274,7 +274,8 @@ SUBROUTINE SSYTRD_SY2SB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
      $                   TPOS, WPOS, S2POS, S1POS
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, SSYR2K, SSYMM, SGEMM, SCOPY,
+      EXTERNAL           XERBLA, SSYR2K, SSYMM, SGEMM,
+     $                   SCOPY,
      $                   SLARFT, SGELQF, SGEQRF, SLASET
 *     ..
 *     .. Intrinsic Functions ..
@@ -283,7 +284,8 @@ SUBROUTINE SSYTRD_SY2SB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV2STAGE 
-      EXTERNAL           LSAME, ILAENV2STAGE
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV2STAGE, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -293,8 +295,12 @@ SUBROUTINE SSYTRD_SY2SB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
       INFO   = 0
       UPPER  = LSAME( UPLO, 'U' )
       LQUERY = ( LWORK.EQ.-1 )
-      LWMIN  = ILAENV2STAGE( 4, 'SSYTRD_SY2SB', '', N, KD, -1, -1 )
-      
+      IF( N.LE.KD+1 ) THEN
+         LWMIN = 1
+      ELSE
+         LWMIN = ILAENV2STAGE( 4, 'SSYTRD_SY2SB', '', N, KD, -1, -1 )
+      END IF
+*
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
@@ -313,7 +319,7 @@ SUBROUTINE SSYTRD_SY2SB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
          CALL XERBLA( 'SSYTRD_SY2SB', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
-         WORK( 1 ) = LWMIN
+         WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
          RETURN
       END IF
 *
@@ -378,7 +384,8 @@ SUBROUTINE SSYTRD_SY2SB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
 *        
              DO 20 J = I, I+PK-1
                 LK = MIN( KD, N-J ) + 1
-                CALL SCOPY( LK, A( J, J ), LDA, AB( KD+1, J ), LDAB-1 )
+                CALL SCOPY( LK, A( J, J ), LDA, AB( KD+1, J ),
+     $                      LDAB-1 )
    20        CONTINUE
 *                
              CALL SLASET( 'Lower', PK, PK, ZERO, ONE, 
@@ -506,7 +513,7 @@ SUBROUTINE SSYTRD_SY2SB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
 
       END IF
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
       RETURN
 *
 *     End of SSYTRD_SY2SB
diff --git a/SRC/ssytrf.f b/SRC/ssytrf.f
index d188589b90..3a96143703 100644
--- a/SRC/ssytrf.f
+++ b/SRC/ssytrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,7 +133,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetrf
 *
 *> \par Further Details:
 *  =====================
@@ -179,6 +177,7 @@
 *>
 *  =====================================================================
       SUBROUTINE SSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -202,7 +201,8 @@ SUBROUTINE SSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SLASYF, SSYTF2, XERBLA
@@ -232,8 +232,8 @@ SUBROUTINE SSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *        Determine the block size
 *
          NB = ILAENV( 1, 'SSYTRF', UPLO, N, -1, -1, -1 )
-         LWKOPT = N*NB
-         WORK( 1 ) = LWKOPT
+         LWKOPT = MAX( 1, N*NB )
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -249,7 +249,8 @@ SUBROUTINE SSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
          IWS = LDWORK*NB
          IF( LWORK.LT.IWS ) THEN
             NB = MAX( LWORK / LDWORK, 1 )
-            NBMIN = MAX( 2, ILAENV( 2, 'SSYTRF', UPLO, N, -1, -1, -1 ) )
+            NBMIN = MAX( 2, ILAENV( 2, 'SSYTRF', UPLO, N, -1, -1,
+     $                   -1 ) )
          END IF
       ELSE
          IWS = 1
@@ -319,13 +320,15 @@ SUBROUTINE SSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *           Factorize columns k:k+kb-1 of A and use blocked code to
 *           update columns k+kb:n
 *
-            CALL SLASYF( UPLO, N-K+1, NB, KB, A( K, K ), LDA, IPIV( K ),
+            CALL SLASYF( UPLO, N-K+1, NB, KB, A( K, K ), LDA,
+     $                   IPIV( K ),
      $                   WORK, LDWORK, IINFO )
          ELSE
 *
 *           Use unblocked code to factorize columns k:n of A
 *
-            CALL SSYTF2( UPLO, N-K+1, A( K, K ), LDA, IPIV( K ), IINFO )
+            CALL SSYTF2( UPLO, N-K+1, A( K, K ), LDA, IPIV( K ),
+     $                   IINFO )
             KB = N - K + 1
          END IF
 *
@@ -352,7 +355,8 @@ SUBROUTINE SSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
       END IF
 *
    40 CONTINUE
-      WORK( 1 ) = LWKOPT
+*
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       RETURN
 *
 *     End of SSYTRF
diff --git a/SRC/ssytrf_aa.f b/SRC/ssytrf_aa.f
index 13e849cdc7..4286fe8a32 100644
--- a/SRC/ssytrf_aa.f
+++ b/SRC/ssytrf_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRF_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytrf_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytrf_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -74,7 +72,7 @@
 *>
 *>          On exit, the tridiagonal matrix is stored in the diagonals
 *>          and the subdiagonals of A just below (or above) the diagonals,
-*>          and L is stored below (or above) the subdiaonals, when UPLO
+*>          and L is stored below (or above) the subdiagonals, when UPLO
 *>          is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -101,8 +99,10 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK.  LWORK >= MAX(1,2*N). For optimum performance
-*>          LWORK >= N*(1+NB), where NB is the optimal blocksize.
+*>          The length of WORK.
+*>          LWORK >= 1, if N <= 1, and LWORK >= 2*N, otherwise.
+*>          For optimum performance LWORK >= N*(1+NB), where NB is
+*>          the optimal blocksize, returned by ILAENV.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -125,10 +125,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetrf_aa
 *
 *  =====================================================================
-      SUBROUTINE SSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
+      SUBROUTINE SSYTRF_AA( UPLO, N, A, LDA, IPIV,
+     $                      WORK, LWORK, INFO )
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -142,27 +143,29 @@ SUBROUTINE SSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
 *     ..
 *     .. Array Arguments ..
       INTEGER            IPIV( * )
-      REAL   A( LDA, * ), WORK( * )
+      REAL               A( LDA, * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *     .. Parameters ..
-      REAL   ZERO, ONE
+      REAL               ZERO, ONE
       PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0 )
 *
 *     .. Local Scalars ..
       LOGICAL            LQUERY, UPPER
-      INTEGER            J, LWKOPT
+      INTEGER            J, LWKMIN, LWKOPT
       INTEGER            NB, MJ, NJ, K1, K2, J1, J2, J3, JB
-      REAL   ALPHA
+      REAL               ALPHA
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLASYF_AA, SGEMV, SSCAL, SCOPY, SSWAP, SGEMM,
+      EXTERNAL           SLASYF_AA, SGEMV, SSCAL, SCOPY, SSWAP,
+     $                   SGEMM,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -179,19 +182,26 @@ SUBROUTINE SSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
       INFO = 0
       UPPER = LSAME( UPLO, 'U' )
       LQUERY = ( LWORK.EQ.-1 )
+      IF( N.LE.1 ) THEN
+         LWKMIN = 1
+         LWKOPT = 1
+      ELSE
+         LWKMIN = 2*N
+         LWKOPT = (NB+1)*N
+      END IF
+*
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, 2*N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -7
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         LWKOPT = (NB+1)*N
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -203,11 +213,11 @@ SUBROUTINE SSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
 *
 *     Quick return
 *
-      IF ( N.EQ.0 ) THEN
+      IF( N.EQ.0 ) THEN
           RETURN
       ENDIF
       IPIV( 1 ) = 1
-      IF ( N.EQ.1 ) THEN
+      IF( N.EQ.1 ) THEN
          RETURN
       END IF
 *
@@ -457,7 +467,8 @@ SUBROUTINE SSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
       END IF
 *
    20 CONTINUE
-      WORK( 1 ) = LWKOPT
+*
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       RETURN
 *
 *     End of SSYTRF_AA
diff --git a/SRC/ssytrf_aa_2stage.f b/SRC/ssytrf_aa_2stage.f
index 94b3aa4b50..9007d68825 100644
--- a/SRC/ssytrf_aa_2stage.f
+++ b/SRC/ssytrf_aa_2stage.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRF_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytrf_aa_2stage.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytrf_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -75,7 +73,7 @@
 *>          triangular part of the matrix A, and the strictly upper
 *>          triangular part of A is not referenced.
 *>
-*>          On exit, L is stored below (or above) the subdiaonal blocks,
+*>          On exit, L is stored below (or above) the subdiagonal blocks,
 *>          when UPLO  is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -94,7 +92,7 @@
 *> \param[in] LTB
 *> \verbatim
 *>          LTB is INTEGER
-*>          The size of the array TB. LTB >= 4*N, internally
+*>          The size of the array TB. LTB >= MAX(1,4*N), internally
 *>          used to select NB such that LTB >= (3*NB+1)*N.
 *>
 *>          If LTB = -1, then a workspace query is assumed; the
@@ -121,14 +119,14 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is REAL workspace of size LWORK
+*>          WORK is REAL workspace of size (MAX(1,LWORK))
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The size of WORK. LWORK >= N, internally used to select NB
-*>          such that LWORK >= N*NB.
+*>          The size of WORK. LWORK >= MAX(1,N), internally used to
+*>          select NB such that LWORK >= N*NB.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal size of the WORK array,
@@ -152,7 +150,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetrf_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE SSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
@@ -187,7 +185,8 @@ SUBROUTINE SSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           XERBLA, SCOPY, SLACPY,
@@ -211,9 +210,9 @@ SUBROUTINE SSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -4
-      ELSE IF ( LTB .LT. 4*N .AND. .NOT.TQUERY ) THEN
+      ELSE IF( LTB.LT.MAX( 1, 4*N ) .AND. .NOT.TQUERY ) THEN
          INFO = -6
-      ELSE IF ( LWORK .LT. N .AND. .NOT.WQUERY ) THEN
+      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.WQUERY ) THEN
          INFO = -10
       END IF
 *
@@ -227,10 +226,10 @@ SUBROUTINE SSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
       NB = ILAENV( 1, 'SSYTRF_AA_2STAGE', UPLO, N, -1, -1, -1 )
       IF( INFO.EQ.0 ) THEN
          IF( TQUERY ) THEN
-            TB( 1 ) = (3*NB+1)*N
+            TB( 1 ) = SROUNDUP_LWORK( MAX( 1, (3*NB+1)*N ) )
          END IF
          IF( WQUERY ) THEN
-            WORK( 1 ) = N*NB
+            WORK( 1 ) = SROUNDUP_LWORK( MAX( 1, N*NB ) )
          END IF
       END IF
       IF( TQUERY .OR. WQUERY ) THEN
@@ -239,7 +238,7 @@ SUBROUTINE SSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
 *
 *     Quick return
 *
-      IF ( N.EQ.0 ) THEN
+      IF( N.EQ.0 ) THEN
          RETURN
       ENDIF
 *
@@ -267,7 +266,7 @@ SUBROUTINE SSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
 *
 *     Save NB
 *
-      TB( 1 ) = NB
+      TB( 1 ) = REAL( NB )
 *
       IF( UPPER ) THEN
 *
diff --git a/SRC/ssytrf_rk.f b/SRC/ssytrf_rk.f
index ec84fcb1b9..575c301dce 100644
--- a/SRC/ssytrf_rk.f
+++ b/SRC/ssytrf_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRF_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytrf_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytrf_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -177,14 +175,14 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is REAL array, dimension ( MAX(1,LWORK) ).
+*>          WORK is REAL array, dimension (MAX(1,LWORK)).
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK.  LWORK >=1.  For best performance
+*>          The length of WORK.  LWORK >= 1.  For best performance
 *>          LWORK >= N*NB, where NB is the block size returned
 *>          by ILAENV.
 *>
@@ -229,7 +227,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup singleSYcomputational
+*> \ingroup hetrf_rk
 *
 *> \par Further Details:
 *  =====================
@@ -256,6 +254,7 @@
 *  =====================================================================
       SUBROUTINE SSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
      $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -280,10 +279,12 @@ SUBROUTINE SSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLASYF_RK, SSYTF2_RK, SSWAP,  XERBLA
+      EXTERNAL           SLASYF_RK, SSYTF2_RK, SSWAP,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -310,8 +311,8 @@ SUBROUTINE SSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *        Determine the block size
 *
          NB = ILAENV( 1, 'SSYTRF_RK', UPLO, N, -1, -1, -1 )
-         LWKOPT = N*NB
-         WORK( 1 ) = LWKOPT
+         LWKOPT = MAX( 1, N*NB )
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -425,7 +426,8 @@ SUBROUTINE SSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *           Factorize columns k:k+kb-1 of A and use blocked code to
 *           update columns k+kb:n
 *
-            CALL SLASYF_RK( UPLO, N-K+1, NB, KB, A( K, K ), LDA, E( K ),
+            CALL SLASYF_RK( UPLO, N-K+1, NB, KB, A( K, K ), LDA,
+     $                      E( K ),
      $                        IPIV( K ), WORK, LDWORK, IINFO )
 
 
@@ -487,7 +489,7 @@ SUBROUTINE SSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *
       END IF
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       RETURN
 *
 *     End of SSYTRF_RK
diff --git a/SRC/ssytrf_rook.f b/SRC/ssytrf_rook.f
index 653289e2b5..4fe34bc748 100644
--- a/SRC/ssytrf_rook.f
+++ b/SRC/ssytrf_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRF_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytrf_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytrf_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -118,7 +116,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK.  LWORK >=1.  For best performance
+*>          The length of WORK.  LWORK >= 1.  For best performance
 *>          LWORK >= N*NB, where NB is the block size returned by ILAENV.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
@@ -146,7 +144,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetrf_rook
 *
 *> \par Further Details:
 *  =====================
@@ -204,7 +202,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE SSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      SUBROUTINE SSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK,
+     $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -228,7 +228,8 @@ SUBROUTINE SSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SLASYF_ROOK, SSYTF2_ROOK, XERBLA
@@ -259,7 +260,7 @@ SUBROUTINE SSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *
          NB = ILAENV( 1, 'SSYTRF_ROOK', UPLO, N, -1, -1, -1 )
          LWKOPT = MAX( 1, N*NB )
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -382,7 +383,8 @@ SUBROUTINE SSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
       END IF
 *
    40 CONTINUE
-      WORK( 1 ) = LWKOPT
+*
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
       RETURN
 *
 *     End of SSYTRF_ROOK
diff --git a/SRC/ssytri.f b/SRC/ssytri.f
index d02f3afaf6..5a66701b42 100644
--- a/SRC/ssytri.f
+++ b/SRC/ssytri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetri
 *
 *  =====================================================================
       SUBROUTINE SSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -248,7 +247,8 @@ SUBROUTINE SSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
                A( K, K ) = A( K, K ) - SDOT( K-1, WORK, 1, A( 1, K ),
      $                     1 )
                A( K, K+1 ) = A( K, K+1 ) -
-     $                       SDOT( K-1, A( 1, K ), 1, A( 1, K+1 ), 1 )
+     $                       SDOT( K-1, A( 1, K ), 1, A( 1, K+1 ),
+     $                             1 )
                CALL SCOPY( K-1, A( 1, K+1 ), 1, WORK, 1 )
                CALL SSYMV( UPLO, K-1, -ONE, A, LDA, WORK, 1, ZERO,
      $                     A( 1, K+1 ), 1 )
@@ -307,9 +307,11 @@ SUBROUTINE SSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL SCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL SSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL SSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K ), 1 )
-               A( K, K ) = A( K, K ) - SDOT( N-K, WORK, 1, A( K+1, K ),
+               A( K, K ) = A( K, K ) - SDOT( N-K, WORK, 1, A( K+1,
+     $            K ),
      $                     1 )
             END IF
             KSTEP = 1
@@ -332,15 +334,19 @@ SUBROUTINE SSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL SCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL SSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL SSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K ), 1 )
-               A( K, K ) = A( K, K ) - SDOT( N-K, WORK, 1, A( K+1, K ),
+               A( K, K ) = A( K, K ) - SDOT( N-K, WORK, 1, A( K+1,
+     $            K ),
      $                     1 )
                A( K, K-1 ) = A( K, K-1 ) -
-     $                       SDOT( N-K, A( K+1, K ), 1, A( K+1, K-1 ),
+     $                       SDOT( N-K, A( K+1, K ), 1, A( K+1,
+     $                             K-1 ),
      $                       1 )
                CALL SCOPY( N-K, A( K+1, K-1 ), 1, WORK, 1 )
-               CALL SSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL SSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K-1 ), 1 )
                A( K-1, K-1 ) = A( K-1, K-1 ) -
      $                         SDOT( N-K, WORK, 1, A( K+1, K-1 ), 1 )
diff --git a/SRC/ssytri2.f b/SRC/ssytri2.f
index 49f6cad652..e728fed7d5 100644
--- a/SRC/ssytri2.f
+++ b/SRC/ssytri2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRI2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytri2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytri2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,16 +86,16 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is REAL array, dimension (N+NB+1)*(NB+3)
+*>          WORK is REAL array, dimension (MAX(1,LWORK))
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK.
-*>          WORK is size >= (N+NB+1)*(NB+3)
+*>          If N = 0, LWORK >= 1, else LWORK >= (N+NB+1)*(NB+3).
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>           calculates:
+*>          calculates:
 *>              - the optimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array,
 *>              - and no error message related to LWORK is issued by XERBLA.
@@ -120,10 +118,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetri2
 *
 *  =====================================================================
       SUBROUTINE SSYTRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -147,7 +146,8 @@ SUBROUTINE SSYTRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SSYTRI, SSYTRI2X, XERBLA
@@ -159,9 +159,13 @@ SUBROUTINE SSYTRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
       INFO = 0
       UPPER = LSAME( UPLO, 'U' )
       LQUERY = ( LWORK.EQ.-1 )
+*
 *     Get blocksize
+*
       NBMAX = ILAENV( 1, 'SSYTRF', UPLO, N, -1, -1, -1 )
-      IF ( NBMAX .GE. N ) THEN
+      IF( N.EQ.0 ) THEN
+         MINSIZE = 1
+      ELSE IF( NBMAX.GE.N ) THEN
          MINSIZE = N
       ELSE
          MINSIZE = (N+NBMAX+1)*(NBMAX+3)
@@ -173,28 +177,29 @@ SUBROUTINE SSYTRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -4
-      ELSE IF (LWORK .LT. MINSIZE .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.MINSIZE .AND. .NOT.LQUERY ) THEN
          INFO = -7
       END IF
-*
-*     Quick return if possible
-*
 *
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'SSYTRI2', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
-         WORK(1)=MINSIZE
+         WORK( 1 ) = SROUNDUP_LWORK( MINSIZE )
          RETURN
       END IF
+*
+*     Quick return if possible
+*
       IF( N.EQ.0 )
      $   RETURN
-
-      IF( NBMAX .GE. N ) THEN
+*
+      IF( NBMAX.GE.N ) THEN
          CALL SSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
       ELSE
          CALL SSYTRI2X( UPLO, N, A, LDA, IPIV, WORK, NBMAX, INFO )
       END IF
+*
       RETURN
 *
 *     End of SSYTRI2
diff --git a/SRC/ssytri2x.f b/SRC/ssytri2x.f
index 57672eec22..bb8fd43d3d 100644
--- a/SRC/ssytri2x.f
+++ b/SRC/ssytri2x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRI2X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytri2x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytri2x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,10 +111,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetri2x
 *
 *  =====================================================================
       SUBROUTINE SSYTRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -381,8 +380,10 @@ SUBROUTINE SSYTRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
             DO WHILE ( I .LE. N )
                IF( IPIV(I) .GT. 0 ) THEN
                   IP=IPIV(I)
-                 IF (I .LT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, I ,IP )
-                 IF (I .GT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                 IF (I .LT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, I ,
+     $                IP )
+                 IF (I .GT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, IP ,
+     $                I )
                ELSE
                  IP=-IPIV(I)
                  I=I+1
@@ -567,12 +568,16 @@ SUBROUTINE SSYTRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
             DO WHILE ( I .GE. 1 )
                IF( IPIV(I) .GT. 0 ) THEN
                   IP=IPIV(I)
-                 IF (I .LT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, I ,IP  )
-                 IF (I .GT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                 IF (I .LT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, I ,
+     $                IP  )
+                 IF (I .GT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, IP ,
+     $                I )
                ELSE
                  IP=-IPIV(I)
-                 IF ( I .LT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, I ,IP )
-                 IF ( I .GT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                 IF ( I .LT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, I ,
+     $                IP )
+                 IF ( I .GT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, IP ,
+     $                I )
                  I=I-1
                ENDIF
                I=I-1
diff --git a/SRC/ssytri_3.f b/SRC/ssytri_3.f
index 58d5df92ae..fcf4798003 100644
--- a/SRC/ssytri_3.f
+++ b/SRC/ssytri_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRI_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytri_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytri_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,16 +117,17 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is REAL array, dimension (N+NB+1)*(NB+3).
+*>          WORK is REAL array, dimension (MAX(1,LWORK)).
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK. LWORK >= (N+NB+1)*(NB+3).
+*>          The length of WORK.
+*>          If N = 0, LWORK >= 1, else LWORK >= (N+NB+1)*(NB+3).
 *>
-*>          If LDWORK = -1, then a workspace query is assumed;
+*>          If LWORK = -1, then a workspace query is assumed;
 *>          the routine only calculates the optimal size of the optimal
 *>          size of the WORK array, returns this value as the first
 *>          entry of the WORK array, and no error message related to
@@ -152,7 +151,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup singleSYcomputational
+*> \ingroup hetri_3
 *
 *> \par Contributors:
 *  ==================
@@ -167,6 +166,7 @@
 *  =====================================================================
       SUBROUTINE SSYTRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
      $                     INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,7 +190,8 @@ SUBROUTINE SSYTRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SSYTRI_3X, XERBLA
@@ -208,8 +209,13 @@ SUBROUTINE SSYTRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *
 *     Determine the block size
 *
-      NB = MAX( 1, ILAENV( 1, 'SSYTRI_3', UPLO, N, -1, -1, -1 ) )
-      LWKOPT = ( N+NB+1 ) * ( NB+3 )
+      IF( N.EQ.0 ) THEN
+         LWKOPT = 1
+      ELSE
+         NB = MAX( 1, ILAENV( 1, 'SSYTRI_3', UPLO, N, -1, -1, -1 ) )
+         LWKOPT = ( N+NB+1 ) * ( NB+3 )
+      END IF
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
@@ -217,7 +223,7 @@ SUBROUTINE SSYTRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -4
-      ELSE IF ( LWORK .LT. LWKOPT .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKOPT .AND. .NOT.LQUERY ) THEN
          INFO = -8
       END IF
 *
@@ -225,7 +231,6 @@ SUBROUTINE SSYTRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
          CALL XERBLA( 'SSYTRI_3', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
-         WORK( 1 ) = LWKOPT
          RETURN
       END IF
 *
@@ -236,7 +241,7 @@ SUBROUTINE SSYTRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *
       CALL SSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK( LWKOPT )
 *
       RETURN
 *
diff --git a/SRC/ssytri_3x.f b/SRC/ssytri_3x.f
index 330b832974..255a90315d 100644
--- a/SRC/ssytri_3x.f
+++ b/SRC/ssytri_3x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRI_3X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytri_3x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytri_3x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -142,7 +140,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup singleSYcomputational
+*> \ingroup hetri_3x
 *
 *> \par Contributors:
 *  ==================
@@ -155,7 +153,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE SSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
+      SUBROUTINE SSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB,
+     $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -187,7 +187,8 @@ SUBROUTINE SSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMM, SSYSWAPR, STRTRI, STRMM, XERBLA
+      EXTERNAL           SGEMM, SSYSWAPR, STRTRI, STRMM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MOD
@@ -431,8 +432,10 @@ SUBROUTINE SSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
          DO I = 1, N
              IP = ABS( IPIV( I ) )
              IF( IP.NE.I ) THEN
-                IF (I .LT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, I ,IP )
-                IF (I .GT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                IF (I .LT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, I ,
+     $               IP )
+                IF (I .GT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, IP ,
+     $               I )
              END IF
          END DO
 *
@@ -627,8 +630,10 @@ SUBROUTINE SSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
          DO I = N, 1, -1
              IP = ABS( IPIV( I ) )
              IF( IP.NE.I ) THEN
-                IF (I .LT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, I ,IP )
-                IF (I .GT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                IF (I .LT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, I ,
+     $               IP )
+                IF (I .GT. IP) CALL SSYSWAPR( UPLO, N, A, LDA, IP ,
+     $               I )
              END IF
          END DO
 *
diff --git a/SRC/ssytri_rook.f b/SRC/ssytri_rook.f
index d78fe73071..2ed3ce1eff 100644
--- a/SRC/ssytri_rook.f
+++ b/SRC/ssytri_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRI_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytri_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytri_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetri_rook
 *
 *> \par Contributors:
 *  ==================
@@ -126,6 +124,7 @@
 *
 *  =====================================================================
       SUBROUTINE SSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -263,7 +262,8 @@ SUBROUTINE SSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
                A( K, K ) = A( K, K ) - SDOT( K-1, WORK, 1, A( 1, K ),
      $                     1 )
                A( K, K+1 ) = A( K, K+1 ) -
-     $                       SDOT( K-1, A( 1, K ), 1, A( 1, K+1 ), 1 )
+     $                       SDOT( K-1, A( 1, K ), 1, A( 1, K+1 ),
+     $                             1 )
                CALL SCOPY( K-1, A( 1, K+1 ), 1, WORK, 1 )
                CALL SSYMV( UPLO, K-1, -ONE, A, LDA, WORK, 1, ZERO,
      $                     A( 1, K+1 ), 1 )
@@ -282,7 +282,8 @@ SUBROUTINE SSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
                IF( KP.GT.1 )
      $             CALL SSWAP( KP-1, A( 1, K ), 1, A( 1, KP ), 1 )
-               CALL SSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ), LDA )
+               CALL SSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ),
+     $                     LDA )
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
                A( KP, KP ) = TEMP
@@ -296,7 +297,8 @@ SUBROUTINE SSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
                IF( KP.GT.1 )
      $            CALL SSWAP( KP-1, A( 1, K ), 1, A( 1, KP ), 1 )
-               CALL SSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ), LDA )
+               CALL SSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ),
+     $                     LDA )
 *
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
@@ -311,7 +313,8 @@ SUBROUTINE SSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
                IF( KP.GT.1 )
      $            CALL SSWAP( KP-1, A( 1, K ), 1, A( 1, KP ), 1 )
-               CALL SSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ), LDA )
+               CALL SSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ),
+     $                     LDA )
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
                A( KP, KP ) = TEMP
@@ -349,9 +352,11 @@ SUBROUTINE SSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL SCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL SSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL SSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K ), 1 )
-               A( K, K ) = A( K, K ) - SDOT( N-K, WORK, 1, A( K+1, K ),
+               A( K, K ) = A( K, K ) - SDOT( N-K, WORK, 1, A( K+1,
+     $            K ),
      $                     1 )
             END IF
             KSTEP = 1
@@ -374,15 +379,19 @@ SUBROUTINE SSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL SCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL SSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL SSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K ), 1 )
-               A( K, K ) = A( K, K ) - SDOT( N-K, WORK, 1, A( K+1, K ),
+               A( K, K ) = A( K, K ) - SDOT( N-K, WORK, 1, A( K+1,
+     $            K ),
      $                     1 )
                A( K, K-1 ) = A( K, K-1 ) -
-     $                       SDOT( N-K, A( K+1, K ), 1, A( K+1, K-1 ),
+     $                       SDOT( N-K, A( K+1, K ), 1, A( K+1,
+     $                             K-1 ),
      $                       1 )
                CALL SCOPY( N-K, A( K+1, K-1 ), 1, WORK, 1 )
-               CALL SSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL SSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K-1 ), 1 )
                A( K-1, K-1 ) = A( K-1, K-1 ) -
      $                         SDOT( N-K, WORK, 1, A( K+1, K-1 ), 1 )
@@ -398,8 +407,10 @@ SUBROUTINE SSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             KP = IPIV( K )
             IF( KP.NE.K ) THEN
                IF( KP.LT.N )
-     $            CALL SSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
-               CALL SSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ), LDA )
+     $            CALL SSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
+               CALL SSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ),
+     $                     LDA )
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
                A( KP, KP ) = TEMP
@@ -412,8 +423,10 @@ SUBROUTINE SSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             KP = -IPIV( K )
             IF( KP.NE.K ) THEN
                IF( KP.LT.N )
-     $            CALL SSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
-               CALL SSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ), LDA )
+     $            CALL SSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
+               CALL SSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ),
+     $                     LDA )
 *
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
@@ -427,8 +440,10 @@ SUBROUTINE SSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             KP = -IPIV( K )
             IF( KP.NE.K ) THEN
                IF( KP.LT.N )
-     $            CALL SSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
-               CALL SSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ), LDA )
+     $            CALL SSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
+               CALL SSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ),
+     $                     LDA )
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
                A( KP, KP ) = TEMP
diff --git a/SRC/ssytrs.f b/SRC/ssytrs.f
index 344949a99d..ad79527726 100644
--- a/SRC/ssytrs.f
+++ b/SRC/ssytrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,10 +111,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetrs
 *
 *  =====================================================================
       SUBROUTINE SSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -270,7 +269,8 @@ SUBROUTINE SSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           Multiply by inv(U**T(K)), where U(K) is the transformation
 *           stored in column K of A.
 *
-            CALL SGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, A( 1, K ),
+            CALL SGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, A( 1,
+     $                  K ),
      $                  1, ONE, B( K, 1 ), LDB )
 *
 *           Interchange rows K and IPIV(K).
@@ -286,7 +286,8 @@ SUBROUTINE SSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           Multiply by inv(U**T(K+1)), where U(K+1) is the transformation
 *           stored in columns K and K+1 of A.
 *
-            CALL SGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, A( 1, K ),
+            CALL SGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, A( 1,
+     $                  K ),
      $                  1, ONE, B( K, 1 ), LDB )
             CALL SGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB,
      $                  A( 1, K+1 ), 1, ONE, B( K+1, 1 ), LDB )
@@ -354,7 +355,8 @@ SUBROUTINE SSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL SGER( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K, 1 ),
+               CALL SGER( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K,
+     $                    1 ),
      $                    LDB, B( K+2, 1 ), LDB )
                CALL SGER( N-K-1, NRHS, -ONE, A( K+2, K+1 ), 1,
      $                    B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
diff --git a/SRC/ssytrs2.f b/SRC/ssytrs2.f
index c8346d83be..25fb569313 100644
--- a/SRC/ssytrs2.f
+++ b/SRC/ssytrs2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytrs2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytrs2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -124,11 +122,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetrs2
 *
 *  =====================================================================
       SUBROUTINE SSYTRS2( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
      $                    WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -159,7 +158,8 @@ SUBROUTINE SSYTRS2( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SSCAL, SSYCONV, SSWAP, STRSM, XERBLA
+      EXTERNAL           SSCAL, SSYCONV, SSWAP, STRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
diff --git a/SRC/ssytrs_3.f b/SRC/ssytrs_3.f
index 9ad5813360..da6e8ea131 100644
--- a/SRC/ssytrs_3.f
+++ b/SRC/ssytrs_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRS_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytrs_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytrs_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -142,7 +140,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup singleSYcomputational
+*> \ingroup hetrs_3
 *
 *> \par Contributors:
 *  ==================
@@ -162,6 +160,7 @@
 *  ====================================================================
       SUBROUTINE SSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
      $                     INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -246,7 +245,8 @@ SUBROUTINE SSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (U \P**T * B) -> B    [ (U \P**T * B) ]
 *
-         CALL STRSM( 'L', 'U', 'N', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL STRSM( 'L', 'U', 'N', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        Compute D \ B -> B   [ D \ (U \P**T * B) ]
 *
@@ -272,7 +272,8 @@ SUBROUTINE SSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (U**T \ B) -> B   [ U**T \ (D \ (U \P**T * B) ) ]
 *
-         CALL STRSM( 'L', 'U', 'T', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL STRSM( 'L', 'U', 'T', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        P * B  [ P * (U**T \ (D \ (U \P**T * B) )) ]
 *
@@ -313,7 +314,8 @@ SUBROUTINE SSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (L \P**T * B) -> B    [ (L \P**T * B) ]
 *
-         CALL STRSM( 'L', 'L', 'N', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL STRSM( 'L', 'L', 'N', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        Compute D \ B -> B   [ D \ (L \P**T * B) ]
 *
@@ -339,7 +341,8 @@ SUBROUTINE SSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (L**T \ B) -> B   [ L**T \ (D \ (L \P**T * B) ) ]
 *
-         CALL STRSM('L', 'L', 'T', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL STRSM('L', 'L', 'T', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        P * B  [ P * (L**T \ (D \ (L \P**T * B) )) ]
 *
diff --git a/SRC/ssytrs_aa.f b/SRC/ssytrs_aa.f
index 3cfa2a2068..4686878a85 100644
--- a/SRC/ssytrs_aa.f
+++ b/SRC/ssytrs_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRS_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytrs_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytrs_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -105,7 +103,13 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK >= max(1,3*N-2).
+*>          The dimension of the array WORK.
+*>          If MIN(N,NRHS) = 0, LWORK >= 1, else LWORK >= 3*N-2.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the minimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -123,7 +127,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetrs_aa
 *
 *  =====================================================================
       SUBROUTINE SSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
@@ -141,7 +145,7 @@ SUBROUTINE SSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *     ..
 *     .. Array Arguments ..
       INTEGER            IPIV( * )
-      REAL   A( LDA, * ), B( LDB, * ), WORK( * )
+      REAL               A( LDA, * ), B( LDB, * ), WORK( * )
 *     ..
 *
 *  =====================================================================
@@ -151,23 +155,31 @@ SUBROUTINE SSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, UPPER
-      INTEGER            K, KP, LWKOPT
+      INTEGER            K, KP, LWKMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SGTSV, SSWAP, SLACPY, STRSM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX
+      INTRINSIC          MIN, MAX
 *     ..
 *     .. Executable Statements ..
 *
       INFO = 0
       UPPER = LSAME( UPLO, 'U' )
       LQUERY = ( LWORK.EQ.-1 )
+      IF( MIN( N, NRHS ).EQ.0 ) THEN
+         LWKMIN = 1
+      ELSE
+         LWKMIN = 3*N-2
+      END IF
+*
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
@@ -178,21 +190,20 @@ SUBROUTINE SSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
          INFO = -5
       ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
          INFO = -8
-      ELSE IF( LWORK.LT.MAX( 1, 3*N-2 ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -10
       END IF
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'SSYTRS_AA', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
-         LWKOPT = (3*N-2)
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK( LWKMIN )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( N.EQ.0 .OR. NRHS.EQ.0 )
+      IF( MIN( N, NRHS ).EQ.0 )
      $   RETURN
 *
       IF( UPPER ) THEN
@@ -209,13 +220,15 @@ SUBROUTINE SSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
             DO WHILE ( K.LE.N )
                KP = IPIV( K )
                IF( KP.NE.K )
-     $             CALL SSWAP( NRHS, B( K, 1 ), LDB, B( KP, 1 ), LDB )
+     $             CALL SSWAP( NRHS, B( K, 1 ), LDB, B( KP, 1 ),
+     $                         LDB )
                K = K + 1
             END DO
 *
 *           Compute U**T \ B -> B    [ (U**T \P**T * B) ]
 *
-            CALL STRSM( 'L', 'U', 'T', 'U', N-1, NRHS, ONE, A( 1, 2 ),
+            CALL STRSM( 'L', 'U', 'T', 'U', N-1, NRHS, ONE, A( 1,
+     $                  2 ),
      $                  LDA, B( 2, 1 ), LDB)
          END IF
 *
@@ -238,7 +251,8 @@ SUBROUTINE SSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute U \ B -> B   [ U \ (T \ (U**T \P**T * B) ) ]
 *
-            CALL STRSM( 'L', 'U', 'N', 'U', N-1, NRHS, ONE, A( 1, 2 ),
+            CALL STRSM( 'L', 'U', 'N', 'U', N-1, NRHS, ONE, A( 1,
+     $                  2 ),
      $                  LDA, B(2, 1), LDB)
 *
 *           Pivot, P * B -> B  [ P * (U \ (T \ (U**T \P**T * B) )) ]
@@ -294,7 +308,8 @@ SUBROUTINE SSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute L**T \ B -> B   [ L**T \ (T \ (L \P**T * B) ) ]
 *
-            CALL STRSM( 'L', 'L', 'T', 'U', N-1, NRHS, ONE, A( 2, 1 ),
+            CALL STRSM( 'L', 'L', 'T', 'U', N-1, NRHS, ONE, A( 2,
+     $                  1 ),
      $                  LDA, B( 2, 1 ), LDB)
 *
 *           Pivot, P * B -> B  [ P * (L**T \ (T \ (L \P**T * B) )) ]
diff --git a/SRC/ssytrs_aa_2stage.f b/SRC/ssytrs_aa_2stage.f
index 12912bc315..ee4a1cc3db 100644
--- a/SRC/ssytrs_aa_2stage.f
+++ b/SRC/ssytrs_aa_2stage.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRS_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytrs_aa_2stage.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytrs_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -131,7 +129,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetrs_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE SSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
@@ -215,7 +213,8 @@ SUBROUTINE SSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (U**T \ B) -> B    [ (U**T \P**T * B) ]
 *
-            CALL STRSM( 'L', 'U', 'T', 'U', N-NB, NRHS, ONE, A(1, NB+1),
+            CALL STRSM( 'L', 'U', 'T', 'U', N-NB, NRHS, ONE, A(1,
+     $                  NB+1),
      $                 LDA, B(NB+1, 1), LDB)
 *
          END IF
@@ -228,7 +227,8 @@ SUBROUTINE SSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (U \ B) -> B   [ U \ (T \ (U**T \P**T * B) ) ]
 *
-            CALL STRSM( 'L', 'U', 'N', 'U', N-NB, NRHS, ONE, A(1, NB+1),
+            CALL STRSM( 'L', 'U', 'N', 'U', N-NB, NRHS, ONE, A(1,
+     $                  NB+1),
      $                  LDA, B(NB+1, 1), LDB)
 *
 *           Pivot, P * B -> B  [ P * (U \ (T \ (U**T \P**T * B) )) ]
@@ -249,7 +249,8 @@ SUBROUTINE SSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (L \ B) -> B    [ (L \P**T * B) ]
 *
-            CALL STRSM( 'L', 'L', 'N', 'U', N-NB, NRHS, ONE, A(NB+1, 1),
+            CALL STRSM( 'L', 'L', 'N', 'U', N-NB, NRHS, ONE, A(NB+1,
+     $                  1),
      $                 LDA, B(NB+1, 1), LDB)
 *
          END IF
@@ -262,7 +263,8 @@ SUBROUTINE SSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (L**T \ B) -> B   [ L**T \ (T \ (L \P**T * B) ) ]
 *
-            CALL STRSM( 'L', 'L', 'T', 'U', N-NB, NRHS, ONE, A(NB+1, 1),
+            CALL STRSM( 'L', 'L', 'T', 'U', N-NB, NRHS, ONE, A(NB+1,
+     $                  1),
      $                  LDA, B(NB+1, 1), LDB)
 *
 *           Pivot, P * B -> B  [ P * (L**T \ (T \ (L \P**T * B) )) ]
diff --git a/SRC/ssytrs_rook.f b/SRC/ssytrs_rook.f
index eabc84f44e..df7a906919 100644
--- a/SRC/ssytrs_rook.f
+++ b/SRC/ssytrs_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download SSYTRS_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssytrs_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssytrs_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,7 +111,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup hetrs_rook
 *
 *> \par Contributors:
 *  ==================
@@ -133,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE SSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
      $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -250,7 +249,8 @@ SUBROUTINE SSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
             IF( K.GT.2 ) THEN
                CALL SGER( K-2, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ),
      $                    LDB, B( 1, 1 ), LDB )
-               CALL SGER( K-2, NRHS, -ONE, A( 1, K-1 ), 1, B( K-1, 1 ),
+               CALL SGER( K-2, NRHS, -ONE, A( 1, K-1 ), 1, B( K-1,
+     $                    1 ),
      $                    LDB, B( 1, 1 ), LDB )
             END IF
 *
@@ -388,7 +388,8 @@ SUBROUTINE SSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL SGER( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K, 1 ),
+               CALL SGER( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K,
+     $                    1 ),
      $                    LDB, B( K+2, 1 ), LDB )
                CALL SGER( N-K-1, NRHS, -ONE, A( K+2, K+1 ), 1,
      $                    B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
diff --git a/SRC/stbcon.f b/SRC/stbcon.f
index 9ce694aa1e..75731f9a0b 100644
--- a/SRC/stbcon.f
+++ b/SRC/stbcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STBCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stbcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stbcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,11 +133,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tbcon
 *
 *  =====================================================================
-      SUBROUTINE STBCON( NORM, UPLO, DIAG, N, KD, AB, LDAB, RCOND, WORK,
+      SUBROUTINE STBCON( NORM, UPLO, DIAG, N, KD, AB, LDAB, RCOND,
+     $                   WORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -238,19 +238,22 @@ SUBROUTINE STBCON( NORM, UPLO, DIAG, N, KD, AB, LDAB, RCOND, WORK,
          END IF
          KASE = 0
    10    CONTINUE
-         CALL SLACN2( N, WORK( N+1 ), WORK, IWORK, AINVNM, KASE, ISAVE )
+         CALL SLACN2( N, WORK( N+1 ), WORK, IWORK, AINVNM, KASE,
+     $                ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.KASE1 ) THEN
 *
 *              Multiply by inv(A).
 *
-               CALL SLATBS( UPLO, 'No transpose', DIAG, NORMIN, N, KD,
+               CALL SLATBS( UPLO, 'No transpose', DIAG, NORMIN, N,
+     $                      KD,
      $                      AB, LDAB, WORK, SCALE, WORK( 2*N+1 ), INFO )
             ELSE
 *
 *              Multiply by inv(A**T).
 *
-               CALL SLATBS( UPLO, 'Transpose', DIAG, NORMIN, N, KD, AB,
+               CALL SLATBS( UPLO, 'Transpose', DIAG, NORMIN, N, KD,
+     $                      AB,
      $                      LDAB, WORK, SCALE, WORK( 2*N+1 ), INFO )
             END IF
             NORMIN = 'Y'
diff --git a/SRC/stbrfs.f b/SRC/stbrfs.f
index 6ccb35e391..a334cc8ab9 100644
--- a/SRC/stbrfs.f
+++ b/SRC/stbrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STBRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stbrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stbrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -180,11 +178,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tbrfs
 *
 *  =====================================================================
       SUBROUTINE STBRFS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
      $                   LDB, X, LDX, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -218,7 +217,8 @@ SUBROUTINE STBRFS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SLACN2, STBMV, STBSV, XERBLA
+      EXTERNAL           SAXPY, SCOPY, SLACN2, STBMV, STBSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN
@@ -283,7 +283,7 @@ SUBROUTINE STBRFS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
       NZ = KD + 2
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -431,15 +431,17 @@ SUBROUTINE STBRFS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
 *
          DO 200 I = 1, N
             IF( WORK( I ).GT.SAFE2 ) THEN
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I )
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
             ELSE
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I ) + SAFE1
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
+     $                     + SAFE1
             END IF
   200    CONTINUE
 *
          KASE = 0
   210    CONTINUE
-         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
diff --git a/SRC/stbtrs.f b/SRC/stbtrs.f
index 30219e7039..52c0972bf6 100644
--- a/SRC/stbtrs.f
+++ b/SRC/stbtrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STBTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stbtrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stbtrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -39,8 +37,14 @@
 *>
 *>    A * X = B  or  A**T * X = B,
 *>
-*> where A is a triangular band matrix of order N, and B is an
-*> N-by NRHS matrix.  A check is made to verify that A is nonsingular.
+*> where A is a triangular band matrix of order N, and B is an N-by-NRHS matrix.
+*>
+*> This subroutine verifies that A is nonsingular, but callers should note that only exact
+*> singularity is detected. It is conceivable for one or more diagonal elements of A to be
+*> subnormally tiny numbers without this subroutine signalling an error.
+*>
+*> If a possible loss of numerical precision due to near-singular matrices is a concern, the
+*> caller should verify that A is nonsingular within some tolerance before calling this subroutine.
 *> \endverbatim
 *
 *  Arguments:
@@ -125,7 +129,7 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the i-th diagonal element of A is zero,
+*>          > 0:  if INFO = i, the i-th diagonal element of A is exactly zero,
 *>                indicating that the matrix is singular and the
 *>                solutions X have not been computed.
 *> \endverbatim
@@ -138,11 +142,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tbtrs
 *
 *  =====================================================================
       SUBROUTINE STBTRS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
      $                   LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -186,7 +191,8 @@ SUBROUTINE STBTRS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.
-     $         LSAME( TRANS, 'T' ) .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+     $         LSAME( TRANS, 'T' ) .AND.
+     $                .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -2
       ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
          INFO = -3
@@ -231,7 +237,8 @@ SUBROUTINE STBTRS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
 *     Solve A * X = B  or  A**T * X = B.
 *
       DO 30 J = 1, NRHS
-         CALL STBSV( UPLO, TRANS, DIAG, N, KD, AB, LDAB, B( 1, J ), 1 )
+         CALL STBSV( UPLO, TRANS, DIAG, N, KD, AB, LDAB, B( 1, J ),
+     $               1 )
    30 CONTINUE
 *
       RETURN
diff --git a/SRC/stfsm.f b/SRC/stfsm.f
index fd4e2df808..cb0ecd9136 100644
--- a/SRC/stfsm.f
+++ b/SRC/stfsm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STFSM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stfsm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stfsm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -141,7 +139,8 @@
 *> \param[in] A
 *> \verbatim
 *>          A is REAL array, dimension (NT)
-*>           NT = N*(N+1)/2. On entry, the matrix A in RFP Format.
+*>           NT = N*(N+1)/2 if SIDE='R' and NT = M*(M+1)/2 otherwise.
+*>           On entry, the matrix A in RFP Format.
 *>           RFP Format is described by TRANSR, UPLO and N as follows:
 *>           If TRANSR='N' then RFP A is (0:N,0:K-1) when N is even;
 *>           K=N/2. RFP A is (0:N-1,0:K) when N is odd; K=N/2. If
@@ -182,7 +181,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tfsm
 *
 *> \par Further Details:
 *  =====================
@@ -272,8 +271,10 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
+      SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA,
+     $                  A,
      $                  B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -327,7 +328,8 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
          INFO = -3
       ELSE IF( .NOT.NOTRANS .AND. .NOT.LSAME( TRANS, 'T' ) ) THEN
          INFO = -4
-      ELSE IF( .NOT.LSAME( DIAG, 'N' ) .AND. .NOT.LSAME( DIAG, 'U' ) )
+      ELSE IF( .NOT.LSAME( DIAG, 'N' ) .AND.
+     $         .NOT.LSAME( DIAG, 'U' ) )
      $         THEN
          INFO = -5
       ELSE IF( M.LT.0 ) THEN
@@ -398,12 +400,15 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    TRANS = 'N'
 *
                      IF( M.EQ.1 ) THEN
-                        CALL STRSM( 'L', 'L', 'N', DIAG, M1, N, ALPHA,
+                        CALL STRSM( 'L', 'L', 'N', DIAG, M1, N,
+     $                              ALPHA,
      $                              A, M, B, LDB )
                      ELSE
-                        CALL STRSM( 'L', 'L', 'N', DIAG, M1, N, ALPHA,
+                        CALL STRSM( 'L', 'L', 'N', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M, B, LDB )
-                        CALL SGEMM( 'N', 'N', M2, N, M1, -ONE, A( M1 ),
+                        CALL SGEMM( 'N', 'N', M2, N, M1, -ONE,
+     $                              A( M1 ),
      $                              M, B, LDB, ALPHA, B( M1, 0 ), LDB )
                         CALL STRSM( 'L', 'U', 'T', DIAG, M2, N, ONE,
      $                              A( M ), M, B( M1, 0 ), LDB )
@@ -415,12 +420,15 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    TRANS = 'T'
 *
                      IF( M.EQ.1 ) THEN
-                        CALL STRSM( 'L', 'L', 'T', DIAG, M1, N, ALPHA,
+                        CALL STRSM( 'L', 'L', 'T', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M, B, LDB )
                      ELSE
-                        CALL STRSM( 'L', 'U', 'N', DIAG, M2, N, ALPHA,
+                        CALL STRSM( 'L', 'U', 'N', DIAG, M2, N,
+     $                              ALPHA,
      $                              A( M ), M, B( M1, 0 ), LDB )
-                        CALL SGEMM( 'T', 'N', M1, N, M2, -ONE, A( M1 ),
+                        CALL SGEMM( 'T', 'N', M1, N, M2, -ONE,
+     $                              A( M1 ),
      $                              M, B( M1, 0 ), LDB, ALPHA, B, LDB )
                         CALL STRSM( 'L', 'L', 'T', DIAG, M1, N, ONE,
      $                              A( 0 ), M, B, LDB )
@@ -439,7 +447,8 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL STRSM( 'L', 'L', 'N', DIAG, M1, N, ALPHA,
      $                           A( M2 ), M, B, LDB )
-                     CALL SGEMM( 'T', 'N', M2, N, M1, -ONE, A( 0 ), M,
+                     CALL SGEMM( 'T', 'N', M2, N, M1, -ONE, A( 0 ),
+     $                           M,
      $                           B, LDB, ALPHA, B( M1, 0 ), LDB )
                      CALL STRSM( 'L', 'U', 'T', DIAG, M2, N, ONE,
      $                           A( M1 ), M, B( M1, 0 ), LDB )
@@ -451,7 +460,8 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL STRSM( 'L', 'U', 'N', DIAG, M2, N, ALPHA,
      $                           A( M1 ), M, B( M1, 0 ), LDB )
-                     CALL SGEMM( 'N', 'N', M1, N, M2, -ONE, A( 0 ), M,
+                     CALL SGEMM( 'N', 'N', M1, N, M2, -ONE, A( 0 ),
+     $                           M,
      $                           B( M1, 0 ), LDB, ALPHA, B, LDB )
                      CALL STRSM( 'L', 'L', 'T', DIAG, M1, N, ONE,
      $                           A( M2 ), M, B, LDB )
@@ -474,10 +484,12 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    TRANS = 'N'
 *
                      IF( M.EQ.1 ) THEN
-                        CALL STRSM( 'L', 'U', 'T', DIAG, M1, N, ALPHA,
+                        CALL STRSM( 'L', 'U', 'T', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M1, B, LDB )
                      ELSE
-                        CALL STRSM( 'L', 'U', 'T', DIAG, M1, N, ALPHA,
+                        CALL STRSM( 'L', 'U', 'T', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M1, B, LDB )
                         CALL SGEMM( 'T', 'N', M2, N, M1, -ONE,
      $                              A( M1*M1 ), M1, B, LDB, ALPHA,
@@ -492,10 +504,12 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    TRANS = 'T'
 *
                      IF( M.EQ.1 ) THEN
-                        CALL STRSM( 'L', 'U', 'N', DIAG, M1, N, ALPHA,
+                        CALL STRSM( 'L', 'U', 'N', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M1, B, LDB )
                      ELSE
-                        CALL STRSM( 'L', 'L', 'T', DIAG, M2, N, ALPHA,
+                        CALL STRSM( 'L', 'L', 'T', DIAG, M2, N,
+     $                              ALPHA,
      $                              A( 1 ), M1, B( M1, 0 ), LDB )
                         CALL SGEMM( 'N', 'N', M1, N, M2, -ONE,
      $                              A( M1*M1 ), M1, B( M1, 0 ), LDB,
@@ -517,7 +531,8 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL STRSM( 'L', 'U', 'T', DIAG, M1, N, ALPHA,
      $                           A( M2*M2 ), M2, B, LDB )
-                     CALL SGEMM( 'N', 'N', M2, N, M1, -ONE, A( 0 ), M2,
+                     CALL SGEMM( 'N', 'N', M2, N, M1, -ONE, A( 0 ),
+     $                           M2,
      $                           B, LDB, ALPHA, B( M1, 0 ), LDB )
                      CALL STRSM( 'L', 'L', 'N', DIAG, M2, N, ONE,
      $                           A( M1*M2 ), M2, B( M1, 0 ), LDB )
@@ -529,7 +544,8 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL STRSM( 'L', 'L', 'T', DIAG, M2, N, ALPHA,
      $                           A( M1*M2 ), M2, B( M1, 0 ), LDB )
-                     CALL SGEMM( 'T', 'N', M1, N, M2, -ONE, A( 0 ), M2,
+                     CALL SGEMM( 'T', 'N', M1, N, M2, -ONE, A( 0 ),
+     $                           M2,
      $                           B( M1, 0 ), LDB, ALPHA, B, LDB )
                      CALL STRSM( 'L', 'U', 'N', DIAG, M1, N, ONE,
      $                           A( M2*M2 ), M2, B, LDB )
@@ -589,7 +605,8 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL STRSM( 'L', 'L', 'N', DIAG, K, N, ALPHA,
      $                           A( K+1 ), M+1, B, LDB )
-                     CALL SGEMM( 'T', 'N', K, N, K, -ONE, A( 0 ), M+1,
+                     CALL SGEMM( 'T', 'N', K, N, K, -ONE, A( 0 ),
+     $                           M+1,
      $                           B, LDB, ALPHA, B( K, 0 ), LDB )
                      CALL STRSM( 'L', 'U', 'T', DIAG, K, N, ONE,
      $                           A( K ), M+1, B( K, 0 ), LDB )
@@ -600,7 +617,8 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    and TRANS = 'T'
                      CALL STRSM( 'L', 'U', 'N', DIAG, K, N, ALPHA,
      $                           A( K ), M+1, B( K, 0 ), LDB )
-                     CALL SGEMM( 'N', 'N', K, N, K, -ONE, A( 0 ), M+1,
+                     CALL SGEMM( 'N', 'N', K, N, K, -ONE, A( 0 ),
+     $                           M+1,
      $                           B( K, 0 ), LDB, ALPHA, B, LDB )
                      CALL STRSM( 'L', 'L', 'T', DIAG, K, N, ONE,
      $                           A( K+1 ), M+1, B, LDB )
@@ -656,7 +674,8 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL STRSM( 'L', 'U', 'T', DIAG, K, N, ALPHA,
      $                           A( K*( K+1 ) ), K, B, LDB )
-                     CALL SGEMM( 'N', 'N', K, N, K, -ONE, A( 0 ), K, B,
+                     CALL SGEMM( 'N', 'N', K, N, K, -ONE, A( 0 ), K,
+     $                           B,
      $                           LDB, ALPHA, B( K, 0 ), LDB )
                      CALL STRSM( 'L', 'L', 'N', DIAG, K, N, ONE,
      $                           A( K*K ), K, B( K, 0 ), LDB )
@@ -722,7 +741,8 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL STRSM( 'R', 'U', 'T', DIAG, M, N2, ALPHA,
      $                           A( N ), N, B( 0, N1 ), LDB )
-                     CALL SGEMM( 'N', 'N', M, N1, N2, -ONE, B( 0, N1 ),
+                     CALL SGEMM( 'N', 'N', M, N1, N2, -ONE, B( 0,
+     $                           N1 ),
      $                           LDB, A( N1 ), N, ALPHA, B( 0, 0 ),
      $                           LDB )
                      CALL STRSM( 'R', 'L', 'N', DIAG, M, N1, ONE,
@@ -735,7 +755,8 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL STRSM( 'R', 'L', 'T', DIAG, M, N1, ALPHA,
      $                           A( 0 ), N, B( 0, 0 ), LDB )
-                     CALL SGEMM( 'N', 'T', M, N2, N1, -ONE, B( 0, 0 ),
+                     CALL SGEMM( 'N', 'T', M, N2, N1, -ONE, B( 0,
+     $                           0 ),
      $                           LDB, A( N1 ), N, ALPHA, B( 0, N1 ),
      $                           LDB )
                      CALL STRSM( 'R', 'U', 'N', DIAG, M, N2, ONE,
@@ -754,7 +775,8 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL STRSM( 'R', 'L', 'T', DIAG, M, N1, ALPHA,
      $                           A( N2 ), N, B( 0, 0 ), LDB )
-                     CALL SGEMM( 'N', 'N', M, N2, N1, -ONE, B( 0, 0 ),
+                     CALL SGEMM( 'N', 'N', M, N2, N1, -ONE, B( 0,
+     $                           0 ),
      $                           LDB, A( 0 ), N, ALPHA, B( 0, N1 ),
      $                           LDB )
                      CALL STRSM( 'R', 'U', 'N', DIAG, M, N2, ONE,
@@ -767,7 +789,8 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL STRSM( 'R', 'U', 'T', DIAG, M, N2, ALPHA,
      $                           A( N1 ), N, B( 0, N1 ), LDB )
-                     CALL SGEMM( 'N', 'T', M, N1, N2, -ONE, B( 0, N1 ),
+                     CALL SGEMM( 'N', 'T', M, N1, N2, -ONE, B( 0,
+     $                           N1 ),
      $                           LDB, A( 0 ), N, ALPHA, B( 0, 0 ), LDB )
                      CALL STRSM( 'R', 'L', 'N', DIAG, M, N1, ONE,
      $                           A( N2 ), N, B( 0, 0 ), LDB )
@@ -791,7 +814,8 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL STRSM( 'R', 'L', 'N', DIAG, M, N2, ALPHA,
      $                           A( 1 ), N1, B( 0, N1 ), LDB )
-                     CALL SGEMM( 'N', 'T', M, N1, N2, -ONE, B( 0, N1 ),
+                     CALL SGEMM( 'N', 'T', M, N1, N2, -ONE, B( 0,
+     $                           N1 ),
      $                           LDB, A( N1*N1 ), N1, ALPHA, B( 0, 0 ),
      $                           LDB )
                      CALL STRSM( 'R', 'U', 'T', DIAG, M, N1, ONE,
@@ -804,7 +828,8 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL STRSM( 'R', 'U', 'N', DIAG, M, N1, ALPHA,
      $                           A( 0 ), N1, B( 0, 0 ), LDB )
-                     CALL SGEMM( 'N', 'N', M, N2, N1, -ONE, B( 0, 0 ),
+                     CALL SGEMM( 'N', 'N', M, N2, N1, -ONE, B( 0,
+     $                           0 ),
      $                           LDB, A( N1*N1 ), N1, ALPHA, B( 0, N1 ),
      $                           LDB )
                      CALL STRSM( 'R', 'L', 'T', DIAG, M, N2, ONE,
@@ -823,7 +848,8 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL STRSM( 'R', 'U', 'N', DIAG, M, N1, ALPHA,
      $                           A( N2*N2 ), N2, B( 0, 0 ), LDB )
-                     CALL SGEMM( 'N', 'T', M, N2, N1, -ONE, B( 0, 0 ),
+                     CALL SGEMM( 'N', 'T', M, N2, N1, -ONE, B( 0,
+     $                           0 ),
      $                           LDB, A( 0 ), N2, ALPHA, B( 0, N1 ),
      $                           LDB )
                      CALL STRSM( 'R', 'L', 'T', DIAG, M, N2, ONE,
@@ -836,7 +862,8 @@ SUBROUTINE STFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL STRSM( 'R', 'L', 'N', DIAG, M, N2, ALPHA,
      $                           A( N1*N2 ), N2, B( 0, N1 ), LDB )
-                     CALL SGEMM( 'N', 'N', M, N1, N2, -ONE, B( 0, N1 ),
+                     CALL SGEMM( 'N', 'N', M, N1, N2, -ONE, B( 0,
+     $                           N1 ),
      $                           LDB, A( 0 ), N2, ALPHA, B( 0, 0 ),
      $                           LDB )
                      CALL STRSM( 'R', 'U', 'T', DIAG, M, N1, ONE,
diff --git a/SRC/stftri.f b/SRC/stftri.f
index d02a85b1e2..8278551bad 100644
--- a/SRC/stftri.f
+++ b/SRC/stftri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STFTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stftri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stftri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tftri
 *
 *> \par Further Details:
 *  =====================
@@ -198,6 +196,7 @@
 *>
 *  =====================================================================
       SUBROUTINE STFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -242,7 +241,8 @@ SUBROUTINE STFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
          INFO = -1
       ELSE IF( .NOT.LOWER .AND. .NOT.LSAME( UPLO, 'U' ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.LSAME( DIAG, 'N' ) .AND. .NOT.LSAME( DIAG, 'U' ) )
+      ELSE IF( .NOT.LSAME( DIAG, 'N' ) .AND.
+     $         .NOT.LSAME( DIAG, 'U' ) )
      $         THEN
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
@@ -305,7 +305,8 @@ SUBROUTINE STFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
      $            INFO = INFO + N1
                IF( INFO.GT.0 )
      $            RETURN
-               CALL STRMM( 'L', 'U', 'T', DIAG, N2, N1, ONE, A( N ), N,
+               CALL STRMM( 'L', 'U', 'T', DIAG, N2, N1, ONE, A( N ),
+     $                     N,
      $                     A( N1 ), N )
 *
             ELSE
@@ -317,7 +318,8 @@ SUBROUTINE STFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
                CALL STRTRI( 'L', DIAG, N1, A( N2 ), N, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL STRMM( 'L', 'L', 'T', DIAG, N1, N2, -ONE, A( N2 ),
+               CALL STRMM( 'L', 'L', 'T', DIAG, N1, N2, -ONE,
+     $                     A( N2 ),
      $                     N, A( 0 ), N )
                CALL STRTRI( 'U', DIAG, N2, A( N1 ), N, INFO )
                IF( INFO.GT.0 )
@@ -396,7 +398,8 @@ SUBROUTINE STFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
      $            INFO = INFO + K
                IF( INFO.GT.0 )
      $            RETURN
-               CALL STRMM( 'L', 'U', 'T', DIAG, K, K, ONE, A( 0 ), N+1,
+               CALL STRMM( 'L', 'U', 'T', DIAG, K, K, ONE, A( 0 ),
+     $                     N+1,
      $                     A( K+1 ), N+1 )
 *
             ELSE
@@ -415,7 +418,8 @@ SUBROUTINE STFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
      $            INFO = INFO + K
                IF( INFO.GT.0 )
      $            RETURN
-               CALL STRMM( 'R', 'U', 'N', DIAG, K, K, ONE, A( K ), N+1,
+               CALL STRMM( 'R', 'U', 'N', DIAG, K, K, ONE, A( K ),
+     $                     N+1,
      $                     A( 0 ), N+1 )
             END IF
          ELSE
@@ -431,7 +435,8 @@ SUBROUTINE STFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
                CALL STRTRI( 'U', DIAG, K, A( K ), K, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL STRMM( 'L', 'U', 'N', DIAG, K, K, -ONE, A( K ), K,
+               CALL STRMM( 'L', 'U', 'N', DIAG, K, K, -ONE, A( K ),
+     $                     K,
      $                     A( K*( K+1 ) ), K )
                CALL STRTRI( 'L', DIAG, K, A( 0 ), K, INFO )
                IF( INFO.GT.0 )
@@ -456,7 +461,8 @@ SUBROUTINE STFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
      $            INFO = INFO + K
                IF( INFO.GT.0 )
      $            RETURN
-               CALL STRMM( 'L', 'L', 'N', DIAG, K, K, ONE, A( K*K ), K,
+               CALL STRMM( 'L', 'L', 'N', DIAG, K, K, ONE, A( K*K ),
+     $                     K,
      $                     A( 0 ), K )
             END IF
          END IF
diff --git a/SRC/stfttp.f b/SRC/stfttp.f
index 1ae028cedd..f43f12eaac 100644
--- a/SRC/stfttp.f
+++ b/SRC/stfttp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STFTTP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stfttp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stfttp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -93,7 +91,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tfttp
 *
 *> \par Further Details:
 *  =====================
@@ -184,6 +182,7 @@
 *>
 *  =====================================================================
       SUBROUTINE STFTTP( TRANSR, UPLO, N, ARF, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/stfttr.f b/SRC/stfttr.f
index 219da39cda..a1cea97315 100644
--- a/SRC/stfttr.f
+++ b/SRC/stfttr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STFTTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stfttr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stfttr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,7 +100,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tfttr
 *
 *> \par Further Details:
 *  =====================
@@ -193,6 +191,7 @@
 *
 *  =====================================================================
       SUBROUTINE STFTTR( TRANSR, UPLO, N, ARF, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/stgevc.f b/SRC/stgevc.f
index 15fc88c4b4..f29e6c304c 100644
--- a/SRC/stgevc.f
+++ b/SRC/stgevc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STGEVC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stgevc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stgevc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -52,7 +50,7 @@
 *>
 *>    S*x = w*P*x,  (y**H)*S = w*(y**H)*P,
 *>
-*> where y**H denotes the conjugate tranpose of y.
+*> where y**H denotes the conjugate transpose of y.
 *> The eigenvalues are not input to this routine, but are computed
 *> directly from the diagonal blocks of S and P.
 *>
@@ -228,7 +226,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup tgevc
 *
 *> \par Further Details:
 *  =====================
@@ -292,6 +290,7 @@
 *  =====================================================================
       SUBROUTINE STGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
      $                   LDVL, VR, LDVR, MM, M, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -337,7 +336,8 @@ SUBROUTINE STGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
       EXTERNAL           LSAME, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMV, SLABAD, SLACPY, SLAG2, SLALN2, XERBLA
+      EXTERNAL           SGEMV, SLACPY, SLAG2, SLALN2,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN
@@ -463,11 +463,10 @@ SUBROUTINE STGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
 *
       SAFMIN = SLAMCH( 'Safe minimum' )
       BIG = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, BIG )
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
-      SMALL = SAFMIN*N / ULP
+      SMALL = SAFMIN*REAL( N ) / ULP
       BIG = ONE / SMALL
-      BIGNUM = ONE / ( SAFMIN*N )
+      BIGNUM = ONE / ( SAFMIN*REAL( N ) )
 *
 *     Compute the 1-norm of each column of the strictly upper triangular
 *     part (i.e., excluding all elements belonging to the diagonal
@@ -765,7 +764,8 @@ SUBROUTINE STGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
 *              Solve  ( a A - b B )  y = SUM(,)
 *              with scaling and perturbation of the denominator
 *
-               CALL SLALN2( .TRUE., NA, NW, DMIN, ACOEF, S( J, J ), LDS,
+               CALL SLALN2( .TRUE., NA, NW, DMIN, ACOEF, S( J, J ),
+     $                      LDS,
      $                      BDIAG( 1 ), BDIAG( 2 ), SUM, 2, BCOEFR,
      $                      BCOEFI, WORK( 2*N+J ), N, SCALE, TEMP,
      $                      IINFO )
@@ -791,11 +791,13 @@ SUBROUTINE STGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
      $                        WORK( ( JW+2 )*N+JE ), 1, ZERO,
      $                        WORK( ( JW+4 )*N+1 ), 1 )
   170          CONTINUE
-               CALL SLACPY( ' ', N, NW, WORK( 4*N+1 ), N, VL( 1, JE ),
+               CALL SLACPY( ' ', N, NW, WORK( 4*N+1 ), N, VL( 1,
+     $                      JE ),
      $                      LDVL )
                IBEG = 1
             ELSE
-               CALL SLACPY( ' ', N, NW, WORK( 2*N+1 ), N, VL( 1, IEIG ),
+               CALL SLACPY( ' ', N, NW, WORK( 2*N+1 ), N, VL( 1,
+     $                      IEIG ),
      $                      LDVL )
                IBEG = JE
             END IF
@@ -954,7 +956,8 @@ SUBROUTINE STGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
 *
 *              Complex eigenvalue
 *
-               CALL SLAG2( S( JE-1, JE-1 ), LDS, P( JE-1, JE-1 ), LDP,
+               CALL SLAG2( S( JE-1, JE-1 ), LDS, P( JE-1, JE-1 ),
+     $                     LDP,
      $                     SAFMIN*SAFETY, ACOEF, TEMP, BCOEFR, TEMP2,
      $                     BCOEFI )
                IF( BCOEFI.EQ.ZERO ) THEN
diff --git a/SRC/stgex2.f b/SRC/stgex2.f
index d61da2327a..d6a11841d7 100644
--- a/SRC/stgex2.f
+++ b/SRC/stgex2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STGEX2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stgex2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stgex2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -181,7 +179,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEauxiliary
+*> \ingroup tgex2
 *
 *> \par Further Details:
 *  =====================
@@ -218,6 +216,7 @@
 *  =====================================================================
       SUBROUTINE STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
      $                   LDZ, J1, N1, N2, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -255,7 +254,7 @@ SUBROUTINE STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
      $                   THRESHA, THRESHB
 *     ..
 *     .. Local Arrays ..
-      INTEGER            IWORK( LDST )
+      INTEGER            IWORK( LDST + 2 )
       REAL               AI( 2 ), AR( 2 ), BE( 2 ), IR( LDST, LDST ),
      $                   IRCOP( LDST, LDST ), LI( LDST, LDST ),
      $                   LICOP( LDST, LDST ), S( LDST, LDST ),
@@ -267,7 +266,8 @@ SUBROUTINE STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
       EXTERNAL           SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMM, SGEQR2, SGERQ2, SLACPY, SLAGV2, SLARTG,
+      EXTERNAL           SGEMM, SGEQR2, SGERQ2, SLACPY, SLAGV2,
+     $                   SLARTG,
      $                   SLASET, SLASSQ, SORG2R, SORGR2, SORM2R, SORMR2,
      $                   SROT, SSCAL, STGSY2
 *     ..
@@ -287,7 +287,7 @@ SUBROUTINE STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
       M = N1 + N2
       IF( LWORK.LT.MAX( N*M, M*M*2 ) ) THEN
          INFO = -16
-         WORK( 1 ) = MAX( N*M, M*M*2 )
+         WORK( 1 ) = REAL( MAX( N*M, M*M*2 ) )
          RETURN
       END IF
 *
@@ -346,10 +346,12 @@ SUBROUTINE STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
          CALL SROT( 2, T( 1, 1 ), 1, T( 1, 2 ), 1, IR( 1, 1 ),
      $              IR( 2, 1 ) )
          IF( SA.GE.SB ) THEN
-            CALL SLARTG( S( 1, 1 ), S( 2, 1 ), LI( 1, 1 ), LI( 2, 1 ),
+            CALL SLARTG( S( 1, 1 ), S( 2, 1 ), LI( 1, 1 ), LI( 2,
+     $                   1 ),
      $                   DDUM )
          ELSE
-            CALL SLARTG( T( 1, 1 ), T( 2, 1 ), LI( 1, 1 ), LI( 2, 1 ),
+            CALL SLARTG( T( 1, 1 ), T( 2, 1 ), LI( 1, 1 ), LI( 2,
+     $                   1 ),
      $                   DDUM )
          END IF
          CALL SROT( 2, S( 1, 1 ), LDST, S( 2, 1 ), LDST, LI( 1, 1 ),
@@ -374,22 +376,28 @@ SUBROUTINE STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *               and
 *               F-norm((B-QL**H*T*QR)) <= O(EPS*F-norm((B)))
 *
-            CALL SLACPY( 'Full', M, M, A( J1, J1 ), LDA, WORK( M*M+1 ),
+            CALL SLACPY( 'Full', M, M, A( J1, J1 ), LDA,
+     $                   WORK( M*M+1 ),
      $                   M )
-            CALL SGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, S, LDST, ZERO,
+            CALL SGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, S, LDST,
+     $                  ZERO,
      $                  WORK, M )
-            CALL SGEMM( 'N', 'T', M, M, M, -ONE, WORK, M, IR, LDST, ONE,
+            CALL SGEMM( 'N', 'T', M, M, M, -ONE, WORK, M, IR, LDST,
+     $                  ONE,
      $                  WORK( M*M+1 ), M )
             DSCALE = ZERO
             DSUM = ONE
             CALL SLASSQ( M*M, WORK( M*M+1 ), 1, DSCALE, DSUM )
             SA = DSCALE*SQRT( DSUM )
 *
-            CALL SLACPY( 'Full', M, M, B( J1, J1 ), LDB, WORK( M*M+1 ),
+            CALL SLACPY( 'Full', M, M, B( J1, J1 ), LDB,
+     $                   WORK( M*M+1 ),
      $                   M )
-            CALL SGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, T, LDST, ZERO,
+            CALL SGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, T, LDST,
+     $                  ZERO,
      $                  WORK, M )
-            CALL SGEMM( 'N', 'T', M, M, M, -ONE, WORK, M, IR, LDST, ONE,
+            CALL SGEMM( 'N', 'T', M, M, M, -ONE, WORK, M, IR, LDST,
+     $                  ONE,
      $                  WORK( M*M+1 ), M )
             DSCALE = ZERO
             DSUM = ONE
@@ -489,11 +497,13 @@ SUBROUTINE STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
          CALL SGEMM( 'T', 'N', M, M, M, ONE, LI, LDST, S, LDST, ZERO,
      $               WORK, M )
-         CALL SGEMM( 'N', 'T', M, M, M, ONE, WORK, M, IR, LDST, ZERO, S,
+         CALL SGEMM( 'N', 'T', M, M, M, ONE, WORK, M, IR, LDST, ZERO,
+     $               S,
      $               LDST )
          CALL SGEMM( 'T', 'N', M, M, M, ONE, LI, LDST, T, LDST, ZERO,
      $               WORK, M )
-         CALL SGEMM( 'N', 'T', M, M, M, ONE, WORK, M, IR, LDST, ZERO, T,
+         CALL SGEMM( 'N', 'T', M, M, M, ONE, WORK, M, IR, LDST, ZERO,
+     $               T,
      $               LDST )
          CALL SLACPY( 'F', M, M, S, LDST, SCPY, LDST )
          CALL SLACPY( 'F', M, M, T, LDST, TCPY, LDST )
@@ -506,11 +516,13 @@ SUBROUTINE STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
          CALL SGERQ2( M, M, T, LDST, TAUR, WORK, LINFO )
          IF( LINFO.NE.0 )
      $      GO TO 70
-         CALL SORMR2( 'R', 'T', M, M, M, T, LDST, TAUR, S, LDST, WORK,
+         CALL SORMR2( 'R', 'T', M, M, M, T, LDST, TAUR, S, LDST,
+     $                WORK,
      $                LINFO )
          IF( LINFO.NE.0 )
      $      GO TO 70
-         CALL SORMR2( 'L', 'N', M, M, M, T, LDST, TAUR, IR, LDST, WORK,
+         CALL SORMR2( 'L', 'N', M, M, M, T, LDST, TAUR, IR, LDST,
+     $                WORK,
      $                LINFO )
          IF( LINFO.NE.0 )
      $      GO TO 70
@@ -530,9 +542,11 @@ SUBROUTINE STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
          CALL SGEQR2( M, M, TCPY, LDST, TAUL, WORK, LINFO )
          IF( LINFO.NE.0 )
      $      GO TO 70
-         CALL SORM2R( 'L', 'T', M, M, M, TCPY, LDST, TAUL, SCPY, LDST,
+         CALL SORM2R( 'L', 'T', M, M, M, TCPY, LDST, TAUL, SCPY,
+     $                LDST,
      $                WORK, INFO )
-         CALL SORM2R( 'R', 'N', M, M, M, TCPY, LDST, TAUL, LICOP, LDST,
+         CALL SORM2R( 'R', 'N', M, M, M, TCPY, LDST, TAUL, LICOP,
+     $                LDST,
      $                WORK, INFO )
          IF( LINFO.NE.0 )
      $      GO TO 70
@@ -570,22 +584,28 @@ SUBROUTINE STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *               and
 *               F-norm((B-QL**H*T*QR)) <= O(EPS*F-norm((B)))
 *
-            CALL SLACPY( 'Full', M, M, A( J1, J1 ), LDA, WORK( M*M+1 ),
+            CALL SLACPY( 'Full', M, M, A( J1, J1 ), LDA,
+     $                   WORK( M*M+1 ),
      $                   M )
-            CALL SGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, S, LDST, ZERO,
+            CALL SGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, S, LDST,
+     $                  ZERO,
      $                  WORK, M )
-            CALL SGEMM( 'N', 'N', M, M, M, -ONE, WORK, M, IR, LDST, ONE,
+            CALL SGEMM( 'N', 'N', M, M, M, -ONE, WORK, M, IR, LDST,
+     $                  ONE,
      $                  WORK( M*M+1 ), M )
             DSCALE = ZERO
             DSUM = ONE
             CALL SLASSQ( M*M, WORK( M*M+1 ), 1, DSCALE, DSUM )
             SA = DSCALE*SQRT( DSUM )
 *
-            CALL SLACPY( 'Full', M, M, B( J1, J1 ), LDB, WORK( M*M+1 ),
+            CALL SLACPY( 'Full', M, M, B( J1, J1 ), LDB,
+     $                   WORK( M*M+1 ),
      $                   M )
-            CALL SGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, T, LDST, ZERO,
+            CALL SGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, T, LDST,
+     $                  ZERO,
      $                  WORK, M )
-            CALL SGEMM( 'N', 'N', M, M, M, -ONE, WORK, M, IR, LDST, ONE,
+            CALL SGEMM( 'N', 'N', M, M, M, -ONE, WORK, M, IR, LDST,
+     $                  ONE,
      $                  WORK( M*M+1 ), M )
             DSCALE = ZERO
             DSUM = ONE
@@ -615,7 +635,8 @@ SUBROUTINE STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
          T( 1, 1 ) = ONE
          IDUM = LWORK - M*M - 2
          IF( N2.GT.1 ) THEN
-            CALL SLAGV2( A( J1, J1 ), LDA, B( J1, J1 ), LDB, AR, AI, BE,
+            CALL SLAGV2( A( J1, J1 ), LDA, B( J1, J1 ), LDB, AR, AI,
+     $                   BE,
      $                   WORK( 1 ), WORK( 2 ), T( 1, 1 ), T( 2, 1 ) )
             WORK( M+1 ) = -WORK( 2 )
             WORK( M+2 ) = WORK( 1 )
@@ -626,7 +647,8 @@ SUBROUTINE STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
          T( M, M ) = ONE
 *
          IF( N1.GT.1 ) THEN
-            CALL SLAGV2( A( J1+N2, J1+N2 ), LDA, B( J1+N2, J1+N2 ), LDB,
+            CALL SLAGV2( A( J1+N2, J1+N2 ), LDA, B( J1+N2, J1+N2 ),
+     $                   LDB,
      $                   TAUR, TAUL, WORK( M*M+1 ), WORK( N2*M+N2+1 ),
      $                   WORK( N2*M+N2+2 ), T( N2+1, N2+1 ),
      $                   T( M, M-1 ) )
@@ -635,13 +657,17 @@ SUBROUTINE STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
             T( M, M ) = T( N2+1, N2+1 )
             T( M-1, M ) = -T( M, M-1 )
          END IF
-         CALL SGEMM( 'T', 'N', N2, N1, N2, ONE, WORK, M, A( J1, J1+N2 ),
+         CALL SGEMM( 'T', 'N', N2, N1, N2, ONE, WORK, M, A( J1,
+     $               J1+N2 ),
      $               LDA, ZERO, WORK( M*M+1 ), N2 )
-         CALL SLACPY( 'Full', N2, N1, WORK( M*M+1 ), N2, A( J1, J1+N2 ),
+         CALL SLACPY( 'Full', N2, N1, WORK( M*M+1 ), N2, A( J1,
+     $                J1+N2 ),
      $                LDA )
-         CALL SGEMM( 'T', 'N', N2, N1, N2, ONE, WORK, M, B( J1, J1+N2 ),
+         CALL SGEMM( 'T', 'N', N2, N1, N2, ONE, WORK, M, B( J1,
+     $               J1+N2 ),
      $               LDB, ZERO, WORK( M*M+1 ), N2 )
-         CALL SLACPY( 'Full', N2, N1, WORK( M*M+1 ), N2, B( J1, J1+N2 ),
+         CALL SLACPY( 'Full', N2, N1, WORK( M*M+1 ), N2, B( J1,
+     $                J1+N2 ),
      $                LDB )
          CALL SGEMM( 'N', 'N', M, M, M, ONE, LI, LDST, WORK, M, ZERO,
      $               WORK( M*M+1 ), M )
diff --git a/SRC/stgexc.f b/SRC/stgexc.f
index d1ad799366..2df76b459a 100644
--- a/SRC/stgexc.f
+++ b/SRC/stgexc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STGEXC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stgexc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stgexc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -195,7 +193,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realGEcomputational
+*> \ingroup tgexc
 *
 *> \par Contributors:
 *  ==================
@@ -217,6 +215,7 @@
 *  =====================================================================
       SUBROUTINE STGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
      $                   LDZ, IFST, ILST, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -241,6 +240,10 @@ SUBROUTINE STGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
       LOGICAL            LQUERY
       INTEGER            HERE, LWMIN, NBF, NBL, NBNEXT
 *     ..
+*     .. External Functions ..
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           SROUNDUP_LWORK
+*     ..
 *     .. External Subroutines ..
       EXTERNAL           STGEX2, XERBLA
 *     ..
@@ -275,7 +278,7 @@ SUBROUTINE STGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
          ELSE
             LWMIN = 4*N + 16
          END IF
-         WORK(1) = LWMIN
+         WORK(1) = REAL( LWMIN )
 *
          IF (LWORK.LT.LWMIN .AND. .NOT.LQUERY) THEN
             INFO = -15
@@ -381,7 +384,8 @@ SUBROUTINE STGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
 *              Swap two 1-by-1 blocks.
 *
-               CALL STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
+               CALL STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+     $                      Z,
      $                      LDZ, HERE, 1, 1, WORK, LWORK, INFO )
                IF( INFO.NE.0 ) THEN
                   ILST = HERE
@@ -399,7 +403,8 @@ SUBROUTINE STGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
 *                 2-by-2 block did not split.
 *
-                  CALL STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+                  CALL STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q,
+     $                         LDQ,
      $                         Z, LDZ, HERE, 1, NBNEXT, WORK, LWORK,
      $                         INFO )
                   IF( INFO.NE.0 ) THEN
@@ -411,14 +416,16 @@ SUBROUTINE STGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
 *                 2-by-2 block did split.
 *
-                  CALL STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+                  CALL STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q,
+     $                         LDQ,
      $                         Z, LDZ, HERE, 1, 1, WORK, LWORK, INFO )
                   IF( INFO.NE.0 ) THEN
                      ILST = HERE
                      RETURN
                   END IF
                   HERE = HERE + 1
-                  CALL STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+                  CALL STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q,
+     $                         LDQ,
      $                         Z, LDZ, HERE, 1, 1, WORK, LWORK, INFO )
                   IF( INFO.NE.0 ) THEN
                      ILST = HERE
@@ -484,7 +491,8 @@ SUBROUTINE STGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
 *              Swap two 1-by-1 blocks.
 *
-               CALL STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
+               CALL STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+     $                      Z,
      $                      LDZ, HERE, NBNEXT, 1, WORK, LWORK, INFO )
                IF( INFO.NE.0 ) THEN
                   ILST = HERE
@@ -501,7 +509,8 @@ SUBROUTINE STGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
 *                 2-by-2 block did not split.
 *
-                  CALL STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+                  CALL STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q,
+     $                         LDQ,
      $                         Z, LDZ, HERE-1, 2, 1, WORK, LWORK, INFO )
                   IF( INFO.NE.0 ) THEN
                      ILST = HERE
@@ -512,14 +521,16 @@ SUBROUTINE STGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
 *                 2-by-2 block did split.
 *
-                  CALL STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+                  CALL STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q,
+     $                         LDQ,
      $                         Z, LDZ, HERE, 1, 1, WORK, LWORK, INFO )
                   IF( INFO.NE.0 ) THEN
                      ILST = HERE
                      RETURN
                   END IF
                   HERE = HERE - 1
-                  CALL STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+                  CALL STGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q,
+     $                         LDQ,
      $                         Z, LDZ, HERE, 1, 1, WORK, LWORK, INFO )
                   IF( INFO.NE.0 ) THEN
                      ILST = HERE
@@ -533,7 +544,7 @@ SUBROUTINE STGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
      $      GO TO 20
       END IF
       ILST = HERE
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       RETURN
 *
 *     End of STGEXC
diff --git a/SRC/stgsen.f b/SRC/stgsen.f
index f1103d7400..c391f40dcb 100644
--- a/SRC/stgsen.f
+++ b/SRC/stgsen.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STGSEN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stgsen.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stgsen.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -304,7 +302,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tgsen
 *
 *> \par Further Details:
 *  =====================
@@ -445,9 +443,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE STGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
+      SUBROUTINE STGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B,
+     $                   LDB,
      $                   ALPHAR, ALPHAI, BETA, Q, LDQ, Z, LDZ, M, PL,
      $                   PR, DIF, WORK, LWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -486,12 +486,13 @@ SUBROUTINE STGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLACN2, SLACPY, SLAG2, SLASSQ, STGEXC, STGSYL,
+      EXTERNAL           SLACN2, SLACPY, SLAG2, SLASSQ, STGEXC,
+     $                   STGSYL,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
-      REAL               SLAMCH
-      EXTERNAL           SLAMCH
+      REAL               SLAMCH, SROUNDUP_LWORK
+      EXTERNAL           SLAMCH, SROUNDUP_LWORK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SIGN, SQRT
@@ -571,7 +572,7 @@ SUBROUTINE STGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
          LIWMIN = 1
       END IF
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       IWORK( 1 ) = LIWMIN
 *
       IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -634,7 +635,8 @@ SUBROUTINE STGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
                KK = K
                IF( K.NE.KS )
-     $            CALL STGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+     $            CALL STGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q,
+     $                         LDQ,
      $                         Z, LDZ, KK, KS, WORK, LWORK, IERR )
 *
                IF( IERR.GT.0 ) THEN
@@ -668,7 +670,8 @@ SUBROUTINE STGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
          I = N1 + 1
          IJB = 0
          CALL SLACPY( 'Full', N1, N2, A( 1, I ), LDA, WORK, N1 )
-         CALL SLACPY( 'Full', N1, N2, B( 1, I ), LDB, WORK( N1*N2+1 ),
+         CALL SLACPY( 'Full', N1, N2, B( 1, I ), LDB,
+     $                WORK( N1*N2+1 ),
      $                N1 )
          CALL STGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA, WORK,
      $                N1, B, LDB, B( I, I ), LDB, WORK( N1*N2+1 ), N1,
@@ -710,14 +713,16 @@ SUBROUTINE STGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *           Frobenius norm-based Difu-estimate.
 *
-            CALL STGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA, WORK,
+            CALL STGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA,
+     $                   WORK,
      $                   N1, B, LDB, B( I, I ), LDB, WORK( N1*N2+1 ),
      $                   N1, DSCALE, DIF( 1 ), WORK( 2*N1*N2+1 ),
      $                   LWORK-2*N1*N2, IWORK, IERR )
 *
 *           Frobenius norm-based Difl-estimate.
 *
-            CALL STGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A, LDA, WORK,
+            CALL STGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A, LDA,
+     $                   WORK,
      $                   N2, B( I, I ), LDB, B, LDB, WORK( N1*N2+1 ),
      $                   N2, DSCALE, DIF( 2 ), WORK( 2*N1*N2+1 ),
      $                   LWORK-2*N1*N2, IWORK, IERR )
@@ -746,7 +751,8 @@ SUBROUTINE STGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *                 Solve generalized Sylvester equation.
 *
-                  CALL STGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA,
+                  CALL STGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ),
+     $                         LDA,
      $                         WORK, N1, B, LDB, B( I, I ), LDB,
      $                         WORK( N1*N2+1 ), N1, DSCALE, DIF( 1 ),
      $                         WORK( 2*N1*N2+1 ), LWORK-2*N1*N2, IWORK,
@@ -755,7 +761,8 @@ SUBROUTINE STGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *                 Solve the transposed variant.
 *
-                  CALL STGSYL( 'T', IJB, N1, N2, A, LDA, A( I, I ), LDA,
+                  CALL STGSYL( 'T', IJB, N1, N2, A, LDA, A( I, I ),
+     $                         LDA,
      $                         WORK, N1, B, LDB, B( I, I ), LDB,
      $                         WORK( N1*N2+1 ), N1, DSCALE, DIF( 1 ),
      $                         WORK( 2*N1*N2+1 ), LWORK-2*N1*N2, IWORK,
@@ -775,7 +782,8 @@ SUBROUTINE STGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *                 Solve generalized Sylvester equation.
 *
-                  CALL STGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A, LDA,
+                  CALL STGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A,
+     $                         LDA,
      $                         WORK, N2, B( I, I ), LDB, B, LDB,
      $                         WORK( N1*N2+1 ), N2, DSCALE, DIF( 2 ),
      $                         WORK( 2*N1*N2+1 ), LWORK-2*N1*N2, IWORK,
@@ -784,7 +792,8 @@ SUBROUTINE STGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *                 Solve the transposed variant.
 *
-                  CALL STGSYL( 'T', IJB, N2, N1, A( I, I ), LDA, A, LDA,
+                  CALL STGSYL( 'T', IJB, N2, N1, A( I, I ), LDA, A,
+     $                         LDA,
      $                         WORK, N2, B( I, I ), LDB, B, LDB,
      $                         WORK( N1*N2+1 ), N2, DSCALE, DIF( 2 ),
      $                         WORK( 2*N1*N2+1 ), LWORK-2*N1*N2, IWORK,
@@ -826,7 +835,8 @@ SUBROUTINE STGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
                WORK( 6 ) = B( K+1, K )
                WORK( 7 ) = B( K, K+1 )
                WORK( 8 ) = B( K+1, K+1 )
-               CALL SLAG2( WORK, 2, WORK( 5 ), 2, SMLNUM*EPS, BETA( K ),
+               CALL SLAG2( WORK, 2, WORK( 5 ), 2, SMLNUM*EPS,
+     $                     BETA( K ),
      $                     BETA( K+1 ), ALPHAR( K ), ALPHAR( K+1 ),
      $                     ALPHAI( K ) )
                ALPHAI( K+1 ) = -ALPHAI( K )
@@ -852,7 +862,7 @@ SUBROUTINE STGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
          END IF
    70 CONTINUE
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/stgsja.f b/SRC/stgsja.f
index 5a81b7e4fd..f51267da20 100644
--- a/SRC/stgsja.f
+++ b/SRC/stgsja.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STGSJA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stgsja.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stgsja.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -350,7 +348,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tgsja
 *
 *> \par Further Details:
 *  =====================
@@ -375,6 +373,7 @@
       SUBROUTINE STGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
      $                   LDB, TOLA, TOLB, ALPHA, BETA, U, LDU, V, LDV,
      $                   Q, LDQ, WORK, NCYCLE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -412,7 +411,8 @@ SUBROUTINE STGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLAGS2, SLAPLL, SLARTG, SLASET, SROT,
+      EXTERNAL           SCOPY, SLAGS2, SLAPLL, SLARTG, SLASET,
+     $                   SROT,
      $                   SSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -435,9 +435,13 @@ SUBROUTINE STGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
       INFO = 0
       IF( .NOT.( INITU .OR. WANTU .OR. LSAME( JOBU, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.( INITV .OR. WANTV .OR. LSAME( JOBV, 'N' ) ) ) THEN
+      ELSE IF( .NOT.( INITV .OR.
+     $         WANTV .OR.
+     $         LSAME( JOBV, 'N' ) ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.( INITQ .OR. WANTQ .OR. LSAME( JOBQ, 'N' ) ) ) THEN
+      ELSE IF( .NOT.( INITQ .OR.
+     $         WANTQ .OR.
+     $         LSAME( JOBQ, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( M.LT.0 ) THEN
          INFO = -4
@@ -507,7 +511,8 @@ SUBROUTINE STGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
 *              Update (K+I)-th and (K+J)-th rows of matrix A: U**T *A
 *
                IF( K+J.LE.M )
-     $            CALL SROT( L, A( K+J, N-L+1 ), LDA, A( K+I, N-L+1 ),
+     $            CALL SROT( L, A( K+J, N-L+1 ), LDA, A( K+I,
+     $                       N-L+1 ),
      $                       LDA, CSU, SNU )
 *
 *              Update I-th and J-th rows of matrix B: V**T *B
@@ -541,10 +546,12 @@ SUBROUTINE STGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
      $                       SNU )
 *
                IF( WANTV )
-     $            CALL SROT( P, V( 1, J ), 1, V( 1, I ), 1, CSV, SNV )
+     $            CALL SROT( P, V( 1, J ), 1, V( 1, I ), 1, CSV,
+     $                       SNV )
 *
                IF( WANTQ )
-     $            CALL SROT( N, Q( 1, N-L+J ), 1, Q( 1, N-L+I ), 1, CSQ,
+     $            CALL SROT( N, Q( 1, N-L+J ), 1, Q( 1, N-L+I ), 1,
+     $                       CSQ,
      $                       SNQ )
 *
    10       CONTINUE
@@ -561,7 +568,8 @@ SUBROUTINE STGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
             ERROR = ZERO
             DO 30 I = 1, MIN( L, M-K )
                CALL SCOPY( L-I+1, A( K+I, N-L+I ), LDA, WORK, 1 )
-               CALL SCOPY( L-I+1, B( I, N-L+I ), LDB, WORK( L+1 ), 1 )
+               CALL SCOPY( L-I+1, B( I, N-L+I ), LDB, WORK( L+1 ),
+     $                     1 )
                CALL SLAPLL( L-I+1, WORK, 1, WORK( L+1 ), 1, SSMIN )
                ERROR = MAX( ERROR, SSMIN )
    30       CONTINUE
@@ -606,16 +614,19 @@ SUBROUTINE STGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
      $            CALL SSCAL( P, -ONE, V( 1, I ), 1 )
             END IF
 *
-            CALL SLARTG( ABS( GAMMA ), ONE, BETA( K+I ), ALPHA( K+I ),
+            CALL SLARTG( ABS( GAMMA ), ONE, BETA( K+I ),
+     $                   ALPHA( K+I ),
      $                   RWK )
 *
             IF( ALPHA( K+I ).GE.BETA( K+I ) ) THEN
-               CALL SSCAL( L-I+1, ONE / ALPHA( K+I ), A( K+I, N-L+I ),
+               CALL SSCAL( L-I+1, ONE / ALPHA( K+I ), A( K+I,
+     $                     N-L+I ),
      $                     LDA )
             ELSE
                CALL SSCAL( L-I+1, ONE / BETA( K+I ), B( I, N-L+I ),
      $                     LDB )
-               CALL SCOPY( L-I+1, B( I, N-L+I ), LDB, A( K+I, N-L+I ),
+               CALL SCOPY( L-I+1, B( I, N-L+I ), LDB, A( K+I,
+     $                     N-L+I ),
      $                     LDA )
             END IF
 *
diff --git a/SRC/stgsna.f b/SRC/stgsna.f
index 40f822915f..80ec384065 100644
--- a/SRC/stgsna.f
+++ b/SRC/stgsna.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STGSNA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stgsna.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stgsna.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -230,7 +228,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tgsna
 *
 *> \par Further Details:
 *  =====================
@@ -378,6 +376,7 @@
       SUBROUTINE STGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
      $                   LDVL, VR, LDVR, S, DIF, MM, M, WORK, LWORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -416,11 +415,15 @@ SUBROUTINE STGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               SDOT, SLAMCH, SLAPY2, SNRM2
-      EXTERNAL           LSAME, SDOT, SLAMCH, SLAPY2, SNRM2
+      REAL               SDOT, SLAMCH, SLAPY2,
+     $                   SNRM2, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SDOT, SLAMCH,
+     $                   SLAPY2, SNRM2,
+     $                   SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMV, SLACPY, SLAG2, STGEXC, STGSYL, XERBLA
+      EXTERNAL           SGEMV, SLACPY, SLAG2,
+     $                   STGEXC, STGSYL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN, SQRT
@@ -490,7 +493,7 @@ SUBROUTINE STGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
          ELSE
             LWMIN = N
          END IF
-         WORK( 1 ) = LWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
 *
          IF( MM.LT.M ) THEN
             INFO = -15
@@ -558,7 +561,8 @@ SUBROUTINE STGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
      $                SNRM2( N, VR( 1, KS+1 ), 1 ) )
                LNRM = SLAPY2( SNRM2( N, VL( 1, KS ), 1 ),
      $                SNRM2( N, VL( 1, KS+1 ), 1 ) )
-               CALL SGEMV( 'N', N, N, ONE, A, LDA, VR( 1, KS ), 1, ZERO,
+               CALL SGEMV( 'N', N, N, ONE, A, LDA, VR( 1, KS ), 1,
+     $                     ZERO,
      $                     WORK, 1 )
                TMPRR = SDOT( N, WORK, 1, VL( 1, KS ), 1 )
                TMPRI = SDOT( N, WORK, 1, VL( 1, KS+1 ), 1 )
@@ -568,7 +572,8 @@ SUBROUTINE STGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
                TMPIR = SDOT( N, WORK, 1, VL( 1, KS ), 1 )
                UHAV = TMPRR + TMPII
                UHAVI = TMPIR - TMPRI
-               CALL SGEMV( 'N', N, N, ONE, B, LDB, VR( 1, KS ), 1, ZERO,
+               CALL SGEMV( 'N', N, N, ONE, B, LDB, VR( 1, KS ), 1,
+     $                     ZERO,
      $                     WORK, 1 )
                TMPRR = SDOT( N, WORK, 1, VL( 1, KS ), 1 )
                TMPRI = SDOT( N, WORK, 1, VL( 1, KS+1 ), 1 )
@@ -590,10 +595,12 @@ SUBROUTINE STGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
 *
                RNRM = SNRM2( N, VR( 1, KS ), 1 )
                LNRM = SNRM2( N, VL( 1, KS ), 1 )
-               CALL SGEMV( 'N', N, N, ONE, A, LDA, VR( 1, KS ), 1, ZERO,
+               CALL SGEMV( 'N', N, N, ONE, A, LDA, VR( 1, KS ), 1,
+     $                     ZERO,
      $                     WORK, 1 )
                UHAV = SDOT( N, WORK, 1, VL( 1, KS ), 1 )
-               CALL SGEMV( 'N', N, N, ONE, B, LDB, VR( 1, KS ), 1, ZERO,
+               CALL SGEMV( 'N', N, N, ONE, B, LDB, VR( 1, KS ), 1,
+     $                     ZERO,
      $                     WORK, 1 )
                UHBV = SDOT( N, WORK, 1, VL( 1, KS ), 1 )
                COND = SLAPY2( UHAV, UHBV )
@@ -632,8 +639,8 @@ SUBROUTINE STGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
                C1 = TWO*( ALPHAR*ALPHAR+ALPHAI*ALPHAI+BETA*BETA )
                C2 = FOUR*BETA*BETA*ALPHAI*ALPHAI
                ROOT1 = C1 + SQRT( C1*C1-4.0*C2 )
-               ROOT2 = C2 / ROOT1
                ROOT1 = ROOT1 / TWO
+               ROOT2 = C2 / ROOT1
                COND = MIN( SQRT( ROOT1 ), SQRT( ROOT2 ) )
             END IF
 *
@@ -645,7 +652,8 @@ SUBROUTINE STGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
             IFST = K
             ILST = 1
 *
-            CALL STGEXC( .FALSE., .FALSE., N, WORK, N, WORK( N*N+1 ), N,
+            CALL STGEXC( .FALSE., .FALSE., N, WORK, N, WORK( N*N+1 ),
+     $                   N,
      $                   DUMMY, 1, DUMMY1, 1, IFST, ILST,
      $                   WORK( N*N*2+1 ), LWORK-2*N*N, IERR )
 *
@@ -671,7 +679,8 @@ SUBROUTINE STGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
                ELSE
                   I = N*N + 1
                   IZ = 2*N*N + 1
-                  CALL STGSYL( 'N', DIFDRI, N2, N1, WORK( N*N1+N1+1 ),
+                  CALL STGSYL( 'N', DIFDRI, N2, N1,
+     $                         WORK( N*N1+N1+1 ),
      $                         N, WORK, N, WORK( N1+1 ), N,
      $                         WORK( N*N1+N1+I ), N, WORK( I ), N,
      $                         WORK( N1+I ), N, SCALE, DIF( KS ),
@@ -689,7 +698,7 @@ SUBROUTINE STGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
      $      KS = KS + 1
 *
    20 CONTINUE
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       RETURN
 *
 *     End of STGSNA
diff --git a/SRC/stgsy2.f b/SRC/stgsy2.f
index 7dffbd2f75..b53f086b89 100644
--- a/SRC/stgsy2.f
+++ b/SRC/stgsy2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STGSY2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stgsy2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stgsy2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -259,7 +257,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYauxiliary
+*> \ingroup tgsy2
 *
 *> \par Contributors:
 *  ==================
@@ -268,9 +266,11 @@
 *>     Umea University, S-901 87 Umea, Sweden.
 *
 *  =====================================================================
-      SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
+      SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC,
+     $                   D,
      $                   LDD, E, LDE, F, LDF, SCALE, RDSUM, RDSCAL,
      $                   IWORK, PQ, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -313,7 +313,8 @@ SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SGEMM, SGEMV, SGER, SGESC2,
+      EXTERNAL           SAXPY, SCOPY, SGEMM, SGEMV, SGER,
+     $                   SGESC2,
      $                   SGETC2, SSCAL, SLASET, SLATDF, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -466,9 +467,11 @@ SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
 *
                   IF( I.GT.1 ) THEN
                      ALPHA = -RHS( 1 )
-                     CALL SAXPY( IS-1, ALPHA, A( 1, IS ), 1, C( 1, JS ),
+                     CALL SAXPY( IS-1, ALPHA, A( 1, IS ), 1, C( 1,
+     $                           JS ),
      $                           1 )
-                     CALL SAXPY( IS-1, ALPHA, D( 1, IS ), 1, F( 1, JS ),
+                     CALL SAXPY( IS-1, ALPHA, D( 1, IS ), 1, F( 1,
+     $                           JS ),
      $                           1 )
                   END IF
                   IF( J.LT.Q ) THEN
@@ -541,9 +544,11 @@ SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
 *                 equation.
 *
                   IF( I.GT.1 ) THEN
-                     CALL SGER( IS-1, NB, -ONE, A( 1, IS ), 1, RHS( 1 ),
+                     CALL SGER( IS-1, NB, -ONE, A( 1, IS ), 1,
+     $                          RHS( 1 ),
      $                          1, C( 1, JS ), LDC )
-                     CALL SGER( IS-1, NB, -ONE, D( 1, IS ), 1, RHS( 1 ),
+                     CALL SGER( IS-1, NB, -ONE, D( 1, IS ), 1,
+     $                          RHS( 1 ),
      $                          1, F( 1, JS ), LDF )
                   END IF
                   IF( J.LT.Q ) THEN
@@ -551,9 +556,11 @@ SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
      $                           C( IS, JE+1 ), LDC )
                      CALL SAXPY( N-JE, RHS( 3 ), E( JS, JE+1 ), LDE,
      $                           F( IS, JE+1 ), LDF )
-                     CALL SAXPY( N-JE, RHS( 4 ), B( JSP1, JE+1 ), LDB,
+                     CALL SAXPY( N-JE, RHS( 4 ), B( JSP1, JE+1 ),
+     $                           LDB,
      $                           C( IS, JE+1 ), LDC )
-                     CALL SAXPY( N-JE, RHS( 4 ), E( JSP1, JE+1 ), LDE,
+                     CALL SAXPY( N-JE, RHS( 4 ), E( JSP1, JE+1 ),
+     $                           LDE,
      $                           F( IS, JE+1 ), LDF )
                   END IF
 *
@@ -619,9 +626,11 @@ SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
 *                 equation.
 *
                   IF( I.GT.1 ) THEN
-                     CALL SGEMV( 'N', IS-1, MB, -ONE, A( 1, IS ), LDA,
+                     CALL SGEMV( 'N', IS-1, MB, -ONE, A( 1, IS ),
+     $                           LDA,
      $                           RHS( 1 ), 1, ONE, C( 1, JS ), 1 )
-                     CALL SGEMV( 'N', IS-1, MB, -ONE, D( 1, IS ), LDD,
+                     CALL SGEMV( 'N', IS-1, MB, -ONE, D( 1, IS ),
+     $                           LDD,
      $                           RHS( 1 ), 1, ONE, F( 1, JS ), 1 )
                   END IF
                   IF( J.LT.Q ) THEN
@@ -679,7 +688,8 @@ SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   II = MB*NB + 1
                   DO 80 JJ = 0, NB - 1
                      CALL SCOPY( MB, C( IS, JS+JJ ), 1, RHS( K ), 1 )
-                     CALL SCOPY( MB, F( IS, JS+JJ ), 1, RHS( II ), 1 )
+                     CALL SCOPY( MB, F( IS, JS+JJ ), 1, RHS( II ),
+     $                           1 )
                      K = K + MB
                      II = II + MB
    80             CONTINUE
@@ -710,7 +720,8 @@ SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   II = MB*NB + 1
                   DO 100 JJ = 0, NB - 1
                      CALL SCOPY( MB, RHS( K ), 1, C( IS, JS+JJ ), 1 )
-                     CALL SCOPY( MB, RHS( II ), 1, F( IS, JS+JJ ), 1 )
+                     CALL SCOPY( MB, RHS( II ), 1, F( IS, JS+JJ ),
+     $                           1 )
                      K = K + MB
                      II = II + MB
   100             CONTINUE
@@ -728,10 +739,12 @@ SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   END IF
                   IF( J.LT.Q ) THEN
                      K = MB*NB + 1
-                     CALL SGEMM( 'N', 'N', MB, N-JE, NB, ONE, RHS( K ),
+                     CALL SGEMM( 'N', 'N', MB, N-JE, NB, ONE,
+     $                           RHS( K ),
      $                           MB, B( JS, JE+1 ), LDB, ONE,
      $                           C( IS, JE+1 ), LDC )
-                     CALL SGEMM( 'N', 'N', MB, N-JE, NB, ONE, RHS( K ),
+                     CALL SGEMM( 'N', 'N', MB, N-JE, NB, ONE,
+     $                           RHS( K ),
      $                           MB, E( JS, JE+1 ), LDE, ONE,
      $                           F( IS, JE+1 ), LDF )
                   END IF
@@ -782,7 +795,8 @@ SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   IF( IERR.GT.0 )
      $               INFO = IERR
 *
-                  CALL SGESC2( ZDIM, Z, LDZ, RHS, IPIV, JPIV, SCALOC )
+                  CALL SGESC2( ZDIM, Z, LDZ, RHS, IPIV, JPIV,
+     $                         SCALOC )
                   IF( SCALOC.NE.ONE ) THEN
                      DO 130 K = 1, N
                         CALL SSCAL( M, SCALOC, C( 1, K ), 1 )
@@ -801,10 +815,12 @@ SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
 *
                   IF( J.GT.P+2 ) THEN
                      ALPHA = RHS( 1 )
-                     CALL SAXPY( JS-1, ALPHA, B( 1, JS ), 1, F( IS, 1 ),
+                     CALL SAXPY( JS-1, ALPHA, B( 1, JS ), 1, F( IS,
+     $                           1 ),
      $                           LDF )
                      ALPHA = RHS( 2 )
-                     CALL SAXPY( JS-1, ALPHA, E( 1, JS ), 1, F( IS, 1 ),
+                     CALL SAXPY( JS-1, ALPHA, E( 1, JS ), 1, F( IS,
+     $                           1 ),
      $                           LDF )
                   END IF
                   IF( I.LT.P ) THEN
@@ -852,7 +868,8 @@ SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   CALL SGETC2( ZDIM, Z, LDZ, IPIV, JPIV, IERR )
                   IF( IERR.GT.0 )
      $               INFO = IERR
-                  CALL SGESC2( ZDIM, Z, LDZ, RHS, IPIV, JPIV, SCALOC )
+                  CALL SGESC2( ZDIM, Z, LDZ, RHS, IPIV, JPIV,
+     $                         SCALOC )
                   IF( SCALOC.NE.ONE ) THEN
                      DO 140 K = 1, N
                         CALL SSCAL( M, SCALOC, C( 1, K ), 1 )
@@ -925,7 +942,8 @@ SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   IF( IERR.GT.0 )
      $               INFO = IERR
 *
-                  CALL SGESC2( ZDIM, Z, LDZ, RHS, IPIV, JPIV, SCALOC )
+                  CALL SGESC2( ZDIM, Z, LDZ, RHS, IPIV, JPIV,
+     $                         SCALOC )
                   IF( SCALOC.NE.ONE ) THEN
                      DO 150 K = 1, N
                         CALL SSCAL( M, SCALOC, C( 1, K ), 1 )
@@ -945,9 +963,11 @@ SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
 *                 equation.
 *
                   IF( J.GT.P+2 ) THEN
-                     CALL SGER( MB, JS-1, ONE, RHS( 1 ), 1, B( 1, JS ),
+                     CALL SGER( MB, JS-1, ONE, RHS( 1 ), 1, B( 1,
+     $                          JS ),
      $                          1, F( IS, 1 ), LDF )
-                     CALL SGER( MB, JS-1, ONE, RHS( 3 ), 1, E( 1, JS ),
+                     CALL SGER( MB, JS-1, ONE, RHS( 3 ), 1, E( 1,
+     $                          JS ),
      $                          1, F( IS, 1 ), LDF )
                   END IF
                   IF( I.LT.P ) THEN
@@ -1007,7 +1027,8 @@ SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   II = MB*NB + 1
                   DO 160 JJ = 0, NB - 1
                      CALL SCOPY( MB, C( IS, JS+JJ ), 1, RHS( K ), 1 )
-                     CALL SCOPY( MB, F( IS, JS+JJ ), 1, RHS( II ), 1 )
+                     CALL SCOPY( MB, F( IS, JS+JJ ), 1, RHS( II ),
+     $                           1 )
                      K = K + MB
                      II = II + MB
   160             CONTINUE
@@ -1019,7 +1040,8 @@ SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   IF( IERR.GT.0 )
      $               INFO = IERR
 *
-                  CALL SGESC2( ZDIM, Z, LDZ, RHS, IPIV, JPIV, SCALOC )
+                  CALL SGESC2( ZDIM, Z, LDZ, RHS, IPIV, JPIV,
+     $                         SCALOC )
                   IF( SCALOC.NE.ONE ) THEN
                      DO 170 K = 1, N
                         CALL SSCAL( M, SCALOC, C( 1, K ), 1 )
@@ -1034,7 +1056,8 @@ SUBROUTINE STGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   II = MB*NB + 1
                   DO 180 JJ = 0, NB - 1
                      CALL SCOPY( MB, RHS( K ), 1, C( IS, JS+JJ ), 1 )
-                     CALL SCOPY( MB, RHS( II ), 1, F( IS, JS+JJ ), 1 )
+                     CALL SCOPY( MB, RHS( II ), 1, F( IS, JS+JJ ),
+     $                           1 )
                      K = K + MB
                      II = II + MB
   180             CONTINUE
diff --git a/SRC/stgsyl.f b/SRC/stgsyl.f
index 733c8ab9cd..69446d2160 100644
--- a/SRC/stgsyl.f
+++ b/SRC/stgsyl.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STGSYL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stgsyl.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stgsyl.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -261,7 +259,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup tgsyl
 *
 *> \par Contributors:
 *  ==================
@@ -293,9 +291,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE STGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
+      SUBROUTINE STGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC,
+     $                   D,
      $                   LDD, E, LDE, F, LDF, SCALE, DIF, WORK, LWORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -331,10 +331,12 @@ SUBROUTINE STGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           LSAME, ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMM, SLACPY, SLASET, SSCAL, STGSY2, XERBLA
+      EXTERNAL           SGEMM, SLACPY, SLASET, SSCAL, STGSY2,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, REAL, SQRT
@@ -384,7 +386,7 @@ SUBROUTINE STGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
          ELSE
             LWMIN = 1
          END IF
-         WORK( 1 ) = LWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
             INFO = -20
@@ -437,7 +439,8 @@ SUBROUTINE STGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
             DSCALE = ZERO
             DSUM = ONE
             PQ = 0
-            CALL STGSY2( TRANS, IFUNC, M, N, A, LDA, B, LDB, C, LDC, D,
+            CALL STGSY2( TRANS, IFUNC, M, N, A, LDA, B, LDB, C, LDC,
+     $                   D,
      $                   LDD, E, LDE, F, LDF, SCALE, DSUM, DSCALE,
      $                   IWORK, PQ, INFO )
             IF( DSCALE.NE.ZERO ) THEN
@@ -531,7 +534,8 @@ SUBROUTINE STGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   IE = IWORK( I+1 ) - 1
                   MB = IE - IS + 1
                   PPQQ = 0
-                  CALL STGSY2( TRANS, IFUNC, MB, NB, A( IS, IS ), LDA,
+                  CALL STGSY2( TRANS, IFUNC, MB, NB, A( IS, IS ),
+     $                         LDA,
      $                         B( JS, JS ), LDB, C( IS, JS ), LDC,
      $                         D( IS, IS ), LDD, E( JS, JS ), LDE,
      $                         F( IS, JS ), LDF, SCALOC, DSUM, DSCALE,
@@ -650,10 +654,12 @@ SUBROUTINE STGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
 *              Substitute R(I, J) and L(I, J) into remaining equation.
 *
                IF( J.GT.P+2 ) THEN
-                  CALL SGEMM( 'N', 'T', MB, JS-1, NB, ONE, C( IS, JS ),
+                  CALL SGEMM( 'N', 'T', MB, JS-1, NB, ONE, C( IS,
+     $                        JS ),
      $                        LDC, B( 1, JS ), LDB, ONE, F( IS, 1 ),
      $                        LDF )
-                  CALL SGEMM( 'N', 'T', MB, JS-1, NB, ONE, F( IS, JS ),
+                  CALL SGEMM( 'N', 'T', MB, JS-1, NB, ONE, F( IS,
+     $                        JS ),
      $                        LDF, E( 1, JS ), LDE, ONE, F( IS, 1 ),
      $                        LDF )
                END IF
@@ -670,7 +676,7 @@ SUBROUTINE STGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
 *
       END IF
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
 *
       RETURN
 *
diff --git a/SRC/stpcon.f b/SRC/stpcon.f
index d32e99855c..0b39fa8ff8 100644
--- a/SRC/stpcon.f
+++ b/SRC/stpcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STPCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stpcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stpcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,11 +120,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tpcon
 *
 *  =====================================================================
       SUBROUTINE STPCON( NORM, UPLO, DIAG, N, AP, RCOND, WORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -221,13 +220,15 @@ SUBROUTINE STPCON( NORM, UPLO, DIAG, N, AP, RCOND, WORK, IWORK,
          END IF
          KASE = 0
    10    CONTINUE
-         CALL SLACN2( N, WORK( N+1 ), WORK, IWORK, AINVNM, KASE, ISAVE )
+         CALL SLACN2( N, WORK( N+1 ), WORK, IWORK, AINVNM, KASE,
+     $                ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.KASE1 ) THEN
 *
 *              Multiply by inv(A).
 *
-               CALL SLATPS( UPLO, 'No transpose', DIAG, NORMIN, N, AP,
+               CALL SLATPS( UPLO, 'No transpose', DIAG, NORMIN, N,
+     $                      AP,
      $                      WORK, SCALE, WORK( 2*N+1 ), INFO )
             ELSE
 *
diff --git a/SRC/stplqt.f b/SRC/stplqt.f
index 4dd0c7ca30..64ea17fca0 100644
--- a/SRC/stplqt.f
+++ b/SRC/stplqt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STPLQT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stplqt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stplqt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tplqt
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +184,7 @@
 *  =====================================================================
       SUBROUTINE STPLQT( M, N, L, MB, A, LDA, B, LDB, T, LDT, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/stplqt2.f b/SRC/stplqt2.f
index 7f381876f4..88a83aaa20 100644
--- a/SRC/stplqt2.f
+++ b/SRC/stplqt2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STPLQT2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stplqt2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stplqt2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,7 +117,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tplqt2
 *
 *> \par Further Details:
 *  =====================
@@ -174,6 +172,7 @@
 *>
 *  =====================================================================
       SUBROUTINE STPLQT2( M, N, L, A, LDA, B, LDB, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/stpmlqt.f b/SRC/stpmlqt.f
index 7d86c2edfa..c31d06844e 100644
--- a/SRC/stpmlqt.f
+++ b/SRC/stpmlqt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STPMLQT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stpmlqt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stpmlqt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -103,9 +101,7 @@
 *> \param[in] LDV
 *> \verbatim
 *>          LDV is INTEGER
-*>          The leading dimension of the array V.
-*>          If SIDE = 'L', LDV >= max(1,M);
-*>          if SIDE = 'R', LDV >= max(1,N).
+*>          The leading dimension of the array V. LDV >= K.
 *> \endverbatim
 *>
 *> \param[in] T
@@ -135,8 +131,8 @@
 *> \verbatim
 *>          LDA is INTEGER
 *>          The leading dimension of the array A.
-*>          If SIDE = 'L', LDC >= max(1,K);
-*>          If SIDE = 'R', LDC >= max(1,M).
+*>          If SIDE = 'L', LDA >= max(1,K);
+*>          If SIDE = 'R', LDA >= max(1,M).
 *> \endverbatim
 *>
 *> \param[in,out] B
@@ -175,7 +171,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tpmlqt
 *
 *> \par Further Details:
 *  =====================
@@ -211,8 +207,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE STPMLQT( SIDE, TRANS, M, N, K, L, MB, V, LDV, T, LDT,
+      SUBROUTINE STPMLQT( SIDE, TRANS, M, N, K, L, MB, V, LDV, T,
+     $                    LDT,
      $                    A, LDA, B, LDB, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -239,7 +237,7 @@ SUBROUTINE STPMLQT( SIDE, TRANS, M, N, K, L, MB, V, LDV, T, LDT,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLARFB, STPRFB, XERBLA
+      EXTERNAL           XERBLA, STPRFB
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
diff --git a/SRC/stpmqrt.f b/SRC/stpmqrt.f
index c9c09fd71a..9d58376c0e 100644
--- a/SRC/stpmqrt.f
+++ b/SRC/stpmqrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STPMQRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stpmqrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stpmqrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -175,7 +173,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tpmqrt
 *
 *> \par Further Details:
 *  =====================
@@ -211,8 +209,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE STPMQRT( SIDE, TRANS, M, N, K, L, NB, V, LDV, T, LDT,
+      SUBROUTINE STPMQRT( SIDE, TRANS, M, N, K, L, NB, V, LDV, T,
+     $                    LDT,
      $                    A, LDA, B, LDB, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/stpqrt.f b/SRC/stpqrt.f
index eee0f25239..a33e931bf9 100644
--- a/SRC/stpqrt.f
+++ b/SRC/stpqrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STPQRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stpqrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stpqrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tpqrt
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +184,7 @@
 *  =====================================================================
       SUBROUTINE STPQRT( M, N, L, NB, A, LDA, B, LDB, T, LDT, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/stpqrt2.f b/SRC/stpqrt2.f
index 281c2e8ac2..15d7ed54e6 100644
--- a/SRC/stpqrt2.f
+++ b/SRC/stpqrt2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STPQRT2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stpqrt2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stpqrt2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,7 +117,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tpqrt2
 *
 *> \par Further Details:
 *  =====================
@@ -170,6 +168,7 @@
 *>
 *  =====================================================================
       SUBROUTINE STPQRT2( M, N, L, A, LDA, B, LDB, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/stprfb.f b/SRC/stprfb.f
index 64e8b34f5e..ea69ed79c8 100644
--- a/SRC/stprfb.f
+++ b/SRC/stprfb.f
@@ -1,11 +1,10 @@
-*> \brief \b STPRFB applies a real or complex "triangular-pentagonal" blocked reflector to a real or complex matrix, which is composed of two blocks.
+*> \brief \b STPRFB applies a real "triangular-pentagonal" block reflector to a real matrix, which is composed of two blocks.
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STPRFB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stprfb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stprfb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,7 @@
 *> \verbatim
 *>
 *> STPRFB applies a real "triangular-pentagonal" block reflector H or its
-*> conjugate transpose H^H to a real matrix C, which is composed of two
+*> transpose H**T to a real matrix C, which is composed of two
 *> blocks A and B, either from the left or right.
 *>
 *> \endverbatim
@@ -48,15 +46,15 @@
 *> \param[in] SIDE
 *> \verbatim
 *>          SIDE is CHARACTER*1
-*>          = 'L': apply H or H^H from the Left
-*>          = 'R': apply H or H^H from the Right
+*>          = 'L': apply H or H**T from the Left
+*>          = 'R': apply H or H**T from the Right
 *> \endverbatim
 *>
 *> \param[in] TRANS
 *> \verbatim
 *>          TRANS is CHARACTER*1
 *>          = 'N': apply H (No transpose)
-*>          = 'C': apply H^H (Conjugate transpose)
+*>          = 'T': apply H**T (Transpose)
 *> \endverbatim
 *>
 *> \param[in] DIRECT
@@ -145,7 +143,7 @@
 *>          (LDA,N) if SIDE = 'L' or (LDA,K) if SIDE = 'R'
 *>          On entry, the K-by-N or M-by-K matrix A.
 *>          On exit, A is overwritten by the corresponding block of
-*>          H*C or H^H*C or C*H or C*H^H.  See Further Details.
+*>          H*C or H**T*C or C*H or C*H**T.  See Further Details.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -161,7 +159,7 @@
 *>          B is REAL array, dimension (LDB,N)
 *>          On entry, the M-by-N matrix B.
 *>          On exit, B is overwritten by the corresponding block of
-*>          H*C or H^H*C or C*H or C*H^H.  See Further Details.
+*>          H*C or H**T*C or C*H or C*H**T.  See Further Details.
 *> \endverbatim
 *>
 *> \param[in] LDB
@@ -194,7 +192,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERauxiliary
+*> \ingroup tprfb
 *
 *> \par Further Details:
 *  =====================
@@ -248,6 +246,7 @@
 *  =====================================================================
       SUBROUTINE STPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
      $                   V, LDV, T, LDT, A, LDA, B, LDB, WORK, LDWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -327,13 +326,13 @@ SUBROUTINE STPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
 *        Let  W =  [ I ]    (K-by-K)
 *                  [ V ]    (M-by-K)
 *
-*        Form  H C  or  H^H C  where  C = [ A ]  (K-by-N)
-*                                         [ B ]  (M-by-N)
+*        Form  H C  or  H**T C  where  C = [ A ]  (K-by-N)
+*                                          [ B ]  (M-by-N)
 *
-*        H = I - W T W^H          or  H^H = I - W T^H W^H
+*        H = I - W T W**T          or  H**T = I - W T**T W**T
 *
-*        A = A -   T (A + V^H B)  or  A = A -   T^H (A + V^H B)
-*        B = B - V T (A + V^H B)  or  B = B - V T^H (A + V^H B)
+*        A = A -   T (A + V**T B)  or  A = A -   T**T (A + V**T B)
+*        B = B - V T (A + V**T B)  or  B = B - V T**T (A + V**T B)
 *
 * ---------------------------------------------------------------------------
 *
@@ -388,12 +387,12 @@ SUBROUTINE STPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
 *        Let  W =  [ I ]    (K-by-K)
 *                  [ V ]    (N-by-K)
 *
-*        Form  C H or  C H^H  where  C = [ A B ] (A is M-by-K, B is M-by-N)
+*        Form  C H or  C H**T  where  C = [ A B ] (A is M-by-K, B is M-by-N)
 *
-*        H = I - W T W^H          or  H^H = I - W T^H W^H
+*        H = I - W T W**T          or  H**T = I - W T**T W**T
 *
-*        A = A - (A + B V) T      or  A = A - (A + B V) T^H
-*        B = B - (A + B V) T V^H  or  B = B - (A + B V) T^H V^H
+*        A = A - (A + B V) T       or  A = A - (A + B V) T**T
+*        B = B - (A + B V) T V**T  or  B = B - (A + B V) T**T V**T
 *
 * ---------------------------------------------------------------------------
 *
@@ -429,7 +428,8 @@ SUBROUTINE STPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
 *
          CALL SGEMM( 'N', 'T', M, N-L, K, -ONE, WORK, LDWORK,
      $               V, LDV, ONE, B, LDB )
-         CALL SGEMM( 'N', 'T', M, L, K-L, -ONE, WORK( 1, KP ), LDWORK,
+         CALL SGEMM( 'N', 'T', M, L, K-L, -ONE, WORK( 1, KP ),
+     $               LDWORK,
      $               V( NP, KP ), LDV, ONE, B( 1, NP ), LDB )
          CALL STRMM( 'R', 'U', 'T', 'N', M, L, ONE, V( NP, 1 ), LDV,
      $               WORK, LDWORK )
@@ -448,13 +448,13 @@ SUBROUTINE STPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
 *        Let  W =  [ V ]    (M-by-K)
 *                  [ I ]    (K-by-K)
 *
-*        Form  H C  or  H^H C  where  C = [ B ]  (M-by-N)
-*                                         [ A ]  (K-by-N)
+*        Form  H C  or  H**T C  where  C = [ B ]  (M-by-N)
+*                                          [ A ]  (K-by-N)
 *
-*        H = I - W T W^H          or  H^H = I - W T^H W^H
+*        H = I - W T W**T         or  H**T = I - W T**T W**T
 *
-*        A = A -   T (A + V^H B)  or  A = A -   T^H (A + V^H B)
-*        B = B - V T (A + V^H B)  or  B = B - V T^H (A + V^H B)
+*        A = A -   T (A + V**T B)  or  A = A -   T**T (A + V**T B)
+*        B = B - V T (A + V**T B)  or  B = B - V T**T (A + V**T B)
 *
 * ---------------------------------------------------------------------------
 *
@@ -510,12 +510,12 @@ SUBROUTINE STPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
 *        Let  W =  [ V ]    (N-by-K)
 *                  [ I ]    (K-by-K)
 *
-*        Form  C H  or  C H^H  where  C = [ B A ] (B is M-by-N, A is M-by-K)
+*        Form  C H  or  C H**T  where  C = [ B A ] (B is M-by-N, A is M-by-K)
 *
-*        H = I - W T W^H          or  H^H = I - W T^H W^H
+*        H = I - W T W**T          or  H**T = I - W T**T W**T
 *
-*        A = A - (A + B V) T      or  A = A - (A + B V) T^H
-*        B = B - (A + B V) T V^H  or  B = B - (A + B V) T^H V^H
+*        A = A - (A + B V) T       or  A = A - (A + B V) T**T
+*        B = B - (A + B V) T V**T  or  B = B - (A + B V) T**T V**T
 *
 * ---------------------------------------------------------------------------
 *
@@ -569,13 +569,13 @@ SUBROUTINE STPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
 *
 *        Let  W =  [ I V ] ( I is K-by-K, V is K-by-M )
 *
-*        Form  H C  or  H^H C  where  C = [ A ]  (K-by-N)
-*                                         [ B ]  (M-by-N)
+*        Form  H C  or  H**T C  where  C = [ A ]  (K-by-N)
+*                                          [ B ]  (M-by-N)
 *
-*        H = I - W^H T W          or  H^H = I - W^H T^H W
+*        H = I - W**T T W          or  H**T = I - W**T T**T W
 *
-*        A = A -     T (A + V B)  or  A = A -     T^H (A + V B)
-*        B = B - V^H T (A + V B)  or  B = B - V^H T^H (A + V B)
+*        A = A -      T (A + V B)  or  A = A -      T**T (A + V B)
+*        B = B - V**T T (A + V B)  or  B = B - V**T T**T (A + V B)
 *
 * ---------------------------------------------------------------------------
 *
@@ -629,12 +629,12 @@ SUBROUTINE STPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
 *
 *        Let  W =  [ I V ] ( I is K-by-K, V is K-by-N )
 *
-*        Form  C H  or  C H^H  where  C = [ A B ] (A is M-by-K, B is M-by-N)
+*        Form  C H  or  C H**T  where  C = [ A B ] (A is M-by-K, B is M-by-N)
 *
-*        H = I - W^H T W            or  H^H = I - W^H T^H W
+*        H = I - W**T T W            or  H**T = I - W**T T**T W
 *
-*        A = A - (A + B V^H) T      or  A = A - (A + B V^H) T^H
-*        B = B - (A + B V^H) T V    or  B = B - (A + B V^H) T^H V
+*        A = A - (A + B V**T) T      or  A = A - (A + B V**T) T**T
+*        B = B - (A + B V**T) T V    or  B = B - (A + B V**T) T**T V
 *
 * ---------------------------------------------------------------------------
 *
@@ -670,7 +670,8 @@ SUBROUTINE STPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
 *
          CALL SGEMM( 'N', 'N', M, N-L, K, -ONE, WORK, LDWORK,
      $               V, LDV, ONE, B, LDB )
-         CALL SGEMM( 'N', 'N', M, L, K-L, -ONE, WORK( 1, KP ), LDWORK,
+         CALL SGEMM( 'N', 'N', M, L, K-L, -ONE, WORK( 1, KP ),
+     $               LDWORK,
      $               V( KP, NP ), LDV, ONE, B( 1, NP ), LDB )
          CALL STRMM( 'R', 'L', 'N', 'N', M, L, ONE, V( 1, NP ), LDV,
      $               WORK, LDWORK )
@@ -688,13 +689,13 @@ SUBROUTINE STPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
 *
 *        Let  W =  [ V I ] ( I is K-by-K, V is K-by-M )
 *
-*        Form  H C  or  H^H C  where  C = [ B ]  (M-by-N)
-*                                         [ A ]  (K-by-N)
+*        Form  H C  or  H**T C  where  C = [ B ]  (M-by-N)
+*                                          [ A ]  (K-by-N)
 *
-*        H = I - W^H T W          or  H^H = I - W^H T^H W
+*        H = I - W**T T W          or  H**T = I - W**T T**T W
 *
-*        A = A -     T (A + V B)  or  A = A -     T^H (A + V B)
-*        B = B - V^H T (A + V B)  or  B = B - V^H T^H (A + V B)
+*        A = A -      T (A + V B)  or  A = A -      T**T (A + V B)
+*        B = B - V**T T (A + V B)  or  B = B - V**T T**T (A + V B)
 *
 * ---------------------------------------------------------------------------
 *
@@ -748,12 +749,12 @@ SUBROUTINE STPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
 *
 *        Let  W =  [ V I ] ( I is K-by-K, V is K-by-N )
 *
-*        Form  C H  or  C H^H  where  C = [ B A ] (A is M-by-K, B is M-by-N)
+*        Form  C H  or  C H**T  where  C = [ B A ] (A is M-by-K, B is M-by-N)
 *
-*        H = I - W^H T W            or  H^H = I - W^H T^H W
+*        H = I - W**T T W            or  H**T = I - W**T T**T W
 *
-*        A = A - (A + B V^H) T      or  A = A - (A + B V^H) T^H
-*        B = B - (A + B V^H) T V    or  B = B - (A + B V^H) T^H V
+*        A = A - (A + B V**T) T      or  A = A - (A + B V**T) T**T
+*        B = B - (A + B V**T) T V    or  B = B - (A + B V**T) T**T V
 *
 * ---------------------------------------------------------------------------
 *
diff --git a/SRC/stprfs.f b/SRC/stprfs.f
index efe453919e..7c95081bf5 100644
--- a/SRC/stprfs.f
+++ b/SRC/stprfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STPRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stprfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stprfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -167,11 +165,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tprfs
 *
 *  =====================================================================
-      SUBROUTINE STPRFS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X, LDX,
+      SUBROUTINE STPRFS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X,
+     $                   LDX,
      $                   FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -205,7 +205,8 @@ SUBROUTINE STPRFS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X, LDX,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SLACN2, STPMV, STPSV, XERBLA
+      EXTERNAL           SAXPY, SCOPY, SLACN2, STPMV, STPSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -266,7 +267,7 @@ SUBROUTINE STPRFS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X, LDX,
       NZ = N + 1
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -421,22 +422,25 @@ SUBROUTINE STPRFS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X, LDX,
 *
          DO 200 I = 1, N
             IF( WORK( I ).GT.SAFE2 ) THEN
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I )
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
             ELSE
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I ) + SAFE1
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
+     $                     + SAFE1
             END IF
   200    CONTINUE
 *
          KASE = 0
   210    CONTINUE
-         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
 *
 *              Multiply by diag(W)*inv(op(A)**T).
 *
-               CALL STPSV( UPLO, TRANST, DIAG, N, AP, WORK( N+1 ), 1 )
+               CALL STPSV( UPLO, TRANST, DIAG, N, AP, WORK( N+1 ),
+     $                     1 )
                DO 220 I = 1, N
                   WORK( N+I ) = WORK( I )*WORK( N+I )
   220          CONTINUE
diff --git a/SRC/stptri.f b/SRC/stptri.f
index fb889ae850..852cb3bcca 100644
--- a/SRC/stptri.f
+++ b/SRC/stptri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STPTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stptri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stptri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -91,7 +89,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tptri
 *
 *> \par Further Details:
 *  =====================
@@ -114,6 +112,7 @@
 *>
 *  =====================================================================
       SUBROUTINE STPTRI( UPLO, DIAG, N, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/stptrs.f b/SRC/stptrs.f
index d4882b3b64..aaa355be85 100644
--- a/SRC/stptrs.f
+++ b/SRC/stptrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STPTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stptrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stptrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -38,9 +36,14 @@
 *>
 *>    A * X = B  or  A**T * X = B,
 *>
-*> where A is a triangular matrix of order N stored in packed format,
-*> and B is an N-by-NRHS matrix.  A check is made to verify that A is
-*> nonsingular.
+*> where A is a triangular matrix of order N stored in packed format, and B is an N-by-NRHS matrix.
+*>
+*> This subroutine verifies that A is nonsingular, but callers should note that only exact
+*> singularity is detected. It is conceivable for one or more diagonal elements of A to be
+*> subnormally tiny numbers without this subroutine signalling an error.
+*>
+*> If a possible loss of numerical precision due to near-singular matrices is a concern, the
+*> caller should verify that A is nonsingular within some tolerance before calling this subroutine.
 *> \endverbatim
 *
 *  Arguments:
@@ -110,7 +113,7 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the i-th diagonal element of A is zero,
+*>          > 0:  if INFO = i, the i-th diagonal element of A is exactly zero,
 *>                indicating that the matrix is singular and the
 *>                solutions X have not been computed.
 *> \endverbatim
@@ -123,10 +126,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tptrs
 *
 *  =====================================================================
-      SUBROUTINE STPTRS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, INFO )
+      SUBROUTINE STPTRS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -170,7 +175,8 @@ SUBROUTINE STPTRS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, INFO )
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.
-     $         LSAME( TRANS, 'T' ) .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+     $         LSAME( TRANS, 'T' ) .AND.
+     $                .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -2
       ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
          INFO = -3
diff --git a/SRC/stpttf.f b/SRC/stpttf.f
index 67d0c1f1eb..3c1842482f 100644
--- a/SRC/stpttf.f
+++ b/SRC/stpttf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STPTTF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stpttf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stpttf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -92,7 +90,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tpttf
 *
 *> \par Further Details:
 *  =====================
@@ -183,6 +181,7 @@
 *>
 *  =====================================================================
       SUBROUTINE STPTTF( TRANSR, UPLO, N, AP, ARF, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/stpttr.f b/SRC/stpttr.f
index 8266a5651e..1175dafe35 100644
--- a/SRC/stpttr.f
+++ b/SRC/stpttr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STPTTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stpttr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stpttr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tpttr
 *
 *  =====================================================================
       SUBROUTINE STPTTR( UPLO, N, AP, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/strcon.f b/SRC/strcon.f
index 741f436f5d..9acea5e013 100644
--- a/SRC/strcon.f
+++ b/SRC/strcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STRCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/strcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/strcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -129,11 +127,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup trcon
 *
 *  =====================================================================
       SUBROUTINE STRCON( NORM, UPLO, DIAG, N, A, LDA, RCOND, WORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -230,7 +229,8 @@ SUBROUTINE STRCON( NORM, UPLO, DIAG, N, A, LDA, RCOND, WORK,
          END IF
          KASE = 0
    10    CONTINUE
-         CALL SLACN2( N, WORK( N+1 ), WORK, IWORK, AINVNM, KASE, ISAVE )
+         CALL SLACN2( N, WORK( N+1 ), WORK, IWORK, AINVNM, KASE,
+     $                ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.KASE1 ) THEN
 *
@@ -242,7 +242,8 @@ SUBROUTINE STRCON( NORM, UPLO, DIAG, N, A, LDA, RCOND, WORK,
 *
 *              Multiply by inv(A**T).
 *
-               CALL SLATRS( UPLO, 'Transpose', DIAG, NORMIN, N, A, LDA,
+               CALL SLATRS( UPLO, 'Transpose', DIAG, NORMIN, N, A,
+     $                      LDA,
      $                      WORK, SCALE, WORK( 2*N+1 ), INFO )
             END IF
             NORMIN = 'Y'
diff --git a/SRC/strevc.f b/SRC/strevc.f
index af97de1d15..fc32406982 100644
--- a/SRC/strevc.f
+++ b/SRC/strevc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STREVC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/strevc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/strevc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -200,7 +198,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup trevc
 *
 *> \par Further Details:
 *  =====================
@@ -217,8 +215,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE STREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
+      SUBROUTINE STREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
+     $                   VR,
      $                   LDVR, MM, M, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -254,7 +254,7 @@ SUBROUTINE STREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
       EXTERNAL           LSAME, ISAMAX, SDOT, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SGEMV, SLABAD, SLALN2, SSCAL,
+      EXTERNAL           SAXPY, SCOPY, SGEMV, SLALN2, SSCAL,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -341,9 +341,8 @@ SUBROUTINE STREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Precision' )
-      SMLNUM = UNFL*( N / ULP )
+      SMLNUM = UNFL*( REAL( N ) / ULP )
       BIGNUM = ( ONE-ULP ) / SMLNUM
 *
 *     Compute 1-norm of each column of strictly upper triangular
@@ -433,7 +432,8 @@ SUBROUTINE STREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
 *                    1-by-1 diagonal block
 *
-                     CALL SLALN2( .FALSE., 1, 1, SMIN, ONE, T( J, J ),
+                     CALL SLALN2( .FALSE., 1, 1, SMIN, ONE, T( J,
+     $                            J ),
      $                            LDT, ONE, ONE, WORK( J+N ), N, WR,
      $                            ZERO, X, 2, SCALE, XNORM, IERR )
 *
@@ -564,7 +564,8 @@ SUBROUTINE STREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
 *                    1-by-1 diagonal block
 *
-                     CALL SLALN2( .FALSE., 1, 2, SMIN, ONE, T( J, J ),
+                     CALL SLALN2( .FALSE., 1, 2, SMIN, ONE, T( J,
+     $                            J ),
      $                            LDT, ONE, ONE, WORK( J+N ), N, WR, WI,
      $                            X, 2, SCALE, XNORM, IERR )
 *
@@ -674,7 +675,8 @@ SUBROUTINE STREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
      $                           WORK( 1+N2 ), 1, WORK( KI+N2 ),
      $                           VR( 1, KI ), 1 )
                   ELSE
-                     CALL SSCAL( N, WORK( KI-1+N ), VR( 1, KI-1 ), 1 )
+                     CALL SSCAL( N, WORK( KI-1+N ), VR( 1, KI-1 ),
+     $                           1 )
                      CALL SSCAL( N, WORK( KI+N2 ), VR( 1, KI ), 1 )
                   END IF
 *
@@ -783,7 +785,8 @@ SUBROUTINE STREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
 *                    Solve (T(J,J)-WR)**T*X = WORK
 *
-                     CALL SLALN2( .FALSE., 1, 1, SMIN, ONE, T( J, J ),
+                     CALL SLALN2( .FALSE., 1, 1, SMIN, ONE, T( J,
+     $                            J ),
      $                            LDT, ONE, ONE, WORK( J+N ), N, WR,
      $                            ZERO, X, 2, SCALE, XNORM, IERR )
 *
@@ -843,7 +846,8 @@ SUBROUTINE STREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *              Copy the vector x or Q*x to VL and normalize.
 *
                IF( .NOT.OVER ) THEN
-                  CALL SCOPY( N-KI+1, WORK( KI+N ), 1, VL( KI, IS ), 1 )
+                  CALL SCOPY( N-KI+1, WORK( KI+N ), 1, VL( KI, IS ),
+     $                        1 )
 *
                   II = ISAMAX( N-KI+1, VL( KI, IS ), 1 ) + KI - 1
                   REMAX = ONE / ABS( VL( II, IS ) )
@@ -856,7 +860,8 @@ SUBROUTINE STREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
                ELSE
 *
                   IF( KI.LT.N )
-     $               CALL SGEMV( 'N', N, N-KI, ONE, VL( 1, KI+1 ), LDVL,
+     $               CALL SGEMV( 'N', N, N-KI, ONE, VL( 1, KI+1 ),
+     $                           LDVL,
      $                           WORK( KI+1+N ), 1, WORK( KI+N ),
      $                           VL( 1, KI ), 1 )
 *
@@ -935,7 +940,8 @@ SUBROUTINE STREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
 *                    Solve (T(J,J)-(WR-i*WI))*(X11+i*X12)= WK+I*WK2
 *
-                     CALL SLALN2( .FALSE., 1, 2, SMIN, ONE, T( J, J ),
+                     CALL SLALN2( .FALSE., 1, 2, SMIN, ONE, T( J,
+     $                            J ),
      $                            LDT, ONE, ONE, WORK( J+N ), N, WR,
      $                            -WI, X, 2, SCALE, XNORM, IERR )
 *
@@ -980,7 +986,8 @@ SUBROUTINE STREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
      $                               WORK( KI+2+N ), 1 )
 *
                      WORK( J+1+N2 ) = WORK( J+1+N2 ) -
-     $                                SDOT( J-KI-2, T( KI+2, J+1 ), 1,
+     $                                SDOT( J-KI-2, T( KI+2, J+1 ),
+     $                                      1,
      $                                WORK( KI+2+N2 ), 1 )
 *
 *                    Solve 2-by-2 complex linear equation
@@ -1011,8 +1018,10 @@ SUBROUTINE STREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *              Copy the vector x or Q*x to VL and normalize.
 *
                IF( .NOT.OVER ) THEN
-                  CALL SCOPY( N-KI+1, WORK( KI+N ), 1, VL( KI, IS ), 1 )
-                  CALL SCOPY( N-KI+1, WORK( KI+N2 ), 1, VL( KI, IS+1 ),
+                  CALL SCOPY( N-KI+1, WORK( KI+N ), 1, VL( KI, IS ),
+     $                        1 )
+                  CALL SCOPY( N-KI+1, WORK( KI+N2 ), 1, VL( KI,
+     $                        IS+1 ),
      $                        1 )
 *
                   EMAX = ZERO
@@ -1038,7 +1047,8 @@ SUBROUTINE STREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
      $                           WORK( KI+1+N2 ), VL( 1, KI+1 ), 1 )
                   ELSE
                      CALL SSCAL( N, WORK( KI+N ), VL( 1, KI ), 1 )
-                     CALL SSCAL( N, WORK( KI+1+N2 ), VL( 1, KI+1 ), 1 )
+                     CALL SSCAL( N, WORK( KI+1+N2 ), VL( 1, KI+1 ),
+     $                           1 )
                   END IF
 *
                   EMAX = ZERO
diff --git a/SRC/strevc3.f b/SRC/strevc3.f
index 5af57123bf..c164b7fffb 100644
--- a/SRC/strevc3.f
+++ b/SRC/strevc3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STREVC3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/strevc3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/strevc3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -215,7 +213,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup trevc3
 *
 *> \par Further Details:
 *  =====================
@@ -274,8 +272,9 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
       EXTERNAL           LSAME, ISAMAX, ILAENV, SDOT, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SGEMV, SLALN2, SSCAL, XERBLA,
-     $                   SLACPY, SGEMM, SLABAD, SLASET
+      EXTERNAL           SAXPY, SCOPY, SGEMV, SLALN2, SSCAL,
+     $                   XERBLA,
+     $                   SLACPY, SGEMM, SLASET
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
@@ -298,8 +297,8 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *
       INFO = 0
       NB = ILAENV( 1, 'STREVC', SIDE // HOWMNY, N, -1, -1, -1 )
-      MAXWRK = N + 2*N*NB
-      WORK(1) = MAXWRK
+      MAXWRK = MAX( 1, N + 2*N*NB )
+      WORK( 1 ) = REAL( MAXWRK )
       LQUERY = ( LWORK.EQ.-1 )
       IF( .NOT.RIGHTV .AND. .NOT.LEFTV ) THEN
          INFO = -1
@@ -381,9 +380,8 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Precision' )
-      SMLNUM = UNFL*( N / ULP )
+      SMLNUM = UNFL*( REAL( N ) / ULP )
       BIGNUM = ( ONE-ULP ) / SMLNUM
 *
 *     Compute 1-norm of each column of strictly upper triangular
@@ -490,7 +488,8 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *
 *                    1-by-1 diagonal block
 *
-                     CALL SLALN2( .FALSE., 1, 1, SMIN, ONE, T( J, J ),
+                     CALL SLALN2( .FALSE., 1, 1, SMIN, ONE, T( J,
+     $                            J ),
      $                            LDT, ONE, ONE, WORK( J+IV*N ), N, WR,
      $                            ZERO, X, 2, SCALE, XNORM, IERR )
 *
@@ -557,7 +556,8 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
                IF( .NOT.OVER ) THEN
 *                 ------------------------------
 *                 no back-transform: copy x to VR and normalize.
-                  CALL SCOPY( KI, WORK( 1 + IV*N ), 1, VR( 1, IS ), 1 )
+                  CALL SCOPY( KI, WORK( 1 + IV*N ), 1, VR( 1, IS ),
+     $                        1 )
 *
                   II = ISAMAX( KI, VR( 1, IS ), 1 )
                   REMAX = ONE / ABS( VR( II, IS ) )
@@ -636,7 +636,8 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *
 *                    1-by-1 diagonal block
 *
-                     CALL SLALN2( .FALSE., 1, 2, SMIN, ONE, T( J, J ),
+                     CALL SLALN2( .FALSE., 1, 2, SMIN, ONE, T( J,
+     $                            J ),
      $                            LDT, ONE, ONE, WORK( J+(IV-1)*N ), N,
      $                            WR, WI, X, 2, SCALE, XNORM, IERR )
 *
@@ -654,8 +655,10 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *                    Scale if necessary
 *
                      IF( SCALE.NE.ONE ) THEN
-                        CALL SSCAL( KI, SCALE, WORK( 1+(IV-1)*N ), 1 )
-                        CALL SSCAL( KI, SCALE, WORK( 1+(IV  )*N ), 1 )
+                        CALL SSCAL( KI, SCALE, WORK( 1+(IV-1)*N ),
+     $                              1 )
+                        CALL SSCAL( KI, SCALE, WORK( 1+(IV  )*N ),
+     $                              1 )
                      END IF
                      WORK( J+(IV-1)*N ) = X( 1, 1 )
                      WORK( J+(IV  )*N ) = X( 1, 2 )
@@ -694,8 +697,10 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *                    Scale if necessary
 *
                      IF( SCALE.NE.ONE ) THEN
-                        CALL SSCAL( KI, SCALE, WORK( 1+(IV-1)*N ), 1 )
-                        CALL SSCAL( KI, SCALE, WORK( 1+(IV  )*N ), 1 )
+                        CALL SSCAL( KI, SCALE, WORK( 1+(IV-1)*N ),
+     $                              1 )
+                        CALL SSCAL( KI, SCALE, WORK( 1+(IV  )*N ),
+     $                              1 )
                      END IF
                      WORK( J-1+(IV-1)*N ) = X( 1, 1 )
                      WORK( J  +(IV-1)*N ) = X( 2, 1 )
@@ -720,8 +725,10 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
                IF( .NOT.OVER ) THEN
 *                 ------------------------------
 *                 no back-transform: copy x to VR and normalize.
-                  CALL SCOPY( KI, WORK( 1+(IV-1)*N ), 1, VR(1,IS-1), 1 )
-                  CALL SCOPY( KI, WORK( 1+(IV  )*N ), 1, VR(1,IS  ), 1 )
+                  CALL SCOPY( KI, WORK( 1+(IV-1)*N ), 1, VR(1,IS-1),
+     $                        1 )
+                  CALL SCOPY( KI, WORK( 1+(IV  )*N ), 1, VR(1,IS  ),
+     $                        1 )
 *
                   EMAX = ZERO
                   DO 100 K = 1, KI
@@ -748,8 +755,10 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
      $                           WORK( 1  + (IV)*N ), 1,
      $                           WORK( KI + (IV)*N ), VR( 1, KI ), 1 )
                   ELSE
-                     CALL SSCAL( N, WORK(KI-1+(IV-1)*N), VR(1,KI-1), 1)
-                     CALL SSCAL( N, WORK(KI  +(IV  )*N), VR(1,KI  ), 1)
+                     CALL SSCAL( N, WORK(KI-1+(IV-1)*N), VR(1,KI-1),
+     $                           1)
+                     CALL SSCAL( N, WORK(KI  +(IV  )*N), VR(1,KI  ),
+     $                           1)
                   END IF
 *
                   EMAX = ZERO
@@ -928,14 +937,16 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *
 *                    Solve [ T(J,J) - WR ]**T * X = WORK
 *
-                     CALL SLALN2( .FALSE., 1, 1, SMIN, ONE, T( J, J ),
+                     CALL SLALN2( .FALSE., 1, 1, SMIN, ONE, T( J,
+     $                            J ),
      $                            LDT, ONE, ONE, WORK( J+IV*N ), N, WR,
      $                            ZERO, X, 2, SCALE, XNORM, IERR )
 *
 *                    Scale if necessary
 *
                      IF( SCALE.NE.ONE )
-     $                  CALL SSCAL( N-KI+1, SCALE, WORK( KI+IV*N ), 1 )
+     $                  CALL SSCAL( N-KI+1, SCALE, WORK( KI+IV*N ),
+     $                              1 )
                      WORK( J+IV*N ) = X( 1, 1 )
                      VMAX = MAX( ABS( WORK( J+IV*N ) ), VMAX )
                      VCRIT = BIGNUM / VMAX
@@ -960,7 +971,8 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
      $                                      WORK( KI+1+IV*N ), 1 )
 *
                      WORK( J+1+IV*N ) = WORK( J+1+IV*N ) -
-     $                                  SDOT( J-KI-1, T( KI+1, J+1 ), 1,
+     $                                  SDOT( J-KI-1, T( KI+1, J+1 ),
+     $                                        1,
      $                                        WORK( KI+1+IV*N ), 1 )
 *
 *                    Solve
@@ -974,7 +986,8 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *                    Scale if necessary
 *
                      IF( SCALE.NE.ONE )
-     $                  CALL SSCAL( N-KI+1, SCALE, WORK( KI+IV*N ), 1 )
+     $                  CALL SSCAL( N-KI+1, SCALE, WORK( KI+IV*N ),
+     $                              1 )
                      WORK( J  +IV*N ) = X( 1, 1 )
                      WORK( J+1+IV*N ) = X( 2, 1 )
 *
@@ -1080,30 +1093,37 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *
                      IF( WORK( J ).GT.VCRIT ) THEN
                         REC = ONE / VMAX
-                        CALL SSCAL( N-KI+1, REC, WORK(KI+(IV  )*N), 1 )
-                        CALL SSCAL( N-KI+1, REC, WORK(KI+(IV+1)*N), 1 )
+                        CALL SSCAL( N-KI+1, REC, WORK(KI+(IV  )*N),
+     $                              1 )
+                        CALL SSCAL( N-KI+1, REC, WORK(KI+(IV+1)*N),
+     $                              1 )
                         VMAX = ONE
                         VCRIT = BIGNUM
                      END IF
 *
                      WORK( J+(IV  )*N ) = WORK( J+(IV)*N ) -
-     $                                  SDOT( J-KI-2, T( KI+2, J ), 1,
+     $                                  SDOT( J-KI-2, T( KI+2, J ),
+     $                                        1,
      $                                        WORK( KI+2+(IV)*N ), 1 )
                      WORK( J+(IV+1)*N ) = WORK( J+(IV+1)*N ) -
-     $                                  SDOT( J-KI-2, T( KI+2, J ), 1,
+     $                                  SDOT( J-KI-2, T( KI+2, J ),
+     $                                        1,
      $                                        WORK( KI+2+(IV+1)*N ), 1 )
 *
 *                    Solve [ T(J,J)-(WR-i*WI) ]*(X11+i*X12)= WK+I*WK2
 *
-                     CALL SLALN2( .FALSE., 1, 2, SMIN, ONE, T( J, J ),
+                     CALL SLALN2( .FALSE., 1, 2, SMIN, ONE, T( J,
+     $                            J ),
      $                            LDT, ONE, ONE, WORK( J+IV*N ), N, WR,
      $                            -WI, X, 2, SCALE, XNORM, IERR )
 *
 *                    Scale if necessary
 *
                      IF( SCALE.NE.ONE ) THEN
-                        CALL SSCAL( N-KI+1, SCALE, WORK(KI+(IV  )*N), 1)
-                        CALL SSCAL( N-KI+1, SCALE, WORK(KI+(IV+1)*N), 1)
+                        CALL SSCAL( N-KI+1, SCALE, WORK(KI+(IV  )*N),
+     $                              1)
+                        CALL SSCAL( N-KI+1, SCALE, WORK(KI+(IV+1)*N),
+     $                              1)
                      END IF
                      WORK( J+(IV  )*N ) = X( 1, 1 )
                      WORK( J+(IV+1)*N ) = X( 1, 2 )
@@ -1121,8 +1141,10 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
                      BETA = MAX( WORK( J ), WORK( J+1 ) )
                      IF( BETA.GT.VCRIT ) THEN
                         REC = ONE / VMAX
-                        CALL SSCAL( N-KI+1, REC, WORK(KI+(IV  )*N), 1 )
-                        CALL SSCAL( N-KI+1, REC, WORK(KI+(IV+1)*N), 1 )
+                        CALL SSCAL( N-KI+1, REC, WORK(KI+(IV  )*N),
+     $                              1 )
+                        CALL SSCAL( N-KI+1, REC, WORK(KI+(IV+1)*N),
+     $                              1 )
                         VMAX = ONE
                         VCRIT = BIGNUM
                      END IF
@@ -1136,11 +1158,13 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
      $                                      WORK( KI+2+(IV+1)*N ), 1 )
 *
                      WORK( J+1+(IV  )*N ) = WORK( J+1+(IV)*N ) -
-     $                                SDOT( J-KI-2, T( KI+2, J+1 ), 1,
+     $                                SDOT( J-KI-2, T( KI+2, J+1 ),
+     $                                      1,
      $                                      WORK( KI+2+(IV)*N ), 1 )
 *
                      WORK( J+1+(IV+1)*N ) = WORK( J+1+(IV+1)*N ) -
-     $                                SDOT( J-KI-2, T( KI+2, J+1 ), 1,
+     $                                SDOT( J-KI-2, T( KI+2, J+1 ),
+     $                                      1,
      $                                      WORK( KI+2+(IV+1)*N ), 1 )
 *
 *                    Solve 2-by-2 complex linear equation
@@ -1154,8 +1178,10 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
 *                    Scale if necessary
 *
                      IF( SCALE.NE.ONE ) THEN
-                        CALL SSCAL( N-KI+1, SCALE, WORK(KI+(IV  )*N), 1)
-                        CALL SSCAL( N-KI+1, SCALE, WORK(KI+(IV+1)*N), 1)
+                        CALL SSCAL( N-KI+1, SCALE, WORK(KI+(IV  )*N),
+     $                              1)
+                        CALL SSCAL( N-KI+1, SCALE, WORK(KI+(IV+1)*N),
+     $                              1)
                      END IF
                      WORK( J  +(IV  )*N ) = X( 1, 1 )
                      WORK( J  +(IV+1)*N ) = X( 1, 2 )
@@ -1208,8 +1234,10 @@ SUBROUTINE STREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
      $                           WORK( KI+1 + (IV+1)*N ),
      $                           VL( 1, KI+1 ), 1 )
                   ELSE
-                     CALL SSCAL( N, WORK(KI+  (IV  )*N), VL(1, KI  ), 1)
-                     CALL SSCAL( N, WORK(KI+1+(IV+1)*N), VL(1, KI+1), 1)
+                     CALL SSCAL( N, WORK(KI+  (IV  )*N), VL(1, KI  ),
+     $                           1)
+                     CALL SSCAL( N, WORK(KI+1+(IV+1)*N), VL(1, KI+1),
+     $                           1)
                   END IF
 *
                   EMAX = ZERO
diff --git a/SRC/strexc.f b/SRC/strexc.f
index e66b892220..01fc56a3d2 100644
--- a/SRC/strexc.f
+++ b/SRC/strexc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STREXC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/strexc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/strexc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -140,11 +138,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup trexc
 *
 *  =====================================================================
       SUBROUTINE STREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -295,7 +294,8 @@ SUBROUTINE STREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, WORK,
 *
 *              Swap two 1 by 1 blocks, no problems possible
 *
-               CALL SLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE, 1, NBNEXT,
+               CALL SLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE, 1,
+     $                      NBNEXT,
      $                      WORK, INFO )
                HERE = HERE + 1
             ELSE
@@ -321,7 +321,8 @@ SUBROUTINE STREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, WORK,
 *
                   CALL SLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE, 1, 1,
      $                         WORK, INFO )
-                  CALL SLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE+1, 1, 1,
+                  CALL SLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE+1, 1,
+     $                         1,
      $                         WORK, INFO )
                   HERE = HERE + 2
                END IF
@@ -346,7 +347,8 @@ SUBROUTINE STREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, WORK,
                IF( T( HERE-1, HERE-2 ).NE.ZERO )
      $            NBNEXT = 2
             END IF
-            CALL SLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE-NBNEXT, NBNEXT,
+            CALL SLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE-NBNEXT,
+     $                   NBNEXT,
      $                   NBF, WORK, INFO )
             IF( INFO.NE.0 ) THEN
                ILST = HERE
@@ -371,7 +373,8 @@ SUBROUTINE STREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, WORK,
                IF( T( HERE-1, HERE-2 ).NE.ZERO )
      $            NBNEXT = 2
             END IF
-            CALL SLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE-NBNEXT, NBNEXT,
+            CALL SLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE-NBNEXT,
+     $                   NBNEXT,
      $                   1, WORK, INFO )
             IF( INFO.NE.0 ) THEN
                ILST = HERE
@@ -381,7 +384,8 @@ SUBROUTINE STREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, WORK,
 *
 *              Swap two 1 by 1 blocks, no problems possible
 *
-               CALL SLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE, NBNEXT, 1,
+               CALL SLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE, NBNEXT,
+     $                      1,
      $                      WORK, INFO )
                HERE = HERE - 1
             ELSE
@@ -394,7 +398,8 @@ SUBROUTINE STREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, WORK,
 *
 *                 2 by 2 Block did not split
 *
-                  CALL SLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE-1, 2, 1,
+                  CALL SLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE-1, 2,
+     $                         1,
      $                         WORK, INFO )
                   IF( INFO.NE.0 ) THEN
                      ILST = HERE
@@ -407,7 +412,8 @@ SUBROUTINE STREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, WORK,
 *
                   CALL SLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE, 1, 1,
      $                         WORK, INFO )
-                  CALL SLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE-1, 1, 1,
+                  CALL SLAEXC( WANTQ, N, T, LDT, Q, LDQ, HERE-1, 1,
+     $                         1,
      $                         WORK, INFO )
                   HERE = HERE - 2
                END IF
diff --git a/SRC/strrfs.f b/SRC/strrfs.f
index 8ac2257ea6..64ac8ac59f 100644
--- a/SRC/strrfs.f
+++ b/SRC/strrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STRRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/strrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/strrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -174,11 +172,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup trrfs
 *
 *  =====================================================================
-      SUBROUTINE STRRFS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB, X,
+      SUBROUTINE STRRFS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB,
+     $                   X,
      $                   LDX, FERR, BERR, WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -212,7 +212,8 @@ SUBROUTINE STRRFS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB, X,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SLACN2, STRMV, STRSV, XERBLA
+      EXTERNAL           SAXPY, SCOPY, SLACN2, STRMV, STRSV,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX
@@ -275,7 +276,7 @@ SUBROUTINE STRRFS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB, X,
       NZ = N + 1
       EPS = SLAMCH( 'Epsilon' )
       SAFMIN = SLAMCH( 'Safe minimum' )
-      SAFE1 = NZ*SAFMIN
+      SAFE1 = REAL( NZ )*SAFMIN
       SAFE2 = SAFE1 / EPS
 *
 *     Do for each right hand side
@@ -418,22 +419,25 @@ SUBROUTINE STRRFS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB, X,
 *
          DO 200 I = 1, N
             IF( WORK( I ).GT.SAFE2 ) THEN
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I )
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
             ELSE
-               WORK( I ) = ABS( WORK( N+I ) ) + NZ*EPS*WORK( I ) + SAFE1
+               WORK( I ) = ABS( WORK( N+I ) ) + REAL( NZ )*EPS*WORK( I )
+     $                     + SAFE1
             END IF
   200    CONTINUE
 *
          KASE = 0
   210    CONTINUE
-         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK, FERR( J ),
+         CALL SLACN2( N, WORK( 2*N+1 ), WORK( N+1 ), IWORK,
+     $                FERR( J ),
      $                KASE, ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
 *
 *              Multiply by diag(W)*inv(op(A)**T).
 *
-               CALL STRSV( UPLO, TRANST, DIAG, N, A, LDA, WORK( N+1 ),
+               CALL STRSV( UPLO, TRANST, DIAG, N, A, LDA,
+     $                     WORK( N+1 ),
      $                     1 )
                DO 220 I = 1, N
                   WORK( N+I ) = WORK( I )*WORK( N+I )
diff --git a/SRC/strsen.f b/SRC/strsen.f
index c0f75fb129..eb34af9c35 100644
--- a/SRC/strsen.f
+++ b/SRC/strsen.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STRSEN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/strsen.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/strsen.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -231,7 +229,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup trsen
 *
 *> \par Further Details:
 *  =====================
@@ -309,8 +307,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE STRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, WR, WI,
+      SUBROUTINE STRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, WR,
+     $                   WI,
      $                   M, S, SEP, WORK, LWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -346,11 +346,12 @@ SUBROUTINE STRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, WR, WI,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               SLANGE
-      EXTERNAL           LSAME, SLANGE
+      REAL               SLANGE, SROUNDUP_LWORK
+      EXTERNAL           LSAME, SLANGE, SROUNDUP_LWORK
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLACN2, SLACPY, STREXC, STRSYL, XERBLA
+      EXTERNAL           SLACN2, SLACPY, STREXC, STRSYL,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
@@ -427,7 +428,7 @@ SUBROUTINE STRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, WR, WI,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         WORK( 1 ) = LWMIN
+         WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
          IWORK( 1 ) = LIWMIN
       END IF
 *
@@ -471,7 +472,8 @@ SUBROUTINE STRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, WR, WI,
                IERR = 0
                KK = K
                IF( K.NE.KS )
-     $            CALL STREXC( COMPQ, N, T, LDT, Q, LDQ, KK, KS, WORK,
+     $            CALL STREXC( COMPQ, N, T, LDT, Q, LDQ, KK, KS,
+     $                         WORK,
      $                         IERR )
                IF( IERR.EQ.1 .OR. IERR.EQ.2 ) THEN
 *
@@ -519,7 +521,8 @@ SUBROUTINE STRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, WR, WI,
          EST = ZERO
          KASE = 0
    30    CONTINUE
-         CALL SLACN2( NN, WORK( NN+1 ), WORK, IWORK, EST, KASE, ISAVE )
+         CALL SLACN2( NN, WORK( NN+1 ), WORK, IWORK, EST, KASE,
+     $                ISAVE )
          IF( KASE.NE.0 ) THEN
             IF( KASE.EQ.1 ) THEN
 *
@@ -558,7 +561,7 @@ SUBROUTINE STRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, WR, WI,
          END IF
    60 CONTINUE
 *
-      WORK( 1 ) = LWMIN
+      WORK( 1 ) = SROUNDUP_LWORK(LWMIN)
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/strsna.f b/SRC/strsna.f
index 6d98ac27f2..598d2717e5 100644
--- a/SRC/strsna.f
+++ b/SRC/strsna.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STRSNA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/strsna.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/strsna.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -213,7 +211,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup trsna
 *
 *> \par Further Details:
 *  =====================
@@ -259,9 +257,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE STRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
+      SUBROUTINE STRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
+     $                   VR,
      $                   LDVR, S, SEP, MM, M, WORK, LDWORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -300,7 +300,8 @@ SUBROUTINE STRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
       EXTERNAL           LSAME, SDOT, SLAMCH, SLAPY2, SNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLABAD, SLACN2, SLACPY, SLAQTR, STREXC, XERBLA
+      EXTERNAL           SLACN2, SLACPY, SLAQTR, STREXC,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
@@ -392,7 +393,6 @@ SUBROUTINE STRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
       KS = 0
       PAIR = .FALSE.
@@ -441,10 +441,12 @@ SUBROUTINE STRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *              Complex eigenvalue.
 *
                PROD1 = SDOT( N, VR( 1, KS ), 1, VL( 1, KS ), 1 )
-               PROD1 = PROD1 + SDOT( N, VR( 1, KS+1 ), 1, VL( 1, KS+1 ),
+               PROD1 = PROD1 + SDOT( N, VR( 1, KS+1 ), 1, VL( 1,
+     $                               KS+1 ),
      $                 1 )
                PROD2 = SDOT( N, VL( 1, KS ), 1, VR( 1, KS+1 ), 1 )
-               PROD2 = PROD2 - SDOT( N, VL( 1, KS+1 ), 1, VR( 1, KS ),
+               PROD2 = PROD2 - SDOT( N, VL( 1, KS+1 ), 1, VR( 1,
+     $                               KS ),
      $                 1 )
                RNRM = SLAPY2( SNRM2( N, VR( 1, KS ), 1 ),
      $                SNRM2( N, VR( 1, KS+1 ), 1 ) )
@@ -467,7 +469,8 @@ SUBROUTINE STRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
             CALL SLACPY( 'Full', N, N, T, LDT, WORK, LDWORK )
             IFST = K
             ILST = 1
-            CALL STREXC( 'No Q', N, WORK, LDWORK, DUMMY, 1, IFST, ILST,
+            CALL STREXC( 'No Q', N, WORK, LDWORK, DUMMY, 1, IFST,
+     $                   ILST,
      $                   WORK( 1, N+1 ), IERR )
 *
             IF( IERR.EQ.1 .OR. IERR.EQ.2 ) THEN
@@ -535,7 +538,8 @@ SUBROUTINE STRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
                EST = ZERO
                KASE = 0
    50          CONTINUE
-               CALL SLACN2( NN, WORK( 1, N+2 ), WORK( 1, N+4 ), IWORK,
+               CALL SLACN2( NN, WORK( 1, N+2 ), WORK( 1, N+4 ),
+     $                      IWORK,
      $                      EST, KASE, ISAVE )
                IF( KASE.NE.0 ) THEN
                   IF( KASE.EQ.1 ) THEN
@@ -543,7 +547,8 @@ SUBROUTINE STRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
 *                       Real eigenvalue: solve C**T*x = scale*c.
 *
-                        CALL SLAQTR( .TRUE., .TRUE., N-1, WORK( 2, 2 ),
+                        CALL SLAQTR( .TRUE., .TRUE., N-1, WORK( 2,
+     $                               2 ),
      $                               LDWORK, DUMMY, DUMM, SCALE,
      $                               WORK( 1, N+4 ), WORK( 1, N+6 ),
      $                               IERR )
@@ -552,7 +557,8 @@ SUBROUTINE STRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *                       Complex eigenvalue: solve
 *                       C**T*(p+iq) = scale*(c+id) in real arithmetic.
 *
-                        CALL SLAQTR( .TRUE., .FALSE., N-1, WORK( 2, 2 ),
+                        CALL SLAQTR( .TRUE., .FALSE., N-1, WORK( 2,
+     $                               2 ),
      $                               LDWORK, WORK( 1, N+1 ), MU, SCALE,
      $                               WORK( 1, N+4 ), WORK( 1, N+6 ),
      $                               IERR )
@@ -562,7 +568,8 @@ SUBROUTINE STRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
 *                       Real eigenvalue: solve C*x = scale*c.
 *
-                        CALL SLAQTR( .FALSE., .TRUE., N-1, WORK( 2, 2 ),
+                        CALL SLAQTR( .FALSE., .TRUE., N-1, WORK( 2,
+     $                               2 ),
      $                               LDWORK, DUMMY, DUMM, SCALE,
      $                               WORK( 1, N+4 ), WORK( 1, N+6 ),
      $                               IERR )
diff --git a/SRC/strsyl.f b/SRC/strsyl.f
index e1f90d2c99..30b4375c37 100644
--- a/SRC/strsyl.f
+++ b/SRC/strsyl.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STRSYL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/strsyl.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/strsyl.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -156,11 +154,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realSYcomputational
+*> \ingroup trsyl
 *
 *  =====================================================================
       SUBROUTINE STRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
      $                   LDC, SCALE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -196,7 +195,7 @@ SUBROUTINE STRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
       EXTERNAL           LSAME, SDOT, SLAMCH, SLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLABAD, SLALN2, SLASY2, SSCAL, XERBLA
+      EXTERNAL           SLALN2, SLASY2, SSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, REAL
@@ -244,14 +243,13 @@ SUBROUTINE STRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       SMLNUM = SMLNUM*REAL( M*N ) / EPS
       BIGNUM = ONE / SMLNUM
 *
       SMIN = MAX( SMLNUM, EPS*SLANGE( 'M', M, M, A, LDA, DUM ),
      $       EPS*SLANGE( 'M', N, N, B, LDB, DUM ) )
 *
-      SGN = ISGN
+      SGN = REAL( ISGN )
 *
       IF( NOTRNA .AND. NOTRNB ) THEN
 *
@@ -592,7 +590,8 @@ SUBROUTINE STRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
                   SUMR = SDOT( L1-1, C( K2, 1 ), LDC, B( 1, L2 ), 1 )
                   VEC( 2, 2 ) = C( K2, L2 ) - ( SUML+SGN*SUMR )
 *
-                  CALL SLASY2( .TRUE., .FALSE., ISGN, 2, 2, A( K1, K1 ),
+                  CALL SLASY2( .TRUE., .FALSE., ISGN, 2, 2, A( K1,
+     $                         K1 ),
      $                         LDA, B( L1, L1 ), LDB, VEC, 2, SCALOC, X,
      $                         2, XNORM, IERR )
                   IF( IERR.NE.0 )
@@ -776,7 +775,8 @@ SUBROUTINE STRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
      $                         B( L2, MIN(L2+1, N ) ), LDB )
                   VEC( 2, 2 ) = C( K2, L2 ) - ( SUML+SGN*SUMR )
 *
-                  CALL SLASY2( .TRUE., .TRUE., ISGN, 2, 2, A( K1, K1 ),
+                  CALL SLASY2( .TRUE., .TRUE., ISGN, 2, 2, A( K1,
+     $                         K1 ),
      $                         LDA, B( L1, L1 ), LDB, VEC, 2, SCALOC, X,
      $                         2, XNORM, IERR )
                   IF( IERR.NE.0 )
@@ -969,7 +969,8 @@ SUBROUTINE STRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
      $                         B( L2, MIN( L2+1, N ) ), LDB )
                   VEC( 2, 2 ) = C( K2, L2 ) - ( SUML+SGN*SUMR )
 *
-                  CALL SLASY2( .FALSE., .TRUE., ISGN, 2, 2, A( K1, K1 ),
+                  CALL SLASY2( .FALSE., .TRUE., ISGN, 2, 2, A( K1,
+     $                         K1 ),
      $                         LDA, B( L1, L1 ), LDB, VEC, 2, SCALOC, X,
      $                         2, XNORM, IERR )
                   IF( IERR.NE.0 )
diff --git a/SRC/strsyl3.f b/SRC/strsyl3.f
new file mode 100644
index 0000000000..5f1d70dbba
--- /dev/null
+++ b/SRC/strsyl3.f
@@ -0,0 +1,1265 @@
+*> \brief \b STRSYL3
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE STRSYL3( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB,
+*                           C, LDC, SCALE, IWORK, LIWORK, SWORK,
+*                           LDSWORK, INFO )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          TRANA, TRANB
+*       INTEGER            INFO, ISGN, LDA, LDB, LDC, M, N,
+*                          LIWORK, LDSWORK
+*       REAL               SCALE
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            IWORK( * )
+*       REAL               A( LDA, * ), B( LDB, * ), C( LDC, * ),
+*                          SWORK( LDSWORK, * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*>  STRSYL3 solves the real Sylvester matrix equation:
+*>
+*>     op(A)*X + X*op(B) = scale*C or
+*>     op(A)*X - X*op(B) = scale*C,
+*>
+*>  where op(A) = A or A**T, and  A and B are both upper quasi-
+*>  triangular. A is M-by-M and B is N-by-N; the right hand side C and
+*>  the solution X are M-by-N; and scale is an output scale factor, set
+*>  <= 1 to avoid overflow in X.
+*>
+*>  A and B must be in Schur canonical form (as returned by SHSEQR), that
+*>  is, block upper triangular with 1-by-1 and 2-by-2 diagonal blocks;
+*>  each 2-by-2 diagonal block has its diagonal elements equal and its
+*>  off-diagonal elements of opposite sign.
+*>
+*>  This is the block version of the algorithm.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] TRANA
+*> \verbatim
+*>          TRANA is CHARACTER*1
+*>          Specifies the option op(A):
+*>          = 'N': op(A) = A    (No transpose)
+*>          = 'T': op(A) = A**T (Transpose)
+*>          = 'C': op(A) = A**H (Conjugate transpose = Transpose)
+*> \endverbatim
+*>
+*> \param[in] TRANB
+*> \verbatim
+*>          TRANB is CHARACTER*1
+*>          Specifies the option op(B):
+*>          = 'N': op(B) = B    (No transpose)
+*>          = 'T': op(B) = B**T (Transpose)
+*>          = 'C': op(B) = B**H (Conjugate transpose = Transpose)
+*> \endverbatim
+*>
+*> \param[in] ISGN
+*> \verbatim
+*>          ISGN is INTEGER
+*>          Specifies the sign in the equation:
+*>          = +1: solve op(A)*X + X*op(B) = scale*C
+*>          = -1: solve op(A)*X - X*op(B) = scale*C
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The order of the matrix A, and the number of rows in the
+*>          matrices X and C. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix B, and the number of columns in the
+*>          matrices X and C. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is REAL array, dimension (LDA,M)
+*>          The upper quasi-triangular matrix A, in Schur canonical form.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in] B
+*> \verbatim
+*>          B is REAL array, dimension (LDB,N)
+*>          The upper quasi-triangular matrix B, in Schur canonical form.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= max(1,N).
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is REAL array, dimension (LDC,N)
+*>          On entry, the M-by-N right hand side matrix C.
+*>          On exit, C is overwritten by the solution matrix X.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M)
+*> \endverbatim
+*>
+*> \param[out] SCALE
+*> \verbatim
+*>          SCALE is REAL
+*>          The scale factor, scale, set <= 1 to avoid overflow in X.
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (MAX(1,LIWORK))
+*>          On exit, if INFO = 0, IWORK(1) returns the optimal LIWORK.
+*> \endverbatim
+*>
+*> \param[in] LIWORK
+*> \verbatim
+*>          IWORK is INTEGER
+*>          The dimension of the array IWORK. LIWORK >=  ((M + NB - 1) / NB + 1)
+*>          + ((N + NB - 1) / NB + 1), where NB is the optimal block size.
+*>
+*>          If LIWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal dimension of the IWORK array,
+*>          returns this value as the first entry of the IWORK array, and
+*>          no error message related to LIWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] SWORK
+*> \verbatim
+*>          SWORK is REAL array, dimension (MAX(2, ROWS),
+*>          MAX(1,COLS)).
+*>          On exit, if INFO = 0, SWORK(1) returns the optimal value ROWS
+*>          and SWORK(2) returns the optimal COLS.
+*> \endverbatim
+*>
+*> \param[in] LDSWORK
+*> \verbatim
+*>          LDSWORK is INTEGER
+*>          LDSWORK >= MAX(2,ROWS), where ROWS = ((M + NB - 1) / NB + 1)
+*>          and NB is the optimal block size.
+*>
+*>          If LDSWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal dimensions of the SWORK matrix,
+*>          returns these values as the first and second entry of the SWORK
+*>          matrix, and no error message related LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0: successful exit
+*>          < 0: if INFO = -i, the i-th argument had an illegal value
+*>          = 1: A and B have common or very close eigenvalues; perturbed
+*>               values were used to solve the equation (but the matrices
+*>               A and B are unchanged).
+*> \endverbatim
+*
+*> \ingroup trsyl3
+*
+*  =====================================================================
+*  References:
+*   E. S. Quintana-Orti and R. A. Van De Geijn (2003). Formal derivation of
+*   algorithms: The triangular Sylvester equation, ACM Transactions
+*   on Mathematical Software (TOMS), volume 29, pages 218--243.
+*
+*   A. Schwarz and C. C. Kjelgaard Mikkelsen (2020). Robust Task-Parallel
+*   Solution of the Triangular Sylvester Equation. Lecture Notes in
+*   Computer Science, vol 12043, pages 82--92, Springer.
+*
+*  Contributor:
+*   Angelika Schwarz, Umea University, Sweden.
+*
+*  =====================================================================
+      SUBROUTINE STRSYL3( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB,
+     $                    C, LDC, SCALE, IWORK, LIWORK, SWORK,
+     $                    LDSWORK, INFO )
+      IMPLICIT NONE
+*
+*     .. Scalar Arguments ..
+      CHARACTER          TRANA, TRANB
+      INTEGER            INFO, ISGN, LDA, LDB, LDC, M, N,
+     $                   LIWORK, LDSWORK
+      REAL               SCALE
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IWORK( * )
+      REAL               A( LDA, * ), B( LDB, * ), C( LDC, * ),
+     $                   SWORK( LDSWORK, * )
+*     ..
+*     .. Parameters ..
+      REAL               ZERO, ONE
+      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            NOTRNA, NOTRNB, LQUERY, SKIP
+      INTEGER            AWRK, BWRK, I, I1, I2, IINFO, J, J1, J2, JJ,
+     $                   K, K1, K2, L, L1, L2, LL, NBA, NB, NBB, PC
+      REAL               ANRM, BIGNUM, BNRM, CNRM, SCAL, SCALOC,
+     $                   SCAMIN, SGN, XNRM, BUF, SMLNUM
+*     ..
+*     .. Local Arrays ..
+      REAL               WNRM( MAX( M, N ) )
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      REAL               SLANGE, SLAMCH, SLARMM
+      EXTERNAL           SLANGE, SLAMCH, SLARMM, ILAENV,
+     $                   LSAME
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           SGEMM, SLASCL, SSCAL, STRSYL,
+     $                   XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, EXPONENT, MAX, MIN, REAL
+*     ..
+*     .. Executable Statements ..
+*
+*     Decode and Test input parameters
+*
+      NOTRNA = LSAME( TRANA, 'N' )
+      NOTRNB = LSAME( TRANB, 'N' )
+*
+*     Use the same block size for all matrices.
+*
+      NB = MAX(8, ILAENV( 1, 'STRSYL', '', M, N, -1, -1) )
+*
+*     Compute number of blocks in A and B
+*
+      NBA = MAX( 1, (M + NB - 1) / NB )
+      NBB = MAX( 1, (N + NB - 1) / NB )
+*
+*     Compute workspace
+*
+      INFO = 0
+      LQUERY = ( LIWORK.EQ.-1 .OR. LDSWORK.EQ.-1 )
+      IWORK( 1 ) = NBA + NBB + 2
+      IF( LQUERY ) THEN
+         LDSWORK = 2
+         SWORK( 1, 1 ) = REAL( MAX( NBA, NBB ) )
+         SWORK( 2, 1 ) = REAL( 2 * NBB + NBA )
+      END IF
+*
+*     Test the input arguments
+*
+      IF( .NOT.NOTRNA .AND. .NOT.LSAME( TRANA, 'T' ) .AND. .NOT.
+     $    LSAME( TRANA, 'C' ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.NOTRNB .AND. .NOT.LSAME( TRANB, 'T' ) .AND. .NOT.
+     $         LSAME( TRANB, 'C' ) ) THEN
+         INFO = -2
+      ELSE IF( ISGN.NE.1 .AND. ISGN.NE.-1 ) THEN
+         INFO = -3
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -5
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -7
+      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+         INFO = -9
+      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
+         INFO = -11
+      ELSE IF( .NOT.LQUERY .AND. LIWORK.LT.IWORK(1) ) THEN
+         INFO = -14
+      ELSE IF( .NOT.LQUERY .AND. LDSWORK.LT.MAX( NBA, NBB ) ) THEN
+         INFO = -16
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'STRSYL3', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      SCALE = ONE
+      IF( M.EQ.0 .OR. N.EQ.0 )
+     $   RETURN
+*
+*     Use unblocked code for small problems or if insufficient
+*     workspaces are provided
+*
+      IF( MIN( NBA, NBB ).EQ.1 .OR. LDSWORK.LT.MAX( NBA, NBB ) .OR.
+     $    LIWORK.LT.IWORK(1) ) THEN
+        CALL STRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB,
+     $               C, LDC, SCALE, INFO )
+        RETURN
+      END IF
+*
+*     Set constants to control overflow
+*
+      SMLNUM = SLAMCH( 'S' )
+      BIGNUM = ONE / SMLNUM
+*
+*      Partition A such that 2-by-2 blocks on the diagonal are not split
+*
+       SKIP = .FALSE.
+       DO I = 1, NBA
+          IWORK( I ) = ( I - 1 ) * NB + 1
+       END DO
+       IWORK( NBA + 1 ) = M + 1
+       DO K = 1, NBA
+          L1 = IWORK( K )
+          L2 = IWORK( K + 1 ) - 1
+          DO L = L1, L2
+             IF( SKIP ) THEN
+                SKIP = .FALSE.
+                CYCLE
+             END IF
+             IF( L.GE.M ) THEN
+*               A( M, M ) is a 1-by-1 block
+                CYCLE
+             END IF
+             IF( A( L, L+1 ).NE.ZERO .AND. A( L+1, L ).NE.ZERO ) THEN
+*               Check if 2-by-2 block is split
+                IF( L + 1 .EQ. IWORK( K + 1 ) ) THEN
+                   IWORK( K + 1 ) = IWORK( K + 1 ) + 1
+                   CYCLE
+                END IF
+                SKIP = .TRUE.
+             END IF
+          END DO
+       END DO
+       IWORK( NBA + 1 ) = M + 1
+       IF( IWORK( NBA ).GE.IWORK( NBA + 1 ) ) THEN
+          IWORK( NBA ) = IWORK( NBA + 1 )
+          NBA = NBA - 1
+       END IF
+*
+*      Partition B such that 2-by-2 blocks on the diagonal are not split
+*
+       PC = NBA + 1
+       SKIP = .FALSE.
+       DO I = 1, NBB
+          IWORK( PC + I ) = ( I - 1 ) * NB + 1
+       END DO
+       IWORK( PC + NBB + 1 ) = N + 1
+       DO K = 1, NBB
+          L1 = IWORK( PC + K )
+          L2 = IWORK( PC + K + 1 ) - 1
+          DO L = L1, L2
+             IF( SKIP ) THEN
+                SKIP = .FALSE.
+                CYCLE
+             END IF
+             IF( L.GE.N ) THEN
+*               B( N, N ) is a 1-by-1 block
+                CYCLE
+             END IF
+             IF( B( L, L+1 ).NE.ZERO .AND. B( L+1, L ).NE.ZERO ) THEN
+*               Check if 2-by-2 block is split
+                IF( L + 1 .EQ. IWORK( PC + K + 1 ) ) THEN
+                   IWORK( PC + K + 1 ) = IWORK( PC + K + 1 ) + 1
+                   CYCLE
+                END IF
+                SKIP = .TRUE.
+             END IF
+          END DO
+       END DO
+       IWORK( PC + NBB + 1 ) = N + 1
+       IF( IWORK( PC + NBB ).GE.IWORK( PC + NBB + 1 ) ) THEN
+          IWORK( PC + NBB ) = IWORK( PC + NBB + 1 )
+          NBB = NBB - 1
+       END IF
+*
+*     Set local scaling factors - must never attain zero.
+*
+      DO L = 1, NBB
+         DO K = 1, NBA
+            SWORK( K, L ) = ONE
+         END DO
+      END DO
+*
+*     Fallback scaling factor to prevent flushing of SWORK( K, L ) to zero.
+*     This scaling is to ensure compatibility with TRSYL and may get flushed.
+*
+      BUF = ONE
+*
+*     Compute upper bounds of blocks of A and B
+*
+      AWRK = NBB
+      DO K = 1, NBA
+         K1 = IWORK( K )
+         K2 = IWORK( K + 1 )
+         DO L = K, NBA
+            L1 = IWORK( L )
+            L2 = IWORK( L + 1 )
+            IF( NOTRNA ) THEN
+               SWORK( K, AWRK + L ) = SLANGE( 'I', K2-K1, L2-L1,
+     $                                        A( K1, L1 ), LDA, WNRM )
+            ELSE
+               SWORK( L, AWRK + K ) = SLANGE( '1', K2-K1, L2-L1,
+     $                                        A( K1, L1 ), LDA, WNRM )
+            END IF
+         END DO
+      END DO
+      BWRK = NBB + NBA
+      DO K = 1, NBB
+         K1 = IWORK( PC + K )
+         K2 = IWORK( PC + K + 1 )
+         DO L = K, NBB
+            L1 = IWORK( PC + L )
+            L2 = IWORK( PC + L + 1 )
+            IF( NOTRNB ) THEN
+               SWORK( K, BWRK + L ) = SLANGE( 'I', K2-K1, L2-L1,
+     $                                        B( K1, L1 ), LDB, WNRM )
+            ELSE
+               SWORK( L, BWRK + K ) = SLANGE( '1', K2-K1, L2-L1,
+     $                                        B( K1, L1 ), LDB, WNRM )
+            END IF
+         END DO
+      END DO
+*
+      SGN = REAL( ISGN )
+*
+      IF( NOTRNA .AND. NOTRNB ) THEN
+*
+*        Solve    A*X + ISGN*X*B = scale*C.
+*
+*        The (K,L)th block of X is determined starting from
+*        bottom-left corner column by column by
+*
+*         A(K,K)*X(K,L) + ISGN*X(K,L)*B(L,L) = C(K,L) - R(K,L)
+*
+*        Where
+*                  M                         L-1
+*        R(K,L) = SUM [A(K,I)*X(I,L)] + ISGN*SUM [X(K,J)*B(J,L)].
+*                I=K+1                       J=1
+*
+*        Start loop over block rows (index = K) and block columns (index = L)
+*
+         DO K = NBA, 1, -1
+*
+*           K1: row index of the first row in X( K, L )
+*           K2: row index of the first row in X( K+1, L )
+*           so the K2 - K1 is the column count of the block X( K, L )
+*
+            K1 = IWORK( K )
+            K2 = IWORK( K + 1 )
+            DO L = 1, NBB
+*
+*              L1: column index of the first column in X( K, L )
+*              L2: column index of the first column in X( K, L + 1)
+*              so that L2 - L1 is the row count of the block X( K, L )
+*
+               L1 = IWORK( PC + L )
+               L2 = IWORK( PC + L + 1 )
+*
+               CALL STRSYL( TRANA, TRANB, ISGN, K2-K1, L2-L1,
+     $                      A( K1, K1 ), LDA,
+     $                      B( L1, L1 ), LDB,
+     $                      C( K1, L1 ), LDC, SCALOC, IINFO )
+               INFO = MAX( INFO, IINFO )
+*
+               IF ( SCALOC * SWORK( K, L ) .EQ. ZERO ) THEN
+                  IF( SCALOC .EQ. ZERO ) THEN
+*                    The magnitude of the largest entry of X(K1:K2-1, L1:L2-1)
+*                    is larger than the product of BIGNUM**2 and cannot be
+*                    represented in the form (1/SCALE)*X(K1:K2-1, L1:L2-1).
+*                    Mark the computation as pointless.
+                     BUF = ZERO
+                  ELSE
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                  END IF
+                  DO JJ = 1, NBB
+                     DO LL = 1, NBA
+*                       Bound by BIGNUM to not introduce Inf. The value
+*                       is irrelevant; corresponding entries of the
+*                       solution will be flushed in consistency scaling.
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                     END DO
+                  END DO
+               END IF
+               SWORK( K, L ) = SCALOC * SWORK( K, L )
+               XNRM = SLANGE( 'I', K2-K1, L2-L1, C( K1, L1 ), LDC,
+     $                        WNRM )
+*
+               DO I = K - 1, 1, -1
+*
+*                 C( I, L ) := C( I, L ) - A( I, K ) * C( K, L )
+*
+                  I1 = IWORK( I )
+                  I2 = IWORK( I + 1 )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = SLANGE( 'I', I2-I1, L2-L1, C( I1, L1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( I, L ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( I, L ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  ANRM = SWORK( I, AWRK + K )
+                  SCALOC = SLARMM( ANRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.E0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.E0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( I, L ) and C( K, L ).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF (SCAL .NE. ONE) THEN
+                      DO JJ = L1, L2-1
+                         CALL SSCAL( K2-K1, SCAL, C( K1, JJ ), 1)
+                      END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( I, L ) ) * SCALOC
+                  IF (SCAL .NE. ONE) THEN
+                      DO LL = L1, L2-1
+                         CALL SSCAL( I2-I1, SCAL, C( I1, LL ), 1)
+                      END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( I, L ) = SCAMIN * SCALOC
+*
+                  CALL SGEMM( 'N', 'N', I2-I1, L2-L1, K2-K1, -ONE,
+     $                        A( I1, K1 ), LDA, C( K1, L1 ), LDC,
+     $                        ONE, C( I1, L1 ), LDC )
+*
+               END DO
+*
+               DO J = L + 1, NBB
+*
+*                 C( K, J ) := C( K, J ) - SGN * C( K, L ) * B( L, J )
+*
+                  J1 = IWORK( PC + J )
+                  J2 = IWORK( PC + J + 1 )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = SLANGE( 'I', K2-K1, J2-J1, C( K1, J1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( K, J ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( K, J ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  BNRM = SWORK(L, BWRK + J)
+                  SCALOC = SLARMM( BNRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.E0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.E0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( K, J ) and C( K, L).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL SSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( K, J ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                      DO JJ = J1, J2-1
+                         CALL SSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                      END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( K, J ) = SCAMIN * SCALOC
+*
+                  CALL SGEMM( 'N', 'N', K2-K1, J2-J1, L2-L1, -SGN,
+     $                        C( K1, L1 ), LDC, B( L1, J1 ), LDB,
+     $                        ONE, C( K1, J1 ), LDC )
+               END DO
+            END DO
+         END DO
+      ELSE IF( .NOT.NOTRNA .AND. NOTRNB ) THEN
+*
+*        Solve    A**T*X + ISGN*X*B = scale*C.
+*
+*        The (K,L)th block of X is determined starting from
+*        upper-left corner column by column by
+*
+*          A(K,K)**T*X(K,L) + ISGN*X(K,L)*B(L,L) = C(K,L) - R(K,L)
+*
+*        Where
+*                   K-1                        L-1
+*          R(K,L) = SUM [A(I,K)**T*X(I,L)] +ISGN*SUM [X(K,J)*B(J,L)]
+*                   I=1                        J=1
+*
+*        Start loop over block rows (index = K) and block columns (index = L)
+*
+         DO K = 1, NBA
+*
+*           K1: row index of the first row in X( K, L )
+*           K2: row index of the first row in X( K+1, L )
+*           so the K2 - K1 is the column count of the block X( K, L )
+*
+            K1 = IWORK( K )
+            K2 = IWORK( K + 1 )
+            DO L = 1, NBB
+*
+*              L1: column index of the first column in X( K, L )
+*              L2: column index of the first column in X( K, L + 1)
+*              so that L2 - L1 is the row count of the block X( K, L )
+*
+               L1 = IWORK( PC + L )
+               L2 = IWORK( PC + L + 1 )
+*
+               CALL STRSYL( TRANA, TRANB, ISGN, K2-K1, L2-L1,
+     $                      A( K1, K1 ), LDA,
+     $                      B( L1, L1 ), LDB,
+     $                      C( K1, L1 ), LDC, SCALOC, IINFO )
+               INFO = MAX( INFO, IINFO )
+*
+               IF( SCALOC * SWORK( K, L ) .EQ. ZERO ) THEN
+                  IF( SCALOC .EQ. ZERO ) THEN
+*                    The magnitude of the largest entry of X(K1:K2-1, L1:L2-1)
+*                    is larger than the product of BIGNUM**2 and cannot be
+*                    represented in the form (1/SCALE)*X(K1:K2-1, L1:L2-1).
+*                    Mark the computation as pointless.
+                     BUF = ZERO
+                  ELSE
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                  END IF
+                  DO JJ = 1, NBB
+                     DO LL = 1, NBA
+*                       Bound by BIGNUM to not introduce Inf. The value
+*                       is irrelevant; corresponding entries of the
+*                       solution will be flushed in consistency scaling.
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                     END DO
+                  END DO
+               END IF
+               SWORK( K, L ) = SCALOC * SWORK( K, L )
+               XNRM = SLANGE( 'I', K2-K1, L2-L1, C( K1, L1 ), LDC,
+     $                        WNRM )
+*
+               DO I = K + 1, NBA
+*
+*                 C( I, L ) := C( I, L ) - A( K, I )**T * C( K, L )
+*
+                  I1 = IWORK( I )
+                  I2 = IWORK( I + 1 )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = SLANGE( 'I', I2-I1, L2-L1, C( I1, L1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( I, L ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( I, L ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  ANRM = SWORK( I, AWRK + K )
+                  SCALOC = SLARMM( ANRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.E0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.E0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to to C( I, L ) and C( K, L ).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF (SCAL .NE. ONE) THEN
+                     DO LL = L1, L2-1
+                        CALL SSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( I, L ) ) * SCALOC
+                  IF (SCAL .NE. ONE) THEN
+                     DO LL = L1, L2-1
+                        CALL SSCAL( I2-I1, SCAL, C( I1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( I, L ) = SCAMIN * SCALOC
+*
+                  CALL SGEMM( 'T', 'N', I2-I1, L2-L1, K2-K1, -ONE,
+     $                        A( K1, I1 ), LDA, C( K1, L1 ), LDC,
+     $                        ONE, C( I1, L1 ), LDC )
+               END DO
+*
+               DO J = L + 1, NBB
+*
+*                 C( K, J ) := C( K, J ) - SGN * C( K, L ) * B( L, J )
+*
+                  J1 = IWORK( PC + J )
+                  J2 = IWORK( PC + J + 1 )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = SLANGE( 'I', K2-K1, J2-J1, C( K1, J1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( K, J ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( K, J ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  BNRM = SWORK( L, BWRK + J )
+                  SCALOC = SLARMM( BNRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.E0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.E0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to to C( K, J ) and C( K, L ).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                      DO LL = L1, L2-1
+                         CALL SSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                      END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( K, J ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO JJ = J1, J2-1
+                        CALL SSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( K, J ) = SCAMIN * SCALOC
+*
+                  CALL SGEMM( 'N', 'N', K2-K1, J2-J1, L2-L1, -SGN,
+     $                        C( K1, L1 ), LDC, B( L1, J1 ), LDB,
+     $                        ONE, C( K1, J1 ), LDC )
+               END DO
+            END DO
+         END DO
+      ELSE IF( .NOT.NOTRNA .AND. .NOT.NOTRNB ) THEN
+*
+*        Solve    A**T*X + ISGN*X*B**T = scale*C.
+*
+*        The (K,L)th block of X is determined starting from
+*        top-right corner column by column by
+*
+*           A(K,K)**T*X(K,L) + ISGN*X(K,L)*B(L,L)**T = C(K,L) - R(K,L)
+*
+*        Where
+*                     K-1                          N
+*            R(K,L) = SUM [A(I,K)**T*X(I,L)] + ISGN*SUM [X(K,J)*B(L,J)**T].
+*                     I=1                        J=L+1
+*
+*        Start loop over block rows (index = K) and block columns (index = L)
+*
+         DO K = 1, NBA
+*
+*           K1: row index of the first row in X( K, L )
+*           K2: row index of the first row in X( K+1, L )
+*           so the K2 - K1 is the column count of the block X( K, L )
+*
+            K1 = IWORK( K )
+            K2 = IWORK( K + 1 )
+            DO L = NBB, 1, -1
+*
+*              L1: column index of the first column in X( K, L )
+*              L2: column index of the first column in X( K, L + 1)
+*              so that L2 - L1 is the row count of the block X( K, L )
+*
+               L1 = IWORK( PC + L )
+               L2 = IWORK( PC + L + 1 )
+*
+               CALL STRSYL( TRANA, TRANB, ISGN, K2-K1, L2-L1,
+     $                      A( K1, K1 ), LDA,
+     $                      B( L1, L1 ), LDB,
+     $                      C( K1, L1 ), LDC, SCALOC, IINFO )
+               INFO = MAX( INFO, IINFO )
+*
+               IF( SCALOC * SWORK( K, L ) .EQ. ZERO ) THEN
+                  IF( SCALOC .EQ. ZERO ) THEN
+*                    The magnitude of the largest entry of X(K1:K2-1, L1:L2-1)
+*                    is larger than the product of BIGNUM**2 and cannot be
+*                    represented in the form (1/SCALE)*X(K1:K2-1, L1:L2-1).
+*                    Mark the computation as pointless.
+                     BUF = ZERO
+                  ELSE
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                  END IF
+                  DO JJ = 1, NBB
+                     DO LL = 1, NBA
+*                       Bound by BIGNUM to not introduce Inf. The value
+*                       is irrelevant; corresponding entries of the
+*                       solution will be flushed in consistency scaling.
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                     END DO
+                  END DO
+               END IF
+               SWORK( K, L ) = SCALOC * SWORK( K, L )
+               XNRM = SLANGE( 'I', K2-K1, L2-L1, C( K1, L1 ), LDC,
+     $                        WNRM )
+*
+               DO I = K + 1, NBA
+*
+*                 C( I, L ) := C( I, L ) - A( K, I )**T * C( K, L )
+*
+                  I1 = IWORK( I )
+                  I2 = IWORK( I + 1 )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = SLANGE( 'I', I2-I1, L2-L1, C( I1, L1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( I, L ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( I, L ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  ANRM = SWORK( I, AWRK + K )
+                  SCALOC = SLARMM( ANRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.E0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.E0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( I, L ) and C( K, L ).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF (SCAL .NE. ONE) THEN
+                     DO LL = L1, L2-1
+                        CALL SSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( I, L ) ) * SCALOC
+                  IF (SCAL .NE. ONE) THEN
+                     DO LL = L1, L2-1
+                        CALL SSCAL( I2-I1, SCAL, C( I1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( I, L ) = SCAMIN * SCALOC
+*
+                  CALL SGEMM( 'T', 'N', I2-I1, L2-L1, K2-K1, -ONE,
+     $                        A( K1, I1 ), LDA, C( K1, L1 ), LDC,
+     $                        ONE, C( I1, L1 ), LDC )
+               END DO
+*
+               DO J = 1, L - 1
+*
+*                 C( K, J ) := C( K, J ) - SGN * C( K, L ) * B( J, L )**T
+*
+                  J1 = IWORK( PC + J )
+                  J2 = IWORK( PC + J + 1 )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = SLANGE( 'I', K2-K1, J2-J1, C( K1, J1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( K, J ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( K, J ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  BNRM = SWORK( L, BWRK + J )
+                  SCALOC = SLARMM( BNRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.E0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.E0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( K, J ) and C( K, L ).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL SSCAL( K2-K1, SCAL, C( K1, LL ), 1)
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( K, J ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO JJ = J1, J2-1
+                        CALL SSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( K, J ) = SCAMIN * SCALOC
+*
+                  CALL SGEMM( 'N', 'T', K2-K1, J2-J1, L2-L1, -SGN,
+     $                        C( K1, L1 ), LDC, B( J1, L1 ), LDB,
+     $                        ONE, C( K1, J1 ), LDC )
+               END DO
+            END DO
+         END DO
+      ELSE IF( NOTRNA .AND. .NOT.NOTRNB ) THEN
+*
+*        Solve    A*X + ISGN*X*B**T = scale*C.
+*
+*        The (K,L)th block of X is determined starting from
+*        bottom-right corner column by column by
+*
+*            A(K,K)*X(K,L) + ISGN*X(K,L)*B(L,L)**T = C(K,L) - R(K,L)
+*
+*        Where
+*                      M                          N
+*            R(K,L) = SUM [A(K,I)*X(I,L)] + ISGN*SUM [X(K,J)*B(L,J)**T].
+*                    I=K+1                      J=L+1
+*
+*        Start loop over block rows (index = K) and block columns (index = L)
+*
+         DO K = NBA, 1, -1
+*
+*           K1: row index of the first row in X( K, L )
+*           K2: row index of the first row in X( K+1, L )
+*           so the K2 - K1 is the column count of the block X( K, L )
+*
+            K1 = IWORK( K )
+            K2 = IWORK( K + 1 )
+            DO L = NBB, 1, -1
+*
+*              L1: column index of the first column in X( K, L )
+*              L2: column index of the first column in X( K, L + 1)
+*              so that L2 - L1 is the row count of the block X( K, L )
+*
+               L1 = IWORK( PC + L )
+               L2 = IWORK( PC + L + 1 )
+*
+               CALL STRSYL( TRANA, TRANB, ISGN, K2-K1, L2-L1,
+     $                      A( K1, K1 ), LDA,
+     $                      B( L1, L1 ), LDB,
+     $                      C( K1, L1 ), LDC, SCALOC, IINFO )
+               INFO = MAX( INFO, IINFO )
+*
+               IF( SCALOC * SWORK( K, L ) .EQ. ZERO ) THEN
+                  IF( SCALOC .EQ. ZERO ) THEN
+*                    The magnitude of the largest entry of X(K1:K2-1, L1:L2-1)
+*                    is larger than the product of BIGNUM**2 and cannot be
+*                    represented in the form (1/SCALE)*X(K1:K2-1, L1:L2-1).
+*                    Mark the computation as pointless.
+                     BUF = ZERO
+                  ELSE
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                  END IF
+                  DO JJ = 1, NBB
+                     DO LL = 1, NBA
+*                       Bound by BIGNUM to not introduce Inf. The value
+*                       is irrelevant; corresponding entries of the
+*                       solution will be flushed in consistency scaling.
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                     END DO
+                  END DO
+               END IF
+               SWORK( K, L ) = SCALOC * SWORK( K, L )
+               XNRM = SLANGE( 'I', K2-K1, L2-L1, C( K1, L1 ), LDC,
+     $                        WNRM )
+*
+               DO I = 1, K - 1
+*
+*                 C( I, L ) := C( I, L ) - A( I, K ) * C( K, L )
+*
+                  I1 = IWORK( I )
+                  I2 = IWORK( I + 1 )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = SLANGE( 'I', I2-I1, L2-L1, C( I1, L1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( I, L ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( I, L ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  ANRM = SWORK( I, AWRK + K )
+                  SCALOC = SLARMM( ANRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.E0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.E0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( I, L ) and C( K, L ).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF (SCAL .NE. ONE) THEN
+                     DO LL = L1, L2-1
+                        CALL SSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( I, L ) ) * SCALOC
+                  IF (SCAL .NE. ONE) THEN
+                     DO LL = L1, L2-1
+                        CALL SSCAL( I2-I1, SCAL, C( I1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( I, L ) = SCAMIN * SCALOC
+*
+                  CALL SGEMM( 'N', 'N', I2-I1, L2-L1, K2-K1, -ONE,
+     $                        A( I1, K1 ), LDA, C( K1, L1 ), LDC,
+     $                        ONE, C( I1, L1 ), LDC )
+*
+               END DO
+*
+               DO J = 1, L - 1
+*
+*                 C( K, J ) := C( K, J ) - SGN * C( K, L ) * B( J, L )**T
+*
+                  J1 = IWORK( PC + J )
+                  J2 = IWORK( PC + J + 1 )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = SLANGE( 'I', K2-K1, J2-J1, C( K1, J1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( K, J ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( K, J ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  BNRM = SWORK( L, BWRK + J )
+                  SCALOC = SLARMM( BNRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.E0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.E0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.E0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.E0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( K, J ) and C( K, L ).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO JJ = L1, L2-1
+                        CALL SSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( K, J ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO JJ = J1, J2-1
+                        CALL SSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( K, J ) = SCAMIN * SCALOC
+*
+                  CALL SGEMM( 'N', 'T', K2-K1, J2-J1, L2-L1, -SGN,
+     $                        C( K1, L1 ), LDC, B( J1, L1 ), LDB,
+     $                        ONE, C( K1, J1 ), LDC )
+               END DO
+            END DO
+         END DO
+*
+      END IF
+*
+*     Reduce local scaling factors
+*
+      SCALE = SWORK( 1, 1 )
+      DO K = 1, NBA
+         DO L = 1, NBB
+            SCALE = MIN( SCALE, SWORK( K, L ) )
+         END DO
+      END DO
+*
+      IF( SCALE .EQ. ZERO ) THEN
+*
+*        The magnitude of the largest entry of the solution is larger
+*        than the product of BIGNUM**2 and cannot be represented in the
+*        form (1/SCALE)*X if SCALE is REAL. Set SCALE to zero and give up.
+*
+         IWORK(1) = NBA + NBB + 2
+         SWORK(1,1) = REAL( MAX( NBA, NBB ) )
+         SWORK(2,1) = REAL( 2 * NBB + NBA )
+         RETURN
+      END IF
+*
+*     Realize consistent scaling
+*
+      DO K = 1, NBA
+         K1 = IWORK( K )
+         K2 = IWORK( K + 1 )
+         DO L = 1, NBB
+            L1 = IWORK( PC + L )
+            L2 = IWORK( PC + L + 1 )
+            SCAL = SCALE / SWORK( K, L )
+            IF( SCAL .NE. ONE ) THEN
+               DO LL = L1, L2-1
+                  CALL SSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+               END DO
+            ENDIF
+         END DO
+      END DO
+*
+      IF( BUF .NE. ONE .AND. BUF.GT.ZERO ) THEN
+*
+*        Decrease SCALE as much as possible.
+*
+         SCALOC = MIN( SCALE / SMLNUM, ONE / BUF )
+         BUF = BUF * SCALOC
+         SCALE = SCALE / SCALOC
+      END IF
+
+      IF( BUF.NE.ONE .AND. BUF.GT.ZERO ) THEN
+*
+*        In case of overly aggressive scaling during the computation,
+*        flushing of the global scale factor may be prevented by
+*        undoing some of the scaling. This step is to ensure that
+*        this routine flushes only scale factors that TRSYL also
+*        flushes and be usable as a drop-in replacement.
+*
+*        How much can the normwise largest entry be upscaled?
+*
+         SCAL = C( 1, 1 )
+         DO K = 1, M
+            DO L = 1, N
+               SCAL = MAX( SCAL, ABS( C( K, L ) ) )
+            END DO
+         END DO
+*
+*        Increase BUF as close to 1 as possible and apply scaling.
+*
+         SCALOC = MIN( BIGNUM / SCAL, ONE / BUF )
+         BUF = BUF * SCALOC
+         CALL SLASCL( 'G', -1, -1, ONE, SCALOC, M, N, C, LDC,
+     $               IWORK(1) )
+      END IF
+*
+*     Combine with buffer scaling factor. SCALE will be flushed if
+*     BUF is less than one here.
+*
+      SCALE = SCALE * BUF
+*
+*     Restore workspace dimensions
+*
+      IWORK(1) = NBA + NBB + 2
+      SWORK(1,1) = REAL( MAX( NBA, NBB ) )
+      SWORK(2,1) = REAL( 2 * NBB + NBA )
+*
+      RETURN
+*
+*     End of STRSYL3
+*
+      END
diff --git a/SRC/strti2.f b/SRC/strti2.f
index e2b630deb9..910396ee25 100644
--- a/SRC/strti2.f
+++ b/SRC/strti2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STRTI2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/strti2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/strti2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -103,10 +101,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup trti2
 *
 *  =====================================================================
       SUBROUTINE STRTI2( UPLO, DIAG, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/strtri.f b/SRC/strtri.f
index e90872f06a..1f2779f8bc 100644
--- a/SRC/strtri.f
+++ b/SRC/strtri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STRTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/strtri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/strtri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup trtri
 *
 *  =====================================================================
       SUBROUTINE STRTRI( UPLO, DIAG, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -197,9 +196,11 @@ SUBROUTINE STRTRI( UPLO, DIAG, N, A, LDA, INFO )
 *
 *              Compute rows 1:j-1 of current block column
 *
-               CALL STRMM( 'Left', 'Upper', 'No transpose', DIAG, J-1,
+               CALL STRMM( 'Left', 'Upper', 'No transpose', DIAG,
+     $                     J-1,
      $                     JB, ONE, A, LDA, A( 1, J ), LDA )
-               CALL STRSM( 'Right', 'Upper', 'No transpose', DIAG, J-1,
+               CALL STRSM( 'Right', 'Upper', 'No transpose', DIAG,
+     $                     J-1,
      $                     JB, -ONE, A( J, J ), LDA, A( 1, J ), LDA )
 *
 *              Compute inverse of current diagonal block
diff --git a/SRC/strtrs.f b/SRC/strtrs.f
index 07bb780ee3..82457b864b 100644
--- a/SRC/strtrs.f
+++ b/SRC/strtrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STRTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/strtrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/strtrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -39,8 +37,14 @@
 *>
 *>    A * X = B  or  A**T * X = B,
 *>
-*> where A is a triangular matrix of order N, and B is an N-by-NRHS
-*> matrix.  A check is made to verify that A is nonsingular.
+*> where A is a triangular matrix of order N, and B is an N-by-NRHS matrix.
+*>
+*> This subroutine verifies that A is nonsingular, but callers should note that only exact
+*> singularity is detected. It is conceivable for one or more diagonal elements of A to be
+*> subnormally tiny numbers without this subroutine signalling an error.
+*>
+*> If a possible loss of numerical precision due to near-singular matrices is a concern, the
+*> caller should verify that A is nonsingular within some tolerance before calling this subroutine.
 *> \endverbatim
 *
 *  Arguments:
@@ -119,7 +123,7 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0: if INFO = -i, the i-th argument had an illegal value
-*>          > 0: if INFO = i, the i-th diagonal element of A is zero,
+*>          > 0:  if INFO = i, the i-th diagonal element of A is exactly zero,
 *>               indicating that the matrix is singular and the solutions
 *>               X have not been computed.
 *> \endverbatim
@@ -132,11 +136,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup trtrs
 *
 *  =====================================================================
       SUBROUTINE STRTRS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -175,10 +180,12 @@ SUBROUTINE STRTRS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB,
 *
       INFO = 0
       NOUNIT = LSAME( DIAG, 'N' )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.
-     $         LSAME( TRANS, 'T' ) .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+     $         LSAME( TRANS, 'T' ) .AND.
+     $                .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -2
       ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
          INFO = -3
diff --git a/SRC/strttf.f b/SRC/strttf.f
index 7ea4980a6f..e95fc88214 100644
--- a/SRC/strttf.f
+++ b/SRC/strttf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STRTTF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/strttf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/strttf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -100,7 +98,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup trttf
 *
 *> \par Further Details:
 *  =====================
@@ -191,6 +189,7 @@
 *
 *  =====================================================================
       SUBROUTINE STRTTF( TRANSR, UPLO, N, A, LDA, ARF, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/strttp.f b/SRC/strttp.f
index 371d21b8f7..1d618d1209 100644
--- a/SRC/strttp.f
+++ b/SRC/strttp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STRTTP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/strttp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/strttp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup trttp
 *
 *  =====================================================================
       SUBROUTINE STRTTP( UPLO, N, A, LDA, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/stzrzf.f b/SRC/stzrzf.f
index e8cbb56b61..8e9e3252f9 100644
--- a/SRC/stzrzf.f
+++ b/SRC/stzrzf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STZRZF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stzrzf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stzrzf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -116,7 +114,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup realOTHERcomputational
+*> \ingroup tzrzf
 *
 *> \par Contributors:
 *  ==================
@@ -148,6 +146,7 @@
 *>
 *  =====================================================================
       SUBROUTINE STZRZF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -179,7 +178,8 @@ SUBROUTINE STZRZF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      REAL               SROUNDUP_LWORK
+      EXTERNAL           ILAENV, SROUNDUP_LWORK
 *     ..
 *     .. Executable Statements ..
 *
@@ -207,7 +207,7 @@ SUBROUTINE STZRZF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
             LWKOPT = M*NB
             LWKMIN = MAX( 1, M )
          END IF
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
          IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
             INFO = -7
@@ -280,7 +280,8 @@ SUBROUTINE STZRZF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *              Form the triangular factor of the block reflector
 *              H = H(i+ib-1) . . . H(i+1) H(i)
 *
-               CALL SLARZT( 'Backward', 'Rowwise', N-M, IB, A( I, M1 ),
+               CALL SLARZT( 'Backward', 'Rowwise', N-M, IB, A( I,
+     $                      M1 ),
      $                      LDA, TAU( I ), WORK, LDWORK )
 *
 *              Apply H to A(1:i-1,i:n) from the right
@@ -301,7 +302,7 @@ SUBROUTINE STZRZF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
       IF( MU.GT.0 )
      $   CALL SLATRZ( MU, N, N-M, A, LDA, TAU, WORK )
 *
-      WORK( 1 ) = LWKOPT
+      WORK( 1 ) = SROUNDUP_LWORK(LWKOPT)
 *
       RETURN
 *
diff --git a/SRC/xerbla.f b/SRC/xerbla.f
index 6b141499ee..1597a53897 100644
--- a/SRC/xerbla.f
+++ b/SRC/xerbla.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download XERBLA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/xerbla.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/xerbla.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -63,10 +61,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup xerbla
 *
 *  =====================================================================
       SUBROUTINE XERBLA( SRNAME, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/xerbla_array.f b/SRC/xerbla_array.f
index ff0a0186b7..ce19bc5792 100644
--- a/SRC/xerbla_array.f
+++ b/SRC/xerbla_array.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download XERBLA_ARRAY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/xerbla_array.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/xerbla_array.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -83,10 +81,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup OTHERauxiliary
+*> \ingroup xerbla_array
 *
 *  =====================================================================
       SUBROUTINE XERBLA_ARRAY( SRNAME_ARRAY, SRNAME_LEN, INFO)
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -115,7 +114,7 @@ SUBROUTINE XERBLA_ARRAY( SRNAME_ARRAY, SRNAME_LEN, INFO)
       EXTERNAL XERBLA
 *     ..
 *     .. Executable Statements ..
-      SRNAME = ''
+      SRNAME = ' '
       DO I = 1, MIN( SRNAME_LEN, LEN( SRNAME ) )
          SRNAME( I:I ) = SRNAME_ARRAY( I )
       END DO
diff --git a/SRC/zbbcsd.f b/SRC/zbbcsd.f
index 757e98c718..64643d3533 100644
--- a/SRC/zbbcsd.f
+++ b/SRC/zbbcsd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZBBCSD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zbbcsd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zbbcsd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -322,13 +320,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup bbcsd
 *
 *  =====================================================================
-      SUBROUTINE ZBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
+      SUBROUTINE ZBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P,
+     $                   Q,
      $                   THETA, PHI, U1, LDU1, U2, LDU2, V1T, LDV1T,
      $                   V2T, LDV2T, B11D, B11E, B12D, B12E, B21D, B21E,
      $                   B22D, B22E, RWORK, LRWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -371,7 +371,8 @@ SUBROUTINE ZBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
      $                   TEMP, THETAMAX, THETAMIN, THRESH, TOL, TOLMUL,
      $                   UNFL, X1, X2, Y1, Y2
 *
-      EXTERNAL           DLARTGP, DLARTGS, DLAS2, XERBLA, ZLASR, ZSCAL,
+      EXTERNAL           DLARTGP, DLARTGS, DLAS2, XERBLA, ZLASR,
+     $                   ZSCAL,
      $                   ZSWAP
 *     ..
 *     .. External Functions ..
@@ -558,9 +559,11 @@ SUBROUTINE ZBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
 *
 *           Compute shifts for B11 and B21 and use the lesser
 *
-            CALL DLAS2( B11D(IMAX-1), B11E(IMAX-1), B11D(IMAX), SIGMA11,
+            CALL DLAS2( B11D(IMAX-1), B11E(IMAX-1), B11D(IMAX),
+     $                  SIGMA11,
      $                  DUMMY )
-            CALL DLAS2( B21D(IMAX-1), B21E(IMAX-1), B21D(IMAX), SIGMA21,
+            CALL DLAS2( B21D(IMAX-1), B21E(IMAX-1), B21D(IMAX),
+     $                  SIGMA21,
      $                  DUMMY )
 *
             IF( SIGMA11 .LE. SIGMA21 ) THEN
@@ -717,10 +720,12 @@ SUBROUTINE ZBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
                CALL DLARTGP( Y2, Y1, RWORK(IV2TSN+I-1-1),
      $                       RWORK(IV2TCS+I-1-1), R )
             ELSE IF( .NOT. RESTART12 .AND. RESTART22 ) THEN
-               CALL DLARTGP( B12BULGE, B12D(I-1), RWORK(IV2TSN+I-1-1),
+               CALL DLARTGP( B12BULGE, B12D(I-1),
+     $                       RWORK(IV2TSN+I-1-1),
      $                       RWORK(IV2TCS+I-1-1), R )
             ELSE IF( RESTART12 .AND. .NOT. RESTART22 ) THEN
-               CALL DLARTGP( B22BULGE, B22D(I-1), RWORK(IV2TSN+I-1-1),
+               CALL DLARTGP( B22BULGE, B22D(I-1),
+     $                       RWORK(IV2TSN+I-1-1),
      $                       RWORK(IV2TCS+I-1-1), R )
             ELSE IF( NU .LT. MU ) THEN
                CALL DLARTGS( B12E(I-1), B12D(I), NU,
@@ -779,7 +784,8 @@ SUBROUTINE ZBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
 *           chasing by applying the original shift again.
 *
             IF( .NOT. RESTART11 .AND. .NOT. RESTART12 ) THEN
-               CALL DLARTGP( X2, X1, RWORK(IU1SN+I-1), RWORK(IU1CS+I-1),
+               CALL DLARTGP( X2, X1, RWORK(IU1SN+I-1),
+     $                       RWORK(IU1CS+I-1),
      $                       R )
             ELSE IF( .NOT. RESTART11 .AND. RESTART12 ) THEN
                CALL DLARTGP( B11BULGE, B11D(I), RWORK(IU1SN+I-1),
@@ -788,14 +794,16 @@ SUBROUTINE ZBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
                CALL DLARTGP( B12BULGE, B12E(I-1), RWORK(IU1SN+I-1),
      $                       RWORK(IU1CS+I-1), R )
             ELSE IF( MU .LE. NU ) THEN
-               CALL DLARTGS( B11E(I), B11D(I+1), MU, RWORK(IU1CS+I-1),
+               CALL DLARTGS( B11E(I), B11D(I+1), MU,
+     $                       RWORK(IU1CS+I-1),
      $                       RWORK(IU1SN+I-1) )
             ELSE
                CALL DLARTGS( B12D(I), B12E(I), NU, RWORK(IU1CS+I-1),
      $                       RWORK(IU1SN+I-1) )
             END IF
             IF( .NOT. RESTART21 .AND. .NOT. RESTART22 ) THEN
-               CALL DLARTGP( Y2, Y1, RWORK(IU2SN+I-1), RWORK(IU2CS+I-1),
+               CALL DLARTGP( Y2, Y1, RWORK(IU2SN+I-1),
+     $                       RWORK(IU2CS+I-1),
      $                       R )
             ELSE IF( .NOT. RESTART21 .AND. RESTART22 ) THEN
                CALL DLARTGP( B21BULGE, B21D(I), RWORK(IU2SN+I-1),
@@ -804,7 +812,8 @@ SUBROUTINE ZBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
                CALL DLARTGP( B22BULGE, B22E(I-1), RWORK(IU2SN+I-1),
      $                       RWORK(IU2CS+I-1), R )
             ELSE IF( NU .LT. MU ) THEN
-               CALL DLARTGS( B21E(I), B21E(I+1), NU, RWORK(IU2CS+I-1),
+               CALL DLARTGS( B21E(I), B21E(I+1), NU,
+     $                       RWORK(IU2CS+I-1),
      $                       RWORK(IU2SN+I-1) )
             ELSE
                CALL DLARTGS( B22D(I), B22E(I), MU, RWORK(IU2CS+I-1),
@@ -990,7 +999,8 @@ SUBROUTINE ZBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
          IF( B12D(IMAX)+B22D(IMAX) .LT. 0 ) THEN
             IF( WANTV2T ) THEN
                IF( COLMAJOR ) THEN
-                  CALL ZSCAL( M-Q, NEGONECOMPLEX, V2T(IMAX,1), LDV2T )
+                  CALL ZSCAL( M-Q, NEGONECOMPLEX, V2T(IMAX,1),
+     $                        LDV2T )
                ELSE
                   CALL ZSCAL( M-Q, NEGONECOMPLEX, V2T(1,IMAX), 1 )
                END IF
@@ -1057,7 +1067,8 @@ SUBROUTINE ZBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
                IF( WANTU2 )
      $            CALL ZSWAP( M-P, U2(1,I), 1, U2(1,MINI), 1 )
                IF( WANTV1T )
-     $            CALL ZSWAP( Q, V1T(I,1), LDV1T, V1T(MINI,1), LDV1T )
+     $            CALL ZSWAP( Q, V1T(I,1), LDV1T, V1T(MINI,1),
+     $                        LDV1T )
                IF( WANTV2T )
      $            CALL ZSWAP( M-Q, V2T(I,1), LDV2T, V2T(MINI,1),
      $               LDV2T )
diff --git a/SRC/zbdsqr.f b/SRC/zbdsqr.f
index 2ad6142a73..13a415ff92 100644
--- a/SRC/zbdsqr.f
+++ b/SRC/zbdsqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZBDSQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zbdsqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zbdsqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -166,7 +164,9 @@
 *>
 *> \param[out] RWORK
 *> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension (4*N)
+*>          RWORK is DOUBLE PRECISION array, dimension (LRWORK)
+*>          LRWORK = 4*N, if NCVT = NRU = NCC = 0, and
+*>          LRWORK = 4*(N-1), otherwise
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -204,6 +204,17 @@
 *>          algorithm through its inner loop. The algorithms stops
 *>          (and so fails to converge) if the number of passes
 *>          through the inner loop exceeds MAXITR*N**2.
+*>
+*> \endverbatim
+*
+*> \par Note:
+*  ===========
+*>
+*> \verbatim
+*>  Bug report from Cezary Dendek.
+*>  On November 3rd 2023, the INTEGER variable MAXIT = MAXITR*N**2 is
+*>  removed since it can overflow pretty easily (for N larger or equal
+*>  than 18,919). We instead use MAXITDIVN = MAXITR*N.
 *> \endverbatim
 *
 *  Authors:
@@ -214,11 +225,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup bdsqr
 *
 *  =====================================================================
       SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $                   LDU, C, LDC, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -255,11 +267,11 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LOWER, ROTATE
-      INTEGER            I, IDIR, ISUB, ITER, J, LL, LLL, M, MAXIT, NM1,
-     $                   NM12, NM13, OLDLL, OLDM
+      INTEGER            I, IDIR, ISUB, ITER, ITERDIVN, J, LL, LLL, M,
+     $                   MAXITDIVN, NM1, NM12, NM13, OLDLL, OLDM
       DOUBLE PRECISION   ABSE, ABSS, COSL, COSR, CS, EPS, F, G, H, MU,
      $                   OLDCS, OLDSN, R, SHIFT, SIGMN, SIGMX, SINL,
-     $                   SINR, SLL, SMAX, SMIN, SMINL, SMINOA,
+     $                   SINR, SLL, SMAX, SMIN, SMINOA,
      $                   SN, THRESH, TOL, TOLMUL, UNFL
 *     ..
 *     .. External Functions ..
@@ -268,7 +280,8 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
       EXTERNAL           LSAME, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARTG, DLAS2, DLASQ1, DLASV2, XERBLA, ZDROT,
+      EXTERNAL           DLARTG, DLAS2, DLASQ1, DLASV2, XERBLA,
+     $                   ZDROT,
      $                   ZDSCAL, ZLASR, ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
@@ -349,10 +362,12 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *        Update singular vectors if desired
 *
          IF( NRU.GT.0 )
-     $      CALL ZLASR( 'R', 'V', 'F', NRU, N, RWORK( 1 ), RWORK( N ),
+     $      CALL ZLASR( 'R', 'V', 'F', NRU, N, RWORK( 1 ),
+     $                  RWORK( N ),
      $                  U, LDU )
          IF( NCC.GT.0 )
-     $      CALL ZLASR( 'L', 'V', 'F', N, NCC, RWORK( 1 ), RWORK( N ),
+     $      CALL ZLASR( 'L', 'V', 'F', N, NCC, RWORK( 1 ),
+     $                  RWORK( N ),
      $                  C, LDC )
       END IF
 *
@@ -372,7 +387,7 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
       DO 30 I = 1, N - 1
          SMAX = MAX( SMAX, ABS( E( I ) ) )
    30 CONTINUE
-      SMINL = ZERO
+      SMIN = ZERO
       IF( TOL.GE.ZERO ) THEN
 *
 *        Relative accuracy desired
@@ -389,20 +404,21 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
    40    CONTINUE
    50    CONTINUE
          SMINOA = SMINOA / SQRT( DBLE( N ) )
-         THRESH = MAX( TOL*SMINOA, MAXITR*N*N*UNFL )
+         THRESH = MAX( TOL*SMINOA, MAXITR*(N*(N*UNFL)) )
       ELSE
 *
 *        Absolute accuracy desired
 *
-         THRESH = MAX( ABS( TOL )*SMAX, MAXITR*N*N*UNFL )
+         THRESH = MAX( ABS( TOL )*SMAX, MAXITR*(N*(N*UNFL)) )
       END IF
 *
 *     Prepare for main iteration loop for the singular values
 *     (MAXIT is the maximum number of passes through the inner
 *     loop permitted before nonconvergence signalled.)
 *
-      MAXIT = MAXITR*N*N
-      ITER = 0
+      MAXITDIVN = MAXITR*N
+      ITERDIVN = 0
+      ITER = -1
       OLDLL = -1
       OLDM = -1
 *
@@ -418,15 +434,18 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *
       IF( M.LE.1 )
      $   GO TO 160
-      IF( ITER.GT.MAXIT )
-     $   GO TO 200
+      IF( ITER.GE.N ) THEN
+         ITER = ITER - N
+         ITERDIVN = ITERDIVN + 1
+         IF( ITERDIVN.GE.MAXITDIVN )
+     $      GO TO 200
+      END IF
 *
 *     Find diagonal block of matrix to work on
 *
       IF( TOL.LT.ZERO .AND. ABS( D( M ) ).LE.THRESH )
      $   D( M ) = ZERO
       SMAX = ABS( D( M ) )
-      SMIN = SMAX
       DO 70 LLL = 1, M - 1
          LL = M - LLL
          ABSS = ABS( D( LL ) )
@@ -435,7 +454,6 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $      D( LL ) = ZERO
          IF( ABSE.LE.THRESH )
      $      GO TO 80
-         SMIN = MIN( SMIN, ABSS )
          SMAX = MAX( SMAX, ABSS, ABSE )
    70 CONTINUE
       LL = 0
@@ -473,7 +491,8 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $      CALL ZDROT( NCVT, VT( M-1, 1 ), LDVT, VT( M, 1 ), LDVT,
      $                  COSR, SINR )
          IF( NRU.GT.0 )
-     $      CALL ZDROT( NRU, U( 1, M-1 ), 1, U( 1, M ), 1, COSL, SINL )
+     $      CALL ZDROT( NRU, U( 1, M-1 ), 1, U( 1, M ), 1, COSL,
+     $                  SINL )
          IF( NCC.GT.0 )
      $      CALL ZDROT( NCC, C( M-1, 1 ), LDC, C( M, 1 ), LDC, COSL,
      $                  SINL )
@@ -517,14 +536,14 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *           apply convergence criterion forward
 *
             MU = ABS( D( LL ) )
-            SMINL = MU
+            SMIN = MU
             DO 100 LLL = LL, M - 1
                IF( ABS( E( LLL ) ).LE.TOL*MU ) THEN
                   E( LLL ) = ZERO
                   GO TO 60
                END IF
                MU = ABS( D( LLL+1 ) )*( MU / ( MU+ABS( E( LLL ) ) ) )
-               SMINL = MIN( SMINL, MU )
+               SMIN = MIN( SMIN, MU )
   100       CONTINUE
          END IF
 *
@@ -545,14 +564,14 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *           apply convergence criterion backward
 *
             MU = ABS( D( M ) )
-            SMINL = MU
+            SMIN = MU
             DO 110 LLL = M - 1, LL, -1
                IF( ABS( E( LLL ) ).LE.TOL*MU ) THEN
                   E( LLL ) = ZERO
                   GO TO 60
                END IF
                MU = ABS( D( LLL ) )*( MU / ( MU+ABS( E( LLL ) ) ) )
-               SMINL = MIN( SMINL, MU )
+               SMIN = MIN( SMIN, MU )
   110       CONTINUE
          END IF
       END IF
@@ -562,7 +581,7 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *     Compute shift.  First, test if shifting would ruin relative
 *     accuracy, and if so set the shift to zero.
 *
-      IF( TOL.GE.ZERO .AND. N*TOL*( SMINL / SMAX ).LE.
+      IF( TOL.GE.ZERO .AND. N*TOL*( SMIN / SMAX ).LE.
      $    MAX( EPS, HNDRTH*TOL ) ) THEN
 *
 *        Use a zero shift to avoid loss of relative accuracy
@@ -606,7 +625,8 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
                CALL DLARTG( D( I )*CS, E( I ), CS, SN, R )
                IF( I.GT.LL )
      $            E( I-1 ) = OLDSN*R
-               CALL DLARTG( OLDCS*R, D( I+1 )*SN, OLDCS, OLDSN, D( I ) )
+               CALL DLARTG( OLDCS*R, D( I+1 )*SN, OLDCS, OLDSN,
+     $                      D( I ) )
                RWORK( I-LL+1 ) = CS
                RWORK( I-LL+1+NM1 ) = SN
                RWORK( I-LL+1+NM12 ) = OLDCS
@@ -622,10 +642,12 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $         CALL ZLASR( 'L', 'V', 'F', M-LL+1, NCVT, RWORK( 1 ),
      $                     RWORK( N ), VT( LL, 1 ), LDVT )
             IF( NRU.GT.0 )
-     $         CALL ZLASR( 'R', 'V', 'F', NRU, M-LL+1, RWORK( NM12+1 ),
+     $         CALL ZLASR( 'R', 'V', 'F', NRU, M-LL+1,
+     $                     RWORK( NM12+1 ),
      $                     RWORK( NM13+1 ), U( 1, LL ), LDU )
             IF( NCC.GT.0 )
-     $         CALL ZLASR( 'L', 'V', 'F', M-LL+1, NCC, RWORK( NM12+1 ),
+     $         CALL ZLASR( 'L', 'V', 'F', M-LL+1, NCC,
+     $                     RWORK( NM12+1 ),
      $                     RWORK( NM13+1 ), C( LL, 1 ), LDC )
 *
 *           Test convergence
@@ -644,7 +666,8 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
                CALL DLARTG( D( I )*CS, E( I-1 ), CS, SN, R )
                IF( I.LT.M )
      $            E( I ) = OLDSN*R
-               CALL DLARTG( OLDCS*R, D( I-1 )*SN, OLDCS, OLDSN, D( I ) )
+               CALL DLARTG( OLDCS*R, D( I-1 )*SN, OLDCS, OLDSN,
+     $                      D( I ) )
                RWORK( I-LL ) = CS
                RWORK( I-LL+NM1 ) = -SN
                RWORK( I-LL+NM12 ) = OLDCS
@@ -657,7 +680,8 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *           Update singular vectors
 *
             IF( NCVT.GT.0 )
-     $         CALL ZLASR( 'L', 'V', 'B', M-LL+1, NCVT, RWORK( NM12+1 ),
+     $         CALL ZLASR( 'L', 'V', 'B', M-LL+1, NCVT,
+     $                     RWORK( NM12+1 ),
      $                     RWORK( NM13+1 ), VT( LL, 1 ), LDVT )
             IF( NRU.GT.0 )
      $         CALL ZLASR( 'R', 'V', 'B', NRU, M-LL+1, RWORK( 1 ),
@@ -712,10 +736,12 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $         CALL ZLASR( 'L', 'V', 'F', M-LL+1, NCVT, RWORK( 1 ),
      $                     RWORK( N ), VT( LL, 1 ), LDVT )
             IF( NRU.GT.0 )
-     $         CALL ZLASR( 'R', 'V', 'F', NRU, M-LL+1, RWORK( NM12+1 ),
+     $         CALL ZLASR( 'R', 'V', 'F', NRU, M-LL+1,
+     $                     RWORK( NM12+1 ),
      $                     RWORK( NM13+1 ), U( 1, LL ), LDU )
             IF( NCC.GT.0 )
-     $         CALL ZLASR( 'L', 'V', 'F', M-LL+1, NCC, RWORK( NM12+1 ),
+     $         CALL ZLASR( 'L', 'V', 'F', M-LL+1, NCC,
+     $                     RWORK( NM12+1 ),
      $                     RWORK( NM13+1 ), C( LL, 1 ), LDC )
 *
 *           Test convergence
@@ -762,7 +788,8 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *           Update singular vectors if desired
 *
             IF( NCVT.GT.0 )
-     $         CALL ZLASR( 'L', 'V', 'B', M-LL+1, NCVT, RWORK( NM12+1 ),
+     $         CALL ZLASR( 'L', 'V', 'B', M-LL+1, NCVT,
+     $                     RWORK( NM12+1 ),
      $                     RWORK( NM13+1 ), VT( LL, 1 ), LDVT )
             IF( NRU.GT.0 )
      $         CALL ZLASR( 'R', 'V', 'B', NRU, M-LL+1, RWORK( 1 ),
@@ -781,6 +808,12 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
 *
   160 CONTINUE
       DO 170 I = 1, N
+         IF( D( I ).EQ.ZERO ) THEN
+*
+*           Avoid -ZERO
+*
+            D( I ) = ZERO
+         END IF
          IF( D( I ).LT.ZERO ) THEN
             D( I ) = -D( I )
 *
@@ -818,7 +851,8 @@ SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
             IF( NRU.GT.0 )
      $         CALL ZSWAP( NRU, U( 1, ISUB ), 1, U( 1, N+1-I ), 1 )
             IF( NCC.GT.0 )
-     $         CALL ZSWAP( NCC, C( ISUB, 1 ), LDC, C( N+1-I, 1 ), LDC )
+     $         CALL ZSWAP( NCC, C( ISUB, 1 ), LDC, C( N+1-I, 1 ),
+     $                     LDC )
          END IF
   190 CONTINUE
       GO TO 220
diff --git a/SRC/zcgesv.f b/SRC/zcgesv.f
index e926d4e975..04e46618bb 100644
--- a/SRC/zcgesv.f
+++ b/SRC/zcgesv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZCGESV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zcgesv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zcgesv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -193,11 +191,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEsolve
+*> \ingroup gesv_mixed
 *
 *  =====================================================================
       SUBROUTINE ZCGESV( N, NRHS, A, LDA, IPIV, B, LDB, X, LDX, WORK,
      $                   SWORK, RWORK, ITER, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -236,7 +235,8 @@ SUBROUTINE ZCGESV( N, NRHS, A, LDA, IPIV, B, LDB, X, LDX, WORK,
       COMPLEX*16         ZDUM
 *
 *     .. External Subroutines ..
-      EXTERNAL           CGETRS, CGETRF, CLAG2Z, XERBLA, ZAXPY, ZGEMM,
+      EXTERNAL           CGETRS, CGETRF, CLAG2Z, XERBLA, ZAXPY,
+     $                   ZGEMM,
      $                   ZLACPY, ZLAG2C, ZGETRF, ZGETRS
 *     ..
 *     .. External Functions ..
@@ -342,7 +342,8 @@ SUBROUTINE ZCGESV( N, NRHS, A, LDA, IPIV, B, LDB, X, LDX, WORK,
 *
       CALL ZLACPY( 'All', N, NRHS, B, LDB, WORK, N )
 *
-      CALL ZGEMM( 'No Transpose', 'No Transpose', N, NRHS, N, NEGONE, A,
+      CALL ZGEMM( 'No Transpose', 'No Transpose', N, NRHS, N, NEGONE,
+     $            A,
      $            LDA, X, LDX, ONE, WORK, N )
 *
 *     Check whether the NRHS normwise backward errors satisfy the
@@ -377,7 +378,8 @@ SUBROUTINE ZCGESV( N, NRHS, A, LDA, IPIV, B, LDB, X, LDX, WORK,
 *
 *        Solve the system SA*SX = SR.
 *
-         CALL CGETRS( 'No transpose', N, NRHS, SWORK( PTSA ), N, IPIV,
+         CALL CGETRS( 'No transpose', N, NRHS, SWORK( PTSA ), N,
+     $                IPIV,
      $                SWORK( PTSX ), N, INFO )
 *
 *        Convert SX back to double precision and update the current
@@ -393,7 +395,8 @@ SUBROUTINE ZCGESV( N, NRHS, A, LDA, IPIV, B, LDB, X, LDX, WORK,
 *
          CALL ZLACPY( 'All', N, NRHS, B, LDB, WORK, N )
 *
-         CALL ZGEMM( 'No Transpose', 'No Transpose', N, NRHS, N, NEGONE,
+         CALL ZGEMM( 'No Transpose', 'No Transpose', N, NRHS, N,
+     $               NEGONE,
      $               A, LDA, X, LDX, ONE, WORK, N )
 *
 *        Check whether the NRHS normwise backward errors satisfy the
diff --git a/SRC/zcposv.f b/SRC/zcposv.f
index 9b1940d60b..5bc48a49b3 100644
--- a/SRC/zcposv.f
+++ b/SRC/zcposv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZCPOSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zcposv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zcposv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -187,10 +185,10 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i of
-*>                (COMPLEX*16) A is not positive definite, so the
-*>                factorization could not be completed, and the solution
-*>                has not been computed.
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                of (COMPLEX*16) A is not positive, so the factorization
+*>                could not be completed, and the solution has not been
+*>                computed.
 *> \endverbatim
 *
 *  Authors:
@@ -201,11 +199,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POsolve
+*> \ingroup posv_mixed
 *
 *  =====================================================================
       SUBROUTINE ZCPOSV( UPLO, N, NRHS, A, LDA, B, LDB, X, LDX, WORK,
      $                   SWORK, RWORK, ITER, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -244,7 +243,8 @@ SUBROUTINE ZCPOSV( UPLO, N, NRHS, A, LDA, B, LDB, X, LDX, WORK,
       COMPLEX*16         ZDUM
 *
 *     .. External Subroutines ..
-      EXTERNAL           ZAXPY, ZHEMM, ZLACPY, ZLAT2C, ZLAG2C, CLAG2Z,
+      EXTERNAL           ZAXPY, ZHEMM, ZLACPY, ZLAT2C, ZLAG2C,
+     $                   CLAG2Z,
      $                   CPOTRF, CPOTRS, XERBLA, ZPOTRF, ZPOTRS
 *     ..
 *     .. External Functions ..
@@ -268,7 +268,8 @@ SUBROUTINE ZCPOSV( UPLO, N, NRHS, A, LDA, B, LDB, X, LDX, WORK,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -387,7 +388,8 @@ SUBROUTINE ZCPOSV( UPLO, N, NRHS, A, LDA, B, LDB, X, LDX, WORK,
 *
 *        Solve the system SA*SX = SR.
 *
-         CALL CPOTRS( UPLO, N, NRHS, SWORK( PTSA ), N, SWORK( PTSX ), N,
+         CALL CPOTRS( UPLO, N, NRHS, SWORK( PTSA ), N, SWORK( PTSX ),
+     $                N,
      $                INFO )
 *
 *        Convert SX back to double precision and update the current
diff --git a/SRC/zdrscl.f b/SRC/zdrscl.f
index 9e1b2ea872..a608cc40c9 100644
--- a/SRC/zdrscl.f
+++ b/SRC/zdrscl.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZDRSCL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zdrscl.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zdrscl.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -77,10 +75,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup rscl
 *
 *  =====================================================================
       SUBROUTINE ZDRSCL( N, SA, SX, INCX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -109,7 +108,7 @@ SUBROUTINE ZDRSCL( N, SA, SX, INCX )
       EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, ZDSCAL
+      EXTERNAL           ZDSCAL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS
@@ -125,7 +124,6 @@ SUBROUTINE ZDRSCL( N, SA, SX, INCX )
 *
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Initialize the denominator to SA and the numerator to 1.
 *
diff --git a/SRC/zgbbrd.f b/SRC/zgbbrd.f
index 0f7226065e..859426911b 100644
--- a/SRC/zgbbrd.f
+++ b/SRC/zgbbrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGBBRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgbbrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgbbrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -185,11 +183,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup gbbrd
 *
 *  =====================================================================
       SUBROUTINE ZGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
      $                   LDQ, PT, LDPT, C, LDC, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -222,7 +221,8 @@ SUBROUTINE ZGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
       COMPLEX*16         RA, RB, RS, T
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARGV, ZLARTG, ZLARTV, ZLASET, ZROT,
+      EXTERNAL           XERBLA, ZLARGV, ZLARTG, ZLARTV, ZLASET,
+     $                   ZROT,
      $                   ZSCAL
 *     ..
 *     .. Intrinsic Functions ..
@@ -242,7 +242,9 @@ SUBROUTINE ZGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
       WANTC = NCC.GT.0
       KLU1 = KL + KU + 1
       INFO = 0
-      IF( .NOT.WANTQ .AND. .NOT.WANTPT .AND. .NOT.LSAME( VECT, 'N' ) )
+      IF( .NOT.WANTQ .AND.
+     $    .NOT.WANTPT .AND.
+     $    .NOT.LSAME( VECT, 'N' ) )
      $     THEN
          INFO = -1
       ELSE IF( M.LT.0 ) THEN
@@ -338,7 +340,8 @@ SUBROUTINE ZGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
                      NRT = NR
                   END IF
                   IF( NRT.GT.0 )
-     $               CALL ZLARTV( NRT, AB( KLU1-L, J1-KLM+L-1 ), INCA,
+     $               CALL ZLARTV( NRT, AB( KLU1-L, J1-KLM+L-1 ),
+     $                            INCA,
      $                            AB( KLU1-L+1, J1-KLM+L-1 ), INCA,
      $                            RWORK( J1 ), WORK( J1 ), KB1 )
    10          CONTINUE
@@ -377,7 +380,8 @@ SUBROUTINE ZGBBRD( VECT, M, N, NCC, KL, KU, AB, LDAB, D, E, Q,
 *                 apply plane rotations to C
 *
                   DO 30 J = J1, J2, KB1
-                     CALL ZROT( NCC, C( J-1, 1 ), LDC, C( J, 1 ), LDC,
+                     CALL ZROT( NCC, C( J-1, 1 ), LDC, C( J, 1 ),
+     $                          LDC,
      $                          RWORK( J ), WORK( J ) )
    30             CONTINUE
                END IF
diff --git a/SRC/zgbcon.f b/SRC/zgbcon.f
index 7a10ef340b..7d7d3c1263 100644
--- a/SRC/zgbcon.f
+++ b/SRC/zgbcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGBCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgbcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgbcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -139,11 +137,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup gbcon
 *
 *  =====================================================================
-      SUBROUTINE ZGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM, RCOND,
+      SUBROUTINE ZGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM,
+     $                   RCOND,
      $                   WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -184,7 +184,8 @@ SUBROUTINE ZGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM, RCOND,
       EXTERNAL           LSAME, IZAMAX, DLAMCH, ZDOTC
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZDRSCL, ZLACN2, ZLATBS
+      EXTERNAL           XERBLA, ZAXPY, ZDRSCL, ZLACN2,
+     $                   ZLATBS
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG, MIN
@@ -259,13 +260,15 @@ SUBROUTINE ZGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM, RCOND,
                      WORK( JP ) = WORK( J )
                      WORK( J ) = T
                   END IF
-                  CALL ZAXPY( LM, -T, AB( KD+1, J ), 1, WORK( J+1 ), 1 )
+                  CALL ZAXPY( LM, -T, AB( KD+1, J ), 1, WORK( J+1 ),
+     $                        1 )
    20          CONTINUE
             END IF
 *
 *           Multiply by inv(U).
 *
-            CALL ZLATBS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL ZLATBS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   KL+KU, AB, LDAB, WORK, SCALE, RWORK, INFO )
          ELSE
 *
@@ -280,7 +283,8 @@ SUBROUTINE ZGBCON( NORM, N, KL, KU, AB, LDAB, IPIV, ANORM, RCOND,
             IF( LNOTI ) THEN
                DO 30 J = N - 1, 1, -1
                   LM = MIN( KL, N-J )
-                  WORK( J ) = WORK( J ) - ZDOTC( LM, AB( KD+1, J ), 1,
+                  WORK( J ) = WORK( J ) - ZDOTC( LM, AB( KD+1, J ),
+     $                  1,
      $                        WORK( J+1 ), 1 )
                   JP = IPIV( J )
                   IF( JP.NE.J ) THEN
diff --git a/SRC/zgbequ.f b/SRC/zgbequ.f
index a8e398a159..cef2c169cc 100644
--- a/SRC/zgbequ.f
+++ b/SRC/zgbequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGBEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgbequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgbequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -146,11 +144,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup gbequ
 *
 *  =====================================================================
-      SUBROUTINE ZGBEQU( M, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+      SUBROUTINE ZGBEQU( M, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                   COLCND,
      $                   AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zgbequb.f b/SRC/zgbequb.f
index 76677fee1a..0e2c3edc28 100644
--- a/SRC/zgbequb.f
+++ b/SRC/zgbequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGBEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgbequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgbequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -153,11 +151,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup gbequb
 *
 *  =====================================================================
-      SUBROUTINE ZGBEQUB( M, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+      SUBROUTINE ZGBEQUB( M, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                    COLCND,
      $                    AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zgbrfs.f b/SRC/zgbrfs.f
index 6c7c016da8..66d6d06d7e 100644
--- a/SRC/zgbrfs.f
+++ b/SRC/zgbrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGBRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgbrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgbrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -197,12 +195,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup gbrfs
 *
 *  =====================================================================
-      SUBROUTINE ZGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
+      SUBROUTINE ZGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
+     $                   LDAFB,
      $                   IPIV, B, LDB, X, LDX, FERR, BERR, WORK, RWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -244,7 +244,8 @@ SUBROUTINE ZGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZGBMV, ZGBTRS, ZLACN2
+      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZGBMV, ZGBTRS,
+     $                   ZLACN2
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG, MAX, MIN
@@ -331,7 +332,8 @@ SUBROUTINE ZGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
 *        where op(A) = A, A**T, or A**H, depending on TRANS.
 *
          CALL ZCOPY( N, B( 1, J ), 1, WORK, 1 )
-         CALL ZGBMV( TRANS, N, N, KL, KU, -CONE, AB, LDAB, X( 1, J ), 1,
+         CALL ZGBMV( TRANS, N, N, KL, KU, -CONE, AB, LDAB, X( 1, J ),
+     $               1,
      $               CONE, WORK, 1 )
 *
 *        Compute componentwise relative backward error from formula
@@ -389,7 +391,8 @@ SUBROUTINE ZGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
 *
 *           Update solution and try again.
 *
-            CALL ZGBTRS( TRANS, N, KL, KU, 1, AFB, LDAFB, IPIV, WORK, N,
+            CALL ZGBTRS( TRANS, N, KL, KU, 1, AFB, LDAFB, IPIV, WORK,
+     $                   N,
      $                   INFO )
             CALL ZAXPY( N, CONE, WORK, 1, X( 1, J ), 1 )
             LSTRES = BERR( J )
diff --git a/SRC/zgbrfsx.f b/SRC/zgbrfsx.f
index c97038b4ae..2c309e694f 100644
--- a/SRC/zgbrfsx.f
+++ b/SRC/zgbrfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGBRFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgbrfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgbrfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -429,14 +427,16 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup gbrfsx
 *
 *  =====================================================================
-      SUBROUTINE ZGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
+      SUBROUTINE ZGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB,
+     $                    AFB,
      $                    LDAFB, IPIV, R, C, B, LDB, X, LDX, RCOND,
      $                    BERR, N_ERR_BNDS, ERR_BNDS_NORM,
      $                    ERR_BNDS_COMP, NPARAMS, PARAMS, WORK, RWORK,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -496,7 +496,8 @@ SUBROUTINE ZGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
 *     ..
 *     .. External Functions ..
       EXTERNAL           LSAME, ILAPREC
-      EXTERNAL           DLAMCH, ZLANGB, ZLA_GBRCOND_X, ZLA_GBRCOND_C
+      EXTERNAL           DLAMCH, ZLANGB, ZLA_GBRCOND_X,
+     $                   ZLA_GBRCOND_C
       DOUBLE PRECISION   DLAMCH, ZLANGB, ZLA_GBRCOND_X, ZLA_GBRCOND_C
       LOGICAL            LSAME
       INTEGER            ILATRANS, ILAPREC
@@ -643,7 +644,8 @@ SUBROUTINE ZGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
          PREC_TYPE = ILAPREC( 'E' )
 
          IF ( NOTRAN ) THEN
-            CALL ZLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE,  N, KL, KU,
+            CALL ZLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE,  N, KL,
+     $                                KU,
      $           NRHS, AB, LDAB, AFB, LDAFB, IPIV, COLEQU, C, B,
      $           LDB, X, LDX, BERR, N_NORMS, ERR_BNDS_NORM,
      $           ERR_BNDS_COMP, WORK, RWORK, WORK(N+1),
@@ -651,7 +653,8 @@ SUBROUTINE ZGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
      $           RCOND, ITHRESH, RTHRESH, UNSTABLE_THRESH, IGNORE_CWISE,
      $           INFO )
          ELSE
-            CALL ZLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE,  N, KL, KU,
+            CALL ZLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE,  N, KL,
+     $                                KU,
      $           NRHS, AB, LDAB, AFB, LDAFB, IPIV, ROWEQU, R, B,
      $           LDB, X, LDX, BERR, N_NORMS, ERR_BNDS_NORM,
      $           ERR_BNDS_COMP, WORK, RWORK, WORK(N+1),
@@ -661,19 +664,23 @@ SUBROUTINE ZGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
          END IF
       END IF
 
-      ERR_LBND = MAX( 10.0D+0, SQRT( DBLE( N ) ) ) * DLAMCH( 'Epsilon' )
+      ERR_LBND = MAX( 10.0D+0,
+     $                SQRT( DBLE( N ) ) ) * DLAMCH( 'Epsilon' )
       IF (N_ERR_BNDS .GE. 1 .AND. N_NORMS .GE. 1) THEN
 *
 *     Compute scaled normwise condition number cond(A*C).
 *
          IF ( COLEQU .AND. NOTRAN ) THEN
-            RCOND_TMP = ZLA_GBRCOND_C( TRANS, N, KL, KU, AB, LDAB, AFB,
+            RCOND_TMP = ZLA_GBRCOND_C( TRANS, N, KL, KU, AB, LDAB,
+     $                                 AFB,
      $           LDAFB, IPIV, C, .TRUE., INFO, WORK, RWORK )
          ELSE IF ( ROWEQU .AND. .NOT. NOTRAN ) THEN
-            RCOND_TMP = ZLA_GBRCOND_C( TRANS, N, KL, KU, AB, LDAB, AFB,
+            RCOND_TMP = ZLA_GBRCOND_C( TRANS, N, KL, KU, AB, LDAB,
+     $                                 AFB,
      $           LDAFB, IPIV, R, .TRUE., INFO, WORK, RWORK )
          ELSE
-            RCOND_TMP = ZLA_GBRCOND_C( TRANS, N, KL, KU, AB, LDAB, AFB,
+            RCOND_TMP = ZLA_GBRCOND_C( TRANS, N, KL, KU, AB, LDAB,
+     $                                 AFB,
      $           LDAFB, IPIV, C, .FALSE., INFO, WORK, RWORK )
          END IF
          DO J = 1, NRHS
diff --git a/SRC/zgbsv.f b/SRC/zgbsv.f
index 0b6a1d19f2..26ed027a2d 100644
--- a/SRC/zgbsv.f
+++ b/SRC/zgbsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGBSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgbsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgbsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,7 +131,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBsolve
+*> \ingroup gbsv
 *
 *> \par Further Details:
 *  =====================
@@ -158,7 +156,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZGBSV( N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB, INFO )
+      SUBROUTINE ZGBSV( N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
+     $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -210,7 +210,8 @@ SUBROUTINE ZGBSV( N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB, INFO )
 *
 *        Solve the system A*X = B, overwriting B with X.
 *
-         CALL ZGBTRS( 'No transpose', N, KL, KU, NRHS, AB, LDAB, IPIV,
+         CALL ZGBTRS( 'No transpose', N, KL, KU, NRHS, AB, LDAB,
+     $                IPIV,
      $                B, LDB, INFO )
       END IF
       RETURN
diff --git a/SRC/zgbsvx.f b/SRC/zgbsvx.f
index b6be786631..0b38c90b06 100644
--- a/SRC/zgbsvx.f
+++ b/SRC/zgbsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGBSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgbsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgbsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -322,7 +320,7 @@
 *>
 *> \param[out] RWORK
 *> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension (N)
+*>          RWORK is DOUBLE PRECISION array, dimension (MAX(1,N))
 *>          On exit, RWORK(1) contains the reciprocal pivot growth
 *>          factor norm(A)/norm(U). The "max absolute element" norm is
 *>          used. If RWORK(1) is much less than 1, then the stability
@@ -361,12 +359,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBsolve
+*> \ingroup gbsvx
 *
 *  =====================================================================
       SUBROUTINE ZGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
      $                   LDAFB, IPIV, EQUED, R, C, B, LDB, X, LDX,
      $                   RCOND, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -407,7 +406,8 @@ SUBROUTINE ZGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
       EXTERNAL           LSAME, DLAMCH, ZLANGB, ZLANTB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZCOPY, ZGBCON, ZGBEQU, ZGBRFS, ZGBTRF,
+      EXTERNAL           XERBLA, ZCOPY, ZGBCON, ZGBEQU, ZGBRFS,
+     $                   ZGBTRF,
      $                   ZGBTRS, ZLACPY, ZLAQGB
 *     ..
 *     .. Intrinsic Functions ..
@@ -432,7 +432,9 @@ SUBROUTINE ZGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
       ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
@@ -508,7 +510,8 @@ SUBROUTINE ZGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *
 *           Equilibrate the matrix.
 *
-            CALL ZLAQGB( N, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+            CALL ZLAQGB( N, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                   COLCND,
      $                   AMAX, EQUED )
             ROWEQU = LSAME( EQUED, 'R' ) .OR. LSAME( EQUED, 'B' )
             COLEQU = LSAME( EQUED, 'C' ) .OR. LSAME( EQUED, 'B' )
@@ -559,7 +562,8 @@ SUBROUTINE ZGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
                   ANORM = MAX( ANORM, ABS( AB( I, J ) ) )
    80          CONTINUE
    90       CONTINUE
-            RPVGRW = ZLANTB( 'M', 'U', 'N', INFO, MIN( INFO-1, KL+KU ),
+            RPVGRW = ZLANTB( 'M', 'U', 'N', INFO, MIN( INFO-1,
+     $                       KL+KU ),
      $                       AFB( MAX( 1, KL+KU+2-INFO ), 1 ), LDAFB,
      $                       RWORK )
             IF( RPVGRW.EQ.ZERO ) THEN
@@ -603,7 +607,8 @@ SUBROUTINE ZGBSVX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *     Use iterative refinement to improve the computed solution and
 *     compute error bounds and backward error estimates for it.
 *
-      CALL ZGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB, IPIV,
+      CALL ZGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
+     $             IPIV,
      $             B, LDB, X, LDX, FERR, BERR, WORK, RWORK, INFO )
 *
 *     Transform the solution matrix X to a solution of the original
diff --git a/SRC/zgbsvxx.f b/SRC/zgbsvxx.f
index f608e9c105..2afeeefb1c 100644
--- a/SRC/zgbsvxx.f
+++ b/SRC/zgbsvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGBSVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgbsvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgbsvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -549,14 +547,16 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBsolve
+*> \ingroup gbsvxx
 *
 *  =====================================================================
-      SUBROUTINE ZGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
+      SUBROUTINE ZGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB,
+     $                    AFB,
      $                    LDAFB, IPIV, EQUED, R, C, B, LDB, X, LDX,
      $                    RCOND, RPVGRW, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -603,7 +603,8 @@ SUBROUTINE ZGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
       DOUBLE PRECISION   DLAMCH, ZLA_GBRPVGRW
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZGBEQUB, ZGBTRF, ZGBTRS, ZLACPY, ZLAQGB,
+      EXTERNAL           ZGBEQUB, ZGBTRF, ZGBTRS, ZLACPY,
+     $                   ZLAQGB,
      $                   XERBLA, ZLASCL2, ZGBRFSX
 *     ..
 *     .. Intrinsic Functions ..
@@ -710,7 +711,8 @@ SUBROUTINE ZGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *
 *     Equilibrate the matrix.
 *
-            CALL ZLAQGB( N, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+            CALL ZLAQGB( N, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                   COLCND,
      $           AMAX, EQUED )
             ROWEQU = LSAME( EQUED, 'R' ) .OR. LSAME( EQUED, 'B' )
             COLEQU = LSAME( EQUED, 'C' ) .OR. LSAME( EQUED, 'B' )
@@ -776,7 +778,8 @@ SUBROUTINE ZGBSVXX( FACT, TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
 *     Use iterative refinement to improve the computed solution and
 *     compute error bounds and backward error estimates for it.
 *
-      CALL ZGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB, LDAFB,
+      CALL ZGBRFSX( TRANS, EQUED, N, KL, KU, NRHS, AB, LDAB, AFB,
+     $              LDAFB,
      $     IPIV, R, C, B, LDB, X, LDX, RCOND, BERR,
      $     N_ERR_BNDS, ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $     WORK, RWORK, INFO )
diff --git a/SRC/zgbtf2.f b/SRC/zgbtf2.f
index fbbe632476..90f83e19ad 100644
--- a/SRC/zgbtf2.f
+++ b/SRC/zgbtf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGBTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgbtf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgbtf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,7 +113,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup gbtf2
 *
 *> \par Further Details:
 *  =====================
@@ -142,6 +140,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGBTF2( M, N, KL, KU, AB, LDAB, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -249,7 +248,8 @@ SUBROUTINE ZGBTF2( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *              Compute multipliers.
 *
-               CALL ZSCAL( KM, ONE / AB( KV+1, J ), AB( KV+2, J ), 1 )
+               CALL ZSCAL( KM, ONE / AB( KV+1, J ), AB( KV+2, J ),
+     $                     1 )
 *
 *              Update trailing submatrix within the band.
 *
diff --git a/SRC/zgbtrf.f b/SRC/zgbtrf.f
index 83139b0919..a642ab0944 100644
--- a/SRC/zgbtrf.f
+++ b/SRC/zgbtrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGBTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgbtrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgbtrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,7 +113,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup gbtrf
 *
 *> \par Further Details:
 *  =====================
@@ -141,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -177,7 +176,8 @@ SUBROUTINE ZGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
       EXTERNAL           ILAENV, IZAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZCOPY, ZGBTF2, ZGEMM, ZGERU, ZLASWP,
+      EXTERNAL           XERBLA, ZCOPY, ZGBTF2, ZGEMM, ZGERU,
+     $                   ZLASWP,
      $                   ZSCAL, ZSWAP, ZTRSM
 *     ..
 *     .. Intrinsic Functions ..
@@ -325,7 +325,8 @@ SUBROUTINE ZGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                 Compute multipliers
 *
-                  CALL ZSCAL( KM, ONE / AB( KV+1, JJ ), AB( KV+2, JJ ),
+                  CALL ZSCAL( KM, ONE / AB( KV+1, JJ ), AB( KV+2,
+     $                        JJ ),
      $                        1 )
 *
 *                 Update trailing submatrix within the band and within
@@ -394,7 +395,8 @@ SUBROUTINE ZGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                 Update A12
 *
-                  CALL ZTRSM( 'Left', 'Lower', 'No transpose', 'Unit',
+                  CALL ZTRSM( 'Left', 'Lower', 'No transpose',
+     $                        'Unit',
      $                        JB, J2, ONE, AB( KV+1, J ), LDAB-1,
      $                        AB( KV+1-JB, J+JB ), LDAB-1 )
 *
@@ -402,7 +404,8 @@ SUBROUTINE ZGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                    Update A22
 *
-                     CALL ZGEMM( 'No transpose', 'No transpose', I2, J2,
+                     CALL ZGEMM( 'No transpose', 'No transpose', I2,
+     $                           J2,
      $                           JB, -ONE, AB( KV+1+JB, J ), LDAB-1,
      $                           AB( KV+1-JB, J+JB ), LDAB-1, ONE,
      $                           AB( KV+1, J+JB ), LDAB-1 )
@@ -412,7 +415,8 @@ SUBROUTINE ZGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                    Update A32
 *
-                     CALL ZGEMM( 'No transpose', 'No transpose', I3, J2,
+                     CALL ZGEMM( 'No transpose', 'No transpose', I3,
+     $                           J2,
      $                           JB, -ONE, WORK31, LDWORK,
      $                           AB( KV+1-JB, J+JB ), LDAB-1, ONE,
      $                           AB( KV+KL+1-JB, J+JB ), LDAB-1 )
@@ -432,7 +436,8 @@ SUBROUTINE ZGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                 Update A13 in the work array
 *
-                  CALL ZTRSM( 'Left', 'Lower', 'No transpose', 'Unit',
+                  CALL ZTRSM( 'Left', 'Lower', 'No transpose',
+     $                        'Unit',
      $                        JB, J3, ONE, AB( KV+1, J ), LDAB-1,
      $                        WORK13, LDWORK )
 *
@@ -440,7 +445,8 @@ SUBROUTINE ZGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                    Update A23
 *
-                     CALL ZGEMM( 'No transpose', 'No transpose', I2, J3,
+                     CALL ZGEMM( 'No transpose', 'No transpose', I2,
+     $                           J3,
      $                           JB, -ONE, AB( KV+1+JB, J ), LDAB-1,
      $                           WORK13, LDWORK, ONE, AB( 1+JB, J+KV ),
      $                           LDAB-1 )
@@ -450,7 +456,8 @@ SUBROUTINE ZGBTRF( M, N, KL, KU, AB, LDAB, IPIV, INFO )
 *
 *                    Update A33
 *
-                     CALL ZGEMM( 'No transpose', 'No transpose', I3, J3,
+                     CALL ZGEMM( 'No transpose', 'No transpose', I3,
+     $                           J3,
      $                           JB, -ONE, WORK31, LDWORK, WORK13,
      $                           LDWORK, ONE, AB( 1+KL, J+KV ), LDAB-1 )
                   END IF
diff --git a/SRC/zgbtrs.f b/SRC/zgbtrs.f
index 4a2ba5452c..c2d365ed55 100644
--- a/SRC/zgbtrs.f
+++ b/SRC/zgbtrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGBTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgbtrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgbtrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,11 +128,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup gbtrs
 *
 *  =====================================================================
-      SUBROUTINE ZGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
+      SUBROUTINE ZGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B,
+     $                   LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -164,7 +164,8 @@ SUBROUTINE ZGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZGEMV, ZGERU, ZLACGV, ZSWAP, ZTBSV
+      EXTERNAL           XERBLA, ZGEMV, ZGERU, ZLACGV, ZSWAP,
+     $                   ZTBSV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -221,7 +222,8 @@ SUBROUTINE ZGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
                L = IPIV( J )
                IF( L.NE.J )
      $            CALL ZSWAP( NRHS, B( L, 1 ), LDB, B( J, 1 ), LDB )
-               CALL ZGERU( LM, NRHS, -ONE, AB( KD+1, J ), 1, B( J, 1 ),
+               CALL ZGERU( LM, NRHS, -ONE, AB( KD+1, J ), 1, B( J,
+     $                     1 ),
      $                     LDB, B( J+1, 1 ), LDB )
    10       CONTINUE
          END IF
@@ -230,7 +232,8 @@ SUBROUTINE ZGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
 *
 *           Solve U*X = B, overwriting B with X.
 *
-            CALL ZTBSV( 'Upper', 'No transpose', 'Non-unit', N, KL+KU,
+            CALL ZTBSV( 'Upper', 'No transpose', 'Non-unit', N,
+     $                  KL+KU,
      $                  AB, LDAB, B( 1, I ), 1 )
    20    CONTINUE
 *
@@ -242,7 +245,8 @@ SUBROUTINE ZGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
 *
 *           Solve U**T * X = B, overwriting B with X.
 *
-            CALL ZTBSV( 'Upper', 'Transpose', 'Non-unit', N, KL+KU, AB,
+            CALL ZTBSV( 'Upper', 'Transpose', 'Non-unit', N, KL+KU,
+     $                  AB,
      $                  LDAB, B( 1, I ), 1 )
    30    CONTINUE
 *
@@ -267,7 +271,8 @@ SUBROUTINE ZGBTRS( TRANS, N, KL, KU, NRHS, AB, LDAB, IPIV, B, LDB,
 *
 *           Solve U**H * X = B, overwriting B with X.
 *
-            CALL ZTBSV( 'Upper', 'Conjugate transpose', 'Non-unit', N,
+            CALL ZTBSV( 'Upper', 'Conjugate transpose', 'Non-unit',
+     $                  N,
      $                  KL+KU, AB, LDAB, B( 1, I ), 1 )
    50    CONTINUE
 *
diff --git a/SRC/zgebak.f b/SRC/zgebak.f
index 9ec610efb4..a004745ee5 100644
--- a/SRC/zgebak.f
+++ b/SRC/zgebak.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEBAK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgebak.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgebak.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,11 +121,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup gebak
 *
 *  =====================================================================
       SUBROUTINE ZGEBAK( JOB, SIDE, N, ILO, IHI, SCALE, M, V, LDV,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,8 +170,10 @@ SUBROUTINE ZGEBAK( JOB, SIDE, N, ILO, IHI, SCALE, M, V, LDV,
       LEFTV = LSAME( SIDE, 'L' )
 *
       INFO = 0
-      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
-     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+      IF( .NOT.LSAME( JOB, 'N' ) .AND.
+     $    .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND.
+     $                .NOT.LSAME( JOB, 'B' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.RIGHTV .AND. .NOT.LEFTV ) THEN
          INFO = -2
@@ -238,7 +239,7 @@ SUBROUTINE ZGEBAK( JOB, SIDE, N, ILO, IHI, SCALE, M, V, LDV,
      $            GO TO 40
                IF( I.LT.ILO )
      $            I = ILO - II
-               K = SCALE( I )
+               K = INT( SCALE( I ) )
                IF( K.EQ.I )
      $            GO TO 40
                CALL ZSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
@@ -252,7 +253,7 @@ SUBROUTINE ZGEBAK( JOB, SIDE, N, ILO, IHI, SCALE, M, V, LDV,
      $            GO TO 50
                IF( I.LT.ILO )
      $            I = ILO - II
-               K = SCALE( I )
+               K = INT( SCALE( I ) )
                IF( K.EQ.I )
      $            GO TO 50
                CALL ZSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
diff --git a/SRC/zgebal.f b/SRC/zgebal.f
index d4a9e39f12..3e077477ca 100644
--- a/SRC/zgebal.f
+++ b/SRC/zgebal.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEBAL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgebal.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgebal.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -89,7 +87,7 @@
 *> \param[out] IHI
 *> \verbatim
 *>          IHI is INTEGER
-*>          ILO and IHI are set to INTEGER such that on exit
+*>          ILO and IHI are set to integers such that on exit
 *>          A(i,j) = 0 if i > j and j = 1,...,ILO-1 or I = IHI+1,...,N.
 *>          If JOB = 'N' or 'S', ILO = 1 and IHI = N.
 *> \endverbatim
@@ -123,7 +121,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup gebal
 *
 *> \par Further Details:
 *  =====================
@@ -155,10 +153,14 @@
 *>
 *>  Modified by Tzu-Yi Chen, Computer Science Division, University of
 *>    California at Berkeley, USA
+*>
+*>  Refactored by Evert Provoost, Department of Computer Science,
+*>    KU Leuven, Belgium
 *> \endverbatim
 *>
 *  =====================================================================
       SUBROUTINE ZGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -184,8 +186,8 @@ SUBROUTINE ZGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
       PARAMETER          ( FACTOR = 0.95D+0 )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            NOCONV
-      INTEGER            I, ICA, IEXC, IRA, J, K, L, M
+      LOGICAL            NOCONV, CANSWAP
+      INTEGER            I, ICA, IRA, J, K, L
       DOUBLE PRECISION   C, CA, F, G, R, RA, S, SFMAX1, SFMAX2, SFMIN1,
      $                   SFMIN2
 *     ..
@@ -193,7 +195,8 @@ SUBROUTINE ZGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
       LOGICAL            DISNAN, LSAME
       INTEGER            IZAMAX
       DOUBLE PRECISION   DLAMCH, DZNRM2
-      EXTERNAL           DISNAN, LSAME, IZAMAX, DLAMCH, DZNRM2
+      EXTERNAL           DISNAN, LSAME, IZAMAX, DLAMCH,
+     $                   DZNRM2
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           XERBLA, ZDSCAL, ZSWAP
@@ -204,8 +207,10 @@ SUBROUTINE ZGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
 *     Test the input parameters
 *
       INFO = 0
-      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
-     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+      IF( .NOT.LSAME( JOB, 'N' ) .AND.
+     $    .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND.
+     $                .NOT.LSAME( JOB, 'B' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -217,176 +222,196 @@ SUBROUTINE ZGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
          RETURN
       END IF
 *
-      K = 1
-      L = N
+*     Quick returns.
 *
-      IF( N.EQ.0 )
-     $   GO TO 210
+      IF( N.EQ.0 ) THEN
+         ILO = 1
+         IHI = 0
+         RETURN
+      END IF
 *
       IF( LSAME( JOB, 'N' ) ) THEN
-         DO 10 I = 1, N
+         DO I = 1, N
             SCALE( I ) = ONE
-   10    CONTINUE
-         GO TO 210
+         END DO
+         ILO = 1
+         IHI = N
+         RETURN
       END IF
 *
-      IF( LSAME( JOB, 'S' ) )
-     $   GO TO 120
-*
-*     Permutation to isolate eigenvalues if possible
-*
-      GO TO 50
-*
-*     Row and column exchange.
-*
-   20 CONTINUE
-      SCALE( M ) = J
-      IF( J.EQ.M )
-     $   GO TO 30
-*
-      CALL ZSWAP( L, A( 1, J ), 1, A( 1, M ), 1 )
-      CALL ZSWAP( N-K+1, A( J, K ), LDA, A( M, K ), LDA )
-*
-   30 CONTINUE
-      GO TO ( 40, 80 )IEXC
-*
-*     Search for rows isolating an eigenvalue and push them down.
-*
-   40 CONTINUE
-      IF( L.EQ.1 )
-     $   GO TO 210
-      L = L - 1
-*
-   50 CONTINUE
-      DO 70 J = L, 1, -1
+*     Permutation to isolate eigenvalues if possible.
 *
-         DO 60 I = 1, L
-            IF( I.EQ.J )
-     $         GO TO 60
-            IF( DBLE( A( J, I ) ).NE.ZERO .OR. DIMAG( A( J, I ) ).NE.
-     $          ZERO )GO TO 70
-   60    CONTINUE
-*
-         M = L
-         IEXC = 1
-         GO TO 20
-   70 CONTINUE
-*
-      GO TO 90
+      K = 1
+      L = N
 *
-*     Search for columns isolating an eigenvalue and push them left.
+      IF( .NOT.LSAME( JOB, 'S' ) ) THEN
 *
-   80 CONTINUE
-      K = K + 1
+*        Row and column exchange.
 *
-   90 CONTINUE
-      DO 110 J = K, L
+         NOCONV = .TRUE.
+         DO WHILE( NOCONV )
+*
+*           Search for rows isolating an eigenvalue and push them down.
+*
+            NOCONV = .FALSE.
+            DO I = L, 1, -1
+               CANSWAP = .TRUE.
+               DO J = 1, L
+                  IF( I.NE.J .AND. ( DBLE( A( I, J ) ).NE.ZERO .OR.
+     $                DIMAG( A( I, J ) ).NE.ZERO ) ) THEN
+                     CANSWAP = .FALSE.
+                     EXIT
+                  END IF
+               END DO
+*
+               IF( CANSWAP ) THEN
+                  SCALE( L ) = I
+                  IF( I.NE.L ) THEN
+                     CALL ZSWAP( L, A( 1, I ), 1, A( 1, L ), 1 )
+                     CALL ZSWAP( N-K+1, A( I, K ), LDA, A( L, K ),
+     $                           LDA )
+                  END IF
+                  NOCONV = .TRUE.
+*
+                  IF( L.EQ.1 ) THEN
+                     ILO = 1
+                     IHI = 1
+                     RETURN
+                  END IF
+*
+                  L = L - 1
+               END IF
+            END DO
+*
+         END DO
+
+         NOCONV = .TRUE.
+         DO WHILE( NOCONV )
+*
+*           Search for columns isolating an eigenvalue and push them left.
+*
+            NOCONV = .FALSE.
+            DO J = K, L
+               CANSWAP = .TRUE.
+               DO I = K, L
+                  IF( I.NE.J .AND. ( DBLE( A( I, J ) ).NE.ZERO .OR.
+     $                DIMAG( A( I, J ) ).NE.ZERO ) ) THEN
+                     CANSWAP = .FALSE.
+                     EXIT
+                  END IF
+               END DO
+*
+               IF( CANSWAP ) THEN
+                  SCALE( K ) = J
+                  IF( J.NE.K ) THEN
+                     CALL ZSWAP( L, A( 1, J ), 1, A( 1, K ), 1 )
+                     CALL ZSWAP( N-K+1, A( J, K ), LDA, A( K, K ),
+     $                           LDA )
+                  END IF
+                  NOCONV = .TRUE.
+*
+                  K = K + 1
+               END IF
+            END DO
+*
+         END DO
 *
-         DO 100 I = K, L
-            IF( I.EQ.J )
-     $         GO TO 100
-            IF( DBLE( A( I, J ) ).NE.ZERO .OR. DIMAG( A( I, J ) ).NE.
-     $          ZERO )GO TO 110
-  100    CONTINUE
+      END IF
 *
-         M = K
-         IEXC = 2
-         GO TO 20
-  110 CONTINUE
+*     Initialize SCALE for non-permuted submatrix.
 *
-  120 CONTINUE
-      DO 130 I = K, L
+      DO I = K, L
          SCALE( I ) = ONE
-  130 CONTINUE
+      END DO
 *
-      IF( LSAME( JOB, 'P' ) )
-     $   GO TO 210
+*     If we only had to permute, we are done.
+*
+      IF( LSAME( JOB, 'P' ) ) THEN
+         ILO = K
+         IHI = L
+         RETURN
+      END IF
 *
 *     Balance the submatrix in rows K to L.
 *
-*     Iterative loop for norm reduction
+*     Iterative loop for norm reduction.
 *
       SFMIN1 = DLAMCH( 'S' ) / DLAMCH( 'P' )
       SFMAX1 = ONE / SFMIN1
       SFMIN2 = SFMIN1*SCLFAC
       SFMAX2 = ONE / SFMIN2
-  140 CONTINUE
-      NOCONV = .FALSE.
-*
-      DO 200 I = K, L
-*
-         C = DZNRM2( L-K+1, A( K, I ), 1 )
-         R = DZNRM2( L-K+1, A( I, K ), LDA )
-         ICA = IZAMAX( L, A( 1, I ), 1 )
-         CA = ABS( A( ICA, I ) )
-         IRA = IZAMAX( N-K+1, A( I, K ), LDA )
-         RA = ABS( A( I, IRA+K-1 ) )
-*
-*        Guard against zero C or R due to underflow.
-*
-         IF( C.EQ.ZERO .OR. R.EQ.ZERO )
-     $      GO TO 200
-         G = R / SCLFAC
-         F = ONE
-         S = C + R
-  160    CONTINUE
-         IF( C.GE.G .OR. MAX( F, C, CA ).GE.SFMAX2 .OR.
-     $       MIN( R, G, RA ).LE.SFMIN2 )GO TO 170
-            IF( DISNAN( C+F+CA+R+G+RA ) ) THEN
 *
-*           Exit if NaN to avoid infinite loop
+      NOCONV = .TRUE.
+      DO WHILE( NOCONV )
+         NOCONV = .FALSE.
 *
-            INFO = -3
-            CALL XERBLA( 'ZGEBAL', -INFO )
-            RETURN
-         END IF
-         F = F*SCLFAC
-         C = C*SCLFAC
-         CA = CA*SCLFAC
-         R = R / SCLFAC
-         G = G / SCLFAC
-         RA = RA / SCLFAC
-         GO TO 160
-*
-  170    CONTINUE
-         G = C / SCLFAC
-  180    CONTINUE
-         IF( G.LT.R .OR. MAX( R, RA ).GE.SFMAX2 .OR.
-     $       MIN( F, C, G, CA ).LE.SFMIN2 )GO TO 190
-         F = F / SCLFAC
-         C = C / SCLFAC
-         G = G / SCLFAC
-         CA = CA / SCLFAC
-         R = R*SCLFAC
-         RA = RA*SCLFAC
-         GO TO 180
-*
-*        Now balance.
-*
-  190    CONTINUE
-         IF( ( C+R ).GE.FACTOR*S )
-     $      GO TO 200
-         IF( F.LT.ONE .AND. SCALE( I ).LT.ONE ) THEN
-            IF( F*SCALE( I ).LE.SFMIN1 )
-     $         GO TO 200
-         END IF
-         IF( F.GT.ONE .AND. SCALE( I ).GT.ONE ) THEN
-            IF( SCALE( I ).GE.SFMAX1 / F )
-     $         GO TO 200
-         END IF
-         G = ONE / F
-         SCALE( I ) = SCALE( I )*F
-         NOCONV = .TRUE.
+         DO I = K, L
 *
-         CALL ZDSCAL( N-K+1, G, A( I, K ), LDA )
-         CALL ZDSCAL( L, F, A( 1, I ), 1 )
+            C = DZNRM2( L-K+1, A( K, I ), 1 )
+            R = DZNRM2( L-K+1, A( I, K ), LDA )
+            ICA = IZAMAX( L, A( 1, I ), 1 )
+            CA = ABS( A( ICA, I ) )
+            IRA = IZAMAX( N-K+1, A( I, K ), LDA )
+            RA = ABS( A( I, IRA+K-1 ) )
 *
-  200 CONTINUE
+*           Guard against zero C or R due to underflow.
+*
+            IF( C.EQ.ZERO .OR. R.EQ.ZERO ) CYCLE
+*
+*           Exit if NaN to avoid infinite loop
 *
-      IF( NOCONV )
-     $   GO TO 140
+            IF( DISNAN( C+CA+R+RA ) ) THEN
+               INFO = -3
+               CALL XERBLA( 'ZGEBAL', -INFO )
+               RETURN
+            END IF
+*
+            G = R / SCLFAC
+            F = ONE
+            S = C + R
+*
+            DO WHILE( C.LT.G .AND. MAX( F, C, CA ).LT.SFMAX2 .AND.
+     $                MIN( R, G, RA ).GT.SFMIN2 )
+               F = F*SCLFAC
+               C = C*SCLFAC
+               CA = CA*SCLFAC
+               R = R / SCLFAC
+               G = G / SCLFAC
+               RA = RA / SCLFAC
+            END DO
+*
+            G = C / SCLFAC
+*
+            DO WHILE( G.GE.R .AND. MAX( R, RA ).LT.SFMAX2 .AND.
+     $                MIN( F, C, G, CA ).GT.SFMIN2 )
+               F = F / SCLFAC
+               C = C / SCLFAC
+               G = G / SCLFAC
+               CA = CA / SCLFAC
+               R = R*SCLFAC
+               RA = RA*SCLFAC
+            END DO
+*
+*           Now balance.
+*
+            IF( ( C+R ).GE.FACTOR*S ) CYCLE
+            IF( F.LT.ONE .AND. SCALE( I ).LT.ONE ) THEN
+               IF( F*SCALE( I ).LE.SFMIN1 ) CYCLE
+            END IF
+            IF( F.GT.ONE .AND. SCALE( I ).GT.ONE ) THEN
+               IF( SCALE( I ).GE.SFMAX1 / F ) CYCLE
+            END IF
+            G = ONE / F
+            SCALE( I ) = SCALE( I )*F
+            NOCONV = .TRUE.
+*
+            CALL ZDSCAL( N-K+1, G, A( I, K ), LDA )
+            CALL ZDSCAL( L, F, A( 1, I ), 1 )
+*
+         END DO
+*
+      END DO
 *
-  210 CONTINUE
       ILO = K
       IHI = L
 *
diff --git a/SRC/zgebd2.f b/SRC/zgebd2.f
index 9a403e4008..465409943a 100644
--- a/SRC/zgebd2.f
+++ b/SRC/zgebd2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEBD2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgebd2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgebd2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup gebd2
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +184,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -202,16 +201,14 @@ SUBROUTINE ZGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
 *  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ZERO, ONE
-      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
-     $                   ONE = ( 1.0D+0, 0.0D+0 ) )
-*     ..
+      COMPLEX*16         ZERO
+      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ) )
 *     .. Local Scalars ..
       INTEGER            I
       COMPLEX*16         ALPHA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLACGV, ZLARF, ZLARFG
+      EXTERNAL           XERBLA, ZLACGV, ZLARF1F, ZLARFG
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DCONJG, MAX, MIN
@@ -245,12 +242,11 @@ SUBROUTINE ZGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
             CALL ZLARFG( M-I+1, ALPHA, A( MIN( I+1, M ), I ), 1,
      $                   TAUQ( I ) )
             D( I ) = DBLE( ALPHA )
-            A( I, I ) = ONE
 *
 *           Apply H(i)**H to A(i:m,i+1:n) from the left
 *
             IF( I.LT.N )
-     $         CALL ZLARF( 'Left', M-I+1, N-I, A( I, I ), 1,
+     $         CALL ZLARF1F( 'Left', M-I+1, N-I, A( I, I ), 1,
      $                     DCONJG( TAUQ( I ) ), A( I, I+1 ), LDA, WORK )
             A( I, I ) = D( I )
 *
@@ -264,11 +260,10 @@ SUBROUTINE ZGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
                CALL ZLARFG( N-I, ALPHA, A( I, MIN( I+2, N ) ), LDA,
      $                      TAUP( I ) )
                E( I ) = DBLE( ALPHA )
-               A( I, I+1 ) = ONE
 *
 *              Apply G(i) to A(i+1:m,i+1:n) from the right
 *
-               CALL ZLARF( 'Right', M-I, N-I, A( I, I+1 ), LDA,
+               CALL ZLARF1F( 'Right', M-I, N-I, A( I, I+1 ), LDA,
      $                     TAUP( I ), A( I+1, I+1 ), LDA, WORK )
                CALL ZLACGV( N-I, A( I, I+1 ), LDA )
                A( I, I+1 ) = E( I )
@@ -289,12 +284,11 @@ SUBROUTINE ZGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
             CALL ZLARFG( N-I+1, ALPHA, A( I, MIN( I+1, N ) ), LDA,
      $                   TAUP( I ) )
             D( I ) = DBLE( ALPHA )
-            A( I, I ) = ONE
 *
 *           Apply G(i) to A(i+1:m,i:n) from the right
 *
             IF( I.LT.M )
-     $         CALL ZLARF( 'Right', M-I, N-I+1, A( I, I ), LDA,
+     $         CALL ZLARF1F( 'Right', M-I, N-I+1, A( I, I ), LDA,
      $                     TAUP( I ), A( I+1, I ), LDA, WORK )
             CALL ZLACGV( N-I+1, A( I, I ), LDA )
             A( I, I ) = D( I )
@@ -308,11 +302,10 @@ SUBROUTINE ZGEBD2( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, INFO )
                CALL ZLARFG( M-I, ALPHA, A( MIN( I+2, M ), I ), 1,
      $                      TAUQ( I ) )
                E( I ) = DBLE( ALPHA )
-               A( I+1, I ) = ONE
 *
 *              Apply H(i)**H to A(i+1:m,i+1:n) from the left
 *
-               CALL ZLARF( 'Left', M-I, N-I, A( I+1, I ), 1,
+               CALL ZLARF1F( 'Left', M-I, N-I, A( I+1, I ), 1,
      $                     DCONJG( TAUQ( I ) ), A( I+1, I+1 ), LDA,
      $                     WORK )
                A( I+1, I ) = E( I )
diff --git a/SRC/zgebrd.f b/SRC/zgebrd.f
index f1791c6a4b..76801eb184 100644
--- a/SRC/zgebrd.f
+++ b/SRC/zgebrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEBRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgebrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgebrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,7 +120,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of the array WORK.  LWORK >= max(1,M,N).
+*>          The length of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= MAX(M,N), otherwise.
 *>          For optimum performance LWORK >= (M+N)*NB, where NB
 *>          is the optimal blocksize.
 *>
@@ -147,7 +146,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup gebrd
 *
 *> \par Further Details:
 *  =====================
@@ -202,6 +201,7 @@
 *  =====================================================================
       SUBROUTINE ZGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,8 +223,8 @@ SUBROUTINE ZGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY
-      INTEGER            I, IINFO, J, LDWRKX, LDWRKY, LWKOPT, MINMN, NB,
-     $                   NBMIN, NX, WS
+      INTEGER            I, IINFO, J, LDWRKX, LDWRKY, LWKMIN, LWKOPT,
+     $                   MINMN, NB, NBMIN, NX, WS
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           XERBLA, ZGEBD2, ZGEMM, ZLABRD
@@ -241,9 +241,17 @@ SUBROUTINE ZGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *     Test the input parameters
 *
       INFO = 0
-      NB = MAX( 1, ILAENV( 1, 'ZGEBRD', ' ', M, N, -1, -1 ) )
-      LWKOPT = ( M+N )*NB
+      MINMN = MIN( M, N )
+      IF( MINMN.EQ.0 ) THEN
+         LWKMIN = 1
+         LWKOPT = 1
+      ELSE
+         LWKMIN = MAX( M, N )
+         NB = MAX( 1, ILAENV( 1, 'ZGEBRD', ' ', M, N, -1, -1 ) )
+         LWKOPT = ( M+N )*NB
+      END IF
       WORK( 1 ) = DBLE( LWKOPT )
+*
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -251,7 +259,7 @@ SUBROUTINE ZGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, M, N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -10
       END IF
       IF( INFO.LT.0 ) THEN
@@ -263,7 +271,6 @@ SUBROUTINE ZGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *
 *     Quick return if possible
 *
-      MINMN = MIN( M, N )
       IF( MINMN.EQ.0 ) THEN
          WORK( 1 ) = 1
          RETURN
@@ -282,7 +289,7 @@ SUBROUTINE ZGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *        Determine when to switch from blocked to unblocked code.
 *
          IF( NX.LT.MINMN ) THEN
-            WS = ( M+N )*NB
+            WS = LWKOPT
             IF( LWORK.LT.WS ) THEN
 *
 *              Not enough work space for the optimal NB, consider using
@@ -307,7 +314,8 @@ SUBROUTINE ZGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
 *        the matrices X and Y which are needed to update the unreduced
 *        part of the matrix
 *
-         CALL ZLABRD( M-I+1, N-I+1, NB, A( I, I ), LDA, D( I ), E( I ),
+         CALL ZLABRD( M-I+1, N-I+1, NB, A( I, I ), LDA, D( I ),
+     $                E( I ),
      $                TAUQ( I ), TAUP( I ), WORK, LDWRKX,
      $                WORK( LDWRKX*NB+1 ), LDWRKY )
 *
@@ -318,7 +326,8 @@ SUBROUTINE ZGEBRD( M, N, A, LDA, D, E, TAUQ, TAUP, WORK, LWORK,
      $               N-I-NB+1, NB, -ONE, A( I+NB, I ), LDA,
      $               WORK( LDWRKX*NB+NB+1 ), LDWRKY, ONE,
      $               A( I+NB, I+NB ), LDA )
-         CALL ZGEMM( 'No transpose', 'No transpose', M-I-NB+1, N-I-NB+1,
+         CALL ZGEMM( 'No transpose', 'No transpose', M-I-NB+1,
+     $               N-I-NB+1,
      $               NB, -ONE, WORK( NB+1 ), LDWRKX, A( I, I+NB ), LDA,
      $               ONE, A( I+NB, I+NB ), LDA )
 *
diff --git a/SRC/zgecon.f b/SRC/zgecon.f
index 3d3127f9df..92b5b9c41e 100644
--- a/SRC/zgecon.f
+++ b/SRC/zgecon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGECON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgecon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgecon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -105,7 +103,15 @@
 *> \verbatim
 *>          INFO is INTEGER
 *>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>                NaNs are illegal values for ANORM, and they propagate to
+*>                the output parameter RCOND.
+*>                Infinity is illegal for ANORM, and it propagates to the output
+*>                parameter RCOND as 0.
+*>          = 1:  if RCOND = NaN, or
+*>                   RCOND = Inf, or
+*>                   the computed norm of the inverse of A is 0.
+*>                In the latter, RCOND = 0 is returned.
 *> \endverbatim
 *
 *  Authors:
@@ -116,11 +122,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup gecon
 *
 *  =====================================================================
       SUBROUTINE ZGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -146,17 +153,17 @@ SUBROUTINE ZGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
       LOGICAL            ONENRM
       CHARACTER          NORMIN
       INTEGER            IX, KASE, KASE1
-      DOUBLE PRECISION   AINVNM, SCALE, SL, SMLNUM, SU
+      DOUBLE PRECISION   AINVNM, SCALE, SL, SMLNUM, SU, HUGEVAL
       COMPLEX*16         ZDUM
 *     ..
 *     .. Local Arrays ..
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Functions ..
-      LOGICAL            LSAME
+      LOGICAL            LSAME, DISNAN
       INTEGER            IZAMAX
       DOUBLE PRECISION   DLAMCH
-      EXTERNAL           LSAME, IZAMAX, DLAMCH
+      EXTERNAL           LSAME, IZAMAX, DLAMCH, DISNAN
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           XERBLA, ZDRSCL, ZLACN2, ZLATRS
@@ -171,6 +178,8 @@ SUBROUTINE ZGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
       CABS1( ZDUM ) = ABS( DBLE( ZDUM ) ) + ABS( DIMAG( ZDUM ) )
 *     ..
 *     .. Executable Statements ..
+*
+      HUGEVAL = DLAMCH( 'Overflow' )
 *
 *     Test the input parameters.
 *
@@ -198,6 +207,13 @@ SUBROUTINE ZGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
          RETURN
       ELSE IF( ANORM.EQ.ZERO ) THEN
          RETURN
+      ELSE IF( DISNAN( ANORM ) ) THEN
+         RCOND = ANORM
+         INFO = -5
+         RETURN
+      ELSE IF( ANORM.GT.HUGEVAL ) THEN
+         INFO = -5
+         RETURN
       END IF
 *
       SMLNUM = DLAMCH( 'Safe minimum' )
@@ -219,12 +235,14 @@ SUBROUTINE ZGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
 *
 *           Multiply by inv(L).
 *
-            CALL ZLATRS( 'Lower', 'No transpose', 'Unit', NORMIN, N, A,
+            CALL ZLATRS( 'Lower', 'No transpose', 'Unit', NORMIN, N,
+     $                   A,
      $                   LDA, WORK, SL, RWORK, INFO )
 *
 *           Multiply by inv(U).
 *
-            CALL ZLATRS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL ZLATRS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   A, LDA, WORK, SU, RWORK( N+1 ), INFO )
          ELSE
 *
@@ -236,7 +254,8 @@ SUBROUTINE ZGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
 *
 *           Multiply by inv(L**H).
 *
-            CALL ZLATRS( 'Lower', 'Conjugate transpose', 'Unit', NORMIN,
+            CALL ZLATRS( 'Lower', 'Conjugate transpose', 'Unit',
+     $                   NORMIN,
      $                   N, A, LDA, WORK, SL, RWORK, INFO )
          END IF
 *
@@ -255,8 +274,17 @@ SUBROUTINE ZGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
 *
 *     Compute the estimate of the reciprocal condition number.
 *
-      IF( AINVNM.NE.ZERO )
-     $   RCOND = ( ONE / AINVNM ) / ANORM
+      IF( AINVNM.NE.ZERO ) THEN
+         RCOND = ( ONE / AINVNM ) / ANORM
+      ELSE
+         INFO = 1
+         RETURN
+      END IF
+*
+*     Check for NaNs and Infs
+*
+      IF( DISNAN( RCOND ) .OR. RCOND.GT.HUGEVAL )
+     $   INFO = 1
 *
    20 CONTINUE
       RETURN
diff --git a/SRC/zgedmd.f90 b/SRC/zgedmd.f90
new file mode 100644
index 0000000000..7e40a3f1b6
--- /dev/null
+++ b/SRC/zgedmd.f90
@@ -0,0 +1,1150 @@
+!> \brief \b ZGEDMD computes the Dynamic Mode Decomposition (DMD) for a pair of data snapshot matrices.
+!
+!  =========== DOCUMENTATION ===========
+!
+!  Definition:
+!  ===========
+!
+!      SUBROUTINE ZGEDMD( JOBS, JOBZ, JOBR, JOBF,  WHTSVD,   &
+!                         M, N, X, LDX, Y, LDY, NRNK, TOL,   &
+!                         K, EIGS, Z, LDZ, RES, B,    LDB,   &
+!                         W, LDW,  S, LDS, ZWORK,  LZWORK,   &
+!                         RWORK, LRWORK, IWORK, LIWORK, INFO )
+!......
+!      USE, INTRINSIC :: iso_fortran_env, only: real64
+!      IMPLICIT NONE
+!      INTEGER, PARAMETER :: WP = real64
+!
+!......
+!      Scalar arguments
+!      CHARACTER, INTENT(IN)   :: JOBS,   JOBZ,  JOBR,  JOBF
+!      INTEGER,   INTENT(IN)   :: WHTSVD, M, N,   LDX,  LDY, &
+!                                 NRNK, LDZ, LDB, LDW,  LDS, &
+!                                 LIWORK, LRWORK, LZWORK
+!      INTEGER,       INTENT(OUT)  :: K, INFO
+!      REAL(KIND=WP), INTENT(IN)   ::    TOL
+!      Array arguments
+!      COMPLEX(KIND=WP), INTENT(INOUT) :: X(LDX,*), Y(LDY,*)
+!      COMPLEX(KIND=WP), INTENT(OUT)   :: Z(LDZ,*), B(LDB,*), &
+!                                         W(LDW,*), S(LDS,*)
+!      COMPLEX(KIND=WP), INTENT(OUT)   :: EIGS(*)
+!      COMPLEX(KIND=WP), INTENT(OUT)   :: ZWORK(*)
+!      REAL(KIND=WP),    INTENT(OUT)   :: RES(*)
+!      REAL(KIND=WP),    INTENT(OUT)   :: RWORK(*)
+!      INTEGER,          INTENT(OUT)   :: IWORK(*)
+!
+!............................................................
+!>    \par Purpose:
+!     =============
+!>    \verbatim
+!>    ZGEDMD computes the Dynamic Mode Decomposition (DMD) for
+!>    a pair of data snapshot matrices. For the input matrices
+!>    X and Y such that Y = A*X with an unaccessible matrix
+!>    A, ZGEDMD computes a certain number of Ritz pairs of A using
+!>    the standard Rayleigh-Ritz extraction from a subspace of
+!>    range(X) that is determined using the leading left singular
+!>    vectors of X. Optionally, ZGEDMD returns the residuals
+!>    of the computed Ritz pairs, the information needed for
+!>    a refinement of the Ritz vectors, or the eigenvectors of
+!>    the Exact DMD.
+!>    For further details see the references listed
+!>    below. For more details of the implementation see [3].
+!>    \endverbatim
+!............................................................
+!>    \par References:
+!     ================
+!>    \verbatim
+!>    [1] P. Schmid: Dynamic mode decomposition of numerical
+!>        and experimental data,
+!>        Journal of Fluid Mechanics 656, 5-28, 2010.
+!>    [2] Z. Drmac, I. Mezic, R. Mohr: Data driven modal
+!>        decompositions: analysis and enhancements,
+!>        SIAM J. on Sci. Comp. 40 (4), A2253-A2285, 2018.
+!>    [3] Z. Drmac: A LAPACK implementation of the Dynamic
+!>        Mode Decomposition I. Technical report. AIMDyn Inc.
+!>        and LAPACK Working Note 298.
+!>    [4] J. Tu, C. W. Rowley, D. M. Luchtenburg, S. L.
+!>        Brunton, N. Kutz: On Dynamic Mode Decomposition:
+!>        Theory and Applications, Journal of Computational
+!>        Dynamics 1(2), 391 -421, 2014.
+!>    \endverbatim
+!......................................................................
+!>    \par Developed and supported by:
+!     ================================
+!>    \verbatim
+!>    Developed and coded by Zlatko Drmac, Faculty of Science,
+!>    University of Zagreb;  drmac@math.hr
+!>    In cooperation with
+!>    AIMdyn Inc., Santa Barbara, CA.
+!>    and supported by
+!>    - DARPA SBIR project "Koopman Operator-Based Forecasting
+!>    for Nonstationary Processes from Near-Term, Limited
+!>    Observational Data" Contract No: W31P4Q-21-C-0007
+!>    - DARPA PAI project "Physics-Informed Machine Learning
+!>    Methodologies" Contract No: HR0011-18-9-0033
+!>    - DARPA MoDyL project "A Data-Driven, Operator-Theoretic
+!>    Framework for Space-Time Analysis of Process Dynamics"
+!>    Contract No: HR0011-16-C-0116
+!>    Any opinions, findings and conclusions or recommendations
+!>    expressed in this material are those of the author and
+!>    do not necessarily reflect the views of the DARPA SBIR
+!>    Program Office
+!>    \endverbatim
+!......................................................................
+!>    \par Distribution Statement A:
+!     ==============================
+!>    \verbatim
+!>    Approved for Public Release, Distribution Unlimited.
+!>    Cleared by DARPA on September 29, 2022
+!>    \endverbatim
+!............................................................
+!     Arguments
+!     =========
+!
+!>    \param[in] JOBS
+!>    \verbatim
+!>    JOBS (input) CHARACTER*1
+!>    Determines whether the initial data snapshots are scaled
+!>    by a diagonal matrix.
+!>    'S' :: The data snapshots matrices X and Y are multiplied
+!>           with a diagonal matrix D so that X*D has unit
+!>           nonzero columns (in the Euclidean 2-norm)
+!>    'C' :: The snapshots are scaled as with the 'S' option.
+!>           If it is found that an i-th column of X is zero
+!>           vector and the corresponding i-th column of Y is
+!>           non-zero, then the i-th column of Y is set to
+!>           zero and a warning flag is raised.
+!>    'Y' :: The data snapshots matrices X and Y are multiplied
+!>           by a diagonal matrix D so that Y*D has unit
+!>           nonzero columns (in the Euclidean 2-norm)
+!>    'N' :: No data scaling.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBZ
+!>    \verbatim
+!>    JOBZ (input) CHARACTER*1
+!>    Determines whether the eigenvectors (Koopman modes) will
+!>    be computed.
+!>    'V' :: The eigenvectors (Koopman modes) will be computed
+!>           and returned in the matrix Z.
+!>           See the description of Z.
+!>    'F' :: The eigenvectors (Koopman modes) will be returned
+!>           in factored form as the product X(:,1:K)*W, where X
+!>           contains a POD basis (leading left singular vectors
+!>           of the data matrix X) and W contains the eigenvectors
+!>           of the corresponding Rayleigh quotient.
+!>           See the descriptions of K, X, W, Z.
+!>    'N' :: The eigenvectors are not computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBR
+!>    \verbatim
+!>    JOBR (input) CHARACTER*1
+!>    Determines whether to compute the residuals.
+!>    'R' :: The residuals for the computed eigenpairs will be
+!>           computed and stored in the array RES.
+!>           See the description of RES.
+!>           For this option to be legal, JOBZ must be 'V'.
+!>    'N' :: The residuals are not computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBF
+!>    \verbatim
+!>    JOBF (input) CHARACTER*1
+!>    Specifies whether to store information needed for post-
+!>    processing (e.g. computing refined Ritz vectors)
+!>    'R' :: The matrix needed for the refinement of the Ritz
+!>           vectors is computed and stored in the array B.
+!>           See the description of B.
+!>    'E' :: The unscaled eigenvectors of the Exact DMD are
+!>           computed and returned in the array B. See the
+!>           description of B.
+!>    'N' :: No eigenvector refinement data is computed.
+!>    \endverbatim
+!.....
+!>    \param[in] WHTSVD
+!>    \verbatim
+!>    WHTSVD (input) INTEGER, WHSTVD in { 1, 2, 3, 4 }
+!>    Allows for a selection of the SVD algorithm from the
+!>    LAPACK library.
+!>    1 :: ZGESVD (the QR SVD algorithm)
+!>    2 :: ZGESDD (the Divide and Conquer algorithm; if enough
+!>         workspace available, this is the fastest option)
+!>    3 :: ZGESVDQ (the preconditioned QR SVD  ; this and 4
+!>         are the most accurate options)
+!>    4 :: ZGEJSV (the preconditioned Jacobi SVD; this and 3
+!>         are the most accurate options)
+!>    For the four methods above, a significant difference in
+!>    the accuracy of small singular values is possible if
+!>    the snapshots vary in norm so that X is severely
+!>    ill-conditioned. If small (smaller than EPS*||X||)
+!>    singular values are of interest and JOBS=='N',  then
+!>    the options (3, 4) give the most accurate results, where
+!>    the option 4 is slightly better and with stronger
+!>    theoretical background.
+!>    If JOBS=='S', i.e. the columns of X will be normalized,
+!>    then all methods give nearly equally accurate results.
+!>    \endverbatim
+!.....
+!>    \param[in] M
+!>    \verbatim
+!>    M (input) INTEGER, M>= 0
+!>    The state space dimension (the row dimension of X, Y).
+!>    \endverbatim
+!.....
+!>    \param[in] N
+!>    \verbatim
+!>    N (input) INTEGER, 0 <= N <= M
+!>    The number of data snapshot pairs
+!>    (the number of columns of X and Y).
+!>    \endverbatim
+!.....
+!>    \param[in,out] X
+!>    \verbatim
+!>    X (input/output) COMPLEX(KIND=WP) M-by-N array
+!>    > On entry, X contains the data snapshot matrix X. It is
+!>    assumed that the column norms of X are in the range of
+!>    the normalized floating point numbers.
+!>    < On exit, the leading K columns of X contain a POD basis,
+!>    i.e. the leading K left singular vectors of the input
+!>    data matrix X, U(:,1:K). All N columns of X contain all
+!>    left singular vectors of the input matrix X.
+!>    See the descriptions of K, Z and W.
+!>    \endverbatim
+!.....
+!>    \param[in] LDX
+!>    \verbatim
+!>    LDX (input) INTEGER, LDX >= M
+!>    The leading dimension of the array X.
+!>    \endverbatim
+!.....
+!>    \param[in,out] Y
+!>    \verbatim
+!>    Y (input/workspace/output) COMPLEX(KIND=WP) M-by-N array
+!>    > On entry, Y contains the data snapshot matrix Y
+!>    < On exit,
+!>    If JOBR == 'R', the leading K columns of Y  contain
+!>    the residual vectors for the computed Ritz pairs.
+!>    See the description of RES.
+!>    If JOBR == 'N', Y contains the original input data,
+!>                    scaled according to the value of JOBS.
+!>    \endverbatim
+!.....
+!>    \param[in] LDY
+!>    \verbatim
+!>    LDY (input) INTEGER , LDY >= M
+!>    The leading dimension of the array Y.
+!>    \endverbatim
+!.....
+!>    \param[in] NRNK
+!>    \verbatim
+!>    NRNK (input) INTEGER
+!>    Determines the mode how to compute the numerical rank,
+!>    i.e. how to truncate small singular values of the input
+!>    matrix X. On input, if
+!>    NRNK = -1 :: i-th singular value sigma(i) is truncated
+!>                 if sigma(i) <= TOL*sigma(1)
+!>                 This option is recommended.
+!>    NRNK = -2 :: i-th singular value sigma(i) is truncated
+!>                 if sigma(i) <= TOL*sigma(i-1)
+!>                 This option is included for R&D purposes.
+!>                 It requires highly accurate SVD, which
+!>                 may not be feasible.
+!>    The numerical rank can be enforced by using positive
+!>    value of NRNK as follows:
+!>    0 < NRNK <= N :: at most NRNK largest singular values
+!>    will be used. If the number of the computed nonzero
+!>    singular values is less than NRNK, then only those
+!>    nonzero values will be used and the actually used
+!>    dimension is less than NRNK. The actual number of
+!>    the nonzero singular values is returned in the variable
+!>    K. See the descriptions of TOL and  K.
+!>    \endverbatim
+!.....
+!>    \param[in] TOL
+!>    \verbatim
+!>    TOL (input) REAL(KIND=WP), 0 <= TOL < 1
+!>    The tolerance for truncating small singular values.
+!>    See the description of NRNK.
+!>    \endverbatim
+!.....
+!>    \param[out] K
+!>    \verbatim
+!>    K (output) INTEGER,  0 <= K <= N
+!>    The dimension of the POD basis for the data snapshot
+!>    matrix X and the number of the computed Ritz pairs.
+!>    The value of K is determined according to the rule set
+!>    by the parameters NRNK and TOL.
+!>    See the descriptions of NRNK and TOL.
+!>    \endverbatim
+!.....
+!>    \param[out] EIGS
+!>    \verbatim
+!>    EIGS (output) COMPLEX(KIND=WP) N-by-1 array
+!>    The leading K (K<=N) entries of EIGS contain
+!>    the computed eigenvalues (Ritz values).
+!>    See the descriptions of K, and Z.
+!>    \endverbatim
+!.....
+!>    \param[out] Z
+!>    \verbatim
+!>    Z (workspace/output) COMPLEX(KIND=WP)  M-by-N array
+!>    If JOBZ =='V' then Z contains the  Ritz vectors.  Z(:,i)
+!>    is an eigenvector of the i-th Ritz value; ||Z(:,i)||_2=1.
+!>    If JOBZ == 'F', then the Z(:,i)'s are given implicitly as
+!>    the columns of X(:,1:K)*W(1:K,1:K), i.e. X(:,1:K)*W(:,i)
+!>    is an eigenvector corresponding to EIGS(i). The columns
+!>    of W(1:k,1:K) are the computed eigenvectors of the
+!>    K-by-K Rayleigh quotient.
+!>    See the descriptions of EIGS, X and W.
+!>    \endverbatim
+!.....
+!>    \param[in] LDZ
+!>    \verbatim
+!>    LDZ (input) INTEGER , LDZ >= M
+!>    The leading dimension of the array Z.
+!>    \endverbatim
+!.....
+!>    \param[out] RES
+!>    \verbatim
+!>    RES (output) REAL(KIND=WP) N-by-1 array
+!>    RES(1:K) contains the residuals for the K computed
+!>    Ritz pairs,
+!>    RES(i) = || A * Z(:,i) - EIGS(i)*Z(:,i))||_2.
+!>    See the description of EIGS and Z.
+!>    \endverbatim
+!.....
+!>    \param[out] B
+!>    \verbatim
+!>    B (output) COMPLEX(KIND=WP)  M-by-N array.
+!>    IF JOBF =='R', B(1:M,1:K) contains A*U(:,1:K), and can
+!>    be used for computing the refined vectors; see further
+!>    details in the provided references.
+!>    If JOBF == 'E', B(1:M,1:K) contains
+!>    A*U(:,1:K)*W(1:K,1:K), which are the vectors from the
+!>    Exact DMD, up to scaling by the inverse eigenvalues.
+!>    If JOBF =='N', then B is not referenced.
+!>    See the descriptions of X, W, K.
+!>    \endverbatim
+!.....
+!>    \param[in] LDB
+!>    \verbatim
+!>    LDB (input) INTEGER, LDB >= M
+!>    The leading dimension of the array B.
+!>    \endverbatim
+!.....
+!>    \param[out] W
+!>    \verbatim
+!>    W (workspace/output) COMPLEX(KIND=WP) N-by-N array
+!>    On exit, W(1:K,1:K) contains the K computed
+!>    eigenvectors of the matrix Rayleigh quotient.
+!>    The Ritz vectors (returned in Z) are the
+!>    product of X (containing a POD basis for the input
+!>    matrix X) and W. See the descriptions of K, S, X and Z.
+!>    W is also used as a workspace to temporarily store the
+!>    right singular vectors of X.
+!>    \endverbatim
+!.....
+!>    \param[in] LDW
+!>    \verbatim
+!>    LDW (input) INTEGER, LDW >= N
+!>    The leading dimension of the array W.
+!>    \endverbatim
+!.....
+!>    \param[out] S
+!>    \verbatim
+!>    S (workspace/output) COMPLEX(KIND=WP) N-by-N array
+!>    The array S(1:K,1:K) is used for the matrix Rayleigh
+!>    quotient. This content is overwritten during
+!>    the eigenvalue decomposition by ZGEEV.
+!>    See the description of K.
+!>    \endverbatim
+!.....
+!>    \param[in] LDS
+!>    \verbatim
+!>    LDS (input) INTEGER, LDS >= N
+!>    The leading dimension of the array S.
+!>    \endverbatim
+!.....
+!>    \param[out] ZWORK
+!>    \verbatim
+!>    ZWORK (workspace/output) COMPLEX(KIND=WP) LZWORK-by-1 array
+!>    ZWORK is used as complex workspace in the complex SVD, as
+!>    specified by WHTSVD (1,2, 3 or 4) and for ZGEEV for computing
+!>    the eigenvalues of a Rayleigh quotient.
+!>    If the call to ZGEDMD is only workspace query, then
+!>    ZWORK(1) contains the minimal complex workspace length and
+!>    ZWORK(2) is the optimal complex workspace length.
+!>    Hence, the length of work is at least 2.
+!>    See the description of LZWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LZWORK
+!>    \verbatim
+!>    LZWORK (input) INTEGER
+!>    The minimal length of the workspace vector ZWORK.
+!>    LZWORK is calculated as MAX(LZWORK_SVD, LZWORK_ZGEEV),
+!>    where LZWORK_ZGEEV = MAX( 1, 2*N )  and the minimal
+!>    LZWORK_SVD is calculated as follows
+!>    If WHTSVD == 1 :: ZGESVD ::
+!>       LZWORK_SVD = MAX(1,2*MIN(M,N)+MAX(M,N))
+!>    If WHTSVD == 2 :: ZGESDD ::
+!>       LZWORK_SVD = 2*MIN(M,N)*MIN(M,N)+2*MIN(M,N)+MAX(M,N)
+!>    If WHTSVD == 3 :: ZGESVDQ ::
+!>       LZWORK_SVD = obtainable by a query
+!>    If WHTSVD == 4 :: ZGEJSV ::
+!>       LZWORK_SVD = obtainable by a query
+!>    If on entry LZWORK = -1, then a workspace query is
+!>    assumed and the procedure only computes the minimal
+!>    and the optimal workspace lengths and returns them in
+!>    LZWORK(1) and LZWORK(2), respectively.
+!>    \endverbatim
+!.....
+!>    \param[out] RWORK
+!>    \verbatim
+!>    RWORK (workspace/output) REAL(KIND=WP) LRWORK-by-1 array
+!>    On exit, RWORK(1:N) contains the singular values of
+!>    X (for JOBS=='N') or column scaled X (JOBS=='S', 'C').
+!>    If WHTSVD==4, then RWORK(N+1) and RWORK(N+2) contain
+!>    scaling factor RWORK(N+2)/RWORK(N+1) used to scale X
+!>    and Y to avoid overflow in the SVD of X.
+!>    This may be of interest if the scaling option is off
+!>    and as many as possible smallest eigenvalues are
+!>    desired to the highest feasible accuracy.
+!>    If the call to ZGEDMD is only workspace query, then
+!>    RWORK(1) contains the minimal workspace length.
+!>    See the description of LRWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LRWORK
+!>    \verbatim
+!>    LRWORK (input) INTEGER
+!>    The minimal length of the workspace vector RWORK.
+!>    LRWORK is calculated as follows:
+!>    LRWORK = MAX(1, N+LRWORK_SVD,N+LRWORK_ZGEEV), where
+!>    LRWORK_ZGEEV = MAX(1,2*N) and RWORK_SVD is the real workspace
+!>    for the SVD subroutine determined by the input parameter
+!>    WHTSVD.
+!>    If WHTSVD == 1 :: ZGESVD ::
+!>       LRWORK_SVD = 5*MIN(M,N)
+!>    If WHTSVD == 2 :: ZGESDD ::
+!>       LRWORK_SVD =  MAX(5*MIN(M,N)*MIN(M,N)+7*MIN(M,N),
+!>       2*MAX(M,N)*MIN(M,N)+2*MIN(M,N)*MIN(M,N)+MIN(M,N) ) )
+!>    If WHTSVD == 3 :: ZGESVDQ ::
+!>       LRWORK_SVD = obtainable by a query
+!>    If WHTSVD == 4 :: ZGEJSV ::
+!>       LRWORK_SVD = obtainable by a query
+!>    If on entry LRWORK = -1, then a workspace query is
+!>    assumed and the procedure only computes the minimal
+!>    real workspace length and returns it in RWORK(1).
+!>    \endverbatim
+!.....
+!>    \param[out] IWORK
+!>    \verbatim
+!>    IWORK (workspace/output) INTEGER LIWORK-by-1 array
+!>    Workspace that is required only if WHTSVD equals
+!>    2 , 3 or 4. (See the description of WHTSVD).
+!>    If on entry LWORK =-1 or LIWORK=-1, then the
+!>    minimal length of IWORK is computed and returned in
+!>    IWORK(1). See the description of LIWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LIWORK
+!>    \verbatim
+!>    LIWORK (input) INTEGER
+!>    The minimal length of the workspace vector IWORK.
+!>    If WHTSVD == 1, then only IWORK(1) is used; LIWORK >=1
+!>    If WHTSVD == 2, then LIWORK >= MAX(1,8*MIN(M,N))
+!>    If WHTSVD == 3, then LIWORK >= MAX(1,M+N-1)
+!>    If WHTSVD == 4, then LIWORK >= MAX(3,M+3*N)
+!>    If on entry LIWORK = -1, then a workspace query is
+!>    assumed and the procedure only computes the minimal
+!>    and the optimal workspace lengths for  ZWORK, RWORK and
+!>    IWORK. See the descriptions of ZWORK, RWORK and IWORK.
+!>    \endverbatim
+!.....
+!>    \param[out] INFO
+!>    \verbatim
+!>    INFO (output) INTEGER
+!>    -i < 0 :: On entry, the i-th argument had an
+!>              illegal value
+!>       = 0 :: Successful return.
+!>       = 1 :: Void input. Quick exit (M=0 or N=0).
+!>       = 2 :: The SVD computation of X did not converge.
+!>              Suggestion: Check the input data and/or
+!>              repeat with different WHTSVD.
+!>       = 3 :: The computation of the eigenvalues did not
+!>              converge.
+!>       = 4 :: If data scaling was requested on input and
+!>              the procedure found inconsistency in the data
+!>              such that for some column index i,
+!>              X(:,i) = 0 but Y(:,i) /= 0, then Y(:,i) is set
+!>              to zero if JOBS=='C'. The computation proceeds
+!>              with original or modified data and warning
+!>              flag is set with INFO=4.
+!>    \endverbatim
+!
+!  Authors:
+!  ========
+!
+!> \author Zlatko Drmac
+!
+!> \ingroup gedmd
+!
+!.............................................................
+!.............................................................
+      SUBROUTINE ZGEDMD( JOBS, JOBZ, JOBR, JOBF,  WHTSVD,   &
+                         M, N, X, LDX, Y, LDY, NRNK, TOL,   &
+                         K, EIGS, Z, LDZ, RES, B,    LDB,   &
+                         W, LDW,  S, LDS, ZWORK,  LZWORK,   &
+                         RWORK, LRWORK, IWORK, LIWORK, INFO )
+!
+!  -- LAPACK driver routine                                           --
+!
+!  -- LAPACK is a software package provided by University of          --
+!  -- Tennessee, University of California Berkeley, University of     --
+!  -- Colorado Denver and NAG Ltd..                                   --
+!
+!.....
+      USE, INTRINSIC :: iso_fortran_env, only: real64
+      IMPLICIT NONE
+      INTEGER, PARAMETER :: WP = real64
+!
+!     Scalar arguments
+!     ~~~~~~~~~~~~~~~~
+      CHARACTER, INTENT(IN)   :: JOBS,   JOBZ,  JOBR,  JOBF
+      INTEGER,   INTENT(IN)   :: WHTSVD, M, N,   LDX,  LDY, &
+                                 NRNK, LDZ, LDB, LDW,  LDS, &
+                                 LIWORK, LRWORK, LZWORK
+      INTEGER,       INTENT(OUT)  :: K, INFO
+      REAL(KIND=WP), INTENT(IN)   ::    TOL
+!
+!     Array arguments
+!     ~~~~~~~~~~~~~~~
+      COMPLEX(KIND=WP), INTENT(INOUT) :: X(LDX,*), Y(LDY,*)
+      COMPLEX(KIND=WP), INTENT(OUT)   :: Z(LDZ,*), B(LDB,*), &
+                                         W(LDW,*), S(LDS,*)
+      COMPLEX(KIND=WP), INTENT(OUT)   :: EIGS(*)
+      COMPLEX(KIND=WP), INTENT(OUT)   :: ZWORK(*)
+      REAL(KIND=WP),    INTENT(OUT)   :: RES(*)
+      REAL(KIND=WP),    INTENT(OUT)   :: RWORK(*)
+      INTEGER,          INTENT(OUT)   :: IWORK(*)
+!
+!     Parameters
+!     ~~~~~~~~~~
+      REAL(KIND=WP),    PARAMETER ::  ONE = 1.0_WP
+      REAL(KIND=WP),    PARAMETER :: ZERO = 0.0_WP
+      COMPLEX(KIND=WP), PARAMETER ::  ZONE = ( 1.0_WP, 0.0_WP )
+      COMPLEX(KIND=WP), PARAMETER :: ZZERO = ( 0.0_WP, 0.0_WP )
+!
+!     Local scalars
+!     ~~~~~~~~~~~~~
+      REAL(KIND=WP) :: OFL,   ROOTSC, SCALE,  SMALL,    &
+                       SSUM,  XSCL1,  XSCL2
+      INTEGER       ::  i,  j,  IMINWR,  INFO1, INFO2,  &
+                        LWRKEV, LWRSDD, LWRSVD, LWRSVJ, &
+                        LWRSVQ, MLWORK, MWRKEV, MWRSDD, &
+                        MWRSVD, MWRSVJ, MWRSVQ, NUMRNK, &
+                        OLWORK, MLRWRK
+      LOGICAL       ::  BADXY, LQUERY, SCCOLX, SCCOLY,  &
+                        WNTEX, WNTREF, WNTRES, WNTVEC
+      CHARACTER     ::  JOBZL, T_OR_N
+      CHARACTER     ::  JSVOPT
+!
+!     Local arrays
+!     ~~~~~~~~~~~~
+      REAL(KIND=WP) :: RDUMMY(2)
+!
+!     External functions (BLAS and LAPACK)
+!     ~~~~~~~~~~~~~~~~~
+      REAL(KIND=WP) ZLANGE, DLAMCH, DZNRM2
+      EXTERNAL      ZLANGE, DLAMCH, DZNRM2, IZAMAX
+      INTEGER                               IZAMAX
+      LOGICAL       DISNAN, LSAME
+      EXTERNAL      DISNAN, LSAME
+!
+!     External subroutines (BLAS and LAPACK)
+!     ~~~~~~~~~~~~~~~~~~~~
+      EXTERNAL      ZAXPY,  ZGEMM,  ZDSCAL
+      EXTERNAL      ZGEEV,  ZGEJSV, ZGESDD, ZGESVD, ZGESVDQ, &
+                    ZLACPY, ZLASCL, ZLASSQ, XERBLA
+!
+!     Intrinsic functions
+!     ~~~~~~~~~~~~~~~~~~~
+      INTRINSIC     DBLE, INT, MAX, SQRT
+!............................................................
+!
+!    Test the input arguments
+!
+      WNTRES = LSAME(JOBR,'R')
+      SCCOLX = LSAME(JOBS,'S') .OR. LSAME(JOBS,'C')
+      SCCOLY = LSAME(JOBS,'Y')
+      WNTVEC = LSAME(JOBZ,'V')
+      WNTREF = LSAME(JOBF,'R')
+      WNTEX  = LSAME(JOBF,'E')
+      INFO   = 0
+      LQUERY = ( ( LZWORK == -1 ) .OR. ( LIWORK == -1 ) &
+                                  .OR. ( LRWORK == -1 ) )
+!
+      IF ( .NOT. (SCCOLX .OR. SCCOLY .OR. &
+                                  LSAME(JOBS,'N')) )   THEN
+          INFO = -1
+      ELSE IF ( .NOT. (WNTVEC .OR. LSAME(JOBZ,'N')        &
+                              .OR. LSAME(JOBZ,'F')) )  THEN
+          INFO = -2
+      ELSE IF ( .NOT. (WNTRES .OR. LSAME(JOBR,'N')) .OR.  &
+                ( WNTRES .AND. (.NOT.WNTVEC) ) )       THEN
+          INFO = -3
+      ELSE IF ( .NOT. (WNTREF .OR. WNTEX .OR.             &
+                LSAME(JOBF,'N') ) )                    THEN
+          INFO = -4
+      ELSE IF ( .NOT.((WHTSVD == 1) .OR. (WHTSVD == 2) .OR.  &
+                      (WHTSVD == 3) .OR. (WHTSVD == 4) )) THEN
+          INFO = -5
+      ELSE IF ( M < 0 )   THEN
+          INFO = -6
+      ELSE IF ( ( N < 0 ) .OR. ( N > M ) ) THEN
+          INFO = -7
+      ELSE IF ( LDX < M ) THEN
+          INFO = -9
+      ELSE IF ( LDY < M ) THEN
+          INFO = -11
+      ELSE IF ( .NOT. (( NRNK == -2).OR.(NRNK == -1).OR. &
+                ((NRNK >= 1).AND.(NRNK <=N ))) )      THEN
+          INFO = -12
+      ELSE IF ( ( TOL < ZERO ) .OR. ( TOL >= ONE ) )  THEN
+          INFO = -13
+      ELSE IF ( LDZ < M ) THEN
+          INFO = -17
+      ELSE IF ( (WNTREF .OR. WNTEX ) .AND. ( LDB < M ) ) THEN
+          INFO = -20
+      ELSE IF ( LDW < N ) THEN
+          INFO = -22
+      ELSE IF ( LDS < N ) THEN
+          INFO = -24
+      END IF
+!
+      IF ( INFO == 0 ) THEN
+          ! Compute the minimal and the optimal workspace
+          ! requirements. Simulate running the code and
+          ! determine minimal and optimal sizes of the
+          ! workspace at any moment of the run.
+         IF ( N == 0 ) THEN
+             ! Quick return. All output except K is void.
+             ! INFO=1 signals the void input.
+             ! In case of a workspace query, the default
+             ! minimal workspace lengths are returned.
+            IF ( LQUERY ) THEN
+                IWORK(1) = 1
+                RWORK(1) = 1
+                ZWORK(1) = 2
+                ZWORK(2) = 2
+            ELSE
+               K   =  0
+            END IF
+            INFO = 1
+            RETURN
+         END IF
+
+         IMINWR = 1
+         MLRWRK = MAX(1,N)
+         MLWORK = 2
+         OLWORK = 2
+         SELECT CASE ( WHTSVD )
+         CASE (1)
+             ! The following is specified as the minimal
+             ! length of WORK in the definition of ZGESVD:
+             ! MWRSVD = MAX(1,2*MIN(M,N)+MAX(M,N))
+             MWRSVD = MAX(1,2*MIN(M,N)+MAX(M,N))
+             MLWORK = MAX(MLWORK,MWRSVD)
+             MLRWRK = MAX(MLRWRK,N + 5*MIN(M,N))
+             IF ( LQUERY ) THEN
+                CALL ZGESVD( 'O', 'S', M, N, X, LDX, RWORK, &
+                     B, LDB, W, LDW, ZWORK, -1, RDUMMY, INFO1 )
+                LWRSVD = INT( ZWORK(1) )
+                OLWORK = MAX(OLWORK,LWRSVD)
+             END IF
+         CASE (2)
+             ! The following is specified as the minimal
+             ! length of WORK in the definition of ZGESDD:
+             ! MWRSDD = 2*min(M,N)*min(M,N)+2*min(M,N)+max(M,N).
+             ! RWORK length: 5*MIN(M,N)*MIN(M,N)+7*MIN(M,N)
+             ! In LAPACK 3.10.1 RWORK is defined differently.
+             ! Below we take max over the two versions.
+             ! IMINWR = 8*MIN(M,N)
+             MWRSDD = 2*MIN(M,N)*MIN(M,N)+2*MIN(M,N)+MAX(M,N)
+             MLWORK = MAX(MLWORK,MWRSDD)
+             IMINWR = 8*MIN(M,N)
+             MLRWRK = MAX( MLRWRK,  N +                    &
+                      MAX( 5*MIN(M,N)*MIN(M,N)+7*MIN(M,N), &
+                           5*MIN(M,N)*MIN(M,N)+5*MIN(M,N), &
+                           2*MAX(M,N)*MIN(M,N)+            &
+                           2*MIN(M,N)*MIN(M,N)+MIN(M,N) ) )
+             IF ( LQUERY ) THEN
+                CALL ZGESDD( 'O', M, N, X, LDX, RWORK, B,LDB,&
+                     W, LDW, ZWORK, -1, RDUMMY, IWORK, INFO1 )
+                LWRSDD = MAX( MWRSDD,INT( ZWORK(1) ))
+                ! Possible bug in ZGESDD optimal workspace size.
+                OLWORK = MAX(OLWORK,LWRSDD)
+             END IF
+         CASE (3)
+             CALL ZGESVDQ( 'H', 'P', 'N', 'R', 'R', M, N, &
+                  X, LDX, RWORK, Z, LDZ, W, LDW, NUMRNK,  &
+                  IWORK, -1, ZWORK, -1, RDUMMY, -1, INFO1 )
+             IMINWR = IWORK(1)
+             MWRSVQ = INT(ZWORK(2))
+             MLWORK = MAX(MLWORK,MWRSVQ)
+             MLRWRK  = MAX(MLRWRK,N + INT(RDUMMY(1)))
+             IF ( LQUERY ) THEN
+                LWRSVQ = INT(ZWORK(1))
+                OLWORK = MAX(OLWORK,LWRSVQ)
+             END IF
+         CASE (4)
+             JSVOPT = 'J'
+             CALL ZGEJSV( 'F', 'U', JSVOPT, 'R', 'N', 'P', M, &
+                   N, X, LDX, RWORK, Z, LDZ, W, LDW,       &
+                   ZWORK, -1, RDUMMY, -1, IWORK, INFO1 )
+             IMINWR = IWORK(1)
+             MWRSVJ = INT(ZWORK(2))
+             MLWORK = MAX(MLWORK,MWRSVJ)
+             MLRWRK = MAX(MLRWRK,N + MAX(7,INT(RDUMMY(1))))
+             IF ( LQUERY ) THEN
+                LWRSVJ = INT(ZWORK(1))
+                OLWORK = MAX(OLWORK,LWRSVJ)
+             END IF
+         END SELECT
+         IF ( WNTVEC .OR. WNTEX .OR. LSAME(JOBZ,'F') ) THEN
+             JOBZL = 'V'
+         ELSE
+             JOBZL = 'N'
+         END IF
+         ! Workspace calculation to the ZGEEV call
+         MWRKEV = MAX( 1, 2*N )
+         MLWORK = MAX(MLWORK,MWRKEV)
+         MLRWRK = MAX(MLRWRK,N+2*N)
+         IF ( LQUERY ) THEN
+             CALL ZGEEV( 'N', JOBZL, N, S, LDS, EIGS, &
+              W, LDW, W, LDW, ZWORK, -1, RWORK, INFO1 )
+                LWRKEV = INT(ZWORK(1))
+                OLWORK = MAX( OLWORK, LWRKEV )
+         END IF
+!
+         IF ( LIWORK < IMINWR .AND. (.NOT.LQUERY) ) INFO = -30
+         IF ( LRWORK < MLRWRK .AND. (.NOT.LQUERY) ) INFO = -28
+         IF ( LZWORK < MLWORK .AND. (.NOT.LQUERY) ) INFO = -26
+
+      END IF
+!
+      IF( INFO /= 0 ) THEN
+         CALL XERBLA( 'ZGEDMD', -INFO )
+         RETURN
+      ELSE IF ( LQUERY ) THEN
+!     Return minimal and optimal workspace sizes
+          IWORK(1) = IMINWR
+          RWORK(1) = MLRWRK
+          ZWORK(1) = MLWORK
+          ZWORK(2) = OLWORK
+          RETURN
+      END IF
+!............................................................
+!
+      OFL   = DLAMCH('O')
+      SMALL = DLAMCH('S')
+      BADXY = .FALSE.
+!
+!     <1> Optional scaling of the snapshots (columns of X, Y)
+!     ==========================================================
+      IF ( SCCOLX ) THEN
+          ! The columns of X will be normalized.
+          ! To prevent overflows, the column norms of X are
+          ! carefully computed using ZLASSQ.
+          K = 0
+          DO i = 1, N
+            !WORK(i) = DZNRM2( M, X(1,i), 1 )
+            SSUM  = ONE
+            SCALE = ZERO
+            CALL ZLASSQ( M, X(1,i), 1, SCALE, SSUM )
+            IF ( DISNAN(SCALE) .OR. DISNAN(SSUM) ) THEN
+                K    =  0
+                INFO = -8
+                CALL XERBLA('ZGEDMD',-INFO)
+            END IF
+            IF ( (SCALE /= ZERO) .AND. (SSUM /= ZERO) ) THEN
+               ROOTSC = SQRT(SSUM)
+               IF ( SCALE .GE. (OFL / ROOTSC) ) THEN
+!                 Norm of X(:,i) overflows. First, X(:,i)
+!                 is scaled by
+!                 ( ONE / ROOTSC ) / SCALE = 1/||X(:,i)||_2.
+!                 Next, the norm of X(:,i) is stored without
+!                 overflow as RWORK(i) = - SCALE * (ROOTSC/M),
+!                 the minus sign indicating the 1/M factor.
+!                 Scaling is performed without overflow, and
+!                 underflow may occur in the smallest entries
+!                 of X(:,i). The relative backward and forward
+!                 errors are small in the ell_2 norm.
+                  CALL ZLASCL( 'G', 0, 0, SCALE, ONE/ROOTSC, &
+                               M, 1, X(1,i), LDX, INFO2 )
+                  RWORK(i) = - SCALE * ( ROOTSC / DBLE(M) )
+               ELSE
+!                 X(:,i) will be scaled to unit 2-norm
+                  RWORK(i) =   SCALE * ROOTSC
+                  CALL ZLASCL( 'G',0, 0, RWORK(i), ONE, M, 1, &
+                               X(1,i), LDX, INFO2 )      ! LAPACK CALL
+!                 X(1:M,i) = (ONE/RWORK(i)) * X(1:M,i)   ! INTRINSIC
+               END IF
+            ELSE
+               RWORK(i) = ZERO
+               K = K + 1
+            END IF
+          END DO
+          IF ( K == N ) THEN
+             ! All columns of X are zero. Return error code -8.
+             ! (the 8th input variable had an illegal value)
+             K = 0
+             INFO = -8
+             CALL XERBLA('ZGEDMD',-INFO)
+             RETURN
+          END IF
+          DO i = 1, N
+!           Now, apply the same scaling to the columns of Y.
+            IF ( RWORK(i) >  ZERO ) THEN
+                CALL ZDSCAL( M, ONE/RWORK(i), Y(1,i), 1 )  ! BLAS CALL
+!               Y(1:M,i) = (ONE/RWORK(i)) * Y(1:M,i)       ! INTRINSIC
+            ELSE IF ( RWORK(i) < ZERO ) THEN
+                CALL ZLASCL( 'G', 0, 0, -RWORK(i),          &
+                     ONE/DBLE(M), M, 1, Y(1,i), LDY, INFO2 ) ! LAPACK CALL
+            ELSE IF ( ABS(Y(IZAMAX(M, Y(1,i),1),i ))  &
+                                            /= ZERO ) THEN
+!               X(:,i) is zero vector. For consistency,
+!               Y(:,i) should also be zero. If Y(:,i) is not
+!               zero, then the data might be inconsistent or
+!               corrupted. If JOBS == 'C', Y(:,i) is set to
+!               zero and a warning flag is raised.
+!               The computation continues but the
+!               situation will be reported in the output.
+                BADXY = .TRUE.
+                IF ( LSAME(JOBS,'C')) &
+                CALL ZDSCAL( M, ZERO, Y(1,i), 1 )  ! BLAS CALL
+            END IF
+          END DO
+      END IF
+  !
+      IF ( SCCOLY ) THEN
+          ! The columns of Y will be normalized.
+          ! To prevent overflows, the column norms of Y are
+          ! carefully computed using ZLASSQ.
+          DO i = 1, N
+            !RWORK(i) = DZNRM2( M, Y(1,i), 1 )
+            SSUM  = ONE
+            SCALE = ZERO
+            CALL ZLASSQ( M, Y(1,i), 1, SCALE, SSUM )
+            IF ( DISNAN(SCALE) .OR. DISNAN(SSUM) ) THEN
+                K    =  0
+                INFO = -10
+                CALL XERBLA('ZGEDMD',-INFO)
+            END IF
+            IF ( SCALE /= ZERO  .AND. (SSUM /= ZERO) ) THEN
+               ROOTSC = SQRT(SSUM)
+               IF ( SCALE .GE. (OFL / ROOTSC) ) THEN
+!                 Norm of Y(:,i) overflows. First, Y(:,i)
+!                 is scaled by
+!                 ( ONE / ROOTSC ) / SCALE = 1/||Y(:,i)||_2.
+!                 Next, the norm of Y(:,i) is stored without
+!                 overflow as RWORK(i) = - SCALE * (ROOTSC/M),
+!                 the minus sign indicating the 1/M factor.
+!                 Scaling is performed without overflow, and
+!                 underflow may occur in the smallest entries
+!                 of Y(:,i). The relative backward and forward
+!                 errors are small in the ell_2 norm.
+                  CALL ZLASCL( 'G', 0, 0, SCALE, ONE/ROOTSC, &
+                               M, 1, Y(1,i), LDY, INFO2 )
+                  RWORK(i) = - SCALE * ( ROOTSC / DBLE(M) )
+               ELSE
+!                 Y(:,i) will be scaled to unit 2-norm
+                  RWORK(i) =   SCALE * ROOTSC
+                  CALL ZLASCL( 'G',0, 0, RWORK(i), ONE, M, 1, &
+                               Y(1,i), LDY, INFO2 )             ! LAPACK CALL
+!                 Y(1:M,i) = (ONE/RWORK(i)) * Y(1:M,i)          ! INTRINSIC
+               END IF
+            ELSE
+               RWORK(i) = ZERO
+            END IF
+         END DO
+         DO i = 1, N
+!           Now, apply the same scaling to the columns of X.
+            IF ( RWORK(i) >  ZERO ) THEN
+                CALL ZDSCAL( M, ONE/RWORK(i), X(1,i), 1 ) ! BLAS CALL
+!               X(1:M,i) = (ONE/RWORK(i)) * X(1:M,i)      ! INTRINSIC
+            ELSE IF ( RWORK(i) < ZERO ) THEN
+                CALL ZLASCL( 'G', 0, 0, -RWORK(i),          &
+                     ONE/DBLE(M), M, 1, X(1,i), LDX, INFO2 ) ! LAPACK CALL
+            ELSE IF ( ABS(X(IZAMAX(M, X(1,i),1),i ))  &
+                                           /= ZERO ) THEN
+!               Y(:,i) is zero vector.  If X(:,i) is not
+!               zero, then a warning flag is raised.
+!               The computation continues but the
+!               situation will be reported in the output.
+                BADXY = .TRUE.
+            END IF
+         END DO
+       END IF
+!
+!     <2> SVD of the data snapshot matrix X.
+!     =====================================
+!     The left singular vectors are stored in the array X.
+!     The right singular vectors are in the array W.
+!     The array W will later on contain the eigenvectors
+!     of a Rayleigh quotient.
+      NUMRNK = N
+      SELECT CASE ( WHTSVD )
+         CASE (1)
+             CALL ZGESVD( 'O', 'S', M, N, X, LDX, RWORK, B, &
+                  LDB, W, LDW, ZWORK, LZWORK,  RWORK(N+1), INFO1 ) ! LAPACK CALL
+             T_OR_N = 'C'
+         CASE (2)
+            CALL ZGESDD( 'O', M, N, X, LDX, RWORK, B, LDB, W, &
+                 LDW, ZWORK, LZWORK, RWORK(N+1), IWORK, INFO1 )   ! LAPACK CALL
+            T_OR_N = 'C'
+         CASE (3)
+              CALL ZGESVDQ( 'H', 'P', 'N', 'R', 'R', M, N, &
+                   X, LDX, RWORK, Z, LDZ, W, LDW, &
+                   NUMRNK, IWORK, LIWORK, ZWORK,     &
+                   LZWORK, RWORK(N+1), LRWORK-N, INFO1)     ! LAPACK CALL
+              CALL ZLACPY( 'A', M, NUMRNK, Z, LDZ, X, LDX )   ! LAPACK CALL
+         T_OR_N = 'C'
+         CASE (4)
+              CALL ZGEJSV( 'F', 'U', JSVOPT, 'R', 'N', 'P', M, &
+                   N, X, LDX, RWORK, Z, LDZ, W, LDW, &
+                   ZWORK, LZWORK, RWORK(N+1), LRWORK-N, IWORK, INFO1 )    ! LAPACK CALL
+              CALL ZLACPY( 'A', M, N, Z, LDZ, X, LDX )   ! LAPACK CALL
+              T_OR_N = 'N'
+              XSCL1 = RWORK(N+1)
+              XSCL2 = RWORK(N+2)
+              IF ( XSCL1 /=  XSCL2 ) THEN
+                 ! This is an exceptional situation. If the
+                 ! data matrices are not scaled and the
+                 ! largest singular value of X overflows.
+                 ! In that case ZGEJSV can return the SVD
+                 ! in scaled form. The scaling factor can be used
+                 ! to rescale the data (X and Y).
+                 CALL ZLASCL( 'G', 0, 0, XSCL1, XSCL2, M, N, Y, LDY, INFO2  )
+              END IF
+      END SELECT
+!
+      IF ( INFO1 > 0 ) THEN
+         ! The SVD selected subroutine did not converge.
+         ! Return with an error code.
+         INFO = 2
+         RETURN
+      END IF
+!
+      IF ( RWORK(1) == ZERO ) THEN
+          ! The largest computed singular value of (scaled)
+          ! X is zero. Return error code -8
+          ! (the 8th input variable had an illegal value).
+          K = 0
+          INFO = -8
+          CALL XERBLA('ZGEDMD',-INFO)
+          RETURN
+      END IF
+!
+      !<3> Determine the numerical rank of the data
+      !    snapshots matrix X. This depends on the
+      !    parameters NRNK and TOL.
+
+      SELECT CASE ( NRNK )
+          CASE ( -1 )
+               K = 1
+               DO i = 2, NUMRNK
+                 IF ( ( RWORK(i) <= RWORK(1)*TOL ) .OR. &
+                      ( RWORK(i) <= SMALL ) ) EXIT
+                 K = K + 1
+               END DO
+          CASE ( -2 )
+               K = 1
+               DO i = 1, NUMRNK-1
+                 IF ( ( RWORK(i+1) <= RWORK(i)*TOL  ) .OR. &
+                      ( RWORK(i) <= SMALL ) ) EXIT
+                 K = K + 1
+               END DO
+          CASE DEFAULT
+               K = 1
+               DO i = 2, NRNK
+                  IF ( RWORK(i) <= SMALL ) EXIT
+                  K = K + 1
+               END DO
+          END SELECT
+      !   Now, U = X(1:M,1:K) is the SVD/POD basis for the
+      !   snapshot data in the input matrix X.
+
+      !<4> Compute the Rayleigh quotient S = U^H * A * U.
+      !    Depending on the requested outputs, the computation
+      !    is organized to compute additional auxiliary
+      !    matrices (for the residuals and refinements).
+      !
+      !    In all formulas below, we need V_k*Sigma_k^(-1)
+      !    where either V_k is in W(1:N,1:K), or V_k^H is in
+      !    W(1:K,1:N). Here Sigma_k=diag(WORK(1:K)).
+      IF ( LSAME(T_OR_N, 'N') ) THEN
+          DO i = 1, K
+           CALL ZDSCAL( N, ONE/RWORK(i), W(1,i), 1 )    ! BLAS CALL
+           ! W(1:N,i) = (ONE/RWORK(i)) * W(1:N,i)      ! INTRINSIC
+          END DO
+      ELSE
+          ! This non-unit stride access is due to the fact
+          ! that ZGESVD, ZGESVDQ and ZGESDD return the
+          ! adjoint matrix of the right singular vectors.
+          !DO i = 1, K
+          ! CALL ZDSCAL( N, ONE/RWORK(i), W(i,1), LDW )    ! BLAS CALL
+          ! ! W(i,1:N) = (ONE/RWORK(i)) * W(i,1:N)      ! INTRINSIC
+          !END DO
+          DO i = 1, K
+              RWORK(N+i) = ONE/RWORK(i)
+          END DO
+          DO j = 1, N
+             DO i = 1, K
+                 W(i,j) = CMPLX(RWORK(N+i),ZERO,KIND=WP)*W(i,j)
+             END DO
+          END DO
+      END IF
+!
+      IF ( WNTREF ) THEN
+         !
+         ! Need A*U(:,1:K)=Y*V_k*inv(diag(WORK(1:K)))
+         ! for computing the refined Ritz vectors
+         ! (optionally, outside ZGEDMD).
+          CALL ZGEMM( 'N', T_OR_N, M, K, N, ZONE, Y, LDY, W, &
+                      LDW, ZZERO, Z, LDZ )                       ! BLAS CALL
+          ! Z(1:M,1:K)=MATMUL(Y(1:M,1:N),TRANSPOSE(CONJG(W(1:K,1:N)))) ! INTRINSIC, for T_OR_N=='C'
+          ! Z(1:M,1:K)=MATMUL(Y(1:M,1:N),W(1:N,1:K))                   ! INTRINSIC, for T_OR_N=='N'
+          !
+          ! At this point Z contains
+          ! A * U(:,1:K) = Y * V_k * Sigma_k^(-1), and
+          ! this is needed for computing the residuals.
+          ! This matrix is  returned in the array B and
+          ! it can be used to compute refined Ritz vectors.
+          CALL ZLACPY( 'A', M, K, Z, LDZ, B, LDB )   ! BLAS CALL
+          ! B(1:M,1:K) = Z(1:M,1:K)                  ! INTRINSIC
+
+          CALL ZGEMM( 'C', 'N', K, K, M, ZONE, X, LDX, Z, &
+                      LDZ, ZZERO, S, LDS )                        ! BLAS CALL
+          ! S(1:K,1:K) = MATMUL(TRANSPOSE(CONJG(X(1:M,1:K))),Z(1:M,1:K)) ! INTRINSIC
+          ! At this point S = U^H * A * U is the Rayleigh quotient.
+      ELSE
+        ! A * U(:,1:K) is not explicitly needed and the
+        ! computation is organized differently. The Rayleigh
+        ! quotient is computed more efficiently.
+        CALL ZGEMM( 'C', 'N', K, N, M, ZONE, X, LDX, Y, LDY, &
+                   ZZERO, Z, LDZ )                                         ! BLAS CALL
+        ! Z(1:K,1:N) = MATMUL( TRANSPOSE(CONJG(X(1:M,1:K))), Y(1:M,1:N) )  ! INTRINSIC
+        !
+        CALL ZGEMM( 'N', T_OR_N, K, K, N, ZONE, Z, LDZ, W, &
+                    LDW, ZZERO, S, LDS )                         ! BLAS CALL
+        ! S(1:K,1:K) = MATMUL(Z(1:K,1:N),TRANSPOSE(CONJG(W(1:K,1:N)))) ! INTRINSIC, for T_OR_N=='T'
+        ! S(1:K,1:K) = MATMUL(Z(1:K,1:N),(W(1:N,1:K)))                 ! INTRINSIC, for T_OR_N=='N'
+        ! At this point S = U^H * A * U is the Rayleigh quotient.
+        ! If the residuals are requested, save scaled V_k into Z.
+        ! Recall that V_k or V_k^H is stored in W.
+        IF ( WNTRES .OR. WNTEX ) THEN
+          IF ( LSAME(T_OR_N, 'N') ) THEN
+              CALL ZLACPY( 'A', N, K, W, LDW, Z, LDZ )
+          ELSE
+              CALL ZLACPY( 'A', K, N, W, LDW, Z, LDZ )
+          END IF
+        END IF
+      END IF
+!
+      !<5> Compute the Ritz values and (if requested) the
+      !   right eigenvectors of the Rayleigh quotient.
+      !
+      CALL ZGEEV( 'N', JOBZL, K, S, LDS, EIGS, W, LDW, &
+            W, LDW, ZWORK, LZWORK, RWORK(N+1), INFO1 )  ! LAPACK CALL
+      !
+      ! W(1:K,1:K) contains the eigenvectors of the Rayleigh
+      ! quotient.  See the description of Z.
+      ! Also, see the description of ZGEEV.
+      IF ( INFO1 > 0 ) THEN
+         ! ZGEEV failed to compute the eigenvalues and
+         ! eigenvectors of the Rayleigh quotient.
+         INFO = 3
+         RETURN
+      END IF
+!
+      ! <6> Compute the eigenvectors (if requested) and,
+      ! the residuals (if requested).
+      !
+      IF ( WNTVEC .OR. WNTEX ) THEN
+      IF ( WNTRES ) THEN
+          IF ( WNTREF ) THEN
+            ! Here, if the refinement is requested, we have
+            ! A*U(:,1:K) already computed and stored in Z.
+            ! For the residuals, need Y = A * U(:,1;K) * W.
+            CALL ZGEMM( 'N', 'N', M, K, K, ZONE, Z, LDZ, W, &
+                       LDW, ZZERO, Y, LDY )               ! BLAS CALL
+            ! Y(1:M,1:K) = Z(1:M,1:K) * W(1:K,1:K)        ! INTRINSIC
+            ! This frees Z; Y contains A * U(:,1:K) * W.
+          ELSE
+            ! Compute S = V_k * Sigma_k^(-1) * W, where
+            ! V_k * Sigma_k^(-1) (or its adjoint) is stored in Z
+            CALL ZGEMM( T_OR_N, 'N', N, K, K, ZONE, Z, LDZ, &
+                       W, LDW, ZZERO, S, LDS )
+            ! Then, compute Z = Y * S =
+            ! = Y * V_k * Sigma_k^(-1) * W(1:K,1:K) =
+            ! = A * U(:,1:K) * W(1:K,1:K)
+            CALL ZGEMM( 'N', 'N', M, K, N, ZONE, Y, LDY, S, &
+                       LDS, ZZERO, Z, LDZ )
+            ! Save a copy of Z into Y and free Z for holding
+            ! the Ritz vectors.
+            CALL ZLACPY( 'A', M, K, Z, LDZ, Y, LDY )
+            IF ( WNTEX ) CALL ZLACPY( 'A', M, K, Z, LDZ, B, LDB )
+          END IF
+      ELSE IF ( WNTEX ) THEN
+          ! Compute S = V_k * Sigma_k^(-1) * W, where
+            ! V_k * Sigma_k^(-1) is stored in Z
+            CALL ZGEMM( T_OR_N, 'N', N, K, K, ZONE, Z, LDZ, &
+                       W, LDW, ZZERO, S, LDS )
+            ! Then, compute Z = Y * S =
+            ! = Y * V_k * Sigma_k^(-1) * W(1:K,1:K) =
+            ! = A * U(:,1:K) * W(1:K,1:K)
+            CALL ZGEMM( 'N', 'N', M, K, N, ZONE, Y, LDY, S, &
+                       LDS, ZZERO, B, LDB )
+            ! The above call replaces the following two calls
+            ! that were used in the developing-testing phase.
+            ! CALL ZGEMM( 'N', 'N', M, K, N, ZONE, Y, LDY, S, &
+            !           LDS, ZZERO, Z, LDZ)
+            ! Save a copy of Z into B and free Z for holding
+            ! the Ritz vectors.
+            ! CALL ZLACPY( 'A', M, K, Z, LDZ, B, LDB )
+      END IF
+!
+      ! Compute the Ritz vectors
+      IF ( WNTVEC ) CALL ZGEMM( 'N', 'N', M, K, K, ZONE, X, LDX, W, LDW, &
+                   ZZERO, Z, LDZ )                          ! BLAS CALL
+      ! Z(1:M,1:K) = MATMUL(X(1:M,1:K), W(1:K,1:K))         ! INTRINSIC
+!
+      IF ( WNTRES ) THEN
+         DO i = 1, K
+            CALL ZAXPY( M, -EIGS(i), Z(1,i), 1, Y(1,i), 1 )       ! BLAS CALL
+            ! Y(1:M,i) = Y(1:M,i) - EIGS(i) * Z(1:M,i)            ! INTRINSIC
+            RES(i) = DZNRM2( M, Y(1,i), 1 )                       ! BLAS CALL
+         END DO
+      END IF
+      END IF
+!
+      IF ( WHTSVD == 4 ) THEN
+          RWORK(N+1) = XSCL1
+          RWORK(N+2) = XSCL2
+      END IF
+!
+!     Successful exit.
+      IF ( .NOT. BADXY ) THEN
+         INFO = 0
+      ELSE
+         ! A warning on possible data inconsistency.
+         ! This should be a rare event.
+         INFO = 4
+      END IF
+!............................................................
+      RETURN
+!     ......
+      END SUBROUTINE ZGEDMD
diff --git a/SRC/zgedmdq.f90 b/SRC/zgedmdq.f90
new file mode 100644
index 0000000000..9436d471a8
--- /dev/null
+++ b/SRC/zgedmdq.f90
@@ -0,0 +1,852 @@
+!> \brief \b ZGEDMDQ computes the Dynamic Mode Decomposition (DMD) for a pair of data snapshot matrices.
+!
+!  =========== DOCUMENTATION ===========
+!
+!  Definition:
+!  ===========
+!
+!     SUBROUTINE ZGEDMDQ( JOBS,  JOBZ, JOBR, JOBQ, JOBT, JOBF,   &
+!                         WHTSVD,   M, N, F, LDF,  X, LDX,  Y,   &
+!                         LDY,   NRNK,  TOL,   K,  EIGS,         &
+!                         Z, LDZ, RES,  B,     LDB,   V, LDV,    &
+!                         S, LDS, ZWORK, LZWORK, WORK,  LWORK,   &
+!                         IWORK, LIWORK, INFO )
+!.....
+!     USE, INTRINSIC :: iso_fortran_env, only: real64
+!     IMPLICIT NONE
+!     INTEGER, PARAMETER :: WP = real64
+!.....
+!     Scalar arguments
+!     CHARACTER, INTENT(IN)  :: JOBS, JOBZ, JOBR, JOBQ,    &
+!                               JOBT, JOBF
+!     INTEGER,   INTENT(IN)  :: WHTSVD, M, N,   LDF, LDX,  &
+!                               LDY, NRNK, LDZ, LDB, LDV,  &
+!                               LDS, LZWORK,  LWORK, LIWORK
+!     INTEGER,   INTENT(OUT) :: INFO,   K
+!     REAL(KIND=WP), INTENT(IN)    ::   TOL
+!     Array arguments
+!     COMPLEX(KIND=WP), INTENT(INOUT) :: F(LDF,*)
+!     COMPLEX(KIND=WP), INTENT(OUT)   :: X(LDX,*), Y(LDY,*), &
+!                                        Z(LDZ,*), B(LDB,*), &
+!                                        V(LDV,*), S(LDS,*)
+!     COMPLEX(KIND=WP), INTENT(OUT)   :: EIGS(*)
+!     COMPLEX(KIND=WP), INTENT(OUT)   :: ZWORK(*)
+!     REAL(KIND=WP), INTENT(OUT)   :: RES(*)
+!     REAL(KIND=WP), INTENT(OUT)   :: WORK(*)
+!     INTEGER,       INTENT(OUT)   :: IWORK(*)
+!............................................................
+!>    \par Purpose:
+!     =============
+!>    \verbatim
+!>    ZGEDMDQ computes the Dynamic Mode Decomposition (DMD) for
+!>    a pair of data snapshot matrices, using a QR factorization
+!>    based compression of the data. For the input matrices
+!>    X and Y such that Y = A*X with an unaccessible matrix
+!>    A, ZGEDMDQ computes a certain number of Ritz pairs of A using
+!>    the standard Rayleigh-Ritz extraction from a subspace of
+!>    range(X) that is determined using the leading left singular
+!>    vectors of X. Optionally, ZGEDMDQ returns the residuals
+!>    of the computed Ritz pairs, the information needed for
+!>    a refinement of the Ritz vectors, or the eigenvectors of
+!>    the Exact DMD.
+!>    For further details see the references listed
+!>    below. For more details of the implementation see [3].
+!>    \endverbatim
+!............................................................
+!>    \par References:
+!     ================
+!>    \verbatim
+!>    [1] P. Schmid: Dynamic mode decomposition of numerical
+!>        and experimental data,
+!>        Journal of Fluid Mechanics 656, 5-28, 2010.
+!>    [2] Z. Drmac, I. Mezic, R. Mohr: Data driven modal
+!>        decompositions: analysis and enhancements,
+!>        SIAM J. on Sci. Comp. 40 (4), A2253-A2285, 2018.
+!>    [3] Z. Drmac: A LAPACK implementation of the Dynamic
+!>        Mode Decomposition I. Technical report. AIMDyn Inc.
+!>        and LAPACK Working Note 298.
+!>    [4] J. Tu, C. W. Rowley, D. M. Luchtenburg, S. L.
+!>        Brunton, N. Kutz: On Dynamic Mode Decomposition:
+!>        Theory and Applications, Journal of Computational
+!>        Dynamics 1(2), 391 -421, 2014.
+!>    \endverbatim
+!......................................................................
+!>    \par Developed and supported by:
+!     ================================
+!>    \verbatim
+!>    Developed and coded by Zlatko Drmac, Faculty of Science,
+!>    University of Zagreb;  drmac@math.hr
+!>    In cooperation with
+!>    AIMdyn Inc., Santa Barbara, CA.
+!>    and supported by
+!>    - DARPA SBIR project "Koopman Operator-Based Forecasting
+!>    for Nonstationary Processes from Near-Term, Limited
+!>    Observational Data" Contract No: W31P4Q-21-C-0007
+!>    - DARPA PAI project "Physics-Informed Machine Learning
+!>    Methodologies" Contract No: HR0011-18-9-0033
+!>    - DARPA MoDyL project "A Data-Driven, Operator-Theoretic
+!>    Framework for Space-Time Analysis of Process Dynamics"
+!>    Contract No: HR0011-16-C-0116
+!>    Any opinions, findings and conclusions or recommendations
+!>    expressed in this material are those of the author and
+!>    do not necessarily reflect the views of the DARPA SBIR
+!>    Program Office.
+!>    \endverbatim
+!......................................................................
+!>    \par Developed and supported by:
+!     ================================
+!>    \verbatim
+!>    Distribution Statement A:
+!>    Approved for Public Release, Distribution Unlimited.
+!>    Cleared by DARPA on September 29, 2022
+!>    \endverbatim
+!============================================================
+!     Arguments
+!     =========
+!
+!>    \param[in] JOBS
+!>    \verbatim
+!>    JOBS (input) CHARACTER*1
+!>    Determines whether the initial data snapshots are scaled
+!>    by a diagonal matrix. The data snapshots are the columns
+!>    of F. The leading N-1 columns of F are denoted X and the
+!>    trailing N-1 columns are denoted Y.
+!>    'S' :: The data snapshots matrices X and Y are multiplied
+!>           with a diagonal matrix D so that X*D has unit
+!>           nonzero columns (in the Euclidean 2-norm)
+!>    'C' :: The snapshots are scaled as with the 'S' option.
+!>           If it is found that an i-th column of X is zero
+!>           vector and the corresponding i-th column of Y is
+!>           non-zero, then the i-th column of Y is set to
+!>           zero and a warning flag is raised.
+!>    'Y' :: The data snapshots matrices X and Y are multiplied
+!>           by a diagonal matrix D so that Y*D has unit
+!>           nonzero columns (in the Euclidean 2-norm)
+!>    'N' :: No data scaling.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBZ
+!>    \verbatim
+!>    JOBZ (input) CHARACTER*1
+!>    Determines whether the eigenvectors (Koopman modes) will
+!>    be computed.
+!>    'V' :: The eigenvectors (Koopman modes) will be computed
+!>           and returned in the matrix Z.
+!>           See the description of Z.
+!>    'F' :: The eigenvectors (Koopman modes) will be returned
+!>           in factored form as the product Z*V, where Z
+!>           is orthonormal and V contains the eigenvectors
+!>           of the corresponding Rayleigh quotient.
+!>           See the descriptions of F, V, Z.
+!>    'Q' :: The eigenvectors (Koopman modes) will be returned
+!>           in factored form as the product Q*Z, where Z
+!>           contains the eigenvectors of the compression of the
+!>           underlying discretized operator onto the span of
+!>           the data snapshots. See the descriptions of F, V, Z.
+!>           Q is from the initial QR factorization.
+!>    'N' :: The eigenvectors are not computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBR
+!>    \verbatim
+!>    JOBR (input) CHARACTER*1
+!>    Determines whether to compute the residuals.
+!>    'R' :: The residuals for the computed eigenpairs will
+!>           be computed and stored in the array RES.
+!>           See the description of RES.
+!>           For this option to be legal, JOBZ must be 'V'.
+!>    'N' :: The residuals are not computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBQ
+!>    \verbatim
+!>    JOBQ (input) CHARACTER*1
+!>    Specifies whether to explicitly compute and return the
+!>    unitary matrix from the QR factorization.
+!>    'Q' :: The matrix Q of the QR factorization of the data
+!>           snapshot matrix is computed and stored in the
+!>           array F. See the description of F.
+!>    'N' :: The matrix Q is not explicitly computed.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBT
+!>    \verbatim
+!>    JOBT (input) CHARACTER*1
+!>    Specifies whether to return the upper triangular factor
+!>    from the QR factorization.
+!>    'R' :: The matrix R of the QR factorization of the data
+!>           snapshot matrix F is returned in the array Y.
+!>           See the description of Y and Further details.
+!>    'N' :: The matrix R is not returned.
+!>    \endverbatim
+!.....
+!>    \param[in] JOBF
+!>    \verbatim
+!>    JOBF (input) CHARACTER*1
+!>    Specifies whether to store information needed for post-
+!>    processing (e.g. computing refined Ritz vectors)
+!>    'R' :: The matrix needed for the refinement of the Ritz
+!>           vectors is computed and stored in the array B.
+!>           See the description of B.
+!>    'E' :: The unscaled eigenvectors of the Exact DMD are
+!>           computed and returned in the array B. See the
+!>           description of B.
+!>    'N' :: No eigenvector refinement data is computed.
+!>    To be useful on exit, this option needs JOBQ='Q'.
+!>    \endverbatim
+!.....
+!>    \param[in] WHTSVD
+!>    \verbatim
+!>    WHTSVD (input) INTEGER, WHSTVD in { 1, 2, 3, 4 }
+!>    Allows for a selection of the SVD algorithm from the
+!>    LAPACK library.
+!>    1 :: ZGESVD (the QR SVD algorithm)
+!>    2 :: ZGESDD (the Divide and Conquer algorithm; if enough
+!>         workspace available, this is the fastest option)
+!>    3 :: ZGESVDQ (the preconditioned QR SVD  ; this and 4
+!>         are the most accurate options)
+!>    4 :: ZGEJSV (the preconditioned Jacobi SVD; this and 3
+!>         are the most accurate options)
+!>    For the four methods above, a significant difference in
+!>    the accuracy of small singular values is possible if
+!>    the snapshots vary in norm so that X is severely
+!>    ill-conditioned. If small (smaller than EPS*||X||)
+!>    singular values are of interest and JOBS=='N',  then
+!>    the options (3, 4) give the most accurate results, where
+!>    the option 4 is slightly better and with stronger
+!>    theoretical background.
+!>    If JOBS=='S', i.e. the columns of X will be normalized,
+!>    then all methods give nearly equally accurate results.
+!>    \endverbatim
+!.....
+!>    \param[in] M
+!>    \verbatim
+!>    M (input) INTEGER, M >= 0
+!>    The state space dimension (the number of rows of F).
+!>    \endverbatim
+!.....
+!>    \param[in] N
+!>    \verbatim
+!>    N (input) INTEGER, 0 <= N <= M
+!>    The number of data snapshots from a single trajectory,
+!>    taken at equidistant discrete times. This is the
+!>    number of columns of F.
+!>    \endverbatim
+!.....
+!>    \param[in,out] F
+!>    \verbatim
+!>    F (input/output) COMPLEX(KIND=WP) M-by-N array
+!>    > On entry,
+!>    the columns of F are the sequence of data snapshots
+!>    from a single trajectory, taken at equidistant discrete
+!>    times. It is assumed that the column norms of F are
+!>    in the range of the normalized floating point numbers.
+!>    < On exit,
+!>    If JOBQ == 'Q', the array F contains the orthogonal
+!>    matrix/factor of the QR factorization of the initial
+!>    data snapshots matrix F. See the description of JOBQ.
+!>    If JOBQ == 'N', the entries in F strictly below the main
+!>    diagonal contain, column-wise, the information on the
+!>    Householder vectors, as returned by ZGEQRF. The
+!>    remaining information to restore the orthogonal matrix
+!>    of the initial QR factorization is stored in ZWORK(1:MIN(M,N)).
+!>    See the description of ZWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LDF
+!>    \verbatim
+!>    LDF (input) INTEGER, LDF >= M
+!>    The leading dimension of the array F.
+!>    \endverbatim
+!.....
+!>    \param[in,out] X
+!>    \verbatim
+!>    X (workspace/output) COMPLEX(KIND=WP) MIN(M,N)-by-(N-1) array
+!>    X is used as workspace to hold representations of the
+!>    leading N-1 snapshots in the orthonormal basis computed
+!>    in the QR factorization of F.
+!>    On exit, the leading K columns of X contain the leading
+!>    K left singular vectors of the above described content
+!>    of X. To lift them to the space of the left singular
+!>    vectors U(:,1:K) of the input data, pre-multiply with the
+!>    Q factor from the initial QR factorization.
+!>    See the descriptions of F, K, V  and Z.
+!>    \endverbatim
+!.....
+!>    \param[in] LDX
+!>    \verbatim
+!>    LDX (input) INTEGER, LDX >= N
+!>    The leading dimension of the array X.
+!>    \endverbatim
+!.....
+!>    \param[in,out] Y
+!>    \verbatim
+!>    Y (workspace/output) COMPLEX(KIND=WP) MIN(M,N)-by-(N) array
+!>    Y is used as workspace to hold representations of the
+!>    trailing N-1 snapshots in the orthonormal basis computed
+!>    in the QR factorization of F.
+!>    On exit,
+!>    If JOBT == 'R', Y contains the MIN(M,N)-by-N upper
+!>    triangular factor from the QR factorization of the data
+!>    snapshot matrix F.
+!>    \endverbatim
+!.....
+!>    \param[in] LDY
+!>    \verbatim
+!>    LDY (input) INTEGER , LDY >= N
+!>    The leading dimension of the array Y.
+!>    \endverbatim
+!.....
+!>    \param[in] NRNK
+!>    \verbatim
+!>    NRNK (input) INTEGER
+!>    Determines the mode how to compute the numerical rank,
+!>    i.e. how to truncate small singular values of the input
+!>    matrix X. On input, if
+!>    NRNK = -1 :: i-th singular value sigma(i) is truncated
+!>                 if sigma(i) <= TOL*sigma(1)
+!>                 This option is recommended.
+!>    NRNK = -2 :: i-th singular value sigma(i) is truncated
+!>                 if sigma(i) <= TOL*sigma(i-1)
+!>                 This option is included for R&D purposes.
+!>                 It requires highly accurate SVD, which
+!>                 may not be feasible.
+!>    The numerical rank can be enforced by using positive
+!>    value of NRNK as follows:
+!>    0 < NRNK <= N-1 :: at most NRNK largest singular values
+!>    will be used. If the number of the computed nonzero
+!>    singular values is less than NRNK, then only those
+!>    nonzero values will be used and the actually used
+!>    dimension is less than NRNK. The actual number of
+!>    the nonzero singular values is returned in the variable
+!>    K. See the description of K.
+!>    \endverbatim
+!.....
+!>    \param[in] TOL
+!>    \verbatim
+!>    TOL (input) REAL(KIND=WP), 0 <= TOL < 1
+!>    The tolerance for truncating small singular values.
+!>    See the description of NRNK.
+!>    \endverbatim
+!.....
+!>    \param[out] K
+!>    \verbatim
+!>    K (output) INTEGER,  0 <= K <= N
+!>    The dimension of the SVD/POD basis for the leading N-1
+!>    data snapshots (columns of F) and the number of the
+!>    computed Ritz pairs. The value of K is determined
+!>    according to the rule set by the parameters NRNK and
+!>    TOL. See the descriptions of NRNK and TOL.
+!>    \endverbatim
+!.....
+!>    \param[out] EIGS
+!>    \verbatim
+!>    EIGS (output) COMPLEX(KIND=WP) (N-1)-by-1 array
+!>    The leading K (K<=N-1) entries of EIGS contain
+!>    the computed eigenvalues (Ritz values).
+!>    See the descriptions of K, and Z.
+!>    \endverbatim
+!.....
+!>    \param[out] Z
+!>    \verbatim
+!>    Z (workspace/output) COMPLEX(KIND=WP)  M-by-(N-1) array
+!>    If JOBZ =='V' then Z contains the Ritz vectors. Z(:,i)
+!>    is an eigenvector of the i-th Ritz value; ||Z(:,i)||_2=1.
+!>    If JOBZ == 'F', then the Z(:,i)'s are given implicitly as
+!>    Z*V, where Z contains orthonormal matrix (the product of
+!>    Q from the initial QR factorization and the SVD/POD_basis
+!>    returned by ZGEDMD in X) and the second factor (the
+!>    eigenvectors of the Rayleigh quotient) is in the array V,
+!>    as returned by ZGEDMD. That is,  X(:,1:K)*V(:,i)
+!>    is an eigenvector corresponding to EIGS(i). The columns
+!>    of V(1:K,1:K) are the computed eigenvectors of the
+!>    K-by-K Rayleigh quotient.
+!>    See the descriptions of EIGS, X and V.
+!>    \endverbatim
+!.....
+!>    \param[in] LDZ
+!>    \verbatim
+!>    LDZ (input) INTEGER , LDZ >= M
+!>    The leading dimension of the array Z.
+!>    \endverbatim
+!.....
+!>    \param[out] RES
+!>    \verbatim
+!>    RES (output) REAL(KIND=WP) (N-1)-by-1 array
+!>    RES(1:K) contains the residuals for the K computed
+!>    Ritz pairs,
+!>    RES(i) = || A * Z(:,i) - EIGS(i)*Z(:,i))||_2.
+!>    See the description of EIGS and Z.
+!>    \endverbatim
+!.....
+!>    \param[out] B
+!>    \verbatim
+!>    B (output) COMPLEX(KIND=WP)  MIN(M,N)-by-(N-1) array.
+!>    IF JOBF =='R', B(1:N,1:K) contains A*U(:,1:K), and can
+!>    be used for computing the refined vectors; see further
+!>    details in the provided references.
+!>    If JOBF == 'E', B(1:N,1;K) contains
+!>    A*U(:,1:K)*W(1:K,1:K), which are the vectors from the
+!>    Exact DMD, up to scaling by the inverse eigenvalues.
+!>    In both cases, the content of B can be lifted to the
+!>    original dimension of the input data by pre-multiplying
+!>    with the Q factor from the initial QR factorization.
+!>    Here A denotes a compression of the underlying operator.
+!>    See the descriptions of F and X.
+!>    If JOBF =='N', then B is not referenced.
+!>    \endverbatim
+!.....
+!>    \param[in] LDB
+!>    \verbatim
+!>    LDB (input) INTEGER, LDB >= MIN(M,N)
+!>    The leading dimension of the array B.
+!>    \endverbatim
+!.....
+!>    \param[out] V
+!>    \verbatim
+!>    V (workspace/output) COMPLEX(KIND=WP) (N-1)-by-(N-1) array
+!>    On exit, V(1:K,1:K) V contains the K eigenvectors of
+!>    the Rayleigh quotient. The Ritz vectors
+!>    (returned in Z) are the product of Q from the initial QR
+!>    factorization (see the description of F) X (see the
+!>    description of X) and V.
+!>    \endverbatim
+!.....
+!>    \param[in] LDV
+!>    \verbatim
+!>    LDV (input) INTEGER, LDV >= N-1
+!>    The leading dimension of the array V.
+!>    \endverbatim
+!.....
+!>    \param[out] S
+!>    \verbatim
+!>    S (output) COMPLEX(KIND=WP) (N-1)-by-(N-1) array
+!>    The array S(1:K,1:K) is used for the matrix Rayleigh
+!>    quotient. This content is overwritten during
+!>    the eigenvalue decomposition by ZGEEV.
+!>    See the description of K.
+!>    \endverbatim
+!.....
+!>    \param[in] LDS
+!>    \verbatim
+!>    LDS (input) INTEGER, LDS >= N-1
+!>    The leading dimension of the array S.
+!>    \endverbatim
+!.....
+!>    \param[out] ZWORK
+!>    \verbatim
+!>    ZWORK (workspace/output) COMPLEX(KIND=WP) LWORK-by-1 array
+!>    On exit,
+!>    ZWORK(1:MIN(M,N)) contains the scalar factors of the
+!>    elementary reflectors as returned by ZGEQRF of the
+!>    M-by-N input matrix F.
+!>    If the call to ZGEDMDQ is only workspace query, then
+!>    ZWORK(1) contains the minimal complex workspace length and
+!>    ZWORK(2) is the optimal complex workspace length.
+!>    Hence, the length of work is at least 2.
+!>    See the description of LZWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LZWORK
+!>    \verbatim
+!>    LZWORK (input) INTEGER
+!>    The minimal length of the  workspace vector ZWORK.
+!>    LZWORK is calculated as follows:
+!>    Let MLWQR  = N (minimal workspace for ZGEQRF[M,N])
+!>        MLWDMD = minimal workspace for ZGEDMD (see the
+!>                 description of LWORK in ZGEDMD)
+!>        MLWMQR = N (minimal workspace for
+!>                   ZUNMQR['L','N',M,N,N])
+!>        MLWGQR = N (minimal workspace for ZUNGQR[M,N,N])
+!>        MINMN  = MIN(M,N)
+!>    Then
+!>    LZWORK = MAX(2, MIN(M,N)+MLWQR, MINMN+MLWDMD)
+!>    is further updated as follows:
+!>       if   JOBZ == 'V' or JOBZ == 'F' THEN
+!>            LZWORK = MAX(LZWORK, MINMN+MLWMQR)
+!>       if   JOBQ == 'Q' THEN
+!>            LZWORK = MAX(ZLWORK, MINMN+MLWGQR)
+!>    \endverbatim
+!.....
+!>    \param[out] WORK
+!>    \verbatim
+!>    WORK (workspace/output) REAL(KIND=WP) LWORK-by-1 array
+!>    On exit,
+!>    WORK(1:N-1) contains the singular values of
+!>    the input submatrix F(1:M,1:N-1).
+!>    If the call to ZGEDMDQ is only workspace query, then
+!>    WORK(1) contains the minimal workspace length and
+!>    WORK(2) is the optimal workspace length. hence, the
+!>    length of work is at least 2.
+!>    See the description of LWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LWORK
+!>    \verbatim
+!>    LWORK (input) INTEGER
+!>    The minimal length of the  workspace vector WORK.
+!>    LWORK is the same as in ZGEDMD, because in ZGEDMDQ
+!>    only ZGEDMD requires real workspace for snapshots
+!>    of dimensions MIN(M,N)-by-(N-1).
+!>    If on entry LWORK = -1, then a workspace query is
+!>    assumed and the procedure only computes the minimal
+!>    and the optimal workspace length for WORK.
+!>    \endverbatim
+!.....
+!>    \param[out] IWORK
+!>    \verbatim
+!>    IWORK (workspace/output) INTEGER LIWORK-by-1 array
+!>    Workspace that is required only if WHTSVD equals
+!>    2 , 3 or 4. (See the description of WHTSVD).
+!>    If on entry LWORK =-1 or LIWORK=-1, then the
+!>    minimal length of IWORK is computed and returned in
+!>    IWORK(1). See the description of LIWORK.
+!>    \endverbatim
+!.....
+!>    \param[in] LIWORK
+!>    \verbatim
+!>    LIWORK (input) INTEGER
+!>    The minimal length of the workspace vector IWORK.
+!>    If WHTSVD == 1, then only IWORK(1) is used; LIWORK >=1
+!>    Let M1=MIN(M,N), N1=N-1. Then
+!>    If WHTSVD == 2, then LIWORK >= MAX(1,8*MIN(M1,N1))
+!>    If WHTSVD == 3, then LIWORK >= MAX(1,M1+N1-1)
+!>    If WHTSVD == 4, then LIWORK >= MAX(3,M1+3*N1)
+!>    If on entry LIWORK = -1, then a workspace query is
+!>    assumed and the procedure only computes the minimal
+!>    and the optimal workspace lengths for both WORK and
+!>    IWORK. See the descriptions of WORK and IWORK.
+!>    \endverbatim
+!.....
+!>    \param[out] INFO
+!>    \verbatim
+!>    INFO (output) INTEGER
+!>    -i < 0 :: On entry, the i-th argument had an
+!>              illegal value
+!>       = 0 :: Successful return.
+!>       = 1 :: Void input. Quick exit (M=0 or N=0).
+!>       = 2 :: The SVD computation of X did not converge.
+!>              Suggestion: Check the input data and/or
+!>              repeat with different WHTSVD.
+!>       = 3 :: The computation of the eigenvalues did not
+!>              converge.
+!>       = 4 :: If data scaling was requested on input and
+!>              the procedure found inconsistency in the data
+!>              such that for some column index i,
+!>              X(:,i) = 0 but Y(:,i) /= 0, then Y(:,i) is set
+!>              to zero if JOBS=='C'. The computation proceeds
+!>              with original or modified data and warning
+!>              flag is set with INFO=4.
+!>    \endverbatim
+!
+!  Authors:
+!  ========
+!
+!> \author Zlatko Drmac
+!
+!> \ingroup gedmd
+!
+!.............................................................
+!.............................................................
+SUBROUTINE ZGEDMDQ( JOBS,  JOBZ, JOBR, JOBQ, JOBT, JOBF,   &
+                    WHTSVD,   M, N, F, LDF,  X, LDX,  Y,   &
+                    LDY,   NRNK,  TOL,   K,  EIGS,         &
+                    Z, LDZ, RES,  B,     LDB,   V, LDV,    &
+                    S, LDS, ZWORK, LZWORK, WORK,  LWORK,   &
+                    IWORK, LIWORK, INFO )
+!
+!  -- LAPACK driver routine                                           --
+!
+!  -- LAPACK is a software package provided by University of          --
+!  -- Tennessee, University of California Berkeley, University of     --
+!  -- Colorado Denver and NAG Ltd..                                   --
+!
+!.....
+      USE, INTRINSIC :: iso_fortran_env, only: real64
+      IMPLICIT NONE
+      INTEGER, PARAMETER :: WP = real64
+!
+!     Scalar arguments
+!     ~~~~~~~~~~~~~~~~
+      CHARACTER, INTENT(IN)  :: JOBS, JOBZ, JOBR, JOBQ,    &
+                                JOBT, JOBF
+      INTEGER,   INTENT(IN)  :: WHTSVD, M, N,   LDF, LDX,  &
+                                LDY, NRNK, LDZ, LDB, LDV,  &
+                                LDS, LZWORK,  LWORK, LIWORK
+      INTEGER,   INTENT(OUT) :: INFO,   K
+      REAL(KIND=WP), INTENT(IN)    ::   TOL
+!
+!     Array arguments
+!     ~~~~~~~~~~~~~~~
+      COMPLEX(KIND=WP), INTENT(INOUT) :: F(LDF,*)
+      COMPLEX(KIND=WP), INTENT(OUT)   :: X(LDX,*), Y(LDY,*), &
+                                         Z(LDZ,*), B(LDB,*), &
+                                         V(LDV,*), S(LDS,*)
+      COMPLEX(KIND=WP), INTENT(OUT)   :: EIGS(*)
+      COMPLEX(KIND=WP), INTENT(OUT)   :: ZWORK(*)
+      REAL(KIND=WP), INTENT(OUT)   :: RES(*)
+      REAL(KIND=WP), INTENT(OUT)   :: WORK(*)
+      INTEGER,       INTENT(OUT)   :: IWORK(*)
+!
+!     Parameters
+!     ~~~~~~~~~~
+      REAL(KIND=WP), PARAMETER ::  ONE = 1.0_WP
+      REAL(KIND=WP), PARAMETER :: ZERO = 0.0_WP
+!     COMPLEX(KIND=WP), PARAMETER ::  ZONE = ( 1.0_WP, 0.0_WP )
+      COMPLEX(KIND=WP), PARAMETER :: ZZERO = ( 0.0_WP, 0.0_WP )
+!
+!     Local scalars
+!     ~~~~~~~~~~~~~
+      INTEGER           :: IMINWR, INFO1,  MINMN, MLRWRK,   &
+                           MLWDMD, MLWGQR, MLWMQR, MLWORK,  &
+                           MLWQR,  OLWDMD, OLWGQR, OLWMQR,  &
+                           OLWORK, OLWQR
+      LOGICAL           :: LQUERY, SCCOLX, SCCOLY, WANTQ,  &
+                           WNTTRF, WNTRES, WNTVEC, WNTVCF, &
+                           WNTVCQ, WNTREF, WNTEX
+      CHARACTER(LEN=1)  :: JOBVL
+!
+!     External functions (BLAS and LAPACK)
+!     ~~~~~~~~~~~~~~~~~
+      LOGICAL       LSAME
+      EXTERNAL      LSAME
+!
+!     External subroutines (BLAS and LAPACK)
+!     ~~~~~~~~~~~~~~~~~~~~
+      EXTERNAL      ZGEDMD, ZGEQRF, ZLACPY, ZLASET, ZUNGQR, &
+                    ZUNMQR, XERBLA
+!
+!     Intrinsic functions
+!     ~~~~~~~~~~~~~~~~~~~
+      INTRINSIC      MAX, MIN, INT
+!..........................................................
+!
+!     Test the input arguments
+      WNTRES = LSAME(JOBR,'R')
+      SCCOLX = LSAME(JOBS,'S') .OR. LSAME( JOBS, 'C' )
+      SCCOLY = LSAME(JOBS,'Y')
+      WNTVEC = LSAME(JOBZ,'V')
+      WNTVCF = LSAME(JOBZ,'F')
+      WNTVCQ = LSAME(JOBZ,'Q')
+      WNTREF = LSAME(JOBF,'R')
+      WNTEX  = LSAME(JOBF,'E')
+      WANTQ  = LSAME(JOBQ,'Q')
+      WNTTRF = LSAME(JOBT,'R')
+      MINMN  = MIN(M,N)
+      INFO = 0
+      LQUERY = ( (LZWORK == -1) .OR. (LWORK == -1) .OR. (LIWORK == -1) )
+!
+      IF ( .NOT. (SCCOLX .OR. SCCOLY .OR.                &
+                                  LSAME(JOBS,'N')) )  THEN
+          INFO = -1
+      ELSE IF ( .NOT. (WNTVEC .OR. WNTVCF .OR. WNTVCQ    &
+                              .OR. LSAME(JOBZ,'N')) ) THEN
+          INFO = -2
+      ELSE IF ( .NOT. (WNTRES .OR. LSAME(JOBR,'N')) .OR.    &
+          ( WNTRES .AND. LSAME(JOBZ,'N') ) ) THEN
+          INFO = -3
+      ELSE IF ( .NOT. (WANTQ .OR. LSAME(JOBQ,'N')) ) THEN
+           INFO = -4
+      ELSE IF ( .NOT. ( WNTTRF .OR. LSAME(JOBT,'N') ) )  THEN
+          INFO = -5
+       ELSE IF ( .NOT. (WNTREF .OR. WNTEX .OR.             &
+                LSAME(JOBF,'N') ) )                     THEN
+          INFO = -6
+      ELSE IF ( .NOT. ((WHTSVD == 1).OR.(WHTSVD == 2).OR.   &
+                       (WHTSVD == 3).OR.(WHTSVD == 4)) ) THEN
+          INFO = -7
+      ELSE IF ( M < 0 ) THEN
+          INFO = -8
+      ELSE IF ( ( N < 0 ) .OR. ( N > M+1 ) ) THEN
+          INFO = -9
+      ELSE IF ( LDF < M ) THEN
+          INFO = -11
+      ELSE IF ( LDX < MINMN ) THEN
+          INFO = -13
+      ELSE IF ( LDY < MINMN ) THEN
+          INFO = -15
+      ELSE IF ( .NOT. (( NRNK == -2).OR.(NRNK == -1).OR.    &
+                       ((NRNK >= 1).AND.(NRNK <=N ))) )  THEN
+          INFO = -16
+      ELSE IF ( ( TOL < ZERO ) .OR. ( TOL >= ONE ) ) THEN
+          INFO = -17
+      ELSE IF ( LDZ < M ) THEN
+          INFO = -21
+      ELSE IF ( (WNTREF.OR.WNTEX ).AND.( LDB < MINMN ) ) THEN
+          INFO = -24
+      ELSE IF ( LDV < N-1 ) THEN
+          INFO = -26
+      ELSE IF ( LDS < N-1 ) THEN
+          INFO = -28
+      END IF
+!
+      IF ( WNTVEC .OR. WNTVCF .OR. WNTVCQ ) THEN
+          JOBVL = 'V'
+      ELSE
+          JOBVL = 'N'
+      END IF
+      IF ( INFO == 0 ) THEN
+          ! Compute the minimal and the optimal workspace
+          ! requirements. Simulate running the code and
+          ! determine minimal and optimal sizes of the
+          ! workspace at any moment of the run.
+         IF ( ( N == 0 ) .OR. ( N == 1 ) ) THEN
+             ! All output except K is void. INFO=1 signals
+             ! the void input. In case of a workspace query,
+             ! the minimal workspace lengths are returned.
+            IF ( LQUERY ) THEN
+               IWORK(1) = 1
+               ZWORK(1) = 2
+               ZWORK(2) = 2
+               WORK(1)  = 2
+               WORK(2)  = 2
+            ELSE
+               K = 0
+            END IF
+            INFO = 1
+            RETURN
+         END IF
+
+         MLRWRK = 2
+         MLWORK = 2
+         OLWORK = 2
+         IMINWR = 1
+         MLWQR  = MAX(1,N)  ! Minimal workspace length for ZGEQRF.
+         MLWORK = MAX(MLWORK,MINMN + MLWQR)
+
+         IF ( LQUERY ) THEN
+             CALL ZGEQRF( M, N, F, LDF, ZWORK, ZWORK, -1, &
+                          INFO1 )
+             OLWQR  = INT(ZWORK(1))
+             OLWORK = MAX(OLWORK,MINMN + OLWQR)
+         END IF
+         CALL ZGEDMD( JOBS, JOBVL, JOBR, JOBF, WHTSVD, MINMN,&
+                      N-1, X, LDX, Y, LDY, NRNK, TOL, K,     &
+                      EIGS, Z, LDZ, RES,  B, LDB, V, LDV,    &
+                      S, LDS, ZWORK, -1, WORK, -1, IWORK,&
+                      -1, INFO1 )
+         MLWDMD = INT(ZWORK(1))
+         MLWORK = MAX(MLWORK, MINMN + MLWDMD)
+         MLRWRK = MAX(MLRWRK, INT(WORK(1)))
+         IMINWR = MAX(IMINWR, IWORK(1))
+         IF ( LQUERY ) THEN
+             OLWDMD = INT(ZWORK(2))
+             OLWORK = MAX(OLWORK, MINMN+OLWDMD)
+         END IF
+         IF ( WNTVEC .OR. WNTVCF ) THEN
+            MLWMQR = MAX(1,N)
+            MLWORK = MAX(MLWORK,MINMN+MLWMQR)
+            IF ( LQUERY ) THEN
+               CALL ZUNMQR( 'L','N', M, N, MINMN, F, LDF,  &
+                            ZWORK, Z, LDZ, ZWORK, -1, INFO1 )
+               OLWMQR = INT(ZWORK(1))
+               OLWORK = MAX(OLWORK,MINMN+OLWMQR)
+            END IF
+         END IF
+         IF ( WANTQ ) THEN
+            MLWGQR = MAX(1,N)
+            MLWORK = MAX(MLWORK,MINMN+MLWGQR)
+            IF ( LQUERY ) THEN
+                CALL ZUNGQR( M, MINMN, MINMN, F, LDF, ZWORK, &
+                             ZWORK, -1, INFO1 )
+                OLWGQR = INT(ZWORK(1))
+                OLWORK = MAX(OLWORK,MINMN+OLWGQR)
+            END IF
+         END IF
+         IF ( LIWORK < IMINWR .AND. (.NOT.LQUERY) ) INFO = -34
+         IF ( LWORK  < MLRWRK .AND. (.NOT.LQUERY) ) INFO = -32
+         IF ( LZWORK < MLWORK .AND. (.NOT.LQUERY) ) INFO = -30
+      END IF
+      IF( INFO /= 0 ) THEN
+         CALL XERBLA( 'ZGEDMDQ', -INFO )
+         RETURN
+      ELSE IF ( LQUERY ) THEN
+!     Return minimal and optimal workspace sizes
+          IWORK(1) = IMINWR
+          ZWORK(1) = MLWORK
+          ZWORK(2) = OLWORK
+          WORK(1)  = MLRWRK
+          WORK(2)  = MLRWRK
+          RETURN
+      END IF
+!.....
+!     Initial QR factorization that is used to represent the
+!     snapshots as elements of lower dimensional subspace.
+!     For large scale computation with M >> N, at this place
+!     one can use an out of core QRF.
+!
+      CALL ZGEQRF( M, N, F, LDF, ZWORK,                &
+                   ZWORK(MINMN+1), LZWORK-MINMN, INFO1 )
+!
+!     Define X and Y as the snapshots representations in the
+!     orthogonal basis computed in the QR factorization.
+!     X corresponds to the leading N-1 and Y to the trailing
+!     N-1 snapshots.
+      CALL ZLASET( 'L', MINMN, N-1, ZZERO,  ZZERO, X, LDX )
+      CALL ZLACPY( 'U', MINMN, N-1, F,      LDF, X, LDX )
+      CALL ZLACPY( 'A', MINMN, N-1, F(1,2), LDF, Y, LDY )
+      IF ( M >= 3 ) THEN
+          CALL ZLASET( 'L', MINMN-2, N-2, ZZERO,  ZZERO, &
+                       Y(3,1), LDY )
+      END IF
+!
+!     Compute the DMD of the projected snapshot pairs (X,Y)
+      CALL ZGEDMD( JOBS, JOBVL, JOBR, JOBF, WHTSVD, MINMN, &
+                  N-1,  X, LDX, Y, LDY, NRNK,   TOL, K,    &
+                  EIGS, Z, LDZ, RES, B,  LDB,   V, LDV,    &
+                  S, LDS, ZWORK(MINMN+1), LZWORK-MINMN, &
+                  WORK,   LWORK, IWORK, LIWORK, INFO1 )
+      IF ( INFO1 == 2 .OR. INFO1 == 3 ) THEN
+          ! Return with error code. See ZGEDMD for details.
+          INFO = INFO1
+          RETURN
+      ELSE
+          INFO = INFO1
+      END IF
+!
+!     The Ritz vectors (Koopman modes) can be explicitly
+!     formed or returned in factored form.
+      IF ( WNTVEC ) THEN
+        ! Compute the eigenvectors explicitly.
+        IF ( M > MINMN ) CALL ZLASET( 'A', M-MINMN, K, ZZERO, &
+                                     ZZERO, Z(MINMN+1,1), LDZ )
+        CALL ZUNMQR( 'L','N', M, K, MINMN, F, LDF, ZWORK, Z,  &
+             LDZ, ZWORK(MINMN+1), LZWORK-MINMN, INFO1 )
+      ELSE IF ( WNTVCF ) THEN
+        !   Return the Ritz vectors (eigenvectors) in factored
+        !   form Z*V, where Z contains orthonormal matrix (the
+        !   product of Q from the initial QR factorization and
+        !   the SVD/POD_basis returned by ZGEDMD in X) and the
+        !   second factor (the eigenvectors of the Rayleigh
+        !   quotient) is in the array V, as returned by ZGEDMD.
+        CALL ZLACPY( 'A', N, K, X, LDX, Z, LDZ )
+        IF ( M > N ) CALL ZLASET( 'A', M-N, K, ZZERO, ZZERO, &
+                                 Z(N+1,1), LDZ )
+        CALL ZUNMQR( 'L','N', M, K, MINMN, F, LDF, ZWORK, Z, &
+                    LDZ, ZWORK(MINMN+1), LZWORK-MINMN, INFO1 )
+      END IF
+!
+!     Some optional output variables:
+!
+!     The upper triangular factor R in the initial QR
+!     factorization is optionally returned in the array Y.
+!     This is useful if this call to ZGEDMDQ is to be
+!     followed by a streaming DMD that is implemented in a
+!     QR compressed form.
+      IF ( WNTTRF ) THEN ! Return the upper triangular R in Y
+         CALL ZLASET( 'A', MINMN, N, ZZERO,  ZZERO, Y, LDY )
+         CALL ZLACPY( 'U', MINMN, N, F, LDF,        Y, LDY )
+      END IF
+!
+!     The orthonormal/unitary factor Q in the initial QR
+!     factorization is optionally returned in the array F.
+!     Same as with the triangular factor above, this is
+!     useful in a streaming DMD.
+      IF ( WANTQ ) THEN                   ! Q overwrites F
+         CALL ZUNGQR( M, MINMN, MINMN, F, LDF, ZWORK,     &
+                      ZWORK(MINMN+1), LZWORK-MINMN, INFO1 )
+      END IF
+!
+      RETURN
+!
+      END SUBROUTINE ZGEDMDQ
diff --git a/SRC/zgeequ.f b/SRC/zgeequ.f
index 9575bd6526..4b6f2acf6a 100644
--- a/SRC/zgeequ.f
+++ b/SRC/zgeequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,11 +130,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup geequ
 *
 *  =====================================================================
       SUBROUTINE ZGEEQU( M, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zgeequb.f b/SRC/zgeequb.f
index 74e1f68170..1ce4428f06 100644
--- a/SRC/zgeequb.f
+++ b/SRC/zgeequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -139,11 +137,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup geequb
 *
 *  =====================================================================
       SUBROUTINE ZGEEQUB( M, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zgees.f b/SRC/zgees.f
index 40fe78d345..0402e7c7af 100644
--- a/SRC/zgees.f
+++ b/SRC/zgees.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEES + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgees.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgees.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -189,11 +187,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEeigen
+*> \ingroup gees
 *
 *  =====================================================================
       SUBROUTINE ZGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
      $                  LDVS, WORK, LWORK, RWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -229,7 +228,8 @@ SUBROUTINE ZGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
       DOUBLE PRECISION   DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, XERBLA, ZCOPY, ZGEBAK, ZGEBAL, ZGEHRD,
+      EXTERNAL           XERBLA, ZCOPY, ZGEBAK, ZGEBAL,
+     $                   ZGEHRD,
      $                   ZHSEQR, ZLACPY, ZLASCL, ZTRSEN, ZUNGHR
 *     ..
 *     .. External Functions ..
@@ -251,7 +251,8 @@ SUBROUTINE ZGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
       WANTST = LSAME( SORT, 'S' )
       IF( ( .NOT.WANTVS ) .AND. ( .NOT.LSAME( JOBVS, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
          INFO = -4
@@ -282,12 +283,13 @@ SUBROUTINE ZGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
 *
             CALL ZHSEQR( 'S', JOBVS, N, 1, N, A, LDA, W, VS, LDVS,
      $             WORK, -1, IEVAL )
-            HSWORK = DBLE( WORK( 1 ) )
+            HSWORK = INT( WORK( 1 ) )
 *
             IF( .NOT.WANTVS ) THEN
                MAXWRK = MAX( MAXWRK, HSWORK )
             ELSE
-               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1, 'ZUNGHR',
+               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1,
+     $                       'ZUNGHR',
      $                       ' ', N, 1, N, -1 ) )
                MAXWRK = MAX( MAXWRK, HSWORK )
             END IF
@@ -318,7 +320,6 @@ SUBROUTINE ZGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -362,7 +363,8 @@ SUBROUTINE ZGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
 *        (CWorkspace: need 2*N-1, prefer N+(N-1)*NB)
 *        (RWorkspace: none)
 *
-         CALL ZUNGHR( N, ILO, IHI, VS, LDVS, WORK( ITAU ), WORK( IWRK ),
+         CALL ZUNGHR( N, ILO, IHI, VS, LDVS, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
       END IF
 *
@@ -391,7 +393,8 @@ SUBROUTINE ZGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
 *        (CWorkspace: none)
 *        (RWorkspace: none)
 *
-         CALL ZTRSEN( 'N', JOBVS, BWORK, N, A, LDA, VS, LDVS, W, SDIM,
+         CALL ZTRSEN( 'N', JOBVS, BWORK, N, A, LDA, VS, LDVS, W,
+     $                SDIM,
      $                S, SEP, WORK( IWRK ), LWORK-IWRK+1, ICOND )
       END IF
 *
@@ -401,7 +404,8 @@ SUBROUTINE ZGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
 *        (CWorkspace: none)
 *        (RWorkspace: need N)
 *
-         CALL ZGEBAK( 'P', 'R', N, ILO, IHI, RWORK( IBAL ), N, VS, LDVS,
+         CALL ZGEBAK( 'P', 'R', N, ILO, IHI, RWORK( IBAL ), N, VS,
+     $                LDVS,
      $                IERR )
       END IF
 *
diff --git a/SRC/zgeesx.f b/SRC/zgeesx.f
index ca4f5c9135..a5770aa77e 100644
--- a/SRC/zgeesx.f
+++ b/SRC/zgeesx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEESX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeesx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeesx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -230,12 +228,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEeigen
+*> \ingroup geesx
 *
 *  =====================================================================
-      SUBROUTINE ZGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
+      SUBROUTINE ZGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
+     $                   W,
      $                   VS, LDVS, RCONDE, RCONDV, WORK, LWORK, RWORK,
      $                   BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -273,8 +273,9 @@ SUBROUTINE ZGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
       DOUBLE PRECISION   DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLASCL, XERBLA, ZCOPY, ZGEBAK, ZGEBAL,
-     $                   ZGEHRD, ZHSEQR, ZLACPY, ZLASCL, ZTRSEN, ZUNGHR
+      EXTERNAL           DLASCL, XERBLA, ZCOPY, ZGEBAK, ZGEBAL,
+     $                   ZGEHRD,
+     $                   ZHSEQR, ZLACPY, ZLASCL, ZTRSEN, ZUNGHR
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -300,7 +301,8 @@ SUBROUTINE ZGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
 *
       IF( ( .NOT.WANTVS ) .AND. ( .NOT.LSAME( JOBVS, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -2
       ELSE IF( .NOT.( WANTSN .OR. WANTSE .OR. WANTSV .OR. WANTSB ) .OR.
      $         ( .NOT.WANTST .AND. .NOT.WANTSN ) ) THEN
@@ -337,12 +339,13 @@ SUBROUTINE ZGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
 *
             CALL ZHSEQR( 'S', JOBVS, N, 1, N, A, LDA, W, VS, LDVS,
      $             WORK, -1, IEVAL )
-            HSWORK = DBLE( WORK( 1 ) )
+            HSWORK = INT( WORK( 1 ) )
 *
             IF( .NOT.WANTVS ) THEN
                MAXWRK = MAX( MAXWRK, HSWORK )
             ELSE
-               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1, 'ZUNGHR',
+               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1,
+     $                       'ZUNGHR',
      $                       ' ', N, 1, N, -1 ) )
                MAXWRK = MAX( MAXWRK, HSWORK )
             END IF
@@ -376,7 +379,6 @@ SUBROUTINE ZGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -421,7 +423,8 @@ SUBROUTINE ZGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
 *        (CWorkspace: need 2*N-1, prefer N+(N-1)*NB)
 *        (RWorkspace: none)
 *
-         CALL ZUNGHR( N, ILO, IHI, VS, LDVS, WORK( ITAU ), WORK( IWRK ),
+         CALL ZUNGHR( N, ILO, IHI, VS, LDVS, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
       END IF
 *
@@ -452,7 +455,8 @@ SUBROUTINE ZGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
 *                     otherwise, need none )
 *        (RWorkspace: none)
 *
-         CALL ZTRSEN( SENSE, JOBVS, BWORK, N, A, LDA, VS, LDVS, W, SDIM,
+         CALL ZTRSEN( SENSE, JOBVS, BWORK, N, A, LDA, VS, LDVS, W,
+     $                SDIM,
      $                RCONDE, RCONDV, WORK( IWRK ), LWORK-IWRK+1,
      $                ICOND )
          IF( .NOT.WANTSN )
@@ -471,7 +475,8 @@ SUBROUTINE ZGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
 *        (CWorkspace: none)
 *        (RWorkspace: need N)
 *
-         CALL ZGEBAK( 'P', 'R', N, ILO, IHI, RWORK( IBAL ), N, VS, LDVS,
+         CALL ZGEBAK( 'P', 'R', N, ILO, IHI, RWORK( IBAL ), N, VS,
+     $                LDVS,
      $                IERR )
       END IF
 *
@@ -483,7 +488,8 @@ SUBROUTINE ZGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM, W,
          CALL ZCOPY( N, A, LDA+1, W, 1 )
          IF( ( WANTSV .OR. WANTSB ) .AND. INFO.EQ.0 ) THEN
             DUM( 1 ) = RCONDV
-            CALL DLASCL( 'G', 0, 0, CSCALE, ANRM, 1, 1, DUM, 1, IERR )
+            CALL DLASCL( 'G', 0, 0, CSCALE, ANRM, 1, 1, DUM, 1,
+     $                   IERR )
             RCONDV = DUM( 1 )
          END IF
       END IF
diff --git a/SRC/zgeev.f b/SRC/zgeev.f
index b968900e2f..09ee680acf 100644
--- a/SRC/zgeev.f
+++ b/SRC/zgeev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -172,10 +170,11 @@
 *
 *  @precisions fortran z -> c
 *
-*> \ingroup complex16GEeigen
+*> \ingroup geev
 *
 *  =====================================================================
-      SUBROUTINE ZGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
+      SUBROUTINE ZGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR,
+     $                  LDVR,
      $                  WORK, LWORK, RWORK, INFO )
       implicit none
 *
@@ -212,14 +211,16 @@ SUBROUTINE ZGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
       DOUBLE PRECISION   DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, XERBLA, ZDSCAL, ZGEBAK, ZGEBAL, ZGEHRD,
-     $                   ZHSEQR, ZLACPY, ZLASCL, ZSCAL, ZTREVC3, ZUNGHR
+      EXTERNAL           XERBLA, ZDSCAL, ZGEBAK, ZGEBAL, ZGEHRD,
+     $                   ZHSEQR,
+     $                   ZLACPY, ZLASCL, ZSCAL, ZTREVC3, ZUNGHR
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            IDAMAX, ILAENV
       DOUBLE PRECISION   DLAMCH, DZNRM2, ZLANGE
-      EXTERNAL           LSAME, IDAMAX, ILAENV, DLAMCH, DZNRM2, ZLANGE
+      EXTERNAL           LSAME, IDAMAX, ILAENV, DLAMCH, DZNRM2,
+     $                   ZLANGE
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, DCMPLX, CONJG, AIMAG, MAX, SQRT
@@ -234,7 +235,8 @@ SUBROUTINE ZGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
       WANTVR = LSAME( JOBVR, 'V' )
       IF( ( .NOT.WANTVL ) .AND. ( .NOT.LSAME( JOBVL, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( ( .NOT.WANTVR ) .AND. ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTVR ) .AND.
+     $         ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
          INFO = -3
@@ -265,7 +267,8 @@ SUBROUTINE ZGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
             MAXWRK = N + N*ILAENV( 1, 'ZGEHRD', ' ', N, 1, N, 0 )
             MINWRK = 2*N
             IF( WANTVL ) THEN
-               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1, 'ZUNGHR',
+               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1,
+     $                       'ZUNGHR',
      $                       ' ', N, 1, N, -1 ) )
                CALL ZTREVC3( 'L', 'B', SELECT, N, A, LDA,
      $                       VL, LDVL, VR, LDVR,
@@ -275,7 +278,8 @@ SUBROUTINE ZGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
                CALL ZHSEQR( 'S', 'V', N, 1, N, A, LDA, W, VL, LDVL,
      $                      WORK, -1, INFO )
             ELSE IF( WANTVR ) THEN
-               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1, 'ZUNGHR',
+               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1,
+     $                       'ZUNGHR',
      $                       ' ', N, 1, N, -1 ) )
                CALL ZTREVC3( 'R', 'B', SELECT, N, A, LDA,
      $                       VL, LDVL, VR, LDVR,
@@ -315,7 +319,6 @@ SUBROUTINE ZGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -361,7 +364,8 @@ SUBROUTINE ZGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
 *        (CWorkspace: need 2*N-1, prefer N+(N-1)*NB)
 *        (RWorkspace: none)
 *
-         CALL ZUNGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ), WORK( IWRK ),
+         CALL ZUNGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
 *
 *        Perform QR iteration, accumulating Schur vectors in VL
@@ -393,7 +397,8 @@ SUBROUTINE ZGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
 *        (CWorkspace: need 2*N-1, prefer N+(N-1)*NB)
 *        (RWorkspace: none)
 *
-         CALL ZUNGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ), WORK( IWRK ),
+         CALL ZUNGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
 *
 *        Perform QR iteration, accumulating Schur vectors in VR
@@ -427,7 +432,8 @@ SUBROUTINE ZGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
 *        (RWorkspace: need 2*N)
 *
          IRWORK = IBAL + N
-         CALL ZTREVC3( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR, LDVR,
+         CALL ZTREVC3( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR,
+     $                 LDVR,
      $                 N, NOUT, WORK( IWRK ), LWORK-IWRK+1,
      $                 RWORK( IRWORK ), N, IERR )
       END IF
@@ -438,7 +444,8 @@ SUBROUTINE ZGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
 *        (CWorkspace: none)
 *        (RWorkspace: need N)
 *
-         CALL ZGEBAK( 'B', 'L', N, ILO, IHI, RWORK( IBAL ), N, VL, LDVL,
+         CALL ZGEBAK( 'B', 'L', N, ILO, IHI, RWORK( IBAL ), N, VL,
+     $                LDVL,
      $                IERR )
 *
 *        Normalize left eigenvectors and make largest component real
@@ -463,7 +470,8 @@ SUBROUTINE ZGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
 *        (CWorkspace: none)
 *        (RWorkspace: need N)
 *
-         CALL ZGEBAK( 'B', 'R', N, ILO, IHI, RWORK( IBAL ), N, VR, LDVR,
+         CALL ZGEBAK( 'B', 'R', N, ILO, IHI, RWORK( IBAL ), N, VR,
+     $                LDVR,
      $                IERR )
 *
 *        Normalize right eigenvectors and make largest component real
@@ -486,10 +494,12 @@ SUBROUTINE ZGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
 *
    50 CONTINUE
       IF( SCALEA ) THEN
-         CALL ZLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1, W( INFO+1 ),
+         CALL ZLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1,
+     $                W( INFO+1 ),
      $                MAX( N-INFO, 1 ), IERR )
          IF( INFO.GT.0 ) THEN
-            CALL ZLASCL( 'G', 0, 0, CSCALE, ANRM, ILO-1, 1, W, N, IERR )
+            CALL ZLASCL( 'G', 0, 0, CSCALE, ANRM, ILO-1, 1, W, N,
+     $                   IERR )
          END IF
       END IF
 *
diff --git a/SRC/zgeevx.f b/SRC/zgeevx.f
index 170a0fc765..171ef42ab8 100644
--- a/SRC/zgeevx.f
+++ b/SRC/zgeevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -279,10 +277,11 @@
 *
 *  @precisions fortran z -> c
 *
-*> \ingroup complex16GEeigen
+*> \ingroup geevx
 *
 *  =====================================================================
-      SUBROUTINE ZGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
+      SUBROUTINE ZGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W,
+     $                   VL,
      $                   LDVL, VR, LDVR, ILO, IHI, SCALE, ABNRM, RCONDE,
      $                   RCONDV, WORK, LWORK, RWORK, INFO )
       implicit none
@@ -323,15 +322,17 @@ SUBROUTINE ZGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
       DOUBLE PRECISION   DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLASCL, XERBLA, ZDSCAL, ZGEBAK, ZGEBAL,
-     $                   ZGEHRD, ZHSEQR, ZLACPY, ZLASCL, ZSCAL, ZTREVC3,
-     $                   ZTRSNA, ZUNGHR
+      EXTERNAL           DLASCL, XERBLA, ZDSCAL, ZGEBAK, ZGEBAL,
+     $                   ZGEHRD,
+     $                   ZHSEQR, ZLACPY, ZLASCL, ZSCAL, ZTREVC3, ZTRSNA,
+     $                   ZUNGHR
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            IDAMAX, ILAENV
       DOUBLE PRECISION   DLAMCH, DZNRM2, ZLANGE
-      EXTERNAL           LSAME, IDAMAX, ILAENV, DLAMCH, DZNRM2, ZLANGE
+      EXTERNAL           LSAME, IDAMAX, ILAENV, DLAMCH, DZNRM2,
+     $                   ZLANGE
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, DCMPLX, CONJG, AIMAG, MAX, SQRT
@@ -348,12 +349,15 @@ SUBROUTINE ZGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
       WNTSNE = LSAME( SENSE, 'E' )
       WNTSNV = LSAME( SENSE, 'V' )
       WNTSNB = LSAME( SENSE, 'B' )
-      IF( .NOT.( LSAME( BALANC, 'N' ) .OR. LSAME( BALANC, 'S' ) .OR.
+      IF( .NOT.( LSAME( BALANC, 'N' ) .OR.
+     $    LSAME( BALANC, 'S' ) .OR.
      $    LSAME( BALANC, 'P' ) .OR. LSAME( BALANC, 'B' ) ) ) THEN
          INFO = -1
-      ELSE IF( ( .NOT.WANTVL ) .AND. ( .NOT.LSAME( JOBVL, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTVL ) .AND.
+     $         ( .NOT.LSAME( JOBVL, 'N' ) ) ) THEN
          INFO = -2
-      ELSE IF( ( .NOT.WANTVR ) .AND. ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTVR ) .AND.
+     $         ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( .NOT.( WNTSNN .OR. WNTSNE .OR. WNTSNB .OR. WNTSNV ) .OR.
      $         ( ( WNTSNE .OR. WNTSNB ) .AND. .NOT.( WANTVL .AND.
@@ -405,10 +409,12 @@ SUBROUTINE ZGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
      $                WORK, -1, INFO )
             ELSE
                IF( WNTSNN ) THEN
-                  CALL ZHSEQR( 'E', 'N', N, 1, N, A, LDA, W, VR, LDVR,
+                  CALL ZHSEQR( 'E', 'N', N, 1, N, A, LDA, W, VR,
+     $                         LDVR,
      $                WORK, -1, INFO )
                ELSE
-                  CALL ZHSEQR( 'S', 'N', N, 1, N, A, LDA, W, VR, LDVR,
+                  CALL ZHSEQR( 'S', 'N', N, 1, N, A, LDA, W, VR,
+     $                         LDVR,
      $                WORK, -1, INFO )
                END IF
             END IF
@@ -426,7 +432,8 @@ SUBROUTINE ZGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
                IF( .NOT.( WNTSNN .OR. WNTSNE ) )
      $            MINWRK = MAX( MINWRK, N*N + 2*N )
                MAXWRK = MAX( MAXWRK, HSWORK )
-               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1, 'ZUNGHR',
+               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1,
+     $                       'ZUNGHR',
      $                       ' ', N, 1, N, -1 ) )
                IF( .NOT.( WNTSNN .OR. WNTSNE ) )
      $            MAXWRK = MAX( MAXWRK, N*N + 2*N )
@@ -458,7 +465,6 @@ SUBROUTINE ZGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -508,7 +514,8 @@ SUBROUTINE ZGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
 *        (CWorkspace: need 2*N-1, prefer N+(N-1)*NB)
 *        (RWorkspace: none)
 *
-         CALL ZUNGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ), WORK( IWRK ),
+         CALL ZUNGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
 *
 *        Perform QR iteration, accumulating Schur vectors in VL
@@ -540,7 +547,8 @@ SUBROUTINE ZGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
 *        (CWorkspace: need 2*N-1, prefer N+(N-1)*NB)
 *        (RWorkspace: none)
 *
-         CALL ZUNGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ), WORK( IWRK ),
+         CALL ZUNGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ),
+     $                WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
 *
 *        Perform QR iteration, accumulating Schur vectors in VR
@@ -581,7 +589,8 @@ SUBROUTINE ZGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
 *        (CWorkspace: need 2*N, prefer N + 2*N*NB)
 *        (RWorkspace: need N)
 *
-         CALL ZTREVC3( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR, LDVR,
+         CALL ZTREVC3( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR,
+     $                 LDVR,
      $                 N, NOUT, WORK( IWRK ), LWORK-IWRK+1,
      $                 RWORK, N, IERR )
       END IF
@@ -591,7 +600,8 @@ SUBROUTINE ZGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
 *     (RWorkspace: need 2*N unless SENSE = 'E')
 *
       IF( .NOT.WNTSNN ) THEN
-         CALL ZTRSNA( SENSE, 'A', SELECT, N, A, LDA, VL, LDVL, VR, LDVR,
+         CALL ZTRSNA( SENSE, 'A', SELECT, N, A, LDA, VL, LDVL, VR,
+     $                LDVR,
      $                RCONDE, RCONDV, N, NOUT, WORK( IWRK ), N, RWORK,
      $                ICOND )
       END IF
@@ -646,14 +656,16 @@ SUBROUTINE ZGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W, VL,
 *
    50 CONTINUE
       IF( SCALEA ) THEN
-         CALL ZLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1, W( INFO+1 ),
+         CALL ZLASCL( 'G', 0, 0, CSCALE, ANRM, N-INFO, 1,
+     $                W( INFO+1 ),
      $                MAX( N-INFO, 1 ), IERR )
          IF( INFO.EQ.0 ) THEN
             IF( ( WNTSNV .OR. WNTSNB ) .AND. ICOND.EQ.0 )
      $         CALL DLASCL( 'G', 0, 0, CSCALE, ANRM, N, 1, RCONDV, N,
      $                      IERR )
          ELSE
-            CALL ZLASCL( 'G', 0, 0, CSCALE, ANRM, ILO-1, 1, W, N, IERR )
+            CALL ZLASCL( 'G', 0, 0, CSCALE, ANRM, ILO-1, 1, W, N,
+     $                   IERR )
          END IF
       END IF
 *
diff --git a/SRC/zgehd2.f b/SRC/zgehd2.f
index e4d79f1b83..4250de42b5 100644
--- a/SRC/zgehd2.f
+++ b/SRC/zgehd2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEHD2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgehd2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgehd2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,7 +104,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup gehd2
 *
 *> \par Further Details:
 *  =====================
@@ -146,6 +144,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGEHD2( N, ILO, IHI, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -166,10 +165,9 @@ SUBROUTINE ZGEHD2( N, ILO, IHI, A, LDA, TAU, WORK, INFO )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I
-      COMPLEX*16         ALPHA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARF, ZLARFG
+      EXTERNAL           XERBLA, ZLARF1F, ZLARFG
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DCONJG, MAX, MIN
@@ -197,21 +195,19 @@ SUBROUTINE ZGEHD2( N, ILO, IHI, A, LDA, TAU, WORK, INFO )
 *
 *        Compute elementary reflector H(i) to annihilate A(i+2:ihi,i)
 *
-         ALPHA = A( I+1, I )
-         CALL ZLARFG( IHI-I, ALPHA, A( MIN( I+2, N ), I ), 1, TAU( I ) )
-         A( I+1, I ) = ONE
+         CALL ZLARFG( IHI-I, A( I+1, I ), A( MIN( I+2, N ), I ), 1,
+     $                TAU( I ) )
 *
 *        Apply H(i) to A(1:ihi,i+1:ihi) from the right
 *
-         CALL ZLARF( 'Right', IHI, IHI-I, A( I+1, I ), 1, TAU( I ),
-     $               A( 1, I+1 ), LDA, WORK )
+         CALL ZLARF1F( 'Right', IHI, IHI-I, A( I+1, I ), 1, TAU( I ),
+     $                 A( 1, I+1 ), LDA, WORK )
 *
 *        Apply H(i)**H to A(i+1:ihi,i+1:n) from the left
 *
-         CALL ZLARF( 'Left', IHI-I, N-I, A( I+1, I ), 1,
-     $               DCONJG( TAU( I ) ), A( I+1, I+1 ), LDA, WORK )
+         CALL ZLARF1F( 'Left', IHI-I, N-I, A( I+1, I ), 1,
+     $                 CONJG( TAU( I ) ), A( I+1, I+1 ), LDA, WORK )
 *
-         A( I+1, I ) = ALPHA
    10 CONTINUE
 *
       RETURN
diff --git a/SRC/zgehrd.f b/SRC/zgehrd.f
index e18493cf97..653ade3970 100644
--- a/SRC/zgehrd.f
+++ b/SRC/zgehrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEHRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgehrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgehrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -89,7 +87,7 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (LWORK)
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
@@ -120,7 +118,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup gehrd
 *
 *> \par Further Details:
 *  =====================
@@ -163,7 +161,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE ZGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -173,7 +173,7 @@ SUBROUTINE ZGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
       INTEGER            IHI, ILO, INFO, LDA, LWORK, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16        A( LDA, * ), TAU( * ), WORK( * )
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
@@ -182,7 +182,7 @@ SUBROUTINE ZGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
       INTEGER            NBMAX, LDT, TSIZE
       PARAMETER          ( NBMAX = 64, LDT = NBMAX+1,
      $                     TSIZE = LDT*NBMAX )
-      COMPLEX*16        ZERO, ONE
+      COMPLEX*16         ZERO, ONE
       PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
      $                     ONE = ( 1.0D+0, 0.0D+0 ) )
 *     ..
@@ -190,10 +190,11 @@ SUBROUTINE ZGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
       LOGICAL            LQUERY
       INTEGER            I, IB, IINFO, IWT, J, LDWORK, LWKOPT, NB,
      $                   NBMIN, NH, NX
-      COMPLEX*16        EI
+      COMPLEX*16         EI
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZAXPY, ZGEHD2, ZGEMM, ZLAHR2, ZLARFB, ZTRMM,
+      EXTERNAL           ZAXPY, ZGEHD2, ZGEMM, ZLAHR2, ZLARFB,
+     $                   ZTRMM,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -221,12 +222,18 @@ SUBROUTINE ZGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -8
       END IF
 *
+      NH = IHI - ILO + 1
       IF( INFO.EQ.0 ) THEN
 *
 *        Compute the workspace requirements
 *
-         NB = MIN( NBMAX, ILAENV( 1, 'ZGEHRD', ' ', N, ILO, IHI, -1 ) )
-         LWKOPT = N*NB + TSIZE
+         IF( NH.LE.1 ) THEN
+            LWKOPT = 1
+         ELSE
+            NB = MIN( NBMAX, ILAENV( 1, 'ZGEHRD', ' ', N, ILO, IHI,
+     $                              -1 ) )
+            LWKOPT = N*NB + TSIZE
+         END IF
          WORK( 1 ) = LWKOPT
       ENDIF
 *
@@ -248,7 +255,6 @@ SUBROUTINE ZGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *     Quick return if possible
 *
-      NH = IHI - ILO + 1
       IF( NH.LE.1 ) THEN
          WORK( 1 ) = 1
          RETURN
@@ -268,7 +274,7 @@ SUBROUTINE ZGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *           Determine if workspace is large enough for blocked code
 *
-            IF( LWORK.LT.N*NB+TSIZE ) THEN
+            IF( LWORK.LT.LWKOPT ) THEN
 *
 *              Not enough workspace to use optimal NB:  determine the
 *              minimum value of NB, and reduce NB or force use of
diff --git a/SRC/zgejsv.f b/SRC/zgejsv.f
index 0c2226f9f0..c76e0a9b36 100644
--- a/SRC/zgejsv.f
+++ b/SRC/zgejsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEJSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgejsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgejsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -21,9 +19,9 @@
 *     SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *                         M, N, A, LDA, SVA, U, LDU, V, LDV,
 *                         CWORK, LWORK, RWORK, LRWORK, IWORK, INFO )
+*     IMPLICIT NONE
 *
 *     .. Scalar Arguments ..
-*     IMPLICIT    NONE
 *     INTEGER     INFO, LDA, LDU, LDV, LWORK, M, N
 *     ..
 *     .. Array Arguments ..
@@ -52,10 +50,10 @@
 *> are computed and stored in the arrays U and V, respectively. The diagonal
 *> of [SIGMA] is computed and stored in the array SVA.
 *> \endverbatim
-*>
-*>  Arguments:
-*>  ==========
-*>
+*
+*  Arguments:
+*  ==========
+*
 *> \param[in] JOBA
 *> \verbatim
 *>          JOBA is CHARACTER*1
@@ -151,7 +149,7 @@
 *>         transposed A if A^* seems to be better with respect to convergence.
 *>         If the matrix is not square, JOBT is ignored. 
 *>         The decision is based on two values of entropy over the adjoint
-*>         orbit of A^* * A. See the descriptions of WORK(6) and WORK(7).
+*>         orbit of A^* * A. See the descriptions of RWORK(6) and RWORK(7).
 *>       = 'T': transpose if entropy test indicates possibly faster
 *>         convergence of Jacobi process if A^* is taken as input. If A is
 *>         replaced with A^*, then the row pivoting is included automatically.
@@ -209,11 +207,11 @@
 *> \verbatim
 *>          SVA is DOUBLE PRECISION array, dimension (N)
 *>          On exit,
-*>          - For WORK(1)/WORK(2) = ONE: The singular values of A. During the
-*>            computation SVA contains Euclidean column norms of the
+*>          - For RWORK(1)/RWORK(2) = ONE: The singular values of A. During
+*>            the computation SVA contains Euclidean column norms of the
 *>            iterated matrices in the array A.
-*>          - For WORK(1) .NE. WORK(2): The singular values of A are
-*>            (WORK(1)/WORK(2)) * SVA(1:N). This factored form is used if
+*>          - For RWORK(1) .NE. RWORK(2): The singular values of A are
+*>            (RWORK(1)/RWORK(2)) * SVA(1:N). This factored form is used if
 *>            sigma_max(A) overflows or if small singular values have been
 *>            saved from underflow by scaling the input matrix A.
 *>          - If JOBR='R' then some of the singular values may be returned
@@ -252,7 +250,7 @@
 *>          If JOBV = 'V', 'J' then V contains on exit the N-by-N matrix of
 *>                         the right singular vectors;
 *>          If JOBV = 'W', AND (JOBU = 'U' AND JOBT = 'T' AND M = N),
-*>                         then V is used as workspace if the pprocedure
+*>                         then V is used as workspace if the procedure
 *>                         replaces A with A^*. In that case, [U] is computed
 *>                         in V as right singular vectors of A^* and then
 *>                         copied back to the U array. This 'W' option is just
@@ -304,7 +302,7 @@
 *>            -> the minimal requirement is LWORK >= 3*N.
 *>            -> For optimal performance, 
 *>               LWORK >= max(N+(N+1)*NB, 2*N+N*NB)=2*N+N*NB,
-*>               where NB is the optimal block size for ZGEQP3, ZGEQRF, ZGELQ,
+*>               where NB is the optimal block size for ZGEQP3, ZGEQRF, ZGELQF,
 *>               ZUNMLQ. In general, the optimal length LWORK is computed as
 *>               LWORK >= max(N+LWORK(ZGEQP3), N+LWORK(ZGESVJ),
 *>                       N+LWORK(ZGELQF), 2*N+LWORK(ZGEQRF), N+LWORK(ZUNMLQ)).
@@ -313,7 +311,7 @@
 *>            -> the minimal requirement is LWORK >= 3*N.      
 *>            -> For optimal performance, 
 *>               LWORK >= max(N+(N+1)*NB, 2*N,2*N+N*NB)=2*N+N*NB,
-*>               where NB is the optimal block size for ZGEQP3, ZGEQRF, ZGELQ,
+*>               where NB is the optimal block size for ZGEQP3, ZGEQRF, ZGELQF,
 *>               ZUNMLQ. In general, the optimal length LWORK is computed as
 *>               LWORK >= max(N+LWORK(ZGEQP3), LWORK(ZPOCON), N+LWORK(ZGESVJ),
 *>                       N+LWORK(ZGELQF), 2*N+LWORK(ZGEQRF), N+LWORK(ZUNMLQ)).   
@@ -349,7 +347,7 @@
 *>
 *> \param[out] RWORK
 *> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension (MAX(7,LWORK))
+*>          RWORK is DOUBLE PRECISION array, dimension (MAX(7,LRWORK))
 *>          On exit,
 *>          RWORK(1) = Determines the scaling factor SCALE = RWORK(2) / RWORK(1)
 *>                    such that SCALE*SVA(1:N) are the computed singular values
@@ -483,7 +481,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEsing
+*> \ingroup gejsv
 *
 *> \par Further Details:
 *  =====================
@@ -566,13 +564,13 @@
       SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
      $                   M, N, A, LDA, SVA, U, LDU, V, LDV,
      $                   CWORK, LWORK, RWORK, LRWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
 *     .. Scalar Arguments ..
-      IMPLICIT    NONE
       INTEGER     INFO, LDA, LDU, LDV, LWORK, LRWORK, M, N
 *     ..
 *     .. Array Arguments ..
@@ -623,10 +621,10 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
       EXTERNAL  IDAMAX, IZAMAX, LSAME, DLAMCH, DZNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL  DLASSQ, ZCOPY,  ZGELQF, ZGEQP3, ZGEQRF, ZLACPY, ZLAPMR,
-     $          ZLASCL, DLASCL, ZLASET, ZLASSQ, ZLASWP, ZUNGQR, ZUNMLQ,
-     $          ZUNMQR, ZPOCON, DSCAL,  ZDSCAL, ZSWAP,  ZTRSM,  ZLACGV,
-     $          XERBLA
+      EXTERNAL  DLASSQ, ZCOPY,  ZGELQF, ZGEQP3, ZGEQRF, ZLACPY,
+     $          ZLAPMR, ZLASCL, DLASCL, ZLASET, ZLASSQ, ZLASWP,
+     $          ZUNGQR, ZUNMLQ, ZUNMQR, ZPOCON, DSCAL,  ZDSCAL,
+     $          ZSWAP,  ZTRSM,  ZLACGV, XERBLA
 *
       EXTERNAL  ZGESVJ
 *     ..
@@ -658,7 +656,8 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
          INFO = - 3
       ELSE IF ( .NOT. ( L2KILL .OR. DEFR ) )    THEN
          INFO = - 4
-      ELSE IF ( .NOT. ( LSAME(JOBT,'T') .OR. LSAME(JOBT,'N') ) ) THEN
+      ELSE IF ( .NOT. ( LSAME(JOBT,'T') .OR.
+     $          LSAME(JOBT,'N') ) ) THEN
          INFO = - 5
       ELSE IF ( .NOT. ( L2PERT .OR. LSAME( JOBP, 'N' ) ) ) THEN
          INFO = - 6
@@ -707,11 +706,11 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
           IF ( LQUERY ) THEN 
               CALL ZGEQP3( M, N, A, LDA, IWORK, CDUMMY, CDUMMY, -1, 
      $             RDUMMY, IERR )
-              LWRK_ZGEQP3 = DBLE( CDUMMY(1) )
+              LWRK_ZGEQP3 = INT( CDUMMY(1) )
               CALL ZGEQRF( N, N, A, LDA, CDUMMY, CDUMMY,-1, IERR )
-              LWRK_ZGEQRF = DBLE( CDUMMY(1) )
+              LWRK_ZGEQRF = INT( CDUMMY(1) )
               CALL ZGELQF( N, N, A, LDA, CDUMMY, CDUMMY,-1, IERR )
-              LWRK_ZGELQF = DBLE( CDUMMY(1) )
+              LWRK_ZGELQF = INT( CDUMMY(1) )
           END IF
           MINWRK  = 2
           OPTWRK  = 2
@@ -725,9 +724,10 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                   MINWRK = MAX( N+LWQP3, N+LWQRF, LWSVDJ )
               END IF
               IF ( LQUERY ) THEN 
-                  CALL ZGESVJ( 'L', 'N', 'N', N, N, A, LDA, SVA, N, V, 
+                  CALL ZGESVJ( 'L', 'N', 'N', N, N, A, LDA, SVA, N,
+     $                         V,
      $                 LDV, CDUMMY, -1, RDUMMY, -1, IERR )
-                  LWRK_ZGESVJ = DBLE( CDUMMY(1) )
+                  LWRK_ZGESVJ = INT( CDUMMY(1) )
                   IF ( ERREST ) THEN 
                       OPTWRK = MAX( N+LWRK_ZGEQP3, N**2+LWCON, 
      $                              N+LWRK_ZGEQRF, LWRK_ZGESVJ )
@@ -763,10 +763,10 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
              IF ( LQUERY ) THEN
                  CALL ZGESVJ( 'L', 'U', 'N', N,N, U, LDU, SVA, N, A,
      $                LDA, CDUMMY, -1, RDUMMY, -1, IERR )
-                 LWRK_ZGESVJ = DBLE( CDUMMY(1) )
+                 LWRK_ZGESVJ = INT( CDUMMY(1) )
                  CALL ZUNMLQ( 'L', 'C', N, N, N, A, LDA, CDUMMY,
      $                V, LDV, CDUMMY, -1, IERR )
-                 LWRK_ZUNMLQ = DBLE( CDUMMY(1) )
+                 LWRK_ZUNMLQ = INT( CDUMMY(1) )
                  IF ( ERREST ) THEN 
                  OPTWRK = MAX( N+LWRK_ZGEQP3, LWCON, LWRK_ZGESVJ, 
      $                         N+LWRK_ZGELQF, 2*N+LWRK_ZGEQRF,
@@ -802,10 +802,10 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
              IF ( LQUERY ) THEN
                  CALL ZGESVJ( 'L', 'U', 'N', N,N, U, LDU, SVA, N, A,
      $                LDA, CDUMMY, -1, RDUMMY, -1, IERR )
-                 LWRK_ZGESVJ = DBLE( CDUMMY(1) )
+                 LWRK_ZGESVJ = INT( CDUMMY(1) )
                  CALL ZUNMQR( 'L', 'N', M, N, N, A, LDA, CDUMMY, U,
      $               LDU, CDUMMY, -1, IERR )
-                 LWRK_ZUNMQRM = DBLE( CDUMMY(1) )
+                 LWRK_ZUNMQRM = INT( CDUMMY(1) )
                  IF ( ERREST ) THEN
                  OPTWRK = N + MAX( LWRK_ZGEQP3, LWCON, N+LWRK_ZGEQRF,
      $                             LWRK_ZGESVJ, LWRK_ZUNMQRM )
@@ -864,26 +864,27 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
              IF ( LQUERY ) THEN
                  CALL ZUNMQR( 'L', 'N', M, N, N, A, LDA, CDUMMY, U,
      $                LDU, CDUMMY, -1, IERR )
-                 LWRK_ZUNMQRM = DBLE( CDUMMY(1) )
+                 LWRK_ZUNMQRM = INT( CDUMMY(1) )
                  CALL ZUNMQR( 'L', 'N', N, N, N, A, LDA, CDUMMY, U,
      $                LDU, CDUMMY, -1, IERR )
-                 LWRK_ZUNMQR = DBLE( CDUMMY(1) )
+                 LWRK_ZUNMQR = INT( CDUMMY(1) )
                  IF ( .NOT. JRACC ) THEN
-                     CALL ZGEQP3( N,N, A, LDA, IWORK, CDUMMY,CDUMMY, -1,
+                     CALL ZGEQP3( N,N, A, LDA, IWORK, CDUMMY,CDUMMY,
+     $                            -1,
      $                    RDUMMY, IERR )
-                     LWRK_ZGEQP3N = DBLE( CDUMMY(1) )
+                     LWRK_ZGEQP3N = INT( CDUMMY(1) )
                      CALL ZGESVJ( 'L', 'U', 'N', N, N, U, LDU, SVA,
      $                    N, V, LDV, CDUMMY, -1, RDUMMY, -1, IERR )
-                     LWRK_ZGESVJ = DBLE( CDUMMY(1) )
+                     LWRK_ZGESVJ = INT( CDUMMY(1) )
                      CALL ZGESVJ( 'U', 'U', 'N', N, N, U, LDU, SVA,
      $                    N, V, LDV, CDUMMY, -1, RDUMMY, -1, IERR )
-                     LWRK_ZGESVJU = DBLE( CDUMMY(1) )
+                     LWRK_ZGESVJU = INT( CDUMMY(1) )
                      CALL ZGESVJ( 'L', 'U', 'V', N, N, U, LDU, SVA,
      $                    N, V, LDV, CDUMMY, -1, RDUMMY, -1, IERR )
-                     LWRK_ZGESVJV = DBLE( CDUMMY(1) )
+                     LWRK_ZGESVJV = INT( CDUMMY(1) )
                      CALL ZUNMLQ( 'L', 'C', N, N, N, A, LDA, CDUMMY,
      $                    V, LDV, CDUMMY, -1, IERR )
-                     LWRK_ZUNMLQ = DBLE( CDUMMY(1) )
+                     LWRK_ZUNMLQ = INT( CDUMMY(1) )
                      IF ( ERREST ) THEN 
                        OPTWRK = MAX( N+LWRK_ZGEQP3, N+LWCON, 
      $                          2*N+N**2+LWCON, 2*N+LWRK_ZGEQRF, 
@@ -912,13 +913,15 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                  ELSE
                      CALL ZGESVJ( 'L', 'U', 'V', N, N, U, LDU, SVA,
      $                    N, V, LDV, CDUMMY, -1, RDUMMY, -1, IERR )
-                     LWRK_ZGESVJV = DBLE( CDUMMY(1) )
-                     CALL ZUNMQR( 'L', 'N', N, N, N, CDUMMY, N, CDUMMY,
+                     LWRK_ZGESVJV = INT( CDUMMY(1) )
+                     CALL ZUNMQR( 'L', 'N', N, N, N, CDUMMY, N,
+     $                            CDUMMY,
      $                    V, LDV, CDUMMY, -1, IERR )
-                     LWRK_ZUNMQR = DBLE( CDUMMY(1) )
-                     CALL ZUNMQR( 'L', 'N', M, N, N, A, LDA, CDUMMY, U,
+                     LWRK_ZUNMQR = INT( CDUMMY(1) )
+                     CALL ZUNMQR( 'L', 'N', M, N, N, A, LDA, CDUMMY,
+     $                            U,
      $                    LDU, CDUMMY, -1, IERR )
-                     LWRK_ZUNMQRM = DBLE( CDUMMY(1) )
+                     LWRK_ZUNMQRM = INT( CDUMMY(1) )
                      IF ( ERREST ) THEN 
                         OPTWRK = MAX( N+LWRK_ZGEQP3, N+LWCON,   
      $                           2*N+LWRK_ZGEQRF, 2*N+N**2,  
@@ -1064,8 +1067,10 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
             CALL ZLACPY( 'A', M, 1, A, LDA, U, LDU )
 *           computing all M left singular vectors of the M x 1 matrix
             IF ( N1 .NE. N  ) THEN
-              CALL ZGEQRF( M, N, U,LDU, CWORK, CWORK(N+1),LWORK-N,IERR )
-              CALL ZUNGQR( M,N1,1, U,LDU,CWORK,CWORK(N+1),LWORK-N,IERR )
+              CALL ZGEQRF( M, N, U,LDU, CWORK, CWORK(N+1),LWORK-N,
+     $                     IERR )
+              CALL ZUNGQR( M,N1,1, U,LDU,CWORK,CWORK(N+1),LWORK-N,
+     $                     IERR )
               CALL ZCOPY( M, A(1,1), 1, U(1,1), 1 )
             END IF
          END IF
@@ -1495,7 +1500,8 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *
 *            .. second preconditioning using the QR factorization
 *
-            CALL ZGEQRF( N,NR, A,LDA, CWORK, CWORK(N+1),LWORK-N, IERR )
+            CALL ZGEQRF( N,NR, A,LDA, CWORK, CWORK(N+1),LWORK-N,
+     $                   IERR )
 *
 *           .. and transpose upper to lower triangular
             DO 1948 p = 1, NR - 1
@@ -1522,7 +1528,8 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
  1949             CONTINUE
  1947          CONTINUE
             ELSE
-               CALL ZLASET( 'U', NR-1, NR-1, CZERO, CZERO, A(1,2), LDA )
+               CALL ZLASET( 'U', NR-1, NR-1, CZERO, CZERO, A(1,2),
+     $                      LDA )
             END IF
 *
 *           .. and one-sided Jacobi rotations are started on a lower
@@ -1562,7 +1569,8 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *        accumulated product of Jacobi rotations, three are perfect )
 *
             CALL ZLASET( 'L', NR-1,NR-1, CZERO, CZERO, A(2,1), LDA )
-            CALL ZGELQF( NR,N, A, LDA, CWORK, CWORK(N+1), LWORK-N, IERR)
+            CALL ZGELQF( NR,N, A, LDA, CWORK, CWORK(N+1), LWORK-N,
+     $                   IERR)
             CALL ZLACPY( 'L', NR, NR, A, LDA, V, LDV )
             CALL ZLASET( 'U', NR-1,NR-1, CZERO, CZERO, V(1,2), LDV )
             CALL ZGEQRF( NR, NR, V, LDV, CWORK(N+1), CWORK(2*N+1),
@@ -1578,9 +1586,12 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
             SCALEM  = RWORK(1)
             NUMRANK = NINT(RWORK(2))
             IF ( NR .LT. N ) THEN
-               CALL ZLASET( 'A',N-NR, NR, CZERO,CZERO, V(NR+1,1),  LDV )
-               CALL ZLASET( 'A',NR, N-NR, CZERO,CZERO, V(1,NR+1),  LDV )
-               CALL ZLASET( 'A',N-NR,N-NR,CZERO,CONE, V(NR+1,NR+1),LDV )
+               CALL ZLASET( 'A',N-NR, NR, CZERO,CZERO, V(NR+1,1),
+     $                      LDV )
+               CALL ZLASET( 'A',NR, N-NR, CZERO,CZERO, V(1,NR+1),
+     $                      LDV )
+               CALL ZLASET( 'A',N-NR,N-NR,CZERO,CONE, V(NR+1,NR+1),
+     $                      LDV )
             END IF
 *
          CALL ZUNMLQ( 'L', 'C', N, N, NR, A, LDA, CWORK,
@@ -1635,10 +1646,13 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
          NUMRANK = NINT(RWORK(2))
 *
          IF ( NR .LT. M ) THEN
-            CALL ZLASET( 'A',  M-NR, NR,CZERO, CZERO, U(NR+1,1), LDU )
+            CALL ZLASET( 'A',  M-NR, NR,CZERO, CZERO, U(NR+1,1),
+     $                   LDU )
             IF ( NR .LT. N1 ) THEN
-               CALL ZLASET( 'A',NR, N1-NR, CZERO, CZERO, U(1,NR+1),LDU )
-               CALL ZLASET( 'A',M-NR,N1-NR,CZERO,CONE,U(NR+1,NR+1),LDU )
+               CALL ZLASET( 'A',NR, N1-NR, CZERO, CZERO, U(1,NR+1),
+     $                      LDU )
+               CALL ZLASET( 'A',M-NR,N1-NR,CZERO,CONE,U(NR+1,NR+1),
+     $                      LDU )
             END IF
          END IF
 *
@@ -1702,7 +1716,8 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
  2968             CONTINUE
  2969          CONTINUE
             ELSE
-               CALL ZLASET( 'U', NR-1, NR-1, CZERO, CZERO, V(1,2), LDV )
+               CALL ZLASET( 'U', NR-1, NR-1, CZERO, CZERO, V(1,2),
+     $                      LDV )
             END IF
 *
 *           Estimate the row scaled condition number of R1
@@ -1811,7 +1826,8 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                CALL ZLACPY( 'L',NR,NR,V,LDV,CWORK(2*N+N*NR+NR+1),NR )
                DO 4950 p = 1, NR
                   TEMP1 = DZNRM2( p, CWORK(2*N+N*NR+NR+p), NR )
-                  CALL ZDSCAL( p, ONE/TEMP1, CWORK(2*N+N*NR+NR+p), NR )
+                  CALL ZDSCAL( p, ONE/TEMP1, CWORK(2*N+N*NR+NR+p),
+     $                         NR )
  4950          CONTINUE
                CALL ZPOCON( 'L',NR,CWORK(2*N+N*NR+NR+1),NR,ONE,TEMP1,
      $              CWORK(2*N+N*NR+NR+NR*NR+1),RWORK,IERR )
@@ -1821,7 +1837,7 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                IF ( CONDR2 .GE. COND_OK ) THEN
 *                 .. save the Householder vectors used for Q3
 *                 (this overwrites the copy of R2, as it will not be
-*                 needed in this branch, but it does not overwritte the
+*                 needed in this branch, but it does not overwrite the
 *                 Huseholder vectors of Q2.).
                   CALL ZLACPY( 'U', NR, NR, V, LDV, CWORK(2*N+1), N )
 *                 .. and the rest of the information on Q3 is in
@@ -1840,11 +1856,12 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
  4969             CONTINUE
  4968          CONTINUE
             ELSE
-               CALL ZLASET( 'U', NR-1,NR-1, CZERO,CZERO, V(1,2), LDV )
+               CALL ZLASET( 'U', NR-1,NR-1, CZERO,CZERO, V(1,2),
+     $                      LDV )
             END IF
 *
 *        Second preconditioning finished; continue with Jacobi SVD
-*        The input matrix is lower trinagular.
+*        The input matrix is lower triangular.
 *
 *        Recover the right singular vectors as solution of a well
 *        conditioned triangular matrix equation.
@@ -1868,7 +1885,8 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *                 equation is Q2*V2 = the product of the Jacobi rotations
 *                 used in ZGESVJ, premultiplied with the orthogonal matrix
 *                 from the second QR factorization.
-                  CALL ZTRSM('L','U','N','N', NR,NR,CONE, A,LDA, V,LDV)
+                  CALL ZTRSM('L','U','N','N', NR,NR,CONE, A,LDA, V,
+     $                        LDV)
                ELSE
 *                 .. R1 is well conditioned, but non-square. Adjoint of R2
 *                 is inverted to get the product of the Jacobi rotations
@@ -1879,19 +1897,22 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
                   IF ( NR .LT. N ) THEN
                   CALL ZLASET('A',N-NR,NR,CZERO,CZERO,V(NR+1,1),LDV)
                   CALL ZLASET('A',NR,N-NR,CZERO,CZERO,V(1,NR+1),LDV)
-                  CALL ZLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),LDV)
+                  CALL ZLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),
+     $                         LDV)
                   END IF
-                  CALL ZUNMQR('L','N',N,N,NR,CWORK(2*N+1),N,CWORK(N+1),
+                  CALL ZUNMQR('L','N',N,N,NR,CWORK(2*N+1),N,
+     $                         CWORK(N+1),
      $                V,LDV,CWORK(2*N+N*NR+NR+1),LWORK-2*N-N*NR-NR,IERR)
                END IF
 *
             ELSE IF ( CONDR2 .LT. COND_OK ) THEN
 *
 *              The matrix R2 is inverted. The solution of the matrix equation
-*              is Q3^* * V3 = the product of the Jacobi rotations (appplied to
+*              is Q3^* * V3 = the product of the Jacobi rotations (applied to
 *              the lower triangular L3 from the LQ factorization of
 *              R2=L3*Q3), pre-multiplied with the transposed Q3.
-               CALL ZGESVJ( 'L', 'U', 'N', NR, NR, V, LDV, SVA, NR, U,
+               CALL ZGESVJ( 'L', 'U', 'N', NR, NR, V, LDV, SVA, NR,
+     $                      U,
      $              LDU, CWORK(2*N+N*NR+NR+1), LWORK-2*N-N*NR-NR,
      $              RWORK, LRWORK, INFO )
                SCALEM  = RWORK(1)
@@ -1912,9 +1933,12 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
  874              CONTINUE
  873           CONTINUE
                IF ( NR .LT. N ) THEN
-                  CALL ZLASET( 'A',N-NR,NR,CZERO,CZERO,V(NR+1,1),LDV )
-                  CALL ZLASET( 'A',NR,N-NR,CZERO,CZERO,V(1,NR+1),LDV )
-                  CALL ZLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),LDV)
+                  CALL ZLASET( 'A',N-NR,NR,CZERO,CZERO,V(NR+1,1),
+     $                         LDV )
+                  CALL ZLASET( 'A',NR,N-NR,CZERO,CZERO,V(1,NR+1),
+     $                         LDV )
+                  CALL ZLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),
+     $                         LDV)
                END IF
                CALL ZUNMQR( 'L','N',N,N,NR,CWORK(2*N+1),N,CWORK(N+1),
      $              V,LDV,CWORK(2*N+N*NR+NR+1),LWORK-2*N-N*NR-NR,IERR )
@@ -1930,15 +1954,19 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *              defense ensures that ZGEJSV completes the task.
 *              Compute the full SVD of L3 using ZGESVJ with explicit
 *              accumulation of Jacobi rotations.
-               CALL ZGESVJ( 'L', 'U', 'V', NR, NR, V, LDV, SVA, NR, U,
+               CALL ZGESVJ( 'L', 'U', 'V', NR, NR, V, LDV, SVA, NR,
+     $                      U,
      $              LDU, CWORK(2*N+N*NR+NR+1), LWORK-2*N-N*NR-NR,
      $                         RWORK, LRWORK, INFO )
                SCALEM  = RWORK(1)
                NUMRANK = NINT(RWORK(2))
                IF ( NR .LT. N ) THEN
-                  CALL ZLASET( 'A',N-NR,NR,CZERO,CZERO,V(NR+1,1),LDV )
-                  CALL ZLASET( 'A',NR,N-NR,CZERO,CZERO,V(1,NR+1),LDV )
-                  CALL ZLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),LDV)
+                  CALL ZLASET( 'A',N-NR,NR,CZERO,CZERO,V(NR+1,1),
+     $                         LDV )
+                  CALL ZLASET( 'A',NR,N-NR,CZERO,CZERO,V(1,NR+1),
+     $                         LDV )
+                  CALL ZLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),
+     $                         LDV)
                END IF
                CALL ZUNMQR( 'L','N',N,N,NR,CWORK(2*N+1),N,CWORK(N+1),
      $              V,LDV,CWORK(2*N+N*NR+NR+1),LWORK-2*N-N*NR-NR,IERR )
@@ -1976,7 +2004,8 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *           At this moment, V contains the right singular vectors of A.
 *           Next, assemble the left singular vector matrix U (M x N).
             IF ( NR .LT. M ) THEN
-               CALL ZLASET('A', M-NR, NR, CZERO, CZERO, U(NR+1,1), LDU)
+               CALL ZLASET('A', M-NR, NR, CZERO, CZERO, U(NR+1,1),
+     $                      LDU)
                IF ( NR .LT. N1 ) THEN
                   CALL ZLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),LDU)
                   CALL ZLASET('A',M-NR,N1-NR,CZERO,CONE,
@@ -2050,10 +2079,13 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *           Assemble the left singular vector matrix U (M x N).
 *
             IF ( N .LT. M ) THEN
-               CALL ZLASET( 'A',  M-N, N, CZERO, CZERO, U(N+1,1), LDU )
+               CALL ZLASET( 'A',  M-N, N, CZERO, CZERO, U(N+1,1),
+     $                      LDU )
                IF ( N .LT. N1 ) THEN
-                  CALL ZLASET('A',N,  N1-N, CZERO, CZERO,  U(1,N+1),LDU)
-                  CALL ZLASET( 'A',M-N,N1-N, CZERO, CONE,U(N+1,N+1),LDU)
+                  CALL ZLASET('A',N,  N1-N, CZERO, CZERO,  U(1,N+1),
+     $                         LDU)
+                  CALL ZLASET( 'A',M-N,N1-N, CZERO, CONE,U(N+1,N+1),
+     $                         LDU)
                END IF
             END IF
             CALL ZUNMQR( 'L', 'N', M, N1, N, A, LDA, CWORK, U,
@@ -2165,10 +2197,13 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *           Next, assemble the left singular vector matrix U (M x N).
 *
          IF ( NR .LT. M ) THEN
-            CALL ZLASET( 'A',  M-NR, NR, CZERO, CZERO, U(NR+1,1), LDU )
+            CALL ZLASET( 'A',  M-NR, NR, CZERO, CZERO, U(NR+1,1),
+     $                   LDU )
             IF ( NR .LT. N1 ) THEN
-               CALL ZLASET('A',NR,  N1-NR, CZERO, CZERO,  U(1,NR+1),LDU)
-               CALL ZLASET('A',M-NR,N1-NR, CZERO, CONE,U(NR+1,NR+1),LDU)
+               CALL ZLASET('A',NR,  N1-NR, CZERO, CZERO,  U(1,NR+1),
+     $                      LDU)
+               CALL ZLASET('A',M-NR,N1-NR, CZERO, CONE,U(NR+1,NR+1),
+     $                      LDU)
             END IF
          END IF
 *
@@ -2193,7 +2228,8 @@ SUBROUTINE ZGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
 *     Undo scaling, if necessary (and possible)
 *
       IF ( USCAL2 .LE. (BIG/SVA(1))*USCAL1 ) THEN
-         CALL DLASCL( 'G', 0, 0, USCAL1, USCAL2, NR, 1, SVA, N, IERR )
+         CALL DLASCL( 'G', 0, 0, USCAL1, USCAL2, NR, 1, SVA, N,
+     $                IERR )
          USCAL1 = ONE
          USCAL2 = ONE
       END IF
diff --git a/SRC/zgelq.f b/SRC/zgelq.f
index de7c9a3784..fc5bceb5fa 100644
--- a/SRC/zgelq.f
+++ b/SRC/zgelq.f
@@ -98,7 +98,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1 or -2, then a workspace query is assumed. The routine
 *>          only calculates the sizes of the T and WORK arrays, returns these
 *>          values as the first entries of the T and WORK arrays, and no error
@@ -166,9 +166,12 @@
 *>  the LQ factorization.
 *> \endverbatim
 *>
+*> \ingroup gelq
+*>
 *  =====================================================================
       SUBROUTINE ZGELQ( M, N, A, LDA, T, TSIZE, WORK, LWORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zgelq2.f b/SRC/zgelq2.f
index 7604556a5f..19bac3142d 100644
--- a/SRC/zgelq2.f
+++ b/SRC/zgelq2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGELQ2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgelq2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgelq2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -104,7 +102,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup gelq2
 *
 *> \par Further Details:
 *  =====================
@@ -126,6 +124,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGELQ2( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -146,10 +145,9 @@ SUBROUTINE ZGELQ2( M, N, A, LDA, TAU, WORK, INFO )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      COMPLEX*16         ALPHA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLACGV, ZLARF, ZLARFG
+      EXTERNAL           XERBLA, ZLACGV, ZLARF1F, ZLARFG
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -178,18 +176,16 @@ SUBROUTINE ZGELQ2( M, N, A, LDA, TAU, WORK, INFO )
 *        Generate elementary reflector H(i) to annihilate A(i,i+1:n)
 *
          CALL ZLACGV( N-I+1, A( I, I ), LDA )
-         ALPHA = A( I, I )
-         CALL ZLARFG( N-I+1, ALPHA, A( I, MIN( I+1, N ) ), LDA,
+         CALL ZLARFG( N-I+1, A( I, I ), A( I, MIN( I+1, N ) ), LDA,
      $                TAU( I ) )
          IF( I.LT.M ) THEN
 *
 *           Apply H(i) to A(i+1:m,i:n) from the right
 *
-            A( I, I ) = ONE
-            CALL ZLARF( 'Right', M-I, N-I+1, A( I, I ), LDA, TAU( I ),
-     $                  A( I+1, I ), LDA, WORK )
+            CALL ZLARF1F( 'Right', M-I, N-I+1, A( I, I ), LDA,
+     $                    TAU( I ),
+     $                    A( I+1, I ), LDA, WORK )
          END IF
-         A( I, I ) = ALPHA
          CALL ZLACGV( N-I+1, A( I, I ), LDA )
    10 CONTINUE
       RETURN
diff --git a/SRC/zgelqf.f b/SRC/zgelqf.f
index 6c295eecec..1bd10c86a4 100644
--- a/SRC/zgelqf.f
+++ b/SRC/zgelqf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGELQF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgelqf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgelqf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -93,7 +91,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,M).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= M, otherwise.
 *>          For optimum performance LWORK >= M*NB, where NB is the
 *>          optimal blocksize.
 *>
@@ -118,7 +117,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup gelqf
 *
 *> \par Further Details:
 *  =====================
@@ -140,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -174,9 +174,8 @@ SUBROUTINE ZGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *     Test the input arguments
 *
       INFO = 0
+      K = MIN( M, N )
       NB = ILAENV( 1, 'ZGELQF', ' ', M, N, -1, -1 )
-      LWKOPT = M*NB
-      WORK( 1 ) = LWKOPT
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -184,19 +183,25 @@ SUBROUTINE ZGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, M ) .AND. .NOT.LQUERY ) THEN
-         INFO = -7
+      ELSE IF( .NOT.LQUERY ) THEN
+         IF( LWORK.LE.0 .OR. ( N.GT.0 .AND. LWORK.LT.MAX( 1, M ) ) )
+     $      INFO = -7
       END IF
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'ZGELQF', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
+         IF( K.EQ.0 ) THEN
+            LWKOPT = 1
+         ELSE
+            LWKOPT = M*NB
+         END IF
+         WORK( 1 ) = LWKOPT
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      K = MIN( M, N )
       IF( K.EQ.0 ) THEN
          WORK( 1 ) = 1
          RETURN
@@ -245,7 +250,8 @@ SUBROUTINE ZGELQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *              Form the triangular factor of the block reflector
 *              H = H(i) H(i+1) . . . H(i+ib-1)
 *
-               CALL ZLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I, I ),
+               CALL ZLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I,
+     $                      I ),
      $                      LDA, TAU( I ), WORK, LDWORK )
 *
 *              Apply H to A(i+ib:m,i:n) from the right
diff --git a/SRC/zgelqt.f b/SRC/zgelqt.f
index 801996743d..2200fa6b5a 100644
--- a/SRC/zgelqt.f
+++ b/SRC/zgelqt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGELQT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgelqt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgelqt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -55,7 +53,7 @@
 *> \param[in] MB
 *> \verbatim
 *>          MB is INTEGER
-*>          The block size to be used in the blocked QR.  MIN(M,N) >= MB >= 1.
+*>          The block size to be used in the blocked LQ.  MIN(M,N) >= MB >= 1.
 *> \endverbatim
 *>
 *> \param[in,out] A
@@ -90,7 +88,10 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (MB*N)
+*>          WORK is COMPLEX*16 array, dimension (MB*M).
+*>          Note: A smaller workspace of MB*(M-MB) may also be sufficient, but
+*>          that is yet to be proven. MB*M is a conservative estimate and the
+*>          recommended value to use.
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -108,7 +109,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gelqt
 *
 *> \par Further Details:
 *  =====================
@@ -116,7 +117,7 @@
 *> \verbatim
 *>
 *>  The matrix V stores the elementary reflectors H(i) in the i-th row
-*>  above the diagonal. For example, if M=5 and N=3, the matrix V is
+*>  above the diagonal. For example, if M=3 and N=5, the matrix V is
 *>
 *>               V = (  1  v1 v1 v1 v1 )
 *>                   (     1  v2 v2 v2 )
@@ -136,6 +137,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGELQT( M, N, MB, A, LDA, T, LDT, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zgelqt3.f b/SRC/zgelqt3.f
index 629a09472d..801bf567a8 100644
--- a/SRC/zgelqt3.f
+++ b/SRC/zgelqt3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGELQT3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgelqt3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgelqt3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -100,7 +98,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gelqt3
 *
 *> \par Further Details:
 *  =====================
@@ -128,6 +126,7 @@
 *>
 *  =====================================================================
       RECURSIVE SUBROUTINE ZGELQT3( M, N, A, LDA, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -174,7 +173,8 @@ RECURSIVE SUBROUTINE ZGELQT3( M, N, A, LDA, T, LDT, INFO )
 *
 *        Compute Householder transform when M=1
 *
-         CALL ZLARFG( N, A, A( 1, MIN( 2, N ) ), LDA, T )
+         CALL ZLARFG( N, A( 1, 1 ), A( 1, MIN( 2, N ) ), LDA,
+     &                T( 1, 1 ) )
          T(1,1)=CONJG(T(1,1))
 *
       ELSE
diff --git a/SRC/zgels.f b/SRC/zgels.f
index ebdbe0d494..fb5351c18d 100644
--- a/SRC/zgels.f
+++ b/SRC/zgels.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGELS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgels.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgels.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,17 @@
 *>
 *> ZGELS solves overdetermined or underdetermined complex linear systems
 *> involving an M-by-N matrix A, or its conjugate-transpose, using a QR
-*> or LQ factorization of A.  It is assumed that A has full rank.
+*> or LQ factorization of A.
+*>
+*> It is assumed that A has full rank, and only a rudimentary protection
+*> against rank-deficient matrices is provided. This subroutine only detects
+*> exact rank-deficiency, where a diagonal element of the triangular factor
+*> of A is exactly zero.
+*>
+*> It is conceivable for one (or more) of the diagonal elements of the triangular
+*> factor of A to be subnormally tiny numbers without this subroutine signalling
+*> an error. The solutions computed for such almost-rank-deficient matrices may
+*> be less accurate due to a loss of numerical precision.
 *>
 *> The following options are provided:
 *>
@@ -161,7 +169,7 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO =  i, the i-th diagonal element of the
-*>                triangular factor of A is zero, so that A does not have
+*>                triangular factor of A is exactly zero, so that A does not have
 *>                full rank; the least squares solution could not be
 *>                computed.
 *> \endverbatim
@@ -174,11 +182,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEsolve
+*> \ingroup gels
 *
 *  =====================================================================
-      SUBROUTINE ZGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
+      SUBROUTINE ZGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK,
+     $                  LWORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -215,7 +225,8 @@ SUBROUTINE ZGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
       EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, XERBLA, ZGELQF, ZGEQRF, ZLASCL, ZLASET,
+      EXTERNAL           XERBLA, ZGELQF, ZGEQRF, ZLASCL,
+     $                   ZLASET,
      $                   ZTRTRS, ZUNMLQ, ZUNMQR
 *     ..
 *     .. Intrinsic Functions ..
@@ -228,7 +239,8 @@ SUBROUTINE ZGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
       INFO = 0
       MN = MIN( M, N )
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.( LSAME( TRANS, 'N' ) .OR. LSAME( TRANS, 'C' ) ) ) THEN
+      IF( .NOT.( LSAME( TRANS, 'N' ) .OR.
+     $    LSAME( TRANS, 'C' ) ) ) THEN
          INFO = -1
       ELSE IF( M.LT.0 ) THEN
          INFO = -2
@@ -288,7 +300,8 @@ SUBROUTINE ZGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *     Quick return if possible
 *
       IF( MIN( M, N, NRHS ).EQ.0 ) THEN
-         CALL ZLASET( 'Full', MAX( M, N ), NRHS, CZERO, CZERO, B, LDB )
+         CALL ZLASET( 'Full', MAX( M, N ), NRHS, CZERO, CZERO, B,
+     $                LDB )
          RETURN
       END IF
 *
@@ -296,7 +309,6 @@ SUBROUTINE ZGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
       SMLNUM = DLAMCH( 'S' ) / DLAMCH( 'P' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A, B if max element outside range [SMLNUM,BIGNUM]
 *
@@ -347,7 +359,8 @@ SUBROUTINE ZGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *        compute QR factorization of A
 *
-         CALL ZGEQRF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ), LWORK-MN,
+         CALL ZGEQRF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ),
+     $                LWORK-MN,
      $                INFO )
 *
 *        workspace at least N, optimally N*NB
@@ -358,7 +371,8 @@ SUBROUTINE ZGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *           B(1:M,1:NRHS) := Q**H * B(1:M,1:NRHS)
 *
-            CALL ZUNMQR( 'Left', 'Conjugate transpose', M, NRHS, N, A,
+            CALL ZUNMQR( 'Left', 'Conjugate transpose', M, NRHS, N,
+     $                   A,
      $                   LDA, WORK( 1 ), B, LDB, WORK( MN+1 ), LWORK-MN,
      $                   INFO )
 *
@@ -366,7 +380,8 @@ SUBROUTINE ZGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *           B(1:N,1:NRHS) := inv(R) * B(1:N,1:NRHS)
 *
-            CALL ZTRTRS( 'Upper', 'No transpose', 'Non-unit', N, NRHS,
+            CALL ZTRTRS( 'Upper', 'No transpose', 'Non-unit', N,
+     $                   NRHS,
      $                   A, LDA, B, LDB, INFO )
 *
             IF( INFO.GT.0 ) THEN
@@ -412,7 +427,8 @@ SUBROUTINE ZGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *        Compute LQ factorization of A
 *
-         CALL ZGELQF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ), LWORK-MN,
+         CALL ZGELQF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ),
+     $                LWORK-MN,
      $                INFO )
 *
 *        workspace at least M, optimally M*NB.
@@ -423,7 +439,8 @@ SUBROUTINE ZGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *           B(1:M,1:NRHS) := inv(L) * B(1:M,1:NRHS)
 *
-            CALL ZTRTRS( 'Lower', 'No transpose', 'Non-unit', M, NRHS,
+            CALL ZTRTRS( 'Lower', 'No transpose', 'Non-unit', M,
+     $                   NRHS,
      $                   A, LDA, B, LDB, INFO )
 *
             IF( INFO.GT.0 ) THEN
@@ -440,7 +457,8 @@ SUBROUTINE ZGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
 *
 *           B(1:N,1:NRHS) := Q(1:N,:)**H * B(1:M,1:NRHS)
 *
-            CALL ZUNMLQ( 'Left', 'Conjugate transpose', N, NRHS, M, A,
+            CALL ZUNMLQ( 'Left', 'Conjugate transpose', N, NRHS, M,
+     $                   A,
      $                   LDA, WORK( 1 ), B, LDB, WORK( MN+1 ), LWORK-MN,
      $                   INFO )
 *
diff --git a/SRC/zgelsd.f b/SRC/zgelsd.f
index 01793e16c2..c5adf6c9eb 100644
--- a/SRC/zgelsd.f
+++ b/SRC/zgelsd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGELSD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgelsd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgelsd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -60,12 +58,6 @@
 *> singular values which are less than RCOND times the largest singular
 *> value.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -210,7 +202,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEsolve
+*> \ingroup gelsd
 *
 *> \par Contributors:
 *  ==================
@@ -222,6 +214,7 @@
 *  =====================================================================
       SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
      $                   WORK, LWORK, RWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -253,9 +246,10 @@ SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
       DOUBLE PRECISION   ANRM, BIGNUM, BNRM, EPS, SFMIN, SMLNUM
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLASCL, DLASET, XERBLA, ZGEBRD, ZGELQF,
-     $                   ZGEQRF, ZLACPY, ZLALSD, ZLASCL, ZLASET, ZUNMBR,
-     $                   ZUNMLQ, ZUNMQR
+      EXTERNAL           DLASCL, DLASET, XERBLA, ZGEBRD, ZGELQF,
+     $                   ZGEQRF,
+     $                   ZLACPY, ZLALSD, ZLASCL, ZLASET, ZUNMBR, ZUNMLQ,
+     $                   ZUNMQR
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
@@ -310,9 +304,11 @@ SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *                        columns.
 *
                MM = N
-               MAXWRK = MAX( MAXWRK, N*ILAENV( 1, 'ZGEQRF', ' ', M, N,
+               MAXWRK = MAX( MAXWRK, N*ILAENV( 1, 'ZGEQRF', ' ', M,
+     $                       N,
      $                       -1, -1 ) )
-               MAXWRK = MAX( MAXWRK, NRHS*ILAENV( 1, 'ZUNMQR', 'LC', M,
+               MAXWRK = MAX( MAXWRK, NRHS*ILAENV( 1, 'ZUNMQR', 'LC',
+     $                       M,
      $                       NRHS, N, -1 ) )
             END IF
             IF( M.GE.N ) THEN
@@ -344,7 +340,8 @@ SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
      $                          'ZGEBRD', ' ', M, M, -1, -1 ) )
                   MAXWRK = MAX( MAXWRK, M*M + 4*M + NRHS*ILAENV( 1,
      $                          'ZUNMBR', 'QLC', M, NRHS, M, -1 ) )
-                  MAXWRK = MAX( MAXWRK, M*M + 4*M + ( M - 1 )*ILAENV( 1,
+                  MAXWRK = MAX( MAXWRK,
+     $                          M*M + 4*M + ( M - 1 )*ILAENV( 1,
      $                          'ZUNMLQ', 'LC', N, NRHS, M, -1 ) )
                   IF( NRHS.GT.1 ) THEN
                      MAXWRK = MAX( MAXWRK, M*M + M + M*NRHS )
@@ -360,9 +357,11 @@ SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *                 Path 2 - underdetermined.
 *
-                  MAXWRK = 2*M + ( N + M )*ILAENV( 1, 'ZGEBRD', ' ', M,
+                  MAXWRK = 2*M + ( N + M )*ILAENV( 1, 'ZGEBRD', ' ',
+     $                             M,
      $                     N, -1, -1 )
-                  MAXWRK = MAX( MAXWRK, 2*M + NRHS*ILAENV( 1, 'ZUNMBR',
+                  MAXWRK = MAX( MAXWRK, 2*M + NRHS*ILAENV( 1,
+     $                          'ZUNMBR',
      $                          'QLC', M, NRHS, M, -1 ) )
                   MAXWRK = MAX( MAXWRK, 2*M + M*ILAENV( 1, 'ZUNMBR',
      $                          'PLN', N, NRHS, M, -1 ) )
@@ -401,7 +400,6 @@ SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
       SFMIN = DLAMCH( 'S' )
       SMLNUM = SFMIN / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A if max entry outside range [SMLNUM,BIGNUM].
 *
@@ -437,20 +435,23 @@ SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *        Scale matrix norm up to SMLNUM.
 *
-         CALL ZLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 1
       ELSE IF( BNRM.GT.BIGNUM ) THEN
 *
 *        Scale matrix norm down to BIGNUM.
 *
-         CALL ZLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 2
       END IF
 *
 *     If M < N make sure B(M+1:N,:) = 0
 *
       IF( M.LT.N )
-     $   CALL ZLASET( 'F', N-M, NRHS, CZERO, CZERO, B( M+1, 1 ), LDB )
+     $   CALL ZLASET( 'F', N-M, NRHS, CZERO, CZERO, B( M+1, 1 ),
+     $                LDB )
 *
 *     Overdetermined case.
 *
@@ -478,7 +479,8 @@ SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *           (RWorkspace: need N)
 *           (CWorkspace: need NRHS, prefer NRHS*NB)
 *
-            CALL ZUNMQR( 'L', 'C', M, NRHS, N, A, LDA, WORK( ITAU ), B,
+            CALL ZUNMQR( 'L', 'C', M, NRHS, N, A, LDA, WORK( ITAU ),
+     $                   B,
      $                   LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
 *           Zero out below R.
@@ -506,7 +508,8 @@ SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        Multiply B by transpose of left bidiagonalizing vectors of R.
 *        (CWorkspace: need 2*N+NRHS, prefer 2*N+NRHS*NB)
 *
-         CALL ZUNMBR( 'Q', 'L', 'C', MM, NRHS, N, A, LDA, WORK( ITAUQ ),
+         CALL ZUNMBR( 'Q', 'L', 'C', MM, NRHS, N, A, LDA,
+     $                WORK( ITAUQ ),
      $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
 *        Solve the bidiagonal least squares problem.
@@ -520,7 +523,8 @@ SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *        Multiply B by right bidiagonalizing vectors of R.
 *
-         CALL ZUNMBR( 'P', 'L', 'N', N, NRHS, N, A, LDA, WORK( ITAUP ),
+         CALL ZUNMBR( 'P', 'L', 'N', N, NRHS, N, A, LDA,
+     $                WORK( ITAUP ),
      $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
       ELSE IF( N.GE.MNTHR .AND. LWORK.GE.4*M+M*M+
@@ -585,7 +589,8 @@ SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *        Zero out below first M rows of B.
 *
-         CALL ZLASET( 'F', N-M, NRHS, CZERO, CZERO, B( M+1, 1 ), LDB )
+         CALL ZLASET( 'F', N-M, NRHS, CZERO, CZERO, B( M+1, 1 ),
+     $                LDB )
          NWORK = ITAU + M
 *
 *        Multiply transpose(Q) by B.
@@ -615,7 +620,8 @@ SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        Multiply B by transpose of left bidiagonalizing vectors.
 *        (CWorkspace: need 2*M+NRHS, prefer 2*M+NRHS*NB)
 *
-         CALL ZUNMBR( 'Q', 'L', 'C', M, NRHS, N, A, LDA, WORK( ITAUQ ),
+         CALL ZUNMBR( 'Q', 'L', 'C', M, NRHS, N, A, LDA,
+     $                WORK( ITAUQ ),
      $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
 *        Solve the bidiagonal least squares problem.
@@ -629,7 +635,8 @@ SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *        Multiply B by right bidiagonalizing vectors of A.
 *
-         CALL ZUNMBR( 'P', 'L', 'N', N, NRHS, M, A, LDA, WORK( ITAUP ),
+         CALL ZUNMBR( 'P', 'L', 'N', N, NRHS, M, A, LDA,
+     $                WORK( ITAUP ),
      $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
 *
       END IF
@@ -637,18 +644,22 @@ SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *     Undo scaling.
 *
       IF( IASCL.EQ.1 ) THEN
-         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL DLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN, 1, S, MINMN,
      $                INFO )
       ELSE IF( IASCL.EQ.2 ) THEN
-         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL DLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN, 1, S, MINMN,
      $                INFO )
       END IF
       IF( IBSCL.EQ.1 ) THEN
-         CALL ZLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL ZLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       END IF
 *
    10 CONTINUE
diff --git a/SRC/zgelss.f b/SRC/zgelss.f
index e4aba64970..5269eea789 100644
--- a/SRC/zgelss.f
+++ b/SRC/zgelss.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGELSS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgelss.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgelss.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -170,11 +168,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEsolve
+*> \ingroup gelss
 *
 *  =====================================================================
       SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
      $                   WORK, LWORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -212,10 +211,10 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
       COMPLEX*16         DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLASCL, DLASET, XERBLA, ZBDSQR, ZCOPY,
-     $                   ZDRSCL, ZGEBRD, ZGELQF, ZGEMM, ZGEMV, ZGEQRF,
-     $                   ZLACPY, ZLASCL, ZLASET, ZUNGBR, ZUNMBR, ZUNMLQ,
-     $                   ZUNMQR
+      EXTERNAL           DLASCL, DLASET, XERBLA, ZBDSQR, ZCOPY,
+     $                   ZDRSCL,
+     $                   ZGEBRD, ZGELQF, ZGEMM, ZGEMV, ZGEQRF, ZLACPY,
+     $                   ZLASCL, ZLASET, ZUNGBR, ZUNMBR, ZUNMLQ
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
@@ -266,15 +265,17 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *              Compute space needed for ZGEQRF
                CALL ZGEQRF( M, N, A, LDA, DUM(1), DUM(1), -1, INFO )
-               LWORK_ZGEQRF = DBLE( DUM(1) )
+               LWORK_ZGEQRF = INT( DUM(1) )
 *              Compute space needed for ZUNMQR
                CALL ZUNMQR( 'L', 'C', M, NRHS, N, A, LDA, DUM(1), B,
      $                   LDB, DUM(1), -1, INFO )
-               LWORK_ZUNMQR = DBLE( DUM(1) )
+               LWORK_ZUNMQR = INT( DUM(1) )
                MM = N
-               MAXWRK = MAX( MAXWRK, N + N*ILAENV( 1, 'ZGEQRF', ' ', M,
+               MAXWRK = MAX( MAXWRK, N + N*ILAENV( 1, 'ZGEQRF', ' ',
+     $                       M,
      $                       N, -1, -1 ) )
-               MAXWRK = MAX( MAXWRK, N + NRHS*ILAENV( 1, 'ZUNMQR', 'LC',
+               MAXWRK = MAX( MAXWRK, N + NRHS*ILAENV( 1, 'ZUNMQR',
+     $                       'LC',
      $                       M, NRHS, N, -1 ) )
             END IF
             IF( M.GE.N ) THEN
@@ -282,17 +283,19 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *              Path 1 - overdetermined or exactly determined
 *
 *              Compute space needed for ZGEBRD
-               CALL ZGEBRD( MM, N, A, LDA, S, S, DUM(1), DUM(1), DUM(1),
+               CALL ZGEBRD( MM, N, A, LDA, S, S, DUM(1), DUM(1),
+     $                      DUM(1),
      $                      -1, INFO )
-               LWORK_ZGEBRD = DBLE( DUM(1) )
+               LWORK_ZGEBRD = INT( DUM(1) )
 *              Compute space needed for ZUNMBR
-               CALL ZUNMBR( 'Q', 'L', 'C', MM, NRHS, N, A, LDA, DUM(1),
+               CALL ZUNMBR( 'Q', 'L', 'C', MM, NRHS, N, A, LDA,
+     $                      DUM(1),
      $                B, LDB, DUM(1), -1, INFO )
-               LWORK_ZUNMBR = DBLE( DUM(1) )
+               LWORK_ZUNMBR = INT( DUM(1) )
 *              Compute space needed for ZUNGBR
                CALL ZUNGBR( 'P', N, N, N, A, LDA, DUM(1),
      $                   DUM(1), -1, INFO )
-               LWORK_ZUNGBR = DBLE( DUM(1) )
+               LWORK_ZUNGBR = INT( DUM(1) )
 *              Compute total workspace needed
                MAXWRK = MAX( MAXWRK, 2*N + LWORK_ZGEBRD )
                MAXWRK = MAX( MAXWRK, 2*N + LWORK_ZUNMBR )
@@ -310,23 +313,23 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *                 Compute space needed for ZGELQF
                   CALL ZGELQF( M, N, A, LDA, DUM(1), DUM(1),
      $                -1, INFO )
-                  LWORK_ZGELQF = DBLE( DUM(1) )
+                  LWORK_ZGELQF = INT( DUM(1) )
 *                 Compute space needed for ZGEBRD
                   CALL ZGEBRD( M, M, A, LDA, S, S, DUM(1), DUM(1),
      $                         DUM(1), -1, INFO )
-                  LWORK_ZGEBRD = DBLE( DUM(1) )
+                  LWORK_ZGEBRD = INT( DUM(1) )
 *                 Compute space needed for ZUNMBR
                   CALL ZUNMBR( 'Q', 'L', 'C', M, NRHS, N, A, LDA,
      $                DUM(1), B, LDB, DUM(1), -1, INFO )
-                  LWORK_ZUNMBR = DBLE( DUM(1) )
+                  LWORK_ZUNMBR = INT( DUM(1) )
 *                 Compute space needed for ZUNGBR
                   CALL ZUNGBR( 'P', M, M, M, A, LDA, DUM(1),
      $                   DUM(1), -1, INFO )
-                  LWORK_ZUNGBR = DBLE( DUM(1) )
+                  LWORK_ZUNGBR = INT( DUM(1) )
 *                 Compute space needed for ZUNMLQ
                   CALL ZUNMLQ( 'L', 'C', N, NRHS, M, A, LDA, DUM(1),
      $                 B, LDB, DUM(1), -1, INFO )
-                  LWORK_ZUNMLQ = DBLE( DUM(1) )
+                  LWORK_ZUNMLQ = INT( DUM(1) )
 *                 Compute total workspace needed
                   MAXWRK = M + LWORK_ZGELQF
                   MAXWRK = MAX( MAXWRK, 3*M + M*M + LWORK_ZGEBRD )
@@ -345,15 +348,15 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *                 Compute space needed for ZGEBRD
                   CALL ZGEBRD( M, N, A, LDA, S, S, DUM(1), DUM(1),
      $                         DUM(1), -1, INFO )
-                  LWORK_ZGEBRD = DBLE( DUM(1) )
+                  LWORK_ZGEBRD = INT( DUM(1) )
 *                 Compute space needed for ZUNMBR
                   CALL ZUNMBR( 'Q', 'L', 'C', M, NRHS, M, A, LDA,
      $                DUM(1), B, LDB, DUM(1), -1, INFO )
-                  LWORK_ZUNMBR = DBLE( DUM(1) )
+                  LWORK_ZUNMBR = INT( DUM(1) )
 *                 Compute space needed for ZUNGBR
                   CALL ZUNGBR( 'P', M, N, M, A, LDA, DUM(1),
      $                   DUM(1), -1, INFO )
-                  LWORK_ZUNGBR = DBLE( DUM(1) )
+                  LWORK_ZUNGBR = INT( DUM(1) )
                   MAXWRK = 2*M + LWORK_ZGEBRD
                   MAXWRK = MAX( MAXWRK, 2*M + LWORK_ZUNMBR )
                   MAXWRK = MAX( MAXWRK, 2*M + LWORK_ZUNGBR )
@@ -388,7 +391,6 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
       SFMIN = DLAMCH( 'S' )
       SMLNUM = SFMIN / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A if max element outside range [SMLNUM,BIGNUM]
 *
@@ -424,13 +426,15 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *
 *        Scale matrix norm up to SMLNUM
 *
-         CALL ZLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 1
       ELSE IF( BNRM.GT.BIGNUM ) THEN
 *
 *        Scale matrix norm down to BIGNUM
 *
-         CALL ZLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 2
       END IF
 *
@@ -460,7 +464,8 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *           (CWorkspace: need N+NRHS, prefer N+NRHS*NB)
 *           (RWorkspace: none)
 *
-            CALL ZUNMQR( 'L', 'C', M, NRHS, N, A, LDA, WORK( ITAU ), B,
+            CALL ZUNMQR( 'L', 'C', M, NRHS, N, A, LDA, WORK( ITAU ),
+     $                   B,
      $                   LDB, WORK( IWORK ), LWORK-IWORK+1, INFO )
 *
 *           Zero out below R
@@ -487,7 +492,8 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (CWorkspace: need 2*N+NRHS, prefer 2*N+NRHS*NB)
 *        (RWorkspace: none)
 *
-         CALL ZUNMBR( 'Q', 'L', 'C', MM, NRHS, N, A, LDA, WORK( ITAUQ ),
+         CALL ZUNMBR( 'Q', 'L', 'C', MM, NRHS, N, A, LDA,
+     $                WORK( ITAUQ ),
      $                B, LDB, WORK( IWORK ), LWORK-IWORK+1, INFO )
 *
 *        Generate right bidiagonalizing vectors of R in A
@@ -504,7 +510,8 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (CWorkspace: none)
 *        (RWorkspace: need BDSPAC)
 *
-         CALL ZBDSQR( 'U', N, N, 0, NRHS, S, RWORK( IE ), A, LDA, DUM,
+         CALL ZBDSQR( 'U', N, N, 0, NRHS, S, RWORK( IE ), A, LDA,
+     $                DUM,
      $                1, B, LDB, RWORK( IRWORK ), INFO )
          IF( INFO.NE.0 )
      $      GO TO 70
@@ -520,7 +527,8 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
                CALL ZDRSCL( NRHS, S( I ), B( I, 1 ), LDB )
                RANK = RANK + 1
             ELSE
-               CALL ZLASET( 'F', 1, NRHS, CZERO, CZERO, B( I, 1 ), LDB )
+               CALL ZLASET( 'F', 1, NRHS, CZERO, CZERO, B( I, 1 ),
+     $                      LDB )
             END IF
    10    CONTINUE
 *
@@ -536,12 +544,14 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
             CHUNK = LWORK / N
             DO 20 I = 1, NRHS, CHUNK
                BL = MIN( NRHS-I+1, CHUNK )
-               CALL ZGEMM( 'C', 'N', N, BL, N, CONE, A, LDA, B( 1, I ),
+               CALL ZGEMM( 'C', 'N', N, BL, N, CONE, A, LDA, B( 1,
+     $                     I ),
      $                     LDB, CZERO, WORK, N )
                CALL ZLACPY( 'G', N, BL, WORK, N, B( 1, I ), LDB )
    20       CONTINUE
-         ELSE
-            CALL ZGEMV( 'C', N, N, CONE, A, LDA, B, 1, CZERO, WORK, 1 )
+         ELSE IF( NRHS.EQ.1 ) THEN
+            CALL ZGEMV( 'C', N, N, CONE, A, LDA, B, 1, CZERO, WORK,
+     $                  1 )
             CALL ZCOPY( N, WORK, 1, B, 1 )
          END IF
 *
@@ -597,7 +607,8 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (CWorkspace: need M*M+4*M-1, prefer M*M+3*M+(M-1)*NB)
 *        (RWorkspace: none)
 *
-         CALL ZUNGBR( 'P', M, M, M, WORK( IL ), LDWORK, WORK( ITAUP ),
+         CALL ZUNGBR( 'P', M, M, M, WORK( IL ), LDWORK,
+     $                WORK( ITAUP ),
      $                WORK( IWORK ), LWORK-IWORK+1, INFO )
          IRWORK = IE + M
 *
@@ -623,7 +634,8 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
                CALL ZDRSCL( NRHS, S( I ), B( I, 1 ), LDB )
                RANK = RANK + 1
             ELSE
-               CALL ZLASET( 'F', 1, NRHS, CZERO, CZERO, B( I, 1 ), LDB )
+               CALL ZLASET( 'F', 1, NRHS, CZERO, CZERO, B( I, 1 ),
+     $                      LDB )
             END IF
    30    CONTINUE
          IWORK = IL + M*LDWORK
@@ -633,27 +645,30 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (RWorkspace: none)
 *
          IF( LWORK.GE.LDB*NRHS+IWORK-1 .AND. NRHS.GT.1 ) THEN
-            CALL ZGEMM( 'C', 'N', M, NRHS, M, CONE, WORK( IL ), LDWORK,
+            CALL ZGEMM( 'C', 'N', M, NRHS, M, CONE, WORK( IL ),
+     $                  LDWORK,
      $                  B, LDB, CZERO, WORK( IWORK ), LDB )
             CALL ZLACPY( 'G', M, NRHS, WORK( IWORK ), LDB, B, LDB )
          ELSE IF( NRHS.GT.1 ) THEN
             CHUNK = ( LWORK-IWORK+1 ) / M
             DO 40 I = 1, NRHS, CHUNK
                BL = MIN( NRHS-I+1, CHUNK )
-               CALL ZGEMM( 'C', 'N', M, BL, M, CONE, WORK( IL ), LDWORK,
+               CALL ZGEMM( 'C', 'N', M, BL, M, CONE, WORK( IL ),
+     $                     LDWORK,
      $                     B( 1, I ), LDB, CZERO, WORK( IWORK ), M )
                CALL ZLACPY( 'G', M, BL, WORK( IWORK ), M, B( 1, I ),
      $                      LDB )
    40       CONTINUE
-         ELSE
-            CALL ZGEMV( 'C', M, M, CONE, WORK( IL ), LDWORK, B( 1, 1 ),
-     $                  1, CZERO, WORK( IWORK ), 1 )
+         ELSE IF( NRHS.EQ.1 ) THEN
+            CALL ZGEMV( 'C', M, M, CONE, WORK( IL ), LDWORK, B( 1,
+     $                  1 ), 1, CZERO, WORK( IWORK ), 1 )
             CALL ZCOPY( M, WORK( IWORK ), 1, B( 1, 1 ), 1 )
          END IF
 *
 *        Zero out below first M rows of B
 *
-         CALL ZLASET( 'F', N-M, NRHS, CZERO, CZERO, B( M+1, 1 ), LDB )
+         CALL ZLASET( 'F', N-M, NRHS, CZERO, CZERO, B( M+1, 1 ),
+     $                LDB )
          IWORK = ITAU + M
 *
 *        Multiply transpose(Q) by B
@@ -684,7 +699,8 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (CWorkspace: need 2*M+NRHS, prefer 2*M+NRHS*NB)
 *        (RWorkspace: none)
 *
-         CALL ZUNMBR( 'Q', 'L', 'C', M, NRHS, N, A, LDA, WORK( ITAUQ ),
+         CALL ZUNMBR( 'Q', 'L', 'C', M, NRHS, N, A, LDA,
+     $                WORK( ITAUQ ),
      $                B, LDB, WORK( IWORK ), LWORK-IWORK+1, INFO )
 *
 *        Generate right bidiagonalizing vectors in A
@@ -701,7 +717,8 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *        (CWorkspace: none)
 *        (RWorkspace: need BDSPAC)
 *
-         CALL ZBDSQR( 'L', M, N, 0, NRHS, S, RWORK( IE ), A, LDA, DUM,
+         CALL ZBDSQR( 'L', M, N, 0, NRHS, S, RWORK( IE ), A, LDA,
+     $                DUM,
      $                1, B, LDB, RWORK( IRWORK ), INFO )
          IF( INFO.NE.0 )
      $      GO TO 70
@@ -717,7 +734,8 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
                CALL ZDRSCL( NRHS, S( I ), B( I, 1 ), LDB )
                RANK = RANK + 1
             ELSE
-               CALL ZLASET( 'F', 1, NRHS, CZERO, CZERO, B( I, 1 ), LDB )
+               CALL ZLASET( 'F', 1, NRHS, CZERO, CZERO, B( I, 1 ),
+     $                      LDB )
             END IF
    50    CONTINUE
 *
@@ -733,12 +751,14 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
             CHUNK = LWORK / N
             DO 60 I = 1, NRHS, CHUNK
                BL = MIN( NRHS-I+1, CHUNK )
-               CALL ZGEMM( 'C', 'N', N, BL, M, CONE, A, LDA, B( 1, I ),
+               CALL ZGEMM( 'C', 'N', N, BL, M, CONE, A, LDA, B( 1,
+     $                     I ),
      $                     LDB, CZERO, WORK, N )
                CALL ZLACPY( 'F', N, BL, WORK, N, B( 1, I ), LDB )
    60       CONTINUE
-         ELSE
-            CALL ZGEMV( 'C', M, N, CONE, A, LDA, B, 1, CZERO, WORK, 1 )
+         ELSE IF( NRHS.EQ.1 ) THEN
+            CALL ZGEMV( 'C', M, N, CONE, A, LDA, B, 1, CZERO, WORK,
+     $                  1 )
             CALL ZCOPY( N, WORK, 1, B, 1 )
          END IF
       END IF
@@ -746,18 +766,22 @@ SUBROUTINE ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 *     Undo scaling
 *
       IF( IASCL.EQ.1 ) THEN
-         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL DLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN, 1, S, MINMN,
      $                INFO )
       ELSE IF( IASCL.EQ.2 ) THEN
-         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL DLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN, 1, S, MINMN,
      $                INFO )
       END IF
       IF( IBSCL.EQ.1 ) THEN
-         CALL ZLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL ZLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       END IF
    70 CONTINUE
       WORK( 1 ) = MAXWRK
diff --git a/SRC/zgelst.f b/SRC/zgelst.f
new file mode 100644
index 0000000000..1a5de8d682
--- /dev/null
+++ b/SRC/zgelst.f
@@ -0,0 +1,549 @@
+*> \brief <b> ZGELST solves overdetermined or underdetermined systems for GE matrices using QR or LQ factorization with compact WY representation of Q.</b>
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download ZGELST + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgelst.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgelst.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgelst.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZGELST( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
+*                          INFO )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          TRANS
+*       INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * ), B( LDB, * ), WORK( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZGELST solves overdetermined or underdetermined real linear systems
+*> involving an M-by-N matrix A, or its conjugate-transpose, using a QR
+*> or LQ factorization of A with compact WY representation of Q.
+*>
+*> It is assumed that A has full rank, and only a rudimentary protection
+*> against rank-deficient matrices is provided. This subroutine only detects
+*> exact rank-deficiency, where a diagonal element of the triangular factor
+*> of A is exactly zero.
+*>
+*> It is conceivable for one (or more) of the diagonal elements of the triangular
+*> factor of A to be subnormally tiny numbers without this subroutine signalling
+*> an error. The solutions computed for such almost-rank-deficient matrices may
+*> be less accurate due to a loss of numerical precision.
+*>
+*> The following options are provided:
+*>
+*> 1. If TRANS = 'N' and m >= n:  find the least squares solution of
+*>    an overdetermined system, i.e., solve the least squares problem
+*>                 minimize || B - A*X ||.
+*>
+*> 2. If TRANS = 'N' and m < n:  find the minimum norm solution of
+*>    an underdetermined system A * X = B.
+*>
+*> 3. If TRANS = 'C' and m >= n:  find the minimum norm solution of
+*>    an underdetermined system A**T * X = B.
+*>
+*> 4. If TRANS = 'C' and m < n:  find the least squares solution of
+*>    an overdetermined system, i.e., solve the least squares problem
+*>                 minimize || B - A**T * X ||.
+*>
+*> Several right hand side vectors b and solution vectors x can be
+*> handled in a single call; they are stored as the columns of the
+*> M-by-NRHS right hand side matrix B and the N-by-NRHS solution
+*> matrix X.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] TRANS
+*> \verbatim
+*>          TRANS is CHARACTER*1
+*>          = 'N': the linear system involves A;
+*>          = 'C': the linear system involves A**H.
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of
+*>          columns of the matrices B and X. NRHS >=0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the M-by-N matrix A.
+*>          On exit,
+*>            if M >= N, A is overwritten by details of its QR
+*>                       factorization as returned by ZGEQRT;
+*>            if M <  N, A is overwritten by details of its LQ
+*>                       factorization as returned by ZGELQT.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in,out] B
+*> \verbatim
+*>          B is COMPLEX*16 array, dimension (LDB,NRHS)
+*>          On entry, the matrix B of right hand side vectors, stored
+*>          columnwise; B is M-by-NRHS if TRANS = 'N', or N-by-NRHS
+*>          if TRANS = 'C'.
+*>          On exit, if INFO = 0, B is overwritten by the solution
+*>          vectors, stored columnwise:
+*>          if TRANS = 'N' and m >= n, rows 1 to n of B contain the least
+*>          squares solution vectors; the residual sum of squares for the
+*>          solution in each column is given by the sum of squares of
+*>          modulus of elements N+1 to M in that column;
+*>          if TRANS = 'N' and m < n, rows 1 to N of B contain the
+*>          minimum norm solution vectors;
+*>          if TRANS = 'C' and m >= n, rows 1 to M of B contain the
+*>          minimum norm solution vectors;
+*>          if TRANS = 'C' and m < n, rows 1 to M of B contain the
+*>          least squares solution vectors; the residual sum of squares
+*>          for the solution in each column is given by the sum of
+*>          squares of the modulus of elements M+1 to N in that column.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= MAX(1,M,N).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          LWORK >= max( 1, MN + max( MN, NRHS ) ).
+*>          For optimal performance,
+*>          LWORK >= max( 1, (MN + max( MN, NRHS ))*NB ).
+*>          where MN = min(M,N) and NB is the optimum block size.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO =  i, the i-th diagonal element of the
+*>                triangular factor of A is exactly zero, so that A does not have
+*>                full rank; the least squares solution could not be
+*>                computed.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup gelst
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
+*>
+*>  November 2022,  Igor Kozachenko,
+*>                  Computer Science Division,
+*>                  University of California, Berkeley
+*> \endverbatim
+*
+*  =====================================================================
+      SUBROUTINE ZGELST( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK,
+     $                   LWORK,
+     $                   INFO )
+      IMPLICIT NONE
+*
+*  -- LAPACK driver routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          TRANS
+      INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), B( LDB, * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+      COMPLEX*16         CZERO
+      PARAMETER          ( CZERO = ( 0.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY, TPSD
+      INTEGER            BROW, I, IASCL, IBSCL, J, LWOPT, MN, MNNRHS,
+     $                   NB, NBMIN, SCLLEN
+      DOUBLE PRECISION   ANRM, BIGNUM, BNRM, SMLNUM
+*     ..
+*     .. Local Arrays ..
+      DOUBLE PRECISION   RWORK( 1 )
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      DOUBLE PRECISION   DLAMCH, ZLANGE
+      EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANGE
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZGELQT, ZGEQRT, ZGEMLQT, ZGEMQRT,
+     $                   ZLASCL,
+     $                   ZLASET, ZTRTRS, XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DBLE, MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input arguments.
+*
+      INFO = 0
+      MN = MIN( M, N )
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( .NOT.( LSAME( TRANS, 'N' ) .OR.
+     $    LSAME( TRANS, 'C' ) ) ) THEN
+         INFO = -1
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -6
+      ELSE IF( LDB.LT.MAX( 1, M, N ) ) THEN
+         INFO = -8
+      ELSE IF( LWORK.LT.MAX( 1, MN+MAX( MN, NRHS ) ) .AND. .NOT.LQUERY )
+     $          THEN
+         INFO = -10
+      END IF
+*
+*     Figure out optimal block size and optimal workspace size
+*
+      IF( INFO.EQ.0 .OR. INFO.EQ.-10 ) THEN
+*
+         TPSD = .TRUE.
+         IF( LSAME( TRANS, 'N' ) )
+     $      TPSD = .FALSE.
+*
+         NB = ILAENV( 1, 'ZGELST', ' ', M, N, -1, -1 )
+*
+         MNNRHS = MAX( MN, NRHS )
+         LWOPT = MAX( 1, (MN+MNNRHS)*NB )
+         WORK( 1 ) = DBLE( LWOPT )
+*
+      END IF
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGELST ', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( MIN( M, N, NRHS ).EQ.0 ) THEN
+         CALL ZLASET( 'Full', MAX( M, N ), NRHS, CZERO, CZERO, B,
+     $                LDB )
+         WORK( 1 ) = DBLE( LWOPT )
+         RETURN
+      END IF
+*
+*     *GEQRT and *GELQT routines cannot accept NB larger than min(M,N)
+*
+      IF( NB.GT.MN ) NB = MN
+*
+*     Determine the block size from the supplied LWORK
+*     ( at this stage we know that LWORK >= (minimum required workspace,
+*     but it may be less than optimal)
+*
+      NB = MIN( NB, LWORK/( MN + MNNRHS ) )
+*
+*     The minimum value of NB, when blocked code is used
+*
+      NBMIN = MAX( 2, ILAENV( 2, 'ZGELST', ' ', M, N, -1, -1 ) )
+*
+      IF( NB.LT.NBMIN ) THEN
+         NB = 1
+      END IF
+*
+*     Get machine parameters
+*
+      SMLNUM = DLAMCH( 'S' ) / DLAMCH( 'P' )
+      BIGNUM = ONE / SMLNUM
+*
+*     Scale A, B if max element outside range [SMLNUM,BIGNUM]
+*
+      ANRM = ZLANGE( 'M', M, N, A, LDA, RWORK )
+      IASCL = 0
+      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
+*
+*        Scale matrix norm up to SMLNUM
+*
+         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, M, N, A, LDA, INFO )
+         IASCL = 1
+      ELSE IF( ANRM.GT.BIGNUM ) THEN
+*
+*        Scale matrix norm down to BIGNUM
+*
+         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, M, N, A, LDA, INFO )
+         IASCL = 2
+      ELSE IF( ANRM.EQ.ZERO ) THEN
+*
+*        Matrix all zero. Return zero solution.
+*
+         CALL ZLASET( 'Full', MAX( M, N ), NRHS, CZERO, CZERO, B,
+     $                LDB )
+         WORK( 1 ) = DBLE( LWOPT )
+         RETURN
+      END IF
+*
+      BROW = M
+      IF( TPSD )
+     $   BROW = N
+      BNRM = ZLANGE( 'M', BROW, NRHS, B, LDB, RWORK )
+      IBSCL = 0
+      IF( BNRM.GT.ZERO .AND. BNRM.LT.SMLNUM ) THEN
+*
+*        Scale matrix norm up to SMLNUM
+*
+         CALL ZLASCL( 'G', 0, 0, BNRM, SMLNUM, BROW, NRHS, B, LDB,
+     $                INFO )
+         IBSCL = 1
+      ELSE IF( BNRM.GT.BIGNUM ) THEN
+*
+*        Scale matrix norm down to BIGNUM
+*
+         CALL ZLASCL( 'G', 0, 0, BNRM, BIGNUM, BROW, NRHS, B, LDB,
+     $                INFO )
+         IBSCL = 2
+      END IF
+*
+      IF( M.GE.N ) THEN
+*
+*        M > N:
+*        Compute the blocked QR factorization of A,
+*        using the compact WY representation of Q,
+*        workspace at least N, optimally N*NB.
+*
+         CALL ZGEQRT( M, N, NB, A, LDA, WORK( 1 ), NB,
+     $                WORK( MN*NB+1 ), INFO )
+*
+         IF( .NOT.TPSD ) THEN
+*
+*           M > N, A is not transposed:
+*           Overdetermined system of equations,
+*           least-squares problem, min || A * X - B ||.
+*
+*           Compute B(1:M,1:NRHS) := Q**T * B(1:M,1:NRHS),
+*           using the compact WY representation of Q,
+*           workspace at least NRHS, optimally NRHS*NB.
+*
+            CALL ZGEMQRT( 'Left', 'Conjugate transpose', M, NRHS, N,
+     $                    NB,
+     $                    A, LDA, WORK( 1 ), NB, B, LDB,
+     $                    WORK( MN*NB+1 ), INFO )
+*
+*           Compute B(1:N,1:NRHS) := inv(R) * B(1:N,1:NRHS)
+*
+            CALL ZTRTRS( 'Upper', 'No transpose', 'Non-unit', N,
+     $                   NRHS,
+     $                   A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
+*
+            SCLLEN = N
+*
+         ELSE
+*
+*           M > N, A is transposed:
+*           Underdetermined system of equations,
+*           minimum norm solution of A**T * X = B.
+*
+*           Compute B := inv(R**T) * B in two row blocks of B.
+*
+*           Block 1: B(1:N,1:NRHS) := inv(R**T) * B(1:N,1:NRHS)
+*
+            CALL ZTRTRS( 'Upper', 'Conjugate transpose', 'Non-unit',
+     $                   N, NRHS, A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
+*
+*           Block 2: Zero out all rows below the N-th row in B:
+*           B(N+1:M,1:NRHS) = ZERO
+*
+            DO  J = 1, NRHS
+               DO I = N + 1, M
+                  B( I, J ) = ZERO
+               END DO
+            END DO
+*
+*           Compute B(1:M,1:NRHS) := Q(1:N,:) * B(1:N,1:NRHS),
+*           using the compact WY representation of Q,
+*           workspace at least NRHS, optimally NRHS*NB.
+*
+            CALL ZGEMQRT( 'Left', 'No transpose', M, NRHS, N, NB,
+     $                    A, LDA, WORK( 1 ), NB, B, LDB,
+     $                    WORK( MN*NB+1 ), INFO )
+*
+            SCLLEN = M
+*
+         END IF
+*
+      ELSE
+*
+*        M < N:
+*        Compute the blocked LQ factorization of A,
+*        using the compact WY representation of Q,
+*        workspace at least M, optimally M*NB.
+*
+         CALL ZGELQT( M, N, NB, A, LDA, WORK( 1 ), NB,
+     $                WORK( MN*NB+1 ), INFO )
+*
+         IF( .NOT.TPSD ) THEN
+*
+*           M < N, A is not transposed:
+*           Underdetermined system of equations,
+*           minimum norm solution of A * X = B.
+*
+*           Compute B := inv(L) * B in two row blocks of B.
+*
+*           Block 1: B(1:M,1:NRHS) := inv(L) * B(1:M,1:NRHS)
+*
+            CALL ZTRTRS( 'Lower', 'No transpose', 'Non-unit', M,
+     $                   NRHS,
+     $                   A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
+*
+*           Block 2: Zero out all rows below the M-th row in B:
+*           B(M+1:N,1:NRHS) = ZERO
+*
+            DO J = 1, NRHS
+               DO I = M + 1, N
+                  B( I, J ) = ZERO
+               END DO
+            END DO
+*
+*           Compute B(1:N,1:NRHS) := Q(1:N,:)**T * B(1:M,1:NRHS),
+*           using the compact WY representation of Q,
+*           workspace at least NRHS, optimally NRHS*NB.
+*
+            CALL ZGEMLQT( 'Left', 'Conjugate transpose', N, NRHS, M,
+     $                    NB,
+     $                   A, LDA, WORK( 1 ), NB, B, LDB,
+     $                   WORK( MN*NB+1 ), INFO )
+*
+            SCLLEN = N
+*
+         ELSE
+*
+*           M < N, A is transposed:
+*           Overdetermined system of equations,
+*           least-squares problem, min || A**T * X - B ||.
+*
+*           Compute B(1:N,1:NRHS) := Q * B(1:N,1:NRHS),
+*           using the compact WY representation of Q,
+*           workspace at least NRHS, optimally NRHS*NB.
+*
+            CALL ZGEMLQT( 'Left', 'No transpose', N, NRHS, M, NB,
+     $                    A, LDA, WORK( 1 ), NB, B, LDB,
+     $                    WORK( MN*NB+1), INFO )
+*
+*           Compute B(1:M,1:NRHS) := inv(L**T) * B(1:M,1:NRHS)
+*
+            CALL ZTRTRS( 'Lower', 'Conjugate transpose', 'Non-unit',
+     $                   M, NRHS, A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
+*
+            SCLLEN = M
+*
+         END IF
+*
+      END IF
+*
+*     Undo scaling
+*
+      IF( IASCL.EQ.1 ) THEN
+         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      ELSE IF( IASCL.EQ.2 ) THEN
+         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      END IF
+      IF( IBSCL.EQ.1 ) THEN
+         CALL ZLASCL( 'G', 0, 0, SMLNUM, BNRM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      ELSE IF( IBSCL.EQ.2 ) THEN
+         CALL ZLASCL( 'G', 0, 0, BIGNUM, BNRM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      END IF
+*
+      WORK( 1 ) = DBLE( LWOPT )
+*
+      RETURN
+*
+*     End of ZGELST
+*
+      END
diff --git a/SRC/zgelsy.f b/SRC/zgelsy.f
index 65fa87ae98..6042cd55bd 100644
--- a/SRC/zgelsy.f
+++ b/SRC/zgelsy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGELSY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgelsy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgelsy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -116,6 +114,7 @@
 *>          B is COMPLEX*16 array, dimension (LDB,NRHS)
 *>          On entry, the M-by-NRHS right hand side matrix B.
 *>          On exit, the N-by-NRHS solution matrix X.
+*>          If M = 0 or N = 0, B is not referenced.
 *> \endverbatim
 *>
 *> \param[in] LDB
@@ -148,6 +147,7 @@
 *>          The effective rank of A, i.e., the order of the submatrix
 *>          R11.  This is the same as the order of the submatrix T11
 *>          in the complete orthogonal factorization of A.
+*>          If NRHS = 0, RANK = 0 on output.
 *> \endverbatim
 *>
 *> \param[out] WORK
@@ -195,7 +195,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEsolve
+*> \ingroup gelsy
 *
 *> \par Contributors:
 *  ==================
@@ -205,8 +205,10 @@
 *>    G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain \n
 *>
 *  =====================================================================
-      SUBROUTINE ZGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
+      SUBROUTINE ZGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND,
+     $                   RANK,
      $                   WORK, LWORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -242,7 +244,8 @@ SUBROUTINE ZGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
       COMPLEX*16         C1, C2, S1, S2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, XERBLA, ZCOPY, ZGEQP3, ZLAIC1, ZLASCL,
+      EXTERNAL           XERBLA, ZCOPY, ZGEQP3, ZLAIC1,
+     $                   ZLASCL,
      $                   ZLASET, ZTRSM, ZTZRZF, ZUNMQR, ZUNMRZ
 *     ..
 *     .. External Functions ..
@@ -303,7 +306,6 @@ SUBROUTINE ZGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
       SMLNUM = DLAMCH( 'S' ) / DLAMCH( 'P' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A, B if max entries outside range [SMLNUM,BIGNUM]
 *
@@ -336,13 +338,15 @@ SUBROUTINE ZGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
 *        Scale matrix norm up to SMLNUM
 *
-         CALL ZLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 1
       ELSE IF( BNRM.GT.BIGNUM ) THEN
 *
 *        Scale matrix norm down to BIGNUM
 *
-         CALL ZLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB,
+     $                INFO )
          IBSCL = 2
       END IF
 *
@@ -409,7 +413,8 @@ SUBROUTINE ZGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *
 *     B(1:M,1:NRHS) := Q**H * B(1:M,1:NRHS)
 *
-      CALL ZUNMQR( 'Left', 'Conjugate transpose', M, NRHS, MN, A, LDA,
+      CALL ZUNMQR( 'Left', 'Conjugate transpose', M, NRHS, MN, A,
+     $             LDA,
      $             WORK( 1 ), B, LDB, WORK( 2*MN+1 ), LWORK-2*MN, INFO )
       WSIZE = MAX( WSIZE, 2*MN+DBLE( WORK( 2*MN+1 ) ) )
 *
@@ -450,18 +455,22 @@ SUBROUTINE ZGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
 *     Undo scaling
 *
       IF( IASCL.EQ.1 ) THEN
-         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL ZLASCL( 'U', 0, 0, SMLNUM, ANRM, RANK, RANK, A, LDA,
      $                INFO )
       ELSE IF( IASCL.EQ.2 ) THEN
-         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB,
+     $                INFO )
          CALL ZLASCL( 'U', 0, 0, BIGNUM, ANRM, RANK, RANK, A, LDA,
      $                INFO )
       END IF
       IF( IBSCL.EQ.1 ) THEN
-         CALL ZLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL ZLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+         CALL ZLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB,
+     $                INFO )
       END IF
 *
    70 CONTINUE
diff --git a/SRC/zgemlq.f b/SRC/zgemlq.f
index 41cd1c0595..d3f26c272f 100644
--- a/SRC/zgemlq.f
+++ b/SRC/zgemlq.f
@@ -109,16 +109,17 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          (workspace) COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1, then a workspace query is assumed. The routine
 *>          only calculates the size of the WORK array, returns this
-*>          value as WORK(1), and no error message related to WORK 
+*>          value as WORK(1), and no error message related to WORK
 *>          is issued by XERBLA.
 *> \endverbatim
 *>
@@ -142,7 +143,7 @@
 *>
 *> \verbatim
 *>
-*> These details are particular for this LAPACK implementation. Users should not 
+*> These details are particular for this LAPACK implementation. Users should not
 *> take them for granted. These details may change in the future, and are not likely
 *> true for another LAPACK implementation. These details are relevant if one wants
 *> to try to understand the code. They are not part of the interface.
@@ -158,14 +159,17 @@
 *>  block sizes MB and NB returned by ILAENV, ZGELQ will use either
 *>  ZLASWLQ (if the matrix is wide-and-short) or ZGELQT to compute
 *>  the LQ factorization.
-*>  This version of ZGEMLQ will use either ZLAMSWLQ or ZGEMLQT to 
+*>  This version of ZGEMLQ will use either ZLAMSWLQ or ZGEMLQT to
 *>  multiply matrix Q by another matrix.
 *>  Further Details in ZLAMSWLQ or ZGEMLQT.
 *> \endverbatim
 *>
+*> \ingroup gemlq
+*>
 *  =====================================================================
       SUBROUTINE ZGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
      $                   C, LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -184,7 +188,7 @@ SUBROUTINE ZGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER            MB, NB, LW, NBLCKS, MN
+      INTEGER            MB, NB, LW, NBLCKS, MN, MINMNK, LWMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -200,7 +204,7 @@ SUBROUTINE ZGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *
 *     Test the input arguments
 *
-      LQUERY  = LWORK.EQ.-1
+      LQUERY  = ( LWORK.EQ.-1 )
       NOTRAN  = LSAME( TRANS, 'N' )
       TRAN    = LSAME( TRANS, 'C' )
       LEFT    = LSAME( SIDE, 'L' )
@@ -215,6 +219,13 @@ SUBROUTINE ZGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
         LW = M * MB
         MN = N
       END IF
+*
+      MINMNK = MIN( M, N, K )
+      IF( MINMNK.EQ.0 ) THEN
+        LWMIN = 1
+      ELSE
+        LWMIN = MAX( 1, LW )
+      END IF
 *
       IF( ( NB.GT.K ) .AND. ( MN.GT.K ) ) THEN
         IF( MOD( MN - K, NB - K ) .EQ. 0 ) THEN
@@ -243,7 +254,7 @@ SUBROUTINE ZGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
         INFO = -9
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
         INFO = -11
-      ELSE IF( ( LWORK.LT.MAX( 1, LW ) ) .AND. ( .NOT.LQUERY ) ) THEN
+      ELSE IF( ( LWORK.LT.LWMIN ) .AND. ( .NOT.LQUERY ) ) THEN
         INFO = -13
       END IF
 *
@@ -260,7 +271,7 @@ SUBROUTINE ZGEMLQ( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *
 *     Quick return if possible
 *
-      IF( MIN( M, N, K ).EQ.0 ) THEN
+      IF( MINMNK.EQ.0 ) THEN
         RETURN
       END IF
 *
diff --git a/SRC/zgemlqt.f b/SRC/zgemlqt.f
index ff0bb47a49..2d58cc232f 100644
--- a/SRC/zgemlqt.f
+++ b/SRC/zgemlqt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEMLQT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgemlqt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgemlqt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -35,13 +33,13 @@
 *>
 *> \verbatim
 *>
-*> ZGEMLQT overwrites the general real M-by-N matrix C with
+*> ZGEMLQT overwrites the general complex M-by-N matrix C with
 *>
 *>                 SIDE = 'L'     SIDE = 'R'
 *> TRANS = 'N':      Q C            C Q
 *> TRANS = 'C':   Q**H C            C Q**H
 *>
-*> where Q is a complex orthogonal matrix defined as the product of K
+*> where Q is a complex unitary matrix defined as the product of K
 *> elementary reflectors:
 *>
 *>       Q = H(1) H(2) . . . H(K) = I - V T V**H
@@ -160,11 +158,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleGEcomputational
+*> \ingroup gemlqt
 *
 *  =====================================================================
       SUBROUTINE ZGEMLQT( SIDE, TRANS, M, N, K, MB, V, LDV, T, LDT,
      $                   C, LDC, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,7 +182,7 @@ SUBROUTINE ZGEMLQT( SIDE, TRANS, M, N, K, MB, V, LDV, T, LDT,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, RIGHT, TRAN, NOTRAN
-      INTEGER            I, IB, LDWORK, KF
+      INTEGER            I, IB, LDWORK, KF, Q
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -207,8 +206,10 @@ SUBROUTINE ZGEMLQT( SIDE, TRANS, M, N, K, MB, V, LDV, T, LDT,
 *
       IF( LEFT ) THEN
          LDWORK = MAX( 1, N )
+         Q = M
       ELSE IF ( RIGHT ) THEN
          LDWORK = MAX( 1, M )
+         Q = N
       END IF
       IF( .NOT.LEFT .AND. .NOT.RIGHT ) THEN
          INFO = -1
@@ -218,7 +219,7 @@ SUBROUTINE ZGEMLQT( SIDE, TRANS, M, N, K, MB, V, LDV, T, LDT,
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
          INFO = -4
-      ELSE IF( K.LT.0) THEN
+      ELSE IF( K.LT.0 .OR. K.GT.Q ) THEN
          INFO = -5
       ELSE IF( MB.LT.1 .OR. (MB.GT.K .AND. K.GT.0)) THEN
          INFO = -6
diff --git a/SRC/zgemqr.f b/SRC/zgemqr.f
index c83eaff2f1..10bfb5479a 100644
--- a/SRC/zgemqr.f
+++ b/SRC/zgemqr.f
@@ -111,16 +111,17 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          (workspace) COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1, then a workspace query is assumed. The routine
 *>          only calculates the size of the WORK array, returns this
-*>          value as WORK(1), and no error message related to WORK 
+*>          value as WORK(1), and no error message related to WORK
 *>          is issued by XERBLA.
 *> \endverbatim
 *>
@@ -144,7 +145,7 @@
 *>
 *> \verbatim
 *>
-*> These details are particular for this LAPACK implementation. Users should not 
+*> These details are particular for this LAPACK implementation. Users should not
 *> take them for granted. These details may change in the future, and are not likely
 *> true for another LAPACK implementation. These details are relevant if one wants
 *> to try to understand the code. They are not part of the interface.
@@ -166,9 +167,12 @@
 *>
 *> \endverbatim
 *>
+*> \ingroup gemqr
+*>
 *  =====================================================================
       SUBROUTINE ZGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
      $                   C, LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -187,7 +191,7 @@ SUBROUTINE ZGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER            MB, NB, LW, NBLCKS, MN
+      INTEGER            MB, NB, LW, NBLCKS, MN, MINMNK, LWMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -203,7 +207,7 @@ SUBROUTINE ZGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *
 *     Test the input arguments
 *
-      LQUERY  = LWORK.EQ.-1
+      LQUERY  = ( LWORK.EQ.-1 )
       NOTRAN  = LSAME( TRANS, 'N' )
       TRAN    = LSAME( TRANS, 'C' )
       LEFT    = LSAME( SIDE, 'L' )
@@ -218,6 +222,13 @@ SUBROUTINE ZGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
         LW = MB * NB
         MN = N
       END IF
+*
+      MINMNK = MIN( M, N, K )
+      IF( MINMNK.EQ.0 ) THEN
+        LWMIN = 1
+      ELSE
+        LWMIN = MAX( 1, LW )
+      END IF
 *
       IF( ( MB.GT.K ) .AND. ( MN.GT.K ) ) THEN
         IF( MOD( MN - K, MB - K ).EQ.0 ) THEN
@@ -246,12 +257,12 @@ SUBROUTINE ZGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
         INFO = -9
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
         INFO = -11
-      ELSE IF( ( LWORK.LT.MAX( 1, LW ) ) .AND. ( .NOT.LQUERY ) ) THEN
+      ELSE IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
         INFO = -13
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-        WORK( 1 ) = LW
+        WORK( 1 ) = LWMIN
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -263,7 +274,7 @@ SUBROUTINE ZGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
 *
 *     Quick return if possible
 *
-      IF( MIN( M, N, K ).EQ.0 ) THEN
+      IF( MINMNK.EQ.0 ) THEN
         RETURN
       END IF
 *
@@ -276,7 +287,7 @@ SUBROUTINE ZGEMQR( SIDE, TRANS, M, N, K, A, LDA, T, TSIZE,
      $                 NB, C, LDC, WORK, LWORK, INFO )
       END IF
 *
-      WORK( 1 ) = LW
+      WORK( 1 ) = LWMIN
 *
       RETURN
 *
diff --git a/SRC/zgemqrt.f b/SRC/zgemqrt.f
index 94e2890cf0..faa5abaec8 100644
--- a/SRC/zgemqrt.f
+++ b/SRC/zgemqrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEMQRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgemqrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgemqrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -94,7 +92,7 @@
 *>          NB is INTEGER
 *>          The block size used for the storage of T.  K >= NB >= 1.
 *>          This must be the same value of NB used to generate T
-*>          in CGEQRT.
+*>          in ZGEQRT.
 *> \endverbatim
 *>
 *> \param[in] V
@@ -102,7 +100,7 @@
 *>          V is COMPLEX*16 array, dimension (LDV,K)
 *>          The i-th column must contain the vector which defines the
 *>          elementary reflector H(i), for i = 1,2,...,k, as returned by
-*>          CGEQRT in the first K columns of its array argument A.
+*>          ZGEQRT in the first K columns of its array argument A.
 *> \endverbatim
 *>
 *> \param[in] LDV
@@ -117,7 +115,7 @@
 *> \verbatim
 *>          T is COMPLEX*16 array, dimension (LDT,K)
 *>          The upper triangular factors of the block reflectors
-*>          as returned by CGEQRT, stored as a NB-by-N matrix.
+*>          as returned by ZGEQRT, stored as a NB-by-N matrix.
 *> \endverbatim
 *>
 *> \param[in] LDT
@@ -160,11 +158,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup gemqrt
 *
 *  =====================================================================
       SUBROUTINE ZGEMQRT( SIDE, TRANS, M, N, K, NB, V, LDV, T, LDT,
      $                   C, LDC, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zgeql2.f b/SRC/zgeql2.f
index 35bd61d412..6cd9afe8cb 100644
--- a/SRC/zgeql2.f
+++ b/SRC/zgeql2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEQL2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeql2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeql2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,7 +96,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup geql2
 *
 *> \par Further Details:
 *  =====================
@@ -120,6 +118,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGEQL2( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -140,10 +139,9 @@ SUBROUTINE ZGEQL2( M, N, A, LDA, TAU, WORK, INFO )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      COMPLEX*16         ALPHA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARF, ZLARFG
+      EXTERNAL           XERBLA, ZLARF1L, ZLARFG
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DCONJG, MAX, MIN
@@ -172,15 +170,13 @@ SUBROUTINE ZGEQL2( M, N, A, LDA, TAU, WORK, INFO )
 *        Generate elementary reflector H(i) to annihilate
 *        A(1:m-k+i-1,n-k+i)
 *
-         ALPHA = A( M-K+I, N-K+I )
-         CALL ZLARFG( M-K+I, ALPHA, A( 1, N-K+I ), 1, TAU( I ) )
+         CALL ZLARFG( M-K+I, A( M-K+I, N-K+I ), A( 1, N-K+I ), 1,
+     $                TAU( I ) )
 *
 *        Apply H(i)**H to A(1:m-k+i,1:n-k+i-1) from the left
 *
-         A( M-K+I, N-K+I ) = ONE
-         CALL ZLARF( 'Left', M-K+I, N-K+I-1, A( 1, N-K+I ), 1,
-     $               DCONJG( TAU( I ) ), A, LDA, WORK )
-         A( M-K+I, N-K+I ) = ALPHA
+         CALL ZLARF1L( 'Left', M-K+I, N-K+I-1, A( 1, N-K+I ), 1,
+     $                 CONJG( TAU( I ) ), A, LDA, WORK )
    10 CONTINUE
       RETURN
 *
diff --git a/SRC/zgeqlf.f b/SRC/zgeqlf.f
index 94721540c5..7270e5d8af 100644
--- a/SRC/zgeqlf.f
+++ b/SRC/zgeqlf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEQLF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeqlf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeqlf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,7 +86,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,N).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= N, otherwise.
 *>          For optimum performance LWORK >= N*NB, where NB is
 *>          the optimal blocksize.
 *>
@@ -113,7 +112,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup geqlf
 *
 *> \par Further Details:
 *  =====================
@@ -135,6 +134,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,8 +188,9 @@ SUBROUTINE ZGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          END IF
          WORK( 1 ) = LWKOPT
 *
-         IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
-            INFO = -7
+         IF( .NOT.LQUERY ) THEN
+            IF( LWORK.LE.0 .OR. ( M.GT.0 .AND. LWORK.LT.MAX( 1, N ) ) )
+     $         INFO = -7
          END IF
       END IF
 *
@@ -246,7 +247,8 @@ SUBROUTINE ZGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *           Compute the QL factorization of the current block
 *           A(1:m-k+i+ib-1,n-k+i:n-k+i+ib-1)
 *
-            CALL ZGEQL2( M-K+I+IB-1, IB, A( 1, N-K+I ), LDA, TAU( I ),
+            CALL ZGEQL2( M-K+I+IB-1, IB, A( 1, N-K+I ), LDA,
+     $                   TAU( I ),
      $                   WORK, IINFO )
             IF( N-K+I.GT.1 ) THEN
 *
@@ -258,7 +260,8 @@ SUBROUTINE ZGEQLF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *              Apply H**H to A(1:m-k+i+ib-1,1:n-k+i-1) from the left
 *
-               CALL ZLARFB( 'Left', 'Conjugate transpose', 'Backward',
+               CALL ZLARFB( 'Left', 'Conjugate transpose',
+     $                      'Backward',
      $                      'Columnwise', M-K+I+IB-1, N-K+I-1, IB,
      $                      A( 1, N-K+I ), LDA, WORK, LDWORK, A, LDA,
      $                      WORK( IB+1 ), LDWORK )
diff --git a/SRC/zgeqp3.f b/SRC/zgeqp3.f
index 9e55fb0c98..2c33ad4b5c 100644
--- a/SRC/zgeqp3.f
+++ b/SRC/zgeqp3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEQP3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeqp3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeqp3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,7 +125,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup geqp3
 *
 *> \par Further Details:
 *  =====================
@@ -156,6 +154,7 @@
 *  =====================================================================
       SUBROUTINE ZGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, RWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -182,7 +181,8 @@ SUBROUTINE ZGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, RWORK,
      $                   NBMIN, NFXD, NX, SM, SMINMN, SN, TOPBMN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZGEQRF, ZLAQP2, ZLAQPS, ZSWAP, ZUNMQR
+      EXTERNAL           XERBLA, ZGEQRF, ZLAQP2, ZLAQPS, ZSWAP,
+     $                   ZUNMQR
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
@@ -265,7 +265,8 @@ SUBROUTINE ZGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, RWORK,
 *CC         CALL ZUNM2R( 'Left', 'Conjugate Transpose', M, N-NA,
 *CC  $                   NA, A, LDA, TAU, A( 1, NA+1 ), LDA, WORK,
 *CC  $                   INFO )
-            CALL ZUNMQR( 'Left', 'Conjugate Transpose', M, N-NA, NA, A,
+            CALL ZUNMQR( 'Left', 'Conjugate Transpose', M, N-NA, NA,
+     $                   A,
      $                   LDA, TAU, A( 1, NA+1 ), LDA, WORK, LWORK,
      $                   INFO )
             IWS = MAX( IWS, INT( WORK( 1 ) ) )
@@ -307,7 +308,8 @@ SUBROUTINE ZGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, RWORK,
 *                 determine the minimum value of NB.
 *
                   NB = LWORK / ( SN+1 )
-                  NBMIN = MAX( 2, ILAENV( INBMIN, 'ZGEQRF', ' ', SM, SN,
+                  NBMIN = MAX( 2, ILAENV( INBMIN, 'ZGEQRF', ' ', SM,
+     $                         SN,
      $                    -1, -1 ) )
 *
 *
diff --git a/SRC/zgeqp3rk.f b/SRC/zgeqp3rk.f
new file mode 100644
index 0000000000..989ce69cc7
--- /dev/null
+++ b/SRC/zgeqp3rk.f
@@ -0,0 +1,1084 @@
+*> \brief \b ZGEQP3RK computes a truncated Householder QR factorization with column pivoting of a complex m-by-n matrix A by using Level 3 BLAS and overwrites m-by-nrhs matrix B with Q**H * B.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download ZGEQP3RK + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeqp3rk.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgeqp3rk.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeqp3rk.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZGEQP3RK( M, N, NRHS, KMAX, ABSTOL, RELTOL, A, LDA,
+*      $                     K, MAXC2NRMK, RELMAXC2NRMK, JPIV, TAU,
+*      $                     WORK, LWORK, RWORK, IWORK, INFO )
+*       IMPLICIT NONE
+*
+*      .. Scalar Arguments ..
+*       INTEGER            INFO, K, KMAX, LDA, LWORK, M, N, NRHS
+*       DOUBLE PRECISION   ABSTOL, MAXC2NRMK, RELMAXC2NRMK, RELTOL
+*      ..
+*      .. Array Arguments ..
+*       INTEGER            IWORK( * ), JPIV( * )
+*       DOUBLE PRECISION   RWORK( * )
+*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*      ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZGEQP3RK performs two tasks simultaneously:
+*>
+*> Task 1: The routine computes a truncated (rank K) or full rank
+*> Householder QR factorization with column pivoting of a complex
+*> M-by-N matrix A using Level 3 BLAS. K is the number of columns
+*> that were factorized, i.e. factorization rank of the
+*> factor R, K <= min(M,N).
+*>
+*>  A * P(K) = Q(K) * R(K)  =
+*>
+*>        = Q(K) * ( R11(K) R12(K) ) = Q(K) * (   R(K)_approx    )
+*>                 ( 0      R22(K) )          ( 0  R(K)_residual ),
+*>
+*> where:
+*>
+*>  P(K)            is an N-by-N permutation matrix;
+*>  Q(K)            is an M-by-M unitary matrix;
+*>  R(K)_approx   = ( R11(K), R12(K) ) is a rank K approximation of the
+*>                    full rank factor R with K-by-K upper-triangular
+*>                    R11(K) and K-by-N rectangular R12(K). The diagonal
+*>                    entries of R11(K) appear in non-increasing order
+*>                    of absolute value, and absolute values of all of
+*>                    them exceed the maximum column 2-norm of R22(K)
+*>                    up to roundoff error.
+*>  R(K)_residual = R22(K) is the residual of a rank K approximation
+*>                    of the full rank factor R. It is a
+*>                    an (M-K)-by-(N-K) rectangular matrix;
+*>  0               is a an (M-K)-by-K zero matrix.
+*>
+*> Task 2: At the same time, the routine overwrites a complex M-by-NRHS
+*> matrix B with  Q(K)**H * B  using Level 3 BLAS.
+*>
+*> =====================================================================
+*>
+*> The matrices A and B are stored on input in the array A as
+*> the left and right blocks A(1:M,1:N) and A(1:M, N+1:N+NRHS)
+*> respectively.
+*>
+*>                                  N     NRHS
+*>             array_A   =   M  [ mat_A, mat_B ]
+*>
+*> The truncation criteria (i.e. when to stop the factorization)
+*> can be any of the following:
+*>
+*>   1) The input parameter KMAX, the maximum number of columns
+*>      KMAX to factorize, i.e. the factorization rank is limited
+*>      to KMAX. If KMAX >= min(M,N), the criterion is not used.
+*>
+*>   2) The input parameter ABSTOL, the absolute tolerance for
+*>      the maximum column 2-norm of the residual matrix R22(K). This
+*>      means that the factorization stops if this norm is less or
+*>      equal to ABSTOL. If ABSTOL < 0.0, the criterion is not used.
+*>
+*>   3) The input parameter RELTOL, the tolerance for the maximum
+*>      column 2-norm matrix of the residual matrix R22(K) divided
+*>      by the maximum column 2-norm of the original matrix A, which
+*>      is equal to abs(R(1,1)). This means that the factorization stops
+*>      when the ratio of the maximum column 2-norm of R22(K) to
+*>      the maximum column 2-norm of A is less than or equal to RELTOL.
+*>      If RELTOL < 0.0, the criterion is not used.
+*>
+*>   4) In case both stopping criteria ABSTOL or RELTOL are not used,
+*>      and when the residual matrix R22(K) is a zero matrix in some
+*>      factorization step K. ( This stopping criterion is implicit. )
+*>
+*>  The algorithm stops when any of these conditions is first
+*>  satisfied, otherwise the whole matrix A is factorized.
+*>
+*>  To factorize the whole matrix A, use the values
+*>  KMAX >= min(M,N), ABSTOL < 0.0 and RELTOL < 0.0.
+*>
+*>  The routine returns:
+*>     a) Q(K), R(K)_approx = ( R11(K), R12(K) ),
+*>        R(K)_residual = R22(K), P(K), i.e. the resulting matrices
+*>        of the factorization; P(K) is represented by JPIV,
+*>        ( if K = min(M,N), R(K)_approx is the full factor R,
+*>        and there is no residual matrix R(K)_residual);
+*>     b) K, the number of columns that were factorized,
+*>        i.e. factorization rank;
+*>     c) MAXC2NRMK, the maximum column 2-norm of the residual
+*>        matrix R(K)_residual = R22(K),
+*>        ( if K = min(M,N), MAXC2NRMK = 0.0 );
+*>     d) RELMAXC2NRMK equals MAXC2NRMK divided by MAXC2NRM, the maximum
+*>        column 2-norm of the original matrix A, which is equal
+*>        to abs(R(1,1)), ( if K = min(M,N), RELMAXC2NRMK = 0.0 );
+*>     e) Q(K)**H * B, the matrix B with the unitary
+*>        transformation Q(K)**H applied on the left.
+*>
+*> The N-by-N permutation matrix P(K) is stored in a compact form in
+*> the integer array JPIV. For 1 <= j <= N, column j
+*> of the matrix A was interchanged with column JPIV(j).
+*>
+*> The M-by-M unitary matrix Q is represented as a product
+*> of elementary Householder reflectors
+*>
+*>     Q(K) = H(1) *  H(2) * . . . * H(K),
+*>
+*> where K is the number of columns that were factorized.
+*>
+*> Each H(j) has the form
+*>
+*>     H(j) = I - tau * v * v**H,
+*>
+*> where 1 <= j <= K and
+*>   I    is an M-by-M identity matrix,
+*>   tau  is a complex scalar,
+*>   v    is a complex vector with v(1:j-1) = 0 and v(j) = 1.
+*>
+*> v(j+1:M) is stored on exit in A(j+1:M,j) and tau in TAU(j).
+*>
+*> See the Further Details section for more information.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e. the number of
+*>          columns of the matrix B. NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] KMAX
+*> \verbatim
+*>          KMAX is INTEGER
+*>
+*>          The first factorization stopping criterion. KMAX >= 0.
+*>
+*>          The maximum number of columns of the matrix A to factorize,
+*>          i.e. the maximum factorization rank.
+*>
+*>          a) If KMAX >= min(M,N), then this stopping criterion
+*>                is not used, the routine factorizes columns
+*>                depending on ABSTOL and RELTOL.
+*>
+*>          b) If KMAX = 0, then this stopping criterion is
+*>                satisfied on input and the routine exits immediately.
+*>                This means that the factorization is not performed,
+*>                the matrices A and B are not modified, and
+*>                the matrix A is itself the residual.
+*> \endverbatim
+*>
+*> \param[in] ABSTOL
+*> \verbatim
+*>          ABSTOL is DOUBLE PRECISION
+*>
+*>          The second factorization stopping criterion, cannot be NaN.
+*>
+*>          The absolute tolerance (stopping threshold) for
+*>          maximum column 2-norm of the residual matrix R22(K).
+*>          The algorithm converges (stops the factorization) when
+*>          the maximum column 2-norm of the residual matrix R22(K)
+*>          is less than or equal to ABSTOL. Let SAFMIN = DLAMCH('S').
+*>
+*>          a) If ABSTOL is NaN, then no computation is performed
+*>                and an error message ( INFO = -5 ) is issued
+*>                by XERBLA.
+*>
+*>          b) If ABSTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on KMAX and RELTOL.
+*>                This includes the case ABSTOL = -Inf.
+*>
+*>          c) If 0.0 <= ABSTOL < 2*SAFMIN, then ABSTOL = 2*SAFMIN
+*>                is used. This includes the case ABSTOL = -0.0.
+*>
+*>          d) If 2*SAFMIN <= ABSTOL then the input value
+*>                of ABSTOL is used.
+*>
+*>          Let MAXC2NRM be the maximum column 2-norm of the
+*>          whole original matrix A.
+*>          If ABSTOL chosen above is >= MAXC2NRM, then this
+*>          stopping criterion is satisfied on input and routine exits
+*>          immediately after MAXC2NRM is computed. The routine
+*>          returns MAXC2NRM in MAXC2NORMK,
+*>          and 1.0 in RELMAXC2NORMK.
+*>          This includes the case ABSTOL = +Inf. This means that the
+*>          factorization is not performed, the matrices A and B are not
+*>          modified, and the matrix A is itself the residual.
+*> \endverbatim
+*>
+*> \param[in] RELTOL
+*> \verbatim
+*>          RELTOL is DOUBLE PRECISION
+*>
+*>          The third factorization stopping criterion, cannot be NaN.
+*>
+*>          The tolerance (stopping threshold) for the ratio
+*>          abs(R(K+1,K+1))/abs(R(1,1)) of the maximum column 2-norm of
+*>          the residual matrix R22(K) to the maximum column 2-norm of
+*>          the original matrix A. The algorithm converges (stops the
+*>          factorization), when abs(R(K+1,K+1))/abs(R(1,1)) A is less
+*>          than or equal to RELTOL. Let EPS = DLAMCH('E').
+*>
+*>          a) If RELTOL is NaN, then no computation is performed
+*>                and an error message ( INFO = -6 ) is issued
+*>                by XERBLA.
+*>
+*>          b) If RELTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on KMAX and ABSTOL.
+*>                This includes the case RELTOL = -Inf.
+*>
+*>          c) If 0.0 <= RELTOL < EPS, then RELTOL = EPS is used.
+*>                This includes the case RELTOL = -0.0.
+*>
+*>          d) If EPS <= RELTOL then the input value of RELTOL
+*>                is used.
+*>
+*>          Let MAXC2NRM be the maximum column 2-norm of the
+*>          whole original matrix A.
+*>          If RELTOL chosen above is >= 1.0, then this stopping
+*>          criterion is satisfied on input and routine exits
+*>          immediately after MAXC2NRM is computed.
+*>          The routine returns MAXC2NRM in MAXC2NORMK,
+*>          and 1.0 in RELMAXC2NORMK.
+*>          This includes the case RELTOL = +Inf. This means that the
+*>          factorization is not performed, the matrices A and B are not
+*>          modified, and the matrix A is itself the residual.
+*>
+*>          NOTE: We recommend that RELTOL satisfy
+*>                min( 10*max(M,N)*EPS, sqrt(EPS) ) <= RELTOL
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N+NRHS)
+*>
+*>          On entry:
+*>
+*>          a) The subarray A(1:M,1:N) contains the M-by-N matrix A.
+*>          b) The subarray A(1:M,N+1:N+NRHS) contains the M-by-NRHS
+*>             matrix B.
+*>
+*>                                  N     NRHS
+*>              array_A   =   M  [ mat_A, mat_B ]
+*>
+*>          On exit:
+*>
+*>          a) The subarray A(1:M,1:N) contains parts of the factors
+*>             of the matrix A:
+*>
+*>            1) If K = 0, A(1:M,1:N) contains the original matrix A.
+*>            2) If K > 0, A(1:M,1:N) contains parts of the
+*>            factors:
+*>
+*>              1. The elements below the diagonal of the subarray
+*>                 A(1:M,1:K) together with TAU(1:K) represent the
+*>                 unitary matrix Q(K) as a product of K Householder
+*>                 elementary reflectors.
+*>
+*>              2. The elements on and above the diagonal of
+*>                 the subarray A(1:K,1:N) contain K-by-N
+*>                 upper-trapezoidal matrix
+*>                 R(K)_approx = ( R11(K), R12(K) ).
+*>                 NOTE: If K=min(M,N), i.e. full rank factorization,
+*>                       then R_approx(K) is the full factor R which
+*>                       is upper-trapezoidal. If, in addition, M>=N,
+*>                       then R is upper-triangular.
+*>
+*>              3. The subarray A(K+1:M,K+1:N) contains (M-K)-by-(N-K)
+*>                 rectangular matrix R(K)_residual = R22(K).
+*>
+*>          b) If NRHS > 0, the subarray A(1:M,N+1:N+NRHS) contains
+*>             the M-by-NRHS product Q(K)**H * B.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*>          This is the leading dimension for both matrices, A and B.
+*> \endverbatim
+*>
+*> \param[out] K
+*> \verbatim
+*>          K is INTEGER
+*>          Factorization rank of the matrix A, i.e. the rank of
+*>          the factor R, which is the same as the number of non-zero
+*>          rows of the factor R. 0 <= K <= min(M,KMAX,N).
+*>
+*>          K also represents the number of non-zero Householder
+*>          vectors.
+*>
+*>          NOTE: If K = 0, a) the arrays A and B are not modified;
+*>                          b) the array TAU(1:min(M,N)) is set to ZERO,
+*>                             if the matrix A does not contain NaN,
+*>                             otherwise the elements TAU(1:min(M,N))
+*>                             are undefined;
+*>                          c) the elements of the array JPIV are set
+*>                             as follows: for j = 1:N, JPIV(j) = j.
+*> \endverbatim
+*>
+*> \param[out] MAXC2NRMK
+*> \verbatim
+*>          MAXC2NRMK is DOUBLE PRECISION
+*>          The maximum column 2-norm of the residual matrix R22(K),
+*>          when the factorization stopped at rank K. MAXC2NRMK >= 0.
+*>
+*>          a) If K = 0, i.e. the factorization was not performed,
+*>             the matrix A was not modified and is itself a residual
+*>             matrix, then MAXC2NRMK equals the maximum column 2-norm
+*>             of the original matrix A.
+*>
+*>          b) If 0 < K < min(M,N), then MAXC2NRMK is returned.
+*>
+*>          c) If K = min(M,N), i.e. the whole matrix A was
+*>             factorized and there is no residual matrix,
+*>             then MAXC2NRMK = 0.0.
+*>
+*>          NOTE: MAXC2NRMK in the factorization step K would equal
+*>                R(K+1,K+1) in the next factorization step K+1.
+*> \endverbatim
+*>
+*> \param[out] RELMAXC2NRMK
+*> \verbatim
+*>          RELMAXC2NRMK is DOUBLE PRECISION
+*>          The ratio MAXC2NRMK / MAXC2NRM of the maximum column
+*>          2-norm of the residual matrix R22(K) (when the factorization
+*>          stopped at rank K) to the maximum column 2-norm of the
+*>          whole original matrix A. RELMAXC2NRMK >= 0.
+*>
+*>          a) If K = 0, i.e. the factorization was not performed,
+*>             the matrix A was not modified and is itself a residual
+*>             matrix, then RELMAXC2NRMK = 1.0.
+*>
+*>          b) If 0 < K < min(M,N), then
+*>                RELMAXC2NRMK = MAXC2NRMK / MAXC2NRM is returned.
+*>
+*>          c) If K = min(M,N), i.e. the whole matrix A was
+*>             factorized and there is no residual matrix,
+*>             then RELMAXC2NRMK = 0.0.
+*>
+*>         NOTE: RELMAXC2NRMK in the factorization step K would equal
+*>               abs(R(K+1,K+1))/abs(R(1,1)) in the next factorization
+*>               step K+1.
+*> \endverbatim
+*>
+*> \param[out] JPIV
+*> \verbatim
+*>          JPIV is INTEGER array, dimension (N)
+*>          Column pivot indices. For 1 <= j <= N, column j
+*>          of the matrix A was interchanged with column JPIV(j).
+*>
+*>          The elements of the array JPIV(1:N) are always set
+*>          by the routine, for example, even  when no columns
+*>          were factorized, i.e. when K = 0, the elements are
+*>          set as JPIV(j) = j for j = 1:N.
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (min(M,N))
+*>          The scalar factors of the elementary reflectors.
+*>
+*>          If 0 < K <= min(M,N), only the elements TAU(1:K) of
+*>          the array TAU are modified by the factorization.
+*>          After the factorization computed, if no NaN was found
+*>          during the factorization, the remaining elements
+*>          TAU(K+1:min(M,N)) are set to zero, otherwise the
+*>          elements TAU(K+1:min(M,N)) are not set and therefore
+*>          undefined.
+*>          ( If K = 0, all elements of TAU are set to zero, if
+*>          the matrix A does not contain NaN. )
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and
+*>          LWORK >= N+NRHS-1, otherwise.
+*>          For optimal performance LWORK >= NB*( N+NRHS+1 ),
+*>          where NB is the optimal block size for ZGEQP3RK returned
+*>          by ILAENV. Minimal block size MINNB=2.
+*>
+*>          NOTE: The decision, whether to use unblocked BLAS 2
+*>          or blocked BLAS 3 code is based not only on the dimension
+*>          LWORK of the availbale workspace WORK, but also also on the
+*>          matrix A dimension N via crossover point NX returned
+*>          by ILAENV. (For N less than NX, unblocked code should be
+*>          used.)
+*>
+*>          If LWORK = -1, then a workspace query is assumed;
+*>          the routine only calculates the optimal size of the WORK
+*>          array, returns this value as the first entry of the WORK
+*>          array, and no error message related to LWORK is issued
+*>          by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension (2*N)
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (N-1).
+*>          Is a work array. ( IWORK is used to store indices
+*>          of "bad" columns for norm downdating in the residual
+*>          matrix in the blocked step auxiliary subroutine ZLAQP3RK ).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          1) INFO = 0: successful exit.
+*>          2) INFO < 0: if INFO = -i, the i-th argument had an
+*>                       illegal value.
+*>          3) If INFO = j_1, where 1 <= j_1 <= N, then NaN was
+*>             detected and the routine stops the computation.
+*>             The j_1-th column of the matrix A or the j_1-th
+*>             element of array TAU contains the first occurrence
+*>             of NaN in the factorization step K+1 ( when K columns
+*>             have been factorized ).
+*>
+*>             On exit:
+*>             K                  is set to the number of
+*>                                   factorized columns without
+*>                                   exception.
+*>             MAXC2NRMK          is set to NaN.
+*>             RELMAXC2NRMK       is set to NaN.
+*>             TAU(K+1:min(M,N))  is not set and contains undefined
+*>                                   elements. If j_1=K+1, TAU(K+1)
+*>                                   may contain NaN.
+*>          4) If INFO = j_2, where N+1 <= j_2 <= 2*N, then no NaN
+*>             was detected, but +Inf (or -Inf) was detected and
+*>             the routine continues the computation until completion.
+*>             The (j_2-N)-th column of the matrix A contains the first
+*>             occurrence of +Inf (or -Inf) in the factorization
+*>             step K+1 ( when K columns have been factorized ).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup geqp3rk
+*
+*> \par Further Details:
+*  =====================
+*
+*> \verbatim
+*> ZGEQP3RK is based on the same BLAS3 Householder QR factorization
+*> algorithm with column pivoting as in ZGEQP3 routine which uses
+*> ZLARFG routine to generate Householder reflectors
+*> for QR factorization.
+*>
+*> We can also write:
+*>
+*>   A = A_approx(K) + A_residual(K)
+*>
+*> The low rank approximation matrix A(K)_approx from
+*> the truncated QR factorization of rank K of the matrix A is:
+*>
+*>   A(K)_approx = Q(K) * ( R(K)_approx ) * P(K)**T
+*>                        (     0     0 )
+*>
+*>               = Q(K) * ( R11(K) R12(K) ) * P(K)**T
+*>                        (      0      0 )
+*>
+*> The residual A_residual(K) of the matrix A is:
+*>
+*>   A_residual(K) = Q(K) * ( 0              0 ) * P(K)**T =
+*>                          ( 0  R(K)_residual )
+*>
+*>                 = Q(K) * ( 0        0 ) * P(K)**T
+*>                          ( 0   R22(K) )
+*>
+*> The truncated (rank K) factorization guarantees that
+*> the maximum column 2-norm of A_residual(K) is less than
+*> or equal to MAXC2NRMK up to roundoff error.
+*>
+*> NOTE: An approximation of the null vectors
+*>       of A can be easily computed from R11(K)
+*>       and R12(K):
+*>
+*>       Null( A(K) )_approx = P * ( inv(R11(K)) * R12(K) )
+*>                                 (         -I           )
+*>
+*> \endverbatim
+*
+*> \par References:
+*  ================
+*> [1] A Level 3 BLAS QR factorization algorithm with column pivoting developed in 1996.
+*> G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain.
+*> X. Sun, Computer Science Dept., Duke University, USA.
+*> C. H. Bischof, Math. and Comp. Sci. Div., Argonne National Lab, USA.
+*> A BLAS-3 version of the QR factorization with column pivoting.
+*> LAPACK Working Note 114
+*> <a href="https://www.netlib.org/lapack/lawnspdf/lawn114.pdf">https://www.netlib.org/lapack/lawnspdf/lawn114.pdf</a>
+*> and in
+*> SIAM J. Sci. Comput., 19(5):1486-1494, Sept. 1998.
+*> <a href="https://doi.org/10.1137/S1064827595296732">https://doi.org/10.1137/S1064827595296732</a>
+*>
+*> [2] A partial column norm updating strategy developed in 2006.
+*> Z. Drmac and Z. Bujanovic, Dept. of Math., University of Zagreb, Croatia.
+*> On the failure of rank revealing QR factorization software – a case study.
+*> LAPACK Working Note 176.
+*> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">http://www.netlib.org/lapack/lawnspdf/lawn176.pdf</a>
+*> and in
+*> ACM Trans. Math. Softw. 35, 2, Article 12 (July 2008), 28 pages.
+*> <a href="https://doi.org/10.1145/1377612.1377616">https://doi.org/10.1145/1377612.1377616</a>
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
+*>
+*>  November  2023, Igor Kozachenko, James Demmel,
+*>                  EECS Department,
+*>                  University of California, Berkeley, USA.
+*>
+*> \endverbatim
+*
+*  =====================================================================
+      SUBROUTINE ZGEQP3RK( M, N, NRHS, KMAX, ABSTOL, RELTOL, A, LDA,
+     $                     K, MAXC2NRMK, RELMAXC2NRMK, JPIV, TAU,
+     $                     WORK, LWORK, RWORK, IWORK, INFO )
+      IMPLICIT NONE
+*
+*  -- LAPACK computational routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            INFO, K, KF, KMAX, LDA, LWORK, M, N, NRHS
+      DOUBLE PRECISION   ABSTOL,  MAXC2NRMK, RELMAXC2NRMK, RELTOL
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IWORK( * ), JPIV( * )
+      DOUBLE PRECISION   RWORK( * )
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      INTEGER            INB, INBMIN, IXOVER
+      PARAMETER          ( INB = 1, INBMIN = 2, IXOVER = 3 )
+      DOUBLE PRECISION   ZERO, ONE, TWO
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0, TWO = 2.0D+0 )
+      COMPLEX*16         CZERO
+      PARAMETER          ( CZERO = ( 0.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY, DONE
+      INTEGER            IINFO, IOFFSET, IWS, J, JB, JBF, JMAXB, JMAX,
+     $                   JMAXC2NRM, KP1, LWKOPT, MINMN, N_SUB, NB,
+     $                   NBMIN, NX
+      DOUBLE PRECISION   EPS, HUGEVAL, MAXC2NRM, SAFMIN
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZLAQP2RK, ZLAQP3RK, XERBLA
+*     ..
+*     .. External Functions ..
+      LOGICAL            DISNAN
+      INTEGER            IDAMAX, ILAENV
+      DOUBLE PRECISION   DLAMCH, DZNRM2
+      EXTERNAL           DISNAN, DLAMCH, DZNRM2, IDAMAX, ILAENV
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DCMPLX, MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Test input arguments
+*     ====================
+*
+      INFO = 0
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( KMAX.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( DISNAN( ABSTOL ) ) THEN
+         INFO = -5
+      ELSE IF( DISNAN( RELTOL ) ) THEN
+         INFO = -6
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -8
+      END IF
+*
+*     If the input parameters M, N, NRHS, KMAX, LDA are valid:
+*       a) Test the input workspace size LWORK for the minimum
+*          size requirement IWS.
+*       b) Determine the optimal block size NB and optimal
+*          workspace size LWKOPT to be returned in WORK(1)
+*          in case of (1) LWORK < IWS, (2) LQUERY = .TRUE.,
+*          (3) when routine exits.
+*     Here, IWS is the miminum workspace required for unblocked
+*     code.
+*
+      IF( INFO.EQ.0 ) THEN
+         MINMN = MIN( M, N )
+         IF( MINMN.EQ.0 ) THEN
+            IWS = 1
+            LWKOPT = 1
+         ELSE
+*
+*           Minimal workspace size in case of using only unblocked
+*           BLAS 2 code in ZLAQP2RK.
+*           1) ZLAQP2RK: N+NRHS-1 to use in WORK array that is used
+*              in ZLARF1F subroutine inside ZLAQP2RK to apply an
+*              elementary reflector from the left.
+*           TOTAL_WORK_SIZE = 3*N + NRHS - 1
+*
+            IWS = N + NRHS - 1
+*
+*           Assign to NB optimal block size.
+*
+            NB = ILAENV( INB, 'ZGEQP3RK', ' ', M, N, -1, -1 )
+*
+*           A formula for the optimal workspace size in case of using
+*           both unblocked BLAS 2 in ZLAQP2RK and blocked BLAS 3 code
+*           in ZLAQP3RK.
+*           1) ZGEQP3RK, ZLAQP2RK, ZLAQP3RK: 2*N to store full and
+*              partial column 2-norms.
+*           2) ZLAQP2RK: N+NRHS-1 to use in WORK array that is used
+*              in ZLARF1F subroutine to apply an elementary reflector
+*              from the left.
+*           3) ZLAQP3RK: NB*(N+NRHS) to use in the work array F that
+*              is used to apply a block reflector from
+*              the left.
+*           4) ZLAQP3RK: NB to use in the auxilixary array AUX.
+*           Sizes (2) and ((3) + (4)) should intersect, therefore
+*           TOTAL_WORK_SIZE = 2*N + NB*( N+NRHS+1 ), given NBMIN=2.
+*
+            LWKOPT = 2*N + NB*( N+NRHS+1 )
+         END IF
+         WORK( 1 ) = DCMPLX( LWKOPT )
+*
+         IF( ( LWORK.LT.IWS ) .AND. .NOT.LQUERY ) THEN
+            INFO = -15
+         END IF
+      END IF
+*
+*      NOTE: The optimal workspace size is returned in WORK(1), if
+*            the input parameters M, N, NRHS, KMAX, LDA are valid.
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGEQP3RK', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible for M=0 or N=0.
+*
+      IF( MINMN.EQ.0 ) THEN
+         K = 0
+         MAXC2NRMK = ZERO
+         RELMAXC2NRMK = ZERO
+         WORK( 1 ) = DCMPLX( LWKOPT )
+         RETURN
+      END IF
+*
+*     ==================================================================
+*
+*     Initialize column pivot array JPIV.
+*
+      DO J = 1, N
+         JPIV( J ) = J
+      END DO
+*
+*     ==================================================================
+*
+*     Initialize storage for partial and exact column 2-norms.
+*     a) The elements WORK(1:N) are used to store partial column
+*        2-norms of the matrix A, and may decrease in each computation
+*        step; initialize to the values of complete columns 2-norms.
+*     b) The elements WORK(N+1:2*N) are used to store complete column
+*        2-norms of the matrix A, they are not changed during the
+*        computation; initialize the values of complete columns 2-norms.
+*
+      DO J = 1, N
+         RWORK( J ) = DZNRM2( M, A( 1, J ), 1 )
+         RWORK( N+J ) = RWORK( J )
+      END DO
+*
+*     ==================================================================
+*
+*     Compute the pivot column index and the maximum column 2-norm
+*     for the whole original matrix stored in A(1:M,1:N).
+*
+      KP1 = IDAMAX( N, RWORK( 1 ), 1 )
+      MAXC2NRM = RWORK( KP1 )
+*
+*     ==================================================================.
+*
+      IF( DISNAN( MAXC2NRM ) ) THEN
+*
+*        Check if the matrix A contains NaN, set INFO parameter
+*        to the column number where the first NaN is found and return
+*        from the routine.
+*
+         K = 0
+         INFO = KP1
+*
+*        Set MAXC2NRMK and  RELMAXC2NRMK to NaN.
+*
+         MAXC2NRMK = MAXC2NRM
+         RELMAXC2NRMK = MAXC2NRM
+*
+*        Array TAU is not set and contains undefined elements.
+*
+         WORK( 1 ) = DCMPLX( LWKOPT )
+         RETURN
+      END IF
+*
+*     ===================================================================
+*
+      IF( MAXC2NRM.EQ.ZERO ) THEN
+*
+*        Check is the matrix A is a zero matrix, set array TAU and
+*        return from the routine.
+*
+         K = 0
+         MAXC2NRMK = ZERO
+         RELMAXC2NRMK = ZERO
+*
+         DO J = 1, MINMN
+            TAU( J ) = CZERO
+         END DO
+*
+         WORK( 1 ) = DCMPLX( LWKOPT )
+         RETURN
+*
+      END IF
+*
+*     ===================================================================
+*
+      HUGEVAL = DLAMCH( 'Overflow' )
+*
+      IF( MAXC2NRM.GT.HUGEVAL ) THEN
+*
+*        Check if the matrix A contains +Inf or -Inf, set INFO parameter
+*        to the column number, where the first +/-Inf  is found plus N,
+*        and continue the computation.
+*
+         INFO = N + KP1
+*
+      END IF
+*
+*     ==================================================================
+*
+*     Quick return if possible for the case when the first
+*     stopping criterion is satisfied, i.e. KMAX = 0.
+*
+      IF( KMAX.EQ.0 ) THEN
+         K = 0
+         MAXC2NRMK = MAXC2NRM
+         RELMAXC2NRMK = ONE
+         DO J = 1, MINMN
+            TAU( J ) = CZERO
+         END DO
+         WORK( 1 ) = DCMPLX( LWKOPT )
+         RETURN
+      END IF
+*
+*     ==================================================================
+*
+      EPS = DLAMCH('Epsilon')
+*
+*     Adjust ABSTOL
+*
+      IF( ABSTOL.GE.ZERO ) THEN
+         SAFMIN = DLAMCH('Safe minimum')
+         ABSTOL = MAX( ABSTOL, TWO*SAFMIN )
+      END IF
+*
+*     Adjust RELTOL
+*
+      IF( RELTOL.GE.ZERO ) THEN
+         RELTOL = MAX( RELTOL, EPS )
+      END IF
+*
+*     ===================================================================
+*
+*     JMAX is the maximum index of the column to be factorized,
+*     which is also limited by the first stopping criterion KMAX.
+*
+      JMAX = MIN( KMAX, MINMN )
+*
+*     ===================================================================
+*
+*     Quick return if possible for the case when the second or third
+*     stopping criterion for the whole original matrix is satified,
+*     i.e. MAXC2NRM <= ABSTOL or RELMAXC2NRM <= RELTOL
+*     (which is ONE <= RELTOL).
+*
+      IF( MAXC2NRM.LE.ABSTOL .OR. ONE.LE.RELTOL ) THEN
+*
+         K = 0
+         MAXC2NRMK = MAXC2NRM
+         RELMAXC2NRMK = ONE
+*
+         DO J = 1, MINMN
+            TAU( J ) = CZERO
+         END DO
+*
+         WORK( 1 ) = DCMPLX( LWKOPT )
+         RETURN
+      END IF
+*
+*     ==================================================================
+*     Factorize columns
+*     ==================================================================
+*
+*     Determine the block size.
+*
+      NBMIN = 2
+      NX = 0
+*
+      IF( ( NB.GT.1 ) .AND. ( NB.LT.MINMN ) ) THEN
+*
+*        Determine when to cross over from blocked to unblocked code.
+*        (for N less than NX, unblocked code should be used).
+*
+         NX = MAX( 0, ILAENV( IXOVER, 'ZGEQP3RK', ' ', M, N, -1,
+     $                        -1 ) )
+*
+         IF( NX.LT.MINMN ) THEN
+*
+*           Determine if workspace is large enough for blocked code.
+*
+            IF( LWORK.LT.LWKOPT ) THEN
+*
+*              Not enough workspace to use optimal block size that
+*              is currently stored in NB.
+*              Reduce NB and determine the minimum value of NB.
+*
+               NB = ( LWORK-2*N ) / ( N+1 )
+               NBMIN = MAX( 2, ILAENV( INBMIN, 'ZGEQP3RK', ' ', M, N,
+     $                 -1, -1 ) )
+*
+            END IF
+         END IF
+      END IF
+*
+*     ==================================================================
+*
+*     DONE is the boolean flag to rerpresent the case when the
+*     factorization completed in the block factorization routine,
+*     before the end of the block.
+*
+      DONE = .FALSE.
+*
+*     J is the column index.
+*
+      J = 1
+*
+*     (1) Use blocked code initially.
+*
+*     JMAXB is the maximum column index of the block, when the
+*     blocked code is used, is also limited by the first stopping
+*     criterion KMAX.
+*
+      JMAXB = MIN( KMAX, MINMN - NX )
+*
+      IF( NB.GE.NBMIN .AND. NB.LT.JMAX .AND. JMAXB.GT.0 ) THEN
+*
+*        Loop over the column blocks of the matrix A(1:M,1:JMAXB). Here:
+*        J   is the column index of a column block;
+*        JB  is the column block size to pass to block factorization
+*            routine in a loop step;
+*        JBF is the number of columns that were actually factorized
+*            that was returned by the block factorization routine
+*            in a loop step, JBF <= JB;
+*        N_SUB is the number of columns in the submatrix;
+*        IOFFSET is the number of rows that should not be factorized.
+*
+         DO WHILE( J.LE.JMAXB )
+*
+            JB = MIN( NB, JMAXB-J+1 )
+            N_SUB = N-J+1
+            IOFFSET = J-1
+*
+*           Factorize JB columns among the columns A(J:N).
+*
+            CALL ZLAQP3RK( M, N_SUB, NRHS, IOFFSET, JB, ABSTOL,
+     $                     RELTOL, KP1, MAXC2NRM, A( 1, J ), LDA,
+     $                     DONE, JBF, MAXC2NRMK, RELMAXC2NRMK,
+     $                     JPIV( J ), TAU( J ),
+     $                     RWORK( J ), RWORK( N+J ),
+     $                     WORK( 1 ), WORK( JB+1 ),
+     $                     N+NRHS-J+1, IWORK, IINFO )
+*
+*           Set INFO on the first occurence of Inf.
+*
+            IF( IINFO.GT.N_SUB .AND. INFO.EQ.0 ) THEN
+               INFO = 2*IOFFSET + IINFO
+            END IF
+*
+            IF( DONE ) THEN
+*
+*              Either the submatrix is zero before the end of the
+*              column block, or ABSTOL or RELTOL criterion is
+*              satisfied before the end of the column block, we can
+*              return from the routine. Perform the following before
+*              returning:
+*                a) Set the number of factorized columns K,
+*                   K = IOFFSET + JBF from the last call of blocked
+*                   routine.
+*                NOTE: 1) MAXC2NRMK and RELMAXC2NRMK are returned
+*                         by the block factorization routine;
+*                      2) The remaining TAUs are set to ZERO by the
+*                         block factorization routine.
+*
+               K = IOFFSET + JBF
+*
+*              Set INFO on the first occurrence of NaN, NaN takes
+*              prcedence over Inf.
+*
+               IF( IINFO.LE.N_SUB .AND. IINFO.GT.0 ) THEN
+                  INFO = IOFFSET + IINFO
+               END IF
+*
+*              Return from the routine.
+*
+               WORK( 1 ) = DCMPLX( LWKOPT )
+*
+               RETURN
+*
+            END IF
+*
+            J = J + JBF
+*
+         END DO
+*
+      END IF
+*
+*     Use unblocked code to factor the last or only block.
+*     J = JMAX+1 means we factorized the maximum possible number of
+*     columns, that is in ELSE clause we need to compute
+*     the MAXC2NORM and RELMAXC2NORM to return after we processed
+*     the blocks.
+*
+      IF( J.LE.JMAX ) THEN
+*
+*        N_SUB is the number of columns in the submatrix;
+*        IOFFSET is the number of rows that should not be factorized.
+*
+         N_SUB = N-J+1
+         IOFFSET = J-1
+*
+         CALL ZLAQP2RK( M, N_SUB, NRHS, IOFFSET, JMAX-J+1,
+     $                  ABSTOL, RELTOL, KP1, MAXC2NRM, A( 1, J ), LDA,
+     $                  KF, MAXC2NRMK, RELMAXC2NRMK, JPIV( J ),
+     $                  TAU( J ), RWORK( J ), RWORK( N+J ),
+     $                  WORK( 1 ), IINFO )
+*
+*        ABSTOL or RELTOL criterion is satisfied when the number of
+*        the factorized columns KF is smaller then the  number
+*        of columns JMAX-J+1 supplied to be factorized by the
+*        unblocked routine, we can return from
+*        the routine. Perform the following before returning:
+*           a) Set the number of factorized columns K,
+*           b) MAXC2NRMK and RELMAXC2NRMK are returned by the
+*              unblocked factorization routine above.
+*
+         K = J - 1 + KF
+*
+*        Set INFO on the first exception occurence.
+*
+*        Set INFO on the first exception occurence of Inf or NaN,
+*        (NaN takes precedence over Inf).
+*
+         IF( IINFO.GT.N_SUB .AND. INFO.EQ.0 ) THEN
+            INFO = 2*IOFFSET + IINFO
+         ELSE IF( IINFO.LE.N_SUB .AND. IINFO.GT.0 ) THEN
+            INFO = IOFFSET + IINFO
+         END IF
+*
+      ELSE
+*
+*        Compute the return values for blocked code.
+*
+*        Set the number of factorized columns if the unblocked routine
+*        was not called.
+*
+            K = JMAX
+*
+*        If there exits a residual matrix after the blocked code:
+*           1) compute the values of MAXC2NRMK, RELMAXC2NRMK of the
+*              residual matrix, otherwise set them to ZERO;
+*           2) Set TAU(K+1:MINMN) to ZERO.
+*
+         IF( K.LT.MINMN ) THEN
+            JMAXC2NRM = K + IDAMAX( N-K, RWORK( K+1 ), 1 )
+            MAXC2NRMK = RWORK( JMAXC2NRM )
+            IF( K.EQ.0 ) THEN
+               RELMAXC2NRMK = ONE
+            ELSE
+               RELMAXC2NRMK = MAXC2NRMK / MAXC2NRM
+            END IF
+*
+            DO J = K + 1, MINMN
+               TAU( J ) = CZERO
+            END DO
+*
+         ELSE
+            MAXC2NRMK = ZERO
+            RELMAXC2NRMK = ZERO
+*
+         END IF
+*
+*     END IF( J.LE.JMAX ) THEN
+*
+      END IF
+*
+      WORK( 1 ) = DCMPLX( LWKOPT )
+*
+      RETURN
+*
+*     End of ZGEQP3RK
+*
+      END
diff --git a/SRC/zgeqr.f b/SRC/zgeqr.f
index 20a80d0835..65a543d2b8 100644
--- a/SRC/zgeqr.f
+++ b/SRC/zgeqr.f
@@ -99,7 +99,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1 or -2, then a workspace query is assumed. The routine
 *>          only calculates the sizes of the T and WORK arrays, returns these
 *>          values as the first entries of the T and WORK arrays, and no error
@@ -168,9 +168,12 @@
 *>
 *> \endverbatim
 *>
+*> \ingroup geqr
+*>
 *  =====================================================================
       SUBROUTINE ZGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,7 +191,7 @@ SUBROUTINE ZGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, LMINWS, MINT, MINW
-      INTEGER            MB, NB, MINTSZ, NBLCKS
+      INTEGER            MB, NB, MINTSZ, NBLCKS, LWMIN, LWREQ
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -244,8 +247,10 @@ SUBROUTINE ZGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
 *
 *     Determine if the workspace size satisfies minimal size
 *
+      LWMIN = MAX( 1, N )
+      LWREQ = MAX( 1, N*NB )
       LMINWS = .FALSE.
-      IF( ( TSIZE.LT.MAX( 1, NB*N*NBLCKS + 5 ) .OR. LWORK.LT.NB*N )
+      IF( ( TSIZE.LT.MAX( 1, NB*N*NBLCKS + 5 ) .OR. LWORK.LT.LWREQ )
      $    .AND. ( LWORK.GE.N ) .AND. ( TSIZE.GE.MINTSZ )
      $    .AND. ( .NOT.LQUERY ) ) THEN
         IF( TSIZE.LT.MAX( 1, NB*N*NBLCKS + 5 ) ) THEN
@@ -253,7 +258,7 @@ SUBROUTINE ZGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
           NB = 1
           MB = M
         END IF
-        IF( LWORK.LT.NB*N ) THEN
+        IF( LWORK.LT.LWREQ ) THEN
           LMINWS = .TRUE.
           NB = 1
         END IF
@@ -268,7 +273,7 @@ SUBROUTINE ZGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
       ELSE IF( TSIZE.LT.MAX( 1, NB*N*NBLCKS + 5 )
      $   .AND. ( .NOT.LQUERY ) .AND. ( .NOT.LMINWS ) ) THEN
         INFO = -6
-      ELSE IF( ( LWORK.LT.MAX( 1, N*NB ) ) .AND. ( .NOT.LQUERY )
+      ELSE IF( ( LWORK.LT.LWREQ ) .AND. ( .NOT.LQUERY )
      $   .AND. ( .NOT.LMINWS ) ) THEN
         INFO = -8
       END IF
@@ -282,9 +287,9 @@ SUBROUTINE ZGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
         T( 2 ) = MB
         T( 3 ) = NB
         IF( MINW ) THEN
-          WORK( 1 ) = MAX( 1, N )
+          WORK( 1 ) = LWMIN
         ELSE
-          WORK( 1 ) = MAX( 1, NB*N )
+          WORK( 1 ) = LWREQ
         END IF
       END IF
       IF( INFO.NE.0 ) THEN
@@ -309,7 +314,7 @@ SUBROUTINE ZGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
      $                LWORK, INFO )
       END IF
 *
-      WORK( 1 ) = MAX( 1, NB*N )
+      WORK( 1 ) = LWREQ
 *
       RETURN
 *
diff --git a/SRC/zgeqr2.f b/SRC/zgeqr2.f
index 511a81ef8a..958e606b73 100644
--- a/SRC/zgeqr2.f
+++ b/SRC/zgeqr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEQR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeqr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeqr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -105,7 +103,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup geqr2
 *
 *> \par Further Details:
 *  =====================
@@ -127,6 +125,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGEQR2( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -147,10 +146,9 @@ SUBROUTINE ZGEQR2( M, N, A, LDA, TAU, WORK, INFO )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      COMPLEX*16         ALPHA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARF, ZLARFG
+      EXTERNAL           XERBLA, ZLARF1F, ZLARFG
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DCONJG, MAX, MIN
@@ -184,11 +182,8 @@ SUBROUTINE ZGEQR2( M, N, A, LDA, TAU, WORK, INFO )
 *
 *           Apply H(i)**H to A(i:m,i+1:n) from the left
 *
-            ALPHA = A( I, I )
-            A( I, I ) = ONE
-            CALL ZLARF( 'Left', M-I+1, N-I, A( I, I ), 1,
-     $                  DCONJG( TAU( I ) ), A( I, I+1 ), LDA, WORK )
-            A( I, I ) = ALPHA
+            CALL ZLARF1F( 'Left', M-I+1, N-I, A( I, I ), 1,
+     $                    CONJG( TAU( I ) ), A( I, I+1 ), LDA, WORK )
          END IF
    10 CONTINUE
       RETURN
diff --git a/SRC/zgeqr2p.f b/SRC/zgeqr2p.f
index 136d75f85c..aef5a2b015 100644
--- a/SRC/zgeqr2p.f
+++ b/SRC/zgeqr2p.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEQR2P + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeqr2p.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeqr2p.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup geqr2p
 *
 *> \par Further Details:
 *  =====================
@@ -131,6 +129,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGEQR2P( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -151,10 +150,9 @@ SUBROUTINE ZGEQR2P( M, N, A, LDA, TAU, WORK, INFO )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      COMPLEX*16         ALPHA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARF, ZLARFGP
+      EXTERNAL           XERBLA, ZLARF1F, ZLARFGP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DCONJG, MAX, MIN
@@ -188,11 +186,8 @@ SUBROUTINE ZGEQR2P( M, N, A, LDA, TAU, WORK, INFO )
 *
 *           Apply H(i)**H to A(i:m,i+1:n) from the left
 *
-            ALPHA = A( I, I )
-            A( I, I ) = ONE
-            CALL ZLARF( 'Left', M-I+1, N-I, A( I, I ), 1,
-     $                  DCONJG( TAU( I ) ), A( I, I+1 ), LDA, WORK )
-            A( I, I ) = ALPHA
+            CALL ZLARF1F( 'Left', M-I+1, N-I, A( I, I ), 1,
+     $                    CONJG( TAU( I ) ), A( I, I+1 ), LDA, WORK )
          END IF
    10 CONTINUE
       RETURN
diff --git a/SRC/zgeqrf.f b/SRC/zgeqrf.f
index dd31483c10..53295593d5 100644
--- a/SRC/zgeqrf.f
+++ b/SRC/zgeqrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEQRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeqrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeqrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,7 +93,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,N).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= N, otherwise.
 *>          For optimum performance LWORK >= N*NB, where NB is
 *>          the optimal blocksize.
 *>
@@ -120,7 +119,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup geqrf
 *
 *> \par Further Details:
 *  =====================
@@ -142,6 +141,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -175,10 +175,9 @@ SUBROUTINE ZGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *     Test the input arguments
 *
+      K = MIN( M, N )
       INFO = 0
       NB = ILAENV( 1, 'ZGEQRF', ' ', M, N, -1, -1 )
-      LWKOPT = N*NB
-      WORK( 1 ) = LWKOPT
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -186,19 +185,25 @@ SUBROUTINE ZGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
-         INFO = -7
+      ELSE IF( .NOT.LQUERY ) THEN
+         IF( LWORK.LE.0 .OR. ( M.GT.0 .AND. LWORK.LT.MAX( 1, N ) ) )
+     $      INFO = -7
       END IF
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'ZGEQRF', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
+         IF( K.EQ.0 ) THEN
+            LWKOPT = 1
+         ELSE
+            LWKOPT = N*NB
+         END IF
+         WORK( 1 ) = LWKOPT
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      K = MIN( M, N )
       IF( K.EQ.0 ) THEN
          WORK( 1 ) = 1
          RETURN
diff --git a/SRC/zgeqrfp.f b/SRC/zgeqrfp.f
index 73bcde6674..8fec1edc3c 100644
--- a/SRC/zgeqrfp.f
+++ b/SRC/zgeqrfp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEQRFP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeqrfp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeqrfp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,7 +95,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,N).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= N, otherwise.
 *>          For optimum performance LWORK >= N*NB, where NB is
 *>          the optimal blocksize.
 *>
@@ -122,7 +121,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup geqrfp
 *
 *> \par Further Details:
 *  =====================
@@ -146,6 +145,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -162,8 +162,8 @@ SUBROUTINE ZGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *     .. Local Scalars ..
       LOGICAL            LQUERY
-      INTEGER            I, IB, IINFO, IWS, K, LDWORK, LWKOPT, NB,
-     $                   NBMIN, NX
+      INTEGER            I, IB, IINFO, IWS, K, LDWORK, LWKMIN, LWKOPT,
+     $                   NB, NBMIN, NX
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           XERBLA, ZGEQR2P, ZLARFB, ZLARFT
@@ -181,8 +181,16 @@ SUBROUTINE ZGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
       INFO = 0
       NB = ILAENV( 1, 'ZGEQRF', ' ', M, N, -1, -1 )
-      LWKOPT = N*NB
+      K = MIN( M, N )
+      IF( K.EQ.0 ) THEN
+         LWKMIN = 1
+         LWKOPT = 1
+      ELSE
+         LWKMIN = N
+         LWKOPT = N*NB
+      END IF
       WORK( 1 ) = LWKOPT
+*
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -190,7 +198,7 @@ SUBROUTINE ZGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -7
       END IF
       IF( INFO.NE.0 ) THEN
@@ -202,7 +210,6 @@ SUBROUTINE ZGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *     Quick return if possible
 *
-      K = MIN( M, N )
       IF( K.EQ.0 ) THEN
          WORK( 1 ) = 1
          RETURN
@@ -210,7 +217,7 @@ SUBROUTINE ZGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
       NBMIN = 2
       NX = 0
-      IWS = N
+      IWS = LWKMIN
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
 *
 *        Determine when to cross over from blocked to unblocked code.
diff --git a/SRC/zgeqrt.f b/SRC/zgeqrt.f
index d54a9e6c36..e636f9d605 100644
--- a/SRC/zgeqrt.f
+++ b/SRC/zgeqrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEQRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeqrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeqrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,7 +106,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup geqrt
 *
 *> \par Further Details:
 *  =====================
@@ -138,6 +136,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGEQRT( M, N, NB, A, LDA, T, LDT, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -195,9 +194,11 @@ SUBROUTINE ZGEQRT( M, N, NB, A, LDA, T, LDT, WORK, INFO )
 *     Compute the QR factorization of the current block A(I:M,I:I+IB-1)
 *
          IF( USE_RECURSIVE_QR ) THEN
-            CALL ZGEQRT3( M-I+1, IB, A(I,I), LDA, T(1,I), LDT, IINFO )
+            CALL ZGEQRT3( M-I+1, IB, A(I,I), LDA, T(1,I), LDT,
+     $                    IINFO )
          ELSE
-            CALL ZGEQRT2( M-I+1, IB, A(I,I), LDA, T(1,I), LDT, IINFO )
+            CALL ZGEQRT2( M-I+1, IB, A(I,I), LDA, T(1,I), LDT,
+     $                    IINFO )
          END IF
          IF( I+IB.LE.N ) THEN
 *
diff --git a/SRC/zgeqrt2.f b/SRC/zgeqrt2.f
index 947856adfa..131cdd5082 100644
--- a/SRC/zgeqrt2.f
+++ b/SRC/zgeqrt2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEQRT2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeqrt2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeqrt2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,7 +95,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup geqrt2
 *
 *> \par Further Details:
 *  =====================
@@ -124,6 +122,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGEQRT2( M, N, A, LDA, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -154,10 +153,10 @@ SUBROUTINE ZGEQRT2( M, N, A, LDA, T, LDT, INFO )
 *     Test the input arguments
 *
       INFO = 0
-      IF( M.LT.0 ) THEN
-         INFO = -1
-      ELSE IF( N.LT.0 ) THEN
+      IF( N.LT.0 ) THEN
          INFO = -2
+      ELSE IF( M.LT.N ) THEN
+         INFO = -1
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
       ELSE IF( LDT.LT.MAX( 1, N ) ) THEN
diff --git a/SRC/zgeqrt3.f b/SRC/zgeqrt3.f
index af6b9437dd..d56831264d 100644
--- a/SRC/zgeqrt3.f
+++ b/SRC/zgeqrt3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGEQRT3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeqrt3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeqrt3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -100,7 +98,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup geqrt3
 *
 *> \par Further Details:
 *  =====================
@@ -129,6 +127,7 @@
 *>
 *  =====================================================================
       RECURSIVE SUBROUTINE ZGEQRT3( M, N, A, LDA, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zgerfs.f b/SRC/zgerfs.f
index ce5d15279e..28f80cddad 100644
--- a/SRC/zgerfs.f
+++ b/SRC/zgerfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGERFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgerfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgerfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -178,11 +176,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup gerfs
 *
 *  =====================================================================
-      SUBROUTINE ZGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
+      SUBROUTINE ZGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
+     $                   LDB,
      $                   X, LDX, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -229,7 +229,8 @@ SUBROUTINE ZGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
       EXTERNAL           LSAME, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZGEMV, ZGETRS, ZLACN2
+      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZGEMV, ZGETRS,
+     $                   ZLACN2
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG, MAX
@@ -307,7 +308,8 @@ SUBROUTINE ZGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
 *        where op(A) = A, A**T, or A**H, depending on TRANS.
 *
          CALL ZCOPY( N, B( 1, J ), 1, WORK, 1 )
-         CALL ZGEMV( TRANS, N, N, -ONE, A, LDA, X( 1, J ), 1, ONE, WORK,
+         CALL ZGEMV( TRANS, N, N, -ONE, A, LDA, X( 1, J ), 1, ONE,
+     $               WORK,
      $               1 )
 *
 *        Compute componentwise relative backward error from formula
diff --git a/SRC/zgerfsx.f b/SRC/zgerfsx.f
index 2c5cf03ec8..4b7a2c4395 100644
--- a/SRC/zgerfsx.f
+++ b/SRC/zgerfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGERFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgerfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgerfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -404,13 +402,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup gerfsx
 *
 *  =====================================================================
-      SUBROUTINE ZGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE ZGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    R, C, B, LDB, X, LDX, RCOND, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -473,7 +473,8 @@ SUBROUTINE ZGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *     ..
 *     .. External Functions ..
       EXTERNAL           LSAME, ILATRANS, ILAPREC
-      EXTERNAL           DLAMCH, ZLANGE, ZLA_GERCOND_X, ZLA_GERCOND_C
+      EXTERNAL           DLAMCH, ZLANGE, ZLA_GERCOND_X,
+     $                   ZLA_GERCOND_C
       DOUBLE PRECISION   DLAMCH, ZLANGE, ZLA_GERCOND_X, ZLA_GERCOND_C
       LOGICAL            LSAME
       INTEGER            ILATRANS, ILAPREC
@@ -606,7 +607,8 @@ SUBROUTINE ZGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
          NORM = '1'
       END IF
       ANORM = ZLANGE( NORM, N, N, A, LDA, RWORK )
-      CALL ZGECON( NORM, N, AF, LDAF, ANORM, RCOND, WORK, RWORK, INFO )
+      CALL ZGECON( NORM, N, AF, LDAF, ANORM, RCOND, WORK, RWORK,
+     $             INFO )
 *
 *     Perform refinement on each right-hand side
 *
@@ -633,19 +635,23 @@ SUBROUTINE ZGERFSX( TRANS, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
          END IF
       END IF
 
-      ERR_LBND = MAX( 10.0D+0, SQRT( DBLE( N ) ) ) * DLAMCH( 'Epsilon' )
+      ERR_LBND = MAX( 10.0D+0,
+     $                SQRT( DBLE( N ) ) ) * DLAMCH( 'Epsilon' )
       IF ( N_ERR_BNDS .GE. 1 .AND. N_NORMS .GE. 1 ) THEN
 *
 *     Compute scaled normwise condition number cond(A*C).
 *
          IF ( COLEQU .AND. NOTRAN ) THEN
-            RCOND_TMP = ZLA_GERCOND_C( TRANS, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = ZLA_GERCOND_C( TRANS, N, A, LDA, AF, LDAF,
+     $                                 IPIV,
      $           C, .TRUE., INFO, WORK, RWORK )
          ELSE IF ( ROWEQU .AND. .NOT. NOTRAN ) THEN
-            RCOND_TMP = ZLA_GERCOND_C( TRANS, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = ZLA_GERCOND_C( TRANS, N, A, LDA, AF, LDAF,
+     $                                 IPIV,
      $           R, .TRUE., INFO, WORK, RWORK )
          ELSE
-            RCOND_TMP = ZLA_GERCOND_C( TRANS, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = ZLA_GERCOND_C( TRANS, N, A, LDA, AF, LDAF,
+     $                                 IPIV,
      $           C, .FALSE., INFO, WORK, RWORK )
          END IF
          DO J = 1, NRHS
diff --git a/SRC/zgerq2.f b/SRC/zgerq2.f
index 8a987dd0a0..dbd33d6b16 100644
--- a/SRC/zgerq2.f
+++ b/SRC/zgerq2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGERQ2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgerq2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgerq2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,7 +96,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup gerq2
 *
 *> \par Further Details:
 *  =====================
@@ -120,6 +118,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGERQ2( M, N, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -140,10 +139,9 @@ SUBROUTINE ZGERQ2( M, N, A, LDA, TAU, WORK, INFO )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I, K
-      COMPLEX*16         ALPHA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLACGV, ZLARF, ZLARFG
+      EXTERNAL           XERBLA, ZLACGV, ZLARF1L, ZLARFG
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -173,15 +171,13 @@ SUBROUTINE ZGERQ2( M, N, A, LDA, TAU, WORK, INFO )
 *        A(m-k+i,1:n-k+i-1)
 *
          CALL ZLACGV( N-K+I, A( M-K+I, 1 ), LDA )
-         ALPHA = A( M-K+I, N-K+I )
-         CALL ZLARFG( N-K+I, ALPHA, A( M-K+I, 1 ), LDA, TAU( I ) )
+         CALL ZLARFG( N-K+I, A( M-K+I, N-K+I ), A( M-K+I, 1 ), LDA,
+     $                TAU( I ) )
 *
 *        Apply H(i) to A(1:m-k+i-1,1:n-k+i) from the right
 *
-         A( M-K+I, N-K+I ) = ONE
-         CALL ZLARF( 'Right', M-K+I-1, N-K+I, A( M-K+I, 1 ), LDA,
-     $               TAU( I ), A, LDA, WORK )
-         A( M-K+I, N-K+I ) = ALPHA
+         CALL ZLARF1L( 'Right', M-K+I-1, N-K+I, A( M-K+I, 1 ), LDA,
+     $                 TAU( I ), A, LDA, WORK )
          CALL ZLACGV( N-K+I-1, A( M-K+I, 1 ), LDA )
    10 CONTINUE
       RETURN
diff --git a/SRC/zgerqf.f b/SRC/zgerqf.f
index 22bd5b94ff..7e7b83bc9a 100644
--- a/SRC/zgerqf.f
+++ b/SRC/zgerqf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGERQF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgerqf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgerqf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,7 +86,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,M).
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= M, otherwise.
 *>          For optimum performance LWORK >= M*NB, where NB is
 *>          the optimal blocksize.
 *>
@@ -113,7 +112,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup gerqf
 *
 *> \par Further Details:
 *  =====================
@@ -135,6 +134,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZGERQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,8 +188,9 @@ SUBROUTINE ZGERQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
          END IF
          WORK( 1 ) = LWKOPT
 *
-         IF( LWORK.LT.MAX( 1, M ) .AND. .NOT.LQUERY ) THEN
-            INFO = -7
+         IF ( .NOT.LQUERY ) THEN
+            IF( LWORK.LE.0 .OR. ( N.GT.0 .AND. LWORK.LT.MAX( 1, M ) ) )
+     $         INFO = -7
          END IF
       END IF
 *
@@ -246,7 +247,8 @@ SUBROUTINE ZGERQF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *           Compute the RQ factorization of the current block
 *           A(m-k+i:m-k+i+ib-1,1:n-k+i+ib-1)
 *
-            CALL ZGERQ2( IB, N-K+I+IB-1, A( M-K+I, 1 ), LDA, TAU( I ),
+            CALL ZGERQ2( IB, N-K+I+IB-1, A( M-K+I, 1 ), LDA,
+     $                   TAU( I ),
      $                   WORK, IINFO )
             IF( M-K+I.GT.1 ) THEN
 *
diff --git a/SRC/zgesc2.f b/SRC/zgesc2.f
index 9f40fc7008..b6bd713af5 100644
--- a/SRC/zgesc2.f
+++ b/SRC/zgesc2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGESC2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgesc2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgesc2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,7 +100,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEauxiliary
+*> \ingroup gesc2
 *
 *> \par Contributors:
 *  ==================
@@ -112,6 +110,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZGESC2( N, A, LDA, RHS, IPIV, JPIV, SCALE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -138,7 +137,7 @@ SUBROUTINE ZGESC2( N, A, LDA, RHS, IPIV, JPIV, SCALE )
       COMPLEX*16         TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZLASWP, ZSCAL, DLABAD
+      EXTERNAL           ZLASWP, ZSCAL
 *     ..
 *     .. External Functions ..
       INTEGER            IZAMAX
@@ -155,7 +154,6 @@ SUBROUTINE ZGESC2( N, A, LDA, RHS, IPIV, JPIV, SCALE )
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Apply permutations IPIV to RHS
 *
diff --git a/SRC/zgesdd.f b/SRC/zgesdd.f
index a3e6408bf8..8b42617560 100644
--- a/SRC/zgesdd.f
+++ b/SRC/zgesdd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGESDD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgesdd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgesdd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -53,12 +51,6 @@
 *>
 *> Note that the routine returns VT = V**H, not V.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -213,7 +205,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEsing
+*> \ingroup gesdd
 *
 *> \par Contributors:
 *  ==================
@@ -274,7 +266,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
       COMPLEX*16         CDUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DBDSDC, DLASCL, XERBLA, ZGEBRD, ZGELQF, ZGEMM,
+      EXTERNAL           DBDSDC, DLASCL, XERBLA, ZGEBRD, ZGELQF,
+     $                   ZGEMM,
      $                   ZGEQRF, ZLACP2, ZLACPY, ZLACRM, ZLARCM, ZLASCL,
      $                   ZLASET, ZUNGBR, ZUNGLQ, ZUNGQR, ZUNMBR
 *     ..
@@ -349,7 +342,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
      $                   CDUM(1), CDUM(1), -1, IERR )
             LWORK_ZGEBRD_NN = INT( CDUM(1) )
 *
-            CALL ZGEQRF( M, N, CDUM(1), M, CDUM(1), CDUM(1), -1, IERR )
+            CALL ZGEQRF( M, N, CDUM(1), M, CDUM(1), CDUM(1), -1,
+     $                   IERR )
             LWORK_ZGEQRF_MN = INT( CDUM(1) )
 *
             CALL ZUNGBR( 'P', N, N, N, CDUM(1), N, CDUM(1), CDUM(1),
@@ -490,7 +484,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
      $                   CDUM(1), CDUM(1), -1, IERR )
             LWORK_ZGEBRD_MM = INT( CDUM(1) )
 *
-            CALL ZGELQF( M, N, CDUM(1), M, CDUM(1), CDUM(1), -1, IERR )
+            CALL ZGELQF( M, N, CDUM(1), M, CDUM(1), CDUM(1), -1,
+     $                   IERR )
             LWORK_ZGELQF_MN = INT( CDUM(1) )
 *
             CALL ZUNGBR( 'P', M, N, M, CDUM(1), M, CDUM(1), CDUM(1),
@@ -680,7 +675,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer N [tau] + N*NB [work]
 *              RWorkspace: need   0
 *
-               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
 *              Zero out below R
@@ -697,7 +693,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer 2*N [tauq, taup] + 2*N*NB [work]
 *              RWorkspace: need   N [e]
 *
-               CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+               CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
      $                      IERR )
                NRWORK = IE + N
@@ -737,13 +734,15 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer N*N [U] + N*N [R] + N [tau] + N*NB [work]
 *              RWorkspace: need   0
 *
-               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
 *              Copy R to WORK( IR ), zeroing out below it
 *
                CALL ZLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
-               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO, WORK( IR+1 ),
+               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                      WORK( IR+1 ),
      $                      LDWRKR )
 *
 *              Generate Q in A
@@ -776,7 +775,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = IE + N
                IRVT = IRU + N*N
                NRWORK = IRVT + N*N
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -788,7 +788,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                CALL ZLACP2( 'F', N, N, RWORK( IRU ), N, WORK( IU ),
      $                      LDWRKU )
-               CALL ZUNMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ), LDWRKR,
+               CALL ZUNMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ),
+     $                      LDWRKR,
      $                      WORK( ITAUQ ), WORK( IU ), LDWRKU,
      $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
@@ -799,7 +800,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              RWorkspace: need   0
 *
                CALL ZLACP2( 'F', N, N, RWORK( IRVT ), N, VT, LDVT )
-               CALL ZUNMBR( 'P', 'R', 'C', N, N, N, WORK( IR ), LDWRKR,
+               CALL ZUNMBR( 'P', 'R', 'C', N, N, N, WORK( IR ),
+     $                      LDWRKR,
      $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
@@ -837,13 +839,15 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer N*N [R] + N [tau] + N*NB [work]
 *              RWorkspace: need   0
 *
-               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
 *              Copy R to WORK(IR), zeroing out below it
 *
                CALL ZLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
-               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO, WORK( IR+1 ),
+               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                      WORK( IR+1 ),
      $                      LDWRKR )
 *
 *              Generate Q in A
@@ -876,7 +880,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = IE + N
                IRVT = IRU + N*N
                NRWORK = IRVT + N*N
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -887,7 +892,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              RWorkspace: need   0
 *
                CALL ZLACP2( 'F', N, N, RWORK( IRU ), N, U, LDU )
-               CALL ZUNMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ), LDWRKR,
+               CALL ZUNMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ),
+     $                      LDWRKR,
      $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
@@ -898,7 +904,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              RWorkspace: need   0
 *
                CALL ZLACP2( 'F', N, N, RWORK( IRVT ), N, VT, LDVT )
-               CALL ZUNMBR( 'P', 'R', 'C', N, N, N, WORK( IR ), LDWRKR,
+               CALL ZUNMBR( 'P', 'R', 'C', N, N, N, WORK( IR ),
+     $                      LDWRKR,
      $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
@@ -908,7 +915,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              RWorkspace: need   0
 *
                CALL ZLACPY( 'F', N, N, U, LDU, WORK( IR ), LDWRKR )
-               CALL ZGEMM( 'N', 'N', M, N, N, CONE, A, LDA, WORK( IR ),
+               CALL ZGEMM( 'N', 'N', M, N, N, CONE, A, LDA,
+     $                     WORK( IR ),
      $                     LDWRKR, CZERO, U, LDU )
 *
             ELSE IF( WNTQA ) THEN
@@ -930,7 +938,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer N*N [U] + N [tau] + N*NB [work]
 *              RWorkspace: need   0
 *
-               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
                CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
 *
@@ -956,7 +965,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer N*N [U] + 2*N [tauq, taup] + 2*N*NB [work]
 *              RWorkspace: need   N [e]
 *
-               CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+               CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
      $                      IERR )
                IRU = IE + N
@@ -969,7 +979,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: need   0
 *              RWorkspace: need   N [e] + N*N [RU] + N*N [RVT] + BDSPAC
 *
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1001,7 +1012,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: need   N*N [U]
 *              RWorkspace: need   0
 *
-               CALL ZGEMM( 'N', 'N', M, N, N, CONE, U, LDU, WORK( IU ),
+               CALL ZGEMM( 'N', 'N', M, N, N, CONE, U, LDU,
+     $                     WORK( IU ),
      $                     LDWRKU, CZERO, A, LDA )
 *
 *              Copy left singular vectors of A from A to U
@@ -1039,7 +1051,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: need   0
 *              RWorkspace: need   N [e] + BDSPAC
 *
-               CALL DBDSDC( 'U', 'N', N, S, RWORK( IE ), DUM, 1,DUM,1,
+               CALL DBDSDC( 'U', 'N', N, S, RWORK( IE ), DUM, 1,DUM,
+     $                      1,
      $                      DUM, IDUM, RWORK( NRWORK ), IWORK, INFO )
             ELSE IF( WNTQO ) THEN
                IU = NWORK
@@ -1084,7 +1097,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: need   0
 *              RWorkspace: need   N [e] + N*N [RU] + N*N [RVT] + BDSPAC
 *
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1107,7 +1121,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                NRWORK = IRVT
                DO 20 I = 1, M, LDWRKU
                   CHUNK = MIN( M-I+1, LDWRKU )
-                  CALL ZLACRM( CHUNK, N, A( I, 1 ), LDA, RWORK( IRU ),
+                  CALL ZLACRM( CHUNK, N, A( I, 1 ), LDA,
+     $                         RWORK( IRU ),
      $                         N, WORK( IU ), LDWRKU, RWORK( NRWORK ) )
                   CALL ZLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
      $                         A( I, 1 ), LDA )
@@ -1143,7 +1158,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = NRWORK
                IRVT = IRU + N*N
                NRWORK = IRVT + N*N
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1195,7 +1211,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = NRWORK
                IRVT = IRU + N*N
                NRWORK = IRVT + N*N
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1275,7 +1292,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: need   0
 *              RWorkspace: need   N [e] + N*N [RU] + N*N [RVT] + BDSPAC
 *
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1302,12 +1320,14 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                   CALL ZLASET( 'F', M, N, CZERO, CZERO, WORK( IU ),
      $                         LDWRKU )
-                  CALL ZLACP2( 'F', N, N, RWORK( IRU ), N, WORK( IU ),
+                  CALL ZLACP2( 'F', N, N, RWORK( IRU ), N,
+     $                         WORK( IU ),
      $                         LDWRKU )
                   CALL ZUNMBR( 'Q', 'L', 'N', M, N, N, A, LDA,
      $                         WORK( ITAUQ ), WORK( IU ), LDWRKU,
      $                         WORK( NWORK ), LWORK-NWORK+1, IERR )
-                  CALL ZLACPY( 'F', M, N, WORK( IU ), LDWRKU, A, LDA )
+                  CALL ZLACPY( 'F', M, N, WORK( IU ), LDWRKU, A,
+     $                         LDA )
                ELSE
 *
 *                 Path 6o-slow
@@ -1349,7 +1369,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = NRWORK
                IRVT = IRU + N*N
                NRWORK = IRVT + N*N
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1387,7 +1408,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = NRWORK
                IRVT = IRU + N*N
                NRWORK = IRVT + N*N
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      N, RWORK( IRVT ), N, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1445,7 +1467,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer M [tau] + M*NB [work]
 *              RWorkspace: need   0
 *
-               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
 *              Zero out above L
@@ -1462,7 +1485,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer 2*M [tauq, taup] + 2*M*NB [work]
 *              RWorkspace: need   M [e]
 *
-               CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+               CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
      $                      IERR )
                NRWORK = IE + M
@@ -1507,7 +1531,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer M*M [VT] + M*M [L] + M [tau] + M*NB [work]
 *              RWorkspace: need   0
 *
-               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
 *              Copy L to WORK(IL), zeroing about above it
@@ -1546,7 +1571,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = IE + M
                IRVT = IRU + M*M
                NRWORK = IRVT + M*M
-               CALL DBDSDC( 'U', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'U', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1557,7 +1583,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              RWorkspace: need   0
 *
                CALL ZLACP2( 'F', M, M, RWORK( IRU ), M, U, LDU )
-               CALL ZUNMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ), LDWRKL,
+               CALL ZUNMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ),
+     $                      LDWRKL,
      $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
@@ -1569,7 +1596,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                CALL ZLACP2( 'F', M, M, RWORK( IRVT ), M, WORK( IVT ),
      $                      LDWKVT )
-               CALL ZUNMBR( 'P', 'R', 'C', M, M, M, WORK( IL ), LDWRKL,
+               CALL ZUNMBR( 'P', 'R', 'C', M, M, M, WORK( IL ),
+     $                      LDWRKL,
      $                      WORK( ITAUP ), WORK( IVT ), LDWKVT,
      $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
@@ -1581,7 +1609,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *
                DO 40 I = 1, N, CHUNK
                   BLK = MIN( N-I+1, CHUNK )
-                  CALL ZGEMM( 'N', 'N', M, BLK, M, CONE, WORK( IVT ), M,
+                  CALL ZGEMM( 'N', 'N', M, BLK, M, CONE, WORK( IVT ),
+     $                        M,
      $                        A( 1, I ), LDA, CZERO, WORK( IL ),
      $                        LDWRKL )
                   CALL ZLACPY( 'F', M, BLK, WORK( IL ), LDWRKL,
@@ -1607,7 +1636,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer M*M [L] + M [tau] + M*NB [work]
 *              RWorkspace: need   0
 *
-               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
 *              Copy L to WORK(IL), zeroing out above it
@@ -1646,7 +1676,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = IE + M
                IRVT = IRU + M*M
                NRWORK = IRVT + M*M
-               CALL DBDSDC( 'U', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'U', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1657,7 +1688,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              RWorkspace: need   0
 *
                CALL ZLACP2( 'F', M, M, RWORK( IRU ), M, U, LDU )
-               CALL ZUNMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ), LDWRKL,
+               CALL ZUNMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ),
+     $                      LDWRKL,
      $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
@@ -1668,7 +1700,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              RWorkspace: need   0
 *
                CALL ZLACP2( 'F', M, M, RWORK( IRVT ), M, VT, LDVT )
-               CALL ZUNMBR( 'P', 'R', 'C', M, M, M, WORK( IL ), LDWRKL,
+               CALL ZUNMBR( 'P', 'R', 'C', M, M, M, WORK( IL ),
+     $                      LDWRKL,
      $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
 *
@@ -1678,7 +1711,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              RWorkspace: need   0
 *
                CALL ZLACPY( 'F', M, M, VT, LDVT, WORK( IL ), LDWRKL )
-               CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IL ), LDWRKL,
+               CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IL ),
+     $                     LDWRKL,
      $                     A, LDA, CZERO, VT, LDVT )
 *
             ELSE IF( WNTQA ) THEN
@@ -1700,7 +1734,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer M*M [VT] + M [tau] + M*NB [work]
 *              RWorkspace: need   0
 *
-               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ),
      $                      LWORK-NWORK+1, IERR )
                CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
 *
@@ -1726,7 +1761,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: prefer M*M [VT] + 2*M [tauq, taup] + 2*M*NB [work]
 *              RWorkspace: need   M [e]
 *
-               CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+               CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
      $                      IERR )
 *
@@ -1739,7 +1775,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = IE + M
                IRVT = IRU + M*M
                NRWORK = IRVT + M*M
-               CALL DBDSDC( 'U', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'U', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1771,7 +1808,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: need   M*M [VT]
 *              RWorkspace: need   0
 *
-               CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IVT ), LDWKVT,
+               CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IVT ),
+     $                     LDWKVT,
      $                     VT, LDVT, CZERO, A, LDA )
 *
 *              Copy right singular vectors of A from A to VT
@@ -1857,7 +1895,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: need   0
 *              RWorkspace: need   M [e] + M*M [RVT] + M*M [RU] + BDSPAC
 *
-               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1866,7 +1905,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *              CWorkspace: need   2*M [tauq, taup] + M*M [VT]
 *              RWorkspace: need   M [e] + M*M [RVT] + M*M [RU] + 2*M*M [rwork]
 *
-               CALL ZLACRM( M, M, U, LDU, RWORK( IRU ), M, WORK( IVT ),
+               CALL ZLACRM( M, M, U, LDU, RWORK( IRU ), M,
+     $                      WORK( IVT ),
      $                      LDWKVT, RWORK( NRWORK ) )
                CALL ZLACPY( 'F', M, M, WORK( IVT ), LDWKVT, U, LDU )
 *
@@ -1880,7 +1920,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                NRWORK = IRU
                DO 50 I = 1, N, CHUNK
                   BLK = MIN( N-I+1, CHUNK )
-                  CALL ZLARCM( M, BLK, RWORK( IRVT ), M, A( 1, I ), LDA,
+                  CALL ZLARCM( M, BLK, RWORK( IRVT ), M, A( 1, I ),
+     $                         LDA,
      $                         WORK( IVT ), LDWKVT, RWORK( NRWORK ) )
                   CALL ZLACPY( 'F', M, BLK, WORK( IVT ), LDWKVT,
      $                         A( 1, I ), LDA )
@@ -1915,7 +1956,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRVT = NRWORK
                IRU = IRVT + M*M
                NRWORK = IRU + M*M
-               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -1967,7 +2009,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRVT = NRWORK
                IRU = IRVT + M*M
                NRWORK = IRU + M*M
-               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -2050,7 +2093,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRVT = NRWORK
                IRU = IRVT + M*M
                NRWORK = IRU + M*M
-               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -2075,12 +2119,14 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
 *                 CWorkspace: prefer 2*M [tauq, taup] + M*N [VT] + M*NB [work]
 *                 RWorkspace: need   M [e] + M*M [RVT]
 *
-                  CALL ZLACP2( 'F', M, M, RWORK( IRVT ), M, WORK( IVT ),
+                  CALL ZLACP2( 'F', M, M, RWORK( IRVT ), M,
+     $                         WORK( IVT ),
      $                         LDWKVT )
                   CALL ZUNMBR( 'P', 'R', 'C', M, N, M, A, LDA,
      $                         WORK( ITAUP ), WORK( IVT ), LDWKVT,
      $                         WORK( NWORK ), LWORK-NWORK+1, IERR )
-                  CALL ZLACPY( 'F', M, N, WORK( IVT ), LDWKVT, A, LDA )
+                  CALL ZLACPY( 'F', M, N, WORK( IVT ), LDWKVT, A,
+     $                         LDA )
                ELSE
 *
 *                 Path 6to-slow
@@ -2102,7 +2148,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                   NRWORK = IRU
                   DO 60 I = 1, N, CHUNK
                      BLK = MIN( N-I+1, CHUNK )
-                     CALL ZLARCM( M, BLK, RWORK( IRVT ), M, A( 1, I ),
+                     CALL ZLARCM( M, BLK, RWORK( IRVT ), M, A( 1,
+     $                            I ),
      $                            LDA, WORK( IVT ), LDWKVT,
      $                            RWORK( NRWORK ) )
                      CALL ZLACPY( 'F', M, BLK, WORK( IVT ), LDWKVT,
@@ -2121,7 +2168,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRVT = NRWORK
                IRU = IRVT + M*M
                NRWORK = IRU + M*M
-               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
@@ -2160,7 +2208,8 @@ SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT,
                IRU = IRVT + M*M
                NRWORK = IRU + M*M
 *
-               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ),
+     $                      RWORK( IRU ),
      $                      M, RWORK( IRVT ), M, DUM, IDUM,
      $                      RWORK( NRWORK ), IWORK, INFO )
 *
diff --git a/SRC/zgesv.f b/SRC/zgesv.f
index abb9a42132..c0cd30a2df 100644
--- a/SRC/zgesv.f
+++ b/SRC/zgesv.f
@@ -1,3 +1,5 @@
+*> \addtogroup gesv
+*>
 *> \brief <b> ZGESV computes the solution to system of linear equations A * X = B for GE matrices (simple driver) </b>
 *
 *  =========== DOCUMENTATION ===========
@@ -5,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGESV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgesv.f">
 *> [TGZ]</a>
@@ -13,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgesv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,10 +115,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEsolve
+*> \ingroup gesv
 *
 *  =====================================================================
       SUBROUTINE ZGESV( N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zgesvd.f b/SRC/zgesvd.f
index 1064fabbbb..fd15166a3c 100644
--- a/SRC/zgesvd.f
+++ b/SRC/zgesvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGESVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgesvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgesvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -206,11 +204,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEsing
+*> \ingroup gesvd
 *
 *  =====================================================================
       SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
      $                   VT, LDVT, WORK, LWORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -252,7 +251,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
       COMPLEX*16         CDUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLASCL, XERBLA, ZBDSQR, ZGEBRD, ZGELQF, ZGEMM,
+      EXTERNAL           DLASCL, XERBLA, ZBDSQR, ZGEBRD, ZGELQF,
+     $                   ZGEMM,
      $                   ZGEQRF, ZLACPY, ZLASCL, ZLASET, ZUNGBR, ZUNGLQ,
      $                   ZUNGQR, ZUNMBR
 *     ..
@@ -321,9 +321,11 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
             CALL ZGEQRF( M, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
             LWORK_ZGEQRF = INT( CDUM(1) )
 *           Compute space needed for ZUNGQR
-            CALL ZUNGQR( M, N, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
+            CALL ZUNGQR( M, N, N, A, LDA, CDUM(1), CDUM(1), -1,
+     $                   IERR )
             LWORK_ZUNGQR_N = INT( CDUM(1) )
-            CALL ZUNGQR( M, M, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
+            CALL ZUNGQR( M, M, N, A, LDA, CDUM(1), CDUM(1), -1,
+     $                   IERR )
             LWORK_ZUNGQR_M = INT( CDUM(1) )
 *           Compute space needed for ZGEBRD
             CALL ZGEBRD( N, N, A, LDA, S, DUM(1), CDUM(1),
@@ -473,7 +475,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
             CALL ZUNGLQ( N, N, M, CDUM(1), N, CDUM(1), CDUM(1), -1,
      $                   IERR )
             LWORK_ZUNGLQ_N = INT( CDUM(1) )
-            CALL ZUNGLQ( M, N, M, A, LDA, CDUM(1), CDUM(1), -1, IERR )
+            CALL ZUNGLQ( M, N, M, A, LDA, CDUM(1), CDUM(1), -1,
+     $                   IERR )
             LWORK_ZUNGLQ_M = INT( CDUM(1) )
 *           Compute space needed for ZGEBRD
             CALL ZGEBRD( M, M, A, LDA, S, DUM(1), CDUM(1),
@@ -672,13 +675,15 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *              (CWorkspace: need 2*N, prefer N+N*NB)
 *              (RWorkspace: need 0)
 *
-               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( IWORK ),
+               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( IWORK ),
      $                      LWORK-IWORK+1, IERR )
 *
 *              Zero out below R
 *
                IF( N .GT. 1 ) THEN
-                  CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO, A( 2, 1 ),
+                  CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO, A( 2,
+     $                         1 ),
      $                         LDA )
                END IF
                IE = 1
@@ -690,7 +695,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *              (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
 *              (RWorkspace: need N)
 *
-               CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+               CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( IWORK ), LWORK-IWORK+1,
      $                      IERR )
                NCVT = 0
@@ -711,7 +717,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *              (CWorkspace: 0)
 *              (RWorkspace: need BDSPAC)
 *
-               CALL ZBDSQR( 'U', N, NCVT, 0, 0, S, RWORK( IE ), A, LDA,
+               CALL ZBDSQR( 'U', N, NCVT, 0, 0, S, RWORK( IE ), A,
+     $                      LDA,
      $                      CDUM, 1, CDUM, 1, RWORK( IRWORK ), INFO )
 *
 *              If right singular vectors desired in VT, copy them there
@@ -761,7 +768,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *
 *                 Copy R to WORK(IR) and zero out below it
 *
-                  CALL ZLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
+                  CALL ZLACPY( 'U', N, N, A, LDA, WORK( IR ),
+     $                         LDWRKR )
                   CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
      $                         WORK( IR+1 ), LDWRKR )
 *
@@ -780,7 +788,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                 (CWorkspace: need N*N+3*N, prefer N*N+2*N+2*N*NB)
 *                 (RWorkspace: need N)
 *
-                  CALL ZGEBRD( N, N, WORK( IR ), LDWRKR, S, RWORK( IE ),
+                  CALL ZGEBRD( N, N, WORK( IR ), LDWRKR, S,
+     $                         RWORK( IE ),
      $                         WORK( ITAUQ ), WORK( ITAUP ),
      $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
@@ -798,7 +807,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                 (CWorkspace: need N*N)
 *                 (RWorkspace: need BDSPAC)
 *
-                  CALL ZBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ), CDUM, 1,
+                  CALL ZBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ), CDUM,
+     $                         1,
      $                         WORK( IR ), LDWRKR, CDUM, 1,
      $                         RWORK( IRWORK ), INFO )
                   IU = ITAUQ
@@ -810,7 +820,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *
                   DO 10 I = 1, M, LDWRKU
                      CHUNK = MIN( M-I+1, LDWRKU )
-                     CALL ZGEMM( 'N', 'N', CHUNK, N, N, CONE, A( I, 1 ),
+                     CALL ZGEMM( 'N', 'N', CHUNK, N, N, CONE, A( I,
+     $                           1 ),
      $                           LDA, WORK( IR ), LDWRKR, CZERO,
      $                           WORK( IU ), LDWRKU )
                      CALL ZLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
@@ -847,7 +858,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                 (CWorkspace: need 0)
 *                 (RWorkspace: need BDSPAC)
 *
-                  CALL ZBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ), CDUM, 1,
+                  CALL ZBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ), CDUM,
+     $                         1,
      $                         A, LDA, CDUM, 1, RWORK( IRWORK ), INFO )
 *
                END IF
@@ -917,7 +929,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
                   CALL ZGEBRD( N, N, VT, LDVT, S, RWORK( IE ),
      $                         WORK( ITAUQ ), WORK( ITAUP ),
      $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  CALL ZLACPY( 'L', N, N, VT, LDVT, WORK( IR ), LDWRKR )
+                  CALL ZLACPY( 'L', N, N, VT, LDVT, WORK( IR ),
+     $                         LDWRKR )
 *
 *                 Generate left vectors bidiagonalizing R in WORK(IR)
 *                 (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
@@ -953,7 +966,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *
                   DO 20 I = 1, M, LDWRKU
                      CHUNK = MIN( M-I+1, LDWRKU )
-                     CALL ZGEMM( 'N', 'N', CHUNK, N, N, CONE, A( I, 1 ),
+                     CALL ZGEMM( 'N', 'N', CHUNK, N, N, CONE, A( I,
+     $                           1 ),
      $                           LDA, WORK( IR ), LDWRKR, CZERO,
      $                           WORK( IU ), LDWRKU )
                      CALL ZLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
@@ -1103,7 +1117,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: need N*N)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ), CDUM,
+                     CALL ZBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ),
+     $                            CDUM,
      $                            1, WORK( IR ), LDWRKR, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -1170,7 +1185,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ), CDUM,
+                     CALL ZBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ),
+     $                            CDUM,
      $                            1, U, LDU, CDUM, 1, RWORK( IRWORK ),
      $                            INFO )
 *
@@ -1347,7 +1363,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'P', N, N, N, A, LDA, WORK( ITAUP ),
+                     CALL ZUNGBR( 'P', N, N, N, A, LDA,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + N
 *
@@ -1438,7 +1455,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                                 prefer N*N+2*N+(N-1)*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+                     CALL ZUNGBR( 'P', N, N, N, VT, LDVT,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + N
 *
@@ -1448,7 +1466,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: need N*N)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', N, N, N, 0, S, RWORK( IE ), VT,
+                     CALL ZBDSQR( 'U', N, N, N, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, WORK( IU ), LDWRKU, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -1514,7 +1533,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+                     CALL ZUNGBR( 'P', N, N, N, VT, LDVT,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + N
 *
@@ -1524,7 +1544,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', N, N, M, 0, S, RWORK( IE ), VT,
+                     CALL ZBDSQR( 'U', N, N, M, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, U, LDU, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -1608,7 +1629,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: need N*N)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ), CDUM,
+                     CALL ZBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ),
+     $                            CDUM,
      $                            1, WORK( IR ), LDWRKR, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -1680,7 +1702,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ), CDUM,
+                     CALL ZBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ),
+     $                            CDUM,
      $                            1, U, LDU, CDUM, 1, RWORK( IRWORK ),
      $                            INFO )
 *
@@ -1861,7 +1884,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'P', N, N, N, A, LDA, WORK( ITAUP ),
+                     CALL ZUNGBR( 'P', N, N, N, A, LDA,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + N
 *
@@ -1953,7 +1977,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                                 prefer N*N+2*N+(N-1)*NB)
 *                    (RWorkspace: need   0)
 *
-                     CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+                     CALL ZUNGBR( 'P', N, N, N, VT, LDVT,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + N
 *
@@ -1963,7 +1988,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: need N*N)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', N, N, N, 0, S, RWORK( IE ), VT,
+                     CALL ZBDSQR( 'U', N, N, N, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, WORK( IU ), LDWRKU, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -2033,7 +2059,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+                     CALL ZUNGBR( 'P', N, N, N, VT, LDVT,
+     $                            WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + N
 *
@@ -2043,7 +2070,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', N, N, M, 0, S, RWORK( IE ), VT,
+                     CALL ZBDSQR( 'U', N, N, M, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, U, LDU, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -2184,7 +2212,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *              (CWorkspace: need 2*M, prefer M+M*NB)
 *              (RWorkspace: 0)
 *
-               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ), WORK( IWORK ),
+               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                      WORK( IWORK ),
      $                      LWORK-IWORK+1, IERR )
 *
 *              Zero out above L
@@ -2200,7 +2229,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *              (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
 *              (RWorkspace: need M)
 *
-               CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+               CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ),
+     $                      WORK( ITAUQ ),
      $                      WORK( ITAUP ), WORK( IWORK ), LWORK-IWORK+1,
      $                      IERR )
                IF( WNTUO .OR. WNTUAS ) THEN
@@ -2222,7 +2252,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *              (CWorkspace: 0)
 *              (RWorkspace: need BDSPAC)
 *
-               CALL ZBDSQR( 'U', M, 0, NRU, 0, S, RWORK( IE ), CDUM, 1,
+               CALL ZBDSQR( 'U', M, 0, NRU, 0, S, RWORK( IE ), CDUM,
+     $                      1,
      $                      A, LDA, CDUM, 1, RWORK( IRWORK ), INFO )
 *
 *              If left singular vectors desired in U, copy them there
@@ -2275,7 +2306,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *
 *                 Copy L to WORK(IR) and zero out above it
 *
-                  CALL ZLACPY( 'L', M, M, A, LDA, WORK( IR ), LDWRKR )
+                  CALL ZLACPY( 'L', M, M, A, LDA, WORK( IR ),
+     $                         LDWRKR )
                   CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
      $                         WORK( IR+LDWRKR ), LDWRKR )
 *
@@ -2294,7 +2326,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                 (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
 *                 (RWorkspace: need M)
 *
-                  CALL ZGEBRD( M, M, WORK( IR ), LDWRKR, S, RWORK( IE ),
+                  CALL ZGEBRD( M, M, WORK( IR ), LDWRKR, S,
+     $                         RWORK( IE ),
      $                         WORK( ITAUQ ), WORK( ITAUP ),
      $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
@@ -2324,7 +2357,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *
                   DO 30 I = 1, N, CHUNK
                      BLK = MIN( N-I+1, CHUNK )
-                     CALL ZGEMM( 'N', 'N', M, BLK, M, CONE, WORK( IR ),
+                     CALL ZGEMM( 'N', 'N', M, BLK, M, CONE,
+     $                           WORK( IR ),
      $                           LDWRKR, A( 1, I ), LDA, CZERO,
      $                           WORK( IU ), LDWRKU )
                      CALL ZLACPY( 'F', M, BLK, WORK( IU ), LDWRKU,
@@ -2361,7 +2395,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                 (CWorkspace: 0)
 *                 (RWorkspace: need BDSPAC)
 *
-                  CALL ZBDSQR( 'L', M, N, 0, 0, S, RWORK( IE ), A, LDA,
+                  CALL ZBDSQR( 'L', M, N, 0, 0, S, RWORK( IE ), A,
+     $                         LDA,
      $                         CDUM, 1, CDUM, 1, RWORK( IRWORK ), INFO )
 *
                END IF
@@ -2412,7 +2447,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                 Copy L to U, zeroing about above it
 *
                   CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
-                  CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO, U( 1, 2 ),
+                  CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO, U( 1,
+     $                         2 ),
      $                         LDU )
 *
 *                 Generate Q in A
@@ -2433,7 +2469,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
                   CALL ZGEBRD( M, M, U, LDU, S, RWORK( IE ),
      $                         WORK( ITAUQ ), WORK( ITAUP ),
      $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  CALL ZLACPY( 'U', M, M, U, LDU, WORK( IR ), LDWRKR )
+                  CALL ZLACPY( 'U', M, M, U, LDU, WORK( IR ),
+     $                         LDWRKR )
 *
 *                 Generate right vectors bidiagonalizing L in WORK(IR)
 *                 (CWorkspace: need M*M+3*M-1, prefer M*M+2*M+(M-1)*NB)
@@ -2469,7 +2506,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *
                   DO 40 I = 1, N, CHUNK
                      BLK = MIN( N-I+1, CHUNK )
-                     CALL ZGEMM( 'N', 'N', M, BLK, M, CONE, WORK( IR ),
+                     CALL ZGEMM( 'N', 'N', M, BLK, M, CONE,
+     $                           WORK( IR ),
      $                           LDWRKR, A( 1, I ), LDA, CZERO,
      $                           WORK( IU ), LDWRKU )
                      CALL ZLACPY( 'F', M, BLK, WORK( IU ), LDWRKU,
@@ -2493,7 +2531,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                 Copy L to U, zeroing out above it
 *
                   CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
-                  CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO, U( 1, 2 ),
+                  CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO, U( 1,
+     $                         2 ),
      $                         LDU )
 *
 *                 Generate Q in A
@@ -2537,7 +2576,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                 (CWorkspace: 0)
 *                 (RWorkspace: need BDSPAC)
 *
-                  CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), A, LDA,
+                  CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), A,
+     $                         LDA,
      $                         U, LDU, CDUM, 1, RWORK( IRWORK ), INFO )
 *
                END IF
@@ -2686,7 +2726,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', M, N, 0, 0, S, RWORK( IE ), VT,
+                     CALL ZBDSQR( 'U', M, N, 0, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, CDUM, 1, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -2861,7 +2902,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: need 3*M, prefer 2*M+M*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'Q', M, M, M, A, LDA, WORK( ITAUQ ),
+                     CALL ZUNGBR( 'Q', M, M, M, A, LDA,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + M
 *
@@ -2871,7 +2913,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), VT,
+                     CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, A, LDA, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -2952,7 +2995,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+M*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL ZUNGBR( 'Q', M, M, M, U, LDU,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + M
 *
@@ -3027,7 +3071,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: need 3*M, prefer 2*M+M*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL ZUNGBR( 'Q', M, M, M, U, LDU,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + M
 *
@@ -3037,7 +3082,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), VT,
+                     CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, U, LDU, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -3192,7 +3238,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', M, N, 0, 0, S, RWORK( IE ), VT,
+                     CALL ZBDSQR( 'U', M, N, 0, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, CDUM, 1, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -3371,7 +3418,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: need 3*M, prefer 2*M+M*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'Q', M, M, M, A, LDA, WORK( ITAUQ ),
+                     CALL ZUNGBR( 'Q', M, M, M, A, LDA,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + M
 *
@@ -3381,7 +3429,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), VT,
+                     CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, A, LDA, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -3462,7 +3511,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+M*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL ZUNGBR( 'Q', M, M, M, U, LDU,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + M
 *
@@ -3541,7 +3591,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: need 3*M, prefer 2*M+M*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL ZUNGBR( 'Q', M, M, M, U, LDU,
+     $                            WORK( ITAUQ ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IRWORK = IE + M
 *
@@ -3551,7 +3602,8 @@ SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), VT,
+                     CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ),
+     $                            VT,
      $                            LDVT, U, LDU, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
diff --git a/SRC/zgesvdq.f b/SRC/zgesvdq.f
index 05eb722f87..acfc9c4a33 100644
--- a/SRC/zgesvdq.f
+++ b/SRC/zgesvdq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGESVDQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgesvdq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgesvdq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -51,8 +49,8 @@
 *> left and the right singular vectors of A, respectively.
 *> \endverbatim
 *
-*  Arguments
-*  =========
+*  Arguments:
+*  ==========
 *
 *> \param[in] JOBA
 *> \verbatim
@@ -363,7 +361,7 @@
 *>   an optimal implementation would do all necessary scaling before calling
 *>   CGESVD and the scaling in CGESVD can be switched off.
 *>   3. Other comments related to code optimization are given in comments in the
-*>   code, enlosed in [[double brackets]].
+*>   code, enclosed in [[double brackets]].
 *> \endverbatim
 *
 *> \par Bugs, examples and comments
@@ -404,14 +402,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEsing
+*> \ingroup gesvdq
 *
 *  =====================================================================
       SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
      $                    S, U, LDU, V, LDV, NUMRANK, IWORK, LIWORK,
      $                    CWORK, LCWORK, RWORK, LRWORK, INFO )
+      IMPLICIT NONE
 *     .. Scalar Arguments ..
-      IMPLICIT    NONE
       CHARACTER   JOBA, JOBP, JOBR, JOBU, JOBV
       INTEGER     M, N, LDA, LDU, LDV, NUMRANK, LIWORK, LCWORK, LRWORK,
      $            INFO
@@ -447,7 +445,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
       DOUBLE PRECISION   RDUMMY(1)
 *     ..
 *     .. External Subroutines (BLAS, LAPACK)
-      EXTERNAL    ZGELQF, ZGEQP3, ZGEQRF, ZGESVD, ZLACPY, ZLAPMT,
+      EXTERNAL    ZGELQF, ZGEQP3, ZGEQRF, ZGESVD, ZLACPY,
+     $                   ZLAPMT,
      $            ZLASCL, ZLASET, ZLASWP, ZDSCAL, DLASET, DLASCL,
      $            ZPOCON, ZUNMLQ, ZUNMQR, XERBLA
 *     ..
@@ -672,10 +671,12 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                    IF ( WNTVA ) THEN
                        CALL ZGEQRF(N,N/2,U,LDU,CDUMMY,CDUMMY,-1,IERR)
                        LWRK_ZGEQRF = INT( CDUMMY(1) )
-                       CALL ZGESVD( 'S', 'O', N/2,N/2, V,LDV, S, U,LDU,
+                       CALL ZGESVD( 'S', 'O', N/2,N/2, V,LDV, S, U,
+     $                              LDU,
      $                      V, LDV, CDUMMY, -1, RDUMMY, IERR )
                        LWRK_ZGESVD2 = INT( CDUMMY(1) )
-                       CALL ZUNMQR( 'R', 'C', N, N, N/2, U, LDU, CDUMMY,
+                       CALL ZUNMQR( 'R', 'C', N, N, N/2, U, LDU,
+     $                              CDUMMY,
      $                      V, LDV, CDUMMY, -1, IERR )
                        LWRK_ZUNMQR2 = INT( CDUMMY(1) )
                        OPTWRK2 = MAX( LWRK_ZGEQP3, N/2+LWRK_ZGEQRF,
@@ -694,10 +695,12 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                    IF ( WNTVA ) THEN
                       CALL ZGELQF(N/2,N,U,LDU,CDUMMY,CDUMMY,-1,IERR)
                       LWRK_ZGELQF = INT( CDUMMY(1) )
-                      CALL ZGESVD( 'S','O', N/2,N/2, V, LDV, S, U, LDU,
+                      CALL ZGESVD( 'S','O', N/2,N/2, V, LDV, S, U,
+     $                             LDU,
      $                     V, LDV, CDUMMY, -1, RDUMMY, IERR )
                       LWRK_ZGESVD2 = INT( CDUMMY(1) )
-                      CALL ZUNMLQ( 'R', 'N', N, N, N/2, U, LDU, CDUMMY,
+                      CALL ZUNMLQ( 'R', 'N', N, N, N/2, U, LDU,
+     $                             CDUMMY,
      $                     V, LDV, CDUMMY,-1,IERR )
                       LWRK_ZUNMLQ = INT( CDUMMY(1) )
                       OPTWRK2 = MAX( LWRK_ZGEQP3, N/2+LWRK_ZGELQF,
@@ -772,9 +775,12 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *              Quick return: A is the M x N zero matrix.
                NUMRANK = 0
                CALL DLASET( 'G', N, 1, ZERO, ZERO, S, N )
-               IF ( WNTUS ) CALL ZLASET('G', M, N, CZERO, CONE, U, LDU)
-               IF ( WNTUA ) CALL ZLASET('G', M, M, CZERO, CONE, U, LDU)
-               IF ( WNTVA ) CALL ZLASET('G', N, N, CZERO, CONE, V, LDV)
+               IF ( WNTUS ) CALL ZLASET('G', M, N, CZERO, CONE, U,
+     $              LDU)
+               IF ( WNTUA ) CALL ZLASET('G', M, M, CZERO, CONE, U,
+     $              LDU)
+               IF ( WNTVA ) CALL ZLASET('G', N, N, CZERO, CONE, V,
+     $              LDV)
                IF ( WNTUF ) THEN
                    CALL ZLASET( 'G', N, 1, CZERO, CZERO, CWORK, N )
                    CALL ZLASET( 'G', M, N, CZERO, CONE, U, LDU )
@@ -795,7 +801,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
             IF ( RWORK(1) .GT. BIG / SQRT(DBLE(M)) ) THEN
 *               .. to prevent overflow in the QR factorization, scale the
 *               matrix by 1/sqrt(M) if too large entry detected
-                CALL ZLASCL('G',0,0,SQRT(DBLE(M)),ONE, M,N, A,LDA, IERR)
+                CALL ZLASCL('G',0,0,SQRT(DBLE(M)),ONE, M,N, A,LDA,
+     $                       IERR)
                 ASCALED = .TRUE.
             END IF
             CALL ZLASWP( N, A, LDA, 1, M-1, IWORK(N+1), 1 )
@@ -817,7 +824,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
           IF ( RTMP .GT. BIG / SQRT(DBLE(M)) ) THEN
 *             .. to prevent overflow in the QR factorization, scale the
 *             matrix by 1/sqrt(M) if too large entry detected
-              CALL ZLASCL('G',0,0, SQRT(DBLE(M)),ONE, M,N, A,LDA, IERR)
+              CALL ZLASCL('G',0,0, SQRT(DBLE(M)),ONE, M,N, A,LDA,
+     $                     IERR)
               ASCALED = .TRUE.
           END IF
       END IF
@@ -946,7 +954,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *           .. compute the singular values of R = [A](1:NR,1:N)
 *
             IF ( NR .GT. 1 )
-     $          CALL ZLASET( 'L', NR-1,NR-1, CZERO,CZERO, A(2,1), LDA )
+     $          CALL ZLASET( 'L', NR-1,NR-1, CZERO,CZERO, A(2,1),
+     $                       LDA )
             CALL ZGESVD( 'N', 'N', NR, N, A, LDA, S, U, LDU,
      $           V, LDV, CWORK, LCWORK, RWORK, INFO )
 *
@@ -966,7 +975,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
  1193          CONTINUE
  1192       CONTINUE
             IF ( NR .GT. 1 )
-     $          CALL ZLASET( 'U', NR-1,NR-1, CZERO,CZERO, U(1,2), LDU )
+     $          CALL ZLASET( 'U', NR-1,NR-1, CZERO,CZERO, U(1,2),
+     $                       LDU )
 *           .. the left singular vectors not computed, the NR right singular
 *           vectors overwrite [U](1:NR,1:NR) as conjugate transposed. These
 *           will be pre-multiplied by Q to build the left singular vectors of A.
@@ -987,7 +997,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *            .. copy R into [U] and overwrite [U] with the left singular vectors
              CALL ZLACPY( 'U', NR, N, A, LDA, U, LDU )
              IF ( NR .GT. 1 )
-     $         CALL ZLASET( 'L', NR-1, NR-1, CZERO, CZERO, U(2,1), LDU )
+     $         CALL ZLASET( 'L', NR-1, NR-1, CZERO, CZERO, U(2,1),
+     $                      LDU )
 *            .. the right singular vectors not computed, the NR left singular
 *            vectors overwrite [U](1:NR,1:NR)
                 CALL ZGESVD( 'O', 'N', NR, N, U, LDU, S, U, LDU,
@@ -1002,7 +1013,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
          IF ( ( NR .LT. M ) .AND. ( .NOT.WNTUF ) ) THEN
              CALL ZLASET('A', M-NR, NR, CZERO, CZERO, U(NR+1,1), LDU)
              IF ( NR .LT. N1 ) THEN
-                CALL ZLASET( 'A',NR,N1-NR,CZERO,CZERO,U(1,NR+1), LDU )
+                CALL ZLASET( 'A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),
+     $                       LDU )
                 CALL ZLASET( 'A',M-NR,N1-NR,CZERO,CONE,
      $               U(NR+1,NR+1), LDU )
              END IF
@@ -1030,7 +1042,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
  1166          CONTINUE
  1165       CONTINUE
             IF ( NR .GT. 1 )
-     $          CALL ZLASET( 'U', NR-1,NR-1, CZERO,CZERO, V(1,2), LDV )
+     $          CALL ZLASET( 'U', NR-1,NR-1, CZERO,CZERO, V(1,2),
+     $                       LDV )
 *           .. the left singular vectors of R**H overwrite V, the right singular
 *           vectors not computed
             IF ( WNTVR .OR. ( NR .EQ. N ) ) THEN
@@ -1060,7 +1073,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *               by padding a zero block. In the case NR << N, a more efficient
 *               way is to first use the QR factorization. For more details
 *               how to implement this, see the " FULL SVD " branch.
-                CALL ZLASET('G', N, N-NR, CZERO, CZERO, V(1,NR+1), LDV)
+                CALL ZLASET('G', N, N-NR, CZERO, CZERO, V(1,NR+1),
+     $                       LDV)
                 CALL ZGESVD( 'O', 'N', N, N, V, LDV, S, U, LDU,
      $               U, LDU, CWORK(N+1), LCWORK-N, RWORK, INFO )
 *
@@ -1080,7 +1094,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *            .. copy R into V and overwrite V with the right singular vectors
              CALL ZLACPY( 'U', NR, N, A, LDA, V, LDV )
              IF ( NR .GT. 1 )
-     $         CALL ZLASET( 'L', NR-1, NR-1, CZERO, CZERO, V(2,1), LDV )
+     $         CALL ZLASET( 'L', NR-1, NR-1, CZERO, CZERO, V(2,1),
+     $                      LDV )
 *            .. the right singular vectors overwrite V, the NR left singular
 *            vectors stored in U(1:NR,1:NR)
              IF ( WNTVR .OR. ( NR .EQ. N ) ) THEN
@@ -1094,7 +1109,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *               by padding a zero block. In the case NR << N, a more efficient
 *               way is to first use the LQ factorization. For more details
 *               how to implement this, see the " FULL SVD " branch.
-                 CALL ZLASET('G', N-NR, N, CZERO,CZERO, V(NR+1,1), LDV)
+                 CALL ZLASET('G', N-NR, N, CZERO,CZERO, V(NR+1,1),
+     $                        LDV)
                  CALL ZGESVD( 'N', 'O', N, N, V, LDV, S, U, LDU,
      $                V, LDV, CWORK(N+1), LCWORK-N, RWORK, INFO )
                  CALL ZLAPMT( .FALSE., N, N, V, LDV, IWORK )
@@ -1120,7 +1136,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
  1169          CONTINUE
  1168       CONTINUE
             IF ( NR .GT. 1 )
-     $          CALL ZLASET( 'U', NR-1,NR-1, CZERO,CZERO, V(1,2), LDV )
+     $          CALL ZLASET( 'U', NR-1,NR-1, CZERO,CZERO, V(1,2),
+     $                       LDV )
 *
 *           .. the left singular vectors of R**H overwrite [V], the NR right
 *           singular vectors of R**H stored in [U](1:NR,1:NR) as conjugate
@@ -1155,9 +1172,11 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
  1117           CONTINUE
 *
                 IF ( ( NR .LT. M ) .AND. .NOT.(WNTUF)) THEN
-                  CALL ZLASET('A', M-NR,NR, CZERO,CZERO, U(NR+1,1), LDU)
+                  CALL ZLASET('A', M-NR,NR, CZERO,CZERO, U(NR+1,1),
+     $                         LDU)
                   IF ( NR .LT. N1 ) THEN
-                     CALL ZLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),LDU)
+                     CALL ZLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),
+     $                            LDU)
                      CALL ZLASET( 'A',M-NR,N1-NR,CZERO,CONE,
      $                    U(NR+1,NR+1), LDU )
                   END IF
@@ -1180,7 +1199,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
  1199                 CONTINUE
  1198              CONTINUE
                    IF ( NR .GT. 1 )
-     $             CALL ZLASET('U',NR-1,NR-1, CZERO,CZERO, V(1,2),LDV)
+     $             CALL ZLASET('U',NR-1,NR-1, CZERO,CZERO, V(1,2),
+     $                          LDV)
 *
                    CALL ZLASET('A',N,N-NR,CZERO,CZERO,V(1,NR+1),LDV)
                    CALL ZGESVD( 'O', 'A', N, N, V, LDV, S, V, LDV,
@@ -1210,7 +1230,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                    IF ( ( N .LT. M ) .AND. .NOT.(WNTUF)) THEN
                       CALL ZLASET('A',M-N,N,CZERO,CZERO,U(N+1,1),LDU)
                       IF ( N .LT. N1 ) THEN
-                        CALL ZLASET('A',N,N1-N,CZERO,CZERO,U(1,N+1),LDU)
+                        CALL ZLASET('A',N,N1-N,CZERO,CZERO,U(1,N+1),
+     $                               LDU)
                         CALL ZLASET('A',M-N,N1-N,CZERO,CONE,
      $                       U(N+1,N+1), LDU )
                       END IF
@@ -1224,7 +1245,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
  1197                 CONTINUE
  1196              CONTINUE
                    IF ( NR .GT. 1 )
-     $             CALL ZLASET('U',NR-1,NR-1,CZERO,CZERO,U(1,NR+2),LDU)
+     $             CALL ZLASET('U',NR-1,NR-1,CZERO,CZERO,U(1,NR+2),
+     $                          LDU)
                    CALL ZGEQRF( N, NR, U(1,NR+1), LDU, CWORK(N+1),
      $                  CWORK(N+NR+1), LCWORK-N-NR, IERR )
                    DO 1143 p = 1, NR
@@ -1237,16 +1259,19 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
      $                 V,LDV, CWORK(N+NR+1),LCWORK-N-NR,RWORK, INFO )
                   CALL ZLASET('A',N-NR,NR,CZERO,CZERO,V(NR+1,1),LDV)
                   CALL ZLASET('A',NR,N-NR,CZERO,CZERO,V(1,NR+1),LDV)
-                  CALL ZLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),LDV)
+                  CALL ZLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),
+     $                         LDV)
                   CALL ZUNMQR('R','C', N, N, NR, U(1,NR+1), LDU,
      $                 CWORK(N+1),V,LDV,CWORK(N+NR+1),LCWORK-N-NR,IERR)
                   CALL ZLAPMT( .FALSE., N, N, V, LDV, IWORK )
 *                 .. assemble the left singular vector matrix U of dimensions
 *                 (M x NR) or (M x N) or (M x M).
                   IF ( ( NR .LT. M ) .AND. .NOT.(WNTUF)) THEN
-                     CALL ZLASET('A',M-NR,NR,CZERO,CZERO,U(NR+1,1),LDU)
+                     CALL ZLASET('A',M-NR,NR,CZERO,CZERO,U(NR+1,1),
+     $                            LDU)
                      IF ( NR .LT. N1 ) THEN
-                     CALL ZLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),LDU)
+                     CALL ZLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),
+     $                            LDU)
                      CALL ZLASET( 'A',M-NR,N1-NR,CZERO,CONE,
      $                    U(NR+1,NR+1),LDU)
                      END IF
@@ -1262,7 +1287,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *                .. copy R into [V] and overwrite V with the right singular vectors
                  CALL ZLACPY( 'U', NR, N, A, LDA, V, LDV )
                 IF ( NR .GT. 1 )
-     $          CALL ZLASET( 'L', NR-1,NR-1, CZERO,CZERO, V(2,1), LDV )
+     $          CALL ZLASET( 'L', NR-1,NR-1, CZERO,CZERO, V(2,1),
+     $                       LDV )
 *               .. the right singular vectors of R overwrite [V], the NR left
 *               singular vectors of R stored in [U](1:NR,1:NR)
                 CALL ZGESVD( 'S', 'O', NR, N, V, LDV, S, U, LDU,
@@ -1272,9 +1298,11 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *               .. assemble the left singular vector matrix U of dimensions
 *              (M x NR) or (M x N) or (M x M).
                IF ( ( NR .LT. M ) .AND. .NOT.(WNTUF)) THEN
-                  CALL ZLASET('A', M-NR,NR, CZERO,CZERO, U(NR+1,1), LDU)
+                  CALL ZLASET('A', M-NR,NR, CZERO,CZERO, U(NR+1,1),
+     $                         LDU)
                   IF ( NR .LT. N1 ) THEN
-                     CALL ZLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),LDU)
+                     CALL ZLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),
+     $                            LDU)
                      CALL ZLASET( 'A',M-NR,N1-NR,CZERO,CONE,
      $                    U(NR+1,NR+1), LDU )
                   END IF
@@ -1293,10 +1321,12 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                IF ( OPTRATIO * NR .GT. N ) THEN
                   CALL ZLACPY( 'U', NR, N, A, LDA, V, LDV )
                   IF ( NR .GT. 1 )
-     $            CALL ZLASET('L', NR-1,NR-1, CZERO,CZERO, V(2,1),LDV)
+     $            CALL ZLASET('L', NR-1,NR-1, CZERO,CZERO, V(2,1),
+     $                         LDV)
 *              .. the right singular vectors of R overwrite [V], the NR left
 *                 singular vectors of R stored in [U](1:NR,1:NR)
-                  CALL ZLASET('A', N-NR,N, CZERO,CZERO, V(NR+1,1),LDV)
+                  CALL ZLASET('A', N-NR,N, CZERO,CZERO, V(NR+1,1),
+     $                         LDV)
                   CALL ZGESVD( 'S', 'O', N, N, V, LDV, S, U, LDU,
      $                 V, LDV, CWORK(N+1), LCWORK-N, RWORK, INFO )
                   CALL ZLAPMT( .FALSE., N, N, V, LDV, IWORK )
@@ -1308,7 +1338,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                   IF ( ( N .LT. M ) .AND. .NOT.(WNTUF)) THEN
                       CALL ZLASET('A',M-N,N,CZERO,CZERO,U(N+1,1),LDU)
                       IF ( N .LT. N1 ) THEN
-                        CALL ZLASET('A',N,N1-N,CZERO,CZERO,U(1,N+1),LDU)
+                        CALL ZLASET('A',N,N1-N,CZERO,CZERO,U(1,N+1),
+     $                               LDU)
                         CALL ZLASET( 'A',M-N,N1-N,CZERO,CONE,
      $                       U(N+1,N+1), LDU )
                       END IF
@@ -1316,7 +1347,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
                ELSE
                   CALL ZLACPY( 'U', NR, N, A, LDA, U(NR+1,1), LDU )
                   IF ( NR .GT. 1 )
-     $            CALL ZLASET('L',NR-1,NR-1,CZERO,CZERO,U(NR+2,1),LDU)
+     $            CALL ZLASET('L',NR-1,NR-1,CZERO,CZERO,U(NR+2,1),
+     $                         LDU)
                   CALL ZGELQF( NR, N, U(NR+1,1), LDU, CWORK(N+1),
      $                 CWORK(N+NR+1), LCWORK-N-NR, IERR )
                   CALL ZLACPY('L',NR,NR,U(NR+1,1),LDU,V,LDV)
@@ -1326,16 +1358,20 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
      $                 V, LDV, CWORK(N+NR+1), LCWORK-N-NR, RWORK, INFO )
                   CALL ZLASET('A',N-NR,NR,CZERO,CZERO,V(NR+1,1),LDV)
                   CALL ZLASET('A',NR,N-NR,CZERO,CZERO,V(1,NR+1),LDV)
-                  CALL ZLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),LDV)
-                  CALL ZUNMLQ('R','N',N,N,NR,U(NR+1,1),LDU,CWORK(N+1),
+                  CALL ZLASET('A',N-NR,N-NR,CZERO,CONE,V(NR+1,NR+1),
+     $                         LDV)
+                  CALL ZUNMLQ('R','N',N,N,NR,U(NR+1,1),LDU,
+     $                         CWORK(N+1),
      $                 V, LDV, CWORK(N+NR+1),LCWORK-N-NR,IERR)
                   CALL ZLAPMT( .FALSE., N, N, V, LDV, IWORK )
 *               .. assemble the left singular vector matrix U of dimensions
 *              (M x NR) or (M x N) or (M x M).
                   IF ( ( NR .LT. M ) .AND. .NOT.(WNTUF)) THEN
-                     CALL ZLASET('A',M-NR,NR,CZERO,CZERO,U(NR+1,1),LDU)
+                     CALL ZLASET('A',M-NR,NR,CZERO,CZERO,U(NR+1,1),
+     $                            LDU)
                      IF ( NR .LT. N1 ) THEN
-                     CALL ZLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),LDU)
+                     CALL ZLASET('A',NR,N1-NR,CZERO,CZERO,U(1,NR+1),
+     $                            LDU)
                      CALL ZLASET( 'A',M-NR,N1-NR,CZERO,CONE,
      $                    U(NR+1,NR+1), LDU )
                      END IF
@@ -1368,7 +1404,8 @@ SUBROUTINE ZGESVDQ( JOBA, JOBP, JOBR, JOBU, JOBV, M, N, A, LDA,
 *
 *     .. if numerical rank deficiency is detected, the truncated
 *     singular values are set to zero.
-      IF ( NR .LT. N ) CALL DLASET( 'G', N-NR,1, ZERO,ZERO, S(NR+1), N )
+      IF ( NR .LT. N ) CALL DLASET( 'G', N-NR,1, ZERO,ZERO, S(NR+1),
+     $     N )
 *     .. undo scaling; this may cause overflow in the largest singular
 *     values.
       IF ( ASCALED )
diff --git a/SRC/zgesvdx.f b/SRC/zgesvdx.f
index a8bf560c21..e406c77b0d 100644
--- a/SRC/zgesvdx.f
+++ b/SRC/zgesvdx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGESVDX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgesvdx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgesvdx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -261,12 +259,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEsing
+*> \ingroup gesvdx
 *
 *  =====================================================================
       SUBROUTINE ZGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
      $                    IL, IU, NS, S, U, LDU, VT, LDVT, WORK,
      $                    LWORK, RWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -305,7 +304,8 @@ SUBROUTINE ZGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
       DOUBLE PRECISION   DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZGEBRD, ZGELQF, ZGEQRF, ZLASCL, ZLASET, ZLACPY,
+      EXTERNAL           ZGEBRD, ZGELQF, ZGEQRF, ZLASCL, ZLASET,
+     $                   ZLACPY,
      $                   ZUNMLQ, ZUNMBR, ZUNMQR, DBDSVDX, DLASCL, XERBLA
 *     ..
 *     .. External Functions ..
@@ -394,7 +394,8 @@ SUBROUTINE ZGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
          MAXWRK = 1
          IF( MINMN.GT.0 ) THEN
             IF( M.GE.N ) THEN
-               MNTHR = ILAENV( 6, 'ZGESVD', JOBU // JOBVT, M, N, 0, 0 )
+               MNTHR = ILAENV( 6, 'ZGESVD', JOBU // JOBVT, M, N, 0,
+     $                         0 )
                IF( M.GE.MNTHR ) THEN
 *
 *                 Path 1 (M much larger than N)
@@ -402,24 +403,28 @@ SUBROUTINE ZGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   MINWRK = N*(N+5)
                   MAXWRK = N + N*ILAENV(1,'ZGEQRF',' ',M,N,-1,-1)
                   MAXWRK = MAX(MAXWRK,
-     $                     N*N+2*N+2*N*ILAENV(1,'ZGEBRD',' ',N,N,-1,-1))
+     $                     N*N+2*N+2*N*ILAENV(1,'ZGEBRD',' ',N,N,-1,
+     $                                         -1))
                   IF (WANTU .OR. WANTVT) THEN
                      MAXWRK = MAX(MAXWRK,
-     $                       N*N+2*N+N*ILAENV(1,'ZUNMQR','LN',N,N,N,-1))
+     $                       N*N+2*N+N*ILAENV(1,'ZUNMQR','LN',N,N,N,
+     $                                         -1))
                   END IF
                ELSE
 *
 *                 Path 2 (M at least N, but not much larger)
 *
                   MINWRK = 3*N + M
-                  MAXWRK = 2*N + (M+N)*ILAENV(1,'ZGEBRD',' ',M,N,-1,-1)
+                  MAXWRK = 2*N + (M+N)*ILAENV(1,'ZGEBRD',' ',M,N,-1,
+     $                             -1)
                   IF (WANTU .OR. WANTVT) THEN
                      MAXWRK = MAX(MAXWRK,
      $                        2*N+N*ILAENV(1,'ZUNMQR','LN',N,N,N,-1))
                   END IF
                END IF
             ELSE
-               MNTHR = ILAENV( 6, 'ZGESVD', JOBU // JOBVT, M, N, 0, 0 )
+               MNTHR = ILAENV( 6, 'ZGESVD', JOBU // JOBVT, M, N, 0,
+     $                         0 )
                IF( N.GE.MNTHR ) THEN
 *
 *                 Path 1t (N much larger than M)
@@ -427,10 +432,12 @@ SUBROUTINE ZGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   MINWRK = M*(M+5)
                   MAXWRK = M + M*ILAENV(1,'ZGELQF',' ',M,N,-1,-1)
                   MAXWRK = MAX(MAXWRK,
-     $                     M*M+2*M+2*M*ILAENV(1,'ZGEBRD',' ',M,M,-1,-1))
+     $                     M*M+2*M+2*M*ILAENV(1,'ZGEBRD',' ',M,M,-1,
+     $                                         -1))
                   IF (WANTU .OR. WANTVT) THEN
                      MAXWRK = MAX(MAXWRK,
-     $                       M*M+2*M+M*ILAENV(1,'ZUNMQR','LN',M,M,M,-1))
+     $                       M*M+2*M+M*ILAENV(1,'ZUNMQR','LN',M,M,M,
+     $                                         -1))
                   END IF
                ELSE
 *
@@ -438,7 +445,8 @@ SUBROUTINE ZGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
 *
 *
                   MINWRK = 3*M + N
-                  MAXWRK = 2*M + (M+N)*ILAENV(1,'ZGEBRD',' ',M,N,-1,-1)
+                  MAXWRK = 2*M + (M+N)*ILAENV(1,'ZGEBRD',' ',M,N,-1,
+     $                             -1)
                   IF (WANTU .OR. WANTVT) THEN
                      MAXWRK = MAX(MAXWRK,
      $                        2*M+M*ILAENV(1,'ZUNMQR','LN',M,M,M,-1))
@@ -559,7 +567,8 @@ SUBROUTINE ZGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   END DO
                   K = K + N
                END DO
-               CALL ZLASET( 'A', M-N, NS, CZERO, CZERO, U( N+1,1 ), LDU)
+               CALL ZLASET( 'A', M-N, NS, CZERO, CZERO, U( N+1,1 ),
+     $                      LDU)
 *
 *              Call ZUNMBR to compute QB*UB.
 *              (Workspace in WORK( ITEMP ): need N, prefer N*NB)
@@ -635,7 +644,8 @@ SUBROUTINE ZGESVDX( JOBU, JOBVT, RANGE, M, N, A, LDA, VL, VU,
                   END DO
                   K = K + N
                END DO
-               CALL ZLASET( 'A', M-N, NS, CZERO, CZERO, U( N+1,1 ), LDU)
+               CALL ZLASET( 'A', M-N, NS, CZERO, CZERO, U( N+1,1 ),
+     $                      LDU)
 *
 *              Call ZUNMBR to compute QB*UB.
 *              (Workspace in WORK( ITEMP ): need N, prefer N*NB)
diff --git a/SRC/zgesvj.f b/SRC/zgesvj.f
index 6cd2335f24..311ddf541a 100644
--- a/SRC/zgesvj.f
+++ b/SRC/zgesvj.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGESVJ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgesvj.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgesvj.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -200,23 +198,25 @@
 *> \verbatim
 *>          LDV is INTEGER
 *>          The leading dimension of the array V, LDV >= 1.
-*>          If JOBV = 'V', then LDV >= max(1,N).
-*>          If JOBV = 'A', then LDV >= max(1,MV) .
+*>          If JOBV = 'V', then LDV >= MAX(1,N).
+*>          If JOBV = 'A', then LDV >= MAX(1,MV) .
 *> \endverbatim
 *>
 *> \param[in,out] CWORK
 *> \verbatim
-*>          CWORK is COMPLEX*16 array, dimension (max(1,LWORK))
+*>          CWORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
 *>          Used as workspace.
-*>          If on entry LWORK = -1, then a workspace query is assumed and
-*>          no computation is done; CWORK(1) is set to the minial (and optimal)
-*>          length of CWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER.
-*>          Length of CWORK, LWORK >= M+N.
+*>          Length of CWORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= M+N, otherwise.
+*>
+*>          If on entry LWORK = -1, then a workspace query is assumed and
+*>          no computation is done; CWORK(1) is set to the minial (and optimal)
+*>          length of CWORK.
 *> \endverbatim
 *>
 *> \param[in,out] RWORK
@@ -247,15 +247,17 @@
 *>          RWORK(6) = the largest absolute value over all sines of the
 *>                    Jacobi rotation angles in the last sweep. It can be
 *>                    useful for a post festum analysis.
-*>         If on entry LRWORK = -1, then a workspace query is assumed and
-*>         no computation is done; RWORK(1) is set to the minial (and optimal)
-*>         length of RWORK.
 *> \endverbatim
 *>
 *> \param[in] LRWORK
 *> \verbatim
 *>         LRWORK is INTEGER
-*>         Length of RWORK, LRWORK >= MAX(6,N).
+*>         Length of RWORK.
+*>         LRWORK >= 1, if MIN(M,N) = 0, and LRWORK >= MAX(6,N), otherwise.
+*>
+*>         If on entry LRWORK = -1, then a workspace query is assumed and
+*>         no computation is done; RWORK(1) is set to the minial (and optimal)
+*>         length of RWORK.
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -276,7 +278,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup gesvj
 *
 *> \par Further Details:
 *  =====================
@@ -367,23 +369,25 @@ SUBROUTINE ZGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
 *
 *     .. Local Parameters ..
       DOUBLE PRECISION   ZERO,         HALF,         ONE
-      PARAMETER  ( ZERO = 0.0D0, HALF = 0.5D0, ONE = 1.0D0)
-      COMPLEX*16      CZERO,                  CONE
-      PARAMETER  ( CZERO = (0.0D0, 0.0D0), CONE = (1.0D0, 0.0D0) )
-      INTEGER      NSWEEP
-      PARAMETER  ( NSWEEP = 30 )
+      PARAMETER        ( ZERO = 0.0D0, HALF = 0.5D0, ONE = 1.0D0)
+      COMPLEX*16         CZERO,                  CONE
+      PARAMETER        ( CZERO = (0.0D0, 0.0D0), CONE = (1.0D0, 0.0D0) )
+      INTEGER            NSWEEP
+      PARAMETER        ( NSWEEP = 30 )
 *     ..
 *     .. Local Scalars ..
-      COMPLEX*16 AAPQ, OMPQ
-      DOUBLE PRECISION AAPP, AAPP0, AAPQ1, AAQQ, APOAQ, AQOAP, BIG,
-     $       BIGTHETA, CS, CTOL, EPSLN, MXAAPQ,
-     $       MXSINJ, ROOTBIG, ROOTEPS, ROOTSFMIN, ROOTTOL,
-     $       SKL, SFMIN, SMALL, SN, T, TEMP1, THETA, THSIGN, TOL
-      INTEGER BLSKIP, EMPTSW, i, ibr, IERR, igl, IJBLSK, ir1,
-     $        ISWROT, jbc, jgl, KBL, LKAHEAD, MVL, N2, N34,
-     $        N4, NBL, NOTROT, p, PSKIPPED, q, ROWSKIP, SWBAND
-      LOGICAL APPLV, GOSCALE, LOWER, LQUERY, LSVEC, NOSCALE, ROTOK,
-     $        RSVEC, UCTOL, UPPER
+      COMPLEX*16         AAPQ, OMPQ
+      DOUBLE PRECISION   AAPP, AAPP0, AAPQ1, AAQQ, APOAQ, AQOAP, BIG,
+     $                   BIGTHETA, CS, CTOL, EPSLN, MXAAPQ,
+     $                   MXSINJ, ROOTBIG, ROOTEPS, ROOTSFMIN, ROOTTOL,
+     $                   SKL, SFMIN, SMALL, SN, T, TEMP1, THETA, THSIGN,
+     $                   TOL
+      INTEGER            BLSKIP, EMPTSW, i, ibr, IERR, igl, IJBLSK, ir1,
+     $                   ISWROT, jbc, jgl, KBL, LKAHEAD, MVL, N2, N34,
+     $                   N4, NBL, NOTROT, p, PSKIPPED, q, ROWSKIP,
+     $                   SWBAND, MINMN, LWMIN, LRWMIN
+      LOGICAL            APPLV, GOSCALE, LOWER, LQUERY, LSVEC, NOSCALE,
+     $                   ROTOK, RSVEC, UCTOL, UPPER
 *     ..
 *     ..
 *     .. Intrinsic Functions ..
@@ -408,7 +412,8 @@ SUBROUTINE ZGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
 *     from BLAS
       EXTERNAL           ZCOPY, ZROT, ZDSCAL, ZSWAP, ZAXPY
 *     from LAPACK
-      EXTERNAL           DLASCL, ZLASCL, ZLASET, ZLASSQ, XERBLA
+      EXTERNAL           DLASCL, ZLASCL, ZLASET, ZLASSQ,
+     $                   XERBLA
       EXTERNAL           ZGSVJ0, ZGSVJ1
 *     ..
 *     .. Executable Statements ..
@@ -422,12 +427,25 @@ SUBROUTINE ZGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
       UPPER = LSAME( JOBA, 'U' )
       LOWER = LSAME( JOBA, 'L' )
 *
-      LQUERY = ( LWORK .EQ. -1 ) .OR. ( LRWORK .EQ. -1 )
+      MINMN = MIN( M, N )
+      IF( MINMN.EQ.0 ) THEN
+         LWMIN  = 1
+         LRWMIN = 1
+      ELSE
+         LWMIN  = M+N
+         LRWMIN = MAX( 6, N )
+      END IF
+*
+      LQUERY = ( LWORK.EQ.-1 ) .OR. ( LRWORK.EQ.-1 )
       IF( .NOT.( UPPER .OR. LOWER .OR. LSAME( JOBA, 'G' ) ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.( LSVEC .OR. UCTOL .OR. LSAME( JOBU, 'N' ) ) ) THEN
+      ELSE IF( .NOT.( LSVEC .OR.
+     $         UCTOL .OR.
+     $         LSAME( JOBU, 'N' ) ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.( RSVEC .OR. APPLV .OR. LSAME( JOBV, 'N' ) ) ) THEN
+      ELSE IF( .NOT.( RSVEC .OR.
+     $         APPLV .OR.
+     $         LSAME( JOBV, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( M.LT.0 ) THEN
          INFO = -4
@@ -442,9 +460,9 @@ SUBROUTINE ZGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
          INFO = -11
       ELSE IF( UCTOL .AND. ( RWORK( 1 ).LE.ONE ) ) THEN
          INFO = -12
-      ELSE IF( ( LWORK.LT.( M+N ) ) .AND. ( .NOT.LQUERY ) ) THEN
+      ELSE IF( LWORK.LT.LWMIN .AND. ( .NOT.LQUERY ) ) THEN
          INFO = -13
-      ELSE IF( ( LRWORK.LT.MAX( N, 6 ) ) .AND. ( .NOT.LQUERY ) ) THEN
+      ELSE IF( LRWORK.LT.LRWMIN .AND. ( .NOT.LQUERY ) ) THEN
          INFO = -15
       ELSE
          INFO = 0
@@ -454,15 +472,15 @@ SUBROUTINE ZGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'ZGESVJ', -INFO )
          RETURN
-      ELSE IF ( LQUERY ) THEN
-         CWORK(1) = M + N
-         RWORK(1) = MAX( N, 6 )
+      ELSE IF( LQUERY ) THEN
+         CWORK( 1 ) = LWMIN
+         RWORK( 1 ) = REAL( LRWMIN )
          RETURN
       END IF
 *
 * #:) Quick return for void matrix
 *
-      IF( ( M.EQ.0 ) .OR. ( N.EQ.0 ) )RETURN
+      IF( MINMN.EQ.0 ) RETURN
 *
 *     Set numerical parameters
 *     The stopping criterion for Jacobi rotations is
@@ -770,7 +788,8 @@ SUBROUTINE ZGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
      $                   V( N4*q+1, N4+1 ), LDV, EPSLN, SFMIN, TOL, 1,
      $                   CWORK( N+1 ), LWORK-N, IERR )
 *
-            CALL ZGSVJ0( JOBV, M, N4, A, LDA, CWORK, SVA, MVL, V, LDV,
+            CALL ZGSVJ0( JOBV, M, N4, A, LDA, CWORK, SVA, MVL, V,
+     $                   LDV,
      $                   EPSLN, SFMIN, TOL, 1, CWORK( N+1 ), LWORK-N,
      $                   IERR )
 *
@@ -782,16 +801,19 @@ SUBROUTINE ZGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
          ELSE IF( UPPER ) THEN
 *
 *
-            CALL ZGSVJ0( JOBV, N4, N4, A, LDA, CWORK, SVA, MVL, V, LDV,
+            CALL ZGSVJ0( JOBV, N4, N4, A, LDA, CWORK, SVA, MVL, V,
+     $                   LDV,
      $                   EPSLN, SFMIN, TOL, 2, CWORK( N+1 ), LWORK-N,
      $                   IERR )
 *
-            CALL ZGSVJ0( JOBV, N2, N4, A( 1, N4+1 ), LDA, CWORK( N4+1 ),
+            CALL ZGSVJ0( JOBV, N2, N4, A( 1, N4+1 ), LDA,
+     $                   CWORK( N4+1 ),
      $                   SVA( N4+1 ), MVL, V( N4*q+1, N4+1 ), LDV,
      $                   EPSLN, SFMIN, TOL, 1, CWORK( N+1 ), LWORK-N,
      $                   IERR )
 *
-            CALL ZGSVJ1( JOBV, N2, N2, N4, A, LDA, CWORK, SVA, MVL, V,
+            CALL ZGSVJ1( JOBV, N2, N2, N4, A, LDA, CWORK, SVA, MVL,
+     $                   V,
      $                   LDV, EPSLN, SFMIN, TOL, 1, CWORK( N+1 ),
      $                   LWORK-N, IERR )
 *
@@ -945,7 +967,8 @@ SUBROUTINE ZGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                     T  = HALF / THETA
                                     CS = ONE
 
-                                    CALL ZROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL ZROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*T )
                                     IF ( RSVEC ) THEN
                                         CALL ZROT( MVL, V(1,p), 1,
@@ -974,7 +997,8 @@ SUBROUTINE ZGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                     AAPP = AAPP*SQRT( MAX( ZERO,
      $                                      ONE-T*AQOAP*AAPQ1 ) )
 *
-                                    CALL ZROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL ZROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*SN )
                                     IF ( RSVEC ) THEN
                                         CALL ZROT( MVL, V(1,p), 1,
@@ -987,14 +1011,17 @@ SUBROUTINE ZGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
 *              .. have to use modified Gram-Schmidt like transformation
                                  CALL ZCOPY( M, A( 1, p ), 1,
      $                                       CWORK(N+1), 1 )
-                                 CALL ZLASCL( 'G', 0, 0, AAPP, ONE, M,
+                                 CALL ZLASCL( 'G', 0, 0, AAPP, ONE,
+     $                                        M,
      $                                        1, CWORK(N+1), LDA,
      $                                        IERR )
-                                 CALL ZLASCL( 'G', 0, 0, AAQQ, ONE, M,
+                                 CALL ZLASCL( 'G', 0, 0, AAQQ, ONE,
+     $                                        M,
      $                                        1, A( 1, q ), LDA, IERR )
                                  CALL ZAXPY( M, -AAPQ, CWORK(N+1), 1,
      $                                       A( 1, q ), 1 )
-                                 CALL ZLASCL( 'G', 0, 0, ONE, AAQQ, M,
+                                 CALL ZLASCL( 'G', 0, 0, ONE, AAQQ,
+     $                                        M,
      $                                        1, A( 1, q ), LDA, IERR )
                                  SVA( q ) = AAQQ*SQRT( MAX( ZERO,
      $                                      ONE-AAPQ1*AAPQ1 ) )
@@ -1009,7 +1036,8 @@ SUBROUTINE ZGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = DZNRM2( M, A( 1, q ), 1 )
+                                    SVA( q ) = DZNRM2( M, A( 1, q ),
+     $                                   1 )
                                  ELSE
                                     T = ZERO
                                     AAQQ = ONE
@@ -1162,7 +1190,8 @@ SUBROUTINE ZGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                  IF( ABS( THETA ).GT.BIGTHETA ) THEN
                                     T  = HALF / THETA
                                     CS = ONE
-                                    CALL ZROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL ZROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*T )
                                     IF( RSVEC ) THEN
                                         CALL ZROT( MVL, V(1,p), 1,
@@ -1189,7 +1218,8 @@ SUBROUTINE ZGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                     AAPP = AAPP*SQRT( MAX( ZERO,
      $                                         ONE-T*AQOAP*AAPQ1 ) )
 *
-                                    CALL ZROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL ZROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*SN )
                                     IF( RSVEC ) THEN
                                         CALL ZROT( MVL, V(1,p), 1,
@@ -1203,15 +1233,18 @@ SUBROUTINE ZGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                IF( AAPP.GT.AAQQ ) THEN
                                     CALL ZCOPY( M, A( 1, p ), 1,
      $                                          CWORK(N+1), 1 )
-                                    CALL ZLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL ZLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, CWORK(N+1),LDA,
      $                                           IERR )
-                                    CALL ZLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL ZLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     CALL ZAXPY( M, -AAPQ, CWORK(N+1),
      $                                          1, A( 1, q ), 1 )
-                                    CALL ZLASCL( 'G', 0, 0, ONE, AAQQ,
+                                    CALL ZLASCL( 'G', 0, 0, ONE,
+     $                                           AAQQ,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     SVA( q ) = AAQQ*SQRT( MAX( ZERO,
@@ -1220,15 +1253,18 @@ SUBROUTINE ZGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
                                ELSE
                                    CALL ZCOPY( M, A( 1, q ), 1,
      $                                          CWORK(N+1), 1 )
-                                    CALL ZLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL ZLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, CWORK(N+1),LDA,
      $                                           IERR )
-                                    CALL ZLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL ZLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     CALL ZAXPY( M, -CONJG(AAPQ),
      $                                   CWORK(N+1), 1, A( 1, p ), 1 )
-                                    CALL ZLASCL( 'G', 0, 0, ONE, AAPP,
+                                    CALL ZLASCL( 'G', 0, 0, ONE,
+     $                                           AAPP,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     SVA( p ) = AAPP*SQRT( MAX( ZERO,
@@ -1244,7 +1280,8 @@ SUBROUTINE ZGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = DZNRM2( M, A( 1, q ), 1)
+                                    SVA( q ) = DZNRM2( M, A( 1, q ),
+     $                                   1)
                                   ELSE
                                     T = ZERO
                                     AAQQ = ONE
@@ -1386,7 +1423,8 @@ SUBROUTINE ZGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
       IF( LSVEC .OR. UCTOL ) THEN
          DO 1998 p = 1, N4
 *            CALL ZDSCAL( M, ONE / SVA( p ), A( 1, p ), 1 )
-            CALL ZLASCL( 'G',0,0, SVA(p), ONE, M, 1, A(1,p), M, IERR )
+            CALL ZLASCL( 'G',0,0, SVA(p), ONE, M, 1, A(1,p), M,
+     $                   IERR )
  1998    CONTINUE
       END IF
 *
diff --git a/SRC/zgesvx.f b/SRC/zgesvx.f
index 87f36bba6b..8a2dd5eaae 100644
--- a/SRC/zgesvx.f
+++ b/SRC/zgesvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGESVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgesvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgesvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -302,7 +300,7 @@
 *>
 *> \param[out] RWORK
 *> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension (2*N)
+*>          RWORK is DOUBLE PRECISION array, dimension (MAX(1,2*N))
 *>          On exit, RWORK(1) contains the reciprocal pivot growth
 *>          factor norm(A)/norm(U). The "max absolute element" norm is
 *>          used. If RWORK(1) is much less than 1, then the stability
@@ -341,12 +339,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEsolve
+*> \ingroup gesvx
 *
 *  =====================================================================
-      SUBROUTINE ZGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE ZGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF,
+     $                   IPIV,
      $                   EQUED, R, C, B, LDB, X, LDX, RCOND, FERR, BERR,
      $                   WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -384,7 +384,8 @@ SUBROUTINE ZGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
       EXTERNAL           LSAME, DLAMCH, ZLANGE, ZLANTR
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZGECON, ZGEEQU, ZGERFS, ZGETRF, ZGETRS,
+      EXTERNAL           XERBLA, ZGECON, ZGEEQU, ZGERFS, ZGETRF,
+     $                   ZGETRS,
      $                   ZLACPY, ZLAQGE
 *     ..
 *     .. Intrinsic Functions ..
@@ -409,7 +410,9 @@ SUBROUTINE ZGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
       ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
@@ -475,7 +478,8 @@ SUBROUTINE ZGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *        Compute row and column scalings to equilibrate the matrix A.
 *
-         CALL ZGEEQU( N, N, A, LDA, R, C, ROWCND, COLCND, AMAX, INFEQU )
+         CALL ZGEEQU( N, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
+     $                INFEQU )
          IF( INFEQU.EQ.0 ) THEN
 *
 *           Equilibrate the matrix.
@@ -551,7 +555,8 @@ SUBROUTINE ZGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL ZGECON( NORM, N, AF, LDAF, ANORM, RCOND, WORK, RWORK, INFO )
+      CALL ZGECON( NORM, N, AF, LDAF, ANORM, RCOND, WORK, RWORK,
+     $             INFO )
 *
 *     Compute the solution matrix X.
 *
diff --git a/SRC/zgesvxx.f b/SRC/zgesvxx.f
index f1102668ae..4322eba1b7 100644
--- a/SRC/zgesvxx.f
+++ b/SRC/zgesvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGESVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgesvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgesvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -529,14 +527,16 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEsolve
+*> \ingroup gesvxx
 *
 *  =====================================================================
-      SUBROUTINE ZGESVXX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE ZGESVXX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    EQUED, R, C, B, LDB, X, LDX, RCOND, RPVGRW,
      $                    BERR, N_ERR_BNDS, ERR_BNDS_NORM,
      $                    ERR_BNDS_COMP, NPARAMS, PARAMS, WORK, RWORK,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -583,7 +583,8 @@ SUBROUTINE ZGESVXX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
       DOUBLE PRECISION   DLAMCH, ZLA_GERPVGRW
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZGEEQUB, ZGETRF, ZGETRS, ZLACPY, ZLAQGE,
+      EXTERNAL           ZGEEQUB, ZGETRF, ZGETRS, ZLACPY,
+     $                   ZLAQGE,
      $                   XERBLA, ZLASCL2, ZGERFSX
 *     ..
 *     .. Intrinsic Functions ..
diff --git a/SRC/zgetc2.f b/SRC/zgetc2.f
index eb97194f29..2d94e53121 100644
--- a/SRC/zgetc2.f
+++ b/SRC/zgetc2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGETC2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgetc2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgetc2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,7 +96,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEauxiliary
+*> \ingroup getc2
 *
 *> \par Contributors:
 *  ==================
@@ -108,6 +106,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZGETC2( N, A, LDA, IPIV, JPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -132,7 +131,7 @@ SUBROUTINE ZGETC2( N, A, LDA, IPIV, JPIV, INFO )
       DOUBLE PRECISION   BIGNUM, EPS, SMIN, SMLNUM, XMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZGERU, ZSWAP, DLABAD
+      EXTERNAL           ZGERU, ZSWAP
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION   DLAMCH
@@ -155,7 +154,6 @@ SUBROUTINE ZGETC2( N, A, LDA, IPIV, JPIV, INFO )
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Handle the case N=1 by itself
 *
@@ -177,8 +175,8 @@ SUBROUTINE ZGETC2( N, A, LDA, IPIV, JPIV, INFO )
 *        Find max element in matrix A
 *
          XMAX = ZERO
-         DO 20 IP = I, N
-            DO 10 JP = I, N
+         DO 20 JP = I, N
+            DO 10 IP = I, N
                IF( ABS( A( IP, JP ) ).GE.XMAX ) THEN
                   XMAX = ABS( A( IP, JP ) )
                   IPV = IP
diff --git a/SRC/zgetf2.f b/SRC/zgetf2.f
index c247f8645a..75f59ef306 100644
--- a/SRC/zgetf2.f
+++ b/SRC/zgetf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGETF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgetf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgetf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup getf2
 *
 *  =====================================================================
       SUBROUTINE ZGETF2( M, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -127,7 +126,7 @@ SUBROUTINE ZGETF2( M, N, A, LDA, IPIV, INFO )
 *     ..
 *     .. Local Scalars ..
       DOUBLE PRECISION   SFMIN
-      INTEGER            I, J, JP
+      INTEGER            J, JP
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION   DLAMCH
@@ -135,7 +134,7 @@ SUBROUTINE ZGETF2( M, N, A, LDA, IPIV, INFO )
       EXTERNAL           DLAMCH, IZAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZGERU, ZSCAL, ZSWAP
+      EXTERNAL           XERBLA, ZGERU, ZRSCL, ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -181,15 +180,8 @@ SUBROUTINE ZGETF2( M, N, A, LDA, IPIV, INFO )
 *
 *           Compute elements J+1:M of J-th column.
 *
-            IF( J.LT.M ) THEN
-               IF( ABS(A( J, J )) .GE. SFMIN ) THEN
-                  CALL ZSCAL( M-J, ONE / A( J, J ), A( J+1, J ), 1 )
-               ELSE
-                  DO 20 I = 1, M-J
-                     A( J+I, J ) = A( J+I, J ) / A( J, J )
-   20             CONTINUE
-               END IF
-            END IF
+            IF( J.LT.M )
+     $         CALL ZRSCL( M-J, A( J, J ), A( J+1, J ), 1 )
 *
          ELSE IF( INFO.EQ.0 ) THEN
 *
diff --git a/SRC/zgetrf.f b/SRC/zgetrf.f
index f3c3b396f8..3a37d60c34 100644
--- a/SRC/zgetrf.f
+++ b/SRC/zgetrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGETRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgetrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgetrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup getrf
 *
 *  =====================================================================
       SUBROUTINE ZGETRF( M, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -128,7 +127,8 @@ SUBROUTINE ZGETRF( M, N, A, LDA, IPIV, INFO )
       INTEGER            I, IINFO, J, JB, NB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZGEMM, ZGETRF2, ZLASWP, ZTRSM
+      EXTERNAL           XERBLA, ZGEMM, ZGETRF2, ZLASWP,
+     $                   ZTRSM
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
@@ -177,7 +177,8 @@ SUBROUTINE ZGETRF( M, N, A, LDA, IPIV, INFO )
 *           Factor diagonal and subdiagonal blocks and test for exact
 *           singularity.
 *
-            CALL ZGETRF2( M-J+1, JB, A( J, J ), LDA, IPIV( J ), IINFO )
+            CALL ZGETRF2( M-J+1, JB, A( J, J ), LDA, IPIV( J ),
+     $                    IINFO )
 *
 *           Adjust INFO and the pivot indices.
 *
@@ -200,14 +201,16 @@ SUBROUTINE ZGETRF( M, N, A, LDA, IPIV, INFO )
 *
 *              Compute block row of U.
 *
-               CALL ZTRSM( 'Left', 'Lower', 'No transpose', 'Unit', JB,
+               CALL ZTRSM( 'Left', 'Lower', 'No transpose', 'Unit',
+     $                     JB,
      $                     N-J-JB+1, ONE, A( J, J ), LDA, A( J, J+JB ),
      $                     LDA )
                IF( J+JB.LE.M ) THEN
 *
 *                 Update trailing submatrix.
 *
-                  CALL ZGEMM( 'No transpose', 'No transpose', M-J-JB+1,
+                  CALL ZGEMM( 'No transpose', 'No transpose',
+     $                        M-J-JB+1,
      $                        N-J-JB+1, JB, -ONE, A( J+JB, J ), LDA,
      $                        A( J, J+JB ), LDA, ONE, A( J+JB, J+JB ),
      $                        LDA )
diff --git a/SRC/zgetrf2.f b/SRC/zgetrf2.f
index a3391fc532..d04d081702 100644
--- a/SRC/zgetrf2.f
+++ b/SRC/zgetrf2.f
@@ -106,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup getrf2
 *
 *  =====================================================================
       RECURSIVE SUBROUTINE ZGETRF2( M, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zgetri.f b/SRC/zgetri.f
index 41782841c9..7094a2e38b 100644
--- a/SRC/zgetri.f
+++ b/SRC/zgetri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGETRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgetri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgetri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup getri
 *
 *  =====================================================================
       SUBROUTINE ZGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -141,7 +140,8 @@ SUBROUTINE ZGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
       EXTERNAL           ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZGEMM, ZGEMV, ZSWAP, ZTRSM, ZTRTRI
+      EXTERNAL           XERBLA, ZGEMM, ZGEMV, ZSWAP, ZTRSM,
+     $                   ZTRTRI
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -152,7 +152,7 @@ SUBROUTINE ZGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
 *
       INFO = 0
       NB = ILAENV( 1, 'ZGETRI', ' ', N, -1, -1, -1 )
-      LWKOPT = N*NB
+      LWKOPT = MAX( 1, N*NB )
       WORK( 1 ) = LWKOPT
       LQUERY = ( LWORK.EQ.-1 )
       IF( N.LT.0 ) THEN
@@ -187,7 +187,8 @@ SUBROUTINE ZGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
          IWS = MAX( LDWORK*NB, 1 )
          IF( LWORK.LT.IWS ) THEN
             NB = LWORK / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'ZGETRI', ' ', N, -1, -1, -1 ) )
+            NBMIN = MAX( 2, ILAENV( 2, 'ZGETRI', ' ', N, -1, -1,
+     $                   -1 ) )
          END IF
       ELSE
          IWS = N
@@ -238,7 +239,8 @@ SUBROUTINE ZGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
      $         CALL ZGEMM( 'No transpose', 'No transpose', N, JB,
      $                     N-J-JB+1, -ONE, A( 1, J+JB ), LDA,
      $                     WORK( J+JB ), LDWORK, ONE, A( 1, J ), LDA )
-            CALL ZTRSM( 'Right', 'Lower', 'No transpose', 'Unit', N, JB,
+            CALL ZTRSM( 'Right', 'Lower', 'No transpose', 'Unit', N,
+     $                  JB,
      $                  ONE, WORK( J ), LDWORK, A( 1, J ), LDA )
    50    CONTINUE
       END IF
diff --git a/SRC/zgetrs.f b/SRC/zgetrs.f
index 53f1bc3884..50a3b49e67 100644
--- a/SRC/zgetrs.f
+++ b/SRC/zgetrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGETRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgetrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgetrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -114,10 +112,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup getrs
 *
 *  =====================================================================
       SUBROUTINE ZGETRS( TRANS, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -189,7 +188,8 @@ SUBROUTINE ZGETRS( TRANS, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *
 *        Solve L*X = B, overwriting B with X.
 *
-         CALL ZTRSM( 'Left', 'Lower', 'No transpose', 'Unit', N, NRHS,
+         CALL ZTRSM( 'Left', 'Lower', 'No transpose', 'Unit', N,
+     $               NRHS,
      $               ONE, A, LDA, B, LDB )
 *
 *        Solve U*X = B, overwriting B with X.
@@ -202,7 +202,8 @@ SUBROUTINE ZGETRS( TRANS, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *
 *        Solve U**T *X = B or U**H *X = B, overwriting B with X.
 *
-         CALL ZTRSM( 'Left', 'Upper', TRANS, 'Non-unit', N, NRHS, ONE,
+         CALL ZTRSM( 'Left', 'Upper', TRANS, 'Non-unit', N, NRHS,
+     $               ONE,
      $               A, LDA, B, LDB )
 *
 *        Solve L**T *X = B, or L**H *X = B overwriting B with X.
diff --git a/SRC/zgetsls.f b/SRC/zgetsls.f
index 5e9a560c16..86784da4cd 100644
--- a/SRC/zgetsls.f
+++ b/SRC/zgetsls.f
@@ -22,8 +22,17 @@
 *>
 *> ZGETSLS solves overdetermined or underdetermined complex linear systems
 *> involving an M-by-N matrix A, using a tall skinny QR or short wide LQ
-*> factorization of A.  It is assumed that A has full rank.
+*> factorization of A.
 *>
+*> It is assumed that A has full rank, and only a rudimentary protection
+*> against rank-deficient matrices is provided. This subroutine only detects
+*> exact rank-deficiency, where a diagonal element of the triangular factor
+*> of A is exactly zero.
+*>
+*> It is conceivable for one (or more) of the diagonal elements of the triangular
+*> factor of A to be subnormally tiny numbers without this subroutine signalling
+*> an error. The solutions computed for such almost-rank-deficient matrices may
+*> be less accurate due to a loss of numerical precision.
 *>
 *>
 *> The following options are provided:
@@ -127,7 +136,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>          If LWORK = -1 or -2, then a workspace query is assumed.
 *>          If LWORK = -1, the routine calculates optimal size of WORK for the
 *>          optimal performance and returns this value in WORK(1).
@@ -141,7 +150,7 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO =  i, the i-th diagonal element of the
-*>                triangular factor of A is zero, so that A does not have
+*>                triangular factor of A is exactly zero, so that A does not have
 *>                full rank; the least squares solution could not be
 *>                computed.
 *> \endverbatim
@@ -154,11 +163,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEsolve
+*> \ingroup getsls
 *
 *  =====================================================================
       SUBROUTINE ZGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
      $                    WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,17 +193,16 @@ SUBROUTINE ZGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, TRAN
-      INTEGER            I, IASCL, IBSCL, J, MINMN, MAXMN, BROW,
-     $                   SCLLEN, MNK, TSZO, TSZM, LWO, LWM, LW1, LW2,
+      INTEGER            I, IASCL, IBSCL, J, MAXMN, BROW,
+     $                   SCLLEN, TSZO, TSZM, LWO, LWM, LW1, LW2,
      $                   WSIZEO, WSIZEM, INFO2
       DOUBLE PRECISION   ANRM, BIGNUM, BNRM, SMLNUM, DUM( 1 )
       COMPLEX*16         TQ( 5 ), WORKQ( 1 )
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      INTEGER            ILAENV
       DOUBLE PRECISION   DLAMCH, ZLANGE
-      EXTERNAL           LSAME, ILAENV, DLABAD, DLAMCH, ZLANGE
+      EXTERNAL           LSAME, DLAMCH, ZLANGE
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ZGEQR, ZGEMQR, ZLASCL, ZLASET,
@@ -207,9 +216,7 @@ SUBROUTINE ZGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
 *     Test the input arguments.
 *
       INFO = 0
-      MINMN = MIN( M, N )
       MAXMN = MAX( M, N )
-      MNK   = MAX( MINMN, NRHS )
       TRAN  = LSAME( TRANS, 'C' )
 *
       LQUERY = ( LWORK.EQ.-1 .OR. LWORK.EQ.-2 )
@@ -230,9 +237,12 @@ SUBROUTINE ZGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
 *
       IF( INFO.EQ.0 ) THEN
 *
-*     Determine the block size and minimum LWORK
+*     Determine the optimum and minimum LWORK
 *
-       IF( M.GE.N ) THEN
+       IF( MIN( M, N, NRHS ).EQ.0 ) THEN
+         WSIZEO = 1
+         WSIZEM = 1
+       ELSE IF( M.GE.N ) THEN
          CALL ZGEQR( M, N, A, LDA, TQ, -1, WORKQ, -1, INFO2 )
          TSZO = INT( TQ( 1 ) )
          LWO  = INT( WORKQ( 1 ) )
@@ -267,17 +277,17 @@ SUBROUTINE ZGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
        IF( ( LWORK.LT.WSIZEM ).AND.( .NOT.LQUERY ) ) THEN
           INFO = -10
        END IF
+*
+       WORK( 1 ) = DBLE( WSIZEO )
 *
       END IF
 *
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'ZGETSLS', -INFO )
-        WORK( 1 ) = DBLE( WSIZEO )
         RETURN
       END IF
       IF( LQUERY ) THEN
-        IF( LWORK.EQ.-1 ) WORK( 1 ) = REAL( WSIZEO )
-        IF( LWORK.EQ.-2 ) WORK( 1 ) = REAL( WSIZEM )
+        IF( LWORK.EQ.-2 ) WORK( 1 ) = DBLE( WSIZEM )
         RETURN
       END IF
       IF( LWORK.LT.WSIZEO ) THEN
@@ -300,7 +310,6 @@ SUBROUTINE ZGETSLS( TRANS, M, N, NRHS, A, LDA, B, LDB,
 *
        SMLNUM = DLAMCH( 'S' ) / DLAMCH( 'P' )
        BIGNUM = ONE / SMLNUM
-       CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Scale A, B if max element outside range [SMLNUM,BIGNUM]
 *
diff --git a/SRC/zgetsqrhrt.f b/SRC/zgetsqrhrt.f
index 5f0167937e..665dfda0a5 100644
--- a/SRC/zgetsqrhrt.f
+++ b/SRC/zgetsqrhrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGETSQRHRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgetsqrhrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgetsqrhrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,14 +128,17 @@
 *>
 *> \param[in] LWORK
 *> \verbatim
+*>          LWORK is INTEGER
 *>          The dimension of the array WORK.
-*>          LWORK >= MAX( LWT + LW1, MAX( LWT+N*N+LW2, LWT+N*N+N ) ),
+*>          If MIN(M,N) = 0, LWORK >= 1, else
+*>          LWORK >= MAX( 1, LWT + LW1, MAX( LWT+N*N+LW2, LWT+N*N+N ) ),
 *>          where
 *>             NUM_ALL_ROW_BLOCKS = CEIL((M-N)/(MB1-N)),
 *>             NB1LOCAL = MIN(NB1,N).
 *>             LWT = NUM_ALL_ROW_BLOCKS * N * NB1LOCAL,
 *>             LW1 = NB1LOCAL * N,
-*>             LW2 = NB1LOCAL * MAX( NB1LOCAL, ( N - NB1LOCAL ) ),
+*>             LW2 = NB1LOCAL * MAX( NB1LOCAL, ( N - NB1LOCAL ) ).
+*>
 *>          If LWORK = -1, then a workspace query is assumed.
 *>          The routine only calculates the optimal size of the WORK
 *>          array, returns this value as the first entry of the WORK
@@ -160,7 +161,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup comlpex16OTHERcomputational
+*> \ingroup getsqrhrt
 *
 *> \par Contributors:
 *  ==================
@@ -174,7 +175,8 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
+      SUBROUTINE ZGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT,
+     $                       WORK,
      $                       LWORK, INFO )
       IMPLICIT NONE
 *
@@ -201,7 +203,8 @@ SUBROUTINE ZGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
      $                   NB1LOCAL, NB2LOCAL, NUM_ALL_ROW_BLOCKS
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZCOPY, ZLATSQR, ZUNGTSQR_ROW, ZUNHR_COL,
+      EXTERNAL           ZCOPY, ZLATSQR, ZUNGTSQR_ROW,
+     $                   ZUNHR_COL,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -212,7 +215,7 @@ SUBROUTINE ZGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
 *     Test the input arguments
 *
       INFO = 0
-      LQUERY  = LWORK.EQ.-1
+      LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
       ELSE IF( N.LT.0 .OR. M.LT.N ) THEN
@@ -225,7 +228,7 @@ SUBROUTINE ZGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
          INFO = -5
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -7
-      ELSE IF( LDT.LT.MAX( 1,  MIN( NB2, N ) ) ) THEN
+      ELSE IF( LDT.LT.MAX( 1, MIN( NB2, N ) ) ) THEN
          INFO = -9
       ELSE
 *
@@ -263,8 +266,9 @@ SUBROUTINE ZGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
             LW2 = NB1LOCAL * MAX( NB1LOCAL, ( N - NB1LOCAL ) )
 *
             LWORKOPT = MAX( LWT + LW1, MAX( LWT+N*N+LW2, LWT+N*N+N ) )
+            LWORKOPT = MAX( 1, LWORKOPT )
 *
-            IF( ( LWORK.LT.MAX( 1, LWORKOPT ) ).AND.(.NOT.LQUERY) ) THEN
+            IF( LWORK.LT.LWORKOPT .AND. .NOT.LQUERY ) THEN
                INFO = -11
             END IF
 *
@@ -337,7 +341,8 @@ SUBROUTINE ZGETSQRHRT( M, N, MB1, NB1, NB2, A, LDA, T, LDT, WORK,
                A( I, J ) = -CONE * WORK( LWT+N*(J-1)+I )
             END DO
          ELSE
-            CALL ZCOPY( N-I+1, WORK(LWT+N*(I-1)+I), N, A( I, I ), LDA )
+            CALL ZCOPY( N-I+1, WORK(LWT+N*(I-1)+I), N, A( I, I ),
+     $                  LDA )
          END IF
       END DO
 *
diff --git a/SRC/zggbak.f b/SRC/zggbak.f
index a0ea5de4d2..2e8883be18 100644
--- a/SRC/zggbak.f
+++ b/SRC/zggbak.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGBAK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zggbak.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zggbak.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -131,7 +129,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup ggbak
 *
 *> \par Further Details:
 *  =====================
@@ -143,8 +141,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
+      SUBROUTINE ZGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M,
+     $                   V,
      $                   LDV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,8 +183,10 @@ SUBROUTINE ZGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
       LEFTV = LSAME( SIDE, 'L' )
 *
       INFO = 0
-      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
-     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+      IF( .NOT.LSAME( JOB, 'N' ) .AND.
+     $    .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND.
+     $                .NOT.LSAME( JOB, 'B' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.RIGHTV .AND. .NOT.LEFTV ) THEN
          INFO = -2
diff --git a/SRC/zggbal.f b/SRC/zggbal.f
index c37ab4c100..840551e658 100644
--- a/SRC/zggbal.f
+++ b/SRC/zggbal.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGBAL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zggbal.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zggbal.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,7 +158,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup ggbal
 *
 *> \par Further Details:
 *  =====================
@@ -174,6 +172,7 @@
 *  =====================================================================
       SUBROUTINE ZGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
      $                   RSCALE, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -230,8 +229,10 @@ SUBROUTINE ZGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
 *     Test the input parameters
 *
       INFO = 0
-      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
-     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+      IF( .NOT.LSAME( JOB, 'N' ) .AND.
+     $    .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND.
+     $                .NOT.LSAME( JOB, 'B' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -514,8 +515,10 @@ SUBROUTINE ZGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
       IF( CMAX.LT.HALF )
      $   GO TO 350
 *
-      CALL DAXPY( NR, -ALPHA, WORK( ILO+2*N ), 1, WORK( ILO+4*N ), 1 )
-      CALL DAXPY( NR, -ALPHA, WORK( ILO+3*N ), 1, WORK( ILO+5*N ), 1 )
+      CALL DAXPY( NR, -ALPHA, WORK( ILO+2*N ), 1, WORK( ILO+4*N ),
+     $            1 )
+      CALL DAXPY( NR, -ALPHA, WORK( ILO+3*N ), 1, WORK( ILO+5*N ),
+     $            1 )
 *
       PGAMMA = GAMMA
       IT = IT + 1
diff --git a/SRC/zgges.f b/SRC/zgges.f
index 3847adc04d..76903d1d3b 100644
--- a/SRC/zgges.f
+++ b/SRC/zgges.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGES + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgges.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgges.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -261,12 +259,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEeigen
+*> \ingroup gges
 *
 *  =====================================================================
-      SUBROUTINE ZGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
+      SUBROUTINE ZGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
+     $                  LDB,
      $                  SDIM, ALPHA, BETA, VSL, LDVSL, VSR, LDVSR, WORK,
      $                  LWORK, RWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -311,9 +311,9 @@ SUBROUTINE ZGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
       DOUBLE PRECISION   DIF( 2 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, XERBLA, ZGEQRF, ZGGBAK, ZGGBAL, ZGGHRD,
-     $                   ZHGEQZ, ZLACPY, ZLASCL, ZLASET, ZTGSEN, ZUNGQR,
-     $                   ZUNMQR
+      EXTERNAL           XERBLA, ZGEQRF, ZGGBAK, ZGGBAL, ZGGHRD,
+     $                   ZHGEQZ,
+     $                   ZLACPY, ZLASCL, ZLASET, ZTGSEN, ZUNGQR, ZUNMQR
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -360,7 +360,8 @@ SUBROUTINE ZGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
          INFO = -1
       ELSE IF( IJOBVR.LE.0 ) THEN
          INFO = -2
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
          INFO = -5
@@ -383,7 +384,8 @@ SUBROUTINE ZGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
 *
       IF( INFO.EQ.0 ) THEN
          LWKMIN = MAX( 1, 2*N )
-         LWKOPT = MAX( 1, N + N*ILAENV( 1, 'ZGEQRF', ' ', N, 1, N, 0 ) )
+         LWKOPT = MAX( 1, N + N*ILAENV( 1, 'ZGEQRF', ' ', N, 1, N,
+     $                 0 ) )
          LWKOPT = MAX( LWKOPT, N +
      $                 N*ILAENV( 1, 'ZUNMQR', ' ', N, 1, N, -1 ) )
          IF( ILVSL ) THEN
@@ -415,7 +417,6 @@ SUBROUTINE ZGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -528,9 +529,11 @@ SUBROUTINE ZGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
 *        Undo scaling on eigenvalues before selecting
 *
          IF( ILASCL )
-     $      CALL ZLASCL( 'G', 0, 0, ANRM, ANRMTO, N, 1, ALPHA, N, IERR )
+     $      CALL ZLASCL( 'G', 0, 0, ANRM, ANRMTO, N, 1, ALPHA, N,
+     $                   IERR )
          IF( ILBSCL )
-     $      CALL ZLASCL( 'G', 0, 0, BNRM, BNRMTO, N, 1, BETA, N, IERR )
+     $      CALL ZLASCL( 'G', 0, 0, BNRM, BNRMTO, N, 1, BETA, N,
+     $                   IERR )
 *
 *        Select eigenvalues
 *
@@ -538,7 +541,8 @@ SUBROUTINE ZGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
             BWORK( I ) = SELCTG( ALPHA( I ), BETA( I ) )
    10    CONTINUE
 *
-         CALL ZTGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB, ALPHA,
+         CALL ZTGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB,
+     $                ALPHA,
      $                BETA, VSL, LDVSL, VSR, LDVSR, SDIM, PVSL, PVSR,
      $                DIF, WORK( IWRK ), LWORK-IWRK+1, IDUM, 1, IERR )
          IF( IERR.EQ.1 )
diff --git a/SRC/zgges3.f b/SRC/zgges3.f
index 8b3e44f885..1225a82d9a 100644
--- a/SRC/zgges3.f
+++ b/SRC/zgges3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGES3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgges3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgges3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -215,7 +213,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= MAX(1,2*N)
+*>          For good performance, LWORK must generally be larger.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -260,12 +259,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEeigen
+*> \ingroup gges3
 *
 *  =====================================================================
       SUBROUTINE ZGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
      $                   LDB, SDIM, ALPHA, BETA, VSL, LDVSL, VSR, LDVSR,
      $                   WORK, LWORK, RWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -300,7 +300,8 @@ SUBROUTINE ZGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
       LOGICAL            CURSL, ILASCL, ILBSCL, ILVSL, ILVSR, LASTSL,
      $                   LQUERY, WANTST
       INTEGER            I, ICOLS, IERR, IHI, IJOBVL, IJOBVR, ILEFT,
-     $                   ILO, IRIGHT, IROWS, IRWRK, ITAU, IWRK, LWKOPT
+     $                   ILO, IRIGHT, IROWS, IRWRK, ITAU, IWRK, LWKOPT,
+     $                   LWKMIN
       DOUBLE PRECISION   ANRM, ANRMTO, BIGNUM, BNRM, BNRMTO, EPS, PVSL,
      $                   PVSR, SMLNUM
 *     ..
@@ -309,9 +310,9 @@ SUBROUTINE ZGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
       DOUBLE PRECISION   DIF( 2 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, XERBLA, ZGEQRF, ZGGBAK, ZGGBAL, ZGGHD3,
-     $                   ZLAQZ0, ZLACPY, ZLASCL, ZLASET, ZTGSEN, ZUNGQR,
-     $                   ZUNMQR
+      EXTERNAL           XERBLA, ZGEQRF, ZGGBAK, ZGGBAL, ZGGHD3,
+     $                   ZLAQZ0,
+     $                   ZLACPY, ZLASCL, ZLASET, ZTGSEN, ZUNGQR, ZUNMQR
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -353,11 +354,14 @@ SUBROUTINE ZGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
+      LWKMIN = MAX( 1, 2*N )
+*
       IF( IJOBVL.LE.0 ) THEN
          INFO = -1
       ELSE IF( IJOBVR.LE.0 ) THEN
          INFO = -2
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
          INFO = -5
@@ -369,7 +373,7 @@ SUBROUTINE ZGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
          INFO = -14
       ELSE IF( LDVSR.LT.1 .OR. ( ILVSR .AND. LDVSR.LT.N ) ) THEN
          INFO = -16
-      ELSE IF( LWORK.LT.MAX( 1, 2*N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -18
       END IF
 *
@@ -377,28 +381,32 @@ SUBROUTINE ZGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
 *
       IF( INFO.EQ.0 ) THEN
          CALL ZGEQRF( N, N, B, LDB, WORK, WORK, -1, IERR )
-         LWKOPT = MAX( 1,  N + INT ( WORK( 1 ) ) )
+         LWKOPT = MAX( LWKMIN,  N + INT( WORK( 1 ) ) )
          CALL ZUNMQR( 'L', 'C', N, N, N, B, LDB, WORK, A, LDA, WORK,
      $                -1, IERR )
-         LWKOPT = MAX( LWKOPT, N + INT ( WORK( 1 ) ) )
+         LWKOPT = MAX( LWKOPT, N + INT( WORK( 1 ) ) )
          IF( ILVSL ) THEN
             CALL ZUNGQR( N, N, N, VSL, LDVSL, WORK, WORK, -1, IERR )
             LWKOPT = MAX( LWKOPT, N + INT ( WORK( 1 ) ) )
          END IF
          CALL ZGGHD3( JOBVSL, JOBVSR, N, 1, N, A, LDA, B, LDB, VSL,
      $                LDVSL, VSR, LDVSR, WORK, -1, IERR )
-         LWKOPT = MAX( LWKOPT, N + INT ( WORK( 1 ) ) )
+         LWKOPT = MAX( LWKOPT, N + INT( WORK( 1 ) ) )
          CALL ZLAQZ0( 'S', JOBVSL, JOBVSR, N, 1, N, A, LDA, B, LDB,
      $                ALPHA, BETA, VSL, LDVSL, VSR, LDVSR, WORK, -1,
      $                RWORK, 0, IERR )
-         LWKOPT = MAX( LWKOPT, INT ( WORK( 1 ) ) )
+         LWKOPT = MAX( LWKOPT, INT( WORK( 1 ) ) )
          IF( WANTST ) THEN
             CALL ZTGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB,
      $                   ALPHA, BETA, VSL, LDVSL, VSR, LDVSR, SDIM,
      $                   PVSL, PVSR, DIF, WORK, -1, IDUM, 1, IERR )
-            LWKOPT = MAX( LWKOPT, INT ( WORK( 1 ) ) )
+            LWKOPT = MAX( LWKOPT, INT( WORK( 1 ) ) )
+         END IF
+         IF( N.EQ.0 ) THEN
+            WORK( 1 ) = 1
+         ELSE
+            WORK( 1 ) = DCMPLX( LWKOPT )
          END IF
-         WORK( 1 ) = DCMPLX( LWKOPT )
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -420,7 +428,6 @@ SUBROUTINE ZGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -525,9 +532,11 @@ SUBROUTINE ZGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
 *        Undo scaling on eigenvalues before selecting
 *
          IF( ILASCL )
-     $      CALL ZLASCL( 'G', 0, 0, ANRM, ANRMTO, N, 1, ALPHA, N, IERR )
+     $      CALL ZLASCL( 'G', 0, 0, ANRM, ANRMTO, N, 1, ALPHA, N,
+     $                   IERR )
          IF( ILBSCL )
-     $      CALL ZLASCL( 'G', 0, 0, BNRM, BNRMTO, N, 1, BETA, N, IERR )
+     $      CALL ZLASCL( 'G', 0, 0, BNRM, BNRMTO, N, 1, BETA, N,
+     $                   IERR )
 *
 *        Select eigenvalues
 *
@@ -535,7 +544,8 @@ SUBROUTINE ZGGES3( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B,
             BWORK( I ) = SELCTG( ALPHA( I ), BETA( I ) )
    10    CONTINUE
 *
-         CALL ZTGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB, ALPHA,
+         CALL ZTGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB,
+     $                ALPHA,
      $                BETA, VSL, LDVSL, VSR, LDVSR, SDIM, PVSL, PVSR,
      $                DIF, WORK( IWRK ), LWORK-IWRK+1, IDUM, 1, IERR )
          IF( IERR.EQ.1 )
diff --git a/SRC/zggesx.f b/SRC/zggesx.f
index 96e4f2cda9..351b1efaf5 100644
--- a/SRC/zggesx.f
+++ b/SRC/zggesx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGESX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zggesx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zggesx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -320,13 +318,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEeigen
+*> \ingroup ggesx
 *
 *  =====================================================================
-      SUBROUTINE ZGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
+      SUBROUTINE ZGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A,
+     $                   LDA,
      $                   B, LDB, SDIM, ALPHA, BETA, VSL, LDVSL, VSR,
      $                   LDVSR, RCONDE, RCONDV, WORK, LWORK, RWORK,
      $                   IWORK, LIWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -372,9 +372,9 @@ SUBROUTINE ZGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
       DOUBLE PRECISION   DIF( 2 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, XERBLA, ZGEQRF, ZGGBAK, ZGGBAL, ZGGHRD,
-     $                   ZHGEQZ, ZLACPY, ZLASCL, ZLASET, ZTGSEN, ZUNGQR,
-     $                   ZUNMQR
+      EXTERNAL           XERBLA, ZGEQRF, ZGGBAK, ZGGBAL, ZGGHRD,
+     $                   ZHGEQZ,
+     $                   ZLACPY, ZLASCL, ZLASET, ZTGSEN, ZUNGQR, ZUNMQR
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -434,7 +434,8 @@ SUBROUTINE ZGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
          INFO = -1
       ELSE IF( IJOBVR.LE.0 ) THEN
          INFO = -2
-      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND.
+     $         ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( .NOT.( WANTSN .OR. WANTSE .OR. WANTSV .OR. WANTSB ) .OR.
      $         ( .NOT.WANTST .AND. .NOT.WANTSN ) ) THEN
@@ -466,7 +467,8 @@ SUBROUTINE ZGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
      $                    ILAENV( 1, 'ZUNMQR', ' ', N, 1, N, -1 ) ) )
             IF( ILVSL ) THEN
                MAXWRK = MAX( MAXWRK, N*( 1 +
-     $                       ILAENV( 1, 'ZUNGQR', ' ', N, 1, N, -1 ) ) )
+     $                       ILAENV( 1, 'ZUNGQR', ' ', N, 1, N,
+     $                               -1 ) ) )
             END IF
             LWRK = MAXWRK
             IF( IJOB.GE.1 )
@@ -510,7 +512,6 @@ SUBROUTINE ZGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -621,9 +622,11 @@ SUBROUTINE ZGGESX( JOBVSL, JOBVSR, SORT, SELCTG, SENSE, N, A, LDA,
 *        Undo scaling on eigenvalues before SELCTGing
 *
          IF( ILASCL )
-     $      CALL ZLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHA, N, IERR )
+     $      CALL ZLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHA, N,
+     $                   IERR )
          IF( ILBSCL )
-     $      CALL ZLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N, IERR )
+     $      CALL ZLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N,
+     $                   IERR )
 *
 *        Select eigenvalues
 *
diff --git a/SRC/zggev.f b/SRC/zggev.f
index 2e6a4d730f..a9df7563f3 100644
--- a/SRC/zggev.f
+++ b/SRC/zggev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zggev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zggev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -209,11 +207,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEeigen
+*> \ingroup ggev
 *
 *  =====================================================================
       SUBROUTINE ZGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
      $                  VL, LDVL, VR, LDVR, WORK, LWORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -253,9 +252,9 @@ SUBROUTINE ZGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
       LOGICAL            LDUMMA( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, XERBLA, ZGEQRF, ZGGBAK, ZGGBAL, ZGGHRD,
-     $                   ZHGEQZ, ZLACPY, ZLASCL, ZLASET, ZTGEVC, ZUNGQR,
-     $                   ZUNMQR
+      EXTERNAL           XERBLA, ZGEQRF, ZGGBAK, ZGGBAL, ZGGHRD,
+     $                   ZHGEQZ,
+     $                   ZLACPY, ZLASCL, ZLASET, ZTGEVC, ZUNGQR, ZUNMQR
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -329,7 +328,8 @@ SUBROUTINE ZGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
 *
       IF( INFO.EQ.0 ) THEN
          LWKMIN = MAX( 1, 2*N )
-         LWKOPT = MAX( 1, N + N*ILAENV( 1, 'ZGEQRF', ' ', N, 1, N, 0 ) )
+         LWKOPT = MAX( 1, N + N*ILAENV( 1, 'ZGEQRF', ' ', N, 1, N,
+     $                 0 ) )
          LWKOPT = MAX( LWKOPT, N +
      $                 N*ILAENV( 1, 'ZUNMQR', ' ', N, 1, N, 0 ) )
          IF( ILVL ) THEN
@@ -359,7 +359,6 @@ SUBROUTINE ZGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
       EPS = DLAMCH( 'E' )*DLAMCH( 'B' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -492,7 +491,8 @@ SUBROUTINE ZGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
             CHTEMP = 'R'
          END IF
 *
-         CALL ZTGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL, LDVL,
+         CALL ZTGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL,
+     $                LDVL,
      $                VR, LDVR, N, IN, WORK( IWRK ), RWORK( IRWRK ),
      $                IERR )
          IF( IERR.NE.0 ) THEN
diff --git a/SRC/zggev3.f b/SRC/zggev3.f
index 2d6c745824..135270ef98 100644
--- a/SRC/zggev3.f
+++ b/SRC/zggev3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGEV3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zggev3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zggev3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -174,7 +172,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= MAX(1,2*N).
+*>          For good performance, LWORK must generally be larger.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -208,11 +207,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEeigen
+*> \ingroup ggev3
 *
 *  =====================================================================
-      SUBROUTINE ZGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
+      SUBROUTINE ZGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA,
+     $                   BETA,
      $                   VL, LDVL, VR, LDVR, WORK, LWORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -243,7 +244,7 @@ SUBROUTINE ZGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
       CHARACTER          CHTEMP
       INTEGER            ICOLS, IERR, IHI, IJOBVL, IJOBVR, ILEFT, ILO,
      $                   IN, IRIGHT, IROWS, IRWRK, ITAU, IWRK, JC, JR,
-     $                   LWKOPT
+     $                   LWKMIN, LWKOPT
       DOUBLE PRECISION   ANRM, ANRMTO, BIGNUM, BNRM, BNRMTO, EPS,
      $                   SMLNUM, TEMP
       COMPLEX*16         X
@@ -252,9 +253,9 @@ SUBROUTINE ZGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
       LOGICAL            LDUMMA( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, XERBLA, ZGEQRF, ZGGBAK, ZGGBAL, ZGGHD3,
-     $                   ZLAQZ0, ZLACPY, ZLASCL, ZLASET, ZTGEVC, ZUNGQR,
-     $                   ZUNMQR
+      EXTERNAL           XERBLA, ZGEQRF, ZGGBAK, ZGGBAL, ZGGHD3,
+     $                   ZLAQZ0,
+     $                   ZLACPY, ZLASCL, ZLASET, ZTGEVC, ZUNGQR, ZUNMQR
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -301,6 +302,7 @@ SUBROUTINE ZGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
+      LWKMIN = MAX( 1, 2*N )
       IF( IJOBVL.LE.0 ) THEN
          INFO = -1
       ELSE IF( IJOBVR.LE.0 ) THEN
@@ -315,7 +317,7 @@ SUBROUTINE ZGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
          INFO = -11
       ELSE IF( LDVR.LT.1 .OR. ( ILVR .AND. LDVR.LT.N ) ) THEN
          INFO = -13
-      ELSE IF( LWORK.LT.MAX( 1, 2*N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -15
       END IF
 *
@@ -323,7 +325,7 @@ SUBROUTINE ZGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
 *
       IF( INFO.EQ.0 ) THEN
          CALL ZGEQRF( N, N, B, LDB, WORK, WORK, -1, IERR )
-         LWKOPT = MAX( 1,  N+INT( WORK( 1 ) ) )
+         LWKOPT = MAX( LWKMIN, N+INT( WORK( 1 ) ) )
          CALL ZUNMQR( 'L', 'C', N, N, N, B, LDB, WORK, A, LDA, WORK,
      $                -1, IERR )
          LWKOPT = MAX( LWKOPT, N+INT( WORK( 1 ) ) )
@@ -348,7 +350,11 @@ SUBROUTINE ZGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
      $                   RWORK, 0, IERR )
             LWKOPT = MAX( LWKOPT, N+INT( WORK( 1 ) ) )
          END IF
-         WORK( 1 ) = DCMPLX( LWKOPT )
+         IF( N.EQ.0 ) THEN
+            WORK( 1 ) = 1
+         ELSE
+            WORK( 1 ) = DCMPLX( LWKOPT )
+         END IF
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -368,7 +374,6 @@ SUBROUTINE ZGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
       EPS = DLAMCH( 'E' )*DLAMCH( 'B' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -494,7 +499,8 @@ SUBROUTINE ZGGEV3( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
             CHTEMP = 'R'
          END IF
 *
-         CALL ZTGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL, LDVL,
+         CALL ZTGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL,
+     $                LDVL,
      $                VR, LDVR, N, IN, WORK( IWRK ), RWORK( IRWRK ),
      $                IERR )
          IF( IERR.NE.0 ) THEN
diff --git a/SRC/zggevx.f b/SRC/zggevx.f
index c63a390e63..c062aef292 100644
--- a/SRC/zggevx.f
+++ b/SRC/zggevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zggevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zggevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -335,7 +333,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEeigen
+*> \ingroup ggevx
 *
 *> \par Further Details:
 *  =====================
@@ -367,10 +365,12 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
+      SUBROUTINE ZGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B,
+     $                   LDB,
      $                   ALPHA, BETA, VL, LDVL, VR, LDVR, ILO, IHI,
      $                   LSCALE, RSCALE, ABNRM, BBNRM, RCONDE, RCONDV,
      $                   WORK, LWORK, RWORK, IWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -414,9 +414,10 @@ SUBROUTINE ZGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
       LOGICAL            LDUMMA( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLASCL, XERBLA, ZGEQRF, ZGGBAK, ZGGBAL,
-     $                   ZGGHRD, ZHGEQZ, ZLACPY, ZLASCL, ZLASET, ZTGEVC,
-     $                   ZTGSNA, ZUNGQR, ZUNMQR
+      EXTERNAL           DLASCL, XERBLA, ZGEQRF, ZGGBAK, ZGGBAL,
+     $                   ZGGHRD,
+     $                   ZHGEQZ, ZLACPY, ZLASCL, ZLASET, ZTGEVC, ZTGSNA,
+     $                   ZUNGQR, ZUNMQR
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -513,12 +514,15 @@ SUBROUTINE ZGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
             END IF
             MAXWRK = MINWRK
             MAXWRK = MAX( MAXWRK,
-     $                    N + N*ILAENV( 1, 'ZGEQRF', ' ', N, 1, N, 0 ) )
+     $                    N + N*ILAENV( 1, 'ZGEQRF', ' ', N, 1, N,
+     $                                  0 ) )
             MAXWRK = MAX( MAXWRK,
-     $                    N + N*ILAENV( 1, 'ZUNMQR', ' ', N, 1, N, 0 ) )
+     $                    N + N*ILAENV( 1, 'ZUNMQR', ' ', N, 1, N,
+     $                                  0 ) )
             IF( ILVL ) THEN
                MAXWRK = MAX( MAXWRK, N +
-     $                       N*ILAENV( 1, 'ZUNGQR', ' ', N, 1, N, 0 ) )
+     $                       N*ILAENV( 1, 'ZUNGQR', ' ', N, 1, N,
+     $                                 0 ) )
             END IF
          END IF
          WORK( 1 ) = MAXWRK
@@ -545,7 +549,6 @@ SUBROUTINE ZGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SQRT( SMLNUM ) / EPS
       BIGNUM = ONE / SMLNUM
 *
@@ -580,7 +583,8 @@ SUBROUTINE ZGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
 *     Permute and/or balance the matrix pair (A,B)
 *     (Real Workspace: need 6*N if BALANC = 'S' or 'B', 1 otherwise)
 *
-      CALL ZGGBAL( BALANC, N, A, LDA, B, LDB, ILO, IHI, LSCALE, RSCALE,
+      CALL ZGGBAL( BALANC, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
+     $             RSCALE,
      $             RWORK, IERR )
 *
 *     Compute ABNRM and BBNRM
@@ -749,7 +753,8 @@ SUBROUTINE ZGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
 *     (Workspace: none needed)
 *
       IF( ILVL ) THEN
-         CALL ZGGBAK( BALANC, 'L', N, ILO, IHI, LSCALE, RSCALE, N, VL,
+         CALL ZGGBAK( BALANC, 'L', N, ILO, IHI, LSCALE, RSCALE, N,
+     $                VL,
      $                LDVL, IERR )
 *
          DO 50 JC = 1, N
@@ -767,7 +772,8 @@ SUBROUTINE ZGGEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, B, LDB,
       END IF
 *
       IF( ILVR ) THEN
-         CALL ZGGBAK( BALANC, 'R', N, ILO, IHI, LSCALE, RSCALE, N, VR,
+         CALL ZGGBAK( BALANC, 'R', N, ILO, IHI, LSCALE, RSCALE, N,
+     $                VR,
      $                LDVR, IERR )
          DO 80 JC = 1, N
             TEMP = ZERO
diff --git a/SRC/zggglm.f b/SRC/zggglm.f
index 6c24131aa3..3a0d550ab9 100644
--- a/SRC/zggglm.f
+++ b/SRC/zggglm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGGLM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zggglm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zggglm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -61,6 +59,16 @@
 *>                  x
 *>
 *> where inv(B) denotes the inverse of B.
+*>
+*> Callers of this subroutine should note that the singularity/rank-deficiency checks
+*> implemented in this subroutine are rudimentary. The ZTRTRS subroutine called by this
+*> subroutine only signals a failure due to singularity if the problem is exactly singular.
+*>
+*> It is conceivable for one (or more) of the factors involved in the generalized QR
+*> factorization of the pair (A, B) to be subnormally close to singularity without this
+*> subroutine signalling an error. The solutions computed for such almost-rank-deficient
+*> problems may be less accurate due to a loss of numerical precision.
+*> 
 *> \endverbatim
 *
 *  Arguments:
@@ -159,12 +167,12 @@
 *>          = 0:  successful exit.
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value.
 *>          = 1:  the upper triangular factor R associated with A in the
-*>                generalized QR factorization of the pair (A, B) is
+*>                generalized QR factorization of the pair (A, B) is exactly
 *>                singular, so that rank(A) < M; the least squares
 *>                solution could not be computed.
 *>          = 2:  the bottom (N-M) by (N-M) part of the upper trapezoidal
 *>                factor T associated with B in the generalized QR
-*>                factorization of the pair (A, B) is singular, so that
+*>                factorization of the pair (A, B) is exactly singular, so that
 *>                rank( A B ) < N; the least squares solution could not
 *>                be computed.
 *> \endverbatim
@@ -177,11 +185,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHEReigen
+*> \ingroup ggglm
 *
 *  =====================================================================
-      SUBROUTINE ZGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
+      SUBROUTINE ZGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK,
+     $                   LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -208,7 +218,8 @@ SUBROUTINE ZGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
      $                   NB4, NP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZCOPY, ZGEMV, ZGGQRF, ZTRTRS, ZUNMQR,
+      EXTERNAL           XERBLA, ZCOPY, ZGEMV, ZGGQRF, ZTRTRS,
+     $                   ZUNMQR,
      $                   ZUNMRQ
 *     ..
 *     .. External Functions ..
@@ -289,12 +300,13 @@ SUBROUTINE ZGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
 *
       CALL ZGGQRF( N, M, P, A, LDA, WORK, B, LDB, WORK( M+1 ),
      $             WORK( M+NP+1 ), LWORK-M-NP, INFO )
-      LOPT = DBLE( WORK( M+NP+1 ) )
+      LOPT = INT( WORK( M+NP+1 ) )
 *
 *     Update left-hand-side vector d = Q**H*d = ( d1 ) M
 *                                               ( d2 ) N-M
 *
-      CALL ZUNMQR( 'Left', 'Conjugate transpose', N, 1, M, A, LDA, WORK,
+      CALL ZUNMQR( 'Left', 'Conjugate transpose', N, 1, M, A, LDA,
+     $             WORK,
      $             D, MAX( 1, N ), WORK( M+NP+1 ), LWORK-M-NP, INFO )
       LOPT = MAX( LOPT, INT( WORK( M+NP+1 ) ) )
 *
@@ -320,13 +332,15 @@ SUBROUTINE ZGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
 *
 *     Update d1 = d1 - T12*y2
 *
-      CALL ZGEMV( 'No transpose', M, N-M, -CONE, B( 1, M+P-N+1 ), LDB,
+      CALL ZGEMV( 'No transpose', M, N-M, -CONE, B( 1, M+P-N+1 ),
+     $            LDB,
      $            Y( M+P-N+1 ), 1, CONE, D, 1 )
 *
 *     Solve triangular system: R11*x = d1
 *
       IF( M.GT.0 ) THEN
-         CALL ZTRTRS( 'Upper', 'No Transpose', 'Non unit', M, 1, A, LDA,
+         CALL ZTRTRS( 'Upper', 'No Transpose', 'Non unit', M, 1, A,
+     $                LDA,
      $                D, M, INFO )
 *
          IF( INFO.GT.0 ) THEN
diff --git a/SRC/zgghd3.f b/SRC/zgghd3.f
index b29cdc70a3..c1945c884c 100644
--- a/SRC/zgghd3.f
+++ b/SRC/zgghd3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGHD3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgghd3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgghd3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -176,14 +174,14 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (LWORK)
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in]  LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of the array WORK.  LWORK >= 1.
+*>          The length of the array WORK. LWORK >= 1.
 *>          For optimum performance LWORK >= 6*N*NB, where NB is the
 *>          optimal blocksize.
 *>
@@ -208,7 +206,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup gghd3
 *
 *> \par Further Details:
 *  =====================
@@ -222,7 +220,8 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
+      SUBROUTINE ZGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB,
+     $                   Q,
      $                   LDQ, Z, LDZ, WORK, LWORK, INFO )
 *
 *  -- LAPACK computational routine --
@@ -263,7 +262,8 @@ SUBROUTINE ZGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
       EXTERNAL           ILAENV, LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZGGHRD, ZLARTG, ZLASET, ZUNM22, ZROT, ZGEMM,
+      EXTERNAL           ZGGHRD, ZLARTG, ZLASET, ZUNM22, ZROT,
+     $                   ZGEMM,
      $                   ZGEMV, ZTRMV, ZLACPY, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -275,7 +275,12 @@ SUBROUTINE ZGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
       INFO = 0
       NB = ILAENV( 1, 'ZGGHD3', ' ', N, ILO, IHI, -1 )
-      LWKOPT = MAX( 6*N*NB, 1 )
+      NH = IHI - ILO + 1
+      IF( NH.LE.1 ) THEN
+         LWKOPT = 1
+      ELSE
+         LWKOPT = 6*N*NB
+      END IF
       WORK( 1 ) = DCMPLX( LWKOPT )
       INITQ = LSAME( COMPQ, 'I' )
       WANTQ = INITQ .OR. LSAME( COMPQ, 'V' )
@@ -325,7 +330,6 @@ SUBROUTINE ZGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
 *     Quick return if possible
 *
-      NH = IHI - ILO + 1
       IF( NH.LE.1 ) THEN
          WORK( 1 ) = CONE
          RETURN
@@ -383,7 +387,8 @@ SUBROUTINE ZGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
             N2NB = ( IHI-JCOL-1 ) / NNB - 1
             NBLST = IHI - JCOL - N2NB*NNB
-            CALL ZLASET( 'All', NBLST, NBLST, CZERO, CONE, WORK, NBLST )
+            CALL ZLASET( 'All', NBLST, NBLST, CZERO, CONE, WORK,
+     $                   NBLST )
             PW = NBLST * NBLST + 1
             DO I = 1, N2NB
                CALL ZLASET( 'All', 2*NNB, 2*NNB, CZERO, CONE,
@@ -576,10 +581,12 @@ SUBROUTINE ZGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
                         WORK( PPW ) = A( I, J+1 )
                         PPW = PPW + 1
                      END DO
-                     CALL ZTRMV( 'Upper', 'Conjugate', 'Non-unit', LEN,
+                     CALL ZTRMV( 'Upper', 'Conjugate', 'Non-unit',
+     $                           LEN,
      $                           WORK( PPWO + NNB ), 2*NNB, WORK( PW ),
      $                           1 )
-                     CALL ZTRMV( 'Lower', 'Conjugate', 'Non-unit', NNB,
+                     CALL ZTRMV( 'Lower', 'Conjugate', 'Non-unit',
+     $                           NNB,
      $                           WORK( PPWO + 2*LEN*NNB ),
      $                           2*NNB, WORK( PW + LEN ), 1 )
                      CALL ZGEMV( 'Conjugate', NNB, LEN, CONE,
@@ -748,9 +755,11 @@ SUBROUTINE ZGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
                END DO
             ELSE
 *
-               CALL ZLASET( 'Lower', IHI - JCOL - 1, NNB, CZERO, CZERO,
+               CALL ZLASET( 'Lower', IHI - JCOL - 1, NNB, CZERO,
+     $                      CZERO,
      $                      A( JCOL + 2, JCOL ), LDA )
-               CALL ZLASET( 'Lower', IHI - JCOL - 1, NNB, CZERO, CZERO,
+               CALL ZLASET( 'Lower', IHI - JCOL - 1, NNB, CZERO,
+     $                      CZERO,
      $                      B( JCOL + 2, JCOL ), LDB )
             END IF
 *
@@ -770,7 +779,8 @@ SUBROUTINE ZGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
 *                    Exploit the structure of U.
 *
-                     CALL ZUNM22( 'Right', 'No Transpose', TOP, 2*NNB,
+                     CALL ZUNM22( 'Right', 'No Transpose', TOP,
+     $                            2*NNB,
      $                            NNB, NNB, WORK( PPWO ), 2*NNB,
      $                            A( 1, J ), LDA, WORK( PW ),
      $                            LWORK-PW+1, IERR )
@@ -801,7 +811,8 @@ SUBROUTINE ZGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
 *
 *                    Exploit the structure of U.
 *
-                     CALL ZUNM22( 'Right', 'No Transpose', TOP, 2*NNB,
+                     CALL ZUNM22( 'Right', 'No Transpose', TOP,
+     $                            2*NNB,
      $                            NNB, NNB, WORK( PPWO ), 2*NNB,
      $                            B( 1, J ), LDB, WORK( PW ),
      $                            LWORK-PW+1, IERR )
@@ -881,8 +892,10 @@ SUBROUTINE ZGGHD3( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
       END IF
 *
       IF ( JCOL.LT.IHI )
-     $   CALL ZGGHRD( COMPQ2, COMPZ2, N, JCOL, IHI, A, LDA, B, LDB, Q,
+     $   CALL ZGGHRD( COMPQ2, COMPZ2, N, JCOL, IHI, A, LDA, B, LDB,
+     $                Q,
      $                LDQ, Z, LDZ, IERR )
+*
       WORK( 1 ) = DCMPLX( LWKOPT )
 *
       RETURN
diff --git a/SRC/zgghrd.f b/SRC/zgghrd.f
index 35305f3448..bc54e3f1ee 100644
--- a/SRC/zgghrd.f
+++ b/SRC/zgghrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGHRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgghrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgghrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -186,7 +184,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup gghrd
 *
 *> \par Further Details:
 *  =====================
@@ -199,8 +197,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZGGHRD( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
+      SUBROUTINE ZGGHRD( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB,
+     $                   Q,
      $                   LDQ, Z, LDZ, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -343,11 +343,13 @@ SUBROUTINE ZGGHRD( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
             CALL ZLARTG( CTEMP, B( JROW, JROW-1 ), C, S,
      $                   B( JROW, JROW ) )
             B( JROW, JROW-1 ) = CZERO
-            CALL ZROT( IHI, A( 1, JROW ), 1, A( 1, JROW-1 ), 1, C, S )
+            CALL ZROT( IHI, A( 1, JROW ), 1, A( 1, JROW-1 ), 1, C,
+     $                 S )
             CALL ZROT( JROW-1, B( 1, JROW ), 1, B( 1, JROW-1 ), 1, C,
      $                 S )
             IF( ILZ )
-     $         CALL ZROT( N, Z( 1, JROW ), 1, Z( 1, JROW-1 ), 1, C, S )
+     $         CALL ZROT( N, Z( 1, JROW ), 1, Z( 1, JROW-1 ), 1, C,
+     $                    S )
    30    CONTINUE
    40 CONTINUE
 *
diff --git a/SRC/zgglse.f b/SRC/zgglse.f
index e5869a7d40..00ab2cfab3 100644
--- a/SRC/zgglse.f
+++ b/SRC/zgglse.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGLSE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgglse.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgglse.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -52,6 +50,16 @@
 *> matrices (B, A) given by
 *>
 *>    B = (0 R)*Q,   A = Z*T*Q.
+*>
+*> Callers of this subroutine should note that the singularity/rank-deficiency checks
+*> implemented in this subroutine are rudimentary. The ZTRTRS subroutine called by this
+*> subroutine only signals a failure due to singularity if the problem is exactly singular.
+*>
+*> It is conceivable for one (or more) of the factors involved in the generalized RQ
+*> factorization of the pair (B, A) to be subnormally close to singularity without this
+*> subroutine signalling an error. The solutions computed for such almost-rank-deficient
+*> problems may be less accurate due to a loss of numerical precision.
+*> 
 *> \endverbatim
 *
 *  Arguments:
@@ -153,12 +161,12 @@
 *>          = 0:  successful exit.
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value.
 *>          = 1:  the upper triangular factor R associated with B in the
-*>                generalized RQ factorization of the pair (B, A) is
+*>                generalized RQ factorization of the pair (B, A) is exactly
 *>                singular, so that rank(B) < P; the least squares
 *>                solution could not be computed.
 *>          = 2:  the (N-P) by (N-P) part of the upper trapezoidal factor
 *>                T associated with A in the generalized RQ factorization
-*>                of the pair (B, A) is singular, so that
+*>                of the pair (B, A) is exactly singular, so that
 *>                rank( (A) ) < N; the least squares solution could not
 *>                    ( (B) )
 *>                be computed.
@@ -172,11 +180,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERsolve
+*> \ingroup gglse
 *
 *  =====================================================================
-      SUBROUTINE ZGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
+      SUBROUTINE ZGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK,
+     $                   LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -202,7 +212,8 @@ SUBROUTINE ZGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
      $                   NB4, NR
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZGEMV, ZGGRQF, ZTRMV,
+      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZGEMV, ZGGRQF,
+     $                   ZTRMV,
      $                   ZTRTRS, ZUNMQR, ZUNMRQ
 *     ..
 *     .. External Functions ..
@@ -276,7 +287,7 @@ SUBROUTINE ZGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
 *
       CALL ZGGRQF( P, M, N, B, LDB, WORK, A, LDA, WORK( P+1 ),
      $             WORK( P+MN+1 ), LWORK-P-MN, INFO )
-      LOPT = DBLE( WORK( P+MN+1 ) )
+      LOPT = INT( WORK( P+MN+1 ) )
 *
 *     Update c = Z**H *c = ( c1 ) N-P
 *                       ( c2 ) M+P-N
@@ -303,7 +314,8 @@ SUBROUTINE ZGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
 *
 *        Update c1
 *
-         CALL ZGEMV( 'No transpose', N-P, P, -CONE, A( 1, N-P+1 ), LDA,
+         CALL ZGEMV( 'No transpose', N-P, P, -CONE, A( 1, N-P+1 ),
+     $               LDA,
      $               D, 1, CONE, C, 1 )
       END IF
 *
@@ -328,7 +340,8 @@ SUBROUTINE ZGGLSE( M, N, P, A, LDA, B, LDB, C, D, X, WORK, LWORK,
       IF( M.LT.N ) THEN
          NR = M + P - N
          IF( NR.GT.0 )
-     $      CALL ZGEMV( 'No transpose', NR, N-M, -CONE, A( N-P+1, M+1 ),
+     $      CALL ZGEMV( 'No transpose', NR, N-M, -CONE, A( N-P+1,
+     $                  M+1 ),
      $                  LDA, D( NR+1 ), 1, CONE, C( N-P+1 ), 1 )
       ELSE
          NR = P
diff --git a/SRC/zggqrf.f b/SRC/zggqrf.f
index 93b1dc0fc6..43e948ea56 100644
--- a/SRC/zggqrf.f
+++ b/SRC/zggqrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGQRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zggqrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zggqrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -173,7 +171,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup ggqrf
 *
 *> \par Further Details:
 *  =====================
@@ -212,6 +210,7 @@
 *  =====================================================================
       SUBROUTINE ZGGQRF( N, M, P, A, LDA, TAUA, B, LDB, TAUB, WORK,
      $                   LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -250,7 +249,7 @@ SUBROUTINE ZGGQRF( N, M, P, A, LDA, TAUA, B, LDB, TAUB, WORK,
       NB2 = ILAENV( 1, 'ZGERQF', ' ', N, P, -1, -1 )
       NB3 = ILAENV( 1, 'ZUNMQR', ' ', N, M, P, -1 )
       NB = MAX( NB1, NB2, NB3 )
-      LWKOPT = MAX( N, M, P )*NB
+      LWKOPT = MAX( 1, MAX( N, M, P )*NB )
       WORK( 1 ) = LWKOPT
       LQUERY = ( LWORK.EQ.-1 )
       IF( N.LT.0 ) THEN
@@ -276,11 +275,12 @@ SUBROUTINE ZGGQRF( N, M, P, A, LDA, TAUA, B, LDB, TAUB, WORK,
 *     QR factorization of N-by-M matrix A: A = Q*R
 *
       CALL ZGEQRF( N, M, A, LDA, TAUA, WORK, LWORK, INFO )
-      LOPT = DBLE( WORK( 1 ) )
+      LOPT = INT( WORK( 1 ) )
 *
 *     Update B := Q**H*B.
 *
-      CALL ZUNMQR( 'Left', 'Conjugate Transpose', N, P, MIN( N, M ), A,
+      CALL ZUNMQR( 'Left', 'Conjugate Transpose', N, P, MIN( N, M ),
+     $             A,
      $             LDA, TAUA, B, LDB, WORK, LWORK, INFO )
       LOPT = MAX( LOPT, INT( WORK( 1 ) ) )
 *
diff --git a/SRC/zggrqf.f b/SRC/zggrqf.f
index a2d4a9d553..41baab3b34 100644
--- a/SRC/zggrqf.f
+++ b/SRC/zggrqf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGRQF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zggrqf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zggrqf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -172,7 +170,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup ggrqf
 *
 *> \par Further Details:
 *  =====================
@@ -211,6 +209,7 @@
 *  =====================================================================
       SUBROUTINE ZGGRQF( M, P, N, A, LDA, TAUA, B, LDB, TAUB, WORK,
      $                   LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -249,7 +248,7 @@ SUBROUTINE ZGGRQF( M, P, N, A, LDA, TAUA, B, LDB, TAUB, WORK,
       NB2 = ILAENV( 1, 'ZGEQRF', ' ', P, N, -1, -1 )
       NB3 = ILAENV( 1, 'ZUNMRQ', ' ', M, N, P, -1 )
       NB = MAX( NB1, NB2, NB3 )
-      LWKOPT = MAX( N, M, P )*NB
+      LWKOPT = MAX( 1, MAX( N, M, P )*NB )
       WORK( 1 ) = LWKOPT
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
@@ -275,7 +274,7 @@ SUBROUTINE ZGGRQF( M, P, N, A, LDA, TAUA, B, LDB, TAUB, WORK,
 *     RQ factorization of M-by-N matrix A: A = R*Q
 *
       CALL ZGERQF( M, N, A, LDA, TAUA, WORK, LWORK, INFO )
-      LOPT = DBLE( WORK( 1 ) )
+      LOPT = INT( WORK( 1 ) )
 *
 *     Update B := B*Q**H
 *
diff --git a/SRC/zggsvd3.f b/SRC/zggsvd3.f
index 71257a7c07..48d33e4040 100644
--- a/SRC/zggsvd3.f
+++ b/SRC/zggsvd3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGSVD3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zggsvd3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zggsvd3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -277,7 +275,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -332,7 +330,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEsing
+*> \ingroup ggsvd3
 *
 *> \par Contributors:
 *  ==================
@@ -350,6 +348,7 @@
       SUBROUTINE ZGGSVD3( JOBU, JOBV, JOBQ, M, N, P, K, L, A, LDA, B,
      $                    LDB, ALPHA, BETA, U, LDU, V, LDV, Q, LDQ,
      $                    WORK, LWORK, RWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -427,7 +426,8 @@ SUBROUTINE ZGGSVD3( JOBU, JOBV, JOBQ, M, N, P, K, L, A, LDA, B,
 *     Compute workspace
 *
       IF( INFO.EQ.0 ) THEN
-         CALL ZGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB, TOLA,
+         CALL ZGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
+     $                 TOLA,
      $                 TOLB, K, L, U, LDU, V, LDV, Q, LDQ, IWORK, RWORK,
      $                 WORK, WORK, -1, INFO )
          LWKOPT = N + INT( WORK( 1 ) )
diff --git a/SRC/zggsvp3.f b/SRC/zggsvp3.f
index f39ccdad31..b0fb0e40fd 100644
--- a/SRC/zggsvp3.f
+++ b/SRC/zggsvp3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGGSVP3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zggsvp3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zggsvp3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -233,7 +231,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
+*>          The dimension of the array WORK. LWORK >= 1.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -256,7 +254,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup ggsvp3
 *
 *> \par Further Details:
 *  =====================
@@ -311,7 +309,8 @@ SUBROUTINE ZGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZGEQP3, ZGEQR2, ZGERQ2, ZLACPY, ZLAPMT,
+      EXTERNAL           XERBLA, ZGEQP3, ZGEQR2, ZGERQ2, ZLACPY,
+     $                   ZLAPMT,
      $                   ZLASET, ZUNG2R, ZUNM2R, ZUNMR2
 *     ..
 *     .. Intrinsic Functions ..
@@ -360,7 +359,8 @@ SUBROUTINE ZGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *     Compute workspace
 *
       IF( INFO.EQ.0 ) THEN
-         CALL ZGEQP3( P, N, B, LDB, IWORK, TAU, WORK, -1, RWORK, INFO )
+         CALL ZGEQP3( P, N, B, LDB, IWORK, TAU, WORK, -1, RWORK,
+     $                INFO )
          LWKOPT = INT( WORK ( 1 ) )
          IF( WANTV ) THEN
             LWKOPT = MAX( LWKOPT, P )
@@ -370,7 +370,8 @@ SUBROUTINE ZGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
          IF( WANTQ ) THEN
             LWKOPT = MAX( LWKOPT, N )
          END IF
-         CALL ZGEQP3( M, N, A, LDA, IWORK, TAU, WORK, -1, RWORK, INFO )
+         CALL ZGEQP3( M, N, A, LDA, IWORK, TAU, WORK, -1, RWORK,
+     $                INFO )
          LWKOPT = MAX( LWKOPT, INT( WORK ( 1 ) ) )
          LWKOPT = MAX( 1, LWKOPT )
          WORK( 1 ) = DCMPLX( LWKOPT )
@@ -390,7 +391,8 @@ SUBROUTINE ZGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
       DO 10 I = 1, N
          IWORK( I ) = 0
    10 CONTINUE
-      CALL ZGEQP3( P, N, B, LDB, IWORK, TAU, WORK, LWORK, RWORK, INFO )
+      CALL ZGEQP3( P, N, B, LDB, IWORK, TAU, WORK, LWORK, RWORK,
+     $             INFO )
 *
 *     Update A := A*P
 *
@@ -423,7 +425,8 @@ SUBROUTINE ZGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
    30    CONTINUE
    40 CONTINUE
       IF( P.GT.L )
-     $   CALL ZLASET( 'Full', P-L, N, CZERO, CZERO, B( L+1, 1 ), LDB )
+     $   CALL ZLASET( 'Full', P-L, N, CZERO, CZERO, B( L+1, 1 ),
+     $                LDB )
 *
       IF( WANTQ ) THEN
 *
@@ -441,7 +444,8 @@ SUBROUTINE ZGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *        Update A := A*Z**H
 *
-         CALL ZUNMR2( 'Right', 'Conjugate transpose', M, N, L, B, LDB,
+         CALL ZUNMR2( 'Right', 'Conjugate transpose', M, N, L, B,
+     $                LDB,
      $                TAU, A, LDA, WORK, INFO )
          IF( WANTQ ) THEN
 *
@@ -486,7 +490,8 @@ SUBROUTINE ZGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *     Update A12 := U**H*A12, where A12 = A( 1:M, N-L+1:N )
 *
-      CALL ZUNM2R( 'Left', 'Conjugate transpose', M, L, MIN( M, N-L ),
+      CALL ZUNM2R( 'Left', 'Conjugate transpose', M, L, MIN( M,
+     $             N-L ),
      $             A, LDA, TAU, A( 1, N-L+1 ), LDA, WORK, INFO )
 *
       IF( WANTU ) THEN
@@ -495,7 +500,8 @@ SUBROUTINE ZGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
          CALL ZLASET( 'Full', M, M, CZERO, CZERO, U, LDU )
          IF( M.GT.1 )
-     $      CALL ZLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA, U( 2, 1 ),
+     $      CALL ZLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA, U( 2,
+     $                   1 ),
      $                   LDU )
          CALL ZUNG2R( M, M, MIN( M, N-L ), U, LDU, TAU, WORK, INFO )
       END IF
@@ -516,7 +522,8 @@ SUBROUTINE ZGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
    90    CONTINUE
   100 CONTINUE
       IF( M.GT.K )
-     $   CALL ZLASET( 'Full', M-K, N-L, CZERO, CZERO, A( K+1, 1 ), LDA )
+     $   CALL ZLASET( 'Full', M-K, N-L, CZERO, CZERO, A( K+1, 1 ),
+     $                LDA )
 *
       IF( N-L.GT.K ) THEN
 *
@@ -528,7 +535,8 @@ SUBROUTINE ZGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update Q( 1:N,1:N-L ) = Q( 1:N,1:N-L )*Z1**H
 *
-            CALL ZUNMR2( 'Right', 'Conjugate transpose', N, N-L, K, A,
+            CALL ZUNMR2( 'Right', 'Conjugate transpose', N, N-L, K,
+     $                   A,
      $                   LDA, TAU, Q, LDQ, WORK, INFO )
          END IF
 *
@@ -553,7 +561,8 @@ SUBROUTINE ZGGSVP3( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
 *
 *           Update U(:,K+1:M) := U(:,K+1:M)*U1
 *
-            CALL ZUNM2R( 'Right', 'No transpose', M, M-K, MIN( M-K, L ),
+            CALL ZUNM2R( 'Right', 'No transpose', M, M-K, MIN( M-K,
+     $                   L ),
      $                   A( K+1, N-L+1 ), LDA, TAU, U( 1, K+1 ), LDU,
      $                   WORK, INFO )
          END IF
diff --git a/SRC/zgsvj0.f b/SRC/zgsvj0.f
index 672ab7590b..fdc78c126a 100644
--- a/SRC/zgsvj0.f
+++ b/SRC/zgsvj0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGSVJ0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgsvj0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgsvj0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -52,10 +50,10 @@
 *>          Specifies whether the output from this procedure is used
 *>          to compute the matrix V:
 *>          = 'V': the product of the Jacobi rotations is accumulated
-*>                 by postmulyiplying the N-by-N array V.
+*>                 by postmultiplying the N-by-N array V.
 *>                (See the description of V.)
 *>          = 'A': the product of the Jacobi rotations is accumulated
-*>                 by postmulyiplying the MV-by-N array V.
+*>                 by postmultiplying the MV-by-N array V.
 *>                (See the descriptions of MV and V.)
 *>          = 'N': the Jacobi rotations are not accumulated.
 *> \endverbatim
@@ -117,7 +115,7 @@
 *> \param[in] MV
 *> \verbatim
 *>          MV is INTEGER
-*>          If JOBV = 'A', then MV rows of V are post-multipled by a
+*>          If JOBV = 'A', then MV rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
 *>          If JOBV = 'N',   then MV is not referenced.
 *> \endverbatim
@@ -125,9 +123,9 @@
 *> \param[in,out] V
 *> \verbatim
 *>          V is COMPLEX*16 array, dimension (LDV,N)
-*>          If JOBV = 'V' then N rows of V are post-multipled by a
+*>          If JOBV = 'V' then N rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
-*>          If JOBV = 'A' then MV rows of V are post-multipled by a
+*>          If JOBV = 'A' then MV rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
 *>          If JOBV = 'N',   then V is not referenced.
 *> \endverbatim
@@ -193,7 +191,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup gsvj0
 *>
 *> \par Further Details:
 *  =====================
@@ -499,7 +497,8 @@ SUBROUTINE ZGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                     T  = HALF / THETA
                                     CS = ONE
 
-                                    CALL ZROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL ZROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*T )
                                     IF ( RSVEC ) THEN
                                         CALL ZROT( MVL, V(1,p), 1,
@@ -528,7 +527,8 @@ SUBROUTINE ZGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                     AAPP = AAPP*SQRT( MAX( ZERO,
      $                                      ONE-T*AQOAP*AAPQ1 ) )
 *
-                                    CALL ZROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL ZROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*SN )
                                     IF ( RSVEC ) THEN
                                         CALL ZROT( MVL, V(1,p), 1,
@@ -541,14 +541,17 @@ SUBROUTINE ZGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
 *              .. have to use modified Gram-Schmidt like transformation
                                  CALL ZCOPY( M, A( 1, p ), 1,
      $                                       WORK, 1 )
-                                 CALL ZLASCL( 'G', 0, 0, AAPP, ONE, M,
+                                 CALL ZLASCL( 'G', 0, 0, AAPP, ONE,
+     $                                        M,
      $                                        1, WORK, LDA,
      $                                        IERR )
-                                 CALL ZLASCL( 'G', 0, 0, AAQQ, ONE, M,
+                                 CALL ZLASCL( 'G', 0, 0, AAQQ, ONE,
+     $                                        M,
      $                                        1, A( 1, q ), LDA, IERR )
                                  CALL ZAXPY( M, -AAPQ, WORK, 1,
      $                                       A( 1, q ), 1 )
-                                 CALL ZLASCL( 'G', 0, 0, ONE, AAQQ, M,
+                                 CALL ZLASCL( 'G', 0, 0, ONE, AAQQ,
+     $                                        M,
      $                                        1, A( 1, q ), LDA, IERR )
                                  SVA( q ) = AAQQ*SQRT( MAX( ZERO,
      $                                      ONE-AAPQ1*AAPQ1 ) )
@@ -563,7 +566,8 @@ SUBROUTINE ZGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = DZNRM2( M, A( 1, q ), 1 )
+                                    SVA( q ) = DZNRM2( M, A( 1, q ),
+     $                                   1 )
                                  ELSE
                                     T = ZERO
                                     AAQQ = ONE
@@ -715,7 +719,8 @@ SUBROUTINE ZGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                  IF( ABS( THETA ).GT.BIGTHETA ) THEN
                                     T  = HALF / THETA
                                     CS = ONE
-                                    CALL ZROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL ZROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*T )
                                     IF( RSVEC ) THEN
                                         CALL ZROT( MVL, V(1,p), 1,
@@ -742,7 +747,8 @@ SUBROUTINE ZGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                     AAPP = AAPP*SQRT( MAX( ZERO,
      $                                         ONE-T*AQOAP*AAPQ1 ) )
 *
-                                    CALL ZROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL ZROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*SN )
                                     IF( RSVEC ) THEN
                                         CALL ZROT( MVL, V(1,p), 1,
@@ -756,15 +762,18 @@ SUBROUTINE ZGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                IF( AAPP.GT.AAQQ ) THEN
                                     CALL ZCOPY( M, A( 1, p ), 1,
      $                                          WORK, 1 )
-                                    CALL ZLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL ZLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, WORK,LDA,
      $                                           IERR )
-                                    CALL ZLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL ZLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     CALL ZAXPY( M, -AAPQ, WORK,
      $                                          1, A( 1, q ), 1 )
-                                    CALL ZLASCL( 'G', 0, 0, ONE, AAQQ,
+                                    CALL ZLASCL( 'G', 0, 0, ONE,
+     $                                           AAQQ,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     SVA( q ) = AAQQ*SQRT( MAX( ZERO,
@@ -773,15 +782,18 @@ SUBROUTINE ZGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
                                ELSE
                                    CALL ZCOPY( M, A( 1, q ), 1,
      $                                          WORK, 1 )
-                                    CALL ZLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL ZLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, WORK,LDA,
      $                                           IERR )
-                                    CALL ZLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL ZLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     CALL ZAXPY( M, -CONJG(AAPQ),
      $                                   WORK, 1, A( 1, p ), 1 )
-                                    CALL ZLASCL( 'G', 0, 0, ONE, AAPP,
+                                    CALL ZLASCL( 'G', 0, 0, ONE,
+     $                                           AAPP,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     SVA( p ) = AAPP*SQRT( MAX( ZERO,
@@ -797,7 +809,8 @@ SUBROUTINE ZGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = DZNRM2( M, A( 1, q ), 1)
+                                    SVA( q ) = DZNRM2( M, A( 1, q ),
+     $                                   1)
                                   ELSE
                                     T = ZERO
                                     AAQQ = ONE
diff --git a/SRC/zgsvj1.f b/SRC/zgsvj1.f
index 2461a95558..c2ef4d5f19 100644
--- a/SRC/zgsvj1.f
+++ b/SRC/zgsvj1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGSVJ1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgsvj1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgsvj1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -75,10 +73,10 @@
 *>          Specifies whether the output from this procedure is used
 *>          to compute the matrix V:
 *>          = 'V': the product of the Jacobi rotations is accumulated
-*>                 by postmulyiplying the N-by-N array V.
+*>                 by postmultiplying the N-by-N array V.
 *>                (See the description of V.)
 *>          = 'A': the product of the Jacobi rotations is accumulated
-*>                 by postmulyiplying the MV-by-N array V.
+*>                 by postmultiplying the MV-by-N array V.
 *>                (See the descriptions of MV and V.)
 *>          = 'N': the Jacobi rotations are not accumulated.
 *> \endverbatim
@@ -147,7 +145,7 @@
 *> \param[in] MV
 *> \verbatim
 *>          MV is INTEGER
-*>          If JOBV = 'A', then MV rows of V are post-multipled by a
+*>          If JOBV = 'A', then MV rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
 *>          If JOBV = 'N',   then MV is not referenced.
 *> \endverbatim
@@ -155,9 +153,9 @@
 *> \param[in,out] V
 *> \verbatim
 *>          V is COMPLEX*16 array, dimension (LDV,N)
-*>          If JOBV = 'V' then N rows of V are post-multipled by a
+*>          If JOBV = 'V' then N rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
-*>          If JOBV = 'A' then MV rows of V are post-multipled by a
+*>          If JOBV = 'A' then MV rows of V are post-multiplied by a
 *>                           sequence of Jacobi rotations.
 *>          If JOBV = 'N',   then V is not referenced.
 *> \endverbatim
@@ -223,7 +221,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup gsvj1
 *
 *> \par Contributor:
 *  ==================
@@ -485,7 +483,8 @@ SUBROUTINE ZGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                  IF( ABS( THETA ).GT.BIGTHETA ) THEN
                                     T  = HALF / THETA
                                     CS = ONE
-                                    CALL ZROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL ZROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*T )
                                     IF( RSVEC ) THEN
                                         CALL ZROT( MVL, V(1,p), 1,
@@ -512,7 +511,8 @@ SUBROUTINE ZGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                     AAPP = AAPP*SQRT( MAX( ZERO,
      $                                         ONE-T*AQOAP*AAPQ1 ) )
 *
-                                    CALL ZROT( M, A(1,p), 1, A(1,q), 1,
+                                    CALL ZROT( M, A(1,p), 1, A(1,q),
+     $                                         1,
      $                                          CS, CONJG(OMPQ)*SN )
                                     IF( RSVEC ) THEN
                                         CALL ZROT( MVL, V(1,p), 1,
@@ -526,15 +526,18 @@ SUBROUTINE ZGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                IF( AAPP.GT.AAQQ ) THEN
                                     CALL ZCOPY( M, A( 1, p ), 1,
      $                                          WORK, 1 )
-                                    CALL ZLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL ZLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, WORK,LDA,
      $                                           IERR )
-                                    CALL ZLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL ZLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     CALL ZAXPY( M, -AAPQ, WORK,
      $                                          1, A( 1, q ), 1 )
-                                    CALL ZLASCL( 'G', 0, 0, ONE, AAQQ,
+                                    CALL ZLASCL( 'G', 0, 0, ONE,
+     $                                           AAQQ,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
                                     SVA( q ) = AAQQ*SQRT( MAX( ZERO,
@@ -543,15 +546,18 @@ SUBROUTINE ZGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
                                ELSE
                                    CALL ZCOPY( M, A( 1, q ), 1,
      $                                          WORK, 1 )
-                                    CALL ZLASCL( 'G', 0, 0, AAQQ, ONE,
+                                    CALL ZLASCL( 'G', 0, 0, AAQQ,
+     $                                           ONE,
      $                                           M, 1, WORK,LDA,
      $                                           IERR )
-                                    CALL ZLASCL( 'G', 0, 0, AAPP, ONE,
+                                    CALL ZLASCL( 'G', 0, 0, AAPP,
+     $                                           ONE,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     CALL ZAXPY( M, -CONJG(AAPQ),
      $                                   WORK, 1, A( 1, p ), 1 )
-                                    CALL ZLASCL( 'G', 0, 0, ONE, AAPP,
+                                    CALL ZLASCL( 'G', 0, 0, ONE,
+     $                                           AAPP,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
                                     SVA( p ) = AAPP*SQRT( MAX( ZERO,
@@ -567,7 +573,8 @@ SUBROUTINE ZGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
      $                            THEN
                                  IF( ( AAQQ.LT.ROOTBIG ) .AND.
      $                               ( AAQQ.GT.ROOTSFMIN ) ) THEN
-                                    SVA( q ) = DZNRM2( M, A( 1, q ), 1)
+                                    SVA( q ) = DZNRM2( M, A( 1, q ),
+     $                                   1)
                                   ELSE
                                     T = ZERO
                                     AAQQ = ONE
diff --git a/SRC/zgtcon.f b/SRC/zgtcon.f
index 24190946aa..ec0942e325 100644
--- a/SRC/zgtcon.f
+++ b/SRC/zgtcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGTCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgtcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgtcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,11 +131,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GTcomputational
+*> \ingroup gtcon
 *
 *  =====================================================================
       SUBROUTINE ZGTCON( NORM, N, DL, D, DU, DU2, IPIV, ANORM, RCOND,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zgtrfs.f b/SRC/zgtrfs.f
index 509a0d7a55..22fbcee424 100644
--- a/SRC/zgtrfs.f
+++ b/SRC/zgtrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGTRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgtrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgtrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -201,12 +199,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GTcomputational
+*> \ingroup gtrfs
 *
 *  =====================================================================
-      SUBROUTINE ZGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
+      SUBROUTINE ZGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
+     $                   DU2,
      $                   IPIV, B, LDB, X, LDX, FERR, BERR, WORK, RWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -247,7 +247,8 @@ SUBROUTINE ZGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZGTTRS, ZLACN2, ZLAGTM
+      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZGTTRS, ZLACN2,
+     $                   ZLAGTM
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCMPLX, DIMAG, MAX
@@ -326,7 +327,8 @@ SUBROUTINE ZGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
 *        where op(A) = A, A**T, or A**H, depending on TRANS.
 *
          CALL ZCOPY( N, B( 1, J ), 1, WORK, 1 )
-         CALL ZLAGTM( TRANS, N, 1, -ONE, DL, D, DU, X( 1, J ), LDX, ONE,
+         CALL ZLAGTM( TRANS, N, 1, -ONE, DL, D, DU, X( 1, J ), LDX,
+     $                ONE,
      $                WORK, N )
 *
 *        Compute abs(op(A))*abs(x) + abs(b) for use in the backward
@@ -401,7 +403,8 @@ SUBROUTINE ZGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
 *
 *           Update solution and try again.
 *
-            CALL ZGTTRS( TRANS, N, 1, DLF, DF, DUF, DU2, IPIV, WORK, N,
+            CALL ZGTTRS( TRANS, N, 1, DLF, DF, DUF, DU2, IPIV, WORK,
+     $                   N,
      $                   INFO )
             CALL ZAXPY( N, DCMPLX( ONE ), WORK, 1, X( 1, J ), 1 )
             LSTRES = BERR( J )
@@ -448,7 +451,8 @@ SUBROUTINE ZGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
 *
 *              Multiply by diag(W)*inv(op(A)**H).
 *
-               CALL ZGTTRS( TRANST, N, 1, DLF, DF, DUF, DU2, IPIV, WORK,
+               CALL ZGTTRS( TRANST, N, 1, DLF, DF, DUF, DU2, IPIV,
+     $                      WORK,
      $                      N, INFO )
                DO 80 I = 1, N
                   WORK( I ) = RWORK( I )*WORK( I )
@@ -460,7 +464,8 @@ SUBROUTINE ZGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
                DO 90 I = 1, N
                   WORK( I ) = RWORK( I )*WORK( I )
    90          CONTINUE
-               CALL ZGTTRS( TRANSN, N, 1, DLF, DF, DUF, DU2, IPIV, WORK,
+               CALL ZGTTRS( TRANSN, N, 1, DLF, DF, DUF, DU2, IPIV,
+     $                      WORK,
      $                      N, INFO )
             END IF
             GO TO 70
diff --git a/SRC/zgtsv.f b/SRC/zgtsv.f
index fbd583d6a6..0c0e174068 100644
--- a/SRC/zgtsv.f
+++ b/SRC/zgtsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGTSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgtsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgtsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,10 +115,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GTsolve
+*> \ingroup gtsv
 *
 *  =====================================================================
       SUBROUTINE ZGTSV( N, NRHS, DL, D, DU, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zgtsvx.f b/SRC/zgtsvx.f
index 32ed2133d5..f60efe8b49 100644
--- a/SRC/zgtsvx.f
+++ b/SRC/zgtsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGTSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgtsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgtsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -285,12 +283,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GTsolve
+*> \ingroup gtsvx
 *
 *  =====================================================================
-      SUBROUTINE ZGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
+      SUBROUTINE ZGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF,
+     $                   DUF,
      $                   DU2, IPIV, B, LDB, X, LDX, RCOND, FERR, BERR,
      $                   WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -326,7 +326,8 @@ SUBROUTINE ZGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
       EXTERNAL           LSAME, DLAMCH, ZLANGT
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZCOPY, ZGTCON, ZGTRFS, ZGTTRF, ZGTTRS,
+      EXTERNAL           XERBLA, ZCOPY, ZGTCON, ZGTRFS, ZGTTRF,
+     $                   ZGTTRS,
      $                   ZLACPY
 *     ..
 *     .. Intrinsic Functions ..
@@ -386,7 +387,8 @@ SUBROUTINE ZGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL ZGTCON( NORM, N, DLF, DF, DUF, DU2, IPIV, ANORM, RCOND, WORK,
+      CALL ZGTCON( NORM, N, DLF, DF, DUF, DU2, IPIV, ANORM, RCOND,
+     $             WORK,
      $             INFO )
 *
 *     Compute the solution vectors X.
@@ -398,7 +400,8 @@ SUBROUTINE ZGTSVX( FACT, TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF,
 *     Use iterative refinement to improve the computed solutions and
 *     compute error bounds and backward error estimates for them.
 *
-      CALL ZGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2, IPIV,
+      CALL ZGTRFS( TRANS, N, NRHS, DL, D, DU, DLF, DF, DUF, DU2,
+     $             IPIV,
      $             B, LDB, X, LDX, FERR, BERR, WORK, RWORK, INFO )
 *
 *     Set INFO = N+1 if the matrix is singular to working precision.
diff --git a/SRC/zgttrf.f b/SRC/zgttrf.f
index 411233ef0b..b657c3f2c6 100644
--- a/SRC/zgttrf.f
+++ b/SRC/zgttrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGTTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgttrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgttrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,10 +115,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GTcomputational
+*> \ingroup gttrf
 *
 *  =====================================================================
       SUBROUTINE ZGTTRF( N, DL, D, DU, DU2, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zgttrs.f b/SRC/zgttrs.f
index d36d0107e0..180acb6dc8 100644
--- a/SRC/zgttrs.f
+++ b/SRC/zgttrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGTTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgttrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgttrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,11 +128,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GTcomputational
+*> \ingroup gttrs
 *
 *  =====================================================================
-      SUBROUTINE ZGTTRS( TRANS, N, NRHS, DL, D, DU, DU2, IPIV, B, LDB,
+      SUBROUTINE ZGTTRS( TRANS, N, NRHS, DL, D, DU, DU2, IPIV, B,
+     $                   LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -212,7 +212,8 @@ SUBROUTINE ZGTTRS( TRANS, N, NRHS, DL, D, DU, DU2, IPIV, B, LDB,
       ELSE
          DO 10 J = 1, NRHS, NB
             JB = MIN( NRHS-J+1, NB )
-            CALL ZGTTS2( ITRANS, N, JB, DL, D, DU, DU2, IPIV, B( 1, J ),
+            CALL ZGTTS2( ITRANS, N, JB, DL, D, DU, DU2, IPIV, B( 1,
+     $                   J ),
      $                   LDB )
    10    CONTINUE
       END IF
diff --git a/SRC/zgtts2.f b/SRC/zgtts2.f
index 83ca50cbab..2078e111cb 100644
--- a/SRC/zgtts2.f
+++ b/SRC/zgtts2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZGTTS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgtts2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgtts2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GTcomputational
+*> \ingroup gtts2
 *
 *  =====================================================================
-      SUBROUTINE ZGTTS2( ITRANS, N, NRHS, DL, D, DU, DU2, IPIV, B, LDB )
+      SUBROUTINE ZGTTS2( ITRANS, N, NRHS, DL, D, DU, DU2, IPIV, B,
+     $                   LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zhb2st_kernels.f b/SRC/zhb2st_kernels.f
index 717b36eefa..7beb9f3611 100644
--- a/SRC/zhb2st_kernels.f
+++ b/SRC/zhb2st_kernels.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHB2ST_KERNELS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhb2st_kernels.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhb2st_kernels.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,6 +161,8 @@
 *>
 *> \endverbatim
 *>
+*> \ingroup hb2st_kernels
+*>
 *  =====================================================================
       SUBROUTINE  ZHB2ST_KERNELS( UPLO, WANTZ, TTYPE,
      $                            ST, ED, SWEEP, N, NB, IB,
@@ -285,7 +285,8 @@ SUBROUTINE  ZHB2ST_KERNELS( UPLO, WANTZ, TTYPE,
                       A( DPOS-NB-I, J1+I ) = ZERO
    30             CONTINUE
                   CTMP = DCONJG( A( DPOS-NB, J1 ) )
-                  CALL ZLARFG( LM, CTMP, V( VPOS+1 ), 1, TAU( TAUPOS ) )
+                  CALL ZLARFG( LM, CTMP, V( VPOS+1 ), 1,
+     $                         TAU( TAUPOS ) )
                   A( DPOS-NB, J1 ) = CTMP
 *
                   CALL ZLARFX( 'Right', LN-1, LM, V( VPOS ),
diff --git a/SRC/zhbev.f b/SRC/zhbev.f
index 341a6fb2bb..e9cdbd6659 100644
--- a/SRC/zhbev.f
+++ b/SRC/zhbev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHBEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhbev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhbev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,11 +142,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHEReigen
+*> \ingroup hbev
 *
 *  =====================================================================
       SUBROUTINE ZHBEV( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
      $                  RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -181,7 +180,8 @@ SUBROUTINE ZHBEV( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       EXTERNAL           LSAME, DLAMCH, ZLANHB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSCAL, DSTERF, XERBLA, ZHBTRD, ZLASCL, ZSTEQR
+      EXTERNAL           DSCAL, DSTERF, XERBLA, ZHBTRD, ZLASCL,
+     $                   ZSTEQR
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          SQRT
@@ -251,9 +251,11 @@ SUBROUTINE ZHBEV( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL ZLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL ZLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL ZLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL ZLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
       END IF
 *
diff --git a/SRC/zhbev_2stage.f b/SRC/zhbev_2stage.f
index 056f0a7cea..257edbd638 100644
--- a/SRC/zhbev_2stage.f
+++ b/SRC/zhbev_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHBEV_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhbev_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhbev_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,7 +130,7 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = (2KD+1)*N + KD*NTHREADS
@@ -171,7 +169,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHEReigen
+*> \ingroup hbev_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -189,7 +187,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -197,16 +195,17 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE ZHBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
+      SUBROUTINE ZHBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z,
+     $                         LDZ,
      $                         WORK, LWORK, RWORK, INFO )
 *
       IMPLICIT NONE
@@ -244,7 +243,8 @@ SUBROUTINE ZHBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       EXTERNAL           LSAME, DLAMCH, ZLANHB, ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSCAL, DSTERF, XERBLA, ZLASCL, ZSTEQR,
+      EXTERNAL           DSCAL, DSTERF, XERBLA, ZLASCL,
+     $                   ZSTEQR,
      $                   ZHETRD_2STAGE, ZHETRD_HB2ST
 *     ..
 *     .. Intrinsic Functions ..
@@ -337,9 +337,11 @@ SUBROUTINE ZHBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL ZLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL ZLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL ZLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL ZLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
       END IF
 *
@@ -351,7 +353,7 @@ SUBROUTINE ZHBEV_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       LLWORK  = LWORK - INDWRK + 1
 *
       CALL ZHETRD_HB2ST( "N", JOBZ, UPLO, N, KD, AB, LDAB, W,
-     $                    RWORK( INDE ), WORK( INDHOUS ), LHTRD, 
+     $                    RWORK( INDE ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWRK ), LLWORK, IINFO )
 *
 *     For eigenvalues only, call DSTERF.  For eigenvectors, call ZSTEQR.
diff --git a/SRC/zhbevd.f b/SRC/zhbevd.f
index 0db5515409..73248d78c4 100644
--- a/SRC/zhbevd.f
+++ b/SRC/zhbevd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHBEVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhbevd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhbevd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -41,12 +39,6 @@
 *> a complex Hermitian band matrix A.  If eigenvectors are desired, it
 *> uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -207,11 +199,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHEReigen
+*> \ingroup hbevd
 *
 *  =====================================================================
-      SUBROUTINE ZHBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
+      SUBROUTINE ZHBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
+     $                   WORK,
      $                   LWORK, RWORK, LRWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -249,7 +243,8 @@ SUBROUTINE ZHBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       EXTERNAL           LSAME, DLAMCH, ZLANHB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSCAL, DSTERF, XERBLA, ZGEMM, ZHBTRD, ZLACPY,
+      EXTERNAL           DSCAL, DSTERF, XERBLA, ZGEMM, ZHBTRD,
+     $                   ZLACPY,
      $                   ZLASCL, ZSTEDC
 *     ..
 *     .. Intrinsic Functions ..
@@ -295,7 +290,7 @@ SUBROUTINE ZHBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
 *
       IF( INFO.EQ.0 ) THEN
          WORK( 1 ) = LWMIN
-         RWORK( 1 ) = LRWMIN
+         RWORK( 1 ) = REAL( LRWMIN )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -348,9 +343,11 @@ SUBROUTINE ZHBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL ZLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL ZLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL ZLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL ZLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
       END IF
 *
@@ -369,7 +366,8 @@ SUBROUTINE ZHBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       IF( .NOT.WANTZ ) THEN
          CALL DSTERF( N, W, RWORK( INDE ), INFO )
       ELSE
-         CALL ZSTEDC( 'I', N, W, RWORK( INDE ), WORK, N, WORK( INDWK2 ),
+         CALL ZSTEDC( 'I', N, W, RWORK( INDE ), WORK, N,
+     $                WORK( INDWK2 ),
      $                LLWK2, RWORK( INDWRK ), LLRWK, IWORK, LIWORK,
      $                INFO )
          CALL ZGEMM( 'N', 'N', N, N, N, CONE, Z, LDZ, WORK, N, CZERO,
@@ -389,7 +387,7 @@ SUBROUTINE ZHBEVD( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ, WORK,
       END IF
 *
       WORK( 1 ) = LWMIN
-      RWORK( 1 ) = LRWMIN
+      RWORK( 1 ) = REAL( LRWMIN )
       IWORK( 1 ) = LIWMIN
       RETURN
 *
diff --git a/SRC/zhbevd_2stage.f b/SRC/zhbevd_2stage.f
index 4522d5e796..f7036aedde 100644
--- a/SRC/zhbevd_2stage.f
+++ b/SRC/zhbevd_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHBEVD_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhbevd_2stage.f">
 *> [TGZ]</a>
@@ -15,13 +14,12 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhbevd_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
 *       SUBROUTINE ZHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
-*                                 WORK, LWORK, RWORK, LRWORK, IWORK, 
+*                                 WORK, LWORK, RWORK, LRWORK, IWORK,
 *                                 LIWORK, INFO )
 *
 *       IMPLICIT NONE
@@ -47,12 +45,6 @@
 *> the reduction to tridiagonal.  If eigenvectors are desired, it
 *> uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -142,7 +134,7 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = (2KD+1)*N + KD*NTHREADS
@@ -219,7 +211,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHEReigen
+*> \ingroup hbevd_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -237,7 +229,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -245,17 +237,18 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE ZHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
-     $                          WORK, LWORK, RWORK, LRWORK, IWORK, 
+      SUBROUTINE ZHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z,
+     $                          LDZ,
+     $                          WORK, LWORK, RWORK, LRWORK, IWORK,
      $                          LIWORK, INFO )
 *
       IMPLICIT NONE
@@ -298,7 +291,8 @@ SUBROUTINE ZHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       EXTERNAL           LSAME, DLAMCH, ZLANHB, ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSCAL, DSTERF, XERBLA, ZGEMM, ZLACPY,
+      EXTERNAL           DSCAL, DSTERF, XERBLA, ZGEMM,
+     $                   ZLACPY,
      $                   ZLASCL, ZSTEDC, ZHETRD_HB2ST
 *     ..
 *     .. Intrinsic Functions ..
@@ -318,9 +312,12 @@ SUBROUTINE ZHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
          LRWMIN = 1
          LIWMIN = 1
       ELSE
-         IB    = ILAENV2STAGE( 2, 'ZHETRD_HB2ST', JOBZ, N, KD, -1, -1 )
-         LHTRD = ILAENV2STAGE( 3, 'ZHETRD_HB2ST', JOBZ, N, KD, IB, -1 )
-         LWTRD = ILAENV2STAGE( 4, 'ZHETRD_HB2ST', JOBZ, N, KD, IB, -1 )
+         IB    = ILAENV2STAGE( 2, 'ZHETRD_HB2ST', JOBZ, N, KD, -1,
+     $                         -1 )
+         LHTRD = ILAENV2STAGE( 3, 'ZHETRD_HB2ST', JOBZ, N, KD, IB,
+     $                         -1 )
+         LWTRD = ILAENV2STAGE( 4, 'ZHETRD_HB2ST', JOBZ, N, KD, IB,
+     $                         -1 )
          IF( WANTZ ) THEN
             LWMIN = 2*N**2
             LRWMIN = 1 + 5*N + 2*N**2
@@ -347,7 +344,7 @@ SUBROUTINE ZHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
 *
       IF( INFO.EQ.0 ) THEN
          WORK( 1 )  = LWMIN
-         RWORK( 1 ) = LRWMIN
+         RWORK( 1 ) = REAL( LRWMIN )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -400,9 +397,11 @@ SUBROUTINE ZHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL ZLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL ZLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL ZLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL ZLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
       END IF
 *
@@ -418,7 +417,7 @@ SUBROUTINE ZHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       LLWK2   = LWORK - INDWK2 + 1
 *
       CALL ZHETRD_HB2ST( "N", JOBZ, UPLO, N, KD, AB, LDAB, W,
-     $                    RWORK( INDE ), WORK( INDHOUS ), LHTRD, 
+     $                    RWORK( INDE ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWK ), LLWORK, IINFO )
 *
 *     For eigenvalues only, call DSTERF.  For eigenvectors, call ZSTEDC.
@@ -426,7 +425,8 @@ SUBROUTINE ZHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       IF( .NOT.WANTZ ) THEN
          CALL DSTERF( N, W, RWORK( INDE ), INFO )
       ELSE
-         CALL ZSTEDC( 'I', N, W, RWORK( INDE ), WORK, N, WORK( INDWK2 ),
+         CALL ZSTEDC( 'I', N, W, RWORK( INDE ), WORK, N,
+     $                WORK( INDWK2 ),
      $                LLWK2, RWORK( INDRWK ), LLRWK, IWORK, LIWORK,
      $                INFO )
          CALL ZGEMM( 'N', 'N', N, N, N, CONE, Z, LDZ, WORK, N, CZERO,
@@ -446,7 +446,7 @@ SUBROUTINE ZHBEVD_2STAGE( JOBZ, UPLO, N, KD, AB, LDAB, W, Z, LDZ,
       END IF
 *
       WORK( 1 )  = LWMIN
-      RWORK( 1 ) = LRWMIN
+      RWORK( 1 ) = REAL( LRWMIN )
       IWORK( 1 ) = LIWMIN
       RETURN
 *
diff --git a/SRC/zhbevx.f b/SRC/zhbevx.f
index 77bd721b3c..b34e5051eb 100644
--- a/SRC/zhbevx.f
+++ b/SRC/zhbevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHBEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhbevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhbevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -258,12 +256,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHEReigen
+*> \ingroup hbevx
 *
 *  =====================================================================
-      SUBROUTINE ZHBEVX( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q, LDQ, VL,
+      SUBROUTINE ZHBEVX( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q, LDQ,
+     $                   VL,
      $                   VU, IL, IU, ABSTOL, M, W, Z, LDZ, WORK, RWORK,
      $                   IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -306,7 +306,8 @@ SUBROUTINE ZHBEVX( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q, LDQ, VL,
       EXTERNAL           LSAME, DLAMCH, ZLANHB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTERF, XERBLA, ZCOPY,
+      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTERF, XERBLA,
+     $                   ZCOPY,
      $                   ZGEMV, ZHBTRD, ZLACPY, ZLASCL, ZSTEIN, ZSTEQR,
      $                   ZSWAP
 *     ..
@@ -416,9 +417,11 @@ SUBROUTINE ZHBEVX( JOBZ, RANGE, UPLO, N, KD, AB, LDAB, Q, LDQ, VL,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL ZLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL ZLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL ZLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL ZLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
          IF( ABSTOL.GT.0 )
      $      ABSTLL = ABSTOL*SIGMA
diff --git a/SRC/zhbevx_2stage.f b/SRC/zhbevx_2stage.f
index 2a9896d430..f4932f6a9e 100644
--- a/SRC/zhbevx_2stage.f
+++ b/SRC/zhbevx_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHBEVX_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhbevx_2stage.f">
 *> [TGZ]</a>
@@ -15,14 +14,13 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhbevx_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
 *       SUBROUTINE ZHBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB,
 *                                 Q, LDQ, VL, VU, IL, IU, ABSTOL, M, W,
-*                                 Z, LDZ, WORK, LWORK, RWORK, IWORK, 
+*                                 Z, LDZ, WORK, LWORK, RWORK, IWORK,
 *                                 IFAIL, INFO )
 *
 *       IMPLICIT NONE
@@ -233,7 +231,7 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = (2KD+1)*N + KD*NTHREADS
@@ -285,7 +283,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHEReigen
+*> \ingroup hbevx_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -303,7 +301,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -311,18 +309,18 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
       SUBROUTINE ZHBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB,
      $                          Q, LDQ, VL, VU, IL, IU, ABSTOL, M, W,
-     $                          Z, LDZ, WORK, LWORK, RWORK, IWORK, 
+     $                          Z, LDZ, WORK, LWORK, RWORK, IWORK,
      $                          IFAIL, INFO )
 *
       IMPLICIT NONE
@@ -371,7 +369,8 @@ SUBROUTINE ZHBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB,
       EXTERNAL           LSAME, DLAMCH, ZLANHB, ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTERF, XERBLA, ZCOPY,
+      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTERF, XERBLA,
+     $                   ZCOPY,
      $                   ZGEMV, ZLACPY, ZLASCL, ZSTEIN, ZSTEQR,
      $                   ZSWAP, ZHETRD_HB2ST
 *     ..
@@ -503,9 +502,11 @@ SUBROUTINE ZHBEVX_2STAGE( JOBZ, RANGE, UPLO, N, KD, AB, LDAB,
       END IF
       IF( ISCALE.EQ.1 ) THEN
          IF( LOWER ) THEN
-            CALL ZLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL ZLASCL( 'B', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          ELSE
-            CALL ZLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB, INFO )
+            CALL ZLASCL( 'Q', KD, KD, ONE, SIGMA, N, N, AB, LDAB,
+     $                   INFO )
          END IF
          IF( ABSTOL.GT.0 )
      $      ABSTLL = ABSTOL*SIGMA
diff --git a/SRC/zhbgst.f b/SRC/zhbgst.f
index b05823b2b2..3cb274786c 100644
--- a/SRC/zhbgst.f
+++ b/SRC/zhbgst.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHBGST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhbgst.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhbgst.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -157,11 +155,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hbgst
 *
 *  =====================================================================
-      SUBROUTINE ZHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
+      SUBROUTINE ZHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB,
+     $                   X,
      $                   LDX, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -197,7 +197,8 @@ SUBROUTINE ZHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZDSCAL, ZGERC, ZGERU, ZLACGV, ZLAR2V,
+      EXTERNAL           XERBLA, ZDSCAL, ZGERC, ZGERU, ZLACGV,
+     $                   ZLAR2V,
      $                   ZLARGV, ZLARTG, ZLARTV, ZLASET, ZROT
 *     ..
 *     .. Intrinsic Functions ..
@@ -441,7 +442,8 @@ SUBROUTINE ZHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *           have been created outside the band
 *
             IF( NRT.GT.0 )
-     $         CALL ZLARGV( NRT, AB( 1, J2T ), INCA, WORK( J2T-M ), KA1,
+     $         CALL ZLARGV( NRT, AB( 1, J2T ), INCA, WORK( J2T-M ),
+     $                      KA1,
      $                      RWORK( J2T-M ), KA1 )
             IF( NR.GT.0 ) THEN
 *
@@ -670,7 +672,8 @@ SUBROUTINE ZHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *
 *                 generate rotation to annihilate a(i-k+ka+1,i)
 *
-                  CALL ZLARTG( AB( KA1-K, I ), RA1, RWORK( I-K+KA-M ),
+                  CALL ZLARTG( AB( KA1-K, I ), RA1,
+     $                         RWORK( I-K+KA-M ),
      $                         WORK( I-K+KA-M ), RA )
 *
 *                 create nonzero element a(i-k+ka+1,i-k) outside the
@@ -707,7 +710,8 @@ SUBROUTINE ZHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *           have been created outside the band
 *
             IF( NRT.GT.0 )
-     $         CALL ZLARGV( NRT, AB( KA1, J2T-KA ), INCA, WORK( J2T-M ),
+     $         CALL ZLARGV( NRT, AB( KA1, J2T-KA ), INCA,
+     $                      WORK( J2T-M ),
      $                      KA1, RWORK( J2T-M ), KA1 )
             IF( NR.GT.0 ) THEN
 *
@@ -722,7 +726,8 @@ SUBROUTINE ZHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              apply rotations in 1st set from both sides to diagonal
 *              blocks
 *
-               CALL ZLAR2V( NR, AB( 1, J2 ), AB( 1, J2+1 ), AB( 2, J2 ),
+               CALL ZLAR2V( NR, AB( 1, J2 ), AB( 1, J2+1 ), AB( 2,
+     $                      J2 ),
      $                      INCA, RWORK( J2-M ), WORK( J2-M ), KA1 )
 *
                CALL ZLACGV( NR, WORK( J2-M ), KA1 )
@@ -804,7 +809,8 @@ SUBROUTINE ZHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              generate rotations in 2nd set to annihilate elements
 *              which have been created outside the band
 *
-               CALL ZLARGV( NR, AB( KA1, J2-KA ), INCA, WORK( J2 ), KA1,
+               CALL ZLARGV( NR, AB( KA1, J2-KA ), INCA, WORK( J2 ),
+     $                      KA1,
      $                      RWORK( J2 ), KA1 )
 *
 *              apply rotations in 2nd set from the left
@@ -818,7 +824,8 @@ SUBROUTINE ZHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              apply rotations in 2nd set from both sides to diagonal
 *              blocks
 *
-               CALL ZLAR2V( NR, AB( 1, J2 ), AB( 1, J2+1 ), AB( 2, J2 ),
+               CALL ZLAR2V( NR, AB( 1, J2 ), AB( 1, J2+1 ), AB( 2,
+     $                      J2 ),
      $                      INCA, RWORK( J2 ), WORK( J2 ), KA1 )
 *
                CALL ZLACGV( NR, WORK( J2 ), KA1 )
@@ -1022,7 +1029,8 @@ SUBROUTINE ZHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *           have been created outside the band
 *
             IF( NRT.GT.0 )
-     $         CALL ZLARGV( NRT, AB( 1, J1+KA ), INCA, WORK( J1 ), KA1,
+     $         CALL ZLARGV( NRT, AB( 1, J1+KA ), INCA, WORK( J1 ),
+     $                      KA1,
      $                      RWORK( J1 ), KA1 )
             IF( NR.GT.0 ) THEN
 *
@@ -1123,7 +1131,8 @@ SUBROUTINE ZHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              generate rotations in 2nd set to annihilate elements
 *              which have been created outside the band
 *
-               CALL ZLARGV( NR, AB( 1, J1+KA ), INCA, WORK( M-KB+J1 ),
+               CALL ZLARGV( NR, AB( 1, J1+KA ), INCA,
+     $                      WORK( M-KB+J1 ),
      $                      KA1, RWORK( M-KB+J1 ), KA1 )
 *
 *              apply rotations in 2nd set from the left
@@ -1233,7 +1242,8 @@ SUBROUTINE ZHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *
                CALL ZDSCAL( NX, ONE / BII, X( 1, I ), 1 )
                IF( KBT.GT.0 )
-     $            CALL ZGERC( NX, KBT, -CONE, X( 1, I ), 1, BB( 2, I ),
+     $            CALL ZGERC( NX, KBT, -CONE, X( 1, I ), 1, BB( 2,
+     $                        I ),
      $                        1, X( 1, I+1 ), LDX )
             END IF
 *
@@ -1292,14 +1302,16 @@ SUBROUTINE ZHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *           have been created outside the band
 *
             IF( NRT.GT.0 )
-     $         CALL ZLARGV( NRT, AB( KA1, J1 ), INCA, WORK( J1 ), KA1,
+     $         CALL ZLARGV( NRT, AB( KA1, J1 ), INCA, WORK( J1 ),
+     $                      KA1,
      $                      RWORK( J1 ), KA1 )
             IF( NR.GT.0 ) THEN
 *
 *              apply rotations in 1st set from the right
 *
                DO 810 L = 1, KA - 1
-                  CALL ZLARTV( NR, AB( L+1, J1 ), INCA, AB( L+2, J1-1 ),
+                  CALL ZLARTV( NR, AB( L+1, J1 ), INCA, AB( L+2,
+     $                         J1-1 ),
      $                         INCA, RWORK( J1 ), WORK( J1 ), KA1 )
   810          CONTINUE
 *
@@ -1398,7 +1410,8 @@ SUBROUTINE ZHBGST( VECT, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, X,
 *              apply rotations in 2nd set from the right
 *
                DO 890 L = 1, KA - 1
-                  CALL ZLARTV( NR, AB( L+1, J1 ), INCA, AB( L+2, J1-1 ),
+                  CALL ZLARTV( NR, AB( L+1, J1 ), INCA, AB( L+2,
+     $                         J1-1 ),
      $                         INCA, RWORK( M-KB+J1 ), WORK( M-KB+J1 ),
      $                         KA1 )
   890          CONTINUE
diff --git a/SRC/zhbgv.f b/SRC/zhbgv.f
index 2d587bd027..e120be6e09 100644
--- a/SRC/zhbgv.f
+++ b/SRC/zhbgv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHBGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhbgv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhbgv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -175,11 +173,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHEReigen
+*> \ingroup hbgv
 *
 *  =====================================================================
-      SUBROUTINE ZHBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W, Z,
+      SUBROUTINE ZHBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
+     $                  Z,
      $                  LDZ, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -207,7 +207,8 @@ SUBROUTINE ZHBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W, Z,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSTERF, XERBLA, ZHBGST, ZHBTRD, ZPBSTF, ZSTEQR
+      EXTERNAL           DSTERF, XERBLA, ZHBGST, ZHBTRD, ZPBSTF,
+     $                   ZSTEQR
 *     ..
 *     .. Executable Statements ..
 *
@@ -235,7 +236,7 @@ SUBROUTINE ZHBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W, Z,
          INFO = -12
       END IF
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZHBGV ', -INFO )
+         CALL XERBLA( 'ZHBGV', -INFO )
          RETURN
       END IF
 *
diff --git a/SRC/zhbgvd.f b/SRC/zhbgvd.f
index b0664750e7..6b3279faa9 100644
--- a/SRC/zhbgvd.f
+++ b/SRC/zhbgvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHBGVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhbgvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhbgvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -46,12 +44,6 @@
 *> and banded, and B is also positive definite.  If eigenvectors are
 *> desired, it uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -238,7 +230,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHEReigen
+*> \ingroup hbgvd
 *
 *> \par Contributors:
 *  ==================
@@ -246,9 +238,11 @@
 *>     Mark Fahey, Department of Mathematics, Univ. of Kentucky, USA
 *
 *  =====================================================================
-      SUBROUTINE ZHBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
+      SUBROUTINE ZHBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB,
+     $                   W,
      $                   Z, LDZ, WORK, LWORK, RWORK, LRWORK, IWORK,
      $                   LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -284,7 +278,8 @@ SUBROUTINE ZHBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSTERF, XERBLA, ZGEMM, ZHBGST, ZHBTRD, ZLACPY,
+      EXTERNAL           DSTERF, XERBLA, ZGEMM, ZHBGST, ZHBTRD,
+     $                   ZLACPY,
      $                   ZPBSTF, ZSTEDC
 *     ..
 *     .. Executable Statements ..
@@ -329,7 +324,7 @@ SUBROUTINE ZHBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
 *
       IF( INFO.EQ.0 ) THEN
          WORK( 1 ) = LWMIN
-         RWORK( 1 ) = LRWMIN
+         RWORK( 1 ) = REAL( LRWMIN )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -386,7 +381,8 @@ SUBROUTINE ZHBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
       IF( .NOT.WANTZ ) THEN
          CALL DSTERF( N, W, RWORK( INDE ), INFO )
       ELSE
-         CALL ZSTEDC( 'I', N, W, RWORK( INDE ), WORK, N, WORK( INDWK2 ),
+         CALL ZSTEDC( 'I', N, W, RWORK( INDE ), WORK, N,
+     $                WORK( INDWK2 ),
      $                LLWK2, RWORK( INDWRK ), LLRWK, IWORK, LIWORK,
      $                INFO )
          CALL ZGEMM( 'N', 'N', N, N, N, CONE, Z, LDZ, WORK, N, CZERO,
@@ -395,7 +391,7 @@ SUBROUTINE ZHBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
       END IF
 *
       WORK( 1 ) = LWMIN
-      RWORK( 1 ) = LRWMIN
+      RWORK( 1 ) = REAL( LRWMIN )
       IWORK( 1 ) = LIWMIN
       RETURN
 *
diff --git a/SRC/zhbgvx.f b/SRC/zhbgvx.f
index 79a3811b21..943a510063 100644
--- a/SRC/zhbgvx.f
+++ b/SRC/zhbgvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHBGVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhbgvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhbgvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -286,7 +284,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHEReigen
+*> \ingroup hbgvx
 *
 *> \par Contributors:
 *  ==================
@@ -297,6 +295,7 @@
       SUBROUTINE ZHBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
      $                   LDBB, Q, LDQ, VL, VU, IL, IU, ABSTOL, M, W, Z,
      $                   LDZ, WORK, RWORK, IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -327,7 +326,7 @@ SUBROUTINE ZHBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
 *     .. Local Scalars ..
       LOGICAL            ALLEIG, INDEIG, TEST, UPPER, VALEIG, WANTZ
       CHARACTER          ORDER, VECT
-      INTEGER            I, IINFO, INDD, INDE, INDEE, INDIBL, INDISP,
+      INTEGER            I, IINFO, INDD, INDE, INDEE, INDISP,
      $                   INDIWK, INDRWK, INDWRK, ITMP1, J, JJ, NSPLIT
       DOUBLE PRECISION   TMP1
 *     ..
@@ -336,7 +335,8 @@ SUBROUTINE ZHBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DSTEBZ, DSTERF, XERBLA, ZCOPY, ZGEMV,
+      EXTERNAL           DCOPY, DSTEBZ, DSTERF, XERBLA, ZCOPY,
+     $                   ZGEMV,
      $                   ZHBGST, ZHBTRD, ZLACPY, ZPBSTF, ZSTEIN, ZSTEQR,
      $                   ZSWAP
 *     ..
@@ -470,17 +470,16 @@ SUBROUTINE ZHBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
       ELSE
          ORDER = 'E'
       END IF
-      INDIBL = 1
-      INDISP = INDIBL + N
+      INDISP = 1 + N
       INDIWK = INDISP + N
       CALL DSTEBZ( RANGE, ORDER, N, VL, VU, IL, IU, ABSTOL,
      $             RWORK( INDD ), RWORK( INDE ), M, NSPLIT, W,
-     $             IWORK( INDIBL ), IWORK( INDISP ), RWORK( INDRWK ),
+     $             IWORK( 1 ), IWORK( INDISP ), RWORK( INDRWK ),
      $             IWORK( INDIWK ), INFO )
 *
       IF( WANTZ ) THEN
          CALL ZSTEIN( N, RWORK( INDD ), RWORK( INDE ), M, W,
-     $                IWORK( INDIBL ), IWORK( INDISP ), Z, LDZ,
+     $                IWORK( 1 ), IWORK( INDISP ), Z, LDZ,
      $                RWORK( INDRWK ), IWORK( INDIWK ), IFAIL, INFO )
 *
 *        Apply unitary matrix used in reduction to tridiagonal
@@ -510,11 +509,11 @@ SUBROUTINE ZHBGVX( JOBZ, RANGE, UPLO, N, KA, KB, AB, LDAB, BB,
    40       CONTINUE
 *
             IF( I.NE.0 ) THEN
-               ITMP1 = IWORK( INDIBL+I-1 )
+               ITMP1 = IWORK( 1 + I-1 )
                W( I ) = W( J )
-               IWORK( INDIBL+I-1 ) = IWORK( INDIBL+J-1 )
+               IWORK( 1 + I-1 ) = IWORK( 1 + J-1 )
                W( J ) = TMP1
-               IWORK( INDIBL+J-1 ) = ITMP1
+               IWORK( 1 + J-1 ) = ITMP1
                CALL ZSWAP( N, Z( 1, I ), 1, Z( 1, J ), 1 )
                IF( INFO.NE.0 ) THEN
                   ITMP1 = IFAIL( I )
diff --git a/SRC/zhbtrd.f b/SRC/zhbtrd.f
index 63dc7a9343..8598332ead 100644
--- a/SRC/zhbtrd.f
+++ b/SRC/zhbtrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHBTRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhbtrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhbtrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -147,7 +145,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hbtrd
 *
 *> \par Further Details:
 *  =====================
@@ -160,6 +158,7 @@
 *  =====================================================================
       SUBROUTINE ZHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -192,7 +191,8 @@ SUBROUTINE ZHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
       COMPLEX*16         T, TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLACGV, ZLAR2V, ZLARGV, ZLARTG, ZLARTV,
+      EXTERNAL           XERBLA, ZLACGV, ZLAR2V, ZLARGV, ZLARTG,
+     $                   ZLARTV,
      $                   ZLASET, ZROT, ZSCAL
 *     ..
 *     .. Intrinsic Functions ..
@@ -276,7 +276,8 @@ SUBROUTINE ZHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
 *                    generate plane rotations to annihilate nonzero
 *                    elements which have been created outside the band
 *
-                     CALL ZLARGV( NR, AB( 1, J1-1 ), INCA, WORK( J1 ),
+                     CALL ZLARGV( NR, AB( 1, J1-1 ), INCA,
+     $                            WORK( J1 ),
      $                            KD1, D( J1 ), KD1 )
 *
 *                    apply rotations from the right
@@ -348,7 +349,8 @@ SUBROUTINE ZHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                               NRT = NR
                            END IF
                            IF( NRT.GT.0 )
-     $                        CALL ZLARTV( NRT, AB( KD-L, J1+L ), INCA,
+     $                        CALL ZLARTV( NRT, AB( KD-L, J1+L ),
+     $                                     INCA,
      $                                     AB( KD-L+1, J1+L ), INCA,
      $                                     D( J1 ), WORK( J1 ), KD1 )
    30                   CONTINUE
@@ -356,7 +358,8 @@ SUBROUTINE ZHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                         J1END = J1 + KD1*( NR-2 )
                         IF( J1END.GE.J1 ) THEN
                            DO 40 JIN = J1, J1END, KD1
-                              CALL ZROT( KD-1, AB( KD-1, JIN+1 ), INCX,
+                              CALL ZROT( KD-1, AB( KD-1, JIN+1 ),
+     $                                   INCX,
      $                                   AB( KD, JIN+1 ), INCX,
      $                                   D( JIN ), WORK( JIN ) )
    40                      CONTINUE
@@ -391,13 +394,15 @@ SUBROUTINE ZHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                            IQB = MAX( 1, J-IBL )
                            NQ = 1 + IQAEND - IQB
                            IQAEND = MIN( IQAEND+KD, IQEND )
-                           CALL ZROT( NQ, Q( IQB, J-1 ), 1, Q( IQB, J ),
+                           CALL ZROT( NQ, Q( IQB, J-1 ), 1, Q( IQB,
+     $                                J ),
      $                                1, D( J ), DCONJG( WORK( J ) ) )
    50                   CONTINUE
                      ELSE
 *
                         DO 60 J = J1, J2, KD1
-                           CALL ZROT( N, Q( 1, J-1 ), 1, Q( 1, J ), 1,
+                           CALL ZROT( N, Q( 1, J-1 ), 1, Q( 1, J ),
+     $                                1,
      $                                D( J ), DCONJG( WORK( J ) ) )
    60                   CONTINUE
                      END IF
@@ -495,7 +500,8 @@ SUBROUTINE ZHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
 *
                      IF( NR.GT.2*KD-1 ) THEN
                         DO 130 L = 1, KD - 1
-                           CALL ZLARTV( NR, AB( KD1-L, J1-KD1+L ), INCA,
+                           CALL ZLARTV( NR, AB( KD1-L, J1-KD1+L ),
+     $                                  INCA,
      $                                  AB( KD1-L+1, J1-KD1+L ), INCA,
      $                                  D( J1 ), WORK( J1 ), KD1 )
   130                   CONTINUE
@@ -554,7 +560,8 @@ SUBROUTINE ZHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                               NRT = NR
                            END IF
                            IF( NRT.GT.0 )
-     $                        CALL ZLARTV( NRT, AB( L+2, J1-1 ), INCA,
+     $                        CALL ZLARTV( NRT, AB( L+2, J1-1 ),
+     $                                     INCA,
      $                                     AB( L+1, J1 ), INCA, D( J1 ),
      $                                     WORK( J1 ), KD1 )
   150                   CONTINUE
@@ -599,13 +606,15 @@ SUBROUTINE ZHBTRD( VECT, UPLO, N, KD, AB, LDAB, D, E, Q, LDQ,
                            IQB = MAX( 1, J-IBL )
                            NQ = 1 + IQAEND - IQB
                            IQAEND = MIN( IQAEND+KD, IQEND )
-                           CALL ZROT( NQ, Q( IQB, J-1 ), 1, Q( IQB, J ),
+                           CALL ZROT( NQ, Q( IQB, J-1 ), 1, Q( IQB,
+     $                                J ),
      $                                1, D( J ), WORK( J ) )
   170                   CONTINUE
                      ELSE
 *
                         DO 180 J = J1, J2, KD1
-                           CALL ZROT( N, Q( 1, J-1 ), 1, Q( 1, J ), 1,
+                           CALL ZROT( N, Q( 1, J-1 ), 1, Q( 1, J ),
+     $                                1,
      $                                D( J ), WORK( J ) )
   180                   CONTINUE
                      END IF
diff --git a/SRC/zhecon.f b/SRC/zhecon.f
index 5c57b566d2..f62cff5af3 100644
--- a/SRC/zhecon.f
+++ b/SRC/zhecon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHECON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhecon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhecon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,11 +115,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hecon
 *
 *  =====================================================================
       SUBROUTINE ZHECON( UPLO, N, A, LDA, IPIV, ANORM, RCOND, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zhecon_3.f b/SRC/zhecon_3.f
index a84d5c0caf..c987d03696 100644
--- a/SRC/zhecon_3.f
+++ b/SRC/zhecon_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHECON_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhecon_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhecon_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,7 +142,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hecon_3
 *
 *> \par Contributors:
 *  ==================
@@ -163,6 +161,7 @@
 *  =====================================================================
       SUBROUTINE ZHECON_3( UPLO, N, A, LDA, E, IPIV, ANORM, RCOND,
      $                     WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zhecon_rook.f b/SRC/zhecon_rook.f
index 522bd2b2d6..012cb3cda1 100644
--- a/SRC/zhecon_rook.f
+++ b/SRC/zhecon_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHECON_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhecon_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhecon_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,7 +115,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hecon_rook
 *
 *> \par Contributors:
 *  ==================
@@ -134,8 +132,10 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE ZHECON_ROOK( UPLO, N, A, LDA, IPIV, ANORM, RCOND, WORK,
+      SUBROUTINE ZHECON_ROOK( UPLO, N, A, LDA, IPIV, ANORM, RCOND,
+     $                        WORK,
      $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zheequb.f b/SRC/zheequb.f
index 93747172eb..29445fe7b7 100644
--- a/SRC/zheequb.f
+++ b/SRC/zheequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHEEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zheequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zheequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,7 +115,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup heequb
 *
 *> \par References:
 *  ================
@@ -128,7 +126,9 @@
 *>  Tech report version: http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.3.1679
 *>
 *  =====================================================================
-      SUBROUTINE ZHEEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
+      SUBROUTINE ZHEEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK,
+     $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -181,7 +181,8 @@ SUBROUTINE ZHEEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF ( .NOT. ( LSAME( UPLO, 'U' ) .OR. LSAME( UPLO, 'L' ) ) ) THEN
+      IF ( .NOT. ( LSAME( UPLO, 'U' ) .OR.
+     $     LSAME( UPLO, 'L' ) ) ) THEN
          INFO = -1
       ELSE IF ( N .LT. 0 ) THEN
          INFO = -2
diff --git a/SRC/zheev.f b/SRC/zheev.f
index 59af34a742..48369efdec 100644
--- a/SRC/zheev.f
+++ b/SRC/zheev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHEEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zheev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zheev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,11 +130,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEeigen
+*> \ingroup heev
 *
 *  =====================================================================
       SUBROUTINE ZHEEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -173,7 +172,8 @@ SUBROUTINE ZHEEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
       EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANHE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSCAL, DSTERF, XERBLA, ZHETRD, ZLASCL, ZSTEQR,
+      EXTERNAL           DSCAL, DSTERF, XERBLA, ZHETRD, ZLASCL,
+     $                   ZSTEQR,
      $                   ZUNGTR
 *     ..
 *     .. Intrinsic Functions ..
@@ -266,7 +266,8 @@ SUBROUTINE ZHEEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
       IF( .NOT.WANTZ ) THEN
          CALL DSTERF( N, W, RWORK( INDE ), INFO )
       ELSE
-         CALL ZUNGTR( UPLO, N, A, LDA, WORK( INDTAU ), WORK( INDWRK ),
+         CALL ZUNGTR( UPLO, N, A, LDA, WORK( INDTAU ),
+     $                WORK( INDWRK ),
      $                LLWORK, IINFO )
          INDWRK = INDE + N
          CALL ZSTEQR( JOBZ, N, W, RWORK( INDE ), A, LDA,
diff --git a/SRC/zheev_2stage.f b/SRC/zheev_2stage.f
index 96c07c54fd..dc07916693 100644
--- a/SRC/zheev_2stage.f
+++ b/SRC/zheev_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHEEV_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zheev_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zheev_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,12 +104,12 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + N
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + N
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -149,7 +147,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEeigen
+*> \ingroup heev_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -167,7 +165,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -175,11 +173,11 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
@@ -224,7 +222,8 @@ SUBROUTINE ZHEEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       EXTERNAL           LSAME, DLAMCH, ZLANHE, ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSCAL, DSTERF, XERBLA, ZLASCL, ZSTEQR,
+      EXTERNAL           DSCAL, DSTERF, XERBLA, ZLASCL,
+     $                   ZSTEQR,
      $                   ZUNGTR, ZHETRD_2STAGE
 *     ..
 *     .. Intrinsic Functions ..
@@ -250,10 +249,14 @@ SUBROUTINE ZHEEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         KD    = ILAENV2STAGE( 1, 'ZHETRD_2STAGE', JOBZ, N, -1, -1, -1 )
-         IB    = ILAENV2STAGE( 2, 'ZHETRD_2STAGE', JOBZ, N, KD, -1, -1 )
-         LHTRD = ILAENV2STAGE( 3, 'ZHETRD_2STAGE', JOBZ, N, KD, IB, -1 )
-         LWTRD = ILAENV2STAGE( 4, 'ZHETRD_2STAGE', JOBZ, N, KD, IB, -1 )
+         KD    = ILAENV2STAGE( 1, 'ZHETRD_2STAGE', JOBZ, N, -1, -1,
+     $                         -1 )
+         IB    = ILAENV2STAGE( 2, 'ZHETRD_2STAGE', JOBZ, N, KD, -1,
+     $                         -1 )
+         LHTRD = ILAENV2STAGE( 3, 'ZHETRD_2STAGE', JOBZ, N, KD, IB,
+     $                         -1 )
+         LWTRD = ILAENV2STAGE( 4, 'ZHETRD_2STAGE', JOBZ, N, KD, IB,
+     $                         -1 )
          LWMIN = N + LHTRD + LWTRD
          WORK( 1 )  = LWMIN
 *
@@ -314,7 +317,7 @@ SUBROUTINE ZHEEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       LLWORK  = LWORK - INDWRK + 1
 *
       CALL ZHETRD_2STAGE( JOBZ, UPLO, N, A, LDA, W, RWORK( INDE ),
-     $                    WORK( INDTAU ), WORK( INDHOUS ), LHTRD, 
+     $                    WORK( INDTAU ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWRK ), LLWORK, IINFO )
 *
 *     For eigenvalues only, call DSTERF.  For eigenvectors, first call
@@ -323,7 +326,8 @@ SUBROUTINE ZHEEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       IF( .NOT.WANTZ ) THEN
          CALL DSTERF( N, W, RWORK( INDE ), INFO )
       ELSE
-         CALL ZUNGTR( UPLO, N, A, LDA, WORK( INDTAU ), WORK( INDWRK ),
+         CALL ZUNGTR( UPLO, N, A, LDA, WORK( INDTAU ),
+     $                WORK( INDWRK ),
      $                LLWORK, IINFO )
          INDWRK = INDE + N
          CALL ZSTEQR( JOBZ, N, W, RWORK( INDE ), A, LDA,
diff --git a/SRC/zheevd.f b/SRC/zheevd.f
index a6484eb032..f8f69417e8 100644
--- a/SRC/zheevd.f
+++ b/SRC/zheevd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHEEVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zheevd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zheevd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -41,12 +39,6 @@
 *> complex Hermitian matrix A.  If eigenvectors are desired, it uses a
 *> divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -122,8 +114,7 @@
 *>
 *> \param[out] RWORK
 *> \verbatim
-*>          RWORK is DOUBLE PRECISION array,
-*>                                         dimension (LRWORK)
+*>          RWORK is DOUBLE PRECISION array, dimension (MAX(1,LRWORK))
 *>          On exit, if INFO = 0, RWORK(1) returns the optimal LRWORK.
 *> \endverbatim
 *>
@@ -186,7 +177,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEeigen
+*> \ingroup heevd
 *
 *> \par Further Details:
 *  =====================
@@ -200,8 +191,10 @@
 *> at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE ZHEEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
+      SUBROUTINE ZHEEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
+     $                   RWORK,
      $                   LRWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -240,7 +233,8 @@ SUBROUTINE ZHEEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
       EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANHE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSCAL, DSTERF, XERBLA, ZHETRD, ZLACPY, ZLASCL,
+      EXTERNAL           DSCAL, DSTERF, XERBLA, ZHETRD, ZLACPY,
+     $                   ZLASCL,
      $                   ZSTEDC, ZUNMTR
 *     ..
 *     .. Intrinsic Functions ..
@@ -284,12 +278,13 @@ SUBROUTINE ZHEEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
                LIWMIN = 1
             END IF
             LOPT = MAX( LWMIN, N +
-     $                  ILAENV( 1, 'ZHETRD', UPLO, N, -1, -1, -1 ) )
+     $                  N*ILAENV( 1, 'ZHETRD', UPLO, N, -1, -1,
+     $                            -1 ) )
             LROPT = LRWMIN
             LIOPT = LIWMIN
          END IF
          WORK( 1 ) = LOPT
-         RWORK( 1 ) = LROPT
+         RWORK( 1 ) = REAL( LROPT )
          IWORK( 1 ) = LIOPT
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -385,7 +380,7 @@ SUBROUTINE ZHEEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
       END IF
 *
       WORK( 1 ) = LOPT
-      RWORK( 1 ) = LROPT
+      RWORK( 1 ) = REAL( LROPT )
       IWORK( 1 ) = LIOPT
 *
       RETURN
diff --git a/SRC/zheevd_2stage.f b/SRC/zheevd_2stage.f
index 9859b0d67f..216109914e 100644
--- a/SRC/zheevd_2stage.f
+++ b/SRC/zheevd_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHEEVD_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zheevd_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zheevd_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -46,12 +44,6 @@
 *> the reduction to tridiagonal.  If eigenvectors are desired, it uses a
 *> divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -119,8 +111,8 @@
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + N+1
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + N+1
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -202,7 +194,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEeigen
+*> \ingroup heevd_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -231,7 +223,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -239,16 +231,17 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE ZHEEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
+      SUBROUTINE ZHEEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK,
+     $                          LWORK,
      $                   RWORK, LRWORK, IWORK, LIWORK, INFO )
 *
       IMPLICIT NONE
@@ -293,11 +286,12 @@ SUBROUTINE ZHEEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       EXTERNAL           LSAME, DLAMCH, ZLANHE, ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSCAL, DSTERF, XERBLA, ZLACPY, ZLASCL,
+      EXTERNAL           DSCAL, DSTERF, XERBLA, ZLACPY,
+     $                   ZLASCL,
      $                   ZSTEDC, ZUNMTR, ZHETRD_2STAGE
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DBLE, MAX, SQRT 
+      INTRINSIC          DBLE, MAX, SQRT
 *     ..
 *     .. Executable Statements ..
 *
@@ -343,7 +337,7 @@ SUBROUTINE ZHEEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
             END IF
          END IF
          WORK( 1 )  = LWMIN
-         RWORK( 1 ) = LRWMIN
+         RWORK( 1 ) = REAL( LRWMIN )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -410,7 +404,7 @@ SUBROUTINE ZHEEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       LLWRK2  = LWORK - INDWK2 + 1
 *
       CALL ZHETRD_2STAGE( JOBZ, UPLO, N, A, LDA, W, RWORK( INDE ),
-     $                    WORK( INDTAU ), WORK( INDHOUS ), LHTRD, 
+     $                    WORK( INDTAU ), WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWRK ), LLWORK, IINFO )
 *
 *     For eigenvalues only, call DSTERF.  For eigenvectors, first call
@@ -442,7 +436,7 @@ SUBROUTINE ZHEEVD_2STAGE( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK,
       END IF
 *
       WORK( 1 )  = LWMIN
-      RWORK( 1 ) = LRWMIN
+      RWORK( 1 ) = REAL( LRWMIN )
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/zheevr.f b/SRC/zheevr.f
index 1452e04a33..603424126c 100644
--- a/SRC/zheevr.f
+++ b/SRC/zheevr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHEEVR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zheevr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zheevr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -41,9 +39,16 @@
 *> \verbatim
 *>
 *> ZHEEVR computes selected eigenvalues and, optionally, eigenvectors
-*> of a complex Hermitian matrix A.  Eigenvalues and eigenvectors can
-*> be selected by specifying either a range of values or a range of
-*> indices for the desired eigenvalues.
+*> of a complex Hermitian matrix A. Eigenvalues and eigenvectors can be
+*> selected by specifying either a range of values or a range of indices
+*> for the desired eigenvalues. Invocations with different choices for
+*> these parameters may result in the computation of slightly different
+*> eigenvalues and/or eigenvectors for the same matrix. The reason for
+*> this behavior is that there exists a variety of algorithms (each
+*> performing best for a particular set of options) with ZHEEVR
+*> attempting to select the best based on the various parameters. In all
+*> cases, the computed values are accurate within the limits of finite
+*> precision arithmetic.
 *>
 *> ZHEEVR first reduces the matrix A to tridiagonal form T with a call
 *> to ZHETRD.  Then, whenever possible, ZHEEVR calls ZSTEMR to compute
@@ -107,6 +112,9 @@
 *>          JOBZ is CHARACTER*1
 *>          = 'N':  Compute eigenvalues only;
 *>          = 'V':  Compute eigenvalues and eigenvectors.
+*>
+*>          This parameter influences the choice of the algorithm and
+*>          may alter the computed values.
 *> \endverbatim
 *>
 *> \param[in] RANGE
@@ -118,6 +126,9 @@
 *>          = 'I': the IL-th through IU-th eigenvalues will be found.
 *>          For RANGE = 'V' or 'I' and IU - IL < N - 1, DSTEBZ and
 *>          ZSTEIN are called
+*>
+*>          This parameter influences the choice of the algorithm and
+*>          may alter the computed values.
 *> \endverbatim
 *>
 *> \param[in] UPLO
@@ -242,6 +253,7 @@
 *>          Note: the user must ensure that at least max(1,M) columns are
 *>          supplied in the array Z; if RANGE = 'V', the exact value of M
 *>          is not known in advance and an upper bound must be used.
+*>          Supplying N columns is always safe.
 *> \endverbatim
 *>
 *> \param[in] LDZ
@@ -272,7 +284,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of the array WORK.  LWORK >= max(1,2*N).
+*>          The length of the array WORK.
+*>          If N <= 1, LWORK >= 1, else LWORK >= 2*N.
 *>          For optimal efficiency, LWORK >= (NB+1)*N,
 *>          where NB is the max of the blocksize for ZHETRD and for
 *>          ZUNMTR as returned by ILAENV.
@@ -294,7 +307,8 @@
 *> \param[in] LRWORK
 *> \verbatim
 *>          LRWORK is INTEGER
-*>          The length of the array RWORK.  LRWORK >= max(1,24*N).
+*>          The length of the array RWORK.
+*>          If N <= 1, LRWORK >= 1, else LRWORK >= 24*N.
 *>
 *>          If LRWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal sizes of the WORK, RWORK
@@ -313,7 +327,8 @@
 *> \param[in] LIWORK
 *> \verbatim
 *>          LIWORK is INTEGER
-*>          The dimension of the array IWORK.  LIWORK >= max(1,10*N).
+*>          The dimension of the array IWORK.
+*>          If N <= 1, LIWORK >= 1, else LIWORK >= 10*N.
 *>
 *>          If LIWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal sizes of the WORK, RWORK
@@ -338,7 +353,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEeigen
+*> \ingroup heevr
 *
 *> \par Contributors:
 *  ==================
@@ -351,9 +366,11 @@
 *>       California at Berkeley, USA \n
 *>
 *  =====================================================================
-      SUBROUTINE ZHEEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
+      SUBROUTINE ZHEEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL,
+     $                   IU,
      $                   ABSTOL, M, W, Z, LDZ, ISUPPZ, WORK, LWORK,
      $                   RWORK, LRWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -396,7 +413,8 @@ SUBROUTINE ZHEEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
       EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANSY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTERF, XERBLA, ZDSCAL,
+      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTERF, XERBLA,
+     $                   ZDSCAL,
      $                   ZHETRD, ZSTEMR, ZSTEIN, ZSWAP, ZUNMTR
 *     ..
 *     .. Intrinsic Functions ..
@@ -417,9 +435,15 @@ SUBROUTINE ZHEEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
       LQUERY = ( ( LWORK.EQ.-1 ) .OR. ( LRWORK.EQ.-1 ) .OR.
      $         ( LIWORK.EQ.-1 ) )
 *
-      LRWMIN = MAX( 1, 24*N )
-      LIWMIN = MAX( 1, 10*N )
-      LWMIN = MAX( 1, 2*N )
+      IF( N.LE.1 ) THEN
+         LWMIN  = 1
+         LRWMIN = 1
+         LIWMIN = 1
+      ELSE
+         LWMIN  = 2*N
+         LRWMIN = 24*N
+         LIWMIN = 10*N
+      END IF
 *
       INFO = 0
       IF( .NOT.( WANTZ .OR. LSAME( JOBZ, 'N' ) ) ) THEN
@@ -454,8 +478,8 @@ SUBROUTINE ZHEEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
          NB = ILAENV( 1, 'ZHETRD', UPLO, N, -1, -1, -1 )
          NB = MAX( NB, ILAENV( 1, 'ZUNMTR', UPLO, N, -1, -1, -1 ) )
          LWKOPT = MAX( ( NB+1 )*N, LWMIN )
-         WORK( 1 ) = LWKOPT
-         RWORK( 1 ) = LRWMIN
+         WORK( 1 )  = LWKOPT
+         RWORK( 1 ) = REAL( LRWMIN )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -483,7 +507,7 @@ SUBROUTINE ZHEEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
       END IF
 *
       IF( N.EQ.1 ) THEN
-         WORK( 1 ) = 2
+         WORK( 1 ) = 1
          IF( ALLEIG .OR. INDEIG ) THEN
             M = 1
             W( 1 ) = DBLE( A( 1, 1 ) )
@@ -667,7 +691,8 @@ SUBROUTINE ZHEEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *
          INDWKN = INDWK
          LLWRKN = LWORK - INDWKN + 1
-         CALL ZUNMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ), Z,
+         CALL ZUNMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ),
+     $                Z,
      $                LDZ, WORK( INDWKN ), LLWRKN, IINFO )
       END IF
 *
@@ -710,8 +735,8 @@ SUBROUTINE ZHEEVR( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *
 *     Set WORK(1) to optimal workspace size.
 *
-      WORK( 1 ) = LWKOPT
-      RWORK( 1 ) = LRWMIN
+      WORK( 1 )  = LWKOPT
+      RWORK( 1 ) = REAL( LRWMIN )
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/zheevr_2stage.f b/SRC/zheevr_2stage.f
index 5c576e633b..b520f1228d 100644
--- a/SRC/zheevr_2stage.f
+++ b/SRC/zheevr_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHEEVR_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zheevr_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zheevr_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -265,7 +263,7 @@
 *>          indicating the nonzero elements in Z. The i-th eigenvector
 *>          is nonzero only in elements ISUPPZ( 2*i-1 ) through
 *>          ISUPPZ( 2*i ). This is an output of ZSTEMR (tridiagonal
-*>          matrix). The support of the eigenvectors of A is typically 
+*>          matrix). The support of the eigenvectors of A is typically
 *>          1:N because of the unitary transformations applied by ZUNMTR.
 *>          Implemented only for RANGE = 'A' or 'I' and IU - IL = N - 1
 *> \endverbatim
@@ -279,12 +277,13 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  
+*>          The dimension of the array WORK.
+*>          If N <= 1,               LWORK must be at least 1.
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, 26*N, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + N
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + N
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -310,7 +309,8 @@
 *> \param[in] LRWORK
 *> \verbatim
 *>          LRWORK is INTEGER
-*>          The length of the array RWORK.  LRWORK >= max(1,24*N).
+*>          The length of the array RWORK.
+*>          If N <= 1, LRWORK >= 1, else LRWORK >= 24*N.
 *>
 *>          If LRWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal sizes of the WORK, RWORK
@@ -329,7 +329,8 @@
 *> \param[in] LIWORK
 *> \verbatim
 *>          LIWORK is INTEGER
-*>          The dimension of the array IWORK.  LIWORK >= max(1,10*N).
+*>          The dimension of the array IWORK.
+*>          If N <= 1, LIWORK >= 1, else LIWORK >= 10*N.
 *>
 *>          If LIWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal sizes of the WORK, RWORK
@@ -354,7 +355,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEeigen
+*> \ingroup heevr_2stage
 *
 *> \par Contributors:
 *  ==================
@@ -382,7 +383,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -390,11 +391,11 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
@@ -444,10 +445,12 @@ SUBROUTINE ZHEEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       LOGICAL            LSAME
       INTEGER            ILAENV, ILAENV2STAGE
       DOUBLE PRECISION   DLAMCH, ZLANSY
-      EXTERNAL           LSAME, DLAMCH, ZLANSY, ILAENV, ILAENV2STAGE
+      EXTERNAL           LSAME, DLAMCH, ZLANSY, ILAENV,
+     $                   ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTERF, XERBLA, ZDSCAL,
+      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTERF, XERBLA,
+     $                   ZDSCAL,
      $                   ZHETRD_2STAGE, ZSTEMR, ZSTEIN, ZSWAP, ZUNMTR
 *     ..
 *     .. Intrinsic Functions ..
@@ -468,13 +471,24 @@ SUBROUTINE ZHEEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       LQUERY = ( ( LWORK.EQ.-1 ) .OR. ( LRWORK.EQ.-1 ) .OR.
      $         ( LIWORK.EQ.-1 ) )
 *
-      KD     = ILAENV2STAGE( 1, 'ZHETRD_2STAGE', JOBZ, N, -1, -1, -1 )
-      IB     = ILAENV2STAGE( 2, 'ZHETRD_2STAGE', JOBZ, N, KD, -1, -1 )
-      LHTRD  = ILAENV2STAGE( 3, 'ZHETRD_2STAGE', JOBZ, N, KD, IB, -1 )
-      LWTRD  = ILAENV2STAGE( 4, 'ZHETRD_2STAGE', JOBZ, N, KD, IB, -1 )
-      LWMIN  = N + LHTRD + LWTRD
-      LRWMIN = MAX( 1, 24*N )
-      LIWMIN = MAX( 1, 10*N )
+      KD     = ILAENV2STAGE( 1, 'ZHETRD_2STAGE', JOBZ, N, -1, -1,
+     $                       -1 )
+      IB     = ILAENV2STAGE( 2, 'ZHETRD_2STAGE', JOBZ, N, KD, -1,
+     $                       -1 )
+      LHTRD  = ILAENV2STAGE( 3, 'ZHETRD_2STAGE', JOBZ, N, KD, IB,
+     $                       -1 )
+      LWTRD  = ILAENV2STAGE( 4, 'ZHETRD_2STAGE', JOBZ, N, KD, IB,
+     $                       -1 )
+*
+      IF( N.LE.1 ) THEN
+         LWMIN  = 1
+         LRWMIN = 1
+         LIWMIN = 1
+      ELSE
+         LWMIN  = N + LHTRD + LWTRD
+         LRWMIN = 24*N
+         LIWMIN = 10*N
+      END IF
 *
       INFO = 0
       IF( .NOT.( LSAME( JOBZ, 'N' ) ) ) THEN
@@ -507,7 +521,7 @@ SUBROUTINE ZHEEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *
       IF( INFO.EQ.0 ) THEN
          WORK( 1 )  = LWMIN
-         RWORK( 1 ) = LRWMIN
+         RWORK( 1 ) = REAL( LRWMIN )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -535,7 +549,7 @@ SUBROUTINE ZHEEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       END IF
 *
       IF( N.EQ.1 ) THEN
-         WORK( 1 ) = 2
+         WORK( 1 ) = 1
          IF( ALLEIG .OR. INDEIG ) THEN
             M = 1
             W( 1 ) = DBLE( A( 1, 1 ) )
@@ -643,9 +657,9 @@ SUBROUTINE ZHEEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *
 *     Call ZHETRD_2STAGE to reduce Hermitian matrix to tridiagonal form.
 *
-      CALL ZHETRD_2STAGE( JOBZ, UPLO, N, A, LDA, RWORK( INDRD ), 
+      CALL ZHETRD_2STAGE( JOBZ, UPLO, N, A, LDA, RWORK( INDRD ),
      $                    RWORK( INDRE ), WORK( INDTAU ),
-     $                    WORK( INDHOUS ), LHTRD, 
+     $                    WORK( INDHOUS ), LHTRD,
      $                    WORK( INDWK ), LLWORK, IINFO )
 *
 *     If all eigenvalues are desired
@@ -722,7 +736,8 @@ SUBROUTINE ZHEEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *
          INDWKN = INDWK
          LLWRKN = LWORK - INDWKN + 1
-         CALL ZUNMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ), Z,
+         CALL ZUNMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ),
+     $                Z,
      $                LDZ, WORK( INDWKN ), LLWRKN, IINFO )
       END IF
 *
@@ -766,7 +781,7 @@ SUBROUTINE ZHEEVR_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *     Set WORK(1) to optimal workspace size.
 *
       WORK( 1 )  = LWMIN
-      RWORK( 1 ) = LRWMIN
+      RWORK( 1 ) = REAL( LRWMIN )
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/zheevx.f b/SRC/zheevx.f
index 71c358b371..c0ea5179e4 100644
--- a/SRC/zheevx.f
+++ b/SRC/zheevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHEEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zheevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zheevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -250,12 +248,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEeigen
+*> \ingroup heevx
 *
 *  =====================================================================
-      SUBROUTINE ZHEEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
+      SUBROUTINE ZHEEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL,
+     $                   IU,
      $                   ABSTOL, M, W, Z, LDZ, WORK, LWORK, RWORK,
      $                   IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -298,7 +298,8 @@ SUBROUTINE ZHEEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
       EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANHE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTERF, XERBLA, ZDSCAL,
+      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTERF, XERBLA,
+     $                   ZDSCAL,
      $                   ZHETRD, ZLACPY, ZSTEIN, ZSTEQR, ZSWAP, ZUNGTR,
      $                   ZUNMTR
 *     ..
@@ -352,7 +353,8 @@ SUBROUTINE ZHEEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
          ELSE
             LWKMIN = 2*N
             NB = ILAENV( 1, 'ZHETRD', UPLO, N, -1, -1, -1 )
-            NB = MAX( NB, ILAENV( 1, 'ZUNMTR', UPLO, N, -1, -1, -1 ) )
+            NB = MAX( NB, ILAENV( 1, 'ZUNMTR', UPLO, N, -1, -1,
+     $                -1 ) )
             LWKOPT = MAX( 1, ( NB + 1 )*N )
             WORK( 1 ) = LWKOPT
          END IF
@@ -504,7 +506,8 @@ SUBROUTINE ZHEEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
 *        Apply unitary matrix used in reduction to tridiagonal
 *        form to eigenvectors returned by ZSTEIN.
 *
-         CALL ZUNMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ), Z,
+         CALL ZUNMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ),
+     $                Z,
      $                LDZ, WORK( INDWRK ), LLWORK, IINFO )
       END IF
 *
diff --git a/SRC/zheevx_2stage.f b/SRC/zheevx_2stage.f
index 1d4dfe9c59..5da0b5701d 100644
--- a/SRC/zheevx_2stage.f
+++ b/SRC/zheevx_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHEEVX_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zheevx_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zheevx_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -209,12 +207,12 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, 8*N, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + N
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + N
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -265,7 +263,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEeigen
+*> \ingroup heevx_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -283,7 +281,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -291,11 +289,11 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
@@ -335,7 +333,7 @@ SUBROUTINE ZHEEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       CHARACTER          ORDER
       INTEGER            I, IINFO, IMAX, INDD, INDE, INDEE, INDIBL,
      $                   INDISP, INDIWK, INDRWK, INDTAU, INDWRK, ISCALE,
-     $                   ITMP1, J, JJ, LLWORK, 
+     $                   ITMP1, J, JJ, LLWORK,
      $                   NSPLIT, LWMIN, LHTRD, LWTRD, KD, IB, INDHOUS
       DOUBLE PRECISION   ABSTLL, ANRM, BIGNUM, EPS, RMAX, RMIN, SAFMIN,
      $                   SIGMA, SMLNUM, TMP1, VLL, VUU
@@ -347,7 +345,8 @@ SUBROUTINE ZHEEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       EXTERNAL           LSAME, DLAMCH, ZLANHE, ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTERF, XERBLA, ZDSCAL,
+      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTERF, XERBLA,
+     $                   ZDSCAL,
      $                   ZLACPY, ZSTEIN, ZSTEQR, ZSWAP, ZUNGTR, ZUNMTR,
      $                   ZHETRD_2STAGE
 *     ..
@@ -499,7 +498,7 @@ SUBROUTINE ZHEEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
       LLWORK  = LWORK - INDWRK + 1
 *
       CALL ZHETRD_2STAGE( JOBZ, UPLO, N, A, LDA, RWORK( INDD ),
-     $                    RWORK( INDE ), WORK( INDTAU ), 
+     $                    RWORK( INDE ), WORK( INDTAU ),
      $                    WORK( INDHOUS ), LHTRD, WORK( INDWRK ),
      $                    LLWORK, IINFO )
 *
@@ -562,7 +561,8 @@ SUBROUTINE ZHEEVX_2STAGE( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU,
 *        Apply unitary matrix used in reduction to tridiagonal
 *        form to eigenvectors returned by ZSTEIN.
 *
-         CALL ZUNMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ), Z,
+         CALL ZUNMTR( 'L', UPLO, 'N', N, M, A, LDA, WORK( INDTAU ),
+     $                Z,
      $                LDZ, WORK( INDWRK ), LLWORK, IINFO )
       END IF
 *
diff --git a/SRC/zhegs2.f b/SRC/zhegs2.f
index ba1c3fb017..8c4e04ae5a 100644
--- a/SRC/zhegs2.f
+++ b/SRC/zhegs2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHEGS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhegs2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhegs2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hegs2
 *
 *  =====================================================================
       SUBROUTINE ZHEGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -153,7 +152,8 @@ SUBROUTINE ZHEGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
       COMPLEX*16         CT
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZDSCAL, ZHER2, ZLACGV, ZTRMV,
+      EXTERNAL           XERBLA, ZAXPY, ZDSCAL, ZHER2, ZLACGV,
+     $                   ZTRMV,
      $                   ZTRSV
 *     ..
 *     .. Intrinsic Functions ..
@@ -210,7 +210,8 @@ SUBROUTINE ZHEGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
                   CALL ZAXPY( N-K, CT, B( K, K+1 ), LDB, A( K, K+1 ),
      $                        LDA )
                   CALL ZLACGV( N-K, B( K, K+1 ), LDB )
-                  CALL ZTRSV( UPLO, 'Conjugate transpose', 'Non-unit',
+                  CALL ZTRSV( UPLO, 'Conjugate transpose',
+     $                        'Non-unit',
      $                        N-K, B( K+1, K+1 ), LDB, A( K, K+1 ),
      $                        LDA )
                   CALL ZLACGV( N-K, A( K, K+1 ), LDA )
@@ -231,10 +232,12 @@ SUBROUTINE ZHEGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
                IF( K.LT.N ) THEN
                   CALL ZDSCAL( N-K, ONE / BKK, A( K+1, K ), 1 )
                   CT = -HALF*AKK
-                  CALL ZAXPY( N-K, CT, B( K+1, K ), 1, A( K+1, K ), 1 )
+                  CALL ZAXPY( N-K, CT, B( K+1, K ), 1, A( K+1, K ),
+     $                        1 )
                   CALL ZHER2( UPLO, N-K, -CONE, A( K+1, K ), 1,
      $                        B( K+1, K ), 1, A( K+1, K+1 ), LDA )
-                  CALL ZAXPY( N-K, CT, B( K+1, K ), 1, A( K+1, K ), 1 )
+                  CALL ZAXPY( N-K, CT, B( K+1, K ), 1, A( K+1, K ),
+     $                        1 )
                   CALL ZTRSV( UPLO, 'No transpose', 'Non-unit', N-K,
      $                        B( K+1, K+1 ), LDB, A( K+1, K ), 1 )
                END IF
@@ -255,7 +258,8 @@ SUBROUTINE ZHEGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
      $                     LDB, A( 1, K ), 1 )
                CT = HALF*AKK
                CALL ZAXPY( K-1, CT, B( 1, K ), 1, A( 1, K ), 1 )
-               CALL ZHER2( UPLO, K-1, CONE, A( 1, K ), 1, B( 1, K ), 1,
+               CALL ZHER2( UPLO, K-1, CONE, A( 1, K ), 1, B( 1, K ),
+     $                     1,
      $                     A, LDA )
                CALL ZAXPY( K-1, CT, B( 1, K ), 1, A( 1, K ), 1 )
                CALL ZDSCAL( K-1, BKK, A( 1, K ), 1 )
@@ -272,12 +276,14 @@ SUBROUTINE ZHEGS2( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
                AKK = DBLE( A( K, K ) )
                BKK = DBLE( B( K, K ) )
                CALL ZLACGV( K-1, A( K, 1 ), LDA )
-               CALL ZTRMV( UPLO, 'Conjugate transpose', 'Non-unit', K-1,
+               CALL ZTRMV( UPLO, 'Conjugate transpose', 'Non-unit',
+     $                     K-1,
      $                     B, LDB, A( K, 1 ), LDA )
                CT = HALF*AKK
                CALL ZLACGV( K-1, B( K, 1 ), LDB )
                CALL ZAXPY( K-1, CT, B( K, 1 ), LDB, A( K, 1 ), LDA )
-               CALL ZHER2( UPLO, K-1, CONE, A( K, 1 ), LDA, B( K, 1 ),
+               CALL ZHER2( UPLO, K-1, CONE, A( K, 1 ), LDA, B( K,
+     $                     1 ),
      $                     LDB, A, LDA )
                CALL ZAXPY( K-1, CT, B( K, 1 ), LDB, A( K, 1 ), LDA )
                CALL ZLACGV( K-1, B( K, 1 ), LDB )
diff --git a/SRC/zhegst.f b/SRC/zhegst.f
index 0d167e8c52..a6cdbb9d37 100644
--- a/SRC/zhegst.f
+++ b/SRC/zhegst.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHEGST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhegst.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhegst.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hegst
 *
 *  =====================================================================
       SUBROUTINE ZHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -152,7 +151,8 @@ SUBROUTINE ZHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
       INTEGER            K, KB, NB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZHEGS2, ZHEMM, ZHER2K, ZTRMM, ZTRSM
+      EXTERNAL           XERBLA, ZHEGS2, ZHEMM, ZHER2K, ZTRMM,
+     $                   ZTRSM
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -221,7 +221,8 @@ SUBROUTINE ZHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
                      CALL ZHEMM( 'Left', UPLO, KB, N-K-KB+1, -HALF,
      $                           A( K, K ), LDA, B( K, K+KB ), LDB,
      $                           CONE, A( K, K+KB ), LDA )
-                     CALL ZHER2K( UPLO, 'Conjugate transpose', N-K-KB+1,
+                     CALL ZHER2K( UPLO, 'Conjugate transpose',
+     $                            N-K-KB+1,
      $                            KB, -CONE, A( K, K+KB ), LDA,
      $                            B( K, K+KB ), LDB, ONE,
      $                            A( K+KB, K+KB ), LDA )
@@ -246,7 +247,8 @@ SUBROUTINE ZHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
                   CALL ZHEGS2( ITYPE, UPLO, KB, A( K, K ), LDA,
      $                         B( K, K ), LDB, INFO )
                   IF( K+KB.LE.N ) THEN
-                     CALL ZTRSM( 'Right', UPLO, 'Conjugate transpose',
+                     CALL ZTRSM( 'Right', UPLO,
+     $                           'Conjugate transpose',
      $                           'Non-unit', N-K-KB+1, KB, CONE,
      $                           B( K, K ), LDB, A( K+KB, K ), LDA )
                      CALL ZHEMM( 'Right', UPLO, N-K-KB+1, KB, -HALF,
@@ -276,15 +278,18 @@ SUBROUTINE ZHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
 *
 *                 Update the upper triangle of A(1:k+kb-1,1:k+kb-1)
 *
-                  CALL ZTRMM( 'Left', UPLO, 'No transpose', 'Non-unit',
+                  CALL ZTRMM( 'Left', UPLO, 'No transpose',
+     $                        'Non-unit',
      $                        K-1, KB, CONE, B, LDB, A( 1, K ), LDA )
-                  CALL ZHEMM( 'Right', UPLO, K-1, KB, HALF, A( K, K ),
+                  CALL ZHEMM( 'Right', UPLO, K-1, KB, HALF, A( K,
+     $                        K ),
      $                        LDA, B( 1, K ), LDB, CONE, A( 1, K ),
      $                        LDA )
                   CALL ZHER2K( UPLO, 'No transpose', K-1, KB, CONE,
      $                         A( 1, K ), LDA, B( 1, K ), LDB, ONE, A,
      $                         LDA )
-                  CALL ZHEMM( 'Right', UPLO, K-1, KB, HALF, A( K, K ),
+                  CALL ZHEMM( 'Right', UPLO, K-1, KB, HALF, A( K,
+     $                        K ),
      $                        LDA, B( 1, K ), LDB, CONE, A( 1, K ),
      $                        LDA )
                   CALL ZTRMM( 'Right', UPLO, 'Conjugate transpose',
@@ -302,7 +307,8 @@ SUBROUTINE ZHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
 *
 *                 Update the lower triangle of A(1:k+kb-1,1:k+kb-1)
 *
-                  CALL ZTRMM( 'Right', UPLO, 'No transpose', 'Non-unit',
+                  CALL ZTRMM( 'Right', UPLO, 'No transpose',
+     $                        'Non-unit',
      $                        KB, K-1, CONE, B, LDB, A( K, 1 ), LDA )
                   CALL ZHEMM( 'Left', UPLO, KB, K-1, HALF, A( K, K ),
      $                        LDA, B( K, 1 ), LDB, CONE, A( K, 1 ),
diff --git a/SRC/zhegv.f b/SRC/zhegv.f
index 41657e3be7..bdf7718164 100644
--- a/SRC/zhegv.f
+++ b/SRC/zhegv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHEGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhegv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhegv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,7 +158,7 @@
 *>                    i off-diagonal elements of an intermediate
 *>                    tridiagonal form did not converge to zero;
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -173,11 +171,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEeigen
+*> \ingroup hegv
 *
 *  =====================================================================
-      SUBROUTINE ZHEGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
+      SUBROUTINE ZHEGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
+     $                  WORK,
      $                  LWORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -209,7 +209,8 @@ SUBROUTINE ZHEGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZHEEV, ZHEGST, ZPOTRF, ZTRMM, ZTRSM
+      EXTERNAL           XERBLA, ZHEEV, ZHEGST, ZPOTRF, ZTRMM,
+     $                   ZTRSM
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -270,7 +271,8 @@ SUBROUTINE ZHEGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL ZHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
-      CALL ZHEEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK, INFO )
+      CALL ZHEEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
+     $            INFO )
 *
       IF( WANTZ ) THEN
 *
@@ -290,7 +292,8 @@ SUBROUTINE ZHEGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
                TRANS = 'C'
             END IF
 *
-            CALL ZTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG, ONE,
+            CALL ZTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG,
+     $                  ONE,
      $                  B, LDB, A, LDA )
 *
          ELSE IF( ITYPE.EQ.3 ) THEN
@@ -304,7 +307,8 @@ SUBROUTINE ZHEGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
                TRANS = 'N'
             END IF
 *
-            CALL ZTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG, ONE,
+            CALL ZTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG,
+     $                  ONE,
      $                  B, LDB, A, LDA )
          END IF
       END IF
diff --git a/SRC/zhegv_2stage.f b/SRC/zhegv_2stage.f
index fda651e5eb..c8e043745a 100644
--- a/SRC/zhegv_2stage.f
+++ b/SRC/zhegv_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHEGV_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhegv_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhegv_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,12 +142,12 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK. LWORK >= 1, when N <= 1;
-*>          otherwise  
+*>          otherwise
 *>          If JOBZ = 'N' and N > 1, LWORK must be queried.
 *>                                   LWORK = MAX(1, dimension) where
 *>                                   dimension = max(stage1,stage2) + (KD+1)*N + N
-*>                                             = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                                               + max(2*KD*KD, KD*NTHREADS) 
+*>                                             = N*KD + N*max(KD+1,FACTOPTNB)
+*>                                               + max(2*KD*KD, KD*NTHREADS)
 *>                                               + (KD+1)*N + N
 *>                                   where KD is the blocking size of the reduction,
 *>                                   FACTOPTNB is the blocking used by the QR or LQ
@@ -179,7 +177,7 @@
 *>                    i off-diagonal elements of an intermediate
 *>                    tridiagonal form did not converge to zero;
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -192,7 +190,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEeigen
+*> \ingroup hegv_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -210,7 +208,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -218,16 +216,17 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE ZHEGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
+      SUBROUTINE ZHEGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB,
+     $                         W,
      $                         WORK, LWORK, RWORK, INFO )
 *
       IMPLICIT NONE
@@ -262,7 +261,8 @@ SUBROUTINE ZHEGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
       EXTERNAL           LSAME, ILAENV2STAGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZHEGST, ZPOTRF, ZTRMM, ZTRSM,
+      EXTERNAL           XERBLA, ZHEGST, ZPOTRF, ZTRMM,
+     $                   ZTRSM,
      $                   ZHEEV_2STAGE
 *     ..
 *     .. Intrinsic Functions ..
@@ -292,10 +292,14 @@ SUBROUTINE ZHEGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         KD    = ILAENV2STAGE( 1, 'ZHETRD_2STAGE', JOBZ, N, -1, -1, -1 )
-         IB    = ILAENV2STAGE( 2, 'ZHETRD_2STAGE', JOBZ, N, KD, -1, -1 )
-         LHTRD = ILAENV2STAGE( 3, 'ZHETRD_2STAGE', JOBZ, N, KD, IB, -1 )
-         LWTRD = ILAENV2STAGE( 4, 'ZHETRD_2STAGE', JOBZ, N, KD, IB, -1 )
+         KD    = ILAENV2STAGE( 1, 'ZHETRD_2STAGE', JOBZ, N, -1, -1,
+     $                         -1 )
+         IB    = ILAENV2STAGE( 2, 'ZHETRD_2STAGE', JOBZ, N, KD, -1,
+     $                         -1 )
+         LHTRD = ILAENV2STAGE( 3, 'ZHETRD_2STAGE', JOBZ, N, KD, IB,
+     $                         -1 )
+         LWTRD = ILAENV2STAGE( 4, 'ZHETRD_2STAGE', JOBZ, N, KD, IB,
+     $                         -1 )
          LWMIN = N + LHTRD + LWTRD
          WORK( 1 )  = LWMIN
 *
@@ -327,7 +331,7 @@ SUBROUTINE ZHEGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL ZHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
-      CALL ZHEEV_2STAGE( JOBZ, UPLO, N, A, LDA, W, 
+      CALL ZHEEV_2STAGE( JOBZ, UPLO, N, A, LDA, W,
      $                   WORK, LWORK, RWORK, INFO )
 *
       IF( WANTZ ) THEN
@@ -348,7 +352,8 @@ SUBROUTINE ZHEGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
                TRANS = 'C'
             END IF
 *
-            CALL ZTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG, ONE,
+            CALL ZTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG,
+     $                  ONE,
      $                  B, LDB, A, LDA )
 *
          ELSE IF( ITYPE.EQ.3 ) THEN
@@ -362,7 +367,8 @@ SUBROUTINE ZHEGV_2STAGE( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
                TRANS = 'N'
             END IF
 *
-            CALL ZTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG, ONE,
+            CALL ZTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, NEIG,
+     $                  ONE,
      $                  B, LDB, A, LDA )
          END IF
       END IF
diff --git a/SRC/zhegvd.f b/SRC/zhegvd.f
index 2e92255df8..208735b0e0 100644
--- a/SRC/zhegvd.f
+++ b/SRC/zhegvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHEGVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhegvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhegvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -43,12 +41,6 @@
 *> B are assumed to be Hermitian and B is also positive definite.
 *> If eigenvectors are desired, it uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -212,7 +204,7 @@
 *>                    the submatrix lying in rows and columns INFO/(N+1)
 *>                    through mod(INFO,N+1);
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -225,7 +217,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEeigen
+*> \ingroup hegvd
 *
 *> \par Further Details:
 *  =====================
@@ -244,8 +236,10 @@
 *>     Mark Fahey, Department of Mathematics, Univ. of Kentucky, USA
 *>
 *  =====================================================================
-      SUBROUTINE ZHEGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
+      SUBROUTINE ZHEGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W,
+     $                   WORK,
      $                   LWORK, RWORK, LRWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -277,7 +271,8 @@ SUBROUTINE ZHEGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZHEEVD, ZHEGST, ZPOTRF, ZTRMM, ZTRSM
+      EXTERNAL           XERBLA, ZHEEVD, ZHEGST, ZPOTRF, ZTRMM,
+     $                   ZTRSM
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, MAX
@@ -323,7 +318,7 @@ SUBROUTINE ZHEGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
 *
       IF( INFO.EQ.0 ) THEN
          WORK( 1 ) = LOPT
-         RWORK( 1 ) = LROPT
+         RWORK( 1 ) = REAL( LROPT )
          IWORK( 1 ) = LIOPT
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -358,11 +353,12 @@ SUBROUTINE ZHEGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL ZHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
-      CALL ZHEEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK, LRWORK,
+      CALL ZHEEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
+     $             LRWORK,
      $             IWORK, LIWORK, INFO )
-      LOPT = MAX( DBLE( LOPT ), DBLE( WORK( 1 ) ) )
-      LROPT = MAX( DBLE( LROPT ), DBLE( RWORK( 1 ) ) )
-      LIOPT = MAX( DBLE( LIOPT ), DBLE( IWORK( 1 ) ) )
+      LOPT = INT( MAX( DBLE( LOPT ), DBLE( WORK( 1 ) ) ) )
+      LROPT = INT( MAX( DBLE( LROPT ), DBLE( RWORK( 1 ) ) ) )
+      LIOPT = INT( MAX( DBLE( LIOPT ), DBLE( IWORK( 1 ) ) ) )
 *
       IF( WANTZ .AND. INFO.EQ.0 ) THEN
 *
@@ -399,7 +395,7 @@ SUBROUTINE ZHEGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
       END IF
 *
       WORK( 1 ) = LOPT
-      RWORK( 1 ) = LROPT
+      RWORK( 1 ) = REAL( LROPT )
       IWORK( 1 ) = LIOPT
 *
       RETURN
diff --git a/SRC/zhegvx.f b/SRC/zhegvx.f
index ac9f9ef1a2..b9b0834dc1 100644
--- a/SRC/zhegvx.f
+++ b/SRC/zhegvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHEGVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhegvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhegvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -280,7 +278,7 @@
 *>                    i eigenvectors failed to converge.  Their indices
 *>                    are stored in array IFAIL.
 *>             > N:   if INFO = N + i, for 1 <= i <= N, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -293,7 +291,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEeigen
+*> \ingroup hegvx
 *
 *> \par Contributors:
 *  ==================
@@ -304,6 +302,7 @@
       SUBROUTINE ZHEGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
      $                   VL, VU, IL, IU, ABSTOL, M, W, Z, LDZ, WORK,
      $                   LWORK, RWORK, IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -338,7 +337,8 @@ SUBROUTINE ZHEGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZHEEVX, ZHEGST, ZPOTRF, ZTRMM, ZTRSM
+      EXTERNAL           XERBLA, ZHEEVX, ZHEGST, ZPOTRF, ZTRMM,
+     $                   ZTRSM
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -422,7 +422,8 @@ SUBROUTINE ZHEGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL ZHEGST( ITYPE, UPLO, N, A, LDA, B, LDB, INFO )
-      CALL ZHEEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU, ABSTOL,
+      CALL ZHEEVX( JOBZ, RANGE, UPLO, N, A, LDA, VL, VU, IL, IU,
+     $             ABSTOL,
      $             M, W, Z, LDZ, WORK, LWORK, RWORK, IWORK, IFAIL,
      $             INFO )
 *
@@ -443,7 +444,8 @@ SUBROUTINE ZHEGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
                TRANS = 'C'
             END IF
 *
-            CALL ZTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, M, CONE, B,
+            CALL ZTRSM( 'Left', UPLO, TRANS, 'Non-unit', N, M, CONE,
+     $                  B,
      $                  LDB, Z, LDZ )
 *
          ELSE IF( ITYPE.EQ.3 ) THEN
@@ -457,7 +459,8 @@ SUBROUTINE ZHEGVX( ITYPE, JOBZ, RANGE, UPLO, N, A, LDA, B, LDB,
                TRANS = 'N'
             END IF
 *
-            CALL ZTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, M, CONE, B,
+            CALL ZTRMM( 'Left', UPLO, TRANS, 'Non-unit', N, M, CONE,
+     $                  B,
      $                  LDB, Z, LDZ )
          END IF
       END IF
diff --git a/SRC/zherfs.f b/SRC/zherfs.f
index b061e8764f..c5e67e5784 100644
--- a/SRC/zherfs.f
+++ b/SRC/zherfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHERFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zherfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zherfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -184,11 +182,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup herfs
 *
 *  =====================================================================
-      SUBROUTINE ZHERFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
+      SUBROUTINE ZHERFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
+     $                   LDB,
      $                   X, LDX, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -229,7 +229,8 @@ SUBROUTINE ZHERFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZHEMV, ZHETRS, ZLACN2
+      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZHEMV, ZHETRS,
+     $                   ZLACN2
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG, MAX
@@ -302,7 +303,8 @@ SUBROUTINE ZHERFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
 *        Compute residual R = B - A * X
 *
          CALL ZCOPY( N, B( 1, J ), 1, WORK, 1 )
-         CALL ZHEMV( UPLO, N, -ONE, A, LDA, X( 1, J ), 1, ONE, WORK, 1 )
+         CALL ZHEMV( UPLO, N, -ONE, A, LDA, X( 1, J ), 1, ONE, WORK,
+     $               1 )
 *
 *        Compute componentwise relative backward error from formula
 *
@@ -409,7 +411,8 @@ SUBROUTINE ZHERFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
 *
 *              Multiply by diag(W)*inv(A**H).
 *
-               CALL ZHETRS( UPLO, N, 1, AF, LDAF, IPIV, WORK, N, INFO )
+               CALL ZHETRS( UPLO, N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
                DO 110 I = 1, N
                   WORK( I ) = RWORK( I )*WORK( I )
   110          CONTINUE
@@ -420,7 +423,8 @@ SUBROUTINE ZHERFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
                DO 120 I = 1, N
                   WORK( I ) = RWORK( I )*WORK( I )
   120          CONTINUE
-               CALL ZHETRS( UPLO, N, 1, AF, LDAF, IPIV, WORK, N, INFO )
+               CALL ZHETRS( UPLO, N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
             END IF
             GO TO 100
          END IF
diff --git a/SRC/zherfsx.f b/SRC/zherfsx.f
index c02955e7ec..77a215fd55 100644
--- a/SRC/zherfsx.f
+++ b/SRC/zherfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHERFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zherfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zherfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -391,13 +389,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup herfsx
 *
 *  =====================================================================
-      SUBROUTINE ZHERFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE ZHERFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    S, B, LDB, X, LDX, RCOND, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -459,7 +459,8 @@ SUBROUTINE ZHERFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *     ..
 *     .. External Functions ..
       EXTERNAL           LSAME, ILAPREC
-      EXTERNAL           DLAMCH, ZLANHE, ZLA_HERCOND_X, ZLA_HERCOND_C
+      EXTERNAL           DLAMCH, ZLANHE, ZLA_HERCOND_X,
+     $                   ZLA_HERCOND_C
       DOUBLE PRECISION   DLAMCH, ZLANHE, ZLA_HERCOND_X, ZLA_HERCOND_C
       LOGICAL            LSAME
       INTEGER            ILAPREC
@@ -516,7 +517,8 @@ SUBROUTINE ZHERFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Test input parameters.
 *
-      IF (.NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF (.NOT.LSAME( UPLO, 'U' ) .AND.
+     $     .NOT.LSAME( UPLO, 'L' ) ) THEN
         INFO = -1
       ELSE IF( .NOT.RCEQU .AND. .NOT.LSAME( EQUED, 'N' ) ) THEN
         INFO = -2
@@ -602,16 +604,19 @@ SUBROUTINE ZHERFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
      $        INFO )
       END IF
 
-      ERR_LBND = MAX( 10.0D+0, SQRT( DBLE( N ) ) ) * DLAMCH( 'Epsilon' )
+      ERR_LBND = MAX( 10.0D+0,
+     $                SQRT( DBLE( N ) ) ) * DLAMCH( 'Epsilon' )
       IF ( N_ERR_BNDS .GE. 1 .AND. N_NORMS .GE. 1 ) THEN
 *
 *     Compute scaled normwise condition number cond(A*C).
 *
          IF ( RCEQU ) THEN
-            RCOND_TMP = ZLA_HERCOND_C( UPLO, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = ZLA_HERCOND_C( UPLO, N, A, LDA, AF, LDAF,
+     $                                 IPIV,
      $           S, .TRUE., INFO, WORK, RWORK )
          ELSE
-            RCOND_TMP = ZLA_HERCOND_C( UPLO, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = ZLA_HERCOND_C( UPLO, N, A, LDA, AF, LDAF,
+     $                                 IPIV,
      $           S, .FALSE., INFO, WORK, RWORK )
          END IF
          DO J = 1, NRHS
diff --git a/SRC/zhesv.f b/SRC/zhesv.f
index f54023e508..d863499424 100644
--- a/SRC/zhesv.f
+++ b/SRC/zhesv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHESV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhesv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhesv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,11 +161,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEsolve
+*> \ingroup hesv
 *
 *  =====================================================================
       SUBROUTINE ZHESV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
      $                  LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -205,7 +204,8 @@ SUBROUTINE ZHESV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/zhesv_aa.f b/SRC/zhesv_aa.f
index df8498c7a5..13910d09ae 100644
--- a/SRC/zhesv_aa.f
+++ b/SRC/zhesv_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHESV_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhesv_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhesv_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -128,7 +126,7 @@
 *>          LWORK is INTEGER
 *>          The length of WORK.  LWORK >= MAX(1,2*N,3*N-2), and for best 
 *>          performance LWORK >= max(1,N*NB), where NB is the optimal
-*>          blocksize for ZHETRF.
+*>          blocksize for ZHETRF_AA.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -154,11 +152,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEsolve
+*> \ingroup hesv_aa
 *
 *  =====================================================================
       SUBROUTINE ZHESV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
      $                     LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -177,7 +176,7 @@ SUBROUTINE ZHESV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
 *     .. Local Scalars ..
       LOGICAL            LQUERY
-      INTEGER            LWKOPT, LWKOPT_HETRF, LWKOPT_HETRS
+      INTEGER            LWKMIN, LWKOPT, LWKOPT_HETRF, LWKOPT_HETRS
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -196,7 +195,9 @@ SUBROUTINE ZHESV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      LWKMIN = MAX( 1, 2*N, 3*N-2 )
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -206,17 +207,17 @@ SUBROUTINE ZHESV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
          INFO = -5
       ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
          INFO = -8
-      ELSE IF( LWORK.LT.MAX(2*N, 3*N-2) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -10
       END IF
 *
       IF( INFO.EQ.0 ) THEN
          CALL ZHETRF_AA( UPLO, N, A, LDA, IPIV, WORK, -1, INFO )
-         LWKOPT_HETRF = INT( WORK(1) )
+         LWKOPT_HETRF = INT( WORK( 1 ) )
          CALL ZHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
      $                   -1, INFO )
-         LWKOPT_HETRS = INT( WORK(1) )
-         LWKOPT = MAX( LWKOPT_HETRF, LWKOPT_HETRS )
+         LWKOPT_HETRS = INT( WORK( 1 ) )
+         LWKOPT = MAX( LWKMIN, LWKOPT_HETRF, LWKOPT_HETRS )
          WORK( 1 ) = LWKOPT
       END IF
 *
diff --git a/SRC/zhesv_aa_2stage.f b/SRC/zhesv_aa_2stage.f
index ee15968552..cb744541e8 100644
--- a/SRC/zhesv_aa_2stage.f
+++ b/SRC/zhesv_aa_2stage.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHESV_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhesv_aa_2stage.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhesv_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,7 +86,7 @@
 *>          triangular part of the matrix A, and the strictly upper
 *>          triangular part of A is not referenced.
 *>
-*>          On exit, L is stored below (or above) the subdiaonal blocks,
+*>          On exit, L is stored below (or above) the subdiagonal blocks,
 *>          when UPLO  is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -100,14 +98,14 @@
 *>
 *> \param[out] TB
 *> \verbatim
-*>          TB is COMPLEX*16 array, dimension (LTB)
+*>          TB is COMPLEX*16 array, dimension (MAX(1,LTB)).
 *>          On exit, details of the LU factorization of the band matrix.
 *> \endverbatim
 *>
 *> \param[in] LTB
 *> \verbatim
 *>          LTB is INTEGER
-*>          The size of the array TB. LTB >= 4*N, internally
+*>          The size of the array TB. LTB >= MAX(1,4*N), internally
 *>          used to select NB such that LTB >= (3*NB+1)*N.
 *>
 *>          If LTB = -1, then a workspace query is assumed; the
@@ -147,14 +145,15 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX*16 workspace of size LWORK
+*>          WORK is COMPLEX*16 workspace of size (MAX(1,LWORK)).
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The size of WORK. LWORK >= N, internally used to select NB
-*>          such that LWORK >= N*NB.
+*>          The size of WORK. LWORK >= MAX(1,N), internally used to
+*>          select NB such that LWORK >= N*NB.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal size of the WORK array,
@@ -178,7 +177,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEsolve
+*> \ingroup hesv_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE ZHESV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
@@ -208,7 +207,7 @@ SUBROUTINE ZHESV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *     .. Local Scalars ..
       LOGICAL            UPPER, TQUERY, WQUERY
-      INTEGER            LWKOPT
+      INTEGER            LWKOPT, LWKMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -216,7 +215,8 @@ SUBROUTINE ZHESV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZHETRF_AA_2STAGE, ZHETRS_AA_2STAGE
+      EXTERNAL           XERBLA, ZHETRF_AA_2STAGE,
+     $                   ZHETRS_AA_2STAGE
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -229,6 +229,7 @@ SUBROUTINE ZHESV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
       UPPER = LSAME( UPLO, 'U' )
       WQUERY = ( LWORK.EQ.-1 )
       TQUERY = ( LTB.EQ.-1 )
+      LWKMIN = MAX( 1, N )
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
@@ -237,18 +238,19 @@ SUBROUTINE ZHESV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
          INFO = -3
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -5
-      ELSE IF( LTB.LT.( 4*N ) .AND. .NOT.TQUERY ) THEN
+      ELSE IF( LTB.LT.MAX( 1, 4*N ) .AND. .NOT.TQUERY ) THEN
          INFO = -7
       ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
          INFO = -11
-      ELSE IF( LWORK.LT.N .AND. .NOT.WQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.WQUERY ) THEN
          INFO = -13
       END IF
 *
       IF( INFO.EQ.0 ) THEN
          CALL ZHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, -1, IPIV,
      $                          IPIV2, WORK, -1, INFO )
-         LWKOPT = INT( WORK(1) )
+         LWKOPT = MAX( LWKMIN, INT( WORK( 1 ) ) )
+         WORK( 1 ) = LWKOPT
       END IF
 *
       IF( INFO.NE.0 ) THEN
diff --git a/SRC/zhesv_rk.f b/SRC/zhesv_rk.f
index 1ec75cc04b..ba692768ae 100644
--- a/SRC/zhesv_rk.f
+++ b/SRC/zhesv_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHESV_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhesv_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhesv_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -205,7 +203,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEsolve
+*> \ingroup hesv_rk
 *
 *> \par Contributors:
 *  ==================
@@ -223,8 +221,10 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE ZHESV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
+      SUBROUTINE ZHESV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
+     $                     WORK,
      $                     LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -261,7 +261,8 @@ SUBROUTINE ZHESV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -279,8 +280,9 @@ SUBROUTINE ZHESV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
          IF( N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            CALL ZHETRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, -1, INFO )
-            LWKOPT = DBLE( WORK(1) )
+            CALL ZHETRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, -1,
+     $                      INFO )
+            LWKOPT = INT( DBLE( WORK( 1 ) ) )
          END IF
          WORK( 1 ) = LWKOPT
       END IF
@@ -301,7 +303,8 @@ SUBROUTINE ZHESV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
 *
 *        Solve the system A*X = B with BLAS3 solver, overwriting B with X.
 *
-         CALL ZHETRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, INFO )
+         CALL ZHETRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
+     $                  INFO )
 *
       END IF
 *
diff --git a/SRC/zhesv_rook.f b/SRC/zhesv_rook.f
index d44284182b..776d96efbc 100644
--- a/SRC/zhesv_rook.f
+++ b/SRC/zhesv_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHESV_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhesv_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhesv_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -184,7 +182,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEsolve
+*> \ingroup hesv_rook
 *>
 *> \verbatim
 *>
@@ -200,8 +198,10 @@
 *
 *
 *  =====================================================================
-      SUBROUTINE ZHESV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
+      SUBROUTINE ZHESV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
+     $                       WORK,
      $                       LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -239,7 +239,8 @@ SUBROUTINE ZHESV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -279,7 +280,8 @@ SUBROUTINE ZHESV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
 *        Solve with TRS ( Use Level BLAS 2)
 *
-         CALL ZHETRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+         CALL ZHETRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
+     $                     INFO )
 *
       END IF
 *
diff --git a/SRC/zhesvx.f b/SRC/zhesvx.f
index 485c81df63..ead7e8eb28 100644
--- a/SRC/zhesvx.f
+++ b/SRC/zhesvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHESVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhesvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhesvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -234,8 +232,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK.  LWORK >= max(1,2*N), and for best
-*>          performance, when FACT = 'N', LWORK >= max(1,2*N,N*NB), where
+*>          The length of WORK.  LWORK >= MAX(1,2*N), and for best
+*>          performance, when FACT = 'N', LWORK >= MAX(1,2*N,N*NB), where
 *>          NB is the optimal blocksize for ZHETRF.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
@@ -276,12 +274,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEsolve
+*> \ingroup hesvx
 *
 *  =====================================================================
-      SUBROUTINE ZHESVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
+      SUBROUTINE ZHESVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
+     $                   B,
      $                   LDB, X, LDX, RCOND, FERR, BERR, WORK, LWORK,
      $                   RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -307,7 +307,7 @@ SUBROUTINE ZHESVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, NOFACT
-      INTEGER            LWKOPT, NB
+      INTEGER            LWKOPT, LWKMIN, NB
       DOUBLE PRECISION   ANORM
 *     ..
 *     .. External Functions ..
@@ -317,7 +317,8 @@ SUBROUTINE ZHESVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
       EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANHE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZHECON, ZHERFS, ZHETRF, ZHETRS, ZLACPY
+      EXTERNAL           XERBLA, ZHECON, ZHERFS, ZHETRF, ZHETRS,
+     $                   ZLACPY
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -329,9 +330,11 @@ SUBROUTINE ZHESVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
       INFO = 0
       NOFACT = LSAME( FACT, 'N' )
       LQUERY = ( LWORK.EQ.-1 )
+      LWKMIN = MAX( 1, 2*N )
       IF( .NOT.NOFACT .AND. .NOT.LSAME( FACT, 'F' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -346,12 +349,12 @@ SUBROUTINE ZHESVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
          INFO = -11
       ELSE IF( LDX.LT.MAX( 1, N ) ) THEN
          INFO = -13
-      ELSE IF( LWORK.LT.MAX( 1, 2*N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -18
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         LWKOPT = MAX( 1, 2*N )
+         LWKOPT = LWKMIN
          IF( NOFACT ) THEN
             NB = ILAENV( 1, 'ZHETRF', UPLO, N, -1, -1, -1 )
             LWKOPT = MAX( LWKOPT, N*NB )
@@ -387,7 +390,8 @@ SUBROUTINE ZHESVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL ZHECON( UPLO, N, AF, LDAF, IPIV, ANORM, RCOND, WORK, INFO )
+      CALL ZHECON( UPLO, N, AF, LDAF, IPIV, ANORM, RCOND, WORK,
+     $             INFO )
 *
 *     Compute the solution vectors X.
 *
diff --git a/SRC/zhesvxx.f b/SRC/zhesvxx.f
index cafd58db10..bd82687aa2 100644
--- a/SRC/zhesvxx.f
+++ b/SRC/zhesvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHESVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhesvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhesvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -496,13 +494,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEsolve
+*> \ingroup hesvxx
 *
 *  =====================================================================
-      SUBROUTINE ZHESVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE ZHESVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    EQUED, S, B, LDB, X, LDX, RCOND, RPVGRW, BERR,
      $                    N_ERR_BNDS, ERR_BNDS_NORM, ERR_BNDS_COMP,
      $                    NPARAMS, PARAMS, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -627,7 +627,8 @@ SUBROUTINE ZHESVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Compute row and column scalings to equilibrate the matrix A.
 *
-         CALL ZHEEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFEQU )
+         CALL ZHEEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK,
+     $                 INFEQU )
          IF( INFEQU.EQ.0 ) THEN
 *
 *     Equilibrate the matrix.
@@ -646,7 +647,8 @@ SUBROUTINE ZHESVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *        Compute the LDL^H or UDU^H factorization of A.
 *
          CALL ZLACPY( UPLO, N, N, A, LDA, AF, LDAF )
-         CALL ZHETRF( UPLO, N, AF, LDAF, IPIV, WORK, 5*MAX(1,N), INFO )
+         CALL ZHETRF( UPLO, N, AF, LDAF, IPIV, WORK, 5*MAX(1,N),
+     $                INFO )
 *
 *        Return if INFO is non-zero.
 *
@@ -657,7 +659,8 @@ SUBROUTINE ZHESVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *           leading rank-deficient INFO columns of A.
 *
             IF( N.GT.0 )
-     $           RPVGRW = ZLA_HERPVGRW( UPLO, N, INFO, A, LDA, AF, LDAF,
+     $           RPVGRW = ZLA_HERPVGRW( UPLO, N, INFO, A, LDA, AF,
+     $                                  LDAF,
      $           IPIV, RWORK )
             RETURN
          END IF
@@ -666,7 +669,8 @@ SUBROUTINE ZHESVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *     Compute the reciprocal pivot growth factor RPVGRW.
 *
       IF( N.GT.0 )
-     $     RPVGRW = ZLA_HERPVGRW( UPLO, N, INFO, A, LDA, AF, LDAF, IPIV,
+     $     RPVGRW = ZLA_HERPVGRW( UPLO, N, INFO, A, LDA, AF, LDAF,
+     $                            IPIV,
      $     RWORK )
 *
 *     Compute the solution matrix X.
diff --git a/SRC/zheswapr.f b/SRC/zheswapr.f
index 71b1ed1c49..b60c632f30 100644
--- a/SRC/zheswapr.f
+++ b/SRC/zheswapr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHESWAPR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zheswapr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zheswapr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,10 +93,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEauxiliary
+*> \ingroup heswapr
 *
 *  =====================================================================
       SUBROUTINE ZHESWAPR( UPLO, N, A, LDA, I1, I2)
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zhetd2.f b/SRC/zhetd2.f
index a6d900b7c7..fc5c3e221f 100644
--- a/SRC/zhetd2.f
+++ b/SRC/zhetd2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETD2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetd2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetd2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,7 +120,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetd2
 *
 *> \par Further Details:
 *  =====================
@@ -172,6 +170,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZHETD2( UPLO, N, A, LDA, D, E, TAU, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -255,7 +254,8 @@ SUBROUTINE ZHETD2( UPLO, N, A, LDA, D, E, TAU, INFO )
 *
 *              Compute  x := tau * A * v  storing x in TAU(1:i)
 *
-               CALL ZHEMV( UPLO, I, TAUI, A, LDA, A( 1, I+1 ), 1, ZERO,
+               CALL ZHEMV( UPLO, I, TAUI, A, LDA, A( 1, I+1 ), 1,
+     $                     ZERO,
      $                     TAU, 1 )
 *
 *              Compute  w := x - 1/2 * tau * (x**H * v) * v
@@ -304,14 +304,16 @@ SUBROUTINE ZHETD2( UPLO, N, A, LDA, D, E, TAU, INFO )
 *
 *              Compute  w := x - 1/2 * tau * (x**H * v) * v
 *
-               ALPHA = -HALF*TAUI*ZDOTC( N-I, TAU( I ), 1, A( I+1, I ),
+               ALPHA = -HALF*TAUI*ZDOTC( N-I, TAU( I ), 1, A( I+1,
+     $                                   I ),
      $                 1 )
                CALL ZAXPY( N-I, ALPHA, A( I+1, I ), 1, TAU( I ), 1 )
 *
 *              Apply the transformation as a rank-2 update:
 *                 A := A - v * w**H - w * v**H
 *
-               CALL ZHER2( UPLO, N-I, -ONE, A( I+1, I ), 1, TAU( I ), 1,
+               CALL ZHER2( UPLO, N-I, -ONE, A( I+1, I ), 1, TAU( I ),
+     $                     1,
      $                     A( I+1, I+1 ), LDA )
 *
             ELSE
diff --git a/SRC/zhetf2.f b/SRC/zhetf2.f
index 7a64951c71..eb47f49252 100644
--- a/SRC/zhetf2.f
+++ b/SRC/zhetf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,7 +125,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetf2
 *
 *> \par Further Details:
 *  =====================
@@ -188,6 +186,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZHETF2( UPLO, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -289,7 +288,8 @@ SUBROUTINE ZHETF2( UPLO, N, A, LDA, IPIV, INFO )
             COLMAX = ZERO
          END IF
 *
-         IF( (MAX( ABSAKK, COLMAX ).EQ.ZERO) .OR. DISNAN(ABSAKK) ) THEN
+         IF( (MAX( ABSAKK, COLMAX ).EQ.ZERO) .OR.
+     $       DISNAN(ABSAKK) ) THEN
 *
 *           Column K is zero or underflow, or contains a NaN:
 *           set INFO and continue
@@ -484,7 +484,8 @@ SUBROUTINE ZHETF2( UPLO, N, A, LDA, IPIV, INFO )
             COLMAX = ZERO
          END IF
 *
-         IF( (MAX( ABSAKK, COLMAX ).EQ.ZERO) .OR. DISNAN(ABSAKK) ) THEN
+         IF( (MAX( ABSAKK, COLMAX ).EQ.ZERO) .OR.
+     $       DISNAN(ABSAKK) ) THEN
 *
 *           Column K is zero or underflow, or contains a NaN:
 *           set INFO and continue
@@ -513,7 +514,8 @@ SUBROUTINE ZHETF2( UPLO, N, A, LDA, IPIV, INFO )
                JMAX = K - 1 + IZAMAX( IMAX-K, A( IMAX, K ), LDA )
                ROWMAX = CABS1( A( IMAX, JMAX ) )
                IF( IMAX.LT.N ) THEN
-                  JMAX = IMAX + IZAMAX( N-IMAX, A( IMAX+1, IMAX ), 1 )
+                  JMAX = IMAX + IZAMAX( N-IMAX, A( IMAX+1, IMAX ),
+     $                                  1 )
                   ROWMAX = MAX( ROWMAX, CABS1( A( JMAX, IMAX ) ) )
                END IF
 *
@@ -550,7 +552,8 @@ SUBROUTINE ZHETF2( UPLO, N, A, LDA, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL ZSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL ZSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
                DO 60 J = KK + 1, KP - 1
                   T = DCONJG( A( J, KK ) )
                   A( J, KK ) = DCONJG( A( KP, J ) )
diff --git a/SRC/zhetf2_rk.f b/SRC/zhetf2_rk.f
index 050c7993d0..5e2afb0660 100644
--- a/SRC/zhetf2_rk.f
+++ b/SRC/zhetf2_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETF2_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetf2_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetf2_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -208,7 +206,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetf2_rk
 *
 *> \par Further Details:
 *  =====================
@@ -238,6 +236,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -480,7 +479,7 @@ SUBROUTINE ZHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
                   A( J, K ) = DCONJG( A( P, J ) )
                   A( P, J ) = T
    14          CONTINUE
-*              (3) Swap and conjugate corner elements at row-col interserction
+*              (3) Swap and conjugate corner elements at row-col intersection
                A( P, K ) = DCONJG( A( P, K ) )
 *              (4) Swap diagonal elements at row-col intersection
                R1 = DBLE( A( K, K ) )
@@ -491,7 +490,8 @@ SUBROUTINE ZHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *              the interchanges in columns k+1:N.
 *
                IF( K.LT.N )
-     $            CALL ZSWAP( N-K, A( K, K+1 ), LDA, A( P, K+1 ), LDA )
+     $            CALL ZSWAP( N-K, A( K, K+1 ), LDA, A( P, K+1 ),
+     $                        LDA )
 *
             END IF
 *
@@ -508,7 +508,7 @@ SUBROUTINE ZHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
                   A( J, KK ) = DCONJG( A( KP, J ) )
                   A( KP, J ) = T
    15          CONTINUE
-*              (3) Swap and conjugate corner elements at row-col interserction
+*              (3) Swap and conjugate corner elements at row-col intersection
                A( KP, KK ) = DCONJG( A( KP, KK ) )
 *              (4) Swap diagonal elements at row-col intersection
                R1 = DBLE( A( KK, KK ) )
@@ -560,7 +560,8 @@ SUBROUTINE ZHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                       = A - W(k)*1/D(k)*W(k)**T
 *
                      D11 = ONE / DBLE( A( K, K ) )
-                     CALL ZHER( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL ZHER( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
 *
 *                    Store U(k) in column k
 *
@@ -579,7 +580,8 @@ SUBROUTINE ZHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                       = A - W(k)*(1/D(k))*W(k)**T
 *                       = A - (W(k)/D(k))*(D(k))*(W(k)/D(K))**T
 *
-                     CALL ZHER( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL ZHER( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
                   END IF
 *
 *                 Store the superdiagonal element of D in array E
@@ -752,14 +754,16 @@ SUBROUTINE ZHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                 Determine both ROWMAX and JMAX.
 *
                   IF( IMAX.NE.K ) THEN
-                     JMAX = K - 1 + IZAMAX( IMAX-K, A( IMAX, K ), LDA )
+                     JMAX = K - 1 + IZAMAX( IMAX-K, A( IMAX, K ),
+     $                                      LDA )
                      ROWMAX = CABS1( A( IMAX, JMAX ) )
                   ELSE
                      ROWMAX = ZERO
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + IZAMAX( N-IMAX, A( IMAX+1, IMAX ),
+                     ITEMP = IMAX + IZAMAX( N-IMAX, A( IMAX+1,
+     $                                      IMAX ),
      $                                     1 )
                      DTEMP = CABS1( A( ITEMP, IMAX ) )
                      IF( DTEMP.GT.ROWMAX ) THEN
@@ -834,7 +838,7 @@ SUBROUTINE ZHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
                   A( J, K ) = DCONJG( A( P, J ) )
                   A( P, J ) = T
    44          CONTINUE
-*              (3) Swap and conjugate corner elements at row-col interserction
+*              (3) Swap and conjugate corner elements at row-col intersection
                A( P, K ) = DCONJG( A( P, K ) )
 *              (4) Swap diagonal elements at row-col intersection
                R1 = DBLE( A( K, K ) )
@@ -855,14 +859,15 @@ SUBROUTINE ZHETF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
             IF( KP.NE.KK ) THEN
 *              (1) Swap columnar parts
                IF( KP.LT.N )
-     $            CALL ZSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL ZSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
 *              (2) Swap and conjugate middle parts
                DO 45 J = KK + 1, KP - 1
                   T = DCONJG( A( J, KK ) )
                   A( J, KK ) = DCONJG( A( KP, J ) )
                   A( KP, J ) = T
    45          CONTINUE
-*              (3) Swap and conjugate corner elements at row-col interserction
+*              (3) Swap and conjugate corner elements at row-col intersection
                A( KP, KK ) = DCONJG( A( KP, KK ) )
 *              (4) Swap diagonal elements at row-col intersection
                R1 = DBLE( A( KK, KK ) )
diff --git a/SRC/zhetf2_rook.f b/SRC/zhetf2_rook.f
index 94bb297367..4e86aec7b2 100644
--- a/SRC/zhetf2_rook.f
+++ b/SRC/zhetf2_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETF2_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetf2_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetf2_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -129,7 +127,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetf2_rook
 *
 *> \par Further Details:
 *  =====================
@@ -191,6 +189,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZHETF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -420,7 +419,7 @@ SUBROUTINE ZHETF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
                   A( J, K ) = DCONJG( A( P, J ) )
                   A( P, J ) = T
    14          CONTINUE
-*              (3) Swap and conjugate corner elements at row-col interserction
+*              (3) Swap and conjugate corner elements at row-col intersection
                A( P, K ) = DCONJG( A( P, K ) )
 *              (4) Swap diagonal elements at row-col intersection
                R1 = DBLE( A( K, K ) )
@@ -441,7 +440,7 @@ SUBROUTINE ZHETF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
                   A( J, KK ) = DCONJG( A( KP, J ) )
                   A( KP, J ) = T
    15          CONTINUE
-*              (3) Swap and conjugate corner elements at row-col interserction
+*              (3) Swap and conjugate corner elements at row-col intersection
                A( KP, KK ) = DCONJG( A( KP, KK ) )
 *              (4) Swap diagonal elements at row-col intersection
                R1 = DBLE( A( KK, KK ) )
@@ -485,7 +484,8 @@ SUBROUTINE ZHETF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                       = A - W(k)*1/D(k)*W(k)**T
 *
                      D11 = ONE / DBLE( A( K, K ) )
-                     CALL ZHER( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL ZHER( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
 *
 *                    Store U(k) in column k
 *
@@ -504,7 +504,8 @@ SUBROUTINE ZHETF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                       = A - W(k)*(1/D(k))*W(k)**T
 *                       = A - (W(k)/D(k))*(D(k))*(W(k)/D(K))**T
 *
-                     CALL ZHER( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL ZHER( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
                   END IF
                END IF
 *
@@ -651,14 +652,16 @@ SUBROUTINE ZHETF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                 Determine both ROWMAX and JMAX.
 *
                   IF( IMAX.NE.K ) THEN
-                     JMAX = K - 1 + IZAMAX( IMAX-K, A( IMAX, K ), LDA )
+                     JMAX = K - 1 + IZAMAX( IMAX-K, A( IMAX, K ),
+     $                                      LDA )
                      ROWMAX = CABS1( A( IMAX, JMAX ) )
                   ELSE
                      ROWMAX = ZERO
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + IZAMAX( N-IMAX, A( IMAX+1, IMAX ),
+                     ITEMP = IMAX + IZAMAX( N-IMAX, A( IMAX+1,
+     $                                      IMAX ),
      $                                     1 )
                      DTEMP = CABS1( A( ITEMP, IMAX ) )
                      IF( DTEMP.GT.ROWMAX ) THEN
@@ -733,7 +736,7 @@ SUBROUTINE ZHETF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
                   A( J, K ) = DCONJG( A( P, J ) )
                   A( P, J ) = T
    44          CONTINUE
-*              (3) Swap and conjugate corner elements at row-col interserction
+*              (3) Swap and conjugate corner elements at row-col intersection
                A( P, K ) = DCONJG( A( P, K ) )
 *              (4) Swap diagonal elements at row-col intersection
                R1 = DBLE( A( K, K ) )
@@ -747,14 +750,15 @@ SUBROUTINE ZHETF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
             IF( KP.NE.KK ) THEN
 *              (1) Swap columnar parts
                IF( KP.LT.N )
-     $            CALL ZSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL ZSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
 *              (2) Swap and conjugate middle parts
                DO 45 J = KK + 1, KP - 1
                   T = DCONJG( A( J, KK ) )
                   A( J, KK ) = DCONJG( A( KP, J ) )
                   A( KP, J ) = T
    45          CONTINUE
-*              (3) Swap and conjugate corner elements at row-col interserction
+*              (3) Swap and conjugate corner elements at row-col intersection
                A( KP, KK ) = DCONJG( A( KP, KK ) )
 *              (4) Swap diagonal elements at row-col intersection
                R1 = DBLE( A( KK, KK ) )
diff --git a/SRC/zhetrd.f b/SRC/zhetrd.f
index 5b7d6546cc..5a44148943 100644
--- a/SRC/zhetrd.f
+++ b/SRC/zhetrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -139,7 +137,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetrd
 *
 *> \par Further Details:
 *  =====================
@@ -188,7 +186,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZHETRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
+      SUBROUTINE ZHETRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -249,7 +249,7 @@ SUBROUTINE ZHETRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
 *        Determine the block size.
 *
          NB = ILAENV( 1, 'ZHETRD', UPLO, N, -1, -1, -1 )
-         LWKOPT = N*NB
+         LWKOPT = MAX( 1, N*NB )
          WORK( 1 ) = LWKOPT
       END IF
 *
diff --git a/SRC/zhetrd_2stage.f b/SRC/zhetrd_2stage.f
index b9d2f0eb19..3eeedb3e5d 100644
--- a/SRC/zhetrd_2stage.f
+++ b/SRC/zhetrd_2stage.f
@@ -4,23 +4,21 @@
 *
 *  =========== DOCUMENTATION ===========
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
-*
-*> \htmlonly
-*> Download ZHETRD_2STAGE + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrd_2stage.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zhetrd_2stage.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrd_2stage.f"> 
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download ZHETRD_2STAGE + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrd_2stage.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zhetrd_2stage.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrd_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZHETRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU, 
+*       SUBROUTINE ZHETRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
 *                                 HOUS2, LHOUS2, WORK, LWORK, INFO )
 *
 *       IMPLICIT NONE
@@ -34,7 +32,7 @@
 *       COMPLEX*16         A( LDA, * ), TAU( * ),
 *                          HOUS2( * ), WORK( * )
 *       ..
-*  
+*
 *
 *> \par Purpose:
 *  =============
@@ -52,11 +50,11 @@
 *> \param[in] VECT
 *> \verbatim
 *>          VECT is CHARACTER*1
-*>          = 'N':  No need for the Housholder representation, 
+*>          = 'N':  No need for the Housholder representation,
 *>                  in particular for the second stage (Band to
 *>                  tridiagonal) and thus LHOUS2 is of size max(1, 4*N);
-*>          = 'V':  the Householder representation is needed to 
-*>                  either generate Q1 Q2 or to apply Q1 Q2, 
+*>          = 'V':  the Householder representation is needed to
+*>                  either generate Q1 Q2 or to apply Q1 Q2,
 *>                  then LHOUS2 is to be queried and computed.
 *>                  (NOT AVAILABLE IN THIS RELEASE).
 *> \endverbatim
@@ -86,7 +84,7 @@
 *>          triangular part of A is not referenced.
 *>          On exit, if UPLO = 'U', the band superdiagonal
 *>          of A are overwritten by the corresponding elements of the
-*>          internal band-diagonal matrix AB, and the elements above 
+*>          internal band-diagonal matrix AB, and the elements above
 *>          the KD superdiagonal, with the array TAU, represent the unitary
 *>          matrix Q1 as a product of elementary reflectors; if UPLO
 *>          = 'L', the diagonal and band subdiagonal of A are over-
@@ -117,13 +115,13 @@
 *> \param[out] TAU
 *> \verbatim
 *>          TAU is COMPLEX*16 array, dimension (N-KD)
-*>          The scalar factors of the elementary reflectors of 
+*>          The scalar factors of the elementary reflectors of
 *>          the first stage (see Further Details).
 *> \endverbatim
 *>
 *> \param[out] HOUS2
 *> \verbatim
-*>          HOUS2 is COMPLEX*16 array, dimension (LHOUS2)
+*>          HOUS2 is COMPLEX*16 array, dimension (MAX(1,LHOUS2))
 *>          Stores the Householder representation of the stage2
 *>          band to tridiagonal.
 *> \endverbatim
@@ -132,6 +130,8 @@
 *> \verbatim
 *>          LHOUS2 is INTEGER
 *>          The dimension of the array HOUS2.
+*>          LHOUS2 >= 1.
+*>
 *>          If LWORK = -1, or LHOUS2 = -1,
 *>          then a query is assumed; the routine
 *>          only calculates the optimal size of the HOUS2 array, returns
@@ -143,23 +143,26 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (LWORK)
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK = MAX(1, dimension)
-*>          If LWORK = -1, or LHOUS2=-1,
+*>          The dimension of the array WORK.
+*>          If N = 0, LWORK >= 1, else LWORK = MAX(1, dimension).
+*>
+*>          If LWORK = -1, or LHOUS2 = -1,
 *>          then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
 *>          LWORK = MAX(1, dimension) where
 *>          dimension   = max(stage1,stage2) + (KD+1)*N
-*>                      = N*KD + N*max(KD+1,FACTOPTNB) 
-*>                        + max(2*KD*KD, KD*NTHREADS) 
-*>                        + (KD+1)*N 
+*>                      = N*KD + N*max(KD+1,FACTOPTNB)
+*>                        + max(2*KD*KD, KD*NTHREADS)
+*>                        + (KD+1)*N
 *>          where KD is the blocking size of the reduction,
 *>          FACTOPTNB is the blocking used by the QR or LQ
 *>          algorithm, usually FACTOPTNB=128 is a good choice
@@ -177,12 +180,12 @@
 *  Authors:
 *  ========
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetrd_2stage
 *
 *> \par Further Details:
 *  =====================
@@ -202,7 +205,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -210,16 +213,16 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZHETRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU, 
+      SUBROUTINE ZHETRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
      $                          HOUS2, LHOUS2, WORK, LWORK, INFO )
 *
       IMPLICIT NONE
@@ -263,12 +266,19 @@ SUBROUTINE ZHETRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
 *
 *     Determine the block size, the workspace size and the hous size.
 *
-      KD     = ILAENV2STAGE( 1, 'ZHETRD_2STAGE', VECT, N, -1, -1, -1 )
-      IB     = ILAENV2STAGE( 2, 'ZHETRD_2STAGE', VECT, N, KD, -1, -1 )
-      LHMIN  = ILAENV2STAGE( 3, 'ZHETRD_2STAGE', VECT, N, KD, IB, -1 )
-      LWMIN  = ILAENV2STAGE( 4, 'ZHETRD_2STAGE', VECT, N, KD, IB, -1 )
-*      WRITE(*,*),'ZHETRD_2STAGE N KD UPLO LHMIN LWMIN ',N, KD, UPLO,
-*     $            LHMIN, LWMIN
+      KD     = ILAENV2STAGE( 1, 'ZHETRD_2STAGE', VECT, N, -1, -1,
+     $                       -1 )
+      IB     = ILAENV2STAGE( 2, 'ZHETRD_2STAGE', VECT, N, KD, -1,
+     $                       -1 )
+      IF( N.EQ.0 ) THEN
+         LHMIN = 1
+         LWMIN = 1
+      ELSE
+         LHMIN = ILAENV2STAGE( 3, 'ZHETRD_2STAGE', VECT, N, KD, IB,
+     $                         -1 )
+         LWMIN = ILAENV2STAGE( 4, 'ZHETRD_2STAGE', VECT, N, KD, IB,
+     $                         -1 )
+      END IF
 *
       IF( .NOT.LSAME( VECT, 'N' ) ) THEN
          INFO = -1
@@ -309,14 +319,14 @@ SUBROUTINE ZHETRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
       LWRK  = LWORK-LDAB*N
       ABPOS = 1
       WPOS  = ABPOS + LDAB*N
-      CALL ZHETRD_HE2HB( UPLO, N, KD, A, LDA, WORK( ABPOS ), LDAB, 
+      CALL ZHETRD_HE2HB( UPLO, N, KD, A, LDA, WORK( ABPOS ), LDAB,
      $                   TAU, WORK( WPOS ), LWRK, INFO )
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'ZHETRD_HE2HB', -INFO )
          RETURN
       END IF
-      CALL ZHETRD_HB2ST( 'Y', VECT, UPLO, N, KD, 
-     $                   WORK( ABPOS ), LDAB, D, E, 
+      CALL ZHETRD_HB2ST( 'Y', VECT, UPLO, N, KD,
+     $                   WORK( ABPOS ), LDAB, D, E,
      $                   HOUS2, LHOUS2, WORK( WPOS ), LWRK, INFO )
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'ZHETRD_HB2ST', -INFO )
@@ -324,7 +334,6 @@ SUBROUTINE ZHETRD_2STAGE( VECT, UPLO, N, A, LDA, D, E, TAU,
       END IF
 *
 *
-      HOUS2( 1 ) = LHMIN
       WORK( 1 )  = LWMIN
       RETURN
 *
diff --git a/SRC/zhetrd_hb2st.F b/SRC/zhetrd_hb2st.F
index e839271a47..29fd61b8b3 100644
--- a/SRC/zhetrd_hb2st.F
+++ b/SRC/zhetrd_hb2st.F
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRD_HB2ST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrd_hb2st.f">
 *> [TGZ]</a>
@@ -13,12 +12,11 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrd_hb2st.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB, 
+*       SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *                               D, E, HOUS, LHOUS, WORK, LWORK, INFO )
 *
 *       #if defined(_OPENMP)
@@ -53,12 +51,12 @@
 *> \param[in] STAGE1
 *> \verbatim
 *>          STAGE1 is CHARACTER*1
-*>          = 'N':  "No": to mention that the stage 1 of the reduction  
+*>          = 'N':  "No": to mention that the stage 1 of the reduction
 *>                  from dense to band using the zhetrd_he2hb routine
-*>                  was not called before this routine to reproduce AB. 
-*>                  In other term this routine is called as standalone. 
-*>          = 'Y':  "Yes": to mention that the stage 1 of the 
-*>                  reduction from dense to band using the zhetrd_he2hb 
+*>                  was not called before this routine to reproduce AB.
+*>                  In other term this routine is called as standalone.
+*>          = 'Y':  "Yes": to mention that the stage 1 of the
+*>                  reduction from dense to band using the zhetrd_he2hb
 *>                  routine has been called to produce AB (e.g., AB is
 *>                  the output of zhetrd_he2hb.
 *> \endverbatim
@@ -66,10 +64,10 @@
 *> \param[in] VECT
 *> \verbatim
 *>          VECT is CHARACTER*1
-*>          = 'N':  No need for the Housholder representation, 
+*>          = 'N':  No need for the Housholder representation,
 *>                  and thus LHOUS is of size max(1, 4*N);
-*>          = 'V':  the Householder representation is needed to 
-*>                  either generate or to apply Q later on, 
+*>          = 'V':  the Householder representation is needed to
+*>                  either generate or to apply Q later on,
 *>                  then LHOUS is to be queried and computed.
 *>                  (NOT AVAILABLE IN THIS RELEASE).
 *> \endverbatim
@@ -132,34 +130,39 @@
 *>
 *> \param[out] HOUS
 *> \verbatim
-*>          HOUS is COMPLEX*16 array, dimension LHOUS, that
-*>          store the Householder representation.
+*>          HOUS is COMPLEX*16 array, dimension (MAX(1,LHOUS))
+*>          Stores the Householder representation.
 *> \endverbatim
 *>
 *> \param[in] LHOUS
 *> \verbatim
 *>          LHOUS is INTEGER
-*>          The dimension of the array HOUS. LHOUS = MAX(1, dimension)
-*>          If LWORK = -1, or LHOUS=-1,
+*>          The dimension of the array HOUS.
+*>          If N = 0 or KD <= 1, LHOUS >= 1, else LHOUS = MAX(1, dimension).
+*>
+*>          If LWORK = -1, or LHOUS = -1,
 *>          then a query is assumed; the routine
 *>          only calculates the optimal size of the HOUS array, returns
 *>          this value as the first entry of the HOUS array, and no error
 *>          message related to LHOUS is issued by XERBLA.
 *>          LHOUS = MAX(1, dimension) where
 *>          dimension = 4*N if VECT='N'
-*>          not available now if VECT='H'     
+*>          not available now if VECT='H'
 *> \endverbatim
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension LWORK.
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK)).
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK = MAX(1, dimension)
-*>          If LWORK = -1, or LHOUS=-1,
+*>          The dimension of the array WORK.
+*>          If N = 0 or KD <= 1, LWORK >= 1, else LWORK = MAX(1, dimension).
+*>
+*>          If LWORK = -1, or LHOUS = -1,
 *>          then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
@@ -188,7 +191,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hetrd_hb2st
 *
 *> \par Further Details:
 *  =====================
@@ -208,7 +211,7 @@
 *>  http://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
-*>  An improved parallel singular value algorithm and its implementation 
+*>  An improved parallel singular value algorithm and its implementation
 *>  for multicore hardware, In Proceedings of 2013 International Conference
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
@@ -216,16 +219,16 @@
 *>  http://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
-*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
+*>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure
 *>  calculations based on fine-grained memory aware tasks.
 *>  International Journal of High Performance Computing Applications.
 *>  Volume 28 Issue 2, Pages 196-209, May 2014.
-*>  http://hpc.sagepub.com/content/28/2/196 
+*>  http://hpc.sagepub.com/content/28/2/196
 *>
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB, 
+      SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
      $                         D, E, HOUS, LHOUS, WORK, LWORK, INFO )
 *
 *
@@ -259,25 +262,26 @@ SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, WANTQ, UPPER, AFTERS1
-      INTEGER            I, M, K, IB, SWEEPID, MYID, SHIFT, STT, ST, 
+      INTEGER            I, M, K, IB, SWEEPID, MYID, SHIFT, STT, ST,
      $                   ED, STIND, EDIND, BLKLASTIND, COLPT, THED,
      $                   STEPERCOL, GRSIZ, THGRSIZ, THGRNB, THGRID,
-     $                   NBTILES, TTYPE, TID, NTHREADS, DEBUG,
-     $                   ABDPOS, ABOFDPOS, DPOS, OFDPOS, AWPOS, 
+     $                   NBTILES, TTYPE, TID, NTHREADS,
+     $                   ABDPOS, ABOFDPOS, DPOS, OFDPOS, AWPOS,
      $                   INDA, INDW, APOS, SIZEA, LDA, INDV, INDTAU,
      $                   SIZEV, SIZETAU, LDV, LHMIN, LWMIN
       DOUBLE PRECISION   ABSTMP
       COMPLEX*16         TMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZHB2ST_KERNELS, ZLACPY, ZLASET, XERBLA
+      EXTERNAL           ZHB2ST_KERNELS, ZLACPY,
+     $                   ZLASET, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MIN, MAX, CEILING, DBLE, REAL
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      INTEGER            ILAENV2STAGE 
+      INTEGER            ILAENV2STAGE
       EXTERNAL           LSAME, ILAENV2STAGE
 *     ..
 *     .. Executable Statements ..
@@ -285,7 +289,6 @@ SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *     Determine the minimal workspace size required.
 *     Test the input parameters
 *
-      DEBUG   = 0
       INFO    = 0
       AFTERS1 = LSAME( STAGE1, 'Y' )
       WANTQ   = LSAME( VECT, 'V' )
@@ -294,9 +297,17 @@ SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *
 *     Determine the block size, the workspace size and the hous size.
 *
-      IB     = ILAENV2STAGE( 2, 'ZHETRD_HB2ST', VECT, N, KD, -1, -1 )
-      LHMIN  = ILAENV2STAGE( 3, 'ZHETRD_HB2ST', VECT, N, KD, IB, -1 )
-      LWMIN  = ILAENV2STAGE( 4, 'ZHETRD_HB2ST', VECT, N, KD, IB, -1 )
+      IB       = ILAENV2STAGE( 2, 'ZHETRD_HB2ST', VECT, N, KD,
+     $                         -1, -1 )
+      IF( N.EQ.0 .OR. KD.LE.1 ) THEN
+         LHMIN = 1
+         LWMIN = 1
+      ELSE
+         LHMIN = ILAENV2STAGE( 3, 'ZHETRD_HB2ST', VECT, N, KD, IB,
+     $                         -1 )
+         LWMIN = ILAENV2STAGE( 4, 'ZHETRD_HB2ST', VECT, N, KD, IB,
+     $                         -1 )
+      END IF
 *
       IF( .NOT.AFTERS1 .AND. .NOT.LSAME( STAGE1, 'N' ) ) THEN
          INFO = -1
@@ -358,7 +369,7 @@ SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
           ABDPOS   = KD + 1
           ABOFDPOS = KD
       ELSE
-          APOS     = INDA 
+          APOS     = INDA
           AWPOS    = INDA + KD + 1
           DPOS     = APOS
           OFDPOS   = DPOS + 1
@@ -366,11 +377,11 @@ SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
           ABOFDPOS = 2
 
       ENDIF
-*      
-*     Case KD=0: 
-*     The matrix is diagonal. We just copy it (convert to "real" for 
-*     complex because D is double and the imaginary part should be 0) 
-*     and store it in D. A sequential code here is better or 
+*
+*     Case KD=0:
+*     The matrix is diagonal. We just copy it (convert to "real" for
+*     complex because D is double and the imaginary part should be 0)
+*     and store it in D. A sequential code here is better or
 *     in a parallel environment it might need two cores for D and E
 *
       IF( KD.EQ.0 ) THEN
@@ -385,17 +396,17 @@ SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
           WORK( 1 ) = 1
           RETURN
       END IF
-*      
-*     Case KD=1: 
-*     The matrix is already Tridiagonal. We have to make diagonal 
+*
+*     Case KD=1:
+*     The matrix is already Tridiagonal. We have to make diagonal
 *     and offdiagonal elements real, and store them in D and E.
-*     For that, for real precision just copy the diag and offdiag 
-*     to D and E while for the COMPLEX case the bulge chasing is  
-*     performed to convert the hermetian tridiagonal to symmetric 
-*     tridiagonal. A simpler conversion formula might be used, but then 
+*     For that, for real precision just copy the diag and offdiag
+*     to D and E while for the COMPLEX case the bulge chasing is
+*     performed to convert the hermetian tridiagonal to symmetric
+*     tridiagonal. A simpler conversion formula might be used, but then
 *     updating the Q matrix will be required and based if Q is generated
-*     or not this might complicate the story. 
-*      
+*     or not this might complicate the story.
+*
       IF( KD.EQ.1 ) THEN
           DO 50 I = 1, N
               D( I ) = DBLE( AB( ABDPOS, I ) )
@@ -444,7 +455,7 @@ SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
           RETURN
       END IF
 *
-*     Main code start here. 
+*     Main code start here.
 *     Reduce the hermitian band of A to a tridiagonal matrix.
 *
       THGRSIZ   = N
@@ -453,7 +464,7 @@ SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
       NBTILES   = CEILING( REAL(N)/REAL(KD) )
       STEPERCOL = CEILING( REAL(SHIFT)/REAL(GRSIZ) )
       THGRNB    = CEILING( REAL(N-1)/REAL(THGRSIZ) )
-*      
+*
       CALL ZLACPY( "A", KD+1, N, AB, LDAB, WORK( APOS ), LDA )
       CALL ZLASET( "A", KD,   N, ZERO, ZERO, WORK( AWPOS ), LDA )
 *
@@ -462,7 +473,7 @@ SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 *
 #if defined(_OPENMP)
 !$OMP PARALLEL PRIVATE( TID, THGRID, BLKLASTIND )
-!$OMP$         PRIVATE( THED, I, M, K, ST, ED, STT, SWEEPID ) 
+!$OMP$         PRIVATE( THED, I, M, K, ST, ED, STT, SWEEPID )
 !$OMP$         PRIVATE( MYID, TTYPE, COLPT, STIND, EDIND )
 !$OMP$         SHARED ( UPLO, WANTQ, INDV, INDTAU, HOUS, WORK)
 !$OMP$         SHARED ( N, KD, IB, NBTILES, LDA, LDV, INDA )
@@ -471,7 +482,7 @@ SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 #endif
 *
 *     main bulge chasing loop
-*      
+*
       DO 100 THGRID = 1, THGRNB
           STT  = (THGRID-1)*THGRSIZ+1
           THED = MIN( (STT + THGRSIZ -1), (N-1))
@@ -482,7 +493,7 @@ SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
                   ST = STT
                   DO 130 SWEEPID = ST, ED
                       DO 140 K = 1, GRSIZ
-                          MYID  = (I-SWEEPID)*(STEPERCOL*GRSIZ) 
+                          MYID  = (I-SWEEPID)*(STEPERCOL*GRSIZ)
      $                           + (M-1)*GRSIZ + K
                           IF ( MYID.EQ.1 ) THEN
                               TTYPE = 1
@@ -508,17 +519,18 @@ SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
                           ENDIF
 *
 *                         Call the kernel
-*                             
+*
 #if defined(_OPENMP) &&  _OPENMP >= 201307
 
-                          IF( TTYPE.NE.1 ) THEN      
+                          IF( TTYPE.NE.1 ) THEN
 !$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1))
 !$OMP$     DEPEND(in:WORK(MYID-1))
 !$OMP$     DEPEND(out:WORK(MYID))
                               TID      = OMP_GET_THREAD_NUM()
-                              CALL ZHB2ST_KERNELS( UPLO, WANTQ, TTYPE, 
+                              CALL ZHB2ST_KERNELS(
+     $                             UPLO, WANTQ, TTYPE,
      $                             STIND, EDIND, SWEEPID, N, KD, IB,
-     $                             WORK ( INDA ), LDA, 
+     $                             WORK ( INDA ), LDA,
      $                             HOUS( INDV ), HOUS( INDTAU ), LDV,
      $                             WORK( INDW + TID*KD ) )
 !$OMP END TASK
@@ -526,20 +538,22 @@ SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 !$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1))
 !$OMP$     DEPEND(out:WORK(MYID))
                               TID      = OMP_GET_THREAD_NUM()
-                              CALL ZHB2ST_KERNELS( UPLO, WANTQ, TTYPE, 
+                              CALL ZHB2ST_KERNELS(
+     $                             UPLO, WANTQ, TTYPE,
      $                             STIND, EDIND, SWEEPID, N, KD, IB,
-     $                             WORK ( INDA ), LDA, 
+     $                             WORK ( INDA ), LDA,
      $                             HOUS( INDV ), HOUS( INDTAU ), LDV,
      $                             WORK( INDW + TID*KD ) )
 !$OMP END TASK
                           ENDIF
 #else
-                          CALL ZHB2ST_KERNELS( UPLO, WANTQ, TTYPE, 
+                          CALL ZHB2ST_KERNELS(
+     $                         UPLO, WANTQ, TTYPE,
      $                         STIND, EDIND, SWEEPID, N, KD, IB,
-     $                         WORK ( INDA ), LDA, 
+     $                         WORK ( INDA ), LDA,
      $                         HOUS( INDV ), HOUS( INDTAU ), LDV,
-     $                         WORK( INDW + TID*KD ) )
-#endif 
+     $                         WORK( INDW ) )
+#endif
                           IF ( BLKLASTIND.GE.(N-1) ) THEN
                               STT = STT + 1
                               EXIT
@@ -554,14 +568,14 @@ SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
 !$OMP END MASTER
 !$OMP END PARALLEL
 #endif
-*      
+*
 *     Copy the diagonal from A to D. Note that D is REAL thus only
 *     the Real part is needed, the imaginary part should be zero.
 *
       DO 150 I = 1, N
           D( I ) = DBLE( WORK( DPOS+(I-1)*LDA ) )
   150 CONTINUE
-*      
+*
 *     Copy the off diagonal from A to E. Note that E is REAL thus only
 *     the Real part is needed, the imaginary part should be zero.
 *
@@ -575,11 +589,10 @@ SUBROUTINE ZHETRD_HB2ST( STAGE1, VECT, UPLO, N, KD, AB, LDAB,
   170     CONTINUE
       ENDIF
 *
-      HOUS( 1 ) = LHMIN
       WORK( 1 ) = LWMIN
       RETURN
 *
 *     End of ZHETRD_HB2ST
 *
       END
-      
+
diff --git a/SRC/zhetrd_he2hb.f b/SRC/zhetrd_he2hb.f
index e1b2e17948..34bb1951f6 100644
--- a/SRC/zhetrd_he2hb.f
+++ b/SRC/zhetrd_he2hb.f
@@ -7,7 +7,6 @@
 * Online html documentation available at 
 *            http://www.netlib.org/lapack/explore-html/ 
 *
-*> \htmlonly
 *> Download ZHETRD_HE2HB + dependencies 
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrd_he2hb.f"> 
 *> [TGZ]</a> 
@@ -15,7 +14,6 @@
 *> [ZIP]</a> 
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrd_he2hb.f"> 
 *> [TXT]</a>
-*> \endhtmlonly 
 *
 *  Definition:
 *  ===========
@@ -123,8 +121,8 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (LWORK)
-*>          On exit, if INFO = 0, or if LWORK=-1, 
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, or if LWORK = -1,
 *>          WORK(1) returns the size of LWORK.
 *> \endverbatim
 *>
@@ -132,7 +130,9 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK which should be calculated
-*>          by a workspace query. LWORK = MAX(1, LWORK_QUERY)
+*>          by a workspace query.
+*>          If N <= KD+1, LWORK >= 1, else LWORK = MAX(1, LWORK_QUERY).
+*>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
@@ -158,7 +158,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetrd_he2hb
 *
 *> \par Further Details:
 *  =====================
@@ -274,7 +274,8 @@ SUBROUTINE ZHETRD_HE2HB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
      $                   TPOS, WPOS, S2POS, S1POS
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZHER2K, ZHEMM, ZGEMM, ZCOPY,
+      EXTERNAL           XERBLA, ZHER2K, ZHEMM, ZGEMM,
+     $                   ZCOPY,
      $                   ZLARFT, ZGELQF, ZGEQRF, ZLASET
 *     ..
 *     .. Intrinsic Functions ..
@@ -293,8 +294,12 @@ SUBROUTINE ZHETRD_HE2HB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
       INFO   = 0
       UPPER  = LSAME( UPLO, 'U' )
       LQUERY = ( LWORK.EQ.-1 )
-      LWMIN  = ILAENV2STAGE( 4, 'ZHETRD_HE2HB', '', N, KD, -1, -1 )
-      
+      IF( N.LE.KD+1 ) THEN
+         LWMIN = 1
+      ELSE
+         LWMIN = ILAENV2STAGE( 4, 'ZHETRD_HE2HB', '', N, KD, -1, -1 )
+      END IF
+*
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
@@ -378,7 +383,8 @@ SUBROUTINE ZHETRD_HE2HB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
 *        
              DO 20 J = I, I+PK-1
                 LK = MIN( KD, N-J ) + 1
-                CALL ZCOPY( LK, A( J, J ), LDA, AB( KD+1, J ), LDAB-1 )
+                CALL ZCOPY( LK, A( J, J ), LDA, AB( KD+1, J ),
+     $                      LDAB-1 )
    20        CONTINUE
 *                
              CALL ZLASET( 'Lower', PK, PK, ZERO, ONE, 
diff --git a/SRC/zhetrf.f b/SRC/zhetrf.f
index 78d4f71b89..8c8c4946c4 100644
--- a/SRC/zhetrf.f
+++ b/SRC/zhetrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK.  LWORK >=1.  For best performance
+*>          The length of WORK. LWORK >= 1. For best performance
 *>          LWORK >= N*NB, where NB is the block size returned by ILAENV.
 *> \endverbatim
 *>
@@ -130,7 +128,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetrf
 *
 *> \par Further Details:
 *  =====================
@@ -174,6 +172,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZHETRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -227,7 +226,7 @@ SUBROUTINE ZHETRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *        Determine the block size
 *
          NB = ILAENV( 1, 'ZHETRF', UPLO, N, -1, -1, -1 )
-         LWKOPT = N*NB
+         LWKOPT = MAX( 1, N*NB )
          WORK( 1 ) = LWKOPT
       END IF
 *
@@ -244,7 +243,8 @@ SUBROUTINE ZHETRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
          IWS = LDWORK*NB
          IF( LWORK.LT.IWS ) THEN
             NB = MAX( LWORK / LDWORK, 1 )
-            NBMIN = MAX( 2, ILAENV( 2, 'ZHETRF', UPLO, N, -1, -1, -1 ) )
+            NBMIN = MAX( 2, ILAENV( 2, 'ZHETRF', UPLO, N, -1, -1,
+     $                   -1 ) )
          END IF
       ELSE
          IWS = 1
@@ -273,7 +273,8 @@ SUBROUTINE ZHETRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *           Factorize columns k-kb+1:k of A and use blocked code to
 *           update columns 1:k-kb
 *
-            CALL ZLAHEF( UPLO, K, NB, KB, A, LDA, IPIV, WORK, N, IINFO )
+            CALL ZLAHEF( UPLO, K, NB, KB, A, LDA, IPIV, WORK, N,
+     $                   IINFO )
          ELSE
 *
 *           Use unblocked code to factorize columns 1:k of A
@@ -313,13 +314,15 @@ SUBROUTINE ZHETRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *           Factorize columns k:k+kb-1 of A and use blocked code to
 *           update columns k+kb:n
 *
-            CALL ZLAHEF( UPLO, N-K+1, NB, KB, A( K, K ), LDA, IPIV( K ),
+            CALL ZLAHEF( UPLO, N-K+1, NB, KB, A( K, K ), LDA,
+     $                   IPIV( K ),
      $                   WORK, N, IINFO )
          ELSE
 *
 *           Use unblocked code to factorize columns k:n of A
 *
-            CALL ZHETF2( UPLO, N-K+1, A( K, K ), LDA, IPIV( K ), IINFO )
+            CALL ZHETF2( UPLO, N-K+1, A( K, K ), LDA, IPIV( K ),
+     $                   IINFO )
             KB = N - K + 1
          END IF
 *
@@ -346,6 +349,7 @@ SUBROUTINE ZHETRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
       END IF
 *
    40 CONTINUE
+*
       WORK( 1 ) = LWKOPT
       RETURN
 *
diff --git a/SRC/zhetrf_aa.f b/SRC/zhetrf_aa.f
index 56722e7e6b..079fc51a4b 100644
--- a/SRC/zhetrf_aa.f
+++ b/SRC/zhetrf_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRF_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrf_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrf_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -74,7 +72,7 @@
 *>
 *>          On exit, the tridiagonal matrix is stored in the diagonals
 *>          and the subdiagonals of A just below (or above) the diagonals,
-*>          and L is stored below (or above) the subdiaonals, when UPLO
+*>          and L is stored below (or above) the subdiagonals, when UPLO
 *>          is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -101,8 +99,10 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK. LWORK >= MAX(1,2*N). For optimum performance
-*>          LWORK >= N*(1+NB), where NB is the optimal blocksize.
+*>          The length of WORK.
+*>          LWORK >= 1, if N >= 1, and LWORK >= 2*N, otherwise.
+*>          For optimum performance LWORK >= N*(1+NB), where NB is
+*>          the optimal blocksize, returned by ILAENV.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -125,10 +125,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetrf_aa
 *
 *  =====================================================================
-      SUBROUTINE ZHETRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
+      SUBROUTINE ZHETRF_AA( UPLO, N, A, LDA, IPIV,
+     $                      WORK, LWORK, INFO )
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -152,7 +153,7 @@ SUBROUTINE ZHETRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
 *
 *     .. Local Scalars ..
       LOGICAL      LQUERY, UPPER
-      INTEGER      J, LWKOPT
+      INTEGER      J, LWKMIN, LWKOPT
       INTEGER      NB, MJ, NJ, K1, K2, J1, J2, J3, JB
       COMPLEX*16   ALPHA
 *     ..
@@ -162,7 +163,8 @@ SUBROUTINE ZHETRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
       EXTERNAL     LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL     ZLAHEF_AA, ZGEMM, ZGEMV, ZCOPY, ZSCAL, ZSWAP, XERBLA
+      EXTERNAL     ZLAHEF_AA, ZGEMM, ZGEMV, ZCOPY, ZSCAL, ZSWAP,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC    DBLE, DCONJG, MAX
@@ -178,18 +180,25 @@ SUBROUTINE ZHETRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
       INFO = 0
       UPPER = LSAME( UPLO, 'U' )
       LQUERY = ( LWORK.EQ.-1 )
+      IF( N.LE.1 ) THEN
+         LWKMIN = 1
+         LWKOPT = 1
+      ELSE
+         LWKMIN = 2*N
+         LWKOPT = (NB+1)*N
+      END IF
+*
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, 2*N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -7
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         LWKOPT = (NB+1)*N
          WORK( 1 ) = LWKOPT
       END IF
 *
@@ -202,11 +211,11 @@ SUBROUTINE ZHETRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
 *
 *     Quick return
 *
-      IF ( N.EQ.0 ) THEN
+      IF( N.EQ.0 ) THEN
           RETURN
       ENDIF
       IPIV( 1 ) = 1
-      IF ( N.EQ.1 ) THEN
+      IF( N.EQ.1 ) THEN
          A( 1, 1 ) = DBLE( A( 1, 1 ) )
          RETURN
       END IF
@@ -429,7 +438,8 @@ SUBROUTINE ZHETRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
 *
                   J3 = J2
                   DO MJ = NJ-1, 1, -1
-                     CALL ZGEMM( 'No transpose', 'Conjugate transpose',
+                     CALL ZGEMM( 'No transpose',
+     $                           'Conjugate transpose',
      $                           MJ, 1, JB+1,
      $                          -ONE, WORK( (J3-J1+1)+K1*N ), N,
      $                                A( J3, J1-K2 ), LDA,
diff --git a/SRC/zhetrf_aa_2stage.f b/SRC/zhetrf_aa_2stage.f
index 92f1c09b37..ab4e67780e 100644
--- a/SRC/zhetrf_aa_2stage.f
+++ b/SRC/zhetrf_aa_2stage.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRF_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrf_aa_2stage.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrf_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -75,7 +73,7 @@
 *>          triangular part of the matrix A, and the strictly upper
 *>          triangular part of A is not referenced.
 *>
-*>          On exit, L is stored below (or above) the subdiaonal blocks,
+*>          On exit, L is stored below (or above) the subdiagonal blocks,
 *>          when UPLO  is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -87,14 +85,14 @@
 *>
 *> \param[out] TB
 *> \verbatim
-*>          TB is COMPLEX*16 array, dimension (LTB)
+*>          TB is COMPLEX*16 array, dimension (MAX(1,LTB))
 *>          On exit, details of the LU factorization of the band matrix.
 *> \endverbatim
 *>
 *> \param[in] LTB
 *> \verbatim
 *>          LTB is INTEGER
-*>          The size of the array TB. LTB >= 4*N, internally
+*>          The size of the array TB. LTB >= MAX(1,4*N), internally
 *>          used to select NB such that LTB >= (3*NB+1)*N.
 *>
 *>          If LTB = -1, then a workspace query is assumed; the
@@ -121,14 +119,14 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX*16 workspace of size LWORK
+*>          WORK is COMPLEX*16 workspace of size (MAX(1,LWORK))
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The size of WORK. LWORK >= N, internally used to select NB
-*>          such that LWORK >= N*NB.
+*>          The size of WORK. LWORK >= MAX(1,N), internally used to
+*>          select NB such that LWORK >= N*NB.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the
 *>          routine only calculates the optimal size of the WORK array,
@@ -152,7 +150,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetrf_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE ZHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
@@ -182,7 +180,7 @@ SUBROUTINE ZHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
 *     .. Local Scalars ..
       LOGICAL            UPPER, TQUERY, WQUERY
       INTEGER            I, J, K, I1, I2, TD
-      INTEGER            LDTB, NB, KB, JB, NT, IINFO
+      INTEGER            LWKOPT, LDTB, NB, KB, JB, NT, IINFO
       COMPLEX*16         PIV
 *     ..
 *     .. External Functions ..
@@ -212,9 +210,9 @@ SUBROUTINE ZHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -4
-      ELSE IF ( LTB .LT. 4*N .AND. .NOT.TQUERY ) THEN
+      ELSE IF( LTB.LT.MAX( 1, 4*N ) .AND. .NOT.TQUERY ) THEN
          INFO = -6
-      ELSE IF ( LWORK .LT. N .AND. .NOT.WQUERY ) THEN
+      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.WQUERY ) THEN
          INFO = -10
       END IF
 *
@@ -228,10 +226,10 @@ SUBROUTINE ZHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
       NB = ILAENV( 1, 'ZHETRF_AA_2STAGE', UPLO, N, -1, -1, -1 )
       IF( INFO.EQ.0 ) THEN
          IF( TQUERY ) THEN
-            TB( 1 ) = (3*NB+1)*N
+            TB( 1 ) = MAX( 1, (3*NB+1)*N )
          END IF
          IF( WQUERY ) THEN
-            WORK( 1 ) = N*NB
+            WORK( 1 ) = MAX( 1, N*NB )
          END IF
       END IF
       IF( TQUERY .OR. WQUERY ) THEN
@@ -240,7 +238,7 @@ SUBROUTINE ZHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
 *
 *     Quick return
 *
-      IF ( N.EQ.0 ) THEN
+      IF( N.EQ.0 ) THEN
          RETURN
       ENDIF
 *
@@ -392,7 +390,7 @@ SUBROUTINE ZHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
                CALL ZGETRF( N-(J+1)*NB, NB, 
      $                      WORK, N,
      $                      IPIV( (J+1)*NB+1 ), IINFO )
-c               IF (IINFO.NE.0 .AND. INFO.EQ.0) THEN
+c               IF( IINFO.NE.0 .AND. INFO.EQ.0 ) THEN
 c                  INFO = IINFO+(J+1)*NB
 c               END IF
 *
@@ -559,13 +557,15 @@ SUBROUTINE ZHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
 *                 Compute H(J,J)
 *
                   IF( J.EQ.1 ) THEN
-                     CALL ZGEMM( 'NoTranspose', 'Conjugate transpose',
+                     CALL ZGEMM( 'NoTranspose',
+     $                           'Conjugate transpose',
      $                       KB, KB, KB,
      $                       ONE,  TB( TD+1 + (J*NB)*LDTB ), LDTB-1,
      $                             A( J*NB+1, (J-1)*NB+1 ), LDA,
      $                       ZERO, WORK( J*NB+1 ), N )
                   ELSE
-                     CALL ZGEMM( 'NoTranspose', 'Conjugate transpose',
+                     CALL ZGEMM( 'NoTranspose',
+     $                           'Conjugate transpose',
      $                      KB, KB, NB+KB,
      $                      ONE, TB( TD+NB+1 + ((J-1)*NB)*LDTB ),
      $                         LDTB-1,
@@ -587,7 +587,7 @@ SUBROUTINE ZHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
                CALL ZGETRF( N-(J+1)*NB, NB, 
      $                      A( (J+1)*NB+1, J*NB+1 ), LDA,
      $                      IPIV( (J+1)*NB+1 ), IINFO )
-c               IF (IINFO.NE.0 .AND. INFO.EQ.0) THEN
+c               IF( IINFO.NE.0 .AND. INFO.EQ.0 ) THEN
 c                  INFO = IINFO+(J+1)*NB
 c               END IF
 *         
diff --git a/SRC/zhetrf_rk.f b/SRC/zhetrf_rk.f
index 73dd9f9d07..2059e30987 100644
--- a/SRC/zhetrf_rk.f
+++ b/SRC/zhetrf_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRF_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrf_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrf_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -177,14 +175,14 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension ( MAX(1,LWORK) ).
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK)).
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK.  LWORK >=1.  For best performance
+*>          The length of WORK.  LWORK >= 1.  For best performance
 *>          LWORK >= N*NB, where NB is the block size returned
 *>          by ILAENV.
 *>
@@ -229,7 +227,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetrf_rk
 *
 *> \par Further Details:
 *  =====================
@@ -256,6 +254,7 @@
 *  =====================================================================
       SUBROUTINE ZHETRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
      $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -310,7 +309,7 @@ SUBROUTINE ZHETRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *        Determine the block size
 *
          NB = ILAENV( 1, 'ZHETRF_RK', UPLO, N, -1, -1, -1 )
-         LWKOPT = N*NB
+         LWKOPT = MAX( 1, N*NB )
          WORK( 1 ) = LWKOPT
       END IF
 *
@@ -425,7 +424,8 @@ SUBROUTINE ZHETRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *           Factorize columns k:k+kb-1 of A and use blocked code to
 *           update columns k+kb:n
 *
-            CALL ZLAHEF_RK( UPLO, N-K+1, NB, KB, A( K, K ), LDA, E( K ),
+            CALL ZLAHEF_RK( UPLO, N-K+1, NB, KB, A( K, K ), LDA,
+     $                      E( K ),
      $                        IPIV( K ), WORK, LDWORK, IINFO )
 
 
diff --git a/SRC/zhetrf_rook.f b/SRC/zhetrf_rook.f
index e9de472486..1ff347c033 100644
--- a/SRC/zhetrf_rook.f
+++ b/SRC/zhetrf_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRF_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrf_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrf_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,7 +120,7 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The length of WORK.  LWORK >=1.  For best performance
+*>          The length of WORK.  LWORK >= 1.  For best performance
 *>          LWORK >= N*NB, where NB is the block size returned by ILAENV.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
@@ -150,7 +148,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetrf_rook
 *
 *> \par Further Details:
 *  =====================
@@ -208,7 +206,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE ZHETRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      SUBROUTINE ZHETRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK,
+     $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zhetri.f b/SRC/zhetri.f
index 284ba87380..c2bc51aeca 100644
--- a/SRC/zhetri.f
+++ b/SRC/zhetri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetri
 *
 *  =====================================================================
       SUBROUTINE ZHETRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,7 +222,8 @@ SUBROUTINE ZHETRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
                CALL ZCOPY( K-1, A( 1, K ), 1, WORK, 1 )
                CALL ZHEMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, ZERO,
      $                     A( 1, K ), 1 )
-               A( K, K ) = A( K, K ) - DBLE( ZDOTC( K-1, WORK, 1, A( 1,
+               A( K, K ) = A( K, K ) - DBLE( ZDOTC( K-1, WORK, 1,
+     $            A( 1,
      $                     K ), 1 ) )
             END IF
             KSTEP = 1
@@ -248,15 +248,18 @@ SUBROUTINE ZHETRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
                CALL ZCOPY( K-1, A( 1, K ), 1, WORK, 1 )
                CALL ZHEMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, ZERO,
      $                     A( 1, K ), 1 )
-               A( K, K ) = A( K, K ) - DBLE( ZDOTC( K-1, WORK, 1, A( 1,
+               A( K, K ) = A( K, K ) - DBLE( ZDOTC( K-1, WORK, 1,
+     $            A( 1,
      $                     K ), 1 ) )
                A( K, K+1 ) = A( K, K+1 ) -
-     $                       ZDOTC( K-1, A( 1, K ), 1, A( 1, K+1 ), 1 )
+     $                       ZDOTC( K-1, A( 1, K ), 1, A( 1, K+1 ),
+     $                              1 )
                CALL ZCOPY( K-1, A( 1, K+1 ), 1, WORK, 1 )
                CALL ZHEMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, ZERO,
      $                     A( 1, K+1 ), 1 )
                A( K+1, K+1 ) = A( K+1, K+1 ) -
-     $                         DBLE( ZDOTC( K-1, WORK, 1, A( 1, K+1 ),
+     $                         DBLE( ZDOTC( K-1, WORK, 1, A( 1,
+     $                               K+1 ),
      $                         1 ) )
             END IF
             KSTEP = 2
@@ -316,7 +319,8 @@ SUBROUTINE ZHETRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL ZCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL ZHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA, WORK,
+               CALL ZHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA,
+     $                     WORK,
      $                     1, ZERO, A( K+1, K ), 1 )
                A( K, K ) = A( K, K ) - DBLE( ZDOTC( N-K, WORK, 1,
      $                     A( K+1, K ), 1 ) )
@@ -341,18 +345,22 @@ SUBROUTINE ZHETRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL ZCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL ZHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA, WORK,
+               CALL ZHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA,
+     $                     WORK,
      $                     1, ZERO, A( K+1, K ), 1 )
                A( K, K ) = A( K, K ) - DBLE( ZDOTC( N-K, WORK, 1,
      $                     A( K+1, K ), 1 ) )
                A( K, K-1 ) = A( K, K-1 ) -
-     $                       ZDOTC( N-K, A( K+1, K ), 1, A( K+1, K-1 ),
+     $                       ZDOTC( N-K, A( K+1, K ), 1, A( K+1,
+     $                              K-1 ),
      $                       1 )
                CALL ZCOPY( N-K, A( K+1, K-1 ), 1, WORK, 1 )
-               CALL ZHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA, WORK,
+               CALL ZHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA,
+     $                     WORK,
      $                     1, ZERO, A( K+1, K-1 ), 1 )
                A( K-1, K-1 ) = A( K-1, K-1 ) -
-     $                         DBLE( ZDOTC( N-K, WORK, 1, A( K+1, K-1 ),
+     $                         DBLE( ZDOTC( N-K, WORK, 1, A( K+1,
+     $                               K-1 ),
      $                         1 ) )
             END IF
             KSTEP = 2
diff --git a/SRC/zhetri2.f b/SRC/zhetri2.f
index 384745c3af..f6673db230 100644
--- a/SRC/zhetri2.f
+++ b/SRC/zhetri2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRI2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetri2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetri2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,16 +86,16 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (N+NB+1)*(NB+3)
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK)).
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK.
-*>          WORK is size >= (N+NB+1)*(NB+3)
+*>          If N = 0, LWORK >= 1, else LWORK >= (N+NB+1)*(NB+3).
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>           calculates:
+*>          calculates:
 *>              - the optimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array,
 *>              - and no error message related to LWORK is issued by XERBLA.
@@ -120,10 +118,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetri2
 *
 *  =====================================================================
       SUBROUTINE ZHETRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -159,9 +158,13 @@ SUBROUTINE ZHETRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
       INFO = 0
       UPPER = LSAME( UPLO, 'U' )
       LQUERY = ( LWORK.EQ.-1 )
+*
 *     Get blocksize
+*
       NBMAX = ILAENV( 1, 'ZHETRF', UPLO, N, -1, -1, -1 )
-      IF ( NBMAX .GE. N ) THEN
+      IF( N.EQ.0 ) THEN
+         MINSIZE = 1
+      ELSE IF( NBMAX.GE.N ) THEN
          MINSIZE = N
       ELSE
          MINSIZE = (N+NBMAX+1)*(NBMAX+3)
@@ -173,28 +176,29 @@ SUBROUTINE ZHETRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -4
-      ELSE IF (LWORK .LT. MINSIZE .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.MINSIZE .AND. .NOT.LQUERY ) THEN
          INFO = -7
       END IF
-*
-*     Quick return if possible
-*
 *
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'ZHETRI2', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
-         WORK(1)=MINSIZE
+         WORK( 1 ) = MINSIZE
          RETURN
       END IF
+*
+*     Quick return if possible
+*
       IF( N.EQ.0 )
      $   RETURN
 
-      IF( NBMAX .GE. N ) THEN
+      IF( NBMAX.GE.N ) THEN
          CALL ZHETRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
       ELSE
          CALL ZHETRI2X( UPLO, N, A, LDA, IPIV, WORK, NBMAX, INFO )
       END IF
+*
       RETURN
 *
 *     End of ZHETRI2
diff --git a/SRC/zhetri2x.f b/SRC/zhetri2x.f
index c1a3908dcf..dc38727410 100644
--- a/SRC/zhetri2x.f
+++ b/SRC/zhetri2x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRI2X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetri2x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetri2x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,10 +111,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetri2x
 *
 *  =====================================================================
       SUBROUTINE ZHETRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -384,8 +383,10 @@ SUBROUTINE ZHETRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
             DO WHILE ( I .LE. N )
                IF( IPIV(I) .GT. 0 ) THEN
                   IP=IPIV(I)
-                 IF (I .LT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, I ,IP )
-                 IF (I .GT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, IP ,I )
+                 IF (I .LT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, I ,
+     $                IP )
+                 IF (I .GT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, IP ,
+     $                I )
                ELSE
                  IP=-IPIV(I)
                  I=I+1
@@ -567,12 +568,16 @@ SUBROUTINE ZHETRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
             DO WHILE ( I .GE. 1 )
                IF( IPIV(I) .GT. 0 ) THEN
                   IP=IPIV(I)
-                 IF (I .LT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, I ,IP  )
-                 IF (I .GT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, IP ,I )
+                 IF (I .LT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, I ,
+     $                IP  )
+                 IF (I .GT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, IP ,
+     $                I )
                ELSE
                  IP=-IPIV(I)
-                 IF ( I .LT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, I ,IP )
-                 IF ( I .GT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, IP ,I )
+                 IF ( I .LT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, I ,
+     $                IP )
+                 IF ( I .GT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, IP ,
+     $                I )
                  I=I-1
                ENDIF
                I=I-1
diff --git a/SRC/zhetri_3.f b/SRC/zhetri_3.f
index c778f1b9ef..55120c1fe8 100644
--- a/SRC/zhetri_3.f
+++ b/SRC/zhetri_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRI_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetri_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetri_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -152,7 +150,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetri_3
 *
 *> \par Contributors:
 *  ==================
@@ -167,6 +165,7 @@
 *  =====================================================================
       SUBROUTINE ZHETRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
      $                     INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zhetri_3x.f b/SRC/zhetri_3x.f
index 941b7522f8..defff462f2 100644
--- a/SRC/zhetri_3x.f
+++ b/SRC/zhetri_3x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRI_3X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetri_3x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetri_3x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -142,7 +140,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetri_3x
 *
 *> \par Contributors:
 *  ==================
@@ -155,7 +153,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE ZHETRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
+      SUBROUTINE ZHETRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB,
+     $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -191,7 +191,8 @@ SUBROUTINE ZHETRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZGEMM, ZHESWAPR, ZTRTRI, ZTRMM, XERBLA
+      EXTERNAL           ZGEMM, ZHESWAPR, ZTRTRI, ZTRMM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DCONJG, DBLE, MAX
@@ -436,8 +437,10 @@ SUBROUTINE ZHETRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
          DO I = 1, N
              IP = ABS( IPIV( I ) )
              IF( IP.NE.I ) THEN
-                IF (I .LT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, I ,IP )
-                IF (I .GT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, IP ,I )
+                IF (I .LT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, I ,
+     $               IP )
+                IF (I .GT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, IP ,
+     $               I )
              END IF
          END DO
 *
@@ -632,8 +635,10 @@ SUBROUTINE ZHETRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
          DO I = N, 1, -1
              IP = ABS( IPIV( I ) )
              IF( IP.NE.I ) THEN
-                IF (I .LT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, I ,IP )
-                IF (I .GT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, IP ,I )
+                IF (I .LT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, I ,
+     $               IP )
+                IF (I .GT. IP) CALL ZHESWAPR( UPLO, N, A, LDA, IP ,
+     $               I )
              END IF
          END DO
 *
diff --git a/SRC/zhetri_rook.f b/SRC/zhetri_rook.f
index f6ad6180dc..ca1097f5e1 100644
--- a/SRC/zhetri_rook.f
+++ b/SRC/zhetri_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRI_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetri_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetri_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetri_rook
 *
 *> \par Contributors:
 *  ==================
@@ -125,6 +123,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZHETRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -237,7 +236,8 @@ SUBROUTINE ZHETRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
                CALL ZCOPY( K-1, A( 1, K ), 1, WORK, 1 )
                CALL ZHEMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, CZERO,
      $                     A( 1, K ), 1 )
-               A( K, K ) = A( K, K ) - DBLE( ZDOTC( K-1, WORK, 1, A( 1,
+               A( K, K ) = A( K, K ) - DBLE( ZDOTC( K-1, WORK, 1,
+     $            A( 1,
      $                     K ), 1 ) )
             END IF
             KSTEP = 1
@@ -262,15 +262,18 @@ SUBROUTINE ZHETRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
                CALL ZCOPY( K-1, A( 1, K ), 1, WORK, 1 )
                CALL ZHEMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, CZERO,
      $                     A( 1, K ), 1 )
-               A( K, K ) = A( K, K ) - DBLE( ZDOTC( K-1, WORK, 1, A( 1,
+               A( K, K ) = A( K, K ) - DBLE( ZDOTC( K-1, WORK, 1,
+     $            A( 1,
      $                     K ), 1 ) )
                A( K, K+1 ) = A( K, K+1 ) -
-     $                       ZDOTC( K-1, A( 1, K ), 1, A( 1, K+1 ), 1 )
+     $                       ZDOTC( K-1, A( 1, K ), 1, A( 1, K+1 ),
+     $                              1 )
                CALL ZCOPY( K-1, A( 1, K+1 ), 1, WORK, 1 )
                CALL ZHEMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, CZERO,
      $                     A( 1, K+1 ), 1 )
                A( K+1, K+1 ) = A( K+1, K+1 ) -
-     $                         DBLE( ZDOTC( K-1, WORK, 1, A( 1, K+1 ),
+     $                         DBLE( ZDOTC( K-1, WORK, 1, A( 1,
+     $                               K+1 ),
      $                         1 ) )
             END IF
             KSTEP = 2
@@ -383,7 +386,8 @@ SUBROUTINE ZHETRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL ZCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL ZHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA, WORK,
+               CALL ZHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA,
+     $                     WORK,
      $                     1, CZERO, A( K+1, K ), 1 )
                A( K, K ) = A( K, K ) - DBLE( ZDOTC( N-K, WORK, 1,
      $                     A( K+1, K ), 1 ) )
@@ -408,18 +412,22 @@ SUBROUTINE ZHETRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL ZCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL ZHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA, WORK,
+               CALL ZHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA,
+     $                     WORK,
      $                     1, CZERO, A( K+1, K ), 1 )
                A( K, K ) = A( K, K ) - DBLE( ZDOTC( N-K, WORK, 1,
      $                     A( K+1, K ), 1 ) )
                A( K, K-1 ) = A( K, K-1 ) -
-     $                       ZDOTC( N-K, A( K+1, K ), 1, A( K+1, K-1 ),
+     $                       ZDOTC( N-K, A( K+1, K ), 1, A( K+1,
+     $                              K-1 ),
      $                       1 )
                CALL ZCOPY( N-K, A( K+1, K-1 ), 1, WORK, 1 )
-               CALL ZHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA, WORK,
+               CALL ZHEMV( UPLO, N-K, -CONE, A( K+1, K+1 ), LDA,
+     $                     WORK,
      $                     1, CZERO, A( K+1, K-1 ), 1 )
                A( K-1, K-1 ) = A( K-1, K-1 ) -
-     $                         DBLE( ZDOTC( N-K, WORK, 1, A( K+1, K-1 ),
+     $                         DBLE( ZDOTC( N-K, WORK, 1, A( K+1,
+     $                               K-1 ),
      $                         1 ) )
             END IF
             KSTEP = 2
@@ -434,7 +442,8 @@ SUBROUTINE ZHETRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
 *
                IF( KP.LT.N )
-     $            CALL ZSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
+     $            CALL ZSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
 *
                DO 90 J = K + 1, KP - 1
                   TEMP = DCONJG( A( J, K ) )
@@ -459,7 +468,8 @@ SUBROUTINE ZHETRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
 *
                IF( KP.LT.N )
-     $            CALL ZSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
+     $            CALL ZSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
 *
                DO 100 J = K + 1, KP - 1
                   TEMP = DCONJG( A( J, K ) )
@@ -485,7 +495,8 @@ SUBROUTINE ZHETRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
 *
                IF( KP.LT.N )
-     $            CALL ZSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
+     $            CALL ZSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
 *
                DO 110 J = K + 1, KP - 1
                   TEMP = DCONJG( A( J, K ) )
diff --git a/SRC/zhetrs.f b/SRC/zhetrs.f
index b00821d7f2..64475707d1 100644
--- a/SRC/zhetrs.f
+++ b/SRC/zhetrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,10 +111,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetrs
 *
 *  =====================================================================
       SUBROUTINE ZHETRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -148,7 +147,8 @@ SUBROUTINE ZHETRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZDSCAL, ZGEMV, ZGERU, ZLACGV, ZSWAP
+      EXTERNAL           XERBLA, ZDSCAL, ZGEMV, ZGERU, ZLACGV,
+     $                   ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, DCONJG, MAX
@@ -208,7 +208,8 @@ SUBROUTINE ZHETRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           Multiply by inv(U(K)), where U(K) is the transformation
 *           stored in column K of A.
 *
-            CALL ZGERU( K-1, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ), LDB,
+            CALL ZGERU( K-1, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ),
+     $                  LDB,
      $                  B( 1, 1 ), LDB )
 *
 *           Multiply by the inverse of the diagonal block.
@@ -229,7 +230,8 @@ SUBROUTINE ZHETRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           Multiply by inv(U(K)), where U(K) is the transformation
 *           stored in columns K-1 and K of A.
 *
-            CALL ZGERU( K-2, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ), LDB,
+            CALL ZGERU( K-2, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ),
+     $                  LDB,
      $                  B( 1, 1 ), LDB )
             CALL ZGERU( K-2, NRHS, -ONE, A( 1, K-1 ), 1, B( K-1, 1 ),
      $                  LDB, B( 1, 1 ), LDB )
@@ -346,7 +348,8 @@ SUBROUTINE ZHETRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           stored in column K of A.
 *
             IF( K.LT.N )
-     $         CALL ZGERU( N-K, NRHS, -ONE, A( K+1, K ), 1, B( K, 1 ),
+     $         CALL ZGERU( N-K, NRHS, -ONE, A( K+1, K ), 1, B( K,
+     $                     1 ),
      $                     LDB, B( K+1, 1 ), LDB )
 *
 *           Multiply by the inverse of the diagonal block.
@@ -368,7 +371,8 @@ SUBROUTINE ZHETRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL ZGERU( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K, 1 ),
+               CALL ZGERU( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K,
+     $                     1 ),
      $                     LDB, B( K+2, 1 ), LDB )
                CALL ZGERU( N-K-1, NRHS, -ONE, A( K+2, K+1 ), 1,
      $                     B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
diff --git a/SRC/zhetrs2.f b/SRC/zhetrs2.f
index 010568c421..2d1ef665e1 100644
--- a/SRC/zhetrs2.f
+++ b/SRC/zhetrs2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrs2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrs2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,11 +117,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetrs2
 *
 *  =====================================================================
       SUBROUTINE ZHETRS2( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
      $                    WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -155,7 +154,8 @@ SUBROUTINE ZHETRS2( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZDSCAL, ZSYCONV, ZSWAP, ZTRSM, XERBLA
+      EXTERNAL           ZDSCAL, ZSYCONV, ZSWAP, ZTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, DCONJG, MAX
diff --git a/SRC/zhetrs_3.f b/SRC/zhetrs_3.f
index 4de54bab48..b3eee791da 100644
--- a/SRC/zhetrs_3.f
+++ b/SRC/zhetrs_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRS_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrs_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrs_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -142,7 +140,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetrs_3
 *
 *> \par Contributors:
 *  ==================
@@ -162,6 +160,7 @@
 *  =====================================================================
       SUBROUTINE ZHETRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
      $                     INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -247,7 +246,8 @@ SUBROUTINE ZHETRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (U \P**T * B) -> B    [ (U \P**T * B) ]
 *
-         CALL ZTRSM( 'L', 'U', 'N', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL ZTRSM( 'L', 'U', 'N', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        Compute D \ B -> B   [ D \ (U \P**T * B) ]
 *
@@ -274,7 +274,8 @@ SUBROUTINE ZHETRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (U**H \ B) -> B   [ U**H \ (D \ (U \P**T * B) ) ]
 *
-         CALL ZTRSM( 'L', 'U', 'C', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL ZTRSM( 'L', 'U', 'C', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        P * B  [ P * (U**H \ (D \ (U \P**T * B) )) ]
 *
@@ -315,7 +316,8 @@ SUBROUTINE ZHETRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (L \P**T * B) -> B    [ (L \P**T * B) ]
 *
-         CALL ZTRSM( 'L', 'L', 'N', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL ZTRSM( 'L', 'L', 'N', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        Compute D \ B -> B   [ D \ (L \P**T * B) ]
 *
@@ -342,7 +344,8 @@ SUBROUTINE ZHETRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (L**H \ B) -> B   [ L**H \ (D \ (L \P**T * B) ) ]
 *
-         CALL ZTRSM('L', 'L', 'C', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL ZTRSM('L', 'L', 'C', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        P * B  [ P * (L**H \ (D \ (L \P**T * B) )) ]
 *
diff --git a/SRC/zhetrs_aa.f b/SRC/zhetrs_aa.f
index 06ac1fd287..8725481ef0 100644
--- a/SRC/zhetrs_aa.f
+++ b/SRC/zhetrs_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRS_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrs_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrs_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,7 +104,13 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK >= max(1,3*N-2).
+*>          The dimension of the array WORK.
+*>          If MIN(N,NRHS) = 0, LWORK >= 1, else LWORK >= 3*N-2.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the minimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -124,7 +128,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetrs_aa
 *
 *  =====================================================================
       SUBROUTINE ZHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
@@ -152,23 +156,30 @@ SUBROUTINE ZHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY, UPPER
-      INTEGER            K, KP, LWKOPT
+      INTEGER            K, KP, LWKMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZGTSV, ZSWAP, ZTRSM, ZLACGV, ZLACPY, XERBLA
+      EXTERNAL           ZGTSV, ZSWAP, ZTRSM, ZLACGV, ZLACPY,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX
+      INTRINSIC          MIN, MAX
 *     ..
 *     .. Executable Statements ..
 *
       INFO = 0
       UPPER = LSAME( UPLO, 'U' )
       LQUERY = ( LWORK.EQ.-1 )
+      IF( MIN( N, NRHS ).EQ.0 ) THEN
+         LWKMIN = 1
+      ELSE
+         LWKMIN = 3*N-2
+      END IF
+*
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
@@ -179,21 +190,20 @@ SUBROUTINE ZHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
          INFO = -5
       ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
          INFO = -8
-      ELSE IF( LWORK.LT.MAX( 1, 3*N-2 ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
          INFO = -10
       END IF
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'ZHETRS_AA', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
-         LWKOPT = (3*N-2)
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = LWKMIN
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( N.EQ.0 .OR. NRHS.EQ.0 )
+      IF( MIN( N, NRHS ).EQ.0 )
      $   RETURN
 *
       IF( UPPER ) THEN
@@ -214,7 +224,8 @@ SUBROUTINE ZHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute U**H \ B -> B    [ (U**H \P**T * B) ]
 *
-            CALL ZTRSM( 'L', 'U', 'C', 'U', N-1, NRHS, ONE, A( 1, 2 ),
+            CALL ZTRSM( 'L', 'U', 'C', 'U', N-1, NRHS, ONE, A( 1,
+     $                  2 ),
      $                  LDA, B( 2, 1 ), LDB )
          END IF
 *
@@ -224,8 +235,10 @@ SUBROUTINE ZHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
          CALL ZLACPY( 'F', 1, N, A(1, 1), LDA+1, WORK(N), 1 )
          IF( N.GT.1 ) THEN
-             CALL ZLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 2*N ), 1)
-             CALL ZLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 1 ), 1 )
+             CALL ZLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 2*N ),
+     $                    1)
+             CALL ZLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 1 ),
+     $                    1 )
              CALL ZLACGV( N-1, WORK( 1 ), 1 )
          END IF
          CALL ZGTSV( N, NRHS, WORK(1), WORK(N), WORK(2*N), B, LDB,
@@ -237,7 +250,8 @@ SUBROUTINE ZHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute U \ B -> B   [ U \ (T \ (U**H \P**T * B) ) ]
 *
-            CALL ZTRSM( 'L', 'U', 'N', 'U', N-1, NRHS, ONE, A( 1, 2 ),
+            CALL ZTRSM( 'L', 'U', 'N', 'U', N-1, NRHS, ONE, A( 1,
+     $                  2 ),
      $                  LDA, B(2, 1), LDB)
 *
 *           Pivot, P * B  [ P * (U**H \ (T \ (U \P**T * B) )) ]
@@ -267,7 +281,8 @@ SUBROUTINE ZHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute L \ B -> B    [ (L \P**T * B) ]
 *
-            CALL ZTRSM( 'L', 'L', 'N', 'U', N-1, NRHS, ONE, A( 2, 1 ),
+            CALL ZTRSM( 'L', 'L', 'N', 'U', N-1, NRHS, ONE, A( 2,
+     $                  1 ),
      $                  LDA, B(2, 1), LDB)
          END IF
 *
@@ -277,8 +292,10 @@ SUBROUTINE ZHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
          CALL ZLACPY( 'F', 1, N, A(1, 1), LDA+1, WORK(N), 1)
          IF( N.GT.1 ) THEN
-             CALL ZLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 1 ), 1)
-             CALL ZLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 2*N ), 1)
+             CALL ZLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 1 ),
+     $                    1)
+             CALL ZLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 2*N ),
+     $                    1)
              CALL ZLACGV( N-1, WORK( 2*N ), 1 )
          END IF
          CALL ZGTSV(N, NRHS, WORK(1), WORK(N), WORK(2*N), B, LDB,
@@ -290,7 +307,8 @@ SUBROUTINE ZHETRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute L**H \ B -> B   [ L**H \ (T \ (L \P**T * B) ) ]
 *
-            CALL ZTRSM( 'L', 'L', 'C', 'U', N-1, NRHS, ONE, A( 2, 1 ),
+            CALL ZTRSM( 'L', 'L', 'C', 'U', N-1, NRHS, ONE, A( 2,
+     $                  1 ),
      $                  LDA, B( 2, 1 ), LDB)
 *
 *           Pivot, P * B  [ P * (L**H \ (T \ (L \P**T * B) )) ]
diff --git a/SRC/zhetrs_aa_2stage.f b/SRC/zhetrs_aa_2stage.f
index 74037f8a88..8628d83bf1 100644
--- a/SRC/zhetrs_aa_2stage.f
+++ b/SRC/zhetrs_aa_2stage.f
@@ -7,7 +7,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRS_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrs_aa_2stage.f">
 *> [TGZ]</a>
@@ -15,7 +14,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrs_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,7 +131,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetrs_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE ZHETRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
@@ -217,7 +215,8 @@ SUBROUTINE ZHETRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (U**H \ B) -> B    [ (U**H \P**T * B) ]
 *
-            CALL ZTRSM( 'L', 'U', 'C', 'U', N-NB, NRHS, ONE, A(1, NB+1),
+            CALL ZTRSM( 'L', 'U', 'C', 'U', N-NB, NRHS, ONE, A(1,
+     $                  NB+1),
      $                 LDA, B(NB+1, 1), LDB)
 *
          END IF
@@ -230,7 +229,8 @@ SUBROUTINE ZHETRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (U \ B) -> B   [ U \ (T \ (U**H \P**T * B) ) ]
 *
-            CALL ZTRSM( 'L', 'U', 'N', 'U', N-NB, NRHS, ONE, A(1, NB+1),
+            CALL ZTRSM( 'L', 'U', 'N', 'U', N-NB, NRHS, ONE, A(1,
+     $                  NB+1),
      $                  LDA, B(NB+1, 1), LDB)
 *
 *           Pivot, P * B -> B  [ P * (U \ (T \ (U**H \P**T * B) )) ]
@@ -251,7 +251,8 @@ SUBROUTINE ZHETRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (L \ B) -> B    [ (L \P**T * B) ]
 *
-            CALL ZTRSM( 'L', 'L', 'N', 'U', N-NB, NRHS, ONE, A(NB+1, 1),
+            CALL ZTRSM( 'L', 'L', 'N', 'U', N-NB, NRHS, ONE, A(NB+1,
+     $                  1),
      $                 LDA, B(NB+1, 1), LDB)
 *
          END IF
@@ -264,7 +265,8 @@ SUBROUTINE ZHETRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (L**H \ B) -> B   [ L**H \ (T \ (L \P**T * B) ) ]
 *
-            CALL ZTRSM( 'L', 'L', 'C', 'U', N-NB, NRHS, ONE, A(NB+1, 1),
+            CALL ZTRSM( 'L', 'L', 'C', 'U', N-NB, NRHS, ONE, A(NB+1,
+     $                  1),
      $                  LDA, B(NB+1, 1), LDB)
 *
 *           Pivot, P * B -> B  [ P * (L**H \ (T \ (L \P**T * B) )) ]
diff --git a/SRC/zhetrs_rook.f b/SRC/zhetrs_rook.f
index cb05538244..a790abc6e3 100644
--- a/SRC/zhetrs_rook.f
+++ b/SRC/zhetrs_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHETRS_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrs_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrs_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,7 +111,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup hetrs_rook
 *
 *> \par Contributors:
 *  ==================
@@ -133,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE ZHETRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
      $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -164,7 +163,8 @@ SUBROUTINE ZHETRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZGEMV, ZGERU, ZLACGV, ZDSCAL, ZSWAP, XERBLA
+      EXTERNAL           ZGEMV, ZGERU, ZLACGV, ZDSCAL, ZSWAP,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DCONJG, MAX, DBLE
@@ -224,7 +224,8 @@ SUBROUTINE ZHETRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           Multiply by inv(U(K)), where U(K) is the transformation
 *           stored in column K of A.
 *
-            CALL ZGERU( K-1, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ), LDB,
+            CALL ZGERU( K-1, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ),
+     $                  LDB,
      $                  B( 1, 1 ), LDB )
 *
 *           Multiply by the inverse of the diagonal block.
@@ -249,7 +250,8 @@ SUBROUTINE ZHETRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           Multiply by inv(U(K)), where U(K) is the transformation
 *           stored in columns K-1 and K of A.
 *
-            CALL ZGERU( K-2, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ), LDB,
+            CALL ZGERU( K-2, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ),
+     $                  LDB,
      $                  B( 1, 1 ), LDB )
             CALL ZGERU( K-2, NRHS, -ONE, A( 1, K-1 ), 1, B( K-1, 1 ),
      $                  LDB, B( 1, 1 ), LDB )
@@ -371,7 +373,8 @@ SUBROUTINE ZHETRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           stored in column K of A.
 *
             IF( K.LT.N )
-     $         CALL ZGERU( N-K, NRHS, -ONE, A( K+1, K ), 1, B( K, 1 ),
+     $         CALL ZGERU( N-K, NRHS, -ONE, A( K+1, K ), 1, B( K,
+     $                     1 ),
      $                     LDB, B( K+1, 1 ), LDB )
 *
 *           Multiply by the inverse of the diagonal block.
@@ -397,7 +400,8 @@ SUBROUTINE ZHETRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL ZGERU( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K, 1 ),
+               CALL ZGERU( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K,
+     $                     1 ),
      $                     LDB, B( K+2, 1 ), LDB )
                CALL ZGERU( N-K-1, NRHS, -ONE, A( K+2, K+1 ), 1,
      $                     B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
diff --git a/SRC/zhfrk.f b/SRC/zhfrk.f
index 2fd8fa04db..1e653c0ebe 100644
--- a/SRC/zhfrk.f
+++ b/SRC/zhfrk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHFRK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhfrk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhfrk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,11 +158,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hfrk
 *
 *  =====================================================================
-      SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
+      SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA,
+     $                  BETA,
      $                  C )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -290,9 +290,11 @@ SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL ZHERK( 'L', 'N', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 1 ), N )
-                  CALL ZHERK( 'U', 'N', N2, K, ALPHA, A( N1+1, 1 ), LDA,
+                  CALL ZHERK( 'U', 'N', N2, K, ALPHA, A( N1+1, 1 ),
+     $                        LDA,
      $                        BETA, C( N+1 ), N )
-                  CALL ZGEMM( 'N', 'C', N2, N1, K, CALPHA, A( N1+1, 1 ),
+                  CALL ZGEMM( 'N', 'C', N2, N1, K, CALPHA, A( N1+1,
+     $                        1 ),
      $                        LDA, A( 1, 1 ), LDA, CBETA, C( N1+1 ), N )
 *
                ELSE
@@ -301,9 +303,11 @@ SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL ZHERK( 'L', 'C', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 1 ), N )
-                  CALL ZHERK( 'U', 'C', N2, K, ALPHA, A( 1, N1+1 ), LDA,
+                  CALL ZHERK( 'U', 'C', N2, K, ALPHA, A( 1, N1+1 ),
+     $                        LDA,
      $                        BETA, C( N+1 ), N )
-                  CALL ZGEMM( 'C', 'N', N2, N1, K, CALPHA, A( 1, N1+1 ),
+                  CALL ZGEMM( 'C', 'N', N2, N1, K, CALPHA, A( 1,
+     $                        N1+1 ),
      $                        LDA, A( 1, 1 ), LDA, CBETA, C( N1+1 ), N )
 *
                END IF
@@ -318,7 +322,8 @@ SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL ZHERK( 'L', 'N', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( N2+1 ), N )
-                  CALL ZHERK( 'U', 'N', N2, K, ALPHA, A( N2, 1 ), LDA,
+                  CALL ZHERK( 'U', 'N', N2, K, ALPHA, A( N2, 1 ),
+     $                        LDA,
      $                        BETA, C( N1+1 ), N )
                   CALL ZGEMM( 'N', 'C', N1, N2, K, CALPHA, A( 1, 1 ),
      $                        LDA, A( N2, 1 ), LDA, CBETA, C( 1 ), N )
@@ -329,7 +334,8 @@ SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL ZHERK( 'L', 'C', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( N2+1 ), N )
-                  CALL ZHERK( 'U', 'C', N2, K, ALPHA, A( 1, N2 ), LDA,
+                  CALL ZHERK( 'U', 'C', N2, K, ALPHA, A( 1, N2 ),
+     $                        LDA,
      $                        BETA, C( N1+1 ), N )
                   CALL ZGEMM( 'C', 'N', N1, N2, K, CALPHA, A( 1, 1 ),
      $                        LDA, A( 1, N2 ), LDA, CBETA, C( 1 ), N )
@@ -352,7 +358,8 @@ SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL ZHERK( 'U', 'N', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 1 ), N1 )
-                  CALL ZHERK( 'L', 'N', N2, K, ALPHA, A( N1+1, 1 ), LDA,
+                  CALL ZHERK( 'L', 'N', N2, K, ALPHA, A( N1+1, 1 ),
+     $                        LDA,
      $                        BETA, C( 2 ), N1 )
                   CALL ZGEMM( 'N', 'C', N1, N2, K, CALPHA, A( 1, 1 ),
      $                        LDA, A( N1+1, 1 ), LDA, CBETA,
@@ -364,7 +371,8 @@ SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL ZHERK( 'U', 'C', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 1 ), N1 )
-                  CALL ZHERK( 'L', 'C', N2, K, ALPHA, A( 1, N1+1 ), LDA,
+                  CALL ZHERK( 'L', 'C', N2, K, ALPHA, A( 1, N1+1 ),
+     $                        LDA,
      $                        BETA, C( 2 ), N1 )
                   CALL ZGEMM( 'C', 'N', N1, N2, K, CALPHA, A( 1, 1 ),
      $                        LDA, A( 1, N1+1 ), LDA, CBETA,
@@ -382,9 +390,11 @@ SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL ZHERK( 'U', 'N', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( N2*N2+1 ), N2 )
-                  CALL ZHERK( 'L', 'N', N2, K, ALPHA, A( N1+1, 1 ), LDA,
+                  CALL ZHERK( 'L', 'N', N2, K, ALPHA, A( N1+1, 1 ),
+     $                        LDA,
      $                        BETA, C( N1*N2+1 ), N2 )
-                  CALL ZGEMM( 'N', 'C', N2, N1, K, CALPHA, A( N1+1, 1 ),
+                  CALL ZGEMM( 'N', 'C', N2, N1, K, CALPHA, A( N1+1,
+     $                        1 ),
      $                        LDA, A( 1, 1 ), LDA, CBETA, C( 1 ), N2 )
 *
                ELSE
@@ -393,9 +403,11 @@ SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL ZHERK( 'U', 'C', N1, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( N2*N2+1 ), N2 )
-                  CALL ZHERK( 'L', 'C', N2, K, ALPHA, A( 1, N1+1 ), LDA,
+                  CALL ZHERK( 'L', 'C', N2, K, ALPHA, A( 1, N1+1 ),
+     $                        LDA,
      $                        BETA, C( N1*N2+1 ), N2 )
-                  CALL ZGEMM( 'C', 'N', N2, N1, K, CALPHA, A( 1, N1+1 ),
+                  CALL ZGEMM( 'C', 'N', N2, N1, K, CALPHA, A( 1,
+     $                        N1+1 ),
      $                        LDA, A( 1, 1 ), LDA, CBETA, C( 1 ), N2 )
 *
                END IF
@@ -422,9 +434,11 @@ SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL ZHERK( 'L', 'N', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 2 ), N+1 )
-                  CALL ZHERK( 'U', 'N', NK, K, ALPHA, A( NK+1, 1 ), LDA,
+                  CALL ZHERK( 'U', 'N', NK, K, ALPHA, A( NK+1, 1 ),
+     $                        LDA,
      $                        BETA, C( 1 ), N+1 )
-                  CALL ZGEMM( 'N', 'C', NK, NK, K, CALPHA, A( NK+1, 1 ),
+                  CALL ZGEMM( 'N', 'C', NK, NK, K, CALPHA, A( NK+1,
+     $                        1 ),
      $                        LDA, A( 1, 1 ), LDA, CBETA, C( NK+2 ),
      $                        N+1 )
 *
@@ -434,9 +448,11 @@ SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL ZHERK( 'L', 'C', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( 2 ), N+1 )
-                  CALL ZHERK( 'U', 'C', NK, K, ALPHA, A( 1, NK+1 ), LDA,
+                  CALL ZHERK( 'U', 'C', NK, K, ALPHA, A( 1, NK+1 ),
+     $                        LDA,
      $                        BETA, C( 1 ), N+1 )
-                  CALL ZGEMM( 'C', 'N', NK, NK, K, CALPHA, A( 1, NK+1 ),
+                  CALL ZGEMM( 'C', 'N', NK, NK, K, CALPHA, A( 1,
+     $                        NK+1 ),
      $                        LDA, A( 1, 1 ), LDA, CBETA, C( NK+2 ),
      $                        N+1 )
 *
@@ -452,7 +468,8 @@ SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL ZHERK( 'L', 'N', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK+2 ), N+1 )
-                  CALL ZHERK( 'U', 'N', NK, K, ALPHA, A( NK+1, 1 ), LDA,
+                  CALL ZHERK( 'U', 'N', NK, K, ALPHA, A( NK+1, 1 ),
+     $                        LDA,
      $                        BETA, C( NK+1 ), N+1 )
                   CALL ZGEMM( 'N', 'C', NK, NK, K, CALPHA, A( 1, 1 ),
      $                        LDA, A( NK+1, 1 ), LDA, CBETA, C( 1 ),
@@ -464,7 +481,8 @@ SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL ZHERK( 'L', 'C', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK+2 ), N+1 )
-                  CALL ZHERK( 'U', 'C', NK, K, ALPHA, A( 1, NK+1 ), LDA,
+                  CALL ZHERK( 'U', 'C', NK, K, ALPHA, A( 1, NK+1 ),
+     $                        LDA,
      $                        BETA, C( NK+1 ), N+1 )
                   CALL ZGEMM( 'C', 'N', NK, NK, K, CALPHA, A( 1, 1 ),
      $                        LDA, A( 1, NK+1 ), LDA, CBETA, C( 1 ),
@@ -488,7 +506,8 @@ SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL ZHERK( 'U', 'N', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK+1 ), NK )
-                  CALL ZHERK( 'L', 'N', NK, K, ALPHA, A( NK+1, 1 ), LDA,
+                  CALL ZHERK( 'L', 'N', NK, K, ALPHA, A( NK+1, 1 ),
+     $                        LDA,
      $                        BETA, C( 1 ), NK )
                   CALL ZGEMM( 'N', 'C', NK, NK, K, CALPHA, A( 1, 1 ),
      $                        LDA, A( NK+1, 1 ), LDA, CBETA,
@@ -500,7 +519,8 @@ SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL ZHERK( 'U', 'C', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK+1 ), NK )
-                  CALL ZHERK( 'L', 'C', NK, K, ALPHA, A( 1, NK+1 ), LDA,
+                  CALL ZHERK( 'L', 'C', NK, K, ALPHA, A( 1, NK+1 ),
+     $                        LDA,
      $                        BETA, C( 1 ), NK )
                   CALL ZGEMM( 'C', 'N', NK, NK, K, CALPHA, A( 1, 1 ),
      $                        LDA, A( 1, NK+1 ), LDA, CBETA,
@@ -518,9 +538,11 @@ SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL ZHERK( 'U', 'N', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK*( NK+1 )+1 ), NK )
-                  CALL ZHERK( 'L', 'N', NK, K, ALPHA, A( NK+1, 1 ), LDA,
+                  CALL ZHERK( 'L', 'N', NK, K, ALPHA, A( NK+1, 1 ),
+     $                        LDA,
      $                        BETA, C( NK*NK+1 ), NK )
-                  CALL ZGEMM( 'N', 'C', NK, NK, K, CALPHA, A( NK+1, 1 ),
+                  CALL ZGEMM( 'N', 'C', NK, NK, K, CALPHA, A( NK+1,
+     $                        1 ),
      $                        LDA, A( 1, 1 ), LDA, CBETA, C( 1 ), NK )
 *
                ELSE
@@ -529,9 +551,11 @@ SUBROUTINE ZHFRK( TRANSR, UPLO, TRANS, N, K, ALPHA, A, LDA, BETA,
 *
                   CALL ZHERK( 'U', 'C', NK, K, ALPHA, A( 1, 1 ), LDA,
      $                        BETA, C( NK*( NK+1 )+1 ), NK )
-                  CALL ZHERK( 'L', 'C', NK, K, ALPHA, A( 1, NK+1 ), LDA,
+                  CALL ZHERK( 'L', 'C', NK, K, ALPHA, A( 1, NK+1 ),
+     $                        LDA,
      $                        BETA, C( NK*NK+1 ), NK )
-                  CALL ZGEMM( 'C', 'N', NK, NK, K, CALPHA, A( 1, NK+1 ),
+                  CALL ZGEMM( 'C', 'N', NK, NK, K, CALPHA, A( 1,
+     $                        NK+1 ),
      $                        LDA, A( 1, 1 ), LDA, CBETA, C( 1 ), NK )
 *
                END IF
diff --git a/SRC/zhgeqz.f b/SRC/zhgeqz.f
index 302b69f347..7c01542ff9 100644
--- a/SRC/zhgeqz.f
+++ b/SRC/zhgeqz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHGEQZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhgeqz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhgeqz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -266,7 +264,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup hgeqz
 *
 *> \par Further Details:
 *  =====================
@@ -278,9 +276,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
+      SUBROUTINE ZHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T,
+     $                   LDT,
      $                   ALPHA, BETA, Q, LDQ, Z, LDZ, WORK, LWORK,
      $                   RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -524,9 +524,7 @@ SUBROUTINE ZHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
             END IF
          END IF
 *
-         IF( ABS( T( ILAST, ILAST ) ).LE.MAX( SAFMIN, ULP*( 
-     $         ABS( T( ILAST - 1, ILAST ) ) + ABS( T( ILAST-1, ILAST-1 )
-     $          ) ) ) ) THEN
+         IF( ABS( T( ILAST, ILAST ) ).LE.BTOL ) THEN
             T( ILAST, ILAST ) = CZERO
             GO TO 50
          END IF
@@ -552,10 +550,7 @@ SUBROUTINE ZHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
 *
 *           Test 2: for T(j,j)=0
 *
-            TEMP = ABS ( T( J, J + 1 ) )
-            IF ( J .GT. ILO )
-     $           TEMP = TEMP + ABS ( T( J - 1, J ) )
-            IF( ABS( T( J, J ) ).LT.MAX( SAFMIN,ULP*TEMP ) ) THEN
+            IF( ABS( T( J, J ) ).LT.BTOL ) THEN
                T( J, J ) = CZERO
 *
 *              Test 1a: Check for 2 consecutive small subdiagonals in A
@@ -584,7 +579,8 @@ SUBROUTINE ZHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
                      CALL ZROT( ILASTM-JCH, T( JCH, JCH+1 ), LDT,
      $                          T( JCH+1, JCH+1 ), LDT, C, S )
                      IF( ILQ )
-     $                  CALL ZROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ), 1,
+     $                  CALL ZROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ),
+     $                             1,
      $                             C, DCONJG( S ) )
                      IF( ILAZR2 )
      $                  H( JCH, JCH-1 ) = H( JCH, JCH-1 )*C
@@ -611,12 +607,14 @@ SUBROUTINE ZHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
      $                            T( JCH, JCH+1 ) )
                      T( JCH+1, JCH+1 ) = CZERO
                      IF( JCH.LT.ILASTM-1 )
-     $                  CALL ZROT( ILASTM-JCH-1, T( JCH, JCH+2 ), LDT,
+     $                  CALL ZROT( ILASTM-JCH-1, T( JCH, JCH+2 ),
+     $                             LDT,
      $                             T( JCH+1, JCH+2 ), LDT, C, S )
                      CALL ZROT( ILASTM-JCH+2, H( JCH, JCH-1 ), LDH,
      $                          H( JCH+1, JCH-1 ), LDH, C, S )
                      IF( ILQ )
-     $                  CALL ZROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ), 1,
+     $                  CALL ZROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ),
+     $                             1,
      $                             C, DCONJG( S ) )
                      CTEMP = H( JCH+1, JCH )
                      CALL ZLARTG( CTEMP, H( JCH+1, JCH-1 ), C, S,
@@ -627,7 +625,8 @@ SUBROUTINE ZHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
                      CALL ZROT( JCH-IFRSTM, T( IFRSTM, JCH ), 1,
      $                          T( IFRSTM, JCH-1 ), 1, C, S )
                      IF( ILZ )
-     $                  CALL ZROT( N, Z( 1, JCH ), 1, Z( 1, JCH-1 ), 1,
+     $                  CALL ZROT( N, Z( 1, JCH ), 1, Z( 1, JCH-1 ),
+     $                             1,
      $                             C, S )
    30             CONTINUE
                   GO TO 50
@@ -662,7 +661,8 @@ SUBROUTINE ZHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
          CALL ZROT( ILAST-IFRSTM, T( IFRSTM, ILAST ), 1,
      $              T( IFRSTM, ILAST-1 ), 1, C, S )
          IF( ILZ )
-     $      CALL ZROT( N, Z( 1, ILAST ), 1, Z( 1, ILAST-1 ), 1, C, S )
+     $      CALL ZROT( N, Z( 1, ILAST ), 1, Z( 1, ILAST-1 ), 1, C,
+     $                 S )
 *
 *        H(ILAST,ILAST-1)=0 -- Standardize B, set ALPHA and BETA
 *
@@ -672,8 +672,10 @@ SUBROUTINE ZHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
             SIGNBC = DCONJG( T( ILAST, ILAST ) / ABSB )
             T( ILAST, ILAST ) = ABSB
             IF( ILSCHR ) THEN
-               CALL ZSCAL( ILAST-IFRSTM, SIGNBC, T( IFRSTM, ILAST ), 1 )
-               CALL ZSCAL( ILAST+1-IFRSTM, SIGNBC, H( IFRSTM, ILAST ),
+               CALL ZSCAL( ILAST-IFRSTM, SIGNBC, T( IFRSTM, ILAST ),
+     $                     1 )
+               CALL ZSCAL( ILAST+1-IFRSTM, SIGNBC, H( IFRSTM,
+     $                     ILAST ),
      $                     1 )
             ELSE
                CALL ZSCAL( 1, SIGNBC, H( ILAST, ILAST ), 1 )
diff --git a/SRC/zhpcon.f b/SRC/zhpcon.f
index c028529b18..51c5c5a921 100644
--- a/SRC/zhpcon.f
+++ b/SRC/zhpcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHPCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhpcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhpcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -111,10 +109,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hpcon
 *
 *  =====================================================================
-      SUBROUTINE ZHPCON( UPLO, N, AP, IPIV, ANORM, RCOND, WORK, INFO )
+      SUBROUTINE ZHPCON( UPLO, N, AP, IPIV, ANORM, RCOND, WORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zhpev.f b/SRC/zhpev.f
index bc43049d87..353623c978 100644
--- a/SRC/zhpev.f
+++ b/SRC/zhpev.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHPEV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhpev.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhpev.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -130,11 +128,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHEReigen
+*> \ingroup hpev
 *
 *  =====================================================================
       SUBROUTINE ZHPEV( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, RWORK,
      $                  INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -168,7 +167,8 @@ SUBROUTINE ZHPEV( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, RWORK,
       EXTERNAL           LSAME, DLAMCH, ZLANHP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSCAL, DSTERF, XERBLA, ZDSCAL, ZHPTRD, ZSTEQR,
+      EXTERNAL           DSCAL, DSTERF, XERBLA, ZDSCAL, ZHPTRD,
+     $                   ZSTEQR,
      $                   ZUPGTR
 *     ..
 *     .. Intrinsic Functions ..
@@ -183,7 +183,8 @@ SUBROUTINE ZHPEV( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, RWORK,
       INFO = 0
       IF( .NOT.( WANTZ .OR. LSAME( JOBZ, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.( LSAME( UPLO, 'L' ) .OR. LSAME( UPLO, 'U' ) ) )
+      ELSE IF( .NOT.( LSAME( UPLO, 'L' ) .OR.
+     $         LSAME( UPLO, 'U' ) ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
diff --git a/SRC/zhpevd.f b/SRC/zhpevd.f
index 7625c8fe81..540469a575 100644
--- a/SRC/zhpevd.f
+++ b/SRC/zhpevd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHPEVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhpevd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhpevd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -41,12 +39,6 @@
 *> a complex Hermitian matrix A in packed storage.  If eigenvectors are
 *> desired, it uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -192,11 +184,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHEReigen
+*> \ingroup hpevd
 *
 *  =====================================================================
       SUBROUTINE ZHPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
      $                   RWORK, LRWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -233,7 +226,8 @@ SUBROUTINE ZHPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
       EXTERNAL           LSAME, DLAMCH, ZLANHP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSCAL, DSTERF, XERBLA, ZDSCAL, ZHPTRD, ZSTEDC,
+      EXTERNAL           DSCAL, DSTERF, XERBLA, ZDSCAL, ZHPTRD,
+     $                   ZSTEDC,
      $                   ZUPMTR
 *     ..
 *     .. Intrinsic Functions ..
@@ -249,7 +243,8 @@ SUBROUTINE ZHPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
       INFO = 0
       IF( .NOT.( WANTZ .OR. LSAME( JOBZ, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.( LSAME( UPLO, 'L' ) .OR. LSAME( UPLO, 'U' ) ) )
+      ELSE IF( .NOT.( LSAME( UPLO, 'L' ) .OR.
+     $         LSAME( UPLO, 'U' ) ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -275,7 +270,7 @@ SUBROUTINE ZHPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
             END IF
          END IF
          WORK( 1 ) = LWMIN
-         RWORK( 1 ) = LRWMIN
+         RWORK( 1 ) = REAL( LRWMIN )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -347,10 +342,12 @@ SUBROUTINE ZHPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
       IF( .NOT.WANTZ ) THEN
          CALL DSTERF( N, W, RWORK( INDE ), INFO )
       ELSE
-         CALL ZSTEDC( 'I', N, W, RWORK( INDE ), Z, LDZ, WORK( INDWRK ),
+         CALL ZSTEDC( 'I', N, W, RWORK( INDE ), Z, LDZ,
+     $                WORK( INDWRK ),
      $                LLWRK, RWORK( INDRWK ), LLRWK, IWORK, LIWORK,
      $                INFO )
-         CALL ZUPMTR( 'L', UPLO, 'N', N, N, AP, WORK( INDTAU ), Z, LDZ,
+         CALL ZUPMTR( 'L', UPLO, 'N', N, N, AP, WORK( INDTAU ), Z,
+     $                LDZ,
      $                WORK( INDWRK ), IINFO )
       END IF
 *
@@ -366,7 +363,7 @@ SUBROUTINE ZHPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK,
       END IF
 *
       WORK( 1 ) = LWMIN
-      RWORK( 1 ) = LRWMIN
+      RWORK( 1 ) = REAL( LRWMIN )
       IWORK( 1 ) = LIWMIN
       RETURN
 *
diff --git a/SRC/zhpevx.f b/SRC/zhpevx.f
index f22e84bd70..c5b0a76c62 100644
--- a/SRC/zhpevx.f
+++ b/SRC/zhpevx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHPEVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhpevx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhpevx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -231,12 +229,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHEReigen
+*> \ingroup hpevx
 *
 *  =====================================================================
       SUBROUTINE ZHPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
      $                   ABSTOL, M, W, Z, LDZ, WORK, RWORK, IWORK,
      $                   IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -264,7 +263,7 @@ SUBROUTINE ZHPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
 *     .. Local Scalars ..
       LOGICAL            ALLEIG, INDEIG, TEST, VALEIG, WANTZ
       CHARACTER          ORDER
-      INTEGER            I, IINFO, IMAX, INDD, INDE, INDEE, INDIBL,
+      INTEGER            I, IINFO, IMAX, INDD, INDE, INDEE,
      $                   INDISP, INDIWK, INDRWK, INDTAU, INDWRK, ISCALE,
      $                   ITMP1, J, JJ, NSPLIT
       DOUBLE PRECISION   ABSTLL, ANRM, BIGNUM, EPS, RMAX, RMIN, SAFMIN,
@@ -276,7 +275,8 @@ SUBROUTINE ZHPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
       EXTERNAL           LSAME, DLAMCH, ZLANHP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTERF, XERBLA, ZDSCAL,
+      EXTERNAL           DCOPY, DSCAL, DSTEBZ, DSTERF, XERBLA,
+     $                   ZDSCAL,
      $                   ZHPTRD, ZSTEIN, ZSTEQR, ZSWAP, ZUPGTR, ZUPMTR
 *     ..
 *     .. Intrinsic Functions ..
@@ -296,7 +296,8 @@ SUBROUTINE ZHPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
          INFO = -1
       ELSE IF( .NOT.( ALLEIG .OR. VALEIG .OR. INDEIG ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.( LSAME( UPLO, 'L' ) .OR. LSAME( UPLO, 'U' ) ) )
+      ELSE IF( .NOT.( LSAME( UPLO, 'L' ) .OR.
+     $         LSAME( UPLO, 'U' ) ) )
      $          THEN
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
@@ -434,24 +435,24 @@ SUBROUTINE ZHPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
       ELSE
          ORDER = 'E'
       END IF
-      INDIBL = 1
-      INDISP = INDIBL + N
+      INDISP = 1 + N
       INDIWK = INDISP + N
       CALL DSTEBZ( RANGE, ORDER, N, VLL, VUU, IL, IU, ABSTLL,
      $             RWORK( INDD ), RWORK( INDE ), M, NSPLIT, W,
-     $             IWORK( INDIBL ), IWORK( INDISP ), RWORK( INDRWK ),
+     $             IWORK( 1 ), IWORK( INDISP ), RWORK( INDRWK ),
      $             IWORK( INDIWK ), INFO )
 *
       IF( WANTZ ) THEN
          CALL ZSTEIN( N, RWORK( INDD ), RWORK( INDE ), M, W,
-     $                IWORK( INDIBL ), IWORK( INDISP ), Z, LDZ,
+     $                IWORK( 1 ), IWORK( INDISP ), Z, LDZ,
      $                RWORK( INDRWK ), IWORK( INDIWK ), IFAIL, INFO )
 *
 *        Apply unitary matrix used in reduction to tridiagonal
 *        form to eigenvectors returned by ZSTEIN.
 *
          INDWRK = INDTAU + N
-         CALL ZUPMTR( 'L', UPLO, 'N', N, M, AP, WORK( INDTAU ), Z, LDZ,
+         CALL ZUPMTR( 'L', UPLO, 'N', N, M, AP, WORK( INDTAU ), Z,
+     $                LDZ,
      $                WORK( INDWRK ), IINFO )
       END IF
 *
@@ -482,11 +483,11 @@ SUBROUTINE ZHPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU,
    30       CONTINUE
 *
             IF( I.NE.0 ) THEN
-               ITMP1 = IWORK( INDIBL+I-1 )
+               ITMP1 = IWORK( 1 + I-1 )
                W( I ) = W( J )
-               IWORK( INDIBL+I-1 ) = IWORK( INDIBL+J-1 )
+               IWORK( 1 + I-1 ) = IWORK( 1 + J-1 )
                W( J ) = TMP1
-               IWORK( INDIBL+J-1 ) = ITMP1
+               IWORK( 1 + J-1 ) = ITMP1
                CALL ZSWAP( N, Z( 1, I ), 1, Z( 1, J ), 1 )
                IF( INFO.NE.0 ) THEN
                   ITMP1 = IFAIL( I )
diff --git a/SRC/zhpgst.f b/SRC/zhpgst.f
index 49822e09d7..b4022ff7f3 100644
--- a/SRC/zhpgst.f
+++ b/SRC/zhpgst.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHPGST + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhpgst.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhpgst.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,10 +104,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hpgst
 *
 *  =====================================================================
       SUBROUTINE ZHPGST( ITYPE, UPLO, N, AP, BP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -138,7 +137,8 @@ SUBROUTINE ZHPGST( ITYPE, UPLO, N, AP, BP, INFO )
       COMPLEX*16         CT
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZDSCAL, ZHPMV, ZHPR2, ZTPMV,
+      EXTERNAL           XERBLA, ZAXPY, ZDSCAL, ZHPMV, ZHPR2,
+     $                   ZTPMV,
      $                   ZTPSV
 *     ..
 *     .. Intrinsic Functions ..
@@ -183,12 +183,14 @@ SUBROUTINE ZHPGST( ITYPE, UPLO, N, AP, BP, INFO )
 *
                AP( JJ ) = DBLE( AP( JJ ) )
                BJJ = DBLE( BP( JJ ) )
-               CALL ZTPSV( UPLO, 'Conjugate transpose', 'Non-unit', J,
+               CALL ZTPSV( UPLO, 'Conjugate transpose', 'Non-unit',
+     $                     J,
      $                     BP, AP( J1 ), 1 )
                CALL ZHPMV( UPLO, J-1, -CONE, AP, BP( J1 ), 1, CONE,
      $                     AP( J1 ), 1 )
                CALL ZDSCAL( J-1, ONE / BJJ, AP( J1 ), 1 )
-               AP( JJ ) = ( AP( JJ )-ZDOTC( J-1, AP( J1 ), 1, BP( J1 ),
+               AP( JJ ) = ( AP( JJ )-ZDOTC( J-1, AP( J1 ), 1,
+     $             BP( J1 ),
      $                    1 ) ) / BJJ
    10       CONTINUE
          ELSE
@@ -263,7 +265,8 @@ SUBROUTINE ZHPGST( ITYPE, UPLO, N, AP, BP, INFO )
                AP( JJ ) = AJJ*BJJ + ZDOTC( N-J, AP( JJ+1 ), 1,
      $                    BP( JJ+1 ), 1 )
                CALL ZDSCAL( N-J, BJJ, AP( JJ+1 ), 1 )
-               CALL ZHPMV( UPLO, N-J, CONE, AP( J1J1 ), BP( JJ+1 ), 1,
+               CALL ZHPMV( UPLO, N-J, CONE, AP( J1J1 ), BP( JJ+1 ),
+     $                     1,
      $                     CONE, AP( JJ+1 ), 1 )
                CALL ZTPMV( UPLO, 'Conjugate transpose', 'Non-unit',
      $                     N-J+1, BP( JJ ), AP( JJ ), 1 )
diff --git a/SRC/zhpgv.f b/SRC/zhpgv.f
index 72876b6e44..3bb089289b 100644
--- a/SRC/zhpgv.f
+++ b/SRC/zhpgv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHPGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhpgv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhpgv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,7 +142,7 @@
 *>                    i off-diagonal elements of an intermediate
 *>                    tridiagonal form did not convergeto zero;
 *>             > N:   if INFO = N + i, for 1 <= i <= n, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -157,11 +155,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHEReigen
+*> \ingroup hpgv
 *
 *  =====================================================================
-      SUBROUTINE ZHPGV( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
+      SUBROUTINE ZHPGV( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ,
+     $                  WORK,
      $                  RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,7 +188,8 @@ SUBROUTINE ZHPGV( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZHPEV, ZHPGST, ZPPTRF, ZTPMV, ZTPSV
+      EXTERNAL           XERBLA, ZHPEV, ZHPGST, ZPPTRF, ZTPMV,
+     $                   ZTPSV
 *     ..
 *     .. Executable Statements ..
 *
diff --git a/SRC/zhpgvd.f b/SRC/zhpgvd.f
index d27cdc761d..1f1041ffc8 100644
--- a/SRC/zhpgvd.f
+++ b/SRC/zhpgvd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHPGVD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhpgvd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhpgvd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -44,12 +42,6 @@
 *> positive definite.
 *> If eigenvectors are desired, it uses a divide and conquer algorithm.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -205,7 +197,7 @@
 *>                    i off-diagonal elements of an intermediate
 *>                    tridiagonal form did not convergeto zero;
 *>             > N:   if INFO = N + i, for 1 <= i <= n, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -218,7 +210,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHEReigen
+*> \ingroup hpgvd
 *
 *> \par Contributors:
 *  ==================
@@ -226,8 +218,10 @@
 *>     Mark Fahey, Department of Mathematics, Univ. of Kentucky, USA
 *
 *  =====================================================================
-      SUBROUTINE ZHPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
+      SUBROUTINE ZHPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ,
+     $                   WORK,
      $                   LWORK, RWORK, LRWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -255,7 +249,8 @@ SUBROUTINE ZHPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZHPEVD, ZHPGST, ZPPTRF, ZTPMV, ZTPSV
+      EXTERNAL           XERBLA, ZHPEVD, ZHPGST, ZPPTRF, ZTPMV,
+     $                   ZTPSV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, MAX
@@ -299,7 +294,7 @@ SUBROUTINE ZHPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
          END IF
 *
          WORK( 1 ) = LWMIN
-         RWORK( 1 ) = LRWMIN
+         RWORK( 1 ) = REAL( LRWMIN )
          IWORK( 1 ) = LIWMIN
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
             INFO = -11
@@ -335,9 +330,9 @@ SUBROUTINE ZHPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
       CALL ZHPGST( ITYPE, UPLO, N, AP, BP, INFO )
       CALL ZHPEVD( JOBZ, UPLO, N, AP, W, Z, LDZ, WORK, LWORK, RWORK,
      $             LRWORK, IWORK, LIWORK, INFO )
-      LWMIN = MAX( DBLE( LWMIN ), DBLE( WORK( 1 ) ) )
-      LRWMIN = MAX( DBLE( LRWMIN ), DBLE( RWORK( 1 ) ) )
-      LIWMIN = MAX( DBLE( LIWMIN ), DBLE( IWORK( 1 ) ) )
+      LWMIN = INT( MAX( DBLE( LWMIN ), DBLE( WORK( 1 ) ) ) )
+      LRWMIN = INT( MAX( DBLE( LRWMIN ), DBLE( RWORK( 1 ) ) ) )
+      LIWMIN = INT( MAX( DBLE( LIWMIN ), DBLE( IWORK( 1 ) ) ) )
 *
       IF( WANTZ ) THEN
 *
@@ -381,7 +376,7 @@ SUBROUTINE ZHPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
       END IF
 *
       WORK( 1 ) = LWMIN
-      RWORK( 1 ) = LRWMIN
+      RWORK( 1 ) = REAL( LRWMIN )
       IWORK( 1 ) = LIWMIN
       RETURN
 *
diff --git a/SRC/zhpgvx.f b/SRC/zhpgvx.f
index 94d7f77331..f63f5718ef 100644
--- a/SRC/zhpgvx.f
+++ b/SRC/zhpgvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHPGVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhpgvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhpgvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -250,7 +248,7 @@
 *>                    i eigenvectors failed to converge.  Their indices
 *>                    are stored in array IFAIL.
 *>             > N:   if INFO = N + i, for 1 <= i <= n, then the leading
-*>                    minor of order i of B is not positive definite.
+*>                    principal minor of order i of B is not positive.
 *>                    The factorization of B could not be completed and
 *>                    no eigenvalues or eigenvectors were computed.
 *> \endverbatim
@@ -263,7 +261,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHEReigen
+*> \ingroup hpgvx
 *
 *> \par Contributors:
 *  ==================
@@ -274,6 +272,7 @@
       SUBROUTINE ZHPGVX( ITYPE, JOBZ, RANGE, UPLO, N, AP, BP, VL, VU,
      $                   IL, IU, ABSTOL, M, W, Z, LDZ, WORK, RWORK,
      $                   IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -302,7 +301,8 @@ SUBROUTINE ZHPGVX( ITYPE, JOBZ, RANGE, UPLO, N, AP, BP, VL, VU,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZHPEVX, ZHPGST, ZPPTRF, ZTPMV, ZTPSV
+      EXTERNAL           XERBLA, ZHPEVX, ZHPGST, ZPPTRF, ZTPMV,
+     $                   ZTPSV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MIN
@@ -368,7 +368,8 @@ SUBROUTINE ZHPGVX( ITYPE, JOBZ, RANGE, UPLO, N, AP, BP, VL, VU,
 *     Transform problem to standard eigenvalue problem and solve.
 *
       CALL ZHPGST( ITYPE, UPLO, N, AP, BP, INFO )
-      CALL ZHPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU, ABSTOL, M,
+      CALL ZHPEVX( JOBZ, RANGE, UPLO, N, AP, VL, VU, IL, IU, ABSTOL,
+     $             M,
      $             W, Z, LDZ, WORK, RWORK, IWORK, IFAIL, INFO )
 *
       IF( WANTZ ) THEN
diff --git a/SRC/zhprfs.f b/SRC/zhprfs.f
index 4aa91aa9d3..206bd9b715 100644
--- a/SRC/zhprfs.f
+++ b/SRC/zhprfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHPRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhprfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhprfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -172,11 +170,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hprfs
 *
 *  =====================================================================
-      SUBROUTINE ZHPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
+      SUBROUTINE ZHPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
+     $                   LDX,
      $                   FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -217,7 +217,8 @@ SUBROUTINE ZHPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZHPMV, ZHPTRS, ZLACN2
+      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZHPMV, ZHPTRS,
+     $                   ZLACN2
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG, MAX
diff --git a/SRC/zhpsv.f b/SRC/zhpsv.f
index 671eac6e60..24dc3ba14c 100644
--- a/SRC/zhpsv.f
+++ b/SRC/zhpsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHPSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhpsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhpsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,7 +133,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERsolve
+*> \ingroup hpsv
 *
 *> \par Further Details:
 *  =====================
@@ -159,6 +157,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZHPSV( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,7 +189,8 @@ SUBROUTINE ZHPSV( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/zhpsvx.f b/SRC/zhpsvx.f
index 5c7b2e6ce0..3196373785 100644
--- a/SRC/zhpsvx.f
+++ b/SRC/zhpsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHPSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhpsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhpsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -249,7 +247,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERsolve
+*> \ingroup hpsvx
 *
 *> \par Further Details:
 *  =====================
@@ -272,8 +270,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZHPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
+      SUBROUTINE ZHPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB,
+     $                   X,
      $                   LDX, RCOND, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -307,7 +307,8 @@ SUBROUTINE ZHPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
       EXTERNAL           LSAME, DLAMCH, ZLANHP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZCOPY, ZHPCON, ZHPRFS, ZHPTRF, ZHPTRS,
+      EXTERNAL           XERBLA, ZCOPY, ZHPCON, ZHPRFS, ZHPTRF,
+     $                   ZHPTRS,
      $                   ZLACPY
 *     ..
 *     .. Intrinsic Functions ..
@@ -321,7 +322,8 @@ SUBROUTINE ZHPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
       NOFACT = LSAME( FACT, 'N' )
       IF( .NOT.NOFACT .AND. .NOT.LSAME( FACT, 'F' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -369,7 +371,8 @@ SUBROUTINE ZHPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
 *     Use iterative refinement to improve the computed solutions and
 *     compute error bounds and backward error estimates for them.
 *
-      CALL ZHPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX, FERR,
+      CALL ZHPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
+     $             FERR,
      $             BERR, WORK, RWORK, INFO )
 *
 *     Set INFO = N+1 if the matrix is singular to working precision.
diff --git a/SRC/zhptrd.f b/SRC/zhptrd.f
index d933af8942..671b0d31ad 100644
--- a/SRC/zhptrd.f
+++ b/SRC/zhptrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHPTRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhptrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhptrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -112,7 +110,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hptrd
 *
 *> \par Further Details:
 *  =====================
@@ -148,6 +146,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZHPTRD( UPLO, N, AP, D, E, TAU, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -276,19 +275,22 @@ SUBROUTINE ZHPTRD( UPLO, N, AP, D, E, TAU, INFO )
 *
 *              Compute  y := tau * A * v  storing y in TAU(i:n-1)
 *
-               CALL ZHPMV( UPLO, N-I, TAUI, AP( I1I1 ), AP( II+1 ), 1,
+               CALL ZHPMV( UPLO, N-I, TAUI, AP( I1I1 ), AP( II+1 ),
+     $                     1,
      $                     ZERO, TAU( I ), 1 )
 *
 *              Compute  w := y - 1/2 * tau * (y**H *v) * v
 *
-               ALPHA = -HALF*TAUI*ZDOTC( N-I, TAU( I ), 1, AP( II+1 ),
+               ALPHA = -HALF*TAUI*ZDOTC( N-I, TAU( I ), 1,
+     $                                   AP( II+1 ),
      $                 1 )
                CALL ZAXPY( N-I, ALPHA, AP( II+1 ), 1, TAU( I ), 1 )
 *
 *              Apply the transformation as a rank-2 update:
 *                 A := A - v * w**H - w * v**H
 *
-               CALL ZHPR2( UPLO, N-I, -ONE, AP( II+1 ), 1, TAU( I ), 1,
+               CALL ZHPR2( UPLO, N-I, -ONE, AP( II+1 ), 1, TAU( I ),
+     $                     1,
      $                     AP( I1I1 ) )
 *
             END IF
diff --git a/SRC/zhptrf.f b/SRC/zhptrf.f
index 9c736f3352..7f447c104f 100644
--- a/SRC/zhptrf.f
+++ b/SRC/zhptrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHPTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhptrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhptrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hptrf
 *
 *> \par Further Details:
 *  =====================
@@ -156,6 +154,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZHPTRF( UPLO, N, AP, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -524,7 +523,8 @@ SUBROUTINE ZHPTRF( UPLO, N, AP, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL ZSWAP( N-KP, AP( KNC+KP-KK+1 ), 1, AP( KPC+1 ),
+     $            CALL ZSWAP( N-KP, AP( KNC+KP-KK+1 ), 1,
+     $                        AP( KPC+1 ),
      $                        1 )
                KX = KNC + KP - KK
                DO 80 J = KK + 1, KP - 1
@@ -592,7 +592,8 @@ SUBROUTINE ZHPTRF( UPLO, N, AP, IPIV, INFO )
 *                 where L(k) and L(k+1) are the k-th and (k+1)-th
 *                 columns of L
 *
-                  D = DLAPY2( DBLE( AP( K+1+( K-1 )*( 2*N-K ) / 2 ) ),
+                  D = DLAPY2(
+     $                DBLE( AP( K+1+( K-1 )*( 2*N-K ) / 2 ) ),
      $                DIMAG( AP( K+1+( K-1 )*( 2*N-K ) / 2 ) ) )
                   D11 = DBLE( AP( K+1+K*( 2*N-K-1 ) / 2 ) ) / D
                   D22 = DBLE( AP( K+( K-1 )*( 2*N-K ) / 2 ) ) / D
diff --git a/SRC/zhptri.f b/SRC/zhptri.f
index 61147cac2a..56de270a07 100644
--- a/SRC/zhptri.f
+++ b/SRC/zhptri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHPTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhptri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhptri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hptri
 *
 *  =====================================================================
       SUBROUTINE ZHPTRI( UPLO, N, AP, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,7 +222,8 @@ SUBROUTINE ZHPTRI( UPLO, N, AP, IPIV, WORK, INFO )
                CALL ZHPMV( UPLO, K-1, -CONE, AP, WORK, 1, ZERO,
      $                     AP( KC ), 1 )
                AP( KC+K-1 ) = AP( KC+K-1 ) -
-     $                        DBLE( ZDOTC( K-1, WORK, 1, AP( KC ), 1 ) )
+     $                        DBLE( ZDOTC( K-1, WORK, 1, AP( KC ),
+     $                              1 ) )
             END IF
             KSTEP = 1
          ELSE
@@ -248,15 +248,18 @@ SUBROUTINE ZHPTRI( UPLO, N, AP, IPIV, WORK, INFO )
                CALL ZHPMV( UPLO, K-1, -CONE, AP, WORK, 1, ZERO,
      $                     AP( KC ), 1 )
                AP( KC+K-1 ) = AP( KC+K-1 ) -
-     $                        DBLE( ZDOTC( K-1, WORK, 1, AP( KC ), 1 ) )
+     $                        DBLE( ZDOTC( K-1, WORK, 1, AP( KC ),
+     $                              1 ) )
                AP( KCNEXT+K-1 ) = AP( KCNEXT+K-1 ) -
-     $                            ZDOTC( K-1, AP( KC ), 1, AP( KCNEXT ),
+     $                            ZDOTC( K-1, AP( KC ), 1,
+     $                                   AP( KCNEXT ),
      $                            1 )
                CALL ZCOPY( K-1, AP( KCNEXT ), 1, WORK, 1 )
                CALL ZHPMV( UPLO, K-1, -CONE, AP, WORK, 1, ZERO,
      $                     AP( KCNEXT ), 1 )
                AP( KCNEXT+K ) = AP( KCNEXT+K ) -
-     $                          DBLE( ZDOTC( K-1, WORK, 1, AP( KCNEXT ),
+     $                          DBLE( ZDOTC( K-1, WORK, 1,
+     $                                AP( KCNEXT ),
      $                          1 ) )
             END IF
             KSTEP = 2
@@ -349,7 +352,8 @@ SUBROUTINE ZHPTRI( UPLO, N, AP, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL ZCOPY( N-K, AP( KC+1 ), 1, WORK, 1 )
-               CALL ZHPMV( UPLO, N-K, -CONE, AP( KC+( N-K+1 ) ), WORK,
+               CALL ZHPMV( UPLO, N-K, -CONE, AP( KC+( N-K+1 ) ),
+     $                     WORK,
      $                     1, ZERO, AP( KC+1 ), 1 )
                AP( KC ) = AP( KC ) - DBLE( ZDOTC( N-K, WORK, 1,
      $                    AP( KC+1 ), 1 ) )
@@ -357,10 +361,12 @@ SUBROUTINE ZHPTRI( UPLO, N, AP, IPIV, WORK, INFO )
      $                          ZDOTC( N-K, AP( KC+1 ), 1,
      $                          AP( KCNEXT+2 ), 1 )
                CALL ZCOPY( N-K, AP( KCNEXT+2 ), 1, WORK, 1 )
-               CALL ZHPMV( UPLO, N-K, -CONE, AP( KC+( N-K+1 ) ), WORK,
+               CALL ZHPMV( UPLO, N-K, -CONE, AP( KC+( N-K+1 ) ),
+     $                     WORK,
      $                     1, ZERO, AP( KCNEXT+2 ), 1 )
                AP( KCNEXT ) = AP( KCNEXT ) -
-     $                        DBLE( ZDOTC( N-K, WORK, 1, AP( KCNEXT+2 ),
+     $                        DBLE( ZDOTC( N-K, WORK, 1,
+     $                              AP( KCNEXT+2 ),
      $                        1 ) )
             END IF
             KSTEP = 2
diff --git a/SRC/zhptrs.f b/SRC/zhptrs.f
index ddf8d8eb0c..207bae93e0 100644
--- a/SRC/zhptrs.f
+++ b/SRC/zhptrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHPTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhptrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhptrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hptrs
 *
 *  =====================================================================
       SUBROUTINE ZHPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -143,7 +142,8 @@ SUBROUTINE ZHPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZDSCAL, ZGEMV, ZGERU, ZLACGV, ZSWAP
+      EXTERNAL           XERBLA, ZDSCAL, ZGEMV, ZGERU, ZLACGV,
+     $                   ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, DCONJG, MAX
@@ -369,7 +369,8 @@ SUBROUTINE ZHPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL ZGERU( N-K-1, NRHS, -ONE, AP( KC+2 ), 1, B( K, 1 ),
+               CALL ZGERU( N-K-1, NRHS, -ONE, AP( KC+2 ), 1, B( K,
+     $                     1 ),
      $                     LDB, B( K+2, 1 ), LDB )
                CALL ZGERU( N-K-1, NRHS, -ONE, AP( KC+N-K+2 ), 1,
      $                     B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
diff --git a/SRC/zhsein.f b/SRC/zhsein.f
index 4d3594017e..15994c1294 100644
--- a/SRC/zhsein.f
+++ b/SRC/zhsein.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHSEIN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhsein.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhsein.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -226,7 +224,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hsein
 *
 *> \par Further Details:
 *  =====================
@@ -239,9 +237,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, W, VL,
+      SUBROUTINE ZHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, W,
+     $                   VL,
      $                   LDVL, VR, LDVR, MM, M, WORK, RWORK, IFAILL,
      $                   IFAILR, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -396,7 +396,8 @@ SUBROUTINE ZHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, W, VL,
 *              Compute infinity-norm of submatrix H(KL:KR,KL:KR) if it
 *              has not ben computed before.
 *
-               HNORM = ZLANHS( 'I', KR-KL+1, H( KL, KL ), LDH, RWORK )
+               HNORM = ZLANHS( 'I', KR-KL+1, H( KL, KL ), LDH,
+     $                         RWORK )
                IF( DISNAN( HNORM ) ) THEN
                   INFO = -6
                   RETURN
@@ -425,7 +426,8 @@ SUBROUTINE ZHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, W, VL,
 *
 *              Compute left eigenvector.
 *
-               CALL ZLAEIN( .FALSE., NOINIT, N-KL+1, H( KL, KL ), LDH,
+               CALL ZLAEIN( .FALSE., NOINIT, N-KL+1, H( KL, KL ),
+     $                      LDH,
      $                      WK, VL( KL, KS ), WORK, LDWORK, RWORK, EPS3,
      $                      SMLNUM, IINFO )
                IF( IINFO.GT.0 ) THEN
@@ -442,7 +444,8 @@ SUBROUTINE ZHSEIN( SIDE, EIGSRC, INITV, SELECT, N, H, LDH, W, VL,
 *
 *              Compute right eigenvector.
 *
-               CALL ZLAEIN( .TRUE., NOINIT, KR, H, LDH, WK, VR( 1, KS ),
+               CALL ZLAEIN( .TRUE., NOINIT, KR, H, LDH, WK, VR( 1,
+     $                      KS ),
      $                      WORK, LDWORK, RWORK, EPS3, SMLNUM, IINFO )
                IF( IINFO.GT.0 ) THEN
                   INFO = INFO + 1
diff --git a/SRC/zhseqr.f b/SRC/zhseqr.f
index d483641c8f..a09db3d39d 100644
--- a/SRC/zhseqr.f
+++ b/SRC/zhseqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZHSEQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhseqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhseqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -216,7 +214,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hseqr
 *
 *> \par Contributors:
 *  ==================
@@ -296,6 +294,7 @@
 *  =====================================================================
       SUBROUTINE ZHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, W, Z, LDZ,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -346,7 +345,8 @@ SUBROUTINE ZHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, W, Z, LDZ,
       EXTERNAL           ILAENV, LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZCOPY, ZLACPY, ZLAHQR, ZLAQR0, ZLASET
+      EXTERNAL           XERBLA, ZCOPY, ZLACPY, ZLAHQR, ZLAQR0,
+     $                   ZLASET
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, DCMPLX, MAX, MIN
@@ -397,7 +397,8 @@ SUBROUTINE ZHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, W, Z, LDZ,
 *
 *        ==== Quick return in case of a workspace query ====
 *
-         CALL ZLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO, IHI, Z,
+         CALL ZLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO, IHI,
+     $                Z,
      $                LDZ, WORK, LWORK, INFO )
 *        ==== Ensure reported workspace size is backward-compatible with
 *        .    previous LAPACK versions. ====
@@ -412,7 +413,8 @@ SUBROUTINE ZHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, W, Z, LDZ,
          IF( ILO.GT.1 )
      $      CALL ZCOPY( ILO-1, H, LDH+1, W, 1 )
          IF( IHI.LT.N )
-     $      CALL ZCOPY( N-IHI, H( IHI+1, IHI+1 ), LDH+1, W( IHI+1 ), 1 )
+     $      CALL ZCOPY( N-IHI, H( IHI+1, IHI+1 ), LDH+1, W( IHI+1 ),
+     $                  1 )
 *
 *        ==== Initialize Z, if requested ====
 *
@@ -435,13 +437,15 @@ SUBROUTINE ZHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, W, Z, LDZ,
 *        ==== ZLAQR0 for big matrices; ZLAHQR for small ones ====
 *
          IF( N.GT.NMIN ) THEN
-            CALL ZLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO, IHI,
+            CALL ZLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO,
+     $                   IHI,
      $                   Z, LDZ, WORK, LWORK, INFO )
          ELSE
 *
 *           ==== Small matrix ====
 *
-            CALL ZLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO, IHI,
+            CALL ZLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO,
+     $                   IHI,
      $                   Z, LDZ, INFO )
 *
             IF( INFO.GT.0 ) THEN
@@ -468,9 +472,11 @@ SUBROUTINE ZHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, W, Z, LDZ,
 *
                   CALL ZLACPY( 'A', N, N, H, LDH, HL, NL )
                   HL( N+1, N ) = ZERO
-                  CALL ZLASET( 'A', NL, NL-N, ZERO, ZERO, HL( 1, N+1 ),
+                  CALL ZLASET( 'A', NL, NL-N, ZERO, ZERO, HL( 1,
+     $                         N+1 ),
      $                         NL )
-                  CALL ZLAQR0( WANTT, WANTZ, NL, ILO, KBOT, HL, NL, W,
+                  CALL ZLAQR0( WANTT, WANTZ, NL, ILO, KBOT, HL, NL,
+     $                         W,
      $                         ILO, IHI, Z, LDZ, WORKL, NL, INFO )
                   IF( WANTT .OR. INFO.NE.0 )
      $               CALL ZLACPY( 'A', N, N, HL, NL, H, LDH )
diff --git a/SRC/zla_gbamv.f b/SRC/zla_gbamv.f
index a4a9bc0a08..bdbdf87031 100644
--- a/SRC/zla_gbamv.f
+++ b/SRC/zla_gbamv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_GBAMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_gbamv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_gbamv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -158,6 +156,8 @@
 *>           Before entry with BETA non-zero, the incremented array Y
 *>           must contain the vector y. On exit, Y is overwritten by the
 *>           updated vector y.
+*>           If either m or n is zero, then Y not referenced and the function
+*>           performs a quick return.
 *> \endverbatim
 *>
 *> \param[in] INCY
@@ -178,11 +178,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup la_gbamv
 *
 *  =====================================================================
       SUBROUTINE ZLA_GBAMV( TRANS, M, N, KL, KU, ALPHA, AB, LDAB, X,
      $                      INCX, BETA, Y, INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zla_gbrcond_c.f b/SRC/zla_gbrcond_c.f
index 6515c383e4..947d1b77a4 100644
--- a/SRC/zla_gbrcond_c.f
+++ b/SRC/zla_gbrcond_c.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_GBRCOND_C + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_gbrcond_c.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_gbrcond_c.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -153,13 +151,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup la_gbrcond
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLA_GBRCOND_C( TRANS, N, KL, KU, AB,
      $                                         LDAB, AFB, LDAFB, IPIV,
      $                                         C, CAPPLY, INFO, WORK,
      $                                         RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zla_gbrcond_x.f b/SRC/zla_gbrcond_x.f
index a3e89f3283..85ab21c1cb 100644
--- a/SRC/zla_gbrcond_x.f
+++ b/SRC/zla_gbrcond_x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_GBRCOND_X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_gbrcond_x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_gbrcond_x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -146,12 +144,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup la_gbrcond
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLA_GBRCOND_X( TRANS, N, KL, KU, AB,
      $                                         LDAB, AFB, LDAFB, IPIV,
      $                                         X, INFO, WORK, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zla_gbrfsx_extended.f b/SRC/zla_gbrfsx_extended.f
index d8185ec073..a1410fe6d1 100644
--- a/SRC/zla_gbrfsx_extended.f
+++ b/SRC/zla_gbrfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_GBRFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_gbrfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_gbrfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -54,7 +52,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERR_BNDS_NORM
 *> and ERR_BNDS_COMP for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERR_BNDS_NORM and ERR_BNDS_COMP.
 *> \endverbatim
 *
@@ -397,16 +395,18 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup la_gbrfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE ZLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL, KU,
+      SUBROUTINE ZLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL,
+     $                                KU,
      $                                NRHS, AB, LDAB, AFB, LDAFB, IPIV,
      $                                COLEQU, C, B, LDB, Y, LDY,
      $                                BERR_OUT, N_NORMS, ERR_BNDS_NORM,
      $                                ERR_BNDS_COMP, RES, AYB, DY,
      $                                Y_TAIL, RCOND, ITHRESH, RTHRESH,
      $                                DZ_UB, IGNORE_CWISE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -466,7 +466,8 @@ SUBROUTINE ZLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL, KU,
       PARAMETER          ( LA_LINRX_RCOND_I = 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZAXPY, ZCOPY, ZGBTRS, ZGBMV, BLAS_ZGBMV_X,
+      EXTERNAL           ZAXPY, ZCOPY, ZGBTRS, ZGBMV,
+     $                   BLAS_ZGBMV_X,
      $                   BLAS_ZGBMV2_X, ZLA_GBAMV, ZLA_WWADDW, DLAMCH,
      $                   CHLA_TRANSTYPE, ZLA_LIN_BERR
       DOUBLE PRECISION   DLAMCH
@@ -537,7 +538,8 @@ SUBROUTINE ZLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL, KU,
 
 !        XXX: RES is no longer needed.
             CALL ZCOPY( N, RES, 1, DY, 1 )
-            CALL ZGBTRS( TRANS, N, KL, KU, 1, AFB, LDAFB, IPIV, DY, N,
+            CALL ZGBTRS( TRANS, N, KL, KU, 1, AFB, LDAFB, IPIV, DY,
+     $                   N,
      $           INFO )
 *
 *         Calculate relative changes DX_X, DZ_Z and ratios DXRAT, DZRAT.
@@ -651,7 +653,7 @@ SUBROUTINE ZLA_GBRFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, KL, KU,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF ( Y_PREC_STATE .LT. EXTRA_Y ) THEN
                CALL ZAXPY( N, (1.0D+0,0.0D+0), DY, 1, Y(1,J), 1 )
diff --git a/SRC/zla_gbrpvgrw.f b/SRC/zla_gbrpvgrw.f
index 7bf810169c..7de037f2ef 100644
--- a/SRC/zla_gbrpvgrw.f
+++ b/SRC/zla_gbrpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_GBRPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_gbrpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_gbrpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -109,11 +107,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup la_gbrpvgrw
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLA_GBRPVGRW( N, KL, KU, NCOLS, AB,
      $                                        LDAB, AFB, LDAFB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zla_geamv.f b/SRC/zla_geamv.f
index bcdc5f1283..9e732b41b0 100644
--- a/SRC/zla_geamv.f
+++ b/SRC/zla_geamv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_GEAMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_geamv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_geamv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -147,6 +145,8 @@
 *>           Before entry with BETA non-zero, the incremented array Y
 *>           must contain the vector y. On exit, Y is overwritten by the
 *>           updated vector y.
+*>           If either m or n is zero, then Y not referenced and the function
+*>           performs a quick return.
 *> \endverbatim
 *>
 *> \param[in] INCY
@@ -167,11 +167,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup la_geamv
 *
 *  =====================================================================
-      SUBROUTINE ZLA_GEAMV( TRANS, M, N, ALPHA, A, LDA, X, INCX, BETA,
+      SUBROUTINE ZLA_GEAMV( TRANS, M, N, ALPHA, A, LDA, X, INCX,
+     $                      BETA,
      $                      Y, INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zla_gercond_c.f b/SRC/zla_gercond_c.f
index 8c8caca467..9f6c5bb96c 100644
--- a/SRC/zla_gercond_c.f
+++ b/SRC/zla_gercond_c.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_GERCOND_C + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_gercond_c.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_gercond_c.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -134,12 +132,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup la_gercond
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLA_GERCOND_C( TRANS, N, A, LDA, AF,
      $                                         LDAF, IPIV, C, CAPPLY,
      $                                         INFO, WORK, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -267,7 +266,8 @@ DOUBLE PRECISION FUNCTION ZLA_GERCOND_C( TRANS, N, A, LDA, AF,
                CALL ZGETRS( 'No transpose', N, 1, AF, LDAF, IPIV,
      $            WORK, N, INFO )
             ELSE
-               CALL ZGETRS( 'Conjugate transpose', N, 1, AF, LDAF, IPIV,
+               CALL ZGETRS( 'Conjugate transpose', N, 1, AF, LDAF,
+     $                      IPIV,
      $            WORK, N, INFO )
             ENDIF
 *
@@ -289,7 +289,8 @@ DOUBLE PRECISION FUNCTION ZLA_GERCOND_C( TRANS, N, A, LDA, AF,
             END IF
 *
             IF ( NOTRANS ) THEN
-               CALL ZGETRS( 'Conjugate transpose', N, 1, AF, LDAF, IPIV,
+               CALL ZGETRS( 'Conjugate transpose', N, 1, AF, LDAF,
+     $                      IPIV,
      $            WORK, N, INFO )
             ELSE
                CALL ZGETRS( 'No transpose', N, 1, AF, LDAF, IPIV,
diff --git a/SRC/zla_gercond_x.f b/SRC/zla_gercond_x.f
index 9de53ec91b..aa06a20db6 100644
--- a/SRC/zla_gercond_x.f
+++ b/SRC/zla_gercond_x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_GERCOND_X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_gercond_x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_gercond_x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,12 +125,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup la_gercond
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLA_GERCOND_X( TRANS, N, A, LDA, AF,
      $                                         LDAF, IPIV, X, INFO,
      $                                         WORK, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -247,7 +246,8 @@ DOUBLE PRECISION FUNCTION ZLA_GERCOND_X( TRANS, N, A, LDA, AF,
                CALL ZGETRS( 'No transpose', N, 1, AF, LDAF, IPIV,
      $            WORK, N, INFO )
             ELSE
-               CALL ZGETRS( 'Conjugate transpose', N, 1, AF, LDAF, IPIV,
+               CALL ZGETRS( 'Conjugate transpose', N, 1, AF, LDAF,
+     $                      IPIV,
      $            WORK, N, INFO )
             ENDIF
 *
@@ -265,7 +265,8 @@ DOUBLE PRECISION FUNCTION ZLA_GERCOND_X( TRANS, N, A, LDA, AF,
             END DO
 *
             IF ( NOTRANS ) THEN
-               CALL ZGETRS( 'Conjugate transpose', N, 1, AF, LDAF, IPIV,
+               CALL ZGETRS( 'Conjugate transpose', N, 1, AF, LDAF,
+     $                      IPIV,
      $            WORK, N, INFO )
             ELSE
                CALL ZGETRS( 'No transpose', N, 1, AF, LDAF, IPIV,
diff --git a/SRC/zla_gerfsx_extended.f b/SRC/zla_gerfsx_extended.f
index 355def45cf..16e8c3c44f 100644
--- a/SRC/zla_gerfsx_extended.f
+++ b/SRC/zla_gerfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_GERFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_gerfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_gerfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -53,7 +51,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERRS_N
 *> and ERRS_C for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERRS_N and ERRS_C.
 *> \endverbatim
 *
@@ -384,15 +382,17 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup la_gerfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE ZLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
+      SUBROUTINE ZLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS,
+     $                                A,
      $                                LDA, AF, LDAF, IPIV, COLEQU, C, B,
      $                                LDB, Y, LDY, BERR_OUT, N_NORMS,
      $                                ERRS_N, ERRS_C, RES, AYB, DY,
      $                                Y_TAIL, RCOND, ITHRESH, RTHRESH,
      $                                DZ_UB, IGNORE_CWISE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -453,7 +453,8 @@ SUBROUTINE ZLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
       PARAMETER          ( LA_LINRX_RCOND_I = 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZAXPY, ZCOPY, ZGETRS, ZGEMV, BLAS_ZGEMV_X,
+      EXTERNAL           ZAXPY, ZCOPY, ZGETRS, ZGEMV,
+     $                   BLAS_ZGEMV_X,
      $                   BLAS_ZGEMV2_X, ZLA_GEAMV, ZLA_WWADDW, DLAMCH,
      $                   CHLA_TRANSTYPE, ZLA_LIN_BERR
       DOUBLE PRECISION   DLAMCH
@@ -512,11 +513,13 @@ SUBROUTINE ZLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
                CALL ZGEMV( TRANS, N, N, (-1.0D+0,0.0D+0), A, LDA,
      $              Y( 1, J ), 1, (1.0D+0,0.0D+0), RES, 1)
             ELSE IF (Y_PREC_STATE .EQ. EXTRA_RESIDUAL) THEN
-               CALL BLAS_ZGEMV_X( TRANS_TYPE, N, N, (-1.0D+0,0.0D+0), A,
+               CALL BLAS_ZGEMV_X( TRANS_TYPE, N, N, (-1.0D+0,0.0D+0),
+     $                            A,
      $              LDA, Y( 1, J ), 1, (1.0D+0,0.0D+0),
      $              RES, 1, PREC_TYPE )
             ELSE
-               CALL BLAS_ZGEMV2_X( TRANS_TYPE, N, N, (-1.0D+0,0.0D+0),
+               CALL BLAS_ZGEMV2_X( TRANS_TYPE, N, N,
+     $              (-1.0D+0,0.0D+0),
      $              A, LDA, Y(1, J), Y_TAIL, 1, (1.0D+0,0.0D+0), RES, 1,
      $              PREC_TYPE)
             END IF
@@ -636,7 +639,7 @@ SUBROUTINE ZLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF ( Y_PREC_STATE .LT. EXTRA_Y ) THEN
                CALL ZAXPY( N, (1.0D+0,0.0D+0), DY, 1, Y(1,J), 1 )
@@ -672,7 +675,8 @@ SUBROUTINE ZLA_GERFSX_EXTENDED( PREC_TYPE, TRANS_TYPE, N, NRHS, A,
 *            op(A) = A, A**T, or A**H depending on TRANS (and type).
 *
          CALL ZCOPY( N, B( 1, J ), 1, RES, 1 )
-         CALL ZGEMV( TRANS, N, N, (-1.0D+0,0.0D+0), A, LDA, Y(1,J), 1,
+         CALL ZGEMV( TRANS, N, N, (-1.0D+0,0.0D+0), A, LDA, Y(1,J),
+     $               1,
      $        (1.0D+0,0.0D+0), RES, 1 )
 
          DO I = 1, N
diff --git a/SRC/zla_gerpvgrw.f b/SRC/zla_gerpvgrw.f
index 64da5a1ff6..a499329735 100644
--- a/SRC/zla_gerpvgrw.f
+++ b/SRC/zla_gerpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_GERPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_gerpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_gerpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -92,11 +90,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup la_gerpvgrw
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLA_GERPVGRW( N, NCOLS, A, LDA, AF,
      $                                        LDAF )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zla_heamv.f b/SRC/zla_heamv.f
index 66cece241c..485f1d9390 100644
--- a/SRC/zla_heamv.f
+++ b/SRC/zla_heamv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_HEAMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_heamv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_heamv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -154,7 +152,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup la_heamv
 *
 *> \par Further Details:
 *  =====================
@@ -175,6 +173,7 @@
 *  =====================================================================
       SUBROUTINE ZLA_HEAMV( UPLO, N, ALPHA, A, LDA, X, INCX, BETA, Y,
      $                      INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zla_hercond_c.f b/SRC/zla_hercond_c.f
index 9de54ea524..d9b7f3268c 100644
--- a/SRC/zla_hercond_c.f
+++ b/SRC/zla_hercond_c.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_HERCOND_C + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_hercond_c.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_hercond_c.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -131,12 +129,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup la_hercond
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLA_HERCOND_C( UPLO, N, A, LDA, AF,
      $                                         LDAF, IPIV, C, CAPPLY,
      $                                         INFO, WORK, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zla_hercond_x.f b/SRC/zla_hercond_x.f
index e1ffafd496..b62318009c 100644
--- a/SRC/zla_hercond_x.f
+++ b/SRC/zla_hercond_x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_HERCOND_X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_hercond_x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_hercond_x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -124,12 +122,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup la_hercond
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLA_HERCOND_X( UPLO, N, A, LDA, AF,
      $                                         LDAF, IPIV, X, INFO,
      $                                         WORK, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zla_herfsx_extended.f b/SRC/zla_herfsx_extended.f
index 2c8c778af7..7469b16dcb 100644
--- a/SRC/zla_herfsx_extended.f
+++ b/SRC/zla_herfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_HERFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_herfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_herfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -55,7 +53,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERR_BNDS_NORM
 *> and ERR_BNDS_COMP for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERR_BNDS_NORM and ERR_BNDS_COMP.
 *> \endverbatim
 *
@@ -382,16 +380,18 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup la_herfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE ZLA_HERFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
+      SUBROUTINE ZLA_HERFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A,
+     $                                LDA,
      $                                AF, LDAF, IPIV, COLEQU, C, B, LDB,
      $                                Y, LDY, BERR_OUT, N_NORMS,
      $                                ERR_BNDS_NORM, ERR_BNDS_COMP, RES,
      $                                AYB, DY, Y_TAIL, RCOND, ITHRESH,
      $                                RTHRESH, DZ_UB, IGNORE_CWISE,
      $                                INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -457,7 +457,8 @@ SUBROUTINE ZLA_HERFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
       INTEGER            ILAUPLO
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZAXPY, ZCOPY, ZHETRS, ZHEMV, BLAS_ZHEMV_X,
+      EXTERNAL           ZAXPY, ZCOPY, ZHETRS, ZHEMV,
+     $                   BLAS_ZHEMV_X,
      $                   BLAS_ZHEMV2_X, ZLA_HEAMV, ZLA_WWADDW,
      $                   ZLA_LIN_BERR
       DOUBLE PRECISION   DLAMCH
@@ -537,7 +538,8 @@ SUBROUTINE ZLA_HERFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
 *
             CALL ZCOPY( N, B( 1, J ), 1, RES, 1 )
             IF ( Y_PREC_STATE .EQ. BASE_RESIDUAL ) THEN
-               CALL ZHEMV( UPLO, N, DCMPLX(-1.0D+0), A, LDA, Y( 1, J ),
+               CALL ZHEMV( UPLO, N, DCMPLX(-1.0D+0), A, LDA, Y( 1,
+     $                     J ),
      $              1, DCMPLX(1.0D+0), RES, 1 )
             ELSE IF ( Y_PREC_STATE .EQ. EXTRA_RESIDUAL ) THEN
                CALL BLAS_ZHEMV_X( UPLO2, N, DCMPLX(-1.0D+0), A, LDA,
@@ -655,7 +657,7 @@ SUBROUTINE ZLA_HERFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF ( Y_PREC_STATE .LT. EXTRA_Y ) THEN
                CALL ZAXPY( N, DCMPLX(1.0D+0), DY, 1, Y(1,J), 1 )
diff --git a/SRC/zla_herpvgrw.f b/SRC/zla_herpvgrw.f
index 76571f6da5..8d7f15d488 100644
--- a/SRC/zla_herpvgrw.f
+++ b/SRC/zla_herpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_HERPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_herpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_herpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,11 +113,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup la_herpvgrw
 *
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION ZLA_HERPVGRW( UPLO, N, INFO, A, LDA, AF,
+      DOUBLE PRECISION FUNCTION ZLA_HERPVGRW( UPLO, N, INFO, A, LDA,
+     $                                        AF,
      $                                        LDAF, IPIV, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zla_lin_berr.f b/SRC/zla_lin_berr.f
index 5ca205b98b..7f96ed4fa1 100644
--- a/SRC/zla_lin_berr.f
+++ b/SRC/zla_lin_berr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_LIN_BERR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_lin_berr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_lin_berr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -94,10 +92,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup la_lin_berr
 *
 *  =====================================================================
       SUBROUTINE ZLA_LIN_BERR( N, NZ, NRHS, RES, AYB, BERR )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zla_porcond_c.f b/SRC/zla_porcond_c.f
index 6133f43dfe..30b566a77f 100644
--- a/SRC/zla_porcond_c.f
+++ b/SRC/zla_porcond_c.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_PORCOND_C + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_porcond_c.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_porcond_c.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,12 +121,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POcomputational
+*> \ingroup la_porcond
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLA_PORCOND_C( UPLO, N, A, LDA, AF,
      $                                         LDAF, C, CAPPLY, INFO,
      $                                         WORK, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zla_porcond_x.f b/SRC/zla_porcond_x.f
index e73718cfc5..c4a9cd1a6c 100644
--- a/SRC/zla_porcond_x.f
+++ b/SRC/zla_porcond_x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_PORCOND_X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_porcond_x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_porcond_x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -116,12 +114,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POcomputational
+*> \ingroup la_porcond
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLA_PORCOND_X( UPLO, N, A, LDA, AF,
      $                                         LDAF, X, INFO, WORK,
      $                                         RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zla_porfsx_extended.f b/SRC/zla_porfsx_extended.f
index e2265c56f5..a8fad72e38 100644
--- a/SRC/zla_porfsx_extended.f
+++ b/SRC/zla_porfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_PORFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_porfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_porfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -54,7 +52,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERR_BNDS_NORM
 *> and ERR_BNDS_COMP for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERR_BNDS_NORM and ERR_BNDS_COMP.
 *> \endverbatim
 *
@@ -374,16 +372,18 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POcomputational
+*> \ingroup la_porfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE ZLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
+      SUBROUTINE ZLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A,
+     $                                LDA,
      $                                AF, LDAF, COLEQU, C, B, LDB, Y,
      $                                LDY, BERR_OUT, N_NORMS,
      $                                ERR_BNDS_NORM, ERR_BNDS_COMP, RES,
      $                                AYB, DY, Y_TAIL, RCOND, ITHRESH,
      $                                RTHRESH, DZ_UB, IGNORE_CWISE,
      $                                INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -448,7 +448,8 @@ SUBROUTINE ZLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
       INTEGER            ILAUPLO
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZAXPY, ZCOPY, ZPOTRS, ZHEMV, BLAS_ZHEMV_X,
+      EXTERNAL           ZAXPY, ZCOPY, ZPOTRS, ZHEMV,
+     $                   BLAS_ZHEMV_X,
      $                   BLAS_ZHEMV2_X, ZLA_HEAMV, ZLA_WWADDW,
      $                   ZLA_LIN_BERR, DLAMCH
       DOUBLE PRECISION   DLAMCH
@@ -508,7 +509,8 @@ SUBROUTINE ZLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
 *
             CALL ZCOPY( N, B( 1, J ), 1, RES, 1 )
             IF (Y_PREC_STATE .EQ. BASE_RESIDUAL) THEN
-               CALL ZHEMV(UPLO, N, DCMPLX(-1.0D+0), A, LDA, Y(1,J), 1,
+               CALL ZHEMV(UPLO, N, DCMPLX(-1.0D+0), A, LDA, Y(1,J),
+     $                     1,
      $              DCMPLX(1.0D+0), RES, 1)
             ELSE IF (Y_PREC_STATE .EQ. EXTRA_RESIDUAL) THEN
                CALL BLAS_ZHEMV_X(UPLO2, N, DCMPLX(-1.0D+0), A, LDA,
@@ -626,7 +628,7 @@ SUBROUTINE ZLA_PORFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF (Y_PREC_STATE .LT. EXTRA_Y) THEN
                CALL ZAXPY( N, DCMPLX(1.0D+0), DY, 1, Y(1,J), 1 )
diff --git a/SRC/zla_porpvgrw.f b/SRC/zla_porpvgrw.f
index 9b381a0727..df20e62a6d 100644
--- a/SRC/zla_porpvgrw.f
+++ b/SRC/zla_porpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_PORPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_porpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_porpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -99,11 +97,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POcomputational
+*> \ingroup la_porpvgrw
 *
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION ZLA_PORPVGRW( UPLO, NCOLS, A, LDA, AF,
+      DOUBLE PRECISION FUNCTION ZLA_PORPVGRW( UPLO, NCOLS, A, LDA,
+     $                                        AF,
      $                                        LDAF, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -142,9 +142,9 @@ DOUBLE PRECISION FUNCTION ZLA_PORPVGRW( UPLO, NCOLS, A, LDA, AF,
 *     .. Executable Statements ..
       UPPER = LSAME( 'Upper', UPLO )
 *
-*     DPOTRF will have factored only the NCOLSxNCOLS leading minor, so
-*     we restrict the growth search to that minor and use only the first
-*     2*NCOLS workspace entries.
+*     DPOTRF will have factored only the NCOLSxNCOLS leading submatrix,
+*     so we restrict the growth search to that submatrix and use only
+*     the first 2*NCOLS workspace entries.
 *
       RPVGRW = 1.0D+0
       DO I = 1, 2*NCOLS
diff --git a/SRC/zla_syamv.f b/SRC/zla_syamv.f
index d00406fb57..521f3727fb 100644
--- a/SRC/zla_syamv.f
+++ b/SRC/zla_syamv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_SYAMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_syamv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_syamv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -155,7 +153,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup la_heamv
 *
 *> \par Further Details:
 *  =====================
@@ -176,6 +174,7 @@
 *  =====================================================================
       SUBROUTINE ZLA_SYAMV( UPLO, N, ALPHA, A, LDA, X, INCX, BETA, Y,
      $                      INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zla_syrcond_c.f b/SRC/zla_syrcond_c.f
index fd7287373c..a149f99396 100644
--- a/SRC/zla_syrcond_c.f
+++ b/SRC/zla_syrcond_c.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_SYRCOND_C + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_syrcond_c.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_syrcond_c.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -131,12 +129,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup la_hercond
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLA_SYRCOND_C( UPLO, N, A, LDA, AF,
      $                                         LDAF, IPIV, C, CAPPLY,
      $                                         INFO, WORK, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zla_syrcond_x.f b/SRC/zla_syrcond_x.f
index 85ef929bfa..fdae62d9f4 100644
--- a/SRC/zla_syrcond_x.f
+++ b/SRC/zla_syrcond_x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_SYRCOND_X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_syrcond_x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_syrcond_x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -124,12 +122,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup la_hercond
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLA_SYRCOND_X( UPLO, N, A, LDA, AF,
      $                                         LDAF, IPIV, X, INFO,
      $                                         WORK, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zla_syrfsx_extended.f b/SRC/zla_syrfsx_extended.f
index bdb7c05c3b..fecbbf5d29 100644
--- a/SRC/zla_syrfsx_extended.f
+++ b/SRC/zla_syrfsx_extended.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_SYRFSX_EXTENDED + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_syrfsx_extended.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_syrfsx_extended.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -55,7 +53,7 @@
 *> In addition to normwise error bound, the code provides maximum
 *> componentwise error bound if possible. See comments for ERR_BNDS_NORM
 *> and ERR_BNDS_COMP for details of the error bounds. Note that this
-*> subroutine is only resonsible for setting the second fields of
+*> subroutine is only responsible for setting the second fields of
 *> ERR_BNDS_NORM and ERR_BNDS_COMP.
 *> \endverbatim
 *
@@ -382,16 +380,18 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup la_herfsx_extended
 *
 *  =====================================================================
-      SUBROUTINE ZLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
+      SUBROUTINE ZLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A,
+     $                                LDA,
      $                                AF, LDAF, IPIV, COLEQU, C, B, LDB,
      $                                Y, LDY, BERR_OUT, N_NORMS,
      $                                ERR_BNDS_NORM, ERR_BNDS_COMP, RES,
      $                                AYB, DY, Y_TAIL, RCOND, ITHRESH,
      $                                RTHRESH, DZ_UB, IGNORE_CWISE,
      $                                INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -457,7 +457,8 @@ SUBROUTINE ZLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
       INTEGER            ILAUPLO
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZAXPY, ZCOPY, ZSYTRS, ZSYMV, BLAS_ZSYMV_X,
+      EXTERNAL           ZAXPY, ZCOPY, ZSYTRS, ZSYMV,
+     $                   BLAS_ZSYMV_X,
      $                   BLAS_ZSYMV2_X, ZLA_SYAMV, ZLA_WWADDW,
      $                   ZLA_LIN_BERR
       DOUBLE PRECISION   DLAMCH
@@ -537,7 +538,8 @@ SUBROUTINE ZLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
 *
             CALL ZCOPY( N, B( 1, J ), 1, RES, 1 )
             IF ( Y_PREC_STATE .EQ. BASE_RESIDUAL ) THEN
-               CALL ZSYMV( UPLO, N, DCMPLX(-1.0D+0), A, LDA, Y(1,J), 1,
+               CALL ZSYMV( UPLO, N, DCMPLX(-1.0D+0), A, LDA, Y(1,J),
+     $                     1,
      $              DCMPLX(1.0D+0), RES, 1 )
             ELSE IF ( Y_PREC_STATE .EQ. EXTRA_RESIDUAL ) THEN
                CALL BLAS_ZSYMV_X( UPLO2, N, DCMPLX(-1.0D+0), A, LDA,
@@ -655,7 +657,7 @@ SUBROUTINE ZLA_SYRFSX_EXTENDED( PREC_TYPE, UPLO, N, NRHS, A, LDA,
             PREVNORMDX = NORMDX
             PREV_DZ_Z = DZ_Z
 *
-*           Update soluton.
+*           Update solution.
 *
             IF ( Y_PREC_STATE .LT. EXTRA_Y ) THEN
                CALL ZAXPY( N, DCMPLX(1.0D+0), DY, 1, Y(1,J), 1 )
diff --git a/SRC/zla_syrpvgrw.f b/SRC/zla_syrpvgrw.f
index d256eee304..7a6a4ea1f6 100644
--- a/SRC/zla_syrpvgrw.f
+++ b/SRC/zla_syrpvgrw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_SYRPVGRW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_syrpvgrw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_syrpvgrw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -115,11 +113,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup la_herpvgrw
 *
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION ZLA_SYRPVGRW( UPLO, N, INFO, A, LDA, AF,
+      DOUBLE PRECISION FUNCTION ZLA_SYRPVGRW( UPLO, N, INFO, A, LDA,
+     $                                        AF,
      $                                        LDAF, IPIV, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zla_wwaddw.f b/SRC/zla_wwaddw.f
index e9d8366463..a3b4d9850b 100644
--- a/SRC/zla_wwaddw.f
+++ b/SRC/zla_wwaddw.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLA_WWADDW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zla_wwaddw.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zla_wwaddw.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -74,10 +72,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup la_wwaddw
 *
 *  =====================================================================
       SUBROUTINE ZLA_WWADDW( N, X, Y, W )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlabrd.f b/SRC/zlabrd.f
index ab3b3217fd..7354e7090d 100644
--- a/SRC/zlabrd.f
+++ b/SRC/zlabrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLABRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlabrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlabrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -157,7 +155,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup labrd
 *
 *> \par Further Details:
 *  =====================
@@ -207,8 +205,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
+      SUBROUTINE ZLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX,
+     $                   Y,
      $                   LDY )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -279,7 +279,8 @@ SUBROUTINE ZLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
                CALL ZGEMV( 'Conjugate transpose', M-I+1, I-1, ONE,
      $                     A( I, 1 ), LDA, A( I, I ), 1, ZERO,
      $                     Y( 1, I ), 1 )
-               CALL ZGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1, 1 ),
+               CALL ZGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1,
+     $                     1 ),
      $                     LDY, Y( 1, I ), 1, ONE, Y( I+1, I ), 1 )
                CALL ZGEMV( 'Conjugate transpose', M-I+1, I-1, ONE,
      $                     X( I, 1 ), LDX, A( I, I ), 1, ZERO,
@@ -312,16 +313,19 @@ SUBROUTINE ZLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
 *
 *              Compute X(i+1:m,i)
 *
-               CALL ZGEMV( 'No transpose', M-I, N-I, ONE, A( I+1, I+1 ),
+               CALL ZGEMV( 'No transpose', M-I, N-I, ONE, A( I+1,
+     $                     I+1 ),
      $                     LDA, A( I, I+1 ), LDA, ZERO, X( I+1, I ), 1 )
                CALL ZGEMV( 'Conjugate transpose', N-I, I, ONE,
      $                     Y( I+1, 1 ), LDY, A( I, I+1 ), LDA, ZERO,
      $                     X( 1, I ), 1 )
                CALL ZGEMV( 'No transpose', M-I, I, -ONE, A( I+1, 1 ),
      $                     LDA, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
-               CALL ZGEMV( 'No transpose', I-1, N-I, ONE, A( 1, I+1 ),
+               CALL ZGEMV( 'No transpose', I-1, N-I, ONE, A( 1,
+     $                     I+1 ),
      $                     LDA, A( I, I+1 ), LDA, ZERO, X( 1, I ), 1 )
-               CALL ZGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1, 1 ),
+               CALL ZGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1,
+     $                     1 ),
      $                     LDX, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
                CALL ZSCAL( M-I, TAUP( I ), X( I+1, I ), 1 )
                CALL ZLACGV( N-I, A( I, I+1 ), LDA )
@@ -357,16 +361,20 @@ SUBROUTINE ZLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
 *
 *              Compute X(i+1:m,i)
 *
-               CALL ZGEMV( 'No transpose', M-I, N-I+1, ONE, A( I+1, I ),
+               CALL ZGEMV( 'No transpose', M-I, N-I+1, ONE, A( I+1,
+     $                     I ),
      $                     LDA, A( I, I ), LDA, ZERO, X( I+1, I ), 1 )
                CALL ZGEMV( 'Conjugate transpose', N-I+1, I-1, ONE,
      $                     Y( I, 1 ), LDY, A( I, I ), LDA, ZERO,
      $                     X( 1, I ), 1 )
-               CALL ZGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1, 1 ),
+               CALL ZGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1,
+     $                     1 ),
      $                     LDA, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
-               CALL ZGEMV( 'No transpose', I-1, N-I+1, ONE, A( 1, I ),
+               CALL ZGEMV( 'No transpose', I-1, N-I+1, ONE, A( 1,
+     $                     I ),
      $                     LDA, A( I, I ), LDA, ZERO, X( 1, I ), 1 )
-               CALL ZGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1, 1 ),
+               CALL ZGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1,
+     $                     1 ),
      $                     LDX, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
                CALL ZSCAL( M-I, TAUP( I ), X( I+1, I ), 1 )
                CALL ZLACGV( N-I+1, A( I, I ), LDA )
@@ -374,7 +382,8 @@ SUBROUTINE ZLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
 *              Update A(i+1:m,i)
 *
                CALL ZLACGV( I-1, Y( I, 1 ), LDY )
-               CALL ZGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1, 1 ),
+               CALL ZGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1,
+     $                     1 ),
      $                     LDA, Y( I, 1 ), LDY, ONE, A( I+1, I ), 1 )
                CALL ZLACGV( I-1, Y( I, 1 ), LDY )
                CALL ZGEMV( 'No transpose', M-I, I, -ONE, X( I+1, 1 ),
@@ -396,7 +405,8 @@ SUBROUTINE ZLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
                CALL ZGEMV( 'Conjugate transpose', M-I, I-1, ONE,
      $                     A( I+1, 1 ), LDA, A( I+1, I ), 1, ZERO,
      $                     Y( 1, I ), 1 )
-               CALL ZGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1, 1 ),
+               CALL ZGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1,
+     $                     1 ),
      $                     LDY, Y( 1, I ), 1, ONE, Y( I+1, I ), 1 )
                CALL ZGEMV( 'Conjugate transpose', M-I, I, ONE,
      $                     X( I+1, 1 ), LDX, A( I+1, I ), 1, ZERO,
diff --git a/SRC/zlacgv.f b/SRC/zlacgv.f
index dc935e08f4..75faea8fa7 100644
--- a/SRC/zlacgv.f
+++ b/SRC/zlacgv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLACGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlacgv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlacgv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -67,10 +65,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lacgv
 *
 *  =====================================================================
       SUBROUTINE ZLACGV( N, X, INCX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlacn2.f b/SRC/zlacn2.f
index d301d95f44..1f30513cc1 100644
--- a/SRC/zlacn2.f
+++ b/SRC/zlacn2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLACN2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlacn2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlacn2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -96,7 +94,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lacn2
 *
 *> \par Further Details:
 *  =====================
@@ -130,6 +128,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZLACN2( N, V, X, EST, KASE, ISAVE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlacon.f b/SRC/zlacon.f
index 61f20d042a..6f3e13d08d 100644
--- a/SRC/zlacon.f
+++ b/SRC/zlacon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLACON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlacon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlacon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -89,7 +87,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lacon
 *
 *> \par Further Details:
 *  =====================
@@ -111,6 +109,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZLACON( N, V, X, EST, KASE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlacp2.f b/SRC/zlacp2.f
index 001043a53d..8cf95f8482 100644
--- a/SRC/zlacp2.f
+++ b/SRC/zlacp2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLACP2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlacp2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlacp2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lacp2
 *
 *  =====================================================================
       SUBROUTINE ZLACP2( UPLO, M, N, A, LDA, B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlacpy.f b/SRC/zlacpy.f
index 06017509e0..e5d067ed8d 100644
--- a/SRC/zlacpy.f
+++ b/SRC/zlacpy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLACPY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlacpy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlacpy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -96,10 +94,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lacpy
 *
 *  =====================================================================
       SUBROUTINE ZLACPY( UPLO, M, N, A, LDA, B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlacrm.f b/SRC/zlacrm.f
index ce8b9b02c5..422daa2bc0 100644
--- a/SRC/zlacrm.f
+++ b/SRC/zlacrm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLACRM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlacrm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlacrm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lacrm
 *
 *  =====================================================================
       SUBROUTINE ZLACRM( M, N, A, LDA, B, LDB, C, LDC, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlacrt.f b/SRC/zlacrt.f
index b64ace8d2d..8801b4cdbf 100644
--- a/SRC/zlacrt.f
+++ b/SRC/zlacrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLACRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlacrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlacrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -98,10 +96,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lacrt
 *
 *  =====================================================================
       SUBROUTINE ZLACRT( N, CX, INCX, CY, INCY, C, S )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zladiv.f b/SRC/zladiv.f
index ae111d73d6..60ebabfd1a 100644
--- a/SRC/zladiv.f
+++ b/SRC/zladiv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLADIV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zladiv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zladiv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -57,10 +55,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup ladiv
 *
 *  =====================================================================
       COMPLEX*16     FUNCTION ZLADIV( X, Y )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlaed0.f b/SRC/zlaed0.f
index c4deac037a..3a725dfc4e 100644
--- a/SRC/zlaed0.f
+++ b/SRC/zlaed0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAED0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaed0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaed0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -137,11 +135,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup laed0
 *
 *  =====================================================================
       SUBROUTINE ZLAED0( QSIZ, N, D, E, Q, LDQ, QSTORE, LDQS, RWORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,7 +171,8 @@ SUBROUTINE ZLAED0( QSIZ, N, D, E, Q, LDQ, QSTORE, LDQS, RWORK,
       DOUBLE PRECISION   TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DSTEQR, XERBLA, ZCOPY, ZLACRM, ZLAED7
+      EXTERNAL           DCOPY, DSTEQR, XERBLA, ZCOPY, ZLACRM,
+     $                   ZLAED7
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
diff --git a/SRC/zlaed7.f b/SRC/zlaed7.f
index 83f32d8b81..ba83b8102c 100644
--- a/SRC/zlaed7.f
+++ b/SRC/zlaed7.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAED7 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaed7.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaed7.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -239,13 +237,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup laed7
 *
 *  =====================================================================
-      SUBROUTINE ZLAED7( N, CUTPNT, QSIZ, TLVLS, CURLVL, CURPBM, D, Q,
+      SUBROUTINE ZLAED7( N, CUTPNT, QSIZ, TLVLS, CURLVL, CURPBM, D,
+     $                   Q,
      $                   LDQ, RHO, INDXQ, QSTORE, QPTR, PRMPTR, PERM,
      $                   GIVPTR, GIVCOL, GIVNUM, WORK, RWORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -270,7 +270,8 @@ SUBROUTINE ZLAED7( N, CUTPNT, QSIZ, TLVLS, CURLVL, CURPBM, D, Q,
      $                   INDXC, INDXP, IQ, IW, IZ, K, N1, N2, PTR
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLAED9, DLAEDA, DLAMRG, XERBLA, ZLACRM, ZLAED8
+      EXTERNAL           DLAED9, DLAEDA, DLAMRG, XERBLA, ZLACRM,
+     $                   ZLAED8
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -356,14 +357,15 @@ SUBROUTINE ZLAED7( N, CUTPNT, QSIZ, TLVLS, CURLVL, CURPBM, D, Q,
          CALL DLAED9( K, 1, K, N, D, RWORK( IQ ), K, RHO,
      $                RWORK( IDLMDA ), RWORK( IW ),
      $                QSTORE( QPTR( CURR ) ), K, INFO )
-         CALL ZLACRM( QSIZ, K, WORK, QSIZ, QSTORE( QPTR( CURR ) ), K, Q,
+         CALL ZLACRM( QSIZ, K, WORK, QSIZ, QSTORE( QPTR( CURR ) ), K,
+     $                Q,
      $                LDQ, RWORK( IQ ) )
          QPTR( CURR+1 ) = QPTR( CURR ) + K**2
          IF( INFO.NE.0 ) THEN
             RETURN
          END IF
 *
-*     Prepare the INDXQ sorting premutation.
+*     Prepare the INDXQ sorting permutation.
 *
          N1 = K
          N2 = N - K
diff --git a/SRC/zlaed8.f b/SRC/zlaed8.f
index 995a673de9..ebe96f163b 100644
--- a/SRC/zlaed8.f
+++ b/SRC/zlaed8.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAED8 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaed8.f">
 *> [TGZ]</a>
@@ -13,12 +12,11 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaed8.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
+*       SUBROUTINE ZLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMBDA,
 *                          Q2, LDQ2, W, INDXP, INDX, INDXQ, PERM, GIVPTR,
 *                          GIVCOL, GIVNUM, INFO )
 *
@@ -29,7 +27,7 @@
 *       .. Array Arguments ..
 *       INTEGER            GIVCOL( 2, * ), INDX( * ), INDXP( * ),
 *      $                   INDXQ( * ), PERM( * )
-*       DOUBLE PRECISION   D( * ), DLAMDA( * ), GIVNUM( 2, * ), W( * ),
+*       DOUBLE PRECISION   D( * ), DLAMBDA( * ), GIVNUM( 2, * ), W( * ),
 *      $                   Z( * )
 *       COMPLEX*16         Q( LDQ, * ), Q2( LDQ2, * )
 *       ..
@@ -122,9 +120,9 @@
 *>         destroyed during the updating process.
 *> \endverbatim
 *>
-*> \param[out] DLAMDA
+*> \param[out] DLAMBDA
 *> \verbatim
-*>          DLAMDA is DOUBLE PRECISION array, dimension (N)
+*>          DLAMBDA is DOUBLE PRECISION array, dimension (N)
 *>         Contains a copy of the first K eigenvalues which will be used
 *>         by DLAED3 to form the secular equation.
 *> \endverbatim
@@ -219,12 +217,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup laed8
 *
 *  =====================================================================
-      SUBROUTINE ZLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
+      SUBROUTINE ZLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z,
+     $                   DLAMBDA,
      $                   Q2, LDQ2, W, INDXP, INDX, INDXQ, PERM, GIVPTR,
      $                   GIVCOL, GIVNUM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -237,7 +237,7 @@ SUBROUTINE ZLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
 *     .. Array Arguments ..
       INTEGER            GIVCOL( 2, * ), INDX( * ), INDXP( * ),
      $                   INDXQ( * ), PERM( * )
-      DOUBLE PRECISION   D( * ), DLAMDA( * ), GIVNUM( 2, * ), W( * ),
+      DOUBLE PRECISION   D( * ), DLAMBDA( * ), GIVNUM( 2, * ), W( * ),
      $                   Z( * )
       COMPLEX*16         Q( LDQ, * ), Q2( LDQ2, * )
 *     ..
@@ -259,7 +259,8 @@ SUBROUTINE ZLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
       EXTERNAL           IDAMAX, DLAMCH, DLAPY2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLAMRG, DSCAL, XERBLA, ZCOPY, ZDROT,
+      EXTERNAL           DCOPY, DLAMRG, DSCAL, XERBLA, ZCOPY,
+     $                   ZDROT,
      $                   ZLACPY
 *     ..
 *     .. Intrinsic Functions ..
@@ -322,14 +323,14 @@ SUBROUTINE ZLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
          INDXQ( I ) = INDXQ( I ) + CUTPNT
    20 CONTINUE
       DO 30 I = 1, N
-         DLAMDA( I ) = D( INDXQ( I ) )
+         DLAMBDA( I ) = D( INDXQ( I ) )
          W( I ) = Z( INDXQ( I ) )
    30 CONTINUE
       I = 1
       J = CUTPNT + 1
-      CALL DLAMRG( N1, N2, DLAMDA, 1, 1, INDX )
+      CALL DLAMRG( N1, N2, DLAMBDA, 1, 1, INDX )
       DO 40 I = 1, N
-         D( I ) = DLAMDA( INDX( I ) )
+         D( I ) = DLAMBDA( INDX( I ) )
          Z( I ) = W( INDX( I ) )
    40 CONTINUE
 *
@@ -350,7 +351,8 @@ SUBROUTINE ZLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
             PERM( J ) = INDXQ( INDX( J ) )
             CALL ZCOPY( QSIZ, Q( 1, PERM( J ) ), 1, Q2( 1, J ), 1 )
    50    CONTINUE
-         CALL ZLACPY( 'A', QSIZ, N, Q2( 1, 1 ), LDQ2, Q( 1, 1 ), LDQ )
+         CALL ZLACPY( 'A', QSIZ, N, Q2( 1, 1 ), LDQ2, Q( 1, 1 ),
+     $                LDQ )
          RETURN
       END IF
 *
@@ -438,7 +440,7 @@ SUBROUTINE ZLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
          ELSE
             K = K + 1
             W( K ) = Z( JLAM )
-            DLAMDA( K ) = D( JLAM )
+            DLAMBDA( K ) = D( JLAM )
             INDXP( K ) = JLAM
             JLAM = J
          END IF
@@ -450,19 +452,19 @@ SUBROUTINE ZLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
 *
       K = K + 1
       W( K ) = Z( JLAM )
-      DLAMDA( K ) = D( JLAM )
+      DLAMBDA( K ) = D( JLAM )
       INDXP( K ) = JLAM
 *
   100 CONTINUE
 *
-*     Sort the eigenvalues and corresponding eigenvectors into DLAMDA
+*     Sort the eigenvalues and corresponding eigenvectors into DLAMBDA
 *     and Q2 respectively.  The eigenvalues/vectors which were not
-*     deflated go into the first K slots of DLAMDA and Q2 respectively,
+*     deflated go into the first K slots of DLAMBDA and Q2 respectively,
 *     while those which were deflated go into the last N - K slots.
 *
       DO 110 J = 1, N
          JP = INDXP( J )
-         DLAMDA( J ) = D( JP )
+         DLAMBDA( J ) = D( JP )
          PERM( J ) = INDXQ( INDX( JP ) )
          CALL ZCOPY( QSIZ, Q( 1, PERM( J ) ), 1, Q2( 1, J ), 1 )
   110 CONTINUE
@@ -471,8 +473,9 @@ SUBROUTINE ZLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
 *     into the last N - K slots of D and Q respectively.
 *
       IF( K.LT.N ) THEN
-         CALL DCOPY( N-K, DLAMDA( K+1 ), 1, D( K+1 ), 1 )
-         CALL ZLACPY( 'A', QSIZ, N-K, Q2( 1, K+1 ), LDQ2, Q( 1, K+1 ),
+         CALL DCOPY( N-K, DLAMBDA( K+1 ), 1, D( K+1 ), 1 )
+         CALL ZLACPY( 'A', QSIZ, N-K, Q2( 1, K+1 ), LDQ2, Q( 1,
+     $                K+1 ),
      $                LDQ )
       END IF
 *
diff --git a/SRC/zlaein.f b/SRC/zlaein.f
index 7e0f6f1094..78b72b8811 100644
--- a/SRC/zlaein.f
+++ b/SRC/zlaein.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAEIN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaein.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaein.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -141,11 +139,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup laein
 *
 *  =====================================================================
-      SUBROUTINE ZLAEIN( RIGHTV, NOINIT, N, H, LDH, W, V, B, LDB, RWORK,
+      SUBROUTINE ZLAEIN( RIGHTV, NOINIT, N, H, LDH, W, V, B, LDB,
+     $                   RWORK,
      $                   EPS3, SMLNUM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -227,7 +227,8 @@ SUBROUTINE ZLAEIN( RIGHTV, NOINIT, N, H, LDH, W, V, B, LDB, RWORK,
 *        Scale supplied initial vector.
 *
          VNORM = DZNRM2( N, V, 1 )
-         CALL ZDSCAL( N, ( EPS3*ROOTN ) / MAX( VNORM, NRMSML ), V, 1 )
+         CALL ZDSCAL( N, ( EPS3*ROOTN ) / MAX( VNORM, NRMSML ), V,
+     $                1 )
       END IF
 *
       IF( RIGHTV ) THEN
@@ -313,7 +314,8 @@ SUBROUTINE ZLAEIN( RIGHTV, NOINIT, N, H, LDH, W, V, B, LDB, RWORK,
 *          or U**H *x = scale*v for a left eigenvector,
 *        overwriting x on v.
 *
-         CALL ZLATRS( 'Upper', TRANS, 'Nonunit', NORMIN, N, B, LDB, V,
+         CALL ZLATRS( 'Upper', TRANS, 'Nonunit', NORMIN, N, B, LDB,
+     $                V,
      $                SCALE, RWORK, IERR )
          NORMIN = 'Y'
 *
diff --git a/SRC/zlaesy.f b/SRC/zlaesy.f
index eddf453ecc..742a2f1d5d 100644
--- a/SRC/zlaesy.f
+++ b/SRC/zlaesy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAESY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaesy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaesy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYauxiliary
+*> \ingroup laesy
 *
 *  =====================================================================
       SUBROUTINE ZLAESY( A, B, C, RT1, RT2, EVSCAL, CS1, SN1 )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlaev2.f b/SRC/zlaev2.f
index de2d9cbb7b..0c20782964 100644
--- a/SRC/zlaev2.f
+++ b/SRC/zlaev2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAEV2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaev2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaev2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,7 +93,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup laev2
 *
 *> \par Further Details:
 *  =====================
@@ -118,6 +116,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZLAEV2( A, B, C, RT1, RT2, CS1, SN1 )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlag2c.f b/SRC/zlag2c.f
index ba141a98fe..6faa3a08cd 100644
--- a/SRC/zlag2c.f
+++ b/SRC/zlag2c.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAG2C + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlag2c.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlag2c.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -100,10 +98,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup _lag2_
 *
 *  =====================================================================
       SUBROUTINE ZLAG2C( M, N, A, LDA, SA, LDSA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -124,7 +123,7 @@ SUBROUTINE ZLAG2C( M, N, A, LDA, SA, LDSA, INFO )
       DOUBLE PRECISION   RMAX
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DBLE, DIMAG
+      INTRINSIC          DBLE, DIMAG, CMPLX
 *     ..
 *     .. External Functions ..
       REAL               SLAMCH
@@ -142,7 +141,7 @@ SUBROUTINE ZLAG2C( M, N, A, LDA, SA, LDSA, INFO )
                INFO = 1
                GO TO 30
             END IF
-            SA( I, J ) = A( I, J )
+            SA( I, J ) = CMPLX( A( I, J ) )
    10    CONTINUE
    20 CONTINUE
       INFO = 0
diff --git a/SRC/zlags2.f b/SRC/zlags2.f
index 1332b052f1..d66fbf138d 100644
--- a/SRC/zlags2.f
+++ b/SRC/zlags2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAGS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlags2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlags2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -150,11 +148,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lags2
 *
 *  =====================================================================
-      SUBROUTINE ZLAGS2( UPPER, A1, A2, A3, B1, B2, B3, CSU, SNU, CSV,
+      SUBROUTINE ZLAGS2( UPPER, A1, A2, A3, B1, B2, B3, CSU, SNU,
+     $                   CSV,
      $                   SNV, CSQ, SNQ )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -237,17 +237,21 @@ SUBROUTINE ZLAGS2( UPPER, A1, A2, A3, B1, B2, B3, CSU, SNU, CSV,
 *           zero (1,2) elements of U**H *A and V**H *B
 *
             IF( ( ABS( UA11R )+ABS1( UA12 ) ).EQ.ZERO ) THEN
-               CALL ZLARTG( -DCMPLX( VB11R ), DCONJG( VB12 ), CSQ, SNQ,
+               CALL ZLARTG( -DCMPLX( VB11R ), DCONJG( VB12 ), CSQ,
+     $                      SNQ,
      $                      R )
             ELSE IF( ( ABS( VB11R )+ABS1( VB12 ) ).EQ.ZERO ) THEN
-               CALL ZLARTG( -DCMPLX( UA11R ), DCONJG( UA12 ), CSQ, SNQ,
+               CALL ZLARTG( -DCMPLX( UA11R ), DCONJG( UA12 ), CSQ,
+     $                      SNQ,
      $                      R )
             ELSE IF( AUA12 / ( ABS( UA11R )+ABS1( UA12 ) ).LE.AVB12 /
      $               ( ABS( VB11R )+ABS1( VB12 ) ) ) THEN
-               CALL ZLARTG( -DCMPLX( UA11R ), DCONJG( UA12 ), CSQ, SNQ,
+               CALL ZLARTG( -DCMPLX( UA11R ), DCONJG( UA12 ), CSQ,
+     $                      SNQ,
      $                      R )
             ELSE
-               CALL ZLARTG( -DCMPLX( VB11R ), DCONJG( VB12 ), CSQ, SNQ,
+               CALL ZLARTG( -DCMPLX( VB11R ), DCONJG( VB12 ), CSQ,
+     $                      SNQ,
      $                      R )
             END IF
 *
@@ -273,17 +277,21 @@ SUBROUTINE ZLAGS2( UPPER, A1, A2, A3, B1, B2, B3, CSU, SNU, CSV,
 *           zero (2,2) elements of U**H *A and V**H *B, and then swap.
 *
             IF( ( ABS1( UA21 )+ABS1( UA22 ) ).EQ.ZERO ) THEN
-               CALL ZLARTG( -DCONJG( VB21 ), DCONJG( VB22 ), CSQ, SNQ,
+               CALL ZLARTG( -DCONJG( VB21 ), DCONJG( VB22 ), CSQ,
+     $                      SNQ,
      $                      R )
             ELSE IF( ( ABS1( VB21 )+ABS( VB22 ) ).EQ.ZERO ) THEN
-               CALL ZLARTG( -DCONJG( UA21 ), DCONJG( UA22 ), CSQ, SNQ,
+               CALL ZLARTG( -DCONJG( UA21 ), DCONJG( UA22 ), CSQ,
+     $                      SNQ,
      $                      R )
             ELSE IF( AUA22 / ( ABS1( UA21 )+ABS1( UA22 ) ).LE.AVB22 /
      $               ( ABS1( VB21 )+ABS1( VB22 ) ) ) THEN
-               CALL ZLARTG( -DCONJG( UA21 ), DCONJG( UA22 ), CSQ, SNQ,
+               CALL ZLARTG( -DCONJG( UA21 ), DCONJG( UA22 ), CSQ,
+     $                      SNQ,
      $                      R )
             ELSE
-               CALL ZLARTG( -DCONJG( VB21 ), DCONJG( VB22 ), CSQ, SNQ,
+               CALL ZLARTG( -DCONJG( VB21 ), DCONJG( VB22 ), CSQ,
+     $                      SNQ,
      $                      R )
             END IF
 *
diff --git a/SRC/zlagtm.f b/SRC/zlagtm.f
index 576490899d..039173ce6d 100644
--- a/SRC/zlagtm.f
+++ b/SRC/zlagtm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAGTM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlagtm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlagtm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,7 @@
 *>
 *> \verbatim
 *>
-*> ZLAGTM performs a matrix-vector product of the form
+*> ZLAGTM performs a matrix-matrix product of the form
 *>
 *>    B := alpha * A * X + beta * B
 *>
@@ -137,11 +135,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lagtm
 *
 *  =====================================================================
-      SUBROUTINE ZLAGTM( TRANS, N, NRHS, ALPHA, DL, D, DU, X, LDX, BETA,
+      SUBROUTINE ZLAGTM( TRANS, N, NRHS, ALPHA, DL, D, DU, X, LDX,
+     $                   BETA,
      $                   B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlahef.f b/SRC/zlahef.f
index 22a638ba82..039444a0da 100644
--- a/SRC/zlahef.f
+++ b/SRC/zlahef.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAHEF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlahef.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlahef.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,7 +158,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup lahef
 *
 *> \par Contributors:
 *  ==================
@@ -173,7 +171,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE ZLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
+      SUBROUTINE ZLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -199,7 +199,7 @@ SUBROUTINE ZLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
       PARAMETER          ( EIGHT = 8.0D+0, SEVTEN = 17.0D+0 )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            IMAX, J, JB, JJ, JMAX, JP, K, KK, KKW, KP,
+      INTEGER            IMAX, J, JJ, JMAX, JP, K, KK, KKW, KP,
      $                   KSTEP, KW
       DOUBLE PRECISION   ABSAKK, ALPHA, COLMAX, R1, ROWMAX, T
       COMPLEX*16         D11, D21, D22, Z
@@ -210,7 +210,8 @@ SUBROUTINE ZLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
       EXTERNAL           LSAME, IZAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZCOPY, ZDSCAL, ZGEMM, ZGEMV, ZLACGV, ZSWAP
+      EXTERNAL           ZCOPY, ZDSCAL, ZGEMMTR, ZGEMV, ZLACGV,
+     $                   ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCONJG, DIMAG, MAX, MIN, SQRT
@@ -255,7 +256,8 @@ SUBROUTINE ZLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
          CALL ZCOPY( K-1, A( 1, K ), 1, W( 1, KW ), 1 )
          W( K, KW ) = DBLE( A( K, K ) )
          IF( K.LT.N ) THEN
-            CALL ZGEMV( 'No transpose', K, N-K, -CONE, A( 1, K+1 ), LDA,
+            CALL ZGEMV( 'No transpose', K, N-K, -CONE, A( 1, K+1 ),
+     $                  LDA,
      $                  W( K, KW+1 ), LDW, CONE, W( 1, KW ), 1 )
             W( K, KW ) = DBLE( W( K, KW ) )
          END IF
@@ -548,28 +550,11 @@ SUBROUTINE ZLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *        A11 := A11 - U12*D*U12**H = A11 - U12*W**H
 *
-*        computing blocks of NB columns at a time (note that conjg(W) is
-*        actually stored)
+*        (note that conjg(W) is actually stored)
 *
-         DO 50 J = ( ( K-1 ) / NB )*NB + 1, 1, -NB
-            JB = MIN( NB, K-J+1 )
-*
-*           Update the upper triangle of the diagonal block
-*
-            DO 40 JJ = J, J + JB - 1
-               A( JJ, JJ ) = DBLE( A( JJ, JJ ) )
-               CALL ZGEMV( 'No transpose', JJ-J+1, N-K, -CONE,
-     $                     A( J, K+1 ), LDA, W( JJ, KW+1 ), LDW, CONE,
-     $                     A( J, JJ ), 1 )
-               A( JJ, JJ ) = DBLE( A( JJ, JJ ) )
-   40       CONTINUE
-*
-*           Update the rectangular superdiagonal block
-*
-            CALL ZGEMM( 'No transpose', 'Transpose', J-1, JB, N-K,
-     $                  -CONE, A( 1, K+1 ), LDA, W( J, KW+1 ), LDW,
-     $                  CONE, A( 1, J ), LDA )
-   50    CONTINUE
+         CALL ZGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
+     $                 -CONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
+     $                 CONE, A( 1, 1 ), LDA )
 *
 *        Put U12 in standard form by partially undoing the interchanges
 *        in columns k+1:n looping backwards from k+1 to n
@@ -623,7 +608,8 @@ SUBROUTINE ZLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
          W( K, K ) = DBLE( A( K, K ) )
          IF( K.LT.N )
      $      CALL ZCOPY( N-K, A( K+1, K ), 1, W( K+1, K ), 1 )
-         CALL ZGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K, 1 ), LDA,
+         CALL ZGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K, 1 ),
+     $               LDA,
      $               W( K, 1 ), LDW, CONE, W( K, K ), 1 )
          W( K, K ) = DBLE( W( K, K ) )
 *
@@ -670,13 +656,15 @@ SUBROUTINE ZLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *              Copy column IMAX to column K+1 of W and update it
 *
-               CALL ZCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1 )
+               CALL ZCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                     1 )
                CALL ZLACGV( IMAX-K, W( K, K+1 ), 1 )
                W( IMAX, K+1 ) = DBLE( A( IMAX, IMAX ) )
                IF( IMAX.LT.N )
      $            CALL ZCOPY( N-IMAX, A( IMAX+1, IMAX ), 1,
      $                        W( IMAX+1, K+1 ), 1 )
-               CALL ZGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K, 1 ),
+               CALL ZGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K,
+     $                     1 ),
      $                     LDA, W( IMAX, 1 ), LDW, CONE, W( K, K+1 ),
      $                     1 )
                W( IMAX, K+1 ) = DBLE( W( IMAX, K+1 ) )
@@ -750,7 +738,8 @@ SUBROUTINE ZLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
      $                     LDA )
                CALL ZLACGV( KP-KK-1, A( KP, KK+1 ), LDA )
                IF( KP.LT.N )
-     $            CALL ZCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL ZCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
 *
 *              Interchange rows KK and KP in first K-1 columns of A
 *              (columns K (or K and K+1 for 2-by-2 pivot) of A will be
@@ -908,29 +897,11 @@ SUBROUTINE ZLAHEF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *        A22 := A22 - L21*D*L21**H = A22 - L21*W**H
 *
-*        computing blocks of NB columns at a time (note that conjg(W) is
-*        actually stored)
-*
-         DO 110 J = K, N, NB
-            JB = MIN( NB, N-J+1 )
-*
-*           Update the lower triangle of the diagonal block
-*
-            DO 100 JJ = J, J + JB - 1
-               A( JJ, JJ ) = DBLE( A( JJ, JJ ) )
-               CALL ZGEMV( 'No transpose', J+JB-JJ, K-1, -CONE,
-     $                     A( JJ, 1 ), LDA, W( JJ, 1 ), LDW, CONE,
-     $                     A( JJ, JJ ), 1 )
-               A( JJ, JJ ) = DBLE( A( JJ, JJ ) )
-  100       CONTINUE
-*
-*           Update the rectangular subdiagonal block
+*        (note that conjg(W) is actually stored)
 *
-            IF( J+JB.LE.N )
-     $         CALL ZGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
-     $                     K-1, -CONE, A( J+JB, 1 ), LDA, W( J, 1 ),
-     $                     LDW, CONE, A( J+JB, J ), LDA )
-  110    CONTINUE
+         CALL ZGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
+     $                 K-1, -CONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
+     $                 CONE, A( K, K ), LDA )
 *
 *        Put L21 in standard form by partially undoing the interchanges
 *        of rows in columns 1:k-1 looping backwards from k-1 to 1
diff --git a/SRC/zlahef_aa.f b/SRC/zlahef_aa.f
index 37bd29f888..3952668bbb 100644
--- a/SRC/zlahef_aa.f
+++ b/SRC/zlahef_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAHEF_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlahef_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlahef_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -136,7 +134,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup lahef_aa
 *
 *  =====================================================================
       SUBROUTINE ZLAHEF_AA( UPLO, J1, M, NB, A, LDA, IPIV,
@@ -172,8 +170,8 @@ SUBROUTINE ZLAHEF_AA( UPLO, J1, M, NB, A, LDA, IPIV,
       EXTERNAL     LSAME, ILAENV, IZAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL     ZGEMM, ZGEMV, ZAXPY, ZLACGV, ZCOPY, ZSCAL, ZSWAP,
-     $             ZLASET, XERBLA
+      EXTERNAL     ZGEMM, ZGEMV, ZAXPY, ZLACGV, ZCOPY, ZSCAL,
+     $             ZSWAP, ZLASET, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC    DBLE, DCONJG, MAX
diff --git a/SRC/zlahef_rk.f b/SRC/zlahef_rk.f
index ed66e133da..a82ddf4729 100644
--- a/SRC/zlahef_rk.f
+++ b/SRC/zlahef_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAHEF_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlahef_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlahef_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -239,7 +237,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup lahef_rk
 *
 *> \par Contributors:
 *  ==================
@@ -259,6 +257,7 @@
 *  =====================================================================
       SUBROUTINE ZLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
      $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -287,7 +286,7 @@ SUBROUTINE ZLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            DONE
-      INTEGER            IMAX, ITEMP, II, J, JB, JJ, JMAX, K, KK, KKW,
+      INTEGER            IMAX, ITEMP, II, J, JMAX, K, KK, KKW,
      $                   KP, KSTEP, KW, P
       DOUBLE PRECISION   ABSAKK, ALPHA, COLMAX, DTEMP, R1, ROWMAX, T,
      $                   SFMIN
@@ -300,7 +299,8 @@ SUBROUTINE ZLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
       EXTERNAL           LSAME, IZAMAX, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZCOPY, ZDSCAL, ZGEMM, ZGEMV, ZLACGV, ZSWAP
+      EXTERNAL           ZCOPY, ZDSCAL, ZGEMMTR, ZGEMV, ZLACGV,
+     $                   ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCONJG, DIMAG, MAX, MIN, SQRT
@@ -356,7 +356,8 @@ SUBROUTINE ZLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
      $      CALL ZCOPY( K-1, A( 1, K ), 1, W( 1, KW ), 1 )
          W( K, KW ) = DBLE( A( K, K ) )
          IF( K.LT.N ) THEN
-            CALL ZGEMV( 'No transpose', K, N-K, -CONE, A( 1, K+1 ), LDA,
+            CALL ZGEMV( 'No transpose', K, N-K, -CONE, A( 1, K+1 ),
+     $                  LDA,
      $                  W( K, KW+1 ), LDW, CONE, W( 1, KW ), 1 )
             W( K, KW ) = DBLE( W( K, KW ) )
          END IF
@@ -422,7 +423,8 @@ SUBROUTINE ZLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *                 Copy column IMAX to column KW-1 of W and update it
 *
                   IF( IMAX.GT.1 )
-     $               CALL ZCOPY( IMAX-1, A( 1, IMAX ), 1, W( 1, KW-1 ),
+     $               CALL ZCOPY( IMAX-1, A( 1, IMAX ), 1, W( 1,
+     $                           KW-1 ),
      $                           1 )
                   W( IMAX, KW-1 ) = DBLE( A( IMAX, IMAX ) )
 *
@@ -752,29 +754,11 @@ SUBROUTINE ZLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *        A11 := A11 - U12*D*U12**H = A11 - U12*W**H
 *
-*        computing blocks of NB columns at a time (note that conjg(W) is
-*        actually stored)
+*        (note that conjg(W) is actually stored)
 *
-         DO 50 J = ( ( K-1 ) / NB )*NB + 1, 1, -NB
-            JB = MIN( NB, K-J+1 )
-*
-*           Update the upper triangle of the diagonal block
-*
-            DO 40 JJ = J, J + JB - 1
-               A( JJ, JJ ) = DBLE( A( JJ, JJ ) )
-               CALL ZGEMV( 'No transpose', JJ-J+1, N-K, -CONE,
-     $                     A( J, K+1 ), LDA, W( JJ, KW+1 ), LDW, CONE,
-     $                     A( J, JJ ), 1 )
-               A( JJ, JJ ) = DBLE( A( JJ, JJ ) )
-   40       CONTINUE
-*
-*           Update the rectangular superdiagonal block
-*
-            IF( J.GE.2 )
-     $         CALL ZGEMM( 'No transpose', 'Transpose', J-1, JB, N-K,
-     $                     -CONE, A( 1, K+1 ), LDA, W( J, KW+1 ), LDW,
-     $                     CONE, A( 1, J ), LDA )
-   50    CONTINUE
+         CALL ZGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
+     $                 -CONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
+     $                 CONE, A( 1, 1 ), LDA )
 *
 *        Set KB to the number of columns factorized
 *
@@ -875,7 +859,8 @@ SUBROUTINE ZLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column k+1 of W and update it
 *
-                  CALL ZCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1)
+                  CALL ZCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                        1)
                   CALL ZLACGV( IMAX-K, W( K, K+1 ), 1 )
                   W( IMAX, K+1 ) = DBLE( A( IMAX, IMAX ) )
 *
@@ -902,7 +887,8 @@ SUBROUTINE ZLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + IZAMAX( N-IMAX, W( IMAX+1, K+1 ), 1)
+                     ITEMP = IMAX + IZAMAX( N-IMAX, W( IMAX+1, K+1 ),
+     $                                      1)
                      DTEMP = CABS1( W( ITEMP, K+1 ) )
                      IF( DTEMP.GT.ROWMAX ) THEN
                         ROWMAX = DTEMP
@@ -925,7 +911,8 @@ SUBROUTINE ZLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                    copy column K+1 of W to column K of W
 *
-                     CALL ZCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL ZCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                      DONE = .TRUE.
 *
@@ -954,7 +941,8 @@ SUBROUTINE ZLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                    Copy updated JMAXth (next IMAXth) column to Kth of W
 *
-                     CALL ZCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL ZCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                   END IF
 *
@@ -1014,7 +1002,8 @@ SUBROUTINE ZLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
      $                     LDA )
                CALL ZLACGV( KP-KK-1, A( KP, KK+1 ), LDA )
                IF( KP.LT.N )
-     $            CALL ZCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL ZCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
 *
 *              Interchange rows KK and KP in first K-1 columns of A
 *              (column K (or K and K+1 for 2-by-2 pivot) of A will be
@@ -1195,29 +1184,11 @@ SUBROUTINE ZLAHEF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *        A22 := A22 - L21*D*L21**H = A22 - L21*W**H
 *
-*        computing blocks of NB columns at a time (note that conjg(W) is
-*        actually stored)
-*
-         DO 110 J = K, N, NB
-            JB = MIN( NB, N-J+1 )
-*
-*           Update the lower triangle of the diagonal block
-*
-            DO 100 JJ = J, J + JB - 1
-               A( JJ, JJ ) = DBLE( A( JJ, JJ ) )
-               CALL ZGEMV( 'No transpose', J+JB-JJ, K-1, -CONE,
-     $                     A( JJ, 1 ), LDA, W( JJ, 1 ), LDW, CONE,
-     $                     A( JJ, JJ ), 1 )
-               A( JJ, JJ ) = DBLE( A( JJ, JJ ) )
-  100       CONTINUE
-*
-*           Update the rectangular subdiagonal block
+*        (note that conjg(W) is actually stored)
 *
-            IF( J+JB.LE.N )
-     $         CALL ZGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
-     $                     K-1, -CONE, A( J+JB, 1 ), LDA, W( J, 1 ),
-     $                     LDW, CONE, A( J+JB, J ), LDA )
-  110    CONTINUE
+         CALL ZGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
+     $                 K-1, -CONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
+     $                 CONE, A( K, K ), LDA )
 *
 *        Set KB to the number of columns factorized
 *
diff --git a/SRC/zlahef_rook.f b/SRC/zlahef_rook.f
index 65f70a5978..06ddcb4e9d 100644
--- a/SRC/zlahef_rook.f
+++ b/SRC/zlahef_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAHEF_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlahef_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlahef_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -162,7 +160,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEcomputational
+*> \ingroup lahef_rook
 *
 *> \par Contributors:
 *  ==================
@@ -181,6 +179,7 @@
 *  =====================================================================
       SUBROUTINE ZLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
      $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -220,7 +219,8 @@ SUBROUTINE ZLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
       EXTERNAL           LSAME, IZAMAX, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZCOPY, ZDSCAL, ZGEMM, ZGEMV, ZLACGV, ZSWAP
+      EXTERNAL           ZCOPY, ZDSCAL, ZGEMM, ZGEMV, ZLACGV,
+     $                   ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCONJG, DIMAG, MAX, MIN, SQRT
@@ -272,7 +272,8 @@ SUBROUTINE ZLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
      $      CALL ZCOPY( K-1, A( 1, K ), 1, W( 1, KW ), 1 )
          W( K, KW ) = DBLE( A( K, K ) )
          IF( K.LT.N ) THEN
-            CALL ZGEMV( 'No transpose', K, N-K, -CONE, A( 1, K+1 ), LDA,
+            CALL ZGEMV( 'No transpose', K, N-K, -CONE, A( 1, K+1 ),
+     $                  LDA,
      $                  W( K, KW+1 ), LDW, CONE, W( 1, KW ), 1 )
             W( K, KW ) = DBLE( W( K, KW ) )
          END IF
@@ -332,7 +333,8 @@ SUBROUTINE ZLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *                 Copy column IMAX to column KW-1 of W and update it
 *
                   IF( IMAX.GT.1 )
-     $               CALL ZCOPY( IMAX-1, A( 1, IMAX ), 1, W( 1, KW-1 ),
+     $               CALL ZCOPY( IMAX-1, A( 1, IMAX ), 1, W( 1,
+     $                           KW-1 ),
      $                           1 )
                   W( IMAX, KW-1 ) = DBLE( A( IMAX, IMAX ) )
 *
@@ -796,7 +798,8 @@ SUBROUTINE ZLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column k+1 of W and update it
 *
-                  CALL ZCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1)
+                  CALL ZCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                        1)
                   CALL ZLACGV( IMAX-K, W( K, K+1 ), 1 )
                   W( IMAX, K+1 ) = DBLE( A( IMAX, IMAX ) )
 *
@@ -823,7 +826,8 @@ SUBROUTINE ZLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + IZAMAX( N-IMAX, W( IMAX+1, K+1 ), 1)
+                     ITEMP = IMAX + IZAMAX( N-IMAX, W( IMAX+1, K+1 ),
+     $                                      1)
                      DTEMP = CABS1( W( ITEMP, K+1 ) )
                      IF( DTEMP.GT.ROWMAX ) THEN
                         ROWMAX = DTEMP
@@ -846,7 +850,8 @@ SUBROUTINE ZLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                    copy column K+1 of W to column K of W
 *
-                     CALL ZCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL ZCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                      DONE = .TRUE.
 *
@@ -875,7 +880,8 @@ SUBROUTINE ZLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                    Copy updated JMAXth (next IMAXth) column to Kth of W
 *
-                     CALL ZCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL ZCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                   END IF
 *
@@ -935,7 +941,8 @@ SUBROUTINE ZLAHEF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
      $                     LDA )
                CALL ZLACGV( KP-KK-1, A( KP, KK+1 ), LDA )
                IF( KP.LT.N )
-     $            CALL ZCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL ZCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
 *
 *              Interchange rows KK and KP in first K-1 columns of A
 *              (column K (or K and K+1 for 2-by-2 pivot) of A will be
diff --git a/SRC/zlahqr.f b/SRC/zlahqr.f
index 9413f20cc8..b595bf3ec1 100644
--- a/SRC/zlahqr.f
+++ b/SRC/zlahqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAHQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlahqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlahqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -171,7 +169,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lahqr
 *
 *> \par Contributors:
 *  ==================
@@ -236,7 +234,7 @@ SUBROUTINE ZLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
       EXTERNAL           ZLADIV, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, ZCOPY, ZLARFG, ZSCAL
+      EXTERNAL           ZCOPY, ZLARFG, ZSCAL
 *     ..
 *     .. Statement Functions ..
       DOUBLE PRECISION   CABS1
@@ -287,7 +285,8 @@ SUBROUTINE ZLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
             CALL ZSCAL( MIN( JHI, I+1 )-JLO+1, DCONJG( SC ),
      $                  H( JLO, I ), 1 )
             IF( WANTZ )
-     $         CALL ZSCAL( IHIZ-ILOZ+1, DCONJG( SC ), Z( ILOZ, I ), 1 )
+     $         CALL ZSCAL( IHIZ-ILOZ+1, DCONJG( SC ), Z( ILOZ, I ),
+     $                     1 )
          END IF
    20 CONTINUE
 *
@@ -298,7 +297,6 @@ SUBROUTINE ZLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
 *
       SAFMIN = DLAMCH( 'SAFE MINIMUM' )
       SAFMAX = RONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULP = DLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( DBLE( NH ) / ULP )
 *
@@ -525,7 +523,8 @@ SUBROUTINE ZLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
                   IF( J.NE.M+1 ) THEN
                      IF( I2.GT.J )
      $                  CALL ZSCAL( I2-J, TEMP, H( J, J+1 ), LDH )
-                     CALL ZSCAL( J-I1, DCONJG( TEMP ), H( I1, J ), 1 )
+                     CALL ZSCAL( J-I1, DCONJG( TEMP ), H( I1, J ),
+     $                           1 )
                      IF( WANTZ ) THEN
                         CALL ZSCAL( NZ, DCONJG( TEMP ), Z( ILOZ, J ),
      $                              1 )
diff --git a/SRC/zlahr2.f b/SRC/zlahr2.f
index 60ba5f0310..5f4135b818 100644
--- a/SRC/zlahr2.f
+++ b/SRC/zlahr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAHR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlahr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlahr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,7 +121,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lahr2
 *
 *> \par Further Details:
 *  =====================
@@ -178,6 +176,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZLAHR2( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -224,7 +223,8 @@ SUBROUTINE ZLAHR2( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *           Update I-th column of A - Y * V**H
 *
             CALL ZLACGV( I-1, A( K+I-1, 1 ), LDA )
-            CALL ZGEMV( 'NO TRANSPOSE', N-K, I-1, -ONE, Y(K+1,1), LDY,
+            CALL ZGEMV( 'NO TRANSPOSE', N-K, I-1, -ONE, Y(K+1,1),
+     $                  LDY,
      $                  A( K+I-1, 1 ), LDA, ONE, A( K+1, I ), 1 )
             CALL ZLACGV( I-1, A( K+I-1, 1 ), LDA )
 *
@@ -274,7 +274,8 @@ SUBROUTINE ZLAHR2( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
 *        Generate the elementary reflector H(I) to annihilate
 *        A(K+I+1:N,I)
 *
-         CALL ZLARFG( N-K-I+1, A( K+I, I ), A( MIN( K+I+1, N ), I ), 1,
+         CALL ZLARFG( N-K-I+1, A( K+I, I ), A( MIN( K+I+1, N ), I ),
+     $                1,
      $                TAU( I ) )
          EI = A( K+I, I )
          A( K+I, I ) = ONE
diff --git a/SRC/zlaic1.f b/SRC/zlaic1.f
index 72948cde9f..0196de100c 100644
--- a/SRC/zlaic1.f
+++ b/SRC/zlaic1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAIC1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaic1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaic1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -128,10 +126,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup laic1
 *
 *  =====================================================================
       SUBROUTINE ZLAIC1( JOB, J, X, SEST, W, GAMMA, SESTPR, S, C )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -348,9 +347,9 @@ SUBROUTINE ZLAIC1( JOB, J, X, SEST, W, GAMMA, SESTPR, S, C )
                B = ( ZETA2*ZETA2+ZETA1*ZETA1-ONE )*HALF
                C = ZETA1*ZETA1
                IF( B.GE.ZERO ) THEN
-                  T = -C / ( B+SQRT( B*B+C ) )
+                  T = DBLE( -C / ( B+SQRT( B*B+C ) ) )
                ELSE
-                  T = B - SQRT( B*B+C )
+                  T = DBLE( B - SQRT( B*B+C ) )
                END IF
                SINE = -( ALPHA / ABSEST ) / T
                COSINE = -( GAMMA / ABSEST ) / ( ONE+T )
diff --git a/SRC/zlals0.f b/SRC/zlals0.f
index 7a7310042f..cd87a3ac2a 100644
--- a/SRC/zlals0.f
+++ b/SRC/zlals0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLALS0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlals0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlals0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -254,7 +252,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup lals0
 *
 *> \par Contributors:
 *  ==================
@@ -264,9 +262,11 @@
 *>     Osni Marques, LBNL/NERSC, USA \n
 *
 *  =====================================================================
-      SUBROUTINE ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
+      SUBROUTINE ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX,
+     $                   LDBX,
      $                   PERM, GIVPTR, GIVCOL, LDGCOL, GIVNUM, LDGNUM,
      $                   POLES, DIFL, DIFR, Z, K, C, S, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -296,7 +296,8 @@ SUBROUTINE ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
       DOUBLE PRECISION   DIFLJ, DIFRJ, DJ, DSIGJ, DSIGJP, TEMP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMV, XERBLA, ZCOPY, ZDROT, ZDSCAL, ZLACPY,
+      EXTERNAL           DGEMV, XERBLA, ZCOPY, ZDROT, ZDSCAL,
+     $                   ZLACPY,
      $                   ZLASCL
 *     ..
 *     .. External Functions ..
@@ -360,7 +361,8 @@ SUBROUTINE ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
 *
          CALL ZCOPY( NRHS, B( NLP1, 1 ), LDB, BX( 1, 1 ), LDBX )
          DO 20 I = 2, N
-            CALL ZCOPY( NRHS, B( PERM( I ), 1 ), LDB, BX( I, 1 ), LDBX )
+            CALL ZCOPY( NRHS, B( PERM( I ), 1 ), LDB, BX( I, 1 ),
+     $                  LDBX )
    20    CONTINUE
 *
 *        Step (3L): apply the inverse of the left singular vector
@@ -392,6 +394,11 @@ SUBROUTINE ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
      $                ( POLES( I, 2 ).EQ.ZERO ) ) THEN
                      RWORK( I ) = ZERO
                   ELSE
+*
+*                    Use calls to the subroutine DLAMC3 to enforce the
+*                    parentheses (x+y)+z. The goal is to prevent
+*                    optimizing compilers from doing x+(y+z).
+*
                      RWORK( I ) = POLES( I, 2 )*Z( I ) /
      $                            ( DLAMC3( POLES( I, 2 ), DSIGJ )-
      $                            DIFLJ ) / ( POLES( I, 2 )+DJ )
@@ -470,7 +477,13 @@ SUBROUTINE ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
                   IF( Z( J ).EQ.ZERO ) THEN
                      RWORK( I ) = ZERO
                   ELSE
-                     RWORK( I ) = Z( J ) / ( DLAMC3( DSIGJ, -POLES( I+1,
+*
+*                    Use calls to the subroutine DLAMC3 to enforce the
+*                    parentheses (x+y)+z. The goal is to prevent
+*                    optimizing compilers from doing x+(y+z).
+*
+                     RWORK( I ) = Z( J ) / ( DLAMC3( DSIGJ,
+     $                      -POLES( I+1,
      $                            2 ) )-DIFR( I, 1 ) ) /
      $                            ( DSIGJ+POLES( I, 1 ) ) / DIFR( I, 2 )
                   END IF
@@ -479,7 +492,8 @@ SUBROUTINE ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
                   IF( Z( J ).EQ.ZERO ) THEN
                      RWORK( I ) = ZERO
                   ELSE
-                     RWORK( I ) = Z( J ) / ( DLAMC3( DSIGJ, -POLES( I,
+                     RWORK( I ) = Z( J ) / ( DLAMC3( DSIGJ,
+     $                      -POLES( I,
      $                            2 ) )-DIFL( I ) ) /
      $                            ( DSIGJ+POLES( I, 1 ) ) / DIFR( I, 2 )
                   END IF
@@ -521,10 +535,12 @@ SUBROUTINE ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
 *
          IF( SQRE.EQ.1 ) THEN
             CALL ZCOPY( NRHS, B( M, 1 ), LDB, BX( M, 1 ), LDBX )
-            CALL ZDROT( NRHS, BX( 1, 1 ), LDBX, BX( M, 1 ), LDBX, C, S )
+            CALL ZDROT( NRHS, BX( 1, 1 ), LDBX, BX( M, 1 ), LDBX, C,
+     $                  S )
          END IF
          IF( K.LT.MAX( M, N ) )
-     $      CALL ZLACPY( 'A', N-K, NRHS, B( K+1, 1 ), LDB, BX( K+1, 1 ),
+     $      CALL ZLACPY( 'A', N-K, NRHS, B( K+1, 1 ), LDB, BX( K+1,
+     $                   1 ),
      $                   LDBX )
 *
 *        Step (3R): permute rows of B.
@@ -534,7 +550,8 @@ SUBROUTINE ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
             CALL ZCOPY( NRHS, BX( M, 1 ), LDBX, B( M, 1 ), LDB )
          END IF
          DO 190 I = 2, N
-            CALL ZCOPY( NRHS, BX( I, 1 ), LDBX, B( PERM( I ), 1 ), LDB )
+            CALL ZCOPY( NRHS, BX( I, 1 ), LDBX, B( PERM( I ), 1 ),
+     $                  LDB )
   190    CONTINUE
 *
 *        Step (4R): apply back the Givens rotations performed.
diff --git a/SRC/zlalsa.f b/SRC/zlalsa.f
index 73ccf3a8bf..ccf62e924b 100644
--- a/SRC/zlalsa.f
+++ b/SRC/zlalsa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLALSA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlalsa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlalsa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -42,9 +40,9 @@
 *>
 *> \verbatim
 *>
-*> ZLALSA is an itermediate step in solving the least squares problem
+*> ZLALSA is an intermediate step in solving the least squares problem
 *> by computing the SVD of the coefficient matrix in compact form (The
-*> singular vectors are computed as products of simple orthorgonal
+*> singular vectors are computed as products of simple orthogonal
 *> matrices.).
 *>
 *> If ICOMPQ = 0, ZLALSA applies the inverse of the left singular vector
@@ -250,7 +248,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup lalsa
 *
 *> \par Contributors:
 *  ==================
@@ -260,10 +258,12 @@
 *>     Osni Marques, LBNL/NERSC, USA \n
 *
 *  =====================================================================
-      SUBROUTINE ZLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
+      SUBROUTINE ZLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX,
+     $                   U,
      $                   LDU, VT, K, DIFL, DIFR, Z, POLES, GIVPTR,
      $                   GIVCOL, LDGCOL, PERM, GIVNUM, C, S, RWORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -294,7 +294,8 @@ SUBROUTINE ZLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
      $                   NDIMR, NL, NLF, NLP1, NLVL, NR, NRF, NRP1, SQRE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DLASDT, XERBLA, ZCOPY, ZLALS0
+      EXTERNAL           DGEMM, DLASDT, XERBLA, ZCOPY,
+     $                   ZLALS0
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, DCMPLX, DIMAG
@@ -473,7 +474,8 @@ SUBROUTINE ZLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
             NLF = IC - NL
             NRF = IC + 1
             J = J - 1
-            CALL ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, BX( NLF, 1 ), LDBX,
+            CALL ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, BX( NLF, 1 ),
+     $                   LDBX,
      $                   B( NLF, 1 ), LDB, PERM( NLF, LVL ),
      $                   GIVPTR( J ), GIVCOL( NLF, LVL2 ), LDGCOL,
      $                   GIVNUM( NLF, LVL2 ), LDU, POLES( NLF, LVL2 ),
@@ -518,7 +520,8 @@ SUBROUTINE ZLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
                SQRE = 1
             END IF
             J = J + 1
-            CALL ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B( NLF, 1 ), LDB,
+            CALL ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B( NLF, 1 ),
+     $                   LDB,
      $                   BX( NLF, 1 ), LDBX, PERM( NLF, LVL ),
      $                   GIVPTR( J ), GIVCOL( NLF, LVL2 ), LDGCOL,
      $                   GIVNUM( NLF, LVL2 ), LDU, POLES( NLF, LVL2 ),
@@ -560,7 +563,8 @@ SUBROUTINE ZLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
                RWORK( J ) = DBLE( B( JROW, JCOL ) )
   200       CONTINUE
   210    CONTINUE
-         CALL DGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ), LDU,
+         CALL DGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ),
+     $               LDU,
      $               RWORK( 1+NLP1*NRHS*2 ), NLP1, ZERO, RWORK( 1 ),
      $               NLP1 )
          J = NLP1*NRHS*2
@@ -570,7 +574,8 @@ SUBROUTINE ZLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
                RWORK( J ) = DIMAG( B( JROW, JCOL ) )
   220       CONTINUE
   230    CONTINUE
-         CALL DGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ), LDU,
+         CALL DGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ),
+     $               LDU,
      $               RWORK( 1+NLP1*NRHS*2 ), NLP1, ZERO,
      $               RWORK( 1+NLP1*NRHS ), NLP1 )
          JREAL = 0
@@ -597,7 +602,8 @@ SUBROUTINE ZLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
                RWORK( J ) = DBLE( B( JROW, JCOL ) )
   260       CONTINUE
   270    CONTINUE
-         CALL DGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ), LDU,
+         CALL DGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ),
+     $               LDU,
      $               RWORK( 1+NRP1*NRHS*2 ), NRP1, ZERO, RWORK( 1 ),
      $               NRP1 )
          J = NRP1*NRHS*2
@@ -607,7 +613,8 @@ SUBROUTINE ZLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
                RWORK( J ) = DIMAG( B( JROW, JCOL ) )
   280       CONTINUE
   290    CONTINUE
-         CALL DGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ), LDU,
+         CALL DGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ),
+     $               LDU,
      $               RWORK( 1+NRP1*NRHS*2 ), NRP1, ZERO,
      $               RWORK( 1+NRP1*NRHS ), NRP1 )
          JREAL = 0
diff --git a/SRC/zlalsd.f b/SRC/zlalsd.f
index dca308e561..dffedc441c 100644
--- a/SRC/zlalsd.f
+++ b/SRC/zlalsd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLALSD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlalsd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlalsd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -48,12 +46,6 @@
 *> problem; in this case a minimum norm solution is returned.
 *> The actual singular values are returned in D in ascending order.
 *>
-*> This code makes very mild assumptions about floating point
-*> arithmetic. It will work on machines with a guard digit in
-*> add/subtract, or on those binary machines without guard digits
-*> which subtract like the Cray XMP, Cray YMP, Cray C 90, or Cray 2.
-*> It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -172,7 +164,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup lalsd
 *
 *> \par Contributors:
 *  ==================
@@ -184,6 +176,7 @@
 *  =====================================================================
       SUBROUTINE ZLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
      $                   RANK, WORK, RWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,7 +216,8 @@ SUBROUTINE ZLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
       EXTERNAL           IDAMAX, DLAMCH, DLANST
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DLARTG, DLASCL, DLASDA, DLASDQ, DLASET,
+      EXTERNAL           DGEMM, DLARTG, DLASCL, DLASDA, DLASDQ,
+     $                   DLASET,
      $                   DLASRT, XERBLA, ZCOPY, ZDROT, ZLACPY, ZLALSA,
      $                   ZLASCL, ZLASET
 *     ..
@@ -269,7 +263,8 @@ SUBROUTINE ZLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
             CALL ZLASET( 'A', 1, NRHS, CZERO, CZERO, B, LDB )
          ELSE
             RANK = 1
-            CALL ZLASCL( 'G', 0, 0, D( 1 ), ONE, 1, NRHS, B, LDB, INFO )
+            CALL ZLASCL( 'G', 0, 0, D( 1 ), ONE, 1, NRHS, B, LDB,
+     $                   INFO )
             D( 1 ) = ABS( D( 1 ) )
          END IF
          RETURN
@@ -295,7 +290,8 @@ SUBROUTINE ZLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
                DO 20 J = 1, N - 1
                   CS = RWORK( J*2-1 )
                   SN = RWORK( J*2 )
-                  CALL ZDROT( 1, B( J, I ), 1, B( J+1, I ), 1, CS, SN )
+                  CALL ZDROT( 1, B( J, I ), 1, B( J+1, I ), 1, CS,
+     $                        SN )
    20          CONTINUE
    30       CONTINUE
          END IF
@@ -368,9 +364,11 @@ SUBROUTINE ZLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
          TOL = RCND*ABS( D( IDAMAX( N, D, 1 ) ) )
          DO 100 I = 1, N
             IF( D( I ).LE.TOL ) THEN
-               CALL ZLASET( 'A', 1, NRHS, CZERO, CZERO, B( I, 1 ), LDB )
+               CALL ZLASET( 'A', 1, NRHS, CZERO, CZERO, B( I, 1 ),
+     $                      LDB )
             ELSE
-               CALL ZLASCL( 'G', 0, 0, D( I ), ONE, 1, NRHS, B( I, 1 ),
+               CALL ZLASCL( 'G', 0, 0, D( I ), ONE, 1, NRHS, B( I,
+     $                      1 ),
      $                      LDB, INFO )
                RANK = RANK + 1
             END IF
@@ -599,7 +597,8 @@ SUBROUTINE ZLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
 *        subproblems were not solved explicitly.
 *
          IF( ABS( D( I ) ).LE.TOL ) THEN
-            CALL ZLASET( 'A', 1, NRHS, CZERO, CZERO, WORK( BX+I-1 ), N )
+            CALL ZLASET( 'A', 1, NRHS, CZERO, CZERO, WORK( BX+I-1 ),
+     $                   N )
          ELSE
             RANK = RANK + 1
             CALL ZLASCL( 'G', 0, 0, D( I ), ONE, 1, NRHS,
@@ -662,7 +661,8 @@ SUBROUTINE ZLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
   300          CONTINUE
   310       CONTINUE
          ELSE
-            CALL ZLALSA( ICMPQ2, SMLSIZ, NSIZE, NRHS, WORK( BXST ), N,
+            CALL ZLALSA( ICMPQ2, SMLSIZ, NSIZE, NRHS, WORK( BXST ),
+     $                   N,
      $                   B( ST, 1 ), LDB, RWORK( U+ST1 ), N,
      $                   RWORK( VT+ST1 ), IWORK( K+ST1 ),
      $                   RWORK( DIFL+ST1 ), RWORK( DIFR+ST1 ),
diff --git a/SRC/zlamswlq.f b/SRC/zlamswlq.f
index af721d428c..de52a7efae 100644
--- a/SRC/zlamswlq.f
+++ b/SRC/zlamswlq.f
@@ -19,13 +19,13 @@
 *>
 *> \verbatim
 *>
-*>    ZLAMQRTS overwrites the general real M-by-N matrix C with
+*>    ZLAMSWLQ overwrites the general complex M-by-N matrix C with
 *>
 *>
 *>                    SIDE = 'L'     SIDE = 'R'
 *>    TRANS = 'N':      Q * C          C * Q
 *>    TRANS = 'C':      Q**H * C       C * Q**H
-*>    where Q is a real orthogonal matrix defined as the product of blocked
+*>    where Q is a complex unitary matrix defined as the product of blocked
 *>    elementary reflectors computed by short wide LQ
 *>    factorization (ZLASWLQ)
 *> \endverbatim
@@ -56,7 +56,7 @@
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix C. N >= M.
+*>          The number of columns of the matrix C. N >= 0.
 *> \endverbatim
 *>
 *> \param[in] K
@@ -70,14 +70,14 @@
 *> \param[in] MB
 *> \verbatim
 *>          MB is INTEGER
-*>          The row block size to be used in the blocked QR.
+*>          The row block size to be used in the blocked LQ.
 *>          M >= MB >= 1
 *> \endverbatim
 *>
 *> \param[in] NB
 *> \verbatim
 *>          NB is INTEGER
-*>          The column block size to be used in the blocked QR.
+*>          The column block size to be used in the blocked LQ.
 *>          NB > M.
 *> \endverbatim
 *>
@@ -94,9 +94,7 @@
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.
-*>          If SIDE = 'L', LDA >= max(1,M);
-*>          if SIDE = 'R', LDA >= max(1,N).
+*>          The leading dimension of the array A. LDA >= MAX(1,K).
 *> \endverbatim
 *>
 *> \param[in] T
@@ -129,17 +127,20 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          (workspace) COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK.
-*>          If SIDE = 'L', LWORK >= max(1,NB) * MB;
-*>          if SIDE = 'R', LWORK >= max(1,M) * MB.
+*>          If MIN(M,N,K) = 0, LWORK >= 1.
+*>          If SIDE = 'L', LWORK >= max(1,NB*MB).
+*>          If SIDE = 'R', LWORK >= max(1,M*MB).
+*>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
+*>          only calculates the minimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
@@ -163,8 +164,8 @@
 *  =====================
 *>
 *> \verbatim
-*> Short-Wide LQ (SWLQ) performs LQ by a sequence of orthogonal transformations,
-*> representing Q as a product of other orthogonal matrices
+*> Short-Wide LQ (SWLQ) performs LQ by a sequence of unitary transformations,
+*> representing Q as a product of other unitary matrices
 *>   Q = Q(1) * Q(2) * . . . * Q(k)
 *> where each Q(i) zeros out upper diagonal entries of a block of NB rows of A:
 *>   Q(1) zeros out the upper diagonal entries of rows 1:NB of A
@@ -181,7 +182,7 @@
 *> stored in columns [(i-1)*(NB-M)+M+1:i*(NB-M)+M] of A, and by upper triangular
 *> block reflectors, stored in array T(1:LDT,(i-1)*M+1:i*M).
 *> The last Q(k) may use fewer rows.
-*> For more information see Further Details in TPQRT.
+*> For more information see Further Details in TPLQT.
 *>
 *> For more details of the overall algorithm, see the description of
 *> Sequential TSQR in Section 2.2 of [1].
@@ -191,90 +192,104 @@
 *>     SIAM J. Sci. Comput, vol. 34, no. 1, 2012
 *> \endverbatim
 *>
+*> \ingroup lamswlq
+*>
 *  =====================================================================
       SUBROUTINE ZLAMSWLQ( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
-     $    LDT, C, LDC, WORK, LWORK, INFO )
+     $                     LDT, C, LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
 *     .. Scalar Arguments ..
-      CHARACTER         SIDE, TRANS
-      INTEGER           INFO, LDA, M, N, K, MB, NB, LDT, LWORK, LDC
+      CHARACTER          SIDE, TRANS
+      INTEGER            INFO, LDA, M, N, K, MB, NB, LDT, LWORK, LDC
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16        A( LDA, * ), WORK( * ), C(LDC, * ),
-     $      T( LDT, * )
+      COMPLEX*16         A( LDA, * ), WORK( * ), C( LDC, * ),
+     $                   T( LDT, * )
 *     ..
 *
 * =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
-      LOGICAL    LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER    I, II, KK, LW, CTR
+      LOGICAL            LEFT, RIGHT, TRAN, NOTRAN, LQUERY
+      INTEGER            I, II, KK, LW, CTR, MINMNK, LWMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
+*     ..
 *     .. External Subroutines ..
-      EXTERNAL    ZTPMLQT, ZGEMLQT, XERBLA
+      EXTERNAL           ZTPMLQT, ZGEMLQT, XERBLA
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input arguments
 *
-      LQUERY  = LWORK.LT.0
+      INFO = 0
+      LQUERY  = ( LWORK.EQ.-1 )
       NOTRAN  = LSAME( TRANS, 'N' )
       TRAN    = LSAME( TRANS, 'C' )
       LEFT    = LSAME( SIDE, 'L' )
       RIGHT   = LSAME( SIDE, 'R' )
-      IF (LEFT) THEN
+      IF( LEFT ) THEN
         LW = N * MB
       ELSE
         LW = M * MB
       END IF
 *
-      INFO = 0
+      MINMNK = MIN( M, N, K )
+      IF( MINMNK.EQ.0 ) THEN
+        LWMIN = 1
+      ELSE
+        LWMIN = MAX( 1, LW )
+      END IF
+*
       IF( .NOT.LEFT .AND. .NOT.RIGHT ) THEN
-         INFO = -1
+        INFO = -1
       ELSE IF( .NOT.TRAN .AND. .NOT.NOTRAN ) THEN
-         INFO = -2
-      ELSE IF( M.LT.0 ) THEN
+        INFO = -2
+      ELSE IF( K.LT.0 ) THEN
+        INFO = -5
+      ELSE IF( M.LT.K ) THEN
         INFO = -3
       ELSE IF( N.LT.0 ) THEN
         INFO = -4
-      ELSE IF( K.LT.0 ) THEN
-        INFO = -5
+      ELSE IF( K.LT.MB .OR. MB.LT.1 ) THEN
+        INFO = -6
       ELSE IF( LDA.LT.MAX( 1, K ) ) THEN
         INFO = -9
-      ELSE IF( LDT.LT.MAX( 1, MB) ) THEN
+      ELSE IF( LDT.LT.MAX( 1, MB ) ) THEN
         INFO = -11
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
-         INFO = -13
-      ELSE IF(( LWORK.LT.MAX(1,LW)).AND.(.NOT.LQUERY)) THEN
+        INFO = -13
+      ELSE IF( LWORK.LT.LWMIN .AND. (.NOT.LQUERY) ) THEN
         INFO = -15
       END IF
 *
+      IF( INFO.EQ.0 ) THEN
+        WORK( 1 ) = LWMIN
+      END IF
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'ZLAMSWLQ', -INFO )
-        WORK(1) = LW
         RETURN
-      ELSE IF (LQUERY) THEN
-        WORK(1) = LW
+      ELSE IF( LQUERY ) THEN
         RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( MIN(M,N,K).EQ.0 ) THEN
+      IF( MINMNK.EQ.0 ) THEN
         RETURN
       END IF
 *
       IF((NB.LE.K).OR.(NB.GE.MAX(M,N,K))) THEN
         CALL ZGEMLQT( SIDE, TRANS, M, N, K, MB, A, LDA,
-     $        T, LDT, C, LDC, WORK, INFO)
+     $        T, LDT, C, LDC, WORK, INFO )
         RETURN
       END IF
 *
@@ -403,7 +418,7 @@ SUBROUTINE ZLAMSWLQ( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
 *
       END IF
 *
-      WORK(1) = LW
+      WORK( 1 ) = LWMIN
       RETURN
 *
 *     End of ZLAMSWLQ
diff --git a/SRC/zlamtsqr.f b/SRC/zlamtsqr.f
index 4225c51c5a..2b9e988523 100644
--- a/SRC/zlamtsqr.f
+++ b/SRC/zlamtsqr.f
@@ -25,7 +25,7 @@
 *>                 SIDE = 'L'     SIDE = 'R'
 *> TRANS = 'N':      Q * C          C * Q
 *> TRANS = 'C':      Q**H * C       C * Q**H
-*>      where Q is a real orthogonal matrix defined as the product
+*>      where Q is a complex unitary matrix defined as the product
 *>      of blocked elementary reflectors computed by tall skinny
 *>      QR factorization (ZLATSQR)
 *> \endverbatim
@@ -56,15 +56,14 @@
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix C. M >= N >= 0.
+*>          The number of columns of the matrix C. N >= 0.
 *> \endverbatim
 *>
 *> \param[in] K
 *> \verbatim
 *>          K is INTEGER
 *>          The number of elementary reflectors whose product defines
-*>          the matrix Q.
-*>          N >= K >= 0;
+*>          the matrix Q. M >= K >= 0;
 *>
 *> \endverbatim
 *>
@@ -72,7 +71,7 @@
 *> \verbatim
 *>          MB is INTEGER
 *>          The block size to be used in the blocked QR.
-*>          MB > N. (must be the same as DLATSQR)
+*>          MB > N. (must be the same as ZLATSQR)
 *> \endverbatim
 *>
 *> \param[in] NB
@@ -87,7 +86,7 @@
 *>          A is COMPLEX*16 array, dimension (LDA,K)
 *>          The i-th column must contain the vector which defines the
 *>          blockedelementary reflector H(i), for i = 1,2,...,k, as
-*>          returned by DLATSQR in the first k columns of
+*>          returned by ZLATSQR in the first k columns of
 *>          its array argument A.
 *> \endverbatim
 *>
@@ -129,22 +128,24 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) COMPLEX*16 array, dimension (MAX(1,LWORK))
-*>
+*>          (workspace) COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
+*>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The dimension of the array WORK.
+*>          If MIN(M,N,K) = 0, LWORK >= 1.
+*>          If SIDE = 'L', LWORK >= max(1,N*NB).
+*>          If SIDE = 'R', LWORK >= max(1,MB*NB).
 *>
-*>          If SIDE = 'L', LWORK >= max(1,N)*NB;
-*>          if SIDE = 'R', LWORK >= max(1,MB)*NB.
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
+*>          only calculates the minimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
-*>
 *> \endverbatim
+*>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
@@ -164,8 +165,8 @@
 *  =====================
 *>
 *> \verbatim
-*> Tall-Skinny QR (TSQR) performs QR by a sequence of orthogonal transformations,
-*> representing Q as a product of other orthogonal matrices
+*> Tall-Skinny QR (TSQR) performs QR by a sequence of unitary transformations,
+*> representing Q as a product of other unitary matrices
 *>   Q = Q(1) * Q(2) * . . . * Q(k)
 *> where each Q(i) zeros out subdiagonal entries of a block of MB rows of A:
 *>   Q(1) zeros out the subdiagonal entries of rows 1:MB of A
@@ -192,96 +193,111 @@
 *>     SIAM J. Sci. Comput, vol. 34, no. 1, 2012
 *> \endverbatim
 *>
+*> \ingroup lamtsqr
+*>
 *  =====================================================================
       SUBROUTINE ZLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
-     $        LDT, C, LDC, WORK, LWORK, INFO )
+     $                     LDT, C, LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
 *     .. Scalar Arguments ..
-      CHARACTER         SIDE, TRANS
-      INTEGER           INFO, LDA, M, N, K, MB, NB, LDT, LWORK, LDC
+      CHARACTER          SIDE, TRANS
+      INTEGER            INFO, LDA, M, N, K, MB, NB, LDT, LWORK, LDC
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16        A( LDA, * ), WORK( * ), C(LDC, * ),
-     $                T( LDT, * )
+      COMPLEX*16         A( LDA, * ), WORK( * ), C( LDC, * ),
+     $                   T( LDT, * )
 *     ..
 *
 * =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
-      LOGICAL    LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER    I, II, KK, LW, CTR
+      LOGICAL            LEFT, RIGHT, TRAN, NOTRAN, LQUERY
+      INTEGER            I, II, KK, LW, CTR, Q, MINMNK, LWMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
+*     ..
 *     .. External Subroutines ..
-      EXTERNAL   ZGEMQRT, ZTPMQRT, XERBLA
+      EXTERNAL           ZGEMQRT, ZTPMQRT, XERBLA
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input arguments
 *
-      LQUERY  = LWORK.LT.0
+      INFO = 0
+      LQUERY  = ( LWORK.EQ.-1 )
       NOTRAN  = LSAME( TRANS, 'N' )
       TRAN    = LSAME( TRANS, 'C' )
       LEFT    = LSAME( SIDE, 'L' )
       RIGHT   = LSAME( SIDE, 'R' )
-      IF (LEFT) THEN
+      IF( LEFT ) THEN
         LW = N * NB
+        Q = M
       ELSE
         LW = M * NB
+        Q = N
+      END IF
+*
+      MINMNK = MIN( M, N, K )
+      IF( MINMNK.EQ.0 ) THEN
+        LWMIN = 1
+      ELSE
+        LWMIN = MAX( 1, LW )
       END IF
 *
-      INFO = 0
       IF( .NOT.LEFT .AND. .NOT.RIGHT ) THEN
-         INFO = -1
+        INFO = -1
       ELSE IF( .NOT.TRAN .AND. .NOT.NOTRAN ) THEN
-         INFO = -2
-      ELSE IF( M.LT.0 ) THEN
+        INFO = -2
+      ELSE IF( M.LT.K ) THEN
         INFO = -3
       ELSE IF( N.LT.0 ) THEN
         INFO = -4
       ELSE IF( K.LT.0 ) THEN
         INFO = -5
-      ELSE IF( LDA.LT.MAX( 1, K ) ) THEN
+      ELSE IF( K.LT.NB .OR. NB.LT.1 ) THEN
+        INFO = -7
+      ELSE IF( LDA.LT.MAX( 1, Q ) ) THEN
         INFO = -9
-      ELSE IF( LDT.LT.MAX( 1, NB) ) THEN
+      ELSE IF( LDT.LT.MAX( 1, NB ) ) THEN
         INFO = -11
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
-         INFO = -13
-      ELSE IF(( LWORK.LT.MAX(1,LW)).AND.(.NOT.LQUERY)) THEN
+        INFO = -13
+      ELSE IF( LWORK.LT.LWMIN .AND. (.NOT.LQUERY) ) THEN
         INFO = -15
       END IF
 *
-*     Determine the block size if it is tall skinny or short and wide
-*
-      IF( INFO.EQ.0)  THEN
-          WORK(1) = LW
+      IF( INFO.EQ.0 )  THEN
+        WORK( 1 ) = LWMIN
       END IF
 *
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'ZLAMTSQR', -INFO )
         RETURN
-      ELSE IF (LQUERY) THEN
-       RETURN
+      ELSE IF( LQUERY ) THEN
+        RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( MIN(M,N,K).EQ.0 ) THEN
+      IF( MINMNK.EQ.0 ) THEN
         RETURN
       END IF
+*
+*     Determine the block size if it is tall skinny or short and wide
 *
       IF((MB.LE.K).OR.(MB.GE.MAX(M,N,K))) THEN
         CALL ZGEMQRT( SIDE, TRANS, M, N, K, NB, A, LDA,
-     $        T, LDT, C, LDC, WORK, INFO)
+     $        T, LDT, C, LDC, WORK, INFO )
         RETURN
-       END IF
+      END IF
 *
       IF(LEFT.AND.NOTRAN) THEN
 *
@@ -407,7 +423,7 @@ SUBROUTINE ZLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
 *
       END IF
 *
-      WORK(1) = LW
+      WORK( 1 ) = LWMIN
       RETURN
 *
 *     End of ZLAMTSQR
diff --git a/SRC/zlangb.f b/SRC/zlangb.f
index 25089ee58b..8b775b01f8 100644
--- a/SRC/zlangb.f
+++ b/SRC/zlangb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLANGB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlangb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlangb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,11 +115,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBauxiliary
+*> \ingroup langb
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLANGB( NORM, N, KL, KU, AB, LDAB,
      $                 WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -201,7 +200,8 @@ DOUBLE PRECISION FUNCTION ZLANGB( NORM, N, KL, KU, AB, LDAB,
             TEMP = WORK( I )
             IF( VALUE.LT.TEMP .OR. DISNAN( TEMP ) ) VALUE = TEMP
    80    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
@@ -210,7 +210,8 @@ DOUBLE PRECISION FUNCTION ZLANGB( NORM, N, KL, KU, AB, LDAB,
          DO 90 J = 1, N
             L = MAX( 1, J-KU )
             K = KU + 1 - J + L
-            CALL ZLASSQ( MIN( N, J+KL )-L+1, AB( K, J ), 1, SCALE, SUM )
+            CALL ZLASSQ( MIN( N, J+KL )-L+1, AB( K, J ), 1, SCALE,
+     $                   SUM )
    90    CONTINUE
          VALUE = SCALE*SQRT( SUM )
       END IF
diff --git a/SRC/zlange.f b/SRC/zlange.f
index d68560e995..6ef47c501d 100644
--- a/SRC/zlange.f
+++ b/SRC/zlange.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLANGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlange.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlange.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEauxiliary
+*> \ingroup lange
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLANGE( NORM, M, N, A, LDA, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,7 +189,8 @@ DOUBLE PRECISION FUNCTION ZLANGE( NORM, M, N, A, LDA, WORK )
             TEMP = WORK( I )
             IF( VALUE.LT.TEMP .OR. DISNAN( TEMP ) ) VALUE = TEMP
    80    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/zlangt.f b/SRC/zlangt.f
index 6ae1da31e9..a60e72a69c 100644
--- a/SRC/zlangt.f
+++ b/SRC/zlangt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLANGT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlangt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlangt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -99,10 +97,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup langt
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLANGT( NORM, N, DL, D, DU )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -146,11 +145,13 @@ DOUBLE PRECISION FUNCTION ZLANGT( NORM, N, DL, D, DU )
 *
          ANORM = ABS( D( N ) )
          DO 10 I = 1, N - 1
-            IF( ANORM.LT.ABS( DL( I ) ) .OR. DISNAN( ABS( DL( I ) ) ) )
+            IF( ANORM.LT.ABS( DL( I ) ) .OR.
+     $          DISNAN( ABS( DL( I ) ) ) )
      $           ANORM = ABS(DL(I))
             IF( ANORM.LT.ABS( D( I ) ) .OR. DISNAN( ABS( D( I ) ) ) )
      $           ANORM = ABS(D(I))
-            IF( ANORM.LT.ABS( DU( I ) ) .OR. DISNAN (ABS( DU( I ) ) ) )
+            IF( ANORM.LT.ABS( DU( I ) ) .OR.
+     $          DISNAN (ABS( DU( I ) ) ) )
      $           ANORM = ABS(DU(I))
    10    CONTINUE
       ELSE IF( LSAME( NORM, 'O' ) .OR. NORM.EQ.'1' ) THEN
@@ -183,7 +184,8 @@ DOUBLE PRECISION FUNCTION ZLANGT( NORM, N, DL, D, DU )
                IF( ANORM .LT. TEMP .OR. DISNAN( TEMP ) ) ANORM = TEMP
    30       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/zlanhb.f b/SRC/zlanhb.f
index 52f46dbc6e..b9ce70ddb3 100644
--- a/SRC/zlanhb.f
+++ b/SRC/zlanhb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLANHB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlanhb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlanhb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -124,11 +122,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lanhb
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLANHB( NORM, UPLO, N, K, AB, LDAB,
      $                 WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -191,7 +190,8 @@ DOUBLE PRECISION FUNCTION ZLANHB( NORM, UPLO, N, K, AB, LDAB,
    30          CONTINUE
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is hermitian).
@@ -227,7 +227,8 @@ DOUBLE PRECISION FUNCTION ZLANHB( NORM, UPLO, N, K, AB, LDAB,
                IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
@@ -236,7 +237,8 @@ DOUBLE PRECISION FUNCTION ZLANHB( NORM, UPLO, N, K, AB, LDAB,
          IF( K.GT.0 ) THEN
             IF( LSAME( UPLO, 'U' ) ) THEN
                DO 110 J = 2, N
-                  CALL ZLASSQ( MIN( J-1, K ), AB( MAX( K+2-J, 1 ), J ),
+                  CALL ZLASSQ( MIN( J-1, K ), AB( MAX( K+2-J, 1 ),
+     $                         J ),
      $                         1, SCALE, SUM )
   110          CONTINUE
                L = K + 1
diff --git a/SRC/zlanhe.f b/SRC/zlanhe.f
index bbb4843ffd..d90dda77c1 100644
--- a/SRC/zlanhe.f
+++ b/SRC/zlanhe.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLANHE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlanhe.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlanhe.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,10 +115,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEauxiliary
+*> \ingroup lanhe
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLANHE( NORM, UPLO, N, A, LDA, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,7 +182,8 @@ DOUBLE PRECISION FUNCTION ZLANHE( NORM, UPLO, N, A, LDA, WORK )
    30          CONTINUE
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is hermitian).
@@ -217,7 +217,8 @@ DOUBLE PRECISION FUNCTION ZLANHE( NORM, UPLO, N, A, LDA, WORK )
                IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/zlanhf.f b/SRC/zlanhf.f
index 331a92aac3..e9de600985 100644
--- a/SRC/zlanhf.f
+++ b/SRC/zlanhf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLANHF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlanhf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlanhf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -131,7 +129,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup lanhf
 *
 *> \par Further Details:
 *  =====================
@@ -242,7 +240,9 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION ZLANHF( NORM, TRANSR, UPLO, N, A, WORK )
+      DOUBLE PRECISION FUNCTION ZLANHF( NORM, TRANSR, UPLO, N, A,
+     $                                  WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -677,7 +677,8 @@ DOUBLE PRECISION FUNCTION ZLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                END IF
             END IF
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *       Find normI(A) ( = norm1(A), since A is Hermitian).
@@ -1129,7 +1130,8 @@ DOUBLE PRECISION FUNCTION ZLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                END IF
             END IF
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *       Find normF(A).
 *
@@ -1143,7 +1145,8 @@ DOUBLE PRECISION FUNCTION ZLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                IF( ILU.EQ.0 ) THEN
 *                 A is upper
                   DO J = 0, K - 3
-                     CALL ZLASSQ( K-J-2, A( K+J+1+J*LDA ), 1, SCALE, S )
+                     CALL ZLASSQ( K-J-2, A( K+J+1+J*LDA ), 1, SCALE,
+     $                            S )
 *                    L at A(k,0)
                   END DO
                   DO J = 0, K - 1
@@ -1190,11 +1193,13 @@ DOUBLE PRECISION FUNCTION ZLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                ELSE
 *                 ilu=1 & A is lower
                   DO J = 0, K - 1
-                     CALL ZLASSQ( N-J-1, A( J+1+J*LDA ), 1, SCALE, S )
+                     CALL ZLASSQ( N-J-1, A( J+1+J*LDA ), 1, SCALE,
+     $                            S )
 *                    trap L at A(0,0)
                   END DO
                   DO J = 1, K - 2
-                     CALL ZLASSQ( J, A( 0+( 1+J )*LDA ), 1, SCALE, S )
+                     CALL ZLASSQ( J, A( 0+( 1+J )*LDA ), 1, SCALE,
+     $                            S )
 *                    U at A(0,1)
                   END DO
                   S = S + S
@@ -1240,7 +1245,8 @@ DOUBLE PRECISION FUNCTION ZLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                IF( ILU.EQ.0 ) THEN
 *                 A**H is upper
                   DO J = 1, K - 2
-                     CALL ZLASSQ( J, A( 0+( K+J )*LDA ), 1, SCALE, S )
+                     CALL ZLASSQ( J, A( 0+( K+J )*LDA ), 1, SCALE,
+     $                            S )
 *                    U at A(0,k)
                   END DO
                   DO J = 0, K - 2
@@ -1302,7 +1308,8 @@ DOUBLE PRECISION FUNCTION ZLANHF( NORM, TRANSR, UPLO, N, A, WORK )
 *                    k by k-1 rect. at A(0,k)
                   END DO
                   DO J = 0, K - 3
-                     CALL ZLASSQ( K-J-2, A( J+2+J*LDA ), 1, SCALE, S )
+                     CALL ZLASSQ( K-J-2, A( J+2+J*LDA ), 1, SCALE,
+     $                            S )
 *                    L at A(1,0)
                   END DO
                   S = S + S
@@ -1352,7 +1359,8 @@ DOUBLE PRECISION FUNCTION ZLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                IF( ILU.EQ.0 ) THEN
 *                 A is upper
                   DO J = 0, K - 2
-                     CALL ZLASSQ( K-J-1, A( K+J+2+J*LDA ), 1, SCALE, S )
+                     CALL ZLASSQ( K-J-1, A( K+J+2+J*LDA ), 1, SCALE,
+     $                            S )
 *                 L at A(k+1,0)
                   END DO
                   DO J = 0, K - 1
@@ -1389,7 +1397,8 @@ DOUBLE PRECISION FUNCTION ZLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                ELSE
 *                 ilu=1 & A is lower
                   DO J = 0, K - 1
-                     CALL ZLASSQ( N-J-1, A( J+2+J*LDA ), 1, SCALE, S )
+                     CALL ZLASSQ( N-J-1, A( J+2+J*LDA ), 1, SCALE,
+     $                            S )
 *                    trap L at A(1,0)
                   END DO
                   DO J = 1, K - 1
@@ -1429,7 +1438,8 @@ DOUBLE PRECISION FUNCTION ZLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                IF( ILU.EQ.0 ) THEN
 *                 A**H is upper
                   DO J = 1, K - 1
-                     CALL ZLASSQ( J, A( 0+( K+1+J )*LDA ), 1, SCALE, S )
+                     CALL ZLASSQ( J, A( 0+( K+1+J )*LDA ), 1, SCALE,
+     $                            S )
 *                 U at A(0,k+1)
                   END DO
                   DO J = 0, K - 1
@@ -1437,7 +1447,8 @@ DOUBLE PRECISION FUNCTION ZLANHF( NORM, TRANSR, UPLO, N, A, WORK )
 *                 k by k rect. at A(0,0)
                   END DO
                   DO J = 0, K - 2
-                     CALL ZLASSQ( K-J-1, A( J+1+( J+K )*LDA ), 1, SCALE,
+                     CALL ZLASSQ( K-J-1, A( J+1+( J+K )*LDA ), 1,
+     $                            SCALE,
      $                            S )
 *                 L at A(0,k)
                   END DO
@@ -1495,7 +1506,8 @@ DOUBLE PRECISION FUNCTION ZLANHF( NORM, TRANSR, UPLO, N, A, WORK )
                ELSE
 *                 A**H is lower
                   DO J = 1, K - 1
-                     CALL ZLASSQ( J, A( 0+( J+1 )*LDA ), 1, SCALE, S )
+                     CALL ZLASSQ( J, A( 0+( J+1 )*LDA ), 1, SCALE,
+     $                            S )
 *                 U at A(0,1)
                   END DO
                   DO J = K + 1, N
@@ -1503,7 +1515,8 @@ DOUBLE PRECISION FUNCTION ZLANHF( NORM, TRANSR, UPLO, N, A, WORK )
 *                 k by k rect. at A(0,k+1)
                   END DO
                   DO J = 0, K - 2
-                     CALL ZLASSQ( K-J-1, A( J+1+J*LDA ), 1, SCALE, S )
+                     CALL ZLASSQ( K-J-1, A( J+1+J*LDA ), 1, SCALE,
+     $                            S )
 *                 L at A(0,0)
                   END DO
                   S = S + S
diff --git a/SRC/zlanhp.f b/SRC/zlanhp.f
index ac45467d0e..de229e8a89 100644
--- a/SRC/zlanhp.f
+++ b/SRC/zlanhp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLANHP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlanhp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlanhp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -110,10 +108,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lanhp
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLANHP( NORM, UPLO, N, AP, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -180,7 +179,8 @@ DOUBLE PRECISION FUNCTION ZLANHP( NORM, UPLO, N, AP, WORK )
                K = K + N - J + 1
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is hermitian).
@@ -219,7 +219,8 @@ DOUBLE PRECISION FUNCTION ZLANHP( NORM, UPLO, N, AP, WORK )
                IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/zlanhs.f b/SRC/zlanhs.f
index d6725804f7..1af6a404d1 100644
--- a/SRC/zlanhs.f
+++ b/SRC/zlanhs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLANHS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlanhs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlanhs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lanhs
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLANHS( NORM, N, A, LDA, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -184,7 +183,8 @@ DOUBLE PRECISION FUNCTION ZLANHS( NORM, N, A, LDA, WORK )
             SUM = WORK( I )
             IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
    80    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/zlanht.f b/SRC/zlanht.f
index 92254726c7..1141248678 100644
--- a/SRC/zlanht.f
+++ b/SRC/zlanht.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLANHT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlanht.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlanht.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -94,10 +92,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lanht
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLANHT( NORM, N, D, E )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -163,7 +162,8 @@ DOUBLE PRECISION FUNCTION ZLANHT( NORM, N, D, E )
                IF( ANORM .LT. SUM .OR. DISNAN( SUM ) ) ANORM = SUM
    20       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/zlansb.f b/SRC/zlansb.f
index ded6d2b7ea..de7ca53c48 100644
--- a/SRC/zlansb.f
+++ b/SRC/zlansb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLANSB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlansb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlansb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,11 +120,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lanhb
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLANSB( NORM, UPLO, N, K, AB, LDAB,
      $                 WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -185,7 +184,8 @@ DOUBLE PRECISION FUNCTION ZLANSB( NORM, UPLO, N, K, AB, LDAB,
    30          CONTINUE
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is symmetric).
@@ -221,7 +221,8 @@ DOUBLE PRECISION FUNCTION ZLANSB( NORM, UPLO, N, K, AB, LDAB,
                IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
@@ -230,7 +231,8 @@ DOUBLE PRECISION FUNCTION ZLANSB( NORM, UPLO, N, K, AB, LDAB,
          IF( K.GT.0 ) THEN
             IF( LSAME( UPLO, 'U' ) ) THEN
                DO 110 J = 2, N
-                  CALL ZLASSQ( MIN( J-1, K ), AB( MAX( K+2-J, 1 ), J ),
+                  CALL ZLASSQ( MIN( J-1, K ), AB( MAX( K+2-J, 1 ),
+     $                         J ),
      $                         1, SCALE, SUM )
   110          CONTINUE
                L = K + 1
diff --git a/SRC/zlansp.f b/SRC/zlansp.f
index b565a1e1c0..0aceed3ba5 100644
--- a/SRC/zlansp.f
+++ b/SRC/zlansp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLANSP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlansp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlansp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lanhp
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLANSP( NORM, UPLO, N, AP, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -174,7 +173,8 @@ DOUBLE PRECISION FUNCTION ZLANSP( NORM, UPLO, N, AP, WORK )
                K = K + N - J + 1
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is symmetric).
@@ -213,7 +213,8 @@ DOUBLE PRECISION FUNCTION ZLANSP( NORM, UPLO, N, AP, WORK )
                IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/zlansy.f b/SRC/zlansy.f
index fd28bda204..b9e3f38601 100644
--- a/SRC/zlansy.f
+++ b/SRC/zlansy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLANSY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlansy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlansy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -116,10 +114,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYauxiliary
+*> \ingroup lanhe
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLANSY( NORM, UPLO, N, A, LDA, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -178,7 +177,8 @@ DOUBLE PRECISION FUNCTION ZLANSY( NORM, UPLO, N, A, LDA, WORK )
    30          CONTINUE
    40       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR.
+     $         ( LSAME( NORM, 'O' ) ) .OR.
      $         ( NORM.EQ.'1' ) ) THEN
 *
 *        Find normI(A) ( = norm1(A), since A is symmetric).
@@ -212,7 +212,8 @@ DOUBLE PRECISION FUNCTION ZLANSY( NORM, UPLO, N, A, LDA, WORK )
                IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
   100       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/zlantb.f b/SRC/zlantb.f
index 13014ceaca..696a10cfed 100644
--- a/SRC/zlantb.f
+++ b/SRC/zlantb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLANTB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlantb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlantb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,11 +131,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lantb
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZLANTB( NORM, UPLO, DIAG, N, K, AB,
      $                 LDAB, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -187,14 +186,16 @@ DOUBLE PRECISION FUNCTION ZLANTB( NORM, UPLO, DIAG, N, K, AB,
                DO 20 J = 1, N
                   DO 10 I = MAX( K+2-J, 1 ), K
                      SUM = ABS( AB( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    10             CONTINUE
    20          CONTINUE
             ELSE
                DO 40 J = 1, N
                   DO 30 I = 2, MIN( N+1-J, K+1 )
                      SUM = ABS( AB( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    30             CONTINUE
    40          CONTINUE
             END IF
@@ -204,14 +205,16 @@ DOUBLE PRECISION FUNCTION ZLANTB( NORM, UPLO, DIAG, N, K, AB,
                DO 60 J = 1, N
                   DO 50 I = MAX( K+2-J, 1 ), K + 1
                      SUM = ABS( AB( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    50             CONTINUE
    60          CONTINUE
             ELSE
                DO 80 J = 1, N
                   DO 70 I = 1, MIN( N+1-J, K+1 )
                      SUM = ABS( AB( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    70             CONTINUE
    80          CONTINUE
             END IF
@@ -307,7 +310,8 @@ DOUBLE PRECISION FUNCTION ZLANTB( NORM, UPLO, DIAG, N, K, AB,
             SUM = WORK( I )
             IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
   270    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
@@ -326,7 +330,8 @@ DOUBLE PRECISION FUNCTION ZLANTB( NORM, UPLO, DIAG, N, K, AB,
                SCALE = ZERO
                SUM = ONE
                DO 290 J = 1, N
-                  CALL ZLASSQ( MIN( J, K+1 ), AB( MAX( K+2-J, 1 ), J ),
+                  CALL ZLASSQ( MIN( J, K+1 ), AB( MAX( K+2-J, 1 ),
+     $                         J ),
      $                         1, SCALE, SUM )
   290          CONTINUE
             END IF
@@ -336,7 +341,8 @@ DOUBLE PRECISION FUNCTION ZLANTB( NORM, UPLO, DIAG, N, K, AB,
                SUM = N
                IF( K.GT.0 ) THEN
                   DO 300 J = 1, N - 1
-                     CALL ZLASSQ( MIN( N-J, K ), AB( 2, J ), 1, SCALE,
+                     CALL ZLASSQ( MIN( N-J, K ), AB( 2, J ), 1,
+     $                            SCALE,
      $                            SUM )
   300             CONTINUE
                END IF
@@ -344,7 +350,8 @@ DOUBLE PRECISION FUNCTION ZLANTB( NORM, UPLO, DIAG, N, K, AB,
                SCALE = ZERO
                SUM = ONE
                DO 310 J = 1, N
-                  CALL ZLASSQ( MIN( N-J+1, K+1 ), AB( 1, J ), 1, SCALE,
+                  CALL ZLASSQ( MIN( N-J+1, K+1 ), AB( 1, J ), 1,
+     $                         SCALE,
      $                         SUM )
   310          CONTINUE
             END IF
diff --git a/SRC/zlantp.f b/SRC/zlantp.f
index af2b2cf75f..4820111316 100644
--- a/SRC/zlantp.f
+++ b/SRC/zlantp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLANTP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlantp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlantp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -118,10 +116,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lantp
 *
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION ZLANTP( NORM, UPLO, DIAG, N, AP, WORK )
+      DOUBLE PRECISION FUNCTION ZLANTP( NORM, UPLO, DIAG, N, AP,
+     $                                  WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,7 +172,8 @@ DOUBLE PRECISION FUNCTION ZLANTP( NORM, UPLO, DIAG, N, AP, WORK )
                DO 20 J = 1, N
                   DO 10 I = K, K + J - 2
                      SUM = ABS( AP( I ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    10             CONTINUE
                   K = K + J
    20          CONTINUE
@@ -180,7 +181,8 @@ DOUBLE PRECISION FUNCTION ZLANTP( NORM, UPLO, DIAG, N, AP, WORK )
                DO 40 J = 1, N
                   DO 30 I = K + 1, K + N - J
                      SUM = ABS( AP( I ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    30             CONTINUE
                   K = K + N - J + 1
    40          CONTINUE
@@ -191,7 +193,8 @@ DOUBLE PRECISION FUNCTION ZLANTP( NORM, UPLO, DIAG, N, AP, WORK )
                DO 60 J = 1, N
                   DO 50 I = K, K + J - 1
                      SUM = ABS( AP( I ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    50             CONTINUE
                   K = K + J
    60          CONTINUE
@@ -199,7 +202,8 @@ DOUBLE PRECISION FUNCTION ZLANTP( NORM, UPLO, DIAG, N, AP, WORK )
                DO 80 J = 1, N
                   DO 70 I = K, K + N - J
                      SUM = ABS( AP( I ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    70             CONTINUE
                   K = K + N - J + 1
    80          CONTINUE
@@ -302,7 +306,8 @@ DOUBLE PRECISION FUNCTION ZLANTP( NORM, UPLO, DIAG, N, AP, WORK )
             SUM = WORK( I )
             IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
   270    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
diff --git a/SRC/zlantr.f b/SRC/zlantr.f
index bd4b5da7c2..5216747c89 100644
--- a/SRC/zlantr.f
+++ b/SRC/zlantr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLANTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlantr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlantr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -134,11 +132,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lantr
 *
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION ZLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
+      DOUBLE PRECISION FUNCTION ZLANTR( NORM, UPLO, DIAG, M, N, A,
+     $                                  LDA,
      $                 WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,14 +188,16 @@ DOUBLE PRECISION FUNCTION ZLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
                DO 20 J = 1, N
                   DO 10 I = 1, MIN( M, J-1 )
                      SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    10             CONTINUE
    20          CONTINUE
             ELSE
                DO 40 J = 1, N
                   DO 30 I = J + 1, M
                      SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    30             CONTINUE
    40          CONTINUE
             END IF
@@ -205,14 +207,16 @@ DOUBLE PRECISION FUNCTION ZLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
                DO 60 J = 1, N
                   DO 50 I = 1, MIN( M, J )
                      SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    50             CONTINUE
    60          CONTINUE
             ELSE
                DO 80 J = 1, N
                   DO 70 I = J, M
                      SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+                     IF( VALUE .LT. SUM .OR.
+     $                   DISNAN( SUM ) ) VALUE = SUM
    70             CONTINUE
    80          CONTINUE
             END IF
@@ -307,7 +311,8 @@ DOUBLE PRECISION FUNCTION ZLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
             SUM = WORK( I )
             IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
   280    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR.
+     $         ( LSAME( NORM, 'E' ) ) ) THEN
 *
 *        Find normF(A).
 *
@@ -316,13 +321,15 @@ DOUBLE PRECISION FUNCTION ZLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
                SCALE = ONE
                SUM = MIN( M, N )
                DO 290 J = 2, N
-                  CALL ZLASSQ( MIN( M, J-1 ), A( 1, J ), 1, SCALE, SUM )
+                  CALL ZLASSQ( MIN( M, J-1 ), A( 1, J ), 1, SCALE,
+     $                         SUM )
   290          CONTINUE
             ELSE
                SCALE = ZERO
                SUM = ONE
                DO 300 J = 1, N
-                  CALL ZLASSQ( MIN( M, J ), A( 1, J ), 1, SCALE, SUM )
+                  CALL ZLASSQ( MIN( M, J ), A( 1, J ), 1, SCALE,
+     $                         SUM )
   300          CONTINUE
             END IF
          ELSE
diff --git a/SRC/zlapll.f b/SRC/zlapll.f
index 345e7f7709..450a4ef7be 100644
--- a/SRC/zlapll.f
+++ b/SRC/zlapll.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAPLL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlapll.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlapll.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -93,10 +91,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lapll
 *
 *  =====================================================================
       SUBROUTINE ZLAPLL( N, X, INCX, Y, INCY, SSMIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlapmr.f b/SRC/zlapmr.f
index 6a409d2c21..6369e00d57 100644
--- a/SRC/zlapmr.f
+++ b/SRC/zlapmr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAPMR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlapmr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlapmr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lapmr
 *
 *  =====================================================================
       SUBROUTINE ZLAPMR( FORWRD, M, N, X, LDX, K )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlapmt.f b/SRC/zlapmt.f
index 6c8e6fe7d1..ee59ae0d6a 100644
--- a/SRC/zlapmt.f
+++ b/SRC/zlapmt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAPMT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlapmt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlapmt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lapmt
 *
 *  =====================================================================
       SUBROUTINE ZLAPMT( FORWRD, M, N, X, LDX, K )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlaqgb.f b/SRC/zlaqgb.f
index f1480b67e5..09a4da207c 100644
--- a/SRC/zlaqgb.f
+++ b/SRC/zlaqgb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQGB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqgb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqgb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -152,11 +150,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBauxiliary
+*> \ingroup laqgb
 *
 *  =====================================================================
-      SUBROUTINE ZLAQGB( M, N, KL, KU, AB, LDAB, R, C, ROWCND, COLCND,
+      SUBROUTINE ZLAQGB( M, N, KL, KU, AB, LDAB, R, C, ROWCND,
+     $                   COLCND,
      $                   AMAX, EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlaqge.f b/SRC/zlaqge.f
index 5eae13dd50..8c758b0b91 100644
--- a/SRC/zlaqge.f
+++ b/SRC/zlaqge.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqge.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqge.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,11 +133,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEauxiliary
+*> \ingroup laqge
 *
 *  =====================================================================
       SUBROUTINE ZLAQGE( M, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
      $                   EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlaqhb.f b/SRC/zlaqhb.f
index 3b90b59909..5db903e801 100644
--- a/SRC/zlaqhb.f
+++ b/SRC/zlaqhb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQHB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqhb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqhb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -134,10 +132,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup laqhb
 *
 *  =====================================================================
-      SUBROUTINE ZLAQHB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX, EQUED )
+      SUBROUTINE ZLAQHB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX,
+     $                   EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlaqhe.f b/SRC/zlaqhe.f
index afda051f15..6a72251912 100644
--- a/SRC/zlaqhe.f
+++ b/SRC/zlaqhe.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQHE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqhe.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqhe.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,10 +125,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16HEauxiliary
+*> \ingroup laqhe
 *
 *  =====================================================================
       SUBROUTINE ZLAQHE( UPLO, N, A, LDA, S, SCOND, AMAX, EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlaqhp.f b/SRC/zlaqhp.f
index e5b2f213d3..6cba38952b 100644
--- a/SRC/zlaqhp.f
+++ b/SRC/zlaqhp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQHP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqhp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqhp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,10 +117,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup laqhp
 *
 *  =====================================================================
       SUBROUTINE ZLAQHP( UPLO, N, AP, S, SCOND, AMAX, EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlaqp2.f b/SRC/zlaqp2.f
index 2354b67887..bc81b28c26 100644
--- a/SRC/zlaqp2.f
+++ b/SRC/zlaqp2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQP2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqp2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqp2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,7 +120,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup laqp2
 *
 *> \par Contributors:
 *  ==================
@@ -139,13 +137,12 @@
 *>
 *> LAPACK Working Note 176
 *
-*> \htmlonly
 *> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">[PDF]</a>
-*> \endhtmlonly
 *
 *  =====================================================================
       SUBROUTINE ZLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
      $                   WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,10 +168,9 @@ SUBROUTINE ZLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
 *     .. Local Scalars ..
       INTEGER            I, ITEMP, J, MN, OFFPI, PVT
       DOUBLE PRECISION   TEMP, TEMP2, TOL3Z
-      COMPLEX*16         AII
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZLARF, ZLARFG, ZSWAP
+      EXTERNAL           ZLARF1F, ZLARFG, ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DCONJG, MAX, MIN, SQRT
@@ -211,7 +207,8 @@ SUBROUTINE ZLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
 *        Generate elementary reflector H(i).
 *
          IF( OFFPI.LT.M ) THEN
-            CALL ZLARFG( M-OFFPI+1, A( OFFPI, I ), A( OFFPI+1, I ), 1,
+            CALL ZLARFG( M-OFFPI+1, A( OFFPI, I ), A( OFFPI+1, I ),
+     $                   1,
      $                   TAU( I ) )
          ELSE
             CALL ZLARFG( 1, A( M, I ), A( M, I ), 1, TAU( I ) )
@@ -221,12 +218,9 @@ SUBROUTINE ZLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
 *
 *           Apply H(i)**H to A(offset+i:m,i+1:n) from the left.
 *
-            AII = A( OFFPI, I )
-            A( OFFPI, I ) = CONE
-            CALL ZLARF( 'Left', M-OFFPI+1, N-I, A( OFFPI, I ), 1,
-     $                  DCONJG( TAU( I ) ), A( OFFPI, I+1 ), LDA,
-     $                  WORK( 1 ) )
-            A( OFFPI, I ) = AII
+            CALL ZLARF1F( 'Left', M-OFFPI+1, N-I, A( OFFPI, I ), 1,
+     $                    CONJG( TAU( I ) ), A( OFFPI, I+1 ), LDA,
+     $                    WORK( 1 ) )
          END IF
 *
 *        Update partial column norms.
diff --git a/SRC/zlaqp2rk.f b/SRC/zlaqp2rk.f
new file mode 100644
index 0000000000..7af2fe1f49
--- /dev/null
+++ b/SRC/zlaqp2rk.f
@@ -0,0 +1,712 @@
+*> \brief \b ZLAQP2RK computes truncated QR factorization with column pivoting of a complex matrix block using Level 2 BLAS and overwrites a complex m-by-nrhs matrix B with Q**H * B.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download ZLAQP2RK + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqp2rk.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqp2rk.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqp2rk.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*      SUBROUTINE ZLAQP2RK( M, N, NRHS, IOFFSET, KMAX, ABSTOL, RELTOL,
+*     $                     KP1, MAXC2NRM, A, LDA, K, MAXC2NRMK,
+*     $                     RELMAXC2NRMK, JPIV, TAU, VN1, VN2, WORK,
+*     $                     INFO )
+*      IMPLICIT NONE
+*
+*     .. Scalar Arguments ..
+*      INTEGER            INFO, IOFFSET, KP1, K, KMAX, LDA, M, N, NRHS
+*      DOUBLE PRECISION   ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+*     $                   RELTOL
+*     ..
+*     .. Array Arguments ..
+*      INTEGER            JPIV( * )
+*      DOUBLE PRECISION   VN1( * ), VN2( * )
+*      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*     $
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLAQP2RK computes a truncated (rank K) or full rank Householder QR
+*> factorization with column pivoting of the complex matrix
+*> block A(IOFFSET+1:M,1:N) as
+*>
+*>   A * P(K) = Q(K) * R(K).
+*>
+*> The routine uses Level 2 BLAS. The block A(1:IOFFSET,1:N)
+*> is accordingly pivoted, but not factorized.
+*>
+*> The routine also overwrites the right-hand-sides matrix block B
+*> stored in A(IOFFSET+1:M,N+1:N+NRHS) with Q(K)**H * B.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of
+*>          columns of the matrix B. NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] IOFFSET
+*> \verbatim
+*>          IOFFSET is INTEGER
+*>          The number of rows of the matrix A that must be pivoted
+*>          but not factorized. IOFFSET >= 0.
+*>
+*>          IOFFSET also represents the number of columns of the whole
+*>          original matrix A_orig that have been factorized
+*>          in the previous steps.
+*> \endverbatim
+*>
+*> \param[in] KMAX
+*> \verbatim
+*>          KMAX is INTEGER
+*>
+*>          The first factorization stopping criterion. KMAX >= 0.
+*>
+*>          The maximum number of columns of the matrix A to factorize,
+*>          i.e. the maximum factorization rank.
+*>
+*>          a) If KMAX >= min(M-IOFFSET,N), then this stopping
+*>                criterion is not used, factorize columns
+*>                depending on ABSTOL and RELTOL.
+*>
+*>          b) If KMAX = 0, then this stopping criterion is
+*>             satisfied on input and the routine exits immediately.
+*>             This means that the factorization is not performed,
+*>             the matrices A and B and the arrays TAU, IPIV
+*>             are not modified.
+*> \endverbatim
+*>
+*> \param[in] ABSTOL
+*> \verbatim
+*>          ABSTOL is DOUBLE PRECISION, cannot be NaN.
+*>
+*>          The second factorization stopping criterion.
+*>
+*>          The absolute tolerance (stopping threshold) for
+*>          maximum column 2-norm of the residual matrix.
+*>          The algorithm converges (stops the factorization) when
+*>          the maximum column 2-norm of the residual matrix
+*>          is less than or equal to ABSTOL.
+*>
+*>          a) If ABSTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on KMAX and RELTOL.
+*>                This includes the case ABSTOL = -Inf.
+*>
+*>          b) If 0.0 <= ABSTOL then the input value
+*>                of ABSTOL is used.
+*> \endverbatim
+*>
+*> \param[in] RELTOL
+*> \verbatim
+*>          RELTOL is DOUBLE PRECISION, cannot be NaN.
+*>
+*>          The third factorization stopping criterion.
+*>
+*>          The tolerance (stopping threshold) for the ratio of the
+*>          maximum column 2-norm of the residual matrix to the maximum
+*>          column 2-norm of the original matrix A_orig. The algorithm
+*>          converges (stops the factorization), when this ratio is
+*>          less than or equal to RELTOL.
+*>
+*>          a) If RELTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on KMAX and ABSTOL.
+*>                This includes the case RELTOL = -Inf.
+*>
+*>          d) If 0.0 <= RELTOL then the input value of RELTOL
+*>                is used.
+*> \endverbatim
+*>
+*> \param[in] KP1
+*> \verbatim
+*>          KP1 is INTEGER
+*>          The index of the column with the maximum 2-norm in
+*>          the whole original matrix A_orig determined in the
+*>          main routine ZGEQP3RK. 1 <= KP1 <= N_orig_mat.
+*> \endverbatim
+*>
+*> \param[in] MAXC2NRM
+*> \verbatim
+*>          MAXC2NRM is DOUBLE PRECISION
+*>          The maximum column 2-norm of the whole original
+*>          matrix A_orig computed in the main routine ZGEQP3RK.
+*>          MAXC2NRM >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N+NRHS)
+*>          On entry:
+*>              the M-by-N matrix A and M-by-NRHS matrix B, as in
+*>
+*>                                  N     NRHS
+*>              array_A   =   M  [ mat_A, mat_B ]
+*>
+*>          On exit:
+*>          1. The elements in block A(IOFFSET+1:M,1:K) below
+*>             the diagonal together with the array TAU represent
+*>             the unitary matrix Q(K) as a product of elementary
+*>             reflectors.
+*>          2. The upper triangular block of the matrix A stored
+*>             in A(IOFFSET+1:M,1:K) is the triangular factor obtained.
+*>          3. The block of the matrix A stored in A(1:IOFFSET,1:N)
+*>             has been accordingly pivoted, but not factorized.
+*>          4. The rest of the array A, block A(IOFFSET+1:M,K+1:N+NRHS).
+*>             The left part A(IOFFSET+1:M,K+1:N) of this block
+*>             contains the residual of the matrix A, and,
+*>             if NRHS > 0, the right part of the block
+*>             A(IOFFSET+1:M,N+1:N+NRHS) contains the block of
+*>             the right-hand-side matrix B. Both these blocks have been
+*>             updated by multiplication from the left by Q(K)**H.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] K
+*> \verbatim
+*>          K is INTEGER
+*>          Factorization rank of the matrix A, i.e. the rank of
+*>          the factor R, which is the same as the number of non-zero
+*>          rows of the factor R. 0 <= K <= min(M-IOFFSET,KMAX,N).
+*>
+*>          K also represents the number of non-zero Householder
+*>          vectors.
+*> \endverbatim
+*>
+*> \param[out] MAXC2NRMK
+*> \verbatim
+*>          MAXC2NRMK is DOUBLE PRECISION
+*>          The maximum column 2-norm of the residual matrix,
+*>          when the factorization stopped at rank K. MAXC2NRMK >= 0.
+*> \endverbatim
+*>
+*> \param[out] RELMAXC2NRMK
+*> \verbatim
+*>          RELMAXC2NRMK is DOUBLE PRECISION
+*>          The ratio MAXC2NRMK / MAXC2NRM of the maximum column
+*>          2-norm of the residual matrix (when the factorization
+*>          stopped at rank K) to the maximum column 2-norm of the
+*>          whole original matrix A. RELMAXC2NRMK >= 0.
+*> \endverbatim
+*>
+*> \param[out] JPIV
+*> \verbatim
+*>          JPIV is INTEGER array, dimension (N)
+*>          Column pivot indices, for 1 <= j <= N, column j
+*>          of the matrix A was interchanged with column JPIV(j).
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (min(M-IOFFSET,N))
+*>          The scalar factors of the elementary reflectors.
+*> \endverbatim
+*>
+*> \param[in,out] VN1
+*> \verbatim
+*>          VN1 is DOUBLE PRECISION array, dimension (N)
+*>          The vector with the partial column norms.
+*> \endverbatim
+*>
+*> \param[in,out] VN2
+*> \verbatim
+*>          VN2 is DOUBLE PRECISION array, dimension (N)
+*>          The vector with the exact column norms.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (N-1)
+*>          Used in ZLARF1F subroutine to apply an elementary
+*>          reflector from the left.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          1) INFO = 0: successful exit.
+*>          2) If INFO = j_1, where 1 <= j_1 <= N, then NaN was
+*>             detected and the routine stops the computation.
+*>             The j_1-th column of the matrix A or the j_1-th
+*>             element of array TAU contains the first occurrence
+*>             of NaN in the factorization step K+1 ( when K columns
+*>             have been factorized ).
+*>
+*>             On exit:
+*>             K                  is set to the number of
+*>                                   factorized columns without
+*>                                   exception.
+*>             MAXC2NRMK          is set to NaN.
+*>             RELMAXC2NRMK       is set to NaN.
+*>             TAU(K+1:min(M,N))  is not set and contains undefined
+*>                                   elements. If j_1=K+1, TAU(K+1)
+*>                                   may contain NaN.
+*>          3) If INFO = j_2, where N+1 <= j_2 <= 2*N, then no NaN
+*>             was detected, but +Inf (or -Inf) was detected and
+*>             the routine continues the computation until completion.
+*>             The (j_2-N)-th column of the matrix A contains the first
+*>             occurrence of +Inf (or -Inf) in the factorization
+*>             step K+1 ( when K columns have been factorized ).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup laqp2rk
+*
+*> \par References:
+*  ================
+*> [1] A Level 3 BLAS QR factorization algorithm with column pivoting developed in 1996.
+*> G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain.
+*> X. Sun, Computer Science Dept., Duke University, USA.
+*> C. H. Bischof, Math. and Comp. Sci. Div., Argonne National Lab, USA.
+*> A BLAS-3 version of the QR factorization with column pivoting.
+*> LAPACK Working Note 114
+*> <a href="https://www.netlib.org/lapack/lawnspdf/lawn114.pdf">https://www.netlib.org/lapack/lawnspdf/lawn114.pdf</a>
+*> and in
+*> SIAM J. Sci. Comput., 19(5):1486-1494, Sept. 1998.
+*> <a href="https://doi.org/10.1137/S1064827595296732">https://doi.org/10.1137/S1064827595296732</a>
+*>
+*> [2] A partial column norm updating strategy developed in 2006.
+*> Z. Drmac and Z. Bujanovic, Dept. of Math., University of Zagreb, Croatia.
+*> On the failure of rank revealing QR factorization software – a case study.
+*> LAPACK Working Note 176.
+*> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">http://www.netlib.org/lapack/lawnspdf/lawn176.pdf</a>
+*> and in
+*> ACM Trans. Math. Softw. 35, 2, Article 12 (July 2008), 28 pages.
+*> <a href="https://doi.org/10.1145/1377612.1377616">https://doi.org/10.1145/1377612.1377616</a>
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
+*>
+*>  November  2023, Igor Kozachenko, James Demmel,
+*>                  EECS Department,
+*>                  University of California, Berkeley, USA.
+*>
+*> \endverbatim
+*
+*  =====================================================================
+      SUBROUTINE ZLAQP2RK( M, N, NRHS, IOFFSET, KMAX, ABSTOL, RELTOL,
+     $                     KP1, MAXC2NRM, A, LDA, K, MAXC2NRMK,
+     $                     RELMAXC2NRMK, JPIV, TAU, VN1, VN2, WORK,
+     $                     INFO )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            INFO, IOFFSET, KP1, K, KMAX, LDA, M, N, NRHS
+      DOUBLE PRECISION   ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+     $                   RELTOL
+*     ..
+*     .. Array Arguments ..
+      INTEGER            JPIV( * )
+      DOUBLE PRECISION   VN1( * ), VN2( * )
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+      COMPLEX*16         CZERO, CONE
+      PARAMETER          ( CZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   CONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, ITEMP, J, JMAXC2NRM, KK, KP, MINMNFACT,
+     $                   MINMNUPDT
+      DOUBLE PRECISION   HUGEVAL, TAUNAN, TEMP, TEMP2, TOL3Z
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZLARF1F, ZLARFG, ZSWAP
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DCONJG, DIMAG, MAX, MIN, SQRT
+*     ..
+*     .. External Functions ..
+      LOGICAL            DISNAN
+      INTEGER            IDAMAX
+      DOUBLE PRECISION   DLAMCH, DZNRM2
+      EXTERNAL           DISNAN, DLAMCH, IDAMAX, DZNRM2
+*     ..
+*     .. Executable Statements ..
+*
+*     Initialize INFO
+*
+      INFO = 0
+*
+*     MINMNFACT in the smallest dimension of the submatrix
+*     A(IOFFSET+1:M,1:N) to be factorized.
+*
+*     MINMNUPDT is the smallest dimension
+*     of the subarray A(IOFFSET+1:M,1:N+NRHS) to be udated, which
+*     contains the submatrices A(IOFFSET+1:M,1:N) and
+*     B(IOFFSET+1:M,1:NRHS) as column blocks.
+*
+      MINMNFACT = MIN( M-IOFFSET, N )
+      MINMNUPDT = MIN( M-IOFFSET, N+NRHS )
+      KMAX = MIN( KMAX, MINMNFACT )
+      TOL3Z = SQRT( DLAMCH( 'Epsilon' ) )
+      HUGEVAL = DLAMCH( 'Overflow' )
+*
+*     Compute the factorization, KK is the lomn loop index.
+*
+      DO KK = 1, KMAX
+*
+         I = IOFFSET + KK
+*
+         IF( I.EQ.1 ) THEN
+*
+*           ============================================================
+*
+*           We are at the first column of the original whole matrix A,
+*           therefore we use the computed KP1 and MAXC2NRM from the
+*           main routine.
+*
+            KP = KP1
+*
+*           ============================================================
+*
+         ELSE
+*
+*           ============================================================
+*
+*           Determine the pivot column in KK-th step, i.e. the index
+*           of the column with the maximum 2-norm in the
+*           submatrix A(I:M,K:N).
+*
+            KP = ( KK-1 ) + IDAMAX( N-KK+1, VN1( KK ), 1 )
+*
+*           Determine the maximum column 2-norm and the relative maximum
+*           column 2-norm of the submatrix A(I:M,KK:N) in step KK.
+*           RELMAXC2NRMK  will be computed later, after somecondition
+*           checks on MAXC2NRMK.
+*
+            MAXC2NRMK = VN1( KP )
+*
+*           ============================================================
+*
+*           Check if the submatrix A(I:M,KK:N) contains NaN, and set
+*           INFO parameter to the column number, where the first NaN
+*           is found and return from the routine.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( DISNAN( MAXC2NRMK ) ) THEN
+*
+*              Set K, the number of factorized columns.
+*              that are not zero.
+*
+                K = KK - 1
+                INFO = K + KP
+*
+*               Set RELMAXC2NRMK to NaN.
+*
+                RELMAXC2NRMK = MAXC2NRMK
+*
+*               Array TAU(K+1:MINMNFACT) is not set and contains
+*               undefined elements.
+*
+               RETURN
+            END IF
+*
+*           ============================================================
+*
+*           Quick return, if the submatrix A(I:M,KK:N) is
+*           a zero matrix.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( MAXC2NRMK.EQ.ZERO ) THEN
+*
+*              Set K, the number of factorized columns.
+*              that are not zero.
+*
+               K = KK - 1
+               RELMAXC2NRMK = ZERO
+*
+*              Set TAUs corresponding to the columns that were not
+*              factorized to ZERO, i.e. set TAU(KK:MINMNFACT) to CZERO.
+*
+               DO J = KK, MINMNFACT
+                  TAU( J ) = CZERO
+               END DO
+*
+*              Return from the routine.
+*
+               RETURN
+*
+            END IF
+*
+*           ============================================================
+*
+*           Check if the submatrix A(I:M,KK:N) contains Inf,
+*           set INFO parameter to the column number, where
+*           the first Inf is found plus N, and continue
+*           the computation.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( INFO.EQ.0 .AND. MAXC2NRMK.GT.HUGEVAL ) THEN
+               INFO = N + KK - 1 + KP
+            END IF
+*
+*           ============================================================
+*
+*           Test for the second and third stopping criteria.
+*           NOTE: There is no need to test for ABSTOL >= ZERO, since
+*           MAXC2NRMK is non-negative. Similarly, there is no need
+*           to test for RELTOL >= ZERO, since RELMAXC2NRMK is
+*           non-negative.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+
+            RELMAXC2NRMK =  MAXC2NRMK / MAXC2NRM
+*
+            IF( MAXC2NRMK.LE.ABSTOL .OR. RELMAXC2NRMK.LE.RELTOL ) THEN
+*
+*              Set K, the number of factorized columns.
+*
+               K = KK - 1
+*
+*              Set TAUs corresponding to the columns that were not
+*              factorized to ZERO, i.e. set TAU(KK:MINMNFACT) to CZERO.
+*
+               DO J = KK, MINMNFACT
+                  TAU( J ) = CZERO
+               END DO
+*
+*              Return from the routine.
+*
+               RETURN
+*
+            END IF
+*
+*           ============================================================
+*
+*           End ELSE of IF(I.EQ.1)
+*
+         END IF
+*
+*        ===============================================================
+*
+*        If the pivot column is not the first column of the
+*        subblock A(1:M,KK:N):
+*        1) swap the KK-th column and the KP-th pivot column
+*           in A(1:M,1:N);
+*        2) copy the KK-th element into the KP-th element of the partial
+*           and exact 2-norm vectors VN1 and VN2. ( Swap is not needed
+*           for VN1 and VN2 since we use the element with the index
+*           larger than KK in the next loop step.)
+*        3) Save the pivot interchange with the indices relative to the
+*           the original matrix A, not the block A(1:M,1:N).
+*
+         IF( KP.NE.KK ) THEN
+            CALL ZSWAP( M, A( 1, KP ), 1, A( 1, KK ), 1 )
+            VN1( KP ) = VN1( KK )
+            VN2( KP ) = VN2( KK )
+            ITEMP = JPIV( KP )
+            JPIV( KP ) = JPIV( KK )
+            JPIV( KK ) = ITEMP
+         END IF
+*
+*        Generate elementary reflector H(KK) using the column A(I:M,KK),
+*        if the column has more than one element, otherwise
+*        the elementary reflector would be an identity matrix,
+*        and TAU(KK) = CZERO.
+*
+         IF( I.LT.M ) THEN
+            CALL ZLARFG( M-I+1, A( I, KK ), A( I+1, KK ), 1,
+     $                   TAU( KK ) )
+         ELSE
+            TAU( KK ) = CZERO
+         END IF
+*
+*        Check if TAU(KK) contains NaN, set INFO parameter
+*        to the column number where NaN is found and return from
+*        the routine.
+*        NOTE: There is no need to check TAU(KK) for Inf,
+*        since ZLARFG cannot produce TAU(KK) or Householder vector
+*        below the diagonal containing Inf. Only BETA on the diagonal,
+*        returned by ZLARFG can contain Inf, which requires
+*        TAU(KK) to contain NaN. Therefore, this case of generating Inf
+*        by ZLARFG is covered by checking TAU(KK) for NaN.
+*
+         IF( DISNAN( DBLE( TAU(KK) ) ) ) THEN
+            TAUNAN = DBLE( TAU(KK) )
+         ELSE IF( DISNAN( DIMAG( TAU(KK) ) ) ) THEN
+            TAUNAN = DIMAG( TAU(KK) )
+         ELSE
+            TAUNAN = ZERO
+         END IF
+*
+         IF( DISNAN( TAUNAN ) ) THEN
+            K = KK - 1
+            INFO = KK
+*
+*           Set MAXC2NRMK and  RELMAXC2NRMK to NaN.
+*
+            MAXC2NRMK = TAUNAN
+            RELMAXC2NRMK = TAUNAN
+*
+*           Array TAU(KK:MINMNFACT) is not set and contains
+*           undefined elements, except the first element TAU(KK) = NaN.
+*
+            RETURN
+         END IF
+*
+*        Apply H(KK)**H to A(I:M,KK+1:N+NRHS) from the left.
+*        ( If M >= N, then at KK = N there is no residual matrix,
+*         i.e. no columns of A to update, only columns of B.
+*         If M < N, then at KK = M-IOFFSET, I = M and we have a
+*         one-row residual matrix in A and the elementary
+*         reflector is a unit matrix, TAU(KK) = CZERO, i.e. no update
+*         is needed for the residual matrix in A and the
+*         right-hand-side-matrix in B.
+*         Therefore, we update only if
+*         KK < MINMNUPDT = min(M-IOFFSET, N+NRHS)
+*         condition is satisfied, not only KK < N+NRHS )
+*
+         IF( KK.LT.MINMNUPDT ) THEN
+            CALL ZLARF1F( 'Left', M-I+1, N+NRHS-KK, A( I, KK ), 1,
+     $                    CONJG( TAU( KK ) ), A( I, KK+1 ), LDA,
+     $                    WORK( 1 ) )
+         END IF
+*
+         IF( KK.LT.MINMNFACT ) THEN
+*
+*           Update the partial column 2-norms for the residual matrix,
+*           only if the residual matrix A(I+1:M,KK+1:N) exists, i.e.
+*           when KK < min(M-IOFFSET, N).
+*
+            DO J = KK + 1, N
+               IF( VN1( J ).NE.ZERO ) THEN
+*
+*                 NOTE: The following lines follow from the analysis in
+*                 Lapack Working Note 176.
+*
+                  TEMP = ONE - ( ABS( A( I, J ) ) / VN1( J ) )**2
+                  TEMP = MAX( TEMP, ZERO )
+                  TEMP2 = TEMP*( VN1( J ) / VN2( J ) )**2
+                  IF( TEMP2 .LE. TOL3Z ) THEN
+*
+*                    Compute the column 2-norm for the partial
+*                    column A(I+1:M,J) by explicitly computing it,
+*                    and store it in both partial 2-norm vector VN1
+*                    and exact column 2-norm vector VN2.
+*
+                     VN1( J ) = DZNRM2( M-I, A( I+1, J ), 1 )
+                     VN2( J ) = VN1( J )
+*
+                  ELSE
+*
+*                    Update the column 2-norm for the partial
+*                    column A(I+1:M,J) by removing one
+*                    element A(I,J) and store it in partial
+*                    2-norm vector VN1.
+*
+                     VN1( J ) = VN1( J )*SQRT( TEMP )
+*
+                  END IF
+               END IF
+            END DO
+*
+         END IF
+*
+*     End factorization loop
+*
+      END DO
+*
+*     If we reached this point, all colunms have been factorized,
+*     i.e. no condition was triggered to exit the routine.
+*     Set the number of factorized columns.
+*
+      K = KMAX
+*
+*     We reached the end of the loop, i.e. all KMAX columns were
+*     factorized, we need to set MAXC2NRMK and RELMAXC2NRMK before
+*     we return.
+*
+      IF( K.LT.MINMNFACT ) THEN
+*
+         JMAXC2NRM = K + IDAMAX( N-K, VN1( K+1 ), 1 )
+         MAXC2NRMK = VN1( JMAXC2NRM )
+*
+         IF( K.EQ.0 ) THEN
+            RELMAXC2NRMK = ONE
+         ELSE
+            RELMAXC2NRMK = MAXC2NRMK / MAXC2NRM
+         END IF
+*
+      ELSE
+         MAXC2NRMK = ZERO
+         RELMAXC2NRMK = ZERO
+      END IF
+*
+*     We reached the end of the loop, i.e. all KMAX columns were
+*     factorized, set TAUs corresponding to the columns that were
+*     not factorized to ZERO, i.e. TAU(K+1:MINMNFACT) set to CZERO.
+*
+      DO J = K + 1, MINMNFACT
+         TAU( J ) = CZERO
+      END DO
+*
+      RETURN
+*
+*     End of ZLAQP2RK
+*
+      END
diff --git a/SRC/zlaqp3rk.f b/SRC/zlaqp3rk.f
new file mode 100644
index 0000000000..13c09dcc76
--- /dev/null
+++ b/SRC/zlaqp3rk.f
@@ -0,0 +1,937 @@
+*> \brief \b ZLAQP3RK computes a step of truncated QR factorization with column pivoting of a complex m-by-n matrix A using Level 3 BLAS and overwrites a complex m-by-nrhs matrix B with Q**H * B.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download ZLAQP3RK + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqp3rk.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqp3rk.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqp3rk.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*      SUBROUTINE ZLAQP3RK( M, N, NRHS, IOFFSET, NB, ABSTOL,
+*     $                     RELTOL, KP1, MAXC2NRM, A, LDA, DONE, KB,
+*     $                     MAXC2NRMK, RELMAXC2NRMK, JPIV, TAU,
+*     $                     VN1, VN2, AUXV, F, LDF, IWORK, INFO )
+*      IMPLICIT NONE
+*      LOGICAL            DONE
+*      INTEGER            INFO, IOFFSET, KB, KP1, LDA, LDF, M, N,
+*     $                   NB, NRHS
+*      DOUBLE PRECISION   ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+*     $                   RELTOL
+*     ..
+*     .. Array Arguments ..
+*      INTEGER            IWORK( * ), JPIV( * )
+*      DOUBLE PRECISION   VN1( * ), VN2( * )
+*      COMPLEX*16         A( LDA, * ), AUXV( * ), F( LDF, * ), TAU( * )
+*     ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLAQP3RK computes a step of truncated QR factorization with column
+*> pivoting of a complex M-by-N matrix A block A(IOFFSET+1:M,1:N)
+*> by using Level 3 BLAS as
+*>
+*>   A * P(KB) = Q(KB) * R(KB).
+*>
+*> The routine tries to factorize NB columns from A starting from
+*> the row IOFFSET+1 and updates the residual matrix with BLAS 3
+*> xGEMM. The number of actually factorized columns is returned
+*> is smaller than NB.
+*>
+*> Block A(1:IOFFSET,1:N) is accordingly pivoted, but not factorized.
+*>
+*> The routine also overwrites the right-hand-sides B matrix stored
+*> in A(IOFFSET+1:M,1:N+1:N+NRHS) with Q(KB)**H * B.
+*>
+*> Cases when the number of factorized columns KB < NB:
+*>
+*> (1) In some cases, due to catastrophic cancellations, it cannot
+*> factorize all NB columns and need to update the residual matrix.
+*> Hence, the actual number of factorized columns in the block returned
+*> in KB is smaller than NB. The logical DONE is returned as FALSE.
+*> The factorization of the whole original matrix A_orig must proceed
+*> with the next block.
+*>
+*> (2) Whenever the stopping criterion ABSTOL or RELTOL is satisfied,
+*> the factorization of the whole original matrix A_orig is stopped,
+*> the logical DONE is returned as TRUE. The number of factorized
+*> columns which is smaller than NB is returned in KB.
+*>
+*> (3) In case both stopping criteria ABSTOL or RELTOL are not used,
+*> and when the residual matrix is a zero matrix in some factorization
+*> step KB, the factorization of the whole original matrix A_orig is
+*> stopped, the logical DONE is returned as TRUE. The number of
+*> factorized columns which is smaller than NB is returned in KB.
+*>
+*> (4) Whenever NaN is detected in the matrix A or in the array TAU,
+*> the factorization of the whole original matrix A_orig is stopped,
+*> the logical DONE is returned as TRUE. The number of factorized
+*> columns which is smaller than NB is returned in KB. The INFO
+*> parameter is set to the column index of the first NaN occurrence.
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A. N >= 0
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of
+*>          columns of the matrix B. NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] IOFFSET
+*> \verbatim
+*>          IOFFSET is INTEGER
+*>          The number of rows of the matrix A that must be pivoted
+*>          but not factorized. IOFFSET >= 0.
+*>
+*>          IOFFSET also represents the number of columns of the whole
+*>          original matrix A_orig that have been factorized
+*>          in the previous steps.
+*> \endverbatim
+*>
+*> \param[in] NB
+*> \verbatim
+*>          NB is INTEGER
+*>          Factorization block size, i.e the number of columns
+*>          to factorize in the matrix A. 0 <= NB
+*>
+*>          If NB = 0, then the routine exits immediately.
+*>             This means that the factorization is not performed,
+*>             the matrices A and B and the arrays TAU, IPIV
+*>             are not modified.
+*> \endverbatim
+*>
+*> \param[in] ABSTOL
+*> \verbatim
+*>          ABSTOL is DOUBLE PRECISION, cannot be NaN.
+*>
+*>          The absolute tolerance (stopping threshold) for
+*>          maximum column 2-norm of the residual matrix.
+*>          The algorithm converges (stops the factorization) when
+*>          the maximum column 2-norm of the residual matrix
+*>          is less than or equal to ABSTOL.
+*>
+*>          a) If ABSTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on NB and RELTOL.
+*>                This includes the case ABSTOL = -Inf.
+*>
+*>          b) If 0.0 <= ABSTOL then the input value
+*>                of ABSTOL is used.
+*> \endverbatim
+*>
+*> \param[in] RELTOL
+*> \verbatim
+*>          RELTOL is DOUBLE PRECISION, cannot be NaN.
+*>
+*>          The tolerance (stopping threshold) for the ratio of the
+*>          maximum column 2-norm of the residual matrix to the maximum
+*>          column 2-norm of the original matrix A_orig. The algorithm
+*>          converges (stops the factorization), when this ratio is
+*>          less than or equal to RELTOL.
+*>
+*>          a) If RELTOL < 0.0, then this stopping criterion is not
+*>                used, the routine factorizes columns depending
+*>                on NB and ABSTOL.
+*>                This includes the case RELTOL = -Inf.
+*>
+*>          d) If 0.0 <= RELTOL then the input value of RELTOL
+*>                is used.
+*> \endverbatim
+*>
+*> \param[in] KP1
+*> \verbatim
+*>          KP1 is INTEGER
+*>          The index of the column with the maximum 2-norm in
+*>          the whole original matrix A_orig determined in the
+*>          main routine ZGEQP3RK. 1 <= KP1 <= N_orig.
+*> \endverbatim
+*>
+*> \param[in] MAXC2NRM
+*> \verbatim
+*>          MAXC2NRM is DOUBLE PRECISION
+*>          The maximum column 2-norm of the whole original
+*>          matrix A_orig computed in the main routine ZGEQP3RK.
+*>          MAXC2NRM >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N+NRHS)
+*>          On entry:
+*>              the M-by-N matrix A and M-by-NRHS matrix B, as in
+*>
+*>                                  N     NRHS
+*>              array_A   =   M  [ mat_A, mat_B ]
+*>
+*>          On exit:
+*>          1. The elements in block A(IOFFSET+1:M,1:KB) below
+*>             the diagonal together with the array TAU represent
+*>             the unitary matrix Q(KB) as a product of elementary
+*>             reflectors.
+*>          2. The upper triangular block of the matrix A stored
+*>             in A(IOFFSET+1:M,1:KB) is the triangular factor obtained.
+*>          3. The block of the matrix A stored in A(1:IOFFSET,1:N)
+*>             has been accordingly pivoted, but not factorized.
+*>          4. The rest of the array A, block A(IOFFSET+1:M,KB+1:N+NRHS).
+*>             The left part A(IOFFSET+1:M,KB+1:N) of this block
+*>             contains the residual of the matrix A, and,
+*>             if NRHS > 0, the right part of the block
+*>             A(IOFFSET+1:M,N+1:N+NRHS) contains the block of
+*>             the right-hand-side matrix B. Both these blocks have been
+*>             updated by multiplication from the left by Q(KB)**H.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] DONE
+*> \verbatim
+*>          DONE is LOGICAL
+*>          TRUE: a) if the factorization completed before processing
+*>                   all min(M-IOFFSET,NB,N) columns due to ABSTOL
+*>                   or RELTOL criterion,
+*>                b) if the factorization completed before processing
+*>                   all min(M-IOFFSET,NB,N) columns due to the
+*>                   residual matrix being a ZERO matrix.
+*>                c) when NaN was detected in the matrix A
+*>                   or in the array TAU.
+*>          FALSE: otherwise.
+*> \endverbatim
+*>
+*> \param[out] KB
+*> \verbatim
+*>          KB is INTEGER
+*>          Factorization rank of the matrix A, i.e. the rank of
+*>          the factor R, which is the same as the number of non-zero
+*>          rows of the factor R.  0 <= KB <= min(M-IOFFSET,NB,N).
+*>
+*>          KB also represents the number of non-zero Householder
+*>          vectors.
+*> \endverbatim
+*>
+*> \param[out] MAXC2NRMK
+*> \verbatim
+*>          MAXC2NRMK is DOUBLE PRECISION
+*>          The maximum column 2-norm of the residual matrix,
+*>          when the factorization stopped at rank KB. MAXC2NRMK >= 0.
+*> \endverbatim
+*>
+*> \param[out] RELMAXC2NRMK
+*> \verbatim
+*>          RELMAXC2NRMK is DOUBLE PRECISION
+*>          The ratio MAXC2NRMK / MAXC2NRM of the maximum column
+*>          2-norm of the residual matrix (when the factorization
+*>          stopped at rank KB) to the maximum column 2-norm of the
+*>          original matrix A_orig. RELMAXC2NRMK >= 0.
+*> \endverbatim
+*>
+*> \param[out] JPIV
+*> \verbatim
+*>          JPIV is INTEGER array, dimension (N)
+*>          Column pivot indices, for 1 <= j <= N, column j
+*>          of the matrix A was interchanged with column JPIV(j).
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (min(M-IOFFSET,N))
+*>          The scalar factors of the elementary reflectors.
+*> \endverbatim
+*>
+*> \param[in,out] VN1
+*> \verbatim
+*>          VN1 is DOUBLE PRECISION array, dimension (N)
+*>          The vector with the partial column norms.
+*> \endverbatim
+*>
+*> \param[in,out] VN2
+*> \verbatim
+*>          VN2 is DOUBLE PRECISION array, dimension (N)
+*>          The vector with the exact column norms.
+*> \endverbatim
+*>
+*> \param[out] AUXV
+*> \verbatim
+*>          AUXV is COMPLEX*16 array, dimension (NB)
+*>          Auxiliary vector.
+*> \endverbatim
+*>
+*> \param[out] F
+*> \verbatim
+*>          F is COMPLEX*16 array, dimension (LDF,NB)
+*>          Matrix F**H = L*(Y**H)*A.
+*> \endverbatim
+*>
+*> \param[in] LDF
+*> \verbatim
+*>          LDF is INTEGER
+*>          The leading dimension of the array F. LDF >= max(1,N+NRHS).
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (N-1).
+*>          Is a work array. ( IWORK is used to store indices
+*>          of "bad" columns for norm downdating in the residual
+*>          matrix ).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          1) INFO = 0: successful exit.
+*>          2) If INFO = j_1, where 1 <= j_1 <= N, then NaN was
+*>             detected and the routine stops the computation.
+*>             The j_1-th column of the matrix A or the j_1-th
+*>             element of array TAU contains the first occurrence
+*>             of NaN in the factorization step KB+1 ( when KB columns
+*>             have been factorized ).
+*>
+*>             On exit:
+*>             KB                  is set to the number of
+*>                                    factorized columns without
+*>                                    exception.
+*>             MAXC2NRMK           is set to NaN.
+*>             RELMAXC2NRMK        is set to NaN.
+*>             TAU(KB+1:min(M,N))     is not set and contains undefined
+*>                                    elements. If j_1=KB+1, TAU(KB+1)
+*>                                    may contain NaN.
+*>          3) If INFO = j_2, where N+1 <= j_2 <= 2*N, then no NaN
+*>             was detected, but +Inf (or -Inf) was detected and
+*>             the routine continues the computation until completion.
+*>             The (j_2-N)-th column of the matrix A contains the first
+*>             occurrence of +Inf (or -Inf) in the actorization
+*>             step KB+1 ( when KB columns have been factorized ).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup laqp3rk
+*
+*> \par References:
+*  ================
+*> [1] A Level 3 BLAS QR factorization algorithm with column pivoting developed in 1996.
+*> G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain.
+*> X. Sun, Computer Science Dept., Duke University, USA.
+*> C. H. Bischof, Math. and Comp. Sci. Div., Argonne National Lab, USA.
+*> A BLAS-3 version of the QR factorization with column pivoting.
+*> LAPACK Working Note 114
+*> <a href="https://www.netlib.org/lapack/lawnspdf/lawn114.pdf">https://www.netlib.org/lapack/lawnspdf/lawn114.pdf</a>
+*> and in
+*> SIAM J. Sci. Comput., 19(5):1486-1494, Sept. 1998.
+*> <a href="https://doi.org/10.1137/S1064827595296732">https://doi.org/10.1137/S1064827595296732</a>
+*>
+*> [2] A partial column norm updating strategy developed in 2006.
+*> Z. Drmac and Z. Bujanovic, Dept. of Math., University of Zagreb, Croatia.
+*> On the failure of rank revealing QR factorization software – a case study.
+*> LAPACK Working Note 176.
+*> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">http://www.netlib.org/lapack/lawnspdf/lawn176.pdf</a>
+*> and in
+*> ACM Trans. Math. Softw. 35, 2, Article 12 (July 2008), 28 pages.
+*> <a href="https://doi.org/10.1145/1377612.1377616">https://doi.org/10.1145/1377612.1377616</a>
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
+*>
+*>  November  2023, Igor Kozachenko, James Demmel,
+*>                  EECS Department,
+*>                  University of California, Berkeley, USA.
+*>
+*> \endverbatim
+*
+*  =====================================================================
+      SUBROUTINE ZLAQP3RK( M, N, NRHS, IOFFSET, NB, ABSTOL,
+     $                     RELTOL, KP1, MAXC2NRM, A, LDA, DONE, KB,
+     $                     MAXC2NRMK, RELMAXC2NRMK, JPIV, TAU,
+     $                     VN1, VN2, AUXV, F, LDF, IWORK, INFO )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      LOGICAL            DONE
+      INTEGER            INFO, IOFFSET, KB, KP1, LDA, LDF, M, N,
+     $                   NB, NRHS
+      DOUBLE PRECISION   ABSTOL, MAXC2NRM, MAXC2NRMK, RELMAXC2NRMK,
+     $                   RELTOL
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IWORK( * ), JPIV( * )
+      DOUBLE PRECISION   VN1( * ), VN2( * )
+      COMPLEX*16         A( LDA, * ), AUXV( * ), F( LDF, * ), TAU( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+      COMPLEX*16         CZERO, CONE
+      PARAMETER          ( CZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   CONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            ITEMP, J, K, MINMNFACT, MINMNUPDT,
+     $                   LSTICC, KP, I, IF
+      DOUBLE PRECISION   HUGEVAL, TAUNAN, TEMP, TEMP2, TOL3Z
+      COMPLEX*16         AIK
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZGEMM, ZGEMV, ZLARFG, ZSWAP
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DCONJG, DIMAG, MAX, MIN, SQRT
+*     ..
+*     .. External Functions ..
+      LOGICAL            DISNAN
+      INTEGER            IDAMAX
+      DOUBLE PRECISION   DLAMCH, DZNRM2
+      EXTERNAL           DISNAN, DLAMCH, IDAMAX, DZNRM2
+*     ..
+*     .. Executable Statements ..
+*
+*     Initialize INFO
+*
+      INFO = 0
+*
+*     MINMNFACT in the smallest dimension of the submatrix
+*     A(IOFFSET+1:M,1:N) to be factorized.
+*
+      MINMNFACT = MIN( M-IOFFSET, N )
+      MINMNUPDT = MIN( M-IOFFSET, N+NRHS )
+      NB = MIN( NB, MINMNFACT )
+      TOL3Z = SQRT( DLAMCH( 'Epsilon' ) )
+      HUGEVAL = DLAMCH( 'Overflow' )
+*
+*     Compute factorization in a while loop over NB columns,
+*     K is the column index in the block A(1:M,1:N).
+*
+      K = 0
+      LSTICC = 0
+      DONE = .FALSE.
+*
+      DO WHILE ( K.LT.NB .AND. LSTICC.EQ.0 )
+         K = K + 1
+         I = IOFFSET + K
+*
+         IF( I.EQ.1 ) THEN
+*
+*           We are at the first column of the original whole matrix A_orig,
+*           therefore we use the computed KP1 and MAXC2NRM from the
+*           main routine.
+*
+            KP = KP1
+*
+         ELSE
+*
+*           Determine the pivot column in K-th step, i.e. the index
+*           of the column with the maximum 2-norm in the
+*           submatrix A(I:M,K:N).
+*
+            KP = ( K-1 ) + IDAMAX( N-K+1, VN1( K ), 1 )
+*
+*           Determine the maximum column 2-norm and the relative maximum
+*           column 2-norm of the submatrix A(I:M,K:N) in step K.
+*
+            MAXC2NRMK = VN1( KP )
+*
+*           ============================================================
+*
+*           Check if the submatrix A(I:M,K:N) contains NaN, set
+*           INFO parameter to the column number, where the first NaN
+*           is found and return from the routine.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( DISNAN( MAXC2NRMK ) ) THEN
+*
+               DONE = .TRUE.
+*
+*              Set KB, the number of factorized partial columns
+*                      that are non-zero in each step in the block,
+*                      i.e. the rank of the factor R.
+*              Set IF, the number of processed rows in the block, which
+*                      is the same as the number of processed rows in
+*                      the original whole matrix A_orig.
+*
+               KB = K - 1
+               IF = I - 1
+               INFO = KB + KP
+*
+*              Set RELMAXC2NRMK to NaN.
+*
+               RELMAXC2NRMK = MAXC2NRMK
+*
+*              There is no need to apply the block reflector to the
+*              residual of the matrix A stored in A(KB+1:M,KB+1:N),
+*              since the submatrix contains NaN and we stop
+*              the computation.
+*              But, we need to apply the block reflector to the residual
+*              right hand sides stored in A(KB+1:M,N+1:N+NRHS), if the
+*              residual right hand sides exist.  This occurs
+*              when ( NRHS != 0 AND KB <= (M-IOFFSET) ):
+*
+*              A(I+1:M,N+1:N+NRHS) := A(I+1:M,N+1:N+NRHS) -
+*                               A(I+1:M,1:KB) * F(N+1:N+NRHS,1:KB)**H.
+
+               IF( NRHS.GT.0 .AND. KB.LT.(M-IOFFSET) ) THEN
+                  CALL ZGEMM( 'No transpose', 'Conjugate transpose',
+     $                  M-IF, NRHS, KB, -CONE, A( IF+1, 1 ), LDA,
+     $                  F( N+1, 1 ), LDF, CONE, A( IF+1, N+1 ), LDA )
+               END IF
+*
+*              There is no need to recompute the 2-norm of the
+*              difficult columns, since we stop the factorization.
+*
+*              Array TAU(KF+1:MINMNFACT) is not set and contains
+*              undefined elements.
+*
+*              Return from the routine.
+*
+               RETURN
+            END IF
+*
+*           Quick return, if the submatrix A(I:M,K:N) is
+*           a zero matrix. We need to check it only if the column index
+*           (same as row index) is larger than 1, since the condition
+*           for the whole original matrix A_orig is checked in the main
+*           routine.
+*
+            IF( MAXC2NRMK.EQ.ZERO ) THEN
+*
+               DONE = .TRUE.
+*
+*              Set KB, the number of factorized partial columns
+*                      that are non-zero in each step in the block,
+*                      i.e. the rank of the factor R.
+*              Set IF, the number of processed rows in the block, which
+*                      is the same as the number of processed rows in
+*                      the original whole matrix A_orig.
+*
+               KB = K - 1
+               IF = I - 1
+               RELMAXC2NRMK = ZERO
+*
+*              There is no need to apply the block reflector to the
+*              residual of the matrix A stored in A(KB+1:M,KB+1:N),
+*              since the submatrix is zero and we stop the computation.
+*              But, we need to apply the block reflector to the residual
+*              right hand sides stored in A(KB+1:M,N+1:N+NRHS), if the
+*              residual right hand sides exist.  This occurs
+*              when ( NRHS != 0 AND KB <= (M-IOFFSET) ):
+*
+*              A(I+1:M,N+1:N+NRHS) := A(I+1:M,N+1:N+NRHS) -
+*                               A(I+1:M,1:KB) * F(N+1:N+NRHS,1:KB)**H.
+*
+               IF( NRHS.GT.0 .AND. KB.LT.(M-IOFFSET) ) THEN
+                  CALL ZGEMM( 'No transpose', 'Conjugate transpose',
+     $                  M-IF, NRHS, KB, -CONE, A( IF+1, 1 ), LDA,
+     $                  F( N+1, 1 ), LDF, CONE, A( IF+1, N+1 ), LDA )
+               END IF
+*
+*              There is no need to recompute the 2-norm of the
+*              difficult columns, since we stop the factorization.
+*
+*              Set TAUs corresponding to the columns that were not
+*              factorized to ZERO, i.e. set TAU(KB+1:MINMNFACT) = CZERO,
+*              which is equivalent to seting TAU(K:MINMNFACT) = CZERO.
+*
+               DO J = K, MINMNFACT
+                  TAU( J ) = CZERO
+               END DO
+*
+*              Return from the routine.
+*
+               RETURN
+*
+            END IF
+*
+*           ============================================================
+*
+*           Check if the submatrix A(I:M,K:N) contains Inf,
+*           set INFO parameter to the column number, where
+*           the first Inf is found plus N, and continue
+*           the computation.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            IF( INFO.EQ.0 .AND. MAXC2NRMK.GT.HUGEVAL ) THEN
+               INFO = N + K - 1 + KP
+            END IF
+*
+*           ============================================================
+*
+*           Test for the second and third tolerance stopping criteria.
+*           NOTE: There is no need to test for ABSTOL.GE.ZERO, since
+*           MAXC2NRMK is non-negative. Similarly, there is no need
+*           to test for RELTOL.GE.ZERO, since RELMAXC2NRMK is
+*           non-negative.
+*           We need to check the condition only if the
+*           column index (same as row index) of the original whole
+*           matrix is larger than 1, since the condition for whole
+*           original matrix is checked in the main routine.
+*
+            RELMAXC2NRMK =  MAXC2NRMK / MAXC2NRM
+*
+            IF( MAXC2NRMK.LE.ABSTOL .OR. RELMAXC2NRMK.LE.RELTOL ) THEN
+*
+               DONE = .TRUE.
+*
+*              Set KB, the number of factorized partial columns
+*                      that are non-zero in each step in the block,
+*                      i.e. the rank of the factor R.
+*              Set IF, the number of processed rows in the block, which
+*                      is the same as the number of processed rows in
+*                      the original whole matrix A_orig;
+*
+                  KB = K - 1
+                  IF = I - 1
+*
+*              Apply the block reflector to the residual of the
+*              matrix A and the residual of the right hand sides B, if
+*              the residual matrix and and/or the residual of the right
+*              hand sides exist,  i.e. if the submatrix
+*              A(I+1:M,KB+1:N+NRHS) exists.  This occurs when
+*                 KB < MINMNUPDT = min( M-IOFFSET, N+NRHS ):
+*
+*              A(IF+1:M,K+1:N+NRHS) := A(IF+1:M,KB+1:N+NRHS) -
+*                             A(IF+1:M,1:KB) * F(KB+1:N+NRHS,1:KB)**H.
+*
+               IF( KB.LT.MINMNUPDT ) THEN
+                  CALL ZGEMM( 'No transpose', 'Conjugate transpose',
+     $                  M-IF, N+NRHS-KB, KB,-CONE, A( IF+1, 1 ), LDA,
+     $                  F( KB+1, 1 ), LDF, CONE, A( IF+1, KB+1 ), LDA )
+               END IF
+*
+*              There is no need to recompute the 2-norm of the
+*              difficult columns, since we stop the factorization.
+*
+*              Set TAUs corresponding to the columns that were not
+*              factorized to ZERO, i.e. set TAU(KB+1:MINMNFACT) = CZERO,
+*              which is equivalent to seting TAU(K:MINMNFACT) = CZERO.
+*
+               DO J = K, MINMNFACT
+                  TAU( J ) = CZERO
+               END DO
+*
+*              Return from the routine.
+*
+               RETURN
+*
+            END IF
+*
+*           ============================================================
+*
+*           End ELSE of IF(I.EQ.1)
+*
+         END IF
+*
+*        ===============================================================
+*
+*        If the pivot column is not the first column of the
+*        subblock A(1:M,K:N):
+*        1) swap the K-th column and the KP-th pivot column
+*           in A(1:M,1:N);
+*        2) swap the K-th row and the KP-th row in F(1:N,1:K-1)
+*        3) copy the K-th element into the KP-th element of the partial
+*           and exact 2-norm vectors VN1 and VN2. (Swap is not needed
+*           for VN1 and VN2 since we use the element with the index
+*           larger than K in the next loop step.)
+*        4) Save the pivot interchange with the indices relative to the
+*           the original matrix A_orig, not the block A(1:M,1:N).
+*
+         IF( KP.NE.K ) THEN
+            CALL ZSWAP( M, A( 1, KP ), 1, A( 1, K ), 1 )
+            CALL ZSWAP( K-1, F( KP, 1 ), LDF, F( K, 1 ), LDF )
+            VN1( KP ) = VN1( K )
+            VN2( KP ) = VN2( K )
+            ITEMP = JPIV( KP )
+            JPIV( KP ) = JPIV( K )
+            JPIV( K ) = ITEMP
+         END IF
+*
+*        Apply previous Householder reflectors to column K:
+*        A(I:M,K) := A(I:M,K) - A(I:M,1:K-1)*F(K,1:K-1)**H.
+*
+         IF( K.GT.1 ) THEN
+            DO J = 1, K - 1
+               F( K, J ) = DCONJG( F( K, J ) )
+            END DO
+            CALL ZGEMV( 'No transpose', M-I+1, K-1, -CONE, A( I, 1 ),
+     $                  LDA, F( K, 1 ), LDF, CONE, A( I, K ), 1 )
+            DO J = 1, K - 1
+               F( K, J ) = DCONJG( F( K, J ) )
+            END DO
+         END IF
+*
+*        Generate elementary reflector H(k) using the column A(I:M,K).
+*
+         IF( I.LT.M ) THEN
+            CALL ZLARFG( M-I+1, A( I, K ), A( I+1, K ), 1, TAU( K ) )
+         ELSE
+            TAU( K ) = CZERO
+         END IF
+*
+*        Check if TAU(K) contains NaN, set INFO parameter
+*        to the column number where NaN is found and return from
+*        the routine.
+*        NOTE: There is no need to check TAU(K) for Inf,
+*        since ZLARFG cannot produce TAU(KK) or Householder vector
+*        below the diagonal containing Inf. Only BETA on the diagonal,
+*        returned by ZLARFG can contain Inf, which requires
+*        TAU(K) to contain NaN. Therefore, this case of generating Inf
+*        by ZLARFG is covered by checking TAU(K) for NaN.
+*
+         IF( DISNAN( DBLE( TAU(K) ) ) ) THEN
+            TAUNAN = DBLE( TAU(K) )
+         ELSE IF( DISNAN( DIMAG( TAU(K) ) ) ) THEN
+            TAUNAN = DIMAG( TAU(K) )
+         ELSE
+            TAUNAN = ZERO
+         END IF
+*
+         IF( DISNAN( TAUNAN ) ) THEN
+*
+            DONE = .TRUE.
+*
+*           Set KB, the number of factorized partial columns
+*                   that are non-zero in each step in the block,
+*                   i.e. the rank of the factor R.
+*           Set IF, the number of processed rows in the block, which
+*                   is the same as the number of processed rows in
+*                   the original whole matrix A_orig.
+*
+            KB = K - 1
+            IF = I - 1
+            INFO = K
+*
+*           Set MAXC2NRMK and  RELMAXC2NRMK to NaN.
+*
+            MAXC2NRMK = TAUNAN
+            RELMAXC2NRMK = TAUNAN
+*
+*           There is no need to apply the block reflector to the
+*           residual of the matrix A stored in A(KB+1:M,KB+1:N),
+*           since the submatrix contains NaN and we stop
+*           the computation.
+*           But, we need to apply the block reflector to the residual
+*           right hand sides stored in A(KB+1:M,N+1:N+NRHS), if the
+*           residual right hand sides exist.  This occurs
+*           when ( NRHS != 0 AND KB <= (M-IOFFSET) ):
+*
+*           A(I+1:M,N+1:N+NRHS) := A(I+1:M,N+1:N+NRHS) -
+*                            A(I+1:M,1:KB) * F(N+1:N+NRHS,1:KB)**H.
+*
+            IF( NRHS.GT.0 .AND. KB.LT.(M-IOFFSET) ) THEN
+               CALL ZGEMM( 'No transpose', 'Conjugate transpose',
+     $               M-IF, NRHS, KB, -CONE, A( IF+1, 1 ), LDA,
+     $               F( N+1, 1 ), LDF, CONE, A( IF+1, N+1 ), LDA )
+            END IF
+*
+*           There is no need to recompute the 2-norm of the
+*           difficult columns, since we stop the factorization.
+*
+*           Array TAU(KF+1:MINMNFACT) is not set and contains
+*           undefined elements.
+*
+*           Return from the routine.
+*
+            RETURN
+         END IF
+*
+*        ===============================================================
+*
+         AIK = A( I, K )
+         A( I, K ) = CONE
+*
+*        ===============================================================
+*
+*        Compute the current K-th column of F:
+*          1) F(K+1:N,K) := tau(K) * A(I:M,K+1:N)**H * A(I:M,K).
+*
+         IF( K.LT.N+NRHS ) THEN
+            CALL ZGEMV( 'Conjugate transpose', M-I+1, N+NRHS-K,
+     $                  TAU( K ), A( I, K+1 ), LDA, A( I, K ), 1,
+     $                  CZERO, F( K+1, K ), 1 )
+         END IF
+*
+*           2) Zero out elements above and on the diagonal of the
+*              column K in matrix F, i.e elements F(1:K,K).
+*
+         DO J = 1, K
+            F( J, K ) = CZERO
+         END DO
+*
+*         3) Incremental updating of the K-th column of F:
+*        F(1:N,K) := F(1:N,K) - tau(K) * F(1:N,1:K-1) * A(I:M,1:K-1)**H
+*                    * A(I:M,K).
+*
+         IF( K.GT.1 ) THEN
+            CALL ZGEMV( 'Conjugate Transpose', M-I+1, K-1, -TAU( K ),
+     $                   A( I, 1 ), LDA, A( I, K ), 1, CZERO,
+     $                   AUXV( 1 ), 1 )
+*
+            CALL ZGEMV( 'No transpose', N+NRHS, K-1, CONE,
+     $                  F( 1, 1 ), LDF, AUXV( 1 ), 1, CONE,
+     $                  F( 1, K ), 1 )
+         END IF
+*
+*        ===============================================================
+*
+*        Update the current I-th row of A:
+*        A(I,K+1:N+NRHS) := A(I,K+1:N+NRHS)
+*                         - A(I,1:K)*F(K+1:N+NRHS,1:K)**H.
+*
+         IF( K.LT.N+NRHS ) THEN
+            CALL ZGEMM( 'No transpose', 'Conjugate transpose',
+     $            1, N+NRHS-K, K, -CONE, A( I, 1 ), LDA,
+     $            F( K+1, 1 ), LDF, CONE, A( I, K+1 ), LDA )
+         END IF
+*
+         A( I, K ) = AIK
+*
+*        Update the partial column 2-norms for the residual matrix,
+*        only if the residual matrix A(I+1:M,K+1:N) exists, i.e.
+*        when K < MINMNFACT = min( M-IOFFSET, N ).
+*
+         IF( K.LT.MINMNFACT ) THEN
+*
+            DO J = K + 1, N
+               IF( VN1( J ).NE.ZERO ) THEN
+*
+*                 NOTE: The following lines follow from the analysis in
+*                 Lapack Working Note 176.
+*
+                  TEMP = ABS( A( I, J ) ) / VN1( J )
+                  TEMP = MAX( ZERO, ( ONE+TEMP )*( ONE-TEMP ) )
+                  TEMP2 = TEMP*( VN1( J ) / VN2( J ) )**2
+                  IF( TEMP2.LE.TOL3Z ) THEN
+*
+*                    At J-index, we have a difficult column for the
+*                    update of the 2-norm. Save the index of the previous
+*                    difficult column in IWORK(J-1).
+*                    NOTE: ILSTCC > 1, threfore we can use IWORK only
+*                    with N-1 elements, where the elements are
+*                    shifted by 1 to the left.
+*
+                     IWORK( J-1 ) = LSTICC
+*
+*                    Set the index of the last difficult column LSTICC.
+*
+                     LSTICC = J
+*
+                  ELSE
+                     VN1( J ) = VN1( J )*SQRT( TEMP )
+                  END IF
+               END IF
+            END DO
+*
+         END IF
+*
+*        End of while loop.
+*
+      END DO
+*
+*     Now, afler the loop:
+*        Set KB, the number of factorized columns in the block;
+*        Set IF, the number of processed rows in the block, which
+*                is the same as the number of processed rows in
+*                the original whole matrix A_orig, IF = IOFFSET + KB.
+*
+      KB = K
+      IF = I
+*
+*     Apply the block reflector to the residual of the matrix A
+*     and the residual of the right hand sides B, if the residual
+*     matrix and and/or the residual of the right hand sides
+*     exist,  i.e. if the submatrix A(I+1:M,KB+1:N+NRHS) exists.
+*     This occurs when KB < MINMNUPDT = min( M-IOFFSET, N+NRHS ):
+*
+*     A(IF+1:M,K+1:N+NRHS) := A(IF+1:M,KB+1:N+NRHS) -
+*                         A(IF+1:M,1:KB) * F(KB+1:N+NRHS,1:KB)**H.
+*
+      IF( KB.LT.MINMNUPDT ) THEN
+         CALL ZGEMM( 'No transpose', 'Conjugate transpose',
+     $         M-IF, N+NRHS-KB, KB, -CONE, A( IF+1, 1 ), LDA,
+     $         F( KB+1, 1 ), LDF, CONE, A( IF+1, KB+1 ), LDA )
+      END IF
+*
+*     Recompute the 2-norm of the difficult columns.
+*     Loop over the index of the difficult columns from the largest
+*     to the smallest index.
+*
+      DO WHILE( LSTICC.GT.0 )
+*
+*        LSTICC is the index of the last difficult column is greater
+*        than 1.
+*        ITEMP is the index of the previous difficult column.
+*
+         ITEMP = IWORK( LSTICC-1 )
+*
+*        Compute the 2-norm explicilty for the last difficult column and
+*        save it in the partial and exact 2-norm vectors VN1 and VN2.
+*
+*        NOTE: The computation of VN1( LSTICC ) relies on the fact that
+*        DZNRM2 does not fail on vectors with norm below the value of
+*        SQRT(DLAMCH('S'))
+*
+         VN1( LSTICC ) = DZNRM2( M-IF, A( IF+1, LSTICC ), 1 )
+         VN2( LSTICC ) = VN1( LSTICC )
+*
+*        Downdate the index of the last difficult column to
+*        the index of the previous difficult column.
+*
+         LSTICC = ITEMP
+*
+      END DO
+*
+      RETURN
+*
+*     End of ZLAQP3RK
+*
+      END
diff --git a/SRC/zlaqps.f b/SRC/zlaqps.f
index c2387dba8c..4383774e43 100644
--- a/SRC/zlaqps.f
+++ b/SRC/zlaqps.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQPS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqps.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqps.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -150,7 +148,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup laqps
 *
 *> \par Contributors:
 *  ==================
@@ -167,13 +165,13 @@
 *>
 *> LAPACK Working Note 176
 *
-*> \htmlonly
 *> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">[PDF]</a>
-*> \endhtmlonly
 *
 *  =====================================================================
-      SUBROUTINE ZLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
+      SUBROUTINE ZLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU,
+     $                   VN1,
      $                   VN2, AUXV, F, LDF )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -247,7 +245,8 @@ SUBROUTINE ZLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
             DO 20 J = 1, K - 1
                F( K, J ) = DCONJG( F( K, J ) )
    20       CONTINUE
-            CALL ZGEMV( 'No transpose', M-RK+1, K-1, -CONE, A( RK, 1 ),
+            CALL ZGEMV( 'No transpose', M-RK+1, K-1, -CONE, A( RK,
+     $                  1 ),
      $                  LDA, F( K, 1 ), LDF, CONE, A( RK, K ), 1 )
             DO 30 J = 1, K - 1
                F( K, J ) = DCONJG( F( K, J ) )
@@ -257,7 +256,8 @@ SUBROUTINE ZLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
 *        Generate elementary reflector H(k).
 *
          IF( RK.LT.M ) THEN
-            CALL ZLARFG( M-RK+1, A( RK, K ), A( RK+1, K ), 1, TAU( K ) )
+            CALL ZLARFG( M-RK+1, A( RK, K ), A( RK+1, K ), 1,
+     $                   TAU( K ) )
          ELSE
             CALL ZLARFG( 1, A( RK, K ), A( RK, K ), 1, TAU( K ) )
          END IF
@@ -286,7 +286,8 @@ SUBROUTINE ZLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
 *                    *A(RK:M,K).
 *
          IF( K.GT.1 ) THEN
-            CALL ZGEMV( 'Conjugate transpose', M-RK+1, K-1, -TAU( K ),
+            CALL ZGEMV( 'Conjugate transpose', M-RK+1, K-1,
+     $                  -TAU( K ),
      $                  A( RK, 1 ), LDA, A( RK, K ), 1, CZERO,
      $                  AUXV( 1 ), 1 )
 *
@@ -298,7 +299,8 @@ SUBROUTINE ZLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
 *        A(RK,K+1:N) := A(RK,K+1:N) - A(RK,1:K)*F(K+1:N,1:K)**H.
 *
          IF( K.LT.N ) THEN
-            CALL ZGEMM( 'No transpose', 'Conjugate transpose', 1, N-K,
+            CALL ZGEMM( 'No transpose', 'Conjugate transpose', 1,
+     $                  N-K,
      $                  K, -CONE, A( RK, 1 ), LDA, F( K+1, 1 ), LDF,
      $                  CONE, A( RK, K+1 ), LDA )
          END IF
@@ -339,7 +341,8 @@ SUBROUTINE ZLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
 *                         A(OFFSET+KB+1:M,1:KB)*F(KB+1:N,1:KB)**H.
 *
       IF( KB.LT.MIN( N, M-OFFSET ) ) THEN
-         CALL ZGEMM( 'No transpose', 'Conjugate transpose', M-RK, N-KB,
+         CALL ZGEMM( 'No transpose', 'Conjugate transpose', M-RK,
+     $               N-KB,
      $               KB, -CONE, A( RK+1, 1 ), LDA, F( KB+1, 1 ), LDF,
      $               CONE, A( RK+1, KB+1 ), LDA )
       END IF
diff --git a/SRC/zlaqr0.f b/SRC/zlaqr0.f
index 27ad09f5af..ff45efdb0d 100644
--- a/SRC/zlaqr0.f
+++ b/SRC/zlaqr0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQR0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -215,7 +213,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup laqr0
 *
 *> \par Contributors:
 *  ==================
@@ -238,6 +236,7 @@
 *  =====================================================================
       SUBROUTINE ZLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
      $                   IHIZ, Z, LDZ, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -301,7 +300,8 @@ SUBROUTINE ZLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
       COMPLEX*16         ZDUM( 1, 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZLACPY, ZLAHQR, ZLAQR3, ZLAQR4, ZLAQR5
+      EXTERNAL           ZLACPY, ZLAHQR, ZLAQR3, ZLAQR4,
+     $                   ZLAQR5
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCMPLX, DIMAG, INT, MAX, MIN, MOD,
@@ -511,7 +511,8 @@ SUBROUTINE ZLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
 *
 *           ==== Aggressive early deflation ====
 *
-            CALL ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+            CALL ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH,
+     $                   ILOZ,
      $                   IHIZ, Z, LDZ, LS, LD, W, H( KV, 1 ), LDH, NHO,
      $                   H( KV, KT ), LDH, NVE, H( KWV, 1 ), LDH, WORK,
      $                   LWORK )
diff --git a/SRC/zlaqr1.f b/SRC/zlaqr1.f
index fdcb377680..0f5ce558ca 100644
--- a/SRC/zlaqr1.f
+++ b/SRC/zlaqr1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQR1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -94,7 +92,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup laqr1
 *
 *> \par Contributors:
 *  ==================
@@ -104,6 +102,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZLAQR1( N, H, LDH, S1, S2, V )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlaqr2.f b/SRC/zlaqr2.f
index f78ea206dd..5cab69b91c 100644
--- a/SRC/zlaqr2.f
+++ b/SRC/zlaqr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -255,7 +253,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup laqr2
 *
 *> \par Contributors:
 *  ==================
@@ -264,9 +262,11 @@
 *>       University of Kansas, USA
 *>
 *  =====================================================================
-      SUBROUTINE ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+      SUBROUTINE ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH,
+     $                   ILOZ,
      $                   IHIZ, Z, LDZ, NS, ND, SH, V, LDV, NH, T, LDT,
      $                   NV, WV, LDWV, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -292,7 +292,7 @@ SUBROUTINE ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
       PARAMETER          ( RZERO = 0.0d0, RONE = 1.0d0 )
 *     ..
 *     .. Local Scalars ..
-      COMPLEX*16         BETA, CDUM, S, TAU
+      COMPLEX*16         CDUM, S, TAU
       DOUBLE PRECISION   FOO, SAFMAX, SAFMIN, SMLNUM, ULP
       INTEGER            I, IFST, ILST, INFO, INFQR, J, JW, KCOL, KLN,
      $                   KNT, KROW, KWTOP, LTOP, LWK1, LWK2, LWKOPT
@@ -302,8 +302,9 @@ SUBROUTINE ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
       EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, ZCOPY, ZGEHRD, ZGEMM, ZLACPY, ZLAHQR,
-     $                   ZLARF, ZLARFG, ZLASET, ZTREXC, ZUNMHR
+      EXTERNAL           ZCOPY, ZGEHRD, ZGEMM, ZLACPY,
+     $                   ZLAHQR,
+     $                   ZLARF1F, ZLARFG, ZLASET, ZTREXC, ZUNMHR
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, INT, MAX, MIN
@@ -330,7 +331,8 @@ SUBROUTINE ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
 *        ==== Workspace query call to ZUNMHR ====
 *
-         CALL ZUNMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V, LDV,
+         CALL ZUNMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V,
+     $                LDV,
      $                WORK, -1, INFO )
          LWK2 = INT( WORK( 1 ) )
 *
@@ -361,7 +363,6 @@ SUBROUTINE ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
       SAFMIN = DLAMCH( 'SAFE MINIMUM' )
       SAFMAX = RONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULP = DLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( DBLE( N ) / ULP )
 *
@@ -400,7 +401,8 @@ SUBROUTINE ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *     .    here and there to keep track.) ====
 *
       CALL ZLACPY( 'U', JW, JW, H( KWTOP, KWTOP ), LDH, T, LDT )
-      CALL ZCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ), LDT+1 )
+      CALL ZCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ),
+     $            LDT+1 )
 *
       CALL ZLASET( 'A', JW, JW, ZERO, ONE, V, LDV )
       CALL ZLAHQR( .true., .true., JW, 1, JW, T, LDT, SH( KWTOP ), 1,
@@ -452,7 +454,8 @@ SUBROUTINE ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
    20       CONTINUE
             ILST = I
             IF( IFST.NE.ILST )
-     $         CALL ZTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, INFO )
+     $         CALL ZTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST,
+     $                      INFO )
    30    CONTINUE
       END IF
 *
@@ -472,18 +475,17 @@ SUBROUTINE ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
             DO 50 I = 1, NS
                WORK( I ) = DCONJG( WORK( I ) )
    50       CONTINUE
-            BETA = WORK( 1 )
-            CALL ZLARFG( NS, BETA, WORK( 2 ), 1, TAU )
-            WORK( 1 ) = ONE
+            CALL ZLARFG( NS, WORK( 1 ), WORK( 2 ), 1, TAU )
 *
-            CALL ZLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ), LDT )
+            CALL ZLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ),
+     $                   LDT )
 *
-            CALL ZLARF( 'L', NS, JW, WORK, 1, DCONJG( TAU ), T, LDT,
-     $                  WORK( JW+1 ) )
-            CALL ZLARF( 'R', NS, NS, WORK, 1, TAU, T, LDT,
-     $                  WORK( JW+1 ) )
-            CALL ZLARF( 'R', JW, NS, WORK, 1, TAU, V, LDV,
-     $                  WORK( JW+1 ) )
+            CALL ZLARF1F( 'L', NS, JW, WORK, 1, CONJG( TAU ), T, LDT,
+     $                    WORK( JW+1 ) )
+            CALL ZLARF1F( 'R', NS, NS, WORK, 1, TAU, T, LDT,
+     $                    WORK( JW+1 ) )
+            CALL ZLARF1F( 'R', JW, NS, WORK, 1, TAU, V, LDV,
+     $                    WORK( JW+1 ) )
 *
             CALL ZGEHRD( JW, 1, NS, T, LDT, WORK, WORK( JW+1 ),
      $                   LWORK-JW, INFO )
@@ -501,7 +503,8 @@ SUBROUTINE ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *        .    H and Z, if requested.  ====
 *
          IF( NS.GT.1 .AND. S.NE.ZERO )
-     $      CALL ZUNMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V, LDV,
+     $      CALL ZUNMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V,
+     $                   LDV,
      $                   WORK( JW+1 ), LWORK-JW, INFO )
 *
 *        ==== Update vertical slab in H ====
@@ -515,7 +518,8 @@ SUBROUTINE ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
             KLN = MIN( NV, KWTOP-KROW )
             CALL ZGEMM( 'N', 'N', KLN, JW, JW, ONE, H( KROW, KWTOP ),
      $                  LDH, V, LDV, ZERO, WV, LDWV )
-            CALL ZLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ), LDH )
+            CALL ZLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ),
+     $                   LDH )
    60    CONTINUE
 *
 *        ==== Update horizontal slab in H ====
@@ -535,7 +539,8 @@ SUBROUTINE ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
          IF( WANTZ ) THEN
             DO 80 KROW = ILOZ, IHIZ, NV
                KLN = MIN( NV, IHIZ-KROW+1 )
-               CALL ZGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW, KWTOP ),
+               CALL ZGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW,
+     $                     KWTOP ),
      $                     LDZ, V, LDV, ZERO, WV, LDWV )
                CALL ZLACPY( 'A', KLN, JW, WV, LDWV, Z( KROW, KWTOP ),
      $                      LDZ )
diff --git a/SRC/zlaqr3.f b/SRC/zlaqr3.f
index c8e5fe9996..9a696fe115 100644
--- a/SRC/zlaqr3.f
+++ b/SRC/zlaqr3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQR3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -252,7 +250,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup laqr3
 *
 *> \par Contributors:
 *  ==================
@@ -261,9 +259,11 @@
 *>       University of Kansas, USA
 *>
 *  =====================================================================
-      SUBROUTINE ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+      SUBROUTINE ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH,
+     $                   ILOZ,
      $                   IHIZ, Z, LDZ, NS, ND, SH, V, LDV, NH, T, LDT,
      $                   NV, WV, LDWV, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -289,7 +289,7 @@ SUBROUTINE ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
       PARAMETER          ( RZERO = 0.0d0, RONE = 1.0d0 )
 *     ..
 *     .. Local Scalars ..
-      COMPLEX*16         BETA, CDUM, S, TAU
+      COMPLEX*16         CDUM, S, TAU
       DOUBLE PRECISION   FOO, SAFMAX, SAFMIN, SMLNUM, ULP
       INTEGER            I, IFST, ILST, INFO, INFQR, J, JW, KCOL, KLN,
      $                   KNT, KROW, KWTOP, LTOP, LWK1, LWK2, LWK3,
@@ -301,8 +301,9 @@ SUBROUTINE ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
       EXTERNAL           DLAMCH, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, ZCOPY, ZGEHRD, ZGEMM, ZLACPY, ZLAHQR,
-     $                   ZLAQR4, ZLARF, ZLARFG, ZLASET, ZTREXC, ZUNMHR
+      EXTERNAL           ZCOPY, ZGEHRD, ZGEMM, ZLACPY, ZLAHQR,
+     $                   ZLAQR4,
+     $                   ZLARF1F, ZLARFG, ZLASET, ZTREXC, ZUNMHR
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, INT, MAX, MIN
@@ -329,13 +330,15 @@ SUBROUTINE ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
 *        ==== Workspace query call to ZUNMHR ====
 *
-         CALL ZUNMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V, LDV,
+         CALL ZUNMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V,
+     $                LDV,
      $                WORK, -1, INFO )
          LWK2 = INT( WORK( 1 ) )
 *
 *        ==== Workspace query call to ZLAQR4 ====
 *
-         CALL ZLAQR4( .true., .true., JW, 1, JW, T, LDT, SH, 1, JW, V,
+         CALL ZLAQR4( .true., .true., JW, 1, JW, T, LDT, SH, 1, JW,
+     $                V,
      $                LDV, WORK, -1, INFQR )
          LWK3 = INT( WORK( 1 ) )
 *
@@ -366,7 +369,6 @@ SUBROUTINE ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *
       SAFMIN = DLAMCH( 'SAFE MINIMUM' )
       SAFMAX = RONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULP = DLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( DBLE( N ) / ULP )
 *
@@ -405,15 +407,18 @@ SUBROUTINE ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *     .    here and there to keep track.) ====
 *
       CALL ZLACPY( 'U', JW, JW, H( KWTOP, KWTOP ), LDH, T, LDT )
-      CALL ZCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ), LDT+1 )
+      CALL ZCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ),
+     $            LDT+1 )
 *
       CALL ZLASET( 'A', JW, JW, ZERO, ONE, V, LDV )
       NMIN = ILAENV( 12, 'ZLAQR3', 'SV', JW, 1, JW, LWORK )
       IF( JW.GT.NMIN ) THEN
-         CALL ZLAQR4( .true., .true., JW, 1, JW, T, LDT, SH( KWTOP ), 1,
+         CALL ZLAQR4( .true., .true., JW, 1, JW, T, LDT, SH( KWTOP ),
+     $                1,
      $                JW, V, LDV, WORK, LWORK, INFQR )
       ELSE
-         CALL ZLAHQR( .true., .true., JW, 1, JW, T, LDT, SH( KWTOP ), 1,
+         CALL ZLAHQR( .true., .true., JW, 1, JW, T, LDT, SH( KWTOP ),
+     $                1,
      $                JW, V, LDV, INFQR )
       END IF
 *
@@ -463,7 +468,8 @@ SUBROUTINE ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
    20       CONTINUE
             ILST = I
             IF( IFST.NE.ILST )
-     $         CALL ZTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, INFO )
+     $         CALL ZTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST,
+     $                      INFO )
    30    CONTINUE
       END IF
 *
@@ -483,18 +489,17 @@ SUBROUTINE ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
             DO 50 I = 1, NS
                WORK( I ) = DCONJG( WORK( I ) )
    50       CONTINUE
-            BETA = WORK( 1 )
-            CALL ZLARFG( NS, BETA, WORK( 2 ), 1, TAU )
-            WORK( 1 ) = ONE
+            CALL ZLARFG( NS, WORK( 1 ), WORK( 2 ), 1, TAU )
 *
-            CALL ZLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ), LDT )
+            CALL ZLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ),
+     $                   LDT )
 *
-            CALL ZLARF( 'L', NS, JW, WORK, 1, DCONJG( TAU ), T, LDT,
-     $                  WORK( JW+1 ) )
-            CALL ZLARF( 'R', NS, NS, WORK, 1, TAU, T, LDT,
-     $                  WORK( JW+1 ) )
-            CALL ZLARF( 'R', JW, NS, WORK, 1, TAU, V, LDV,
-     $                  WORK( JW+1 ) )
+            CALL ZLARF1F( 'L', NS, JW, WORK, 1, CONJG( TAU ), T, LDT,
+     $                    WORK( JW+1 ) )
+            CALL ZLARF1F( 'R', NS, NS, WORK, 1, TAU, T, LDT,
+     $                    WORK( JW+1 ) )
+            CALL ZLARF1F( 'R', JW, NS, WORK, 1, TAU, V, LDV,
+     $                    WORK( JW+1 ) )
 *
             CALL ZGEHRD( JW, 1, NS, T, LDT, WORK, WORK( JW+1 ),
      $                   LWORK-JW, INFO )
@@ -512,7 +517,8 @@ SUBROUTINE ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
 *        .    H and Z, if requested.  ====
 *
          IF( NS.GT.1 .AND. S.NE.ZERO )
-     $      CALL ZUNMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V, LDV,
+     $      CALL ZUNMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V,
+     $                   LDV,
      $                   WORK( JW+1 ), LWORK-JW, INFO )
 *
 *        ==== Update vertical slab in H ====
@@ -526,7 +532,8 @@ SUBROUTINE ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
             KLN = MIN( NV, KWTOP-KROW )
             CALL ZGEMM( 'N', 'N', KLN, JW, JW, ONE, H( KROW, KWTOP ),
      $                  LDH, V, LDV, ZERO, WV, LDWV )
-            CALL ZLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ), LDH )
+            CALL ZLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ),
+     $                   LDH )
    60    CONTINUE
 *
 *        ==== Update horizontal slab in H ====
@@ -546,7 +553,8 @@ SUBROUTINE ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
          IF( WANTZ ) THEN
             DO 80 KROW = ILOZ, IHIZ, NV
                KLN = MIN( NV, IHIZ-KROW+1 )
-               CALL ZGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW, KWTOP ),
+               CALL ZGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW,
+     $                     KWTOP ),
      $                     LDZ, V, LDV, ZERO, WV, LDWV )
                CALL ZLACPY( 'A', KLN, JW, WV, LDWV, Z( KROW, KWTOP ),
      $                      LDZ )
diff --git a/SRC/zlaqr4.f b/SRC/zlaqr4.f
index ee2ab611cd..505f792a56 100644
--- a/SRC/zlaqr4.f
+++ b/SRC/zlaqr4.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQR4 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr4.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr4.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -221,7 +219,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup laqr4
 *
 *> \par Contributors:
 *  ==================
@@ -244,6 +242,7 @@
 *  =====================================================================
       SUBROUTINE ZLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
      $                   IHIZ, Z, LDZ, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -517,7 +516,8 @@ SUBROUTINE ZLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
 *
 *           ==== Aggressive early deflation ====
 *
-            CALL ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+            CALL ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH,
+     $                   ILOZ,
      $                   IHIZ, Z, LDZ, LS, LD, W, H( KV, 1 ), LDH, NHO,
      $                   H( KV, KT ), LDH, NVE, H( KWV, 1 ), LDH, WORK,
      $                   LWORK )
diff --git a/SRC/zlaqr5.f b/SRC/zlaqr5.f
index 3185508bc0..54da1d4e98 100644
--- a/SRC/zlaqr5.f
+++ b/SRC/zlaqr5.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQR5 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr5.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr5.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -225,7 +223,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup laqr5
 *
 *> \par Contributors:
 *  ==================
@@ -251,7 +249,8 @@
 *>       ACM Trans. Math. Softw. 40, 2, Article 12 (February 2014).
 *>
 *  =====================================================================
-      SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
+      SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS,
+     $                   S,
      $                   H, LDH, ILOZ, IHIZ, Z, LDZ, V, LDV, U, LDU, NV,
      $                   WV, LDWV, NH, WH, LDWH )
       IMPLICIT NONE
@@ -279,7 +278,7 @@ SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
       PARAMETER          ( RZERO = 0.0d0, RONE = 1.0d0 )
 *     ..
 *     .. Local Scalars ..
-      COMPLEX*16         ALPHA, BETA, CDUM, REFSUM
+      COMPLEX*16         ALPHA, BETA, CDUM, REFSUM, T1, T2, T3
       DOUBLE PRECISION   H11, H12, H21, H22, SAFMAX, SAFMIN, SCL,
      $                   SMLNUM, TST1, TST2, ULP
       INTEGER            I2, I4, INCOL, J, JBOT, JCOL, JLEN,
@@ -300,7 +299,7 @@ SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
       COMPLEX*16         VT( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, ZGEMM, ZLACPY, ZLAQR1, ZLARFG, ZLASET,
+      EXTERNAL           ZGEMM, ZLACPY, ZLAQR1, ZLARFG, ZLASET,
      $                   ZTRMM
 *     ..
 *     .. Statement Functions ..
@@ -331,7 +330,6 @@ SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
 *
       SAFMIN = DLAMCH( 'SAFE MINIMUM' )
       SAFMAX = RONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULP = DLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( DBLE( N ) / ULP )
 *
@@ -424,12 +422,12 @@ SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
 *              ==== Perform update from right within 
 *              .    computational window. ====
 *
+               T1 = V( 1, M22 )
+               T2 = T1*DCONJG( V( 2, M22 ) )
                DO 30 J = JTOP, MIN( KBOT, K+3 )
-                  REFSUM = V( 1, M22 )*( H( J, K+1 )+V( 2, M22 )*
-     $                     H( J, K+2 ) )
-                  H( J, K+1 ) = H( J, K+1 ) - REFSUM
-                  H( J, K+2 ) = H( J, K+2 ) -
-     $                          REFSUM*DCONJG( V( 2, M22 ) )
+                  REFSUM = H( J, K+1 ) + V( 2, M22 )*H( J, K+2 )
+                  H( J, K+1 ) = H( J, K+1 ) - REFSUM*T1
+                  H( J, K+2 ) = H( J, K+2 ) - REFSUM*T2
    30          CONTINUE
 *
 *              ==== Perform update from left within 
@@ -442,12 +440,13 @@ SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
                ELSE
                   JBOT = KBOT
                END IF
+               T1 = DCONJG( V( 1, M22 ) )
+               T2 = T1*V( 2, M22 )
                DO 40 J = K+1, JBOT
-                  REFSUM = DCONJG( V( 1, M22 ) )*
-     $                     ( H( K+1, J )+DCONJG( V( 2, M22 ) )*
-     $                     H( K+2, J ) )
-                  H( K+1, J ) = H( K+1, J ) - REFSUM
-                  H( K+2, J ) = H( K+2, J ) - REFSUM*V( 2, M22 )
+                  REFSUM = H( K+1, J ) +
+     $                     DCONJG( V( 2, M22 ) )*H( K+2, J )
+                  H( K+1, J ) = H( K+1, J ) - REFSUM*T1
+                  H( K+2, J ) = H( K+2, J ) - REFSUM*T2
    40          CONTINUE
 *
 *              ==== The following convergence test requires that
@@ -532,11 +531,13 @@ SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
 *                 .    Mth bulge. Exploit fact that first two elements
 *                 .    of row are actually zero. ====
 *
-                  REFSUM = V( 1, M )*V( 3, M )*H( K+3, K+2 )
-                  H( K+3, K   ) = -REFSUM
-                  H( K+3, K+1 ) = -REFSUM*DCONJG( V( 2, M ) )
-                  H( K+3, K+2 ) = H( K+3, K+2 ) -
-     $                            REFSUM*DCONJG( V( 3, M ) )
+                  T1 = V( 1, M )
+                  T2 = T1*DCONJG( V( 2, M ) )
+                  T3 = T1*DCONJG( V( 3, M ) )
+                  REFSUM = V( 3, M )*H( K+3, K+2 )
+                  H( K+3, K   ) = -REFSUM*T1
+                  H( K+3, K+1 ) = -REFSUM*T2
+                  H( K+3, K+2 ) = H( K+3, K+2 ) - REFSUM*T3
 *
 *                 ==== Calculate reflection to move
 *                 .    Mth bulge one step. ====
@@ -571,12 +572,13 @@ SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
      $                            S( 2*M ), VT )
                      ALPHA = VT( 1 )
                      CALL ZLARFG( 3, ALPHA, VT( 2 ), 1, VT( 1 ) )
-                     REFSUM = DCONJG( VT( 1 ) )*
-     $                        ( H( K+1, K )+DCONJG( VT( 2 ) )*
-     $                        H( K+2, K ) )
+                     T1 = DCONJG( VT( 1 ) )
+                     T2 = T1*VT( 2 )
+                     T3 = T1*VT( 3 )
+                     REFSUM = H( K+1, K )+DCONJG( VT( 2 ) )*H( K+2, K )
 *
-                     IF( CABS1( H( K+2, K )-REFSUM*VT( 2 ) )+
-     $                   CABS1( REFSUM*VT( 3 ) ).GT.ULP*
+                     IF( CABS1( H( K+2, K )-REFSUM*T2 )+
+     $                   CABS1( REFSUM*T3 ).GT.ULP*
      $                   ( CABS1( H( K, K ) )+CABS1( H( K+1,
      $                   K+1 ) )+CABS1( H( K+2, K+2 ) ) ) ) THEN
 *
@@ -594,7 +596,7 @@ SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
 *                       .    Replace the old reflector with
 *                       .    the new one. ====
 *
-                        H( K+1, K ) = H( K+1, K ) - REFSUM
+                        H( K+1, K ) = H( K+1, K ) - REFSUM*T1
                         H( K+2, K ) = ZERO
                         H( K+3, K ) = ZERO
                         V( 1, M ) = VT( 1 )
@@ -610,25 +612,29 @@ SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
 *              .     deflation check. We still delay most of the
 *              .     updates from the left for efficiency. ====
 *
+               T1 = V( 1, M )
+               T2 = T1*DCONJG( V( 2, M ) )
+               T3 = T1*DCONJG( V( 3, M ) )
                DO 70 J = JTOP, MIN( KBOT, K+3 )
-                  REFSUM = V( 1, M )*( H( J, K+1 )+V( 2, M )*
-     $                     H( J, K+2 )+V( 3, M )*H( J, K+3 ) )
-                  H( J, K+1 ) = H( J, K+1 ) - REFSUM
-                  H( J, K+2 ) = H( J, K+2 ) -
-     $                          REFSUM*DCONJG( V( 2, M ) )
-                  H( J, K+3 ) = H( J, K+3 ) -
-     $                          REFSUM*DCONJG( V( 3, M ) )
+                  REFSUM = H( J, K+1 ) + V( 2, M )*H( J, K+2 )
+     $                     + V( 3, M )*H( J, K+3 )
+                  H( J, K+1 ) = H( J, K+1 ) - REFSUM*T1
+                  H( J, K+2 ) = H( J, K+2 ) - REFSUM*T2
+                  H( J, K+3 ) = H( J, K+3 ) - REFSUM*T3
    70          CONTINUE
 *
 *              ==== Perform update from left for subsequent
 *              .    column. ====
 *
-               REFSUM =  DCONJG( V( 1, M ) )*( H( K+1, K+1 )
-     $                  +DCONJG( V( 2, M ) )*H( K+2, K+1 )
-     $                  +DCONJG( V( 3, M ) )*H( K+3, K+1 ) )
-               H( K+1, K+1 ) = H( K+1, K+1 ) - REFSUM
-               H( K+2, K+1 ) = H( K+2, K+1 ) - REFSUM*V( 2, M )
-               H( K+3, K+1 ) = H( K+3, K+1 ) - REFSUM*V( 3, M )
+               T1 = DCONJG( V( 1, M ) )
+               T2 = T1*V( 2, M )
+               T3 = T1*V( 3, M )
+               REFSUM = H( K+1, K+1 )
+     $                  + DCONJG( V( 2, M ) )*H( K+2, K+1 )
+     $                  + DCONJG( V( 3, M ) )*H( K+3, K+1 )
+               H( K+1, K+1 ) = H( K+1, K+1 ) - REFSUM*T1
+               H( K+2, K+1 ) = H( K+2, K+1 ) - REFSUM*T2
+               H( K+3, K+1 ) = H( K+3, K+1 ) - REFSUM*T3
 *
 *              ==== The following convergence test requires that
 *              .    the tradition small-compared-to-nearby-diagonals
@@ -688,13 +694,15 @@ SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
 *
             DO 100 M = MBOT, MTOP, -1
                K = KRCOL + 2*( M-1 )
+               T1 = DCONJG( V( 1, M ) )
+               T2 = T1*V( 2, M )
+               T3 = T1*V( 3, M )
                DO 90 J = MAX( KTOP, KRCOL + 2*M ), JBOT
-                  REFSUM = DCONJG( V( 1, M ) )*
-     $                     ( H( K+1, J )+DCONJG( V( 2, M ) )*
-     $                     H( K+2, J )+DCONJG( V( 3, M ) )*H( K+3, J ) )
-                  H( K+1, J ) = H( K+1, J ) - REFSUM
-                  H( K+2, J ) = H( K+2, J ) - REFSUM*V( 2, M )
-                  H( K+3, J ) = H( K+3, J ) - REFSUM*V( 3, M )
+                  REFSUM = H( K+1, J ) + DCONJG( V( 2, M ) )*H( K+2, J )
+     $                     + DCONJG( V( 3, M ) )*H( K+3, J )
+                  H( K+1, J ) = H( K+1, J ) - REFSUM*T1
+                  H( K+2, J ) = H( K+2, J ) - REFSUM*T2
+                  H( K+3, J ) = H( K+3, J ) - REFSUM*T3
    90          CONTINUE
   100       CONTINUE
 *
@@ -712,14 +720,15 @@ SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
                   I2 = MAX( 1, KTOP-INCOL )
                   I2 = MAX( I2, KMS-(KRCOL-INCOL)+1 )
                   I4 = MIN( KDU, KRCOL + 2*( MBOT-1 ) - INCOL + 5 )
+                  T1 = V( 1, M )
+                  T2 = T1*DCONJG( V( 2, M ) )
+                  T3 = T1*DCONJG( V( 3, M ) )
                   DO 110 J = I2, I4
-                     REFSUM = V( 1, M )*( U( J, KMS+1 )+V( 2, M )*
-     $                        U( J, KMS+2 )+V( 3, M )*U( J, KMS+3 ) )
-                     U( J, KMS+1 ) = U( J, KMS+1 ) - REFSUM
-                     U( J, KMS+2 ) = U( J, KMS+2 ) -
-     $                               REFSUM*DCONJG( V( 2, M ) )
-                     U( J, KMS+3 ) = U( J, KMS+3 ) -
-     $                               REFSUM*DCONJG( V( 3, M ) )
+                     REFSUM = U( J, KMS+1 ) + V( 2, M )*U( J, KMS+2 )
+     $                        + V( 3, M )*U( J, KMS+3 )
+                     U( J, KMS+1 ) = U( J, KMS+1 ) - REFSUM*T1
+                     U( J, KMS+2 ) = U( J, KMS+2 ) - REFSUM*T2
+                     U( J, KMS+3 ) = U( J, KMS+3 ) - REFSUM*T3
   110             CONTINUE
   120          CONTINUE
             ELSE IF( WANTZ ) THEN
@@ -730,14 +739,15 @@ SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
 *
                DO 140 M = MBOT, MTOP, -1
                   K = KRCOL + 2*( M-1 )
+                  T1 = V( 1, M )
+                  T2 = T1*DCONJG( V( 2, M ) )
+                  T3 = T1*DCONJG( V( 3, M ) )
                   DO 130 J = ILOZ, IHIZ
-                     REFSUM = V( 1, M )*( Z( J, K+1 )+V( 2, M )*
-     $                        Z( J, K+2 )+V( 3, M )*Z( J, K+3 ) )
-                     Z( J, K+1 ) = Z( J, K+1 ) - REFSUM
-                     Z( J, K+2 ) = Z( J, K+2 ) -
-     $                             REFSUM*DCONJG( V( 2, M ) )
-                     Z( J, K+3 ) = Z( J, K+3 ) -
-     $                             REFSUM*DCONJG( V( 3, M ) )
+                     REFSUM = Z( J, K+1 ) + V( 2, M )*Z( J, K+2 )
+     $                        + V( 3, M )*Z( J, K+3 )
+                     Z( J, K+1 ) = Z( J, K+1 ) - REFSUM*T1
+                     Z( J, K+2 ) = Z( J, K+2 ) - REFSUM*T2
+                     Z( J, K+3 ) = Z( J, K+3 ) - REFSUM*T3
   130             CONTINUE
   140          CONTINUE
             END IF
diff --git a/SRC/zlaqsb.f b/SRC/zlaqsb.f
index 2ea0b2f3cc..f66f9f76c5 100644
--- a/SRC/zlaqsb.f
+++ b/SRC/zlaqsb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQSB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqsb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqsb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -134,10 +132,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup laqhb
 *
 *  =====================================================================
-      SUBROUTINE ZLAQSB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX, EQUED )
+      SUBROUTINE ZLAQSB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX,
+     $                   EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlaqsp.f b/SRC/zlaqsp.f
index 263be6bd21..e2c628db69 100644
--- a/SRC/zlaqsp.f
+++ b/SRC/zlaqsp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQSP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqsp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqsp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,10 +117,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup laqhp
 *
 *  =====================================================================
       SUBROUTINE ZLAQSP( UPLO, N, AP, S, SCOND, AMAX, EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlaqsy.f b/SRC/zlaqsy.f
index 37872b8b26..096915c636 100644
--- a/SRC/zlaqsy.f
+++ b/SRC/zlaqsy.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQSY + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqsy.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqsy.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,10 +125,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYauxiliary
+*> \ingroup laqhe
 *
 *  =====================================================================
       SUBROUTINE ZLAQSY( UPLO, N, A, LDA, S, SCOND, AMAX, EQUED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlaqz0.f b/SRC/zlaqz0.f
index 2616f20b5b..c5a888bc37 100644
--- a/SRC/zlaqz0.f
+++ b/SRC/zlaqz0.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQZ0 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqz0.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqz0.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -89,7 +87,7 @@
 *>      Anal., 29(2006), pp. 199--227.
 *>
 *> Ref: T. Steel, D. Camps, K. Meerbergen, R. Vandebril "A multishift,
-*>      multipole rational QZ method with agressive early deflation"
+*>      multipole rational QZ method with aggressive early deflation"
 *> \endverbatim
 *
 *  Arguments:
@@ -274,10 +272,11 @@
 *
 *> \date May 2020
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup laqz0
 *>
 *  =====================================================================
-      RECURSIVE SUBROUTINE ZLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
+      RECURSIVE SUBROUTINE ZLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI,
+     $                             A,
      $                             LDA, B, LDB, ALPHA, BETA, Q, LDQ, Z,
      $                             LDZ, WORK, LWORK, RWORK, REC,
      $                             INFO )
@@ -300,7 +299,8 @@ RECURSIVE SUBROUTINE ZLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
       PARAMETER( ZERO = 0.0D0, ONE = 1.0D0, HALF = 0.5D0 )
 
 *     Local scalars
-      DOUBLE PRECISION :: SMLNUM, ULP, SAFMIN, SAFMAX, C1, TEMPR
+      DOUBLE PRECISION :: SMLNUM, ULP, SAFMIN, SAFMAX, C1, TEMPR,
+     $                    BNORM, BTOL
       COMPLEX*16 :: ESHIFT, S1, TEMP
       INTEGER :: ISTART, ISTOP, IITER, MAXIT, ISTART2, K, LD, NSHIFTS,
      $           NBLOCK, NW, NMIN, NIBBLE, N_UNDEFLATED, N_DEFLATED,
@@ -311,9 +311,9 @@ RECURSIVE SUBROUTINE ZLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
       CHARACTER :: JBCMPZ*3
 
 *     External Functions
-      EXTERNAL :: XERBLA, ZHGEQZ, ZLAQZ2, ZLAQZ3, ZLASET, DLABAD,
+      EXTERNAL :: XERBLA, ZHGEQZ, ZLAQZ2, ZLAQZ3, ZLASET,
      $            ZLARTG, ZROT
-      DOUBLE PRECISION, EXTERNAL :: DLAMCH
+      DOUBLE PRECISION, EXTERNAL :: DLAMCH, ZLANHS
       LOGICAL, EXTERNAL :: LSAME
       INTEGER, EXTERNAL :: ILAENV
 
@@ -418,7 +418,8 @@ RECURSIVE SUBROUTINE ZLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
       NBR = NSR+ITEMP1
 
       IF( N .LT. NMIN .OR. REC .GE. 2 ) THEN
-         CALL ZHGEQZ( WANTS, WANTQ, WANTZ, N, ILO, IHI, A, LDA, B, LDB,
+         CALL ZHGEQZ( WANTS, WANTQ, WANTZ, N, ILO, IHI, A, LDA, B,
+     $                LDB,
      $                ALPHA, BETA, Q, LDQ, Z, LDZ, WORK, LWORK, RWORK,
      $                INFO )
          RETURN
@@ -430,7 +431,8 @@ RECURSIVE SUBROUTINE ZLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 
 *     Workspace query to ZLAQZ2
       NW = MAX( NWR, NMIN )
-      CALL ZLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW, A, LDA, B, LDB,
+      CALL ZLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW, A, LDA, B,
+     $             LDB,
      $             Q, LDQ, Z, LDZ, N_UNDEFLATED, N_DEFLATED, ALPHA,
      $             BETA, WORK, NW, WORK, NW, WORK, -1, RWORK, REC,
      $             AED_INFO )
@@ -463,10 +465,12 @@ RECURSIVE SUBROUTINE ZLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 *     Get machine constants
       SAFMIN = DLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE/SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULP = DLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( DBLE( N )/ULP )
 
+      BNORM = ZLANHS( 'F', IHI-ILO+1, B( ILO, ILO ), LDB, RWORK )
+      BTOL = MAX( SAFMIN, ULP*BNORM )
+
       ISTART = ILO
       ISTOP = IHI
       MAXIT = 30*( IHI-ILO+1 )
@@ -529,30 +533,26 @@ RECURSIVE SUBROUTINE ZLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 *        slow down the method when many infinite eigenvalues are present
          K = ISTOP
          DO WHILE ( K.GE.ISTART2 )
-            TEMPR = ZERO
-            IF( K .LT. ISTOP ) THEN
-               TEMPR = TEMPR+ABS( B( K, K+1 ) )
-            END IF
-            IF( K .GT. ISTART2 ) THEN
-               TEMPR = TEMPR+ABS( B( K-1, K ) )
-            END IF
 
-            IF( ABS( B( K, K ) ) .LT. MAX( SMLNUM, ULP*TEMPR ) ) THEN
-*              A diagonal element of B is negligable, move it
+            IF( ABS( B( K, K ) ) .LT. BTOL ) THEN
+*              A diagonal element of B is negligible, move it
 *              to the top and deflate it
                
                DO K2 = K, ISTART2+1, -1
-                  CALL ZLARTG( B( K2-1, K2 ), B( K2-1, K2-1 ), C1, S1,
+                  CALL ZLARTG( B( K2-1, K2 ), B( K2-1, K2-1 ), C1,
+     $                         S1,
      $                         TEMP )
                   B( K2-1, K2 ) = TEMP
                   B( K2-1, K2-1 ) = CZERO
 
                   CALL ZROT( K2-2-ISTARTM+1, B( ISTARTM, K2 ), 1,
      $                       B( ISTARTM, K2-1 ), 1, C1, S1 )
-                  CALL ZROT( MIN( K2+1, ISTOP )-ISTARTM+1, A( ISTARTM,
+                  CALL ZROT( MIN( K2+1, ISTOP )-ISTARTM+1,
+     $                       A( ISTARTM,
      $                       K2 ), 1, A( ISTARTM, K2-1 ), 1, C1, S1 )
                   IF ( ILZ ) THEN
-                     CALL ZROT( N, Z( 1, K2 ), 1, Z( 1, K2-1 ), 1, C1,
+                     CALL ZROT( N, Z( 1, K2 ), 1, Z( 1, K2-1 ), 1,
+     $                          C1,
      $                          S1 )
                   END IF
 
@@ -562,9 +562,11 @@ RECURSIVE SUBROUTINE ZLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
                      A( K2, K2-1 ) = TEMP
                      A( K2+1, K2-1 ) = CZERO
 
-                     CALL ZROT( ISTOPM-K2+1, A( K2, K2 ), LDA, A( K2+1,
+                     CALL ZROT( ISTOPM-K2+1, A( K2, K2 ), LDA,
+     $                          A( K2+1,
      $                          K2 ), LDA, C1, S1 )
-                     CALL ZROT( ISTOPM-K2+1, B( K2, K2 ), LDB, B( K2+1,
+                     CALL ZROT( ISTOPM-K2+1, B( K2, K2 ), LDB,
+     $                          B( K2+1,
      $                          K2 ), LDB, C1, S1 )
                      IF( ILQ ) THEN
                         CALL ZROT( N, Q( 1, K2 ), 1, Q( 1, K2+1 ), 1,
@@ -626,7 +628,8 @@ RECURSIVE SUBROUTINE ZLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 *
 *        Time for AED
 *
-         CALL ZLAQZ2( ILSCHUR, ILQ, ILZ, N, ISTART2, ISTOP, NW, A, LDA,
+         CALL ZLAQZ2( ILSCHUR, ILQ, ILZ, N, ISTART2, ISTOP, NW, A,
+     $                LDA,
      $                B, LDB, Q, LDQ, Z, LDZ, N_UNDEFLATED, N_DEFLATED,
      $                ALPHA, BETA, WORK, NW, WORK( NW**2+1 ), NW,
      $                WORK( 2*NW**2+1 ), LWORK-2*NW**2, RWORK, REC,
@@ -649,7 +652,7 @@ RECURSIVE SUBROUTINE ZLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 
          NS = MIN( NSHIFTS, ISTOP-ISTART2 )
          NS = MIN( NS, N_UNDEFLATED )
-         SHIFTPOS = ISTOP-N_DEFLATED-N_UNDEFLATED+1
+         SHIFTPOS = ISTOP-N_UNDEFLATED+1
 
          IF ( MOD( LD, 6 ) .EQ. 0 ) THEN
 * 
@@ -669,7 +672,8 @@ RECURSIVE SUBROUTINE ZLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 *
 *        Time for a QZ sweep
 *
-         CALL ZLAQZ3( ILSCHUR, ILQ, ILZ, N, ISTART2, ISTOP, NS, NBLOCK,
+         CALL ZLAQZ3( ILSCHUR, ILQ, ILZ, N, ISTART2, ISTOP, NS,
+     $                NBLOCK,
      $                ALPHA( SHIFTPOS ), BETA( SHIFTPOS ), A, LDA, B,
      $                LDB, Q, LDQ, Z, LDZ, WORK, NBLOCK, WORK( NBLOCK**
      $                2+1 ), NBLOCK, WORK( 2*NBLOCK**2+1 ),
diff --git a/SRC/zlaqz1.f b/SRC/zlaqz1.f
index d8f52ad04c..c50a26d496 100644
--- a/SRC/zlaqz1.f
+++ b/SRC/zlaqz1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQZ1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ZLAQZ1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ZLAQZ1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -165,10 +163,11 @@
 *
 *> \date May 2020
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup laqz1
 *>
 *  =====================================================================
-      SUBROUTINE ZLAQZ1( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
+      SUBROUTINE ZLAQZ1( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA,
+     $                   B,
      $                   LDB, NQ, QSTART, Q, LDQ, NZ, ZSTART, Z, LDZ )
       IMPLICIT NONE
 *
@@ -204,7 +203,8 @@ SUBROUTINE ZLAQZ1( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
          CALL ZROT( IHI-ISTARTM+1, A( ISTARTM, IHI ), 1, A( ISTARTM,
      $              IHI-1 ), 1, C, S )
          IF ( ILZ ) THEN
-            CALL ZROT( NZ, Z( 1, IHI-ZSTART+1 ), 1, Z( 1, IHI-1-ZSTART+
+            CALL ZROT( NZ, Z( 1, IHI-ZSTART+1 ), 1, Z( 1,
+     $                 IHI-1-ZSTART+
      $                 1 ), 1, C, S )
          END IF
 *
@@ -220,10 +220,12 @@ SUBROUTINE ZLAQZ1( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
          B( K+1, K ) = CZERO
          CALL ZROT( K+2-ISTARTM+1, A( ISTARTM, K+1 ), 1, A( ISTARTM,
      $              K ), 1, C, S )
-         CALL ZROT( K-ISTARTM+1, B( ISTARTM, K+1 ), 1, B( ISTARTM, K ),
+         CALL ZROT( K-ISTARTM+1, B( ISTARTM, K+1 ), 1, B( ISTARTM,
+     $              K ),
      $              1, C, S )
          IF ( ILZ ) THEN
-            CALL ZROT( NZ, Z( 1, K+1-ZSTART+1 ), 1, Z( 1, K-ZSTART+1 ),
+            CALL ZROT( NZ, Z( 1, K+1-ZSTART+1 ), 1, Z( 1,
+     $                 K-ZSTART+1 ),
      $                 1, C, S )
          END IF
 *
@@ -232,9 +234,11 @@ SUBROUTINE ZLAQZ1( ILQ, ILZ, K, ISTARTM, ISTOPM, IHI, A, LDA, B,
          CALL ZLARTG( A( K+1, K ), A( K+2, K ), C, S, TEMP )
          A( K+1, K ) = TEMP
          A( K+2, K ) = CZERO
-         CALL ZROT( ISTOPM-K, A( K+1, K+1 ), LDA, A( K+2, K+1 ), LDA, C,
+         CALL ZROT( ISTOPM-K, A( K+1, K+1 ), LDA, A( K+2, K+1 ), LDA,
+     $              C,
      $              S )
-         CALL ZROT( ISTOPM-K, B( K+1, K+1 ), LDB, B( K+2, K+1 ), LDB, C,
+         CALL ZROT( ISTOPM-K, B( K+1, K+1 ), LDB, B( K+2, K+1 ), LDB,
+     $              C,
      $              S )
          IF ( ILQ ) THEN
             CALL ZROT( NQ, Q( 1, K+1-QSTART+1 ), 1, Q( 1, K+2-QSTART+
diff --git a/SRC/zlaqz2.f b/SRC/zlaqz2.f
index 2e94e6dc49..0faec2770f 100644
--- a/SRC/zlaqz2.f
+++ b/SRC/zlaqz2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQZ2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ZLAQZ2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ZLAQZ2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -224,10 +222,11 @@
 *
 *> \date May 2020
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup laqz2
 *>
 *  =====================================================================
-      RECURSIVE SUBROUTINE ZLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
+      RECURSIVE SUBROUTINE ZLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI,
+     $                             NW,
      $                             A, LDA, B, LDB, Q, LDQ, Z, LDZ, NS,
      $                             ND, ALPHA, BETA, QC, LDQC, ZC, LDZC,
      $                             WORK, LWORK, RWORK, REC, INFO )
@@ -258,7 +257,7 @@ RECURSIVE SUBROUTINE ZLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
       COMPLEX*16 :: S, S1, TEMP
 
 *     External Functions
-      EXTERNAL :: XERBLA, ZLAQZ0, ZLAQZ1, DLABAD, ZLACPY, ZLASET, ZGEMM,
+      EXTERNAL :: XERBLA, ZLAQZ0, ZLAQZ1, ZLACPY, ZLASET, ZGEMM,
      $            ZTGEXC, ZLARTG, ZROT
       DOUBLE PRECISION, EXTERNAL :: DLAMCH
 
@@ -297,7 +296,6 @@ RECURSIVE SUBROUTINE ZLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
 *     Get machine constants
       SAFMIN = DLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE/SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULP = DLAMCH( 'PRECISION' )
       SMLNUM = SAFMIN*( DBLE( N )/ULP )
 
@@ -320,7 +318,8 @@ RECURSIVE SUBROUTINE ZLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
 
 *     Store window in case of convergence failure
       CALL ZLACPY( 'ALL', JW, JW, A( KWTOP, KWTOP ), LDA, WORK, JW )
-      CALL ZLACPY( 'ALL', JW, JW, B( KWTOP, KWTOP ), LDB, WORK( JW**2+
+      CALL ZLACPY( 'ALL', JW, JW, B( KWTOP, KWTOP ), LDB,
+     $             WORK( JW**2+
      $             1 ), JW )
 
 *     Transform window to real schur form
@@ -335,7 +334,8 @@ RECURSIVE SUBROUTINE ZLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
 *        Convergence failure, restore the window and exit
          ND = 0
          NS = JW-QZ_SMALL_INFO
-         CALL ZLACPY( 'ALL', JW, JW, WORK, JW, A( KWTOP, KWTOP ), LDA )
+         CALL ZLACPY( 'ALL', JW, JW, WORK, JW, A( KWTOP, KWTOP ),
+     $                LDA )
          CALL ZLACPY( 'ALL', JW, JW, WORK( JW**2+1 ), JW, B( KWTOP,
      $                KWTOP ), LDB )
          RETURN
@@ -392,11 +392,14 @@ RECURSIVE SUBROUTINE ZLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
             A( K, KWTOP-1 ) = TEMP
             A( K+1, KWTOP-1 ) = CZERO
             K2 = MAX( KWTOP, K-1 )
-            CALL ZROT( IHI-K2+1, A( K, K2 ), LDA, A( K+1, K2 ), LDA, C1,
+            CALL ZROT( IHI-K2+1, A( K, K2 ), LDA, A( K+1, K2 ), LDA,
+     $                 C1,
      $                 S1 )
-            CALL ZROT( IHI-( K-1 )+1, B( K, K-1 ), LDB, B( K+1, K-1 ),
+            CALL ZROT( IHI-( K-1 )+1, B( K, K-1 ), LDB, B( K+1,
+     $                 K-1 ),
      $                 LDB, C1, S1 )
-            CALL ZROT( JW, QC( 1, K-KWTOP+1 ), 1, QC( 1, K+1-KWTOP+1 ),
+            CALL ZROT( JW, QC( 1, K-KWTOP+1 ), 1, QC( 1,
+     $                 K+1-KWTOP+1 ),
      $                 1, C1, DCONJG( S1 ) )
          END DO
 
@@ -438,25 +441,29 @@ RECURSIVE SUBROUTINE ZLAQZ2( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NW,
      $                IHI+1 ), LDB )
       END IF
       IF ( ILQ ) THEN
-         CALL ZGEMM( 'N', 'N', N, JW, JW, CONE, Q( 1, KWTOP ), LDQ, QC,
+         CALL ZGEMM( 'N', 'N', N, JW, JW, CONE, Q( 1, KWTOP ), LDQ,
+     $               QC,
      $               LDQC, CZERO, WORK, N )
          CALL ZLACPY( 'ALL', N, JW, WORK, N, Q( 1, KWTOP ), LDQ )
       END IF
 
       IF ( KWTOP-1-ISTARTM+1 > 0 ) THEN
-         CALL ZGEMM( 'N', 'N', KWTOP-ISTARTM, JW, JW, CONE, A( ISTARTM,
+         CALL ZGEMM( 'N', 'N', KWTOP-ISTARTM, JW, JW, CONE,
+     $               A( ISTARTM,
      $               KWTOP ), LDA, ZC, LDZC, CZERO, WORK,
      $               KWTOP-ISTARTM )
         CALL ZLACPY( 'ALL', KWTOP-ISTARTM, JW, WORK, KWTOP-ISTARTM,
      $               A( ISTARTM, KWTOP ), LDA )
-         CALL ZGEMM( 'N', 'N', KWTOP-ISTARTM, JW, JW, CONE, B( ISTARTM,
+         CALL ZGEMM( 'N', 'N', KWTOP-ISTARTM, JW, JW, CONE,
+     $               B( ISTARTM,
      $               KWTOP ), LDB, ZC, LDZC, CZERO, WORK,
      $               KWTOP-ISTARTM )
         CALL ZLACPY( 'ALL', KWTOP-ISTARTM, JW, WORK, KWTOP-ISTARTM,
      $               B( ISTARTM, KWTOP ), LDB )
       END IF
       IF ( ILZ ) THEN
-         CALL ZGEMM( 'N', 'N', N, JW, JW, CONE, Z( 1, KWTOP ), LDZ, ZC,
+         CALL ZGEMM( 'N', 'N', N, JW, JW, CONE, Z( 1, KWTOP ), LDZ,
+     $               ZC,
      $               LDZC, CZERO, WORK, N )
          CALL ZLACPY( 'ALL', N, JW, WORK, N, Z( 1, KWTOP ), LDZ )
       END IF
diff --git a/SRC/zlaqz3.f b/SRC/zlaqz3.f
index 9e589cb67e..a8851f9be4 100644
--- a/SRC/zlaqz3.f
+++ b/SRC/zlaqz3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAQZ3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ZLAQZ3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ZLAQZ3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -198,7 +196,7 @@
 *
 *> \date May 2020
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup laqz3
 *>
 *  =====================================================================
       SUBROUTINE ZLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
@@ -232,7 +230,7 @@ SUBROUTINE ZLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       COMPLEX*16 :: TEMP, TEMP2, TEMP3, S
 
 *     External Functions
-      EXTERNAL :: XERBLA, DLABAD, ZLASET, ZLARTG, ZROT, ZLAQZ1, ZGEMM,
+      EXTERNAL :: XERBLA, ZLASET, ZLARTG, ZROT, ZLAQZ1, ZGEMM,
      $            ZLACPY
       DOUBLE PRECISION, EXTERNAL :: DLAMCH
 
@@ -260,7 +258,6 @@ SUBROUTINE ZLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
 *     Get machine constants
       SAFMIN = DLAMCH( 'SAFE MINIMUM' )
       SAFMAX = ONE/SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
 
       IF ( ILO .GE. IHI ) THEN
          RETURN
@@ -329,17 +326,20 @@ SUBROUTINE ZLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       SHEIGHT = NS+1
       SWIDTH = ISTOPM-( ILO+NS )+1
       IF ( SWIDTH > 0 ) THEN
-         CALL ZGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC, LDQC,
+         CALL ZGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC,
+     $               LDQC,
      $               A( ILO, ILO+NS ), LDA, CZERO, WORK, SHEIGHT )
          CALL ZLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, A( ILO,
      $                ILO+NS ), LDA )
-         CALL ZGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC, LDQC,
+         CALL ZGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC,
+     $               LDQC,
      $               B( ILO, ILO+NS ), LDB, CZERO, WORK, SHEIGHT )
          CALL ZLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, B( ILO,
      $                ILO+NS ), LDB )
       END IF
       IF ( ILQ ) THEN
-         CALL ZGEMM( 'N', 'N', N, SHEIGHT, SHEIGHT, CONE, Q( 1, ILO ),
+         CALL ZGEMM( 'N', 'N', N, SHEIGHT, SHEIGHT, CONE, Q( 1,
+     $               ILO ),
      $               LDQ, QC, LDQC, CZERO, WORK, N )
          CALL ZLACPY( 'ALL', N, SHEIGHT, WORK, N, Q( 1, ILO ), LDQ )
       END IF
@@ -352,12 +352,14 @@ SUBROUTINE ZLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
          CALL ZGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, CONE,
      $               A( ISTARTM, ILO ), LDA, ZC, LDZC, CZERO, WORK,
      $               SHEIGHT )
-         CALL ZLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, A( ISTARTM,
+         CALL ZLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                A( ISTARTM,
      $                ILO ), LDA )
          CALL ZGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, CONE,
      $               B( ISTARTM, ILO ), LDB, ZC, LDZC, CZERO, WORK,
      $               SHEIGHT )
-         CALL ZLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, B( ISTARTM,
+         CALL ZLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                B( ISTARTM,
      $                ILO ), LDB )
       END IF
       IF ( ILZ ) THEN
@@ -389,7 +391,8 @@ SUBROUTINE ZLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
 *              Move down the block with index k+i+j, updating
 *              the (ns+np x ns+np) block:
 *              (k:k+ns+np,k:k+ns+np-1)
-               CALL ZLAQZ1( .TRUE., .TRUE., K+I+J, ISTARTB, ISTOPB, IHI,
+               CALL ZLAQZ1( .TRUE., .TRUE., K+I+J, ISTARTB, ISTOPB,
+     $                      IHI,
      $                      A, LDA, B, LDB, NBLOCK, K+1, QC, LDQC,
      $                      NBLOCK, K, ZC, LDZC )
             END DO
@@ -406,18 +409,22 @@ SUBROUTINE ZLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
             CALL ZGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC,
      $                  LDQC, A( K+1, K+NS+NP ), LDA, CZERO, WORK,
      $                  SHEIGHT )
-            CALL ZLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, A( K+1,
+            CALL ZLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                   A( K+1,
      $                   K+NS+NP ), LDA )
             CALL ZGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC,
      $                  LDQC, B( K+1, K+NS+NP ), LDB, CZERO, WORK,
      $                  SHEIGHT )
-            CALL ZLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, B( K+1,
+            CALL ZLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                   B( K+1,
      $                   K+NS+NP ), LDB )
          END IF
          IF ( ILQ ) THEN
-            CALL ZGEMM( 'N', 'N', N, NBLOCK, NBLOCK, CONE, Q( 1, K+1 ),
+            CALL ZGEMM( 'N', 'N', N, NBLOCK, NBLOCK, CONE, Q( 1,
+     $                  K+1 ),
      $                  LDQ, QC, LDQC, CZERO, WORK, N )
-            CALL ZLACPY( 'ALL', N, NBLOCK, WORK, N, Q( 1, K+1 ), LDQ )
+            CALL ZLACPY( 'ALL', N, NBLOCK, WORK, N, Q( 1, K+1 ),
+     $                   LDQ )
          END IF
 
 *        Update A(istartm:k,k:k+ns+npos-1) and B(istartm:k,k:k+ns+npos-1)
@@ -460,7 +467,8 @@ SUBROUTINE ZLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       DO I = 1, NS
 *        Chase the shift down to the bottom right corner
          DO ISHIFT = IHI-I, IHI-1
-            CALL ZLAQZ1( .TRUE., .TRUE., ISHIFT, ISTARTB, ISTOPB, IHI,
+            CALL ZLAQZ1( .TRUE., .TRUE., ISHIFT, ISTARTB, ISTOPB,
+     $                   IHI,
      $                   A, LDA, B, LDB, NS, IHI-NS+1, QC, LDQC, NS+1,
      $                   IHI-NS, ZC, LDZC )
          END DO
@@ -474,17 +482,20 @@ SUBROUTINE ZLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
       SHEIGHT = NS
       SWIDTH = ISTOPM-( IHI+1 )+1
       IF ( SWIDTH > 0 ) THEN
-         CALL ZGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC, LDQC,
+         CALL ZGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC,
+     $               LDQC,
      $               A( IHI-NS+1, IHI+1 ), LDA, CZERO, WORK, SHEIGHT )
          CALL ZLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
      $                A( IHI-NS+1, IHI+1 ), LDA )
-         CALL ZGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC, LDQC,
+         CALL ZGEMM( 'C', 'N', SHEIGHT, SWIDTH, SHEIGHT, CONE, QC,
+     $               LDQC,
      $               B( IHI-NS+1, IHI+1 ), LDB, CZERO, WORK, SHEIGHT )
          CALL ZLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
      $                B( IHI-NS+1, IHI+1 ), LDB )
       END IF
       IF ( ILQ ) THEN
-         CALL ZGEMM( 'N', 'N', N, NS, NS, CONE, Q( 1, IHI-NS+1 ), LDQ,
+         CALL ZGEMM( 'N', 'N', N, NS, NS, CONE, Q( 1, IHI-NS+1 ),
+     $               LDQ,
      $               QC, LDQC, CZERO, WORK, N )
          CALL ZLACPY( 'ALL', N, NS, WORK, N, Q( 1, IHI-NS+1 ), LDQ )
       END IF
@@ -497,16 +508,19 @@ SUBROUTINE ZLAQZ3( ILSCHUR, ILQ, ILZ, N, ILO, IHI, NSHIFTS,
          CALL ZGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, CONE,
      $               A( ISTARTM, IHI-NS ), LDA, ZC, LDZC, CZERO, WORK,
      $               SHEIGHT )
-         CALL ZLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, A( ISTARTM,
+         CALL ZLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                A( ISTARTM,
      $                IHI-NS ), LDA )
          CALL ZGEMM( 'N', 'N', SHEIGHT, SWIDTH, SWIDTH, CONE,
      $               B( ISTARTM, IHI-NS ), LDB, ZC, LDZC, CZERO, WORK,
      $               SHEIGHT )
-         CALL ZLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT, B( ISTARTM,
+         CALL ZLACPY( 'ALL', SHEIGHT, SWIDTH, WORK, SHEIGHT,
+     $                B( ISTARTM,
      $                IHI-NS ), LDB )
       END IF
       IF ( ILZ ) THEN
-         CALL ZGEMM( 'N', 'N', N, NS+1, NS+1, CONE, Z( 1, IHI-NS ), LDZ,
+         CALL ZGEMM( 'N', 'N', N, NS+1, NS+1, CONE, Z( 1, IHI-NS ),
+     $               LDZ,
      $               ZC, LDZC, CZERO, WORK, N )
          CALL ZLACPY( 'ALL', N, NS+1, WORK, N, Z( 1, IHI-NS ), LDZ )
       END IF
diff --git a/SRC/zlar1v.f b/SRC/zlar1v.f
index e272c33a51..65863b2799 100644
--- a/SRC/zlar1v.f
+++ b/SRC/zlar1v.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAR1V + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlar1v.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlar1v.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -212,7 +210,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lar1v
 *
 *> \par Contributors:
 *  ==================
@@ -227,6 +225,7 @@
       SUBROUTINE ZLAR1V( N, B1, BN, LAMBDA, D, L, LD, LLD,
      $           PIVMIN, GAPTOL, Z, WANTNC, NEGCNT, ZTZ, MINGMA,
      $           R, ISUPPZ, NRMINV, RESID, RQCORR, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlar2v.f b/SRC/zlar2v.f
index 3d767956c2..a08ea26224 100644
--- a/SRC/zlar2v.f
+++ b/SRC/zlar2v.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAR2V + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlar2v.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlar2v.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -104,10 +102,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lar2v
 *
 *  =====================================================================
       SUBROUTINE ZLAR2V( N, X, Y, Z, INCX, C, S, INCC )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlarcm.f b/SRC/zlarcm.f
index 4445d6d483..61e5e17654 100644
--- a/SRC/zlarcm.f
+++ b/SRC/zlarcm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLARCM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarcm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarcm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup larcm
 *
 *  =====================================================================
       SUBROUTINE ZLARCM( M, N, A, LDA, B, LDB, C, LDC, RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlarf.f b/SRC/zlarf.f
index e555d18ecd..1af457e458 100644
--- a/SRC/zlarf.f
+++ b/SRC/zlarf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLARF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup larf
 *
 *  =====================================================================
       SUBROUTINE ZLARF( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -204,7 +203,8 @@ SUBROUTINE ZLARF( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
 *
 *           C(1:lastv,1:lastc) := C(...) - v(1:lastv,1) * w(1:lastc,1)**H
 *
-            CALL ZGERC( LASTV, LASTC, -TAU, V, INCV, WORK, 1, C, LDC )
+            CALL ZGERC( LASTV, LASTC, -TAU, V, INCV, WORK, 1, C,
+     $                  LDC )
          END IF
       ELSE
 *
@@ -219,7 +219,8 @@ SUBROUTINE ZLARF( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
 *
 *           C(1:lastc,1:lastv) := C(...) - w(1:lastc,1) * v(1:lastv,1)**H
 *
-            CALL ZGERC( LASTC, LASTV, -TAU, WORK, 1, V, INCV, C, LDC )
+            CALL ZGERC( LASTC, LASTV, -TAU, WORK, 1, V, INCV, C,
+     $                  LDC )
          END IF
       END IF
       RETURN
diff --git a/SRC/zlarf1f.f b/SRC/zlarf1f.f
new file mode 100644
index 0000000000..adaca3c9b4
--- /dev/null
+++ b/SRC/zlarf1f.f
@@ -0,0 +1,302 @@
+*> \brief \b ZLARF1F applies an elementary reflector to a general rectangular
+*              matrix assuming v(1) = 1.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download ZLARF1F + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarf1f.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlarf1f.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarf1f.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLARF1F( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          SIDE
+*       INTEGER            INCV, LDC, M, N
+*       COMPLEX*16         TAU
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         C( LDC, * ), V( * ), WORK( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLARF1F applies a complex elementary reflector H to a real m by n matrix
+*> C, from either the left or the right. H is represented in the form
+*>
+*>       H = I - tau * v * v**H
+*>
+*> where tau is a complex scalar and v is a complex vector.
+*>
+*> If tau = 0, then H is taken to be the unit matrix.
+*>
+*> To apply H**H, supply conjg(tau) instead
+*> tau.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'L': form  H * C
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is COMPLEX*16 array, dimension
+*>                     (1 + (M-1)*abs(INCV)) if SIDE = 'L'
+*>                  or (1 + (N-1)*abs(INCV)) if SIDE = 'R'
+*>          The vector v in the representation of H. V is not used if
+*>          TAU = 0. V(1) is not referenced or modified.
+*> \endverbatim
+*>
+*> \param[in] INCV
+*> \verbatim
+*>          INCV is INTEGER
+*>          The increment between elements of v. INCV <> 0.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16
+*>          The value tau in the representation of H.
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is COMPLEX*16 array, dimension (LDC,N)
+*>          On entry, the m by n matrix C.
+*>          On exit, C is overwritten by the matrix H * C if SIDE = 'L',
+*>          or C * H if SIDE = 'R'.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension
+*>                         (N) if SIDE = 'L'
+*>                      or (M) if SIDE = 'R'
+*> \endverbatim
+*  To take advantage of the fact that v(1) = 1, we do the following
+*     v = [ 1 v_2 ]**T
+*     If SIDE='L'
+*           |-----|
+*           | C_1 |
+*        C =| C_2 |
+*           |-----|
+*        C_1\in\mathbb{C}^{1\times n}, C_2\in\mathbb{C}^{m-1\times n}
+*        So we compute:
+*        C = HC   = (I - \tau vv**T)C
+*                 = C - \tau vv**T C
+*        w = C**T v  = [ C_1**T C_2**T ] [ 1 v_2 ]**T
+*                    = C_1**T + C_2**T v ( ZGEMM then ZAXPYC-like )
+*        C  = C - \tau vv**T C
+*           = C - \tau vw**T
+*        Giving us   C_1 = C_1 - \tau w**T ( ZAXPYC-like )
+*                 and
+*                    C_2 = C_2 - \tau v_2w**T ( ZGERC )
+*     If SIDE='R'
+*
+*        C = [ C_1 C_2 ]
+*        C_1\in\mathbb{C}^{m\times 1}, C_2\in\mathbb{C}^{m\times n-1}
+*        So we compute: 
+*        C = CH   = C(I - \tau vv**T)
+*                 = C - \tau Cvv**T
+*
+*        w = Cv   = [ C_1 C_2 ] [ 1 v_2 ]**T
+*                 = C_1 + C_2v_2 ( ZGEMM then ZAXPYC-like )
+*        C  = C - \tau Cvv**T
+*           = C - \tau wv**T
+*        Giving us   C_1 = C_1 - \tau w ( ZAXPYC-like )
+*                 and
+*                    C_2 = C_2 - \tau wv_2**T ( ZGERC )
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup larf
+*
+*  =====================================================================
+      SUBROUTINE ZLARF1F( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          SIDE
+      INTEGER            INCV, LDC, M, N
+      COMPLEX*16         TAU
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         C( LDC, * ), V( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      COMPLEX*16         ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
+     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            APPLYLEFT
+      INTEGER            I, LASTV, LASTC, J
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZAXPY, ZGEMV, ZGERC, ZSCAL
+*     .. Intrinsic Functions ..
+      INTRINSIC          DCONJG
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAZLR, ILAZLC
+      EXTERNAL           LSAME, ILAZLR, ILAZLC
+*     ..
+*     .. Executable Statements ..
+*
+      APPLYLEFT = LSAME( SIDE, 'L' )
+      LASTV = 1
+      LASTC = 0
+      IF( TAU.NE.ZERO ) THEN
+!     Set up variables for scanning V.  LASTV begins pointing to the end
+!     of V.
+         IF( APPLYLEFT ) THEN
+            LASTV = M
+         ELSE
+            LASTV = N
+         END IF
+         IF( INCV.GT.0 ) THEN
+            I = 1 + (LASTV-1) * INCV
+         ELSE
+            I = 1
+         END IF
+!     Look for the last non-zero row in V.
+!        Since we are assuming that V(1) = 1, and it is not stored, so we
+!        shouldn't access it.
+         DO WHILE( LASTV.GT.1 .AND. V( I ).EQ.ZERO )
+            LASTV = LASTV - 1
+            I = I - INCV
+         END DO
+         IF( APPLYLEFT ) THEN
+!     Scan for the last non-zero column in C(1:lastv,:).
+            LASTC = ILAZLC(LASTV, N, C, LDC)
+         ELSE
+!     Scan for the last non-zero row in C(:,1:lastv).
+            LASTC = ILAZLR(M, LASTV, C, LDC)
+         END IF
+      END IF
+      IF( LASTC.EQ.0 ) THEN
+         RETURN
+      END IF
+      IF( APPLYLEFT ) THEN
+*
+*        Form  H * C
+*
+            ! Check if m = 1. This means v = 1, So we just need to compute
+            ! C := HC = (1-\tau)C.
+            IF( LASTV.EQ.1 ) THEN
+               CALL ZSCAL(LASTC, ONE - TAU, C, LDC)
+            ELSE
+*
+*              w(1:lastc,1) := C(1:lastv,1:lastc)**H * v(1:lastv,1)
+*
+               ! (I - tvv**H)C = C - tvv**H C
+               ! First compute w**H = v**H c -> w = C**H v
+               ! C = [ C_1 C_2 ]**T, v = [1 v_2]**T
+               ! w = C_1**H + C_2**Hv_2
+               ! w = C_2**Hv_2
+               CALL ZGEMV( 'Conjugate transpose', LASTV - 1,
+     $               LASTC, ONE, C( 1+1, 1 ), LDC, V( 1 + INCV ),
+     $               INCV, ZERO, WORK, 1 )
+*
+*              w(1:lastc,1) += v(1,1) * C(1,1:lastc)**H
+*
+               DO I = 1, LASTC
+                  WORK( I ) = WORK( I ) + DCONJG( C( 1, I ) )
+               END DO
+*
+*           C(1:lastv,1:lastc) := C(...) - tau * v(1:lastv,1) * w(1:lastc,1)**H
+*
+            ! C(1, 1:lastc)   := C(...) - tau * v(1,1) * w(1:lastc,1)**H
+            !                  = C(...) - tau * Conj(w(1:lastc,1))
+            ! This is essentially a zaxpyc
+               DO I = 1, LASTC
+                  C( 1, I ) = C( 1, I ) - TAU * DCONJG( WORK( I ) )
+               END DO
+*
+*        C(2:lastv,1:lastc) += - tau * v(2:lastv,1) * w(1:lastc,1)**H
+*
+               CALL ZGERC( LASTV - 1, LASTC, -TAU, V( 1 + INCV ),
+     $               INCV, WORK, 1, C( 1+1, 1 ), LDC )
+            END IF
+      ELSE
+*
+*        Form  C * H
+*
+            ! Check if n = 1. This means v = 1, so we just need to compute
+            ! C := CH = C(1-\tau).
+            IF( LASTV.EQ.1 ) THEN
+               CALL ZSCAL(LASTC, ONE - TAU, C, 1)
+            ELSE
+*
+*              w(1:lastc,1) := C(1:lastc,1:lastv) * v(1:lastv,1)
+*
+               ! w(1:lastc,1) := C(1:lastc,2:lastv) * v(2:lastv,1)
+               CALL ZGEMV( 'No transpose', LASTC, LASTV-1, ONE, 
+     $            C(1,1+1), LDC, V(1+INCV), INCV, ZERO, WORK, 1 )
+               ! w(1:lastc,1) += C(1:lastc,1) v(1,1) = C(1:lastc,1)
+               CALL ZAXPY(LASTC, ONE, C, 1, WORK, 1)
+*
+*              C(1:lastc,1:lastv) := C(...) - tau * w(1:lastc,1) * v(1:lastv,1)**T
+*
+               ! C(1:lastc,1)     := C(...) - tau * w(1:lastc,1) * v(1,1)**T
+               !                   = C(...) - tau * w(1:lastc,1)
+               CALL ZAXPY(LASTC, -TAU, WORK, 1, C, 1)
+               ! C(1:lastc,2:lastv) := C(...) - tau * w(1:lastc,1) * v(2:lastv)**T
+               CALL ZGERC( LASTC, LASTV-1, -TAU, WORK, 1, V(1+INCV),
+     $                     INCV, C(1,1+1), LDC )
+            END IF
+      END IF
+      RETURN
+*
+*     End of ZLARF1F
+*
+      END
diff --git a/SRC/zlarf1l.f b/SRC/zlarf1l.f
new file mode 100644
index 0000000000..2a3bd1d373
--- /dev/null
+++ b/SRC/zlarf1l.f
@@ -0,0 +1,267 @@
+*> \brief \b ZLARF1L applies an elementary reflector to a general rectangular
+*              matrix assuming v(lastv) = 1, where lastv is the last non-zero
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download ZLARF1L + dependencies
+*> <a
+*href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarf1l.f">
+*> [TGZ]</a>
+*> <a
+*href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlarf1l.f">
+*> [ZIP]</a>
+*> <a
+*href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarf1l.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLARF1L( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          SIDE
+*       INTEGER            INCV, LDC, M, N
+*       COMPLEX*16         TAU
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         C( LDC, * ), V( * ), WORK( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLARF1L applies a complex elementary reflector H to a complex m by n matrix
+*> C, from either the left or the right. H is represented in the form
+*>
+*>       H = I - tau * v * v**H
+*>
+*> where tau is a real scalar and v is a real vector assuming v(lastv) = 1,
+*> where lastv is the last non-zero element.
+*>
+*> If tau = 0, then H is taken to be the unit matrix.
+*>
+*> To apply H**H (the conjugate transpose of H), supply conjg(tau) instead
+*> tau.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'L': form  H * C
+*>          = 'R': form  C * H
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is COMPLEX*16 array, dimension
+*>                     (1 + (M-1)*abs(INCV)) if SIDE = 'L'
+*>                  or (1 + (N-1)*abs(INCV)) if SIDE = 'R'
+*>          The vector v in the representation of H. V is not used if
+*>          TAU = 0.
+*> \endverbatim
+*>
+*> \param[in] INCV
+*> \verbatim
+*>          INCV is INTEGER
+*>          The increment between elements of v. INCV > 0.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16
+*>          The value tau in the representation of H.
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is COMPLEX*16 array, dimension (LDC,N)
+*>          On entry, the m by n matrix C.
+*>          On exit, C is overwritten by the matrix H * C if SIDE = 'L',
+*>          or C * H if SIDE = 'R'.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension
+*>                         (N) if SIDE = 'L'
+*>                      or (M) if SIDE = 'R'
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup larf1f
+*
+*  =====================================================================
+      SUBROUTINE ZLARF1L( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          SIDE
+      INTEGER            INCV, LDC, M, N
+      COMPLEX*16         TAU
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         C( LDC, * ), V( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      COMPLEX*16         ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
+     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            APPLYLEFT
+      INTEGER            I, J, LASTV, LASTC, FIRSTV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZAXPY, ZGEMV, ZGERC, ZSCAL
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DCONJG
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAZLR, ILAZLC
+      EXTERNAL           LSAME, ILAZLR, ILAZLC
+*     ..
+*     .. Executable Statements ..
+*
+      APPLYLEFT = LSAME( SIDE, 'L' )
+      FIRSTV = 1
+      LASTC = 0
+      IF( TAU.NE.ZERO ) THEN
+!     Set up variables for scanning V.  LASTV begins pointing to the end
+!     of V up to V(1).
+         IF( APPLYLEFT ) THEN
+            LASTV = M
+         ELSE
+            LASTV = N
+         END IF
+         I = 1
+!     Look for the last non-zero row in V.
+         DO WHILE( LASTV.GT.FIRSTV .AND. V( I ).EQ.ZERO )
+            FIRSTV = FIRSTV + 1
+            I = I + INCV
+         END DO
+         IF( APPLYLEFT ) THEN
+!     Scan for the last non-zero column in C(1:lastv,:).
+            LASTC = ILAZLC(LASTV, N, C, LDC)
+         ELSE
+!     Scan for the last non-zero row in C(:,1:lastv).
+            LASTC = ILAZLR(M, LASTV, C, LDC)
+         END IF
+      END IF
+      IF( LASTC.EQ.0 ) THEN
+         RETURN
+      END IF
+      IF( APPLYLEFT ) THEN
+*
+*        Form  H * C
+*
+         IF( LASTV.EQ.FIRSTV ) THEN        
+*
+*           C(lastv,1:lastc) := ( 1 - tau ) * C(lastv,1:lastc)
+*
+            CALL ZSCAL( LASTC, ONE - TAU, C( LASTV, 1 ), LDC )
+         ELSE
+*
+*           w(1:lastc,1) := C(firstv:lastv-1,1:lastc)**T * v(firstv:lastv-1,1)
+*
+            CALL ZGEMV( 'Conjugate transpose', LASTV - FIRSTV, LASTC,
+     $                  ONE, C( FIRSTV, 1 ), LDC, V( I ), INCV, ZERO,
+     $                  WORK, 1 )
+*
+*           w(1:lastc,1) += C(lastv,1:lastc)**H * v(lastv,1)
+*
+            DO J = 1, LASTC
+               WORK( J ) = WORK( J ) + CONJG( C( LASTV, J ) )
+            END DO
+*
+*           C(lastv,1:lastc) += - tau * v(lastv,1) * w(1:lastc,1)**H
+*
+            DO J = 1, LASTC
+               C( LASTV, J ) = C( LASTV, J )
+     $                         - TAU * CONJG( WORK( J ) )
+            END DO
+*
+*           C(firstv:lastv-1,1:lastc) += - tau * v(firstv:lastv-1,1) * w(1:lastc,1)**H
+*
+            CALL ZGERC( LASTV - FIRSTV, LASTC, -TAU, V( I ), INCV,
+     $                  WORK, 1, C( FIRSTV, 1 ), LDC)
+         END IF
+      ELSE
+*
+*        Form  C * H
+*
+         IF( LASTV.EQ.FIRSTV ) THEN
+*
+*           C(1:lastc,lastv) := ( 1 - tau ) * C(1:lastc,lastv)
+*
+            CALL ZSCAL( LASTC, ONE - TAU, C( 1, LASTV ), 1 )
+         ELSE
+*
+*           w(1:lastc,1) := C(1:lastc,firstv:lastv-1) * v(firstv:lastv-1,1)
+*
+            CALL ZGEMV( 'No transpose', LASTC, LASTV - FIRSTV, ONE,
+     $                  C( 1, FIRSTV ), LDC, V( I ), INCV, ZERO,
+     $                  WORK, 1 )
+*
+*           w(1:lastc,1) += C(1:lastc,lastv) * v(lastv,1)
+*
+            CALL ZAXPY( LASTC, ONE, C( 1, LASTV ), 1, WORK, 1 )
+*
+*           C(1:lastc,lastv) += - tau * v(lastv,1) * w(1:lastc,1)
+*
+            CALL ZAXPY( LASTC, -TAU, WORK, 1, C( 1, LASTV ), 1 )
+*
+*           C(1:lastc,firstv:lastv-1) += - tau * w(1:lastc,1) * v(firstv:lastv-1)**H
+*
+            CALL ZGERC( LASTC, LASTV - FIRSTV, -TAU, WORK, 1, V( I ),
+     $                  INCV, C( 1, FIRSTV ), LDC )
+         END IF
+      END IF
+      RETURN
+*
+*     End of ZLARF1L
+*
+      END
diff --git a/SRC/zlarfb.f b/SRC/zlarfb.f
index c5f424db31..bb2dae6fdf 100644
--- a/SRC/zlarfb.f
+++ b/SRC/zlarfb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLARFB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarfb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarfb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -161,7 +159,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup larfb
 *
 *> \par Further Details:
 *  =====================
@@ -170,9 +168,8 @@
 *>
 *>  The shape of the matrix V and the storage of the vectors which define
 *>  the H(i) is best illustrated by the following example with n = 5 and
-*>  k = 3. The elements equal to 1 are not stored; the corresponding
-*>  array elements are modified but restored on exit. The rest of the
-*>  array is not used.
+*>  k = 3. The triangular part of V (including its diagonal) is not
+*>  referenced.
 *>
 *>  DIRECT = 'F' and STOREV = 'C':         DIRECT = 'F' and STOREV = 'R':
 *>
@@ -192,8 +189,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
+      SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V,
+     $                   LDV,
      $                   T, LDT, C, LDC, WORK, LDWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -265,20 +264,23 @@ SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1
 *
-               CALL ZTRMM( 'Right', 'Lower', 'No transpose', 'Unit', N,
+               CALL ZTRMM( 'Right', 'Lower', 'No transpose', 'Unit',
+     $                     N,
      $                     K, ONE, V, LDV, WORK, LDWORK )
                IF( M.GT.K ) THEN
 *
 *                 W := W + C2**H * V2
 *
-                  CALL ZGEMM( 'Conjugate transpose', 'No transpose', N,
+                  CALL ZGEMM( 'Conjugate transpose', 'No transpose',
+     $                        N,
      $                        K, M-K, ONE, C( K+1, 1 ), LDC,
      $                        V( K+1, 1 ), LDV, ONE, WORK, LDWORK )
                END IF
 *
 *              W := W * T**H  or  W * T
 *
-               CALL ZTRMM( 'Right', 'Upper', TRANST, 'Non-unit', N, K,
+               CALL ZTRMM( 'Right', 'Upper', TRANST, 'Non-unit', N,
+     $                     K,
      $                     ONE, T, LDT, WORK, LDWORK )
 *
 *              C := C - V * W**H
@@ -319,13 +321,15 @@ SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1
 *
-               CALL ZTRMM( 'Right', 'Lower', 'No transpose', 'Unit', M,
+               CALL ZTRMM( 'Right', 'Lower', 'No transpose', 'Unit',
+     $                     M,
      $                     K, ONE, V, LDV, WORK, LDWORK )
                IF( N.GT.K ) THEN
 *
 *                 W := W + C2 * V2
 *
-                  CALL ZGEMM( 'No transpose', 'No transpose', M, K, N-K,
+                  CALL ZGEMM( 'No transpose', 'No transpose', M, K,
+     $                        N-K,
      $                        ONE, C( 1, K+1 ), LDC, V( K+1, 1 ), LDV,
      $                        ONE, WORK, LDWORK )
                END IF
@@ -341,7 +345,8 @@ SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 C2 := C2 - W * V2**H
 *
-                  CALL ZGEMM( 'No transpose', 'Conjugate transpose', M,
+                  CALL ZGEMM( 'No transpose', 'Conjugate transpose',
+     $                        M,
      $                        N-K, K, -ONE, WORK, LDWORK, V( K+1, 1 ),
      $                        LDV, ONE, C( 1, K+1 ), LDC )
                END IF
@@ -376,26 +381,30 @@ SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *              W := C2**H
 *
                DO 70 J = 1, K
-                  CALL ZCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ), 1 )
+                  CALL ZCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ),
+     $                        1 )
                   CALL ZLACGV( N, WORK( 1, J ), 1 )
    70          CONTINUE
 *
 *              W := W * V2
 *
-               CALL ZTRMM( 'Right', 'Upper', 'No transpose', 'Unit', N,
+               CALL ZTRMM( 'Right', 'Upper', 'No transpose', 'Unit',
+     $                     N,
      $                     K, ONE, V( M-K+1, 1 ), LDV, WORK, LDWORK )
                IF( M.GT.K ) THEN
 *
 *                 W := W + C1**H * V1
 *
-                  CALL ZGEMM( 'Conjugate transpose', 'No transpose', N,
+                  CALL ZGEMM( 'Conjugate transpose', 'No transpose',
+     $                        N,
      $                        K, M-K, ONE, C, LDC, V, LDV, ONE, WORK,
      $                        LDWORK )
                END IF
 *
 *              W := W * T**H  or  W * T
 *
-               CALL ZTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K,
+               CALL ZTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N,
+     $                     K,
      $                     ONE, T, LDT, WORK, LDWORK )
 *
 *              C := C - V * W**H
@@ -438,13 +447,15 @@ SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V2
 *
-               CALL ZTRMM( 'Right', 'Upper', 'No transpose', 'Unit', M,
+               CALL ZTRMM( 'Right', 'Upper', 'No transpose', 'Unit',
+     $                     M,
      $                     K, ONE, V( N-K+1, 1 ), LDV, WORK, LDWORK )
                IF( N.GT.K ) THEN
 *
 *                 W := W + C1 * V1
 *
-                  CALL ZGEMM( 'No transpose', 'No transpose', M, K, N-K,
+                  CALL ZGEMM( 'No transpose', 'No transpose', M, K,
+     $                        N-K,
      $                        ONE, C, LDC, V, LDV, ONE, WORK, LDWORK )
                END IF
 *
@@ -459,7 +470,8 @@ SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 C1 := C1 - W * V1**H
 *
-                  CALL ZGEMM( 'No transpose', 'Conjugate transpose', M,
+                  CALL ZGEMM( 'No transpose', 'Conjugate transpose',
+     $                        M,
      $                        N-K, K, -ONE, WORK, LDWORK, V, LDV, ONE,
      $                        C, LDC )
                END IF
@@ -517,7 +529,8 @@ SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * T**H  or  W * T
 *
-               CALL ZTRMM( 'Right', 'Upper', TRANST, 'Non-unit', N, K,
+               CALL ZTRMM( 'Right', 'Upper', TRANST, 'Non-unit', N,
+     $                     K,
      $                     ONE, T, LDT, WORK, LDWORK )
 *
 *              C := C - V**H * W**H
@@ -534,7 +547,8 @@ SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V1
 *
-               CALL ZTRMM( 'Right', 'Upper', 'No transpose', 'Unit', N,
+               CALL ZTRMM( 'Right', 'Upper', 'No transpose', 'Unit',
+     $                     N,
      $                     K, ONE, V, LDV, WORK, LDWORK )
 *
 *              C1 := C1 - W**H
@@ -565,7 +579,8 @@ SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 W := W + C2 * V2**H
 *
-                  CALL ZGEMM( 'No transpose', 'Conjugate transpose', M,
+                  CALL ZGEMM( 'No transpose', 'Conjugate transpose',
+     $                        M,
      $                        K, N-K, ONE, C( 1, K+1 ), LDC,
      $                        V( 1, K+1 ), LDV, ONE, WORK, LDWORK )
                END IF
@@ -581,14 +596,16 @@ SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 C2 := C2 - W * V2
 *
-                  CALL ZGEMM( 'No transpose', 'No transpose', M, N-K, K,
+                  CALL ZGEMM( 'No transpose', 'No transpose', M, N-K,
+     $                        K,
      $                        -ONE, WORK, LDWORK, V( 1, K+1 ), LDV, ONE,
      $                        C( 1, K+1 ), LDC )
                END IF
 *
 *              W := W * V1
 *
-               CALL ZTRMM( 'Right', 'Upper', 'No transpose', 'Unit', M,
+               CALL ZTRMM( 'Right', 'Upper', 'No transpose', 'Unit',
+     $                     M,
      $                     K, ONE, V, LDV, WORK, LDWORK )
 *
 *              C1 := C1 - W
@@ -616,7 +633,8 @@ SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *              W := C2**H
 *
                DO 190 J = 1, K
-                  CALL ZCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ), 1 )
+                  CALL ZCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ),
+     $                        1 )
                   CALL ZLACGV( N, WORK( 1, J ), 1 )
   190          CONTINUE
 *
@@ -636,7 +654,8 @@ SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * T**H  or  W * T
 *
-               CALL ZTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K,
+               CALL ZTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N,
+     $                     K,
      $                     ONE, T, LDT, WORK, LDWORK )
 *
 *              C := C - V**H * W**H
@@ -652,7 +671,8 @@ SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *              W := W * V2
 *
-               CALL ZTRMM( 'Right', 'Lower', 'No transpose', 'Unit', N,
+               CALL ZTRMM( 'Right', 'Lower', 'No transpose', 'Unit',
+     $                     N,
      $                     K, ONE, V( 1, M-K+1 ), LDV, WORK, LDWORK )
 *
 *              C2 := C2 - W**H
@@ -685,7 +705,8 @@ SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 W := W + C1 * V1**H
 *
-                  CALL ZGEMM( 'No transpose', 'Conjugate transpose', M,
+                  CALL ZGEMM( 'No transpose', 'Conjugate transpose',
+     $                        M,
      $                        K, N-K, ONE, C, LDC, V, LDV, ONE, WORK,
      $                        LDWORK )
                END IF
@@ -701,13 +722,15 @@ SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
 *
 *                 C1 := C1 - W * V1
 *
-                  CALL ZGEMM( 'No transpose', 'No transpose', M, N-K, K,
+                  CALL ZGEMM( 'No transpose', 'No transpose', M, N-K,
+     $                        K,
      $                        -ONE, WORK, LDWORK, V, LDV, ONE, C, LDC )
                END IF
 *
 *              W := W * V2
 *
-               CALL ZTRMM( 'Right', 'Lower', 'No transpose', 'Unit', M,
+               CALL ZTRMM( 'Right', 'Lower', 'No transpose', 'Unit',
+     $                     M,
      $                     K, ONE, V( 1, N-K+1 ), LDV, WORK, LDWORK )
 *
 *              C1 := C1 - W
diff --git a/SRC/zlarfb_gett.f b/SRC/zlarfb_gett.f
index 4a3c4dcf19..302d28c0cd 100644
--- a/SRC/zlarfb_gett.f
+++ b/SRC/zlarfb_gett.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLARFB_GETT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarfb_gett.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarfb_gett.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -157,7 +155,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup larfb_gett
 *
 *> \par Contributors:
 *  ==================
@@ -452,7 +450,7 @@ SUBROUTINE ZLARFB_GETT( IDENT, M, N, K, T, LDT, A, LDA, B, LDB,
          IF( LNOTIDENT ) THEN
 *
 *           col2_(2) Compute W2: = (V1**H) * W2 = (A1**H) * W2,
-*           V1 is not an identy matrix, but unit lower-triangular
+*           V1 is not an identity matrix, but unit lower-triangular
 *           V1 stored in A1 (diagonal ones are not stored).
 *
 *
diff --git a/SRC/zlarfg.f b/SRC/zlarfg.f
index d69796cadc..576d9c64d5 100644
--- a/SRC/zlarfg.f
+++ b/SRC/zlarfg.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLARFG + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarfg.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarfg.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -99,10 +97,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup larfg
 *
 *  =====================================================================
       SUBROUTINE ZLARFG( N, ALPHA, X, INCX, TAU )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlarfgp.f b/SRC/zlarfgp.f
index 77eba8e869..29a6b824f7 100644
--- a/SRC/zlarfgp.f
+++ b/SRC/zlarfgp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLARFGP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarfgp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarfgp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup larfgp
 *
 *  =====================================================================
       SUBROUTINE ZLARFGP( N, ALPHA, X, INCX, TAU )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -122,13 +121,14 @@ SUBROUTINE ZLARFGP( N, ALPHA, X, INCX, TAU )
 *     ..
 *     .. Local Scalars ..
       INTEGER            J, KNT
-      DOUBLE PRECISION   ALPHI, ALPHR, BETA, BIGNUM, SMLNUM, XNORM
+      DOUBLE PRECISION   ALPHI, ALPHR, BETA, BIGNUM, EPS, SMLNUM, XNORM
       COMPLEX*16         SAVEALPHA
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION   DLAMCH, DLAPY3, DLAPY2, DZNRM2
       COMPLEX*16         ZLADIV
-      EXTERNAL           DLAMCH, DLAPY3, DLAPY2, DZNRM2, ZLADIV
+      EXTERNAL           DLAMCH, DLAPY3, DLAPY2, DZNRM2,
+     $                   ZLADIV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCMPLX, DIMAG, SIGN
@@ -143,37 +143,28 @@ SUBROUTINE ZLARFGP( N, ALPHA, X, INCX, TAU )
          RETURN
       END IF
 *
+      EPS = DLAMCH( 'Precision' )
       XNORM = DZNRM2( N-1, X, INCX )
       ALPHR = DBLE( ALPHA )
       ALPHI = DIMAG( ALPHA )
 *
-      IF( XNORM.EQ.ZERO ) THEN
+      IF( XNORM.LE.EPS*ABS(ALPHA) .AND. ALPHI.EQ.ZERO ) THEN
 *
 *        H  =  [1-alpha/abs(alpha) 0; 0 I], sign chosen so ALPHA >= 0.
 *
-         IF( ALPHI.EQ.ZERO ) THEN
-            IF( ALPHR.GE.ZERO ) THEN
-*              When TAU.eq.ZERO, the vector is special-cased to be
-*              all zeros in the application routines.  We do not need
-*              to clear it.
-               TAU = ZERO
-            ELSE
-*              However, the application routines rely on explicit
-*              zero checks when TAU.ne.ZERO, and we must clear X.
-               TAU = TWO
-               DO J = 1, N-1
-                  X( 1 + (J-1)*INCX ) = ZERO
-               END DO
-               ALPHA = -ALPHA
-            END IF
+         IF( ALPHR.GE.ZERO ) THEN
+*           When TAU.eq.ZERO, the vector is special-cased to be
+*           all zeros in the application routines.  We do not need
+*           to clear it.
+            TAU = ZERO
          ELSE
-*           Only "reflecting" the diagonal entry to be real and non-negative.
-            XNORM = DLAPY2( ALPHR, ALPHI )
-            TAU = DCMPLX( ONE - ALPHR / XNORM, -ALPHI / XNORM )
+*           However, the application routines rely on explicit
+*           zero checks when TAU.ne.ZERO, and we must clear X.
+            TAU = TWO
             DO J = 1, N-1
                X( 1 + (J-1)*INCX ) = ZERO
             END DO
-            ALPHA = XNORM
+            ALPHA = -ALPHA
          END IF
       ELSE
 *
diff --git a/SRC/zlarft.f b/SRC/zlarft.f
index 5ad0996fab..efd52037d3 100644
--- a/SRC/zlarft.f
+++ b/SRC/zlarft.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLARFT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarft.f">
 *> [TGZ]</a>
@@ -13,12 +12,11 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarft.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+*       RECURSIVE SUBROUTINE ZLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
 *
 *       .. Scalar Arguments ..
 *       CHARACTER          DIRECT, STOREV
@@ -130,7 +128,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup larft
 *
 *> \par Further Details:
 *  =====================
@@ -159,166 +157,485 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+      RECURSIVE SUBROUTINE ZLARFT( DIRECT, STOREV, N, K, V, LDV,
+     $                             TAU, T, LDT )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *
-*     .. Scalar Arguments ..
-      CHARACTER          DIRECT, STOREV
-      INTEGER            K, LDT, LDV, N
+*        .. Scalar Arguments
+*
+      CHARACTER         DIRECT, STOREV
+      INTEGER           K, LDT, LDV, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         T( LDT, * ), TAU( * ), V( LDV, * )
-*     ..
 *
-*  =====================================================================
+      COMPLEX*16        T( LDT, * ), TAU( * ), V( LDV, * )
+*     ..
 *
 *     .. Parameters ..
-      COMPLEX*16         ONE, ZERO
-      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
-     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
-*     ..
+*
+      COMPLEX*16        ONE, NEG_ONE, ZERO
+      PARAMETER(ONE=(1.0D+0,0.0D+0), ZERO = (0.0D+0,0.0D+0),
+     $            NEG_ONE=(-1.0D+0,0.0D+0))
+*
 *     .. Local Scalars ..
-      INTEGER            I, J, PREVLASTV, LASTV
-*     ..
+*
+      INTEGER           I,J,L,NX
+      LOGICAL           QR,LQ,QL,DIRF,COLV
+*
 *     .. External Subroutines ..
-      EXTERNAL           ZGEMV, ZTRMV, ZGEMM
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      EXTERNAL           LSAME
+*
+      EXTERNAL          ZTRMM,ZGEMM,ZLACPY
+*
+*     .. External Functions..
+*
+      LOGICAL           LSAME
+      INTEGER           ILAENV
+      EXTERNAL          LSAME, ILAENV
+*
+*     .. Intrinsic Functions..
+*
+      INTRINSIC         CONJG
+*     
+*     The general scheme used is inspired by the approach inside DGEQRT3
+*     which was (at the time of writing this code):
+*     Based on the algorithm of Elmroth and Gustavson,
+*     IBM J. Res. Develop. Vol 44 No. 4 July 2000.
 *     ..
 *     .. Executable Statements ..
 *
 *     Quick return if possible
 *
-      IF( N.EQ.0 )
-     $   RETURN
-*
-      IF( LSAME( DIRECT, 'F' ) ) THEN
-         PREVLASTV = N
-         DO I = 1, K
-            PREVLASTV = MAX( PREVLASTV, I )
-            IF( TAU( I ).EQ.ZERO ) THEN
-*
-*              H(i)  =  I
-*
-               DO J = 1, I
-                  T( J, I ) = ZERO
-               END DO
-            ELSE
-*
-*              general case
-*
-               IF( LSAME( STOREV, 'C' ) ) THEN
-*                 Skip any trailing zeros.
-                  DO LASTV = N, I+1, -1
-                     IF( V( LASTV, I ).NE.ZERO ) EXIT
-                  END DO
-                  DO J = 1, I-1
-                     T( J, I ) = -TAU( I ) * CONJG( V( I , J ) )
-                  END DO
-                  J = MIN( LASTV, PREVLASTV )
-*
-*                 T(1:i-1,i) := - tau(i) * V(i:j,1:i-1)**H * V(i:j,i)
-*
-                  CALL ZGEMV( 'Conjugate transpose', J-I, I-1,
-     $                        -TAU( I ), V( I+1, 1 ), LDV,
-     $                        V( I+1, I ), 1, ONE, T( 1, I ), 1 )
-               ELSE
-*                 Skip any trailing zeros.
-                  DO LASTV = N, I+1, -1
-                     IF( V( I, LASTV ).NE.ZERO ) EXIT
-                  END DO
-                  DO J = 1, I-1
-                     T( J, I ) = -TAU( I ) * V( J , I )
-                  END DO
-                  J = MIN( LASTV, PREVLASTV )
-*
-*                 T(1:i-1,i) := - tau(i) * V(1:i-1,i:j) * V(i,i:j)**H
-*
-                  CALL ZGEMM( 'N', 'C', I-1, 1, J-I, -TAU( I ),
-     $                        V( 1, I+1 ), LDV, V( I, I+1 ), LDV,
-     $                        ONE, T( 1, I ), LDT )
-               END IF
-*
-*              T(1:i-1,i) := T(1:i-1,1:i-1) * T(1:i-1,i)
-*
-               CALL ZTRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T,
-     $                     LDT, T( 1, I ), 1 )
-               T( I, I ) = TAU( I )
-               IF( I.GT.1 ) THEN
-                  PREVLASTV = MAX( PREVLASTV, LASTV )
-               ELSE
-                  PREVLASTV = LASTV
-               END IF
-             END IF
+      IF(N.EQ.0.OR.K.EQ.0) THEN
+         RETURN
+      END IF
+*
+*     Base case
+*
+      IF(N.EQ.1.OR.K.EQ.1) THEN
+         T(1,1) = TAU(1)
+         RETURN
+      END IF
+*
+*     Determine when to cross over into the level 2 based implementation
+*
+      NX = ILAENV(3, "ZLARFT", DIRECT // STOREV, N, K, -1, -1)
+      IF(K.LT.NX) THEN
+         CALL ZLARFT_LVL2(DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT)
+         RETURN
+      END IF
+*
+*     Beginning of executable statements
+*
+      L = K / 2
+*
+*     Determine what kind of Q we need to compute
+*     We assume that if the user doesn't provide 'F' for DIRECT,
+*     then they meant to provide 'B' and if they don't provide
+*     'C' for STOREV, then they meant to provide 'R'
+*
+      DIRF = LSAME(DIRECT,'F')
+      COLV = LSAME(STOREV,'C')
+*
+*     QR happens when we have forward direction in column storage
+*
+      QR = DIRF.AND.COLV
+*
+*     LQ happens when we have forward direction in row storage
+*
+      LQ = DIRF.AND.(.NOT.COLV)
+*
+*     QL happens when we have backward direction in column storage
+*
+      QL = (.NOT.DIRF).AND.COLV
+*
+*     The last case is RQ. Due to how we structured this, if the
+*     above 3 are false, then RQ must be true, so we never store 
+*     this
+*     RQ happens when we have backward direction in row storage
+*     RQ = (.NOT.DIRF).AND.(.NOT.COLV)
+*
+      IF(QR) THEN
+*
+*        Break V apart into 6 components
+*
+*        V = |---------------|
+*            |V_{1,1} 0      |
+*            |V_{2,1} V_{2,2}|
+*            |V_{3,1} V_{3,2}|
+*            |---------------|
+*
+*        V_{1,1}\in\C^{l,l}      unit lower triangular
+*        V_{2,1}\in\C^{k-l,l}    rectangular
+*        V_{3,1}\in\C^{n-k,l}    rectangular
+*        
+*        V_{2,2}\in\C^{k-l,k-l}  unit lower triangular
+*        V_{3,2}\in\C^{n-k,k-l}  rectangular
+*
+*        We will construct the T matrix 
+*        T = |---------------|
+*            |T_{1,1} T_{1,2}|
+*            |0       T_{2,2}|
+*            |---------------|
+*
+*        T is the triangular factor obtained from block reflectors. 
+*        To motivate the structure, assume we have already computed T_{1,1}
+*        and T_{2,2}. Then collect the associated reflectors in V_1 and V_2
+*
+*        T_{1,1}\in\C^{l, l}     upper triangular
+*        T_{2,2}\in\C^{k-l, k-l} upper triangular
+*        T_{1,2}\in\C^{l, k-l}   rectangular
+*
+*        Where l = floor(k/2)
+*
+*        Then, consider the product:
+*        
+*        (I - V_1*T_{1,1}*V_1')*(I - V_2*T_{2,2}*V_2')
+*        = I - V_1*T_{1,1}*V_1' - V_2*T_{2,2}*V_2' + V_1*T_{1,1}*V_1'*V_2*T_{2,2}*V_2'
+*        
+*        Define T_{1,2} = -T_{1,1}*V_1'*V_2*T_{2,2}
+*        
+*        Then, we can define the matrix V as 
+*        V = |-------|
+*            |V_1 V_2|
+*            |-------|
+*        
+*        So, our product is equivalent to the matrix product
+*        I - V*T*V'
+*        This means, we can compute T_{1,1} and T_{2,2}, then use this information
+*        to compute T_{1,2}
+*
+*        Compute T_{1,1} recursively
+*
+         CALL ZLARFT(DIRECT, STOREV, N, L, V, LDV, TAU, T, LDT)
+*
+*        Compute T_{2,2} recursively
+*
+         CALL ZLARFT(DIRECT, STOREV, N-L, K-L, V(L+1, L+1), LDV, 
+     $               TAU(L+1), T(L+1, L+1), LDT)
+*
+*        Compute T_{1,2} 
+*        T_{1,2} = V_{2,1}'
+*
+         DO J = 1, L
+            DO I = 1, K-L
+               T(J, L+I) = CONJG(V(L+I, J))
+            END DO
          END DO
-      ELSE
-         PREVLASTV = 1
-         DO I = K, 1, -1
-            IF( TAU( I ).EQ.ZERO ) THEN
-*
-*              H(i)  =  I
-*
-               DO J = I, K
-                  T( J, I ) = ZERO
-               END DO
-            ELSE
-*
-*              general case
-*
-               IF( I.LT.K ) THEN
-                  IF( LSAME( STOREV, 'C' ) ) THEN
-*                    Skip any leading zeros.
-                     DO LASTV = 1, I-1
-                        IF( V( LASTV, I ).NE.ZERO ) EXIT
-                     END DO
-                     DO J = I+1, K
-                        T( J, I ) = -TAU( I ) * CONJG( V( N-K+I , J ) )
-                     END DO
-                     J = MAX( LASTV, PREVLASTV )
-*
-*                    T(i+1:k,i) = -tau(i) * V(j:n-k+i,i+1:k)**H * V(j:n-k+i,i)
-*
-                     CALL ZGEMV( 'Conjugate transpose', N-K+I-J, K-I,
-     $                           -TAU( I ), V( J, I+1 ), LDV, V( J, I ),
-     $                           1, ONE, T( I+1, I ), 1 )
-                  ELSE
-*                    Skip any leading zeros.
-                     DO LASTV = 1, I-1
-                        IF( V( I, LASTV ).NE.ZERO ) EXIT
-                     END DO
-                     DO J = I+1, K
-                        T( J, I ) = -TAU( I ) * V( J, N-K+I )
-                     END DO
-                     J = MAX( LASTV, PREVLASTV )
-*
-*                    T(i+1:k,i) = -tau(i) * V(i+1:k,j:n-k+i) * V(i,j:n-k+i)**H
-*
-                     CALL ZGEMM( 'N', 'C', K-I, 1, N-K+I-J, -TAU( I ),
-     $                           V( I+1, J ), LDV, V( I, J ), LDV,
-     $                           ONE, T( I+1, I ), LDT )
-                  END IF
-*
-*                 T(i+1:k,i) := T(i+1:k,i+1:k) * T(i+1:k,i)
-*
-                  CALL ZTRMV( 'Lower', 'No transpose', 'Non-unit', K-I,
-     $                        T( I+1, I+1 ), LDT, T( I+1, I ), 1 )
-                  IF( I.GT.1 ) THEN
-                     PREVLASTV = MIN( PREVLASTV, LASTV )
-                  ELSE
-                     PREVLASTV = LASTV
-                  END IF
-               END IF
-               T( I, I ) = TAU( I )
-            END IF
+*
+*        T_{1,2} = T_{1,2}*V_{2,2}
+*
+         CALL ZTRMM('Right', 'Lower', 'No transpose', 'Unit', L,
+     $               K-L, ONE, V(L+1, L+1), LDV, T(1, L+1), LDT)
+
+*
+*        T_{1,2} = V_{3,1}'*V_{3,2} + T_{1,2}
+*        Note: We assume K <= N, and GEMM will do nothing if N=K
+*
+         CALL ZGEMM('Conjugate', 'No transpose', L, K-L, N-K, ONE, 
+     $               V(K+1, 1), LDV, V(K+1, L+1), LDV, ONE, 
+     $               T(1, L+1), LDT)
+*
+*        At this point, we have that T_{1,2} = V_1'*V_2
+*        All that is left is to pre and post multiply by -T_{1,1} and T_{2,2}
+*        respectively.
+*
+*        T_{1,2} = -T_{1,1}*T_{1,2}
+*
+         CALL ZTRMM('Left', 'Upper', 'No transpose', 'Non-unit', L,
+     $               K-L, NEG_ONE, T, LDT, T(1, L+1), LDT)
+*
+*        T_{1,2} = T_{1,2}*T_{2,2}
+*
+         CALL ZTRMM('Right', 'Upper', 'No transpose', 'Non-unit', L, 
+     $               K-L, ONE, T(L+1, L+1), LDT, T(1, L+1), LDT)
+
+      ELSE IF(LQ) THEN
+*
+*        Break V apart into 6 components
+*
+*        V = |----------------------|
+*            |V_{1,1} V_{1,2} V{1,3}|
+*            |0       V_{2,2} V{2,3}|
+*            |----------------------|
+*
+*        V_{1,1}\in\C^{l,l}      unit upper triangular
+*        V_{1,2}\in\C^{l,k-l}    rectangular
+*        V_{1,3}\in\C^{l,n-k}    rectangular
+*        
+*        V_{2,2}\in\C^{k-l,k-l}  unit upper triangular
+*        V_{2,3}\in\C^{k-l,n-k}  rectangular
+*
+*        Where l = floor(k/2)
+*
+*        We will construct the T matrix 
+*        T = |---------------|
+*            |T_{1,1} T_{1,2}|
+*            |0       T_{2,2}|
+*            |---------------|
+*
+*        T is the triangular factor obtained from block reflectors. 
+*        To motivate the structure, assume we have already computed T_{1,1}
+*        and T_{2,2}. Then collect the associated reflectors in V_1 and V_2
+*
+*        T_{1,1}\in\C^{l, l}         upper triangular
+*        T_{2,2}\in\C^{k-l, k-l}     upper triangular
+*        T_{1,2}\in\C^{l, k-l}       rectangular
+*
+*        Then, consider the product:
+*        
+*        (I - V_1'*T_{1,1}*V_1)*(I - V_2'*T_{2,2}*V_2)
+*        = I - V_1'*T_{1,1}*V_1 - V_2'*T_{2,2}*V_2 + V_1'*T_{1,1}*V_1*V_2'*T_{2,2}*V_2
+*        
+*        Define T_{1,2} = -T_{1,1}*V_1*V_2'*T_{2,2}
+*        
+*        Then, we can define the matrix V as 
+*        V = |---|
+*            |V_1|
+*            |V_2|
+*            |---|
+*        
+*        So, our product is equivalent to the matrix product
+*        I - V'*T*V
+*        This means, we can compute T_{1,1} and T_{2,2}, then use this information
+*        to compute T_{1,2}
+*
+*        Compute T_{1,1} recursively
+*
+         CALL ZLARFT(DIRECT, STOREV, N, L, V, LDV, TAU, T, LDT)
+*
+*        Compute T_{2,2} recursively
+*
+         CALL ZLARFT(DIRECT, STOREV, N-L, K-L, V(L+1, L+1), LDV, 
+     $               TAU(L+1), T(L+1, L+1), LDT)
+
+*
+*        Compute T_{1,2}
+*        T_{1,2} = V_{1,2}
+*
+         CALL ZLACPY('All', L, K-L, V(1, L+1), LDV, T(1, L+1), LDT)
+*
+*        T_{1,2} = T_{1,2}*V_{2,2}'
+*
+         CALL ZTRMM('Right', 'Upper', 'Conjugate', 'Unit', L, K-L,
+     $               ONE, V(L+1, L+1), LDV, T(1, L+1), LDT)
+
+*
+*        T_{1,2} = V_{1,3}*V_{2,3}' + T_{1,2}
+*        Note: We assume K <= N, and GEMM will do nothing if N=K
+*
+         CALL ZGEMM('No transpose', 'Conjugate', L, K-L, N-K, ONE,
+     $               V(1, K+1), LDV, V(L+1, K+1), LDV, ONE,
+     $               T(1, L+1), LDT)
+*
+*        At this point, we have that T_{1,2} = V_1*V_2'
+*        All that is left is to pre and post multiply by -T_{1,1} and T_{2,2}
+*        respectively.
+*
+*        T_{1,2} = -T_{1,1}*T_{1,2}
+*
+         CALL ZTRMM('Left', 'Upper', 'No transpose', 'Non-unit', L,
+     $               K-L, NEG_ONE, T, LDT, T(1, L+1), LDT)
+
+*
+*        T_{1,2} = T_{1,2}*T_{2,2}
+*
+         CALL ZTRMM('Right', 'Upper', 'No transpose', 'Non-unit', L,
+     $               K-L, ONE, T(L+1, L+1), LDT, T(1, L+1), LDT)
+      ELSE IF(QL) THEN
+*
+*        Break V apart into 6 components
+*
+*        V = |---------------|
+*            |V_{1,1} V_{1,2}|
+*            |V_{2,1} V_{2,2}|
+*            |0       V_{3,2}|
+*            |---------------|
+*
+*        V_{1,1}\in\C^{n-k,k-l}  rectangular
+*        V_{2,1}\in\C^{k-l,k-l}  unit upper triangular
+*        
+*        V_{1,2}\in\C^{n-k,l}    rectangular
+*        V_{2,2}\in\C^{k-l,l}    rectangular
+*        V_{3,2}\in\C^{l,l}      unit upper triangular
+*
+*        We will construct the T matrix 
+*        T = |---------------|
+*            |T_{1,1} 0      |
+*            |T_{2,1} T_{2,2}|
+*            |---------------|
+*
+*        T is the triangular factor obtained from block reflectors. 
+*        To motivate the structure, assume we have already computed T_{1,1}
+*        and T_{2,2}. Then collect the associated reflectors in V_1 and V_2
+*
+*        T_{1,1}\in\C^{k-l, k-l} non-unit lower triangular
+*        T_{2,2}\in\C^{l, l}     non-unit lower triangular
+*        T_{2,1}\in\C^{k-l, l}   rectangular
+*
+*        Where l = floor(k/2)
+*
+*        Then, consider the product:
+*        
+*        (I - V_2*T_{2,2}*V_2')*(I - V_1*T_{1,1}*V_1')
+*        = I - V_2*T_{2,2}*V_2' - V_1*T_{1,1}*V_1' + V_2*T_{2,2}*V_2'*V_1*T_{1,1}*V_1'
+*        
+*        Define T_{2,1} = -T_{2,2}*V_2'*V_1*T_{1,1}
+*        
+*        Then, we can define the matrix V as 
+*        V = |-------|
+*            |V_1 V_2|
+*            |-------|
+*        
+*        So, our product is equivalent to the matrix product
+*        I - V*T*V'
+*        This means, we can compute T_{1,1} and T_{2,2}, then use this information
+*        to compute T_{2,1}
+*
+*        Compute T_{1,1} recursively
+*
+         CALL ZLARFT(DIRECT, STOREV, N-L, K-L, V, LDV, TAU, T, LDT)
+*
+*        Compute T_{2,2} recursively
+*
+         CALL ZLARFT(DIRECT, STOREV, N, L, V(1, K-L+1), LDV,
+     $               TAU(K-L+1), T(K-L+1, K-L+1), LDT)
+*
+*        Compute T_{2,1}
+*        T_{2,1} = V_{2,2}'
+*
+         DO J = 1, K-L
+            DO I = 1, L
+               T(K-L+I, J) = CONJG(V(N-K+J, K-L+I))
+            END DO
          END DO
-      END IF
-      RETURN
 *
-*     End of ZLARFT
+*        T_{2,1} = T_{2,1}*V_{2,1}
+*
+         CALL ZTRMM('Right', 'Upper', 'No transpose', 'Unit', L,
+     $               K-L, ONE, V(N-K+1, 1), LDV, T(K-L+1, 1), LDT)
+
+*
+*        T_{2,1} = V_{2,2}'*V_{2,1} + T_{2,1}
+*        Note: We assume K <= N, and GEMM will do nothing if N=K
+*
+         CALL ZGEMM('Conjugate', 'No transpose', L, K-L, N-K, ONE,
+     $               V(1, K-L+1), LDV, V, LDV, ONE, T(K-L+1, 1),
+     $               LDT)
+*
+*        At this point, we have that T_{2,1} = V_2'*V_1
+*        All that is left is to pre and post multiply by -T_{2,2} and T_{1,1}
+*        respectively.
+*
+*        T_{2,1} = -T_{2,2}*T_{2,1}
 *
-      END
+         CALL ZTRMM('Left', 'Lower', 'No transpose', 'Non-unit', L,
+     $               K-L, NEG_ONE, T(K-L+1, K-L+1), LDT,
+     $               T(K-L+1, 1), LDT)
+*
+*        T_{2,1} = T_{2,1}*T_{1,1}
+*
+         CALL ZTRMM('Right', 'Lower', 'No transpose', 'Non-unit', L,
+     $               K-L, ONE, T, LDT, T(K-L+1, 1), LDT)
+      ELSE
+*
+*        Else means RQ case
+*
+*        Break V apart into 6 components
+*
+*        V = |-----------------------|
+*            |V_{1,1} V_{1,2} 0      |
+*            |V_{2,1} V_{2,2} V_{2,3}|
+*            |-----------------------|
+*
+*        V_{1,1}\in\C^{k-l,n-k}  rectangular
+*        V_{1,2}\in\C^{k-l,k-l}  unit lower triangular
+*
+*        V_{2,1}\in\C^{l,n-k}    rectangular
+*        V_{2,2}\in\C^{l,k-l}    rectangular
+*        V_{2,3}\in\C^{l,l}      unit lower triangular
+*
+*        We will construct the T matrix 
+*        T = |---------------|
+*            |T_{1,1} 0      |
+*            |T_{2,1} T_{2,2}|
+*            |---------------|
+*
+*        T is the triangular factor obtained from block reflectors. 
+*        To motivate the structure, assume we have already computed T_{1,1}
+*        and T_{2,2}. Then collect the associated reflectors in V_1 and V_2
+*
+*        T_{1,1}\in\C^{k-l, k-l} non-unit lower triangular
+*        T_{2,2}\in\C^{l, l}     non-unit lower triangular
+*        T_{2,1}\in\C^{k-l, l}   rectangular
+*
+*        Where l = floor(k/2)
+*
+*        Then, consider the product:
+*        
+*        (I - V_2'*T_{2,2}*V_2)*(I - V_1'*T_{1,1}*V_1)
+*        = I - V_2'*T_{2,2}*V_2 - V_1'*T_{1,1}*V_1 + V_2'*T_{2,2}*V_2*V_1'*T_{1,1}*V_1
+*        
+*        Define T_{2,1} = -T_{2,2}*V_2*V_1'*T_{1,1}
+*        
+*        Then, we can define the matrix V as 
+*        V = |---|
+*            |V_1|
+*            |V_2|
+*            |---|
+*        
+*        So, our product is equivalent to the matrix product
+*        I - V'*T*V
+*        This means, we can compute T_{1,1} and T_{2,2}, then use this information
+*        to compute T_{2,1}
+*
+*        Compute T_{1,1} recursively
+*
+         CALL ZLARFT(DIRECT, STOREV, N-L, K-L, V, LDV, TAU, T, LDT)
+*
+*        Compute T_{2,2} recursively
+*
+         CALL ZLARFT(DIRECT, STOREV, N, L, V(K-L+1, 1), LDV,
+     $               TAU(K-L+1), T(K-L+1, K-L+1), LDT)
+*
+*        Compute T_{2,1}
+*        T_{2,1} = V_{2,2}
+*
+         CALL ZLACPY('All', L, K-L, V(K-L+1, N-K+1), LDV,
+     $               T(K-L+1, 1), LDT)
+
+*
+*        T_{2,1} = T_{2,1}*V_{1,2}'
+*
+         CALL ZTRMM('Right', 'Lower', 'Conjugate', 'Unit', L, K-L,
+     $               ONE, V(1, N-K+1), LDV, T(K-L+1, 1), LDT)
+
+*
+*        T_{2,1} = V_{2,1}*V_{1,1}' + T_{2,1} 
+*        Note: We assume K <= N, and GEMM will do nothing if N=K
+*
+         CALL ZGEMM('No transpose', 'Conjugate', L, K-L, N-K, ONE, 
+     $               V(K-L+1, 1), LDV, V, LDV, ONE, T(K-L+1, 1),
+     $               LDT)
+
+*
+*        At this point, we have that T_{2,1} = V_2*V_1'
+*        All that is left is to pre and post multiply by -T_{2,2} and T_{1,1}
+*        respectively.
+*
+*        T_{2,1} = -T_{2,2}*T_{2,1}
+*
+         CALL ZTRMM('Left', 'Lower', 'No tranpose', 'Non-unit', L,
+     $               K-L, NEG_ONE, T(K-L+1, K-L+1), LDT, 
+     $               T(K-L+1, 1), LDT)
+
+*
+*        T_{2,1} = T_{2,1}*T_{1,1}
+*
+         CALL ZTRMM('Right', 'Lower', 'No tranpose', 'Non-unit', L,
+     $               K-L, ONE, T, LDT, T(K-L+1, 1), LDT)
+      END IF
+      END SUBROUTINE
diff --git a/SRC/zlarft_lvl2.f b/SRC/zlarft_lvl2.f
new file mode 100644
index 0000000000..808c7fdb25
--- /dev/null
+++ b/SRC/zlarft_lvl2.f
@@ -0,0 +1,327 @@
+*> \brief \b ZLARFT_LVL2: Level 2 BLAS version for terminating case of ZLARFT.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download ZLARFT_LVL2 + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarft.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlarft.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarft.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLARFT_LVL2( DIRECT, STOREV, N, K, V, LDV, TAU,
+*                    T, LDT )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          DIRECT, STOREV
+*       INTEGER            K, LDT, LDV, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         T( LDT, * ), TAU( * ), V( LDV, * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLARFT_LVL2 forms the triangular factor T of a complex block reflector H
+*> of order n, which is defined as a product of k elementary reflectors.
+*>
+*> If DIRECT = 'F', H = H(1) H(2) . . . H(k) and T is upper triangular;
+*>
+*> If DIRECT = 'B', H = H(k) . . . H(2) H(1) and T is lower triangular.
+*>
+*> If STOREV = 'C', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th column of the array V, and
+*>
+*>    H  =  I - V * T * V**H
+*>
+*> If STOREV = 'R', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th row of the array V, and
+*>
+*>    H  =  I - V**H * T * V
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] DIRECT
+*> \verbatim
+*>          DIRECT is CHARACTER*1
+*>          Specifies the order in which the elementary reflectors are
+*>          multiplied to form the block reflector:
+*>          = 'F': H = H(1) H(2) . . . H(k) (Forward)
+*>          = 'B': H = H(k) . . . H(2) H(1) (Backward)
+*> \endverbatim
+*>
+*> \param[in] STOREV
+*> \verbatim
+*>          STOREV is CHARACTER*1
+*>          Specifies how the vectors which define the elementary
+*>          reflectors are stored (see also Further Details):
+*>          = 'C': columnwise
+*>          = 'R': rowwise
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the block reflector H. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The order of the triangular factor T (= the number of
+*>          elementary reflectors). K >= 1.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is COMPLEX*16 array, dimension
+*>                               (LDV,K) if STOREV = 'C'
+*>                               (LDV,N) if STOREV = 'R'
+*>          The matrix V. See further details.
+*> \endverbatim
+*>
+*> \param[in] LDV
+*> \verbatim
+*>          LDV is INTEGER
+*>          The leading dimension of the array V.
+*>          If STOREV = 'C', LDV >= max(1,N); if STOREV = 'R', LDV >= K.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i).
+*> \endverbatim
+*>
+*> \param[out] T
+*> \verbatim
+*>          T is COMPLEX*16 array, dimension (LDT,K)
+*>          The k by k triangular factor T of the block reflector.
+*>          If DIRECT = 'F', T is upper triangular; if DIRECT = 'B', T is
+*>          lower triangular. The rest of the array is not used.
+*> \endverbatim
+*>
+*> \param[in] LDT
+*> \verbatim
+*>          LDT is INTEGER
+*>          The leading dimension of the array T. LDT >= K.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup larft
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The shape of the matrix V and the storage of the vectors which define
+*>  the H(i) is best illustrated by the following example with n = 5 and
+*>  k = 3. The elements equal to 1 are not stored.
+*>
+*>  DIRECT = 'F' and STOREV = 'C':         DIRECT = 'F' and STOREV = 'R':
+*>
+*>               V = (  1       )                 V = (  1 v1 v1 v1 v1 )
+*>                   ( v1  1    )                     (     1 v2 v2 v2 )
+*>                   ( v1 v2  1 )                     (        1 v3 v3 )
+*>                   ( v1 v2 v3 )
+*>                   ( v1 v2 v3 )
+*>
+*>  DIRECT = 'B' and STOREV = 'C':         DIRECT = 'B' and STOREV = 'R':
+*>
+*>               V = ( v1 v2 v3 )                 V = ( v1 v1  1       )
+*>                   ( v1 v2 v3 )                     ( v2 v2 v2  1    )
+*>                   (  1 v2 v3 )                     ( v3 v3 v3 v3  1 )
+*>                   (     1 v3 )
+*>                   (        1 )
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE ZLARFT_LVL2( DIRECT, STOREV, N, K, V, LDV, TAU,
+     $            T, LDT )
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      CHARACTER          DIRECT, STOREV
+      INTEGER            K, LDT, LDV, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         T( LDT, * ), TAU( * ), V( LDV, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      COMPLEX*16         ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
+     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J, PREVLASTV, LASTV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZGEMV, ZTRMV, ZGEMM
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+*
+      IF( LSAME( DIRECT, 'F' ) ) THEN
+         PREVLASTV = N
+         DO I = 1, K
+            PREVLASTV = MAX( PREVLASTV, I )
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = 1, I
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( LSAME( STOREV, 'C' ) ) THEN
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( LASTV, I ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * CONJG( V( I , J ) )
+                  END DO
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(i:j,1:i-1)**H * V(i:j,i)
+*
+                  CALL ZGEMV( 'Conjugate transpose', J-I, I-1,
+     $                        -TAU( I ), V( I+1, 1 ), LDV,
+     $                        V( I+1, I ), 1, ONE, T( 1, I ), 1 )
+               ELSE
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( I, LASTV ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * V( J , I )
+                  END DO
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(1:i-1,i:j) * V(i,i:j)**H
+*
+                  CALL ZGEMM( 'N', 'C', I-1, 1, J-I, -TAU( I ),
+     $                        V( 1, I+1 ), LDV, V( I, I+1 ), LDV,
+     $                        ONE, T( 1, I ), LDT )
+               END IF
+*
+*              T(1:i-1,i) := T(1:i-1,1:i-1) * T(1:i-1,i)
+*
+               CALL ZTRMV( 'Upper', 'No transpose', 'Non-unit', I-1,
+     $                     T,
+     $                     LDT, T( 1, I ), 1 )
+               T( I, I ) = TAU( I )
+               IF( I.GT.1 ) THEN
+                  PREVLASTV = MAX( PREVLASTV, LASTV )
+               ELSE
+                  PREVLASTV = LASTV
+               END IF
+             END IF
+         END DO
+      ELSE
+         PREVLASTV = 1
+         DO I = K, 1, -1
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = I, K
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( I.LT.K ) THEN
+                  IF( LSAME( STOREV, 'C' ) ) THEN
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( LASTV, I ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * CONJG( V( N-K+I , J ) )
+                     END DO
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(j:n-k+i,i+1:k)**H * V(j:n-k+i,i)
+*
+                     CALL ZGEMV( 'Conjugate transpose', N-K+I-J, K-I,
+     $                           -TAU( I ), V( J, I+1 ), LDV, V( J, I ),
+     $                           1, ONE, T( I+1, I ), 1 )
+                  ELSE
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( I, LASTV ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * V( J, N-K+I )
+                     END DO
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(i+1:k,j:n-k+i) * V(i,j:n-k+i)**H
+*
+                     CALL ZGEMM( 'N', 'C', K-I, 1, N-K+I-J,
+     $                           -TAU( I ),
+     $                           V( I+1, J ), LDV, V( I, J ), LDV,
+     $                           ONE, T( I+1, I ), LDT )
+                  END IF
+*
+*                 T(i+1:k,i) := T(i+1:k,i+1:k) * T(i+1:k,i)
+*
+                  CALL ZTRMV( 'Lower', 'No transpose', 'Non-unit',
+     $                        K-I,
+     $                        T( I+1, I+1 ), LDT, T( I+1, I ), 1 )
+                  IF( I.GT.1 ) THEN
+                     PREVLASTV = MIN( PREVLASTV, LASTV )
+                  ELSE
+                     PREVLASTV = LASTV
+                  END IF
+               END IF
+               T( I, I ) = TAU( I )
+            END IF
+         END DO
+      END IF
+      RETURN
+*
+*     End of ZLARFT_LVL2
+*
+      END
diff --git a/SRC/zlarfx.f b/SRC/zlarfx.f
index c617fe552b..30602cb412 100644
--- a/SRC/zlarfx.f
+++ b/SRC/zlarfx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLARFX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarfx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarfx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -112,10 +110,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup larfx
 *
 *  =====================================================================
       SUBROUTINE ZLARFX( SIDE, M, N, V, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlarfy.f b/SRC/zlarfy.f
index 23169e97d9..6a00254bd3 100644
--- a/SRC/zlarfy.f
+++ b/SRC/zlarfy.f
@@ -101,10 +101,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup larfy
 *
 *  =====================================================================
       SUBROUTINE ZLARFY( UPLO, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlargv.f b/SRC/zlargv.f
index 1eef6b716c..8cf28b47f7 100644
--- a/SRC/zlargv.f
+++ b/SRC/zlargv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLARGV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlargv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlargv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -104,7 +102,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup largv
 *
 *> \par Further Details:
 *  =====================
@@ -119,6 +117,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZLARGV( N, X, INCX, Y, INCY, C, INCC )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlarnv.f b/SRC/zlarnv.f
index d82d404ded..d23af036cd 100644
--- a/SRC/zlarnv.f
+++ b/SRC/zlarnv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLARNV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarnv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarnv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -81,7 +79,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup larnv
 *
 *> \par Further Details:
 *  =====================
@@ -96,6 +94,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZLARNV( IDIST, ISEED, N, X )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlarrv.f b/SRC/zlarrv.f
index 51ec558f53..67c1e186af 100644
--- a/SRC/zlarrv.f
+++ b/SRC/zlarrv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLARRV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarrv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarrv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -266,7 +264,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup larrv
 *
 *> \par Contributors:
 *  ==================
@@ -283,6 +281,7 @@ SUBROUTINE ZLARRV( N, VL, VU, D, L, PIVMIN,
      $                   RTOL1, RTOL2, W, WERR, WGAP,
      $                   IBLOCK, INDEXW, GERS, Z, LDZ, ISUPPZ,
      $                   WORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -334,7 +333,8 @@ SUBROUTINE ZLARRV( N, VL, VU, D, L, PIVMIN,
       EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLARRB, DLARRF, ZDSCAL, ZLAR1V,
+      EXTERNAL           DCOPY, DLARRB, DLARRF, ZDSCAL,
+     $                   ZLAR1V,
      $                   ZLASET
 *     ..
 *     .. Intrinsic Functions ..
@@ -348,7 +348,7 @@ SUBROUTINE ZLARRV( N, VL, VU, D, L, PIVMIN,
 *
 *     Quick return if possible
 *
-      IF( N.LE.0 ) THEN
+      IF( (N.LE.0).OR.(M.LE.0) ) THEN
          RETURN
       END IF
 *
diff --git a/SRC/zlarscl2.f b/SRC/zlarscl2.f
index 4a1e1603a4..e090fcf71b 100644
--- a/SRC/zlarscl2.f
+++ b/SRC/zlarscl2.f
@@ -1,11 +1,10 @@
-*> \brief \b ZLARSCL2 performs reciprocal diagonal scaling on a vector.
+*> \brief \b ZLARSCL2 performs reciprocal diagonal scaling on a matrix.
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLARSCL2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarscl2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarscl2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -34,7 +32,7 @@
 *>
 *> \verbatim
 *>
-*> ZLARSCL2 performs a reciprocal diagonal scaling on an vector:
+*> ZLARSCL2 performs a reciprocal diagonal scaling on a matrix:
 *>   x <-- inv(D) * x
 *> where the DOUBLE PRECISION diagonal matrix D is stored as a vector.
 *>
@@ -66,14 +64,14 @@
 *> \param[in,out] X
 *> \verbatim
 *>          X is COMPLEX*16 array, dimension (LDX,N)
-*>     On entry, the vector X to be scaled by D.
-*>     On exit, the scaled vector.
+*>     On entry, the matrix X to be scaled by D.
+*>     On exit, the scaled matrix.
 *> \endverbatim
 *>
 *> \param[in] LDX
 *> \verbatim
 *>          LDX is INTEGER
-*>     The leading dimension of the vector X. LDX >= M.
+*>     The leading dimension of the matrix X. LDX >= M.
 *> \endverbatim
 *
 *  Authors:
@@ -84,10 +82,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup larscl2
 *
 *  =====================================================================
       SUBROUTINE ZLARSCL2 ( M, N, D, X, LDX )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlartg.f90 b/SRC/zlartg.f90
index e509898a1c..faba51799b 100644
--- a/SRC/zlartg.f90
+++ b/SRC/zlartg.f90
@@ -11,8 +11,8 @@
 !       SUBROUTINE ZLARTG( F, G, C, S, R )
 !
 !       .. Scalar Arguments ..
-!       REAL(wp)           C
-!       COMPLEX(wp)        F, G, R, S
+!       REAL(wp)              C
+!       COMPLEX(wp)           F, G, R, S
 !       ..
 !
 !> \par Purpose:
@@ -30,7 +30,7 @@
 !> The mathematical formulas used for C and S are
 !>
 !>    sgn(x) = {  x / |x|,   x != 0
-!>             {  1,         x = 0
+!>             {  1,         x  = 0
 !>
 !>    R = sgn(F) * sqrt(|F|**2 + |G|**2)
 !>
@@ -38,6 +38,10 @@
 !>
 !>    S = sgn(F) * conjg(G) / sqrt(|F|**2 + |G|**2)
 !>
+!> Special conditions:
+!>    If G=0, then C=1 and S=0.
+!>    If F=0, then C=0 and S is chosen so that R is real.
+!>
 !> When F and G are real, the formulas simplify to C = F/R and
 !> S = G/R, and the returned values of C, S, and R should be
 !> identical to those returned by DLARTG.
@@ -46,11 +50,8 @@
 !> to avoid overflow or underflow in computing the square root of the
 !> sum of squares.
 !>
-!> This is a faster version of the BLAS1 routine ZROTG, except for
-!> the following differences:
-!>    F and G are unchanged on return.
-!>    If G=0, then C=1 and S=0.
-!>    If F=0, then C=0 and S is chosen so that R is real.
+!> This is the same routine ZROTG fom BLAS1, except that
+!> F and G are unchanged on return.
 !>
 !> Below, wp=>dp stands for double precision from LA_CONSTANTS module.
 !> \endverbatim
@@ -91,22 +92,19 @@
 !  Authors:
 !  ========
 !
-!> \author Edward Anderson, Lockheed Martin
-!
-!> \date August 2016
+!> \author Weslley Pereira, University of Colorado Denver, USA
 !
-!> \ingroup OTHERauxiliary
+!> \date December 2021
 !
-!> \par Contributors:
-!  ==================
-!>
-!> Weslley Pereira, University of Colorado Denver, USA
+!> \ingroup lartg
 !
 !> \par Further Details:
 !  =====================
 !>
 !> \verbatim
 !>
+!> Based on the algorithm from
+!>
 !>  Anderson E. (2017)
 !>  Algorithm 978: Safe Scaling in the Level 1 BLAS
 !>  ACM Trans Math Softw 44:1--28
@@ -117,9 +115,10 @@
 subroutine ZLARTG( f, g, c, s, r )
    use LA_CONSTANTS, &
    only: wp=>dp, zero=>dzero, one=>done, two=>dtwo, czero=>zzero, &
-         rtmin=>drtmin, rtmax=>drtmax, safmin=>dsafmin, safmax=>dsafmax
+         safmin=>dsafmin, safmax=>dsafmax
+   implicit none
 !
-!  -- LAPACK auxiliary routine (version 3.10.0) --
+!  -- LAPACK auxiliary routine --
 !  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 !  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 !     February 2021
@@ -129,7 +128,7 @@ subroutine ZLARTG( f, g, c, s, r )
    complex(wp)        f, g, r, s
 !  ..
 !  .. Local Scalars ..
-   real(wp) :: d, f1, f2, g1, g2, h2, p, u, uu, v, vv, w
+   real(wp) :: d, f1, f2, g1, g2, h2, u, v, w, rtmin, rtmax
    complex(wp) :: fs, gs, t
 !  ..
 !  .. Intrinsic Functions ..
@@ -141,6 +140,9 @@ subroutine ZLARTG( f, g, c, s, r )
 !  .. Statement Function definitions ..
    ABSSQ( t ) = real( t )**2 + aimag( t )**2
 !  ..
+!  .. Constants ..
+   rtmin = sqrt( safmin )
+!  ..
 !  .. Executable Statements ..
 !
    if( g == czero ) then
@@ -149,30 +151,43 @@ subroutine ZLARTG( f, g, c, s, r )
       r = f
    else if( f == czero ) then
       c = zero
-      g1 = max( abs(real(g)), abs(aimag(g)) )
-      if( g1 > rtmin .and. g1 < rtmax ) then
+      if( real(g) == zero ) then
+         r = abs(aimag(g))
+         s = conjg( g ) / r
+      elseif( aimag(g) == zero ) then
+         r = abs(real(g))
+         s = conjg( g ) / r
+      else
+         g1 = max( abs(real(g)), abs(aimag(g)) )
+         rtmax = sqrt( safmax/2 )
+         if( g1 > rtmin .and. g1 < rtmax ) then
 !
 !        Use unscaled algorithm
 !
-         g2 = ABSSQ( g )
-         d = sqrt( g2 )
-         s = conjg( g ) / d
-         r = d
-      else
+!           The following two lines can be replaced by `d = abs( g )`.
+!           This algorithm do not use the intrinsic complex abs.
+            g2 = ABSSQ( g )
+            d = sqrt( g2 )
+            s = conjg( g ) / d
+            r = d
+         else
 !
 !        Use scaled algorithm
 !
-         u = min( safmax, max( safmin, g1 ) )
-         uu = one / u
-         gs = g*uu
-         g2 = ABSSQ( gs )
-         d = sqrt( g2 )
-         s = conjg( gs ) / d
-         r = d*u
+            u = min( safmax, max( safmin, g1 ) )
+            gs = g / u
+!           The following two lines can be replaced by `d = abs( gs )`.
+!           This algorithm do not use the intrinsic complex abs.
+            g2 = ABSSQ( gs )
+            d = sqrt( g2 )
+            s = conjg( gs ) / d
+            r = d*u
+         end if
       end if
    else
       f1 = max( abs(real(f)), abs(aimag(f)) )
       g1 = max( abs(real(g)), abs(aimag(g)) )
+      rtmax = sqrt( safmax/4 )
       if( f1 > rtmin .and. f1 < rtmax .and. &
           g1 > rtmin .and. g1 < rtmax ) then
 !
@@ -181,32 +196,51 @@ subroutine ZLARTG( f, g, c, s, r )
          f2 = ABSSQ( f )
          g2 = ABSSQ( g )
          h2 = f2 + g2
-         if( f2 > rtmin .and. h2 < rtmax ) then
-            d = sqrt( f2*h2 )
+         ! safmin <= f2 <= h2 <= safmax
+         if( f2 >= h2 * safmin ) then
+            ! safmin <= f2/h2 <= 1, and h2/f2 is finite
+            c = sqrt( f2 / h2 )
+            r = f / c
+            rtmax = rtmax * 2
+            if( f2 > rtmin .and. h2 < rtmax ) then
+               ! safmin <= sqrt( f2*h2 ) <= safmax
+               s = conjg( g ) * ( f / sqrt( f2*h2 ) )
+            else
+               s = conjg( g ) * ( r / h2 )
+            end if
          else
-            d = sqrt( f2 )*sqrt( h2 )
+            ! f2/h2 <= safmin may be subnormal, and h2/f2 may overflow.
+            ! Moreover,
+            !  safmin <= f2*f2 * safmax < f2 * h2 < h2*h2 * safmin <= safmax,
+            !  sqrt(safmin) <= sqrt(f2 * h2) <= sqrt(safmax).
+            ! Also,
+            !  g2 >> f2, which means that h2 = g2.
+            d = sqrt( f2 * h2 )
+            c = f2 / d
+            if( c >= safmin ) then
+               r = f / c
+            else
+               ! f2 / sqrt(f2 * h2) < safmin, then
+               !  sqrt(safmin) <= f2 * sqrt(safmax) <= h2 / sqrt(f2 * h2) <= h2 * (safmin / f2) <= h2 <= safmax
+               r = f * ( h2 / d )
+            end if
+            s = conjg( g ) * ( f / d )
          end if
-         p = 1 / d
-         c = f2*p
-         s = conjg( g )*( f*p )
-         r = f*( h2*p )
       else
 !
 !        Use scaled algorithm
 !
          u = min( safmax, max( safmin, f1, g1 ) )
-         uu = one / u
-         gs = g*uu
+         gs = g / u
          g2 = ABSSQ( gs )
-         if( f1*uu < rtmin ) then
+         if( f1 / u < rtmin ) then
 !
 !           f is not well-scaled when scaled by g1.
 !           Use a different scaling for f.
 !
             v = min( safmax, max( safmin, f1 ) )
-            vv = one / v
-            w = v * uu
-            fs = f*vv
+            w = v / u
+            fs = f / v
             f2 = ABSSQ( fs )
             h2 = f2*w**2 + g2
          else
@@ -214,19 +248,43 @@ subroutine ZLARTG( f, g, c, s, r )
 !           Otherwise use the same scaling for f and g.
 !
             w = one
-            fs = f*uu
+            fs = f / u
             f2 = ABSSQ( fs )
             h2 = f2 + g2
          end if
-         if( f2 > rtmin .and. h2 < rtmax ) then
-            d = sqrt( f2*h2 )
+         ! safmin <= f2 <= h2 <= safmax
+         if( f2 >= h2 * safmin ) then
+            ! safmin <= f2/h2 <= 1, and h2/f2 is finite
+            c = sqrt( f2 / h2 )
+            r = fs / c
+            rtmax = rtmax * 2
+            if( f2 > rtmin .and. h2 < rtmax ) then
+               ! safmin <= sqrt( f2*h2 ) <= safmax
+               s = conjg( gs ) * ( fs / sqrt( f2*h2 ) )
+            else
+               s = conjg( gs ) * ( r / h2 )
+            end if
          else
-            d = sqrt( f2 )*sqrt( h2 )
+            ! f2/h2 <= safmin may be subnormal, and h2/f2 may overflow.
+            ! Moreover,
+            !  safmin <= f2*f2 * safmax < f2 * h2 < h2*h2 * safmin <= safmax,
+            !  sqrt(safmin) <= sqrt(f2 * h2) <= sqrt(safmax).
+            ! Also,
+            !  g2 >> f2, which means that h2 = g2.
+            d = sqrt( f2 * h2 )
+            c = f2 / d
+            if( c >= safmin ) then
+               r = fs / c
+            else
+               ! f2 / sqrt(f2 * h2) < safmin, then
+               !  sqrt(safmin) <= f2 * sqrt(safmax) <= h2 / sqrt(f2 * h2) <= h2 * (safmin / f2) <= h2 <= safmax
+               r = fs * ( h2 / d )
+            end if
+            s = conjg( gs ) * ( fs / d )
          end if
-         p = 1 / d
-         c = ( f2*p )*w
-         s = conjg( gs )*( fs*p )
-         r = ( fs*( h2*p ) )*u
+         ! Rescale c and r
+         c = c * w
+         r = r * u
       end if
    end if
    return
diff --git a/SRC/zlartv.f b/SRC/zlartv.f
index 02f5b0d76f..447ee97afa 100644
--- a/SRC/zlartv.f
+++ b/SRC/zlartv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLARTV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlartv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlartv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -100,10 +98,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lartv
 *
 *  =====================================================================
       SUBROUTINE ZLARTV( N, X, INCX, Y, INCY, C, S, INCC )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlarz.f b/SRC/zlarz.f
index 3cfcd66255..848c75216d 100644
--- a/SRC/zlarz.f
+++ b/SRC/zlarz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLARZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -129,7 +127,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup larz
 *
 *> \par Contributors:
 *  ==================
@@ -144,6 +142,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZLARZ( SIDE, M, N, L, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -166,7 +165,8 @@ SUBROUTINE ZLARZ( SIDE, M, N, L, V, INCV, TAU, C, LDC, WORK )
      $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZAXPY, ZCOPY, ZGEMV, ZGERC, ZGERU, ZLACGV
+      EXTERNAL           ZAXPY, ZCOPY, ZGEMV, ZGERC, ZGERU,
+     $                   ZLACGV
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -187,7 +187,8 @@ SUBROUTINE ZLARZ( SIDE, M, N, L, V, INCV, TAU, C, LDC, WORK )
 *
 *           w( 1:n ) = conjg( w( 1:n ) + C( m-l+1:m, 1:n )**H * v( 1:l ) )
 *
-            CALL ZGEMV( 'Conjugate transpose', L, N, ONE, C( M-L+1, 1 ),
+            CALL ZGEMV( 'Conjugate transpose', L, N, ONE, C( M-L+1,
+     $                  1 ),
      $                  LDC, V, INCV, ONE, WORK, 1 )
             CALL ZLACGV( N, WORK, 1 )
 *
@@ -214,7 +215,8 @@ SUBROUTINE ZLARZ( SIDE, M, N, L, V, INCV, TAU, C, LDC, WORK )
 *
 *           w( 1:m ) = w( 1:m ) + C( 1:m, n-l+1:n, 1:n ) * v( 1:l )
 *
-            CALL ZGEMV( 'No transpose', M, L, ONE, C( 1, N-L+1 ), LDC,
+            CALL ZGEMV( 'No transpose', M, L, ONE, C( 1, N-L+1 ),
+     $                  LDC,
      $                  V, INCV, ONE, WORK, 1 )
 *
 *           C( 1:m, 1 ) = C( 1:m, 1 ) - tau * w( 1:m )
diff --git a/SRC/zlarzb.f b/SRC/zlarzb.f
index 15c809d28b..75b0cd65a2 100644
--- a/SRC/zlarzb.f
+++ b/SRC/zlarzb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLARZB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarzb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarzb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -164,7 +162,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup larzb
 *
 *> \par Contributors:
 *  ==================
@@ -180,6 +178,7 @@
 *  =====================================================================
       SUBROUTINE ZLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
      $                   LDV, T, LDT, C, LDC, WORK, LDWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -257,7 +256,8 @@ SUBROUTINE ZLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
 *
 *        W( 1:n, 1:k ) = W( 1:n, 1:k ) * T**T  or  W( 1:m, 1:k ) * T
 *
-         CALL ZTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K, ONE, T,
+         CALL ZTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K, ONE,
+     $               T,
      $               LDT, WORK, LDWORK )
 *
 *        C( 1:k, 1:n ) = C( 1:k, 1:n ) - W( 1:n, 1:k )**H
@@ -272,7 +272,8 @@ SUBROUTINE ZLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
 *                            V( 1:k, 1:l )**H * W( 1:n, 1:k )**H
 *
          IF( L.GT.0 )
-     $      CALL ZGEMM( 'Transpose', 'Transpose', L, N, K, -ONE, V, LDV,
+     $      CALL ZGEMM( 'Transpose', 'Transpose', L, N, K, -ONE, V,
+     $                  LDV,
      $                  WORK, LDWORK, ONE, C( M-L+1, 1 ), LDC )
 *
       ELSE IF( LSAME( SIDE, 'R' ) ) THEN
@@ -298,7 +299,8 @@ SUBROUTINE ZLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
          DO 50 J = 1, K
             CALL ZLACGV( K-J+1, T( J, J ), 1 )
    50    CONTINUE
-         CALL ZTRMM( 'Right', 'Lower', TRANS, 'Non-unit', M, K, ONE, T,
+         CALL ZTRMM( 'Right', 'Lower', TRANS, 'Non-unit', M, K, ONE,
+     $               T,
      $               LDT, WORK, LDWORK )
          DO 60 J = 1, K
             CALL ZLACGV( K-J+1, T( J, J ), 1 )
@@ -319,7 +321,8 @@ SUBROUTINE ZLARZB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L, V,
             CALL ZLACGV( K, V( 1, J ), 1 )
    90    CONTINUE
          IF( L.GT.0 )
-     $      CALL ZGEMM( 'No transpose', 'No transpose', M, L, K, -ONE,
+     $      CALL ZGEMM( 'No transpose', 'No transpose', M, L, K,
+     $                  -ONE,
      $                  WORK, LDWORK, V, LDV, ONE, C( 1, N-L+1 ), LDC )
          DO 100 J = 1, L
             CALL ZLACGV( K, V( 1, J ), 1 )
diff --git a/SRC/zlarzt.f b/SRC/zlarzt.f
index 25d1e96f06..03d2a2e936 100644
--- a/SRC/zlarzt.f
+++ b/SRC/zlarzt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLARZT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarzt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarzt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,7 +131,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup larzt
 *
 *> \par Contributors:
 *  ==================
@@ -182,6 +180,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZLARZT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlascl.f b/SRC/zlascl.f
index 3d53f5ae60..b44b40f903 100644
--- a/SRC/zlascl.f
+++ b/SRC/zlascl.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLASCL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlascl.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlascl.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -136,10 +134,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lascl
 *
 *  =====================================================================
-      SUBROUTINE ZLASCL( TYPE, KL, KU, CFROM, CTO, M, N, A, LDA, INFO )
+      SUBROUTINE ZLASCL( TYPE, KL, KU, CFROM, CTO, M, N, A, LDA,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -272,6 +272,8 @@ SUBROUTINE ZLASCL( TYPE, KL, KU, CFROM, CTO, M, N, A, LDA, INFO )
          ELSE
             MUL = CTOC / CFROMC
             DONE = .TRUE.
+            IF (MUL .EQ. ONE)
+     $         RETURN
          END IF
       END IF
 *
diff --git a/SRC/zlascl2.f b/SRC/zlascl2.f
index c4e6992fbe..7ecfeb158c 100644
--- a/SRC/zlascl2.f
+++ b/SRC/zlascl2.f
@@ -1,11 +1,10 @@
-*> \brief \b ZLASCL2 performs diagonal scaling on a vector.
+*> \brief \b ZLASCL2 performs diagonal scaling on a matrix.
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLASCL2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlascl2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlascl2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -34,7 +32,7 @@
 *>
 *> \verbatim
 *>
-*> ZLASCL2 performs a diagonal scaling on a vector:
+*> ZLASCL2 performs a diagonal scaling on a matrix:
 *>   x <-- D * x
 *> where the DOUBLE PRECISION diagonal matrix D is stored as a vector.
 *>
@@ -66,14 +64,14 @@
 *> \param[in,out] X
 *> \verbatim
 *>          X is COMPLEX*16 array, dimension (LDX,N)
-*>     On entry, the vector X to be scaled by D.
-*>     On exit, the scaled vector.
+*>     On entry, the matrix X to be scaled by D.
+*>     On exit, the scaled matrix.
 *> \endverbatim
 *>
 *> \param[in] LDX
 *> \verbatim
 *>          LDX is INTEGER
-*>     The leading dimension of the vector X. LDX >= M.
+*>     The leading dimension of the matrix X. LDX >= M.
 *> \endverbatim
 *
 *  Authors:
@@ -84,10 +82,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup lascl2
 *
 *  =====================================================================
       SUBROUTINE ZLASCL2 ( M, N, D, X, LDX )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlaset.f b/SRC/zlaset.f
index 00f5f595fc..15f53a324d 100644
--- a/SRC/zlaset.f
+++ b/SRC/zlaset.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLASET + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaset.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaset.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -99,10 +97,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup laset
 *
 *  =====================================================================
       SUBROUTINE ZLASET( UPLO, M, N, ALPHA, BETA, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlasr.f b/SRC/zlasr.f
index 07c91329c4..85b96bb4fe 100644
--- a/SRC/zlasr.f
+++ b/SRC/zlasr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLASR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlasr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlasr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -193,10 +191,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lasr
 *
 *  =====================================================================
       SUBROUTINE ZLASR( SIDE, PIVOT, DIRECT, M, N, C, S, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -237,12 +236,14 @@ SUBROUTINE ZLASR( SIDE, PIVOT, DIRECT, M, N, C, S, A, LDA )
 *     Test the input parameters
 *
       INFO = 0
-      IF( .NOT.( LSAME( SIDE, 'L' ) .OR. LSAME( SIDE, 'R' ) ) ) THEN
+      IF( .NOT.( LSAME( SIDE, 'L' ) .OR.
+     $    LSAME( SIDE, 'R' ) ) ) THEN
          INFO = 1
       ELSE IF( .NOT.( LSAME( PIVOT, 'V' ) .OR. LSAME( PIVOT,
      $         'T' ) .OR. LSAME( PIVOT, 'B' ) ) ) THEN
          INFO = 2
-      ELSE IF( .NOT.( LSAME( DIRECT, 'F' ) .OR. LSAME( DIRECT, 'B' ) ) )
+      ELSE IF( .NOT.( LSAME( DIRECT, 'F' ) .OR.
+     $         LSAME( DIRECT, 'B' ) ) )
      $          THEN
          INFO = 3
       ELSE IF( M.LT.0 ) THEN
diff --git a/SRC/zlassq.f90 b/SRC/zlassq.f90
index 9346dacac9..98a164b8f5 100644
--- a/SRC/zlassq.f90
+++ b/SRC/zlassq.f90
@@ -5,7 +5,6 @@
 ! Online html documentation available at
 !            http://www.netlib.org/lapack/explore-html/
 !
-!> \htmlonly
 !> Download ZLASSQ + dependencies
 !> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlassq.f90">
 !> [TGZ]</a>
@@ -13,7 +12,6 @@
 !> [ZIP]</a>
 !> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlassq.f90">
 !> [TXT]</a>
-!> \endhtmlonly
 !
 !  Definition:
 !  ===========
@@ -34,28 +32,15 @@
 !>
 !> \verbatim
 !>
-!> ZLASSQ  returns the values  scl  and  smsq  such that
+!> ZLASSQ returns the values scale_out and sumsq_out such that
 !>
-!>    ( scl**2 )*smsq = x( 1 )**2 +...+ x( n )**2 + ( scale**2 )*sumsq,
+!>    (scale_out**2)*sumsq_out = x( 1 )**2 +...+ x( n )**2 + (scale**2)*sumsq,
 !>
-!> where  x( i ) = X( 1 + ( i - 1 )*INCX ). The value of  sumsq  is
+!> where x( i ) = X( 1 + ( i - 1 )*INCX ). The value of sumsq is
 !> assumed to be non-negative.
 !>
 !> scale and sumsq must be supplied in SCALE and SUMSQ and
-!> scl and smsq are overwritten on SCALE and SUMSQ respectively.
-!>
-!> If scale * sqrt( sumsq ) > tbig then
-!>    we require:   scale >= sqrt( TINY*EPS ) / sbig   on entry,
-!> and if 0 < scale * sqrt( sumsq ) < tsml then
-!>    we require:   scale <= sqrt( HUGE ) / ssml       on entry,
-!> where
-!>    tbig -- upper threshold for values whose square is representable;
-!>    sbig -- scaling constant for big numbers; \see la_constants.f90
-!>    tsml -- lower threshold for values whose square is representable;
-!>    ssml -- scaling constant for small numbers; \see la_constants.f90
-!> and
-!>    TINY*EPS -- tiniest representable number;
-!>    HUGE     -- biggest representable number.
+!> scale_out and sumsq_out are overwritten on SCALE and SUMSQ respectively.
 !>
 !> \endverbatim
 !
@@ -72,7 +57,7 @@
 !> \verbatim
 !>          X is DOUBLE COMPLEX array, dimension (1+(N-1)*abs(INCX))
 !>          The vector for which a scaled sum of squares is computed.
-!>             x( i )  = X( 1 + ( i - 1 )*INCX ), 1 <= i <= n.
+!>             x( i ) = X( 1 + ( i - 1 )*INCX ), 1 <= i <= n.
 !> \endverbatim
 !>
 !> \param[in] INCX
@@ -82,24 +67,24 @@
 !>          If INCX > 0, X(1+(i-1)*INCX) = x(i) for 1 <= i <= n
 !>          If INCX < 0, X(1-(n-i)*INCX) = x(i) for 1 <= i <= n
 !>          If INCX = 0, x isn't a vector so there is no need to call
-!>          this subroutine.  If you call it anyway, it will count x(1)
+!>          this subroutine. If you call it anyway, it will count x(1)
 !>          in the vector norm N times.
 !> \endverbatim
 !>
 !> \param[in,out] SCALE
 !> \verbatim
 !>          SCALE is DOUBLE PRECISION
-!>          On entry, the value  scale  in the equation above.
-!>          On exit, SCALE is overwritten with  scl , the scaling factor
+!>          On entry, the value scale in the equation above.
+!>          On exit, SCALE is overwritten by scale_out, the scaling factor
 !>          for the sum of squares.
 !> \endverbatim
 !>
 !> \param[in,out] SUMSQ
 !> \verbatim
 !>          SUMSQ is DOUBLE PRECISION
-!>          On entry, the value  sumsq  in the equation above.
-!>          On exit, SUMSQ is overwritten with  smsq , the basic sum of
-!>          squares from which  scl  has been factored out.
+!>          On entry, the value sumsq in the equation above.
+!>          On exit, SUMSQ is overwritten by sumsq_out, the basic sum of
+!>          squares from which scale_out has been factored out.
 !> \endverbatim
 !
 !  Authors:
@@ -130,14 +115,15 @@
 !>
 !> \endverbatim
 !
-!> \ingroup OTHERauxiliary
+!> \ingroup lassq
 !
 !  =====================================================================
-subroutine ZLASSQ( n, x, incx, scl, sumsq )
+subroutine ZLASSQ( n, x, incx, scale, sumsq )
    use LA_CONSTANTS, &
       only: wp=>dp, zero=>dzero, one=>done, &
             sbig=>dsbig, ssml=>dssml, tbig=>dtbig, tsml=>dtsml
    use LA_XISNAN
+   implicit none
 !
 !  -- LAPACK auxiliary routine --
 !  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -145,7 +131,7 @@ subroutine ZLASSQ( n, x, incx, scl, sumsq )
 !
 !  .. Scalar Arguments ..
    integer :: incx, n
-   real(wp) :: scl, sumsq
+   real(wp) :: scale, sumsq
 !  ..
 !  .. Array Arguments ..
    complex(wp) :: x(*)
@@ -158,10 +144,10 @@ subroutine ZLASSQ( n, x, incx, scl, sumsq )
 !
 !  Quick return if possible
 !
-   if( LA_ISNAN(scl) .or. LA_ISNAN(sumsq) ) return
-   if( sumsq == zero ) scl = one
-   if( scl == zero ) then
-      scl = one
+   if( LA_ISNAN(scale) .or. LA_ISNAN(sumsq) ) return
+   if( sumsq == zero ) scale = one
+   if( scale == zero ) then
+      scale = one
       sumsq = zero
    end if
    if (n <= 0) then
@@ -207,15 +193,27 @@ subroutine ZLASSQ( n, x, incx, scl, sumsq )
 !  Put the existing sum of squares into one of the accumulators
 !
    if( sumsq > zero ) then
-      ax = scl*sqrt( sumsq )
+      ax = scale*sqrt( sumsq )
       if (ax > tbig) then
-!        We assume scl >= sqrt( TINY*EPS ) / sbig
-         abig = abig + (scl*sbig)**2 * sumsq
+         if (scale > one) then
+            scale = scale * sbig
+            abig = abig + scale * (scale * sumsq)
+         else
+            ! sumsq > tbig^2 => (sbig * (sbig * sumsq)) is representable
+            abig = abig + scale * (scale * (sbig * (sbig * sumsq)))
+         end if
       else if (ax < tsml) then
-!        We assume scl <= sqrt( HUGE ) / ssml
-         if (notbig) asml = asml + (scl*ssml)**2 * sumsq
+         if (notbig) then
+            if (scale < one) then
+               scale = scale * ssml
+               asml = asml + scale * (scale * sumsq)
+            else
+               ! sumsq < tsml^2 => (ssml * (ssml * sumsq)) is representable
+               asml = asml + scale * (scale * (ssml * (ssml * sumsq)))
+            end if
+         end if
       else
-         amed = amed + scl**2 * sumsq
+         amed = amed + scale * (scale * sumsq)
       end if
    end if
 !
@@ -229,7 +227,7 @@ subroutine ZLASSQ( n, x, incx, scl, sumsq )
       if (amed > zero .or. LA_ISNAN(amed)) then
          abig = abig + (amed*sbig)*sbig
       end if
-      scl = one / sbig
+      scale = one / sbig
       sumsq = abig
    else if (asml > zero) then
 !
@@ -245,17 +243,17 @@ subroutine ZLASSQ( n, x, incx, scl, sumsq )
             ymin = asml
             ymax = amed
          end if
-         scl = one
+         scale = one
          sumsq = ymax**2*( one + (ymin/ymax)**2 )
       else
-         scl = one / ssml
+         scale = one / ssml
          sumsq = asml
       end if
    else
 !
 !     Otherwise all values are mid-range or zero
 !
-      scl = one
+      scale = one
       sumsq = amed
    end if
    return
diff --git a/SRC/zlaswlq.f b/SRC/zlaswlq.f
index 39c974c8df..0cfd5b8f3f 100644
--- a/SRC/zlaswlq.f
+++ b/SRC/zlaswlq.f
@@ -60,7 +60,7 @@
 *> \verbatim
 *>          NB is INTEGER
 *>          The column block size to be used in the blocked QR.
-*>          NB > M.
+*>          NB > 0.
 *> \endverbatim
 *>
 *> \param[in,out] A
@@ -96,21 +96,23 @@
 *>          The leading dimension of the array T.  LDT >= MB.
 *> \endverbatim
 *>
-*>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) COMPLEX*16 array, dimension (MAX(1,LWORK))
-*>
+*>          (workspace) COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
 *> \param[in] LWORK
 *> \verbatim
-*>          The dimension of the array WORK.  LWORK >= MB*M.
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= MB*M, otherwise.
+*>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
+*>          only calculates the minimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
-*>
 *> \endverbatim
+*>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
@@ -158,33 +160,38 @@
 *>     SIAM J. Sci. Comput, vol. 34, no. 1, 2012
 *> \endverbatim
 *>
+*> \ingroup laswlq
+*>
 *  =====================================================================
       SUBROUTINE ZLASWLQ( M, N, MB, NB, A, LDA, T, LDT, WORK, LWORK,
-     $                  INFO)
+     $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd. --
 *
 *     .. Scalar Arguments ..
-      INTEGER           INFO, LDA, M, N, MB, NB, LWORK, LDT
+      INTEGER            INFO, LDA, M, N, MB, NB, LWORK, LDT
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16        A( LDA, * ), WORK( * ), T( LDT, *)
+      COMPLEX*16         A( LDA, * ), WORK( * ), T( LDT, * )
 *     ..
 *
 *  =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
-      LOGICAL    LQUERY
-      INTEGER    I, II, KK, CTR
+      LOGICAL            LQUERY
+      INTEGER            I, II, KK, CTR, MINMN, LWMIN
 *     ..
 *     .. EXTERNAL FUNCTIONS ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
+*     ..
 *     .. EXTERNAL SUBROUTINES ..
       EXTERNAL           ZGELQT, ZTPLQT, XERBLA
+*     ..
 *     .. INTRINSIC FUNCTIONS ..
       INTRINSIC          MAX, MIN, MOD
 *     ..
@@ -195,73 +202,81 @@ SUBROUTINE ZLASWLQ( M, N, MB, NB, A, LDA, T, LDT, WORK, LWORK,
       INFO = 0
 *
       LQUERY = ( LWORK.EQ.-1 )
+*
+      MINMN = MIN( M, N )
+      IF( MINMN.EQ.0 ) THEN
+        LWMIN = 1
+      ELSE
+        LWMIN = M*MB
+      END IF
 *
       IF( M.LT.0 ) THEN
         INFO = -1
       ELSE IF( N.LT.0 .OR. N.LT.M ) THEN
         INFO = -2
-      ELSE IF( MB.LT.1 .OR. ( MB.GT.M .AND. M.GT.0 )) THEN
+      ELSE IF( MB.LT.1 .OR. ( MB.GT.M .AND. M.GT.0 ) ) THEN
         INFO = -3
-      ELSE IF( NB.LE.M ) THEN
+      ELSE IF( NB.LE.0 ) THEN
         INFO = -4
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-        INFO = -5
+        INFO = -6
       ELSE IF( LDT.LT.MB ) THEN
         INFO = -8
-      ELSE IF( ( LWORK.LT.M*MB) .AND. (.NOT.LQUERY) ) THEN
+      ELSE IF( LWORK.LT.LWMIN .AND. (.NOT.LQUERY) ) THEN
         INFO = -10
       END IF
-      IF( INFO.EQ.0)  THEN
-      WORK(1) = MB*M
+*
+      IF( INFO.EQ.0 )  THEN
+        WORK( 1 ) = LWMIN
       END IF
 *
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'ZLASWLQ', -INFO )
         RETURN
-      ELSE IF (LQUERY) THEN
-       RETURN
+      ELSE IF( LQUERY ) THEN
+        RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( MIN(M,N).EQ.0 ) THEN
-          RETURN
+      IF( MINMN.EQ.0 ) THEN
+        RETURN
       END IF
 *
 *     The LQ Decomposition
 *
-       IF((M.GE.N).OR.(NB.LE.M).OR.(NB.GE.N)) THEN
-        CALL ZGELQT( M, N, MB, A, LDA, T, LDT, WORK, INFO)
+      IF( (M.GE.N) .OR. (NB.LE.M) .OR. (NB.GE.N) ) THEN
+        CALL ZGELQT( M, N, MB, A, LDA, T, LDT, WORK, INFO )
         RETURN
-       END IF
+      END IF
 *
-       KK = MOD((N-M),(NB-M))
-       II=N-KK+1
+      KK = MOD((N-M),(NB-M))
+      II = N-KK+1
 *
-*      Compute the LQ factorization of the first block A(1:M,1:NB)
+*     Compute the LQ factorization of the first block A(1:M,1:NB)
 *
-       CALL ZGELQT( M, NB, MB, A(1,1), LDA, T, LDT, WORK, INFO)
-       CTR = 1
+      CALL ZGELQT( M, NB, MB, A(1,1), LDA, T, LDT, WORK, INFO )
+      CTR = 1
 *
-       DO I = NB+1, II-NB+M , (NB-M)
+      DO I = NB+1, II-NB+M, (NB-M)
 *
-*      Compute the QR factorization of the current block A(1:M,I:I+NB-M)
+*       Compute the QR factorization of the current block A(1:M,I:I+NB-M)
 *
-         CALL ZTPLQT( M, NB-M, 0, MB, A(1,1), LDA, A( 1, I ),
-     $                  LDA, T(1, CTR * M + 1),
-     $                  LDT, WORK, INFO )
-         CTR = CTR + 1
-       END DO
+        CALL ZTPLQT( M, NB-M, 0, MB, A(1,1), LDA, A( 1, I ),
+     $                LDA, T(1, CTR * M + 1),
+     $                LDT, WORK, INFO )
+        CTR = CTR + 1
+      END DO
 *
 *     Compute the QR factorization of the last block A(1:M,II:N)
 *
-       IF (II.LE.N) THEN
+      IF( II.LE.N ) THEN
         CALL ZTPLQT( M, KK, 0, MB, A(1,1), LDA, A( 1, II ),
-     $                  LDA, T(1, CTR * M + 1), LDT,
-     $                  WORK, INFO )
-       END IF
+     $                LDA, T(1, CTR * M + 1), LDT,
+     $                WORK, INFO )
+      END IF
 *
-      WORK( 1 ) = M * MB
+      WORK( 1 ) = LWMIN
       RETURN
 *
 *     End of ZLASWLQ
diff --git a/SRC/zlaswp.f b/SRC/zlaswp.f
index 13fa864905..50ac2426c5 100644
--- a/SRC/zlaswp.f
+++ b/SRC/zlaswp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLASWP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaswp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaswp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -99,7 +97,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup laswp
 *
 *> \par Further Details:
 *  =====================
@@ -112,6 +110,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZLASWP( N, A, LDA, K1, K2, IPIV, INCX )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlasyf.f b/SRC/zlasyf.f
index 57f236d1bd..5363c390e6 100644
--- a/SRC/zlasyf.f
+++ b/SRC/zlasyf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLASYF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlasyf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlasyf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -160,7 +158,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup lahef
 *
 *> \par Contributors:
 *  ==================
@@ -173,7 +171,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE ZLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
+      SUBROUTINE ZLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -199,7 +199,7 @@ SUBROUTINE ZLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
       PARAMETER          ( CONE = ( 1.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            IMAX, J, JB, JJ, JMAX, JP, K, KK, KKW, KP,
+      INTEGER            IMAX, J, JJ, JMAX, JP, K, KK, KKW, KP,
      $                   KSTEP, KW
       DOUBLE PRECISION   ABSAKK, ALPHA, COLMAX, ROWMAX
       COMPLEX*16         D11, D21, D22, R1, T, Z
@@ -210,7 +210,7 @@ SUBROUTINE ZLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
       EXTERNAL           LSAME, IZAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZCOPY, ZGEMM, ZGEMV, ZSCAL, ZSWAP
+      EXTERNAL           ZCOPY, ZGEMMTR, ZGEMV, ZSCAL, ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG, MAX, MIN, SQRT
@@ -252,7 +252,8 @@ SUBROUTINE ZLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
          CALL ZCOPY( K, A( 1, K ), 1, W( 1, KW ), 1 )
          IF( K.LT.N )
-     $      CALL ZGEMV( 'No transpose', K, N-K, -CONE, A( 1, K+1 ), LDA,
+     $      CALL ZGEMV( 'No transpose', K, N-K, -CONE, A( 1, K+1 ),
+     $                  LDA,
      $                  W( K, KW+1 ), LDW, CONE, W( 1, KW ), 1 )
 *
          KSTEP = 1
@@ -479,25 +480,9 @@ SUBROUTINE ZLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *        A11 := A11 - U12*D*U12**T = A11 - U12*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 50 J = ( ( K-1 ) / NB )*NB + 1, 1, -NB
-            JB = MIN( NB, K-J+1 )
-*
-*           Update the upper triangle of the diagonal block
-*
-            DO 40 JJ = J, J + JB - 1
-               CALL ZGEMV( 'No transpose', JJ-J+1, N-K, -CONE,
-     $                     A( J, K+1 ), LDA, W( JJ, KW+1 ), LDW, CONE,
-     $                     A( J, JJ ), 1 )
-   40       CONTINUE
-*
-*           Update the rectangular superdiagonal block
-*
-            CALL ZGEMM( 'No transpose', 'Transpose', J-1, JB, N-K,
-     $                  -CONE, A( 1, K+1 ), LDA, W( J, KW+1 ), LDW,
-     $                  CONE, A( 1, J ), LDA )
-   50    CONTINUE
+         CALL ZGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
+     $                 -CONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
+     $                 CONE, A( 1, 1 ), LDA )
 *
 *        Put U12 in standard form by partially undoing the interchanges
 *        in columns k+1:n looping backwards from k+1 to n
@@ -547,7 +532,8 @@ SUBROUTINE ZLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *        Copy column K of A to column K of W and update it
 *
          CALL ZCOPY( N-K+1, A( K, K ), 1, W( K, K ), 1 )
-         CALL ZGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K, 1 ), LDA,
+         CALL ZGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K, 1 ),
+     $               LDA,
      $               W( K, 1 ), LDW, CONE, W( K, K ), 1 )
 *
          KSTEP = 1
@@ -584,10 +570,13 @@ SUBROUTINE ZLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *              Copy column IMAX to column K+1 of W and update it
 *
-               CALL ZCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1 )
-               CALL ZCOPY( N-IMAX+1, A( IMAX, IMAX ), 1, W( IMAX, K+1 ),
+               CALL ZCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                     1 )
+               CALL ZCOPY( N-IMAX+1, A( IMAX, IMAX ), 1, W( IMAX,
+     $                     K+1 ),
      $                     1 )
-               CALL ZGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K, 1 ),
+               CALL ZGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K,
+     $                     1 ),
      $                     LDA, W( IMAX, 1 ), LDW, CONE, W( K, K+1 ),
      $                     1 )
 *
@@ -646,7 +635,8 @@ SUBROUTINE ZLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
                CALL ZCOPY( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
      $                     LDA )
                IF( KP.LT.N )
-     $            CALL ZCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL ZCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
 *
 *              Interchange rows KK and KP in first K-1 columns of A
 *              (columns K (or K and K+1 for 2-by-2 pivot) of A will be
@@ -769,26 +759,9 @@ SUBROUTINE ZLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
 *        A22 := A22 - L21*D*L21**T = A22 - L21*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 110 J = K, N, NB
-            JB = MIN( NB, N-J+1 )
-*
-*           Update the lower triangle of the diagonal block
-*
-            DO 100 JJ = J, J + JB - 1
-               CALL ZGEMV( 'No transpose', J+JB-JJ, K-1, -CONE,
-     $                     A( JJ, 1 ), LDA, W( JJ, 1 ), LDW, CONE,
-     $                     A( JJ, JJ ), 1 )
-  100       CONTINUE
-*
-*           Update the rectangular subdiagonal block
-*
-            IF( J+JB.LE.N )
-     $         CALL ZGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
-     $                     K-1, -CONE, A( J+JB, 1 ), LDA, W( J, 1 ),
-     $                     LDW, CONE, A( J+JB, J ), LDA )
-  110    CONTINUE
+         CALL ZGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
+     $                 K-1, -CONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
+     $                 CONE, A( K, K ), LDA )
 *
 *        Put L21 in standard form by partially undoing the interchanges
 *        of rows in columns 1:k-1 looping backwards from k-1 to 1
diff --git a/SRC/zlasyf_aa.f b/SRC/zlasyf_aa.f
index b8b5f27607..230b668515 100644
--- a/SRC/zlasyf_aa.f
+++ b/SRC/zlasyf_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLASYF_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlasyf_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlasyf_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -136,7 +134,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup lahef_aa
 *
 *  =====================================================================
       SUBROUTINE ZLASYF_AA( UPLO, J1, M, NB, A, LDA, IPIV,
@@ -172,7 +170,8 @@ SUBROUTINE ZLASYF_AA( UPLO, J1, M, NB, A, LDA, IPIV,
       EXTERNAL           LSAME, ILAENV, IZAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZGEMV, ZAXPY, ZSCAL, ZCOPY, ZSWAP, ZLASET,
+      EXTERNAL           ZGEMV, ZAXPY, ZSCAL, ZCOPY, ZSWAP,
+     $                   ZLASET,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
diff --git a/SRC/zlasyf_rk.f b/SRC/zlasyf_rk.f
index ead0ab0af7..16499a5562 100644
--- a/SRC/zlasyf_rk.f
+++ b/SRC/zlasyf_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLASYF_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlasyf_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlasyf_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -239,7 +237,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup lahef_rk
 *
 *> \par Contributors:
 *  ==================
@@ -259,6 +257,7 @@
 *  =====================================================================
       SUBROUTINE ZLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
      $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -298,7 +297,7 @@ SUBROUTINE ZLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
       EXTERNAL           LSAME, IZAMAX, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZCOPY, ZGEMM, ZGEMV, ZSCAL, ZSWAP
+      EXTERNAL           ZCOPY, ZGEMMTR, ZGEMV, ZSCAL, ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG, MAX, MIN, SQRT
@@ -414,7 +413,8 @@ SUBROUTINE ZLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column KW-1 of W and update it
 *
-                  CALL ZCOPY( IMAX, A( 1, IMAX ), 1, W( 1, KW-1 ), 1 )
+                  CALL ZCOPY( IMAX, A( 1, IMAX ), 1, W( 1, KW-1 ),
+     $                        1 )
                   CALL ZCOPY( K-IMAX, A( IMAX, IMAX+1 ), LDA,
      $                        W( IMAX+1, KW-1 ), 1 )
 *
@@ -513,7 +513,8 @@ SUBROUTINE ZLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *              and last N-K+2 columns of W
 *
                CALL ZSWAP( N-K+1, A( K, K ), LDA, A( P, K ), LDA )
-               CALL ZSWAP( N-KK+1, W( K, KKW ), LDW, W( P, KKW ), LDW )
+               CALL ZSWAP( N-KK+1, W( K, KKW ), LDW, W( P, KKW ),
+     $                     LDW )
             END IF
 *
 *           Updated column KP is already stored in column KKW of W
@@ -530,7 +531,8 @@ SUBROUTINE ZLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *              Interchange rows KK and KP in last N-KK+1 columns
 *              of A and W
 *
-               CALL ZSWAP( N-KK+1, A( KK, KK ), LDA, A( KP, KK ), LDA )
+               CALL ZSWAP( N-KK+1, A( KK, KK ), LDA, A( KP, KK ),
+     $                     LDA )
                CALL ZSWAP( N-KK+1, W( KK, KKW ), LDW, W( KP, KKW ),
      $                     LDW )
             END IF
@@ -624,26 +626,9 @@ SUBROUTINE ZLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *        A11 := A11 - U12*D*U12**T = A11 - U12*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 50 J = ( ( K-1 ) / NB )*NB + 1, 1, -NB
-            JB = MIN( NB, K-J+1 )
-*
-*           Update the upper triangle of the diagonal block
-*
-            DO 40 JJ = J, J + JB - 1
-               CALL ZGEMV( 'No transpose', JJ-J+1, N-K, -CONE,
-     $                     A( J, K+1 ), LDA, W( JJ, KW+1 ), LDW, CONE,
-     $                     A( J, JJ ), 1 )
-   40       CONTINUE
-*
-*           Update the rectangular superdiagonal block
-*
-            IF( J.GE.2 )
-     $         CALL ZGEMM( 'No transpose', 'Transpose', J-1, JB,
-     $                     N-K, -CONE, A( 1, K+1 ), LDA, W( J, KW+1 ),
-     $                     LDW, CONE, A( 1, J ), LDA )
-   50    CONTINUE
+         CALL ZGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
+     $                 -CONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
+     $                 CONE, A( 1, 1 ), LDA )
 *
 *        Set KB to the number of columns factorized
 *
@@ -737,7 +722,8 @@ SUBROUTINE ZLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column K+1 of W and update it
 *
-                  CALL ZCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1)
+                  CALL ZCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                        1)
                   CALL ZCOPY( N-IMAX+1, A( IMAX, IMAX ), 1,
      $                        W( IMAX, K+1 ), 1 )
                   IF( K.GT.1 )
@@ -757,7 +743,8 @@ SUBROUTINE ZLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + IZAMAX( N-IMAX, W( IMAX+1, K+1 ), 1)
+                     ITEMP = IMAX + IZAMAX( N-IMAX, W( IMAX+1, K+1 ),
+     $                                      1)
                      DTEMP = CABS1( W( ITEMP, K+1 ) )
                      IF( DTEMP.GT.ROWMAX ) THEN
                         ROWMAX = DTEMP
@@ -779,7 +766,8 @@ SUBROUTINE ZLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                    copy column K+1 of W to column K of W
 *
-                     CALL ZCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL ZCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                      DONE = .TRUE.
 *
@@ -805,7 +793,8 @@ SUBROUTINE ZLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *                    Copy updated JMAXth (next IMAXth) column to Kth of W
 *
-                     CALL ZCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL ZCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                   END IF
 *
@@ -840,7 +829,8 @@ SUBROUTINE ZLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *              Copy non-updated column KK to column KP
 *
                A( KP, K ) = A( KK, K )
-               CALL ZCOPY( KP-K-1, A( K+1, KK ), 1, A( KP, K+1 ), LDA )
+               CALL ZCOPY( KP-K-1, A( K+1, KK ), 1, A( KP, K+1 ),
+     $                     LDA )
                CALL ZCOPY( N-KP+1, A( KP, KK ), 1, A( KP, KP ), 1 )
 *
 *              Interchange rows KK and KP in first KK columns of A and W
@@ -937,26 +927,9 @@ SUBROUTINE ZLASYF_RK( UPLO, N, NB, KB, A, LDA, E, IPIV, W, LDW,
 *
 *        A22 := A22 - L21*D*L21**T = A22 - L21*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 110 J = K, N, NB
-            JB = MIN( NB, N-J+1 )
-*
-*           Update the lower triangle of the diagonal block
-*
-            DO 100 JJ = J, J + JB - 1
-               CALL ZGEMV( 'No transpose', J+JB-JJ, K-1, -CONE,
-     $                     A( JJ, 1 ), LDA, W( JJ, 1 ), LDW, CONE,
-     $                     A( JJ, JJ ), 1 )
-  100       CONTINUE
-*
-*           Update the rectangular subdiagonal block
-*
-            IF( J+JB.LE.N )
-     $         CALL ZGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
-     $                     K-1, -CONE, A( J+JB, 1 ), LDA, W( J, 1 ),
-     $                     LDW, CONE, A( J+JB, J ), LDA )
-  110    CONTINUE
+         CALL ZGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
+     $                 K-1, -CONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
+     $                 CONE, A( K, K ), LDA )
 *
 *        Set KB to the number of columns factorized
 *
diff --git a/SRC/zlasyf_rook.f b/SRC/zlasyf_rook.f
index 7a9872c7c6..57bd229efe 100644
--- a/SRC/zlasyf_rook.f
+++ b/SRC/zlasyf_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLASYF_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlasyf_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlasyf_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -161,7 +159,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup lahef_rook
 *
 *> \par Contributors:
 *  ==================
@@ -181,6 +179,7 @@
 *  =====================================================================
       SUBROUTINE ZLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
      $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -208,7 +207,7 @@ SUBROUTINE ZLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *     ..
 *     .. Local Scalars ..
       LOGICAL            DONE
-      INTEGER            IMAX, ITEMP, J, JB, JJ, JMAX, JP1, JP2, K, KK,
+      INTEGER            IMAX, ITEMP, J, JJ, JMAX, JP1, JP2, K, KK,
      $                   KW, KKW, KP, KSTEP, P, II
       DOUBLE PRECISION   ABSAKK, ALPHA, COLMAX, ROWMAX, DTEMP, SFMIN
       COMPLEX*16         D11, D12, D21, D22, R1, T, Z
@@ -220,7 +219,7 @@ SUBROUTINE ZLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
       EXTERNAL           LSAME, IZAMAX, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZCOPY, ZGEMM, ZGEMV, ZSCAL, ZSWAP
+      EXTERNAL           ZCOPY, ZGEMMTR, ZGEMV, ZSCAL, ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, SQRT, DIMAG, DBLE
@@ -325,7 +324,8 @@ SUBROUTINE ZLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column KW-1 of W and update it
 *
-                  CALL ZCOPY( IMAX, A( 1, IMAX ), 1, W( 1, KW-1 ), 1 )
+                  CALL ZCOPY( IMAX, A( 1, IMAX ), 1, W( 1, KW-1 ),
+     $                        1 )
                   CALL ZCOPY( K-IMAX, A( IMAX, IMAX+1 ), LDA,
      $                        W( IMAX+1, KW-1 ), 1 )
 *
@@ -424,7 +424,8 @@ SUBROUTINE ZLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *              and last N-K+2 columns of W
 *
                CALL ZSWAP( N-K+1, A( K, K ), LDA, A( P, K ), LDA )
-               CALL ZSWAP( N-KK+1, W( K, KKW ), LDW, W( P, KKW ), LDW )
+               CALL ZSWAP( N-KK+1, W( K, KKW ), LDW, W( P, KKW ),
+     $                     LDW )
             END IF
 *
 *           Updated column KP is already stored in column KKW of W
@@ -441,7 +442,8 @@ SUBROUTINE ZLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *              Interchange rows KK and KP in last N-KK+1 columns
 *              of A and W
 *
-               CALL ZSWAP( N-KK+1, A( KK, KK ), LDA, A( KP, KK ), LDA )
+               CALL ZSWAP( N-KK+1, A( KK, KK ), LDA, A( KP, KK ),
+     $                     LDA )
                CALL ZSWAP( N-KK+1, W( KK, KKW ), LDW, W( KP, KKW ),
      $                     LDW )
             END IF
@@ -522,26 +524,11 @@ SUBROUTINE ZLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *        A11 := A11 - U12*D*U12**T = A11 - U12*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 50 J = ( ( K-1 ) / NB )*NB + 1, 1, -NB
-            JB = MIN( NB, K-J+1 )
-*
-*           Update the upper triangle of the diagonal block
-*
-            DO 40 JJ = J, J + JB - 1
-               CALL ZGEMV( 'No transpose', JJ-J+1, N-K, -CONE,
-     $                     A( J, K+1 ), LDA, W( JJ, KW+1 ), LDW, CONE,
-     $                     A( J, JJ ), 1 )
-   40       CONTINUE
-*
-*           Update the rectangular superdiagonal block
+*        (note that conjg(W) is actually stored)
 *
-            IF( J.GE.2 )
-     $         CALL ZGEMM( 'No transpose', 'Transpose', J-1, JB,
-     $                  N-K, -CONE, A( 1, K+1 ), LDA, W( J, KW+1 ), LDW,
-     $                  CONE, A( 1, J ), LDA )
-   50    CONTINUE
+         CALL ZGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
+     $                 -CONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
+     $                 CONE, A( 1, 1 ), LDA )
 *
 *        Put U12 in standard form by partially undoing the interchanges
 *        in columns k+1:n
@@ -651,7 +638,8 @@ SUBROUTINE ZLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                 Copy column IMAX to column K+1 of W and update it
 *
-                  CALL ZCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1)
+                  CALL ZCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ),
+     $                        1)
                   CALL ZCOPY( N-IMAX+1, A( IMAX, IMAX ), 1,
      $                        W( IMAX, K+1 ), 1 )
                   IF( K.GT.1 )
@@ -671,7 +659,8 @@ SUBROUTINE ZLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + IZAMAX( N-IMAX, W( IMAX+1, K+1 ), 1)
+                     ITEMP = IMAX + IZAMAX( N-IMAX, W( IMAX+1, K+1 ),
+     $                                      1)
                      DTEMP = CABS1( W( ITEMP, K+1 ) )
                      IF( DTEMP.GT.ROWMAX ) THEN
                         ROWMAX = DTEMP
@@ -693,7 +682,8 @@ SUBROUTINE ZLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                    copy column K+1 of W to column K of W
 *
-                     CALL ZCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL ZCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                      DONE = .TRUE.
 *
@@ -719,7 +709,8 @@ SUBROUTINE ZLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *                    Copy updated JMAXth (next IMAXth) column to Kth of W
 *
-                     CALL ZCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+                     CALL ZCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ),
+     $                           1 )
 *
                   END IF
 *
@@ -754,7 +745,8 @@ SUBROUTINE ZLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *              Copy non-updated column KK to column KP
 *
                A( KP, K ) = A( KK, K )
-               CALL ZCOPY( KP-K-1, A( K+1, KK ), 1, A( KP, K+1 ), LDA )
+               CALL ZCOPY( KP-K-1, A( K+1, KK ), 1, A( KP, K+1 ),
+     $                     LDA )
                CALL ZCOPY( N-KP+1, A( KP, KK ), 1, A( KP, KP ), 1 )
 *
 *              Interchange rows KK and KP in first KK columns of A and W
@@ -838,26 +830,11 @@ SUBROUTINE ZLASYF_ROOK( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW,
 *
 *        A22 := A22 - L21*D*L21**T = A22 - L21*W**T
 *
-*        computing blocks of NB columns at a time
-*
-         DO 110 J = K, N, NB
-            JB = MIN( NB, N-J+1 )
-*
-*           Update the lower triangle of the diagonal block
-*
-            DO 100 JJ = J, J + JB - 1
-               CALL ZGEMV( 'No transpose', J+JB-JJ, K-1, -CONE,
-     $                     A( JJ, 1 ), LDA, W( JJ, 1 ), LDW, CONE,
-     $                     A( JJ, JJ ), 1 )
-  100       CONTINUE
-*
-*           Update the rectangular subdiagonal block
+*        (note that conjg(W) is actually stored)
 *
-            IF( J+JB.LE.N )
-     $         CALL ZGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
-     $                    K-1, -CONE, A( J+JB, 1 ), LDA, W( J, 1 ), LDW,
-     $                    CONE, A( J+JB, J ), LDA )
-  110    CONTINUE
+         CALL ZGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
+     $                 K-1, -CONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
+     $                 CONE, A( K, K ), LDA )
 *
 *        Put L21 in standard form by partially undoing the interchanges
 *        in columns 1:k-1
diff --git a/SRC/zlat2c.f b/SRC/zlat2c.f
index 1d607dcea1..b000027a29 100644
--- a/SRC/zlat2c.f
+++ b/SRC/zlat2c.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAT2C + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlat2c.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlat2c.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -104,10 +102,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup _lat2_
 *
 *  =====================================================================
       SUBROUTINE ZLAT2C( UPLO, N, A, LDA, SA, LDSA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -130,7 +129,7 @@ SUBROUTINE ZLAT2C( UPLO, N, A, LDA, SA, LDSA, INFO )
       LOGICAL            UPPER
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DBLE, DIMAG
+      INTRINSIC          DBLE, DIMAG, CMPLX
 *     ..
 *     .. External Functions ..
       REAL               SLAMCH
@@ -151,7 +150,7 @@ SUBROUTINE ZLAT2C( UPLO, N, A, LDA, SA, LDSA, INFO )
                   INFO = 1
                   GO TO 50
                END IF
-               SA( I, J ) = A( I, J )
+               SA( I, J ) = CMPLX( A( I, J ) )
    10       CONTINUE
    20    CONTINUE
       ELSE
@@ -164,7 +163,7 @@ SUBROUTINE ZLAT2C( UPLO, N, A, LDA, SA, LDSA, INFO )
                   INFO = 1
                   GO TO 50
                END IF
-               SA( I, J ) = A( I, J )
+               SA( I, J ) = CMPLX( A( I, J ) )
    30       CONTINUE
    40    CONTINUE
       END IF
diff --git a/SRC/zlatbs.f b/SRC/zlatbs.f
index b7b2cb8aec..cced7cd5e1 100644
--- a/SRC/zlatbs.f
+++ b/SRC/zlatbs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLATBS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlatbs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlatbs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,7 +161,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup latbs
 *
 *> \par Further Details:
 *  =====================
@@ -238,8 +236,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB, X,
+      SUBROUTINE ZLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB,
+     $                   X,
      $                   SCALE, CNORM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -274,11 +274,12 @@ SUBROUTINE ZLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB, X,
       INTEGER            IDAMAX, IZAMAX
       DOUBLE PRECISION   DLAMCH, DZASUM
       COMPLEX*16         ZDOTC, ZDOTU, ZLADIV
-      EXTERNAL           LSAME, IDAMAX, IZAMAX, DLAMCH, DZASUM, ZDOTC,
+      EXTERNAL           LSAME, IDAMAX, IZAMAX, DLAMCH, DZASUM,
+     $                   ZDOTC,
      $                   ZDOTU, ZLADIV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSCAL, XERBLA, ZAXPY, ZDSCAL, ZTBSV, DLABAD
+      EXTERNAL           DSCAL, XERBLA, ZAXPY, ZDSCAL, ZTBSV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, MAX, MIN
@@ -324,17 +325,14 @@ SUBROUTINE ZLATBS( UPLO, TRANS, DIAG, NORMIN, N, KD, AB, LDAB, X,
 *
 *     Quick return if possible
 *
+      SCALE = ONE
       IF( N.EQ.0 )
      $   RETURN
 *
 *     Determine machine dependent parameters to control overflow.
 *
-      SMLNUM = DLAMCH( 'Safe minimum' )
-      BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
-      SMLNUM = SMLNUM / DLAMCH( 'Precision' )
+      SMLNUM = DLAMCH( 'Safe minimum' ) / DLAMCH( 'Precision' )
       BIGNUM = ONE / SMLNUM
-      SCALE = ONE
 *
       IF( LSAME( NORMIN, 'N' ) ) THEN
 *
diff --git a/SRC/zlatdf.f b/SRC/zlatdf.f
index 25e71edced..48850369de 100644
--- a/SRC/zlatdf.f
+++ b/SRC/zlatdf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLATDF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlatdf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlatdf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -134,7 +132,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup latdf
 *
 *> \par Further Details:
 *  =====================
@@ -166,6 +164,7 @@
 *  =====================================================================
       SUBROUTINE ZLATDF( IJOB, N, Z, LDZ, RHS, RDSUM, RDSCAL, IPIV,
      $                   JPIV )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -200,7 +199,8 @@ SUBROUTINE ZLATDF( IJOB, N, Z, LDZ, RHS, RDSUM, RDSCAL, IPIV,
       COMPLEX*16         WORK( 4*MAXDIM ), XM( MAXDIM ), XP( MAXDIM )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZAXPY, ZCOPY, ZGECON, ZGESC2, ZLASSQ, ZLASWP,
+      EXTERNAL           ZAXPY, ZCOPY, ZGECON, ZGESC2, ZLASSQ,
+     $                   ZLASWP,
      $                   ZSCAL
 *     ..
 *     .. External Functions ..
@@ -227,12 +227,13 @@ SUBROUTINE ZLATDF( IJOB, N, Z, LDZ, RHS, RDSUM, RDSCAL, IPIV,
             BM = RHS( J ) - CONE
             SPLUS = ONE
 *
-*           Lockahead for L- part RHS(1:N-1) = +-1
+*           Look-ahead for L- part RHS(1:N-1) = +-1
 *           SPLUS and SMIN computed more efficiently than in BSOLVE[1].
 *
             SPLUS = SPLUS + DBLE( ZDOTC( N-J, Z( J+1, J ), 1, Z( J+1,
      $              J ), 1 ) )
-            SMINU = DBLE( ZDOTC( N-J, Z( J+1, J ), 1, RHS( J+1 ), 1 ) )
+            SMINU = DBLE( ZDOTC( N-J, Z( J+1, J ), 1, RHS( J+1 ),
+     $                    1 ) )
             SPLUS = SPLUS*DBLE( RHS( J ) )
             IF( SPLUS.GT.SMINU ) THEN
                RHS( J ) = BP
diff --git a/SRC/zlatps.f b/SRC/zlatps.f
index b22e42f6c1..fe2baec109 100644
--- a/SRC/zlatps.f
+++ b/SRC/zlatps.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLATPS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlatps.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlatps.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,7 +149,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup latps
 *
 *> \par Further Details:
 *  =====================
@@ -228,6 +226,7 @@
 *  =====================================================================
       SUBROUTINE ZLATPS( UPLO, TRANS, DIAG, NORMIN, N, AP, X, SCALE,
      $                   CNORM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -262,11 +261,12 @@ SUBROUTINE ZLATPS( UPLO, TRANS, DIAG, NORMIN, N, AP, X, SCALE,
       INTEGER            IDAMAX, IZAMAX
       DOUBLE PRECISION   DLAMCH, DZASUM
       COMPLEX*16         ZDOTC, ZDOTU, ZLADIV
-      EXTERNAL           LSAME, IDAMAX, IZAMAX, DLAMCH, DZASUM, ZDOTC,
+      EXTERNAL           LSAME, IDAMAX, IZAMAX, DLAMCH, DZASUM,
+     $                   ZDOTC,
      $                   ZDOTU, ZLADIV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSCAL, XERBLA, ZAXPY, ZDSCAL, ZTPSV, DLABAD
+      EXTERNAL           DSCAL, XERBLA, ZAXPY, ZDSCAL, ZTPSV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, MAX, MIN
@@ -315,7 +315,6 @@ SUBROUTINE ZLATPS( UPLO, TRANS, DIAG, NORMIN, N, AP, X, SCALE,
 *
       SMLNUM = DLAMCH( 'Safe minimum' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SMLNUM / DLAMCH( 'Precision' )
       BIGNUM = ONE / SMLNUM
       SCALE = ONE
@@ -660,7 +659,8 @@ SUBROUTINE ZLATPS( UPLO, TRANS, DIAG, NORMIN, N, AP, X, SCALE,
 *                    Compute the update
 *                       x(1:j-1) := x(1:j-1) - x(j) * A(1:j-1,j)
 *
-                     CALL ZAXPY( J-1, -X( J )*TSCAL, AP( IP-J+1 ), 1, X,
+                     CALL ZAXPY( J-1, -X( J )*TSCAL, AP( IP-J+1 ), 1,
+     $                           X,
      $                           1 )
                      I = IZAMAX( J-1, X, 1 )
                      XMAX = CABS1( X( I ) )
diff --git a/SRC/zlatrd.f b/SRC/zlatrd.f
index ee2a484723..a0d6d01980 100644
--- a/SRC/zlatrd.f
+++ b/SRC/zlatrd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLATRD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlatrd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlatrd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -140,7 +138,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup latrd
 *
 *> \par Further Details:
 *  =====================
@@ -196,6 +194,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,7 +222,8 @@ SUBROUTINE ZLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
       COMPLEX*16         ALPHA
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZAXPY, ZGEMV, ZHEMV, ZLACGV, ZLARFG, ZSCAL
+      EXTERNAL           ZAXPY, ZGEMV, ZHEMV, ZLACGV, ZLARFG,
+     $                   ZSCAL
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -256,7 +256,8 @@ SUBROUTINE ZLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
      $                     LDA, W( I, IW+1 ), LDW, ONE, A( 1, I ), 1 )
                CALL ZLACGV( N-I, W( I, IW+1 ), LDW )
                CALL ZLACGV( N-I, A( I, I+1 ), LDA )
-               CALL ZGEMV( 'No transpose', I, N-I, -ONE, W( 1, IW+1 ),
+               CALL ZGEMV( 'No transpose', I, N-I, -ONE, W( 1,
+     $                     IW+1 ),
      $                     LDW, A( I, I+1 ), LDA, ONE, A( 1, I ), 1 )
                CALL ZLACGV( N-I, A( I, I+1 ), LDA )
                A( I, I ) = DBLE( A( I, I ) )
@@ -332,17 +333,20 @@ SUBROUTINE ZLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
                CALL ZGEMV( 'Conjugate transpose', N-I, I-1, ONE,
      $                     W( I+1, 1 ), LDW, A( I+1, I ), 1, ZERO,
      $                     W( 1, I ), 1 )
-               CALL ZGEMV( 'No transpose', N-I, I-1, -ONE, A( I+1, 1 ),
+               CALL ZGEMV( 'No transpose', N-I, I-1, -ONE, A( I+1,
+     $                     1 ),
      $                     LDA, W( 1, I ), 1, ONE, W( I+1, I ), 1 )
                CALL ZGEMV( 'Conjugate transpose', N-I, I-1, ONE,
      $                     A( I+1, 1 ), LDA, A( I+1, I ), 1, ZERO,
      $                     W( 1, I ), 1 )
-               CALL ZGEMV( 'No transpose', N-I, I-1, -ONE, W( I+1, 1 ),
+               CALL ZGEMV( 'No transpose', N-I, I-1, -ONE, W( I+1,
+     $                     1 ),
      $                     LDW, W( 1, I ), 1, ONE, W( I+1, I ), 1 )
                CALL ZSCAL( N-I, TAU( I ), W( I+1, I ), 1 )
                ALPHA = -HALF*TAU( I )*ZDOTC( N-I, W( I+1, I ), 1,
      $                 A( I+1, I ), 1 )
-               CALL ZAXPY( N-I, ALPHA, A( I+1, I ), 1, W( I+1, I ), 1 )
+               CALL ZAXPY( N-I, ALPHA, A( I+1, I ), 1, W( I+1, I ),
+     $                     1 )
             END IF
 *
    20    CONTINUE
diff --git a/SRC/zlatrs.f b/SRC/zlatrs.f
index 91bb688ece..4dbfe8f511 100644
--- a/SRC/zlatrs.f
+++ b/SRC/zlatrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLATRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlatrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlatrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -159,7 +157,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup latrs
 *
 *> \par Further Details:
 *  =====================
@@ -234,8 +232,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
+      SUBROUTINE ZLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X,
+     $                   SCALE,
      $                   CNORM, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -270,11 +270,12 @@ SUBROUTINE ZLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
       INTEGER            IDAMAX, IZAMAX
       DOUBLE PRECISION   DLAMCH, DZASUM
       COMPLEX*16         ZDOTC, ZDOTU, ZLADIV
-      EXTERNAL           LSAME, IDAMAX, IZAMAX, DLAMCH, DZASUM, ZDOTC,
+      EXTERNAL           LSAME, IDAMAX, IZAMAX, DLAMCH, DZASUM,
+     $                   ZDOTC,
      $                   ZDOTU, ZLADIV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSCAL, XERBLA, ZAXPY, ZDSCAL, ZTRSV, DLABAD
+      EXTERNAL           DSCAL, XERBLA, ZAXPY, ZDSCAL, ZTRSV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, MAX, MIN
@@ -318,17 +319,14 @@ SUBROUTINE ZLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
 *
 *     Quick return if possible
 *
+      SCALE = ONE
       IF( N.EQ.0 )
      $   RETURN
 *
 *     Determine machine dependent parameters to control overflow.
 *
-      SMLNUM = DLAMCH( 'Safe minimum' )
-      BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
-      SMLNUM = SMLNUM / DLAMCH( 'Precision' )
+      SMLNUM = DLAMCH( 'Safe minimum' ) / DLAMCH( 'Precision' )
       BIGNUM = ONE / SMLNUM
-      SCALE = ONE
 *
       IF( LSAME( NORMIN, 'N' ) ) THEN
 *
@@ -360,8 +358,74 @@ SUBROUTINE ZLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
       IF( TMAX.LE.BIGNUM*HALF ) THEN
          TSCAL = ONE
       ELSE
-         TSCAL = HALF / ( SMLNUM*TMAX )
-         CALL DSCAL( N, TSCAL, CNORM, 1 )
+*
+*        Avoid NaN generation if entries in CNORM exceed the
+*        overflow threshold
+*
+         IF ( TMAX.LE.DLAMCH('Overflow') ) THEN
+*           Case 1: All entries in CNORM are valid floating-point numbers
+            TSCAL = HALF / ( SMLNUM*TMAX )
+            CALL DSCAL( N, TSCAL, CNORM, 1 )
+         ELSE
+*           Case 2: At least one column norm of A cannot be
+*           represented as a floating-point number. Find the
+*           maximum offdiagonal absolute value
+*           max( |Re(A(I,J))|, |Im(A(I,J)| ). If this entry is
+*           not +/- Infinity, use this value as TSCAL.
+            TMAX = ZERO
+            IF( UPPER ) THEN
+*
+*              A is upper triangular.
+*
+               DO J = 2, N
+                  DO I = 1, J - 1
+                     TMAX = MAX( TMAX, ABS( DBLE( A( I, J ) ) ),
+     $                           ABS( DIMAG(A ( I, J ) ) ) )
+                  END DO
+               END DO
+            ELSE
+*
+*              A is lower triangular.
+*
+               DO J = 1, N - 1
+                  DO I = J + 1, N
+                     TMAX = MAX( TMAX, ABS( DBLE( A( I, J ) ) ),
+     $                           ABS( DIMAG(A ( I, J ) ) ) )
+                  END DO
+               END DO
+            END IF
+*
+            IF( TMAX.LE.DLAMCH('Overflow') ) THEN
+               TSCAL = ONE / ( SMLNUM*TMAX )
+               DO J = 1, N
+                  IF( CNORM( J ).LE.DLAMCH('Overflow') ) THEN
+                     CNORM( J ) = CNORM( J )*TSCAL
+                  ELSE
+*                    Recompute the 1-norm of each column without
+*                    introducing Infinity in the summation.
+                     TSCAL = TWO * TSCAL
+                     CNORM( J ) = ZERO
+                     IF( UPPER ) THEN
+                        DO I = 1, J - 1
+                           CNORM( J ) = CNORM( J ) +
+     $                                  TSCAL * CABS2( A( I, J ) )
+                        END DO
+                     ELSE
+                        DO I = J + 1, N
+                           CNORM( J ) = CNORM( J ) +
+     $                                  TSCAL * CABS2( A( I, J ) )
+                        END DO
+                     END IF
+                     TSCAL = TSCAL * HALF
+                  END IF
+               END DO
+            ELSE
+*              At least one entry of A is not a valid floating-point
+*              entry. Rely on TRSV to propagate Inf and NaN.
+               CALL ZTRSV( UPLO, TRANS, DIAG, N, A, LDA, X, 1 )
+               RETURN
+            END IF
+         END IF
       END IF
 *
 *     Compute a bound on the computed solution vector to see if the
@@ -723,7 +787,8 @@ SUBROUTINE ZLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
                   IF( UPPER ) THEN
                      CSUMJ = ZDOTU( J-1, A( 1, J ), 1, X, 1 )
                   ELSE IF( J.LT.N ) THEN
-                     CSUMJ = ZDOTU( N-J, A( J+1, J ), 1, X( J+1 ), 1 )
+                     CSUMJ = ZDOTU( N-J, A( J+1, J ), 1, X( J+1 ),
+     $                              1 )
                   END IF
                ELSE
 *
@@ -857,7 +922,8 @@ SUBROUTINE ZLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
                   IF( UPPER ) THEN
                      CSUMJ = ZDOTC( J-1, A( 1, J ), 1, X, 1 )
                   ELSE IF( J.LT.N ) THEN
-                     CSUMJ = ZDOTC( N-J, A( J+1, J ), 1, X( J+1 ), 1 )
+                     CSUMJ = ZDOTC( N-J, A( J+1, J ), 1, X( J+1 ),
+     $                              1 )
                   END IF
                ELSE
 *
diff --git a/SRC/zlatrs3.f b/SRC/zlatrs3.f
new file mode 100644
index 0000000000..af5fc69a30
--- /dev/null
+++ b/SRC/zlatrs3.f
@@ -0,0 +1,687 @@
+*> \brief \b ZLATRS3 solves a triangular system of equations with the scale factors set to prevent overflow.
+*
+*  Definition:
+*  ===========
+*
+*      SUBROUTINE ZLATRS3( UPLO, TRANS, DIAG, NORMIN, N, NRHS, A, LDA,
+*                          X, LDX, SCALE, CNORM, WORK, LWORK, INFO )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          DIAG, NORMIN, TRANS, UPLO
+*       INTEGER            INFO, LDA, LWORK, LDX, N, NRHS
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   CNORM( * ), SCALE( * ), WORK( * )
+*       COMPLEX*16         A( LDA, * ), X( LDX, * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLATRS3 solves one of the triangular systems
+*>
+*>    A * X = B * diag(scale),  A**T * X = B * diag(scale), or
+*>    A**H * X = B * diag(scale)
+*>
+*> with scaling to prevent overflow.  Here A is an upper or lower
+*> triangular matrix, A**T denotes the transpose of A, A**H denotes the
+*> conjugate transpose of A. X and B are n-by-nrhs matrices and scale
+*> is an nrhs-element vector of scaling factors. A scaling factor scale(j)
+*> is usually less than or equal to 1, chosen such that X(:,j) is less
+*> than the overflow threshold. If the matrix A is singular (A(j,j) = 0
+*> for some j), then a non-trivial solution to A*X = 0 is returned. If
+*> the system is so badly scaled that the solution cannot be represented
+*> as (1/scale(k))*X(:,k), then x(:,k) = 0 and scale(k) is returned.
+*>
+*> This is a BLAS-3 version of LATRS for solving several right
+*> hand sides simultaneously.
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>          Specifies whether the matrix A is upper or lower triangular.
+*>          = 'U':  Upper triangular
+*>          = 'L':  Lower triangular
+*> \endverbatim
+*>
+*> \param[in] TRANS
+*> \verbatim
+*>          TRANS is CHARACTER*1
+*>          Specifies the operation applied to A.
+*>          = 'N':  Solve A * x = s*b  (No transpose)
+*>          = 'T':  Solve A**T* x = s*b  (Transpose)
+*>          = 'C':  Solve A**T* x = s*b  (Conjugate transpose)
+*> \endverbatim
+*>
+*> \param[in] DIAG
+*> \verbatim
+*>          DIAG is CHARACTER*1
+*>          Specifies whether or not the matrix A is unit triangular.
+*>          = 'N':  Non-unit triangular
+*>          = 'U':  Unit triangular
+*> \endverbatim
+*>
+*> \param[in] NORMIN
+*> \verbatim
+*>          NORMIN is CHARACTER*1
+*>          Specifies whether CNORM has been set or not.
+*>          = 'Y':  CNORM contains the column norms on entry
+*>          = 'N':  CNORM is not set on entry.  On exit, the norms will
+*>                  be computed and stored in CNORM.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of columns of X.  NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          The triangular matrix A.  If UPLO = 'U', the leading n by n
+*>          upper triangular part of the array A contains the upper
+*>          triangular matrix, and the strictly lower triangular part of
+*>          A is not referenced.  If UPLO = 'L', the leading n by n lower
+*>          triangular part of the array A contains the lower triangular
+*>          matrix, and the strictly upper triangular part of A is not
+*>          referenced.  If DIAG = 'U', the diagonal elements of A are
+*>          also not referenced and are assumed to be 1.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max (1,N).
+*> \endverbatim
+*>
+*> \param[in,out] X
+*> \verbatim
+*>          X is COMPLEX*16 array, dimension (LDX,NRHS)
+*>          On entry, the right hand side B of the triangular system.
+*>          On exit, X is overwritten by the solution matrix X.
+*> \endverbatim
+*>
+*> \param[in] LDX
+*> \verbatim
+*>          LDX is INTEGER
+*>          The leading dimension of the array X.  LDX >= max (1,N).
+*> \endverbatim
+*>
+*> \param[out] SCALE
+*> \verbatim
+*>          SCALE is DOUBLE PRECISION array, dimension (NRHS)
+*>          The scaling factor s(k) is for the triangular system
+*>          A * x(:,k) = s(k)*b(:,k)  or  A**T* x(:,k) = s(k)*b(:,k).
+*>          If SCALE = 0, the matrix A is singular or badly scaled.
+*>          If A(j,j) = 0 is encountered, a non-trivial vector x(:,k)
+*>          that is an exact or approximate solution to A*x(:,k) = 0
+*>          is returned. If the system so badly scaled that solution
+*>          cannot be presented as x(:,k) * 1/s(k), then x(:,k) = 0
+*>          is returned.
+*> \endverbatim
+*>
+*> \param[in,out] CNORM
+*> \verbatim
+*>          CNORM is DOUBLE PRECISION array, dimension (N)
+*>
+*>          If NORMIN = 'Y', CNORM is an input argument and CNORM(j)
+*>          contains the norm of the off-diagonal part of the j-th column
+*>          of A.  If TRANS = 'N', CNORM(j) must be greater than or equal
+*>          to the infinity-norm, and if TRANS = 'T' or 'C', CNORM(j)
+*>          must be greater than or equal to the 1-norm.
+*>
+*>          If NORMIN = 'N', CNORM is an output argument and CNORM(j)
+*>          returns the 1-norm of the offdiagonal part of the j-th column
+*>          of A.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension (LWORK).
+*>          On exit, if INFO = 0, WORK(1) returns the optimal size of
+*>          WORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>
+*>          If MIN(N,NRHS) = 0, LWORK >= 1, else
+*>          LWORK >= MAX(1, 2*NBA * MAX(NBA, MIN(NRHS, 32)), where
+*>          NBA = (N + NB - 1)/NB and NB is the optimal block size.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal dimensions of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -k, the k-th argument had an illegal value
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup latrs3
+*> \par Further Details:
+*  =====================
+*  \verbatim
+*  The algorithm follows the structure of a block triangular solve.
+*  The diagonal block is solved with a call to the robust the triangular
+*  solver LATRS for every right-hand side RHS = 1, ..., NRHS
+*     op(A( J, J )) * x( J, RHS ) = SCALOC * b( J, RHS ),
+*  where op( A ) = A or op( A ) = A**T or op( A ) = A**H.
+*  The linear block updates operate on block columns of X,
+*     B( I, K ) - op(A( I, J )) * X( J, K )
+*  and use GEMM. To avoid overflow in the linear block update, the worst case
+*  growth is estimated. For every RHS, a scale factor s <= 1.0 is computed
+*  such that
+*     || s * B( I, RHS )||_oo
+*   + || op(A( I, J )) ||_oo * || s *  X( J, RHS ) ||_oo <= Overflow threshold
+*
+*  Once all columns of a block column have been rescaled (BLAS-1), the linear
+*  update is executed with GEMM without overflow.
+*
+*  To limit rescaling, local scale factors track the scaling of column segments.
+*  There is one local scale factor s( I, RHS ) per block row I = 1, ..., NBA
+*  per right-hand side column RHS = 1, ..., NRHS. The global scale factor
+*  SCALE( RHS ) is chosen as the smallest local scale factor s( I, RHS )
+*  I = 1, ..., NBA.
+*  A triangular solve op(A( J, J )) * x( J, RHS ) = SCALOC * b( J, RHS )
+*  updates the local scale factor s( J, RHS ) := s( J, RHS ) * SCALOC. The
+*  linear update of potentially inconsistently scaled vector segments
+*     s( I, RHS ) * b( I, RHS ) - op(A( I, J )) * ( s( J, RHS )* x( J, RHS ) )
+*  computes a consistent scaling SCAMIN = MIN( s(I, RHS ), s(J, RHS) ) and,
+*  if necessary, rescales the blocks prior to calling GEMM.
+*
+*  \endverbatim
+*  =====================================================================
+*  References:
+*  C. C. Kjelgaard Mikkelsen, A. B. Schwarz and L. Karlsson (2019).
+*  Parallel robust solution of triangular linear systems. Concurrency
+*  and Computation: Practice and Experience, 31(19), e5064.
+*
+*  Contributor:
+*   Angelika Schwarz, Umea University, Sweden.
+*
+*  =====================================================================
+      SUBROUTINE ZLATRS3( UPLO, TRANS, DIAG, NORMIN, N, NRHS, A, LDA,
+     $                    X, LDX, SCALE, CNORM, WORK, LWORK, INFO )
+      IMPLICIT NONE
+*
+*     .. Scalar Arguments ..
+      CHARACTER          DIAG, TRANS, NORMIN, UPLO
+      INTEGER            INFO, LDA, LWORK, LDX, N, NRHS
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), X( LDX, * )
+      DOUBLE PRECISION   CNORM( * ), SCALE( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+      COMPLEX*16         CZERO, CONE
+      PARAMETER          ( CONE = ( 1.0D+0, 0.0D+0 ) )
+      PARAMETER          ( CZERO = ( 0.0D+0, 0.0D+0 ) )
+      INTEGER            NBMAX, NBMIN, NBRHS, NRHSMIN
+      PARAMETER          ( NRHSMIN = 2, NBRHS = 32 )
+      PARAMETER          ( NBMIN = 8, NBMAX = 64 )
+*     ..
+*     .. Local Arrays ..
+      DOUBLE PRECISION   W( NBMAX ), XNRM( NBRHS )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY, NOTRAN, NOUNIT, UPPER
+      INTEGER            AWRK, I, IFIRST, IINC, ILAST, II, I1, I2, J,
+     $                   JFIRST, JINC, JLAST, J1, J2, K, KK, K1, K2,
+     $                   LANRM, LDS, LSCALE, NB, NBA, NBX, RHS, LWMIN
+      DOUBLE PRECISION   ANRM, BIGNUM, BNRM, RSCAL, SCAL, SCALOC,
+     $                   SCAMIN, SMLNUM, TMAX
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      DOUBLE PRECISION   DLAMCH, ZLANGE, DLARMM
+      EXTERNAL           ILAENV, LSAME, DLAMCH, ZLANGE,
+     $                   DLARMM
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZLATRS, ZDSCAL, XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+      INFO = 0
+      UPPER = LSAME( UPLO, 'U' )
+      NOTRAN = LSAME( TRANS, 'N' )
+      NOUNIT = LSAME( DIAG, 'N' )
+      LQUERY = ( LWORK.EQ.-1 )
+*
+*     Partition A and X into blocks.
+*
+      NB = MAX( NBMIN, ILAENV( 1, 'ZLATRS', '', N, N, -1, -1 ) )
+      NB = MIN( NBMAX, NB )
+      NBA = MAX( 1, (N + NB - 1) / NB )
+      NBX = MAX( 1, (NRHS + NBRHS - 1) / NBRHS )
+*
+*     Compute the workspace
+*
+*     The workspace comprises two parts.
+*     The first part stores the local scale factors. Each simultaneously
+*     computed right-hand side requires one local scale factor per block
+*     row. WORK( I + KK * LDS ) is the scale factor of the vector
+*     segment associated with the I-th block row and the KK-th vector
+*     in the block column.
+*
+      LSCALE = NBA * MAX( NBA, MIN( NRHS, NBRHS ) )
+      LDS = NBA
+*
+*     The second part stores upper bounds of the triangular A. There are
+*     a total of NBA x NBA blocks, of which only the upper triangular
+*     part or the lower triangular part is referenced. The upper bound of
+*     the block A( I, J ) is stored as WORK( AWRK + I + J * NBA ).
+*
+      LANRM = NBA * NBA
+      AWRK = LSCALE
+*
+      IF( MIN( N, NRHS ).EQ.0 ) THEN
+         LWMIN = 1
+      ELSE
+         LWMIN = LSCALE + LANRM
+      END IF
+      WORK( 1 ) = LWMIN
+*
+*     Test the input parameters.
+*
+      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
+     $         LSAME( TRANS, 'C' ) ) THEN
+         INFO = -2
+      ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
+         INFO = -3
+      ELSE IF( .NOT.LSAME( NORMIN, 'Y' ) .AND. .NOT.
+     $         LSAME( NORMIN, 'N' ) ) THEN
+         INFO = -4
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -5
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -6
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -8
+      ELSE IF( LDX.LT.MAX( 1, N ) ) THEN
+         INFO = -10
+      ELSE IF( .NOT.LQUERY .AND. LWORK.LT.LWMIN ) THEN
+         INFO = -14
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZLATRS3', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Initialize scaling factors
+*
+      DO KK = 1, NRHS
+         SCALE( KK ) = ONE
+      END DO
+*
+*     Quick return if possible
+*
+      IF( MIN( N, NRHS ).EQ.0 )
+     $   RETURN
+*
+*     Determine machine dependent constant to control overflow.
+*
+      BIGNUM = DLAMCH( 'Overflow' )
+      SMLNUM = DLAMCH( 'Safe Minimum' )
+*
+*     Use unblocked code for small problems
+*
+      IF( NRHS.LT.NRHSMIN ) THEN
+         CALL ZLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X( 1, 1),
+     $                SCALE( 1 ), CNORM, INFO )
+         DO K = 2, NRHS
+            CALL ZLATRS( UPLO, TRANS, DIAG, 'Y', N, A, LDA, X( 1,
+     $                   K ),
+     $                   SCALE( K ), CNORM, INFO )
+         END DO
+         RETURN
+      END IF
+*
+*     Compute norms of blocks of A excluding diagonal blocks and find
+*     the block with the largest norm TMAX.
+*
+      TMAX = ZERO
+      DO J = 1, NBA
+         J1 = (J-1)*NB + 1
+         J2 = MIN( J*NB, N ) + 1
+         IF ( UPPER ) THEN
+            IFIRST = 1
+            ILAST = J - 1
+         ELSE
+            IFIRST = J + 1
+            ILAST = NBA
+         END IF
+         DO I = IFIRST, ILAST
+            I1 = (I-1)*NB + 1
+            I2 = MIN( I*NB, N ) + 1
+*
+*           Compute upper bound of A( I1:I2-1, J1:J2-1 ).
+*
+            IF( NOTRAN ) THEN
+               ANRM = ZLANGE( 'I', I2-I1, J2-J1, A( I1, J1 ), LDA,
+     $                        W )
+               WORK( AWRK + I+(J-1)*NBA ) = ANRM
+            ELSE
+               ANRM = ZLANGE( '1', I2-I1, J2-J1, A( I1, J1 ), LDA,
+     $                        W )
+               WORK( AWRK + J+(I-1) * NBA ) = ANRM
+            END IF
+            TMAX = MAX( TMAX, ANRM )
+         END DO
+      END DO
+*
+      IF( .NOT. TMAX.LE.DLAMCH('Overflow') ) THEN
+*
+*        Some matrix entries have huge absolute value. At least one upper
+*        bound norm( A(I1:I2-1, J1:J2-1), 'I') is not a valid floating-point
+*        number, either due to overflow in LANGE or due to Inf in A.
+*        Fall back to LATRS. Set normin = 'N' for every right-hand side to
+*        force computation of TSCAL in LATRS to avoid the likely overflow
+*        in the computation of the column norms CNORM.
+*
+         DO K = 1, NRHS
+            CALL ZLATRS( UPLO, TRANS, DIAG, 'N', N, A, LDA, X( 1,
+     $                   K ),
+     $                   SCALE( K ), CNORM, INFO )
+         END DO
+         RETURN
+      END IF
+*
+*     Every right-hand side requires workspace to store NBA local scale
+*     factors. To save workspace, X is computed successively in block columns
+*     of width NBRHS, requiring a total of NBA x NBRHS space. If sufficient
+*     workspace is available, larger values of NBRHS or NBRHS = NRHS are viable.
+      DO K = 1, NBX
+*        Loop over block columns (index = K) of X and, for column-wise scalings,
+*        over individual columns (index = KK).
+*        K1: column index of the first column in X( J, K )
+*        K2: column index of the first column in X( J, K+1 )
+*        so the K2 - K1 is the column count of the block X( J, K )
+         K1 = (K-1)*NBRHS + 1
+         K2 = MIN( K*NBRHS, NRHS ) + 1
+*
+*        Initialize local scaling factors of current block column X( J, K )
+*
+         DO KK = 1, K2 - K1
+            DO I = 1, NBA
+               WORK( I+KK*LDS ) = ONE
+            END DO
+         END DO
+*
+         IF( NOTRAN ) THEN
+*
+*           Solve A * X(:, K1:K2-1) = B * diag(scale(K1:K2-1))
+*
+            IF( UPPER ) THEN
+               JFIRST = NBA
+               JLAST = 1
+               JINC = -1
+            ELSE
+               JFIRST = 1
+               JLAST = NBA
+               JINC = 1
+            END IF
+         ELSE
+*
+*           Solve op(A) * X(:, K1:K2-1) = B * diag(scale(K1:K2-1))
+*           where op(A) = A**T or op(A) = A**H
+*
+            IF( UPPER ) THEN
+               JFIRST = 1
+               JLAST = NBA
+               JINC = 1
+            ELSE
+               JFIRST = NBA
+               JLAST = 1
+               JINC = -1
+            END IF
+         END IF
+
+         DO J = JFIRST, JLAST, JINC
+*           J1: row index of the first row in A( J, J )
+*           J2: row index of the first row in A( J+1, J+1 )
+*           so that J2 - J1 is the row count of the block A( J, J )
+            J1 = (J-1)*NB + 1
+            J2 = MIN( J*NB, N ) + 1
+*
+*           Solve op(A( J, J )) * X( J, RHS ) = SCALOC * B( J, RHS )
+*
+            DO KK = 1, K2 - K1
+               RHS = K1 + KK - 1
+               IF( KK.EQ.1 ) THEN
+                  CALL ZLATRS( UPLO, TRANS, DIAG, 'N', J2-J1,
+     $                         A( J1, J1 ), LDA, X( J1, RHS ),
+     $                         SCALOC, CNORM, INFO )
+               ELSE
+                  CALL ZLATRS( UPLO, TRANS, DIAG, 'Y', J2-J1,
+     $                         A( J1, J1 ), LDA, X( J1, RHS ),
+     $                         SCALOC, CNORM, INFO )
+               END IF
+*              Find largest absolute value entry in the vector segment
+*              X( J1:J2-1, RHS ) as an upper bound for the worst case
+*              growth in the linear updates.
+               XNRM( KK ) = ZLANGE( 'I', J2-J1, 1, X( J1, RHS ),
+     $                              LDX, W )
+*
+               IF( SCALOC .EQ. ZERO ) THEN
+*                 LATRS found that A is singular through A(j,j) = 0.
+*                 Reset the computation x(1:n) = 0, x(j) = 1, SCALE = 0
+*                 and compute op(A)*x = 0. Note that X(J1:J2-1, KK) is
+*                 set by LATRS.
+                  SCALE( RHS ) = ZERO
+                  DO II = 1, J1-1
+                     X( II, KK ) = CZERO
+                  END DO
+                  DO II = J2, N
+                     X( II, KK ) = CZERO
+                  END DO
+*                 Discard the local scale factors.
+                  DO II = 1, NBA
+                     WORK( II+KK*LDS ) = ONE
+                  END DO
+                  SCALOC = ONE
+               ELSE IF( SCALOC*WORK( J+KK*LDS ) .EQ. ZERO ) THEN
+*                 LATRS computed a valid scale factor, but combined with
+*                 the current scaling the solution does not have a
+*                 scale factor > 0.
+*
+*                 Set WORK( J+KK*LDS ) to smallest valid scale
+*                 factor and increase SCALOC accordingly.
+                  SCAL = WORK( J+KK*LDS ) / SMLNUM
+                  SCALOC = SCALOC * SCAL
+                  WORK( J+KK*LDS ) = SMLNUM
+*                 If LATRS overestimated the growth, x may be
+*                 rescaled to preserve a valid combined scale
+*                 factor WORK( J, KK ) > 0.
+                  RSCAL = ONE / SCALOC
+                  IF( XNRM( KK )*RSCAL .LE. BIGNUM ) THEN
+                     XNRM( KK ) = XNRM( KK ) * RSCAL
+                     CALL ZDSCAL( J2-J1, RSCAL, X( J1, RHS ), 1 )
+                     SCALOC = ONE
+                  ELSE
+*                    The system op(A) * x = b is badly scaled and its
+*                    solution cannot be represented as (1/scale) * x.
+*                    Set x to zero. This approach deviates from LATRS
+*                    where a completely meaningless non-zero vector
+*                    is returned that is not a solution to op(A) * x = b.
+                     SCALE( RHS ) = ZERO
+                     DO II = 1, N
+                        X( II, KK ) = CZERO
+                     END DO
+*                    Discard the local scale factors.
+                     DO II = 1, NBA
+                        WORK( II+KK*LDS ) = ONE
+                     END DO
+                     SCALOC = ONE
+                  END IF
+               END IF
+               SCALOC = SCALOC * WORK( J+KK*LDS )
+               WORK( J+KK*LDS ) = SCALOC
+            END DO
+*
+*           Linear block updates
+*
+            IF( NOTRAN ) THEN
+               IF( UPPER ) THEN
+                  IFIRST = J - 1
+                  ILAST = 1
+                  IINC = -1
+               ELSE
+                  IFIRST = J + 1
+                  ILAST = NBA
+                  IINC = 1
+               END IF
+            ELSE
+               IF( UPPER ) THEN
+                  IFIRST = J + 1
+                  ILAST = NBA
+                  IINC = 1
+               ELSE
+                  IFIRST = J - 1
+                  ILAST = 1
+                  IINC = -1
+               END IF
+            END IF
+*
+            DO I = IFIRST, ILAST, IINC
+*              I1: row index of the first column in X( I, K )
+*              I2: row index of the first column in X( I+1, K )
+*              so the I2 - I1 is the row count of the block X( I, K )
+               I1 = (I-1)*NB + 1
+               I2 = MIN( I*NB, N ) + 1
+*
+*              Prepare the linear update to be executed with GEMM.
+*              For each column, compute a consistent scaling, a
+*              scaling factor to survive the linear update, and
+*              rescale the column segments, if necessary. Then
+*              the linear update is safely executed.
+*
+               DO KK = 1, K2 - K1
+                  RHS = K1 + KK - 1
+*                 Compute consistent scaling
+                  SCAMIN = MIN( WORK( I+KK*LDS), WORK( J+KK*LDS ) )
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  BNRM = ZLANGE( 'I', I2-I1, 1, X( I1, RHS ), LDX,
+     $                           W )
+                  BNRM = BNRM*( SCAMIN / WORK( I+KK*LDS ) )
+                  XNRM( KK ) = XNRM( KK )*( SCAMIN / WORK( J+KK*LDS) )
+                  ANRM = WORK( AWRK + I+(J-1)*NBA )
+                  SCALOC = DLARMM( ANRM, XNRM( KK ), BNRM )
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to X( I, KK ) and X( J, KK ).
+*
+                  SCAL = ( SCAMIN / WORK( I+KK*LDS) )*SCALOC
+                  IF( SCAL.NE.ONE ) THEN
+                     CALL ZDSCAL( I2-I1, SCAL, X( I1, RHS ), 1 )
+                     WORK( I+KK*LDS ) = SCAMIN*SCALOC
+                  END IF
+*
+                  SCAL = ( SCAMIN / WORK( J+KK*LDS ) )*SCALOC
+                  IF( SCAL.NE.ONE ) THEN
+                     CALL ZDSCAL( J2-J1, SCAL, X( J1, RHS ), 1 )
+                     WORK( J+KK*LDS ) = SCAMIN*SCALOC
+                  END IF
+               END DO
+*
+               IF( NOTRAN ) THEN
+*
+*                 B( I, K ) := B( I, K ) - A( I, J ) * X( J, K )
+*
+                  CALL ZGEMM( 'N', 'N', I2-I1, K2-K1, J2-J1, -CONE,
+     $                        A( I1, J1 ), LDA, X( J1, K1 ), LDX,
+     $                        CONE, X( I1, K1 ), LDX )
+               ELSE IF( LSAME( TRANS, 'T' ) ) THEN
+*
+*                 B( I, K ) := B( I, K ) - A( I, J )**T * X( J, K )
+*
+                  CALL ZGEMM( 'T', 'N', I2-I1, K2-K1, J2-J1, -CONE,
+     $                        A( J1, I1 ), LDA, X( J1, K1 ), LDX,
+     $                        CONE, X( I1, K1 ), LDX )
+               ELSE
+*
+*                 B( I, K ) := B( I, K ) - A( I, J )**H * X( J, K )
+*
+                  CALL ZGEMM( 'C', 'N', I2-I1, K2-K1, J2-J1, -CONE,
+     $                        A( J1, I1 ), LDA, X( J1, K1 ), LDX,
+     $                        CONE, X( I1, K1 ), LDX )
+               END IF
+            END DO
+         END DO
+
+*
+*        Reduce local scaling factors
+*
+         DO KK = 1, K2 - K1
+            RHS = K1 + KK - 1
+            DO I = 1, NBA
+               SCALE( RHS ) = MIN( SCALE( RHS ), WORK( I+KK*LDS ) )
+            END DO
+         END DO
+*
+*        Realize consistent scaling
+*
+         DO KK = 1, K2 - K1
+            RHS = K1 + KK - 1
+            IF( SCALE( RHS ).NE.ONE .AND. SCALE( RHS ).NE. ZERO ) THEN
+               DO I = 1, NBA
+                  I1 = (I - 1) * NB + 1
+                  I2 = MIN( I * NB, N ) + 1
+                  SCAL = SCALE( RHS ) / WORK( I+KK*LDS )
+                  IF( SCAL.NE.ONE )
+     $               CALL ZDSCAL( I2-I1, SCAL, X( I1, RHS ), 1 )
+               END DO
+            END IF
+         END DO
+      END DO
+      RETURN
+*
+*     End of ZLATRS3
+*
+      END
diff --git a/SRC/zlatrz.f b/SRC/zlatrz.f
index 6fe2138170..d79d11a5ab 100644
--- a/SRC/zlatrz.f
+++ b/SRC/zlatrz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLATRZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlatrz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlatrz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,7 +95,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup latrz
 *
 *> \par Contributors:
 *  ==================
@@ -137,6 +135,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZLATRZ( M, N, L, A, LDA, TAU, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zlatsqr.f b/SRC/zlatsqr.f
index 7069a47d28..ffb402ebd8 100644
--- a/SRC/zlatsqr.f
+++ b/SRC/zlatsqr.f
@@ -101,14 +101,18 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>         (workspace) COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          (workspace) COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the minimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
-*>          The dimension of the array WORK.  LWORK >= NB*N.
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          LWORK >= 1, if MIN(M,N) = 0, and LWORK >= NB*N, otherwise.
+*>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
+*>          only calculates the minimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
@@ -160,33 +164,38 @@
 *>     SIAM J. Sci. Comput, vol. 34, no. 1, 2012
 *> \endverbatim
 *>
+*> \ingroup latsqr
+*>
 *  =====================================================================
       SUBROUTINE ZLATSQR( M, N, MB, NB, A, LDA, T, LDT, WORK,
-     $                    LWORK, INFO)
+     $                    LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd. --
 *
 *     .. Scalar Arguments ..
-      INTEGER           INFO, LDA, M, N, MB, NB, LDT, LWORK
+      INTEGER            INFO, LDA, M, N, MB, NB, LDT, LWORK
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16        A( LDA, * ), WORK( * ), T(LDT, *)
+      COMPLEX*16         A( LDA, * ), WORK( * ), T( LDT, * )
 *     ..
 *
 *  =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
-      LOGICAL    LQUERY
-      INTEGER    I, II, KK, CTR
+      LOGICAL            LQUERY
+      INTEGER            I, II, KK, CTR, LWMIN, MINMN
 *     ..
 *     .. EXTERNAL FUNCTIONS ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
+*     ..
 *     .. EXTERNAL SUBROUTINES ..
-      EXTERNAL    ZGEQRT, ZTPQRT, XERBLA
+      EXTERNAL           ZGEQRT, ZTPQRT, XERBLA
+*     ..
 *     .. INTRINSIC FUNCTIONS ..
       INTRINSIC          MAX, MIN, MOD
 *     ..
@@ -197,71 +206,79 @@ SUBROUTINE ZLATSQR( M, N, MB, NB, A, LDA, T, LDT, WORK,
       INFO = 0
 *
       LQUERY = ( LWORK.EQ.-1 )
+*
+      MINMN = MIN( M, N )
+      IF( MINMN.EQ.0 ) THEN
+        LWMIN = 1
+      ELSE
+        LWMIN = N*NB
+      END IF
 *
       IF( M.LT.0 ) THEN
         INFO = -1
       ELSE IF( N.LT.0 .OR. M.LT.N ) THEN
         INFO = -2
-      ELSE IF( MB.LE.N ) THEN
+      ELSE IF( MB.LT.1 ) THEN
         INFO = -3
-      ELSE IF( NB.LT.1 .OR. ( NB.GT.N .AND. N.GT.0 )) THEN
+      ELSE IF( NB.LT.1 .OR. ( NB.GT.N .AND. N.GT.0 ) ) THEN
         INFO = -4
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-        INFO = -5
+        INFO = -6
       ELSE IF( LDT.LT.NB ) THEN
         INFO = -8
-      ELSE IF( LWORK.LT.(N*NB) .AND. (.NOT.LQUERY) ) THEN
+      ELSE IF( LWORK.LT.LWMIN .AND. (.NOT.LQUERY) ) THEN
         INFO = -10
       END IF
-      IF( INFO.EQ.0)  THEN
-        WORK(1) = NB*N
+*
+      IF( INFO.EQ.0 )  THEN
+        WORK( 1 ) = LWMIN
       END IF
       IF( INFO.NE.0 ) THEN
         CALL XERBLA( 'ZLATSQR', -INFO )
         RETURN
-      ELSE IF (LQUERY) THEN
-       RETURN
+      ELSE IF( LQUERY ) THEN
+        RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( MIN(M,N).EQ.0 ) THEN
-          RETURN
+      IF( MINMN.EQ.0 ) THEN
+        RETURN
       END IF
 *
 *     The QR Decomposition
 *
-       IF ((MB.LE.N).OR.(MB.GE.M)) THEN
-         CALL ZGEQRT( M, N, NB, A, LDA, T, LDT, WORK, INFO)
-         RETURN
-       END IF
-       KK = MOD((M-N),(MB-N))
-       II=M-KK+1
+      IF( (MB.LE.N) .OR. (MB.GE.M) ) THEN
+        CALL ZGEQRT( M, N, NB, A, LDA, T, LDT, WORK, INFO )
+        RETURN
+      END IF
+      KK = MOD((M-N),(MB-N))
+      II = M-KK+1
 *
-*      Compute the QR factorization of the first block A(1:MB,1:N)
+*     Compute the QR factorization of the first block A(1:MB,1:N)
 *
-       CALL ZGEQRT( MB, N, NB, A(1,1), LDA, T, LDT, WORK, INFO )
-       CTR = 1
+      CALL ZGEQRT( MB, N, NB, A(1,1), LDA, T, LDT, WORK, INFO )
+      CTR = 1
 *
-       DO I = MB+1, II-MB+N ,  (MB-N)
+      DO I = MB+1, II-MB+N, (MB-N)
 *
-*      Compute the QR factorization of the current block A(I:I+MB-N,1:N)
+*       Compute the QR factorization of the current block A(I:I+MB-N,1:N)
 *
-         CALL ZTPQRT( MB-N, N, 0, NB, A(1,1), LDA, A( I, 1 ), LDA,
-     $                 T(1, CTR * N + 1),
-     $                  LDT, WORK, INFO )
-         CTR = CTR + 1
-       END DO
+        CALL ZTPQRT( MB-N, N, 0, NB, A(1,1), LDA, A( I, 1 ), LDA,
+     $                T(1, CTR * N + 1),
+     $                LDT, WORK, INFO )
+        CTR = CTR + 1
+      END DO
 *
-*      Compute the QR factorization of the last block A(II:M,1:N)
+*     Compute the QR factorization of the last block A(II:M,1:N)
 *
-       IF (II.LE.M) THEN
-         CALL ZTPQRT( KK, N, 0, NB, A(1,1), LDA, A( II, 1 ), LDA,
-     $                 T(1,CTR * N + 1), LDT,
-     $                  WORK, INFO )
-       END IF
+      IF( II.LE.M ) THEN
+        CALL ZTPQRT( KK, N, 0, NB, A(1,1), LDA, A( II, 1 ), LDA,
+     $                T(1,CTR * N + 1), LDT,
+     $                WORK, INFO )
+      END IF
 *
-      work( 1 ) = N*NB
+      WORK( 1 ) = LWMIN
       RETURN
 *
 *     End of ZLATSQR
diff --git a/SRC/zlaunhr_col_getrfnp.f b/SRC/zlaunhr_col_getrfnp.f
index c40599a42e..da04d8919d 100644
--- a/SRC/zlaunhr_col_getrfnp.f
+++ b/SRC/zlaunhr_col_getrfnp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAUNHR_COL_GETRFNP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaunhr_col_getrfnp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaunhr_col_getrfnp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -128,7 +126,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup launhr_col_getrfnp
 *
 *> \par Contributors:
 *  ==================
@@ -166,7 +164,8 @@ SUBROUTINE ZLAUNHR_COL_GETRFNP( M, N, A, LDA, D, INFO )
       INTEGER            IINFO, J, JB, NB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZGEMM, ZLAUNHR_COL_GETRFNP2, ZTRSM, XERBLA
+      EXTERNAL           ZGEMM, ZLAUNHR_COL_GETRFNP2, ZTRSM,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
@@ -223,14 +222,16 @@ SUBROUTINE ZLAUNHR_COL_GETRFNP( M, N, A, LDA, D, INFO )
 *
 *              Compute block row of U.
 *
-               CALL ZTRSM( 'Left', 'Lower', 'No transpose', 'Unit', JB,
+               CALL ZTRSM( 'Left', 'Lower', 'No transpose', 'Unit',
+     $                     JB,
      $                     N-J-JB+1, CONE, A( J, J ), LDA, A( J, J+JB ),
      $                     LDA )
                IF( J+JB.LE.M ) THEN
 *
 *                 Update trailing submatrix.
 *
-                  CALL ZGEMM( 'No transpose', 'No transpose', M-J-JB+1,
+                  CALL ZGEMM( 'No transpose', 'No transpose',
+     $                        M-J-JB+1,
      $                        N-J-JB+1, JB, -CONE, A( J+JB, J ), LDA,
      $                        A( J, J+JB ), LDA, CONE, A( J+JB, J+JB ),
      $                        LDA )
diff --git a/SRC/zlaunhr_col_getrfnp2.f b/SRC/zlaunhr_col_getrfnp2.f
index fe67f1fc85..a3625dd5e2 100644
--- a/SRC/zlaunhr_col_getrfnp2.f
+++ b/SRC/zlaunhr_col_getrfnp2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAUNHR_COL_GETRFNP2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaunhr_col_getrfnp2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaunhr_col_getrfnp2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -149,7 +147,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup launhr_col_getrfnp2
 *
 *> \par Contributors:
 *  ==================
@@ -163,7 +161,8 @@
 *> \endverbatim
 *
 *  =====================================================================
-      RECURSIVE SUBROUTINE ZLAUNHR_COL_GETRFNP2( M, N, A, LDA, D, INFO )
+      RECURSIVE SUBROUTINE ZLAUNHR_COL_GETRFNP2( M, N, A, LDA, D,
+     $                                           INFO )
       IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
@@ -295,7 +294,8 @@ RECURSIVE SUBROUTINE ZLAUNHR_COL_GETRFNP2( M, N, A, LDA, D, INFO )
 *        Update B22, i.e. compute the Schur complement
 *        B22 := B22 - B21*B12
 *
-         CALL ZGEMM( 'N', 'N', M-N1, N2, N1, -CONE, A( N1+1, 1 ), LDA,
+         CALL ZGEMM( 'N', 'N', M-N1, N2, N1, -CONE, A( N1+1, 1 ),
+     $               LDA,
      $               A( 1, N1+1 ), LDA, CONE, A( N1+1, N1+1 ), LDA )
 *
 *        Factor B22, recursive call
diff --git a/SRC/zlauu2.f b/SRC/zlauu2.f
index 7d7faebdf5..dcb5b944d5 100644
--- a/SRC/zlauu2.f
+++ b/SRC/zlauu2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAUU2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlauu2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlauu2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,10 +93,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lauu2
 *
 *  =====================================================================
       SUBROUTINE ZLAUU2( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -164,10 +163,12 @@ SUBROUTINE ZLAUU2( UPLO, N, A, LDA, INFO )
          DO 10 I = 1, N
             AII = DBLE( A( I, I ) )
             IF( I.LT.N ) THEN
-               A( I, I ) = AII*AII + DBLE( ZDOTC( N-I, A( I, I+1 ), LDA,
+               A( I, I ) = AII*AII + DBLE( ZDOTC( N-I, A( I, I+1 ),
+     $            LDA,
      $                     A( I, I+1 ), LDA ) )
                CALL ZLACGV( N-I, A( I, I+1 ), LDA )
-               CALL ZGEMV( 'No transpose', I-1, N-I, ONE, A( 1, I+1 ),
+               CALL ZGEMV( 'No transpose', I-1, N-I, ONE, A( 1,
+     $                     I+1 ),
      $                     LDA, A( I, I+1 ), LDA, DCMPLX( AII ),
      $                     A( 1, I ), 1 )
                CALL ZLACGV( N-I, A( I, I+1 ), LDA )
@@ -183,7 +184,8 @@ SUBROUTINE ZLAUU2( UPLO, N, A, LDA, INFO )
          DO 20 I = 1, N
             AII = DBLE( A( I, I ) )
             IF( I.LT.N ) THEN
-               A( I, I ) = AII*AII + DBLE( ZDOTC( N-I, A( I+1, I ), 1,
+               A( I, I ) = AII*AII + DBLE( ZDOTC( N-I, A( I+1, I ),
+     $            1,
      $                     A( I+1, I ), 1 ) )
                CALL ZLACGV( I-1, A( I, 1 ), LDA )
                CALL ZGEMV( 'Conjugate transpose', N-I, I-1, ONE,
diff --git a/SRC/zlauum.f b/SRC/zlauum.f
index af36aa92df..d7c13fc373 100644
--- a/SRC/zlauum.f
+++ b/SRC/zlauum.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZLAUUM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlauum.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlauum.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -95,10 +93,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup lauum
 *
 *  =====================================================================
       SUBROUTINE ZLAUUM( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -202,7 +201,8 @@ SUBROUTINE ZLAUUM( UPLO, N, A, LDA, INFO )
      $                     A( I, 1 ), LDA )
                CALL ZLAUU2( 'Lower', IB, A( I, I ), LDA, INFO )
                IF( I+IB.LE.N ) THEN
-                  CALL ZGEMM( 'Conjugate transpose', 'No transpose', IB,
+                  CALL ZGEMM( 'Conjugate transpose', 'No transpose',
+     $                        IB,
      $                        I-1, N-I-IB+1, CONE, A( I+IB, I ), LDA,
      $                        A( I+IB, 1 ), LDA, CONE, A( I, 1 ), LDA )
                   CALL ZHERK( 'Lower', 'Conjugate transpose', IB,
diff --git a/SRC/zpbcon.f b/SRC/zpbcon.f
index 35fa50aabc..dcf97a3980 100644
--- a/SRC/zpbcon.f
+++ b/SRC/zpbcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPBCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpbcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpbcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -125,11 +123,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup pbcon
 *
 *  =====================================================================
       SUBROUTINE ZPBCON( UPLO, N, KD, AB, LDAB, ANORM, RCOND, WORK,
      $                   RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -231,13 +230,15 @@ SUBROUTINE ZPBCON( UPLO, N, KD, AB, LDAB, ANORM, RCOND, WORK,
 *
 *           Multiply by inv(U).
 *
-            CALL ZLATBS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL ZLATBS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   KD, AB, LDAB, WORK, SCALEU, RWORK, INFO )
          ELSE
 *
 *           Multiply by inv(L).
 *
-            CALL ZLATBS( 'Lower', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL ZLATBS( 'Lower', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   KD, AB, LDAB, WORK, SCALEL, RWORK, INFO )
             NORMIN = 'Y'
 *
diff --git a/SRC/zpbequ.f b/SRC/zpbequ.f
index 3d4b84a96e..b30fd4abb2 100644
--- a/SRC/zpbequ.f
+++ b/SRC/zpbequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPBEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpbequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpbequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,10 +121,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup pbequ
 *
 *  =====================================================================
-      SUBROUTINE ZPBEQU( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX, INFO )
+      SUBROUTINE ZPBEQU( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zpbrfs.f b/SRC/zpbrfs.f
index 4c343ed3a6..3c33d134f9 100644
--- a/SRC/zpbrfs.f
+++ b/SRC/zpbrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPBRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpbrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpbrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -181,11 +179,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup pbrfs
 *
 *  =====================================================================
       SUBROUTINE ZPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
      $                   LDB, X, LDX, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -225,7 +224,8 @@ SUBROUTINE ZPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZHBMV, ZLACN2, ZPBTRS
+      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZHBMV, ZLACN2,
+     $                   ZPBTRS
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG, MAX, MIN
@@ -411,7 +411,8 @@ SUBROUTINE ZPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
 *
 *              Multiply by diag(W)*inv(A**H).
 *
-               CALL ZPBTRS( UPLO, N, KD, 1, AFB, LDAFB, WORK, N, INFO )
+               CALL ZPBTRS( UPLO, N, KD, 1, AFB, LDAFB, WORK, N,
+     $                      INFO )
                DO 110 I = 1, N
                   WORK( I ) = RWORK( I )*WORK( I )
   110          CONTINUE
@@ -422,7 +423,8 @@ SUBROUTINE ZPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B,
                DO 120 I = 1, N
                   WORK( I ) = RWORK( I )*WORK( I )
   120          CONTINUE
-               CALL ZPBTRS( UPLO, N, KD, 1, AFB, LDAFB, WORK, N, INFO )
+               CALL ZPBTRS( UPLO, N, KD, 1, AFB, LDAFB, WORK, N,
+     $                      INFO )
             END IF
             GO TO 100
          END IF
diff --git a/SRC/zpbstf.f b/SRC/zpbstf.f
index 1b3bb147b8..9b932f0552 100644
--- a/SRC/zpbstf.f
+++ b/SRC/zpbstf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPBSTF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpbstf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpbstf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -110,7 +108,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup pbstf
 *
 *> \par Further Details:
 *  =====================
@@ -150,6 +148,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZPBSTF( UPLO, N, KD, AB, LDAB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zpbsv.f b/SRC/zpbsv.f
index fe6baf8b51..db663da6bb 100644
--- a/SRC/zpbsv.f
+++ b/SRC/zpbsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPBSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpbsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpbsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,9 +117,9 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i of A is not
-*>                positive definite, so the factorization could not be
-*>                completed, and the solution has not been computed.
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                of A is not positive, so the factorization could not
+*>                be completed, and the solution has not been computed.
 *> \endverbatim
 *
 *  Authors:
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERsolve
+*> \ingroup pbsv
 *
 *> \par Further Details:
 *  =====================
@@ -161,6 +159,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZPBSV( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -191,7 +190,8 @@ SUBROUTINE ZPBSV( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/zpbsvx.f b/SRC/zpbsvx.f
index 1efd2fd1ec..72bd571ad0 100644
--- a/SRC/zpbsvx.f
+++ b/SRC/zpbsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPBSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpbsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpbsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -70,7 +68,7 @@
 *>    where U is an upper triangular band matrix, and L is a lower
 *>    triangular band matrix.
 *>
-*> 3. If the leading i-by-i principal minor is not positive definite,
+*> 3. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A.  If the reciprocal of the condition number is less than machine
@@ -280,10 +278,10 @@
 *>          = 0: successful exit
 *>          < 0: if INFO = -i, the i-th argument had an illegal value
 *>          > 0: if INFO = i, and i is
-*>                <= N:  the leading minor of order i of A is
-*>                       not positive definite, so the factorization
-*>                       could not be completed, and the solution has not
-*>                       been computed. RCOND = 0 is returned.
+*>                <= N:  the leading principal minor of order i of A
+*>                       is not positive, so the factorization could not
+*>                       be completed, and the solution has not been
+*>                       computed. RCOND = 0 is returned.
 *>                = N+1: U is nonsingular, but RCOND is less than machine
 *>                       precision, meaning that the matrix is singular
 *>                       to working precision.  Nevertheless, the
@@ -301,7 +299,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERsolve
+*> \ingroup pbsvx
 *
 *> \par Further Details:
 *  =====================
@@ -336,9 +334,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
+      SUBROUTINE ZPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB,
+     $                   LDAFB,
      $                   EQUED, S, B, LDB, X, LDX, RCOND, FERR, BERR,
      $                   WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -372,7 +372,8 @@ SUBROUTINE ZPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
       EXTERNAL           LSAME, DLAMCH, ZLANHB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZCOPY, ZLACPY, ZLAQHB, ZPBCON, ZPBEQU,
+      EXTERNAL           XERBLA, ZCOPY, ZLACPY, ZLAQHB, ZPBCON,
+     $                   ZPBEQU,
      $                   ZPBRFS, ZPBTRF, ZPBTRS
 *     ..
 *     .. Intrinsic Functions ..
@@ -395,7 +396,9 @@ SUBROUTINE ZPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
       ELSE IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
@@ -452,7 +455,8 @@ SUBROUTINE ZPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
 *
 *           Equilibrate the matrix.
 *
-            CALL ZLAQHB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX, EQUED )
+            CALL ZLAQHB( UPLO, N, KD, AB, LDAB, S, SCOND, AMAX,
+     $                   EQUED )
             RCEQU = LSAME( EQUED, 'Y' )
          END IF
       END IF
@@ -500,7 +504,8 @@ SUBROUTINE ZPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL ZPBCON( UPLO, N, KD, AFB, LDAFB, ANORM, RCOND, WORK, RWORK,
+      CALL ZPBCON( UPLO, N, KD, AFB, LDAFB, ANORM, RCOND, WORK,
+     $             RWORK,
      $             INFO )
 *
 *     Compute the solution matrix X.
@@ -511,7 +516,8 @@ SUBROUTINE ZPBSVX( FACT, UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB,
 *     Use iterative refinement to improve the computed solution and
 *     compute error bounds and backward error estimates for it.
 *
-      CALL ZPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B, LDB, X,
+      CALL ZPBRFS( UPLO, N, KD, NRHS, AB, LDAB, AFB, LDAFB, B, LDB,
+     $             X,
      $             LDX, FERR, BERR, WORK, RWORK, INFO )
 *
 *     Transform the solution matrix X to a solution of the original
diff --git a/SRC/zpbtf2.f b/SRC/zpbtf2.f
index 7b90af47e7..7002eb5490 100644
--- a/SRC/zpbtf2.f
+++ b/SRC/zpbtf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPBTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpbtf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpbtf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,8 +95,8 @@
 *>          INFO is INTEGER
 *>          = 0: successful exit
 *>          < 0: if INFO = -k, the k-th argument had an illegal value
-*>          > 0: if INFO = k, the leading minor of order k is not
-*>               positive definite, and the factorization could not be
+*>          > 0: if INFO = k, the leading principal minor of order k
+*>               is not positive, and the factorization could not be
 *>               completed.
 *> \endverbatim
 *
@@ -110,7 +108,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup pbtf2
 *
 *> \par Further Details:
 *  =====================
@@ -139,6 +137,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZPBTF2( UPLO, N, KD, AB, LDAB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zpbtrf.f b/SRC/zpbtrf.f
index 61cd1d4345..2f8f262ec4 100644
--- a/SRC/zpbtrf.f
+++ b/SRC/zpbtrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPBTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpbtrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpbtrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -92,8 +90,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *> \endverbatim
 *
@@ -105,7 +103,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup pbtrf
 *
 *> \par Further Details:
 *  =====================
@@ -139,6 +137,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZPBTRF( UPLO, N, KD, AB, LDAB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -174,7 +173,8 @@ SUBROUTINE ZPBTRF( UPLO, N, KD, AB, LDAB, INFO )
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZGEMM, ZHERK, ZPBTF2, ZPOTF2, ZTRSM
+      EXTERNAL           XERBLA, ZGEMM, ZHERK, ZPBTF2, ZPOTF2,
+     $                   ZTRSM
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MIN
@@ -271,14 +271,16 @@ SUBROUTINE ZPBTRF( UPLO, N, KD, AB, LDAB, INFO )
 *
 *                    Update A12
 *
-                     CALL ZTRSM( 'Left', 'Upper', 'Conjugate transpose',
+                     CALL ZTRSM( 'Left', 'Upper',
+     $                           'Conjugate transpose',
      $                           'Non-unit', IB, I2, CONE,
      $                           AB( KD+1, I ), LDAB-1,
      $                           AB( KD+1-IB, I+IB ), LDAB-1 )
 *
 *                    Update A22
 *
-                     CALL ZHERK( 'Upper', 'Conjugate transpose', I2, IB,
+                     CALL ZHERK( 'Upper', 'Conjugate transpose', I2,
+     $                           IB,
      $                           -ONE, AB( KD+1-IB, I+IB ), LDAB-1, ONE,
      $                           AB( KD+1, I+IB ), LDAB-1 )
                   END IF
@@ -295,7 +297,8 @@ SUBROUTINE ZPBTRF( UPLO, N, KD, AB, LDAB, INFO )
 *
 *                    Update A13 (in the work array).
 *
-                     CALL ZTRSM( 'Left', 'Upper', 'Conjugate transpose',
+                     CALL ZTRSM( 'Left', 'Upper',
+     $                           'Conjugate transpose',
      $                           'Non-unit', IB, I3, CONE,
      $                           AB( KD+1, I ), LDAB-1, WORK, LDWORK )
 *
@@ -310,7 +313,8 @@ SUBROUTINE ZPBTRF( UPLO, N, KD, AB, LDAB, INFO )
 *
 *                    Update A33
 *
-                     CALL ZHERK( 'Upper', 'Conjugate transpose', I3, IB,
+                     CALL ZHERK( 'Upper', 'Conjugate transpose', I3,
+     $                           IB,
      $                           -ONE, WORK, LDWORK, ONE,
      $                           AB( KD+1, I+KD ), LDAB-1 )
 *
@@ -380,7 +384,8 @@ SUBROUTINE ZPBTRF( UPLO, N, KD, AB, LDAB, INFO )
 *
 *                    Update A22
 *
-                     CALL ZHERK( 'Lower', 'No transpose', I2, IB, -ONE,
+                     CALL ZHERK( 'Lower', 'No transpose', I2, IB,
+     $                           -ONE,
      $                           AB( 1+IB, I ), LDAB-1, ONE,
      $                           AB( 1, I+IB ), LDAB-1 )
                   END IF
@@ -413,7 +418,8 @@ SUBROUTINE ZPBTRF( UPLO, N, KD, AB, LDAB, INFO )
 *
 *                    Update A33
 *
-                     CALL ZHERK( 'Lower', 'No transpose', I3, IB, -ONE,
+                     CALL ZHERK( 'Lower', 'No transpose', I3, IB,
+     $                           -ONE,
      $                           WORK, LDWORK, ONE, AB( 1, I+KD ),
      $                           LDAB-1 )
 *
diff --git a/SRC/zpbtrs.f b/SRC/zpbtrs.f
index d9d74b70d1..91848a0a58 100644
--- a/SRC/zpbtrs.f
+++ b/SRC/zpbtrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPBTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpbtrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpbtrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -114,10 +112,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup pbtrs
 *
 *  =====================================================================
       SUBROUTINE ZPBTRS( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -184,12 +183,14 @@ SUBROUTINE ZPBTRS( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
 *
 *           Solve U**H *X = B, overwriting B with X.
 *
-            CALL ZTBSV( 'Upper', 'Conjugate transpose', 'Non-unit', N,
+            CALL ZTBSV( 'Upper', 'Conjugate transpose', 'Non-unit',
+     $                  N,
      $                  KD, AB, LDAB, B( 1, J ), 1 )
 *
 *           Solve U*X = B, overwriting B with X.
 *
-            CALL ZTBSV( 'Upper', 'No transpose', 'Non-unit', N, KD, AB,
+            CALL ZTBSV( 'Upper', 'No transpose', 'Non-unit', N, KD,
+     $                  AB,
      $                  LDAB, B( 1, J ), 1 )
    10    CONTINUE
       ELSE
@@ -200,12 +201,14 @@ SUBROUTINE ZPBTRS( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, INFO )
 *
 *           Solve L*X = B, overwriting B with X.
 *
-            CALL ZTBSV( 'Lower', 'No transpose', 'Non-unit', N, KD, AB,
+            CALL ZTBSV( 'Lower', 'No transpose', 'Non-unit', N, KD,
+     $                  AB,
      $                  LDAB, B( 1, J ), 1 )
 *
 *           Solve L**H *X = B, overwriting B with X.
 *
-            CALL ZTBSV( 'Lower', 'Conjugate transpose', 'Non-unit', N,
+            CALL ZTBSV( 'Lower', 'Conjugate transpose', 'Non-unit',
+     $                  N,
      $                  KD, AB, LDAB, B( 1, J ), 1 )
    20    CONTINUE
       END IF
diff --git a/SRC/zpftrf.f b/SRC/zpftrf.f
index 6d18f2cb32..51f6f2cb8f 100644
--- a/SRC/zpftrf.f
+++ b/SRC/zpftrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPFTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpftrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpftrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -91,8 +89,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *>
 *>  Further Notes on RFP Format:
@@ -204,10 +202,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup pftrf
 *
 *  =====================================================================
       SUBROUTINE ZPFTRF( TRANSR, UPLO, N, A, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -304,7 +303,8 @@ SUBROUTINE ZPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL ZPOTRF( 'L', N1, A( 0 ), N, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL ZTRSM( 'R', 'L', 'C', 'N', N2, N1, CONE, A( 0 ), N,
+               CALL ZTRSM( 'R', 'L', 'C', 'N', N2, N1, CONE, A( 0 ),
+     $                     N,
      $                     A( N1 ), N )
                CALL ZHERK( 'U', 'N', N2, N1, -ONE, A( N1 ), N, ONE,
      $                     A( N ), N )
@@ -321,7 +321,8 @@ SUBROUTINE ZPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL ZPOTRF( 'L', N1, A( N2 ), N, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL ZTRSM( 'L', 'L', 'N', 'N', N1, N2, CONE, A( N2 ), N,
+               CALL ZTRSM( 'L', 'L', 'N', 'N', N1, N2, CONE, A( N2 ),
+     $                     N,
      $                     A( 0 ), N )
                CALL ZHERK( 'U', 'C', N2, N1, -ONE, A( 0 ), N, ONE,
      $                     A( N1 ), N )
@@ -344,9 +345,11 @@ SUBROUTINE ZPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL ZPOTRF( 'U', N1, A( 0 ), N1, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL ZTRSM( 'L', 'U', 'C', 'N', N1, N2, CONE, A( 0 ), N1,
+               CALL ZTRSM( 'L', 'U', 'C', 'N', N1, N2, CONE, A( 0 ),
+     $                     N1,
      $                     A( N1*N1 ), N1 )
-               CALL ZHERK( 'L', 'C', N2, N1, -ONE, A( N1*N1 ), N1, ONE,
+               CALL ZHERK( 'L', 'C', N2, N1, -ONE, A( N1*N1 ), N1,
+     $                     ONE,
      $                     A( 1 ), N1 )
                CALL ZPOTRF( 'L', N2, A( 1 ), N1, INFO )
                IF( INFO.GT.0 )
@@ -361,7 +364,8 @@ SUBROUTINE ZPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL ZPOTRF( 'U', N1, A( N2*N2 ), N2, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL ZTRSM( 'R', 'U', 'N', 'N', N2, N1, CONE, A( N2*N2 ),
+               CALL ZTRSM( 'R', 'U', 'N', 'N', N2, N1, CONE,
+     $                     A( N2*N2 ),
      $                     N2, A( 0 ), N2 )
                CALL ZHERK( 'L', 'N', N2, N1, -ONE, A( 0 ), N2, ONE,
      $                     A( N1*N2 ), N2 )
@@ -390,7 +394,8 @@ SUBROUTINE ZPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL ZPOTRF( 'L', K, A( 1 ), N+1, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL ZTRSM( 'R', 'L', 'C', 'N', K, K, CONE, A( 1 ), N+1,
+               CALL ZTRSM( 'R', 'L', 'C', 'N', K, K, CONE, A( 1 ),
+     $                     N+1,
      $                     A( K+1 ), N+1 )
                CALL ZHERK( 'U', 'N', K, K, -ONE, A( K+1 ), N+1, ONE,
      $                     A( 0 ), N+1 )
@@ -430,9 +435,11 @@ SUBROUTINE ZPFTRF( TRANSR, UPLO, N, A, INFO )
                CALL ZPOTRF( 'U', K, A( 0+K ), K, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL ZTRSM( 'L', 'U', 'C', 'N', K, K, CONE, A( K ), N1,
+               CALL ZTRSM( 'L', 'U', 'C', 'N', K, K, CONE, A( K ),
+     $                     N1,
      $                     A( K*( K+1 ) ), K )
-               CALL ZHERK( 'L', 'C', K, K, -ONE, A( K*( K+1 ) ), K, ONE,
+               CALL ZHERK( 'L', 'C', K, K, -ONE, A( K*( K+1 ) ), K,
+     $                     ONE,
      $                     A( 0 ), K )
                CALL ZPOTRF( 'L', K, A( 0 ), K, INFO )
                IF( INFO.GT.0 )
diff --git a/SRC/zpftri.f b/SRC/zpftri.f
index 7ebf737694..3b44f3a5ef 100644
--- a/SRC/zpftri.f
+++ b/SRC/zpftri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPFTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpftri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpftri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,7 +95,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup pftri
 *
 *> \par Further Details:
 *  =====================
@@ -209,6 +207,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZPFTRI( TRANSR, UPLO, N, A, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -237,7 +236,8 @@ SUBROUTINE ZPFTRI( TRANSR, UPLO, N, A, INFO )
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZTFTRI, ZLAUUM, ZTRMM, ZHERK
+      EXTERNAL           XERBLA, ZTFTRI, ZLAUUM, ZTRMM,
+     $                   ZHERK
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MOD
@@ -312,7 +312,8 @@ SUBROUTINE ZPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL ZLAUUM( 'L', N1, A( 0 ), N, INFO )
                CALL ZHERK( 'L', 'C', N1, N2, ONE, A( N1 ), N, ONE,
      $                     A( 0 ), N )
-               CALL ZTRMM( 'L', 'U', 'N', 'N', N2, N1, CONE, A( N ), N,
+               CALL ZTRMM( 'L', 'U', 'N', 'N', N2, N1, CONE, A( N ),
+     $                     N,
      $                     A( N1 ), N )
                CALL ZLAUUM( 'U', N2, A( N ), N, INFO )
 *
@@ -325,7 +326,8 @@ SUBROUTINE ZPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL ZLAUUM( 'L', N1, A( N2 ), N, INFO )
                CALL ZHERK( 'L', 'N', N1, N2, ONE, A( 0 ), N, ONE,
      $                     A( N2 ), N )
-               CALL ZTRMM( 'R', 'U', 'C', 'N', N1, N2, CONE, A( N1 ), N,
+               CALL ZTRMM( 'R', 'U', 'C', 'N', N1, N2, CONE, A( N1 ),
+     $                     N,
      $                     A( 0 ), N )
                CALL ZLAUUM( 'U', N2, A( N1 ), N, INFO )
 *
@@ -341,9 +343,11 @@ SUBROUTINE ZPFTRI( TRANSR, UPLO, N, A, INFO )
 *              T1 -> a(0), T2 -> a(1), S -> a(0+N1*N1)
 *
                CALL ZLAUUM( 'U', N1, A( 0 ), N1, INFO )
-               CALL ZHERK( 'U', 'N', N1, N2, ONE, A( N1*N1 ), N1, ONE,
+               CALL ZHERK( 'U', 'N', N1, N2, ONE, A( N1*N1 ), N1,
+     $                     ONE,
      $                     A( 0 ), N1 )
-               CALL ZTRMM( 'R', 'L', 'N', 'N', N1, N2, CONE, A( 1 ), N1,
+               CALL ZTRMM( 'R', 'L', 'N', 'N', N1, N2, CONE, A( 1 ),
+     $                     N1,
      $                     A( N1*N1 ), N1 )
                CALL ZLAUUM( 'L', N2, A( 1 ), N1, INFO )
 *
@@ -355,7 +359,8 @@ SUBROUTINE ZPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL ZLAUUM( 'U', N1, A( N2*N2 ), N2, INFO )
                CALL ZHERK( 'U', 'C', N1, N2, ONE, A( 0 ), N2, ONE,
      $                     A( N2*N2 ), N2 )
-               CALL ZTRMM( 'L', 'L', 'C', 'N', N2, N1, CONE, A( N1*N2 ),
+               CALL ZTRMM( 'L', 'L', 'C', 'N', N2, N1, CONE,
+     $                     A( N1*N2 ),
      $                     N2, A( 0 ), N2 )
                CALL ZLAUUM( 'L', N2, A( N1*N2 ), N2, INFO )
 *
@@ -380,7 +385,8 @@ SUBROUTINE ZPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL ZLAUUM( 'L', K, A( 1 ), N+1, INFO )
                CALL ZHERK( 'L', 'C', K, K, ONE, A( K+1 ), N+1, ONE,
      $                     A( 1 ), N+1 )
-               CALL ZTRMM( 'L', 'U', 'N', 'N', K, K, CONE, A( 0 ), N+1,
+               CALL ZTRMM( 'L', 'U', 'N', 'N', K, K, CONE, A( 0 ),
+     $                     N+1,
      $                     A( K+1 ), N+1 )
                CALL ZLAUUM( 'U', K, A( 0 ), N+1, INFO )
 *
@@ -393,7 +399,8 @@ SUBROUTINE ZPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL ZLAUUM( 'L', K, A( K+1 ), N+1, INFO )
                CALL ZHERK( 'L', 'N', K, K, ONE, A( 0 ), N+1, ONE,
      $                     A( K+1 ), N+1 )
-               CALL ZTRMM( 'R', 'U', 'C', 'N', K, K, CONE, A( K ), N+1,
+               CALL ZTRMM( 'R', 'U', 'C', 'N', K, K, CONE, A( K ),
+     $                     N+1,
      $                     A( 0 ), N+1 )
                CALL ZLAUUM( 'U', K, A( K ), N+1, INFO )
 *
@@ -410,7 +417,8 @@ SUBROUTINE ZPFTRI( TRANSR, UPLO, N, A, INFO )
 *              T1 -> a(0+k), T2 -> a(0+0), S -> a(0+k*(k+1)); lda=k
 *
                CALL ZLAUUM( 'U', K, A( K ), K, INFO )
-               CALL ZHERK( 'U', 'N', K, K, ONE, A( K*( K+1 ) ), K, ONE,
+               CALL ZHERK( 'U', 'N', K, K, ONE, A( K*( K+1 ) ), K,
+     $                     ONE,
      $                     A( K ), K )
                CALL ZTRMM( 'R', 'L', 'N', 'N', K, K, CONE, A( 0 ), K,
      $                     A( K*( K+1 ) ), K )
@@ -425,7 +433,8 @@ SUBROUTINE ZPFTRI( TRANSR, UPLO, N, A, INFO )
                CALL ZLAUUM( 'U', K, A( K*( K+1 ) ), K, INFO )
                CALL ZHERK( 'U', 'C', K, K, ONE, A( 0 ), K, ONE,
      $                     A( K*( K+1 ) ), K )
-               CALL ZTRMM( 'L', 'L', 'C', 'N', K, K, CONE, A( K*K ), K,
+               CALL ZTRMM( 'L', 'L', 'C', 'N', K, K, CONE, A( K*K ),
+     $                     K,
      $                     A( 0 ), K )
                CALL ZLAUUM( 'L', K, A( K*K ), K, INFO )
 *
diff --git a/SRC/zpftrs.f b/SRC/zpftrs.f
index c63592f57a..221f4f26d4 100644
--- a/SRC/zpftrs.f
+++ b/SRC/zpftrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPFTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpftrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpftrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -105,7 +103,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup pftrs
 *
 *> \par Further Details:
 *  =====================
@@ -217,6 +215,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZPFTRS( TRANSR, UPLO, N, NRHS, A, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -280,14 +279,18 @@ SUBROUTINE ZPFTRS( TRANSR, UPLO, N, NRHS, A, B, LDB, INFO )
 *     start execution: there are two triangular solves
 *
       IF( LOWER ) THEN
-         CALL ZTFSM( TRANSR, 'L', UPLO, 'N', 'N', N, NRHS, CONE, A, B,
+         CALL ZTFSM( TRANSR, 'L', UPLO, 'N', 'N', N, NRHS, CONE, A,
+     $               B,
      $               LDB )
-         CALL ZTFSM( TRANSR, 'L', UPLO, 'C', 'N', N, NRHS, CONE, A, B,
+         CALL ZTFSM( TRANSR, 'L', UPLO, 'C', 'N', N, NRHS, CONE, A,
+     $               B,
      $               LDB )
       ELSE
-         CALL ZTFSM( TRANSR, 'L', UPLO, 'C', 'N', N, NRHS, CONE, A, B,
+         CALL ZTFSM( TRANSR, 'L', UPLO, 'C', 'N', N, NRHS, CONE, A,
+     $               B,
      $               LDB )
-         CALL ZTFSM( TRANSR, 'L', UPLO, 'N', 'N', N, NRHS, CONE, A, B,
+         CALL ZTFSM( TRANSR, 'L', UPLO, 'N', 'N', N, NRHS, CONE, A,
+     $               B,
      $               LDB )
       END IF
 *
diff --git a/SRC/zpocon.f b/SRC/zpocon.f
index dcfc6f64c7..2e50f4a6a0 100644
--- a/SRC/zpocon.f
+++ b/SRC/zpocon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPOCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpocon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpocon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,11 +111,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POcomputational
+*> \ingroup pocon
 *
 *  =====================================================================
       SUBROUTINE ZPOCON( UPLO, N, A, LDA, ANORM, RCOND, WORK, RWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -216,13 +215,15 @@ SUBROUTINE ZPOCON( UPLO, N, A, LDA, ANORM, RCOND, WORK, RWORK,
 *
 *           Multiply by inv(U).
 *
-            CALL ZLATRS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL ZLATRS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   A, LDA, WORK, SCALEU, RWORK, INFO )
          ELSE
 *
 *           Multiply by inv(L).
 *
-            CALL ZLATRS( 'Lower', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL ZLATRS( 'Lower', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   A, LDA, WORK, SCALEL, RWORK, INFO )
             NORMIN = 'Y'
 *
diff --git a/SRC/zpoequ.f b/SRC/zpoequ.f
index 9435bd08f4..5774f9a5b1 100644
--- a/SRC/zpoequ.f
+++ b/SRC/zpoequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPOEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpoequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpoequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,10 +104,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POcomputational
+*> \ingroup poequ
 *
 *  =====================================================================
       SUBROUTINE ZPOEQU( N, A, LDA, S, SCOND, AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zpoequb.f b/SRC/zpoequb.f
index fd8a000b2a..1ac29789f2 100644
--- a/SRC/zpoequb.f
+++ b/SRC/zpoequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPOEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpoequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpoequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -112,10 +110,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POcomputational
+*> \ingroup poequb
 *
 *  =====================================================================
       SUBROUTINE ZPOEQUB( N, A, LDA, S, SCOND, AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zporfs.f b/SRC/zporfs.f
index 96c6546665..09e66272d1 100644
--- a/SRC/zporfs.f
+++ b/SRC/zporfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPORFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zporfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zporfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -175,11 +173,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POcomputational
+*> \ingroup porfs
 *
 *  =====================================================================
       SUBROUTINE ZPORFS( UPLO, N, NRHS, A, LDA, AF, LDAF, B, LDB, X,
      $                   LDX, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -219,7 +218,8 @@ SUBROUTINE ZPORFS( UPLO, N, NRHS, A, LDA, AF, LDAF, B, LDB, X,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZHEMV, ZLACN2, ZPOTRS
+      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZHEMV, ZLACN2,
+     $                   ZPOTRS
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG, MAX
@@ -292,7 +292,8 @@ SUBROUTINE ZPORFS( UPLO, N, NRHS, A, LDA, AF, LDAF, B, LDB, X,
 *        Compute residual R = B - A * X
 *
          CALL ZCOPY( N, B( 1, J ), 1, WORK, 1 )
-         CALL ZHEMV( UPLO, N, -ONE, A, LDA, X( 1, J ), 1, ONE, WORK, 1 )
+         CALL ZHEMV( UPLO, N, -ONE, A, LDA, X( 1, J ), 1, ONE, WORK,
+     $               1 )
 *
 *        Compute componentwise relative backward error from formula
 *
diff --git a/SRC/zporfsx.f b/SRC/zporfsx.f
index ce43103eb7..7f2a8405e7 100644
--- a/SRC/zporfsx.f
+++ b/SRC/zporfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPORFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zporfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zporfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -383,13 +381,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POcomputational
+*> \ingroup porfsx
 *
 *  =====================================================================
-      SUBROUTINE ZPORFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, S, B,
+      SUBROUTINE ZPORFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, S,
+     $                    B,
      $                    LDB, X, LDX, RCOND, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -451,7 +451,8 @@ SUBROUTINE ZPORFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, S, B,
 *     ..
 *     .. External Functions ..
       EXTERNAL           LSAME, ILAPREC
-      EXTERNAL           DLAMCH, ZLANHE, ZLA_PORCOND_X, ZLA_PORCOND_C
+      EXTERNAL           DLAMCH, ZLANHE, ZLA_PORCOND_X,
+     $                   ZLA_PORCOND_C
       DOUBLE PRECISION   DLAMCH, ZLANHE, ZLA_PORCOND_X, ZLA_PORCOND_C
       LOGICAL            LSAME
       INTEGER            ILAPREC
@@ -508,7 +509,8 @@ SUBROUTINE ZPORFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, S, B,
 *
 *     Test input parameters.
 *
-      IF (.NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF (.NOT.LSAME( UPLO, 'U' ) .AND.
+     $     .NOT.LSAME( UPLO, 'L' ) ) THEN
         INFO = -1
       ELSE IF( .NOT.RCEQU .AND. .NOT.LSAME( EQUED, 'N' ) ) THEN
         INFO = -2
@@ -594,7 +596,8 @@ SUBROUTINE ZPORFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, S, B,
      $        INFO )
       END IF
 
-      ERR_LBND = MAX( 10.0D+0, SQRT( DBLE( N ) ) ) * DLAMCH( 'Epsilon' )
+      ERR_LBND = MAX( 10.0D+0,
+     $                SQRT( DBLE( N ) ) ) * DLAMCH( 'Epsilon' )
       IF ( N_ERR_BNDS .GE. 1 .AND. N_NORMS .GE. 1 ) THEN
 *
 *     Compute scaled normwise condition number cond(A*C).
diff --git a/SRC/zposv.f b/SRC/zposv.f
index 3bb625876f..3ddab214ea 100644
--- a/SRC/zposv.f
+++ b/SRC/zposv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPOSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zposv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zposv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -110,9 +108,9 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i of A is not
-*>                positive definite, so the factorization could not be
-*>                completed, and the solution has not been computed.
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                of A is not positive, so the factorization could not
+*>                be completed, and the solution has not been computed.
 *> \endverbatim
 *
 *  Authors:
@@ -123,10 +121,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POsolve
+*> \ingroup posv
 *
 *  =====================================================================
       SUBROUTINE ZPOSV( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -157,7 +156,8 @@ SUBROUTINE ZPOSV( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/zposvx.f b/SRC/zposvx.f
index f9e9b1d5fd..e872299ad1 100644
--- a/SRC/zposvx.f
+++ b/SRC/zposvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPOSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zposvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zposvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -70,7 +68,7 @@
 *>    where U is an upper triangular matrix and L is a lower triangular
 *>    matrix.
 *>
-*> 3. If the leading i-by-i principal minor is not positive definite,
+*> 3. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A.  If the reciprocal of the condition number is less than machine
@@ -276,10 +274,10 @@
 *>          = 0: successful exit
 *>          < 0: if INFO = -i, the i-th argument had an illegal value
 *>          > 0: if INFO = i, and i is
-*>                <= N:  the leading minor of order i of A is
-*>                       not positive definite, so the factorization
-*>                       could not be completed, and the solution has not
-*>                       been computed. RCOND = 0 is returned.
+*>                <= N:  the leading principal minor of order i of A
+*>                       is not positive, so the factorization could not
+*>                       be completed, and the solution has not been
+*>                       computed. RCOND = 0 is returned.
 *>                = N+1: U is nonsingular, but RCOND is less than machine
 *>                       precision, meaning that the matrix is singular
 *>                       to working precision.  Nevertheless, the
@@ -297,12 +295,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POsolve
+*> \ingroup posvx
 *
 *  =====================================================================
-      SUBROUTINE ZPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
+      SUBROUTINE ZPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF,
+     $                   EQUED,
      $                   S, B, LDB, X, LDX, RCOND, FERR, BERR, WORK,
      $                   RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -336,7 +336,8 @@ SUBROUTINE ZPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
       EXTERNAL           LSAME, DLAMCH, ZLANHE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLACPY, ZLAQHE, ZPOCON, ZPOEQU, ZPORFS,
+      EXTERNAL           XERBLA, ZLACPY, ZLAQHE, ZPOCON, ZPOEQU,
+     $                   ZPORFS,
      $                   ZPOTRF, ZPOTRS
 *     ..
 *     .. Intrinsic Functions ..
@@ -358,10 +359,13 @@ SUBROUTINE ZPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -450,7 +454,8 @@ SUBROUTINE ZPOSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL ZPOCON( UPLO, N, AF, LDAF, ANORM, RCOND, WORK, RWORK, INFO )
+      CALL ZPOCON( UPLO, N, AF, LDAF, ANORM, RCOND, WORK, RWORK,
+     $             INFO )
 *
 *     Compute the solution matrix X.
 *
diff --git a/SRC/zposvxx.f b/SRC/zposvxx.f
index 6735fab718..36024e5301 100644
--- a/SRC/zposvxx.f
+++ b/SRC/zposvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPOSVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zposvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zposvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -87,7 +85,7 @@
 *>    where U is an upper triangular matrix and L is a lower triangular
 *>    matrix.
 *>
-*>    3. If the leading i-by-i principal minor is not positive definite,
+*>    3. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A (see argument RCOND).  If the reciprocal of the condition number
@@ -483,13 +481,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POsolve
+*> \ingroup posvxx
 *
 *  =====================================================================
-      SUBROUTINE ZPOSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, EQUED,
+      SUBROUTINE ZPOSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF,
+     $                    EQUED,
      $                    S, B, LDB, X, LDX, RCOND, RPVGRW, BERR,
      $                    N_ERR_BNDS, ERR_BNDS_NORM, ERR_BNDS_COMP,
      $                    NPARAMS, PARAMS, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zpotf2.f b/SRC/zpotf2.f
index eb88d617cc..08820eca37 100644
--- a/SRC/zpotf2.f
+++ b/SRC/zpotf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPOTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpotf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpotf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -89,8 +87,8 @@
 *>          INFO is INTEGER
 *>          = 0: successful exit
 *>          < 0: if INFO = -k, the k-th argument had an illegal value
-*>          > 0: if INFO = k, the leading minor of order k is not
-*>               positive definite, and the factorization could not be
+*>          > 0: if INFO = k, the leading principal minor of order k
+*>               is not positive, and the factorization could not be
 *>               completed.
 *> \endverbatim
 *
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POcomputational
+*> \ingroup potf2
 *
 *  =====================================================================
       SUBROUTINE ZPOTF2( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -201,7 +200,8 @@ SUBROUTINE ZPOTF2( UPLO, N, A, LDA, INFO )
 *
 *           Compute L(J,J) and test for non-positive-definiteness.
 *
-            AJJ = DBLE( A( J, J ) ) - DBLE( ZDOTC( J-1, A( J, 1 ), LDA,
+            AJJ = DBLE( A( J, J ) ) - DBLE( ZDOTC( J-1, A( J, 1 ),
+     $                  LDA,
      $            A( J, 1 ), LDA ) )
             IF( AJJ.LE.ZERO.OR.DISNAN( AJJ ) ) THEN
                A( J, J ) = AJJ
@@ -214,7 +214,8 @@ SUBROUTINE ZPOTF2( UPLO, N, A, LDA, INFO )
 *
             IF( J.LT.N ) THEN
                CALL ZLACGV( J-1, A( J, 1 ), LDA )
-               CALL ZGEMV( 'No transpose', N-J, J-1, -CONE, A( J+1, 1 ),
+               CALL ZGEMV( 'No transpose', N-J, J-1, -CONE, A( J+1,
+     $                     1 ),
      $                     LDA, A( J, 1 ), LDA, CONE, A( J+1, J ), 1 )
                CALL ZLACGV( J-1, A( J, 1 ), LDA )
                CALL ZDSCAL( N-J, ONE / AJJ, A( J+1, J ), 1 )
diff --git a/SRC/zpotrf.f b/SRC/zpotrf.f
index 3b7018276b..767d415a93 100644
--- a/SRC/zpotrf.f
+++ b/SRC/zpotrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPOTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpotrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpotrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -87,8 +85,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *> \endverbatim
 *
@@ -100,10 +98,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POcomputational
+*> \ingroup potrf
 *
 *  =====================================================================
       SUBROUTINE ZPOTRF( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -134,7 +133,8 @@ SUBROUTINE ZPOTRF( UPLO, N, A, LDA, INFO )
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZGEMM, ZHERK, ZPOTRF2, ZTRSM
+      EXTERNAL           XERBLA, ZGEMM, ZHERK, ZPOTRF2,
+     $                   ZTRSM
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -193,7 +193,8 @@ SUBROUTINE ZPOTRF( UPLO, N, A, LDA, INFO )
 *
 *                 Compute the current block row.
 *
-                  CALL ZGEMM( 'Conjugate transpose', 'No transpose', JB,
+                  CALL ZGEMM( 'Conjugate transpose', 'No transpose',
+     $                        JB,
      $                        N-J-JB+1, J-1, -CONE, A( 1, J ), LDA,
      $                        A( 1, J+JB ), LDA, CONE, A( J, J+JB ),
      $                        LDA )
@@ -226,7 +227,8 @@ SUBROUTINE ZPOTRF( UPLO, N, A, LDA, INFO )
      $                        N-J-JB+1, JB, J-1, -CONE, A( J+JB, 1 ),
      $                        LDA, A( J, 1 ), LDA, CONE, A( J+JB, J ),
      $                        LDA )
-                  CALL ZTRSM( 'Right', 'Lower', 'Conjugate transpose',
+                  CALL ZTRSM( 'Right', 'Lower',
+     $                        'Conjugate transpose',
      $                        'Non-unit', N-J-JB+1, JB, CONE, A( J, J ),
      $                        LDA, A( J+JB, J ), LDA )
                END IF
diff --git a/SRC/zpotrf2.f b/SRC/zpotrf2.f
index 859ddc75f2..af57c8bdcc 100644
--- a/SRC/zpotrf2.f
+++ b/SRC/zpotrf2.f
@@ -86,8 +86,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *> \endverbatim
 *
@@ -99,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POcomputational
+*> \ingroup potrf2
 *
 *  =====================================================================
       RECURSIVE SUBROUTINE ZPOTRF2( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zpotri.f b/SRC/zpotri.f
index 8c94eadc2f..4bcaf23f65 100644
--- a/SRC/zpotri.f
+++ b/SRC/zpotri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPOTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpotri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpotri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -88,10 +86,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POcomputational
+*> \ingroup potri
 *
 *  =====================================================================
       SUBROUTINE ZPOTRI( UPLO, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -122,7 +121,8 @@ SUBROUTINE ZPOTRI( UPLO, N, A, LDA, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/zpotrs.f b/SRC/zpotrs.f
index 78a1c32738..8990c1e758 100644
--- a/SRC/zpotrs.f
+++ b/SRC/zpotrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPOTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpotrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpotrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -103,10 +101,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16POcomputational
+*> \ingroup potrs
 *
 *  =====================================================================
       SUBROUTINE ZPOTRS( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,7 +171,8 @@ SUBROUTINE ZPOTRS( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
 *
 *        Solve U**H *X = B, overwriting B with X.
 *
-         CALL ZTRSM( 'Left', 'Upper', 'Conjugate transpose', 'Non-unit',
+         CALL ZTRSM( 'Left', 'Upper', 'Conjugate transpose',
+     $               'Non-unit',
      $               N, NRHS, ONE, A, LDA, B, LDB )
 *
 *        Solve U*X = B, overwriting B with X.
@@ -190,7 +190,8 @@ SUBROUTINE ZPOTRS( UPLO, N, NRHS, A, LDA, B, LDB, INFO )
 *
 *        Solve L**H *X = B, overwriting B with X.
 *
-         CALL ZTRSM( 'Left', 'Lower', 'Conjugate transpose', 'Non-unit',
+         CALL ZTRSM( 'Left', 'Lower', 'Conjugate transpose',
+     $               'Non-unit',
      $               N, NRHS, ONE, A, LDA, B, LDB )
       END IF
 *
diff --git a/SRC/zppcon.f b/SRC/zppcon.f
index c569a497b9..ed0c423e97 100644
--- a/SRC/zppcon.f
+++ b/SRC/zppcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPPCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zppcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zppcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -111,10 +109,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup ppcon
 *
 *  =====================================================================
-      SUBROUTINE ZPPCON( UPLO, N, AP, ANORM, RCOND, WORK, RWORK, INFO )
+      SUBROUTINE ZPPCON( UPLO, N, AP, ANORM, RCOND, WORK, RWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -211,13 +211,15 @@ SUBROUTINE ZPPCON( UPLO, N, AP, ANORM, RCOND, WORK, RWORK, INFO )
 *
 *           Multiply by inv(U).
 *
-            CALL ZLATPS( 'Upper', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL ZLATPS( 'Upper', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   AP, WORK, SCALEU, RWORK, INFO )
          ELSE
 *
 *           Multiply by inv(L).
 *
-            CALL ZLATPS( 'Lower', 'No transpose', 'Non-unit', NORMIN, N,
+            CALL ZLATPS( 'Lower', 'No transpose', 'Non-unit', NORMIN,
+     $                   N,
      $                   AP, WORK, SCALEL, RWORK, INFO )
             NORMIN = 'Y'
 *
diff --git a/SRC/zppequ.f b/SRC/zppequ.f
index e2159e0f03..0356152486 100644
--- a/SRC/zppequ.f
+++ b/SRC/zppequ.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPPEQU + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zppequ.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zppequ.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -110,10 +108,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup ppequ
 *
 *  =====================================================================
       SUBROUTINE ZPPEQU( UPLO, N, AP, S, SCOND, AMAX, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zpprfs.f b/SRC/zpprfs.f
index 769a6a0c08..9bb9988c84 100644
--- a/SRC/zpprfs.f
+++ b/SRC/zpprfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPPRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpprfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpprfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,11 +161,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup pprfs
 *
 *  =====================================================================
-      SUBROUTINE ZPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
+      SUBROUTINE ZPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX,
+     $                   FERR,
      $                   BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -207,7 +207,8 @@ SUBROUTINE ZPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZHPMV, ZLACN2, ZPPTRS
+      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZHPMV, ZLACN2,
+     $                   ZPPTRS
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG, MAX
@@ -276,7 +277,8 @@ SUBROUTINE ZPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
 *        Compute residual R = B - A * X
 *
          CALL ZCOPY( N, B( 1, J ), 1, WORK, 1 )
-         CALL ZHPMV( UPLO, N, -CONE, AP, X( 1, J ), 1, CONE, WORK, 1 )
+         CALL ZHPMV( UPLO, N, -CONE, AP, X( 1, J ), 1, CONE, WORK,
+     $               1 )
 *
 *        Compute componentwise relative backward error from formula
 *
diff --git a/SRC/zppsv.f b/SRC/zppsv.f
index 19536e204c..dbd2bdbb52 100644
--- a/SRC/zppsv.f
+++ b/SRC/zppsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPPSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zppsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zppsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -104,9 +102,9 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i of A is not
-*>                positive definite, so the factorization could not be
-*>                completed, and the solution has not been computed.
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                of A is not positive, so the factorization could not
+*>                be completed, and the solution has not been computed.
 *> \endverbatim
 *
 *  Authors:
@@ -117,7 +115,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERsolve
+*> \ingroup ppsv
 *
 *> \par Further Details:
 *  =====================
@@ -141,6 +139,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZPPSV( UPLO, N, NRHS, AP, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,7 +170,8 @@ SUBROUTINE ZPPSV( UPLO, N, NRHS, AP, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/zppsvx.f b/SRC/zppsvx.f
index f94badf783..09425fd7be 100644
--- a/SRC/zppsvx.f
+++ b/SRC/zppsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPPSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zppsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zppsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -69,7 +67,7 @@
 *>    where U is an upper triangular matrix, L is a lower triangular
 *>    matrix, and **H indicates conjugate transpose.
 *>
-*> 3. If the leading i-by-i principal minor is not positive definite,
+*> 3. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A.  If the reciprocal of the condition number is less than machine
@@ -262,10 +260,10 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO = i, and i is
-*>                <= N:  the leading minor of order i of A is
-*>                       not positive definite, so the factorization
-*>                       could not be completed, and the solution has not
-*>                       been computed. RCOND = 0 is returned.
+*>                <= N:  the leading principal minor of order i of A
+*>                       is not positive, so the factorization could not
+*>                       be completed, and the solution has not been
+*>                       computed. RCOND = 0 is returned.
 *>                = N+1: U is nonsingular, but RCOND is less than machine
 *>                       precision, meaning that the matrix is singular
 *>                       to working precision.  Nevertheless, the
@@ -283,7 +281,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERsolve
+*> \ingroup ppsvx
 *
 *> \par Further Details:
 *  =====================
@@ -306,8 +304,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B, LDB,
+      SUBROUTINE ZPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B,
+     $                   LDB,
      $                   X, LDX, RCOND, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -341,7 +341,8 @@ SUBROUTINE ZPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B, LDB,
       EXTERNAL           LSAME, DLAMCH, ZLANHP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZCOPY, ZLACPY, ZLAQHP, ZPPCON, ZPPEQU,
+      EXTERNAL           XERBLA, ZCOPY, ZLACPY, ZLAQHP, ZPPCON,
+     $                   ZPPEQU,
      $                   ZPPRFS, ZPPTRF, ZPPTRS
 *     ..
 *     .. Intrinsic Functions ..
@@ -363,10 +364,13 @@ SUBROUTINE ZPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B, LDB,
 *
 *     Test the input parameters.
 *
-      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+      IF( .NOT.NOFACT .AND.
+     $    .NOT.EQUIL .AND.
+     $    .NOT.LSAME( FACT, 'F' ) )
      $     THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -461,7 +465,8 @@ SUBROUTINE ZPPSVX( FACT, UPLO, N, NRHS, AP, AFP, EQUED, S, B, LDB,
 *     Use iterative refinement to improve the computed solution and
 *     compute error bounds and backward error estimates for it.
 *
-      CALL ZPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR, BERR,
+      CALL ZPPRFS( UPLO, N, NRHS, AP, AFP, B, LDB, X, LDX, FERR,
+     $             BERR,
      $             WORK, RWORK, INFO )
 *
 *     Transform the solution matrix X to a solution of the original
diff --git a/SRC/zpptrf.f b/SRC/zpptrf.f
index a34d639131..e40af1e57d 100644
--- a/SRC/zpptrf.f
+++ b/SRC/zpptrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPPTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpptrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpptrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -79,8 +77,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the factorization could not be
 *>                completed.
 *> \endverbatim
 *
@@ -92,7 +90,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup pptrf
 *
 *> \par Further Details:
 *  =====================
@@ -116,6 +114,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZPPTRF( UPLO, N, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -184,7 +183,8 @@ SUBROUTINE ZPPTRF( UPLO, N, AP, INFO )
 *           Compute elements 1:J-1 of column J.
 *
             IF( J.GT.1 )
-     $         CALL ZTPSV( 'Upper', 'Conjugate transpose', 'Non-unit',
+     $         CALL ZTPSV( 'Upper', 'Conjugate transpose',
+     $                     'Non-unit',
      $                     J-1, AP, AP( JC ), 1 )
 *
 *           Compute U(J,J) and test for non-positive-definiteness.
diff --git a/SRC/zpptri.f b/SRC/zpptri.f
index a74466eb80..87db3b45ed 100644
--- a/SRC/zpptri.f
+++ b/SRC/zpptri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPPTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpptri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpptri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -86,10 +84,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup pptri
 *
 *  =====================================================================
       SUBROUTINE ZPPTRI( UPLO, N, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,9 +171,11 @@ SUBROUTINE ZPPTRI( UPLO, N, AP, INFO )
          JJ = 1
          DO 20 J = 1, N
             JJN = JJ + N - J + 1
-            AP( JJ ) = DBLE( ZDOTC( N-J+1, AP( JJ ), 1, AP( JJ ), 1 ) )
+            AP( JJ ) = DBLE( ZDOTC( N-J+1, AP( JJ ), 1, AP( JJ ),
+     $          1 ) )
             IF( J.LT.N )
-     $         CALL ZTPMV( 'Lower', 'Conjugate transpose', 'Non-unit',
+     $         CALL ZTPMV( 'Lower', 'Conjugate transpose',
+     $                     'Non-unit',
      $                     N-J, AP( JJN ), AP( JJ+1 ), 1 )
             JJ = JJN
    20    CONTINUE
diff --git a/SRC/zpptrs.f b/SRC/zpptrs.f
index 433213d5ab..67b03bf163 100644
--- a/SRC/zpptrs.f
+++ b/SRC/zpptrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPPTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpptrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpptrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,10 +99,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup pptrs
 *
 *  =====================================================================
       SUBROUTINE ZPPTRS( UPLO, N, NRHS, AP, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -167,7 +166,8 @@ SUBROUTINE ZPPTRS( UPLO, N, NRHS, AP, B, LDB, INFO )
 *
 *           Solve U**H *X = B, overwriting B with X.
 *
-            CALL ZTPSV( 'Upper', 'Conjugate transpose', 'Non-unit', N,
+            CALL ZTPSV( 'Upper', 'Conjugate transpose', 'Non-unit',
+     $                  N,
      $                  AP, B( 1, I ), 1 )
 *
 *           Solve U*X = B, overwriting B with X.
@@ -188,7 +188,8 @@ SUBROUTINE ZPPTRS( UPLO, N, NRHS, AP, B, LDB, INFO )
 *
 *           Solve L**H *X = Y, overwriting B with X.
 *
-            CALL ZTPSV( 'Lower', 'Conjugate transpose', 'Non-unit', N,
+            CALL ZTPSV( 'Lower', 'Conjugate transpose', 'Non-unit',
+     $                  N,
      $                  AP, B( 1, I ), 1 )
    20    CONTINUE
       END IF
diff --git a/SRC/zpstf2.f b/SRC/zpstf2.f
index ef2536bd6c..7e66fa03bc 100644
--- a/SRC/zpstf2.f
+++ b/SRC/zpstf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPSTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpstf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpstf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,10 +133,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup pstf2
 *
 *  =====================================================================
-      SUBROUTINE ZPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
+      SUBROUTINE ZPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -175,7 +175,8 @@ SUBROUTINE ZPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
       EXTERNAL           DLAMCH, LSAME, DISNAN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZDSCAL, ZGEMV, ZLACGV, ZSWAP, XERBLA
+      EXTERNAL           ZDSCAL, ZGEMV, ZLACGV, ZSWAP,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, DCONJG, MAX, SQRT
@@ -300,7 +301,8 @@ SUBROUTINE ZPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *
             IF( J.LT.N ) THEN
                CALL ZLACGV( J-1, A( 1, J ), 1 )
-               CALL ZGEMV( 'Trans', J-1, N-J, -CONE, A( 1, J+1 ), LDA,
+               CALL ZGEMV( 'Trans', J-1, N-J, -CONE, A( 1, J+1 ),
+     $                     LDA,
      $                     A( 1, J ), 1, CONE, A( J, J+1 ), LDA )
                CALL ZLACGV( J-1, A( 1, J ), 1 )
                CALL ZDSCAL( N-J, ONE / AJJ, A( J, J+1 ), LDA )
@@ -346,7 +348,8 @@ SUBROUTINE ZPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
                A( PVT, PVT ) = A( J, J )
                CALL ZSWAP( J-1, A( J, 1 ), LDA, A( PVT, 1 ), LDA )
                IF( PVT.LT.N )
-     $            CALL ZSWAP( N-PVT, A( PVT+1, J ), 1, A( PVT+1, PVT ),
+     $            CALL ZSWAP( N-PVT, A( PVT+1, J ), 1, A( PVT+1,
+     $                        PVT ),
      $                        1 )
                DO 170 I = J + 1, PVT - 1
                   ZTEMP = DCONJG( A( I, J ) )
diff --git a/SRC/zpstrf.f b/SRC/zpstrf.f
index 577934d2c8..a9c7e1bd73 100644
--- a/SRC/zpstrf.f
+++ b/SRC/zpstrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPSTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpstrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpstrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,10 +133,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup pstrf
 *
 *  =====================================================================
-      SUBROUTINE ZPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
+      SUBROUTINE ZPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -176,7 +176,8 @@ SUBROUTINE ZPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
       EXTERNAL           DLAMCH, ILAENV, LSAME, DISNAN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZDSCAL, ZGEMV, ZHERK, ZLACGV, ZPSTF2, ZSWAP,
+      EXTERNAL           ZDSCAL, ZGEMV, ZHERK, ZLACGV, ZPSTF2,
+     $                   ZSWAP,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -323,7 +324,8 @@ SUBROUTINE ZPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *
                   IF( J.LT.N ) THEN
                      CALL ZLACGV( J-1, A( 1, J ), 1 )
-                     CALL ZGEMV( 'Trans', J-K, N-J, -CONE, A( K, J+1 ),
+                     CALL ZGEMV( 'Trans', J-K, N-J, -CONE, A( K,
+     $                           J+1 ),
      $                           LDA, A( K, J ), 1, CONE, A( J, J+1 ),
      $                           LDA )
                      CALL ZLACGV( J-1, A( 1, J ), 1 )
@@ -390,7 +392,8 @@ SUBROUTINE ZPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *                    Pivot OK, so can now swap pivot rows and columns
 *
                      A( PVT, PVT ) = A( J, J )
-                     CALL ZSWAP( J-1, A( J, 1 ), LDA, A( PVT, 1 ), LDA )
+                     CALL ZSWAP( J-1, A( J, 1 ), LDA, A( PVT, 1 ),
+     $                           LDA )
                      IF( PVT.LT.N )
      $                  CALL ZSWAP( N-PVT, A( PVT+1, J ), 1,
      $                              A( PVT+1, PVT ), 1 )
diff --git a/SRC/zptcon.f b/SRC/zptcon.f
index 122a091983..c7e935b584 100644
--- a/SRC/zptcon.f
+++ b/SRC/zptcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPTCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zptcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zptcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,7 +100,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16PTcomputational
+*> \ingroup ptcon
 *
 *> \par Further Details:
 *  =====================
@@ -116,6 +114,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZPTCON( N, D, E, ANORM, RCOND, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zpteqr.f b/SRC/zpteqr.f
index a81a6ad942..91cd88f7bd 100644
--- a/SRC/zpteqr.f
+++ b/SRC/zpteqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPTEQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpteqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpteqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,8 +121,8 @@
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value.
 *>          > 0:  if INFO = i, and i is:
 *>                <= N  the Cholesky factorization of the matrix could
-*>                      not be performed because the i-th principal minor
-*>                      was not positive definite.
+*>                      not be performed because the leading principal
+*>                      minor of order i was not positive.
 *>                > N   the SVD algorithm failed to converge;
 *>                      if INFO = N+i, i off-diagonal elements of the
 *>                      bidiagonal factor did not converge to zero.
@@ -138,10 +136,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16PTcomputational
+*> \ingroup pteqr
 *
 *  =====================================================================
       SUBROUTINE ZPTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zptrfs.f b/SRC/zptrfs.f
index 43e14d585b..313e6d94f3 100644
--- a/SRC/zptrfs.f
+++ b/SRC/zptrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPTRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zptrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zptrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -175,11 +173,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16PTcomputational
+*> \ingroup ptrfs
 *
 *  =====================================================================
       SUBROUTINE ZPTRFS( UPLO, N, NRHS, D, E, DF, EF, B, LDB, X, LDX,
      $                   FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zptsv.f b/SRC/zptsv.f
index d53e17a340..0c34644fe1 100644
--- a/SRC/zptsv.f
+++ b/SRC/zptsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPTSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zptsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zptsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -94,8 +92,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the solution has not been
+*>          > 0:  if INFO = i, the leading principal minor of order i
+*>                is not positive, and the solution has not been
 *>                computed.  The factorization has not been completed
 *>                unless i = N.
 *> \endverbatim
@@ -108,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16PTsolve
+*> \ingroup ptsv
 *
 *  =====================================================================
       SUBROUTINE ZPTSV( N, NRHS, D, E, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zptsvx.f b/SRC/zptsvx.f
index 4a40768f1a..b04d391315 100644
--- a/SRC/zptsvx.f
+++ b/SRC/zptsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPTSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zptsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zptsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -60,7 +58,7 @@
 *>    factorization can also be regarded as having the form
 *>    A = U**H*D*U.
 *>
-*> 2. If the leading i-by-i principal minor is not positive definite,
+*> 2. If the leading principal minor of order i is not positive,
 *>    then the routine returns with INFO = i. Otherwise, the factored
 *>    form of A is used to estimate the condition number of the matrix
 *>    A.  If the reciprocal of the condition number is less than machine
@@ -205,10 +203,10 @@
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *>          > 0:  if INFO = i, and i is
-*>                <= N:  the leading minor of order i of A is
-*>                       not positive definite, so the factorization
-*>                       could not be completed, and the solution has not
-*>                       been computed. RCOND = 0 is returned.
+*>                <= N:  the leading principal minor of order i of A
+*>                       is not positive, so the factorization could not
+*>                       be completed, and the solution has not been
+*>                       computed. RCOND = 0 is returned.
 *>                = N+1: U is nonsingular, but RCOND is less than machine
 *>                       precision, meaning that the matrix is singular
 *>                       to working precision.  Nevertheless, the
@@ -226,11 +224,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16PTsolve
+*> \ingroup ptsvx
 *
 *  =====================================================================
       SUBROUTINE ZPTSVX( FACT, N, NRHS, D, E, DF, EF, B, LDB, X, LDX,
      $                   RCOND, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -264,7 +263,8 @@ SUBROUTINE ZPTSVX( FACT, N, NRHS, D, E, DF, EF, B, LDB, X, LDX,
       EXTERNAL           LSAME, DLAMCH, ZLANHT
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, XERBLA, ZCOPY, ZLACPY, ZPTCON, ZPTRFS,
+      EXTERNAL           DCOPY, XERBLA, ZCOPY, ZLACPY, ZPTCON,
+     $                   ZPTRFS,
      $                   ZPTTRF, ZPTTRS
 *     ..
 *     .. Intrinsic Functions ..
@@ -325,7 +325,8 @@ SUBROUTINE ZPTSVX( FACT, N, NRHS, D, E, DF, EF, B, LDB, X, LDX,
 *     Use iterative refinement to improve the computed solutions and
 *     compute error bounds and backward error estimates for them.
 *
-      CALL ZPTRFS( 'Lower', N, NRHS, D, E, DF, EF, B, LDB, X, LDX, FERR,
+      CALL ZPTRFS( 'Lower', N, NRHS, D, E, DF, EF, B, LDB, X, LDX,
+     $             FERR,
      $             BERR, WORK, RWORK, INFO )
 *
 *     Set INFO = N+1 if the matrix is singular to working precision.
diff --git a/SRC/zpttrf.f b/SRC/zpttrf.f
index a106ec4193..d40c4b8ee9 100644
--- a/SRC/zpttrf.f
+++ b/SRC/zpttrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPTTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpttrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpttrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -71,8 +69,8 @@
 *>          INFO is INTEGER
 *>          = 0: successful exit
 *>          < 0: if INFO = -k, the k-th argument had an illegal value
-*>          > 0: if INFO = k, the leading minor of order k is not
-*>               positive definite; if k < N, the factorization could not
+*>          > 0: if INFO = k, the leading principal minor of order k
+*>               is not positive; if k < N, the factorization could not
 *>               be completed, while if k = N, the factorization was
 *>               completed, but D(N) <= 0.
 *> \endverbatim
@@ -85,10 +83,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16PTcomputational
+*> \ingroup pttrf
 *
 *  =====================================================================
       SUBROUTINE ZPTTRF( N, D, E, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zpttrs.f b/SRC/zpttrs.f
index 41c7c9ba7c..3f32fb18ba 100644
--- a/SRC/zpttrs.f
+++ b/SRC/zpttrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPTTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpttrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpttrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -114,10 +112,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16PTcomputational
+*> \ingroup pttrs
 *
 *  =====================================================================
       SUBROUTINE ZPTTRS( UPLO, N, NRHS, D, E, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zptts2.f b/SRC/zptts2.f
index 8ff6b1fe75..f23a1a7784 100644
--- a/SRC/zptts2.f
+++ b/SRC/zptts2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZPTTS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zptts2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zptts2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,10 +104,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16PTcomputational
+*> \ingroup ptts2
 *
 *  =====================================================================
       SUBROUTINE ZPTTS2( IUPLO, N, NRHS, D, E, B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zrot.f b/SRC/zrot.f
index 28fc8ec1de..e8f963f5f2 100644
--- a/SRC/zrot.f
+++ b/SRC/zrot.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZROT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zrot.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zrot.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -35,7 +33,7 @@
 *>
 *> \verbatim
 *>
-*> ZROT   applies a plane rotation, where the cos (C) is real and the
+*> ZROT applies a plane rotation, where the cos (C) is real and the
 *> sin (S) is complex, and the vectors CX and CY are complex.
 *> \endverbatim
 *
@@ -96,10 +94,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup rot
 *
 *  =====================================================================
       SUBROUTINE ZROT( N, CX, INCX, CY, INCY, C, S )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zrscl.f b/SRC/zrscl.f
new file mode 100644
index 0000000000..22c0544228
--- /dev/null
+++ b/SRC/zrscl.f
@@ -0,0 +1,203 @@
+*> \brief \b ZDRSCL multiplies a vector by the reciprocal of a real scalar.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*> Download ZDRSCL + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zdrscl.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zdrscl.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zdrscl.f">
+*> [TXT]</a>
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZRSCL( N, A, X, INCX )
+*
+*       .. Scalar Arguments ..
+*       INTEGER            INCX, N
+*       COMPLEX*16         A
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         X( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZRSCL multiplies an n-element complex vector x by the complex scalar
+*> 1/a.  This is done without overflow or underflow as long as
+*> the final result x/a does not overflow or underflow.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of components of the vector x.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX*16
+*>          The scalar a which is used to divide each component of x.
+*>          A must not be 0, or the subroutine will divide by zero.
+*> \endverbatim
+*>
+*> \param[in,out] X
+*> \verbatim
+*>          X is COMPLEX*16 array, dimension
+*>                         (1+(N-1)*abs(INCX))
+*>          The n-element vector x.
+*> \endverbatim
+*>
+*> \param[in] INCX
+*> \verbatim
+*>          INCX is INTEGER
+*>          The increment between successive values of the vector SX.
+*>          > 0:  SX(1) = X(1) and SX(1+(i-1)*INCX) = x(i),     1< i<= n
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*  =====================================================================
+      SUBROUTINE ZRSCL( N, A, X, INCX )
+      IMPLICIT NONE
+*
+*  -- LAPACK auxiliary routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            INCX, N
+      COMPLEX*16         A
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         X( * )
+*     ..
+*
+* =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      DOUBLE PRECISION   SAFMAX, SAFMIN, OV, AR, AI, ABSR, ABSI, UR, UI
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH
+      COMPLEX*16         ZLADIV
+      EXTERNAL           DLAMCH, ZLADIV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DSCAL, ZDSCAL, ZDRSCL
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible
+*
+      IF( N.LE.0 )
+     $   RETURN
+*
+*     Get machine parameters
+*
+      SAFMIN = DLAMCH( 'S' )
+      SAFMAX = ONE / SAFMIN
+      OV   = DLAMCH( 'O' )
+*
+*     Initialize constants related to A.
+*
+      AR = DBLE( A )
+      AI = DIMAG( A )
+      ABSR = ABS( AR )
+      ABSI = ABS( AI )
+*
+      IF( AI.EQ.ZERO ) THEN
+*        If alpha is real, then we can use csrscl
+         CALL ZDRSCL( N, AR, X, INCX )
+*
+      ELSE IF( AR.EQ.ZERO ) THEN
+*        If alpha has a zero real part, then we follow the same rules as if
+*        alpha were real.
+         IF( ABSI.GT.SAFMAX ) THEN
+            CALL ZDSCAL( N, SAFMIN, X, INCX )
+            CALL ZSCAL( N, DCMPLX( ZERO, -SAFMAX / AI ), X, INCX )
+         ELSE IF( ABSI.LT.SAFMIN ) THEN
+            CALL ZSCAL( N, DCMPLX( ZERO, -SAFMIN / AI ), X, INCX )
+            CALL ZDSCAL( N, SAFMAX, X, INCX )
+         ELSE
+            CALL ZSCAL( N, DCMPLX( ZERO, -ONE / AI ), X, INCX )
+         END IF
+*
+      ELSE
+*        The following numbers can be computed.
+*        They are the inverse of the real and imaginary parts of 1/alpha.
+*        Note that a and b are always different from zero.
+*        NaNs are only possible if either:
+*        1. alphaR or alphaI is NaN.
+*        2. alphaR and alphaI are both infinite, in which case it makes sense
+*        to propagate a NaN.
+         UR = AR + AI * ( AI / AR )
+         UI = AI + AR * ( AR / AI )
+*
+         IF( (ABS( UR ).LT.SAFMIN).OR.(ABS( UI ).LT.SAFMIN) ) THEN
+*           This means that both alphaR and alphaI are very small.
+            CALL ZSCAL( N, DCMPLX( SAFMIN / UR, -SAFMIN / UI ), X,
+     $                  INCX )
+            CALL ZDSCAL( N, SAFMAX, X, INCX )
+         ELSE IF( (ABS( UR ).GT.SAFMAX).OR.(ABS( UI ).GT.SAFMAX) ) THEN
+            IF( (ABSR.GT.OV).OR.(ABSI.GT.OV) ) THEN
+*              This means that a and b are both Inf. No need for scaling.
+               CALL ZSCAL( N, DCMPLX( ONE / UR, -ONE / UI ), X,
+     $                     INCX )
+            ELSE
+               CALL ZDSCAL( N, SAFMIN, X, INCX )
+               IF( (ABS( UR ).GT.OV).OR.(ABS( UI ).GT.OV) ) THEN
+*                 Infs were generated. We do proper scaling to avoid them.
+                  IF( ABSR.GE.ABSI ) THEN
+*                    ABS( UR ) <= ABS( UI )
+                     UR = (SAFMIN * AR) + SAFMIN * (AI * ( AI / AR ))
+                     UI = (SAFMIN * AI) + AR * ( (SAFMIN * AR) / AI )
+                  ELSE
+*                    ABS( UR ) > ABS( UI )
+                     UR = (SAFMIN * AR) + AI * ( (SAFMIN * AI) / AR )
+                     UI = (SAFMIN * AI) + SAFMIN * (AR * ( AR / AI ))
+                  END IF
+                  CALL ZSCAL( N, DCMPLX( ONE / UR, -ONE / UI ), X,
+     $                        INCX )
+               ELSE
+                  CALL ZSCAL( N, DCMPLX( SAFMAX / UR, -SAFMAX / UI ),
+     $                        X, INCX )
+               END IF
+            END IF
+         ELSE
+            CALL ZSCAL( N, DCMPLX( ONE / UR, -ONE / UI ), X, INCX )
+         END IF
+      END IF
+*
+      RETURN
+*
+*     End of ZRSCL
+*
+      END
diff --git a/SRC/zspcon.f b/SRC/zspcon.f
index fa497bd05d..b26979af04 100644
--- a/SRC/zspcon.f
+++ b/SRC/zspcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSPCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zspcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zspcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -111,10 +109,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hpcon
 *
 *  =====================================================================
-      SUBROUTINE ZSPCON( UPLO, N, AP, IPIV, ANORM, RCOND, WORK, INFO )
+      SUBROUTINE ZSPCON( UPLO, N, AP, IPIV, ANORM, RCOND, WORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zspmv.f b/SRC/zspmv.f
index 8a8d3a9d0f..929afed6c2 100644
--- a/SRC/zspmv.f
+++ b/SRC/zspmv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSPMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zspmv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zspmv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,10 +142,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup hpmv
 *
 *  =====================================================================
       SUBROUTINE ZSPMV( UPLO, N, ALPHA, AP, X, INCX, BETA, Y, INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -186,7 +185,8 @@ SUBROUTINE ZSPMV( UPLO, N, ALPHA, AP, X, INCX, BETA, Y, INCY )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = 1
       ELSE IF( N.LT.0 ) THEN
          INFO = 2
diff --git a/SRC/zspr.f b/SRC/zspr.f
index 549415fa3b..30b1315a0f 100644
--- a/SRC/zspr.f
+++ b/SRC/zspr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSPR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zspr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zspr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -125,10 +123,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup hpr
 *
 *  =====================================================================
       SUBROUTINE ZSPR( UPLO, N, ALPHA, X, INCX, AP )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -165,7 +164,8 @@ SUBROUTINE ZSPR( UPLO, N, ALPHA, X, INCX, AP )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = 1
       ELSE IF( N.LT.0 ) THEN
          INFO = 2
diff --git a/SRC/zsprfs.f b/SRC/zsprfs.f
index 9985b5749f..0b5c4714c6 100644
--- a/SRC/zsprfs.f
+++ b/SRC/zsprfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSPRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsprfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsprfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -172,11 +170,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hprfs
 *
 *  =====================================================================
-      SUBROUTINE ZSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
+      SUBROUTINE ZSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
+     $                   LDX,
      $                   FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -217,7 +217,8 @@ SUBROUTINE ZSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZLACN2, ZSPMV, ZSPTRS
+      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZLACN2, ZSPMV,
+     $                   ZSPTRS
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG, MAX
diff --git a/SRC/zspsv.f b/SRC/zspsv.f
index a1c13024bb..62b25d6e76 100644
--- a/SRC/zspsv.f
+++ b/SRC/zspsv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSPSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zspsv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zspsv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,7 +133,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERsolve
+*> \ingroup hpsv
 *
 *> \par Further Details:
 *  =====================
@@ -159,6 +157,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZSPSV( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,7 +189,8 @@ SUBROUTINE ZSPSV( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/zspsvx.f b/SRC/zspsvx.f
index 2cd0975651..298c3305a3 100644
--- a/SRC/zspsvx.f
+++ b/SRC/zspsvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSPSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zspsvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zspsvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -249,7 +247,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERsolve
+*> \ingroup hpsvx
 *
 *> \par Further Details:
 *  =====================
@@ -272,8 +270,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
+      SUBROUTINE ZSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB,
+     $                   X,
      $                   LDX, RCOND, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -307,7 +307,8 @@ SUBROUTINE ZSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
       EXTERNAL           LSAME, DLAMCH, ZLANSP
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZCOPY, ZLACPY, ZSPCON, ZSPRFS, ZSPTRF,
+      EXTERNAL           XERBLA, ZCOPY, ZLACPY, ZSPCON, ZSPRFS,
+     $                   ZSPTRF,
      $                   ZSPTRS
 *     ..
 *     .. Intrinsic Functions ..
@@ -321,7 +322,8 @@ SUBROUTINE ZSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
       NOFACT = LSAME( FACT, 'N' )
       IF( .NOT.NOFACT .AND. .NOT.LSAME( FACT, 'F' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -369,7 +371,8 @@ SUBROUTINE ZSPSVX( FACT, UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X,
 *     Use iterative refinement to improve the computed solutions and
 *     compute error bounds and backward error estimates for them.
 *
-      CALL ZSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX, FERR,
+      CALL ZSPRFS( UPLO, N, NRHS, AP, AFP, IPIV, B, LDB, X, LDX,
+     $             FERR,
      $             BERR, WORK, RWORK, INFO )
 *
 *     Set INFO = N+1 if the matrix is singular to working precision.
diff --git a/SRC/zsptrf.f b/SRC/zsptrf.f
index bad30b7a42..b2478ee703 100644
--- a/SRC/zsptrf.f
+++ b/SRC/zsptrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSPTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsptrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsptrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,7 +106,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hptrf
 *
 *> \par Further Details:
 *  =====================
@@ -155,6 +153,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZSPTRF( UPLO, N, AP, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -506,7 +505,8 @@ SUBROUTINE ZSPTRF( UPLO, N, AP, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL ZSWAP( N-KP, AP( KNC+KP-KK+1 ), 1, AP( KPC+1 ),
+     $            CALL ZSWAP( N-KP, AP( KNC+KP-KK+1 ), 1,
+     $                        AP( KPC+1 ),
      $                        1 )
                KX = KNC + KP - KK
                DO 80 J = KK + 1, KP - 1
diff --git a/SRC/zsptri.f b/SRC/zsptri.f
index ba590f661c..f0057aca18 100644
--- a/SRC/zsptri.f
+++ b/SRC/zsptri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSPTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsptri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsptri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hptri
 *
 *  =====================================================================
       SUBROUTINE ZSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -218,7 +217,8 @@ SUBROUTINE ZSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
 *
             IF( K.GT.1 ) THEN
                CALL ZCOPY( K-1, AP( KC ), 1, WORK, 1 )
-               CALL ZSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO, AP( KC ),
+               CALL ZSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO,
+     $                     AP( KC ),
      $                     1 )
                AP( KC+K-1 ) = AP( KC+K-1 ) -
      $                        ZDOTU( K-1, WORK, 1, AP( KC ), 1 )
@@ -243,18 +243,21 @@ SUBROUTINE ZSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
 *
             IF( K.GT.1 ) THEN
                CALL ZCOPY( K-1, AP( KC ), 1, WORK, 1 )
-               CALL ZSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO, AP( KC ),
+               CALL ZSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO,
+     $                     AP( KC ),
      $                     1 )
                AP( KC+K-1 ) = AP( KC+K-1 ) -
      $                        ZDOTU( K-1, WORK, 1, AP( KC ), 1 )
                AP( KCNEXT+K-1 ) = AP( KCNEXT+K-1 ) -
-     $                            ZDOTU( K-1, AP( KC ), 1, AP( KCNEXT ),
+     $                            ZDOTU( K-1, AP( KC ), 1,
+     $                                   AP( KCNEXT ),
      $                            1 )
                CALL ZCOPY( K-1, AP( KCNEXT ), 1, WORK, 1 )
                CALL ZSPMV( UPLO, K-1, -ONE, AP, WORK, 1, ZERO,
      $                     AP( KCNEXT ), 1 )
                AP( KCNEXT+K ) = AP( KCNEXT+K ) -
-     $                          ZDOTU( K-1, WORK, 1, AP( KCNEXT ), 1 )
+     $                          ZDOTU( K-1, WORK, 1, AP( KCNEXT ),
+     $                                 1 )
             END IF
             KSTEP = 2
             KCNEXT = KCNEXT + K + 1
@@ -345,7 +348,8 @@ SUBROUTINE ZSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL ZCOPY( N-K, AP( KC+1 ), 1, WORK, 1 )
-               CALL ZSPMV( UPLO, N-K, -ONE, AP( KC+( N-K+1 ) ), WORK, 1,
+               CALL ZSPMV( UPLO, N-K, -ONE, AP( KC+( N-K+1 ) ), WORK,
+     $                     1,
      $                     ZERO, AP( KC+1 ), 1 )
                AP( KC ) = AP( KC ) - ZDOTU( N-K, WORK, 1, AP( KC+1 ),
      $                    1 )
@@ -353,10 +357,12 @@ SUBROUTINE ZSPTRI( UPLO, N, AP, IPIV, WORK, INFO )
      $                          ZDOTU( N-K, AP( KC+1 ), 1,
      $                          AP( KCNEXT+2 ), 1 )
                CALL ZCOPY( N-K, AP( KCNEXT+2 ), 1, WORK, 1 )
-               CALL ZSPMV( UPLO, N-K, -ONE, AP( KC+( N-K+1 ) ), WORK, 1,
+               CALL ZSPMV( UPLO, N-K, -ONE, AP( KC+( N-K+1 ) ), WORK,
+     $                     1,
      $                     ZERO, AP( KCNEXT+2 ), 1 )
                AP( KCNEXT ) = AP( KCNEXT ) -
-     $                        ZDOTU( N-K, WORK, 1, AP( KCNEXT+2 ), 1 )
+     $                        ZDOTU( N-K, WORK, 1, AP( KCNEXT+2 ),
+     $                               1 )
             END IF
             KSTEP = 2
             KCNEXT = KCNEXT - ( N-K+3 )
diff --git a/SRC/zsptrs.f b/SRC/zsptrs.f
index 2a16cb22ac..45ecf6991c 100644
--- a/SRC/zsptrs.f
+++ b/SRC/zsptrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSPTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsptrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsptrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -108,10 +106,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup hptrs
 *
 *  =====================================================================
       SUBROUTINE ZSPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -267,7 +266,8 @@ SUBROUTINE ZSPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *           Multiply by inv(U**T(K)), where U(K) is the transformation
 *           stored in column K of A.
 *
-            CALL ZGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, AP( KC ),
+            CALL ZGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB,
+     $                  AP( KC ),
      $                  1, ONE, B( K, 1 ), LDB )
 *
 *           Interchange rows K and IPIV(K).
@@ -284,7 +284,8 @@ SUBROUTINE ZSPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *           Multiply by inv(U**T(K+1)), where U(K+1) is the transformation
 *           stored in columns K and K+1 of A.
 *
-            CALL ZGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, AP( KC ),
+            CALL ZGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB,
+     $                  AP( KC ),
      $                  1, ONE, B( K, 1 ), LDB )
             CALL ZGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB,
      $                  AP( KC+K ), 1, ONE, B( K+1, 1 ), LDB )
@@ -355,7 +356,8 @@ SUBROUTINE ZSPTRS( UPLO, N, NRHS, AP, IPIV, B, LDB, INFO )
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL ZGERU( N-K-1, NRHS, -ONE, AP( KC+2 ), 1, B( K, 1 ),
+               CALL ZGERU( N-K-1, NRHS, -ONE, AP( KC+2 ), 1, B( K,
+     $                     1 ),
      $                     LDB, B( K+2, 1 ), LDB )
                CALL ZGERU( N-K-1, NRHS, -ONE, AP( KC+N-K+2 ), 1,
      $                     B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
diff --git a/SRC/zstedc.f b/SRC/zstedc.f
index 74d390af7e..16d90a216b 100644
--- a/SRC/zstedc.f
+++ b/SRC/zstedc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSTEDC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zstedc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zstedc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -43,12 +41,6 @@
 *> be found if ZHETRD or ZHPTRD or ZHBTRD has been used to reduce this
 *> matrix to tridiagonal form.
 *>
-*> This code makes very mild assumptions about floating point
-*> arithmetic. It will work on machines with a guard digit in
-*> add/subtract, or on those binary machines without guard digits
-*> which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or Cray-2.
-*> It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.  See DLAED3 for details.
 *> \endverbatim
 *
 *  Arguments:
@@ -198,7 +190,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup stedc
 *
 *> \par Contributors:
 *  ==================
@@ -209,6 +201,7 @@
 *  =====================================================================
       SUBROUTINE ZSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, RWORK,
      $                   LRWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -243,7 +236,8 @@ SUBROUTINE ZSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, RWORK,
       EXTERNAL           LSAME, ILAENV, DLAMCH, DLANST
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLASCL, DLASET, DSTEDC, DSTEQR, DSTERF, XERBLA,
+      EXTERNAL           DLASCL, DLASET, DSTEDC, DSTEQR, DSTERF,
+     $                   XERBLA,
      $                   ZLACPY, ZLACRM, ZLAED0, ZSTEQR, ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
@@ -302,7 +296,7 @@ SUBROUTINE ZSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, RWORK,
             LIWMIN = 3 + 5*N
          END IF
          WORK( 1 ) = LWMIN
-         RWORK( 1 ) = LRWMIN
+         RWORK( 1 ) = REAL( LRWMIN )
          IWORK( 1 ) = LIWMIN
 *
          IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
@@ -414,12 +408,15 @@ SUBROUTINE ZSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, RWORK,
 *              Scale.
 *
                ORGNRM = DLANST( 'M', M, D( START ), E( START ) )
-               CALL DLASCL( 'G', 0, 0, ORGNRM, ONE, M, 1, D( START ), M,
+               CALL DLASCL( 'G', 0, 0, ORGNRM, ONE, M, 1, D( START ),
+     $                      M,
      $                      INFO )
-               CALL DLASCL( 'G', 0, 0, ORGNRM, ONE, M-1, 1, E( START ),
+               CALL DLASCL( 'G', 0, 0, ORGNRM, ONE, M-1, 1,
+     $                      E( START ),
      $                      M-1, INFO )
 *
-               CALL ZLAED0( N, M, D( START ), E( START ), Z( 1, START ),
+               CALL ZLAED0( N, M, D( START ), E( START ), Z( 1,
+     $                      START ),
      $                      LDZ, WORK, N, RWORK, IWORK, INFO )
                IF( INFO.GT.0 ) THEN
                   INFO = ( INFO / ( M+1 )+START-1 )*( N+1 ) +
@@ -429,13 +426,15 @@ SUBROUTINE ZSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, RWORK,
 *
 *              Scale back.
 *
-               CALL DLASCL( 'G', 0, 0, ONE, ORGNRM, M, 1, D( START ), M,
+               CALL DLASCL( 'G', 0, 0, ONE, ORGNRM, M, 1, D( START ),
+     $                      M,
      $                      INFO )
 *
             ELSE
                CALL DSTEQR( 'I', M, D( START ), E( START ), RWORK, M,
      $                      RWORK( M*M+1 ), INFO )
-               CALL ZLACRM( N, M, Z( 1, START ), LDZ, RWORK, M, WORK, N,
+               CALL ZLACRM( N, M, Z( 1, START ), LDZ, RWORK, M, WORK,
+     $                      N,
      $                      RWORK( M*M+1 ) )
                CALL ZLACPY( 'A', N, M, WORK, N, Z( 1, START ), LDZ )
                IF( INFO.GT.0 ) THEN
@@ -473,7 +472,7 @@ SUBROUTINE ZSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, RWORK,
 *
    70 CONTINUE
       WORK( 1 ) = LWMIN
-      RWORK( 1 ) = LRWMIN
+      RWORK( 1 ) = REAL( LRWMIN )
       IWORK( 1 ) = LIWMIN
 *
       RETURN
diff --git a/SRC/zstegr.f b/SRC/zstegr.f
index ee43a0d214..7ccb03acc5 100644
--- a/SRC/zstegr.f
+++ b/SRC/zstegr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSTEGR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zstegr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zstegr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -56,7 +54,7 @@
 *>
 *> Note : ZSTEGR and ZSTEMR work only on machines which follow
 *> IEEE-754 floating-point standard in their handling of infinities and
-*> NaNs.  Normal execution may create these exceptiona values and hence
+*> NaNs.  Normal execution may create these exceptional values and hence
 *> may abort due to a floating point exception in environments which
 *> do not conform to the IEEE-754 standard.
 *> \endverbatim
@@ -249,7 +247,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup stegr
 *
 *> \par Contributors:
 *  ==================
@@ -262,6 +260,7 @@
       SUBROUTINE ZSTEGR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $           ABSTOL, M, W, Z, LDZ, ISUPPZ, WORK, LWORK, IWORK,
      $           LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zstein.f b/SRC/zstein.f
index 9be9d981c1..ca408fe70b 100644
--- a/SRC/zstein.f
+++ b/SRC/zstein.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSTEIN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zstein.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zstein.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -174,11 +172,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup stein
 *
 *  =====================================================================
       SUBROUTINE ZSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
      $                   IWORK, IFAIL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -222,7 +221,8 @@ SUBROUTINE ZSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
       EXTERNAL           IDAMAX, DLAMCH, DNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLAGTF, DLAGTS, DLARNV, DSCAL, XERBLA
+      EXTERNAL           DCOPY, DLAGTF, DLAGTS, DLARNV, DSCAL,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCMPLX, MAX, SQRT
@@ -365,7 +365,8 @@ SUBROUTINE ZSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
 *           Compute LU factors with partial pivoting  ( PT = LU )
 *
             TOL = ZERO
-            CALL DLAGTF( BLKSIZ, WORK( INDRV4+1 ), XJ, WORK( INDRV2+2 ),
+            CALL DLAGTF( BLKSIZ, WORK( INDRV4+1 ), XJ,
+     $                   WORK( INDRV2+2 ),
      $                   WORK( INDRV3+1 ), TOL, WORK( INDRV5+1 ), IWORK,
      $                   IINFO )
 *
@@ -386,7 +387,8 @@ SUBROUTINE ZSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
 *
 *           Solve the system LU = Pb.
 *
-            CALL DLAGTS( -1, BLKSIZ, WORK( INDRV4+1 ), WORK( INDRV2+2 ),
+            CALL DLAGTS( -1, BLKSIZ, WORK( INDRV4+1 ),
+     $                   WORK( INDRV2+2 ),
      $                   WORK( INDRV3+1 ), WORK( INDRV5+1 ), IWORK,
      $                   WORK( INDRV1+1 ), TOL, IINFO )
 *
diff --git a/SRC/zstemr.f b/SRC/zstemr.f
index b034198de0..f8fc18ca1c 100644
--- a/SRC/zstemr.f
+++ b/SRC/zstemr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSTEMR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zstemr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zstemr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -320,7 +318,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup stemr
 *
 *> \par Contributors:
 *  ==================
@@ -330,11 +328,13 @@
 *> Inderjit Dhillon, University of Texas, Austin, USA \n
 *> Osni Marques, LBNL/NERSC, USA \n
 *> Christof Voemel, University of California, Berkeley, USA \n
+*> Aravindh Krishnamoorthy, FAU, Erlangen, Germany \n
 *
 *  =====================================================================
       SUBROUTINE ZSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $                   M, W, Z, LDZ, NZC, ISUPPZ, TRYRAC, WORK, LWORK,
      $                   IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -361,7 +361,8 @@ SUBROUTINE ZSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
      $                     MINRGP = 1.0D-3 )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            ALLEIG, INDEIG, LQUERY, VALEIG, WANTZ, ZQUERY
+      LOGICAL            ALLEIG, INDEIG, LQUERY, VALEIG, WANTZ, ZQUERY,
+     $                   LAESWAP
       INTEGER            I, IBEGIN, IEND, IFIRST, IIL, IINDBL, IINDW,
      $                   IINDWK, IINFO, IINSPL, IIU, ILAST, IN, INDD,
      $                   INDE2, INDERR, INDGP, INDGRS, INDWRK, ITMP,
@@ -378,7 +379,8 @@ SUBROUTINE ZSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
       EXTERNAL           LSAME, DLAMCH, DLANST
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLAE2, DLAEV2, DLARRC, DLARRE, DLARRJ,
+      EXTERNAL           DCOPY, DLAE2, DLAEV2, DLARRC, DLARRE,
+     $                   DLARRJ,
      $                   DLARRR, DLASRT, DSCAL, XERBLA, ZLARRV, ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
@@ -397,6 +399,7 @@ SUBROUTINE ZSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
 *
       LQUERY = ( ( LWORK.EQ.-1 ).OR.( LIWORK.EQ.-1 ) )
       ZQUERY = ( NZC.EQ.-1 )
+      LAESWAP = .FALSE.
 
 *     DSTEMR needs WORK of size 6*N, IWORK of size 3*N.
 *     In addition, DLARRE needs WORK of size 6*N, IWORK of size 5*N.
@@ -519,6 +522,15 @@ SUBROUTINE ZSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
          ELSE IF( WANTZ.AND.(.NOT.ZQUERY) ) THEN
             CALL DLAEV2( D(1), E(1), D(2), R1, R2, CS, SN )
          END IF
+*        D/S/LAE2 and D/S/LAEV2 outputs satisfy |R1| >= |R2|. However,
+*        the following code requires R1 >= R2. Hence, we correct
+*        the order of R1, R2, CS, SN if R1 < R2 before further processing.
+         IF( R1.LT.R2 ) THEN
+            E(2) = R1
+            R1 = R2
+            R2 = E(2)
+            LAESWAP = .TRUE.
+         ENDIF
          IF( ALLEIG.OR.
      $      (VALEIG.AND.(R2.GT.WL).AND.
      $                  (R2.LE.WU)).OR.
@@ -526,8 +538,13 @@ SUBROUTINE ZSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
             M = M+1
             W( M ) = R2
             IF( WANTZ.AND.(.NOT.ZQUERY) ) THEN
-               Z( 1, M ) = -SN
-               Z( 2, M ) = CS
+               IF( LAESWAP ) THEN
+                  Z( 1, M ) = CS
+                  Z( 2, M ) = SN
+               ELSE
+                  Z( 1, M ) = -SN
+                  Z( 2, M ) = CS
+               ENDIF
 *              Note: At most one of SN and CS can be zero.
                IF (SN.NE.ZERO) THEN
                   IF (CS.NE.ZERO) THEN
@@ -550,8 +567,13 @@ SUBROUTINE ZSTEMR( JOBZ, RANGE, N, D, E, VL, VU, IL, IU,
             M = M+1
             W( M ) = R1
             IF( WANTZ.AND.(.NOT.ZQUERY) ) THEN
-               Z( 1, M ) = CS
-               Z( 2, M ) = SN
+               IF( LAESWAP ) THEN
+                  Z( 1, M ) = -SN
+                  Z( 2, M ) = CS
+               ELSE
+                  Z( 1, M ) = CS
+                  Z( 2, M ) = SN
+               ENDIF
 *              Note: At most one of SN and CS can be zero.
                IF (SN.NE.ZERO) THEN
                   IF (CS.NE.ZERO) THEN
diff --git a/SRC/zsteqr.f b/SRC/zsteqr.f
index 47f4004e8d..0528bf5ebc 100644
--- a/SRC/zsteqr.f
+++ b/SRC/zsteqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSTEQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsteqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsteqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -125,10 +123,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup steqr
 *
 *  =====================================================================
       SUBROUTINE ZSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -168,7 +167,8 @@ SUBROUTINE ZSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
       EXTERNAL           LSAME, DLAMCH, DLANST, DLAPY2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLAE2, DLAEV2, DLARTG, DLASCL, DLASRT, XERBLA,
+      EXTERNAL           DLAE2, DLAEV2, DLARTG, DLASCL, DLASRT,
+     $                   XERBLA,
      $                   ZLASET, ZLASR, ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
@@ -274,13 +274,15 @@ SUBROUTINE ZSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
      $   GO TO 10
       IF( ANORM.GT.SSFMAX ) THEN
          ISCALE = 1
-         CALL DLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L+1, 1, D( L ), N,
+         CALL DLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L+1, 1, D( L ),
+     $                N,
      $                INFO )
          CALL DLASCL( 'G', 0, 0, ANORM, SSFMAX, LEND-L, 1, E( L ), N,
      $                INFO )
       ELSE IF( ANORM.LT.SSFMIN ) THEN
          ISCALE = 2
-         CALL DLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L+1, 1, D( L ), N,
+         CALL DLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L+1, 1, D( L ),
+     $                N,
      $                INFO )
          CALL DLASCL( 'G', 0, 0, ANORM, SSFMIN, LEND-L, 1, E( L ), N,
      $                INFO )
@@ -323,7 +325,8 @@ SUBROUTINE ZSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
 *
          IF( M.EQ.L+1 ) THEN
             IF( ICOMPZ.GT.0 ) THEN
-               CALL DLAEV2( D( L ), E( L ), D( L+1 ), RT1, RT2, C, S )
+               CALL DLAEV2( D( L ), E( L ), D( L+1 ), RT1, RT2, C,
+     $                      S )
                WORK( L ) = C
                WORK( N-1+L ) = S
                CALL ZLASR( 'R', 'V', 'B', N, 2, WORK( L ),
@@ -382,7 +385,8 @@ SUBROUTINE ZSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
 *
          IF( ICOMPZ.GT.0 ) THEN
             MM = M - L + 1
-            CALL ZLASR( 'R', 'V', 'B', N, MM, WORK( L ), WORK( N-1+L ),
+            CALL ZLASR( 'R', 'V', 'B', N, MM, WORK( L ),
+     $                  WORK( N-1+L ),
      $                  Z( 1, L ), LDZ )
          END IF
 *
@@ -430,7 +434,8 @@ SUBROUTINE ZSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
 *
          IF( M.EQ.L-1 ) THEN
             IF( ICOMPZ.GT.0 ) THEN
-               CALL DLAEV2( D( L-1 ), E( L-1 ), D( L ), RT1, RT2, C, S )
+               CALL DLAEV2( D( L-1 ), E( L-1 ), D( L ), RT1, RT2, C,
+     $                      S )
                WORK( M ) = C
                WORK( N-1+M ) = S
                CALL ZLASR( 'R', 'V', 'F', N, 2, WORK( M ),
@@ -489,7 +494,8 @@ SUBROUTINE ZSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
 *
          IF( ICOMPZ.GT.0 ) THEN
             MM = L - M + 1
-            CALL ZLASR( 'R', 'V', 'F', N, MM, WORK( M ), WORK( N-1+M ),
+            CALL ZLASR( 'R', 'V', 'F', N, MM, WORK( M ),
+     $                  WORK( N-1+M ),
      $                  Z( 1, M ), LDZ )
          END IF
 *
@@ -515,12 +521,14 @@ SUBROUTINE ZSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
       IF( ISCALE.EQ.1 ) THEN
          CALL DLASCL( 'G', 0, 0, SSFMAX, ANORM, LENDSV-LSV+1, 1,
      $                D( LSV ), N, INFO )
-         CALL DLASCL( 'G', 0, 0, SSFMAX, ANORM, LENDSV-LSV, 1, E( LSV ),
+         CALL DLASCL( 'G', 0, 0, SSFMAX, ANORM, LENDSV-LSV, 1,
+     $                E( LSV ),
      $                N, INFO )
       ELSE IF( ISCALE.EQ.2 ) THEN
          CALL DLASCL( 'G', 0, 0, SSFMIN, ANORM, LENDSV-LSV+1, 1,
      $                D( LSV ), N, INFO )
-         CALL DLASCL( 'G', 0, 0, SSFMIN, ANORM, LENDSV-LSV, 1, E( LSV ),
+         CALL DLASCL( 'G', 0, 0, SSFMIN, ANORM, LENDSV-LSV, 1,
+     $                E( LSV ),
      $                N, INFO )
       END IF
 *
diff --git a/SRC/zsycon.f b/SRC/zsycon.f
index 5b3fef621e..3d7cc0b559 100644
--- a/SRC/zsycon.f
+++ b/SRC/zsycon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsycon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsycon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,11 +115,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hecon
 *
 *  =====================================================================
       SUBROUTINE ZSYCON( UPLO, N, A, LDA, IPIV, ANORM, RCOND, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zsycon_3.f b/SRC/zsycon_3.f
index 25c8b5e089..65de1a92b3 100644
--- a/SRC/zsycon_3.f
+++ b/SRC/zsycon_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYCON_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsycon_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsycon_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,7 +142,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hecon_3
 *
 *> \par Contributors:
 *  ==================
@@ -163,6 +161,7 @@
 *  =====================================================================
       SUBROUTINE ZSYCON_3( UPLO, N, A, LDA, E, IPIV, ANORM, RCOND,
      $                     WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zsycon_rook.f b/SRC/zsycon_rook.f
index 1346f8b860..c215e7596a 100644
--- a/SRC/zsycon_rook.f
+++ b/SRC/zsycon_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYCON_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsycon_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsycon_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,7 +115,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hecon_rook
 *
 *> \par Contributors:
 *  ==================
@@ -134,8 +132,10 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE ZSYCON_ROOK( UPLO, N, A, LDA, IPIV, ANORM, RCOND, WORK,
+      SUBROUTINE ZSYCON_ROOK( UPLO, N, A, LDA, IPIV, ANORM, RCOND,
+     $                        WORK,
      $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zsyconv.f b/SRC/zsyconv.f
index e6a1d006c1..bda9236d4d 100644
--- a/SRC/zsyconv.f
+++ b/SRC/zsyconv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYCONV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsyconv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsyconv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup syconv
 *
 *  =====================================================================
       SUBROUTINE ZSYCONV( UPLO, WAY, N, A, LDA, IPIV, E, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zsyconvf.f b/SRC/zsyconvf.f
index eb49b0f3d8..30a880b8d0 100644
--- a/SRC/zsyconvf.f
+++ b/SRC/zsyconvf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYCONVF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsyconvf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsyconvf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -39,7 +37,7 @@
 *> ZSYTRF provided on entry in parameter A into the factorization
 *> output format used in ZSYTRF_RK (or ZSYTRF_BK) that is stored
 *> on exit in parameters A and E. It also converts in place details of
-*> the intechanges stored in IPIV from the format used in ZSYTRF into
+*> the interchanges stored in IPIV from the format used in ZSYTRF into
 *> the format used in ZSYTRF_RK (or ZSYTRF_BK).
 *>
 *> If parameter WAY = 'R':
@@ -48,7 +46,7 @@
 *> (or ZSYTRF_BK) provided on entry in parameters A and E into
 *> the factorization output format used in ZSYTRF that is stored
 *> on exit in parameter A. It also converts in place details of
-*> the intechanges stored in IPIV from the format used in ZSYTRF_RK
+*> the interchanges stored in IPIV from the format used in ZSYTRF_RK
 *> (or ZSYTRF_BK) into the format used in ZSYTRF.
 *>
 *> ZSYCONVF can also convert in Hermitian matrix case, i.e. between
@@ -192,7 +190,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup syconvf
 *
 *> \par Contributors:
 *  ==================
@@ -206,6 +204,7 @@
 *> \endverbatim
 *  =====================================================================
       SUBROUTINE ZSYCONVF( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -325,7 +324,7 @@ SUBROUTINE ZSYCONVF( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
                   END IF
 *
 *                 Convert IPIV
-*                 There is no interchnge of rows i and and IPIV(i),
+*                 There is no interchange of rows i and and IPIV(i),
 *                 so this should be reflected in IPIV format for
 *                 *SYTRF_RK ( or *SYTRF_BK)
 *
@@ -469,7 +468,7 @@ SUBROUTINE ZSYCONVF( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
                   END IF
 *
 *                 Convert IPIV
-*                 There is no interchnge of rows i and and IPIV(i),
+*                 There is no interchange of rows i and and IPIV(i),
 *                 so this should be reflected in IPIV format for
 *                 *SYTRF_RK ( or *SYTRF_BK)
 *
@@ -535,7 +534,7 @@ SUBROUTINE ZSYCONVF( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
 *
 *           Revert VALUE
 *           Assign subdiagonal entries of D from array E to
-*           subgiagonal entries of A.
+*           subdiagonal entries of A.
 *
             I = 1
             DO WHILE ( I.LE.N-1 )
diff --git a/SRC/zsyconvf_rook.f b/SRC/zsyconvf_rook.f
index 3cfa694c39..91de431e78 100644
--- a/SRC/zsyconvf_rook.f
+++ b/SRC/zsyconvf_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYCONVF_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsyconvf_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsyconvf_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -183,7 +181,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup syconvf_rook
 *
 *> \par Contributors:
 *  ==================
@@ -197,6 +195,7 @@
 *> \endverbatim
 *  =====================================================================
       SUBROUTINE ZSYCONVF_ROOK( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -520,7 +519,7 @@ SUBROUTINE ZSYCONVF_ROOK( UPLO, WAY, N, A, LDA, E, IPIV, INFO )
 *
 *           Revert VALUE
 *           Assign subdiagonal entries of D from array E to
-*           subgiagonal entries of A.
+*           subdiagonal entries of A.
 *
             I = 1
             DO WHILE ( I.LE.N-1 )
diff --git a/SRC/zsyequb.f b/SRC/zsyequb.f
index 84d5330ad3..b68d8d28b6 100644
--- a/SRC/zsyequb.f
+++ b/SRC/zsyequb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYEQUB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsyequb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsyequb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -117,7 +115,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup heequb
 *
 *> \par References:
 *  ================
@@ -128,7 +126,9 @@
 *>  Tech report version: http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.3.1679
 *>
 *  =====================================================================
-      SUBROUTINE ZSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
+      SUBROUTINE ZSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK,
+     $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -181,7 +181,8 @@ SUBROUTINE ZSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFO )
 *     Test the input parameters.
 *
       INFO = 0
-      IF ( .NOT. ( LSAME( UPLO, 'U' ) .OR. LSAME( UPLO, 'L' ) ) ) THEN
+      IF ( .NOT. ( LSAME( UPLO, 'U' ) .OR.
+     $     LSAME( UPLO, 'L' ) ) ) THEN
          INFO = -1
       ELSE IF ( N .LT. 0 ) THEN
          INFO = -2
diff --git a/SRC/zsymv.f b/SRC/zsymv.f
index d54620e26f..76b159fa46 100644
--- a/SRC/zsymv.f
+++ b/SRC/zsymv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYMV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsymv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsymv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -150,10 +148,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYauxiliary
+*> \ingroup hemv
 *
 *  =====================================================================
-      SUBROUTINE ZSYMV( UPLO, N, ALPHA, A, LDA, X, INCX, BETA, Y, INCY )
+      SUBROUTINE ZSYMV( UPLO, N, ALPHA, A, LDA, X, INCX, BETA, Y,
+     $                  INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -195,7 +195,8 @@ SUBROUTINE ZSYMV( UPLO, N, ALPHA, A, LDA, X, INCX, BETA, Y, INCY )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = 1
       ELSE IF( N.LT.0 ) THEN
          INFO = 2
diff --git a/SRC/zsyr.f b/SRC/zsyr.f
index 27b559c90b..61411dfc6b 100644
--- a/SRC/zsyr.f
+++ b/SRC/zsyr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsyr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsyr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -128,10 +126,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYauxiliary
+*> \ingroup her
 *
 *  =====================================================================
       SUBROUTINE ZSYR( UPLO, N, ALPHA, X, INCX, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -171,7 +170,8 @@ SUBROUTINE ZSYR( UPLO, N, ALPHA, X, INCX, A, LDA )
 *     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = 1
       ELSE IF( N.LT.0 ) THEN
          INFO = 2
diff --git a/SRC/zsyrfs.f b/SRC/zsyrfs.f
index e62d7f8a7a..571e612df4 100644
--- a/SRC/zsyrfs.f
+++ b/SRC/zsyrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsyrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsyrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -184,11 +182,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup herfs
 *
 *  =====================================================================
-      SUBROUTINE ZSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
+      SUBROUTINE ZSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
+     $                   LDB,
      $                   X, LDX, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -229,7 +229,8 @@ SUBROUTINE ZSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZLACN2, ZSYMV, ZSYTRS
+      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZLACN2, ZSYMV,
+     $                   ZSYTRS
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG, MAX
@@ -302,7 +303,8 @@ SUBROUTINE ZSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
 *        Compute residual R = B - A * X
 *
          CALL ZCOPY( N, B( 1, J ), 1, WORK, 1 )
-         CALL ZSYMV( UPLO, N, -ONE, A, LDA, X( 1, J ), 1, ONE, WORK, 1 )
+         CALL ZSYMV( UPLO, N, -ONE, A, LDA, X( 1, J ), 1, ONE, WORK,
+     $               1 )
 *
 *        Compute componentwise relative backward error from formula
 *
@@ -409,7 +411,8 @@ SUBROUTINE ZSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
 *
 *              Multiply by diag(W)*inv(A**T).
 *
-               CALL ZSYTRS( UPLO, N, 1, AF, LDAF, IPIV, WORK, N, INFO )
+               CALL ZSYTRS( UPLO, N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
                DO 110 I = 1, N
                   WORK( I ) = RWORK( I )*WORK( I )
   110          CONTINUE
@@ -420,7 +423,8 @@ SUBROUTINE ZSYRFS( UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
                DO 120 I = 1, N
                   WORK( I ) = RWORK( I )*WORK( I )
   120          CONTINUE
-               CALL ZSYTRS( UPLO, N, 1, AF, LDAF, IPIV, WORK, N, INFO )
+               CALL ZSYTRS( UPLO, N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
             END IF
             GO TO 100
          END IF
diff --git a/SRC/zsyrfsx.f b/SRC/zsyrfsx.f
index b938ef0ead..11e4fd1fbb 100644
--- a/SRC/zsyrfsx.f
+++ b/SRC/zsyrfsx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYRFSX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsyrfsx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsyrfsx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -392,13 +390,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup herfsx
 *
 *  =====================================================================
-      SUBROUTINE ZSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE ZSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    S, B, LDB, X, LDX, RCOND, BERR, N_ERR_BNDS,
      $                    ERR_BNDS_NORM, ERR_BNDS_COMP, NPARAMS, PARAMS,
      $                    WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -461,7 +461,8 @@ SUBROUTINE ZSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *     ..
 *     .. External Functions ..
       EXTERNAL           LSAME, ILAPREC
-      EXTERNAL           DLAMCH, ZLANSY, ZLA_SYRCOND_X, ZLA_SYRCOND_C
+      EXTERNAL           DLAMCH, ZLANSY, ZLA_SYRCOND_X,
+     $                   ZLA_SYRCOND_C
       DOUBLE PRECISION   DLAMCH, ZLANSY, ZLA_SYRCOND_X, ZLA_SYRCOND_C
       LOGICAL            LSAME
       INTEGER            ILAPREC
@@ -518,7 +519,8 @@ SUBROUTINE ZSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Test input parameters.
 *
-      IF ( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF ( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $     .NOT.LSAME( UPLO, 'L' ) ) THEN
         INFO = -1
       ELSE IF( .NOT.RCEQU .AND. .NOT.LSAME( EQUED, 'N' ) ) THEN
         INFO = -2
@@ -604,16 +606,19 @@ SUBROUTINE ZSYRFSX( UPLO, EQUED, N, NRHS, A, LDA, AF, LDAF, IPIV,
      $        INFO )
       END IF
 
-      ERR_LBND = MAX( 10.0D+0, SQRT( DBLE( N ) ) ) * DLAMCH( 'Epsilon' )
+      ERR_LBND = MAX( 10.0D+0,
+     $                SQRT( DBLE( N ) ) ) * DLAMCH( 'Epsilon' )
       IF (N_ERR_BNDS .GE. 1 .AND. N_NORMS .GE. 1) THEN
 *
 *     Compute scaled normwise condition number cond(A*C).
 *
          IF ( RCEQU ) THEN
-            RCOND_TMP = ZLA_SYRCOND_C( UPLO, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = ZLA_SYRCOND_C( UPLO, N, A, LDA, AF, LDAF,
+     $                                 IPIV,
      $           S, .TRUE., INFO, WORK, RWORK )
          ELSE
-            RCOND_TMP = ZLA_SYRCOND_C( UPLO, N, A, LDA, AF, LDAF, IPIV,
+            RCOND_TMP = ZLA_SYRCOND_C( UPLO, N, A, LDA, AF, LDAF,
+     $                                 IPIV,
      $           S, .FALSE., INFO, WORK, RWORK )
          END IF
          DO J = 1, NRHS
diff --git a/SRC/zsysv.f b/SRC/zsysv.f
index ed173dadca..0a328bbadd 100644
--- a/SRC/zsysv.f
+++ b/SRC/zsysv.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYSV + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsysv.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsysv.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,11 +161,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYsolve
+*> \ingroup hesv
 *
 *  =====================================================================
       SUBROUTINE ZSYSV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
      $                  LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -204,7 +203,8 @@ SUBROUTINE ZSYSV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -223,7 +223,7 @@ SUBROUTINE ZSYSV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
             LWKOPT = 1
          ELSE
             CALL ZSYTRF( UPLO, N, A, LDA, IPIV, WORK, -1, INFO )
-            LWKOPT = DBLE( WORK(1) )
+            LWKOPT = INT( DBLE( WORK( 1 ) ) )
          END IF
          WORK( 1 ) = LWKOPT
       END IF
diff --git a/SRC/zsysv_aa.f b/SRC/zsysv_aa.f
index 3a3af5009f..bf66ebdbcf 100644
--- a/SRC/zsysv_aa.f
+++ b/SRC/zsysv_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYSV_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsysv_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsysv_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -154,11 +152,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYsolve
+*> \ingroup hesv_aa
 *
 *  =====================================================================
       SUBROUTINE ZSYSV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
      $                     LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -196,7 +195,8 @@ SUBROUTINE ZSYSV_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
diff --git a/SRC/zsysv_aa_2stage.f b/SRC/zsysv_aa_2stage.f
index 4f19630a97..28f7e216ce 100644
--- a/SRC/zsysv_aa_2stage.f
+++ b/SRC/zsysv_aa_2stage.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYSV_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsysv_aa_2stage.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsysv_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -87,7 +85,7 @@
 *>          triangular part of the matrix A, and the strictly upper
 *>          triangular part of A is not referenced.
 *>
-*>          On exit, L is stored below (or above) the subdiaonal blocks,
+*>          On exit, L is stored below (or above) the subdiagonal blocks,
 *>          when UPLO  is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -177,7 +175,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hesv_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE ZSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
diff --git a/SRC/zsysv_rk.f b/SRC/zsysv_rk.f
index df828ee337..681fcc0aef 100644
--- a/SRC/zsysv_rk.f
+++ b/SRC/zsysv_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYSV_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsysv_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsysv_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -205,7 +203,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYsolve
+*> \ingroup hesv_rk
 *
 *> \par Contributors:
 *  ==================
@@ -223,8 +221,10 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE ZSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
+      SUBROUTINE ZSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
+     $                     WORK,
      $                     LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -261,7 +261,8 @@ SUBROUTINE ZSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -279,8 +280,9 @@ SUBROUTINE ZSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
          IF( N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            CALL ZSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, -1, INFO )
-            LWKOPT = DBLE( WORK(1) )
+            CALL ZSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, -1,
+     $                      INFO )
+            LWKOPT = INT( DBLE( WORK( 1 ) ) )
          END IF
          WORK( 1 ) = LWKOPT
       END IF
@@ -301,7 +303,8 @@ SUBROUTINE ZSYSV_RK( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, WORK,
 *
 *        Solve the system A*X = B with BLAS3 solver, overwriting B with X.
 *
-         CALL ZSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB, INFO )
+         CALL ZSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
+     $                  INFO )
 *
       END IF
 *
diff --git a/SRC/zsysv_rook.f b/SRC/zsysv_rook.f
index 7c9fb4bf64..f6d98a14d4 100644
--- a/SRC/zsysv_rook.f
+++ b/SRC/zsysv_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYSV_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsysv_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsysv_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -181,7 +179,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYsolve
+*> \ingroup hesv_rook
 *
 *> \par Contributors:
 *  ==================
@@ -199,8 +197,10 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE ZSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
+      SUBROUTINE ZSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
+     $                       WORK,
      $                  LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -237,7 +237,8 @@ SUBROUTINE ZSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -256,7 +257,7 @@ SUBROUTINE ZSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
             LWKOPT = 1
          ELSE
             CALL ZSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, -1, INFO )
-            LWKOPT = DBLE( WORK(1) )
+            LWKOPT = INT( DBLE( WORK( 1 ) ) )
          END IF
          WORK( 1 ) = LWKOPT
       END IF
@@ -277,7 +278,8 @@ SUBROUTINE ZSYSV_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK,
 *
 *        Solve with TRS_ROOK ( Use Level 2 BLAS)
 *
-         CALL ZSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+         CALL ZSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
+     $                     INFO )
 *
       END IF
 *
diff --git a/SRC/zsysvx.f b/SRC/zsysvx.f
index 91c6adb79b..fb86588007 100644
--- a/SRC/zsysvx.f
+++ b/SRC/zsysvx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYSVX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsysvx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsysvx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -276,12 +274,14 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYsolve
+*> \ingroup hesvx
 *
 *  =====================================================================
-      SUBROUTINE ZSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
+      SUBROUTINE ZSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
+     $                   B,
      $                   LDB, X, LDX, RCOND, FERR, BERR, WORK, LWORK,
      $                   RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -317,7 +317,8 @@ SUBROUTINE ZSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
       EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANSY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLACPY, ZSYCON, ZSYRFS, ZSYTRF, ZSYTRS
+      EXTERNAL           XERBLA, ZLACPY, ZSYCON, ZSYRFS, ZSYTRF,
+     $                   ZSYTRS
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -331,7 +332,8 @@ SUBROUTINE ZSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
       LQUERY = ( LWORK.EQ.-1 )
       IF( .NOT.NOFACT .AND. .NOT.LSAME( FACT, 'F' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) )
+      ELSE IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $         .NOT.LSAME( UPLO, 'L' ) )
      $          THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
@@ -387,7 +389,8 @@ SUBROUTINE ZSYSVX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
 *
 *     Compute the reciprocal of the condition number of A.
 *
-      CALL ZSYCON( UPLO, N, AF, LDAF, IPIV, ANORM, RCOND, WORK, INFO )
+      CALL ZSYCON( UPLO, N, AF, LDAF, IPIV, ANORM, RCOND, WORK,
+     $             INFO )
 *
 *     Compute the solution vectors X.
 *
diff --git a/SRC/zsysvxx.f b/SRC/zsysvxx.f
index 5cbc15d9e1..94cb5dc7da 100644
--- a/SRC/zsysvxx.f
+++ b/SRC/zsysvxx.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYSVXX + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsysvxx.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsysvxx.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -496,13 +494,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYsolve
+*> \ingroup hesvxx
 *
 *  =====================================================================
-      SUBROUTINE ZSYSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
+      SUBROUTINE ZSYSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF,
+     $                    IPIV,
      $                    EQUED, S, B, LDB, X, LDX, RCOND, RPVGRW, BERR,
      $                    N_ERR_BNDS, ERR_BNDS_NORM, ERR_BNDS_COMP,
      $                    NPARAMS, PARAMS, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK driver routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -627,7 +627,8 @@ SUBROUTINE ZSYSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *
 *     Compute row and column scalings to equilibrate the matrix A.
 *
-         CALL ZSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK, INFEQU )
+         CALL ZSYEQUB( UPLO, N, A, LDA, S, SCOND, AMAX, WORK,
+     $                 INFEQU )
          IF( INFEQU.EQ.0 ) THEN
 *
 *     Equilibrate the matrix.
@@ -647,7 +648,8 @@ SUBROUTINE ZSYSVXX( FACT, UPLO, N, NRHS, A, LDA, AF, LDAF, IPIV,
 *        Compute the LDL^T or UDU^T factorization of A.
 *
          CALL ZLACPY( UPLO, N, N, A, LDA, AF, LDAF )
-         CALL ZSYTRF( UPLO, N, AF, LDAF, IPIV, WORK, 5*MAX(1,N), INFO )
+         CALL ZSYTRF( UPLO, N, AF, LDAF, IPIV, WORK, 5*MAX(1,N),
+     $                INFO )
 *
 *        Return if INFO is non-zero.
 *
diff --git a/SRC/zsyswapr.f b/SRC/zsyswapr.f
index 1f1a878574..d15fb22215 100644
--- a/SRC/zsyswapr.f
+++ b/SRC/zsyswapr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYSWAPR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsyswapr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsyswapr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -57,16 +55,14 @@
 *>
 *> \param[in,out] A
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the NB diagonal matrix D and the multipliers
-*>          used to obtain the factor U or L as computed by ZSYTRF.
-*>
-*>          On exit, if INFO = 0, the (symmetric) inverse of the original
-*>          matrix.  If UPLO = 'U', the upper triangular part of the
-*>          inverse is formed and the part of A below the diagonal is not
-*>          referenced; if UPLO = 'L' the lower triangular part of the
-*>          inverse is formed and the part of A above the diagonal is
-*>          not referenced.
+*>          A is COMPLEX*16 array, dimension (LDA,*)
+*>          On entry, the N-by-N matrix A. On exit, the permuted matrix
+*>          where the rows I1 and I2 and columns I1 and I2 are interchanged.
+*>          If UPLO = 'U', the interchanges are applied to the upper
+*>          triangular part and the strictly lower triangular part of A is
+*>          not referenced; if UPLO = 'L', the interchanges are applied to
+*>          the lower triangular part and the part of A above the diagonal
+*>          is not referenced.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -95,10 +91,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYauxiliary
+*> \ingroup heswapr
 *
 *  =====================================================================
       SUBROUTINE ZSYSWAPR( UPLO, N, A, LDA, I1, I2)
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -109,14 +106,13 @@ SUBROUTINE ZSYSWAPR( UPLO, N, A, LDA, I1, I2)
       INTEGER          I1, I2, LDA, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16       A( LDA, N )
+      COMPLEX*16       A( LDA, * )
 *
 *  =====================================================================
 *
 *     ..
 *     .. Local Scalars ..
       LOGICAL            UPPER
-      INTEGER            I
       COMPLEX*16         TMP
 *
 *     .. External Functions ..
@@ -143,19 +139,12 @@ SUBROUTINE ZSYSWAPR( UPLO, N, A, LDA, I1, I2)
          A(I1,I1)=A(I2,I2)
          A(I2,I2)=TMP
 *
-         DO I=1,I2-I1-1
-            TMP=A(I1,I1+I)
-            A(I1,I1+I)=A(I1+I,I2)
-            A(I1+I,I2)=TMP
-         END DO
+         CALL ZSWAP( I2-I1-1, A(I1,I1+1), LDA, A(I1+1,I2), 1 )
 *
 *          third swap
 *          - swap row I1 and I2 from I2+1 to N
-         DO I=I2+1,N
-            TMP=A(I1,I)
-            A(I1,I)=A(I2,I)
-            A(I2,I)=TMP
-         END DO
+         IF ( I2.LT.N )
+     $      CALL ZSWAP( N-I2, A(I1,I2+1), LDA, A(I2,I2+1), LDA )
 *
         ELSE
 *
@@ -171,19 +160,12 @@ SUBROUTINE ZSYSWAPR( UPLO, N, A, LDA, I1, I2)
           A(I1,I1)=A(I2,I2)
           A(I2,I2)=TMP
 *
-          DO I=1,I2-I1-1
-             TMP=A(I1+I,I1)
-             A(I1+I,I1)=A(I2,I1+I)
-             A(I2,I1+I)=TMP
-          END DO
+          CALL ZSWAP( I2-I1-1, A(I1+1,I1), 1, A(I2,I1+1), LDA )
 *
 *         third swap
 *          - swap col I1 and I2 from I2+1 to N
-          DO I=I2+1,N
-             TMP=A(I,I1)
-             A(I,I1)=A(I,I2)
-             A(I,I2)=TMP
-          END DO
+         IF ( I2.LT.N )
+     $      CALL ZSWAP( N-I2, A(I2+1,I1), 1, A(I2+1,I2), 1 )
 *
       ENDIF
       END SUBROUTINE ZSYSWAPR
diff --git a/SRC/zsytf2.f b/SRC/zsytf2.f
index 7542a0de16..63cb9709fe 100644
--- a/SRC/zsytf2.f
+++ b/SRC/zsytf2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTF2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytf2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytf2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -127,7 +125,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetf2
 *
 *> \par Further Details:
 *  =====================
@@ -188,6 +186,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZSYTF2( UPLO, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -481,7 +480,8 @@ SUBROUTINE ZSYTF2( UPLO, N, A, LDA, IPIV, INFO )
                JMAX = K - 1 + IZAMAX( IMAX-K, A( IMAX, K ), LDA )
                ROWMAX = CABS1( A( IMAX, JMAX ) )
                IF( IMAX.LT.N ) THEN
-                  JMAX = IMAX + IZAMAX( N-IMAX, A( IMAX+1, IMAX ), 1 )
+                  JMAX = IMAX + IZAMAX( N-IMAX, A( IMAX+1, IMAX ),
+     $                                  1 )
                   ROWMAX = MAX( ROWMAX, CABS1( A( JMAX, IMAX ) ) )
                END IF
 *
@@ -513,7 +513,8 @@ SUBROUTINE ZSYTF2( UPLO, N, A, LDA, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL ZSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL ZSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
                CALL ZSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
      $                     LDA )
                T = A( KK, KK )
diff --git a/SRC/zsytf2_rk.f b/SRC/zsytf2_rk.f
index d0dd3a278d..9d549adc51 100644
--- a/SRC/zsytf2_rk.f
+++ b/SRC/zsytf2_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTF2_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytf2_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytf2_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -208,7 +206,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetf2_rk
 *
 *> \par Further Details:
 *  =====================
@@ -238,6 +236,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -469,7 +468,8 @@ SUBROUTINE ZSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *              the interchanges in columns k+1:N.
 *
                IF( K.LT.N )
-     $            CALL ZSWAP( N-K, A( K, K+1 ), LDA, A( P, K+1 ), LDA )
+     $            CALL ZSWAP( N-K, A( K, K+1 ), LDA, A( P, K+1 ),
+     $                        LDA )
 *
             END IF
 *
@@ -484,7 +484,8 @@ SUBROUTINE ZSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
                IF( KP.GT.1 )
      $            CALL ZSWAP( KP-1, A( 1, KK ), 1, A( 1, KP ), 1 )
                IF( ( KK.GT.1 ) .AND. ( KP.LT.(KK-1) ) )
-     $            CALL ZSWAP( KK-KP-1, A( KP+1, KK ), 1, A( KP, KP+1 ),
+     $            CALL ZSWAP( KK-KP-1, A( KP+1, KK ), 1, A( KP,
+     $                        KP+1 ),
      $                     LDA )
                T = A( KK, KK )
                A( KK, KK ) = A( KP, KP )
@@ -526,7 +527,8 @@ SUBROUTINE ZSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                       = A - W(k)*1/D(k)*W(k)**T
 *
                      D11 = CONE / A( K, K )
-                     CALL ZSYR( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL ZSYR( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
 *
 *                    Store U(k) in column k
 *
@@ -545,7 +547,8 @@ SUBROUTINE ZSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                       = A - W(k)*(1/D(k))*W(k)**T
 *                       = A - (W(k)/D(k))*(D(k))*(W(k)/D(K))**T
 *
-                     CALL ZSYR( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL ZSYR( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
                   END IF
 *
 *                 Store the superdiagonal element of D in array E
@@ -703,14 +706,16 @@ SUBROUTINE ZSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *                 Determine both ROWMAX and JMAX.
 *
                   IF( IMAX.NE.K ) THEN
-                     JMAX = K - 1 + IZAMAX( IMAX-K, A( IMAX, K ), LDA )
+                     JMAX = K - 1 + IZAMAX( IMAX-K, A( IMAX, K ),
+     $                                      LDA )
                      ROWMAX = CABS1( A( IMAX, JMAX ) )
                   ELSE
                      ROWMAX = ZERO
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + IZAMAX( N-IMAX, A( IMAX+1, IMAX ),
+                     ITEMP = IMAX + IZAMAX( N-IMAX, A( IMAX+1,
+     $                                      IMAX ),
      $                                     1 )
                      DTEMP = CABS1( A( ITEMP, IMAX ) )
                      IF( DTEMP.GT.ROWMAX ) THEN
@@ -769,7 +774,8 @@ SUBROUTINE ZSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
                IF( P.LT.N )
      $            CALL ZSWAP( N-P, A( P+1, K ), 1, A( P+1, P ), 1 )
                IF( P.GT.(K+1) )
-     $            CALL ZSWAP( P-K-1, A( K+1, K ), 1, A( P, K+1 ), LDA )
+     $            CALL ZSWAP( P-K-1, A( K+1, K ), 1, A( P, K+1 ),
+     $                        LDA )
                T = A( K, K )
                A( K, K ) = A( P, P )
                A( P, P ) = T
@@ -791,9 +797,11 @@ SUBROUTINE ZSYTF2_RK( UPLO, N, A, LDA, E, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL ZSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL ZSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
                IF( ( KK.LT.N ) .AND. ( KP.GT.(KK+1) ) )
-     $            CALL ZSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
+     $            CALL ZSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP,
+     $                        KK+1 ),
      $                     LDA )
                T = A( KK, KK )
                A( KK, KK ) = A( KP, KP )
diff --git a/SRC/zsytf2_rook.f b/SRC/zsytf2_rook.f
index cbfb57e266..9038e0bbd6 100644
--- a/SRC/zsytf2_rook.f
+++ b/SRC/zsytf2_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTF2_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytf2_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytf2_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -129,7 +127,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetf2_rook
 *
 *> \par Further Details:
 *  =====================
@@ -191,6 +189,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -418,7 +417,8 @@ SUBROUTINE ZSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
                IF( KP.GT.1 )
      $            CALL ZSWAP( KP-1, A( 1, KK ), 1, A( 1, KP ), 1 )
                IF( ( KK.GT.1 ) .AND. ( KP.LT.(KK-1) ) )
-     $            CALL ZSWAP( KK-KP-1, A( KP+1, KK ), 1, A( KP, KP+1 ),
+     $            CALL ZSWAP( KK-KP-1, A( KP+1, KK ), 1, A( KP,
+     $                        KP+1 ),
      $                     LDA )
                T = A( KK, KK )
                A( KK, KK ) = A( KP, KP )
@@ -452,7 +452,8 @@ SUBROUTINE ZSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                       = A - W(k)*1/D(k)*W(k)**T
 *
                      D11 = CONE / A( K, K )
-                     CALL ZSYR( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL ZSYR( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
 *
 *                    Store U(k) in column k
 *
@@ -471,7 +472,8 @@ SUBROUTINE ZSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                       = A - W(k)*(1/D(k))*W(k)**T
 *                       = A - (W(k)/D(k))*(D(k))*(W(k)/D(K))**T
 *
-                     CALL ZSYR( UPLO, K-1, -D11, A( 1, K ), 1, A, LDA )
+                     CALL ZSYR( UPLO, K-1, -D11, A( 1, K ), 1, A,
+     $                          LDA )
                   END IF
                END IF
 *
@@ -601,14 +603,16 @@ SUBROUTINE ZSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *                 Determine both ROWMAX and JMAX.
 *
                   IF( IMAX.NE.K ) THEN
-                     JMAX = K - 1 + IZAMAX( IMAX-K, A( IMAX, K ), LDA )
+                     JMAX = K - 1 + IZAMAX( IMAX-K, A( IMAX, K ),
+     $                                      LDA )
                      ROWMAX = CABS1( A( IMAX, JMAX ) )
                   ELSE
                      ROWMAX = ZERO
                   END IF
 *
                   IF( IMAX.LT.N ) THEN
-                     ITEMP = IMAX + IZAMAX( N-IMAX, A( IMAX+1, IMAX ),
+                     ITEMP = IMAX + IZAMAX( N-IMAX, A( IMAX+1,
+     $                                      IMAX ),
      $                                     1 )
                      DTEMP = CABS1( A( ITEMP, IMAX ) )
                      IF( DTEMP.GT.ROWMAX ) THEN
@@ -667,7 +671,8 @@ SUBROUTINE ZSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
                IF( P.LT.N )
      $            CALL ZSWAP( N-P, A( P+1, K ), 1, A( P+1, P ), 1 )
                IF( P.GT.(K+1) )
-     $            CALL ZSWAP( P-K-1, A( K+1, K ), 1, A( P, K+1 ), LDA )
+     $            CALL ZSWAP( P-K-1, A( K+1, K ), 1, A( P, K+1 ),
+     $                        LDA )
                T = A( K, K )
                A( K, K ) = A( P, P )
                A( P, P ) = T
@@ -682,9 +687,11 @@ SUBROUTINE ZSYTF2_ROOK( UPLO, N, A, LDA, IPIV, INFO )
 *              submatrix A(k:n,k:n)
 *
                IF( KP.LT.N )
-     $            CALL ZSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+     $            CALL ZSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ),
+     $                        1 )
                IF( ( KK.LT.N ) .AND. ( KP.GT.(KK+1) ) )
-     $            CALL ZSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
+     $            CALL ZSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP,
+     $                        KK+1 ),
      $                     LDA )
                T = A( KK, KK )
                A( KK, KK ) = A( KP, KP )
diff --git a/SRC/zsytrf.f b/SRC/zsytrf.f
index a775a87587..d4596b0b44 100644
--- a/SRC/zsytrf.f
+++ b/SRC/zsytrf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTRF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytrf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytrf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,7 +133,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetrf
 *
 *> \par Further Details:
 *  =====================
@@ -179,6 +177,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -232,7 +231,7 @@ SUBROUTINE ZSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *        Determine the block size
 *
          NB = ILAENV( 1, 'ZSYTRF', UPLO, N, -1, -1, -1 )
-         LWKOPT = N*NB
+         LWKOPT = MAX( 1, N*NB )
          WORK( 1 ) = LWKOPT
       END IF
 *
@@ -249,7 +248,8 @@ SUBROUTINE ZSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
          IWS = LDWORK*NB
          IF( LWORK.LT.IWS ) THEN
             NB = MAX( LWORK / LDWORK, 1 )
-            NBMIN = MAX( 2, ILAENV( 2, 'ZSYTRF', UPLO, N, -1, -1, -1 ) )
+            NBMIN = MAX( 2, ILAENV( 2, 'ZSYTRF', UPLO, N, -1, -1,
+     $                   -1 ) )
          END IF
       ELSE
          IWS = 1
@@ -278,7 +278,8 @@ SUBROUTINE ZSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *           Factorize columns k-kb+1:k of A and use blocked code to
 *           update columns 1:k-kb
 *
-            CALL ZLASYF( UPLO, K, NB, KB, A, LDA, IPIV, WORK, N, IINFO )
+            CALL ZLASYF( UPLO, K, NB, KB, A, LDA, IPIV, WORK, N,
+     $                   IINFO )
          ELSE
 *
 *           Use unblocked code to factorize columns 1:k of A
@@ -318,13 +319,15 @@ SUBROUTINE ZSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *           Factorize columns k:k+kb-1 of A and use blocked code to
 *           update columns k+kb:n
 *
-            CALL ZLASYF( UPLO, N-K+1, NB, KB, A( K, K ), LDA, IPIV( K ),
+            CALL ZLASYF( UPLO, N-K+1, NB, KB, A( K, K ), LDA,
+     $                   IPIV( K ),
      $                   WORK, N, IINFO )
          ELSE
 *
 *           Use unblocked code to factorize columns k:n of A
 *
-            CALL ZSYTF2( UPLO, N-K+1, A( K, K ), LDA, IPIV( K ), IINFO )
+            CALL ZSYTF2( UPLO, N-K+1, A( K, K ), LDA, IPIV( K ),
+     $                   IINFO )
             KB = N - K + 1
          END IF
 *
diff --git a/SRC/zsytrf_aa.f b/SRC/zsytrf_aa.f
index 73d257cfe5..623603c92e 100644
--- a/SRC/zsytrf_aa.f
+++ b/SRC/zsytrf_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTRF_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytrf_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytrf_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -74,7 +72,7 @@
 *>
 *>          On exit, the tridiagonal matrix is stored in the diagonals
 *>          and the subdiagonals of A just below (or above) the diagonals,
-*>          and L is stored below (or above) the subdiaonals, when UPLO
+*>          and L is stored below (or above) the subdiagonals, when UPLO
 *>          is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -125,7 +123,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetrf_aa
 *
 *  =====================================================================
       SUBROUTINE ZSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
@@ -162,7 +160,8 @@ SUBROUTINE ZSYTRF_AA( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO)
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZLASYF_AA, ZGEMM, ZGEMV, ZSCAL, ZCOPY,
+      EXTERNAL           ZLASYF_AA, ZGEMM, ZGEMV, ZSCAL,
+     $                   ZCOPY,
      $                   ZSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
diff --git a/SRC/zsytrf_aa_2stage.f b/SRC/zsytrf_aa_2stage.f
index b731cb7a22..8d47f220fb 100644
--- a/SRC/zsytrf_aa_2stage.f
+++ b/SRC/zsytrf_aa_2stage.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTRF_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytrf_aa_2stage.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytrf_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -75,7 +73,7 @@
 *>          triangular part of the matrix A, and the strictly upper
 *>          triangular part of A is not referenced.
 *>
-*>          On exit, L is stored below (or above) the subdiaonal blocks,
+*>          On exit, L is stored below (or above) the subdiagonal blocks,
 *>          when UPLO  is 'L' (or 'U').
 *> \endverbatim
 *>
@@ -152,7 +150,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetrf_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE ZSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
@@ -191,7 +189,8 @@ SUBROUTINE ZSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZCOPY, ZGBTRF, ZGEMM, ZGETRF,  
+      EXTERNAL           XERBLA, ZCOPY, ZGBTRF, ZGEMM,
+     $                   ZGETRF,
      $                   ZLACPY, ZLASET, ZLASWP, ZTRSM, ZSWAP 
 *     ..
 *     .. Intrinsic Functions ..
diff --git a/SRC/zsytrf_rk.f b/SRC/zsytrf_rk.f
index 3b398ce6ca..e6b7fb7286 100644
--- a/SRC/zsytrf_rk.f
+++ b/SRC/zsytrf_rk.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTRF_RK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytrf_rk.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytrf_rk.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -229,7 +227,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetrf_rk
 *
 *> \par Further Details:
 *  =====================
@@ -256,6 +254,7 @@
 *  =====================================================================
       SUBROUTINE ZSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
      $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -310,7 +309,7 @@ SUBROUTINE ZSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *        Determine the block size
 *
          NB = ILAENV( 1, 'ZSYTRF_RK', UPLO, N, -1, -1, -1 )
-         LWKOPT = N*NB
+         LWKOPT = MAX( 1, N*NB )
          WORK( 1 ) = LWKOPT
       END IF
 *
@@ -425,7 +424,8 @@ SUBROUTINE ZSYTRF_RK( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
 *           Factorize columns k:k+kb-1 of A and use blocked code to
 *           update columns k+kb:n
 *
-            CALL ZLASYF_RK( UPLO, N-K+1, NB, KB, A( K, K ), LDA, E( K ),
+            CALL ZLASYF_RK( UPLO, N-K+1, NB, KB, A( K, K ), LDA,
+     $                      E( K ),
      $                        IPIV( K ), WORK, LDWORK, IINFO )
 
 
diff --git a/SRC/zsytrf_rook.f b/SRC/zsytrf_rook.f
index 84a654fb89..24baa48e19 100644
--- a/SRC/zsytrf_rook.f
+++ b/SRC/zsytrf_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTRF_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytrf_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytrf_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -146,7 +144,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetrf_rook
 *
 *> \par Further Details:
 *  =====================
@@ -204,7 +202,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE ZSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      SUBROUTINE ZSYTRF_ROOK( UPLO, N, A, LDA, IPIV, WORK, LWORK,
+     $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zsytri.f b/SRC/zsytri.f
index 32c7bf5cb7..25e05e7d8d 100644
--- a/SRC/zsytri.f
+++ b/SRC/zsytri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetri
 *
 *  =====================================================================
       SUBROUTINE ZSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -221,7 +220,8 @@ SUBROUTINE ZSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
                CALL ZCOPY( K-1, A( 1, K ), 1, WORK, 1 )
                CALL ZSYMV( UPLO, K-1, -ONE, A, LDA, WORK, 1, ZERO,
      $                     A( 1, K ), 1 )
-               A( K, K ) = A( K, K ) - ZDOTU( K-1, WORK, 1, A( 1, K ),
+               A( K, K ) = A( K, K ) - ZDOTU( K-1, WORK, 1, A( 1,
+     $            K ),
      $                     1 )
             END IF
             KSTEP = 1
@@ -246,10 +246,12 @@ SUBROUTINE ZSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
                CALL ZCOPY( K-1, A( 1, K ), 1, WORK, 1 )
                CALL ZSYMV( UPLO, K-1, -ONE, A, LDA, WORK, 1, ZERO,
      $                     A( 1, K ), 1 )
-               A( K, K ) = A( K, K ) - ZDOTU( K-1, WORK, 1, A( 1, K ),
+               A( K, K ) = A( K, K ) - ZDOTU( K-1, WORK, 1, A( 1,
+     $            K ),
      $                     1 )
                A( K, K+1 ) = A( K, K+1 ) -
-     $                       ZDOTU( K-1, A( 1, K ), 1, A( 1, K+1 ), 1 )
+     $                       ZDOTU( K-1, A( 1, K ), 1, A( 1, K+1 ),
+     $                              1 )
                CALL ZCOPY( K-1, A( 1, K+1 ), 1, WORK, 1 )
                CALL ZSYMV( UPLO, K-1, -ONE, A, LDA, WORK, 1, ZERO,
      $                     A( 1, K+1 ), 1 )
@@ -308,9 +310,11 @@ SUBROUTINE ZSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL ZCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL ZSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL ZSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K ), 1 )
-               A( K, K ) = A( K, K ) - ZDOTU( N-K, WORK, 1, A( K+1, K ),
+               A( K, K ) = A( K, K ) - ZDOTU( N-K, WORK, 1, A( K+1,
+     $            K ),
      $                     1 )
             END IF
             KSTEP = 1
@@ -333,18 +337,23 @@ SUBROUTINE ZSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL ZCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL ZSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL ZSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K ), 1 )
-               A( K, K ) = A( K, K ) - ZDOTU( N-K, WORK, 1, A( K+1, K ),
+               A( K, K ) = A( K, K ) - ZDOTU( N-K, WORK, 1, A( K+1,
+     $            K ),
      $                     1 )
                A( K, K-1 ) = A( K, K-1 ) -
-     $                       ZDOTU( N-K, A( K+1, K ), 1, A( K+1, K-1 ),
+     $                       ZDOTU( N-K, A( K+1, K ), 1, A( K+1,
+     $                              K-1 ),
      $                       1 )
                CALL ZCOPY( N-K, A( K+1, K-1 ), 1, WORK, 1 )
-               CALL ZSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL ZSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     ZERO, A( K+1, K-1 ), 1 )
                A( K-1, K-1 ) = A( K-1, K-1 ) -
-     $                         ZDOTU( N-K, WORK, 1, A( K+1, K-1 ), 1 )
+     $                         ZDOTU( N-K, WORK, 1, A( K+1, K-1 ),
+     $                                1 )
             END IF
             KSTEP = 2
          END IF
diff --git a/SRC/zsytri2.f b/SRC/zsytri2.f
index 5417377f01..5e17d84aea 100644
--- a/SRC/zsytri2.f
+++ b/SRC/zsytri2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTRI2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytri2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytri2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,10 +118,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetri2
 *
 *  =====================================================================
       SUBROUTINE ZSYTRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zsytri2x.f b/SRC/zsytri2x.f
index 61814ae6d8..c8333d2988 100644
--- a/SRC/zsytri2x.f
+++ b/SRC/zsytri2x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTRI2X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytri2x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytri2x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,10 +111,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetri2x
 *
 *  =====================================================================
       SUBROUTINE ZSYTRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -382,8 +381,10 @@ SUBROUTINE ZSYTRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
             DO WHILE ( I .LE. N )
                IF( IPIV(I) .GT. 0 ) THEN
                   IP=IPIV(I)
-                 IF (I .LT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, I ,IP )
-                 IF (I .GT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                 IF (I .LT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, I ,
+     $                IP )
+                 IF (I .GT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, IP ,
+     $                I )
                ELSE
                  IP=-IPIV(I)
                  I=I+1
@@ -566,12 +567,16 @@ SUBROUTINE ZSYTRI2X( UPLO, N, A, LDA, IPIV, WORK, NB, INFO )
             DO WHILE ( I .GE. 1 )
                IF( IPIV(I) .GT. 0 ) THEN
                   IP=IPIV(I)
-                 IF (I .LT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, I ,IP  )
-                 IF (I .GT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                 IF (I .LT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, I ,
+     $                IP  )
+                 IF (I .GT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, IP ,
+     $                I )
                ELSE
                  IP=-IPIV(I)
-                 IF ( I .LT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, I ,IP )
-                 IF ( I .GT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                 IF ( I .LT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, I ,
+     $                IP )
+                 IF ( I .GT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, IP ,
+     $                I )
                  I=I-1
                ENDIF
                I=I-1
diff --git a/SRC/zsytri_3.f b/SRC/zsytri_3.f
index 4503703d3f..7dfabb883e 100644
--- a/SRC/zsytri_3.f
+++ b/SRC/zsytri_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTRI_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytri_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytri_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -152,7 +150,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetri_3
 *
 *> \par Contributors:
 *  ==================
@@ -167,6 +165,7 @@
 *  =====================================================================
       SUBROUTINE ZSYTRI_3( UPLO, N, A, LDA, E, IPIV, WORK, LWORK,
      $                     INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zsytri_3x.f b/SRC/zsytri_3x.f
index 5bbd8e3090..10dde99dda 100644
--- a/SRC/zsytri_3x.f
+++ b/SRC/zsytri_3x.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTRI_3X + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytri_3x.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytri_3x.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -142,7 +140,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetri_3x
 *
 *> \par Contributors:
 *  ==================
@@ -155,7 +153,9 @@
 *> \endverbatim
 *
 *  =====================================================================
-      SUBROUTINE ZSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
+      SUBROUTINE ZSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB,
+     $                      INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,7 +188,8 @@ SUBROUTINE ZSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZGEMM, ZSYSWAPR, ZTRTRI, ZTRMM, XERBLA
+      EXTERNAL           ZGEMM, ZSYSWAPR, ZTRTRI, ZTRMM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MOD
@@ -433,8 +434,10 @@ SUBROUTINE ZSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
          DO I = 1, N
              IP = ABS( IPIV( I ) )
              IF( IP.NE.I ) THEN
-                IF (I .LT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, I ,IP )
-                IF (I .GT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                IF (I .LT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, I ,
+     $               IP )
+                IF (I .GT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, IP ,
+     $               I )
              END IF
          END DO
 *
@@ -629,8 +632,10 @@ SUBROUTINE ZSYTRI_3X( UPLO, N, A, LDA, E, IPIV, WORK, NB, INFO )
          DO I = N, 1, -1
              IP = ABS( IPIV( I ) )
              IF( IP.NE.I ) THEN
-                IF (I .LT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, I ,IP )
-                IF (I .GT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, IP ,I )
+                IF (I .LT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, I ,
+     $               IP )
+                IF (I .GT. IP) CALL ZSYSWAPR( UPLO, N, A, LDA, IP ,
+     $               I )
              END IF
          END DO
 *
diff --git a/SRC/zsytri_rook.f b/SRC/zsytri_rook.f
index 41a2f040f3..c39181b4e1 100644
--- a/SRC/zsytri_rook.f
+++ b/SRC/zsytri_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTRI_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytri_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytri_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,7 +105,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetri_rook
 *
 *> \par Contributors:
 *  ==================
@@ -126,6 +124,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -236,7 +235,8 @@ SUBROUTINE ZSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
                CALL ZCOPY( K-1, A( 1, K ), 1, WORK, 1 )
                CALL ZSYMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, CZERO,
      $                     A( 1, K ), 1 )
-               A( K, K ) = A( K, K ) - ZDOTU( K-1, WORK, 1, A( 1, K ),
+               A( K, K ) = A( K, K ) - ZDOTU( K-1, WORK, 1, A( 1,
+     $            K ),
      $                     1 )
             END IF
             KSTEP = 1
@@ -261,10 +261,12 @@ SUBROUTINE ZSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
                CALL ZCOPY( K-1, A( 1, K ), 1, WORK, 1 )
                CALL ZSYMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, CZERO,
      $                     A( 1, K ), 1 )
-               A( K, K ) = A( K, K ) - ZDOTU( K-1, WORK, 1, A( 1, K ),
+               A( K, K ) = A( K, K ) - ZDOTU( K-1, WORK, 1, A( 1,
+     $            K ),
      $                     1 )
                A( K, K+1 ) = A( K, K+1 ) -
-     $                       ZDOTU( K-1, A( 1, K ), 1, A( 1, K+1 ), 1 )
+     $                       ZDOTU( K-1, A( 1, K ), 1, A( 1, K+1 ),
+     $                              1 )
                CALL ZCOPY( K-1, A( 1, K+1 ), 1, WORK, 1 )
                CALL ZSYMV( UPLO, K-1, -CONE, A, LDA, WORK, 1, CZERO,
      $                     A( 1, K+1 ), 1 )
@@ -283,7 +285,8 @@ SUBROUTINE ZSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
                IF( KP.GT.1 )
      $             CALL ZSWAP( KP-1, A( 1, K ), 1, A( 1, KP ), 1 )
-               CALL ZSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ), LDA )
+               CALL ZSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ),
+     $                     LDA )
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
                A( KP, KP ) = TEMP
@@ -297,7 +300,8 @@ SUBROUTINE ZSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
                IF( KP.GT.1 )
      $            CALL ZSWAP( KP-1, A( 1, K ), 1, A( 1, KP ), 1 )
-               CALL ZSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ), LDA )
+               CALL ZSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ),
+     $                     LDA )
 *
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
@@ -312,7 +316,8 @@ SUBROUTINE ZSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             IF( KP.NE.K ) THEN
                IF( KP.GT.1 )
      $            CALL ZSWAP( KP-1, A( 1, K ), 1, A( 1, KP ), 1 )
-               CALL ZSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ), LDA )
+               CALL ZSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ),
+     $                     LDA )
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
                A( KP, KP ) = TEMP
@@ -350,9 +355,11 @@ SUBROUTINE ZSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL ZCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL ZSYMV( UPLO, N-K,-CONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL ZSYMV( UPLO, N-K,-CONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     CZERO, A( K+1, K ), 1 )
-               A( K, K ) = A( K, K ) - ZDOTU( N-K, WORK, 1, A( K+1, K ),
+               A( K, K ) = A( K, K ) - ZDOTU( N-K, WORK, 1, A( K+1,
+     $            K ),
      $                     1 )
             END IF
             KSTEP = 1
@@ -375,18 +382,23 @@ SUBROUTINE ZSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
             IF( K.LT.N ) THEN
                CALL ZCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
-               CALL ZSYMV( UPLO, N-K,-CONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL ZSYMV( UPLO, N-K,-CONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     CZERO, A( K+1, K ), 1 )
-               A( K, K ) = A( K, K ) - ZDOTU( N-K, WORK, 1, A( K+1, K ),
+               A( K, K ) = A( K, K ) - ZDOTU( N-K, WORK, 1, A( K+1,
+     $            K ),
      $                     1 )
                A( K, K-1 ) = A( K, K-1 ) -
-     $                       ZDOTU( N-K, A( K+1, K ), 1, A( K+1, K-1 ),
+     $                       ZDOTU( N-K, A( K+1, K ), 1, A( K+1,
+     $                              K-1 ),
      $                       1 )
                CALL ZCOPY( N-K, A( K+1, K-1 ), 1, WORK, 1 )
-               CALL ZSYMV( UPLO, N-K,-CONE, A( K+1, K+1 ), LDA, WORK, 1,
+               CALL ZSYMV( UPLO, N-K,-CONE, A( K+1, K+1 ), LDA, WORK,
+     $                     1,
      $                     CZERO, A( K+1, K-1 ), 1 )
                A( K-1, K-1 ) = A( K-1, K-1 ) -
-     $                         ZDOTU( N-K, WORK, 1, A( K+1, K-1 ), 1 )
+     $                         ZDOTU( N-K, WORK, 1, A( K+1, K-1 ),
+     $                                1 )
             END IF
             KSTEP = 2
          END IF
@@ -399,8 +411,10 @@ SUBROUTINE ZSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             KP = IPIV( K )
             IF( KP.NE.K ) THEN
                IF( KP.LT.N )
-     $            CALL ZSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
-               CALL ZSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ), LDA )
+     $            CALL ZSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
+               CALL ZSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ),
+     $                     LDA )
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
                A( KP, KP ) = TEMP
@@ -413,8 +427,10 @@ SUBROUTINE ZSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             KP = -IPIV( K )
             IF( KP.NE.K ) THEN
                IF( KP.LT.N )
-     $            CALL ZSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
-               CALL ZSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ), LDA )
+     $            CALL ZSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
+               CALL ZSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ),
+     $                     LDA )
 *
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
@@ -428,8 +444,10 @@ SUBROUTINE ZSYTRI_ROOK( UPLO, N, A, LDA, IPIV, WORK, INFO )
             KP = -IPIV( K )
             IF( KP.NE.K ) THEN
                IF( KP.LT.N )
-     $            CALL ZSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
-               CALL ZSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ), LDA )
+     $            CALL ZSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ),
+     $                        1 )
+               CALL ZSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ),
+     $                     LDA )
                TEMP = A( K, K )
                A( K, K ) = A( KP, KP )
                A( KP, KP ) = TEMP
diff --git a/SRC/zsytrs.f b/SRC/zsytrs.f
index 81c27f72ee..00863174f8 100644
--- a/SRC/zsytrs.f
+++ b/SRC/zsytrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,10 +111,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetrs
 *
 *  =====================================================================
       SUBROUTINE ZSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -207,7 +206,8 @@ SUBROUTINE ZSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           Multiply by inv(U(K)), where U(K) is the transformation
 *           stored in column K of A.
 *
-            CALL ZGERU( K-1, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ), LDB,
+            CALL ZGERU( K-1, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ),
+     $                  LDB,
      $                  B( 1, 1 ), LDB )
 *
 *           Multiply by the inverse of the diagonal block.
@@ -227,7 +227,8 @@ SUBROUTINE ZSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           Multiply by inv(U(K)), where U(K) is the transformation
 *           stored in columns K-1 and K of A.
 *
-            CALL ZGERU( K-2, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ), LDB,
+            CALL ZGERU( K-2, NRHS, -ONE, A( 1, K ), 1, B( K, 1 ),
+     $                  LDB,
      $                  B( 1, 1 ), LDB )
             CALL ZGERU( K-2, NRHS, -ONE, A( 1, K-1 ), 1, B( K-1, 1 ),
      $                  LDB, B( 1, 1 ), LDB )
@@ -270,7 +271,8 @@ SUBROUTINE ZSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           Multiply by inv(U**T(K)), where U(K) is the transformation
 *           stored in column K of A.
 *
-            CALL ZGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, A( 1, K ),
+            CALL ZGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, A( 1,
+     $                  K ),
      $                  1, ONE, B( K, 1 ), LDB )
 *
 *           Interchange rows K and IPIV(K).
@@ -286,7 +288,8 @@ SUBROUTINE ZSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           Multiply by inv(U**T(K+1)), where U(K+1) is the transformation
 *           stored in columns K and K+1 of A.
 *
-            CALL ZGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, A( 1, K ),
+            CALL ZGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB, A( 1,
+     $                  K ),
      $                  1, ONE, B( K, 1 ), LDB )
             CALL ZGEMV( 'Transpose', K-1, NRHS, -ONE, B, LDB,
      $                  A( 1, K+1 ), 1, ONE, B( K+1, 1 ), LDB )
@@ -333,7 +336,8 @@ SUBROUTINE ZSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           stored in column K of A.
 *
             IF( K.LT.N )
-     $         CALL ZGERU( N-K, NRHS, -ONE, A( K+1, K ), 1, B( K, 1 ),
+     $         CALL ZGERU( N-K, NRHS, -ONE, A( K+1, K ), 1, B( K,
+     $                     1 ),
      $                     LDB, B( K+1, 1 ), LDB )
 *
 *           Multiply by the inverse of the diagonal block.
@@ -354,7 +358,8 @@ SUBROUTINE ZSYTRS( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL ZGERU( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K, 1 ),
+               CALL ZGERU( N-K-1, NRHS, -ONE, A( K+2, K ), 1, B( K,
+     $                     1 ),
      $                     LDB, B( K+2, 1 ), LDB )
                CALL ZGERU( N-K-1, NRHS, -ONE, A( K+2, K+1 ), 1,
      $                     B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
diff --git a/SRC/zsytrs2.f b/SRC/zsytrs2.f
index 38986f80a1..d64b9a869e 100644
--- a/SRC/zsytrs2.f
+++ b/SRC/zsytrs2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTRS2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytrs2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytrs2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -124,11 +122,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetrs2
 *
 *  =====================================================================
       SUBROUTINE ZSYTRS2( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
      $                    WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -159,7 +158,8 @@ SUBROUTINE ZSYTRS2( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZSCAL, ZSYCONV, ZSWAP, ZTRSM, XERBLA
+      EXTERNAL           ZSCAL, ZSYCONV, ZSWAP, ZTRSM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
diff --git a/SRC/zsytrs_3.f b/SRC/zsytrs_3.f
index b9e5cbac15..592b94f450 100644
--- a/SRC/zsytrs_3.f
+++ b/SRC/zsytrs_3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTRS_3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytrs_3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytrs_3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -142,7 +140,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetrs_3
 *
 *> \par Contributors:
 *  ==================
@@ -162,6 +160,7 @@
 *  =====================================================================
       SUBROUTINE ZSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
      $                     INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -246,7 +245,8 @@ SUBROUTINE ZSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (U \P**T * B) -> B    [ (U \P**T * B) ]
 *
-         CALL ZTRSM( 'L', 'U', 'N', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL ZTRSM( 'L', 'U', 'N', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        Compute D \ B -> B   [ D \ (U \P**T * B) ]
 *
@@ -272,7 +272,8 @@ SUBROUTINE ZSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (U**T \ B) -> B   [ U**T \ (D \ (U \P**T * B) ) ]
 *
-         CALL ZTRSM( 'L', 'U', 'T', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL ZTRSM( 'L', 'U', 'T', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        P * B  [ P * (U**T \ (D \ (U \P**T * B) )) ]
 *
@@ -313,7 +314,8 @@ SUBROUTINE ZSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (L \P**T * B) -> B    [ (L \P**T * B) ]
 *
-         CALL ZTRSM( 'L', 'L', 'N', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL ZTRSM( 'L', 'L', 'N', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        Compute D \ B -> B   [ D \ (L \P**T * B) ]
 *
@@ -339,7 +341,8 @@ SUBROUTINE ZSYTRS_3( UPLO, N, NRHS, A, LDA, E, IPIV, B, LDB,
 *
 *        Compute (L**T \ B) -> B   [ L**T \ (D \ (L \P**T * B) ) ]
 *
-         CALL ZTRSM('L', 'L', 'T', 'U', N, NRHS, ONE, A, LDA, B, LDB )
+         CALL ZTRSM('L', 'L', 'T', 'U', N, NRHS, ONE, A, LDA, B,
+     $               LDB )
 *
 *        P * B  [ P * (L**T \ (D \ (L \P**T * B) )) ]
 *
diff --git a/SRC/zsytrs_aa.f b/SRC/zsytrs_aa.f
index 4dbd067761..3445ece589 100644
--- a/SRC/zsytrs_aa.f
+++ b/SRC/zsytrs_aa.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTRS_AA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytrs_aa.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytrs_aa.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -123,7 +121,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetrs_aa
 *
 *  =====================================================================
       SUBROUTINE ZSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
@@ -213,7 +211,8 @@ SUBROUTINE ZSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute U**T \ B -> B    [ (U**T \P**T * B) ]
 *
-            CALL ZTRSM( 'L', 'U', 'T', 'U', N-1, NRHS, ONE, A( 1, 2 ),
+            CALL ZTRSM( 'L', 'U', 'T', 'U', N-1, NRHS, ONE, A( 1,
+     $                  2 ),
      $                  LDA, B( 2, 1 ), LDB)
          END IF
 *
@@ -223,10 +222,13 @@ SUBROUTINE ZSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
          CALL ZLACPY( 'F', 1, N, A( 1, 1 ), LDA+1, WORK( N ), 1)
          IF( N.GT.1 ) THEN
-            CALL ZLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 1 ), 1 )
-            CALL ZLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 2*N ), 1 )
+            CALL ZLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 1 ),
+     $                   1 )
+            CALL ZLACPY( 'F', 1, N-1, A( 1, 2 ), LDA+1, WORK( 2*N ),
+     $                   1 )
          END IF
-         CALL ZGTSV( N, NRHS, WORK( 1 ), WORK( N ), WORK( 2*N ), B, LDB,
+         CALL ZGTSV( N, NRHS, WORK( 1 ), WORK( N ), WORK( 2*N ), B,
+     $               LDB,
      $               INFO )
 *
 *        3) Backward substitution with U
@@ -235,7 +237,8 @@ SUBROUTINE ZSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute U \ B -> B   [ U \ (T \ (U**T \P**T * B) ) ]
 *
-            CALL ZTRSM( 'L', 'U', 'N', 'U', N-1, NRHS, ONE, A( 1, 2 ),
+            CALL ZTRSM( 'L', 'U', 'N', 'U', N-1, NRHS, ONE, A( 1,
+     $                  2 ),
      $                  LDA, B( 2, 1 ), LDB)
 *
 *           Pivot, P * B -> B  [ P * (U \ (T \ (U**T \P**T * B) )) ]
@@ -265,7 +268,8 @@ SUBROUTINE ZSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute L \ B -> B    [ (L \P**T * B) ]
 *
-            CALL ZTRSM( 'L', 'L', 'N', 'U', N-1, NRHS, ONE, A( 2, 1 ),
+            CALL ZTRSM( 'L', 'L', 'N', 'U', N-1, NRHS, ONE, A( 2,
+     $                  1 ),
      $                  LDA, B( 2, 1 ), LDB)
          END IF
 *
@@ -275,10 +279,13 @@ SUBROUTINE ZSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
          CALL ZLACPY( 'F', 1, N, A(1, 1), LDA+1, WORK(N), 1)
          IF( N.GT.1 ) THEN
-            CALL ZLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 1 ), 1 )
-            CALL ZLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 2*N ), 1 )
+            CALL ZLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 1 ),
+     $                   1 )
+            CALL ZLACPY( 'F', 1, N-1, A( 2, 1 ), LDA+1, WORK( 2*N ),
+     $                   1 )
          END IF
-         CALL ZGTSV( N, NRHS, WORK( 1 ), WORK(N), WORK( 2*N ), B, LDB,
+         CALL ZGTSV( N, NRHS, WORK( 1 ), WORK(N), WORK( 2*N ), B,
+     $               LDB,
      $               INFO)
 *
 *        3) Backward substitution with L**T
@@ -287,7 +294,8 @@ SUBROUTINE ZSYTRS_AA( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *
 *           Compute (L**T \ B) -> B   [ L**T \ (T \ (L \P**T * B) ) ]
 *
-            CALL ZTRSM( 'L', 'L', 'T', 'U', N-1, NRHS, ONE, A( 2, 1 ),
+            CALL ZTRSM( 'L', 'L', 'T', 'U', N-1, NRHS, ONE, A( 2,
+     $                  1 ),
      $                  LDA, B( 2, 1 ), LDB)
 *
 *           Pivot, P * B -> B  [ P * (L**T \ (T \ (L \P**T * B) )) ]
diff --git a/SRC/zsytrs_aa_2stage.f b/SRC/zsytrs_aa_2stage.f
index d43f0fa123..aed39add8e 100644
--- a/SRC/zsytrs_aa_2stage.f
+++ b/SRC/zsytrs_aa_2stage.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTRS_AA_2STAGE + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytrs_aa_2stage.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytrs_aa_2stage.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -131,7 +129,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetrs_aa_2stage
 *
 *  =====================================================================
       SUBROUTINE ZSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
@@ -215,7 +213,8 @@ SUBROUTINE ZSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (U**T \ B) -> B    [ (U**T \P**T * B) ]
 *
-            CALL ZTRSM( 'L', 'U', 'T', 'U', N-NB, NRHS, ONE, A(1, NB+1),
+            CALL ZTRSM( 'L', 'U', 'T', 'U', N-NB, NRHS, ONE, A(1,
+     $                  NB+1),
      $                 LDA, B(NB+1, 1), LDB)
 *
          END IF
@@ -228,7 +227,8 @@ SUBROUTINE ZSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (U \ B) -> B   [ U \ (T \ (U**T \P**T * B) ) ]
 *
-            CALL ZTRSM( 'L', 'U', 'N', 'U', N-NB, NRHS, ONE, A(1, NB+1),
+            CALL ZTRSM( 'L', 'U', 'N', 'U', N-NB, NRHS, ONE, A(1,
+     $                  NB+1),
      $                  LDA, B(NB+1, 1), LDB)
 *
 *           Pivot, P * B -> B  [ P * (U \ (T \ (U**T \P**T * B) )) ]
@@ -249,7 +249,8 @@ SUBROUTINE ZSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (L \ B) -> B    [ (L \P**T * B) ]
 *
-            CALL ZTRSM( 'L', 'L', 'N', 'U', N-NB, NRHS, ONE, A(NB+1, 1),
+            CALL ZTRSM( 'L', 'L', 'N', 'U', N-NB, NRHS, ONE, A(NB+1,
+     $                  1),
      $                 LDA, B(NB+1, 1), LDB)
 *
          END IF
@@ -262,7 +263,8 @@ SUBROUTINE ZSYTRS_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
 *
 *           Compute (L**T \ B) -> B   [ L**T \ (T \ (L \P**T * B) ) ]
 *
-            CALL ZTRSM( 'L', 'L', 'T', 'U', N-NB, NRHS, ONE, A(NB+1, 1),
+            CALL ZTRSM( 'L', 'L', 'T', 'U', N-NB, NRHS, ONE, A(NB+1,
+     $                  1),
      $                  LDA, B(NB+1, 1), LDB)
 *
 *           Pivot, P * B -> B  [ P * (L**T \ (T \ (L \P**T * B) )) ]
diff --git a/SRC/zsytrs_rook.f b/SRC/zsytrs_rook.f
index c66a723794..1ee59010fe 100644
--- a/SRC/zsytrs_rook.f
+++ b/SRC/zsytrs_rook.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZSYTRS_ROOK + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytrs_rook.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytrs_rook.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -113,7 +111,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup hetrs_rook
 *
 *> \par Contributors:
 *  ==================
@@ -133,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE ZSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
      $                        INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -223,7 +222,8 @@ SUBROUTINE ZSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           Multiply by inv(U(K)), where U(K) is the transformation
 *           stored in column K of A.
 *
-            CALL ZGERU( K-1, NRHS, -CONE, A( 1, K ), 1, B( K, 1 ), LDB,
+            CALL ZGERU( K-1, NRHS, -CONE, A( 1, K ), 1, B( K, 1 ),
+     $                  LDB,
      $                 B( 1, 1 ), LDB )
 *
 *           Multiply by the inverse of the diagonal block.
@@ -250,7 +250,8 @@ SUBROUTINE ZSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
             IF( K.GT.2 ) THEN
                CALL ZGERU( K-2, NRHS,-CONE, A( 1, K ), 1, B( K, 1 ),
      $                    LDB, B( 1, 1 ), LDB )
-               CALL ZGERU( K-2, NRHS,-CONE, A( 1, K-1 ), 1, B( K-1, 1 ),
+               CALL ZGERU( K-2, NRHS,-CONE, A( 1, K-1 ), 1, B( K-1,
+     $                     1 ),
      $                    LDB, B( 1, 1 ), LDB )
             END IF
 *
@@ -363,7 +364,8 @@ SUBROUTINE ZSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           stored in column K of A.
 *
             IF( K.LT.N )
-     $         CALL ZGERU( N-K, NRHS, -CONE, A( K+1, K ), 1, B( K, 1 ),
+     $         CALL ZGERU( N-K, NRHS, -CONE, A( K+1, K ), 1, B( K,
+     $                     1 ),
      $                    LDB, B( K+1, 1 ), LDB )
 *
 *           Multiply by the inverse of the diagonal block.
@@ -388,7 +390,8 @@ SUBROUTINE ZSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           stored in columns K and K+1 of A.
 *
             IF( K.LT.N-1 ) THEN
-               CALL ZGERU( N-K-1, NRHS,-CONE, A( K+2, K ), 1, B( K, 1 ),
+               CALL ZGERU( N-K-1, NRHS,-CONE, A( K+2, K ), 1, B( K,
+     $                     1 ),
      $                    LDB, B( K+2, 1 ), LDB )
                CALL ZGERU( N-K-1, NRHS,-CONE, A( K+2, K+1 ), 1,
      $                    B( K+1, 1 ), LDB, B( K+2, 1 ), LDB )
@@ -433,7 +436,8 @@ SUBROUTINE ZSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           stored in column K of A.
 *
             IF( K.LT.N )
-     $         CALL ZGEMV( 'Transpose', N-K, NRHS, -CONE, B( K+1, 1 ),
+     $         CALL ZGEMV( 'Transpose', N-K, NRHS, -CONE, B( K+1,
+     $                     1 ),
      $                     LDB, A( K+1, K ), 1, CONE, B( K, 1 ), LDB )
 *
 *           Interchange rows K and IPIV(K).
@@ -450,9 +454,11 @@ SUBROUTINE ZSYTRS_ROOK( UPLO, N, NRHS, A, LDA, IPIV, B, LDB,
 *           stored in columns K-1 and K of A.
 *
             IF( K.LT.N ) THEN
-               CALL ZGEMV( 'Transpose', N-K, NRHS, -CONE, B( K+1, 1 ),
+               CALL ZGEMV( 'Transpose', N-K, NRHS, -CONE, B( K+1,
+     $                     1 ),
      $                     LDB, A( K+1, K ), 1, CONE, B( K, 1 ), LDB )
-               CALL ZGEMV( 'Transpose', N-K, NRHS, -CONE, B( K+1, 1 ),
+               CALL ZGEMV( 'Transpose', N-K, NRHS, -CONE, B( K+1,
+     $                     1 ),
      $                     LDB, A( K+1, K-1 ), 1, CONE, B( K-1, 1 ),
      $                     LDB )
             END IF
diff --git a/SRC/ztbcon.f b/SRC/ztbcon.f
index ed1f3df9fd..7379e41beb 100644
--- a/SRC/ztbcon.f
+++ b/SRC/ztbcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTBCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztbcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztbcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -135,11 +133,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tbcon
 *
 *  =====================================================================
-      SUBROUTINE ZTBCON( NORM, UPLO, DIAG, N, KD, AB, LDAB, RCOND, WORK,
+      SUBROUTINE ZTBCON( NORM, UPLO, DIAG, N, KD, AB, LDAB, RCOND,
+     $                   WORK,
      $                   RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -251,13 +251,15 @@ SUBROUTINE ZTBCON( NORM, UPLO, DIAG, N, KD, AB, LDAB, RCOND, WORK,
 *
 *              Multiply by inv(A).
 *
-               CALL ZLATBS( UPLO, 'No transpose', DIAG, NORMIN, N, KD,
+               CALL ZLATBS( UPLO, 'No transpose', DIAG, NORMIN, N,
+     $                      KD,
      $                      AB, LDAB, WORK, SCALE, RWORK, INFO )
             ELSE
 *
 *              Multiply by inv(A**H).
 *
-               CALL ZLATBS( UPLO, 'Conjugate transpose', DIAG, NORMIN,
+               CALL ZLATBS( UPLO, 'Conjugate transpose', DIAG,
+     $                      NORMIN,
      $                      N, KD, AB, LDAB, WORK, SCALE, RWORK, INFO )
             END IF
             NORMIN = 'Y'
diff --git a/SRC/ztbrfs.f b/SRC/ztbrfs.f
index 0bd1865667..2c7010db80 100644
--- a/SRC/ztbrfs.f
+++ b/SRC/ztbrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTBRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztbrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztbrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -180,11 +178,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tbrfs
 *
 *  =====================================================================
       SUBROUTINE ZTBRFS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
      $                   LDB, X, LDX, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -219,7 +218,8 @@ SUBROUTINE ZTBRFS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZLACN2, ZTBMV, ZTBSV
+      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZLACN2, ZTBMV,
+     $                   ZTBSV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG, MAX, MIN
diff --git a/SRC/ztbtrs.f b/SRC/ztbtrs.f
index e12a7e798e..7e5fd9f9d1 100644
--- a/SRC/ztbtrs.f
+++ b/SRC/ztbtrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTBTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztbtrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztbtrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -39,8 +37,14 @@
 *>
 *>    A * X = B,  A**T * X = B,  or  A**H * X = B,
 *>
-*> where A is a triangular band matrix of order N, and B is an
-*> N-by-NRHS matrix.  A check is made to verify that A is nonsingular.
+*> where A is a triangular band matrix of order N, and B is an N-by-NRHS matrix.
+*>
+*> This subroutine verifies that A is nonsingular, but callers should note that only exact
+*> singularity is detected. It is conceivable for one or more diagonal elements of A to be
+*> subnormally tiny numbers without this subroutine signalling an error.
+*>
+*> If a possible loss of numerical precision due to near-singular matrices is a concern, the
+*> caller should verify that A is nonsingular within some tolerance before calling this subroutine.
 *> \endverbatim
 *
 *  Arguments:
@@ -125,7 +129,7 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the i-th diagonal element of A is zero,
+*>          > 0:  if INFO = i, the i-th diagonal element of A is exactly zero,
 *>                indicating that the matrix is singular and the
 *>                solutions X have not been computed.
 *> \endverbatim
@@ -138,11 +142,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tbtrs
 *
 *  =====================================================================
       SUBROUTINE ZTBTRS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
      $                   LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -186,7 +191,8 @@ SUBROUTINE ZTBTRS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.
-     $         LSAME( TRANS, 'T' ) .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+     $         LSAME( TRANS, 'T' ) .AND.
+     $                .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -2
       ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
          INFO = -3
@@ -231,7 +237,8 @@ SUBROUTINE ZTBTRS( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
 *     Solve A * X = B,  A**T * X = B,  or  A**H * X = B.
 *
       DO 30 J = 1, NRHS
-         CALL ZTBSV( UPLO, TRANS, DIAG, N, KD, AB, LDAB, B( 1, J ), 1 )
+         CALL ZTBSV( UPLO, TRANS, DIAG, N, KD, AB, LDAB, B( 1, J ),
+     $               1 )
    30 CONTINUE
 *
       RETURN
diff --git a/SRC/ztfsm.f b/SRC/ztfsm.f
index 538da4f071..606fce4194 100644
--- a/SRC/ztfsm.f
+++ b/SRC/ztfsm.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTFSM + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztfsm.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztfsm.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -141,7 +139,8 @@
 *> \param[in] A
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (N*(N+1)/2)
-*>           NT = N*(N+1)/2. On entry, the matrix A in RFP Format.
+*>           NT = N*(N+1)/2 if SIDE='R' and NT = M*(M+1)/2 otherwise.
+*>           On entry, the matrix A in RFP Format.
 *>           RFP Format is described by TRANSR, UPLO and N as follows:
 *>           If TRANSR='N' then RFP A is (0:N,0:K-1) when N is even;
 *>           K=N/2. RFP A is (0:N-1,0:K) when N is odd; K=N/2. If
@@ -182,7 +181,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tfsm
 *
 *> \par Further Details:
 *  =====================
@@ -293,8 +292,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
+      SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA,
+     $                  A,
      $                  B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -348,7 +349,8 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
          INFO = -3
       ELSE IF( .NOT.NOTRANS .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -4
-      ELSE IF( .NOT.LSAME( DIAG, 'N' ) .AND. .NOT.LSAME( DIAG, 'U' ) )
+      ELSE IF( .NOT.LSAME( DIAG, 'N' ) .AND.
+     $         .NOT.LSAME( DIAG, 'U' ) )
      $         THEN
          INFO = -5
       ELSE IF( M.LT.0 ) THEN
@@ -419,12 +421,15 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    TRANS = 'N'
 *
                      IF( M.EQ.1 ) THEN
-                        CALL ZTRSM( 'L', 'L', 'N', DIAG, M1, N, ALPHA,
+                        CALL ZTRSM( 'L', 'L', 'N', DIAG, M1, N,
+     $                              ALPHA,
      $                              A, M, B, LDB )
                      ELSE
-                        CALL ZTRSM( 'L', 'L', 'N', DIAG, M1, N, ALPHA,
+                        CALL ZTRSM( 'L', 'L', 'N', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M, B, LDB )
-                        CALL ZGEMM( 'N', 'N', M2, N, M1, -CONE, A( M1 ),
+                        CALL ZGEMM( 'N', 'N', M2, N, M1, -CONE,
+     $                              A( M1 ),
      $                              M, B, LDB, ALPHA, B( M1, 0 ), LDB )
                         CALL ZTRSM( 'L', 'U', 'C', DIAG, M2, N, CONE,
      $                              A( M ), M, B( M1, 0 ), LDB )
@@ -436,12 +441,15 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    TRANS = 'C'
 *
                      IF( M.EQ.1 ) THEN
-                        CALL ZTRSM( 'L', 'L', 'C', DIAG, M1, N, ALPHA,
+                        CALL ZTRSM( 'L', 'L', 'C', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M, B, LDB )
                      ELSE
-                        CALL ZTRSM( 'L', 'U', 'N', DIAG, M2, N, ALPHA,
+                        CALL ZTRSM( 'L', 'U', 'N', DIAG, M2, N,
+     $                              ALPHA,
      $                              A( M ), M, B( M1, 0 ), LDB )
-                        CALL ZGEMM( 'C', 'N', M1, N, M2, -CONE, A( M1 ),
+                        CALL ZGEMM( 'C', 'N', M1, N, M2, -CONE,
+     $                              A( M1 ),
      $                              M, B( M1, 0 ), LDB, ALPHA, B, LDB )
                         CALL ZTRSM( 'L', 'L', 'C', DIAG, M1, N, CONE,
      $                              A( 0 ), M, B, LDB )
@@ -460,7 +468,8 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL ZTRSM( 'L', 'L', 'N', DIAG, M1, N, ALPHA,
      $                           A( M2 ), M, B, LDB )
-                     CALL ZGEMM( 'C', 'N', M2, N, M1, -CONE, A( 0 ), M,
+                     CALL ZGEMM( 'C', 'N', M2, N, M1, -CONE, A( 0 ),
+     $                           M,
      $                           B, LDB, ALPHA, B( M1, 0 ), LDB )
                      CALL ZTRSM( 'L', 'U', 'C', DIAG, M2, N, CONE,
      $                           A( M1 ), M, B( M1, 0 ), LDB )
@@ -472,7 +481,8 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL ZTRSM( 'L', 'U', 'N', DIAG, M2, N, ALPHA,
      $                           A( M1 ), M, B( M1, 0 ), LDB )
-                     CALL ZGEMM( 'N', 'N', M1, N, M2, -CONE, A( 0 ), M,
+                     CALL ZGEMM( 'N', 'N', M1, N, M2, -CONE, A( 0 ),
+     $                           M,
      $                           B( M1, 0 ), LDB, ALPHA, B, LDB )
                      CALL ZTRSM( 'L', 'L', 'C', DIAG, M1, N, CONE,
      $                           A( M2 ), M, B, LDB )
@@ -495,10 +505,12 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    TRANS = 'N'
 *
                      IF( M.EQ.1 ) THEN
-                        CALL ZTRSM( 'L', 'U', 'C', DIAG, M1, N, ALPHA,
+                        CALL ZTRSM( 'L', 'U', 'C', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M1, B, LDB )
                      ELSE
-                        CALL ZTRSM( 'L', 'U', 'C', DIAG, M1, N, ALPHA,
+                        CALL ZTRSM( 'L', 'U', 'C', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M1, B, LDB )
                         CALL ZGEMM( 'C', 'N', M2, N, M1, -CONE,
      $                              A( M1*M1 ), M1, B, LDB, ALPHA,
@@ -513,10 +525,12 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    TRANS = 'C'
 *
                      IF( M.EQ.1 ) THEN
-                        CALL ZTRSM( 'L', 'U', 'N', DIAG, M1, N, ALPHA,
+                        CALL ZTRSM( 'L', 'U', 'N', DIAG, M1, N,
+     $                              ALPHA,
      $                              A( 0 ), M1, B, LDB )
                      ELSE
-                        CALL ZTRSM( 'L', 'L', 'C', DIAG, M2, N, ALPHA,
+                        CALL ZTRSM( 'L', 'L', 'C', DIAG, M2, N,
+     $                              ALPHA,
      $                              A( 1 ), M1, B( M1, 0 ), LDB )
                         CALL ZGEMM( 'N', 'N', M1, N, M2, -CONE,
      $                              A( M1*M1 ), M1, B( M1, 0 ), LDB,
@@ -538,7 +552,8 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL ZTRSM( 'L', 'U', 'C', DIAG, M1, N, ALPHA,
      $                           A( M2*M2 ), M2, B, LDB )
-                     CALL ZGEMM( 'N', 'N', M2, N, M1, -CONE, A( 0 ), M2,
+                     CALL ZGEMM( 'N', 'N', M2, N, M1, -CONE, A( 0 ),
+     $                           M2,
      $                           B, LDB, ALPHA, B( M1, 0 ), LDB )
                      CALL ZTRSM( 'L', 'L', 'N', DIAG, M2, N, CONE,
      $                           A( M1*M2 ), M2, B( M1, 0 ), LDB )
@@ -550,7 +565,8 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL ZTRSM( 'L', 'L', 'C', DIAG, M2, N, ALPHA,
      $                           A( M1*M2 ), M2, B( M1, 0 ), LDB )
-                     CALL ZGEMM( 'C', 'N', M1, N, M2, -CONE, A( 0 ), M2,
+                     CALL ZGEMM( 'C', 'N', M1, N, M2, -CONE, A( 0 ),
+     $                           M2,
      $                           B( M1, 0 ), LDB, ALPHA, B, LDB )
                      CALL ZTRSM( 'L', 'U', 'N', DIAG, M1, N, CONE,
      $                           A( M2*M2 ), M2, B, LDB )
@@ -610,7 +626,8 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL ZTRSM( 'L', 'L', 'N', DIAG, K, N, ALPHA,
      $                           A( K+1 ), M+1, B, LDB )
-                     CALL ZGEMM( 'C', 'N', K, N, K, -CONE, A( 0 ), M+1,
+                     CALL ZGEMM( 'C', 'N', K, N, K, -CONE, A( 0 ),
+     $                           M+1,
      $                           B, LDB, ALPHA, B( K, 0 ), LDB )
                      CALL ZTRSM( 'L', 'U', 'C', DIAG, K, N, CONE,
      $                           A( K ), M+1, B( K, 0 ), LDB )
@@ -621,7 +638,8 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *                    and TRANS = 'C'
                      CALL ZTRSM( 'L', 'U', 'N', DIAG, K, N, ALPHA,
      $                           A( K ), M+1, B( K, 0 ), LDB )
-                     CALL ZGEMM( 'N', 'N', K, N, K, -CONE, A( 0 ), M+1,
+                     CALL ZGEMM( 'N', 'N', K, N, K, -CONE, A( 0 ),
+     $                           M+1,
      $                           B( K, 0 ), LDB, ALPHA, B, LDB )
                      CALL ZTRSM( 'L', 'L', 'C', DIAG, K, N, CONE,
      $                           A( K+1 ), M+1, B, LDB )
@@ -677,7 +695,8 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL ZTRSM( 'L', 'U', 'C', DIAG, K, N, ALPHA,
      $                           A( K*( K+1 ) ), K, B, LDB )
-                     CALL ZGEMM( 'N', 'N', K, N, K, -CONE, A( 0 ), K, B,
+                     CALL ZGEMM( 'N', 'N', K, N, K, -CONE, A( 0 ), K,
+     $                           B,
      $                           LDB, ALPHA, B( K, 0 ), LDB )
                      CALL ZTRSM( 'L', 'L', 'N', DIAG, K, N, CONE,
      $                           A( K*K ), K, B( K, 0 ), LDB )
@@ -743,7 +762,8 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL ZTRSM( 'R', 'U', 'C', DIAG, M, N2, ALPHA,
      $                           A( N ), N, B( 0, N1 ), LDB )
-                     CALL ZGEMM( 'N', 'N', M, N1, N2, -CONE, B( 0, N1 ),
+                     CALL ZGEMM( 'N', 'N', M, N1, N2, -CONE, B( 0,
+     $                           N1 ),
      $                           LDB, A( N1 ), N, ALPHA, B( 0, 0 ),
      $                           LDB )
                      CALL ZTRSM( 'R', 'L', 'N', DIAG, M, N1, CONE,
@@ -756,7 +776,8 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL ZTRSM( 'R', 'L', 'C', DIAG, M, N1, ALPHA,
      $                           A( 0 ), N, B( 0, 0 ), LDB )
-                     CALL ZGEMM( 'N', 'C', M, N2, N1, -CONE, B( 0, 0 ),
+                     CALL ZGEMM( 'N', 'C', M, N2, N1, -CONE, B( 0,
+     $                           0 ),
      $                           LDB, A( N1 ), N, ALPHA, B( 0, N1 ),
      $                           LDB )
                      CALL ZTRSM( 'R', 'U', 'N', DIAG, M, N2, CONE,
@@ -775,7 +796,8 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL ZTRSM( 'R', 'L', 'C', DIAG, M, N1, ALPHA,
      $                           A( N2 ), N, B( 0, 0 ), LDB )
-                     CALL ZGEMM( 'N', 'N', M, N2, N1, -CONE, B( 0, 0 ),
+                     CALL ZGEMM( 'N', 'N', M, N2, N1, -CONE, B( 0,
+     $                           0 ),
      $                           LDB, A( 0 ), N, ALPHA, B( 0, N1 ),
      $                           LDB )
                      CALL ZTRSM( 'R', 'U', 'N', DIAG, M, N2, CONE,
@@ -788,7 +810,8 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL ZTRSM( 'R', 'U', 'C', DIAG, M, N2, ALPHA,
      $                           A( N1 ), N, B( 0, N1 ), LDB )
-                     CALL ZGEMM( 'N', 'C', M, N1, N2, -CONE, B( 0, N1 ),
+                     CALL ZGEMM( 'N', 'C', M, N1, N2, -CONE, B( 0,
+     $                           N1 ),
      $                           LDB, A( 0 ), N, ALPHA, B( 0, 0 ), LDB )
                      CALL ZTRSM( 'R', 'L', 'N', DIAG, M, N1, CONE,
      $                           A( N2 ), N, B( 0, 0 ), LDB )
@@ -812,7 +835,8 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL ZTRSM( 'R', 'L', 'N', DIAG, M, N2, ALPHA,
      $                           A( 1 ), N1, B( 0, N1 ), LDB )
-                     CALL ZGEMM( 'N', 'C', M, N1, N2, -CONE, B( 0, N1 ),
+                     CALL ZGEMM( 'N', 'C', M, N1, N2, -CONE, B( 0,
+     $                           N1 ),
      $                           LDB, A( N1*N1 ), N1, ALPHA, B( 0, 0 ),
      $                           LDB )
                      CALL ZTRSM( 'R', 'U', 'C', DIAG, M, N1, CONE,
@@ -825,7 +849,8 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL ZTRSM( 'R', 'U', 'N', DIAG, M, N1, ALPHA,
      $                           A( 0 ), N1, B( 0, 0 ), LDB )
-                     CALL ZGEMM( 'N', 'N', M, N2, N1, -CONE, B( 0, 0 ),
+                     CALL ZGEMM( 'N', 'N', M, N2, N1, -CONE, B( 0,
+     $                           0 ),
      $                           LDB, A( N1*N1 ), N1, ALPHA, B( 0, N1 ),
      $                           LDB )
                      CALL ZTRSM( 'R', 'L', 'C', DIAG, M, N2, CONE,
@@ -844,7 +869,8 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL ZTRSM( 'R', 'U', 'N', DIAG, M, N1, ALPHA,
      $                           A( N2*N2 ), N2, B( 0, 0 ), LDB )
-                     CALL ZGEMM( 'N', 'C', M, N2, N1, -CONE, B( 0, 0 ),
+                     CALL ZGEMM( 'N', 'C', M, N2, N1, -CONE, B( 0,
+     $                           0 ),
      $                           LDB, A( 0 ), N2, ALPHA, B( 0, N1 ),
      $                           LDB )
                      CALL ZTRSM( 'R', 'L', 'C', DIAG, M, N2, CONE,
@@ -857,7 +883,8 @@ SUBROUTINE ZTFSM( TRANSR, SIDE, UPLO, TRANS, DIAG, M, N, ALPHA, A,
 *
                      CALL ZTRSM( 'R', 'L', 'N', DIAG, M, N2, ALPHA,
      $                           A( N1*N2 ), N2, B( 0, N1 ), LDB )
-                     CALL ZGEMM( 'N', 'N', M, N1, N2, -CONE, B( 0, N1 ),
+                     CALL ZGEMM( 'N', 'N', M, N1, N2, -CONE, B( 0,
+     $                           N1 ),
      $                           LDB, A( 0 ), N2, ALPHA, B( 0, 0 ),
      $                           LDB )
                      CALL ZTRSM( 'R', 'U', 'C', DIAG, M, N1, CONE,
diff --git a/SRC/ztftri.f b/SRC/ztftri.f
index 7fbd81cdd6..95614d9e27 100644
--- a/SRC/ztftri.f
+++ b/SRC/ztftri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTFTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztftri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztftri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,7 +104,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tftri
 *
 *> \par Further Details:
 *  =====================
@@ -218,6 +216,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -262,7 +261,8 @@ SUBROUTINE ZTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
          INFO = -1
       ELSE IF( .NOT.LOWER .AND. .NOT.LSAME( UPLO, 'U' ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.LSAME( DIAG, 'N' ) .AND. .NOT.LSAME( DIAG, 'U' ) )
+      ELSE IF( .NOT.LSAME( DIAG, 'N' ) .AND.
+     $         .NOT.LSAME( DIAG, 'U' ) )
      $         THEN
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
@@ -318,14 +318,16 @@ SUBROUTINE ZTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
                CALL ZTRTRI( 'L', DIAG, N1, A( 0 ), N, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL ZTRMM( 'R', 'L', 'N', DIAG, N2, N1, -CONE, A( 0 ),
+               CALL ZTRMM( 'R', 'L', 'N', DIAG, N2, N1, -CONE,
+     $                     A( 0 ),
      $                     N, A( N1 ), N )
                CALL ZTRTRI( 'U', DIAG, N2, A( N ), N, INFO )
                IF( INFO.GT.0 )
      $            INFO = INFO + N1
                IF( INFO.GT.0 )
      $            RETURN
-               CALL ZTRMM( 'L', 'U', 'C', DIAG, N2, N1, CONE, A( N ), N,
+               CALL ZTRMM( 'L', 'U', 'C', DIAG, N2, N1, CONE, A( N ),
+     $                     N,
      $                     A( N1 ), N )
 *
             ELSE
@@ -337,14 +339,16 @@ SUBROUTINE ZTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
                CALL ZTRTRI( 'L', DIAG, N1, A( N2 ), N, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL ZTRMM( 'L', 'L', 'C', DIAG, N1, N2, -CONE, A( N2 ),
+               CALL ZTRMM( 'L', 'L', 'C', DIAG, N1, N2, -CONE,
+     $                     A( N2 ),
      $                     N, A( 0 ), N )
                CALL ZTRTRI( 'U', DIAG, N2, A( N1 ), N, INFO )
                IF( INFO.GT.0 )
      $            INFO = INFO + N1
                IF( INFO.GT.0 )
      $            RETURN
-               CALL ZTRMM( 'R', 'U', 'N', DIAG, N1, N2, CONE, A( N1 ),
+               CALL ZTRMM( 'R', 'U', 'N', DIAG, N1, N2, CONE,
+     $                     A( N1 ),
      $                     N, A( 0 ), N )
 *
             END IF
@@ -361,7 +365,8 @@ SUBROUTINE ZTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
                CALL ZTRTRI( 'U', DIAG, N1, A( 0 ), N1, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL ZTRMM( 'L', 'U', 'N', DIAG, N1, N2, -CONE, A( 0 ),
+               CALL ZTRMM( 'L', 'U', 'N', DIAG, N1, N2, -CONE,
+     $                     A( 0 ),
      $                     N1, A( N1*N1 ), N1 )
                CALL ZTRTRI( 'L', DIAG, N2, A( 1 ), N1, INFO )
                IF( INFO.GT.0 )
@@ -416,7 +421,8 @@ SUBROUTINE ZTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
      $            INFO = INFO + K
                IF( INFO.GT.0 )
      $            RETURN
-               CALL ZTRMM( 'L', 'U', 'C', DIAG, K, K, CONE, A( 0 ), N+1,
+               CALL ZTRMM( 'L', 'U', 'C', DIAG, K, K, CONE, A( 0 ),
+     $                     N+1,
      $                     A( K+1 ), N+1 )
 *
             ELSE
@@ -428,14 +434,16 @@ SUBROUTINE ZTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
                CALL ZTRTRI( 'L', DIAG, K, A( K+1 ), N+1, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL ZTRMM( 'L', 'L', 'C', DIAG, K, K, -CONE, A( K+1 ),
+               CALL ZTRMM( 'L', 'L', 'C', DIAG, K, K, -CONE,
+     $                     A( K+1 ),
      $                     N+1, A( 0 ), N+1 )
                CALL ZTRTRI( 'U', DIAG, K, A( K ), N+1, INFO )
                IF( INFO.GT.0 )
      $            INFO = INFO + K
                IF( INFO.GT.0 )
      $            RETURN
-               CALL ZTRMM( 'R', 'U', 'N', DIAG, K, K, CONE, A( K ), N+1,
+               CALL ZTRMM( 'R', 'U', 'N', DIAG, K, K, CONE, A( K ),
+     $                     N+1,
      $                     A( 0 ), N+1 )
             END IF
          ELSE
@@ -451,14 +459,16 @@ SUBROUTINE ZTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
                CALL ZTRTRI( 'U', DIAG, K, A( K ), K, INFO )
                IF( INFO.GT.0 )
      $            RETURN
-               CALL ZTRMM( 'L', 'U', 'N', DIAG, K, K, -CONE, A( K ), K,
+               CALL ZTRMM( 'L', 'U', 'N', DIAG, K, K, -CONE, A( K ),
+     $                     K,
      $                     A( K*( K+1 ) ), K )
                CALL ZTRTRI( 'L', DIAG, K, A( 0 ), K, INFO )
                IF( INFO.GT.0 )
      $            INFO = INFO + K
                IF( INFO.GT.0 )
      $            RETURN
-               CALL ZTRMM( 'R', 'L', 'C', DIAG, K, K, CONE, A( 0 ), K,
+               CALL ZTRMM( 'R', 'L', 'C', DIAG, K, K, CONE, A( 0 ),
+     $                     K,
      $                     A( K*( K+1 ) ), K )
             ELSE
 *
@@ -476,7 +486,8 @@ SUBROUTINE ZTFTRI( TRANSR, UPLO, DIAG, N, A, INFO )
      $            INFO = INFO + K
                IF( INFO.GT.0 )
      $            RETURN
-               CALL ZTRMM( 'L', 'L', 'N', DIAG, K, K, CONE, A( K*K ), K,
+               CALL ZTRMM( 'L', 'L', 'N', DIAG, K, K, CONE, A( K*K ),
+     $                     K,
      $                     A( 0 ), K )
             END IF
          END IF
diff --git a/SRC/ztfttp.f b/SRC/ztfttp.f
index 9f5c4866a8..48405a6bb2 100644
--- a/SRC/ztfttp.f
+++ b/SRC/ztfttp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTFTTP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztfttp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztfttp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -93,7 +91,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tfttp
 *
 *> \par Further Details:
 *  =====================
@@ -205,6 +203,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZTFTTP( TRANSR, UPLO, N, ARF, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ztfttr.f b/SRC/ztfttr.f
index 511aca3360..975f96b89e 100644
--- a/SRC/ztfttr.f
+++ b/SRC/ztfttr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTFTTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztfttr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztfttr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,7 +99,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tfttr
 *
 *> \par Further Details:
 *  =====================
@@ -213,6 +211,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZTFTTR( TRANSR, UPLO, N, ARF, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ztgevc.f b/SRC/ztgevc.f
index 23bd36ddb1..1d0a28dd0e 100644
--- a/SRC/ztgevc.f
+++ b/SRC/ztgevc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTGEVC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztgevc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztgevc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -53,7 +51,7 @@
 *>
 *>    S*x = w*P*x,  (y**H)*S = w*(y**H)*P,
 *>
-*> where y**H denotes the conjugate tranpose of y.
+*> where y**H denotes the conjugate transpose of y.
 *> The eigenvalues are not input to this routine, but are computed
 *> directly from the diagonal elements of S and P.
 *>
@@ -154,7 +152,7 @@
 *> \verbatim
 *>          VR is COMPLEX*16 array, dimension (LDVR,MM)
 *>          On entry, if SIDE = 'R' or 'B' and HOWMNY = 'B', VR must
-*>          contain an N-by-N matrix Q (usually the unitary matrix Z
+*>          contain an N-by-N matrix Z (usually the unitary matrix Z
 *>          of right Schur vectors returned by ZHGEQZ).
 *>          On exit, if SIDE = 'R' or 'B', VR contains:
 *>          if HOWMNY = 'A', the matrix X of right eigenvectors of (S,P);
@@ -211,11 +209,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup tgevc
 *
 *  =====================================================================
       SUBROUTINE ZTGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
      $                   LDVL, VR, LDVR, MM, M, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -259,7 +258,7 @@ SUBROUTINE ZTGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
       EXTERNAL           LSAME, DLAMCH, ZLADIV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, XERBLA, ZGEMV
+      EXTERNAL           XERBLA, ZGEMV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, MAX, MIN
@@ -367,7 +366,6 @@ SUBROUTINE ZTGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
 *
       SAFMIN = DLAMCH( 'Safe minimum' )
       BIG = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, BIG )
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       SMALL = SAFMIN*N / ULP
       BIG = ONE / SMALL
@@ -528,7 +526,8 @@ SUBROUTINE ZTGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
 *              Back transform eigenvector if HOWMNY='B'.
 *
                IF( ILBACK ) THEN
-                  CALL ZGEMV( 'N', N, N+1-JE, CONE, VL( 1, JE ), LDVL,
+                  CALL ZGEMV( 'N', N, N+1-JE, CONE, VL( 1, JE ),
+     $                        LDVL,
      $                        WORK( JE ), 1, CZERO, WORK( N+1 ), 1 )
                   ISRC = 2
                   IBEG = 1
diff --git a/SRC/ztgex2.f b/SRC/ztgex2.f
index 3c3705c66c..5f97848d47 100644
--- a/SRC/ztgex2.f
+++ b/SRC/ztgex2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTGEX2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztgex2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztgex2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -153,7 +151,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEauxiliary
+*> \ingroup tgex2
 *
 *> \par Further Details:
 *  =====================
@@ -187,6 +185,7 @@
 *  =====================================================================
       SUBROUTINE ZTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
      $                   LDZ, J1, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -315,7 +314,8 @@ SUBROUTINE ZTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
          CALL ZLACPY( 'Full', M, M, S, LDST, WORK, M )
          CALL ZLACPY( 'Full', M, M, T, LDST, WORK( M*M+1 ), M )
          CALL ZROT( 2, WORK, 1, WORK( 3 ), 1, CZ, -DCONJG( SZ ) )
-         CALL ZROT( 2, WORK( 5 ), 1, WORK( 7 ), 1, CZ, -DCONJG( SZ ) )
+         CALL ZROT( 2, WORK( 5 ), 1, WORK( 7 ), 1, CZ,
+     $              -DCONJG( SZ ) )
          CALL ZROT( 2, WORK, 2, WORK( 2 ), 2, CQ, -SQ )
          CALL ZROT( 2, WORK( 5 ), 2, WORK( 6 ), 2, CQ, -SQ )
          DO 10 I = 1, 2
@@ -344,8 +344,10 @@ SUBROUTINE ZTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
      $           DCONJG( SZ ) )
       CALL ZROT( J1+1, B( 1, J1 ), 1, B( 1, J1+1 ), 1, CZ,
      $           DCONJG( SZ ) )
-      CALL ZROT( N-J1+1, A( J1, J1 ), LDA, A( J1+1, J1 ), LDA, CQ, SQ )
-      CALL ZROT( N-J1+1, B( J1, J1 ), LDB, B( J1+1, J1 ), LDB, CQ, SQ )
+      CALL ZROT( N-J1+1, A( J1, J1 ), LDA, A( J1+1, J1 ), LDA, CQ,
+     $           SQ )
+      CALL ZROT( N-J1+1, B( J1, J1 ), LDB, B( J1+1, J1 ), LDB, CQ,
+     $           SQ )
 *
 *     Set  N1 by N2 (2,1) blocks to 0
 *
diff --git a/SRC/ztgexc.f b/SRC/ztgexc.f
index 55677317ca..9b430a9760 100644
--- a/SRC/ztgexc.f
+++ b/SRC/ztgexc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTGEXC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztgexc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztgexc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,7 +161,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup tgexc
 *
 *> \par Contributors:
 *  ==================
@@ -197,6 +195,7 @@
 *  =====================================================================
       SUBROUTINE ZTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
      $                   LDZ, IFST, ILST, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -261,7 +260,8 @@ SUBROUTINE ZTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
 *        Swap with next one below
 *
-         CALL ZTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z, LDZ,
+         CALL ZTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
+     $                LDZ,
      $                HERE, INFO )
          IF( INFO.NE.0 ) THEN
             ILST = HERE
@@ -278,7 +278,8 @@ SUBROUTINE ZTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
 *
 *        Swap with next one above
 *
-         CALL ZTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z, LDZ,
+         CALL ZTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
+     $                LDZ,
      $                HERE, INFO )
          IF( INFO.NE.0 ) THEN
             ILST = HERE
diff --git a/SRC/ztgsen.f b/SRC/ztgsen.f
index 25a5c6f4ed..9f9dfcc3cd 100644
--- a/SRC/ztgsen.f
+++ b/SRC/ztgsen.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTGSEN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztgsen.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztgsen.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -290,7 +288,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tgsen
 *
 *> \par Further Details:
 *  =====================
@@ -427,9 +425,11 @@
 *>      1996.
 *>
 *  =====================================================================
-      SUBROUTINE ZTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
+      SUBROUTINE ZTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B,
+     $                   LDB,
      $                   ALPHA, BETA, Q, LDQ, Z, LDZ, M, PL, PR, DIF,
      $                   WORK, LWORK, IWORK, LIWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -468,7 +468,8 @@ SUBROUTINE ZTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLACN2, ZLACPY, ZLASSQ, ZSCAL, ZTGEXC,
+      EXTERNAL           XERBLA, ZLACN2, ZLACPY, ZLASSQ, ZSCAL,
+     $                   ZTGEXC,
      $                   ZTGSYL
 *     ..
 *     .. Intrinsic Functions ..
@@ -592,7 +593,8 @@ SUBROUTINE ZTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *           and Z that will swap adjacent diagonal blocks in (A, B).
 *
             IF( K.NE.KS )
-     $         CALL ZTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
+     $         CALL ZTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ,
+     $                      Z,
      $                      LDZ, K, KS, IERR )
 *
             IF( IERR.GT.0 ) THEN
@@ -622,7 +624,8 @@ SUBROUTINE ZTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
          N2 = N - M
          I = N1 + 1
          CALL ZLACPY( 'Full', N1, N2, A( 1, I ), LDA, WORK, N1 )
-         CALL ZLACPY( 'Full', N1, N2, B( 1, I ), LDB, WORK( N1*N2+1 ),
+         CALL ZLACPY( 'Full', N1, N2, B( 1, I ), LDB,
+     $                WORK( N1*N2+1 ),
      $                N1 )
          IJB = 0
          CALL ZTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA, WORK,
@@ -664,14 +667,16 @@ SUBROUTINE ZTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *           Frobenius norm-based Difu estimate.
 *
-            CALL ZTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA, WORK,
+            CALL ZTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA,
+     $                   WORK,
      $                   N1, B, LDB, B( I, I ), LDB, WORK( N1*N2+1 ),
      $                   N1, DSCALE, DIF( 1 ), WORK( N1*N2*2+1 ),
      $                   LWORK-2*N1*N2, IWORK, IERR )
 *
 *           Frobenius norm-based Difl estimate.
 *
-            CALL ZTGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A, LDA, WORK,
+            CALL ZTGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A, LDA,
+     $                   WORK,
      $                   N2, B( I, I ), LDB, B, LDB, WORK( N1*N2+1 ),
      $                   N2, DSCALE, DIF( 2 ), WORK( N1*N2*2+1 ),
      $                   LWORK-2*N1*N2, IWORK, IERR )
@@ -699,7 +704,8 @@ SUBROUTINE ZTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *                 Solve generalized Sylvester equation
 *
-                  CALL ZTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA,
+                  CALL ZTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ),
+     $                         LDA,
      $                         WORK, N1, B, LDB, B( I, I ), LDB,
      $                         WORK( N1*N2+1 ), N1, DSCALE, DIF( 1 ),
      $                         WORK( N1*N2*2+1 ), LWORK-2*N1*N2, IWORK,
@@ -708,7 +714,8 @@ SUBROUTINE ZTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *                 Solve the transposed variant.
 *
-                  CALL ZTGSYL( 'C', IJB, N1, N2, A, LDA, A( I, I ), LDA,
+                  CALL ZTGSYL( 'C', IJB, N1, N2, A, LDA, A( I, I ),
+     $                         LDA,
      $                         WORK, N1, B, LDB, B( I, I ), LDB,
      $                         WORK( N1*N2+1 ), N1, DSCALE, DIF( 1 ),
      $                         WORK( N1*N2*2+1 ), LWORK-2*N1*N2, IWORK,
@@ -728,7 +735,8 @@ SUBROUTINE ZTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *                 Solve generalized Sylvester equation
 *
-                  CALL ZTGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A, LDA,
+                  CALL ZTGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A,
+     $                         LDA,
      $                         WORK, N2, B( I, I ), LDB, B, LDB,
      $                         WORK( N1*N2+1 ), N2, DSCALE, DIF( 2 ),
      $                         WORK( N1*N2*2+1 ), LWORK-2*N1*N2, IWORK,
@@ -737,7 +745,8 @@ SUBROUTINE ZTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
 *
 *                 Solve the transposed variant.
 *
-                  CALL ZTGSYL( 'C', IJB, N2, N1, A( I, I ), LDA, A, LDA,
+                  CALL ZTGSYL( 'C', IJB, N2, N1, A( I, I ), LDA, A,
+     $                         LDA,
      $                         WORK, N2, B, LDB, B( I, I ), LDB,
      $                         WORK( N1*N2+1 ), N2, DSCALE, DIF( 2 ),
      $                         WORK( N1*N2*2+1 ), LWORK-2*N1*N2, IWORK,
diff --git a/SRC/ztgsja.f b/SRC/ztgsja.f
index c1c5abdb18..2492871f69 100644
--- a/SRC/ztgsja.f
+++ b/SRC/ztgsja.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTGSJA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztgsja.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztgsja.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -351,7 +349,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tgsja
 *
 *> \par Further Details:
 *  =====================
@@ -376,6 +374,7 @@
       SUBROUTINE ZTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
      $                   LDB, TOLA, TOLB, ALPHA, BETA, U, LDU, V, LDV,
      $                   Q, LDQ, WORK, NCYCLE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -417,7 +416,8 @@ SUBROUTINE ZTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLARTG, XERBLA, ZCOPY, ZDSCAL, ZLAGS2, ZLAPLL,
+      EXTERNAL           DLARTG, XERBLA, ZCOPY, ZDSCAL, ZLAGS2,
+     $                   ZLAPLL,
      $                   ZLASET, ZROT
 *     ..
 *     .. Intrinsic Functions ..
@@ -440,9 +440,13 @@ SUBROUTINE ZTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
       INFO = 0
       IF( .NOT.( INITU .OR. WANTU .OR. LSAME( JOBU, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.( INITV .OR. WANTV .OR. LSAME( JOBV, 'N' ) ) ) THEN
+      ELSE IF( .NOT.( INITV .OR.
+     $         WANTV .OR.
+     $         LSAME( JOBV, 'N' ) ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.( INITQ .OR. WANTQ .OR. LSAME( JOBQ, 'N' ) ) ) THEN
+      ELSE IF( .NOT.( INITQ .OR.
+     $         WANTQ .OR.
+     $         LSAME( JOBQ, 'N' ) ) ) THEN
          INFO = -3
       ELSE IF( M.LT.0 ) THEN
          INFO = -4
@@ -512,7 +516,8 @@ SUBROUTINE ZTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
 *              Update (K+I)-th and (K+J)-th rows of matrix A: U**H *A
 *
                IF( K+J.LE.M )
-     $            CALL ZROT( L, A( K+J, N-L+1 ), LDA, A( K+I, N-L+1 ),
+     $            CALL ZROT( L, A( K+J, N-L+1 ), LDA, A( K+I,
+     $                       N-L+1 ),
      $                       LDA, CSU, DCONJG( SNU ) )
 *
 *              Update I-th and J-th rows of matrix B: V**H *B
@@ -555,10 +560,12 @@ SUBROUTINE ZTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
      $                       SNU )
 *
                IF( WANTV )
-     $            CALL ZROT( P, V( 1, J ), 1, V( 1, I ), 1, CSV, SNV )
+     $            CALL ZROT( P, V( 1, J ), 1, V( 1, I ), 1, CSV,
+     $                       SNV )
 *
                IF( WANTQ )
-     $            CALL ZROT( N, Q( 1, N-L+J ), 1, Q( 1, N-L+I ), 1, CSQ,
+     $            CALL ZROT( N, Q( 1, N-L+J ), 1, Q( 1, N-L+I ), 1,
+     $                       CSQ,
      $                       SNQ )
 *
    10       CONTINUE
@@ -575,7 +582,8 @@ SUBROUTINE ZTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
             ERROR = ZERO
             DO 30 I = 1, MIN( L, M-K )
                CALL ZCOPY( L-I+1, A( K+I, N-L+I ), LDA, WORK, 1 )
-               CALL ZCOPY( L-I+1, B( I, N-L+I ), LDB, WORK( L+1 ), 1 )
+               CALL ZCOPY( L-I+1, B( I, N-L+I ), LDB, WORK( L+1 ),
+     $                     1 )
                CALL ZLAPLL( L-I+1, WORK, 1, WORK( L+1 ), 1, SSMIN )
                ERROR = MAX( ERROR, SSMIN )
    30       CONTINUE
@@ -618,16 +626,19 @@ SUBROUTINE ZTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B,
      $            CALL ZDSCAL( P, -ONE, V( 1, I ), 1 )
             END IF
 *
-            CALL DLARTG( ABS( GAMMA ), ONE, BETA( K+I ), ALPHA( K+I ),
+            CALL DLARTG( ABS( GAMMA ), ONE, BETA( K+I ),
+     $                   ALPHA( K+I ),
      $                   RWK )
 *
             IF( ALPHA( K+I ).GE.BETA( K+I ) ) THEN
-               CALL ZDSCAL( L-I+1, ONE / ALPHA( K+I ), A( K+I, N-L+I ),
+               CALL ZDSCAL( L-I+1, ONE / ALPHA( K+I ), A( K+I,
+     $                      N-L+I ),
      $                      LDA )
             ELSE
                CALL ZDSCAL( L-I+1, ONE / BETA( K+I ), B( I, N-L+I ),
      $                      LDB )
-               CALL ZCOPY( L-I+1, B( I, N-L+I ), LDB, A( K+I, N-L+I ),
+               CALL ZCOPY( L-I+1, B( I, N-L+I ), LDB, A( K+I,
+     $                     N-L+I ),
      $                     LDA )
             END IF
 *
diff --git a/SRC/ztgsna.f b/SRC/ztgsna.f
index 11743eb2df..5e15172871 100644
--- a/SRC/ztgsna.f
+++ b/SRC/ztgsna.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTGSNA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztgsna.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztgsna.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -213,7 +211,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tgsna
 *
 *> \par Further Details:
 *  =====================
@@ -308,6 +306,7 @@
       SUBROUTINE ZTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
      $                   LDVL, VR, LDVR, S, DIF, MM, M, WORK, LWORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -345,10 +344,12 @@ SUBROUTINE ZTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
       LOGICAL            LSAME
       DOUBLE PRECISION   DLAMCH, DLAPY2, DZNRM2
       COMPLEX*16         ZDOTC
-      EXTERNAL           LSAME, DLAMCH, DLAPY2, DZNRM2, ZDOTC
+      EXTERNAL           LSAME, DLAMCH, DLAPY2, DZNRM2,
+     $                   ZDOTC
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, XERBLA, ZGEMV, ZLACPY, ZTGEXC, ZTGSYL
+      EXTERNAL           XERBLA, ZGEMV, ZLACPY, ZTGEXC,
+     $                   ZTGSYL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DCMPLX, MAX
@@ -428,7 +429,6 @@ SUBROUTINE ZTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       KS = 0
       DO 20 K = 1, N
 *
@@ -465,7 +465,8 @@ SUBROUTINE ZTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
 *
          IF( WANTDF ) THEN
             IF( N.EQ.1 ) THEN
-               DIF( KS ) = DLAPY2( ABS( A( 1, 1 ) ), ABS( B( 1, 1 ) ) )
+               DIF( KS ) = DLAPY2( ABS( A( 1, 1 ) ), ABS( B( 1,
+     $              1 ) ) )
             ELSE
 *
 *              Estimate the reciprocal condition number of the k-th
@@ -479,7 +480,8 @@ SUBROUTINE ZTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
                IFST = K
                ILST = 1
 *
-               CALL ZTGEXC( .FALSE., .FALSE., N, WORK, N, WORK( N*N+1 ),
+               CALL ZTGEXC( .FALSE., .FALSE., N, WORK, N,
+     $                      WORK( N*N+1 ),
      $                      N, DUMMY, 1, DUMMY1, 1, IFST, ILST, IERR )
 *
                IF( IERR.GT.0 ) THEN
@@ -498,7 +500,8 @@ SUBROUTINE ZTGSNA( JOB, HOWMNY, SELECT, N, A, LDA, B, LDB, VL,
                   N1 = 1
                   N2 = N - N1
                   I = N*N + 1
-                  CALL ZTGSYL( 'N', IDIFJB, N2, N1, WORK( N*N1+N1+1 ),
+                  CALL ZTGSYL( 'N', IDIFJB, N2, N1,
+     $                         WORK( N*N1+N1+1 ),
      $                         N, WORK, N, WORK( N1+1 ), N,
      $                         WORK( N*N1+N1+I ), N, WORK( I ), N,
      $                         WORK( N1+I ), N, SCALE, DIF( KS ), DUMMY,
diff --git a/SRC/ztgsy2.f b/SRC/ztgsy2.f
index ee26b5e7b0..f3ef6909c0 100644
--- a/SRC/ztgsy2.f
+++ b/SRC/ztgsy2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTGSY2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztgsy2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztgsy2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -57,7 +55,7 @@
 *>        Z = [ kron(In, A)  -kron(B**H, Im) ]             (2)
 *>            [ kron(In, D)  -kron(E**H, Im) ],
 *>
-*> Ik is the identity matrix of size k and X**H is the conjuguate transpose of X.
+*> Ik is the identity matrix of size k and X**H is the conjugate transpose of X.
 *> kron(X, Y) is the Kronecker product between the matrices X and Y.
 *>
 *> If TRANS = 'C', y in the conjugate transposed system Z**H*y = scale*b
@@ -244,7 +242,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYauxiliary
+*> \ingroup tgsy2
 *
 *> \par Contributors:
 *  ==================
@@ -253,9 +251,11 @@
 *>     Umea University, S-901 87 Umea, Sweden.
 *
 *  =====================================================================
-      SUBROUTINE ZTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
+      SUBROUTINE ZTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC,
+     $                   D,
      $                   LDD, E, LDE, F, LDF, SCALE, RDSUM, RDSCAL,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -293,7 +293,8 @@ SUBROUTINE ZTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZGESC2, ZGETC2, ZLATDF, ZSCAL
+      EXTERNAL           XERBLA, ZAXPY, ZGESC2, ZGETC2, ZLATDF,
+     $                   ZSCAL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DCMPLX, DCONJG, MAX
@@ -390,8 +391,10 @@ SUBROUTINE ZTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
 *
                IF( I.GT.1 ) THEN
                   ALPHA = -RHS( 1 )
-                  CALL ZAXPY( I-1, ALPHA, A( 1, I ), 1, C( 1, J ), 1 )
-                  CALL ZAXPY( I-1, ALPHA, D( 1, I ), 1, F( 1, J ), 1 )
+                  CALL ZAXPY( I-1, ALPHA, A( 1, I ), 1, C( 1, J ),
+     $                        1 )
+                  CALL ZAXPY( I-1, ALPHA, D( 1, I ), 1, F( 1, J ),
+     $                        1 )
                END IF
                IF( J.LT.N ) THEN
                   CALL ZAXPY( N-J, RHS( 2 ), B( J, J+1 ), LDB,
@@ -435,9 +438,11 @@ SUBROUTINE ZTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                CALL ZGESC2( LDZ, Z, LDZ, RHS, IPIV, JPIV, SCALOC )
                IF( SCALOC.NE.ONE ) THEN
                   DO 40 K = 1, N
-                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), C( 1, K ),
+                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), C( 1,
+     $                           K ),
      $                           1 )
-                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), F( 1, K ),
+                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), F( 1,
+     $                           K ),
      $                           1 )
    40             CONTINUE
                   SCALE = SCALE*SCALOC
diff --git a/SRC/ztgsyl.f b/SRC/ztgsyl.f
index f613671c9c..6c8e31d5f1 100644
--- a/SRC/ztgsyl.f
+++ b/SRC/ztgsyl.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTGSYL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztgsyl.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztgsyl.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -260,7 +258,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup tgsyl
 *
 *> \par Contributors:
 *  ==================
@@ -289,9 +287,11 @@
 *>      July 1989, pp 745-751.
 *>
 *  =====================================================================
-      SUBROUTINE ZTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
+      SUBROUTINE ZTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC,
+     $                   D,
      $                   LDD, E, LDE, F, LDF, SCALE, DIF, WORK, LWORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -332,7 +332,8 @@ SUBROUTINE ZTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZGEMM, ZLACPY, ZLASET, ZSCAL, ZTGSY2
+      EXTERNAL           XERBLA, ZGEMM, ZLACPY, ZLASET, ZSCAL,
+     $                   ZTGSY2
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, DCMPLX, MAX, SQRT
@@ -436,7 +437,8 @@ SUBROUTINE ZTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
             DSCALE = ZERO
             DSUM = ONE
             PQ = M*N
-            CALL ZTGSY2( TRANS, IFUNC, M, N, A, LDA, B, LDB, C, LDC, D,
+            CALL ZTGSY2( TRANS, IFUNC, M, N, A, LDA, B, LDB, C, LDC,
+     $                   D,
      $                   LDD, E, LDE, F, LDF, SCALE, DSUM, DSCALE,
      $                   INFO )
             IF( DSCALE.NE.ZERO ) THEN
@@ -524,7 +526,8 @@ SUBROUTINE ZTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
                   IS = IWORK( I )
                   IE = IWORK( I+1 ) - 1
                   MB = IE - IS + 1
-                  CALL ZTGSY2( TRANS, IFUNC, MB, NB, A( IS, IS ), LDA,
+                  CALL ZTGSY2( TRANS, IFUNC, MB, NB, A( IS, IS ),
+     $                         LDA,
      $                         B( JS, JS ), LDB, C( IS, JS ), LDC,
      $                         D( IS, IS ), LDD, E( JS, JS ), LDE,
      $                         F( IS, JS ), LDF, SCALOC, DSUM, DSCALE,
@@ -633,9 +636,11 @@ SUBROUTINE ZTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
      $            INFO = LINFO
                IF( SCALOC.NE.ONE ) THEN
                   DO 160 K = 1, JS - 1
-                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), C( 1, K ),
+                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), C( 1,
+     $                           K ),
      $                           1 )
-                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), F( 1, K ),
+                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), F( 1,
+     $                           K ),
      $                           1 )
   160             CONTINUE
                   DO 170 K = JS, JE
@@ -651,9 +656,11 @@ SUBROUTINE ZTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
      $                           F( IE+1, K ), 1 )
   180             CONTINUE
                   DO 190 K = JE + 1, N
-                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), C( 1, K ),
+                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), C( 1,
+     $                           K ),
      $                           1 )
-                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), F( 1, K ),
+                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), F( 1,
+     $                           K ),
      $                           1 )
   190             CONTINUE
                   SCALE = SCALE*SCALOC
diff --git a/SRC/ztpcon.f b/SRC/ztpcon.f
index e5d0b071db..272f42cc5f 100644
--- a/SRC/ztpcon.f
+++ b/SRC/ztpcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTPCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztpcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztpcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -122,11 +120,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tpcon
 *
 *  =====================================================================
       SUBROUTINE ZTPCON( NORM, UPLO, DIAG, N, AP, RCOND, WORK, RWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -234,13 +233,15 @@ SUBROUTINE ZTPCON( NORM, UPLO, DIAG, N, AP, RCOND, WORK, RWORK,
 *
 *              Multiply by inv(A).
 *
-               CALL ZLATPS( UPLO, 'No transpose', DIAG, NORMIN, N, AP,
+               CALL ZLATPS( UPLO, 'No transpose', DIAG, NORMIN, N,
+     $                      AP,
      $                      WORK, SCALE, RWORK, INFO )
             ELSE
 *
 *              Multiply by inv(A**H).
 *
-               CALL ZLATPS( UPLO, 'Conjugate transpose', DIAG, NORMIN,
+               CALL ZLATPS( UPLO, 'Conjugate transpose', DIAG,
+     $                      NORMIN,
      $                      N, AP, WORK, SCALE, RWORK, INFO )
             END IF
             NORMIN = 'Y'
diff --git a/SRC/ztplqt.f b/SRC/ztplqt.f
index a27d5e13a4..459da7e588 100644
--- a/SRC/ztplqt.f
+++ b/SRC/ztplqt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTPLQT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztplqt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztplqt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tplqt
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +184,7 @@
 *  =====================================================================
       SUBROUTINE ZTPLQT( M, N, L, MB, A, LDA, B, LDB, T, LDT, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ztplqt2.f b/SRC/ztplqt2.f
index 777e5f57e4..a66322e6e3 100644
--- a/SRC/ztplqt2.f
+++ b/SRC/ztplqt2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTPLQT2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztplqt2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztplqt2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,7 +117,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tplqt2
 *
 *> \par Further Details:
 *  =====================
@@ -174,6 +172,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZTPLQT2( M, N, L, A, LDA, B, LDB, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ztpmlqt.f b/SRC/ztpmlqt.f
index 77927562cd..42980147a5 100644
--- a/SRC/ztpmlqt.f
+++ b/SRC/ztpmlqt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTPMLQT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztpmlqt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztpmlqt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -36,7 +34,7 @@
 *>
 *> \verbatim
 *>
-*> ZTPMLQT applies a complex orthogonal matrix Q obtained from a
+*> ZTPMLQT applies a complex unitary matrix Q obtained from a
 *> "triangular-pentagonal" complex block reflector H to a general
 *> complex matrix C, which consists of two blocks A and B.
 *> \endverbatim
@@ -103,9 +101,7 @@
 *> \param[in] LDV
 *> \verbatim
 *>          LDV is INTEGER
-*>          The leading dimension of the array V.
-*>          If SIDE = 'L', LDV >= max(1,M);
-*>          if SIDE = 'R', LDV >= max(1,N).
+*>          The leading dimension of the array V. LDV >= K.
 *> \endverbatim
 *>
 *> \param[in] T
@@ -135,8 +131,8 @@
 *> \verbatim
 *>          LDA is INTEGER
 *>          The leading dimension of the array A.
-*>          If SIDE = 'L', LDC >= max(1,K);
-*>          If SIDE = 'R', LDC >= max(1,M).
+*>          If SIDE = 'L', LDA >= max(1,K);
+*>          If SIDE = 'R', LDA >= max(1,M).
 *> \endverbatim
 *>
 *> \param[in,out] B
@@ -175,7 +171,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup doubleOTHERcomputational
+*> \ingroup tpmlqt
 *
 *> \par Further Details:
 *  =====================
@@ -199,7 +195,7 @@
 *>
 *>  If SIDE = 'R':  C = [A B]  where A is M-by-K, B is M-by-N and V is K-by-N.
 *>
-*>  The real orthogonal matrix Q is formed from V and T.
+*>  The complex unitary matrix Q is formed from V and T.
 *>
 *>  If TRANS='N' and SIDE='L', C is on exit replaced with Q * C.
 *>
@@ -211,8 +207,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZTPMLQT( SIDE, TRANS, M, N, K, L, MB, V, LDV, T, LDT,
+      SUBROUTINE ZTPMLQT( SIDE, TRANS, M, N, K, L, MB, V, LDV, T,
+     $                    LDT,
      $                    A, LDA, B, LDB, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ztpmqrt.f b/SRC/ztpmqrt.f
index a31bca76fa..74bfde8a8a 100644
--- a/SRC/ztpmqrt.f
+++ b/SRC/ztpmqrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTPMQRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztpmqrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztpmqrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -175,7 +173,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tpmqrt
 *
 *> \par Further Details:
 *  =====================
@@ -211,8 +209,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZTPMQRT( SIDE, TRANS, M, N, K, L, NB, V, LDV, T, LDT,
+      SUBROUTINE ZTPMQRT( SIDE, TRANS, M, N, K, L, NB, V, LDV, T,
+     $                    LDT,
      $                    A, LDA, B, LDB, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ztpqrt.f b/SRC/ztpqrt.f
index 83ff7409cd..3f754f2541 100644
--- a/SRC/ztpqrt.f
+++ b/SRC/ztpqrt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTPQRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztpqrt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztpqrt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -132,7 +130,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tpqrt
 *
 *> \par Further Details:
 *  =====================
@@ -186,6 +184,7 @@
 *  =====================================================================
       SUBROUTINE ZTPQRT( M, N, L, NB, A, LDA, B, LDB, T, LDT, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ztpqrt2.f b/SRC/ztpqrt2.f
index 651ac45337..7d682d870a 100644
--- a/SRC/ztpqrt2.f
+++ b/SRC/ztpqrt2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTPQRT2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztpqrt2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztpqrt2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,7 +117,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tpqrt2
 *
 *> \par Further Details:
 *  =====================
@@ -170,6 +168,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZTPQRT2( M, N, L, A, LDA, B, LDB, T, LDT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ztprfb.f b/SRC/ztprfb.f
index 2edbd05666..67097d6174 100644
--- a/SRC/ztprfb.f
+++ b/SRC/ztprfb.f
@@ -1,11 +1,10 @@
-*> \brief \b ZTPRFB applies a real or complex "triangular-pentagonal" blocked reflector to a real or complex matrix, which is composed of two blocks.
+*> \brief \b ZTPRFB applies a complex "triangular-pentagonal" block reflector to a complex matrix, which is composed of two blocks.
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTPRFB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztprfb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztprfb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -194,7 +192,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup tprfb
 *
 *> \par Further Details:
 *  =====================
@@ -248,6 +246,7 @@
 *  =====================================================================
       SUBROUTINE ZTPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
      $                   V, LDV, T, LDT, A, LDA, B, LDB, WORK, LDWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -432,7 +431,8 @@ SUBROUTINE ZTPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
 *
          CALL ZGEMM( 'N', 'C', M, N-L, K, -ONE, WORK, LDWORK,
      $               V, LDV, ONE, B, LDB )
-         CALL ZGEMM( 'N', 'C', M, L, K-L, -ONE, WORK( 1, KP ), LDWORK,
+         CALL ZGEMM( 'N', 'C', M, L, K-L, -ONE, WORK( 1, KP ),
+     $               LDWORK,
      $               V( NP, KP ), LDV, ONE, B( 1, NP ), LDB )
          CALL ZTRMM( 'R', 'U', 'C', 'N', M, L, ONE, V( NP, 1 ), LDV,
      $               WORK, LDWORK )
@@ -673,7 +673,8 @@ SUBROUTINE ZTPRFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, L,
 *
          CALL ZGEMM( 'N', 'N', M, N-L, K, -ONE, WORK, LDWORK,
      $               V, LDV, ONE, B, LDB )
-         CALL ZGEMM( 'N', 'N', M, L, K-L, -ONE, WORK( 1, KP ), LDWORK,
+         CALL ZGEMM( 'N', 'N', M, L, K-L, -ONE, WORK( 1, KP ),
+     $               LDWORK,
      $               V( KP, NP ), LDV, ONE, B( 1, NP ), LDB )
          CALL ZTRMM( 'R', 'L', 'N', 'N', M, L, ONE, V( 1, NP ), LDV,
      $               WORK, LDWORK )
diff --git a/SRC/ztprfs.f b/SRC/ztprfs.f
index 485694a565..c17102d314 100644
--- a/SRC/ztprfs.f
+++ b/SRC/ztprfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTPRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztprfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztprfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -166,11 +164,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tprfs
 *
 *  =====================================================================
-      SUBROUTINE ZTPRFS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X, LDX,
+      SUBROUTINE ZTPRFS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X,
+     $                   LDX,
      $                   FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -204,7 +204,8 @@ SUBROUTINE ZTPRFS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X, LDX,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZLACN2, ZTPMV, ZTPSV
+      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZLACN2, ZTPMV,
+     $                   ZTPSV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG, MAX
diff --git a/SRC/ztptri.f b/SRC/ztptri.f
index 31284ad637..39999ea26b 100644
--- a/SRC/ztptri.f
+++ b/SRC/ztptri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTPTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztptri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztptri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -91,7 +89,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tptri
 *
 *> \par Further Details:
 *  =====================
@@ -114,6 +112,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZTPTRI( UPLO, DIAG, N, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ztptrs.f b/SRC/ztptrs.f
index 2d7093313a..769de8ff96 100644
--- a/SRC/ztptrs.f
+++ b/SRC/ztptrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTPTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztptrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztptrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -38,9 +36,14 @@
 *>
 *>    A * X = B,  A**T * X = B,  or  A**H * X = B,
 *>
-*> where A is a triangular matrix of order N stored in packed format,
-*> and B is an N-by-NRHS matrix.  A check is made to verify that A is
-*> nonsingular.
+*> where A is a triangular matrix of order N stored in packed format, and B is an N-by-NRHS matrix.
+*>
+*> This subroutine verifies that A is nonsingular, but callers should note that only exact
+*> singularity is detected. It is conceivable for one or more diagonal elements of A to be
+*> subnormally tiny numbers without this subroutine signalling an error.
+*>
+*> If a possible loss of numerical precision due to near-singular matrices is a concern, the
+*> caller should verify that A is nonsingular within some tolerance before calling this subroutine.
 *> \endverbatim
 *
 *  Arguments:
@@ -110,7 +113,7 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the i-th diagonal element of A is zero,
+*>          > 0:  if INFO = i, the i-th diagonal element of A is exactly zero,
 *>                indicating that the matrix is singular and the
 *>                solutions X have not been computed.
 *> \endverbatim
@@ -123,10 +126,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tptrs
 *
 *  =====================================================================
-      SUBROUTINE ZTPTRS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, INFO )
+      SUBROUTINE ZTPTRS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -170,7 +175,8 @@ SUBROUTINE ZTPTRS( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, INFO )
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.
-     $         LSAME( TRANS, 'T' ) .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+     $         LSAME( TRANS, 'T' ) .AND.
+     $                .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -2
       ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
          INFO = -3
diff --git a/SRC/ztpttf.f b/SRC/ztpttf.f
index bdd107d4d7..74ebc0ddff 100644
--- a/SRC/ztpttf.f
+++ b/SRC/ztpttf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTPTTF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztpttf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztpttf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -92,7 +90,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tpttf
 *
 *> \par Further Details:
 *  =====================
@@ -204,6 +202,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZTPTTF( TRANSR, UPLO, N, AP, ARF, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ztpttr.f b/SRC/ztpttr.f
index 1529e0251a..12c1644a4f 100644
--- a/SRC/ztpttr.f
+++ b/SRC/ztpttr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTPTTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztpttr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztpttr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tpttr
 *
 *  =====================================================================
       SUBROUTINE ZTPTTR( UPLO, N, AP, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ztrcon.f b/SRC/ztrcon.f
index 051ab1b7c6..1108061213 100644
--- a/SRC/ztrcon.f
+++ b/SRC/ztrcon.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTRCON + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrcon.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrcon.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -129,11 +127,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup trcon
 *
 *  =====================================================================
       SUBROUTINE ZTRCON( NORM, UPLO, DIAG, N, A, LDA, RCOND, WORK,
      $                   RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -249,7 +248,8 @@ SUBROUTINE ZTRCON( NORM, UPLO, DIAG, N, A, LDA, RCOND, WORK,
 *
 *              Multiply by inv(A**H).
 *
-               CALL ZLATRS( UPLO, 'Conjugate transpose', DIAG, NORMIN,
+               CALL ZLATRS( UPLO, 'Conjugate transpose', DIAG,
+     $                      NORMIN,
      $                      N, A, LDA, WORK, SCALE, RWORK, INFO )
             END IF
             NORMIN = 'Y'
diff --git a/SRC/ztrevc.f b/SRC/ztrevc.f
index 38411757dc..38ea60dbfc 100644
--- a/SRC/ztrevc.f
+++ b/SRC/ztrevc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTREVC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrevc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrevc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -196,7 +194,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup trevc
 *
 *> \par Further Details:
 *  =====================
@@ -213,8 +211,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
+      SUBROUTINE ZTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
+     $                   VR,
      $                   LDVR, MM, M, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -253,7 +253,8 @@ SUBROUTINE ZTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
       EXTERNAL           LSAME, IZAMAX, DLAMCH, DZASUM
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZCOPY, ZDSCAL, ZGEMV, ZLATRS, DLABAD
+      EXTERNAL           XERBLA, ZCOPY, ZDSCAL, ZGEMV,
+     $                   ZLATRS
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, MAX
@@ -319,7 +320,6 @@ SUBROUTINE ZTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Precision' )
       SMLNUM = UNFL*( N / ULP )
 *
@@ -388,7 +388,8 @@ SUBROUTINE ZTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
    60          CONTINUE
             ELSE
                IF( KI.GT.1 )
-     $            CALL ZGEMV( 'N', N, KI-1, CMONE, VR, LDVR, WORK( 1 ),
+     $            CALL ZGEMV( 'N', N, KI-1, CMONE, VR, LDVR,
+     $                        WORK( 1 ),
      $                        1, DCMPLX( SCALE ), VR( 1, KI ), 1 )
 *
                II = IZAMAX( N, VR( 1, KI ), 1 )
@@ -437,7 +438,8 @@ SUBROUTINE ZTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
   100       CONTINUE
 *
             IF( KI.LT.N ) THEN
-               CALL ZLATRS( 'Upper', 'Conjugate transpose', 'Non-unit',
+               CALL ZLATRS( 'Upper', 'Conjugate transpose',
+     $                      'Non-unit',
      $                      'Y', N-KI, T( KI+1, KI+1 ), LDT,
      $                      WORK( KI+1 ), SCALE, RWORK, INFO )
                WORK( KI ) = SCALE
@@ -457,7 +459,8 @@ SUBROUTINE ZTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
   110          CONTINUE
             ELSE
                IF( KI.LT.N )
-     $            CALL ZGEMV( 'N', N, N-KI, CMONE, VL( 1, KI+1 ), LDVL,
+     $            CALL ZGEMV( 'N', N, N-KI, CMONE, VL( 1, KI+1 ),
+     $                        LDVL,
      $                        WORK( KI+1 ), 1, DCMPLX( SCALE ),
      $                        VL( 1, KI ), 1 )
 *
diff --git a/SRC/ztrevc3.f b/SRC/ztrevc3.f
index 6300e80aec..049976919e 100644
--- a/SRC/ztrevc3.f
+++ b/SRC/ztrevc3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTREVC3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrevc3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrevc3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -222,7 +220,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup trevc3
 *
 *> \par Further Details:
 *  =====================
@@ -239,7 +237,8 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
+      SUBROUTINE ZTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
+     $                    VR,
      $                    LDVR, MM, M, WORK, LWORK, RWORK, LRWORK, INFO)
       IMPLICIT NONE
 *
@@ -279,11 +278,13 @@ SUBROUTINE ZTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
       LOGICAL            LSAME
       INTEGER            ILAENV, IZAMAX
       DOUBLE PRECISION   DLAMCH, DZASUM
-      EXTERNAL           LSAME, ILAENV, IZAMAX, DLAMCH, DZASUM
+      EXTERNAL           LSAME, ILAENV, IZAMAX, DLAMCH,
+     $                   DZASUM
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZCOPY, ZDSCAL, ZGEMV, ZLATRS,
-     $                   ZGEMM, DLABAD, ZLASET, ZLACPY
+      EXTERNAL           XERBLA, ZCOPY, ZDSCAL, ZGEMV,
+     $                   ZLATRS,
+     $                   ZGEMM, ZLASET, ZLACPY
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCMPLX, CONJG, DIMAG, MAX
@@ -321,9 +322,9 @@ SUBROUTINE ZTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
       INFO = 0
       NB = ILAENV( 1, 'ZTREVC', SIDE // HOWMNY, N, -1, -1, -1 )
-      MAXWRK = N + 2*N*NB
+      MAXWRK = MAX( 1, N + 2*N*NB )
       WORK(1) = MAXWRK
-      RWORK(1) = N
+      RWORK(1) = MAX( 1, N )
       LQUERY = ( LWORK.EQ.-1 .OR. LRWORK.EQ.-1 )
       IF( .NOT.RIGHTV .AND. .NOT.LEFTV ) THEN
          INFO = -1
@@ -371,7 +372,6 @@ SUBROUTINE ZTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Precision' )
       SMLNUM = UNFL*( N / ULP )
 *
@@ -543,7 +543,8 @@ SUBROUTINE ZTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
   100       CONTINUE
 *
             IF( KI.LT.N ) THEN
-               CALL ZLATRS( 'Upper', 'Conjugate transpose', 'Non-unit',
+               CALL ZLATRS( 'Upper', 'Conjugate transpose',
+     $                      'Non-unit',
      $                      'Y', N-KI, T( KI+1, KI+1 ), LDT,
      $                      WORK( KI+1 + IV*N ), SCALE, RWORK, INFO )
                WORK( KI + IV*N ) = SCALE
@@ -554,7 +555,8 @@ SUBROUTINE ZTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
             IF( .NOT.OVER ) THEN
 *              ------------------------------
 *              no back-transform: copy x to VL and normalize.
-               CALL ZCOPY( N-KI+1, WORK( KI + IV*N ), 1, VL(KI,IS), 1 )
+               CALL ZCOPY( N-KI+1, WORK( KI + IV*N ), 1, VL(KI,IS),
+     $                     1 )
 *
                II = IZAMAX( N-KI+1, VL( KI, IS ), 1 ) + KI - 1
                REMAX = ONE / CABS1( VL( II, IS ) )
@@ -568,7 +570,8 @@ SUBROUTINE ZTREVC3( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *              ------------------------------
 *              version 1: back-transform each vector with GEMV, Q*x.
                IF( KI.LT.N )
-     $            CALL ZGEMV( 'N', N, N-KI, CONE, VL( 1, KI+1 ), LDVL,
+     $            CALL ZGEMV( 'N', N, N-KI, CONE, VL( 1, KI+1 ),
+     $                        LDVL,
      $                        WORK( KI+1 + IV*N ), 1, DCMPLX( SCALE ),
      $                        VL( 1, KI ), 1 )
 *
diff --git a/SRC/ztrexc.f b/SRC/ztrexc.f
index b92e63efa9..b7a1212c7c 100644
--- a/SRC/ztrexc.f
+++ b/SRC/ztrexc.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTREXC + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrexc.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrexc.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -40,7 +38,7 @@
 *>
 *> The Schur form T is reordered by a unitary similarity transformation
 *> Z**H*T*Z, and optionally the matrix Q of Schur vectors is updated by
-*> postmultplying it with Z.
+*> postmultiplying it with Z.
 *> \endverbatim
 *
 *  Arguments:
@@ -119,10 +117,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup trexc
 *
 *  =====================================================================
       SUBROUTINE ZTREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -213,7 +212,8 @@ SUBROUTINE ZTREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, INFO )
 *        Apply transformation to the matrix T.
 *
          IF( K+2.LE.N )
-     $      CALL ZROT( N-K-1, T( K, K+2 ), LDT, T( K+1, K+2 ), LDT, CS,
+     $      CALL ZROT( N-K-1, T( K, K+2 ), LDT, T( K+1, K+2 ), LDT,
+     $                 CS,
      $                 SN )
          CALL ZROT( K-1, T( 1, K ), 1, T( 1, K+1 ), 1, CS,
      $              DCONJG( SN ) )
diff --git a/SRC/ztrrfs.f b/SRC/ztrrfs.f
index 8c1a4c0695..21dd489271 100644
--- a/SRC/ztrrfs.f
+++ b/SRC/ztrrfs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTRRFS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrrfs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrrfs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -174,11 +172,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup trrfs
 *
 *  =====================================================================
-      SUBROUTINE ZTRRFS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB, X,
+      SUBROUTINE ZTRRFS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB,
+     $                   X,
      $                   LDX, FERR, BERR, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -213,7 +213,8 @@ SUBROUTINE ZTRRFS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB, X,
       INTEGER            ISAVE( 3 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZLACN2, ZTRMV, ZTRSV
+      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZLACN2, ZTRMV,
+     $                   ZTRSV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG, MAX
diff --git a/SRC/ztrsen.f b/SRC/ztrsen.f
index 33f7e5b95d..dd319c3722 100644
--- a/SRC/ztrsen.f
+++ b/SRC/ztrsen.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTRSEN + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrsen.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrsen.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -182,7 +180,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup trsen
 *
 *> \par Further Details:
 *  =====================
@@ -259,8 +257,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZTRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, W, M, S,
+      SUBROUTINE ZTRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, W, M,
+     $                   S,
      $                   SEP, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -297,7 +297,8 @@ SUBROUTINE ZTRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, W, M, S,
       EXTERNAL           LSAME, ZLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLACN2, ZLACPY, ZTREXC, ZTRSYL
+      EXTERNAL           XERBLA, ZLACN2, ZLACPY, ZTREXC,
+     $                   ZTRSYL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
diff --git a/SRC/ztrsna.f b/SRC/ztrsna.f
index eaa2ef7175..854f15f1bf 100644
--- a/SRC/ztrsna.f
+++ b/SRC/ztrsna.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTRSNA + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrsna.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrsna.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -197,7 +195,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup trsna
 *
 *> \par Further Details:
 *  =====================
@@ -243,9 +241,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
+      SUBROUTINE ZTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL,
+     $                   VR,
      $                   LDVR, S, SEP, MM, M, WORK, LDWORK, RWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -285,11 +285,12 @@ SUBROUTINE ZTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
       INTEGER            IZAMAX
       DOUBLE PRECISION   DLAMCH, DZNRM2
       COMPLEX*16         ZDOTC
-      EXTERNAL           LSAME, IZAMAX, DLAMCH, DZNRM2, ZDOTC
+      EXTERNAL           LSAME, IZAMAX, DLAMCH, DZNRM2,
+     $                   ZDOTC
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZDRSCL, ZLACN2, ZLACPY, ZLATRS, ZTREXC,
-     $                   DLABAD
+      EXTERNAL           XERBLA, ZDRSCL, ZLACN2, ZLACPY, ZLATRS,
+     $                   ZTREXC
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG, MAX
@@ -368,7 +369,6 @@ SUBROUTINE ZTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
       KS = 1
       DO 50 K = 1, N
@@ -399,7 +399,8 @@ SUBROUTINE ZTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
 *           diagonal element to the (1,1) position.
 *
             CALL ZLACPY( 'Full', N, N, T, LDT, WORK, LDWORK )
-            CALL ZTREXC( 'No Q', N, WORK, LDWORK, DUMMY, 1, K, 1, IERR )
+            CALL ZTREXC( 'No Q', N, WORK, LDWORK, DUMMY, 1, K, 1,
+     $                   IERR )
 *
 *           Form  C = T22 - lambda*I in WORK(2:N,2:N).
 *
@@ -415,7 +416,8 @@ SUBROUTINE ZTRSNA( JOB, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
             KASE = 0
             NORMIN = 'N'
    30       CONTINUE
-            CALL ZLACN2( N-1, WORK( 1, N+1 ), WORK, EST, KASE, ISAVE )
+            CALL ZLACN2( N-1, WORK( 1, N+1 ), WORK, EST, KASE,
+     $                   ISAVE )
 *
             IF( KASE.NE.0 ) THEN
                IF( KASE.EQ.1 ) THEN
diff --git a/SRC/ztrsyl.f b/SRC/ztrsyl.f
index 27e21dd9d6..6e5fe9c646 100644
--- a/SRC/ztrsyl.f
+++ b/SRC/ztrsyl.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTRSYL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrsyl.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrsyl.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -149,11 +147,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16SYcomputational
+*> \ingroup trsyl
 *
 *  =====================================================================
       SUBROUTINE ZTRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
      $                   LDC, SCALE, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,10 +187,11 @@ SUBROUTINE ZTRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
       LOGICAL            LSAME
       DOUBLE PRECISION   DLAMCH, ZLANGE
       COMPLEX*16         ZDOTC, ZDOTU, ZLADIV
-      EXTERNAL           LSAME, DLAMCH, ZLANGE, ZDOTC, ZDOTU, ZLADIV
+      EXTERNAL           LSAME, DLAMCH, ZLANGE, ZDOTC, ZDOTU,
+     $                   ZLADIV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, XERBLA, ZDSCAL
+      EXTERNAL           XERBLA, ZDSCAL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, MAX, MIN
@@ -237,7 +237,6 @@ SUBROUTINE ZTRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       SMLNUM = SMLNUM*DBLE( M*N ) / EPS
       BIGNUM = ONE / SMLNUM
       SMIN = MAX( SMLNUM, EPS*ZLANGE( 'M', M, M, A, LDA, DUM ),
diff --git a/SRC/ztrsyl3.f b/SRC/ztrsyl3.f
new file mode 100644
index 0000000000..0a2fc99dc1
--- /dev/null
+++ b/SRC/ztrsyl3.f
@@ -0,0 +1,1157 @@
+*> \brief \b ZTRSYL3
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZTRSYL3( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB,
+*                           C, LDC, SCALE, SWORK, LDSWORK, INFO )
+*
+*       .. Scalar Arguments ..
+*       CHARACTER          TRANA, TRANB
+*       INTEGER            INFO, ISGN, LDA, LDB, LDC, LDSWORK, M, N
+*       DOUBLE PRECISION   SCALE
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * ), B( LDB, * ), C( LDC, * )
+*       DOUBLE PRECISION   SWORK( LDSWORK, * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*>  ZTRSYL3 solves the complex Sylvester matrix equation:
+*>
+*>     op(A)*X + X*op(B) = scale*C or
+*>     op(A)*X - X*op(B) = scale*C,
+*>
+*>  where op(A) = A or A**H, and  A and B are both upper triangular. A is
+*>  M-by-M and B is N-by-N; the right hand side C and the solution X are
+*>  M-by-N; and scale is an output scale factor, set <= 1 to avoid
+*>  overflow in X.
+*>
+*>  This is the block version of the algorithm.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] TRANA
+*> \verbatim
+*>          TRANA is CHARACTER*1
+*>          Specifies the option op(A):
+*>          = 'N': op(A) = A    (No transpose)
+*>          = 'C': op(A) = A**H (Conjugate transpose)
+*> \endverbatim
+*>
+*> \param[in] TRANB
+*> \verbatim
+*>          TRANB is CHARACTER*1
+*>          Specifies the option op(B):
+*>          = 'N': op(B) = B    (No transpose)
+*>          = 'C': op(B) = B**H (Conjugate transpose)
+*> \endverbatim
+*>
+*> \param[in] ISGN
+*> \verbatim
+*>          ISGN is INTEGER
+*>          Specifies the sign in the equation:
+*>          = +1: solve op(A)*X + X*op(B) = scale*C
+*>          = -1: solve op(A)*X - X*op(B) = scale*C
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The order of the matrix A, and the number of rows in the
+*>          matrices X and C. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix B, and the number of columns in the
+*>          matrices X and C. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,M)
+*>          The upper triangular matrix A.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in] B
+*> \verbatim
+*>          B is COMPLEX*16 array, dimension (LDB,N)
+*>          The upper triangular matrix B.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= max(1,N).
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is COMPLEX*16 array, dimension (LDC,N)
+*>          On entry, the M-by-N right hand side matrix C.
+*>          On exit, C is overwritten by the solution matrix X.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M)
+*> \endverbatim
+*>
+*> \param[out] SCALE
+*> \verbatim
+*>          SCALE is DOUBLE PRECISION
+*>          The scale factor, scale, set <= 1 to avoid overflow in X.
+*> \endverbatim
+*>
+*> \param[out] SWORK
+*> \verbatim
+*>          SWORK is DOUBLE PRECISION array, dimension (MAX(2, ROWS),
+*>          MAX(1,COLS)).
+*>          On exit, if INFO = 0, SWORK(1) returns the optimal value ROWS
+*>          and SWORK(2) returns the optimal COLS.
+*> \endverbatim
+*>
+*> \param[in] LDSWORK
+*> \verbatim
+*>          LDSWORK is INTEGER
+*>          LDSWORK >= MAX(2,ROWS), where ROWS = ((M + NB - 1) / NB + 1)
+*>          and NB is the optimal block size.
+*>
+*>          If LDSWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal dimensions of the SWORK matrix,
+*>          returns these values as the first and second entry of the SWORK
+*>          matrix, and no error message related LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0: successful exit
+*>          < 0: if INFO = -i, the i-th argument had an illegal value
+*>          = 1: A and B have common or very close eigenvalues; perturbed
+*>               values were used to solve the equation (but the matrices
+*>               A and B are unchanged).
+*> \endverbatim
+*
+*> \ingroup trsyl3
+*
+*  =====================================================================
+*  References:
+*   E. S. Quintana-Orti and R. A. Van De Geijn (2003). Formal derivation of
+*   algorithms: The triangular Sylvester equation, ACM Transactions
+*   on Mathematical Software (TOMS), volume 29, pages 218--243.
+*
+*   A. Schwarz and C. C. Kjelgaard Mikkelsen (2020). Robust Task-Parallel
+*   Solution of the Triangular Sylvester Equation. Lecture Notes in
+*   Computer Science, vol 12043, pages 82--92, Springer.
+*
+*  Contributor:
+*   Angelika Schwarz, Umea University, Sweden.
+*
+*  =====================================================================
+      SUBROUTINE ZTRSYL3( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB,
+     $                    C, LDC, SCALE, SWORK, LDSWORK, INFO )
+      IMPLICIT NONE
+*
+*     .. Scalar Arguments ..
+      CHARACTER          TRANA, TRANB
+      INTEGER            INFO, ISGN, LDA, LDB, LDC, LDSWORK, M, N
+      DOUBLE PRECISION   SCALE
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), B( LDB, * ), C( LDC, * )
+      DOUBLE PRECISION   SWORK( LDSWORK, * )
+*     ..
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+      COMPLEX*16         CONE
+      PARAMETER          ( CONE = ( 1.0D0, 0.0D0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            NOTRNA, NOTRNB, LQUERY
+      INTEGER            AWRK, BWRK, I, I1, I2, IINFO, J, J1, J2, JJ,
+     $                   K, K1, K2, L, L1, L2, LL, NBA, NB, NBB
+      DOUBLE PRECISION   ANRM, BIGNUM, BNRM, CNRM, SCAL, SCALOC,
+     $                   SCAMIN, SGN, XNRM, BUF, SMLNUM
+      COMPLEX*16         CSGN
+*     ..
+*     .. Local Arrays ..
+      DOUBLE PRECISION   WNRM( MAX( M, N ) )
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      DOUBLE PRECISION   DLAMCH, DLARMM, ZLANGE
+      EXTERNAL           DLAMCH, DLARMM, ILAENV, LSAME,
+     $                   ZLANGE
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZDSCAL, ZGEMM, ZLASCL,
+     $                   ZTRSYL
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DIMAG, EXPONENT, MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Decode and Test input parameters
+*
+      NOTRNA = LSAME( TRANA, 'N' )
+      NOTRNB = LSAME( TRANB, 'N' )
+*
+*     Use the same block size for all matrices.
+*
+      NB = MAX( 8, ILAENV( 1, 'ZTRSYL', '', M, N, -1, -1) )
+*
+*     Compute number of blocks in A and B
+*
+      NBA = MAX( 1, (M + NB - 1) / NB )
+      NBB = MAX( 1, (N + NB - 1) / NB )
+*
+*     Compute workspace
+*
+      INFO = 0
+      LQUERY = ( LDSWORK.EQ.-1 )
+      IF( LQUERY ) THEN
+         LDSWORK = 2
+         SWORK(1,1) = MAX( NBA, NBB )
+         SWORK(2,1) = 2 * NBB + NBA
+      END IF
+*
+*     Test the input arguments
+*
+      IF( .NOT.NOTRNA .AND. .NOT. LSAME( TRANA, 'C' ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.NOTRNB .AND. .NOT. LSAME( TRANB, 'C' ) ) THEN
+         INFO = -2
+      ELSE IF( ISGN.NE.1 .AND. ISGN.NE.-1 ) THEN
+         INFO = -3
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -5
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -7
+      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+         INFO = -9
+      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
+         INFO = -11
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZTRSYL3', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      SCALE = ONE
+      IF( M.EQ.0 .OR. N.EQ.0 )
+     $   RETURN
+*
+*     Use unblocked code for small problems or if insufficient
+*     workspace is provided
+*
+      IF( MIN( NBA, NBB ).EQ.1 .OR. LDSWORK.LT.MAX( NBA, NBB ) ) THEN
+        CALL ZTRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB,
+     $               C, LDC, SCALE, INFO )
+        RETURN
+      END IF
+*
+*     Set constants to control overflow
+*
+      SMLNUM = DLAMCH( 'S' )
+      BIGNUM = ONE / SMLNUM
+*
+*     Set local scaling factors.
+*
+      DO L = 1, NBB
+         DO K = 1, NBA
+            SWORK( K, L ) = ONE
+         END DO
+      END DO
+*
+*     Fallback scaling factor to prevent flushing of SWORK( K, L ) to zero.
+*     This scaling is to ensure compatibility with TRSYL and may get flushed.
+*
+      BUF = ONE
+*
+*      Compute upper bounds of blocks of A and B
+*
+      AWRK = NBB
+      DO K = 1, NBA
+         K1 = (K - 1) * NB + 1
+         K2 = MIN( K * NB, M ) + 1
+         DO L = K, NBA
+            L1 = (L - 1) * NB + 1
+            L2 = MIN( L * NB, M ) + 1
+            IF( NOTRNA ) THEN
+               SWORK( K, AWRK + L ) = ZLANGE( 'I', K2-K1, L2-L1,
+     $                                        A( K1, L1 ), LDA, WNRM )
+            ELSE
+               SWORK( L, AWRK + K ) = ZLANGE( '1', K2-K1, L2-L1,
+     $                                        A( K1, L1 ), LDA, WNRM )
+            END IF
+         END DO
+      END DO
+      BWRK = NBB + NBA
+      DO K = 1, NBB
+         K1 = (K - 1) * NB + 1
+         K2 = MIN( K * NB, N ) + 1
+         DO L = K, NBB
+            L1 = (L - 1) * NB + 1
+            L2 = MIN( L * NB, N ) + 1
+            IF( NOTRNB ) THEN
+               SWORK( K, BWRK + L ) = ZLANGE( 'I', K2-K1, L2-L1,
+     $                                        B( K1, L1 ), LDB, WNRM )
+            ELSE
+               SWORK( L, BWRK + K ) = ZLANGE( '1', K2-K1, L2-L1,
+     $                                        B( K1, L1 ), LDB, WNRM )
+            END IF
+         END DO
+      END DO
+*
+      SGN = DBLE( ISGN )
+      CSGN = DCMPLX( SGN, ZERO )
+*
+      IF( NOTRNA .AND. NOTRNB ) THEN
+*
+*        Solve    A*X + ISGN*X*B = scale*C.
+*
+*        The (K,L)th block of X is determined starting from
+*        bottom-left corner column by column by
+*
+*         A(K,K)*X(K,L) + ISGN*X(K,L)*B(L,L) = C(K,L) - R(K,L)
+*
+*        Where
+*                  M                         L-1
+*        R(K,L) = SUM [A(K,I)*X(I,L)] + ISGN*SUM [X(K,J)*B(J,L)].
+*                I=K+1                       J=1
+*
+*        Start loop over block rows (index = K) and block columns (index = L)
+*
+         DO K = NBA, 1, -1
+*
+*           K1: row index of the first row in X( K, L )
+*           K2: row index of the first row in X( K+1, L )
+*           so the K2 - K1 is the column count of the block X( K, L )
+*
+            K1 = (K - 1) * NB + 1
+            K2 = MIN( K * NB, M ) + 1
+            DO L = 1, NBB
+*
+*              L1: column index of the first column in X( K, L )
+*              L2: column index of the first column in X( K, L + 1)
+*              so that L2 - L1 is the row count of the block X( K, L )
+*
+               L1 = (L - 1) * NB + 1
+               L2 = MIN( L * NB, N ) + 1
+*
+               CALL ZTRSYL( TRANA, TRANB, ISGN, K2-K1, L2-L1,
+     $                      A( K1, K1 ), LDA,
+     $                      B( L1, L1 ), LDB,
+     $                      C( K1, L1 ), LDC, SCALOC, IINFO )
+               INFO = MAX( INFO, IINFO )
+*
+               IF( SCALOC * SWORK( K, L ) .EQ. ZERO ) THEN
+                  IF( SCALOC .EQ. ZERO ) THEN
+*                    The magnitude of the largest entry of X(K1:K2-1, L1:L2-1)
+*                    is larger than the product of BIGNUM**2 and cannot be
+*                    represented in the form (1/SCALE)*X(K1:K2-1, L1:L2-1).
+*                    Mark the computation as pointless.
+                     BUF = ZERO
+                  ELSE
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                  END IF
+                  DO JJ = 1, NBB
+                     DO LL = 1, NBA
+*                       Bound by BIGNUM to not introduce Inf. The value
+*                       is irrelevant; corresponding entries of the
+*                       solution will be flushed in consistency scaling.
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                     END DO
+                  END DO
+               END IF
+               SWORK( K, L ) = SCALOC * SWORK( K, L )
+               XNRM = ZLANGE( 'I', K2-K1, L2-L1, C( K1, L1 ), LDC,
+     $                        WNRM )
+*
+               DO I = K - 1, 1, -1
+*
+*                 C( I, L ) := C( I, L ) - A( I, K ) * C( K, L )
+*
+                  I1 = (I - 1) * NB + 1
+                  I2 = MIN( I * NB, M ) + 1
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = ZLANGE( 'I', I2-I1, L2-L1, C( I1, L1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( I, L ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( I, L ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  ANRM = SWORK( I, AWRK + K )
+                  SCALOC = DLARMM( ANRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.D0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.D0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( I, L ) and C( K, L ).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                      DO JJ = L1, L2-1
+                         CALL ZDSCAL( K2-K1, SCAL, C( K1, JJ ), 1)
+                      END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( I, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                      DO LL = L1, L2-1
+                         CALL ZDSCAL( I2-I1, SCAL, C( I1, LL ), 1)
+                      END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( I, L ) = SCAMIN * SCALOC
+*
+                  CALL ZGEMM( 'N', 'N', I2-I1, L2-L1, K2-K1, -CONE,
+     $                        A( I1, K1 ), LDA, C( K1, L1 ), LDC,
+     $                        CONE, C( I1, L1 ), LDC )
+*
+               END DO
+*
+               DO J = L + 1, NBB
+*
+*                 C( K, J ) := C( K, J ) - SGN * C( K, L ) * B( L, J )
+*
+                  J1 = (J - 1) * NB + 1
+                  J2 = MIN( J * NB, N ) + 1
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = ZLANGE( 'I', K2-K1, J2-J1, C( K1, J1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( K, J ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( K, J ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  BNRM = SWORK(L, BWRK + J)
+                  SCALOC = DLARMM( BNRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.D0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.D0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( K, J ) and C( K, L).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL ZDSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( K, J ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                      DO JJ = J1, J2-1
+                         CALL ZDSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                      END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( K, J ) = SCAMIN * SCALOC
+*
+                  CALL ZGEMM( 'N', 'N', K2-K1, J2-J1, L2-L1, -CSGN,
+     $                        C( K1, L1 ), LDC, B( L1, J1 ), LDB,
+     $                        CONE, C( K1, J1 ), LDC )
+               END DO
+            END DO
+         END DO
+      ELSE IF( .NOT.NOTRNA .AND. NOTRNB ) THEN
+*
+*        Solve    A**H *X + ISGN*X*B = scale*C.
+*
+*        The (K,L)th block of X is determined starting from
+*        upper-left corner column by column by
+*
+*          A(K,K)**H*X(K,L) + ISGN*X(K,L)*B(L,L) = C(K,L) - R(K,L)
+*
+*        Where
+*                   K-1                        L-1
+*          R(K,L) = SUM [A(I,K)**H*X(I,L)] +ISGN*SUM [X(K,J)*B(J,L)]
+*                   I=1                        J=1
+*
+*        Start loop over block rows (index = K) and block columns (index = L)
+*
+         DO K = 1, NBA
+*
+*           K1: row index of the first row in X( K, L )
+*           K2: row index of the first row in X( K+1, L )
+*           so the K2 - K1 is the column count of the block X( K, L )
+*
+            K1 = (K - 1) * NB + 1
+            K2 = MIN( K * NB, M ) + 1
+            DO L = 1, NBB
+*
+*              L1: column index of the first column in X( K, L )
+*              L2: column index of the first column in X( K, L + 1)
+*              so that L2 - L1 is the row count of the block X( K, L )
+*
+               L1 = (L - 1) * NB + 1
+               L2 = MIN( L * NB, N ) + 1
+*
+               CALL ZTRSYL( TRANA, TRANB, ISGN, K2-K1, L2-L1,
+     $                      A( K1, K1 ), LDA,
+     $                      B( L1, L1 ), LDB,
+     $                      C( K1, L1 ), LDC, SCALOC, IINFO )
+               INFO = MAX( INFO, IINFO )
+*
+               IF( SCALOC * SWORK( K, L ) .EQ. ZERO ) THEN
+                  IF( SCALOC .EQ. ZERO ) THEN
+*                    The magnitude of the largest entry of X(K1:K2-1, L1:L2-1)
+*                    is larger than the product of BIGNUM**2 and cannot be
+*                    represented in the form (1/SCALE)*X(K1:K2-1, L1:L2-1).
+*                    Mark the computation as pointless.
+                     BUF = ZERO
+                  ELSE
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                  END IF
+                  DO JJ = 1, NBB
+                     DO LL = 1, NBA
+*                       Bound by BIGNUM to not introduce Inf. The value
+*                       is irrelevant; corresponding entries of the
+*                       solution will be flushed in consistency scaling.
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                     END DO
+                  END DO
+               END IF
+               SWORK( K, L ) = SCALOC * SWORK( K, L )
+               XNRM = ZLANGE( 'I', K2-K1, L2-L1, C( K1, L1 ), LDC,
+     $                        WNRM )
+*
+               DO I = K + 1, NBA
+*
+*                 C( I, L ) := C( I, L ) - A( K, I )**H * C( K, L )
+*
+                  I1 = (I - 1) * NB + 1
+                  I2 = MIN( I * NB, M ) + 1
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = ZLANGE( 'I', I2-I1, L2-L1, C( I1, L1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( I, L ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( I, L ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  ANRM = SWORK( I, AWRK + K )
+                  SCALOC = DLARMM( ANRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.D0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.D0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to to C( I, L ) and C( K, L).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL ZDSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( I, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL ZDSCAL( I2-I1, SCAL, C( I1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( I, L ) = SCAMIN * SCALOC
+*
+                  CALL ZGEMM( 'C', 'N', I2-I1, L2-L1, K2-K1, -CONE,
+     $                        A( K1, I1 ), LDA, C( K1, L1 ), LDC,
+     $                        CONE, C( I1, L1 ), LDC )
+               END DO
+*
+               DO J = L + 1, NBB
+*
+*                 C( K, J ) := C( K, J ) - SGN * C( K, L ) * B( L, J )
+*
+                  J1 = (J - 1) * NB + 1
+                  J2 = MIN( J * NB, N ) + 1
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = ZLANGE( 'I', K2-K1, J2-J1, C( K1, J1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( K, J ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( K, J ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  BNRM = SWORK( L, BWRK + J )
+                  SCALOC = DLARMM( BNRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.D0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.D0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to to C( K, J ) and C( K, L).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                      DO LL = L1, L2-1
+                         CALL ZDSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                      END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( K, J ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO JJ = J1, J2-1
+                        CALL ZDSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( K, J ) = SCAMIN * SCALOC
+*
+                  CALL ZGEMM( 'N', 'N', K2-K1, J2-J1, L2-L1, -CSGN,
+     $                        C( K1, L1 ), LDC, B( L1, J1 ), LDB,
+     $                        CONE, C( K1, J1 ), LDC )
+               END DO
+            END DO
+         END DO
+      ELSE IF( .NOT.NOTRNA .AND. .NOT.NOTRNB ) THEN
+*
+*        Solve    A**H *X + ISGN*X*B**H = scale*C.
+*
+*        The (K,L)th block of X is determined starting from
+*        top-right corner column by column by
+*
+*           A(K,K)**H*X(K,L) + ISGN*X(K,L)*B(L,L)**H = C(K,L) - R(K,L)
+*
+*        Where
+*                     K-1                          N
+*            R(K,L) = SUM [A(I,K)**H*X(I,L)] + ISGN*SUM [X(K,J)*B(L,J)**H].
+*                     I=1                        J=L+1
+*
+*        Start loop over block rows (index = K) and block columns (index = L)
+*
+         DO K = 1, NBA
+*
+*           K1: row index of the first row in X( K, L )
+*           K2: row index of the first row in X( K+1, L )
+*           so the K2 - K1 is the column count of the block X( K, L )
+*
+            K1 = (K - 1) * NB + 1
+            K2 = MIN( K * NB, M ) + 1
+            DO L = NBB, 1, -1
+*
+*              L1: column index of the first column in X( K, L )
+*              L2: column index of the first column in X( K, L + 1)
+*              so that L2 - L1 is the row count of the block X( K, L )
+*
+               L1 = (L - 1) * NB + 1
+               L2 = MIN( L * NB, N ) + 1
+*
+               CALL ZTRSYL( TRANA, TRANB, ISGN, K2-K1, L2-L1,
+     $                      A( K1, K1 ), LDA,
+     $                      B( L1, L1 ), LDB,
+     $                      C( K1, L1 ), LDC, SCALOC, IINFO )
+               INFO = MAX( INFO, IINFO )
+*
+               IF( SCALOC * SWORK( K, L ) .EQ. ZERO ) THEN
+                  IF( SCALOC .EQ. ZERO ) THEN
+*                    The magnitude of the largest entry of X(K1:K2-1, L1:L2-1)
+*                    is larger than the product of BIGNUM**2 and cannot be
+*                    represented in the form (1/SCALE)*X(K1:K2-1, L1:L2-1).
+*                    Mark the computation as pointless.
+                     BUF = ZERO
+                  ELSE
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                  END IF
+                  DO JJ = 1, NBB
+                     DO LL = 1, NBA
+*                       Bound by BIGNUM to not introduce Inf. The value
+*                       is irrelevant; corresponding entries of the
+*                       solution will be flushed in consistency scaling.
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                     END DO
+                  END DO
+               END IF
+               SWORK( K, L ) = SCALOC * SWORK( K, L )
+               XNRM = ZLANGE( 'I', K2-K1, L2-L1, C( K1, L1 ), LDC,
+     $                        WNRM )
+*
+               DO I = K + 1, NBA
+*
+*                 C( I, L ) := C( I, L ) - A( K, I )**H * C( K, L )
+*
+                  I1 = (I - 1) * NB + 1
+                  I2 = MIN( I * NB, M ) + 1
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = ZLANGE( 'I', I2-I1, L2-L1, C( I1, L1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( I, L ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( I, L ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  ANRM = SWORK( I, AWRK + K )
+                  SCALOC = DLARMM( ANRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.D0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.D0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( I, L ) and C( K, L).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL ZDSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( I, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL ZDSCAL( I2-I1, SCAL, C( I1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( I, L ) = SCAMIN * SCALOC
+*
+                  CALL ZGEMM( 'C', 'N', I2-I1, L2-L1, K2-K1, -CONE,
+     $                        A( K1, I1 ), LDA, C( K1, L1 ), LDC,
+     $                        CONE, C( I1, L1 ), LDC )
+               END DO
+*
+               DO J = 1, L - 1
+*
+*                 C( K, J ) := C( K, J ) - SGN * C( K, L ) * B( J, L )**H
+*
+                  J1 = (J - 1) * NB + 1
+                  J2 = MIN( J * NB, N ) + 1
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = ZLANGE( 'I', K2-K1, J2-J1, C( K1, J1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( K, J ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( K, J ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  BNRM = SWORK( L, BWRK + J )
+                  SCALOC = DLARMM( BNRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.D0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.D0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( K, J ) and C( K, L).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL ZDSCAL( K2-K1, SCAL, C( K1, LL ), 1)
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( K, J ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO JJ = J1, J2-1
+                        CALL ZDSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( K, J ) = SCAMIN * SCALOC
+*
+                  CALL ZGEMM( 'N', 'C', K2-K1, J2-J1, L2-L1, -CSGN,
+     $                        C( K1, L1 ), LDC, B( J1, L1 ), LDB,
+     $                        CONE, C( K1, J1 ), LDC )
+               END DO
+            END DO
+         END DO
+      ELSE IF( NOTRNA .AND. .NOT.NOTRNB ) THEN
+*
+*        Solve    A*X + ISGN*X*B**H = scale*C.
+*
+*        The (K,L)th block of X is determined starting from
+*        bottom-right corner column by column by
+*
+*            A(K,K)*X(K,L) + ISGN*X(K,L)*B(L,L)**H = C(K,L) - R(K,L)
+*
+*        Where
+*                      M                          N
+*            R(K,L) = SUM [A(K,I)*X(I,L)] + ISGN*SUM [X(K,J)*B(L,J)**H].
+*                    I=K+1                      J=L+1
+*
+*        Start loop over block rows (index = K) and block columns (index = L)
+*
+         DO K = NBA, 1, -1
+*
+*           K1: row index of the first row in X( K, L )
+*           K2: row index of the first row in X( K+1, L )
+*           so the K2 - K1 is the column count of the block X( K, L )
+*
+            K1 = (K - 1) * NB + 1
+            K2 = MIN( K * NB, M ) + 1
+            DO L = NBB, 1, -1
+*
+*              L1: column index of the first column in X( K, L )
+*              L2: column index of the first column in X( K, L + 1)
+*              so that L2 - L1 is the row count of the block X( K, L )
+*
+               L1 = (L - 1) * NB + 1
+               L2 = MIN( L * NB, N ) + 1
+*
+               CALL ZTRSYL( TRANA, TRANB, ISGN, K2-K1, L2-L1,
+     $                      A( K1, K1 ), LDA,
+     $                      B( L1, L1 ), LDB,
+     $                      C( K1, L1 ), LDC, SCALOC, IINFO )
+               INFO = MAX( INFO, IINFO )
+*
+               IF( SCALOC * SWORK( K, L ) .EQ. ZERO ) THEN
+                  IF( SCALOC .EQ. ZERO ) THEN
+*                    The magnitude of the largest entry of X(K1:K2-1, L1:L2-1)
+*                    is larger than the product of BIGNUM**2 and cannot be
+*                    represented in the form (1/SCALE)*X(K1:K2-1, L1:L2-1).
+*                    Mark the computation as pointless.
+                     BUF = ZERO
+                  ELSE
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                  END IF
+                  DO JJ = 1, NBB
+                     DO LL = 1, NBA
+*                       Bound by BIGNUM to not introduce Inf. The value
+*                       is irrelevant; corresponding entries of the
+*                       solution will be flushed in consistency scaling.
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                     END DO
+                  END DO
+               END IF
+               SWORK( K, L ) = SCALOC * SWORK( K, L )
+               XNRM = ZLANGE( 'I', K2-K1, L2-L1, C( K1, L1 ), LDC,
+     $                        WNRM )
+*
+               DO I = 1, K - 1
+*
+*                 C( I, L ) := C( I, L ) - A( I, K ) * C( K, L )
+*
+                  I1 = (I - 1) * NB + 1
+                  I2 = MIN( I * NB, M ) + 1
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = ZLANGE( 'I', I2-I1, L2-L1, C( I1, L1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( I, L ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( I, L ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  ANRM = SWORK( I, AWRK + K )
+                  SCALOC = DLARMM( ANRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.D0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.D0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( I, L ) and C( K, L).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL ZDSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( I, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO LL = L1, L2-1
+                        CALL ZDSCAL( I2-I1, SCAL, C( I1, LL ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( I, L ) = SCAMIN * SCALOC
+*
+                  CALL ZGEMM( 'N', 'N', I2-I1, L2-L1, K2-K1, -CONE,
+     $                        A( I1, K1 ), LDA, C( K1, L1 ), LDC,
+     $                        CONE, C( I1, L1 ), LDC )
+*
+               END DO
+*
+               DO J = 1, L - 1
+*
+*                 C( K, J ) := C( K, J ) - SGN * C( K, L ) * B( J, L )**H
+*
+                  J1 = (J - 1) * NB + 1
+                  J2 = MIN( J * NB, N ) + 1
+*
+*                 Compute scaling factor to survive the linear update
+*                 simulating consistent scaling.
+*
+                  CNRM = ZLANGE( 'I', K2-K1, J2-J1, C( K1, J1 ),
+     $                           LDC, WNRM )
+                  SCAMIN = MIN( SWORK( K, J ), SWORK( K, L ) )
+                  CNRM = CNRM * ( SCAMIN / SWORK( K, J ) )
+                  XNRM = XNRM * ( SCAMIN / SWORK( K, L ) )
+                  BNRM = SWORK( L, BWRK + J )
+                  SCALOC = DLARMM( BNRM, XNRM, CNRM )
+                  IF( SCALOC * SCAMIN .EQ. ZERO ) THEN
+*                    Use second scaling factor to prevent flushing to zero.
+                     BUF = BUF*2.D0**EXPONENT( SCALOC )
+                     DO JJ = 1, NBB
+                        DO LL = 1, NBA
+                        SWORK( LL, JJ ) = MIN( BIGNUM,
+     $                     SWORK( LL, JJ ) / 2.D0**EXPONENT( SCALOC ) )
+                        END DO
+                     END DO
+                     SCAMIN = SCAMIN / 2.D0**EXPONENT( SCALOC )
+                     SCALOC = SCALOC / 2.D0**EXPONENT( SCALOC )
+                  END IF
+                  CNRM = CNRM * SCALOC
+                  XNRM = XNRM * SCALOC
+*
+*                 Simultaneously apply the robust update factor and the
+*                 consistency scaling factor to C( K, J ) and C( K, L).
+*
+                  SCAL = ( SCAMIN / SWORK( K, L ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO JJ = L1, L2-1
+                        CALL ZDSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                     END DO
+                  ENDIF
+*
+                  SCAL = ( SCAMIN / SWORK( K, J ) ) * SCALOC
+                  IF( SCAL .NE. ONE ) THEN
+                     DO JJ = J1, J2-1
+                        CALL ZDSCAL( K2-K1, SCAL, C( K1, JJ ), 1 )
+                     END DO
+                  ENDIF
+*
+*                 Record current scaling factor
+*
+                  SWORK( K, L ) = SCAMIN * SCALOC
+                  SWORK( K, J ) = SCAMIN * SCALOC
+*
+                  CALL ZGEMM( 'N', 'C', K2-K1, J2-J1, L2-L1, -CSGN,
+     $                        C( K1, L1 ), LDC, B( J1, L1 ), LDB,
+     $                        CONE, C( K1, J1 ), LDC )
+               END DO
+            END DO
+         END DO
+*
+      END IF
+*
+*     Reduce local scaling factors
+*
+      SCALE = SWORK( 1, 1 )
+      DO K = 1, NBA
+         DO L = 1, NBB
+            SCALE = MIN( SCALE, SWORK( K, L ) )
+         END DO
+      END DO
+      IF( SCALE .EQ. ZERO ) THEN
+*
+*        The magnitude of the largest entry of the solution is larger
+*        than the product of BIGNUM**2 and cannot be represented in the
+*        form (1/SCALE)*X if SCALE is DOUBLE PRECISION. Set SCALE to
+*        zero and give up.
+*
+         SWORK(1,1) = MAX( NBA, NBB )
+         SWORK(2,1) = 2 * NBB + NBA
+         RETURN
+      END IF
+*
+*     Realize consistent scaling
+*
+      DO K = 1, NBA
+         K1 = (K - 1) * NB + 1
+         K2 = MIN( K * NB, M ) + 1
+         DO L = 1, NBB
+            L1 = (L - 1) * NB + 1
+            L2 = MIN( L * NB, N ) + 1
+            SCAL = SCALE / SWORK( K, L )
+            IF( SCAL .NE. ONE ) THEN
+               DO LL = L1, L2-1
+                  CALL ZDSCAL( K2-K1, SCAL, C( K1, LL ), 1 )
+               END DO
+            ENDIF
+         END DO
+      END DO
+*
+      IF( BUF .NE. ONE .AND. BUF.GT.ZERO ) THEN
+*
+*        Decrease SCALE as much as possible.
+*
+         SCALOC = MIN( SCALE / SMLNUM, ONE / BUF )
+         BUF = BUF * SCALOC
+         SCALE = SCALE / SCALOC
+      END IF
+*
+      IF( BUF.NE.ONE .AND. BUF.GT.ZERO ) THEN
+*
+*        In case of overly aggressive scaling during the computation,
+*        flushing of the global scale factor may be prevented by
+*        undoing some of the scaling. This step is to ensure that
+*        this routine flushes only scale factors that TRSYL also
+*        flushes and be usable as a drop-in replacement.
+*
+*        How much can the normwise largest entry be upscaled?
+*
+         SCAL = MAX( ABS( DBLE( C( 1, 1 ) ) ),
+     $               ABS( DIMAG( C ( 1, 1 ) ) ) )
+         DO K = 1, M
+            DO L = 1, N
+               SCAL = MAX( SCAL, ABS( DBLE ( C( K, L ) ) ),
+     $                     ABS( DIMAG ( C( K, L ) ) ) )
+            END DO
+         END DO
+*
+*        Increase BUF as close to 1 as possible and apply scaling.
+*
+         SCALOC = MIN( BIGNUM / SCAL, ONE / BUF )
+         BUF = BUF * SCALOC
+         CALL ZLASCL( 'G', -1, -1, ONE, SCALOC, M, N, C, LDC, IINFO )
+      END IF
+*
+*     Combine with buffer scaling factor. SCALE will be flushed if
+*     BUF is less than one here.
+*
+      SCALE = SCALE * BUF
+*
+*     Restore workspace dimensions
+*
+      SWORK(1,1) = MAX( NBA, NBB )
+      SWORK(2,1) = 2 * NBB + NBA
+*
+      RETURN
+*
+*     End of ZTRSYL3
+*
+      END
diff --git a/SRC/ztrti2.f b/SRC/ztrti2.f
index d9249d21c2..bbee7917d6 100644
--- a/SRC/ztrti2.f
+++ b/SRC/ztrti2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTRTI2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrti2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrti2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -103,10 +101,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup trti2
 *
 *  =====================================================================
       SUBROUTINE ZTRTI2( UPLO, DIAG, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ztrtri.f b/SRC/ztrtri.f
index 6b9134dfb0..445faedbca 100644
--- a/SRC/ztrtri.f
+++ b/SRC/ztrtri.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTRTRI + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrtri.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrtri.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -102,10 +100,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup trtri
 *
 *  =====================================================================
       SUBROUTINE ZTRTRI( UPLO, DIAG, N, A, LDA, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -198,9 +197,11 @@ SUBROUTINE ZTRTRI( UPLO, DIAG, N, A, LDA, INFO )
 *
 *              Compute rows 1:j-1 of current block column
 *
-               CALL ZTRMM( 'Left', 'Upper', 'No transpose', DIAG, J-1,
+               CALL ZTRMM( 'Left', 'Upper', 'No transpose', DIAG,
+     $                     J-1,
      $                     JB, ONE, A, LDA, A( 1, J ), LDA )
-               CALL ZTRSM( 'Right', 'Upper', 'No transpose', DIAG, J-1,
+               CALL ZTRSM( 'Right', 'Upper', 'No transpose', DIAG,
+     $                     J-1,
      $                     JB, -ONE, A( J, J ), LDA, A( 1, J ), LDA )
 *
 *              Compute inverse of current diagonal block
diff --git a/SRC/ztrtrs.f b/SRC/ztrtrs.f
index ad7f965e2f..b51704dd45 100644
--- a/SRC/ztrtrs.f
+++ b/SRC/ztrtrs.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTRTRS + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrtrs.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrtrs.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -39,8 +37,14 @@
 *>
 *>    A * X = B,  A**T * X = B,  or  A**H * X = B,
 *>
-*> where A is a triangular matrix of order N, and B is an N-by-NRHS
-*> matrix.  A check is made to verify that A is nonsingular.
+*> where A is a triangular matrix of order N, and B is an N-by-NRHS matrix.
+*>
+*> This subroutine verifies that A is nonsingular, but callers should note that only exact
+*> singularity is detected. It is conceivable for one or more diagonal elements of A to be
+*> subnormally tiny numbers without this subroutine signalling an error.
+*>
+*> If a possible loss of numerical precision due to near-singular matrices is a concern, the
+*> caller should verify that A is nonsingular within some tolerance before calling this subroutine.
 *> \endverbatim
 *
 *  Arguments:
@@ -119,7 +123,7 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0: if INFO = -i, the i-th argument had an illegal value
-*>          > 0: if INFO = i, the i-th diagonal element of A is zero,
+*>          > 0:  if INFO = i, the i-th diagonal element of A is exactly zero,
 *>               indicating that the matrix is singular and the solutions
 *>               X have not been computed.
 *> \endverbatim
@@ -132,11 +136,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup trtrs
 *
 *  =====================================================================
       SUBROUTINE ZTRTRS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -176,10 +181,12 @@ SUBROUTINE ZTRTRS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB,
 *
       INFO = 0
       NOUNIT = LSAME( DIAG, 'N' )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND.
+     $    .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.
-     $         LSAME( TRANS, 'T' ) .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+     $         LSAME( TRANS, 'T' ) .AND.
+     $                .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -2
       ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
          INFO = -3
diff --git a/SRC/ztrttf.f b/SRC/ztrttf.f
index 277d72456e..d3e701ea7f 100644
--- a/SRC/ztrttf.f
+++ b/SRC/ztrttf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTRTTF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrttf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrttf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -101,7 +99,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup trttf
 *
 *> \par Further Details:
 *  =====================
@@ -213,6 +211,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZTRTTF( TRANSR, UPLO, N, A, LDA, ARF, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ztrttp.f b/SRC/ztrttp.f
index ba9e8ce916..bdbb9af16a 100644
--- a/SRC/ztrttp.f
+++ b/SRC/ztrttp.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTRTTP + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrttp.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrttp.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -97,10 +95,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup trttp
 *
 *  =====================================================================
       SUBROUTINE ZTRTTP( UPLO, N, A, LDA, AP, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/ztzrzf.f b/SRC/ztzrzf.f
index 46d39e749f..8919a0cffe 100644
--- a/SRC/ztzrzf.f
+++ b/SRC/ztzrzf.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZTZRZF + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztzrzf.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztzrzf.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -116,7 +114,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup tzrzf
 *
 *> \par Contributors:
 *  ==================
@@ -148,6 +146,7 @@
 *>
 *  =====================================================================
       SUBROUTINE ZTZRZF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -280,7 +279,8 @@ SUBROUTINE ZTZRZF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *              Form the triangular factor of the block reflector
 *              H = H(i+ib-1) . . . H(i+1) H(i)
 *
-               CALL ZLARZT( 'Backward', 'Rowwise', N-M, IB, A( I, M1 ),
+               CALL ZLARZT( 'Backward', 'Rowwise', N-M, IB, A( I,
+     $                      M1 ),
      $                      LDA, TAU( I ), WORK, LDWORK )
 *
 *              Apply H to A(1:i-1,i:n) from the right
diff --git a/SRC/zunbdb.f b/SRC/zunbdb.f
index 281ec6e45f..e0c8beadec 100644
--- a/SRC/zunbdb.f
+++ b/SRC/zunbdb.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNBDB + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunbdb.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunbdb.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -255,7 +253,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unbdb
 *
 *> \par Further Details:
 *  =====================
@@ -281,9 +279,11 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
+      SUBROUTINE ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12,
+     $                   LDX12,
      $                   X21, LDX21, X22, LDX22, THETA, PHI, TAUP1,
      $                   TAUP2, TAUQ1, TAUQ2, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -315,7 +315,8 @@ SUBROUTINE ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
       DOUBLE PRECISION   Z1, Z2, Z3, Z4
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZAXPY, ZLARF, ZLARFGP, ZSCAL, XERBLA
+      EXTERNAL           ZAXPY, ZLARF1F, ZLARFGP, ZSCAL,
+     $                   XERBLA
       EXTERNAL           ZLACGV
 *
 *     ..
@@ -406,9 +407,11 @@ SUBROUTINE ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
      $                     0.0D0 ), X12(I,I-1), 1, X11(I,I), 1 )
             END IF
             IF( I .EQ. 1 ) THEN
-               CALL ZSCAL( M-P-I+1, DCMPLX( Z2, 0.0D0 ), X21(I,I), 1 )
+               CALL ZSCAL( M-P-I+1, DCMPLX( Z2, 0.0D0 ), X21(I,I),
+     $                     1 )
             ELSE
-               CALL ZSCAL( M-P-I+1, DCMPLX( Z2*COS(PHI(I-1)), 0.0D0 ),
+               CALL ZSCAL( M-P-I+1, DCMPLX( Z2*COS(PHI(I-1)),
+     $                     0.0D0 ),
      $                     X21(I,I), 1 )
                CALL ZAXPY( M-P-I+1, DCMPLX( -Z2*Z3*Z4*SIN(PHI(I-1)),
      $                     0.0D0 ), X22(I,I-1), 1, X21(I,I), 1 )
@@ -418,11 +421,11 @@ SUBROUTINE ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
      $                 DZNRM2( P-I+1, X11(I,I), 1 ) )
 *
             IF( P .GT. I ) THEN
-               CALL ZLARFGP( P-I+1, X11(I,I), X11(I+1,I), 1, TAUP1(I) )
+               CALL ZLARFGP( P-I+1, X11(I,I), X11(I+1,I), 1,
+     $                       TAUP1(I) )
             ELSE IF ( P .EQ. I ) THEN
                CALL ZLARFGP( P-I+1, X11(I,I), X11(I,I), 1, TAUP1(I) )
             END IF
-            X11(I,I) = ONE
             IF ( M-P .GT. I ) THEN
                CALL ZLARFGP( M-P-I+1, X21(I,I), X21(I+1,I), 1,
      $                       TAUP2(I) )
@@ -430,30 +433,34 @@ SUBROUTINE ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL ZLARFGP( M-P-I+1, X21(I,I), X21(I,I), 1,
      $                       TAUP2(I) )
             END IF
-            X21(I,I) = ONE
 *
             IF ( Q .GT. I ) THEN
-               CALL ZLARF( 'L', P-I+1, Q-I, X11(I,I), 1,
-     $                     DCONJG(TAUP1(I)), X11(I,I+1), LDX11, WORK )
-               CALL ZLARF( 'L', M-P-I+1, Q-I, X21(I,I), 1,
-     $                     DCONJG(TAUP2(I)), X21(I,I+1), LDX21, WORK )
+               CALL ZLARF1F( 'L', P-I+1, Q-I, X11(I,I), 1,
+     $                       CONJG(TAUP1(I)), X11(I,I+1), LDX11,
+     $                       WORK )
+               CALL ZLARF1F( 'L', M-P-I+1, Q-I, X21(I,I), 1,
+     $                       CONJG(TAUP2(I)), X21(I,I+1), LDX21,
+     $                       WORK )
             END IF
             IF ( M-Q+1 .GT. I ) THEN
-               CALL ZLARF( 'L', P-I+1, M-Q-I+1, X11(I,I), 1,
-     $                     DCONJG(TAUP1(I)), X12(I,I), LDX12, WORK )
-               CALL ZLARF( 'L', M-P-I+1, M-Q-I+1, X21(I,I), 1,
-     $                     DCONJG(TAUP2(I)), X22(I,I), LDX22, WORK )
+               CALL ZLARF1F( 'L', P-I+1, M-Q-I+1, X11(I,I), 1,
+     $                       CONJG(TAUP1(I)), X12(I,I), LDX12, WORK )
+               CALL ZLARF1F( 'L', M-P-I+1, M-Q-I+1, X21(I,I), 1,
+     $                       CONJG(TAUP2(I)), X22(I,I), LDX22, WORK )
             END IF
 *
             IF( I .LT. Q ) THEN
-               CALL ZSCAL( Q-I, DCMPLX( -Z1*Z3*SIN(THETA(I)), 0.0D0 ),
+               CALL ZSCAL( Q-I, DCMPLX( -Z1*Z3*SIN(THETA(I)),
+     $                     0.0D0 ),
      $                     X11(I,I+1), LDX11 )
                CALL ZAXPY( Q-I, DCMPLX( Z2*Z3*COS(THETA(I)), 0.0D0 ),
      $                     X21(I,I+1), LDX21, X11(I,I+1), LDX11 )
             END IF
-            CALL ZSCAL( M-Q-I+1, DCMPLX( -Z1*Z4*SIN(THETA(I)), 0.0D0 ),
+            CALL ZSCAL( M-Q-I+1, DCMPLX( -Z1*Z4*SIN(THETA(I)),
+     $                  0.0D0 ),
      $                  X12(I,I), LDX12 )
-            CALL ZAXPY( M-Q-I+1, DCMPLX( Z2*Z4*COS(THETA(I)), 0.0D0 ),
+            CALL ZAXPY( M-Q-I+1, DCMPLX( Z2*Z4*COS(THETA(I)),
+     $                  0.0D0 ),
      $                  X22(I,I), LDX22, X12(I,I), LDX12 )
 *
             IF( I .LT. Q )
@@ -469,7 +476,6 @@ SUBROUTINE ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                   CALL ZLARFGP( Q-I, X11(I,I+1), X11(I,I+2), LDX11,
      $                          TAUQ1(I) )
                END IF
-               X11(I,I+1) = ONE
             END IF
             IF ( M-Q+1 .GT. I ) THEN
                CALL ZLACGV( M-Q-I+1, X12(I,I), LDX12 )
@@ -481,21 +487,23 @@ SUBROUTINE ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
      $                          TAUQ2(I) )
                END IF
             END IF
-            X12(I,I) = ONE
 *
             IF( I .LT. Q ) THEN
-               CALL ZLARF( 'R', P-I, Q-I, X11(I,I+1), LDX11, TAUQ1(I),
-     $                     X11(I+1,I+1), LDX11, WORK )
-               CALL ZLARF( 'R', M-P-I, Q-I, X11(I,I+1), LDX11, TAUQ1(I),
-     $                     X21(I+1,I+1), LDX21, WORK )
+               CALL ZLARF1F( 'R', P-I, Q-I, X11(I,I+1), LDX11,
+     $                       TAUQ1(I),
+     $                       X11(I+1,I+1), LDX11, WORK )
+               CALL ZLARF1F( 'R', M-P-I, Q-I, X11(I,I+1), LDX11,
+     $                       TAUQ1(I),
+     $                       X21(I+1,I+1), LDX21, WORK )
             END IF
             IF ( P .GT. I ) THEN
-               CALL ZLARF( 'R', P-I, M-Q-I+1, X12(I,I), LDX12, TAUQ2(I),
-     $                     X12(I+1,I), LDX12, WORK )
+               CALL ZLARF1F( 'R', P-I, M-Q-I+1, X12(I,I), LDX12,
+     $                       TAUQ2(I),
+     $                       X12(I+1,I), LDX12, WORK )
             END IF
             IF ( M-P .GT. I ) THEN
-               CALL ZLARF( 'R', M-P-I, M-Q-I+1, X12(I,I), LDX12,
-     $                     TAUQ2(I), X22(I+1,I), LDX22, WORK )
+               CALL ZLARF1F( 'R', M-P-I, M-Q-I+1, X12(I,I), LDX12,
+     $                       TAUQ2(I), X22(I+1,I), LDX22, WORK )
             END IF
 *
             IF( I .LT. Q )
@@ -518,15 +526,15 @@ SUBROUTINE ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL ZLARFGP( M-Q-I+1, X12(I,I), X12(I,I+1), LDX12,
      $                       TAUQ2(I) )
             END IF
-            X12(I,I) = ONE
 *
             IF ( P .GT. I ) THEN
-               CALL ZLARF( 'R', P-I, M-Q-I+1, X12(I,I), LDX12, TAUQ2(I),
-     $                     X12(I+1,I), LDX12, WORK )
+               CALL ZLARF1F( 'R', P-I, M-Q-I+1, X12(I,I), LDX12,
+     $                       TAUQ2(I),
+     $                       X12(I+1,I), LDX12, WORK )
             END IF
             IF( M-P-Q .GE. 1 )
-     $         CALL ZLARF( 'R', M-P-Q, M-Q-I+1, X12(I,I), LDX12,
-     $                     TAUQ2(I), X22(Q+1,I), LDX22, WORK )
+     $         CALL ZLARF1F( 'R', M-P-Q, M-Q-I+1, X12(I,I), LDX12,
+     $                       TAUQ2(I), X22(Q+1,I), LDX22, WORK )
 *
             CALL ZLACGV( M-Q-I+1, X12(I,I), LDX12 )
 *
@@ -541,9 +549,9 @@ SUBROUTINE ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
             CALL ZLACGV( M-P-Q-I+1, X22(Q+I,P+I), LDX22 )
             CALL ZLARFGP( M-P-Q-I+1, X22(Q+I,P+I), X22(Q+I,P+I+1),
      $                    LDX22, TAUQ2(P+I) )
-            X22(Q+I,P+I) = ONE
-            CALL ZLARF( 'R', M-P-Q-I, M-P-Q-I+1, X22(Q+I,P+I), LDX22,
-     $                  TAUQ2(P+I), X22(Q+I+1,P+I), LDX22, WORK )
+            CALL ZLARF1F( 'R', M-P-Q-I, M-P-Q-I+1, X22(Q+I,P+I),
+     $                    LDX22, TAUQ2(P+I), X22(Q+I+1,P+I), LDX22,
+     $                    WORK )
 *
             CALL ZLACGV( M-P-Q-I+1, X22(Q+I,P+I), LDX22 )
 *
@@ -568,7 +576,8 @@ SUBROUTINE ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL ZSCAL( M-P-I+1, DCMPLX( Z2, 0.0D0 ), X21(I,I),
      $                     LDX21 )
             ELSE
-               CALL ZSCAL( M-P-I+1, DCMPLX( Z2*COS(PHI(I-1)), 0.0D0 ),
+               CALL ZSCAL( M-P-I+1, DCMPLX( Z2*COS(PHI(I-1)),
+     $                     0.0D0 ),
      $                     X21(I,I), LDX21 )
                CALL ZAXPY( M-P-I+1, DCMPLX( -Z2*Z3*Z4*SIN(PHI(I-1)),
      $                     0.0D0 ), X22(I-1,I), LDX22, X21(I,I), LDX21 )
@@ -580,8 +589,8 @@ SUBROUTINE ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
             CALL ZLACGV( P-I+1, X11(I,I), LDX11 )
             CALL ZLACGV( M-P-I+1, X21(I,I), LDX21 )
 *
-            CALL ZLARFGP( P-I+1, X11(I,I), X11(I,I+1), LDX11, TAUP1(I) )
-            X11(I,I) = ONE
+            CALL ZLARFGP( P-I+1, X11(I,I), X11(I,I+1), LDX11,
+     $                    TAUP1(I) )
             IF ( I .EQ. M-P ) THEN
                CALL ZLARFGP( M-P-I+1, X21(I,I), X21(I,I), LDX21,
      $                       TAUP2(I) )
@@ -589,29 +598,32 @@ SUBROUTINE ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
                CALL ZLARFGP( M-P-I+1, X21(I,I), X21(I,I+1), LDX21,
      $                       TAUP2(I) )
             END IF
-            X21(I,I) = ONE
 *
-            CALL ZLARF( 'R', Q-I, P-I+1, X11(I,I), LDX11, TAUP1(I),
-     $                  X11(I+1,I), LDX11, WORK )
-            CALL ZLARF( 'R', M-Q-I+1, P-I+1, X11(I,I), LDX11, TAUP1(I),
-     $                  X12(I,I), LDX12, WORK )
-            CALL ZLARF( 'R', Q-I, M-P-I+1, X21(I,I), LDX21, TAUP2(I),
-     $                  X21(I+1,I), LDX21, WORK )
-            CALL ZLARF( 'R', M-Q-I+1, M-P-I+1, X21(I,I), LDX21,
-     $                  TAUP2(I), X22(I,I), LDX22, WORK )
+            CALL ZLARF1F( 'R', Q-I, P-I+1, X11(I,I), LDX11, TAUP1(I),
+     $                    X11(I+1,I), LDX11, WORK )
+            CALL ZLARF1F( 'R', M-Q-I+1, P-I+1, X11(I,I), LDX11,
+     $                    TAUP1(I),
+     $                    X12(I,I), LDX12, WORK )
+            CALL ZLARF1F( 'R', Q-I, M-P-I+1, X21(I,I), LDX21,
+     $                    TAUP2(I), X21(I+1,I), LDX21, WORK )
+            CALL ZLARF1F( 'R', M-Q-I+1, M-P-I+1, X21(I,I), LDX21,
+     $                    TAUP2(I), X22(I,I), LDX22, WORK )
 *
             CALL ZLACGV( P-I+1, X11(I,I), LDX11 )
             CALL ZLACGV( M-P-I+1, X21(I,I), LDX21 )
 *
             IF( I .LT. Q ) THEN
-               CALL ZSCAL( Q-I, DCMPLX( -Z1*Z3*SIN(THETA(I)), 0.0D0 ),
+               CALL ZSCAL( Q-I, DCMPLX( -Z1*Z3*SIN(THETA(I)),
+     $                     0.0D0 ),
      $                     X11(I+1,I), 1 )
                CALL ZAXPY( Q-I, DCMPLX( Z2*Z3*COS(THETA(I)), 0.0D0 ),
      $                     X21(I+1,I), 1, X11(I+1,I), 1 )
             END IF
-            CALL ZSCAL( M-Q-I+1, DCMPLX( -Z1*Z4*SIN(THETA(I)), 0.0D0 ),
+            CALL ZSCAL( M-Q-I+1, DCMPLX( -Z1*Z4*SIN(THETA(I)),
+     $                  0.0D0 ),
      $                  X12(I,I), 1 )
-            CALL ZAXPY( M-Q-I+1, DCMPLX( Z2*Z4*COS(THETA(I)), 0.0D0 ),
+            CALL ZAXPY( M-Q-I+1, DCMPLX( Z2*Z4*COS(THETA(I)),
+     $                  0.0D0 ),
      $                  X22(I,I), 1, X12(I,I), 1 )
 *
             IF( I .LT. Q )
@@ -619,23 +631,28 @@ SUBROUTINE ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
      $                  DZNRM2( M-Q-I+1, X12(I,I), 1 ) )
 *
             IF( I .LT. Q ) THEN
-               CALL ZLARFGP( Q-I, X11(I+1,I), X11(I+2,I), 1, TAUQ1(I) )
-               X11(I+1,I) = ONE
+               CALL ZLARFGP( Q-I, X11(I+1,I), X11(I+2,I), 1,
+     $                       TAUQ1(I) )
             END IF
-            CALL ZLARFGP( M-Q-I+1, X12(I,I), X12(I+1,I), 1, TAUQ2(I) )
-            X12(I,I) = ONE
+            CALL ZLARFGP( M-Q-I+1, X12(I,I), X12(I+1,I), 1,
+     $                    TAUQ2(I) )
 *
             IF( I .LT. Q ) THEN
-               CALL ZLARF( 'L', Q-I, P-I, X11(I+1,I), 1,
-     $                     DCONJG(TAUQ1(I)), X11(I+1,I+1), LDX11, WORK )
-               CALL ZLARF( 'L', Q-I, M-P-I, X11(I+1,I), 1,
-     $                     DCONJG(TAUQ1(I)), X21(I+1,I+1), LDX21, WORK )
+               CALL ZLARF1F( 'L', Q-I, P-I, X11(I+1,I), 1,
+     $                       CONJG(TAUQ1(I)), X11(I+1,I+1), LDX11,
+     $                       WORK )
+               CALL ZLARF1F( 'L', Q-I, M-P-I, X11(I+1,I), 1,
+     $                       CONJG(TAUQ1(I)), X21(I+1,I+1), LDX21,
+     $                       WORK )
             END IF
-            CALL ZLARF( 'L', M-Q-I+1, P-I, X12(I,I), 1,
-     $                  DCONJG(TAUQ2(I)), X12(I,I+1), LDX12, WORK )
+            CALL ZLARF1F( 'L', M-Q-I+1, P-I, X12(I,I), 1,
+     $                    CONJG(TAUQ2(I)),
+     $                    X12(I,I+1), LDX12, WORK )
+
             IF ( M-P .GT. I ) THEN
-               CALL ZLARF( 'L', M-Q-I+1, M-P-I, X12(I,I), 1,
-     $                     DCONJG(TAUQ2(I)), X22(I,I+1), LDX22, WORK )
+               CALL ZLARF1F( 'L', M-Q-I+1, M-P-I, X12(I,I), 1,
+     $                       CONJG(TAUQ2(I)), X22(I,I+1), LDX22,
+     $                       WORK )
             END IF
 *
          END DO
@@ -644,17 +661,20 @@ SUBROUTINE ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
 *
          DO I = Q + 1, P
 *
-            CALL ZSCAL( M-Q-I+1, DCMPLX( -Z1*Z4, 0.0D0 ), X12(I,I), 1 )
-            CALL ZLARFGP( M-Q-I+1, X12(I,I), X12(I+1,I), 1, TAUQ2(I) )
-            X12(I,I) = ONE
+            CALL ZSCAL( M-Q-I+1, DCMPLX( -Z1*Z4, 0.0D0 ), X12(I,I),
+     $                  1 )
+            CALL ZLARFGP( M-Q-I+1, X12(I,I), X12(I+1,I), 1,
+     $                    TAUQ2(I) )
 *
             IF ( P .GT. I ) THEN
-               CALL ZLARF( 'L', M-Q-I+1, P-I, X12(I,I), 1,
-     $                     DCONJG(TAUQ2(I)), X12(I,I+1), LDX12, WORK )
+               CALL ZLARF1F( 'L', M-Q-I+1, P-I, X12(I,I), 1,
+     $                       CONJG(TAUQ2(I)), X12(I,I+1), LDX12,
+     $                       WORK )
             END IF
             IF( M-P-Q .GE. 1 )
-     $         CALL ZLARF( 'L', M-Q-I+1, M-P-Q, X12(I,I), 1,
-     $                     DCONJG(TAUQ2(I)), X22(I,Q+1), LDX22, WORK )
+     $         CALL ZLARF1F( 'L', M-Q-I+1, M-P-Q, X12(I,I), 1,
+     $                       CONJG(TAUQ2(I)), X22(I,Q+1), LDX22,
+     $                       WORK )
 *
          END DO
 *
@@ -666,12 +686,10 @@ SUBROUTINE ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
      $                  X22(P+I,Q+I), 1 )
             CALL ZLARFGP( M-P-Q-I+1, X22(P+I,Q+I), X22(P+I+1,Q+I), 1,
      $                    TAUQ2(P+I) )
-            X22(P+I,Q+I) = ONE
-*
             IF ( M-P-Q .NE. I ) THEN
-               CALL ZLARF( 'L', M-P-Q-I+1, M-P-Q-I, X22(P+I,Q+I), 1,
-     $                     DCONJG(TAUQ2(P+I)), X22(P+I,Q+I+1), LDX22,
-     $                     WORK )
+               CALL ZLARF1F( 'L', M-P-Q-I+1, M-P-Q-I, X22(P+I,Q+I),
+     $                       1, CONJG(TAUQ2(P+I)), X22(P+I,Q+I+1),
+     $                       LDX22, WORK )
             END IF
 *
          END DO
diff --git a/SRC/zunbdb1.f b/SRC/zunbdb1.f
index 767788a74d..d1e1933176 100644
--- a/SRC/zunbdb1.f
+++ b/SRC/zunbdb1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNBDB1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunbdb1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunbdb1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,7 @@
 *>\verbatim
 *>
 *> ZUNBDB1 simultaneously bidiagonalizes the blocks of a tall and skinny
-*> matrix X with orthonomal columns:
+*> matrix X with orthonormal columns:
 *>
 *>                            [ B11 ]
 *>      [ X11 ]   [ P1 |    ] [  0  ]
@@ -174,7 +172,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unbdb1
 *
 *> \par Further Details:
 *  =====================
@@ -198,8 +196,10 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE ZUNBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
+      SUBROUTINE ZUNBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    PHI,
      $                    TAUP1, TAUP2, TAUQ1, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -227,7 +227,8 @@ SUBROUTINE ZUNBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       LOGICAL            LQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZLARF, ZLARFGP, ZUNBDB5, ZDROT, XERBLA
+      EXTERNAL           ZLARF1F, ZLARFGP, ZUNBDB5, ZDROT,
+     $                   XERBLA
       EXTERNAL           ZLACGV
 *     ..
 *     .. External Functions ..
@@ -286,27 +287,29 @@ SUBROUTINE ZUNBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
          THETA(I) = ATAN2( DBLE( X21(I,I) ), DBLE( X11(I,I) ) )
          C = COS( THETA(I) )
          S = SIN( THETA(I) )
-         X11(I,I) = ONE
-         X21(I,I) = ONE
-         CALL ZLARF( 'L', P-I+1, Q-I, X11(I,I), 1, DCONJG(TAUP1(I)),
-     $               X11(I,I+1), LDX11, WORK(ILARF) )
-         CALL ZLARF( 'L', M-P-I+1, Q-I, X21(I,I), 1, DCONJG(TAUP2(I)),
-     $               X21(I,I+1), LDX21, WORK(ILARF) )
+         C = COS( THETA(I) )
+         S = SIN( THETA(I) )
+         CALL ZLARF1F( 'L', P-I+1, Q-I, X11(I,I), 1, CONJG(TAUP1(I)),
+     $                 X11(I,I+1), LDX11, WORK(ILARF) )
+         CALL ZLARF1F( 'L', M-P-I+1, Q-I, X21(I,I), 1,
+     $                 CONJG(TAUP2(I)), X21(I,I+1), LDX21,
+     $                 WORK(ILARF) )
 *
          IF( I .LT. Q ) THEN
             CALL ZDROT( Q-I, X11(I,I+1), LDX11, X21(I,I+1), LDX21, C,
      $                  S )
             CALL ZLACGV( Q-I, X21(I,I+1), LDX21 )
-            CALL ZLARFGP( Q-I, X21(I,I+1), X21(I,I+2), LDX21, TAUQ1(I) )
+            CALL ZLARFGP( Q-I, X21(I,I+1), X21(I,I+2), LDX21,
+     $                    TAUQ1(I) )
             S = DBLE( X21(I,I+1) )
-            X21(I,I+1) = ONE
-            CALL ZLARF( 'R', P-I, Q-I, X21(I,I+1), LDX21, TAUQ1(I),
-     $                  X11(I+1,I+1), LDX11, WORK(ILARF) )
-            CALL ZLARF( 'R', M-P-I, Q-I, X21(I,I+1), LDX21, TAUQ1(I),
-     $                  X21(I+1,I+1), LDX21, WORK(ILARF) )
+            CALL ZLARF1F( 'R', P-I, Q-I, X21(I,I+1), LDX21, TAUQ1(I),
+     $                    X11(I+1,I+1), LDX11, WORK(ILARF) )
+            CALL ZLARF1F( 'R', M-P-I, Q-I, X21(I,I+1), LDX21,
+     $                    TAUQ1(I), X21(I+1,I+1), LDX21,
+     $                    WORK(ILARF) )
             CALL ZLACGV( Q-I, X21(I,I+1), LDX21 )
             C = SQRT( DZNRM2( P-I, X11(I+1,I+1), 1 )**2
-     $          + DZNRM2( M-P-I, X21(I+1,I+1), 1 )**2 )
+     $              + DZNRM2( M-P-I, X21(I+1,I+1), 1 )**2 )
             PHI(I) = ATAN2( S, C )
             CALL ZUNBDB5( P-I, M-P-I, Q-I-1, X11(I+1,I+1), 1,
      $                    X21(I+1,I+1), 1, X11(I+1,I+2), LDX11,
diff --git a/SRC/zunbdb2.f b/SRC/zunbdb2.f
index 412d8d8d08..f8bc474f3e 100644
--- a/SRC/zunbdb2.f
+++ b/SRC/zunbdb2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNBDB2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunbdb2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunbdb2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,7 @@
 *>\verbatim
 *>
 *> ZUNBDB2 simultaneously bidiagonalizes the blocks of a tall and skinny
-*> matrix X with orthonomal columns:
+*> matrix X with orthonormal columns:
 *>
 *>                            [ B11 ]
 *>      [ X11 ]   [ P1 |    ] [  0  ]
@@ -122,14 +120,14 @@
 *>
 *> \param[out] TAUP1
 *> \verbatim
-*>          TAUP1 is COMPLEX*16 array, dimension (P)
+*>          TAUP1 is COMPLEX*16 array, dimension (P-1)
 *>           The scalar factors of the elementary reflectors that define
 *>           P1.
 *> \endverbatim
 *>
 *> \param[out] TAUP2
 *> \verbatim
-*>          TAUP2 is COMPLEX*16 array, dimension (M-P)
+*>          TAUP2 is COMPLEX*16 array, dimension (Q)
 *>           The scalar factors of the elementary reflectors that define
 *>           P2.
 *> \endverbatim
@@ -172,7 +170,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unbdb2
 *
 *> \par Further Details:
 *  =====================
@@ -196,8 +194,10 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE ZUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
+      SUBROUTINE ZUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    PHI,
      $                    TAUP1, TAUP2, TAUQ1, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -226,7 +226,8 @@ SUBROUTINE ZUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       LOGICAL            LQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZLARF, ZLARFGP, ZUNBDB5, ZDROT, ZSCAL, ZLACGV,
+      EXTERNAL           ZLARF1F, ZLARFGP, ZUNBDB5, ZDROT, ZSCAL,
+     $                   ZLACGV,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
@@ -287,11 +288,10 @@ SUBROUTINE ZUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
          CALL ZLACGV( Q-I+1, X11(I,I), LDX11 )
          CALL ZLARFGP( Q-I+1, X11(I,I), X11(I,I+1), LDX11, TAUQ1(I) )
          C = DBLE( X11(I,I) )
-         X11(I,I) = ONE
-         CALL ZLARF( 'R', P-I, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
-     $               X11(I+1,I), LDX11, WORK(ILARF) )
-         CALL ZLARF( 'R', M-P-I+1, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
-     $               X21(I,I), LDX21, WORK(ILARF) )
+         CALL ZLARF1F( 'R', P-I, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
+     $                 X11(I+1,I), LDX11, WORK(ILARF) )
+         CALL ZLARF1F( 'R', M-P-I+1, Q-I+1, X11(I,I), LDX11,
+     $                 TAUQ1(I), X21(I,I), LDX21, WORK(ILARF) )
          CALL ZLACGV( Q-I+1, X11(I,I), LDX11 )
          S = SQRT( DZNRM2( P-I, X11(I+1,I), 1 )**2
      $           + DZNRM2( M-P-I+1, X21(I,I), 1 )**2 )
@@ -307,13 +307,13 @@ SUBROUTINE ZUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
             PHI(I) = ATAN2( DBLE( X11(I+1,I) ), DBLE( X21(I,I) ) )
             C = COS( PHI(I) )
             S = SIN( PHI(I) )
-            X11(I+1,I) = ONE
-            CALL ZLARF( 'L', P-I, Q-I, X11(I+1,I), 1, DCONJG(TAUP1(I)),
-     $                  X11(I+1,I+1), LDX11, WORK(ILARF) )
+            CALL ZLARF1F( 'L', P-I, Q-I, X11(I+1,I), 1,
+     $                    CONJG(TAUP1(I)),
+     $                    X11(I+1,I+1), LDX11, WORK(ILARF) )
          END IF
-         X21(I,I) = ONE
-         CALL ZLARF( 'L', M-P-I+1, Q-I, X21(I,I), 1, DCONJG(TAUP2(I)),
-     $               X21(I,I+1), LDX21, WORK(ILARF) )
+         CALL ZLARF1F( 'L', M-P-I+1, Q-I, X21(I,I), 1,
+     $                 CONJG(TAUP2(I)), X21(I,I+1), LDX21,
+     $                 WORK(ILARF) )
 *
       END DO
 *
@@ -321,9 +321,9 @@ SUBROUTINE ZUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *
       DO I = P + 1, Q
          CALL ZLARFGP( M-P-I+1, X21(I,I), X21(I+1,I), 1, TAUP2(I) )
-         X21(I,I) = ONE
-         CALL ZLARF( 'L', M-P-I+1, Q-I, X21(I,I), 1, DCONJG(TAUP2(I)),
-     $               X21(I,I+1), LDX21, WORK(ILARF) )
+         CALL ZLARF1F( 'L', M-P-I+1, Q-I, X21(I,I), 1,
+     $                 CONJG(TAUP2(I)), X21(I,I+1), LDX21,
+     $                 WORK(ILARF) )
       END DO
 *
       RETURN
diff --git a/SRC/zunbdb3.f b/SRC/zunbdb3.f
index 74083e41a9..f7a9768946 100644
--- a/SRC/zunbdb3.f
+++ b/SRC/zunbdb3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNBDB3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunbdb3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunbdb3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -37,7 +35,7 @@
 *>\verbatim
 *>
 *> ZUNBDB3 simultaneously bidiagonalizes the blocks of a tall and skinny
-*> matrix X with orthonomal columns:
+*> matrix X with orthonormal columns:
 *>
 *>                            [ B11 ]
 *>      [ X11 ]   [ P1 |    ] [  0  ]
@@ -172,7 +170,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unbdb3
 *
 *> \par Further Details:
 *  =====================
@@ -196,8 +194,10 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE ZUNBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
+      SUBROUTINE ZUNBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    PHI,
      $                    TAUP1, TAUP2, TAUQ1, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -225,7 +225,8 @@ SUBROUTINE ZUNBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       LOGICAL            LQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZLARF, ZLARFGP, ZUNBDB5, ZDROT, ZLACGV, XERBLA
+      EXTERNAL           ZLARF1F, ZLARFGP, ZUNBDB5, ZDROT, ZLACGV,
+     $                   XERBLA
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION   DZNRM2
@@ -283,14 +284,12 @@ SUBROUTINE ZUNBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
      $                  S )
          END IF
 *
-         CALL ZLACGV( Q-I+1, X21(I,I), LDX21 )
          CALL ZLARFGP( Q-I+1, X21(I,I), X21(I,I+1), LDX21, TAUQ1(I) )
          S = DBLE( X21(I,I) )
-         X21(I,I) = ONE
-         CALL ZLARF( 'R', P-I+1, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
-     $               X11(I,I), LDX11, WORK(ILARF) )
-         CALL ZLARF( 'R', M-P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
-     $               X21(I+1,I), LDX21, WORK(ILARF) )
+         CALL ZLARF1F( 'R', P-I+1, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
+     $                 X11(I,I), LDX11, WORK(ILARF) )
+         CALL ZLARF1F( 'R', M-P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
+     $                 X21(I+1,I), LDX21, WORK(ILARF) )
          CALL ZLACGV( Q-I+1, X21(I,I), LDX21 )
          C = SQRT( DZNRM2( P-I+1, X11(I,I), 1 )**2
      $           + DZNRM2( M-P-I, X21(I+1,I), 1 )**2 )
@@ -301,28 +300,25 @@ SUBROUTINE ZUNBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
      $                 WORK(IORBDB5), LORBDB5, CHILDINFO )
          CALL ZLARFGP( P-I+1, X11(I,I), X11(I+1,I), 1, TAUP1(I) )
          IF( I .LT. M-P ) THEN
-            CALL ZLARFGP( M-P-I, X21(I+1,I), X21(I+2,I), 1, TAUP2(I) )
+            CALL ZLARFGP( M-P-I, X21(I+1,I), X21(I+2,I), 1,
+     $                    TAUP2(I) )
             PHI(I) = ATAN2( DBLE( X21(I+1,I) ), DBLE( X11(I,I) ) )
             C = COS( PHI(I) )
             S = SIN( PHI(I) )
-            X21(I+1,I) = ONE
-            CALL ZLARF( 'L', M-P-I, Q-I, X21(I+1,I), 1,
-     $                  DCONJG(TAUP2(I)), X21(I+1,I+1), LDX21,
-     $                  WORK(ILARF) )
+            CALL ZLARF1F( 'L', M-P-I, Q-I, X21(I+1,I), 1,
+     $                    CONJG(TAUP2(I)),
+     $                    X21(I+1,I+1), LDX21, WORK(ILARF) )
          END IF
-         X11(I,I) = ONE
-         CALL ZLARF( 'L', P-I+1, Q-I, X11(I,I), 1, DCONJG(TAUP1(I)),
-     $               X11(I,I+1), LDX11, WORK(ILARF) )
-*
+         CALL ZLARF1F( 'L', P-I+1, Q-I, X11(I,I), 1, CONJG(TAUP1(I)),
+     $                 X11(I,I+1), LDX11, WORK(ILARF) )
       END DO
 *
 *     Reduce the bottom-right portion of X11 to the identity matrix
 *
       DO I = M-P + 1, Q
          CALL ZLARFGP( P-I+1, X11(I,I), X11(I+1,I), 1, TAUP1(I) )
-         X11(I,I) = ONE
-         CALL ZLARF( 'L', P-I+1, Q-I, X11(I,I), 1, DCONJG(TAUP1(I)),
-     $               X11(I,I+1), LDX11, WORK(ILARF) )
+         CALL ZLARF1F( 'L', P-I+1, Q-I, X11(I,I), 1, CONJG(TAUP1(I)),
+     $                 X11(I,I+1), LDX11, WORK(ILARF) )
       END DO
 *
       RETURN
diff --git a/SRC/zunbdb4.f b/SRC/zunbdb4.f
index b1fcd8bd03..31d8ec40b7 100644
--- a/SRC/zunbdb4.f
+++ b/SRC/zunbdb4.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNBDB4 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunbdb4.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunbdb4.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -38,7 +36,7 @@
 *>\verbatim
 *>
 *> ZUNBDB4 simultaneously bidiagonalizes the blocks of a tall and skinny
-*> matrix X with orthonomal columns:
+*> matrix X with orthonormal columns:
 *>
 *>                            [ B11 ]
 *>      [ X11 ]   [ P1 |    ] [  0  ]
@@ -124,14 +122,14 @@
 *>
 *> \param[out] TAUP1
 *> \verbatim
-*>          TAUP1 is COMPLEX*16 array, dimension (P)
+*>          TAUP1 is COMPLEX*16 array, dimension (M-Q)
 *>           The scalar factors of the elementary reflectors that define
 *>           P1.
 *> \endverbatim
 *>
 *> \param[out] TAUP2
 *> \verbatim
-*>          TAUP2 is COMPLEX*16 array, dimension (M-P)
+*>          TAUP2 is COMPLEX*16 array, dimension (M-Q)
 *>           The scalar factors of the elementary reflectors that define
 *>           P2.
 *> \endverbatim
@@ -183,7 +181,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unbdb4
 *
 *> \par Further Details:
 *  =====================
@@ -207,9 +205,11 @@
 *>      Algorithms, 50(1):33-65, 2009.
 *>
 *  =====================================================================
-      SUBROUTINE ZUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
+      SUBROUTINE ZUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    PHI,
      $                    TAUP1, TAUP2, TAUQ1, PHANTOM, WORK, LWORK,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -238,7 +238,8 @@ SUBROUTINE ZUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       LOGICAL            LQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZLARF, ZLARFGP, ZUNBDB5, ZDROT, ZSCAL, ZLACGV,
+      EXTERNAL           ZLARF1F, ZLARFGP, ZUNBDB5, ZDROT, ZSCAL,
+     $                   ZLACGV,
      $                   XERBLA
 *     ..
 *     .. External Functions ..
@@ -302,44 +303,45 @@ SUBROUTINE ZUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
      $                    LORBDB5, CHILDINFO )
             CALL ZSCAL( P, NEGONE, PHANTOM(1), 1 )
             CALL ZLARFGP( P, PHANTOM(1), PHANTOM(2), 1, TAUP1(1) )
-            CALL ZLARFGP( M-P, PHANTOM(P+1), PHANTOM(P+2), 1, TAUP2(1) )
+            CALL ZLARFGP( M-P, PHANTOM(P+1), PHANTOM(P+2), 1,
+     $                    TAUP2(1) )
             THETA(I) = ATAN2( DBLE( PHANTOM(1) ), DBLE( PHANTOM(P+1) ) )
             C = COS( THETA(I) )
             S = SIN( THETA(I) )
-            PHANTOM(1) = ONE
-            PHANTOM(P+1) = ONE
-            CALL ZLARF( 'L', P, Q, PHANTOM(1), 1, DCONJG(TAUP1(1)), X11,
-     $                  LDX11, WORK(ILARF) )
-            CALL ZLARF( 'L', M-P, Q, PHANTOM(P+1), 1, DCONJG(TAUP2(1)),
-     $                  X21, LDX21, WORK(ILARF) )
+            CALL ZLARF1F( 'L', P, Q, PHANTOM(1), 1, CONJG(TAUP1(1)),
+     $                    X11,
+     $                    LDX11, WORK(ILARF) )
+            CALL ZLARF1F( 'L', M-P, Q, PHANTOM(P+1), 1,
+     $                    CONJG(TAUP2(1)),
+     $                    X21, LDX21, WORK(ILARF) )
          ELSE
             CALL ZUNBDB5( P-I+1, M-P-I+1, Q-I+1, X11(I,I-1), 1,
      $                    X21(I,I-1), 1, X11(I,I), LDX11, X21(I,I),
      $                    LDX21, WORK(IORBDB5), LORBDB5, CHILDINFO )
             CALL ZSCAL( P-I+1, NEGONE, X11(I,I-1), 1 )
-            CALL ZLARFGP( P-I+1, X11(I,I-1), X11(I+1,I-1), 1, TAUP1(I) )
+            CALL ZLARFGP( P-I+1, X11(I,I-1), X11(I+1,I-1), 1,
+     $                    TAUP1(I) )
             CALL ZLARFGP( M-P-I+1, X21(I,I-1), X21(I+1,I-1), 1,
      $                    TAUP2(I) )
             THETA(I) = ATAN2( DBLE( X11(I,I-1) ), DBLE( X21(I,I-1) ) )
             C = COS( THETA(I) )
             S = SIN( THETA(I) )
-            X11(I,I-1) = ONE
-            X21(I,I-1) = ONE
-            CALL ZLARF( 'L', P-I+1, Q-I+1, X11(I,I-1), 1,
-     $                  DCONJG(TAUP1(I)), X11(I,I), LDX11, WORK(ILARF) )
-            CALL ZLARF( 'L', M-P-I+1, Q-I+1, X21(I,I-1), 1,
-     $                  DCONJG(TAUP2(I)), X21(I,I), LDX21, WORK(ILARF) )
+            CALL ZLARF1F( 'L', P-I+1, Q-I+1, X11(I,I-1), 1,
+     $                    CONJG(TAUP1(I)), X11(I,I), LDX11,
+     $                    WORK(ILARF) )
+            CALL ZLARF1F( 'L', M-P-I+1, Q-I+1, X21(I,I-1), 1,
+     $                    CONJG(TAUP2(I)), X21(I,I), LDX21,
+     $                    WORK(ILARF) )
          END IF
 *
          CALL ZDROT( Q-I+1, X11(I,I), LDX11, X21(I,I), LDX21, S, -C )
          CALL ZLACGV( Q-I+1, X21(I,I), LDX21 )
          CALL ZLARFGP( Q-I+1, X21(I,I), X21(I,I+1), LDX21, TAUQ1(I) )
          C = DBLE( X21(I,I) )
-         X21(I,I) = ONE
-         CALL ZLARF( 'R', P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
-     $               X11(I+1,I), LDX11, WORK(ILARF) )
-         CALL ZLARF( 'R', M-P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
-     $               X21(I+1,I), LDX21, WORK(ILARF) )
+         CALL ZLARF1F( 'R', P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
+     $                 X11(I+1,I), LDX11, WORK(ILARF) )
+         CALL ZLARF1F( 'R', M-P-I, Q-I+1, X21(I,I), LDX21, TAUQ1(I),
+     $                 X21(I+1,I), LDX21, WORK(ILARF) )
          CALL ZLACGV( Q-I+1, X21(I,I), LDX21 )
          IF( I .LT. M-Q ) THEN
             S = SQRT( DZNRM2( P-I, X11(I+1,I), 1 )**2
@@ -354,11 +356,10 @@ SUBROUTINE ZUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
       DO I = M - Q + 1, P
          CALL ZLACGV( Q-I+1, X11(I,I), LDX11 )
          CALL ZLARFGP( Q-I+1, X11(I,I), X11(I,I+1), LDX11, TAUQ1(I) )
-         X11(I,I) = ONE
-         CALL ZLARF( 'R', P-I, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
-     $               X11(I+1,I), LDX11, WORK(ILARF) )
-         CALL ZLARF( 'R', Q-P, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
-     $               X21(M-Q+1,I), LDX21, WORK(ILARF) )
+         CALL ZLARF1F( 'R', P-I, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
+     $                 X11(I+1,I), LDX11, WORK(ILARF) )
+         CALL ZLARF1F( 'R', Q-P, Q-I+1, X11(I,I), LDX11, TAUQ1(I),
+     $                 X21(M-Q+1,I), LDX21, WORK(ILARF) )
          CALL ZLACGV( Q-I+1, X11(I,I), LDX11 )
       END DO
 *
@@ -366,11 +367,12 @@ SUBROUTINE ZUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, PHI,
 *
       DO I = P + 1, Q
          CALL ZLACGV( Q-I+1, X21(M-Q+I-P,I), LDX21 )
-         CALL ZLARFGP( Q-I+1, X21(M-Q+I-P,I), X21(M-Q+I-P,I+1), LDX21,
+         CALL ZLARFGP( Q-I+1, X21(M-Q+I-P,I), X21(M-Q+I-P,I+1),
+     $                 LDX21,
      $                 TAUQ1(I) )
-         X21(M-Q+I-P,I) = ONE
-         CALL ZLARF( 'R', Q-I, Q-I+1, X21(M-Q+I-P,I), LDX21, TAUQ1(I),
-     $               X21(M-Q+I-P+1,I), LDX21, WORK(ILARF) )
+         CALL ZLARF1F( 'R', Q-I, Q-I+1, X21(M-Q+I-P,I), LDX21,
+     $                 TAUQ1(I),
+     $                 X21(M-Q+I-P+1,I), LDX21, WORK(ILARF) )
          CALL ZLACGV( Q-I+1, X21(M-Q+I-P,I), LDX21 )
       END DO
 *
diff --git a/SRC/zunbdb5.f b/SRC/zunbdb5.f
index 23174fe502..89424cdf1b 100644
--- a/SRC/zunbdb5.f
+++ b/SRC/zunbdb5.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNBDB5 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunbdb5.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunbdb5.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -148,11 +146,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unbdb5
 *
 *  =====================================================================
-      SUBROUTINE ZUNBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
+      SUBROUTINE ZUNBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1,
+     $                    Q2,
      $                    LDQ2, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -169,18 +169,21 @@ SUBROUTINE ZUNBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
 *  =====================================================================
 *
 *     .. Parameters ..
+      DOUBLE PRECISION   REALZERO
+      PARAMETER          ( REALZERO = 0.0D0 )
       COMPLEX*16         ONE, ZERO
       PARAMETER          ( ONE = (1.0D0,0.0D0), ZERO = (0.0D0,0.0D0) )
 *     ..
 *     .. Local Scalars ..
       INTEGER            CHILDINFO, I, J
+      DOUBLE PRECISION   EPS, NORM, SCL, SSQ
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZUNBDB6, XERBLA
+      EXTERNAL           ZLASSQ, ZUNBDB6, ZSCAL, XERBLA
 *     ..
 *     .. External Functions ..
-      DOUBLE PRECISION   DZNRM2
-      EXTERNAL           DZNRM2
+      DOUBLE PRECISION   DLAMCH, DZNRM2
+      EXTERNAL           DLAMCH, DZNRM2
 *     ..
 *     .. Intrinsic Function ..
       INTRINSIC          MAX
@@ -213,16 +216,33 @@ SUBROUTINE ZUNBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
          RETURN
       END IF
 *
-*     Project X onto the orthogonal complement of Q
+      EPS = DLAMCH( 'Precision' )
 *
-      CALL ZUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2, LDQ2,
-     $              WORK, LWORK, CHILDINFO )
+*     Project X onto the orthogonal complement of Q if X is nonzero
 *
-*     If the projection is nonzero, then return
+      SCL = REALZERO
+      SSQ = REALZERO
+      CALL ZLASSQ( M1, X1, INCX1, SCL, SSQ )
+      CALL ZLASSQ( M2, X2, INCX2, SCL, SSQ )
+      NORM = SCL * SQRT( SSQ )
 *
-      IF( DZNRM2(M1,X1,INCX1) .NE. ZERO
-     $    .OR. DZNRM2(M2,X2,INCX2) .NE. ZERO ) THEN
-         RETURN
+      IF( NORM .GT. N * EPS ) THEN
+*        Scale vector to unit norm to avoid problems in the caller code.
+*        Computing the reciprocal is undesirable but
+*         * xLASCL cannot be used because of the vector increments and
+*         * the round-off error has a negligible impact on
+*           orthogonalization.
+         CALL ZSCAL( M1, ONE / NORM, X1, INCX1 )
+         CALL ZSCAL( M2, ONE / NORM, X2, INCX2 )
+         CALL ZUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
+     $              LDQ2, WORK, LWORK, CHILDINFO )
+*
+*        If the projection is nonzero, then return
+*
+         IF( DZNRM2(M1,X1,INCX1) .NE. REALZERO
+     $       .OR. DZNRM2(M2,X2,INCX2) .NE. REALZERO ) THEN
+            RETURN
+         END IF
       END IF
 *
 *     Project each standard basis vector e_1,...,e_M1 in turn, stopping
@@ -238,8 +258,8 @@ SUBROUTINE ZUNBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
          END DO
          CALL ZUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
      $                 LDQ2, WORK, LWORK, CHILDINFO )
-         IF( DZNRM2(M1,X1,INCX1) .NE. ZERO
-     $       .OR. DZNRM2(M2,X2,INCX2) .NE. ZERO ) THEN
+         IF( DZNRM2(M1,X1,INCX1) .NE. REALZERO
+     $       .OR. DZNRM2(M2,X2,INCX2) .NE. REALZERO ) THEN
             RETURN
          END IF
       END DO
@@ -257,8 +277,8 @@ SUBROUTINE ZUNBDB5( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
          X2(I) = ONE
          CALL ZUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
      $                 LDQ2, WORK, LWORK, CHILDINFO )
-         IF( DZNRM2(M1,X1,INCX1) .NE. ZERO
-     $       .OR. DZNRM2(M2,X2,INCX2) .NE. ZERO ) THEN
+         IF( DZNRM2(M1,X1,INCX1) .NE. REALZERO
+     $       .OR. DZNRM2(M2,X2,INCX2) .NE. REALZERO ) THEN
             RETURN
          END IF
       END DO
diff --git a/SRC/zunbdb6.f b/SRC/zunbdb6.f
index ec681b597a..0d83cf5194 100644
--- a/SRC/zunbdb6.f
+++ b/SRC/zunbdb6.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNBDB6 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunbdb6.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunbdb6.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -41,10 +39,15 @@
 *> with respect to the columns of
 *>      Q = [ Q1 ] .
 *>          [ Q2 ]
-*> The columns of Q must be orthonormal.
+*> The columns of Q must be orthonormal. The orthogonalized vector will
+*> be zero if and only if it lies entirely in the range of Q.
 *>
-*> If the projection is zero according to Kahan's "twice is enough"
-*> criterion, then the zero vector is returned.
+*> The projection is computed with at most two iterations of the
+*> classical Gram-Schmidt algorithm, see
+*> * L. Giraud, J. Langou, M. Rozložník. "On the round-off error
+*>   analysis of the Gram-Schmidt algorithm with reorthogonalization."
+*>   2002. CERFACS Technical Report No. TR/PA/02/33. URL:
+*>   https://www.cerfacs.fr/algor/reports/2002/TR_PA_02_33.pdf
 *>
 *>\endverbatim
 *
@@ -146,11 +149,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unbdb6
 *
 *  =====================================================================
-      SUBROUTINE ZUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
+      SUBROUTINE ZUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1,
+     $                    Q2,
      $                    LDQ2, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -167,16 +172,19 @@ SUBROUTINE ZUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
 *  =====================================================================
 *
 *     .. Parameters ..
-      DOUBLE PRECISION   ALPHASQ, REALONE, REALZERO
-      PARAMETER          ( ALPHASQ = 0.01D0, REALONE = 1.0D0,
+      DOUBLE PRECISION   ALPHA, REALONE, REALZERO
+      PARAMETER          ( ALPHA = 0.83D0, REALONE = 1.0D0,
      $                     REALZERO = 0.0D0 )
       COMPLEX*16         NEGONE, ONE, ZERO
       PARAMETER          ( NEGONE = (-1.0D0,0.0D0), ONE = (1.0D0,0.0D0),
      $                     ZERO = (0.0D0,0.0D0) )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I
-      DOUBLE PRECISION   NORMSQ1, NORMSQ2, SCL1, SCL2, SSQ1, SSQ2
+      INTEGER            I, IX
+      DOUBLE PRECISION   EPS, NORM, NORM_NEW, SCL, SSQ
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ZGEMV, ZLASSQ, XERBLA
@@ -211,55 +219,63 @@ SUBROUTINE ZUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
          CALL XERBLA( 'ZUNBDB6', -INFO )
          RETURN
       END IF
+*
+      EPS = DLAMCH( 'Precision' )
+*
+*     Compute the Euclidean norm of X
+*
+      SCL = REALZERO
+      SSQ = REALZERO
+      CALL ZLASSQ( M1, X1, INCX1, SCL, SSQ )
+      CALL ZLASSQ( M2, X2, INCX2, SCL, SSQ )
+      NORM = SCL * SQRT( SSQ )
 *
 *     First, project X onto the orthogonal complement of Q's column
 *     space
-*
-      SCL1 = REALZERO
-      SSQ1 = REALONE
-      CALL ZLASSQ( M1, X1, INCX1, SCL1, SSQ1 )
-      SCL2 = REALZERO
-      SSQ2 = REALONE
-      CALL ZLASSQ( M2, X2, INCX2, SCL2, SSQ2 )
-      NORMSQ1 = SCL1**2*SSQ1 + SCL2**2*SSQ2
 *
       IF( M1 .EQ. 0 ) THEN
          DO I = 1, N
             WORK(I) = ZERO
          END DO
       ELSE
-         CALL ZGEMV( 'C', M1, N, ONE, Q1, LDQ1, X1, INCX1, ZERO, WORK,
+         CALL ZGEMV( 'C', M1, N, ONE, Q1, LDQ1, X1, INCX1, ZERO,
+     $               WORK,
      $               1 )
       END IF
 *
-      CALL ZGEMV( 'C', M2, N, ONE, Q2, LDQ2, X2, INCX2, ONE, WORK, 1 )
+      CALL ZGEMV( 'C', M2, N, ONE, Q2, LDQ2, X2, INCX2, ONE, WORK,
+     $            1 )
 *
       CALL ZGEMV( 'N', M1, N, NEGONE, Q1, LDQ1, WORK, 1, ONE, X1,
      $            INCX1 )
       CALL ZGEMV( 'N', M2, N, NEGONE, Q2, LDQ2, WORK, 1, ONE, X2,
      $            INCX2 )
 *
-      SCL1 = REALZERO
-      SSQ1 = REALONE
-      CALL ZLASSQ( M1, X1, INCX1, SCL1, SSQ1 )
-      SCL2 = REALZERO
-      SSQ2 = REALONE
-      CALL ZLASSQ( M2, X2, INCX2, SCL2, SSQ2 )
-      NORMSQ2 = SCL1**2*SSQ1 + SCL2**2*SSQ2
+      SCL = REALZERO
+      SSQ = REALZERO
+      CALL ZLASSQ( M1, X1, INCX1, SCL, SSQ )
+      CALL ZLASSQ( M2, X2, INCX2, SCL, SSQ )
+      NORM_NEW = SCL * SQRT(SSQ)
 *
 *     If projection is sufficiently large in norm, then stop.
 *     If projection is zero, then stop.
 *     Otherwise, project again.
 *
-      IF( NORMSQ2 .GE. ALPHASQ*NORMSQ1 ) THEN
+      IF( NORM_NEW .GE. ALPHA * NORM ) THEN
          RETURN
       END IF
 *
-      IF( NORMSQ2 .EQ. ZERO ) THEN
+      IF( NORM_NEW .LE. N * EPS * NORM ) THEN
+         DO IX = 1, 1 + (M1-1)*INCX1, INCX1
+           X1( IX ) = ZERO
+         END DO
+         DO IX = 1, 1 + (M2-1)*INCX2, INCX2
+           X2( IX ) = ZERO
+         END DO
          RETURN
       END IF
 *
-      NORMSQ1 = NORMSQ2
+      NORM = NORM_NEW
 *
       DO I = 1, N
          WORK(I) = ZERO
@@ -270,35 +286,35 @@ SUBROUTINE ZUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
             WORK(I) = ZERO
          END DO
       ELSE
-         CALL ZGEMV( 'C', M1, N, ONE, Q1, LDQ1, X1, INCX1, ZERO, WORK,
+         CALL ZGEMV( 'C', M1, N, ONE, Q1, LDQ1, X1, INCX1, ZERO,
+     $               WORK,
      $               1 )
       END IF
 *
-      CALL ZGEMV( 'C', M2, N, ONE, Q2, LDQ2, X2, INCX2, ONE, WORK, 1 )
+      CALL ZGEMV( 'C', M2, N, ONE, Q2, LDQ2, X2, INCX2, ONE, WORK,
+     $            1 )
 *
       CALL ZGEMV( 'N', M1, N, NEGONE, Q1, LDQ1, WORK, 1, ONE, X1,
      $            INCX1 )
       CALL ZGEMV( 'N', M2, N, NEGONE, Q2, LDQ2, WORK, 1, ONE, X2,
      $            INCX2 )
 *
-      SCL1 = REALZERO
-      SSQ1 = REALONE
-      CALL ZLASSQ( M1, X1, INCX1, SCL1, SSQ1 )
-      SCL2 = REALZERO
-      SSQ2 = REALONE
-      CALL ZLASSQ( M1, X1, INCX1, SCL1, SSQ1 )
-      NORMSQ2 = SCL1**2*SSQ1 + SCL2**2*SSQ2
+      SCL = REALZERO
+      SSQ = REALZERO
+      CALL ZLASSQ( M1, X1, INCX1, SCL, SSQ )
+      CALL ZLASSQ( M2, X2, INCX2, SCL, SSQ )
+      NORM_NEW = SCL * SQRT(SSQ)
 *
 *     If second projection is sufficiently large in norm, then do
 *     nothing more. Alternatively, if it shrunk significantly, then
 *     truncate it to zero.
 *
-      IF( NORMSQ2 .LT. ALPHASQ*NORMSQ1 ) THEN
-         DO I = 1, M1
-            X1(I) = ZERO
+      IF( NORM_NEW .LT. ALPHA * NORM ) THEN
+         DO IX = 1, 1 + (M1-1)*INCX1, INCX1
+            X1(IX) = ZERO
          END DO
-         DO I = 1, M2
-            X2(I) = ZERO
+         DO IX = 1, 1 + (M2-1)*INCX2, INCX2
+            X2(IX) = ZERO
          END DO
       END IF
 *
@@ -307,4 +323,3 @@ SUBROUTINE ZUNBDB6( M1, M2, N, X1, INCX1, X2, INCX2, Q1, LDQ1, Q2,
 *     End of ZUNBDB6
 *
       END
-
diff --git a/SRC/zuncsd.f b/SRC/zuncsd.f
index cc45bbc70b..4055a4bbb0 100644
--- a/SRC/zuncsd.f
+++ b/SRC/zuncsd.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNCSD + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zuncsd.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zuncsd.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -308,15 +306,17 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup uncsd
 *
 *  =====================================================================
-      RECURSIVE SUBROUTINE ZUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
+      RECURSIVE SUBROUTINE ZUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T,
+     $                             TRANS,
      $                             SIGNS, M, P, Q, X11, LDX11, X12,
      $                             LDX12, X21, LDX21, X22, LDX22, THETA,
      $                             U1, LDU1, U2, LDU2, V1T, LDV1T, V2T,
      $                             LDV2T, WORK, LWORK, RWORK, LRWORK,
      $                             IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -360,7 +360,8 @@ RECURSIVE SUBROUTINE ZUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
       LOGICAL            LRQUERY
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZBBCSD, ZLACPY, ZLAPMR, ZLAPMT,
+      EXTERNAL           XERBLA, ZBBCSD, ZLACPY, ZLAPMR,
+     $                   ZLAPMT,
      $                   ZUNBDB, ZUNGLQ, ZUNGQR
 *     ..
 *     .. External Functions ..
@@ -428,7 +429,8 @@ RECURSIVE SUBROUTINE ZUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
          ELSE
             SIGNST = 'D'
          END IF
-         CALL ZUNCSD( JOBV1T, JOBV2T, JOBU1, JOBU2, TRANST, SIGNST, M,
+         CALL ZUNCSD( JOBV1T, JOBV2T, JOBU1, JOBU2, TRANST, SIGNST,
+     $                M,
      $                Q, P, X11, LDX11, X21, LDX21, X12, LDX12, X22,
      $                LDX22, THETA, V1T, LDV1T, V2T, LDV2T, U1, LDU1,
      $                U2, LDU2, WORK, LWORK, RWORK, LRWORK, IWORK,
@@ -531,7 +533,8 @@ RECURSIVE SUBROUTINE ZUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
 *
 *     Transform to bidiagonal block form
 *
-      CALL ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12, X21,
+      CALL ZUNBDB( TRANS, SIGNS, M, P, Q, X11, LDX11, X12, LDX12,
+     $             X21,
      $             LDX21, X22, LDX22, THETA, RWORK(IPHI), WORK(ITAUP1),
      $             WORK(ITAUP2), WORK(ITAUQ1), WORK(ITAUQ2),
      $             WORK(IORBDB), LORBDBWORK, CHILDINFO )
@@ -541,7 +544,8 @@ RECURSIVE SUBROUTINE ZUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
       IF( COLMAJOR ) THEN
          IF( WANTU1 .AND. P .GT. 0 ) THEN
             CALL ZLACPY( 'L', P, Q, X11, LDX11, U1, LDU1 )
-            CALL ZUNGQR( P, P, Q, U1, LDU1, WORK(ITAUP1), WORK(IORGQR),
+            CALL ZUNGQR( P, P, Q, U1, LDU1, WORK(ITAUP1),
+     $                   WORK(IORGQR),
      $                   LORGQRWORK, INFO)
          END IF
          IF( WANTU2 .AND. M-P .GT. 0 ) THEN
@@ -557,7 +561,8 @@ RECURSIVE SUBROUTINE ZUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
                V1T(1,J) = ZERO
                V1T(J,1) = ZERO
             END DO
-            CALL ZUNGLQ( Q-1, Q-1, Q-1, V1T(2,2), LDV1T, WORK(ITAUQ1),
+            CALL ZUNGLQ( Q-1, Q-1, Q-1, V1T(2,2), LDV1T,
+     $                   WORK(ITAUQ1),
      $                   WORK(IORGLQ), LORGLQWORK, INFO )
          END IF
          IF( WANTV2T .AND. M-Q .GT. 0 ) THEN
@@ -574,7 +579,8 @@ RECURSIVE SUBROUTINE ZUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
       ELSE
          IF( WANTU1 .AND. P .GT. 0 ) THEN
             CALL ZLACPY( 'U', Q, P, X11, LDX11, U1, LDU1 )
-            CALL ZUNGLQ( P, P, Q, U1, LDU1, WORK(ITAUP1), WORK(IORGLQ),
+            CALL ZUNGLQ( P, P, Q, U1, LDU1, WORK(ITAUP1),
+     $                   WORK(IORGLQ),
      $                   LORGLQWORK, INFO)
          END IF
          IF( WANTU2 .AND. M-P .GT. 0 ) THEN
@@ -590,7 +596,8 @@ RECURSIVE SUBROUTINE ZUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
                V1T(1,J) = ZERO
                V1T(J,1) = ZERO
             END DO
-            CALL ZUNGQR( Q-1, Q-1, Q-1, V1T(2,2), LDV1T, WORK(ITAUQ1),
+            CALL ZUNGQR( Q-1, Q-1, Q-1, V1T(2,2), LDV1T,
+     $                   WORK(ITAUQ1),
      $                   WORK(IORGQR), LORGQRWORK, INFO )
          END IF
          IF( WANTV2T .AND. M-Q .GT. 0 ) THEN
@@ -608,7 +615,8 @@ RECURSIVE SUBROUTINE ZUNCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS,
 *
 *     Compute the CSD of the matrix in bidiagonal-block form
 *
-      CALL ZBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q, THETA,
+      CALL ZBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P, Q,
+     $             THETA,
      $             RWORK(IPHI), U1, LDU1, U2, LDU2, V1T, LDV1T, V2T,
      $             LDV2T, RWORK(IB11D), RWORK(IB11E), RWORK(IB12D),
      $             RWORK(IB12E), RWORK(IB21D), RWORK(IB21E),
diff --git a/SRC/zuncsd2by1.f b/SRC/zuncsd2by1.f
index 6b76730b8e..40839956f8 100644
--- a/SRC/zuncsd2by1.f
+++ b/SRC/zuncsd2by1.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNCSD2BY1 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zuncsd2by1.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zuncsd2by1.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -217,7 +215,7 @@
 *>          and RWORK array, respectively, and no error message related
 *>          to LWORK or LRWORK is issued by XERBLA.
 *> \endverbatim
-*
+*>
 *> \param[out] IWORK
 *> \verbatim
 *>          IWORK is INTEGER array, dimension (M-MIN(P,M-P,Q,M-Q))
@@ -246,13 +244,15 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup uncsd2by1
 *
 *  =====================================================================
-      SUBROUTINE ZUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
+      SUBROUTINE ZUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11,
+     $                       LDX11,
      $                       X21, LDX21, THETA, U1, LDU1, U2, LDU2, V1T,
      $                       LDV1T, WORK, LWORK, RWORK, LRWORK, IWORK,
      $                       INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -292,7 +292,8 @@ SUBROUTINE ZUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
       COMPLEX*16         CDUM( 1, 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZBBCSD, ZCOPY, ZLACPY, ZLAPMR, ZLAPMT, ZUNBDB1,
+      EXTERNAL           ZBBCSD, ZCOPY, ZLACPY, ZLAPMR, ZLAPMT,
+     $                   ZUNBDB1,
      $                   ZUNBDB2, ZUNBDB3, ZUNBDB4, ZUNGLQ, ZUNGQR,
      $                   XERBLA
 *     ..
@@ -388,7 +389,8 @@ SUBROUTINE ZUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
          LORGLQMIN = 1
          LORGLQOPT = 1
          IF( R .EQ. Q ) THEN
-            CALL ZUNBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA, DUM,
+            CALL ZUNBDB1( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    DUM,
      $                    CDUM, CDUM, CDUM, WORK, -1, CHILDINFO )
             LORBDB = INT( WORK(1) )
             IF( WANTU1 .AND. P .GT. 0 ) THEN
@@ -409,17 +411,20 @@ SUBROUTINE ZUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
                LORGLQMIN = MAX( LORGLQMIN, Q-1 )
                LORGLQOPT = MAX( LORGLQOPT, INT( WORK(1) ) )
             END IF
-            CALL ZBBCSD( JOBU1, JOBU2, JOBV1T, 'N', 'N', M, P, Q, THETA,
+            CALL ZBBCSD( JOBU1, JOBU2, JOBV1T, 'N', 'N', M, P, Q,
+     $                   THETA,
      $                   DUM, U1, LDU1, U2, LDU2, V1T, LDV1T, CDUM, 1,
      $                   DUM, DUM, DUM, DUM, DUM, DUM, DUM, DUM,
      $                   RWORK(1), -1, CHILDINFO )
             LBBCSD = INT( RWORK(1) )
          ELSE IF( R .EQ. P ) THEN
-            CALL ZUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA, DUM,
+            CALL ZUNBDB2( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    DUM,
      $                    CDUM, CDUM, CDUM, WORK(1), -1, CHILDINFO )
             LORBDB = INT( WORK(1) )
             IF( WANTU1 .AND. P .GT. 0 ) THEN
-               CALL ZUNGQR( P-1, P-1, P-1, U1(2,2), LDU1, CDUM, WORK(1),
+               CALL ZUNGQR( P-1, P-1, P-1, U1(2,2), LDU1, CDUM,
+     $                      WORK(1),
      $                      -1, CHILDINFO )
                LORGQRMIN = MAX( LORGQRMIN, P-1 )
                LORGQROPT = MAX( LORGQROPT, INT( WORK(1) ) )
@@ -436,13 +441,15 @@ SUBROUTINE ZUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
                LORGLQMIN = MAX( LORGLQMIN, Q )
                LORGLQOPT = MAX( LORGLQOPT, INT( WORK(1) ) )
             END IF
-            CALL ZBBCSD( JOBV1T, 'N', JOBU1, JOBU2, 'T', M, Q, P, THETA,
+            CALL ZBBCSD( JOBV1T, 'N', JOBU1, JOBU2, 'T', M, Q, P,
+     $                   THETA,
      $                   DUM, V1T, LDV1T, CDUM, 1, U1, LDU1, U2, LDU2,
      $                   DUM, DUM, DUM, DUM, DUM, DUM, DUM, DUM,
      $                   RWORK(1), -1, CHILDINFO )
             LBBCSD = INT( RWORK(1) )
          ELSE IF( R .EQ. M-P ) THEN
-            CALL ZUNBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA, DUM,
+            CALL ZUNBDB3( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    DUM,
      $                    CDUM, CDUM, CDUM, WORK(1), -1, CHILDINFO )
             LORBDB = INT( WORK(1) )
             IF( WANTU1 .AND. P .GT. 0 ) THEN
@@ -469,7 +476,8 @@ SUBROUTINE ZUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
      $                   RWORK(1), -1, CHILDINFO )
             LBBCSD = INT( RWORK(1) )
          ELSE
-            CALL ZUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA, DUM,
+            CALL ZUNBDB4( M, P, Q, X11, LDX11, X21, LDX21, THETA,
+     $                    DUM,
      $                    CDUM, CDUM, CDUM, CDUM, WORK(1), -1, CHILDINFO
      $                  )
             LORBDB = M + INT( WORK(1) )
@@ -480,7 +488,8 @@ SUBROUTINE ZUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
                LORGQROPT = MAX( LORGQROPT, INT( WORK(1) ) )
             END IF
             IF( WANTU2 .AND. M-P .GT. 0 ) THEN
-               CALL ZUNGQR( M-P, M-P, M-Q, U2, LDU2, CDUM, WORK(1), -1,
+               CALL ZUNGQR( M-P, M-P, M-Q, U2, LDU2, CDUM, WORK(1),
+     $                      -1,
      $                      CHILDINFO )
                LORGQRMIN = MAX( LORGQRMIN, M-P )
                LORGQROPT = MAX( LORGQROPT, INT( WORK(1) ) )
@@ -540,7 +549,8 @@ SUBROUTINE ZUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
 *
          IF( WANTU1 .AND. P .GT. 0 ) THEN
             CALL ZLACPY( 'L', P, Q, X11, LDX11, U1, LDU1 )
-            CALL ZUNGQR( P, P, Q, U1, LDU1, WORK(ITAUP1), WORK(IORGQR),
+            CALL ZUNGQR( P, P, Q, U1, LDU1, WORK(ITAUP1),
+     $                   WORK(IORGQR),
      $                   LORGQR, CHILDINFO )
          END IF
          IF( WANTU2 .AND. M-P .GT. 0 ) THEN
@@ -556,7 +566,8 @@ SUBROUTINE ZUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
             END DO
             CALL ZLACPY( 'U', Q-1, Q-1, X21(1,2), LDX21, V1T(2,2),
      $                   LDV1T )
-            CALL ZUNGLQ( Q-1, Q-1, Q-1, V1T(2,2), LDV1T, WORK(ITAUQ1),
+            CALL ZUNGLQ( Q-1, Q-1, Q-1, V1T(2,2), LDV1T,
+     $                   WORK(ITAUQ1),
      $                   WORK(IORGLQ), LORGLQ, CHILDINFO )
          END IF
 *
@@ -599,7 +610,8 @@ SUBROUTINE ZUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
                U1(1,J) = ZERO
                U1(J,1) = ZERO
             END DO
-            CALL ZLACPY( 'L', P-1, P-1, X11(2,1), LDX11, U1(2,2), LDU1 )
+            CALL ZLACPY( 'L', P-1, P-1, X11(2,1), LDX11, U1(2,2),
+     $                   LDU1 )
             CALL ZUNGQR( P-1, P-1, P-1, U1(2,2), LDU1, WORK(ITAUP1),
      $                   WORK(IORGQR), LORGQR, CHILDINFO )
          END IF
@@ -649,7 +661,8 @@ SUBROUTINE ZUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
 *
          IF( WANTU1 .AND. P .GT. 0 ) THEN
             CALL ZLACPY( 'L', P, Q, X11, LDX11, U1, LDU1 )
-            CALL ZUNGQR( P, P, Q, U1, LDU1, WORK(ITAUP1), WORK(IORGQR),
+            CALL ZUNGQR( P, P, Q, U1, LDU1, WORK(ITAUP1),
+     $                   WORK(IORGQR),
      $                   LORGQR, CHILDINFO )
          END IF
          IF( WANTU2 .AND. M-P .GT. 0 ) THEN
@@ -732,7 +745,8 @@ SUBROUTINE ZUNCSD2BY1( JOBU1, JOBU2, JOBV1T, M, P, Q, X11, LDX11,
          END IF
          IF( WANTV1T .AND. Q .GT. 0 ) THEN
             CALL ZLACPY( 'U', M-Q, Q, X21, LDX21, V1T, LDV1T )
-            CALL ZLACPY( 'U', P-(M-Q), Q-(M-Q), X11(M-Q+1,M-Q+1), LDX11,
+            CALL ZLACPY( 'U', P-(M-Q), Q-(M-Q), X11(M-Q+1,M-Q+1),
+     $                   LDX11,
      $                   V1T(M-Q+1,M-Q+1), LDV1T )
             CALL ZLACPY( 'U', -P+Q, Q-P, X21(M-Q+1,P+1), LDX21,
      $                   V1T(P+1,P+1), LDV1T )
diff --git a/SRC/zung2l.f b/SRC/zung2l.f
index add5cb946b..7f5cf64b00 100644
--- a/SRC/zung2l.f
+++ b/SRC/zung2l.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNG2L + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zung2l.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zung2l.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup ung2l
 *
 *  =====================================================================
       SUBROUTINE ZUNG2L( M, N, K, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -134,7 +133,7 @@ SUBROUTINE ZUNG2L( M, N, K, A, LDA, TAU, WORK, INFO )
       INTEGER            I, II, J, L
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARF, ZSCAL
+      EXTERNAL           XERBLA, ZLARF1L, ZSCAL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -178,8 +177,9 @@ SUBROUTINE ZUNG2L( M, N, K, A, LDA, TAU, WORK, INFO )
 *        Apply H(i) to A(1:m-k+i,1:n-k+i) from the left
 *
          A( M-N+II, II ) = ONE
-         CALL ZLARF( 'Left', M-N+II, II-1, A( 1, II ), 1, TAU( I ), A,
-     $               LDA, WORK )
+         CALL ZLARF1L( 'Left', M-N+II, II-1, A( 1, II ), 1, TAU( I ),
+     $                 A,
+     $                 LDA, WORK )
          CALL ZSCAL( M-N+II-1, -TAU( I ), A( 1, II ), 1 )
          A( M-N+II, II ) = ONE - TAU( I )
 *
diff --git a/SRC/zung2r.f b/SRC/zung2r.f
index 2823b7ebdd..56374be425 100644
--- a/SRC/zung2r.f
+++ b/SRC/zung2r.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNG2R + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zung2r.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zung2r.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup ung2r
 *
 *  =====================================================================
       SUBROUTINE ZUNG2R( M, N, K, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -134,7 +133,7 @@ SUBROUTINE ZUNG2R( M, N, K, A, LDA, TAU, WORK, INFO )
       INTEGER            I, J, L
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARF, ZSCAL
+      EXTERNAL           XERBLA, ZLARF1F, ZSCAL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX
@@ -177,9 +176,8 @@ SUBROUTINE ZUNG2R( M, N, K, A, LDA, TAU, WORK, INFO )
 *        Apply H(i) to A(i:m,i:n) from the left
 *
          IF( I.LT.N ) THEN
-            A( I, I ) = ONE
-            CALL ZLARF( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
-     $                  A( I, I+1 ), LDA, WORK )
+            CALL ZLARF1F( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
+     $                    A( I, I+1 ), LDA, WORK )
          END IF
          IF( I.LT.M )
      $      CALL ZSCAL( M-I, -TAU( I ), A( I+1, I ), 1 )
diff --git a/SRC/zungbr.f b/SRC/zungbr.f
index 3dfca43be2..4559d0fce0 100644
--- a/SRC/zungbr.f
+++ b/SRC/zungbr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNGBR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungbr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungbr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -150,10 +148,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup ungbr
 *
 *  =====================================================================
-      SUBROUTINE ZUNGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE ZUNGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -233,7 +233,7 @@ SUBROUTINE ZUNGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
                END IF
             END IF
          END IF
-         LWKOPT = DBLE( WORK( 1 ) )
+         LWKOPT = INT( DBLE( WORK( 1 ) ) )
          LWKOPT = MAX (LWKOPT, MN)
       END IF
 *
diff --git a/SRC/zunghr.f b/SRC/zunghr.f
index c112db1930..7def0f904c 100644
--- a/SRC/zunghr.f
+++ b/SRC/zunghr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNGHR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunghr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunghr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -119,10 +117,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unghr
 *
 *  =====================================================================
-      SUBROUTINE ZUNGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE ZUNGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zungl2.f b/SRC/zungl2.f
index e7a0b59603..24f41b9be8 100644
--- a/SRC/zungl2.f
+++ b/SRC/zungl2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNGL2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungl2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungl2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -106,10 +104,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup ungl2
 *
 *  =====================================================================
       SUBROUTINE ZUNGL2( M, N, K, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -133,7 +132,7 @@ SUBROUTINE ZUNGL2( M, N, K, A, LDA, TAU, WORK, INFO )
       INTEGER            I, J, L
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLACGV, ZLARF, ZSCAL
+      EXTERNAL           XERBLA, ZLACGV, ZLARF1F, ZSCAL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DCONJG, MAX
@@ -182,9 +181,9 @@ SUBROUTINE ZUNGL2( M, N, K, A, LDA, TAU, WORK, INFO )
          IF( I.LT.N ) THEN
             CALL ZLACGV( N-I, A( I, I+1 ), LDA )
             IF( I.LT.M ) THEN
-               A( I, I ) = ONE
-               CALL ZLARF( 'Right', M-I, N-I+1, A( I, I ), LDA,
-     $                     DCONJG( TAU( I ) ), A( I+1, I ), LDA, WORK )
+               CALL ZLARF1F( 'Right', M-I, N-I+1, A( I, I ), LDA,
+     $                       CONJG( TAU( I ) ), A( I+1, I ), LDA,
+     $                       WORK )
             END IF
             CALL ZSCAL( N-I, -TAU( I ), A( I, I+1 ), LDA )
             CALL ZLACGV( N-I, A( I, I+1 ), LDA )
diff --git a/SRC/zunglq.f b/SRC/zunglq.f
index aca6bc6e72..4e7ae19a83 100644
--- a/SRC/zunglq.f
+++ b/SRC/zunglq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNGLQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunglq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunglq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -120,10 +118,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unglq
 *
 *  =====================================================================
       SUBROUTINE ZUNGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -211,7 +210,8 @@ SUBROUTINE ZUNGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              determine the minimum value of NB.
 *
                NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'ZUNGLQ', ' ', M, N, K, -1 ) )
+               NBMIN = MAX( 2, ILAENV( 2, 'ZUNGLQ', ' ', M, N, K,
+     $                      -1 ) )
             END IF
          END IF
       END IF
@@ -252,12 +252,14 @@ SUBROUTINE ZUNGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              Form the triangular factor of the block reflector
 *              H = H(i) H(i+1) . . . H(i+ib-1)
 *
-               CALL ZLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I, I ),
+               CALL ZLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I,
+     $                      I ),
      $                      LDA, TAU( I ), WORK, LDWORK )
 *
 *              Apply H**H to A(i+ib:m,i:n) from the right
 *
-               CALL ZLARFB( 'Right', 'Conjugate transpose', 'Forward',
+               CALL ZLARFB( 'Right', 'Conjugate transpose',
+     $                      'Forward',
      $                      'Rowwise', M-I-IB+1, N-I+1, IB, A( I, I ),
      $                      LDA, WORK, LDWORK, A( I+IB, I ), LDA,
      $                      WORK( IB+1 ), LDWORK )
@@ -265,7 +267,8 @@ SUBROUTINE ZUNGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *           Apply H**H to columns i:n of current block
 *
-            CALL ZUNGL2( IB, N-I+1, IB, A( I, I ), LDA, TAU( I ), WORK,
+            CALL ZUNGL2( IB, N-I+1, IB, A( I, I ), LDA, TAU( I ),
+     $                   WORK,
      $                   IINFO )
 *
 *           Set columns 1:i-1 of current block to zero
diff --git a/SRC/zungql.f b/SRC/zungql.f
index 1804ca65ff..efdba650fb 100644
--- a/SRC/zungql.f
+++ b/SRC/zungql.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNGQL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungql.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungql.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup ungql
 *
 *  =====================================================================
       SUBROUTINE ZUNGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -221,7 +220,8 @@ SUBROUTINE ZUNGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              determine the minimum value of NB.
 *
                NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'ZUNGQL', ' ', M, N, K, -1 ) )
+               NBMIN = MAX( 2, ILAENV( 2, 'ZUNGQL', ' ', M, N, K,
+     $                      -1 ) )
             END IF
          END IF
       END IF
diff --git a/SRC/zungqr.f b/SRC/zungqr.f
index b3f2c4507f..07384a26e2 100644
--- a/SRC/zungqr.f
+++ b/SRC/zungqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNGQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup ungqr
 *
 *  =====================================================================
       SUBROUTINE ZUNGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -212,7 +211,8 @@ SUBROUTINE ZUNGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              determine the minimum value of NB.
 *
                NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'ZUNGQR', ' ', M, N, K, -1 ) )
+               NBMIN = MAX( 2, ILAENV( 2, 'ZUNGQR', ' ', M, N, K,
+     $                      -1 ) )
             END IF
          END IF
       END IF
@@ -266,7 +266,8 @@ SUBROUTINE ZUNGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *           Apply H to rows i:m of current block
 *
-            CALL ZUNG2R( M-I+1, IB, IB, A( I, I ), LDA, TAU( I ), WORK,
+            CALL ZUNG2R( M-I+1, IB, IB, A( I, I ), LDA, TAU( I ),
+     $                   WORK,
      $                   IINFO )
 *
 *           Set rows 1:i-1 of current block to zero
diff --git a/SRC/zungr2.f b/SRC/zungr2.f
index 034ff4fe41..f24a455fe6 100644
--- a/SRC/zungr2.f
+++ b/SRC/zungr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNGR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup ungr2
 *
 *  =====================================================================
       SUBROUTINE ZUNGR2( M, N, K, A, LDA, TAU, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -134,7 +133,7 @@ SUBROUTINE ZUNGR2( M, N, K, A, LDA, TAU, WORK, INFO )
       INTEGER            I, II, J, L
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLACGV, ZLARF, ZSCAL
+      EXTERNAL           XERBLA, ZLACGV, ZLARF1L, ZSCAL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DCONJG, MAX
@@ -182,9 +181,8 @@ SUBROUTINE ZUNGR2( M, N, K, A, LDA, TAU, WORK, INFO )
 *        Apply H(i)**H to A(1:m-k+i,1:n-k+i) from the right
 *
          CALL ZLACGV( N-M+II-1, A( II, 1 ), LDA )
-         A( II, N-M+II ) = ONE
-         CALL ZLARF( 'Right', II-1, N-M+II, A( II, 1 ), LDA,
-     $               DCONJG( TAU( I ) ), A, LDA, WORK )
+         CALL ZLARF1L( 'Right', II-1, N-M+II, A( II, 1 ), LDA,
+     $                 CONJG( TAU( I ) ), A, LDA, WORK )
          CALL ZSCAL( N-M+II-1, -TAU( I ), A( II, 1 ), LDA )
          CALL ZLACGV( N-M+II-1, A( II, 1 ), LDA )
          A( II, N-M+II ) = ONE - DCONJG( TAU( I ) )
diff --git a/SRC/zungrq.f b/SRC/zungrq.f
index 40b3b2392e..68d46706e3 100644
--- a/SRC/zungrq.f
+++ b/SRC/zungrq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNGRQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungrq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungrq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -121,10 +119,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup ungrq
 *
 *  =====================================================================
       SUBROUTINE ZUNGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -221,7 +220,8 @@ SUBROUTINE ZUNGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *              determine the minimum value of NB.
 *
                NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'ZUNGRQ', ' ', M, N, K, -1 ) )
+               NBMIN = MAX( 2, ILAENV( 2, 'ZUNGRQ', ' ', M, N, K,
+     $                      -1 ) )
             END IF
          END IF
       END IF
@@ -265,7 +265,8 @@ SUBROUTINE ZUNGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *              Apply H**H to A(1:m-k+i-1,1:n-k+i+ib-1) from the right
 *
-               CALL ZLARFB( 'Right', 'Conjugate transpose', 'Backward',
+               CALL ZLARFB( 'Right', 'Conjugate transpose',
+     $                      'Backward',
      $                      'Rowwise', II-1, N-K+I+IB-1, IB, A( II, 1 ),
      $                      LDA, WORK, LDWORK, A, LDA, WORK( IB+1 ),
      $                      LDWORK )
@@ -273,7 +274,8 @@ SUBROUTINE ZUNGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *           Apply H**H to columns 1:n-k+i+ib-1 of current block
 *
-            CALL ZUNGR2( IB, N-K+I+IB-1, IB, A( II, 1 ), LDA, TAU( I ),
+            CALL ZUNGR2( IB, N-K+I+IB-1, IB, A( II, 1 ), LDA,
+     $                   TAU( I ),
      $                   WORK, IINFO )
 *
 *           Set columns n-k+i+ib:n of current block to zero
diff --git a/SRC/zungtr.f b/SRC/zungtr.f
index 01e100a8cd..0a0db889a5 100644
--- a/SRC/zungtr.f
+++ b/SRC/zungtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNGTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -116,10 +114,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup ungtr
 *
 *  =====================================================================
       SUBROUTINE ZUNGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -217,7 +216,8 @@ SUBROUTINE ZUNGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
 *        Generate Q(1:n-1,1:n-1)
 *
-         CALL ZUNGQL( N-1, N-1, N-1, A, LDA, TAU, WORK, LWORK, IINFO )
+         CALL ZUNGQL( N-1, N-1, N-1, A, LDA, TAU, WORK, LWORK,
+     $                IINFO )
 *
       ELSE
 *
diff --git a/SRC/zungtsqr.f b/SRC/zungtsqr.f
index d4868d4035..bc5baf08df 100644
--- a/SRC/zungtsqr.f
+++ b/SRC/zungtsqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNGTSQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zuntsqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungtsqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -133,6 +131,7 @@
 *>
 *> \param[in] LWORK
 *> \verbatim
+*>          LWORK is INTEGER
 *>          The dimension of the array WORK.  LWORK >= (M+NB)*N.
 *>          If LWORK = -1, then a workspace query is assumed.
 *>          The routine only calculates the optimal size of the WORK
@@ -156,7 +155,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup ungtsqr
 *
 *> \par Contributors:
 *  ==================
diff --git a/SRC/zungtsqr_row.f b/SRC/zungtsqr_row.f
index 0d32ad6ce9..cbf2b0ca5e 100644
--- a/SRC/zungtsqr_row.f
+++ b/SRC/zungtsqr_row.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNGTSQR_ROW + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunrgtsqr_row.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunrgtsqr_row.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -144,6 +142,7 @@
 *>
 *> \param[in] LWORK
 *> \verbatim
+*>          LWORK is INTEGER
 *>          The dimension of the array WORK.
 *>          LWORK >= NBLOCAL * MAX(NBLOCAL,(N-NBLOCAL)),
 *>          where NBLOCAL=MIN(NB,N).
@@ -169,7 +168,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup ungtsqr_row
 *
 *> \par Contributors:
 *  ==================
diff --git a/SRC/zunhr_col.f b/SRC/zunhr_col.f
index 52f13eab51..4c581e029b 100644
--- a/SRC/zunhr_col.f
+++ b/SRC/zunhr_col.f
@@ -5,15 +5,13 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNHR_COL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunhr_col.f">
 *> [TGZ]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunhr_col.f">
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunhr_col.f">
-*> [TXT]</a
-*> \endhtmlonly
+*> [TXT]</a>
 *
 *  Definition:
 *  ===========
@@ -241,7 +239,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unhr_col
 *
 *> \par Contributors:
 *  ==================
@@ -281,7 +279,8 @@ SUBROUTINE ZUNHR_COL( M, N, NB, A, LDA, T, LDT, D, INFO )
      $                   NPLUSONE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZCOPY, ZLAUNHR_COL_GETRFNP, ZSCAL, ZTRSM,
+      EXTERNAL           ZCOPY, ZLAUNHR_COL_GETRFNP, ZSCAL,
+     $                   ZTRSM,
      $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -420,7 +419,7 @@ SUBROUTINE ZUNHR_COL( M, N, NB, A, LDA, T, LDT, D, INFO )
 *
          JBTEMP2 = JB - 2
          DO J = JB, JB+JNB-2
-            DO I = J-JBTEMP2, NB
+            DO I = J-JBTEMP2, MIN( NB, N )
                T( I, J ) = CZERO
             END DO
          END DO
diff --git a/SRC/zunm22.f b/SRC/zunm22.f
index cedcea73af..cd184ec468 100644
--- a/SRC/zunm22.f
+++ b/SRC/zunm22.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNM22 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunm22.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunm22.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -154,7 +152,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complexOTHERcomputational
+*> \ingroup unm22
 *
 *  =====================================================================
       SUBROUTINE ZUNM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
@@ -215,7 +213,8 @@ SUBROUTINE ZUNM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
       IF( N1.EQ.0 .OR. N2.EQ.0 ) NW = 1
       IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.LSAME( TRANS, 'C' ) )
+      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND.
+     $         .NOT.LSAME( TRANS, 'C' ) )
      $          THEN
          INFO = -2
       ELSE IF( M.LT.0 ) THEN
@@ -281,13 +280,15 @@ SUBROUTINE ZUNM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *
                CALL ZLACPY( 'All', N1, LEN, C( N2+1, I ), LDC, WORK,
      $                      LDWORK )
-               CALL ZTRMM( 'Left', 'Lower', 'No Transpose', 'Non-Unit',
+               CALL ZTRMM( 'Left', 'Lower', 'No Transpose',
+     $                     'Non-Unit',
      $                     N1, LEN, ONE, Q( 1, N2+1 ), LDQ, WORK,
      $                     LDWORK )
 *
 *              Multiply top part of C by Q11.
 *
-               CALL ZGEMM( 'No Transpose', 'No Transpose', N1, LEN, N2,
+               CALL ZGEMM( 'No Transpose', 'No Transpose', N1, LEN,
+     $                     N2,
      $                     ONE, Q, LDQ, C( 1, I ), LDC, ONE, WORK,
      $                     LDWORK )
 *
@@ -295,13 +296,15 @@ SUBROUTINE ZUNM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *
                CALL ZLACPY( 'All', N2, LEN, C( 1, I ), LDC,
      $                      WORK( N1+1 ), LDWORK )
-               CALL ZTRMM( 'Left', 'Upper', 'No Transpose', 'Non-Unit',
+               CALL ZTRMM( 'Left', 'Upper', 'No Transpose',
+     $                     'Non-Unit',
      $                     N2, LEN, ONE, Q( N1+1, 1 ), LDQ,
      $                     WORK( N1+1 ), LDWORK )
 *
 *              Multiply bottom part of C by Q22.
 *
-               CALL ZGEMM( 'No Transpose', 'No Transpose', N2, LEN, N1,
+               CALL ZGEMM( 'No Transpose', 'No Transpose', N2, LEN,
+     $                     N1,
      $                     ONE, Q( N1+1, N2+1 ), LDQ, C( N2+1, I ), LDC,
      $                     ONE, WORK( N1+1 ), LDWORK )
 *
@@ -359,13 +362,15 @@ SUBROUTINE ZUNM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *
                CALL ZLACPY( 'All', LEN, N2, C( I, N1+1 ), LDC, WORK,
      $                      LDWORK )
-               CALL ZTRMM( 'Right', 'Upper', 'No Transpose', 'Non-Unit',
+               CALL ZTRMM( 'Right', 'Upper', 'No Transpose',
+     $                     'Non-Unit',
      $                     LEN, N2, ONE, Q( N1+1, 1 ), LDQ, WORK,
      $                     LDWORK )
 *
 *              Multiply left part of C by Q11.
 *
-               CALL ZGEMM( 'No Transpose', 'No Transpose', LEN, N2, N1,
+               CALL ZGEMM( 'No Transpose', 'No Transpose', LEN, N2,
+     $                     N1,
      $                     ONE, C( I, 1 ), LDC, Q, LDQ, ONE, WORK,
      $                     LDWORK )
 *
@@ -373,13 +378,15 @@ SUBROUTINE ZUNM22( SIDE, TRANS, M, N, N1, N2, Q, LDQ, C, LDC,
 *
                CALL ZLACPY( 'All', LEN, N1, C( I, 1 ), LDC,
      $                      WORK( 1 + N2*LDWORK ), LDWORK )
-               CALL ZTRMM( 'Right', 'Lower', 'No Transpose', 'Non-Unit',
+               CALL ZTRMM( 'Right', 'Lower', 'No Transpose',
+     $                     'Non-Unit',
      $                     LEN, N1, ONE, Q( 1, N2+1 ), LDQ,
      $                     WORK( 1 + N2*LDWORK ), LDWORK )
 *
 *              Multiply right part of C by Q22.
 *
-               CALL ZGEMM( 'No Transpose', 'No Transpose', LEN, N1, N2,
+               CALL ZGEMM( 'No Transpose', 'No Transpose', LEN, N1,
+     $                     N2,
      $                     ONE, C( I, N1+1 ), LDC, Q( N1+1, N2+1 ), LDQ,
      $                     ONE, WORK( 1 + N2*LDWORK ), LDWORK )
 *
diff --git a/SRC/zunm2l.f b/SRC/zunm2l.f
index 48c2dbfc0c..2756bf9811 100644
--- a/SRC/zunm2l.f
+++ b/SRC/zunm2l.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNM2L + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunm2l.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunm2l.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,11 +149,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unm2l
 *
 *  =====================================================================
       SUBROUTINE ZUNM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -178,14 +177,14 @@ SUBROUTINE ZUNM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *     .. Local Scalars ..
       LOGICAL            LEFT, NOTRAN
       INTEGER            I, I1, I2, I3, MI, NI, NQ
-      COMPLEX*16         AII, TAUI
+      COMPLEX*16         TAUI
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARF
+      EXTERNAL           XERBLA, ZLARF1L
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DCONJG, MAX
@@ -266,10 +265,8 @@ SUBROUTINE ZUNM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
          ELSE
             TAUI = DCONJG( TAU( I ) )
          END IF
-         AII = A( NQ-K+I, I )
-         A( NQ-K+I, I ) = ONE
-         CALL ZLARF( SIDE, MI, NI, A( 1, I ), 1, TAUI, C, LDC, WORK )
-         A( NQ-K+I, I ) = AII
+         CALL ZLARF1L( SIDE, MI, NI, A( 1, I ), 1, TAUI, C, LDC,
+     $                 WORK )
    10 CONTINUE
       RETURN
 *
diff --git a/SRC/zunm2r.f b/SRC/zunm2r.f
index aec5a8bcae..8e42228a7f 100644
--- a/SRC/zunm2r.f
+++ b/SRC/zunm2r.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNM2R + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunm2r.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunm2r.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,11 +149,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unm2r
 *
 *  =====================================================================
       SUBROUTINE ZUNM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -178,14 +177,14 @@ SUBROUTINE ZUNM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *     .. Local Scalars ..
       LOGICAL            LEFT, NOTRAN
       INTEGER            I, I1, I2, I3, IC, JC, MI, NI, NQ
-      COMPLEX*16         AII, TAUI
+      COMPLEX*16         TAUI
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARF
+      EXTERNAL           XERBLA, ZLARF1F
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DCONJG, MAX
@@ -270,11 +269,9 @@ SUBROUTINE ZUNM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
          ELSE
             TAUI = DCONJG( TAU( I ) )
          END IF
-         AII = A( I, I )
-         A( I, I ) = ONE
-         CALL ZLARF( SIDE, MI, NI, A( I, I ), 1, TAUI, C( IC, JC ), LDC,
+         CALL ZLARF1F( SIDE, MI, NI, A( I, I ), 1, TAUI, C( IC, JC ),
+     $               LDC,
      $               WORK )
-         A( I, I ) = AII
    10 CONTINUE
       RETURN
 *
diff --git a/SRC/zunmbr.f b/SRC/zunmbr.f
index b43e881b29..0ca5288430 100644
--- a/SRC/zunmbr.f
+++ b/SRC/zunmbr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNMBR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmbr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmbr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -188,11 +186,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unmbr
 *
 *  =====================================================================
       SUBROUTINE ZUNMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
      $                   LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -269,18 +268,22 @@ SUBROUTINE ZUNMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
          IF( M.GT.0 .AND. N.GT.0 ) THEN
             IF( APPLYQ ) THEN
                IF( LEFT ) THEN
-                  NB = ILAENV( 1, 'ZUNMQR', SIDE // TRANS, M-1, N, M-1,
+                  NB = ILAENV( 1, 'ZUNMQR', SIDE // TRANS, M-1, N,
+     $                         M-1,
      $                 -1 )
                ELSE
-                  NB = ILAENV( 1, 'ZUNMQR', SIDE // TRANS, M, N-1, N-1,
+                  NB = ILAENV( 1, 'ZUNMQR', SIDE // TRANS, M, N-1,
+     $                         N-1,
      $                 -1 )
                END IF
             ELSE
                IF( LEFT ) THEN
-                  NB = ILAENV( 1, 'ZUNMLQ', SIDE // TRANS, M-1, N, M-1,
+                  NB = ILAENV( 1, 'ZUNMLQ', SIDE // TRANS, M-1, N,
+     $                         M-1,
      $                 -1 )
                ELSE
-                  NB = ILAENV( 1, 'ZUNMLQ', SIDE // TRANS, M, N-1, N-1,
+                  NB = ILAENV( 1, 'ZUNMLQ', SIDE // TRANS, M, N-1,
+     $                         N-1,
      $                 -1 )
                END IF
             END IF
@@ -328,7 +331,8 @@ SUBROUTINE ZUNMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
                I1 = 1
                I2 = 2
             END IF
-            CALL ZUNMQR( SIDE, TRANS, MI, NI, NQ-1, A( 2, 1 ), LDA, TAU,
+            CALL ZUNMQR( SIDE, TRANS, MI, NI, NQ-1, A( 2, 1 ), LDA,
+     $                   TAU,
      $                   C( I1, I2 ), LDC, WORK, LWORK, IINFO )
          END IF
       ELSE
diff --git a/SRC/zunmhr.f b/SRC/zunmhr.f
index 9ece71c5e7..744cd76671 100644
--- a/SRC/zunmhr.f
+++ b/SRC/zunmhr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNMHR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmhr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmhr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -170,11 +168,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unmhr
 *
 *  =====================================================================
       SUBROUTINE ZUNMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
      $                   LDC, WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -225,7 +224,8 @@ SUBROUTINE ZUNMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
       END IF
       IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.LSAME( TRANS, 'C' ) )
+      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND.
+     $         .NOT.LSAME( TRANS, 'C' ) )
      $          THEN
          INFO = -2
       ELSE IF( M.LT.0 ) THEN
diff --git a/SRC/zunml2.f b/SRC/zunml2.f
index f47f768b08..969d586d17 100644
--- a/SRC/zunml2.f
+++ b/SRC/zunml2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNML2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunml2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunml2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,11 +149,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unml2
 *
 *  =====================================================================
       SUBROUTINE ZUNML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -178,14 +177,14 @@ SUBROUTINE ZUNML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *     .. Local Scalars ..
       LOGICAL            LEFT, NOTRAN
       INTEGER            I, I1, I2, I3, IC, JC, MI, NI, NQ
-      COMPLEX*16         AII, TAUI
+      COMPLEX*16         TAUI
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLACGV, ZLARF
+      EXTERNAL           XERBLA, ZLACGV, ZLARF1F
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DCONJG, MAX
@@ -272,11 +271,8 @@ SUBROUTINE ZUNML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
          END IF
          IF( I.LT.NQ )
      $      CALL ZLACGV( NQ-I, A( I, I+1 ), LDA )
-         AII = A( I, I )
-         A( I, I ) = ONE
-         CALL ZLARF( SIDE, MI, NI, A( I, I ), LDA, TAUI, C( IC, JC ),
-     $               LDC, WORK )
-         A( I, I ) = AII
+         CALL ZLARF1F( SIDE, MI, NI, A( I, I ), LDA, TAUI, C( IC,
+     $                 JC ), LDC, WORK )
          IF( I.LT.NQ )
      $      CALL ZLACGV( NQ-I, A( I, I+1 ), LDA )
    10 CONTINUE
diff --git a/SRC/zunmlq.f b/SRC/zunmlq.f
index f2fb315440..6c0329cf60 100644
--- a/SRC/zunmlq.f
+++ b/SRC/zunmlq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNMLQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmlq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmlq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -159,11 +157,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unmlq
 *
 *  =====================================================================
       SUBROUTINE ZUNMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -241,7 +240,8 @@ SUBROUTINE ZUNMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Compute the workspace requirements
 *
-         NB = MIN( NBMAX, ILAENV( 1, 'ZUNMLQ', SIDE // TRANS, M, N, K,
+         NB = MIN( NBMAX, ILAENV( 1, 'ZUNMLQ', SIDE // TRANS, M, N,
+     $             K,
      $        -1 ) )
          LWKOPT = NW*NB + TSIZE
          WORK( 1 ) = LWKOPT
@@ -266,7 +266,8 @@ SUBROUTINE ZUNMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'ZUNMLQ', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'ZUNMLQ', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -275,7 +276,8 @@ SUBROUTINE ZUNMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Use unblocked code
 *
-         CALL ZUNML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+         CALL ZUNML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                WORK,
      $                IINFO )
       ELSE
 *
@@ -331,7 +333,8 @@ SUBROUTINE ZUNMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *           Apply H or H**H
 *
-            CALL ZLARFB( SIDE, TRANST, 'Forward', 'Rowwise', MI, NI, IB,
+            CALL ZLARFB( SIDE, TRANST, 'Forward', 'Rowwise', MI, NI,
+     $                   IB,
      $                   A( I, I ), LDA, WORK( IWT ), LDT,
      $                   C( IC, JC ), LDC, WORK, LDWORK )
    10    CONTINUE
diff --git a/SRC/zunmql.f b/SRC/zunmql.f
index 06353a0c75..2109544483 100644
--- a/SRC/zunmql.f
+++ b/SRC/zunmql.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNMQL + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmql.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmql.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -159,11 +157,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unmql
 *
 *  =====================================================================
       SUBROUTINE ZUNMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -243,7 +242,8 @@ SUBROUTINE ZUNMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
          IF( M.EQ.0 .OR. N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            NB = MIN( NBMAX, ILAENV( 1, 'ZUNMQL', SIDE // TRANS, M, N,
+            NB = MIN( NBMAX, ILAENV( 1, 'ZUNMQL', SIDE // TRANS, M,
+     $                N,
      $                               K, -1 ) )
             LWKOPT = NW*NB + TSIZE
          END IF
@@ -268,7 +268,8 @@ SUBROUTINE ZUNMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'ZUNMQL', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'ZUNMQL', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -277,7 +278,8 @@ SUBROUTINE ZUNMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Use unblocked code
 *
-         CALL ZUNM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+         CALL ZUNM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                WORK,
      $                IINFO )
       ELSE
 *
@@ -323,7 +325,8 @@ SUBROUTINE ZUNMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *           Apply H or H**H
 *
-            CALL ZLARFB( SIDE, TRANS, 'Backward', 'Columnwise', MI, NI,
+            CALL ZLARFB( SIDE, TRANS, 'Backward', 'Columnwise', MI,
+     $                   NI,
      $                   IB, A( 1, I ), LDA, WORK( IWT ), LDT, C, LDC,
      $                   WORK, LDWORK )
    10    CONTINUE
diff --git a/SRC/zunmqr.f b/SRC/zunmqr.f
index 2ae205f4fd..07348c65f2 100644
--- a/SRC/zunmqr.f
+++ b/SRC/zunmqr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNMQR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmqr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmqr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -159,11 +157,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unmqr
 *
 *  =====================================================================
       SUBROUTINE ZUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -240,7 +239,8 @@ SUBROUTINE ZUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Compute the workspace requirements
 *
-         NB = MIN( NBMAX, ILAENV( 1, 'ZUNMQR', SIDE // TRANS, M, N, K,
+         NB = MIN( NBMAX, ILAENV( 1, 'ZUNMQR', SIDE // TRANS, M, N,
+     $             K,
      $        -1 ) )
          LWKOPT = NW*NB + TSIZE
          WORK( 1 ) = LWKOPT
@@ -265,7 +265,8 @@ SUBROUTINE ZUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'ZUNMQR', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'ZUNMQR', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -274,7 +275,8 @@ SUBROUTINE ZUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Use unblocked code
 *
-         CALL ZUNM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+         CALL ZUNM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                WORK,
      $                IINFO )
       ELSE
 *
@@ -306,7 +308,8 @@ SUBROUTINE ZUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *           Form the triangular factor of the block reflector
 *           H = H(i) H(i+1) . . . H(i+ib-1)
 *
-            CALL ZLARFT( 'Forward', 'Columnwise', NQ-I+1, IB, A( I, I ),
+            CALL ZLARFT( 'Forward', 'Columnwise', NQ-I+1, IB, A( I,
+     $                   I ),
      $                   LDA, TAU( I ), WORK( IWT ), LDT )
             IF( LEFT ) THEN
 *
@@ -324,7 +327,8 @@ SUBROUTINE ZUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *           Apply H or H**H
 *
-            CALL ZLARFB( SIDE, TRANS, 'Forward', 'Columnwise', MI, NI,
+            CALL ZLARFB( SIDE, TRANS, 'Forward', 'Columnwise', MI,
+     $                   NI,
      $                   IB, A( I, I ), LDA, WORK( IWT ), LDT,
      $                   C( IC, JC ), LDC, WORK, LDWORK )
    10    CONTINUE
diff --git a/SRC/zunmr2.f b/SRC/zunmr2.f
index 3685e9c7c6..6696a7f8f2 100644
--- a/SRC/zunmr2.f
+++ b/SRC/zunmr2.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNMR2 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmr2.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmr2.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -151,11 +149,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unmr2
 *
 *  =====================================================================
       SUBROUTINE ZUNMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -178,14 +177,14 @@ SUBROUTINE ZUNMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *     .. Local Scalars ..
       LOGICAL            LEFT, NOTRAN
       INTEGER            I, I1, I2, I3, MI, NI, NQ
-      COMPLEX*16         AII, TAUI
+      COMPLEX*16         TAUI
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLACGV, ZLARF
+      EXTERNAL           XERBLA, ZLACGV, ZLARF1L
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DCONJG, MAX
@@ -267,10 +266,8 @@ SUBROUTINE ZUNMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
             TAUI = TAU( I )
          END IF
          CALL ZLACGV( NQ-K+I-1, A( I, 1 ), LDA )
-         AII = A( I, NQ-K+I )
-         A( I, NQ-K+I ) = ONE
-         CALL ZLARF( SIDE, MI, NI, A( I, 1 ), LDA, TAUI, C, LDC, WORK )
-         A( I, NQ-K+I ) = AII
+         CALL ZLARF1L( SIDE, MI, NI, A( I, 1 ), LDA, TAUI, C, LDC,
+     $                 WORK )
          CALL ZLACGV( NQ-K+I-1, A( I, 1 ), LDA )
    10 CONTINUE
       RETURN
diff --git a/SRC/zunmr3.f b/SRC/zunmr3.f
index 72d23fa434..6fbc8c8e35 100644
--- a/SRC/zunmr3.f
+++ b/SRC/zunmr3.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNMR3 + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmr3.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmr3.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -159,7 +157,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unmr3
 *
 *> \par Contributors:
 *  ==================
@@ -173,8 +171,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZUNMR3( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
+      SUBROUTINE ZUNMR3( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C,
+     $                   LDC,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zunmrq.f b/SRC/zunmrq.f
index e14e93bf2e..6d6a16ac42 100644
--- a/SRC/zunmrq.f
+++ b/SRC/zunmrq.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNMRQ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmrq.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmrq.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -159,11 +157,12 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unmrq
 *
 *  =====================================================================
       SUBROUTINE ZUNMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -244,7 +243,8 @@ SUBROUTINE ZUNMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
          IF( M.EQ.0 .OR. N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            NB = MIN( NBMAX, ILAENV( 1, 'ZUNMRQ', SIDE // TRANS, M, N,
+            NB = MIN( NBMAX, ILAENV( 1, 'ZUNMRQ', SIDE // TRANS, M,
+     $                N,
      $                               K, -1 ) )
             LWKOPT = NW*NB + TSIZE
          END IF
@@ -269,7 +269,8 @@ SUBROUTINE ZUNMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'ZUNMRQ', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'ZUNMRQ', SIDE // TRANS, M, N,
+     $                   K,
      $                              -1 ) )
          END IF
       END IF
@@ -278,7 +279,8 @@ SUBROUTINE ZUNMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
 *
 *        Use unblocked code
 *
-         CALL ZUNMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+         CALL ZUNMR2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                WORK,
      $                IINFO )
       ELSE
 *
diff --git a/SRC/zunmrz.f b/SRC/zunmrz.f
index 1ec5532846..4e4de13221 100644
--- a/SRC/zunmrz.f
+++ b/SRC/zunmrz.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNMRZ + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmrz.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmrz.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -168,7 +166,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unmrz
 *
 *> \par Contributors:
 *  ==================
@@ -182,8 +180,10 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZUNMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
+      SUBROUTINE ZUNMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C,
+     $                   LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -267,7 +267,8 @@ SUBROUTINE ZUNMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
          IF( M.EQ.0 .OR. N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-            NB = MIN( NBMAX, ILAENV( 1, 'ZUNMRQ', SIDE // TRANS, M, N,
+            NB = MIN( NBMAX, ILAENV( 1, 'ZUNMRQ', SIDE // TRANS, M,
+     $                N,
      $                               K, -1 ) )
             LWKOPT = NW*NB + TSIZE
          END IF
@@ -297,7 +298,8 @@ SUBROUTINE ZUNMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
          IF( LWORK.LT.LWKOPT ) THEN
             NB = (LWORK-TSIZE) / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'ZUNMRQ', SIDE // TRANS, M, N, K,
+            NBMIN = MAX( 2, ILAENV( 2, 'ZUNMRQ', SIDE // TRANS, M, N,
+     $                   K,
      $              -1 ) )
          END IF
       END IF
@@ -346,7 +348,8 @@ SUBROUTINE ZUNMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
 *           Form the triangular factor of the block reflector
 *           H = H(i+ib-1) . . . H(i+1) H(i)
 *
-            CALL ZLARZT( 'Backward', 'Rowwise', L, IB, A( I, JA ), LDA,
+            CALL ZLARZT( 'Backward', 'Rowwise', L, IB, A( I, JA ),
+     $                   LDA,
      $                   TAU( I ), WORK( IWT ), LDT )
 *
             IF( LEFT ) THEN
diff --git a/SRC/zunmtr.f b/SRC/zunmtr.f
index 441a7c2bcc..fa13e1a118 100644
--- a/SRC/zunmtr.f
+++ b/SRC/zunmtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUNMTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -163,11 +161,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup unmtr
 *
 *  =====================================================================
-      SUBROUTINE ZUNMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
+      SUBROUTINE ZUNMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C,
+     $                   LDC,
      $                   WORK, LWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -220,7 +220,8 @@ SUBROUTINE ZUNMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
          INFO = -1
       ELSE IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.LSAME( TRANS, 'C' ) )
+      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND.
+     $         .NOT.LSAME( TRANS, 'C' ) )
      $          THEN
          INFO = -3
       ELSE IF( M.LT.0 ) THEN
@@ -283,7 +284,8 @@ SUBROUTINE ZUNMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
 *
 *        Q was determined by a call to ZHETRD with UPLO = 'U'
 *
-         CALL ZUNMQL( SIDE, TRANS, MI, NI, NQ-1, A( 1, 2 ), LDA, TAU, C,
+         CALL ZUNMQL( SIDE, TRANS, MI, NI, NQ-1, A( 1, 2 ), LDA, TAU,
+     $                C,
      $                LDC, WORK, LWORK, IINFO )
       ELSE
 *
diff --git a/SRC/zupgtr.f b/SRC/zupgtr.f
index 38fca71516..af552d80a9 100644
--- a/SRC/zupgtr.f
+++ b/SRC/zupgtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUPGTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zupgtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zupgtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -107,10 +105,11 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup upgtr
 *
 *  =====================================================================
       SUBROUTINE ZUPGTR( UPLO, N, AP, TAU, Q, LDQ, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/SRC/zupmtr.f b/SRC/zupmtr.f
index c195800261..b37f4b182d 100644
--- a/SRC/zupmtr.f
+++ b/SRC/zupmtr.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download ZUPMTR + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zupmtr.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zupmtr.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -142,11 +140,13 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup upmtr
 *
 *  =====================================================================
-      SUBROUTINE ZUPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC, WORK,
+      SUBROUTINE ZUPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC,
+     $                   WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -169,14 +169,14 @@ SUBROUTINE ZUPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC, WORK,
 *     .. Local Scalars ..
       LOGICAL            FORWRD, LEFT, NOTRAN, UPPER
       INTEGER            I, I1, I2, I3, IC, II, JC, MI, NI, NQ
-      COMPLEX*16         AII, TAUI
+      COMPLEX*16         TAUI
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARF
+      EXTERNAL           XERBLA, ZLARF1, ZLARF1F
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DCONJG, MAX
@@ -265,11 +265,8 @@ SUBROUTINE ZUPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC, WORK,
             ELSE
                TAUI = DCONJG( TAU( I ) )
             END IF
-            AII = AP( II )
-            AP( II ) = ONE
-            CALL ZLARF( SIDE, MI, NI, AP( II-I+1 ), 1, TAUI, C, LDC,
-     $                  WORK )
-            AP( II ) = AII
+            CALL ZLARF1L( SIDE, MI, NI, AP( II-I+1 ), 1, TAUI, C,
+     $                    LDC, WORK )
 *
             IF( FORWRD ) THEN
                II = II + I + 2
@@ -305,8 +302,6 @@ SUBROUTINE ZUPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC, WORK,
          END IF
 *
          DO 20 I = I1, I2, I3
-            AII = AP( II )
-            AP( II ) = ONE
             IF( LEFT ) THEN
 *
 *              H(i) or H(i)**H is applied to C(i+1:m,1:n)
@@ -328,9 +323,8 @@ SUBROUTINE ZUPMTR( SIDE, UPLO, TRANS, M, N, AP, TAU, C, LDC, WORK,
             ELSE
                TAUI = DCONJG( TAU( I ) )
             END IF
-            CALL ZLARF( SIDE, MI, NI, AP( II ), 1, TAUI, C( IC, JC ),
-     $                  LDC, WORK )
-            AP( II ) = AII
+            CALL ZLARF1F( SIDE, MI, NI, AP( II ), 1, TAUI, C( IC,
+     $                    JC ), LDC, WORK )
 *
             IF( FORWRD ) THEN
                II = II + NQ - I + 1
diff --git a/TESTING/CMakeLists.txt b/TESTING/CMakeLists.txt
index 96cdacf821..f9c2482fc8 100644
--- a/TESTING/CMakeLists.txt
+++ b/TESTING/CMakeLists.txt
@@ -1,3 +1,9 @@
+enable_language(Fortran)
+
+# Check for any necessary platform specific compiler flags
+include(CheckLAPACKCompilerFlags)
+CheckLAPACKCompilerFlags()
+
 if(MSVC_VERSION)
 #  string(REPLACE "/STACK:10000000" "/STACK:900000000000000000"
 #    CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
@@ -9,8 +15,8 @@ add_subdirectory(EIG)
 
 
 # Only run this test if python 3 is found
-if(PYTHON_EXECUTABLE)
-  message(STATUS "Running Summary")
+if(PYTHON_EXECUTABLE AND LAPACK_TESTING_USE_PYTHON)
+  message(STATUS "Enabling LAPACK test summary (see TESTING/testing_results.txt)")
   file(COPY ${LAPACK_SOURCE_DIR}/lapack_testing.py DESTINATION ${LAPACK_BINARY_DIR})
   add_test(
     NAME LAPACK_Test_Summary
@@ -32,7 +38,7 @@ function(add_lapack_test output input target)
       -DINTDIR=${CMAKE_CFG_INTDIR}
       -P "${LAPACK_SOURCE_DIR}/TESTING/runtest.cmake")
 
-    if(PYTHONINTERP_FOUND)
+    if(PYTHON_EXECUTABLE AND LAPACK_TESTING_USE_PYTHON)
       set_property(
         TEST LAPACK_Test_Summary
         APPEND PROPERTY DEPENDS LAPACK-${testName}
@@ -47,9 +53,7 @@ add_lapack_test(stest.out stest.in xlintsts)
 # ======== SINGLE RFP LIN TESTS ========================
 add_lapack_test(stest_rfp.out stest_rfp.in xlintstrfs)
 #
-#
 # ======== SINGLE EIG TESTS ===========================
-#
 add_lapack_test(snep.out nep.in xeigtsts)
 add_lapack_test(ssep.out sep.in xeigtsts)
 add_lapack_test(sse2.out se2.in xeigtsts)
@@ -70,6 +74,9 @@ add_lapack_test(sgqr.out gqr.in xeigtsts)
 add_lapack_test(sgsv.out gsv.in xeigtsts)
 add_lapack_test(scsd.out csd.in xeigtsts)
 add_lapack_test(slse.out lse.in xeigtsts)
+#
+# ======== SINGLE DMD EIG TESTS ===========================
+add_lapack_test(sdmd.out sdmd.in xdmdeigtsts)
 endif()
 
 if(BUILD_DOUBLE)
@@ -101,6 +108,9 @@ add_lapack_test(dgqr.out gqr.in xeigtstd)
 add_lapack_test(dgsv.out gsv.in xeigtstd)
 add_lapack_test(dcsd.out csd.in xeigtstd)
 add_lapack_test(dlse.out lse.in xeigtstd)
+#
+# ======== DOUBLE DMD EIG TESTS ===========================
+add_lapack_test(ddmd.out ddmd.in xdmdeigtstd)
 endif()
 
 if(BUILD_COMPLEX)
@@ -130,6 +140,9 @@ add_lapack_test(cgqr.out gqr.in xeigtstc)
 add_lapack_test(cgsv.out gsv.in xeigtstc)
 add_lapack_test(ccsd.out csd.in xeigtstc)
 add_lapack_test(clse.out lse.in xeigtstc)
+#
+# ======== COMPLEX DMD EIG TESTS ===========================
+add_lapack_test(cdmd.out cdmd.in xdmdeigtstc)
 endif()
 
 if(BUILD_COMPLEX16)
@@ -161,6 +174,9 @@ add_lapack_test(zgqr.out gqr.in xeigtstz)
 add_lapack_test(zgsv.out gsv.in xeigtstz)
 add_lapack_test(zcsd.out csd.in xeigtstz)
 add_lapack_test(zlse.out lse.in xeigtstz)
+#
+# ======== COMPLEX16 DMD EIG TESTS ===========================
+add_lapack_test(zdmd.out zdmd.in xdmdeigtstz)
 endif()
 
 
diff --git a/TESTING/EIG/CMakeLists.txt b/TESTING/EIG/CMakeLists.txt
index 5993233bdf..d99762d434 100644
--- a/TESTING/EIG/CMakeLists.txt
+++ b/TESTING/EIG/CMakeLists.txt
@@ -40,7 +40,9 @@ set(SEIGTST schkee.F
    sget54.f sglmts.f sgqrts.f sgrqts.f sgsvts3.f
    shst01.f slarfy.f slarhs.f slatm4.f slctes.f slctsx.f slsets.f sort01.f
    sort03.f ssbt21.f ssgt01.f sslect.f sspt21.f sstt21.f
-   sstt22.f ssyt21.f ssyt22.f)
+   sstt22.f ssyl01.f ssyt21.f ssyt22.f)
+
+set(SDMDEIGTST schkdmd.f90)
 
 set(CEIGTST cchkee.F
    cbdt01.f cbdt02.f cbdt03.f cbdt05.f
@@ -56,9 +58,11 @@ set(CEIGTST cchkee.F
    cget54.f cglmts.f cgqrts.f cgrqts.f cgsvts3.f
    chbt21.f chet21.f chet22.f chpt21.f chst01.f
    clarfy.f clarhs.f clatm4.f clctes.f clctsx.f clsets.f csbmv.f
-   csgt01.f cslect.f
+   csgt01.f cslect.f csyl01.f
    cstt21.f cstt22.f cunt01.f cunt03.f)
 
+set(CDMDEIGTST cchkdmd.f90)
+
 set(DZIGTST dlafts.f dlahd2.f dlasum.f dlatb9.f dstech.f dstect.f
    dsvdch.f dsvdct.f dsxt1.f)
 
@@ -77,7 +81,9 @@ set(DEIGTST dchkee.F
    dget54.f dglmts.f dgqrts.f dgrqts.f dgsvts3.f
    dhst01.f dlarfy.f dlarhs.f dlatm4.f dlctes.f dlctsx.f dlsets.f dort01.f
    dort03.f dsbt21.f dsgt01.f dslect.f dspt21.f dstt21.f
-   dstt22.f dsyt21.f dsyt22.f)
+   dstt22.f dsyl01.f dsyt21.f dsyt22.f)
+
+set(DDMDEIGTST dchkdmd.f90)
 
 set(ZEIGTST zchkee.F
    zbdt01.f zbdt02.f zbdt03.f zbdt05.f
@@ -93,9 +99,11 @@ set(ZEIGTST zchkee.F
    zget54.f zglmts.f zgqrts.f zgrqts.f zgsvts3.f
    zhbt21.f zhet21.f zhet22.f zhpt21.f zhst01.f
    zlarfy.f zlarhs.f zlatm4.f zlctes.f zlctsx.f zlsets.f zsbmv.f
-   zsgt01.f zslect.f
+   zsgt01.f zslect.f zsyl01.f
    zstt21.f zstt22.f zunt01.f zunt03.f)
 
+set(ZDMDEIGTST zchkdmd.f90)
+
 macro(add_eig_executable name)
   add_executable(${name} ${ARGN})
   target_link_libraries(${name} ${TMGLIB} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
@@ -103,16 +111,21 @@ endmacro()
 
 if(BUILD_SINGLE)
 add_eig_executable(xeigtsts ${SEIGTST} ${SCIGTST} ${AEIGTST})
+add_eig_executable(xdmdeigtsts ${SDMDEIGTST})
 endif()
 
 if(BUILD_COMPLEX)
 add_eig_executable(xeigtstc ${CEIGTST} ${SCIGTST} ${AEIGTST})
+add_eig_executable(xdmdeigtstc ${CDMDEIGTST})
 endif()
 
+
 if(BUILD_DOUBLE)
 add_eig_executable(xeigtstd ${DEIGTST} ${DZIGTST} ${AEIGTST})
+add_eig_executable(xdmdeigtstd ${DDMDEIGTST})
 endif()
 
 if(BUILD_COMPLEX16)
 add_eig_executable(xeigtstz ${ZEIGTST} ${DZIGTST} ${AEIGTST})
+add_eig_executable(xdmdeigtstz ${ZDMDEIGTST})
 endif()
diff --git a/TESTING/EIG/Makefile b/TESTING/EIG/Makefile
index e8342cdabe..5de315b6e6 100644
--- a/TESTING/EIG/Makefile
+++ b/TESTING/EIG/Makefile
@@ -62,7 +62,9 @@ SEIGTST = schkee.o \
    sget54.o sglmts.o sgqrts.o sgrqts.o sgsvts3.o \
    shst01.o slarfy.o slarhs.o slatm4.o slctes.o slctsx.o slsets.o sort01.o \
    sort03.o ssbt21.o ssgt01.o sslect.o sspt21.o sstt21.o \
-   sstt22.o ssyt21.o ssyt22.o
+   sstt22.o ssyl01.o ssyt21.o ssyt22.o
+
+SDMDEIGTST = schkdmd.o
 
 CEIGTST = cchkee.o \
    cbdt01.o cbdt02.o cbdt03.o cbdt05.o \
@@ -78,9 +80,11 @@ CEIGTST = cchkee.o \
    cget54.o cglmts.o cgqrts.o cgrqts.o cgsvts3.o \
    chbt21.o chet21.o chet22.o chpt21.o chst01.o \
    clarfy.o clarhs.o clatm4.o clctes.o clctsx.o clsets.o csbmv.o \
-   csgt01.o cslect.o \
+   csgt01.o cslect.o csyl01.o\
    cstt21.o cstt22.o cunt01.o cunt03.o
 
+CDMDEIGTST = cchkdmd.o
+
 DZIGTST = dlafts.o dlahd2.o dlasum.o dlatb9.o dstech.o dstect.o \
    dsvdch.o dsvdct.o dsxt1.o
 
@@ -99,7 +103,9 @@ DEIGTST = dchkee.o \
    dget54.o dglmts.o dgqrts.o dgrqts.o dgsvts3.o \
    dhst01.o dlarfy.o dlarhs.o dlatm4.o dlctes.o dlctsx.o dlsets.o dort01.o \
    dort03.o dsbt21.o dsgt01.o dslect.o dspt21.o dstt21.o \
-   dstt22.o dsyt21.o dsyt22.o
+   dstt22.o dsyl01.o dsyt21.o dsyt22.o
+
+DDMDEIGTST = dchkdmd.o
 
 ZEIGTST = zchkee.o \
    zbdt01.o zbdt02.o zbdt03.o zbdt05.o \
@@ -115,17 +121,31 @@ ZEIGTST = zchkee.o \
    zget54.o zglmts.o zgqrts.o zgrqts.o zgsvts3.o \
    zhbt21.o zhet21.o zhet22.o zhpt21.o zhst01.o \
    zlarfy.o zlarhs.o zlatm4.o zlctes.o zlctsx.o zlsets.o zsbmv.o \
-   zsgt01.o zslect.o \
+   zsgt01.o zslect.o zsyl01.o\
    zstt21.o zstt22.o zunt01.o zunt03.o
 
+ZDMDEIGTST = zchkdmd.o
+
 .PHONY: all
 all: single complex double complex16
 
 .PHONY: single complex double complex16
-single: xeigtsts
-complex: xeigtstc
-double: xeigtstd
-complex16: xeigtstz
+single: xeigtsts xdmdeigtsts
+complex: xeigtstc xdmdeigtstc
+double: xeigtstd xdmdeigtstd
+complex16: xeigtstz xdmdeigtstz
+
+xdmdeigtsts: $(SDMDEIGTST) $(TMGLIB) $(LAPACKLIB) $(BLASLIB)
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
+
+xdmdeigtstc: $(CDMDEIGTST) $(TMGLIB) $(LAPACKLIB) $(BLASLIB)
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
+
+xdmdeigtstd: $(DDMDEIGTST) $(TMGLIB) $(LAPACKLIB) $(BLASLIB)
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
+
+xdmdeigtstz: $(ZDMDEIGTST) $(TMGLIB) $(LAPACKLIB) $(BLASLIB)
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
 
 xeigtsts: $(SEIGTST) $(SCIGTST) $(AEIGTST) $(TMGLIB) $(LAPACKLIB) $(BLASLIB)
 	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
@@ -139,6 +159,10 @@ xeigtstd: $(DEIGTST) $(DZIGTST) $(AEIGTST) $(TMGLIB) $(LAPACKLIB) $(BLASLIB)
 xeigtstz: $(ZEIGTST) $(DZIGTST) $(AEIGTST) $(TMGLIB) $(LAPACKLIB) $(BLASLIB)
 	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
 
+$(SDMDEIGTST): $(FRC)
+$(CDMDEIGTST): $(FRC)
+$(DDMDEIGTST): $(FRC)
+$(ZDMDEIGTST): $(FRC)
 $(AEIGTST): $(FRC)
 $(SCIGTST): $(FRC)
 $(DZIGTST): $(FRC)
@@ -155,7 +179,7 @@ clean: cleanobj cleanexe
 cleanobj:
 	rm -f *.o
 cleanexe:
-	rm -f xeigtst*
+	rm -f xeigtst* xdmdeigtst*
 
 schkee.o: schkee.F
 	$(FC) $(FFLAGS_DRV) -c -o $@ $<
@@ -165,3 +189,11 @@ cchkee.o: cchkee.F
 	$(FC) $(FFLAGS_DRV) -c -o $@ $<
 zchkee.o: zchkee.F
 	$(FC) $(FFLAGS_DRV) -c -o $@ $<
+schkdmd.o: schkdmd.f90
+	$(FC) $(FFLAGS_DRV) -c -o $@ $<
+cchkdmd.o: cchkdmd.f90
+	$(FC) $(FFLAGS_DRV) -c -o $@ $<
+dchkdmd.o: dchkdmd.f90
+	$(FC) $(FFLAGS_DRV) -c -o $@ $<
+zchkdmd.o: zchkdmd.f90
+	$(FC) $(FFLAGS_DRV) -c -o $@ $<
diff --git a/TESTING/EIG/alahdg.f b/TESTING/EIG/alahdg.f
index 597ee4b7aa..87bdb1a3ab 100644
--- a/TESTING/EIG/alahdg.f
+++ b/TESTING/EIG/alahdg.f
@@ -59,6 +59,7 @@
 *
 *  =====================================================================
       SUBROUTINE ALAHDG( IOUNIT, PATH )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/alareq.f b/TESTING/EIG/alareq.f
index 2585a686a0..25ff484e40 100644
--- a/TESTING/EIG/alareq.f
+++ b/TESTING/EIG/alareq.f
@@ -28,12 +28,12 @@
 *> to evaluate the input line which requested NMATS matrix types for
 *> PATH.  The flow of control is as follows:
 *>
-*> If NMATS = NTYPES then
+*> IF NMATS = NTYPES THEN
 *>    DOTYPE(1:NTYPES) = .TRUE.
-*> else
+*> ELSE
 *>    Read the next input line for NMATS matrix types
 *>    Set DOTYPE(I) = .TRUE. for each valid type I
-*> endif
+*> END IF
 *> \endverbatim
 *
 *  Arguments:
@@ -87,6 +87,7 @@
 *
 *  =====================================================================
       SUBROUTINE ALAREQ( PATH, NMATS, DOTYPE, NTYPES, NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/alarqg.f b/TESTING/EIG/alarqg.f
index 6e2e6e7ecf..321e8b6422 100644
--- a/TESTING/EIG/alarqg.f
+++ b/TESTING/EIG/alarqg.f
@@ -28,12 +28,12 @@
 *> to evaluate the input line which requested NMATS matrix types for
 *> PATH.  The flow of control is as follows:
 *>
-*> If NMATS = NTYPES then
+*> IF NMATS = NTYPES THEN
 *>    DOTYPE(1:NTYPES) = .TRUE.
-*> else
+*> ELSE
 *>    Read the next input line for NMATS matrix types
 *>    Set DOTYPE(I) = .TRUE. for each valid type I
-*> endif
+*> END IF
 *> \endverbatim
 *
 *  Arguments:
@@ -87,6 +87,7 @@
 *
 *  =====================================================================
       SUBROUTINE ALARQG( PATH, NMATS, DOTYPE, NTYPES, NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/alasmg.f b/TESTING/EIG/alasmg.f
index ba586d7032..74caaa79d8 100644
--- a/TESTING/EIG/alasmg.f
+++ b/TESTING/EIG/alasmg.f
@@ -70,6 +70,7 @@
 *
 *  =====================================================================
       SUBROUTINE ALASMG( TYPE, NOUT, NFAIL, NRUN, NERRS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/alasum.f b/TESTING/EIG/alasum.f
index 9144a9c087..87654d1457 100644
--- a/TESTING/EIG/alasum.f
+++ b/TESTING/EIG/alasum.f
@@ -70,6 +70,7 @@
 *
 *  =====================================================================
       SUBROUTINE ALASUM( TYPE, NOUT, NFAIL, NRUN, NERRS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/alasvm.f b/TESTING/EIG/alasvm.f
index 118315d1d6..b1e4762623 100644
--- a/TESTING/EIG/alasvm.f
+++ b/TESTING/EIG/alasvm.f
@@ -70,6 +70,7 @@
 *
 *  =====================================================================
       SUBROUTINE ALASVM( TYPE, NOUT, NFAIL, NRUN, NERRS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cbdt01.f b/TESTING/EIG/cbdt01.f
index f5633bdc31..f0d90741e1 100644
--- a/TESTING/EIG/cbdt01.f
+++ b/TESTING/EIG/cbdt01.f
@@ -144,6 +144,7 @@
 *  =====================================================================
       SUBROUTINE CBDT01( M, N, KD, A, LDA, Q, LDQ, D, E, PT, LDPT, WORK,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cbdt02.f b/TESTING/EIG/cbdt02.f
index 6ef39a96b3..611554e96b 100644
--- a/TESTING/EIG/cbdt02.f
+++ b/TESTING/EIG/cbdt02.f
@@ -117,6 +117,7 @@
 *  =====================================================================
       SUBROUTINE CBDT02( M, N, B, LDB, C, LDC, U, LDU, WORK, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cbdt03.f b/TESTING/EIG/cbdt03.f
index 631929b346..e4b8a56238 100644
--- a/TESTING/EIG/cbdt03.f
+++ b/TESTING/EIG/cbdt03.f
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE CBDT03( UPLO, N, KD, D, E, U, LDU, S, VT, LDVT, WORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cbdt05.f b/TESTING/EIG/cbdt05.f
index 9b711fe01b..80934f3ebf 100644
--- a/TESTING/EIG/cbdt05.f
+++ b/TESTING/EIG/cbdt05.f
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE CBDT05( M, N, A, LDA, S, NS, U, LDU,
      $                    VT, LDVT, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cchkbb.f b/TESTING/EIG/cchkbb.f
index d48d6c780d..eca5e4d4d7 100644
--- a/TESTING/EIG/cchkbb.f
+++ b/TESTING/EIG/cchkbb.f
@@ -358,6 +358,7 @@ SUBROUTINE CCHKBB( NSIZES, MVAL, NVAL, NWDTHS, KK, NTYPES, DOTYPE,
      $                   NRHS, ISEED, THRESH, NOUNIT, A, LDA, AB, LDAB,
      $                   BD, BE, Q, LDQ, P, LDP, C, LDC, CC, WORK,
      $                   LWORK, RWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine (input) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cchkbd.f b/TESTING/EIG/cchkbd.f
index 12fc0d3329..84f5d7d9f0 100644
--- a/TESTING/EIG/cchkbd.f
+++ b/TESTING/EIG/cchkbd.f
@@ -412,6 +412,7 @@ SUBROUTINE CCHKBD( NSIZES, MVAL, NVAL, NTYPES, DOTYPE, NRHS,
      $                   ISEED, THRESH, A, LDA, BD, BE, S1, S2, X, LDX,
      $                   Y, Z, Q, LDQ, PT, LDPT, U, VT, WORK, LWORK,
      $                   RWORK, NOUT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -465,8 +466,8 @@ SUBROUTINE CCHKBD( NSIZES, MVAL, NVAL, NTYPES, DOTYPE, NRHS,
 *     .. External Subroutines ..
       EXTERNAL           ALASUM, CBDSQR, CBDT01, CBDT02, CBDT03,
      $                   CGEBRD, CGEMM, CLACPY, CLASET, CLATMR,
-     $                   CLATMS, CUNGBR, CUNT01, SCOPY, SLABAD,
-     $                   SLAHD2, SSVDCH, XERBLA
+     $                   CLATMS, CUNGBR, CUNT01, SCOPY, SLAHD2,
+     $                   SSVDCH, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, EXP, INT, LOG, MAX, MIN, SQRT
@@ -548,7 +549,6 @@ SUBROUTINE CCHKBD( NSIZES, MVAL, NVAL, NTYPES, DOTYPE, NRHS,
       NTEST = 0
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = SLAMCH( 'Overflow' )
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       LOG2UI = INT( LOG( ULPINV ) / LOG( TWO ) )
diff --git a/TESTING/EIG/cchkbk.f b/TESTING/EIG/cchkbk.f
index 6b9b0e24c2..50ec871701 100644
--- a/TESTING/EIG/cchkbk.f
+++ b/TESTING/EIG/cchkbk.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE CCHKBK( NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cchkbl.f b/TESTING/EIG/cchkbl.f
index 894abd4906..566891d549 100644
--- a/TESTING/EIG/cchkbl.f
+++ b/TESTING/EIG/cchkbl.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE CCHKBL( NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cchkdmd.f90 b/TESTING/EIG/cchkdmd.f90
new file mode 100644
index 0000000000..aa90046ff7
--- /dev/null
+++ b/TESTING/EIG/cchkdmd.f90
@@ -0,0 +1,721 @@
+!   This is a test program for checking the implementations of
+!   the implementations of the following subroutines
+!
+!   CGEDMD,  for computation of the
+!            Dynamic Mode Decomposition (DMD)
+!   CGEDMDQ, for computation of a
+!            QR factorization based compressed DMD
+!
+!   Developed and supported by:
+!   ===========================
+!   Developed and coded by Zlatko Drmac, Faculty of Science,
+!   University of Zagreb;  drmac@math.hr
+!   In cooperation with
+!   AIMdyn Inc., Santa Barbara, CA.
+!   ========================================================
+!   How to run the code (compiler, link info)
+!   ========================================================
+!   Compile as FORTRAN 90 (or later) and link with BLAS and
+!   LAPACK libraries.
+!   NOTE: The code is developed and tested on top of the
+!   Intel MKL library (versions 2022.0.3 and 2022.2.0),
+!   using the Intel Fortran compiler.
+!
+!   For developers of the C++ implementation
+!   ========================================================
+!   See the LAPACK++ and Template Numerical Toolkit (TNT)
+!
+!   Note on a development of the GPU HP implementation
+!   ========================================================
+!   Work in progress. See CUDA, MAGMA, SLATE.
+!   NOTE: The four SVD subroutines used in this code are
+!   included as a part of R&D and for the completeness.
+!   This was also an opportunity to test those SVD codes.
+!   If the scaling option is used all four are essentially
+!   equally good. For implementations on HP platforms,
+!   one can use whichever SVD is available.
+!............................................................
+
+!............................................................
+!............................................................
+!
+      PROGRAM DMD_TEST
+
+      use iso_fortran_env
+      IMPLICIT NONE
+      integer, parameter :: WP = real32
+!............................................................
+      REAL(KIND=WP), PARAMETER ::  ONE = 1.0_WP
+      REAL(KIND=WP), PARAMETER :: ZERO = 0.0_WP
+
+      COMPLEX(KIND=WP), PARAMETER ::  CONE = ( 1.0_WP, 0.0_WP )
+      COMPLEX(KIND=WP), PARAMETER :: CZERO = ( 0.0_WP, 0.0_WP )
+!............................................................
+      REAL(KIND=WP), ALLOCATABLE, DIMENSION(:)   :: RES, &
+                     RES1, RESEX, SINGVX, SINGVQX, WORK
+      INTEGER      , ALLOCATABLE, DIMENSION(:)   ::   IWORK
+      REAL(KIND=WP) :: WDUMMY(2)
+      INTEGER       :: IDUMMY(4), ISEED(4)
+      REAL(KIND=WP) :: ANORM, COND, CONDL, CONDR, EPS,       &
+                       TOL, TOL2, SVDIFF, TMP, TMP_AU,       &
+                       TMP_FQR, TMP_REZ, TMP_REZQ,  TMP_XW, &
+                       TMP_EX
+!............................................................
+      COMPLEX(KIND=WP) :: CMAX
+      INTEGER :: LCWORK
+      COMPLEX(KIND=WP), ALLOCATABLE, DIMENSION(:,:) ::  A, AC,  &
+                                 AU, F, F0, F1, S, W,  &
+                                 X, X0, Y, Y0, Y1, Z, Z1
+      COMPLEX(KIND=WP), ALLOCATABLE, DIMENSION(:)   ::  CDA, CDR, &
+                                       CDL, CEIGS, CEIGSA, CWORK
+      COMPLEX(KIND=WP) ::  CDUMMY(22), CDUM2X2(2,2)
+!............................................................
+      INTEGER :: K, KQ, LDF, LDS, LDA, LDAU, LDW, LDX, LDY,  &
+                 LDZ, LIWORK, LWORK, M, N, LLOOP, NRNK
+      INTEGER :: i, iJOBREF, iJOBZ, iSCALE, INFO, j,     &
+                 NFAIL, NFAIL_AU, NFAIL_F_QR, NFAIL_REZ,     &
+                 NFAIL_REZQ, NFAIL_SVDIFF, NFAIL_TOTAL, NFAILQ_TOTAL,  &
+                 NFAIL_Z_XV,  MODE, MODEL, MODER, WHTSVD
+      INTEGER :: iNRNK, iWHTSVD,  K_traj, LWMINOPT
+      CHARACTER :: GRADE, JOBREF, JOBZ, PIVTNG, RSIGN,   &
+                   SCALE, RESIDS, WANTQ, WANTR
+      LOGICAL :: TEST_QRDMD
+
+!..... external subroutines (BLAS and LAPACK)
+      EXTERNAL CAXPY, CGEEV, CGEMM, CGEMV, CLASCL
+!.....external subroutines DMD package
+!     subroutines under test
+      EXTERNAL CGEDMD, CGEDMDQ
+!..... external functions (BLAS and LAPACK)
+      EXTERNAL         SCNRM2, SLAMCH
+      REAL(KIND=WP) :: SCNRM2, SLAMCH
+      EXTERNAL         CLANGE
+      REAL(KIND=WP) :: CLANGE
+      EXTERNAL ICAMAX
+      INTEGER  ICAMAX
+      EXTERNAL LSAME
+      LOGICAL  LSAME
+
+      INTRINSIC ABS, INT, MIN, MAX, SIGN
+!............................................................
+
+
+      WRITE(*,*) 'COMPLEX CODE TESTING'
+
+      ! The test is always in pairs : ( CGEDMD and CGEDMDQ)
+      ! because the test includes comparing the results (in pairs).
+!.....................................................................................
+      ! This code by default performs tests on CGEDMDQ
+      ! Since the QR factorizations based algorithm is designed for
+      ! single trajectory data, only single trajectory tests will
+      ! be performed with xGEDMDQ.
+
+      WANTQ = 'Q'
+      WANTR = 'R'
+!.................................................................................
+
+      EPS = SLAMCH( 'P' )  ! machine precision WP
+
+      ! Global counters of failures of some particular tests
+      NFAIL      = 0
+      NFAIL_REZ  = 0
+      NFAIL_REZQ = 0
+      NFAIL_Z_XV = 0
+      NFAIL_F_QR = 0
+      NFAIL_AU   = 0
+      NFAIL_SVDIFF = 0
+      NFAIL_TOTAL  = 0
+      NFAILQ_TOTAL = 0
+
+      DO LLOOP = 1, 4
+
+      WRITE(*,*) 'L Loop Index = ', LLOOP
+
+      ! Set the dimensions of the problem ...
+      READ(*,*) M
+      WRITE(*,*) 'M = ', M
+      ! ... and the number of snapshots.
+      READ(*,*) N
+      WRITE(*,*) 'N = ', N
+
+      ! Test the dimensions
+      IF ( ( MIN(M,N) == 0 ) .OR. ( M < N )  ) THEN
+          WRITE(*,*) 'Bad dimensions. Required: M >= N > 0.'
+          STOP
+      END IF
+!.............
+      ! The seed inside the LLOOP so that each pass can be reproduced easily.
+      ISEED(1) = 4
+      ISEED(2) = 3
+      ISEED(3) = 2
+      ISEED(4) = 1
+
+      LDA  = M
+      LDF  = M
+      LDX  = M
+      LDY  = M
+      LDW  = N
+      LDZ  = M
+      LDAU = M
+      LDS  = N
+
+      TMP_XW  = ZERO
+      TMP_AU   = ZERO
+      TMP_REZ  = ZERO
+      TMP_REZQ = ZERO
+      SVDIFF   = ZERO
+      TMP_EX   = ZERO
+
+      ALLOCATE( A(LDA,M) )
+      ALLOCATE( AC(LDA,M) )
+      ALLOCATE( F(LDF,N+1) )
+      ALLOCATE( F0(LDF,N+1) )
+      ALLOCATE( F1(LDF,N+1) )
+      ALLOCATE( X(LDX,N) )
+      ALLOCATE( X0(LDX,N) )
+      ALLOCATE( Y(LDY,N+1) )
+      ALLOCATE( Y0(LDY,N+1) )
+      ALLOCATE( Y1(LDY,N+1) )
+      ALLOCATE( AU(LDAU,N) )
+      ALLOCATE( W(LDW,N) )
+      ALLOCATE( S(LDS,N) )
+      ALLOCATE( Z(LDZ,N) )
+      ALLOCATE( Z1(LDZ,N) )
+      ALLOCATE( RES(N) )
+      ALLOCATE( RES1(N) )
+      ALLOCATE( RESEX(N) )
+      ALLOCATE( CEIGS(N) )
+      ALLOCATE( SINGVX(N) )
+      ALLOCATE( SINGVQX(N) )
+
+      TOL  = 10*M*EPS
+      TOL2 = 10*M*N*EPS
+
+!.............
+
+      DO K_traj = 1, 2
+      !  Number of intial conditions in the simulation/trajectories (1 or 2)
+
+      COND   = 1.0D4
+      CMAX   = (1.0D1,1.0D1)
+      RSIGN  = 'F'
+      GRADE  = 'N'
+      MODEL  = 6
+      CONDL  = 1.0D1
+      MODER  = 6
+      CONDR  = 1.0D1
+      PIVTNG = 'N'
+      ! Loop over all parameter MODE values for CLATMR (+-1,..,+-6)
+
+      DO MODE = 1, 6
+
+      ALLOCATE( IWORK(2*M) )
+      ALLOCATE( CDA(M) )
+      ALLOCATE( CDL(M) )
+      ALLOCATE( CDR(M) )
+
+      CALL CLATMR( M, M, 'N', ISEED, 'N', CDA, MODE, COND, &
+                   CMAX, RSIGN, GRADE, CDL, MODEL,  CONDL, &
+                   CDR, MODER, CONDR, PIVTNG, IWORK, M, M, &
+                   ZERO, -ONE, 'N', A, LDA, IWORK(M+1), INFO )
+      DEALLOCATE( CDR )
+      DEALLOCATE( CDL )
+      DEALLOCATE( CDA )
+      DEALLOCATE( IWORK )
+
+      LCWORK = MAX(1,2*M)
+      ALLOCATE( CEIGSA(M) )
+      ALLOCATE( CWORK(LCWORK) )
+      ALLOCATE( WORK(2*M) )
+      AC(1:M,1:M) = A(1:M,1:M)
+      CALL CGEEV( 'N','N', M, AC, LDA, CEIGSA, CDUM2X2, 2, &
+                  CDUM2X2, 2, CWORK, LCWORK, WORK, INFO ) ! LAPACK CALL
+      DEALLOCATE(WORK)
+      DEALLOCATE(CWORK)
+
+      TMP = ABS(CEIGSA(ICAMAX(M, CEIGSA, 1))) ! The spectral radius of A
+      ! Scale the matrix A to have unit spectral radius.
+      CALL CLASCL( 'G',0, 0, TMP, ONE, M, M, &
+                   A, LDA, INFO )
+      CALL CLASCL( 'G',0, 0, TMP, ONE, M, 1, &
+                   CEIGSA, M, INFO )
+      ANORM = CLANGE( 'F', M, M, A, LDA, WDUMMY )
+
+      IF ( K_traj == 2 ) THEN
+          ! generate data as two trajectories
+          ! with two inital conditions
+          CALL CLARNV(2, ISEED, M, F(1,1) )
+          DO i = 1, N/2
+             CALL CGEMV( 'N', M, M, CONE, A, LDA, F(1,i), 1,  &
+                  CZERO, F(1,i+1), 1 )
+          END DO
+          X0(1:M,1:N/2) = F(1:M,1:N/2)
+          Y0(1:M,1:N/2) = F(1:M,2:N/2+1)
+
+          CALL CLARNV(2, ISEED, M, F(1,1) )
+          DO i = 1, N-N/2
+             CALL CGEMV( 'N', M, M, CONE, A, LDA, F(1,i), 1,  &
+                  CZERO, F(1,i+1), 1 )
+          END DO
+          X0(1:M,N/2+1:N) = F(1:M,1:N-N/2)
+          Y0(1:M,N/2+1:N) = F(1:M,2:N-N/2+1)
+      ELSE
+          CALL CLARNV(2, ISEED, M, F(1,1) )
+          DO i = 1, N
+             CALL CGEMV( 'N', M, M, CONE, A, M, F(1,i), 1,  &
+                  CZERO, F(1,i+1), 1 )
+          END DO
+          F0(1:M,1:N+1) = F(1:M,1:N+1)
+          X0(1:M,1:N) = F0(1:M,1:N)
+          Y0(1:M,1:N) = F0(1:M,2:N+1)
+      END IF
+
+      DEALLOCATE( CEIGSA )
+!........................................................................
+
+      DO iJOBZ = 1, 4
+
+          SELECT CASE ( iJOBZ )
+          CASE(1)
+              JOBZ   = 'V'
+              RESIDS = 'R'
+          CASE(2)
+              JOBZ   = 'V'
+              RESIDS = 'N'
+          CASE(3)
+              JOBZ   = 'F'
+              RESIDS = 'N'
+          CASE(4)
+              JOBZ   = 'N'
+              RESIDS = 'N'
+          END SELECT
+
+      DO iJOBREF = 1, 3
+
+          SELECT CASE ( iJOBREF )
+          CASE(1)
+              JOBREF = 'R'
+          CASE(2)
+              JOBREF = 'E'
+          CASE(3)
+              JOBREF = 'N'
+          END SELECT
+
+      DO iSCALE = 1, 4
+
+          SELECT CASE ( iSCALE )
+          CASE(1)
+              SCALE = 'S'
+          CASE(2)
+              SCALE = 'C'
+          CASE(3)
+              SCALE = 'Y'
+          CASE(4)
+              SCALE = 'N'
+          END SELECT
+
+      DO iNRNK = -1, -2, -1
+          NRNK   = iNRNK
+
+      DO iWHTSVD = 1,  3
+         ! Check all four options to compute the POD basis
+         ! via the SVD.
+         WHTSVD   = iWHTSVD
+
+      DO LWMINOPT = 1, 2
+         ! Workspace query for the minimal (1) and for the optimal
+         ! (2) workspace lengths determined by workspace query.
+
+      ! CGEDMD is always tested and its results are also used for
+      ! comparisons with CGEDMDQ.
+
+      X(1:M,1:N) = X0(1:M,1:N)
+      Y(1:M,1:N) = Y0(1:M,1:N)
+
+      CALL CGEDMD( SCALE, JOBZ, RESIDS, JOBREF, WHTSVD,  &
+                M,  N, X, LDX, Y, LDY, NRNK, TOL,  &
+                K, CEIGS, Z, LDZ,  RES,  &
+                AU, LDAU, W,  LDW,   S, LDS,        &
+                CDUMMY, -1, WDUMMY, -1, IDUMMY, -1, INFO )
+
+      IF ( (INFO .EQ. 2) .OR. ( INFO .EQ. 3 ) &
+                       .OR. ( INFO < 0 ) ) THEN
+        WRITE(*,*) 'Call to CGEDMD workspace query failed. &
+                   &Check the calling sequence and the code.'
+        WRITE(*,*) 'The error code is ', INFO
+        WRITE(*,*) 'The input parameters were ',      &
+        SCALE, JOBZ, RESIDS, JOBREF, WHTSVD,          &
+        M, N, LDX, LDY, NRNK, TOL, LDZ, LDAU, LDW, LDS
+        STOP
+      ELSE
+        !WRITE(*,*) '... done. Workspace length computed.'
+      END IF
+
+      LCWORK = INT(CDUMMY(LWMINOPT))
+      ALLOCATE(CWORK(LCWORK))
+      LIWORK = IDUMMY(1)
+      ALLOCATE(IWORK(LIWORK))
+      LWORK = INT(WDUMMY(1))
+      ALLOCATE(WORK(LWORK))
+
+      CALL CGEDMD( SCALE, JOBZ, RESIDS, JOBREF, WHTSVD,  &
+                   M,  N, X, LDX, Y, LDY, NRNK, TOL,  &
+                   K, CEIGS, Z, LDZ,  RES,  &
+                   AU, LDAU, W,  LDW,   S, LDS,        &
+                   CWORK, LCWORK, WORK, LWORK, IWORK, LIWORK, INFO )
+      IF ( INFO /= 0 ) THEN
+           WRITE(*,*) 'Call to CGEDMD failed. &
+           &Check the calling sequence and the code.'
+           WRITE(*,*) 'The error code is ', INFO
+           WRITE(*,*) 'The input parameters were ',&
+           SCALE, JOBZ, RESIDS, JOBREF, WHTSVD, &
+           M, N, LDX, LDY, NRNK, TOL
+           STOP
+      END IF
+      SINGVX(1:N) = WORK(1:N)
+
+      !...... CGEDMD check point
+      IF ( LSAME(JOBZ,'V')  ) THEN
+          ! Check that Z = X*W, on return from CGEDMD
+          ! This checks that the returned eigenvectors in Z are
+          ! the product of the SVD'POD basis returned in X
+          ! and the eigenvectors of the Rayleigh quotient
+          ! returned in W
+          CALL CGEMM( 'N', 'N', M, K, K, CONE, X, LDX, W, LDW, &
+                      CZERO, Z1, LDZ )
+          TMP = ZERO
+          DO i = 1, K
+             CALL CAXPY( M, -CONE, Z(1,i), 1, Z1(1,i), 1)
+             TMP = MAX(TMP, SCNRM2( M, Z1(1,i), 1 ) )
+          END DO
+          TMP_XW = MAX(TMP_XW, TMP )
+          IF ( TMP_XW <= TOL ) THEN
+              !WRITE(*,*) ' :) .... OK .........CGEDMD PASSED.'
+          ELSE
+              NFAIL_Z_XV = NFAIL_Z_XV + 1
+              WRITE(*,*) ':( .................CGEDMD FAILED!', &
+                  'Check the code for implementation errors.'
+              WRITE(*,*) 'The input parameters were ',&
+                 SCALE, JOBZ, RESIDS, JOBREF, WHTSVD, &
+                 M, N, LDX, LDY, NRNK, TOL
+          END IF
+      END IF
+      !...... CGEDMD check point
+
+      IF ( LSAME(JOBREF,'R') ) THEN
+           ! The matrix A*U is returned for computing refined Ritz vectors.
+           ! Check that A*U is computed correctly using the formula
+           ! A*U = Y * V * inv(SIGMA). This depends on the
+           ! accuracy in the computed singular values and vectors of X.
+           ! See the paper for an error analysis.
+           ! Note that the left singular vectors of the input matrix X
+           ! are returned in the array X.
+           CALL CGEMM( 'N', 'N', M, K, M, CONE, A, LDA, X, LDX, &
+                      CZERO, Z1, LDZ )
+          TMP = ZERO
+          DO i = 1, K
+             CALL CAXPY( M, -CONE, AU(1,i), 1, Z1(1,i), 1)
+             TMP = MAX( TMP, SCNRM2( M, Z1(1,i),1 ) * &
+                     SINGVX(K)/(ANORM*SINGVX(1)) )
+          END DO
+          TMP_AU = MAX( TMP_AU, TMP )
+          IF ( TMP <= TOL2 ) THEN
+              !WRITE(*,*) ':) .... OK .........CGEDMD PASSED.'
+          ELSE
+              NFAIL_AU = NFAIL_AU + 1
+              WRITE(*,*) ':( .................CGEDMD FAILED!', &
+                  'Check the code for implementation errors.'
+              WRITE(*,*) 'The input parameters were ',&
+                 SCALE, JOBZ, RESIDS, JOBREF, WHTSVD, &
+                 M, N, LDX, LDY, NRNK, TOL2
+          END IF
+      ELSEIF ( LSAME(JOBREF,'E') ) THEN
+          ! The unscaled vectors of the Exact DMD are computed.
+          ! This option is included for the sake of completeness,
+          ! for users who prefer the Exact DMD vectors. The
+          ! returned vectors are in the real form, in the same way
+          ! as the Ritz vectors. Here we just save the vectors
+          ! and test them separately using a Matlab script.
+          CALL CGEMM( 'N', 'N', M, K, M, CONE, A, LDA, AU, LDAU, CZERO, Y1, LDY )
+
+          DO i=1, K
+             CALL CAXPY( M, -CEIGS(i), AU(1,i), 1, Y1(1,i), 1 )
+             RESEX(i) = SCNRM2( M, Y1(1,i), 1) / SCNRM2(M,AU(1,i),1)
+          END DO
+      END IF
+      !...... CGEDMD check point
+
+      IF ( LSAME(RESIDS, 'R') ) THEN
+          ! Compare the residuals returned by CGEDMD with the
+          ! explicitly computed residuals using the matrix A.
+          ! Compute explicitly Y1 = A*Z
+          CALL CGEMM( 'N', 'N', M, K, M, CONE, A, LDA, Z, LDZ, CZERO, Y1, LDY )
+          ! ... and then A*Z(:,i) - LAMBDA(i)*Z(:,i), using the real forms
+          ! of the invariant subspaces that correspond to complex conjugate
+          ! pairs of eigencalues. (See the description of Z in CGEDMD,)
+
+          DO i=1, K
+                ! have a real eigenvalue with real eigenvector
+                CALL CAXPY( M, -CEIGS(i), Z(1,i), 1, Y1(1,i), 1 )
+                RES1(i) = SCNRM2( M, Y1(1,i), 1)
+          END DO
+          TMP = ZERO
+          DO i = 1, K
+          TMP = MAX( TMP, ABS(RES(i) - RES1(i)) * &
+                    SINGVX(K)/(ANORM*SINGVX(1)) )
+          END DO
+          TMP_REZ = MAX( TMP_REZ, TMP )
+          IF ( TMP <= TOL2 ) THEN
+              !WRITE(*,*) ':) .... OK ..........CGEDMD PASSED.'
+          ELSE
+              NFAIL_REZ = NFAIL_REZ + 1
+              WRITE(*,*) ':( ..................CGEDMD FAILED!', &
+                  'Check the code for implementation errors.'
+              WRITE(*,*) 'The input parameters were ',&
+                 SCALE, JOBZ, RESIDS, JOBREF, WHTSVD, &
+                 M, N, LDX, LDY, NRNK, TOL
+          END IF
+
+
+         IF ( LSAME(JOBREF,'E') ) THEN
+            TMP = ZERO
+          DO i = 1, K
+          TMP = MAX( TMP, ABS(RES1(i) - RESEX(i))/(RES1(i)+RESEX(i)) )
+          END DO
+          TMP_EX = MAX(TMP_EX,TMP)
+         END IF
+
+      END IF
+
+      DEALLOCATE(CWORK)
+      DEALLOCATE(WORK)
+      DEALLOCATE(IWORK)
+
+!.......................................................................................................
+
+      IF ( K_traj == 1 ) THEN
+
+          F(1:M,1:N+1) = F0(1:M,1:N+1)
+          CALL CGEDMDQ( SCALE, JOBZ, RESIDS, WANTQ, WANTR, JOBREF, &
+                    WHTSVD, M, N+1, F, LDF,  X, LDX,  Y, LDY,  &
+                    NRNK,  TOL, K, CEIGS, Z, LDZ, RES,  AU,  &
+                    LDAU, W, LDW, S, LDS, CDUMMY, -1,   &
+                    WDUMMY,  -1, IDUMMY, -1, INFO )
+
+          LCWORK = INT(CDUMMY(LWMINOPT))
+          ALLOCATE(CWORK(LCWORK))
+          LIWORK = IDUMMY(1)
+          ALLOCATE(IWORK(LIWORK))
+          LWORK = INT(WDUMMY(1))
+          ALLOCATE(WORK(LWORK))
+
+          CALL CGEDMDQ( SCALE, JOBZ, RESIDS, WANTQ, WANTR, JOBREF, &
+                        WHTSVD, M, N+1, F, LDF,  X, LDX,  Y, LDY,  &
+                        NRNK,  TOL, KQ, CEIGS, Z, LDZ, RES,  AU,  &
+                        LDAU, W, LDW, S, LDS, CWORK, LCWORK,   &
+                        WORK,  LWORK, IWORK, LIWORK, INFO )
+          IF ( INFO /= 0 ) THEN
+                 WRITE(*,*) 'Call to CGEDMDQ failed. &
+                 &Check the calling sequence and the code.'
+                 WRITE(*,*) 'The error code is ', INFO
+                 WRITE(*,*) 'The input parameters were ',&
+                 SCALE, JOBZ, RESIDS, WANTQ, WANTR, WHTSVD, &
+                 M, N, LDX, LDY, NRNK, TOL
+                 STOP
+          END IF
+          SINGVQX(1:N) =WORK(1:N)
+
+          !..... ZGEDMDQ check point
+
+          TMP = ZERO
+          DO i = 1, MIN(K, KQ)
+             TMP = MAX(TMP, ABS(SINGVX(i)-SINGVQX(i)) / &
+                                   SINGVX(1) )
+          END DO
+          SVDIFF = MAX( SVDIFF, TMP )
+          IF ( TMP > TOL2 ) THEN
+               WRITE(*,*) 'FAILED! Something was wrong with the run.'
+             NFAIL_SVDIFF = NFAIL_SVDIFF + 1
+          END IF
+          !..... CGEDMDQ check point
+
+          !..... CGEDMDQ check point
+          IF ( LSAME(WANTQ,'Q') .AND. LSAME(WANTR,'R') ) THEN
+             ! Check that the QR factors are computed and returned
+             ! as requested. The residual ||F-Q*R||_F / ||F||_F
+             ! is compared to M*N*EPS.
+             F1(1:M,1:N+1) = F0(1:M,1:N+1)
+             CALL CGEMM( 'N', 'N', M, N+1, MIN(M,N+1), -CONE, F, &
+                         LDF, Y, LDY, CONE, F1, LDF )
+             TMP_FQR = CLANGE( 'F', M, N+1, F1, LDF, WORK ) / &
+                   CLANGE( 'F', M, N+1, F0,  LDF, WORK )
+             IF ( TMP_FQR <= TOL2 ) THEN
+                !WRITE(*,*) ':) CGEDMDQ ........ PASSED.'
+             ELSE
+                WRITE(*,*) ':( CGEDMDQ ........ FAILED.'
+                NFAIL_F_QR = NFAIL_F_QR + 1
+             END IF
+          END IF
+          !..... ZGEDMDQ checkpoint
+                 !..... ZGEDMDQ checkpoint
+          IF ( LSAME(RESIDS, 'R') ) THEN
+              ! Compare the residuals returned by ZGEDMDQ with the
+              ! explicitly computed residuals using the matrix A.
+              ! Compute explicitly Y1 = A*Z
+              CALL CGEMM( 'N', 'N', M, KQ, M, CONE, A, LDA, Z, LDZ, CZERO, Y1, LDY )
+              ! ... and then A*Z(:,i) - LAMBDA(i)*Z(:,i), using the real forms
+              ! of the invariant subspaces that correspond to complex conjugate
+              ! pairs of eigencalues. (See the description of Z in ZGEDMDQ)
+              DO i = 1, KQ
+                    ! have a real eigenvalue with real eigenvector
+                    CALL CAXPY( M, -CEIGS(i), Z(1,i), 1, Y1(1,i), 1 )
+                    ! Y(1:M,i) = Y(1:M,i) - REIG(i)*Z(1:M,i)
+                    RES1(i) = SCNRM2( M, Y1(1,i), 1)
+              END DO
+              TMP = ZERO
+              DO i = 1, KQ
+              TMP = MAX( TMP, ABS(RES(i) - RES1(i)) * &
+                  SINGVQX(KQ)/(ANORM*SINGVQX(1)) )
+              END DO
+              TMP_REZQ = MAX( TMP_REZQ, TMP )
+              IF ( TMP <= TOL2 ) THEN
+                  !WRITE(*,*) '.... OK ........ CGEDMDQ PASSED.'
+              ELSE
+                  NFAIL_REZQ = NFAIL_REZQ + 1
+                  WRITE(*,*) '................ CGEDMDQ FAILED!', &
+                      'Check the code for implementation errors.'
+              END IF
+          END IF
+
+          DEALLOCATE(CWORK)
+          DEALLOCATE(WORK)
+          DEALLOCATE(IWORK)
+
+      END IF
+
+      END DO   ! LWMINOPT
+      !write(*,*) 'LWMINOPT loop completed'
+      END DO   ! iWHTSVD
+      !write(*,*) 'WHTSVD loop completed'
+      END DO   ! iNRNK  -2:-1
+      !write(*,*) 'NRNK loop completed'
+      END DO   ! iSCALE  1:4
+      !write(*,*) 'SCALE loop completed'
+      END DO
+      !write(*,*) 'JOBREF loop completed'
+      END DO   ! iJOBZ
+      !write(*,*) 'JOBZ loop completed'
+
+      END DO ! MODE -6:6
+      !write(*,*) 'MODE loop completed'
+      END DO ! 1 or 2 trajectories
+      !write(*,*) 'trajectories  loop completed'
+
+      DEALLOCATE( A )
+      DEALLOCATE( AC )
+      DEALLOCATE( Z )
+      DEALLOCATE( F )
+      DEALLOCATE( F0 )
+      DEALLOCATE( F1 )
+      DEALLOCATE( X )
+      DEALLOCATE( X0 )
+      DEALLOCATE( Y )
+      DEALLOCATE( Y0 )
+      DEALLOCATE( Y1 )
+      DEALLOCATE( AU )
+      DEALLOCATE( W )
+      DEALLOCATE( S )
+      DEALLOCATE( Z1 )
+      DEALLOCATE( RES )
+      DEALLOCATE( RES1 )
+      DEALLOCATE( RESEX )
+      DEALLOCATE( CEIGS )
+      DEALLOCATE( SINGVX )
+      DEALLOCATE( SINGVQX )
+
+      END DO ! LLOOP
+
+      WRITE(*,*)
+      WRITE(*,*) '>>>>>>>>>>>>>>>>>>>>>>>>>>'
+      WRITE(*,*) ' Test summary for CGEDMD :'
+      WRITE(*,*) '>>>>>>>>>>>>>>>>>>>>>>>>>>'
+      WRITE(*,*)
+      IF ( NFAIL_Z_XV == 0 ) THEN
+          WRITE(*,*) '>>>> Z - U*V test PASSED.'
+      ELSE
+          WRITE(*,*) 'Z - U*V test FAILED ', NFAIL_Z_XV, ' time(s)'
+          WRITE(*,*) 'Max error ||Z-U*V||_F was ', TMP_XW
+          NFAIL_TOTAL = NFAIL_TOTAL + NFAIL_z_XV
+      END IF
+
+      IF ( NFAIL_AU == 0 ) THEN
+          WRITE(*,*) '>>>> A*U test PASSED. '
+      ELSE
+          WRITE(*,*) 'A*U test FAILED ', NFAIL_AU, ' time(s)'
+          WRITE(*,*) 'Max A*U test adjusted error measure was ', TMP_AU
+          WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+          NFAIL_TOTAL = NFAIL_TOTAL + NFAIL_AU
+      END IF
+
+
+      IF ( NFAIL_REZ == 0 ) THEN
+         WRITE(*,*) '>>>> Rezidual computation test PASSED.'
+      ELSE
+        WRITE(*,*) 'Rezidual computation test FAILED ', NFAIL_REZ, 'time(s)'
+        WRITE(*,*) 'Max residual computing test adjusted error measure was ', TMP_REZ
+        WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+        NFAIL_TOTAL = NFAIL_TOTAL + NFAIL_REZ
+      END IF
+      IF ( NFAIL_TOTAL == 0 ) THEN
+        WRITE(*,*) '>>>> CGEDMD :: ALL TESTS PASSED.'
+      ELSE
+        WRITE(*,*) NFAIL_TOTAL, 'FAILURES!'
+        WRITE(*,*) '>>>>>>>>>>>>>> CGEDMD :: TESTS FAILED. CHECK THE IMPLEMENTATION.'
+      END IF
+
+      WRITE(*,*)
+      WRITE(*,*) '>>>>>>>>>>>>>>>>>>>>>>>>>>'
+      WRITE(*,*) ' Test summary for CGEDMDQ :'
+      WRITE(*,*) '>>>>>>>>>>>>>>>>>>>>>>>>>>'
+      WRITE(*,*)
+
+      IF ( NFAIL_SVDIFF == 0 ) THEN
+        WRITE(*,*) '>>>> CGEDMD and CGEDMDQ computed singular &
+           &values test PASSED.'
+      ELSE
+        WRITE(*,*) 'ZGEDMD and ZGEDMDQ discrepancies in &
+            &the singular values unacceptable ', &
+            NFAIL_SVDIFF, ' times. Test FAILED.'
+        WRITE(*,*) 'The maximal discrepancy in the singular values (relative to the norm) was ', SVDIFF
+        WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+        NFAILQ_TOTAL = NFAILQ_TOTAL + NFAIL_SVDIFF
+      END IF
+      IF ( NFAIL_F_QR == 0 ) THEN
+        WRITE(*,*) '>>>> F - Q*R test PASSED.'
+      ELSE
+        WRITE(*,*) 'F - Q*R test FAILED ', NFAIL_F_QR, ' time(s)'
+        WRITE(*,*) 'The largest relative residual was ', TMP_FQR
+        WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+        NFAILQ_TOTAL = NFAILQ_TOTAL + NFAIL_F_QR
+      END IF
+
+      IF ( NFAIL_REZQ == 0 ) THEN
+        WRITE(*,*) '>>>> Rezidual computation test PASSED.'
+      ELSE
+        WRITE(*,*) 'Rezidual computation test FAILED ', NFAIL_REZQ, 'time(s)'
+        WRITE(*,*) 'Max residual computing test adjusted error measure was ', TMP_REZQ
+        WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+        NFAILQ_TOTAL = NFAILQ_TOTAL + NFAIL_REZQ
+      END IF
+
+      IF ( NFAILQ_TOTAL == 0 ) THEN
+        WRITE(*,*) '>>>>>>> CGEDMDQ :: ALL TESTS PASSED.'
+      ELSE
+        WRITE(*,*) NFAILQ_TOTAL, 'FAILURES!'
+        WRITE(*,*) '>>>>>>> CGEDMDQ :: TESTS FAILED. CHECK THE IMPLEMENTATION.'
+      END IF
+
+      WRITE(*,*)
+      WRITE(*,*) 'Test completed.'
+      STOP
+      END
diff --git a/TESTING/EIG/cchkec.f b/TESTING/EIG/cchkec.f
index 6727a0954b..3dffdef489 100644
--- a/TESTING/EIG/cchkec.f
+++ b/TESTING/EIG/cchkec.f
@@ -23,7 +23,7 @@
 *> \verbatim
 *>
 *> CCHKEC tests eigen- condition estimation routines
-*>        CTRSYL, CTREXC, CTRSNA, CTRSEN
+*>        CTRSYL, CTRSYL3, CTREXC, CTRSNA, CTRSEN
 *>
 *> In all cases, the routine runs through a fixed set of numerical
 *> examples, subjects them to various tests, and compares the test
@@ -72,6 +72,7 @@
 *
 *  =====================================================================
       SUBROUTINE CCHKEC( THRESH, TSTERR, NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -88,17 +89,17 @@ SUBROUTINE CCHKEC( THRESH, TSTERR, NIN, NOUT )
 *     .. Local Scalars ..
       LOGICAL            OK
       CHARACTER*3        PATH
-      INTEGER            KTREXC, KTRSEN, KTRSNA, KTRSYL, LTREXC, LTRSYL,
-     $                   NTESTS, NTREXC, NTRSYL
-      REAL               EPS, RTREXC, RTRSYL, SFMIN
+      INTEGER            KTREXC, KTRSEN, KTRSNA, KTRSYL, KTRSYL3,
+     $                   LTREXC, LTRSYL, NTESTS, NTREXC, NTRSYL
+      REAL               EPS, RTREXC, SFMIN
 *     ..
 *     .. Local Arrays ..
-      INTEGER            LTRSEN( 3 ), LTRSNA( 3 ), NTRSEN( 3 ),
-     $                   NTRSNA( 3 )
-      REAL               RTRSEN( 3 ), RTRSNA( 3 )
+      INTEGER            FTRSYL( 3 ), ITRSYL( 2 ), LTRSEN( 3 ),
+     $                   LTRSNA( 3 ), NTRSEN( 3 ), NTRSNA( 3 )
+      REAL               RTRSEN( 3 ), RTRSNA( 3 ), RTRSYL( 2 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CERREC, CGET35, CGET36, CGET37, CGET38
+      EXTERNAL           CERREC, CGET35, CGET36, CGET37, CGET38, CSYL01
 *     ..
 *     .. External Functions ..
       REAL               SLAMCH
@@ -120,10 +121,24 @@ SUBROUTINE CCHKEC( THRESH, TSTERR, NIN, NOUT )
      $   CALL CERREC( PATH, NOUT )
 *
       OK = .TRUE.
-      CALL CGET35( RTRSYL, LTRSYL, NTRSYL, KTRSYL, NIN )
-      IF( RTRSYL.GT.THRESH ) THEN
+      CALL CGET35( RTRSYL( 1 ), LTRSYL, NTRSYL, KTRSYL, NIN )
+      IF( RTRSYL( 1 ).GT.THRESH ) THEN
          OK = .FALSE.
-         WRITE( NOUT, FMT = 9999 )RTRSYL, LTRSYL, NTRSYL, KTRSYL
+         WRITE( NOUT, FMT = 9999 )RTRSYL( 1 ), LTRSYL, NTRSYL, KTRSYL
+      END IF
+*
+      CALL CSYL01( THRESH, FTRSYL, RTRSYL, ITRSYL, KTRSYL3 )
+      IF( FTRSYL( 1 ).GT.0 ) THEN
+         OK = .FALSE.
+         WRITE( NOUT, FMT = 9970 )FTRSYL( 1 ), RTRSYL( 1 ), THRESH
+      END IF
+      IF( FTRSYL( 2 ).GT.0 ) THEN
+         OK = .FALSE.
+         WRITE( NOUT, FMT = 9971 )FTRSYL( 2 ), RTRSYL( 2 ), THRESH
+      END IF
+      IF( FTRSYL( 3 ).GT.0 ) THEN
+         OK = .FALSE.
+         WRITE( NOUT, FMT = 9972 )FTRSYL( 3 )
       END IF
 *
       CALL CGET36( RTREXC, LTREXC, NTREXC, KTREXC, NIN )
@@ -169,6 +184,12 @@ SUBROUTINE CCHKEC( THRESH, TSTERR, NIN, NOUT )
      $      / ' Safe minimum (SFMIN)             = ', E16.6, / )
  9992 FORMAT( ' Routines pass computational tests if test ratio is ',
      $      'less than', F8.2, / / )
+ 9972 FORMAT( 'CTRSYL and CTRSYL3 compute an inconsistent scale ',
+     $      'factor in ', I8, ' tests.')
+ 9971 FORMAT( 'Error in CTRSYL3: ', I8, ' tests fail the threshold.', /
+     $      'Maximum test ratio =', D12.3, ' threshold =', D12.3 )
+ 9970 FORMAT( 'Error in CTRSYL: ', I8, ' tests fail the threshold.', /
+     $      'Maximum test ratio =', D12.3, ' threshold =', D12.3 )
       RETURN
 *
 *     End of CCHKEC
diff --git a/TESTING/EIG/cchkee.F b/TESTING/EIG/cchkee.F
index 7c6f580870..638966afe1 100644
--- a/TESTING/EIG/cchkee.F
+++ b/TESTING/EIG/cchkee.F
@@ -2524,7 +2524,7 @@ PROGRAM CCHKEE
  9974 FORMAT( ' Tests of CHBTRD', / ' (reduction of a Hermitian band ',
      $      'matrix to real tridiagonal form)' )
  9973 FORMAT( / 1X, 71( '-' ) )
- 9972 FORMAT( / ' LAPACK VERSION ', I1, '.', I1, '.', I1 )
+ 9972 FORMAT( / ' LAPACK VERSION ', I1, '.', I2, '.', I1 )
  9971 FORMAT( / ' Tests of the Generalized Linear Regression Model ',
      $      'routines' )
  9970 FORMAT( / ' Tests of the Generalized QR and RQ routines' )
diff --git a/TESTING/EIG/cchkgg.f b/TESTING/EIG/cchkgg.f
index 8938bb6579..5bd766eaef 100644
--- a/TESTING/EIG/cchkgg.f
+++ b/TESTING/EIG/cchkgg.f
@@ -500,6 +500,7 @@ SUBROUTINE CCHKGG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   S2, P1, P2, U, LDU, V, Q, Z, ALPHA1, BETA1,
      $                   ALPHA3, BETA3, EVECTL, EVECTR, WORK, LWORK,
      $                   RWORK, LLWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -560,8 +561,8 @@ SUBROUTINE CCHKGG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CGEQR2, CGET51, CGET52, CGGHRD, CHGEQZ, CLACPY,
-     $                   CLARFG, CLASET, CLATM4, CTGEVC, CUNM2R, SLABAD,
-     $                   SLASUM, XERBLA
+     $                   CLARFG, CLASET, CLATM4, CTGEVC, CUNM2R, SLASUM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, CONJG, MAX, MIN, REAL, SIGN
@@ -639,7 +640,6 @@ SUBROUTINE CCHKGG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/cchkgk.f b/TESTING/EIG/cchkgk.f
index 39228d35ee..d625b8fc8f 100644
--- a/TESTING/EIG/cchkgk.f
+++ b/TESTING/EIG/cchkgk.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE CCHKGK( NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cchkgl.f b/TESTING/EIG/cchkgl.f
index a442548352..32f955fe17 100644
--- a/TESTING/EIG/cchkgl.f
+++ b/TESTING/EIG/cchkgl.f
@@ -50,6 +50,7 @@
 *
 *  =====================================================================
       SUBROUTINE CCHKGL( NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cchkhb.f b/TESTING/EIG/cchkhb.f
index 4c12df9f27..5d6a4780ba 100644
--- a/TESTING/EIG/cchkhb.f
+++ b/TESTING/EIG/cchkhb.f
@@ -295,6 +295,7 @@
       SUBROUTINE CCHKHB( NSIZES, NN, NWDTHS, KK, NTYPES, DOTYPE, ISEED,
      $                   THRESH, NOUNIT, A, LDA, SD, SE, U, LDU, WORK,
      $                   LWORK, RWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cchkhb2stg.f b/TESTING/EIG/cchkhb2stg.f
index 594470816b..a8f7e58956 100644
--- a/TESTING/EIG/cchkhb2stg.f
+++ b/TESTING/EIG/cchkhb2stg.f
@@ -338,6 +338,7 @@ SUBROUTINE CCHKHB2STG( NSIZES, NN, NWDTHS, KK, NTYPES, DOTYPE,
      $                   ISEED, THRESH, NOUNIT, A, LDA, SD, SE, D1,
      $                   D2, D3, U, LDU, WORK, LWORK, RWORK, RESULT,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -852,8 +853,9 @@ SUBROUTINE CCHKHB2STG( NSIZES, NN, NWDTHS, KK, NTYPES, DOTYPE,
       CALL SLASUM( 'CHB', NOUNIT, NERRS, NTESTT )
       RETURN
 *
- 9999 FORMAT( ' CCHKHB2STG: ', A, ' returned INFO=', I6, '.', / 9X, 'N=',
-     $      I6, ', JTYPE=', I6, ', ISEED=(', 3( I5, ',' ), I5, ')' )
+ 9999 FORMAT( ' CCHKHB2STG: ', A, ' returned INFO=', I6, '.', / 9X,
+     $      'N=', I6, ', JTYPE=', I6, ', ISEED=(', 3( I5, ',' ), I5,
+     $      ')' )
  9998 FORMAT( / 1X, A3,
      $     ' -- Complex Hermitian Banded Tridiagonal Reduction Routines'
      $       )
diff --git a/TESTING/EIG/cchkhs.f b/TESTING/EIG/cchkhs.f
index 65f1fc82d4..07eed07e16 100644
--- a/TESTING/EIG/cchkhs.f
+++ b/TESTING/EIG/cchkhs.f
@@ -21,7 +21,7 @@
 *       .. Array Arguments ..
 *       LOGICAL            DOTYPE( * ), SELECT( * )
 *       INTEGER            ISEED( 4 ), IWORK( * ), NN( * )
-*       REAL               RESULT( 14 ), RWORK( * )
+*       REAL               RESULT( 16 ), RWORK( * )
 *       COMPLEX            A( LDA, * ), EVECTL( LDU, * ),
 *      $                   EVECTR( LDU, * ), EVECTX( LDU, * ),
 *      $                   EVECTY( LDU, * ), H( LDA, * ), T1( LDA, * ),
@@ -64,10 +64,15 @@
 *>            eigenvectors of H.  Y is lower triangular, and X is
 *>            upper triangular.
 *>
+*>            CTREVC3 computes left and right eigenvector matrices
+*>            from a Schur matrix T and backtransforms them with Z
+*>            to eigenvector matrices L and R for A. L and R are
+*>            GE matrices.
+*>
 *>    When CCHKHS is called, a number of matrix "sizes" ("n's") and a
 *>    number of matrix "types" are specified.  For each size ("n")
 *>    and each type of matrix, one matrix will be generated and used
-*>    to test the nonsymmetric eigenroutines.  For each matrix, 14
+*>    to test the nonsymmetric eigenroutines.  For each matrix, 16
 *>    tests will be performed:
 *>
 *>    (1)     | A - U H U**H | / ( |A| n ulp )
@@ -98,6 +103,10 @@
 *>
 *>    (14)    | Y**H A - W**H Y | / ( |A| |Y| ulp )
 *>
+*>    (15)    | AR - RW | / ( |A| |R| ulp )
+*>
+*>    (16)    | LA - WL | / ( |A| |L| ulp )
+*>
 *>    The "sizes" are specified by an array NN(1:NSIZES); the value of
 *>    each element NN(j) specifies one size.
 *>    The "types" are specified by a logical array DOTYPE( 1:NTYPES );
@@ -331,7 +340,7 @@
 *>           Workspace.  Could be equivalenced to IWORK, but not RWORK.
 *>           Modified.
 *>
-*>  RESULT - REAL array, dimension (14)
+*>  RESULT - REAL array, dimension (16)
 *>           The values computed by the fourteen tests described above.
 *>           The values are currently limited to 1/ulp, to avoid
 *>           overflow.
@@ -409,6 +418,7 @@ SUBROUTINE CCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   W3, EVECTL, EVECTR, EVECTY, EVECTX, UU, TAU,
      $                   WORK, NWORK, RWORK, IWORK, SELECT, RESULT,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -421,7 +431,7 @@ SUBROUTINE CCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *     .. Array Arguments ..
       LOGICAL            DOTYPE( * ), SELECT( * )
       INTEGER            ISEED( 4 ), IWORK( * ), NN( * )
-      REAL               RESULT( 14 ), RWORK( * )
+      REAL               RESULT( 16 ), RWORK( * )
       COMPLEX            A( LDA, * ), EVECTL( LDU, * ),
      $                   EVECTR( LDU, * ), EVECTX( LDU, * ),
      $                   EVECTY( LDU, * ), H( LDA, * ), T1( LDA, * ),
@@ -463,8 +473,8 @@ SUBROUTINE CCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *     .. External Subroutines ..
       EXTERNAL           CCOPY, CGEHRD, CGEMM, CGET10, CGET22, CHSEIN,
      $                   CHSEQR, CHST01, CLACPY, CLASET, CLATME, CLATMR,
-     $                   CLATMS, CTREVC, CUNGHR, CUNMHR, SLABAD, SLAFTS,
-     $                   SLASUM, XERBLA
+     $                   CLATMS, CTREVC, CTREVC3, CUNGHR, CUNMHR,
+     $                   SLAFTS, SLASUM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, REAL, SQRT
@@ -524,7 +534,6 @@ SUBROUTINE CCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = SLAMCH( 'Overflow' )
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
@@ -1067,6 +1076,66 @@ SUBROUTINE CCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $            RESULT( 14 ) = DUMMA( 3 )*ANINV
             END IF
 *
+*           Compute Left and Right Eigenvectors of A
+*
+*           Compute a Right eigenvector matrix:
+*
+            NTEST = 15
+            RESULT( 15 ) = ULPINV
+*
+            CALL CLACPY( ' ', N, N, UZ, LDU, EVECTR, LDU )
+*
+            CALL CTREVC3( 'Right', 'Back', SELECT, N, T1, LDA, CDUMMA,
+     $                    LDU, EVECTR, LDU, N, IN, WORK, NWORK, RWORK,
+     $                    N, IINFO )
+            IF( IINFO.NE.0 ) THEN
+               WRITE( NOUNIT, FMT = 9999 )'CTREVC3(R,B)', IINFO, N,
+     $            JTYPE, IOLDSD
+               INFO = ABS( IINFO )
+               GO TO 250
+            END IF
+*
+*           Test 15:  | AR - RW | / ( |A| |R| ulp )
+*
+*                     (from Schur decomposition)
+*
+            CALL CGET22( 'N', 'N', 'N', N, A, LDA, EVECTR, LDU, W1,
+     $                   WORK, RWORK, DUMMA( 1 ) )
+            RESULT( 15 ) = DUMMA( 1 )
+            IF( DUMMA( 2 ).GT.THRESH ) THEN
+               WRITE( NOUNIT, FMT = 9998 )'Right', 'CTREVC3',
+     $            DUMMA( 2 ), N, JTYPE, IOLDSD
+            END IF
+*
+*           Compute a Left eigenvector matrix:
+*
+            NTEST = 16
+            RESULT( 16 ) = ULPINV
+*
+            CALL CLACPY( ' ', N, N, UZ, LDU, EVECTL, LDU )
+*
+            CALL CTREVC3( 'Left', 'Back', SELECT, N, T1, LDA, EVECTL,
+     $                    LDU, CDUMMA, LDU, N, IN, WORK, NWORK, RWORK,
+     $                    N, IINFO )
+            IF( IINFO.NE.0 ) THEN
+               WRITE( NOUNIT, FMT = 9999 )'CTREVC3(L,B)', IINFO, N,
+     $            JTYPE, IOLDSD
+               INFO = ABS( IINFO )
+               GO TO 250
+            END IF
+*
+*           Test 16:  | LA - WL | / ( |A| |L| ulp )
+*
+*                     (from Schur decomposition)
+*
+            CALL CGET22( 'Conj', 'N', 'Conj', N, A, LDA, EVECTL, LDU,
+     $                   W1, WORK, RWORK, DUMMA( 3 ) )
+            RESULT( 16 ) = DUMMA( 3 )
+            IF( DUMMA( 4 ).GT.THRESH ) THEN
+               WRITE( NOUNIT, FMT = 9998 )'Left', 'CTREVC3', DUMMA( 4 ),
+     $            N, JTYPE, IOLDSD
+            END IF
+*
 *           End of Loop -- Check for RESULT(j) > THRESH
 *
   240       CONTINUE
diff --git a/TESTING/EIG/cchkst.f b/TESTING/EIG/cchkst.f
index 95747d0519..ee98bc9b58 100644
--- a/TESTING/EIG/cchkst.f
+++ b/TESTING/EIG/cchkst.f
@@ -364,7 +364,7 @@
 *> \verbatim
 *>          D1 is REAL array of
 *>                             dimension( max(NN) )
-*>          The eigenvalues of A, as computed by CSTEQR simlutaneously
+*>          The eigenvalues of A, as computed by CSTEQR simultaneously
 *>          with Z.  On exit, the eigenvalues in D1 correspond with the
 *>          matrix in A.
 *> \endverbatim
@@ -601,6 +601,7 @@ SUBROUTINE CCHKST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   WA1, WA2, WA3, WR, U, LDU, V, VP, TAU, Z, WORK,
      $                   LWORK, RWORK, LRWORK, IWORK, LIWORK, RESULT,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -665,8 +666,7 @@ SUBROUTINE CCHKST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           CCOPY, CHET21, CHETRD, CHPT21, CHPTRD, CLACPY,
      $                   CLASET, CLATMR, CLATMS, CPTEQR, CSTEDC, CSTEMR,
      $                   CSTEIN, CSTEQR, CSTT21, CSTT22, CUNGTR, CUPGTR,
-     $                   SCOPY, SLABAD, SLASUM, SSTEBZ, SSTECH, SSTERF,
-     $                   XERBLA
+     $                   SCOPY, SLASUM, SSTEBZ, SSTECH, SSTERF, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, CONJG, INT, LOG, MAX, MIN, REAL, SQRT
@@ -733,7 +733,6 @@ SUBROUTINE CCHKST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       ULPINV = ONE / ULP
       LOG2UI = INT( LOG( ULPINV ) / LOG( TWO ) )
diff --git a/TESTING/EIG/cchkst2stg.f b/TESTING/EIG/cchkst2stg.f
index d2eaea4360..06c7569a4f 100644
--- a/TESTING/EIG/cchkst2stg.f
+++ b/TESTING/EIG/cchkst2stg.f
@@ -385,7 +385,7 @@
 *> \verbatim
 *>          D1 is REAL array of
 *>                             dimension( max(NN) )
-*>          The eigenvalues of A, as computed by CSTEQR simlutaneously
+*>          The eigenvalues of A, as computed by CSTEQR simultaneously
 *>          with Z.  On exit, the eigenvalues in D1 correspond with the
 *>          matrix in A.
 *> \endverbatim
@@ -622,6 +622,7 @@ SUBROUTINE CCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   WA1, WA2, WA3, WR, U, LDU, V, VP, TAU, Z, WORK,
      $                   LWORK, RWORK, LRWORK, IWORK, LIWORK, RESULT,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -683,10 +684,10 @@ SUBROUTINE CCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           ILAENV, SLAMCH, SLARND, SSXT1
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLABAD, SLASUM, SSTEBZ, SSTECH, SSTERF,
-     $                   XERBLA, CCOPY, CHET21, CHETRD, CHPT21, CHPTRD,
-     $                   CLACPY, CLASET, CLATMR, CLATMS, CPTEQR, CSTEDC,
-     $                   CSTEMR, CSTEIN, CSTEQR, CSTT21, CSTT22, CUNGTR,
+      EXTERNAL           SCOPY, SLASUM, SSTEBZ, SSTECH, SSTERF, XERBLA,
+     $                   CCOPY, CHET21, CHETRD, CHPT21, CHPTRD, CLACPY,
+     $                   CLASET, CLATMR, CLATMS, CPTEQR, CSTEDC, CSTEMR,
+     $                   CSTEIN, CSTEQR, CSTT21, CSTT22, CUNGTR,
      $                   CUPGTR, CHETRD_2STAGE, SLASET
 *     ..
 *     .. Intrinsic Functions ..
@@ -754,7 +755,6 @@ SUBROUTINE CCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       ULPINV = ONE / ULP
       LOG2UI = INT( LOG( ULPINV ) / LOG( TWO ) )
@@ -1072,7 +1072,6 @@ SUBROUTINE CCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                END IF
             END IF
 *
-*
 *           Do Tests 3 and 4 which are similar to 11 and 12 but with the
 *           D1 computed using the standard 1-stage reduction as reference
 *
@@ -1735,7 +1734,6 @@ SUBROUTINE CCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                         END IF
                      END IF
 *
-*
 *                 Do test 28
 *
                      TEMP2 = TWO*( TWO*N-ONE )*ULP*
@@ -1792,7 +1790,6 @@ SUBROUTINE CCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
 *           Do Tests 29 and 30
 *
-*
 *           Call CSTEMR to compute D2, do tests.
 *
 *           Compute D2
@@ -1832,7 +1829,6 @@ SUBROUTINE CCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                   RESULT( 31 ) = TEMP2 / MAX( UNFL,
      $                           ULP*MAX( TEMP1, TEMP2 ) )
 *
-*
 *           Call CSTEMR(V,V) to compute D1 and Z, do tests.
 *
 *           Compute D1 and Z
@@ -1934,7 +1930,6 @@ SUBROUTINE CCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                   RESULT( 34 ) = ZERO
                END IF
 *
-*
 *           Call CSTEMR(V,A) to compute D1 and Z, do tests.
 *
 *           Compute D1 and Z
@@ -1991,7 +1986,7 @@ SUBROUTINE CCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                   END IF
                END IF
 *
-*           Do Test 34
+*           Do Test 37
 *
                TEMP1 = ZERO
                TEMP2 = ZERO
@@ -2010,7 +2005,6 @@ SUBROUTINE CCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
 *           End of Loop -- Check for RESULT(j) > THRESH
 *
-*
 *           Print out tests which fail.
 *
             DO 290 JR = 1, NTEST
diff --git a/TESTING/EIG/cckglm.f b/TESTING/EIG/cckglm.f
index badddb63b4..a88c745e86 100644
--- a/TESTING/EIG/cckglm.f
+++ b/TESTING/EIG/cckglm.f
@@ -165,6 +165,7 @@
       SUBROUTINE CCKGLM( NN, NVAL, MVAL, PVAL, NMATS, ISEED, THRESH,
      $                   NMAX, A, AF, B, BF, X, WORK, RWORK, NIN, NOUT,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cckgqr.f b/TESTING/EIG/cckgqr.f
index 574d07181d..ec52c1e13b 100644
--- a/TESTING/EIG/cckgqr.f
+++ b/TESTING/EIG/cckgqr.f
@@ -208,6 +208,7 @@
       SUBROUTINE CCKGQR( NM, MVAL, NP, PVAL, NN, NVAL, NMATS, ISEED,
      $                   THRESH, NMAX, A, AF, AQ, AR, TAUA, B, BF, BZ,
      $                   BT, BWK, TAUB, WORK, RWORK, NIN, NOUT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cckgsv.f b/TESTING/EIG/cckgsv.f
index f3204e2940..2f2b08171c 100644
--- a/TESTING/EIG/cckgsv.f
+++ b/TESTING/EIG/cckgsv.f
@@ -195,6 +195,7 @@
       SUBROUTINE CCKGSV( NM, MVAL, PVAL, NVAL, NMATS, ISEED, THRESH,
      $                   NMAX, A, AF, B, BF, U, V, Q, ALPHA, BETA, R,
      $                   IWORK, WORK, RWORK, NIN, NOUT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/ccklse.f b/TESTING/EIG/ccklse.f
index d9cff9bcbc..caf72a9c53 100644
--- a/TESTING/EIG/ccklse.f
+++ b/TESTING/EIG/ccklse.f
@@ -165,6 +165,7 @@
       SUBROUTINE CCKLSE( NN, MVAL, PVAL, NVAL, NMATS, ISEED, THRESH,
      $                   NMAX, A, AF, B, BF, X, WORK, RWORK, NIN, NOUT,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/ccsdts.f b/TESTING/EIG/ccsdts.f
index 9a2aa91e6c..47d11996ce 100644
--- a/TESTING/EIG/ccsdts.f
+++ b/TESTING/EIG/ccsdts.f
@@ -226,6 +226,7 @@
       SUBROUTINE CCSDTS( M, P, Q, X, XF, LDX, U1, LDU1, U2, LDU2, V1T,
      $                   LDV1T, V2T, LDV2T, THETA, IWORK, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cdrges.f b/TESTING/EIG/cdrges.f
index b28b190f5f..bfe91116bf 100644
--- a/TESTING/EIG/cdrges.f
+++ b/TESTING/EIG/cdrges.f
@@ -378,6 +378,7 @@
       SUBROUTINE CDRGES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, B, S, T, Q, LDQ, Z, ALPHA,
      $                   BETA, WORK, LWORK, RWORK, RESULT, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -435,7 +436,7 @@ SUBROUTINE CDRGES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALASVM, CGET51, CGET54, CGGES, CLACPY, CLARFG,
-     $                   CLASET, CLATM4, CUNM2R, SLABAD, XERBLA
+     $                   CLASET, CLATM4, CUNM2R, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, CONJG, MAX, MIN, REAL, SIGN
@@ -533,7 +534,6 @@ SUBROUTINE CDRGES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       SAFMIN = SLAMCH( 'Safe minimum' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/cdrges3.f b/TESTING/EIG/cdrges3.f
index dd1d9ed5c2..84cc2f429a 100644
--- a/TESTING/EIG/cdrges3.f
+++ b/TESTING/EIG/cdrges3.f
@@ -379,6 +379,7 @@ SUBROUTINE CDRGES3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                    NOUNIT, A, LDA, B, S, T, Q, LDQ, Z, ALPHA,
      $                    BETA, WORK, LWORK, RWORK, RESULT, BWORK,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -436,7 +437,7 @@ SUBROUTINE CDRGES3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALASVM, CGET51, CGET54, CGGES3, CLACPY, CLARFG,
-     $                   CLASET, CLATM4, CUNM2R, SLABAD, XERBLA
+     $                   CLASET, CLATM4, CUNM2R, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, CONJG, MAX, MIN, REAL, SIGN
@@ -534,7 +535,6 @@ SUBROUTINE CDRGES3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       SAFMIN = SLAMCH( 'Safe minimum' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/cdrgev.f b/TESTING/EIG/cdrgev.f
index 0e4d131c8a..9c7c57cf4b 100644
--- a/TESTING/EIG/cdrgev.f
+++ b/TESTING/EIG/cdrgev.f
@@ -396,6 +396,7 @@ SUBROUTINE CDRGEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, B, S, T, Q, LDQ, Z, QE, LDQE,
      $                   ALPHA, BETA, ALPHA1, BETA1, WORK, LWORK, RWORK,
      $                   RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -452,7 +453,7 @@ SUBROUTINE CDRGEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALASVM, CGET52, CGGEV, CLACPY, CLARFG, CLASET,
-     $                   CLATM4, CUNM2R, SLABAD, XERBLA
+     $                   CLATM4, CUNM2R, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, CONJG, MAX, MIN, REAL, SIGN
@@ -546,7 +547,6 @@ SUBROUTINE CDRGEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       SAFMIN = SLAMCH( 'Safe minimum' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/cdrgev3.f b/TESTING/EIG/cdrgev3.f
index fbb74cf70c..5836890d37 100644
--- a/TESTING/EIG/cdrgev3.f
+++ b/TESTING/EIG/cdrgev3.f
@@ -396,6 +396,7 @@ SUBROUTINE CDRGEV3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                    NOUNIT, A, LDA, B, S, T, Q, LDQ, Z, QE, LDQE,
      $                    ALPHA, BETA, ALPHA1, BETA1, WORK, LWORK,
      $                    RWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -452,7 +453,7 @@ SUBROUTINE CDRGEV3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALASVM, CGET52, CGGEV3, CLACPY, CLARFG, CLASET,
-     $                   CLATM4, CUNM2R, SLABAD, XERBLA
+     $                   CLATM4, CUNM2R, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, CONJG, MAX, MIN, REAL, SIGN
@@ -546,7 +547,6 @@ SUBROUTINE CDRGEV3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       SAFMIN = SLAMCH( 'Safe minimum' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/cdrgsx.f b/TESTING/EIG/cdrgsx.f
index c5baeef5ee..019f78d9b1 100644
--- a/TESTING/EIG/cdrgsx.f
+++ b/TESTING/EIG/cdrgsx.f
@@ -346,6 +346,7 @@
       SUBROUTINE CDRGSX( NSIZE, NCMAX, THRESH, NIN, NOUT, A, LDA, B,
      $                   AI, BI, Z, Q, ALPHA, BETA, C, LDC, S, WORK,
      $                   LWORK, RWORK, IWORK, LIWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -395,7 +396,7 @@ SUBROUTINE CDRGSX( NSIZE, NCMAX, THRESH, NIN, NOUT, A, LDA, B,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALASVM, CGESVD, CGET51, CGGESX, CLACPY, CLAKF2,
-     $                   CLASET, CLATM5, SLABAD, XERBLA
+     $                   CLASET, CLATM5, XERBLA
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            FS
@@ -478,7 +479,6 @@ SUBROUTINE CDRGSX( NSIZE, NCMAX, THRESH, NIN, NOUT, A, LDA, B,
       ULPINV = ONE / ULP
       SMLNUM = SLAMCH( 'S' ) / ULP
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       THRSH2 = TEN*THRESH
       NTESTT = 0
       NERRS = 0
@@ -917,7 +917,7 @@ SUBROUTINE CDRGSX( NSIZE, NCMAX, THRESH, NIN, NOUT, A, LDA, B,
      $      / '  2:  A and B are upper triangular matrices, ',
      $      / '  3:  A and B are as type 2, but each second diagonal ',
      $      'block in A_11 and ', /
-     $      '      each third diaongal block in A_22 are 2x2 blocks,',
+     $      '      each third diagonal block in A_22 are 2x2 blocks,',
      $      / '  4:  A and B are block diagonal matrices, ',
      $      / '  5:  (A,B) has potentially close or common ',
      $      'eigenvalues.', / )
diff --git a/TESTING/EIG/cdrgvx.f b/TESTING/EIG/cdrgvx.f
index 830a39d869..8eab34e582 100644
--- a/TESTING/EIG/cdrgvx.f
+++ b/TESTING/EIG/cdrgvx.f
@@ -56,7 +56,7 @@
 *>
 *>    | l**H * (beta A - alpha B) | / ( ulp max( |beta A|, |alpha B| ) )
 *>
-*>     where l**H is the conjugate tranpose of l.
+*>     where l**H is the conjugate transpose of l.
 *>
 *> (2) max over all right eigenvalue/-vector pairs (beta/alpha,r) of
 *>
@@ -295,6 +295,7 @@ SUBROUTINE CDRGVX( NSIZE, THRESH, NIN, NOUT, A, LDA, B, AI, BI,
      $                   ALPHA, BETA, VL, VR, ILO, IHI, LSCALE, RSCALE,
      $                   S, STRU, DIF, DIFTRU, WORK, LWORK, RWORK,
      $                   IWORK, LIWORK, RESULT, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cdrves.f b/TESTING/EIG/cdrves.f
index 81a44a5836..cc6bedc8d4 100644
--- a/TESTING/EIG/cdrves.f
+++ b/TESTING/EIG/cdrves.f
@@ -375,6 +375,7 @@
       SUBROUTINE CDRVES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, H, HT, W, WT, VS, LDVS, RESULT,
      $                   WORK, NWORK, RWORK, IWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -438,7 +439,7 @@ SUBROUTINE CDRVES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CGEES, CHST01, CLACPY, CLATME, CLATMR, CLATMS,
-     $                   CLASET, SLABAD, SLASUM, XERBLA
+     $                   CLASET, SLASUM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, CMPLX, MAX, MIN, SQRT
@@ -507,7 +508,6 @@ SUBROUTINE CDRVES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       RTULP = SQRT( ULP )
diff --git a/TESTING/EIG/cdrvev.f b/TESTING/EIG/cdrvev.f
index 6a834b6d92..3e6b98ff7d 100644
--- a/TESTING/EIG/cdrvev.f
+++ b/TESTING/EIG/cdrvev.f
@@ -388,6 +388,7 @@ SUBROUTINE CDRVEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, H, W, W1, VL, LDVL, VR, LDVR,
      $                   LRE, LDLRE, RESULT, WORK, NWORK, RWORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -443,7 +444,7 @@ SUBROUTINE CDRVEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CGEEV, CGET22, CLACPY, CLATME, CLATMR, CLATMS,
-     $                   CLASET, SLABAD, SLASUM, XERBLA
+     $                   CLASET, SLASUM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, CMPLX, MAX, MIN, REAL, SQRT
@@ -515,7 +516,6 @@ SUBROUTINE CDRVEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       RTULP = SQRT( ULP )
diff --git a/TESTING/EIG/cdrvsg.f b/TESTING/EIG/cdrvsg.f
index a93933a278..c4c29f5f3e 100644
--- a/TESTING/EIG/cdrvsg.f
+++ b/TESTING/EIG/cdrvsg.f
@@ -236,7 +236,7 @@
 *>
 *>  B       COMPLEX array, dimension (LDB , max(NN))
 *>          Used to hold the Hermitian positive definite matrix for
-*>          the generailzed problem.
+*>          the generalized problem.
 *>          On exit, B contains the last matrix actually
 *>          used.
 *>          Modified.
@@ -367,6 +367,7 @@ SUBROUTINE CDRVSG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, B, LDB, D, Z, LDZ, AB, BB, AP,
      $                   BP, WORK, NWORK, RWORK, LRWORK, IWORK, LIWORK,
      $                   RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -420,7 +421,7 @@ SUBROUTINE CDRVSG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *     .. External Subroutines ..
       EXTERNAL           CHBGV, CHBGVD, CHBGVX, CHEGV, CHEGVD, CHEGVX,
      $                   CHPGV, CHPGVD, CHPGVX, CLACPY, CLASET, CLATMR,
-     $                   CLATMS, CSGT01, SLABAD, SLAFTS, SLASUM, XERBLA
+     $                   CLATMS, CSGT01, SLAFTS, SLASUM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, REAL, SQRT
@@ -481,7 +482,6 @@ SUBROUTINE CDRVSG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = SLAMCH( 'Overflow' )
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
@@ -663,8 +663,8 @@ SUBROUTINE CDRVSG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                IL = 1
                IU = N
             ELSE
-               IL = 1 + ( N-1 )*SLARND( 1, ISEED2 )
-               IU = 1 + ( N-1 )*SLARND( 1, ISEED2 )
+               IL = 1 + INT( ( N-1 )*SLARND( 1, ISEED2 ) )
+               IU = 1 + INT( ( N-1 )*SLARND( 1, ISEED2 ) )
                IF( IL.GT.IU ) THEN
                   ITEMP = IL
                   IL = IU
diff --git a/TESTING/EIG/cdrvsg2stg.f b/TESTING/EIG/cdrvsg2stg.f
index 8b85537739..f7d323247d 100644
--- a/TESTING/EIG/cdrvsg2stg.f
+++ b/TESTING/EIG/cdrvsg2stg.f
@@ -242,7 +242,7 @@
 *>
 *>  B       COMPLEX array, dimension (LDB , max(NN))
 *>          Used to hold the Hermitian positive definite matrix for
-*>          the generailzed problem.
+*>          the generalized problem.
 *>          On exit, B contains the last matrix actually
 *>          used.
 *>          Modified.
@@ -426,7 +426,7 @@ SUBROUTINE CDRVSG2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           LSAME, SLAMCH, SLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLABAD, SLAFTS, SLASUM, XERBLA, CHBGV, CHBGVD,
+      EXTERNAL           SLAFTS, SLASUM, XERBLA, CHBGV, CHBGVD,
      $                   CHBGVX, CHEGV, CHEGVD, CHEGVX, CHPGV, CHPGVD,
      $                   CHPGVX, CLACPY, CLASET, CLATMR, CLATMS, CSGT01,
      $                   CHEGV_2STAGE
@@ -490,7 +490,6 @@ SUBROUTINE CDRVSG2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = SLAMCH( 'Overflow' )
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
diff --git a/TESTING/EIG/cdrvst.f b/TESTING/EIG/cdrvst.f
index 9c129c0e88..934b8e02bd 100644
--- a/TESTING/EIG/cdrvst.f
+++ b/TESTING/EIG/cdrvst.f
@@ -204,7 +204,7 @@
 *>          Not modified.
 *>
 *>  D1      REAL array, dimension (max(NN))
-*>          The eigenvalues of A, as computed by CSTEQR simlutaneously
+*>          The eigenvalues of A, as computed by CSTEQR simultaneously
 *>          with Z.  On exit, the eigenvalues in D1 correspond with the
 *>          matrix in A.
 *>          Modified.
@@ -335,6 +335,7 @@ SUBROUTINE CDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, D1, D2, D3, WA1, WA2, WA3, U,
      $                   LDU, V, TAU, Z, WORK, LWORK, RWORK, LRWORK,
      $                   IWORK, LIWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -393,8 +394,8 @@ SUBROUTINE CDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *     .. External Subroutines ..
       EXTERNAL           ALASVM, CHBEV, CHBEVD, CHBEVX, CHEEV, CHEEVD,
      $                   CHEEVR, CHEEVX, CHET21, CHET22, CHPEV, CHPEVD,
-     $                   CHPEVX, CLACPY, CLASET, CLATMR, CLATMS, SLABAD,
-     $                   SLAFTS, XERBLA
+     $                   CHPEVX, CLACPY, CLASET, CLATMR, CLATMS, SLAFTS,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, INT, LOG, MAX, MIN, REAL, SQRT
@@ -451,7 +452,6 @@ SUBROUTINE CDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = SLAMCH( 'Overflow' )
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
diff --git a/TESTING/EIG/cdrvst2stg.f b/TESTING/EIG/cdrvst2stg.f
index 954c7fb87a..c436783f72 100644
--- a/TESTING/EIG/cdrvst2stg.f
+++ b/TESTING/EIG/cdrvst2stg.f
@@ -204,7 +204,7 @@
 *>          Not modified.
 *>
 *>  D1      REAL             array, dimension (max(NN))
-*>          The eigenvalues of A, as computed by CSTEQR simlutaneously
+*>          The eigenvalues of A, as computed by CSTEQR simultaneously
 *>          with Z.  On exit, the eigenvalues in D1 correspond with the
 *>          matrix in A.
 *>          Modified.
@@ -335,6 +335,7 @@ SUBROUTINE CDRVST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, D1, D2, D3, WA1, WA2, WA3, U,
      $                   LDU, V, TAU, Z, WORK, LWORK, RWORK, LRWORK,
      $                   IWORK, LIWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -391,7 +392,7 @@ SUBROUTINE CDRVST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           SLAMCH, SLARND, SSXT1
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, SLABAD, SLAFTS, XERBLA, CHBEV, CHBEVD,
+      EXTERNAL           ALASVM, SLAFTS, XERBLA, CHBEV, CHBEVD,
      $                   CHBEVX, CHEEV, CHEEVD, CHEEVR, CHEEVX, CHET21,
      $                   CHET22, CHPEV, CHPEVD, CHPEVX, CLACPY, CLASET,
      $                   CHEEVD_2STAGE, CHEEVR_2STAGE, CHEEVX_2STAGE,
@@ -453,7 +454,6 @@ SUBROUTINE CDRVST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = SLAMCH( 'Overflow' )
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
diff --git a/TESTING/EIG/cdrvsx.f b/TESTING/EIG/cdrvsx.f
index 0265ff2715..19825bcee4 100644
--- a/TESTING/EIG/cdrvsx.f
+++ b/TESTING/EIG/cdrvsx.f
@@ -432,6 +432,7 @@ SUBROUTINE CDRVSX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NIUNIT, NOUNIT, A, LDA, H, HT, W, WT, WTMP, VS,
      $                   LDVS, VS1, RESULT, WORK, LWORK, RWORK, BWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -492,7 +493,7 @@ SUBROUTINE CDRVSX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGET24, CLATME, CLATMR, CLATMS, CLASET, SLABAD,
+      EXTERNAL           CGET24, CLATME, CLATMR, CLATMS, CLASET,
      $                   SLASUM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -567,7 +568,6 @@ SUBROUTINE CDRVSX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       RTULP = SQRT( ULP )
diff --git a/TESTING/EIG/cdrvvx.f b/TESTING/EIG/cdrvvx.f
index f1f5a0bace..99931b6efa 100644
--- a/TESTING/EIG/cdrvvx.f
+++ b/TESTING/EIG/cdrvvx.f
@@ -493,6 +493,7 @@ SUBROUTINE CDRVVX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   LDVR, LRE, LDLRE, RCONDV, RCNDV1, RCDVIN,
      $                   RCONDE, RCNDE1, RCDEIN, SCALE, SCALE1, RESULT,
      $                   WORK, NWORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -548,8 +549,8 @@ SUBROUTINE CDRVVX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGET23, CLATME, CLATMR, CLATMS, CLASET, SLABAD,
-     $                   SLASUM, XERBLA
+      EXTERNAL           CGET23, CLATME, CLATMR, CLATMS, CLASET, SLASUM,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, CMPLX, MAX, MIN, SQRT
@@ -624,7 +625,6 @@ SUBROUTINE CDRVVX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       RTULP = SQRT( ULP )
diff --git a/TESTING/EIG/cerrbd.f b/TESTING/EIG/cerrbd.f
index 76503ae090..7ce6dc4b47 100644
--- a/TESTING/EIG/cerrbd.f
+++ b/TESTING/EIG/cerrbd.f
@@ -21,7 +21,8 @@
 *>
 *> \verbatim
 *>
-*> CERRBD tests the error exits for CGEBRD, CUNGBR, CUNMBR, and CBDSQR.
+*> CERRBD tests the error exits for CGEBD2, CGEBRD, CUNGBR, CUNMBR,
+*> and CBDSQR.
 *> \endverbatim
 *
 *  Arguments:
@@ -51,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRBD( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -81,7 +83,8 @@ SUBROUTINE CERRBD( PATH, NUNIT )
       EXTERNAL           LSAMEN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CBDSQR, CGEBRD, CHKXER, CUNGBR, CUNMBR
+      EXTERNAL           CHKXER, CBDSQR, CGEBD2, CGEBRD, CUNGBR,
+     $                   CUNMBR
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -132,6 +135,20 @@ SUBROUTINE CERRBD( PATH, NUNIT )
          CALL CHKXER( 'CGEBRD', INFOT, NOUT, LERR, OK )
          NT = NT + 4
 *
+*        CGEBD2
+*
+         SRNAMT = 'CGEBD2'
+         INFOT = 1
+         CALL CGEBD2( -1, 0, A, 1, D, E, TQ, TP, W, INFO )
+         CALL CHKXER( 'CGEBD2', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL CGEBD2( 0, -1, A, 1, D, E, TQ, TP, W, INFO )
+         CALL CHKXER( 'CGEBD2', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL CGEBD2( 2, 1, A, 1, D, E, TQ, TP, W, INFO )
+         CALL CHKXER( 'CGEBD2', INFOT, NOUT, LERR, OK )
+         NT = NT + 3
+*
 *        CUNGBR
 *
          SRNAMT = 'CUNGBR'
diff --git a/TESTING/EIG/cerrec.f b/TESTING/EIG/cerrec.f
index 650ab2b6e6..7e5c6ced81 100644
--- a/TESTING/EIG/cerrec.f
+++ b/TESTING/EIG/cerrec.f
@@ -23,7 +23,7 @@
 *>
 *> CERREC tests the error exits for the routines for eigen- condition
 *> estimation for REAL matrices:
-*>    CTRSYL, CTREXC, CTRSNA and CTRSEN.
+*>    CTRSYL, CTRSYL3, CTREXC, CTRSNA and CTRSEN.
 *> \endverbatim
 *
 *  Arguments:
@@ -53,6 +53,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERREC( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -77,12 +78,12 @@ SUBROUTINE CERREC( PATH, NUNIT )
 *     ..
 *     .. Local Arrays ..
       LOGICAL            SEL( NMAX )
-      REAL               RW( LW ), S( NMAX ), SEP( NMAX )
+      REAL               RW( LW ), S( NMAX ), SEP( NMAX ), SWORK( NMAX )
       COMPLEX            A( NMAX, NMAX ), B( NMAX, NMAX ),
      $                   C( NMAX, NMAX ), WORK( LW ), X( NMAX )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHKXER, CTREXC, CTRSEN, CTRSNA, CTRSYL
+      EXTERNAL           CHKXER, CTREXC, CTRSEN, CTRSNA, CTRSYL, CTRSYL3
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -141,6 +142,43 @@ SUBROUTINE CERREC( PATH, NUNIT )
       CALL CHKXER( 'CTRSYL', INFOT, NOUT, LERR, OK )
       NT = NT + 8
 *
+*     Test CTRSYL3
+*
+      SRNAMT = 'CTRSYL3'
+      INFOT = 1
+      CALL CTRSYL3( 'X', 'N', 1, 0, 0, A, 1, B, 1, C, 1, SCALE,
+     $              SWORK, NMAX, INFO )
+      CALL CHKXER( 'CTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL CTRSYL3( 'N', 'X', 1, 0, 0, A, 1, B, 1, C, 1, SCALE,
+     $              SWORK, NMAX, INFO )
+      CALL CHKXER( 'CTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL CTRSYL3( 'N', 'N', 0, 0, 0, A, 1, B, 1, C, 1, SCALE,
+     $              SWORK, NMAX, INFO )
+      CALL CHKXER( 'CTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL CTRSYL3( 'N', 'N', 1, -1, 0, A, 1, B, 1, C, 1, SCALE,
+     $              SWORK, NMAX, INFO )
+      CALL CHKXER( 'CTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL CTRSYL3( 'N', 'N', 1, 0, -1, A, 1, B, 1, C, 1, SCALE,
+     $              SWORK, NMAX, INFO )
+      CALL CHKXER( 'CTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 7
+      CALL CTRSYL3( 'N', 'N', 1, 2, 0, A, 1, B, 1, C, 2, SCALE,
+     $              SWORK, NMAX, INFO )
+      CALL CHKXER( 'CTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 9
+      CALL CTRSYL3( 'N', 'N', 1, 0, 2, A, 1, B, 1, C, 1, SCALE,
+     $              SWORK, NMAX, INFO )
+      CALL CHKXER( 'CTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 11
+      CALL CTRSYL3( 'N', 'N', 1, 2, 0, A, 2, B, 1, C, 1, SCALE,
+     $              SWORK, NMAX, INFO )
+      CALL CHKXER( 'CTRSYL3', INFOT, NOUT, LERR, OK )
+      NT = NT + 8
+*
 *     Test CTREXC
 *
       SRNAMT = 'CTREXC'
diff --git a/TESTING/EIG/cerred.f b/TESTING/EIG/cerred.f
index 98d1570805..a406d9cc54 100644
--- a/TESTING/EIG/cerred.f
+++ b/TESTING/EIG/cerred.f
@@ -67,6 +67,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRED( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -332,7 +333,7 @@ SUBROUTINE CERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
 *
 *        Test CGESDD
@@ -367,7 +368,7 @@ SUBROUTINE CERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
 *
 *        Test CGEJSV
@@ -433,7 +434,7 @@ SUBROUTINE CERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
 *
 *        Test CGESVDX
@@ -492,7 +493,7 @@ SUBROUTINE CERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
 *
 *        Test CGESVDQ
@@ -547,7 +548,7 @@ SUBROUTINE CERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
       END IF
 *
@@ -558,7 +559,7 @@ SUBROUTINE CERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
       END IF
 *
diff --git a/TESTING/EIG/cerrgg.f b/TESTING/EIG/cerrgg.f
index 3839b5f2c3..fa5eeb47b6 100644
--- a/TESTING/EIG/cerrgg.f
+++ b/TESTING/EIG/cerrgg.f
@@ -54,6 +54,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRGG( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cerrhs.f b/TESTING/EIG/cerrhs.f
index 0568a6d786..8a87071baa 100644
--- a/TESTING/EIG/cerrhs.f
+++ b/TESTING/EIG/cerrhs.f
@@ -21,8 +21,8 @@
 *>
 *> \verbatim
 *>
-*> CERRHS tests the error exits for CGEBAK, CGEBAL, CGEHRD, CUNGHR,
-*> CUNMHR, CHSEQR, CHSEIN, and CTREVC.
+*> CERRHS tests the error exits for CGEBAK, CGEBAL, CGEHRD, CGEHD2,
+*> CUNGHR, CUNMHR, CHSEQR, CHSEIN, CTREVC, and CTREVC3.
 *> \endverbatim
 *
 *  Arguments:
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRHS( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -86,7 +87,7 @@ SUBROUTINE CERRHS( PATH, NUNIT )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CHKXER, CGEBAK, CGEBAL, CGEHRD, CHSEIN, CHSEQR,
-     $                   CUNGHR, CUNMHR, CTREVC
+     $                   CUNGHR, CUNMHR, CTREVC, CTREVC3, CGEHD2
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          REAL
@@ -193,6 +194,29 @@ SUBROUTINE CERRHS( PATH, NUNIT )
          CALL CHKXER( 'CGEHRD', INFOT, NOUT, LERR, OK )
          NT = NT + 7
 *
+*        CGEHD2
+*
+         SRNAMT = 'CGEHD2'
+         INFOT = 1
+         CALL CGEHD2( -1, 1, 1, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'CGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL CGEHD2( 0, 0, 0, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'CGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL CGEHD2( 0, 2, 0, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'CGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL CGEHD2( 1, 1, 0, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'CGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL CGEHD2( 0, 1, 1, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'CGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL CGEHD2( 2, 1, 1, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'CGEHD2', INFOT, NOUT, LERR, OK )
+         NT = NT + 6
+*
 *        CUNGHR
 *
          SRNAMT = 'CUNGHR'
@@ -398,6 +422,47 @@ SUBROUTINE CERRHS( PATH, NUNIT )
      $                RW, INFO )
          CALL CHKXER( 'CTREVC', INFOT, NOUT, LERR, OK )
          NT = NT + 7
+*
+*        CTREVC3
+*
+         SRNAMT = 'CTREVC3'
+         INFOT = 1
+         CALL CTREVC3( '/', 'A', SEL, 0, A, 1, VL, 1, VR, 1, 0, M, W,
+     $                 LW, RW, 1, INFO )
+         CALL CHKXER( 'CTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL CTREVC3( 'L', '/', SEL, 0, A, 1, VL, 1, VR, 1, 0, M, W,
+     $                 LW, RW, 1, INFO )
+         CALL CHKXER( 'CTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL CTREVC3( 'L', 'A', SEL, -1, A, 1, VL, 1, VR, 1, 0, M, W,
+     $                 LW, RW, 1, INFO )
+         CALL CHKXER( 'CTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 6
+         CALL CTREVC3( 'L', 'A', SEL, 2, A, 1, VL, 2, VR, 1, 4, M, W,
+     $                 LW, RW, 2, INFO )
+         CALL CHKXER( 'CTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL CTREVC3( 'L', 'A', SEL, 2, A, 2, VL, 1, VR, 1, 4, M, W,
+     $                 LW, RW, 2, INFO )
+         CALL CHKXER( 'CTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL CTREVC3( 'R', 'A', SEL, 2, A, 2, VL, 1, VR, 1, 4, M, W,
+     $                 LW, RW, 2, INFO )
+         CALL CHKXER( 'CTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 11
+         CALL CTREVC3( 'L', 'A', SEL, 2, A, 2, VL, 2, VR, 1, 1, M, W,
+     $                 LW, RW, 2, INFO )
+         CALL CHKXER( 'CTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 14
+         CALL CTREVC3( 'L', 'A', SEL, 2, A, 2, VL, 2, VR, 1, 2, M, W,
+     $                 2, RW, 2, INFO )
+         CALL CHKXER( 'CTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 16
+         CALL CTREVC3( 'L', 'A', SEL, 2, A, 2, VL, 2, VR, 1, 2, M, W,
+     $                 LW, RW, 1, INFO )
+         CALL CHKXER( 'CTREVC3', INFOT, NOUT, LERR, OK )
+         NT = NT + 9
       END IF
 *
 *     Print a summary line.
diff --git a/TESTING/EIG/cerrst.f b/TESTING/EIG/cerrst.f
index eef34b44bb..83e0679389 100644
--- a/TESTING/EIG/cerrst.f
+++ b/TESTING/EIG/cerrst.f
@@ -21,7 +21,7 @@
 *>
 *> \verbatim
 *>
-*> CERRST tests the error exits for CHETRD, CUNGTR, CUNMTR, CHPTRD,
+*> CERRST tests the error exits for CHETRD, CHETD2, CUNGTR, CUNMTR, CHPTRD,
 *> CUNGTR, CUPMTR, CSTEQR, CSTEIN, CPTEQR, CHBTRD,
 *> CHEEV, CHEEVX, CHEEVD, CHBEV, CHBEVX, CHBEVD,
 *> CHPEV, CHPEVX, CHPEVD, and CSTEDC.
@@ -58,6 +58,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRST( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -94,7 +95,7 @@ SUBROUTINE CERRST( PATH, NUNIT )
       EXTERNAL           CHBEV, CHBEVD, CHBEVX, CHBTRD, CHEEV, CHEEVD,
      $                   CHEEVR, CHEEVX, CHETRD, CHKXER, CHPEV, CHPEVD,
      $                   CHPEVX, CHPTRD, CPTEQR, CSTEDC, CSTEIN, CSTEQR,
-     $                   CUNGTR, CUNMTR, CUPGTR, CUPMTR,
+     $                   CUNGTR, CUNMTR, CUPGTR, CUPMTR, CHETD2,
      $                   CHEEVD_2STAGE, CHEEVR_2STAGE, CHEEVX_2STAGE,
      $                   CHEEV_2STAGE, CHBEV_2STAGE, CHBEVD_2STAGE,
      $                   CHBEVX_2STAGE, CHETRD_2STAGE, CHETRD_HE2HB,
@@ -156,6 +157,20 @@ SUBROUTINE CERRST( PATH, NUNIT )
          CALL CHKXER( 'CHETRD', INFOT, NOUT, LERR, OK )
          NT = NT + 4
 *
+*        CHETD2
+*
+         SRNAMT = 'CHETD2'
+         INFOT = 1
+         CALL CHETD2( '/', 0, A, 1, D, E, TAU, INFO )
+         CALL CHKXER( 'CHETD2', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL CHETD2( 'U', -1, A, 1, D, E, TAU, INFO )
+         CALL CHKXER( 'CHETD2', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL CHETD2( 'U', 2, A, 1, D, E, TAU, INFO )
+         CALL CHKXER( 'CHETD2', INFOT, NOUT, LERR, OK )
+         NT = NT + 3
+*
 *        CHETRD_2STAGE
 *
          SRNAMT = 'CHETRD_2STAGE'
@@ -628,56 +643,56 @@ SUBROUTINE CERRST( PATH, NUNIT )
          SRNAMT = 'CHEEVX_2STAGE'
          INFOT = 1
          CALL CHEEVX_2STAGE( '/', 'A', 'U', 0, A, 1,
-     $                0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                0.0, 0.0, 0, 0, 0.0,
      $                M, X, Z, 1, W, 1, RW, IW, I3, INFO )
          CALL CHKXER( 'CHEEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 1
          CALL CHEEVX_2STAGE( 'V', 'A', 'U', 0, A, 1,
-     $                0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                0.0, 0.0, 0, 0, 0.0,
      $                M, X, Z, 1, W, 1, RW, IW, I3, INFO )
          CALL CHKXER( 'CHEEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 2
          CALL CHEEVX_2STAGE( 'N', '/', 'U', 0, A, 1,
-     $                0.0D0, 1.0D0, 1, 0, 0.0D0,
+     $                0.0, 1.0, 1, 0, 0.0,
      $                M, X, Z, 1, W, 1, RW, IW, I3, INFO )
          CALL CHKXER( 'CHEEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 3
          CALL CHEEVX_2STAGE( 'N', 'A', '/', 0, A, 1,
-     $                0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                0.0, 0.0, 0, 0, 0.0,
      $                M, X, Z, 1, W, 1, RW, IW, I3, INFO )
          INFOT = 4
          CALL CHEEVX_2STAGE( 'N', 'A', 'U', -1, A, 1,
-     $                0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                0.0, 0.0, 0, 0, 0.0,
      $                M, X, Z, 1, W, 1, RW, IW, I3, INFO )
          CALL CHKXER( 'CHEEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 6
          CALL CHEEVX_2STAGE( 'N', 'A', 'U', 2, A, 1,
-     $                0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                0.0, 0.0, 0, 0, 0.0,
      $                M, X, Z, 2, W, 3, RW, IW, I3, INFO )
          CALL CHKXER( 'CHEEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 8
          CALL CHEEVX_2STAGE( 'N', 'V', 'U', 1, A, 1,
-     $                0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                0.0, 0.0, 0, 0, 0.0,
      $                M, X, Z, 1, W, 1, RW, IW, I3, INFO )
          CALL CHKXER( 'CHEEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 9
          CALL CHEEVX_2STAGE( 'N', 'I', 'U', 1, A, 1,
-     $                0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                0.0, 0.0, 0, 0, 0.0,
      $                M, X, Z, 1, W, 1, RW, IW, I3, INFO )
          CALL CHKXER( 'CHEEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 10
          CALL CHEEVX_2STAGE( 'N', 'I', 'U', 2, A, 2,
-     $                0.0D0, 0.0D0, 2, 1, 0.0D0,
+     $                0.0, 0.0, 2, 1, 0.0,
      $                M, X, Z, 2, W, 3, RW, IW, I3, INFO )
          CALL CHKXER( 'CHEEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 15
          CALL CHEEVX_2STAGE( 'N', 'A', 'U', 2, A, 2,
-     $                0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                0.0, 0.0, 0, 0, 0.0,
      $                M, X, Z, 0, W, 3, RW, IW, I3, INFO )
          CALL CHKXER( 'CHEEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 17
          CALL CHEEVX_2STAGE( 'N', 'A', 'U', 2, A, 2,
-     $                0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                0.0, 0.0, 0, 0, 0.0,
      $                M, X, Z, 2, W, 0, RW, IW, I1, INFO )
          CALL CHKXER( 'CHEEVX_2STAGE', INFOT, NOUT, LERR, OK )
          NT = NT + 11
@@ -734,17 +749,17 @@ SUBROUTINE CERRST( PATH, NUNIT )
          CALL CHKXER( 'CHEEVR', INFOT, NOUT, LERR, OK )
          INFOT = 18
          CALL CHEEVR( 'V', 'I', 'U', 1, A, 1, 0.0E0, 0.0E0, 1, 1, 0.0,
-     $                M, R, Z, 1, IW, Q, 2*N-1, RW, 24*N, IW( 2*N+1 ),
+     $                M, R, Z, 1, IW, Q, 0, RW, 24*N, IW( 2*N+1 ),
      $                10*N, INFO )
          CALL CHKXER( 'CHEEVR', INFOT, NOUT, LERR, OK )
          INFOT = 20
          CALL CHEEVR( 'V', 'I', 'U', 1, A, 1, 0.0E0, 0.0E0, 1, 1, 0.0,
-     $                M, R, Z, 1, IW, Q, 2*N, RW, 24*N-1, IW( 2*N-1 ),
+     $                M, R, Z, 1, IW, Q, 2*N, RW, 0, IW( 2*N-1 ),
      $                10*N, INFO )
          CALL CHKXER( 'CHEEVR', INFOT, NOUT, LERR, OK )
          INFOT = 22
          CALL CHEEVR( 'V', 'I', 'U', 1, A, 1, 0.0E0, 0.0E0, 1, 1, 0.0,
-     $                M, R, Z, 1, IW, Q, 2*N, RW, 24*N, IW, 10*N-1,
+     $                M, R, Z, 1, IW, Q, 2*N, RW, 24*N, IW, 0,
      $                INFO )
          CALL CHKXER( 'CHEEVR', INFOT, NOUT, LERR, OK )
          NT = NT + 12
@@ -755,80 +770,80 @@ SUBROUTINE CERRST( PATH, NUNIT )
          N = 1
          INFOT = 1
          CALL CHEEVR_2STAGE( '/', 'A', 'U', 0, A, 1,
-     $                0.0D0, 0.0D0, 1, 1, 0.0D0,
+     $                0.0, 0.0, 1, 1, 0.0,
      $                M, R, Z, 1, IW, Q, 2*N, RW, 24*N, IW( 2*N+1 ),
      $                10*N, INFO )
          CALL CHKXER( 'CHEEVR_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 1
          CALL CHEEVR_2STAGE( 'V', 'A', 'U', 0, A, 1,
-     $                0.0D0, 0.0D0, 1, 1, 0.0D0,
+     $                0.0, 0.0, 1, 1, 0.0,
      $                M, R, Z, 1, IW, Q, 2*N, RW, 24*N, IW( 2*N+1 ),
      $                10*N, INFO )
          CALL CHKXER( 'CHEEVR_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 2
          CALL CHEEVR_2STAGE( 'N', '/', 'U', 0, A, 1,
-     $                0.0D0, 0.0D0, 1, 1, 0.0D0,
+     $                0.0, 0.0, 1, 1, 0.0,
      $                M, R, Z, 1, IW, Q, 2*N, RW, 24*N, IW( 2*N+1 ),
      $                10*N, INFO )
          CALL CHKXER( 'CHEEVR_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 3
          CALL CHEEVR_2STAGE( 'N', 'A', '/', -1, A, 1,
-     $                0.0D0, 0.0D0, 1, 1, 0.0D0,
+     $                0.0, 0.0, 1, 1, 0.0,
      $                M, R, Z, 1, IW, Q, 2*N, RW, 24*N,
      $                IW( 2*N+1 ), 10*N, INFO )
          CALL CHKXER( 'CHEEVR_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 4
          CALL CHEEVR_2STAGE( 'N', 'A', 'U', -1, A, 1,
-     $                0.0D0, 0.0D0, 1, 1, 0.0D0,
+     $                0.0, 0.0, 1, 1, 0.0,
      $                M, R, Z, 1, IW, Q, 2*N, RW, 24*N,
      $                IW( 2*N+1 ), 10*N, INFO )
          CALL CHKXER( 'CHEEVR_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 6
          CALL CHEEVR_2STAGE( 'N', 'A', 'U', 2, A, 1,
-     $                0.0D0, 0.0D0, 1, 1, 0.0D0,
+     $                0.0, 0.0, 1, 1, 0.0,
      $                M, R, Z, 1, IW, Q, 2*N, RW, 24*N, IW( 2*N+1 ),
      $                10*N, INFO )
          CALL CHKXER( 'CHEEVR_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 8
          CALL CHEEVR_2STAGE( 'N', 'V', 'U', 1, A, 1,
-     $                0.0D0, 0.0D0, 1, 1, 0.0D0,
+     $                0.0, 0.0, 1, 1, 0.0,
      $                M, R, Z, 1, IW, Q, 2*N, RW, 24*N, IW( 2*N+1 ),
      $                10*N, INFO )
          CALL CHKXER( 'CHEEVR_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 9
          CALL CHEEVR_2STAGE( 'N', 'I', 'U', 1, A, 1,
-     $                0.0D0, 0.0D0, 0, 1, 0.0D0,
+     $                0.0, 0.0, 0, 1, 0.0,
      $                M, R, Z, 1, IW, Q, 2*N, RW, 24*N, IW( 2*N+1 ),
      $                10*N, INFO )
          CALL CHKXER( 'CHEEVR_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 10
          CALL CHEEVR_2STAGE( 'N', 'I', 'U', 2, A, 2,
-     $                0.0D0, 0.0D0, 2, 1, 0.0D0,
+     $                0.0, 0.0, 2, 1, 0.0,
      $                M, R, Z, 1, IW, Q, 2*N, RW, 24*N, IW( 2*N+1 ),
      $                10*N, INFO )
          CALL CHKXER( 'CHEEVR_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 15
          CALL CHEEVR_2STAGE( 'N', 'I', 'U', 1, A, 1,
-     $                0.0D0, 0.0D0, 1, 1, 0.0D0,
+     $                0.0, 0.0, 1, 1, 0.0,
      $                M, R, Z, 0, IW, Q, 2*N, RW, 24*N, IW( 2*N+1 ),
      $                10*N, INFO )
          CALL CHKXER( 'CHEEVR_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 18
          CALL CHEEVR_2STAGE( 'N', 'I', 'U', 1, A, 1,
-     $                0.0D0, 0.0D0, 1, 1, 0.0D0,
-     $                M, R, Z, 1, IW, Q, 2*N-1, RW, 24*N, IW( 2*N+1 ),
+     $                0.0, 0.0, 1, 1, 0.0,
+     $                M, R, Z, 1, IW, Q, 0, RW, 24*N, IW( 2*N+1 ),
      $                10*N, INFO )
          CALL CHKXER( 'CHEEVR_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 20
          CALL CHEEVR_2STAGE( 'N', 'I', 'U', 1, A, 1,
-     $                0.0D0, 0.0D0, 1, 1, 0.0D0,
-     $                M, R, Z, 1, IW, Q, 26*N, RW, 24*N-1, IW( 2*N-1 ),
+     $                0.0, 0.0, 1, 1, 0.0,
+     $                M, R, Z, 1, IW, Q, 26*N, RW, 0, IW( 2*N-1 ),
      $                10*N, INFO )
          CALL CHKXER( 'CHEEVR_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 22
          CALL CHEEVR_2STAGE( 'N', 'I', 'U', 1, A, 1,
-     $                0.0D0, 0.0D0, 1, 1, 0.0D0,
-     $                M, R, Z, 1, IW, Q, 26*N, RW, 24*N, IW, 10*N-1,
+     $                0.0, 0.0, 1, 1, 0.0,
+     $                M, R, Z, 1, IW, Q, 26*N, RW, 24*N, IW, 0,
      $                INFO )
          CALL CHKXER( 'CHEEVR_2STAGE', INFOT, NOUT, LERR, OK )
          NT = NT + 13
@@ -1259,65 +1274,65 @@ SUBROUTINE CERRST( PATH, NUNIT )
          SRNAMT = 'CHBEVX_2STAGE'
          INFOT = 1
          CALL CHBEVX_2STAGE( '/', 'A', 'U', 0, 0, A, 1, Q, 1,
-     $                       0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                       0.0, 0.0, 0, 0, 0.0,
      $                       M, X, Z, 1, W, 0, RW, IW, I3, INFO )
          INFOT = 1
          CALL CHBEVX_2STAGE( 'V', 'A', 'U', 0, 0, A, 1, Q, 1,
-     $                       0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                       0.0, 0.0, 0, 0, 0.0,
      $                       M, X, Z, 1, W, 0, RW, IW, I3, INFO )
          CALL CHKXER( 'CHBEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 2
          CALL CHBEVX_2STAGE( 'N', '/', 'U', 0, 0, A, 1, Q, 1,
-     $                       0.0D0, 1.0D0, 1, 0, 0.0D0,
+     $                       0.0, 1.0, 1, 0, 0.0,
      $                       M, X, Z, 1, W, 0, RW, IW, I3, INFO )
          CALL CHKXER( 'CHBEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 3
          CALL CHBEVX_2STAGE( 'N', 'A', '/', 0, 0, A, 1, Q, 1,
-     $                       0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                       0.0, 0.0, 0, 0, 0.0,
      $                       M, X, Z, 1, W, 0, RW, IW, I3, INFO )
          INFOT = 4
          CALL CHBEVX_2STAGE( 'N', 'A', 'U', -1, 0, A, 1, Q, 1,
-     $                       0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                       0.0, 0.0, 0, 0, 0.0,
      $                       M, X, Z, 1, W, 0, RW, IW, I3, INFO )
          CALL CHKXER( 'CHBEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 5
          CALL CHBEVX_2STAGE( 'N', 'A', 'U', 0, -1, A, 1, Q, 1,
-     $                       0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                       0.0, 0.0, 0, 0, 0.0,
      $                       M, X, Z, 1, W, 0, RW, IW, I3, INFO )
          CALL CHKXER( 'CHBEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 7
          CALL CHBEVX_2STAGE( 'N', 'A', 'U', 2, 1, A, 1, Q, 2,
-     $                       0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                       0.0, 0.0, 0, 0, 0.0,
      $                       M, X, Z, 2, W, 0, RW, IW, I3, INFO )
          CALL CHKXER( 'CHBEVX_2STAGE', INFOT, NOUT, LERR, OK )
 *         INFOT = 9
 *         CALL CHBEVX_2STAGE( 'V', 'A', 'U', 2, 0, A, 1, Q, 1,
-*     $                       0.0D0, 0.0D0, 0, 0, 0.0D0,
+*     $                       0.0, 0.0, 0, 0, 0.0,
 *     $                       M, X, Z, 2, W, 0, RW, IW, I3, INFO )
 *         CALL CHKXER( 'CHBEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 11
          CALL CHBEVX_2STAGE( 'N', 'V', 'U', 1, 0, A, 1, Q, 1,
-     $                       0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                       0.0, 0.0, 0, 0, 0.0,
      $                       M, X, Z, 1, W, 0, RW, IW, I3, INFO )
          CALL CHKXER( 'CHBEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 12
          CALL CHBEVX_2STAGE( 'N', 'I', 'U', 1, 0, A, 1, Q, 1,
-     $                       0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                       0.0, 0.0, 0, 0, 0.0,
      $                       M, X, Z, 1, W, 0, RW, IW, I3, INFO )
          CALL CHKXER( 'CHBEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 13
          CALL CHBEVX_2STAGE( 'N', 'I', 'U', 1, 0, A, 1, Q, 1,
-     $                       0.0D0, 0.0D0, 1, 2, 0.0D0,
+     $                       0.0, 0.0, 1, 2, 0.0,
      $                       M, X, Z, 1, W, 0, RW, IW, I3, INFO )
          CALL CHKXER( 'CHBEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 18
          CALL CHBEVX_2STAGE( 'N', 'A', 'U', 2, 0, A, 1, Q, 2,
-     $                       0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                       0.0, 0.0, 0, 0, 0.0,
      $                       M, X, Z, 0, W, 0, RW, IW, I3, INFO )
          CALL CHKXER( 'CHBEVX_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 20
          CALL CHBEVX_2STAGE( 'N', 'A', 'U', 2, 0, A, 1, Q, 2,
-     $                       0.0D0, 0.0D0, 0, 0, 0.0D0,
+     $                       0.0, 0.0, 0, 0, 0.0,
      $                       M, X, Z, 1, W, 0, RW, IW, I3, INFO )
          CALL CHKXER( 'CHBEVX_2STAGE', INFOT, NOUT, LERR, OK )
          NT = NT + 12
diff --git a/TESTING/EIG/cget02.f b/TESTING/EIG/cget02.f
index 3a8f6308ca..b5f96b7fe7 100644
--- a/TESTING/EIG/cget02.f
+++ b/TESTING/EIG/cget02.f
@@ -131,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE CGET02( TRANS, M, N, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cget10.f b/TESTING/EIG/cget10.f
index 9e6b34ba8a..448f87819a 100644
--- a/TESTING/EIG/cget10.f
+++ b/TESTING/EIG/cget10.f
@@ -96,6 +96,7 @@
 *
 *  =====================================================================
       SUBROUTINE CGET10( M, N, A, LDA, B, LDB, WORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cget22.f b/TESTING/EIG/cget22.f
index 2f0896741b..f5bf430eaa 100644
--- a/TESTING/EIG/cget22.f
+++ b/TESTING/EIG/cget22.f
@@ -141,6 +141,7 @@
 *  =====================================================================
       SUBROUTINE CGET22( TRANSA, TRANSE, TRANSW, N, A, LDA, E, LDE, W,
      $                   WORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cget23.f b/TESTING/EIG/cget23.f
index b4a8c4631c..e2c67785d9 100644
--- a/TESTING/EIG/cget23.f
+++ b/TESTING/EIG/cget23.f
@@ -365,6 +365,7 @@ SUBROUTINE CGET23( COMP, ISRT, BALANC, JTYPE, THRESH, ISEED,
      $                   LDVR, LRE, LDLRE, RCONDV, RCNDV1, RCDVIN,
      $                   RCONDE, RCNDE1, RCDEIN, SCALE, SCALE1, RESULT,
      $                   WORK, LWORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cget24.f b/TESTING/EIG/cget24.f
index 4674b62265..82c77006b8 100644
--- a/TESTING/EIG/cget24.f
+++ b/TESTING/EIG/cget24.f
@@ -332,6 +332,7 @@ SUBROUTINE CGET24( COMP, JTYPE, THRESH, ISEED, NOUNIT, N, A, LDA,
      $                   H, HT, W, WT, WTMP, VS, LDVS, VS1, RCDEIN,
      $                   RCDVIN, NSLCT, ISLCT, ISRT, RESULT, WORK,
      $                   LWORK, RWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cget35.f b/TESTING/EIG/cget35.f
index 4f03ab9eee..63ba3ad01a 100644
--- a/TESTING/EIG/cget35.f
+++ b/TESTING/EIG/cget35.f
@@ -81,6 +81,7 @@
 *
 *  =====================================================================
       SUBROUTINE CGET35( RMAX, LMAX, NINFO, KNT, NIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -134,7 +135,6 @@ SUBROUTINE CGET35( RMAX, LMAX, NINFO, KNT, NIN )
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Set up test case parameters
 *
diff --git a/TESTING/EIG/cget36.f b/TESTING/EIG/cget36.f
index 7f943f2564..56673d260c 100644
--- a/TESTING/EIG/cget36.f
+++ b/TESTING/EIG/cget36.f
@@ -82,6 +82,7 @@
 *
 *  =====================================================================
       SUBROUTINE CGET36( RMAX, LMAX, NINFO, KNT, NIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cget37.f b/TESTING/EIG/cget37.f
index c2a6589f32..9a4bd3fde5 100644
--- a/TESTING/EIG/cget37.f
+++ b/TESTING/EIG/cget37.f
@@ -87,6 +87,7 @@
 *
 *  =====================================================================
       SUBROUTINE CGET37( RMAX, LMAX, NINFO, KNT, NIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -132,7 +133,7 @@ SUBROUTINE CGET37( RMAX, LMAX, NINFO, KNT, NIN )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CCOPY, CGEHRD, CHSEQR, CLACPY, CSSCAL, CTREVC,
-     $                   CTRSNA, SCOPY, SLABAD, SSCAL
+     $                   CTRSNA, SCOPY, SSCAL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          AIMAG, MAX, REAL, SQRT
@@ -142,7 +143,6 @@ SUBROUTINE CGET37( RMAX, LMAX, NINFO, KNT, NIN )
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     EPSIN = 2**(-24) = precision to which input data computed
 *
@@ -265,7 +265,7 @@ SUBROUTINE CGET37( RMAX, LMAX, NINFO, KNT, NIN )
   100       CONTINUE
             WSRT( KMIN ) = WSRT( I )
             WSRT( I ) = VMIN
-            VCMIN = WTMP( I )
+            VCMIN = REAL( WTMP( I ) )
             WTMP( I ) = W( KMIN )
             WTMP( KMIN ) = VCMIN
             VMIN = STMP( KMIN )
diff --git a/TESTING/EIG/cget38.f b/TESTING/EIG/cget38.f
index 9925f3fd70..95a9438f60 100644
--- a/TESTING/EIG/cget38.f
+++ b/TESTING/EIG/cget38.f
@@ -88,6 +88,7 @@
 *
 *  =====================================================================
       SUBROUTINE CGET38( RMAX, LMAX, NINFO, KNT, NIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -136,7 +137,7 @@ SUBROUTINE CGET38( RMAX, LMAX, NINFO, KNT, NIN )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CGEHRD, CHSEQR, CHST01, CLACPY, CSSCAL, CTRSEN,
-     $                   CUNGHR, SLABAD
+     $                   CUNGHR
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          AIMAG, MAX, REAL, SQRT
@@ -146,7 +147,6 @@ SUBROUTINE CGET38( RMAX, LMAX, NINFO, KNT, NIN )
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     EPSIN = 2**(-24) = precision to which input data computed
 *
diff --git a/TESTING/EIG/cget51.f b/TESTING/EIG/cget51.f
index 3781c6a88b..5cffc356c4 100644
--- a/TESTING/EIG/cget51.f
+++ b/TESTING/EIG/cget51.f
@@ -152,6 +152,7 @@
 *  =====================================================================
       SUBROUTINE CGET51( ITYPE, N, A, LDA, B, LDB, U, LDU, V, LDV, WORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cget52.f b/TESTING/EIG/cget52.f
index 30bf6ba394..967d56e362 100644
--- a/TESTING/EIG/cget52.f
+++ b/TESTING/EIG/cget52.f
@@ -158,6 +158,7 @@
 *  =====================================================================
       SUBROUTINE CGET52( LEFT, N, A, LDA, B, LDB, E, LDE, ALPHA, BETA,
      $                   WORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -256,7 +257,7 @@ SUBROUTINE CGET52( LEFT, N, A, LDA, B, LDB, E, LDE, ALPHA, BETA,
          END IF
          CALL CGEMV( TRANS, N, N, ACOEFF, A, LDA, E( 1, JVEC ), 1,
      $               CZERO, WORK( N*( JVEC-1 )+1 ), 1 )
-         CALL CGEMV( TRANS, N, N, -BCOEFF, B, LDA, E( 1, JVEC ), 1,
+         CALL CGEMV( TRANS, N, N, -BCOEFF, B, LDB, E( 1, JVEC ), 1,
      $               CONE, WORK( N*( JVEC-1 )+1 ), 1 )
    10 CONTINUE
 *
diff --git a/TESTING/EIG/cget54.f b/TESTING/EIG/cget54.f
index ce8376fc6d..19222a7b29 100644
--- a/TESTING/EIG/cget54.f
+++ b/TESTING/EIG/cget54.f
@@ -153,6 +153,7 @@
 *  =====================================================================
       SUBROUTINE CGET54( N, A, LDA, B, LDB, S, LDS, T, LDT, U, LDU, V,
      $                   LDV, WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cglmts.f b/TESTING/EIG/cglmts.f
index ecf8699f27..b906050a8d 100644
--- a/TESTING/EIG/cglmts.f
+++ b/TESTING/EIG/cglmts.f
@@ -147,6 +147,7 @@
 *  =====================================================================
       SUBROUTINE CGLMTS( N, M, P, A, AF, LDA, B, BF, LDB, D, DF,
      $                   X, U, WORK, LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cgqrts.f b/TESTING/EIG/cgqrts.f
index 6a5bcc2d4e..b641c1820f 100644
--- a/TESTING/EIG/cgqrts.f
+++ b/TESTING/EIG/cgqrts.f
@@ -173,6 +173,7 @@
 *  =====================================================================
       SUBROUTINE CGQRTS( N, M, P, A, AF, Q, R, LDA, TAUA, B, BF, Z, T,
      $                   BWK, LDB, TAUB, WORK, LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cgrqts.f b/TESTING/EIG/cgrqts.f
index 103820ec11..51ef242617 100644
--- a/TESTING/EIG/cgrqts.f
+++ b/TESTING/EIG/cgrqts.f
@@ -173,6 +173,7 @@
 *  =====================================================================
       SUBROUTINE CGRQTS( M, P, N, A, AF, Q, R, LDA, TAUA, B, BF, Z, T,
      $                   BWK, LDB, TAUB, WORK, LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cgsvts3.f b/TESTING/EIG/cgsvts3.f
index 699f14b1cb..f505e81b65 100644
--- a/TESTING/EIG/cgsvts3.f
+++ b/TESTING/EIG/cgsvts3.f
@@ -206,6 +206,7 @@
       SUBROUTINE CGSVTS3( M, P, N, A, AF, LDA, B, BF, LDB, U, LDU, V,
      $                    LDV, Q, LDQ, ALPHA, BETA, R, LDR, IWORK, WORK,
      $                    LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/chbt21.f b/TESTING/EIG/chbt21.f
index b41936aa59..1e29d59604 100644
--- a/TESTING/EIG/chbt21.f
+++ b/TESTING/EIG/chbt21.f
@@ -149,6 +149,7 @@
 *  =====================================================================
       SUBROUTINE CHBT21( UPLO, N, KA, KS, A, LDA, D, E, U, LDU, WORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/chet21.f b/TESTING/EIG/chet21.f
index a274681c98..0fe30d25ae 100644
--- a/TESTING/EIG/chet21.f
+++ b/TESTING/EIG/chet21.f
@@ -211,6 +211,7 @@
 *  =====================================================================
       SUBROUTINE CHET21( ITYPE, UPLO, N, KBAND, A, LDA, D, E, U, LDU, V,
      $                   LDV, TAU, WORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -304,9 +305,9 @@ SUBROUTINE CHET21( ITYPE, UPLO, N, KBAND, A, LDA, D, E, U, LDU, V,
    10    CONTINUE
 *
          IF( N.GT.1 .AND. KBAND.EQ.1 ) THEN
-            DO 20 J = 2, N - 1
+            DO 20 J = 1, N - 1
                CALL CHER2( CUPLO, N, -CMPLX( E( J ) ), U( 1, J ), 1,
-     $                     U( 1, J-1 ), 1, WORK, N )
+     $                     U( 1, J+1 ), 1, WORK, N )
    20       CONTINUE
          END IF
          WNORM = CLANHE( '1', CUPLO, N, WORK, N, RWORK )
diff --git a/TESTING/EIG/chet22.f b/TESTING/EIG/chet22.f
index 27f22e9a42..6ad378ad7d 100644
--- a/TESTING/EIG/chet22.f
+++ b/TESTING/EIG/chet22.f
@@ -158,6 +158,7 @@
 *  =====================================================================
       SUBROUTINE CHET22( ITYPE, UPLO, N, M, KBAND, A, LDA, D, E, U, LDU,
      $                   V, LDV, TAU, WORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/chkxer.f b/TESTING/EIG/chkxer.f
index fd00bb65a7..eb9a0e57e6 100644
--- a/TESTING/EIG/chkxer.f
+++ b/TESTING/EIG/chkxer.f
@@ -38,6 +38,7 @@
 *
 *  =====================================================================
       SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -61,7 +62,7 @@ SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
       RETURN
 *
  9999 FORMAT( ' *** Illegal value of parameter number ', I2,
-     $      ' not detected by ', A6, ' ***' )
+     $      ' not detected by ', A, ' ***' )
 *
 *     End of CHKXER
 *
diff --git a/TESTING/EIG/chpt21.f b/TESTING/EIG/chpt21.f
index bc342ca357..7a891abafc 100644
--- a/TESTING/EIG/chpt21.f
+++ b/TESTING/EIG/chpt21.f
@@ -225,6 +225,7 @@
 *  =====================================================================
       SUBROUTINE CHPT21( ITYPE, UPLO, N, KBAND, AP, D, E, U, LDU, VP,
      $                   TAU, WORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/chst01.f b/TESTING/EIG/chst01.f
index 286daee2c9..cf5022ca64 100644
--- a/TESTING/EIG/chst01.f
+++ b/TESTING/EIG/chst01.f
@@ -137,6 +137,7 @@
 *  =====================================================================
       SUBROUTINE CHST01( N, ILO, IHI, A, LDA, H, LDH, Q, LDQ, WORK,
      $                   LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -166,7 +167,7 @@ SUBROUTINE CHST01( N, ILO, IHI, A, LDA, H, LDH, Q, LDQ, WORK,
       EXTERNAL           CLANGE, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEMM, CLACPY, CUNT01, SLABAD
+      EXTERNAL           CGEMM, CLACPY, CUNT01
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CMPLX, MAX, MIN
@@ -184,7 +185,6 @@ SUBROUTINE CHST01( N, ILO, IHI, A, LDA, H, LDH, Q, LDQ, WORK,
       UNFL = SLAMCH( 'Safe minimum' )
       EPS = SLAMCH( 'Precision' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       SMLNUM = UNFL*N / EPS
 *
 *     Test 1:  Compute norm( A - Q*H*Q' ) / ( norm(A) * N * EPS )
diff --git a/TESTING/EIG/clarfy.f b/TESTING/EIG/clarfy.f
index 80329cab43..ad4baf2c51 100644
--- a/TESTING/EIG/clarfy.f
+++ b/TESTING/EIG/clarfy.f
@@ -105,6 +105,7 @@
 *
 *  =====================================================================
       SUBROUTINE CLARFY( UPLO, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/clarhs.f b/TESTING/EIG/clarhs.f
index 9842df9599..671e71e1b2 100644
--- a/TESTING/EIG/clarhs.f
+++ b/TESTING/EIG/clarhs.f
@@ -205,6 +205,7 @@
 *  =====================================================================
       SUBROUTINE CLARHS( PATH, XTYPE, UPLO, TRANS, M, N, KL, KU, NRHS,
      $                   A, LDA, X, LDX, B, LDB, ISEED, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/clatm4.f b/TESTING/EIG/clatm4.f
index 12d0c63182..daafeb52e7 100644
--- a/TESTING/EIG/clatm4.f
+++ b/TESTING/EIG/clatm4.f
@@ -168,6 +168,7 @@
 *  =====================================================================
       SUBROUTINE CLATM4( ITYPE, N, NZ1, NZ2, RSIGN, AMAGN, RCOND,
      $                   TRIANG, IDIST, ISEED, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/clctes.f b/TESTING/EIG/clctes.f
index 9bf95cbc4a..c62b9e5f23 100644
--- a/TESTING/EIG/clctes.f
+++ b/TESTING/EIG/clctes.f
@@ -55,6 +55,7 @@
 *
 *  =====================================================================
       LOGICAL          FUNCTION CLCTES( Z, D )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/clctsx.f b/TESTING/EIG/clctsx.f
index 39c5cf321a..257c35ef86 100644
--- a/TESTING/EIG/clctsx.f
+++ b/TESTING/EIG/clctsx.f
@@ -54,6 +54,7 @@
 *
 *  =====================================================================
       LOGICAL          FUNCTION CLCTSX( ALPHA, BETA )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/clsets.f b/TESTING/EIG/clsets.f
index 2124a9e091..2c185d5af3 100644
--- a/TESTING/EIG/clsets.f
+++ b/TESTING/EIG/clsets.f
@@ -152,6 +152,7 @@
 *  =====================================================================
       SUBROUTINE CLSETS( M, P, N, A, AF, LDA, B, BF, LDB, C, CF,
      $                   D, DF, X, WORK, LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/csbmv.f b/TESTING/EIG/csbmv.f
index 567ea45178..63fa46482d 100644
--- a/TESTING/EIG/csbmv.f
+++ b/TESTING/EIG/csbmv.f
@@ -149,6 +149,7 @@
 *  =====================================================================
       SUBROUTINE CSBMV( UPLO, N, K, ALPHA, A, LDA, X, INCX, BETA, Y,
      $                  INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/csgt01.f b/TESTING/EIG/csgt01.f
index 828669d48d..15ed7887d6 100644
--- a/TESTING/EIG/csgt01.f
+++ b/TESTING/EIG/csgt01.f
@@ -149,6 +149,7 @@
 *  =====================================================================
       SUBROUTINE CSGT01( ITYPE, UPLO, N, M, A, LDA, B, LDB, Z, LDZ, D,
      $                   WORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cslect.f b/TESTING/EIG/cslect.f
index be324ec3c2..9f7e33dfcf 100644
--- a/TESTING/EIG/cslect.f
+++ b/TESTING/EIG/cslect.f
@@ -53,6 +53,7 @@
 *
 *  =====================================================================
       LOGICAL          FUNCTION CSLECT( Z )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cstt21.f b/TESTING/EIG/cstt21.f
index 58f426961f..52e14c6fb3 100644
--- a/TESTING/EIG/cstt21.f
+++ b/TESTING/EIG/cstt21.f
@@ -130,6 +130,7 @@
 *  =====================================================================
       SUBROUTINE CSTT21( N, KBAND, AD, AE, SD, SE, U, LDU, WORK, RWORK,
      $                   RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cstt22.f b/TESTING/EIG/cstt22.f
index bd09f63020..ebc2e789eb 100644
--- a/TESTING/EIG/cstt22.f
+++ b/TESTING/EIG/cstt22.f
@@ -142,6 +142,7 @@
 *  =====================================================================
       SUBROUTINE CSTT22( N, M, KBAND, AD, AE, SD, SE, U, LDU, WORK,
      $                   LDWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/csyl01.f b/TESTING/EIG/csyl01.f
new file mode 100644
index 0000000000..8a3cd1ae5d
--- /dev/null
+++ b/TESTING/EIG/csyl01.f
@@ -0,0 +1,317 @@
+*> \brief \b CSYL01
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE CSYL01( THRESH, NFAIL, RMAX, NINFO, KNT )
+*
+*     .. Scalar Arguments ..
+*     INTEGER            KNT
+*     REAL               THRESH
+*     ..
+*     .. Array Arguments ..
+*     INTEGER            NFAIL( 3 ), NINFO( 2 )
+*     REAL               RMAX( 2 )
+*     ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> CSYL01 tests CTRSYL and CTRSYL3, routines for solving the Sylvester matrix
+*> equation
+*>
+*>    op(A)*X + ISGN*X*op(B) = scale*C,
+*>
+*> where op(A) and op(B) are both upper triangular form, op() represents an
+*> optional conjugate transpose, and ISGN can be -1 or +1. Scale is an output
+*> less than or equal to 1, chosen to avoid overflow in X.
+*>
+*> The test code verifies that the following residual does not exceed
+*> the provided threshold:
+*>
+*>    norm(op(A)*X + ISGN*X*op(B) - scale*C) /
+*>        (EPS*max(norm(A),norm(B))*norm(X))
+*>
+*> This routine complements CGET35 by testing with larger,
+*> random matrices, of which some require rescaling of X to avoid overflow.
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] THRESH
+*> \verbatim
+*>          THRESH is REAL
+*>          A test will count as "failed" if the residual, computed as
+*>          described above, exceeds THRESH.
+*> \endverbatim
+*>
+*> \param[out] NFAIL
+*> \verbatim
+*>          NFAIL is INTEGER array, dimension (3)
+*>          NFAIL(1) = No. of times residual CTRSYL exceeds threshold THRESH
+*>          NFAIL(2) = No. of times residual CTRSYL3 exceeds threshold THRESH
+*>          NFAIL(3) = No. of times CTRSYL3 and CTRSYL deviate
+*> \endverbatim
+*>
+*> \param[out] RMAX
+*> \verbatim
+*>          RMAX is DOUBLE PRECISION array, dimension (2)
+*>          RMAX(1) = Value of the largest test ratio of CTRSYL
+*>          RMAX(2) = Value of the largest test ratio of CTRSYL3
+*> \endverbatim
+*>
+*> \param[out] NINFO
+*> \verbatim
+*>          NINFO is INTEGER array, dimension (2)
+*>          NINFO(1) = No. of times CTRSYL where INFO is nonzero
+*>          NINFO(2) = No. of times CTRSYL3 where INFO is nonzero
+*> \endverbatim
+*>
+*> \param[out] KNT
+*> \verbatim
+*>          KNT is INTEGER
+*>          Total number of examples tested.
+*> \endverbatim
+
+*
+*  -- LAPACK test routine --
+      SUBROUTINE CSYL01( THRESH, NFAIL, RMAX, NINFO, KNT )
+      IMPLICIT NONE
+*
+*  -- LAPACK test routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            KNT
+      REAL               THRESH
+*     ..
+*     .. Array Arguments ..
+      INTEGER            NFAIL( 3 ), NINFO( 2 )
+      REAL               RMAX( 2 )
+*     ..
+*
+*  =====================================================================
+*     ..
+*     .. Parameters ..
+      COMPLEX            CONE
+      PARAMETER          ( CONE = ( 1.0E+0, 0.0E+0 ) )
+      REAL               ONE, ZERO
+      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0 )
+      INTEGER            MAXM, MAXN, LDSWORK
+      PARAMETER          ( MAXM = 101, MAXN = 138, LDSWORK = 18 )
+*     ..
+*     .. Local Scalars ..
+      CHARACTER          TRANA, TRANB
+      INTEGER            I, INFO, IINFO, ISGN, ITRANA, ITRANB, J, KLA,
+     $                   KUA, KLB, KUB, M, N
+      REAL               ANRM, BNRM, BIGNUM, EPS, RES, RES1,
+     $                   SCALE, SCALE3, SMLNUM, TNRM, XNRM
+      COMPLEX            RMUL
+*     ..
+*     .. Local Arrays ..
+      COMPLEX            DUML( MAXM ), DUMR( MAXN ),
+     $                   D( MAX( MAXM, MAXN ) )
+      REAL               DUM( MAXN ), VM( 2 )
+      INTEGER            ISEED( 4 ), IWORK( MAXM + MAXN + 2 )
+*     ..
+*     .. Allocatable Arrays ..
+      INTEGER            AllocateStatus
+      COMPLEX, DIMENSION(:,:), ALLOCATABLE :: A, B, C, CC, X
+      REAL,    DIMENSION(:,:), ALLOCATABLE :: SWORK
+*     ..
+*     .. External Functions ..
+      LOGICAL            SISNAN
+      REAL               SLAMCH, CLANGE
+      EXTERNAL           SISNAN, SLAMCH, CLANGE
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           CLATMR, CLACPY, CGEMM, CTRSYL, CTRSYL3
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, REAL, MAX
+*     ..
+*     .. Allocate memory dynamically ..
+      ALLOCATE ( A( MAXM, MAXM ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( B( MAXN, MAXN ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( C( MAXM, MAXN ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( CC( MAXM, MAXN ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( X( MAXM, MAXN ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( SWORK( LDSWORK, 54 ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+*     ..
+*     .. Executable Statements ..
+*
+*     Get machine parameters
+*
+      EPS = SLAMCH( 'P' )
+      SMLNUM = SLAMCH( 'S' ) / EPS
+      BIGNUM = ONE / SMLNUM
+*
+*     Expect INFO = 0
+      VM( 1 ) = ONE
+*     Expect INFO = 1
+      VM( 2 ) = 0.5E+0
+*
+*     Begin test loop
+*
+      NINFO( 1 ) = 0
+      NINFO( 2 ) = 0
+      NFAIL( 1 ) = 0
+      NFAIL( 2 ) = 0
+      NFAIL( 3 ) = 0
+      RMAX( 1 ) = ZERO
+      RMAX( 2 ) = ZERO
+      KNT = 0
+      ISEED( 1 ) = 1
+      ISEED( 2 ) = 1
+      ISEED( 3 ) = 1
+      ISEED( 4 ) = 1
+      SCALE = ONE
+      SCALE3 = ONE
+      DO J = 1, 2
+         DO ISGN = -1, 1, 2
+*           Reset seed (overwritten by LATMR)
+            ISEED( 1 ) = 1
+            ISEED( 2 ) = 1
+            ISEED( 3 ) = 1
+            ISEED( 4 ) = 1
+            DO M = 32, MAXM, 23
+               KLA = 0
+               KUA = M - 1
+               CALL CLATMR( M, M, 'S', ISEED, 'N', D,
+     $                      6, ONE, CONE, 'T', 'N',
+     $                      DUML, 1, ONE, DUMR, 1, ONE,
+     $                      'N', IWORK, KLA, KUA, ZERO,
+     $                      ONE, 'NO', A, MAXM, IWORK,
+     $                      IINFO )
+               DO I = 1, M
+                  A( I, I ) = A( I, I ) * VM( J )
+               END DO
+               ANRM = CLANGE( 'M', M, M, A, MAXM, DUM )
+               DO N = 51, MAXN, 29
+                  KLB = 0
+                  KUB = N - 1
+                  CALL CLATMR( N, N, 'S', ISEED, 'N', D,
+     $                         6, ONE, CONE, 'T', 'N',
+     $                         DUML, 1, ONE, DUMR, 1, ONE,
+     $                         'N', IWORK, KLB, KUB, ZERO,
+     $                         ONE, 'NO', B, MAXN, IWORK,
+     $                         IINFO )
+                  DO I = 1, N
+                     B( I, I ) = B( I, I ) * VM ( J )
+                  END DO
+                  BNRM = CLANGE( 'M', N, N, B, MAXN, DUM )
+                  TNRM = MAX( ANRM, BNRM )
+                  CALL CLATMR( M, N, 'S', ISEED, 'N', D,
+     $                         6, ONE, CONE, 'T', 'N',
+     $                         DUML, 1, ONE, DUMR, 1, ONE,
+     $                         'N', IWORK, M, N, ZERO, ONE,
+     $                         'NO', C, MAXM, IWORK, IINFO )
+                  DO ITRANA = 1, 2
+                     IF( ITRANA.EQ.1 )
+     $                   TRANA = 'N'
+                     IF( ITRANA.EQ.2 )
+     $                   TRANA = 'C'
+                     DO ITRANB = 1, 2
+                        IF( ITRANB.EQ.1 )
+     $                     TRANB = 'N'
+                        IF( ITRANB.EQ.2 )
+     $                     TRANB = 'C'
+                        KNT = KNT + 1
+*
+                        CALL CLACPY( 'All', M, N, C, MAXM, X, MAXM)
+                        CALL CLACPY( 'All', M, N, C, MAXM, CC, MAXM)
+                        CALL CTRSYL( TRANA, TRANB, ISGN, M, N, 
+     $                               A, MAXM, B, MAXN, X, MAXM,
+     $                               SCALE, IINFO )
+                        IF( IINFO.NE.0 )
+     $                     NINFO( 1 ) = NINFO( 1 ) + 1
+                        XNRM = CLANGE( 'M', M, N, X, MAXM, DUM )
+                        RMUL = CONE
+                        IF( XNRM.GT.ONE .AND. TNRM.GT.ONE ) THEN
+                           IF( XNRM.GT.BIGNUM / TNRM ) THEN
+                              RMUL = CONE / MAX( XNRM, TNRM )
+                           END IF
+                        END IF
+                        CALL CGEMM( TRANA, 'N', M, N, M, RMUL,
+     $                              A, MAXM, X, MAXM, -SCALE*RMUL,
+     $                              CC, MAXM )
+                        CALL CGEMM( 'N', TRANB, M, N, N,
+     $                              REAL( ISGN )*RMUL, X, MAXM, B,
+     $                              MAXN, CONE, CC, MAXM )
+                        RES1 = CLANGE( 'M', M, N, CC, MAXM, DUM )
+                        RES = RES1 / MAX( SMLNUM, SMLNUM*XNRM,
+     $                        ( ( ABS( RMUL )*TNRM )*EPS )*XNRM )
+                        IF( RES.GT.THRESH )
+     $                     NFAIL( 1 ) = NFAIL( 1 ) + 1
+                        IF( RES.GT.RMAX( 1 ) )
+     $                     RMAX( 1 ) = RES
+*
+                        CALL CLACPY( 'All', M, N, C, MAXM, X, MAXM )
+                        CALL CLACPY( 'All', M, N, C, MAXM, CC, MAXM )
+                        CALL CTRSYL3( TRANA, TRANB, ISGN, M, N,
+     $                                A, MAXM, B, MAXN, X, MAXM,
+     $                                SCALE3, SWORK, LDSWORK, INFO)
+                        IF( INFO.NE.0 )
+     $                     NINFO( 2 ) = NINFO( 2 ) + 1
+                        XNRM = CLANGE( 'M', M, N, X, MAXM, DUM )
+                        RMUL = CONE
+                        IF( XNRM.GT.ONE .AND. TNRM.GT.ONE ) THEN
+                           IF( XNRM.GT.BIGNUM / TNRM ) THEN
+                              RMUL = CONE / MAX( XNRM, TNRM )
+                           END IF
+                        END IF
+                        CALL CGEMM( TRANA, 'N', M, N, M, RMUL,
+     $                              A, MAXM, X, MAXM, -SCALE3*RMUL,
+     $                              CC, MAXM )
+                        CALL CGEMM( 'N', TRANB, M, N, N,
+     $                              REAL( ISGN )*RMUL, X, MAXM, B,
+     $                              MAXN, CONE, CC, MAXM )
+                        RES1 = CLANGE( 'M', M, N, CC, MAXM, DUM )
+                        RES = RES1 / MAX( SMLNUM, SMLNUM*XNRM,
+     $                             ( ( ABS( RMUL )*TNRM )*EPS )*XNRM )
+*                       Verify that TRSYL3 only flushes if TRSYL flushes (but
+*                       there may be cases where TRSYL3 avoid flushing).
+                        IF( SCALE3.EQ.ZERO .AND. SCALE.GT.ZERO .OR. 
+     $                      IINFO.NE.INFO ) THEN
+                           NFAIL( 3 ) = NFAIL( 3 ) + 1
+                        END IF
+                        IF( RES.GT.THRESH .OR. SISNAN( RES ) )
+     $                     NFAIL( 2 ) = NFAIL( 2 ) + 1
+                        IF( RES.GT.RMAX( 2 ) )
+     $                     RMAX( 2 ) = RES
+                     END DO
+                  END DO
+               END DO
+            END DO
+         END DO
+      END DO
+*
+      DEALLOCATE (A, STAT = AllocateStatus)
+      DEALLOCATE (B, STAT = AllocateStatus)
+      DEALLOCATE (C, STAT = AllocateStatus)
+      DEALLOCATE (CC, STAT = AllocateStatus)
+      DEALLOCATE (X, STAT = AllocateStatus)
+      DEALLOCATE (SWORK, STAT = AllocateStatus)
+*
+      RETURN
+*
+*     End of CSYL01
+*
+      END
diff --git a/TESTING/EIG/cunt01.f b/TESTING/EIG/cunt01.f
index d8928954f7..1e5178e89e 100644
--- a/TESTING/EIG/cunt01.f
+++ b/TESTING/EIG/cunt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE CUNT01( ROWCOL, M, N, U, LDU, WORK, LWORK, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/cunt03.f b/TESTING/EIG/cunt03.f
index 56165f9543..81cbfe079d 100644
--- a/TESTING/EIG/cunt03.f
+++ b/TESTING/EIG/cunt03.f
@@ -159,6 +159,7 @@
 *  =====================================================================
       SUBROUTINE CUNT03( RC, MU, MV, N, K, U, LDU, V, LDV, WORK, LWORK,
      $                   RWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dbdt01.f b/TESTING/EIG/dbdt01.f
index 69e0b5ffc2..c265d0d6d4 100644
--- a/TESTING/EIG/dbdt01.f
+++ b/TESTING/EIG/dbdt01.f
@@ -138,6 +138,7 @@
 *  =====================================================================
       SUBROUTINE DBDT01( M, N, KD, A, LDA, Q, LDQ, D, E, PT, LDPT, WORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dbdt02.f b/TESTING/EIG/dbdt02.f
index ac0291219b..0e9e37d38e 100644
--- a/TESTING/EIG/dbdt02.f
+++ b/TESTING/EIG/dbdt02.f
@@ -109,6 +109,7 @@
 *
 *  =====================================================================
       SUBROUTINE DBDT02( M, N, B, LDB, C, LDC, U, LDU, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dbdt03.f b/TESTING/EIG/dbdt03.f
index 8af6162c96..44300f4380 100644
--- a/TESTING/EIG/dbdt03.f
+++ b/TESTING/EIG/dbdt03.f
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE DBDT03( UPLO, N, KD, D, E, U, LDU, S, VT, LDVT, WORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dbdt04.f b/TESTING/EIG/dbdt04.f
index 1c07135552..762b8373a2 100644
--- a/TESTING/EIG/dbdt04.f
+++ b/TESTING/EIG/dbdt04.f
@@ -128,6 +128,7 @@
 *  =====================================================================
       SUBROUTINE DBDT04( UPLO, N, D, E, S, NS, U, LDU, VT, LDVT, WORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dbdt05.f b/TESTING/EIG/dbdt05.f
index e4e6fcac68..ca12e830b8 100644
--- a/TESTING/EIG/dbdt05.f
+++ b/TESTING/EIG/dbdt05.f
@@ -124,6 +124,7 @@
 *  =====================================================================
       SUBROUTINE DBDT05( M, N, A, LDA, S, NS, U, LDU,
      $                    VT, LDVT, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dchkbb.f b/TESTING/EIG/dchkbb.f
index 9fec997288..9c24697509 100644
--- a/TESTING/EIG/dchkbb.f
+++ b/TESTING/EIG/dchkbb.f
@@ -352,6 +352,7 @@ SUBROUTINE DCHKBB( NSIZES, MVAL, NVAL, NWDTHS, KK, NTYPES, DOTYPE,
      $                   NRHS, ISEED, THRESH, NOUNIT, A, LDA, AB, LDAB,
      $                   BD, BE, Q, LDQ, P, LDP, C, LDC, CC, WORK,
      $                   LWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine (input) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dchkbd.f b/TESTING/EIG/dchkbd.f
index a24acfab2b..92d4fff006 100644
--- a/TESTING/EIG/dchkbd.f
+++ b/TESTING/EIG/dchkbd.f
@@ -490,6 +490,7 @@ SUBROUTINE DCHKBD( NSIZES, MVAL, NVAL, NTYPES, DOTYPE, NRHS,
      $                   ISEED, THRESH, A, LDA, BD, BE, S1, S2, X, LDX,
      $                   Y, Z, Q, LDQ, PT, LDPT, U, VT, WORK, LWORK,
      $                   IWORK, NOUT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -544,8 +545,8 @@ SUBROUTINE DCHKBD( NSIZES, MVAL, NVAL, NTYPES, DOTYPE, NRHS,
 *     .. External Subroutines ..
       EXTERNAL           ALASUM, DBDSDC, DBDSQR, DBDSVDX, DBDT01,
      $                   DBDT02, DBDT03, DBDT04, DCOPY, DGEBRD,
-     $                   DGEMM, DLABAD, DLACPY, DLAHD2, DLASET,
-     $                   DLATMR, DLATMS, DORGBR, DORT01, XERBLA
+     $                   DGEMM, DLACPY, DLAHD2, DLASET, DLATMR,
+     $                   DLATMS, DORGBR, DORT01, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, EXP, INT, LOG, MAX, MIN, SQRT
@@ -627,7 +628,6 @@ SUBROUTINE DCHKBD( NSIZES, MVAL, NVAL, NTYPES, DOTYPE, NRHS,
       NTEST = 0
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = DLAMCH( 'Overflow' )
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       LOG2UI = INT( LOG( ULPINV ) / LOG( TWO ) )
diff --git a/TESTING/EIG/dchkbk.f b/TESTING/EIG/dchkbk.f
index 364b8f6b1f..d5ef617575 100644
--- a/TESTING/EIG/dchkbk.f
+++ b/TESTING/EIG/dchkbk.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE DCHKBK( NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dchkbl.f b/TESTING/EIG/dchkbl.f
index 7237dacf29..bfa4d0f62f 100644
--- a/TESTING/EIG/dchkbl.f
+++ b/TESTING/EIG/dchkbl.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE DCHKBL( NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dchkdmd.f90 b/TESTING/EIG/dchkdmd.f90
new file mode 100644
index 0000000000..c64d01a412
--- /dev/null
+++ b/TESTING/EIG/dchkdmd.f90
@@ -0,0 +1,813 @@
+!     This is a test program for checking the implementations of
+!     the implementations of the following subroutines
+!
+!     DGEDMD  for computation of the
+!             Dynamic Mode Decomposition (DMD)
+!     DGEDMDQ for computation of a
+!             QR factorization based compressed DMD
+!
+!     Developed and supported by:
+!     ===========================
+!     Developed and coded by Zlatko Drmac, Faculty of Science,
+!     University of Zagreb;  drmac@math.hr
+!     In cooperation with
+!     AIMdyn Inc., Santa Barbara, CA.
+!     ========================================================
+!     How to run the code (compiler, link info)
+!     ========================================================
+!     Compile as FORTRAN 90 (or later) and link with BLAS and
+!     LAPACK libraries.
+!     NOTE: The code is developed and tested on top of the
+!     Intel MKL library (versions 2022.0.3 and 2022.2.0),
+!     using the Intel Fortran compiler.
+!
+!     For developers of the C++ implementation
+!     ========================================================
+!     See the LAPACK++ and Template Numerical Toolkit (TNT)
+!
+!     Note on a development of the GPU HP implementation
+!     ========================================================
+!     Work in progress. See CUDA, MAGMA, SLATE.
+!     NOTE: The four SVD subroutines used in this code are
+!     included as a part of R&D and for the completeness.
+!     This was also an opportunity to test those SVD codes.
+!     If the scaling option is used all four are essentially
+!     equally good. For implementations on HP platforms,
+!     one can use whichever SVD is available.
+!...  .........................................................
+!     NOTE:
+!     When using the Intel MKL 2022.0.3 the subroutine xGESVDQ
+!     (optionally used in xGEDMD) may cause access violation
+!     error for x = S, D, C, Z, but only if called with the
+!     work space query. (At least in our Windows 10 MSVS 2019.)
+!     The problem can be mitigated by downloading the source
+!     code of xGESVDQ from the LAPACK repository and use it
+!     localy instead of the one in the MKL. This seems to
+!     indicate that the problem is indeed in the MKL.
+!     This problem did not appear whith Intel MKL 2022.2.0.
+!
+!     NOTE:
+!     xGESDD seems to have a problem with workspace. In some
+!     cases the length of the optimal workspace is returned
+!     smaller than the minimal workspace, as specified in the
+!     code. As a precaution, all optimal workspaces are
+!     set as MAX(minimal, optimal).
+!     Latest implementations of complex xGESDD have different
+!     length of the real worksapce. We use max value over
+!     two versions.
+!............................................................
+!............................................................
+!
+      PROGRAM DMD_TEST
+      use iso_fortran_env, only: real64
+      IMPLICIT NONE
+      integer, parameter :: WP = real64
+
+!............................................................
+      REAL(KIND=WP), PARAMETER ::  ONE = 1.0_WP
+      REAL(KIND=WP), PARAMETER :: ZERO = 0.0_WP
+!............................................................
+      REAL(KIND=WP), ALLOCATABLE, DIMENSION(:,:) ::          &
+                     A, AC, EIGA, LAMBDA, LAMBDAQ, F, F1, F2,&
+                     Z, Z1, S, AU, W, VA, X, X0, Y, Y0, Y1
+      REAL(KIND=WP), ALLOCATABLE, DIMENSION(:)   ::          &
+                     DA, DL, DR, REIG, REIGA, REIGQ, IEIG,   &
+                     IEIGA, IEIGQ,  RES, RES1, RESEX, SINGVX,&
+                     SINGVQX, WORK
+      INTEGER      , ALLOCATABLE, DIMENSION(:)   ::   IWORK
+      REAL(KIND=WP) :: AB(2,2),   WDUMMY(2)
+      INTEGER       :: IDUMMY(2), ISEED(4), RJOBDATA(8)
+      REAL(KIND=WP) :: ANORM, COND, CONDL, CONDR, DMAX, EPS, &
+                       TOL, TOL2, SVDIFF, TMP, TMP_AU,       &
+                       TMP_FQR, TMP_REZ, TMP_REZQ,  TMP_ZXW, &
+                       TMP_EX, XNORM, YNORM
+!............................................................
+      INTEGER :: K, KQ, LDF, LDS, LDA, LDAU, LDW, LDX, LDY,  &
+                 LDZ, LIWORK, LWORK, M, N, L, LLOOP, NRNK
+      INTEGER :: i, iJOBREF, iJOBZ, iSCALE, INFO, j, KDIFF,  &
+                 NFAIL, NFAIL_AU, NFAIL_F_QR, NFAIL_REZ,     &
+                 NFAIL_REZQ, NFAIL_SVDIFF, NFAIL_TOTAL, NFAILQ_TOTAL, &
+                 NFAIL_Z_XV, MODE, MODEL, MODER, WHTSVD
+      INTEGER    iNRNK, iWHTSVD, K_TRAJ, LWMINOPT
+      CHARACTER(LEN=1) GRADE, JOBREF, JOBZ, PIVTNG, RSIGN,   &
+                       SCALE, RESIDS, WANTQ, WANTR
+
+      LOGICAL  TEST_QRDMD
+!..... external subroutines (BLAS and LAPACK)
+      EXTERNAL DAXPY,  DGEEV, DGEMM, DGEMV, DLACPY, DLASCL
+      EXTERNAL DLARNV, DLATMR
+!.....external subroutines DMD package, part 1
+!     subroutines under test
+      EXTERNAL DGEDMD, DGEDMDQ
+
+!..... external functions (BLAS and LAPACK)
+      EXTERNAL         DLAMCH, DLANGE, DNRM2
+      REAL(KIND=WP) :: DLAMCH, DLANGE, DNRM2
+      EXTERNAL         LSAME
+      LOGICAL          LSAME
+
+      INTRINSIC ABS, INT, MIN, MAX
+!............................................................
+
+      ! The test is always in pairs : ( DGEDMD and DGEDMDQ )
+      ! because the test includes comparing the results (in pairs).
+!.....................................................................................
+      TEST_QRDMD = .TRUE. ! This code by default performs tests on DGEDMDQ
+                          ! Since the QR factorizations based algorithm is designed for
+                          ! single trajectory data, only single trajectory tests will
+                          ! be performed with xGEDMDQ.
+      WANTQ = 'Q'
+      WANTR = 'R'
+!.................................................................................
+
+      EPS = DLAMCH( 'P' )  ! machine precision DP
+
+      ! Global counters of failures of some particular tests
+      NFAIL      = 0
+      NFAIL_REZ  = 0
+      NFAIL_REZQ = 0
+      NFAIL_Z_XV = 0
+      NFAIL_F_QR = 0
+      NFAIL_AU   = 0
+      KDIFF      = 0
+      NFAIL_SVDIFF = 0
+      NFAIL_TOTAL  = 0
+      NFAILQ_TOTAL = 0
+
+
+      DO LLOOP = 1, 4
+
+      WRITE(*,*) 'L Loop Index = ', LLOOP
+
+      ! Set the dimensions of the problem ...
+      WRITE(*,*) 'M = '
+      READ(*,*) M
+      WRITE(*,*) M
+      ! ... and the number of snapshots.
+      WRITE(*,*) 'N = '
+      READ(*,*) N
+      WRITE(*,*) N
+
+      ! ... Test the dimensions
+      IF ( ( MIN(M,N) == 0 ) .OR. ( M < N )  ) THEN
+          WRITE(*,*) 'Bad dimensions. Required: M >= N > 0.'
+          STOP
+      END IF
+!.............
+      ! The seed inside the LLOOP so that each pass can be reproduced easily.
+
+      ISEED(1) = 4
+      ISEED(2) = 3
+      ISEED(3) = 2
+      ISEED(4) = 1
+
+      LDA  = M
+      LDF  = M
+      LDX  = MAX(M,N+1)
+      LDY  = MAX(M,N+1)
+      LDW  = N
+      LDZ  = M
+      LDAU = MAX(M,N+1)
+      LDS  = N
+
+      TMP_ZXW  = ZERO
+      TMP_AU   = ZERO
+      TMP_REZ  = ZERO
+      TMP_REZQ = ZERO
+      SVDIFF   = ZERO
+      TMP_EX   = ZERO
+
+      !
+      ! Test the subroutines on real data snapshots. All
+      ! computation is done in real arithmetic, even when
+      ! Koopman eigenvalues and modes are real.
+      !
+      ! Allocate memory space
+      ALLOCATE( A(LDA,M) )
+      ALLOCATE( AC(LDA,M) )
+      ALLOCATE( DA(M) )
+      ALLOCATE( DL(M) )
+      ALLOCATE( F(LDF,N+1) )
+      ALLOCATE( F1(LDF,N+1) )
+      ALLOCATE( F2(LDF,N+1) )
+      ALLOCATE( X(LDX,N) )
+      ALLOCATE( X0(LDX,N) )
+      ALLOCATE( SINGVX(N) )
+      ALLOCATE( SINGVQX(N) )
+      ALLOCATE( Y(LDY,N+1) )
+      ALLOCATE( Y0(LDY,N+1) )
+      ALLOCATE( Y1(M,N+1) )
+      ALLOCATE( Z(LDZ,N) )
+      ALLOCATE( Z1(LDZ,N) )
+      ALLOCATE( RES(N)  )
+      ALLOCATE( RES1(N) )
+      ALLOCATE( RESEX(N) )
+      ALLOCATE( REIG(N) )
+      ALLOCATE( IEIG(N) )
+      ALLOCATE( REIGQ(N) )
+      ALLOCATE( IEIGQ(N) )
+      ALLOCATE( REIGA(M) )
+      ALLOCATE( IEIGA(M) )
+      ALLOCATE( VA(LDA,M) )
+      ALLOCATE( LAMBDA(N,2) )
+      ALLOCATE( LAMBDAQ(N,2) )
+      ALLOCATE( EIGA(M,2) )
+      ALLOCATE( W(LDW,N) )
+      ALLOCATE( AU(LDAU,N) )
+      ALLOCATE( S(N,N) )
+
+      TOL  = M*EPS
+      ! This mimics O(M*N)*EPS bound for accumulated roundoff error.
+      ! The factor 10 is somewhat arbitrary.
+      TOL2 = 10*M*N*EPS
+
+!.............
+
+      DO K_TRAJ = 1, 2
+      !  Number of intial conditions in the simulation/trajectories (1 or 2)
+
+      COND = 1.0D8
+      DMAX = 1.0D2
+      RSIGN = 'F'
+      GRADE = 'N'
+      MODEL = 6
+      CONDL = 1.0D2
+      MODER = 6
+      CONDR = 1.0D2
+      PIVTNG = 'N'
+
+      ! Loop over all parameter MODE values for ZLATMR (+1,..,+6)
+      DO MODE = 1, 6
+
+      ALLOCATE( IWORK(2*M) )
+      ALLOCATE(DR(N))
+      CALL DLATMR( M, M, 'S', ISEED, 'N', DA, MODE, COND, &
+                   DMAX, RSIGN, GRADE, DL, MODEL,  CONDL, &
+                   DR, MODER, CONDR, PIVTNG, IWORK, M, M, &
+                   ZERO, -ONE, 'N', A, LDA, IWORK(M+1), INFO )
+      DEALLOCATE(IWORK)
+      DEALLOCATE(DR)
+
+      LWORK = 4*M+1
+      ALLOCATE(WORK(LWORK))
+      AC  = A
+      CALL DGEEV( 'N','V', M, AC, M, REIGA, IEIGA, VA, M, &
+                  VA, M, WORK, LWORK, INFO ) ! LAPACK CALL
+      DEALLOCATE(WORK)
+      TMP = ZERO
+      DO i = 1, M
+         EIGA(i,1) = REIGA(i)
+         EIGA(i,2) = IEIGA(i)
+         TMP = MAX( TMP, SQRT(REIGA(i)**2+IEIGA(i)**2))
+      END DO
+
+      ! Scale A to have the desirable spectral radius.
+      CALL DLASCL( 'G', 0, 0, TMP, ONE, M, M, A, M, INFO )
+      CALL DLASCL( 'G', 0, 0, TMP, ONE, M, 2, EIGA, M, INFO )
+
+      ! Compute the norm of A
+      ANORM = DLANGE( 'F', N, N, A, M, WDUMMY )
+
+      IF ( K_TRAJ == 2 ) THEN
+          ! generate data with two inital conditions
+      CALL DLARNV(2, ISEED, M, F1(1,1) )
+      F1(1:M,1) = 1.0E-10*F1(1:M,1)
+      DO i = 1, N/2
+         CALL DGEMV( 'N', M, M, ONE, A, M, F1(1,i), 1, ZERO, &
+              F1(1,i+1), 1 )
+      END DO
+      X0(1:M,1:N/2) = F1(1:M,1:N/2)
+      Y0(1:M,1:N/2) = F1(1:M,2:N/2+1)
+
+      CALL DLARNV(2, ISEED, M, F1(1,1) )
+      DO i = 1, N-N/2
+         CALL DGEMV( 'N', M, M, ONE, A, M, F1(1,i), 1, ZERO, &
+              F1(1,i+1), 1 )
+      END DO
+      X0(1:M,N/2+1:N) = F1(1:M,1:N-N/2)
+      Y0(1:M,N/2+1:N) = F1(1:M,2:N-N/2+1)
+      ELSE
+      CALL DLARNV(2, ISEED, M, F(1,1) )
+      DO i = 1, N
+         CALL DGEMV( 'N', M, M, ONE, A, M, F(1,i), 1, ZERO, &
+              F(1,i+1), 1 )
+      END DO
+      X0(1:M,1:N) = F(1:M,1:N)
+      Y0(1:M,1:N) = F(1:M,2:N+1)
+      END IF
+
+      XNORM = DLANGE( 'F', M, N, X0, LDX, WDUMMY )
+      YNORM = DLANGE( 'F', M, N, Y0, LDX, WDUMMY )
+!............................................................
+
+      DO iJOBZ = 1, 4
+
+          SELECT CASE ( iJOBZ )
+          CASE(1)
+              JOBZ   = 'V' ! Ritz vectors will be computed
+              RESIDS = 'R' ! Residuals will be computed
+          CASE(2)
+              JOBZ   = 'V'
+              RESIDS = 'N'
+          CASE(3)
+              JOBZ   = 'F' ! Ritz vectors in factored form
+              RESIDS = 'N'
+          CASE(4)
+              JOBZ   = 'N'
+              RESIDS = 'N'
+          END SELECT
+
+      DO iJOBREF = 1, 3
+
+          SELECT CASE ( iJOBREF )
+          CASE(1)
+              JOBREF = 'R' ! Data for refined Ritz vectors
+          CASE(2)
+              JOBREF = 'E' ! Exact DMD vectors
+          CASE(3)
+              JOBREF = 'N'
+          END SELECT
+
+      DO iSCALE = 1, 4
+
+          SELECT CASE ( iSCALE )
+          CASE(1)
+              SCALE = 'S' ! X data normalized
+          CASE(2)
+              SCALE = 'C' ! X normalized, consist. check
+          CASE(3)
+              SCALE = 'Y' ! Y data normalized
+          CASE(4)
+              SCALE = 'N'
+          END SELECT
+
+      DO iNRNK = -1, -2, -1
+          ! Two truncation strategies. The "-2" case for R&D
+          ! purposes only - it uses possibly low accuracy small
+          ! singular values, in which case the formulas used in
+          ! the DMD are highly sensitive.
+          NRNK   = iNRNK
+
+      DO iWHTSVD = 1, 4
+          ! Check all four options to compute the POD basis
+          ! via the SVD.
+          WHTSVD   = iWHTSVD
+
+      DO LWMINOPT = 1, 2
+          ! Workspace query for the minimal (1) and for the optimal
+          ! (2) workspace lengths determined by workspace query.
+
+      X(1:M,1:N) = X0(1:M,1:N)
+      Y(1:M,1:N) = Y0(1:M,1:N)
+
+      ! DGEDMD: Workspace query and workspace allocation
+      CALL DGEDMD( SCALE, JOBZ, RESIDS, JOBREF, WHTSVD, M, &
+           N, X, LDX, Y, LDY, NRNK, TOL, K, REIG, IEIG, Z, &
+           LDZ, RES, AU, LDAU, W, LDW, S, LDS, WDUMMY, -1, &
+           IDUMMY, -1, INFO )
+
+      LIWORK = IDUMMY(1)
+      ALLOCATE( IWORK(LIWORK) )
+      LWORK = INT(WDUMMY(LWMINOPT))
+      ALLOCATE( WORK(LWORK) )
+
+      ! DGEDMD test: CALL DGEDMD
+      CALL DGEDMD( SCALE, JOBZ, RESIDS, JOBREF, WHTSVD, M, &
+           N, X, LDX, Y, LDY, NRNK, TOL, K, REIG, IEIG, Z, &
+           LDZ, RES, AU, LDAU, W, LDW, S, LDS, WORK, LWORK,&
+           IWORK, LIWORK, INFO )
+
+      SINGVX(1:N) = WORK(1:N)
+
+      !...... DGEDMD check point
+      IF ( LSAME(JOBZ,'V')  ) THEN
+          ! Check that Z = X*W, on return from DGEDMD
+          ! This checks that the returned aigenvectors in Z are
+          ! the product of the SVD'POD basis returned in X
+          ! and the eigenvectors of the rayleigh quotient
+          ! returned in W
+          CALL DGEMM( 'N', 'N', M, K, K, ONE, X, LDX, W, LDW, &
+                      ZERO, Z1, LDZ )
+          TMP = ZERO
+          DO i = 1, K
+             CALL DAXPY( M, -ONE, Z(1,i), 1, Z1(1,i), 1)
+             TMP = MAX(TMP, DNRM2( M, Z1(1,i), 1 ) )
+          END DO
+          TMP_ZXW = MAX(TMP_ZXW, TMP )
+
+          IF ( TMP_ZXW > 10*M*EPS ) THEN
+              NFAIL_Z_XV = NFAIL_Z_XV + 1
+              WRITE(*,*) ':( .................DGEDMD FAILED!', &
+                  'Check the code for implementation errors.'
+              WRITE(*,*) 'The input parameters were ',&
+                 SCALE, JOBZ, RESIDS, JOBREF, WHTSVD, &
+                 M, N, LDX, LDY, NRNK, TOL
+          END IF
+
+      END IF
+
+      !...... DGEDMD check point
+      IF ( LSAME(JOBREF,'R') ) THEN
+          ! The matrix A*U is returned for computing refined Ritz vectors.
+          ! Check that A*U is computed correctly using the formula
+          ! A*U = Y * V * inv(SIGMA). This depends on the
+          ! accuracy in the computed singular values and vectors of X.
+          ! See the paper for an error analysis.
+          ! Note that the left singular vectors of the input matrix X
+          ! are returned in the array X.
+          CALL DGEMM( 'N', 'N', M, K, M, ONE, A, LDA, X, LDX, &
+                     ZERO, Z1, LDZ )
+          TMP = ZERO
+          DO i = 1, K
+              CALL DAXPY( M, -ONE, AU(1,i), 1, Z1(1,i), 1)
+              TMP = MAX( TMP, DNRM2( M, Z1(1,i),1 ) * &
+                       SINGVX(K)/(ANORM*SINGVX(1)) )
+          END DO
+          TMP_AU = MAX( TMP_AU, TMP )
+
+          IF ( TMP > TOL2 ) THEN
+              NFAIL_AU = NFAIL_AU + 1
+              WRITE(*,*) ':( .................DGEDMD FAILED!', &
+                  'Check the code for implementation errors.'
+              WRITE(*,*) 'The input parameters were ',&
+                 SCALE, JOBZ, RESIDS, JOBREF, WHTSVD, &
+                 M, N, LDX, LDY, NRNK, TOL
+          END IF
+
+      ELSEIF ( LSAME(JOBREF,'E') ) THEN
+      ! The unscaled vectors of the Exact DMD are computed.
+      ! This option is included for the sake of completeness,
+      ! for users who prefer the Exact DMD vectors. The
+      ! returned vectors are in the real form, in the same way
+      ! as the Ritz vectors. Here we just save the vectors
+      ! and test them separately using a Matlab script.
+
+       CALL DGEMM( 'N', 'N', M, K, M, ONE, A, LDA, AU, LDAU, ZERO, Y1, M )
+       i=1
+       DO WHILE ( i <= K )
+           IF ( IEIG(i) == ZERO ) THEN
+           ! have a real eigenvalue with real eigenvector
+           CALL DAXPY( M, -REIG(i), AU(1,i), 1, Y1(1,i), 1 )
+           RESEX(i) = DNRM2( M, Y1(1,i), 1) / DNRM2(M,AU(1,i),1)
+           i = i + 1
+           ELSE
+           ! Have a complex conjugate pair
+           ! REIG(i) +- sqrt(-1)*IMEIG(i).
+           ! Since all computation is done in real
+           ! arithmetic, the formula for the residual
+           ! is recast for real representation of the
+           ! complex conjugate eigenpair. See the
+           ! description of RES.
+           AB(1,1) =  REIG(i)
+           AB(2,1) = -IEIG(i)
+           AB(1,2) =  IEIG(i)
+           AB(2,2) =  REIG(i)
+           CALL DGEMM( 'N', 'N', M, 2, 2, -ONE, AU(1,i), &
+                       M, AB, 2, ONE, Y1(1,i), M )
+           RESEX(i)   = DLANGE( 'F', M, 2, Y1(1,i), M, &
+                        WORK )/ DLANGE( 'F', M, 2, AU(1,i), M, &
+                        WORK )
+           RESEX(i+1) = RESEX(i)
+           i = i + 2
+           END IF
+       END DO
+
+      END IF
+
+      !...... DGEDMD check point
+      IF ( LSAME(RESIDS, 'R') ) THEN
+          ! Compare the residuals returned by DGEDMD with the
+          ! explicitly computed residuals using the matrix A.
+          ! Compute explicitly Y1 = A*Z
+          CALL DGEMM( 'N', 'N', M, K, M, ONE, A, LDA, Z, LDZ, ZERO, Y1, M )
+          ! ... and then A*Z(:,i) - LAMBDA(i)*Z(:,i), using the real forms
+          ! of the invariant subspaces that correspond to complex conjugate
+          ! pairs of eigencalues. (See the description of Z in DGEDMD,)
+          i = 1
+          DO WHILE ( i <= K )
+              IF ( IEIG(i) == ZERO ) THEN
+                  ! have a real eigenvalue with real eigenvector
+                  CALL DAXPY( M, -REIG(i), Z(1,i), 1, Y1(1,i), 1 )
+                  RES1(i) = DNRM2( M, Y1(1,i), 1)
+                  i = i + 1
+              ELSE
+                  ! Have a complex conjugate pair
+                  ! REIG(i) +- sqrt(-1)*IMEIG(i).
+                  ! Since all computation is done in real
+                  ! arithmetic, the formula for the residual
+                  ! is recast for real representation of the
+                  ! complex conjugate eigenpair. See the
+                  ! description of RES.
+                  AB(1,1) =  REIG(i)
+                  AB(2,1) = -IEIG(i)
+                  AB(1,2) =  IEIG(i)
+                  AB(2,2) =  REIG(i)
+                  CALL DGEMM( 'N', 'N', M, 2, 2, -ONE, Z(1,i), &
+                              M, AB, 2, ONE, Y1(1,i), M )
+                  RES1(i)   = DLANGE( 'F', M, 2, Y1(1,i), M, &
+                                     WORK )
+                  RES1(i+1) = RES1(i)
+                  i = i + 2
+              END IF
+          END DO
+          TMP = ZERO
+          DO i = 1, K
+              TMP = MAX( TMP, ABS(RES(i) - RES1(i)) * &
+                        SINGVX(K)/(ANORM*SINGVX(1)) )
+          END DO
+          TMP_REZ = MAX( TMP_REZ, TMP )
+
+          IF ( TMP > TOL2 ) THEN
+              NFAIL_REZ = NFAIL_REZ + 1
+              WRITE(*,*) ':( ..................DGEDMD FAILED!', &
+                  'Check the code for implementation errors.'
+              WRITE(*,*) 'The input parameters were ',&
+                 SCALE, JOBZ, RESIDS, JOBREF, WHTSVD, &
+                 M, N, LDX, LDY, NRNK, TOL
+          END IF
+
+          IF ( LSAME(JOBREF,'E') ) THEN
+              TMP = ZERO
+              DO i = 1, K
+                  TMP = MAX( TMP, ABS(RES1(i) - RESEX(i))/(RES1(i)+RESEX(i)) )
+              END DO
+              TMP_EX = MAX(TMP_EX,TMP)
+          END IF
+
+      END IF
+
+      !..... store the results for inspection
+      DO i = 1, K
+          LAMBDA(i,1) = REIG(i)
+          LAMBDA(i,2) = IEIG(i)
+      END DO
+
+      DEALLOCATE(IWORK)
+      DEALLOCATE(WORK)
+
+      !======================================================================
+      !     Now test the DGEDMDQ
+      !======================================================================
+      IF ( TEST_QRDMD .AND. (K_TRAJ == 1) ) THEN
+          RJOBDATA(2) = 1
+          F1 = F
+
+          ! DGEDMDQ test: Workspace query and workspace allocation
+          CALL DGEDMDQ( SCALE, JOBZ, RESIDS, WANTQ, WANTR, &
+               JOBREF, WHTSVD, M, N+1, F1, LDF, X, LDX, Y, &
+               LDY, NRNK, TOL, KQ, REIGQ, IEIGQ, Z, LDZ,   &
+               RES, AU, LDAU, W, LDW, S, LDS, WDUMMY,      &
+               -1, IDUMMY, -1, INFO )
+          LIWORK = IDUMMY(1)
+          ALLOCATE( IWORK(LIWORK) )
+          LWORK = INT(WDUMMY(LWMINOPT))
+          ALLOCATE(WORK(LWORK))
+          ! DGEDMDQ test: CALL DGEDMDQ
+          CALL DGEDMDQ( SCALE, JOBZ, RESIDS, WANTQ, WANTR, &
+               JOBREF, WHTSVD, M, N+1, F1, LDF, X, LDX, Y, &
+               LDY, NRNK, TOL, KQ, REIGQ, IEIGQ, Z, LDZ,   &
+               RES, AU, LDAU, W, LDW, S, LDS,              &
+               WORK, LWORK, IWORK, LIWORK, INFO )
+
+          SINGVQX(1:KQ) = WORK(MIN(M,N+1)+1: MIN(M,N+1)+KQ)
+
+          !..... DGEDMDQ check point
+          IF ( KQ /= K ) THEN
+              KDIFF = KDIFF+1
+          END IF
+
+          TMP = ZERO
+          DO i = 1, MIN(K, KQ)
+              TMP = MAX(TMP, ABS(SINGVX(i)-SINGVQX(i)) / &
+                                    SINGVX(1) )
+          END DO
+          SVDIFF = MAX( SVDIFF, TMP )
+          IF ( TMP > M*N*EPS ) THEN
+              WRITE(*,*) 'FAILED! Something was wrong with the run.'
+              NFAIL_SVDIFF = NFAIL_SVDIFF + 1
+              DO j =1, 3
+                  write(*,*) j, SINGVX(j), SINGVQX(j)
+                  read(*,*)
+              END DO
+          END IF
+
+          !..... DGEDMDQ check point
+          IF ( LSAME(WANTQ,'Q') .AND. LSAME(WANTR,'R') ) THEN
+              ! Check that the QR factors are computed and returned
+              ! as requested. The residual ||F-Q*R||_F / ||F||_F
+              ! is compared to M*N*EPS.
+              F2 = F
+              CALL DGEMM( 'N', 'N', M, N+1, MIN(M,N+1), -ONE, F1, &
+                          LDF, Y, LDY, ONE, F2, LDF )
+              TMP_FQR = DLANGE( 'F', M, N+1, F2, LDF, WORK ) / &
+                    DLANGE( 'F', M, N+1, F,  LDF, WORK )
+              IF ( TMP_FQR > TOL2 ) THEN
+                  WRITE(*,*) 'FAILED! Something was wrong with the run.'
+                  NFAIL_F_QR = NFAIL_F_QR + 1
+              END IF
+          END IF
+
+          !..... DGEDMDQ check point
+          IF ( LSAME(RESIDS, 'R') ) THEN
+              ! Compare the residuals returned by DGEDMDQ with the
+              ! explicitly computed residuals using the matrix A.
+              ! Compute explicitly Y1 = A*Z
+              CALL DGEMM( 'N', 'N', M, KQ, M, ONE, A, M, Z, M, ZERO, Y1, M )
+              ! ... and then A*Z(:,i) - LAMBDA(i)*Z(:,i), using the real forms
+              ! of the invariant subspaces that correspond to complex conjugate
+              ! pairs of eigencalues. (See the description of Z in DGEDMDQ)
+              i = 1
+              DO WHILE ( i <= KQ )
+                  IF ( IEIGQ(i) == ZERO ) THEN
+                      ! have a real eigenvalue with real eigenvector
+                      CALL DAXPY( M, -REIGQ(i), Z(1,i), 1, Y1(1,i), 1 )
+                      ! Y(1:M,i) = Y(1:M,i) - REIG(i)*Z(1:M,i)
+                      RES1(i) = DNRM2( M, Y1(1,i), 1)
+                      i = i + 1
+                  ELSE
+                     ! Have a complex conjugate pair
+                     ! REIG(i) +- sqrt(-1)*IMEIG(i).
+                     ! Since all computation is done in real
+                     ! arithmetic, the formula for the residual
+                     ! is recast for real representation of the
+                     ! complex conjugate eigenpair. See the
+                     ! description of RES.
+                     AB(1,1) =  REIGQ(i)
+                     AB(2,1) = -IEIGQ(i)
+                     AB(1,2) =  IEIGQ(i)
+                     AB(2,2) =  REIGQ(i)
+                     CALL DGEMM( 'N', 'N', M, 2, 2, -ONE, Z(1,i), &
+                                 M, AB, 2, ONE, Y1(1,i), M )             ! BLAS CALL
+                     ! Y(1:M,i:i+1) = Y(1:M,i:i+1) - Z(1:M,i:i+1) * AB   ! INTRINSIC
+                     RES1(i)   = DLANGE( 'F', M, 2, Y1(1,i), M, &
+                                        WORK )                           ! LAPACK CALL
+                     RES1(i+1) = RES1(i)
+                     i = i + 2
+                  END IF
+              END DO
+              TMP = ZERO
+              DO i = 1, KQ
+                  TMP = MAX( TMP, ABS(RES(i) - RES1(i)) * &
+                      SINGVQX(K)/(ANORM*SINGVQX(1)) )
+              END DO
+              TMP_REZQ = MAX( TMP_REZQ, TMP )
+              IF ( TMP > TOL2 ) THEN
+                  NFAIL_REZQ = NFAIL_REZQ + 1
+                  WRITE(*,*) '................ DGEDMDQ FAILED!', &
+                      'Check the code for implementation errors.'
+                  STOP
+              END IF
+
+          END IF
+
+          DO i = 1, KQ
+              LAMBDAQ(i,1) = REIGQ(i)
+              LAMBDAQ(i,2) = IEIGQ(i)
+          END DO
+
+          DEALLOCATE(WORK)
+          DEALLOCATE(IWORK)
+      END IF ! TEST_QRDMD
+!======================================================================
+
+      END DO ! LWMINOPT
+      !write(*,*) 'LWMINOPT loop completed'
+      END DO ! WHTSVD LOOP
+      !write(*,*) 'WHTSVD loop completed'
+      END DO ! NRNK LOOP
+      !write(*,*) 'NRNK loop completed'
+      END DO ! SCALE LOOP
+      !write(*,*) 'SCALE loop completed'
+      END DO ! JOBF LOOP
+      !write(*,*) 'JOBREF loop completed'
+      END DO ! JOBZ LOOP
+      !write(*,*) 'JOBZ loop completed'
+
+      END DO ! MODE -6:6
+      !write(*,*) 'MODE loop completed'
+      END DO ! 1 or 2 trajectories
+      !write(*,*) 'trajectories  loop completed'
+
+      DEALLOCATE(A)
+      DEALLOCATE(AC)
+      DEALLOCATE(DA)
+      DEALLOCATE(DL)
+      DEALLOCATE(F)
+      DEALLOCATE(F1)
+      DEALLOCATE(F2)
+      DEALLOCATE(X)
+      DEALLOCATE(X0)
+      DEALLOCATE(SINGVX)
+      DEALLOCATE(SINGVQX)
+      DEALLOCATE(Y)
+      DEALLOCATE(Y0)
+      DEALLOCATE(Y1)
+      DEALLOCATE(Z)
+      DEALLOCATE(Z1)
+      DEALLOCATE(RES)
+      DEALLOCATE(RES1)
+      DEALLOCATE(RESEX)
+      DEALLOCATE(REIG)
+      DEALLOCATE(IEIG)
+      DEALLOCATE(REIGQ)
+      DEALLOCATE(IEIGQ)
+      DEALLOCATE(REIGA)
+      DEALLOCATE(IEIGA)
+      DEALLOCATE(VA)
+      DEALLOCATE(LAMBDA)
+      DEALLOCATE(LAMBDAQ)
+      DEALLOCATE(EIGA)
+      DEALLOCATE(W)
+      DEALLOCATE(AU)
+      DEALLOCATE(S)
+
+!............................................................
+      !     Generate random M-by-M matrix A. Use DLATMR from
+      END DO ! LLOOP
+
+      WRITE(*,*) '>>>>>>>>>>>>>>>>>>>>>>>>>>'
+      WRITE(*,*) ' Test summary for DGEDMD :'
+      WRITE(*,*) '>>>>>>>>>>>>>>>>>>>>>>>>>>'
+      WRITE(*,*)
+      IF ( NFAIL_Z_XV == 0 ) THEN
+          WRITE(*,*) '>>>> Z - U*V test PASSED.'
+      ELSE
+          WRITE(*,*) 'Z - U*V test FAILED ', NFAIL_Z_XV, ' time(s)'
+          WRITE(*,*) 'Max error ||Z-U*V||_F was ', TMP_ZXW
+          NFAIL_TOTAL = NFAIL_TOTAL + NFAIL_Z_XV
+      END IF
+      IF ( NFAIL_AU == 0 ) THEN
+          WRITE(*,*) '>>>> A*U test PASSED. '
+      ELSE
+          WRITE(*,*) 'A*U test FAILED ', NFAIL_AU, ' time(s)'
+          WRITE(*,*) 'Max A*U test adjusted error measure was ', TMP_AU
+          WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+          NFAIL_TOTAL = NFAIL_TOTAL + NFAIL_AU
+      END IF
+
+      IF ( NFAIL_REZ == 0 ) THEN
+          WRITE(*,*) '>>>> Rezidual computation test PASSED.'
+      ELSE
+          WRITE(*,*) 'Rezidual computation test FAILED ', NFAIL_REZ, 'time(s)'
+          WRITE(*,*) 'Max residual computing test adjusted error measure was ', TMP_REZ
+          WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+          NFAIL_TOTAL = NFAIL_TOTAL + NFAIL_REZ
+      END IF
+
+      IF ( NFAIL_TOTAL == 0 ) THEN
+          WRITE(*,*) '>>>> DGEDMD :: ALL TESTS PASSED.'
+      ELSE
+          WRITE(*,*) NFAIL_TOTAL, 'FAILURES!'
+          WRITE(*,*) '>>>>>>>>>>>>>> DGEDMD :: TESTS FAILED. CHECK THE IMPLEMENTATION.'
+      END IF
+
+      IF ( TEST_QRDMD ) THEN
+      WRITE(*,*)
+      WRITE(*,*) '>>>>>>>>>>>>>>>>>>>>>>>>>>'
+      WRITE(*,*) ' Test summary for DGEDMDQ :'
+      WRITE(*,*) '>>>>>>>>>>>>>>>>>>>>>>>>>>'
+      WRITE(*,*)
+
+      IF ( NFAIL_SVDIFF == 0 ) THEN
+          WRITE(*,*) '>>>> DGEDMD and DGEDMDQ computed singular &
+              &values test PASSED.'
+      ELSE
+          WRITE(*,*) 'DGEDMD and DGEDMDQ discrepancies in &
+              &the singular values unacceptable ', &
+              NFAIL_SVDIFF, ' times. Test FAILED.'
+          WRITE(*,*) 'The maximal discrepancy in the singular values (relative to the norm) was ', SVDIFF
+          WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+          NFAILQ_TOTAL = NFAILQ_TOTAL + NFAIL_SVDIFF
+      END IF
+
+      IF ( NFAIL_F_QR == 0 ) THEN
+          WRITE(*,*) '>>>> F - Q*R test PASSED.'
+      ELSE
+          WRITE(*,*) 'F - Q*R test FAILED ', NFAIL_F_QR, ' time(s)'
+          WRITE(*,*) 'The largest relative residual was ', TMP_FQR
+          WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+          NFAILQ_TOTAL = NFAILQ_TOTAL + NFAIL_F_QR
+      END IF
+
+      IF ( NFAIL_REZQ == 0 ) THEN
+          WRITE(*,*) '>>>> Rezidual computation test PASSED.'
+      ELSE
+          WRITE(*,*) 'Rezidual computation test FAILED ', NFAIL_REZQ, 'time(s)'
+          WRITE(*,*) 'Max residual computing test adjusted error measure was ', TMP_REZQ
+          WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+          NFAILQ_TOTAL = NFAILQ_TOTAL + NFAIL_REZQ
+      END IF
+
+      IF ( NFAILQ_TOTAL == 0 ) THEN
+          WRITE(*,*) '>>>>>>> DGEDMDQ :: ALL TESTS PASSED.'
+      ELSE
+         WRITE(*,*) NFAILQ_TOTAL, 'FAILURES!'
+         WRITE(*,*) '>>>>>>> DGEDMDQ :: TESTS FAILED. CHECK THE IMPLEMENTATION.'
+      END IF
+
+      END IF
+
+      WRITE(*,*)
+      WRITE(*,*) 'Test completed.'
+      STOP
+      END
diff --git a/TESTING/EIG/dchkec.f b/TESTING/EIG/dchkec.f
index 8549618842..6409285e9d 100644
--- a/TESTING/EIG/dchkec.f
+++ b/TESTING/EIG/dchkec.f
@@ -73,6 +73,7 @@
 *
 *  =====================================================================
       SUBROUTINE DCHKEC( THRESH, TSTERR, NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -90,21 +91,23 @@ SUBROUTINE DCHKEC( THRESH, TSTERR, NIN, NOUT )
       LOGICAL            OK
       CHARACTER*3        PATH
       INTEGER            KLAEXC, KLALN2, KLANV2, KLAQTR, KLASY2, KTREXC,
-     $                   KTRSEN, KTRSNA, KTRSYL, LLAEXC, LLALN2, LLANV2,
-     $                   LLAQTR, LLASY2, LTREXC, LTRSYL, NLANV2, NLAQTR,
-     $                   NLASY2, NTESTS, NTRSYL, KTGEXC, NTGEXC, LTGEXC
+     $                   KTRSEN, KTRSNA, KTRSYL, KTRSYL3, LLAEXC,
+     $                   LLALN2, LLANV2, LLAQTR, LLASY2, LTREXC, LTRSYL,
+     $                   NLANV2, NLAQTR, NLASY2, NTESTS, NTRSYL, KTGEXC,
+     $                   LTGEXC
       DOUBLE PRECISION   EPS, RLAEXC, RLALN2, RLANV2, RLAQTR, RLASY2,
-     $                   RTREXC, RTRSYL, SFMIN, RTGEXC
+     $                   RTREXC, SFMIN, RTGEXC
 *     ..
 *     .. Local Arrays ..
-      INTEGER            LTRSEN( 3 ), LTRSNA( 3 ), NLAEXC( 2 ),
-     $                   NLALN2( 2 ), NTREXC( 3 ), NTRSEN( 3 ),
+      INTEGER            FTRSYL( 3 ), ITRSYL( 2 ), LTRSEN( 3 ),
+     $                   LTRSNA( 3 ), NLAEXC( 2 ), NLALN2( 2 ),
+     $                   NTGEXC( 2 ), NTREXC( 3 ), NTRSEN( 3 ),
      $                   NTRSNA( 3 )
-      DOUBLE PRECISION   RTRSEN( 3 ), RTRSNA( 3 )
+      DOUBLE PRECISION   RTRSEN( 3 ), RTRSNA( 3 ), RTRSYL( 2 )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           DERREC, DGET31, DGET32, DGET33, DGET34, DGET35,
-     $                   DGET36, DGET37, DGET38, DGET39, DGET40
+     $                   DGET36, DGET37, DGET38, DGET39, DGET40, DSYL01
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION   DLAMCH
@@ -153,10 +156,24 @@ SUBROUTINE DCHKEC( THRESH, TSTERR, NIN, NOUT )
          WRITE( NOUT, FMT = 9996 )RLAEXC, LLAEXC, NLAEXC, KLAEXC
       END IF
 *
-      CALL DGET35( RTRSYL, LTRSYL, NTRSYL, KTRSYL )
-      IF( RTRSYL.GT.THRESH ) THEN
+      CALL DGET35( RTRSYL( 1 ), LTRSYL, NTRSYL, KTRSYL )
+      IF( RTRSYL( 1 ).GT.THRESH ) THEN
          OK = .FALSE.
-         WRITE( NOUT, FMT = 9995 )RTRSYL, LTRSYL, NTRSYL, KTRSYL
+         WRITE( NOUT, FMT = 9995 )RTRSYL( 1 ), LTRSYL, NTRSYL, KTRSYL
+      END IF
+*
+      CALL DSYL01( THRESH, FTRSYL, RTRSYL, ITRSYL, KTRSYL3 )
+      IF( FTRSYL( 1 ).GT.0 ) THEN
+         OK = .FALSE.
+         WRITE( NOUT, FMT = 9970 )FTRSYL( 1 ), RTRSYL( 1 ), THRESH
+      END IF
+      IF( FTRSYL( 2 ).GT.0 ) THEN
+         OK = .FALSE.
+         WRITE( NOUT, FMT = 9971 )FTRSYL( 2 ), RTRSYL( 2 ), THRESH
+      END IF
+      IF( FTRSYL( 3 ).GT.0 ) THEN
+         OK = .FALSE.
+         WRITE( NOUT, FMT = 9972 )FTRSYL( 3 )
       END IF
 *
       CALL DGET36( RTREXC, LTREXC, NTREXC, KTREXC, NIN )
@@ -227,7 +244,13 @@ SUBROUTINE DCHKEC( THRESH, TSTERR, NIN, NOUT )
  9987 FORMAT( ' Routines pass computational tests if test ratio is les',
      $      's than', F8.2, / / )
  9986 FORMAT( ' Error in DTGEXC: RMAX =', D12.3, / ' LMAX = ', I8, ' N',
-     $      'INFO=', I8, ' KNT=', I8 )
+     $      'INFO=', 2I8, ' KNT=', I8 )
+ 9972 FORMAT( 'DTRSYL and DTRSYL3 compute an inconsistent result ',
+     $      'factor in ', I8, ' tests.')
+ 9971 FORMAT( 'Error in DTRSYL3: ', I8, ' tests fail the threshold.', /
+     $      'Maximum test ratio =', D12.3, ' threshold =', D12.3 )
+ 9970 FORMAT( 'Error in DTRSYL: ', I8, ' tests fail the threshold.', /
+     $      'Maximum test ratio =', D12.3, ' threshold =', D12.3 )
 *
 *     End of DCHKEC
 *
diff --git a/TESTING/EIG/dchkee.F b/TESTING/EIG/dchkee.F
index 2b8e0b371d..20c4cb47c2 100644
--- a/TESTING/EIG/dchkee.F
+++ b/TESTING/EIG/dchkee.F
@@ -2508,7 +2508,7 @@ PROGRAM DCHKEE
  9974 FORMAT( ' Tests of DSBTRD', / ' (reduction of a symmetric band ',
      $      'matrix to tridiagonal form)' )
  9973 FORMAT( / 1X, 71( '-' ) )
- 9972 FORMAT( / ' LAPACK VERSION ', I1, '.', I1, '.', I1 )
+ 9972 FORMAT( / ' LAPACK VERSION ', I1, '.', I2, '.', I1 )
  9971 FORMAT( / ' Tests of the Generalized Linear Regression Model ',
      $      'routines' )
  9970 FORMAT( / ' Tests of the Generalized QR and RQ routines' )
diff --git a/TESTING/EIG/dchkgg.f b/TESTING/EIG/dchkgg.f
index 15e1360ea3..026c1e28f0 100644
--- a/TESTING/EIG/dchkgg.f
+++ b/TESTING/EIG/dchkgg.f
@@ -508,6 +508,7 @@ SUBROUTINE DCHKGG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   S2, P1, P2, U, LDU, V, Q, Z, ALPHR1, ALPHI1,
      $                   BETA1, ALPHR3, ALPHI3, BETA3, EVECTL, EVECTR,
      $                   WORK, LWORK, LLWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -561,9 +562,9 @@ SUBROUTINE DCHKGG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           DLAMCH, DLANGE, DLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEQR2, DGET51, DGET52, DGGHRD, DHGEQZ, DLABAD,
-     $                   DLACPY, DLARFG, DLASET, DLASUM, DLATM4, DORM2R,
-     $                   DTGEVC, XERBLA
+      EXTERNAL           DGEQR2, DGET51, DGET52, DGGHRD, DHGEQZ, DLACPY,
+     $                   DLARFG, DLASET, DLASUM, DLATM4, DORM2R, DTGEVC,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, MAX, MIN, SIGN
@@ -641,7 +642,6 @@ SUBROUTINE DCHKGG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/dchkgk.f b/TESTING/EIG/dchkgk.f
index 9ba567d743..3f9feca2f5 100644
--- a/TESTING/EIG/dchkgk.f
+++ b/TESTING/EIG/dchkgk.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE DCHKGK( NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dchkgl.f b/TESTING/EIG/dchkgl.f
index 60fee9870a..18ed77cfa9 100644
--- a/TESTING/EIG/dchkgl.f
+++ b/TESTING/EIG/dchkgl.f
@@ -50,6 +50,7 @@
 *
 *  =====================================================================
       SUBROUTINE DCHKGL( NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dchkhs.f b/TESTING/EIG/dchkhs.f
index 2e57498965..c21b7a2d32 100644
--- a/TESTING/EIG/dchkhs.f
+++ b/TESTING/EIG/dchkhs.f
@@ -23,7 +23,7 @@
 *       INTEGER            ISEED( 4 ), IWORK( * ), NN( * )
 *       DOUBLE PRECISION   A( LDA, * ), EVECTL( LDU, * ),
 *      $                   EVECTR( LDU, * ), EVECTX( LDU, * ),
-*      $                   EVECTY( LDU, * ), H( LDA, * ), RESULT( 14 ),
+*      $                   EVECTY( LDU, * ), H( LDA, * ), RESULT( 16 ),
 *      $                   T1( LDA, * ), T2( LDA, * ), TAU( * ),
 *      $                   U( LDU, * ), UU( LDU, * ), UZ( LDU, * ),
 *      $                   WI1( * ), WI2( * ), WI3( * ), WORK( * ),
@@ -49,15 +49,21 @@
 *>            T is "quasi-triangular", and the eigenvalue vector W.
 *>
 *>            DTREVC computes the left and right eigenvector matrices
-*>            L and R for T.
+*>            L and R for T. L is lower quasi-triangular, and R is
+*>            upper quasi-triangular.
 *>
 *>            DHSEIN computes the left and right eigenvector matrices
 *>            Y and X for H, using inverse iteration.
 *>
+*>            DTREVC3 computes left and right eigenvector matrices
+*>            from a Schur matrix T and backtransforms them with Z
+*>            to eigenvector matrices L and R for A. L and R are
+*>            GE matrices.
+*>
 *>    When DCHKHS is called, a number of matrix "sizes" ("n's") and a
 *>    number of matrix "types" are specified.  For each size ("n")
 *>    and each type of matrix, one matrix will be generated and used
-*>    to test the nonsymmetric eigenroutines.  For each matrix, 14
+*>    to test the nonsymmetric eigenroutines.  For each matrix, 16
 *>    tests will be performed:
 *>
 *>    (1)     | A - U H U**T | / ( |A| n ulp )
@@ -88,6 +94,10 @@
 *>
 *>    (14)    | Y**H A - W**H Y | / ( |A| |Y| ulp )
 *>
+*>    (15)    | AR - RW | / ( |A| |R| ulp )
+*>
+*>    (16)    | LA - WL | / ( |A| |L| ulp )
+*>
 *>    The "sizes" are specified by an array NN(1:NSIZES); the value of
 *>    each element NN(j) specifies one size.
 *>    The "types" are specified by a logical array DOTYPE( 1:NTYPES );
@@ -331,7 +341,7 @@
 *>           Workspace.
 *>           Modified.
 *>
-*>  RESULT - DOUBLE PRECISION array, dimension (14)
+*>  RESULT - DOUBLE PRECISION array, dimension (16)
 *>           The values computed by the fourteen tests described above.
 *>           The values are currently limited to 1/ulp, to avoid
 *>           overflow.
@@ -409,6 +419,7 @@ SUBROUTINE DCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   WI1, WR2, WI2, WR3, WI3, EVECTL, EVECTR,
      $                   EVECTY, EVECTX, UU, TAU, WORK, NWORK, IWORK,
      $                   SELECT, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -423,7 +434,7 @@ SUBROUTINE DCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       INTEGER            ISEED( 4 ), IWORK( * ), NN( * )
       DOUBLE PRECISION   A( LDA, * ), EVECTL( LDU, * ),
      $                   EVECTR( LDU, * ), EVECTX( LDU, * ),
-     $                   EVECTY( LDU, * ), H( LDA, * ), RESULT( 14 ),
+     $                   EVECTY( LDU, * ), H( LDA, * ), RESULT( 16 ),
      $                   T1( LDA, * ), T2( LDA, * ), TAU( * ),
      $                   U( LDU, * ), UU( LDU, * ), UZ( LDU, * ),
      $                   WI1( * ), WI2( * ), WI3( * ), WORK( * ),
@@ -459,9 +470,9 @@ SUBROUTINE DCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           DCOPY, DGEHRD, DGEMM, DGET10, DGET22, DHSEIN,
-     $                   DHSEQR, DHST01, DLABAD, DLACPY, DLAFTS, DLASET,
-     $                   DLASUM, DLATME, DLATMR, DLATMS, DORGHR, DORMHR,
-     $                   DTREVC, XERBLA
+     $                   DHSEQR, DHST01, DLACPY, DLAFTS, DLASET, DLASUM,
+     $                   DLATME, DLATMR, DLATMS, DORGHR, DORMHR, DTREVC,
+     $                   DTREVC3, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, MAX, MIN, SQRT
@@ -521,7 +532,6 @@ SUBROUTINE DCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = DLAMCH( 'Overflow' )
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
@@ -561,7 +571,7 @@ SUBROUTINE DCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
 *           Initialize RESULT
 *
-            DO 30 J = 1, 14
+            DO 30 J = 1, 16
                RESULT( J ) = ZERO
    30       CONTINUE
 *
@@ -1108,6 +1118,64 @@ SUBROUTINE DCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $            RESULT( 14 ) = DUMMA( 3 )*ANINV
             END IF
 *
+*           Compute Left and Right Eigenvectors of A
+*
+*           Compute a Right eigenvector matrix:
+*
+            NTEST = 15
+            RESULT( 15 ) = ULPINV
+*
+            CALL DLACPY( ' ', N, N, UZ, LDU, EVECTR, LDU )
+*
+            CALL DTREVC3( 'Right', 'Back', SELECT, N, T1, LDA, DUMMA,
+     $                    LDU, EVECTR, LDU, N, IN, WORK, NWORK, IINFO )
+            IF( IINFO.NE.0 ) THEN
+               WRITE( NOUNIT, FMT = 9999 )'DTREVC3(R,B)', IINFO, N,
+     $            JTYPE, IOLDSD
+               INFO = ABS( IINFO )
+               GO TO 250
+            END IF
+*
+*           Test 15:  | AR - RW | / ( |A| |R| ulp )
+*
+*                     (from Schur decomposition)
+*
+            CALL DGET22( 'N', 'N', 'N', N, A, LDA, EVECTR, LDU, WR1,
+     $                   WI1, WORK, DUMMA( 1 ) )
+            RESULT( 15 ) = DUMMA( 1 )
+            IF( DUMMA( 2 ).GT.THRESH ) THEN
+               WRITE( NOUNIT, FMT = 9998 )'Right', 'DTREVC3',
+     $            DUMMA( 2 ), N, JTYPE, IOLDSD
+            END IF
+*
+*           Compute a Left eigenvector matrix:
+*
+            NTEST = 16
+            RESULT( 16 ) = ULPINV
+*
+            CALL DLACPY( ' ', N, N, UZ, LDU, EVECTL, LDU )
+*
+            CALL DTREVC3( 'Left', 'Back', SELECT, N, T1, LDA, EVECTL,
+     $                    LDU, DUMMA, LDU, N, IN, WORK, NWORK, IINFO )
+            IF( IINFO.NE.0 ) THEN
+               WRITE( NOUNIT, FMT = 9999 )'DTREVC3(L,B)', IINFO, N,
+     $            JTYPE, IOLDSD
+               INFO = ABS( IINFO )
+               GO TO 250
+            END IF
+*
+*           Test 16:  | LA - WL | / ( |A| |L| ulp )
+*
+*                     (from Schur decomposition)
+*
+            CALL DGET22( 'Trans', 'N', 'Conj', N, A, LDA, EVECTL, LDU,
+     $                   WR1, WI1, WORK, DUMMA( 3 ) )
+            RESULT( 16 ) = DUMMA( 3 )
+            IF( DUMMA( 4 ).GT.THRESH ) THEN
+               WRITE( NOUNIT, FMT = 9998 )'Left', 'DTREVC3', DUMMA( 4 ),
+     $            N, JTYPE, IOLDSD
+            END IF
+*
 *           End of Loop -- Check for RESULT(j) > THRESH
 *
   250       CONTINUE
diff --git a/TESTING/EIG/dchksb.f b/TESTING/EIG/dchksb.f
index 86f849b77c..fef7cc3b95 100644
--- a/TESTING/EIG/dchksb.f
+++ b/TESTING/EIG/dchksb.f
@@ -290,6 +290,7 @@
       SUBROUTINE DCHKSB( NSIZES, NN, NWDTHS, KK, NTYPES, DOTYPE, ISEED,
      $                   THRESH, NOUNIT, A, LDA, SD, SE, U, LDU, WORK,
      $                   LWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dchksb2stg.f b/TESTING/EIG/dchksb2stg.f
index 87dbbcd25c..6bc0ca532e 100644
--- a/TESTING/EIG/dchksb2stg.f
+++ b/TESTING/EIG/dchksb2stg.f
@@ -329,6 +329,7 @@
       SUBROUTINE DCHKSB2STG( NSIZES, NN, NWDTHS, KK, NTYPES, DOTYPE,
      $                   ISEED, THRESH, NOUNIT, A, LDA, SD, SE, D1,
      $                   D2, D3, U, LDU, WORK, LWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -840,8 +841,9 @@ SUBROUTINE DCHKSB2STG( NSIZES, NN, NWDTHS, KK, NTYPES, DOTYPE,
       CALL DLASUM( 'DSB', NOUNIT, NERRS, NTESTT )
       RETURN
 *
- 9999 FORMAT( ' DCHKSB2STG: ', A, ' returned INFO=', I6, '.', / 9X, 'N=',
-     $      I6, ', JTYPE=', I6, ', ISEED=(', 3( I5, ',' ), I5, ')' )
+ 9999 FORMAT( ' DCHKSB2STG: ', A, ' returned INFO=', I6, '.', / 9X,
+     $      'N=', I6, ', JTYPE=', I6, ', ISEED=(', 3( I5, ',' ), I5,
+     $      ')' )
 *
  9998 FORMAT( / 1X, A3,
      $      ' -- Real Symmetric Banded Tridiagonal Reduction Routines' )
diff --git a/TESTING/EIG/dchkst.f b/TESTING/EIG/dchkst.f
index 2e04f68c53..d8ff91f698 100644
--- a/TESTING/EIG/dchkst.f
+++ b/TESTING/EIG/dchkst.f
@@ -363,7 +363,7 @@
 *> \verbatim
 *>          D1 is DOUBLE PRECISION array of
 *>                             dimension( max(NN) )
-*>          The eigenvalues of A, as computed by DSTEQR simlutaneously
+*>          The eigenvalues of A, as computed by DSTEQR simultaneously
 *>          with Z.  On exit, the eigenvalues in D1 correspond with the
 *>          matrix in A.
 *> \endverbatim
@@ -588,6 +588,7 @@ SUBROUTINE DCHKST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, AP, SD, SE, D1, D2, D3, D4, D5,
      $                   WA1, WA2, WA3, WR, U, LDU, V, VP, TAU, Z, WORK,
      $                   LWORK, IWORK, LIWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -645,10 +646,10 @@ SUBROUTINE DCHKST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           ILAENV, DLAMCH, DLARND, DSXT1
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLABAD, DLACPY, DLASET, DLASUM, DLATMR,
-     $                   DLATMS, DOPGTR, DORGTR, DPTEQR, DSPT21, DSPTRD,
-     $                   DSTEBZ, DSTECH, DSTEDC, DSTEMR, DSTEIN, DSTEQR,
-     $                   DSTERF, DSTT21, DSTT22, DSYT21, DSYTRD, XERBLA
+      EXTERNAL           DCOPY, DLACPY, DLASET, DLASUM, DLATMR, DLATMS,
+     $                   DOPGTR, DORGTR, DPTEQR, DSPT21, DSPTRD, DSTEBZ,
+     $                   DSTECH, DSTEDC, DSTEMR, DSTEIN, DSTEQR, DSTERF,
+     $                   DSTT21, DSTT22, DSYT21, DSYTRD, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, INT, LOG, MAX, MIN, SQRT
@@ -715,7 +716,6 @@ SUBROUTINE DCHKST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       ULPINV = ONE / ULP
       LOG2UI = INT( LOG( ULPINV ) / LOG( TWO ) )
diff --git a/TESTING/EIG/dchkst2stg.f b/TESTING/EIG/dchkst2stg.f
index 90eeec33dc..9cc1052d3e 100644
--- a/TESTING/EIG/dchkst2stg.f
+++ b/TESTING/EIG/dchkst2stg.f
@@ -384,7 +384,7 @@
 *> \verbatim
 *>          D1 is DOUBLE PRECISION array of
 *>                             dimension( max(NN) )
-*>          The eigenvalues of A, as computed by DSTEQR simlutaneously
+*>          The eigenvalues of A, as computed by DSTEQR simultaneously
 *>          with Z.  On exit, the eigenvalues in D1 correspond with the
 *>          matrix in A.
 *> \endverbatim
@@ -609,6 +609,7 @@ SUBROUTINE DCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, AP, SD, SE, D1, D2, D3, D4, D5,
      $                   WA1, WA2, WA3, WR, U, LDU, V, VP, TAU, Z, WORK,
      $                   LWORK, IWORK, LIWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -666,10 +667,10 @@ SUBROUTINE DCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           ILAENV, DLAMCH, DLARND, DSXT1
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLABAD, DLACPY, DLASET, DLASUM, DLATMR,
-     $                   DLATMS, DOPGTR, DORGTR, DPTEQR, DSPT21, DSPTRD,
-     $                   DSTEBZ, DSTECH, DSTEDC, DSTEMR, DSTEIN, DSTEQR,
-     $                   DSTERF, DSTT21, DSTT22, DSYT21, DSYTRD, XERBLA,
+      EXTERNAL           DCOPY, DLACPY, DLASET, DLASUM, DLATMR, DLATMS,
+     $                   DOPGTR, DORGTR, DPTEQR, DSPT21, DSPTRD, DSTEBZ,
+     $                   DSTECH, DSTEDC, DSTEMR, DSTEIN, DSTEQR, DSTERF,
+     $                   DSTT21, DSTT22, DSYT21, DSYTRD, XERBLA,
      $                   DSYTRD_2STAGE
 *     ..
 *     .. Intrinsic Functions ..
@@ -737,7 +738,6 @@ SUBROUTINE DCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       ULPINV = ONE / ULP
       LOG2UI = INT( LOG( ULPINV ) / LOG( TWO ) )
@@ -1055,7 +1055,6 @@ SUBROUTINE DCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                END IF
             END IF
 *
-*
 *           Do Tests 3 and 4 which are similar to 11 and 12 but with the
 *           D1 computed using the standard 1-stage reduction as reference
 *
@@ -1715,7 +1714,6 @@ SUBROUTINE DCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                         END IF
                      END IF
 *
-*
 *                 Do test 28
 *
                      TEMP2 = TWO*( TWO*N-ONE )*ULP*
@@ -1814,7 +1812,6 @@ SUBROUTINE DCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                   RESULT( 31 ) = TEMP2 / MAX( UNFL,
      $                           ULP*MAX( TEMP1, TEMP2 ) )
 *
-*
 *           Call DSTEMR(V,V) to compute D1 and Z, do tests.
 *
 *           Compute D1 and Z
@@ -1916,7 +1913,6 @@ SUBROUTINE DCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                   RESULT( 34 ) = ZERO
                END IF
 *
-*
 *           Call DSTEMR(V,A) to compute D1 and Z, do tests.
 *
 *           Compute D1 and Z
@@ -1973,7 +1969,7 @@ SUBROUTINE DCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                   END IF
                END IF
 *
-*           Do Test 34
+*           Do Test 37
 *
                TEMP1 = ZERO
                TEMP2 = ZERO
@@ -1992,7 +1988,6 @@ SUBROUTINE DCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
 *           End of Loop -- Check for RESULT(j) > THRESH
 *
-*
 *           Print out tests which fail.
 *
             DO 290 JR = 1, NTEST
diff --git a/TESTING/EIG/dckglm.f b/TESTING/EIG/dckglm.f
index 389ba49328..6dd4a46cc5 100644
--- a/TESTING/EIG/dckglm.f
+++ b/TESTING/EIG/dckglm.f
@@ -164,6 +164,7 @@
       SUBROUTINE DCKGLM( NN, MVAL, PVAL, NVAL, NMATS, ISEED, THRESH,
      $                   NMAX, A, AF, B, BF, X, WORK, RWORK, NIN, NOUT,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dckgqr.f b/TESTING/EIG/dckgqr.f
index a810facc0e..ed915a757d 100644
--- a/TESTING/EIG/dckgqr.f
+++ b/TESTING/EIG/dckgqr.f
@@ -207,6 +207,7 @@
       SUBROUTINE DCKGQR( NM, MVAL, NP, PVAL, NN, NVAL, NMATS, ISEED,
      $                   THRESH, NMAX, A, AF, AQ, AR, TAUA, B, BF, BZ,
      $                   BT, BWK, TAUB, WORK, RWORK, NIN, NOUT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dckgsv.f b/TESTING/EIG/dckgsv.f
index 3b60dde6b7..bfd7f3d0b4 100644
--- a/TESTING/EIG/dckgsv.f
+++ b/TESTING/EIG/dckgsv.f
@@ -195,6 +195,7 @@
       SUBROUTINE DCKGSV( NM, MVAL, PVAL, NVAL, NMATS, ISEED, THRESH,
      $                   NMAX, A, AF, B, BF, U, V, Q, ALPHA, BETA, R,
      $                   IWORK, WORK, RWORK, NIN, NOUT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dcklse.f b/TESTING/EIG/dcklse.f
index b2dbbf1e52..77cd7cf9e4 100644
--- a/TESTING/EIG/dcklse.f
+++ b/TESTING/EIG/dcklse.f
@@ -164,6 +164,7 @@
       SUBROUTINE DCKLSE( NN, MVAL, PVAL, NVAL, NMATS, ISEED, THRESH,
      $                   NMAX, A, AF, B, BF, X, WORK, RWORK, NIN, NOUT,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dcsdts.f b/TESTING/EIG/dcsdts.f
index a671a8a258..4b6429214f 100644
--- a/TESTING/EIG/dcsdts.f
+++ b/TESTING/EIG/dcsdts.f
@@ -226,6 +226,7 @@
       SUBROUTINE DCSDTS( M, P, Q, X, XF, LDX, U1, LDU1, U2, LDU2, V1T,
      $                   LDV1T, V2T, LDV2T, THETA, IWORK, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/ddrges.f b/TESTING/EIG/ddrges.f
index abb10547a0..dfe94799e2 100644
--- a/TESTING/EIG/ddrges.f
+++ b/TESTING/EIG/ddrges.f
@@ -400,6 +400,7 @@ SUBROUTINE DDRGES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, B, S, T, Q, LDQ, Z, ALPHAR,
      $                   ALPHAI, BETA, WORK, LWORK, RESULT, BWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -451,8 +452,8 @@ SUBROUTINE DDRGES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           DLCTES, ILAENV, DLAMCH, DLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, DGET51, DGET53, DGET54, DGGES, DLABAD,
-     $                   DLACPY, DLARFG, DLASET, DLATM4, DORM2R, XERBLA
+      EXTERNAL           ALASVM, DGET51, DGET53, DGET54, DGGES, DLACPY,
+     $                   DLARFG, DLASET, DLATM4, DORM2R, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, MAX, MIN, SIGN
@@ -541,7 +542,6 @@ SUBROUTINE DDRGES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/ddrges3.f b/TESTING/EIG/ddrges3.f
index 770ae09c07..6d98d4bfad 100644
--- a/TESTING/EIG/ddrges3.f
+++ b/TESTING/EIG/ddrges3.f
@@ -400,6 +400,7 @@ SUBROUTINE DDRGES3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                    NOUNIT, A, LDA, B, S, T, Q, LDQ, Z, ALPHAR,
      $                    ALPHAI, BETA, WORK, LWORK, RESULT, BWORK,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -451,8 +452,8 @@ SUBROUTINE DDRGES3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           DLCTES, ILAENV, DLAMCH, DLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, DGET51, DGET53, DGET54, DGGES3, DLABAD,
-     $                   DLACPY, DLARFG, DLASET, DLATM4, DORM2R, XERBLA
+      EXTERNAL           ALASVM, DGET51, DGET53, DGET54, DGGES3, DLACPY,
+     $                   DLARFG, DLASET, DLATM4, DORM2R, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, MAX, MIN, SIGN
@@ -541,7 +542,6 @@ SUBROUTINE DDRGES3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/ddrgev.f b/TESTING/EIG/ddrgev.f
index 536ab36e1d..b8c3e22ea6 100644
--- a/TESTING/EIG/ddrgev.f
+++ b/TESTING/EIG/ddrgev.f
@@ -405,6 +405,7 @@ SUBROUTINE DDRGEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, B, S, T, Q, LDQ, Z, QE, LDQE,
      $                   ALPHAR, ALPHAI, BETA, ALPHR1, ALPHI1, BETA1,
      $                   WORK, LWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -455,7 +456,7 @@ SUBROUTINE DDRGEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           ILAENV, DLAMCH, DLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, DGET52, DGGEV, DLABAD, DLACPY, DLARFG,
+      EXTERNAL           ALASVM, DGET52, DGGEV, DLACPY, DLARFG,
      $                   DLASET, DLATM4, DORM2R, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -546,7 +547,6 @@ SUBROUTINE DDRGEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/ddrgev3.f b/TESTING/EIG/ddrgev3.f
index 20a64361cc..145f08933d 100644
--- a/TESTING/EIG/ddrgev3.f
+++ b/TESTING/EIG/ddrgev3.f
@@ -405,6 +405,7 @@ SUBROUTINE DDRGEV3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, B, S, T, Q, LDQ, Z, QE, LDQE,
      $                   ALPHAR, ALPHAI, BETA, ALPHR1, ALPHI1, BETA1,
      $                   WORK, LWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -455,8 +456,8 @@ SUBROUTINE DDRGEV3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           ILAENV, DLAMCH, DLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, DGET52, DGGEV3, DLABAD, DLACPY, DLARFG,
-     $                   DLASET, DLATM4, DORM2R, XERBLA
+      EXTERNAL           ALASVM, DGET52, DGGEV3, DLACPY, DLARFG, DLASET,
+     $                   DLATM4, DORM2R, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, MAX, MIN, SIGN
@@ -546,7 +547,6 @@ SUBROUTINE DDRGEV3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/ddrgsx.f b/TESTING/EIG/ddrgsx.f
index b3f5e23f4a..71164a64da 100644
--- a/TESTING/EIG/ddrgsx.f
+++ b/TESTING/EIG/ddrgsx.f
@@ -356,6 +356,7 @@
       SUBROUTINE DDRGSX( NSIZE, NCMAX, THRESH, NIN, NOUT, A, LDA, B, AI,
      $                   BI, Z, Q, ALPHAR, ALPHAI, BETA, C, LDC, S,
      $                   WORK, LWORK, IWORK, LIWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -400,7 +401,7 @@ SUBROUTINE DDRGSX( NSIZE, NCMAX, THRESH, NIN, NOUT, A, LDA, B, AI,
       EXTERNAL           DLCTSX, ILAENV, DLAMCH, DLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, DGESVD, DGET51, DGET53, DGGESX, DLABAD,
+      EXTERNAL           ALASVM, DGESVD, DGET51, DGET53, DGGESX,
      $                   DLACPY, DLAKF2, DLASET, DLATM5, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -478,7 +479,6 @@ SUBROUTINE DDRGSX( NSIZE, NCMAX, THRESH, NIN, NOUT, A, LDA, B, AI,
       ULPINV = ONE / ULP
       SMLNUM = DLAMCH( 'S' ) / ULP
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       THRSH2 = TEN*THRESH
       NTESTT = 0
       NERRS = 0
@@ -984,7 +984,7 @@ SUBROUTINE DDRGSX( NSIZE, NCMAX, THRESH, NIN, NOUT, A, LDA, B, AI,
      $      / '  2:  A and B are upper triangular matrices, ',
      $      / '  3:  A and B are as type 2, but each second diagonal ',
      $      'block in A_11 and ', /
-     $      '      each third diaongal block in A_22 are 2x2 blocks,',
+     $      '      each third diagonal block in A_22 are 2x2 blocks,',
      $      / '  4:  A and B are block diagonal matrices, ',
      $      / '  5:  (A,B) has potentially close or common ',
      $      'eigenvalues.', / )
diff --git a/TESTING/EIG/ddrgvx.f b/TESTING/EIG/ddrgvx.f
index c637621348..e375a37aea 100644
--- a/TESTING/EIG/ddrgvx.f
+++ b/TESTING/EIG/ddrgvx.f
@@ -56,7 +56,7 @@
 *>
 *>    | l**H * (beta A - alpha B) | / ( ulp max( |beta A|, |alpha B| ) )
 *>
-*>     where l**H is the conjugate tranpose of l.
+*>     where l**H is the conjugate transpose of l.
 *>
 *> (2) max over all right eigenvalue/-vector pairs (beta/alpha,r) of
 *>
@@ -297,6 +297,7 @@ SUBROUTINE DDRGVX( NSIZE, THRESH, NIN, NOUT, A, LDA, B, AI, BI,
      $                   ALPHAR, ALPHAI, BETA, VL, VR, ILO, IHI, LSCALE,
      $                   RSCALE, S, DTRU, DIF, DIFTRU, WORK, LWORK,
      $                   IWORK, LIWORK, RESULT, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/ddrvbd.f b/TESTING/EIG/ddrvbd.f
index ce83234bff..0e3e2b4612 100644
--- a/TESTING/EIG/ddrvbd.f
+++ b/TESTING/EIG/ddrvbd.f
@@ -420,8 +420,8 @@ SUBROUTINE DDRVBD( NSIZES, MM, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALASVM, DBDT01, DGEJSV, DGESDD, DGESVD,
-     $                   DGESVDQ, DGESVDX, DGESVJ, DLABAD, DLACPY,
-     $                   DLASET, DLATMS, DORT01, DORT03, XERBLA
+     $                   DGESVDQ, DGESVDX, DGESVJ, DLACPY, DLASET,
+     $                   DLATMS, DORT01, DORT03, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, INT, MAX, MIN
@@ -497,7 +497,6 @@ SUBROUTINE DDRVBD( NSIZES, MM, NN, NTYPES, DOTYPE, ISEED, THRESH,
       NTEST = 0
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Precision' )
       RTUNFL = SQRT( UNFL )
       ULPINV = ONE / ULP
diff --git a/TESTING/EIG/ddrves.f b/TESTING/EIG/ddrves.f
index d2c2218b0b..c9822d8d65 100644
--- a/TESTING/EIG/ddrves.f
+++ b/TESTING/EIG/ddrves.f
@@ -385,6 +385,7 @@
       SUBROUTINE DDRVES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, H, HT, WR, WI, WRT, WIT, VS,
      $                   LDVS, RESULT, WORK, NWORK, IWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -444,8 +445,8 @@ SUBROUTINE DDRVES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           DSLECT, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEES, DHST01, DLABAD, DLACPY, DLASET, DLASUM,
-     $                   DLATME, DLATMR, DLATMS, XERBLA
+      EXTERNAL           DGEES, DHST01, DLACPY, DLASET, DLASUM, DLATME,
+     $                   DLATMR, DLATMS, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SIGN, SQRT
@@ -514,7 +515,6 @@ SUBROUTINE DDRVES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       RTULP = SQRT( ULP )
diff --git a/TESTING/EIG/ddrvev.f b/TESTING/EIG/ddrvev.f
index 3b39fa977c..bc0104043f 100644
--- a/TESTING/EIG/ddrvev.f
+++ b/TESTING/EIG/ddrvev.f
@@ -403,6 +403,7 @@ SUBROUTINE DDRVEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, H, WR, WI, WR1, WI1, VL, LDVL,
      $                   VR, LDVR, LRE, LDLRE, RESULT, WORK, NWORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -452,7 +453,7 @@ SUBROUTINE DDRVEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           DLAMCH, DLAPY2, DNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEEV, DGET22, DLABAD, DLACPY, DLASET, DLASUM,
+      EXTERNAL           DGEEV, DGET22, DLACPY, DLASET, DLASUM,
      $                   DLATME, DLATMR, DLATMS, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -525,7 +526,6 @@ SUBROUTINE DDRVEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       RTULP = SQRT( ULP )
diff --git a/TESTING/EIG/ddrvsg.f b/TESTING/EIG/ddrvsg.f
index 0b49c8404a..a1716883cb 100644
--- a/TESTING/EIG/ddrvsg.f
+++ b/TESTING/EIG/ddrvsg.f
@@ -234,7 +234,7 @@
 *>
 *>  B       DOUBLE PRECISION array, dimension (LDB , max(NN))
 *>          Used to hold the symmetric positive definite matrix for
-*>          the generailzed problem.
+*>          the generalized problem.
 *>          On exit, B contains the last matrix actually
 *>          used.
 *>          Modified.
@@ -352,6 +352,7 @@
       SUBROUTINE DDRVSG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, B, LDB, D, Z, LDZ, AB, BB, AP,
      $                   BP, WORK, NWORK, IWORK, LIWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -399,7 +400,7 @@ SUBROUTINE DDRVSG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           LSAME, DLAMCH, DLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLACPY, DLAFTS, DLASET, DLASUM, DLATMR,
+      EXTERNAL           DLACPY, DLAFTS, DLASET, DLASUM, DLATMR,
      $                   DLATMS, DSBGV, DSBGVD, DSBGVX, DSGT01, DSPGV,
      $                   DSPGVD, DSPGVX, DSYGV, DSYGVD, DSYGVX, XERBLA
 *     ..
@@ -460,7 +461,6 @@ SUBROUTINE DDRVSG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = DLAMCH( 'Overflow' )
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
@@ -645,8 +645,8 @@ SUBROUTINE DDRVSG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                IL = 1
                IU = N
             ELSE
-               IL = 1 + ( N-1 )*DLARND( 1, ISEED2 )
-               IU = 1 + ( N-1 )*DLARND( 1, ISEED2 )
+               IL = 1 + INT( ( N-1 )*DLARND( 1, ISEED2 ) )
+               IU = 1 + INT( ( N-1 )*DLARND( 1, ISEED2 ) )
                IF( IL.GT.IU ) THEN
                   ITEMP = IL
                   IL = IU
diff --git a/TESTING/EIG/ddrvsg2stg.f b/TESTING/EIG/ddrvsg2stg.f
index 196c6b48e6..0fe31cab17 100644
--- a/TESTING/EIG/ddrvsg2stg.f
+++ b/TESTING/EIG/ddrvsg2stg.f
@@ -240,7 +240,7 @@
 *>
 *>  B       DOUBLE PRECISION array, dimension (LDB , max(NN))
 *>          Used to hold the symmetric positive definite matrix for
-*>          the generailzed problem.
+*>          the generalized problem.
 *>          On exit, B contains the last matrix actually
 *>          used.
 *>          Modified.
@@ -408,7 +408,7 @@ SUBROUTINE DDRVSG2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           LSAME, DLAMCH, DLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLACPY, DLAFTS, DLASET, DLASUM, DLATMR,
+      EXTERNAL           DLACPY, DLAFTS, DLASET, DLASUM, DLATMR,
      $                   DLATMS, DSBGV, DSBGVD, DSBGVX, DSGT01, DSPGV,
      $                   DSPGVD, DSPGVX, DSYGV, DSYGVD, DSYGVX, XERBLA,
      $                   DSYGV_2STAGE
@@ -470,7 +470,6 @@ SUBROUTINE DDRVSG2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = DLAMCH( 'Overflow' )
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
diff --git a/TESTING/EIG/ddrvst.f b/TESTING/EIG/ddrvst.f
index a25077018b..77e9755755 100644
--- a/TESTING/EIG/ddrvst.f
+++ b/TESTING/EIG/ddrvst.f
@@ -214,7 +214,7 @@
 *>          Not modified.
 *>
 *>  D1      DOUBLE PRECISION array, dimension (max(NN))
-*>          The eigenvalues of A, as computed by DSTEQR simlutaneously
+*>          The eigenvalues of A, as computed by DSTEQR simultaneously
 *>          with Z.  On exit, the eigenvalues in D1 correspond with the
 *>          matrix in A.
 *>          Modified.
@@ -450,6 +450,7 @@ SUBROUTINE DDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, D1, D2, D3, D4, EVEIGS, WA1,
      $                   WA2, WA3, U, LDU, V, TAU, Z, WORK, LWORK,
      $                   IWORK, LIWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -502,11 +503,11 @@ SUBROUTINE DDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           DLAMCH, DLARND, DSXT1
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, DLABAD, DLACPY, DLAFTS, DLASET, DLATMR,
-     $                   DLATMS, DSBEV, DSBEVD, DSBEVX, DSPEV, DSPEVD,
-     $                   DSPEVX, DSTEV, DSTEVD, DSTEVR, DSTEVX, DSTT21,
-     $                   DSTT22, DSYEV, DSYEVD, DSYEVR, DSYEVX, DSYT21,
-     $                   DSYT22, XERBLA
+      EXTERNAL           ALASVM, DLACPY, DLAFTS, DLASET, DLATMR, DLATMS,
+     $                   DSBEV, DSBEVD, DSBEVX, DSPEV, DSPEVD, DSPEVX,
+     $                   DSTEV, DSTEVD, DSTEVR, DSTEVX, DSTT21, DSTT22,
+     $                   DSYEV, DSYEVD, DSYEVR, DSYEVX, DSYT21, DSYT22,
+     $                   XERBLA
 *     ..
 *     .. Scalars in Common ..
       CHARACTER*32       SRNAMT
@@ -574,7 +575,6 @@ SUBROUTINE DDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = DLAMCH( 'Overflow' )
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
@@ -2773,7 +2773,7 @@ SUBROUTINE DDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                      RESULT( NTEST ) = ULPINV
                      RESULT( NTEST+1 ) = ULPINV
                      RESULT( NTEST+2 ) = ULPINV
-                     GO TO 700
+                     GO TO 1750
                   END IF
                END IF
 *
@@ -2798,13 +2798,13 @@ SUBROUTINE DDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                      RETURN
                   ELSE
                      RESULT( NTEST ) = ULPINV
-                     GO TO 700
+                     GO TO 1750
                   END IF
                END IF
 *
                IF( M3.EQ.0 .AND. N.GT.0 ) THEN
                   RESULT( NTEST ) = ULPINV
-                  GO TO 700
+                  GO TO 1750
                END IF
 *
 *              Do test 78 (or +54)
@@ -2820,6 +2820,8 @@ SUBROUTINE DDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                           MAX( UNFL, TEMP3*ULP )
 *
                CALL DLACPY( ' ', N, N, V, LDU, A, LDA )
+*
+ 1750       CONTINUE
 *
  1720       CONTINUE
 *
diff --git a/TESTING/EIG/ddrvst2stg.f b/TESTING/EIG/ddrvst2stg.f
index c9a2632bbf..9a24e346d0 100644
--- a/TESTING/EIG/ddrvst2stg.f
+++ b/TESTING/EIG/ddrvst2stg.f
@@ -214,7 +214,7 @@
 *>          Not modified.
 *>
 *>  D1      DOUBLE PRECISION array, dimension (max(NN))
-*>          The eigenvalues of A, as computed by DSTEQR simlutaneously
+*>          The eigenvalues of A, as computed by DSTEQR simultaneously
 *>          with Z.  On exit, the eigenvalues in D1 correspond with the
 *>          matrix in A.
 *>          Modified.
@@ -450,6 +450,7 @@ SUBROUTINE DDRVST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, D1, D2, D3, D4, EVEIGS, WA1,
      $                   WA2, WA3, U, LDU, V, TAU, Z, WORK, LWORK,
      $                   IWORK, LIWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -502,7 +503,7 @@ SUBROUTINE DDRVST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           DLAMCH, DLARND, DSXT1
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, DLABAD, DLACPY, DLAFTS, DLASET, DLATMR,
+      EXTERNAL           ALASVM, DLACPY, DLAFTS, DLASET, DLATMR,
      $                   DLATMS, DSBEV, DSBEVD, DSBEVX, DSPEV, DSPEVD,
      $                   DSPEVX, DSTEV, DSTEVD, DSTEVR, DSTEVX, DSTT21,
      $                   DSTT22, DSYEV, DSYEVD, DSYEVR, DSYEVX, DSYT21,
@@ -577,7 +578,6 @@ SUBROUTINE DDRVST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = DLAMCH( 'Overflow' )
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
diff --git a/TESTING/EIG/ddrvsx.f b/TESTING/EIG/ddrvsx.f
index c032a4a0c8..46d11252ba 100644
--- a/TESTING/EIG/ddrvsx.f
+++ b/TESTING/EIG/ddrvsx.f
@@ -451,6 +451,7 @@ SUBROUTINE DDRVSX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NIUNIT, NOUNIT, A, LDA, H, HT, WR, WI, WRT,
      $                   WIT, WRTMP, WITMP, VS, LDVS, VS1, RESULT, WORK,
      $                   LWORK, IWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -508,7 +509,7 @@ SUBROUTINE DDRVSX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGET24, DLABAD, DLASET, DLASUM, DLATME, DLATMR,
+      EXTERNAL           DGET24, DLASET, DLASUM, DLATME, DLATMR,
      $                   DLATMS, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -583,7 +584,6 @@ SUBROUTINE DDRVSX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       RTULP = SQRT( ULP )
diff --git a/TESTING/EIG/ddrvvx.f b/TESTING/EIG/ddrvvx.f
index cbb78d2b6e..ae0c438b67 100644
--- a/TESTING/EIG/ddrvvx.f
+++ b/TESTING/EIG/ddrvvx.f
@@ -518,6 +518,7 @@ SUBROUTINE DDRVVX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   VL, LDVL, VR, LDVR, LRE, LDLRE, RCONDV, RCNDV1,
      $                   RCDVIN, RCONDE, RCNDE1, RCDEIN, SCALE, SCALE1,
      $                   RESULT, WORK, NWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -568,8 +569,8 @@ SUBROUTINE DDRVVX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGET23, DLABAD, DLASET, DLASUM, DLATME, DLATMR,
-     $                   DLATMS, XERBLA
+      EXTERNAL           DGET23, DLASET, DLASUM, DLATME, DLATMR, DLATMS,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, SQRT
@@ -644,7 +645,6 @@ SUBROUTINE DDRVVX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       RTULP = SQRT( ULP )
diff --git a/TESTING/EIG/derrbd.f b/TESTING/EIG/derrbd.f
index 914274ff25..c57b0416ce 100644
--- a/TESTING/EIG/derrbd.f
+++ b/TESTING/EIG/derrbd.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRBD( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/derrec.f b/TESTING/EIG/derrec.f
index d5863ad426..cdee741809 100644
--- a/TESTING/EIG/derrec.f
+++ b/TESTING/EIG/derrec.f
@@ -23,7 +23,7 @@
 *>
 *> DERREC tests the error exits for the routines for eigen- condition
 *> estimation for DOUBLE PRECISION matrices:
-*>    DTRSYL, DTREXC, DTRSNA and DTRSEN.
+*>    DTRSYL, DTRSYL3, DTREXC, DTRSNA and DTRSEN.
 *> \endverbatim
 *
 *  Arguments:
@@ -53,6 +53,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERREC( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -82,7 +83,7 @@ SUBROUTINE DERREC( PATH, NUNIT )
      $                   WI( NMAX ), WORK( NMAX ), WR( NMAX )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHKXER, DTREXC, DTRSEN, DTRSNA, DTRSYL
+      EXTERNAL           CHKXER, DTREXC, DTRSEN, DTRSNA, DTRSYL, DTRSYL3
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -141,6 +142,43 @@ SUBROUTINE DERREC( PATH, NUNIT )
       CALL CHKXER( 'DTRSYL', INFOT, NOUT, LERR, OK )
       NT = NT + 8
 *
+*     Test DTRSYL3
+*
+      SRNAMT = 'DTRSYL3'
+      INFOT = 1
+      CALL DTRSYL3( 'X', 'N', 1, 0, 0, A, 1, B, 1, C, 1, SCALE,
+     $              IWORK, NMAX, WORK, NMAX, INFO )
+      CALL CHKXER( 'DTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL DTRSYL3( 'N', 'X', 1, 0, 0, A, 1, B, 1, C, 1, SCALE,
+     $              IWORK, NMAX, WORK, NMAX, INFO )
+      CALL CHKXER( 'DTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL DTRSYL3( 'N', 'N', 0, 0, 0, A, 1, B, 1, C, 1, SCALE,
+     $              IWORK, NMAX, WORK, NMAX, INFO )
+      CALL CHKXER( 'DTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL DTRSYL3( 'N', 'N', 1, -1, 0, A, 1, B, 1, C, 1, SCALE,
+     $              IWORK, NMAX, WORK, NMAX, INFO )
+      CALL CHKXER( 'DTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL DTRSYL3( 'N', 'N', 1, 0, -1, A, 1, B, 1, C, 1, SCALE,
+     $              IWORK, NMAX, WORK, NMAX, INFO )
+      CALL CHKXER( 'DTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 7
+      CALL DTRSYL3( 'N', 'N', 1, 2, 0, A, 1, B, 1, C, 2, SCALE,
+     $              IWORK, NMAX, WORK, NMAX, INFO )
+      CALL CHKXER( 'DTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 9
+      CALL DTRSYL3( 'N', 'N', 1, 0, 2, A, 1, B, 1, C, 1, SCALE,
+     $              IWORK, NMAX, WORK, NMAX, INFO )
+      CALL CHKXER( 'DTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 11
+      CALL DTRSYL3( 'N', 'N', 1, 2, 0, A, 2, B, 1, C, 1, SCALE,
+     $              IWORK, NMAX, WORK, NMAX, INFO )
+      CALL CHKXER( 'DTRSYL3', INFOT, NOUT, LERR, OK )
+      NT = NT + 8
+*
 *     Test DTREXC
 *
       SRNAMT = 'DTREXC'
diff --git a/TESTING/EIG/derred.f b/TESTING/EIG/derred.f
index 6df5178253..a20d08ff90 100644
--- a/TESTING/EIG/derred.f
+++ b/TESTING/EIG/derred.f
@@ -67,6 +67,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRED( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -99,7 +100,7 @@ SUBROUTINE DERRED( PATH, NUNIT )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CHKXER, DGEES, DGEESX, DGEEV, DGEEVX, DGEJSV,
-     $                   DGESDD, DGESVD, DGESVDX, DGESVQ
+     $                   DGESDD, DGESVD, DGESVDX, DGESVDQ
 *     ..
 *     .. External Functions ..
       LOGICAL            DSLECT, LSAMEN
@@ -329,7 +330,7 @@ SUBROUTINE DERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
 *
 *        Test DGESDD
@@ -358,7 +359,7 @@ SUBROUTINE DERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
 *
 *        Test DGEJSV
@@ -424,7 +425,7 @@ SUBROUTINE DERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
 *
 *        Test DGESVDX
@@ -483,7 +484,7 @@ SUBROUTINE DERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
 *
 *        Test DGESVDQ
@@ -538,7 +539,7 @@ SUBROUTINE DERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
       END IF
 *
@@ -549,7 +550,7 @@ SUBROUTINE DERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
       END IF
 *
diff --git a/TESTING/EIG/derrgg.f b/TESTING/EIG/derrgg.f
index 6fc61b8727..63358eb9f3 100644
--- a/TESTING/EIG/derrgg.f
+++ b/TESTING/EIG/derrgg.f
@@ -54,6 +54,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRGG( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/derrhs.f b/TESTING/EIG/derrhs.f
index fec41c0f0f..78a6713c36 100644
--- a/TESTING/EIG/derrhs.f
+++ b/TESTING/EIG/derrhs.f
@@ -21,8 +21,8 @@
 *>
 *> \verbatim
 *>
-*> DERRHS tests the error exits for DGEBAK, SGEBAL, SGEHRD, DORGHR,
-*> DORMHR, DHSEQR, SHSEIN, and DTREVC.
+*> DERRHS tests the error exits for DGEBAK, DGEBAL, DGEHRD, DGEHD2,
+*> DORGHR, DORMHR, DHSEQR, DHSEIN, DTREVC, and DTREVC3.
 *> \endverbatim
 *
 *  Arguments:
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRHS( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -86,7 +87,7 @@ SUBROUTINE DERRHS( PATH, NUNIT )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CHKXER, DGEBAK, DGEBAL, DGEHRD, DHSEIN, DHSEQR,
-     $                   DORGHR, DORMHR, DTREVC
+     $                   DORGHR, DORMHR, DTREVC, DTREVC3, DGEHD2
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE
@@ -194,6 +195,29 @@ SUBROUTINE DERRHS( PATH, NUNIT )
          CALL CHKXER( 'DGEHRD', INFOT, NOUT, LERR, OK )
          NT = NT + 7
 *
+*        DGEHD2
+*
+         SRNAMT = 'DGEHD2'
+         INFOT = 1
+         CALL DGEHD2( -1, 1, 1, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'DGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL DGEHD2( 0, 0, 0, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'DGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL DGEHD2( 0, 2, 0, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'DGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL DGEHD2( 1, 1, 0, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'DGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL DGEHD2( 0, 1, 1, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'DGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL DGEHD2( 2, 1, 1, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'DGEHD2', INFOT, NOUT, LERR, OK )
+         NT = NT + 6
+*
 *        DORGHR
 *
          SRNAMT = 'DORGHR'
@@ -328,7 +352,11 @@ SUBROUTINE DERRHS( PATH, NUNIT )
          CALL DHSEQR( 'E', 'V', 2, 1, 2, A, 2, WR, WI, C, 1, W, 1,
      $                INFO )
          CALL CHKXER( 'DHSEQR', INFOT, NOUT, LERR, OK )
-         NT = NT + 9
+         INFOT = 13
+         CALL DHSEQR( 'E', 'N', 2, 1, 2, A, 2, WR, WI, C, 1, W, 1,
+     $                INFO )
+         CALL CHKXER( 'DHSEQR', INFOT, NOUT, LERR, OK )
+         NT = NT + 10
 *
 *        DHSEIN
 *
@@ -399,6 +427,43 @@ SUBROUTINE DERRHS( PATH, NUNIT )
      $                INFO )
          CALL CHKXER( 'DTREVC', INFOT, NOUT, LERR, OK )
          NT = NT + 7
+*
+*        DTREVC3
+*
+         SRNAMT = 'DTREVC3'
+         INFOT = 1
+         CALL DTREVC3( '/', 'A', SEL, 0, A, 1, VL, 1, VR, 1, 0, M, W,
+     $                 LW, INFO )
+         CALL CHKXER( 'DTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL DTREVC3( 'L', '/', SEL, 0, A, 1, VL, 1, VR, 1, 0, M, W,
+     $                 LW, INFO )
+         CALL CHKXER( 'DTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL DTREVC3( 'L', 'A', SEL, -1, A, 1, VL, 1, VR, 1, 0, M, W,
+     $                 LW, INFO )
+         CALL CHKXER( 'DTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 6
+         CALL DTREVC3( 'L', 'A', SEL, 2, A, 1, VL, 2, VR, 1, 4, M, W,
+     $                 LW, INFO )
+         CALL CHKXER( 'DTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL DTREVC3( 'L', 'A', SEL, 2, A, 2, VL, 1, VR, 1, 4, M, W,
+     $                 LW, INFO )
+         CALL CHKXER( 'DTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL DTREVC3( 'R', 'A', SEL, 2, A, 2, VL, 1, VR, 1, 4, M, W,
+     $                 LW, INFO )
+         CALL CHKXER( 'DTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 11
+         CALL DTREVC3( 'L', 'A', SEL, 2, A, 2, VL, 2, VR, 1, 1, M, W,
+     $                 LW, INFO )
+         CALL CHKXER( 'DTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 14
+         CALL DTREVC3( 'L', 'A', SEL, 2, A, 2, VL, 2, VR, 1, 2, M, W,
+     $                 2, INFO )
+         CALL CHKXER( 'DTREVC3', INFOT, NOUT, LERR, OK )
+         NT = NT + 8
       END IF
 *
 *     Print a summary line.
diff --git a/TESTING/EIG/derrst.f b/TESTING/EIG/derrst.f
index f297e5a7d8..94018743f2 100644
--- a/TESTING/EIG/derrst.f
+++ b/TESTING/EIG/derrst.f
@@ -21,10 +21,10 @@
 *>
 *> \verbatim
 *>
-*> DERRST tests the error exits for DSYTRD, DORGTR, DORMTR, DSPTRD,
-*> DOPGTR, DOPMTR, DSTEQR, SSTERF, SSTEBZ, SSTEIN, DPTEQR, DSBTRD,
-*> DSYEV, SSYEVX, SSYEVD, DSBEV, SSBEVX, SSBEVD,
-*> DSPEV, SSPEVX, SSPEVD, DSTEV, SSTEVX, SSTEVD, and SSTEDC.
+*> DERRST tests the error exits for DSYTRD, DSYTD2, DORGTR, DORMTR, DSPTRD,
+*> DOPGTR, DOPMTR, DSTEQR, DSTERF, DSTEBZ, DSTEIN, DPTEQR, DSBTRD,
+*> DSYEV, DSYEVX, DSYEVD, DSBEV, DSBEVX, DSBEVD,
+*> DSPEV, DSPEVX, DSPEVD, DSTEV, DSTEVX, DSTEVD, and DSTEDC.
 *> DSYEVD_2STAGE, DSYEVR_2STAGE, DSYEVX_2STAGE,
 *> DSYEV_2STAGE, DSBEV_2STAGE, DSBEVD_2STAGE,
 *> DSBEVX_2STAGE, DSYTRD_2STAGE, DSYTRD_SY2SB,
@@ -58,6 +58,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRST( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -95,7 +96,7 @@ SUBROUTINE DERRST( PATH, NUNIT )
      $                   DSBEV, DSBEVD, DSBEVX, DSBTRD, DSPEV, DSPEVD,
      $                   DSPEVX, DSPTRD, DSTEBZ, DSTEDC, DSTEIN, DSTEQR,
      $                   DSTERF, DSTEV, DSTEVD, DSTEVR, DSTEVX, DSYEV,
-     $                   DSYEVD, DSYEVR, DSYEVX, DSYTRD,
+     $                   DSYEVD, DSYEVR, DSYEVX, DSYTRD, DSYTD2,
      $                   DSYEVD_2STAGE, DSYEVR_2STAGE, DSYEVX_2STAGE,
      $                   DSYEV_2STAGE, DSBEV_2STAGE, DSBEVD_2STAGE,
      $                   DSBEVX_2STAGE, DSYTRD_2STAGE, DSYTRD_SY2SB,
@@ -157,6 +158,20 @@ SUBROUTINE DERRST( PATH, NUNIT )
          CALL CHKXER( 'DSYTRD', INFOT, NOUT, LERR, OK )
          NT = NT + 4
 *
+*        DSYTD2
+*
+         SRNAMT = 'DSYTD2'
+         INFOT = 1
+         CALL DSYTD2( '/', 0, A, 1, D, E, TAU, INFO )
+         CALL CHKXER( 'DSYTD2', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL DSYTD2( 'U', -1, A, 1, D, E, TAU, INFO )
+         CALL CHKXER( 'DSYTD2', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL DSYTD2( 'U', 2, A, 1, D, E, TAU, INFO )
+         CALL CHKXER( 'DSYTD2', INFOT, NOUT, LERR, OK )
+         NT = NT + 3
+*
 *        DSYTRD_2STAGE
 *
          SRNAMT = 'DSYTRD_2STAGE'
@@ -721,12 +736,12 @@ SUBROUTINE DERRST( PATH, NUNIT )
          CALL CHKXER( 'DSYEVR', INFOT, NOUT, LERR, OK )
          INFOT = 18
          CALL DSYEVR( 'V', 'I', 'U', 1, A, 1, 0.0D0, 0.0D0, 1, 1, 0.0D0,
-     $                M, R, Z, 1, IW, Q, 26*N-1, IW( 2*N+1 ), 10*N,
+     $                M, R, Z, 1, IW, Q, 0, IW( 2*N+1 ), 10*N,
      $                INFO )
          CALL CHKXER( 'DSYEVR', INFOT, NOUT, LERR, OK )
          INFOT = 20
          CALL DSYEVR( 'V', 'I', 'U', 1, A, 1, 0.0D0, 0.0D0, 1, 1, 0.0D0,
-     $                M, R, Z, 1, IW, Q, 26*N, IW( 2*N+1 ), 10*N-1,
+     $                M, R, Z, 1, IW, Q, 26*N, IW( 2*N+1 ), 0,
      $                INFO )
          CALL CHKXER( 'DSYEVR', INFOT, NOUT, LERR, OK )
          NT = NT + 11
diff --git a/TESTING/EIG/dget02.f b/TESTING/EIG/dget02.f
index b1f2995562..74395c0ea7 100644
--- a/TESTING/EIG/dget02.f
+++ b/TESTING/EIG/dget02.f
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE DGET02( TRANS, M, N, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dget10.f b/TESTING/EIG/dget10.f
index 684172f6b8..1233dd0805 100644
--- a/TESTING/EIG/dget10.f
+++ b/TESTING/EIG/dget10.f
@@ -90,6 +90,7 @@
 *
 *  =====================================================================
       SUBROUTINE DGET10( M, N, A, LDA, B, LDB, WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dget22.f b/TESTING/EIG/dget22.f
index e19552ff78..ff52d3917a 100644
--- a/TESTING/EIG/dget22.f
+++ b/TESTING/EIG/dget22.f
@@ -165,6 +165,7 @@
 *  =====================================================================
       SUBROUTINE DGET22( TRANSA, TRANSE, TRANSW, N, A, LDA, E, LDE, WR,
      $                   WI, WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dget23.f b/TESTING/EIG/dget23.f
index 2151669046..6588dfadd7 100644
--- a/TESTING/EIG/dget23.f
+++ b/TESTING/EIG/dget23.f
@@ -375,6 +375,7 @@ SUBROUTINE DGET23( COMP, BALANC, JTYPE, THRESH, ISEED, NOUNIT, N,
      $                   LDVR, LRE, LDLRE, RCONDV, RCNDV1, RCDVIN,
      $                   RCONDE, RCNDE1, RCDEIN, SCALE, SCALE1, RESULT,
      $                   WORK, LWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dget24.f b/TESTING/EIG/dget24.f
index eeb9109e9c..3b2f1eb440 100644
--- a/TESTING/EIG/dget24.f
+++ b/TESTING/EIG/dget24.f
@@ -340,6 +340,7 @@ SUBROUTINE DGET24( COMP, JTYPE, THRESH, ISEED, NOUNIT, N, A, LDA,
      $                   H, HT, WR, WI, WRT, WIT, WRTMP, WITMP, VS,
      $                   LDVS, VS1, RCDEIN, RCDVIN, NSLCT, ISLCT,
      $                   RESULT, WORK, LWORK, IWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dget31.f b/TESTING/EIG/dget31.f
index b952a91d24..3b0420d513 100644
--- a/TESTING/EIG/dget31.f
+++ b/TESTING/EIG/dget31.f
@@ -65,7 +65,7 @@
 *>
 *> \param[out] NINFO
 *> \verbatim
-*>          NINFO is INTEGER array, dimension (3)
+*>          NINFO is INTEGER array, dimension (2)
 *>          NINFO(1) = number of examples with INFO less than 0
 *>          NINFO(2) = number of examples with INFO greater than 0
 *> \endverbatim
@@ -88,6 +88,7 @@
 *
 *  =====================================================================
       SUBROUTINE DGET31( RMAX, LMAX, NINFO, KNT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -130,7 +131,7 @@ SUBROUTINE DGET31( RMAX, LMAX, NINFO, KNT )
       EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLALN2
+      EXTERNAL           DLALN2
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
@@ -146,7 +147,6 @@ SUBROUTINE DGET31( RMAX, LMAX, NINFO, KNT )
       UNFL = DLAMCH( 'U' )
       SMLNUM = DLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Set up test case parameters
 *
diff --git a/TESTING/EIG/dget32.f b/TESTING/EIG/dget32.f
index faf1773bbd..8672d33610 100644
--- a/TESTING/EIG/dget32.f
+++ b/TESTING/EIG/dget32.f
@@ -79,6 +79,7 @@
 *
 *  =====================================================================
       SUBROUTINE DGET32( RMAX, LMAX, NINFO, KNT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -114,7 +115,7 @@ SUBROUTINE DGET32( RMAX, LMAX, NINFO, KNT )
       EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLASY2
+      EXTERNAL           DLASY2
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, SQRT
@@ -131,7 +132,6 @@ SUBROUTINE DGET32( RMAX, LMAX, NINFO, KNT )
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Set up test case parameters
 *
diff --git a/TESTING/EIG/dget33.f b/TESTING/EIG/dget33.f
index c4f3b69ce2..f10f58525e 100644
--- a/TESTING/EIG/dget33.f
+++ b/TESTING/EIG/dget33.f
@@ -73,6 +73,7 @@
 *
 *  =====================================================================
       SUBROUTINE DGET33( RMAX, LMAX, NINFO, KNT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -105,7 +106,7 @@ SUBROUTINE DGET33( RMAX, LMAX, NINFO, KNT )
       EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLANV2
+      EXTERNAL           DLANV2
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SIGN
@@ -117,7 +118,6 @@ SUBROUTINE DGET33( RMAX, LMAX, NINFO, KNT )
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Set up test case parameters
 *
diff --git a/TESTING/EIG/dget34.f b/TESTING/EIG/dget34.f
index 67f0df99fd..6d8a40e220 100644
--- a/TESTING/EIG/dget34.f
+++ b/TESTING/EIG/dget34.f
@@ -79,6 +79,7 @@
 *
 *  =====================================================================
       SUBROUTINE DGET34( RMAX, LMAX, NINFO, KNT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -116,7 +117,7 @@ SUBROUTINE DGET34( RMAX, LMAX, NINFO, KNT )
       EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DHST01, DLABAD, DLAEXC
+      EXTERNAL           DCOPY, DHST01, DLAEXC
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, MAX, SIGN, SQRT
@@ -128,7 +129,6 @@ SUBROUTINE DGET34( RMAX, LMAX, NINFO, KNT )
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Set up test case parameters
 *
diff --git a/TESTING/EIG/dget35.f b/TESTING/EIG/dget35.f
index a7908fca24..241ce43804 100644
--- a/TESTING/EIG/dget35.f
+++ b/TESTING/EIG/dget35.f
@@ -75,6 +75,7 @@
 *
 *  =====================================================================
       SUBROUTINE DGET35( RMAX, LMAX, NINFO, KNT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -110,7 +111,7 @@ SUBROUTINE DGET35( RMAX, LMAX, NINFO, KNT )
       EXTERNAL           DLAMCH, DLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DLABAD, DTRSYL
+      EXTERNAL           DGEMM, DTRSYL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, MAX, SIN, SQRT
@@ -133,7 +134,6 @@ SUBROUTINE DGET35( RMAX, LMAX, NINFO, KNT )
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )*FOUR / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Set up test case parameters
 *
diff --git a/TESTING/EIG/dget36.f b/TESTING/EIG/dget36.f
index 8725ae2e40..c79949ae78 100644
--- a/TESTING/EIG/dget36.f
+++ b/TESTING/EIG/dget36.f
@@ -85,6 +85,7 @@
 *
 *  =====================================================================
       SUBROUTINE DGET36( RMAX, LMAX, NINFO, KNT, NIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dget37.f b/TESTING/EIG/dget37.f
index fbdf50be22..2eb80ea726 100644
--- a/TESTING/EIG/dget37.f
+++ b/TESTING/EIG/dget37.f
@@ -87,6 +87,7 @@
 *
 *  =====================================================================
       SUBROUTINE DGET37( RMAX, LMAX, NINFO, KNT, NIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -131,8 +132,8 @@ SUBROUTINE DGET37( RMAX, LMAX, NINFO, KNT, NIN )
       EXTERNAL           DLAMCH, DLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEHRD, DHSEQR, DLABAD, DLACPY, DSCAL,
-     $                   DTREVC, DTRSNA
+      EXTERNAL           DCOPY, DGEHRD, DHSEQR, DLACPY, DSCAL, DTREVC,
+     $                   DTRSNA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, MAX, SQRT
@@ -142,7 +143,6 @@ SUBROUTINE DGET37( RMAX, LMAX, NINFO, KNT, NIN )
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     EPSIN = 2**(-24) = precision to which input data computed
 *
diff --git a/TESTING/EIG/dget38.f b/TESTING/EIG/dget38.f
index a0fb6daec0..f81d601324 100644
--- a/TESTING/EIG/dget38.f
+++ b/TESTING/EIG/dget38.f
@@ -88,6 +88,7 @@
 *
 *  =====================================================================
       SUBROUTINE DGET38( RMAX, LMAX, NINFO, KNT, NIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -134,8 +135,8 @@ SUBROUTINE DGET38( RMAX, LMAX, NINFO, KNT, NIN )
       EXTERNAL           DLAMCH, DLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEHRD, DHSEQR, DHST01, DLABAD, DLACPY,
-     $                   DORGHR, DSCAL, DTRSEN
+      EXTERNAL           DCOPY, DGEHRD, DHSEQR, DHST01, DLACPY, DORGHR,
+     $                   DSCAL, DTRSEN
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, MAX, SQRT
@@ -145,7 +146,6 @@ SUBROUTINE DGET38( RMAX, LMAX, NINFO, KNT, NIN )
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     EPSIN = 2**(-24) = precision to which input data computed
 *
diff --git a/TESTING/EIG/dget39.f b/TESTING/EIG/dget39.f
index 773d39c71d..0dc3977862 100644
--- a/TESTING/EIG/dget39.f
+++ b/TESTING/EIG/dget39.f
@@ -100,6 +100,7 @@
 *
 *  =====================================================================
       SUBROUTINE DGET39( RMAX, LMAX, NINFO, KNT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -130,7 +131,7 @@ SUBROUTINE DGET39( RMAX, LMAX, NINFO, KNT )
       EXTERNAL           IDAMAX, DASUM, DDOT, DLAMCH, DLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEMV, DLABAD, DLAQTR
+      EXTERNAL           DCOPY, DGEMV, DLAQTR
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, COS, DBLE, MAX, SIN, SQRT
@@ -159,7 +160,6 @@ SUBROUTINE DGET39( RMAX, LMAX, NINFO, KNT )
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Set up test case parameters
 *
diff --git a/TESTING/EIG/dget40.f b/TESTING/EIG/dget40.f
index 4d087f5240..f0b6cacd0f 100644
--- a/TESTING/EIG/dget40.f
+++ b/TESTING/EIG/dget40.f
@@ -15,7 +15,7 @@
 *      DOUBLE PRECISION   RMAX
 *      ..
 *       .. Array Arguments ..
-*      INTEGER            NINFO( 3 )
+*      INTEGER            NINFO( 2 )
 *
 *
 *> \par Purpose:
@@ -53,8 +53,9 @@
 *>
 *> \param[out] NINFO
 *> \verbatim
-*>          NINFO is INTEGER(3)
-*>          Number of examples where INFO is nonzero.
+*>          NINFO is INTEGER array, dimension (2)
+*>          NINFO( 1 ) = DTGEXC without accumulation returned INFO nonzero
+*>          NINFO( 2 ) = DTGEXC with accumulation returned INFO nonzero
 *> \endverbatim
 *>
 *> \param[out] KNT
@@ -63,9 +64,10 @@
 *>          Total number of examples tested.
 *> \endverbatim
 *>
-*> \param[out] NIN
+*> \param[in] NIN
 *> \verbatim
-*>          NINFO is INTEGER
+*>          NIN is INTEGER
+*>          Input logical unit number.
 *> \endverbatim
 *
 *  Authors:
@@ -80,6 +82,7 @@
 *
 *  =====================================================================
       SUBROUTINE DGET40( RMAX, LMAX, NINFO, KNT, NIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -90,7 +93,7 @@ SUBROUTINE DGET40( RMAX, LMAX, NINFO, KNT, NIN )
       DOUBLE PRECISION   RMAX
 *     ..
 *     .. Array Arguments ..
-      INTEGER            NINFO( 3 )
+      INTEGER            NINFO( 2 )
 *     ..
 *
 *  =====================================================================
@@ -103,7 +106,7 @@ SUBROUTINE DGET40( RMAX, LMAX, NINFO, KNT, NIN )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I, IFST, IFST1, IFST2, IFSTSV, ILST, ILST1,
-     $                   ILST2, ILSTSV, INFO1, INFO2, J, LOC, N
+     $                   ILST2, ILSTSV, J, LOC, N
       DOUBLE PRECISION   EPS, RES
 *     ..
 *     .. Local Arrays ..
@@ -130,7 +133,6 @@ SUBROUTINE DGET40( RMAX, LMAX, NINFO, KNT, NIN )
       KNT = 0
       NINFO( 1 ) = 0
       NINFO( 2 ) = 0
-      NINFO( 3 ) = 0
 *
 *     Read input data until N=0
 *
@@ -164,7 +166,7 @@ SUBROUTINE DGET40( RMAX, LMAX, NINFO, KNT, NIN )
       CALL DLASET( 'Full', N, N, ZERO, ONE, Q, LDT )
       CALL DLASET( 'Full', N, N, ZERO, ONE, Z, LDT )
       CALL DTGEXC( .FALSE., .FALSE., N, T1, LDT, S1, LDT, Q, LDT,
-     $             Z, LDT, IFST1, ILST1, WORK, LWORK, INFO1 )
+     $             Z, LDT, IFST1, ILST1, WORK, LWORK, NINFO ( 1 ) )
       DO 40 I = 1, N
          DO 30 J = 1, N
             IF( I.EQ.J .AND. Q( I, J ).NE.ONE )
@@ -183,7 +185,7 @@ SUBROUTINE DGET40( RMAX, LMAX, NINFO, KNT, NIN )
       CALL DLASET( 'Full', N, N, ZERO, ONE, Q, LDT )
       CALL DLASET( 'Full', N, N, ZERO, ONE, Z, LDT )
       CALL DTGEXC( .TRUE., .TRUE., N, T2, LDT, S2, LDT, Q, LDT,
-     $             Z, LDT, IFST2, ILST2, WORK, LWORK, INFO2 )
+     $             Z, LDT, IFST2, ILST2, WORK, LWORK, NINFO ( 2 ) )
 *
 *     Compare T1 with T2 and S1 with S2
 *
@@ -199,7 +201,7 @@ SUBROUTINE DGET40( RMAX, LMAX, NINFO, KNT, NIN )
      $   RES = RES + ONE / EPS
       IF( ILST1.NE.ILST2 )
      $   RES = RES + ONE / EPS
-      IF( INFO1.NE.INFO2 )
+      IF( NINFO( 1 ).NE.NINFO( 2 ) )
      $   RES = RES + ONE / EPS
 *
 *     Test orthogonality of Q and Z and backward error on T2 and S2
diff --git a/TESTING/EIG/dget51.f b/TESTING/EIG/dget51.f
index 27a4030161..4a4433e248 100644
--- a/TESTING/EIG/dget51.f
+++ b/TESTING/EIG/dget51.f
@@ -146,6 +146,7 @@
 *  =====================================================================
       SUBROUTINE DGET51( ITYPE, N, A, LDA, B, LDB, U, LDU, V, LDV, WORK,
      $                   RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dget52.f b/TESTING/EIG/dget52.f
index 68196f5f3b..52945a252e 100644
--- a/TESTING/EIG/dget52.f
+++ b/TESTING/EIG/dget52.f
@@ -196,6 +196,7 @@
 *  =====================================================================
       SUBROUTINE DGET52( LEFT, N, A, LDA, B, LDB, E, LDE, ALPHAR,
      $                   ALPHAI, BETA, WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -293,7 +294,7 @@ SUBROUTINE DGET52( LEFT, N, A, LDA, B, LDB, E, LDE, ALPHAR,
                BCOEFR = SCALE*SALFR
                CALL DGEMV( TRANS, N, N, ACOEF, A, LDA, E( 1, JVEC ), 1,
      $                     ZERO, WORK( N*( JVEC-1 )+1 ), 1 )
-               CALL DGEMV( TRANS, N, N, -BCOEFR, B, LDA, E( 1, JVEC ),
+               CALL DGEMV( TRANS, N, N, -BCOEFR, B, LDB, E( 1, JVEC ),
      $                     1, ONE, WORK( N*( JVEC-1 )+1 ), 1 )
             ELSE
 *
@@ -323,16 +324,16 @@ SUBROUTINE DGET52( LEFT, N, A, LDA, B, LDB, E, LDE, ALPHAR,
 *
                CALL DGEMV( TRANS, N, N, ACOEF, A, LDA, E( 1, JVEC ), 1,
      $                     ZERO, WORK( N*( JVEC-1 )+1 ), 1 )
-               CALL DGEMV( TRANS, N, N, -BCOEFR, B, LDA, E( 1, JVEC ),
+               CALL DGEMV( TRANS, N, N, -BCOEFR, B, LDB, E( 1, JVEC ),
      $                     1, ONE, WORK( N*( JVEC-1 )+1 ), 1 )
-               CALL DGEMV( TRANS, N, N, BCOEFI, B, LDA, E( 1, JVEC+1 ),
+               CALL DGEMV( TRANS, N, N, BCOEFI, B, LDB, E( 1, JVEC+1 ),
      $                     1, ONE, WORK( N*( JVEC-1 )+1 ), 1 )
 *
                CALL DGEMV( TRANS, N, N, ACOEF, A, LDA, E( 1, JVEC+1 ),
      $                     1, ZERO, WORK( N*JVEC+1 ), 1 )
-               CALL DGEMV( TRANS, N, N, -BCOEFI, B, LDA, E( 1, JVEC ),
+               CALL DGEMV( TRANS, N, N, -BCOEFI, B, LDB, E( 1, JVEC ),
      $                     1, ONE, WORK( N*JVEC+1 ), 1 )
-               CALL DGEMV( TRANS, N, N, -BCOEFR, B, LDA, E( 1, JVEC+1 ),
+               CALL DGEMV( TRANS, N, N, -BCOEFR, B, LDB, E( 1, JVEC+1 ),
      $                     1, ONE, WORK( N*JVEC+1 ), 1 )
             END IF
          END IF
diff --git a/TESTING/EIG/dget53.f b/TESTING/EIG/dget53.f
index ca0e830a78..b6d526f405 100644
--- a/TESTING/EIG/dget53.f
+++ b/TESTING/EIG/dget53.f
@@ -123,6 +123,7 @@
 *
 *  =====================================================================
       SUBROUTINE DGET53( A, LDA, B, LDB, SCALE, WR, WI, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dget54.f b/TESTING/EIG/dget54.f
index 5ea5933102..c4f49b7158 100644
--- a/TESTING/EIG/dget54.f
+++ b/TESTING/EIG/dget54.f
@@ -153,6 +153,7 @@
 *  =====================================================================
       SUBROUTINE DGET54( N, A, LDA, B, LDB, S, LDS, T, LDT, U, LDU, V,
      $                   LDV, WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dglmts.f b/TESTING/EIG/dglmts.f
index 0286a757cd..d2d24fea35 100644
--- a/TESTING/EIG/dglmts.f
+++ b/TESTING/EIG/dglmts.f
@@ -143,6 +143,7 @@
 *  =====================================================================
       SUBROUTINE DGLMTS( N, M, P, A, AF, LDA, B, BF, LDB, D, DF, X, U,
      $                   WORK, LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dgqrts.f b/TESTING/EIG/dgqrts.f
index 4ea8a0ec94..8b26736265 100644
--- a/TESTING/EIG/dgqrts.f
+++ b/TESTING/EIG/dgqrts.f
@@ -173,6 +173,7 @@
 *  =====================================================================
       SUBROUTINE DGQRTS( N, M, P, A, AF, Q, R, LDA, TAUA, B, BF, Z, T,
      $                   BWK, LDB, TAUB, WORK, LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dgrqts.f b/TESTING/EIG/dgrqts.f
index c69aeee230..10ea0e5f69 100644
--- a/TESTING/EIG/dgrqts.f
+++ b/TESTING/EIG/dgrqts.f
@@ -173,6 +173,7 @@
 *  =====================================================================
       SUBROUTINE DGRQTS( M, P, N, A, AF, Q, R, LDA, TAUA, B, BF, Z, T,
      $                   BWK, LDB, TAUB, WORK, LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dgsvts3.f b/TESTING/EIG/dgsvts3.f
index 8a0ebac03d..47fc3465cd 100644
--- a/TESTING/EIG/dgsvts3.f
+++ b/TESTING/EIG/dgsvts3.f
@@ -207,6 +207,7 @@
       SUBROUTINE DGSVTS3( M, P, N, A, AF, LDA, B, BF, LDB, U, LDU, V,
      $                    LDV, Q, LDQ, ALPHA, BETA, R, LDR, IWORK, WORK,
      $                    LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dhst01.f b/TESTING/EIG/dhst01.f
index 79925881b0..26aa14b263 100644
--- a/TESTING/EIG/dhst01.f
+++ b/TESTING/EIG/dhst01.f
@@ -131,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE DHST01( N, ILO, IHI, A, LDA, H, LDH, Q, LDQ, WORK,
      $                   LWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -159,7 +160,7 @@ SUBROUTINE DHST01( N, ILO, IHI, A, LDA, H, LDH, Q, LDQ, WORK,
       EXTERNAL           DLAMCH, DLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DLABAD, DLACPY, DORT01
+      EXTERNAL           DGEMM, DLACPY, DORT01
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -177,7 +178,6 @@ SUBROUTINE DHST01( N, ILO, IHI, A, LDA, H, LDH, Q, LDQ, WORK,
       UNFL = DLAMCH( 'Safe minimum' )
       EPS = DLAMCH( 'Precision' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       SMLNUM = UNFL*N / EPS
 *
 *     Test 1:  Compute norm( A - Q*H*Q' ) / ( norm(A) * N * EPS )
diff --git a/TESTING/EIG/dlafts.f b/TESTING/EIG/dlafts.f
index 64a0bfc52f..586ed52ece 100644
--- a/TESTING/EIG/dlafts.f
+++ b/TESTING/EIG/dlafts.f
@@ -96,6 +96,7 @@
 *  =====================================================================
       SUBROUTINE DLAFTS( TYPE, M, N, IMAT, NTESTS, RESULT, ISEED,
      $                   THRESH, IOUNIT, IE )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dlahd2.f b/TESTING/EIG/dlahd2.f
index a6c65635f0..1e0dd71ba8 100644
--- a/TESTING/EIG/dlahd2.f
+++ b/TESTING/EIG/dlahd2.f
@@ -62,6 +62,7 @@
 *
 *  =====================================================================
       SUBROUTINE DLAHD2( IOUNIT, PATH )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -534,8 +535,8 @@ SUBROUTINE DLAHD2( IOUNIT, PATH )
      $      / ' 2: norm( I - Q'' Q )   / ( m ulp )',
      $      / ' 3: norm( I - PT PT'' )   / ( n ulp )',
      $      / ' 4: norm( Y - Q'' C )   / ( norm(Y) max(m,nrhs) ulp )' )
- 9968 FORMAT( / ' Tests performed:  See sdrvst.f' )
- 9967 FORMAT( / ' Tests performed:  See cdrvst.f' )
+ 9968 FORMAT( / ' Tests performed:  See ddrvst.f' )
+ 9967 FORMAT( / ' Tests performed:  See zdrvst.f' )
 *
 *     End of DLAHD2
 *
diff --git a/TESTING/EIG/dlarfy.f b/TESTING/EIG/dlarfy.f
index dc0e328e79..7761fa4fa5 100644
--- a/TESTING/EIG/dlarfy.f
+++ b/TESTING/EIG/dlarfy.f
@@ -105,6 +105,7 @@
 *
 *  =====================================================================
       SUBROUTINE DLARFY( UPLO, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dlarhs.f b/TESTING/EIG/dlarhs.f
index bc048bbcfe..7ef614dff4 100644
--- a/TESTING/EIG/dlarhs.f
+++ b/TESTING/EIG/dlarhs.f
@@ -202,6 +202,7 @@
 *  =====================================================================
       SUBROUTINE DLARHS( PATH, XTYPE, UPLO, TRANS, M, N, KL, KU, NRHS,
      $                   A, LDA, X, LDX, B, LDB, ISEED, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dlasum.f b/TESTING/EIG/dlasum.f
index d5b8717b48..4523b42efa 100644
--- a/TESTING/EIG/dlasum.f
+++ b/TESTING/EIG/dlasum.f
@@ -40,6 +40,7 @@
 *
 *  =====================================================================
       SUBROUTINE DLASUM( TYPE, IOUNIT, IE, NRUN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dlatb9.f b/TESTING/EIG/dlatb9.f
index 70647889b4..22be069fe9 100644
--- a/TESTING/EIG/dlatb9.f
+++ b/TESTING/EIG/dlatb9.f
@@ -167,6 +167,7 @@
       SUBROUTINE DLATB9( PATH, IMAT, M, P, N, TYPE, KLA, KUA, KLB, KUB,
      $                   ANORM, BNORM, MODEA, MODEB, CNDNMA, CNDNMB,
      $                   DISTA, DISTB )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -199,9 +200,6 @@ SUBROUTINE DLATB9( PATH, IMAT, M, P, N, TYPE, KLA, KUA, KLB, KUB,
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           DLABAD
-*     ..
 *     .. Save statement ..
       SAVE               EPS, SMALL, LARGE, BADC1, BADC2, FIRST
 *     ..
@@ -219,11 +217,6 @@ SUBROUTINE DLATB9( PATH, IMAT, M, P, N, TYPE, KLA, KUA, KLB, KUB,
          BADC1 = SQRT( BADC2 )
          SMALL = DLAMCH( 'Safe minimum' )
          LARGE = ONE / SMALL
-*
-*        If it looks like we're on a Cray, take the square root of
-*        SMALL and LARGE to avoid overflow and underflow problems.
-*
-         CALL DLABAD( SMALL, LARGE )
          SMALL = SHRINK*( SMALL / EPS )
          LARGE = ONE / SMALL
       END IF
diff --git a/TESTING/EIG/dlatm4.f b/TESTING/EIG/dlatm4.f
index 266c10ff18..4a028e5a81 100644
--- a/TESTING/EIG/dlatm4.f
+++ b/TESTING/EIG/dlatm4.f
@@ -172,6 +172,7 @@
 *  =====================================================================
       SUBROUTINE DLATM4( ITYPE, N, NZ1, NZ2, ISIGN, AMAGN, RCOND,
      $                   TRIANG, IDIST, ISEED, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dlctes.f b/TESTING/EIG/dlctes.f
index 039dfb2aac..4317b076a2 100644
--- a/TESTING/EIG/dlctes.f
+++ b/TESTING/EIG/dlctes.f
@@ -65,6 +65,7 @@
 *
 *  =====================================================================
       LOGICAL          FUNCTION DLCTES( ZR, ZI, D )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dlctsx.f b/TESTING/EIG/dlctsx.f
index 878262070b..b49f3cad46 100644
--- a/TESTING/EIG/dlctsx.f
+++ b/TESTING/EIG/dlctsx.f
@@ -62,6 +62,7 @@
 *
 *  =====================================================================
       LOGICAL          FUNCTION DLCTSX( AR, AI, BETA )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dlsets.f b/TESTING/EIG/dlsets.f
index 3616183a52..afb46a7276 100644
--- a/TESTING/EIG/dlsets.f
+++ b/TESTING/EIG/dlsets.f
@@ -148,6 +148,7 @@
 *  =====================================================================
       SUBROUTINE DLSETS( M, P, N, A, AF, LDA, B, BF, LDB, C, CF, D, DF,
      $                   X, WORK, LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dort01.f b/TESTING/EIG/dort01.f
index eb1d7a7ec2..19865a6857 100644
--- a/TESTING/EIG/dort01.f
+++ b/TESTING/EIG/dort01.f
@@ -113,6 +113,7 @@
 *
 *  =====================================================================
       SUBROUTINE DORT01( ROWCOL, M, N, U, LDU, WORK, LWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dort03.f b/TESTING/EIG/dort03.f
index a7ce1588ea..ae3c3090bf 100644
--- a/TESTING/EIG/dort03.f
+++ b/TESTING/EIG/dort03.f
@@ -153,6 +153,7 @@
 *  =====================================================================
       SUBROUTINE DORT03( RC, MU, MV, N, K, U, LDU, V, LDV, WORK, LWORK,
      $                   RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dsbt21.f b/TESTING/EIG/dsbt21.f
index 33a0c807b3..31b131f687 100644
--- a/TESTING/EIG/dsbt21.f
+++ b/TESTING/EIG/dsbt21.f
@@ -144,6 +144,7 @@
 *  =====================================================================
       SUBROUTINE DSBT21( UPLO, N, KA, KS, A, LDA, D, E, U, LDU, WORK,
      $                   RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dsgt01.f b/TESTING/EIG/dsgt01.f
index db76456c6b..2f4fd8d8eb 100644
--- a/TESTING/EIG/dsgt01.f
+++ b/TESTING/EIG/dsgt01.f
@@ -143,6 +143,7 @@
 *  =====================================================================
       SUBROUTINE DSGT01( ITYPE, UPLO, N, M, A, LDA, B, LDB, Z, LDZ, D,
      $                   WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dslect.f b/TESTING/EIG/dslect.f
index e2ef8df887..e74998d011 100644
--- a/TESTING/EIG/dslect.f
+++ b/TESTING/EIG/dslect.f
@@ -59,6 +59,7 @@
 *
 *  =====================================================================
       LOGICAL          FUNCTION DSLECT( ZR, ZI )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dspt21.f b/TESTING/EIG/dspt21.f
index 7fba320f4d..3d97af27c0 100644
--- a/TESTING/EIG/dspt21.f
+++ b/TESTING/EIG/dspt21.f
@@ -218,6 +218,7 @@
 *  =====================================================================
       SUBROUTINE DSPT21( ITYPE, UPLO, N, KBAND, AP, D, E, U, LDU, VP,
      $                   TAU, WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dstech.f b/TESTING/EIG/dstech.f
index 00a1406ea6..15487a824a 100644
--- a/TESTING/EIG/dstech.f
+++ b/TESTING/EIG/dstech.f
@@ -98,6 +98,7 @@
 *
 *  =====================================================================
       SUBROUTINE DSTECH( N, A, B, EIG, TOL, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dstect.f b/TESTING/EIG/dstect.f
index d23f8dc4ba..32f0d9eafe 100644
--- a/TESTING/EIG/dstect.f
+++ b/TESTING/EIG/dstect.f
@@ -79,6 +79,7 @@
 *
 *  =====================================================================
       SUBROUTINE DSTECT( N, A, B, SHIFT, NUM )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dstt21.f b/TESTING/EIG/dstt21.f
index 6eca6e6b7a..4fb78c3985 100644
--- a/TESTING/EIG/dstt21.f
+++ b/TESTING/EIG/dstt21.f
@@ -124,6 +124,7 @@
 *  =====================================================================
       SUBROUTINE DSTT21( N, KBAND, AD, AE, SD, SE, U, LDU, WORK,
      $                   RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dstt22.f b/TESTING/EIG/dstt22.f
index fc68590cf2..4521e44845 100644
--- a/TESTING/EIG/dstt22.f
+++ b/TESTING/EIG/dstt22.f
@@ -136,6 +136,7 @@
 *  =====================================================================
       SUBROUTINE DSTT22( N, M, KBAND, AD, AE, SD, SE, U, LDU, WORK,
      $                   LDWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dsvdch.f b/TESTING/EIG/dsvdch.f
index 58cfb5cb69..db8b7eba07 100644
--- a/TESTING/EIG/dsvdch.f
+++ b/TESTING/EIG/dsvdch.f
@@ -94,6 +94,7 @@
 *
 *  =====================================================================
       SUBROUTINE DSVDCH( N, S, E, SVD, TOL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dsvdct.f b/TESTING/EIG/dsvdct.f
index 6f87c5712c..44bf7a1c4e 100644
--- a/TESTING/EIG/dsvdct.f
+++ b/TESTING/EIG/dsvdct.f
@@ -84,6 +84,7 @@
 *
 *  =====================================================================
       SUBROUTINE DSVDCT( N, S, E, SHIFT, NUM )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dsxt1.f b/TESTING/EIG/dsxt1.f
index 97b323ca0b..3826e02c08 100644
--- a/TESTING/EIG/dsxt1.f
+++ b/TESTING/EIG/dsxt1.f
@@ -103,6 +103,7 @@
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DSXT1( IJOB, D1, N1, D2, N2, ABSTOL,
      $                 ULP, UNFL )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dsyl01.f b/TESTING/EIG/dsyl01.f
new file mode 100644
index 0000000000..0ea4813822
--- /dev/null
+++ b/TESTING/EIG/dsyl01.f
@@ -0,0 +1,311 @@
+*> \brief \b DSYL01
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DSYL01( THRESH, NFAIL, RMAX, NINFO, KNT )
+*
+*       .. Scalar Arguments ..
+*       INTEGER            KNT
+*       DOUBLE PRECISION   THRESH
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            NFAIL( 3 ), NINFO( 2 )
+*       DOUBLE PRECISION   RMAX( 2 )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> DSYL01 tests DTRSYL and DTRSYL3, routines for solving the Sylvester matrix
+*> equation
+*>
+*>    op(A)*X + ISGN*X*op(B) = scale*C,
+*>
+*> A and B are assumed to be in Schur canonical form, op() represents an
+*> optional transpose, and ISGN can be -1 or +1.  Scale is an output
+*> less than or equal to 1, chosen to avoid overflow in X.
+*>
+*> The test code verifies that the following residual does not exceed
+*> the provided threshold:
+*>
+*>    norm(op(A)*X + ISGN*X*op(B) - scale*C) /
+*>        (EPS*max(norm(A),norm(B))*norm(X))
+*>
+*> This routine complements DGET35 by testing with larger,
+*> random matrices, of which some require rescaling of X to avoid overflow.
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] THRESH
+*> \verbatim
+*>          THRESH is DOUBLE PRECISION
+*>          A test will count as "failed" if the residual, computed as
+*>          described above, exceeds THRESH.
+*> \endverbatim
+*>
+*> \param[out] NFAIL
+*> \verbatim
+*>          NFAIL is INTEGER array, dimension (3)
+*>          NFAIL(1) = No. of times residual DTRSYL exceeds threshold THRESH
+*>          NFAIL(2) = No. of times residual DTRSYL3 exceeds threshold THRESH
+*>          NFAIL(3) = No. of times DTRSYL3 and DTRSYL deviate
+*> \endverbatim
+*>
+*> \param[out] RMAX
+*> \verbatim
+*>          RMAX is DOUBLE PRECISION, dimension (2)
+*>          RMAX(1) = Value of the largest test ratio of DTRSYL
+*>          RMAX(2) = Value of the largest test ratio of DTRSYL3
+*> \endverbatim
+*>
+*> \param[out] NINFO
+*> \verbatim
+*>          NINFO is INTEGER array, dimension (2)
+*>          NINFO(1) = No. of times DTRSYL returns an expected INFO
+*>          NINFO(2) = No. of times DTRSYL3 returns an expected INFO
+*> \endverbatim
+*>
+*> \param[out] KNT
+*> \verbatim
+*>          KNT is INTEGER
+*>          Total number of examples tested.
+*> \endverbatim
+
+*
+*  -- LAPACK test routine --
+      SUBROUTINE DSYL01( THRESH, NFAIL, RMAX, NINFO, KNT )
+      IMPLICIT NONE
+*
+*  -- LAPACK test routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            KNT
+      DOUBLE PRECISION   THRESH
+*     ..
+*     .. Array Arguments ..
+      INTEGER            NFAIL( 3 ), NINFO( 2 )
+      DOUBLE PRECISION   RMAX( 2 )
+*     ..
+*
+*  =====================================================================
+*     ..
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+      INTEGER            MAXM, MAXN, LDSWORK
+      PARAMETER          ( MAXM = 245, MAXN = 192, LDSWORK = 36 )
+*     ..
+*     .. Local Scalars ..
+      CHARACTER          TRANA, TRANB
+      INTEGER            I, INFO, IINFO, ISGN, ITRANA, ITRANB, J, KLA,
+     $                   KUA, KLB, KUB, LIWORK, M, N
+      DOUBLE PRECISION   ANRM, BNRM, BIGNUM, EPS, RES, RES1, RMUL,
+     $                   SCALE, SCALE3, SMLNUM, TNRM, XNRM
+*     ..
+*     .. Local Arrays ..
+      DOUBLE PRECISION   DUML( MAXM ), DUMR( MAXN ),
+     $                   D( MAX( MAXM, MAXN ) ), DUM( MAXN ),
+     $                   VM( 2 )
+      INTEGER            ISEED( 4 ), IWORK( MAXM + MAXN + 2 )
+*     ..
+*     .. Allocatable Arrays ..
+      INTEGER            AllocateStatus
+      DOUBLE PRECISION, DIMENSION(:,:), ALLOCATABLE :: A, B, C, CC, X,
+     $                   SWORK
+*     ..
+*     .. External Functions ..
+      LOGICAL            DISNAN
+      DOUBLE PRECISION   DLAMCH, DLANGE
+      EXTERNAL           DLAMCH, DLANGE
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DLATMR, DLACPY, DGEMM, DTRSYL, DTRSYL3
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, MAX
+*     ..
+*     .. Allocate memory dynamically ..
+      ALLOCATE ( A( MAXM, MAXM ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( B( MAXN, MAXN ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( C( MAXM, MAXN ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( CC( MAXM, MAXN ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( X( MAXM, MAXN ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( SWORK( LDSWORK, 126 ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+*     ..
+*     .. Executable Statements ..
+*
+*     Get machine parameters
+*
+      EPS = DLAMCH( 'P' )
+      SMLNUM = DLAMCH( 'S' ) / EPS
+      BIGNUM = ONE / SMLNUM
+*
+      VM( 1 ) = ONE
+      VM( 2 ) = 0.000001D+0
+*
+*     Begin test loop
+*
+      NINFO( 1 ) = 0
+      NINFO( 2 ) = 0
+      NFAIL( 1 ) = 0
+      NFAIL( 2 ) = 0
+      NFAIL( 3 ) = 0
+      RMAX( 1 ) = ZERO
+      RMAX( 2 ) = ZERO
+      KNT = 0
+      DO I = 1, 4
+         ISEED( I ) = 1
+      END DO
+      SCALE = ONE
+      SCALE3 = ONE
+      LIWORK = MAXM + MAXN + 2
+      DO J = 1, 2
+         DO ISGN = -1, 1, 2
+*           Reset seed (overwritten by LATMR)
+            DO I = 1, 4
+               ISEED( I ) = 1
+            END DO
+            DO M = 32, MAXM, 71
+               KLA = 0
+               KUA = M - 1
+               CALL DLATMR( M, M, 'S', ISEED, 'N', D,
+     $                      6, ONE, ONE, 'T', 'N',
+     $                      DUML, 1, ONE, DUMR, 1, ONE,
+     $                      'N', IWORK, KLA, KUA, ZERO,
+     $                      ONE, 'NO', A, MAXM, IWORK, IINFO )
+               DO I = 1, M
+                  A( I, I ) = A( I, I ) * VM( J )
+               END DO
+               ANRM = DLANGE( 'M', M, M, A, MAXM, DUM )
+               DO N = 51, MAXN, 47
+                  KLB = 0
+                  KUB = N - 1
+                  CALL DLATMR( N, N, 'S', ISEED, 'N', D,
+     $                         6, ONE, ONE, 'T', 'N',
+     $                         DUML, 1, ONE, DUMR, 1, ONE,
+     $                         'N', IWORK, KLB, KUB, ZERO,
+     $                         ONE, 'NO', B, MAXN, IWORK, IINFO )
+                  BNRM = DLANGE( 'M', N, N, B, MAXN, DUM )
+                  TNRM = MAX( ANRM, BNRM )
+                  CALL DLATMR( M, N, 'S', ISEED, 'N', D,
+     $                         6, ONE, ONE, 'T', 'N',
+     $                         DUML, 1, ONE, DUMR, 1, ONE,
+     $                         'N', IWORK, M, N, ZERO, ONE,
+     $                         'NO', C, MAXM, IWORK, IINFO )
+                  DO ITRANA = 1, 2
+                     IF( ITRANA.EQ.1 ) THEN
+                        TRANA = 'N'
+                     END IF
+                     IF( ITRANA.EQ.2 ) THEN
+                        TRANA = 'T'
+                     END IF
+                     DO ITRANB = 1, 2
+                        IF( ITRANB.EQ.1 ) THEN
+                           TRANB = 'N'
+                        END IF
+                        IF( ITRANB.EQ.2 ) THEN
+                           TRANB = 'T'
+                        END IF
+                        KNT = KNT + 1
+*
+                        CALL DLACPY( 'All', M, N, C, MAXM, X, MAXM)
+                        CALL DLACPY( 'All', M, N, C, MAXM, CC, MAXM)
+                        CALL DTRSYL( TRANA, TRANB, ISGN, M, N, 
+     $                               A, MAXM, B, MAXN, X, MAXM,
+     $                               SCALE, IINFO )
+                        IF( IINFO.NE.0 )
+     $                     NINFO( 1 ) = NINFO( 1 ) + 1
+                        XNRM = DLANGE( 'M', M, N, X, MAXM, DUM )
+                        RMUL = ONE
+                        IF( XNRM.GT.ONE .AND. TNRM.GT.ONE ) THEN
+                           IF( XNRM.GT.BIGNUM / TNRM ) THEN
+                              RMUL = ONE / MAX( XNRM, TNRM )
+                           END IF
+                        END IF
+                        CALL DGEMM( TRANA, 'N', M, N, M, RMUL,
+     $                              A, MAXM, X, MAXM, -SCALE*RMUL,
+     $                              CC, MAXM )
+                        CALL DGEMM( 'N', TRANB, M, N, N,
+     $                               DBLE( ISGN )*RMUL, X, MAXM, B,
+     $                               MAXN, ONE, CC, MAXM )
+                        RES1 = DLANGE( 'M', M, N, CC, MAXM, DUM )
+                        RES = RES1 / MAX( SMLNUM, SMLNUM*XNRM,
+     $                              ( ( RMUL*TNRM )*EPS )*XNRM )
+                        IF( RES.GT.THRESH )
+     $                     NFAIL( 1 ) = NFAIL( 1 ) + 1
+                        IF( RES.GT.RMAX( 1 ) )
+     $                     RMAX( 1 ) = RES
+*
+                        CALL DLACPY( 'All', M, N, C, MAXM, X, MAXM )
+                        CALL DLACPY( 'All', M, N, C, MAXM, CC, MAXM )
+                        CALL DTRSYL3( TRANA, TRANB, ISGN, M, N,
+     $                                A, MAXM, B, MAXN, X, MAXM,
+     $                                SCALE3, IWORK, LIWORK,
+     $                                SWORK, LDSWORK, INFO)
+                        IF( INFO.NE.0 )
+     $                     NINFO( 2 ) = NINFO( 2 ) + 1
+                        XNRM = DLANGE( 'M', M, N, X, MAXM, DUM )
+                        RMUL = ONE
+                        IF( XNRM.GT.ONE .AND. TNRM.GT.ONE ) THEN
+                           IF( XNRM.GT.BIGNUM / TNRM ) THEN
+                              RMUL = ONE / MAX( XNRM, TNRM )
+                           END IF
+                        END IF
+                        CALL DGEMM( TRANA, 'N', M, N, M, RMUL,
+     $                              A, MAXM, X, MAXM, -SCALE3*RMUL,
+     $                              CC, MAXM )
+                        CALL DGEMM( 'N', TRANB, M, N, N,
+     $                              DBLE( ISGN )*RMUL, X, MAXM, B,
+     $                              MAXN, ONE, CC, MAXM )
+                        RES1 = DLANGE( 'M', M, N, CC, MAXM, DUM )
+                        RES = RES1 / MAX( SMLNUM, SMLNUM*XNRM,
+     $                             ( ( RMUL*TNRM )*EPS )*XNRM )
+*                       Verify that TRSYL3 only flushes if TRSYL flushes (but
+*                       there may be cases where TRSYL3 avoid flushing).
+                        IF( SCALE3.EQ.ZERO .AND. SCALE.GT.ZERO .OR. 
+     $                      IINFO.NE.INFO ) THEN
+                           NFAIL( 3 ) = NFAIL( 3 ) + 1
+                        END IF
+                        IF( RES.GT.THRESH .OR. DISNAN( RES ) )
+     $                     NFAIL( 2 ) = NFAIL( 2 ) + 1
+                        IF( RES.GT.RMAX( 2 ) )
+     $                     RMAX( 2 ) = RES
+                     END DO
+                  END DO
+               END DO
+            END DO
+         END DO
+      END DO
+*
+      DEALLOCATE (A, STAT = AllocateStatus)
+      DEALLOCATE (B, STAT = AllocateStatus)
+      DEALLOCATE (C, STAT = AllocateStatus)
+      DEALLOCATE (CC, STAT = AllocateStatus)
+      DEALLOCATE (X, STAT = AllocateStatus)
+      DEALLOCATE (SWORK, STAT = AllocateStatus)
+*
+      RETURN
+*
+*     End of DSYL01
+*
+      END
diff --git a/TESTING/EIG/dsyt21.f b/TESTING/EIG/dsyt21.f
index 86c506902d..9986323420 100644
--- a/TESTING/EIG/dsyt21.f
+++ b/TESTING/EIG/dsyt21.f
@@ -204,6 +204,7 @@
 *  =====================================================================
       SUBROUTINE DSYT21( ITYPE, UPLO, N, KBAND, A, LDA, D, E, U, LDU, V,
      $                   LDV, TAU, WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/dsyt22.f b/TESTING/EIG/dsyt22.f
index 5a98f90950..c1b19486a0 100644
--- a/TESTING/EIG/dsyt22.f
+++ b/TESTING/EIG/dsyt22.f
@@ -154,6 +154,7 @@
 *  =====================================================================
       SUBROUTINE DSYT22( ITYPE, UPLO, N, M, KBAND, A, LDA, D, E, U, LDU,
      $                   V, LDV, TAU, WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/ilaenv.f b/TESTING/EIG/ilaenv.f
index 2b6c6f0912..bbe3c88b2b 100644
--- a/TESTING/EIG/ilaenv.f
+++ b/TESTING/EIG/ilaenv.f
@@ -150,6 +150,7 @@
 *  =====================================================================
       INTEGER          FUNCTION ILAENV( ISPEC, NAME, OPTS, N1, N2, N3,
      $                 N4 )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -250,6 +251,7 @@ INTEGER          FUNCTION ILAENV( ISPEC, NAME, OPTS, N1, N2, N3,
       END
       INTEGER FUNCTION ILAENV2STAGE( ISPEC, NAME, OPTS, N1, N2,
      $                               N3, N4 )
+      IMPLICIT NONE
 *     .. Scalar Arguments ..
       CHARACTER*( * )    NAME, OPTS
       INTEGER            ISPEC, N1, N2, N3, N4
@@ -299,6 +301,7 @@ INTEGER FUNCTION ILAENV2STAGE( ISPEC, NAME, OPTS, N1, N2,
 *
       END
       INTEGER FUNCTION IPARMQ( ISPEC, NAME, OPTS, N, ILO, IHI, LWORK )
+      IMPLICIT NONE
 *
       INTEGER            INMIN, INWIN, INIBL, ISHFTS, IACC22
       PARAMETER          ( INMIN = 12, INWIN = 13, INIBL = 14,
diff --git a/TESTING/EIG/sbdt01.f b/TESTING/EIG/sbdt01.f
index fdc30a51ea..90c71a1d88 100644
--- a/TESTING/EIG/sbdt01.f
+++ b/TESTING/EIG/sbdt01.f
@@ -138,6 +138,7 @@
 *  =====================================================================
       SUBROUTINE SBDT01( M, N, KD, A, LDA, Q, LDQ, D, E, PT, LDPT, WORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sbdt02.f b/TESTING/EIG/sbdt02.f
index e86863f78b..acd41acc2d 100644
--- a/TESTING/EIG/sbdt02.f
+++ b/TESTING/EIG/sbdt02.f
@@ -109,6 +109,7 @@
 *
 *  =====================================================================
       SUBROUTINE SBDT02( M, N, B, LDB, C, LDC, U, LDU, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sbdt03.f b/TESTING/EIG/sbdt03.f
index 1956325e99..d49737baad 100644
--- a/TESTING/EIG/sbdt03.f
+++ b/TESTING/EIG/sbdt03.f
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE SBDT03( UPLO, N, KD, D, E, U, LDU, S, VT, LDVT, WORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sbdt04.f b/TESTING/EIG/sbdt04.f
index a97cc28c1b..0111b1a644 100644
--- a/TESTING/EIG/sbdt04.f
+++ b/TESTING/EIG/sbdt04.f
@@ -128,6 +128,7 @@
 *  =====================================================================
       SUBROUTINE SBDT04( UPLO, N, D, E, S, NS, U, LDU, VT, LDVT, WORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sbdt05.f b/TESTING/EIG/sbdt05.f
index 121c35a90d..b4c91c2cb7 100644
--- a/TESTING/EIG/sbdt05.f
+++ b/TESTING/EIG/sbdt05.f
@@ -124,6 +124,7 @@
 *  =====================================================================
       SUBROUTINE SBDT05( M, N, A, LDA, S, NS, U, LDU,
      $                    VT, LDVT, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/schkbb.f b/TESTING/EIG/schkbb.f
index a3d48d7373..3d214b04b7 100644
--- a/TESTING/EIG/schkbb.f
+++ b/TESTING/EIG/schkbb.f
@@ -352,6 +352,7 @@ SUBROUTINE SCHKBB( NSIZES, MVAL, NVAL, NWDTHS, KK, NTYPES, DOTYPE,
      $                   NRHS, ISEED, THRESH, NOUNIT, A, LDA, AB, LDAB,
      $                   BD, BE, Q, LDQ, P, LDP, C, LDC, CC, WORK,
      $                   LWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine (input) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/schkbd.f b/TESTING/EIG/schkbd.f
index ba19cddd2f..9fd4f3480a 100644
--- a/TESTING/EIG/schkbd.f
+++ b/TESTING/EIG/schkbd.f
@@ -490,6 +490,7 @@ SUBROUTINE SCHKBD( NSIZES, MVAL, NVAL, NTYPES, DOTYPE, NRHS,
      $                   ISEED, THRESH, A, LDA, BD, BE, S1, S2, X, LDX,
      $                   Y, Z, Q, LDQ, PT, LDPT, U, VT, WORK, LWORK,
      $                   IWORK, NOUT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -544,8 +545,8 @@ SUBROUTINE SCHKBD( NSIZES, MVAL, NVAL, NTYPES, DOTYPE, NRHS,
 *     .. External Subroutines ..
       EXTERNAL           ALASUM, SBDSDC, SBDSQR, SBDSVDX, SBDT01,
      $                   SBDT02, SBDT03, SBDT04, SCOPY, SGEBRD,
-     $                   SGEMM, SLABAD, SLACPY, SLAHD2, SLASET,
-     $                   SLATMR, SLATMS, SORGBR, SORT01, XERBLA
+     $                   SGEMM, SLACPY, SLAHD2, SLASET, SLATMR,
+     $                   SLATMS, SORGBR, SORT01, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, EXP, INT, LOG, MAX, MIN, SQRT
@@ -627,7 +628,6 @@ SUBROUTINE SCHKBD( NSIZES, MVAL, NVAL, NTYPES, DOTYPE, NRHS,
       NTEST = 0
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = SLAMCH( 'Overflow' )
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       LOG2UI = INT( LOG( ULPINV ) / LOG( TWO ) )
diff --git a/TESTING/EIG/schkbk.f b/TESTING/EIG/schkbk.f
index 1824017572..1e4108d1f1 100644
--- a/TESTING/EIG/schkbk.f
+++ b/TESTING/EIG/schkbk.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE SCHKBK( NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/schkbl.f b/TESTING/EIG/schkbl.f
index e0634603b6..ba83564778 100644
--- a/TESTING/EIG/schkbl.f
+++ b/TESTING/EIG/schkbl.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE SCHKBL( NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/schkdmd.f90 b/TESTING/EIG/schkdmd.f90
new file mode 100644
index 0000000000..855d981fda
--- /dev/null
+++ b/TESTING/EIG/schkdmd.f90
@@ -0,0 +1,792 @@
+!     This is a test program for checking the implementations of
+!     the implementations of the following subroutines
+!
+!     SGEDMD  for computation of the
+!             Dynamic Mode Decomposition (DMD)
+!     SGEDMDQ for computation of a
+!             QR factorization based compressed DMD
+!
+!     Developed and supported by:
+!     ===========================
+!     Developed and coded by Zlatko Drmac, Faculty of Science,
+!     University of Zagreb;  drmac@math.hr
+!     In cooperation with
+!     AIMdyn Inc., Santa Barbara, CA.
+!     ========================================================
+!     How to run the code (compiler, link info)
+!     ========================================================
+!     Compile as FORTRAN 90 (or later) and link with BLAS and
+!     LAPACK libraries.
+!     NOTE: The code is developed and tested on top of the
+!     Intel MKL library (versions 2022.0.3 and 2022.2.0),
+!     using the Intel Fortran compiler.
+!
+!     For developers of the C++ implementation
+!     ========================================================
+!     See the LAPACK++ and Template Numerical Toolkit (TNT)
+!
+!     Note on a development of the GPU HP implementation
+!     ========================================================
+!     Work in progress. See CUDA, MAGMA, SLATE.
+!     NOTE: The four SVD subroutines used in this code are
+!     included as a part of R&D and for the completeness.
+!     This was also an opportunity to test those SVD codes.
+!     If the scaling option is used all four are essentially
+!     equally good. For implementations on HP platforms,
+!     one can use whichever SVD is available.
+!...  .........................................................
+!     NOTE:
+!     When using the Intel MKL 2022.0.3 the subroutine xGESVDQ
+!     (optionally used in xGEDMD) may cause access violation
+!     error for x = S, D, C, Z, but only if called with the
+!     work space query. (At least in our Windows 10 MSVS 2019.)
+!     The problem can be mitigated by downloading the source
+!     code of xGESVDQ from the LAPACK repository and use it
+!     localy instead of the one in the MKL. This seems to
+!     indicate that the problem is indeed in the MKL.
+!     This problem did not appear whith Intel MKL 2022.2.0.
+!
+!     NOTE:
+!     xGESDD seems to have a problem with workspace. In some
+!     cases the length of the optimal workspace is returned
+!     smaller than the minimal workspace, as specified in the
+!     code. As a precaution, all optimal workspaces are
+!     set as MAX(minimal, optimal).
+!     Latest implementations of complex xGESDD have different
+!     length of the real worksapce. We use max value over
+!     two versions.
+!............................................................
+!............................................................
+!
+      PROGRAM DMD_TEST
+      use iso_fortran_env, only: real32
+      IMPLICIT NONE
+      integer, parameter :: WP = real32
+
+!............................................................
+      REAL(KIND=WP), PARAMETER ::  ONE = 1.0_WP
+      REAL(KIND=WP), PARAMETER :: ZERO = 0.0_WP
+!............................................................
+      REAL(KIND=WP), ALLOCATABLE, DIMENSION(:,:) ::          &
+                     A, AC, EIGA, LAMBDA, LAMBDAQ, F, F1, F2,&
+                     Z, Z1, S, AU, W, VA, X, X0, Y, Y0, Y1
+      REAL(KIND=WP), ALLOCATABLE, DIMENSION(:)   ::          &
+                     DA, DL, DR, REIG, REIGA, REIGQ, IEIG,   &
+                     IEIGA, IEIGQ,  RES, RES1, RESEX, SINGVX,&
+                     SINGVQX, WORK
+      INTEGER      , ALLOCATABLE, DIMENSION(:)   ::   IWORK
+      REAL(KIND=WP) :: AB(2,2),   WDUMMY(2)
+      INTEGER       :: IDUMMY(2), ISEED(4), RJOBDATA(8)
+      REAL(KIND=WP) :: ANORM, COND, CONDL, CONDR, DMAX, EPS, &
+                       TOL, TOL2, SVDIFF, TMP, TMP_AU,       &
+                       TMP_FQR, TMP_REZ, TMP_REZQ,  TMP_ZXW, &
+                       TMP_EX, XNORM, YNORM
+!............................................................
+      INTEGER :: K, KQ, LDF, LDS, LDA, LDAU, LDW, LDX, LDY,  &
+                 LDZ, LIWORK, LWORK, M, N, L, LLOOP, NRNK
+      INTEGER :: i, iJOBREF, iJOBZ, iSCALE, INFO, KDIFF,     &
+                 NFAIL, NFAIL_AU, NFAIL_F_QR, NFAIL_REZ,     &
+                 NFAIL_REZQ, NFAIL_SVDIFF, NFAIL_TOTAL, NFAILQ_TOTAL, &
+                 NFAIL_Z_XV, MODE, MODEL, MODER, WHTSVD
+      INTEGER    iNRNK, iWHTSVD, K_TRAJ, LWMINOPT
+      CHARACTER(LEN=1) GRADE, JOBREF, JOBZ, PIVTNG, RSIGN,   &
+                       SCALE, RESIDS, WANTQ, WANTR
+
+      LOGICAL          TEST_QRDMD
+!..... external subroutines (BLAS and LAPACK)
+      EXTERNAL SAXPY,  SGEEV, SGEMM, SGEMV, SLACPY, SLASCL
+      EXTERNAL SLARNV, SLATMR
+!.....external subroutines DMD package, part 1
+!     subroutines under test
+      EXTERNAL SGEDMD, SGEDMDQ
+
+!..... external functions (BLAS and LAPACK)
+      EXTERNAL         SLAMCH, SLANGE, SNRM2
+      REAL(KIND=WP) :: SLAMCH, SLANGE, SNRM2
+      EXTERNAL         LSAME
+      LOGICAL          LSAME
+
+      INTRINSIC ABS, INT, MIN, MAX
+!............................................................
+
+      ! The test is always in pairs : ( SGEDMD and SGEDMDQ )
+      ! because the test includes comparing the results (in pairs).
+!.....................................................................................
+      TEST_QRDMD = .TRUE. ! This code by default performs tests on SGEDMDQ
+                          ! Since the QR factorizations based algorithm is designed for
+                          ! single trajectory data, only single trajectory tests will
+                          ! be performed with xGEDMDQ.
+      WANTQ = 'Q'
+      WANTR = 'R'
+!.................................................................................
+
+      EPS = SLAMCH( 'P' )  ! machine precision SP
+
+      ! Global counters of failures of some particular tests
+      NFAIL      = 0
+      NFAIL_REZ  = 0
+      NFAIL_REZQ = 0
+      NFAIL_Z_XV = 0
+      NFAIL_F_QR = 0
+      NFAIL_AU   = 0
+      KDIFF      = 0
+      NFAIL_SVDIFF = 0
+      NFAIL_TOTAL  = 0
+      NFAILQ_TOTAL = 0
+
+
+      DO LLOOP = 1, 4
+
+      WRITE(*,*) 'L Loop Index = ', LLOOP
+
+      ! Set the dimensions of the problem ...
+      WRITE(*,*) 'M = '
+      READ(*,*) M
+      WRITE(*,*) M
+      ! ... and the number of snapshots.
+      WRITE(*,*) 'N = '
+      READ(*,*) N
+      WRITE(*,*) N
+
+      ! ... Test the dimensions
+      IF ( ( MIN(M,N) == 0 ) .OR. ( M < N )  ) THEN
+          WRITE(*,*) 'Bad dimensions. Required: M >= N > 0.'
+          STOP
+      END IF
+!.............
+      ! The seed inside the LLOOP so that each pass can be reproduced easily.
+
+      ISEED(1) = 4
+      ISEED(2) = 3
+      ISEED(3) = 2
+      ISEED(4) = 1
+
+      LDA = M
+      LDF = M
+      LDX = MAX(M,N+1)
+      LDY = MAX(M,N+1)
+      LDW = N
+      LDZ = M
+      LDAU = MAX(M,N+1)
+      LDS = N
+
+      TMP_ZXW  = ZERO
+      TMP_AU   = ZERO
+      TMP_REZ  = ZERO
+      TMP_REZQ = ZERO
+      SVDIFF   = ZERO
+      TMP_EX   = ZERO
+
+      !
+      ! Test the subroutines on real data snapshots. All
+      ! computation is done in real arithmetic, even when
+      ! Koopman eigenvalues and modes are real.
+      !
+      ! Allocate memory space
+      ALLOCATE( A(LDA,M) )
+      ALLOCATE( AC(LDA,M) )
+      ALLOCATE( DA(M) )
+      ALLOCATE( DL(M) )
+      ALLOCATE( F(LDF,N+1) )
+      ALLOCATE( F1(LDF,N+1) )
+      ALLOCATE( F2(LDF,N+1) )
+      ALLOCATE( X(LDX,N) )
+      ALLOCATE( X0(LDX,N) )
+      ALLOCATE( SINGVX(N) )
+      ALLOCATE( SINGVQX(N) )
+      ALLOCATE( Y(LDY,N+1) )
+      ALLOCATE( Y0(LDY,N+1) )
+      ALLOCATE( Y1(M,N+1) )
+      ALLOCATE( Z(LDZ,N) )
+      ALLOCATE( Z1(LDZ,N) )
+      ALLOCATE( RES(N)  )
+      ALLOCATE( RES1(N) )
+      ALLOCATE( RESEX(N) )
+      ALLOCATE( REIG(N) )
+      ALLOCATE( IEIG(N) )
+      ALLOCATE( REIGQ(N) )
+      ALLOCATE( IEIGQ(N) )
+      ALLOCATE( REIGA(M) )
+      ALLOCATE( IEIGA(M) )
+      ALLOCATE( VA(LDA,M) )
+      ALLOCATE( LAMBDA(N,2) )
+      ALLOCATE( LAMBDAQ(N,2) )
+      ALLOCATE( EIGA(M,2) )
+      ALLOCATE( W(LDW,N) )
+      ALLOCATE( AU(LDAU,N) )
+      ALLOCATE( S(N,N) )
+
+      TOL  = M*EPS
+      ! This mimics O(M*N)*EPS bound for accumulated roundoff error.
+      ! The factor 10 is somewhat arbitrary.
+      TOL2 = 10*M*N*EPS
+
+!.............
+
+      DO K_TRAJ = 1, 2
+      !  Number of intial conditions in the simulation/trajectories (1 or 2)
+
+      COND = 1.0D8
+      DMAX = 1.0D2
+      RSIGN = 'F'
+      GRADE = 'N'
+      MODEL = 6
+      CONDL = 1.0D2
+      MODER = 6
+      CONDR = 1.0D2
+      PIVTNG = 'N'
+
+      ! Loop over all parameter MODE values for ZLATMR (+1,..,+6)
+      DO MODE = 1, 6
+
+      ALLOCATE( IWORK(2*M) )
+      ALLOCATE(DR(N))
+      CALL SLATMR( M, M, 'S', ISEED, 'N', DA, MODE, COND, &
+                   DMAX, RSIGN, GRADE, DL, MODEL,  CONDL, &
+                   DR, MODER, CONDR, PIVTNG, IWORK, M, M, &
+                   ZERO, -ONE, 'N', A, LDA, IWORK(M+1), INFO )
+      DEALLOCATE(IWORK)
+      DEALLOCATE(DR)
+
+      LWORK = 4*M+1
+      ALLOCATE(WORK(LWORK))
+      AC  = A
+      CALL SGEEV( 'N','V', M, AC, M, REIGA, IEIGA, VA, M, &
+                  VA, M, WORK, LWORK, INFO ) ! LAPACK CALL
+      DEALLOCATE(WORK)
+      TMP = ZERO
+      DO i = 1, M
+          EIGA(i,1) = REIGA(i)
+          EIGA(i,2) = IEIGA(i)
+          TMP = MAX( TMP, SQRT(REIGA(i)**2+IEIGA(i)**2))
+      END DO
+
+      ! Scale A to have the desirable spectral radius.
+      CALL SLASCL( 'G', 0, 0, TMP, ONE, M, M, A, M, INFO )
+      CALL SLASCL( 'G', 0, 0, TMP, ONE, M, 2, EIGA, M, INFO )
+
+      ! Compute the norm of A
+      ANORM = SLANGE( 'F', N, N, A, M, WDUMMY )
+
+      IF ( K_TRAJ == 2 ) THEN
+          ! generate data with two inital conditions
+      CALL SLARNV(2, ISEED, M, F1(1,1) )
+      F1(1:M,1) = 1.0E-10*F1(1:M,1)
+      DO i = 1, N/2
+         CALL SGEMV( 'N', M, M, ONE, A, M, F1(1,i), 1, ZERO, &
+              F1(1,i+1), 1 )
+      END DO
+      X0(1:M,1:N/2) = F1(1:M,1:N/2)
+      Y0(1:M,1:N/2) = F1(1:M,2:N/2+1)
+
+      CALL SLARNV(2, ISEED, M, F1(1,1) )
+      DO i = 1, N-N/2
+         CALL SGEMV( 'N', M, M, ONE, A, M, F1(1,i), 1, ZERO, &
+              F1(1,i+1), 1 )
+      END DO
+      X0(1:M,N/2+1:N) = F1(1:M,1:N-N/2)
+      Y0(1:M,N/2+1:N) = F1(1:M,2:N-N/2+1)
+      ELSE
+          ! single trajectory
+      CALL SLARNV(2, ISEED, M, F(1,1) )
+      DO i = 1, N
+         CALL SGEMV( 'N', M, M, ONE, A, M, F(1,i), 1, ZERO, &
+              F(1,i+1), 1 )
+      END DO
+      X0(1:M,1:N) = F(1:M,1:N)
+      Y0(1:M,1:N) = F(1:M,2:N+1)
+      END IF
+
+      XNORM = SLANGE( 'F', M, N, X0, LDX, WDUMMY )
+      YNORM = SLANGE( 'F', M, N, Y0, LDX, WDUMMY )
+!............................................................
+
+      DO iJOBZ = 1, 4
+
+          SELECT CASE ( iJOBZ )
+          CASE(1)
+              JOBZ   = 'V' ! Ritz vectors will be computed
+              RESIDS = 'R' ! Residuals will be computed
+          CASE(2)
+              JOBZ   = 'V'
+              RESIDS = 'N'
+          CASE(3)
+              JOBZ   = 'F' ! Ritz vectors in factored form
+              RESIDS = 'N'
+          CASE(4)
+              JOBZ   = 'N'
+              RESIDS = 'N'
+          END SELECT
+
+      DO iJOBREF = 1, 3
+
+          SELECT CASE ( iJOBREF )
+          CASE(1)
+              JOBREF = 'R' ! Data for refined Ritz vectors
+          CASE(2)
+              JOBREF = 'E' ! Exact DMD vectors
+          CASE(3)
+              JOBREF = 'N'
+          END SELECT
+
+      DO iSCALE = 1, 4
+
+          SELECT CASE ( iSCALE )
+          CASE(1)
+              SCALE = 'S' ! X data normalized
+          CASE(2)
+              SCALE = 'C' ! X normalized, consist. check
+          CASE(3)
+              SCALE = 'Y' ! Y data normalized
+          CASE(4)
+              SCALE = 'N'
+          END SELECT
+
+      DO iNRNK = -1, -2, -1
+          ! Two truncation strategies. The "-2" case for R&D
+          ! purposes only - it uses possibly low accuracy small
+          ! singular values, in which case the formulas used in
+          ! the DMD are highly sensitive.
+          NRNK   = iNRNK
+
+      DO iWHTSVD = 1, 4
+          ! Check all four options to compute the POD basis
+          ! via the SVD.
+          WHTSVD   = iWHTSVD
+
+      DO LWMINOPT = 1, 2
+          ! Workspace query for the minimal (1) and for the optimal
+          ! (2) workspace lengths determined by workspace query.
+
+       X(1:M,1:N) = X0(1:M,1:N)
+       Y(1:M,1:N) = Y0(1:M,1:N)
+
+       ! SGEDMD: Workspace query and workspace allocation
+       CALL SGEDMD( SCALE, JOBZ, RESIDS, JOBREF, WHTSVD, M, &
+            N, X, LDX, Y, LDY, NRNK, TOL, K, REIG, IEIG, Z, &
+            LDZ, RES, AU, LDAU, W, LDW, S, LDS, WDUMMY, -1, &
+            IDUMMY, -1, INFO )
+
+       LIWORK = IDUMMY(1)
+       ALLOCATE( IWORK(LIWORK) )
+       LWORK = INT(WDUMMY(LWMINOPT))
+       ALLOCATE( WORK(LWORK) )
+
+       ! SGEDMD test: CALL SGEDMD
+       CALL SGEDMD( SCALE, JOBZ, RESIDS, JOBREF, WHTSVD, M, &
+            N, X, LDX, Y, LDY, NRNK, TOL, K, REIG, IEIG, Z, &
+            LDZ, RES, AU, LDAU, W, LDW, S, LDS, WORK, LWORK,&
+            IWORK, LIWORK, INFO )
+
+       SINGVX(1:N) = WORK(1:N)
+
+       !...... SGEDMD check point
+       IF ( LSAME(JOBZ,'V')  ) THEN
+          ! Check that Z = X*W, on return from SGEDMD
+          ! This checks that the returned aigenvectors in Z are
+          ! the product of the SVD'POD basis returned in X
+          ! and the eigenvectors of the rayleigh quotient
+          ! returned in W
+          CALL SGEMM( 'N', 'N', M, K, K, ONE, X, LDX, W, LDW, &
+                      ZERO, Z1, LDZ )
+          TMP = ZERO
+          DO i = 1, K
+             CALL SAXPY( M, -ONE, Z(1,i), 1, Z1(1,i), 1)
+             TMP = MAX(TMP, SNRM2( M, Z1(1,i), 1 ) )
+          END DO
+          TMP_ZXW = MAX(TMP_ZXW, TMP )
+
+          IF ( TMP_ZXW > 10*M*EPS ) THEN
+              NFAIL_Z_XV = NFAIL_Z_XV + 1
+          END IF
+
+       END IF
+
+       !...... SGEDMD check point
+       IF ( LSAME(JOBREF,'R') ) THEN
+           ! The matrix A*U is returned for computing refined Ritz vectors.
+           ! Check that A*U is computed correctly using the formula
+           ! A*U = Y * V * inv(SIGMA). This depends on the
+           ! accuracy in the computed singular values and vectors of X.
+           ! See the paper for an error analysis.
+           ! Note that the left singular vectors of the input matrix X
+           ! are returned in the array X.
+           CALL SGEMM( 'N', 'N', M, K, M, ONE, A, LDA, X, LDX, &
+                      ZERO, Z1, LDZ )
+           TMP = ZERO
+           DO i = 1, K
+              CALL SAXPY( M, -ONE, AU(1,i), 1, Z1(1,i), 1)
+              TMP = MAX( TMP, SNRM2( M, Z1(1,i),1 ) * &
+                       SINGVX(K)/(ANORM*SINGVX(1)) )
+           END DO
+           TMP_AU = MAX( TMP_AU, TMP )
+
+           IF ( TMP > TOL2 ) THEN
+               NFAIL_AU = NFAIL_AU + 1
+           END IF
+
+       ELSEIF ( LSAME(JOBREF,'E') ) THEN
+       ! The unscaled vectors of the Exact DMD are computed.
+       ! This option is included for the sake of completeness,
+       ! for users who prefer the Exact DMD vectors. The
+       ! returned vectors are in the real form, in the same way
+       ! as the Ritz vectors. Here we just save the vectors
+       ! and test them separately using a Matlab script.
+
+       CALL SGEMM( 'N', 'N', M, K, M, ONE, A, LDA, AU, LDAU, ZERO, Y1, M )
+       i=1
+       DO WHILE ( i <= K )
+       IF ( IEIG(i) == ZERO ) THEN
+        ! have a real eigenvalue with real eigenvector
+        CALL SAXPY( M, -REIG(i), AU(1,i), 1, Y1(1,i), 1 )
+        RESEX(i) = SNRM2( M, Y1(1,i), 1) / SNRM2(M,AU(1,i),1)
+        i = i + 1
+       ELSE
+       ! Have a complex conjugate pair
+       ! REIG(i) +- sqrt(-1)*IMEIG(i).
+       ! Since all computation is done in real
+       ! arithmetic, the formula for the residual
+       ! is recast for real representation of the
+       ! complex conjugate eigenpair. See the
+       ! description of RES.
+       AB(1,1) =  REIG(i)
+       AB(2,1) = -IEIG(i)
+       AB(1,2) =  IEIG(i)
+       AB(2,2) =  REIG(i)
+       CALL SGEMM( 'N', 'N', M, 2, 2, -ONE, AU(1,i), &
+                   M, AB, 2, ONE, Y1(1,i), M )
+       RESEX(i)   = SLANGE( 'F', M, 2, Y1(1,i), M, &
+                    WORK )/ SLANGE( 'F', M, 2, AU(1,i), M, &
+                    WORK )
+       RESEX(i+1) = RESEX(i)
+       i = i + 2
+       END IF
+       END DO
+
+       END IF
+
+      !...... SGEDMD check point
+      IF ( LSAME(RESIDS, 'R') ) THEN
+          ! Compare the residuals returned by SGEDMD with the
+          ! explicitly computed residuals using the matrix A.
+          ! Compute explicitly Y1 = A*Z
+          CALL SGEMM( 'N', 'N', M, K, M, ONE, A, LDA, Z, LDZ, ZERO, Y1, M )
+          ! ... and then A*Z(:,i) - LAMBDA(i)*Z(:,i), using the real forms
+          ! of the invariant subspaces that correspond to complex conjugate
+          ! pairs of eigencalues. (See the description of Z in SGEDMD,)
+          i = 1
+          DO WHILE ( i <= K )
+            IF ( IEIG(i) == ZERO ) THEN
+                ! have a real eigenvalue with real eigenvector
+                CALL SAXPY( M, -REIG(i), Z(1,i), 1, Y1(1,i), 1 )
+                RES1(i) = SNRM2( M, Y1(1,i), 1)
+                i = i + 1
+            ELSE
+               ! Have a complex conjugate pair
+               ! REIG(i) +- sqrt(-1)*IMEIG(i).
+               ! Since all computation is done in real
+               ! arithmetic, the formula for the residual
+               ! is recast for real representation of the
+               ! complex conjugate eigenpair. See the
+               ! description of RES.
+               AB(1,1) =  REIG(i)
+               AB(2,1) = -IEIG(i)
+               AB(1,2) =  IEIG(i)
+               AB(2,2) =  REIG(i)
+               CALL SGEMM( 'N', 'N', M, 2, 2, -ONE, Z(1,i), &
+                           M, AB, 2, ONE, Y1(1,i), M )
+               RES1(i)   = SLANGE( 'F', M, 2, Y1(1,i), M, &
+                                  WORK )
+               RES1(i+1) = RES1(i)
+               i = i + 2
+            END IF
+          END DO
+          TMP = ZERO
+          DO i = 1, K
+          TMP = MAX( TMP, ABS(RES(i) - RES1(i)) * &
+                    SINGVX(K)/(ANORM*SINGVX(1)) )
+          END DO
+          TMP_REZ = MAX( TMP_REZ, TMP )
+
+          IF ( TMP > TOL2 ) THEN
+              NFAIL_REZ = NFAIL_REZ + 1
+          END IF
+
+         IF ( LSAME(JOBREF,'E') ) THEN
+            TMP = ZERO
+          DO i = 1, K
+          TMP = MAX( TMP, ABS(RES1(i) - RESEX(i))/(RES1(i)+RESEX(i)) )
+          END DO
+          TMP_EX = MAX(TMP_EX,TMP)
+         END IF
+
+      END IF
+
+      ! ... store the results for inspection
+      DO i = 1, K
+          LAMBDA(i,1) = REIG(i)
+          LAMBDA(i,2) = IEIG(i)
+      END DO
+
+      DEALLOCATE(IWORK)
+      DEALLOCATE(WORK)
+
+      !======================================================================
+      !     Now test the SGEDMDQ, if requested.
+      !======================================================================
+      IF ( TEST_QRDMD .AND. (K_TRAJ == 1) ) THEN
+          RJOBDATA(2) = 1
+          F1 = F
+
+          ! SGEDMDQ test: Workspace query and workspace allocation
+          CALL SGEDMDQ( SCALE, JOBZ, RESIDS, WANTQ, WANTR, &
+               JOBREF, WHTSVD, M, N+1, F1, LDF, X, LDX, Y, &
+               LDY, NRNK, TOL, KQ, REIGQ, IEIGQ, Z, LDZ,   &
+               RES, AU, LDAU, W, LDW, S, LDS, WDUMMY,      &
+               -1, IDUMMY, -1, INFO )
+          LIWORK = IDUMMY(1)
+          ALLOCATE( IWORK(LIWORK) )
+          LWORK = INT(WDUMMY(LWMINOPT))
+          ALLOCATE(WORK(LWORK))
+
+          ! SGEDMDQ test: CALL SGEDMDQ
+          CALL SGEDMDQ( SCALE, JOBZ, RESIDS, WANTQ, WANTR, &
+               JOBREF, WHTSVD, M, N+1, F1, LDF, X, LDX, Y, &
+               LDY, NRNK, TOL, KQ, REIGQ, IEIGQ, Z, LDZ,   &
+               RES, AU, LDAU, W, LDW, S, LDS,              &
+               WORK, LWORK, IWORK, LIWORK, INFO )
+
+          SINGVQX(1:KQ) = WORK(MIN(M,N+1)+1: MIN(M,N+1)+KQ)
+
+          !..... SGEDMDQ check point
+          IF ( KQ /= K ) THEN
+             KDIFF = KDIFF+1
+          END IF
+
+          TMP = ZERO
+          DO i = 1, MIN(K, KQ)
+             TMP = MAX(TMP, ABS(SINGVX(i)-SINGVQX(i)) / &
+                                   SINGVX(1) )
+          END DO
+          SVDIFF = MAX( SVDIFF, TMP )
+          IF ( TMP > M*N*EPS ) THEN
+             NFAIL_SVDIFF = NFAIL_SVDIFF + 1
+          END IF
+
+          !..... SGEDMDQ check point
+          IF ( LSAME(WANTQ,'Q') .AND. LSAME(WANTR,'R') ) THEN
+             ! Check that the QR factors are computed and returned
+             ! as requested. The residual ||F-Q*R||_F / ||F||_F
+             ! is compared to M*N*EPS.
+             F2 = F
+             CALL SGEMM( 'N', 'N', M, N+1, MIN(M,N+1), -ONE, F1, &
+                         LDF, Y, LDY, ONE, F2, LDF )
+             TMP_FQR = SLANGE( 'F', M, N+1, F2, LDF, WORK ) / &
+                   SLANGE( 'F', M, N+1, F,  LDF, WORK )
+             IF ( TMP_FQR > TOL2 ) THEN
+                 NFAIL_F_QR = NFAIL_F_QR + 1
+             END IF
+          END IF
+
+          !..... SGEDMDQ checkpoint
+          IF ( LSAME(RESIDS, 'R') ) THEN
+              ! Compare the residuals returned by SGEDMDQ with the
+              ! explicitly computed residuals using the matrix A.
+              ! Compute explicitly Y1 = A*Z
+              CALL SGEMM( 'N', 'N', M, KQ, M, ONE, A, M, Z, M, ZERO, Y1, M )
+              ! ... and then A*Z(:,i) - LAMBDA(i)*Z(:,i), using the real forms
+              ! of the invariant subspaces that correspond to complex conjugate
+              ! pairs of eigencalues. (See the description of Z in SGEDMDQ)
+              i = 1
+              DO WHILE ( i <= KQ )
+                IF ( IEIGQ(i) == ZERO ) THEN
+                    ! have a real eigenvalue with real eigenvector
+                    CALL SAXPY( M, -REIGQ(i), Z(1,i), 1, Y1(1,i), 1 )
+                    ! Y(1:M,i) = Y(1:M,i) - REIG(i)*Z(1:M,i)
+                    RES1(i) = SNRM2( M, Y1(1,i), 1)
+                    i = i + 1
+                ELSE
+                   ! Have a complex conjugate pair
+                   ! REIG(i) +- sqrt(-1)*IMEIG(i).
+                   ! Since all computation is done in real
+                   ! arithmetic, the formula for the residual
+                   ! is recast for real representation of the
+                   ! complex conjugate eigenpair. See the
+                   ! description of RES.
+                   AB(1,1) =  REIGQ(i)
+                   AB(2,1) = -IEIGQ(i)
+                   AB(1,2) =  IEIGQ(i)
+                   AB(2,2) =  REIGQ(i)
+                   CALL SGEMM( 'N', 'N', M, 2, 2, -ONE, Z(1,i), &
+                               M, AB, 2, ONE, Y1(1,i), M )             ! BLAS CALL
+                   ! Y(1:M,i:i+1) = Y(1:M,i:i+1) - Z(1:M,i:i+1) * AB   ! INTRINSIC
+                   RES1(i)   = SLANGE( 'F', M, 2, Y1(1,i), M, &
+                                      WORK )                           ! LAPACK CALL
+                   RES1(i+1) = RES1(i)
+                   i = i + 2
+                END IF
+              END DO
+              TMP = ZERO
+              DO i = 1, KQ
+              TMP = MAX( TMP, ABS(RES(i) - RES1(i)) * &
+                  SINGVQX(K)/(ANORM*SINGVQX(1)) )
+              END DO
+              TMP_REZQ = MAX( TMP_REZQ, TMP )
+              IF ( TMP > TOL2 ) THEN
+                  NFAIL_REZQ = NFAIL_REZQ + 1
+              END IF
+
+          END IF
+
+          DO i = 1, KQ
+              LAMBDAQ(i,1) = REIGQ(i)
+              LAMBDAQ(i,2) = IEIGQ(i)
+          END DO
+
+      DEALLOCATE(WORK)
+      DEALLOCATE(IWORK)
+      END IF            ! TEST_QRDMD
+!======================================================================
+
+      END DO ! LWMINOPT
+      !write(*,*) 'LWMINOPT loop completed'
+      END DO ! WHTSVD LOOP
+      !write(*,*) 'WHTSVD loop completed'
+      END DO ! NRNK LOOP
+      !write(*,*) 'NRNK loop completed'
+      END DO ! SCALE LOOP
+      !write(*,*) 'SCALE loop completed'
+      END DO ! JOBF LOOP
+      !write(*,*) 'JOBREF loop completed'
+      END DO ! JOBZ LOOP
+      !write(*,*) 'JOBZ loop completed'
+
+      END DO ! MODE -6:6
+      !write(*,*) 'MODE loop completed'
+      END DO ! 1 or 2 trajectories
+      !write(*,*) 'trajectories  loop completed'
+
+      DEALLOCATE(A)
+      DEALLOCATE(AC)
+      DEALLOCATE(DA)
+      DEALLOCATE(DL)
+      DEALLOCATE(F)
+      DEALLOCATE(F1)
+      DEALLOCATE(F2)
+      DEALLOCATE(X)
+      DEALLOCATE(X0)
+      DEALLOCATE(SINGVX)
+      DEALLOCATE(SINGVQX)
+      DEALLOCATE(Y)
+      DEALLOCATE(Y0)
+      DEALLOCATE(Y1)
+      DEALLOCATE(Z)
+      DEALLOCATE(Z1)
+      DEALLOCATE(RES)
+      DEALLOCATE(RES1)
+      DEALLOCATE(RESEX)
+      DEALLOCATE(REIG)
+      DEALLOCATE(IEIG)
+      DEALLOCATE(REIGQ)
+      DEALLOCATE(IEIGQ)
+      DEALLOCATE(REIGA)
+      DEALLOCATE(IEIGA)
+      DEALLOCATE(VA)
+      DEALLOCATE(LAMBDA)
+      DEALLOCATE(LAMBDAQ)
+      DEALLOCATE(EIGA)
+      DEALLOCATE(W)
+      DEALLOCATE(AU)
+      DEALLOCATE(S)
+
+!............................................................
+      !     Generate random M-by-M matrix A. Use DLATMR from
+      END DO ! LLOOP
+
+
+      WRITE(*,*) '>>>>>>>>>>>>>>>>>>>>>>>>>>'
+      WRITE(*,*) ' Test summary for SGEDMD :'
+      WRITE(*,*) '>>>>>>>>>>>>>>>>>>>>>>>>>>'
+      WRITE(*,*)
+      IF ( NFAIL_Z_XV == 0 ) THEN
+          WRITE(*,*) '>>>> Z - U*V test PASSED.'
+      ELSE
+          WRITE(*,*) 'Z - U*V test FAILED ', NFAIL_Z_XV, ' time(s)'
+          WRITE(*,*) 'Max error ||Z-U*V||_F was ', TMP_ZXW
+          NFAIL_TOTAL = NFAIL_TOTAL + NFAIL_Z_XV
+      END IF
+      IF ( NFAIL_AU == 0 ) THEN
+          WRITE(*,*) '>>>> A*U test PASSED. '
+      ELSE
+          WRITE(*,*) 'A*U test FAILED ', NFAIL_AU, ' time(s)'
+          WRITE(*,*) 'Max A*U test adjusted error measure was ', TMP_AU
+          WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+          NFAIL_TOTAL = NFAIL_TOTAL + NFAIL_AU
+      END IF
+
+      IF ( NFAIL_REZ == 0 ) THEN
+          WRITE(*,*) '>>>> Rezidual computation test PASSED.'
+      ELSE
+          WRITE(*,*) 'Rezidual computation test FAILED ', NFAIL_REZ, 'time(s)'
+          WRITE(*,*) 'Max residual computing test adjusted error measure was ', TMP_REZ
+          WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+          NFAIL_TOTAL = NFAIL_TOTAL + NFAIL_REZ
+      END IF
+
+      IF ( NFAIL_TOTAL == 0 ) THEN
+          WRITE(*,*) '>>>> SGEDMD :: ALL TESTS PASSED.'
+      ELSE
+          WRITE(*,*) NFAIL_TOTAL, 'FAILURES!'
+          WRITE(*,*) '>>>>>>>>>>>>>> SGEDMD :: TESTS FAILED. CHECK THE IMPLEMENTATION.'
+      END IF
+
+      IF ( TEST_QRDMD ) THEN
+      WRITE(*,*)
+      WRITE(*,*) '>>>>>>>>>>>>>>>>>>>>>>>>>>'
+      WRITE(*,*) ' Test summary for SGEDMDQ :'
+      WRITE(*,*) '>>>>>>>>>>>>>>>>>>>>>>>>>>'
+      WRITE(*,*)
+
+      IF ( NFAIL_SVDIFF == 0 ) THEN
+          WRITE(*,*) '>>>> SGEDMD and SGEDMDQ computed singular &
+              &values test PASSED.'
+      ELSE
+          WRITE(*,*) 'SGEDMD and SGEDMDQ discrepancies in &
+              &the singular values unacceptable ', &
+              NFAIL_SVDIFF, ' times. Test FAILED.'
+          WRITE(*,*) 'The maximal discrepancy in the singular values (relative to the norm) was ', SVDIFF
+          WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+          NFAILQ_TOTAL = NFAILQ_TOTAL + NFAIL_SVDIFF
+      END IF
+
+      IF ( NFAIL_F_QR == 0 ) THEN
+          WRITE(*,*) '>>>> F - Q*R test PASSED.'
+      ELSE
+          WRITE(*,*) 'F - Q*R test FAILED ', NFAIL_F_QR, ' time(s)'
+          WRITE(*,*) 'The largest relative residual was ', TMP_FQR
+          WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+          NFAILQ_TOTAL = NFAILQ_TOTAL + NFAIL_F_QR
+      END IF
+
+      IF ( NFAIL_REZQ == 0 ) THEN
+          WRITE(*,*) '>>>> Rezidual computation test PASSED.'
+      ELSE
+          WRITE(*,*) 'Rezidual computation test FAILED ', NFAIL_REZQ, 'time(s)'
+          WRITE(*,*) 'Max residual computing test adjusted error measure was ', TMP_REZQ
+          WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+          NFAILQ_TOTAL = NFAILQ_TOTAL + NFAIL_REZQ
+      END IF
+
+      IF ( NFAILQ_TOTAL == 0 ) THEN
+          WRITE(*,*) '>>>>>>> SGEDMDQ :: ALL TESTS PASSED.'
+      ELSE
+         WRITE(*,*) NFAILQ_TOTAL, 'FAILURES!'
+         WRITE(*,*) '>>>>>>> SGEDMDQ :: TESTS FAILED. CHECK THE IMPLEMENTATION.'
+      END IF
+
+      END IF
+
+      WRITE(*,*)
+      WRITE(*,*) 'Test completed.'
+      STOP
+      END
diff --git a/TESTING/EIG/schkec.f b/TESTING/EIG/schkec.f
index e6123e1ad9..2f92e221ff 100644
--- a/TESTING/EIG/schkec.f
+++ b/TESTING/EIG/schkec.f
@@ -73,6 +73,7 @@
 *
 *  =====================================================================
       SUBROUTINE SCHKEC( THRESH, TSTERR, NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -90,21 +91,23 @@ SUBROUTINE SCHKEC( THRESH, TSTERR, NIN, NOUT )
       LOGICAL            OK
       CHARACTER*3        PATH
       INTEGER            KLAEXC, KLALN2, KLANV2, KLAQTR, KLASY2, KTREXC,
-     $                   KTRSEN, KTRSNA, KTRSYL, LLAEXC, LLALN2, LLANV2,
-     $                   LLAQTR, LLASY2, LTREXC, LTRSYL, NLANV2, NLAQTR,
-     $                   NLASY2, NTESTS, NTRSYL, KTGEXC, NTGEXC, LTGEXC
+     $                   KTRSEN, KTRSNA, KTRSYL, KTRSYL3, LLAEXC,
+     $                   LLALN2, LLANV2, LLAQTR, LLASY2, LTREXC, LTRSYL,
+     $                   NLANV2, NLAQTR, NLASY2, NTESTS, NTRSYL, KTGEXC,
+     $                   LTGEXC
       REAL               EPS, RLAEXC, RLALN2, RLANV2, RLAQTR, RLASY2,
-     $                   RTREXC, RTRSYL, SFMIN, RTGEXC
+     $                   RTREXC, SFMIN, RTGEXC
 *     ..
 *     .. Local Arrays ..
-      INTEGER            LTRSEN( 3 ), LTRSNA( 3 ), NLAEXC( 2 ),
-     $                   NLALN2( 2 ), NTREXC( 3 ), NTRSEN( 3 ),
+      INTEGER            FTRSYL( 3 ), ITRSYL( 2 ), LTRSEN( 3 ),
+     $                   LTRSNA( 3 ), NLAEXC( 2 ), NLALN2( 2 ),
+     $                   NTGEXC( 2 ), NTREXC( 3 ), NTRSEN( 3 ),
      $                   NTRSNA( 3 )
-      REAL               RTRSEN( 3 ), RTRSNA( 3 )
+      REAL               RTRSEN( 3 ), RTRSNA( 3 ), RTRSYL( 2 )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SERREC, SGET31, SGET32, SGET33, SGET34, SGET35,
-     $                   SGET36, SGET37, SGET38, SGET39, SGET40
+     $                   SGET36, SGET37, SGET38, SGET39, SGET40, SSYL01
 *     ..
 *     .. External Functions ..
       REAL               SLAMCH
@@ -153,10 +156,24 @@ SUBROUTINE SCHKEC( THRESH, TSTERR, NIN, NOUT )
          WRITE( NOUT, FMT = 9996 )RLAEXC, LLAEXC, NLAEXC, KLAEXC
       END IF
 *
-      CALL SGET35( RTRSYL, LTRSYL, NTRSYL, KTRSYL )
-      IF( RTRSYL.GT.THRESH ) THEN
+      CALL SGET35( RTRSYL( 1 ), LTRSYL, NTRSYL, KTRSYL )
+      IF( RTRSYL( 1 ).GT.THRESH ) THEN
          OK = .FALSE.
-         WRITE( NOUT, FMT = 9995 )RTRSYL, LTRSYL, NTRSYL, KTRSYL
+         WRITE( NOUT, FMT = 9995 )RTRSYL( 1 ), LTRSYL, NTRSYL, KTRSYL
+      END IF
+*
+      CALL SSYL01( THRESH, FTRSYL, RTRSYL, ITRSYL, KTRSYL3 )
+      IF( FTRSYL( 1 ).GT.0 ) THEN
+         OK = .FALSE.
+         WRITE( NOUT, FMT = 9970 )FTRSYL( 1 ), RTRSYL( 1 ), THRESH
+      END IF
+      IF( FTRSYL( 2 ).GT.0 ) THEN
+         OK = .FALSE.
+         WRITE( NOUT, FMT = 9971 )FTRSYL( 2 ), RTRSYL( 2 ), THRESH
+      END IF
+      IF( FTRSYL( 3 ).GT.0 ) THEN
+         OK = .FALSE.
+         WRITE( NOUT, FMT = 9972 )FTRSYL( 3 )
       END IF
 *
       CALL SGET36( RTREXC, LTREXC, NTREXC, KTREXC, NIN )
@@ -227,7 +244,13 @@ SUBROUTINE SCHKEC( THRESH, TSTERR, NIN, NOUT )
  9987 FORMAT( ' Routines pass computational tests if test ratio is les',
      $      's than', F8.2, / / )
  9986 FORMAT( ' Error in STGEXC: RMAX =', E12.3, / ' LMAX = ', I8, ' N',
-     $      'INFO=', I8, ' KNT=', I8 )
+     $      'INFO=', 2I8, ' KNT=', I8 )
+ 9972 FORMAT( 'STRSYL and STRSYL3 compute an inconsistent result ',
+     $      'factor in ', I8, ' tests.')
+ 9971 FORMAT( 'Error in STRSYL3: ', I8, ' tests fail the threshold.', /
+     $      'Maximum test ratio =', D12.3, ' threshold =', D12.3 )
+ 9970 FORMAT( 'Error in STRSYL: ', I8, ' tests fail the threshold.', /
+     $      'Maximum test ratio =', D12.3, ' threshold =', D12.3 )
 *
 *     End of SCHKEC
 *
diff --git a/TESTING/EIG/schkee.F b/TESTING/EIG/schkee.F
index bf04b5e5b6..fa780b695c 100644
--- a/TESTING/EIG/schkee.F
+++ b/TESTING/EIG/schkee.F
@@ -2511,7 +2511,7 @@ PROGRAM SCHKEE
  9974 FORMAT( ' Tests of SSBTRD', / ' (reduction of a symmetric band ',
      $      'matrix to tridiagonal form)' )
  9973 FORMAT( / 1X, 71( '-' ) )
- 9972 FORMAT( / ' LAPACK VERSION ', I1, '.', I1, '.', I1 )
+ 9972 FORMAT( / ' LAPACK VERSION ', I1, '.', I2, '.', I1 )
  9971 FORMAT( / ' Tests of the Generalized Linear Regression Model ',
      $      'routines' )
  9970 FORMAT( / ' Tests of the Generalized QR and RQ routines' )
diff --git a/TESTING/EIG/schkgg.f b/TESTING/EIG/schkgg.f
index fff2a6c2e9..5736954413 100644
--- a/TESTING/EIG/schkgg.f
+++ b/TESTING/EIG/schkgg.f
@@ -508,6 +508,7 @@ SUBROUTINE SCHKGG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   S2, P1, P2, U, LDU, V, Q, Z, ALPHR1, ALPHI1,
      $                   BETA1, ALPHR3, ALPHI3, BETA3, EVECTL, EVECTR,
      $                   WORK, LWORK, LLWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -561,9 +562,9 @@ SUBROUTINE SCHKGG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           SLAMCH, SLANGE, SLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEQR2, SGET51, SGET52, SGGHRD, SHGEQZ, SLABAD,
-     $                   SLACPY, SLARFG, SLASET, SLASUM, SLATM4, SORM2R,
-     $                   STGEVC, XERBLA
+      EXTERNAL           SGEQR2, SGET51, SGET52, SGGHRD, SHGEQZ, SLACPY,
+     $                   SLARFG, SLASET, SLASUM, SLATM4, SORM2R, STGEVC,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, REAL, SIGN
@@ -641,7 +642,6 @@ SUBROUTINE SCHKGG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/schkgk.f b/TESTING/EIG/schkgk.f
index d8d98ca960..464d9dbc5e 100644
--- a/TESTING/EIG/schkgk.f
+++ b/TESTING/EIG/schkgk.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE SCHKGK( NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/schkgl.f b/TESTING/EIG/schkgl.f
index 5ce99d90a3..8bd51ac72a 100644
--- a/TESTING/EIG/schkgl.f
+++ b/TESTING/EIG/schkgl.f
@@ -50,6 +50,7 @@
 *
 *  =====================================================================
       SUBROUTINE SCHKGL( NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/schkhs.f b/TESTING/EIG/schkhs.f
index ab0e901383..1ac07ac972 100644
--- a/TESTING/EIG/schkhs.f
+++ b/TESTING/EIG/schkhs.f
@@ -23,7 +23,7 @@
 *       INTEGER            ISEED( 4 ), IWORK( * ), NN( * )
 *       REAL               A( LDA, * ), EVECTL( LDU, * ),
 *      $                   EVECTR( LDU, * ), EVECTX( LDU, * ),
-*      $                   EVECTY( LDU, * ), H( LDA, * ), RESULT( 14 ),
+*      $                   EVECTY( LDU, * ), H( LDA, * ), RESULT( 16 ),
 *      $                   T1( LDA, * ), T2( LDA, * ), TAU( * ),
 *      $                   U( LDU, * ), UU( LDU, * ), UZ( LDU, * ),
 *      $                   WI1( * ), WI2( * ), WI3( * ), WORK( * ),
@@ -54,10 +54,15 @@
 *>            SHSEIN computes the left and right eigenvector matrices
 *>            Y and X for H, using inverse iteration.
 *>
+*>            STREVC3 computes left and right eigenvector matrices
+*>            from a Schur matrix T and backtransforms them with Z
+*>            to eigenvector matrices L and R for A. L and R are
+*>            GE matrices.
+*>
 *>    When SCHKHS is called, a number of matrix "sizes" ("n's") and a
 *>    number of matrix "types" are specified.  For each size ("n")
 *>    and each type of matrix, one matrix will be generated and used
-*>    to test the nonsymmetric eigenroutines.  For each matrix, 14
+*>    to test the nonsymmetric eigenroutines.  For each matrix, 16
 *>    tests will be performed:
 *>
 *>    (1)     | A - U H U**T | / ( |A| n ulp )
@@ -88,6 +93,10 @@
 *>
 *>    (14)    | Y**H A - W**H Y | / ( |A| |Y| ulp )
 *>
+*>    (15)    | AR - RW | / ( |A| |R| ulp )
+*>
+*>    (16)    | LA - WL | / ( |A| |L| ulp )
+*>
 *>    The "sizes" are specified by an array NN(1:NSIZES); the value of
 *>    each element NN(j) specifies one size.
 *>    The "types" are specified by a logical array DOTYPE( 1:NTYPES );
@@ -331,7 +340,7 @@
 *>           Workspace.
 *>           Modified.
 *>
-*>  RESULT - REAL array, dimension (14)
+*>  RESULT - REAL array, dimension (16)
 *>           The values computed by the fourteen tests described above.
 *>           The values are currently limited to 1/ulp, to avoid
 *>           overflow.
@@ -409,6 +418,7 @@ SUBROUTINE SCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   WI1, WR2, WI2, WR3, WI3, EVECTL, EVECTR,
      $                   EVECTY, EVECTX, UU, TAU, WORK, NWORK, IWORK,
      $                   SELECT, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -423,7 +433,7 @@ SUBROUTINE SCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       INTEGER            ISEED( 4 ), IWORK( * ), NN( * )
       REAL               A( LDA, * ), EVECTL( LDU, * ),
      $                   EVECTR( LDU, * ), EVECTX( LDU, * ),
-     $                   EVECTY( LDU, * ), H( LDA, * ), RESULT( 14 ),
+     $                   EVECTY( LDU, * ), H( LDA, * ), RESULT( 16 ),
      $                   T1( LDA, * ), T2( LDA, * ), TAU( * ),
      $                   U( LDU, * ), UU( LDU, * ), UZ( LDU, * ),
      $                   WI1( * ), WI2( * ), WI3( * ), WORK( * ),
@@ -459,9 +469,9 @@ SUBROUTINE SCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           SCOPY, SGEHRD, SGEMM, SGET10, SGET22, SHSEIN,
-     $                   SHSEQR, SHST01, SLABAD, SLACPY, SLAFTS, SLASET,
-     $                   SLASUM, SLATME, SLATMR, SLATMS, SORGHR, SORMHR,
-     $                   STREVC, XERBLA
+     $                   SHSEQR, SHST01, SLACPY, SLAFTS, SLASET, SLASUM,
+     $                   SLATME, SLATMR, SLATMS, SORGHR, SORMHR, STREVC,
+     $                   STREVC3, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, REAL, SQRT
@@ -521,7 +531,6 @@ SUBROUTINE SCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = SLAMCH( 'Overflow' )
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
@@ -561,7 +570,7 @@ SUBROUTINE SCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
 *           Initialize RESULT
 *
-            DO 30 J = 1, 14
+            DO 30 J = 1, 16
                RESULT( J ) = ZERO
    30       CONTINUE
 *
@@ -1108,6 +1117,64 @@ SUBROUTINE SCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $            RESULT( 14 ) = DUMMA( 3 )*ANINV
             END IF
 *
+*           Compute Left and Right Eigenvectors of A
+*
+*           Compute a Right eigenvector matrix:
+*
+            NTEST = 15
+            RESULT( 15 ) = ULPINV
+*
+            CALL SLACPY( ' ', N, N, UZ, LDU, EVECTR, LDU )
+*
+            CALL STREVC3( 'Right', 'Back', SELECT, N, T1, LDA, DUMMA,
+     $                    LDU, EVECTR, LDU, N, IN, WORK, NWORK, IINFO )
+            IF( IINFO.NE.0 ) THEN
+               WRITE( NOUNIT, FMT = 9999 )'STREVC3(R,B)', IINFO, N,
+     $            JTYPE, IOLDSD
+               INFO = ABS( IINFO )
+               GO TO 250
+            END IF
+*
+*           Test 15:  | AR - RW | / ( |A| |R| ulp )
+*
+*                     (from Schur decomposition)
+*
+            CALL SGET22( 'N', 'N', 'N', N, A, LDA, EVECTR, LDU, WR1,
+     $                   WI1, WORK, DUMMA( 1 ) )
+            RESULT( 15 ) = DUMMA( 1 )
+            IF( DUMMA( 2 ).GT.THRESH ) THEN
+               WRITE( NOUNIT, FMT = 9998 )'Right', 'STREVC3',
+     $            DUMMA( 2 ), N, JTYPE, IOLDSD
+            END IF
+*
+*           Compute a Left eigenvector matrix:
+*
+            NTEST = 16
+            RESULT( 16 ) = ULPINV
+*
+            CALL SLACPY( ' ', N, N, UZ, LDU, EVECTL, LDU )
+*
+            CALL STREVC3( 'Left', 'Back', SELECT, N, T1, LDA, EVECTL,
+     $                    LDU, DUMMA, LDU, N, IN, WORK, NWORK, IINFO )
+            IF( IINFO.NE.0 ) THEN
+               WRITE( NOUNIT, FMT = 9999 )'STREVC3(L,B)', IINFO, N,
+     $            JTYPE, IOLDSD
+               INFO = ABS( IINFO )
+               GO TO 250
+            END IF
+*
+*           Test 16:  | LA - WL | / ( |A| |L| ulp )
+*
+*                     (from Schur decomposition)
+*
+            CALL SGET22( 'Trans', 'N', 'Conj', N, A, LDA, EVECTL, LDU,
+     $                   WR1, WI1, WORK, DUMMA( 3 ) )
+            RESULT( 16 ) = DUMMA( 3 )
+            IF( DUMMA( 4 ).GT.THRESH ) THEN
+               WRITE( NOUNIT, FMT = 9998 )'Left', 'STREVC3', DUMMA( 4 ),
+     $            N, JTYPE, IOLDSD
+            END IF
+*
 *           End of Loop -- Check for RESULT(j) > THRESH
 *
   250       CONTINUE
diff --git a/TESTING/EIG/schksb.f b/TESTING/EIG/schksb.f
index b93e9e6801..096d57247c 100644
--- a/TESTING/EIG/schksb.f
+++ b/TESTING/EIG/schksb.f
@@ -290,6 +290,7 @@
       SUBROUTINE SCHKSB( NSIZES, NN, NWDTHS, KK, NTYPES, DOTYPE, ISEED,
      $                   THRESH, NOUNIT, A, LDA, SD, SE, U, LDU, WORK,
      $                   LWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/schksb2stg.f b/TESTING/EIG/schksb2stg.f
index 8d9bb1cdf8..d9ec6db295 100644
--- a/TESTING/EIG/schksb2stg.f
+++ b/TESTING/EIG/schksb2stg.f
@@ -329,6 +329,7 @@
       SUBROUTINE SCHKSB2STG( NSIZES, NN, NWDTHS, KK, NTYPES, DOTYPE,
      $                   ISEED, THRESH, NOUNIT, A, LDA, SD, SE, D1,
      $                   D2, D3, U, LDU, WORK, LWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -840,8 +841,9 @@ SUBROUTINE SCHKSB2STG( NSIZES, NN, NWDTHS, KK, NTYPES, DOTYPE,
       CALL SLASUM( 'SSB', NOUNIT, NERRS, NTESTT )
       RETURN
 *
- 9999 FORMAT( ' SCHKSB2STG: ', A, ' returned INFO=', I6, '.', / 9X, 'N=',
-     $      I6, ', JTYPE=', I6, ', ISEED=(', 3( I5, ',' ), I5, ')' )
+ 9999 FORMAT( ' SCHKSB2STG: ', A, ' returned INFO=', I6, '.', / 9X,
+     $      'N=', I6, ', JTYPE=', I6, ', ISEED=(', 3( I5, ',' ), I5,
+     $      ')' )
 *
  9998 FORMAT( / 1X, A3,
      $      ' -- Real Symmetric Banded Tridiagonal Reduction Routines' )
diff --git a/TESTING/EIG/schkst.f b/TESTING/EIG/schkst.f
index 10622d77a7..91b9db668c 100644
--- a/TESTING/EIG/schkst.f
+++ b/TESTING/EIG/schkst.f
@@ -363,7 +363,7 @@
 *> \verbatim
 *>          D1 is REAL array of
 *>                             dimension( max(NN) )
-*>          The eigenvalues of A, as computed by SSTEQR simlutaneously
+*>          The eigenvalues of A, as computed by SSTEQR simultaneously
 *>          with Z.  On exit, the eigenvalues in D1 correspond with the
 *>          matrix in A.
 *> \endverbatim
@@ -588,6 +588,7 @@ SUBROUTINE SCHKST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, AP, SD, SE, D1, D2, D3, D4, D5,
      $                   WA1, WA2, WA3, WR, U, LDU, V, VP, TAU, Z, WORK,
      $                   LWORK, IWORK, LIWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -645,10 +646,10 @@ SUBROUTINE SCHKST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           ILAENV, SLAMCH, SLARND, SSXT1
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLABAD, SLACPY, SLASET, SLASUM, SLATMR,
-     $                   SLATMS, SOPGTR, SORGTR, SPTEQR, SSPT21, SSPTRD,
-     $                   SSTEBZ, SSTECH, SSTEDC, SSTEMR, SSTEIN, SSTEQR,
-     $                   SSTERF, SSTT21, SSTT22, SSYT21, SSYTRD, XERBLA
+      EXTERNAL           SCOPY, SLACPY, SLASET, SLASUM, SLATMR, SLATMS,
+     $                   SOPGTR, SORGTR, SPTEQR, SSPT21, SSPTRD, SSTEBZ,
+     $                   SSTECH, SSTEDC, SSTEMR, SSTEIN, SSTEQR, SSTERF,
+     $                   SSTT21, SSTT22, SSYT21, SSYTRD, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, INT, LOG, MAX, MIN, REAL, SQRT
@@ -715,7 +716,6 @@ SUBROUTINE SCHKST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       ULPINV = ONE / ULP
       LOG2UI = INT( LOG( ULPINV ) / LOG( TWO ) )
diff --git a/TESTING/EIG/schkst2stg.f b/TESTING/EIG/schkst2stg.f
index 62b93c08f8..1e65fa2fae 100644
--- a/TESTING/EIG/schkst2stg.f
+++ b/TESTING/EIG/schkst2stg.f
@@ -384,7 +384,7 @@
 *> \verbatim
 *>          D1 is REAL array of
 *>                             dimension( max(NN) )
-*>          The eigenvalues of A, as computed by SSTEQR simlutaneously
+*>          The eigenvalues of A, as computed by SSTEQR simultaneously
 *>          with Z.  On exit, the eigenvalues in D1 correspond with the
 *>          matrix in A.
 *> \endverbatim
@@ -609,6 +609,7 @@ SUBROUTINE SCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, AP, SD, SE, D1, D2, D3, D4, D5,
      $                   WA1, WA2, WA3, WR, U, LDU, V, VP, TAU, Z, WORK,
      $                   LWORK, IWORK, LIWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -666,10 +667,10 @@ SUBROUTINE SCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           ILAENV, SLAMCH, SLARND, SSXT1
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLABAD, SLACPY, SLASET, SLASUM, SLATMR,
-     $                   SLATMS, SOPGTR, SORGTR, SPTEQR, SSPT21, SSPTRD,
-     $                   SSTEBZ, SSTECH, SSTEDC, SSTEMR, SSTEIN, SSTEQR,
-     $                   SSTERF, SSTT21, SSTT22, SSYT21, SSYTRD, XERBLA,
+      EXTERNAL           SCOPY, SLACPY, SLASET, SLASUM, SLATMR, SLATMS,
+     $                   SOPGTR, SORGTR, SPTEQR, SSPT21, SSPTRD, SSTEBZ,
+     $                   SSTECH, SSTEDC, SSTEMR, SSTEIN, SSTEQR, SSTERF,
+     $                   SSTT21, SSTT22, SSYT21, SSYTRD, XERBLA,
      $                   SSYTRD_2STAGE
 *     ..
 *     .. Intrinsic Functions ..
@@ -737,7 +738,6 @@ SUBROUTINE SCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       ULPINV = ONE / ULP
       LOG2UI = INT( LOG( ULPINV ) / LOG( TWO ) )
@@ -1055,7 +1055,6 @@ SUBROUTINE SCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                END IF
             END IF
 *
-*
 *           Do Tests 3 and 4 which are similar to 11 and 12 but with the
 *           D1 computed using the standard 1-stage reduction as reference
 *
@@ -1715,7 +1714,6 @@ SUBROUTINE SCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                         END IF
                      END IF
 *
-*
 *                 Do test 28
 *
                      TEMP2 = TWO*( TWO*N-ONE )*ULP*
@@ -1814,7 +1812,6 @@ SUBROUTINE SCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                   RESULT( 31 ) = TEMP2 / MAX( UNFL,
      $                           ULP*MAX( TEMP1, TEMP2 ) )
 *
-*
 *           Call SSTEMR(V,V) to compute D1 and Z, do tests.
 *
 *           Compute D1 and Z
@@ -1916,7 +1913,6 @@ SUBROUTINE SCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                   RESULT( 34 ) = ZERO
                END IF
 *
-*
 *           Call SSTEMR(V,A) to compute D1 and Z, do tests.
 *
 *           Compute D1 and Z
@@ -1973,7 +1969,7 @@ SUBROUTINE SCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                   END IF
                END IF
 *
-*           Do Test 34
+*           Do Test 37
 *
                TEMP1 = ZERO
                TEMP2 = ZERO
@@ -1992,7 +1988,6 @@ SUBROUTINE SCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
 *           End of Loop -- Check for RESULT(j) > THRESH
 *
-*
 *           Print out tests which fail.
 *
             DO 290 JR = 1, NTEST
diff --git a/TESTING/EIG/sckglm.f b/TESTING/EIG/sckglm.f
index 167cb61de7..c3cea580ee 100644
--- a/TESTING/EIG/sckglm.f
+++ b/TESTING/EIG/sckglm.f
@@ -164,6 +164,7 @@
       SUBROUTINE SCKGLM( NN, MVAL, PVAL, NVAL, NMATS, ISEED, THRESH,
      $                   NMAX, A, AF, B, BF, X, WORK, RWORK, NIN, NOUT,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sckgqr.f b/TESTING/EIG/sckgqr.f
index 919879504f..8db203ad9e 100644
--- a/TESTING/EIG/sckgqr.f
+++ b/TESTING/EIG/sckgqr.f
@@ -207,6 +207,7 @@
       SUBROUTINE SCKGQR( NM, MVAL, NP, PVAL, NN, NVAL, NMATS, ISEED,
      $                   THRESH, NMAX, A, AF, AQ, AR, TAUA, B, BF, BZ,
      $                   BT, BWK, TAUB, WORK, RWORK, NIN, NOUT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sckgsv.f b/TESTING/EIG/sckgsv.f
index 20838b5ba8..9cd4c4210d 100644
--- a/TESTING/EIG/sckgsv.f
+++ b/TESTING/EIG/sckgsv.f
@@ -195,6 +195,7 @@
       SUBROUTINE SCKGSV( NM, MVAL, PVAL, NVAL, NMATS, ISEED, THRESH,
      $                   NMAX, A, AF, B, BF, U, V, Q, ALPHA, BETA, R,
      $                   IWORK, WORK, RWORK, NIN, NOUT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/scklse.f b/TESTING/EIG/scklse.f
index 123217688e..7979e70fcf 100644
--- a/TESTING/EIG/scklse.f
+++ b/TESTING/EIG/scklse.f
@@ -164,6 +164,7 @@
       SUBROUTINE SCKLSE( NN, MVAL, PVAL, NVAL, NMATS, ISEED, THRESH,
      $                   NMAX, A, AF, B, BF, X, WORK, RWORK, NIN, NOUT,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/scsdts.f b/TESTING/EIG/scsdts.f
index 1debe8341d..245b592a5e 100644
--- a/TESTING/EIG/scsdts.f
+++ b/TESTING/EIG/scsdts.f
@@ -226,6 +226,7 @@
       SUBROUTINE SCSDTS( M, P, Q, X, XF, LDX, U1, LDU1, U2, LDU2, V1T,
      $                   LDV1T, V2T, LDV2T, THETA, IWORK, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sdrges.f b/TESTING/EIG/sdrges.f
index 73d23125c2..fda8b56447 100644
--- a/TESTING/EIG/sdrges.f
+++ b/TESTING/EIG/sdrges.f
@@ -400,6 +400,7 @@ SUBROUTINE SDRGES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, B, S, T, Q, LDQ, Z, ALPHAR,
      $                   ALPHAI, BETA, WORK, LWORK, RESULT, BWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -451,8 +452,8 @@ SUBROUTINE SDRGES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           SLCTES, ILAENV, SLAMCH, SLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, SGET51, SGET53, SGET54, SGGES, SLABAD,
-     $                   SLACPY, SLARFG, SLASET, SLATM4, SORM2R, XERBLA
+      EXTERNAL           ALASVM, SGET51, SGET53, SGET54, SGGES, SLACPY,
+     $                   SLARFG, SLASET, SLATM4, SORM2R, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, REAL, SIGN
@@ -541,7 +542,6 @@ SUBROUTINE SDRGES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/sdrges3.f b/TESTING/EIG/sdrges3.f
index 9c82725789..b9abc64fd2 100644
--- a/TESTING/EIG/sdrges3.f
+++ b/TESTING/EIG/sdrges3.f
@@ -400,6 +400,7 @@ SUBROUTINE SDRGES3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                    NOUNIT, A, LDA, B, S, T, Q, LDQ, Z, ALPHAR,
      $                    ALPHAI, BETA, WORK, LWORK, RESULT, BWORK,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -451,8 +452,8 @@ SUBROUTINE SDRGES3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           SLCTES, ILAENV, SLAMCH, SLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, SGET51, SGET53, SGET54, SGGES3, SLABAD,
-     $                   SLACPY, SLARFG, SLASET, SLATM4, SORM2R, XERBLA
+      EXTERNAL           ALASVM, SGET51, SGET53, SGET54, SGGES3, SLACPY,
+     $                   SLARFG, SLASET, SLATM4, SORM2R, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, REAL, SIGN
@@ -541,7 +542,6 @@ SUBROUTINE SDRGES3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/sdrgev.f b/TESTING/EIG/sdrgev.f
index 5254a97235..24dd20f049 100644
--- a/TESTING/EIG/sdrgev.f
+++ b/TESTING/EIG/sdrgev.f
@@ -405,6 +405,7 @@ SUBROUTINE SDRGEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, B, S, T, Q, LDQ, Z, QE, LDQE,
      $                   ALPHAR, ALPHAI, BETA, ALPHR1, ALPHI1, BETA1,
      $                   WORK, LWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -455,7 +456,7 @@ SUBROUTINE SDRGEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           ILAENV, SLAMCH, SLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, SGET52, SGGEV, SLABAD, SLACPY, SLARFG,
+      EXTERNAL           ALASVM, SGET52, SGGEV, SLACPY, SLARFG,
      $                   SLASET, SLATM4, SORM2R, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -546,7 +547,6 @@ SUBROUTINE SDRGEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/sdrgev3.f b/TESTING/EIG/sdrgev3.f
index 1b1d82292c..772e47a555 100644
--- a/TESTING/EIG/sdrgev3.f
+++ b/TESTING/EIG/sdrgev3.f
@@ -405,6 +405,7 @@ SUBROUTINE SDRGEV3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                    NOUNIT, A, LDA, B, S, T, Q, LDQ, Z, QE, LDQE,
      $                    ALPHAR, ALPHAI, BETA, ALPHR1, ALPHI1, BETA1,
      $                    WORK, LWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -455,8 +456,8 @@ SUBROUTINE SDRGEV3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           ILAENV, SLAMCH, SLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, SGET52, SGGEV3, SLABAD, SLACPY, SLARFG,
-     $                   SLASET, SLATM4, SORM2R, XERBLA
+      EXTERNAL           ALASVM, SGET52, SGGEV3, SLACPY, SLARFG, SLASET,
+     $                   SLATM4, SORM2R, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, REAL, SIGN
@@ -546,7 +547,6 @@ SUBROUTINE SDRGEV3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL SLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/sdrgsx.f b/TESTING/EIG/sdrgsx.f
index ce0d592144..daf118a051 100644
--- a/TESTING/EIG/sdrgsx.f
+++ b/TESTING/EIG/sdrgsx.f
@@ -356,6 +356,7 @@
       SUBROUTINE SDRGSX( NSIZE, NCMAX, THRESH, NIN, NOUT, A, LDA, B,
      $                   AI, BI, Z, Q, ALPHAR, ALPHAI, BETA, C, LDC, S,
      $                   WORK, LWORK, IWORK, LIWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -400,7 +401,7 @@ SUBROUTINE SDRGSX( NSIZE, NCMAX, THRESH, NIN, NOUT, A, LDA, B,
       EXTERNAL           SLCTSX, ILAENV, SLAMCH, SLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, SGESVD, SGET51, SGET53, SGGESX, SLABAD,
+      EXTERNAL           ALASVM, SGESVD, SGET51, SGET53, SGGESX,
      $                   SLACPY, SLAKF2, SLASET, SLATM5, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -479,7 +480,6 @@ SUBROUTINE SDRGSX( NSIZE, NCMAX, THRESH, NIN, NOUT, A, LDA, B,
       ULPINV = ONE / ULP
       SMLNUM = SLAMCH( 'S' ) / ULP
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       THRSH2 = TEN*THRESH
       NTESTT = 0
       NERRS = 0
@@ -985,7 +985,7 @@ SUBROUTINE SDRGSX( NSIZE, NCMAX, THRESH, NIN, NOUT, A, LDA, B,
      $      / '  2:  A and B are upper triangular matrices, ',
      $      / '  3:  A and B are as type 2, but each second diagonal ',
      $      'block in A_11 and ', /
-     $      '      each third diaongal block in A_22 are 2x2 blocks,',
+     $      '      each third diagonal block in A_22 are 2x2 blocks,',
      $      / '  4:  A and B are block diagonal matrices, ',
      $      / '  5:  (A,B) has potentially close or common ',
      $      'eigenvalues.', / )
diff --git a/TESTING/EIG/sdrgvx.f b/TESTING/EIG/sdrgvx.f
index f6da720ad5..59a0c67cc6 100644
--- a/TESTING/EIG/sdrgvx.f
+++ b/TESTING/EIG/sdrgvx.f
@@ -57,7 +57,7 @@
 *>
 *>    | l**H * (beta A - alpha B) | / ( ulp max( |beta A|, |alpha B| ) )
 *>
-*>     where l**H is the conjugate tranpose of l.
+*>     where l**H is the conjugate transpose of l.
 *>
 *> (2) max over all right eigenvalue/-vector pairs (beta/alpha,r) of
 *>
@@ -298,6 +298,7 @@ SUBROUTINE SDRGVX( NSIZE, THRESH, NIN, NOUT, A, LDA, B, AI, BI,
      $                   ALPHAR, ALPHAI, BETA, VL, VR, ILO, IHI, LSCALE,
      $                   RSCALE, S, STRU, DIF, DIFTRU, WORK, LWORK,
      $                   IWORK, LIWORK, RESULT, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sdrvbd.f b/TESTING/EIG/sdrvbd.f
index de6d5a4123..77abb532f4 100644
--- a/TESTING/EIG/sdrvbd.f
+++ b/TESTING/EIG/sdrvbd.f
@@ -420,8 +420,8 @@ SUBROUTINE SDRVBD( NSIZES, MM, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALASVM, SBDT01, SGEJSV, SGESDD, SGESVD,
-     $                   SGESVDQ, SGESVDX, SGESVJ, SLABAD, SLACPY,
-     $                   SLASET, SLATMS, SORT01, SORT03, XERBLA
+     $                   SGESVDQ, SGESVDX, SGESVJ, SLACPY, SLASET,
+     $                   SLATMS, SORT01, SORT03, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, REAL, INT, MAX, MIN
@@ -497,7 +497,6 @@ SUBROUTINE SDRVBD( NSIZES, MM, NN, NTYPES, DOTYPE, ISEED, THRESH,
       NTEST = 0
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Precision' )
       RTUNFL = SQRT( UNFL )
       ULPINV = ONE / ULP
diff --git a/TESTING/EIG/sdrves.f b/TESTING/EIG/sdrves.f
index 4e3dc0a6d9..f87b028c27 100644
--- a/TESTING/EIG/sdrves.f
+++ b/TESTING/EIG/sdrves.f
@@ -385,6 +385,7 @@
       SUBROUTINE SDRVES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, H, HT, WR, WI, WRT, WIT, VS,
      $                   LDVS, RESULT, WORK, NWORK, IWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -444,8 +445,8 @@ SUBROUTINE SDRVES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           SSLECT, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEES, SHST01, SLABAD, SLACPY, SLASUM, SLATME,
-     $                   SLATMR, SLATMS, SLASET, XERBLA
+      EXTERNAL           SGEES, SHST01, SLACPY, SLASUM, SLATME, SLATMR,
+     $                   SLATMS, SLASET, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SIGN, SQRT
@@ -514,7 +515,6 @@ SUBROUTINE SDRVES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       RTULP = SQRT( ULP )
diff --git a/TESTING/EIG/sdrvev.f b/TESTING/EIG/sdrvev.f
index 6d5e34bf6f..d7131338a4 100644
--- a/TESTING/EIG/sdrvev.f
+++ b/TESTING/EIG/sdrvev.f
@@ -403,6 +403,7 @@ SUBROUTINE SDRVEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, H, WR, WI, WR1, WI1, VL, LDVL,
      $                   VR, LDVR, LRE, LDLRE, RESULT, WORK, NWORK,
      $                   IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -452,7 +453,7 @@ SUBROUTINE SDRVEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           SLAMCH, SLAPY2, SNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEEV, SGET22, SLABAD, SLACPY, SLASUM, SLATME,
+      EXTERNAL           SGEEV, SGET22, SLACPY, SLASUM, SLATME,
      $                   SLATMR, SLATMS, SLASET, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -525,7 +526,6 @@ SUBROUTINE SDRVEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       RTULP = SQRT( ULP )
diff --git a/TESTING/EIG/sdrvsg.f b/TESTING/EIG/sdrvsg.f
index 4a57223c80..de7ce12f7f 100644
--- a/TESTING/EIG/sdrvsg.f
+++ b/TESTING/EIG/sdrvsg.f
@@ -234,7 +234,7 @@
 *>
 *>  B       REAL array, dimension (LDB , max(NN))
 *>          Used to hold the symmetric positive definite matrix for
-*>          the generailzed problem.
+*>          the generalized problem.
 *>          On exit, B contains the last matrix actually
 *>          used.
 *>          Modified.
@@ -352,6 +352,7 @@
       SUBROUTINE SDRVSG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, B, LDB, D, Z, LDZ, AB, BB, AP,
      $                   BP, WORK, NWORK, IWORK, LIWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -399,7 +400,7 @@ SUBROUTINE SDRVSG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           LSAME, SLAMCH, SLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLABAD, SLACPY, SLAFTS, SLASET, SLASUM, SLATMR,
+      EXTERNAL           SLACPY, SLAFTS, SLASET, SLASUM, SLATMR,
      $                   SLATMS, SSBGV, SSBGVD, SSBGVX, SSGT01, SSPGV,
      $                   SSPGVD, SSPGVX, SSYGV, SSYGVD, SSYGVX, XERBLA
 *     ..
@@ -460,7 +461,6 @@ SUBROUTINE SDRVSG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = SLAMCH( 'Overflow' )
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
@@ -645,8 +645,8 @@ SUBROUTINE SDRVSG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                IL = 1
                IU = N
             ELSE
-               IL = 1 + ( N-1 )*SLARND( 1, ISEED2 )
-               IU = 1 + ( N-1 )*SLARND( 1, ISEED2 )
+               IL = 1 + INT( ( N-1 )*SLARND( 1, ISEED2 ) )
+               IU = 1 + INT( ( N-1 )*SLARND( 1, ISEED2 ) )
                IF( IL.GT.IU ) THEN
                   ITEMP = IL
                   IL = IU
diff --git a/TESTING/EIG/sdrvsg2stg.f b/TESTING/EIG/sdrvsg2stg.f
index ebd1699777..38ed616281 100644
--- a/TESTING/EIG/sdrvsg2stg.f
+++ b/TESTING/EIG/sdrvsg2stg.f
@@ -240,7 +240,7 @@
 *>
 *>  B       REAL             array, dimension (LDB , max(NN))
 *>          Used to hold the symmetric positive definite matrix for
-*>          the generailzed problem.
+*>          the generalized problem.
 *>          On exit, B contains the last matrix actually
 *>          used.
 *>          Modified.
@@ -408,7 +408,7 @@ SUBROUTINE SDRVSG2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           LSAME, SLAMCH, SLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLABAD, SLACPY, SLAFTS, SLASET, SLASUM, SLATMR,
+      EXTERNAL           SLACPY, SLAFTS, SLASET, SLASUM, SLATMR,
      $                   SLATMS, SSBGV, SSBGVD, SSBGVX, SSGT01, SSPGV,
      $                   SSPGVD, SSPGVX, SSYGV, SSYGVD, SSYGVX, XERBLA,
      $                   SSYGV_2STAGE
@@ -470,7 +470,6 @@ SUBROUTINE SDRVSG2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = SLAMCH( 'Overflow' )
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
diff --git a/TESTING/EIG/sdrvst.f b/TESTING/EIG/sdrvst.f
index ea0cf66f9f..22fdf264ea 100644
--- a/TESTING/EIG/sdrvst.f
+++ b/TESTING/EIG/sdrvst.f
@@ -214,7 +214,7 @@
 *>          Not modified.
 *>
 *>  D1      REAL array, dimension (max(NN))
-*>          The eigenvalues of A, as computed by SSTEQR simlutaneously
+*>          The eigenvalues of A, as computed by SSTEQR simultaneously
 *>          with Z.  On exit, the eigenvalues in D1 correspond with the
 *>          matrix in A.
 *>          Modified.
@@ -450,6 +450,7 @@ SUBROUTINE SDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, D1, D2, D3, D4, EVEIGS, WA1,
      $                   WA2, WA3, U, LDU, V, TAU, Z, WORK, LWORK,
      $                   IWORK, LIWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -502,11 +503,11 @@ SUBROUTINE SDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           SLAMCH, SLARND, SSXT1
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, SLABAD, SLACPY, SLAFTS, SLASET, SLATMR,
-     $                   SLATMS, SSBEV, SSBEVD, SSBEVX, SSPEV, SSPEVD,
-     $                   SSPEVX, SSTEV, SSTEVD, SSTEVR, SSTEVX, SSTT21,
-     $                   SSTT22, SSYEV, SSYEVD, SSYEVR, SSYEVX, SSYT21,
-     $                   SSYT22, XERBLA
+      EXTERNAL           ALASVM, SLACPY, SLAFTS, SLASET, SLATMR, SLATMS,
+     $                   SSBEV, SSBEVD, SSBEVX, SSPEV, SSPEVD, SSPEVX,
+     $                   SSTEV, SSTEVD, SSTEVR, SSTEVX, SSTT21, SSTT22,
+     $                   SSYEV, SSYEVD, SSYEVR, SSYEVX, SSYT21, SSYT22,
+     $                   XERBLA
 *     ..
 *     .. Scalars in Common ..
       CHARACTER*32       SRNAMT
@@ -574,7 +575,6 @@ SUBROUTINE SDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = SLAMCH( 'Overflow' )
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
@@ -2773,7 +2773,7 @@ SUBROUTINE SDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                      RESULT( NTEST ) = ULPINV
                      RESULT( NTEST+1 ) = ULPINV
                      RESULT( NTEST+2 ) = ULPINV
-                     GO TO 700
+                     GO TO 1750
                   END IF
                END IF
 *
@@ -2798,13 +2798,13 @@ SUBROUTINE SDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                      RETURN
                   ELSE
                      RESULT( NTEST ) = ULPINV
-                     GO TO 700
+                     GO TO 1750
                   END IF
                END IF
 *
                IF( M3.EQ.0 .AND. N.GT.0 ) THEN
                   RESULT( NTEST ) = ULPINV
-                  GO TO 700
+                  GO TO 1750
                END IF
 *
 *              Do test 78 (or +54)
@@ -2820,6 +2820,8 @@ SUBROUTINE SDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                           MAX( UNFL, TEMP3*ULP )
 *
                CALL SLACPY( ' ', N, N, V, LDU, A, LDA )
+*
+ 1750       CONTINUE
 *
  1720       CONTINUE
 *
diff --git a/TESTING/EIG/sdrvst2stg.f b/TESTING/EIG/sdrvst2stg.f
index a13a58b486..6fe62b0713 100644
--- a/TESTING/EIG/sdrvst2stg.f
+++ b/TESTING/EIG/sdrvst2stg.f
@@ -214,7 +214,7 @@
 *>          Not modified.
 *>
 *>  D1      REAL             array, dimension (max(NN))
-*>          The eigenvalues of A, as computed by SSTEQR simlutaneously
+*>          The eigenvalues of A, as computed by SSTEQR simultaneously
 *>          with Z.  On exit, the eigenvalues in D1 correspond with the
 *>          matrix in A.
 *>          Modified.
@@ -450,6 +450,7 @@ SUBROUTINE SDRVST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, D1, D2, D3, D4, EVEIGS, WA1,
      $                   WA2, WA3, U, LDU, V, TAU, Z, WORK, LWORK,
      $                   IWORK, LIWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -502,7 +503,7 @@ SUBROUTINE SDRVST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           SLAMCH, SLARND, SSXT1
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, SLABAD, SLACPY, SLAFTS, SLASET, SLATMR,
+      EXTERNAL           ALASVM, SLACPY, SLAFTS, SLASET, SLATMR,
      $                   SLATMS, SSBEV, SSBEVD, SSBEVX, SSPEV, SSPEVD,
      $                   SSPEVX, SSTEV, SSTEVD, SSTEVR, SSTEVX, SSTT21,
      $                   SSTT22, SSYEV, SSYEVD, SSYEVR, SSYEVX, SSYT21,
@@ -577,7 +578,6 @@ SUBROUTINE SDRVST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = SLAMCH( 'Overflow' )
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
diff --git a/TESTING/EIG/sdrvsx.f b/TESTING/EIG/sdrvsx.f
index b6f772f5b6..03406409f5 100644
--- a/TESTING/EIG/sdrvsx.f
+++ b/TESTING/EIG/sdrvsx.f
@@ -451,6 +451,7 @@ SUBROUTINE SDRVSX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NIUNIT, NOUNIT, A, LDA, H, HT, WR, WI, WRT,
      $                   WIT, WRTMP, WITMP, VS, LDVS, VS1, RESULT, WORK,
      $                   LWORK, IWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -508,7 +509,7 @@ SUBROUTINE SDRVSX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGET24, SLABAD, SLASUM, SLATME, SLATMR, SLATMS,
+      EXTERNAL           SGET24, SLASUM, SLATME, SLATMR, SLATMS,
      $                   SLASET, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -583,7 +584,6 @@ SUBROUTINE SDRVSX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       RTULP = SQRT( ULP )
diff --git a/TESTING/EIG/sdrvvx.f b/TESTING/EIG/sdrvvx.f
index 70e59bcea9..0d7b8d3809 100644
--- a/TESTING/EIG/sdrvvx.f
+++ b/TESTING/EIG/sdrvvx.f
@@ -517,6 +517,7 @@ SUBROUTINE SDRVVX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   VL, LDVL, VR, LDVR, LRE, LDLRE, RCONDV, RCNDV1,
      $                   RCDVIN, RCONDE, RCNDE1, RCDEIN, SCALE, SCALE1,
      $                   RESULT, WORK, NWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -567,8 +568,8 @@ SUBROUTINE SDRVVX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGET23, SLABAD, SLASUM, SLATME, SLATMR, SLATMS,
-     $                   SLASET, XERBLA
+      EXTERNAL           SGET23, SLASUM, SLATME, SLATMR, SLATMS, SLASET,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, SQRT
@@ -643,7 +644,6 @@ SUBROUTINE SDRVVX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = SLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       ULP = SLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       RTULP = SQRT( ULP )
diff --git a/TESTING/EIG/serrbd.f b/TESTING/EIG/serrbd.f
index f8962596cb..c4abad1c2f 100644
--- a/TESTING/EIG/serrbd.f
+++ b/TESTING/EIG/serrbd.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRBD( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -111,7 +112,7 @@ SUBROUTINE SERRBD( PATH, NUNIT )
 *
       DO 20 J = 1, NMAX
          DO 10 I = 1, NMAX
-            A( I, J ) = 1.D0 / REAL( I+J )
+            A( I, J ) = 1. / REAL( I+J )
    10    CONTINUE
    20 CONTINUE
       OK = .TRUE.
diff --git a/TESTING/EIG/serrec.f b/TESTING/EIG/serrec.f
index 249f0e6424..6c89ed3a1e 100644
--- a/TESTING/EIG/serrec.f
+++ b/TESTING/EIG/serrec.f
@@ -23,7 +23,7 @@
 *>
 *> SERREC tests the error exits for the routines for eigen- condition
 *> estimation for REAL matrices:
-*>    STRSYL, STREXC, STRSNA and STRSEN.
+*>    STRSYL, STRSYL3, STREXC, STRSNA and STRSEN.
 *> \endverbatim
 *
 *  Arguments:
@@ -53,6 +53,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERREC( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -82,7 +83,7 @@ SUBROUTINE SERREC( PATH, NUNIT )
      $                   WI( NMAX ), WORK( NMAX ), WR( NMAX )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHKXER, STREXC, STRSEN, STRSNA, STRSYL
+      EXTERNAL           CHKXER, STREXC, STRSEN, STRSNA, STRSYL, STRSYL3
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -141,6 +142,43 @@ SUBROUTINE SERREC( PATH, NUNIT )
       CALL CHKXER( 'STRSYL', INFOT, NOUT, LERR, OK )
       NT = NT + 8
 *
+*     Test STRSYL3
+*
+      SRNAMT = 'STRSYL3'
+      INFOT = 1
+      CALL STRSYL3( 'X', 'N', 1, 0, 0, A, 1, B, 1, C, 1, SCALE,
+     $              IWORK, NMAX, WORK, NMAX, INFO )
+      CALL CHKXER( 'STRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL STRSYL3( 'N', 'X', 1, 0, 0, A, 1, B, 1, C, 1, SCALE,
+     $              IWORK, NMAX, WORK, NMAX, INFO )
+      CALL CHKXER( 'STRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL STRSYL3( 'N', 'N', 0, 0, 0, A, 1, B, 1, C, 1, SCALE,
+     $              IWORK, NMAX, WORK, NMAX, INFO )
+      CALL CHKXER( 'STRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL STRSYL3( 'N', 'N', 1, -1, 0, A, 1, B, 1, C, 1, SCALE,
+     $              IWORK, NMAX, WORK, NMAX, INFO )
+      CALL CHKXER( 'STRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL STRSYL3( 'N', 'N', 1, 0, -1, A, 1, B, 1, C, 1, SCALE,
+     $              IWORK, NMAX, WORK, NMAX, INFO )
+      CALL CHKXER( 'STRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 7
+      CALL STRSYL3( 'N', 'N', 1, 2, 0, A, 1, B, 1, C, 2, SCALE,
+     $              IWORK, NMAX, WORK, NMAX, INFO )
+      CALL CHKXER( 'STRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 9
+      CALL STRSYL3( 'N', 'N', 1, 0, 2, A, 1, B, 1, C, 1, SCALE,
+     $              IWORK, NMAX, WORK, NMAX, INFO )
+      CALL CHKXER( 'STRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 11
+      CALL STRSYL3( 'N', 'N', 1, 2, 0, A, 2, B, 1, C, 1, SCALE,
+     $              IWORK, NMAX, WORK, NMAX, INFO )
+      CALL CHKXER( 'STRSYL3', INFOT, NOUT, LERR, OK )
+      NT = NT + 8
+*
 *     Test STREXC
 *
       SRNAMT = 'STREXC'
diff --git a/TESTING/EIG/serred.f b/TESTING/EIG/serred.f
index b52aa16246..d6d5f5c61f 100644
--- a/TESTING/EIG/serred.f
+++ b/TESTING/EIG/serred.f
@@ -67,6 +67,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRED( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -329,7 +330,7 @@ SUBROUTINE SERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
 *
 *        Test SGESDD
@@ -358,7 +359,7 @@ SUBROUTINE SERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
 *
 *        Test SGEJSV
@@ -424,7 +425,7 @@ SUBROUTINE SERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
 *
 *        Test SGESVDX
@@ -483,7 +484,7 @@ SUBROUTINE SERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
 *
 *        Test SGESVDQ
@@ -538,7 +539,7 @@ SUBROUTINE SERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
       END IF
 *
@@ -549,7 +550,7 @@ SUBROUTINE SERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
       END IF
 *
diff --git a/TESTING/EIG/serrgg.f b/TESTING/EIG/serrgg.f
index 7824f8618d..ed7ce49479 100644
--- a/TESTING/EIG/serrgg.f
+++ b/TESTING/EIG/serrgg.f
@@ -54,6 +54,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRGG( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/serrhs.f b/TESTING/EIG/serrhs.f
index 8f0ff98a1d..d6fa9d318f 100644
--- a/TESTING/EIG/serrhs.f
+++ b/TESTING/EIG/serrhs.f
@@ -21,8 +21,8 @@
 *>
 *> \verbatim
 *>
-*> SERRHS tests the error exits for SGEBAK, SGEBAL, SGEHRD, SORGHR,
-*> SORMHR, SHSEQR, SHSEIN, and STREVC.
+*> SERRHS tests the error exits for SGEBAK, SGEBAL, SGEHRD, SGEHD2,
+*> SORGHR, SORMHR, SHSEQR, SHSEIN, STREVC, and STREVC3.
 *> \endverbatim
 *
 *  Arguments:
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRHS( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -85,7 +86,7 @@ SUBROUTINE SERRHS( PATH, NUNIT )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CHKXER, SGEBAK, SGEBAL, SGEHRD, SHSEIN, SHSEQR,
-     $                   SORGHR, SORMHR, STREVC
+     $                   SORGHR, SORMHR, STREVC, STREVC3, SGEHD2
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          REAL
@@ -193,6 +194,29 @@ SUBROUTINE SERRHS( PATH, NUNIT )
          CALL CHKXER( 'SGEHRD', INFOT, NOUT, LERR, OK )
          NT = NT + 7
 *
+*        SGEHD2
+*
+         SRNAMT = 'SGEHD2'
+         INFOT = 1
+         CALL SGEHD2( -1, 1, 1, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'SGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL SGEHD2( 0, 0, 0, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'SGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL SGEHD2( 0, 2, 0, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'SGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL SGEHD2( 1, 1, 0, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'SGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL SGEHD2( 0, 1, 1, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'SGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL SGEHD2( 2, 1, 1, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'SGEHD2', INFOT, NOUT, LERR, OK )
+         NT = NT + 6
+*
 *        SORGHR
 *
          SRNAMT = 'SORGHR'
@@ -327,7 +351,11 @@ SUBROUTINE SERRHS( PATH, NUNIT )
          CALL SHSEQR( 'E', 'V', 2, 1, 2, A, 2, WR, WI, C, 1, W, 1,
      $                INFO )
          CALL CHKXER( 'SHSEQR', INFOT, NOUT, LERR, OK )
-         NT = NT + 9
+         INFOT = 13
+         CALL SHSEQR( 'E', 'N', 2, 1, 2, A, 2, WR, WI, C, 1, W, 1,
+     $                INFO )
+         CALL CHKXER( 'SHSEQR', INFOT, NOUT, LERR, OK )
+         NT = NT + 10
 *
 *        SHSEIN
 *
@@ -398,6 +426,43 @@ SUBROUTINE SERRHS( PATH, NUNIT )
      $                INFO )
          CALL CHKXER( 'STREVC', INFOT, NOUT, LERR, OK )
          NT = NT + 7
+*
+*        STREVC3
+*
+         SRNAMT = 'STREVC3'
+         INFOT = 1
+         CALL STREVC3( '/', 'A', SEL, 0, A, 1, VL, 1, VR, 1, 0, M, W,
+     $                 LW, INFO )
+         CALL CHKXER( 'STREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL STREVC3( 'L', '/', SEL, 0, A, 1, VL, 1, VR, 1, 0, M, W,
+     $                 LW, INFO )
+         CALL CHKXER( 'STREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL STREVC3( 'L', 'A', SEL, -1, A, 1, VL, 1, VR, 1, 0, M, W,
+     $                 LW, INFO )
+         CALL CHKXER( 'STREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 6
+         CALL STREVC3( 'L', 'A', SEL, 2, A, 1, VL, 2, VR, 1, 4, M, W,
+     $                 LW, INFO )
+         CALL CHKXER( 'STREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL STREVC3( 'L', 'A', SEL, 2, A, 2, VL, 1, VR, 1, 4, M, W,
+     $                 LW, INFO )
+         CALL CHKXER( 'STREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL STREVC3( 'R', 'A', SEL, 2, A, 2, VL, 1, VR, 1, 4, M, W,
+     $                 LW, INFO )
+         CALL CHKXER( 'STREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 11
+         CALL STREVC3( 'L', 'A', SEL, 2, A, 2, VL, 2, VR, 1, 1, M, W,
+     $                 LW, INFO )
+         CALL CHKXER( 'STREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 14
+         CALL STREVC3( 'L', 'A', SEL, 2, A, 2, VL, 2, VR, 1, 2, M, W,
+     $                 2, INFO )
+         CALL CHKXER( 'STREVC3', INFOT, NOUT, LERR, OK )
+         NT = NT + 8
       END IF
 *
 *     Print a summary line.
diff --git a/TESTING/EIG/serrst.f b/TESTING/EIG/serrst.f
index afb6d4faff..471fa35993 100644
--- a/TESTING/EIG/serrst.f
+++ b/TESTING/EIG/serrst.f
@@ -21,7 +21,7 @@
 *>
 *> \verbatim
 *>
-*> SERRST tests the error exits for SSYTRD, SORGTR, SORMTR, SSPTRD,
+*> SERRST tests the error exits for SSYTRD, SSYTD2, SORGTR, SORMTR, SSPTRD,
 *> SOPGTR, SOPMTR, SSTEQR, SSTERF, SSTEBZ, SSTEIN, SPTEQR, SSBTRD,
 *> SSYEV, SSYEVX, SSYEVD, SSBEV, SSBEVX, SSBEVD,
 *> SSPEV, SSPEVX, SSPEVD, SSTEV, SSTEVX, SSTEVD, and SSTEDC.
@@ -58,6 +58,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRST( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -95,7 +96,7 @@ SUBROUTINE SERRST( PATH, NUNIT )
      $                   SSBEV, SSBEVD, SSBEVX, SSBTRD, SSPEV, SSPEVD,
      $                   SSPEVX, SSPTRD, SSTEBZ, SSTEDC, SSTEIN, SSTEQR,
      $                   SSTERF, SSTEV, SSTEVD, SSTEVR, SSTEVX, SSYEV,
-     $                   SSYEVD, SSYEVR, SSYEVX, SSYTRD,
+     $                   SSYEVD, SSYEVR, SSYEVX, SSYTRD, SSYTD2,
      $                   SSYEVD_2STAGE, SSYEVR_2STAGE, SSYEVX_2STAGE,
      $                   SSYEV_2STAGE, SSBEV_2STAGE, SSBEVD_2STAGE,
      $                   SSBEVX_2STAGE, SSYTRD_2STAGE, SSYTRD_SY2SB,
@@ -157,6 +158,20 @@ SUBROUTINE SERRST( PATH, NUNIT )
          CALL CHKXER( 'SSYTRD', INFOT, NOUT, LERR, OK )
          NT = NT + 4
 *
+*        SSYTD2
+*
+         SRNAMT = 'SSYTD2'
+         INFOT = 1
+         CALL SSYTD2( '/', 0, A, 1, D, E, TAU, INFO )
+         CALL CHKXER( 'SSYTD2', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL SSYTD2( 'U', -1, A, 1, D, E, TAU, INFO )
+         CALL CHKXER( 'SSYTD2', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL SSYTD2( 'U', 2, A, 1, D, E, TAU, INFO )
+         CALL CHKXER( 'SSYTD2', INFOT, NOUT, LERR, OK )
+         NT = NT + 3
+*
 *        SSYTRD_2STAGE
 *
          SRNAMT = 'SSYTRD_2STAGE'
@@ -719,12 +734,12 @@ SUBROUTINE SERRST( PATH, NUNIT )
          CALL CHKXER( 'SSYEVR', INFOT, NOUT, LERR, OK )
          INFOT = 18
          CALL SSYEVR( 'V', 'I', 'U', 1, A, 1, 0.0E0, 0.0E0, 1, 1, 0.0,
-     $                M, R, Z, 1, IW, Q, 26*N-1, IW( 2*N+1 ), 10*N,
+     $                M, R, Z, 1, IW, Q, 0, IW( 2*N+1 ), 10*N,
      $                INFO )
          CALL CHKXER( 'SSYEVR', INFOT, NOUT, LERR, OK )
          INFOT = 20
          CALL SSYEVR( 'V', 'I', 'U', 1, A, 1, 0.0E0, 0.0E0, 1, 1, 0.0,
-     $                M, R, Z, 1, IW, Q, 26*N, IW( 2*N+1 ), 10*N-1,
+     $                M, R, Z, 1, IW, Q, 26*N, IW( 2*N+1 ), 0,
      $                INFO )
          CALL CHKXER( 'SSYEVR', INFOT, NOUT, LERR, OK )
          NT = NT + 11
diff --git a/TESTING/EIG/sget02.f b/TESTING/EIG/sget02.f
index 5cae02bf22..363e6f0b03 100644
--- a/TESTING/EIG/sget02.f
+++ b/TESTING/EIG/sget02.f
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE SGET02( TRANS, M, N, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sget10.f b/TESTING/EIG/sget10.f
index cbec05bf68..e8b8d9ea61 100644
--- a/TESTING/EIG/sget10.f
+++ b/TESTING/EIG/sget10.f
@@ -90,6 +90,7 @@
 *
 *  =====================================================================
       SUBROUTINE SGET10( M, N, A, LDA, B, LDB, WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sget22.f b/TESTING/EIG/sget22.f
index ddfc2592f1..1517a5265b 100644
--- a/TESTING/EIG/sget22.f
+++ b/TESTING/EIG/sget22.f
@@ -165,6 +165,7 @@
 *  =====================================================================
       SUBROUTINE SGET22( TRANSA, TRANSE, TRANSW, N, A, LDA, E, LDE, WR,
      $                   WI, WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sget23.f b/TESTING/EIG/sget23.f
index 8275781811..8c3c26f098 100644
--- a/TESTING/EIG/sget23.f
+++ b/TESTING/EIG/sget23.f
@@ -375,6 +375,7 @@ SUBROUTINE SGET23( COMP, BALANC, JTYPE, THRESH, ISEED, NOUNIT, N,
      $                   LDVR, LRE, LDLRE, RCONDV, RCNDV1, RCDVIN,
      $                   RCONDE, RCNDE1, RCDEIN, SCALE, SCALE1, RESULT,
      $                   WORK, LWORK, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sget24.f b/TESTING/EIG/sget24.f
index fef8762552..2ca65a82a6 100644
--- a/TESTING/EIG/sget24.f
+++ b/TESTING/EIG/sget24.f
@@ -340,6 +340,7 @@ SUBROUTINE SGET24( COMP, JTYPE, THRESH, ISEED, NOUNIT, N, A, LDA,
      $                   H, HT, WR, WI, WRT, WIT, WRTMP, WITMP, VS,
      $                   LDVS, VS1, RCDEIN, RCDVIN, NSLCT, ISLCT,
      $                   RESULT, WORK, LWORK, IWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sget31.f b/TESTING/EIG/sget31.f
index e6214007be..27933beadb 100644
--- a/TESTING/EIG/sget31.f
+++ b/TESTING/EIG/sget31.f
@@ -65,7 +65,7 @@
 *>
 *> \param[out] NINFO
 *> \verbatim
-*>          NINFO is INTEGER array, dimension (3)
+*>          NINFO is INTEGER array, dimension (2)
 *>          NINFO(1) = number of examples with INFO less than 0
 *>          NINFO(2) = number of examples with INFO greater than 0
 *> \endverbatim
@@ -88,6 +88,7 @@
 *
 *  =====================================================================
       SUBROUTINE SGET31( RMAX, LMAX, NINFO, KNT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -130,7 +131,7 @@ SUBROUTINE SGET31( RMAX, LMAX, NINFO, KNT )
       EXTERNAL           SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLABAD, SLALN2
+      EXTERNAL           SLALN2
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
@@ -146,7 +147,6 @@ SUBROUTINE SGET31( RMAX, LMAX, NINFO, KNT )
       UNFL = SLAMCH( 'U' )
       SMLNUM = SLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Set up test case parameters
 *
diff --git a/TESTING/EIG/sget32.f b/TESTING/EIG/sget32.f
index 7a0efd0827..aae64fc42c 100644
--- a/TESTING/EIG/sget32.f
+++ b/TESTING/EIG/sget32.f
@@ -79,6 +79,7 @@
 *
 *  =====================================================================
       SUBROUTINE SGET32( RMAX, LMAX, NINFO, KNT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -114,7 +115,7 @@ SUBROUTINE SGET32( RMAX, LMAX, NINFO, KNT )
       EXTERNAL           SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLABAD, SLASY2
+      EXTERNAL           SLASY2
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, SQRT
@@ -131,7 +132,6 @@ SUBROUTINE SGET32( RMAX, LMAX, NINFO, KNT )
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Set up test case parameters
 *
diff --git a/TESTING/EIG/sget33.f b/TESTING/EIG/sget33.f
index 48cee8d447..70f67ad967 100644
--- a/TESTING/EIG/sget33.f
+++ b/TESTING/EIG/sget33.f
@@ -73,6 +73,7 @@
 *
 *  =====================================================================
       SUBROUTINE SGET33( RMAX, LMAX, NINFO, KNT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -105,7 +106,7 @@ SUBROUTINE SGET33( RMAX, LMAX, NINFO, KNT )
       EXTERNAL           SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLABAD, SLANV2
+      EXTERNAL           SLANV2
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SIGN
@@ -117,7 +118,6 @@ SUBROUTINE SGET33( RMAX, LMAX, NINFO, KNT )
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Set up test case parameters
 *
diff --git a/TESTING/EIG/sget34.f b/TESTING/EIG/sget34.f
index 27f705ca3c..3d217775a0 100644
--- a/TESTING/EIG/sget34.f
+++ b/TESTING/EIG/sget34.f
@@ -79,6 +79,7 @@
 *
 *  =====================================================================
       SUBROUTINE SGET34( RMAX, LMAX, NINFO, KNT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -128,7 +129,6 @@ SUBROUTINE SGET34( RMAX, LMAX, NINFO, KNT )
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Set up test case parameters
 *
diff --git a/TESTING/EIG/sget35.f b/TESTING/EIG/sget35.f
index 46c8b699f9..1b9fb77415 100644
--- a/TESTING/EIG/sget35.f
+++ b/TESTING/EIG/sget35.f
@@ -75,6 +75,7 @@
 *
 *  =====================================================================
       SUBROUTINE SGET35( RMAX, LMAX, NINFO, KNT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -133,7 +134,6 @@ SUBROUTINE SGET35( RMAX, LMAX, NINFO, KNT )
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )*FOUR / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Set up test case parameters
 *
diff --git a/TESTING/EIG/sget36.f b/TESTING/EIG/sget36.f
index 47eae95e41..102a84324a 100644
--- a/TESTING/EIG/sget36.f
+++ b/TESTING/EIG/sget36.f
@@ -85,6 +85,7 @@
 *
 *  =====================================================================
       SUBROUTINE SGET36( RMAX, LMAX, NINFO, KNT, NIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sget37.f b/TESTING/EIG/sget37.f
index eb10424bf1..3a75283261 100644
--- a/TESTING/EIG/sget37.f
+++ b/TESTING/EIG/sget37.f
@@ -87,6 +87,7 @@
 *
 *  =====================================================================
       SUBROUTINE SGET37( RMAX, LMAX, NINFO, KNT, NIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -131,8 +132,8 @@ SUBROUTINE SGET37( RMAX, LMAX, NINFO, KNT, NIN )
       EXTERNAL           SLAMCH, SLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEHRD, SHSEQR, SLABAD, SLACPY, SSCAL,
-     $                   STREVC, STRSNA
+      EXTERNAL           SCOPY, SGEHRD, SHSEQR, SLACPY, SSCAL, STREVC,
+     $                   STRSNA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, REAL, SQRT
@@ -142,7 +143,6 @@ SUBROUTINE SGET37( RMAX, LMAX, NINFO, KNT, NIN )
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     EPSIN = 2**(-24) = precision to which input data computed
 *
diff --git a/TESTING/EIG/sget38.f b/TESTING/EIG/sget38.f
index 636dfb70ee..fda8c7c948 100644
--- a/TESTING/EIG/sget38.f
+++ b/TESTING/EIG/sget38.f
@@ -88,6 +88,7 @@
 *
 *  =====================================================================
       SUBROUTINE SGET38( RMAX, LMAX, NINFO, KNT, NIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -134,8 +135,8 @@ SUBROUTINE SGET38( RMAX, LMAX, NINFO, KNT, NIN )
       EXTERNAL           SLAMCH, SLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEHRD, SHSEQR, SHST01, SLABAD, SLACPY,
-     $                   SORGHR, SSCAL, STRSEN
+      EXTERNAL           SCOPY, SGEHRD, SHSEQR, SHST01, SLACPY, SORGHR,
+     $                   SSCAL, STRSEN
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, REAL, SQRT
@@ -145,7 +146,6 @@ SUBROUTINE SGET38( RMAX, LMAX, NINFO, KNT, NIN )
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     EPSIN = 2**(-24) = precision to which input data computed
 *
diff --git a/TESTING/EIG/sget39.f b/TESTING/EIG/sget39.f
index dbcabf9d7d..2ed9894e51 100644
--- a/TESTING/EIG/sget39.f
+++ b/TESTING/EIG/sget39.f
@@ -100,6 +100,7 @@
 *
 *  =====================================================================
       SUBROUTINE SGET39( RMAX, LMAX, NINFO, KNT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -130,7 +131,7 @@ SUBROUTINE SGET39( RMAX, LMAX, NINFO, KNT )
       EXTERNAL           ISAMAX, SASUM, SDOT, SLAMCH, SLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SGEMV, SLABAD, SLAQTR
+      EXTERNAL           SCOPY, SGEMV, SLAQTR
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, COS, MAX, REAL, SIN, SQRT
@@ -159,7 +160,6 @@ SUBROUTINE SGET39( RMAX, LMAX, NINFO, KNT )
       EPS = SLAMCH( 'P' )
       SMLNUM = SLAMCH( 'S' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Set up test case parameters
 *
diff --git a/TESTING/EIG/sget40.f b/TESTING/EIG/sget40.f
index 1fd3d400dd..355f993afb 100644
--- a/TESTING/EIG/sget40.f
+++ b/TESTING/EIG/sget40.f
@@ -12,10 +12,10 @@
 *
 *       .. Scalar Arguments ..
 *       INTEGER            KNT, LMAX, NIN
-*       REAL   RMAX
+*       REAL               RMAX
 *       ..
 *       .. Array Arguments ..
-*       INTEGER            NINFO( 3 )
+*       INTEGER            NINFO( 2 )
 *
 *
 *> \par Purpose:
@@ -53,8 +53,9 @@
 *>
 *> \param[out] NINFO
 *> \verbatim
-*>          NINFO is INTEGER
-*>          Number of examples where INFO is nonzero.
+*>          NINFO is INTEGER array, dimension (2)
+*>          NINFO( 1 ) = STGEXC without accumulation returned INFO nonzero
+*>          NINFO( 2 ) = STGEXC with accumulation returned INFO nonzero
 *> \endverbatim
 *>
 *> \param[out] KNT
@@ -63,9 +64,10 @@
 *>          Total number of examples tested.
 *> \endverbatim
 *>
-*> \param[out] NIN
+*> \param[in] NIN
 *> \verbatim
-*>          NINFO is INTEGER
+*>          NIN is INTEGER
+*>          Input logical unit number.
 *> \endverbatim
 *
 *  Authors:
@@ -80,6 +82,7 @@
 *
 *  =====================================================================
       SUBROUTINE SGET40( RMAX, LMAX, NINFO, KNT, NIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -90,7 +93,7 @@ SUBROUTINE SGET40( RMAX, LMAX, NINFO, KNT, NIN )
       REAL               RMAX
 *     ..
 *     .. Array Arguments ..
-      INTEGER            NINFO( 3 )
+      INTEGER            NINFO( 2 )
 *     ..
 *
 *  =====================================================================
@@ -103,7 +106,7 @@ SUBROUTINE SGET40( RMAX, LMAX, NINFO, KNT, NIN )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I, IFST, IFST1, IFST2, IFSTSV, ILST, ILST1,
-     $                   ILST2, ILSTSV, INFO1, INFO2, J, LOC, N
+     $                   ILST2, ILSTSV, J, LOC, N
       REAL               EPS, RES
 *     ..
 *     .. Local Arrays ..
@@ -130,7 +133,6 @@ SUBROUTINE SGET40( RMAX, LMAX, NINFO, KNT, NIN )
       KNT = 0
       NINFO( 1 ) = 0
       NINFO( 2 ) = 0
-      NINFO( 3 ) = 0
 *
 *     Read input data until N=0
 *
@@ -164,7 +166,7 @@ SUBROUTINE SGET40( RMAX, LMAX, NINFO, KNT, NIN )
       CALL SLASET( 'Full', N, N, ZERO, ONE, Q, LDT )
       CALL SLASET( 'Full', N, N, ZERO, ONE, Z, LDT )
       CALL STGEXC( .FALSE., .FALSE., N, T1, LDT, S1, LDT, Q, LDT,
-     $             Z, LDT, IFST1, ILST1, WORK, LWORK, INFO1 )
+     $             Z, LDT, IFST1, ILST1, WORK, LWORK, NINFO( 1 ) )
       DO 40 I = 1, N
          DO 30 J = 1, N
             IF( I.EQ.J .AND. Q( I, J ).NE.ONE )
@@ -183,7 +185,7 @@ SUBROUTINE SGET40( RMAX, LMAX, NINFO, KNT, NIN )
       CALL SLASET( 'Full', N, N, ZERO, ONE, Q, LDT )
       CALL SLASET( 'Full', N, N, ZERO, ONE, Z, LDT )
       CALL STGEXC( .TRUE., .TRUE., N, T2, LDT, S2, LDT, Q, LDT,
-     $             Z, LDT, IFST2, ILST2, WORK, LWORK, INFO2 )
+     $             Z, LDT, IFST2, ILST2, WORK, LWORK, NINFO( 2 ) )
 *
 *     Compare T1 with T2 and S1 with S2
 *
@@ -199,7 +201,7 @@ SUBROUTINE SGET40( RMAX, LMAX, NINFO, KNT, NIN )
      $   RES = RES + ONE / EPS
       IF( ILST1.NE.ILST2 )
      $   RES = RES + ONE / EPS
-      IF( INFO1.NE.INFO2 )
+      IF( NINFO( 1 ).NE.NINFO( 2 ) )
      $   RES = RES + ONE / EPS
 *
 *     Test orthogonality of Q and Z and backward error on T2 and S2
diff --git a/TESTING/EIG/sget51.f b/TESTING/EIG/sget51.f
index 2067b8c3d9..c60129827b 100644
--- a/TESTING/EIG/sget51.f
+++ b/TESTING/EIG/sget51.f
@@ -146,6 +146,7 @@
 *  =====================================================================
       SUBROUTINE SGET51( ITYPE, N, A, LDA, B, LDB, U, LDU, V, LDV, WORK,
      $                   RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sget52.f b/TESTING/EIG/sget52.f
index 9f54126021..a286132487 100644
--- a/TESTING/EIG/sget52.f
+++ b/TESTING/EIG/sget52.f
@@ -196,6 +196,7 @@
 *  =====================================================================
       SUBROUTINE SGET52( LEFT, N, A, LDA, B, LDB, E, LDE, ALPHAR,
      $                   ALPHAI, BETA, WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -293,7 +294,7 @@ SUBROUTINE SGET52( LEFT, N, A, LDA, B, LDB, E, LDE, ALPHAR,
                BCOEFR = SCALE*SALFR
                CALL SGEMV( TRANS, N, N, ACOEF, A, LDA, E( 1, JVEC ), 1,
      $                     ZERO, WORK( N*( JVEC-1 )+1 ), 1 )
-               CALL SGEMV( TRANS, N, N, -BCOEFR, B, LDA, E( 1, JVEC ),
+               CALL SGEMV( TRANS, N, N, -BCOEFR, B, LDB, E( 1, JVEC ),
      $                     1, ONE, WORK( N*( JVEC-1 )+1 ), 1 )
             ELSE
 *
@@ -323,16 +324,16 @@ SUBROUTINE SGET52( LEFT, N, A, LDA, B, LDB, E, LDE, ALPHAR,
 *
                CALL SGEMV( TRANS, N, N, ACOEF, A, LDA, E( 1, JVEC ), 1,
      $                     ZERO, WORK( N*( JVEC-1 )+1 ), 1 )
-               CALL SGEMV( TRANS, N, N, -BCOEFR, B, LDA, E( 1, JVEC ),
+               CALL SGEMV( TRANS, N, N, -BCOEFR, B, LDB, E( 1, JVEC ),
      $                     1, ONE, WORK( N*( JVEC-1 )+1 ), 1 )
-               CALL SGEMV( TRANS, N, N, BCOEFI, B, LDA, E( 1, JVEC+1 ),
+               CALL SGEMV( TRANS, N, N, BCOEFI, B, LDB, E( 1, JVEC+1 ),
      $                     1, ONE, WORK( N*( JVEC-1 )+1 ), 1 )
 *
                CALL SGEMV( TRANS, N, N, ACOEF, A, LDA, E( 1, JVEC+1 ),
      $                     1, ZERO, WORK( N*JVEC+1 ), 1 )
-               CALL SGEMV( TRANS, N, N, -BCOEFI, B, LDA, E( 1, JVEC ),
+               CALL SGEMV( TRANS, N, N, -BCOEFI, B, LDB, E( 1, JVEC ),
      $                     1, ONE, WORK( N*JVEC+1 ), 1 )
-               CALL SGEMV( TRANS, N, N, -BCOEFR, B, LDA, E( 1, JVEC+1 ),
+               CALL SGEMV( TRANS, N, N, -BCOEFR, B, LDB, E( 1, JVEC+1 ),
      $                     1, ONE, WORK( N*JVEC+1 ), 1 )
             END IF
          END IF
diff --git a/TESTING/EIG/sget53.f b/TESTING/EIG/sget53.f
index 11decbe82f..932b587b83 100644
--- a/TESTING/EIG/sget53.f
+++ b/TESTING/EIG/sget53.f
@@ -123,6 +123,7 @@
 *
 *  =====================================================================
       SUBROUTINE SGET53( A, LDA, B, LDB, SCALE, WR, WI, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sget54.f b/TESTING/EIG/sget54.f
index 8d73a29131..540a909bdc 100644
--- a/TESTING/EIG/sget54.f
+++ b/TESTING/EIG/sget54.f
@@ -153,6 +153,7 @@
 *  =====================================================================
       SUBROUTINE SGET54( N, A, LDA, B, LDB, S, LDS, T, LDT, U, LDU, V,
      $                   LDV, WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sglmts.f b/TESTING/EIG/sglmts.f
index 0859b3e0dc..0add7d0a0c 100644
--- a/TESTING/EIG/sglmts.f
+++ b/TESTING/EIG/sglmts.f
@@ -146,6 +146,7 @@
 *  =====================================================================
       SUBROUTINE SGLMTS( N, M, P, A, AF, LDA, B, BF, LDB, D, DF,
      $                   X, U, WORK, LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sgqrts.f b/TESTING/EIG/sgqrts.f
index eacdc858f0..e292e897b3 100644
--- a/TESTING/EIG/sgqrts.f
+++ b/TESTING/EIG/sgqrts.f
@@ -173,6 +173,7 @@
 *  =====================================================================
       SUBROUTINE SGQRTS( N, M, P, A, AF, Q, R, LDA, TAUA, B, BF, Z, T,
      $                   BWK, LDB, TAUB, WORK, LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sgrqts.f b/TESTING/EIG/sgrqts.f
index 005adcacc8..b0190c2794 100644
--- a/TESTING/EIG/sgrqts.f
+++ b/TESTING/EIG/sgrqts.f
@@ -174,6 +174,7 @@
 *  =====================================================================
       SUBROUTINE SGRQTS( M, P, N, A, AF, Q, R, LDA, TAUA, B, BF, Z, T,
      $                   BWK, LDB, TAUB, WORK, LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sgsvts3.f b/TESTING/EIG/sgsvts3.f
index b9b87be8c5..9d72861ad8 100644
--- a/TESTING/EIG/sgsvts3.f
+++ b/TESTING/EIG/sgsvts3.f
@@ -207,6 +207,7 @@
       SUBROUTINE SGSVTS3( M, P, N, A, AF, LDA, B, BF, LDB, U, LDU, V,
      $                    LDV, Q, LDQ, ALPHA, BETA, R, LDR, IWORK, WORK,
      $                    LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/shst01.f b/TESTING/EIG/shst01.f
index 97b14c211a..f0884772ed 100644
--- a/TESTING/EIG/shst01.f
+++ b/TESTING/EIG/shst01.f
@@ -131,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE SHST01( N, ILO, IHI, A, LDA, H, LDH, Q, LDQ, WORK,
      $                   LWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -159,7 +160,7 @@ SUBROUTINE SHST01( N, ILO, IHI, A, LDA, H, LDH, Q, LDQ, WORK,
       EXTERNAL           SLAMCH, SLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SGEMM, SLABAD, SLACPY, SORT01
+      EXTERNAL           SGEMM, SLACPY, SORT01
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -177,7 +178,6 @@ SUBROUTINE SHST01( N, ILO, IHI, A, LDA, H, LDH, Q, LDQ, WORK,
       UNFL = SLAMCH( 'Safe minimum' )
       EPS = SLAMCH( 'Precision' )
       OVFL = ONE / UNFL
-      CALL SLABAD( UNFL, OVFL )
       SMLNUM = UNFL*N / EPS
 *
 *     Test 1:  Compute norm( A - Q*H*Q' ) / ( norm(A) * N * EPS )
diff --git a/TESTING/EIG/slafts.f b/TESTING/EIG/slafts.f
index 7bbb389d3c..ddf6e3f9f1 100644
--- a/TESTING/EIG/slafts.f
+++ b/TESTING/EIG/slafts.f
@@ -96,6 +96,7 @@
 *  =====================================================================
       SUBROUTINE SLAFTS( TYPE, M, N, IMAT, NTESTS, RESULT, ISEED,
      $                   THRESH, IOUNIT, IE )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/slahd2.f b/TESTING/EIG/slahd2.f
index 401c247b7c..03d5f84777 100644
--- a/TESTING/EIG/slahd2.f
+++ b/TESTING/EIG/slahd2.f
@@ -62,6 +62,7 @@
 *
 *  =====================================================================
       SUBROUTINE SLAHD2( IOUNIT, PATH )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/slarfy.f b/TESTING/EIG/slarfy.f
index c2a819fe1f..fc2084779b 100644
--- a/TESTING/EIG/slarfy.f
+++ b/TESTING/EIG/slarfy.f
@@ -105,6 +105,7 @@
 *
 *  =====================================================================
       SUBROUTINE SLARFY( UPLO, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/slarhs.f b/TESTING/EIG/slarhs.f
index bdb74724e8..183c1e8d61 100644
--- a/TESTING/EIG/slarhs.f
+++ b/TESTING/EIG/slarhs.f
@@ -202,6 +202,7 @@
 *  =====================================================================
       SUBROUTINE SLARHS( PATH, XTYPE, UPLO, TRANS, M, N, KL, KU, NRHS,
      $                   A, LDA, X, LDX, B, LDB, ISEED, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/slasum.f b/TESTING/EIG/slasum.f
index fa1e43388d..0e1f8f60d4 100644
--- a/TESTING/EIG/slasum.f
+++ b/TESTING/EIG/slasum.f
@@ -38,6 +38,7 @@
 *
 *  =====================================================================
       SUBROUTINE SLASUM( TYPE, IOUNIT, IE, NRUN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/slatb9.f b/TESTING/EIG/slatb9.f
index f8638a46a0..9642c8f8e5 100644
--- a/TESTING/EIG/slatb9.f
+++ b/TESTING/EIG/slatb9.f
@@ -167,6 +167,7 @@
       SUBROUTINE SLATB9( PATH, IMAT, M, P, N, TYPE, KLA, KUA,
      $                   KLB, KUB, ANORM, BNORM, MODEA, MODEB,
      $                   CNDNMA, CNDNMB, DISTA, DISTB )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -199,9 +200,6 @@ SUBROUTINE SLATB9( PATH, IMAT, M, P, N, TYPE, KLA, KUA,
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           SLABAD
-*     ..
 *     .. Save statement ..
       SAVE               EPS, SMALL, LARGE, BADC1, BADC2, FIRST
 *     ..
@@ -219,11 +217,6 @@ SUBROUTINE SLATB9( PATH, IMAT, M, P, N, TYPE, KLA, KUA,
          BADC1 = SQRT( BADC2 )
          SMALL = SLAMCH( 'Safe minimum' )
          LARGE = ONE / SMALL
-*
-*        If it looks like we're on a Cray, take the square root of
-*        SMALL and LARGE to avoid overflow and underflow problems.
-*
-         CALL SLABAD( SMALL, LARGE )
          SMALL = SHRINK*( SMALL / EPS )
          LARGE = ONE / SMALL
       END IF
diff --git a/TESTING/EIG/slatm4.f b/TESTING/EIG/slatm4.f
index 3c40de70fa..d286f0f8d3 100644
--- a/TESTING/EIG/slatm4.f
+++ b/TESTING/EIG/slatm4.f
@@ -172,6 +172,7 @@
 *  =====================================================================
       SUBROUTINE SLATM4( ITYPE, N, NZ1, NZ2, ISIGN, AMAGN, RCOND,
      $                   TRIANG, IDIST, ISEED, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/slctes.f b/TESTING/EIG/slctes.f
index d5dec3fef0..b3e10a8730 100644
--- a/TESTING/EIG/slctes.f
+++ b/TESTING/EIG/slctes.f
@@ -65,6 +65,7 @@
 *
 *  =====================================================================
       LOGICAL          FUNCTION SLCTES( ZR, ZI, D )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/slctsx.f b/TESTING/EIG/slctsx.f
index d650baed9f..b784e16e16 100644
--- a/TESTING/EIG/slctsx.f
+++ b/TESTING/EIG/slctsx.f
@@ -62,6 +62,7 @@
 *
 *  =====================================================================
       LOGICAL          FUNCTION SLCTSX( AR, AI, BETA )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/slsets.f b/TESTING/EIG/slsets.f
index 0fb66decf2..aecad49b91 100644
--- a/TESTING/EIG/slsets.f
+++ b/TESTING/EIG/slsets.f
@@ -152,6 +152,7 @@
 *  =====================================================================
       SUBROUTINE SLSETS( M, P, N, A, AF, LDA, B, BF, LDB, C, CF,
      $                   D, DF, X, WORK, LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sort01.f b/TESTING/EIG/sort01.f
index c8fb5ff6ec..ca13d6ba3a 100644
--- a/TESTING/EIG/sort01.f
+++ b/TESTING/EIG/sort01.f
@@ -113,6 +113,7 @@
 *
 *  =====================================================================
       SUBROUTINE SORT01( ROWCOL, M, N, U, LDU, WORK, LWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sort03.f b/TESTING/EIG/sort03.f
index 3ca35705ac..792c4be9ab 100644
--- a/TESTING/EIG/sort03.f
+++ b/TESTING/EIG/sort03.f
@@ -153,6 +153,7 @@
 *  =====================================================================
       SUBROUTINE SORT03( RC, MU, MV, N, K, U, LDU, V, LDV, WORK, LWORK,
      $                   RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/ssbt21.f b/TESTING/EIG/ssbt21.f
index f4b4fbe0c4..63256ad8ba 100644
--- a/TESTING/EIG/ssbt21.f
+++ b/TESTING/EIG/ssbt21.f
@@ -144,6 +144,7 @@
 *  =====================================================================
       SUBROUTINE SSBT21( UPLO, N, KA, KS, A, LDA, D, E, U, LDU, WORK,
      $                   RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/ssgt01.f b/TESTING/EIG/ssgt01.f
index b606422a61..adebef44d4 100644
--- a/TESTING/EIG/ssgt01.f
+++ b/TESTING/EIG/ssgt01.f
@@ -143,6 +143,7 @@
 *  =====================================================================
       SUBROUTINE SSGT01( ITYPE, UPLO, N, M, A, LDA, B, LDB, Z, LDZ, D,
      $                   WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sslect.f b/TESTING/EIG/sslect.f
index 1880f02a6d..10bf84927d 100644
--- a/TESTING/EIG/sslect.f
+++ b/TESTING/EIG/sslect.f
@@ -59,6 +59,7 @@
 *
 *  =====================================================================
       LOGICAL          FUNCTION SSLECT( ZR, ZI )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sspt21.f b/TESTING/EIG/sspt21.f
index 6945f142ed..7330e36e0d 100644
--- a/TESTING/EIG/sspt21.f
+++ b/TESTING/EIG/sspt21.f
@@ -218,6 +218,7 @@
 *  =====================================================================
       SUBROUTINE SSPT21( ITYPE, UPLO, N, KBAND, AP, D, E, U, LDU, VP,
      $                   TAU, WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sstech.f b/TESTING/EIG/sstech.f
index f05e1efa0d..db4545ec7d 100644
--- a/TESTING/EIG/sstech.f
+++ b/TESTING/EIG/sstech.f
@@ -98,6 +98,7 @@
 *
 *  =====================================================================
       SUBROUTINE SSTECH( N, A, B, EIG, TOL, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sstect.f b/TESTING/EIG/sstect.f
index 94a2653690..498d6dd2a9 100644
--- a/TESTING/EIG/sstect.f
+++ b/TESTING/EIG/sstect.f
@@ -79,6 +79,7 @@
 *
 *  =====================================================================
       SUBROUTINE SSTECT( N, A, B, SHIFT, NUM )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sstt21.f b/TESTING/EIG/sstt21.f
index 90984502d7..6aca3061c4 100644
--- a/TESTING/EIG/sstt21.f
+++ b/TESTING/EIG/sstt21.f
@@ -124,6 +124,7 @@
 *  =====================================================================
       SUBROUTINE SSTT21( N, KBAND, AD, AE, SD, SE, U, LDU, WORK,
      $                   RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/sstt22.f b/TESTING/EIG/sstt22.f
index f07405fb7b..f6b21da8b3 100644
--- a/TESTING/EIG/sstt22.f
+++ b/TESTING/EIG/sstt22.f
@@ -136,6 +136,7 @@
 *  =====================================================================
       SUBROUTINE SSTT22( N, M, KBAND, AD, AE, SD, SE, U, LDU, WORK,
      $                   LDWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/ssvdch.f b/TESTING/EIG/ssvdch.f
index e85181b14e..4e6bfb249a 100644
--- a/TESTING/EIG/ssvdch.f
+++ b/TESTING/EIG/ssvdch.f
@@ -94,6 +94,7 @@
 *
 *  =====================================================================
       SUBROUTINE SSVDCH( N, S, E, SVD, TOL, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/ssvdct.f b/TESTING/EIG/ssvdct.f
index 9b6aad3152..bfa561bc4b 100644
--- a/TESTING/EIG/ssvdct.f
+++ b/TESTING/EIG/ssvdct.f
@@ -84,6 +84,7 @@
 *
 *  =====================================================================
       SUBROUTINE SSVDCT( N, S, E, SHIFT, NUM )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/ssxt1.f b/TESTING/EIG/ssxt1.f
index 3fa6d6bb8b..5293107b76 100644
--- a/TESTING/EIG/ssxt1.f
+++ b/TESTING/EIG/ssxt1.f
@@ -103,6 +103,7 @@
 *  =====================================================================
       REAL             FUNCTION SSXT1( IJOB, D1, N1, D2, N2, ABSTOL,
      $                 ULP, UNFL )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/ssyl01.f b/TESTING/EIG/ssyl01.f
new file mode 100644
index 0000000000..fda30a3c0e
--- /dev/null
+++ b/TESTING/EIG/ssyl01.f
@@ -0,0 +1,311 @@
+*> \brief \b SSYL01
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE SSYL01( THRESH, NFAIL, RMAX, NINFO, KNT )
+*
+*      .. Scalar Arguments ..
+*      INTEGER            KNT
+*      REAL               THRESH
+*      ..
+*      .. Array Arguments ..
+*      INTEGER            NFAIL( 3 ), NINFO( 2 )
+*      REAL               RMAX( 2 )
+*      ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> SSYL01 tests STRSYL and STRSYL3, routines for solving the Sylvester matrix
+*> equation
+*>
+*>    op(A)*X + ISGN*X*op(B) = scale*C,
+*>
+*> A and B are assumed to be in Schur canonical form, op() represents an
+*> optional transpose, and ISGN can be -1 or +1.  Scale is an output
+*> less than or equal to 1, chosen to avoid overflow in X.
+*>
+*> The test code verifies that the following residual does not exceed
+*> the provided threshold:
+*>
+*>    norm(op(A)*X + ISGN*X*op(B) - scale*C) /
+*>        (EPS*max(norm(A),norm(B))*norm(X))
+*>
+*> This routine complements SGET35 by testing with larger,
+*> random matrices, of which some require rescaling of X to avoid overflow.
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] THRESH
+*> \verbatim
+*>          THRESH is REAL
+*>          A test will count as "failed" if the residual, computed as
+*>          described above, exceeds THRESH.
+*> \endverbatim
+*>
+*> \param[out] NFAIL
+*> \verbatim
+*>          NFAIL is INTEGER array, dimension (3)
+*>          NFAIL(1) = No. of times residual STRSYL exceeds threshold THRESH
+*>          NFAIL(2) = No. of times residual STRSYL3 exceeds threshold THRESH
+*>          NFAIL(3) = No. of times STRSYL3 and STRSYL deviate
+*> \endverbatim
+*>
+*> \param[out] RMAX
+*> \verbatim
+*>          RMAX is REAL, dimension (2)
+*>          RMAX(1) = Value of the largest test ratio of STRSYL
+*>          RMAX(2) = Value of the largest test ratio of STRSYL3
+*> \endverbatim
+*>
+*> \param[out] NINFO
+*> \verbatim
+*>          NINFO is INTEGER array, dimension (2)
+*>          NINFO(1) = No. of times STRSYL returns an expected INFO
+*>          NINFO(2) = No. of times STRSYL3 returns an expected INFO
+*> \endverbatim
+*>
+*> \param[out] KNT
+*> \verbatim
+*>          KNT is INTEGER
+*>          Total number of examples tested.
+*> \endverbatim
+
+*
+*  -- LAPACK test routine --
+      SUBROUTINE SSYL01( THRESH, NFAIL, RMAX, NINFO, KNT )
+      IMPLICIT NONE
+*
+*  -- LAPACK test routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            KNT
+      REAL               THRESH
+*     ..
+*     .. Array Arguments ..
+      INTEGER            NFAIL( 3 ), NINFO( 2 )
+      REAL               RMAX( 2 )
+*     ..
+*
+*  =====================================================================
+*     ..
+*     .. Parameters ..
+      REAL               ZERO, ONE
+      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0 )
+      INTEGER            MAXM, MAXN, LDSWORK
+      PARAMETER          ( MAXM = 101, MAXN = 138, LDSWORK = 18 )
+*     ..
+*     .. Local Scalars ..
+      CHARACTER          TRANA, TRANB
+      INTEGER            I, INFO, IINFO, ISGN, ITRANA, ITRANB, J, KLA,
+     $                   KUA, KLB, KUB, LIWORK, M, N
+      REAL               ANRM, BNRM, BIGNUM, EPS, RES, RES1, RMUL,
+     $                   SCALE, SCALE3, SMLNUM, TNRM, XNRM
+*     ..
+*     .. Local Arrays ..
+      REAL               DUML( MAXM ), DUMR( MAXN ),
+     $                   D( MAX( MAXM, MAXN ) ), DUM( MAXN ),
+     $                   VM( 2 )
+      INTEGER            ISEED( 4 ), IWORK( MAXM + MAXN + 2 )
+*     ..
+*     .. Allocatable Arrays ..
+      INTEGER            AllocateStatus
+      REAL, DIMENSION(:,:), ALLOCATABLE :: A, B, C, CC, X,
+     $                   SWORK
+*     ..
+*     .. External Functions ..
+      LOGICAL            SISNAN
+      REAL               SLAMCH, SLANGE
+      EXTERNAL           SISNAN, SLAMCH, SLANGE
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           SLATMR, SLACPY, SGEMM, STRSYL, STRSYL3
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, REAL, MAX
+*     ..
+*     .. Allocate memory dynamically ..
+      ALLOCATE ( A( MAXM, MAXM ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( B( MAXN, MAXN ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( C( MAXM, MAXN ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( CC( MAXM, MAXN ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( X( MAXM, MAXN ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( SWORK( LDSWORK, 54 ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+*     ..
+*     .. Executable Statements ..
+*
+*     Get machine parameters
+*
+      EPS = SLAMCH( 'P' )
+      SMLNUM = SLAMCH( 'S' ) / EPS
+      BIGNUM = ONE / SMLNUM
+*
+      VM( 1 ) = ONE
+      VM( 2 ) = 0.05E+0
+*
+*     Begin test loop
+*
+      NINFO( 1 ) = 0
+      NINFO( 2 ) = 0
+      NFAIL( 1 ) = 0
+      NFAIL( 2 ) = 0
+      NFAIL( 3 ) = 0
+      RMAX( 1 ) = ZERO
+      RMAX( 2 ) = ZERO
+      KNT = 0
+      DO I = 1, 4
+         ISEED( I ) = 1
+      END DO
+      SCALE = ONE
+      SCALE3 = ONE
+      LIWORK = MAXM + MAXN + 2
+      DO J = 1, 2
+         DO ISGN = -1, 1, 2
+*           Reset seed (overwritten by LATMR)
+            DO I = 1, 4
+               ISEED( I ) = 1
+            END DO
+            DO M = 32, MAXM, 71
+               KLA = 0
+               KUA = M - 1
+               CALL SLATMR( M, M, 'S', ISEED, 'N', D,
+     $                      6, ONE, ONE, 'T', 'N',
+     $                      DUML, 1, ONE, DUMR, 1, ONE,
+     $                      'N', IWORK, KLA, KUA, ZERO,
+     $                      ONE, 'NO', A, MAXM, IWORK, IINFO )
+               DO I = 1, M
+                  A( I, I ) = A( I, I ) * VM( J )
+               END DO
+               ANRM = SLANGE( 'M', M, M, A, MAXM, DUM )
+               DO N = 51, MAXN, 47
+                  KLB = 0
+                  KUB = N - 1
+                  CALL SLATMR( N, N, 'S', ISEED, 'N', D,
+     $                         6, ONE, ONE, 'T', 'N',
+     $                         DUML, 1, ONE, DUMR, 1, ONE,
+     $                         'N', IWORK, KLB, KUB, ZERO,
+     $                         ONE, 'NO', B, MAXN, IWORK, IINFO )
+                  BNRM = SLANGE( 'M', N, N, B, MAXN, DUM )
+                  TNRM = MAX( ANRM, BNRM )
+                  CALL SLATMR( M, N, 'S', ISEED, 'N', D,
+     $                         6, ONE, ONE, 'T', 'N',
+     $                         DUML, 1, ONE, DUMR, 1, ONE,
+     $                         'N', IWORK, M, N, ZERO, ONE,
+     $                         'NO', C, MAXM, IWORK, IINFO )
+                  DO ITRANA = 1, 2
+                     IF( ITRANA.EQ.1 ) THEN
+                        TRANA = 'N'
+                     END IF
+                     IF( ITRANA.EQ.2 ) THEN
+                        TRANA = 'T'
+                     END IF
+                     DO ITRANB = 1, 2
+                        IF( ITRANB.EQ.1 ) THEN
+                           TRANB = 'N'
+                        END IF
+                        IF( ITRANB.EQ.2 ) THEN
+                           TRANB = 'T'
+                        END IF
+                        KNT = KNT + 1
+*
+                        CALL SLACPY( 'All', M, N, C, MAXM, X, MAXM)
+                        CALL SLACPY( 'All', M, N, C, MAXM, CC, MAXM)
+                        CALL STRSYL( TRANA, TRANB, ISGN, M, N, 
+     $                               A, MAXM, B, MAXN, X, MAXM,
+     $                               SCALE, IINFO )
+                        IF( IINFO.NE.0 )
+     $                     NINFO( 1 ) = NINFO( 1 ) + 1
+                        XNRM = SLANGE( 'M', M, N, X, MAXM, DUM )
+                        RMUL = ONE
+                        IF( XNRM.GT.ONE .AND. TNRM.GT.ONE ) THEN
+                           IF( XNRM.GT.BIGNUM / TNRM ) THEN
+                              RMUL = ONE / MAX( XNRM, TNRM )
+                           END IF
+                        END IF
+                        CALL SGEMM( TRANA, 'N', M, N, M, RMUL,
+     $                              A, MAXM, X, MAXM, -SCALE*RMUL,
+     $                              C, MAXM )
+                        CALL SGEMM( 'N', TRANB, M, N, N,
+     $                               REAL( ISGN )*RMUL, X, MAXM, B,
+     $                               MAXN, ONE, C, MAXM )
+                        RES1 = SLANGE( 'M', M, N, C, MAXM, DUM )
+                        RES = RES1 / MAX( SMLNUM, SMLNUM*XNRM,
+     $                              ( ( RMUL*TNRM )*EPS )*XNRM )
+                        IF( RES.GT.THRESH )
+     $                     NFAIL( 1 ) = NFAIL( 1 ) + 1
+                        IF( RES.GT.RMAX( 1 ) )
+     $                     RMAX( 1 ) = RES
+*
+                        CALL SLACPY( 'All', M, N, C, MAXM, X, MAXM )
+                        CALL SLACPY( 'All', M, N, C, MAXM, CC, MAXM )
+                        CALL STRSYL3( TRANA, TRANB, ISGN, M, N,
+     $                                A, MAXM, B, MAXN, X, MAXM,
+     $                                SCALE3, IWORK, LIWORK,
+     $                                SWORK, LDSWORK, INFO)
+                        IF( INFO.NE.0 )
+     $                     NINFO( 2 ) = NINFO( 2 ) + 1
+                        XNRM = SLANGE( 'M', M, N, X, MAXM, DUM )
+                        RMUL = ONE
+                        IF( XNRM.GT.ONE .AND. TNRM.GT.ONE ) THEN
+                           IF( XNRM.GT.BIGNUM / TNRM ) THEN
+                              RMUL = ONE / MAX( XNRM, TNRM )
+                           END IF
+                        END IF
+                        CALL SGEMM( TRANA, 'N', M, N, M, RMUL,
+     $                              A, MAXM, X, MAXM, -SCALE3*RMUL,
+     $                              CC, MAXM )
+                        CALL SGEMM( 'N', TRANB, M, N, N,
+     $                              REAL( ISGN )*RMUL, X, MAXM, B,
+     $                              MAXN, ONE, CC, MAXM )
+                        RES1 = SLANGE( 'M', M, N, CC, MAXM, DUM )
+                        RES = RES1 / MAX( SMLNUM, SMLNUM*XNRM,
+     $                             ( ( RMUL*TNRM )*EPS )*XNRM )
+*                       Verify that TRSYL3 only flushes if TRSYL flushes (but
+*                       there may be cases where TRSYL3 avoid flushing).
+                        IF( SCALE3.EQ.ZERO .AND. SCALE.GT.ZERO .OR. 
+     $                      IINFO.NE.INFO ) THEN
+                           NFAIL( 3 ) = NFAIL( 3 ) + 1
+                        END IF
+                        IF( RES.GT.THRESH .OR. SISNAN( RES ) )
+     $                     NFAIL( 2 ) = NFAIL( 2 ) + 1
+                        IF( RES.GT.RMAX( 2 ) )
+     $                     RMAX( 2 ) = RES
+                     END DO
+                  END DO
+               END DO
+            END DO
+         END DO
+      END DO
+*
+      DEALLOCATE (A, STAT = AllocateStatus)
+      DEALLOCATE (B, STAT = AllocateStatus)
+      DEALLOCATE (C, STAT = AllocateStatus)
+      DEALLOCATE (CC, STAT = AllocateStatus)
+      DEALLOCATE (X, STAT = AllocateStatus)
+      DEALLOCATE (SWORK, STAT = AllocateStatus)
+*
+      RETURN
+*
+*     End of SSYL01
+*
+      END
diff --git a/TESTING/EIG/ssyt21.f b/TESTING/EIG/ssyt21.f
index b14fdf67bc..ba3194fc69 100644
--- a/TESTING/EIG/ssyt21.f
+++ b/TESTING/EIG/ssyt21.f
@@ -204,6 +204,7 @@
 *  =====================================================================
       SUBROUTINE SSYT21( ITYPE, UPLO, N, KBAND, A, LDA, D, E, U, LDU, V,
      $                   LDV, TAU, WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/ssyt22.f b/TESTING/EIG/ssyt22.f
index 2319bb2db0..ea88687c34 100644
--- a/TESTING/EIG/ssyt22.f
+++ b/TESTING/EIG/ssyt22.f
@@ -154,6 +154,7 @@
 *  =====================================================================
       SUBROUTINE SSYT22( ITYPE, UPLO, N, M, KBAND, A, LDA, D, E, U, LDU,
      $                   V, LDV, TAU, WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/xerbla.f b/TESTING/EIG/xerbla.f
index e5fd237155..6a45740d40 100644
--- a/TESTING/EIG/xerbla.f
+++ b/TESTING/EIG/xerbla.f
@@ -72,6 +72,7 @@
 *>
 *  =====================================================================
       SUBROUTINE XERBLA( SRNAME, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/xlaenv.f b/TESTING/EIG/xlaenv.f
index 23b6c75673..c030ede9c5 100644
--- a/TESTING/EIG/xlaenv.f
+++ b/TESTING/EIG/xlaenv.f
@@ -78,6 +78,7 @@
 *
 *  =====================================================================
       SUBROUTINE XLAENV( ISPEC, NVALUE )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zbdt01.f b/TESTING/EIG/zbdt01.f
index afe2fa89a5..3b6804af59 100644
--- a/TESTING/EIG/zbdt01.f
+++ b/TESTING/EIG/zbdt01.f
@@ -144,6 +144,7 @@
 *  =====================================================================
       SUBROUTINE ZBDT01( M, N, KD, A, LDA, Q, LDQ, D, E, PT, LDPT, WORK,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zbdt02.f b/TESTING/EIG/zbdt02.f
index f0da37222b..f1ad90780a 100644
--- a/TESTING/EIG/zbdt02.f
+++ b/TESTING/EIG/zbdt02.f
@@ -117,6 +117,7 @@
 *  =====================================================================
       SUBROUTINE ZBDT02( M, N, B, LDB, C, LDC, U, LDU, WORK, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zbdt03.f b/TESTING/EIG/zbdt03.f
index 289e555852..6d8c95de1d 100644
--- a/TESTING/EIG/zbdt03.f
+++ b/TESTING/EIG/zbdt03.f
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE ZBDT03( UPLO, N, KD, D, E, U, LDU, S, VT, LDVT, WORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zbdt05.f b/TESTING/EIG/zbdt05.f
index c6298e7e3b..2a4bf82016 100644
--- a/TESTING/EIG/zbdt05.f
+++ b/TESTING/EIG/zbdt05.f
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE ZBDT05( M, N, A, LDA, S, NS, U, LDU,
      $                    VT, LDVT, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zchkbb.f b/TESTING/EIG/zchkbb.f
index b9e165ce87..77ee6acc6b 100644
--- a/TESTING/EIG/zchkbb.f
+++ b/TESTING/EIG/zchkbb.f
@@ -358,6 +358,7 @@ SUBROUTINE ZCHKBB( NSIZES, MVAL, NVAL, NWDTHS, KK, NTYPES, DOTYPE,
      $                   NRHS, ISEED, THRESH, NOUNIT, A, LDA, AB, LDAB,
      $                   BD, BE, Q, LDQ, P, LDP, C, LDC, CC, WORK,
      $                   LWORK, RWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine (input) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zchkbd.f b/TESTING/EIG/zchkbd.f
index 034cf57cfd..9a874b1999 100644
--- a/TESTING/EIG/zchkbd.f
+++ b/TESTING/EIG/zchkbd.f
@@ -412,6 +412,7 @@ SUBROUTINE ZCHKBD( NSIZES, MVAL, NVAL, NTYPES, DOTYPE, NRHS,
      $                   ISEED, THRESH, A, LDA, BD, BE, S1, S2, X, LDX,
      $                   Y, Z, Q, LDQ, PT, LDPT, U, VT, WORK, LWORK,
      $                   RWORK, NOUT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -463,9 +464,9 @@ SUBROUTINE ZCHKBD( NSIZES, MVAL, NVAL, NTYPES, DOTYPE, NRHS,
       EXTERNAL           DLAMCH, DLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASUM, DCOPY, DLABAD, DLAHD2, DSVDCH, XERBLA,
-     $                   ZBDSQR, ZBDT01, ZBDT02, ZBDT03, ZGEBRD, ZGEMM,
-     $                   ZLACPY, ZLASET, ZLATMR, ZLATMS, ZUNGBR, ZUNT01
+      EXTERNAL           ALASUM, DCOPY, DLAHD2, DSVDCH, XERBLA, ZBDSQR,
+     $                   ZBDT01, ZBDT02, ZBDT03, ZGEBRD, ZGEMM, ZLACPY,
+     $                   ZLASET, ZLATMR, ZLATMS, ZUNGBR, ZUNT01
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, EXP, INT, LOG, MAX, MIN, SQRT
@@ -547,7 +548,6 @@ SUBROUTINE ZCHKBD( NSIZES, MVAL, NVAL, NTYPES, DOTYPE, NRHS,
       NTEST = 0
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = DLAMCH( 'Overflow' )
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       LOG2UI = INT( LOG( ULPINV ) / LOG( TWO ) )
diff --git a/TESTING/EIG/zchkbk.f b/TESTING/EIG/zchkbk.f
index 206e9c2b96..5596d9621b 100644
--- a/TESTING/EIG/zchkbk.f
+++ b/TESTING/EIG/zchkbk.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZCHKBK( NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zchkbl.f b/TESTING/EIG/zchkbl.f
index f623bc311e..762a56df9f 100644
--- a/TESTING/EIG/zchkbl.f
+++ b/TESTING/EIG/zchkbl.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZCHKBL( NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zchkdmd.f90 b/TESTING/EIG/zchkdmd.f90
new file mode 100644
index 0000000000..d22c32efd7
--- /dev/null
+++ b/TESTING/EIG/zchkdmd.f90
@@ -0,0 +1,745 @@
+!     This is a test program for checking the implementations of
+!     the implementations of the following subroutines
+!
+!     ZGEDMD,  for computation of the
+!              Dynamic Mode Decomposition (DMD)
+!     ZGEDMDQ, for computation of a
+!              QR factorization based compressed DMD
+!
+!     Developed and supported by:
+!     ===========================
+!     Developed and coded by Zlatko Drmac, Faculty of Science,
+!     University of Zagreb;  drmac@math.hr
+!     In cooperation with
+!     AIMdyn Inc., Santa Barbara, CA.
+!     ========================================================
+!     How to run the code (compiler, link info)
+!     ========================================================
+!     Compile as FORTRAN 90 (or later) and link with BLAS and
+!     LAPACK libraries.
+!     NOTE: The code is developed and tested on top of the
+!     Intel MKL library (versions 2022.0.3 and 2022.2.0),
+!     using the Intel Fortran compiler.
+!
+!     For developers of the C++ implementation
+!     ========================================================
+!     See the LAPACK++ and Template Numerical Toolkit (TNT)
+!
+!     Note on a development of the GPU HP implementation
+!     ========================================================
+!     Work in progress. See CUDA, MAGMA, SLATE.
+!     NOTE: The four SVD subroutines used in this code are
+!     included as a part of R&D and for the completeness.
+!     This was also an opportunity to test those SVD codes.
+!     If the scaling option is used all four are essentially
+!     equally good. For implementations on HP platforms,
+!     one can use whichever SVD is available.
+!............................................................
+
+!............................................................
+!............................................................
+!
+      PROGRAM DMD_TEST
+      use iso_fortran_env, only: real64
+      IMPLICIT NONE
+      integer, parameter :: WP = real64
+
+!............................................................
+      REAL(KIND=WP), PARAMETER ::  ONE = 1.0_WP
+      REAL(KIND=WP), PARAMETER :: ZERO = 0.0_WP
+
+      COMPLEX(KIND=WP), PARAMETER ::  ZONE = ( 1.0_WP, 0.0_WP )
+      COMPLEX(KIND=WP), PARAMETER :: ZZERO = ( 0.0_WP, 0.0_WP )
+!............................................................
+      REAL(KIND=WP), ALLOCATABLE, DIMENSION(:)   :: RES, &
+                     RES1, RESEX, SINGVX, SINGVQX, WORK
+      INTEGER      , ALLOCATABLE, DIMENSION(:)   :: IWORK
+      REAL(KIND=WP) :: WDUMMY(2)
+      INTEGER       :: IDUMMY(4), ISEED(4)
+      REAL(KIND=WP) :: ANORM, COND, CONDL, CONDR, EPS,       &
+                       TOL, TOL2, SVDIFF, TMP, TMP_AU,       &
+                       TMP_FQR, TMP_REZ, TMP_REZQ,  TMP_ZXW, &
+                       TMP_EX
+
+!............................................................
+      COMPLEX(KIND=WP) :: ZMAX
+      INTEGER :: LZWORK
+      COMPLEX(KIND=WP), ALLOCATABLE, DIMENSION(:,:) ::  ZA, ZAC,  &
+                                 ZAU, ZF, ZF0, ZF1, ZS, ZW,       &
+                                 ZX, ZX0, ZY, ZY0, ZY1, ZZ, ZZ1
+      COMPLEX(KIND=WP), ALLOCATABLE, DIMENSION(:)   ::  ZDA, ZDR, &
+                                       ZDL, ZEIGS, ZEIGSA, ZWORK
+      COMPLEX(KIND=WP) ::  ZDUMMY(22), ZDUM2X2(2,2)
+!............................................................
+      INTEGER :: K, KQ, LDF, LDS, LDA, LDAU, LDW, LDX, LDY,  &
+                 LDZ, LIWORK, LWORK, M, N, LLOOP, NRNK, NRNKsp
+      INTEGER :: i, iJOBREF, iJOBZ, iSCALE, INFO, j,     &
+                 NFAIL, NFAIL_AU, NFAIL_F_QR, NFAIL_REZ,     &
+                 NFAIL_REZQ, NFAIL_SVDIFF, NFAIL_TOTAL, NFAILQ_TOTAL,  &
+                 NFAIL_Z_XV,  MODE, MODEL, MODER, WHTSVD,     &
+                 WHTSVDsp
+      INTEGER :: iNRNK, iWHTSVD,  K_TRAJ, LWMINOPT
+      CHARACTER :: GRADE, JOBREF, JOBZ, PIVTNG, RSIGN,   &
+                       SCALE, RESIDS, WANTQ, WANTR
+      LOGICAL :: TEST_QRDMD
+
+!.....external subroutines (BLAS and LAPACK)
+      EXTERNAL DAXPY,  DGEEV, DGEMM, DGEMV, DLACPY, DLASCL
+      EXTERNAL ZGEEV,  ZGEMV, ZLASCL
+      EXTERNAL ZLARNV, ZLATMR
+      EXTERNAL ZAXPY,  ZGEMM
+!.....external subroutines DMD package, part 1
+!     subroutines under test
+      EXTERNAL ZGEDMD, ZGEDMDQ
+!.....external functions (BLAS and LAPACK)
+      EXTERNAL         DLAMCH,  DZNRM2
+      REAL(KIND=WP) :: DLAMCH,  DZNRM2
+      REAL(KIND=WP) ::          ZLANGE
+      EXTERNAL IZAMAX
+      INTEGER  IZAMAX
+      EXTERNAL LSAME
+      LOGICAL  LSAME
+
+      INTRINSIC ABS, INT, MIN, MAX, SIGN
+!............................................................
+
+      ! The test is always in pairs : ( ZGEDMD and ZGEDMDQ )
+      ! because the test includes comparing the results (in pairs).
+!.....................................................................................
+      TEST_QRDMD = .TRUE. ! This code by default performs tests on ZGEDMDQ
+                          ! Since the QR factorizations based algorithm is designed for
+                          ! single trajectory data, only single trajectory tests will
+                          ! be performed with xGEDMDQ.
+      WANTQ = 'Q'
+      WANTR = 'R'
+!.................................................................................
+
+      EPS = DLAMCH( 'P' )  ! machine precision DP
+
+      ! Global counters of failures of some particular tests
+      NFAIL      = 0
+      NFAIL_REZ  = 0
+      NFAIL_REZQ = 0
+      NFAIL_Z_XV = 0
+      NFAIL_F_QR = 0
+      NFAIL_AU   = 0
+      NFAIL_SVDIFF = 0
+      NFAIL_TOTAL  = 0
+      NFAILQ_TOTAL = 0
+
+      DO LLOOP = 1, 4
+
+      WRITE(*,*) 'L Loop Index = ', LLOOP
+
+      ! Set the dimensions of the problem ...
+      WRITE(*,*) 'M = '
+      READ(*,*) M
+      WRITE(*,*) M
+      ! ... and the number of snapshots.
+      WRITE(*,*) 'N = '
+      READ(*,*) N
+      WRITE(*,*) N
+
+      ! ... Test the dimensions
+      IF ( ( MIN(M,N) == 0 ) .OR. ( M < N )  ) THEN
+          WRITE(*,*) 'Bad dimensions. Required: M >= N > 0.'
+          STOP
+      END IF
+!.............
+      ! The seed inside the LLOOP so that each pass can be reproduced easily.
+      ISEED(1) = 4
+      ISEED(2) = 3
+      ISEED(3) = 2
+      ISEED(4) = 1
+
+      LDA  = M
+      LDF  = M
+      LDX  = M
+      LDY  = M
+      LDW  = N
+      LDZ  = M
+      LDAU = M
+      LDS  = N
+
+      TMP_ZXW  = ZERO
+      TMP_AU   = ZERO
+      TMP_REZ  = ZERO
+      TMP_REZQ = ZERO
+      SVDIFF   = ZERO
+      TMP_EX   = ZERO
+
+      ALLOCATE( ZA(LDA,M) )
+      ALLOCATE( ZAC(LDA,M) )
+      ALLOCATE( ZF(LDF,N+1) )
+      ALLOCATE( ZF0(LDF,N+1) )
+      ALLOCATE( ZF1(LDF,N+1) )
+      ALLOCATE( ZX(LDX,N) )
+      ALLOCATE( ZX0(LDX,N) )
+      ALLOCATE( ZY(LDY,N+1) )
+      ALLOCATE( ZY0(LDY,N+1) )
+      ALLOCATE( ZY1(LDY,N+1) )
+      ALLOCATE( ZAU(LDAU,N) )
+      ALLOCATE( ZW(LDW,N) )
+      ALLOCATE( ZS(LDS,N) )
+      ALLOCATE( ZZ(LDZ,N) )
+      ALLOCATE( ZZ1(LDZ,N) )
+      ALLOCATE( RES(N) )
+      ALLOCATE( RES1(N) )
+      ALLOCATE( RESEX(N) )
+      ALLOCATE( ZEIGS(N) )
+      ALLOCATE( SINGVX(N) )
+      ALLOCATE( SINGVQX(N) )
+
+      TOL  = M*EPS
+      ! This mimics O(M*N)*EPS bound for accumulated roundoff error.
+      ! The factor 10 is somewhat arbitrary.
+      TOL2 = 10*M*N*EPS
+
+!.............
+
+      DO K_TRAJ = 1, 2
+      !  Number of intial conditions in the simulation/trajectories (1 or 2)
+
+      COND = 1.0D4
+      ZMAX = (1.0D1,1.0D1)
+      RSIGN = 'F'
+      GRADE = 'N'
+      MODEL = 6
+      CONDL = 1.0D1
+      MODER = 6
+      CONDR = 1.0D1
+      PIVTNG = 'N'
+
+      ! Loop over all parameter MODE values for ZLATMR (+1,..,+6)
+      DO MODE = 1, 6
+
+      ALLOCATE( IWORK(2*M) )
+      ALLOCATE( ZDA(M) )
+      ALLOCATE( ZDL(M) )
+      ALLOCATE( ZDR(M) )
+
+      CALL ZLATMR( M, M, 'N', ISEED, 'N', ZDA, MODE, COND, &
+                   ZMAX, RSIGN, GRADE, ZDL, MODEL,  CONDL, &
+                   ZDR, MODER, CONDR, PIVTNG, IWORK, M, M, &
+                   ZERO, -ONE, 'N', ZA, LDA, IWORK(M+1), INFO )
+      DEALLOCATE( ZDR )
+      DEALLOCATE( ZDL )
+      DEALLOCATE( ZDA )
+      DEALLOCATE( IWORK )
+
+      LZWORK = MAX(1,2*M)
+      ALLOCATE( ZEIGSA(M) )
+      ALLOCATE( ZWORK(LZWORK) )
+      ALLOCATE( WORK(2*M) )
+      ZAC(1:M,1:M) = ZA(1:M,1:M)
+      CALL ZGEEV( 'N','N', M, ZAC, LDA, ZEIGSA, ZDUM2X2, 2, &
+                  ZDUM2X2, 2, ZWORK, LZWORK, WORK, INFO ) ! LAPACK CALL
+      DEALLOCATE(WORK)
+      DEALLOCATE(ZWORK)
+
+      TMP = ABS(ZEIGSA(IZAMAX(M, ZEIGSA, 1))) ! The spectral radius of ZA
+      ! Scale the matrix ZA to have unit spectral radius.
+      CALL ZLASCL( 'G',0, 0, TMP, ONE, M, M, &
+                   ZA, LDA, INFO )
+      CALL ZLASCL( 'G',0, 0, TMP, ONE, M, 1, &
+                   ZEIGSA, M, INFO )
+      ANORM = ZLANGE( 'F', M, M, ZA, LDA, WDUMMY )
+
+      IF ( K_TRAJ == 2 ) THEN
+          ! generate data as two trajectories
+          ! with two inital conditions
+          CALL ZLARNV(2, ISEED, M, ZF(1,1) )
+          DO i = 1, N/2
+             CALL ZGEMV( 'N', M, M, ZONE, ZA, LDA, ZF(1,i), 1,  &
+                  ZZERO, ZF(1,i+1), 1 )
+          END DO
+          ZX0(1:M,1:N/2) = ZF(1:M,1:N/2)
+          ZY0(1:M,1:N/2) = ZF(1:M,2:N/2+1)
+
+          CALL ZLARNV(2, ISEED, M, ZF(1,1) )
+          DO i = 1, N-N/2
+             CALL ZGEMV( 'N', M, M, ZONE, ZA, LDA, ZF(1,i), 1,  &
+                  ZZERO, ZF(1,i+1), 1 )
+          END DO
+          ZX0(1:M,N/2+1:N) = ZF(1:M,1:N-N/2)
+          ZY0(1:M,N/2+1:N) = ZF(1:M,2:N-N/2+1)
+      ELSE
+          CALL ZLARNV(2, ISEED, M, ZF(1,1) )
+          DO i = 1, N
+             CALL ZGEMV( 'N', M, M, ZONE, ZA, M, ZF(1,i), 1,  &
+                  ZZERO, ZF(1,i+1), 1 )
+          END DO
+          ZF0(1:M,1:N+1) = ZF(1:M,1:N+1)
+          ZX0(1:M,1:N) = ZF0(1:M,1:N)
+          ZY0(1:M,1:N) = ZF0(1:M,2:N+1)
+      END IF
+
+      DEALLOCATE( ZEIGSA )
+!........................................................................
+
+      DO iJOBZ = 1, 4
+
+          SELECT CASE ( iJOBZ )
+          CASE(1)
+              JOBZ   = 'V'
+              RESIDS = 'R'
+          CASE(2)
+              JOBZ   = 'V'
+              RESIDS = 'N'
+          CASE(3)
+              JOBZ   = 'F'
+              RESIDS = 'N'
+          CASE(4)
+              JOBZ   = 'N'
+              RESIDS = 'N'
+          END SELECT
+
+      DO iJOBREF = 1, 3
+
+          SELECT CASE ( iJOBREF )
+          CASE(1)
+              JOBREF = 'R'
+          CASE(2)
+              JOBREF = 'E'
+          CASE(3)
+              JOBREF = 'N'
+          END SELECT
+
+      DO iSCALE = 1, 4
+
+          SELECT CASE ( iSCALE )
+          CASE(1)
+              SCALE = 'S'
+          CASE(2)
+              SCALE = 'C'
+          CASE(3)
+              SCALE = 'Y'
+          CASE(4)
+              SCALE = 'N'
+          END SELECT
+
+      DO iNRNK = -1, -2, -1
+         NRNK   = iNRNK
+         NRNKsp = iNRNK
+
+      DO iWHTSVD = 1,  3
+         ! Check all four options to compute the POD basis
+         ! via the SVD.
+         WHTSVD   = iWHTSVD
+         WHTSVDsp = iWHTSVD
+
+      DO LWMINOPT = 1, 2
+         ! Workspace query for the minimal (1) and for the optimal
+         ! (2) workspace lengths determined by workspace query.
+
+      ! ZGEDMD is always tested and its results are also used for
+      ! comparisons with ZGEDMDQ.
+
+      ZX(1:M,1:N) = ZX0(1:M,1:N)
+      ZY(1:M,1:N) = ZY0(1:M,1:N)
+
+      CALL ZGEDMD( SCALE, JOBZ, RESIDS, JOBREF, WHTSVD,   &
+                   M,  N, ZX, LDX, ZY, LDY, NRNK, TOL,    &
+                   K, ZEIGS, ZZ, LDZ,  RES, ZAU, LDAU,    &
+                   ZW,  LDW, ZS, LDS,  ZDUMMY, -1,        &
+                   WDUMMY, -1, IDUMMY, -1, INFO )
+      IF ( (INFO .EQ. 2) .OR. ( INFO .EQ. 3 ) &
+                          .OR. ( INFO < 0 ) ) THEN
+           WRITE(*,*) 'Call to ZGEDMD workspace query failed. &
+                      &Check the calling sequence and the code.'
+           WRITE(*,*) 'The error code is ', INFO
+           WRITE(*,*) 'The input parameters were ',      &
+           SCALE, JOBZ, RESIDS, JOBREF, WHTSVD,          &
+           M, N, LDX, LDY, NRNK, TOL, LDZ, LDAU, LDW, LDS
+           STOP
+      END IF
+
+      LZWORK = INT(ZDUMMY(LWMINOPT))
+      LWORK  = INT(WDUMMY(1))
+      LIWORK = IDUMMY(1)
+
+      ALLOCATE(ZWORK(LZWORK))
+      ALLOCATE( WORK(LWORK))
+      ALLOCATE(IWORK(LIWORK))
+
+      CALL ZGEDMD( SCALE, JOBZ, RESIDS, JOBREF, WHTSVD,  &
+                   M,  N, ZX, LDX, ZY, LDY, NRNK, TOL,   &
+                   K, ZEIGS, ZZ, LDZ,  RES, ZAU, LDAU,   &
+                   ZW,  LDW,  ZS, LDS, ZWORK,  LZWORK,   &
+                   WORK, LWORK, IWORK, LIWORK, INFO )
+
+      IF ( INFO /= 0 ) THEN
+           WRITE(*,*) 'Call to ZGEDMD failed. &
+           &Check the calling sequence and the code.'
+           WRITE(*,*) 'The error code is ', INFO
+           WRITE(*,*) 'The input parameters were ',&
+           SCALE, JOBZ, RESIDS, JOBREF, WHTSVD, &
+           M, N, LDX, LDY, NRNK, TOL
+           STOP
+      END IF
+
+      SINGVX(1:N) = WORK(1:N)
+
+      !...... ZGEDMD check point
+      IF ( LSAME(JOBZ,'V')  ) THEN
+          ! Check that Z = X*W, on return from ZGEDMD
+          ! This checks that the returned eigenvectors in Z are
+          ! the product of the SVD'POD basis returned in X
+          ! and the eigenvectors of the rayleigh quotient
+          ! returned in W
+          CALL ZGEMM( 'N', 'N', M, K, K, ZONE, ZX, LDX, ZW, LDW, &
+                      ZZERO, ZZ1, LDZ )
+          TMP = ZERO
+          DO i = 1, K
+             CALL ZAXPY( M, -ZONE, ZZ(1,i), 1, ZZ1(1,i), 1)
+             TMP = MAX(TMP, DZNRM2( M, ZZ1(1,i), 1 ) )
+          END DO
+          TMP_ZXW = MAX(TMP_ZXW, TMP )
+          IF ( TMP_ZXW <= 10*M*EPS ) THEN
+              !WRITE(*,*) ' :) .... OK .........ZGEDMD PASSED.'
+          ELSE
+              NFAIL_Z_XV = NFAIL_Z_XV + 1
+              WRITE(*,*) ':( .................ZGEDMD FAILED!', &
+                  'Check the code for implementation errors.'
+              WRITE(*,*) 'The input parameters were ',&
+                 SCALE, JOBZ, RESIDS, JOBREF, WHTSVD, &
+                 M, N, LDX, LDY, NRNK, TOL
+          END IF
+      END IF
+
+
+      !...... ZGEDMD check point
+      IF ( LSAME(JOBREF,'R') ) THEN
+           ! The matrix A*U is returned for computing refined Ritz vectors.
+           ! Check that A*U is computed correctly using the formula
+           ! A*U = Y * V * inv(SIGMA). This depends on the
+           ! accuracy in the computed singular values and vectors of X.
+           ! See the paper for an error analysis.
+           ! Note that the left singular vectors of the input matrix X
+           ! are returned in the array X.
+           CALL ZGEMM( 'N', 'N', M, K, M, ZONE, ZA, LDA, ZX, LDX, &
+                      ZZERO, ZZ1, LDZ )
+          TMP = ZERO
+          DO i = 1, K
+            CALL ZAXPY( M, -ZONE, ZAU(1,i), 1, ZZ1(1,i), 1)
+            TMP = MAX( TMP, DZNRM2( M, ZZ1(1,i),1 ) * &
+                     SINGVX(K)/(ANORM*SINGVX(1)) )
+          END DO
+          TMP_AU = MAX( TMP_AU, TMP )
+          IF ( TMP <= TOL2 ) THEN
+              !WRITE(*,*) ':) .... OK .........ZGEDMD PASSED.'
+          ELSE
+              NFAIL_AU = NFAIL_AU + 1
+              WRITE(*,*) ':( .................ZGEDMD FAILED!', &
+                  'Check the code for implementation errors.'
+              WRITE(*,*) 'The input parameters were ',&
+                 SCALE, JOBZ, RESIDS, JOBREF, WHTSVD, &
+                 M, N, LDX, LDY, NRNK, TOL
+          END IF
+      ELSEIF ( LSAME(JOBREF,'E') ) THEN
+       ! The unscaled vectors of the Exact DMD are computed.
+       ! This option is included for the sake of completeness,
+       ! for users who prefer the Exact DMD vectors. The
+       ! returned vectors are in the real form, in the same way
+       ! as the Ritz vectors. Here we just save the vectors
+       ! and test them separately using a Matlab script.
+
+
+       CALL ZGEMM( 'N', 'N', M, K, M, ZONE, ZA, LDA, ZAU, LDAU, ZZERO, ZY1, LDY )
+
+               DO i=1, K
+                  ! have a real eigenvalue with real eigenvector
+                CALL ZAXPY( M, -ZEIGS(i), ZAU(1,i), 1, ZY1(1,i), 1 )
+                RESEX(i) = DZNRM2( M, ZY1(1,i), 1) / DZNRM2(M,ZAU(1,i),1)
+               END DO
+      END IF
+      !...... ZGEDMD check point
+
+      IF ( LSAME(RESIDS, 'R') ) THEN
+          ! Compare the residuals returned by ZGEDMD with the
+          ! explicitly computed residuals using the matrix A.
+          ! Compute explicitly Y1 = A*Z
+          CALL ZGEMM( 'N', 'N', M, K, M, ZONE, ZA, LDA, ZZ, LDZ, ZZERO, ZY1, LDY )
+          ! ... and then A*Z(:,i) - LAMBDA(i)*Z(:,i), using the real forms
+          ! of the invariant subspaces that correspond to complex conjugate
+          ! pairs of eigencalues. (See the description of Z in ZGEDMD,)
+
+          DO i=1, K
+                ! have a real eigenvalue with real eigenvector
+                CALL ZAXPY( M, -ZEIGS(i), ZZ(1,i), 1, ZY1(1,i), 1 )
+                RES1(i) = DZNRM2( M, ZY1(1,i), 1)
+          END DO
+          TMP = ZERO
+          DO i = 1, K
+          TMP = MAX( TMP, ABS(RES(i) - RES1(i)) * &
+                    SINGVX(K)/(ANORM*SINGVX(1)) )
+          END DO
+          TMP_REZ = MAX( TMP_REZ, TMP )
+          IF ( TMP <= TOL2 ) THEN
+              !WRITE(*,*) ':) .... OK ..........ZGEDMD PASSED.'
+          ELSE
+              NFAIL_REZ = NFAIL_REZ + 1
+              WRITE(*,*) ':( ..................ZGEDMD FAILED!', &
+                  'Check the code for implementation errors.'
+              WRITE(*,*) 'The input parameters were ',&
+                 SCALE, JOBZ, RESIDS, JOBREF, WHTSVD, &
+                 M, N, LDX, LDY, NRNK, TOL
+          END IF
+
+
+         IF ( LSAME(JOBREF,'E') ) THEN
+            TMP = ZERO
+          DO i = 1, K
+          TMP = MAX( TMP, ABS(RES1(i) - RESEX(i))/(RES1(i)+RESEX(i)) )
+          END DO
+          TMP_EX = MAX(TMP_EX,TMP)
+         END IF
+
+      END IF
+
+      DEALLOCATE(ZWORK)
+      DEALLOCATE(WORK)
+      DEALLOCATE(IWORK)
+
+      IF ( TEST_QRDMD .AND. (K_TRAJ == 1) ) THEN
+
+      ZF(1:M,1:N+1) = ZF0(1:M,1:N+1)
+
+      CALL ZGEDMDQ( SCALE, JOBZ, RESIDS, WANTQ, WANTR, JOBREF, &
+                    WHTSVD, M, N+1, ZF, LDF,  ZX, LDX,  ZY, LDY,  &
+                    NRNK,  TOL, K, ZEIGS, ZZ, LDZ, RES,  ZAU,  &
+                    LDAU, ZW, LDW, ZS, LDS, ZDUMMY, -1,   &
+                    WDUMMY,  -1, IDUMMY, -1, INFO )
+
+      LZWORK = INT(ZDUMMY(LWMINOPT))
+      ALLOCATE( ZWORK(LZWORK) )
+      LIWORK = IDUMMY(1)
+      ALLOCATE(IWORK(LIWORK))
+      LWORK = INT(WDUMMY(1))
+      ALLOCATE(WORK(LWORK))
+
+      CALL ZGEDMDQ( SCALE, JOBZ, RESIDS, WANTQ, WANTR, JOBREF, &
+                    WHTSVD, M, N+1, ZF, LDF,  ZX, LDX,  ZY, LDY,  &
+                    NRNK,  TOL, KQ, ZEIGS, ZZ, LDZ, RES,  ZAU,  &
+                    LDAU, ZW, LDW, ZS, LDS, ZWORK, LZWORK,   &
+                    WORK,  LWORK, IWORK, LIWORK, INFO )
+
+      IF ( INFO /= 0 ) THEN
+             WRITE(*,*) 'Call to ZGEDMDQ failed. &
+             &Check the calling sequence and the code.'
+             WRITE(*,*) 'The error code is ', INFO
+             WRITE(*,*) 'The input parameters were ',&
+             SCALE, JOBZ, RESIDS, WANTQ, WANTR, WHTSVD, &
+             M, N, LDX, LDY, NRNK, TOL
+             STOP
+      END IF
+      SINGVQX(1:N) = WORK(1:N)
+
+      !..... ZGEDMDQ check point
+
+          IF ( 1 == 0 ) THEN
+              ! Comparison of ZGEDMD and ZGEDMDQ singular values disabled
+          TMP = ZERO
+          DO i = 1, MIN(K, KQ)
+             TMP = MAX(TMP, ABS(SINGVX(i)-SINGVQX(i)) / &
+                                   SINGVX(1) )
+          END DO
+          SVDIFF = MAX( SVDIFF, TMP )
+          IF ( TMP > M*N*EPS ) THEN
+             WRITE(*,*) 'FAILED! Something was wrong with the run.'
+             NFAIL_SVDIFF = NFAIL_SVDIFF + 1
+             DO j =1, 3
+                 write(*,*) j, SINGVX(j), SINGVQX(j)
+                 read(*,*)
+             END DO
+
+          END IF
+          END IF
+
+      !..... ZGEDMDQ check point
+      IF ( LSAME(WANTQ,'Q') .AND. LSAME(WANTR,'R') ) THEN
+         ! Check that the QR factors are computed and returned
+         ! as requested. The residual ||F-Q*R||_F / ||F||_F
+         ! is compared to M*N*EPS.
+         ZF1(1:M,1:N+1) = ZF0(1:M,1:N+1)
+         CALL ZGEMM( 'N', 'N', M, N+1, MIN(M,N+1), -ZONE, ZF, &
+                     LDF, ZY, LDY, ZONE, ZF1, LDF )
+         TMP_FQR = ZLANGE( 'F', M, N+1, ZF1, LDF, WORK ) / &
+               ZLANGE( 'F', M, N+1, ZF0,  LDF, WORK )
+         IF ( TMP_FQR > TOL2 ) THEN
+              WRITE(*,*) 'FAILED! Something was wrong with the run.'
+             NFAIL_F_QR = NFAIL_F_QR + 1
+         ELSE
+             !WRITE(*,*) '........ PASSED.'
+         END IF
+      END IF
+
+      !..... ZGEDMDQ check point
+      IF ( LSAME(RESIDS, 'R') ) THEN
+          ! Compare the residuals returned by ZGEDMDQ with the
+          ! explicitly computed residuals using the matrix A.
+          ! Compute explicitly Y1 = A*Z
+          CALL ZGEMM( 'N', 'N', M, KQ, M, ZONE, ZA, LDA, ZZ, LDZ, ZZERO, ZY1, LDY )
+          ! ... and then A*Z(:,i) - LAMBDA(i)*Z(:,i), using the real forms
+          ! of the invariant subspaces that correspond to complex conjugate
+          ! pairs of eigencalues. (See the description of Z in ZGEDMDQ)
+
+          DO i=1, KQ
+                ! have a real eigenvalue with real eigenvector
+                CALL ZAXPY( M, -ZEIGS(i), ZZ(1,i), 1, ZY1(1,i), 1 )
+                ! Y(1:M,i) = Y(1:M,i) - REIG(i)*Z(1:M,i)
+                RES1(i) = DZNRM2( M, ZY1(1,i), 1)
+          END DO
+          TMP = ZERO
+          DO i = 1, KQ
+          TMP = MAX( TMP, ABS(RES(i) - RES1(i)) * &
+              SINGVQX(KQ)/(ANORM*SINGVQX(1)) )
+          END DO
+          TMP_REZQ = MAX( TMP_REZQ, TMP )
+          IF ( TMP <= TOL2 ) THEN
+              !WRITE(*,*) '.... OK ........ ZGEDMDQ PASSED.'
+          ELSE
+              NFAIL_REZQ = NFAIL_REZQ + 1
+              WRITE(*,*) '................ ZGEDMDQ FAILED!', &
+                  'Check the code for implementation errors.'
+              STOP
+          END IF
+
+      END IF
+
+      DEALLOCATE( ZWORK )
+      DEALLOCATE( WORK  )
+      DEALLOCATE( IWORK )
+
+      END IF ! ZGEDMDQ
+
+!.......................................................................................................
+
+      END DO   ! LWMINOPT
+      !write(*,*) 'LWMINOPT loop completed'
+      END DO   ! iWHTSVD
+      !write(*,*) 'WHTSVD loop completed'
+      END DO   ! iNRNK  -2:-1
+      !write(*,*) 'NRNK loop completed'
+      END DO   ! iSCALE  1:4
+      !write(*,*) 'SCALE loop completed'
+      END DO
+      !write(*,*) 'JOBREF loop completed'
+      END DO   ! iJOBZ
+      !write(*,*) 'JOBZ loop completed'
+
+      END DO ! MODE -6:6
+      !write(*,*) 'MODE loop completed'
+      END DO ! 1 or 2 trajectories
+      !write(*,*) 'trajectories  loop completed'
+
+      DEALLOCATE( ZA )
+      DEALLOCATE( ZAC )
+      DEALLOCATE( ZZ )
+      DEALLOCATE( ZF )
+      DEALLOCATE( ZF0 )
+      DEALLOCATE( ZF1 )
+      DEALLOCATE( ZX )
+      DEALLOCATE( ZX0 )
+      DEALLOCATE( ZY )
+      DEALLOCATE( ZY0 )
+      DEALLOCATE( ZY1 )
+      DEALLOCATE( ZAU )
+      DEALLOCATE( ZW )
+      DEALLOCATE( ZS )
+      DEALLOCATE( ZZ1 )
+      DEALLOCATE( RES )
+      DEALLOCATE( RES1 )
+      DEALLOCATE( RESEX )
+      DEALLOCATE( ZEIGS )
+      DEALLOCATE( SINGVX )
+      DEALLOCATE( SINGVQX )
+
+      END DO ! LLOOP
+
+      WRITE(*,*) '>>>>>>>>>>>>>>>>>>>>>>>>>>'
+      WRITE(*,*) ' Test summary for ZGEDMD :'
+      WRITE(*,*) '>>>>>>>>>>>>>>>>>>>>>>>>>>'
+      WRITE(*,*)
+      IF ( NFAIL_Z_XV == 0 ) THEN
+         WRITE(*,*) '>>>> Z - U*V test PASSED.'
+      ELSE
+         WRITE(*,*) 'Z - U*V test FAILED ', NFAIL_Z_XV, ' time(s)'
+         WRITE(*,*) 'Max error ||Z-U*V||_F was ', TMP_ZXW
+         NFAIL_TOTAL = NFAIL_TOTAL + NFAIL_Z_XV
+      END IF
+      IF ( NFAIL_AU == 0 ) THEN
+        WRITE(*,*) '>>>> A*U test PASSED. '
+      ELSE
+        WRITE(*,*) 'A*U test FAILED ', NFAIL_AU, ' time(s)'
+        WRITE(*,*) 'Max A*U test adjusted error measure was ', TMP_AU
+        WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+        NFAIL_TOTAL = NFAIL_TOTAL + NFAIL_AU
+      END IF
+
+      IF ( NFAIL_REZ == 0 ) THEN
+        WRITE(*,*) '>>>> Rezidual computation test PASSED.'
+      ELSE
+        WRITE(*,*) 'Rezidual computation test FAILED ', NFAIL_REZ, 'time(s)'
+        WRITE(*,*) 'Max residual computing test adjusted error measure was ', TMP_REZ
+        WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+        NFAIL_TOTAL = NFAIL_TOTAL + NFAIL_REZ
+      END IF
+
+      IF ( NFAIL_TOTAL == 0 ) THEN
+        WRITE(*,*) '>>>> ZGEDMD :: ALL TESTS PASSED.'
+      ELSE
+        WRITE(*,*) NFAIL_TOTAL, 'FAILURES!'
+        WRITE(*,*) '>>>>>>>>>>>>>> ZGEDMD :: TESTS FAILED. CHECK THE IMPLEMENTATION.'
+      END IF
+
+      IF ( TEST_QRDMD ) THEN
+      WRITE(*,*)
+      WRITE(*,*) '>>>>>>>>>>>>>>>>>>>>>>>>>>'
+      WRITE(*,*) ' Test summary for ZGEDMDQ :'
+      WRITE(*,*) '>>>>>>>>>>>>>>>>>>>>>>>>>>'
+      WRITE(*,*)
+
+      IF ( NFAIL_SVDIFF == 0 ) THEN
+          WRITE(*,*) '>>>> ZGEDMD and ZGEDMDQ computed singular &
+              &values test PASSED.'
+      ELSE
+         WRITE(*,*) 'ZGEDMD and ZGEDMDQ discrepancies in &
+             &the singular values unacceptable ', &
+             NFAIL_SVDIFF, ' times. Test FAILED.'
+         WRITE(*,*) 'The maximal discrepancy in the singular values (relative to the norm) was ', SVDIFF
+         WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+         NFAILQ_TOTAL = NFAILQ_TOTAL + NFAIL_SVDIFF
+      END IF
+
+      IF ( NFAIL_F_QR == 0 ) THEN
+          WRITE(*,*) '>>>> F - Q*R test PASSED.'
+      ELSE
+          WRITE(*,*) 'F - Q*R test FAILED ', NFAIL_F_QR, ' time(s)'
+          WRITE(*,*) 'The largest relative residual was ', TMP_FQR
+          WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+          NFAILQ_TOTAL = NFAILQ_TOTAL + NFAIL_F_QR
+      END IF
+
+      IF ( NFAIL_REZQ == 0 ) THEN
+          WRITE(*,*) '>>>> Rezidual computation test PASSED.'
+      ELSE
+          WRITE(*,*) 'Rezidual computation test FAILED ', NFAIL_REZQ, 'time(s)'
+          WRITE(*,*) 'Max residual computing test adjusted error measure was ', TMP_REZQ
+          WRITE(*,*) 'It should be up to O(M*N) times EPS, EPS = ', EPS
+          NFAILQ_TOTAL = NFAILQ_TOTAL + NFAIL_REZQ
+      END IF
+
+      IF ( NFAILQ_TOTAL == 0 ) THEN
+          WRITE(*,*) '>>>>>>> ZGEDMDQ :: ALL TESTS PASSED.'
+      ELSE
+         WRITE(*,*) NFAILQ_TOTAL, 'FAILURES!'
+         WRITE(*,*) '>>>>>>> ZGEDMDQ :: TESTS FAILED. CHECK THE IMPLEMENTATION.'
+      END IF
+
+      END IF
+
+      WRITE(*,*)
+      WRITE(*,*) 'Test completed.'
+      STOP
+      END
diff --git a/TESTING/EIG/zchkec.f b/TESTING/EIG/zchkec.f
index 1e1c29e0d0..a9cbe14ff8 100644
--- a/TESTING/EIG/zchkec.f
+++ b/TESTING/EIG/zchkec.f
@@ -72,6 +72,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZCHKEC( THRESH, TSTERR, NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -88,17 +89,17 @@ SUBROUTINE ZCHKEC( THRESH, TSTERR, NIN, NOUT )
 *     .. Local Scalars ..
       LOGICAL            OK
       CHARACTER*3        PATH
-      INTEGER            KTREXC, KTRSEN, KTRSNA, KTRSYL, LTREXC, LTRSYL,
-     $                   NTESTS, NTREXC, NTRSYL
-      DOUBLE PRECISION   EPS, RTREXC, RTRSYL, SFMIN
+      INTEGER            KTREXC, KTRSEN, KTRSNA, KTRSYL, KTRSYL3,
+     $                   LTREXC, LTRSYL, NTESTS, NTREXC, NTRSYL
+      DOUBLE PRECISION   EPS, RTREXC, SFMIN
 *     ..
 *     .. Local Arrays ..
-      INTEGER            LTRSEN( 3 ), LTRSNA( 3 ), NTRSEN( 3 ),
-     $                   NTRSNA( 3 )
-      DOUBLE PRECISION   RTRSEN( 3 ), RTRSNA( 3 )
+      INTEGER            FTRSYL( 3 ), ITRSYL( 2 ), LTRSEN( 3 ),
+     $                   LTRSNA( 3 ), NTRSEN( 3 ), NTRSNA( 3 )
+      DOUBLE PRECISION   RTRSEN( 3 ), RTRSNA( 3 ), RTRSYL( 2 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZERREC, ZGET35, ZGET36, ZGET37, ZGET38
+      EXTERNAL           ZERREC, ZGET35, ZGET36, ZGET37, ZGET38, ZSYL01
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION   DLAMCH
@@ -120,10 +121,24 @@ SUBROUTINE ZCHKEC( THRESH, TSTERR, NIN, NOUT )
      $   CALL ZERREC( PATH, NOUT )
 *
       OK = .TRUE.
-      CALL ZGET35( RTRSYL, LTRSYL, NTRSYL, KTRSYL, NIN )
-      IF( RTRSYL.GT.THRESH ) THEN
+      CALL ZGET35( RTRSYL( 1 ), LTRSYL, NTRSYL, KTRSYL, NIN )
+      IF( RTRSYL( 1 ).GT.THRESH ) THEN
          OK = .FALSE.
-         WRITE( NOUT, FMT = 9999 )RTRSYL, LTRSYL, NTRSYL, KTRSYL
+         WRITE( NOUT, FMT = 9999 )RTRSYL( 1 ), LTRSYL, NTRSYL, KTRSYL
+      END IF
+*
+      CALL ZSYL01( THRESH, FTRSYL, RTRSYL, ITRSYL, KTRSYL3 )
+      IF( FTRSYL( 1 ).GT.0 ) THEN
+         OK = .FALSE.
+         WRITE( NOUT, FMT = 9970 )FTRSYL( 1 ), RTRSYL( 1 ), THRESH
+      END IF
+      IF( FTRSYL( 2 ).GT.0 ) THEN
+         OK = .FALSE.
+         WRITE( NOUT, FMT = 9971 )FTRSYL( 2 ), RTRSYL( 2 ), THRESH
+      END IF
+      IF( FTRSYL( 3 ).GT.0 ) THEN
+         OK = .FALSE.
+         WRITE( NOUT, FMT = 9972 )FTRSYL( 3 )
       END IF
 *
       CALL ZGET36( RTREXC, LTREXC, NTREXC, KTREXC, NIN )
@@ -148,7 +163,7 @@ SUBROUTINE ZCHKEC( THRESH, TSTERR, NIN, NOUT )
          WRITE( NOUT, FMT = 9996 )RTRSEN, LTRSEN, NTRSEN, KTRSEN
       END IF
 *
-      NTESTS = KTRSYL + KTREXC + KTRSNA + KTRSEN
+      NTESTS = KTRSYL + KTRSYL3 + KTREXC + KTRSNA + KTRSEN
       IF( OK )
      $   WRITE( NOUT, FMT = 9995 )PATH, NTESTS
 *
@@ -169,6 +184,12 @@ SUBROUTINE ZCHKEC( THRESH, TSTERR, NIN, NOUT )
      $      / ' Safe minimum (SFMIN)             = ', D16.6, / )
  9992 FORMAT( ' Routines pass computational tests if test ratio is ',
      $      'less than', F8.2, / / )
+ 9970 FORMAT( 'Error in ZTRSYL: ', I8, ' tests fail the threshold.', /
+     $      'Maximum test ratio =', D12.3, ' threshold =', D12.3 )
+ 9971 FORMAT( 'Error in ZTRSYL3: ', I8, ' tests fail the threshold.', /
+     $      'Maximum test ratio =', D12.3, ' threshold =', D12.3 )
+ 9972 FORMAT( 'ZTRSYL and ZTRSYL3 compute an inconsistent scale ',
+     $      'factor in ', I8, ' tests.')
       RETURN
 *
 *     End of ZCHKEC
diff --git a/TESTING/EIG/zchkee.F b/TESTING/EIG/zchkee.F
index b14127553b..7261881b48 100644
--- a/TESTING/EIG/zchkee.F
+++ b/TESTING/EIG/zchkee.F
@@ -2522,7 +2522,7 @@ PROGRAM ZCHKEE
  9974 FORMAT( ' Tests of ZHBTRD', / ' (reduction of a Hermitian band ',
      $      'matrix to real tridiagonal form)' )
  9973 FORMAT( / 1X, 71( '-' ) )
- 9972 FORMAT( / ' LAPACK VERSION ', I1, '.', I1, '.', I1 )
+ 9972 FORMAT( / ' LAPACK VERSION ', I1, '.', I2, '.', I1 )
  9971 FORMAT( / ' Tests of the Generalized Linear Regression Model ',
      $      'routines' )
  9970 FORMAT( / ' Tests of the Generalized QR and RQ routines' )
diff --git a/TESTING/EIG/zchkgg.f b/TESTING/EIG/zchkgg.f
index 5e6797f502..5feafc1b1b 100644
--- a/TESTING/EIG/zchkgg.f
+++ b/TESTING/EIG/zchkgg.f
@@ -500,6 +500,7 @@ SUBROUTINE ZCHKGG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   S2, P1, P2, U, LDU, V, Q, Z, ALPHA1, BETA1,
      $                   ALPHA3, BETA3, EVECTL, EVECTR, WORK, LWORK,
      $                   RWORK, LLWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -559,9 +560,9 @@ SUBROUTINE ZCHKGG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           DLAMCH, ZLANGE, ZLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLASUM, XERBLA, ZGEQR2, ZGET51, ZGET52,
-     $                   ZGGHRD, ZHGEQZ, ZLACPY, ZLARFG, ZLASET, ZLATM4,
-     $                   ZTGEVC, ZUNM2R
+      EXTERNAL           DLASUM, XERBLA, ZGEQR2, ZGET51, ZGET52, ZGGHRD,
+     $                   ZHGEQZ, ZLACPY, ZLARFG, ZLASET, ZLATM4, ZTGEVC,
+     $                   ZUNM2R
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCONJG, MAX, MIN, SIGN
@@ -639,7 +640,6 @@ SUBROUTINE ZCHKGG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/zchkgk.f b/TESTING/EIG/zchkgk.f
index 0838411775..cd02b6fe96 100644
--- a/TESTING/EIG/zchkgk.f
+++ b/TESTING/EIG/zchkgk.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZCHKGK( NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zchkgl.f b/TESTING/EIG/zchkgl.f
index 27c8babc97..3acbbb2d6b 100644
--- a/TESTING/EIG/zchkgl.f
+++ b/TESTING/EIG/zchkgl.f
@@ -50,6 +50,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZCHKGL( NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zchkhb.f b/TESTING/EIG/zchkhb.f
index 080ce81706..8b79e9d001 100644
--- a/TESTING/EIG/zchkhb.f
+++ b/TESTING/EIG/zchkhb.f
@@ -295,6 +295,7 @@
       SUBROUTINE ZCHKHB( NSIZES, NN, NWDTHS, KK, NTYPES, DOTYPE, ISEED,
      $                   THRESH, NOUNIT, A, LDA, SD, SE, U, LDU, WORK,
      $                   LWORK, RWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zchkhb2stg.f b/TESTING/EIG/zchkhb2stg.f
index 0fe7a6ea05..ba576d36fa 100644
--- a/TESTING/EIG/zchkhb2stg.f
+++ b/TESTING/EIG/zchkhb2stg.f
@@ -335,6 +335,7 @@ SUBROUTINE ZCHKHB2STG( NSIZES, NN, NWDTHS, KK, NTYPES, DOTYPE,
      $                   ISEED, THRESH, NOUNIT, A, LDA, SD, SE, D1,
      $                   D2, D3, U, LDU, WORK, LWORK, RWORK, RESULT,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -849,8 +850,9 @@ SUBROUTINE ZCHKHB2STG( NSIZES, NN, NWDTHS, KK, NTYPES, DOTYPE,
       CALL DLASUM( 'ZHB', NOUNIT, NERRS, NTESTT )
       RETURN
 *
- 9999 FORMAT( ' ZCHKHB2STG: ', A, ' returned INFO=', I6, '.', / 9X, 'N=',
-     $      I6, ', JTYPE=', I6, ', ISEED=(', 3( I5, ',' ), I5, ')' )
+ 9999 FORMAT( ' ZCHKHB2STG: ', A, ' returned INFO=', I6, '.', / 9X,
+     $      'N=', I6, ', JTYPE=', I6, ', ISEED=(', 3( I5, ',' ), I5,
+     $      ')' )
  9998 FORMAT( / 1X, A3,
      $     ' -- Complex Hermitian Banded Tridiagonal Reduction Routines'
      $       )
diff --git a/TESTING/EIG/zchkhs.f b/TESTING/EIG/zchkhs.f
index 52962a0414..310f72a333 100644
--- a/TESTING/EIG/zchkhs.f
+++ b/TESTING/EIG/zchkhs.f
@@ -21,7 +21,7 @@
 *       .. Array Arguments ..
 *       LOGICAL            DOTYPE( * ), SELECT( * )
 *       INTEGER            ISEED( 4 ), IWORK( * ), NN( * )
-*       DOUBLE PRECISION   RESULT( 14 ), RWORK( * )
+*       DOUBLE PRECISION   RESULT( 16 ), RWORK( * )
 *       COMPLEX*16         A( LDA, * ), EVECTL( LDU, * ),
 *      $                   EVECTR( LDU, * ), EVECTX( LDU, * ),
 *      $                   EVECTY( LDU, * ), H( LDA, * ), T1( LDA, * ),
@@ -64,10 +64,15 @@
 *>            eigenvectors of H.  Y is lower triangular, and X is
 *>            upper triangular.
 *>
+*>            ZTREVC3 computes left and right eigenvector matrices
+*>            from a Schur matrix T and backtransforms them with Z
+*>            to eigenvector matrices L and R for A. L and R are
+*>            GE matrices.
+*>
 *>    When ZCHKHS is called, a number of matrix "sizes" ("n's") and a
 *>    number of matrix "types" are specified.  For each size ("n")
 *>    and each type of matrix, one matrix will be generated and used
-*>    to test the nonsymmetric eigenroutines.  For each matrix, 14
+*>    to test the nonsymmetric eigenroutines.  For each matrix, 16
 *>    tests will be performed:
 *>
 *>    (1)     | A - U H U**H | / ( |A| n ulp )
@@ -98,6 +103,10 @@
 *>
 *>    (14)    | Y**H A - W**H Y | / ( |A| |Y| ulp )
 *>
+*>    (15)    | AR - RW | / ( |A| |R| ulp )
+*>
+*>    (16)    | LA - WL | / ( |A| |L| ulp )
+*>
 *>    The "sizes" are specified by an array NN(1:NSIZES); the value of
 *>    each element NN(j) specifies one size.
 *>    The "types" are specified by a logical array DOTYPE( 1:NTYPES );
@@ -331,7 +340,7 @@
 *>           Workspace.  Could be equivalenced to IWORK, but not RWORK.
 *>           Modified.
 *>
-*>  RESULT - DOUBLE PRECISION array, dimension (14)
+*>  RESULT - DOUBLE PRECISION array, dimension (16)
 *>           The values computed by the fourteen tests described above.
 *>           The values are currently limited to 1/ulp, to avoid
 *>           overflow.
@@ -409,6 +418,7 @@ SUBROUTINE ZCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   W3, EVECTL, EVECTR, EVECTY, EVECTX, UU, TAU,
      $                   WORK, NWORK, RWORK, IWORK, SELECT, RESULT,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -421,7 +431,7 @@ SUBROUTINE ZCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *     .. Array Arguments ..
       LOGICAL            DOTYPE( * ), SELECT( * )
       INTEGER            ISEED( 4 ), IWORK( * ), NN( * )
-      DOUBLE PRECISION   RESULT( 14 ), RWORK( * )
+      DOUBLE PRECISION   RESULT( 16 ), RWORK( * )
       COMPLEX*16         A( LDA, * ), EVECTL( LDU, * ),
      $                   EVECTR( LDU, * ), EVECTX( LDU, * ),
      $                   EVECTY( LDU, * ), H( LDA, * ), T1( LDA, * ),
@@ -461,9 +471,9 @@ SUBROUTINE ZCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLAFTS, DLASUM, XERBLA, ZCOPY, ZGEHRD,
-     $                   ZGEMM, ZGET10, ZGET22, ZHSEIN, ZHSEQR, ZHST01,
-     $                   ZLACPY, ZLASET, ZLATME, ZLATMR, ZLATMS, ZTREVC,
+      EXTERNAL           DLAFTS, DLASUM, XERBLA, ZCOPY, ZGEHRD, ZGEMM,
+     $                   ZGET10, ZGET22, ZHSEIN, ZHSEQR, ZHST01, ZLACPY,
+     $                   ZLASET, ZLATME, ZLATMR, ZLATMS, ZTREVC, ZTREVC3,
      $                   ZUNGHR, ZUNMHR
 *     ..
 *     .. Intrinsic Functions ..
@@ -524,7 +534,6 @@ SUBROUTINE ZCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = DLAMCH( 'Overflow' )
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
@@ -1067,6 +1076,66 @@ SUBROUTINE ZCHKHS( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $            RESULT( 14 ) = DUMMA( 3 )*ANINV
             END IF
 *
+*           Compute Left and Right Eigenvectors of A
+*
+*           Compute a Right eigenvector matrix:
+*
+            NTEST = 15
+            RESULT( 15 ) = ULPINV
+*
+            CALL ZLACPY( ' ', N, N, UZ, LDU, EVECTR, LDU )
+*
+            CALL ZTREVC3( 'Right', 'Back', SELECT, N, T1, LDA, CDUMMA,
+     $                    LDU, EVECTR, LDU, N, IN, WORK, NWORK, RWORK,
+     $                    N, IINFO )
+            IF( IINFO.NE.0 ) THEN
+               WRITE( NOUNIT, FMT = 9999 )'ZTREVC3(R,B)', IINFO, N,
+     $            JTYPE, IOLDSD
+               INFO = ABS( IINFO )
+               GO TO 250
+            END IF
+*
+*           Test 15:  | AR - RW | / ( |A| |R| ulp )
+*
+*                     (from Schur decomposition)
+*
+            CALL ZGET22( 'N', 'N', 'N', N, A, LDA, EVECTR, LDU, W1,
+     $                   WORK, RWORK, DUMMA( 1 ) )
+            RESULT( 15 ) = DUMMA( 1 )
+            IF( DUMMA( 2 ).GT.THRESH ) THEN
+               WRITE( NOUNIT, FMT = 9998 )'Right', 'ZTREVC3',
+     $            DUMMA( 2 ), N, JTYPE, IOLDSD
+            END IF
+*
+*           Compute a Left eigenvector matrix:
+*
+            NTEST = 16
+            RESULT( 16 ) = ULPINV
+*
+            CALL ZLACPY( ' ', N, N, UZ, LDU, EVECTL, LDU )
+*
+            CALL ZTREVC3( 'Left', 'Back', SELECT, N, T1, LDA, EVECTL,
+     $                    LDU, CDUMMA, LDU, N, IN, WORK, NWORK, RWORK,
+     $                    N, IINFO )
+            IF( IINFO.NE.0 ) THEN
+               WRITE( NOUNIT, FMT = 9999 )'ZTREVC3(L,B)', IINFO, N,
+     $            JTYPE, IOLDSD
+               INFO = ABS( IINFO )
+               GO TO 250
+            END IF
+*
+*           Test 16:  | LA - WL | / ( |A| |L| ulp )
+*
+*                     (from Schur decomposition)
+*
+            CALL ZGET22( 'Conj', 'N', 'Conj', N, A, LDA, EVECTL, LDU,
+     $                   W1, WORK, RWORK, DUMMA( 3 ) )
+            RESULT( 16 ) = DUMMA( 3 )
+            IF( DUMMA( 4 ).GT.THRESH ) THEN
+               WRITE( NOUNIT, FMT = 9998 )'Left', 'ZTREVC3', DUMMA( 4 ),
+     $            N, JTYPE, IOLDSD
+            END IF
+*
 *           End of Loop -- Check for RESULT(j) > THRESH
 *
   240       CONTINUE
diff --git a/TESTING/EIG/zchkst.f b/TESTING/EIG/zchkst.f
index 60496dde1b..63b2c2c641 100644
--- a/TESTING/EIG/zchkst.f
+++ b/TESTING/EIG/zchkst.f
@@ -364,7 +364,7 @@
 *> \verbatim
 *>          D1 is DOUBLE PRECISION array of
 *>                             dimension( max(NN) )
-*>          The eigenvalues of A, as computed by ZSTEQR simlutaneously
+*>          The eigenvalues of A, as computed by ZSTEQR simultaneously
 *>          with Z.  On exit, the eigenvalues in D1 correspond with the
 *>          matrix in A.
 *> \endverbatim
@@ -601,6 +601,7 @@ SUBROUTINE ZCHKST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   WA1, WA2, WA3, WR, U, LDU, V, VP, TAU, Z, WORK,
      $                   LWORK, RWORK, LRWORK, IWORK, LIWORK, RESULT,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -662,11 +663,10 @@ SUBROUTINE ZCHKST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           ILAENV, DLAMCH, DLARND, DSXT1
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLABAD, DLASUM, DSTEBZ, DSTECH, DSTERF,
-     $                   XERBLA, ZCOPY, ZHET21, ZHETRD, ZHPT21, ZHPTRD,
-     $                   ZLACPY, ZLASET, ZLATMR, ZLATMS, ZPTEQR, ZSTEDC,
-     $                   ZSTEMR, ZSTEIN, ZSTEQR, ZSTT21, ZSTT22, ZUNGTR,
-     $                   ZUPGTR
+      EXTERNAL           DCOPY, DLASUM, DSTEBZ, DSTECH, DSTERF, XERBLA,
+     $                   ZCOPY, ZHET21, ZHETRD, ZHPT21, ZHPTRD, ZLACPY,
+     $                   ZLASET, ZLATMR, ZLATMS, ZPTEQR, ZSTEDC, ZSTEMR,
+     $                   ZSTEIN, ZSTEQR, ZSTT21, ZSTT22, ZUNGTR, ZUPGTR
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCONJG, INT, LOG, MAX, MIN, SQRT
@@ -733,7 +733,6 @@ SUBROUTINE ZCHKST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       ULPINV = ONE / ULP
       LOG2UI = INT( LOG( ULPINV ) / LOG( TWO ) )
diff --git a/TESTING/EIG/zchkst2stg.f b/TESTING/EIG/zchkst2stg.f
index 1e2dd624ca..c9f0c5f3b8 100644
--- a/TESTING/EIG/zchkst2stg.f
+++ b/TESTING/EIG/zchkst2stg.f
@@ -385,7 +385,7 @@
 *> \verbatim
 *>          D1 is DOUBLE PRECISION array of
 *>                             dimension( max(NN) )
-*>          The eigenvalues of A, as computed by ZSTEQR simlutaneously
+*>          The eigenvalues of A, as computed by ZSTEQR simultaneously
 *>          with Z.  On exit, the eigenvalues in D1 correspond with the
 *>          matrix in A.
 *> \endverbatim
@@ -622,6 +622,7 @@ SUBROUTINE ZCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   WA1, WA2, WA3, WR, U, LDU, V, VP, TAU, Z, WORK,
      $                   LWORK, RWORK, LRWORK, IWORK, LIWORK, RESULT,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -683,11 +684,11 @@ SUBROUTINE ZCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           ILAENV, DLAMCH, DLARND, DSXT1
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLABAD, DLASUM, DSTEBZ, DSTECH, DSTERF,
-     $                   XERBLA, ZCOPY, ZHET21, ZHETRD, ZHPT21, ZHPTRD,
-     $                   ZLACPY, ZLASET, ZLATMR, ZLATMS, ZPTEQR, ZSTEDC,
-     $                   ZSTEMR, ZSTEIN, ZSTEQR, ZSTT21, ZSTT22, ZUNGTR,
-     $                   ZUPGTR, ZHETRD_2STAGE, DLASET
+      EXTERNAL           DCOPY, DLASUM, DSTEBZ, DSTECH, DSTERF, XERBLA,
+     $                   ZCOPY, ZHET21, ZHETRD, ZHPT21, ZHPTRD, ZLACPY,
+     $                   ZLASET, ZLATMR, ZLATMS, ZPTEQR, ZSTEDC, ZSTEMR,
+     $                   ZSTEIN, ZSTEQR, ZSTT21, ZSTT22, ZUNGTR, ZUPGTR,
+     $                   ZHETRD_2STAGE, DLASET
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCONJG, INT, LOG, MAX, MIN, SQRT
@@ -754,7 +755,6 @@ SUBROUTINE ZCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       ULPINV = ONE / ULP
       LOG2UI = INT( LOG( ULPINV ) / LOG( TWO ) )
@@ -1072,7 +1072,6 @@ SUBROUTINE ZCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                END IF
             END IF
 *
-*
 *           Do Tests 3 and 4 which are similar to 11 and 12 but with the
 *           D1 computed using the standard 1-stage reduction as reference
 *
@@ -1735,7 +1734,6 @@ SUBROUTINE ZCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                         END IF
                      END IF
 *
-*
 *                 Do test 28
 *
                      TEMP2 = TWO*( TWO*N-ONE )*ULP*
@@ -1792,7 +1790,6 @@ SUBROUTINE ZCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
 *           Do Tests 29 and 30
 *
-*
 *           Call ZSTEMR to compute D2, do tests.
 *
 *           Compute D2
@@ -1832,7 +1829,6 @@ SUBROUTINE ZCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                   RESULT( 31 ) = TEMP2 / MAX( UNFL,
      $                           ULP*MAX( TEMP1, TEMP2 ) )
 *
-*
 *           Call ZSTEMR(V,V) to compute D1 and Z, do tests.
 *
 *           Compute D1 and Z
@@ -1934,7 +1930,6 @@ SUBROUTINE ZCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                   RESULT( 34 ) = ZERO
                END IF
 *
-*
 *           Call ZSTEMR(V,A) to compute D1 and Z, do tests.
 *
 *           Compute D1 and Z
@@ -1991,7 +1986,7 @@ SUBROUTINE ZCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                   END IF
                END IF
 *
-*           Do Test 34
+*           Do Test 37
 *
                TEMP1 = ZERO
                TEMP2 = ZERO
@@ -2010,7 +2005,6 @@ SUBROUTINE ZCHKST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
 *           End of Loop -- Check for RESULT(j) > THRESH
 *
-*
 *           Print out tests which fail.
 *
             DO 290 JR = 1, NTEST
diff --git a/TESTING/EIG/zckglm.f b/TESTING/EIG/zckglm.f
index ff8101bb91..ab7791e153 100644
--- a/TESTING/EIG/zckglm.f
+++ b/TESTING/EIG/zckglm.f
@@ -165,6 +165,7 @@
       SUBROUTINE ZCKGLM( NN, NVAL, MVAL, PVAL, NMATS, ISEED, THRESH,
      $                   NMAX, A, AF, B, BF, X, WORK, RWORK, NIN, NOUT,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zckgqr.f b/TESTING/EIG/zckgqr.f
index 769d0f8b07..f256c367e3 100644
--- a/TESTING/EIG/zckgqr.f
+++ b/TESTING/EIG/zckgqr.f
@@ -208,6 +208,7 @@
       SUBROUTINE ZCKGQR( NM, MVAL, NP, PVAL, NN, NVAL, NMATS, ISEED,
      $                   THRESH, NMAX, A, AF, AQ, AR, TAUA, B, BF, BZ,
      $                   BT, BWK, TAUB, WORK, RWORK, NIN, NOUT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zckgsv.f b/TESTING/EIG/zckgsv.f
index 800aa5edd3..7d73df7e97 100644
--- a/TESTING/EIG/zckgsv.f
+++ b/TESTING/EIG/zckgsv.f
@@ -195,6 +195,7 @@
       SUBROUTINE ZCKGSV( NM, MVAL, PVAL, NVAL, NMATS, ISEED, THRESH,
      $                   NMAX, A, AF, B, BF, U, V, Q, ALPHA, BETA, R,
      $                   IWORK, WORK, RWORK, NIN, NOUT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zcklse.f b/TESTING/EIG/zcklse.f
index 26b0298e3c..7d9d068545 100644
--- a/TESTING/EIG/zcklse.f
+++ b/TESTING/EIG/zcklse.f
@@ -165,6 +165,7 @@
       SUBROUTINE ZCKLSE( NN, MVAL, PVAL, NVAL, NMATS, ISEED, THRESH,
      $                   NMAX, A, AF, B, BF, X, WORK, RWORK, NIN, NOUT,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zcsdts.f b/TESTING/EIG/zcsdts.f
index c96cb1613c..45ad1c942f 100644
--- a/TESTING/EIG/zcsdts.f
+++ b/TESTING/EIG/zcsdts.f
@@ -226,6 +226,7 @@
       SUBROUTINE ZCSDTS( M, P, Q, X, XF, LDX, U1, LDU1, U2, LDU2, V1T,
      $                   LDV1T, V2T, LDV2T, THETA, IWORK, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zdrges.f b/TESTING/EIG/zdrges.f
index 580573814f..9b4726a16c 100644
--- a/TESTING/EIG/zdrges.f
+++ b/TESTING/EIG/zdrges.f
@@ -378,6 +378,7 @@
       SUBROUTINE ZDRGES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, B, S, T, Q, LDQ, Z, ALPHA,
      $                   BETA, WORK, LWORK, RWORK, RESULT, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -434,8 +435,8 @@ SUBROUTINE ZDRGES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           ZLCTES, ILAENV, DLAMCH, ZLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, DLABAD, XERBLA, ZGET51, ZGET54, ZGGES,
-     $                   ZLACPY, ZLARFG, ZLASET, ZLATM4, ZUNM2R
+      EXTERNAL           ALASVM, XERBLA, ZGET51, ZGET54, ZGGES, ZLACPY,
+     $                   ZLARFG, ZLASET, ZLATM4, ZUNM2R
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCONJG, DIMAG, MAX, MIN, SIGN
@@ -533,7 +534,6 @@ SUBROUTINE ZDRGES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       SAFMIN = DLAMCH( 'Safe minimum' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/zdrges3.f b/TESTING/EIG/zdrges3.f
index b678e47042..7dc73fee94 100644
--- a/TESTING/EIG/zdrges3.f
+++ b/TESTING/EIG/zdrges3.f
@@ -379,6 +379,7 @@ SUBROUTINE ZDRGES3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                    NOUNIT, A, LDA, B, S, T, Q, LDQ, Z, ALPHA,
      $                    BETA, WORK, LWORK, RWORK, RESULT, BWORK,
      $                    INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -435,8 +436,8 @@ SUBROUTINE ZDRGES3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           ZLCTES, ILAENV, DLAMCH, ZLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, DLABAD, XERBLA, ZGET51, ZGET54, ZGGES3,
-     $                   ZLACPY, ZLARFG, ZLASET, ZLATM4, ZUNM2R
+      EXTERNAL           ALASVM, XERBLA, ZGET51, ZGET54, ZGGES3, ZLACPY,
+     $                   ZLARFG, ZLASET, ZLATM4, ZUNM2R
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCONJG, DIMAG, MAX, MIN, SIGN
@@ -534,7 +535,6 @@ SUBROUTINE ZDRGES3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       SAFMIN = DLAMCH( 'Safe minimum' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/zdrgev.f b/TESTING/EIG/zdrgev.f
index e7389183bc..66a813d897 100644
--- a/TESTING/EIG/zdrgev.f
+++ b/TESTING/EIG/zdrgev.f
@@ -396,6 +396,7 @@ SUBROUTINE ZDRGEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, B, S, T, Q, LDQ, Z, QE, LDQE,
      $                   ALPHA, BETA, ALPHA1, BETA1, WORK, LWORK, RWORK,
      $                   RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -451,7 +452,7 @@ SUBROUTINE ZDRGEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           ILAENV, DLAMCH, ZLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, DLABAD, XERBLA, ZGET52, ZGGEV, ZLACPY,
+      EXTERNAL           ALASVM, XERBLA, ZGET52, ZGGEV, ZLACPY,
      $                   ZLARFG, ZLASET, ZLATM4, ZUNM2R
 *     ..
 *     .. Intrinsic Functions ..
@@ -546,7 +547,6 @@ SUBROUTINE ZDRGEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       SAFMIN = DLAMCH( 'Safe minimum' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/zdrgev3.f b/TESTING/EIG/zdrgev3.f
index 4ccc987763..4de01513a0 100644
--- a/TESTING/EIG/zdrgev3.f
+++ b/TESTING/EIG/zdrgev3.f
@@ -396,6 +396,7 @@ SUBROUTINE ZDRGEV3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                    NOUNIT, A, LDA, B, S, T, Q, LDQ, Z, QE, LDQE,
      $                    ALPHA, BETA, ALPHA1, BETA1, WORK, LWORK,
      $                    RWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -451,8 +452,8 @@ SUBROUTINE ZDRGEV3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           ILAENV, DLAMCH, ZLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, DLABAD, XERBLA, ZGET52, ZGGEV3, ZLACPY,
-     $                   ZLARFG, ZLASET, ZLATM4, ZUNM2R
+      EXTERNAL           ALASVM, XERBLA, ZGET52, ZGGEV3, ZLACPY, ZLARFG,
+     $                   ZLASET, ZLATM4, ZUNM2R
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCONJG, MAX, MIN, SIGN
@@ -546,7 +547,6 @@ SUBROUTINE ZDRGEV3( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       SAFMIN = DLAMCH( 'Safe minimum' )
       SAFMIN = SAFMIN / ULP
       SAFMAX = ONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
       ULPINV = ONE / ULP
 *
 *     The values RMAGN(2:3) depend on N, see below.
diff --git a/TESTING/EIG/zdrgsx.f b/TESTING/EIG/zdrgsx.f
index 096ed3c225..c43cc94a6b 100644
--- a/TESTING/EIG/zdrgsx.f
+++ b/TESTING/EIG/zdrgsx.f
@@ -346,6 +346,7 @@
       SUBROUTINE ZDRGSX( NSIZE, NCMAX, THRESH, NIN, NOUT, A, LDA, B, AI,
      $                   BI, Z, Q, ALPHA, BETA, C, LDC, S, WORK, LWORK,
      $                   RWORK, IWORK, LIWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -394,7 +395,7 @@ SUBROUTINE ZDRGSX( NSIZE, NCMAX, THRESH, NIN, NOUT, A, LDA, B, AI,
       EXTERNAL           ZLCTSX, ILAENV, DLAMCH, ZLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, DLABAD, XERBLA, ZGESVD, ZGET51, ZGGESX,
+      EXTERNAL           ALASVM, XERBLA, ZGESVD, ZGET51, ZGGESX,
      $                   ZLACPY, ZLAKF2, ZLASET, ZLATM5
 *     ..
 *     .. Scalars in Common ..
@@ -479,7 +480,6 @@ SUBROUTINE ZDRGSX( NSIZE, NCMAX, THRESH, NIN, NOUT, A, LDA, B, AI,
       ULPINV = ONE / ULP
       SMLNUM = DLAMCH( 'S' ) / ULP
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       THRSH2 = TEN*THRESH
       NTESTT = 0
       NERRS = 0
@@ -918,7 +918,7 @@ SUBROUTINE ZDRGSX( NSIZE, NCMAX, THRESH, NIN, NOUT, A, LDA, B, AI,
      $      / '  2:  A and B are upper triangular matrices, ',
      $      / '  3:  A and B are as type 2, but each second diagonal ',
      $      'block in A_11 and ', /
-     $      '      each third diaongal block in A_22 are 2x2 blocks,',
+     $      '      each third diagonal block in A_22 are 2x2 blocks,',
      $      / '  4:  A and B are block diagonal matrices, ',
      $      / '  5:  (A,B) has potentially close or common ',
      $      'eigenvalues.', / )
diff --git a/TESTING/EIG/zdrgvx.f b/TESTING/EIG/zdrgvx.f
index 72e0303fbd..27532a2be4 100644
--- a/TESTING/EIG/zdrgvx.f
+++ b/TESTING/EIG/zdrgvx.f
@@ -55,7 +55,7 @@
 *>
 *>    | l**H * (beta A - alpha B) | / ( ulp max( |beta A|, |alpha B| ) )
 *>
-*>     where l**H is the conjugate tranpose of l.
+*>     where l**H is the conjugate transpose of l.
 *>
 *> (2) max over all right eigenvalue/-vector pairs (beta/alpha,r) of
 *>
@@ -294,6 +294,7 @@ SUBROUTINE ZDRGVX( NSIZE, THRESH, NIN, NOUT, A, LDA, B, AI, BI,
      $                   ALPHA, BETA, VL, VR, ILO, IHI, LSCALE, RSCALE,
      $                   S, DTRU, DIF, DIFTRU, WORK, LWORK, RWORK,
      $                   IWORK, LIWORK, RESULT, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zdrves.f b/TESTING/EIG/zdrves.f
index d3f237c23b..15aeca16bb 100644
--- a/TESTING/EIG/zdrves.f
+++ b/TESTING/EIG/zdrves.f
@@ -375,6 +375,7 @@
       SUBROUTINE ZDRVES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, H, HT, W, WT, VS, LDVS, RESULT,
      $                   WORK, NWORK, RWORK, IWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -437,8 +438,8 @@ SUBROUTINE ZDRVES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           ZSLECT, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLASUM, XERBLA, ZGEES, ZHST01, ZLACPY,
-     $                   ZLASET, ZLATME, ZLATMR, ZLATMS
+      EXTERNAL           DLASUM, XERBLA, ZGEES, ZHST01, ZLACPY, ZLASET,
+     $                   ZLATME, ZLATMR, ZLATMS
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DCMPLX, MAX, MIN, SQRT
@@ -507,7 +508,6 @@ SUBROUTINE ZDRVES( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       RTULP = SQRT( ULP )
diff --git a/TESTING/EIG/zdrvev.f b/TESTING/EIG/zdrvev.f
index 4fbb10e100..c6fec57abe 100644
--- a/TESTING/EIG/zdrvev.f
+++ b/TESTING/EIG/zdrvev.f
@@ -388,6 +388,7 @@ SUBROUTINE ZDRVEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, H, W, W1, VL, LDVL, VR, LDVR,
      $                   LRE, LDLRE, RESULT, WORK, NWORK, RWORK, IWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -442,7 +443,7 @@ SUBROUTINE ZDRVEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           DLAMCH, DZNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLASUM, XERBLA, ZGEEV, ZGET22, ZLACPY,
+      EXTERNAL           DLASUM, XERBLA, ZGEEV, ZGET22, ZLACPY,
      $                   ZLASET, ZLATME, ZLATMR, ZLATMS
 *     ..
 *     .. Intrinsic Functions ..
@@ -515,7 +516,6 @@ SUBROUTINE ZDRVEV( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       RTULP = SQRT( ULP )
diff --git a/TESTING/EIG/zdrvsg.f b/TESTING/EIG/zdrvsg.f
index 336514a3fe..c82c494182 100644
--- a/TESTING/EIG/zdrvsg.f
+++ b/TESTING/EIG/zdrvsg.f
@@ -236,7 +236,7 @@
 *>
 *>  B       COMPLEX*16 array, dimension (LDB , max(NN))
 *>          Used to hold the Hermitian positive definite matrix for
-*>          the generailzed problem.
+*>          the generalized problem.
 *>          On exit, B contains the last matrix actually
 *>          used.
 *>          Modified.
@@ -367,6 +367,7 @@ SUBROUTINE ZDRVSG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, B, LDB, D, Z, LDZ, AB, BB, AP,
      $                   BP, WORK, NWORK, RWORK, LRWORK, IWORK, LIWORK,
      $                   RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -418,7 +419,7 @@ SUBROUTINE ZDRVSG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           LSAME, DLAMCH, DLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLAFTS, DLASUM, XERBLA, ZHBGV, ZHBGVD,
+      EXTERNAL           DLAFTS, DLASUM, XERBLA, ZHBGV, ZHBGVD,
      $                   ZHBGVX, ZHEGV, ZHEGVD, ZHEGVX, ZHPGV, ZHPGVD,
      $                   ZHPGVX, ZLACPY, ZLASET, ZLATMR, ZLATMS, ZSGT01
 *     ..
@@ -481,7 +482,6 @@ SUBROUTINE ZDRVSG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = DLAMCH( 'Overflow' )
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
@@ -663,8 +663,8 @@ SUBROUTINE ZDRVSG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
                IL = 1
                IU = N
             ELSE
-               IL = 1 + ( N-1 )*DLARND( 1, ISEED2 )
-               IU = 1 + ( N-1 )*DLARND( 1, ISEED2 )
+               IL = 1 + INT( ( N-1 )*DLARND( 1, ISEED2 ) )
+               IU = 1 + INT( ( N-1 )*DLARND( 1, ISEED2 ) )
                IF( IL.GT.IU ) THEN
                   ITEMP = IL
                   IL = IU
diff --git a/TESTING/EIG/zdrvsg2stg.f b/TESTING/EIG/zdrvsg2stg.f
index 4bdf2849ed..c5ef4ce700 100644
--- a/TESTING/EIG/zdrvsg2stg.f
+++ b/TESTING/EIG/zdrvsg2stg.f
@@ -242,7 +242,7 @@
 *>
 *>  B       COMPLEX*16 array, dimension (LDB , max(NN))
 *>          Used to hold the Hermitian positive definite matrix for
-*>          the generailzed problem.
+*>          the generalized problem.
 *>          On exit, B contains the last matrix actually
 *>          used.
 *>          Modified.
@@ -426,7 +426,7 @@ SUBROUTINE ZDRVSG2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           LSAME, DLAMCH, DLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLAFTS, DLASUM, XERBLA, ZHBGV, ZHBGVD,
+      EXTERNAL           DLAFTS, DLASUM, XERBLA, ZHBGV, ZHBGVD,
      $                   ZHBGVX, ZHEGV, ZHEGVD, ZHEGVX, ZHPGV, ZHPGVD,
      $                   ZHPGVX, ZLACPY, ZLASET, ZLATMR, ZLATMS, ZSGT01,
      $                   ZHEGV_2STAGE
@@ -490,7 +490,6 @@ SUBROUTINE ZDRVSG2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = DLAMCH( 'Overflow' )
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
diff --git a/TESTING/EIG/zdrvst.f b/TESTING/EIG/zdrvst.f
index 384e58de16..c90dc3049e 100644
--- a/TESTING/EIG/zdrvst.f
+++ b/TESTING/EIG/zdrvst.f
@@ -204,7 +204,7 @@
 *>          Not modified.
 *>
 *>  D1      DOUBLE PRECISION array, dimension (max(NN))
-*>          The eigenvalues of A, as computed by ZSTEQR simlutaneously
+*>          The eigenvalues of A, as computed by ZSTEQR simultaneously
 *>          with Z.  On exit, the eigenvalues in D1 correspond with the
 *>          matrix in A.
 *>          Modified.
@@ -335,6 +335,7 @@ SUBROUTINE ZDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, D1, D2, D3, WA1, WA2, WA3, U,
      $                   LDU, V, TAU, Z, WORK, LWORK, RWORK, LRWORK,
      $                   IWORK, LIWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -391,10 +392,10 @@ SUBROUTINE ZDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           DLAMCH, DLARND, DSXT1
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, DLABAD, DLAFTS, XERBLA, ZHBEV, ZHBEVD,
-     $                   ZHBEVX, ZHEEV, ZHEEVD, ZHEEVR, ZHEEVX, ZHET21,
-     $                   ZHET22, ZHPEV, ZHPEVD, ZHPEVX, ZLACPY, ZLASET,
-     $                   ZLATMR, ZLATMS
+      EXTERNAL           ALASVM, DLAFTS, XERBLA, ZHBEV, ZHBEVD, ZHBEVX,
+     $                   ZHEEV, ZHEEVD, ZHEEVR, ZHEEVX, ZHET21, ZHET22,
+     $                   ZHPEV, ZHPEVD, ZHPEVX, ZLACPY, ZLASET, ZLATMR,
+     $                   ZLATMS
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, INT, LOG, MAX, MIN, SQRT
@@ -451,7 +452,6 @@ SUBROUTINE ZDRVST( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = DLAMCH( 'Overflow' )
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
diff --git a/TESTING/EIG/zdrvst2stg.f b/TESTING/EIG/zdrvst2stg.f
index 4a88e5218d..5dd58c173d 100644
--- a/TESTING/EIG/zdrvst2stg.f
+++ b/TESTING/EIG/zdrvst2stg.f
@@ -204,7 +204,7 @@
 *>          Not modified.
 *>
 *>  D1      DOUBLE PRECISION array, dimension (max(NN))
-*>          The eigenvalues of A, as computed by ZSTEQR simlutaneously
+*>          The eigenvalues of A, as computed by ZSTEQR simultaneously
 *>          with Z.  On exit, the eigenvalues in D1 correspond with the
 *>          matrix in A.
 *>          Modified.
@@ -335,6 +335,7 @@ SUBROUTINE ZDRVST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NOUNIT, A, LDA, D1, D2, D3, WA1, WA2, WA3, U,
      $                   LDU, V, TAU, Z, WORK, LWORK, RWORK, LRWORK,
      $                   IWORK, LIWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -391,7 +392,7 @@ SUBROUTINE ZDRVST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           DLAMCH, DLARND, DSXT1
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALASVM, DLABAD, DLAFTS, XERBLA, ZHBEV, ZHBEVD,
+      EXTERNAL           ALASVM, DLAFTS, XERBLA, ZHBEV, ZHBEVD,
      $                   ZHBEVX, ZHEEV, ZHEEVD, ZHEEVR, ZHEEVX, ZHET21,
      $                   ZHET22, ZHPEV, ZHPEVD, ZHPEVX, ZLACPY, ZLASET,
      $                   ZHEEVD_2STAGE, ZHEEVR_2STAGE, ZHEEVX_2STAGE,
@@ -453,7 +454,6 @@ SUBROUTINE ZDRVST2STG( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = DLAMCH( 'Overflow' )
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       ULPINV = ONE / ULP
       RTUNFL = SQRT( UNFL )
diff --git a/TESTING/EIG/zdrvsx.f b/TESTING/EIG/zdrvsx.f
index ac7a2d6ebc..4af65a4dd4 100644
--- a/TESTING/EIG/zdrvsx.f
+++ b/TESTING/EIG/zdrvsx.f
@@ -432,6 +432,7 @@ SUBROUTINE ZDRVSX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   NIUNIT, NOUNIT, A, LDA, H, HT, W, WT, WTMP, VS,
      $                   LDVS, VS1, RESULT, WORK, LWORK, RWORK, BWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -492,7 +493,7 @@ SUBROUTINE ZDRVSX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLASUM, XERBLA, ZGET24, ZLASET, ZLATME,
+      EXTERNAL           DLASUM, XERBLA, ZGET24, ZLASET, ZLATME,
      $                   ZLATMR, ZLATMS
 *     ..
 *     .. Intrinsic Functions ..
@@ -567,7 +568,6 @@ SUBROUTINE ZDRVSX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       RTULP = SQRT( ULP )
diff --git a/TESTING/EIG/zdrvvx.f b/TESTING/EIG/zdrvvx.f
index 830313c726..8bd6dbc5b0 100644
--- a/TESTING/EIG/zdrvvx.f
+++ b/TESTING/EIG/zdrvvx.f
@@ -493,6 +493,7 @@ SUBROUTINE ZDRVVX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
      $                   LDVR, LRE, LDLRE, RCONDV, RCNDV1, RCDVIN,
      $                   RCONDE, RCNDE1, RCDEIN, SCALE, SCALE1, RESULT,
      $                   WORK, NWORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -548,8 +549,8 @@ SUBROUTINE ZDRVVX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
       EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLASUM, XERBLA, ZGET23, ZLASET, ZLATME,
-     $                   ZLATMR, ZLATMS
+      EXTERNAL           DLASUM, XERBLA, ZGET23, ZLASET, ZLATME, ZLATMR,
+     $                   ZLATMS
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DCMPLX, MAX, MIN, SQRT
@@ -624,7 +625,6 @@ SUBROUTINE ZDRVVX( NSIZES, NN, NTYPES, DOTYPE, ISEED, THRESH,
 *
       UNFL = DLAMCH( 'Safe minimum' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       ULP = DLAMCH( 'Precision' )
       ULPINV = ONE / ULP
       RTULP = SQRT( ULP )
diff --git a/TESTING/EIG/zerrbd.f b/TESTING/EIG/zerrbd.f
index f1dde92666..fb74e846c3 100644
--- a/TESTING/EIG/zerrbd.f
+++ b/TESTING/EIG/zerrbd.f
@@ -21,7 +21,8 @@
 *>
 *> \verbatim
 *>
-*> ZERRBD tests the error exits for ZGEBRD, ZUNGBR, ZUNMBR, and ZBDSQR.
+*> ZERRBD tests the error exits for ZGEBD2, ZGEBRD, ZUNGBR, ZUNMBR,
+*> and ZBDSQR.
 *> \endverbatim
 *
 *  Arguments:
@@ -51,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRBD( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -81,7 +83,8 @@ SUBROUTINE ZERRBD( PATH, NUNIT )
       EXTERNAL           LSAMEN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CHKXER, ZBDSQR, ZGEBRD, ZUNGBR, ZUNMBR
+      EXTERNAL           CHKXER, ZBDSQR, ZGEBD2, ZGEBRD, ZUNGBR,
+     $                   ZUNMBR
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -132,6 +135,20 @@ SUBROUTINE ZERRBD( PATH, NUNIT )
          CALL CHKXER( 'ZGEBRD', INFOT, NOUT, LERR, OK )
          NT = NT + 4
 *
+*        ZGEBD2
+*
+         SRNAMT = 'ZGEBD2'
+         INFOT = 1
+         CALL ZGEBD2( -1, 0, A, 1, D, E, TQ, TP, W, INFO )
+         CALL CHKXER( 'ZGEBD2', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL ZGEBD2( 0, -1, A, 1, D, E, TQ, TP, W, INFO )
+         CALL CHKXER( 'ZGEBD2', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL ZGEBD2( 2, 1, A, 1, D, E, TQ, TP, W, INFO )
+         CALL CHKXER( 'ZGEBD2', INFOT, NOUT, LERR, OK )
+         NT = NT + 3
+*
 *        ZUNGBR
 *
          SRNAMT = 'ZUNGBR'
diff --git a/TESTING/EIG/zerrec.f b/TESTING/EIG/zerrec.f
index dc6129da91..cc3f48b482 100644
--- a/TESTING/EIG/zerrec.f
+++ b/TESTING/EIG/zerrec.f
@@ -23,7 +23,7 @@
 *>
 *> ZERREC tests the error exits for the routines for eigen- condition
 *> estimation for DOUBLE PRECISION matrices:
-*>    ZTRSYL, ZTREXC, ZTRSNA and ZTRSEN.
+*>    ZTRSYL, ZTRSYL3, ZTREXC, ZTRSNA and ZTRSEN.
 *> \endverbatim
 *
 *  Arguments:
@@ -53,6 +53,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERREC( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -77,7 +78,7 @@ SUBROUTINE ZERREC( PATH, NUNIT )
 *     ..
 *     .. Local Arrays ..
       LOGICAL            SEL( NMAX )
-      DOUBLE PRECISION   RW( LW ), S( NMAX ), SEP( NMAX )
+      DOUBLE PRECISION   RW( LW ), S( NMAX ), SEP( NMAX ), SWORK( NMAX )
       COMPLEX*16         A( NMAX, NMAX ), B( NMAX, NMAX ),
      $                   C( NMAX, NMAX ), WORK( LW ), X( NMAX )
 *     ..
@@ -141,6 +142,43 @@ SUBROUTINE ZERREC( PATH, NUNIT )
       CALL CHKXER( 'ZTRSYL', INFOT, NOUT, LERR, OK )
       NT = NT + 8
 *
+*     Test ZTRSYL3
+*
+      SRNAMT = 'ZTRSYL3'
+      INFOT = 1
+      CALL ZTRSYL3( 'X', 'N', 1, 0, 0, A, 1, B, 1, C, 1, SCALE,
+     $              SWORK, NMAX, INFO )
+      CALL CHKXER( 'ZTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL ZTRSYL3( 'N', 'X', 1, 0, 0, A, 1, B, 1, C, 1, SCALE,
+     $              SWORK, NMAX, INFO )
+      CALL CHKXER( 'ZTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL ZTRSYL3( 'N', 'N', 0, 0, 0, A, 1, B, 1, C, 1, SCALE,
+     $              SWORK, NMAX, INFO )
+      CALL CHKXER( 'ZTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL ZTRSYL3( 'N', 'N', 1, -1, 0, A, 1, B, 1, C, 1, SCALE,
+     $              SWORK, NMAX, INFO )
+      CALL CHKXER( 'ZTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 5
+      CALL ZTRSYL3( 'N', 'N', 1, 0, -1, A, 1, B, 1, C, 1, SCALE,
+     $              SWORK, NMAX, INFO )
+      CALL CHKXER( 'ZTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 7
+      CALL ZTRSYL3( 'N', 'N', 1, 2, 0, A, 1, B, 1, C, 2, SCALE,
+     $              SWORK, NMAX, INFO )
+      CALL CHKXER( 'ZTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 9
+      CALL ZTRSYL3( 'N', 'N', 1, 0, 2, A, 1, B, 1, C, 1, SCALE,
+     $              SWORK, NMAX, INFO )
+      CALL CHKXER( 'ZTRSYL3', INFOT, NOUT, LERR, OK )
+      INFOT = 11
+      CALL ZTRSYL3( 'N', 'N', 1, 2, 0, A, 2, B, 1, C, 1, SCALE,
+     $              SWORK, NMAX, INFO )
+      CALL CHKXER( 'ZTRSYL3', INFOT, NOUT, LERR, OK )
+      NT = NT + 8
+*
 *     Test ZTREXC
 *
       SRNAMT = 'ZTREXC'
diff --git a/TESTING/EIG/zerred.f b/TESTING/EIG/zerred.f
index d1219c02b9..eef38dda77 100644
--- a/TESTING/EIG/zerred.f
+++ b/TESTING/EIG/zerred.f
@@ -67,6 +67,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRED( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -100,7 +101,7 @@ SUBROUTINE ZERRED( PATH, NUNIT )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CHKXER, ZGEES, ZGEESX, ZGEEV, ZGEEVX, ZGESVJ,
-     $                   ZGESDD, ZGESVD, ZGESVDX, ZGESVQ
+     $                   ZGESDD, ZGESVD, ZGESVDX, ZGESVDQ
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAMEN, ZSLECT
@@ -332,7 +333,7 @@ SUBROUTINE ZERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
 *
 *        Test ZGESDD
@@ -367,7 +368,7 @@ SUBROUTINE ZERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
 *
 *        Test ZGEJSV
@@ -433,7 +434,7 @@ SUBROUTINE ZERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
 *
 *        Test ZGESVDX
@@ -492,7 +493,7 @@ SUBROUTINE ZERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
 *
 *        Test ZGESVDQ
@@ -547,7 +548,7 @@ SUBROUTINE ZERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
       END IF
 *
@@ -558,7 +559,7 @@ SUBROUTINE ZERRED( PATH, NUNIT )
             WRITE( NOUT, FMT = 9999 )SRNAMT( 1:LEN_TRIM( SRNAMT ) ),
      $           NT
          ELSE
-            WRITE( NOUT, FMT = 9998 )
+            WRITE( NOUT, FMT = 9998 )SRNAMT( 1:LEN_TRIM( SRNAMT ) )
          END IF
       END IF
 *
diff --git a/TESTING/EIG/zerrgg.f b/TESTING/EIG/zerrgg.f
index 26e8df9834..e232133d5a 100644
--- a/TESTING/EIG/zerrgg.f
+++ b/TESTING/EIG/zerrgg.f
@@ -54,6 +54,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRGG( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zerrhs.f b/TESTING/EIG/zerrhs.f
index 5823389477..f9e2e32ddf 100644
--- a/TESTING/EIG/zerrhs.f
+++ b/TESTING/EIG/zerrhs.f
@@ -21,8 +21,8 @@
 *>
 *> \verbatim
 *>
-*> ZERRHS tests the error exits for ZGEBAK, CGEBAL, CGEHRD, ZUNGHR,
-*> ZUNMHR, ZHSEQR, CHSEIN, and ZTREVC.
+*> ZERRHS tests the error exits for ZGEBAK, ZGEBAL, ZGEHRD, ZGEHD2,
+*> ZUNGHR, ZUNMHR, ZHSEQR, ZHSEIN, ZTREVC, and ZTREVC3.
 *> \endverbatim
 *
 *  Arguments:
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRHS( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -86,7 +87,7 @@ SUBROUTINE ZERRHS( PATH, NUNIT )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CHKXER, ZGEBAK, ZGEBAL, ZGEHRD, ZHSEIN, ZHSEQR,
-     $                   ZTREVC, ZUNGHR, ZUNMHR
+     $                   ZUNGHR, ZUNMHR, ZTREVC, ZTREVC3
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE
@@ -193,6 +194,29 @@ SUBROUTINE ZERRHS( PATH, NUNIT )
          CALL CHKXER( 'ZGEHRD', INFOT, NOUT, LERR, OK )
          NT = NT + 7
 *
+*        ZGEHD2
+*
+         SRNAMT = 'ZGEHD2'
+         INFOT = 1
+         CALL ZGEHD2( -1, 1, 1, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'ZGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL ZGEHD2( 0, 0, 0, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'ZGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL ZGEHD2( 0, 2, 0, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'ZGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL ZGEHD2( 1, 1, 0, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'ZGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL ZGEHD2( 0, 1, 1, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'ZGEHD2', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL ZGEHD2( 2, 1, 1, A, 1, TAU, W, INFO )
+         CALL CHKXER( 'ZGEHD2', INFOT, NOUT, LERR, OK )
+         NT = NT + 6
+*
 *        ZUNGHR
 *
          SRNAMT = 'ZUNGHR'
@@ -389,6 +413,47 @@ SUBROUTINE ZERRHS( PATH, NUNIT )
      $                INFO )
          CALL CHKXER( 'ZTREVC', INFOT, NOUT, LERR, OK )
          NT = NT + 7
+*
+*        ZTREVC3
+*
+         SRNAMT = 'ZTREVC3'
+         INFOT = 1
+         CALL ZTREVC3( '/', 'A', SEL, 0, A, 1, VL, 1, VR, 1, 0, M, W,
+     $                 LW, RW, 1, INFO )
+         CALL CHKXER( 'ZTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL ZTREVC3( 'L', '/', SEL, 0, A, 1, VL, 1, VR, 1, 0, M, W,
+     $                 LW, RW, 1, INFO )
+         CALL CHKXER( 'ZTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL ZTREVC3( 'L', 'A', SEL, -1, A, 1, VL, 1, VR, 1, 0, M, W,
+     $                 LW, RW, 1, INFO )
+         CALL CHKXER( 'ZTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 6
+         CALL ZTREVC3( 'L', 'A', SEL, 2, A, 1, VL, 2, VR, 1, 4, M, W,
+     $                 LW, RW, 2, INFO )
+         CALL CHKXER( 'ZTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL ZTREVC3( 'L', 'A', SEL, 2, A, 2, VL, 1, VR, 1, 4, M, W,
+     $                 LW, RW, 2, INFO )
+         CALL CHKXER( 'ZTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL ZTREVC3( 'R', 'A', SEL, 2, A, 2, VL, 1, VR, 1, 4, M, W,
+     $                 LW, RW, 2, INFO )
+         CALL CHKXER( 'ZTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 11
+         CALL ZTREVC3( 'L', 'A', SEL, 2, A, 2, VL, 2, VR, 1, 1, M, W,
+     $                 LW, RW, 2, INFO )
+         CALL CHKXER( 'ZTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 14
+         CALL ZTREVC3( 'L', 'A', SEL, 2, A, 2, VL, 2, VR, 1, 2, M, W,
+     $                 2, RW, 2, INFO )
+         CALL CHKXER( 'ZTREVC3', INFOT, NOUT, LERR, OK )
+         INFOT = 16
+         CALL ZTREVC3( 'L', 'A', SEL, 2, A, 2, VL, 2, VR, 1, 2, M, W,
+     $                 LW, RW, 1, INFO )
+         CALL CHKXER( 'ZTREVC3', INFOT, NOUT, LERR, OK )
+         NT = NT + 9
       END IF
 *
 *     Print a summary line.
diff --git a/TESTING/EIG/zerrst.f b/TESTING/EIG/zerrst.f
index 5b0e6f8201..2a989a232d 100644
--- a/TESTING/EIG/zerrst.f
+++ b/TESTING/EIG/zerrst.f
@@ -23,7 +23,7 @@
 *>
 *> \verbatim
 *>
-*> ZERRST tests the error exits for ZHETRD, ZUNGTR, CUNMTR, ZHPTRD,
+*> ZERRST tests the error exits for ZHETRD, ZHETD2, ZUNGTR, CUNMTR, ZHPTRD,
 *> ZUNGTR, ZUPMTR, ZSTEQR, CSTEIN, ZPTEQR, ZHBTRD,
 *> ZHEEV, CHEEVX, CHEEVD, ZHBEV, CHBEVX, CHBEVD,
 *> ZHPEV, CHPEVX, CHPEVD, and ZSTEDC.
@@ -59,6 +59,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRST( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -95,7 +96,7 @@ SUBROUTINE ZERRST( PATH, NUNIT )
       EXTERNAL           CHKXER, ZHBEV, ZHBEVD, ZHBEVX, ZHBTRD, ZHEEV,
      $                   ZHEEVD, ZHEEVR, ZHEEVX, ZHETRD, ZHPEV, ZHPEVD,
      $                   ZHPEVX, ZHPTRD, ZPTEQR, ZSTEDC, ZSTEIN, ZSTEQR,
-     $                   ZUNGTR, ZUNMTR, ZUPGTR, ZUPMTR,
+     $                   ZUNGTR, ZUNMTR, ZUPGTR, ZUPMTR, ZHETD2,
      $                   ZHEEVD_2STAGE, ZHEEVR_2STAGE, ZHEEVX_2STAGE,
      $                   ZHEEV_2STAGE, ZHBEV_2STAGE, ZHBEVD_2STAGE,
      $                   ZHBEVX_2STAGE, ZHETRD_2STAGE
@@ -156,6 +157,20 @@ SUBROUTINE ZERRST( PATH, NUNIT )
          CALL CHKXER( 'ZHETRD', INFOT, NOUT, LERR, OK )
          NT = NT + 4
 *
+*        ZHETD2
+*
+         SRNAMT = 'ZHETD2'
+         INFOT = 1
+         CALL ZHETD2( '/', 0, A, 1, D, E, TAU, INFO )
+         CALL CHKXER( 'ZHETD2', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL ZHETD2( 'U', -1, A, 1, D, E, TAU, INFO )
+         CALL CHKXER( 'ZHETD2', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL ZHETD2( 'U', 2, A, 1, D, E, TAU, INFO )
+         CALL CHKXER( 'ZHETD2', INFOT, NOUT, LERR, OK )
+         NT = NT + 3
+*
 *        ZHETRD_2STAGE
 *
          SRNAMT = 'ZHETRD_2STAGE'
@@ -734,17 +749,17 @@ SUBROUTINE ZERRST( PATH, NUNIT )
          CALL CHKXER( 'ZHEEVR', INFOT, NOUT, LERR, OK )
          INFOT = 18
          CALL ZHEEVR( 'V', 'I', 'U', 1, A, 1, 0.0D0, 0.0D0, 1, 1, 0.0D0,
-     $                M, R, Z, 1, IW, Q, 2*N-1, RW, 24*N, IW( 2*N+1 ),
+     $                M, R, Z, 1, IW, Q, 0, RW, 24*N, IW( 2*N+1 ),
      $                10*N, INFO )
          CALL CHKXER( 'ZHEEVR', INFOT, NOUT, LERR, OK )
          INFOT = 20
          CALL ZHEEVR( 'V', 'I', 'U', 1, A, 1, 0.0D0, 0.0D0, 1, 1, 0.0D0,
-     $                M, R, Z, 1, IW, Q, 2*N, RW, 24*N-1, IW( 2*N-1 ),
+     $                M, R, Z, 1, IW, Q, 2*N, RW, 0, IW( 2*N-1 ),
      $                10*N, INFO )
          CALL CHKXER( 'ZHEEVR', INFOT, NOUT, LERR, OK )
          INFOT = 22
          CALL ZHEEVR( 'V', 'I', 'U', 1, A, 1, 0.0D0, 0.0D0, 1, 1, 0.0D0,
-     $                M, R, Z, 1, IW, Q, 2*N, RW, 24*N, IW, 10*N-1,
+     $                M, R, Z, 1, IW, Q, 2*N, RW, 24*N, IW, 0,
      $                INFO )
          CALL CHKXER( 'ZHEEVR', INFOT, NOUT, LERR, OK )
          NT = NT + 12
@@ -816,19 +831,19 @@ SUBROUTINE ZERRST( PATH, NUNIT )
          INFOT = 18
          CALL ZHEEVR_2STAGE( 'N', 'I', 'U', 1, A, 1,
      $                0.0D0, 0.0D0, 1, 1, 0.0D0,
-     $                M, R, Z, 1, IW, Q, 2*N-1, RW, 24*N, IW( 2*N+1 ),
+     $                M, R, Z, 1, IW, Q, 0, RW, 24*N, IW( 2*N+1 ),
      $                10*N, INFO )
          CALL CHKXER( 'ZHEEVR_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 20
          CALL ZHEEVR_2STAGE( 'N', 'I', 'U', 1, A, 1,
      $                0.0D0, 0.0D0, 1, 1, 0.0D0,
-     $                M, R, Z, 1, IW, Q, 26*N, RW, 24*N-1, IW( 2*N-1 ),
+     $                M, R, Z, 1, IW, Q, 26*N, RW, 0, IW( 2*N-1 ),
      $                10*N, INFO )
          CALL CHKXER( 'ZHEEVR_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 22
          CALL ZHEEVR_2STAGE( 'N', 'I', 'U', 1, A, 1,
      $                0.0D0, 0.0D0, 1, 1, 0.0D0,
-     $                M, R, Z, 1, IW, Q, 26*N, RW, 24*N, IW, 10*N-1,
+     $                M, R, Z, 1, IW, Q, 26*N, RW, 24*N, IW, 0,
      $                INFO )
          CALL CHKXER( 'ZHEEVR_2STAGE', INFOT, NOUT, LERR, OK )
          NT = NT + 13
diff --git a/TESTING/EIG/zget02.f b/TESTING/EIG/zget02.f
index c43704693f..bd808c598a 100644
--- a/TESTING/EIG/zget02.f
+++ b/TESTING/EIG/zget02.f
@@ -131,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE ZGET02( TRANS, M, N, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zget10.f b/TESTING/EIG/zget10.f
index 4442fc8ec2..10b4ff5d13 100644
--- a/TESTING/EIG/zget10.f
+++ b/TESTING/EIG/zget10.f
@@ -96,6 +96,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZGET10( M, N, A, LDA, B, LDB, WORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zget22.f b/TESTING/EIG/zget22.f
index 73ed0ac344..f31fe26c41 100644
--- a/TESTING/EIG/zget22.f
+++ b/TESTING/EIG/zget22.f
@@ -141,6 +141,7 @@
 *  =====================================================================
       SUBROUTINE ZGET22( TRANSA, TRANSE, TRANSW, N, A, LDA, E, LDE, W,
      $                   WORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zget23.f b/TESTING/EIG/zget23.f
index fc48a5e1b3..7c84d0fd45 100644
--- a/TESTING/EIG/zget23.f
+++ b/TESTING/EIG/zget23.f
@@ -365,6 +365,7 @@ SUBROUTINE ZGET23( COMP, ISRT, BALANC, JTYPE, THRESH, ISEED,
      $                   LDVR, LRE, LDLRE, RCONDV, RCNDV1, RCDVIN,
      $                   RCONDE, RCNDE1, RCDEIN, SCALE, SCALE1, RESULT,
      $                   WORK, LWORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zget24.f b/TESTING/EIG/zget24.f
index 670611e91c..69a1589519 100644
--- a/TESTING/EIG/zget24.f
+++ b/TESTING/EIG/zget24.f
@@ -332,6 +332,7 @@ SUBROUTINE ZGET24( COMP, JTYPE, THRESH, ISEED, NOUNIT, N, A, LDA,
      $                   H, HT, W, WT, WTMP, VS, LDVS, VS1, RCDEIN,
      $                   RCDVIN, NSLCT, ISLCT, ISRT, RESULT, WORK,
      $                   LWORK, RWORK, BWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zget35.f b/TESTING/EIG/zget35.f
index 5da48bcb0f..38a2d98ac8 100644
--- a/TESTING/EIG/zget35.f
+++ b/TESTING/EIG/zget35.f
@@ -81,6 +81,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZGET35( RMAX, LMAX, NINFO, KNT, NIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -122,7 +123,7 @@ SUBROUTINE ZGET35( RMAX, LMAX, NINFO, KNT, NIN )
       EXTERNAL           DLAMCH, ZLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, ZGEMM, ZTRSYL
+      EXTERNAL           ZGEMM, ZTRSYL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, MAX, SQRT
@@ -134,7 +135,6 @@ SUBROUTINE ZGET35( RMAX, LMAX, NINFO, KNT, NIN )
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Set up test case parameters
 *
diff --git a/TESTING/EIG/zget36.f b/TESTING/EIG/zget36.f
index c7a79b99f7..9c4fbaf504 100644
--- a/TESTING/EIG/zget36.f
+++ b/TESTING/EIG/zget36.f
@@ -82,6 +82,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZGET36( RMAX, LMAX, NINFO, KNT, NIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zget37.f b/TESTING/EIG/zget37.f
index 63680e8556..7002e4f601 100644
--- a/TESTING/EIG/zget37.f
+++ b/TESTING/EIG/zget37.f
@@ -87,6 +87,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZGET37( RMAX, LMAX, NINFO, KNT, NIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -131,8 +132,8 @@ SUBROUTINE ZGET37( RMAX, LMAX, NINFO, KNT, NIN )
       EXTERNAL           DLAMCH, ZLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLABAD, DSCAL, ZCOPY, ZDSCAL, ZGEHRD,
-     $                   ZHSEQR, ZLACPY, ZTREVC, ZTRSNA
+      EXTERNAL           DCOPY, DSCAL, ZCOPY, ZDSCAL, ZGEHRD, ZHSEQR,
+     $                   ZLACPY, ZTREVC, ZTRSNA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, DIMAG, MAX, SQRT
@@ -142,7 +143,6 @@ SUBROUTINE ZGET37( RMAX, LMAX, NINFO, KNT, NIN )
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     EPSIN = 2**(-24) = precision to which input data computed
 *
@@ -265,7 +265,7 @@ SUBROUTINE ZGET37( RMAX, LMAX, NINFO, KNT, NIN )
   100       CONTINUE
             WSRT( KMIN ) = WSRT( I )
             WSRT( I ) = VMIN
-            VCMIN = WTMP( I )
+            VCMIN = DBLE( WTMP( I ) )
             WTMP( I ) = W( KMIN )
             WTMP( KMIN ) = VCMIN
             VMIN = STMP( KMIN )
diff --git a/TESTING/EIG/zget38.f b/TESTING/EIG/zget38.f
index 43b538fcf2..c8385c23bc 100644
--- a/TESTING/EIG/zget38.f
+++ b/TESTING/EIG/zget38.f
@@ -88,6 +88,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZGET38( RMAX, LMAX, NINFO, KNT, NIN )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -135,8 +136,8 @@ SUBROUTINE ZGET38( RMAX, LMAX, NINFO, KNT, NIN )
       EXTERNAL           DLAMCH, ZLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, ZDSCAL, ZGEHRD, ZHSEQR, ZHST01, ZLACPY,
-     $                   ZTRSEN, ZUNGHR
+      EXTERNAL           ZDSCAL, ZGEHRD, ZHSEQR, ZHST01, ZLACPY, ZTRSEN,
+     $                   ZUNGHR
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, DIMAG, MAX, SQRT
@@ -146,7 +147,6 @@ SUBROUTINE ZGET38( RMAX, LMAX, NINFO, KNT, NIN )
       EPS = DLAMCH( 'P' )
       SMLNUM = DLAMCH( 'S' ) / EPS
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     EPSIN = 2**(-24) = precision to which input data computed
 *
diff --git a/TESTING/EIG/zget51.f b/TESTING/EIG/zget51.f
index 7b2ea679a3..c1d1b43664 100644
--- a/TESTING/EIG/zget51.f
+++ b/TESTING/EIG/zget51.f
@@ -152,6 +152,7 @@
 *  =====================================================================
       SUBROUTINE ZGET51( ITYPE, N, A, LDA, B, LDB, U, LDU, V, LDV, WORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zget52.f b/TESTING/EIG/zget52.f
index e22939a6c2..d0d2563834 100644
--- a/TESTING/EIG/zget52.f
+++ b/TESTING/EIG/zget52.f
@@ -159,6 +159,7 @@
 *  =====================================================================
       SUBROUTINE ZGET52( LEFT, N, A, LDA, B, LDB, E, LDE, ALPHA, BETA,
      $                   WORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -257,7 +258,7 @@ SUBROUTINE ZGET52( LEFT, N, A, LDA, B, LDB, E, LDE, ALPHA, BETA,
          END IF
          CALL ZGEMV( TRANS, N, N, ACOEFF, A, LDA, E( 1, JVEC ), 1,
      $               CZERO, WORK( N*( JVEC-1 )+1 ), 1 )
-         CALL ZGEMV( TRANS, N, N, -BCOEFF, B, LDA, E( 1, JVEC ), 1,
+         CALL ZGEMV( TRANS, N, N, -BCOEFF, B, LDB, E( 1, JVEC ), 1,
      $               CONE, WORK( N*( JVEC-1 )+1 ), 1 )
    10 CONTINUE
 *
diff --git a/TESTING/EIG/zget54.f b/TESTING/EIG/zget54.f
index 6ac622018d..44a256ee84 100644
--- a/TESTING/EIG/zget54.f
+++ b/TESTING/EIG/zget54.f
@@ -153,6 +153,7 @@
 *  =====================================================================
       SUBROUTINE ZGET54( N, A, LDA, B, LDB, S, LDS, T, LDT, U, LDU, V,
      $                   LDV, WORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zglmts.f b/TESTING/EIG/zglmts.f
index 63664241d3..54ceca0512 100644
--- a/TESTING/EIG/zglmts.f
+++ b/TESTING/EIG/zglmts.f
@@ -143,6 +143,7 @@
 *  =====================================================================
       SUBROUTINE ZGLMTS( N, M, P, A, AF, LDA, B, BF, LDB, D, DF, X, U,
      $                   WORK, LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zgqrts.f b/TESTING/EIG/zgqrts.f
index 7d331414ab..434e080058 100644
--- a/TESTING/EIG/zgqrts.f
+++ b/TESTING/EIG/zgqrts.f
@@ -173,6 +173,7 @@
 *  =====================================================================
       SUBROUTINE ZGQRTS( N, M, P, A, AF, Q, R, LDA, TAUA, B, BF, Z, T,
      $                   BWK, LDB, TAUB, WORK, LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zgrqts.f b/TESTING/EIG/zgrqts.f
index f62b23a6f8..368dbdbffe 100644
--- a/TESTING/EIG/zgrqts.f
+++ b/TESTING/EIG/zgrqts.f
@@ -173,6 +173,7 @@
 *  =====================================================================
       SUBROUTINE ZGRQTS( M, P, N, A, AF, Q, R, LDA, TAUA, B, BF, Z, T,
      $                   BWK, LDB, TAUB, WORK, LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zgsvts3.f b/TESTING/EIG/zgsvts3.f
index 729a6f3ce6..66846eec83 100644
--- a/TESTING/EIG/zgsvts3.f
+++ b/TESTING/EIG/zgsvts3.f
@@ -206,6 +206,7 @@
       SUBROUTINE ZGSVTS3( M, P, N, A, AF, LDA, B, BF, LDB, U, LDU, V,
      $                    LDV, Q, LDQ, ALPHA, BETA, R, LDR, IWORK, WORK,
      $                    LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zhbt21.f b/TESTING/EIG/zhbt21.f
index cedf8344fe..ec5057dbdf 100644
--- a/TESTING/EIG/zhbt21.f
+++ b/TESTING/EIG/zhbt21.f
@@ -149,6 +149,7 @@
 *  =====================================================================
       SUBROUTINE ZHBT21( UPLO, N, KA, KS, A, LDA, D, E, U, LDU, WORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zhet21.f b/TESTING/EIG/zhet21.f
index d254f85e9c..ac3bb3b474 100644
--- a/TESTING/EIG/zhet21.f
+++ b/TESTING/EIG/zhet21.f
@@ -211,6 +211,7 @@
 *  =====================================================================
       SUBROUTINE ZHET21( ITYPE, UPLO, N, KBAND, A, LDA, D, E, U, LDU, V,
      $                   LDV, TAU, WORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -304,9 +305,9 @@ SUBROUTINE ZHET21( ITYPE, UPLO, N, KBAND, A, LDA, D, E, U, LDU, V,
    10    CONTINUE
 *
          IF( N.GT.1 .AND. KBAND.EQ.1 ) THEN
-            DO 20 J = 2, N - 1
+            DO 20 J = 1, N - 1
                CALL ZHER2( CUPLO, N, -DCMPLX( E( J ) ), U( 1, J ), 1,
-     $                     U( 1, J-1 ), 1, WORK, N )
+     $                     U( 1, J+1 ), 1, WORK, N )
    20       CONTINUE
          END IF
          WNORM = ZLANHE( '1', CUPLO, N, WORK, N, RWORK )
diff --git a/TESTING/EIG/zhet22.f b/TESTING/EIG/zhet22.f
index 6606d250b6..56fc4dd471 100644
--- a/TESTING/EIG/zhet22.f
+++ b/TESTING/EIG/zhet22.f
@@ -158,6 +158,7 @@
 *  =====================================================================
       SUBROUTINE ZHET22( ITYPE, UPLO, N, M, KBAND, A, LDA, D, E, U, LDU,
      $                   V, LDV, TAU, WORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zhpt21.f b/TESTING/EIG/zhpt21.f
index 70734dafe9..c75fcda4da 100644
--- a/TESTING/EIG/zhpt21.f
+++ b/TESTING/EIG/zhpt21.f
@@ -225,6 +225,7 @@
 *  =====================================================================
       SUBROUTINE ZHPT21( ITYPE, UPLO, N, KBAND, AP, D, E, U, LDU, VP,
      $                   TAU, WORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zhst01.f b/TESTING/EIG/zhst01.f
index ebb1c48952..2172368c97 100644
--- a/TESTING/EIG/zhst01.f
+++ b/TESTING/EIG/zhst01.f
@@ -137,6 +137,7 @@
 *  =====================================================================
       SUBROUTINE ZHST01( N, ILO, IHI, A, LDA, H, LDH, Q, LDQ, WORK,
      $                   LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -166,7 +167,7 @@ SUBROUTINE ZHST01( N, ILO, IHI, A, LDA, H, LDH, Q, LDQ, WORK,
       EXTERNAL           DLAMCH, ZLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, ZGEMM, ZLACPY, ZUNT01
+      EXTERNAL           ZGEMM, ZLACPY, ZUNT01
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DCMPLX, MAX, MIN
@@ -184,7 +185,6 @@ SUBROUTINE ZHST01( N, ILO, IHI, A, LDA, H, LDH, Q, LDQ, WORK,
       UNFL = DLAMCH( 'Safe minimum' )
       EPS = DLAMCH( 'Precision' )
       OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
       SMLNUM = UNFL*N / EPS
 *
 *     Test 1:  Compute norm( A - Q*H*Q' ) / ( norm(A) * N * EPS )
diff --git a/TESTING/EIG/zlarfy.f b/TESTING/EIG/zlarfy.f
index e0cb2f9795..af07e7a697 100644
--- a/TESTING/EIG/zlarfy.f
+++ b/TESTING/EIG/zlarfy.f
@@ -105,6 +105,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZLARFY( UPLO, N, V, INCV, TAU, C, LDC, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zlarhs.f b/TESTING/EIG/zlarhs.f
index 1dc003f2e4..2fb9d9758d 100644
--- a/TESTING/EIG/zlarhs.f
+++ b/TESTING/EIG/zlarhs.f
@@ -205,6 +205,7 @@
 *  =====================================================================
       SUBROUTINE ZLARHS( PATH, XTYPE, UPLO, TRANS, M, N, KL, KU, NRHS,
      $                   A, LDA, X, LDX, B, LDB, ISEED, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zlatm4.f b/TESTING/EIG/zlatm4.f
index 1223993879..b752eaf9f2 100644
--- a/TESTING/EIG/zlatm4.f
+++ b/TESTING/EIG/zlatm4.f
@@ -168,6 +168,7 @@
 *  =====================================================================
       SUBROUTINE ZLATM4( ITYPE, N, NZ1, NZ2, RSIGN, AMAGN, RCOND,
      $                   TRIANG, IDIST, ISEED, A, LDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zlctes.f b/TESTING/EIG/zlctes.f
index a7ac8b067f..fe544678e6 100644
--- a/TESTING/EIG/zlctes.f
+++ b/TESTING/EIG/zlctes.f
@@ -55,6 +55,7 @@
 *
 *  =====================================================================
       LOGICAL          FUNCTION ZLCTES( Z, D )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zlctsx.f b/TESTING/EIG/zlctsx.f
index 95d3e13258..ac04b5294b 100644
--- a/TESTING/EIG/zlctsx.f
+++ b/TESTING/EIG/zlctsx.f
@@ -54,6 +54,7 @@
 *
 *  =====================================================================
       LOGICAL          FUNCTION ZLCTSX( ALPHA, BETA )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zlsets.f b/TESTING/EIG/zlsets.f
index 8c8ff01b22..ede45d7af7 100644
--- a/TESTING/EIG/zlsets.f
+++ b/TESTING/EIG/zlsets.f
@@ -148,6 +148,7 @@
 *  =====================================================================
       SUBROUTINE ZLSETS( M, P, N, A, AF, LDA, B, BF, LDB, C, CF, D, DF,
      $                   X, WORK, LWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zsbmv.f b/TESTING/EIG/zsbmv.f
index ad8baee592..be44143088 100644
--- a/TESTING/EIG/zsbmv.f
+++ b/TESTING/EIG/zsbmv.f
@@ -149,6 +149,7 @@
 *  =====================================================================
       SUBROUTINE ZSBMV( UPLO, N, K, ALPHA, A, LDA, X, INCX, BETA, Y,
      $                  INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zsgt01.f b/TESTING/EIG/zsgt01.f
index 97e10fcea9..5e885ea826 100644
--- a/TESTING/EIG/zsgt01.f
+++ b/TESTING/EIG/zsgt01.f
@@ -149,6 +149,7 @@
 *  =====================================================================
       SUBROUTINE ZSGT01( ITYPE, UPLO, N, M, A, LDA, B, LDB, Z, LDZ, D,
      $                   WORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zslect.f b/TESTING/EIG/zslect.f
index ec6ff4e016..f34ba72b7c 100644
--- a/TESTING/EIG/zslect.f
+++ b/TESTING/EIG/zslect.f
@@ -53,6 +53,7 @@
 *
 *  =====================================================================
       LOGICAL          FUNCTION ZSLECT( Z )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zstt21.f b/TESTING/EIG/zstt21.f
index 4df1f7fe2b..69bbe0b9f7 100644
--- a/TESTING/EIG/zstt21.f
+++ b/TESTING/EIG/zstt21.f
@@ -130,6 +130,7 @@
 *  =====================================================================
       SUBROUTINE ZSTT21( N, KBAND, AD, AE, SD, SE, U, LDU, WORK, RWORK,
      $                   RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zstt22.f b/TESTING/EIG/zstt22.f
index b21773b162..8155976ca6 100644
--- a/TESTING/EIG/zstt22.f
+++ b/TESTING/EIG/zstt22.f
@@ -142,6 +142,7 @@
 *  =====================================================================
       SUBROUTINE ZSTT22( N, M, KBAND, AD, AE, SD, SE, U, LDU, WORK,
      $                   LDWORK, RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zsyl01.f b/TESTING/EIG/zsyl01.f
new file mode 100644
index 0000000000..5d26d494cf
--- /dev/null
+++ b/TESTING/EIG/zsyl01.f
@@ -0,0 +1,317 @@
+*> \brief \b ZSYL01
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZSYL01( THRESH, NFAIL, RMAX, NINFO, KNT )
+*
+*     .. Scalar Arguments ..
+*     INTEGER            KNT
+*     DOUBLE PRECISION   THRESH
+*     ..
+*     .. Array Arguments ..
+*     INTEGER            NFAIL( 3 ), NINFO( 2 )
+*     DOUBLE PRECISION   RMAX( 2 )
+*     ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZSYL01 tests ZTRSYL and ZTRSYL3, routines for solving the Sylvester matrix
+*> equation
+*>
+*>    op(A)*X + ISGN*X*op(B) = scale*C,
+*>
+*> where op(A) and op(B) are both upper triangular form, op() represents an
+*> optional conjugate transpose, and ISGN can be -1 or +1. Scale is an output
+*> less than or equal to 1, chosen to avoid overflow in X.
+*>
+*> The test code verifies that the following residual does not exceed
+*> the provided threshold:
+*>
+*>    norm(op(A)*X + ISGN*X*op(B) - scale*C) /
+*>        (EPS*max(norm(A),norm(B))*norm(X))
+*>
+*> This routine complements ZGET35 by testing with larger,
+*> random matrices, of which some require rescaling of X to avoid overflow.
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] THRESH
+*> \verbatim
+*>          THRESH is DOUBLE PRECISION
+*>          A test will count as "failed" if the residual, computed as
+*>          described above, exceeds THRESH.
+*> \endverbatim
+*>
+*> \param[out] NFAIL
+*> \verbatim
+*>          NFAIL is INTEGER array, dimension (3)
+*>          NFAIL(1) = No. of times residual ZTRSYL exceeds threshold THRESH
+*>          NFAIL(2) = No. of times residual ZTRSYL3 exceeds threshold THRESH
+*>          NFAIL(3) = No. of times ZTRSYL3 and ZTRSYL deviate
+*> \endverbatim
+*>
+*> \param[out] RMAX
+*> \verbatim
+*>          RMAX is DOUBLE PRECISION array, dimension (2)
+*>          RMAX(1) = Value of the largest test ratio of ZTRSYL
+*>          RMAX(2) = Value of the largest test ratio of ZTRSYL3
+*> \endverbatim
+*>
+*> \param[out] NINFO
+*> \verbatim
+*>          NINFO is INTEGER array, dimension (2)
+*>          NINFO(1) = No. of times ZTRSYL returns an expected INFO
+*>          NINFO(2) = No. of times ZTRSYL3 returns an expected INFO
+*> \endverbatim
+*>
+*> \param[out] KNT
+*> \verbatim
+*>          KNT is INTEGER
+*>          Total number of examples tested.
+*> \endverbatim
+
+*
+*  -- LAPACK test routine --
+      SUBROUTINE ZSYL01( THRESH, NFAIL, RMAX, NINFO, KNT )
+      IMPLICIT NONE
+*
+*  -- LAPACK test routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            KNT
+      DOUBLE PRECISION   THRESH
+*     ..
+*     .. Array Arguments ..
+      INTEGER            NFAIL( 3 ), NINFO( 2 )
+      DOUBLE PRECISION   RMAX( 2 )
+*     ..
+*
+*  =====================================================================
+*     ..
+*     .. Parameters ..
+      COMPLEX*16         CONE
+      PARAMETER          ( CONE = ( 1.0D0, 0.0D+0 ) )
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+      INTEGER            MAXM, MAXN, LDSWORK
+      PARAMETER          ( MAXM = 185, MAXN = 192, LDSWORK = 36 )
+*     ..
+*     .. Local Scalars ..
+      CHARACTER          TRANA, TRANB
+      INTEGER            I, INFO, IINFO, ISGN, ITRANA, ITRANB, J, KLA,
+     $                   KUA, KLB, KUB, M, N
+      DOUBLE PRECISION   ANRM, BNRM, BIGNUM, EPS, RES, RES1,
+     $                   SCALE, SCALE3, SMLNUM, TNRM, XNRM
+      COMPLEX*16         RMUL
+*     ..
+*     .. Local Arrays ..
+      COMPLEX*16         DUML( MAXM ), DUMR( MAXN ),
+     $                   D( MAX( MAXM, MAXN ) )
+      DOUBLE PRECISION   DUM( MAXN ), VM( 2 )
+      INTEGER            ISEED( 4 ), IWORK( MAXM + MAXN + 2 )
+*     ..
+*     .. Allocatable Arrays ..
+      INTEGER            AllocateStatus
+      COMPLEX*16,       DIMENSION(:,:), ALLOCATABLE :: A, B, C, CC, X
+      DOUBLE PRECISION, DIMENSION(:,:), ALLOCATABLE :: SWORK
+*     ..
+*     .. External Functions ..
+      LOGICAL            DISNAN
+      DOUBLE PRECISION   DLAMCH, ZLANGE
+      EXTERNAL           DISNAN, DLAMCH, ZLANGE
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZLATMR, ZLACPY, ZGEMM, ZTRSYL, ZTRSYL3
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, MAX, SQRT
+*     ..
+*     .. Allocate memory dynamically ..
+      ALLOCATE ( A( MAXM, MAXM ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( B( MAXN, MAXN ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( C( MAXM, MAXN ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( CC( MAXM, MAXN ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( X( MAXM, MAXN ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( SWORK( LDSWORK, 103 ), STAT = AllocateStatus )
+      IF( AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+*     ..
+*     .. Executable Statements ..
+*
+*     Get machine parameters
+*
+      EPS = DLAMCH( 'P' )
+      SMLNUM = DLAMCH( 'S' ) / EPS
+      BIGNUM = ONE / SMLNUM
+*
+*     Expect INFO = 0
+      VM( 1 ) = ONE
+*     Expect INFO = 1
+      VM( 2 ) = 0.05D+0
+*
+*     Begin test loop
+*
+      NINFO( 1 ) = 0
+      NINFO( 2 ) = 0
+      NFAIL( 1 ) = 0
+      NFAIL( 2 ) = 0
+      NFAIL( 3 ) = 0
+      RMAX( 1 ) = ZERO
+      RMAX( 2 ) = ZERO
+      KNT = 0
+      ISEED( 1 ) = 1
+      ISEED( 2 ) = 1
+      ISEED( 3 ) = 1
+      ISEED( 4 ) = 1
+      SCALE = ONE
+      SCALE3 = ONE
+      DO J = 1, 2
+         DO ISGN = -1, 1, 2
+*           Reset seed (overwritten by LATMR)
+            ISEED( 1 ) = 1
+            ISEED( 2 ) = 1
+            ISEED( 3 ) = 1
+            ISEED( 4 ) = 1
+            DO M = 32, MAXM, 51
+               KLA = 0
+               KUA = M - 1
+               CALL ZLATMR( M, M, 'S', ISEED, 'N', D,
+     $                      6, ONE, CONE, 'T', 'N',
+     $                      DUML, 1, ONE, DUMR, 1, ONE,
+     $                      'N', IWORK, KLA, KUA, ZERO,
+     $                      ONE, 'NO', A, MAXM, IWORK,
+     $                      IINFO )
+               DO I = 1, M
+                  A( I, I ) = A( I, I ) * VM( J )
+               END DO
+               ANRM = ZLANGE( 'M', M, M, A, MAXM, DUM )
+               DO N = 51, MAXN, 47
+                  KLB = 0
+                  KUB = N - 1
+                  CALL ZLATMR( N, N, 'S', ISEED, 'N', D,
+     $                         6, ONE, CONE, 'T', 'N',
+     $                         DUML, 1, ONE, DUMR, 1, ONE,
+     $                         'N', IWORK, KLB, KUB, ZERO,
+     $                         ONE, 'NO', B, MAXN, IWORK,
+     $                         IINFO )
+                  DO I = 1, N
+                     B( I, I ) = B( I, I ) * VM ( J )
+                  END DO
+                  BNRM = ZLANGE( 'M', N, N, B, MAXN, DUM )
+                  TNRM = MAX( ANRM, BNRM )
+                  CALL ZLATMR( M, N, 'S', ISEED, 'N', D,
+     $                         6, ONE, CONE, 'T', 'N',
+     $                         DUML, 1, ONE, DUMR, 1, ONE,
+     $                         'N', IWORK, M, N, ZERO, ONE,
+     $                         'NO', C, MAXM, IWORK, IINFO )
+                  DO ITRANA = 1, 2
+                     IF( ITRANA.EQ.1 )
+     $                   TRANA = 'N'
+                     IF( ITRANA.EQ.2 )
+     $                   TRANA = 'C'
+                     DO ITRANB = 1, 2
+                        IF( ITRANB.EQ.1 )
+     $                     TRANB = 'N'
+                        IF( ITRANB.EQ.2 )
+     $                     TRANB = 'C'
+                        KNT = KNT + 1
+*
+                        CALL ZLACPY( 'All', M, N, C, MAXM, X, MAXM)
+                        CALL ZLACPY( 'All', M, N, C, MAXM, CC, MAXM)
+                        CALL ZTRSYL( TRANA, TRANB, ISGN, M, N, 
+     $                               A, MAXM, B, MAXN, X, MAXM,
+     $                               SCALE, IINFO )
+                        IF( IINFO.NE.0 )
+     $                     NINFO( 1 ) = NINFO( 1 ) + 1
+                        XNRM = ZLANGE( 'M', M, N, X, MAXM, DUM )
+                        RMUL = CONE
+                        IF( XNRM.GT.ONE .AND. TNRM.GT.ONE ) THEN
+                           IF( XNRM.GT.BIGNUM / TNRM ) THEN
+                              RMUL = CONE / MAX( XNRM, TNRM )
+                           END IF
+                        END IF
+                        CALL ZGEMM( TRANA, 'N', M, N, M, RMUL,
+     $                              A, MAXM, X, MAXM, -SCALE*RMUL,
+     $                              CC, MAXM )
+                        CALL ZGEMM( 'N', TRANB, M, N, N,
+     $                              DBLE( ISGN )*RMUL, X, MAXM, B,
+     $                              MAXN, CONE, CC, MAXM )
+                        RES1 = ZLANGE( 'M', M, N, CC, MAXM, DUM )
+                        RES = RES1 / MAX( SMLNUM, SMLNUM*XNRM,
+     $                        ( ( ABS( RMUL )*TNRM )*EPS )*XNRM )
+                        IF( RES.GT.THRESH )
+     $                     NFAIL( 1 ) = NFAIL( 1 ) + 1
+                        IF( RES.GT.RMAX( 1 ) )
+     $                     RMAX( 1 ) = RES
+*
+                        CALL ZLACPY( 'All', M, N, C, MAXM, X, MAXM )
+                        CALL ZLACPY( 'All', M, N, C, MAXM, CC, MAXM )
+                        CALL ZTRSYL3( TRANA, TRANB, ISGN, M, N,
+     $                                A, MAXM, B, MAXN, X, MAXM,
+     $                                SCALE3, SWORK, LDSWORK, INFO)
+                        IF( INFO.NE.0 )
+     $                     NINFO( 2 ) = NINFO( 2 ) + 1
+                        XNRM = ZLANGE( 'M', M, N, X, MAXM, DUM )
+                        RMUL = CONE
+                        IF( XNRM.GT.ONE .AND. TNRM.GT.ONE ) THEN
+                           IF( XNRM.GT.BIGNUM / TNRM ) THEN
+                              RMUL = CONE / MAX( XNRM, TNRM )
+                           END IF
+                        END IF
+                        CALL ZGEMM( TRANA, 'N', M, N, M, RMUL,
+     $                              A, MAXM, X, MAXM, -SCALE3*RMUL,
+     $                              CC, MAXM )
+                        CALL ZGEMM( 'N', TRANB, M, N, N,
+     $                              DBLE( ISGN )*RMUL, X, MAXM, B,
+     $                              MAXN, CONE, CC, MAXM )
+                        RES1 = ZLANGE( 'M', M, N, CC, MAXM, DUM )
+                        RES = RES1 / MAX( SMLNUM, SMLNUM*XNRM,
+     $                             ( ( ABS( RMUL )*TNRM )*EPS )*XNRM )
+*                       Verify that TRSYL3 only flushes if TRSYL flushes (but
+*                       there may be cases where TRSYL3 avoid flushing).
+                        IF( SCALE3.EQ.ZERO .AND. SCALE.GT.ZERO .OR.
+     $                      IINFO.NE.INFO ) THEN
+                           NFAIL( 3 ) = NFAIL( 3 ) + 1
+                        END IF
+                        IF( RES.GT.THRESH .OR. DISNAN( RES ) )
+     $                     NFAIL( 2 ) = NFAIL( 2 ) + 1
+                        IF( RES.GT.RMAX( 2 ) )
+     $                     RMAX( 2 ) = RES
+                     END DO
+                  END DO
+               END DO
+            END DO
+         END DO
+      END DO
+*
+      DEALLOCATE (A, STAT = AllocateStatus)
+      DEALLOCATE (B, STAT = AllocateStatus)
+      DEALLOCATE (C, STAT = AllocateStatus)
+      DEALLOCATE (CC, STAT = AllocateStatus)
+      DEALLOCATE (X, STAT = AllocateStatus)
+      DEALLOCATE (SWORK, STAT = AllocateStatus)
+*
+      RETURN
+*
+*     End of ZSYL01
+*
+      END
diff --git a/TESTING/EIG/zunt01.f b/TESTING/EIG/zunt01.f
index 040c88f449..6405f658ce 100644
--- a/TESTING/EIG/zunt01.f
+++ b/TESTING/EIG/zunt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE ZUNT01( ROWCOL, M, N, U, LDU, WORK, LWORK, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/EIG/zunt03.f b/TESTING/EIG/zunt03.f
index 2ab2cde0d4..ca87d48b4e 100644
--- a/TESTING/EIG/zunt03.f
+++ b/TESTING/EIG/zunt03.f
@@ -159,6 +159,7 @@
 *  =====================================================================
       SUBROUTINE ZUNT03( RC, MU, MV, N, K, U, LDU, V, LDV, WORK, LWORK,
      $                   RWORK, RESULT, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/CMakeLists.txt b/TESTING/LIN/CMakeLists.txt
index 2c3e2a5fd7..e28818c76b 100644
--- a/TESTING/LIN/CMakeLists.txt
+++ b/TESTING/LIN/CMakeLists.txt
@@ -9,7 +9,7 @@ set(DZLNTST dlaord.f)
 set(SLINTST schkaa.F
    schkeq.f schkgb.f schkge.f schkgt.f
    schklq.f schkpb.f schkpo.f schkps.f schkpp.f
-   schkpt.f schkq3.f schkql.f schkqr.f schkrq.f
+   schkpt.f schkq3.f schkqp3rk.f schkql.f schkqr.f schkrq.f
    schksp.f schksy.f schksy_rook.f schksy_rk.f 
    schksy_aa.f schksy_aa_2stage.f 
    schktb.f schktp.f schktr.f
@@ -20,7 +20,7 @@ set(SLINTST schkaa.F
    serrgt.f serrlq.f serrls.f
    serrps.f serrql.f serrqp.f serrqr.f
    serrrq.f serrtr.f serrtz.f
-   sgbt01.f sgbt02.f sgbt05.f sgelqs.f sgeqls.f sgeqrs.f
+   sgbt01.f sgbt02.f sgbt05.f sgeqls.f
    sgerqs.f sget01.f sget02.f
    sget03.f sget04.f sget06.f sget07.f sgtt01.f sgtt02.f
    sgtt05.f slaptm.f slarhs.f slatb4.f slatb5.f slattb.f slattp.f
@@ -56,7 +56,7 @@ set(CLINTST cchkaa.F
    cchkhe.f cchkhe_rook.f cchkhe_rk.f 
    cchkhe_aa.f cchkhe_aa_2stage.f
    cchkhp.f cchklq.f cchkpb.f
-   cchkpo.f cchkps.f cchkpp.f cchkpt.f cchkq3.f cchkql.f
+   cchkpo.f cchkps.f cchkpp.f cchkpt.f cchkq3.f cchkqp3rk.f cchkql.f
    cchkqr.f cchkrq.f cchksp.f cchksy.f cchksy_rook.f cchksy_rk.f
    cchksy_aa.f cchksy_aa_2stage.f
    cchktb.f
@@ -70,7 +70,7 @@ set(CLINTST cchkaa.F
    cerrgt.f cerrlq.f
    cerrls.f cerrps.f cerrql.f cerrqp.f
    cerrqr.f cerrrq.f cerrtr.f cerrtz.f
-   cgbt01.f cgbt02.f cgbt05.f cgelqs.f cgeqls.f cgeqrs.f
+   cgbt01.f cgbt02.f cgbt05.f cgeqls.f
    cgerqs.f cget01.f cget02.f
    cget03.f cget04.f cget07.f cgtt01.f cgtt02.f
    cgtt05.f chet01.f chet01_rook.f chet01_3.f
@@ -110,7 +110,7 @@ endif()
 set(DLINTST dchkaa.F
    dchkeq.f dchkgb.f dchkge.f dchkgt.f
    dchklq.f dchkpb.f dchkpo.f dchkps.f dchkpp.f
-   dchkpt.f dchkq3.f dchkql.f dchkqr.f dchkrq.f
+   dchkpt.f dchkq3.f dchkqp3rk.f dchkql.f dchkqr.f dchkrq.f
    dchksp.f dchksy.f dchksy_rook.f dchksy_rk.f 
    dchksy_aa.f dchksy_aa_2stage.f
    dchktb.f dchktp.f dchktr.f
@@ -121,7 +121,7 @@ set(DLINTST dchkaa.F
    derrgt.f derrlq.f derrls.f
    derrps.f derrql.f derrqp.f derrqr.f
    derrrq.f derrtr.f derrtz.f
-   dgbt01.f dgbt02.f dgbt05.f dgelqs.f dgeqls.f dgeqrs.f
+   dgbt01.f dgbt02.f dgbt05.f dgeqls.f
    dgerqs.f dget01.f dget02.f
    dget03.f dget04.f dget06.f dget07.f dgtt01.f dgtt02.f
    dgtt05.f dlaptm.f dlarhs.f dlatb4.f dlatb5.f dlattb.f dlattp.f
@@ -158,7 +158,7 @@ set(ZLINTST zchkaa.F
    zchkhe.f zchkhe_rook.f zchkhe_rk.f 
    zchkhe_aa.f zchkhe_aa_2stage.f
    zchkhp.f zchklq.f zchkpb.f
-   zchkpo.f zchkps.f zchkpp.f zchkpt.f zchkq3.f zchkql.f
+   zchkpo.f zchkps.f zchkpp.f zchkpt.f zchkq3.f zchkqp3rk.f zchkql.f
    zchkqr.f zchkrq.f zchksp.f zchksy.f zchksy_rook.f zchksy_rk.f
    zchksy_aa.f  zchksy_aa_2stage.f
    zchktb.f
@@ -172,7 +172,7 @@ set(ZLINTST zchkaa.F
    zerrgt.f zerrlq.f
    zerrls.f zerrps.f zerrql.f zerrqp.f
    zerrqr.f zerrrq.f zerrtr.f zerrtz.f
-   zgbt01.f zgbt02.f zgbt05.f zgelqs.f zgeqls.f zgeqrs.f
+   zgbt01.f zgbt02.f zgbt05.f zgeqls.f
    zgerqs.f zget01.f zget02.f
    zget03.f zget04.f zget07.f zgtt01.f zgtt02.f
    zgtt05.f zhet01.f zhet01_rook.f zhet01_3.f
diff --git a/TESTING/LIN/Makefile b/TESTING/LIN/Makefile
index 2474d04db1..46e096c2f0 100644
--- a/TESTING/LIN/Makefile
+++ b/TESTING/LIN/Makefile
@@ -45,7 +45,7 @@ DZLNTST = dlaord.o
 SLINTST = schkaa.o \
    schkeq.o schkgb.o schkge.o schkgt.o \
    schklq.o schkpb.o schkpo.o schkps.o schkpp.o \
-   schkpt.o schkq3.o schkql.o schkqr.o schkrq.o \
+   schkpt.o schkq3.o schkqp3rk.o schkql.o schkqr.o schkrq.o \
    schksp.o schksy.o schksy_rook.o schksy_rk.o  \
    schksy_aa.o schksy_aa_2stage.o schktb.o schktp.o schktr.o \
    schktz.o \
@@ -55,7 +55,7 @@ SLINTST = schkaa.o \
    serrgt.o serrlq.o serrls.o \
    serrps.o serrql.o serrqp.o serrqr.o \
    serrrq.o serrtr.o serrtz.o \
-   sgbt01.o sgbt02.o sgbt05.o sgelqs.o sgeqls.o sgeqrs.o \
+   sgbt01.o sgbt02.o sgbt05.o sgeqls.o \
    sgerqs.o sget01.o sget02.o \
    sget03.o sget04.o sget06.o sget07.o sgtt01.o sgtt02.o \
    sgtt05.o slaptm.o slarhs.o slatb4.o slatb5.o slattb.o slattp.o \
@@ -89,7 +89,7 @@ CLINTST = cchkaa.o \
    cchkeq.o cchkgb.o cchkge.o cchkgt.o \
    cchkhe.o cchkhe_rook.o cchkhe_rk.o  \
    cchkhe_aa.o cchkhe_aa_2stage.o cchkhp.o cchklq.o cchkpb.o \
-   cchkpo.o cchkps.o cchkpp.o cchkpt.o cchkq3.o cchkql.o \
+   cchkpo.o cchkps.o cchkpp.o cchkpt.o cchkq3.o cchkqp3rk.o cchkql.o \
    cchkqr.o cchkrq.o cchksp.o cchksy.o cchksy_rook.o cchksy_rk.o \
    cchksy_aa.o cchksy_aa_2stage.o cchktb.o \
    cchktp.o cchktr.o cchktz.o \
@@ -100,7 +100,7 @@ CLINTST = cchkaa.o \
    cerrgt.o cerrlq.o \
    cerrls.o cerrps.o cerrql.o cerrqp.o \
    cerrqr.o cerrrq.o cerrtr.o cerrtz.o \
-   cgbt01.o cgbt02.o cgbt05.o cgelqs.o cgeqls.o cgeqrs.o \
+   cgbt01.o cgbt02.o cgbt05.o cgeqls.o \
    cgerqs.o cget01.o cget02.o \
    cget03.o cget04.o cget07.o cgtt01.o cgtt02.o \
    cgtt05.o chet01.o chet01_rook.o chet01_3.o chet01_aa.o \
@@ -137,7 +137,7 @@ endif
 DLINTST = dchkaa.o \
    dchkeq.o dchkgb.o dchkge.o dchkgt.o \
    dchklq.o dchkpb.o dchkpo.o dchkps.o dchkpp.o \
-   dchkpt.o dchkq3.o dchkql.o dchkqr.o dchkrq.o \
+   dchkpt.o dchkq3.o dchkqp3rk.o dchkql.o dchkqr.o dchkrq.o \
    dchksp.o dchksy.o dchksy_rook.o dchksy_rk.o  \
    dchksy_aa.o dchksy_aa_2stage.o dchktb.o dchktp.o dchktr.o \
    dchktz.o \
@@ -147,7 +147,7 @@ DLINTST = dchkaa.o \
    derrgt.o derrlq.o derrls.o \
    derrps.o derrql.o derrqp.o derrqr.o \
    derrrq.o derrtr.o derrtz.o \
-   dgbt01.o dgbt02.o dgbt05.o dgelqs.o dgeqls.o dgeqrs.o \
+   dgbt01.o dgbt02.o dgbt05.o dgeqls.o \
    dgerqs.o dget01.o dget02.o \
    dget03.o dget04.o dget06.o dget07.o dgtt01.o dgtt02.o \
    dgtt05.o dlaptm.o dlarhs.o dlatb4.o dlatb5.o dlattb.o dlattp.o \
@@ -182,7 +182,7 @@ ZLINTST = zchkaa.o \
    zchkeq.o zchkgb.o zchkge.o zchkgt.o \
    zchkhe.o zchkhe_rook.o zchkhe_rk.o zchkhe_aa.o zchkhe_aa_2stage.o \
    zchkhp.o zchklq.o zchkpb.o \
-   zchkpo.o zchkps.o zchkpp.o zchkpt.o zchkq3.o zchkql.o \
+   zchkpo.o zchkps.o zchkpp.o zchkpt.o zchkq3.o zchkqp3rk.o zchkql.o \
    zchkqr.o zchkrq.o zchksp.o zchksy.o zchksy_rook.o zchksy_rk.o \
    zchksy_aa.o zchksy_aa_2stage.o zchktb.o \
    zchktp.o zchktr.o zchktz.o \
@@ -192,7 +192,7 @@ ZLINTST = zchkaa.o \
    zerrgt.o zerrlq.o \
    zerrls.o zerrps.o zerrql.o zerrqp.o \
    zerrqr.o zerrrq.o zerrtr.o zerrtz.o \
-   zgbt01.o zgbt02.o zgbt05.o zgelqs.o zgeqls.o zgeqrs.o \
+   zgbt01.o zgbt02.o zgbt05.o zgeqls.o \
    zgerqs.o zget01.o zget02.o \
    zget03.o zget04.o zget07.o zgtt01.o zgtt02.o \
    zgtt05.o zhet01.o zhet01_rook.o zhet01_3.o zhet01_aa.o \
diff --git a/TESTING/LIN/aladhd.f b/TESTING/LIN/aladhd.f
index f2a1c39511..6ca0bcb79e 100644
--- a/TESTING/LIN/aladhd.f
+++ b/TESTING/LIN/aladhd.f
@@ -87,6 +87,7 @@
 *
 *  =====================================================================
       SUBROUTINE ALADHD( IOUNIT, PATH )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/alaerh.f b/TESTING/LIN/alaerh.f
index 1845888a66..9ce2580ee2 100644
--- a/TESTING/LIN/alaerh.f
+++ b/TESTING/LIN/alaerh.f
@@ -144,6 +144,7 @@
 *  =====================================================================
       SUBROUTINE ALAERH( PATH, SUBNAM, INFO, INFOE, OPTS, M, N, KL, KU,
      $                   N5, IMAT, NFAIL, NERRS, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -797,6 +798,18 @@ SUBROUTINE ALAERH( PATH, SUBNAM, INFO, INFOE, OPTS, M, N, KL, KU,
             WRITE( NOUT, FMT = 9978 )
      $     SUBNAM(1:LEN_TRIM( SUBNAM )), INFO, M, N, IMAT
          END IF
+*
+      ELSE IF( LSAMEN( 2, P2, 'QK' ) ) THEN
+*
+*        xQK:  truncated QR factorization with pivoting
+*
+         IF( LSAMEN( 7, SUBNAM( 2: 8 ), 'GEQP3RK' )  ) THEN
+            WRITE( NOUT, FMT = 9930 )
+     $     SUBNAM(1:LEN_TRIM( SUBNAM )), INFO, M, N, KL, N5, IMAT
+         ELSE IF( LSAMEN( 5, SUBNAM( 2: 6 ), 'LATMS' ) ) THEN
+            WRITE( NOUT, FMT = 9978 )
+     $     SUBNAM(1:LEN_TRIM( SUBNAM )), INFO, M, N, IMAT
+         END IF
 *
       ELSE IF( LSAMEN( 2, P2, 'LQ' ) ) THEN
 *
@@ -1147,6 +1160,11 @@ SUBROUTINE ALAERH( PATH, SUBNAM, INFO, INFOE, OPTS, M, N, KL, KU,
 *     What we do next
 *
  9949 FORMAT( ' ==> Doing only the condition estimate for this case' )
+*
+*     SUBNAM, INFO, M, N, NB, IMAT
+*
+ 9930 FORMAT( ' *** Error code from ', A, '=', I5, / ' ==> M =', I5,
+     $      ', N =', I5, ', NX =', I5, ', NB =', I4, ', type ', I2 )
 *
       RETURN
 *
diff --git a/TESTING/LIN/alaesm.f b/TESTING/LIN/alaesm.f
index 391da22d4f..345ea0d420 100644
--- a/TESTING/LIN/alaesm.f
+++ b/TESTING/LIN/alaesm.f
@@ -60,6 +60,7 @@
 *
 *  =====================================================================
       SUBROUTINE ALAESM( PATH, OK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/alahd.f b/TESTING/LIN/alahd.f
index 2cc0fba063..87e84aee8f 100644
--- a/TESTING/LIN/alahd.f
+++ b/TESTING/LIN/alahd.f
@@ -104,6 +104,7 @@
 *
 *  =====================================================================
       SUBROUTINE ALAHD( IOUNIT, PATH )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -584,13 +585,27 @@ SUBROUTINE ALAHD( IOUNIT, PATH )
 *
 *        QR decomposition with column pivoting
 *
-         WRITE( IOUNIT, FMT = 9986 )PATH
+         WRITE( IOUNIT, FMT = 8006 )PATH
          WRITE( IOUNIT, FMT = 9969 )
          WRITE( IOUNIT, FMT = '( '' Test ratios:'' )' )
          WRITE( IOUNIT, FMT = 9940 )1
          WRITE( IOUNIT, FMT = 9939 )2
          WRITE( IOUNIT, FMT = 9938 )3
          WRITE( IOUNIT, FMT = '( '' Messages:'' )' )
+*
+      ELSE IF( LSAMEN( 2, P2, 'QK' ) ) THEN
+*
+*        truncated QR decomposition with column pivoting
+*
+         WRITE( IOUNIT, FMT = 8006 )PATH
+         WRITE( IOUNIT, FMT = 9871 )
+         WRITE( IOUNIT, FMT = '( '' Test ratios:'' )' )
+         WRITE( IOUNIT, FMT = 8060 )1
+         WRITE( IOUNIT, FMT = 8061 )2
+         WRITE( IOUNIT, FMT = 8062 )3
+         WRITE( IOUNIT, FMT = 8063 )4
+         WRITE( IOUNIT, FMT = 8064 )5
+         WRITE( IOUNIT, FMT = '( '' Messages:'' )' )
 *
       ELSE IF( LSAMEN( 2, P2, 'TZ' ) ) THEN
 *
@@ -608,17 +623,18 @@ SUBROUTINE ALAHD( IOUNIT, PATH )
       ELSE IF( LSAMEN( 2, P2, 'LS' ) ) THEN
 *
 *        LS:  Least Squares driver routines for
-*             LS, LSD, LSS, LSX and LSY.
+*             LS, LST, TSLS, LSD, LSS, LSX and LSY.
 *
          WRITE( IOUNIT, FMT = 9984 )PATH
          WRITE( IOUNIT, FMT = 9967 )
-         WRITE( IOUNIT, FMT = 9921 )C1, C1, C1, C1
+         WRITE( IOUNIT, FMT = 9921 )C1, C1, C1, C1, C1, C1
          WRITE( IOUNIT, FMT = 9935 )1
          WRITE( IOUNIT, FMT = 9931 )2
-         WRITE( IOUNIT, FMT = 9933 )3
-         WRITE( IOUNIT, FMT = 9935 )4
-         WRITE( IOUNIT, FMT = 9934 )5
-         WRITE( IOUNIT, FMT = 9932 )6
+         WRITE( IOUNIT, FMT = 9919 )
+         WRITE( IOUNIT, FMT = 9933 )7
+         WRITE( IOUNIT, FMT = 9935 )8
+         WRITE( IOUNIT, FMT = 9934 )9
+         WRITE( IOUNIT, FMT = 9932 )10
          WRITE( IOUNIT, FMT = 9920 )
          WRITE( IOUNIT, FMT = '( '' Messages:'' )' )
 *
@@ -776,8 +792,10 @@ SUBROUTINE ALAHD( IOUNIT, PATH )
      $       'triangular-pentagonal matrices' )
  8004 FORMAT( / 1X, A3, ':  TS factorization for ',
      $       'tall-skinny or short-wide matrices' )
- 8005 FORMAT( / 1X, A3, ':  Householder recostruction from TSQR',
+ 8005 FORMAT( / 1X, A3, ':  Householder reconstruction from TSQR',
      $       ' factorization output ', /,' for tall-skinny matrices.' )
+ 8006 FORMAT( / 1X, A3, ':  truncated QR factorization',
+     $        ' with column pivoting' )
 *
 *     GE matrix types
 *
@@ -921,6 +939,36 @@ SUBROUTINE ALAHD( IOUNIT, PATH )
      $      / 4X, '3. Geometric distribution', 10X,
      $      '6. Every second column fixed' )
 *
+*     QK matrix types
+*
+ 9871 FORMAT( 4X, ' 1. Zero matrix', /
+     $        4X, ' 2. Random, Diagonal, CNDNUM = 2', /
+     $        4X, ' 3. Random, Upper triangular, CNDNUM = 2', /
+     $        4X, ' 4. Random, Lower triangular, CNDNUM = 2', /
+     $        4X, ' 5. Random, First column is zero, CNDNUM = 2', /
+     $        4X, ' 6. Random, Last MINMN column is zero, CNDNUM = 2', /
+     $        4X, ' 7. Random, Last N column is zero, CNDNUM = 2', /
+     $        4X, ' 8. Random, Middle column in MINMN is zero,',
+     $               ' CNDNUM = 2', /
+     $        4X, ' 9. Random, First half of MINMN columns are zero,',
+     $                 ' CNDNUM = 2', /
+     $        4X, '10. Random, Last columns are zero starting from',
+     $                 ' MINMN/2+1, CNDNUM = 2', /
+     $        4X, '11. Random, Half MINMN columns in the middle are',
+     $                 ' zero starting from MINMN/2-(MINMN/2)/2+1,',
+     $                 ' CNDNUM = 2', /
+     $        4X, '12. Random, Odd columns are ZERO, CNDNUM = 2', /
+     $        4X, '13. Random, Even columns are ZERO, CNDNUM = 2', /
+     $        4X, '14. Random, CNDNUM = 2', /
+     $        4X, '15. Random, CNDNUM = sqrt(0.1/EPS)', /
+     $        4X, '16. Random, CNDNUM = 0.1/EPS', /
+     $        4X, '17. Random, CNDNUM = 0.1/EPS,',
+     $                 ' one small singular value S(N)=1/CNDNUM', /
+     $        4X, '18. Random, CNDNUM = 2, scaled near underflow,',
+     $                 ' NORM = SMALL = SAFMIN', /
+     $        4X, '19. Random, CNDNUM = 2, scaled near overflow,',
+     $            ' NORM = LARGE = 1.0/( 0.25 * ( SAFMIN / EPS ) )' )
+*
 *     TZ matrix types
 *
  9968 FORMAT( ' Matrix types (2-3 have condition 1/EPS):', / 4X,
@@ -1029,9 +1077,8 @@ SUBROUTINE ALAHD( IOUNIT, PATH )
      $      ' * norm(C) * EPS )' )
  9940 FORMAT( 3X, I2, ': norm(svd(A) - svd(R)) / ',
      $      '( M * norm(svd(R)) * EPS )' )
- 9939 FORMAT( 3X, I2, ': norm( A*P - Q*R )     / ( M * norm(A) * EPS )'
-     $       )
- 9938 FORMAT( 3X, I2, ': norm( I - Q''*Q )      / ( M * EPS )' )
+ 9939 FORMAT( 3X, I2, ': norm( A*P - Q*R ) / ( M * norm(A) * EPS )')
+ 9938 FORMAT( 3X, I2, ': norm( I - Q''*Q ) / ( M * EPS )' )
  9937 FORMAT( 3X, I2, ': norm( A - R*Q )       / ( M * norm(A) * EPS )'
      $       )
  9935 FORMAT( 3X, I2, ': norm( B - A * X )   / ',
@@ -1048,10 +1095,11 @@ SUBROUTINE ALAHD( IOUNIT, PATH )
      $      'check if X is in the row space of A or A'' ',
      $      '(overdetermined case)' )
  9929 FORMAT( ' Test ratios (1-3: ', A1, 'TZRZF):' )
- 9920 FORMAT( 3X, ' 7-10: same as 3-6', 3X, ' 11-14: same as 3-6' )
- 9921 FORMAT( ' Test ratios:', / '    (1-2: ', A1, 'GELS, 3-6: ', A1,
-     $      'GELSY, 7-10: ', A1, 'GELSS, 11-14: ', A1, 'GELSD, 15-16: ',
-     $        A1, 'GETSLS)')
+ 9919 FORMAT( 3X, ' 3-4: same as 1-2', 3X, ' 5-6: same as 1-2' )
+ 9920 FORMAT( 3X, ' 11-14: same as 7-10', 3X, ' 15-18: same as 7-10' )
+ 9921 FORMAT( ' Test ratios:', / '    (1-2: ', A1, 'GELS, 3-4: ', A1,
+     $      'GELST, 5-6: ', A1, 'GETSLS, 7-10: ', A1, 'GELSY, 11-14: ',
+     $        A1, 'GETSS, 15-18: ', A1, 'GELSD)' )
  9928 FORMAT( 7X, 'where ALPHA = ( 1 + SQRT( 17 ) ) / 8' )
  9927 FORMAT( 3X, I2, ': ABS( Largest element in L )', / 12X,
      $      ' - ( 1 / ( 1 - ALPHA ) ) + THRESH' )
@@ -1103,6 +1151,15 @@ SUBROUTINE ALAHD( IOUNIT, PATH )
  8054 FORMAT(3X,I2,': norm( C*Q - C*Q ) / ( M * norm(C) * EPS )' )
  8055 FORMAT(3X,I2,': norm( C*Q'' - C*Q'' ) / ( M * norm(C) * EPS )')
 
+ 8060 FORMAT( 3X, I2, ': 2-norm(svd(A) - svd(R)) / ',
+     $      '( max(M,N) * 2-norm(svd(R)) * EPS )' )
+ 8061 FORMAT( 3X, I2, ': 1-norm( A*P - Q*R ) / ( max(M,N) * 1-norm(A)',
+     $                ' * EPS )')
+ 8062 FORMAT( 3X, I2, ': 1-norm( I - Q''*Q ) / ( M * EPS )' )
+ 8063 FORMAT( 3X, I2, ': Returns 1.0D+100, if abs(R(K+1,K+1))',
+     $                 ' > abs(R(K,K)), where K=1:KFACT-1' )
+ 8064 FORMAT( 3X, I2, ': 1-norm(Q**T * B - Q**T * B ) / ( M * EPS )')
+
 *
       RETURN
 *
diff --git a/TESTING/LIN/alareq.f b/TESTING/LIN/alareq.f
index db18775ebc..e30578c46e 100644
--- a/TESTING/LIN/alareq.f
+++ b/TESTING/LIN/alareq.f
@@ -28,12 +28,12 @@
 *> to evaluate the input line which requested NMATS matrix types for
 *> PATH.  The flow of control is as follows:
 *>
-*> If NMATS = NTYPES then
+*> IF NMATS = NTYPES THEN
 *>    DOTYPE(1:NTYPES) = .TRUE.
-*> else
+*> ELSE
 *>    Read the next input line for NMATS matrix types
 *>    Set DOTYPE(I) = .TRUE. for each valid type I
-*> endif
+*> END IF
 *> \endverbatim
 *
 *  Arguments:
@@ -87,6 +87,7 @@
 *
 *  =====================================================================
       SUBROUTINE ALAREQ( PATH, NMATS, DOTYPE, NTYPES, NIN, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/alasum.f b/TESTING/LIN/alasum.f
index 432b8df458..4758146b47 100644
--- a/TESTING/LIN/alasum.f
+++ b/TESTING/LIN/alasum.f
@@ -70,6 +70,7 @@
 *
 *  =====================================================================
       SUBROUTINE ALASUM( TYPE, NOUT, NFAIL, NRUN, NERRS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/alasvm.f b/TESTING/LIN/alasvm.f
index d9e5000134..930b779e8b 100644
--- a/TESTING/LIN/alasvm.f
+++ b/TESTING/LIN/alasvm.f
@@ -70,6 +70,7 @@
 *
 *  =====================================================================
       SUBROUTINE ALASVM( TYPE, NOUT, NFAIL, NRUN, NERRS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchkaa.F b/TESTING/LIN/cchkaa.F
index ec1534ed4e..a5a3428c14 100644
--- a/TESTING/LIN/cchkaa.F
+++ b/TESTING/LIN/cchkaa.F
@@ -69,6 +69,7 @@
 *> CLQ    8               List types on next line if 0 < NTYPES <  8
 *> CQL    8               List types on next line if 0 < NTYPES <  8
 *> CQP    6               List types on next line if 0 < NTYPES <  6
+*> ZQK   19               List types on next line if 0 < NTYPES < 19
 *> CTZ    3               List types on next line if 0 < NTYPES <  3
 *> CLS    6               List types on next line if 0 < NTYPES <  6
 *> CEQ
@@ -153,12 +154,11 @@ PROGRAM CCHKAA
      $                   NBVAL( MAXIN ), NBVAL2( MAXIN ),
      $                   NSVAL( MAXIN ), NVAL( MAXIN ), NXVAL( MAXIN ),
      $                   RANKVAL( MAXIN ), PIV( NMAX )
-      REAL               S( 2*NMAX )
-      COMPLEX            E( NMAX )
 *     ..
 *     .. Allocatable Arrays ..
       INTEGER AllocateStatus
-      REAL, DIMENSION(:), ALLOCATABLE :: RWORK
+      REAL, DIMENSION(:), ALLOCATABLE :: RWORK, S
+      COMPLEX, DIMENSION(:), ALLOCATABLE :: E
       COMPLEX, DIMENSION(:,:), ALLOCATABLE :: A, B, WORK
 *     ..
 *     .. External Functions ..
@@ -170,14 +170,14 @@ PROGRAM CCHKAA
       EXTERNAL           ALAREQ, CCHKEQ, CCHKGB, CCHKGE, CCHKGT, CCHKHE,
      $                   CCHKHE_ROOK, CCHKHE_RK, CCHKHE_AA, CCHKHP,
      $                   CCHKLQ, CCHKUNHR_COL, CCHKPB, CCHKPO, CCHKPS,
-     $                   CCHKPP, CCHKPT, CCHKQ3, CCHKQL, CCHKQR, CCHKRQ,
-     $                   CCHKSP, CCHKSY, CCHKSY_ROOK, CCHKSY_RK,
-     $                   CCHKSY_AA, CCHKTB,  CCHKTP, CCHKTR, CCHKTZ,
-     $                   CDRVGB, CDRVGE, CDRVGT, CDRVHE, CDRVHE_ROOK,
-     $                   CDRVHE_RK, CDRVHE_AA, CDRVHP, CDRVLS, CDRVPB,
-     $                   CDRVPO, CDRVPP, CDRVPT, CDRVSP, CDRVSY,
-     $                   CDRVSY_ROOK, CDRVSY_RK, CDRVSY_AA, ILAVER,
-     $                   CCHKQRT, CCHKQRTP
+     $                   CCHKPP, CCHKPT, CCHKQ3, CCHKQP3RK, CCHKQL,
+     $                   CCHKQR, CCHKRQ, CCHKSP, CCHKSY, CCHKSY_ROOK,
+     $                   CCHKSY_RK, CCHKSY_AA, CCHKTB, CCHKTP, CCHKTR,
+     $                   CCHKTZ, CDRVGB, CDRVGE, CDRVGT, CDRVHE,
+     $                   CDRVHE_ROOK, CDRVHE_RK, CDRVHE_AA, CDRVHP,
+     $                   CDRVLS, CDRVPB, CDRVPO, CDRVPP, CDRVPT, CDRVSP,
+     $                   CDRVSY, CDRVSY_ROOK, CDRVSY_RK, CDRVSY_AA,
+     $                   ILAVER, CCHKQRT, CCHKQRTP
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -203,6 +203,10 @@ PROGRAM CCHKAA
       IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
       ALLOCATE ( WORK( NMAX, NMAX+MAXRHS+10 ), STAT = AllocateStatus )
       IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
+      ALLOCATE ( E( NMAX ), STAT = AllocateStatus )
+      IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
+      ALLOCATE ( S( 2*NMAX ), STAT = AllocateStatus)
+      IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
       ALLOCATE ( RWORK( 150*NMAX+2*MAXRHS ), STAT = AllocateStatus )
       IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
 *     ..
@@ -1109,6 +1113,23 @@ PROGRAM CCHKAA
          ELSE
             WRITE( NOUT, FMT = 9989 )PATH
          END IF
+*
+      ELSE IF( LSAMEN( 2, C2, 'QK' ) ) THEN
+*
+*        QK: truncated QR factorization with pivoting
+*
+         NTYPES = 19
+         CALL ALAREQ( PATH, NMATS, DOTYPE, NTYPES, NIN, NOUT )
+*
+         IF( TSTCHK ) THEN
+            CALL CCHKQP3RK( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL,
+     $                   NNB, NBVAL, NXVAL, THRESH, A( 1, 1 ),
+     $                   A( 1, 2 ), B( 1, 1 ), B( 1, 2 ),
+     $                   S( 1 ), B( 1, 4 ),
+     $                   WORK, RWORK, IWORK, NOUT )
+         ELSE
+            WRITE( NOUT, FMT = 9989 )PATH
+         END IF
 *
       ELSE IF( LSAMEN( 2, C2, 'LS' ) ) THEN
 *
@@ -1211,6 +1232,8 @@ PROGRAM CCHKAA
 *
       DEALLOCATE (A, STAT = AllocateStatus)
       DEALLOCATE (B, STAT = AllocateStatus)
+      DEALLOCATE (E, STAT = AllocateStatus)
+      DEALLOCATE (S, STAT = AllocateStatus)
       DEALLOCATE (WORK, STAT = AllocateStatus)
       DEALLOCATE (RWORK,  STAT = AllocateStatus)
 *
@@ -1222,7 +1245,7 @@ PROGRAM CCHKAA
  9995 FORMAT( ' Invalid input value: ', A4, '=', I6, '; must be <=',
      $      I6 )
  9994 FORMAT( ' Tests of the COMPLEX LAPACK routines ',
-     $      / ' LAPACK VERSION ', I1, '.', I1, '.', I1,
+     $      / ' LAPACK VERSION ', I1, '.', I2, '.', I1,
      $      / / ' The following parameter values will be used:' )
  9993 FORMAT( 4X, A4, ':  ', 10I6, / 11X, 10I6 )
  9992 FORMAT( / ' Routines pass computational tests if test ratio is ',
diff --git a/TESTING/LIN/cchkeq.f b/TESTING/LIN/cchkeq.f
index e2f092fc6c..7e5cfad170 100644
--- a/TESTING/LIN/cchkeq.f
+++ b/TESTING/LIN/cchkeq.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE CCHKEQ( THRESH, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchkgb.f b/TESTING/LIN/cchkgb.f
index 9bb6f29b79..17e4a495e8 100644
--- a/TESTING/LIN/cchkgb.f
+++ b/TESTING/LIN/cchkgb.f
@@ -188,6 +188,7 @@
       SUBROUTINE CCHKGB( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NNS,
      $                   NSVAL, THRESH, TSTERR, A, LA, AFAC, LAFAC, B,
      $                   X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchkge.f b/TESTING/LIN/cchkge.f
index 0ee1c85c57..a8bace2b69 100644
--- a/TESTING/LIN/cchkge.f
+++ b/TESTING/LIN/cchkge.f
@@ -183,6 +183,7 @@
       SUBROUTINE CCHKGE( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NNS,
      $                   NSVAL, THRESH, TSTERR, NMAX, A, AFAC, AINV, B,
      $                   X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchkgt.f b/TESTING/LIN/cchkgt.f
index b6fd5e4b55..b6e0539a11 100644
--- a/TESTING/LIN/cchkgt.f
+++ b/TESTING/LIN/cchkgt.f
@@ -144,6 +144,7 @@
 *  =====================================================================
       SUBROUTINE CCHKGT( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   A, AF, B, X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchkhe.f b/TESTING/LIN/cchkhe.f
index 1ff0257579..61f1862f33 100644
--- a/TESTING/LIN/cchkhe.f
+++ b/TESTING/LIN/cchkhe.f
@@ -168,6 +168,7 @@
       SUBROUTINE CCHKHE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                   XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchkhe_aa_2stage.f b/TESTING/LIN/cchkhe_aa_2stage.f
index 30a61261f5..d79978e557 100644
--- a/TESTING/LIN/cchkhe_aa_2stage.f
+++ b/TESTING/LIN/cchkhe_aa_2stage.f
@@ -433,9 +433,9 @@ SUBROUTINE CCHKHE_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
 *                 block factorization, LWORK is the length of AINV.
 *
                   SRNAMT = 'CHETRF_AA_2STAGE'
-                  LWORK = MIN(N*NB, 3*NMAX*NMAX)
-                  CALL CHETRF_AA_2STAGE( UPLO, N, AFAC, LDA, 
-     $                                   AINV, (3*NB+1)*N, 
+                  LWORK = MIN( MAX( 1, N*NB ), 3*NMAX*NMAX)
+                  CALL CHETRF_AA_2STAGE( UPLO, N, AFAC, LDA,
+     $                                   AINV, MAX( 1, (3*NB+1)*N ),
      $                                   IWORK, IWORK( 1+N ),
      $                                   WORK, LWORK,
      $                                   INFO )
@@ -517,7 +517,6 @@ SUBROUTINE CCHKHE_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
                      CALL CLACPY( 'Full', N, NRHS, B, LDA, X, LDA )
 *
                      SRNAMT = 'CHETRS_AA_2STAGE'
-                     LWORK = MAX( 1, 3*N-2 )
                      CALL CHETRS_AA_2STAGE( UPLO, N, NRHS, AFAC, LDA,
      $                            AINV, (3*NB+1)*N, IWORK, IWORK( 1+N ),
      $                            X, LDA, INFO )
diff --git a/TESTING/LIN/cchkhe_rk.f b/TESTING/LIN/cchkhe_rk.f
index 4f9801f88d..a606af3ffb 100644
--- a/TESTING/LIN/cchkhe_rk.f
+++ b/TESTING/LIN/cchkhe_rk.f
@@ -174,6 +174,7 @@
       SUBROUTINE CCHKHE_RK( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                      THRESH, TSTERR, NMAX, A, AFAC, E, AINV, B,
      $                      X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchkhe_rook.f b/TESTING/LIN/cchkhe_rook.f
index 72a4a1d4d0..34692d2155 100644
--- a/TESTING/LIN/cchkhe_rook.f
+++ b/TESTING/LIN/cchkhe_rook.f
@@ -169,6 +169,7 @@
       SUBROUTINE CCHKHE_ROOK( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                        THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                        XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchkhp.f b/TESTING/LIN/cchkhp.f
index 8d7cf477a2..339dec2887 100644
--- a/TESTING/LIN/cchkhp.f
+++ b/TESTING/LIN/cchkhp.f
@@ -161,6 +161,7 @@
       SUBROUTINE CCHKHP( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, A, AFAC, AINV, B, X, XACT, WORK, RWORK,
      $                   IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchklq.f b/TESTING/LIN/cchklq.f
index 54107d0475..c400bdf7b4 100644
--- a/TESTING/LIN/cchklq.f
+++ b/TESTING/LIN/cchklq.f
@@ -193,6 +193,7 @@
       SUBROUTINE CCHKLQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   NRHS, THRESH, TSTERR, NMAX, A, AF, AQ, AL, AC,
      $                   B, X, XACT, TAU, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -235,7 +236,7 @@ SUBROUTINE CCHKLQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
       REAL               RESULT( NTESTS )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAERH, ALAHD, ALASUM, CERRLQ, CGELQS, CGET02,
+      EXTERNAL           ALAERH, ALAHD, ALASUM, CERRLQ, CGELS, CGET02,
      $                   CLACPY, CLARHS, CLATB4, CLATMS, CLQT01, CLQT02,
      $                   CLQT03, XLAENV
 *     ..
@@ -370,7 +371,7 @@ SUBROUTINE CCHKLQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                               WORK, LWORK, RWORK, RESULT( 3 ) )
                         NT = NT + 4
 *
-*                       If M>=N and K=N, call CGELQS to solve a system
+*                       If M<=N and K=M, call CGELS to solve a system
 *                       with NRHS right hand sides and compute the
 *                       residual.
 *
@@ -387,14 +388,20 @@ SUBROUTINE CCHKLQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
 *
                            CALL CLACPY( 'Full', M, NRHS, B, LDA, X,
      $                                  LDA )
-                           SRNAMT = 'CGELQS'
-                           CALL CGELQS( M, N, NRHS, AF, LDA, TAU, X,
-     $                                  LDA, WORK, LWORK, INFO )
 *
-*                          Check error code from CGELQS.
+*                          Reset AF to the original matrix. CGELS
+*                          factors the matrix before solving the system.
+*
+                           CALL CLACPY( 'Full', M, N, A, LDA, AF, LDA )
+*
+                           SRNAMT = 'CGELS'
+                           CALL CGELS( 'No transpose', M, N, NRHS, AF,
+     $                                 LDA, X, LDA, WORK, LWORK, INFO )
+*
+*                          Check error code from CGELS.
 *
                            IF( INFO.NE.0 )
-     $                        CALL ALAERH( PATH, 'CGELQS', INFO, 0, ' ',
+     $                        CALL ALAERH( PATH, 'CGELS', INFO, 0, 'N',
      $                                     M, N, NRHS, -1, NB, IMAT,
      $                                     NFAIL, NERRS, NOUT )
 *
diff --git a/TESTING/LIN/cchkpb.f b/TESTING/LIN/cchkpb.f
index 4d1ab6f4f9..877e88d6a5 100644
--- a/TESTING/LIN/cchkpb.f
+++ b/TESTING/LIN/cchkpb.f
@@ -165,6 +165,7 @@
       SUBROUTINE CCHKPB( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                   XACT, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchkpo.f b/TESTING/LIN/cchkpo.f
index 8cf85bf6e4..6c193f1604 100644
--- a/TESTING/LIN/cchkpo.f
+++ b/TESTING/LIN/cchkpo.f
@@ -165,6 +165,7 @@
       SUBROUTINE CCHKPO( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                   XACT, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchkpp.f b/TESTING/LIN/cchkpp.f
index 8b736e52b7..98c108d9fe 100644
--- a/TESTING/LIN/cchkpp.f
+++ b/TESTING/LIN/cchkpp.f
@@ -156,6 +156,7 @@
       SUBROUTINE CCHKPP( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, A, AFAC, AINV, B, X, XACT, WORK, RWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchkps.f b/TESTING/LIN/cchkps.f
index d77ffc0262..c7e364fb93 100644
--- a/TESTING/LIN/cchkps.f
+++ b/TESTING/LIN/cchkps.f
@@ -151,6 +151,7 @@
       SUBROUTINE CCHKPS( DOTYPE, NN, NVAL, NNB, NBVAL, NRANK, RANKVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, PERM, PIV, WORK,
      $                   RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchkpt.f b/TESTING/LIN/cchkpt.f
index 2ec8020646..16ccca2c2c 100644
--- a/TESTING/LIN/cchkpt.f
+++ b/TESTING/LIN/cchkpt.f
@@ -144,6 +144,7 @@
 *  =====================================================================
       SUBROUTINE CCHKPT( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   A, D, E, B, X, XACT, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -319,15 +320,15 @@ SUBROUTINE CCHKPT( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
 *                 elements.
 *
                   IF( IZERO.EQ.1 ) THEN
-                     D( 1 ) = Z( 2 )
+                     D( 1 ) = REAL( Z( 2 ) )
                      IF( N.GT.1 )
      $                  E( 1 ) = Z( 3 )
                   ELSE IF( IZERO.EQ.N ) THEN
                      E( N-1 ) = Z( 1 )
-                     D( N ) = Z( 2 )
+                     D( N ) = REAL( Z( 2 ) )
                   ELSE
                      E( IZERO-1 ) = Z( 1 )
-                     D( IZERO ) = Z( 2 )
+                     D( IZERO ) = REAL( Z( 2 ) )
                      E( IZERO ) = Z( 3 )
                   END IF
                END IF
diff --git a/TESTING/LIN/cchkq3.f b/TESTING/LIN/cchkq3.f
index e065655393..2fe44658ad 100644
--- a/TESTING/LIN/cchkq3.f
+++ b/TESTING/LIN/cchkq3.f
@@ -155,6 +155,7 @@
       SUBROUTINE CCHKQ3( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   THRESH, A, COPYA, S, TAU, WORK, RWORK,
      $                   IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchkql.f b/TESTING/LIN/cchkql.f
index 34c6ca6a71..8b029263b7 100644
--- a/TESTING/LIN/cchkql.f
+++ b/TESTING/LIN/cchkql.f
@@ -193,6 +193,7 @@
       SUBROUTINE CCHKQL( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   NRHS, THRESH, TSTERR, NMAX, A, AF, AQ, AL, AC,
      $                   B, X, XACT, TAU, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchkqp3rk.f b/TESTING/LIN/cchkqp3rk.f
new file mode 100644
index 0000000000..b794d4664c
--- /dev/null
+++ b/TESTING/LIN/cchkqp3rk.f
@@ -0,0 +1,801 @@
+*> \brief \b CCHKQP3RK
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Definition:
+*  ===========
+*
+*      SUBROUTINE CCHKQP3RK( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL,
+*     $                      NNB, NBVAL, NXVAL, THRESH, A, COPYA,
+*     $                      B, COPYB, S, TAU,
+*     $                      WORK, RWORK, IWORK, NOUT )
+*      IMPLICIT NONE
+*
+*       .. Scalar Arguments ..
+*       INTEGER            NM, NN, NNB, NOUT
+*       REAL               THRESH
+*       ..
+*       .. Array Arguments ..
+*       LOGICAL            DOTYPE( * )
+*       INTEGER            IWORK( * ), MVAL( * ), NBVAL( * ), NVAL( * ),
+*      $                   NXVAL( * )
+*       REAL               S( * ), RWORK( * )
+*       COMPLEX            A( * ), COPYA( * ), TAU( * ), WORK( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> CCHKQP3RK tests CGEQP3RK.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] DOTYPE
+*> \verbatim
+*>          DOTYPE is LOGICAL array, dimension (NTYPES)
+*>          The matrix types to be used for testing.  Matrices of type j
+*>          (for 1 <= j <= NTYPES) are used for testing if DOTYPE(j) =
+*>          .TRUE.; if DOTYPE(j) = .FALSE., then type j is not used.
+*> \endverbatim
+*>
+*> \param[in] NM
+*> \verbatim
+*>          NM is INTEGER
+*>          The number of values of M contained in the vector MVAL.
+*> \endverbatim
+*>
+*> \param[in] MVAL
+*> \verbatim
+*>          MVAL is INTEGER array, dimension (NM)
+*>          The values of the matrix row dimension M.
+*> \endverbatim
+*>
+*> \param[in] NN
+*> \verbatim
+*>          NN is INTEGER
+*>          The number of values of N contained in the vector NVAL.
+*> \endverbatim
+*>
+*> \param[in] NVAL
+*> \verbatim
+*>          NVAL is INTEGER array, dimension (NN)
+*>          The values of the matrix column dimension N.
+*> \endverbatim
+*>
+*> \param[in] NNS
+*> \verbatim
+*>          NNS is INTEGER
+*>          The number of values of NRHS contained in the vector NSVAL.
+*> \endverbatim
+*>
+*> \param[in] NSVAL
+*> \verbatim
+*>          NSVAL is INTEGER array, dimension (NNS)
+*>          The values of the number of right hand sides NRHS.
+*> \endverbatim
+*> \param[in] NNB
+*> \verbatim
+*>          NNB is INTEGER
+*>          The number of values of NB and NX contained in the
+*>          vectors NBVAL and NXVAL.  The blocking parameters are used
+*>          in pairs (NB,NX).
+*> \endverbatim
+*>
+*> \param[in] NBVAL
+*> \verbatim
+*>          NBVAL is INTEGER array, dimension (NNB)
+*>          The values of the blocksize NB.
+*> \endverbatim
+*>
+*> \param[in] NXVAL
+*> \verbatim
+*>          NXVAL is INTEGER array, dimension (NNB)
+*>          The values of the crossover point NX.
+*> \endverbatim
+*>
+*> \param[in] THRESH
+*> \verbatim
+*>          THRESH is REAL
+*>          The threshold value for the test ratios.  A result is
+*>          included in the output file if RESULT >= THRESH.  To have
+*>          every test ratio printed, use THRESH = 0.
+*> \endverbatim
+*>
+*> \param[out] A
+*> \verbatim
+*>          A is COMPLEX array, dimension (MMAX*NMAX)
+*>          where MMAX is the maximum value of M in MVAL and NMAX is the
+*>          maximum value of N in NVAL.
+*> \endverbatim
+*>
+*> \param[out] COPYA
+*> \verbatim
+*>          COPYA is COMPLEX array, dimension (MMAX*NMAX)
+*> \endverbatim
+*>
+*> \param[out] B
+*> \verbatim
+*>          B is COMPLEX array, dimension (MMAX*NSMAX)
+*>          where MMAX is the maximum value of M in MVAL and NSMAX is the
+*>          maximum value of NRHS in NSVAL.
+*> \endverbatim
+*>
+*> \param[out] COPYB
+*> \verbatim
+*>          COPYB is COMPLEX array, dimension (MMAX*NSMAX)
+*> \endverbatim
+*>
+*> \param[out] S
+*> \verbatim
+*>          S is REAL array, dimension
+*>                      (min(MMAX,NMAX))
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is COMPLEX array, dimension (MMAX)
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX array, dimension
+*>                      (max(M*max(M,N) + 4*min(M,N) + max(M,N)))
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is REAL array, dimension (4*NMAX)
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (2*NMAX)
+*> \endverbatim
+*>
+*> \param[in] NOUT
+*> \verbatim
+*>          NOUT is INTEGER
+*>          The unit number for output.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup complex_lin
+*
+*  =====================================================================
+      SUBROUTINE CCHKQP3RK( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL,
+     $                      NNB, NBVAL, NXVAL, THRESH, A, COPYA,
+     $                      B, COPYB, S, TAU,
+     $                      WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
+*
+*  -- LAPACK test routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            NM, NN, NNB, NNS, NOUT
+      REAL               THRESH
+*     ..
+*     .. Array Arguments ..
+      LOGICAL            DOTYPE( * )
+      INTEGER            IWORK( * ), NBVAL( * ), MVAL( * ), NVAL( * ),
+     $                   NSVAL( * ), NXVAL( * )
+      REAL               S( * ), RWORK( * )
+      COMPLEX            A( * ), COPYA( * ), B( * ), COPYB( * ),
+     $                   TAU( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      INTEGER            NTYPES
+      PARAMETER          ( NTYPES = 19 )
+      INTEGER            NTESTS
+      PARAMETER          ( NTESTS = 5 )
+      REAL               ONE, ZERO, BIGNUM
+      COMPLEX            CONE, CZERO
+      PARAMETER          ( ONE = 1.0E+0, ZERO = 0.0E+0,
+     $                   CZERO = ( 0.0E+0, 0.0E+0 ),
+     $                   CONE = ( 1.0E+0, 0.0E+0 ),
+     $                   BIGNUM = 1.0E+38 )
+*     ..
+*     .. Local Scalars ..
+      CHARACTER          DIST, TYPE
+      CHARACTER*3        PATH
+      INTEGER            I, IHIGH, ILOW, IM, IMAT, IN, INC_ZERO,
+     $                   INB, IND_OFFSET_GEN,
+     $                   IND_IN, IND_OUT, INS, INFO,
+     $                   ISTEP, J, J_INC, J_FIRST_NZ, JB_ZERO,
+     $                   KFACT, KL, KMAX, KU, LDA, LW, LWORK,
+     $                   LWORK_MQR, M, MINMN, MINMNB_GEN, MODE, N,
+     $                   NB, NB_ZERO, NERRS, NFAIL, NB_GEN, NRHS,
+     $                   NRUN, NX, T
+      REAL               ANORM, CNDNUM, EPS, ABSTOL, RELTOL,
+     $                   DTEMP, MAXC2NRMK, RELMAXC2NRMK
+*     ..
+*     .. Local Arrays ..
+      INTEGER            ISEED( 4 ), ISEEDY( 4 )
+      REAL               RESULT( NTESTS ), RDUMMY( 1 )
+*     ..
+*     .. External Functions ..
+      REAL               SLAMCH, CQPT01, CQRT11, CQRT12, CLANGE
+      EXTERNAL           SLAMCH, CQPT01, CQRT11, CQRT12, CLANGE
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ALAERH, ALAHD, ALASUM, SLAORD, ICOPY, CAXPY,
+     $                   XLAENV, CGEQP3RK, CLACPY, CLASET, CLATB4,
+     $                   CLATMS, CUNMQR, CSWAP
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, MIN, MOD, REAL
+*     ..
+*     .. Scalars in Common ..
+      LOGICAL            LERR, OK
+      CHARACTER*32       SRNAMT
+      INTEGER            INFOT, IOUNIT, CUNMQR_LWORK
+*     ..
+*     .. Common blocks ..
+      COMMON             / INFOC / INFOT, IOUNIT, OK, LERR
+      COMMON             / SRNAMC / SRNAMT
+*     ..
+*     .. Data statements ..
+      DATA               ISEEDY / 1988, 1989, 1990, 1991 /
+*     ..
+*     .. Executable Statements ..
+*
+*     Initialize constants and the random number seed.
+*
+      PATH( 1: 1 ) = 'Complex precision'
+      PATH( 2: 3 ) = 'QK'
+      NRUN = 0
+      NFAIL = 0
+      NERRS = 0
+      DO  I = 1, 4
+         ISEED( I ) = ISEEDY( I )
+      END DO
+      EPS = SLAMCH( 'Epsilon' )
+      INFOT = 0
+*
+      DO IM = 1, NM
+*
+*        Do for each value of M in MVAL.
+*
+         M = MVAL( IM )
+         LDA = MAX( 1, M )
+*
+         DO IN = 1, NN
+*
+*           Do for each value of N in NVAL.
+*
+            N = NVAL( IN )
+            MINMN = MIN( M, N )
+            LWORK = MAX( 1, M*MAX( M, N )+4*MINMN+MAX( M, N ),
+     $                   M*N + 2*MINMN + 4*N )
+*
+            DO INS = 1, NNS
+               NRHS = NSVAL( INS )
+*
+*                 Set up parameters with CLATB4 and generate
+*                 M-by-NRHS B matrix with CLATMS.
+*                 IMAT = 14:
+*                 Random matrix, CNDNUM = 2, NORM = ONE,
+*                 MODE = 3 (geometric distribution of singular values).
+*
+                  CALL CLATB4( PATH, 14, M, NRHS, TYPE, KL, KU, ANORM,
+     $                         MODE, CNDNUM, DIST )
+*
+                  SRNAMT = 'CLATMS'
+                  CALL CLATMS( M, NRHS, DIST, ISEED, TYPE, S, MODE,
+     $                         CNDNUM, ANORM, KL, KU, 'No packing',
+     $                         COPYB, LDA, WORK, INFO )
+*
+*                 Check error code from CLATMS.
+*
+                  IF( INFO.NE.0 ) THEN
+                     CALL ALAERH( PATH, 'CLATMS', INFO, 0, ' ', M,
+     $                            NRHS, -1, -1, -1, 6, NFAIL, NERRS,
+     $                            NOUT )
+                     CYCLE
+                  END IF
+*
+               DO IMAT = 1, NTYPES
+*
+*              Do the tests only if DOTYPE( IMAT ) is true.
+*
+               IF( .NOT.DOTYPE( IMAT ) )
+     $            CYCLE
+*
+*              The type of distribution used to generate the random
+*              eigen-/singular values:
+*              ( 'S' for symmetric distribution ) => UNIFORM( -1, 1 )
+*
+*           Do for each type of NON-SYMMETRIC matrix:                               CNDNUM                     NORM                                     MODE
+*            1. Zero matrix
+*            2. Random, Diagonal, CNDNUM = 2                                        CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            3. Random, Upper triangular, CNDNUM = 2                                CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            4. Random, Lower triangular, CNDNUM = 2                                CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            5. Random, First column is zero, CNDNUM = 2                            CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            6. Random, Last MINMN column is zero, CNDNUM = 2                       CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            7. Random, Last N column is zero, CNDNUM = 2                           CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            8. Random, Middle column in MINMN is zero, CNDNUM = 2                  CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            9. Random, First half of MINMN columns are zero, CNDNUM = 2            CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           10. Random, Last columns are zero starting from MINMN/2+1, CNDNUM = 2   CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           11. Random, Half MINMN columns in the middle are zero starting
+*                  from  MINMN/2-(MINMN/2)/2+1, CNDNUM = 2                          CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           12. Random, Odd columns are ZERO, CNDNUM = 2                            CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           13. Random, Even columns are ZERO, CNDNUM = 2                           CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           14. Random, CNDNUM = 2                                                  CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           15. Random, CNDNUM = sqrt(0.1/EPS)                                      CNDNUM = BADC1 = sqrt(0.1/EPS)  ONE                                      3 ( geometric distribution of singular values )
+*           16. Random, CNDNUM = 0.1/EPS                                            CNDNUM = BADC2 = 0.1/EPS        ONE                                      3 ( geometric distribution of singular values )
+*           17. Random, CNDNUM = 0.1/EPS,                                           CNDNUM = BADC2 = 0.1/EPS        ONE                                      2 ( one small singular value, S(N)=1/CNDNUM )
+*                 one small singular value S(N)=1/CNDNUM
+*           18. Random, CNDNUM = 2, scaled near underflow                           CNDNUM = 2                      SMALL = SAFMIN
+*           19. Random, CNDNUM = 2, scaled near overflow                            CNDNUM = 2                      LARGE = 1.0/( 0.25 * ( SAFMIN / EPS ) )  3 ( geometric distribution of singular values )
+*
+               IF( IMAT.EQ.1 ) THEN
+*
+*                 Matrix 1: Zero matrix
+*
+                  CALL CLASET( 'Full', M, N, CZERO, CZERO, COPYA, LDA )
+                  DO I = 1, MINMN
+                     S( I ) = ZERO
+                  END DO
+*
+               ELSE IF( (IMAT.GE.2 .AND. IMAT.LE.4 )
+     $                  .OR. (IMAT.GE.14 .AND. IMAT.LE.19 ) ) THEN
+*
+*                 Matrices 2-5.
+*
+*                 Set up parameters with DLATB4 and generate a test
+*                 matrix with CLATMS.
+*
+                  CALL CLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM,
+     $                         MODE, CNDNUM, DIST )
+*
+                  SRNAMT = 'CLATMS'
+                  CALL CLATMS( M, N, DIST, ISEED, TYPE, S, MODE,
+     $                         CNDNUM, ANORM, KL, KU, 'No packing',
+     $                         COPYA, LDA, WORK, INFO )
+*
+*                 Check error code from CLATMS.
+*
+                  IF( INFO.NE.0 ) THEN
+                     CALL ALAERH( PATH, 'CLATMS', INFO, 0, ' ', M, N,
+     $                            -1, -1, -1, IMAT, NFAIL, NERRS,
+     $                            NOUT )
+                     CYCLE
+                  END IF
+*
+                  CALL SLAORD( 'Decreasing', MINMN, S, 1 )
+*
+               ELSE IF( MINMN.GE.2
+     $                  .AND. IMAT.GE.5 .AND. IMAT.LE.13 ) THEN
+*
+*                 Rectangular matrices 5-13 that contain zero columns,
+*                 only for matrices MINMN >=2.
+*
+*                 JB_ZERO is the column index of ZERO block.
+*                 NB_ZERO is the column block size of ZERO block.
+*                 NB_GEN is the column blcok size of the
+*                 generated block.
+*                 J_INC in the non_zero column index increment
+*                 for matrix 12 and 13.
+*                 J_FIRS_NZ is the index of the first non-zero
+*                 column.
+*
+                  IF( IMAT.EQ.5 ) THEN
+*
+*                    First column is zero.
+*
+                     JB_ZERO = 1
+                     NB_ZERO = 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.6 ) THEN
+*
+*                    Last column MINMN is zero.
+*
+                     JB_ZERO = MINMN
+                     NB_ZERO = 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.7 ) THEN
+*
+*                    Last column N is zero.
+*
+                     JB_ZERO = N
+                     NB_ZERO = 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.8 ) THEN
+*
+*                    Middle column in MINMN is zero.
+*
+                     JB_ZERO = MINMN / 2 + 1
+                     NB_ZERO = 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.9 ) THEN
+*
+*                    First half of MINMN columns is zero.
+*
+                     JB_ZERO = 1
+                     NB_ZERO = MINMN / 2
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.10 ) THEN
+*
+*                    Last columns are zero columns,
+*                    starting from (MINMN / 2 + 1) column.
+*
+                     JB_ZERO = MINMN / 2 + 1
+                     NB_ZERO = N - JB_ZERO + 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.11 ) THEN
+*
+*                    Half of the columns in the middle of MINMN
+*                    columns is zero, starting from
+*                    MINMN/2 - (MINMN/2)/2 + 1 column.
+*
+                     JB_ZERO = MINMN / 2 - (MINMN / 2) / 2 + 1
+                     NB_ZERO = MINMN / 2
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.12 ) THEN
+*
+*                    Odd-numbered columns are zero,
+*
+                     NB_GEN = N / 2
+                     NB_ZERO = N - NB_GEN
+                     J_INC = 2
+                     J_FIRST_NZ = 2
+*
+                  ELSE IF( IMAT.EQ.13 ) THEN
+*
+*                    Even-numbered columns are zero.
+*
+                     NB_ZERO = N / 2
+                     NB_GEN = N - NB_ZERO
+                     J_INC = 2
+                     J_FIRST_NZ = 1
+*
+                  END IF
+*
+*
+*                 1) Set the first NB_ZERO columns in COPYA(1:M,1:N)
+*                    to zero.
+*
+                  CALL CLASET( 'Full', M, NB_ZERO, CZERO, CZERO,
+     $                         COPYA, LDA )
+*
+*                    2) Generate an M-by-(N-NB_ZERO) matrix with the
+*                       chosen singular value distribution
+*                       in COPYA(1:M,NB_ZERO+1:N).
+*
+                  CALL CLATB4( PATH, IMAT, M, NB_GEN, TYPE, KL, KU,
+     $                         ANORM, MODE, CNDNUM, DIST )
+*
+                  SRNAMT = 'CLATMS'
+*
+                  IND_OFFSET_GEN = NB_ZERO * LDA
+*
+                  CALL CLATMS( M, NB_GEN, DIST, ISEED, TYPE, S, MODE,
+     $                        CNDNUM, ANORM, KL, KU, 'No packing',
+     $                        COPYA( IND_OFFSET_GEN + 1 ), LDA,
+     $                        WORK, INFO )
+*
+*                 Check error code from CLATMS.
+*
+                  IF( INFO.NE.0 ) THEN
+                     CALL ALAERH( PATH, 'CLATMS', INFO, 0, ' ', M,
+     $                            NB_GEN, -1, -1, -1, IMAT, NFAIL,
+     $                            NERRS, NOUT )
+                     CYCLE
+                  END IF
+*
+*                 3) Swap the gererated colums from the right side
+*                 NB_GEN-size block in COPYA into correct column
+*                 positions.
+*
+                  IF( IMAT.EQ.6
+     $                    .OR. IMAT.EQ.7
+     $                    .OR. IMAT.EQ.8
+     $                    .OR. IMAT.EQ.10
+     $                    .OR. IMAT.EQ.11 ) THEN
+*
+*                    Move by swapping the generated columns
+*                    from the right NB_GEN-size block from
+*                    (NB_ZERO+1:NB_ZERO+JB_ZERO)
+*                    into columns (1:JB_ZERO-1).
+*
+                     DO J = 1, JB_ZERO-1, 1
+                        CALL CSWAP( M,
+     $                        COPYA( ( NB_ZERO+J-1)*LDA+1), 1,
+     $                        COPYA( (J-1)*LDA + 1 ), 1 )
+                     END DO
+*
+                  ELSE IF( IMAT.EQ.12 .OR. IMAT.EQ.13 ) THEN
+*
+*                    ( IMAT = 12, Odd-numbered ZERO columns. )
+*                    Swap the generated columns from the right
+*                    NB_GEN-size block into the even zero colums in the
+*                    left NB_ZERO-size block.
+*
+*                    ( IMAT = 13, Even-numbered ZERO columns. )
+*                    Swap the generated columns from the right
+*                    NB_GEN-size block into the odd zero colums in the
+*                    left NB_ZERO-size block.
+*
+                     DO J = 1, NB_GEN, 1
+                        IND_OUT = ( NB_ZERO+J-1 )*LDA + 1
+                        IND_IN = ( J_INC*(J-1)+(J_FIRST_NZ-1) )*LDA
+     $                            + 1
+                        CALL CSWAP( M,
+     $                              COPYA( IND_OUT ), 1,
+     $                              COPYA( IND_IN), 1 )
+                        END DO
+*
+                  END IF
+*
+*                 5) Order the singular values generated by
+*                    DLAMTS in decreasing order and add trailing zeros
+*                    that correspond to zero columns.
+*                    The total number of singular values is MINMN.
+*
+                  MINMNB_GEN = MIN( M, NB_GEN )
+*
+                  CALL SLAORD( 'Decreasing', MINMNB_GEN, S, 1 )
+
+                  DO I = MINMNB_GEN+1, MINMN
+                     S( I ) = ZERO
+                  END DO
+*
+               ELSE
+*
+*                    IF(MINMN.LT.2) skip this size for this matrix type.
+*
+                     CYCLE
+               END IF
+*
+*              Initialize a copy array for a pivot array for DGEQP3RK.
+*
+               DO I = 1, N
+                  IWORK( I ) = 0
+               END DO
+*
+               DO INB = 1, NNB
+*
+*                 Do for each pair of values (NB,NX) in NBVAL and NXVAL.
+*
+                  NB = NBVAL( INB )
+                  CALL XLAENV( 1, NB )
+                  NX = NXVAL( INB )
+                  CALL XLAENV( 3, NX )
+*
+*                 We do MIN(M,N)+1 because we need a test for KMAX > N,
+*                 when KMAX is larger than MIN(M,N), KMAX should be
+*                 KMAX = MIN(M,N)
+*
+                  DO KMAX = 0, MIN(M,N)+1
+*
+*                 Get a working copy of COPYA into A( 1:M,1:N ).
+*                 Get a working copy of COPYB into A( 1:M, (N+1):NRHS ).
+*                 Get a working copy of COPYB into into B( 1:M, 1:NRHS ).
+*                 Get a working copy of IWORK(1:N) awith zeroes into
+*                 which is going to be used as pivot array IWORK( N+1:2N ).
+*                 NOTE: IWORK(2N+1:3N) is going to be used as a WORK array
+*                 for the routine.
+*
+                  CALL CLACPY( 'All', M, N, COPYA, LDA, A, LDA )
+                  CALL CLACPY( 'All', M, NRHS, COPYB, LDA,
+     $                         A( LDA*N + 1 ),  LDA )
+                  CALL CLACPY( 'All', M, NRHS, COPYB, LDA,
+     $                         B,  LDA )
+                  CALL ICOPY( N, IWORK( 1 ), 1, IWORK( N+1 ), 1 )
+                  DO I = 1, NTESTS
+                    RESULT( I ) = ZERO
+                  END DO
+*
+                  ABSTOL = -1.0
+                  RELTOl = -1.0
+*
+*                 Compute the QR factorization with pivoting of A
+*
+                  LW = MAX( 1, MAX( 2*N + NB*( N+NRHS+1 ),
+     $                              3*N + NRHS - 1 ) )
+*
+*                 Compute CGEQP3RK factorization of A.
+*
+                  SRNAMT = 'CGEQP3RK'
+                  CALL CGEQP3RK( M, N, NRHS, KMAX, ABSTOL, RELTOL,
+     $                           A, LDA, KFACT, MAXC2NRMK,
+     $                           RELMAXC2NRMK, IWORK( N+1 ), TAU,
+     $                           WORK, LW, RWORK, IWORK( 2*N+1 ),
+     $                           INFO )
+*
+*                 Check error code from CGEQP3RK.
+*
+                  IF( INFO.LT.0 )
+     $               CALL ALAERH( PATH, 'CGEQP3RK', INFO, 0, ' ',
+     $                            M, N, NX, -1, NB, IMAT,
+     $                            NFAIL, NERRS, NOUT )
+*
+                  IF( KFACT.EQ.MINMN ) THEN
+*
+*                 Compute test 1:
+*
+*                 This test in only for the full rank factorization of
+*                 the matrix A.
+*
+*                 Array S(1:min(M,N)) contains svd(A) the sigular values
+*                 of the original matrix A in decreasing absolute value
+*                 order. The test computes svd(R), the vector sigular
+*                 values of the upper trapezoid of A(1:M,1:N) that
+*                 contains the factor R, in decreasing order. The test
+*                 returns the ratio:
+*
+*                 2-norm(svd(R) - svd(A)) / ( max(M,N) * 2-norm(svd(A)) * EPS )
+*
+                     RESULT( 1 ) = CQRT12( M, N, A, LDA, S, WORK,
+     $                                     LWORK , RWORK )
+*
+                     NRUN = NRUN + 1
+*
+*                   End test 1
+*
+                  END IF
+
+*                 Compute test 2:
+*
+*                 The test returns the ratio:
+*
+*                 1-norm( A*P - Q*R ) / ( max(M,N) * 1-norm(A) * EPS )
+*
+                  RESULT( 2 ) = CQPT01( M, N, KFACT, COPYA, A, LDA, TAU,
+     $                                  IWORK( N+1 ), WORK, LWORK )
+*
+*                 Compute test 3:
+*
+*                 The test returns the ratio:
+*
+*                 1-norm( Q**T * Q - I ) / ( M * EPS )
+*
+                  RESULT( 3 ) = CQRT11( M, KFACT, A, LDA, TAU, WORK,
+     $                                  LWORK )
+*
+                  NRUN = NRUN + 2
+*
+*                 Compute test 4:
+*
+*                 This test is only for the factorizations with the
+*                 rank greater than 2.
+*                 The elements on the diagonal of R should be non-
+*                 increasing.
+*
+*                 The test returns the ratio:
+*
+*                 Returns 1.0D+100 if abs(R(K+1,K+1)) > abs(R(K,K)),
+*                 K=1:KFACT-1
+*
+                  IF( MIN(KFACT, MINMN).GE.2 ) THEN
+*
+                     DO J = 1, KFACT-1, 1
+*
+                        DTEMP = (( ABS( A( (J-1)*LDA+J ) ) -
+     $                          ABS( A( (J)*LDA+J+1 ) ) ) /
+     $                          ABS( A(1) ) )
+*
+                        IF( DTEMP.LT.ZERO ) THEN
+                           RESULT( 4 ) = BIGNUM
+                        END IF
+*
+                     END DO
+*
+                     NRUN = NRUN + 1
+*
+*                    End test 4.
+*
+                  END IF
+*
+*                 Compute test 5:
+*
+*                 This test in only for matrix A with min(M,N) > 0.
+*
+*                 The test returns the ratio:
+*
+*                 1-norm(Q**T * B - Q**T * B ) /
+*                       ( M * EPS )
+*
+*                 (1) Compute B:=Q**T * B in the matrix B.
+*
+                  IF( MINMN.GT.0 ) THEN
+*
+                     LWORK_MQR = MAX(1, NRHS)
+                     CALL CUNMQR( 'Left', 'Conjugate transpose',
+     $                            M, NRHS, KFACT, A, LDA, TAU, B, LDA,
+     $                            WORK, LWORK_MQR, INFO )
+*
+                     DO I = 1, NRHS
+*
+*                       Compare N+J-th column of A and J-column of B.
+*
+                        CALL CAXPY( M, -CONE, A( ( N+I-1 )*LDA+1 ), 1,
+     $                              B( ( I-1 )*LDA+1 ), 1 )
+                     END DO
+*
+                     RESULT( 5 ) = ABS(
+     $                  CLANGE( 'One-norm', M, NRHS, B, LDA, RDUMMY ) /
+     $                  ( REAL( M )*SLAMCH( 'Epsilon' ) ) )
+*
+                     NRUN = NRUN + 1
+*
+*                    End compute test 5.
+*
+                  END IF
+*
+*                 Print information about the tests that did not pass
+*                 the threshold.
+*
+                  DO T = 1, NTESTS
+                     IF( RESULT( T ).GE.THRESH ) THEN
+                        IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
+     $                     CALL ALAHD( NOUT, PATH )
+                        WRITE( NOUT, FMT = 9999 ) 'CGEQP3RK', M, N,
+     $                      NRHS, KMAX, ABSTOL, RELTOL,
+     $                      NB, NX, IMAT, T, RESULT( T )
+                        NFAIL = NFAIL + 1
+                     END IF
+                  END DO
+*
+*                 END DO KMAX = 1, MIN(M,N)+1
+*
+                  END DO
+*
+*                 END DO for INB = 1, NNB
+*
+               END DO
+*
+*              END DO  for IMAT = 1, NTYPES
+*
+               END DO
+*
+*              END DO for INS = 1, NNS
+*
+            END DO
+*
+*           END DO for IN = 1, NN
+*
+         END DO
+*
+*        END DO for IM = 1, NM
+*
+      END DO
+*
+*     Print a summary of the results.
+*
+      CALL ALASUM( PATH, NOUT, NFAIL, NRUN, NERRS )
+*
+ 9999 FORMAT( 1X, A, ' M =', I5, ', N =', I5, ', NRHS =', I5,
+     $        ', KMAX =', I5, ', ABSTOL =', G12.5,
+     $        ', RELTOL =', G12.5, ', NB =', I4, ', NX =', I4,
+     $        ', type ', I2, ', test ', I2, ', ratio =', G12.5 )
+*
+*     End of CCHKQP3RK
+*
+      END
diff --git a/TESTING/LIN/cchkqr.f b/TESTING/LIN/cchkqr.f
index c6bfec9d2a..2f3e640005 100644
--- a/TESTING/LIN/cchkqr.f
+++ b/TESTING/LIN/cchkqr.f
@@ -198,6 +198,7 @@
       SUBROUTINE CCHKQR( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   NRHS, THRESH, TSTERR, NMAX, A, AF, AQ, AR, AC,
      $                   B, X, XACT, TAU, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -244,7 +245,7 @@ SUBROUTINE CCHKQR( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
       EXTERNAL           CGENND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAERH, ALAHD, ALASUM, CERRQR, CGEQRS, CGET02,
+      EXTERNAL           ALAERH, ALAHD, ALASUM, CERRQR, CGELS, CGET02,
      $                   CLACPY, CLARHS, CLATB4, CLATMS, CQRT01,
      $                   CQRT01P, CQRT02, CQRT03, XLAENV
 *     ..
@@ -388,7 +389,7 @@ SUBROUTINE CCHKQR( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                               WORK, LWORK, RWORK, RESULT( 3 ) )
                         NT = NT + 4
 *
-*                       If M>=N and K=N, call CGEQRS to solve a system
+*                       If M>=N and K=N, call CGELS to solve a system
 *                       with NRHS right hand sides and compute the
 *                       residual.
 *
@@ -405,14 +406,20 @@ SUBROUTINE CCHKQR( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
 *
                            CALL CLACPY( 'Full', M, NRHS, B, LDA, X,
      $                                  LDA )
-                           SRNAMT = 'CGEQRS'
-                           CALL CGEQRS( M, N, NRHS, AF, LDA, TAU, X,
-     $                                  LDA, WORK, LWORK, INFO )
 *
-*                          Check error code from CGEQRS.
+*                          Reset AF to the original matrix. CGELS
+*                          factors the matrix before solving the system.
+*
+                           CALL CLACPY( 'Full', M, N, A, LDA, AF, LDA )
+*
+                           SRNAMT = 'CGELS'
+                           CALL CGELS( 'No transpose', M, N, NRHS, AF,
+     $                                 LDA, X, LDA, WORK, LWORK, INFO )
+*
+*                          Check error code from CGELS.
 *
                            IF( INFO.NE.0 )
-     $                        CALL ALAERH( PATH, 'CGEQRS', INFO, 0, ' ',
+     $                        CALL ALAERH( PATH, 'CGELS', INFO, 0, 'N',
      $                                     M, N, NRHS, -1, NB, IMAT,
      $                                     NFAIL, NERRS, NOUT )
 *
diff --git a/TESTING/LIN/cchkrfp.f b/TESTING/LIN/cchkrfp.f
index 58d55c31c9..a926380d4c 100644
--- a/TESTING/LIN/cchkrfp.f
+++ b/TESTING/LIN/cchkrfp.f
@@ -56,6 +56,7 @@
 *
 *  =====================================================================
       PROGRAM CCHKRFP
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -276,7 +277,7 @@ PROGRAM CCHKRFP
  9995 FORMAT( ' !! Invalid input value: ', A4, '=', I6, '; must be <=',
      $      I6 )
  9994 FORMAT( /  ' Tests of the COMPLEX LAPACK RFP routines ',
-     $      / ' LAPACK VERSION ', I1, '.', I1, '.', I1,
+     $      / ' LAPACK VERSION ', I1, '.', I2, '.', I1,
      $      / / ' The following parameter values will be used:' )
  9993 FORMAT( 4X, A4, ':  ', 10I6, / 11X, 10I6 )
  9992 FORMAT( / ' Routines pass computational tests if test ratio is ',
diff --git a/TESTING/LIN/cchkrq.f b/TESTING/LIN/cchkrq.f
index 48050c51f9..4d77d192fe 100644
--- a/TESTING/LIN/cchkrq.f
+++ b/TESTING/LIN/cchkrq.f
@@ -198,6 +198,7 @@
       SUBROUTINE CCHKRQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   NRHS, THRESH, TSTERR, NMAX, A, AF, AQ, AR, AC,
      $                   B, X, XACT, TAU, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchksp.f b/TESTING/LIN/cchksp.f
index 584cf426cc..7c0a44c78a 100644
--- a/TESTING/LIN/cchksp.f
+++ b/TESTING/LIN/cchksp.f
@@ -161,6 +161,7 @@
       SUBROUTINE CCHKSP( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, A, AFAC, AINV, B, X, XACT, WORK, RWORK,
      $                   IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchksy.f b/TESTING/LIN/cchksy.f
index c933f0c967..ce69f88b8f 100644
--- a/TESTING/LIN/cchksy.f
+++ b/TESTING/LIN/cchksy.f
@@ -168,6 +168,7 @@
       SUBROUTINE CCHKSY( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                   XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchksy_rk.f b/TESTING/LIN/cchksy_rk.f
index f4954054f4..0f7c43a31c 100644
--- a/TESTING/LIN/cchksy_rk.f
+++ b/TESTING/LIN/cchksy_rk.f
@@ -174,6 +174,7 @@
       SUBROUTINE CCHKSY_RK( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                      THRESH, TSTERR, NMAX, A, AFAC, E, AINV, B,
      $                      X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchksy_rook.f b/TESTING/LIN/cchksy_rook.f
index 2031089801..81e7450e0e 100644
--- a/TESTING/LIN/cchksy_rook.f
+++ b/TESTING/LIN/cchksy_rook.f
@@ -169,6 +169,7 @@
       SUBROUTINE CCHKSY_ROOK( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                        THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                        XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchktb.f b/TESTING/LIN/cchktb.f
index 865b9de329..dae182a745 100644
--- a/TESTING/LIN/cchktb.f
+++ b/TESTING/LIN/cchktb.f
@@ -146,6 +146,7 @@
 *  =====================================================================
       SUBROUTINE CCHKTB( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, AB, AINV, B, X, XACT, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchktp.f b/TESTING/LIN/cchktp.f
index 18242ff54c..8588d82fa7 100644
--- a/TESTING/LIN/cchktp.f
+++ b/TESTING/LIN/cchktp.f
@@ -87,7 +87,7 @@
 *> \verbatim
 *>          NMAX is INTEGER
 *>          The leading dimension of the work arrays.  NMAX >= the
-*>          maximumm value of N in NVAL.
+*>          maximum value of N in NVAL.
 *> \endverbatim
 *>
 *> \param[out] AP
@@ -148,6 +148,7 @@
       SUBROUTINE CCHKTP( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, AP, AINVP, B, X, XACT, WORK, RWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cchktr.f b/TESTING/LIN/cchktr.f
index ce1ecf7615..4957a556db 100644
--- a/TESTING/LIN/cchktr.f
+++ b/TESTING/LIN/cchktr.f
@@ -31,7 +31,7 @@
 *>
 *> \verbatim
 *>
-*> CCHKTR tests CTRTRI, -TRS, -RFS, and -CON, and CLATRS
+*> CCHKTR tests CTRTRI, -TRS, -RFS, and -CON, and CLATRS(3)
 *> \endverbatim
 *
 *  Arguments:
@@ -160,6 +160,7 @@
       SUBROUTINE CCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AINV, B, X, XACT,
      $                   WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -184,7 +185,7 @@ SUBROUTINE CCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
       INTEGER            NTYPE1, NTYPES
       PARAMETER          ( NTYPE1 = 10, NTYPES = 18 )
       INTEGER            NTESTS
-      PARAMETER          ( NTESTS = 9 )
+      PARAMETER          ( NTESTS = 10 )
       INTEGER            NTRAN
       PARAMETER          ( NTRAN = 3 )
       REAL               ONE, ZERO
@@ -195,13 +196,14 @@ SUBROUTINE CCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
       CHARACTER*3        PATH
       INTEGER            I, IDIAG, IMAT, IN, INB, INFO, IRHS, ITRAN,
      $                   IUPLO, K, LDA, N, NB, NERRS, NFAIL, NRHS, NRUN
-      REAL               AINVNM, ANORM, DUMMY, RCOND, RCONDC, RCONDI,
-     $                   RCONDO, SCALE
+      REAL               AINVNM, ANORM, BIGNUM, DUMMY, RCOND, RCONDC,
+     $                   RCONDI, RCONDO, RES, SCALE, SLAMCH
 *     ..
 *     .. Local Arrays ..
       CHARACTER          TRANSS( NTRAN ), UPLOS( 2 )
       INTEGER            ISEED( 4 ), ISEEDY( 4 )
-      REAL               RESULT( NTESTS )
+      REAL               RESULT( NTESTS ), RWORK2( 2*NMAX ),
+     $                   SCALE3( 2 )
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -210,9 +212,9 @@ SUBROUTINE CCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALAERH, ALAHD, ALASUM, CCOPY, CERRTR, CGET04,
-     $                   CLACPY, CLARHS, CLATRS, CLATTR, CTRCON, CTRRFS,
-     $                   CTRT01, CTRT02, CTRT03, CTRT05, CTRT06, CTRTRI,
-     $                   CTRTRS, XLAENV
+     $                   CLACPY, CLARHS, CLATRS, CLATRS3, CLATTR,
+     $                   CSSCAL, CTRCON, CTRRFS, CTRT01, CTRT02, CTRT03,
+     $                   CTRT05, CTRT06, CTRTRI, CTRTRS, XLAENV, SLAMCH
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -236,6 +238,7 @@ SUBROUTINE CCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
 *
       PATH( 1: 1 ) = 'Complex precision'
       PATH( 2: 3 ) = 'TR'
+      BIGNUM = SLAMCH('Overflow') / SLAMCH('Precision')
       NRUN = 0
       NFAIL = 0
       NERRS = 0
@@ -380,7 +383,7 @@ SUBROUTINE CCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
 *                       This line is needed on a Sun SPARCstation.
 *
                         IF( N.GT.0 )
-     $                     DUMMY = A( 1 )
+     $                     DUMMY = REAL( A( 1 ) )
 *
                         CALL CTRT02( UPLO, TRANS, DIAG, N, NRHS, A, LDA,
      $                               X, LDA, B, LDA, WORK, RWORK,
@@ -535,6 +538,32 @@ SUBROUTINE CCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                         RWORK, ONE, B( N+1 ), LDA, X, LDA, WORK,
      $                         RESULT( 9 ) )
 *
+*+    TEST 10
+*                 Solve op(A)*X = B.
+*
+                  SRNAMT = 'CLATRS3'
+                  CALL CCOPY( N, X, 1, B, 1 )
+                  CALL CCOPY( N, X, 1, B( N+1 ), 1 )
+                  CALL CSSCAL( N, BIGNUM, B( N+1 ), 1 )
+                  CALL CLATRS3( UPLO, TRANS, DIAG, 'N', N, 2, A, LDA,
+     $                          B, MAX(1, N), SCALE3, RWORK, RWORK2,
+     $                          2*NMAX, INFO )
+*
+*                 Check error code from CLATRS3.
+*
+                  IF( INFO.NE.0 )
+     $               CALL ALAERH( PATH, 'CLATRS3', INFO, 0,
+     $                            UPLO // TRANS // DIAG // 'N', N, N,
+     $                            -1, -1, -1, IMAT, NFAIL, NERRS, NOUT )
+                  CALL CTRT03( UPLO, TRANS, DIAG, N, 1, A, LDA,
+     $                         SCALE3( 1 ), RWORK, ONE, B( 1 ), LDA,
+     $                         X, LDA, WORK, RESULT( 10 ) )
+                  CALL CSSCAL( N, BIGNUM, X, 1 )
+                  CALL CTRT03( UPLO, TRANS, DIAG, N, 1, A, LDA,
+     $                         SCALE3( 2 ), RWORK, ONE, B( N+1 ), LDA,
+     $                         X, LDA, WORK, RES )
+                  RESULT( 10 ) = MAX( RESULT( 10 ), RES )
+*
 *                 Print information about the tests that did not pass
 *                 the threshold.
 *
@@ -552,7 +581,14 @@ SUBROUTINE CCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                  DIAG, 'Y', N, IMAT, 9, RESULT( 9 )
                      NFAIL = NFAIL + 1
                   END IF
-                  NRUN = NRUN + 2
+                  IF( RESULT( 10 ).GE.THRESH ) THEN
+                     IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
+     $                  CALL ALAHD( NOUT, PATH )
+                     WRITE( NOUT, FMT = 9996 )'CLATRS3', UPLO, TRANS,
+     $                  DIAG, 'N', N, IMAT, 10, RESULT( 10 )
+                     NFAIL = NFAIL + 1
+                  END IF
+                  NRUN = NRUN + 3
    90          CONTINUE
   100       CONTINUE
   110    CONTINUE
diff --git a/TESTING/LIN/cchktz.f b/TESTING/LIN/cchktz.f
index 192b1c390e..c65c768988 100644
--- a/TESTING/LIN/cchktz.f
+++ b/TESTING/LIN/cchktz.f
@@ -134,6 +134,7 @@
 *  =====================================================================
       SUBROUTINE CCHKTZ( DOTYPE, NM, MVAL, NN, NVAL, THRESH, TSTERR, A,
      $                   COPYA, S, TAU, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvgb.f b/TESTING/LIN/cdrvgb.f
index 389725eaed..16d9e11bef 100644
--- a/TESTING/LIN/cdrvgb.f
+++ b/TESTING/LIN/cdrvgb.f
@@ -169,6 +169,7 @@
       SUBROUTINE CDRVGB( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, LA,
      $                   AFB, LAFB, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvgbx.f b/TESTING/LIN/cdrvgbx.f
index 68ff66e07e..11c1d0c772 100644
--- a/TESTING/LIN/cdrvgbx.f
+++ b/TESTING/LIN/cdrvgbx.f
@@ -172,6 +172,7 @@
       SUBROUTINE CDRVGB( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, LA,
      $                   AFB, LAFB, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvge.f b/TESTING/LIN/cdrvge.f
index 386bd31086..8a9bcd0453 100644
--- a/TESTING/LIN/cdrvge.f
+++ b/TESTING/LIN/cdrvge.f
@@ -161,6 +161,7 @@
       SUBROUTINE CDRVGE( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvgex.f b/TESTING/LIN/cdrvgex.f
index d989261db3..2cf1611e50 100644
--- a/TESTING/LIN/cdrvgex.f
+++ b/TESTING/LIN/cdrvgex.f
@@ -164,6 +164,7 @@
       SUBROUTINE CDRVGE( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvgt.f b/TESTING/LIN/cdrvgt.f
index 8d43f640fe..e4e07afee7 100644
--- a/TESTING/LIN/cdrvgt.f
+++ b/TESTING/LIN/cdrvgt.f
@@ -136,6 +136,7 @@
 *  =====================================================================
       SUBROUTINE CDRVGT( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, AF,
      $                   B, X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -307,16 +308,16 @@ SUBROUTINE CDRVGT( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, AF,
                   IZERO = 0
                ELSE IF( IMAT.EQ.8 ) THEN
                   IZERO = 1
-                  Z( 2 ) = A( N )
+                  Z( 2 ) = REAL( A( N ) )
                   A( N ) = ZERO
                   IF( N.GT.1 ) THEN
-                     Z( 3 ) = A( 1 )
+                     Z( 3 ) = REAL( A( 1 ) )
                      A( 1 ) = ZERO
                   END IF
                ELSE IF( IMAT.EQ.9 ) THEN
                   IZERO = N
-                  Z( 1 ) = A( 3*N-2 )
-                  Z( 2 ) = A( 2*N-1 )
+                  Z( 1 ) = REAL( A( 3*N-2 ) )
+                  Z( 2 ) = REAL( A( 2*N-1 ) )
                   A( 3*N-2 ) = ZERO
                   A( 2*N-1 ) = ZERO
                ELSE
diff --git a/TESTING/LIN/cdrvhe.f b/TESTING/LIN/cdrvhe.f
index de7851e0f5..43a0c5b31e 100644
--- a/TESTING/LIN/cdrvhe.f
+++ b/TESTING/LIN/cdrvhe.f
@@ -150,6 +150,7 @@
       SUBROUTINE CDRVHE( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvhe_aa.f b/TESTING/LIN/cdrvhe_aa.f
index 70c4a7e312..3a5b965faa 100644
--- a/TESTING/LIN/cdrvhe_aa.f
+++ b/TESTING/LIN/cdrvhe_aa.f
@@ -150,6 +150,7 @@
       SUBROUTINE CDRVHE_AA( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                         NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                         RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvhe_aa_2stage.f b/TESTING/LIN/cdrvhe_aa_2stage.f
index 51cef512d8..cb71a60b36 100644
--- a/TESTING/LIN/cdrvhe_aa_2stage.f
+++ b/TESTING/LIN/cdrvhe_aa_2stage.f
@@ -152,6 +152,7 @@ SUBROUTINE CDRVHE_AA_2STAGE(
      $                         DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                         NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                         RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -400,9 +401,9 @@ SUBROUTINE CDRVHE_AA_2STAGE(
 *                    Factor the matrix and solve the system using CHESV_AA.
 *
                      SRNAMT = 'CHESV_AA_2STAGE '
-                     LWORK = MIN(N*NB, 3*NMAX*NMAX)
+                     LWORK = MIN( MAX( 1, N*NB ), 3*NMAX*NMAX)
                      CALL CHESV_AA_2STAGE( UPLO, N, NRHS, AFAC, LDA,
-     $                                 AINV, (3*NB+1)*N, 
+     $                                 AINV, MAX( 1, (3*NB+1)*N ),
      $                                 IWORK, IWORK( 1+N ),
      $                                 X, LDA, WORK, LWORK, INFO )
 *
diff --git a/TESTING/LIN/cdrvhe_rk.f b/TESTING/LIN/cdrvhe_rk.f
index 72669ccd18..30205622e8 100644
--- a/TESTING/LIN/cdrvhe_rk.f
+++ b/TESTING/LIN/cdrvhe_rk.f
@@ -155,6 +155,7 @@
       SUBROUTINE CDRVHE_RK( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                      NMAX, A, AFAC, E, AINV, B, X, XACT, WORK,
      $                      RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvhe_rook.f b/TESTING/LIN/cdrvhe_rook.f
index d2f3cb7975..f396aed00d 100644
--- a/TESTING/LIN/cdrvhe_rook.f
+++ b/TESTING/LIN/cdrvhe_rook.f
@@ -150,6 +150,7 @@
       SUBROUTINE CDRVHE_ROOK( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                        NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                        RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvhex.f b/TESTING/LIN/cdrvhex.f
index 940ad416d6..3a7872ee0f 100644
--- a/TESTING/LIN/cdrvhex.f
+++ b/TESTING/LIN/cdrvhex.f
@@ -154,6 +154,7 @@
       SUBROUTINE CDRVHE( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvhp.f b/TESTING/LIN/cdrvhp.f
index 27ff71c5e3..1a1d54c128 100644
--- a/TESTING/LIN/cdrvhp.f
+++ b/TESTING/LIN/cdrvhp.f
@@ -154,6 +154,7 @@
       SUBROUTINE CDRVHP( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvls.f b/TESTING/LIN/cdrvls.f
index 7fe189e5fd..03b89b4973 100644
--- a/TESTING/LIN/cdrvls.f
+++ b/TESTING/LIN/cdrvls.f
@@ -31,7 +31,8 @@
 *>
 *> \verbatim
 *>
-*> CDRVLS tests the least squares driver routines CGELS, CGETSLS, CGELSS, CGELSY
+*> CDRVLS tests the least squares driver routines CGELS, CGELST,
+*> CGETSLS, CGELSS, CGELSY
 *> and CGELSD.
 *> \endverbatim
 *
@@ -189,6 +190,7 @@
       SUBROUTINE CDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                   NBVAL, NXVAL, THRESH, TSTERR, A, COPYA, B,
      $                   COPYB, C, S, COPYS, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -211,7 +213,7 @@ SUBROUTINE CDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *
 *     .. Parameters ..
       INTEGER            NTESTS
-      PARAMETER          ( NTESTS = 16 )
+      PARAMETER          ( NTESTS = 18 )
       INTEGER            SMLSIZ
       PARAMETER          ( SMLSIZ = 25 )
       REAL               ONE, ZERO
@@ -228,8 +230,8 @@ SUBROUTINE CDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                   LWLSY, LWORK, M, MNMIN, N, NB, NCOLS, NERRS,
      $                   NFAIL, NRHS, NROWS, NRUN, RANK, MB,
      $                   MMAX, NMAX, NSMAX, LIWORK, LRWORK,
-     $                   LWORK_CGELS, LWORK_CGETSLS, LWORK_CGELSS,
-     $                   LWORK_CGELSY, LWORK_CGELSD,
+     $                   LWORK_CGELS, LWORK_CGELST, LWORK_CGETSLS,
+     $                   LWORK_CGELSS, LWORK_CGELSY,  LWORK_CGELSD,
      $                   LRWORK_CGELSY, LRWORK_CGELSS, LRWORK_CGELSD
       REAL               EPS, NORMA, NORMB, RCOND
 *     ..
@@ -249,7 +251,7 @@ SUBROUTINE CDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALAERH, ALAHD, ALASVM, CERRLS, CGELS, CGELSD,
-     $                   CGELSS, CGELSY, CGEMM, CGETSLS, CLACPY,
+     $                   CGELSS, CGELST, CGELSY, CGEMM, CGETSLS, CLACPY,
      $                   CLARNV, CQRT13, CQRT15, CQRT16, CSSCAL,
      $                   SAXPY, XLAENV
 *     ..
@@ -334,7 +336,8 @@ SUBROUTINE CDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
       LIWORK = 1
 *
 *     Iterate through all test cases and compute necessary workspace
-*     sizes for ?GELS, ?GETSLS, ?GELSY, ?GELSS and ?GELSD routines.
+*     sizes for ?GELS, ?GELST, ?GETSLS, ?GELSY, ?GELSS and ?GELSD
+*     routines.
 *
       DO IM = 1, NM
          M = MVAL( IM )
@@ -361,6 +364,10 @@ SUBROUTINE CDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
                               CALL CGELS( TRANS, M, N, NRHS, A, LDA,
      $                                    B, LDB, WQ, -1, INFO )
                               LWORK_CGELS = INT( WQ( 1 ) )
+*                             Compute workspace needed for CGELST
+                              CALL CGELST( TRANS, M, N, NRHS, A, LDA,
+     $                                    B, LDB, WQ, -1, INFO )
+                              LWORK_CGELST = INT ( WQ ( 1 ) )
 *                             Compute workspace needed for CGETSLS
                               CALL CGETSLS( TRANS, M, N, NRHS, A, LDA,
      $                                      B, LDB, WQ, -1, INFO )
@@ -425,21 +432,26 @@ SUBROUTINE CDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
                      ITYPE = ( IRANK-1 )*3 + ISCALE
                      IF( .NOT.DOTYPE( ITYPE ) )
      $                  GO TO 100
-*
+*                 =====================================================
+*                       Begin test CGELS
+*                 =====================================================
                      IF( IRANK.EQ.1 ) THEN
 *
-*                       Test CGELS
-*
 *                       Generate a matrix of scaling type ISCALE
 *
                         CALL CQRT13( ISCALE, M, N, COPYA, LDA, NORMA,
      $                               ISEED )
-                        DO 40 INB = 1, NNB
+*
+*                       Loop for testing different block sizes.
+*
+                        DO INB = 1, NNB
                            NB = NBVAL( INB )
                            CALL XLAENV( 1, NB )
                            CALL XLAENV( 3, NXVAL( INB ) )
 *
-                           DO 30 ITRAN = 1, 2
+*                          Loop for testing non-transposed and transposed.
+*
+                           DO ITRAN = 1, 2
                               IF( ITRAN.EQ.1 ) THEN
                                  TRANS = 'N'
                                  NROWS = M
@@ -484,15 +496,20 @@ SUBROUTINE CDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                                        ITYPE, NFAIL, NERRS,
      $                                        NOUT )
 *
-*                             Check correctness of results
+*                             Test 1: Check correctness of results
+*                             for CGELS, compute the residual:
+*                             RESID = norm(B - A*X) /
+*                             / ( max(m,n) * norm(A) * norm(X) * EPS )
 *
-                              LDWORK = MAX( 1, NROWS )
                               IF( NROWS.GT.0 .AND. NRHS.GT.0 )
      $                           CALL CLACPY( 'Full', NROWS, NRHS,
      $                                        COPYB, LDB, C, LDB )
                               CALL CQRT16( TRANS, M, N, NRHS, COPYA,
      $                                     LDA, B, LDB, C, LDB, RWORK,
      $                                     RESULT( 1 ) )
+*
+*                             Test 2: Check correctness of results
+*                             for CGELS.
 *
                               IF( ( ITRAN.EQ.1 .AND. M.GE.N ) .OR.
      $                            ( ITRAN.EQ.2 .AND. M.LT.N ) ) THEN
@@ -515,7 +532,7 @@ SUBROUTINE CDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *                             Print information about the tests that
 *                             did not pass the threshold.
 *
-                              DO 20 K = 1, 2
+                              DO K = 1, 2
                                  IF( RESULT( K ).GE.THRESH ) THEN
                                     IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
      $                                 CALL ALAHD( NOUT, PATH )
@@ -524,26 +541,34 @@ SUBROUTINE CDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                                 RESULT( K )
                                     NFAIL = NFAIL + 1
                                  END IF
-   20                         CONTINUE
+                              END DO
                               NRUN = NRUN + 2
-   30                      CONTINUE
-   40                   CONTINUE
-*
-*
-*                       Test CGETSLS
+                           END DO
+                        END DO
+                     END IF
+*                 =====================================================
+*                       End test CGELS
+*                 =====================================================
+*                 =====================================================
+*                       Begin test CGELST
+*                 =====================================================
+                     IF( IRANK.EQ.1 ) THEN
 *
 *                       Generate a matrix of scaling type ISCALE
 *
                         CALL CQRT13( ISCALE, M, N, COPYA, LDA, NORMA,
      $                               ISEED )
-                        DO 65 INB = 1, NNB
-                             MB = NBVAL( INB )
-                             CALL XLAENV( 1, MB )
-                             DO 62 IMB = 1, NNB
-                              NB = NBVAL( IMB )
-                              CALL XLAENV( 2, NB )
 *
-                           DO 60 ITRAN = 1, 2
+*                       Loop for testing different block sizes.
+*
+                        DO INB = 1, NNB
+                           NB = NBVAL( INB )
+                           CALL XLAENV( 1, NB )
+                           CALL XLAENV( 3, NXVAL( INB ) )
+*
+*                          Loop for testing non-transposed and transposed.
+*
+                           DO ITRAN = 1, 2
                               IF( ITRAN.EQ.1 ) THEN
                                  TRANS = 'N'
                                  NROWS = M
@@ -560,9 +585,9 @@ SUBROUTINE CDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
                               IF( NCOLS.GT.0 ) THEN
                                  CALL CLARNV( 2, ISEED, NCOLS*NRHS,
      $                                        WORK )
-                                 CALL CSCAL( NCOLS*NRHS,
-     $                                       CONE / REAL( NCOLS ), WORK,
-     $                                       1 )
+                                 CALL CSSCAL( NCOLS*NRHS,
+     $                                        ONE / REAL( NCOLS ), WORK,
+     $                                        1 )
                               END IF
                               CALL CGEMM( TRANS, 'No transpose', NROWS,
      $                                    NRHS, NCOLS, CONE, COPYA, LDA,
@@ -578,31 +603,37 @@ SUBROUTINE CDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
                                  CALL CLACPY( 'Full', NROWS, NRHS,
      $                                        COPYB, LDB, B, LDB )
                               END IF
-                              SRNAMT = 'CGETSLS '
-                              CALL CGETSLS( TRANS, M, N, NRHS, A,
-     $                                 LDA, B, LDB, WORK, LWORK, INFO )
+                              SRNAMT = 'CGELST'
+                              CALL CGELST( TRANS, M, N, NRHS, A, LDA, B,
+     $                                    LDB, WORK, LWORK, INFO )
+*
                               IF( INFO.NE.0 )
-     $                           CALL ALAERH( PATH, 'CGETSLS ', INFO, 0,
+     $                           CALL ALAERH( PATH, 'CGELST', INFO, 0,
      $                                        TRANS, M, N, NRHS, -1, NB,
      $                                        ITYPE, NFAIL, NERRS,
      $                                        NOUT )
 *
-*                             Check correctness of results
+*                             Test 3: Check correctness of results
+*                             for CGELST, compute the residual:
+*                             RESID = norm(B - A*X) /
+*                             / ( max(m,n) * norm(A) * norm(X) * EPS )
 *
-                              LDWORK = MAX( 1, NROWS )
                               IF( NROWS.GT.0 .AND. NRHS.GT.0 )
      $                           CALL CLACPY( 'Full', NROWS, NRHS,
      $                                        COPYB, LDB, C, LDB )
                               CALL CQRT16( TRANS, M, N, NRHS, COPYA,
-     $                                     LDA, B, LDB, C, LDB, WORK2,
-     $                                     RESULT( 15 ) )
+     $                                     LDA, B, LDB, C, LDB, RWORK,
+     $                                     RESULT( 3 ) )
+*
+*                             Test 4: Check correctness of results
+*                             for CGELST.
 *
                               IF( ( ITRAN.EQ.1 .AND. M.GE.N ) .OR.
      $                            ( ITRAN.EQ.2 .AND. M.LT.N ) ) THEN
 *
 *                                Solving LS system
 *
-                                 RESULT( 16 ) = CQRT17( TRANS, 1, M, N,
+                                 RESULT( 4 ) = CQRT17( TRANS, 1, M, N,
      $                                         NRHS, COPYA, LDA, B, LDB,
      $                                         COPYB, LDB, C, WORK,
      $                                         LWORK )
@@ -610,7 +641,7 @@ SUBROUTINE CDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *
 *                                Solving overdetermined system
 *
-                                 RESULT( 16 ) = CQRT14( TRANS, M, N,
+                                 RESULT( 4 ) = CQRT14( TRANS, M, N,
      $                                         NRHS, COPYA, LDA, B, LDB,
      $                                         WORK, LWORK )
                               END IF
@@ -618,21 +649,151 @@ SUBROUTINE CDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *                             Print information about the tests that
 *                             did not pass the threshold.
 *
-                              DO 50 K = 15, 16
+                              DO K = 3, 4
                                  IF( RESULT( K ).GE.THRESH ) THEN
                                     IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
      $                                 CALL ALAHD( NOUT, PATH )
-                                    WRITE( NOUT, FMT = 9997 )TRANS, M,
-     $                                 N, NRHS, MB, NB, ITYPE, K,
+                                    WRITE( NOUT, FMT = 9999 )TRANS, M,
+     $                                 N, NRHS, NB, ITYPE, K,
      $                                 RESULT( K )
                                     NFAIL = NFAIL + 1
                                  END IF
-   50                         CONTINUE
+                              END DO
                               NRUN = NRUN + 2
-   60                      CONTINUE
-   62                      CONTINUE
-   65                   CONTINUE
+                           END DO
+                        END DO
+                     END IF
+*                 =====================================================
+*                       End test CGELST
+*                 =====================================================
+*                 =====================================================
+*                       Begin test CGELSTSLS
+*                 =====================================================
+                     IF( IRANK.EQ.1 ) THEN
+*
+*                       Generate a matrix of scaling type ISCALE
+*
+                        CALL CQRT13( ISCALE, M, N, COPYA, LDA, NORMA,
+     $                               ISEED )
+*
+*                       Loop for testing different block sizes MB.
+*
+                        DO INB = 1, NNB
+                           MB = NBVAL( INB )
+                           CALL XLAENV( 1, MB )
+*
+*                          Loop for testing different block sizes NB.
+*
+                           DO IMB = 1, NNB
+                              NB = NBVAL( IMB )
+                              CALL XLAENV( 2, NB )
+*
+*                             Loop for testing non-transposed
+*                             and transposed.
+*
+                              DO ITRAN = 1, 2
+                                 IF( ITRAN.EQ.1 ) THEN
+                                    TRANS = 'N'
+                                    NROWS = M
+                                    NCOLS = N
+                                 ELSE
+                                    TRANS = 'C'
+                                    NROWS = N
+                                    NCOLS = M
+                                 END IF
+                                 LDWORK = MAX( 1, NCOLS )
+*
+*                                Set up a consistent rhs
+*
+                                 IF( NCOLS.GT.0 ) THEN
+                                    CALL CLARNV( 2, ISEED, NCOLS*NRHS,
+     $                                           WORK )
+                                    CALL CSCAL( NCOLS*NRHS,
+     $                                          CONE / REAL( NCOLS ),
+     $                                          WORK, 1 )
+                                 END IF
+                                 CALL CGEMM( TRANS, 'No transpose',
+     $                                       NROWS, NRHS, NCOLS, CONE,
+     $                                       COPYA, LDA, WORK, LDWORK,
+     $                                       CZERO, B, LDB )
+                                 CALL CLACPY( 'Full', NROWS, NRHS,
+     $                                        B, LDB, COPYB, LDB )
+*
+*                                Solve LS or overdetermined system
+*
+                                 IF( M.GT.0 .AND. N.GT.0 ) THEN
+                                    CALL CLACPY( 'Full', M, N,
+     $                                           COPYA, LDA, A, LDA )
+                                    CALL CLACPY( 'Full', NROWS, NRHS,
+     $                                           COPYB, LDB, B, LDB )
+                                 END IF
+                                 SRNAMT = 'CGETSLS '
+                                 CALL CGETSLS( TRANS, M, N, NRHS, A,
+     $                                    LDA, B, LDB, WORK, LWORK,
+     $                                    INFO )
+                                 IF( INFO.NE.0 )
+     $                              CALL ALAERH( PATH, 'CGETSLS ', INFO,
+     $                                           0, TRANS, M, N, NRHS,
+     $                                           -1, NB, ITYPE, NFAIL,
+     $                                           NERRS, NOUT )
+*
+*                             Test 5: Check correctness of results
+*                             for CGETSLS, compute the residual:
+*                             RESID = norm(B - A*X) /
+*                             / ( max(m,n) * norm(A) * norm(X) * EPS )
+*
+                                 IF( NROWS.GT.0 .AND. NRHS.GT.0 )
+     $                              CALL CLACPY( 'Full', NROWS, NRHS,
+     $                                           COPYB, LDB, C, LDB )
+                                 CALL CQRT16( TRANS, M, N, NRHS,
+     $                                        COPYA, LDA, B, LDB,
+     $                                        C, LDB, WORK2,
+     $                                        RESULT( 5 ) )
+*
+*                             Test 6: Check correctness of results
+*                             for CGETSLS.
+*
+                                 IF( ( ITRAN.EQ.1 .AND. M.GE.N ) .OR.
+     $                               ( ITRAN.EQ.2 .AND. M.LT.N ) ) THEN
+*
+*                                   Solving LS system, compute:
+*                                   r = norm((B- A*X)**T * A) /
+*                                 / (norm(A)*norm(B)*max(M,N,NRHS)*EPS)
+*
+                                    RESULT( 6 ) = CQRT17( TRANS, 1, M,
+     $                                             N, NRHS, COPYA, LDA,
+     $                                             B, LDB, COPYB, LDB,
+     $                                             C, WORK, LWORK )
+                                 ELSE
+*
+*                                   Solving overdetermined system
+*
+                                    RESULT( 6 ) = CQRT14( TRANS, M, N,
+     $                                             NRHS, COPYA, LDA, B,
+     $                                             LDB, WORK, LWORK )
+                                 END IF
+*
+*                                Print information about the tests that
+*                                did not pass the threshold.
+*
+                                 DO K = 5, 6
+                                    IF( RESULT( K ).GE.THRESH ) THEN
+                                       IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
+     $                                    CALL ALAHD( NOUT, PATH )
+                                       WRITE( NOUT, FMT = 9997 )TRANS,
+     $                                    M, N, NRHS, MB, NB, ITYPE, K,
+     $                                    RESULT( K )
+                                          NFAIL = NFAIL + 1
+                                    END IF
+                                 END DO
+                                 NRUN = NRUN + 2
+                              END DO
+                           END DO
+                        END DO
                      END IF
+*                 =====================================================
+*                       End test CGELSTSLS
+*                 ====================================================
 *
 *                    Generate a matrix of scaling type ISCALE and rank
 *                    type IRANK.
@@ -680,37 +841,37 @@ SUBROUTINE CDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *
 *                       workspace used: 2*MNMIN+NB*NB+NB*MAX(N,NRHS)
 *
-*                       Test 3:  Compute relative error in svd
+*                       Test 7:  Compute relative error in svd
 *                                workspace: M*N + 4*MIN(M,N) + MAX(M,N)
 *
-                        RESULT( 3 ) = CQRT12( CRANK, CRANK, A, LDA,
+                        RESULT( 7 ) = CQRT12( CRANK, CRANK, A, LDA,
      $                                COPYS, WORK, LWORK, RWORK )
 *
-*                       Test 4:  Compute error in solution
+*                       Test 8:  Compute error in solution
 *                                workspace:  M*NRHS + M
 *
                         CALL CLACPY( 'Full', M, NRHS, COPYB, LDB, WORK,
      $                               LDWORK )
                         CALL CQRT16( 'No transpose', M, N, NRHS, COPYA,
      $                               LDA, B, LDB, WORK, LDWORK, RWORK,
-     $                               RESULT( 4 ) )
+     $                               RESULT( 8 ) )
 *
-*                       Test 5:  Check norm of r'*A
+*                       Test 9:  Check norm of r'*A
 *                                workspace: NRHS*(M+N)
 *
-                        RESULT( 5 ) = ZERO
+                        RESULT( 9 ) = ZERO
                         IF( M.GT.CRANK )
-     $                     RESULT( 5 ) = CQRT17( 'No transpose', 1, M,
+     $                     RESULT( 9 ) = CQRT17( 'No transpose', 1, M,
      $                                   N, NRHS, COPYA, LDA, B, LDB,
      $                                   COPYB, LDB, C, WORK, LWORK )
 *
-*                       Test 6:  Check if x is in the rowspace of A
+*                       Test 10:  Check if x is in the rowspace of A
 *                                workspace: (M+NRHS)*(N+2)
 *
-                        RESULT( 6 ) = ZERO
+                        RESULT( 10 ) = ZERO
 *
                         IF( N.GT.CRANK )
-     $                     RESULT( 6 ) = CQRT14( 'No transpose', M, N,
+     $                     RESULT( 10 ) = CQRT14( 'No transpose', M, N,
      $                                   NRHS, COPYA, LDA, B, LDB,
      $                                   WORK, LWORK )
 *
@@ -736,38 +897,38 @@ SUBROUTINE CDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *                       workspace used: 3*min(m,n) +
 *                                       max(2*min(m,n),nrhs,max(m,n))
 *
-*                       Test 7:  Compute relative error in svd
+*                       Test 11:  Compute relative error in svd
 *
                         IF( RANK.GT.0 ) THEN
                            CALL SAXPY( MNMIN, -ONE, COPYS, 1, S, 1 )
-                           RESULT( 7 ) = SASUM( MNMIN, S, 1 ) /
+                           RESULT( 11 ) = SASUM( MNMIN, S, 1 ) /
      $                                    SASUM( MNMIN, COPYS, 1 ) /
      $                                    ( EPS*REAL( MNMIN ) )
                         ELSE
-                           RESULT( 7 ) = ZERO
+                           RESULT( 11 ) = ZERO
                         END IF
 *
-*                       Test 8:  Compute error in solution
+*                       Test 12:  Compute error in solution
 *
                         CALL CLACPY( 'Full', M, NRHS, COPYB, LDB, WORK,
      $                               LDWORK )
                         CALL CQRT16( 'No transpose', M, N, NRHS, COPYA,
      $                               LDA, B, LDB, WORK, LDWORK, RWORK,
-     $                               RESULT( 8 ) )
+     $                               RESULT( 12 ) )
 *
-*                       Test 9:  Check norm of r'*A
+*                       Test 13:  Check norm of r'*A
 *
-                        RESULT( 9 ) = ZERO
+                        RESULT( 13 ) = ZERO
                         IF( M.GT.CRANK )
-     $                     RESULT( 9 ) = CQRT17( 'No transpose', 1, M,
+     $                     RESULT( 13 ) = CQRT17( 'No transpose', 1, M,
      $                                    N, NRHS, COPYA, LDA, B, LDB,
      $                                    COPYB, LDB, C, WORK, LWORK )
 *
-*                       Test 10:  Check if x is in the rowspace of A
+*                       Test 14:  Check if x is in the rowspace of A
 *
-                        RESULT( 10 ) = ZERO
+                        RESULT( 14 ) = ZERO
                         IF( N.GT.CRANK )
-     $                     RESULT( 10 ) = CQRT14( 'No transpose', M, N,
+     $                     RESULT( 14 ) = CQRT14( 'No transpose', M, N,
      $                                    NRHS, COPYA, LDA, B, LDB,
      $                                    WORK, LWORK )
 *
@@ -792,45 +953,45 @@ SUBROUTINE CDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                                  N, NRHS, -1, NB, ITYPE, NFAIL,
      $                                  NERRS, NOUT )
 *
-*                       Test 11:  Compute relative error in svd
+*                       Test 15:  Compute relative error in svd
 *
                         IF( RANK.GT.0 ) THEN
                            CALL SAXPY( MNMIN, -ONE, COPYS, 1, S, 1 )
-                           RESULT( 11 ) = SASUM( MNMIN, S, 1 ) /
+                           RESULT( 15 ) = SASUM( MNMIN, S, 1 ) /
      $                                    SASUM( MNMIN, COPYS, 1 ) /
      $                                    ( EPS*REAL( MNMIN ) )
                         ELSE
-                           RESULT( 11 ) = ZERO
+                           RESULT( 15 ) = ZERO
                         END IF
 *
-*                       Test 12:  Compute error in solution
+*                       Test 16:  Compute error in solution
 *
                         CALL CLACPY( 'Full', M, NRHS, COPYB, LDB, WORK,
      $                               LDWORK )
                         CALL CQRT16( 'No transpose', M, N, NRHS, COPYA,
      $                               LDA, B, LDB, WORK, LDWORK, RWORK,
-     $                               RESULT( 12 ) )
+     $                               RESULT( 16 ) )
 *
-*                       Test 13:  Check norm of r'*A
+*                       Test 17:  Check norm of r'*A
 *
-                        RESULT( 13 ) = ZERO
+                        RESULT( 17 ) = ZERO
                         IF( M.GT.CRANK )
-     $                     RESULT( 13 ) = CQRT17( 'No transpose', 1, M,
+     $                     RESULT( 17 ) = CQRT17( 'No transpose', 1, M,
      $                                    N, NRHS, COPYA, LDA, B, LDB,
      $                                    COPYB, LDB, C, WORK, LWORK )
 *
-*                       Test 14:  Check if x is in the rowspace of A
+*                       Test 18:  Check if x is in the rowspace of A
 *
-                        RESULT( 14 ) = ZERO
+                        RESULT( 18 ) = ZERO
                         IF( N.GT.CRANK )
-     $                     RESULT( 14 ) = CQRT14( 'No transpose', M, N,
+     $                     RESULT( 18 ) = CQRT14( 'No transpose', M, N,
      $                                    NRHS, COPYA, LDA, B, LDB,
      $                                    WORK, LWORK )
 *
 *                       Print information about the tests that did not
 *                       pass the threshold.
 *
-                        DO 80 K = 3, 14
+                        DO 80 K = 7, 18
                            IF( RESULT( K ).GE.THRESH ) THEN
                               IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
      $                           CALL ALAHD( NOUT, PATH )
diff --git a/TESTING/LIN/cdrvpb.f b/TESTING/LIN/cdrvpb.f
index 7f8a846280..f72bac1ae7 100644
--- a/TESTING/LIN/cdrvpb.f
+++ b/TESTING/LIN/cdrvpb.f
@@ -156,6 +156,7 @@
       SUBROUTINE CDRVPB( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvpo.f b/TESTING/LIN/cdrvpo.f
index 88cca10dfd..5d8a78d684 100644
--- a/TESTING/LIN/cdrvpo.f
+++ b/TESTING/LIN/cdrvpo.f
@@ -156,6 +156,7 @@
       SUBROUTINE CDRVPO( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvpox.f b/TESTING/LIN/cdrvpox.f
index 4103b543e0..2b234d3048 100644
--- a/TESTING/LIN/cdrvpox.f
+++ b/TESTING/LIN/cdrvpox.f
@@ -159,6 +159,7 @@
       SUBROUTINE CDRVPO( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvpp.f b/TESTING/LIN/cdrvpp.f
index c2fa2eb76c..dc15ec9bc8 100644
--- a/TESTING/LIN/cdrvpp.f
+++ b/TESTING/LIN/cdrvpp.f
@@ -156,6 +156,7 @@
       SUBROUTINE CDRVPP( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvpt.f b/TESTING/LIN/cdrvpt.f
index 41a868b74e..942cabc338 100644
--- a/TESTING/LIN/cdrvpt.f
+++ b/TESTING/LIN/cdrvpt.f
@@ -137,6 +137,7 @@
 *  =====================================================================
       SUBROUTINE CDRVPT( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, D,
      $                   E, B, X, XACT, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -266,12 +267,12 @@ SUBROUTINE CDRVPT( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, D,
 *
                IA = 1
                DO 20 I = 1, N - 1
-                  D( I ) = A( IA )
+                  D( I ) = REAL( A( IA ) )
                   E( I ) = A( IA+1 )
                   IA = IA + 2
    20          CONTINUE
                IF( N.GT.0 )
-     $            D( N ) = A( IA )
+     $            D( N ) = REAL( A( IA ) )
             ELSE
 *
 *              Type 7-12:  generate a diagonally dominant matrix with
@@ -333,13 +334,13 @@ SUBROUTINE CDRVPT( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, D,
                   Z( 2 ) = D( 1 )
                   D( 1 ) = ZERO
                   IF( N.GT.1 ) THEN
-                     Z( 3 ) = E( 1 )
+                     Z( 3 ) = REAL( E( 1 ) )
                      E( 1 ) = ZERO
                   END IF
                ELSE IF( IMAT.EQ.9 ) THEN
                   IZERO = N
                   IF( N.GT.1 ) THEN
-                     Z( 1 ) = E( N-1 )
+                     Z( 1 ) = REAL( E( N-1 ) )
                      E( N-1 ) = ZERO
                   END IF
                   Z( 2 ) = D( N )
@@ -347,9 +348,9 @@ SUBROUTINE CDRVPT( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, D,
                ELSE IF( IMAT.EQ.10 ) THEN
                   IZERO = ( N+1 ) / 2
                   IF( IZERO.GT.1 ) THEN
-                     Z( 1 ) = E( IZERO-1 )
+                     Z( 1 ) = REAL( E( IZERO-1 ) )
                      E( IZERO-1 ) = ZERO
-                     Z( 3 ) = E( IZERO )
+                     Z( 3 ) = REAL( E( IZERO ) )
                      E( IZERO ) = ZERO
                   END IF
                   Z( 2 ) = D( IZERO )
diff --git a/TESTING/LIN/cdrvrf1.f b/TESTING/LIN/cdrvrf1.f
index dec82def2c..428361a556 100644
--- a/TESTING/LIN/cdrvrf1.f
+++ b/TESTING/LIN/cdrvrf1.f
@@ -92,6 +92,7 @@
 *
 *  =====================================================================
       SUBROUTINE CDRVRF1( NOUT, NN, NVAL, THRESH, A, LDA, ARF, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvrf2.f b/TESTING/LIN/cdrvrf2.f
index 774e3880ff..7ae8086bcd 100644
--- a/TESTING/LIN/cdrvrf2.f
+++ b/TESTING/LIN/cdrvrf2.f
@@ -86,6 +86,7 @@
 *
 *  =====================================================================
       SUBROUTINE CDRVRF2( NOUT, NN, NVAL, A, LDA, ARF, AP, ASAV  )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvrf3.f b/TESTING/LIN/cdrvrf3.f
index 1ca816979a..b8451b0552 100644
--- a/TESTING/LIN/cdrvrf3.f
+++ b/TESTING/LIN/cdrvrf3.f
@@ -116,6 +116,7 @@
 *  =====================================================================
       SUBROUTINE CDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
      +                    S_WORK_CLANGE, C_WORK_CGEQRF, TAU )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -156,9 +157,10 @@ SUBROUTINE CDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
       REAL               RESULT( NTESTS )
 *     ..
 *     .. External Functions ..
+      LOGICAL            LSAME
       REAL               SLAMCH, CLANGE
       COMPLEX            CLARND
-      EXTERNAL           SLAMCH, CLARND, CLANGE
+      EXTERNAL           SLAMCH, CLARND, CLANGE, LSAME
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CTRTTF, CGEQRF, CGEQLF, CTFSM, CTRSM
@@ -222,9 +224,9 @@ SUBROUTINE CDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *
                            DO 100 IALPHA = 1, 3
 *
-                              IF ( IALPHA.EQ. 1) THEN
+                              IF ( IALPHA.EQ.1 ) THEN
                                  ALPHA = ZERO
-                              ELSE IF ( IALPHA.EQ. 2) THEN
+                              ELSE IF ( IALPHA.EQ.2 ) THEN
                                  ALPHA = ONE
                               ELSE
                                  ALPHA = CLARND( 4, ISEED )
@@ -263,7 +265,7 @@ SUBROUTINE CDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *
                               DO J = 1, NA
                                  DO I = 1, NA
-                                    A( I, J) = CLARND( 4, ISEED )
+                                    A( I, J ) = CLARND( 4, ISEED )
                                  END DO
                               END DO
 *
@@ -276,6 +278,20 @@ SUBROUTINE CDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
                                  CALL CGEQRF( NA, NA, A, LDA, TAU,
      +                                        C_WORK_CGEQRF, LDA,
      +                                        INFO )
+*
+*                                Forcing main diagonal of test matrix to
+*                                be unit makes it ill-conditioned for
+*                                some test cases
+*
+                                 IF ( LSAME( DIAG, 'U' ) ) THEN
+                                    DO J = 1, NA
+                                       DO I = 1, J
+                                          A( I, J ) = A( I, J ) /
+     +                                            ( 2.0 * A( J, J ) )
+                                       END DO
+                                    END DO
+                                 END IF
+*
                               ELSE
 *
 *                                The case IUPLO.EQ.2 is when SIDE.EQ.'L'
@@ -285,6 +301,20 @@ SUBROUTINE CDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
                                  CALL CGELQF( NA, NA, A, LDA, TAU,
      +                                        C_WORK_CGEQRF, LDA,
      +                                        INFO )
+*
+*                                Forcing main diagonal of test matrix to
+*                                be unit makes it ill-conditioned for
+*                                some test cases
+*
+                                 IF ( LSAME( DIAG, 'U' ) ) THEN
+                                    DO I = 1, NA
+                                       DO J = 1, I
+                                          A( I, J ) = A( I, J ) /
+     +                                            ( 2.0 * A( I, I ) )
+                                       END DO
+                                    END DO
+                                 END IF
+*
                               END IF
 *
 *                             After the QR factorization, the diagonal
@@ -293,7 +323,8 @@ SUBROUTINE CDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *                             value 1.0E+00.
 *
                               DO J = 1, NA
-                                 A( J, J) = A(J,J) * CLARND( 5, ISEED )
+                                 A( J, J ) = A( J, J ) *
+     +                                   CLARND( 5, ISEED )
                               END DO
 *
 *                             Store a copy of A in RFP format (in ARF).
@@ -307,8 +338,8 @@ SUBROUTINE CDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *
                               DO J = 1, N
                                  DO I = 1, M
-                                    B1( I, J) = CLARND( 4, ISEED )
-                                    B2( I, J) = B1( I, J)
+                                    B1( I, J ) = CLARND( 4, ISEED )
+                                    B2( I, J ) = B1( I, J )
                                  END DO
                               END DO
 *
@@ -331,24 +362,24 @@ SUBROUTINE CDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *
                               DO J = 1, N
                                  DO I = 1, M
-                                    B1( I, J) = B2( I, J ) - B1( I, J )
+                                    B1( I, J ) = B2( I, J ) - B1( I, J )
                                  END DO
                               END DO
 *
-                              RESULT(1) = CLANGE( 'I', M, N, B1, LDA,
+                              RESULT( 1 ) = CLANGE( 'I', M, N, B1, LDA,
      +                                            S_WORK_CLANGE )
 *
-                              RESULT(1) = RESULT(1) / SQRT( EPS )
-     +                                    / MAX ( MAX( M, N), 1 )
+                              RESULT( 1 ) = RESULT( 1 ) / SQRT( EPS )
+     +                                    / MAX ( MAX( M, N ), 1 )
 *
-                              IF( RESULT(1).GE.THRESH ) THEN
+                              IF( RESULT( 1 ).GE.THRESH ) THEN
                                  IF( NFAIL.EQ.0 ) THEN
                                     WRITE( NOUT, * )
                                     WRITE( NOUT, FMT = 9999 )
                                  END IF
                                  WRITE( NOUT, FMT = 9997 ) 'CTFSM',
      +                              CFORM, SIDE, UPLO, TRANS, DIAG, M,
-     +                              N, RESULT(1)
+     +                              N, RESULT( 1 )
                                  NFAIL = NFAIL + 1
                               END IF
 *
diff --git a/TESTING/LIN/cdrvrf4.f b/TESTING/LIN/cdrvrf4.f
index 047c1760bc..d00513dd88 100644
--- a/TESTING/LIN/cdrvrf4.f
+++ b/TESTING/LIN/cdrvrf4.f
@@ -111,6 +111,7 @@
 *  =====================================================================
       SUBROUTINE CDRVRF4( NOUT, NN, NVAL, THRESH, C1, C2, LDC, CRF, A,
      +                    LDA, S_WORK_CLANGE )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvrfp.f b/TESTING/LIN/cdrvrfp.f
index cffa28d5fb..18cbebf171 100644
--- a/TESTING/LIN/cdrvrfp.f
+++ b/TESTING/LIN/cdrvrfp.f
@@ -241,6 +241,7 @@ SUBROUTINE CDRVRFP( NOUT, NN, NVAL, NNS, NSVAL, NNT, NTVAL,
      +              C_WORK_CLATMS, C_WORK_CPOT02,
      +              C_WORK_CPOT03, S_WORK_CLATMS, S_WORK_CLANHE,
      +              S_WORK_CPOT01, S_WORK_CPOT02, S_WORK_CPOT03 )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvsp.f b/TESTING/LIN/cdrvsp.f
index d7a9748d18..753d324531 100644
--- a/TESTING/LIN/cdrvsp.f
+++ b/TESTING/LIN/cdrvsp.f
@@ -154,6 +154,7 @@
       SUBROUTINE CDRVSP( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvsy.f b/TESTING/LIN/cdrvsy.f
index 27a697e8b0..f5fd5695b9 100644
--- a/TESTING/LIN/cdrvsy.f
+++ b/TESTING/LIN/cdrvsy.f
@@ -150,6 +150,7 @@
       SUBROUTINE CDRVSY( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvsy_aa.f b/TESTING/LIN/cdrvsy_aa.f
index 7814d3ae6d..70291ee7a2 100644
--- a/TESTING/LIN/cdrvsy_aa.f
+++ b/TESTING/LIN/cdrvsy_aa.f
@@ -150,6 +150,7 @@
       SUBROUTINE CDRVSY_AA( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                      NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                      RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvsy_aa_2stage.f b/TESTING/LIN/cdrvsy_aa_2stage.f
index 3059a4c9c6..f33aef213f 100644
--- a/TESTING/LIN/cdrvsy_aa_2stage.f
+++ b/TESTING/LIN/cdrvsy_aa_2stage.f
@@ -152,6 +152,7 @@ SUBROUTINE CDRVSY_AA_2STAGE(
      $                         DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                         NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                         RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvsy_rk.f b/TESTING/LIN/cdrvsy_rk.f
index baa9e178d1..844643f956 100644
--- a/TESTING/LIN/cdrvsy_rk.f
+++ b/TESTING/LIN/cdrvsy_rk.f
@@ -154,6 +154,7 @@
       SUBROUTINE CDRVSY_RK( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                      NMAX, A, AFAC, E, AINV, B, X, XACT, WORK,
      $                      RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvsy_rook.f b/TESTING/LIN/cdrvsy_rook.f
index 4dc04c0299..586cee58ff 100644
--- a/TESTING/LIN/cdrvsy_rook.f
+++ b/TESTING/LIN/cdrvsy_rook.f
@@ -149,6 +149,7 @@
       SUBROUTINE CDRVSY_ROOK( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                        NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                        RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cdrvsyx.f b/TESTING/LIN/cdrvsyx.f
index 309f7f8702..60a1159680 100644
--- a/TESTING/LIN/cdrvsyx.f
+++ b/TESTING/LIN/cdrvsyx.f
@@ -154,6 +154,7 @@
       SUBROUTINE CDRVSY( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cerrge.f b/TESTING/LIN/cerrge.f
index 1fcf656f78..5e73d7db19 100644
--- a/TESTING/LIN/cerrge.f
+++ b/TESTING/LIN/cerrge.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRGE( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cerrgex.f b/TESTING/LIN/cerrgex.f
index 9858faeaa5..c544f27d05 100644
--- a/TESTING/LIN/cerrgex.f
+++ b/TESTING/LIN/cerrgex.f
@@ -55,6 +55,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRGE( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cerrgt.f b/TESTING/LIN/cerrgt.f
index c342133ebe..dc5566cb26 100644
--- a/TESTING/LIN/cerrgt.f
+++ b/TESTING/LIN/cerrgt.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRGT( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cerrhe.f b/TESTING/LIN/cerrhe.f
index d0c5cf6b59..cbec382423 100644
--- a/TESTING/LIN/cerrhe.f
+++ b/TESTING/LIN/cerrhe.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRHE( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -133,7 +134,7 @@ SUBROUTINE CERRHE( PATH, NUNIT )
       IF( LSAMEN( 2, C2, 'HE' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a Hermitian indefinite matrix with patrial
+*        of a Hermitian indefinite matrix with partial
 *        (Bunch-Kaufman) diagonal pivoting method.
 *
 *        CHETRF
@@ -576,7 +577,7 @@ SUBROUTINE CERRHE( PATH, NUNIT )
          CALL CHKXER( 'CHETRS_AA_STAGE', INFOT, NOUT, LERR, OK )
 *
 *        Test error exits of the routines that use factorization
-*        of a Hermitian indefinite packed matrix with patrial
+*        of a Hermitian indefinite packed matrix with partial
 *        (Bunch-Kaufman) diagonal pivoting method.
 *
       ELSE IF( LSAMEN( 2, C2, 'HP' ) ) THEN
diff --git a/TESTING/LIN/cerrhex.f b/TESTING/LIN/cerrhex.f
index b6c8897987..8cd7d92581 100644
--- a/TESTING/LIN/cerrhex.f
+++ b/TESTING/LIN/cerrhex.f
@@ -55,6 +55,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRHE( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -137,7 +138,7 @@ SUBROUTINE CERRHE( PATH, NUNIT )
       IF( LSAMEN( 2, C2, 'HE' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a Hermitian indefinite matrix with patrial
+*        of a Hermitian indefinite matrix with partial
 *        (Bunch-Kaufman) diagonal pivoting method.
 *
 *        CHETRF
@@ -523,7 +524,7 @@ SUBROUTINE CERRHE( PATH, NUNIT )
       ELSE IF( LSAMEN( 2, C2, 'HP' ) ) THEN
 *
 *     Test error exits of the routines that use factorization
-*     of a Hermitian indefinite packed matrix with patrial
+*     of a Hermitian indefinite packed matrix with partial
 *     (Bunch-Kaufman) diagonal pivoting method.
 *
 *        CHPTRF
diff --git a/TESTING/LIN/cerrlq.f b/TESTING/LIN/cerrlq.f
index 1036835b4d..e9a5b3b533 100644
--- a/TESTING/LIN/cerrlq.f
+++ b/TESTING/LIN/cerrlq.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRLQ( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -76,7 +77,7 @@ SUBROUTINE CERRLQ( PATH, NUNIT )
      $                   W( NMAX ), X( NMAX )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAESM, CGELQ2, CGELQF, CGELQS, CHKXER, CUNGL2,
+      EXTERNAL           ALAESM, CGELQ2, CGELQF, CHKXER, CUNGL2,
      $                   CUNGLQ, CUNML2, CUNMLQ
 *     ..
 *     .. Scalars in Common ..
@@ -140,31 +141,6 @@ SUBROUTINE CERRLQ( PATH, NUNIT )
       CALL CGELQ2( 2, 1, A, 1, B, W, INFO )
       CALL CHKXER( 'CGELQ2', INFOT, NOUT, LERR, OK )
 *
-*     CGELQS
-*
-      SRNAMT = 'CGELQS'
-      INFOT = 1
-      CALL CGELQS( -1, 0, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'CGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 2
-      CALL CGELQS( 0, -1, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'CGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 2
-      CALL CGELQS( 2, 1, 0, A, 2, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'CGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 3
-      CALL CGELQS( 0, 0, -1, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'CGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 5
-      CALL CGELQS( 2, 2, 0, A, 1, X, B, 2, W, 1, INFO )
-      CALL CHKXER( 'CGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 8
-      CALL CGELQS( 1, 2, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'CGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 10
-      CALL CGELQS( 1, 1, 2, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'CGELQS', INFOT, NOUT, LERR, OK )
-*
 *     CUNGLQ
 *
       SRNAMT = 'CUNGLQ'
diff --git a/TESTING/LIN/cerrls.f b/TESTING/LIN/cerrls.f
index 48e44ad863..5c0daad020 100644
--- a/TESTING/LIN/cerrls.f
+++ b/TESTING/LIN/cerrls.f
@@ -22,7 +22,7 @@
 *> \verbatim
 *>
 *> CERRLS tests the error exits for the COMPLEX least squares
-*> driver routines (CGELS, CGELSS, CGELSY, CGELSD).
+*> driver routines (CGELS, CGELST, CGETSLS, CGELSS, CGELSY, CGELSD).
 *> \endverbatim
 *
 *  Arguments:
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRLS( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -83,7 +84,8 @@ SUBROUTINE CERRLS( PATH, NUNIT )
       EXTERNAL           LSAMEN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAESM, CGELS, CGELSD, CGELSS, CGELSY, CHKXER
+      EXTERNAL           ALAESM, CHKXER, CGELS, CGELSD, CGELSS, CGELST,
+     $                   CGELSY, CGETSLS
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -130,10 +132,66 @@ SUBROUTINE CERRLS( PATH, NUNIT )
          INFOT = 8
          CALL CGELS( 'N', 2, 0, 0, A, 2, B, 1, W, 2, INFO )
          CALL CHKXER( 'CGELS ', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL CGELS( 'N', 0, 2, 0, A, 1, B, 1, W, 2, INFO )
+         CALL CHKXER( 'CGELS', INFOT, NOUT, LERR, OK )
          INFOT = 10
          CALL CGELS( 'N', 1, 1, 0, A, 1, B, 1, W, 1, INFO )
          CALL CHKXER( 'CGELS ', INFOT, NOUT, LERR, OK )
 *
+*        CGELST
+*
+         SRNAMT = 'CGELST'
+         INFOT = 1
+         CALL CGELST( '/', 0, 0, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'CGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL CGELST( 'N', -1, 0, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'CGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL CGELST( 'N', 0, -1, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'CGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL CGELST( 'N', 0, 0, -1, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'CGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 6
+         CALL CGELST( 'N', 2, 0, 0, A, 1, B, 2, W, 2, INFO )
+         CALL CHKXER( 'CGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL CGELST( 'N', 2, 0, 0, A, 2, B, 1, W, 2, INFO )
+         CALL CHKXER( 'CGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL CGELST( 'N', 0, 2, 0, A, 1, B, 1, W, 2, INFO )
+         CALL CHKXER( 'CGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL CGELST( 'N', 1, 1, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'CGELST', INFOT, NOUT, LERR, OK )
+*
+*        CGETSLS
+*
+         SRNAMT = 'CGETSLS'
+         INFOT = 1
+         CALL CGETSLS( '/', 0, 0, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'CGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL CGETSLS( 'N', -1, 0, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'CGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL CGETSLS( 'N', 0, -1, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'CGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL CGETSLS( 'N', 0, 0, -1, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'CGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 6
+         CALL CGETSLS( 'N', 2, 0, 0, A, 1, B, 2, W, 2, INFO )
+         CALL CHKXER( 'CGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL CGETSLS( 'N', 2, 0, 0, A, 2, B, 1, W, 2, INFO )
+         CALL CHKXER( 'CGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL CGETSLS( 'N', 0, 2, 0, A, 1, B, 1, W, 2, INFO )
+         CALL CHKXER( 'CGETSLS', INFOT, NOUT, LERR, OK )
+*
 *        CGELSS
 *
          SRNAMT = 'CGELSS'
diff --git a/TESTING/LIN/cerrpo.f b/TESTING/LIN/cerrpo.f
index 40ebe52201..04e0d250d6 100644
--- a/TESTING/LIN/cerrpo.f
+++ b/TESTING/LIN/cerrpo.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRPO( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cerrpox.f b/TESTING/LIN/cerrpox.f
index 2973a1da5b..45d295e4e2 100644
--- a/TESTING/LIN/cerrpox.f
+++ b/TESTING/LIN/cerrpox.f
@@ -55,6 +55,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRPO( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cerrps.f b/TESTING/LIN/cerrps.f
index 6b19424bc6..4e8685abc3 100644
--- a/TESTING/LIN/cerrps.f
+++ b/TESTING/LIN/cerrps.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRPS( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cerrql.f b/TESTING/LIN/cerrql.f
index 50f97d4dc9..801a933abf 100644
--- a/TESTING/LIN/cerrql.f
+++ b/TESTING/LIN/cerrql.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRQL( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cerrqp.f b/TESTING/LIN/cerrqp.f
index a2188a71ad..64b4cdef99 100644
--- a/TESTING/LIN/cerrqp.f
+++ b/TESTING/LIN/cerrqp.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRQP( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cerrqr.f b/TESTING/LIN/cerrqr.f
index 21cf22936a..313afbcb44 100644
--- a/TESTING/LIN/cerrqr.f
+++ b/TESTING/LIN/cerrqr.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRQR( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -77,7 +78,7 @@ SUBROUTINE CERRQR( PATH, NUNIT )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALAESM, CGEQR2, CGEQR2P, CGEQRF, CGEQRFP,
-     $                   CGEQRS, CHKXER, CUNG2R, CUNGQR, CUNM2R,
+     $                   CHKXER, CUNG2R, CUNGQR, CUNM2R,
      $                   CUNMQR
 *     ..
 *     .. Scalars in Common ..
@@ -170,31 +171,6 @@ SUBROUTINE CERRQR( PATH, NUNIT )
       CALL CGEQR2P( 2, 1, A, 1, B, W, INFO )
       CALL CHKXER( 'CGEQR2P', INFOT, NOUT, LERR, OK )
 *
-*     CGEQRS
-*
-      SRNAMT = 'CGEQRS'
-      INFOT = 1
-      CALL CGEQRS( -1, 0, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'CGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 2
-      CALL CGEQRS( 0, -1, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'CGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 2
-      CALL CGEQRS( 1, 2, 0, A, 2, X, B, 2, W, 1, INFO )
-      CALL CHKXER( 'CGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 3
-      CALL CGEQRS( 0, 0, -1, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'CGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 5
-      CALL CGEQRS( 2, 1, 0, A, 1, X, B, 2, W, 1, INFO )
-      CALL CHKXER( 'CGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 8
-      CALL CGEQRS( 2, 1, 0, A, 2, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'CGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 10
-      CALL CGEQRS( 1, 1, 2, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'CGEQRS', INFOT, NOUT, LERR, OK )
-*
 *     CUNGQR
 *
       SRNAMT = 'CUNGQR'
diff --git a/TESTING/LIN/cerrrfp.f b/TESTING/LIN/cerrrfp.f
index 4f2196c32b..252109c0fd 100644
--- a/TESTING/LIN/cerrrfp.f
+++ b/TESTING/LIN/cerrrfp.f
@@ -49,6 +49,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRRFP( NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -63,7 +64,8 @@ SUBROUTINE CERRRFP( NUNIT )
 *     ..
 *     .. Local Scalars ..
       INTEGER            INFO
-      COMPLEX            ALPHA, BETA
+      COMPLEX            ALPHACMPLX
+      REAL               ALPHA, BETA
 *     ..
 *     .. Local Arrays ..
       COMPLEX            A( 1, 1), B( 1, 1)
@@ -89,10 +91,11 @@ SUBROUTINE CERRRFP( NUNIT )
 *
       NOUT = NUNIT
       OK = .TRUE.
-      A( 1, 1 ) = CMPLX( 1.D0 , 1.D0  )
-      B( 1, 1 ) = CMPLX( 1.D0 , 1.D0  )
-      ALPHA     = CMPLX( 1.D0 , 1.D0  )
-      BETA      = CMPLX( 1.D0 , 1.D0  )
+      A( 1, 1 ) = CMPLX( 1.0 , 1.0 )
+      B( 1, 1 ) = CMPLX( 1.0 , 1.0  )
+      ALPHACMPLX = CMPLX( 1.0 , 1.0  )
+      ALPHA = 1.0
+      BETA = 1.0
 *
       SRNAMT = 'CPFTRF'
       INFOT = 1
@@ -135,28 +138,28 @@ SUBROUTINE CERRRFP( NUNIT )
 *
       SRNAMT = 'CTFSM '
       INFOT = 1
-      CALL CTFSM( '/', 'L', 'U', 'C', 'U', 0, 0, ALPHA, A, B, 1 )
+      CALL CTFSM( '/', 'L', 'U', 'C', 'U', 0, 0, ALPHACMPLX, A, B, 1 )
       CALL CHKXER( 'CTFSM ', INFOT, NOUT, LERR, OK )
       INFOT = 2
-      CALL CTFSM( 'N', '/', 'U', 'C', 'U', 0, 0, ALPHA, A, B, 1 )
+      CALL CTFSM( 'N', '/', 'U', 'C', 'U', 0, 0, ALPHACMPLX, A, B, 1 )
       CALL CHKXER( 'CTFSM ', INFOT, NOUT, LERR, OK )
       INFOT = 3
-      CALL CTFSM( 'N', 'L', '/', 'C', 'U', 0, 0, ALPHA, A, B, 1 )
+      CALL CTFSM( 'N', 'L', '/', 'C', 'U', 0, 0, ALPHACMPLX, A, B, 1 )
       CALL CHKXER( 'CTFSM ', INFOT, NOUT, LERR, OK )
       INFOT = 4
-      CALL CTFSM( 'N', 'L', 'U', '/', 'U', 0, 0, ALPHA, A, B, 1 )
+      CALL CTFSM( 'N', 'L', 'U', '/', 'U', 0, 0, ALPHACMPLX, A, B, 1 )
       CALL CHKXER( 'CTFSM ', INFOT, NOUT, LERR, OK )
       INFOT = 5
-      CALL CTFSM( 'N', 'L', 'U', 'C', '/', 0, 0, ALPHA, A, B, 1 )
+      CALL CTFSM( 'N', 'L', 'U', 'C', '/', 0, 0, ALPHACMPLX, A, B, 1 )
       CALL CHKXER( 'CTFSM ', INFOT, NOUT, LERR, OK )
       INFOT = 6
-      CALL CTFSM( 'N', 'L', 'U', 'C', 'U', -1, 0, ALPHA, A, B, 1 )
+      CALL CTFSM( 'N', 'L', 'U', 'C', 'U', -1, 0, ALPHACMPLX, A, B, 1 )
       CALL CHKXER( 'CTFSM ', INFOT, NOUT, LERR, OK )
       INFOT = 7
-      CALL CTFSM( 'N', 'L', 'U', 'C', 'U', 0, -1, ALPHA, A, B, 1 )
+      CALL CTFSM( 'N', 'L', 'U', 'C', 'U', 0, -1, ALPHACMPLX, A, B, 1 )
       CALL CHKXER( 'CTFSM ', INFOT, NOUT, LERR, OK )
       INFOT = 11
-      CALL CTFSM( 'N', 'L', 'U', 'C', 'U', 0, 0, ALPHA, A, B, 0 )
+      CALL CTFSM( 'N', 'L', 'U', 'C', 'U', 0, 0, ALPHACMPLX, A, B, 0 )
       CALL CHKXER( 'CTFSM ', INFOT, NOUT, LERR, OK )
 *
       SRNAMT = 'CTFTRI'
diff --git a/TESTING/LIN/cerrrq.f b/TESTING/LIN/cerrrq.f
index 2c8c5978fa..79c23c2fc3 100644
--- a/TESTING/LIN/cerrrq.f
+++ b/TESTING/LIN/cerrrq.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRRQ( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cerrsy.f b/TESTING/LIN/cerrsy.f
index a236d2d183..fd84418fbc 100644
--- a/TESTING/LIN/cerrsy.f
+++ b/TESTING/LIN/cerrsy.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRSY( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -130,7 +131,7 @@ SUBROUTINE CERRSY( PATH, NUNIT )
       IF( LSAMEN( 2, C2, 'SY' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a symmetric indefinite matrix with patrial
+*        of a symmetric indefinite matrix with partial
 *        (Bunch-Kaufman) diagonal pivoting method.
 *
 *        CSYTRF
@@ -469,7 +470,7 @@ SUBROUTINE CERRSY( PATH, NUNIT )
       ELSE IF( LSAMEN( 2, C2, 'SP' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a symmetric indefinite packed matrix with patrial
+*        of a symmetric indefinite packed matrix with partial
 *        (Bunch-Kaufman) diagonal pivoting method.
 *
 *        CSPTRF
diff --git a/TESTING/LIN/cerrsyx.f b/TESTING/LIN/cerrsyx.f
index 34972668e2..dc238780cf 100644
--- a/TESTING/LIN/cerrsyx.f
+++ b/TESTING/LIN/cerrsyx.f
@@ -55,6 +55,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRSY( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -135,7 +136,7 @@ SUBROUTINE CERRSY( PATH, NUNIT )
       IF( LSAMEN( 2, C2, 'SY' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a symmetric indefinite matrix with patrial
+*        of a symmetric indefinite matrix with partial
 *        (Bunch-Kaufman) diagonal pivoting method.
 *
 *        CSYTRF
@@ -521,7 +522,7 @@ SUBROUTINE CERRSY( PATH, NUNIT )
       ELSE IF( LSAMEN( 2, C2, 'SP' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a symmetric indefinite packed matrix with patrial
+*        of a symmetric indefinite packed matrix with partial
 *        (Bunch-Kaufman) diagonal pivoting method.
 *
 *        CSPTRF
diff --git a/TESTING/LIN/cerrtr.f b/TESTING/LIN/cerrtr.f
index db65edd881..bda688b1bc 100644
--- a/TESTING/LIN/cerrtr.f
+++ b/TESTING/LIN/cerrtr.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRTR( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -70,7 +71,7 @@ SUBROUTINE CERRTR( PATH, NUNIT )
 *     .. Local Scalars ..
       CHARACTER*2        C2
       INTEGER            INFO
-      REAL               RCOND, SCALE
+      REAL               RCOND, SCALE, SCALES(0)
 *     ..
 *     .. Local Arrays ..
       REAL               R1( NMAX ), R2( NMAX ), RW( NMAX )
@@ -82,9 +83,10 @@ SUBROUTINE CERRTR( PATH, NUNIT )
       EXTERNAL           LSAMEN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAESM, CHKXER, CLATBS, CLATPS, CLATRS, CTBCON,
-     $                   CTBRFS, CTBTRS, CTPCON, CTPRFS, CTPTRI, CTPTRS,
-     $                   CTRCON, CTRRFS, CTRTI2, CTRTRI, CTRTRS
+      EXTERNAL           ALAESM, CHKXER, CLATBS, CLATPS, CLATRS,
+     $                   CLATRS3, CTBCON, CTBRFS, CTBTRS, CTPCON,
+     $                   CTPRFS, CTPTRI, CTPTRS, CTRCON, CTRRFS, CTRTI2,
+     $                   CTRTRI, CTRTRS
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -240,6 +242,46 @@ SUBROUTINE CERRTR( PATH, NUNIT )
          CALL CLATRS( 'U', 'N', 'N', 'N', 2, A, 1, X, SCALE, RW, INFO )
          CALL CHKXER( 'CLATRS', INFOT, NOUT, LERR, OK )
 *
+*        CLATRS3
+*
+         SRNAMT = 'CLATRS3'
+         INFOT = 1
+         CALL CLATRS3( '/', 'N', 'N', 'N', 0, 0, A, 1, X, 1, SCALES,
+     $                 RW, RW( 2 ), 1, INFO )
+         CALL CHKXER( 'CLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL CLATRS3( 'U', '/', 'N', 'N', 0, 0, A, 1, X, 1, SCALES,
+     $                 RW, RW( 2 ), 1, INFO )
+         CALL CHKXER( 'CLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL CLATRS3( 'U', 'N', '/', 'N', 0, 0, A, 1, X, 1, SCALES,
+     $                 RW, RW( 2 ), 1, INFO )
+         CALL CHKXER( 'CLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL CLATRS3( 'U', 'N', 'N', '/', 0, 0, A, 1, X, 1, SCALES,
+     $                 RW, RW( 2 ), 1, INFO )
+         CALL CHKXER( 'CLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL CLATRS3( 'U', 'N', 'N', 'N', -1, 0, A, 1, X, 1, SCALES,
+     $                 RW, RW( 2 ), 1, INFO )
+         CALL CHKXER( 'CLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 6
+         CALL CLATRS3( 'U', 'N', 'N', 'N', 0, -1, A, 1, X, 1, SCALES,
+     $                 RW, RW( 2 ), 1, INFO )
+         CALL CHKXER( 'CLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL CLATRS3( 'U', 'N', 'N', 'N', 2, 0, A, 1, X, 1, SCALES,
+     $                 RW, RW( 2 ), 1, INFO )
+         CALL CHKXER( 'CLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL CLATRS3( 'U', 'N', 'N', 'N', 2, 0, A, 2, X, 1, SCALES,
+     $                 RW, RW( 2 ), 1, INFO )
+         CALL CHKXER( 'CLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 14
+         CALL CLATRS3( 'U', 'N', 'N', 'N', 1, 0, A, 1, X, 1, SCALES,
+     $                 RW, RW( 2 ), 0, INFO )
+         CALL CHKXER( 'CLATRS3', INFOT, NOUT, LERR, OK )
+*
 *     Test error exits for the packed triangular routines.
 *
       ELSE IF( LSAMEN( 2, C2, 'TP' ) ) THEN
diff --git a/TESTING/LIN/cerrtsqr.f b/TESTING/LIN/cerrtsqr.f
index 173e2e527e..165c8d6816 100644
--- a/TESTING/LIN/cerrtsqr.f
+++ b/TESTING/LIN/cerrtsqr.f
@@ -70,7 +70,7 @@ SUBROUTINE CERRTSQR( PATH, NUNIT )
       PARAMETER          ( NMAX = 2 )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I, INFO, J, NB
+      INTEGER            I, INFO, J, MB, NB
 *     ..
 *     .. Local Arrays ..
       COMPLEX            A( NMAX, NMAX ), T( NMAX, NMAX ), W( NMAX ),
@@ -130,6 +130,35 @@ SUBROUTINE CERRTSQR( PATH, NUNIT )
       CALL CGEQR( 3, 2, A, 3, TAU, 8, W, 0, INFO )
       CALL CHKXER( 'CGEQR', INFOT, NOUT, LERR, OK )
 *
+*     CLATSQR
+*
+      MB = 1
+      NB = 1
+      SRNAMT = 'CLATSQR'
+      INFOT = 1
+      CALL CLATSQR( -1, 0, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'CLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL CLATSQR( 1, 2, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'CLATSQR', INFOT, NOUT, LERR, OK )
+      CALL CLATSQR( 0, -1, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'CLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL CLATSQR( 2, 1, -1, NB, A, 2, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'CLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL CLATSQR( 2, 1, MB, 2, A, 2, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'CLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 6
+      CALL CLATSQR( 2, 1, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'CLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL CLATSQR( 2, 1, MB, NB, A, 2, TAU, 0, W, 1, INFO )
+      CALL CHKXER( 'CLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL CLATSQR( 2, 1, MB, NB, A, 2, TAU, 2, W, 0, INFO )
+      CALL CHKXER( 'CLATSQR', INFOT, NOUT, LERR, OK )
+*
 *     CGEMQR
 *
       TAU(1)=1
@@ -189,6 +218,37 @@ SUBROUTINE CERRTSQR( PATH, NUNIT )
       CALL CGELQ( 2, 3, A, 3, TAU, 8, W, 0, INFO )
       CALL CHKXER( 'CGELQ', INFOT, NOUT, LERR, OK )
 *
+*     CLASWLQ
+*
+      MB = 1
+      NB = 1
+      SRNAMT = 'CLASWLQ'
+      INFOT = 1
+      CALL CLASWLQ( -1, 0, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'CLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL CLASWLQ( 2, 1, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'CLASWLQ', INFOT, NOUT, LERR, OK )
+      CALL CLASWLQ( 0, -1, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'CLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL CLASWLQ( 1, 2, -1, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'CLASWLQ', INFOT, NOUT, LERR, OK )
+      CALL CLASWLQ( 1, 1, 2, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'CLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL CLASWLQ( 1, 2, MB, -1, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'CLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 6
+      CALL CLASWLQ( 1, 2, MB, NB, A, 0, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'CLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL CLASWLQ( 1, 2, MB, NB, A, 1, TAU, 0, W, 1, INFO )
+      CALL CHKXER( 'CLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL CLASWLQ( 1, 2, MB, NB, A, 1, TAU, 1, W, 0, INFO )
+      CALL CHKXER( 'CLASWLQ', INFOT, NOUT, LERR, OK )
+*
 *     CGEMLQ
 *
       TAU(1)=1
diff --git a/TESTING/LIN/cerrtz.f b/TESTING/LIN/cerrtz.f
index 4c81279ab4..e2750349d2 100644
--- a/TESTING/LIN/cerrtz.f
+++ b/TESTING/LIN/cerrtz.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRTZ( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cerrvx.f b/TESTING/LIN/cerrvx.f
index 701abd1613..a86f0712ec 100644
--- a/TESTING/LIN/cerrvx.f
+++ b/TESTING/LIN/cerrvx.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRVX( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -87,7 +88,7 @@ SUBROUTINE CERRVX( PATH, NUNIT )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CGBSV, CGBSVX, CGESV, CGESVX, CGTSV, CGTSVX,
-     $                   CHESV, CHESV_RK ,CHESV_ROOK, CHESVX, CHKXER,
+     $                   CHESV, CHESV_RK, CHESV_ROOK, CHESVX, CHKXER,
      $                   CHPSV, CHPSVX, CPBSV, CPBSVX, CPOSV, CPOSVX,
      $                   CPPSV, CPPSVX, CPTSV, CPTSVX, CSPSV, CSPSVX,
      $                   CSYSV, CSYSV_AA, CSYSV_RK, CSYSV_ROOK,
@@ -651,6 +652,9 @@ SUBROUTINE CERRVX( PATH, NUNIT )
          INFOT = 3
          CALL CHESV_ROOK( 'U', 0, -1, A, 1, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'CHESV_ROOK', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL CHESV_ROOK( 'U', 2, 0, A, 1, IP, B, 2, W, 1, INFO )
+         CALL CHKXER( 'CHESV_ROOK', INFOT, NOUT, LERR, OK )
          INFOT = 8
          CALL CHESV_ROOK( 'U', 2, 0, A, 2, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'CHESV_ROOK', INFOT, NOUT, LERR, OK )
@@ -710,9 +714,15 @@ SUBROUTINE CERRVX( PATH, NUNIT )
          INFOT = 3
          CALL CHESV_AA( 'U', 0, -1, A, 1, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'CHESV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL CHESV_AA( 'U', 2, 0, A, 1, IP, B, 2, W, 1, INFO )
+         CALL CHKXER( 'CHESV_AA', INFOT, NOUT, LERR, OK )
          INFOT = 8
          CALL CHESV_AA( 'U', 2, 0, A, 2, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'CHESV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL CHESV_AA( 'U', 3, 1, A, 3, IP, B, 3, W, 6, INFO )
+         CALL CHKXER( 'CHESV_AA', INFOT, NOUT, LERR, OK )
 *
       ELSE IF( LSAMEN( 2, C2, 'H2' ) ) THEN
 *
@@ -733,16 +743,44 @@ SUBROUTINE CERRVX( PATH, NUNIT )
          CALL CHKXER( 'CHESV_AA_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 5
          CALL CHESV_AA_2STAGE( 'U', 2, 1, A, 1, A, 1, IP, IP, B, 1,
+     $                         W, 1, INFO )
+         CALL CHKXER( 'CHESV_AA_2STAGE', INFOT, NOUT, LERR, OK )
+         INFOT = 7
+         CALL CHESV_AA_2STAGE( 'U', 2, 1, A, 2, A, 1, IP, IP, B, 2,
      $                         W, 1, INFO )
          CALL CHKXER( 'CHESV_AA_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 11
          CALL CHESV_AA_2STAGE( 'U', 2, 1, A, 2, A, 8, IP, IP, B, 1,
      $                         W, 1, INFO )
          CALL CHKXER( 'CHESV_AA_2STAGE', INFOT, NOUT, LERR, OK )
-         INFOT = 7
-         CALL CHESV_AA_2STAGE( 'U', 2, 1, A, 2, A, 1, IP, IP, B, 2,
+         INFOT = 13
+         CALL CHESV_AA_2STAGE( 'U', 2, 1, A, 2, A, 8, IP, IP, B, 2,
      $                         W, 1, INFO )
          CALL CHKXER( 'CHESV_AA_2STAGE', INFOT, NOUT, LERR, OK )
+*
+      ELSE IF( LSAMEN( 2, C2, 'SA' ) ) THEN
+*
+*        CSYSV_AASEN
+*
+         SRNAMT = 'CSYSV_AA'
+         INFOT = 1
+         CALL CSYSV_AA( '/', 0, 0, A, 1, IP, B, 1, W, 1, INFO )
+         CALL CHKXER( 'CSYSV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL CSYSV_AA( 'U', -1, 0, A, 1, IP, B, 1, W, 1, INFO )
+         CALL CHKXER( 'CSYSV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL CSYSV_AA( 'U', 0, -1, A, 1, IP, B, 1, W, 1, INFO )
+         CALL CHKXER( 'CSYSV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL CSYSV_AA( 'U', 2, 0, A, 1, IP, B, 2, W, 1, INFO )
+         CALL CHKXER( 'CSYSV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL CSYSV_AA( 'U', 2, 0, A, 2, IP, B, 1, W, 1, INFO )
+         CALL CHKXER( 'CSYSV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL CSYSV_AA( 'U', 3, 1, A, 3, IP, B, 3, W, 6, INFO )
+         CALL CHKXER( 'CSYSV_AA', INFOT, NOUT, LERR, OK )
 *
       ELSE IF( LSAMEN( 2, C2, 'S2' ) ) THEN
 *
@@ -763,14 +801,18 @@ SUBROUTINE CERRVX( PATH, NUNIT )
          CALL CHKXER( 'CSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 5
          CALL CSYSV_AA_2STAGE( 'U', 2, 1, A, 1, A, 1, IP, IP, B, 1,
+     $                         W, 1, INFO )
+         CALL CHKXER( 'CSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
+         INFOT = 7
+         CALL CSYSV_AA_2STAGE( 'U', 2, 1, A, 2, A, 1, IP, IP, B, 2,
      $                         W, 1, INFO )
          CALL CHKXER( 'CSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 11
          CALL CSYSV_AA_2STAGE( 'U', 2, 1, A, 2, A, 8, IP, IP, B, 1,
      $                         W, 1, INFO )
          CALL CHKXER( 'CSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
-         INFOT = 7
-         CALL CSYSV_AA_2STAGE( 'U', 2, 1, A, 2, A, 1, IP, IP, B, 2,
+         INFOT = 13
+         CALL CSYSV_AA_2STAGE( 'U', 2, 1, A, 2, A, 8, IP, IP, B, 2,
      $                         W, 1, INFO )
          CALL CHKXER( 'CSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
 *
@@ -834,6 +876,9 @@ SUBROUTINE CERRVX( PATH, NUNIT )
          INFOT = 3
          CALL CSYSV( 'U', 0, -1, A, 1, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'CSYSV ', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL CSYSV( 'U', 2, 0, A, 1, IP, B, 2, W, 1, INFO )
+         CALL CHKXER( 'CSYSV ', INFOT, NOUT, LERR, OK )
          INFOT = 8
          CALL CSYSV( 'U', 2, 0, A, 2, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'CSYSV ', INFOT, NOUT, LERR, OK )
@@ -898,6 +943,9 @@ SUBROUTINE CERRVX( PATH, NUNIT )
          INFOT = 3
          CALL CSYSV_ROOK( 'U', 0, -1, A, 1, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'CSYSV_ROOK', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL CSYSV_ROOK( 'U', 2, 0, A, 1, IP, B, 2, W, 1, INFO )
+         CALL CHKXER( 'CSYSV_ROOK', INFOT, NOUT, LERR, OK )
          INFOT = 8
          CALL CSYSV_ROOK( 'U', 2, 0, A, 2, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'CSYSV_ROOK', INFOT, NOUT, LERR, OK )
diff --git a/TESTING/LIN/cerrvxx.f b/TESTING/LIN/cerrvxx.f
index 8fdd36f7c3..57c45cf3c7 100644
--- a/TESTING/LIN/cerrvxx.f
+++ b/TESTING/LIN/cerrvxx.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE CERRVX( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cgbt01.f b/TESTING/LIN/cgbt01.f
index 148076e9ac..d079c447af 100644
--- a/TESTING/LIN/cgbt01.f
+++ b/TESTING/LIN/cgbt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE CGBT01( M, N, KL, KU, A, LDA, AFAC, LDAFAC, IPIV, WORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cgbt02.f b/TESTING/LIN/cgbt02.f
index 3204a89867..af9b14ee38 100644
--- a/TESTING/LIN/cgbt02.f
+++ b/TESTING/LIN/cgbt02.f
@@ -145,6 +145,7 @@
 *  =====================================================================
       SUBROUTINE CGBT02( TRANS, M, N, KL, KU, NRHS, A, LDA, X, LDX, B,
      $                   LDB, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cgbt05.f b/TESTING/LIN/cgbt05.f
index 34b81058fd..ec359d6543 100644
--- a/TESTING/LIN/cgbt05.f
+++ b/TESTING/LIN/cgbt05.f
@@ -173,6 +173,7 @@
 *  =====================================================================
       SUBROUTINE CGBT05( TRANS, N, KL, KU, NRHS, AB, LDAB, B, LDB, X,
      $                   LDX, XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cgennd.f b/TESTING/LIN/cgennd.f
index 9667d24730..919a0d6cb5 100644
--- a/TESTING/LIN/cgennd.f
+++ b/TESTING/LIN/cgennd.f
@@ -65,6 +65,7 @@
 *
 *  =====================================================================
       LOGICAL FUNCTION CGENND (M, N, A, LDA)
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cgeqls.f b/TESTING/LIN/cgeqls.f
index 75351220d4..232b5dd238 100644
--- a/TESTING/LIN/cgeqls.f
+++ b/TESTING/LIN/cgeqls.f
@@ -119,6 +119,7 @@
 *  =====================================================================
       SUBROUTINE CGEQLS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cgerqs.f b/TESTING/LIN/cgerqs.f
index 32cc5a89a5..ac28a3643c 100644
--- a/TESTING/LIN/cgerqs.f
+++ b/TESTING/LIN/cgerqs.f
@@ -119,6 +119,7 @@
 *  =====================================================================
       SUBROUTINE CGERQS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cget01.f b/TESTING/LIN/cget01.f
index 8020512c40..40693e3678 100644
--- a/TESTING/LIN/cget01.f
+++ b/TESTING/LIN/cget01.f
@@ -105,6 +105,7 @@
 *  =====================================================================
       SUBROUTINE CGET01( M, N, A, LDA, AFAC, LDAFAC, IPIV, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cget02.f b/TESTING/LIN/cget02.f
index 805ad949ec..cb92c35535 100644
--- a/TESTING/LIN/cget02.f
+++ b/TESTING/LIN/cget02.f
@@ -131,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE CGET02( TRANS, M, N, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cget03.f b/TESTING/LIN/cget03.f
index b55435a234..f5dd5a0652 100644
--- a/TESTING/LIN/cget03.f
+++ b/TESTING/LIN/cget03.f
@@ -107,6 +107,7 @@
 *  =====================================================================
       SUBROUTINE CGET03( N, A, LDA, AINV, LDAINV, WORK, LDWORK, RWORK,
      $                   RCOND, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cget04.f b/TESTING/LIN/cget04.f
index 9aba9910f5..3e7068b853 100644
--- a/TESTING/LIN/cget04.f
+++ b/TESTING/LIN/cget04.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE CGET04( N, NRHS, X, LDX, XACT, LDXACT, RCOND, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cget07.f b/TESTING/LIN/cget07.f
index 5e51dca5a7..f3b43a2e94 100644
--- a/TESTING/LIN/cget07.f
+++ b/TESTING/LIN/cget07.f
@@ -163,6 +163,7 @@
 *  =====================================================================
       SUBROUTINE CGET07( TRANS, N, NRHS, A, LDA, B, LDB, X, LDX, XACT,
      $                   LDXACT, FERR, CHKFERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cgtt01.f b/TESTING/LIN/cgtt01.f
index e504515c58..7bbac81393 100644
--- a/TESTING/LIN/cgtt01.f
+++ b/TESTING/LIN/cgtt01.f
@@ -39,7 +39,7 @@
 *
 *> \param[in] N
 *> \verbatim
-*>          N is INTEGTER
+*>          N is INTEGER
 *>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
@@ -131,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE CGTT01( N, DL, D, DU, DLF, DF, DUF, DU2, IPIV, WORK,
      $                   LDWORK, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cgtt02.f b/TESTING/LIN/cgtt02.f
index 0d067c3378..302f9fa337 100644
--- a/TESTING/LIN/cgtt02.f
+++ b/TESTING/LIN/cgtt02.f
@@ -47,7 +47,7 @@
 *>
 *> \param[in] N
 *> \verbatim
-*>          N is INTEGTER
+*>          N is INTEGER
 *>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
@@ -121,6 +121,7 @@
 *  =====================================================================
       SUBROUTINE CGTT02( TRANS, N, NRHS, DL, D, DU, X, LDX, B, LDB,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cgtt05.f b/TESTING/LIN/cgtt05.f
index 2467cf7c4b..cd80c931c4 100644
--- a/TESTING/LIN/cgtt05.f
+++ b/TESTING/LIN/cgtt05.f
@@ -162,6 +162,7 @@
 *  =====================================================================
       SUBROUTINE CGTT05( TRANS, N, NRHS, DL, D, DU, B, LDB, X, LDX,
      $                   XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/chet01.f b/TESTING/LIN/chet01.f
index 4fc12ed654..6b91c67e59 100644
--- a/TESTING/LIN/chet01.f
+++ b/TESTING/LIN/chet01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE CHET01( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C, LDC,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/chet01_3.f b/TESTING/LIN/chet01_3.f
index 58104a3575..e79f40f392 100644
--- a/TESTING/LIN/chet01_3.f
+++ b/TESTING/LIN/chet01_3.f
@@ -138,6 +138,7 @@
 *  =====================================================================
       SUBROUTINE CHET01_3( UPLO, N, A, LDA, AFAC, LDAFAC, E, IPIV, C,
      $                     LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,7 +189,7 @@ SUBROUTINE CHET01_3( UPLO, N, A, LDA, AFAC, LDAFAC, E, IPIV, C,
          RETURN
       END IF
 *
-*     a) Revert to multiplyers of L
+*     a) Revert to multipliers of L
 *
       CALL CSYCONVF_ROOK( UPLO, 'R', N, AFAC, LDAFAC, E, IPIV, INFO )
 *
diff --git a/TESTING/LIN/chet01_aa.f b/TESTING/LIN/chet01_aa.f
index 8f4ab84e78..5b1a1d708c 100644
--- a/TESTING/LIN/chet01_aa.f
+++ b/TESTING/LIN/chet01_aa.f
@@ -121,6 +121,7 @@
 *  =====================================================================
       SUBROUTINE CHET01_AA( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
      $                      LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -159,7 +160,7 @@ SUBROUTINE CHET01_AA( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
       EXTERNAL           CLASET, CLAVHE
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DBLE
+      INTRINSIC          REAL
 *     ..
 *     .. Executable Statements ..
 *
@@ -255,7 +256,7 @@ SUBROUTINE CHET01_AA( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
          IF( RESID.NE.ZERO )
      $      RESID = ONE / EPS
       ELSE
-         RESID = ( ( RESID / DBLE( N ) ) / ANORM ) / EPS
+         RESID = ( ( RESID / REAL( N ) ) / ANORM ) / EPS
       END IF
 *
       RETURN
diff --git a/TESTING/LIN/chet01_rook.f b/TESTING/LIN/chet01_rook.f
index 30aa976a08..6d22ad9f34 100644
--- a/TESTING/LIN/chet01_rook.f
+++ b/TESTING/LIN/chet01_rook.f
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE CHET01_ROOK( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
      $                        LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/chkxer.f b/TESTING/LIN/chkxer.f
index d2b2c636a4..5a068e7505 100644
--- a/TESTING/LIN/chkxer.f
+++ b/TESTING/LIN/chkxer.f
@@ -38,6 +38,7 @@
 *
 *  =====================================================================
       SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/chpt01.f b/TESTING/LIN/chpt01.f
index 9ed6b7f44c..6df37c8986 100644
--- a/TESTING/LIN/chpt01.f
+++ b/TESTING/LIN/chpt01.f
@@ -110,6 +110,7 @@
 *
 *  =====================================================================
       SUBROUTINE CHPT01( UPLO, N, A, AFAC, IPIV, C, LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/clahilb.f b/TESTING/LIN/clahilb.f
index ba05c5740b..f868a9424d 100644
--- a/TESTING/LIN/clahilb.f
+++ b/TESTING/LIN/clahilb.f
@@ -131,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE CLAHILB( N, NRHS, A, LDA, X, LDX, B, LDB, WORK,
      $     INFO, PATH)
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/claipd.f b/TESTING/LIN/claipd.f
index 958639c0ee..daad94da82 100644
--- a/TESTING/LIN/claipd.f
+++ b/TESTING/LIN/claipd.f
@@ -80,6 +80,7 @@
 *
 *  =====================================================================
       SUBROUTINE CLAIPD( N, A, INDA, VINDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/claptm.f b/TESTING/LIN/claptm.f
index 52febe0333..99934931eb 100644
--- a/TESTING/LIN/claptm.f
+++ b/TESTING/LIN/claptm.f
@@ -126,6 +126,7 @@
 *  =====================================================================
       SUBROUTINE CLAPTM( UPLO, N, NRHS, ALPHA, D, E, X, LDX, BETA, B,
      $                   LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/clarhs.f b/TESTING/LIN/clarhs.f
index 279c98f953..085c5f9fc0 100644
--- a/TESTING/LIN/clarhs.f
+++ b/TESTING/LIN/clarhs.f
@@ -205,6 +205,7 @@
 *  =====================================================================
       SUBROUTINE CLARHS( PATH, XTYPE, UPLO, TRANS, M, N, KL, KU, NRHS,
      $                   A, LDA, X, LDX, B, LDB, ISEED, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/clatb4.f b/TESTING/LIN/clatb4.f
index eeb0f03a96..0893c117cc 100644
--- a/TESTING/LIN/clatb4.f
+++ b/TESTING/LIN/clatb4.f
@@ -118,6 +118,7 @@
 *  =====================================================================
       SUBROUTINE CLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
      $                   CNDNUM, DIST )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -154,9 +155,6 @@ SUBROUTINE CLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           SLABAD
-*     ..
 *     .. Save statement ..
       SAVE               EPS, SMALL, LARGE, BADC1, BADC2, FIRST
 *     ..
@@ -174,11 +172,6 @@ SUBROUTINE CLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
          BADC1 = SQRT( BADC2 )
          SMALL = SLAMCH( 'Safe minimum' )
          LARGE = ONE / SMALL
-*
-*        If it looks like we're on a Cray, take the square root of
-*        SMALL and LARGE to avoid overflow and underflow problems.
-*
-         CALL SLABAD( SMALL, LARGE )
          SMALL = SHRINK*( SMALL / EPS )
          LARGE = ONE / SMALL
       END IF
@@ -233,6 +226,110 @@ SUBROUTINE CLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
          ELSE
             ANORM = ONE
          END IF
+*
+      ELSE IF( LSAMEN( 2, C2, 'QK' ) ) THEN
+*
+*        xQK: truncated QR with pivoting.
+*             Set parameters to generate a general
+*             M x N matrix.
+*
+*        Set TYPE, the type of matrix to be generated.  'N' is nonsymmetric.
+*
+         TYPE = 'N'
+*
+*        Set DIST, the type of distribution for the random
+*        number generator. 'S' is
+*
+         DIST = 'S'
+*
+*        Set the lower and upper bandwidths.
+*
+         IF( IMAT.EQ.2 ) THEN
+*
+*           2. Random, Diagonal, CNDNUM = 2
+*
+            KL = 0
+            KU = 0
+            CNDNUM = TWO
+            ANORM = ONE
+            MODE = 3
+         ELSE IF( IMAT.EQ.3 ) THEN
+*
+*           3. Random, Upper triangular,  CNDNUM = 2
+*
+            KL = 0
+            KU = MAX( N-1, 0 )
+            CNDNUM = TWO
+            ANORM = ONE
+            MODE = 3
+         ELSE IF( IMAT.EQ.4 ) THEN
+*
+*          4. Random, Lower triangular,  CNDNUM = 2
+*
+            KL = MAX( M-1, 0 )
+            KU = 0
+            CNDNUM = TWO
+            ANORM = ONE
+            MODE = 3
+         ELSE
+*
+*           5.-19. Rectangular matrix
+*
+            KL = MAX( M-1, 0 )
+            KU = MAX( N-1, 0 )
+*
+            IF( IMAT.GE.5 .AND. IMAT.LE.14 ) THEN
+*
+*              5.-14. Random, CNDNUM = 2.
+*
+               CNDNUM = TWO
+               ANORM = ONE
+               MODE = 3
+*
+            ELSE IF( IMAT.EQ.15 ) THEN
+*
+*              15. Random, CNDNUM = sqrt(0.1/EPS)
+*
+               CNDNUM = BADC1
+               ANORM = ONE
+               MODE = 3
+*
+            ELSE IF( IMAT.EQ.16 ) THEN
+*
+*              16. Random, CNDNUM = 0.1/EPS
+*
+               CNDNUM = BADC2
+               ANORM = ONE
+               MODE = 3
+*
+            ELSE IF( IMAT.EQ.17 ) THEN
+*
+*              17. Random, CNDNUM = 0.1/EPS,
+*                  one small singular value S(N)=1/CNDNUM
+*
+               CNDNUM = BADC2
+               ANORM = ONE
+               MODE = 2
+*
+            ELSE IF( IMAT.EQ.18 ) THEN
+*
+*              18. Random, scaled near underflow
+*
+               CNDNUM = TWO
+               ANORM = SMALL
+               MODE = 3
+*
+            ELSE IF( IMAT.EQ.19 ) THEN
+*
+*              19. Random, scaled near overflow
+*
+               CNDNUM = TWO
+               ANORM = LARGE
+               MODE = 3
+*
+            END IF
+*
+         END IF
 *
       ELSE IF( LSAMEN( 2, C2, 'GE' ) ) THEN
 *
@@ -517,17 +614,18 @@ SUBROUTINE CLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
 *
 *        Set the norm and condition number.
 *
-         IF( IMAT.EQ.2 .OR. IMAT.EQ.8 ) THEN
+         MAT = ABS( IMAT )
+         IF( MAT.EQ.2 .OR. MAT.EQ.8 ) THEN
             CNDNUM = BADC1
-         ELSE IF( IMAT.EQ.3 .OR. IMAT.EQ.9 ) THEN
+         ELSE IF( MAT.EQ.3 .OR. MAT.EQ.9 ) THEN
             CNDNUM = BADC2
          ELSE
             CNDNUM = TWO
          END IF
 *
-         IF( IMAT.EQ.4 ) THEN
+         IF( MAT.EQ.4 ) THEN
             ANORM = SMALL
-         ELSE IF( IMAT.EQ.5 ) THEN
+         ELSE IF( MAT.EQ.5 ) THEN
             ANORM = LARGE
          ELSE
             ANORM = ONE
diff --git a/TESTING/LIN/clatb5.f b/TESTING/LIN/clatb5.f
index 16f27656e4..46b593ba4b 100644
--- a/TESTING/LIN/clatb5.f
+++ b/TESTING/LIN/clatb5.f
@@ -111,6 +111,7 @@
 *  =====================================================================
       SUBROUTINE CLATB5( PATH, IMAT, N, TYPE, KL, KU, ANORM, MODE,
      $                   CNDNUM, DIST )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -145,9 +146,6 @@ SUBROUTINE CLATB5( PATH, IMAT, N, TYPE, KL, KU, ANORM, MODE,
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           SLABAD
-*     ..
 *     .. Save statement ..
       SAVE               EPS, SMALL, LARGE, BADC1, BADC2, FIRST
 *     ..
@@ -165,11 +163,6 @@ SUBROUTINE CLATB5( PATH, IMAT, N, TYPE, KL, KU, ANORM, MODE,
          BADC1 = SQRT( BADC2 )
          SMALL = SLAMCH( 'Safe minimum' )
          LARGE = ONE / SMALL
-*
-*        If it looks like we're on a Cray, take the square root of
-*        SMALL and LARGE to avoid overflow and underflow problems.
-*
-         CALL SLABAD( SMALL, LARGE )
          SMALL = SHRINK*( SMALL / EPS )
          LARGE = ONE / SMALL
       END IF
diff --git a/TESTING/LIN/clatsp.f b/TESTING/LIN/clatsp.f
index 79bc010ecd..f66c5974ee 100644
--- a/TESTING/LIN/clatsp.f
+++ b/TESTING/LIN/clatsp.f
@@ -81,6 +81,7 @@
 *
 *  =====================================================================
       SUBROUTINE CLATSP( UPLO, N, X, ISEED )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/clatsy.f b/TESTING/LIN/clatsy.f
index 111c649984..b82b20d179 100644
--- a/TESTING/LIN/clatsy.f
+++ b/TESTING/LIN/clatsy.f
@@ -86,6 +86,7 @@
 *
 *  =====================================================================
       SUBROUTINE CLATSY( UPLO, N, X, LDX, ISEED )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/clattb.f b/TESTING/LIN/clattb.f
index c5a21f51f9..0385bbe82a 100644
--- a/TESTING/LIN/clattb.f
+++ b/TESTING/LIN/clattb.f
@@ -138,6 +138,7 @@
 *  =====================================================================
       SUBROUTINE CLATTB( IMAT, UPLO, TRANS, DIAG, ISEED, N, KD, AB,
      $                   LDAB, B, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -178,7 +179,7 @@ SUBROUTINE CLATTB( IMAT, UPLO, TRANS, DIAG, ISEED, N, KD, AB,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CCOPY, CLARNV, CLATB4, CLATMS, CSSCAL, CSWAP,
-     $                   SLABAD, SLARNV
+     $                   SLARNV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, CMPLX, MAX, MIN, REAL, SQRT
@@ -191,7 +192,6 @@ SUBROUTINE CLATTB( IMAT, UPLO, TRANS, DIAG, ISEED, N, KD, AB,
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       SMLNUM = UNFL
       BIGNUM = ( ONE-ULP ) / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       IF( ( IMAT.GE.6 .AND. IMAT.LE.9 ) .OR. IMAT.EQ.17 ) THEN
          DIAG = 'U'
       ELSE
diff --git a/TESTING/LIN/clattp.f b/TESTING/LIN/clattp.f
index 82f0585dfe..010697033e 100644
--- a/TESTING/LIN/clattp.f
+++ b/TESTING/LIN/clattp.f
@@ -128,6 +128,7 @@
 *  =====================================================================
       SUBROUTINE CLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, AP, B, WORK,
      $                   RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -169,7 +170,7 @@ SUBROUTINE CLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, AP, B, WORK,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CLARNV, CLATB4, CLATMS, CROT, CROTG, CSSCAL,
-     $                   SLABAD, SLARNV
+     $                   SLARNV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, CMPLX, CONJG, MAX, REAL, SQRT
@@ -182,7 +183,6 @@ SUBROUTINE CLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, AP, B, WORK,
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       SMLNUM = UNFL
       BIGNUM = ( ONE-ULP ) / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       IF( ( IMAT.GE.7 .AND. IMAT.LE.10 ) .OR. IMAT.EQ.18 ) THEN
          DIAG = 'U'
       ELSE
@@ -336,7 +336,7 @@ SUBROUTINE CLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, AP, B, WORK,
                WORK( J+1 ) = PLUS2
                WORK( N+J+1 ) = ZERO
                PLUS1 = STAR1 / PLUS2
-               REXP = CLARND( 2, ISEED )
+               REXP = REAL( CLARND( 2, ISEED ) )
                IF( REXP.LT.ZERO ) THEN
                   STAR1 = -SFAC**( ONE-REXP )*CLARND( 5, ISEED )
                ELSE
@@ -790,7 +790,7 @@ SUBROUTINE CLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, AP, B, WORK,
             DO 460 J = 1, N / 2
                JL = JJ
                DO 450 I = J, N - J
-                  T = AP( JR-I+J )
+                  T = REAL( AP( JR-I+J ) )
                   AP( JR-I+J ) = AP( JL )
                   AP( JL ) = T
                   JL = JL + I
@@ -804,7 +804,7 @@ SUBROUTINE CLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, AP, B, WORK,
             DO 480 J = 1, N / 2
                JR = JJ
                DO 470 I = J, N - J
-                  T = AP( JL+I-J )
+                  T = REAL( AP( JL+I-J ) )
                   AP( JL+I-J ) = AP( JR )
                   AP( JR ) = T
                   JR = JR - I
diff --git a/TESTING/LIN/clattr.f b/TESTING/LIN/clattr.f
index c26e2f9026..275c1d702e 100644
--- a/TESTING/LIN/clattr.f
+++ b/TESTING/LIN/clattr.f
@@ -135,6 +135,7 @@
 *  =====================================================================
       SUBROUTINE CLATTR( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, LDA, B,
      $                   WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -175,7 +176,7 @@ SUBROUTINE CLATTR( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, LDA, B,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CCOPY, CLARNV, CLATB4, CLATMS, CROT, CROTG,
-     $                   CSSCAL, CSWAP, SLABAD, SLARNV
+     $                   CSSCAL, CSWAP, SLARNV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, CMPLX, CONJG, MAX, REAL, SQRT
@@ -188,7 +189,6 @@ SUBROUTINE CLATTR( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, LDA, B,
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       SMLNUM = UNFL
       BIGNUM = ( ONE-ULP ) / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       IF( ( IMAT.GE.7 .AND. IMAT.LE.10 ) .OR. IMAT.EQ.18 ) THEN
          DIAG = 'U'
       ELSE
diff --git a/TESTING/LIN/clavhe.f b/TESTING/LIN/clavhe.f
index 838c321212..c572be9276 100644
--- a/TESTING/LIN/clavhe.f
+++ b/TESTING/LIN/clavhe.f
@@ -150,6 +150,7 @@
 *  =====================================================================
       SUBROUTINE CLAVHE( UPLO, TRANS, DIAG, N, NRHS, A, LDA, IPIV, B,
      $                   LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/clavhe_rook.f b/TESTING/LIN/clavhe_rook.f
index 9d14637ac7..f6899a1709 100644
--- a/TESTING/LIN/clavhe_rook.f
+++ b/TESTING/LIN/clavhe_rook.f
@@ -153,6 +153,7 @@
 *  =====================================================================
       SUBROUTINE CLAVHE_ROOK( UPLO, TRANS, DIAG, N, NRHS, A, LDA, IPIV,
      $                        B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/clavhp.f b/TESTING/LIN/clavhp.f
index 5715e87f02..1b493e316f 100644
--- a/TESTING/LIN/clavhp.f
+++ b/TESTING/LIN/clavhp.f
@@ -128,6 +128,7 @@
 *  =====================================================================
       SUBROUTINE CLAVHP( UPLO, TRANS, DIAG, N, NRHS, A, IPIV, B, LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/clavsp.f b/TESTING/LIN/clavsp.f
index f23c4d9e53..8e961957af 100644
--- a/TESTING/LIN/clavsp.f
+++ b/TESTING/LIN/clavsp.f
@@ -128,6 +128,7 @@
 *  =====================================================================
       SUBROUTINE CLAVSP( UPLO, TRANS, DIAG, N, NRHS, A, IPIV, B, LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/clavsy.f b/TESTING/LIN/clavsy.f
index f78fef7959..1df649bef1 100644
--- a/TESTING/LIN/clavsy.f
+++ b/TESTING/LIN/clavsy.f
@@ -150,6 +150,7 @@
 *  =====================================================================
       SUBROUTINE CLAVSY( UPLO, TRANS, DIAG, N, NRHS, A, LDA, IPIV, B,
      $                   LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/clavsy_rook.f b/TESTING/LIN/clavsy_rook.f
index 604e2de652..1b82a0c296 100644
--- a/TESTING/LIN/clavsy_rook.f
+++ b/TESTING/LIN/clavsy_rook.f
@@ -152,6 +152,7 @@
 *  =====================================================================
       SUBROUTINE CLAVSY_ROOK( UPLO, TRANS, DIAG, N, NRHS, A, LDA, IPIV,
      $                        B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/clqt01.f b/TESTING/LIN/clqt01.f
index b302d3541a..10ff41647c 100644
--- a/TESTING/LIN/clqt01.f
+++ b/TESTING/LIN/clqt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE CLQT01( M, N, A, AF, Q, L, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/clqt02.f b/TESTING/LIN/clqt02.f
index 24eb053995..7173a2832b 100644
--- a/TESTING/LIN/clqt02.f
+++ b/TESTING/LIN/clqt02.f
@@ -27,7 +27,7 @@
 *> \verbatim
 *>
 *> CLQT02 tests CUNGLQ, which generates an m-by-n matrix Q with
-*> orthonornmal rows that is defined as the product of k elementary
+*> orthonormal rows that is defined as the product of k elementary
 *> reflectors.
 *>
 *> Given the LQ factorization of an m-by-n matrix A, CLQT02 generates
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE CLQT02( M, N, K, A, AF, Q, L, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/clqt03.f b/TESTING/LIN/clqt03.f
index 56706ab309..ddc731c6ca 100644
--- a/TESTING/LIN/clqt03.f
+++ b/TESTING/LIN/clqt03.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE CLQT03( M, N, K, AF, C, CC, Q, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/clqt04.f b/TESTING/LIN/clqt04.f
index 97bae67687..c444ce44c1 100644
--- a/TESTING/LIN/clqt04.f
+++ b/TESTING/LIN/clqt04.f
@@ -86,8 +86,9 @@ SUBROUTINE CLQT04(M,N,NB,RESULT)
 *     ..
 *     .. Local allocatable arrays
       COMPLEX, ALLOCATABLE :: AF(:,:), Q(:,:),
-     $  L(:,:), RWORK(:), WORK( : ), T(:,:),
+     $  L(:,:), WORK( : ), T(:,:),
      $  CF(:,:), DF(:,:), A(:,:), C(:,:), D(:,:)
+      REAL, ALLOCATABLE :: RWORK(:)
 *
 *     .. Parameters ..
       REAL       ZERO
diff --git a/TESTING/LIN/clqt05.f b/TESTING/LIN/clqt05.f
index 47e335869d..387b19d027 100644
--- a/TESTING/LIN/clqt05.f
+++ b/TESTING/LIN/clqt05.f
@@ -93,8 +93,9 @@ SUBROUTINE CLQT05(M,N,L,NB,RESULT)
 *     ..
 *     .. Local allocatable arrays
       COMPLEX, ALLOCATABLE :: AF(:,:), Q(:,:),
-     $  R(:,:), RWORK(:), WORK( : ), T(:,:),
+     $  R(:,:), WORK( : ), T(:,:),
      $  CF(:,:), DF(:,:), A(:,:), C(:,:), D(:,:)
+      REAL, ALLOCATABLE :: RWORK(:)
 *
 *     .. Parameters ..
       REAL ZERO
diff --git a/TESTING/LIN/cpbt01.f b/TESTING/LIN/cpbt01.f
index 33c80666dc..0dbd19f360 100644
--- a/TESTING/LIN/cpbt01.f
+++ b/TESTING/LIN/cpbt01.f
@@ -117,6 +117,7 @@
 *  =====================================================================
       SUBROUTINE CPBT01( UPLO, N, KD, A, LDA, AFAC, LDAFAC, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -201,7 +202,8 @@ SUBROUTINE CPBT01( UPLO, N, KD, A, LDA, AFAC, LDAFAC, RWORK,
 *
 *           Compute the (K,K) element of the result.
 *
-            AKK = CDOTC( KLEN+1, AFAC( KC, K ), 1, AFAC( KC, K ), 1 )
+            AKK = REAL(
+     $         CDOTC( KLEN+1, AFAC( KC, K ), 1, AFAC( KC, K ), 1 ) )
             AFAC( KD+1, K ) = AKK
 *
 *           Compute the rest of column K.
@@ -228,7 +230,7 @@ SUBROUTINE CPBT01( UPLO, N, KD, A, LDA, AFAC, LDAFAC, RWORK,
 *
 *           Scale column K by the diagonal element.
 *
-            AKK = AFAC( 1, K )
+            AKK = REAL( AFAC( 1, K ) )
             CALL CSSCAL( KLEN+1, AKK, AFAC( 1, K ), 1 )
 *
    40    CONTINUE
diff --git a/TESTING/LIN/cpbt02.f b/TESTING/LIN/cpbt02.f
index d84f38e82a..c03c510c85 100644
--- a/TESTING/LIN/cpbt02.f
+++ b/TESTING/LIN/cpbt02.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE CPBT02( UPLO, N, KD, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cpbt05.f b/TESTING/LIN/cpbt05.f
index 6e1a7b119a..8403f94bef 100644
--- a/TESTING/LIN/cpbt05.f
+++ b/TESTING/LIN/cpbt05.f
@@ -168,6 +168,7 @@
 *  =====================================================================
       SUBROUTINE CPBT05( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, X, LDX,
      $                   XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cpot01.f b/TESTING/LIN/cpot01.f
index 3c8e9a8859..874f433c5c 100644
--- a/TESTING/LIN/cpot01.f
+++ b/TESTING/LIN/cpot01.f
@@ -103,6 +103,7 @@
 *
 *  =====================================================================
       SUBROUTINE CPOT01( UPLO, N, A, LDA, AFAC, LDAFAC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -176,7 +177,7 @@ SUBROUTINE CPOT01( UPLO, N, A, LDA, AFAC, LDAFAC, RWORK, RESID )
 *
 *           Compute the (K,K) element of the result.
 *
-            TR = CDOTC( K, AFAC( 1, K ), 1, AFAC( 1, K ), 1 )
+            TR = REAL( CDOTC( K, AFAC( 1, K ), 1, AFAC( 1, K ), 1 ) )
             AFAC( K, K ) = TR
 *
 *           Compute the rest of column K.
diff --git a/TESTING/LIN/cpot02.f b/TESTING/LIN/cpot02.f
index 9578e4b0d7..2468cd96dd 100644
--- a/TESTING/LIN/cpot02.f
+++ b/TESTING/LIN/cpot02.f
@@ -124,6 +124,7 @@
 *  =====================================================================
       SUBROUTINE CPOT02( UPLO, N, NRHS, A, LDA, X, LDX, B, LDB, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cpot03.f b/TESTING/LIN/cpot03.f
index 1f6fc9bc4a..43dbb72980 100644
--- a/TESTING/LIN/cpot03.f
+++ b/TESTING/LIN/cpot03.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE CPOT03( UPLO, N, A, LDA, AINV, LDAINV, WORK, LDWORK,
      $                   RWORK, RCOND, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cpot05.f b/TESTING/LIN/cpot05.f
index 436a15dfee..641bca2f5a 100644
--- a/TESTING/LIN/cpot05.f
+++ b/TESTING/LIN/cpot05.f
@@ -162,6 +162,7 @@
 *  =====================================================================
       SUBROUTINE CPOT05( UPLO, N, NRHS, A, LDA, B, LDB, X, LDX, XACT,
      $                   LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cppt01.f b/TESTING/LIN/cppt01.f
index 3a761a4c71..1deb398052 100644
--- a/TESTING/LIN/cppt01.f
+++ b/TESTING/LIN/cppt01.f
@@ -92,6 +92,7 @@
 *
 *  =====================================================================
       SUBROUTINE CPPT01( UPLO, N, A, AFAC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -178,7 +179,7 @@ SUBROUTINE CPPT01( UPLO, N, A, AFAC, RWORK, RESID )
 *
 *           Compute the (K,K) element of the result.
 *
-            TR = CDOTC( K, AFAC( KC ), 1, AFAC( KC ), 1 )
+            TR = REAL( CDOTC( K, AFAC( KC ), 1, AFAC( KC ), 1 ) )
             AFAC( KC+K-1 ) = TR
 *
 *           Compute the rest of column K.
diff --git a/TESTING/LIN/cppt02.f b/TESTING/LIN/cppt02.f
index ac5a8dbcaf..16309bb2b8 100644
--- a/TESTING/LIN/cppt02.f
+++ b/TESTING/LIN/cppt02.f
@@ -120,6 +120,7 @@
 *  =====================================================================
       SUBROUTINE CPPT02( UPLO, N, NRHS, A, X, LDX, B, LDB, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cppt03.f b/TESTING/LIN/cppt03.f
index 3383d24378..ea6fcd2af4 100644
--- a/TESTING/LIN/cppt03.f
+++ b/TESTING/LIN/cppt03.f
@@ -107,6 +107,7 @@
 *  =====================================================================
       SUBROUTINE CPPT03( UPLO, N, A, AINV, WORK, LDWORK, RWORK, RCOND,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cppt05.f b/TESTING/LIN/cppt05.f
index 685e823e58..af668a9263 100644
--- a/TESTING/LIN/cppt05.f
+++ b/TESTING/LIN/cppt05.f
@@ -154,6 +154,7 @@
 *  =====================================================================
       SUBROUTINE CPPT05( UPLO, N, NRHS, AP, B, LDB, X, LDX, XACT,
      $                   LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cpst01.f b/TESTING/LIN/cpst01.f
index 26da4b3943..3dce0baae0 100644
--- a/TESTING/LIN/cpst01.f
+++ b/TESTING/LIN/cpst01.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE CPST01( UPLO, N, A, LDA, AFAC, LDAFAC, PERM, LDPERM,
      $                   PIV, RWORK, RESID, RANK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -219,7 +220,7 @@ SUBROUTINE CPST01( UPLO, N, A, LDA, AFAC, LDAFAC, PERM, LDPERM,
 *
 *           Compute the (K,K) element of the result.
 *
-            TR = CDOTC( K, AFAC( 1, K ), 1, AFAC( 1, K ), 1 )
+            TR = REAL( CDOTC( K, AFAC( 1, K ), 1, AFAC( 1, K ), 1 ) )
             AFAC( K, K ) = TR
 *
 *           Compute the rest of column K.
diff --git a/TESTING/LIN/cptt01.f b/TESTING/LIN/cptt01.f
index e4520ec3da..41c77e80d4 100644
--- a/TESTING/LIN/cptt01.f
+++ b/TESTING/LIN/cptt01.f
@@ -36,7 +36,7 @@
 *
 *> \param[in] N
 *> \verbatim
-*>          N is INTEGTER
+*>          N is INTEGER
 *>          The order of the matrix A.
 *> \endverbatim
 *>
@@ -89,6 +89,7 @@
 *
 *  =====================================================================
       SUBROUTINE CPTT01( N, D, E, DF, EF, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cptt02.f b/TESTING/LIN/cptt02.f
index da4f0e854d..6b2a18b67e 100644
--- a/TESTING/LIN/cptt02.f
+++ b/TESTING/LIN/cptt02.f
@@ -46,7 +46,7 @@
 *>
 *> \param[in] N
 *> \verbatim
-*>          N is INTEGTER
+*>          N is INTEGER
 *>          The order of the matrix A.
 *> \endverbatim
 *>
@@ -112,6 +112,7 @@
 *
 *  =====================================================================
       SUBROUTINE CPTT02( UPLO, N, NRHS, D, E, X, LDX, B, LDB, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cptt05.f b/TESTING/LIN/cptt05.f
index 9762c68419..feae0cc3ca 100644
--- a/TESTING/LIN/cptt05.f
+++ b/TESTING/LIN/cptt05.f
@@ -147,6 +147,7 @@
 *  =====================================================================
       SUBROUTINE CPTT05( N, NRHS, D, E, B, LDB, X, LDX, XACT, LDXACT,
      $                   FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cqlt01.f b/TESTING/LIN/cqlt01.f
index 2a8fe6b786..83222f5e17 100644
--- a/TESTING/LIN/cqlt01.f
+++ b/TESTING/LIN/cqlt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE CQLT01( M, N, A, AF, Q, L, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cqlt02.f b/TESTING/LIN/cqlt02.f
index fc4685aa53..95037f1db6 100644
--- a/TESTING/LIN/cqlt02.f
+++ b/TESTING/LIN/cqlt02.f
@@ -27,7 +27,7 @@
 *> \verbatim
 *>
 *> CQLT02 tests CUNGQL, which generates an m-by-n matrix Q with
-*> orthonornmal columns that is defined as the product of k elementary
+*> orthonormal columns that is defined as the product of k elementary
 *> reflectors.
 *>
 *> Given the QL factorization of an m-by-n matrix A, CQLT02 generates
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE CQLT02( M, N, K, A, AF, Q, L, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cqlt03.f b/TESTING/LIN/cqlt03.f
index fb1bea003f..ef2b1a1331 100644
--- a/TESTING/LIN/cqlt03.f
+++ b/TESTING/LIN/cqlt03.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE CQLT03( M, N, K, AF, C, CC, Q, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cqpt01.f b/TESTING/LIN/cqpt01.f
index 79fc2dc66c..8476bf937e 100644
--- a/TESTING/LIN/cqpt01.f
+++ b/TESTING/LIN/cqpt01.f
@@ -33,7 +33,8 @@
 *> Householder vectors, and the rest of AF contains a partially updated
 *> matrix.
 *>
-*> This function returns ||A*P - Q*R||/(||norm(A)||*eps*M)
+*> This function returns ||A*P - Q*R|| / ( ||norm(A)||*eps*max(M,N) )
+*> where || . || is matrix one norm.
 *> \endverbatim
 *
 *  Arguments:
@@ -117,6 +118,7 @@
 *  =====================================================================
       REAL             FUNCTION CQPT01( M, N, K, A, AF, LDA, TAU, JPVT,
      $                 WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,28 +174,28 @@ REAL             FUNCTION CQPT01( M, N, K, A, AF, LDA, TAU, JPVT,
 *
       NORMA = CLANGE( 'One-norm', M, N, A, LDA, RWORK )
 *
-      DO 30 J = 1, K
-         DO 10 I = 1, MIN( J, M )
+      DO J = 1, K
+         DO I = 1, MIN( J, M )
             WORK( ( J-1 )*M+I ) = AF( I, J )
-   10    CONTINUE
-         DO 20 I = J + 1, M
+         END DO
+         DO I = J + 1, M
             WORK( ( J-1 )*M+I ) = ZERO
-   20    CONTINUE
-   30 CONTINUE
-      DO 40 J = K + 1, N
+         END DO
+      END DO
+      DO J = K + 1, N
          CALL CCOPY( M, AF( 1, J ), 1, WORK( ( J-1 )*M+1 ), 1 )
-   40 CONTINUE
+      END DO
 *
       CALL CUNMQR( 'Left', 'No transpose', M, N, K, AF, LDA, TAU, WORK,
      $             M, WORK( M*N+1 ), LWORK-M*N, INFO )
 *
-      DO 50 J = 1, N
+      DO J = 1, N
 *
 *        Compare i-th column of QR and jpvt(i)-th column of A
 *
          CALL CAXPY( M, CMPLX( -ONE ), A( 1, JPVT( J ) ), 1,
      $               WORK( ( J-1 )*M+1 ), 1 )
-   50 CONTINUE
+      END DO
 *
       CQPT01 = CLANGE( 'One-norm', M, N, WORK, M, RWORK ) /
      $         ( REAL( MAX( M, N ) )*SLAMCH( 'Epsilon' ) )
diff --git a/TESTING/LIN/cqrt01.f b/TESTING/LIN/cqrt01.f
index 714edc9c7e..fd9289a1bf 100644
--- a/TESTING/LIN/cqrt01.f
+++ b/TESTING/LIN/cqrt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE CQRT01( M, N, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cqrt01p.f b/TESTING/LIN/cqrt01p.f
index 4f12f28c5d..e498ae1da8 100644
--- a/TESTING/LIN/cqrt01p.f
+++ b/TESTING/LIN/cqrt01p.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE CQRT01P( M, N, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cqrt02.f b/TESTING/LIN/cqrt02.f
index 62f176cd85..66f28320ee 100644
--- a/TESTING/LIN/cqrt02.f
+++ b/TESTING/LIN/cqrt02.f
@@ -27,7 +27,7 @@
 *> \verbatim
 *>
 *> CQRT02 tests CUNGQR, which generates an m-by-n matrix Q with
-*> orthonornmal columns that is defined as the product of k elementary
+*> orthonormal columns that is defined as the product of k elementary
 *> reflectors.
 *>
 *> Given the QR factorization of an m-by-n matrix A, CQRT02 generates
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE CQRT02( M, N, K, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cqrt03.f b/TESTING/LIN/cqrt03.f
index 08bb826c71..25a735719c 100644
--- a/TESTING/LIN/cqrt03.f
+++ b/TESTING/LIN/cqrt03.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE CQRT03( M, N, K, AF, C, CC, Q, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cqrt11.f b/TESTING/LIN/cqrt11.f
index 494d5e9cd7..54265930cb 100644
--- a/TESTING/LIN/cqrt11.f
+++ b/TESTING/LIN/cqrt11.f
@@ -95,6 +95,7 @@
 *
 *  =====================================================================
       REAL             FUNCTION CQRT11( M, K, A, LDA, TAU, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -157,9 +158,9 @@ REAL             FUNCTION CQRT11( M, K, A, LDA, TAU, WORK, LWORK )
       CALL CUNM2R( 'Left', 'Conjugate transpose', M, M, K, A, LDA, TAU,
      $             WORK, M, WORK( M*M+1 ), INFO )
 *
-      DO 10 J = 1, M
+      DO J = 1, M
          WORK( ( J-1 )*M+J ) = WORK( ( J-1 )*M+J ) - ONE
-   10 CONTINUE
+      END DO
 *
       CQRT11 = CLANGE( 'One-norm', M, M, WORK, M, RDUMMY ) /
      $         ( REAL( M )*SLAMCH( 'Epsilon' ) )
diff --git a/TESTING/LIN/cqrt12.f b/TESTING/LIN/cqrt12.f
index 4c29423ae5..77ba06eb28 100644
--- a/TESTING/LIN/cqrt12.f
+++ b/TESTING/LIN/cqrt12.f
@@ -28,7 +28,7 @@
 *> CQRT12 computes the singular values `svlues' of the upper trapezoid
 *> of A(1:M,1:N) and returns the ratio
 *>
-*>      || s - svlues||/(||svlues||*eps*max(M,N))
+*>      || svlues -s ||/( ||s||*eps*max(M,N) )
 *> \endverbatim
 *
 *  Arguments:
@@ -94,6 +94,7 @@
 *  =====================================================================
       REAL             FUNCTION CQRT12( M, N, A, LDA, S, WORK, LWORK,
      $                 RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -125,8 +126,8 @@ REAL             FUNCTION CQRT12( M, N, A, LDA, S, WORK, LWORK,
       EXTERNAL           CLANGE, SASUM, SLAMCH, SNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CGEBD2, CLASCL, CLASET, SAXPY, SBDSQR, SLABAD,
-     $                   SLASCL, XERBLA
+      EXTERNAL           CGEBD2, CLASCL, CLASET, SAXPY, SBDSQR, SLASCL,
+     $                   XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CMPLX, MAX, MIN, REAL
@@ -153,17 +154,16 @@ REAL             FUNCTION CQRT12( M, N, A, LDA, S, WORK, LWORK,
 *     Copy upper triangle of A into work
 *
       CALL CLASET( 'Full', M, N, CMPLX( ZERO ), CMPLX( ZERO ), WORK, M )
-      DO 20 J = 1, N
-         DO 10 I = 1, MIN( J, M )
+      DO J = 1, N
+         DO I = 1, MIN( J, M )
             WORK( ( J-1 )*M+I ) = A( I, J )
-   10    CONTINUE
-   20 CONTINUE
+         END DO
+      END DO
 *
 *     Get machine parameters
 *
       SMLNUM = SLAMCH( 'S' ) / SLAMCH( 'P' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Scale work if max entry outside range [SMLNUM,BIGNUM]
 *
@@ -207,9 +207,9 @@ REAL             FUNCTION CQRT12( M, N, A, LDA, S, WORK, LWORK,
 *
       ELSE
 *
-         DO 30 I = 1, MN
+         DO I = 1, MN
             RWORK( I ) = ZERO
-   30    CONTINUE
+         END DO
       END IF
 *
 *     Compare s and singular values of work
diff --git a/TESTING/LIN/cqrt13.f b/TESTING/LIN/cqrt13.f
index 6b2f42aaba..e87b7eafb3 100644
--- a/TESTING/LIN/cqrt13.f
+++ b/TESTING/LIN/cqrt13.f
@@ -88,6 +88,7 @@
 *
 *  =====================================================================
       SUBROUTINE CQRT13( SCALE, M, N, A, LDA, NORMA, ISEED )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -117,7 +118,7 @@ SUBROUTINE CQRT13( SCALE, M, N, A, LDA, NORMA, ISEED )
       EXTERNAL           CLANGE, SCASUM, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLARNV, CLASCL, SLABAD
+      EXTERNAL           CLARNV, CLASCL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          CMPLX, REAL, SIGN
@@ -146,7 +147,6 @@ SUBROUTINE CQRT13( SCALE, M, N, A, LDA, NORMA, ISEED )
          NORMA = CLANGE( 'Max', M, N, A, LDA, DUMMY )
          SMLNUM = SLAMCH( 'Safe minimum' )
          BIGNUM = ONE / SMLNUM
-         CALL SLABAD( SMLNUM, BIGNUM )
          SMLNUM = SMLNUM / SLAMCH( 'Epsilon' )
          BIGNUM = ONE / SMLNUM
 *
diff --git a/TESTING/LIN/cqrt14.f b/TESTING/LIN/cqrt14.f
index 474af0ed58..0f531f4a84 100644
--- a/TESTING/LIN/cqrt14.f
+++ b/TESTING/LIN/cqrt14.f
@@ -113,6 +113,7 @@
 *  =====================================================================
       REAL             FUNCTION CQRT14( TRANS, M, N, NRHS, A, LDA, X,
      $                 LDX, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cqrt15.f b/TESTING/LIN/cqrt15.f
index f766bb4df5..0709edf25e 100644
--- a/TESTING/LIN/cqrt15.f
+++ b/TESTING/LIN/cqrt15.f
@@ -146,6 +146,7 @@
 *  =====================================================================
       SUBROUTINE CQRT15( SCALE, RKSEL, M, N, NRHS, A, LDA, B, LDB, S,
      $                   RANK, NORMA, NORMB, ISEED, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -184,7 +185,7 @@ SUBROUTINE CQRT15( SCALE, RKSEL, M, N, NRHS, A, LDA, B, LDB, S,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           CGEMM, CLARF, CLARNV, CLAROR, CLASCL, CLASET,
-     $                   CSSCAL, SLABAD, SLAORD, SLASCL, XERBLA
+     $                   CSSCAL, SLAORD, SLASCL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, CMPLX, MAX, MIN
@@ -199,7 +200,6 @@ SUBROUTINE CQRT15( SCALE, RKSEL, M, N, NRHS, A, LDA, B, LDB, S,
 *
       SMLNUM = SLAMCH( 'Safe minimum' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       EPS = SLAMCH( 'Epsilon' )
       SMLNUM = ( SMLNUM / EPS ) / EPS
       BIGNUM = ONE / SMLNUM
diff --git a/TESTING/LIN/cqrt16.f b/TESTING/LIN/cqrt16.f
index a11b319c18..5aa56ffb7f 100644
--- a/TESTING/LIN/cqrt16.f
+++ b/TESTING/LIN/cqrt16.f
@@ -130,6 +130,7 @@
 *  =====================================================================
       SUBROUTINE CQRT16( TRANS, M, N, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cqrt17.f b/TESTING/LIN/cqrt17.f
index 5cea027097..b5795b36d8 100644
--- a/TESTING/LIN/cqrt17.f
+++ b/TESTING/LIN/cqrt17.f
@@ -150,6 +150,7 @@
 *  =====================================================================
       REAL             FUNCTION CQRT17( TRANS, IRESID, M, N, NRHS, A,
      $                 LDA, X, LDX, B, LDB, C, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/crqt01.f b/TESTING/LIN/crqt01.f
index 23d0c96b32..4769853820 100644
--- a/TESTING/LIN/crqt01.f
+++ b/TESTING/LIN/crqt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE CRQT01( M, N, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/crqt02.f b/TESTING/LIN/crqt02.f
index 8625c2f913..8b5ede7abc 100644
--- a/TESTING/LIN/crqt02.f
+++ b/TESTING/LIN/crqt02.f
@@ -27,7 +27,7 @@
 *> \verbatim
 *>
 *> CRQT02 tests CUNGRQ, which generates an m-by-n matrix Q with
-*> orthonornmal rows that is defined as the product of k elementary
+*> orthonormal rows that is defined as the product of k elementary
 *> reflectors.
 *>
 *> Given the RQ factorization of an m-by-n matrix A, CRQT02 generates
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE CRQT02( M, N, K, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/crqt03.f b/TESTING/LIN/crqt03.f
index b3d25d2a8b..4438404110 100644
--- a/TESTING/LIN/crqt03.f
+++ b/TESTING/LIN/crqt03.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE CRQT03( M, N, K, AF, C, CC, Q, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/crzt01.f b/TESTING/LIN/crzt01.f
index 6a75a8b31e..55ffa7988f 100644
--- a/TESTING/LIN/crzt01.f
+++ b/TESTING/LIN/crzt01.f
@@ -95,6 +95,7 @@
 *  =====================================================================
       REAL             FUNCTION CRZT01( M, N, A, AF, LDA, TAU, WORK,
      $                 LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -158,7 +159,7 @@ REAL             FUNCTION CRZT01( M, N, A, AF, LDA, TAU, WORK,
 *
 *     R = R * P(1) * ... *P(m)
 *
-      CALL CUNMRZ( 'Right', 'No tranpose', M, N, M, N-M, AF, LDA, TAU,
+      CALL CUNMRZ( 'Right', 'No transpose', M, N, M, N-M, AF, LDA, TAU,
      $             WORK, M, WORK( M*N+1 ), LWORK-M*N, INFO )
 *
 *     R = R - A
diff --git a/TESTING/LIN/crzt02.f b/TESTING/LIN/crzt02.f
index 8c807c825a..4bb0b19045 100644
--- a/TESTING/LIN/crzt02.f
+++ b/TESTING/LIN/crzt02.f
@@ -88,6 +88,7 @@
 *  =====================================================================
       REAL             FUNCTION CRZT02( M, N, AF, LDA, TAU, WORK,
      $                 LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/csbmv.f b/TESTING/LIN/csbmv.f
index 4ea747390b..a761220cd6 100644
--- a/TESTING/LIN/csbmv.f
+++ b/TESTING/LIN/csbmv.f
@@ -149,6 +149,7 @@
 *  =====================================================================
       SUBROUTINE CSBMV( UPLO, N, K, ALPHA, A, LDA, X, INCX, BETA, Y,
      $                  INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cspt01.f b/TESTING/LIN/cspt01.f
index 31c73e9e46..625c1ada72 100644
--- a/TESTING/LIN/cspt01.f
+++ b/TESTING/LIN/cspt01.f
@@ -109,6 +109,7 @@
 *
 *  =====================================================================
       SUBROUTINE CSPT01( UPLO, N, A, AFAC, IPIV, C, LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cspt02.f b/TESTING/LIN/cspt02.f
index f4d1fd2683..a7c29aaf46 100644
--- a/TESTING/LIN/cspt02.f
+++ b/TESTING/LIN/cspt02.f
@@ -120,6 +120,7 @@
 *  =====================================================================
       SUBROUTINE CSPT02( UPLO, N, NRHS, A, X, LDX, B, LDB, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/cspt03.f b/TESTING/LIN/cspt03.f
index 46b27df25f..0ac374a38b 100644
--- a/TESTING/LIN/cspt03.f
+++ b/TESTING/LIN/cspt03.f
@@ -107,6 +107,7 @@
 *  =====================================================================
       SUBROUTINE CSPT03( UPLO, N, A, AINV, WORK, LDW, RWORK, RCOND,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/csyt01.f b/TESTING/LIN/csyt01.f
index cec8f34f96..d5b2af2e2e 100644
--- a/TESTING/LIN/csyt01.f
+++ b/TESTING/LIN/csyt01.f
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE CSYT01( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C, LDC,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/csyt01_3.f b/TESTING/LIN/csyt01_3.f
index f0b316cefc..e4f402b923 100644
--- a/TESTING/LIN/csyt01_3.f
+++ b/TESTING/LIN/csyt01_3.f
@@ -138,6 +138,7 @@
 *  =====================================================================
       SUBROUTINE CSYT01_3( UPLO, N, A, LDA, AFAC, LDAFAC, E, IPIV, C,
      $                     LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,7 +189,7 @@ SUBROUTINE CSYT01_3( UPLO, N, A, LDA, AFAC, LDAFAC, E, IPIV, C,
          RETURN
       END IF
 *
-*     a) Revert to multiplyers of L
+*     a) Revert to multipliers of L
 *
       CALL CSYCONVF_ROOK( UPLO, 'R', N, AFAC, LDAFAC, E, IPIV, INFO )
 *
diff --git a/TESTING/LIN/csyt01_aa.f b/TESTING/LIN/csyt01_aa.f
index 9b0a0c5e4c..48b4173ad0 100644
--- a/TESTING/LIN/csyt01_aa.f
+++ b/TESTING/LIN/csyt01_aa.f
@@ -121,6 +121,7 @@
 *  =====================================================================
       SUBROUTINE CSYT01_AA( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
      $                      LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -141,9 +142,10 @@ SUBROUTINE CSYT01_AA( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
 *
 *     .. Parameters ..
       REAL               ZERO, ONE
-      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+      PARAMETER          ( ZERO = 0.0E+0, ONE = 1.0E+0 )
       COMPLEX            CZERO, CONE
-      PARAMETER          ( CZERO = 0.0E+0, CONE = 1.0E+0 )
+      PARAMETER          ( CZERO = ( 0.0E+0, 0.0E+0 ),
+     $                     CONE  = ( 1.0E+0, 0.0E+0 ) )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I, J
@@ -158,7 +160,7 @@ SUBROUTINE CSYT01_AA( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
       EXTERNAL           CLASET, CLAVSY
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DBLE
+      INTRINSIC          REAL
 *     ..
 *     .. Executable Statements ..
 *
@@ -250,7 +252,7 @@ SUBROUTINE CSYT01_AA( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
          IF( RESID.NE.ZERO )
      $      RESID = ONE / EPS
       ELSE
-         RESID = ( ( RESID / DBLE( N ) ) / ANORM ) / EPS
+         RESID = ( ( RESID / REAL( N ) ) / ANORM ) / EPS
       END IF
 *
       RETURN
diff --git a/TESTING/LIN/csyt01_rook.f b/TESTING/LIN/csyt01_rook.f
index f2ca4541a8..10021f3212 100644
--- a/TESTING/LIN/csyt01_rook.f
+++ b/TESTING/LIN/csyt01_rook.f
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE CSYT01_ROOK( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
      $                    LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/csyt02.f b/TESTING/LIN/csyt02.f
index a4a3f99b49..e17ead97f9 100644
--- a/TESTING/LIN/csyt02.f
+++ b/TESTING/LIN/csyt02.f
@@ -124,6 +124,7 @@
 *  =====================================================================
       SUBROUTINE CSYT02( UPLO, N, NRHS, A, LDA, X, LDX, B, LDB, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/csyt03.f b/TESTING/LIN/csyt03.f
index f01e24c86e..3da4e284a6 100644
--- a/TESTING/LIN/csyt03.f
+++ b/TESTING/LIN/csyt03.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE CSYT03( UPLO, N, A, LDA, AINV, LDAINV, WORK, LDWORK,
      $                   RWORK, RCOND, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ctbt02.f b/TESTING/LIN/ctbt02.f
index 8c6a24b51e..75e13671a3 100644
--- a/TESTING/LIN/ctbt02.f
+++ b/TESTING/LIN/ctbt02.f
@@ -30,10 +30,10 @@
 *>
 *> CTBT02 computes the residual for the computed solution to a
 *> triangular system of linear equations op(A)*X = B, when A is a
-*> triangular band matrix. The test ratio is the maximum over the
-*> number of right hand sides of
-*>    norm(op(A)*X - B) / ( norm(op(A)) * norm(X) * EPS ),
-*> where op(A) = A, A**T, or A**H, and EPS is the machine epsilon.
+*> triangular band matrix. The test ratio is the maximum over
+*>    norm(b - op(A)*x) / ( ||op(A)||_1 * norm(x) * EPS ),
+*> where op(A) = A, A**T, or A**H, b is the column of B, x is the
+*> solution vector, and EPS is the machine epsilon.
 *> \endverbatim
 *
 *  Arguments:
@@ -156,6 +156,7 @@
 *  =====================================================================
       SUBROUTINE CTBT02( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, X,
      $                   LDX, B, LDB, WORK, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ctbt03.f b/TESTING/LIN/ctbt03.f
index 94ae9a77ec..f2198eb52a 100644
--- a/TESTING/LIN/ctbt03.f
+++ b/TESTING/LIN/ctbt03.f
@@ -174,6 +174,7 @@
       SUBROUTINE CTBT03( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB,
      $                   SCALE, CNORM, TSCAL, X, LDX, B, LDB, WORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ctbt05.f b/TESTING/LIN/ctbt05.f
index b6060564d9..6e50227826 100644
--- a/TESTING/LIN/ctbt05.f
+++ b/TESTING/LIN/ctbt05.f
@@ -186,6 +186,7 @@
 *  =====================================================================
       SUBROUTINE CTBT05( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
      $                   LDB, X, LDX, XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ctbt06.f b/TESTING/LIN/ctbt06.f
index c81b854893..b5ce929e6b 100644
--- a/TESTING/LIN/ctbt06.f
+++ b/TESTING/LIN/ctbt06.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE CTBT06( RCOND, RCONDC, UPLO, DIAG, N, KD, AB, LDAB,
      $                   RWORK, RAT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ctpt01.f b/TESTING/LIN/ctpt01.f
index 41a1f78f52..f21df71d3e 100644
--- a/TESTING/LIN/ctpt01.f
+++ b/TESTING/LIN/ctpt01.f
@@ -106,6 +106,7 @@
 *
 *  =====================================================================
       SUBROUTINE CTPT01( UPLO, DIAG, N, AP, AINVP, RCOND, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ctpt02.f b/TESTING/LIN/ctpt02.f
index 12d8870c9d..8d18a9ffd0 100644
--- a/TESTING/LIN/ctpt02.f
+++ b/TESTING/LIN/ctpt02.f
@@ -30,9 +30,10 @@
 *> CTPT02 computes the residual for the computed solution to a
 *> triangular system of linear equations op(A)*X = B, when the
 *> triangular matrix A is stored in packed format. The test ratio is
-*> the maximum over the number of right hand sides of
-*>    norm(op(A)*X - B) / ( norm(op(A)) * norm(X) * EPS ),
-*> where op(A) = A, A**T, or A**H, and EPS is the machine epsilon.
+*> the maximum over
+*>    norm(b - op(A)*x) / ( ||op(A)||_1 * norm(x) * EPS ),
+*> where op(A) = A, A**T, or A**H, b is the column of B, x is the
+*> solution vector, and EPS is the machine epsilon.
 *> \endverbatim
 *
 *  Arguments:
@@ -143,6 +144,7 @@
 *  =====================================================================
       SUBROUTINE CTPT02( UPLO, TRANS, DIAG, N, NRHS, AP, X, LDX, B, LDB,
      $                   WORK, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ctpt03.f b/TESTING/LIN/ctpt03.f
index 43ba503104..74c8820714 100644
--- a/TESTING/LIN/ctpt03.f
+++ b/TESTING/LIN/ctpt03.f
@@ -159,6 +159,7 @@
 *  =====================================================================
       SUBROUTINE CTPT03( UPLO, TRANS, DIAG, N, NRHS, AP, SCALE, CNORM,
      $                   TSCAL, X, LDX, B, LDB, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ctpt05.f b/TESTING/LIN/ctpt05.f
index 0f1f4ac1c6..281e57747d 100644
--- a/TESTING/LIN/ctpt05.f
+++ b/TESTING/LIN/ctpt05.f
@@ -172,6 +172,7 @@
 *  =====================================================================
       SUBROUTINE CTPT05( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X, LDX,
      $                   XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ctpt06.f b/TESTING/LIN/ctpt06.f
index 20e8f81c7c..aaf89a217e 100644
--- a/TESTING/LIN/ctpt06.f
+++ b/TESTING/LIN/ctpt06.f
@@ -109,6 +109,7 @@
 *
 *  =====================================================================
       SUBROUTINE CTPT06( RCOND, RCONDC, UPLO, DIAG, N, AP, RWORK, RAT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ctrt01.f b/TESTING/LIN/ctrt01.f
index 30c4f2138d..0d246b56c4 100644
--- a/TESTING/LIN/ctrt01.f
+++ b/TESTING/LIN/ctrt01.f
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE CTRT01( UPLO, DIAG, N, A, LDA, AINV, LDAINV, RCOND,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ctrt02.f b/TESTING/LIN/ctrt02.f
index 1addc5881c..3168441d3e 100644
--- a/TESTING/LIN/ctrt02.f
+++ b/TESTING/LIN/ctrt02.f
@@ -30,10 +30,10 @@
 *>
 *> CTRT02 computes the residual for the computed solution to a
 *> triangular system of linear equations op(A)*X = B, where A is a
-*> triangular matrix. The test ratio is the maximum over the number of
-*> right hand sides of
-*>    norm(op(A)*X - B) / ( norm(op(A)) * norm(X) * EPS ),
-*> where op(A) = A, A**T, or A**H, and EPS is the machine epsilon.
+*> triangular matrix. The test ratio is the maximum over
+*>    norm(b - op(A)*x) / ( ||op(A)||_1 * norm(x) * EPS ),
+*> where op(A) = A, A**T, or A**H, b is the column of B, x is the
+*> solution vector, and EPS is the machine epsilon.
 *> \endverbatim
 *
 *  Arguments:
@@ -152,6 +152,7 @@
 *  =====================================================================
       SUBROUTINE CTRT02( UPLO, TRANS, DIAG, N, NRHS, A, LDA, X, LDX, B,
      $                   LDB, WORK, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ctrt03.f b/TESTING/LIN/ctrt03.f
index b8f44aa053..ab2ecc68fa 100644
--- a/TESTING/LIN/ctrt03.f
+++ b/TESTING/LIN/ctrt03.f
@@ -168,6 +168,7 @@
 *  =====================================================================
       SUBROUTINE CTRT03( UPLO, TRANS, DIAG, N, NRHS, A, LDA, SCALE,
      $                   CNORM, TSCAL, X, LDX, B, LDB, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ctrt05.f b/TESTING/LIN/ctrt05.f
index 0edb2d832b..08f1b46e8b 100644
--- a/TESTING/LIN/ctrt05.f
+++ b/TESTING/LIN/ctrt05.f
@@ -179,6 +179,7 @@
 *  =====================================================================
       SUBROUTINE CTRT05( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB, X,
      $                   LDX, XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ctrt06.f b/TESTING/LIN/ctrt06.f
index 07a0ec73f8..8c498a23b9 100644
--- a/TESTING/LIN/ctrt06.f
+++ b/TESTING/LIN/ctrt06.f
@@ -119,6 +119,7 @@
 *  =====================================================================
       SUBROUTINE CTRT06( RCOND, RCONDC, UPLO, DIAG, N, A, LDA, RWORK,
      $                   RAT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ctsqr01.f b/TESTING/LIN/ctsqr01.f
index 0d91776f88..ca1bf5230e 100644
--- a/TESTING/LIN/ctsqr01.f
+++ b/TESTING/LIN/ctsqr01.f
@@ -96,8 +96,9 @@ SUBROUTINE CTSQR01(TSSW, M, N, MB, NB, RESULT)
 *     ..
 *     .. Local allocatable arrays
       COMPLEX, ALLOCATABLE :: AF(:,:), Q(:,:),
-     $  R(:,:), RWORK(:), WORK( : ), T(:),
+     $  R(:,:), WORK( : ), T(:),
      $  CF(:,:), DF(:,:), A(:,:), C(:,:), D(:,:), LQ(:,:)
+      REAL, ALLOCATABLE :: RWORK(:)
 *
 *     .. Parameters ..
       REAL ZERO
diff --git a/TESTING/LIN/cunhr_col01.f b/TESTING/LIN/cunhr_col01.f
index d77d60b1a0..056a5a7c67 100644
--- a/TESTING/LIN/cunhr_col01.f
+++ b/TESTING/LIN/cunhr_col01.f
@@ -311,7 +311,7 @@ SUBROUTINE CUNHR_COL01( M, N, MB1, NB1, NB2, RESULT )
 *     Compute |I - (Q**H)*Q| / ( eps * m ) and store in RESULT(2)
 *
       CALL CLASET( 'Full', M, M, CZERO, CONE, R, M )
-      CALL CHERK( 'U', 'C', M, M, -CONE, Q, M, CONE, R, M )
+      CALL CHERK( 'U', 'C', M, M, REAL(-CONE), Q, M, REAL(CONE), R, M )
       RESID = CLANSY( '1', 'Upper', M, R, M, RWORK )
       RESULT( 2 ) = RESID / ( EPS * MAX( 1, M ) )
 *
diff --git a/TESTING/LIN/cunhr_col02.f b/TESTING/LIN/cunhr_col02.f
index 001f291da9..4a4f677911 100644
--- a/TESTING/LIN/cunhr_col02.f
+++ b/TESTING/LIN/cunhr_col02.f
@@ -273,7 +273,7 @@ SUBROUTINE CUNHR_COL02( M, N, MB1, NB1, NB2, RESULT )
 *     Compute |I - (Q**T)*Q| / ( eps * m ) and store in RESULT(2)
 *
       CALL CLASET( 'Full', M, M, CZERO, CONE, R, M )
-      CALL CHERK( 'U', 'C', M, M, -CONE, Q, M, CONE, R, M )
+      CALL CHERK( 'U', 'C', M, M, REAL(-CONE), Q, M, REAL(CONE), R, M )
       RESID = CLANSY( '1', 'Upper', M, R, M, RWORK )
       RESULT( 2 ) = RESID / ( EPS * MAX( 1, M ) )
 *
diff --git a/TESTING/LIN/dchkaa.F b/TESTING/LIN/dchkaa.F
index ef9d7808ce..91ed659661 100644
--- a/TESTING/LIN/dchkaa.F
+++ b/TESTING/LIN/dchkaa.F
@@ -63,6 +63,7 @@
 *> DLQ    8               List types on next line if 0 < NTYPES <  8
 *> DQL    8               List types on next line if 0 < NTYPES <  8
 *> DQP    6               List types on next line if 0 < NTYPES <  6
+*> DQK    19              List types on next line if 0 < NTYPES <  19
 *> DTZ    3               List types on next line if 0 < NTYPES <  3
 *> DLS    6               List types on next line if 0 < NTYPES <  6
 *> DEQ
@@ -149,12 +150,12 @@ PROGRAM DCHKAA
      $                   NBVAL( MAXIN ), NBVAL2( MAXIN ),
      $                   NSVAL( MAXIN ), NVAL( MAXIN ), NXVAL( MAXIN ),
      $                   RANKVAL( MAXIN ), PIV( NMAX )
-      DOUBLE PRECISION   E( NMAX ), S( 2*NMAX )
 *     ..
 *     .. Allocatable Arrays ..
       INTEGER AllocateStatus
-      DOUBLE PRECISION, DIMENSION(:), ALLOCATABLE :: RWORK
-      DOUBLE PRECISION, DIMENSION(:,:), ALLOCATABLE :: A, B, WORK      
+      DOUBLE PRECISION, DIMENSION(:), ALLOCATABLE :: RWORK, S
+      DOUBLE PRECISION, DIMENSION(:), ALLOCATABLE :: E
+      DOUBLE PRECISION, DIMENSION(:,:), ALLOCATABLE :: A, B, WORK
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME, LSAMEN
@@ -164,13 +165,13 @@ PROGRAM DCHKAA
 *     .. External Subroutines ..
       EXTERNAL           ALAREQ, DCHKEQ, DCHKGB, DCHKGE, DCHKGT, DCHKLQ,
      $                   DCHKORHR_COL, DCHKPB, DCHKPO, DCHKPS, DCHKPP,
-     $                   DCHKPT, DCHKQ3, DCHKQL, DCHKQR, DCHKRQ, DCHKSP,
-     $                   DCHKSY, DCHKSY_ROOK, DCHKSY_RK, DCHKSY_AA,
-     $                   DCHKTB, DCHKTP, DCHKTR, DCHKTZ, DDRVGB, DDRVGE,
-     $                   DDRVGT, DDRVLS, DDRVPB, DDRVPO, DDRVPP, DDRVPT,
-     $                   DDRVSP, DDRVSY, DDRVSY_ROOK, DDRVSY_RK,
-     $                   DDRVSY_AA, ILAVER, DCHKLQTP, DCHKQRT, DCHKQRTP,
-     $                   DCHKLQT,DCHKTSQR
+     $                   DCHKPT, DCHKQ3, DCHKQP3RK, DCHKQL, DCHKQR,
+     $                   DCHKRQ, DCHKSP, DCHKSY, DCHKSY_ROOK, DCHKSY_RK,
+     $                   DCHKSY_AA, DCHKTB, DCHKTP, DCHKTR, DCHKTZ,
+     $                   DDRVGB, DDRVGE, DDRVGT, DDRVLS, DDRVPB, DDRVPO,
+     $                   DDRVPP, DDRVPT, DDRVSP, DDRVSY, DDRVSY_ROOK,
+     $                   DDRVSY_RK, DDRVSY_AA, ILAVER, DCHKLQTP, DCHKQRT,
+     $                   DCHKQRTP, DCHKLQT,DCHKTSQR
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -197,6 +198,10 @@ PROGRAM DCHKAA
       IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
       ALLOCATE ( WORK( NMAX, 3*NMAX+MAXRHS+30 ), STAT = AllocateStatus )
       IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
+      ALLOCATE ( E( NMAX ), STAT = AllocateStatus )
+      IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
+      ALLOCATE ( S( 2*NMAX ), STAT = AllocateStatus )
+      IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
       ALLOCATE ( RWORK( 5*NMAX+2*MAXRHS ), STAT = AllocateStatus )
       IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
 *
@@ -919,9 +924,26 @@ PROGRAM DCHKAA
          CALL ALAREQ( PATH, NMATS, DOTYPE, NTYPES, NIN, NOUT )
 *
          IF( TSTCHK ) THEN
-            CALL DCHKQ3( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
-     $                   THRESH, A( 1, 1 ), A( 1, 2 ), B( 1, 1 ),
-     $                   B( 1, 3 ), WORK, IWORK, NOUT )
+            CALL DCHKQ3( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL,
+     $                   NXVAL, THRESH, A( 1, 1 ), A( 1, 2 ),
+     $                   B( 1, 1 ), B( 1, 3 ), WORK, IWORK, NOUT )
+         ELSE
+            WRITE( NOUT, FMT = 9989 )PATH
+         END IF
+*
+      ELSE IF( LSAMEN( 2, C2, 'QK' ) ) THEN
+*
+*        QK: truncated QR factorization with pivoting
+*
+         NTYPES = 19
+         CALL ALAREQ( PATH, NMATS, DOTYPE, NTYPES, NIN, NOUT )
+*
+         IF( TSTCHK ) THEN
+            CALL DCHKQP3RK( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL,
+     $                      NNB, NBVAL, NXVAL, THRESH, A( 1, 1 ),
+     $                      A( 1, 2 ), B( 1, 1 ), B( 1, 2 ),
+     $                      B( 1, 3 ), B( 1, 4 ),
+     $                      WORK, IWORK, NOUT )
          ELSE
             WRITE( NOUT, FMT = 9989 )PATH
          END IF
@@ -1054,6 +1076,8 @@ PROGRAM DCHKAA
 *
       DEALLOCATE (A, STAT = AllocateStatus)
       DEALLOCATE (B, STAT = AllocateStatus)
+      DEALLOCATE (E, STAT = AllocateStatus)
+      DEALLOCATE (S, STAT = AllocateStatus)
       DEALLOCATE (WORK, STAT = AllocateStatus)
       DEALLOCATE (RWORK,  STAT = AllocateStatus)
 *
@@ -1065,7 +1089,7 @@ PROGRAM DCHKAA
  9995 FORMAT( ' Invalid input value: ', A4, '=', I6, '; must be <=',
      $      I6 )
  9994 FORMAT( ' Tests of the DOUBLE PRECISION LAPACK routines ',
-     $      / ' LAPACK VERSION ', I1, '.', I1, '.', I1,
+     $      / ' LAPACK VERSION ', I1, '.', I2, '.', I1,
      $      / / ' The following parameter values will be used:' )
  9993 FORMAT( 4X, A4, ':  ', 10I6, / 11X, 10I6 )
  9992 FORMAT( / ' Routines pass computational tests if test ratio is ',
diff --git a/TESTING/LIN/dchkab.f b/TESTING/LIN/dchkab.f
index a6b8a0fe1d..25f081302a 100644
--- a/TESTING/LIN/dchkab.f
+++ b/TESTING/LIN/dchkab.f
@@ -70,6 +70,7 @@
 *
 *  =====================================================================
       PROGRAM DCHKAB
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -350,7 +351,7 @@ PROGRAM DCHKAB
      $      I6 )
  9994 FORMAT( ' Tests of the DOUBLE PRECISION LAPACK DSGESV/DSPOSV',
      $  ' routines ',
-     $      / ' LAPACK VERSION ', I1, '.', I1, '.', I1,
+     $      / ' LAPACK VERSION ', I1, '.', I2, '.', I1,
      $      / / ' The following parameter values will be used:' )
  9993 FORMAT( 4X, A4, ':  ', 10I6, / 11X, 10I6 )
  9992 FORMAT( / ' Routines pass computational tests if test ratio is ',
diff --git a/TESTING/LIN/dchkeq.f b/TESTING/LIN/dchkeq.f
index 025ddabcf6..52f100d8a8 100644
--- a/TESTING/LIN/dchkeq.f
+++ b/TESTING/LIN/dchkeq.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE DCHKEQ( THRESH, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchkgb.f b/TESTING/LIN/dchkgb.f
index fa8dce5cff..80e2b9b8f9 100644
--- a/TESTING/LIN/dchkgb.f
+++ b/TESTING/LIN/dchkgb.f
@@ -188,6 +188,7 @@
       SUBROUTINE DCHKGB( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NNS,
      $                   NSVAL, THRESH, TSTERR, A, LA, AFAC, LAFAC, B,
      $                   X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchkge.f b/TESTING/LIN/dchkge.f
index 467667a42b..2e9c3b97f4 100644
--- a/TESTING/LIN/dchkge.f
+++ b/TESTING/LIN/dchkge.f
@@ -182,6 +182,7 @@
       SUBROUTINE DCHKGE( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NNS,
      $                   NSVAL, THRESH, TSTERR, NMAX, A, AFAC, AINV, B,
      $                   X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchkgt.f b/TESTING/LIN/dchkgt.f
index ace78f00c6..0acbc28a49 100644
--- a/TESTING/LIN/dchkgt.f
+++ b/TESTING/LIN/dchkgt.f
@@ -143,6 +143,7 @@
 *  =====================================================================
       SUBROUTINE DCHKGT( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   A, AF, B, X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchklq.f b/TESTING/LIN/dchklq.f
index 70af41fe0b..0b5daca999 100644
--- a/TESTING/LIN/dchklq.f
+++ b/TESTING/LIN/dchklq.f
@@ -193,6 +193,7 @@
       SUBROUTINE DCHKLQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   NRHS, THRESH, TSTERR, NMAX, A, AF, AQ, AL, AC,
      $                   B, X, XACT, TAU, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -235,7 +236,7 @@ SUBROUTINE DCHKLQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
       DOUBLE PRECISION   RESULT( NTESTS )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAERH, ALAHD, ALASUM, DERRLQ, DGELQS, DGET02,
+      EXTERNAL           ALAERH, ALAHD, ALASUM, DERRLQ, DGELS, DGET02,
      $                   DLACPY, DLARHS, DLATB4, DLATMS, DLQT01, DLQT02,
      $                   DLQT03, XLAENV
 *     ..
@@ -373,7 +374,7 @@ SUBROUTINE DCHKLQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                               WORK, LWORK, RWORK, RESULT( 3 ) )
                         NT = NT + 4
 *
-*                       If M>=N and K=N, call DGELQS to solve a system
+*                       If M<=N and K=M, call DGELS to solve a system
 *                       with NRHS right hand sides and compute the
 *                       residual.
 *
@@ -390,14 +391,20 @@ SUBROUTINE DCHKLQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
 *
                            CALL DLACPY( 'Full', M, NRHS, B, LDA, X,
      $                                  LDA )
-                           SRNAMT = 'DGELQS'
-                           CALL DGELQS( M, N, NRHS, AF, LDA, TAU, X,
-     $                                  LDA, WORK, LWORK, INFO )
 *
-*                          Check error code from DGELQS.
+*                          Reset AF to the original matrix. DGELS
+*                          factors the matrix before solving the system.
+*
+                           CALL DLACPY( 'Full', M, N, A, LDA, AF, LDA )
+*
+                           SRNAMT = 'DGELS'
+                           CALL DGELS( 'No transpose', M, N, NRHS, AF,
+     $                                 LDA, X, LDA, WORK, LWORK, INFO )
+*
+*                          Check error code from DGELS.
 *
                            IF( INFO.NE.0 )
-     $                        CALL ALAERH( PATH, 'DGELQS', INFO, 0, ' ',
+     $                        CALL ALAERH( PATH, 'DGELS', INFO, 0, 'N',
      $                                     M, N, NRHS, -1, NB, IMAT,
      $                                     NFAIL, NERRS, NOUT )
 *
diff --git a/TESTING/LIN/dchkpb.f b/TESTING/LIN/dchkpb.f
index c5d51230ed..0b93755045 100644
--- a/TESTING/LIN/dchkpb.f
+++ b/TESTING/LIN/dchkpb.f
@@ -169,6 +169,7 @@
       SUBROUTINE DCHKPB( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                   XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchkpo.f b/TESTING/LIN/dchkpo.f
index e9d5af1863..233b742e6e 100644
--- a/TESTING/LIN/dchkpo.f
+++ b/TESTING/LIN/dchkpo.f
@@ -169,6 +169,7 @@
       SUBROUTINE DCHKPO( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                   XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchkpp.f b/TESTING/LIN/dchkpp.f
index 3da13227a2..4338db4130 100644
--- a/TESTING/LIN/dchkpp.f
+++ b/TESTING/LIN/dchkpp.f
@@ -160,6 +160,7 @@
       SUBROUTINE DCHKPP( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, A, AFAC, AINV, B, X, XACT, WORK, RWORK,
      $                   IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchkps.f b/TESTING/LIN/dchkps.f
index 1e4a9e58de..a4c6b44af5 100644
--- a/TESTING/LIN/dchkps.f
+++ b/TESTING/LIN/dchkps.f
@@ -151,6 +151,7 @@
       SUBROUTINE DCHKPS( DOTYPE, NN, NVAL, NNB, NBVAL, NRANK, RANKVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, PERM, PIV, WORK,
      $                   RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchkpt.f b/TESTING/LIN/dchkpt.f
index 2869723f28..c2df8e58e6 100644
--- a/TESTING/LIN/dchkpt.f
+++ b/TESTING/LIN/dchkpt.f
@@ -143,6 +143,7 @@
 *  =====================================================================
       SUBROUTINE DCHKPT( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   A, D, E, B, X, XACT, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchkq3.f b/TESTING/LIN/dchkq3.f
index 1fdf07252b..a6ce4c8a88 100644
--- a/TESTING/LIN/dchkq3.f
+++ b/TESTING/LIN/dchkq3.f
@@ -30,7 +30,7 @@
 *>
 *> \verbatim
 *>
-*> DCHKQ3 tests DGEQP3.
+*> DCHKQ3 tests  DGEQP3.
 *> \endverbatim
 *
 *  Arguments:
@@ -150,6 +150,7 @@
       SUBROUTINE DCHKQ3( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   THRESH, A, COPYA, S, TAU, WORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchkql.f b/TESTING/LIN/dchkql.f
index 595ca10a61..24837f1c4a 100644
--- a/TESTING/LIN/dchkql.f
+++ b/TESTING/LIN/dchkql.f
@@ -193,6 +193,7 @@
       SUBROUTINE DCHKQL( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   NRHS, THRESH, TSTERR, NMAX, A, AF, AQ, AL, AC,
      $                   B, X, XACT, TAU, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchkqp3rk.f b/TESTING/LIN/dchkqp3rk.f
new file mode 100644
index 0000000000..319d332dd2
--- /dev/null
+++ b/TESTING/LIN/dchkqp3rk.f
@@ -0,0 +1,797 @@
+*> \brief \b DCHKQP3RK
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Definition:
+*  ===========
+*
+*      SUBROUTINE DCHKQP3RK( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL,
+*     $                      NNB, NBVAL, NXVAL, THRESH, A, COPYA,
+*     $                      B, COPYB, S, TAU,
+*     $                      WORK, IWORK, NOUT )
+*      IMPLICIT NONE
+*
+*  -- LAPACK test routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+*      INTEGER            NM, NN, NNS, NNB, NOUT
+*      DOUBLE PRECISION   THRESH
+*     ..
+*     .. Array Arguments ..
+*      LOGICAL            DOTYPE( * )
+*      INTEGER            IWORK( * ), MVAL( * ), NBVAL( * ), NSVAL( * ),
+*     $                   NVAL( * ), NXVAL( * )
+*      DOUBLE PRECISION   A( * ), COPYA( * ), B( * ), COPYB( * ),
+*     $                   S( * ), TAU( * ), WORK( * )
+*     ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> DCHKQP3RK tests DGEQP3RK.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] DOTYPE
+*> \verbatim
+*>          DOTYPE is LOGICAL array, dimension (NTYPES)
+*>          The matrix types to be used for testing.  Matrices of type j
+*>          (for 1 <= j <= NTYPES) are used for testing if DOTYPE(j) =
+*>          .TRUE.; if DOTYPE(j) = .FALSE., then type j is not used.
+*> \endverbatim
+*>
+*> \param[in] NM
+*> \verbatim
+*>          NM is INTEGER
+*>          The number of values of M contained in the vector MVAL.
+*> \endverbatim
+*>
+*> \param[in] MVAL
+*> \verbatim
+*>          MVAL is INTEGER array, dimension (NM)
+*>          The values of the matrix row dimension M.
+*> \endverbatim
+*>
+*> \param[in] NN
+*> \verbatim
+*>          NN is INTEGER
+*>          The number of values of N contained in the vector NVAL.
+*> \endverbatim
+*>
+*> \param[in] NVAL
+*> \verbatim
+*>          NVAL is INTEGER array, dimension (NN)
+*>          The values of the matrix column dimension N.
+*> \endverbatim
+*>
+*> \param[in] NNS
+*> \verbatim
+*>          NNS is INTEGER
+*>          The number of values of NRHS contained in the vector NSVAL.
+*> \endverbatim
+*>
+*> \param[in] NSVAL
+*> \verbatim
+*>          NSVAL is INTEGER array, dimension (NNS)
+*>          The values of the number of right hand sides NRHS.
+*> \endverbatim
+*>
+*> \param[in] NNB
+*> \verbatim
+*>          NNB is INTEGER
+*>          The number of values of NB and NX contained in the
+*>          vectors NBVAL and NXVAL.  The blocking parameters are used
+*>          in pairs (NB,NX).
+*> \endverbatim
+*>
+*> \param[in] NBVAL
+*> \verbatim
+*>          NBVAL is INTEGER array, dimension (NNB)
+*>          The values of the blocksize NB.
+*> \endverbatim
+*>
+*> \param[in] NXVAL
+*> \verbatim
+*>          NXVAL is INTEGER array, dimension (NNB)
+*>          The values of the crossover point NX.
+*> \endverbatim
+*>
+*> \param[in] THRESH
+*> \verbatim
+*>          THRESH is DOUBLE PRECISION
+*>          The threshold value for the test ratios.  A result is
+*>          included in the output file if RESULT >= THRESH.  To have
+*>          every test ratio printed, use THRESH = 0.
+*> \endverbatim
+*>
+*> \param[out] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (MMAX*NMAX)
+*>          where MMAX is the maximum value of M in MVAL and NMAX is the
+*>          maximum value of N in NVAL.
+*> \endverbatim
+*>
+*> \param[out] COPYA
+*> \verbatim
+*>          COPYA is DOUBLE PRECISION array, dimension (MMAX*NMAX)
+*> \endverbatim
+*>
+*> \param[out] B
+*> \verbatim
+*>          B is DOUBLE PRECISION array, dimension (MMAX*NSMAX)
+*>          where MMAX is the maximum value of M in MVAL and NSMAX is the
+*>          maximum value of NRHS in NSVAL.
+*> \endverbatim
+*>
+*> \param[out] COPYB
+*> \verbatim
+*>          COPYB is DOUBLE PRECISION array, dimension (MMAX*NSMAX)
+*> \endverbatim
+*>
+*> \param[out] S
+*> \verbatim
+*>          S is DOUBLE PRECISION array, dimension
+*>                      (min(MMAX,NMAX))
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is DOUBLE PRECISION array, dimension (MMAX)
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension
+*>                      (MMAX*NMAX + 4*NMAX + MMAX)
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (2*NMAX)
+*> \endverbatim
+*>
+*> \param[in] NOUT
+*> \verbatim
+*>          NOUT is INTEGER
+*>          The unit number for output.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup double_lin
+*
+*  =====================================================================
+      SUBROUTINE DCHKQP3RK( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL,
+     $                      NNB, NBVAL, NXVAL, THRESH, A, COPYA,
+     $                      B, COPYB, S, TAU,
+     $                      WORK, IWORK, NOUT )
+      IMPLICIT NONE
+*
+*  -- LAPACK test routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            NM, NN, NNB, NNS, NOUT
+      DOUBLE PRECISION   THRESH
+*     ..
+*     .. Array Arguments ..
+      LOGICAL            DOTYPE( * )
+      INTEGER            IWORK( * ), NBVAL( * ), MVAL( * ), NVAL( * ),
+     $                   NSVAL( * ), NXVAL( * )
+      DOUBLE PRECISION   A( * ), COPYA( * ), B( * ), COPYB( * ),
+     $                   S( * ), TAU( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      INTEGER            NTYPES
+      PARAMETER          ( NTYPES = 19 )
+      INTEGER            NTESTS
+      PARAMETER          ( NTESTS = 5 )
+      DOUBLE PRECISION   ONE, ZERO, BIGNUM
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0,
+     $                     BIGNUM = 1.0D+38 )
+*     ..
+*     .. Local Scalars ..
+      CHARACTER          DIST, TYPE
+      CHARACTER*3        PATH
+      INTEGER            I, IHIGH, ILOW, IM, IMAT, IN, INC_ZERO,
+     $                   INB, IND_OFFSET_GEN,
+     $                   IND_IN, IND_OUT, INS, INFO,
+     $                   ISTEP, J, J_INC, J_FIRST_NZ, JB_ZERO,
+     $                   KFACT, KL, KMAX, KU, LDA, LW, LWORK,
+     $                   LWORK_MQR, M, MINMN, MINMNB_GEN, MODE, N,
+     $                   NB, NB_ZERO, NERRS, NFAIL, NB_GEN, NRHS,
+     $                   NRUN, NX, T
+      DOUBLE PRECISION   ANORM, CNDNUM, EPS, ABSTOL, RELTOL,
+     $                   DTEMP, MAXC2NRMK, RELMAXC2NRMK
+*     ..
+*     .. Local Arrays ..
+      INTEGER            ISEED( 4 ), ISEEDY( 4 )
+      DOUBLE PRECISION   RESULT( NTESTS ), RDUMMY( 1 )
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH, DQPT01, DQRT11, DQRT12, DLANGE,
+     $                   DLAPY2
+      EXTERNAL           DLAMCH, DQPT01, DQRT11, DQRT12, DLANGE
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ALAERH, ALAHD, ALASUM, DAXPY, DGEQP3RK,
+     $                   DLACPY, DLAORD, DLASET, DLATB4, DLATMS,
+     $                   DORMQR, DSWAP, ICOPY, XLAENV
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, MAX, MIN, MOD
+*     ..
+*     .. Scalars in Common ..
+      LOGICAL            LERR, OK
+      CHARACTER*32       SRNAMT
+      INTEGER            INFOT, IOUNIT
+*     ..
+*     .. Common blocks ..
+      COMMON             / INFOC / INFOT, IOUNIT, OK, LERR
+      COMMON             / SRNAMC / SRNAMT
+*     ..
+*     .. Data statements ..
+      DATA               ISEEDY / 1988, 1989, 1990, 1991 /
+*     ..
+*     .. Executable Statements ..
+*
+*     Initialize constants and the random number seed.
+*
+      PATH( 1: 1 ) = 'Double precision'
+      PATH( 2: 3 ) = 'QK'
+      NRUN = 0
+      NFAIL = 0
+      NERRS = 0
+      DO I = 1, 4
+         ISEED( I ) = ISEEDY( I )
+      END DO
+      EPS = DLAMCH( 'Epsilon' )
+      INFOT = 0
+*
+      DO IM = 1, NM
+*
+*        Do for each value of M in MVAL.
+*
+         M = MVAL( IM )
+         LDA = MAX( 1, M )
+*
+         DO IN = 1, NN
+*
+*           Do for each value of N in NVAL.
+*
+            N = NVAL( IN )
+            MINMN = MIN( M, N )
+            LWORK = MAX( 1, M*MAX( M, N )+4*MINMN+MAX( M, N ),
+     $                   M*N + 2*MINMN + 4*N )
+*
+            DO INS = 1, NNS
+               NRHS = NSVAL( INS )
+*
+*                 Set up parameters with DLATB4 and generate
+*                 M-by-NRHS B matrix with DLATMS.
+*                 IMAT = 14:
+*                 Random matrix, CNDNUM = 2, NORM = ONE,
+*                 MODE = 3 (geometric distribution of singular values).
+*
+                  CALL DLATB4( PATH, 14, M, NRHS, TYPE, KL, KU, ANORM,
+     $                         MODE, CNDNUM, DIST )
+*
+                  SRNAMT = 'DLATMS'
+                  CALL DLATMS( M, NRHS, DIST, ISEED, TYPE, S, MODE,
+     $                         CNDNUM, ANORM, KL, KU, 'No packing',
+     $                         COPYB, LDA, WORK, INFO )
+
+
+*
+*                 Check error code from DLATMS.
+*
+                  IF( INFO.NE.0 ) THEN
+                     CALL ALAERH( PATH, 'DLATMS', INFO, 0, ' ', M,
+     $                            NRHS, -1, -1, -1, 6, NFAIL, NERRS,
+     $                            NOUT )
+                     CYCLE
+                  END IF
+*
+               DO IMAT = 1, NTYPES
+*
+*              Do the tests only if DOTYPE( IMAT ) is true.
+*
+               IF( .NOT.DOTYPE( IMAT ) )
+     $            CYCLE
+*
+*              The type of distribution used to generate the random
+*              eigen-/singular values:
+*              ( 'S' for symmetric distribution ) => UNIFORM( -1, 1 )
+*
+*           Do for each type of NON-SYMMETRIC matrix:                               CNDNUM                     NORM                                     MODE
+*            1. Zero matrix
+*            2. Random, Diagonal, CNDNUM = 2                                        CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            3. Random, Upper triangular, CNDNUM = 2                                CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            4. Random, Lower triangular, CNDNUM = 2                                CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            5. Random, First column is zero, CNDNUM = 2                            CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            6. Random, Last MINMN column is zero, CNDNUM = 2                       CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            7. Random, Last N column is zero, CNDNUM = 2                           CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            8. Random, Middle column in MINMN is zero, CNDNUM = 2                  CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            9. Random, First half of MINMN columns are zero, CNDNUM = 2            CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           10. Random, Last columns are zero starting from MINMN/2+1, CNDNUM = 2   CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           11. Random, Half MINMN columns in the middle are zero starting
+*                  from  MINMN/2-(MINMN/2)/2+1, CNDNUM = 2                          CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           12. Random, Odd columns are ZERO, CNDNUM = 2                            CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           13. Random, Even columns are ZERO, CNDNUM = 2                           CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           14. Random, CNDNUM = 2                                                  CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           15. Random, CNDNUM = sqrt(0.1/EPS)                                      CNDNUM = BADC1 = sqrt(0.1/EPS)  ONE                                      3 ( geometric distribution of singular values )
+*           16. Random, CNDNUM = 0.1/EPS                                            CNDNUM = BADC2 = 0.1/EPS        ONE                                      3 ( geometric distribution of singular values )
+*           17. Random, CNDNUM = 0.1/EPS,                                           CNDNUM = BADC2 = 0.1/EPS        ONE                                      2 ( one small singular value, S(N)=1/CNDNUM )
+*                 one small singular value S(N)=1/CNDNUM
+*           18. Random, CNDNUM = 2, scaled near underflow                           CNDNUM = 2                      SMALL = SAFMIN
+*           19. Random, CNDNUM = 2, scaled near overflow                            CNDNUM = 2                      LARGE = 1.0/( 0.25 * ( SAFMIN / EPS ) )  3 ( geometric distribution of singular values )
+*
+               IF( IMAT.EQ.1 ) THEN
+*
+*                 Matrix 1: Zero matrix
+*
+                  CALL DLASET( 'Full', M, N, ZERO, ZERO, COPYA, LDA )
+                  DO I = 1, MINMN
+                     S( I ) = ZERO
+                  END DO
+*
+               ELSE IF( (IMAT.GE.2 .AND. IMAT.LE.4 )
+     $                  .OR. (IMAT.GE.14 .AND. IMAT.LE.19 ) ) THEN
+*
+*                 Matrices 2-5.
+*
+*                 Set up parameters with DLATB4 and generate a test
+*                 matrix with DLATMS.
+*
+                  CALL DLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM,
+     $                         MODE, CNDNUM, DIST )
+*
+                  SRNAMT = 'DLATMS'
+                  CALL DLATMS( M, N, DIST, ISEED, TYPE, S, MODE,
+     $                         CNDNUM, ANORM, KL, KU, 'No packing',
+     $                         COPYA, LDA, WORK, INFO )
+*
+*                 Check error code from DLATMS.
+*
+                  IF( INFO.NE.0 ) THEN
+                     CALL ALAERH( PATH, 'DLATMS', INFO, 0, ' ', M, N,
+     $                            -1, -1, -1, IMAT, NFAIL, NERRS,
+     $                            NOUT )
+                     CYCLE
+                  END IF
+*
+                  CALL DLAORD( 'Decreasing', MINMN, S, 1 )
+*
+               ELSE IF( MINMN.GE.2
+     $                  .AND. IMAT.GE.5 .AND. IMAT.LE.13 ) THEN
+*
+*                 Rectangular matrices 5-13 that contain zero columns,
+*                 only for matrices MINMN >=2.
+*
+*                 JB_ZERO is the column index of ZERO block.
+*                 NB_ZERO is the column block size of ZERO block.
+*                 NB_GEN is the column blcok size of the
+*                 generated block.
+*                 J_INC in the non_zero column index increment
+*                 for matrix 12 and 13.
+*                 J_FIRS_NZ is the index of the first non-zero
+*                 column.
+*
+                  IF( IMAT.EQ.5 ) THEN
+*
+*                    First column is zero.
+*
+                     JB_ZERO = 1
+                     NB_ZERO = 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.6 ) THEN
+*
+*                    Last column MINMN is zero.
+*
+                     JB_ZERO = MINMN
+                     NB_ZERO = 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.7 ) THEN
+*
+*                    Last column N is zero.
+*
+                     JB_ZERO = N
+                     NB_ZERO = 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.8 ) THEN
+*
+*                    Middle column in MINMN is zero.
+*
+                     JB_ZERO = MINMN / 2 + 1
+                     NB_ZERO = 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.9 ) THEN
+*
+*                    First half of MINMN columns is zero.
+*
+                     JB_ZERO = 1
+                     NB_ZERO = MINMN / 2
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.10 ) THEN
+*
+*                    Last columns are zero columns,
+*                    starting from (MINMN / 2 + 1) column.
+*
+                     JB_ZERO = MINMN / 2 + 1
+                     NB_ZERO = N - JB_ZERO + 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.11 ) THEN
+*
+*                    Half of the columns in the middle of MINMN
+*                    columns is zero, starting from
+*                    MINMN/2 - (MINMN/2)/2 + 1 column.
+*
+                     JB_ZERO = MINMN / 2 - (MINMN / 2) / 2 + 1
+                     NB_ZERO = MINMN / 2
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.12 ) THEN
+*
+*                    Odd-numbered columns are zero,
+*
+                     NB_GEN = N / 2
+                     NB_ZERO = N - NB_GEN
+                     J_INC = 2
+                     J_FIRST_NZ = 2
+*
+                  ELSE IF( IMAT.EQ.13 ) THEN
+*
+*                    Even-numbered columns are zero.
+*
+                     NB_ZERO = N / 2
+                     NB_GEN = N - NB_ZERO
+                     J_INC = 2
+                     J_FIRST_NZ = 1
+*
+                  END IF
+*
+*
+*                 1) Set the first NB_ZERO columns in COPYA(1:M,1:N)
+*                    to zero.
+*
+                  CALL DLASET( 'Full', M, NB_ZERO, ZERO, ZERO,
+     $                         COPYA, LDA )
+*
+*                    2) Generate an M-by-(N-NB_ZERO) matrix with the
+*                       chosen singular value distribution
+*                       in COPYA(1:M,NB_ZERO+1:N).
+*
+                  CALL DLATB4( PATH, IMAT, M, NB_GEN, TYPE, KL, KU,
+     $                         ANORM, MODE, CNDNUM, DIST )
+*
+                  SRNAMT = 'DLATMS'
+*
+                  IND_OFFSET_GEN = NB_ZERO * LDA
+*
+                  CALL DLATMS( M, NB_GEN, DIST, ISEED, TYPE, S, MODE,
+     $                        CNDNUM, ANORM, KL, KU, 'No packing',
+     $                        COPYA( IND_OFFSET_GEN + 1 ), LDA,
+     $                        WORK, INFO )
+*
+*                 Check error code from DLATMS.
+*
+                  IF( INFO.NE.0 ) THEN
+                     CALL ALAERH( PATH, 'DLATMS', INFO, 0, ' ', M,
+     $                            NB_GEN, -1, -1, -1, IMAT, NFAIL,
+     $                            NERRS, NOUT )
+                     CYCLE
+                  END IF
+*
+*                 3) Swap the gererated colums from the right side
+*                 NB_GEN-size block in COPYA into correct column
+*                 positions.
+*
+                  IF( IMAT.EQ.6
+     $                    .OR. IMAT.EQ.7
+     $                    .OR. IMAT.EQ.8
+     $                    .OR. IMAT.EQ.10
+     $                    .OR. IMAT.EQ.11 ) THEN
+*
+*                    Move by swapping the generated columns
+*                    from the right NB_GEN-size block from
+*                    (NB_ZERO+1:NB_ZERO+JB_ZERO)
+*                    into columns (1:JB_ZERO-1).
+*
+                     DO J = 1, JB_ZERO-1, 1
+                        CALL DSWAP( M,
+     $                        COPYA( ( NB_ZERO+J-1)*LDA+1), 1,
+     $                        COPYA( (J-1)*LDA + 1 ), 1 )
+                     END DO
+*
+                  ELSE IF( IMAT.EQ.12 .OR. IMAT.EQ.13 ) THEN
+*
+*                    ( IMAT = 12, Odd-numbered ZERO columns. )
+*                    Swap the generated columns from the right
+*                    NB_GEN-size block into the even zero colums in the
+*                    left NB_ZERO-size block.
+*
+*                    ( IMAT = 13, Even-numbered ZERO columns. )
+*                    Swap the generated columns from the right
+*                    NB_GEN-size block into the odd zero colums in the
+*                    left NB_ZERO-size block.
+*
+                     DO J = 1, NB_GEN, 1
+                        IND_OUT = ( NB_ZERO+J-1 )*LDA + 1
+                        IND_IN = ( J_INC*(J-1)+(J_FIRST_NZ-1) )*LDA
+     $                            + 1
+                        CALL DSWAP( M,
+     $                              COPYA( IND_OUT ), 1,
+     $                              COPYA( IND_IN), 1 )
+                        END DO
+*
+                  END IF
+*
+*                 5) Order the singular values generated by
+*                    DLAMTS in decreasing order and add trailing zeros
+*                    that correspond to zero columns.
+*                    The total number of singular values is MINMN.
+*
+                  MINMNB_GEN = MIN( M, NB_GEN )
+*
+                  DO I = MINMNB_GEN+1, MINMN
+                     S( I ) = ZERO
+                  END DO
+*
+               ELSE
+*
+*                    IF(MINMN.LT.2) skip this size for this matrix type.
+*
+                     CYCLE
+               END IF
+*
+*              Initialize a copy array for a pivot array for DGEQP3RK.
+*
+               DO I = 1, N
+                  IWORK( I ) = 0
+               END DO
+*
+               DO INB = 1, NNB
+*
+*                 Do for each pair of values (NB,NX) in NBVAL and NXVAL.
+*
+                  NB = NBVAL( INB )
+                  CALL XLAENV( 1, NB )
+                  NX = NXVAL( INB )
+                  CALL XLAENV( 3, NX )
+*
+*                 We do MIN(M,N)+1 because we need a test for KMAX > N,
+*                 when KMAX is larger than MIN(M,N), KMAX should be
+*                 KMAX = MIN(M,N)
+*
+                  DO KMAX = 0, MIN(M,N)+1
+*
+*                 Get a working copy of COPYA into A( 1:M,1:N ).
+*                 Get a working copy of COPYB into A( 1:M, (N+1):NRHS ).
+*                 Get a working copy of COPYB into into B( 1:M, 1:NRHS ).
+*                 Get a working copy of IWORK(1:N) awith zeroes into
+*                 which is going to be used as pivot array IWORK( N+1:2N ).
+*                 NOTE: IWORK(2N+1:3N) is going to be used as a WORK array
+*                 for the routine.
+*
+                  CALL DLACPY( 'All', M, N, COPYA, LDA, A, LDA )
+                  CALL DLACPY( 'All', M, NRHS, COPYB, LDA,
+     $                         A( LDA*N + 1 ),  LDA )
+                  CALL DLACPY( 'All', M, NRHS, COPYB, LDA,
+     $                         B,  LDA )
+                  CALL ICOPY( N, IWORK( 1 ), 1, IWORK( N+1 ), 1 )
+                  DO I = 1, NTESTS
+                    RESULT( I ) = ZERO
+                  END DO
+*
+                  ABSTOL = -1.0
+                  RELTOL = -1.0
+*
+*                 Compute the QR factorization with pivoting of A
+*
+                  LW = MAX( 1, MAX( 2*N + NB*( N+NRHS+1 ),
+     $                              3*N + NRHS - 1 ) )
+*
+*                 Compute DGEQP3RK factorization of A.
+*
+                  SRNAMT = 'DGEQP3RK'
+                  CALL DGEQP3RK( M, N, NRHS, KMAX, ABSTOL, RELTOL,
+     $                           A, LDA, KFACT, MAXC2NRMK,
+     $                           RELMAXC2NRMK, IWORK( N+1 ), TAU,
+     $                           WORK, LW, IWORK( 2*N+1 ), INFO )
+*
+*                 Check error code from DGEQP3RK.
+*
+                  IF( INFO.LT.0 )
+     $               CALL ALAERH( PATH, 'DGEQP3RK', INFO, 0, ' ',
+     $                            M, N, NX, -1, NB, IMAT,
+     $                            NFAIL, NERRS, NOUT )
+*
+*                 Compute test 1:
+*
+*                 This test in only for the full rank factorization of
+*                 the matrix A.
+*
+*                 Array S(1:min(M,N)) contains svd(A) the sigular values
+*                 of the original matrix A in decreasing absolute value
+*                 order. The test computes svd(R), the vector sigular
+*                 values of the upper trapezoid of A(1:M,1:N) that
+*                 contains the factor R, in decreasing order. The test
+*                 returns the ratio:
+*
+*                 2-norm(svd(R) - svd(A)) / ( max(M,N) * 2-norm(svd(A)) * EPS )
+*
+                  IF( KFACT.EQ.MINMN ) THEN
+*
+                     RESULT( 1 ) = DQRT12( M, N, A, LDA, S, WORK,
+     $                                     LWORK )
+*
+                     NRUN = NRUN + 1
+*
+*                   End test 1
+*
+                  END IF
+*
+*                 Compute test 2:
+*
+*                 The test returns the ratio:
+*
+*                 1-norm( A*P - Q*R ) / ( max(M,N) * 1-norm(A) * EPS )
+*
+                  RESULT( 2 ) = DQPT01( M, N, KFACT, COPYA, A, LDA, TAU,
+     $                                  IWORK( N+1 ), WORK, LWORK )
+*
+*                 Compute test 3:
+*
+*                 The test returns the ratio:
+*
+*                 1-norm( Q**T * Q - I ) / ( M * EPS )
+*
+                  RESULT( 3 ) = DQRT11( M, KFACT, A, LDA, TAU, WORK,
+     $                                  LWORK )
+*
+                  NRUN = NRUN + 2
+*
+*                 Compute test 4:
+*
+*                 This test is only for the factorizations with the
+*                 rank greater than 2.
+*                 The elements on the diagonal of R should be non-
+*                 increasing.
+*
+*                 The test returns the ratio:
+*
+*                 Returns 1.0D+100 if abs(R(K+1,K+1)) > abs(R(K,K)),
+*                 K=1:KFACT-1
+*
+                  IF( MIN(KFACT, MINMN).GE.2 ) THEN
+*
+                     DO J = 1, KFACT-1, 1
+
+                        DTEMP = (( ABS( A( (J-1)*LDA+J ) ) -
+     $                          ABS( A( (J)*LDA+J+1 ) ) ) /
+     $                          ABS( A(1) ) )
+*
+                        IF( DTEMP.LT.ZERO ) THEN
+                           RESULT( 4 ) = BIGNUM
+                        END IF
+*
+                     END DO
+*
+                     NRUN = NRUN + 1
+*
+*                    End test 4.
+*
+                  END IF
+*
+*                 Compute test 5:
+*
+*                 This test in only for matrix A with min(M,N) > 0.
+*
+*                 The test returns the ratio:
+*
+*                 1-norm(Q**T * B - Q**T * B ) /
+*                       ( M * EPS )
+*
+*                 (1) Compute B:=Q**T * B in the matrix B.
+*
+                  IF( MINMN.GT.0 ) THEN
+*
+                     LWORK_MQR = MAX(1, NRHS)
+                     CALL DORMQR( 'Left', 'Transpose',
+     $                            M, NRHS, KFACT, A, LDA, TAU, B, LDA,
+     $                            WORK, LWORK_MQR, INFO )
+*
+                     DO I = 1, NRHS
+*
+*                       Compare N+J-th column of A and J-column of B.
+*
+                        CALL DAXPY( M, -ONE, A( ( N+I-1 )*LDA+1 ), 1,
+     $                              B( ( I-1 )*LDA+1 ), 1 )
+                     END DO
+*
+                     RESULT( 5 ) = ABS(
+     $                  DLANGE( 'One-norm', M, NRHS, B, LDA, RDUMMY ) /
+     $                  ( DBLE( M )*DLAMCH( 'Epsilon' ) ) )
+*
+                     NRUN = NRUN + 1
+*
+*                    End compute test 5.
+*
+                  END IF
+*
+*                 Print information about the tests that did not
+*                 pass the threshold.
+*
+                  DO T = 1, NTESTS
+                     IF( RESULT( T ).GE.THRESH ) THEN
+                        IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
+     $                     CALL ALAHD( NOUT, PATH )
+                        WRITE( NOUT, FMT = 9999 ) 'DGEQP3RK', M, N,
+     $                     NRHS, KMAX, ABSTOL, RELTOL, NB, NX,
+     $                     IMAT, T, RESULT( T )
+                        NFAIL = NFAIL + 1
+                     END IF
+                  END DO
+*
+*                 END DO KMAX = 1, MIN(M,N)+1
+*
+                  END DO
+*
+*                 END DO for INB = 1, NNB
+*
+               END DO
+*
+*              END DO  for IMAT = 1, NTYPES
+*
+               END DO
+*
+*              END DO for INS = 1, NNS
+*
+            END DO
+*
+*           END DO for IN = 1, NN
+*
+         END DO
+*
+*        END DO for IM = 1, NM
+*
+      END DO
+*
+*     Print a summary of the results.
+*
+      CALL ALASUM( PATH, NOUT, NFAIL, NRUN, NERRS )
+*
+ 9999 FORMAT( 1X, A, ' M =', I5, ', N =', I5, ', NRHS =', I5,
+     $        ', KMAX =', I5, ', ABSTOL =', G12.5,
+     $        ', RELTOL =', G12.5, ', NB =', I4, ', NX =', I4,
+     $        ', type ', I2, ', test ', I2, ', ratio =', G12.5 )
+*
+*     End of DCHKQP3RK
+*
+      END
diff --git a/TESTING/LIN/dchkqr.f b/TESTING/LIN/dchkqr.f
index 5541e85c02..013f7676ab 100644
--- a/TESTING/LIN/dchkqr.f
+++ b/TESTING/LIN/dchkqr.f
@@ -198,6 +198,7 @@
       SUBROUTINE DCHKQR( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   NRHS, THRESH, TSTERR, NMAX, A, AF, AQ, AR, AC,
      $                   B, X, XACT, TAU, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -244,7 +245,7 @@ SUBROUTINE DCHKQR( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
       EXTERNAL           DGENND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAERH, ALAHD, ALASUM, DERRQR, DGEQRS, DGET02,
+      EXTERNAL           ALAERH, ALAHD, ALASUM, DERRQR, DGELS, DGET02,
      $                   DLACPY, DLARHS, DLATB4, DLATMS, DQRT01,
      $                   DQRT01P, DQRT02, DQRT03, XLAENV
 *     ..
@@ -389,7 +390,7 @@ SUBROUTINE DCHKQR( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                               WORK, LWORK, RWORK, RESULT( 3 ) )
                         NT = NT + 4
 *
-*                       If M>=N and K=N, call DGEQRS to solve a system
+*                       If M>=N and K=N, call DGELS to solve a system
 *                       with NRHS right hand sides and compute the
 *                       residual.
 *
@@ -406,14 +407,20 @@ SUBROUTINE DCHKQR( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
 *
                            CALL DLACPY( 'Full', M, NRHS, B, LDA, X,
      $                                  LDA )
-                           SRNAMT = 'DGEQRS'
-                           CALL DGEQRS( M, N, NRHS, AF, LDA, TAU, X,
-     $                                  LDA, WORK, LWORK, INFO )
 *
-*                          Check error code from DGEQRS.
+*                          Reset AF. DGELS overwrites the matrix with
+*                          its factorization.
+*
+                           CALL DLACPY( 'Full', M, N, A, LDA, AF, LDA )
+*
+                           SRNAMT = 'DGELS'
+                           CALL DGELS( 'No transpose', M, N, NRHS, AF,
+     $                                 LDA, X, LDA, WORK, LWORK, INFO )
+*
+*                          Check error code from DGELS.
 *
                            IF( INFO.NE.0 )
-     $                        CALL ALAERH( PATH, 'DGEQRS', INFO, 0, ' ',
+     $                        CALL ALAERH( PATH, 'DGELS', INFO, 0, 'N',
      $                                     M, N, NRHS, -1, NB, IMAT,
      $                                     NFAIL, NERRS, NOUT )
 *
diff --git a/TESTING/LIN/dchkrfp.f b/TESTING/LIN/dchkrfp.f
index e242e013d8..41d269b7e8 100644
--- a/TESTING/LIN/dchkrfp.f
+++ b/TESTING/LIN/dchkrfp.f
@@ -56,6 +56,7 @@
 *
 *  =====================================================================
       PROGRAM DCHKRFP
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -275,7 +276,7 @@ PROGRAM DCHKRFP
  9995 FORMAT( ' !! Invalid input value: ', A4, '=', I6, '; must be <=',
      $      I6 )
  9994 FORMAT( /  ' Tests of the DOUBLE PRECISION LAPACK RFP routines ',
-     $      / ' LAPACK VERSION ', I1, '.', I1, '.', I1,
+     $      / ' LAPACK VERSION ', I1, '.', I2, '.', I1,
      $      / / ' The following parameter values will be used:' )
  9993 FORMAT( 4X, A4, ':  ', 10I6, / 11X, 10I6 )
  9992 FORMAT( / ' Routines pass computational tests if test ratio is ',
diff --git a/TESTING/LIN/dchkrq.f b/TESTING/LIN/dchkrq.f
index 028359d08d..e85ac113b6 100644
--- a/TESTING/LIN/dchkrq.f
+++ b/TESTING/LIN/dchkrq.f
@@ -198,6 +198,7 @@
       SUBROUTINE DCHKRQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   NRHS, THRESH, TSTERR, NMAX, A, AF, AQ, AR, AC,
      $                   B, X, XACT, TAU, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchksp.f b/TESTING/LIN/dchksp.f
index f327ca7ce9..b301ec4fa0 100644
--- a/TESTING/LIN/dchksp.f
+++ b/TESTING/LIN/dchksp.f
@@ -160,6 +160,7 @@
       SUBROUTINE DCHKSP( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, A, AFAC, AINV, B, X, XACT, WORK, RWORK,
      $                   IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchksy.f b/TESTING/LIN/dchksy.f
index 8d127cd3b6..4d9789e742 100644
--- a/TESTING/LIN/dchksy.f
+++ b/TESTING/LIN/dchksy.f
@@ -167,6 +167,7 @@
       SUBROUTINE DCHKSY( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                   XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchksy_aa_2stage.f b/TESTING/LIN/dchksy_aa_2stage.f
index bc4e77a5aa..1940351a40 100644
--- a/TESTING/LIN/dchksy_aa_2stage.f
+++ b/TESTING/LIN/dchksy_aa_2stage.f
@@ -421,9 +421,9 @@ SUBROUTINE DCHKSY_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
 *                 block factorization, LWORK is the length of AINV.
 *
                   SRNAMT = 'DSYTRF_AA_2STAGE'
-                  LWORK = MIN(N*NB, 3*NMAX*NMAX)
+                  LWORK = MIN( MAX( 1, N*NB ), 3*NMAX*NMAX )
                   CALL DSYTRF_AA_2STAGE( UPLO, N, AFAC, LDA, 
-     $                                   AINV, (3*NB+1)*N, 
+     $                                   AINV, MAX( 1, (3*NB+1)*N ),
      $                                   IWORK, IWORK( 1+N ),
      $                                   WORK, LWORK,
      $                                   INFO )
@@ -503,7 +503,6 @@ SUBROUTINE DCHKSY_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
                      CALL DLACPY( 'Full', N, NRHS, B, LDA, X, LDA )
 *
                      SRNAMT = 'DSYTRS_AA_2STAGE'
-                     LWORK = MAX( 1, 3*N-2 )
                      CALL DSYTRS_AA_2STAGE( UPLO, N, NRHS, AFAC, LDA,
      $                            AINV, (3*NB+1)*N, IWORK, IWORK( 1+N ),
      $                            X, LDA, INFO )
diff --git a/TESTING/LIN/dchksy_rk.f b/TESTING/LIN/dchksy_rk.f
index 701cb9ce6a..d3d4134e2c 100644
--- a/TESTING/LIN/dchksy_rk.f
+++ b/TESTING/LIN/dchksy_rk.f
@@ -173,6 +173,7 @@
       SUBROUTINE DCHKSY_RK( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                      THRESH, TSTERR, NMAX, A, AFAC, E, AINV, B,
      $                      X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchksy_rook.f b/TESTING/LIN/dchksy_rook.f
index 03b16b78ac..1a3c6dee5d 100644
--- a/TESTING/LIN/dchksy_rook.f
+++ b/TESTING/LIN/dchksy_rook.f
@@ -168,6 +168,7 @@
       SUBROUTINE DCHKSY_ROOK( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                   XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchktb.f b/TESTING/LIN/dchktb.f
index 16d0aed32a..c1a182d50d 100644
--- a/TESTING/LIN/dchktb.f
+++ b/TESTING/LIN/dchktb.f
@@ -152,6 +152,7 @@
       SUBROUTINE DCHKTB( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, AB, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchktp.f b/TESTING/LIN/dchktp.f
index 9af6150ca4..bba30f5ca8 100644
--- a/TESTING/LIN/dchktp.f
+++ b/TESTING/LIN/dchktp.f
@@ -86,7 +86,7 @@
 *> \verbatim
 *>          NMAX is INTEGER
 *>          The leading dimension of the work arrays.  NMAX >= the
-*>          maximumm value of N in NVAL.
+*>          maximum value of N in NVAL.
 *> \endverbatim
 *>
 *> \param[out] AP
@@ -154,6 +154,7 @@
       SUBROUTINE DCHKTP( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, AP, AINVP, B, X, XACT, WORK, RWORK,
      $                   IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dchktr.f b/TESTING/LIN/dchktr.f
index a4a1150c09..999309c8e8 100644
--- a/TESTING/LIN/dchktr.f
+++ b/TESTING/LIN/dchktr.f
@@ -30,7 +30,7 @@
 *>
 *> \verbatim
 *>
-*> DCHKTR tests DTRTRI, -TRS, -RFS, and -CON, and DLATRS
+*> DCHKTR tests DTRTRI, -TRS, -RFS, and -CON, and DLATRS(3)
 *> \endverbatim
 *
 *  Arguments:
@@ -164,6 +164,7 @@
       SUBROUTINE DCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AINV, B, X, XACT,
      $                   WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -187,7 +188,7 @@ SUBROUTINE DCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
       INTEGER            NTYPE1, NTYPES
       PARAMETER          ( NTYPE1 = 10, NTYPES = 18 )
       INTEGER            NTESTS
-      PARAMETER          ( NTESTS = 9 )
+      PARAMETER          ( NTESTS = 10 )
       INTEGER            NTRAN
       PARAMETER          ( NTRAN = 3 )
       DOUBLE PRECISION   ONE, ZERO
@@ -198,13 +199,13 @@ SUBROUTINE DCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
       CHARACTER*3        PATH
       INTEGER            I, IDIAG, IMAT, IN, INB, INFO, IRHS, ITRAN,
      $                   IUPLO, K, LDA, N, NB, NERRS, NFAIL, NRHS, NRUN
-      DOUBLE PRECISION   AINVNM, ANORM, DUMMY, RCOND, RCONDC, RCONDI,
-     $                   RCONDO, SCALE
+      DOUBLE PRECISION   AINVNM, ANORM, BIGNUM, DLAMCH, DUMMY, RCOND,
+     $                   RCONDC, RCONDI, RCONDO, RES, SCALE
 *     ..
 *     .. Local Arrays ..
       CHARACTER          TRANSS( NTRAN ), UPLOS( 2 )
       INTEGER            ISEED( 4 ), ISEEDY( 4 )
-      DOUBLE PRECISION   RESULT( NTESTS )
+      DOUBLE PRECISION   RESULT( NTESTS ), SCALE3( 2 )
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -213,9 +214,9 @@ SUBROUTINE DCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALAERH, ALAHD, ALASUM, DCOPY, DERRTR, DGET04,
-     $                   DLACPY, DLARHS, DLATRS, DLATTR, DTRCON, DTRRFS,
-     $                   DTRT01, DTRT02, DTRT03, DTRT05, DTRT06, DTRTRI,
-     $                   DTRTRS, XLAENV
+     $                   DLACPY, DLAMCH, DSCAL, DLARHS, DLATRS, DLATRS3,
+     $                   DLATTR, DTRCON, DTRRFS, DTRT01, DTRT02, DTRT03,
+     $                   DTRT05, DTRT06, DTRTRI, DTRTRS, XLAENV
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -239,6 +240,7 @@ SUBROUTINE DCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
 *
       PATH( 1: 1 ) = 'Double precision'
       PATH( 2: 3 ) = 'TR'
+      BIGNUM = DLAMCH('Overflow') / DLAMCH('Precision')
       NRUN = 0
       NFAIL = 0
       NERRS = 0
@@ -539,6 +541,32 @@ SUBROUTINE DCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                         RWORK, ONE, B( N+1 ), LDA, X, LDA, WORK,
      $                         RESULT( 9 ) )
 *
+*+    TEST 10
+*                 Solve op(A)*X = B
+*
+                  SRNAMT = 'DLATRS3'
+                  CALL DCOPY( N, X, 1, B, 1 )
+                  CALL DCOPY( N, X, 1, B( N+1 ), 1 )
+                  CALL DSCAL( N, BIGNUM, B( N+1 ), 1 )
+                  CALL DLATRS3( UPLO, TRANS, DIAG, 'N', N, 2, A, LDA,
+     $                          B, MAX(1, N), SCALE3, RWORK, WORK, NMAX,
+     $                          INFO )
+*
+*                 Check error code from DLATRS3.
+*
+                  IF( INFO.NE.0 )
+     $               CALL ALAERH( PATH, 'DLATRS3', INFO, 0,
+     $                            UPLO // TRANS // DIAG // 'N', N, N,
+     $                            -1, -1, -1, IMAT, NFAIL, NERRS, NOUT )
+                  CALL DTRT03( UPLO, TRANS, DIAG, N, 1, A, LDA,
+     $                         SCALE3( 1 ), RWORK, ONE, B( 1 ), LDA,
+     $                         X, LDA, WORK, RESULT( 10 ) )
+                  CALL DSCAL( N, BIGNUM, X, 1 )
+                  CALL DTRT03( UPLO, TRANS, DIAG, N, 1, A, LDA,
+     $                         SCALE3( 2 ), RWORK, ONE, B( N+1 ), LDA,
+     $                         X, LDA, WORK, RES )
+                  RESULT( 10 ) = MAX( RESULT( 10 ), RES )
+*
 *                 Print information about the tests that did not pass
 *                 the threshold.
 *
@@ -556,7 +584,14 @@ SUBROUTINE DCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                  DIAG, 'Y', N, IMAT, 9, RESULT( 9 )
                      NFAIL = NFAIL + 1
                   END IF
-                  NRUN = NRUN + 2
+                  IF( RESULT( 10 ).GE.THRESH ) THEN
+                     IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
+     $                  CALL ALAHD( NOUT, PATH )
+                     WRITE( NOUT, FMT = 9996 )'DLATRS3', UPLO, TRANS,
+     $                  DIAG, 'N', N, IMAT, 10, RESULT( 10 )
+                     NFAIL = NFAIL + 1
+                  END IF
+                  NRUN = NRUN + 3
    90          CONTINUE
   100       CONTINUE
   110    CONTINUE
@@ -569,8 +604,8 @@ SUBROUTINE DCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
  9999 FORMAT( ' UPLO=''', A1, ''', DIAG=''', A1, ''', N=', I5, ', NB=',
      $      I4, ', type ', I2, ', test(', I2, ')= ', G12.5 )
  9998 FORMAT( ' UPLO=''', A1, ''', TRANS=''', A1, ''', DIAG=''', A1,
-     $      ''', N=', I5, ', NB=', I4, ', type ', I2, ',
-     $      test(', I2, ')= ', G12.5 )
+     $      ''', N=', I5, ', NB=', I4, ', type ', I2, ', test(',
+     $      I2, ')= ', G12.5 )
  9997 FORMAT( ' NORM=''', A1, ''', UPLO =''', A1, ''', N=', I5, ',',
      $      11X, ' type ', I2, ', test(', I2, ')=', G12.5 )
  9996 FORMAT( 1X, A, '( ''', A1, ''', ''', A1, ''', ''', A1, ''', ''',
diff --git a/TESTING/LIN/dchktz.f b/TESTING/LIN/dchktz.f
index efb468f002..0e27b9d653 100644
--- a/TESTING/LIN/dchktz.f
+++ b/TESTING/LIN/dchktz.f
@@ -129,6 +129,7 @@
 *  =====================================================================
       SUBROUTINE DCHKTZ( DOTYPE, NM, MVAL, NN, NVAL, THRESH, TSTERR, A,
      $                   COPYA, S, TAU, WORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvab.f b/TESTING/LIN/ddrvab.f
index 9110d8334b..a56c77a9c3 100644
--- a/TESTING/LIN/ddrvab.f
+++ b/TESTING/LIN/ddrvab.f
@@ -148,6 +148,7 @@
       SUBROUTINE DDRVAB( DOTYPE, NM, MVAL, NNS,
      $                   NSVAL, THRESH, NMAX, A, AFAC, B,
      $                   X, WORK, RWORK, SWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -346,7 +347,7 @@ SUBROUTINE DDRVAB( DOTYPE, NM, MVAL, NNS,
                CALL DGET08( TRANS, N, N, NRHS, A, LDA, X, LDA, WORK,
      $                      LDA, RWORK, RESULT( 1 ) )
 *
-*              Check if the test passes the tesing.
+*              Check if the test passes the testing.
 *              Print information about the tests that did not
 *              pass the testing.
 *
diff --git a/TESTING/LIN/ddrvac.f b/TESTING/LIN/ddrvac.f
index bd463cee40..ec54f573a7 100644
--- a/TESTING/LIN/ddrvac.f
+++ b/TESTING/LIN/ddrvac.f
@@ -141,6 +141,7 @@
       SUBROUTINE DDRVAC( DOTYPE, NM, MVAL, NNS, NSVAL, THRESH, NMAX,
      $                   A, AFAC, B, X, WORK,
      $                   RWORK, SWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -365,7 +366,7 @@ SUBROUTINE DDRVAC( DOTYPE, NM, MVAL, NNS, NSVAL, THRESH, NMAX,
                   CALL DPOT06( UPLO, N, NRHS, A, LDA, X, LDA, WORK,
      $               LDA, RWORK, RESULT( 1 ) )
 *
-*                 Check if the test passes the tesing.
+*                 Check if the test passes the testing.
 *                 Print information about the tests that did not
 *                 pass the testing.
 *
diff --git a/TESTING/LIN/ddrvgb.f b/TESTING/LIN/ddrvgb.f
index ad323d5ec0..ee1a48f67d 100644
--- a/TESTING/LIN/ddrvgb.f
+++ b/TESTING/LIN/ddrvgb.f
@@ -169,6 +169,7 @@
       SUBROUTINE DDRVGB( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, LA,
      $                   AFB, LAFB, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvgbx.f b/TESTING/LIN/ddrvgbx.f
index 8a9fdb645a..e2a5ec15de 100644
--- a/TESTING/LIN/ddrvgbx.f
+++ b/TESTING/LIN/ddrvgbx.f
@@ -172,6 +172,7 @@
       SUBROUTINE DDRVGB( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, LA,
      $                   AFB, LAFB, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvge.f b/TESTING/LIN/ddrvge.f
index c079135a28..67e82bff87 100644
--- a/TESTING/LIN/ddrvge.f
+++ b/TESTING/LIN/ddrvge.f
@@ -161,6 +161,7 @@
       SUBROUTINE DDRVGE( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvgex.f b/TESTING/LIN/ddrvgex.f
index 53fa3ee748..615e37f9c9 100644
--- a/TESTING/LIN/ddrvgex.f
+++ b/TESTING/LIN/ddrvgex.f
@@ -164,6 +164,7 @@
       SUBROUTINE DDRVGE( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvgt.f b/TESTING/LIN/ddrvgt.f
index b1661e37b7..0d722726d0 100644
--- a/TESTING/LIN/ddrvgt.f
+++ b/TESTING/LIN/ddrvgt.f
@@ -136,6 +136,7 @@
 *  =====================================================================
       SUBROUTINE DDRVGT( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, AF,
      $                   B, X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvls.f b/TESTING/LIN/ddrvls.f
index b64930c10c..9fb85e0a4f 100644
--- a/TESTING/LIN/ddrvls.f
+++ b/TESTING/LIN/ddrvls.f
@@ -31,8 +31,8 @@
 *>
 *> \verbatim
 *>
-*> DDRVLS tests the least squares driver routines DGELS, DGETSLS, DGELSS, DGELSY,
-*> and DGELSD.
+*> DDRVLS tests the least squares driver routines DGELS, DGELST,
+*> DGETSLS, DGELSS, DGELSY, and DGELSD.
 *> \endverbatim
 *
 *  Arguments:
@@ -189,6 +189,7 @@
       SUBROUTINE DDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                   NBVAL, NXVAL, THRESH, TSTERR, A, COPYA, B,
      $                   COPYB, C, S, COPYS, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -211,7 +212,7 @@ SUBROUTINE DDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *
 *     .. Parameters ..
       INTEGER            NTESTS
-      PARAMETER          ( NTESTS = 16 )
+      PARAMETER          ( NTESTS = 18 )
       INTEGER            SMLSIZ
       PARAMETER          ( SMLSIZ = 25 )
       DOUBLE PRECISION   ONE, TWO, ZERO
@@ -225,8 +226,8 @@ SUBROUTINE DDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                   LWLSY, LWORK, M, MNMIN, N, NB, NCOLS, NERRS,
      $                   NFAIL, NRHS, NROWS, NRUN, RANK, MB,
      $                   MMAX, NMAX, NSMAX, LIWORK,
-     $                   LWORK_DGELS, LWORK_DGETSLS, LWORK_DGELSS,
-     $                   LWORK_DGELSY, LWORK_DGELSD
+     $                   LWORK_DGELS, LWORK_DGELST, LWORK_DGETSLS,
+     $                   LWORK_DGELSS, LWORK_DGELSY, LWORK_DGELSD
       DOUBLE PRECISION   EPS, NORMA, NORMB, RCOND
 *     ..
 *     .. Local Arrays ..
@@ -243,12 +244,12 @@ SUBROUTINE DDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALAERH, ALAHD, ALASVM, DAXPY, DERRLS, DGELS,
-     $                   DGELSD, DGELSS, DGELSY, DGEMM, DLACPY,
-     $                   DLARNV, DLASRT, DQRT13, DQRT15, DQRT16, DSCAL,
-     $                   XLAENV
+     $                   DGELSD, DGELSS, DGELST, DGELSY, DGEMM,
+     $                   DGETSLS, DLACPY, DLARNV, DQRT13, DQRT15,
+     $                   DQRT16, DSCAL, XLAENV
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DBLE, INT, LOG, MAX, MIN, SQRT
+      INTRINSIC          DBLE, INT, MAX, MIN, SQRT
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -330,7 +331,8 @@ SUBROUTINE DDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
       LIWORK = 1
 *
 *     Iterate through all test cases and compute necessary workspace
-*     sizes for ?GELS, ?GETSLS, ?GELSY, ?GELSS and ?GELSD routines.
+*     sizes for ?GELS, ?GELST, ?GETSLS, ?GELSY, ?GELSS and ?GELSD
+*     routines.
 *
       DO IM = 1, NM
          M = MVAL( IM )
@@ -357,6 +359,10 @@ SUBROUTINE DDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
                               CALL DGELS( TRANS, M, N, NRHS, A, LDA,
      $                                    B, LDB, WQ, -1, INFO )
                               LWORK_DGELS = INT ( WQ ( 1 ) )
+*                             Compute workspace needed for DGELST
+                              CALL DGELST( TRANS, M, N, NRHS, A, LDA,
+     $                                    B, LDB, WQ, -1, INFO )
+                              LWORK_DGELST = INT ( WQ ( 1 ) )
 *                             Compute workspace needed for DGETSLS
                               CALL DGETSLS( TRANS, M, N, NRHS, A, LDA,
      $                                      B, LDB, WQ, -1, INFO )
@@ -378,9 +384,9 @@ SUBROUTINE DDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *                       Compute LIWORK workspace needed for DGELSY and DGELSD
                         LIWORK = MAX( LIWORK, N, IWQ( 1 ) )
 *                       Compute LWORK workspace needed for all functions
-                        LWORK = MAX( LWORK, LWORK_DGELS, LWORK_DGETSLS,
-     $                               LWORK_DGELSY, LWORK_DGELSS,
-     $                               LWORK_DGELSD )
+                        LWORK = MAX( LWORK, LWORK_DGELS, LWORK_DGELST,
+     $                               LWORK_DGETSLS, LWORK_DGELSY,
+     $                               LWORK_DGELSS, LWORK_DGELSD )
                      END IF
                   ENDDO
                ENDDO
@@ -411,21 +417,26 @@ SUBROUTINE DDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
                      ITYPE = ( IRANK-1 )*3 + ISCALE
                      IF( .NOT.DOTYPE( ITYPE ) )
      $                  GO TO 110
-*
+*                 =====================================================
+*                       Begin test DGELS
+*                 =====================================================
                      IF( IRANK.EQ.1 ) THEN
 *
-*                       Test DGELS
-*
 *                       Generate a matrix of scaling type ISCALE
 *
                         CALL DQRT13( ISCALE, M, N, COPYA, LDA, NORMA,
      $                               ISEED )
-                        DO 40 INB = 1, NNB
+*
+*                       Loop for testing different block sizes.
+*
+                        DO INB = 1, NNB
                            NB = NBVAL( INB )
                            CALL XLAENV( 1, NB )
                            CALL XLAENV( 3, NXVAL( INB ) )
 *
-                           DO 30 ITRAN = 1, 2
+*                          Loop for testing non-transposed and transposed.
+*
+                           DO ITRAN = 1, 2
                               IF( ITRAN.EQ.1 ) THEN
                                  TRANS = 'N'
                                  NROWS = M
@@ -469,20 +480,27 @@ SUBROUTINE DDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                                        ITYPE, NFAIL, NERRS,
      $                                        NOUT )
 *
-*                             Check correctness of results
+*                             Test 1: Check correctness of results
+*                             for DGELS, compute the residual:
+*                             RESID = norm(B - A*X) /
+*                             / ( max(m,n) * norm(A) * norm(X) * EPS )
 *
-                              LDWORK = MAX( 1, NROWS )
                               IF( NROWS.GT.0 .AND. NRHS.GT.0 )
      $                           CALL DLACPY( 'Full', NROWS, NRHS,
      $                                        COPYB, LDB, C, LDB )
                               CALL DQRT16( TRANS, M, N, NRHS, COPYA,
      $                                     LDA, B, LDB, C, LDB, WORK,
      $                                     RESULT( 1 ) )
+*
+*                             Test 2: Check correctness of results
+*                             for DGELS.
 *
                               IF( ( ITRAN.EQ.1 .AND. M.GE.N ) .OR.
      $                            ( ITRAN.EQ.2 .AND. M.LT.N ) ) THEN
 *
-*                                Solving LS system
+*                                Solving LS system, compute:
+*                                r = norm((B- A*X)**T * A) /
+*                                 / (norm(A)*norm(B)*max(M,N,NRHS)*EPS)
 *
                                  RESULT( 2 ) = DQRT17( TRANS, 1, M, N,
      $                                         NRHS, COPYA, LDA, B, LDB,
@@ -500,35 +518,42 @@ SUBROUTINE DDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *                             Print information about the tests that
 *                             did not pass the threshold.
 *
-                              DO 20 K = 1, 2
+                              DO K = 1, 2
                                  IF( RESULT( K ).GE.THRESH ) THEN
                                     IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
      $                                 CALL ALAHD( NOUT, PATH )
-                                    WRITE( NOUT, FMT = 9999 )TRANS, M,
+                                    WRITE( NOUT, FMT = 9999 ) TRANS, M,
      $                                 N, NRHS, NB, ITYPE, K,
      $                                 RESULT( K )
                                     NFAIL = NFAIL + 1
                                  END IF
-   20                         CONTINUE
+                              END DO
                               NRUN = NRUN + 2
-   30                      CONTINUE
-   40                   CONTINUE
-*
-*
-*                       Test DGETSLS
+                           END DO
+                        END DO
+                     END IF
+*                 =====================================================
+*                       End test DGELS
+*                 =====================================================
+*                 =====================================================
+*                       Begin test DGELST
+*                 =====================================================
+                     IF( IRANK.EQ.1 ) THEN
 *
 *                       Generate a matrix of scaling type ISCALE
 *
                         CALL DQRT13( ISCALE, M, N, COPYA, LDA, NORMA,
      $                               ISEED )
-                        DO 65 INB = 1, NNB
-                           MB = NBVAL( INB )
-                           CALL XLAENV( 1, MB )
-                             DO 62 IMB = 1, NNB
-                              NB = NBVAL( IMB )
-                              CALL XLAENV( 2, NB )
 *
-                           DO 60 ITRAN = 1, 2
+*                       Loop for testing different block sizes.
+*
+                        DO INB = 1, NNB
+                           NB = NBVAL( INB )
+                           CALL XLAENV( 1, NB )
+*
+*                          Loop for testing non-transposed and transposed.
+*
+                           DO ITRAN = 1, 2
                               IF( ITRAN.EQ.1 ) THEN
                                  TRANS = 'N'
                                  NROWS = M
@@ -563,31 +588,38 @@ SUBROUTINE DDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
                                  CALL DLACPY( 'Full', NROWS, NRHS,
      $                                        COPYB, LDB, B, LDB )
                               END IF
-                              SRNAMT = 'DGETSLS '
-                              CALL DGETSLS( TRANS, M, N, NRHS, A,
-     $                                 LDA, B, LDB, WORK, LWORK, INFO )
+                              SRNAMT = 'DGELST'
+                              CALL DGELST( TRANS, M, N, NRHS, A, LDA, B,
+     $                                     LDB, WORK, LWORK, INFO )
                               IF( INFO.NE.0 )
-     $                           CALL ALAERH( PATH, 'DGETSLS ', INFO, 0,
+     $                           CALL ALAERH( PATH, 'DGELST', INFO, 0,
      $                                        TRANS, M, N, NRHS, -1, NB,
      $                                        ITYPE, NFAIL, NERRS,
      $                                        NOUT )
 *
-*                             Check correctness of results
+*                             Test 3: Check correctness of results
+*                             for DGELST, compute the residual:
+*                             RESID = norm(B - A*X) /
+*                             / ( max(m,n) * norm(A) * norm(X) * EPS )
 *
-                              LDWORK = MAX( 1, NROWS )
                               IF( NROWS.GT.0 .AND. NRHS.GT.0 )
      $                           CALL DLACPY( 'Full', NROWS, NRHS,
      $                                        COPYB, LDB, C, LDB )
                               CALL DQRT16( TRANS, M, N, NRHS, COPYA,
      $                                     LDA, B, LDB, C, LDB, WORK,
-     $                                     RESULT( 15 ) )
+     $                                     RESULT( 3 ) )
+*
+*                             Test 4: Check correctness of results
+*                             for DGELST.
 *
                               IF( ( ITRAN.EQ.1 .AND. M.GE.N ) .OR.
      $                            ( ITRAN.EQ.2 .AND. M.LT.N ) ) THEN
 *
-*                                Solving LS system
+*                                Solving LS system, compute:
+*                                r = norm((B- A*X)**T * A) /
+*                                 / (norm(A)*norm(B)*max(M,N,NRHS)*EPS)
 *
-                                 RESULT( 16 ) = DQRT17( TRANS, 1, M, N,
+                                 RESULT( 4 ) = DQRT17( TRANS, 1, M, N,
      $                                         NRHS, COPYA, LDA, B, LDB,
      $                                         COPYB, LDB, C, WORK,
      $                                         LWORK )
@@ -595,7 +627,7 @@ SUBROUTINE DDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *
 *                                Solving overdetermined system
 *
-                                 RESULT( 16 ) = DQRT14( TRANS, M, N,
+                                 RESULT( 4 ) = DQRT14( TRANS, M, N,
      $                                         NRHS, COPYA, LDA, B, LDB,
      $                                         WORK, LWORK )
                               END IF
@@ -603,21 +635,151 @@ SUBROUTINE DDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *                             Print information about the tests that
 *                             did not pass the threshold.
 *
-                              DO 50 K = 15, 16
+                              DO K = 3, 4
                                  IF( RESULT( K ).GE.THRESH ) THEN
                                     IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
      $                                 CALL ALAHD( NOUT, PATH )
-                                    WRITE( NOUT, FMT = 9997 )TRANS, M,
-     $                                 N, NRHS, MB, NB, ITYPE, K,
+                                    WRITE( NOUT, FMT = 9999 ) TRANS, M,
+     $                                 N, NRHS, NB, ITYPE, K,
      $                                 RESULT( K )
                                     NFAIL = NFAIL + 1
                                  END IF
-   50                         CONTINUE
+                              END DO
                               NRUN = NRUN + 2
-   60                      CONTINUE
-   62                      CONTINUE
-   65                   CONTINUE
+                           END DO
+                        END DO
+                     END IF
+*                 =====================================================
+*                       End test DGELST
+*                 =====================================================
+*                 =====================================================
+*                       Begin test DGETSLS
+*                 =====================================================
+                     IF( IRANK.EQ.1 ) THEN
+*
+*                       Generate a matrix of scaling type ISCALE
+*
+                        CALL DQRT13( ISCALE, M, N, COPYA, LDA, NORMA,
+     $                               ISEED )
+*
+*                       Loop for testing different block sizes MB.
+*
+                        DO IMB = 1, NNB
+                           MB = NBVAL( IMB )
+                           CALL XLAENV( 1, MB )
+*
+*                          Loop for testing different block sizes NB.
+*
+                           DO INB = 1, NNB
+                              NB = NBVAL( INB )
+                              CALL XLAENV( 2, NB )
+*
+*                             Loop for testing non-transposed
+*                             and transposed.
+*
+                              DO ITRAN = 1, 2
+                                 IF( ITRAN.EQ.1 ) THEN
+                                    TRANS = 'N'
+                                    NROWS = M
+                                    NCOLS = N
+                                 ELSE
+                                    TRANS = 'T'
+                                    NROWS = N
+                                    NCOLS = M
+                                 END IF
+                                 LDWORK = MAX( 1, NCOLS )
+*
+*                                Set up a consistent rhs
+*
+                                 IF( NCOLS.GT.0 ) THEN
+                                    CALL DLARNV( 2, ISEED, NCOLS*NRHS,
+     $                                           WORK )
+                                    CALL DSCAL( NCOLS*NRHS,
+     $                                          ONE / DBLE( NCOLS ),
+     $                                          WORK, 1 )
+                                 END IF
+                                 CALL DGEMM( TRANS, 'No transpose',
+     $                                       NROWS, NRHS, NCOLS, ONE,
+     $                                       COPYA, LDA, WORK, LDWORK,
+     $                                       ZERO, B, LDB )
+                                 CALL DLACPY( 'Full', NROWS, NRHS,
+     $                                        B, LDB, COPYB, LDB )
+*
+*                                Solve LS or overdetermined system
+*
+                                 IF( M.GT.0 .AND. N.GT.0 ) THEN
+                                    CALL DLACPY( 'Full', M, N,
+     $                                           COPYA, LDA, A, LDA )
+                                    CALL DLACPY( 'Full', NROWS, NRHS,
+     $                                           COPYB, LDB, B, LDB )
+                                 END IF
+                                 SRNAMT = 'DGETSLS'
+                                 CALL DGETSLS( TRANS, M, N, NRHS,
+     $                                    A, LDA, B, LDB, WORK, LWORK,
+     $                                    INFO )
+                                 IF( INFO.NE.0 )
+     $                              CALL ALAERH( PATH, 'DGETSLS', INFO,
+     $                                           0, TRANS, M, N, NRHS,
+     $                                           -1, NB, ITYPE, NFAIL,
+     $                                           NERRS, NOUT )
+*
+*                             Test 5: Check correctness of results
+*                             for DGETSLS, compute the residual:
+*                             RESID = norm(B - A*X) /
+*                             / ( max(m,n) * norm(A) * norm(X) * EPS )
+*
+                                 IF( NROWS.GT.0 .AND. NRHS.GT.0 )
+     $                              CALL DLACPY( 'Full', NROWS, NRHS,
+     $                                           COPYB, LDB, C, LDB )
+                                 CALL DQRT16( TRANS, M, N, NRHS,
+     $                                        COPYA, LDA, B, LDB,
+     $                                        C, LDB, WORK,
+     $                                        RESULT( 5 ) )
+*
+*                             Test 6: Check correctness of results
+*                             for DGETSLS.
+*
+                                 IF( ( ITRAN.EQ.1 .AND. M.GE.N ) .OR.
+     $                               ( ITRAN.EQ.2 .AND. M.LT.N ) ) THEN
+*
+*                                   Solving LS system, compute:
+*                                   r = norm((B- A*X)**T * A) /
+*                                 / (norm(A)*norm(B)*max(M,N,NRHS)*EPS)
+*
+                                    RESULT( 6 ) = DQRT17( TRANS, 1, M,
+     $                                             N, NRHS, COPYA, LDA,
+     $                                             B, LDB, COPYB, LDB,
+     $                                             C, WORK, LWORK )
+                                 ELSE
+*
+*                                   Solving overdetermined system
+*
+                                    RESULT( 6 ) = DQRT14( TRANS, M, N,
+     $                                             NRHS, COPYA, LDA,
+     $                                             B, LDB, WORK, LWORK )
+                                 END IF
+*
+*                                Print information about the tests that
+*                                did not pass the threshold.
+*
+                                 DO K = 5, 6
+                                    IF( RESULT( K ).GE.THRESH ) THEN
+                                       IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
+     $                                    CALL ALAHD( NOUT, PATH )
+                                       WRITE( NOUT, FMT = 9997 ) TRANS,
+     $                                    M, N, NRHS, MB, NB, ITYPE,
+     $                                    K, RESULT( K )
+                                       NFAIL = NFAIL + 1
+                                    END IF
+                                 END DO
+                                 NRUN = NRUN + 2
+                              END DO
+                           END DO
+                        END DO
                      END IF
+*                 =====================================================
+*                       End test DGETSLS
+*                 =====================================================
 *
 *                    Generate a matrix of scaling type ISCALE and rank
 *                    type IRANK.
@@ -662,37 +824,37 @@ SUBROUTINE DDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                                  N, NRHS, -1, NB, ITYPE, NFAIL,
      $                                  NERRS, NOUT )
 *
-*                       Test 3:  Compute relative error in svd
+*                       Test 7:  Compute relative error in svd
 *                                workspace: M*N + 4*MIN(M,N) + MAX(M,N)
 *
-                        RESULT( 3 ) = DQRT12( CRANK, CRANK, A, LDA,
+                        RESULT( 7 ) = DQRT12( CRANK, CRANK, A, LDA,
      $                                COPYS, WORK, LWORK )
 *
-*                       Test 4:  Compute error in solution
+*                       Test 8:  Compute error in solution
 *                                workspace:  M*NRHS + M
 *
                         CALL DLACPY( 'Full', M, NRHS, COPYB, LDB, WORK,
      $                               LDWORK )
                         CALL DQRT16( 'No transpose', M, N, NRHS, COPYA,
      $                               LDA, B, LDB, WORK, LDWORK,
-     $                               WORK( M*NRHS+1 ), RESULT( 4 ) )
+     $                               WORK( M*NRHS+1 ), RESULT( 8 ) )
 *
-*                       Test 5:  Check norm of r'*A
+*                       Test 9:  Check norm of r'*A
 *                                workspace: NRHS*(M+N)
 *
-                        RESULT( 5 ) = ZERO
+                        RESULT( 9 ) = ZERO
                         IF( M.GT.CRANK )
-     $                     RESULT( 5 ) = DQRT17( 'No transpose', 1, M,
+     $                     RESULT( 9 ) = DQRT17( 'No transpose', 1, M,
      $                                   N, NRHS, COPYA, LDA, B, LDB,
      $                                   COPYB, LDB, C, WORK, LWORK )
 *
-*                       Test 6:  Check if x is in the rowspace of A
+*                       Test 10:  Check if x is in the rowspace of A
 *                                workspace: (M+NRHS)*(N+2)
 *
-                        RESULT( 6 ) = ZERO
+                        RESULT( 10 ) = ZERO
 *
                         IF( N.GT.CRANK )
-     $                     RESULT( 6 ) = DQRT14( 'No transpose', M, N,
+     $                     RESULT( 10 ) = DQRT14( 'No transpose', M, N,
      $                                   NRHS, COPYA, LDA, B, LDB,
      $                                   WORK, LWORK )
 *
@@ -716,38 +878,38 @@ SUBROUTINE DDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *                       workspace used: 3*min(m,n) +
 *                                       max(2*min(m,n),nrhs,max(m,n))
 *
-*                       Test 7:  Compute relative error in svd
+*                       Test 11:  Compute relative error in svd
 *
                         IF( RANK.GT.0 ) THEN
                            CALL DAXPY( MNMIN, -ONE, COPYS, 1, S, 1 )
-                           RESULT( 7 ) = DASUM( MNMIN, S, 1 ) /
+                           RESULT( 11 ) = DASUM( MNMIN, S, 1 ) /
      $                                   DASUM( MNMIN, COPYS, 1 ) /
      $                                   ( EPS*DBLE( MNMIN ) )
                         ELSE
-                           RESULT( 7 ) = ZERO
+                           RESULT( 11 ) = ZERO
                         END IF
 *
-*                       Test 8:  Compute error in solution
+*                       Test 12:  Compute error in solution
 *
                         CALL DLACPY( 'Full', M, NRHS, COPYB, LDB, WORK,
      $                               LDWORK )
                         CALL DQRT16( 'No transpose', M, N, NRHS, COPYA,
      $                               LDA, B, LDB, WORK, LDWORK,
-     $                               WORK( M*NRHS+1 ), RESULT( 8 ) )
+     $                               WORK( M*NRHS+1 ), RESULT( 12 ) )
 *
-*                       Test 9:  Check norm of r'*A
+*                       Test 13:  Check norm of r'*A
 *
-                        RESULT( 9 ) = ZERO
+                        RESULT( 13 ) = ZERO
                         IF( M.GT.CRANK )
-     $                     RESULT( 9 ) = DQRT17( 'No transpose', 1, M,
+     $                     RESULT( 13 ) = DQRT17( 'No transpose', 1, M,
      $                                   N, NRHS, COPYA, LDA, B, LDB,
      $                                   COPYB, LDB, C, WORK, LWORK )
 *
-*                       Test 10:  Check if x is in the rowspace of A
+*                       Test 14:  Check if x is in the rowspace of A
 *
-                        RESULT( 10 ) = ZERO
+                        RESULT( 14 ) = ZERO
                         IF( N.GT.CRANK )
-     $                     RESULT( 10 ) = DQRT14( 'No transpose', M, N,
+     $                     RESULT( 14 ) = DQRT14( 'No transpose', M, N,
      $                                    NRHS, COPYA, LDA, B, LDB,
      $                                    WORK, LWORK )
 *
@@ -776,45 +938,45 @@ SUBROUTINE DDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                                  N, NRHS, -1, NB, ITYPE, NFAIL,
      $                                  NERRS, NOUT )
 *
-*                       Test 11:  Compute relative error in svd
+*                       Test 15:  Compute relative error in svd
 *
                         IF( RANK.GT.0 ) THEN
                            CALL DAXPY( MNMIN, -ONE, COPYS, 1, S, 1 )
-                           RESULT( 11 ) = DASUM( MNMIN, S, 1 ) /
+                           RESULT( 15 ) = DASUM( MNMIN, S, 1 ) /
      $                                    DASUM( MNMIN, COPYS, 1 ) /
      $                                    ( EPS*DBLE( MNMIN ) )
                         ELSE
-                           RESULT( 11 ) = ZERO
+                           RESULT( 15 ) = ZERO
                         END IF
 *
-*                       Test 12:  Compute error in solution
+*                       Test 16:  Compute error in solution
 *
                         CALL DLACPY( 'Full', M, NRHS, COPYB, LDB, WORK,
      $                               LDWORK )
                         CALL DQRT16( 'No transpose', M, N, NRHS, COPYA,
      $                               LDA, B, LDB, WORK, LDWORK,
-     $                               WORK( M*NRHS+1 ), RESULT( 12 ) )
+     $                               WORK( M*NRHS+1 ), RESULT( 16 ) )
 *
-*                       Test 13:  Check norm of r'*A
+*                       Test 17:  Check norm of r'*A
 *
-                        RESULT( 13 ) = ZERO
+                        RESULT( 17 ) = ZERO
                         IF( M.GT.CRANK )
-     $                     RESULT( 13 ) = DQRT17( 'No transpose', 1, M,
+     $                     RESULT( 17 ) = DQRT17( 'No transpose', 1, M,
      $                                    N, NRHS, COPYA, LDA, B, LDB,
      $                                    COPYB, LDB, C, WORK, LWORK )
 *
-*                       Test 14:  Check if x is in the rowspace of A
+*                       Test 18:  Check if x is in the rowspace of A
 *
-                        RESULT( 14 ) = ZERO
+                        RESULT( 18 ) = ZERO
                         IF( N.GT.CRANK )
-     $                     RESULT( 14 ) = DQRT14( 'No transpose', M, N,
+     $                     RESULT( 18 ) = DQRT14( 'No transpose', M, N,
      $                                    NRHS, COPYA, LDA, B, LDB,
      $                                    WORK, LWORK )
 *
 *                       Print information about the tests that did not
 *                       pass the threshold.
 *
-                        DO 90 K = 3, 14
+                        DO 90 K = 7, 18
                            IF( RESULT( K ).GE.THRESH ) THEN
                               IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
      $                           CALL ALAHD( NOUT, PATH )
@@ -826,6 +988,12 @@ SUBROUTINE DDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
                         NRUN = NRUN + 12
 *
   100                CONTINUE
+
+
+
+
+
+
   110             CONTINUE
   120          CONTINUE
   130       CONTINUE
diff --git a/TESTING/LIN/ddrvpb.f b/TESTING/LIN/ddrvpb.f
index 6508de866b..83bc5e6b90 100644
--- a/TESTING/LIN/ddrvpb.f
+++ b/TESTING/LIN/ddrvpb.f
@@ -161,6 +161,7 @@
       SUBROUTINE DDRVPB( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvpo.f b/TESTING/LIN/ddrvpo.f
index c5c8076e0a..e095023476 100644
--- a/TESTING/LIN/ddrvpo.f
+++ b/TESTING/LIN/ddrvpo.f
@@ -161,6 +161,7 @@
       SUBROUTINE DDRVPO( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvpox.f b/TESTING/LIN/ddrvpox.f
index f23223ee15..13b1d0b7fc 100644
--- a/TESTING/LIN/ddrvpox.f
+++ b/TESTING/LIN/ddrvpox.f
@@ -164,6 +164,7 @@
       SUBROUTINE DDRVPO( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvpp.f b/TESTING/LIN/ddrvpp.f
index 15de557f93..a0012ba16a 100644
--- a/TESTING/LIN/ddrvpp.f
+++ b/TESTING/LIN/ddrvpp.f
@@ -164,6 +164,7 @@
       SUBROUTINE DDRVPP( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvpt.f b/TESTING/LIN/ddrvpt.f
index c0c2806ec2..4568e2affc 100644
--- a/TESTING/LIN/ddrvpt.f
+++ b/TESTING/LIN/ddrvpt.f
@@ -137,6 +137,7 @@
 *  =====================================================================
       SUBROUTINE DDRVPT( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, D,
      $                   E, B, X, XACT, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvrf1.f b/TESTING/LIN/ddrvrf1.f
index 08ab4895f6..cfcc722e53 100644
--- a/TESTING/LIN/ddrvrf1.f
+++ b/TESTING/LIN/ddrvrf1.f
@@ -91,6 +91,7 @@
 *
 *  =====================================================================
       SUBROUTINE DDRVRF1( NOUT, NN, NVAL, THRESH, A, LDA, ARF, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvrf2.f b/TESTING/LIN/ddrvrf2.f
index 6ed60b1364..17a1a9e244 100644
--- a/TESTING/LIN/ddrvrf2.f
+++ b/TESTING/LIN/ddrvrf2.f
@@ -86,6 +86,7 @@
 *
 *  =====================================================================
       SUBROUTINE DDRVRF2( NOUT, NN, NVAL, A, LDA, ARF, AP, ASAV  )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvrf3.f b/TESTING/LIN/ddrvrf3.f
index 1c5d74aea0..d62d82c63d 100644
--- a/TESTING/LIN/ddrvrf3.f
+++ b/TESTING/LIN/ddrvrf3.f
@@ -115,6 +115,7 @@
 *  =====================================================================
       SUBROUTINE DDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
      +                    D_WORK_DLANGE, D_WORK_DGEQRF, TAU )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -153,8 +154,9 @@ SUBROUTINE DDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
       DOUBLE PRECISION   RESULT( NTESTS )
 *     ..
 *     .. External Functions ..
+      LOGICAL            LSAME
       DOUBLE PRECISION   DLAMCH, DLANGE, DLARND
-      EXTERNAL           DLAMCH, DLANGE, DLARND
+      EXTERNAL           DLAMCH, DLANGE, DLARND, LSAME
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           DTRTTF, DGEQRF, DGEQLF, DTFSM, DTRSM
@@ -218,9 +220,9 @@ SUBROUTINE DDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *
                            DO 100 IALPHA = 1, 3
 *
-                              IF ( IALPHA.EQ. 1) THEN
+                              IF ( IALPHA.EQ.1 ) THEN
                                  ALPHA = ZERO
-                              ELSE IF ( IALPHA.EQ. 2) THEN
+                              ELSE IF ( IALPHA.EQ.2 ) THEN
                                  ALPHA = ONE
                               ELSE
                                  ALPHA = DLARND( 2, ISEED )
@@ -259,7 +261,7 @@ SUBROUTINE DDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *
                               DO J = 1, NA
                                  DO I = 1, NA
-                                    A( I, J) = DLARND( 2, ISEED )
+                                    A( I, J ) = DLARND( 2, ISEED )
                                  END DO
                               END DO
 *
@@ -272,6 +274,20 @@ SUBROUTINE DDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
                                  CALL DGEQRF( NA, NA, A, LDA, TAU,
      +                                        D_WORK_DGEQRF, LDA,
      +                                        INFO )
+*
+*                                Forcing main diagonal of test matrix to
+*                                be unit makes it ill-conditioned for
+*                                some test cases
+*
+                                 IF ( LSAME( DIAG, 'U' ) ) THEN
+                                    DO J = 1, NA
+                                       DO I = 1, J
+                                          A( I, J ) = A( I, J ) /
+     +                                            ( 2.0 * A( J, J ) )
+                                       END DO
+                                    END DO
+                                 END IF
+*
                               ELSE
 *
 *                                The case IUPLO.EQ.2 is when SIDE.EQ.'L'
@@ -281,6 +297,20 @@ SUBROUTINE DDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
                                  CALL DGELQF( NA, NA, A, LDA, TAU,
      +                                        D_WORK_DGEQRF, LDA,
      +                                        INFO )
+*
+*                                Forcing main diagonal of test matrix to
+*                                be unit makes it ill-conditioned for
+*                                some test cases
+*
+                                 IF ( LSAME( DIAG, 'U' ) ) THEN
+                                    DO I = 1, NA
+                                       DO J = 1, I
+                                          A( I, J ) = A( I, J ) /
+     +                                            ( 2.0 * A( I, I ) )
+                                       END DO
+                                    END DO
+                                 END IF
+*
                               END IF
 *
 *                             Store a copy of A in RFP format (in ARF).
@@ -294,8 +324,8 @@ SUBROUTINE DDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *
                               DO J = 1, N
                                  DO I = 1, M
-                                    B1( I, J) = DLARND( 2, ISEED )
-                                    B2( I, J) = B1( I, J)
+                                    B1( I, J ) = DLARND( 2, ISEED )
+                                    B2( I, J ) = B1( I, J )
                                  END DO
                               END DO
 *
@@ -318,24 +348,24 @@ SUBROUTINE DDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *
                               DO J = 1, N
                                  DO I = 1, M
-                                    B1( I, J) = B2( I, J ) - B1( I, J )
+                                    B1( I, J ) = B2( I, J ) - B1( I, J )
                                  END DO
                               END DO
 *
-                              RESULT(1) = DLANGE( 'I', M, N, B1, LDA,
+                              RESULT( 1 ) = DLANGE( 'I', M, N, B1, LDA,
      +                                            D_WORK_DLANGE )
 *
-                              RESULT(1) = RESULT(1) / SQRT( EPS )
-     +                                    / MAX ( MAX( M, N), 1 )
+                              RESULT( 1 ) = RESULT( 1 ) / SQRT( EPS )
+     +                                    / MAX ( MAX( M, N ), 1 )
 *
-                              IF( RESULT(1).GE.THRESH ) THEN
+                              IF( RESULT( 1 ).GE.THRESH ) THEN
                                  IF( NFAIL.EQ.0 ) THEN
                                     WRITE( NOUT, * )
                                     WRITE( NOUT, FMT = 9999 )
                                  END IF
                                  WRITE( NOUT, FMT = 9997 ) 'DTFSM',
      +                              CFORM, SIDE, UPLO, TRANS, DIAG, M,
-     +                              N, RESULT(1)
+     +                              N, RESULT( 1 )
                                  NFAIL = NFAIL + 1
                               END IF
 *
diff --git a/TESTING/LIN/ddrvrf4.f b/TESTING/LIN/ddrvrf4.f
index 260a1bcc62..64dad8f40d 100644
--- a/TESTING/LIN/ddrvrf4.f
+++ b/TESTING/LIN/ddrvrf4.f
@@ -115,6 +115,7 @@
 *  =====================================================================
       SUBROUTINE DDRVRF4( NOUT, NN, NVAL, THRESH, C1, C2, LDC, CRF, A,
      +                    LDA, D_WORK_DLANGE )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvrfp.f b/TESTING/LIN/ddrvrfp.f
index 0e65969209..acacc53f63 100644
--- a/TESTING/LIN/ddrvrfp.f
+++ b/TESTING/LIN/ddrvrfp.f
@@ -235,6 +235,7 @@ SUBROUTINE DDRVRFP( NOUT, NN, NVAL, NNS, NSVAL, NNT, NTVAL,
      +              D_WORK_DLATMS, D_WORK_DPOT01, D_TEMP_DPOT02,
      +              D_TEMP_DPOT03, D_WORK_DLANSY,
      +              D_WORK_DPOT02, D_WORK_DPOT03 )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvsp.f b/TESTING/LIN/ddrvsp.f
index a62561c66e..f7f9a7c0e8 100644
--- a/TESTING/LIN/ddrvsp.f
+++ b/TESTING/LIN/ddrvsp.f
@@ -153,6 +153,7 @@
       SUBROUTINE DDRVSP( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvsy.f b/TESTING/LIN/ddrvsy.f
index 4eb3fa8e63..25fafda594 100644
--- a/TESTING/LIN/ddrvsy.f
+++ b/TESTING/LIN/ddrvsy.f
@@ -149,6 +149,7 @@
       SUBROUTINE DDRVSY( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvsy_aa.f b/TESTING/LIN/ddrvsy_aa.f
index 0b8e46c716..206b25ebed 100644
--- a/TESTING/LIN/ddrvsy_aa.f
+++ b/TESTING/LIN/ddrvsy_aa.f
@@ -149,6 +149,7 @@
       SUBROUTINE DDRVSY_AA( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                      NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                      RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvsy_aa_2stage.f b/TESTING/LIN/ddrvsy_aa_2stage.f
index 91c9e8e9af..09dbea6422 100644
--- a/TESTING/LIN/ddrvsy_aa_2stage.f
+++ b/TESTING/LIN/ddrvsy_aa_2stage.f
@@ -152,6 +152,7 @@ SUBROUTINE DDRVSY_AA_2STAGE(
      $                         DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                         NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                         RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -400,9 +401,9 @@ SUBROUTINE DDRVSY_AA_2STAGE(
 *                    Factor the matrix and solve the system using DSYSV_AA.
 *
                      SRNAMT = 'DSYSV_AA_2STAGE '
-                     LWORK = MIN(N*NB, 3*NMAX*NMAX)
+                     LWORK = MIN( MAX( 1, N*NB ), 3*NMAX*NMAX )
                      CALL DSYSV_AA_2STAGE( UPLO, N, NRHS, AFAC, LDA,
-     $                                 AINV, (3*NB+1)*N, 
+     $                                 AINV, MAX( 1, (3*NB+1)*N ),
      $                                 IWORK, IWORK( 1+N ),
      $                                 X, LDA, WORK, LWORK, INFO )
 *
diff --git a/TESTING/LIN/ddrvsy_rk.f b/TESTING/LIN/ddrvsy_rk.f
index 15b2c2b781..6007662bec 100644
--- a/TESTING/LIN/ddrvsy_rk.f
+++ b/TESTING/LIN/ddrvsy_rk.f
@@ -153,6 +153,7 @@
       SUBROUTINE DDRVSY_RK( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                      NMAX, A, AFAC, E, AINV, B, X, XACT, WORK,
      $                      RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvsy_rook.f b/TESTING/LIN/ddrvsy_rook.f
index dcfea94503..9a8fd4172d 100644
--- a/TESTING/LIN/ddrvsy_rook.f
+++ b/TESTING/LIN/ddrvsy_rook.f
@@ -149,6 +149,7 @@
       SUBROUTINE DDRVSY_ROOK( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                        NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                        RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ddrvsyx.f b/TESTING/LIN/ddrvsyx.f
index 51781ca982..88eea0923f 100644
--- a/TESTING/LIN/ddrvsyx.f
+++ b/TESTING/LIN/ddrvsyx.f
@@ -153,6 +153,7 @@
       SUBROUTINE DDRVSY( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/derrab.f b/TESTING/LIN/derrab.f
index 1ab97ef259..a7536832f0 100644
--- a/TESTING/LIN/derrab.f
+++ b/TESTING/LIN/derrab.f
@@ -44,6 +44,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRAB( NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/derrac.f b/TESTING/LIN/derrac.f
index 4db46ca599..224d9f3779 100644
--- a/TESTING/LIN/derrac.f
+++ b/TESTING/LIN/derrac.f
@@ -44,6 +44,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRAC( NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/derrge.f b/TESTING/LIN/derrge.f
index fc80bbbcfd..1ce4a04dec 100644
--- a/TESTING/LIN/derrge.f
+++ b/TESTING/LIN/derrge.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRGE( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/derrgex.f b/TESTING/LIN/derrgex.f
index c54d82ce84..f2fe9153c0 100644
--- a/TESTING/LIN/derrgex.f
+++ b/TESTING/LIN/derrgex.f
@@ -55,6 +55,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRGE( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/derrgt.f b/TESTING/LIN/derrgt.f
index c4cebf2f88..135058febe 100644
--- a/TESTING/LIN/derrgt.f
+++ b/TESTING/LIN/derrgt.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRGT( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/derrlq.f b/TESTING/LIN/derrlq.f
index d3cfcddd00..5377115609 100644
--- a/TESTING/LIN/derrlq.f
+++ b/TESTING/LIN/derrlq.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRLQ( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -76,7 +77,7 @@ SUBROUTINE DERRLQ( PATH, NUNIT )
      $                   W( NMAX ), X( NMAX )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAESM, CHKXER, DGELQ2, DGELQF, DGELQS, DORGL2,
+      EXTERNAL           ALAESM, CHKXER, DGELQ2, DGELQF, DORGL2,
      $                   DORGLQ, DORML2, DORMLQ
 *     ..
 *     .. Scalars in Common ..
@@ -140,31 +141,6 @@ SUBROUTINE DERRLQ( PATH, NUNIT )
       CALL DGELQ2( 2, 1, A, 1, B, W, INFO )
       CALL CHKXER( 'DGELQ2', INFOT, NOUT, LERR, OK )
 *
-*     DGELQS
-*
-      SRNAMT = 'DGELQS'
-      INFOT = 1
-      CALL DGELQS( -1, 0, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'DGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 2
-      CALL DGELQS( 0, -1, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'DGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 2
-      CALL DGELQS( 2, 1, 0, A, 2, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'DGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 3
-      CALL DGELQS( 0, 0, -1, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'DGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 5
-      CALL DGELQS( 2, 2, 0, A, 1, X, B, 2, W, 1, INFO )
-      CALL CHKXER( 'DGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 8
-      CALL DGELQS( 1, 2, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'DGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 10
-      CALL DGELQS( 1, 1, 2, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'DGELQS', INFOT, NOUT, LERR, OK )
-*
 *     DORGLQ
 *
       SRNAMT = 'DORGLQ'
diff --git a/TESTING/LIN/derrls.f b/TESTING/LIN/derrls.f
index a1f74dec23..d885aab113 100644
--- a/TESTING/LIN/derrls.f
+++ b/TESTING/LIN/derrls.f
@@ -22,7 +22,7 @@
 *> \verbatim
 *>
 *> DERRLS tests the error exits for the DOUBLE PRECISION least squares
-*> driver routines (DGELS, SGELSS, SGELSY, SGELSD).
+*> driver routines (DGELS, DGELST, DGETSLS, SGELSS, SGELSY, SGELSD).
 *> \endverbatim
 *
 *  Arguments:
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRLS( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -83,7 +84,8 @@ SUBROUTINE DERRLS( PATH, NUNIT )
       EXTERNAL           LSAMEN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAESM, CHKXER, DGELS, DGELSD, DGELSS, DGELSY
+      EXTERNAL           ALAESM, CHKXER, DGELS, DGELSD, DGELSS, DGELST,
+     $                   DGELSY, DGETSLS
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -130,10 +132,66 @@ SUBROUTINE DERRLS( PATH, NUNIT )
          INFOT = 8
          CALL DGELS( 'N', 2, 0, 0, A, 2, B, 1, W, 2, INFO )
          CALL CHKXER( 'DGELS ', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL DGELS( 'N', 0, 2, 0, A, 1, B, 1, W, 2, INFO )
+         CALL CHKXER( 'DGELS', INFOT, NOUT, LERR, OK )
          INFOT = 10
          CALL DGELS( 'N', 1, 1, 0, A, 1, B, 1, W, 1, INFO )
          CALL CHKXER( 'DGELS ', INFOT, NOUT, LERR, OK )
 *
+*        DGELST
+*
+         SRNAMT = 'DGELST'
+         INFOT = 1
+         CALL DGELST( '/', 0, 0, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'DGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL DGELST( 'N', -1, 0, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'DGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL DGELST( 'N', 0, -1, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'DGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL DGELST( 'N', 0, 0, -1, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'DGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 6
+         CALL DGELST( 'N', 2, 0, 0, A, 1, B, 2, W, 2, INFO )
+         CALL CHKXER( 'DGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL DGELST( 'N', 2, 0, 0, A, 2, B, 1, W, 2, INFO )
+         CALL CHKXER( 'DGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL DGELST( 'N', 0, 2, 0, A, 1, B, 1, W, 2, INFO )
+         CALL CHKXER( 'DGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL DGELST( 'N', 1, 1, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'DGELST', INFOT, NOUT, LERR, OK )
+*
+*        DGETSLS
+*
+         SRNAMT = 'DGETSLS'
+         INFOT = 1
+         CALL DGETSLS( '/', 0, 0, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'DGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL DGETSLS( 'N', -1, 0, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'DGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL DGETSLS( 'N', 0, -1, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'DGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL DGETSLS( 'N', 0, 0, -1, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'DGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 6
+         CALL DGETSLS( 'N', 2, 0, 0, A, 1, B, 2, W, 2, INFO )
+         CALL CHKXER( 'DGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL DGETSLS( 'N', 2, 0, 0, A, 2, B, 1, W, 2, INFO )
+         CALL CHKXER( 'DGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL DGETSLS( 'N', 0, 2, 0, A, 1, B, 1, W, 2, INFO )
+         CALL CHKXER( 'DGETSLS', INFOT, NOUT, LERR, OK )
+*
 *        DGELSS
 *
          SRNAMT = 'DGELSS'
diff --git a/TESTING/LIN/derrpo.f b/TESTING/LIN/derrpo.f
index 8282119ef6..02e9e644ed 100644
--- a/TESTING/LIN/derrpo.f
+++ b/TESTING/LIN/derrpo.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRPO( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/derrpox.f b/TESTING/LIN/derrpox.f
index c39cdd02fc..ed3c8f9234 100644
--- a/TESTING/LIN/derrpox.f
+++ b/TESTING/LIN/derrpox.f
@@ -55,6 +55,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRPO( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/derrps.f b/TESTING/LIN/derrps.f
index 378542c04f..7225f61041 100644
--- a/TESTING/LIN/derrps.f
+++ b/TESTING/LIN/derrps.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRPS( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/derrql.f b/TESTING/LIN/derrql.f
index b9c50d9ab2..cf833e1cc5 100644
--- a/TESTING/LIN/derrql.f
+++ b/TESTING/LIN/derrql.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRQL( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/derrqp.f b/TESTING/LIN/derrqp.f
index 3f29bf60e2..eeb7b4f755 100644
--- a/TESTING/LIN/derrqp.f
+++ b/TESTING/LIN/derrqp.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRQP( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/derrqr.f b/TESTING/LIN/derrqr.f
index 03155b1332..5be9a30e39 100644
--- a/TESTING/LIN/derrqr.f
+++ b/TESTING/LIN/derrqr.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRQR( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -77,7 +78,7 @@ SUBROUTINE DERRQR( PATH, NUNIT )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALAESM, CHKXER, DGEQR2, DGEQR2P, DGEQRF,
-     $                   DGEQRFP, DGEQRS, DORG2R, DORGQR, DORM2R,
+     $                   DGEQRFP, DORG2R, DORGQR, DORM2R,
      $                   DORMQR
 *     ..
 *     .. Scalars in Common ..
@@ -170,31 +171,6 @@ SUBROUTINE DERRQR( PATH, NUNIT )
       CALL DGEQR2P( 2, 1, A, 1, B, W, INFO )
       CALL CHKXER( 'DGEQR2P', INFOT, NOUT, LERR, OK )
 *
-*     DGEQRS
-*
-      SRNAMT = 'DGEQRS'
-      INFOT = 1
-      CALL DGEQRS( -1, 0, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'DGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 2
-      CALL DGEQRS( 0, -1, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'DGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 2
-      CALL DGEQRS( 1, 2, 0, A, 2, X, B, 2, W, 1, INFO )
-      CALL CHKXER( 'DGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 3
-      CALL DGEQRS( 0, 0, -1, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'DGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 5
-      CALL DGEQRS( 2, 1, 0, A, 1, X, B, 2, W, 1, INFO )
-      CALL CHKXER( 'DGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 8
-      CALL DGEQRS( 2, 1, 0, A, 2, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'DGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 10
-      CALL DGEQRS( 1, 1, 2, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'DGEQRS', INFOT, NOUT, LERR, OK )
-*
 *     DORGQR
 *
       SRNAMT = 'DORGQR'
diff --git a/TESTING/LIN/derrrfp.f b/TESTING/LIN/derrrfp.f
index d1e07a6efb..6c6a85e3e9 100644
--- a/TESTING/LIN/derrrfp.f
+++ b/TESTING/LIN/derrrfp.f
@@ -49,6 +49,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRRFP( NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/derrrq.f b/TESTING/LIN/derrrq.f
index ae51d4c723..b4269c7a9a 100644
--- a/TESTING/LIN/derrrq.f
+++ b/TESTING/LIN/derrrq.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRRQ( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/derrsy.f b/TESTING/LIN/derrsy.f
index af15a4b8ed..1da41d7180 100644
--- a/TESTING/LIN/derrsy.f
+++ b/TESTING/LIN/derrsy.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRSY( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -133,7 +134,7 @@ SUBROUTINE DERRSY( PATH, NUNIT )
       IF( LSAMEN( 2, C2, 'SY' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a symmetric indefinite matrix with patrial
+*        of a symmetric indefinite matrix with partial
 *        (Bunch-Kaufman) pivoting.
 *
 *        DSYTRF
@@ -581,7 +582,7 @@ SUBROUTINE DERRSY( PATH, NUNIT )
       ELSE IF( LSAMEN( 2, C2, 'SP' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a symmetric indefinite packed matrix with patrial
+*        of a symmetric indefinite packed matrix with partial
 *        (Bunch-Kaufman) pivoting.
 *
 *        DSPTRF
diff --git a/TESTING/LIN/derrsyx.f b/TESTING/LIN/derrsyx.f
index c2d14caab8..6bd72c34b9 100644
--- a/TESTING/LIN/derrsyx.f
+++ b/TESTING/LIN/derrsyx.f
@@ -55,6 +55,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRSY( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -138,7 +139,7 @@ SUBROUTINE DERRSY( PATH, NUNIT )
       IF( LSAMEN( 2, C2, 'SY' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a symmetric indefinite matrix with patrial
+*        of a symmetric indefinite matrix with partial
 *        (Bunch-Kaufman) pivoting.
 *
 *        DSYTRF
@@ -528,7 +529,7 @@ SUBROUTINE DERRSY( PATH, NUNIT )
       ELSE IF( LSAMEN( 2, C2, 'SP' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a symmetric indefinite packed matrix with patrial
+*        of a symmetric indefinite packed matrix with partial
 *        (Bunch-Kaufman) pivoting.
 *
 *        DSPTRF
diff --git a/TESTING/LIN/derrtr.f b/TESTING/LIN/derrtr.f
index a667f0d2b8..c88c1f64d3 100644
--- a/TESTING/LIN/derrtr.f
+++ b/TESTING/LIN/derrtr.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRTR( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -71,7 +72,7 @@ SUBROUTINE DERRTR( PATH, NUNIT )
 *     .. Local Scalars ..
       CHARACTER*2        C2
       INTEGER            INFO
-      DOUBLE PRECISION   RCOND, SCALE
+      DOUBLE PRECISION   RCOND, SCALE, SCALES(0)
 *     ..
 *     .. Local Arrays ..
       INTEGER            IW( NMAX )
@@ -83,9 +84,10 @@ SUBROUTINE DERRTR( PATH, NUNIT )
       EXTERNAL           LSAMEN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAESM, CHKXER, DLATBS, DLATPS, DLATRS, DTBCON,
-     $                   DTBRFS, DTBTRS, DTPCON, DTPRFS, DTPTRI, DTPTRS,
-     $                   DTRCON, DTRRFS, DTRTI2, DTRTRI, DTRTRS
+      EXTERNAL           ALAESM, CHKXER, DLATBS, DLATPS, DLATRS,
+     $                   DLATRS3, DTBCON, DTBRFS, DTBTRS, DTPCON,
+     $                   DTPRFS, DTPTRI, DTPTRS, DTRCON, DTRRFS,
+     $                   DTRTI2, DTRTRI, DTRTRS
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -244,6 +246,46 @@ SUBROUTINE DERRTR( PATH, NUNIT )
          INFOT = 7
          CALL DLATRS( 'U', 'N', 'N', 'N', 2, A, 1, X, SCALE, W, INFO )
          CALL CHKXER( 'DLATRS', INFOT, NOUT, LERR, OK )
+*
+*        DLATRS3
+*
+         SRNAMT = 'DLATRS3'
+         INFOT = 1
+         CALL DLATRS3( '/', 'N', 'N', 'N', 0, 0, A, 1, X, 1, SCALES,
+     $                 W, W( 2 ), 1, INFO )
+         CALL CHKXER( 'DLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL DLATRS3( 'U', '/', 'N', 'N', 0, 0, A, 1, X, 1, SCALES,
+     $                 W, W( 2 ), 1, INFO )
+         CALL CHKXER( 'DLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL DLATRS3( 'U', 'N', '/', 'N', 0, 0, A, 1, X, 1, SCALES,
+     $                 W, W( 2 ), 1, INFO )
+         CALL CHKXER( 'DLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL DLATRS3( 'U', 'N', 'N', '/', 0, 0, A, 1, X, 1, SCALES,
+     $                 W, W( 2 ), 1, INFO )
+         CALL CHKXER( 'DLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL DLATRS3( 'U', 'N', 'N', 'N', -1, 0, A, 1, X, 1, SCALES,
+     $                 W, W( 2 ), 1, INFO )
+         CALL CHKXER( 'DLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 6
+         CALL DLATRS3( 'U', 'N', 'N', 'N', 0, -1, A, 1, X, 1, SCALES,
+     $                 W, W( 2 ), 1, INFO )
+         CALL CHKXER( 'DLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL DLATRS3( 'U', 'N', 'N', 'N', 2, 0, A, 1, X, 1, SCALES,
+     $                 W, W( 2 ), 1, INFO )
+         CALL CHKXER( 'DLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL DLATRS3( 'U', 'N', 'N', 'N', 2, 0, A, 2, X, 1, SCALES,
+     $                 W, W( 2 ), 1, INFO )
+         CALL CHKXER( 'DLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 14
+         CALL DLATRS3( 'U', 'N', 'N', 'N', 1, 0, A, 1, X, 1, SCALES,
+     $                 W, W( 2 ), 0, INFO )
+         CALL CHKXER( 'DLATRS3', INFOT, NOUT, LERR, OK )
 *
       ELSE IF( LSAMEN( 2, C2, 'TP' ) ) THEN
 *
diff --git a/TESTING/LIN/derrtsqr.f b/TESTING/LIN/derrtsqr.f
index 110f904d79..f0d345149e 100644
--- a/TESTING/LIN/derrtsqr.f
+++ b/TESTING/LIN/derrtsqr.f
@@ -70,7 +70,7 @@ SUBROUTINE DERRTSQR( PATH, NUNIT )
       PARAMETER          ( NMAX = 2 )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I, INFO, J, NB
+      INTEGER            I, INFO, J, MB, NB
 *     ..
 *     .. Local Arrays ..
       DOUBLE PRECISION   A( NMAX, NMAX ), T( NMAX, NMAX ), W( NMAX ),
@@ -130,6 +130,35 @@ SUBROUTINE DERRTSQR( PATH, NUNIT )
       CALL DGEQR( 3, 2, A, 3, TAU, 7, W, 0, INFO )
       CALL CHKXER( 'DGEQR', INFOT, NOUT, LERR, OK )
 *
+*     DLATSQR
+*
+      MB = 1
+      NB = 1
+      SRNAMT = 'DLATSQR'
+      INFOT = 1
+      CALL DLATSQR( -1, 0, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'DLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL DLATSQR( 1, 2, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'DLATSQR', INFOT, NOUT, LERR, OK )
+      CALL DLATSQR( 0, -1, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'DLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL DLATSQR( 2, 1, -1, NB, A, 2, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'DLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL DLATSQR( 2, 1, MB, 2, A, 2, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'DLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 6
+      CALL DLATSQR( 2, 1, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'DLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL DLATSQR( 2, 1, MB, NB, A, 2, TAU, 0, W, 1, INFO )
+      CALL CHKXER( 'DLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL DLATSQR( 2, 1, MB, NB, A, 2, TAU, 2, W, 0, INFO )
+      CALL CHKXER( 'DLATSQR', INFOT, NOUT, LERR, OK )
+*
 *     DGEMQR
 *
       TAU(1)=1
@@ -191,6 +220,37 @@ SUBROUTINE DERRTSQR( PATH, NUNIT )
       CALL DGELQ( 2, 3, A, 3, TAU, 7, W, 0, INFO )
       CALL CHKXER( 'DGELQ', INFOT, NOUT, LERR, OK )
 *
+*     DLASWLQ
+*
+      MB = 1
+      NB = 1
+      SRNAMT = 'DLASWLQ'
+      INFOT = 1
+      CALL DLASWLQ( -1, 0, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'DLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL DLASWLQ( 2, 1, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'DLASWLQ', INFOT, NOUT, LERR, OK )
+      CALL DLASWLQ( 0, -1, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'DLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL DLASWLQ( 1, 2, -1, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'DLASWLQ', INFOT, NOUT, LERR, OK )
+      CALL DLASWLQ( 1, 1, 2, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'DLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL DLASWLQ( 1, 2, MB, -1, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'DLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 6
+      CALL DLASWLQ( 1, 2, MB, NB, A, 0, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'DLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL DLASWLQ( 1, 2, MB, NB, A, 1, TAU, 0, W, 1, INFO )
+      CALL CHKXER( 'DLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL DLASWLQ( 1, 2, MB, NB, A, 1, TAU, 1, W, 0, INFO )
+      CALL CHKXER( 'DLASWLQ', INFOT, NOUT, LERR, OK )
+*
 *     DGEMLQ
 *
       TAU(1)=1
diff --git a/TESTING/LIN/derrtz.f b/TESTING/LIN/derrtz.f
index a43ae219c4..13d9c3a242 100644
--- a/TESTING/LIN/derrtz.f
+++ b/TESTING/LIN/derrtz.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRTZ( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/derrvx.f b/TESTING/LIN/derrvx.f
index 447b00bc4d..2c8afc9d98 100644
--- a/TESTING/LIN/derrvx.f
+++ b/TESTING/LIN/derrvx.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRVX( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -699,21 +700,27 @@ SUBROUTINE DERRVX( PATH, NUNIT )
 *
       ELSE IF( LSAMEN( 2, C2, 'SA' ) ) THEN
 *
-*        DSYSV_AA
-*
-        SRNAMT = 'DSYSV_AA'
-        INFOT = 1
-        CALL DSYSV_AA( '/', 0, 0, A, 1, IP, B, 1, W, 1, INFO )
-        CALL CHKXER( 'DSYSV_AA', INFOT, NOUT, LERR, OK )
-        INFOT = 2
-        CALL DSYSV_AA( 'U', -1, 0, A, 1, IP, B, 1, W, 1, INFO )
-        CALL CHKXER( 'DSYSV_AA', INFOT, NOUT, LERR, OK )
-        INFOT = 3
-        CALL DSYSV_AA( 'U', 0, -1, A, 1, IP, B, 1, W, 1, INFO )
-        CALL CHKXER( 'DSYSV_AA', INFOT, NOUT, LERR, OK )
-        INFOT = 8
-        CALL DSYSV_AA( 'U', 2, 0, A, 2, IP, B, 1, W, 1, INFO )
-        CALL CHKXER( 'DSYSV_AA', INFOT, NOUT, LERR, OK )
+*        DSYSV_AASEN
+*
+         SRNAMT = 'DSYSV_AA'
+         INFOT = 1
+         CALL DSYSV_AA( '/', 0, 0, A, 1, IP, B, 1, W, 1, INFO )
+         CALL CHKXER( 'DSYSV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL DSYSV_AA( 'U', -1, 0, A, 1, IP, B, 1, W, 1, INFO )
+         CALL CHKXER( 'DSYSV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL DSYSV_AA( 'U', 0, -1, A, 1, IP, B, 1, W, 1, INFO )
+         CALL CHKXER( 'DSYSV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL DSYSV_AA( 'U', 2, 0, A, 1, IP, B, 2, W, 1, INFO )
+         CALL CHKXER( 'DSYSV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL DSYSV_AA( 'U', 2, 0, A, 2, IP, B, 1, W, 1, INFO )
+         CALL CHKXER( 'DSYSV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL DSYSV_AA( 'U', 3, 1, A, 3, IP, B, 3, W, 6, INFO )
+         CALL CHKXER( 'DSYSV_AA', INFOT, NOUT, LERR, OK )
 *
       ELSE IF( LSAMEN( 2, C2, 'S2' ) ) THEN
 *
@@ -734,14 +741,18 @@ SUBROUTINE DERRVX( PATH, NUNIT )
          CALL CHKXER( 'DSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 5
          CALL DSYSV_AA_2STAGE( 'U', 2, 1, A, 1, A, 1, IP, IP, B, 1,
+     $                         W, 1, INFO )
+         CALL CHKXER( 'DSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
+         INFOT = 7
+         CALL DSYSV_AA_2STAGE( 'U', 2, 1, A, 2, A, 1, IP, IP, B, 2,
      $                         W, 1, INFO )
          CALL CHKXER( 'DSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 11
          CALL DSYSV_AA_2STAGE( 'U', 2, 1, A, 2, A, 8, IP, IP, B, 1,
      $                         W, 1, INFO )
          CALL CHKXER( 'DSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
-         INFOT = 7
-         CALL DSYSV_AA_2STAGE( 'U', 2, 1, A, 2, A, 1, IP, IP, B, 2,
+         INFOT = 13
+         CALL DSYSV_AA_2STAGE( 'U', 2, 1, A, 2, A, 8, IP, IP, B, 2,
      $                         W, 1, INFO )
          CALL CHKXER( 'DSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
 *
diff --git a/TESTING/LIN/derrvxx.f b/TESTING/LIN/derrvxx.f
index dd2c5700d7..fda3867d21 100644
--- a/TESTING/LIN/derrvxx.f
+++ b/TESTING/LIN/derrvxx.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE DERRVX( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dgbt01.f b/TESTING/LIN/dgbt01.f
index 6a095876ed..12df3b6735 100644
--- a/TESTING/LIN/dgbt01.f
+++ b/TESTING/LIN/dgbt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE DGBT01( M, N, KL, KU, A, LDA, AFAC, LDAFAC, IPIV, WORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dgbt02.f b/TESTING/LIN/dgbt02.f
index 5877562476..442f5713e8 100644
--- a/TESTING/LIN/dgbt02.f
+++ b/TESTING/LIN/dgbt02.f
@@ -146,6 +146,7 @@
 *  =====================================================================
       SUBROUTINE DGBT02( TRANS, M, N, KL, KU, NRHS, A, LDA, X, LDX, B,
      $                   LDB, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dgbt05.f b/TESTING/LIN/dgbt05.f
index 793e73951d..c47882b8f3 100644
--- a/TESTING/LIN/dgbt05.f
+++ b/TESTING/LIN/dgbt05.f
@@ -173,6 +173,7 @@
 *  =====================================================================
       SUBROUTINE DGBT05( TRANS, N, KL, KU, NRHS, AB, LDAB, B, LDB, X,
      $                   LDX, XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dgennd.f b/TESTING/LIN/dgennd.f
index 9b3ed260b6..3767f7c1a7 100644
--- a/TESTING/LIN/dgennd.f
+++ b/TESTING/LIN/dgennd.f
@@ -65,6 +65,7 @@
 *
 *  =====================================================================
       LOGICAL FUNCTION DGENND (M, N, A, LDA)
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dgeqls.f b/TESTING/LIN/dgeqls.f
index e84df53ecc..749acb1eae 100644
--- a/TESTING/LIN/dgeqls.f
+++ b/TESTING/LIN/dgeqls.f
@@ -119,6 +119,7 @@
 *  =====================================================================
       SUBROUTINE DGEQLS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dgerqs.f b/TESTING/LIN/dgerqs.f
index a893249645..e16cdae2e9 100644
--- a/TESTING/LIN/dgerqs.f
+++ b/TESTING/LIN/dgerqs.f
@@ -119,6 +119,7 @@
 *  =====================================================================
       SUBROUTINE DGERQS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dget01.f b/TESTING/LIN/dget01.f
index fad1c2211c..e4304d7d65 100644
--- a/TESTING/LIN/dget01.f
+++ b/TESTING/LIN/dget01.f
@@ -104,6 +104,7 @@
 *  =====================================================================
       SUBROUTINE DGET01( M, N, A, LDA, AFAC, LDAFAC, IPIV, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dget02.f b/TESTING/LIN/dget02.f
index 85899e46d8..1ee42e613c 100644
--- a/TESTING/LIN/dget02.f
+++ b/TESTING/LIN/dget02.f
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE DGET02( TRANS, M, N, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dget03.f b/TESTING/LIN/dget03.f
index 6486ff5d5a..0acf9916a7 100644
--- a/TESTING/LIN/dget03.f
+++ b/TESTING/LIN/dget03.f
@@ -106,6 +106,7 @@
 *  =====================================================================
       SUBROUTINE DGET03( N, A, LDA, AINV, LDAINV, WORK, LDWORK, RWORK,
      $                   RCOND, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dget04.f b/TESTING/LIN/dget04.f
index 255f1dd104..91824c6734 100644
--- a/TESTING/LIN/dget04.f
+++ b/TESTING/LIN/dget04.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE DGET04( N, NRHS, X, LDX, XACT, LDXACT, RCOND, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dget06.f b/TESTING/LIN/dget06.f
index 0e72c74e63..1befb613fe 100644
--- a/TESTING/LIN/dget06.f
+++ b/TESTING/LIN/dget06.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DGET06( RCOND, RCONDC )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dget07.f b/TESTING/LIN/dget07.f
index 99dbe0c009..94278fae77 100644
--- a/TESTING/LIN/dget07.f
+++ b/TESTING/LIN/dget07.f
@@ -162,6 +162,7 @@
 *  =====================================================================
       SUBROUTINE DGET07( TRANS, N, NRHS, A, LDA, B, LDB, X, LDX, XACT,
      $                   LDXACT, FERR, CHKFERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dget08.f b/TESTING/LIN/dget08.f
index 5c82d7ba5d..b2bcb768c4 100644
--- a/TESTING/LIN/dget08.f
+++ b/TESTING/LIN/dget08.f
@@ -130,6 +130,7 @@
 *  =====================================================================
       SUBROUTINE DGET08( TRANS, M, N, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dgtt01.f b/TESTING/LIN/dgtt01.f
index 3b5ff9e4ca..4bf07606b2 100644
--- a/TESTING/LIN/dgtt01.f
+++ b/TESTING/LIN/dgtt01.f
@@ -39,7 +39,7 @@
 *
 *> \param[in] N
 *> \verbatim
-*>          N is INTEGTER
+*>          N is INTEGER
 *>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
@@ -131,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE DGTT01( N, DL, D, DU, DLF, DF, DUF, DU2, IPIV, WORK,
      $                   LDWORK, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dgtt02.f b/TESTING/LIN/dgtt02.f
index 2c4c0cc67f..401bc7b696 100644
--- a/TESTING/LIN/dgtt02.f
+++ b/TESTING/LIN/dgtt02.f
@@ -48,7 +48,7 @@
 *>
 *> \param[in] N
 *> \verbatim
-*>          N is INTEGTER
+*>          N is INTEGER
 *>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE DGTT02( TRANS, N, NRHS, DL, D, DU, X, LDX, B, LDB,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dgtt05.f b/TESTING/LIN/dgtt05.f
index d389ef166c..e634de3c78 100644
--- a/TESTING/LIN/dgtt05.f
+++ b/TESTING/LIN/dgtt05.f
@@ -162,6 +162,7 @@
 *  =====================================================================
       SUBROUTINE DGTT05( TRANS, N, NRHS, DL, D, DU, B, LDB, X, LDX,
      $                   XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dlahilb.f b/TESTING/LIN/dlahilb.f
index 9590be53d2..4a0838f733 100644
--- a/TESTING/LIN/dlahilb.f
+++ b/TESTING/LIN/dlahilb.f
@@ -121,6 +121,7 @@
 *
 *  =====================================================================
       SUBROUTINE DLAHILB( N, NRHS, A, LDA, X, LDX, B, LDB, WORK, INFO)
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dlaord.f b/TESTING/LIN/dlaord.f
index e5f7e3b502..6e906ccb30 100644
--- a/TESTING/LIN/dlaord.f
+++ b/TESTING/LIN/dlaord.f
@@ -70,6 +70,7 @@
 *
 *  =====================================================================
       SUBROUTINE DLAORD( JOB, N, X, INCX )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dlaptm.f b/TESTING/LIN/dlaptm.f
index 24cbf6ab55..603bfafc1c 100644
--- a/TESTING/LIN/dlaptm.f
+++ b/TESTING/LIN/dlaptm.f
@@ -113,6 +113,7 @@
 *
 *  =====================================================================
       SUBROUTINE DLAPTM( N, NRHS, ALPHA, D, E, X, LDX, BETA, B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dlarhs.f b/TESTING/LIN/dlarhs.f
index 48a1d54a68..2624c76196 100644
--- a/TESTING/LIN/dlarhs.f
+++ b/TESTING/LIN/dlarhs.f
@@ -202,6 +202,7 @@
 *  =====================================================================
       SUBROUTINE DLARHS( PATH, XTYPE, UPLO, TRANS, M, N, KL, KU, NRHS,
      $                   A, LDA, X, LDX, B, LDB, ISEED, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dlatb4.f b/TESTING/LIN/dlatb4.f
index 8825d13e75..65745dc4bc 100644
--- a/TESTING/LIN/dlatb4.f
+++ b/TESTING/LIN/dlatb4.f
@@ -117,6 +117,7 @@
 *  =====================================================================
       SUBROUTINE DLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
      $                   CNDNUM, DIST )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -133,7 +134,7 @@ SUBROUTINE DLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
 *
 *     .. Parameters ..
       DOUBLE PRECISION   SHRINK, TENTH
-      PARAMETER          ( SHRINK = 0.25D0, TENTH = 0.1D+0 )
+      PARAMETER          ( SHRINK = 0.25D+0, TENTH = 0.1D+0 )
       DOUBLE PRECISION   ONE
       PARAMETER          ( ONE = 1.0D+0 )
       DOUBLE PRECISION   TWO
@@ -153,9 +154,6 @@ SUBROUTINE DLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           DLABAD
-*     ..
 *     .. Save statement ..
       SAVE               EPS, SMALL, LARGE, BADC1, BADC2, FIRST
 *     ..
@@ -173,11 +171,6 @@ SUBROUTINE DLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
          BADC1 = SQRT( BADC2 )
          SMALL = DLAMCH( 'Safe minimum' )
          LARGE = ONE / SMALL
-*
-*        If it looks like we're on a Cray, take the square root of
-*        SMALL and LARGE to avoid overflow and underflow problems.
-*
-         CALL DLABAD( SMALL, LARGE )
          SMALL = SHRINK*( SMALL / EPS )
          LARGE = ONE / SMALL
       END IF
@@ -232,6 +225,110 @@ SUBROUTINE DLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
          ELSE
             ANORM = ONE
          END IF
+*
+      ELSE IF( LSAMEN( 2, C2, 'QK' ) ) THEN
+*
+*        xQK: truncated QR with pivoting.
+*             Set parameters to generate a general
+*             M x N matrix.
+*
+*        Set TYPE, the type of matrix to be generated.  'N' is nonsymmetric.
+*
+         TYPE = 'N'
+*
+*        Set DIST, the type of distribution for the random
+*        number generator. 'S' is
+*
+         DIST = 'S'
+*
+*        Set the lower and upper bandwidths.
+*
+         IF( IMAT.EQ.2 ) THEN
+*
+*           2. Random, Diagonal, CNDNUM = 2
+*
+            KL = 0
+            KU = 0
+            CNDNUM = TWO
+            ANORM = ONE
+            MODE = 3
+         ELSE IF( IMAT.EQ.3 ) THEN
+*
+*           3. Random, Upper triangular,  CNDNUM = 2
+*
+            KL = 0
+            KU = MAX( N-1, 0 )
+            CNDNUM = TWO
+            ANORM = ONE
+            MODE = 3
+         ELSE IF( IMAT.EQ.4 ) THEN
+*
+*          4. Random, Lower triangular,  CNDNUM = 2
+*
+            KL = MAX( M-1, 0 )
+            KU = 0
+            CNDNUM = TWO
+            ANORM = ONE
+            MODE = 3
+         ELSE
+*
+*           5.-19. Rectangular matrix
+*
+            KL = MAX( M-1, 0 )
+            KU = MAX( N-1, 0 )
+*
+            IF( IMAT.GE.5 .AND. IMAT.LE.14 ) THEN
+*
+*              5.-14. Random, CNDNUM = 2.
+*
+               CNDNUM = TWO
+               ANORM = ONE
+               MODE = 3
+*
+            ELSE IF( IMAT.EQ.15 ) THEN
+*
+*              15. Random, CNDNUM = sqrt(0.1/EPS)
+*
+               CNDNUM = BADC1
+               ANORM = ONE
+               MODE = 3
+*
+            ELSE IF( IMAT.EQ.16 ) THEN
+*
+*              16. Random, CNDNUM = 0.1/EPS
+*
+               CNDNUM = BADC2
+               ANORM = ONE
+               MODE = 3
+*
+            ELSE IF( IMAT.EQ.17 ) THEN
+*
+*              17. Random, CNDNUM = 0.1/EPS,
+*                  one small singular value S(N)=1/CNDNUM
+*
+               CNDNUM = BADC2
+               ANORM = ONE
+               MODE = 2
+*
+            ELSE IF( IMAT.EQ.18 ) THEN
+*
+*              18. Random, scaled near underflow
+*
+               CNDNUM = TWO
+               ANORM = SMALL
+               MODE = 3
+*
+            ELSE IF( IMAT.EQ.19 ) THEN
+*
+*              19. Random, scaled near overflow
+*
+               CNDNUM = TWO
+               ANORM = LARGE
+               MODE = 3
+*
+            END IF
+*
+         END IF
 *
       ELSE IF( LSAMEN( 2, C2, 'GE' ) ) THEN
 *
@@ -518,17 +615,18 @@ SUBROUTINE DLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
 *
 *        Set the norm and condition number.
 *
-         IF( IMAT.EQ.2 .OR. IMAT.EQ.8 ) THEN
+         MAT = ABS( IMAT )
+         IF( MAT.EQ.2 .OR. MAT.EQ.8 ) THEN
             CNDNUM = BADC1
-         ELSE IF( IMAT.EQ.3 .OR. IMAT.EQ.9 ) THEN
+         ELSE IF( MAT.EQ.3 .OR. MAT.EQ.9 ) THEN
             CNDNUM = BADC2
          ELSE
             CNDNUM = TWO
          END IF
 *
-         IF( IMAT.EQ.4 ) THEN
+         IF( MAT.EQ.4 ) THEN
             ANORM = SMALL
-         ELSE IF( IMAT.EQ.5 ) THEN
+         ELSE IF( MAT.EQ.5 ) THEN
             ANORM = LARGE
          ELSE
             ANORM = ONE
diff --git a/TESTING/LIN/dlatb5.f b/TESTING/LIN/dlatb5.f
index 9967bbad1b..3e319bb172 100644
--- a/TESTING/LIN/dlatb5.f
+++ b/TESTING/LIN/dlatb5.f
@@ -111,6 +111,7 @@
 *  =====================================================================
       SUBROUTINE DLATB5( PATH, IMAT, N, TYPE, KL, KU, ANORM, MODE,
      $                   CNDNUM, DIST )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -145,9 +146,6 @@ SUBROUTINE DLATB5( PATH, IMAT, N, TYPE, KL, KU, ANORM, MODE,
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           DLABAD
-*     ..
 *     .. Save statement ..
       SAVE               EPS, SMALL, LARGE, BADC1, BADC2, FIRST
 *     ..
@@ -165,11 +163,6 @@ SUBROUTINE DLATB5( PATH, IMAT, N, TYPE, KL, KU, ANORM, MODE,
          BADC1 = SQRT( BADC2 )
          SMALL = DLAMCH( 'Safe minimum' )
          LARGE = ONE / SMALL
-*
-*        If it looks like we're on a Cray, take the square root of
-*        SMALL and LARGE to avoid overflow and underflow problems.
-*
-         CALL DLABAD( SMALL, LARGE )
          SMALL = SHRINK*( SMALL / EPS )
          LARGE = ONE / SMALL
       END IF
diff --git a/TESTING/LIN/dlattb.f b/TESTING/LIN/dlattb.f
index e3f8c9c345..636e966539 100644
--- a/TESTING/LIN/dlattb.f
+++ b/TESTING/LIN/dlattb.f
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE DLATTB( IMAT, UPLO, TRANS, DIAG, ISEED, N, KD, AB,
      $                   LDAB, B, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -168,8 +169,7 @@ SUBROUTINE DLATTB( IMAT, UPLO, TRANS, DIAG, ISEED, N, KD, AB,
       EXTERNAL           LSAME, IDAMAX, DLAMCH, DLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLABAD, DLARNV, DLATB4, DLATMS, DSCAL,
-     $                   DSWAP
+      EXTERNAL           DCOPY, DLARNV, DLATB4, DLATMS, DSCAL, DSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, MAX, MIN, SIGN, SQRT
@@ -182,7 +182,6 @@ SUBROUTINE DLATTB( IMAT, UPLO, TRANS, DIAG, ISEED, N, KD, AB,
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       SMLNUM = UNFL
       BIGNUM = ( ONE-ULP ) / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       IF( ( IMAT.GE.6 .AND. IMAT.LE.9 ) .OR. IMAT.EQ.17 ) THEN
          DIAG = 'U'
       ELSE
@@ -195,7 +194,7 @@ SUBROUTINE DLATTB( IMAT, UPLO, TRANS, DIAG, ISEED, N, KD, AB,
       IF( N.LE.0 )
      $   RETURN
 *
-*     Call DLATB4 to set parameters for SLATMS.
+*     Call DLATB4 to set parameters for DLATMS.
 *
       UPPER = LSAME( UPLO, 'U' )
       IF( UPPER ) THEN
diff --git a/TESTING/LIN/dlattp.f b/TESTING/LIN/dlattp.f
index fef888859a..a444a27c88 100644
--- a/TESTING/LIN/dlattp.f
+++ b/TESTING/LIN/dlattp.f
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE DLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, B, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -160,8 +161,7 @@ SUBROUTINE DLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, B, WORK,
       EXTERNAL           LSAME, IDAMAX, DLAMCH, DLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLARNV, DLATB4, DLATMS, DROT, DROTG,
-     $                   DSCAL
+      EXTERNAL           DLARNV, DLATB4, DLATMS, DROT, DROTG, DSCAL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, MAX, SIGN, SQRT
@@ -174,7 +174,6 @@ SUBROUTINE DLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, B, WORK,
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       SMLNUM = UNFL
       BIGNUM = ( ONE-ULP ) / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       IF( ( IMAT.GE.7 .AND. IMAT.LE.10 ) .OR. IMAT.EQ.18 ) THEN
          DIAG = 'U'
       ELSE
@@ -187,7 +186,7 @@ SUBROUTINE DLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, B, WORK,
       IF( N.LE.0 )
      $   RETURN
 *
-*     Call DLATB4 to set parameters for SLATMS.
+*     Call DLATB4 to set parameters for DLATMS.
 *
       UPPER = LSAME( UPLO, 'U' )
       IF( UPPER ) THEN
diff --git a/TESTING/LIN/dlattr.f b/TESTING/LIN/dlattr.f
index 03f9bfae4c..c4fa7aa882 100644
--- a/TESTING/LIN/dlattr.f
+++ b/TESTING/LIN/dlattr.f
@@ -130,6 +130,7 @@
 *  =====================================================================
       SUBROUTINE DLATTR( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, LDA, B,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -166,7 +167,7 @@ SUBROUTINE DLATTR( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, LDA, B,
       EXTERNAL           LSAME, IDAMAX, DLAMCH, DLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLABAD, DLARNV, DLATB4, DLATMS, DROT,
+      EXTERNAL           DCOPY, DLARNV, DLATB4, DLATMS, DROT,
      $                   DROTG, DSCAL, DSWAP
 *     ..
 *     .. Intrinsic Functions ..
@@ -180,7 +181,6 @@ SUBROUTINE DLATTR( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, LDA, B,
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       SMLNUM = UNFL
       BIGNUM = ( ONE-ULP ) / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       IF( ( IMAT.GE.7 .AND. IMAT.LE.10 ) .OR. IMAT.EQ.18 ) THEN
          DIAG = 'U'
       ELSE
@@ -193,7 +193,7 @@ SUBROUTINE DLATTR( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, LDA, B,
       IF( N.LE.0 )
      $   RETURN
 *
-*     Call DLATB4 to set parameters for SLATMS.
+*     Call DLATB4 to set parameters for DLATMS.
 *
       UPPER = LSAME( UPLO, 'U' )
       IF( UPPER ) THEN
diff --git a/TESTING/LIN/dlavsp.f b/TESTING/LIN/dlavsp.f
index 3a5a85e9e0..a58719a68a 100644
--- a/TESTING/LIN/dlavsp.f
+++ b/TESTING/LIN/dlavsp.f
@@ -127,6 +127,7 @@
 *  =====================================================================
       SUBROUTINE DLAVSP( UPLO, TRANS, DIAG, N, NRHS, A, IPIV, B, LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dlavsy.f b/TESTING/LIN/dlavsy.f
index 03e7058719..9dc877331e 100644
--- a/TESTING/LIN/dlavsy.f
+++ b/TESTING/LIN/dlavsy.f
@@ -152,6 +152,7 @@
 *  =====================================================================
       SUBROUTINE DLAVSY( UPLO, TRANS, DIAG, N, NRHS, A, LDA, IPIV, B,
      $                   LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dlavsy_rook.f b/TESTING/LIN/dlavsy_rook.f
index f1994aee92..80a2fd301e 100644
--- a/TESTING/LIN/dlavsy_rook.f
+++ b/TESTING/LIN/dlavsy_rook.f
@@ -154,6 +154,7 @@
 *  =====================================================================
       SUBROUTINE DLAVSY_ROOK( UPLO, TRANS, DIAG, N, NRHS, A, LDA, IPIV,
      $                        B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dlqt01.f b/TESTING/LIN/dlqt01.f
index 1ef7365c47..4687cb340b 100644
--- a/TESTING/LIN/dlqt01.f
+++ b/TESTING/LIN/dlqt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE DLQT01( M, N, A, AF, Q, L, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dlqt02.f b/TESTING/LIN/dlqt02.f
index 158cd0b798..ac79a15572 100644
--- a/TESTING/LIN/dlqt02.f
+++ b/TESTING/LIN/dlqt02.f
@@ -27,7 +27,7 @@
 *> \verbatim
 *>
 *> DLQT02 tests DORGLQ, which generates an m-by-n matrix Q with
-*> orthonornmal rows that is defined as the product of k elementary
+*> orthonormal rows that is defined as the product of k elementary
 *> reflectors.
 *>
 *> Given the LQ factorization of an m-by-n matrix A, DLQT02 generates
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE DLQT02( M, N, K, A, AF, Q, L, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dlqt03.f b/TESTING/LIN/dlqt03.f
index 55ce022ce2..c1fbb7a598 100644
--- a/TESTING/LIN/dlqt03.f
+++ b/TESTING/LIN/dlqt03.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE DLQT03( M, N, K, AF, C, CC, Q, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dpbt01.f b/TESTING/LIN/dpbt01.f
index 3d810dac17..928576fbef 100644
--- a/TESTING/LIN/dpbt01.f
+++ b/TESTING/LIN/dpbt01.f
@@ -116,6 +116,7 @@
 *  =====================================================================
       SUBROUTINE DPBT01( UPLO, N, KD, A, LDA, AFAC, LDAFAC, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dpbt02.f b/TESTING/LIN/dpbt02.f
index 6abda62e06..9e86a119c6 100644
--- a/TESTING/LIN/dpbt02.f
+++ b/TESTING/LIN/dpbt02.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE DPBT02( UPLO, N, KD, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dpbt05.f b/TESTING/LIN/dpbt05.f
index 47e656be79..169f4059be 100644
--- a/TESTING/LIN/dpbt05.f
+++ b/TESTING/LIN/dpbt05.f
@@ -168,6 +168,7 @@
 *  =====================================================================
       SUBROUTINE DPBT05( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, X, LDX,
      $                   XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dpot01.f b/TESTING/LIN/dpot01.f
index b48d066101..c6826d4514 100644
--- a/TESTING/LIN/dpot01.f
+++ b/TESTING/LIN/dpot01.f
@@ -101,6 +101,7 @@
 *
 *  =====================================================================
       SUBROUTINE DPOT01( UPLO, N, A, LDA, AFAC, LDAFAC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dpot02.f b/TESTING/LIN/dpot02.f
index 6d87b89f55..b198526eaa 100644
--- a/TESTING/LIN/dpot02.f
+++ b/TESTING/LIN/dpot02.f
@@ -124,6 +124,7 @@
 *  =====================================================================
       SUBROUTINE DPOT02( UPLO, N, NRHS, A, LDA, X, LDX, B, LDB, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dpot03.f b/TESTING/LIN/dpot03.f
index 2e506b623b..16ebd7bb0d 100644
--- a/TESTING/LIN/dpot03.f
+++ b/TESTING/LIN/dpot03.f
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE DPOT03( UPLO, N, A, LDA, AINV, LDAINV, WORK, LDWORK,
      $                   RWORK, RCOND, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dpot05.f b/TESTING/LIN/dpot05.f
index 25a195bdda..9280deef96 100644
--- a/TESTING/LIN/dpot05.f
+++ b/TESTING/LIN/dpot05.f
@@ -161,6 +161,7 @@
 *  =====================================================================
       SUBROUTINE DPOT05( UPLO, N, NRHS, A, LDA, B, LDB, X, LDX, XACT,
      $                   LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dpot06.f b/TESTING/LIN/dpot06.f
index 397ed19c20..3b3f0d30e2 100644
--- a/TESTING/LIN/dpot06.f
+++ b/TESTING/LIN/dpot06.f
@@ -124,6 +124,7 @@
 *  =====================================================================
       SUBROUTINE DPOT06( UPLO, N, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dppt01.f b/TESTING/LIN/dppt01.f
index a357d07948..8a8d6c7109 100644
--- a/TESTING/LIN/dppt01.f
+++ b/TESTING/LIN/dppt01.f
@@ -90,6 +90,7 @@
 *
 *  =====================================================================
       SUBROUTINE DPPT01( UPLO, N, A, AFAC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dppt02.f b/TESTING/LIN/dppt02.f
index f854f9b189..8bf3112ef4 100644
--- a/TESTING/LIN/dppt02.f
+++ b/TESTING/LIN/dppt02.f
@@ -119,6 +119,7 @@
 *  =====================================================================
       SUBROUTINE DPPT02( UPLO, N, NRHS, A, X, LDX, B, LDB, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dppt03.f b/TESTING/LIN/dppt03.f
index 9e24cf6b3c..731d07493b 100644
--- a/TESTING/LIN/dppt03.f
+++ b/TESTING/LIN/dppt03.f
@@ -107,6 +107,7 @@
 *  =====================================================================
       SUBROUTINE DPPT03( UPLO, N, A, AINV, WORK, LDWORK, RWORK, RCOND,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dppt05.f b/TESTING/LIN/dppt05.f
index fefe2e9235..e8dbe93a77 100644
--- a/TESTING/LIN/dppt05.f
+++ b/TESTING/LIN/dppt05.f
@@ -153,6 +153,7 @@
 *  =====================================================================
       SUBROUTINE DPPT05( UPLO, N, NRHS, AP, B, LDB, X, LDX, XACT,
      $                   LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dpst01.f b/TESTING/LIN/dpst01.f
index ffe75d8a9e..c3afc99dd4 100644
--- a/TESTING/LIN/dpst01.f
+++ b/TESTING/LIN/dpst01.f
@@ -131,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE DPST01( UPLO, N, A, LDA, AFAC, LDAFAC, PERM, LDPERM,
      $                   PIV, RWORK, RESID, RANK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dptt01.f b/TESTING/LIN/dptt01.f
index 2c6c440ffa..6e46a2993c 100644
--- a/TESTING/LIN/dptt01.f
+++ b/TESTING/LIN/dptt01.f
@@ -35,7 +35,7 @@
 *
 *> \param[in] N
 *> \verbatim
-*>          N is INTEGTER
+*>          N is INTEGER
 *>          The order of the matrix A.
 *> \endverbatim
 *>
@@ -88,6 +88,7 @@
 *
 *  =====================================================================
       SUBROUTINE DPTT01( N, D, E, DF, EF, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dptt02.f b/TESTING/LIN/dptt02.f
index a4802c6969..c52361a3fd 100644
--- a/TESTING/LIN/dptt02.f
+++ b/TESTING/LIN/dptt02.f
@@ -35,7 +35,7 @@
 *
 *> \param[in] N
 *> \verbatim
-*>          N is INTEGTER
+*>          N is INTEGER
 *>          The order of the matrix A.
 *> \endverbatim
 *>
@@ -101,6 +101,7 @@
 *
 *  =====================================================================
       SUBROUTINE DPTT02( N, NRHS, D, E, X, LDX, B, LDB, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dptt05.f b/TESTING/LIN/dptt05.f
index 1cd2c4b662..38c2cbf072 100644
--- a/TESTING/LIN/dptt05.f
+++ b/TESTING/LIN/dptt05.f
@@ -147,6 +147,7 @@
 *  =====================================================================
       SUBROUTINE DPTT05( N, NRHS, D, E, B, LDB, X, LDX, XACT, LDXACT,
      $                   FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dqlt01.f b/TESTING/LIN/dqlt01.f
index 5a27350cbc..9d3322860b 100644
--- a/TESTING/LIN/dqlt01.f
+++ b/TESTING/LIN/dqlt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE DQLT01( M, N, A, AF, Q, L, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dqlt02.f b/TESTING/LIN/dqlt02.f
index 950cfe67bd..b580d2d499 100644
--- a/TESTING/LIN/dqlt02.f
+++ b/TESTING/LIN/dqlt02.f
@@ -27,7 +27,7 @@
 *> \verbatim
 *>
 *> DQLT02 tests DORGQL, which generates an m-by-n matrix Q with
-*> orthonornmal columns that is defined as the product of k elementary
+*> orthonormal columns that is defined as the product of k elementary
 *> reflectors.
 *>
 *> Given the QL factorization of an m-by-n matrix A, DQLT02 generates
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE DQLT02( M, N, K, A, AF, Q, L, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dqlt03.f b/TESTING/LIN/dqlt03.f
index bed6a00c8b..257572eb01 100644
--- a/TESTING/LIN/dqlt03.f
+++ b/TESTING/LIN/dqlt03.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE DQLT03( M, N, K, AF, C, CC, Q, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dqpt01.f b/TESTING/LIN/dqpt01.f
index 8efbdc774d..75b1a872bc 100644
--- a/TESTING/LIN/dqpt01.f
+++ b/TESTING/LIN/dqpt01.f
@@ -28,12 +28,13 @@
 *>
 *> DQPT01 tests the QR-factorization with pivoting of a matrix A.  The
 *> array AF contains the (possibly partial) QR-factorization of A, where
-*> the upper triangle of AF(1:k,1:k) is a partial triangular factor,
-*> the entries below the diagonal in the first k columns are the
+*> the upper triangle of AF(1:K,1:K) is a partial triangular factor,
+*> the entries below the diagonal in the first K columns are the
 *> Householder vectors, and the rest of AF contains a partially updated
 *> matrix.
 *>
-*> This function returns ||A*P - Q*R||/(||norm(A)||*eps*M)
+*> This function returns ||A*P - Q*R|| / ( ||norm(A)||*eps*max(M,N) ),
+*> where || . || is matrix one norm.
 *> \endverbatim
 *
 *  Arguments:
@@ -117,6 +118,7 @@
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DQPT01( M, N, K, A, AF, LDA, TAU, JPVT,
      $                 WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,28 +174,41 @@ DOUBLE PRECISION FUNCTION DQPT01( M, N, K, A, AF, LDA, TAU, JPVT,
 *
       NORMA = DLANGE( 'One-norm', M, N, A, LDA, RWORK )
 *
-      DO 30 J = 1, K
-         DO 10 I = 1, MIN( J, M )
+      DO J = 1, K
+*
+*        Copy the upper triangular part of the factor R stored
+*        in AF(1:K,1:K) into the work array WORK.
+*
+         DO I = 1, MIN( J, M )
             WORK( ( J-1 )*M+I ) = AF( I, J )
-   10    CONTINUE
-         DO 20 I = J + 1, M
+         END DO
+*
+*        Zero out the elements below the diagonal in the work array.
+*
+         DO I = J + 1, M
             WORK( ( J-1 )*M+I ) = ZERO
-   20    CONTINUE
-   30 CONTINUE
-      DO 40 J = K + 1, N
+         END DO
+      END DO
+*
+*     Copy columns (K+1,N) from AF into the work array WORK.
+*     AF(1:K,K+1:N) contains the rectangular block of the upper trapezoidal
+*     factor R, AF(K+1:M,K+1:N) contains the partially updated residual
+*     matrix of R.
+*
+      DO J = K + 1, N
          CALL DCOPY( M, AF( 1, J ), 1, WORK( ( J-1 )*M+1 ), 1 )
-   40 CONTINUE
+      END DO
 *
       CALL DORMQR( 'Left', 'No transpose', M, N, K, AF, LDA, TAU, WORK,
      $             M, WORK( M*N+1 ), LWORK-M*N, INFO )
 *
-      DO 50 J = 1, N
+      DO J = 1, N
 *
-*        Compare i-th column of QR and jpvt(i)-th column of A
+*        Compare J-th column of QR and JPVT(J)-th column of A.
 *
          CALL DAXPY( M, -ONE, A( 1, JPVT( J ) ), 1, WORK( ( J-1 )*M+1 ),
      $               1 )
-   50 CONTINUE
+      END DO
 *
       DQPT01 = DLANGE( 'One-norm', M, N, WORK, M, RWORK ) /
      $         ( DBLE( MAX( M, N ) )*DLAMCH( 'Epsilon' ) )
diff --git a/TESTING/LIN/dqrt01.f b/TESTING/LIN/dqrt01.f
index 2ddd551cef..d124afb4b8 100644
--- a/TESTING/LIN/dqrt01.f
+++ b/TESTING/LIN/dqrt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE DQRT01( M, N, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dqrt01p.f b/TESTING/LIN/dqrt01p.f
index 7dc7668ce9..35a989c42c 100644
--- a/TESTING/LIN/dqrt01p.f
+++ b/TESTING/LIN/dqrt01p.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE DQRT01P( M, N, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dqrt02.f b/TESTING/LIN/dqrt02.f
index d0e4349d1d..a1a314d500 100644
--- a/TESTING/LIN/dqrt02.f
+++ b/TESTING/LIN/dqrt02.f
@@ -27,7 +27,7 @@
 *> \verbatim
 *>
 *> DQRT02 tests DORGQR, which generates an m-by-n matrix Q with
-*> orthonornmal columns that is defined as the product of k elementary
+*> orthonormal columns that is defined as the product of k elementary
 *> reflectors.
 *>
 *> Given the QR factorization of an m-by-n matrix A, DQRT02 generates
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE DQRT02( M, N, K, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dqrt03.f b/TESTING/LIN/dqrt03.f
index d156faca03..146c96a922 100644
--- a/TESTING/LIN/dqrt03.f
+++ b/TESTING/LIN/dqrt03.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE DQRT03( M, N, K, AF, C, CC, Q, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dqrt11.f b/TESTING/LIN/dqrt11.f
index 33c7fab378..18b93351c7 100644
--- a/TESTING/LIN/dqrt11.f
+++ b/TESTING/LIN/dqrt11.f
@@ -95,6 +95,7 @@
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DQRT11( M, K, A, LDA, TAU, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -157,9 +158,9 @@ DOUBLE PRECISION FUNCTION DQRT11( M, K, A, LDA, TAU, WORK, LWORK )
       CALL DORM2R( 'Left', 'Transpose', M, M, K, A, LDA, TAU, WORK, M,
      $             WORK( M*M+1 ), INFO )
 *
-      DO 10 J = 1, M
+      DO J = 1, M
          WORK( ( J-1 )*M+J ) = WORK( ( J-1 )*M+J ) - ONE
-   10 CONTINUE
+      END DO
 *
       DQRT11 = DLANGE( 'One-norm', M, M, WORK, M, RDUMMY ) /
      $         ( DBLE( M )*DLAMCH( 'Epsilon' ) )
diff --git a/TESTING/LIN/dqrt12.f b/TESTING/LIN/dqrt12.f
index 278e01bf0a..d1b1f772b2 100644
--- a/TESTING/LIN/dqrt12.f
+++ b/TESTING/LIN/dqrt12.f
@@ -26,7 +26,7 @@
 *> DQRT12 computes the singular values `svlues' of the upper trapezoid
 *> of A(1:M,1:N) and returns the ratio
 *>
-*>      || s - svlues||/(||svlues||*eps*max(M,N))
+*>      || svlues - s ||/(||s||*eps*max(M,N))
 *> \endverbatim
 *
 *  Arguments:
@@ -86,6 +86,7 @@
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DQRT12( M, N, A, LDA, S, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -113,8 +114,7 @@ DOUBLE PRECISION FUNCTION DQRT12( M, N, A, LDA, S, WORK, LWORK )
       EXTERNAL           DASUM, DLAMCH, DLANGE, DNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DBDSQR, DGEBD2, DLABAD, DLASCL, DLASET,
-     $                   XERBLA
+      EXTERNAL           DAXPY, DBDSQR, DGEBD2, DLASCL, DLASET, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, MAX, MIN
@@ -145,17 +145,16 @@ DOUBLE PRECISION FUNCTION DQRT12( M, N, A, LDA, S, WORK, LWORK )
 *     Copy upper triangle of A into work
 *
       CALL DLASET( 'Full', M, N, ZERO, ZERO, WORK, M )
-      DO 20 J = 1, N
-         DO 10 I = 1, MIN( J, M )
+      DO J = 1, N
+         DO I = 1, MIN( J, M )
             WORK( ( J-1 )*M+I ) = A( I, J )
-   10    CONTINUE
-   20 CONTINUE
+         END DO
+      END DO
 *
 *     Get machine parameters
 *
       SMLNUM = DLAMCH( 'S' ) / DLAMCH( 'P' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Scale work if max entry outside range [SMLNUM,BIGNUM]
 *
@@ -199,16 +198,18 @@ DOUBLE PRECISION FUNCTION DQRT12( M, N, A, LDA, S, WORK, LWORK )
 *
       ELSE
 *
-         DO 30 I = 1, MN
+         DO I = 1, MN
             WORK( M*N+I ) = ZERO
-   30    CONTINUE
+         END DO
       END IF
 *
 *     Compare s and singular values of work
 *
       CALL DAXPY( MN, -ONE, S, 1, WORK( M*N+1 ), 1 )
+*
       DQRT12 = DASUM( MN, WORK( M*N+1 ), 1 ) /
-     $         ( DLAMCH( 'Epsilon' )*DBLE( MAX( M, N ) ) )
+     $  ( DLAMCH('Epsilon') * DBLE( MAX( M, N ) ) )
+*
       IF( NRMSVL.NE.ZERO )
      $   DQRT12 = DQRT12 / NRMSVL
 *
diff --git a/TESTING/LIN/dqrt13.f b/TESTING/LIN/dqrt13.f
index 203f62069b..eaeefb3072 100644
--- a/TESTING/LIN/dqrt13.f
+++ b/TESTING/LIN/dqrt13.f
@@ -88,6 +88,7 @@
 *
 *  =====================================================================
       SUBROUTINE DQRT13( SCALE, M, N, A, LDA, NORMA, ISEED )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -117,7 +118,7 @@ SUBROUTINE DQRT13( SCALE, M, N, A, LDA, NORMA, ISEED )
       EXTERNAL           DASUM, DLAMCH, DLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLARNV, DLASCL
+      EXTERNAL           DLARNV, DLASCL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          SIGN
@@ -146,7 +147,6 @@ SUBROUTINE DQRT13( SCALE, M, N, A, LDA, NORMA, ISEED )
          NORMA = DLANGE( 'Max', M, N, A, LDA, DUMMY )
          SMLNUM = DLAMCH( 'Safe minimum' )
          BIGNUM = ONE / SMLNUM
-         CALL DLABAD( SMLNUM, BIGNUM )
          SMLNUM = SMLNUM / DLAMCH( 'Epsilon' )
          BIGNUM = ONE / SMLNUM
 *
diff --git a/TESTING/LIN/dqrt14.f b/TESTING/LIN/dqrt14.f
index fdfc96b98d..145a186330 100644
--- a/TESTING/LIN/dqrt14.f
+++ b/TESTING/LIN/dqrt14.f
@@ -113,6 +113,7 @@
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DQRT14( TRANS, M, N, NRHS, A, LDA, X,
      $                 LDX, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dqrt15.f b/TESTING/LIN/dqrt15.f
index 1c5f9e47bb..9e7308048f 100644
--- a/TESTING/LIN/dqrt15.f
+++ b/TESTING/LIN/dqrt15.f
@@ -145,6 +145,7 @@
 *  =====================================================================
       SUBROUTINE DQRT15( SCALE, RKSEL, M, N, NRHS, A, LDA, B, LDB, S,
      $                   RANK, NORMA, NORMB, ISEED, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dqrt16.f b/TESTING/LIN/dqrt16.f
index cb4ba183a6..a714358d7b 100644
--- a/TESTING/LIN/dqrt16.f
+++ b/TESTING/LIN/dqrt16.f
@@ -130,6 +130,7 @@
 *  =====================================================================
       SUBROUTINE DQRT16( TRANS, M, N, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dqrt17.f b/TESTING/LIN/dqrt17.f
index ccbb3cff42..e9bf2eb484 100644
--- a/TESTING/LIN/dqrt17.f
+++ b/TESTING/LIN/dqrt17.f
@@ -150,6 +150,7 @@
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DQRT17( TRANS, IRESID, M, N, NRHS, A,
      $                 LDA, X, LDX, B, LDB, C, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/drqt01.f b/TESTING/LIN/drqt01.f
index 936583ccbe..bda8a1b04c 100644
--- a/TESTING/LIN/drqt01.f
+++ b/TESTING/LIN/drqt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE DRQT01( M, N, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/drqt02.f b/TESTING/LIN/drqt02.f
index 7fbb6a6d4d..4daea2476b 100644
--- a/TESTING/LIN/drqt02.f
+++ b/TESTING/LIN/drqt02.f
@@ -27,7 +27,7 @@
 *> \verbatim
 *>
 *> DRQT02 tests DORGRQ, which generates an m-by-n matrix Q with
-*> orthonornmal rows that is defined as the product of k elementary
+*> orthonormal rows that is defined as the product of k elementary
 *> reflectors.
 *>
 *> Given the RQ factorization of an m-by-n matrix A, DRQT02 generates
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE DRQT02( M, N, K, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/drqt03.f b/TESTING/LIN/drqt03.f
index 1ddd767064..aaea64e2e8 100644
--- a/TESTING/LIN/drqt03.f
+++ b/TESTING/LIN/drqt03.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE DRQT03( M, N, K, AF, C, CC, Q, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/drzt01.f b/TESTING/LIN/drzt01.f
index 8e969aba78..110181d0ef 100644
--- a/TESTING/LIN/drzt01.f
+++ b/TESTING/LIN/drzt01.f
@@ -95,6 +95,7 @@
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DRZT01( M, N, A, AF, LDA, TAU, WORK,
      $                 LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -158,7 +159,7 @@ DOUBLE PRECISION FUNCTION DRZT01( M, N, A, AF, LDA, TAU, WORK,
 *
 *     R = R * P(1) * ... *P(m)
 *
-      CALL DORMRZ( 'Right', 'No tranpose', M, N, M, N-M, AF, LDA, TAU,
+      CALL DORMRZ( 'Right', 'No transpose', M, N, M, N-M, AF, LDA, TAU,
      $             WORK, M, WORK( M*N+1 ), LWORK-M*N, INFO )
 *
 *     R = R - A
diff --git a/TESTING/LIN/drzt02.f b/TESTING/LIN/drzt02.f
index 5b028f7990..6a28a9b4b2 100644
--- a/TESTING/LIN/drzt02.f
+++ b/TESTING/LIN/drzt02.f
@@ -88,6 +88,7 @@
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DRZT02( M, N, AF, LDA, TAU, WORK,
      $                 LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dspt01.f b/TESTING/LIN/dspt01.f
index e71d217ae1..f286478d5f 100644
--- a/TESTING/LIN/dspt01.f
+++ b/TESTING/LIN/dspt01.f
@@ -107,6 +107,7 @@
 *
 *  =====================================================================
       SUBROUTINE DSPT01( UPLO, N, A, AFAC, IPIV, C, LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dsyt01.f b/TESTING/LIN/dsyt01.f
index cb918de00e..181f2ba4f5 100644
--- a/TESTING/LIN/dsyt01.f
+++ b/TESTING/LIN/dsyt01.f
@@ -121,6 +121,7 @@
 *  =====================================================================
       SUBROUTINE DSYT01( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C, LDC,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dsyt01_3.f b/TESTING/LIN/dsyt01_3.f
index 2a7d9d1422..574a5e47cb 100644
--- a/TESTING/LIN/dsyt01_3.f
+++ b/TESTING/LIN/dsyt01_3.f
@@ -137,6 +137,7 @@
 *  =====================================================================
       SUBROUTINE DSYT01_3( UPLO, N, A, LDA, AFAC, LDAFAC, E, IPIV, C,
      $                     LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,7 +184,7 @@ SUBROUTINE DSYT01_3( UPLO, N, A, LDA, AFAC, LDAFAC, E, IPIV, C,
          RETURN
       END IF
 *
-*     a) Revert to multiplyers of L
+*     a) Revert to multipliers of L
 *
       CALL DSYCONVF_ROOK( UPLO, 'R', N, AFAC, LDAFAC, E, IPIV, INFO )
 *
diff --git a/TESTING/LIN/dsyt01_aa.f b/TESTING/LIN/dsyt01_aa.f
index 94770532c7..7af9b3c3af 100644
--- a/TESTING/LIN/dsyt01_aa.f
+++ b/TESTING/LIN/dsyt01_aa.f
@@ -121,6 +121,7 @@
 *  =====================================================================
       SUBROUTINE DSYT01_AA( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
      $                         LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dsyt01_rook.f b/TESTING/LIN/dsyt01_rook.f
index c7b6bc2aa3..c25e72bb5e 100644
--- a/TESTING/LIN/dsyt01_rook.f
+++ b/TESTING/LIN/dsyt01_rook.f
@@ -121,6 +121,7 @@
 *  =====================================================================
       SUBROUTINE DSYT01_ROOK( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
      $                   LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dtbt02.f b/TESTING/LIN/dtbt02.f
index 5f5192a003..1e0e7f5064 100644
--- a/TESTING/LIN/dtbt02.f
+++ b/TESTING/LIN/dtbt02.f
@@ -29,10 +29,10 @@
 *>
 *> DTBT02 computes the residual for the computed solution to a
 *> triangular system of linear equations op(A)*X = B, when A is a
-*> triangular band matrix. The test ratio is the maximum over the
-*> number of right hand sides of
-*>    norm(op(A)*X - B) / ( norm(op(A)) * norm(X) * EPS ),
-*> where op(A) = A, A**T, or A**H and EPS is the machine epsilon.
+*> triangular band matrix. The test ratio is the maximum over
+*>    norm(b - op(A)*x) / ( ||op(A)||_1 * norm(x) * EPS ),
+*> where op(A) = A or A**T, b is the column of B, x is the solution
+*> vector, and EPS is the machine epsilon.
 *> The norm used is the 1-norm.
 *> \endverbatim
 *
@@ -151,6 +151,7 @@
 *  =====================================================================
       SUBROUTINE DTBT02( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, X,
      $                   LDX, B, LDB, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dtbt03.f b/TESTING/LIN/dtbt03.f
index 04307fd3bb..8d7dce49a4 100644
--- a/TESTING/LIN/dtbt03.f
+++ b/TESTING/LIN/dtbt03.f
@@ -172,6 +172,7 @@
       SUBROUTINE DTBT03( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB,
      $                   SCALE, CNORM, TSCAL, X, LDX, B, LDB, WORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -204,7 +205,7 @@ SUBROUTINE DTBT03( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB,
       EXTERNAL           LSAME, IDAMAX, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DLABAD, DSCAL, DTBMV
+      EXTERNAL           DAXPY, DCOPY, DSCAL, DTBMV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, MAX
@@ -220,7 +221,6 @@ SUBROUTINE DTBT03( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB,
       EPS = DLAMCH( 'Epsilon' )
       SMLNUM = DLAMCH( 'Safe minimum' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Compute the norm of the triangular matrix A using the column
 *     norms already computed by DLATBS.
diff --git a/TESTING/LIN/dtbt05.f b/TESTING/LIN/dtbt05.f
index 0b2430d60b..28f53a7939 100644
--- a/TESTING/LIN/dtbt05.f
+++ b/TESTING/LIN/dtbt05.f
@@ -186,6 +186,7 @@
 *  =====================================================================
       SUBROUTINE DTBT05( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
      $                   LDB, X, LDX, XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dtbt06.f b/TESTING/LIN/dtbt06.f
index 2e87bdaa7a..54ca934e1e 100644
--- a/TESTING/LIN/dtbt06.f
+++ b/TESTING/LIN/dtbt06.f
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE DTBT06( RCOND, RCONDC, UPLO, DIAG, N, KD, AB, LDAB,
      $                   WORK, RAT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -152,9 +153,6 @@ SUBROUTINE DTBT06( RCOND, RCONDC, UPLO, DIAG, N, KD, AB, LDAB,
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           DLABAD
-*     ..
 *     .. Executable Statements ..
 *
       EPS = DLAMCH( 'Epsilon' )
@@ -191,7 +189,6 @@ SUBROUTINE DTBT06( RCOND, RCONDC, UPLO, DIAG, N, KD, AB, LDAB,
 *
          SMLNUM = DLAMCH( 'Safe minimum' )
          BIGNUM = ONE / SMLNUM
-         CALL DLABAD( SMLNUM, BIGNUM )
          ANORM = DLANTB( 'M', UPLO, DIAG, N, KD, AB, LDAB, WORK )
 *
          RAT = RMAX*( MIN( BIGNUM / MAX( ONE, ANORM ), ONE / EPS ) )
diff --git a/TESTING/LIN/dtplqt.f b/TESTING/LIN/dtplqt.f
index 7952c05760..b621b710dd 100644
--- a/TESTING/LIN/dtplqt.f
+++ b/TESTING/LIN/dtplqt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download DTPQRT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtplqt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtplqt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -186,6 +184,7 @@
 *  =====================================================================
       SUBROUTINE DTPLQT( M, N, L, MB, A, LDA, B, LDB, T, LDT, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dtpt01.f b/TESTING/LIN/dtpt01.f
index 58309b17bd..e2468b56bc 100644
--- a/TESTING/LIN/dtpt01.f
+++ b/TESTING/LIN/dtpt01.f
@@ -105,6 +105,7 @@
 *
 *  =====================================================================
       SUBROUTINE DTPT01( UPLO, DIAG, N, AP, AINVP, RCOND, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dtpt02.f b/TESTING/LIN/dtpt02.f
index 9506a1d195..2c05acfa6c 100644
--- a/TESTING/LIN/dtpt02.f
+++ b/TESTING/LIN/dtpt02.f
@@ -29,9 +29,10 @@
 *> DTPT02 computes the residual for the computed solution to a
 *> triangular system of linear equations op(A)*X = B, when the
 *> triangular matrix A is stored in packed format. The test ratio is
-*> the maximum over the number of right hand sides of
-*>    norm(op(A)*X - B) / ( norm(op(A)) * norm(X) * EPS ),
-*> where op(A) = A or A**T, and EPS is the machine epsilon.
+*> the maximum over
+*>    norm(b - op(A)*x) / ( ||op(A)||_1 * norm(x) * EPS ),
+*> where op(A) = A or A**T, b is the column of B, x is the solution
+*> vector, and EPS is the machine epsilon.
 *> The norm used is the 1-norm.
 *> \endverbatim
 *
@@ -138,6 +139,7 @@
 *  =====================================================================
       SUBROUTINE DTPT02( UPLO, TRANS, DIAG, N, NRHS, AP, X, LDX, B, LDB,
      $                   WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dtpt03.f b/TESTING/LIN/dtpt03.f
index 069836a0c5..5c51cab6d0 100644
--- a/TESTING/LIN/dtpt03.f
+++ b/TESTING/LIN/dtpt03.f
@@ -158,6 +158,7 @@
 *  =====================================================================
       SUBROUTINE DTPT03( UPLO, TRANS, DIAG, N, NRHS, AP, SCALE, CNORM,
      $                   TSCAL, X, LDX, B, LDB, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,7 +191,7 @@ SUBROUTINE DTPT03( UPLO, TRANS, DIAG, N, NRHS, AP, SCALE, CNORM,
       EXTERNAL           LSAME, IDAMAX, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DLABAD, DSCAL, DTPMV
+      EXTERNAL           DAXPY, DCOPY, DSCAL, DTPMV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, MAX
@@ -206,7 +207,6 @@ SUBROUTINE DTPT03( UPLO, TRANS, DIAG, N, NRHS, AP, SCALE, CNORM,
       EPS = DLAMCH( 'Epsilon' )
       SMLNUM = DLAMCH( 'Safe minimum' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Compute the norm of the triangular matrix A using the column
 *     norms already computed by DLATPS.
diff --git a/TESTING/LIN/dtpt05.f b/TESTING/LIN/dtpt05.f
index 117acae01d..f82675d467 100644
--- a/TESTING/LIN/dtpt05.f
+++ b/TESTING/LIN/dtpt05.f
@@ -171,6 +171,7 @@
 *  =====================================================================
       SUBROUTINE DTPT05( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X, LDX,
      $                   XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dtpt06.f b/TESTING/LIN/dtpt06.f
index f5eb2a5126..8fec47e1fa 100644
--- a/TESTING/LIN/dtpt06.f
+++ b/TESTING/LIN/dtpt06.f
@@ -108,6 +108,7 @@
 *
 *  =====================================================================
       SUBROUTINE DTPT06( RCOND, RCONDC, UPLO, DIAG, N, AP, WORK, RAT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -138,9 +139,6 @@ SUBROUTINE DTPT06( RCOND, RCONDC, UPLO, DIAG, N, AP, WORK, RAT )
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           DLABAD
-*     ..
 *     .. Executable Statements ..
 *
       EPS = DLAMCH( 'Epsilon' )
@@ -177,7 +175,6 @@ SUBROUTINE DTPT06( RCOND, RCONDC, UPLO, DIAG, N, AP, WORK, RAT )
 *
          SMLNUM = DLAMCH( 'Safe minimum' )
          BIGNUM = ONE / SMLNUM
-         CALL DLABAD( SMLNUM, BIGNUM )
          ANORM = DLANTP( 'M', UPLO, DIAG, N, AP, WORK )
 *
          RAT = RMAX*( MIN( BIGNUM / MAX( ONE, ANORM ), ONE / EPS ) )
diff --git a/TESTING/LIN/dtrt01.f b/TESTING/LIN/dtrt01.f
index e5827fe787..81e7c97e34 100644
--- a/TESTING/LIN/dtrt01.f
+++ b/TESTING/LIN/dtrt01.f
@@ -121,6 +121,7 @@
 *  =====================================================================
       SUBROUTINE DTRT01( UPLO, DIAG, N, A, LDA, AINV, LDAINV, RCOND,
      $                   WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dtrt02.f b/TESTING/LIN/dtrt02.f
index a7c95e136d..80438ab700 100644
--- a/TESTING/LIN/dtrt02.f
+++ b/TESTING/LIN/dtrt02.f
@@ -29,10 +29,10 @@
 *>
 *> DTRT02 computes the residual for the computed solution to a
 *> triangular system of linear equations op(A)*X = B, where A is a
-*> triangular matrix. The test ratio is the maximum over the number of
-*> right hand sides of
-*>    norm(op(A)*X - B) / ( norm(op(A)) * norm(X) * EPS ),
-*> where op(A) = A or A**T, and EPS is the machine epsilon.
+*> triangular matrix. The test ratio is the maximum over
+*>    norm(b - op(A)*x) / ( ||op(A)||_1 * norm(x) * EPS ),
+*> where op(A) = A or A**T, b is the column of B, x is the solution
+*> vector, and EPS is the machine epsilon.
 *> The norm used is the 1-norm.
 *> \endverbatim
 *
@@ -147,6 +147,7 @@
 *  =====================================================================
       SUBROUTINE DTRT02( UPLO, TRANS, DIAG, N, NRHS, A, LDA, X, LDX, B,
      $                   LDB, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dtrt03.f b/TESTING/LIN/dtrt03.f
index ef6a33f6a5..b4458f1820 100644
--- a/TESTING/LIN/dtrt03.f
+++ b/TESTING/LIN/dtrt03.f
@@ -166,6 +166,7 @@
 *  =====================================================================
       SUBROUTINE DTRT03( UPLO, TRANS, DIAG, N, NRHS, A, LDA, SCALE,
      $                   CNORM, TSCAL, X, LDX, B, LDB, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -198,7 +199,7 @@ SUBROUTINE DTRT03( UPLO, TRANS, DIAG, N, NRHS, A, LDA, SCALE,
       EXTERNAL           LSAME, IDAMAX, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DLABAD, DSCAL, DTRMV
+      EXTERNAL           DAXPY, DCOPY, DSCAL, DTRMV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, MAX
@@ -214,7 +215,6 @@ SUBROUTINE DTRT03( UPLO, TRANS, DIAG, N, NRHS, A, LDA, SCALE,
       EPS = DLAMCH( 'Epsilon' )
       SMLNUM = DLAMCH( 'Safe minimum' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Compute the norm of the triangular matrix A using the column
 *     norms already computed by DLATRS.
diff --git a/TESTING/LIN/dtrt05.f b/TESTING/LIN/dtrt05.f
index c03aa5bf9c..d3b31eb723 100644
--- a/TESTING/LIN/dtrt05.f
+++ b/TESTING/LIN/dtrt05.f
@@ -178,6 +178,7 @@
 *  =====================================================================
       SUBROUTINE DTRT05( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB, X,
      $                   LDX, XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/dtrt06.f b/TESTING/LIN/dtrt06.f
index 276e5485fc..df88cc66df 100644
--- a/TESTING/LIN/dtrt06.f
+++ b/TESTING/LIN/dtrt06.f
@@ -118,6 +118,7 @@
 *  =====================================================================
       SUBROUTINE DTRT06( RCOND, RCONDC, UPLO, DIAG, N, A, LDA, WORK,
      $                   RAT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -148,9 +149,6 @@ SUBROUTINE DTRT06( RCOND, RCONDC, UPLO, DIAG, N, A, LDA, WORK,
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           DLABAD
-*     ..
 *     .. Executable Statements ..
 *
       EPS = DLAMCH( 'Epsilon' )
@@ -187,7 +185,6 @@ SUBROUTINE DTRT06( RCOND, RCONDC, UPLO, DIAG, N, A, LDA, WORK,
 *
          SMLNUM = DLAMCH( 'Safe minimum' )
          BIGNUM = ONE / SMLNUM
-         CALL DLABAD( SMLNUM, BIGNUM )
          ANORM = DLANTR( 'M', UPLO, DIAG, N, N, A, LDA, WORK )
 *
          RAT = RMAX*( MIN( BIGNUM / MAX( ONE, ANORM ), ONE / EPS ) )
diff --git a/TESTING/LIN/icopy.f b/TESTING/LIN/icopy.f
index 05bbf11fca..cd8e8aede7 100644
--- a/TESTING/LIN/icopy.f
+++ b/TESTING/LIN/icopy.f
@@ -72,6 +72,7 @@
 *
 *  =====================================================================
       SUBROUTINE ICOPY( N, SX, INCX, SY, INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ilaenv.f b/TESTING/LIN/ilaenv.f
index 50c6a4c6c4..fbf5c78c3b 100644
--- a/TESTING/LIN/ilaenv.f
+++ b/TESTING/LIN/ilaenv.f
@@ -147,6 +147,7 @@
 *  =====================================================================
       INTEGER          FUNCTION ILAENV( ISPEC, NAME, OPTS, N1, N2, N3,
      $                 N4 )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -243,6 +244,7 @@ INTEGER          FUNCTION ILAENV( ISPEC, NAME, OPTS, N1, N2, N3,
       END
       INTEGER FUNCTION ILAENV2STAGE( ISPEC, NAME, OPTS, N1, N2,
      $                               N3, N4 )
+      IMPLICIT NONE
 *     .. Scalar Arguments ..
       CHARACTER*( * )    NAME, OPTS
       INTEGER            ISPEC, N1, N2, N3, N4
diff --git a/TESTING/LIN/schkaa.F b/TESTING/LIN/schkaa.F
index a5b826d06e..ad6ea87767 100644
--- a/TESTING/LIN/schkaa.F
+++ b/TESTING/LIN/schkaa.F
@@ -63,6 +63,7 @@
 *> SLQ    8               List types on next line if 0 < NTYPES <  8
 *> SQL    8               List types on next line if 0 < NTYPES <  8
 *> SQP    6               List types on next line if 0 < NTYPES <  6
+*> DQK    19              List types on next line if 0 < NTYPES <  19
 *> STZ    3               List types on next line if 0 < NTYPES <  3
 *> SLS    6               List types on next line if 0 < NTYPES <  6
 *> SEQ
@@ -147,11 +148,11 @@ PROGRAM SCHKAA
      $                   NBVAL( MAXIN ), NBVAL2( MAXIN ),
      $                   NSVAL( MAXIN ), NVAL( MAXIN ), NXVAL( MAXIN ),
      $                   RANKVAL( MAXIN ), PIV( NMAX )
-      REAL               E( NMAX ), S( 2*NMAX )
 *     ..
 *     .. Allocatable Arrays ..
       INTEGER AllocateStatus
-      REAL, DIMENSION(:), ALLOCATABLE :: RWORK
+      REAL, DIMENSION(:), ALLOCATABLE :: RWORK, S
+      REAL, DIMENSION(:), ALLOCATABLE :: E
       REAL, DIMENSION(:,:), ALLOCATABLE :: A, B, WORK
 *     ..
 *     .. External Functions ..
@@ -162,13 +163,13 @@ PROGRAM SCHKAA
 *     .. External Subroutines ..
       EXTERNAL           ALAREQ, SCHKEQ, SCHKGB, SCHKGE, SCHKGT, SCHKLQ,
      $                   SCHKORHR_COL, SCHKPB, SCHKPO, SCHKPS, SCHKPP,
-     $                   SCHKPT, SCHKQ3, SCHKQL, SCHKQR, SCHKRQ, SCHKSP,
-     $                   SCHKSY, SCHKSY_ROOK, SCHKSY_RK, SCHKSY_AA,
-     $                   SCHKTB, SCHKTP, SCHKTR, SCHKTZ, SDRVGB, SDRVGE,
-     $                   SDRVGT, SDRVLS, SDRVPB, SDRVPO, SDRVPP, SDRVPT,
-     $                   SDRVSP, SDRVSY, SDRVSY_ROOK, SDRVSY_RK,
-     $                   SDRVSY_AA, ILAVER, SCHKLQTP, SCHKQRT, SCHKQRTP,
-     $                   SCHKLQT, SCHKTSQR
+     $                   SCHKPT, SCHKQ3, SCHKQP3RK, SCHKQL, SCHKQR,
+     $                   SCHKRQ, SCHKSP, SCHKSY, SCHKSY_ROOK, SCHKSY_RK,
+     $                   SCHKSY_AA, SCHKTB, SCHKTP, SCHKTR, SCHKTZ,
+     $                   SDRVGB, SDRVGE, SDRVGT, SDRVLS, SDRVPB, SDRVPO,
+     $                   SDRVPP, SDRVPT, SDRVSP, SDRVSY, SDRVSY_ROOK,
+     $                   SDRVSY_RK, SDRVSY_AA, ILAVER, SCHKLQTP, SCHKQRT,
+     $                   SCHKQRTP, SCHKLQT, SCHKTSQR
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -188,13 +189,17 @@ PROGRAM SCHKAA
 *     ..
 *     .. Allocate memory dynamically ..
 *
-      ALLOCATE (A( ( KDMAX+1 )*NMAX, 7 ), STAT = AllocateStatus )
+      ALLOCATE ( A( ( KDMAX+1 )*NMAX, 7 ), STAT = AllocateStatus )
       IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
-      ALLOCATE (B( NMAX*MAXRHS, 4 ), STAT = AllocateStatus )
+      ALLOCATE ( B( NMAX*MAXRHS, 4 ), STAT = AllocateStatus )
       IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
-      ALLOCATE (WORK( NMAX, NMAX+MAXRHS+30 ) , STAT = AllocateStatus )
+      ALLOCATE ( WORK( NMAX, 3*NMAX+MAXRHS+30 ), STAT = AllocateStatus )
       IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
-      ALLOCATE (RWORK( 5*NMAX+2*MAXRHS ), STAT = AllocateStatus )
+      ALLOCATE ( E( NMAX ), STAT = AllocateStatus )
+      IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
+      ALLOCATE ( S( 2*NMAX ), STAT = AllocateStatus )
+      IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
+      ALLOCATE ( RWORK( 5*NMAX+2*MAXRHS ), STAT = AllocateStatus )
       IF (AllocateStatus /= 0) STOP "*** Not enough memory ***" 
 *     ..
 *     .. Executable Statements ..
@@ -920,6 +925,23 @@ PROGRAM SCHKAA
          ELSE
             WRITE( NOUT, FMT = 9989 )PATH
          END IF
+*
+      ELSE IF( LSAMEN( 2, C2, 'QK' ) ) THEN
+*
+*        QK: truncated QR factorization with pivoting
+*
+         NTYPES = 19
+         CALL ALAREQ( PATH, NMATS, DOTYPE, NTYPES, NIN, NOUT )
+*
+         IF( TSTCHK ) THEN
+            CALL SCHKQP3RK( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL,
+     $                      NNB, NBVAL, NXVAL, THRESH, A( 1, 1 ),
+     $                      A( 1, 2 ), B( 1, 1 ), B( 1, 2 ),
+     $                      B( 1, 3 ), B( 1, 4 ),
+     $                      WORK, IWORK, NOUT )
+         ELSE
+            WRITE( NOUT, FMT = 9989 )PATH
+         END IF
 *
       ELSE IF( LSAMEN( 2, C2, 'TZ' ) ) THEN
 *
@@ -1048,6 +1070,8 @@ PROGRAM SCHKAA
 *
       DEALLOCATE (A, STAT = AllocateStatus)
       DEALLOCATE (B, STAT = AllocateStatus)
+      DEALLOCATE (E, STAT = AllocateStatus)
+      DEALLOCATE (S, STAT = AllocateStatus)
       DEALLOCATE (WORK, STAT = AllocateStatus)
       DEALLOCATE (RWORK,  STAT = AllocateStatus)
 *
@@ -1059,7 +1083,7 @@ PROGRAM SCHKAA
  9995 FORMAT( ' Invalid input value: ', A4, '=', I6, '; must be <=',
      $      I6 )
  9994 FORMAT( ' Tests of the REAL LAPACK routines ',
-     $      / ' LAPACK VERSION ', I1, '.', I1, '.', I1,
+     $      / ' LAPACK VERSION ', I1, '.', I2, '.', I1,
      $      / / ' The following parameter values will be used:' )
  9993 FORMAT( 4X, A4, ':  ', 10I6, / 11X, 10I6 )
  9992 FORMAT( / ' Routines pass computational tests if test ratio is ',
diff --git a/TESTING/LIN/schkeq.f b/TESTING/LIN/schkeq.f
index 62898cf7a1..f31673dcd7 100644
--- a/TESTING/LIN/schkeq.f
+++ b/TESTING/LIN/schkeq.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE SCHKEQ( THRESH, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schkgb.f b/TESTING/LIN/schkgb.f
index 9ab8c0e018..5711438d04 100644
--- a/TESTING/LIN/schkgb.f
+++ b/TESTING/LIN/schkgb.f
@@ -188,6 +188,7 @@
       SUBROUTINE SCHKGB( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NNS,
      $                   NSVAL, THRESH, TSTERR, A, LA, AFAC, LAFAC, B,
      $                   X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schkge.f b/TESTING/LIN/schkge.f
index 0921f79257..2d8500a4da 100644
--- a/TESTING/LIN/schkge.f
+++ b/TESTING/LIN/schkge.f
@@ -182,6 +182,7 @@
       SUBROUTINE SCHKGE( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NNS,
      $                   NSVAL, THRESH, TSTERR, NMAX, A, AFAC, AINV, B,
      $                   X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schkgt.f b/TESTING/LIN/schkgt.f
index 0a538a6140..54367e017b 100644
--- a/TESTING/LIN/schkgt.f
+++ b/TESTING/LIN/schkgt.f
@@ -143,6 +143,7 @@
 *  =====================================================================
       SUBROUTINE SCHKGT( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   A, AF, B, X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schklq.f b/TESTING/LIN/schklq.f
index cd66e8d102..d8be9862b4 100644
--- a/TESTING/LIN/schklq.f
+++ b/TESTING/LIN/schklq.f
@@ -193,6 +193,7 @@
       SUBROUTINE SCHKLQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   NRHS, THRESH, TSTERR, NMAX, A, AF, AQ, AL, AC,
      $                   B, X, XACT, TAU, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -235,7 +236,7 @@ SUBROUTINE SCHKLQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
       REAL               RESULT( NTESTS )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAERH, ALAHD, ALASUM, SERRLQ, SGELQS, SGET02,
+      EXTERNAL           ALAERH, ALAHD, ALASUM, SERRLQ, SGET02,
      $                   SLACPY, SLARHS, SLATB4, SLATMS, SLQT01, SLQT02,
      $                   SLQT03, XLAENV
 *     ..
@@ -370,7 +371,7 @@ SUBROUTINE SCHKLQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                               WORK, LWORK, RWORK, RESULT( 3 ) )
                         NT = NT + 4
 *
-*                       If M>=N and K=N, call SGELQS to solve a system
+*                       If M<=N and K=M, call SGELS to solve a system
 *                       with NRHS right hand sides and compute the
 *                       residual.
 *
@@ -387,14 +388,20 @@ SUBROUTINE SCHKLQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
 *
                            CALL SLACPY( 'Full', M, NRHS, B, LDA, X,
      $                                  LDA )
-                           SRNAMT = 'SGELQS'
-                           CALL SGELQS( M, N, NRHS, AF, LDA, TAU, X,
-     $                                  LDA, WORK, LWORK, INFO )
 *
-*                          Check error code from SGELQS.
+*                          Reset AF to the original matrix. SGELS
+*                          factors the matrix before solving the system.
+*
+                           CALL SLACPY( 'Full', M, N, A, LDA, AF, LDA )
+*
+                           SRNAMT = 'SGELS'
+                           CALL SGELS( 'No transpose', M, N, NRHS, AF,
+     $                                 LDA, X, LDA, WORK, LWORK, INFO )
+*
+*                          Check error code from SGELS.
 *
                            IF( INFO.NE.0 )
-     $                        CALL ALAERH( PATH, 'SGELQS', INFO, 0, ' ',
+     $                        CALL ALAERH( PATH, 'SGELS', INFO, 0, 'N',
      $                                     M, N, NRHS, -1, NB, IMAT,
      $                                     NFAIL, NERRS, NOUT )
 *
diff --git a/TESTING/LIN/schkpb.f b/TESTING/LIN/schkpb.f
index fdad0d6dfd..98e23d8320 100644
--- a/TESTING/LIN/schkpb.f
+++ b/TESTING/LIN/schkpb.f
@@ -169,6 +169,7 @@
       SUBROUTINE SCHKPB( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                   XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schkpo.f b/TESTING/LIN/schkpo.f
index ccfb9b7b27..d269df4ea5 100644
--- a/TESTING/LIN/schkpo.f
+++ b/TESTING/LIN/schkpo.f
@@ -169,6 +169,7 @@
       SUBROUTINE SCHKPO( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                   XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schkpp.f b/TESTING/LIN/schkpp.f
index 977c785484..607c6a0577 100644
--- a/TESTING/LIN/schkpp.f
+++ b/TESTING/LIN/schkpp.f
@@ -160,6 +160,7 @@
       SUBROUTINE SCHKPP( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, A, AFAC, AINV, B, X, XACT, WORK, RWORK,
      $                   IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schkps.f b/TESTING/LIN/schkps.f
index 7bd70c4525..1801be3dc2 100644
--- a/TESTING/LIN/schkps.f
+++ b/TESTING/LIN/schkps.f
@@ -151,6 +151,7 @@
       SUBROUTINE SCHKPS( DOTYPE, NN, NVAL, NNB, NBVAL, NRANK, RANKVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, PERM, PIV, WORK,
      $                   RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schkpt.f b/TESTING/LIN/schkpt.f
index 569a3f01bc..5a356eaf3a 100644
--- a/TESTING/LIN/schkpt.f
+++ b/TESTING/LIN/schkpt.f
@@ -143,6 +143,7 @@
 *  =====================================================================
       SUBROUTINE SCHKPT( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   A, D, E, B, X, XACT, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schkq3.f b/TESTING/LIN/schkq3.f
index 209683f48e..99b228d5e9 100644
--- a/TESTING/LIN/schkq3.f
+++ b/TESTING/LIN/schkq3.f
@@ -150,6 +150,7 @@
       SUBROUTINE SCHKQ3( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   THRESH, A, COPYA, S, TAU, WORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schkql.f b/TESTING/LIN/schkql.f
index b68c9bcb02..20726e188f 100644
--- a/TESTING/LIN/schkql.f
+++ b/TESTING/LIN/schkql.f
@@ -193,6 +193,7 @@
       SUBROUTINE SCHKQL( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   NRHS, THRESH, TSTERR, NMAX, A, AF, AQ, AL, AC,
      $                   B, X, XACT, TAU, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schkqp3rk.f b/TESTING/LIN/schkqp3rk.f
new file mode 100644
index 0000000000..c5ce7ff609
--- /dev/null
+++ b/TESTING/LIN/schkqp3rk.f
@@ -0,0 +1,796 @@
+*> \brief \b SCHKQP3RK
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Definition:
+*  ===========
+*
+*      SUBROUTINE SCHKQP3RK( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL,
+*     $                      NNB, NBVAL, NXVAL, THRESH, A, COPYA,
+*     $                      B, COPYB, S, TAU,
+*     $                      WORK, IWORK, NOUT )
+*      IMPLICIT NONE
+*
+*  -- LAPACK test routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+*      INTEGER            NM, NN, NNS, NNB, NOUT
+*      REAL               THRESH
+*     ..
+*     .. Array Arguments ..
+*      LOGICAL            DOTYPE( * )
+*      INTEGER            IWORK( * ), MVAL( * ), NBVAL( * ), NSVAL( * ),
+*     $                   NVAL( * ), NXVAL( * )
+*      REAL               A( * ), COPYA( * ), B( * ), COPYB( * ),
+*     $                   S( * ), TAU( * ), WORK( * )
+*     ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> SCHKQP3RK tests SGEQP3RK.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] DOTYPE
+*> \verbatim
+*>          DOTYPE is LOGICAL array, dimension (NTYPES)
+*>          The matrix types to be used for testing.  Matrices of type j
+*>          (for 1 <= j <= NTYPES) are used for testing if DOTYPE(j) =
+*>          .TRUE.; if DOTYPE(j) = .FALSE., then type j is not used.
+*> \endverbatim
+*>
+*> \param[in] NM
+*> \verbatim
+*>          NM is INTEGER
+*>          The number of values of M contained in the vector MVAL.
+*> \endverbatim
+*>
+*> \param[in] MVAL
+*> \verbatim
+*>          MVAL is INTEGER array, dimension (NM)
+*>          The values of the matrix row dimension M.
+*> \endverbatim
+*>
+*> \param[in] NN
+*> \verbatim
+*>          NN is INTEGER
+*>          The number of values of N contained in the vector NVAL.
+*> \endverbatim
+*>
+*> \param[in] NVAL
+*> \verbatim
+*>          NVAL is INTEGER array, dimension (NN)
+*>          The values of the matrix column dimension N.
+*> \endverbatim
+*>
+*> \param[in] NNS
+*> \verbatim
+*>          NNS is INTEGER
+*>          The number of values of NRHS contained in the vector NSVAL.
+*> \endverbatim
+*>
+*> \param[in] NSVAL
+*> \verbatim
+*>          NSVAL is INTEGER array, dimension (NNS)
+*>          The values of the number of right hand sides NRHS.
+*> \endverbatim
+*>
+*> \param[in] NNB
+*> \verbatim
+*>          NNB is INTEGER
+*>          The number of values of NB and NX contained in the
+*>          vectors NBVAL and NXVAL.  The blocking parameters are used
+*>          in pairs (NB,NX).
+*> \endverbatim
+*>
+*> \param[in] NBVAL
+*> \verbatim
+*>          NBVAL is INTEGER array, dimension (NNB)
+*>          The values of the blocksize NB.
+*> \endverbatim
+*>
+*> \param[in] NXVAL
+*> \verbatim
+*>          NXVAL is INTEGER array, dimension (NNB)
+*>          The values of the crossover point NX.
+*> \endverbatim
+*>
+*> \param[in] THRESH
+*> \verbatim
+*>          THRESH is REAL
+*>          The threshold value for the test ratios.  A result is
+*>          included in the output file if RESULT >= THRESH.  To have
+*>          every test ratio printed, use THRESH = 0.
+*> \endverbatim
+*>
+*> \param[out] A
+*> \verbatim
+*>          A is REAL array, dimension (MMAX*NMAX)
+*>          where MMAX is the maximum value of M in MVAL and NMAX is the
+*>          maximum value of N in NVAL.
+*> \endverbatim
+*>
+*> \param[out] COPYA
+*> \verbatim
+*>          COPYA is REAL array, dimension (MMAX*NMAX)
+*> \endverbatim
+*>
+*> \param[out] B
+*> \verbatim
+*>          B is REAL array, dimension (MMAX*NSMAX)
+*>          where MMAX is the maximum value of M in MVAL and NSMAX is the
+*>          maximum value of NRHS in NSVAL.
+*> \endverbatim
+*>
+*> \param[out] COPYB
+*> \verbatim
+*>          COPYB is REAL array, dimension (MMAX*NSMAX)
+*> \endverbatim
+*>
+*> \param[out] S
+*> \verbatim
+*>          S is REAL array, dimension
+*>                      (min(MMAX,NMAX))
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is REAL array, dimension (MMAX)
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is REAL array, dimension
+*>                      (MMAX*NMAX + 4*NMAX + MMAX)
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (2*NMAX)
+*> \endverbatim
+*>
+*> \param[in] NOUT
+*> \verbatim
+*>          NOUT is INTEGER
+*>          The unit number for output.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup single_lin
+*
+*  =====================================================================
+      SUBROUTINE SCHKQP3RK( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL,
+     $                      NNB, NBVAL, NXVAL, THRESH, A, COPYA,
+     $                      B, COPYB, S, TAU,
+     $                      WORK, IWORK, NOUT )
+      IMPLICIT NONE
+*
+*  -- LAPACK test routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            NM, NN, NNB, NNS, NOUT
+      REAL               THRESH
+*     ..
+*     .. Array Arguments ..
+      LOGICAL            DOTYPE( * )
+      INTEGER            IWORK( * ), NBVAL( * ), MVAL( * ), NVAL( * ),
+     $                   NSVAL( * ), NXVAL( * )
+      REAL               A( * ), COPYA( * ), B( * ), COPYB( * ),
+     $                   S( * ), TAU( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      INTEGER            NTYPES
+      PARAMETER          ( NTYPES = 19 )
+      INTEGER            NTESTS
+      PARAMETER          ( NTESTS = 5 )
+      REAL               ONE, ZERO, BIGNUM
+      PARAMETER          ( ONE = 1.0E+0, ZERO = 0.0E+0,
+     $                     BIGNUM = 1.0E+38 )
+*     ..
+*     .. Local Scalars ..
+      CHARACTER          DIST, TYPE
+      CHARACTER*3        PATH
+      INTEGER            I, IHIGH, ILOW, IM, IMAT, IN, INC_ZERO,
+     $                   INB, IND_OFFSET_GEN,
+     $                   IND_IN, IND_OUT, INS, INFO,
+     $                   ISTEP, J, J_INC, J_FIRST_NZ, JB_ZERO,
+     $                   KFACT, KL, KMAX, KU, LDA, LW, LWORK,
+     $                   LWORK_MQR, M, MINMN, MINMNB_GEN, MODE, N,
+     $                   NB, NB_ZERO, NERRS, NFAIL, NB_GEN, NRHS,
+     $                   NRUN, NX, T
+      REAL               ANORM, CNDNUM, EPS, ABSTOL, RELTOL,
+     $                   DTEMP, MAXC2NRMK, RELMAXC2NRMK
+*     ..
+*     .. Local Arrays ..
+      INTEGER            ISEED( 4 ), ISEEDY( 4 )
+      REAL               RESULT( NTESTS ), RDUMMY( 1 )
+*     ..
+*     .. External Functions ..
+      REAL               SLAMCH, SQPT01, SQRT11, SQRT12, SLANGE
+      EXTERNAL           SLAMCH, SQPT01, SQRT11, SQRT12, SLANGE
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ALAERH, ALAHD, ALASUM, SAXPY, SGEQP3RK,
+     $                   SLACPY, SLAORD, SLASET, SLATB4, SLATMS,
+     $                   SORMQR, SSWAP, ICOPY, XLAENV
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, MIN, MOD, REAL
+*     ..
+*     .. Scalars in Common ..
+      LOGICAL            LERR, OK
+      CHARACTER*32       SRNAMT
+      INTEGER            INFOT, IOUNIT
+*     ..
+*     .. Common blocks ..
+      COMMON             / INFOC / INFOT, IOUNIT, OK, LERR
+      COMMON             / SRNAMC / SRNAMT
+*     ..
+*     .. Data statements ..
+      DATA               ISEEDY / 1988, 1989, 1990, 1991 /
+*     ..
+*     .. Executable Statements ..
+*
+*     Initialize constants and the random number seed.
+*
+      PATH( 1: 1 ) = 'Single precision'
+      PATH( 2: 3 ) = 'QK'
+      NRUN = 0
+      NFAIL = 0
+      NERRS = 0
+      DO I = 1, 4
+         ISEED( I ) = ISEEDY( I )
+      END DO
+      EPS = SLAMCH( 'Epsilon' )
+      INFOT = 0
+*
+      DO IM = 1, NM
+*
+*        Do for each value of M in MVAL.
+*
+         M = MVAL( IM )
+         LDA = MAX( 1, M )
+*
+         DO IN = 1, NN
+*
+*           Do for each value of N in NVAL.
+*
+            N = NVAL( IN )
+            MINMN = MIN( M, N )
+            LWORK = MAX( 1, M*MAX( M, N )+4*MINMN+MAX( M, N ),
+     $                   M*N + 2*MINMN + 4*N )
+*
+            DO INS = 1, NNS
+               NRHS = NSVAL( INS )
+*
+*                 Set up parameters with SLATB4 and generate
+*                 M-by-NRHS B matrix with SLATMS.
+*                 IMAT = 14:
+*                 Random matrix, CNDNUM = 2, NORM = ONE,
+*                 MODE = 3 (geometric distribution of singular values).
+*
+                  CALL SLATB4( PATH, 14, M, NRHS, TYPE, KL, KU, ANORM,
+     $                         MODE, CNDNUM, DIST )
+*
+                  SRNAMT = 'SLATMS'
+                  CALL SLATMS( M, NRHS, DIST, ISEED, TYPE, S, MODE,
+     $                         CNDNUM, ANORM, KL, KU, 'No packing',
+     $                         COPYB, LDA, WORK, INFO )
+
+
+*
+*                 Check error code from SLATMS.
+*
+                  IF( INFO.NE.0 ) THEN
+                     CALL ALAERH( PATH, 'SLATMS', INFO, 0, ' ', M,
+     $                            NRHS, -1, -1, -1, 6, NFAIL, NERRS,
+     $                            NOUT )
+                     CYCLE
+                  END IF
+*
+               DO IMAT = 1, NTYPES
+*
+*              Do the tests only if DOTYPE( IMAT ) is true.
+*
+               IF( .NOT.DOTYPE( IMAT ) )
+     $            CYCLE
+*
+*              The type of distribution used to generate the random
+*              eigen-/singular values:
+*              ( 'S' for symmetric distribution ) => UNIFORM( -1, 1 )
+*
+*           Do for each type of NON-SYMMETRIC matrix:                               CNDNUM                     NORM                                     MODE
+*            1. Zero matrix
+*            2. Random, Diagonal, CNDNUM = 2                                        CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            3. Random, Upper triangular, CNDNUM = 2                                CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            4. Random, Lower triangular, CNDNUM = 2                                CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            5. Random, First column is zero, CNDNUM = 2                            CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            6. Random, Last MINMN column is zero, CNDNUM = 2                       CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            7. Random, Last N column is zero, CNDNUM = 2                           CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            8. Random, Middle column in MINMN is zero, CNDNUM = 2                  CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            9. Random, First half of MINMN columns are zero, CNDNUM = 2            CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           10. Random, Last columns are zero starting from MINMN/2+1, CNDNUM = 2   CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           11. Random, Half MINMN columns in the middle are zero starting
+*                  from  MINMN/2-(MINMN/2)/2+1, CNDNUM = 2                          CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           12. Random, Odd columns are ZERO, CNDNUM = 2                            CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           13. Random, Even columns are ZERO, CNDNUM = 2                           CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           14. Random, CNDNUM = 2                                                  CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           15. Random, CNDNUM = sqrt(0.1/EPS)                                      CNDNUM = BADC1 = sqrt(0.1/EPS)  ONE                                      3 ( geometric distribution of singular values )
+*           16. Random, CNDNUM = 0.1/EPS                                            CNDNUM = BADC2 = 0.1/EPS        ONE                                      3 ( geometric distribution of singular values )
+*           17. Random, CNDNUM = 0.1/EPS,                                           CNDNUM = BADC2 = 0.1/EPS        ONE                                      2 ( one small singular value, S(N)=1/CNDNUM )
+*                 one small singular value S(N)=1/CNDNUM
+*           18. Random, CNDNUM = 2, scaled near underflow                           CNDNUM = 2                      SMALL = SAFMIN
+*           19. Random, CNDNUM = 2, scaled near overflow                            CNDNUM = 2                      LARGE = 1.0/( 0.25 * ( SAFMIN / EPS ) )  3 ( geometric distribution of singular values )
+*
+               IF( IMAT.EQ.1 ) THEN
+*
+*                 Matrix 1: Zero matrix
+*
+                  CALL SLASET( 'Full', M, N, ZERO, ZERO, COPYA, LDA )
+                  DO I = 1, MINMN
+                     S( I ) = ZERO
+                  END DO
+*
+               ELSE IF( (IMAT.GE.2 .AND. IMAT.LE.4 )
+     $                  .OR. (IMAT.GE.14 .AND. IMAT.LE.19 ) ) THEN
+*
+*                 Matrices 2-5.
+*
+*                 Set up parameters with SLATB4 and generate a test
+*                 matrix with SLATMS.
+*
+                  CALL SLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM,
+     $                         MODE, CNDNUM, DIST )
+*
+                  SRNAMT = 'SLATMS'
+                  CALL SLATMS( M, N, DIST, ISEED, TYPE, S, MODE,
+     $                         CNDNUM, ANORM, KL, KU, 'No packing',
+     $                         COPYA, LDA, WORK, INFO )
+*
+*                 Check error code from SLATMS.
+*
+                  IF( INFO.NE.0 ) THEN
+                     CALL ALAERH( PATH, 'SLATMS', INFO, 0, ' ', M, N,
+     $                            -1, -1, -1, IMAT, NFAIL, NERRS,
+     $                            NOUT )
+                     CYCLE
+                  END IF
+*
+                  CALL SLAORD( 'Decreasing', MINMN, S, 1 )
+*
+               ELSE IF( MINMN.GE.2
+     $                  .AND. IMAT.GE.5 .AND. IMAT.LE.13 ) THEN
+*
+*                 Rectangular matrices 5-13 that contain zero columns,
+*                 only for matrices MINMN >=2.
+*
+*                 JB_ZERO is the column index of ZERO block.
+*                 NB_ZERO is the column block size of ZERO block.
+*                 NB_GEN is the column blcok size of the
+*                 generated block.
+*                 J_INC in the non_zero column index increment
+*                 for matrix 12 and 13.
+*                 J_FIRS_NZ is the index of the first non-zero
+*                 column.
+*
+                  IF( IMAT.EQ.5 ) THEN
+*
+*                    First column is zero.
+*
+                     JB_ZERO = 1
+                     NB_ZERO = 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.6 ) THEN
+*
+*                    Last column MINMN is zero.
+*
+                     JB_ZERO = MINMN
+                     NB_ZERO = 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.7 ) THEN
+*
+*                    Last column N is zero.
+*
+                     JB_ZERO = N
+                     NB_ZERO = 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.8 ) THEN
+*
+*                    Middle column in MINMN is zero.
+*
+                     JB_ZERO = MINMN / 2 + 1
+                     NB_ZERO = 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.9 ) THEN
+*
+*                    First half of MINMN columns is zero.
+*
+                     JB_ZERO = 1
+                     NB_ZERO = MINMN / 2
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.10 ) THEN
+*
+*                    Last columns are zero columns,
+*                    starting from (MINMN / 2 + 1) column.
+*
+                     JB_ZERO = MINMN / 2 + 1
+                     NB_ZERO = N - JB_ZERO + 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.11 ) THEN
+*
+*                    Half of the columns in the middle of MINMN
+*                    columns is zero, starting from
+*                    MINMN/2 - (MINMN/2)/2 + 1 column.
+*
+                     JB_ZERO = MINMN / 2 - (MINMN / 2) / 2 + 1
+                     NB_ZERO = MINMN / 2
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.12 ) THEN
+*
+*                    Odd-numbered columns are zero,
+*
+                     NB_GEN = N / 2
+                     NB_ZERO = N - NB_GEN
+                     J_INC = 2
+                     J_FIRST_NZ = 2
+*
+                  ELSE IF( IMAT.EQ.13 ) THEN
+*
+*                    Even-numbered columns are zero.
+*
+                     NB_ZERO = N / 2
+                     NB_GEN = N - NB_ZERO
+                     J_INC = 2
+                     J_FIRST_NZ = 1
+*
+                  END IF
+*
+*
+*                 1) Set the first NB_ZERO columns in COPYA(1:M,1:N)
+*                    to zero.
+*
+                  CALL SLASET( 'Full', M, NB_ZERO, ZERO, ZERO,
+     $                         COPYA, LDA )
+*
+*                    2) Generate an M-by-(N-NB_ZERO) matrix with the
+*                       chosen singular value distribution
+*                       in COPYA(1:M,NB_ZERO+1:N).
+*
+                  CALL SLATB4( PATH, IMAT, M, NB_GEN, TYPE, KL, KU,
+     $                         ANORM, MODE, CNDNUM, DIST )
+*
+                  SRNAMT = 'SLATMS'
+*
+                  IND_OFFSET_GEN = NB_ZERO * LDA
+*
+                  CALL SLATMS( M, NB_GEN, DIST, ISEED, TYPE, S, MODE,
+     $                        CNDNUM, ANORM, KL, KU, 'No packing',
+     $                        COPYA( IND_OFFSET_GEN + 1 ), LDA,
+     $                        WORK, INFO )
+*
+*                 Check error code from SLATMS.
+*
+                  IF( INFO.NE.0 ) THEN
+                     CALL ALAERH( PATH, 'SLATMS', INFO, 0, ' ', M,
+     $                            NB_GEN, -1, -1, -1, IMAT, NFAIL,
+     $                            NERRS, NOUT )
+                     CYCLE
+                  END IF
+*
+*                 3) Swap the gererated colums from the right side
+*                 NB_GEN-size block in COPYA into correct column
+*                 positions.
+*
+                  IF( IMAT.EQ.6
+     $                    .OR. IMAT.EQ.7
+     $                    .OR. IMAT.EQ.8
+     $                    .OR. IMAT.EQ.10
+     $                    .OR. IMAT.EQ.11 ) THEN
+*
+*                    Move by swapping the generated columns
+*                    from the right NB_GEN-size block from
+*                    (NB_ZERO+1:NB_ZERO+JB_ZERO)
+*                    into columns (1:JB_ZERO-1).
+*
+                     DO J = 1, JB_ZERO-1, 1
+                        CALL SSWAP( M,
+     $                        COPYA( ( NB_ZERO+J-1)*LDA+1), 1,
+     $                        COPYA( (J-1)*LDA + 1 ), 1 )
+                     END DO
+*
+                  ELSE IF( IMAT.EQ.12 .OR. IMAT.EQ.13 ) THEN
+*
+*                    ( IMAT = 12, Odd-numbered ZERO columns. )
+*                    Swap the generated columns from the right
+*                    NB_GEN-size block into the even zero colums in the
+*                    left NB_ZERO-size block.
+*
+*                    ( IMAT = 13, Even-numbered ZERO columns. )
+*                    Swap the generated columns from the right
+*                    NB_GEN-size block into the odd zero colums in the
+*                    left NB_ZERO-size block.
+*
+                     DO J = 1, NB_GEN, 1
+                        IND_OUT = ( NB_ZERO+J-1 )*LDA + 1
+                        IND_IN = ( J_INC*(J-1)+(J_FIRST_NZ-1) )*LDA
+     $                            + 1
+                        CALL SSWAP( M,
+     $                              COPYA( IND_OUT ), 1,
+     $                              COPYA( IND_IN), 1 )
+                        END DO
+*
+                  END IF
+*
+*                 5) Order the singular values generated by
+*                    DLAMTS in decreasing order and add trailing zeros
+*                    that correspond to zero columns.
+*                    The total number of singular values is MINMN.
+*
+                  MINMNB_GEN = MIN( M, NB_GEN )
+*
+                  DO I = MINMNB_GEN+1, MINMN
+                     S( I ) = ZERO
+                  END DO
+*
+               ELSE
+*
+*                    IF(MINMN.LT.2) skip this size for this matrix type.
+*
+                     CYCLE
+               END IF
+*
+*              Initialize a copy array for a pivot array for SGEQP3RK.
+*
+               DO I = 1, N
+                  IWORK( I ) = 0
+               END DO
+*
+               DO INB = 1, NNB
+*
+*                 Do for each pair of values (NB,NX) in NBVAL and NXVAL.
+*
+                  NB = NBVAL( INB )
+                  CALL XLAENV( 1, NB )
+                  NX = NXVAL( INB )
+                  CALL XLAENV( 3, NX )
+*
+*                 We do MIN(M,N)+1 because we need a test for KMAX > N,
+*                 when KMAX is larger than MIN(M,N), KMAX should be
+*                 KMAX = MIN(M,N)
+*
+                  DO KMAX = 0, MIN(M,N)+1
+*
+*                 Get a working copy of COPYA into A( 1:M,1:N ).
+*                 Get a working copy of COPYB into A( 1:M, (N+1):NRHS ).
+*                 Get a working copy of COPYB into into B( 1:M, 1:NRHS ).
+*                 Get a working copy of IWORK(1:N) awith zeroes into
+*                 which is going to be used as pivot array IWORK( N+1:2N ).
+*                 NOTE: IWORK(2N+1:3N) is going to be used as a WORK array
+*                 for the routine.
+*
+                  CALL SLACPY( 'All', M, N, COPYA, LDA, A, LDA )
+                  CALL SLACPY( 'All', M, NRHS, COPYB, LDA,
+     $                         A( LDA*N + 1 ),  LDA )
+                  CALL SLACPY( 'All', M, NRHS, COPYB, LDA,
+     $                         B,  LDA )
+                  CALL ICOPY( N, IWORK( 1 ), 1, IWORK( N+1 ), 1 )
+                  DO I = 1, NTESTS
+                    RESULT( I ) = ZERO
+                  END DO
+*
+                  ABSTOL = -1.0
+                  RELTOL = -1.0
+*
+*                 Compute the QR factorization with pivoting of A
+*
+                  LW = MAX( 1, MAX( 2*N + NB*( N+NRHS+1 ),
+     $                              3*N + NRHS - 1 ) )
+*
+*                 Compute SGEQP3RK factorization of A.
+*
+                  SRNAMT = 'SGEQP3RK'
+                  CALL SGEQP3RK( M, N, NRHS, KMAX, ABSTOL, RELTOL,
+     $                           A, LDA, KFACT, MAXC2NRMK,
+     $                           RELMAXC2NRMK, IWORK( N+1 ), TAU,
+     $                           WORK, LW, IWORK( 2*N+1 ), INFO )
+*
+*                 Check error code from SGEQP3RK.
+*
+                  IF( INFO.LT.0 )
+     $               CALL ALAERH( PATH, 'SGEQP3RK', INFO, 0, ' ',
+     $                            M, N, NX, -1, NB, IMAT,
+     $                            NFAIL, NERRS, NOUT )
+*
+*                 Compute test 1:
+*
+*                 This test in only for the full rank factorization of
+*                 the matrix A.
+*
+*                 Array S(1:min(M,N)) contains svd(A) the sigular values
+*                 of the original matrix A in decreasing absolute value
+*                 order. The test computes svd(R), the vector sigular
+*                 values of the upper trapezoid of A(1:M,1:N) that
+*                 contains the factor R, in decreasing order. The test
+*                 returns the ratio:
+*
+*                 2-norm(svd(R) - svd(A)) / ( max(M,N) * 2-norm(svd(A)) * EPS )
+*
+                  IF( KFACT.EQ.MINMN ) THEN
+*
+                     RESULT( 1 ) = SQRT12( M, N, A, LDA, S, WORK,
+     $                                     LWORK )
+*
+                     NRUN = NRUN + 1
+*
+*                   End test 1
+*
+                  END IF
+*
+*                 Compute test 2:
+*
+*                 The test returns the ratio:
+*
+*                 1-norm( A*P - Q*R ) / ( max(M,N) * 1-norm(A) * EPS )
+*
+                  RESULT( 2 ) = SQPT01( M, N, KFACT, COPYA, A, LDA, TAU,
+     $                                  IWORK( N+1 ), WORK, LWORK )
+*
+*                 Compute test 3:
+*
+*                 The test returns the ratio:
+*
+*                 1-norm( Q**T * Q - I ) / ( M * EPS )
+*
+                  RESULT( 3 ) = SQRT11( M, KFACT, A, LDA, TAU, WORK,
+     $                                  LWORK )
+*
+                  NRUN = NRUN + 2
+*
+*                 Compute test 4:
+*
+*                 This test is only for the factorizations with the
+*                 rank greater than 2.
+*                 The elements on the diagonal of R should be non-
+*                 increasing.
+*
+*                 The test returns the ratio:
+*
+*                 Returns 1.0D+100 if abs(R(K+1,K+1)) > abs(R(K,K)),
+*                 K=1:KFACT-1
+*
+                  IF( MIN(KFACT, MINMN).GE.2 ) THEN
+*
+                     DO J = 1, KFACT-1, 1
+
+                        DTEMP = (( ABS( A( (J-1)*LDA+J ) ) -
+     $                          ABS( A( (J)*LDA+J+1 ) ) ) /
+     $                          ABS( A(1) ) )
+*
+                        IF( DTEMP.LT.ZERO ) THEN
+                           RESULT( 4 ) = BIGNUM
+                        END IF
+*
+                     END DO
+*
+                     NRUN = NRUN + 1
+*
+*                    End test 4.
+*
+                  END IF
+*
+*                 Compute test 5:
+*
+*                 This test in only for matrix A with min(M,N) > 0.
+*
+*                 The test returns the ratio:
+*
+*                 1-norm(Q**T * B - Q**T * B ) /
+*                       ( M * EPS )
+*
+*                 (1) Compute B:=Q**T * B in the matrix B.
+*
+                  IF( MINMN.GT.0 ) THEN
+*
+                     LWORK_MQR = MAX(1, NRHS)
+                     CALL SORMQR( 'Left', 'Transpose',
+     $                            M, NRHS, KFACT, A, LDA, TAU, B, LDA,
+     $                            WORK, LWORK_MQR, INFO )
+*
+                     DO I = 1, NRHS
+*
+*                       Compare N+J-th column of A and J-column of B.
+*
+                        CALL SAXPY( M, -ONE, A( ( N+I-1 )*LDA+1 ), 1,
+     $                              B( ( I-1 )*LDA+1 ), 1 )
+                     END DO
+*
+                     RESULT( 5 ) = ABS(
+     $                  SLANGE( 'One-norm', M, NRHS, B, LDA, RDUMMY ) /
+     $                  ( REAL( M )*SLAMCH( 'Epsilon' ) ) )
+*
+                     NRUN = NRUN + 1
+*
+*                    End compute test 5.
+*
+                  END IF
+*
+*                 Print information about the tests that did not pass
+*                 the threshold.
+*
+                  DO T = 1, NTESTS
+                     IF( RESULT( T ).GE.THRESH ) THEN
+                        IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
+     $                     CALL ALAHD( NOUT, PATH )
+                        WRITE( NOUT, FMT = 9999 ) 'SGEQP3RK', M, N,
+     $                      NRHS, KMAX, ABSTOL, RELTOL,
+     $                      NB, NX, IMAT, T, RESULT( T )
+                        NFAIL = NFAIL + 1
+                     END IF
+                  END DO
+*
+*                 END DO KMAX = 1, MIN(M,N)+1
+*
+                  END DO
+*
+*                 END DO for INB = 1, NNB
+*
+               END DO
+*
+*              END DO  for IMAT = 1, NTYPES
+*
+               END DO
+*
+*              END DO for INS = 1, NNS
+*
+            END DO
+*
+*           END DO for IN = 1, NN
+*
+         END DO
+*
+*        END DO for IM = 1, NM
+*
+      END DO
+*
+*     Print a summary of the results.
+*
+      CALL ALASUM( PATH, NOUT, NFAIL, NRUN, NERRS )
+*
+ 9999 FORMAT( 1X, A, ' M =', I5, ', N =', I5, ', NRHS =', I5,
+     $        ', KMAX =', I5, ', ABSTOL =', G12.5,
+     $        ', RELTOL =', G12.5, ', NB =', I4, ', NX =', I4,
+     $        ', type ', I2, ', test ', I2, ', ratio =', G12.5 )
+*
+*     End of SCHKQP3RK
+*
+      END
diff --git a/TESTING/LIN/schkqr.f b/TESTING/LIN/schkqr.f
index 5c45ede9b5..49d775c172 100644
--- a/TESTING/LIN/schkqr.f
+++ b/TESTING/LIN/schkqr.f
@@ -198,6 +198,7 @@
       SUBROUTINE SCHKQR( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   NRHS, THRESH, TSTERR, NMAX, A, AF, AQ, AR, AC,
      $                   B, X, XACT, TAU, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -244,7 +245,7 @@ SUBROUTINE SCHKQR( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
       EXTERNAL           SGENND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAERH, ALAHD, ALASUM, SERRQR, SGEQRS, SGET02,
+      EXTERNAL           ALAERH, ALAHD, ALASUM, SERRQR, SGELS, SGET02,
      $                   SLACPY, SLARHS, SLATB4, SLATMS, SQRT01,
      $                   SQRT01P, SQRT02, SQRT03, XLAENV
 *     ..
@@ -388,7 +389,7 @@ SUBROUTINE SCHKQR( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                               WORK, LWORK, RWORK, RESULT( 3 ) )
                         NT = NT + 4
 *
-*                       If M>=N and K=N, call SGEQRS to solve a system
+*                       If M>=N and K=N, call SGELS to solve a system
 *                       with NRHS right hand sides and compute the
 *                       residual.
 *
@@ -405,14 +406,20 @@ SUBROUTINE SCHKQR( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
 *
                            CALL SLACPY( 'Full', M, NRHS, B, LDA, X,
      $                                  LDA )
-                           SRNAMT = 'SGEQRS'
-                           CALL SGEQRS( M, N, NRHS, AF, LDA, TAU, X,
-     $                                  LDA, WORK, LWORK, INFO )
 *
-*                          Check error code from SGEQRS.
+*                          Reset AF to the original matrix. SGELS
+*                          factors the matrix before solving the system.
+*
+                           CALL SLACPY( 'Full', M, N, A, LDA, AF, LDA )
+*
+                           SRNAMT = 'SGELS'
+                           CALL SGELS( 'No transpose', M, N, NRHS, AF,
+     $                                 LDA, X, LDA, WORK, LWORK, INFO )
+*
+*                          Check error code from SGELS.
 *
                            IF( INFO.NE.0 )
-     $                        CALL ALAERH( PATH, 'SGEQRS', INFO, 0, ' ',
+     $                        CALL ALAERH( PATH, 'SGELS', INFO, 0, 'N',
      $                                     M, N, NRHS, -1, NB, IMAT,
      $                                     NFAIL, NERRS, NOUT )
 *
diff --git a/TESTING/LIN/schkrfp.f b/TESTING/LIN/schkrfp.f
index f3fdfa07f9..ab04f496b8 100644
--- a/TESTING/LIN/schkrfp.f
+++ b/TESTING/LIN/schkrfp.f
@@ -56,6 +56,7 @@
 *
 *  =====================================================================
       PROGRAM SCHKRFP
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -274,7 +275,7 @@ PROGRAM SCHKRFP
  9995 FORMAT( ' !! Invalid input value: ', A4, '=', I6, '; must be <=',
      $      I6 )
  9994 FORMAT( /  ' Tests of the REAL LAPACK RFP routines ',
-     $      / ' LAPACK VERSION ', I1, '.', I1, '.', I1,
+     $      / ' LAPACK VERSION ', I1, '.', I2, '.', I1,
      $      / / ' The following parameter values will be used:' )
  9993 FORMAT( 4X, A4, ':  ', 10I6, / 11X, 10I6 )
  9992 FORMAT( / ' Routines pass computational tests if test ratio is ',
diff --git a/TESTING/LIN/schkrq.f b/TESTING/LIN/schkrq.f
index 095fbbf9be..1d919f19c8 100644
--- a/TESTING/LIN/schkrq.f
+++ b/TESTING/LIN/schkrq.f
@@ -198,6 +198,7 @@
       SUBROUTINE SCHKRQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   NRHS, THRESH, TSTERR, NMAX, A, AF, AQ, AR, AC,
      $                   B, X, XACT, TAU, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schksp.f b/TESTING/LIN/schksp.f
index b3c45d1f27..3762433b7c 100644
--- a/TESTING/LIN/schksp.f
+++ b/TESTING/LIN/schksp.f
@@ -160,6 +160,7 @@
       SUBROUTINE SCHKSP( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, A, AFAC, AINV, B, X, XACT, WORK, RWORK,
      $                   IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schksy.f b/TESTING/LIN/schksy.f
index dc94b34924..cfa26e41cd 100644
--- a/TESTING/LIN/schksy.f
+++ b/TESTING/LIN/schksy.f
@@ -167,6 +167,7 @@
       SUBROUTINE SCHKSY( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                   XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schksy_aa_2stage.f b/TESTING/LIN/schksy_aa_2stage.f
index d3c27ae561..6490cd7c37 100644
--- a/TESTING/LIN/schksy_aa_2stage.f
+++ b/TESTING/LIN/schksy_aa_2stage.f
@@ -423,9 +423,9 @@ SUBROUTINE SCHKSY_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
 *                 block factorization, LWORK is the length of AINV.
 *
                   SRNAMT = 'SSYTRF_AA_2STAGE'
-                  LWORK = MIN(N*NB, 3*NMAX*NMAX)
+                  LWORK = MIN( MAX( 1, N*NB ), 3*NMAX*NMAX )
                   CALL SSYTRF_AA_2STAGE( UPLO, N, AFAC, LDA, 
-     $                                   AINV, (3*NB+1)*N, 
+     $                                   AINV, MAX( 1, (3*NB+1)*N ),
      $                                   IWORK, IWORK( 1+N ),
      $                                   WORK, LWORK,
      $                                   INFO )
@@ -505,7 +505,6 @@ SUBROUTINE SCHKSY_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
                      CALL SLACPY( 'Full', N, NRHS, B, LDA, X, LDA )
 *
                      SRNAMT = 'SSYTRS_AA_2STAGE'
-                     LWORK = MAX( 1, 3*N-2 )
                      CALL SSYTRS_AA_2STAGE( UPLO, N, NRHS, AFAC, LDA,
      $                            AINV, (3*NB+1)*N, IWORK, IWORK( 1+N ),
      $                            X, LDA, INFO )
diff --git a/TESTING/LIN/schksy_rk.f b/TESTING/LIN/schksy_rk.f
index 932e6e1860..6e2d9c93d6 100644
--- a/TESTING/LIN/schksy_rk.f
+++ b/TESTING/LIN/schksy_rk.f
@@ -173,6 +173,7 @@
       SUBROUTINE SCHKSY_RK( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                      THRESH, TSTERR, NMAX, A, AFAC, E, AINV, B,
      $                      X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schksy_rook.f b/TESTING/LIN/schksy_rook.f
index eb91eba4f0..865af3ffbc 100644
--- a/TESTING/LIN/schksy_rook.f
+++ b/TESTING/LIN/schksy_rook.f
@@ -168,6 +168,7 @@
       SUBROUTINE SCHKSY_ROOK( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                   XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schktb.f b/TESTING/LIN/schktb.f
index cdbb622b15..f1600ee292 100644
--- a/TESTING/LIN/schktb.f
+++ b/TESTING/LIN/schktb.f
@@ -152,6 +152,7 @@
       SUBROUTINE SCHKTB( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, AB, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schktp.f b/TESTING/LIN/schktp.f
index ff05c1d97a..b0128fe5ac 100644
--- a/TESTING/LIN/schktp.f
+++ b/TESTING/LIN/schktp.f
@@ -86,7 +86,7 @@
 *> \verbatim
 *>          NMAX is INTEGER
 *>          The leading dimension of the work arrays.  NMAX >= the
-*>          maximumm value of N in NVAL.
+*>          maximum value of N in NVAL.
 *> \endverbatim
 *>
 *> \param[out] AP
@@ -154,6 +154,7 @@
       SUBROUTINE SCHKTP( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, AP, AINVP, B, X, XACT, WORK, RWORK,
      $                   IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/schktr.f b/TESTING/LIN/schktr.f
index 66fa0bee7f..f8bbe8a89f 100644
--- a/TESTING/LIN/schktr.f
+++ b/TESTING/LIN/schktr.f
@@ -30,7 +30,7 @@
 *>
 *> \verbatim
 *>
-*> SCHKTR tests STRTRI, -TRS, -RFS, and -CON, and SLATRS
+*> SCHKTR tests STRTRI, -TRS, -RFS, and -CON, and SLATRS(3)
 *> \endverbatim
 *
 *  Arguments:
@@ -164,6 +164,7 @@
       SUBROUTINE SCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AINV, B, X, XACT,
      $                   WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -187,7 +188,7 @@ SUBROUTINE SCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
       INTEGER            NTYPE1, NTYPES
       PARAMETER          ( NTYPE1 = 10, NTYPES = 18 )
       INTEGER            NTESTS
-      PARAMETER          ( NTESTS = 9 )
+      PARAMETER          ( NTESTS = 10 )
       INTEGER            NTRAN
       PARAMETER          ( NTRAN = 3 )
       REAL               ONE, ZERO
@@ -198,13 +199,13 @@ SUBROUTINE SCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
       CHARACTER*3        PATH
       INTEGER            I, IDIAG, IMAT, IN, INB, INFO, IRHS, ITRAN,
      $                   IUPLO, K, LDA, N, NB, NERRS, NFAIL, NRHS, NRUN
-      REAL               AINVNM, ANORM, DUMMY, RCOND, RCONDC, RCONDI,
-     $                   RCONDO, SCALE
+      REAL               AINVNM, ANORM, BIGNUM, DUMMY, RCOND, RCONDC,
+     $                   RCONDI, RCONDO, RES, SCALE, SLAMCH
 *     ..
 *     .. Local Arrays ..
       CHARACTER          TRANSS( NTRAN ), UPLOS( 2 )
       INTEGER            ISEED( 4 ), ISEEDY( 4 )
-      REAL               RESULT( NTESTS )
+      REAL               RESULT( NTESTS ), SCALE3( 2 )
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -213,9 +214,9 @@ SUBROUTINE SCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALAERH, ALAHD, ALASUM, SCOPY, SERRTR, SGET04,
-     $                   SLACPY, SLARHS, SLATRS, SLATTR, STRCON, STRRFS,
-     $                   STRT01, STRT02, STRT03, STRT05, STRT06, STRTRI,
-     $                   STRTRS, XLAENV
+     $                   SLACPY, SLARHS, SLATRS, SLATRS3, SLATTR, SSCAL,
+     $                   STRCON, STRRFS, STRT01, STRT02, STRT03, STRT05,
+     $                   STRT06, STRTRI, STRTRS, XLAENV, SLAMCH
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -239,6 +240,7 @@ SUBROUTINE SCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
 *
       PATH( 1: 1 ) = 'Single precision'
       PATH( 2: 3 ) = 'TR'
+      BIGNUM = SLAMCH('Overflow') / SLAMCH('Precision')
       NRUN = 0
       NFAIL = 0
       NERRS = 0
@@ -539,6 +541,33 @@ SUBROUTINE SCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                         RWORK, ONE, B( N+1 ), LDA, X, LDA, WORK,
      $                         RESULT( 9 ) )
 *
+*+    TEST 10
+*                 Solve op(A)*X = B
+*
+                  SRNAMT = 'SLATRS3'
+                  CALL SCOPY( N, X, 1, B, 1 )
+                  CALL SCOPY( N, X, 1, B( N+1 ), 1 )
+                  CALL SSCAL( N, BIGNUM, B( N+1 ), 1 )
+                  CALL SLATRS3( UPLO, TRANS, DIAG, 'N', N, 2, A, LDA,
+     $                          B, MAX(1, N), SCALE3, RWORK, WORK, NMAX,
+     $                          INFO )
+*
+*                 Check error code from SLATRS3.
+*
+                  IF( INFO.NE.0 )
+     $               CALL ALAERH( PATH, 'SLATRS3', INFO, 0,
+     $                            UPLO // TRANS // DIAG // 'N', N, N,
+     $                            -1, -1, -1, IMAT, NFAIL, NERRS, NOUT )
+*
+                  CALL STRT03( UPLO, TRANS, DIAG, N, 1, A, LDA,
+     $                         SCALE3( 1 ), RWORK, ONE, B( 1 ), LDA,
+     $                         X, LDA, WORK, RESULT( 10 ) )
+                  CALL SSCAL( N, BIGNUM, X, 1 )
+                  CALL STRT03( UPLO, TRANS, DIAG, N, 1, A, LDA,
+     $                         SCALE3( 2 ), RWORK, ONE, B( N+1 ), LDA,
+     $                         X, LDA, WORK, RES )
+                  RESULT( 10 ) = MAX( RESULT( 10 ), RES )
+*
 *                 Print information about the tests that did not pass
 *                 the threshold.
 *
@@ -556,7 +585,14 @@ SUBROUTINE SCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                  DIAG, 'Y', N, IMAT, 9, RESULT( 9 )
                      NFAIL = NFAIL + 1
                   END IF
-                  NRUN = NRUN + 2
+                  IF( RESULT( 10 ).GE.THRESH ) THEN
+                     IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
+     $                  CALL ALAHD( NOUT, PATH )
+                     WRITE( NOUT, FMT = 9996 )'SLATRS3', UPLO, TRANS,
+     $                  DIAG, 'N', N, IMAT, 10, RESULT( 10 )
+                     NFAIL = NFAIL + 1
+                  END IF
+                  NRUN = NRUN + 3
    90          CONTINUE
   100       CONTINUE
   110    CONTINUE
@@ -569,8 +605,8 @@ SUBROUTINE SCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
  9999 FORMAT( ' UPLO=''', A1, ''', DIAG=''', A1, ''', N=', I5, ', NB=',
      $      I4, ', type ', I2, ', test(', I2, ')= ', G12.5 )
  9998 FORMAT( ' UPLO=''', A1, ''', TRANS=''', A1, ''', DIAG=''', A1,
-     $      ''', N=', I5, ', NB=', I4, ', type ', I2, ',
-     $      test(', I2, ')= ', G12.5 )
+     $      ''', N=', I5, ', NB=', I4, ', type ', I2, ', test(',
+     $      I2, ')= ', G12.5 )
  9997 FORMAT( ' NORM=''', A1, ''', UPLO =''', A1, ''', N=', I5, ',',
      $      11X, ' type ', I2, ', test(', I2, ')=', G12.5 )
  9996 FORMAT( 1X, A, '( ''', A1, ''', ''', A1, ''', ''', A1, ''', ''',
diff --git a/TESTING/LIN/schktz.f b/TESTING/LIN/schktz.f
index 85544542a0..cdacd300fc 100644
--- a/TESTING/LIN/schktz.f
+++ b/TESTING/LIN/schktz.f
@@ -129,6 +129,7 @@
 *  =====================================================================
       SUBROUTINE SCHKTZ( DOTYPE, NM, MVAL, NN, NVAL, THRESH, TSTERR, A,
      $                   COPYA, S, TAU, WORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvgb.f b/TESTING/LIN/sdrvgb.f
index d7c293ab6a..a59bd992c3 100644
--- a/TESTING/LIN/sdrvgb.f
+++ b/TESTING/LIN/sdrvgb.f
@@ -169,6 +169,7 @@
       SUBROUTINE SDRVGB( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, LA,
      $                   AFB, LAFB, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvgbx.f b/TESTING/LIN/sdrvgbx.f
index 342e25ac25..b1e300b569 100644
--- a/TESTING/LIN/sdrvgbx.f
+++ b/TESTING/LIN/sdrvgbx.f
@@ -172,6 +172,7 @@
       SUBROUTINE SDRVGB( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, LA,
      $                   AFB, LAFB, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvge.f b/TESTING/LIN/sdrvge.f
index fa66d12c1a..30069cf8d9 100644
--- a/TESTING/LIN/sdrvge.f
+++ b/TESTING/LIN/sdrvge.f
@@ -161,6 +161,7 @@
       SUBROUTINE SDRVGE( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvgex.f b/TESTING/LIN/sdrvgex.f
index a7a9984ff2..e6082ef7bb 100644
--- a/TESTING/LIN/sdrvgex.f
+++ b/TESTING/LIN/sdrvgex.f
@@ -164,6 +164,7 @@
       SUBROUTINE SDRVGE( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvgt.f b/TESTING/LIN/sdrvgt.f
index 6c3ad2d7b9..2cb7c596d9 100644
--- a/TESTING/LIN/sdrvgt.f
+++ b/TESTING/LIN/sdrvgt.f
@@ -136,6 +136,7 @@
 *  =====================================================================
       SUBROUTINE SDRVGT( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, AF,
      $                   B, X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvls.f b/TESTING/LIN/sdrvls.f
index b964515037..bb3ea9a7cb 100644
--- a/TESTING/LIN/sdrvls.f
+++ b/TESTING/LIN/sdrvls.f
@@ -31,8 +31,8 @@
 *>
 *> \verbatim
 *>
-*> SDRVLS tests the least squares driver routines SGELS, SGETSLS, SGELSS, SGELSY,
-*> and SGELSD.
+*> SDRVLS tests the least squares driver routines SGELS, SGELST,
+*> SGETSLS, SGELSS, SGELSY and SGELSD.
 *> \endverbatim
 *
 *  Arguments:
@@ -189,6 +189,7 @@
       SUBROUTINE SDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                   NBVAL, NXVAL, THRESH, TSTERR, A, COPYA, B,
      $                   COPYB, C, S, COPYS, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -211,7 +212,7 @@ SUBROUTINE SDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *
 *     .. Parameters ..
       INTEGER            NTESTS
-      PARAMETER          ( NTESTS = 16 )
+      PARAMETER          ( NTESTS = 18 )
       INTEGER            SMLSIZ
       PARAMETER          ( SMLSIZ = 25 )
       REAL               ONE, TWO, ZERO
@@ -225,8 +226,8 @@ SUBROUTINE SDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                   LWLSY, LWORK, M, MNMIN, N, NB, NCOLS, NERRS,
      $                   NFAIL, NRHS, NROWS, NRUN, RANK, MB,
      $                   MMAX, NMAX, NSMAX, LIWORK,
-     $                   LWORK_SGELS, LWORK_SGETSLS, LWORK_SGELSS,
-     $                   LWORK_SGELSY, LWORK_SGELSD
+     $                   LWORK_SGELS, LWORK_SGELST, LWORK_SGETSLS,
+     $                   LWORK_SGELSS, LWORK_SGELSY, LWORK_SGELSD
       REAL               EPS, NORMA, NORMB, RCOND
 *     ..
 *     .. Local Arrays ..
@@ -243,12 +244,12 @@ SUBROUTINE SDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALAERH, ALAHD, ALASVM, SAXPY, SERRLS, SGELS,
-     $                   SGELSD, SGELSS, SGELSY, SGEMM, SLACPY,
-     $                   SLARNV, SQRT13, SQRT15, SQRT16, SSCAL,
-     $                   XLAENV, SGETSLS
+     $                   SGELSD, SGELSS, SGELST, SGELSY, SGEMM,
+     $                   SGETSLS, SLACPY, SLARNV, SQRT13, SQRT15,
+     $                   SQRT16, SSCAL, XLAENV
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          INT, LOG, MAX, MIN, REAL, SQRT
+      INTRINSIC          INT, MAX, MIN, REAL, SQRT
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -330,7 +331,8 @@ SUBROUTINE SDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
       LIWORK = 1
 *
 *     Iterate through all test cases and compute necessary workspace
-*     sizes for ?GELS, ?GETSLS, ?GELSY, ?GELSS and ?GELSD routines.
+*     sizes for ?GELS, ?GELST, ?GETSLS, ?GELSY, ?GELSS and ?GELSD
+*     routines.
 *
       DO IM = 1, NM
          M = MVAL( IM )
@@ -357,6 +359,10 @@ SUBROUTINE SDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
                               CALL SGELS( TRANS, M, N, NRHS, A, LDA,
      $                                    B, LDB, WQ( 1 ), -1, INFO )
                               LWORK_SGELS = INT ( WQ( 1 ) )
+*                             Compute workspace needed for SGELST
+                              CALL SGELST( TRANS, M, N, NRHS, A, LDA,
+     $                                    B, LDB, WQ, -1, INFO )
+                              LWORK_SGELST = INT ( WQ ( 1 ) )
 *                             Compute workspace needed for SGETSLS
                               CALL SGETSLS( TRANS, M, N, NRHS, A, LDA,
      $                                      B, LDB, WQ( 1 ), -1, INFO )
@@ -378,9 +384,9 @@ SUBROUTINE SDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *                       Compute LIWORK workspace needed for SGELSY and SGELSD
                         LIWORK = MAX( LIWORK, N, IWQ( 1 ) )
 *                       Compute LWORK workspace needed for all functions
-                        LWORK = MAX( LWORK, LWORK_SGELS, LWORK_SGETSLS,
-     $                               LWORK_SGELSY, LWORK_SGELSS,
-     $                               LWORK_SGELSD )
+                        LWORK = MAX( LWORK, LWORK_SGELS, LWORK_SGELST,
+     $                               LWORK_SGETSLS, LWORK_SGELSY,
+     $                               LWORK_SGELSS, LWORK_SGELSD )
                      END IF
                   ENDDO
                ENDDO
@@ -411,21 +417,26 @@ SUBROUTINE SDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
                      ITYPE = ( IRANK-1 )*3 + ISCALE
                      IF( .NOT.DOTYPE( ITYPE ) )
      $                  GO TO 110
-*
+*                 =====================================================
+*                       Begin test SGELS
+*                 =====================================================
                      IF( IRANK.EQ.1 ) THEN
 *
-*                       Test SGELS
-*
 *                       Generate a matrix of scaling type ISCALE
 *
                         CALL SQRT13( ISCALE, M, N, COPYA, LDA, NORMA,
      $                               ISEED )
-                        DO 40 INB = 1, NNB
+*
+*                       Loop for testing different block sizes.
+*
+                        DO INB = 1, NNB
                            NB = NBVAL( INB )
                            CALL XLAENV( 1, NB )
                            CALL XLAENV( 3, NXVAL( INB ) )
 *
-                           DO 30 ITRAN = 1, 2
+*                          Loop for testing non-transposed and transposed.
+*
+                           DO ITRAN = 1, 2
                               IF( ITRAN.EQ.1 ) THEN
                                  TRANS = 'N'
                                  NROWS = M
@@ -469,20 +480,27 @@ SUBROUTINE SDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                                        ITYPE, NFAIL, NERRS,
      $                                        NOUT )
 *
-*                             Check correctness of results
+*                             Test 1: Check correctness of results
+*                             for SGELS, compute the residual:
+*                             RESID = norm(B - A*X) /
+*                             / ( max(m,n) * norm(A) * norm(X) * EPS )
 *
-                              LDWORK = MAX( 1, NROWS )
                               IF( NROWS.GT.0 .AND. NRHS.GT.0 )
      $                           CALL SLACPY( 'Full', NROWS, NRHS,
      $                                        COPYB, LDB, C, LDB )
                               CALL SQRT16( TRANS, M, N, NRHS, COPYA,
      $                                     LDA, B, LDB, C, LDB, WORK,
      $                                     RESULT( 1 ) )
+*
+*                             Test 2: Check correctness of results
+*                             for SGELS.
 *
                               IF( ( ITRAN.EQ.1 .AND. M.GE.N ) .OR.
      $                            ( ITRAN.EQ.2 .AND. M.LT.N ) ) THEN
 *
-*                                Solving LS system
+*                                Solving LS system, compute:
+*                                r = norm((B- A*X)**T * A) /
+*                                 / (norm(A)*norm(B)*max(M,N,NRHS)*EPS)
 *
                                  RESULT( 2 ) = SQRT17( TRANS, 1, M, N,
      $                                         NRHS, COPYA, LDA, B, LDB,
@@ -500,7 +518,7 @@ SUBROUTINE SDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *                             Print information about the tests that
 *                             did not pass the threshold.
 *
-                              DO 20 K = 1, 2
+                              DO K = 1, 2
                                  IF( RESULT( K ).GE.THRESH ) THEN
                                     IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
      $                                 CALL ALAHD( NOUT, PATH )
@@ -509,26 +527,33 @@ SUBROUTINE SDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                                 RESULT( K )
                                     NFAIL = NFAIL + 1
                                  END IF
-   20                         CONTINUE
+                              END DO
                               NRUN = NRUN + 2
-   30                      CONTINUE
-   40                   CONTINUE
-*
-*
-*                       Test SGETSLS
+                           END DO
+                        END DO
+                     END IF
+*                 =====================================================
+*                       End test SGELS
+*                 =====================================================
+*                 =====================================================
+*                       Begin test SGELST
+*                 =====================================================
+                     IF( IRANK.EQ.1 ) THEN
 *
 *                       Generate a matrix of scaling type ISCALE
 *
                         CALL SQRT13( ISCALE, M, N, COPYA, LDA, NORMA,
      $                               ISEED )
-                        DO 65 INB = 1, NNB
-                             MB = NBVAL( INB )
-                             CALL XLAENV( 1, MB )
-                             DO 62 IMB = 1, NNB
-                               NB = NBVAL( IMB )
-                               CALL XLAENV( 2, NB )
-*
-                           DO 60 ITRAN = 1, 2
+*
+*                       Loop for testing different block sizes.
+*
+                        DO INB = 1, NNB
+                           NB = NBVAL( INB )
+                           CALL XLAENV( 1, NB )
+*
+*                          Loop for testing non-transposed and transposed.
+*
+                           DO ITRAN = 1, 2
                               IF( ITRAN.EQ.1 ) THEN
                                  TRANS = 'N'
                                  NROWS = M
@@ -563,31 +588,38 @@ SUBROUTINE SDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
                                  CALL SLACPY( 'Full', NROWS, NRHS,
      $                                        COPYB, LDB, B, LDB )
                               END IF
-                              SRNAMT = 'SGETSLS '
-                              CALL SGETSLS( TRANS, M, N, NRHS, A,
-     $                                 LDA, B, LDB, WORK, LWORK, INFO )
+                              SRNAMT = 'SGELST'
+                              CALL SGELST( TRANS, M, N, NRHS, A, LDA, B,
+     $                                     LDB, WORK, LWORK, INFO )
                               IF( INFO.NE.0 )
-     $                           CALL ALAERH( PATH, 'SGETSLS ', INFO, 0,
+     $                           CALL ALAERH( PATH, 'SGELST', INFO, 0,
      $                                        TRANS, M, N, NRHS, -1, NB,
      $                                        ITYPE, NFAIL, NERRS,
      $                                        NOUT )
 *
-*                             Check correctness of results
+*                             Test 3: Check correctness of results
+*                             for SGELST, compute the residual:
+*                             RESID = norm(B - A*X) /
+*                             / ( max(m,n) * norm(A) * norm(X) * EPS )
 *
-                              LDWORK = MAX( 1, NROWS )
                               IF( NROWS.GT.0 .AND. NRHS.GT.0 )
      $                           CALL SLACPY( 'Full', NROWS, NRHS,
      $                                        COPYB, LDB, C, LDB )
                               CALL SQRT16( TRANS, M, N, NRHS, COPYA,
      $                                     LDA, B, LDB, C, LDB, WORK,
-     $                                     RESULT( 15 ) )
+     $                                     RESULT( 3 ) )
+*
+*                             Test 4: Check correctness of results
+*                             for SGELST.
 *
                               IF( ( ITRAN.EQ.1 .AND. M.GE.N ) .OR.
      $                            ( ITRAN.EQ.2 .AND. M.LT.N ) ) THEN
 *
-*                                Solving LS system
+*                                Solving LS system, compute:
+*                                r = norm((B- A*X)**T * A) /
+*                                 / (norm(A)*norm(B)*max(M,N,NRHS)*EPS)
 *
-                                 RESULT( 16 ) = SQRT17( TRANS, 1, M, N,
+                                 RESULT( 4 ) = SQRT17( TRANS, 1, M, N,
      $                                         NRHS, COPYA, LDA, B, LDB,
      $                                         COPYB, LDB, C, WORK,
      $                                         LWORK )
@@ -595,7 +627,7 @@ SUBROUTINE SDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *
 *                                Solving overdetermined system
 *
-                                 RESULT( 16 ) = SQRT14( TRANS, M, N,
+                                 RESULT( 4 ) = SQRT14( TRANS, M, N,
      $                                         NRHS, COPYA, LDA, B, LDB,
      $                                         WORK, LWORK )
                               END IF
@@ -603,21 +635,151 @@ SUBROUTINE SDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *                             Print information about the tests that
 *                             did not pass the threshold.
 *
-                              DO 50 K = 15, 16
+                              DO K = 3, 4
                                  IF( RESULT( K ).GE.THRESH ) THEN
                                     IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
      $                                 CALL ALAHD( NOUT, PATH )
-                                    WRITE( NOUT, FMT = 9997 )TRANS, M,
-     $                                 N, NRHS, MB, NB, ITYPE, K,
+                                    WRITE( NOUT, FMT = 9999 ) TRANS, M,
+     $                                 N, NRHS, NB, ITYPE, K,
      $                                 RESULT( K )
                                     NFAIL = NFAIL + 1
                                  END IF
-   50                         CONTINUE
+                              END DO
                               NRUN = NRUN + 2
-   60                      CONTINUE
-   62                      CONTINUE
-   65                   CONTINUE
+                           END DO
+                        END DO
                      END IF
+*                 =====================================================
+*                       End test SGELST
+*                 =====================================================
+*                 =====================================================
+*                       Begin test SGETSLS
+*                 =====================================================
+                     IF( IRANK.EQ.1 ) THEN
+*
+*                       Generate a matrix of scaling type ISCALE
+*
+                        CALL SQRT13( ISCALE, M, N, COPYA, LDA, NORMA,
+     $                               ISEED )
+*
+*                       Loop for testing different block sizes MB.
+*
+                        DO IMB = 1, NNB
+                           MB = NBVAL( IMB )
+                           CALL XLAENV( 1, MB )
+*
+*                          Loop for testing different block sizes NB.
+*
+                           DO INB = 1, NNB
+                              NB = NBVAL( INB )
+                              CALL XLAENV( 2, NB )
+*
+*                             Loop for testing non-transposed
+*                             and transposed.
+*
+                              DO ITRAN = 1, 2
+                                 IF( ITRAN.EQ.1 ) THEN
+                                    TRANS = 'N'
+                                    NROWS = M
+                                    NCOLS = N
+                                 ELSE
+                                    TRANS = 'T'
+                                    NROWS = N
+                                    NCOLS = M
+                                 END IF
+                                 LDWORK = MAX( 1, NCOLS )
+*
+*                                Set up a consistent rhs
+*
+                                 IF( NCOLS.GT.0 ) THEN
+                                    CALL SLARNV( 2, ISEED, NCOLS*NRHS,
+     $                                           WORK )
+                                    CALL SSCAL( NCOLS*NRHS,
+     $                                          ONE / REAL( NCOLS ),
+     $                                          WORK, 1 )
+                                 END IF
+                                 CALL SGEMM( TRANS, 'No transpose',
+     $                                       NROWS, NRHS, NCOLS, ONE,
+     $                                       COPYA, LDA, WORK, LDWORK,
+     $                                       ZERO, B, LDB )
+                                 CALL SLACPY( 'Full', NROWS, NRHS,
+     $                                        B, LDB, COPYB, LDB )
+*
+*                                Solve LS or overdetermined system
+*
+                                 IF( M.GT.0 .AND. N.GT.0 ) THEN
+                                    CALL SLACPY( 'Full', M, N,
+     $                                           COPYA, LDA, A, LDA )
+                                    CALL SLACPY( 'Full', NROWS, NRHS,
+     $                                           COPYB, LDB, B, LDB )
+                                 END IF
+                                 SRNAMT = 'SGETSLS'
+                                 CALL SGETSLS( TRANS, M, N, NRHS,
+     $                                    A, LDA, B, LDB, WORK, LWORK,
+     $                                    INFO )
+                                 IF( INFO.NE.0 )
+     $                              CALL ALAERH( PATH, 'SGETSLS', INFO,
+     $                                           0, TRANS, M, N, NRHS,
+     $                                           -1, NB, ITYPE, NFAIL,
+     $                                           NERRS, NOUT )
+*
+*                             Test 5: Check correctness of results
+*                             for SGETSLS, compute the residual:
+*                             RESID = norm(B - A*X) /
+*                             / ( max(m,n) * norm(A) * norm(X) * EPS )
+*
+                                 IF( NROWS.GT.0 .AND. NRHS.GT.0 )
+     $                              CALL SLACPY( 'Full', NROWS, NRHS,
+     $                                           COPYB, LDB, C, LDB )
+                                 CALL SQRT16( TRANS, M, N, NRHS,
+     $                                        COPYA, LDA, B, LDB,
+     $                                        C, LDB, WORK,
+     $                                        RESULT( 5 ) )
+*
+*                             Test 6: Check correctness of results
+*                             for SGETSLS.
+*
+                                 IF( ( ITRAN.EQ.1 .AND. M.GE.N ) .OR.
+     $                               ( ITRAN.EQ.2 .AND. M.LT.N ) ) THEN
+*
+*                                   Solving LS system, compute:
+*                                   r = norm((B- A*X)**T * A) /
+*                                 / (norm(A)*norm(B)*max(M,N,NRHS)*EPS)
+*
+                                    RESULT( 6 ) = SQRT17( TRANS, 1, M,
+     $                                             N, NRHS, COPYA, LDA,
+     $                                             B, LDB, COPYB, LDB,
+     $                                             C, WORK, LWORK )
+                                 ELSE
+*
+*                                   Solving overdetermined system
+*
+                                    RESULT( 6 ) = SQRT14( TRANS, M, N,
+     $                                             NRHS, COPYA, LDA,
+     $                                             B, LDB, WORK, LWORK )
+                                 END IF
+*
+*                                Print information about the tests that
+*                                did not pass the threshold.
+*
+                                 DO K = 5, 6
+                                    IF( RESULT( K ).GE.THRESH ) THEN
+                                       IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
+     $                                    CALL ALAHD( NOUT, PATH )
+                                       WRITE( NOUT, FMT = 9997 ) TRANS,
+     $                                    M, N, NRHS, MB, NB, ITYPE,
+     $                                    K, RESULT( K )
+                                       NFAIL = NFAIL + 1
+                                    END IF
+                                 END DO
+                                 NRUN = NRUN + 2
+                              END DO
+                           END DO
+                        END DO
+                     END IF
+*                 =====================================================
+*                       End test SGETSLS
+*                 =====================================================
 *
 *                    Generate a matrix of scaling type ISCALE and rank
 *                    type IRANK.
@@ -662,37 +824,37 @@ SUBROUTINE SDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                                  N, NRHS, -1, NB, ITYPE, NFAIL,
      $                                  NERRS, NOUT )
 *
-*                       Test 3:  Compute relative error in svd
+*                       Test 7:  Compute relative error in svd
 *                                workspace: M*N + 4*MIN(M,N) + MAX(M,N)
 *
-                        RESULT( 3 ) = SQRT12( CRANK, CRANK, A, LDA,
+                        RESULT( 7 ) = SQRT12( CRANK, CRANK, A, LDA,
      $                                COPYS, WORK, LWORK )
 *
-*                       Test 4:  Compute error in solution
+*                       Test 8:  Compute error in solution
 *                                workspace:  M*NRHS + M
 *
                         CALL SLACPY( 'Full', M, NRHS, COPYB, LDB, WORK,
      $                               LDWORK )
                         CALL SQRT16( 'No transpose', M, N, NRHS, COPYA,
      $                               LDA, B, LDB, WORK, LDWORK,
-     $                               WORK( M*NRHS+1 ), RESULT( 4 ) )
+     $                               WORK( M*NRHS+1 ), RESULT( 8 ) )
 *
-*                       Test 5:  Check norm of r'*A
+*                       Test 9:  Check norm of r'*A
 *                                workspace: NRHS*(M+N)
 *
-                        RESULT( 5 ) = ZERO
+                        RESULT( 9 ) = ZERO
                         IF( M.GT.CRANK )
-     $                     RESULT( 5 ) = SQRT17( 'No transpose', 1, M,
+     $                     RESULT( 9 ) = SQRT17( 'No transpose', 1, M,
      $                                   N, NRHS, COPYA, LDA, B, LDB,
      $                                   COPYB, LDB, C, WORK, LWORK )
 *
-*                       Test 6:  Check if x is in the rowspace of A
+*                       Test 10:  Check if x is in the rowspace of A
 *                                workspace: (M+NRHS)*(N+2)
 *
-                        RESULT( 6 ) = ZERO
+                        RESULT( 10 ) = ZERO
 *
                         IF( N.GT.CRANK )
-     $                     RESULT( 6 ) = SQRT14( 'No transpose', M, N,
+     $                     RESULT( 10 ) = SQRT14( 'No transpose', M, N,
      $                                   NRHS, COPYA, LDA, B, LDB,
      $                                   WORK, LWORK )
 *
@@ -716,38 +878,38 @@ SUBROUTINE SDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *                       workspace used: 3*min(m,n) +
 *                                       max(2*min(m,n),nrhs,max(m,n))
 *
-*                       Test 7:  Compute relative error in svd
+*                       Test 11:  Compute relative error in svd
 *
                         IF( RANK.GT.0 ) THEN
                            CALL SAXPY( MNMIN, -ONE, COPYS, 1, S, 1 )
-                           RESULT( 7 ) = SASUM( MNMIN, S, 1 ) /
+                           RESULT( 11 ) = SASUM( MNMIN, S, 1 ) /
      $                                   SASUM( MNMIN, COPYS, 1 ) /
      $                                   ( EPS*REAL( MNMIN ) )
                         ELSE
-                           RESULT( 7 ) = ZERO
+                           RESULT( 11 ) = ZERO
                         END IF
 *
-*                       Test 8:  Compute error in solution
+*                       Test 12:  Compute error in solution
 *
                         CALL SLACPY( 'Full', M, NRHS, COPYB, LDB, WORK,
      $                               LDWORK )
                         CALL SQRT16( 'No transpose', M, N, NRHS, COPYA,
      $                               LDA, B, LDB, WORK, LDWORK,
-     $                               WORK( M*NRHS+1 ), RESULT( 8 ) )
+     $                               WORK( M*NRHS+1 ), RESULT( 12 ) )
 *
-*                       Test 9:  Check norm of r'*A
+*                       Test 13:  Check norm of r'*A
 *
-                        RESULT( 9 ) = ZERO
+                        RESULT( 13 ) = ZERO
                         IF( M.GT.CRANK )
-     $                     RESULT( 9 ) = SQRT17( 'No transpose', 1, M,
+     $                     RESULT( 13 ) = SQRT17( 'No transpose', 1, M,
      $                                   N, NRHS, COPYA, LDA, B, LDB,
      $                                   COPYB, LDB, C, WORK, LWORK )
 *
-*                       Test 10:  Check if x is in the rowspace of A
+*                       Test 14:  Check if x is in the rowspace of A
 *
-                        RESULT( 10 ) = ZERO
+                        RESULT( 14 ) = ZERO
                         IF( N.GT.CRANK )
-     $                     RESULT( 10 ) = SQRT14( 'No transpose', M, N,
+     $                     RESULT( 14 ) = SQRT14( 'No transpose', M, N,
      $                                    NRHS, COPYA, LDA, B, LDB,
      $                                    WORK, LWORK )
 *
@@ -776,45 +938,45 @@ SUBROUTINE SDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                                  N, NRHS, -1, NB, ITYPE, NFAIL,
      $                                  NERRS, NOUT )
 *
-*                       Test 11:  Compute relative error in svd
+*                       Test 15:  Compute relative error in svd
 *
                         IF( RANK.GT.0 ) THEN
                            CALL SAXPY( MNMIN, -ONE, COPYS, 1, S, 1 )
-                           RESULT( 11 ) = SASUM( MNMIN, S, 1 ) /
+                           RESULT( 15 ) = SASUM( MNMIN, S, 1 ) /
      $                                    SASUM( MNMIN, COPYS, 1 ) /
      $                                    ( EPS*REAL( MNMIN ) )
                         ELSE
-                           RESULT( 11 ) = ZERO
+                           RESULT( 15 ) = ZERO
                         END IF
 *
-*                       Test 12:  Compute error in solution
+*                       Test 16:  Compute error in solution
 *
                         CALL SLACPY( 'Full', M, NRHS, COPYB, LDB, WORK,
      $                               LDWORK )
                         CALL SQRT16( 'No transpose', M, N, NRHS, COPYA,
      $                               LDA, B, LDB, WORK, LDWORK,
-     $                               WORK( M*NRHS+1 ), RESULT( 12 ) )
+     $                               WORK( M*NRHS+1 ), RESULT( 16 ) )
 *
-*                       Test 13:  Check norm of r'*A
+*                       Test 17:  Check norm of r'*A
 *
-                        RESULT( 13 ) = ZERO
+                        RESULT( 17 ) = ZERO
                         IF( M.GT.CRANK )
-     $                     RESULT( 13 ) = SQRT17( 'No transpose', 1, M,
+     $                     RESULT( 17 ) = SQRT17( 'No transpose', 1, M,
      $                                    N, NRHS, COPYA, LDA, B, LDB,
      $                                    COPYB, LDB, C, WORK, LWORK )
 *
-*                       Test 14:  Check if x is in the rowspace of A
+*                       Test 18:  Check if x is in the rowspace of A
 *
-                        RESULT( 14 ) = ZERO
+                        RESULT( 18 ) = ZERO
                         IF( N.GT.CRANK )
-     $                     RESULT( 14 ) = SQRT14( 'No transpose', M, N,
+     $                     RESULT( 18 ) = SQRT14( 'No transpose', M, N,
      $                                    NRHS, COPYA, LDA, B, LDB,
      $                                    WORK, LWORK )
 *
 *                       Print information about the tests that did not
 *                       pass the threshold.
 *
-                        DO 90 K = 3, 14
+                        DO 90 K = 7, 18
                            IF( RESULT( K ).GE.THRESH ) THEN
                               IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
      $                           CALL ALAHD( NOUT, PATH )
diff --git a/TESTING/LIN/sdrvpb.f b/TESTING/LIN/sdrvpb.f
index e3e9ea3737..4b16f4a114 100644
--- a/TESTING/LIN/sdrvpb.f
+++ b/TESTING/LIN/sdrvpb.f
@@ -161,6 +161,7 @@
       SUBROUTINE SDRVPB( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvpo.f b/TESTING/LIN/sdrvpo.f
index 5ac638b0b6..b334be09be 100644
--- a/TESTING/LIN/sdrvpo.f
+++ b/TESTING/LIN/sdrvpo.f
@@ -161,6 +161,7 @@
       SUBROUTINE SDRVPO( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvpox.f b/TESTING/LIN/sdrvpox.f
index ae3cf9bee9..29b5cf7794 100644
--- a/TESTING/LIN/sdrvpox.f
+++ b/TESTING/LIN/sdrvpox.f
@@ -164,6 +164,7 @@
       SUBROUTINE SDRVPO( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvpp.f b/TESTING/LIN/sdrvpp.f
index bfabe72b72..b800074c40 100644
--- a/TESTING/LIN/sdrvpp.f
+++ b/TESTING/LIN/sdrvpp.f
@@ -164,6 +164,7 @@
       SUBROUTINE SDRVPP( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvpt.f b/TESTING/LIN/sdrvpt.f
index 00754141b9..de44011a06 100644
--- a/TESTING/LIN/sdrvpt.f
+++ b/TESTING/LIN/sdrvpt.f
@@ -137,6 +137,7 @@
 *  =====================================================================
       SUBROUTINE SDRVPT( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, D,
      $                   E, B, X, XACT, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvrf1.f b/TESTING/LIN/sdrvrf1.f
index 1567b2762e..17843ad800 100644
--- a/TESTING/LIN/sdrvrf1.f
+++ b/TESTING/LIN/sdrvrf1.f
@@ -91,6 +91,7 @@
 *
 *  =====================================================================
       SUBROUTINE SDRVRF1( NOUT, NN, NVAL, THRESH, A, LDA, ARF, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvrf2.f b/TESTING/LIN/sdrvrf2.f
index 1d2c85edb4..3105a6681e 100644
--- a/TESTING/LIN/sdrvrf2.f
+++ b/TESTING/LIN/sdrvrf2.f
@@ -86,6 +86,7 @@
 *
 *  =====================================================================
       SUBROUTINE SDRVRF2( NOUT, NN, NVAL, A, LDA, ARF, AP, ASAV  )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvrf3.f b/TESTING/LIN/sdrvrf3.f
index 5faae27337..80364e3192 100644
--- a/TESTING/LIN/sdrvrf3.f
+++ b/TESTING/LIN/sdrvrf3.f
@@ -115,6 +115,7 @@
 *  =====================================================================
       SUBROUTINE SDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
      +                    S_WORK_SLANGE, S_WORK_SGEQRF, TAU )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -153,8 +154,9 @@ SUBROUTINE SDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
       REAL               RESULT( NTESTS )
 *     ..
 *     .. External Functions ..
+      LOGICAL            LSAME
       REAL               SLAMCH, SLANGE, SLARND
-      EXTERNAL           SLAMCH, SLANGE, SLARND
+      EXTERNAL           SLAMCH, SLANGE, SLARND, LSAME
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           STRTTF, SGEQRF, SGEQLF, STFSM, STRSM
@@ -218,9 +220,9 @@ SUBROUTINE SDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *
                            DO 100 IALPHA = 1, 3
 *
-                              IF ( IALPHA.EQ. 1) THEN
+                              IF ( IALPHA.EQ.1 ) THEN
                                  ALPHA = ZERO
-                              ELSE IF ( IALPHA.EQ. 2) THEN
+                              ELSE IF ( IALPHA.EQ.2 ) THEN
                                  ALPHA = ONE
                               ELSE
                                  ALPHA = SLARND( 2, ISEED )
@@ -259,7 +261,7 @@ SUBROUTINE SDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *
                               DO J = 1, NA
                                  DO I = 1, NA
-                                    A( I, J) = SLARND( 2, ISEED )
+                                    A( I, J ) = SLARND( 2, ISEED )
                                  END DO
                               END DO
 *
@@ -272,6 +274,20 @@ SUBROUTINE SDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
                                  CALL SGEQRF( NA, NA, A, LDA, TAU,
      +                                        S_WORK_SGEQRF, LDA,
      +                                        INFO )
+*
+*                                Forcing main diagonal of test matrix to
+*                                be unit makes it ill-conditioned for
+*                                some test cases
+*
+                                 IF ( LSAME( DIAG, 'U' ) ) THEN
+                                    DO J = 1, NA
+                                       DO I = 1, J
+                                          A( I, J ) = A( I, J ) /
+     +                                            ( 2.0 * A( J, J ) )
+                                       END DO
+                                    END DO
+                                 END IF
+*
                               ELSE
 *
 *                                The case IUPLO.EQ.2 is when SIDE.EQ.'L'
@@ -281,6 +297,20 @@ SUBROUTINE SDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
                                  CALL SGELQF( NA, NA, A, LDA, TAU,
      +                                        S_WORK_SGEQRF, LDA,
      +                                        INFO )
+*
+*                                Forcing main diagonal of test matrix to
+*                                be unit makes it ill-conditioned for
+*                                some test cases
+*
+                                 IF ( LSAME( DIAG, 'U' ) ) THEN
+                                    DO I = 1, NA
+                                       DO J = 1, I
+                                          A( I, J ) = A( I, J ) /
+     +                                            ( 2.0 * A( I, I ) )
+                                       END DO
+                                    END DO
+                                 END IF
+*
                               END IF
 *
 *                             Store a copy of A in RFP format (in ARF).
@@ -294,8 +324,8 @@ SUBROUTINE SDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *
                               DO J = 1, N
                                  DO I = 1, M
-                                    B1( I, J) = SLARND( 2, ISEED )
-                                    B2( I, J) = B1( I, J)
+                                    B1( I, J ) = SLARND( 2, ISEED )
+                                    B2( I, J ) = B1( I, J )
                                  END DO
                               END DO
 *
@@ -318,24 +348,24 @@ SUBROUTINE SDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *
                               DO J = 1, N
                                  DO I = 1, M
-                                    B1( I, J) = B2( I, J ) - B1( I, J )
+                                    B1( I, J ) = B2( I, J ) - B1( I, J )
                                  END DO
                               END DO
 *
-                              RESULT(1) = SLANGE( 'I', M, N, B1, LDA,
+                              RESULT( 1 ) = SLANGE( 'I', M, N, B1, LDA,
      +                                            S_WORK_SLANGE )
 *
-                              RESULT(1) = RESULT(1) / SQRT( EPS )
-     +                                    / MAX ( MAX( M, N), 1 )
+                              RESULT( 1 ) = RESULT( 1 ) / SQRT( EPS )
+     +                                    / MAX ( MAX( M, N ), 1 )
 *
-                              IF( RESULT(1).GE.THRESH ) THEN
+                              IF( RESULT( 1 ).GE.THRESH ) THEN
                                  IF( NFAIL.EQ.0 ) THEN
                                     WRITE( NOUT, * )
                                     WRITE( NOUT, FMT = 9999 )
                                  END IF
                                  WRITE( NOUT, FMT = 9997 ) 'STFSM',
      +                              CFORM, SIDE, UPLO, TRANS, DIAG, M,
-     +                              N, RESULT(1)
+     +                              N, RESULT( 1 )
                                  NFAIL = NFAIL + 1
                               END IF
 *
diff --git a/TESTING/LIN/sdrvrf4.f b/TESTING/LIN/sdrvrf4.f
index e4d08ccbb3..b08d5c7d08 100644
--- a/TESTING/LIN/sdrvrf4.f
+++ b/TESTING/LIN/sdrvrf4.f
@@ -115,6 +115,7 @@
 *  =====================================================================
       SUBROUTINE SDRVRF4( NOUT, NN, NVAL, THRESH, C1, C2, LDC, CRF, A,
      +                    LDA, S_WORK_SLANGE )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvrfp.f b/TESTING/LIN/sdrvrfp.f
index fbbf8bc88f..1f1e1f0824 100644
--- a/TESTING/LIN/sdrvrfp.f
+++ b/TESTING/LIN/sdrvrfp.f
@@ -235,6 +235,7 @@ SUBROUTINE SDRVRFP( NOUT, NN, NVAL, NNS, NSVAL, NNT, NTVAL,
      +              S_WORK_SLATMS, S_WORK_SPOT01, S_TEMP_SPOT02,
      +              S_TEMP_SPOT03, S_WORK_SLANSY,
      +              S_WORK_SPOT02, S_WORK_SPOT03 )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvsp.f b/TESTING/LIN/sdrvsp.f
index 077f041353..b328f433ab 100644
--- a/TESTING/LIN/sdrvsp.f
+++ b/TESTING/LIN/sdrvsp.f
@@ -153,6 +153,7 @@
       SUBROUTINE SDRVSP( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvsy.f b/TESTING/LIN/sdrvsy.f
index 509522c425..1f12acbe15 100644
--- a/TESTING/LIN/sdrvsy.f
+++ b/TESTING/LIN/sdrvsy.f
@@ -149,6 +149,7 @@
       SUBROUTINE SDRVSY( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvsy_aa.f b/TESTING/LIN/sdrvsy_aa.f
index ff0c3ab8de..e53db7309e 100644
--- a/TESTING/LIN/sdrvsy_aa.f
+++ b/TESTING/LIN/sdrvsy_aa.f
@@ -149,6 +149,7 @@
       SUBROUTINE SDRVSY_AA( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                      NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                      RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvsy_aa_2stage.f b/TESTING/LIN/sdrvsy_aa_2stage.f
index aff32bce93..25e7fe0eca 100644
--- a/TESTING/LIN/sdrvsy_aa_2stage.f
+++ b/TESTING/LIN/sdrvsy_aa_2stage.f
@@ -152,6 +152,7 @@ SUBROUTINE SDRVSY_AA_2STAGE(
      $                         DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                         NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                         RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -400,9 +401,9 @@ SUBROUTINE SDRVSY_AA_2STAGE(
 *                    Factor the matrix and solve the system using SSYSV_AA.
 *
                      SRNAMT = 'SSYSV_AA_2STAGE '
-                     LWORK = MIN(N*NB, 3*NMAX*NMAX)
+                     LWORK = MIN( MAX( 1, N*NB ), 3*NMAX*NMAX )
                      CALL SSYSV_AA_2STAGE( UPLO, N, NRHS, AFAC, LDA,
-     $                                 AINV, (3*NB+1)*N, 
+     $                                 AINV, MAX( 1, (3*NB+1)*N ),
      $                                 IWORK, IWORK( 1+N ),
      $                                 X, LDA, WORK, LWORK, INFO )
 *
diff --git a/TESTING/LIN/sdrvsy_rk.f b/TESTING/LIN/sdrvsy_rk.f
index 6018126f69..776e644cfc 100644
--- a/TESTING/LIN/sdrvsy_rk.f
+++ b/TESTING/LIN/sdrvsy_rk.f
@@ -153,6 +153,7 @@
       SUBROUTINE SDRVSY_RK( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                      NMAX, A, AFAC, E, AINV, B, X, XACT, WORK,
      $                      RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvsy_rook.f b/TESTING/LIN/sdrvsy_rook.f
index eebfea59b0..4ab67a81bd 100644
--- a/TESTING/LIN/sdrvsy_rook.f
+++ b/TESTING/LIN/sdrvsy_rook.f
@@ -150,6 +150,7 @@
       SUBROUTINE SDRVSY_ROOK( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                        NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                        RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sdrvsyx.f b/TESTING/LIN/sdrvsyx.f
index 26f300548f..6a33067122 100644
--- a/TESTING/LIN/sdrvsyx.f
+++ b/TESTING/LIN/sdrvsyx.f
@@ -153,6 +153,7 @@
       SUBROUTINE SDRVSY( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/serrge.f b/TESTING/LIN/serrge.f
index 7ac5c926b3..d8b9fcc8be 100644
--- a/TESTING/LIN/serrge.f
+++ b/TESTING/LIN/serrge.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRGE( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/serrgex.f b/TESTING/LIN/serrgex.f
index b6da20b5e0..2f080d4a1c 100644
--- a/TESTING/LIN/serrgex.f
+++ b/TESTING/LIN/serrgex.f
@@ -55,6 +55,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRGE( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/serrgt.f b/TESTING/LIN/serrgt.f
index 431e8bbd94..0c64f6fc22 100644
--- a/TESTING/LIN/serrgt.f
+++ b/TESTING/LIN/serrgt.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRGT( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/serrlq.f b/TESTING/LIN/serrlq.f
index 5bb0fe2012..af27cafaf9 100644
--- a/TESTING/LIN/serrlq.f
+++ b/TESTING/LIN/serrlq.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRLQ( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -76,7 +77,7 @@ SUBROUTINE SERRLQ( PATH, NUNIT )
      $                   W( NMAX ), X( NMAX )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAESM, CHKXER, SGELQ2, SGELQF, SGELQS, SORGL2,
+      EXTERNAL           ALAESM, CHKXER, SGELQ2, SGELQF, SORGL2,
      $                   SORGLQ, SORML2, SORMLQ
 *     ..
 *     .. Scalars in Common ..
@@ -140,31 +141,6 @@ SUBROUTINE SERRLQ( PATH, NUNIT )
       CALL SGELQ2( 2, 1, A, 1, B, W, INFO )
       CALL CHKXER( 'SGELQ2', INFOT, NOUT, LERR, OK )
 *
-*     SGELQS
-*
-      SRNAMT = 'SGELQS'
-      INFOT = 1
-      CALL SGELQS( -1, 0, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'SGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 2
-      CALL SGELQS( 0, -1, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'SGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 2
-      CALL SGELQS( 2, 1, 0, A, 2, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'SGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 3
-      CALL SGELQS( 0, 0, -1, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'SGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 5
-      CALL SGELQS( 2, 2, 0, A, 1, X, B, 2, W, 1, INFO )
-      CALL CHKXER( 'SGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 8
-      CALL SGELQS( 1, 2, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'SGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 10
-      CALL SGELQS( 1, 1, 2, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'SGELQS', INFOT, NOUT, LERR, OK )
-*
 *     SORGLQ
 *
       SRNAMT = 'SORGLQ'
diff --git a/TESTING/LIN/serrlqt.f b/TESTING/LIN/serrlqt.f
index 2a5f9eee26..fe52f88393 100644
--- a/TESTING/LIN/serrlqt.f
+++ b/TESTING/LIN/serrlqt.f
@@ -101,11 +101,11 @@ SUBROUTINE SERRLQT( PATH, NUNIT )
 *
       DO J = 1, NMAX
          DO I = 1, NMAX
-            A( I, J ) = 1.D0 / REAL( I+J )
-            C( I, J ) = 1.D0 / REAL( I+J )
-            T( I, J ) = 1.D0 / REAL( I+J )
+            A( I, J ) = 1. / REAL( I+J )
+            C( I, J ) = 1. / REAL( I+J )
+            T( I, J ) = 1. / REAL( I+J )
          END DO
-         W( J ) = 0.D0
+         W( J ) = 0.
       END DO
       OK = .TRUE.
 *
diff --git a/TESTING/LIN/serrlqtp.f b/TESTING/LIN/serrlqtp.f
index e06f23f532..1a94853e2f 100644
--- a/TESTING/LIN/serrlqtp.f
+++ b/TESTING/LIN/serrlqtp.f
@@ -101,11 +101,11 @@ SUBROUTINE SERRLQTP( PATH, NUNIT )
 *
       DO J = 1, NMAX
          DO I = 1, NMAX
-            A( I, J ) = 1.D0 / REAL( I+J )
-            C( I, J ) = 1.D0 / REAL( I+J )
-            T( I, J ) = 1.D0 / REAL( I+J )
+            A( I, J ) = 1. / REAL( I+J )
+            C( I, J ) = 1. / REAL( I+J )
+            T( I, J ) = 1. / REAL( I+J )
          END DO
-         W( J ) = 0.0
+         W( J ) = 0.
       END DO
       OK = .TRUE.
 *
diff --git a/TESTING/LIN/serrls.f b/TESTING/LIN/serrls.f
index e6ee4360f9..e4c0bfe7fa 100644
--- a/TESTING/LIN/serrls.f
+++ b/TESTING/LIN/serrls.f
@@ -22,7 +22,7 @@
 *> \verbatim
 *>
 *> SERRLS tests the error exits for the REAL least squares
-*> driver routines (SGELS, SGELSS, SGELSY, SGELSD).
+*> driver routines (SGELS, SGELST, SGETSLS, SGELSS, SGELSY, SGELSD).
 *> \endverbatim
 *
 *  Arguments:
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRLS( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -83,7 +84,8 @@ SUBROUTINE SERRLS( PATH, NUNIT )
       EXTERNAL           LSAMEN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAESM, CHKXER, SGELS, SGELSD, SGELSS, SGELSY
+      EXTERNAL           ALAESM, CHKXER, SGELS, SGELSD, SGELSS, SGELST,
+     $                   SGELSY, SGETSLS
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -130,10 +132,66 @@ SUBROUTINE SERRLS( PATH, NUNIT )
          INFOT = 8
          CALL SGELS( 'N', 2, 0, 0, A, 2, B, 1, W, 2, INFO )
          CALL CHKXER( 'SGELS ', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL SGELS( 'N', 0, 2, 0, A, 1, B, 1, W, 2, INFO )
+         CALL CHKXER( 'DGELS', INFOT, NOUT, LERR, OK )
          INFOT = 10
          CALL SGELS( 'N', 1, 1, 0, A, 1, B, 1, W, 1, INFO )
          CALL CHKXER( 'SGELS ', INFOT, NOUT, LERR, OK )
 *
+*        SGELST
+*
+         SRNAMT = 'SGELST'
+         INFOT = 1
+         CALL SGELST( '/', 0, 0, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'SGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL SGELST( 'N', -1, 0, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'SGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL SGELST( 'N', 0, -1, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'SGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL SGELST( 'N', 0, 0, -1, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'SGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 6
+         CALL SGELST( 'N', 2, 0, 0, A, 1, B, 2, W, 2, INFO )
+         CALL CHKXER( 'SGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL SGELST( 'N', 2, 0, 0, A, 2, B, 1, W, 2, INFO )
+         CALL CHKXER( 'SGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL SGELST( 'N', 0, 2, 0, A, 1, B, 1, W, 2, INFO )
+         CALL CHKXER( 'SGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL SGELST( 'N', 1, 1, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'SGELST', INFOT, NOUT, LERR, OK )
+*
+*        SGETSLS
+*
+         SRNAMT = 'SGETSLS'
+         INFOT = 1
+         CALL SGETSLS( '/', 0, 0, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'SGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL SGETSLS( 'N', -1, 0, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'SGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL SGETSLS( 'N', 0, -1, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'SGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL SGETSLS( 'N', 0, 0, -1, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'SGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 6
+         CALL SGETSLS( 'N', 2, 0, 0, A, 1, B, 2, W, 2, INFO )
+         CALL CHKXER( 'SGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL SGETSLS( 'N', 2, 0, 0, A, 2, B, 1, W, 2, INFO )
+         CALL CHKXER( 'SGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL SGETSLS( 'N', 0, 2, 0, A, 1, B, 1, W, 2, INFO )
+         CALL CHKXER( 'SGETSLS', INFOT, NOUT, LERR, OK )
+*
 *        SGELSS
 *
          SRNAMT = 'SGELSS'
diff --git a/TESTING/LIN/serrorhr_col.f b/TESTING/LIN/serrorhr_col.f
index 3b222273cc..db4fbaa90e 100644
--- a/TESTING/LIN/serrorhr_col.f
+++ b/TESTING/LIN/serrorhr_col.f
@@ -49,7 +49,7 @@
 *> \author Univ. of Colorado Denver
 *> \author NAG Ltd.
 *
-*> \ingroup singlr_lin
+*> \ingroup single_lin
 *
 *  =====================================================================
       SUBROUTINE SERRORHR_COL( PATH, NUNIT )
diff --git a/TESTING/LIN/serrpo.f b/TESTING/LIN/serrpo.f
index 4c07c8f875..ecd00071a8 100644
--- a/TESTING/LIN/serrpo.f
+++ b/TESTING/LIN/serrpo.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRPO( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/serrpox.f b/TESTING/LIN/serrpox.f
index 6e81bf6706..c2add9cf89 100644
--- a/TESTING/LIN/serrpox.f
+++ b/TESTING/LIN/serrpox.f
@@ -55,6 +55,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRPO( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/serrps.f b/TESTING/LIN/serrps.f
index 669028b815..50c3ea6717 100644
--- a/TESTING/LIN/serrps.f
+++ b/TESTING/LIN/serrps.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRPS( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/serrql.f b/TESTING/LIN/serrql.f
index e714aa076b..edc8e88abc 100644
--- a/TESTING/LIN/serrql.f
+++ b/TESTING/LIN/serrql.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRQL( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/serrqp.f b/TESTING/LIN/serrqp.f
index 952c5ff4e3..c17b270138 100644
--- a/TESTING/LIN/serrqp.f
+++ b/TESTING/LIN/serrqp.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRQP( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/serrqr.f b/TESTING/LIN/serrqr.f
index 1ad40b7aa2..d6e7e73aef 100644
--- a/TESTING/LIN/serrqr.f
+++ b/TESTING/LIN/serrqr.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRQR( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -77,7 +78,7 @@ SUBROUTINE SERRQR( PATH, NUNIT )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALAESM, CHKXER, SGEQR2, SGEQR2P, SGEQRF,
-     $                   SGEQRFP, SGEQRS, SORG2R, SORGQR, SORM2R,
+     $                   SGEQRFP, SORG2R, SORGQR, SORM2R,
      $                   SORMQR
 *     ..
 *     .. Scalars in Common ..
@@ -170,31 +171,6 @@ SUBROUTINE SERRQR( PATH, NUNIT )
       CALL SGEQR2P( 2, 1, A, 1, B, W, INFO )
       CALL CHKXER( 'SGEQR2P', INFOT, NOUT, LERR, OK )
 *
-*     SGEQRS
-*
-      SRNAMT = 'SGEQRS'
-      INFOT = 1
-      CALL SGEQRS( -1, 0, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'SGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 2
-      CALL SGEQRS( 0, -1, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'SGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 2
-      CALL SGEQRS( 1, 2, 0, A, 2, X, B, 2, W, 1, INFO )
-      CALL CHKXER( 'SGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 3
-      CALL SGEQRS( 0, 0, -1, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'SGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 5
-      CALL SGEQRS( 2, 1, 0, A, 1, X, B, 2, W, 1, INFO )
-      CALL CHKXER( 'SGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 8
-      CALL SGEQRS( 2, 1, 0, A, 2, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'SGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 10
-      CALL SGEQRS( 1, 1, 2, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'SGEQRS', INFOT, NOUT, LERR, OK )
-*
 *     SORGQR
 *
       SRNAMT = 'SORGQR'
diff --git a/TESTING/LIN/serrrfp.f b/TESTING/LIN/serrrfp.f
index 2c7ee8ed64..8bb637b900 100644
--- a/TESTING/LIN/serrrfp.f
+++ b/TESTING/LIN/serrrfp.f
@@ -49,6 +49,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRRFP( NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/serrrq.f b/TESTING/LIN/serrrq.f
index d8d9ea62b2..8b08abe9cd 100644
--- a/TESTING/LIN/serrrq.f
+++ b/TESTING/LIN/serrrq.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRRQ( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/serrsy.f b/TESTING/LIN/serrsy.f
index c562b417b2..f9fac035c0 100644
--- a/TESTING/LIN/serrsy.f
+++ b/TESTING/LIN/serrsy.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRSY( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -133,7 +134,7 @@ SUBROUTINE SERRSY( PATH, NUNIT )
       IF( LSAMEN( 2, C2, 'SY' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a symmetric indefinite matrix with patrial
+*        of a symmetric indefinite matrix with partial
 *        (Bunch-Kaufman) pivoting.
 *
 *        SSYTRF
@@ -581,7 +582,7 @@ SUBROUTINE SERRSY( PATH, NUNIT )
       ELSE IF( LSAMEN( 2, C2, 'SP' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a symmetric indefinite packed matrix with patrial
+*        of a symmetric indefinite packed matrix with partial
 *        (Bunch-Kaufman) pivoting.
 *
 *        SSPTRF
diff --git a/TESTING/LIN/serrsyx.f b/TESTING/LIN/serrsyx.f
index ed47c37bd9..a83eed294d 100644
--- a/TESTING/LIN/serrsyx.f
+++ b/TESTING/LIN/serrsyx.f
@@ -55,6 +55,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRSY( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -137,7 +138,7 @@ SUBROUTINE SERRSY( PATH, NUNIT )
       IF( LSAMEN( 2, C2, 'SY' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a symmetric indefinite matrix with patrial
+*        of a symmetric indefinite matrix with partial
 *        (Bunch-Kaufman) pivoting.
 *
 *        SSYTRF
@@ -527,7 +528,7 @@ SUBROUTINE SERRSY( PATH, NUNIT )
       ELSE IF( LSAMEN( 2, C2, 'SP' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a symmetric indefinite packed matrix with patrial
+*        of a symmetric indefinite packed matrix with partial
 *        (Bunch-Kaufman) pivoting.
 *
 *        SSPTRF
diff --git a/TESTING/LIN/serrtr.f b/TESTING/LIN/serrtr.f
index f0d0a0ef21..73c072e6f3 100644
--- a/TESTING/LIN/serrtr.f
+++ b/TESTING/LIN/serrtr.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRTR( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -71,7 +72,7 @@ SUBROUTINE SERRTR( PATH, NUNIT )
 *     .. Local Scalars ..
       CHARACTER*2        C2
       INTEGER            INFO
-      REAL               RCOND, SCALE
+      REAL               RCOND, SCALE, SCALES(0)
 *     ..
 *     .. Local Arrays ..
       INTEGER            IW( NMAX )
@@ -83,9 +84,10 @@ SUBROUTINE SERRTR( PATH, NUNIT )
       EXTERNAL           LSAMEN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAESM, CHKXER, SLATBS, SLATPS, SLATRS, STBCON,
-     $                   STBRFS, STBTRS, STPCON, STPRFS, STPTRI, STPTRS,
-     $                   STRCON, STRRFS, STRTI2, STRTRI, STRTRS
+      EXTERNAL           ALAESM, CHKXER, SLATBS, SLATPS, SLATRS,
+     $                   SLATRS3, STBCON, STBRFS, STBTRS, STPCON,
+     $                   STPRFS, STPTRI, STPTRS, STRCON, STRRFS, STRTI2,
+     $                   STRTRI, STRTRS
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -244,6 +246,46 @@ SUBROUTINE SERRTR( PATH, NUNIT )
          INFOT = 7
          CALL SLATRS( 'U', 'N', 'N', 'N', 2, A, 1, X, SCALE, W, INFO )
          CALL CHKXER( 'SLATRS', INFOT, NOUT, LERR, OK )
+*
+*        SLATRS3
+*
+         SRNAMT = 'SLATRS3'
+         INFOT = 1
+         CALL SLATRS3( '/', 'N', 'N', 'N', 0, 0, A, 1, X, 1, SCALES,
+     $                 W, W( 2 ), 1, INFO )
+         CALL CHKXER( 'SLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL SLATRS3( 'U', '/', 'N', 'N', 0, 0, A, 1, X, 1, SCALES,
+     $                 W, W( 2 ), 1, INFO )
+         CALL CHKXER( 'SLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL SLATRS3( 'U', 'N', '/', 'N', 0, 0, A, 1, X, 1, SCALES,
+     $                 W, W( 2 ), 1, INFO )
+         CALL CHKXER( 'SLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL SLATRS3( 'U', 'N', 'N', '/', 0, 0, A, 1, X, 1, SCALES,
+     $                 W, W( 2 ), 1, INFO )
+         CALL CHKXER( 'SLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL SLATRS3( 'U', 'N', 'N', 'N', -1, 0, A, 1, X, 1, SCALES,
+     $                 W, W( 2 ), 1, INFO )
+         CALL CHKXER( 'SLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 6
+         CALL SLATRS3( 'U', 'N', 'N', 'N', 0, -1, A, 1, X, 1, SCALES,
+     $                 W, W( 2 ), 1, INFO )
+         CALL CHKXER( 'SLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL SLATRS3( 'U', 'N', 'N', 'N', 2, 0, A, 1, X, 1, SCALES,
+     $                 W, W( 2 ), 1, INFO )
+         CALL CHKXER( 'SLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL SLATRS3( 'U', 'N', 'N', 'N', 2, 0, A, 2, X, 1, SCALES,
+     $                 W, W( 2 ), 1, INFO )
+         CALL CHKXER( 'SLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 14
+         CALL SLATRS3( 'U', 'N', 'N', 'N', 1, 0, A, 1, X, 1, SCALES,
+     $                 W, W( 2 ), 0, INFO )
+         CALL CHKXER( 'SLATRS3', INFOT, NOUT, LERR, OK )
 *
       ELSE IF( LSAMEN( 2, C2, 'TP' ) ) THEN
 *
diff --git a/TESTING/LIN/serrtsqr.f b/TESTING/LIN/serrtsqr.f
index 78dd0c57dd..9f972319e1 100644
--- a/TESTING/LIN/serrtsqr.f
+++ b/TESTING/LIN/serrtsqr.f
@@ -70,7 +70,7 @@ SUBROUTINE SERRTSQR( PATH, NUNIT )
       PARAMETER          ( NMAX = 2 )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I, INFO, J, NB
+      INTEGER            I, INFO, J, MB, NB
 *     ..
 *     .. Local Arrays ..
       REAL               A( NMAX, NMAX ), T( NMAX, NMAX ), W( NMAX ),
@@ -101,11 +101,11 @@ SUBROUTINE SERRTSQR( PATH, NUNIT )
 *
       DO J = 1, NMAX
          DO I = 1, NMAX
-            A( I, J ) = 1.D0 / REAL( I+J )
-            C( I, J ) = 1.D0 / REAL( I+J )
-            T( I, J ) = 1.D0 / REAL( I+J )
+            A( I, J ) = 1. / REAL( I+J )
+            C( I, J ) = 1. / REAL( I+J )
+            T( I, J ) = 1. / REAL( I+J )
          END DO
-         W( J ) = 0.D0
+         W( J ) = 0.
       END DO
       OK = .TRUE.
 *
@@ -130,6 +130,35 @@ SUBROUTINE SERRTSQR( PATH, NUNIT )
       CALL SGEQR( 3, 2, A, 3, TAU, 7, W, 0, INFO )
       CALL CHKXER( 'SGEQR', INFOT, NOUT, LERR, OK )
 *
+*     SLATSQR
+*
+      MB = 1
+      NB = 1
+      SRNAMT = 'SLATSQR'
+      INFOT = 1
+      CALL SLATSQR( -1, 0, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'SLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL SLATSQR( 1, 2, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'SLATSQR', INFOT, NOUT, LERR, OK )
+      CALL SLATSQR( 0, -1, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'SLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL SLATSQR( 2, 1, -1, NB, A, 2, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'SLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL SLATSQR( 2, 1, MB, 2, A, 2, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'SLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 6
+      CALL SLATSQR( 2, 1, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'SLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL SLATSQR( 2, 1, MB, NB, A, 2, TAU, 0, W, 1, INFO )
+      CALL CHKXER( 'SLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL SLATSQR( 2, 1, MB, NB, A, 2, TAU, 2, W, 0, INFO )
+      CALL CHKXER( 'SLATSQR', INFOT, NOUT, LERR, OK )
+*
 *     SGEMQR
 *
       TAU(1)=1
@@ -191,6 +220,37 @@ SUBROUTINE SERRTSQR( PATH, NUNIT )
       CALL SGELQ( 2, 3, A, 3, TAU, 7, W, 0, INFO )
       CALL CHKXER( 'SGELQ', INFOT, NOUT, LERR, OK )
 *
+*     SLASWLQ
+*
+      MB = 1
+      NB = 1
+      SRNAMT = 'SLASWLQ'
+      INFOT = 1
+      CALL SLASWLQ( -1, 0, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'SLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL SLASWLQ( 2, 1, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'SLASWLQ', INFOT, NOUT, LERR, OK )
+      CALL SLASWLQ( 0, -1, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'SLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL SLASWLQ( 1, 2, -1, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'SLASWLQ', INFOT, NOUT, LERR, OK )
+      CALL SLASWLQ( 1, 1, 2, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'SLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL SLASWLQ( 1, 2, MB, -1, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'SLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 6
+      CALL SLASWLQ( 1, 2, MB, NB, A, 0, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'SLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL SLASWLQ( 1, 2, MB, NB, A, 1, TAU, 0, W, 1, INFO )
+      CALL CHKXER( 'SLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL SLASWLQ( 1, 2, MB, NB, A, 1, TAU, 1, W, 0, INFO )
+      CALL CHKXER( 'SLASWLQ', INFOT, NOUT, LERR, OK )
+*
 *     SGEMLQ
 *
       TAU(1)=1
diff --git a/TESTING/LIN/serrtz.f b/TESTING/LIN/serrtz.f
index 457f7b743e..49a6da81c8 100644
--- a/TESTING/LIN/serrtz.f
+++ b/TESTING/LIN/serrtz.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRTZ( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/serrvx.f b/TESTING/LIN/serrvx.f
index c3db47332e..6dea06cf07 100644
--- a/TESTING/LIN/serrvx.f
+++ b/TESTING/LIN/serrvx.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRVX( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -582,6 +583,9 @@ SUBROUTINE SERRVX( PATH, NUNIT )
          INFOT = 3
          CALL SSYSV( 'U', 0, -1, A, 1, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'SSYSV ', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL SSYSV( 'U', 2, 0, A, 1, IP, B, 2, W, 1, INFO )
+         CALL CHKXER( 'SSYSV ', INFOT, NOUT, LERR, OK )
          INFOT = 8
          CALL SSYSV( 'U', 2, 0, A, 2, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'SSYSV ', INFOT, NOUT, LERR, OK )
@@ -647,6 +651,9 @@ SUBROUTINE SERRVX( PATH, NUNIT )
          INFOT = 3
          CALL SSYSV_ROOK( 'U', 0, -1, A, 1, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'SSYSV_ROOK', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL SSYSV_ROOK( 'U', 2, 0, A, 1, IP, B, 2, W, 1, INFO )
+         CALL CHKXER( 'SSYSV_ROOK', INFOT, NOUT, LERR, OK )
          INFOT = 8
          CALL SSYSV_ROOK( 'U', 2, 0, A, 2, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'SSYSV_ROOK', INFOT, NOUT, LERR, OK )
@@ -694,7 +701,7 @@ SUBROUTINE SERRVX( PATH, NUNIT )
 *
       ELSE IF( LSAMEN( 2, C2, 'SA' ) ) THEN
 *
-*        SSYSV_AA
+*        SSYSV_AASEN
 *
          SRNAMT = 'SSYSV_AA'
          INFOT = 1
@@ -706,13 +713,19 @@ SUBROUTINE SERRVX( PATH, NUNIT )
          INFOT = 3
          CALL SSYSV_AA( 'U', 0, -1, A, 1, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'SSYSV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL SSYSV_AA( 'U', 2, 0, A, 1, IP, B, 2, W, 1, INFO )
+         CALL CHKXER( 'SSYSV_AA', INFOT, NOUT, LERR, OK )
          INFOT = 8
          CALL SSYSV_AA( 'U', 2, 0, A, 2, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'SSYSV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL SSYSV_AA( 'U', 3, 1, A, 3, IP, B, 3, W, 6, INFO )
+         CALL CHKXER( 'SSYSV_AA', INFOT, NOUT, LERR, OK )
 *
       ELSE IF( LSAMEN( 2, C2, 'S2' ) ) THEN
 *
-*        DSYSV_AASEN_2STAGE
+*        SSYSV_AASEN_2STAGE
 *
          SRNAMT = 'SSYSV_AA_2STAGE'
          INFOT = 1
@@ -729,14 +742,18 @@ SUBROUTINE SERRVX( PATH, NUNIT )
          CALL CHKXER( 'SSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 5
          CALL SSYSV_AA_2STAGE( 'U', 2, 1, A, 1, A, 1, IP, IP, B, 1,
+     $                         W, 1, INFO )
+         CALL CHKXER( 'SSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
+         INFOT = 7
+         CALL SSYSV_AA_2STAGE( 'U', 2, 1, A, 2, A, 1, IP, IP, B, 2,
      $                         W, 1, INFO )
          CALL CHKXER( 'SSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 11
          CALL SSYSV_AA_2STAGE( 'U', 2, 1, A, 2, A, 8, IP, IP, B, 1,
      $                         W, 1, INFO )
          CALL CHKXER( 'SSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
-         INFOT = 7
-         CALL SSYSV_AA_2STAGE( 'U', 2, 1, A, 2, A, 1, IP, IP, B, 2,
+         INFOT = 13
+         CALL SSYSV_AA_2STAGE( 'U', 2, 1, A, 2, A, 8, IP, IP, B, 2,
      $                         W, 1, INFO )
          CALL CHKXER( 'SSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
 *
diff --git a/TESTING/LIN/serrvxx.f b/TESTING/LIN/serrvxx.f
index d48c29a171..2a5480fa6e 100644
--- a/TESTING/LIN/serrvxx.f
+++ b/TESTING/LIN/serrvxx.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE SERRVX( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sgbt01.f b/TESTING/LIN/sgbt01.f
index c5ae6b11a5..bf2676ce0c 100644
--- a/TESTING/LIN/sgbt01.f
+++ b/TESTING/LIN/sgbt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE SGBT01( M, N, KL, KU, A, LDA, AFAC, LDAFAC, IPIV, WORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sgbt02.f b/TESTING/LIN/sgbt02.f
index 3f9fedd6aa..fe1e492ffc 100644
--- a/TESTING/LIN/sgbt02.f
+++ b/TESTING/LIN/sgbt02.f
@@ -146,6 +146,7 @@
 *  =====================================================================
       SUBROUTINE SGBT02( TRANS, M, N, KL, KU, NRHS, A, LDA, X, LDX, B,
      $                   LDB, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sgbt05.f b/TESTING/LIN/sgbt05.f
index bba80b56da..b5068c6256 100644
--- a/TESTING/LIN/sgbt05.f
+++ b/TESTING/LIN/sgbt05.f
@@ -173,6 +173,7 @@
 *  =====================================================================
       SUBROUTINE SGBT05( TRANS, N, KL, KU, NRHS, AB, LDAB, B, LDB, X,
      $                   LDX, XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sgennd.f b/TESTING/LIN/sgennd.f
index a5a420fdb0..f83a91c82b 100644
--- a/TESTING/LIN/sgennd.f
+++ b/TESTING/LIN/sgennd.f
@@ -65,6 +65,7 @@
 *
 *  =====================================================================
       LOGICAL FUNCTION SGENND (M, N, A, LDA)
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sgeqls.f b/TESTING/LIN/sgeqls.f
index 8215b6a5b8..e89fb37b78 100644
--- a/TESTING/LIN/sgeqls.f
+++ b/TESTING/LIN/sgeqls.f
@@ -119,6 +119,7 @@
 *  =====================================================================
       SUBROUTINE SGEQLS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sgerqs.f b/TESTING/LIN/sgerqs.f
index 0c5c693af8..9228a41286 100644
--- a/TESTING/LIN/sgerqs.f
+++ b/TESTING/LIN/sgerqs.f
@@ -119,6 +119,7 @@
 *  =====================================================================
       SUBROUTINE SGERQS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sget01.f b/TESTING/LIN/sget01.f
index a8b013d149..7a760c3098 100644
--- a/TESTING/LIN/sget01.f
+++ b/TESTING/LIN/sget01.f
@@ -104,6 +104,7 @@
 *  =====================================================================
       SUBROUTINE SGET01( M, N, A, LDA, AFAC, LDAFAC, IPIV, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sget02.f b/TESTING/LIN/sget02.f
index 7142a17e98..9c853b625b 100644
--- a/TESTING/LIN/sget02.f
+++ b/TESTING/LIN/sget02.f
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE SGET02( TRANS, M, N, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sget03.f b/TESTING/LIN/sget03.f
index b32f104896..710cd6fc95 100644
--- a/TESTING/LIN/sget03.f
+++ b/TESTING/LIN/sget03.f
@@ -106,6 +106,7 @@
 *  =====================================================================
       SUBROUTINE SGET03( N, A, LDA, AINV, LDAINV, WORK, LDWORK, RWORK,
      $                   RCOND, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sget04.f b/TESTING/LIN/sget04.f
index 8c4fe9a892..72820c53a8 100644
--- a/TESTING/LIN/sget04.f
+++ b/TESTING/LIN/sget04.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE SGET04( N, NRHS, X, LDX, XACT, LDXACT, RCOND, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sget06.f b/TESTING/LIN/sget06.f
index 12b952e134..5849b4e888 100644
--- a/TESTING/LIN/sget06.f
+++ b/TESTING/LIN/sget06.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       REAL             FUNCTION SGET06( RCOND, RCONDC )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sget07.f b/TESTING/LIN/sget07.f
index 4333ad0b28..3b3b86b963 100644
--- a/TESTING/LIN/sget07.f
+++ b/TESTING/LIN/sget07.f
@@ -162,6 +162,7 @@
 *  =====================================================================
       SUBROUTINE SGET07( TRANS, N, NRHS, A, LDA, B, LDB, X, LDX, XACT,
      $                   LDXACT, FERR, CHKFERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sgtt01.f b/TESTING/LIN/sgtt01.f
index 5d88c91f77..75e87e58a4 100644
--- a/TESTING/LIN/sgtt01.f
+++ b/TESTING/LIN/sgtt01.f
@@ -39,7 +39,7 @@
 *
 *> \param[in] N
 *> \verbatim
-*>          N is INTEGTER
+*>          N is INTEGER
 *>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
@@ -131,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE SGTT01( N, DL, D, DU, DLF, DF, DUF, DU2, IPIV, WORK,
      $                   LDWORK, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sgtt02.f b/TESTING/LIN/sgtt02.f
index 97882436bc..76ab843c97 100644
--- a/TESTING/LIN/sgtt02.f
+++ b/TESTING/LIN/sgtt02.f
@@ -48,7 +48,7 @@
 *>
 *> \param[in] N
 *> \verbatim
-*>          N is INTEGTER
+*>          N is INTEGER
 *>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE SGTT02( TRANS, N, NRHS, DL, D, DU, X, LDX, B, LDB,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sgtt05.f b/TESTING/LIN/sgtt05.f
index adf4089b50..0c96321f92 100644
--- a/TESTING/LIN/sgtt05.f
+++ b/TESTING/LIN/sgtt05.f
@@ -162,6 +162,7 @@
 *  =====================================================================
       SUBROUTINE SGTT05( TRANS, N, NRHS, DL, D, DU, B, LDB, X, LDX,
      $                   XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/slahilb.f b/TESTING/LIN/slahilb.f
index cb3272d3b6..43d1bd302f 100644
--- a/TESTING/LIN/slahilb.f
+++ b/TESTING/LIN/slahilb.f
@@ -121,6 +121,7 @@
 *
 *  =====================================================================
       SUBROUTINE SLAHILB( N, NRHS, A, LDA, X, LDX, B, LDB, WORK, INFO)
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/slaord.f b/TESTING/LIN/slaord.f
index 06bccf02ea..318f4b23de 100644
--- a/TESTING/LIN/slaord.f
+++ b/TESTING/LIN/slaord.f
@@ -70,6 +70,7 @@
 *
 *  =====================================================================
       SUBROUTINE SLAORD( JOB, N, X, INCX )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/slaptm.f b/TESTING/LIN/slaptm.f
index 6b3ffdf8ad..98333f1d2b 100644
--- a/TESTING/LIN/slaptm.f
+++ b/TESTING/LIN/slaptm.f
@@ -113,6 +113,7 @@
 *
 *  =====================================================================
       SUBROUTINE SLAPTM( N, NRHS, ALPHA, D, E, X, LDX, BETA, B, LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/slarhs.f b/TESTING/LIN/slarhs.f
index 6a8a592c8c..fde4c2cc04 100644
--- a/TESTING/LIN/slarhs.f
+++ b/TESTING/LIN/slarhs.f
@@ -202,6 +202,7 @@
 *  =====================================================================
       SUBROUTINE SLARHS( PATH, XTYPE, UPLO, TRANS, M, N, KL, KU, NRHS,
      $                   A, LDA, X, LDX, B, LDB, ISEED, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/slatb4.f b/TESTING/LIN/slatb4.f
index 94d29db403..8156bb9989 100644
--- a/TESTING/LIN/slatb4.f
+++ b/TESTING/LIN/slatb4.f
@@ -117,6 +117,7 @@
 *  =====================================================================
       SUBROUTINE SLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
      $                   CNDNUM, DIST )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -153,9 +154,6 @@ SUBROUTINE SLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           SLABAD
-*     ..
 *     .. Save statement ..
       SAVE               EPS, SMALL, LARGE, BADC1, BADC2, FIRST
 *     ..
@@ -173,11 +171,6 @@ SUBROUTINE SLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
          BADC1 = SQRT( BADC2 )
          SMALL = SLAMCH( 'Safe minimum' )
          LARGE = ONE / SMALL
-*
-*        If it looks like we're on a Cray, take the square root of
-*        SMALL and LARGE to avoid overflow and underflow problems.
-*
-         CALL SLABAD( SMALL, LARGE )
          SMALL = SHRINK*( SMALL / EPS )
          LARGE = ONE / SMALL
       END IF
@@ -232,6 +225,110 @@ SUBROUTINE SLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
          ELSE
             ANORM = ONE
          END IF
+*
+      ELSE IF( LSAMEN( 2, C2, 'QK' ) ) THEN
+*
+*        xQK: truncated QR with pivoting.
+*             Set parameters to generate a general
+*             M x N matrix.
+*
+*        Set TYPE, the type of matrix to be generated.  'N' is nonsymmetric.
+*
+         TYPE = 'N'
+*
+*        Set DIST, the type of distribution for the random
+*        number generator. 'S' is
+*
+         DIST = 'S'
+*
+*        Set the lower and upper bandwidths.
+*
+         IF( IMAT.EQ.2 ) THEN
+*
+*           2. Random, Diagonal, CNDNUM = 2
+*
+            KL = 0
+            KU = 0
+            CNDNUM = TWO
+            ANORM = ONE
+            MODE = 3
+         ELSE IF( IMAT.EQ.3 ) THEN
+*
+*           3. Random, Upper triangular,  CNDNUM = 2
+*
+            KL = 0
+            KU = MAX( N-1, 0 )
+            CNDNUM = TWO
+            ANORM = ONE
+            MODE = 3
+         ELSE IF( IMAT.EQ.4 ) THEN
+*
+*          4. Random, Lower triangular,  CNDNUM = 2
+*
+            KL = MAX( M-1, 0 )
+            KU = 0
+            CNDNUM = TWO
+            ANORM = ONE
+            MODE = 3
+         ELSE
+*
+*           5.-19. Rectangular matrix
+*
+            KL = MAX( M-1, 0 )
+            KU = MAX( N-1, 0 )
+*
+            IF( IMAT.GE.5 .AND. IMAT.LE.14 ) THEN
+*
+*              5.-14. Random, CNDNUM = 2.
+*
+               CNDNUM = TWO
+               ANORM = ONE
+               MODE = 3
+*
+            ELSE IF( IMAT.EQ.15 ) THEN
+*
+*              15. Random, CNDNUM = sqrt(0.1/EPS)
+*
+               CNDNUM = BADC1
+               ANORM = ONE
+               MODE = 3
+*
+            ELSE IF( IMAT.EQ.16 ) THEN
+*
+*              16. Random, CNDNUM = 0.1/EPS
+*
+               CNDNUM = BADC2
+               ANORM = ONE
+               MODE = 3
+*
+            ELSE IF( IMAT.EQ.17 ) THEN
+*
+*              17. Random, CNDNUM = 0.1/EPS,
+*                  one small singular value S(N)=1/CNDNUM
+*
+               CNDNUM = BADC2
+               ANORM = ONE
+               MODE = 2
+*
+            ELSE IF( IMAT.EQ.18 ) THEN
+*
+*              18. Random, scaled near underflow
+*
+               CNDNUM = TWO
+               ANORM = SMALL
+               MODE = 3
+*
+            ELSE IF( IMAT.EQ.19 ) THEN
+*
+*              19. Random, scaled near overflow
+*
+               CNDNUM = TWO
+               ANORM = LARGE
+               MODE = 3
+*
+            END IF
+*
+         END IF
 *
       ELSE IF( LSAMEN( 2, C2, 'GE' ) ) THEN
 *
@@ -518,17 +615,18 @@ SUBROUTINE SLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
 *
 *        Set the norm and condition number.
 *
-         IF( IMAT.EQ.2 .OR. IMAT.EQ.8 ) THEN
+         MAT = ABS( IMAT )
+         IF( MAT.EQ.2 .OR. MAT.EQ.8 ) THEN
             CNDNUM = BADC1
-         ELSE IF( IMAT.EQ.3 .OR. IMAT.EQ.9 ) THEN
+         ELSE IF( MAT.EQ.3 .OR. MAT.EQ.9 ) THEN
             CNDNUM = BADC2
          ELSE
             CNDNUM = TWO
          END IF
 *
-         IF( IMAT.EQ.4 ) THEN
+         IF( MAT.EQ.4 ) THEN
             ANORM = SMALL
-         ELSE IF( IMAT.EQ.5 ) THEN
+         ELSE IF( MAT.EQ.5 ) THEN
             ANORM = LARGE
          ELSE
             ANORM = ONE
diff --git a/TESTING/LIN/slatb5.f b/TESTING/LIN/slatb5.f
index 6eefee4267..8dcc0a68eb 100644
--- a/TESTING/LIN/slatb5.f
+++ b/TESTING/LIN/slatb5.f
@@ -111,6 +111,7 @@
 *  =====================================================================
       SUBROUTINE SLATB5( PATH, IMAT, N, TYPE, KL, KU, ANORM, MODE,
      $                   CNDNUM, DIST )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -145,9 +146,6 @@ SUBROUTINE SLATB5( PATH, IMAT, N, TYPE, KL, KU, ANORM, MODE,
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           SLABAD
-*     ..
 *     .. Save statement ..
       SAVE               EPS, SMALL, LARGE, BADC1, BADC2, FIRST
 *     ..
@@ -165,11 +163,6 @@ SUBROUTINE SLATB5( PATH, IMAT, N, TYPE, KL, KU, ANORM, MODE,
          BADC1 = SQRT( BADC2 )
          SMALL = SLAMCH( 'Safe minimum' )
          LARGE = ONE / SMALL
-*
-*        If it looks like we're on a Cray, take the square root of
-*        SMALL and LARGE to avoid overflow and underflow problems.
-*
-         CALL SLABAD( SMALL, LARGE )
          SMALL = SHRINK*( SMALL / EPS )
          LARGE = ONE / SMALL
       END IF
diff --git a/TESTING/LIN/slattb.f b/TESTING/LIN/slattb.f
index 57e32b2db8..600a4da61c 100644
--- a/TESTING/LIN/slattb.f
+++ b/TESTING/LIN/slattb.f
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE SLATTB( IMAT, UPLO, TRANS, DIAG, ISEED, N, KD, AB,
      $                   LDAB, B, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -168,8 +169,7 @@ SUBROUTINE SLATTB( IMAT, UPLO, TRANS, DIAG, ISEED, N, KD, AB,
       EXTERNAL           LSAME, ISAMAX, SLAMCH, SLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLABAD, SLARNV, SLATB4, SLATMS, SSCAL,
-     $                   SSWAP
+      EXTERNAL           SCOPY, SLARNV, SLATB4, SLATMS, SSCAL, SSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN, REAL, SIGN, SQRT
@@ -182,7 +182,6 @@ SUBROUTINE SLATTB( IMAT, UPLO, TRANS, DIAG, ISEED, N, KD, AB,
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       SMLNUM = UNFL
       BIGNUM = ( ONE-ULP ) / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       IF( ( IMAT.GE.6 .AND. IMAT.LE.9 ) .OR. IMAT.EQ.17 ) THEN
          DIAG = 'U'
       ELSE
diff --git a/TESTING/LIN/slattp.f b/TESTING/LIN/slattp.f
index 24650bcc47..f7b6925964 100644
--- a/TESTING/LIN/slattp.f
+++ b/TESTING/LIN/slattp.f
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE SLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, B, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -160,8 +161,7 @@ SUBROUTINE SLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, B, WORK,
       EXTERNAL           LSAME, ISAMAX, SLAMCH, SLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLABAD, SLARNV, SLATB4, SLATMS, SROT, SROTG,
-     $                   SSCAL
+      EXTERNAL           SLARNV, SLATB4, SLATMS, SROT, SROTG, SSCAL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, REAL, SIGN, SQRT
@@ -174,7 +174,6 @@ SUBROUTINE SLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, B, WORK,
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       SMLNUM = UNFL
       BIGNUM = ( ONE-ULP ) / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       IF( ( IMAT.GE.7 .AND. IMAT.LE.10 ) .OR. IMAT.EQ.18 ) THEN
          DIAG = 'U'
       ELSE
diff --git a/TESTING/LIN/slattr.f b/TESTING/LIN/slattr.f
index e1ffd99918..2e7ddd3ac7 100644
--- a/TESTING/LIN/slattr.f
+++ b/TESTING/LIN/slattr.f
@@ -130,6 +130,7 @@
 *  =====================================================================
       SUBROUTINE SLATTR( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, LDA, B,
      $                   WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -166,7 +167,7 @@ SUBROUTINE SLATTR( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, LDA, B,
       EXTERNAL           LSAME, ISAMAX, SLAMCH, SLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLABAD, SLARNV, SLATB4, SLATMS, SROT,
+      EXTERNAL           SCOPY, SLARNV, SLATB4, SLATMS, SROT,
      $                   SROTG, SSCAL, SSWAP
 *     ..
 *     .. Intrinsic Functions ..
@@ -180,7 +181,6 @@ SUBROUTINE SLATTR( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, LDA, B,
       ULP = SLAMCH( 'Epsilon' )*SLAMCH( 'Base' )
       SMLNUM = UNFL
       BIGNUM = ( ONE-ULP ) / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
       IF( ( IMAT.GE.7 .AND. IMAT.LE.10 ) .OR. IMAT.EQ.18 ) THEN
          DIAG = 'U'
       ELSE
diff --git a/TESTING/LIN/slavsp.f b/TESTING/LIN/slavsp.f
index e6580d37fa..c58c3eb4f5 100644
--- a/TESTING/LIN/slavsp.f
+++ b/TESTING/LIN/slavsp.f
@@ -127,6 +127,7 @@
 *  =====================================================================
       SUBROUTINE SLAVSP( UPLO, TRANS, DIAG, N, NRHS, A, IPIV, B, LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/slavsy.f b/TESTING/LIN/slavsy.f
index c0f0ee4a1d..0216573ea9 100644
--- a/TESTING/LIN/slavsy.f
+++ b/TESTING/LIN/slavsy.f
@@ -152,6 +152,7 @@
 *  =====================================================================
       SUBROUTINE SLAVSY( UPLO, TRANS, DIAG, N, NRHS, A, LDA, IPIV, B,
      $                   LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/slavsy_rook.f b/TESTING/LIN/slavsy_rook.f
index d775e5e0e3..e183b5a830 100644
--- a/TESTING/LIN/slavsy_rook.f
+++ b/TESTING/LIN/slavsy_rook.f
@@ -154,6 +154,7 @@
 *  =====================================================================
       SUBROUTINE SLAVSY_ROOK( UPLO, TRANS, DIAG, N, NRHS, A, LDA, IPIV,
      $                        B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/slqt01.f b/TESTING/LIN/slqt01.f
index 9b868ac117..ec8b2cc9da 100644
--- a/TESTING/LIN/slqt01.f
+++ b/TESTING/LIN/slqt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE SLQT01( M, N, A, AF, Q, L, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/slqt02.f b/TESTING/LIN/slqt02.f
index d59a8a01c5..78dda770eb 100644
--- a/TESTING/LIN/slqt02.f
+++ b/TESTING/LIN/slqt02.f
@@ -27,7 +27,7 @@
 *> \verbatim
 *>
 *> SLQT02 tests SORGLQ, which generates an m-by-n matrix Q with
-*> orthonornmal rows that is defined as the product of k elementary
+*> orthonormal rows that is defined as the product of k elementary
 *> reflectors.
 *>
 *> Given the LQ factorization of an m-by-n matrix A, SLQT02 generates
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE SLQT02( M, N, K, A, AF, Q, L, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/slqt03.f b/TESTING/LIN/slqt03.f
index bc78a0fca9..fa3b290199 100644
--- a/TESTING/LIN/slqt03.f
+++ b/TESTING/LIN/slqt03.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE SLQT03( M, N, K, AF, C, CC, Q, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/spbt01.f b/TESTING/LIN/spbt01.f
index 7aae3a2c63..4cfb0f68e7 100644
--- a/TESTING/LIN/spbt01.f
+++ b/TESTING/LIN/spbt01.f
@@ -116,6 +116,7 @@
 *  =====================================================================
       SUBROUTINE SPBT01( UPLO, N, KD, A, LDA, AFAC, LDAFAC, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/spbt02.f b/TESTING/LIN/spbt02.f
index 7343063698..cb09239594 100644
--- a/TESTING/LIN/spbt02.f
+++ b/TESTING/LIN/spbt02.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE SPBT02( UPLO, N, KD, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/spbt05.f b/TESTING/LIN/spbt05.f
index 14b68c1096..8ea013f4c8 100644
--- a/TESTING/LIN/spbt05.f
+++ b/TESTING/LIN/spbt05.f
@@ -168,6 +168,7 @@
 *  =====================================================================
       SUBROUTINE SPBT05( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, X, LDX,
      $                   XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/spot01.f b/TESTING/LIN/spot01.f
index 5f14b3f0ff..0ec68f4ef0 100644
--- a/TESTING/LIN/spot01.f
+++ b/TESTING/LIN/spot01.f
@@ -101,6 +101,7 @@
 *
 *  =====================================================================
       SUBROUTINE SPOT01( UPLO, N, A, LDA, AFAC, LDAFAC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/spot02.f b/TESTING/LIN/spot02.f
index 08176a87ee..6435ddee41 100644
--- a/TESTING/LIN/spot02.f
+++ b/TESTING/LIN/spot02.f
@@ -124,6 +124,7 @@
 *  =====================================================================
       SUBROUTINE SPOT02( UPLO, N, NRHS, A, LDA, X, LDX, B, LDB, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/spot03.f b/TESTING/LIN/spot03.f
index 191b3139c8..3b28847db2 100644
--- a/TESTING/LIN/spot03.f
+++ b/TESTING/LIN/spot03.f
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE SPOT03( UPLO, N, A, LDA, AINV, LDAINV, WORK, LDWORK,
      $                   RWORK, RCOND, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/spot05.f b/TESTING/LIN/spot05.f
index 7658ea3856..00aa2bd2c4 100644
--- a/TESTING/LIN/spot05.f
+++ b/TESTING/LIN/spot05.f
@@ -161,6 +161,7 @@
 *  =====================================================================
       SUBROUTINE SPOT05( UPLO, N, NRHS, A, LDA, B, LDB, X, LDX, XACT,
      $                   LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sppt01.f b/TESTING/LIN/sppt01.f
index 213b38b410..cd38eec3a3 100644
--- a/TESTING/LIN/sppt01.f
+++ b/TESTING/LIN/sppt01.f
@@ -90,6 +90,7 @@
 *
 *  =====================================================================
       SUBROUTINE SPPT01( UPLO, N, A, AFAC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sppt02.f b/TESTING/LIN/sppt02.f
index 3e94585b09..8d9d4e0c32 100644
--- a/TESTING/LIN/sppt02.f
+++ b/TESTING/LIN/sppt02.f
@@ -119,6 +119,7 @@
 *  =====================================================================
       SUBROUTINE SPPT02( UPLO, N, NRHS, A, X, LDX, B, LDB, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sppt03.f b/TESTING/LIN/sppt03.f
index abb31cb4a5..968cbc4675 100644
--- a/TESTING/LIN/sppt03.f
+++ b/TESTING/LIN/sppt03.f
@@ -107,6 +107,7 @@
 *  =====================================================================
       SUBROUTINE SPPT03( UPLO, N, A, AINV, WORK, LDWORK, RWORK, RCOND,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sppt05.f b/TESTING/LIN/sppt05.f
index a56d0411d9..de0824025e 100644
--- a/TESTING/LIN/sppt05.f
+++ b/TESTING/LIN/sppt05.f
@@ -153,6 +153,7 @@
 *  =====================================================================
       SUBROUTINE SPPT05( UPLO, N, NRHS, AP, B, LDB, X, LDX, XACT,
      $                   LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/spst01.f b/TESTING/LIN/spst01.f
index 83084fba5e..5e56d3322b 100644
--- a/TESTING/LIN/spst01.f
+++ b/TESTING/LIN/spst01.f
@@ -131,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE SPST01( UPLO, N, A, LDA, AFAC, LDAFAC, PERM, LDPERM,
      $                   PIV, RWORK, RESID, RANK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sptt01.f b/TESTING/LIN/sptt01.f
index fef18dd2b4..0c4d163eab 100644
--- a/TESTING/LIN/sptt01.f
+++ b/TESTING/LIN/sptt01.f
@@ -35,7 +35,7 @@
 *
 *> \param[in] N
 *> \verbatim
-*>          N is INTEGTER
+*>          N is INTEGER
 *>          The order of the matrix A.
 *> \endverbatim
 *>
@@ -88,6 +88,7 @@
 *
 *  =====================================================================
       SUBROUTINE SPTT01( N, D, E, DF, EF, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sptt02.f b/TESTING/LIN/sptt02.f
index 51a6a074a1..ff8c8a56ce 100644
--- a/TESTING/LIN/sptt02.f
+++ b/TESTING/LIN/sptt02.f
@@ -35,7 +35,7 @@
 *
 *> \param[in] N
 *> \verbatim
-*>          N is INTEGTER
+*>          N is INTEGER
 *>          The order of the matrix A.
 *> \endverbatim
 *>
@@ -101,6 +101,7 @@
 *
 *  =====================================================================
       SUBROUTINE SPTT02( N, NRHS, D, E, X, LDX, B, LDB, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sptt05.f b/TESTING/LIN/sptt05.f
index ddbc40f132..3b73f41ee3 100644
--- a/TESTING/LIN/sptt05.f
+++ b/TESTING/LIN/sptt05.f
@@ -147,6 +147,7 @@
 *  =====================================================================
       SUBROUTINE SPTT05( N, NRHS, D, E, B, LDB, X, LDX, XACT, LDXACT,
      $                   FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sqlt01.f b/TESTING/LIN/sqlt01.f
index aa61e91a0b..661dec77e3 100644
--- a/TESTING/LIN/sqlt01.f
+++ b/TESTING/LIN/sqlt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE SQLT01( M, N, A, AF, Q, L, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sqlt02.f b/TESTING/LIN/sqlt02.f
index 5d381b950a..316bcdb9cf 100644
--- a/TESTING/LIN/sqlt02.f
+++ b/TESTING/LIN/sqlt02.f
@@ -27,7 +27,7 @@
 *> \verbatim
 *>
 *> SQLT02 tests SORGQL, which generates an m-by-n matrix Q with
-*> orthonornmal columns that is defined as the product of k elementary
+*> orthonormal columns that is defined as the product of k elementary
 *> reflectors.
 *>
 *> Given the QL factorization of an m-by-n matrix A, SQLT02 generates
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE SQLT02( M, N, K, A, AF, Q, L, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sqlt03.f b/TESTING/LIN/sqlt03.f
index 5c1bcdf666..1232d813a4 100644
--- a/TESTING/LIN/sqlt03.f
+++ b/TESTING/LIN/sqlt03.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE SQLT03( M, N, K, AF, C, CC, Q, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sqpt01.f b/TESTING/LIN/sqpt01.f
index de0c80e53a..d7fc25a092 100644
--- a/TESTING/LIN/sqpt01.f
+++ b/TESTING/LIN/sqpt01.f
@@ -33,7 +33,8 @@
 *> Householder vectors, and the rest of AF contains a partially updated
 *> matrix.
 *>
-*> This function returns ||A*P - Q*R||/(||norm(A)||*eps*M)
+*> This function returns ||A*P - Q*R|| / ( ||norm(A)||*eps*max(M,N) )
+*> where || . || is matrix one norm.
 *> \endverbatim
 *
 *  Arguments:
@@ -117,6 +118,7 @@
 *  =====================================================================
       REAL             FUNCTION SQPT01( M, N, K, A, AF, LDA, TAU, JPVT,
      $                 WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,28 +174,28 @@ REAL             FUNCTION SQPT01( M, N, K, A, AF, LDA, TAU, JPVT,
 *
       NORMA = SLANGE( 'One-norm', M, N, A, LDA, RWORK )
 *
-      DO 30 J = 1, K
-         DO 10 I = 1, MIN( J, M )
+      DO J = 1, K
+         DO I = 1, MIN( J, M )
             WORK( ( J-1 )*M+I ) = AF( I, J )
-   10    CONTINUE
-         DO 20 I = J + 1, M
+         END DO
+         DO I = J + 1, M
             WORK( ( J-1 )*M+I ) = ZERO
-   20    CONTINUE
-   30 CONTINUE
-      DO 40 J = K + 1, N
+         END DO
+      END DO
+      DO J = K + 1, N
          CALL SCOPY( M, AF( 1, J ), 1, WORK( ( J-1 )*M+1 ), 1 )
-   40 CONTINUE
+      END DO
 *
       CALL SORMQR( 'Left', 'No transpose', M, N, K, AF, LDA, TAU, WORK,
      $             M, WORK( M*N+1 ), LWORK-M*N, INFO )
 *
-      DO 50 J = 1, N
+      DO J = 1, N
 *
 *        Compare i-th column of QR and jpvt(i)-th column of A
 *
          CALL SAXPY( M, -ONE, A( 1, JPVT( J ) ), 1, WORK( ( J-1 )*M+1 ),
      $               1 )
-   50 CONTINUE
+      END DO
 *
       SQPT01 = SLANGE( 'One-norm', M, N, WORK, M, RWORK ) /
      $         ( REAL( MAX( M, N ) )*SLAMCH( 'Epsilon' ) )
diff --git a/TESTING/LIN/sqrt01.f b/TESTING/LIN/sqrt01.f
index 6f14989038..60d6b24bb9 100644
--- a/TESTING/LIN/sqrt01.f
+++ b/TESTING/LIN/sqrt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE SQRT01( M, N, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sqrt01p.f b/TESTING/LIN/sqrt01p.f
index f3a53013df..14efb6b538 100644
--- a/TESTING/LIN/sqrt01p.f
+++ b/TESTING/LIN/sqrt01p.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE SQRT01P( M, N, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sqrt02.f b/TESTING/LIN/sqrt02.f
index 72163f0a9d..d3bd40931b 100644
--- a/TESTING/LIN/sqrt02.f
+++ b/TESTING/LIN/sqrt02.f
@@ -27,7 +27,7 @@
 *> \verbatim
 *>
 *> SQRT02 tests SORGQR, which generates an m-by-n matrix Q with
-*> orthonornmal columns that is defined as the product of k elementary
+*> orthonormal columns that is defined as the product of k elementary
 *> reflectors.
 *>
 *> Given the QR factorization of an m-by-n matrix A, SQRT02 generates
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE SQRT02( M, N, K, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sqrt03.f b/TESTING/LIN/sqrt03.f
index bf11ef2588..58a08dead3 100644
--- a/TESTING/LIN/sqrt03.f
+++ b/TESTING/LIN/sqrt03.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE SQRT03( M, N, K, AF, C, CC, Q, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sqrt11.f b/TESTING/LIN/sqrt11.f
index d4422dacbf..1915721f98 100644
--- a/TESTING/LIN/sqrt11.f
+++ b/TESTING/LIN/sqrt11.f
@@ -95,6 +95,7 @@
 *
 *  =====================================================================
       REAL             FUNCTION SQRT11( M, K, A, LDA, TAU, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -157,9 +158,9 @@ REAL             FUNCTION SQRT11( M, K, A, LDA, TAU, WORK, LWORK )
       CALL SORM2R( 'Left', 'Transpose', M, M, K, A, LDA, TAU, WORK, M,
      $             WORK( M*M+1 ), INFO )
 *
-      DO 10 J = 1, M
+      DO J = 1, M
          WORK( ( J-1 )*M+J ) = WORK( ( J-1 )*M+J ) - ONE
-   10 CONTINUE
+      END DO
 *
       SQRT11 = SLANGE( 'One-norm', M, M, WORK, M, RDUMMY ) /
      $         ( REAL( M )*SLAMCH( 'Epsilon' ) )
diff --git a/TESTING/LIN/sqrt12.f b/TESTING/LIN/sqrt12.f
index 2eab0ee0d6..128481fdfa 100644
--- a/TESTING/LIN/sqrt12.f
+++ b/TESTING/LIN/sqrt12.f
@@ -26,7 +26,7 @@
 *> SQRT12 computes the singular values `svlues' of the upper trapezoid
 *> of A(1:M,1:N) and returns the ratio
 *>
-*>      || s - svlues||/(||svlues||*eps*max(M,N))
+*>      || svlues - s ||/(||s||*eps*max(M,N))
 *> \endverbatim
 *
 *  Arguments:
@@ -86,6 +86,7 @@
 *
 *  =====================================================================
       REAL             FUNCTION SQRT12( M, N, A, LDA, S, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -113,8 +114,7 @@ REAL             FUNCTION SQRT12( M, N, A, LDA, S, WORK, LWORK )
       EXTERNAL           SASUM, SLAMCH, SLANGE, SNRM2
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SBDSQR, SGEBD2, SLABAD, SLASCL, SLASET,
-     $                   XERBLA
+      EXTERNAL           SAXPY, SBDSQR, SGEBD2, SLASCL, SLASET, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN, REAL
@@ -145,17 +145,16 @@ REAL             FUNCTION SQRT12( M, N, A, LDA, S, WORK, LWORK )
 *     Copy upper triangle of A into work
 *
       CALL SLASET( 'Full', M, N, ZERO, ZERO, WORK, M )
-      DO 20 J = 1, N
-         DO 10 I = 1, MIN( J, M )
+      DO J = 1, N
+         DO I = 1, MIN( J, M )
             WORK( ( J-1 )*M+I ) = A( I, J )
-   10    CONTINUE
-   20 CONTINUE
+         END DO
+      END DO
 *
 *     Get machine parameters
 *
       SMLNUM = SLAMCH( 'S' ) / SLAMCH( 'P' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Scale work if max entry outside range [SMLNUM,BIGNUM]
 *
@@ -199,9 +198,9 @@ REAL             FUNCTION SQRT12( M, N, A, LDA, S, WORK, LWORK )
 *
       ELSE
 *
-         DO 30 I = 1, MN
+         DO I = 1, MN
             WORK( M*N+I ) = ZERO
-   30    CONTINUE
+         END DO
       END IF
 *
 *     Compare s and singular values of work
diff --git a/TESTING/LIN/sqrt13.f b/TESTING/LIN/sqrt13.f
index d77c5fa066..bb153a67b5 100644
--- a/TESTING/LIN/sqrt13.f
+++ b/TESTING/LIN/sqrt13.f
@@ -88,6 +88,7 @@
 *
 *  =====================================================================
       SUBROUTINE SQRT13( SCALE, M, N, A, LDA, NORMA, ISEED )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -117,7 +118,7 @@ SUBROUTINE SQRT13( SCALE, M, N, A, LDA, NORMA, ISEED )
       EXTERNAL           SASUM, SLAMCH, SLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SLABAD, SLARNV, SLASCL
+      EXTERNAL           SLARNV, SLASCL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          SIGN
@@ -146,7 +147,6 @@ SUBROUTINE SQRT13( SCALE, M, N, A, LDA, NORMA, ISEED )
          NORMA = SLANGE( 'Max', M, N, A, LDA, DUMMY )
          SMLNUM = SLAMCH( 'Safe minimum' )
          BIGNUM = ONE / SMLNUM
-         CALL SLABAD( SMLNUM, BIGNUM )
          SMLNUM = SMLNUM / SLAMCH( 'Epsilon' )
          BIGNUM = ONE / SMLNUM
 *
diff --git a/TESTING/LIN/sqrt14.f b/TESTING/LIN/sqrt14.f
index 64bdc81108..4d682d23a3 100644
--- a/TESTING/LIN/sqrt14.f
+++ b/TESTING/LIN/sqrt14.f
@@ -113,6 +113,7 @@
 *  =====================================================================
       REAL             FUNCTION SQRT14( TRANS, M, N, NRHS, A, LDA, X,
      $                 LDX, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sqrt15.f b/TESTING/LIN/sqrt15.f
index 5a6967abba..b487837198 100644
--- a/TESTING/LIN/sqrt15.f
+++ b/TESTING/LIN/sqrt15.f
@@ -145,6 +145,7 @@
 *  =====================================================================
       SUBROUTINE SQRT15( SCALE, RKSEL, M, N, NRHS, A, LDA, B, LDB, S,
      $                   RANK, NORMA, NORMB, ISEED, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sqrt16.f b/TESTING/LIN/sqrt16.f
index 1a5dbf785e..0c6620e42b 100644
--- a/TESTING/LIN/sqrt16.f
+++ b/TESTING/LIN/sqrt16.f
@@ -130,6 +130,7 @@
 *  =====================================================================
       SUBROUTINE SQRT16( TRANS, M, N, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sqrt17.f b/TESTING/LIN/sqrt17.f
index d2ff56bf1a..19fb600eef 100644
--- a/TESTING/LIN/sqrt17.f
+++ b/TESTING/LIN/sqrt17.f
@@ -150,6 +150,7 @@
 *  =====================================================================
       REAL             FUNCTION SQRT17( TRANS, IRESID, M, N, NRHS, A,
      $                 LDA, X, LDX, B, LDB, C, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/srqt01.f b/TESTING/LIN/srqt01.f
index 07a040a157..136dcd7c44 100644
--- a/TESTING/LIN/srqt01.f
+++ b/TESTING/LIN/srqt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE SRQT01( M, N, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/srqt02.f b/TESTING/LIN/srqt02.f
index ca0594f7af..882fd09006 100644
--- a/TESTING/LIN/srqt02.f
+++ b/TESTING/LIN/srqt02.f
@@ -27,7 +27,7 @@
 *> \verbatim
 *>
 *> SRQT02 tests SORGRQ, which generates an m-by-n matrix Q with
-*> orthonornmal rows that is defined as the product of k elementary
+*> orthonormal rows that is defined as the product of k elementary
 *> reflectors.
 *>
 *> Given the RQ factorization of an m-by-n matrix A, SRQT02 generates
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE SRQT02( M, N, K, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/srqt03.f b/TESTING/LIN/srqt03.f
index 730d76d450..5cb2c444d2 100644
--- a/TESTING/LIN/srqt03.f
+++ b/TESTING/LIN/srqt03.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE SRQT03( M, N, K, AF, C, CC, Q, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/srzt01.f b/TESTING/LIN/srzt01.f
index 4478c05067..d7ff5c6400 100644
--- a/TESTING/LIN/srzt01.f
+++ b/TESTING/LIN/srzt01.f
@@ -95,6 +95,7 @@
 *  =====================================================================
       REAL             FUNCTION SRZT01( M, N, A, AF, LDA, TAU, WORK,
      $                 LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -158,7 +159,7 @@ REAL             FUNCTION SRZT01( M, N, A, AF, LDA, TAU, WORK,
 *
 *     R = R * P(1) * ... *P(m)
 *
-      CALL SORMRZ( 'Right', 'No tranpose', M, N, M, N-M, AF, LDA, TAU,
+      CALL SORMRZ( 'Right', 'No transpose', M, N, M, N-M, AF, LDA, TAU,
      $             WORK, M, WORK( M*N+1 ), LWORK-M*N, INFO )
 *
 *     R = R - A
diff --git a/TESTING/LIN/srzt02.f b/TESTING/LIN/srzt02.f
index cd76a7c62a..36fc218f95 100644
--- a/TESTING/LIN/srzt02.f
+++ b/TESTING/LIN/srzt02.f
@@ -88,6 +88,7 @@
 *  =====================================================================
       REAL             FUNCTION SRZT02( M, N, AF, LDA, TAU, WORK,
      $                 LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/sspt01.f b/TESTING/LIN/sspt01.f
index 05cac43f48..67192092fe 100644
--- a/TESTING/LIN/sspt01.f
+++ b/TESTING/LIN/sspt01.f
@@ -107,6 +107,7 @@
 *
 *  =====================================================================
       SUBROUTINE SSPT01( UPLO, N, A, AFAC, IPIV, C, LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ssyt01.f b/TESTING/LIN/ssyt01.f
index b47ca7d2fe..abc7d4350d 100644
--- a/TESTING/LIN/ssyt01.f
+++ b/TESTING/LIN/ssyt01.f
@@ -121,6 +121,7 @@
 *  =====================================================================
       SUBROUTINE SSYT01( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C, LDC,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ssyt01_3.f b/TESTING/LIN/ssyt01_3.f
index 147553db9e..b5bb404ca5 100644
--- a/TESTING/LIN/ssyt01_3.f
+++ b/TESTING/LIN/ssyt01_3.f
@@ -137,6 +137,7 @@
 *  =====================================================================
       SUBROUTINE SSYT01_3( UPLO, N, A, LDA, AFAC, LDAFAC, E, IPIV, C,
      $                     LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,7 +184,7 @@ SUBROUTINE SSYT01_3( UPLO, N, A, LDA, AFAC, LDAFAC, E, IPIV, C,
          RETURN
       END IF
 *
-*     a) Revert to multiplyers of L
+*     a) Revert to multipliers of L
 *
       CALL SSYCONVF_ROOK( UPLO, 'R', N, AFAC, LDAFAC, E, IPIV, INFO )
 *
diff --git a/TESTING/LIN/ssyt01_aa.f b/TESTING/LIN/ssyt01_aa.f
index 470d45c3d4..248a39794f 100644
--- a/TESTING/LIN/ssyt01_aa.f
+++ b/TESTING/LIN/ssyt01_aa.f
@@ -121,6 +121,7 @@
 *  =====================================================================
       SUBROUTINE SSYT01_AA( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
      $                      LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -156,7 +157,7 @@ SUBROUTINE SSYT01_AA( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
       EXTERNAL           SLASET, SLAVSY, SSWAP, STRMM, SLACPY
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DBLE
+      INTRINSIC          REAL
 *     ..
 *     .. Executable Statements ..
 *
@@ -248,7 +249,7 @@ SUBROUTINE SSYT01_AA( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
          IF( RESID.NE.ZERO )
      $      RESID = ONE / EPS
       ELSE
-         RESID = ( ( RESID / DBLE( N ) ) / ANORM ) / EPS
+         RESID = ( ( RESID / REAL( N ) ) / ANORM ) / EPS
       END IF
 *
       RETURN
diff --git a/TESTING/LIN/ssyt01_rook.f b/TESTING/LIN/ssyt01_rook.f
index 7f5803b007..aa7e08e0a8 100644
--- a/TESTING/LIN/ssyt01_rook.f
+++ b/TESTING/LIN/ssyt01_rook.f
@@ -121,6 +121,7 @@
 *  =====================================================================
       SUBROUTINE SSYT01_ROOK( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
      $                    LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/stbt02.f b/TESTING/LIN/stbt02.f
index 31fbf9262a..deb1a99980 100644
--- a/TESTING/LIN/stbt02.f
+++ b/TESTING/LIN/stbt02.f
@@ -29,10 +29,10 @@
 *>
 *> STBT02 computes the residual for the computed solution to a
 *> triangular system of linear equations op(A)*X = B, when A is a
-*> triangular band matrix. The test ratio is the maximum over the
-*> number of right hand sides of
-*>    norm(op(A)*X - B) / ( norm(op(A)) * norm(X) * EPS ),
-*> where op(A) = A or A**T, and EPS is the machine epsilon.
+*> triangular band matrix. The test ratio is the maximum over
+*>    norm(b - op(A)*x) / ( ||op(A)||_1 * norm(x) * EPS ),
+*> where op(A) = A or A**T, b is the column of B, x is the solution
+*> vector, and EPS is the machine epsilon.
 *> The norm used is the 1-norm.
 *> \endverbatim
 *
@@ -151,6 +151,7 @@
 *  =====================================================================
       SUBROUTINE STBT02( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, X,
      $                   LDX, B, LDB, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/stbt03.f b/TESTING/LIN/stbt03.f
index 3ae44926d3..5487913b37 100644
--- a/TESTING/LIN/stbt03.f
+++ b/TESTING/LIN/stbt03.f
@@ -172,6 +172,7 @@
       SUBROUTINE STBT03( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB,
      $                   SCALE, CNORM, TSCAL, X, LDX, B, LDB, WORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -204,7 +205,7 @@ SUBROUTINE STBT03( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB,
       EXTERNAL           LSAME, ISAMAX, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SLABAD, SSCAL, STBMV
+      EXTERNAL           SAXPY, SCOPY, SSCAL, STBMV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, REAL
@@ -220,7 +221,6 @@ SUBROUTINE STBT03( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB,
       EPS = SLAMCH( 'Epsilon' )
       SMLNUM = SLAMCH( 'Safe minimum' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Compute the norm of the triangular matrix A using the column
 *     norms already computed by SLATBS.
diff --git a/TESTING/LIN/stbt05.f b/TESTING/LIN/stbt05.f
index 60e39016c0..96c0f04d00 100644
--- a/TESTING/LIN/stbt05.f
+++ b/TESTING/LIN/stbt05.f
@@ -186,6 +186,7 @@
 *  =====================================================================
       SUBROUTINE STBT05( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
      $                   LDB, X, LDX, XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/stbt06.f b/TESTING/LIN/stbt06.f
index 8cd5fbc189..19a70dd021 100644
--- a/TESTING/LIN/stbt06.f
+++ b/TESTING/LIN/stbt06.f
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE STBT06( RCOND, RCONDC, UPLO, DIAG, N, KD, AB, LDAB,
      $                   WORK, RAT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -152,9 +153,6 @@ SUBROUTINE STBT06( RCOND, RCONDC, UPLO, DIAG, N, KD, AB, LDAB,
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           SLABAD
-*     ..
 *     .. Executable Statements ..
 *
       EPS = SLAMCH( 'Epsilon' )
@@ -191,7 +189,6 @@ SUBROUTINE STBT06( RCOND, RCONDC, UPLO, DIAG, N, KD, AB, LDAB,
 *
          SMLNUM = SLAMCH( 'Safe minimum' )
          BIGNUM = ONE / SMLNUM
-         CALL SLABAD( SMLNUM, BIGNUM )
          ANORM = SLANTB( 'M', UPLO, DIAG, N, KD, AB, LDAB, WORK )
 *
          RAT = RMAX*( MIN( BIGNUM / MAX( ONE, ANORM ), ONE / EPS ) )
diff --git a/TESTING/LIN/stplqt.f b/TESTING/LIN/stplqt.f
index ba34f6bc5d..49a609139c 100644
--- a/TESTING/LIN/stplqt.f
+++ b/TESTING/LIN/stplqt.f
@@ -5,7 +5,6 @@
 * Online html documentation available at
 *            http://www.netlib.org/lapack/explore-html/
 *
-*> \htmlonly
 *> Download STPLQT + dependencies
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/stplqt.f">
 *> [TGZ]</a>
@@ -13,7 +12,6 @@
 *> [ZIP]</a>
 *> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/stplqt.f">
 *> [TXT]</a>
-*> \endhtmlonly
 *
 *  Definition:
 *  ===========
@@ -186,6 +184,7 @@
 *  =====================================================================
       SUBROUTINE STPLQT( M, N, L, MB, A, LDA, B, LDB, T, LDT, WORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/stpt01.f b/TESTING/LIN/stpt01.f
index 5e27083b4e..65fbac2e3e 100644
--- a/TESTING/LIN/stpt01.f
+++ b/TESTING/LIN/stpt01.f
@@ -105,6 +105,7 @@
 *
 *  =====================================================================
       SUBROUTINE STPT01( UPLO, DIAG, N, AP, AINVP, RCOND, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/stpt02.f b/TESTING/LIN/stpt02.f
index 72936dd044..b77fbf010d 100644
--- a/TESTING/LIN/stpt02.f
+++ b/TESTING/LIN/stpt02.f
@@ -29,9 +29,10 @@
 *> STPT02 computes the residual for the computed solution to a
 *> triangular system of linear equations op(A)*X = B, when the
 *> triangular matrix A is stored in packed format. The test ratio is
-*> the maximum over the number of right hand sides of
-*>    norm(op(A)*X - B) / ( norm(op(A)) * norm(X) * EPS ),
-*> where op(A) = A or A**T, and EPS is the machine epsilon.
+*> the maximum over
+*>    norm(b - op(A)*x) / ( ||op(A)||_1 * norm(x) * EPS ),
+*> where op(A) = A or A**T, b is the column of B, x is the solution
+*> vector, and EPS is the machine epsilon.
 *> The norm used is the 1-norm.
 *> \endverbatim
 *
@@ -138,6 +139,7 @@
 *  =====================================================================
       SUBROUTINE STPT02( UPLO, TRANS, DIAG, N, NRHS, AP, X, LDX, B, LDB,
      $                   WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/stpt03.f b/TESTING/LIN/stpt03.f
index 9e844e7978..c8302c62a2 100644
--- a/TESTING/LIN/stpt03.f
+++ b/TESTING/LIN/stpt03.f
@@ -158,6 +158,7 @@
 *  =====================================================================
       SUBROUTINE STPT03( UPLO, TRANS, DIAG, N, NRHS, AP, SCALE, CNORM,
      $                   TSCAL, X, LDX, B, LDB, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -190,7 +191,7 @@ SUBROUTINE STPT03( UPLO, TRANS, DIAG, N, NRHS, AP, SCALE, CNORM,
       EXTERNAL           LSAME, ISAMAX, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SLABAD, SSCAL, STPMV
+      EXTERNAL           SAXPY, SCOPY, SSCAL, STPMV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, REAL
@@ -206,7 +207,6 @@ SUBROUTINE STPT03( UPLO, TRANS, DIAG, N, NRHS, AP, SCALE, CNORM,
       EPS = SLAMCH( 'Epsilon' )
       SMLNUM = SLAMCH( 'Safe minimum' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Compute the norm of the triangular matrix A using the column
 *     norms already computed by SLATPS.
diff --git a/TESTING/LIN/stpt05.f b/TESTING/LIN/stpt05.f
index 81abb969f8..c8c767504d 100644
--- a/TESTING/LIN/stpt05.f
+++ b/TESTING/LIN/stpt05.f
@@ -171,6 +171,7 @@
 *  =====================================================================
       SUBROUTINE STPT05( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X, LDX,
      $                   XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/stpt06.f b/TESTING/LIN/stpt06.f
index 117987dcc5..f4bd8783f9 100644
--- a/TESTING/LIN/stpt06.f
+++ b/TESTING/LIN/stpt06.f
@@ -108,6 +108,7 @@
 *
 *  =====================================================================
       SUBROUTINE STPT06( RCOND, RCONDC, UPLO, DIAG, N, AP, WORK, RAT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -138,9 +139,6 @@ SUBROUTINE STPT06( RCOND, RCONDC, UPLO, DIAG, N, AP, WORK, RAT )
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           SLABAD
-*     ..
 *     .. Executable Statements ..
 *
       EPS = SLAMCH( 'Epsilon' )
@@ -177,7 +175,6 @@ SUBROUTINE STPT06( RCOND, RCONDC, UPLO, DIAG, N, AP, WORK, RAT )
 *
          SMLNUM = SLAMCH( 'Safe minimum' )
          BIGNUM = ONE / SMLNUM
-         CALL SLABAD( SMLNUM, BIGNUM )
          ANORM = SLANTP( 'M', UPLO, DIAG, N, AP, WORK )
 *
          RAT = RMAX*( MIN( BIGNUM / MAX( ONE, ANORM ), ONE / EPS ) )
diff --git a/TESTING/LIN/strt01.f b/TESTING/LIN/strt01.f
index 08c2433ed4..ab02e1b6ca 100644
--- a/TESTING/LIN/strt01.f
+++ b/TESTING/LIN/strt01.f
@@ -121,6 +121,7 @@
 *  =====================================================================
       SUBROUTINE STRT01( UPLO, DIAG, N, A, LDA, AINV, LDAINV, RCOND,
      $                   WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/strt02.f b/TESTING/LIN/strt02.f
index df91501ded..f93b75e0f2 100644
--- a/TESTING/LIN/strt02.f
+++ b/TESTING/LIN/strt02.f
@@ -29,10 +29,10 @@
 *>
 *> STRT02 computes the residual for the computed solution to a
 *> triangular system of linear equations op(A)*X = B, where A is a
-*> triangular matrix. The test ratio is the maximum over the number of
-*> right hand sides of
-*>    norm(op(A)*X - B) / ( norm(op(A)) * norm(X) * EPS ),
-*> where op(A) = A or A**T, and EPS is the machine epsilon.
+*> triangular matrix. The test ratio is the maximum over
+*>    norm(b - op(A)*x) / ( ||op(A)||_1 * norm(x) * EPS ),
+*> where op(A) = A or A**T, b is the column of B, x is the solution
+*> vector, and EPS is the machine epsilon.
 *> The norm used is the 1-norm.
 *> \endverbatim
 *
@@ -147,6 +147,7 @@
 *  =====================================================================
       SUBROUTINE STRT02( UPLO, TRANS, DIAG, N, NRHS, A, LDA, X, LDX, B,
      $                   LDB, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/strt03.f b/TESTING/LIN/strt03.f
index 2e41076d48..d89bd7fd67 100644
--- a/TESTING/LIN/strt03.f
+++ b/TESTING/LIN/strt03.f
@@ -166,6 +166,7 @@
 *  =====================================================================
       SUBROUTINE STRT03( UPLO, TRANS, DIAG, N, NRHS, A, LDA, SCALE,
      $                   CNORM, TSCAL, X, LDX, B, LDB, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -198,7 +199,7 @@ SUBROUTINE STRT03( UPLO, TRANS, DIAG, N, NRHS, A, LDA, SCALE,
       EXTERNAL           LSAME, ISAMAX, SLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SAXPY, SCOPY, SLABAD, SSCAL, STRMV
+      EXTERNAL           SAXPY, SCOPY, SSCAL, STRMV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, REAL
@@ -214,7 +215,6 @@ SUBROUTINE STRT03( UPLO, TRANS, DIAG, N, NRHS, A, LDA, SCALE,
       EPS = SLAMCH( 'Epsilon' )
       SMLNUM = SLAMCH( 'Safe minimum' )
       BIGNUM = ONE / SMLNUM
-      CALL SLABAD( SMLNUM, BIGNUM )
 *
 *     Compute the norm of the triangular matrix A using the column
 *     norms already computed by SLATRS.
diff --git a/TESTING/LIN/strt05.f b/TESTING/LIN/strt05.f
index af4ebe34a7..7ffb8b6e7e 100644
--- a/TESTING/LIN/strt05.f
+++ b/TESTING/LIN/strt05.f
@@ -178,6 +178,7 @@
 *  =====================================================================
       SUBROUTINE STRT05( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB, X,
      $                   LDX, XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/strt06.f b/TESTING/LIN/strt06.f
index 266e835434..2e12303045 100644
--- a/TESTING/LIN/strt06.f
+++ b/TESTING/LIN/strt06.f
@@ -118,6 +118,7 @@
 *  =====================================================================
       SUBROUTINE STRT06( RCOND, RCONDC, UPLO, DIAG, N, A, LDA, WORK,
      $                   RAT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -148,9 +149,6 @@ SUBROUTINE STRT06( RCOND, RCONDC, UPLO, DIAG, N, A, LDA, WORK,
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           SLABAD
-*     ..
 *     .. Executable Statements ..
 *
       EPS = SLAMCH( 'Epsilon' )
@@ -187,7 +185,6 @@ SUBROUTINE STRT06( RCOND, RCONDC, UPLO, DIAG, N, A, LDA, WORK,
 *
          SMLNUM = SLAMCH( 'Safe minimum' )
          BIGNUM = ONE / SMLNUM
-         CALL SLABAD( SMLNUM, BIGNUM )
          ANORM = SLANTR( 'M', UPLO, DIAG, N, N, A, LDA, WORK )
 *
          RAT = RMAX*( MIN( BIGNUM / MAX( ONE, ANORM ), ONE / EPS ) )
diff --git a/TESTING/LIN/xerbla.f b/TESTING/LIN/xerbla.f
index 431339f785..8ebff6ff8d 100644
--- a/TESTING/LIN/xerbla.f
+++ b/TESTING/LIN/xerbla.f
@@ -72,6 +72,7 @@
 *>
 *  =====================================================================
       SUBROUTINE XERBLA( SRNAME, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/xlaenv.f b/TESTING/LIN/xlaenv.f
index c1720c7f10..10049b6a65 100644
--- a/TESTING/LIN/xlaenv.f
+++ b/TESTING/LIN/xlaenv.f
@@ -75,6 +75,7 @@
 *
 *  =====================================================================
       SUBROUTINE XLAENV( ISPEC, NVALUE )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchkaa.F b/TESTING/LIN/zchkaa.F
index a118515a5d..77a7a6cb31 100644
--- a/TESTING/LIN/zchkaa.F
+++ b/TESTING/LIN/zchkaa.F
@@ -69,6 +69,7 @@
 *> ZLQ    8               List types on next line if 0 < NTYPES <  8
 *> ZQL    8               List types on next line if 0 < NTYPES <  8
 *> ZQP    6               List types on next line if 0 < NTYPES <  6
+*> ZQK   19               List types on next line if 0 < NTYPES < 19
 *> ZTZ    3               List types on next line if 0 < NTYPES <  3
 *> ZLS    6               List types on next line if 0 < NTYPES <  6
 *> ZEQ
@@ -153,12 +154,11 @@ PROGRAM ZCHKAA
      $                   NBVAL( MAXIN ), NBVAL2( MAXIN ),
      $                   NSVAL( MAXIN ), NVAL( MAXIN ), NXVAL( MAXIN ),
      $                   RANKVAL( MAXIN ), PIV( NMAX )
-      DOUBLE PRECISION   S( 2*NMAX )
-      COMPLEX*16         E( NMAX )
-*
-*    .. Allocatable Arrays ..
+*     ..
+*     .. Allocatable Arrays ..
       INTEGER AllocateStatus
-      DOUBLE PRECISION, DIMENSION(:), ALLOCATABLE::   RWORK
+      DOUBLE PRECISION, DIMENSION(:), ALLOCATABLE::  RWORK, S
+      COMPLEX*16, DIMENSION(:), ALLOCATABLE :: E
       COMPLEX*16, DIMENSION(:,:), ALLOCATABLE::  A, B, WORK
 *     ..
 *     .. External Functions ..
@@ -170,15 +170,16 @@ PROGRAM ZCHKAA
       EXTERNAL           ALAREQ, ZCHKEQ, ZCHKGB, ZCHKGE, ZCHKGT, ZCHKHE,
      $                   ZCHKHE_ROOK, ZCHKHE_RK, ZCHKHE_AA, ZCHKHP,
      $                   ZCHKLQ, ZCHKUNHR_COL, ZCHKPB, ZCHKPO, ZCHKPS,
-     $                   ZCHKPP, ZCHKPT, ZCHKQ3, ZCHKQL, ZCHKQR, ZCHKRQ,
-     $                   ZCHKSP, ZCHKSY, ZCHKSY_ROOK, ZCHKSY_RK,
-     $                   ZCHKSY_AA, ZCHKTB, ZCHKTP, ZCHKTR, ZCHKTZ,
-     $                   ZDRVGB, ZDRVGE, ZDRVGT, ZDRVHE, ZDRVHE_ROOK,
-     $                   ZDRVHE_RK, ZDRVHE_AA, ZDRVHE_AA_2STAGE, ZDRVHP,
-     $                   ZDRVLS, ZDRVPB,  ZDRVPO, ZDRVPP, ZDRVPT,
-     $                   ZDRVSP, ZDRVSY, ZDRVSY_ROOK, ZDRVSY_RK,
-     $                   ZDRVSY_AA, ZDRVSY_AA_2STAGE, ILAVER, ZCHKQRT,
-     $                   ZCHKQRTP, ZCHKLQT, ZCHKLQTP, ZCHKTSQR
+     $                   ZCHKPP, ZCHKPT, ZCHKQ3, ZCHKQP3RK, ZCHKQL,
+     $                   ZCHKQR, ZCHKRQ, ZCHKSP, ZCHKSY, ZCHKSY_ROOK,
+     $                   ZCHKSY_RK, ZCHKSY_AA, ZCHKTB, ZCHKTP, ZCHKTR,
+     $                   ZCHKTZ, ZDRVGB, ZDRVGE, ZDRVGT, ZDRVHE,
+     $                   ZDRVHE_ROOK, ZDRVHE_RK, ZDRVHE_AA,
+     $                   ZDRVHE_AA_2STAGE, ZDRVHP, ZDRVLS, ZDRVPB,
+     $                   ZDRVPO, ZDRVPP, ZDRVPT, ZDRVSP, ZDRVSY,
+     $                   ZDRVSY_ROOK, ZDRVSY_RK, ZDRVSY_AA,
+     $                   ZDRVSY_AA_2STAGE, ILAVER, ZCHKQRT, ZCHKQRTP,
+     $                   ZCHKLQT, ZCHKLQTP, ZCHKTSQR
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -197,13 +198,18 @@ PROGRAM ZCHKAA
       DATA               THREQ / 2.0D0 / , INTSTR / '0123456789' /
 *
 *     .. Allocate memory dynamically ..
-      ALLOCATE (RWORK( 150*NMAX+2*MAXRHS ), STAT = AllocateStatus)
+*
+      ALLOCATE ( A ( (KDMAX+1) * NMAX, 7 ), STAT = AllocateStatus)
+      IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
+      ALLOCATE ( B ( NMAX * MAXRHS, 4 ), STAT = AllocateStatus)
+      IF (AllocateStatus /= 0 ) STOP "*** Not enough memory ***"
+      ALLOCATE ( WORK ( NMAX, NMAX+MAXRHS+10 ), STAT = AllocateStatus)
       IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
-      ALLOCATE (A ((KDMAX+1) * NMAX, 7), STAT = AllocateStatus)
+      ALLOCATE ( E( NMAX ), STAT = AllocateStatus )
       IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
-      ALLOCATE (B (NMAX * MAXRHS, 4), STAT = AllocateStatus)
+      ALLOCATE ( S( 2*NMAX ), STAT = AllocateStatus)
       IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
-      ALLOCATE (WORK (NMAX, NMAX+MAXRHS+10), STAT = AllocateStatus)
+      ALLOCATE ( RWORK( 150*NMAX+2*MAXRHS ), STAT = AllocateStatus)
       IF (AllocateStatus /= 0) STOP "*** Not enough memory ***"
 *     ..
 *     .. Executable Statements ..
@@ -1109,6 +1115,23 @@ PROGRAM ZCHKAA
          ELSE
             WRITE( NOUT, FMT = 9989 )PATH
          END IF
+*
+      ELSE IF( LSAMEN( 2, C2, 'QK' ) ) THEN
+*
+*        QK: truncated QR factorization with pivoting
+*
+         NTYPES = 19
+         CALL ALAREQ( PATH, NMATS, DOTYPE, NTYPES, NIN, NOUT )
+*
+         IF( TSTCHK ) THEN
+            CALL ZCHKQP3RK( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL,
+     $                   NNB, NBVAL, NXVAL, THRESH, A( 1, 1 ),
+     $                   A( 1, 2 ), B( 1, 1 ), B( 1, 2 ),
+     $                   S( 1 ), B( 1, 4 ),
+     $                   WORK, RWORK, IWORK, NOUT )
+         ELSE
+            WRITE( NOUT, FMT = 9989 )PATH
+         END IF
 *
       ELSE IF( LSAMEN( 2, C2, 'LS' ) ) THEN
 *
@@ -1245,6 +1268,8 @@ PROGRAM ZCHKAA
 *
       DEALLOCATE (A, STAT = AllocateStatus)
       DEALLOCATE (B, STAT = AllocateStatus)
+      DEALLOCATE (E, STAT = AllocateStatus)
+      DEALLOCATE (S, STAT = AllocateStatus)
       DEALLOCATE (RWORK, STAT = AllocateStatus)
       DEALLOCATE (WORK,  STAT = AllocateStatus)
 *
@@ -1256,7 +1281,7 @@ PROGRAM ZCHKAA
  9995 FORMAT( ' Invalid input value: ', A4, '=', I6, '; must be <=',
      $      I6 )
  9994 FORMAT( ' Tests of the COMPLEX*16 LAPACK routines ',
-     $      / ' LAPACK VERSION ', I1, '.', I1, '.', I1,
+     $      / ' LAPACK VERSION ', I1, '.', I2, '.', I1,
      $      / / ' The following parameter values will be used:' )
  9993 FORMAT( 4X, A4, ':  ', 10I6, / 11X, 10I6 )
  9992 FORMAT( / ' Routines pass computational tests if test ratio is ',
diff --git a/TESTING/LIN/zchkab.f b/TESTING/LIN/zchkab.f
index 63274cabb9..253905fea8 100644
--- a/TESTING/LIN/zchkab.f
+++ b/TESTING/LIN/zchkab.f
@@ -70,6 +70,7 @@
 *
 *  =====================================================================
       PROGRAM ZCHKAB
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -350,7 +351,7 @@ PROGRAM ZCHKAB
  9995 FORMAT( ' Invalid input value: ', A4, '=', I6, '; must be <=',
      $      I6 )
  9994 FORMAT( ' Tests of the COMPLEX*16 LAPACK ZCGESV/ZCPOSV routines ',
-     $      / ' LAPACK VERSION ', I1, '.', I1, '.', I1,
+     $      / ' LAPACK VERSION ', I1, '.', I2, '.', I1,
      $      / / ' The following parameter values will be used:' )
  9993 FORMAT( 4X, A4, ':  ', 10I6, / 11X, 10I6 )
  9992 FORMAT( / ' Routines pass computational tests if test ratio is ',
diff --git a/TESTING/LIN/zchkeq.f b/TESTING/LIN/zchkeq.f
index 214331d5a6..e5d863612a 100644
--- a/TESTING/LIN/zchkeq.f
+++ b/TESTING/LIN/zchkeq.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZCHKEQ( THRESH, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchkgb.f b/TESTING/LIN/zchkgb.f
index 3b0cd707ab..bd54ac5e84 100644
--- a/TESTING/LIN/zchkgb.f
+++ b/TESTING/LIN/zchkgb.f
@@ -188,6 +188,7 @@
       SUBROUTINE ZCHKGB( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NNS,
      $                   NSVAL, THRESH, TSTERR, A, LA, AFAC, LAFAC, B,
      $                   X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchkge.f b/TESTING/LIN/zchkge.f
index d87759df5c..fa6970c779 100644
--- a/TESTING/LIN/zchkge.f
+++ b/TESTING/LIN/zchkge.f
@@ -183,6 +183,7 @@
       SUBROUTINE ZCHKGE( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NNS,
      $                   NSVAL, THRESH, TSTERR, NMAX, A, AFAC, AINV, B,
      $                   X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchkgt.f b/TESTING/LIN/zchkgt.f
index b9a6ab7e4a..4c03bace8d 100644
--- a/TESTING/LIN/zchkgt.f
+++ b/TESTING/LIN/zchkgt.f
@@ -144,6 +144,7 @@
 *  =====================================================================
       SUBROUTINE ZCHKGT( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   A, AF, B, X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchkhe.f b/TESTING/LIN/zchkhe.f
index e443eab04f..9ee0793b77 100644
--- a/TESTING/LIN/zchkhe.f
+++ b/TESTING/LIN/zchkhe.f
@@ -168,6 +168,7 @@
       SUBROUTINE ZCHKHE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                   XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchkhe_aa_2stage.f b/TESTING/LIN/zchkhe_aa_2stage.f
index 726e1fea6d..51082f1d0b 100644
--- a/TESTING/LIN/zchkhe_aa_2stage.f
+++ b/TESTING/LIN/zchkhe_aa_2stage.f
@@ -185,7 +185,8 @@ SUBROUTINE ZCHKHE_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
       LOGICAL            DOTYPE( * )
       INTEGER            IWORK( * ), NBVAL( * ), NSVAL( * ), NVAL( * )
       COMPLEX*16         A( * ), AFAC( * ), AINV( * ), B( * ),
-     $                   RWORK( * ), WORK( * ), X( * ), XACT( * )
+     $                   WORK( * ), X( * ), XACT( * )
+      DOUBLE PRECISION   RWORK( * )
 *     ..
 *
 *  =====================================================================
@@ -430,9 +431,9 @@ SUBROUTINE ZCHKHE_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
 *                 block factorization, LWORK is the length of AINV.
 *
                   SRNAMT = 'ZHETRF_AA_2STAGE'
-                  LWORK = MIN(N*NB, 3*NMAX*NMAX)
-                  CALL ZHETRF_AA_2STAGE( UPLO, N, AFAC, LDA, 
-     $                                   AINV, (3*NB+1)*N, 
+                  LWORK = MIN( MAX( 1, N*NB ), 3*NMAX*NMAX )
+                  CALL ZHETRF_AA_2STAGE( UPLO, N, AFAC, LDA,
+     $                                   AINV, MAX( 1, (3*NB+1)*N ),
      $                                   IWORK, IWORK( 1+N ),
      $                                   WORK, LWORK,
      $                                   INFO )
diff --git a/TESTING/LIN/zchkhe_rk.f b/TESTING/LIN/zchkhe_rk.f
index 63697d33a1..2abef5c64c 100644
--- a/TESTING/LIN/zchkhe_rk.f
+++ b/TESTING/LIN/zchkhe_rk.f
@@ -174,6 +174,7 @@
       SUBROUTINE ZCHKHE_RK( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                      THRESH, TSTERR, NMAX, A, AFAC, E, AINV, B,
      $                      X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchkhe_rook.f b/TESTING/LIN/zchkhe_rook.f
index 84f5a84220..a75d880114 100644
--- a/TESTING/LIN/zchkhe_rook.f
+++ b/TESTING/LIN/zchkhe_rook.f
@@ -169,6 +169,7 @@
       SUBROUTINE ZCHKHE_ROOK( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                        THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                        XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchkhp.f b/TESTING/LIN/zchkhp.f
index 6525ed65e3..93951e1414 100644
--- a/TESTING/LIN/zchkhp.f
+++ b/TESTING/LIN/zchkhp.f
@@ -161,6 +161,7 @@
       SUBROUTINE ZCHKHP( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, A, AFAC, AINV, B, X, XACT, WORK, RWORK,
      $                   IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchklq.f b/TESTING/LIN/zchklq.f
index 371bb946b9..7afe70c6ce 100644
--- a/TESTING/LIN/zchklq.f
+++ b/TESTING/LIN/zchklq.f
@@ -193,6 +193,7 @@
       SUBROUTINE ZCHKLQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   NRHS, THRESH, TSTERR, NMAX, A, AF, AQ, AL, AC,
      $                   B, X, XACT, TAU, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -235,7 +236,7 @@ SUBROUTINE ZCHKLQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
       DOUBLE PRECISION   RESULT( NTESTS )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAERH, ALAHD, ALASUM, XLAENV, ZERRLQ, ZGELQS,
+      EXTERNAL           ALAERH, ALAHD, ALASUM, XLAENV, ZERRLQ, ZGELS,
      $                   ZGET02, ZLACPY, ZLARHS, ZLATB4, ZLATMS, ZLQT01,
      $                   ZLQT02, ZLQT03
 *     ..
@@ -370,7 +371,7 @@ SUBROUTINE ZCHKLQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                               WORK, LWORK, RWORK, RESULT( 3 ) )
                         NT = NT + 4
 *
-*                       If M>=N and K=N, call ZGELQS to solve a system
+*                       If M<=N and K=M, call ZGELS to solve a system
 *                       with NRHS right hand sides and compute the
 *                       residual.
 *
@@ -387,14 +388,20 @@ SUBROUTINE ZCHKLQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
 *
                            CALL ZLACPY( 'Full', M, NRHS, B, LDA, X,
      $                                  LDA )
-                           SRNAMT = 'ZGELQS'
-                           CALL ZGELQS( M, N, NRHS, AF, LDA, TAU, X,
-     $                                  LDA, WORK, LWORK, INFO )
 *
-*                          Check error code from ZGELQS.
+*                          Reset AF to the original matrix. ZGELS
+*                          factors the matrix before solving the system.
+*
+                           CALL ZLACPY( 'Full', M, N, A, LDA, AF, LDA )
+*
+                           SRNAMT = 'ZGELS'
+                           CALL ZGELS( 'No transpose', M, N, NRHS, AF,
+     $                                 LDA, X, LDA, WORK, LWORK, INFO )
+*
+*                          Check error code from ZGELS.
 *
                            IF( INFO.NE.0 )
-     $                        CALL ALAERH( PATH, 'ZGELQS', INFO, 0, ' ',
+     $                        CALL ALAERH( PATH, 'ZGELS', INFO, 0, 'N',
      $                                     M, N, NRHS, -1, NB, IMAT,
      $                                     NFAIL, NERRS, NOUT )
 *
diff --git a/TESTING/LIN/zchkpb.f b/TESTING/LIN/zchkpb.f
index 1ce8c3b88f..4f3160b5cf 100644
--- a/TESTING/LIN/zchkpb.f
+++ b/TESTING/LIN/zchkpb.f
@@ -165,6 +165,7 @@
       SUBROUTINE ZCHKPB( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                   XACT, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchkpo.f b/TESTING/LIN/zchkpo.f
index 93ea721633..6a8398ffc6 100644
--- a/TESTING/LIN/zchkpo.f
+++ b/TESTING/LIN/zchkpo.f
@@ -165,6 +165,7 @@
       SUBROUTINE ZCHKPO( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                   XACT, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchkpp.f b/TESTING/LIN/zchkpp.f
index 250b12359d..c3dcbcaff6 100644
--- a/TESTING/LIN/zchkpp.f
+++ b/TESTING/LIN/zchkpp.f
@@ -156,6 +156,7 @@
       SUBROUTINE ZCHKPP( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, A, AFAC, AINV, B, X, XACT, WORK, RWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchkps.f b/TESTING/LIN/zchkps.f
index 79fc951e22..a7fc5fb7db 100644
--- a/TESTING/LIN/zchkps.f
+++ b/TESTING/LIN/zchkps.f
@@ -151,6 +151,7 @@
       SUBROUTINE ZCHKPS( DOTYPE, NN, NVAL, NNB, NBVAL, NRANK, RANKVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, PERM, PIV, WORK,
      $                   RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchkpt.f b/TESTING/LIN/zchkpt.f
index 80e1690a7e..b2c4238647 100644
--- a/TESTING/LIN/zchkpt.f
+++ b/TESTING/LIN/zchkpt.f
@@ -144,6 +144,7 @@
 *  =====================================================================
       SUBROUTINE ZCHKPT( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   A, D, E, B, X, XACT, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -319,15 +320,15 @@ SUBROUTINE ZCHKPT( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
 *                 elements.
 *
                   IF( IZERO.EQ.1 ) THEN
-                     D( 1 ) = Z( 2 )
+                     D( 1 ) = DBLE( Z( 2 ) )
                      IF( N.GT.1 )
      $                  E( 1 ) = Z( 3 )
                   ELSE IF( IZERO.EQ.N ) THEN
                      E( N-1 ) = Z( 1 )
-                     D( N ) = Z( 2 )
+                     D( N ) = DBLE( Z( 2 ) )
                   ELSE
                      E( IZERO-1 ) = Z( 1 )
-                     D( IZERO ) = Z( 2 )
+                     D( IZERO ) = DBLE( Z( 2 ) )
                      E( IZERO ) = Z( 3 )
                   END IF
                END IF
diff --git a/TESTING/LIN/zchkq3.f b/TESTING/LIN/zchkq3.f
index 33cd0fe15f..f27510656c 100644
--- a/TESTING/LIN/zchkq3.f
+++ b/TESTING/LIN/zchkq3.f
@@ -155,6 +155,7 @@
       SUBROUTINE ZCHKQ3( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   THRESH, A, COPYA, S, TAU, WORK, RWORK,
      $                   IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchkql.f b/TESTING/LIN/zchkql.f
index 0dbb345b06..cafb2c623f 100644
--- a/TESTING/LIN/zchkql.f
+++ b/TESTING/LIN/zchkql.f
@@ -193,6 +193,7 @@
       SUBROUTINE ZCHKQL( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   NRHS, THRESH, TSTERR, NMAX, A, AF, AQ, AL, AC,
      $                   B, X, XACT, TAU, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchkqp3rk.f b/TESTING/LIN/zchkqp3rk.f
new file mode 100644
index 0000000000..5092058837
--- /dev/null
+++ b/TESTING/LIN/zchkqp3rk.f
@@ -0,0 +1,801 @@
+*> \brief \b ZCHKQP3RK
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
+*
+*  Definition:
+*  ===========
+*
+*      SUBROUTINE ZCHKQP3RK( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL,
+*     $                      NNB, NBVAL, NXVAL, THRESH, A, COPYA,
+*     $                      B, COPYB, S, TAU,
+*     $                      WORK, RWORK, IWORK, NOUT )
+*      IMPLICIT NONE
+*
+*       .. Scalar Arguments ..
+*       INTEGER            NM, NN, NNB, NOUT
+*       DOUBLE PRECISION   THRESH
+*       ..
+*       .. Array Arguments ..
+*       LOGICAL            DOTYPE( * )
+*       INTEGER            IWORK( * ), MVAL( * ), NBVAL( * ), NVAL( * ),
+*      $                   NXVAL( * )
+*       DOUBLE PRECISION   S( * ), RWORK( * )
+*       COMPLEX*16         A( * ), COPYA( * ), TAU( * ), WORK( * )
+*       ..
+*
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZCHKQP3RK tests ZGEQP3RK.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] DOTYPE
+*> \verbatim
+*>          DOTYPE is LOGICAL array, dimension (NTYPES)
+*>          The matrix types to be used for testing.  Matrices of type j
+*>          (for 1 <= j <= NTYPES) are used for testing if DOTYPE(j) =
+*>          .TRUE.; if DOTYPE(j) = .FALSE., then type j is not used.
+*> \endverbatim
+*>
+*> \param[in] NM
+*> \verbatim
+*>          NM is INTEGER
+*>          The number of values of M contained in the vector MVAL.
+*> \endverbatim
+*>
+*> \param[in] MVAL
+*> \verbatim
+*>          MVAL is INTEGER array, dimension (NM)
+*>          The values of the matrix row dimension M.
+*> \endverbatim
+*>
+*> \param[in] NN
+*> \verbatim
+*>          NN is INTEGER
+*>          The number of values of N contained in the vector NVAL.
+*> \endverbatim
+*>
+*> \param[in] NVAL
+*> \verbatim
+*>          NVAL is INTEGER array, dimension (NN)
+*>          The values of the matrix column dimension N.
+*> \endverbatim
+*>
+*> \param[in] NNS
+*> \verbatim
+*>          NNS is INTEGER
+*>          The number of values of NRHS contained in the vector NSVAL.
+*> \endverbatim
+*>
+*> \param[in] NSVAL
+*> \verbatim
+*>          NSVAL is INTEGER array, dimension (NNS)
+*>          The values of the number of right hand sides NRHS.
+*> \endverbatim
+*> \param[in] NNB
+*> \verbatim
+*>          NNB is INTEGER
+*>          The number of values of NB and NX contained in the
+*>          vectors NBVAL and NXVAL.  The blocking parameters are used
+*>          in pairs (NB,NX).
+*> \endverbatim
+*>
+*> \param[in] NBVAL
+*> \verbatim
+*>          NBVAL is INTEGER array, dimension (NNB)
+*>          The values of the blocksize NB.
+*> \endverbatim
+*>
+*> \param[in] NXVAL
+*> \verbatim
+*>          NXVAL is INTEGER array, dimension (NNB)
+*>          The values of the crossover point NX.
+*> \endverbatim
+*>
+*> \param[in] THRESH
+*> \verbatim
+*>          THRESH is DOUBLE PRECISION
+*>          The threshold value for the test ratios.  A result is
+*>          included in the output file if RESULT >= THRESH.  To have
+*>          every test ratio printed, use THRESH = 0.
+*> \endverbatim
+*>
+*> \param[out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (MMAX*NMAX)
+*>          where MMAX is the maximum value of M in MVAL and NMAX is the
+*>          maximum value of N in NVAL.
+*> \endverbatim
+*>
+*> \param[out] COPYA
+*> \verbatim
+*>          COPYA is COMPLEX*16 array, dimension (MMAX*NMAX)
+*> \endverbatim
+*>
+*> \param[out] B
+*> \verbatim
+*>          B is COMPLEX*16 array, dimension (MMAX*NSMAX)
+*>          where MMAX is the maximum value of M in MVAL and NSMAX is the
+*>          maximum value of NRHS in NSVAL.
+*> \endverbatim
+*>
+*> \param[out] COPYB
+*> \verbatim
+*>          COPYB is COMPLEX*16 array, dimension (MMAX*NSMAX)
+*> \endverbatim
+*>
+*> \param[out] S
+*> \verbatim
+*>          S is DOUBLE PRECISION array, dimension
+*>                      (min(MMAX,NMAX))
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (MMAX)
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension
+*>                      (max(M*max(M,N) + 4*min(M,N) + max(M,N)))
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension (4*NMAX)
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (2*NMAX)
+*> \endverbatim
+*>
+*> \param[in] NOUT
+*> \verbatim
+*>          NOUT is INTEGER
+*>          The unit number for output.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
+*
+*> \ingroup complex16_lin
+*
+*  =====================================================================
+      SUBROUTINE ZCHKQP3RK( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL,
+     $                      NNB, NBVAL, NXVAL, THRESH, A, COPYA,
+     $                      B, COPYB, S, TAU,
+     $                      WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
+*
+*  -- LAPACK test routine --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*
+*     .. Scalar Arguments ..
+      INTEGER            NM, NN, NNB, NNS, NOUT
+      DOUBLE PRECISION   THRESH
+*     ..
+*     .. Array Arguments ..
+      LOGICAL            DOTYPE( * )
+      INTEGER            IWORK( * ), NBVAL( * ), MVAL( * ), NVAL( * ),
+     $                   NSVAL( * ), NXVAL( * )
+      DOUBLE PRECISION   S( * ), RWORK( * )
+      COMPLEX*16         A( * ), COPYA( * ), B( * ), COPYB( * ),
+     $                   TAU( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      INTEGER            NTYPES
+      PARAMETER          ( NTYPES = 19 )
+      INTEGER            NTESTS
+      PARAMETER          ( NTESTS = 5 )
+      DOUBLE PRECISION   ONE, ZERO, BIGNUM
+      COMPLEX*16         CONE, CZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0,
+     $                   CZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   CONE = ( 1.0D+0, 0.0D+0 ),
+     $                   BIGNUM = 1.0D+38 )
+*     ..
+*     .. Local Scalars ..
+      CHARACTER          DIST, TYPE
+      CHARACTER*3        PATH
+      INTEGER            I, IHIGH, ILOW, IM, IMAT, IN, INC_ZERO,
+     $                   INB, IND_OFFSET_GEN,
+     $                   IND_IN, IND_OUT, INS, INFO,
+     $                   ISTEP, J, J_INC, J_FIRST_NZ, JB_ZERO,
+     $                   KFACT, KL, KMAX, KU, LDA, LW, LWORK,
+     $                   LWORK_MQR, M, MINMN, MINMNB_GEN, MODE, N,
+     $                   NB, NB_ZERO, NERRS, NFAIL, NB_GEN, NRHS,
+     $                   NRUN, NX, T
+      DOUBLE PRECISION   ANORM, CNDNUM, EPS, ABSTOL, RELTOL,
+     $                   DTEMP, MAXC2NRMK, RELMAXC2NRMK
+*     ..
+*     .. Local Arrays ..
+      INTEGER            ISEED( 4 ), ISEEDY( 4 )
+      DOUBLE PRECISION   RESULT( NTESTS ), RDUMMY( 1 )
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH, ZQPT01, ZQRT11, ZQRT12, ZLANGE
+      EXTERNAL           DLAMCH, ZQPT01, ZQRT11, ZQRT12, ZLANGE
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ALAERH, ALAHD, ALASUM, DLAORD, ICOPY, ZAXPY,
+     $                   XLAENV, ZGEQP3RK, ZLACPY, ZLASET, ZLATB4,
+     $                   ZLATMS, ZUNMQR, ZSWAP
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, MAX, MIN, MOD
+*     ..
+*     .. Scalars in Common ..
+      LOGICAL            LERR, OK
+      CHARACTER*32       SRNAMT
+      INTEGER            INFOT, IOUNIT, ZUNMQR_LWORK
+*     ..
+*     .. Common blocks ..
+      COMMON             / INFOC / INFOT, IOUNIT, OK, LERR
+      COMMON             / SRNAMC / SRNAMT
+*     ..
+*     .. Data statements ..
+      DATA               ISEEDY / 1988, 1989, 1990, 1991 /
+*     ..
+*     .. Executable Statements ..
+*
+*     Initialize constants and the random number seed.
+*
+      PATH( 1: 1 ) = 'Zomplex precision'
+      PATH( 2: 3 ) = 'QK'
+      NRUN = 0
+      NFAIL = 0
+      NERRS = 0
+      DO  I = 1, 4
+         ISEED( I ) = ISEEDY( I )
+      END DO
+      EPS = DLAMCH( 'Epsilon' )
+      INFOT = 0
+*
+      DO IM = 1, NM
+*
+*        Do for each value of M in MVAL.
+*
+         M = MVAL( IM )
+         LDA = MAX( 1, M )
+*
+         DO IN = 1, NN
+*
+*           Do for each value of N in NVAL.
+*
+            N = NVAL( IN )
+            MINMN = MIN( M, N )
+            LWORK = MAX( 1, M*MAX( M, N )+4*MINMN+MAX( M, N ),
+     $                   M*N + 2*MINMN + 4*N )
+*
+            DO INS = 1, NNS
+               NRHS = NSVAL( INS )
+*
+*                 Set up parameters with ZLATB4 and generate
+*                 M-by-NRHS B matrix with ZLATMS.
+*                 IMAT = 14:
+*                 Random matrix, CNDNUM = 2, NORM = ONE,
+*                 MODE = 3 (geometric distribution of singular values).
+*
+                  CALL ZLATB4( PATH, 14, M, NRHS, TYPE, KL, KU, ANORM,
+     $                         MODE, CNDNUM, DIST )
+*
+                  SRNAMT = 'ZLATMS'
+                  CALL ZLATMS( M, NRHS, DIST, ISEED, TYPE, S, MODE,
+     $                         CNDNUM, ANORM, KL, KU, 'No packing',
+     $                         COPYB, LDA, WORK, INFO )
+*
+*                 Check error code from ZLATMS.
+*
+                  IF( INFO.NE.0 ) THEN
+                     CALL ALAERH( PATH, 'ZLATMS', INFO, 0, ' ', M,
+     $                            NRHS, -1, -1, -1, 6, NFAIL, NERRS,
+     $                            NOUT )
+                     CYCLE
+                  END IF
+*
+               DO IMAT = 1, NTYPES
+*
+*              Do the tests only if DOTYPE( IMAT ) is true.
+*
+               IF( .NOT.DOTYPE( IMAT ) )
+     $            CYCLE
+*
+*              The type of distribution used to generate the random
+*              eigen-/singular values:
+*              ( 'S' for symmetric distribution ) => UNIFORM( -1, 1 )
+*
+*           Do for each type of NON-SYMMETRIC matrix:                               CNDNUM                     NORM                                     MODE
+*            1. Zero matrix
+*            2. Random, Diagonal, CNDNUM = 2                                        CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            3. Random, Upper triangular, CNDNUM = 2                                CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            4. Random, Lower triangular, CNDNUM = 2                                CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            5. Random, First column is zero, CNDNUM = 2                            CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            6. Random, Last MINMN column is zero, CNDNUM = 2                       CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            7. Random, Last N column is zero, CNDNUM = 2                           CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            8. Random, Middle column in MINMN is zero, CNDNUM = 2                  CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*            9. Random, First half of MINMN columns are zero, CNDNUM = 2            CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           10. Random, Last columns are zero starting from MINMN/2+1, CNDNUM = 2   CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           11. Random, Half MINMN columns in the middle are zero starting
+*                  from  MINMN/2-(MINMN/2)/2+1, CNDNUM = 2                          CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           12. Random, Odd columns are ZERO, CNDNUM = 2                            CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           13. Random, Even columns are ZERO, CNDNUM = 2                           CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           14. Random, CNDNUM = 2                                                  CNDNUM = 2                      ONE                                      3 ( geometric distribution of singular values )
+*           15. Random, CNDNUM = sqrt(0.1/EPS)                                      CNDNUM = BADC1 = sqrt(0.1/EPS)  ONE                                      3 ( geometric distribution of singular values )
+*           16. Random, CNDNUM = 0.1/EPS                                            CNDNUM = BADC2 = 0.1/EPS        ONE                                      3 ( geometric distribution of singular values )
+*           17. Random, CNDNUM = 0.1/EPS,                                           CNDNUM = BADC2 = 0.1/EPS        ONE                                      2 ( one small singular value, S(N)=1/CNDNUM )
+*                 one small singular value S(N)=1/CNDNUM
+*           18. Random, CNDNUM = 2, scaled near underflow                           CNDNUM = 2                      SMALL = SAFMIN
+*           19. Random, CNDNUM = 2, scaled near overflow                            CNDNUM = 2                      LARGE = 1.0/( 0.25 * ( SAFMIN / EPS ) )  3 ( geometric distribution of singular values )
+*
+               IF( IMAT.EQ.1 ) THEN
+*
+*                 Matrix 1: Zero matrix
+*
+                  CALL ZLASET( 'Full', M, N, CZERO, CZERO, COPYA, LDA )
+                  DO I = 1, MINMN
+                     S( I ) = ZERO
+                  END DO
+*
+               ELSE IF( (IMAT.GE.2 .AND. IMAT.LE.4 )
+     $                  .OR. (IMAT.GE.14 .AND. IMAT.LE.19 ) ) THEN
+*
+*                 Matrices 2-5.
+*
+*                 Set up parameters with DLATB4 and generate a test
+*                 matrix with ZLATMS.
+*
+                  CALL ZLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM,
+     $                         MODE, CNDNUM, DIST )
+*
+                  SRNAMT = 'ZLATMS'
+                  CALL ZLATMS( M, N, DIST, ISEED, TYPE, S, MODE,
+     $                         CNDNUM, ANORM, KL, KU, 'No packing',
+     $                         COPYA, LDA, WORK, INFO )
+*
+*                 Check error code from ZLATMS.
+*
+                  IF( INFO.NE.0 ) THEN
+                     CALL ALAERH( PATH, 'ZLATMS', INFO, 0, ' ', M, N,
+     $                            -1, -1, -1, IMAT, NFAIL, NERRS,
+     $                            NOUT )
+                     CYCLE
+                  END IF
+*
+                  CALL DLAORD( 'Decreasing', MINMN, S, 1 )
+*
+               ELSE IF( MINMN.GE.2
+     $                  .AND. IMAT.GE.5 .AND. IMAT.LE.13 ) THEN
+*
+*                 Rectangular matrices 5-13 that contain zero columns,
+*                 only for matrices MINMN >=2.
+*
+*                 JB_ZERO is the column index of ZERO block.
+*                 NB_ZERO is the column block size of ZERO block.
+*                 NB_GEN is the column blcok size of the
+*                 generated block.
+*                 J_INC in the non_zero column index increment
+*                 for matrix 12 and 13.
+*                 J_FIRS_NZ is the index of the first non-zero
+*                 column.
+*
+                  IF( IMAT.EQ.5 ) THEN
+*
+*                    First column is zero.
+*
+                     JB_ZERO = 1
+                     NB_ZERO = 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.6 ) THEN
+*
+*                    Last column MINMN is zero.
+*
+                     JB_ZERO = MINMN
+                     NB_ZERO = 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.7 ) THEN
+*
+*                    Last column N is zero.
+*
+                     JB_ZERO = N
+                     NB_ZERO = 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.8 ) THEN
+*
+*                    Middle column in MINMN is zero.
+*
+                     JB_ZERO = MINMN / 2 + 1
+                     NB_ZERO = 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.9 ) THEN
+*
+*                    First half of MINMN columns is zero.
+*
+                     JB_ZERO = 1
+                     NB_ZERO = MINMN / 2
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.10 ) THEN
+*
+*                    Last columns are zero columns,
+*                    starting from (MINMN / 2 + 1) column.
+*
+                     JB_ZERO = MINMN / 2 + 1
+                     NB_ZERO = N - JB_ZERO + 1
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.11 ) THEN
+*
+*                    Half of the columns in the middle of MINMN
+*                    columns is zero, starting from
+*                    MINMN/2 - (MINMN/2)/2 + 1 column.
+*
+                     JB_ZERO = MINMN / 2 - (MINMN / 2) / 2 + 1
+                     NB_ZERO = MINMN / 2
+                     NB_GEN = N - NB_ZERO
+*
+                  ELSE IF( IMAT.EQ.12 ) THEN
+*
+*                    Odd-numbered columns are zero,
+*
+                     NB_GEN = N / 2
+                     NB_ZERO = N - NB_GEN
+                     J_INC = 2
+                     J_FIRST_NZ = 2
+*
+                  ELSE IF( IMAT.EQ.13 ) THEN
+*
+*                    Even-numbered columns are zero.
+*
+                     NB_ZERO = N / 2
+                     NB_GEN = N - NB_ZERO
+                     J_INC = 2
+                     J_FIRST_NZ = 1
+*
+                  END IF
+*
+*
+*                 1) Set the first NB_ZERO columns in COPYA(1:M,1:N)
+*                    to zero.
+*
+                  CALL ZLASET( 'Full', M, NB_ZERO, CZERO, CZERO,
+     $                         COPYA, LDA )
+*
+*                    2) Generate an M-by-(N-NB_ZERO) matrix with the
+*                       chosen singular value distribution
+*                       in COPYA(1:M,NB_ZERO+1:N).
+*
+                  CALL ZLATB4( PATH, IMAT, M, NB_GEN, TYPE, KL, KU,
+     $                         ANORM, MODE, CNDNUM, DIST )
+*
+                  SRNAMT = 'ZLATMS'
+*
+                  IND_OFFSET_GEN = NB_ZERO * LDA
+*
+                  CALL ZLATMS( M, NB_GEN, DIST, ISEED, TYPE, S, MODE,
+     $                        CNDNUM, ANORM, KL, KU, 'No packing',
+     $                        COPYA( IND_OFFSET_GEN + 1 ), LDA,
+     $                        WORK, INFO )
+*
+*                 Check error code from ZLATMS.
+*
+                  IF( INFO.NE.0 ) THEN
+                     CALL ALAERH( PATH, 'ZLATMS', INFO, 0, ' ', M,
+     $                            NB_GEN, -1, -1, -1, IMAT, NFAIL,
+     $                            NERRS, NOUT )
+                     CYCLE
+                  END IF
+*
+*                 3) Swap the gererated colums from the right side
+*                 NB_GEN-size block in COPYA into correct column
+*                 positions.
+*
+                  IF( IMAT.EQ.6
+     $                    .OR. IMAT.EQ.7
+     $                    .OR. IMAT.EQ.8
+     $                    .OR. IMAT.EQ.10
+     $                    .OR. IMAT.EQ.11 ) THEN
+*
+*                    Move by swapping the generated columns
+*                    from the right NB_GEN-size block from
+*                    (NB_ZERO+1:NB_ZERO+JB_ZERO)
+*                    into columns (1:JB_ZERO-1).
+*
+                     DO J = 1, JB_ZERO-1, 1
+                        CALL ZSWAP( M,
+     $                        COPYA( ( NB_ZERO+J-1)*LDA+1), 1,
+     $                        COPYA( (J-1)*LDA + 1 ), 1 )
+                     END DO
+*
+                  ELSE IF( IMAT.EQ.12 .OR. IMAT.EQ.13 ) THEN
+*
+*                    ( IMAT = 12, Odd-numbered ZERO columns. )
+*                    Swap the generated columns from the right
+*                    NB_GEN-size block into the even zero colums in the
+*                    left NB_ZERO-size block.
+*
+*                    ( IMAT = 13, Even-numbered ZERO columns. )
+*                    Swap the generated columns from the right
+*                    NB_GEN-size block into the odd zero colums in the
+*                    left NB_ZERO-size block.
+*
+                     DO J = 1, NB_GEN, 1
+                        IND_OUT = ( NB_ZERO+J-1 )*LDA + 1
+                        IND_IN = ( J_INC*(J-1)+(J_FIRST_NZ-1) )*LDA
+     $                            + 1
+                        CALL ZSWAP( M,
+     $                              COPYA( IND_OUT ), 1,
+     $                              COPYA( IND_IN), 1 )
+                        END DO
+*
+                  END IF
+*
+*                 5) Order the singular values generated by
+*                    DLAMTS in decreasing order and add trailing zeros
+*                    that correspond to zero columns.
+*                    The total number of singular values is MINMN.
+*
+                  MINMNB_GEN = MIN( M, NB_GEN )
+*
+                  CALL DLAORD( 'Decreasing', MINMNB_GEN, S, 1 )
+
+                  DO I = MINMNB_GEN+1, MINMN
+                     S( I ) = ZERO
+                  END DO
+*
+               ELSE
+*
+*                    IF(MINMN.LT.2) skip this size for this matrix type.
+*
+                     CYCLE
+               END IF
+*
+*              Initialize a copy array for a pivot array for DGEQP3RK.
+*
+               DO I = 1, N
+                  IWORK( I ) = 0
+               END DO
+*
+               DO INB = 1, NNB
+*
+*                 Do for each pair of values (NB,NX) in NBVAL and NXVAL.
+*
+                  NB = NBVAL( INB )
+                  CALL XLAENV( 1, NB )
+                  NX = NXVAL( INB )
+                  CALL XLAENV( 3, NX )
+*
+*                 We do MIN(M,N)+1 because we need a test for KMAX > N,
+*                 when KMAX is larger than MIN(M,N), KMAX should be
+*                 KMAX = MIN(M,N)
+*
+                  DO KMAX = 0, MIN(M,N)+1
+*
+*                 Get a working copy of COPYA into A( 1:M,1:N ).
+*                 Get a working copy of COPYB into A( 1:M, (N+1):NRHS ).
+*                 Get a working copy of COPYB into into B( 1:M, 1:NRHS ).
+*                 Get a working copy of IWORK(1:N) awith zeroes into
+*                 which is going to be used as pivot array IWORK( N+1:2N ).
+*                 NOTE: IWORK(2N+1:3N) is going to be used as a WORK array
+*                 for the routine.
+*
+                  CALL ZLACPY( 'All', M, N, COPYA, LDA, A, LDA )
+                  CALL ZLACPY( 'All', M, NRHS, COPYB, LDA,
+     $                         A( LDA*N + 1 ),  LDA )
+                  CALL ZLACPY( 'All', M, NRHS, COPYB, LDA,
+     $                         B,  LDA )
+                  CALL ICOPY( N, IWORK( 1 ), 1, IWORK( N+1 ), 1 )
+                  DO I = 1, NTESTS
+                    RESULT( I ) = ZERO
+                  END DO
+*
+                  ABSTOL = -1.0
+                  RELTOl = -1.0
+*
+*                 Compute the QR factorization with pivoting of A
+*
+                  LW = MAX( 1, MAX( 2*N + NB*( N+NRHS+1 ),
+     $                              3*N + NRHS - 1 ) )
+*
+*                 Compute ZGEQP3RK factorization of A.
+*
+                  SRNAMT = 'ZGEQP3RK'
+                  CALL ZGEQP3RK( M, N, NRHS, KMAX, ABSTOL, RELTOL,
+     $                           A, LDA, KFACT, MAXC2NRMK,
+     $                           RELMAXC2NRMK, IWORK( N+1 ), TAU,
+     $                           WORK, LW, RWORK, IWORK( 2*N+1 ),
+     $                           INFO )
+*
+*                 Check error code from ZGEQP3RK.
+*
+                  IF( INFO.LT.0 )
+     $               CALL ALAERH( PATH, 'ZGEQP3RK', INFO, 0, ' ',
+     $                            M, N, NX, -1, NB, IMAT,
+     $                            NFAIL, NERRS, NOUT )
+*
+                  IF( KFACT.EQ.MINMN ) THEN
+*
+*                 Compute test 1:
+*
+*                 This test in only for the full rank factorization of
+*                 the matrix A.
+*
+*                 Array S(1:min(M,N)) contains svd(A) the sigular values
+*                 of the original matrix A in decreasing absolute value
+*                 order. The test computes svd(R), the vector sigular
+*                 values of the upper trapezoid of A(1:M,1:N) that
+*                 contains the factor R, in decreasing order. The test
+*                 returns the ratio:
+*
+*                 2-norm(svd(R) - svd(A)) / ( max(M,N) * 2-norm(svd(A)) * EPS )
+*
+                     RESULT( 1 ) = ZQRT12( M, N, A, LDA, S, WORK,
+     $                                     LWORK , RWORK )
+*
+                     NRUN = NRUN + 1
+*
+*                   End test 1
+*
+                  END IF
+
+*                 Compute test 2:
+*
+*                 The test returns the ratio:
+*
+*                 1-norm( A*P - Q*R ) / ( max(M,N) * 1-norm(A) * EPS )
+*
+                  RESULT( 2 ) = ZQPT01( M, N, KFACT, COPYA, A, LDA, TAU,
+     $                                  IWORK( N+1 ), WORK, LWORK )
+*
+*                 Compute test 3:
+*
+*                 The test returns the ratio:
+*
+*                 1-norm( Q**T * Q - I ) / ( M * EPS )
+*
+                  RESULT( 3 ) = ZQRT11( M, KFACT, A, LDA, TAU, WORK,
+     $                                  LWORK )
+*
+                  NRUN = NRUN + 2
+*
+*                 Compute test 4:
+*
+*                 This test is only for the factorizations with the
+*                 rank greater than 2.
+*                 The elements on the diagonal of R should be non-
+*                 increasing.
+*
+*                 The test returns the ratio:
+*
+*                 Returns 1.0D+100 if abs(R(K+1,K+1)) > abs(R(K,K)),
+*                 K=1:KFACT-1
+*
+                  IF( MIN(KFACT, MINMN).GE.2 ) THEN
+*
+                     DO J = 1, KFACT-1, 1
+*
+                        DTEMP = (( ABS( A( (J-1)*LDA+J ) ) -
+     $                          ABS( A( (J)*LDA+J+1 ) ) ) /
+     $                          ABS( A(1) ) )
+*
+                        IF( DTEMP.LT.ZERO ) THEN
+                           RESULT( 4 ) = BIGNUM
+                        END IF
+*
+                     END DO
+*
+                     NRUN = NRUN + 1
+*
+*                    End test 4.
+*
+                  END IF
+*
+*                 Compute test 5:
+*
+*                 This test in only for matrix A with min(M,N) > 0.
+*
+*                 The test returns the ratio:
+*
+*                 1-norm(Q**T * B - Q**T * B ) /
+*                       ( M * EPS )
+*
+*                 (1) Compute B:=Q**T * B in the matrix B.
+*
+                  IF( MINMN.GT.0 ) THEN
+*
+                     LWORK_MQR = MAX(1, NRHS)
+                     CALL ZUNMQR( 'Left', 'Conjugate transpose',
+     $                            M, NRHS, KFACT, A, LDA, TAU, B, LDA,
+     $                            WORK, LWORK_MQR, INFO )
+*
+                     DO I = 1, NRHS
+*
+*                       Compare N+J-th column of A and J-column of B.
+*
+                        CALL ZAXPY( M, -CONE, A( ( N+I-1 )*LDA+1 ), 1,
+     $                              B( ( I-1 )*LDA+1 ), 1 )
+                     END DO
+*
+                     RESULT( 5 ) = ABS(
+     $                  ZLANGE( 'One-norm', M, NRHS, B, LDA, RDUMMY ) /
+     $                  ( DBLE( M )*DLAMCH( 'Epsilon' ) ) )
+*
+                     NRUN = NRUN + 1
+*
+*                    End compute test 5.
+*
+                  END IF
+*
+*                 Print information about the tests that did not pass
+*                 the threshold.
+*
+                  DO T = 1, NTESTS
+                     IF( RESULT( T ).GE.THRESH ) THEN
+                        IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
+     $                     CALL ALAHD( NOUT, PATH )
+                        WRITE( NOUT, FMT = 9999 ) 'ZGEQP3RK', M, N,
+     $                      NRHS, KMAX, ABSTOL, RELTOL,
+     $                      NB, NX, IMAT, T, RESULT( T )
+                        NFAIL = NFAIL + 1
+                     END IF
+                  END DO
+*
+*                 END DO KMAX = 1, MIN(M,N)+1
+*
+                  END DO
+*
+*                 END DO for INB = 1, NNB
+*
+               END DO
+*
+*              END DO  for IMAT = 1, NTYPES
+*
+               END DO
+*
+*              END DO for INS = 1, NNS
+*
+            END DO
+*
+*           END DO for IN = 1, NN
+*
+         END DO
+*
+*        END DO for IM = 1, NM
+*
+      END DO
+*
+*     Print a summary of the results.
+*
+      CALL ALASUM( PATH, NOUT, NFAIL, NRUN, NERRS )
+*
+ 9999 FORMAT( 1X, A, ' M =', I5, ', N =', I5, ', NRHS =', I5,
+     $        ', KMAX =', I5, ', ABSTOL =', G12.5,
+     $        ', RELTOL =', G12.5, ', NB =', I4, ', NX =', I4,
+     $        ', type ', I2, ', test ', I2, ', ratio =', G12.5 )
+*
+*     End of ZCHKQP3RK
+*
+      END
diff --git a/TESTING/LIN/zchkqr.f b/TESTING/LIN/zchkqr.f
index a240d2da5f..740abf4dfb 100644
--- a/TESTING/LIN/zchkqr.f
+++ b/TESTING/LIN/zchkqr.f
@@ -198,6 +198,7 @@
       SUBROUTINE ZCHKQR( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   NRHS, THRESH, TSTERR, NMAX, A, AF, AQ, AR, AC,
      $                   B, X, XACT, TAU, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -244,7 +245,7 @@ SUBROUTINE ZCHKQR( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
       EXTERNAL           ZGENND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAERH, ALAHD, ALASUM, XLAENV, ZERRQR, ZGEQRS,
+      EXTERNAL           ALAERH, ALAHD, ALASUM, XLAENV, ZERRQR, ZGELS,
      $                   ZGET02, ZLACPY, ZLARHS, ZLATB4, ZLATMS, ZQRT01,
      $                   ZQRT01P, ZQRT02, ZQRT03
 *     ..
@@ -388,7 +389,7 @@ SUBROUTINE ZCHKQR( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                               WORK, LWORK, RWORK, RESULT( 3 ) )
                         NT = NT + 4
 *
-*                       If M>=N and K=N, call ZGEQRS to solve a system
+*                       If M>=N and K=N, call ZGELS to solve a system
 *                       with NRHS right hand sides and compute the
 *                       residual.
 *
@@ -405,14 +406,20 @@ SUBROUTINE ZCHKQR( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
 *
                            CALL ZLACPY( 'Full', M, NRHS, B, LDA, X,
      $                                  LDA )
-                           SRNAMT = 'ZGEQRS'
-                           CALL ZGEQRS( M, N, NRHS, AF, LDA, TAU, X,
-     $                                  LDA, WORK, LWORK, INFO )
 *
-*                          Check error code from ZGEQRS.
+*                          Reset AF to the original matrix. ZGELS
+*                          factors the matrix before solving the system.
+*
+                           CALL ZLACPY( 'Full', M, N, A, LDA, AF, LDA )
+*
+                           SRNAMT = 'ZGELS'
+                           CALL ZGELS( 'No transpose', M, N, NRHS, AF,
+     $                                 LDA, X, LDA, WORK, LWORK, INFO )
+*
+*                          Check error code from ZGELS.
 *
                            IF( INFO.NE.0 )
-     $                        CALL ALAERH( PATH, 'ZGEQRS', INFO, 0, ' ',
+     $                        CALL ALAERH( PATH, 'ZGELS', INFO, 0, 'N',
      $                                     M, N, NRHS, -1, NB, IMAT,
      $                                     NFAIL, NERRS, NOUT )
 *
diff --git a/TESTING/LIN/zchkrfp.f b/TESTING/LIN/zchkrfp.f
index 1764f566e4..b2af1e9fbb 100644
--- a/TESTING/LIN/zchkrfp.f
+++ b/TESTING/LIN/zchkrfp.f
@@ -56,6 +56,7 @@
 *
 *  =====================================================================
       PROGRAM ZCHKRFP
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -276,7 +277,7 @@ PROGRAM ZCHKRFP
  9995 FORMAT( ' !! Invalid input value: ', A4, '=', I6, '; must be <=',
      $      I6 )
  9994 FORMAT( /  ' Tests of the COMPLEX*16 LAPACK RFP routines ',
-     $      / ' LAPACK VERSION ', I1, '.', I1, '.', I1,
+     $      / ' LAPACK VERSION ', I1, '.', I2, '.', I1,
      $      / / ' The following parameter values will be used:' )
  9993 FORMAT( 4X, A4, ':  ', 10I6, / 11X, 10I6 )
  9992 FORMAT( / ' Routines pass computational tests if test ratio is ',
diff --git a/TESTING/LIN/zchkrq.f b/TESTING/LIN/zchkrq.f
index 32347c697c..6bcb3d6b9e 100644
--- a/TESTING/LIN/zchkrq.f
+++ b/TESTING/LIN/zchkrq.f
@@ -198,6 +198,7 @@
       SUBROUTINE ZCHKRQ( DOTYPE, NM, MVAL, NN, NVAL, NNB, NBVAL, NXVAL,
      $                   NRHS, THRESH, TSTERR, NMAX, A, AF, AQ, AR, AC,
      $                   B, X, XACT, TAU, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchksp.f b/TESTING/LIN/zchksp.f
index fbfc45eeb7..43bfc86b81 100644
--- a/TESTING/LIN/zchksp.f
+++ b/TESTING/LIN/zchksp.f
@@ -161,6 +161,7 @@
       SUBROUTINE ZCHKSP( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, A, AFAC, AINV, B, X, XACT, WORK, RWORK,
      $                   IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchksy.f b/TESTING/LIN/zchksy.f
index 7877eb7e2d..0c8c2c2b16 100644
--- a/TESTING/LIN/zchksy.f
+++ b/TESTING/LIN/zchksy.f
@@ -168,6 +168,7 @@
       SUBROUTINE ZCHKSY( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                   XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchksy_rk.f b/TESTING/LIN/zchksy_rk.f
index 3a206b30d8..d891f6425d 100644
--- a/TESTING/LIN/zchksy_rk.f
+++ b/TESTING/LIN/zchksy_rk.f
@@ -174,6 +174,7 @@
       SUBROUTINE ZCHKSY_RK( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                      THRESH, TSTERR, NMAX, A, AFAC, E, AINV, B,
      $                      X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchksy_rook.f b/TESTING/LIN/zchksy_rook.f
index dcb5b6edd1..0a18fd3de8 100644
--- a/TESTING/LIN/zchksy_rook.f
+++ b/TESTING/LIN/zchksy_rook.f
@@ -169,6 +169,7 @@
       SUBROUTINE ZCHKSY_ROOK( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                        THRESH, TSTERR, NMAX, A, AFAC, AINV, B, X,
      $                        XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchktb.f b/TESTING/LIN/zchktb.f
index e719786247..31253f7cbb 100644
--- a/TESTING/LIN/zchktb.f
+++ b/TESTING/LIN/zchktb.f
@@ -146,6 +146,7 @@
 *  =====================================================================
       SUBROUTINE ZCHKTB( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, AB, AINV, B, X, XACT, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchktp.f b/TESTING/LIN/zchktp.f
index 1798c24e77..38f4017980 100644
--- a/TESTING/LIN/zchktp.f
+++ b/TESTING/LIN/zchktp.f
@@ -87,7 +87,7 @@
 *> \verbatim
 *>          NMAX is INTEGER
 *>          The leading dimension of the work arrays.  NMAX >= the
-*>          maximumm value of N in NVAL.
+*>          maximum value of N in NVAL.
 *> \endverbatim
 *>
 *> \param[out] AP
@@ -148,6 +148,7 @@
       SUBROUTINE ZCHKTP( DOTYPE, NN, NVAL, NNS, NSVAL, THRESH, TSTERR,
      $                   NMAX, AP, AINVP, B, X, XACT, WORK, RWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zchktr.f b/TESTING/LIN/zchktr.f
index 0a6f47b1ea..fa23993b75 100644
--- a/TESTING/LIN/zchktr.f
+++ b/TESTING/LIN/zchktr.f
@@ -31,7 +31,7 @@
 *>
 *> \verbatim
 *>
-*> ZCHKTR tests ZTRTRI, -TRS, -RFS, and -CON, and ZLATRS
+*> ZCHKTR tests ZTRTRI, -TRS, -RFS, and -CON, and ZLATRS(3)
 *> \endverbatim
 *
 *  Arguments:
@@ -160,6 +160,7 @@
       SUBROUTINE ZCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                   THRESH, TSTERR, NMAX, A, AINV, B, X, XACT,
      $                   WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -184,7 +185,7 @@ SUBROUTINE ZCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
       INTEGER            NTYPE1, NTYPES
       PARAMETER          ( NTYPE1 = 10, NTYPES = 18 )
       INTEGER            NTESTS
-      PARAMETER          ( NTESTS = 9 )
+      PARAMETER          ( NTESTS = 10 )
       INTEGER            NTRAN
       PARAMETER          ( NTRAN = 3 )
       DOUBLE PRECISION   ONE, ZERO
@@ -195,13 +196,14 @@ SUBROUTINE ZCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
       CHARACTER*3        PATH
       INTEGER            I, IDIAG, IMAT, IN, INB, INFO, IRHS, ITRAN,
      $                   IUPLO, K, LDA, N, NB, NERRS, NFAIL, NRHS, NRUN
-      DOUBLE PRECISION   AINVNM, ANORM, DUMMY, RCOND, RCONDC, RCONDI,
-     $                   RCONDO, SCALE
+      DOUBLE PRECISION   AINVNM, ANORM, BIGNUM, DUMMY, RCOND, RCONDC,
+     $                   RCONDI, RCONDO, RES, SCALE, DLAMCH
 *     ..
 *     .. Local Arrays ..
       CHARACTER          TRANSS( NTRAN ), UPLOS( 2 )
       INTEGER            ISEED( 4 ), ISEEDY( 4 )
-      DOUBLE PRECISION   RESULT( NTESTS )
+      DOUBLE PRECISION   RESULT( NTESTS ), RWORK2( 2*NMAX ),
+     $                   SCALE3( 2 )
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -209,10 +211,10 @@ SUBROUTINE ZCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
       EXTERNAL           LSAME, ZLANTR
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAERH, ALAHD, ALASUM, XLAENV, ZCOPY, ZERRTR,
-     $                   ZGET04, ZLACPY, ZLARHS, ZLATRS, ZLATTR, ZTRCON,
-     $                   ZTRRFS, ZTRT01, ZTRT02, ZTRT03, ZTRT05, ZTRT06,
-     $                   ZTRTRI, ZTRTRS
+      EXTERNAL           ALAERH, ALAHD, ALASUM, DLAMCH, XLAENV, ZCOPY,
+     $                   ZDSCAL, ZERRTR, ZGET04, ZLACPY, ZLARHS, ZLATRS,
+     $                   ZLATRS3, ZLATTR, ZTRCON, ZTRRFS, ZTRT01,
+     $                   ZTRT02, ZTRT03, ZTRT05, ZTRT06, ZTRTRI, ZTRTRS
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -236,6 +238,7 @@ SUBROUTINE ZCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
 *
       PATH( 1: 1 ) = 'Zomplex precision'
       PATH( 2: 3 ) = 'TR'
+      BIGNUM = DLAMCH('Overflow') / DLAMCH('Precision')
       NRUN = 0
       NFAIL = 0
       NERRS = 0
@@ -380,7 +383,7 @@ SUBROUTINE ZCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
 *                       This line is needed on a Sun SPARCstation.
 *
                         IF( N.GT.0 )
-     $                     DUMMY = A( 1 )
+     $                     DUMMY = DBLE( A( 1 ) )
 *
                         CALL ZTRT02( UPLO, TRANS, DIAG, N, NRHS, A, LDA,
      $                               X, LDA, B, LDA, WORK, RWORK,
@@ -535,6 +538,32 @@ SUBROUTINE ZCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                         RWORK, ONE, B( N+1 ), LDA, X, LDA, WORK,
      $                         RESULT( 9 ) )
 *
+*+    TEST 10
+*                 Solve op(A)*X = B
+*
+                  SRNAMT = 'ZLATRS3'
+                  CALL ZCOPY( N, X, 1, B, 1 )
+                  CALL ZCOPY( N, X, 1, B( N+1 ), 1 )
+                  CALL ZDSCAL( N, BIGNUM, B( N+1 ), 1 )
+                  CALL ZLATRS3( UPLO, TRANS, DIAG, 'N', N, 2, A, LDA,
+     $                          B, MAX(1, N), SCALE3, RWORK, RWORK2,
+     $                          2*NMAX, INFO )
+*
+*                 Check error code from ZLATRS3.
+*
+                  IF( INFO.NE.0 )
+     $               CALL ALAERH( PATH, 'ZLATRS3', INFO, 0,
+     $                            UPLO // TRANS // DIAG // 'N', N, N,
+     $                            -1, -1, -1, IMAT, NFAIL, NERRS, NOUT )
+                  CALL ZTRT03( UPLO, TRANS, DIAG, N, 1, A, LDA,
+     $                         SCALE3( 1 ), RWORK, ONE, B( 1 ), LDA,
+     $                         X, LDA, WORK, RESULT( 10 ) )
+                  CALL ZDSCAL( N, BIGNUM, X, 1 )
+                  CALL ZTRT03( UPLO, TRANS, DIAG, N, 1, A, LDA,
+     $                         SCALE3( 2 ), RWORK, ONE, B( N+1 ), LDA,
+     $                         X, LDA, WORK, RES )
+                  RESULT( 10 ) = MAX( RESULT( 10 ), RES )
+*
 *                 Print information about the tests that did not pass
 *                 the threshold.
 *
@@ -552,7 +581,14 @@ SUBROUTINE ZCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
      $                  DIAG, 'Y', N, IMAT, 9, RESULT( 9 )
                      NFAIL = NFAIL + 1
                   END IF
-                  NRUN = NRUN + 2
+                  IF( RESULT( 10 ).GE.THRESH ) THEN
+                     IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
+     $                  CALL ALAHD( NOUT, PATH )
+                     WRITE( NOUT, FMT = 9996 )'ZLATRS3', UPLO, TRANS,
+     $                  DIAG, 'N', N, IMAT, 10, RESULT( 10 )
+                     NFAIL = NFAIL + 1
+                  END IF
+                  NRUN = NRUN + 3
    90          CONTINUE
   100       CONTINUE
   110    CONTINUE
@@ -565,8 +601,8 @@ SUBROUTINE ZCHKTR( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL,
  9999 FORMAT( ' UPLO=''', A1, ''', DIAG=''', A1, ''', N=', I5, ', NB=',
      $      I4, ', type ', I2, ', test(', I2, ')= ', G12.5 )
  9998 FORMAT( ' UPLO=''', A1, ''', TRANS=''', A1, ''', DIAG=''', A1,
-     $      ''', N=', I5, ', NB=', I4, ', type ', I2, ',
-     $      test(', I2, ')= ', G12.5 )
+     $      ''', N=', I5, ', NB=', I4, ', type ', I2, ', test(',
+     $      I2, ')= ', G12.5 )
  9997 FORMAT( ' NORM=''', A1, ''', UPLO =''', A1, ''', N=', I5, ',',
      $      11X, ' type ', I2, ', test(', I2, ')=', G12.5 )
  9996 FORMAT( 1X, A, '( ''', A1, ''', ''', A1, ''', ''', A1, ''', ''',
diff --git a/TESTING/LIN/zchktz.f b/TESTING/LIN/zchktz.f
index 754b2a33c3..5b5734e644 100644
--- a/TESTING/LIN/zchktz.f
+++ b/TESTING/LIN/zchktz.f
@@ -134,6 +134,7 @@
 *  =====================================================================
       SUBROUTINE ZCHKTZ( DOTYPE, NM, MVAL, NN, NVAL, THRESH, TSTERR, A,
      $                   COPYA, S, TAU, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvab.f b/TESTING/LIN/zdrvab.f
index 1305159593..db7a7bd782 100644
--- a/TESTING/LIN/zdrvab.f
+++ b/TESTING/LIN/zdrvab.f
@@ -149,6 +149,7 @@
       SUBROUTINE ZDRVAB( DOTYPE, NM, MVAL, NNS,
      $                   NSVAL, THRESH, NMAX, A, AFAC, B,
      $                   X, WORK, RWORK, SWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -348,7 +349,7 @@ SUBROUTINE ZDRVAB( DOTYPE, NM, MVAL, NNS,
                CALL ZGET08( TRANS, N, N, NRHS, A, LDA, X, LDA, WORK,
      $                      LDA, RWORK, RESULT( 1 ) )
 *
-*              Check if the test passes the tesing.
+*              Check if the test passes the testing.
 *              Print information about the tests that did not
 *              pass the testing.
 *
diff --git a/TESTING/LIN/zdrvac.f b/TESTING/LIN/zdrvac.f
index 20f8eb1e55..3a7d00da91 100644
--- a/TESTING/LIN/zdrvac.f
+++ b/TESTING/LIN/zdrvac.f
@@ -142,6 +142,7 @@
       SUBROUTINE ZDRVAC( DOTYPE, NM, MVAL, NNS, NSVAL, THRESH, NMAX,
      $                   A, AFAC, B, X, WORK,
      $                   RWORK, SWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -367,7 +368,7 @@ SUBROUTINE ZDRVAC( DOTYPE, NM, MVAL, NNS, NSVAL, THRESH, NMAX,
                   CALL ZPOT06( UPLO, N, NRHS, A, LDA, X, LDA, WORK,
      $               LDA, RWORK, RESULT( 1 ) )
 *
-*                 Check if the test passes the tesing.
+*                 Check if the test passes the testing.
 *                 Print information about the tests that did not
 *                 pass the testing.
 *
diff --git a/TESTING/LIN/zdrvgb.f b/TESTING/LIN/zdrvgb.f
index aa5712c3b5..69a0c60ecf 100644
--- a/TESTING/LIN/zdrvgb.f
+++ b/TESTING/LIN/zdrvgb.f
@@ -169,6 +169,7 @@
       SUBROUTINE ZDRVGB( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, LA,
      $                   AFB, LAFB, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvgbx.f b/TESTING/LIN/zdrvgbx.f
index 9bf3560f20..b17bfa1a4d 100644
--- a/TESTING/LIN/zdrvgbx.f
+++ b/TESTING/LIN/zdrvgbx.f
@@ -172,6 +172,7 @@
       SUBROUTINE ZDRVGB( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, LA,
      $                   AFB, LAFB, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvge.f b/TESTING/LIN/zdrvge.f
index f6ef2d19c1..f6eebd8f19 100644
--- a/TESTING/LIN/zdrvge.f
+++ b/TESTING/LIN/zdrvge.f
@@ -161,6 +161,7 @@
       SUBROUTINE ZDRVGE( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvgex.f b/TESTING/LIN/zdrvgex.f
index 27d9105a32..3be717ea4b 100644
--- a/TESTING/LIN/zdrvgex.f
+++ b/TESTING/LIN/zdrvgex.f
@@ -164,6 +164,7 @@
       SUBROUTINE ZDRVGE( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvgt.f b/TESTING/LIN/zdrvgt.f
index d055e4bdb2..5bb2ee0ce4 100644
--- a/TESTING/LIN/zdrvgt.f
+++ b/TESTING/LIN/zdrvgt.f
@@ -136,6 +136,7 @@
 *  =====================================================================
       SUBROUTINE ZDRVGT( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, AF,
      $                   B, X, XACT, WORK, RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -307,16 +308,16 @@ SUBROUTINE ZDRVGT( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, AF,
                   IZERO = 0
                ELSE IF( IMAT.EQ.8 ) THEN
                   IZERO = 1
-                  Z( 2 ) = A( N )
+                  Z( 2 ) = DBLE( A( N ) )
                   A( N ) = ZERO
                   IF( N.GT.1 ) THEN
-                     Z( 3 ) = A( 1 )
+                     Z( 3 ) = DBLE( A( 1 ) )
                      A( 1 ) = ZERO
                   END IF
                ELSE IF( IMAT.EQ.9 ) THEN
                   IZERO = N
-                  Z( 1 ) = A( 3*N-2 )
-                  Z( 2 ) = A( 2*N-1 )
+                  Z( 1 ) = DBLE( A( 3*N-2 ) )
+                  Z( 2 ) = DBLE( A( 2*N-1 ) )
                   A( 3*N-2 ) = ZERO
                   A( 2*N-1 ) = ZERO
                ELSE
diff --git a/TESTING/LIN/zdrvhe.f b/TESTING/LIN/zdrvhe.f
index a4cc639b19..9b0c98e05d 100644
--- a/TESTING/LIN/zdrvhe.f
+++ b/TESTING/LIN/zdrvhe.f
@@ -150,6 +150,7 @@
       SUBROUTINE ZDRVHE( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvhe_aa.f b/TESTING/LIN/zdrvhe_aa.f
index 34d8f2aaf1..28f268c5c6 100644
--- a/TESTING/LIN/zdrvhe_aa.f
+++ b/TESTING/LIN/zdrvhe_aa.f
@@ -150,6 +150,7 @@
       SUBROUTINE ZDRVHE_AA( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                         NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                         RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvhe_aa_2stage.f b/TESTING/LIN/zdrvhe_aa_2stage.f
index 9401867e0c..9f6d5cba84 100644
--- a/TESTING/LIN/zdrvhe_aa_2stage.f
+++ b/TESTING/LIN/zdrvhe_aa_2stage.f
@@ -152,6 +152,7 @@ SUBROUTINE ZDRVHE_AA_2STAGE(
      $                         DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                         NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                         RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -400,9 +401,9 @@ SUBROUTINE ZDRVHE_AA_2STAGE(
 *                    Factor the matrix and solve the system using ZHESV_AA.
 *
                      SRNAMT = 'ZHESV_AA_2STAGE '
-                     LWORK = MIN(N*NB, 3*NMAX*NMAX)
+                     LWORK = MIN( MAX( 1, N*NB ), 3*NMAX*NMAX )
                      CALL ZHESV_AA_2STAGE( UPLO, N, NRHS, AFAC, LDA,
-     $                                 AINV, (3*NB+1)*N, 
+     $                                 AINV, MAX( 1, (3*NB+1)*N ),
      $                                 IWORK, IWORK( 1+N ),
      $                                 X, LDA, WORK, LWORK, INFO )
 *
diff --git a/TESTING/LIN/zdrvhe_rk.f b/TESTING/LIN/zdrvhe_rk.f
index 2f34883d64..52232b7959 100644
--- a/TESTING/LIN/zdrvhe_rk.f
+++ b/TESTING/LIN/zdrvhe_rk.f
@@ -155,6 +155,7 @@
       SUBROUTINE ZDRVHE_RK( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                      NMAX, A, AFAC, E, AINV, B, X, XACT, WORK,
      $                      RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvhe_rook.f b/TESTING/LIN/zdrvhe_rook.f
index 59aed71be6..4bee964b35 100644
--- a/TESTING/LIN/zdrvhe_rook.f
+++ b/TESTING/LIN/zdrvhe_rook.f
@@ -150,6 +150,7 @@
       SUBROUTINE ZDRVHE_ROOK( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                        NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                        RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvhex.f b/TESTING/LIN/zdrvhex.f
index 0f66d28e93..d503610061 100644
--- a/TESTING/LIN/zdrvhex.f
+++ b/TESTING/LIN/zdrvhex.f
@@ -154,6 +154,7 @@
       SUBROUTINE ZDRVHE( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvhp.f b/TESTING/LIN/zdrvhp.f
index 5c96c03e75..8a0e9770b1 100644
--- a/TESTING/LIN/zdrvhp.f
+++ b/TESTING/LIN/zdrvhp.f
@@ -154,6 +154,7 @@
       SUBROUTINE ZDRVHP( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvls.f b/TESTING/LIN/zdrvls.f
index 2eab979054..49a2fdcd75 100644
--- a/TESTING/LIN/zdrvls.f
+++ b/TESTING/LIN/zdrvls.f
@@ -31,8 +31,8 @@
 *>
 *> \verbatim
 *>
-*> ZDRVLS tests the least squares driver routines ZGELS, ZGETSLS, ZGELSS, ZGELSY
-*> and ZGELSD.
+*> ZDRVLS tests the least squares driver routines ZGELS, ZGELST,
+*> ZGETSLS, ZGELSS, ZGELSY and ZGELSD.
 *> \endverbatim
 *
 *  Arguments:
@@ -189,6 +189,7 @@
       SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                   NBVAL, NXVAL, THRESH, TSTERR, A, COPYA, B,
      $                   COPYB, C, S, COPYS, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -211,7 +212,7 @@ SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *
 *     .. Parameters ..
       INTEGER            NTESTS
-      PARAMETER          ( NTESTS = 16 )
+      PARAMETER          ( NTESTS = 18 )
       INTEGER            SMLSIZ
       PARAMETER          ( SMLSIZ = 25 )
       DOUBLE PRECISION   ONE, ZERO
@@ -228,8 +229,8 @@ SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                   LWLSY, LWORK, M, MNMIN, N, NB, NCOLS, NERRS,
      $                   NFAIL, NRHS, NROWS, NRUN, RANK, MB,
      $                   MMAX, NMAX, NSMAX, LIWORK, LRWORK,
-     $                   LWORK_ZGELS, LWORK_ZGETSLS, LWORK_ZGELSS,
-     $                   LWORK_ZGELSY, LWORK_ZGELSD,
+     $                   LWORK_ZGELS, LWORK_ZGELST, LWORK_ZGETSLS,
+     $                   LWORK_ZGELSS, LWORK_ZGELSY, LWORK_ZGELSD,
      $                   LRWORK_ZGELSY, LRWORK_ZGELSS, LRWORK_ZGELSD
       DOUBLE PRECISION   EPS, NORMA, NORMB, RCOND
 *     ..
@@ -248,10 +249,10 @@ SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
       EXTERNAL           DASUM, DLAMCH, ZQRT12, ZQRT14, ZQRT17
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAERH, ALAHD, ALASVM, DAXPY, DLASRT, XLAENV,
-     $                   ZDSCAL, ZERRLS, ZGELS, ZGELSD, ZGELSS,
-     $                   ZGELSY, ZGEMM, ZLACPY, ZLARNV, ZQRT13, ZQRT15,
-     $                   ZQRT16, ZGETSLS
+      EXTERNAL           ALAERH, ALAHD, ALASVM, DAXPY, ZERRLS, ZGELS,
+     $                   ZGELSD, ZGELSS, ZGELST, ZGELSY, ZGEMM,
+     $                   ZGETSLS, ZLACPY, ZLARNV, ZQRT13, ZQRT15,
+     $                   ZQRT16, ZDSCAL, XLAENV
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, MAX, MIN, INT, SQRT
@@ -334,7 +335,8 @@ SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
       LIWORK = 1
 *
 *     Iterate through all test cases and compute necessary workspace
-*     sizes for ?GELS, ?GETSLS, ?GELSY, ?GELSS and ?GELSD routines.
+*     sizes for ?GELS, ?GELST, ?GETSLS, ?GELSY, ?GELSS and ?GELSD
+*     routines.
 *
       DO IM = 1, NM
          M = MVAL( IM )
@@ -361,6 +363,10 @@ SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
                               CALL ZGELS( TRANS, M, N, NRHS, A, LDA,
      $                                    B, LDB, WQ, -1, INFO )
                               LWORK_ZGELS = INT ( WQ( 1 ) )
+*                             Compute workspace needed for ZGELST
+                              CALL ZGELST( TRANS, M, N, NRHS, A, LDA,
+     $                                    B, LDB, WQ, -1, INFO )
+                              LWORK_ZGELST = INT ( WQ ( 1 ) )
 *                             Compute workspace needed for ZGETSLS
                               CALL ZGETSLS( TRANS, M, N, NRHS, A, LDA,
      $                                      B, LDB, WQ, -1, INFO )
@@ -390,9 +396,9 @@ SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
                         LRWORK = MAX( LRWORK, LRWORK_ZGELSY,
      $                                LRWORK_ZGELSS, LRWORK_ZGELSD )
 *                       Compute LWORK workspace needed for all functions
-                        LWORK = MAX( LWORK, LWORK_ZGELS, LWORK_ZGETSLS,
-     $                               LWORK_ZGELSY, LWORK_ZGELSS,
-     $                               LWORK_ZGELSD )
+                        LWORK = MAX( LWORK, LWORK_ZGELS, LWORK_ZGELST,
+     $                               LWORK_ZGETSLS, LWORK_ZGELSY,
+     $                               LWORK_ZGELSS, LWORK_ZGELSD )
                      END IF
                   ENDDO
                ENDDO
@@ -425,21 +431,26 @@ SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
                      ITYPE = ( IRANK-1 )*3 + ISCALE
                      IF( .NOT.DOTYPE( ITYPE ) )
      $                  GO TO 100
-*
+*                 =====================================================
+*                       Begin test ZGELS
+*                 =====================================================
                      IF( IRANK.EQ.1 ) THEN
 *
-*                       Test ZGELS
-*
 *                       Generate a matrix of scaling type ISCALE
 *
                         CALL ZQRT13( ISCALE, M, N, COPYA, LDA, NORMA,
      $                               ISEED )
-                        DO 40 INB = 1, NNB
+*
+*                       Loop for testing different block sizes.
+*
+                        DO INB = 1, NNB
                            NB = NBVAL( INB )
                            CALL XLAENV( 1, NB )
                            CALL XLAENV( 3, NXVAL( INB ) )
 *
-                           DO 30 ITRAN = 1, 2
+*                          Loop for testing non-transposed and transposed.
+*
+                           DO ITRAN = 1, 2
                               IF( ITRAN.EQ.1 ) THEN
                                  TRANS = 'N'
                                  NROWS = M
@@ -484,15 +495,20 @@ SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                                        ITYPE, NFAIL, NERRS,
      $                                        NOUT )
 *
-*                             Check correctness of results
+*                             Test 1: Check correctness of results
+*                             for ZGELS, compute the residual:
+*                             RESID = norm(B - A*X) /
+*                             / ( max(m,n) * norm(A) * norm(X) * EPS )
 *
-                              LDWORK = MAX( 1, NROWS )
                               IF( NROWS.GT.0 .AND. NRHS.GT.0 )
      $                           CALL ZLACPY( 'Full', NROWS, NRHS,
      $                                        COPYB, LDB, C, LDB )
                               CALL ZQRT16( TRANS, M, N, NRHS, COPYA,
      $                                     LDA, B, LDB, C, LDB, RWORK,
      $                                     RESULT( 1 ) )
+*
+*                             Test 2: Check correctness of results
+*                             for ZGELS.
 *
                               IF( ( ITRAN.EQ.1 .AND. M.GE.N ) .OR.
      $                            ( ITRAN.EQ.2 .AND. M.LT.N ) ) THEN
@@ -515,7 +531,7 @@ SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *                             Print information about the tests that
 *                             did not pass the threshold.
 *
-                              DO 20 K = 1, 2
+                              DO K = 1, 2
                                  IF( RESULT( K ).GE.THRESH ) THEN
                                     IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
      $                                 CALL ALAHD( NOUT, PATH )
@@ -524,26 +540,34 @@ SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                                 RESULT( K )
                                     NFAIL = NFAIL + 1
                                  END IF
-   20                         CONTINUE
+                              END DO
                               NRUN = NRUN + 2
-   30                      CONTINUE
-   40                   CONTINUE
-*
-*
-*                       Test ZGETSLS
+                           END DO
+                        END DO
+                     END IF
+*                 =====================================================
+*                       End test ZGELS
+*                 =====================================================
+*                 =====================================================
+*                       Begin test ZGELST
+*                 =====================================================
+                     IF( IRANK.EQ.1 ) THEN
 *
 *                       Generate a matrix of scaling type ISCALE
 *
                         CALL ZQRT13( ISCALE, M, N, COPYA, LDA, NORMA,
      $                               ISEED )
-                        DO 65 INB = 1, NNB
-                            MB = NBVAL( INB )
-                            CALL XLAENV( 1, MB )
-                             DO 62 IMB = 1, NNB
-                              NB = NBVAL( IMB )
-                              CALL XLAENV( 2, NB )
 *
-                           DO 60 ITRAN = 1, 2
+*                       Loop for testing different block sizes.
+*
+                        DO INB = 1, NNB
+                           NB = NBVAL( INB )
+                           CALL XLAENV( 1, NB )
+                           CALL XLAENV( 3, NXVAL( INB ) )
+*
+*                          Loop for testing non-transposed and transposed.
+*
+                           DO ITRAN = 1, 2
                               IF( ITRAN.EQ.1 ) THEN
                                  TRANS = 'N'
                                  NROWS = M
@@ -560,9 +584,9 @@ SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
                               IF( NCOLS.GT.0 ) THEN
                                  CALL ZLARNV( 2, ISEED, NCOLS*NRHS,
      $                                        WORK )
-                                 CALL ZSCAL( NCOLS*NRHS,
-     $                                       CONE / DBLE( NCOLS ), WORK,
-     $                                       1 )
+                                 CALL ZDSCAL( NCOLS*NRHS,
+     $                                        ONE / DBLE( NCOLS ), WORK,
+     $                                        1 )
                               END IF
                               CALL ZGEMM( TRANS, 'No transpose', NROWS,
      $                                    NRHS, NCOLS, CONE, COPYA, LDA,
@@ -578,31 +602,37 @@ SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
                                  CALL ZLACPY( 'Full', NROWS, NRHS,
      $                                        COPYB, LDB, B, LDB )
                               END IF
-                              SRNAMT = 'ZGETSLS '
-                              CALL ZGETSLS( TRANS, M, N, NRHS, A,
-     $                                 LDA, B, LDB, WORK, LWORK, INFO )
+                              SRNAMT = 'ZGELST'
+                              CALL ZGELST( TRANS, M, N, NRHS, A, LDA, B,
+     $                                    LDB, WORK, LWORK, INFO )
+*
                               IF( INFO.NE.0 )
-     $                           CALL ALAERH( PATH, 'ZGETSLS ', INFO, 0,
+     $                           CALL ALAERH( PATH, 'ZGELST', INFO, 0,
      $                                        TRANS, M, N, NRHS, -1, NB,
      $                                        ITYPE, NFAIL, NERRS,
      $                                        NOUT )
 *
-*                             Check correctness of results
+*                             Test 3: Check correctness of results
+*                             for ZGELST, compute the residual:
+*                             RESID = norm(B - A*X) /
+*                             / ( max(m,n) * norm(A) * norm(X) * EPS )
 *
-                              LDWORK = MAX( 1, NROWS )
                               IF( NROWS.GT.0 .AND. NRHS.GT.0 )
      $                           CALL ZLACPY( 'Full', NROWS, NRHS,
      $                                        COPYB, LDB, C, LDB )
                               CALL ZQRT16( TRANS, M, N, NRHS, COPYA,
-     $                                     LDA, B, LDB, C, LDB, WORK2,
-     $                                     RESULT( 15 ) )
+     $                                     LDA, B, LDB, C, LDB, RWORK,
+     $                                     RESULT( 3 ) )
+*
+*                             Test 4: Check correctness of results
+*                             for ZGELST.
 *
                               IF( ( ITRAN.EQ.1 .AND. M.GE.N ) .OR.
      $                            ( ITRAN.EQ.2 .AND. M.LT.N ) ) THEN
 *
 *                                Solving LS system
 *
-                                 RESULT( 16 ) = ZQRT17( TRANS, 1, M, N,
+                                 RESULT( 4 ) = ZQRT17( TRANS, 1, M, N,
      $                                         NRHS, COPYA, LDA, B, LDB,
      $                                         COPYB, LDB, C, WORK,
      $                                         LWORK )
@@ -610,7 +640,7 @@ SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *
 *                                Solving overdetermined system
 *
-                                 RESULT( 16 ) = ZQRT14( TRANS, M, N,
+                                 RESULT( 4 ) = ZQRT14( TRANS, M, N,
      $                                         NRHS, COPYA, LDA, B, LDB,
      $                                         WORK, LWORK )
                               END IF
@@ -618,21 +648,151 @@ SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *                             Print information about the tests that
 *                             did not pass the threshold.
 *
-                              DO 50 K = 15, 16
+                              DO K = 3, 4
                                  IF( RESULT( K ).GE.THRESH ) THEN
                                     IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
      $                                 CALL ALAHD( NOUT, PATH )
-                                    WRITE( NOUT, FMT = 9997 )TRANS, M,
-     $                                 N, NRHS, MB, NB, ITYPE, K,
+                                    WRITE( NOUT, FMT = 9999 )TRANS, M,
+     $                                 N, NRHS, NB, ITYPE, K,
      $                                 RESULT( K )
                                     NFAIL = NFAIL + 1
                                  END IF
-   50                         CONTINUE
+                              END DO
                               NRUN = NRUN + 2
-   60                      CONTINUE
-   62                      CONTINUE
-   65                   CONTINUE
+                           END DO
+                        END DO
+                     END IF
+*                 =====================================================
+*                       End test ZGELST
+*                 =====================================================
+*                 =====================================================
+*                       Begin test ZGELSTSLS
+*                 =====================================================
+                     IF( IRANK.EQ.1 ) THEN
+*
+*                       Generate a matrix of scaling type ISCALE
+*
+                        CALL ZQRT13( ISCALE, M, N, COPYA, LDA, NORMA,
+     $                               ISEED )
+*
+*                       Loop for testing different block sizes MB.
+*
+                        DO INB = 1, NNB
+                           MB = NBVAL( INB )
+                           CALL XLAENV( 1, MB )
+*
+*                          Loop for testing different block sizes NB.
+*
+                           DO IMB = 1, NNB
+                              NB = NBVAL( IMB )
+                              CALL XLAENV( 2, NB )
+*
+*                             Loop for testing non-transposed
+*                             and transposed.
+*
+                              DO ITRAN = 1, 2
+                                 IF( ITRAN.EQ.1 ) THEN
+                                    TRANS = 'N'
+                                    NROWS = M
+                                    NCOLS = N
+                                 ELSE
+                                    TRANS = 'C'
+                                    NROWS = N
+                                    NCOLS = M
+                                 END IF
+                                 LDWORK = MAX( 1, NCOLS )
+*
+*                                Set up a consistent rhs
+*
+                                 IF( NCOLS.GT.0 ) THEN
+                                    CALL ZLARNV( 2, ISEED, NCOLS*NRHS,
+     $                                           WORK )
+                                    CALL ZSCAL( NCOLS*NRHS,
+     $                                          CONE / DBLE( NCOLS ),
+     $                                          WORK, 1 )
+                                 END IF
+                                 CALL ZGEMM( TRANS, 'No transpose',
+     $                                       NROWS, NRHS, NCOLS, CONE,
+     $                                       COPYA, LDA, WORK, LDWORK,
+     $                                       CZERO, B, LDB )
+                                 CALL ZLACPY( 'Full', NROWS, NRHS,
+     $                                        B, LDB, COPYB, LDB )
+*
+*                                Solve LS or overdetermined system
+*
+                                 IF( M.GT.0 .AND. N.GT.0 ) THEN
+                                    CALL ZLACPY( 'Full', M, N,
+     $                                           COPYA, LDA, A, LDA )
+                                    CALL ZLACPY( 'Full', NROWS, NRHS,
+     $                                           COPYB, LDB, B, LDB )
+                                 END IF
+                                 SRNAMT = 'ZGETSLS '
+                                 CALL ZGETSLS( TRANS, M, N, NRHS, A,
+     $                                    LDA, B, LDB, WORK, LWORK,
+     $                                    INFO )
+                                 IF( INFO.NE.0 )
+     $                              CALL ALAERH( PATH, 'ZGETSLS ', INFO,
+     $                                           0, TRANS, M, N, NRHS,
+     $                                           -1, NB, ITYPE, NFAIL,
+     $                                           NERRS, NOUT )
+*
+*                             Test 5: Check correctness of results
+*                             for ZGETSLS, compute the residual:
+*                             RESID = norm(B - A*X) /
+*                             / ( max(m,n) * norm(A) * norm(X) * EPS )
+*
+                                 IF( NROWS.GT.0 .AND. NRHS.GT.0 )
+     $                              CALL ZLACPY( 'Full', NROWS, NRHS,
+     $                                           COPYB, LDB, C, LDB )
+                                 CALL ZQRT16( TRANS, M, N, NRHS,
+     $                                        COPYA, LDA, B, LDB,
+     $                                        C, LDB, WORK2,
+     $                                        RESULT( 5 ) )
+*
+*                             Test 6: Check correctness of results
+*                             for ZGETSLS.
+*
+                                 IF( ( ITRAN.EQ.1 .AND. M.GE.N ) .OR.
+     $                               ( ITRAN.EQ.2 .AND. M.LT.N ) ) THEN
+*
+*                                   Solving LS system, compute:
+*                                   r = norm((B- A*X)**T * A) /
+*                                 / (norm(A)*norm(B)*max(M,N,NRHS)*EPS)
+*
+                                    RESULT( 6 ) = ZQRT17( TRANS, 1, M,
+     $                                             N, NRHS, COPYA, LDA,
+     $                                             B, LDB, COPYB, LDB,
+     $                                             C, WORK, LWORK )
+                                 ELSE
+*
+*                                   Solving overdetermined system
+*
+                                    RESULT( 6 ) = ZQRT14( TRANS, M, N,
+     $                                             NRHS, COPYA, LDA, B,
+     $                                             LDB, WORK, LWORK )
+                                 END IF
+*
+*                                Print information about the tests that
+*                                did not pass the threshold.
+*
+                                 DO K = 5, 6
+                                    IF( RESULT( K ).GE.THRESH ) THEN
+                                       IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
+     $                                    CALL ALAHD( NOUT, PATH )
+                                       WRITE( NOUT, FMT = 9997 )TRANS,
+     $                                    M, N, NRHS, MB, NB, ITYPE, K,
+     $                                    RESULT( K )
+                                          NFAIL = NFAIL + 1
+                                    END IF
+                                 END DO
+                                 NRUN = NRUN + 2
+                              END DO
+                           END DO
+                        END DO
                      END IF
+*                 =====================================================
+*                       End test ZGELSTSLS
+*                 =====================================================
 *
 *                    Generate a matrix of scaling type ISCALE and rank
 *                    type IRANK.
@@ -680,37 +840,37 @@ SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *
 *                       workspace used: 2*MNMIN+NB*NB+NB*MAX(N,NRHS)
 *
-*                       Test 3:  Compute relative error in svd
+*                       Test 7:  Compute relative error in svd
 *                                workspace: M*N + 4*MIN(M,N) + MAX(M,N)
 *
-                        RESULT( 3 ) = ZQRT12( CRANK, CRANK, A, LDA,
+                        RESULT( 7 ) = ZQRT12( CRANK, CRANK, A, LDA,
      $                                COPYS, WORK, LWORK, RWORK )
 *
-*                       Test 4:  Compute error in solution
+*                       Test 8:  Compute error in solution
 *                                workspace:  M*NRHS + M
 *
                         CALL ZLACPY( 'Full', M, NRHS, COPYB, LDB, WORK,
      $                               LDWORK )
                         CALL ZQRT16( 'No transpose', M, N, NRHS, COPYA,
      $                               LDA, B, LDB, WORK, LDWORK, RWORK,
-     $                               RESULT( 4 ) )
+     $                               RESULT( 8 ) )
 *
-*                       Test 5:  Check norm of r'*A
+*                       Test 9:  Check norm of r'*A
 *                                workspace: NRHS*(M+N)
 *
-                        RESULT( 5 ) = ZERO
+                        RESULT( 9 ) = ZERO
                         IF( M.GT.CRANK )
-     $                     RESULT( 5 ) = ZQRT17( 'No transpose', 1, M,
+     $                     RESULT( 9 ) = ZQRT17( 'No transpose', 1, M,
      $                                   N, NRHS, COPYA, LDA, B, LDB,
      $                                   COPYB, LDB, C, WORK, LWORK )
 *
-*                       Test 6:  Check if x is in the rowspace of A
+*                       Test 10:  Check if x is in the rowspace of A
 *                                workspace: (M+NRHS)*(N+2)
 *
-                        RESULT( 6 ) = ZERO
+                        RESULT( 10 ) = ZERO
 *
                         IF( N.GT.CRANK )
-     $                     RESULT( 6 ) = ZQRT14( 'No transpose', M, N,
+     $                     RESULT( 10 ) = ZQRT14( 'No transpose', M, N,
      $                                   NRHS, COPYA, LDA, B, LDB,
      $                                   WORK, LWORK )
 *
@@ -736,38 +896,38 @@ SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
 *                       workspace used: 3*min(m,n) +
 *                                       max(2*min(m,n),nrhs,max(m,n))
 *
-*                       Test 7:  Compute relative error in svd
+*                       Test 11:  Compute relative error in svd
 *
                         IF( RANK.GT.0 ) THEN
                            CALL DAXPY( MNMIN, -ONE, COPYS, 1, S, 1 )
-                           RESULT( 7 ) = DASUM( MNMIN, S, 1 ) /
+                           RESULT( 11 ) = DASUM( MNMIN, S, 1 ) /
      $                                   DASUM( MNMIN, COPYS, 1 ) /
      $                                   ( EPS*DBLE( MNMIN ) )
                         ELSE
-                           RESULT( 7 ) = ZERO
+                           RESULT( 11 ) = ZERO
                         END IF
 *
-*                       Test 8:  Compute error in solution
+*                       Test 12:  Compute error in solution
 *
                         CALL ZLACPY( 'Full', M, NRHS, COPYB, LDB, WORK,
      $                               LDWORK )
                         CALL ZQRT16( 'No transpose', M, N, NRHS, COPYA,
      $                               LDA, B, LDB, WORK, LDWORK, RWORK,
-     $                               RESULT( 8 ) )
+     $                               RESULT( 12 ) )
 *
-*                       Test 9:  Check norm of r'*A
+*                       Test 13:  Check norm of r'*A
 *
-                        RESULT( 9 ) = ZERO
+                        RESULT( 13 ) = ZERO
                         IF( M.GT.CRANK )
-     $                     RESULT( 9 ) = ZQRT17( 'No transpose', 1, M,
+     $                     RESULT( 13 ) = ZQRT17( 'No transpose', 1, M,
      $                                   N, NRHS, COPYA, LDA, B, LDB,
      $                                   COPYB, LDB, C, WORK, LWORK )
 *
-*                       Test 10:  Check if x is in the rowspace of A
+*                       Test 14:  Check if x is in the rowspace of A
 *
-                        RESULT( 10 ) = ZERO
+                        RESULT( 14 ) = ZERO
                         IF( N.GT.CRANK )
-     $                     RESULT( 10 ) = ZQRT14( 'No transpose', M, N,
+     $                     RESULT( 14 ) = ZQRT14( 'No transpose', M, N,
      $                                    NRHS, COPYA, LDA, B, LDB,
      $                                    WORK, LWORK )
 *
@@ -792,45 +952,45 @@ SUBROUTINE ZDRVLS( DOTYPE, NM, MVAL, NN, NVAL, NNS, NSVAL, NNB,
      $                                  N, NRHS, -1, NB, ITYPE, NFAIL,
      $                                  NERRS, NOUT )
 *
-*                       Test 11:  Compute relative error in svd
+*                       Test 15:  Compute relative error in svd
 *
                         IF( RANK.GT.0 ) THEN
                            CALL DAXPY( MNMIN, -ONE, COPYS, 1, S, 1 )
-                           RESULT( 11 ) = DASUM( MNMIN, S, 1 ) /
+                           RESULT( 15 ) = DASUM( MNMIN, S, 1 ) /
      $                                    DASUM( MNMIN, COPYS, 1 ) /
      $                                    ( EPS*DBLE( MNMIN ) )
                         ELSE
-                           RESULT( 11 ) = ZERO
+                           RESULT( 15 ) = ZERO
                         END IF
 *
-*                       Test 12:  Compute error in solution
+*                       Test 16:  Compute error in solution
 *
                         CALL ZLACPY( 'Full', M, NRHS, COPYB, LDB, WORK,
      $                               LDWORK )
                         CALL ZQRT16( 'No transpose', M, N, NRHS, COPYA,
      $                               LDA, B, LDB, WORK, LDWORK, RWORK,
-     $                               RESULT( 12 ) )
+     $                               RESULT( 16 ) )
 *
-*                       Test 13:  Check norm of r'*A
+*                       Test 17:  Check norm of r'*A
 *
-                        RESULT( 13 ) = ZERO
+                        RESULT( 17 ) = ZERO
                         IF( M.GT.CRANK )
-     $                     RESULT( 13 ) = ZQRT17( 'No transpose', 1, M,
+     $                     RESULT( 17 ) = ZQRT17( 'No transpose', 1, M,
      $                                    N, NRHS, COPYA, LDA, B, LDB,
      $                                    COPYB, LDB, C, WORK, LWORK )
 *
-*                       Test 14:  Check if x is in the rowspace of A
+*                       Test 18:  Check if x is in the rowspace of A
 *
-                        RESULT( 14 ) = ZERO
+                        RESULT( 18 ) = ZERO
                         IF( N.GT.CRANK )
-     $                     RESULT( 14 ) = ZQRT14( 'No transpose', M, N,
+     $                     RESULT( 18 ) = ZQRT14( 'No transpose', M, N,
      $                                    NRHS, COPYA, LDA, B, LDB,
      $                                    WORK, LWORK )
 *
 *                       Print information about the tests that did not
 *                       pass the threshold.
 *
-                        DO 80 K = 3, 14
+                        DO 80 K = 7, 18
                            IF( RESULT( K ).GE.THRESH ) THEN
                               IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 )
      $                           CALL ALAHD( NOUT, PATH )
diff --git a/TESTING/LIN/zdrvpb.f b/TESTING/LIN/zdrvpb.f
index a3eecb83ea..3a98c16137 100644
--- a/TESTING/LIN/zdrvpb.f
+++ b/TESTING/LIN/zdrvpb.f
@@ -156,6 +156,7 @@
       SUBROUTINE ZDRVPB( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvpo.f b/TESTING/LIN/zdrvpo.f
index 3cc691c5b4..81873f4043 100644
--- a/TESTING/LIN/zdrvpo.f
+++ b/TESTING/LIN/zdrvpo.f
@@ -156,6 +156,7 @@
       SUBROUTINE ZDRVPO( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvpox.f b/TESTING/LIN/zdrvpox.f
index d124059620..2548be0f9d 100644
--- a/TESTING/LIN/zdrvpox.f
+++ b/TESTING/LIN/zdrvpox.f
@@ -159,6 +159,7 @@
       SUBROUTINE ZDRVPO( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvpp.f b/TESTING/LIN/zdrvpp.f
index f63f7145dd..c78cd9637c 100644
--- a/TESTING/LIN/zdrvpp.f
+++ b/TESTING/LIN/zdrvpp.f
@@ -156,6 +156,7 @@
       SUBROUTINE ZDRVPP( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, ASAV, B, BSAV, X, XACT, S, WORK,
      $                   RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvpt.f b/TESTING/LIN/zdrvpt.f
index 14a9f76ba0..7fcb62a8f6 100644
--- a/TESTING/LIN/zdrvpt.f
+++ b/TESTING/LIN/zdrvpt.f
@@ -137,6 +137,7 @@
 *  =====================================================================
       SUBROUTINE ZDRVPT( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, D,
      $                   E, B, X, XACT, WORK, RWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -266,12 +267,12 @@ SUBROUTINE ZDRVPT( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, D,
 *
                IA = 1
                DO 20 I = 1, N - 1
-                  D( I ) = A( IA )
+                  D( I ) = DBLE( A( IA ) )
                   E( I ) = A( IA+1 )
                   IA = IA + 2
    20          CONTINUE
                IF( N.GT.0 )
-     $            D( N ) = A( IA )
+     $            D( N ) = DBLE( A( IA ) )
             ELSE
 *
 *              Type 7-12:  generate a diagonally dominant matrix with
@@ -333,13 +334,13 @@ SUBROUTINE ZDRVPT( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, D,
                   Z( 2 ) = D( 1 )
                   D( 1 ) = ZERO
                   IF( N.GT.1 ) THEN
-                     Z( 3 ) = E( 1 )
+                     Z( 3 ) = DBLE( E( 1 ) )
                      E( 1 ) = ZERO
                   END IF
                ELSE IF( IMAT.EQ.9 ) THEN
                   IZERO = N
                   IF( N.GT.1 ) THEN
-                     Z( 1 ) = E( N-1 )
+                     Z( 1 ) = DBLE( E( N-1 ) )
                      E( N-1 ) = ZERO
                   END IF
                   Z( 2 ) = D( N )
@@ -347,9 +348,9 @@ SUBROUTINE ZDRVPT( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, A, D,
                ELSE IF( IMAT.EQ.10 ) THEN
                   IZERO = ( N+1 ) / 2
                   IF( IZERO.GT.1 ) THEN
-                     Z( 1 ) = E( IZERO-1 )
+                     Z( 1 ) = DBLE( E( IZERO-1 ) )
                      E( IZERO-1 ) = ZERO
-                     Z( 3 ) = E( IZERO )
+                     Z( 3 ) = DBLE( E( IZERO ) )
                      E( IZERO ) = ZERO
                   END IF
                   Z( 2 ) = D( IZERO )
diff --git a/TESTING/LIN/zdrvrf1.f b/TESTING/LIN/zdrvrf1.f
index 0e54815fbc..86914b8ba8 100644
--- a/TESTING/LIN/zdrvrf1.f
+++ b/TESTING/LIN/zdrvrf1.f
@@ -92,6 +92,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZDRVRF1( NOUT, NN, NVAL, THRESH, A, LDA, ARF, WORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvrf2.f b/TESTING/LIN/zdrvrf2.f
index 7f03e30ae3..34a1a2f364 100644
--- a/TESTING/LIN/zdrvrf2.f
+++ b/TESTING/LIN/zdrvrf2.f
@@ -86,6 +86,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZDRVRF2( NOUT, NN, NVAL, A, LDA, ARF, AP, ASAV  )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvrf3.f b/TESTING/LIN/zdrvrf3.f
index 7a44dba29f..a08e3ccebd 100644
--- a/TESTING/LIN/zdrvrf3.f
+++ b/TESTING/LIN/zdrvrf3.f
@@ -116,6 +116,7 @@
 *  =====================================================================
       SUBROUTINE ZDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
      +                    D_WORK_ZLANGE, Z_WORK_ZGEQRF, TAU )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -156,9 +157,10 @@ SUBROUTINE ZDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
       DOUBLE PRECISION   RESULT( NTESTS )
 *     ..
 *     .. External Functions ..
+      LOGICAL            LSAME
       DOUBLE PRECISION   DLAMCH, ZLANGE
       COMPLEX*16         ZLARND
-      EXTERNAL           DLAMCH, ZLARND, ZLANGE
+      EXTERNAL           DLAMCH, ZLARND, ZLANGE, LSAME
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ZTRTTF, ZGEQRF, ZGEQLF, ZTFSM, ZTRSM
@@ -222,9 +224,9 @@ SUBROUTINE ZDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *
                            DO 100 IALPHA = 1, 3
 *
-                              IF ( IALPHA.EQ. 1) THEN
+                              IF ( IALPHA.EQ.1 ) THEN
                                  ALPHA = ZERO
-                              ELSE IF ( IALPHA.EQ. 2) THEN
+                              ELSE IF ( IALPHA.EQ.2 ) THEN
                                  ALPHA = ONE
                               ELSE
                                  ALPHA = ZLARND( 4, ISEED )
@@ -263,7 +265,7 @@ SUBROUTINE ZDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *
                               DO J = 1, NA
                                  DO I = 1, NA
-                                    A( I, J) = ZLARND( 4, ISEED )
+                                    A( I, J ) = ZLARND( 4, ISEED )
                                  END DO
                               END DO
 *
@@ -276,6 +278,20 @@ SUBROUTINE ZDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
                                  CALL ZGEQRF( NA, NA, A, LDA, TAU,
      +                                        Z_WORK_ZGEQRF, LDA,
      +                                        INFO )
+*
+*                                Forcing main diagonal of test matrix to
+*                                be unit makes it ill-conditioned for
+*                                some test cases
+*
+                                 IF ( LSAME( DIAG, 'U' ) ) THEN
+                                    DO J = 1, NA
+                                       DO I = 1, J
+                                          A( I, J ) = A( I, J ) /
+     +                                            ( 2.0 * A( J, J ) )
+                                       END DO
+                                    END DO
+                                 END IF
+*
                               ELSE
 *
 *                                The case IUPLO.EQ.2 is when SIDE.EQ.'L'
@@ -285,6 +301,20 @@ SUBROUTINE ZDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
                                  CALL ZGELQF( NA, NA, A, LDA, TAU,
      +                                        Z_WORK_ZGEQRF, LDA,
      +                                        INFO )
+*
+*                                Forcing main diagonal of test matrix to
+*                                be unit makes it ill-conditioned for
+*                                some test cases
+*
+                                 IF ( LSAME( DIAG, 'U' ) ) THEN
+                                    DO I = 1, NA
+                                       DO J = 1, I
+                                          A( I, J ) = A( I, J ) /
+     +                                            ( 2.0 * A( I, I ) )
+                                       END DO
+                                    END DO
+                                 END IF
+*
                               END IF
 *
 *                             After the QR factorization, the diagonal
@@ -293,7 +323,8 @@ SUBROUTINE ZDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *                             value 1.0E+00.
 *
                               DO J = 1, NA
-                                 A( J, J) = A(J,J) * ZLARND( 5, ISEED )
+                                 A( J, J ) = A( J, J ) *
+     +                                   ZLARND( 5, ISEED )
                               END DO
 *
 *                             Store a copy of A in RFP format (in ARF).
@@ -307,8 +338,8 @@ SUBROUTINE ZDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *
                               DO J = 1, N
                                  DO I = 1, M
-                                    B1( I, J) = ZLARND( 4, ISEED )
-                                    B2( I, J) = B1( I, J)
+                                    B1( I, J ) = ZLARND( 4, ISEED )
+                                    B2( I, J ) = B1( I, J )
                                  END DO
                               END DO
 *
@@ -331,24 +362,24 @@ SUBROUTINE ZDRVRF3( NOUT, NN, NVAL, THRESH, A, LDA, ARF, B1, B2,
 *
                               DO J = 1, N
                                  DO I = 1, M
-                                    B1( I, J) = B2( I, J ) - B1( I, J )
+                                    B1( I, J ) = B2( I, J ) - B1( I, J )
                                  END DO
                               END DO
 *
-                              RESULT(1) = ZLANGE( 'I', M, N, B1, LDA,
+                              RESULT( 1 ) = ZLANGE( 'I', M, N, B1, LDA,
      +                                            D_WORK_ZLANGE )
 *
-                              RESULT(1) = RESULT(1) / SQRT( EPS )
-     +                                    / MAX ( MAX( M, N), 1 )
+                              RESULT( 1 ) = RESULT( 1 ) / SQRT( EPS )
+     +                                    / MAX ( MAX( M, N ), 1 )
 *
-                              IF( RESULT(1).GE.THRESH ) THEN
+                              IF( RESULT( 1 ).GE.THRESH ) THEN
                                  IF( NFAIL.EQ.0 ) THEN
                                     WRITE( NOUT, * )
                                     WRITE( NOUT, FMT = 9999 )
                                  END IF
                                  WRITE( NOUT, FMT = 9997 ) 'ZTFSM',
      +                              CFORM, SIDE, UPLO, TRANS, DIAG, M,
-     +                              N, RESULT(1)
+     +                              N, RESULT( 1 )
                                  NFAIL = NFAIL + 1
                               END IF
 *
diff --git a/TESTING/LIN/zdrvrf4.f b/TESTING/LIN/zdrvrf4.f
index 17c4a2d24d..51f46066b7 100644
--- a/TESTING/LIN/zdrvrf4.f
+++ b/TESTING/LIN/zdrvrf4.f
@@ -111,6 +111,7 @@
 *  =====================================================================
       SUBROUTINE ZDRVRF4( NOUT, NN, NVAL, THRESH, C1, C2, LDC, CRF, A,
      +                    LDA, D_WORK_ZLANGE )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvrfp.f b/TESTING/LIN/zdrvrfp.f
index be6c13445b..15a4eb7941 100644
--- a/TESTING/LIN/zdrvrfp.f
+++ b/TESTING/LIN/zdrvrfp.f
@@ -241,6 +241,7 @@ SUBROUTINE ZDRVRFP( NOUT, NN, NVAL, NNS, NSVAL, NNT, NTVAL,
      +              Z_WORK_ZLATMS, Z_WORK_ZPOT02,
      +              Z_WORK_ZPOT03, D_WORK_ZLATMS, D_WORK_ZLANHE,
      +              D_WORK_ZPOT01, D_WORK_ZPOT02, D_WORK_ZPOT03 )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvsp.f b/TESTING/LIN/zdrvsp.f
index 1b68711d74..5a382ba1f7 100644
--- a/TESTING/LIN/zdrvsp.f
+++ b/TESTING/LIN/zdrvsp.f
@@ -154,6 +154,7 @@
       SUBROUTINE ZDRVSP( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvsy.f b/TESTING/LIN/zdrvsy.f
index 0e5623794e..e4ac1365b3 100644
--- a/TESTING/LIN/zdrvsy.f
+++ b/TESTING/LIN/zdrvsy.f
@@ -150,6 +150,7 @@
       SUBROUTINE ZDRVSY( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvsy_aa.f b/TESTING/LIN/zdrvsy_aa.f
index eaac75ed71..74aaf61a14 100644
--- a/TESTING/LIN/zdrvsy_aa.f
+++ b/TESTING/LIN/zdrvsy_aa.f
@@ -150,6 +150,7 @@
       SUBROUTINE ZDRVSY_AA( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                      NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                      RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvsy_aa_2stage.f b/TESTING/LIN/zdrvsy_aa_2stage.f
index 21497477cb..744872db39 100644
--- a/TESTING/LIN/zdrvsy_aa_2stage.f
+++ b/TESTING/LIN/zdrvsy_aa_2stage.f
@@ -152,6 +152,7 @@ SUBROUTINE ZDRVSY_AA_2STAGE(
      $                         DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                         NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                         RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -229,7 +230,7 @@ SUBROUTINE ZDRVSY_AA_2STAGE(
 *     Test path
 *
       PATH( 1: 1 ) = 'Zomplex precision'
-      PATH( 2: 3 ) = 'H2'
+      PATH( 2: 3 ) = 'S2'
 *
 *     Path to generate matrices
 *
diff --git a/TESTING/LIN/zdrvsy_rk.f b/TESTING/LIN/zdrvsy_rk.f
index a27e891eb6..e628bf9c77 100644
--- a/TESTING/LIN/zdrvsy_rk.f
+++ b/TESTING/LIN/zdrvsy_rk.f
@@ -155,6 +155,7 @@
       SUBROUTINE ZDRVSY_RK( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                      NMAX, A, AFAC, E, AINV, B, X, XACT, WORK,
      $                      RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvsy_rook.f b/TESTING/LIN/zdrvsy_rook.f
index eba5faa81b..8f1e16ddc8 100644
--- a/TESTING/LIN/zdrvsy_rook.f
+++ b/TESTING/LIN/zdrvsy_rook.f
@@ -150,6 +150,7 @@
       SUBROUTINE ZDRVSY_ROOK( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR,
      $                        NMAX, A, AFAC, AINV, B, X, XACT, WORK,
      $                        RWORK, IWORK, NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zdrvsyx.f b/TESTING/LIN/zdrvsyx.f
index 5d2d741c00..8c5e04241a 100644
--- a/TESTING/LIN/zdrvsyx.f
+++ b/TESTING/LIN/zdrvsyx.f
@@ -154,6 +154,7 @@
       SUBROUTINE ZDRVSY( DOTYPE, NN, NVAL, NRHS, THRESH, TSTERR, NMAX,
      $                   A, AFAC, AINV, B, X, XACT, WORK, RWORK, IWORK,
      $                   NOUT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zerrab.f b/TESTING/LIN/zerrab.f
index 81bf019d9f..f333df3fe2 100644
--- a/TESTING/LIN/zerrab.f
+++ b/TESTING/LIN/zerrab.f
@@ -44,6 +44,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRAB( NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zerrac.f b/TESTING/LIN/zerrac.f
index 1d32450aa0..0d6ce859f9 100644
--- a/TESTING/LIN/zerrac.f
+++ b/TESTING/LIN/zerrac.f
@@ -44,6 +44,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRAC( NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zerrge.f b/TESTING/LIN/zerrge.f
index 6bf79f6467..a1c1cb9720 100644
--- a/TESTING/LIN/zerrge.f
+++ b/TESTING/LIN/zerrge.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRGE( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zerrgex.f b/TESTING/LIN/zerrgex.f
index b20f0ce74f..62b45e4fc5 100644
--- a/TESTING/LIN/zerrgex.f
+++ b/TESTING/LIN/zerrgex.f
@@ -55,6 +55,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRGE( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zerrgt.f b/TESTING/LIN/zerrgt.f
index bfb760e089..1126e5d258 100644
--- a/TESTING/LIN/zerrgt.f
+++ b/TESTING/LIN/zerrgt.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRGT( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zerrhe.f b/TESTING/LIN/zerrhe.f
index e49e5037c5..f7fb8baf37 100644
--- a/TESTING/LIN/zerrhe.f
+++ b/TESTING/LIN/zerrhe.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRHE( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -135,7 +136,7 @@ SUBROUTINE ZERRHE( PATH, NUNIT )
       IF( LSAMEN( 2, C2, 'HE' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a Hermitian indefinite matrix with patrial
+*        of a Hermitian indefinite matrix with partial
 *        (Bunch-Kaufman) diagonal pivoting method.
 *
 *        ZHETRF
@@ -580,7 +581,7 @@ SUBROUTINE ZERRHE( PATH, NUNIT )
       ELSE IF( LSAMEN( 2, C2, 'HP' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a Hermitian indefinite packed matrix with patrial
+*        of a Hermitian indefinite packed matrix with partial
 *        (Bunch-Kaufman) diagonal pivoting method.
 *
 *        ZHPTRF
diff --git a/TESTING/LIN/zerrhex.f b/TESTING/LIN/zerrhex.f
index b6e8b77ef3..b831d8dea1 100644
--- a/TESTING/LIN/zerrhex.f
+++ b/TESTING/LIN/zerrhex.f
@@ -55,6 +55,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRHE( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -138,7 +139,7 @@ SUBROUTINE ZERRHE( PATH, NUNIT )
       OK = .TRUE.
 *
 *     Test error exits of the routines that use factorization
-*     of a Hermitian indefinite matrix with patrial
+*     of a Hermitian indefinite matrix with partial
 *     (Bunch-Kaufman) diagonal pivoting method.
 *
       IF( LSAMEN( 2, C2, 'HE' ) ) THEN
@@ -526,7 +527,7 @@ SUBROUTINE ZERRHE( PATH, NUNIT )
       ELSE IF( LSAMEN( 2, C2, 'HP' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a Hermitian indefinite packed matrix with patrial
+*        of a Hermitian indefinite packed matrix with partial
 *        (Bunch-Kaufman) diagonal pivoting method.
 *
 *        ZHPTRF
diff --git a/TESTING/LIN/zerrlq.f b/TESTING/LIN/zerrlq.f
index d8e5a8fe84..11c232b304 100644
--- a/TESTING/LIN/zerrlq.f
+++ b/TESTING/LIN/zerrlq.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRLQ( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -76,7 +77,7 @@ SUBROUTINE ZERRLQ( PATH, NUNIT )
      $                   W( NMAX ), X( NMAX )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAESM, CHKXER, ZGELQ2, ZGELQF, ZGELQS, ZUNGL2,
+      EXTERNAL           ALAESM, CHKXER, ZGELQ2, ZGELQF, ZUNGL2,
      $                   ZUNGLQ, ZUNML2, ZUNMLQ
 *     ..
 *     .. Scalars in Common ..
@@ -142,31 +143,6 @@ SUBROUTINE ZERRLQ( PATH, NUNIT )
       CALL ZGELQ2( 2, 1, A, 1, B, W, INFO )
       CALL CHKXER( 'ZGELQ2', INFOT, NOUT, LERR, OK )
 *
-*     ZGELQS
-*
-      SRNAMT = 'ZGELQS'
-      INFOT = 1
-      CALL ZGELQS( -1, 0, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'ZGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 2
-      CALL ZGELQS( 0, -1, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'ZGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 2
-      CALL ZGELQS( 2, 1, 0, A, 2, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'ZGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 3
-      CALL ZGELQS( 0, 0, -1, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'ZGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 5
-      CALL ZGELQS( 2, 2, 0, A, 1, X, B, 2, W, 1, INFO )
-      CALL CHKXER( 'ZGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 8
-      CALL ZGELQS( 1, 2, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'ZGELQS', INFOT, NOUT, LERR, OK )
-      INFOT = 10
-      CALL ZGELQS( 1, 1, 2, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'ZGELQS', INFOT, NOUT, LERR, OK )
-*
 *     ZUNGLQ
 *
       SRNAMT = 'ZUNGLQ'
diff --git a/TESTING/LIN/zerrls.f b/TESTING/LIN/zerrls.f
index 66e56c8c6b..2e7b7bcb74 100644
--- a/TESTING/LIN/zerrls.f
+++ b/TESTING/LIN/zerrls.f
@@ -22,7 +22,7 @@
 *> \verbatim
 *>
 *> ZERRLS tests the error exits for the COMPLEX*16 least squares
-*> driver routines (ZGELS, CGELSS, CGELSY, CGELSD).
+*> driver routines (ZGELS, ZGELST, ZGETSLS, CGELSS, CGELSY, CGELSD).
 *> \endverbatim
 *
 *  Arguments:
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRLS( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -83,7 +84,8 @@ SUBROUTINE ZERRLS( PATH, NUNIT )
       EXTERNAL           LSAMEN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAESM, CHKXER, ZGELS, ZGELSD, ZGELSS, ZGELSY
+      EXTERNAL           ALAESM, CHKXER, ZGELS, ZGELSD, ZGELSS, ZGELST,
+     $                   ZGELSY, ZGETSLS
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -130,10 +132,66 @@ SUBROUTINE ZERRLS( PATH, NUNIT )
          INFOT = 8
          CALL ZGELS( 'N', 2, 0, 0, A, 2, B, 1, W, 2, INFO )
          CALL CHKXER( 'ZGELS ', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL ZGELS( 'N', 0, 2, 0, A, 1, B, 1, W, 2, INFO )
+         CALL CHKXER( 'ZGELS', INFOT, NOUT, LERR, OK )
          INFOT = 10
          CALL ZGELS( 'N', 1, 1, 0, A, 1, B, 1, W, 1, INFO )
          CALL CHKXER( 'ZGELS ', INFOT, NOUT, LERR, OK )
 *
+*        ZGELST
+*
+         SRNAMT = 'ZGELST'
+         INFOT = 1
+         CALL ZGELST( '/', 0, 0, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'ZGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL ZGELST( 'N', -1, 0, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'ZGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL ZGELST( 'N', 0, -1, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'ZGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL ZGELST( 'N', 0, 0, -1, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'ZGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 6
+         CALL ZGELST( 'N', 2, 0, 0, A, 1, B, 2, W, 2, INFO )
+         CALL CHKXER( 'ZGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL ZGELST( 'N', 2, 0, 0, A, 2, B, 1, W, 2, INFO )
+         CALL CHKXER( 'ZGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL ZGELST( 'N', 0, 2, 0, A, 1, B, 1, W, 2, INFO )
+         CALL CHKXER( 'ZGELST', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL ZGELST( 'N', 1, 1, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'ZGELST', INFOT, NOUT, LERR, OK )
+*
+*        ZGETSLS
+*
+         SRNAMT = 'ZGETSLS'
+         INFOT = 1
+         CALL ZGETSLS( '/', 0, 0, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'ZGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL ZGETSLS( 'N', -1, 0, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'ZGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL ZGETSLS( 'N', 0, -1, 0, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'ZGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL ZGETSLS( 'N', 0, 0, -1, A, 1, B, 1, W, 1, INFO )
+         CALL CHKXER( 'ZGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 6
+         CALL ZGETSLS( 'N', 2, 0, 0, A, 1, B, 2, W, 2, INFO )
+         CALL CHKXER( 'ZGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL ZGETSLS( 'N', 2, 0, 0, A, 2, B, 1, W, 2, INFO )
+         CALL CHKXER( 'ZGETSLS', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL ZGETSLS( 'N', 0, 2, 0, A, 1, B, 1, W, 2, INFO )
+         CALL CHKXER( 'ZGETSLS', INFOT, NOUT, LERR, OK )
+*
 *        ZGELSS
 *
          SRNAMT = 'ZGELSS'
diff --git a/TESTING/LIN/zerrpo.f b/TESTING/LIN/zerrpo.f
index 802377dd59..0e83f9d7e4 100644
--- a/TESTING/LIN/zerrpo.f
+++ b/TESTING/LIN/zerrpo.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRPO( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zerrpox.f b/TESTING/LIN/zerrpox.f
index 2af8aeab96..ed51764734 100644
--- a/TESTING/LIN/zerrpox.f
+++ b/TESTING/LIN/zerrpox.f
@@ -55,6 +55,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRPO( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zerrps.f b/TESTING/LIN/zerrps.f
index 86425c1920..81c83736eb 100644
--- a/TESTING/LIN/zerrps.f
+++ b/TESTING/LIN/zerrps.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRPS( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zerrql.f b/TESTING/LIN/zerrql.f
index ebbbb8f644..4ffd774322 100644
--- a/TESTING/LIN/zerrql.f
+++ b/TESTING/LIN/zerrql.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRQL( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zerrqp.f b/TESTING/LIN/zerrqp.f
index 5251d45229..8906101b79 100644
--- a/TESTING/LIN/zerrqp.f
+++ b/TESTING/LIN/zerrqp.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRQP( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zerrqr.f b/TESTING/LIN/zerrqr.f
index 114453d4c2..f12f77b55f 100644
--- a/TESTING/LIN/zerrqr.f
+++ b/TESTING/LIN/zerrqr.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRQR( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine (--
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -77,7 +78,7 @@ SUBROUTINE ZERRQR( PATH, NUNIT )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALAESM, CHKXER, ZGEQR2, ZGEQR2P, ZGEQRF,
-     $                   ZGEQRFP, ZGEQRS, ZUNG2R, ZUNGQR, ZUNM2R,
+     $                   ZGEQRFP, ZUNG2R, ZUNGQR, ZUNM2R,
      $                   ZUNMQR
 *     ..
 *     .. Scalars in Common ..
@@ -172,31 +173,6 @@ SUBROUTINE ZERRQR( PATH, NUNIT )
       CALL ZGEQR2P( 2, 1, A, 1, B, W, INFO )
       CALL CHKXER( 'ZGEQR2P', INFOT, NOUT, LERR, OK )
 *
-*     ZGEQRS
-*
-      SRNAMT = 'ZGEQRS'
-      INFOT = 1
-      CALL ZGEQRS( -1, 0, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'ZGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 2
-      CALL ZGEQRS( 0, -1, 0, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'ZGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 2
-      CALL ZGEQRS( 1, 2, 0, A, 2, X, B, 2, W, 1, INFO )
-      CALL CHKXER( 'ZGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 3
-      CALL ZGEQRS( 0, 0, -1, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'ZGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 5
-      CALL ZGEQRS( 2, 1, 0, A, 1, X, B, 2, W, 1, INFO )
-      CALL CHKXER( 'ZGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 8
-      CALL ZGEQRS( 2, 1, 0, A, 2, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'ZGEQRS', INFOT, NOUT, LERR, OK )
-      INFOT = 10
-      CALL ZGEQRS( 1, 1, 2, A, 1, X, B, 1, W, 1, INFO )
-      CALL CHKXER( 'ZGEQRS', INFOT, NOUT, LERR, OK )
-*
 *     ZUNGQR
 *
       SRNAMT = 'ZUNGQR'
diff --git a/TESTING/LIN/zerrrfp.f b/TESTING/LIN/zerrrfp.f
index e7916d50de..de7ee5c9ae 100644
--- a/TESTING/LIN/zerrrfp.f
+++ b/TESTING/LIN/zerrrfp.f
@@ -49,6 +49,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRRFP( NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zerrrq.f b/TESTING/LIN/zerrrq.f
index e1af3729ce..4f67756abb 100644
--- a/TESTING/LIN/zerrrq.f
+++ b/TESTING/LIN/zerrrq.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRRQ( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zerrsy.f b/TESTING/LIN/zerrsy.f
index a50f9d24e3..a948e0795b 100644
--- a/TESTING/LIN/zerrsy.f
+++ b/TESTING/LIN/zerrsy.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRSY( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -132,7 +133,7 @@ SUBROUTINE ZERRSY( PATH, NUNIT )
       IF( LSAMEN( 2, C2, 'SY' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a symmetric indefinite matrix with patrial
+*        of a symmetric indefinite matrix with partial
 *        (Bunch-Kaufman) diagonal pivoting method.
 *
 *        ZSYTRF
@@ -471,7 +472,7 @@ SUBROUTINE ZERRSY( PATH, NUNIT )
       ELSE IF( LSAMEN( 2, C2, 'SP' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a symmetric indefinite packed matrix with patrial
+*        of a symmetric indefinite packed matrix with partial
 *        (Bunch-Kaufman) pivoting.
 *
 *        ZSPTRF
diff --git a/TESTING/LIN/zerrsyx.f b/TESTING/LIN/zerrsyx.f
index 23d2a5a2ba..e238e6fd1a 100644
--- a/TESTING/LIN/zerrsyx.f
+++ b/TESTING/LIN/zerrsyx.f
@@ -55,6 +55,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRSY( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -139,7 +140,7 @@ SUBROUTINE ZERRSY( PATH, NUNIT )
       IF( LSAMEN( 2, C2, 'SY' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a symmetric indefinite matrix with patrial
+*        of a symmetric indefinite matrix with partial
 *        (Bunch-Kaufman) diagonal pivoting method.
 *
 *        ZSYTRF
@@ -525,7 +526,7 @@ SUBROUTINE ZERRSY( PATH, NUNIT )
       ELSE IF( LSAMEN( 2, C2, 'SP' ) ) THEN
 *
 *        Test error exits of the routines that use factorization
-*        of a symmetric indefinite packed matrix with patrial
+*        of a symmetric indefinite packed matrix with partial
 *        (Bunch-Kaufman) pivoting.
 *
 *        ZSPTRF
diff --git a/TESTING/LIN/zerrtr.f b/TESTING/LIN/zerrtr.f
index 098040ace3..7c61c0bfe2 100644
--- a/TESTING/LIN/zerrtr.f
+++ b/TESTING/LIN/zerrtr.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRTR( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -70,7 +71,7 @@ SUBROUTINE ZERRTR( PATH, NUNIT )
 *     .. Local Scalars ..
       CHARACTER*2        C2
       INTEGER            INFO
-      DOUBLE PRECISION   RCOND, SCALE
+      DOUBLE PRECISION   RCOND, SCALE, SCALES(0)
 *     ..
 *     .. Local Arrays ..
       DOUBLE PRECISION   R1( NMAX ), R2( NMAX ), RW( NMAX )
@@ -82,9 +83,10 @@ SUBROUTINE ZERRTR( PATH, NUNIT )
       EXTERNAL           LSAMEN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ALAESM, CHKXER, ZLATBS, ZLATPS, ZLATRS, ZTBCON,
-     $                   ZTBRFS, ZTBTRS, ZTPCON, ZTPRFS, ZTPTRI, ZTPTRS,
-     $                   ZTRCON, ZTRRFS, ZTRTI2, ZTRTRI, ZTRTRS
+      EXTERNAL           ALAESM, CHKXER, ZLATBS, ZLATPS, ZLATRS,
+     $                   ZLATRS3, ZTBCON, ZTBRFS, ZTBTRS, ZTPCON,
+     $                   ZTPRFS, ZTPTRI, ZTPTRS, ZTRCON, ZTRRFS, ZTRTI2,
+     $                   ZTRTRI, ZTRTRS
 *     ..
 *     .. Scalars in Common ..
       LOGICAL            LERR, OK
@@ -240,6 +242,46 @@ SUBROUTINE ZERRTR( PATH, NUNIT )
          CALL ZLATRS( 'U', 'N', 'N', 'N', 2, A, 1, X, SCALE, RW, INFO )
          CALL CHKXER( 'ZLATRS', INFOT, NOUT, LERR, OK )
 *
+*        ZLATRS3
+*
+         SRNAMT = 'ZLATRS3'
+         INFOT = 1
+         CALL ZLATRS3( '/', 'N', 'N', 'N', 0, 0, A, 1, X, 1, SCALES,
+     $                 RW, RW( 2 ), 1, INFO )
+         CALL CHKXER( 'ZLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL ZLATRS3( 'U', '/', 'N', 'N', 0, 0, A, 1, X, 1, SCALES,
+     $                 RW, RW( 2 ), 1, INFO )
+         CALL CHKXER( 'ZLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL ZLATRS3( 'U', 'N', '/', 'N', 0, 0, A, 1, X, 1, SCALES,
+     $                 RW, RW( 2 ), 1, INFO )
+         CALL CHKXER( 'ZLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 4
+         CALL ZLATRS3( 'U', 'N', 'N', '/', 0, 0, A, 1, X, 1, SCALES,
+     $                 RW, RW( 2 ), 1, INFO )
+         CALL CHKXER( 'ZLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL ZLATRS3( 'U', 'N', 'N', 'N', -1, 0, A, 1, X, 1, SCALES,
+     $                 RW, RW( 2 ), 1, INFO )
+         CALL CHKXER( 'ZLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 6
+         CALL ZLATRS3( 'U', 'N', 'N', 'N', 0, -1, A, 1, X, 1, SCALES,
+     $                 RW, RW( 2 ), 1, INFO )
+         CALL CHKXER( 'ZLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL ZLATRS3( 'U', 'N', 'N', 'N', 2, 0, A, 1, X, 1, SCALES,
+     $                 RW, RW( 2 ), 1, INFO )
+         CALL CHKXER( 'ZLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL ZLATRS3( 'U', 'N', 'N', 'N', 2, 0, A, 2, X, 1, SCALES,
+     $                 RW, RW( 2 ), 1, INFO )
+         CALL CHKXER( 'ZLATRS3', INFOT, NOUT, LERR, OK )
+         INFOT = 14
+         CALL ZLATRS3( 'U', 'N', 'N', 'N', 1, 0, A, 1, X, 1, SCALES,
+     $                 RW, RW( 2 ), 0, INFO )
+         CALL CHKXER( 'ZLATRS3', INFOT, NOUT, LERR, OK )
+*
 *     Test error exits for the packed triangular routines.
 *
       ELSE IF( LSAMEN( 2, C2, 'TP' ) ) THEN
diff --git a/TESTING/LIN/zerrtsqr.f b/TESTING/LIN/zerrtsqr.f
index d874ae8392..19f73fa7ab 100644
--- a/TESTING/LIN/zerrtsqr.f
+++ b/TESTING/LIN/zerrtsqr.f
@@ -70,7 +70,7 @@ SUBROUTINE ZERRTSQR( PATH, NUNIT )
       PARAMETER          ( NMAX = 2 )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I, INFO, J, NB
+      INTEGER            I, INFO, J, MB, NB
 *     ..
 *     .. Local Arrays ..
       COMPLEX*16         A( NMAX, NMAX ), T( NMAX, NMAX ), W( NMAX ),
@@ -130,6 +130,35 @@ SUBROUTINE ZERRTSQR( PATH, NUNIT )
       CALL ZGEQR( 3, 2, A, 3, TAU, 8, W, 0, INFO )
       CALL CHKXER( 'ZGEQR', INFOT, NOUT, LERR, OK )
 *
+*     ZLATSQR
+*
+      MB = 1
+      NB = 1
+      SRNAMT = 'ZLATSQR'
+      INFOT = 1
+      CALL ZLATSQR( -1, 0, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'ZLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL ZLATSQR( 1, 2, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'ZLATSQR', INFOT, NOUT, LERR, OK )
+      CALL ZLATSQR( 0, -1, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'ZLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL ZLATSQR( 2, 1, -1, NB, A, 2, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'ZLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL ZLATSQR( 2, 1, MB, 2, A, 2, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'ZLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 6
+      CALL ZLATSQR( 2, 1, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'ZLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL ZLATSQR( 2, 1, MB, NB, A, 2, TAU, 0, W, 1, INFO )
+      CALL CHKXER( 'ZLATSQR', INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL ZLATSQR( 2, 1, MB, NB, A, 2, TAU, 2, W, 0, INFO )
+      CALL CHKXER( 'ZLATSQR', INFOT, NOUT, LERR, OK )
+*
 *     ZGEMQR
 *
       TAU(1)=1
@@ -189,6 +218,37 @@ SUBROUTINE ZERRTSQR( PATH, NUNIT )
       CALL ZGELQ( 2, 3, A, 3, TAU, 8, W, 0, INFO )
       CALL CHKXER( 'ZGELQ', INFOT, NOUT, LERR, OK )
 *
+*     ZLASWLQ
+*
+      MB = 1
+      NB = 1
+      SRNAMT = 'ZLASWLQ'
+      INFOT = 1
+      CALL ZLASWLQ( -1, 0, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'ZLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 2
+      CALL ZLASWLQ( 2, 1, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'ZLASWLQ', INFOT, NOUT, LERR, OK )
+      CALL ZLASWLQ( 0, -1, MB, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'ZLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 3
+      CALL ZLASWLQ( 1, 2, -1, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'ZLASWLQ', INFOT, NOUT, LERR, OK )
+      CALL ZLASWLQ( 1, 1, 2, NB, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'ZLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 4
+      CALL ZLASWLQ( 1, 2, MB, -1, A, 1, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'ZLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 6
+      CALL ZLASWLQ( 1, 2, MB, NB, A, 0, TAU, 1, W, 1, INFO )
+      CALL CHKXER( 'ZLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 8
+      CALL ZLASWLQ( 1, 2, MB, NB, A, 1, TAU, 0, W, 1, INFO )
+      CALL CHKXER( 'ZLASWLQ', INFOT, NOUT, LERR, OK )
+      INFOT = 10
+      CALL ZLASWLQ( 1, 2, MB, NB, A, 1, TAU, 1, W, 0, INFO )
+      CALL CHKXER( 'ZLASWLQ', INFOT, NOUT, LERR, OK )
+*
 *     ZGEMLQ
 *
       TAU(1)=1
diff --git a/TESTING/LIN/zerrtz.f b/TESTING/LIN/zerrtz.f
index 693ec0cb1a..23fa3b6dda 100644
--- a/TESTING/LIN/zerrtz.f
+++ b/TESTING/LIN/zerrtz.f
@@ -51,6 +51,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRTZ( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zerrvx.f b/TESTING/LIN/zerrvx.f
index ea7823df3f..09d412d07c 100644
--- a/TESTING/LIN/zerrvx.f
+++ b/TESTING/LIN/zerrvx.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRVX( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -653,6 +654,9 @@ SUBROUTINE ZERRVX( PATH, NUNIT )
          INFOT = 3
          CALL ZHESV_ROOK( 'U', 0, -1, A, 1, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'ZHESV_ROOK', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL ZHESV_ROOK( 'U', 2, 0, A, 1, IP, B, 2, W, 1, INFO )
+         CALL CHKXER( 'ZHESV_ROOK', INFOT, NOUT, LERR, OK )
          INFOT = 8
          CALL ZHESV_ROOK( 'U', 2, 0, A, 2, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'ZHESV_ROOK', INFOT, NOUT, LERR, OK )
@@ -700,21 +704,27 @@ SUBROUTINE ZERRVX( PATH, NUNIT )
 *
       ELSE IF( LSAMEN( 2, C2, 'HA' ) ) THEN
 *
-*        ZHESV_AA
-*
-        SRNAMT = 'ZHESV_AA'
-        INFOT = 1
-        CALL ZHESV_AA( '/', 0, 0, A, 1, IP, B, 1, W, 1, INFO )
-        CALL CHKXER( 'ZHESV_AA', INFOT, NOUT, LERR, OK )
-        INFOT = 2
-        CALL ZHESV_AA( 'U', -1, 0, A, 1, IP, B, 1, W, 1, INFO )
-        CALL CHKXER( 'ZHESV_AA', INFOT, NOUT, LERR, OK )
-        INFOT = 3
-        CALL ZHESV_AA( 'U', 0, -1, A, 1, IP, B, 1, W, 1, INFO )
-        CALL CHKXER( 'ZHESV_AA', INFOT, NOUT, LERR, OK )
-        INFOT = 8
-        CALL ZHESV_AA( 'U', 2, 0, A, 2, IP, B, 1, W, 1, INFO )
-        CALL CHKXER( 'ZHESV_AA', INFOT, NOUT, LERR, OK )
+*        ZHESV_AASEN
+*
+         SRNAMT = 'ZHESV_AA'
+         INFOT = 1
+         CALL ZHESV_AA( '/', 0, 0, A, 1, IP, B, 1, W, 1, INFO )
+         CALL CHKXER( 'ZHESV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL ZHESV_AA( 'U', -1, 0, A, 1, IP, B, 1, W, 1, INFO )
+         CALL CHKXER( 'ZHESV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL ZHESV_AA( 'U', 0, -1, A, 1, IP, B, 1, W, 1, INFO )
+         CALL CHKXER( 'ZHESV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL ZHESV_AA( 'U', 2, 0, A, 1, IP, B, 2, W, 1, INFO )
+         CALL CHKXER( 'ZHESV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL ZHESV_AA( 'U', 2, 0, A, 2, IP, B, 1, W, 1, INFO )
+         CALL CHKXER( 'ZHESV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL ZHESV_AA( 'U', 3, 1, A, 3, IP, B, 3, W, 6, INFO )
+         CALL CHKXER( 'ZHESV_AA', INFOT, NOUT, LERR, OK )
 *
       ELSE IF( LSAMEN( 2, C2, 'H2' ) ) THEN
 *
@@ -735,16 +745,44 @@ SUBROUTINE ZERRVX( PATH, NUNIT )
          CALL CHKXER( 'ZHESV_AA_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 5
          CALL ZHESV_AA_2STAGE( 'U', 2, 1, A, 1, A, 1, IP, IP, B, 1,
+     $                         W, 1, INFO )
+         CALL CHKXER( 'ZHESV_AA_2STAGE', INFOT, NOUT, LERR, OK )
+         INFOT = 7
+         CALL ZHESV_AA_2STAGE( 'U', 2, 1, A, 2, A, 1, IP, IP, B, 2,
      $                         W, 1, INFO )
          CALL CHKXER( 'ZHESV_AA_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 11
          CALL ZHESV_AA_2STAGE( 'U', 2, 1, A, 2, A, 8, IP, IP, B, 1,
      $                         W, 1, INFO )
          CALL CHKXER( 'ZHESV_AA_2STAGE', INFOT, NOUT, LERR, OK )
-         INFOT = 7
-         CALL ZHESV_AA_2STAGE( 'U', 2, 1, A, 2, A, 1, IP, IP, B, 2,
+         INFOT = 13
+         CALL ZHESV_AA_2STAGE( 'U', 2, 1, A, 2, A, 8, IP, IP, B, 2,
      $                         W, 1, INFO )
          CALL CHKXER( 'ZHESV_AA_2STAGE', INFOT, NOUT, LERR, OK )
+*
+      ELSE IF( LSAMEN( 2, C2, 'SA' ) ) THEN
+*
+*        ZSYSV_AASEN
+*
+         SRNAMT = 'ZSYSV_AA'
+         INFOT = 1
+         CALL ZSYSV_AA( '/', 0, 0, A, 1, IP, B, 1, W, 1, INFO )
+         CALL CHKXER( 'ZSYSV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 2
+         CALL ZSYSV_AA( 'U', -1, 0, A, 1, IP, B, 1, W, 1, INFO )
+         CALL CHKXER( 'ZSYSV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 3
+         CALL ZSYSV_AA( 'U', 0, -1, A, 1, IP, B, 1, W, 1, INFO )
+         CALL CHKXER( 'ZSYSV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL ZSYSV_AA( 'U', 2, 0, A, 1, IP, B, 2, W, 1, INFO )
+         CALL CHKXER( 'ZSYSV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 8
+         CALL ZSYSV_AA( 'U', 2, 0, A, 2, IP, B, 1, W, 1, INFO )
+         CALL CHKXER( 'ZSYSV_AA', INFOT, NOUT, LERR, OK )
+         INFOT = 10
+         CALL ZSYSV_AA( 'U', 3, 1, A, 3, IP, B, 3, W, 6, INFO )
+         CALL CHKXER( 'ZSYSV_AA', INFOT, NOUT, LERR, OK )
 *
       ELSE IF( LSAMEN( 2, C2, 'S2' ) ) THEN
 *
@@ -765,17 +803,21 @@ SUBROUTINE ZERRVX( PATH, NUNIT )
          CALL CHKXER( 'ZSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 5
          CALL ZSYSV_AA_2STAGE( 'U', 2, 1, A, 1, A, 1, IP, IP, B, 1,
+     $                         W, 1, INFO )
+         CALL CHKXER( 'ZSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
+         INFOT = 7
+         CALL ZSYSV_AA_2STAGE( 'U', 2, 1, A, 2, A, 1, IP, IP, B, 2,
      $                         W, 1, INFO )
          CALL CHKXER( 'ZSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
          INFOT = 11
          CALL ZSYSV_AA_2STAGE( 'U', 2, 1, A, 2, A, 8, IP, IP, B, 1,
      $                         W, 1, INFO )
          CALL CHKXER( 'ZSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
-         INFOT = 7
-         CALL ZSYSV_AA_2STAGE( 'U', 2, 1, A, 2, A, 1, IP, IP, B, 2,
+         INFOT = 13
+         CALL ZSYSV_AA_2STAGE( 'U', 2, 1, A, 2, A, 8, IP, IP, B, 2,
      $                         W, 1, INFO )
          CALL CHKXER( 'ZSYSV_AA_2STAGE', INFOT, NOUT, LERR, OK )
-**
+*
       ELSE IF( LSAMEN( 2, C2, 'HP' ) ) THEN
 *
 *        ZHPSV
@@ -836,6 +878,9 @@ SUBROUTINE ZERRVX( PATH, NUNIT )
          INFOT = 3
          CALL ZSYSV( 'U', 0, -1, A, 1, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'ZSYSV ', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL ZSYSV( 'U', 2, 0, A, 1, IP, B, 2, W, 1, INFO )
+         CALL CHKXER( 'ZSYSV ', INFOT, NOUT, LERR, OK )
          INFOT = 8
          CALL ZSYSV( 'U', 2, 0, A, 2, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'ZSYSV ', INFOT, NOUT, LERR, OK )
@@ -900,6 +945,9 @@ SUBROUTINE ZERRVX( PATH, NUNIT )
          INFOT = 3
          CALL ZSYSV_ROOK( 'U', 0, -1, A, 1, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'ZSYSV_ROOK', INFOT, NOUT, LERR, OK )
+         INFOT = 5
+         CALL ZSYSV_ROOK( 'U', 2, 0, A, 1, IP, B, 2, W, 1, INFO )
+         CALL CHKXER( 'ZSYSV_ROOK', INFOT, NOUT, LERR, OK )
          INFOT = 8
          CALL ZSYSV_ROOK( 'U', 2, 0, A, 2, IP, B, 1, W, 1, INFO )
          CALL CHKXER( 'ZSYSV_ROOK', INFOT, NOUT, LERR, OK )
diff --git a/TESTING/LIN/zerrvxx.f b/TESTING/LIN/zerrvxx.f
index 8fd920fccf..5b2d55c8d2 100644
--- a/TESTING/LIN/zerrvxx.f
+++ b/TESTING/LIN/zerrvxx.f
@@ -52,6 +52,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZERRVX( PATH, NUNIT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zgbt01.f b/TESTING/LIN/zgbt01.f
index e041ab9fa0..4126774539 100644
--- a/TESTING/LIN/zgbt01.f
+++ b/TESTING/LIN/zgbt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE ZGBT01( M, N, KL, KU, A, LDA, AFAC, LDAFAC, IPIV, WORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zgbt02.f b/TESTING/LIN/zgbt02.f
index 0d13b571ad..9fa8429c6c 100644
--- a/TESTING/LIN/zgbt02.f
+++ b/TESTING/LIN/zgbt02.f
@@ -145,6 +145,7 @@
 *  =====================================================================
       SUBROUTINE ZGBT02( TRANS, M, N, KL, KU, NRHS, A, LDA, X, LDX, B,
      $                   LDB, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zgbt05.f b/TESTING/LIN/zgbt05.f
index 0dc6852118..898165aef9 100644
--- a/TESTING/LIN/zgbt05.f
+++ b/TESTING/LIN/zgbt05.f
@@ -173,6 +173,7 @@
 *  =====================================================================
       SUBROUTINE ZGBT05( TRANS, N, KL, KU, NRHS, AB, LDAB, B, LDB, X,
      $                   LDX, XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zgennd.f b/TESTING/LIN/zgennd.f
index 48c9ad7269..a4a99b6d06 100644
--- a/TESTING/LIN/zgennd.f
+++ b/TESTING/LIN/zgennd.f
@@ -65,6 +65,7 @@
 *
 *  =====================================================================
       LOGICAL FUNCTION ZGENND (M, N, A, LDA)
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zgeqls.f b/TESTING/LIN/zgeqls.f
index ee3ec4938a..5d0eb55e85 100644
--- a/TESTING/LIN/zgeqls.f
+++ b/TESTING/LIN/zgeqls.f
@@ -119,6 +119,7 @@
 *  =====================================================================
       SUBROUTINE ZGEQLS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zgerqs.f b/TESTING/LIN/zgerqs.f
index ca9f527f0a..ce3021284e 100644
--- a/TESTING/LIN/zgerqs.f
+++ b/TESTING/LIN/zgerqs.f
@@ -119,6 +119,7 @@
 *  =====================================================================
       SUBROUTINE ZGERQS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zget01.f b/TESTING/LIN/zget01.f
index e462298681..bbb20fd7a7 100644
--- a/TESTING/LIN/zget01.f
+++ b/TESTING/LIN/zget01.f
@@ -105,6 +105,7 @@
 *  =====================================================================
       SUBROUTINE ZGET01( M, N, A, LDA, AFAC, LDAFAC, IPIV, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zget02.f b/TESTING/LIN/zget02.f
index 1ffa387959..8f45177b52 100644
--- a/TESTING/LIN/zget02.f
+++ b/TESTING/LIN/zget02.f
@@ -131,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE ZGET02( TRANS, M, N, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zget03.f b/TESTING/LIN/zget03.f
index 74121aabc3..94e5c2226d 100644
--- a/TESTING/LIN/zget03.f
+++ b/TESTING/LIN/zget03.f
@@ -107,6 +107,7 @@
 *  =====================================================================
       SUBROUTINE ZGET03( N, A, LDA, AINV, LDAINV, WORK, LDWORK, RWORK,
      $                   RCOND, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zget04.f b/TESTING/LIN/zget04.f
index fa0d23899e..5c2df339be 100644
--- a/TESTING/LIN/zget04.f
+++ b/TESTING/LIN/zget04.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZGET04( N, NRHS, X, LDX, XACT, LDXACT, RCOND, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zget07.f b/TESTING/LIN/zget07.f
index dc78e0bb60..6354993845 100644
--- a/TESTING/LIN/zget07.f
+++ b/TESTING/LIN/zget07.f
@@ -163,6 +163,7 @@
 *  =====================================================================
       SUBROUTINE ZGET07( TRANS, N, NRHS, A, LDA, B, LDB, X, LDX, XACT,
      $                   LDXACT, FERR, CHKFERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zget08.f b/TESTING/LIN/zget08.f
index 32291170c1..9800ee02f7 100644
--- a/TESTING/LIN/zget08.f
+++ b/TESTING/LIN/zget08.f
@@ -130,6 +130,7 @@
 *  =====================================================================
       SUBROUTINE ZGET08( TRANS, M, N, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zgtt01.f b/TESTING/LIN/zgtt01.f
index c63fdbc25d..d41e26365e 100644
--- a/TESTING/LIN/zgtt01.f
+++ b/TESTING/LIN/zgtt01.f
@@ -39,7 +39,7 @@
 *
 *> \param[in] N
 *> \verbatim
-*>          N is INTEGTER
+*>          N is INTEGER
 *>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
@@ -131,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE ZGTT01( N, DL, D, DU, DLF, DF, DUF, DU2, IPIV, WORK,
      $                   LDWORK, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zgtt02.f b/TESTING/LIN/zgtt02.f
index 72cc9ea712..90cc7356e1 100644
--- a/TESTING/LIN/zgtt02.f
+++ b/TESTING/LIN/zgtt02.f
@@ -47,7 +47,7 @@
 *>
 *> \param[in] N
 *> \verbatim
-*>          N is INTEGTER
+*>          N is INTEGER
 *>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
@@ -121,6 +121,7 @@
 *  =====================================================================
       SUBROUTINE ZGTT02( TRANS, N, NRHS, DL, D, DU, X, LDX, B, LDB,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zgtt05.f b/TESTING/LIN/zgtt05.f
index fc8b2f8d62..cfd971088f 100644
--- a/TESTING/LIN/zgtt05.f
+++ b/TESTING/LIN/zgtt05.f
@@ -162,6 +162,7 @@
 *  =====================================================================
       SUBROUTINE ZGTT05( TRANS, N, NRHS, DL, D, DU, B, LDB, X, LDX,
      $                   XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zhet01.f b/TESTING/LIN/zhet01.f
index b532964693..7410fb479d 100644
--- a/TESTING/LIN/zhet01.f
+++ b/TESTING/LIN/zhet01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE ZHET01( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C, LDC,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zhet01_3.f b/TESTING/LIN/zhet01_3.f
index 0a76404d66..853f146684 100644
--- a/TESTING/LIN/zhet01_3.f
+++ b/TESTING/LIN/zhet01_3.f
@@ -138,6 +138,7 @@
 *  =====================================================================
       SUBROUTINE ZHET01_3( UPLO, N, A, LDA, AFAC, LDAFAC, E, IPIV, C,
      $                     LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,7 +189,7 @@ SUBROUTINE ZHET01_3( UPLO, N, A, LDA, AFAC, LDAFAC, E, IPIV, C,
          RETURN
       END IF
 *
-*     a) Revert to multiplyers of L
+*     a) Revert to multipliers of L
 *
       CALL ZSYCONVF_ROOK( UPLO, 'R', N, AFAC, LDAFAC, E, IPIV, INFO )
 *
diff --git a/TESTING/LIN/zhet01_aa.f b/TESTING/LIN/zhet01_aa.f
index de6a7475ce..f1035c8180 100644
--- a/TESTING/LIN/zhet01_aa.f
+++ b/TESTING/LIN/zhet01_aa.f
@@ -121,6 +121,7 @@
 *  =====================================================================
       SUBROUTINE ZHET01_AA( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
      $                      LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zhet01_rook.f b/TESTING/LIN/zhet01_rook.f
index 88ccf4c1f4..97639450fc 100644
--- a/TESTING/LIN/zhet01_rook.f
+++ b/TESTING/LIN/zhet01_rook.f
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE ZHET01_ROOK( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
      $                        LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zhpt01.f b/TESTING/LIN/zhpt01.f
index 5ac14fdcfe..61db22601c 100644
--- a/TESTING/LIN/zhpt01.f
+++ b/TESTING/LIN/zhpt01.f
@@ -110,6 +110,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZHPT01( UPLO, N, A, AFAC, IPIV, C, LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zlahilb.f b/TESTING/LIN/zlahilb.f
index ffd98b4f8d..42babae7c4 100644
--- a/TESTING/LIN/zlahilb.f
+++ b/TESTING/LIN/zlahilb.f
@@ -131,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE ZLAHILB( N, NRHS, A, LDA, X, LDX, B, LDB, WORK,
      $     INFO, PATH)
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zlaipd.f b/TESTING/LIN/zlaipd.f
index 2e70cdf480..b3d8efbb1f 100644
--- a/TESTING/LIN/zlaipd.f
+++ b/TESTING/LIN/zlaipd.f
@@ -80,6 +80,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZLAIPD( N, A, INDA, VINDA )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zlaptm.f b/TESTING/LIN/zlaptm.f
index 818284bb0d..664a6c88df 100644
--- a/TESTING/LIN/zlaptm.f
+++ b/TESTING/LIN/zlaptm.f
@@ -126,6 +126,7 @@
 *  =====================================================================
       SUBROUTINE ZLAPTM( UPLO, N, NRHS, ALPHA, D, E, X, LDX, BETA, B,
      $                   LDB )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zlarhs.f b/TESTING/LIN/zlarhs.f
index 210a4a3c14..a8c72e2511 100644
--- a/TESTING/LIN/zlarhs.f
+++ b/TESTING/LIN/zlarhs.f
@@ -205,6 +205,7 @@
 *  =====================================================================
       SUBROUTINE ZLARHS( PATH, XTYPE, UPLO, TRANS, M, N, KL, KU, NRHS,
      $                   A, LDA, X, LDX, B, LDB, ISEED, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zlatb4.f b/TESTING/LIN/zlatb4.f
index a6977f4e9c..ab3d2343cb 100644
--- a/TESTING/LIN/zlatb4.f
+++ b/TESTING/LIN/zlatb4.f
@@ -118,6 +118,7 @@
 *  =====================================================================
       SUBROUTINE ZLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
      $                   CNDNUM, DIST )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -154,9 +155,6 @@ SUBROUTINE ZLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           DLABAD
-*     ..
 *     .. Save statement ..
       SAVE               EPS, SMALL, LARGE, BADC1, BADC2, FIRST
 *     ..
@@ -174,11 +172,6 @@ SUBROUTINE ZLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
          BADC1 = SQRT( BADC2 )
          SMALL = DLAMCH( 'Safe minimum' )
          LARGE = ONE / SMALL
-*
-*        If it looks like we're on a Cray, take the square root of
-*        SMALL and LARGE to avoid overflow and underflow problems.
-*
-         CALL DLABAD( SMALL, LARGE )
          SMALL = SHRINK*( SMALL / EPS )
          LARGE = ONE / SMALL
       END IF
@@ -233,6 +226,110 @@ SUBROUTINE ZLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
          ELSE
             ANORM = ONE
          END IF
+*
+      ELSE IF( LSAMEN( 2, C2, 'QK' ) ) THEN
+*
+*        xQK: truncated QR with pivoting.
+*             Set parameters to generate a general
+*             M x N matrix.
+*
+*        Set TYPE, the type of matrix to be generated.  'N' is nonsymmetric.
+*
+         TYPE = 'N'
+*
+*        Set DIST, the type of distribution for the random
+*        number generator. 'S' is
+*
+         DIST = 'S'
+*
+*        Set the lower and upper bandwidths.
+*
+         IF( IMAT.EQ.2 ) THEN
+*
+*           2. Random, Diagonal, CNDNUM = 2
+*
+            KL = 0
+            KU = 0
+            CNDNUM = TWO
+            ANORM = ONE
+            MODE = 3
+         ELSE IF( IMAT.EQ.3 ) THEN
+*
+*           3. Random, Upper triangular,  CNDNUM = 2
+*
+            KL = 0
+            KU = MAX( N-1, 0 )
+            CNDNUM = TWO
+            ANORM = ONE
+            MODE = 3
+         ELSE IF( IMAT.EQ.4 ) THEN
+*
+*          4. Random, Lower triangular,  CNDNUM = 2
+*
+            KL = MAX( M-1, 0 )
+            KU = 0
+            CNDNUM = TWO
+            ANORM = ONE
+            MODE = 3
+         ELSE
+*
+*           5.-19. Rectangular matrix
+*
+            KL = MAX( M-1, 0 )
+            KU = MAX( N-1, 0 )
+*
+            IF( IMAT.GE.5 .AND. IMAT.LE.14 ) THEN
+*
+*              5.-14. Random, CNDNUM = 2.
+*
+               CNDNUM = TWO
+               ANORM = ONE
+               MODE = 3
+*
+            ELSE IF( IMAT.EQ.15 ) THEN
+*
+*              15. Random, CNDNUM = sqrt(0.1/EPS)
+*
+               CNDNUM = BADC1
+               ANORM = ONE
+               MODE = 3
+*
+            ELSE IF( IMAT.EQ.16 ) THEN
+*
+*              16. Random, CNDNUM = 0.1/EPS
+*
+               CNDNUM = BADC2
+               ANORM = ONE
+               MODE = 3
+*
+            ELSE IF( IMAT.EQ.17 ) THEN
+*
+*              17. Random, CNDNUM = 0.1/EPS,
+*                  one small singular value S(N)=1/CNDNUM
+*
+               CNDNUM = BADC2
+               ANORM = ONE
+               MODE = 2
+*
+            ELSE IF( IMAT.EQ.18 ) THEN
+*
+*              18. Random, scaled near underflow
+*
+               CNDNUM = TWO
+               ANORM = SMALL
+               MODE = 3
+*
+            ELSE IF( IMAT.EQ.19 ) THEN
+*
+*              19. Random, scaled near overflow
+*
+               CNDNUM = TWO
+               ANORM = LARGE
+               MODE = 3
+*
+            END IF
+*
+         END IF
 *
       ELSE IF( LSAMEN( 2, C2, 'GE' ) ) THEN
 *
@@ -517,17 +614,18 @@ SUBROUTINE ZLATB4( PATH, IMAT, M, N, TYPE, KL, KU, ANORM, MODE,
 *
 *        Set the norm and condition number.
 *
-         IF( IMAT.EQ.2 .OR. IMAT.EQ.8 ) THEN
+         MAT = ABS( IMAT )
+         IF( MAT.EQ.2 .OR. MAT.EQ.8 ) THEN
             CNDNUM = BADC1
-         ELSE IF( IMAT.EQ.3 .OR. IMAT.EQ.9 ) THEN
+         ELSE IF( MAT.EQ.3 .OR. MAT.EQ.9 ) THEN
             CNDNUM = BADC2
          ELSE
             CNDNUM = TWO
          END IF
 *
-         IF( IMAT.EQ.4 ) THEN
+         IF( MAT.EQ.4 ) THEN
             ANORM = SMALL
-         ELSE IF( IMAT.EQ.5 ) THEN
+         ELSE IF( MAT.EQ.5 ) THEN
             ANORM = LARGE
          ELSE
             ANORM = ONE
diff --git a/TESTING/LIN/zlatb5.f b/TESTING/LIN/zlatb5.f
index 446d05995f..f062271db3 100644
--- a/TESTING/LIN/zlatb5.f
+++ b/TESTING/LIN/zlatb5.f
@@ -111,6 +111,7 @@
 *  =====================================================================
       SUBROUTINE ZLATB5( PATH, IMAT, N, TYPE, KL, KU, ANORM, MODE,
      $                   CNDNUM, DIST )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -145,9 +146,6 @@ SUBROUTINE ZLATB5( PATH, IMAT, N, TYPE, KL, KU, ANORM, MODE,
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, SQRT
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           DLABAD
-*     ..
 *     .. Save statement ..
       SAVE               EPS, SMALL, LARGE, BADC1, BADC2, FIRST
 *     ..
@@ -165,11 +163,6 @@ SUBROUTINE ZLATB5( PATH, IMAT, N, TYPE, KL, KU, ANORM, MODE,
          BADC1 = SQRT( BADC2 )
          SMALL = DLAMCH( 'Safe minimum' )
          LARGE = ONE / SMALL
-*
-*        If it looks like we're on a Cray, take the square root of
-*        SMALL and LARGE to avoid overflow and underflow problems.
-*
-         CALL DLABAD( SMALL, LARGE )
          SMALL = SHRINK*( SMALL / EPS )
          LARGE = ONE / SMALL
       END IF
diff --git a/TESTING/LIN/zlatsp.f b/TESTING/LIN/zlatsp.f
index e105062959..ccff3804c5 100644
--- a/TESTING/LIN/zlatsp.f
+++ b/TESTING/LIN/zlatsp.f
@@ -81,6 +81,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZLATSP( UPLO, N, X, ISEED )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zlatsy.f b/TESTING/LIN/zlatsy.f
index d79c55227e..31ce9ae0e4 100644
--- a/TESTING/LIN/zlatsy.f
+++ b/TESTING/LIN/zlatsy.f
@@ -86,6 +86,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZLATSY( UPLO, N, X, LDX, ISEED )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zlattb.f b/TESTING/LIN/zlattb.f
index 62b4bfa981..7c4bc22737 100644
--- a/TESTING/LIN/zlattb.f
+++ b/TESTING/LIN/zlattb.f
@@ -138,6 +138,7 @@
 *  =====================================================================
       SUBROUTINE ZLATTB( IMAT, UPLO, TRANS, DIAG, ISEED, N, KD, AB,
      $                   LDAB, B, WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -177,8 +178,8 @@ SUBROUTINE ZLATTB( IMAT, UPLO, TRANS, DIAG, ISEED, N, KD, AB,
       EXTERNAL           LSAME, IZAMAX, DLAMCH, DLARND, ZLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLARNV, ZCOPY, ZDSCAL, ZLARNV, ZLATB4,
-     $                   ZLATMS, ZSWAP
+      EXTERNAL           DLARNV, ZCOPY, ZDSCAL, ZLARNV, ZLATB4, ZLATMS,
+     $                   ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCMPLX, MAX, MIN, SQRT
@@ -191,7 +192,6 @@ SUBROUTINE ZLATTB( IMAT, UPLO, TRANS, DIAG, ISEED, N, KD, AB,
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       SMLNUM = UNFL
       BIGNUM = ( ONE-ULP ) / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       IF( ( IMAT.GE.6 .AND. IMAT.LE.9 ) .OR. IMAT.EQ.17 ) THEN
          DIAG = 'U'
       ELSE
@@ -204,7 +204,7 @@ SUBROUTINE ZLATTB( IMAT, UPLO, TRANS, DIAG, ISEED, N, KD, AB,
       IF( N.LE.0 )
      $   RETURN
 *
-*     Call ZLATB4 to set parameters for CLATMS.
+*     Call ZLATB4 to set parameters for ZLATMS.
 *
       UPPER = LSAME( UPLO, 'U' )
       IF( UPPER ) THEN
diff --git a/TESTING/LIN/zlattp.f b/TESTING/LIN/zlattp.f
index b728852b5a..7cc79bc576 100644
--- a/TESTING/LIN/zlattp.f
+++ b/TESTING/LIN/zlattp.f
@@ -128,6 +128,7 @@
 *  =====================================================================
       SUBROUTINE ZLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, AP, B, WORK,
      $                   RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -168,8 +169,8 @@ SUBROUTINE ZLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, AP, B, WORK,
       EXTERNAL           LSAME, IZAMAX, DLAMCH, ZLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLARNV, ZDSCAL, ZLARNV, ZLATB4, ZLATMS,
-     $                   ZROT, ZROTG
+      EXTERNAL           DLARNV, ZDSCAL, ZLARNV, ZLATB4, ZLATMS, ZROT,
+     $                   ZROTG
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, MAX, SQRT
@@ -182,7 +183,6 @@ SUBROUTINE ZLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, AP, B, WORK,
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       SMLNUM = UNFL
       BIGNUM = ( ONE-ULP ) / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       IF( ( IMAT.GE.7 .AND. IMAT.LE.10 ) .OR. IMAT.EQ.18 ) THEN
          DIAG = 'U'
       ELSE
@@ -336,7 +336,7 @@ SUBROUTINE ZLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, AP, B, WORK,
                WORK( J+1 ) = PLUS2
                WORK( N+J+1 ) = ZERO
                PLUS1 = STAR1 / PLUS2
-               REXP = ZLARND( 2, ISEED )
+               REXP = DBLE( ZLARND( 2, ISEED ) )
                IF( REXP.LT.ZERO ) THEN
                   STAR1 = -SFAC**( ONE-REXP )*ZLARND( 5, ISEED )
                ELSE
@@ -790,7 +790,7 @@ SUBROUTINE ZLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, AP, B, WORK,
             DO 460 J = 1, N / 2
                JL = JJ
                DO 450 I = J, N - J
-                  T = AP( JR-I+J )
+                  T = DBLE( AP( JR-I+J ) )
                   AP( JR-I+J ) = AP( JL )
                   AP( JL ) = T
                   JL = JL + I
@@ -804,7 +804,7 @@ SUBROUTINE ZLATTP( IMAT, UPLO, TRANS, DIAG, ISEED, N, AP, B, WORK,
             DO 480 J = 1, N / 2
                JR = JJ
                DO 470 I = J, N - J
-                  T = AP( JL+I-J )
+                  T = DBLE( AP( JL+I-J ) )
                   AP( JL+I-J ) = AP( JR )
                   AP( JR ) = T
                   JR = JR - I
diff --git a/TESTING/LIN/zlattr.f b/TESTING/LIN/zlattr.f
index 0b3857f02c..2a7b66f4f7 100644
--- a/TESTING/LIN/zlattr.f
+++ b/TESTING/LIN/zlattr.f
@@ -135,6 +135,7 @@
 *  =====================================================================
       SUBROUTINE ZLATTR( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, LDA, B,
      $                   WORK, RWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -174,7 +175,7 @@ SUBROUTINE ZLATTR( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, LDA, B,
       EXTERNAL           LSAME, IZAMAX, DLAMCH, DLARND, ZLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLARNV, ZCOPY, ZDSCAL, ZLARNV, ZLATB4,
+      EXTERNAL           DLARNV, ZCOPY, ZDSCAL, ZLARNV, ZLATB4,
      $                   ZLATMS, ZROT, ZROTG, ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
@@ -188,7 +189,6 @@ SUBROUTINE ZLATTR( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, LDA, B,
       ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
       SMLNUM = UNFL
       BIGNUM = ( ONE-ULP ) / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       IF( ( IMAT.GE.7 .AND. IMAT.LE.10 ) .OR. IMAT.EQ.18 ) THEN
          DIAG = 'U'
       ELSE
@@ -201,7 +201,7 @@ SUBROUTINE ZLATTR( IMAT, UPLO, TRANS, DIAG, ISEED, N, A, LDA, B,
       IF( N.LE.0 )
      $   RETURN
 *
-*     Call ZLATB4 to set parameters for CLATMS.
+*     Call ZLATB4 to set parameters for ZLATMS.
 *
       UPPER = LSAME( UPLO, 'U' )
       IF( UPPER ) THEN
diff --git a/TESTING/LIN/zlavhe.f b/TESTING/LIN/zlavhe.f
index 90806f613a..1c552b52ea 100644
--- a/TESTING/LIN/zlavhe.f
+++ b/TESTING/LIN/zlavhe.f
@@ -150,6 +150,7 @@
 *  =====================================================================
       SUBROUTINE ZLAVHE( UPLO, TRANS, DIAG, N, NRHS, A, LDA, IPIV, B,
      $                   LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zlavhe_rook.f b/TESTING/LIN/zlavhe_rook.f
index 7a7e3686c7..fcb5e60b53 100644
--- a/TESTING/LIN/zlavhe_rook.f
+++ b/TESTING/LIN/zlavhe_rook.f
@@ -150,6 +150,7 @@
 *  =====================================================================
       SUBROUTINE ZLAVHE_ROOK( UPLO, TRANS, DIAG, N, NRHS, A, LDA, IPIV,
      $                        B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zlavhp.f b/TESTING/LIN/zlavhp.f
index 9d0afefd04..7fe97c95d8 100644
--- a/TESTING/LIN/zlavhp.f
+++ b/TESTING/LIN/zlavhp.f
@@ -128,6 +128,7 @@
 *  =====================================================================
       SUBROUTINE ZLAVHP( UPLO, TRANS, DIAG, N, NRHS, A, IPIV, B, LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zlavsp.f b/TESTING/LIN/zlavsp.f
index eb296cb952..524d30603c 100644
--- a/TESTING/LIN/zlavsp.f
+++ b/TESTING/LIN/zlavsp.f
@@ -128,6 +128,7 @@
 *  =====================================================================
       SUBROUTINE ZLAVSP( UPLO, TRANS, DIAG, N, NRHS, A, IPIV, B, LDB,
      $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zlavsy.f b/TESTING/LIN/zlavsy.f
index b97148f9f8..49aa0aac47 100644
--- a/TESTING/LIN/zlavsy.f
+++ b/TESTING/LIN/zlavsy.f
@@ -150,6 +150,7 @@
 *  =====================================================================
       SUBROUTINE ZLAVSY( UPLO, TRANS, DIAG, N, NRHS, A, LDA, IPIV, B,
      $                   LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zlavsy_rook.f b/TESTING/LIN/zlavsy_rook.f
index 942d0f0233..5493cff312 100644
--- a/TESTING/LIN/zlavsy_rook.f
+++ b/TESTING/LIN/zlavsy_rook.f
@@ -152,6 +152,7 @@
 *  =====================================================================
       SUBROUTINE ZLAVSY_ROOK( UPLO, TRANS, DIAG, N, NRHS, A, LDA, IPIV,
      $                        B, LDB, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zlqt01.f b/TESTING/LIN/zlqt01.f
index c2a7f82ce8..befabb8132 100644
--- a/TESTING/LIN/zlqt01.f
+++ b/TESTING/LIN/zlqt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE ZLQT01( M, N, A, AF, Q, L, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zlqt02.f b/TESTING/LIN/zlqt02.f
index c55d76ccdb..aaeafd8294 100644
--- a/TESTING/LIN/zlqt02.f
+++ b/TESTING/LIN/zlqt02.f
@@ -27,7 +27,7 @@
 *> \verbatim
 *>
 *> ZLQT02 tests ZUNGLQ, which generates an m-by-n matrix Q with
-*> orthonornmal rows that is defined as the product of k elementary
+*> orthonormal rows that is defined as the product of k elementary
 *> reflectors.
 *>
 *> Given the LQ factorization of an m-by-n matrix A, ZLQT02 generates
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE ZLQT02( M, N, K, A, AF, Q, L, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zlqt03.f b/TESTING/LIN/zlqt03.f
index 0765b3cd6f..34df003fe8 100644
--- a/TESTING/LIN/zlqt03.f
+++ b/TESTING/LIN/zlqt03.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE ZLQT03( M, N, K, AF, C, CC, Q, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zlqt04.f b/TESTING/LIN/zlqt04.f
index 2e7a0e8ee3..3afa7c397d 100644
--- a/TESTING/LIN/zlqt04.f
+++ b/TESTING/LIN/zlqt04.f
@@ -86,8 +86,9 @@ SUBROUTINE ZLQT04(M,N,NB,RESULT)
 *     ..
 *     .. Local allocatable arrays
       COMPLEX*16, ALLOCATABLE :: AF(:,:), Q(:,:),
-     $  L(:,:), RWORK(:), WORK( : ), T(:,:),
+     $  L(:,:), WORK( : ), T(:,:),
      $  CF(:,:), DF(:,:), A(:,:), C(:,:), D(:,:)
+      DOUBLE PRECISION, ALLOCATABLE :: RWORK(:)
 *
 *     .. Parameters ..
       DOUBLE PRECISION ZERO
diff --git a/TESTING/LIN/zlqt05.f b/TESTING/LIN/zlqt05.f
index a795a50d1b..e845621a96 100644
--- a/TESTING/LIN/zlqt05.f
+++ b/TESTING/LIN/zlqt05.f
@@ -93,8 +93,9 @@ SUBROUTINE ZLQT05(M,N,L,NB,RESULT)
 *     ..
 *     .. Local allocatable arrays
       COMPLEX*16, ALLOCATABLE :: AF(:,:), Q(:,:),
-     $  R(:,:), RWORK(:), WORK( : ), T(:,:),
+     $  R(:,:), WORK( : ), T(:,:),
      $  CF(:,:), DF(:,:), A(:,:), C(:,:), D(:,:)
+      DOUBLE PRECISION, ALLOCATABLE :: RWORK(:)
 *
 *     .. Parameters ..
       DOUBLE PRECISION ZERO
diff --git a/TESTING/LIN/zpbt01.f b/TESTING/LIN/zpbt01.f
index fb7881ac7e..77adfc111a 100644
--- a/TESTING/LIN/zpbt01.f
+++ b/TESTING/LIN/zpbt01.f
@@ -117,6 +117,7 @@
 *  =====================================================================
       SUBROUTINE ZPBT01( UPLO, N, KD, A, LDA, AFAC, LDAFAC, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -201,7 +202,8 @@ SUBROUTINE ZPBT01( UPLO, N, KD, A, LDA, AFAC, LDAFAC, RWORK,
 *
 *           Compute the (K,K) element of the result.
 *
-            AKK = ZDOTC( KLEN+1, AFAC( KC, K ), 1, AFAC( KC, K ), 1 )
+            AKK = DBLE(
+     $         ZDOTC( KLEN+1, AFAC( KC, K ), 1, AFAC( KC, K ), 1 ) )
             AFAC( KD+1, K ) = AKK
 *
 *           Compute the rest of column K.
@@ -228,7 +230,7 @@ SUBROUTINE ZPBT01( UPLO, N, KD, A, LDA, AFAC, LDAFAC, RWORK,
 *
 *           Scale column K by the diagonal element.
 *
-            AKK = AFAC( 1, K )
+            AKK = DBLE( AFAC( 1, K ) )
             CALL ZDSCAL( KLEN+1, AKK, AFAC( 1, K ), 1 )
 *
    40    CONTINUE
diff --git a/TESTING/LIN/zpbt02.f b/TESTING/LIN/zpbt02.f
index e4f8329963..330788467d 100644
--- a/TESTING/LIN/zpbt02.f
+++ b/TESTING/LIN/zpbt02.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE ZPBT02( UPLO, N, KD, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zpbt05.f b/TESTING/LIN/zpbt05.f
index 03376e0cec..6aece07379 100644
--- a/TESTING/LIN/zpbt05.f
+++ b/TESTING/LIN/zpbt05.f
@@ -168,6 +168,7 @@
 *  =====================================================================
       SUBROUTINE ZPBT05( UPLO, N, KD, NRHS, AB, LDAB, B, LDB, X, LDX,
      $                   XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zpot01.f b/TESTING/LIN/zpot01.f
index b083856211..844061107f 100644
--- a/TESTING/LIN/zpot01.f
+++ b/TESTING/LIN/zpot01.f
@@ -103,6 +103,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZPOT01( UPLO, N, A, LDA, AFAC, LDAFAC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -176,7 +177,7 @@ SUBROUTINE ZPOT01( UPLO, N, A, LDA, AFAC, LDAFAC, RWORK, RESID )
 *
 *           Compute the (K,K) element of the result.
 *
-            TR = ZDOTC( K, AFAC( 1, K ), 1, AFAC( 1, K ), 1 )
+            TR = DBLE( ZDOTC( K, AFAC( 1, K ), 1, AFAC( 1, K ), 1 ) )
             AFAC( K, K ) = TR
 *
 *           Compute the rest of column K.
diff --git a/TESTING/LIN/zpot02.f b/TESTING/LIN/zpot02.f
index 17b6904001..df64a557d4 100644
--- a/TESTING/LIN/zpot02.f
+++ b/TESTING/LIN/zpot02.f
@@ -124,6 +124,7 @@
 *  =====================================================================
       SUBROUTINE ZPOT02( UPLO, N, NRHS, A, LDA, X, LDX, B, LDB, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zpot03.f b/TESTING/LIN/zpot03.f
index f3cbd11410..15d7f0a2e6 100644
--- a/TESTING/LIN/zpot03.f
+++ b/TESTING/LIN/zpot03.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE ZPOT03( UPLO, N, A, LDA, AINV, LDAINV, WORK, LDWORK,
      $                   RWORK, RCOND, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zpot05.f b/TESTING/LIN/zpot05.f
index 35239083ab..ad779d235b 100644
--- a/TESTING/LIN/zpot05.f
+++ b/TESTING/LIN/zpot05.f
@@ -162,6 +162,7 @@
 *  =====================================================================
       SUBROUTINE ZPOT05( UPLO, N, NRHS, A, LDA, B, LDB, X, LDX, XACT,
      $                   LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zpot06.f b/TESTING/LIN/zpot06.f
index c97f432344..34993e8125 100644
--- a/TESTING/LIN/zpot06.f
+++ b/TESTING/LIN/zpot06.f
@@ -124,6 +124,7 @@
 *  =====================================================================
       SUBROUTINE ZPOT06( UPLO, N, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zppt01.f b/TESTING/LIN/zppt01.f
index 78ec595af4..4791d53b23 100644
--- a/TESTING/LIN/zppt01.f
+++ b/TESTING/LIN/zppt01.f
@@ -92,6 +92,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZPPT01( UPLO, N, A, AFAC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -178,7 +179,7 @@ SUBROUTINE ZPPT01( UPLO, N, A, AFAC, RWORK, RESID )
 *
 *           Compute the (K,K) element of the result.
 *
-            TR = ZDOTC( K, AFAC( KC ), 1, AFAC( KC ), 1 )
+            TR = DBLE( ZDOTC( K, AFAC( KC ), 1, AFAC( KC ), 1 ) )
             AFAC( KC+K-1 ) = TR
 *
 *           Compute the rest of column K.
diff --git a/TESTING/LIN/zppt02.f b/TESTING/LIN/zppt02.f
index 40b71c9693..b3f22898b7 100644
--- a/TESTING/LIN/zppt02.f
+++ b/TESTING/LIN/zppt02.f
@@ -120,6 +120,7 @@
 *  =====================================================================
       SUBROUTINE ZPPT02( UPLO, N, NRHS, A, X, LDX, B, LDB, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zppt03.f b/TESTING/LIN/zppt03.f
index 52c2590faf..833118e373 100644
--- a/TESTING/LIN/zppt03.f
+++ b/TESTING/LIN/zppt03.f
@@ -107,6 +107,7 @@
 *  =====================================================================
       SUBROUTINE ZPPT03( UPLO, N, A, AINV, WORK, LDWORK, RWORK, RCOND,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zppt05.f b/TESTING/LIN/zppt05.f
index ccde4a2372..2d5fedcd76 100644
--- a/TESTING/LIN/zppt05.f
+++ b/TESTING/LIN/zppt05.f
@@ -154,6 +154,7 @@
 *  =====================================================================
       SUBROUTINE ZPPT05( UPLO, N, NRHS, AP, B, LDB, X, LDX, XACT,
      $                   LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zpst01.f b/TESTING/LIN/zpst01.f
index 6918572197..afccb1046e 100644
--- a/TESTING/LIN/zpst01.f
+++ b/TESTING/LIN/zpst01.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE ZPST01( UPLO, N, A, LDA, AFAC, LDAFAC, PERM, LDPERM,
      $                   PIV, RWORK, RESID, RANK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -219,7 +220,7 @@ SUBROUTINE ZPST01( UPLO, N, A, LDA, AFAC, LDAFAC, PERM, LDPERM,
 *
 *           Compute the (K,K) element of the result.
 *
-            TR = ZDOTC( K, AFAC( 1, K ), 1, AFAC( 1, K ), 1 )
+            TR = DBLE( ZDOTC( K, AFAC( 1, K ), 1, AFAC( 1, K ), 1 ) )
             AFAC( K, K ) = TR
 *
 *           Compute the rest of column K.
diff --git a/TESTING/LIN/zptt01.f b/TESTING/LIN/zptt01.f
index e842c7e46f..d1f43ae653 100644
--- a/TESTING/LIN/zptt01.f
+++ b/TESTING/LIN/zptt01.f
@@ -36,7 +36,7 @@
 *
 *> \param[in] N
 *> \verbatim
-*>          N is INTEGTER
+*>          N is INTEGER
 *>          The order of the matrix A.
 *> \endverbatim
 *>
@@ -89,6 +89,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZPTT01( N, D, E, DF, EF, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zptt02.f b/TESTING/LIN/zptt02.f
index 6e3a8aed09..c381046632 100644
--- a/TESTING/LIN/zptt02.f
+++ b/TESTING/LIN/zptt02.f
@@ -46,7 +46,7 @@
 *>
 *> \param[in] N
 *> \verbatim
-*>          N is INTEGTER
+*>          N is INTEGER
 *>          The order of the matrix A.
 *> \endverbatim
 *>
@@ -112,6 +112,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZPTT02( UPLO, N, NRHS, D, E, X, LDX, B, LDB, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zptt05.f b/TESTING/LIN/zptt05.f
index 82d497e0e6..eb49b308b5 100644
--- a/TESTING/LIN/zptt05.f
+++ b/TESTING/LIN/zptt05.f
@@ -147,6 +147,7 @@
 *  =====================================================================
       SUBROUTINE ZPTT05( N, NRHS, D, E, B, LDB, X, LDX, XACT, LDXACT,
      $                   FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zqlt01.f b/TESTING/LIN/zqlt01.f
index d5eef9ff4f..5190b52574 100644
--- a/TESTING/LIN/zqlt01.f
+++ b/TESTING/LIN/zqlt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE ZQLT01( M, N, A, AF, Q, L, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zqlt02.f b/TESTING/LIN/zqlt02.f
index 1f84cfa5a2..d7ffaed51a 100644
--- a/TESTING/LIN/zqlt02.f
+++ b/TESTING/LIN/zqlt02.f
@@ -27,7 +27,7 @@
 *> \verbatim
 *>
 *> ZQLT02 tests ZUNGQL, which generates an m-by-n matrix Q with
-*> orthonornmal columns that is defined as the product of k elementary
+*> orthonormal columns that is defined as the product of k elementary
 *> reflectors.
 *>
 *> Given the QL factorization of an m-by-n matrix A, ZQLT02 generates
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE ZQLT02( M, N, K, A, AF, Q, L, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zqlt03.f b/TESTING/LIN/zqlt03.f
index a7d9b27ca4..c8d856c0a5 100644
--- a/TESTING/LIN/zqlt03.f
+++ b/TESTING/LIN/zqlt03.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE ZQLT03( M, N, K, AF, C, CC, Q, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zqpt01.f b/TESTING/LIN/zqpt01.f
index 4e53f92c84..61a00aa483 100644
--- a/TESTING/LIN/zqpt01.f
+++ b/TESTING/LIN/zqpt01.f
@@ -33,7 +33,7 @@
 *> Householder vectors, and the rest of AF contains a partially updated
 *> matrix.
 *>
-*> This function returns ||A*P - Q*R||/(||norm(A)||*eps*M)
+*> This function returns ||A*P - Q*R|| / ( ||norm(A)||*eps*max(M,N) )
 *> \endverbatim
 *
 *  Arguments:
@@ -117,6 +117,7 @@
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZQPT01( M, N, K, A, AF, LDA, TAU, JPVT,
      $                 WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -172,28 +173,28 @@ DOUBLE PRECISION FUNCTION ZQPT01( M, N, K, A, AF, LDA, TAU, JPVT,
 *
       NORMA = ZLANGE( 'One-norm', M, N, A, LDA, RWORK )
 *
-      DO 30 J = 1, K
-         DO 10 I = 1, MIN( J, M )
+      DO J = 1, K
+         DO I = 1, MIN( J, M )
             WORK( ( J-1 )*M+I ) = AF( I, J )
-   10    CONTINUE
-         DO 20 I = J + 1, M
+         END DO
+         DO I = J + 1, M
             WORK( ( J-1 )*M+I ) = ZERO
-   20    CONTINUE
-   30 CONTINUE
-      DO 40 J = K + 1, N
+         END DO
+      END DO
+      DO J = K + 1, N
          CALL ZCOPY( M, AF( 1, J ), 1, WORK( ( J-1 )*M+1 ), 1 )
-   40 CONTINUE
+      END DO
 *
       CALL ZUNMQR( 'Left', 'No transpose', M, N, K, AF, LDA, TAU, WORK,
      $             M, WORK( M*N+1 ), LWORK-M*N, INFO )
 *
-      DO 50 J = 1, N
+      DO J = 1, N
 *
 *        Compare i-th column of QR and jpvt(i)-th column of A
 *
          CALL ZAXPY( M, DCMPLX( -ONE ), A( 1, JPVT( J ) ), 1,
      $               WORK( ( J-1 )*M+1 ), 1 )
-   50 CONTINUE
+      END DO
 *
       ZQPT01 = ZLANGE( 'One-norm', M, N, WORK, M, RWORK ) /
      $         ( DBLE( MAX( M, N ) )*DLAMCH( 'Epsilon' ) )
diff --git a/TESTING/LIN/zqrt01.f b/TESTING/LIN/zqrt01.f
index 4aa0aa59fd..f1f533d244 100644
--- a/TESTING/LIN/zqrt01.f
+++ b/TESTING/LIN/zqrt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE ZQRT01( M, N, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zqrt01p.f b/TESTING/LIN/zqrt01p.f
index eb991152ca..56bffa0b10 100644
--- a/TESTING/LIN/zqrt01p.f
+++ b/TESTING/LIN/zqrt01p.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE ZQRT01P( M, N, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zqrt02.f b/TESTING/LIN/zqrt02.f
index 2dbefaf84e..f2d8e35663 100644
--- a/TESTING/LIN/zqrt02.f
+++ b/TESTING/LIN/zqrt02.f
@@ -27,7 +27,7 @@
 *> \verbatim
 *>
 *> ZQRT02 tests ZUNGQR, which generates an m-by-n matrix Q with
-*> orthonornmal columns that is defined as the product of k elementary
+*> orthonormal columns that is defined as the product of k elementary
 *> reflectors.
 *>
 *> Given the QR factorization of an m-by-n matrix A, ZQRT02 generates
@@ -132,6 +132,7 @@
 *  =====================================================================
       SUBROUTINE ZQRT02( M, N, K, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zqrt03.f b/TESTING/LIN/zqrt03.f
index 56b2e3b505..5931c159ad 100644
--- a/TESTING/LIN/zqrt03.f
+++ b/TESTING/LIN/zqrt03.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE ZQRT03( M, N, K, AF, C, CC, Q, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zqrt11.f b/TESTING/LIN/zqrt11.f
index c3be59c365..7af12fffa8 100644
--- a/TESTING/LIN/zqrt11.f
+++ b/TESTING/LIN/zqrt11.f
@@ -95,6 +95,7 @@
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZQRT11( M, K, A, LDA, TAU, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -158,9 +159,9 @@ DOUBLE PRECISION FUNCTION ZQRT11( M, K, A, LDA, TAU, WORK, LWORK )
       CALL ZUNM2R( 'Left', 'Conjugate transpose', M, M, K, A, LDA, TAU,
      $             WORK, M, WORK( M*M+1 ), INFO )
 *
-      DO 10 J = 1, M
+      DO J = 1, M
          WORK( ( J-1 )*M+J ) = WORK( ( J-1 )*M+J ) - ONE
-   10 CONTINUE
+      END DO
 *
       ZQRT11 = ZLANGE( 'One-norm', M, M, WORK, M, RDUMMY ) /
      $         ( DBLE( M )*DLAMCH( 'Epsilon' ) )
diff --git a/TESTING/LIN/zqrt12.f b/TESTING/LIN/zqrt12.f
index 0da6be1576..87be412f4a 100644
--- a/TESTING/LIN/zqrt12.f
+++ b/TESTING/LIN/zqrt12.f
@@ -28,7 +28,7 @@
 *> ZQRT12 computes the singular values `svlues' of the upper trapezoid
 *> of A(1:M,1:N) and returns the ratio
 *>
-*>      || s - svlues||/(||svlues||*eps*max(M,N))
+*>      || svlues - s||/(||s||*eps*max(M,N))
 *> \endverbatim
 *
 *  Arguments:
@@ -94,6 +94,7 @@
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZQRT12( M, N, A, LDA, S, WORK, LWORK,
      $                 RWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -125,8 +126,8 @@ DOUBLE PRECISION FUNCTION ZQRT12( M, N, A, LDA, S, WORK, LWORK,
       EXTERNAL           DASUM, DLAMCH, DNRM2, ZLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DAXPY, DBDSQR, DLABAD, DLASCL, XERBLA, ZGEBD2,
-     $                   ZLASCL, ZLASET
+      EXTERNAL           DAXPY, DBDSQR, DLASCL, XERBLA, ZGEBD2, ZLASCL,
+     $                   ZLASET
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, DCMPLX, MAX, MIN
@@ -154,17 +155,16 @@ DOUBLE PRECISION FUNCTION ZQRT12( M, N, A, LDA, S, WORK, LWORK,
 *
       CALL ZLASET( 'Full', M, N, DCMPLX( ZERO ), DCMPLX( ZERO ), WORK,
      $             M )
-      DO 20 J = 1, N
-         DO 10 I = 1, MIN( J, M )
+      DO J = 1, N
+         DO I = 1, MIN( J, M )
             WORK( ( J-1 )*M+I ) = A( I, J )
-   10    CONTINUE
-   20 CONTINUE
+         END DO
+      END DO
 *
 *     Get machine parameters
 *
       SMLNUM = DLAMCH( 'S' ) / DLAMCH( 'P' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
 *
 *     Scale work if max entry outside range [SMLNUM,BIGNUM]
 *
@@ -208,9 +208,9 @@ DOUBLE PRECISION FUNCTION ZQRT12( M, N, A, LDA, S, WORK, LWORK,
 *
       ELSE
 *
-         DO 30 I = 1, MN
+         DO I = 1, MN
             RWORK( I ) = ZERO
-   30    CONTINUE
+         END DO
       END IF
 *
 *     Compare s and singular values of work
@@ -218,6 +218,7 @@ DOUBLE PRECISION FUNCTION ZQRT12( M, N, A, LDA, S, WORK, LWORK,
       CALL DAXPY( MN, -ONE, S, 1, RWORK( 1 ), 1 )
       ZQRT12 = DASUM( MN, RWORK( 1 ), 1 ) /
      $         ( DLAMCH( 'Epsilon' )*DBLE( MAX( M, N ) ) )
+*
       IF( NRMSVL.NE.ZERO )
      $   ZQRT12 = ZQRT12 / NRMSVL
 *
diff --git a/TESTING/LIN/zqrt13.f b/TESTING/LIN/zqrt13.f
index 341ec17000..67c4884f74 100644
--- a/TESTING/LIN/zqrt13.f
+++ b/TESTING/LIN/zqrt13.f
@@ -88,6 +88,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZQRT13( SCALE, M, N, A, LDA, NORMA, ISEED )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -117,7 +118,7 @@ SUBROUTINE ZQRT13( SCALE, M, N, A, LDA, NORMA, ISEED )
       EXTERNAL           DLAMCH, DZASUM, ZLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, ZLARNV, ZLASCL
+      EXTERNAL           ZLARNV, ZLASCL
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          DBLE, DCMPLX, SIGN
@@ -146,7 +147,6 @@ SUBROUTINE ZQRT13( SCALE, M, N, A, LDA, NORMA, ISEED )
          NORMA = ZLANGE( 'Max', M, N, A, LDA, DUMMY )
          SMLNUM = DLAMCH( 'Safe minimum' )
          BIGNUM = ONE / SMLNUM
-         CALL DLABAD( SMLNUM, BIGNUM )
          SMLNUM = SMLNUM / DLAMCH( 'Epsilon' )
          BIGNUM = ONE / SMLNUM
 *
diff --git a/TESTING/LIN/zqrt14.f b/TESTING/LIN/zqrt14.f
index 80c8ac56f1..919d2872fb 100644
--- a/TESTING/LIN/zqrt14.f
+++ b/TESTING/LIN/zqrt14.f
@@ -113,6 +113,7 @@
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZQRT14( TRANS, M, N, NRHS, A, LDA, X,
      $                 LDX, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zqrt15.f b/TESTING/LIN/zqrt15.f
index f58b9e38bc..625797547e 100644
--- a/TESTING/LIN/zqrt15.f
+++ b/TESTING/LIN/zqrt15.f
@@ -146,6 +146,7 @@
 *  =====================================================================
       SUBROUTINE ZQRT15( SCALE, RKSEL, M, N, NRHS, A, LDA, B, LDB, S,
      $                   RANK, NORMA, NORMB, ISEED, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -183,8 +184,8 @@ SUBROUTINE ZQRT15( SCALE, RKSEL, M, N, NRHS, A, LDA, B, LDB, S,
       EXTERNAL           DASUM, DLAMCH, DLARND, DZNRM2, ZLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLAORD, DLASCL, XERBLA, ZDSCAL, ZGEMM,
-     $                   ZLARF, ZLARNV, ZLAROR, ZLASCL, ZLASET
+      EXTERNAL           DLAORD, DLASCL, XERBLA, ZDSCAL, ZGEMM, ZLARF,
+     $                   ZLARNV, ZLAROR, ZLASCL, ZLASET
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DCMPLX, MAX, MIN
@@ -199,7 +200,6 @@ SUBROUTINE ZQRT15( SCALE, RKSEL, M, N, NRHS, A, LDA, B, LDB, S,
 *
       SMLNUM = DLAMCH( 'Safe minimum' )
       BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
       EPS = DLAMCH( 'Epsilon' )
       SMLNUM = ( SMLNUM / EPS ) / EPS
       BIGNUM = ONE / SMLNUM
diff --git a/TESTING/LIN/zqrt16.f b/TESTING/LIN/zqrt16.f
index 9becd6d3b0..5d9493119f 100644
--- a/TESTING/LIN/zqrt16.f
+++ b/TESTING/LIN/zqrt16.f
@@ -130,6 +130,7 @@
 *  =====================================================================
       SUBROUTINE ZQRT16( TRANS, M, N, NRHS, A, LDA, X, LDX, B, LDB,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zqrt17.f b/TESTING/LIN/zqrt17.f
index 9a0770c626..f404ad5bf3 100644
--- a/TESTING/LIN/zqrt17.f
+++ b/TESTING/LIN/zqrt17.f
@@ -150,6 +150,7 @@
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZQRT17( TRANS, IRESID, M, N, NRHS, A,
      $                 LDA, X, LDX, B, LDB, C, WORK, LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zrqt01.f b/TESTING/LIN/zrqt01.f
index 2f60426f5a..45a76d8e25 100644
--- a/TESTING/LIN/zrqt01.f
+++ b/TESTING/LIN/zrqt01.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE ZRQT01( M, N, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zrqt02.f b/TESTING/LIN/zrqt02.f
index 548321d000..8de952847e 100644
--- a/TESTING/LIN/zrqt02.f
+++ b/TESTING/LIN/zrqt02.f
@@ -27,7 +27,7 @@
 *> \verbatim
 *>
 *> ZRQT02 tests ZUNGRQ, which generates an m-by-n matrix Q with
-*> orthonornmal rows that is defined as the product of k elementary
+*> orthonormal rows that is defined as the product of k elementary
 *> reflectors.
 *>
 *> Given the RQ factorization of an m-by-n matrix A, ZRQT02 generates
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE ZRQT02( M, N, K, A, AF, Q, R, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zrqt03.f b/TESTING/LIN/zrqt03.f
index 6393224bfc..579cac4c18 100644
--- a/TESTING/LIN/zrqt03.f
+++ b/TESTING/LIN/zrqt03.f
@@ -133,6 +133,7 @@
 *  =====================================================================
       SUBROUTINE ZRQT03( M, N, K, AF, C, CC, Q, LDA, TAU, WORK, LWORK,
      $                   RWORK, RESULT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zrzt01.f b/TESTING/LIN/zrzt01.f
index 2eba7ba6f3..5d9f4a2154 100644
--- a/TESTING/LIN/zrzt01.f
+++ b/TESTING/LIN/zrzt01.f
@@ -95,6 +95,7 @@
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZRZT01( M, N, A, AF, LDA, TAU, WORK,
      $                 LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -159,7 +160,7 @@ DOUBLE PRECISION FUNCTION ZRZT01( M, N, A, AF, LDA, TAU, WORK,
 *
 *     R = R * P(1) * ... *P(m)
 *
-      CALL ZUNMRZ( 'Right', 'No tranpose', M, N, M, N-M, AF, LDA, TAU,
+      CALL ZUNMRZ( 'Right', 'No transpose', M, N, M, N-M, AF, LDA, TAU,
      $             WORK, M, WORK( M*N+1 ), LWORK-M*N, INFO )
 *
 *     R = R - A
diff --git a/TESTING/LIN/zrzt02.f b/TESTING/LIN/zrzt02.f
index 0ea6dab024..d532e8f607 100644
--- a/TESTING/LIN/zrzt02.f
+++ b/TESTING/LIN/zrzt02.f
@@ -88,6 +88,7 @@
 *  =====================================================================
       DOUBLE PRECISION FUNCTION ZRZT02( M, N, AF, LDA, TAU, WORK,
      $                 LWORK )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zsbmv.f b/TESTING/LIN/zsbmv.f
index 9272052626..938dd5e2ce 100644
--- a/TESTING/LIN/zsbmv.f
+++ b/TESTING/LIN/zsbmv.f
@@ -149,6 +149,7 @@
 *  =====================================================================
       SUBROUTINE ZSBMV( UPLO, N, K, ALPHA, A, LDA, X, INCX, BETA, Y,
      $                  INCY )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zspt01.f b/TESTING/LIN/zspt01.f
index 6269ef790e..90bdd341d7 100644
--- a/TESTING/LIN/zspt01.f
+++ b/TESTING/LIN/zspt01.f
@@ -109,6 +109,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZSPT01( UPLO, N, A, AFAC, IPIV, C, LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zspt02.f b/TESTING/LIN/zspt02.f
index e34ce22c22..67ba287733 100644
--- a/TESTING/LIN/zspt02.f
+++ b/TESTING/LIN/zspt02.f
@@ -120,6 +120,7 @@
 *  =====================================================================
       SUBROUTINE ZSPT02( UPLO, N, NRHS, A, X, LDX, B, LDB, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zspt03.f b/TESTING/LIN/zspt03.f
index 2819b930ba..f818524628 100644
--- a/TESTING/LIN/zspt03.f
+++ b/TESTING/LIN/zspt03.f
@@ -107,6 +107,7 @@
 *  =====================================================================
       SUBROUTINE ZSPT03( UPLO, N, A, AINV, WORK, LDW, RWORK, RCOND,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zsyt01.f b/TESTING/LIN/zsyt01.f
index 32b7a698cc..02d2b853ee 100644
--- a/TESTING/LIN/zsyt01.f
+++ b/TESTING/LIN/zsyt01.f
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE ZSYT01( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C, LDC,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zsyt01_3.f b/TESTING/LIN/zsyt01_3.f
index 202488db98..6c8df0e862 100644
--- a/TESTING/LIN/zsyt01_3.f
+++ b/TESTING/LIN/zsyt01_3.f
@@ -138,6 +138,7 @@
 *  =====================================================================
       SUBROUTINE ZSYT01_3( UPLO, N, A, LDA, AFAC, LDAFAC, E, IPIV, C,
      $                     LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -188,7 +189,7 @@ SUBROUTINE ZSYT01_3( UPLO, N, A, LDA, AFAC, LDAFAC, E, IPIV, C,
          RETURN
       END IF
 *
-*     a) Revert to multiplyers of L
+*     a) Revert to multipliers of L
 *
       CALL ZSYCONVF_ROOK( UPLO, 'R', N, AFAC, LDAFAC, E, IPIV, INFO )
 *
diff --git a/TESTING/LIN/zsyt01_aa.f b/TESTING/LIN/zsyt01_aa.f
index 17969d444f..ed65a5128d 100644
--- a/TESTING/LIN/zsyt01_aa.f
+++ b/TESTING/LIN/zsyt01_aa.f
@@ -121,6 +121,7 @@
 *  =====================================================================
       SUBROUTINE ZSYT01_AA( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
      $                      LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -142,8 +143,9 @@ SUBROUTINE ZSYT01_AA( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
 *     .. Parameters ..
       DOUBLE PRECISION   ZERO, ONE
       PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
-      COMPLEX*16         CZERO, CONE
-      PARAMETER          ( CZERO = 0.0E+0, CONE = 1.0E+0 )
+      COMPLEX*16          CZERO, CONE
+      PARAMETER          ( CZERO = ( 0.0D+0, 0.0D+0 ),
+     $                     CONE  = ( 1.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
       INTEGER            I, J
diff --git a/TESTING/LIN/zsyt01_rook.f b/TESTING/LIN/zsyt01_rook.f
index 885bebc021..cf7a9b3925 100644
--- a/TESTING/LIN/zsyt01_rook.f
+++ b/TESTING/LIN/zsyt01_rook.f
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE ZSYT01_ROOK( UPLO, N, A, LDA, AFAC, LDAFAC, IPIV, C,
      $                    LDC, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zsyt02.f b/TESTING/LIN/zsyt02.f
index 5792a3ba8e..0809380e75 100644
--- a/TESTING/LIN/zsyt02.f
+++ b/TESTING/LIN/zsyt02.f
@@ -124,6 +124,7 @@
 *  =====================================================================
       SUBROUTINE ZSYT02( UPLO, N, NRHS, A, LDA, X, LDX, B, LDB, RWORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/zsyt03.f b/TESTING/LIN/zsyt03.f
index 74efd913f0..654a6f7d96 100644
--- a/TESTING/LIN/zsyt03.f
+++ b/TESTING/LIN/zsyt03.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE ZSYT03( UPLO, N, A, LDA, AINV, LDAINV, WORK, LDWORK,
      $                   RWORK, RCOND, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ztbt02.f b/TESTING/LIN/ztbt02.f
index 3c9f119569..d6546a0b26 100644
--- a/TESTING/LIN/ztbt02.f
+++ b/TESTING/LIN/ztbt02.f
@@ -30,10 +30,10 @@
 *>
 *> ZTBT02 computes the residual for the computed solution to a
 *> triangular system of linear equations op(A)*X = B, when A is a
-*> triangular band matrix. The test ratio is the maximum over the
-*> number of right hand sides of
-*>    norm(op(A)*X - B) / ( norm(op(A)) * norm(X) * EPS ),
-*> where op(A) = A, A**T, or A**H, and EPS is the machine epsilon.
+*> triangular band matrix. The test ratio is the maximum over
+*>    norm(b - op(A)*x) / ( ||op(A)||_1 * norm(x) * EPS ),
+*> where op(A) = A, A**T, or A**H, b is the column of B, x is the
+*> solution vector, and EPS is the machine epsilon.
 *> \endverbatim
 *
 *  Arguments:
@@ -156,6 +156,7 @@
 *  =====================================================================
       SUBROUTINE ZTBT02( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, X,
      $                   LDX, B, LDB, WORK, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ztbt03.f b/TESTING/LIN/ztbt03.f
index d00cf82238..d21294f1c5 100644
--- a/TESTING/LIN/ztbt03.f
+++ b/TESTING/LIN/ztbt03.f
@@ -174,6 +174,7 @@
       SUBROUTINE ZTBT03( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB,
      $                   SCALE, CNORM, TSCAL, X, LDX, B, LDB, WORK,
      $                   RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ztbt05.f b/TESTING/LIN/ztbt05.f
index 10863ff1c2..ed775e78ea 100644
--- a/TESTING/LIN/ztbt05.f
+++ b/TESTING/LIN/ztbt05.f
@@ -186,6 +186,7 @@
 *  =====================================================================
       SUBROUTINE ZTBT05( UPLO, TRANS, DIAG, N, KD, NRHS, AB, LDAB, B,
      $                   LDB, X, LDX, XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ztbt06.f b/TESTING/LIN/ztbt06.f
index b033a5db3d..358b9f8429 100644
--- a/TESTING/LIN/ztbt06.f
+++ b/TESTING/LIN/ztbt06.f
@@ -123,6 +123,7 @@
 *  =====================================================================
       SUBROUTINE ZTBT06( RCOND, RCONDC, UPLO, DIAG, N, KD, AB, LDAB,
      $                   RWORK, RAT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ztpt01.f b/TESTING/LIN/ztpt01.f
index 3da15f7f3d..da29456e84 100644
--- a/TESTING/LIN/ztpt01.f
+++ b/TESTING/LIN/ztpt01.f
@@ -106,6 +106,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZTPT01( UPLO, DIAG, N, AP, AINVP, RCOND, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ztpt02.f b/TESTING/LIN/ztpt02.f
index 8555053d14..89b2a5920e 100644
--- a/TESTING/LIN/ztpt02.f
+++ b/TESTING/LIN/ztpt02.f
@@ -30,9 +30,10 @@
 *> ZTPT02 computes the residual for the computed solution to a
 *> triangular system of linear equations op(A)*X = B, when the
 *> triangular matrix A is stored in packed format. The test ratio is
-*> the maximum over the number of right hand sides of
-*>    norm(op(A)*X - B) / ( norm(op(A)) * norm(X) * EPS ),
-*> where op(A) = A, A**T, or A**H, and EPS is the machine epsilon.
+*> the maximum over
+*>    norm(b - op(A)*x) / ( ||op(A)||_1 * norm(x) * EPS ),
+*> where op(A) = A, A**T, or A**H, b is the column of B, x is the
+*> solution vector, and EPS is the machine epsilon.
 *> \endverbatim
 *
 *  Arguments:
@@ -143,6 +144,7 @@
 *  =====================================================================
       SUBROUTINE ZTPT02( UPLO, TRANS, DIAG, N, NRHS, AP, X, LDX, B, LDB,
      $                   WORK, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ztpt03.f b/TESTING/LIN/ztpt03.f
index 802e1a611b..f91960ec21 100644
--- a/TESTING/LIN/ztpt03.f
+++ b/TESTING/LIN/ztpt03.f
@@ -159,6 +159,7 @@
 *  =====================================================================
       SUBROUTINE ZTPT03( UPLO, TRANS, DIAG, N, NRHS, AP, SCALE, CNORM,
      $                   TSCAL, X, LDX, B, LDB, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ztpt05.f b/TESTING/LIN/ztpt05.f
index 2ca7c38744..657edca5c1 100644
--- a/TESTING/LIN/ztpt05.f
+++ b/TESTING/LIN/ztpt05.f
@@ -172,6 +172,7 @@
 *  =====================================================================
       SUBROUTINE ZTPT05( UPLO, TRANS, DIAG, N, NRHS, AP, B, LDB, X, LDX,
      $                   XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ztpt06.f b/TESTING/LIN/ztpt06.f
index 5ab661626c..f9bf5e8181 100644
--- a/TESTING/LIN/ztpt06.f
+++ b/TESTING/LIN/ztpt06.f
@@ -109,6 +109,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZTPT06( RCOND, RCONDC, UPLO, DIAG, N, AP, RWORK, RAT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ztrt01.f b/TESTING/LIN/ztrt01.f
index ddb212b02f..3c573dd41d 100644
--- a/TESTING/LIN/ztrt01.f
+++ b/TESTING/LIN/ztrt01.f
@@ -122,6 +122,7 @@
 *  =====================================================================
       SUBROUTINE ZTRT01( UPLO, DIAG, N, A, LDA, AINV, LDAINV, RCOND,
      $                   RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ztrt02.f b/TESTING/LIN/ztrt02.f
index 47e9f3463c..6129881d96 100644
--- a/TESTING/LIN/ztrt02.f
+++ b/TESTING/LIN/ztrt02.f
@@ -30,10 +30,10 @@
 *>
 *> ZTRT02 computes the residual for the computed solution to a
 *> triangular system of linear equations op(A)*X = B, where A is a
-*> triangular matrix. The test ratio is the maximum over the number of
-*> right hand sides of
-*>    norm(op(A)*X - B) / ( norm(op(A)) * norm(X) * EPS ),
-*> where op(A) = A, A**T, or A**H, and EPS is the machine epsilon.
+*> triangular matrix. The test ratio is the maximum over
+*>    norm(b - op(A)*x) / ( ||op(A)||_1 * norm(x) * EPS ),
+*> where op(A) = A, A**T, or A**H, b is the column of B, x is the
+*> solution vector, and EPS is the machine epsilon.
 *> \endverbatim
 *
 *  Arguments:
@@ -152,6 +152,7 @@
 *  =====================================================================
       SUBROUTINE ZTRT02( UPLO, TRANS, DIAG, N, NRHS, A, LDA, X, LDX, B,
      $                   LDB, WORK, RWORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ztrt03.f b/TESTING/LIN/ztrt03.f
index a37887f7e3..aff9a70d0e 100644
--- a/TESTING/LIN/ztrt03.f
+++ b/TESTING/LIN/ztrt03.f
@@ -168,6 +168,7 @@
 *  =====================================================================
       SUBROUTINE ZTRT03( UPLO, TRANS, DIAG, N, NRHS, A, LDA, SCALE,
      $                   CNORM, TSCAL, X, LDX, B, LDB, WORK, RESID )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ztrt05.f b/TESTING/LIN/ztrt05.f
index 63ba27b9aa..190a78874f 100644
--- a/TESTING/LIN/ztrt05.f
+++ b/TESTING/LIN/ztrt05.f
@@ -179,6 +179,7 @@
 *  =====================================================================
       SUBROUTINE ZTRT05( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB, X,
      $                   LDX, XACT, LDXACT, FERR, BERR, RESLTS )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ztrt06.f b/TESTING/LIN/ztrt06.f
index ed55905dad..e3ecaa1293 100644
--- a/TESTING/LIN/ztrt06.f
+++ b/TESTING/LIN/ztrt06.f
@@ -119,6 +119,7 @@
 *  =====================================================================
       SUBROUTINE ZTRT06( RCOND, RCONDC, UPLO, DIAG, N, A, LDA, RWORK,
      $                   RAT )
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/LIN/ztsqr01.f b/TESTING/LIN/ztsqr01.f
index 629da2996d..f844d512bc 100644
--- a/TESTING/LIN/ztsqr01.f
+++ b/TESTING/LIN/ztsqr01.f
@@ -96,8 +96,9 @@ SUBROUTINE ZTSQR01(TSSW, M, N, MB, NB, RESULT)
 *     ..
 *     .. Local allocatable arrays
       COMPLEX*16, ALLOCATABLE :: AF(:,:), Q(:,:),
-     $  R(:,:), RWORK(:), WORK( : ), T(:),
+     $  R(:,:), WORK( : ), T(:),
      $  CF(:,:), DF(:,:), A(:,:), C(:,:), D(:,:), LQ(:,:)
+      DOUBLE PRECISION, ALLOCATABLE :: RWORK(:)
 *
 *     .. Parameters ..
       DOUBLE PRECISION ZERO
diff --git a/TESTING/LIN/zunhr_col01.f b/TESTING/LIN/zunhr_col01.f
index b7590a8ea5..a632fe4c6b 100644
--- a/TESTING/LIN/zunhr_col01.f
+++ b/TESTING/LIN/zunhr_col01.f
@@ -311,7 +311,7 @@ SUBROUTINE ZUNHR_COL01( M, N, MB1, NB1, NB2, RESULT )
 *     Compute |I - (Q**H)*Q| / ( eps * m ) and store in RESULT(2)
 *
       CALL ZLASET( 'Full', M, M, CZERO, CONE, R, M )
-      CALL ZHERK( 'U', 'C', M, M, -CONE, Q, M, CONE, R, M )
+      CALL ZHERK( 'U', 'C', M, M, REAL(-CONE), Q, M, REAL(CONE), R, M )
       RESID = ZLANSY( '1', 'Upper', M, R, M, RWORK )
       RESULT( 2 ) = RESID / ( EPS * MAX( 1, M ) )
 *
diff --git a/TESTING/LIN/zunhr_col02.f b/TESTING/LIN/zunhr_col02.f
index c6e7f80cd0..1c2e713716 100644
--- a/TESTING/LIN/zunhr_col02.f
+++ b/TESTING/LIN/zunhr_col02.f
@@ -273,7 +273,7 @@ SUBROUTINE ZUNHR_COL02( M, N, MB1, NB1, NB2, RESULT )
 *     Compute |I - (Q**T)*Q| / ( eps * m ) and store in RESULT(2)
 *
       CALL ZLASET( 'Full', M, M, CZERO, CONE, R, M )
-      CALL ZHERK( 'U', 'C', M, M, -CONE, Q, M, CONE, R, M )
+      CALL ZHERK( 'U', 'C', M, M, REAL(-CONE), Q, M, REAL(CONE), R, M )
       RESID = ZLANSY( '1', 'Upper', M, R, M, RWORK )
       RESULT( 2 ) = RESID / ( EPS * MAX( 1, M ) )
 *
diff --git a/TESTING/MATGEN/CMakeLists.txt b/TESTING/MATGEN/CMakeLists.txt
index 0b3f89ed2c..02e05a86d4 100644
--- a/TESTING/MATGEN/CMakeLists.txt
+++ b/TESTING/MATGEN/CMakeLists.txt
@@ -47,7 +47,45 @@ if(BUILD_COMPLEX16)
 endif()
 list(REMOVE_DUPLICATES SOURCES)
 
-add_library(${TMGLIB} ${SOURCES})
+add_library(${TMGLIB}_obj OBJECT ${SOURCES})
+set_target_properties(
+  ${TMGLIB}_obj PROPERTIES
+  POSITION_INDEPENDENT_CODE ON
+  Fortran_PREPROCESS ON
+  )
+
+if(BUILD_INDEX64_EXT_API)
+  if(NOT CMAKE_Fortran_COMPILER_ID MATCHES ${INDEX64_EXT_API_COMPILERS})
+    message(STATUS "Build Index-64 API as extended API with _64 suffix: skipped (unsupported Fortran compiler)")
+    # Disable extended API for MATGEN and LAPACK.
+    set(BUILD_INDEX64_EXT_API OFF)
+    set(BUILD_INDEX64_EXT_API OFF PARENT_SCOPE)
+  else()
+    cmake_minimum_required(VERSION 3.18)
+    set(SOURCES_64)
+    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${TMGLIB}_64_obj)
+    file(COPY ${SOURCES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${TMGLIB}_64_obj)
+    file(GLOB SOURCES_64 ${CMAKE_CURRENT_BINARY_DIR}/${TMGLIB}_64_obj/*.*)
+    foreach(F IN LISTS SOURCES_64)
+      set(FFILE "")
+      file(READ ${F} FFILE)
+      file(WRITE ${F} "#include \"matgen_64.h\"\n")
+      file(APPEND ${F} "${FFILE}")
+    endforeach()
+    file(COPY matgen_64.h DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${TMGLIB}_64_obj)
+    add_library(${TMGLIB}_64_obj OBJECT ${SOURCES_64})
+    target_compile_options(${TMGLIB}_64_obj PRIVATE "${FOPT_ILP64}" -DMATGEN_64)
+    set_target_properties(
+    ${TMGLIB}_64_obj PROPERTIES
+    POSITION_INDEPENDENT_CODE ON
+    Fortran_PREPROCESS ON
+  )
+  endif()
+endif()
+
+add_library(${TMGLIB}
+        $<TARGET_OBJECTS:${TMGLIB}_obj>
+        $<$<BOOL:${BUILD_INDEX64_EXT_API}>: $<TARGET_OBJECTS:${TMGLIB}_64_obj>>)
 
 set_target_properties(
   ${TMGLIB} PROPERTIES
diff --git a/TESTING/MATGEN/clagge.f b/TESTING/MATGEN/clagge.f
index 4575608f69..4fd32d2943 100644
--- a/TESTING/MATGEN/clagge.f
+++ b/TESTING/MATGEN/clagge.f
@@ -111,6 +111,7 @@
 *
 *  =====================================================================
       SUBROUTINE CLAGGE( M, N, KL, KU, D, A, LDA, ISEED, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/claghe.f b/TESTING/MATGEN/claghe.f
index 723e0f2d14..259ab07dc9 100644
--- a/TESTING/MATGEN/claghe.f
+++ b/TESTING/MATGEN/claghe.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE CLAGHE( N, K, D, A, LDA, ISEED, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/clagsy.f b/TESTING/MATGEN/clagsy.f
index b01d155653..9ee0e9777e 100644
--- a/TESTING/MATGEN/clagsy.f
+++ b/TESTING/MATGEN/clagsy.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE CLAGSY( N, K, D, A, LDA, ISEED, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/clahilb.f b/TESTING/MATGEN/clahilb.f
index e6b497715d..0a85eff47a 100644
--- a/TESTING/MATGEN/clahilb.f
+++ b/TESTING/MATGEN/clahilb.f
@@ -131,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE CLAHILB( N, NRHS, A, LDA, X, LDX, B, LDB, WORK,
      $     INFO, PATH)
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -225,15 +226,15 @@ SUBROUTINE CLAHILB( N, NRHS, A, LDA, X, LDX, B, LDB, WORK,
       IF ( LSAMEN( 2, C2, 'SY' ) ) THEN
          DO J = 1, N
             DO I = 1, N
-               A(I, J) = D1(MOD(J,SIZE_D)+1) * (REAL(M) / (I + J - 1))
-     $              * D1(MOD(I,SIZE_D)+1)
+               A(I, J) = D1(MOD(J,SIZE_D)+1) * (REAL(M)
+     $              / REAL(I + J - 1)) * D1(MOD(I,SIZE_D)+1)
             END DO
          END DO
       ELSE
          DO J = 1, N
             DO I = 1, N
-               A(I, J) = D1(MOD(J,SIZE_D)+1) * (REAL(M) / (I + J - 1))
-     $              * D2(MOD(I,SIZE_D)+1)
+               A(I, J) = D1(MOD(J,SIZE_D)+1) * (REAL(M)
+     $              / REAL(I + J - 1)) * D2(MOD(I,SIZE_D)+1)
             END DO
          END DO
       END IF
@@ -246,10 +247,10 @@ SUBROUTINE CLAHILB( N, NRHS, A, LDA, X, LDX, B, LDB, WORK,
 *     Generate the true solutions in X.  Because B = the first NRHS
 *     columns of M*I, the true solutions are just the first NRHS columns
 *     of the inverse Hilbert matrix.
-      WORK(1) = N
+      WORK(1) = REAL(N)
       DO J = 2, N
-         WORK(J) = (  ( (WORK(J-1)/(J-1)) * (J-1 - N) ) /(J-1)  )
-     $        * (N +J -1)
+         WORK(J) = (  ( (WORK(J-1)/REAL(J-1)) * REAL(J-1 - N) )
+     $        / REAL(J-1)  ) * REAL(N +J -1)
       END DO
 
 *     If we are testing SY routines,
@@ -259,7 +260,7 @@ SUBROUTINE CLAHILB( N, NRHS, A, LDA, X, LDX, B, LDB, WORK,
             DO I = 1, N
                X(I, J) =
      $              INVD1(MOD(J,SIZE_D)+1) *
-     $              ((WORK(I)*WORK(J)) / (I + J - 1))
+     $              ((WORK(I)*WORK(J)) / REAL(I + J - 1))
      $              * INVD1(MOD(I,SIZE_D)+1)
             END DO
          END DO
@@ -268,7 +269,7 @@ SUBROUTINE CLAHILB( N, NRHS, A, LDA, X, LDX, B, LDB, WORK,
             DO I = 1, N
                X(I, J) =
      $              INVD2(MOD(J,SIZE_D)+1) *
-     $              ((WORK(I)*WORK(J)) / (I + J - 1))
+     $              ((WORK(I)*WORK(J)) / REAL(I + J - 1))
      $              * INVD1(MOD(I,SIZE_D)+1)
             END DO
          END DO
diff --git a/TESTING/MATGEN/clakf2.f b/TESTING/MATGEN/clakf2.f
index 5f03cc181c..6a717ef024 100644
--- a/TESTING/MATGEN/clakf2.f
+++ b/TESTING/MATGEN/clakf2.f
@@ -102,6 +102,7 @@
 *
 *  =====================================================================
       SUBROUTINE CLAKF2( M, N, A, LDA, B, D, E, Z, LDZ )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/clarge.f b/TESTING/MATGEN/clarge.f
index 77086a4815..1b68d7553a 100644
--- a/TESTING/MATGEN/clarge.f
+++ b/TESTING/MATGEN/clarge.f
@@ -84,6 +84,7 @@
 *
 *  =====================================================================
       SUBROUTINE CLARGE( N, A, LDA, ISEED, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/clarnd.f b/TESTING/MATGEN/clarnd.f
index df08d67966..0e4b0250ba 100644
--- a/TESTING/MATGEN/clarnd.f
+++ b/TESTING/MATGEN/clarnd.f
@@ -72,6 +72,7 @@
 *>
 *  =====================================================================
       COMPLEX FUNCTION CLARND( IDIST, ISEED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -124,7 +125,8 @@ COMPLEX FUNCTION CLARND( IDIST, ISEED )
 *
 *        real and imaginary parts each normal (0,1)
 *
-         CLARND = SQRT( -TWO*LOG( T1 ) )*EXP( CMPLX( ZERO, TWOPI*T2 ) )
+         CLARND = SQRT( -TWO*LOG( T1 ) )*
+     $            EXP( CMPLX( ZERO, TWOPI*T2 ) )
       ELSE IF( IDIST.EQ.4 ) THEN
 *
 *        uniform distribution on the unit disc abs(z) <= 1
diff --git a/TESTING/MATGEN/claror.f b/TESTING/MATGEN/claror.f
index de5331e1f6..f303d270f7 100644
--- a/TESTING/MATGEN/claror.f
+++ b/TESTING/MATGEN/claror.f
@@ -155,6 +155,7 @@
 *
 *  =====================================================================
       SUBROUTINE CLAROR( SIDE, INIT, M, N, A, LDA, ISEED, X, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/clarot.f b/TESTING/MATGEN/clarot.f
index 901c0ee8a2..14df3f0bf0 100644
--- a/TESTING/MATGEN/clarot.f
+++ b/TESTING/MATGEN/clarot.f
@@ -224,8 +224,10 @@
 *> \ingroup complex_matgen
 *
 *  =====================================================================
-      SUBROUTINE CLAROT( LROWS, LLEFT, LRIGHT, NL, C, S, A, LDA, XLEFT,
+      SUBROUTINE CLAROT( LROWS, LLEFT, LRIGHT, NL, C, S, A, LDA,
+     $                   XLEFT,
      $                   XRIGHT )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/clatm1.f b/TESTING/MATGEN/clatm1.f
index 05a90fdced..6e056ec2ba 100644
--- a/TESTING/MATGEN/clatm1.f
+++ b/TESTING/MATGEN/clatm1.f
@@ -133,7 +133,9 @@
 *> \ingroup complex_matgen
 *
 *  =====================================================================
-      SUBROUTINE CLATM1( MODE, COND, IRSIGN, IDIST, ISEED, D, N, INFO )
+      SUBROUTINE CLATM1( MODE, COND, IRSIGN, IDIST, ISEED, D, N,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/clatm2.f b/TESTING/MATGEN/clatm2.f
index cd2dc7ae47..6429304c2f 100644
--- a/TESTING/MATGEN/clatm2.f
+++ b/TESTING/MATGEN/clatm2.f
@@ -209,6 +209,7 @@
 *  =====================================================================
       COMPLEX FUNCTION CLATM2( M, N, I, J, KL, KU, IDIST, ISEED, D,
      $                         IGRADE, DL, DR, IPVTNG, IWORK, SPARSE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/clatm3.f b/TESTING/MATGEN/clatm3.f
index 863325b3f2..7d9efca7dd 100644
--- a/TESTING/MATGEN/clatm3.f
+++ b/TESTING/MATGEN/clatm3.f
@@ -226,6 +226,7 @@
       COMPLEX FUNCTION CLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
      $                         ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                         SPARSE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/clatm5.f b/TESTING/MATGEN/clatm5.f
index 25904e45f8..1a26de078f 100644
--- a/TESTING/MATGEN/clatm5.f
+++ b/TESTING/MATGEN/clatm5.f
@@ -262,9 +262,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE CLATM5( PRTYPE, M, N, A, LDA, B, LDB, C, LDC, D, LDD,
+      SUBROUTINE CLATM5( PRTYPE, M, N, A, LDA, B, LDB, C, LDC, D,
+     $                   LDD,
      $                   E, LDE, F, LDF, R, LDR, L, LDL, ALPHA, QBLCKA,
      $                   QBLCKB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/clatm6.f b/TESTING/MATGEN/clatm6.f
index 632e896d8c..42e57225fc 100644
--- a/TESTING/MATGEN/clatm6.f
+++ b/TESTING/MATGEN/clatm6.f
@@ -171,6 +171,7 @@
 *  =====================================================================
       SUBROUTINE CLATM6( TYPE, N, A, LDA, B, X, LDX, Y, LDY, ALPHA,
      $                   BETA, WX, WY, S, DIF )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/clatme.f b/TESTING/MATGEN/clatme.f
index 213a4b3bca..88b6467850 100644
--- a/TESTING/MATGEN/clatme.f
+++ b/TESTING/MATGEN/clatme.f
@@ -298,6 +298,7 @@ SUBROUTINE CLATME( N, DIST, ISEED, D, MODE, COND, DMAX,
      $                   UPPER, SIM, DS, MODES, CONDS, KL, KU, ANORM,
      $  A,
      $                   LDA, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/clatmr.f b/TESTING/MATGEN/clatmr.f
index 34536d9b94..7c578b36e7 100644
--- a/TESTING/MATGEN/clatmr.f
+++ b/TESTING/MATGEN/clatmr.f
@@ -487,6 +487,7 @@ SUBROUTINE CLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
      $                   RSIGN, GRADE, DL, MODEL, CONDL, DR, MODER,
      $                   CONDR, PIVTNG, IPIVOT, KL, KU, SPARSE, ANORM,
      $                   PACK, A, LDA, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -530,7 +531,8 @@ SUBROUTINE CLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
       LOGICAL            LSAME
       REAL               CLANGB, CLANGE, CLANSB, CLANSP, CLANSY
       COMPLEX            CLATM2, CLATM3
-      EXTERNAL           LSAME, CLANGB, CLANGE, CLANSB, CLANSP, CLANSY,
+      EXTERNAL           LSAME, CLANGB, CLANGE,
+     $                   CLANSB, CLANSP, CLANSY,
      $                   CLATM2, CLATM3
 *     ..
 *     .. External Subroutines ..
@@ -897,7 +899,8 @@ SUBROUTINE CLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 170 J = 1, N
                DO 160 I = 1, J
-                  CTEMP = CLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  CTEMP = CLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                    IDIST,
      $                    ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                    SPARSE )
                   MNSUB = MIN( ISUB, JSUB )
@@ -916,7 +919,8 @@ SUBROUTINE CLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 190 J = 1, N
                DO 180 I = 1, J
-                  CTEMP = CLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  CTEMP = CLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                    IDIST,
      $                    ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                    SPARSE )
                   MNSUB = MIN( ISUB, JSUB )
@@ -935,7 +939,8 @@ SUBROUTINE CLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 210 J = 1, N
                DO 200 I = 1, J
-                  CTEMP = CLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  CTEMP = CLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                    IDIST,
      $                    ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                    SPARSE )
 *
@@ -963,7 +968,8 @@ SUBROUTINE CLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 230 J = 1, N
                DO 220 I = 1, J
-                  CTEMP = CLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  CTEMP = CLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                    IDIST,
      $                    ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                    SPARSE )
 *
@@ -1016,7 +1022,8 @@ SUBROUTINE CLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 270 J = 1, N
                DO 260 I = J - KUU, J
-                  CTEMP = CLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  CTEMP = CLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                    IDIST,
      $                    ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                    SPARSE )
                   MNSUB = MIN( ISUB, JSUB )
@@ -1106,7 +1113,8 @@ SUBROUTINE CLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 390 J = 1, N
                DO 380 I = 1, J
-                  A( I, J ) = CLATM2( M, N, I, J, KL, KU, IDIST, ISEED,
+                  A( I, J ) = CLATM2( M, N, I, J, KL, KU, IDIST,
+     $                        ISEED,
      $                        D, IGRADE, DL, DR, IPVTNG, IWORK, SPARSE )
                   IF( I.NE.J )
      $               A( J, I ) = CZERO
@@ -1142,7 +1150,8 @@ SUBROUTINE CLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ISUB = 1
                      JSUB = JSUB + 1
                   END IF
-                  A( ISUB, JSUB ) = CLATM2( M, N, I, J, KL, KU, IDIST,
+                  A( ISUB, JSUB ) = CLATM2( M, N, I, J, KL, KU,
+     $                              IDIST,
      $                              ISEED, D, IGRADE, DL, DR, IPVTNG,
      $                              IWORK, SPARSE )
   420          CONTINUE
@@ -1200,7 +1209,8 @@ SUBROUTINE CLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      A( J-I+1, I+N ) = CZERO
                   ELSE
                      IF( ISYM.EQ.0 ) THEN
-                        A( J-I+1, I ) = CONJG( CLATM2( M, N, I, J, KL,
+                        A( J-I+1, I ) = CONJG( CLATM2( M, N, I, J,
+     $                                  KL,
      $                                  KU, IDIST, ISEED, D, IGRADE, DL,
      $                                  DR, IPVTNG, IWORK, SPARSE ) )
                      ELSE
@@ -1216,7 +1226,8 @@ SUBROUTINE CLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 510 J = 1, N
                DO 500 I = J - KUU, J
-                  A( I-J+KUU+1, J ) = CLATM2( M, N, I, J, KL, KU, IDIST,
+                  A( I-J+KUU+1, J ) = CLATM2( M, N, I, J, KL, KU,
+     $                                IDIST,
      $                                ISEED, D, IGRADE, DL, DR, IPVTNG,
      $                                IWORK, SPARSE )
   500          CONTINUE
diff --git a/TESTING/MATGEN/clatms.f b/TESTING/MATGEN/clatms.f
index a1951216bb..36434d84a3 100644
--- a/TESTING/MATGEN/clatms.f
+++ b/TESTING/MATGEN/clatms.f
@@ -329,6 +329,7 @@
 *  =====================================================================
       SUBROUTINE CLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
      $                   KL, KU, PACK, A, LDA, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -374,7 +375,8 @@ SUBROUTINE CLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
       EXTERNAL           LSAME, SLARND, CLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLAGGE, CLAGHE, CLAGSY, CLAROT, CLARTG, CLASET,
+      EXTERNAL           CLAGGE, CLAGHE, CLAGSY,
+     $                   CLAROT, CLARTG, CLASET,
      $                   SLATM1, SSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -534,7 +536,8 @@ SUBROUTINE CLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
 *             Compute D according to COND and MODE
 *
-      CALL SLATM1( MODE, COND, IRSIGN, IDIST, ISEED, D, MNMIN, IINFO )
+      CALL SLATM1( MODE, COND, IRSIGN, IDIST, ISEED, D, MNMIN,
+     $             IINFO )
       IF( IINFO.NE.0 ) THEN
          INFO = 1
          RETURN
@@ -647,7 +650,8 @@ SUBROUTINE CLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ICOL = MAX( 1, JR-JKL )
                      IF( JR.LT.M ) THEN
                         IL = MIN( N, JR+JKU ) + 1 - ICOL
-                        CALL CLAROT( .TRUE., JR.GT.JKL, .FALSE., IL, C,
+                        CALL CLAROT( .TRUE., JR.GT.JKL, .FALSE., IL,
+     $                               C,
      $                               S, A( JR-ISKEW*ICOL+IOFFST, ICOL ),
      $                               ILDA, EXTRA, DUMMY )
                      END IF
@@ -668,7 +672,8 @@ SUBROUTINE CLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IL = IR + 2 - IROW
                         CTEMP = CZERO
                         ILTEMP = JCH.GT.JKU
-                        CALL CLAROT( .FALSE., ILTEMP, .TRUE., IL, C, S,
+                        CALL CLAROT( .FALSE., ILTEMP, .TRUE., IL, C,
+     $                               S,
      $                               A( IROW-ISKEW*IC+IOFFST, IC ),
      $                               ILDA, CTEMP, EXTRA )
                         IF( ILTEMP ) THEN
@@ -681,7 +686,8 @@ SUBROUTINE CLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            ICOL = MAX( 1, JCH-JKU-JKL )
                            IL = IC + 2 - ICOL
                            EXTRA = CZERO
-                           CALL CLAROT( .TRUE., JCH.GT.JKU+JKL, .TRUE.,
+                           CALL CLAROT( .TRUE., JCH.GT.JKU+JKL,
+     $                                  .TRUE.,
      $                                  IL, C, S, A( IROW-ISKEW*ICOL+
      $                                  IOFFST, ICOL ), ILDA, EXTRA,
      $                                  CTEMP )
@@ -705,7 +711,8 @@ SUBROUTINE CLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      IROW = MAX( 1, JC-JKU )
                      IF( JC.LT.N ) THEN
                         IL = MIN( M, JC+JKL ) + 1 - IROW
-                        CALL CLAROT( .FALSE., JC.GT.JKU, .FALSE., IL, C,
+                        CALL CLAROT( .FALSE., JC.GT.JKU, .FALSE., IL,
+     $                               C,
      $                               S, A( IROW-ISKEW*JC+IOFFST, JC ),
      $                               ILDA, EXTRA, DUMMY )
                      END IF
@@ -726,7 +733,8 @@ SUBROUTINE CLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IL = IC + 2 - ICOL
                         CTEMP = CZERO
                         ILTEMP = JCH.GT.JKL
-                        CALL CLAROT( .TRUE., ILTEMP, .TRUE., IL, C, S,
+                        CALL CLAROT( .TRUE., ILTEMP, .TRUE., IL, C,
+     $                               S,
      $                               A( IR-ISKEW*ICOL+IOFFST, ICOL ),
      $                               ILDA, CTEMP, EXTRA )
                         IF( ILTEMP ) THEN
@@ -739,7 +747,8 @@ SUBROUTINE CLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            IROW = MAX( 1, JCH-JKL-JKU )
                            IL = IR + 2 - IROW
                            EXTRA = CZERO
-                           CALL CLAROT( .FALSE., JCH.GT.JKL+JKU, .TRUE.,
+                           CALL CLAROT( .FALSE., JCH.GT.JKL+JKU,
+     $                                  .TRUE.,
      $                                  IL, C, S, A( IROW-ISKEW*ICOL+
      $                                  IOFFST, ICOL ), ILDA, EXTRA,
      $                                  CTEMP )
@@ -771,7 +780,8 @@ SUBROUTINE CLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      IROW = MAX( 1, JC-JKU+1 )
                      IF( JC.GT.0 ) THEN
                         IL = MIN( M, JC+JKL+1 ) + 1 - IROW
-                        CALL CLAROT( .FALSE., .FALSE., JC+JKL.LT.M, IL,
+                        CALL CLAROT( .FALSE., .FALSE., JC+JKL.LT.M,
+     $                               IL,
      $                               C, S, A( IROW-ISKEW*JC+IOFFST,
      $                               JC ), ILDA, DUMMY, EXTRA )
                      END IF
@@ -792,7 +802,8 @@ SUBROUTINE CLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         ICOL = MIN( N-1, JCH+JKU )
                         ILTEMP = JCH + JKU.LT.N
                         CTEMP = CZERO
-                        CALL CLAROT( .TRUE., ILEXTR, ILTEMP, ICOL+2-IC,
+                        CALL CLAROT( .TRUE., ILEXTR, ILTEMP,
+     $                               ICOL+2-IC,
      $                               C, S, A( JCH-ISKEW*IC+IOFFST, IC ),
      $                               ILDA, EXTRA, CTEMP )
                         IF( ILTEMP ) THEN
@@ -830,7 +841,8 @@ SUBROUTINE CLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ICOL = MAX( 1, JR-JKL+1 )
                      IF( JR.GT.0 ) THEN
                         IL = MIN( N, JR+JKU+1 ) + 1 - ICOL
-                        CALL CLAROT( .TRUE., .FALSE., JR+JKU.LT.N, IL,
+                        CALL CLAROT( .TRUE., .FALSE., JR+JKU.LT.N,
+     $                               IL,
      $                               C, S, A( JR-ISKEW*ICOL+IOFFST,
      $                               ICOL ), ILDA, DUMMY, EXTRA )
                      END IF
@@ -851,7 +863,8 @@ SUBROUTINE CLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IROW = MIN( M-1, JCH+JKL )
                         ILTEMP = JCH + JKL.LT.M
                         CTEMP = CZERO
-                        CALL CLAROT( .FALSE., ILEXTR, ILTEMP, IROW+2-IR,
+                        CALL CLAROT( .FALSE., ILEXTR, ILTEMP,
+     $                               IROW+2-IR,
      $                               C, S, A( IR-ISKEW*JCH+IOFFST,
      $                               JCH ), ILDA, EXTRA, CTEMP )
                         IF( ILTEMP ) THEN
@@ -940,13 +953,15 @@ SUBROUTINE CLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            CT = CONJG( C )
                            ST = CONJG( S )
                         END IF
-                        CALL CLAROT( .TRUE., .TRUE., .TRUE., K+2, C, S,
+                        CALL CLAROT( .TRUE., .TRUE., .TRUE., K+2, C,
+     $                               S,
      $                               A( ( 1-ISKEW )*JCH+IOFFG, JCH ),
      $                               ILDA, CTEMP, EXTRA )
                         IROW = MAX( 1, JCH-K )
                         IL = MIN( JCH+1, K+2 )
                         EXTRA = CZERO
-                        CALL CLAROT( .FALSE., JCH.GT.K, .TRUE., IL, CT,
+                        CALL CLAROT( .FALSE., JCH.GT.K, .TRUE., IL,
+     $                               CT,
      $                               ST, A( IROW-ISKEW*JCH+IOFFG, JCH ),
      $                               ILDA, EXTRA, CTEMP )
                         ICOL = JCH
@@ -1016,7 +1031,8 @@ SUBROUTINE CLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         CT = CONJG( C )
                         ST = CONJG( S )
                      END IF
-                     CALL CLAROT( .FALSE., .TRUE., N-JC.GT.K, IL, C, S,
+                     CALL CLAROT( .FALSE., .TRUE., N-JC.GT.K, IL, C,
+     $                            S,
      $                            A( ( 1-ISKEW )*JC+IOFFG, JC ), ILDA,
      $                            CTEMP, EXTRA )
                      ICOL = MAX( 1, JC-K+1 )
@@ -1042,7 +1058,8 @@ SUBROUTINE CLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            CT = CONJG( C )
                            ST = CONJG( S )
                         END IF
-                        CALL CLAROT( .TRUE., .TRUE., .TRUE., K+2, C, S,
+                        CALL CLAROT( .TRUE., .TRUE., .TRUE., K+2, C,
+     $                               S,
      $                               A( JCH-ISKEW*ICOL+IOFFG, ICOL ),
      $                               ILDA, EXTRA, CTEMP )
                         IL = MIN( N+1-JCH, K+2 )
diff --git a/TESTING/MATGEN/clatmt.f b/TESTING/MATGEN/clatmt.f
index 05eb5566a9..e93f00adcc 100644
--- a/TESTING/MATGEN/clatmt.f
+++ b/TESTING/MATGEN/clatmt.f
@@ -337,6 +337,7 @@
 *  =====================================================================
       SUBROUTINE CLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
      $                   RANK, KL, KU, PACK, A, LDA, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -382,7 +383,8 @@ SUBROUTINE CLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
       EXTERNAL           CLARND, SLARND, LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           CLAGGE, CLAGHE, CLAGSY, CLAROT, CLARTG, CLASET,
+      EXTERNAL           CLAGGE, CLAGHE, CLAGSY,
+     $                   CLAROT, CLARTG, CLASET,
      $                   SLATM7, SSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -656,7 +658,8 @@ SUBROUTINE CLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ICOL = MAX( 1, JR-JKL )
                      IF( JR.LT.M ) THEN
                         IL = MIN( N, JR+JKU ) + 1 - ICOL
-                        CALL CLAROT( .TRUE., JR.GT.JKL, .FALSE., IL, C,
+                        CALL CLAROT( .TRUE., JR.GT.JKL, .FALSE., IL,
+     $                               C,
      $                               S, A( JR-ISKEW*ICOL+IOFFST, ICOL ),
      $                               ILDA, EXTRA, DUMMY )
                      END IF
@@ -677,7 +680,8 @@ SUBROUTINE CLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IL = IR + 2 - IROW
                         CTEMP = CZERO
                         ILTEMP = JCH.GT.JKU
-                        CALL CLAROT( .FALSE., ILTEMP, .TRUE., IL, C, S,
+                        CALL CLAROT( .FALSE., ILTEMP, .TRUE., IL, C,
+     $                               S,
      $                               A( IROW-ISKEW*IC+IOFFST, IC ),
      $                               ILDA, CTEMP, EXTRA )
                         IF( ILTEMP ) THEN
@@ -690,7 +694,8 @@ SUBROUTINE CLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            ICOL = MAX( 1, JCH-JKU-JKL )
                            IL = IC + 2 - ICOL
                            EXTRA = CZERO
-                           CALL CLAROT( .TRUE., JCH.GT.JKU+JKL, .TRUE.,
+                           CALL CLAROT( .TRUE., JCH.GT.JKU+JKL,
+     $                                  .TRUE.,
      $                                  IL, C, S, A( IROW-ISKEW*ICOL+
      $                                  IOFFST, ICOL ), ILDA, EXTRA,
      $                                  CTEMP )
@@ -714,7 +719,8 @@ SUBROUTINE CLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      IROW = MAX( 1, JC-JKU )
                      IF( JC.LT.N ) THEN
                         IL = MIN( M, JC+JKL ) + 1 - IROW
-                        CALL CLAROT( .FALSE., JC.GT.JKU, .FALSE., IL, C,
+                        CALL CLAROT( .FALSE., JC.GT.JKU, .FALSE., IL,
+     $                               C,
      $                               S, A( IROW-ISKEW*JC+IOFFST, JC ),
      $                               ILDA, EXTRA, DUMMY )
                      END IF
@@ -735,7 +741,8 @@ SUBROUTINE CLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IL = IC + 2 - ICOL
                         CTEMP = CZERO
                         ILTEMP = JCH.GT.JKL
-                        CALL CLAROT( .TRUE., ILTEMP, .TRUE., IL, C, S,
+                        CALL CLAROT( .TRUE., ILTEMP, .TRUE., IL, C,
+     $                               S,
      $                               A( IR-ISKEW*ICOL+IOFFST, ICOL ),
      $                               ILDA, CTEMP, EXTRA )
                         IF( ILTEMP ) THEN
@@ -748,7 +755,8 @@ SUBROUTINE CLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            IROW = MAX( 1, JCH-JKL-JKU )
                            IL = IR + 2 - IROW
                            EXTRA = CZERO
-                           CALL CLAROT( .FALSE., JCH.GT.JKL+JKU, .TRUE.,
+                           CALL CLAROT( .FALSE., JCH.GT.JKL+JKU,
+     $                                  .TRUE.,
      $                                  IL, C, S, A( IROW-ISKEW*ICOL+
      $                                  IOFFST, ICOL ), ILDA, EXTRA,
      $                                  CTEMP )
@@ -780,7 +788,8 @@ SUBROUTINE CLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      IROW = MAX( 1, JC-JKU+1 )
                      IF( JC.GT.0 ) THEN
                         IL = MIN( M, JC+JKL+1 ) + 1 - IROW
-                        CALL CLAROT( .FALSE., .FALSE., JC+JKL.LT.M, IL,
+                        CALL CLAROT( .FALSE., .FALSE., JC+JKL.LT.M,
+     $                               IL,
      $                               C, S, A( IROW-ISKEW*JC+IOFFST,
      $                               JC ), ILDA, DUMMY, EXTRA )
                      END IF
@@ -801,7 +810,8 @@ SUBROUTINE CLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         ICOL = MIN( N-1, JCH+JKU )
                         ILTEMP = JCH + JKU.LT.N
                         CTEMP = CZERO
-                        CALL CLAROT( .TRUE., ILEXTR, ILTEMP, ICOL+2-IC,
+                        CALL CLAROT( .TRUE., ILEXTR, ILTEMP,
+     $                               ICOL+2-IC,
      $                               C, S, A( JCH-ISKEW*IC+IOFFST, IC ),
      $                               ILDA, EXTRA, CTEMP )
                         IF( ILTEMP ) THEN
@@ -839,7 +849,8 @@ SUBROUTINE CLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ICOL = MAX( 1, JR-JKL+1 )
                      IF( JR.GT.0 ) THEN
                         IL = MIN( N, JR+JKU+1 ) + 1 - ICOL
-                        CALL CLAROT( .TRUE., .FALSE., JR+JKU.LT.N, IL,
+                        CALL CLAROT( .TRUE., .FALSE., JR+JKU.LT.N,
+     $                               IL,
      $                               C, S, A( JR-ISKEW*ICOL+IOFFST,
      $                               ICOL ), ILDA, DUMMY, EXTRA )
                      END IF
@@ -860,7 +871,8 @@ SUBROUTINE CLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IROW = MIN( M-1, JCH+JKL )
                         ILTEMP = JCH + JKL.LT.M
                         CTEMP = CZERO
-                        CALL CLAROT( .FALSE., ILEXTR, ILTEMP, IROW+2-IR,
+                        CALL CLAROT( .FALSE., ILEXTR, ILTEMP,
+     $                               IROW+2-IR,
      $                               C, S, A( IR-ISKEW*JCH+IOFFST,
      $                               JCH ), ILDA, EXTRA, CTEMP )
                         IF( ILTEMP ) THEN
@@ -949,13 +961,15 @@ SUBROUTINE CLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            CT = CONJG( C )
                            ST = CONJG( S )
                         END IF
-                        CALL CLAROT( .TRUE., .TRUE., .TRUE., K+2, C, S,
+                        CALL CLAROT( .TRUE., .TRUE., .TRUE., K+2, C,
+     $                               S,
      $                               A( ( 1-ISKEW )*JCH+IOFFG, JCH ),
      $                               ILDA, CTEMP, EXTRA )
                         IROW = MAX( 1, JCH-K )
                         IL = MIN( JCH+1, K+2 )
                         EXTRA = CZERO
-                        CALL CLAROT( .FALSE., JCH.GT.K, .TRUE., IL, CT,
+                        CALL CLAROT( .FALSE., JCH.GT.K, .TRUE., IL,
+     $                               CT,
      $                               ST, A( IROW-ISKEW*JCH+IOFFG, JCH ),
      $                               ILDA, EXTRA, CTEMP )
                         ICOL = JCH
@@ -1025,7 +1039,8 @@ SUBROUTINE CLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         CT = CONJG( C )
                         ST = CONJG( S )
                      END IF
-                     CALL CLAROT( .FALSE., .TRUE., N-JC.GT.K, IL, C, S,
+                     CALL CLAROT( .FALSE., .TRUE., N-JC.GT.K, IL, C,
+     $                            S,
      $                            A( ( 1-ISKEW )*JC+IOFFG, JC ), ILDA,
      $                            CTEMP, EXTRA )
                      ICOL = MAX( 1, JC-K+1 )
@@ -1051,7 +1066,8 @@ SUBROUTINE CLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            CT = CONJG( C )
                            ST = CONJG( S )
                         END IF
-                        CALL CLAROT( .TRUE., .TRUE., .TRUE., K+2, C, S,
+                        CALL CLAROT( .TRUE., .TRUE., .TRUE., K+2, C,
+     $                               S,
      $                               A( JCH-ISKEW*ICOL+IOFFG, ICOL ),
      $                               ILDA, EXTRA, CTEMP )
                         IL = MIN( N+1-JCH, K+2 )
diff --git a/TESTING/MATGEN/dlagge.f b/TESTING/MATGEN/dlagge.f
index ffd11d2785..9e5ee4d52a 100644
--- a/TESTING/MATGEN/dlagge.f
+++ b/TESTING/MATGEN/dlagge.f
@@ -110,6 +110,7 @@
 *
 *  =====================================================================
       SUBROUTINE DLAGGE( M, N, KL, KU, D, A, LDA, ISEED, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/dlagsy.f b/TESTING/MATGEN/dlagsy.f
index 7ba58ee4f5..e0205a67f6 100644
--- a/TESTING/MATGEN/dlagsy.f
+++ b/TESTING/MATGEN/dlagsy.f
@@ -98,6 +98,7 @@
 *
 *  =====================================================================
       SUBROUTINE DLAGSY( N, K, D, A, LDA, ISEED, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/dlahilb.f b/TESTING/MATGEN/dlahilb.f
index cf0712b51c..709cae8cbb 100644
--- a/TESTING/MATGEN/dlahilb.f
+++ b/TESTING/MATGEN/dlahilb.f
@@ -120,7 +120,9 @@
 *> \ingroup double_matgen
 *
 *  =====================================================================
-      SUBROUTINE DLAHILB( N, NRHS, A, LDA, X, LDX, B, LDB, WORK, INFO)
+      SUBROUTINE DLAHILB( N, NRHS, A, LDA, X, LDX, B, LDB, WORK,
+     $                    INFO)
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/dlakf2.f b/TESTING/MATGEN/dlakf2.f
index 76baefdcdd..8c1e52dde6 100644
--- a/TESTING/MATGEN/dlakf2.f
+++ b/TESTING/MATGEN/dlakf2.f
@@ -102,6 +102,7 @@
 *
 *  =====================================================================
       SUBROUTINE DLAKF2( M, N, A, LDA, B, D, E, Z, LDZ )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/dlaran.f b/TESTING/MATGEN/dlaran.f
index 24f6e97278..f42138a1b7 100644
--- a/TESTING/MATGEN/dlaran.f
+++ b/TESTING/MATGEN/dlaran.f
@@ -64,6 +64,7 @@
 *>
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLARAN( ISEED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/dlarge.f b/TESTING/MATGEN/dlarge.f
index 4f1c09477d..842efc19fe 100644
--- a/TESTING/MATGEN/dlarge.f
+++ b/TESTING/MATGEN/dlarge.f
@@ -84,6 +84,7 @@
 *
 *  =====================================================================
       SUBROUTINE DLARGE( N, A, LDA, ISEED, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/dlarnd.f b/TESTING/MATGEN/dlarnd.f
index f41f2ceab8..8562574f3d 100644
--- a/TESTING/MATGEN/dlarnd.f
+++ b/TESTING/MATGEN/dlarnd.f
@@ -70,6 +70,7 @@
 *>
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLARND( IDIST, ISEED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/dlaror.f b/TESTING/MATGEN/dlaror.f
index 183aa00d0a..8994def144 100644
--- a/TESTING/MATGEN/dlaror.f
+++ b/TESTING/MATGEN/dlaror.f
@@ -143,6 +143,7 @@
 *
 *  =====================================================================
       SUBROUTINE DLAROR( SIDE, INIT, M, N, A, LDA, ISEED, X, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/dlarot.f b/TESTING/MATGEN/dlarot.f
index 7337dc682c..d42b5e5d5c 100644
--- a/TESTING/MATGEN/dlarot.f
+++ b/TESTING/MATGEN/dlarot.f
@@ -221,8 +221,10 @@
 *> \ingroup double_matgen
 *
 *  =====================================================================
-      SUBROUTINE DLAROT( LROWS, LLEFT, LRIGHT, NL, C, S, A, LDA, XLEFT,
+      SUBROUTINE DLAROT( LROWS, LLEFT, LRIGHT, NL, C, S, A, LDA,
+     $                   XLEFT,
      $                   XRIGHT )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/dlatm1.f b/TESTING/MATGEN/dlatm1.f
index b0d8ffa3e3..00b3d3e47d 100644
--- a/TESTING/MATGEN/dlatm1.f
+++ b/TESTING/MATGEN/dlatm1.f
@@ -131,7 +131,9 @@
 *> \ingroup double_matgen
 *
 *  =====================================================================
-      SUBROUTINE DLATM1( MODE, COND, IRSIGN, IDIST, ISEED, D, N, INFO )
+      SUBROUTINE DLATM1( MODE, COND, IRSIGN, IDIST, ISEED, D, N,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/dlatm2.f b/TESTING/MATGEN/dlatm2.f
index 5a55addc36..bf5c0700ce 100644
--- a/TESTING/MATGEN/dlatm2.f
+++ b/TESTING/MATGEN/dlatm2.f
@@ -205,6 +205,7 @@
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLATM2( M, N, I, J, KL, KU, IDIST,
      $                 ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK, SPARSE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/dlatm3.f b/TESTING/MATGEN/dlatm3.f
index f5a4a66b30..bea8cec7cb 100644
--- a/TESTING/MATGEN/dlatm3.f
+++ b/TESTING/MATGEN/dlatm3.f
@@ -220,9 +220,11 @@
 *> \ingroup double_matgen
 *
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION DLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+      DOUBLE PRECISION FUNCTION DLATM3( M, N, I, J, ISUB, JSUB, KL,
+     $                 KU,
      $                 IDIST, ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                 SPARSE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/dlatm5.f b/TESTING/MATGEN/dlatm5.f
index 429315b0d5..a46d05ebd3 100644
--- a/TESTING/MATGEN/dlatm5.f
+++ b/TESTING/MATGEN/dlatm5.f
@@ -262,9 +262,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DLATM5( PRTYPE, M, N, A, LDA, B, LDB, C, LDC, D, LDD,
+      SUBROUTINE DLATM5( PRTYPE, M, N, A, LDA, B, LDB, C, LDC, D,
+     $                   LDD,
      $                   E, LDE, F, LDF, R, LDR, L, LDL, ALPHA, QBLCKA,
      $                   QBLCKB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/dlatm6.f b/TESTING/MATGEN/dlatm6.f
index 01941609cf..b4eede5e68 100644
--- a/TESTING/MATGEN/dlatm6.f
+++ b/TESTING/MATGEN/dlatm6.f
@@ -173,6 +173,7 @@
 *  =====================================================================
       SUBROUTINE DLATM6( TYPE, N, A, LDA, B, X, LDX, Y, LDY, ALPHA,
      $                   BETA, WX, WY, S, DIF )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/dlatm7.f b/TESTING/MATGEN/dlatm7.f
index 38c993dad7..d4d3448ffb 100644
--- a/TESTING/MATGEN/dlatm7.f
+++ b/TESTING/MATGEN/dlatm7.f
@@ -119,6 +119,7 @@
 *  =====================================================================
       SUBROUTINE DLATM7( MODE, COND, IRSIGN, IDIST, ISEED, D, N,
      $                   RANK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/dlatme.f b/TESTING/MATGEN/dlatme.f
index 311f16e2da..287449f10f 100644
--- a/TESTING/MATGEN/dlatme.f
+++ b/TESTING/MATGEN/dlatme.f
@@ -329,6 +329,7 @@ SUBROUTINE DLATME( N, DIST, ISEED, D, MODE, COND, DMAX, EI,
      $                   UPPER, SIM, DS, MODES, CONDS, KL, KU, ANORM,
      $  A,
      $                   LDA, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/dlatmr.f b/TESTING/MATGEN/dlatmr.f
index efb016b91e..284eeb32e9 100644
--- a/TESTING/MATGEN/dlatmr.f
+++ b/TESTING/MATGEN/dlatmr.f
@@ -468,6 +468,7 @@ SUBROUTINE DLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
      $                   RSIGN, GRADE, DL, MODEL, CONDL, DR, MODER,
      $                   CONDR, PIVTNG, IPIVOT, KL, KU, SPARSE, ANORM,
      $                   PACK, A, LDA, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -503,9 +504,11 @@ SUBROUTINE DLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      DOUBLE PRECISION   DLANGB, DLANGE, DLANSB, DLANSP, DLANSY, DLATM2,
+      DOUBLE PRECISION   DLANGB, DLANGE, DLANSB,
+     $                   DLANSP, DLANSY, DLATM2,
      $                   DLATM3
-      EXTERNAL           LSAME, DLANGB, DLANGE, DLANSB, DLANSP, DLANSY,
+      EXTERNAL           LSAME, DLANGB, DLANGE,
+     $                   DLANSB, DLANSP, DLANSY,
      $                   DLATM2, DLATM3
 *     ..
 *     .. External Subroutines ..
@@ -846,7 +849,8 @@ SUBROUTINE DLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 140 J = 1, N
                DO 130 I = 1, J
-                  TEMP = DLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  TEMP = DLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                   IDIST,
      $                   ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                   SPARSE )
                   MNSUB = MIN( ISUB, JSUB )
@@ -861,7 +865,8 @@ SUBROUTINE DLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 160 J = 1, N
                DO 150 I = 1, J
-                  TEMP = DLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  TEMP = DLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                   IDIST,
      $                   ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                   SPARSE )
                   MNSUB = MIN( ISUB, JSUB )
@@ -876,7 +881,8 @@ SUBROUTINE DLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 180 J = 1, N
                DO 170 I = 1, J
-                  TEMP = DLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  TEMP = DLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                   IDIST,
      $                   ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                   SPARSE )
 *
@@ -900,7 +906,8 @@ SUBROUTINE DLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 200 J = 1, N
                DO 190 I = 1, J
-                  TEMP = DLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  TEMP = DLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                   IDIST,
      $                   ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                   SPARSE )
 *
@@ -945,7 +952,8 @@ SUBROUTINE DLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 240 J = 1, N
                DO 230 I = J - KUU, J
-                  TEMP = DLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  TEMP = DLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                   IDIST,
      $                   ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                   SPARSE )
                   MNSUB = MIN( ISUB, JSUB )
@@ -1012,7 +1020,8 @@ SUBROUTINE DLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 340 J = 1, N
                DO 330 I = 1, J
-                  A( I, J ) = DLATM2( M, N, I, J, KL, KU, IDIST, ISEED,
+                  A( I, J ) = DLATM2( M, N, I, J, KL, KU, IDIST,
+     $                        ISEED,
      $                        D, IGRADE, DL, DR, IPVTNG, IWORK, SPARSE )
                   IF( I.NE.J )
      $               A( J, I ) = ZERO
@@ -1023,7 +1032,8 @@ SUBROUTINE DLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 360 J = 1, N
                DO 350 I = 1, J
-                  A( J, I ) = DLATM2( M, N, I, J, KL, KU, IDIST, ISEED,
+                  A( J, I ) = DLATM2( M, N, I, J, KL, KU, IDIST,
+     $                        ISEED,
      $                        D, IGRADE, DL, DR, IPVTNG, IWORK, SPARSE )
                   IF( I.NE.J )
      $               A( I, J ) = ZERO
@@ -1041,7 +1051,8 @@ SUBROUTINE DLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ISUB = 1
                      JSUB = JSUB + 1
                   END IF
-                  A( ISUB, JSUB ) = DLATM2( M, N, I, J, KL, KU, IDIST,
+                  A( ISUB, JSUB ) = DLATM2( M, N, I, J, KL, KU,
+     $                              IDIST,
      $                              ISEED, D, IGRADE, DL, DR, IPVTNG,
      $                              IWORK, SPARSE )
   370          CONTINUE
@@ -1096,7 +1107,8 @@ SUBROUTINE DLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                   IF( I.LT.1 ) THEN
                      A( J-I+1, I+N ) = ZERO
                   ELSE
-                     A( J-I+1, I ) = DLATM2( M, N, I, J, KL, KU, IDIST,
+                     A( J-I+1, I ) = DLATM2( M, N, I, J, KL, KU,
+     $                               IDIST,
      $                               ISEED, D, IGRADE, DL, DR, IPVTNG,
      $                               IWORK, SPARSE )
                   END IF
@@ -1107,7 +1119,8 @@ SUBROUTINE DLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 460 J = 1, N
                DO 450 I = J - KUU, J
-                  A( I-J+KUU+1, J ) = DLATM2( M, N, I, J, KL, KU, IDIST,
+                  A( I-J+KUU+1, J ) = DLATM2( M, N, I, J, KL, KU,
+     $                                IDIST,
      $                                ISEED, D, IGRADE, DL, DR, IPVTNG,
      $                                IWORK, SPARSE )
   450          CONTINUE
diff --git a/TESTING/MATGEN/dlatms.f b/TESTING/MATGEN/dlatms.f
index e6b9fbece2..e4e49d90ae 100644
--- a/TESTING/MATGEN/dlatms.f
+++ b/TESTING/MATGEN/dlatms.f
@@ -318,6 +318,7 @@
 *  =====================================================================
       SUBROUTINE DLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
      $                   KL, KU, PACK, A, LDA, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -358,7 +359,8 @@ SUBROUTINE DLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
       EXTERNAL           LSAME, DLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DCOPY, DLAGGE, DLAGSY, DLAROT, DLARTG, DLASET,
+      EXTERNAL           DCOPY, DLAGGE, DLAGSY,
+     $                   DLAROT, DLARTG, DLASET,
      $                   DLATM1, DSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -513,7 +515,8 @@ SUBROUTINE DLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
 *             Compute D according to COND and MODE
 *
-      CALL DLATM1( MODE, COND, IRSIGN, IDIST, ISEED, D, MNMIN, IINFO )
+      CALL DLATM1( MODE, COND, IRSIGN, IDIST, ISEED, D, MNMIN,
+     $             IINFO )
       IF( IINFO.NE.0 ) THEN
          INFO = 1
          RETURN
@@ -620,7 +623,8 @@ SUBROUTINE DLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ICOL = MAX( 1, JR-JKL )
                      IF( JR.LT.M ) THEN
                         IL = MIN( N, JR+JKU ) + 1 - ICOL
-                        CALL DLAROT( .TRUE., JR.GT.JKL, .FALSE., IL, C,
+                        CALL DLAROT( .TRUE., JR.GT.JKL, .FALSE., IL,
+     $                               C,
      $                               S, A( JR-ISKEW*ICOL+IOFFST, ICOL ),
      $                               ILDA, EXTRA, DUMMY )
                      END IF
@@ -638,7 +642,8 @@ SUBROUTINE DLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IL = IR + 2 - IROW
                         TEMP = ZERO
                         ILTEMP = JCH.GT.JKU
-                        CALL DLAROT( .FALSE., ILTEMP, .TRUE., IL, C, -S,
+                        CALL DLAROT( .FALSE., ILTEMP, .TRUE., IL, C,
+     $                               -S,
      $                               A( IROW-ISKEW*IC+IOFFST, IC ),
      $                               ILDA, TEMP, EXTRA )
                         IF( ILTEMP ) THEN
@@ -647,7 +652,8 @@ SUBROUTINE DLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            ICOL = MAX( 1, JCH-JKU-JKL )
                            IL = IC + 2 - ICOL
                            EXTRA = ZERO
-                           CALL DLAROT( .TRUE., JCH.GT.JKU+JKL, .TRUE.,
+                           CALL DLAROT( .TRUE., JCH.GT.JKU+JKL,
+     $                                  .TRUE.,
      $                                  IL, C, -S, A( IROW-ISKEW*ICOL+
      $                                  IOFFST, ICOL ), ILDA, EXTRA,
      $                                  TEMP )
@@ -671,7 +677,8 @@ SUBROUTINE DLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      IROW = MAX( 1, JC-JKU )
                      IF( JC.LT.N ) THEN
                         IL = MIN( M, JC+JKL ) + 1 - IROW
-                        CALL DLAROT( .FALSE., JC.GT.JKU, .FALSE., IL, C,
+                        CALL DLAROT( .FALSE., JC.GT.JKU, .FALSE., IL,
+     $                               C,
      $                               S, A( IROW-ISKEW*JC+IOFFST, JC ),
      $                               ILDA, EXTRA, DUMMY )
                      END IF
@@ -689,7 +696,8 @@ SUBROUTINE DLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IL = IC + 2 - ICOL
                         TEMP = ZERO
                         ILTEMP = JCH.GT.JKL
-                        CALL DLAROT( .TRUE., ILTEMP, .TRUE., IL, C, -S,
+                        CALL DLAROT( .TRUE., ILTEMP, .TRUE., IL, C,
+     $                               -S,
      $                               A( IR-ISKEW*ICOL+IOFFST, ICOL ),
      $                               ILDA, TEMP, EXTRA )
                         IF( ILTEMP ) THEN
@@ -698,7 +706,8 @@ SUBROUTINE DLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            IROW = MAX( 1, JCH-JKL-JKU )
                            IL = IR + 2 - IROW
                            EXTRA = ZERO
-                           CALL DLAROT( .FALSE., JCH.GT.JKL+JKU, .TRUE.,
+                           CALL DLAROT( .FALSE., JCH.GT.JKL+JKU,
+     $                                  .TRUE.,
      $                                  IL, C, -S, A( IROW-ISKEW*ICOL+
      $                                  IOFFST, ICOL ), ILDA, EXTRA,
      $                                  TEMP )
@@ -730,7 +739,8 @@ SUBROUTINE DLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      IROW = MAX( 1, JC-JKU+1 )
                      IF( JC.GT.0 ) THEN
                         IL = MIN( M, JC+JKL+1 ) + 1 - IROW
-                        CALL DLAROT( .FALSE., .FALSE., JC+JKL.LT.M, IL,
+                        CALL DLAROT( .FALSE., .FALSE., JC+JKL.LT.M,
+     $                               IL,
      $                               C, S, A( IROW-ISKEW*JC+IOFFST,
      $                               JC ), ILDA, DUMMY, EXTRA )
                      END IF
@@ -748,7 +758,8 @@ SUBROUTINE DLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         ICOL = MIN( N-1, JCH+JKU )
                         ILTEMP = JCH + JKU.LT.N
                         TEMP = ZERO
-                        CALL DLAROT( .TRUE., ILEXTR, ILTEMP, ICOL+2-IC,
+                        CALL DLAROT( .TRUE., ILEXTR, ILTEMP,
+     $                               ICOL+2-IC,
      $                               C, S, A( JCH-ISKEW*IC+IOFFST, IC ),
      $                               ILDA, EXTRA, TEMP )
                         IF( ILTEMP ) THEN
@@ -783,7 +794,8 @@ SUBROUTINE DLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ICOL = MAX( 1, JR-JKL+1 )
                      IF( JR.GT.0 ) THEN
                         IL = MIN( N, JR+JKU+1 ) + 1 - ICOL
-                        CALL DLAROT( .TRUE., .FALSE., JR+JKU.LT.N, IL,
+                        CALL DLAROT( .TRUE., .FALSE., JR+JKU.LT.N,
+     $                               IL,
      $                               C, S, A( JR-ISKEW*ICOL+IOFFST,
      $                               ICOL ), ILDA, DUMMY, EXTRA )
                      END IF
@@ -801,7 +813,8 @@ SUBROUTINE DLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IROW = MIN( M-1, JCH+JKL )
                         ILTEMP = JCH + JKL.LT.M
                         TEMP = ZERO
-                        CALL DLAROT( .FALSE., ILEXTR, ILTEMP, IROW+2-IR,
+                        CALL DLAROT( .FALSE., ILEXTR, ILTEMP,
+     $                               IROW+2-IR,
      $                               C, S, A( IR-ISKEW*JCH+IOFFST,
      $                               JCH ), ILDA, EXTRA, TEMP )
                         IF( ILTEMP ) THEN
@@ -863,13 +876,15 @@ SUBROUTINE DLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         CALL DLARTG( A( JCH+1-ISKEW*( ICOL+1 )+IOFFG,
      $                               ICOL+1 ), EXTRA, C, S, DUMMY )
                         TEMP = A( JCH-ISKEW*( JCH+1 )+IOFFG, JCH+1 )
-                        CALL DLAROT( .TRUE., .TRUE., .TRUE., K+2, C, -S,
+                        CALL DLAROT( .TRUE., .TRUE., .TRUE., K+2, C,
+     $                               -S,
      $                               A( ( 1-ISKEW )*JCH+IOFFG, JCH ),
      $                               ILDA, TEMP, EXTRA )
                         IROW = MAX( 1, JCH-K )
                         IL = MIN( JCH+1, K+2 )
                         EXTRA = ZERO
-                        CALL DLAROT( .FALSE., JCH.GT.K, .TRUE., IL, C,
+                        CALL DLAROT( .FALSE., JCH.GT.K, .TRUE., IL,
+     $                               C,
      $                               -S, A( IROW-ISKEW*JCH+IOFFG, JCH ),
      $                               ILDA, EXTRA, TEMP )
                         ICOL = JCH
@@ -921,11 +936,13 @@ SUBROUTINE DLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ANGLE = TWOPI*DLARND( 1, ISEED )
                      C = COS( ANGLE )
                      S = -SIN( ANGLE )
-                     CALL DLAROT( .FALSE., .TRUE., N-JC.GT.K, IL, C, S,
+                     CALL DLAROT( .FALSE., .TRUE., N-JC.GT.K, IL, C,
+     $                            S,
      $                            A( ( 1-ISKEW )*JC+IOFFG, JC ), ILDA,
      $                            TEMP, EXTRA )
                      ICOL = MAX( 1, JC-K+1 )
-                     CALL DLAROT( .TRUE., .FALSE., .TRUE., JC+2-ICOL, C,
+                     CALL DLAROT( .TRUE., .FALSE., .TRUE., JC+2-ICOL,
+     $                            C,
      $                            S, A( JC-ISKEW*ICOL+IOFFG, ICOL ),
      $                            ILDA, DUMMY, TEMP )
 *
@@ -936,12 +953,14 @@ SUBROUTINE DLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         CALL DLARTG( A( JCH-ISKEW*ICOL+IOFFG, ICOL ),
      $                               EXTRA, C, S, DUMMY )
                         TEMP = A( 1+( 1-ISKEW )*JCH+IOFFG, JCH )
-                        CALL DLAROT( .TRUE., .TRUE., .TRUE., K+2, C, S,
+                        CALL DLAROT( .TRUE., .TRUE., .TRUE., K+2, C,
+     $                               S,
      $                               A( JCH-ISKEW*ICOL+IOFFG, ICOL ),
      $                               ILDA, EXTRA, TEMP )
                         IL = MIN( N+1-JCH, K+2 )
                         EXTRA = ZERO
-                        CALL DLAROT( .FALSE., .TRUE., N-JCH.GT.K, IL, C,
+                        CALL DLAROT( .FALSE., .TRUE., N-JCH.GT.K, IL,
+     $                               C,
      $                               S, A( ( 1-ISKEW )*JCH+IOFFG, JCH ),
      $                               ILDA, TEMP, EXTRA )
                         ICOL = JCH
diff --git a/TESTING/MATGEN/dlatmt.f b/TESTING/MATGEN/dlatmt.f
index bdd167f2d1..7463e4d9e3 100644
--- a/TESTING/MATGEN/dlatmt.f
+++ b/TESTING/MATGEN/dlatmt.f
@@ -328,6 +328,7 @@
 *  =====================================================================
       SUBROUTINE DLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
      $                   RANK, KL, KU, PACK, A, LDA, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -631,7 +632,8 @@ SUBROUTINE DLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ICOL = MAX( 1, JR-JKL )
                      IF( JR.LT.M ) THEN
                         IL = MIN( N, JR+JKU ) + 1 - ICOL
-                        CALL DLAROT( .TRUE., JR.GT.JKL, .FALSE., IL, C,
+                        CALL DLAROT( .TRUE., JR.GT.JKL, .FALSE., IL,
+     $                               C,
      $                               S, A( JR-ISKEW*ICOL+IOFFST, ICOL ),
      $                               ILDA, EXTRA, DUMMY )
                      END IF
@@ -649,7 +651,8 @@ SUBROUTINE DLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IL = IR + 2 - IROW
                         TEMP = ZERO
                         ILTEMP = JCH.GT.JKU
-                        CALL DLAROT( .FALSE., ILTEMP, .TRUE., IL, C, -S,
+                        CALL DLAROT( .FALSE., ILTEMP, .TRUE., IL, C,
+     $                               -S,
      $                               A( IROW-ISKEW*IC+IOFFST, IC ),
      $                               ILDA, TEMP, EXTRA )
                         IF( ILTEMP ) THEN
@@ -658,7 +661,8 @@ SUBROUTINE DLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            ICOL = MAX( 1, JCH-JKU-JKL )
                            IL = IC + 2 - ICOL
                            EXTRA = ZERO
-                           CALL DLAROT( .TRUE., JCH.GT.JKU+JKL, .TRUE.,
+                           CALL DLAROT( .TRUE., JCH.GT.JKU+JKL,
+     $                                  .TRUE.,
      $                                  IL, C, -S, A( IROW-ISKEW*ICOL+
      $                                  IOFFST, ICOL ), ILDA, EXTRA,
      $                                  TEMP )
@@ -682,7 +686,8 @@ SUBROUTINE DLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      IROW = MAX( 1, JC-JKU )
                      IF( JC.LT.N ) THEN
                         IL = MIN( M, JC+JKL ) + 1 - IROW
-                        CALL DLAROT( .FALSE., JC.GT.JKU, .FALSE., IL, C,
+                        CALL DLAROT( .FALSE., JC.GT.JKU, .FALSE., IL,
+     $                               C,
      $                               S, A( IROW-ISKEW*JC+IOFFST, JC ),
      $                               ILDA, EXTRA, DUMMY )
                      END IF
@@ -700,7 +705,8 @@ SUBROUTINE DLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IL = IC + 2 - ICOL
                         TEMP = ZERO
                         ILTEMP = JCH.GT.JKL
-                        CALL DLAROT( .TRUE., ILTEMP, .TRUE., IL, C, -S,
+                        CALL DLAROT( .TRUE., ILTEMP, .TRUE., IL, C,
+     $                               -S,
      $                               A( IR-ISKEW*ICOL+IOFFST, ICOL ),
      $                               ILDA, TEMP, EXTRA )
                         IF( ILTEMP ) THEN
@@ -709,7 +715,8 @@ SUBROUTINE DLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            IROW = MAX( 1, JCH-JKL-JKU )
                            IL = IR + 2 - IROW
                            EXTRA = ZERO
-                           CALL DLAROT( .FALSE., JCH.GT.JKL+JKU, .TRUE.,
+                           CALL DLAROT( .FALSE., JCH.GT.JKL+JKU,
+     $                                  .TRUE.,
      $                                  IL, C, -S, A( IROW-ISKEW*ICOL+
      $                                  IOFFST, ICOL ), ILDA, EXTRA,
      $                                  TEMP )
@@ -741,7 +748,8 @@ SUBROUTINE DLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      IROW = MAX( 1, JC-JKU+1 )
                      IF( JC.GT.0 ) THEN
                         IL = MIN( M, JC+JKL+1 ) + 1 - IROW
-                        CALL DLAROT( .FALSE., .FALSE., JC+JKL.LT.M, IL,
+                        CALL DLAROT( .FALSE., .FALSE., JC+JKL.LT.M,
+     $                               IL,
      $                               C, S, A( IROW-ISKEW*JC+IOFFST,
      $                               JC ), ILDA, DUMMY, EXTRA )
                      END IF
@@ -759,7 +767,8 @@ SUBROUTINE DLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         ICOL = MIN( N-1, JCH+JKU )
                         ILTEMP = JCH + JKU.LT.N
                         TEMP = ZERO
-                        CALL DLAROT( .TRUE., ILEXTR, ILTEMP, ICOL+2-IC,
+                        CALL DLAROT( .TRUE., ILEXTR, ILTEMP,
+     $                               ICOL+2-IC,
      $                               C, S, A( JCH-ISKEW*IC+IOFFST, IC ),
      $                               ILDA, EXTRA, TEMP )
                         IF( ILTEMP ) THEN
@@ -794,7 +803,8 @@ SUBROUTINE DLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ICOL = MAX( 1, JR-JKL+1 )
                      IF( JR.GT.0 ) THEN
                         IL = MIN( N, JR+JKU+1 ) + 1 - ICOL
-                        CALL DLAROT( .TRUE., .FALSE., JR+JKU.LT.N, IL,
+                        CALL DLAROT( .TRUE., .FALSE., JR+JKU.LT.N,
+     $                               IL,
      $                               C, S, A( JR-ISKEW*ICOL+IOFFST,
      $                               ICOL ), ILDA, DUMMY, EXTRA )
                      END IF
@@ -812,7 +822,8 @@ SUBROUTINE DLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IROW = MIN( M-1, JCH+JKL )
                         ILTEMP = JCH + JKL.LT.M
                         TEMP = ZERO
-                        CALL DLAROT( .FALSE., ILEXTR, ILTEMP, IROW+2-IR,
+                        CALL DLAROT( .FALSE., ILEXTR, ILTEMP,
+     $                               IROW+2-IR,
      $                               C, S, A( IR-ISKEW*JCH+IOFFST,
      $                               JCH ), ILDA, EXTRA, TEMP )
                         IF( ILTEMP ) THEN
@@ -874,13 +885,15 @@ SUBROUTINE DLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         CALL DLARTG( A( JCH+1-ISKEW*( ICOL+1 )+IOFFG,
      $                               ICOL+1 ), EXTRA, C, S, DUMMY )
                         TEMP = A( JCH-ISKEW*( JCH+1 )+IOFFG, JCH+1 )
-                        CALL DLAROT( .TRUE., .TRUE., .TRUE., K+2, C, -S,
+                        CALL DLAROT( .TRUE., .TRUE., .TRUE., K+2, C,
+     $                               -S,
      $                               A( ( 1-ISKEW )*JCH+IOFFG, JCH ),
      $                               ILDA, TEMP, EXTRA )
                         IROW = MAX( 1, JCH-K )
                         IL = MIN( JCH+1, K+2 )
                         EXTRA = ZERO
-                        CALL DLAROT( .FALSE., JCH.GT.K, .TRUE., IL, C,
+                        CALL DLAROT( .FALSE., JCH.GT.K, .TRUE., IL,
+     $                               C,
      $                               -S, A( IROW-ISKEW*JCH+IOFFG, JCH ),
      $                               ILDA, EXTRA, TEMP )
                         ICOL = JCH
@@ -932,11 +945,13 @@ SUBROUTINE DLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ANGLE = TWOPI*DLARND( 1, ISEED )
                      C = COS( ANGLE )
                      S = -SIN( ANGLE )
-                     CALL DLAROT( .FALSE., .TRUE., N-JC.GT.K, IL, C, S,
+                     CALL DLAROT( .FALSE., .TRUE., N-JC.GT.K, IL, C,
+     $                            S,
      $                            A( ( 1-ISKEW )*JC+IOFFG, JC ), ILDA,
      $                            TEMP, EXTRA )
                      ICOL = MAX( 1, JC-K+1 )
-                     CALL DLAROT( .TRUE., .FALSE., .TRUE., JC+2-ICOL, C,
+                     CALL DLAROT( .TRUE., .FALSE., .TRUE., JC+2-ICOL,
+     $                            C,
      $                            S, A( JC-ISKEW*ICOL+IOFFG, ICOL ),
      $                            ILDA, DUMMY, TEMP )
 *
@@ -947,12 +962,14 @@ SUBROUTINE DLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         CALL DLARTG( A( JCH-ISKEW*ICOL+IOFFG, ICOL ),
      $                               EXTRA, C, S, DUMMY )
                         TEMP = A( 1+( 1-ISKEW )*JCH+IOFFG, JCH )
-                        CALL DLAROT( .TRUE., .TRUE., .TRUE., K+2, C, S,
+                        CALL DLAROT( .TRUE., .TRUE., .TRUE., K+2, C,
+     $                               S,
      $                               A( JCH-ISKEW*ICOL+IOFFG, ICOL ),
      $                               ILDA, EXTRA, TEMP )
                         IL = MIN( N+1-JCH, K+2 )
                         EXTRA = ZERO
-                        CALL DLAROT( .FALSE., .TRUE., N-JCH.GT.K, IL, C,
+                        CALL DLAROT( .FALSE., .TRUE., N-JCH.GT.K, IL,
+     $                               C,
      $                               S, A( ( 1-ISKEW )*JCH+IOFFG, JCH ),
      $                               ILDA, TEMP, EXTRA )
                         ICOL = JCH
diff --git a/TESTING/MATGEN/matgen_64.h b/TESTING/MATGEN/matgen_64.h
new file mode 100644
index 0000000000..827468ec77
--- /dev/null
+++ b/TESTING/MATGEN/matgen_64.h
@@ -0,0 +1,81 @@
+#ifndef MATGEN_64_H
+#define MATGEN_64_H
+#ifdef MATGEN_64
+
+#define CLAGGE CLAGGE_64
+#define CLAGHE CLAGHE_64
+#define CLAGSY CLAGSY_64
+#define CLAHILB CLAHILB_64
+#define CLAKF2 CLAKF2_64
+#define CLARGE CLARGE_64
+#define CLARND CLARND_64
+#define CLAROR CLAROR_64
+#define CLAROT CLAROT_64
+#define CLATM1 CLATM1_64
+#define CLATM2 CLATM2_64
+#define CLATM3 CLATM3_64
+#define CLATM5 CLATM5_64
+#define CLATM6 CLATM6_64
+#define CLATME CLATME_64
+#define CLATMR CLATMR_64
+#define CLATMS CLATMS_64
+#define CLATMT CLATMT_64
+#define DLAGGE DLAGGE_64
+#define DLAGSY DLAGSY_64
+#define DLAHILB DLAHILB_64
+#define DLAKF2 DLAKF2_64
+#define DLARAN DLARAN_64
+#define DLARGE DLARGE_64
+#define DLARND DLARND_64
+#define DLAROR DLAROR_64
+#define DLAROT DLAROT_64
+#define DLATM1 DLATM1_64
+#define DLATM2 DLATM2_64
+#define DLATM3 DLATM3_64
+#define DLATM5 DLATM5_64
+#define DLATM6 DLATM6_64
+#define DLATM7 DLATM7_64
+#define DLATME DLATME_64
+#define DLATMR DLATMR_64
+#define DLATMS DLATMS_64
+#define DLATMT DLATMT_64
+#define SLAGGE SLAGGE_64
+#define SLAGSY SLAGSY_64
+#define SLAHILB SLAHILB_64
+#define SLAKF2 SLAKF2_64
+#define SLARAN SLARAN_64
+#define SLARGE SLARGE_64
+#define SLARND SLARND_64
+#define SLAROR SLAROR_64
+#define SLAROT SLAROT_64
+#define SLATM1 SLATM1_64
+#define SLATM2 SLATM2_64
+#define SLATM3 SLATM3_64
+#define SLATM5 SLATM5_64
+#define SLATM6 SLATM6_64
+#define SLATM7 SLATM7_64
+#define SLATME SLATME_64
+#define SLATMR SLATMR_64
+#define SLATMS SLATMS_64
+#define SLATMT SLATMT_64
+#define ZLAGGE ZLAGGE_64
+#define ZLAGHE ZLAGHE_64
+#define ZLAGSY ZLAGSY_64
+#define ZLAHILB ZLAHILB_64
+#define ZLAKF2 ZLAKF2_64
+#define ZLARGE ZLARGE_64
+#define ZLARND ZLARND_64
+#define ZLAROR ZLAROR_64
+#define ZLAROT ZLAROT_64
+#define ZLATM1 ZLATM1_64
+#define ZLATM2 ZLATM2_64
+#define ZLATM3 ZLATM3_64
+#define ZLATM5 ZLATM5_64
+#define ZLATM6 ZLATM6_64
+#define ZLATME ZLATME_64
+#define ZLATMR ZLATMR_64
+#define ZLATMS ZLATMS_64
+#define ZLATMT ZLATMT_64
+
+#endif
+#endif
diff --git a/TESTING/MATGEN/slagge.f b/TESTING/MATGEN/slagge.f
index 9627d563d8..1e98d30236 100644
--- a/TESTING/MATGEN/slagge.f
+++ b/TESTING/MATGEN/slagge.f
@@ -110,6 +110,7 @@
 *
 *  =====================================================================
       SUBROUTINE SLAGGE( M, N, KL, KU, D, A, LDA, ISEED, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/slagsy.f b/TESTING/MATGEN/slagsy.f
index dd319dadcd..239c5eb1f8 100644
--- a/TESTING/MATGEN/slagsy.f
+++ b/TESTING/MATGEN/slagsy.f
@@ -98,6 +98,7 @@
 *
 *  =====================================================================
       SUBROUTINE SLAGSY( N, K, D, A, LDA, ISEED, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/slahilb.f b/TESTING/MATGEN/slahilb.f
index 4dc8333463..77a8cff01c 100644
--- a/TESTING/MATGEN/slahilb.f
+++ b/TESTING/MATGEN/slahilb.f
@@ -120,7 +120,9 @@
 *> \ingroup real_matgen
 *
 *  =====================================================================
-      SUBROUTINE SLAHILB( N, NRHS, A, LDA, X, LDX, B, LDB, WORK, INFO)
+      SUBROUTINE SLAHILB( N, NRHS, A, LDA, X, LDX, B, LDB, WORK,
+     $                    INFO)
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -195,7 +197,7 @@ SUBROUTINE SLAHILB( N, NRHS, A, LDA, X, LDX, B, LDB, WORK, INFO)
 *     Generate the scaled Hilbert matrix in A
       DO J = 1, N
          DO I = 1, N
-            A(I, J) = REAL(M) / (I + J - 1)
+            A(I, J) = REAL(M) / REAL(I + J - 1)
          END DO
       END DO
 *
@@ -206,15 +208,15 @@ SUBROUTINE SLAHILB( N, NRHS, A, LDA, X, LDX, B, LDB, WORK, INFO)
 *     Generate the true solutions in X.  Because B = the first NRHS
 *     columns of M*I, the true solutions are just the first NRHS columns
 *     of the inverse Hilbert matrix.
-      WORK(1) = N
+      WORK(1) = REAL(N)
       DO J = 2, N
-         WORK(J) = (  ( (WORK(J-1)/(J-1)) * (J-1 - N) ) /(J-1)  )
-     $        * (N +J -1)
+         WORK(J) = (  ( (WORK(J-1)/REAL(J-1)) * REAL(J-1 - N) )
+     $        /REAL(J-1) ) * REAL(N +J -1)
       END DO
 *
       DO J = 1, NRHS
          DO I = 1, N
-            X(I, J) = (WORK(I)*WORK(J)) / (I + J - 1)
+            X(I, J) = (WORK(I)*WORK(J)) / REAL(I + J - 1)
          END DO
       END DO
 *
diff --git a/TESTING/MATGEN/slakf2.f b/TESTING/MATGEN/slakf2.f
index ef9f90adf0..0046a4b755 100644
--- a/TESTING/MATGEN/slakf2.f
+++ b/TESTING/MATGEN/slakf2.f
@@ -102,6 +102,7 @@
 *
 *  =====================================================================
       SUBROUTINE SLAKF2( M, N, A, LDA, B, D, E, Z, LDZ )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/slaran.f b/TESTING/MATGEN/slaran.f
index 586612d9f4..9cefa865b2 100644
--- a/TESTING/MATGEN/slaran.f
+++ b/TESTING/MATGEN/slaran.f
@@ -64,6 +64,7 @@
 *>
 *  =====================================================================
       REAL FUNCTION SLARAN( ISEED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/slarge.f b/TESTING/MATGEN/slarge.f
index 8bebf48d5d..dd8c364c9f 100644
--- a/TESTING/MATGEN/slarge.f
+++ b/TESTING/MATGEN/slarge.f
@@ -84,6 +84,7 @@
 *
 *  =====================================================================
       SUBROUTINE SLARGE( N, A, LDA, ISEED, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/slarnd.f b/TESTING/MATGEN/slarnd.f
index c2d7a5cb2d..bde5c95e11 100644
--- a/TESTING/MATGEN/slarnd.f
+++ b/TESTING/MATGEN/slarnd.f
@@ -70,6 +70,7 @@
 *>
 *  =====================================================================
       REAL             FUNCTION SLARND( IDIST, ISEED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/slaror.f b/TESTING/MATGEN/slaror.f
index 0fc0a7272d..60d19fdd18 100644
--- a/TESTING/MATGEN/slaror.f
+++ b/TESTING/MATGEN/slaror.f
@@ -143,6 +143,7 @@
 *
 *  =====================================================================
       SUBROUTINE SLAROR( SIDE, INIT, M, N, A, LDA, ISEED, X, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/slarot.f b/TESTING/MATGEN/slarot.f
index ab4c22ad76..c4fcc84652 100644
--- a/TESTING/MATGEN/slarot.f
+++ b/TESTING/MATGEN/slarot.f
@@ -221,8 +221,10 @@
 *> \ingroup real_matgen
 *
 *  =====================================================================
-      SUBROUTINE SLAROT( LROWS, LLEFT, LRIGHT, NL, C, S, A, LDA, XLEFT,
+      SUBROUTINE SLAROT( LROWS, LLEFT, LRIGHT, NL, C, S, A, LDA,
+     $                   XLEFT,
      $                   XRIGHT )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/slatm1.f b/TESTING/MATGEN/slatm1.f
index bd01cb620f..07ad8432d6 100644
--- a/TESTING/MATGEN/slatm1.f
+++ b/TESTING/MATGEN/slatm1.f
@@ -131,7 +131,9 @@
 *> \ingroup real_matgen
 *
 *  =====================================================================
-      SUBROUTINE SLATM1( MODE, COND, IRSIGN, IDIST, ISEED, D, N, INFO )
+      SUBROUTINE SLATM1( MODE, COND, IRSIGN, IDIST, ISEED, D, N,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/slatm2.f b/TESTING/MATGEN/slatm2.f
index b259c333ea..cdf18c4c61 100644
--- a/TESTING/MATGEN/slatm2.f
+++ b/TESTING/MATGEN/slatm2.f
@@ -205,6 +205,7 @@
 *  =====================================================================
       REAL             FUNCTION SLATM2( M, N, I, J, KL, KU, IDIST,
      $                 ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK, SPARSE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/slatm3.f b/TESTING/MATGEN/slatm3.f
index f4e8337344..1308b175f6 100644
--- a/TESTING/MATGEN/slatm3.f
+++ b/TESTING/MATGEN/slatm3.f
@@ -220,9 +220,11 @@
 *> \ingroup real_matgen
 *
 *  =====================================================================
-      REAL             FUNCTION SLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+      REAL             FUNCTION SLATM3( M, N, I, J, ISUB, JSUB, KL,
+     $                 KU,
      $                 IDIST, ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                 SPARSE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/slatm5.f b/TESTING/MATGEN/slatm5.f
index 37a629225c..54c12b7622 100644
--- a/TESTING/MATGEN/slatm5.f
+++ b/TESTING/MATGEN/slatm5.f
@@ -262,9 +262,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE SLATM5( PRTYPE, M, N, A, LDA, B, LDB, C, LDC, D, LDD,
+      SUBROUTINE SLATM5( PRTYPE, M, N, A, LDA, B, LDB, C, LDC, D,
+     $                   LDD,
      $                   E, LDE, F, LDF, R, LDR, L, LDL, ALPHA, QBLCKA,
      $                   QBLCKB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/slatm6.f b/TESTING/MATGEN/slatm6.f
index b0d27f7dcd..d7448b435e 100644
--- a/TESTING/MATGEN/slatm6.f
+++ b/TESTING/MATGEN/slatm6.f
@@ -173,6 +173,7 @@
 *  =====================================================================
       SUBROUTINE SLATM6( TYPE, N, A, LDA, B, X, LDX, Y, LDY, ALPHA,
      $                   BETA, WX, WY, S, DIF )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/slatm7.f b/TESTING/MATGEN/slatm7.f
index 9f9863b00a..a655a606d8 100644
--- a/TESTING/MATGEN/slatm7.f
+++ b/TESTING/MATGEN/slatm7.f
@@ -119,6 +119,7 @@
 *  =====================================================================
       SUBROUTINE SLATM7( MODE, COND, IRSIGN, IDIST, ISEED, D, N,
      $                   RANK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/slatme.f b/TESTING/MATGEN/slatme.f
index 049409ca56..c51ed6112b 100644
--- a/TESTING/MATGEN/slatme.f
+++ b/TESTING/MATGEN/slatme.f
@@ -329,6 +329,7 @@ SUBROUTINE SLATME( N, DIST, ISEED, D, MODE, COND, DMAX, EI,
      $                   UPPER, SIM, DS, MODES, CONDS, KL, KU, ANORM,
      $  A,
      $                   LDA, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/slatmr.f b/TESTING/MATGEN/slatmr.f
index 124a6246a9..e5a9c1c7a1 100644
--- a/TESTING/MATGEN/slatmr.f
+++ b/TESTING/MATGEN/slatmr.f
@@ -468,6 +468,7 @@ SUBROUTINE SLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
      $                   RSIGN, GRADE, DL, MODEL, CONDL, DR, MODER,
      $                   CONDR, PIVTNG, IPIVOT, KL, KU, SPARSE, ANORM,
      $                   PACK, A, LDA, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -503,9 +504,11 @@ SUBROUTINE SLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      REAL               SLANGB, SLANGE, SLANSB, SLANSP, SLANSY, SLATM2,
+      REAL               SLANGB, SLANGE, SLANSB,
+     $                   SLANSP, SLANSY, SLATM2,
      $                   SLATM3
-      EXTERNAL           LSAME, SLANGB, SLANGE, SLANSB, SLANSP, SLANSY,
+      EXTERNAL           LSAME, SLANGB, SLANGE,
+     $                   SLANSB, SLANSP, SLANSY,
      $                   SLATM2, SLATM3
 *     ..
 *     .. External Subroutines ..
@@ -846,7 +849,8 @@ SUBROUTINE SLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 140 J = 1, N
                DO 130 I = 1, J
-                  TEMP = SLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  TEMP = SLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                   IDIST,
      $                   ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                   SPARSE )
                   MNSUB = MIN( ISUB, JSUB )
@@ -861,7 +865,8 @@ SUBROUTINE SLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 160 J = 1, N
                DO 150 I = 1, J
-                  TEMP = SLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  TEMP = SLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                   IDIST,
      $                   ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                   SPARSE )
                   MNSUB = MIN( ISUB, JSUB )
@@ -876,7 +881,8 @@ SUBROUTINE SLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 180 J = 1, N
                DO 170 I = 1, J
-                  TEMP = SLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  TEMP = SLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                   IDIST,
      $                   ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                   SPARSE )
 *
@@ -900,7 +906,8 @@ SUBROUTINE SLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 200 J = 1, N
                DO 190 I = 1, J
-                  TEMP = SLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  TEMP = SLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                   IDIST,
      $                   ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                   SPARSE )
 *
@@ -945,7 +952,8 @@ SUBROUTINE SLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 240 J = 1, N
                DO 230 I = J - KUU, J
-                  TEMP = SLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  TEMP = SLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                   IDIST,
      $                   ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                   SPARSE )
                   MNSUB = MIN( ISUB, JSUB )
@@ -1012,7 +1020,8 @@ SUBROUTINE SLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 340 J = 1, N
                DO 330 I = 1, J
-                  A( I, J ) = SLATM2( M, N, I, J, KL, KU, IDIST, ISEED,
+                  A( I, J ) = SLATM2( M, N, I, J, KL, KU, IDIST,
+     $                        ISEED,
      $                        D, IGRADE, DL, DR, IPVTNG, IWORK, SPARSE )
                   IF( I.NE.J )
      $               A( J, I ) = ZERO
@@ -1023,7 +1032,8 @@ SUBROUTINE SLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 360 J = 1, N
                DO 350 I = 1, J
-                  A( J, I ) = SLATM2( M, N, I, J, KL, KU, IDIST, ISEED,
+                  A( J, I ) = SLATM2( M, N, I, J, KL, KU, IDIST,
+     $                        ISEED,
      $                        D, IGRADE, DL, DR, IPVTNG, IWORK, SPARSE )
                   IF( I.NE.J )
      $               A( I, J ) = ZERO
@@ -1041,7 +1051,8 @@ SUBROUTINE SLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ISUB = 1
                      JSUB = JSUB + 1
                   END IF
-                  A( ISUB, JSUB ) = SLATM2( M, N, I, J, KL, KU, IDIST,
+                  A( ISUB, JSUB ) = SLATM2( M, N, I, J, KL, KU,
+     $                              IDIST,
      $                              ISEED, D, IGRADE, DL, DR, IPVTNG,
      $                              IWORK, SPARSE )
   370          CONTINUE
@@ -1096,7 +1107,8 @@ SUBROUTINE SLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                   IF( I.LT.1 ) THEN
                      A( J-I+1, I+N ) = ZERO
                   ELSE
-                     A( J-I+1, I ) = SLATM2( M, N, I, J, KL, KU, IDIST,
+                     A( J-I+1, I ) = SLATM2( M, N, I, J, KL, KU,
+     $                               IDIST,
      $                               ISEED, D, IGRADE, DL, DR, IPVTNG,
      $                               IWORK, SPARSE )
                   END IF
@@ -1107,7 +1119,8 @@ SUBROUTINE SLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 460 J = 1, N
                DO 450 I = J - KUU, J
-                  A( I-J+KUU+1, J ) = SLATM2( M, N, I, J, KL, KU, IDIST,
+                  A( I-J+KUU+1, J ) = SLATM2( M, N, I, J, KL, KU,
+     $                                IDIST,
      $                                ISEED, D, IGRADE, DL, DR, IPVTNG,
      $                                IWORK, SPARSE )
   450          CONTINUE
diff --git a/TESTING/MATGEN/slatms.f b/TESTING/MATGEN/slatms.f
index eb4f4b38ed..f51a8371f3 100644
--- a/TESTING/MATGEN/slatms.f
+++ b/TESTING/MATGEN/slatms.f
@@ -318,6 +318,7 @@
 *  =====================================================================
       SUBROUTINE SLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
      $                   KL, KU, PACK, A, LDA, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -358,7 +359,8 @@ SUBROUTINE SLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
       EXTERNAL           LSAME, SLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           SCOPY, SLAGGE, SLAGSY, SLAROT, SLARTG, SLATM1,
+      EXTERNAL           SCOPY, SLAGGE, SLAGSY,
+     $                   SLAROT, SLARTG, SLATM1,
      $                   SLASET, SSCAL, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
@@ -513,7 +515,8 @@ SUBROUTINE SLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
 *             Compute D according to COND and MODE
 *
-      CALL SLATM1( MODE, COND, IRSIGN, IDIST, ISEED, D, MNMIN, IINFO )
+      CALL SLATM1( MODE, COND, IRSIGN, IDIST, ISEED, D, MNMIN,
+     $             IINFO )
       IF( IINFO.NE.0 ) THEN
          INFO = 1
          RETURN
@@ -620,7 +623,8 @@ SUBROUTINE SLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ICOL = MAX( 1, JR-JKL )
                      IF( JR.LT.M ) THEN
                         IL = MIN( N, JR+JKU ) + 1 - ICOL
-                        CALL SLAROT( .TRUE., JR.GT.JKL, .FALSE., IL, C,
+                        CALL SLAROT( .TRUE., JR.GT.JKL, .FALSE., IL,
+     $                               C,
      $                               S, A( JR-ISKEW*ICOL+IOFFST, ICOL ),
      $                               ILDA, EXTRA, DUMMY )
                      END IF
@@ -638,7 +642,8 @@ SUBROUTINE SLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IL = IR + 2 - IROW
                         TEMP = ZERO
                         ILTEMP = JCH.GT.JKU
-                        CALL SLAROT( .FALSE., ILTEMP, .TRUE., IL, C, -S,
+                        CALL SLAROT( .FALSE., ILTEMP, .TRUE., IL, C,
+     $                               -S,
      $                               A( IROW-ISKEW*IC+IOFFST, IC ),
      $                               ILDA, TEMP, EXTRA )
                         IF( ILTEMP ) THEN
@@ -647,7 +652,8 @@ SUBROUTINE SLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            ICOL = MAX( 1, JCH-JKU-JKL )
                            IL = IC + 2 - ICOL
                            EXTRA = ZERO
-                           CALL SLAROT( .TRUE., JCH.GT.JKU+JKL, .TRUE.,
+                           CALL SLAROT( .TRUE., JCH.GT.JKU+JKL,
+     $                                  .TRUE.,
      $                                  IL, C, -S, A( IROW-ISKEW*ICOL+
      $                                  IOFFST, ICOL ), ILDA, EXTRA,
      $                                  TEMP )
@@ -671,7 +677,8 @@ SUBROUTINE SLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      IROW = MAX( 1, JC-JKU )
                      IF( JC.LT.N ) THEN
                         IL = MIN( M, JC+JKL ) + 1 - IROW
-                        CALL SLAROT( .FALSE., JC.GT.JKU, .FALSE., IL, C,
+                        CALL SLAROT( .FALSE., JC.GT.JKU, .FALSE., IL,
+     $                               C,
      $                               S, A( IROW-ISKEW*JC+IOFFST, JC ),
      $                               ILDA, EXTRA, DUMMY )
                      END IF
@@ -689,7 +696,8 @@ SUBROUTINE SLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IL = IC + 2 - ICOL
                         TEMP = ZERO
                         ILTEMP = JCH.GT.JKL
-                        CALL SLAROT( .TRUE., ILTEMP, .TRUE., IL, C, -S,
+                        CALL SLAROT( .TRUE., ILTEMP, .TRUE., IL, C,
+     $                               -S,
      $                               A( IR-ISKEW*ICOL+IOFFST, ICOL ),
      $                               ILDA, TEMP, EXTRA )
                         IF( ILTEMP ) THEN
@@ -698,7 +706,8 @@ SUBROUTINE SLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            IROW = MAX( 1, JCH-JKL-JKU )
                            IL = IR + 2 - IROW
                            EXTRA = ZERO
-                           CALL SLAROT( .FALSE., JCH.GT.JKL+JKU, .TRUE.,
+                           CALL SLAROT( .FALSE., JCH.GT.JKL+JKU,
+     $                                  .TRUE.,
      $                                  IL, C, -S, A( IROW-ISKEW*ICOL+
      $                                  IOFFST, ICOL ), ILDA, EXTRA,
      $                                  TEMP )
@@ -730,7 +739,8 @@ SUBROUTINE SLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      IROW = MAX( 1, JC-JKU+1 )
                      IF( JC.GT.0 ) THEN
                         IL = MIN( M, JC+JKL+1 ) + 1 - IROW
-                        CALL SLAROT( .FALSE., .FALSE., JC+JKL.LT.M, IL,
+                        CALL SLAROT( .FALSE., .FALSE., JC+JKL.LT.M,
+     $                               IL,
      $                               C, S, A( IROW-ISKEW*JC+IOFFST,
      $                               JC ), ILDA, DUMMY, EXTRA )
                      END IF
@@ -748,7 +758,8 @@ SUBROUTINE SLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         ICOL = MIN( N-1, JCH+JKU )
                         ILTEMP = JCH + JKU.LT.N
                         TEMP = ZERO
-                        CALL SLAROT( .TRUE., ILEXTR, ILTEMP, ICOL+2-IC,
+                        CALL SLAROT( .TRUE., ILEXTR, ILTEMP,
+     $                               ICOL+2-IC,
      $                               C, S, A( JCH-ISKEW*IC+IOFFST, IC ),
      $                               ILDA, EXTRA, TEMP )
                         IF( ILTEMP ) THEN
@@ -783,7 +794,8 @@ SUBROUTINE SLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ICOL = MAX( 1, JR-JKL+1 )
                      IF( JR.GT.0 ) THEN
                         IL = MIN( N, JR+JKU+1 ) + 1 - ICOL
-                        CALL SLAROT( .TRUE., .FALSE., JR+JKU.LT.N, IL,
+                        CALL SLAROT( .TRUE., .FALSE., JR+JKU.LT.N,
+     $                               IL,
      $                               C, S, A( JR-ISKEW*ICOL+IOFFST,
      $                               ICOL ), ILDA, DUMMY, EXTRA )
                      END IF
@@ -801,7 +813,8 @@ SUBROUTINE SLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IROW = MIN( M-1, JCH+JKL )
                         ILTEMP = JCH + JKL.LT.M
                         TEMP = ZERO
-                        CALL SLAROT( .FALSE., ILEXTR, ILTEMP, IROW+2-IR,
+                        CALL SLAROT( .FALSE., ILEXTR, ILTEMP,
+     $                               IROW+2-IR,
      $                               C, S, A( IR-ISKEW*JCH+IOFFST,
      $                               JCH ), ILDA, EXTRA, TEMP )
                         IF( ILTEMP ) THEN
@@ -863,13 +876,15 @@ SUBROUTINE SLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         CALL SLARTG( A( JCH+1-ISKEW*( ICOL+1 )+IOFFG,
      $                               ICOL+1 ), EXTRA, C, S, DUMMY )
                         TEMP = A( JCH-ISKEW*( JCH+1 )+IOFFG, JCH+1 )
-                        CALL SLAROT( .TRUE., .TRUE., .TRUE., K+2, C, -S,
+                        CALL SLAROT( .TRUE., .TRUE., .TRUE., K+2, C,
+     $                               -S,
      $                               A( ( 1-ISKEW )*JCH+IOFFG, JCH ),
      $                               ILDA, TEMP, EXTRA )
                         IROW = MAX( 1, JCH-K )
                         IL = MIN( JCH+1, K+2 )
                         EXTRA = ZERO
-                        CALL SLAROT( .FALSE., JCH.GT.K, .TRUE., IL, C,
+                        CALL SLAROT( .FALSE., JCH.GT.K, .TRUE., IL,
+     $                               C,
      $                               -S, A( IROW-ISKEW*JCH+IOFFG, JCH ),
      $                               ILDA, EXTRA, TEMP )
                         ICOL = JCH
@@ -921,11 +936,13 @@ SUBROUTINE SLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ANGLE = TWOPI*SLARND( 1, ISEED )
                      C = COS( ANGLE )
                      S = -SIN( ANGLE )
-                     CALL SLAROT( .FALSE., .TRUE., N-JC.GT.K, IL, C, S,
+                     CALL SLAROT( .FALSE., .TRUE., N-JC.GT.K, IL, C,
+     $                            S,
      $                            A( ( 1-ISKEW )*JC+IOFFG, JC ), ILDA,
      $                            TEMP, EXTRA )
                      ICOL = MAX( 1, JC-K+1 )
-                     CALL SLAROT( .TRUE., .FALSE., .TRUE., JC+2-ICOL, C,
+                     CALL SLAROT( .TRUE., .FALSE., .TRUE., JC+2-ICOL,
+     $                            C,
      $                            S, A( JC-ISKEW*ICOL+IOFFG, ICOL ),
      $                            ILDA, DUMMY, TEMP )
 *
@@ -936,12 +953,14 @@ SUBROUTINE SLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         CALL SLARTG( A( JCH-ISKEW*ICOL+IOFFG, ICOL ),
      $                               EXTRA, C, S, DUMMY )
                         TEMP = A( 1+( 1-ISKEW )*JCH+IOFFG, JCH )
-                        CALL SLAROT( .TRUE., .TRUE., .TRUE., K+2, C, S,
+                        CALL SLAROT( .TRUE., .TRUE., .TRUE., K+2, C,
+     $                               S,
      $                               A( JCH-ISKEW*ICOL+IOFFG, ICOL ),
      $                               ILDA, EXTRA, TEMP )
                         IL = MIN( N+1-JCH, K+2 )
                         EXTRA = ZERO
-                        CALL SLAROT( .FALSE., .TRUE., N-JCH.GT.K, IL, C,
+                        CALL SLAROT( .FALSE., .TRUE., N-JCH.GT.K, IL,
+     $                               C,
      $                               S, A( ( 1-ISKEW )*JCH+IOFFG, JCH ),
      $                               ILDA, TEMP, EXTRA )
                         ICOL = JCH
diff --git a/TESTING/MATGEN/slatmt.f b/TESTING/MATGEN/slatmt.f
index f06dcc46c0..0cc7c8abf3 100644
--- a/TESTING/MATGEN/slatmt.f
+++ b/TESTING/MATGEN/slatmt.f
@@ -328,6 +328,7 @@
 *  =====================================================================
       SUBROUTINE SLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
      $                   RANK, KL, KU, PACK, A, LDA, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -631,7 +632,8 @@ SUBROUTINE SLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ICOL = MAX( 1, JR-JKL )
                      IF( JR.LT.M ) THEN
                         IL = MIN( N, JR+JKU ) + 1 - ICOL
-                        CALL SLAROT( .TRUE., JR.GT.JKL, .FALSE., IL, C,
+                        CALL SLAROT( .TRUE., JR.GT.JKL, .FALSE., IL,
+     $                               C,
      $                               S, A( JR-ISKEW*ICOL+IOFFST, ICOL ),
      $                               ILDA, EXTRA, DUMMY )
                      END IF
@@ -649,7 +651,8 @@ SUBROUTINE SLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IL = IR + 2 - IROW
                         TEMP = ZERO
                         ILTEMP = JCH.GT.JKU
-                        CALL SLAROT( .FALSE., ILTEMP, .TRUE., IL, C, -S,
+                        CALL SLAROT( .FALSE., ILTEMP, .TRUE., IL, C,
+     $                               -S,
      $                               A( IROW-ISKEW*IC+IOFFST, IC ),
      $                               ILDA, TEMP, EXTRA )
                         IF( ILTEMP ) THEN
@@ -658,7 +661,8 @@ SUBROUTINE SLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            ICOL = MAX( 1, JCH-JKU-JKL )
                            IL = IC + 2 - ICOL
                            EXTRA = ZERO
-                           CALL SLAROT( .TRUE., JCH.GT.JKU+JKL, .TRUE.,
+                           CALL SLAROT( .TRUE., JCH.GT.JKU+JKL,
+     $                                  .TRUE.,
      $                                  IL, C, -S, A( IROW-ISKEW*ICOL+
      $                                  IOFFST, ICOL ), ILDA, EXTRA,
      $                                  TEMP )
@@ -682,7 +686,8 @@ SUBROUTINE SLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      IROW = MAX( 1, JC-JKU )
                      IF( JC.LT.N ) THEN
                         IL = MIN( M, JC+JKL ) + 1 - IROW
-                        CALL SLAROT( .FALSE., JC.GT.JKU, .FALSE., IL, C,
+                        CALL SLAROT( .FALSE., JC.GT.JKU, .FALSE., IL,
+     $                               C,
      $                               S, A( IROW-ISKEW*JC+IOFFST, JC ),
      $                               ILDA, EXTRA, DUMMY )
                      END IF
@@ -700,7 +705,8 @@ SUBROUTINE SLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IL = IC + 2 - ICOL
                         TEMP = ZERO
                         ILTEMP = JCH.GT.JKL
-                        CALL SLAROT( .TRUE., ILTEMP, .TRUE., IL, C, -S,
+                        CALL SLAROT( .TRUE., ILTEMP, .TRUE., IL, C,
+     $                               -S,
      $                               A( IR-ISKEW*ICOL+IOFFST, ICOL ),
      $                               ILDA, TEMP, EXTRA )
                         IF( ILTEMP ) THEN
@@ -709,7 +715,8 @@ SUBROUTINE SLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            IROW = MAX( 1, JCH-JKL-JKU )
                            IL = IR + 2 - IROW
                            EXTRA = ZERO
-                           CALL SLAROT( .FALSE., JCH.GT.JKL+JKU, .TRUE.,
+                           CALL SLAROT( .FALSE., JCH.GT.JKL+JKU,
+     $                                  .TRUE.,
      $                                  IL, C, -S, A( IROW-ISKEW*ICOL+
      $                                  IOFFST, ICOL ), ILDA, EXTRA,
      $                                  TEMP )
@@ -741,7 +748,8 @@ SUBROUTINE SLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      IROW = MAX( 1, JC-JKU+1 )
                      IF( JC.GT.0 ) THEN
                         IL = MIN( M, JC+JKL+1 ) + 1 - IROW
-                        CALL SLAROT( .FALSE., .FALSE., JC+JKL.LT.M, IL,
+                        CALL SLAROT( .FALSE., .FALSE., JC+JKL.LT.M,
+     $                               IL,
      $                               C, S, A( IROW-ISKEW*JC+IOFFST,
      $                               JC ), ILDA, DUMMY, EXTRA )
                      END IF
@@ -759,7 +767,8 @@ SUBROUTINE SLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         ICOL = MIN( N-1, JCH+JKU )
                         ILTEMP = JCH + JKU.LT.N
                         TEMP = ZERO
-                        CALL SLAROT( .TRUE., ILEXTR, ILTEMP, ICOL+2-IC,
+                        CALL SLAROT( .TRUE., ILEXTR, ILTEMP,
+     $                               ICOL+2-IC,
      $                               C, S, A( JCH-ISKEW*IC+IOFFST, IC ),
      $                               ILDA, EXTRA, TEMP )
                         IF( ILTEMP ) THEN
@@ -794,7 +803,8 @@ SUBROUTINE SLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ICOL = MAX( 1, JR-JKL+1 )
                      IF( JR.GT.0 ) THEN
                         IL = MIN( N, JR+JKU+1 ) + 1 - ICOL
-                        CALL SLAROT( .TRUE., .FALSE., JR+JKU.LT.N, IL,
+                        CALL SLAROT( .TRUE., .FALSE., JR+JKU.LT.N,
+     $                               IL,
      $                               C, S, A( JR-ISKEW*ICOL+IOFFST,
      $                               ICOL ), ILDA, DUMMY, EXTRA )
                      END IF
@@ -812,7 +822,8 @@ SUBROUTINE SLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IROW = MIN( M-1, JCH+JKL )
                         ILTEMP = JCH + JKL.LT.M
                         TEMP = ZERO
-                        CALL SLAROT( .FALSE., ILEXTR, ILTEMP, IROW+2-IR,
+                        CALL SLAROT( .FALSE., ILEXTR, ILTEMP,
+     $                               IROW+2-IR,
      $                               C, S, A( IR-ISKEW*JCH+IOFFST,
      $                               JCH ), ILDA, EXTRA, TEMP )
                         IF( ILTEMP ) THEN
@@ -874,13 +885,15 @@ SUBROUTINE SLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         CALL SLARTG( A( JCH+1-ISKEW*( ICOL+1 )+IOFFG,
      $                               ICOL+1 ), EXTRA, C, S, DUMMY )
                         TEMP = A( JCH-ISKEW*( JCH+1 )+IOFFG, JCH+1 )
-                        CALL SLAROT( .TRUE., .TRUE., .TRUE., K+2, C, -S,
+                        CALL SLAROT( .TRUE., .TRUE., .TRUE., K+2, C,
+     $                               -S,
      $                               A( ( 1-ISKEW )*JCH+IOFFG, JCH ),
      $                               ILDA, TEMP, EXTRA )
                         IROW = MAX( 1, JCH-K )
                         IL = MIN( JCH+1, K+2 )
                         EXTRA = ZERO
-                        CALL SLAROT( .FALSE., JCH.GT.K, .TRUE., IL, C,
+                        CALL SLAROT( .FALSE., JCH.GT.K, .TRUE., IL,
+     $                               C,
      $                               -S, A( IROW-ISKEW*JCH+IOFFG, JCH ),
      $                               ILDA, EXTRA, TEMP )
                         ICOL = JCH
@@ -932,11 +945,13 @@ SUBROUTINE SLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ANGLE = TWOPI*SLARND( 1, ISEED )
                      C = COS( ANGLE )
                      S = -SIN( ANGLE )
-                     CALL SLAROT( .FALSE., .TRUE., N-JC.GT.K, IL, C, S,
+                     CALL SLAROT( .FALSE., .TRUE., N-JC.GT.K, IL, C,
+     $                            S,
      $                            A( ( 1-ISKEW )*JC+IOFFG, JC ), ILDA,
      $                            TEMP, EXTRA )
                      ICOL = MAX( 1, JC-K+1 )
-                     CALL SLAROT( .TRUE., .FALSE., .TRUE., JC+2-ICOL, C,
+                     CALL SLAROT( .TRUE., .FALSE., .TRUE., JC+2-ICOL,
+     $                            C,
      $                            S, A( JC-ISKEW*ICOL+IOFFG, ICOL ),
      $                            ILDA, DUMMY, TEMP )
 *
@@ -947,12 +962,14 @@ SUBROUTINE SLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         CALL SLARTG( A( JCH-ISKEW*ICOL+IOFFG, ICOL ),
      $                               EXTRA, C, S, DUMMY )
                         TEMP = A( 1+( 1-ISKEW )*JCH+IOFFG, JCH )
-                        CALL SLAROT( .TRUE., .TRUE., .TRUE., K+2, C, S,
+                        CALL SLAROT( .TRUE., .TRUE., .TRUE., K+2, C,
+     $                               S,
      $                               A( JCH-ISKEW*ICOL+IOFFG, ICOL ),
      $                               ILDA, EXTRA, TEMP )
                         IL = MIN( N+1-JCH, K+2 )
                         EXTRA = ZERO
-                        CALL SLAROT( .FALSE., .TRUE., N-JCH.GT.K, IL, C,
+                        CALL SLAROT( .FALSE., .TRUE., N-JCH.GT.K, IL,
+     $                               C,
      $                               S, A( ( 1-ISKEW )*JCH+IOFFG, JCH ),
      $                               ILDA, TEMP, EXTRA )
                         ICOL = JCH
diff --git a/TESTING/MATGEN/zlagge.f b/TESTING/MATGEN/zlagge.f
index 8c2a9676ed..4e544a72d4 100644
--- a/TESTING/MATGEN/zlagge.f
+++ b/TESTING/MATGEN/zlagge.f
@@ -111,6 +111,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZLAGGE( M, N, KL, KU, D, A, LDA, ISEED, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/zlaghe.f b/TESTING/MATGEN/zlaghe.f
index fb77cfb4ca..bb696505a3 100644
--- a/TESTING/MATGEN/zlaghe.f
+++ b/TESTING/MATGEN/zlaghe.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZLAGHE( N, K, D, A, LDA, ISEED, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/zlagsy.f b/TESTING/MATGEN/zlagsy.f
index adbb41e39e..0d2019c8b3 100644
--- a/TESTING/MATGEN/zlagsy.f
+++ b/TESTING/MATGEN/zlagsy.f
@@ -99,6 +99,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZLAGSY( N, K, D, A, LDA, ISEED, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/zlahilb.f b/TESTING/MATGEN/zlahilb.f
index 172c7694de..894e16f243 100644
--- a/TESTING/MATGEN/zlahilb.f
+++ b/TESTING/MATGEN/zlahilb.f
@@ -131,6 +131,7 @@
 *  =====================================================================
       SUBROUTINE ZLAHILB( N, NRHS, A, LDA, X, LDX, B, LDB, WORK,
      $     INFO, PATH)
+      IMPLICIT NONE
 *
 *  -- LAPACK test routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -161,15 +162,21 @@ SUBROUTINE ZLAHILB( N, NRHS, A, LDA, X, LDX, B, LDB, WORK,
       INTEGER NMAX_EXACT, NMAX_APPROX, SIZE_D
       PARAMETER (NMAX_EXACT = 6, NMAX_APPROX = 11, SIZE_D = 8)
 *
-*     d's are generated from random permutation of those eight elements.
-      COMPLEX*16 d1(8), d2(8), invd1(8), invd2(8)
-      DATA D1 /(-1,0),(0,1),(-1,-1),(0,-1),(1,0),(-1,1),(1,1),(1,-1)/
-      DATA D2 /(-1,0),(0,-1),(-1,1),(0,1),(1,0),(-1,-1),(1,-1),(1,1)/
+*     D's are generated from random permutation of those eight elements.
+      COMPLEX*16 D1(8), D2(8), INVD1(8), INVD2(8)
+      DATA D1 /(-1.0D0,0.0D0),(0.0D0,1.0D0),(-1.0D0,-1.0D0),
+     $     (0.0D0,-1.0D0),(1.0D0,0.0D0),(-1.0D0,1.0D0),(1.0D0,1.0D0),
+     $     (1.0D0,-1.0D0)/
+      DATA D2 /(-1.0D0,0.0D0),(0.0D0,-1.0D0),(-1.0D0,1.0D0),
+     $     (0.0D0,1.0D0),(1.0D0,0.0D0),(-1.0D0,-1.0D0),(1.0D0,-1.0D0),
+     $     (1.0D0,1.0D0)/
 
-      DATA INVD1 /(-1,0),(0,-1),(-.5,.5),(0,1),(1,0),
-     $     (-.5,-.5),(.5,-.5),(.5,.5)/
-      DATA INVD2 /(-1,0),(0,1),(-.5,-.5),(0,-1),(1,0),
-     $     (-.5,.5),(.5,.5),(.5,-.5)/
+      DATA INVD1 /(-1.0D0,0.0D0),(0.0D0,-1.0D0),(-0.5D0,0.5D0),
+     $     (0.0D0,1.0D0),(1.0D0,0.0D0),(-0.5D0,-0.5D0),(0.5D0,-0.5D0),
+     $     (0.5D0,0.5D0)/
+      DATA INVD2 /(-1.0D0,0.0D0),(0.0D0,1.0D0),(-0.5D0,-0.5D0),
+     $     (0.0D0,-1.0D0),(1.0D0,0.0D0),(-0.5D0,0.5D0),(0.5D0,0.5D0),
+     $     (0.5D0,-0.5D0)/
 *     ..
 *     .. External Subroutines ..
       EXTERNAL XERBLA
diff --git a/TESTING/MATGEN/zlakf2.f b/TESTING/MATGEN/zlakf2.f
index b6b9ca4a7b..849ba79b59 100644
--- a/TESTING/MATGEN/zlakf2.f
+++ b/TESTING/MATGEN/zlakf2.f
@@ -102,6 +102,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZLAKF2( M, N, A, LDA, B, D, E, Z, LDZ )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/zlarge.f b/TESTING/MATGEN/zlarge.f
index f899bfd3ef..5c06086d3a 100644
--- a/TESTING/MATGEN/zlarge.f
+++ b/TESTING/MATGEN/zlarge.f
@@ -84,6 +84,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZLARGE( N, A, LDA, ISEED, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/zlarnd.f b/TESTING/MATGEN/zlarnd.f
index 6e66d2bb2e..e87e7dc38a 100644
--- a/TESTING/MATGEN/zlarnd.f
+++ b/TESTING/MATGEN/zlarnd.f
@@ -72,6 +72,7 @@
 *>
 *  =====================================================================
       COMPLEX*16   FUNCTION ZLARND( IDIST, ISEED )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -124,7 +125,8 @@ COMPLEX*16   FUNCTION ZLARND( IDIST, ISEED )
 *
 *        real and imaginary parts each normal (0,1)
 *
-         ZLARND = SQRT( -TWO*LOG( T1 ) )*EXP( DCMPLX( ZERO, TWOPI*T2 ) )
+         ZLARND = SQRT( -TWO*LOG( T1 ) )*
+     $            EXP( DCMPLX( ZERO, TWOPI*T2 ) )
       ELSE IF( IDIST.EQ.4 ) THEN
 *
 *        uniform distribution on the unit disc abs(z) <= 1
diff --git a/TESTING/MATGEN/zlaror.f b/TESTING/MATGEN/zlaror.f
index 8ae8f9dc61..26646abad4 100644
--- a/TESTING/MATGEN/zlaror.f
+++ b/TESTING/MATGEN/zlaror.f
@@ -155,6 +155,7 @@
 *
 *  =====================================================================
       SUBROUTINE ZLAROR( SIDE, INIT, M, N, A, LDA, ISEED, X, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/zlarot.f b/TESTING/MATGEN/zlarot.f
index 901b5ddbd3..718295e0ab 100644
--- a/TESTING/MATGEN/zlarot.f
+++ b/TESTING/MATGEN/zlarot.f
@@ -224,8 +224,10 @@
 *> \ingroup complex16_matgen
 *
 *  =====================================================================
-      SUBROUTINE ZLAROT( LROWS, LLEFT, LRIGHT, NL, C, S, A, LDA, XLEFT,
+      SUBROUTINE ZLAROT( LROWS, LLEFT, LRIGHT, NL, C, S, A, LDA,
+     $                   XLEFT,
      $                   XRIGHT )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/zlatm1.f b/TESTING/MATGEN/zlatm1.f
index c916c8ca19..8e99077ed7 100644
--- a/TESTING/MATGEN/zlatm1.f
+++ b/TESTING/MATGEN/zlatm1.f
@@ -133,7 +133,9 @@
 *> \ingroup complex16_matgen
 *
 *  =====================================================================
-      SUBROUTINE ZLATM1( MODE, COND, IRSIGN, IDIST, ISEED, D, N, INFO )
+      SUBROUTINE ZLATM1( MODE, COND, IRSIGN, IDIST, ISEED, D, N,
+     $                   INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/zlatm2.f b/TESTING/MATGEN/zlatm2.f
index af0151587e..f4b921d8fb 100644
--- a/TESTING/MATGEN/zlatm2.f
+++ b/TESTING/MATGEN/zlatm2.f
@@ -208,6 +208,7 @@
 *  =====================================================================
       COMPLEX*16   FUNCTION ZLATM2( M, N, I, J, KL, KU, IDIST,
      $                 ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK, SPARSE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/zlatm3.f b/TESTING/MATGEN/zlatm3.f
index e7fab607cf..86ddd756d4 100644
--- a/TESTING/MATGEN/zlatm3.f
+++ b/TESTING/MATGEN/zlatm3.f
@@ -226,6 +226,7 @@
       COMPLEX*16   FUNCTION ZLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
      $                 IDIST, ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                 SPARSE )
+      IMPLICIT NONE
 *
 *  -- LAPACK auxiliary routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/zlatm5.f b/TESTING/MATGEN/zlatm5.f
index 07eeb6a1f2..bf6cce7d21 100644
--- a/TESTING/MATGEN/zlatm5.f
+++ b/TESTING/MATGEN/zlatm5.f
@@ -262,9 +262,11 @@
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZLATM5( PRTYPE, M, N, A, LDA, B, LDB, C, LDC, D, LDD,
+      SUBROUTINE ZLATM5( PRTYPE, M, N, A, LDA, B, LDB, C, LDC, D,
+     $                   LDD,
      $                   E, LDE, F, LDF, R, LDR, L, LDL, ALPHA, QBLCKA,
      $                   QBLCKB )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/zlatm6.f b/TESTING/MATGEN/zlatm6.f
index 104becfd1b..479f875b92 100644
--- a/TESTING/MATGEN/zlatm6.f
+++ b/TESTING/MATGEN/zlatm6.f
@@ -171,6 +171,7 @@
 *  =====================================================================
       SUBROUTINE ZLATM6( TYPE, N, A, LDA, B, X, LDX, Y, LDY, ALPHA,
      $                   BETA, WX, WY, S, DIF )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/zlatme.f b/TESTING/MATGEN/zlatme.f
index a081353ce9..7b90c406f4 100644
--- a/TESTING/MATGEN/zlatme.f
+++ b/TESTING/MATGEN/zlatme.f
@@ -298,6 +298,7 @@ SUBROUTINE ZLATME( N, DIST, ISEED, D, MODE, COND, DMAX,
      $                   UPPER, SIM, DS, MODES, CONDS, KL, KU, ANORM,
      $  A,
      $                   LDA, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
diff --git a/TESTING/MATGEN/zlatmr.f b/TESTING/MATGEN/zlatmr.f
index 935d717e7b..faef49d653 100644
--- a/TESTING/MATGEN/zlatmr.f
+++ b/TESTING/MATGEN/zlatmr.f
@@ -487,6 +487,7 @@ SUBROUTINE ZLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
      $                   RSIGN, GRADE, DL, MODEL, CONDL, DR, MODER,
      $                   CONDR, PIVTNG, IPIVOT, KL, KU, SPARSE, ANORM,
      $                   PACK, A, LDA, IWORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -528,9 +529,11 @@ SUBROUTINE ZLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      DOUBLE PRECISION   ZLANGB, ZLANGE, ZLANSB, ZLANSP, ZLANSY
+      DOUBLE PRECISION   ZLANGB, ZLANGE, ZLANSB,
+     $                   ZLANSP, ZLANSY
       COMPLEX*16         ZLATM2, ZLATM3
-      EXTERNAL           LSAME, ZLANGB, ZLANGE, ZLANSB, ZLANSP, ZLANSY,
+      EXTERNAL           LSAME, ZLANGB, ZLANGE,
+     $                   ZLANSB, ZLANSP, ZLANSY,
      $                   ZLATM2, ZLATM3
 *     ..
 *     .. External Subroutines ..
@@ -897,7 +900,8 @@ SUBROUTINE ZLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 170 J = 1, N
                DO 160 I = 1, J
-                  CTEMP = ZLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  CTEMP = ZLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                    IDIST,
      $                    ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                    SPARSE )
                   MNSUB = MIN( ISUB, JSUB )
@@ -916,7 +920,8 @@ SUBROUTINE ZLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 190 J = 1, N
                DO 180 I = 1, J
-                  CTEMP = ZLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  CTEMP = ZLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                    IDIST,
      $                    ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                    SPARSE )
                   MNSUB = MIN( ISUB, JSUB )
@@ -935,7 +940,8 @@ SUBROUTINE ZLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 210 J = 1, N
                DO 200 I = 1, J
-                  CTEMP = ZLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  CTEMP = ZLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                    IDIST,
      $                    ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                    SPARSE )
 *
@@ -963,7 +969,8 @@ SUBROUTINE ZLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 230 J = 1, N
                DO 220 I = 1, J
-                  CTEMP = ZLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  CTEMP = ZLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                    IDIST,
      $                    ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                    SPARSE )
 *
@@ -1016,7 +1023,8 @@ SUBROUTINE ZLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 270 J = 1, N
                DO 260 I = J - KUU, J
-                  CTEMP = ZLATM3( M, N, I, J, ISUB, JSUB, KL, KU, IDIST,
+                  CTEMP = ZLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
+     $                    IDIST,
      $                    ISEED, D, IGRADE, DL, DR, IPVTNG, IWORK,
      $                    SPARSE )
                   MNSUB = MIN( ISUB, JSUB )
@@ -1106,7 +1114,8 @@ SUBROUTINE ZLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 390 J = 1, N
                DO 380 I = 1, J
-                  A( I, J ) = ZLATM2( M, N, I, J, KL, KU, IDIST, ISEED,
+                  A( I, J ) = ZLATM2( M, N, I, J, KL, KU, IDIST,
+     $                        ISEED,
      $                        D, IGRADE, DL, DR, IPVTNG, IWORK, SPARSE )
                   IF( I.NE.J )
      $               A( J, I ) = CZERO
@@ -1142,7 +1151,8 @@ SUBROUTINE ZLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ISUB = 1
                      JSUB = JSUB + 1
                   END IF
-                  A( ISUB, JSUB ) = ZLATM2( M, N, I, J, KL, KU, IDIST,
+                  A( ISUB, JSUB ) = ZLATM2( M, N, I, J, KL, KU,
+     $                              IDIST,
      $                              ISEED, D, IGRADE, DL, DR, IPVTNG,
      $                              IWORK, SPARSE )
   420          CONTINUE
@@ -1200,7 +1210,8 @@ SUBROUTINE ZLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      A( J-I+1, I+N ) = CZERO
                   ELSE
                      IF( ISYM.EQ.0 ) THEN
-                        A( J-I+1, I ) = DCONJG( ZLATM2( M, N, I, J, KL,
+                        A( J-I+1, I ) = DCONJG( ZLATM2( M, N, I, J,
+     $                                  KL,
      $                                  KU, IDIST, ISEED, D, IGRADE, DL,
      $                                  DR, IPVTNG, IWORK, SPARSE ) )
                      ELSE
@@ -1216,7 +1227,8 @@ SUBROUTINE ZLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
             DO 510 J = 1, N
                DO 500 I = J - KUU, J
-                  A( I-J+KUU+1, J ) = ZLATM2( M, N, I, J, KL, KU, IDIST,
+                  A( I-J+KUU+1, J ) = ZLATM2( M, N, I, J, KL, KU,
+     $                                IDIST,
      $                                ISEED, D, IGRADE, DL, DR, IPVTNG,
      $                                IWORK, SPARSE )
   500          CONTINUE
diff --git a/TESTING/MATGEN/zlatms.f b/TESTING/MATGEN/zlatms.f
index b8421eede1..f79f8f1325 100644
--- a/TESTING/MATGEN/zlatms.f
+++ b/TESTING/MATGEN/zlatms.f
@@ -329,6 +329,7 @@
 *  =====================================================================
       SUBROUTINE ZLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
      $                   KL, KU, PACK, A, LDA, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -374,7 +375,8 @@ SUBROUTINE ZLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
       EXTERNAL           LSAME, DLARND, ZLARND
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLATM1, DSCAL, XERBLA, ZLAGGE, ZLAGHE, ZLAGSY,
+      EXTERNAL           DLATM1, DSCAL, XERBLA,
+     $                   ZLAGGE, ZLAGHE, ZLAGSY,
      $                   ZLAROT, ZLARTG, ZLASET
 *     ..
 *     .. Intrinsic Functions ..
@@ -534,7 +536,8 @@ SUBROUTINE ZLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
 *
 *             Compute D according to COND and MODE
 *
-      CALL DLATM1( MODE, COND, IRSIGN, IDIST, ISEED, D, MNMIN, IINFO )
+      CALL DLATM1( MODE, COND, IRSIGN, IDIST, ISEED, D, MNMIN,
+     $             IINFO )
       IF( IINFO.NE.0 ) THEN
          INFO = 1
          RETURN
@@ -647,7 +650,8 @@ SUBROUTINE ZLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ICOL = MAX( 1, JR-JKL )
                      IF( JR.LT.M ) THEN
                         IL = MIN( N, JR+JKU ) + 1 - ICOL
-                        CALL ZLAROT( .TRUE., JR.GT.JKL, .FALSE., IL, C,
+                        CALL ZLAROT( .TRUE., JR.GT.JKL, .FALSE., IL,
+     $                               C,
      $                               S, A( JR-ISKEW*ICOL+IOFFST, ICOL ),
      $                               ILDA, EXTRA, DUMMY )
                      END IF
@@ -668,7 +672,8 @@ SUBROUTINE ZLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IL = IR + 2 - IROW
                         CTEMP = CZERO
                         ILTEMP = JCH.GT.JKU
-                        CALL ZLAROT( .FALSE., ILTEMP, .TRUE., IL, C, S,
+                        CALL ZLAROT( .FALSE., ILTEMP, .TRUE., IL, C,
+     $                               S,
      $                               A( IROW-ISKEW*IC+IOFFST, IC ),
      $                               ILDA, CTEMP, EXTRA )
                         IF( ILTEMP ) THEN
@@ -681,7 +686,8 @@ SUBROUTINE ZLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            ICOL = MAX( 1, JCH-JKU-JKL )
                            IL = IC + 2 - ICOL
                            EXTRA = CZERO
-                           CALL ZLAROT( .TRUE., JCH.GT.JKU+JKL, .TRUE.,
+                           CALL ZLAROT( .TRUE., JCH.GT.JKU+JKL,
+     $                                  .TRUE.,
      $                                  IL, C, S, A( IROW-ISKEW*ICOL+
      $                                  IOFFST, ICOL ), ILDA, EXTRA,
      $                                  CTEMP )
@@ -705,7 +711,8 @@ SUBROUTINE ZLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      IROW = MAX( 1, JC-JKU )
                      IF( JC.LT.N ) THEN
                         IL = MIN( M, JC+JKL ) + 1 - IROW
-                        CALL ZLAROT( .FALSE., JC.GT.JKU, .FALSE., IL, C,
+                        CALL ZLAROT( .FALSE., JC.GT.JKU, .FALSE., IL,
+     $                               C,
      $                               S, A( IROW-ISKEW*JC+IOFFST, JC ),
      $                               ILDA, EXTRA, DUMMY )
                      END IF
@@ -726,7 +733,8 @@ SUBROUTINE ZLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IL = IC + 2 - ICOL
                         CTEMP = CZERO
                         ILTEMP = JCH.GT.JKL
-                        CALL ZLAROT( .TRUE., ILTEMP, .TRUE., IL, C, S,
+                        CALL ZLAROT( .TRUE., ILTEMP, .TRUE., IL, C,
+     $                               S,
      $                               A( IR-ISKEW*ICOL+IOFFST, ICOL ),
      $                               ILDA, CTEMP, EXTRA )
                         IF( ILTEMP ) THEN
@@ -739,7 +747,8 @@ SUBROUTINE ZLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            IROW = MAX( 1, JCH-JKL-JKU )
                            IL = IR + 2 - IROW
                            EXTRA = CZERO
-                           CALL ZLAROT( .FALSE., JCH.GT.JKL+JKU, .TRUE.,
+                           CALL ZLAROT( .FALSE., JCH.GT.JKL+JKU,
+     $                                  .TRUE.,
      $                                  IL, C, S, A( IROW-ISKEW*ICOL+
      $                                  IOFFST, ICOL ), ILDA, EXTRA,
      $                                  CTEMP )
@@ -771,7 +780,8 @@ SUBROUTINE ZLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      IROW = MAX( 1, JC-JKU+1 )
                      IF( JC.GT.0 ) THEN
                         IL = MIN( M, JC+JKL+1 ) + 1 - IROW
-                        CALL ZLAROT( .FALSE., .FALSE., JC+JKL.LT.M, IL,
+                        CALL ZLAROT( .FALSE., .FALSE., JC+JKL.LT.M,
+     $                               IL,
      $                               C, S, A( IROW-ISKEW*JC+IOFFST,
      $                               JC ), ILDA, DUMMY, EXTRA )
                      END IF
@@ -792,7 +802,8 @@ SUBROUTINE ZLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         ICOL = MIN( N-1, JCH+JKU )
                         ILTEMP = JCH + JKU.LT.N
                         CTEMP = CZERO
-                        CALL ZLAROT( .TRUE., ILEXTR, ILTEMP, ICOL+2-IC,
+                        CALL ZLAROT( .TRUE., ILEXTR, ILTEMP,
+     $                               ICOL+2-IC,
      $                               C, S, A( JCH-ISKEW*IC+IOFFST, IC ),
      $                               ILDA, EXTRA, CTEMP )
                         IF( ILTEMP ) THEN
@@ -830,7 +841,8 @@ SUBROUTINE ZLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ICOL = MAX( 1, JR-JKL+1 )
                      IF( JR.GT.0 ) THEN
                         IL = MIN( N, JR+JKU+1 ) + 1 - ICOL
-                        CALL ZLAROT( .TRUE., .FALSE., JR+JKU.LT.N, IL,
+                        CALL ZLAROT( .TRUE., .FALSE., JR+JKU.LT.N,
+     $                               IL,
      $                               C, S, A( JR-ISKEW*ICOL+IOFFST,
      $                               ICOL ), ILDA, DUMMY, EXTRA )
                      END IF
@@ -851,7 +863,8 @@ SUBROUTINE ZLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IROW = MIN( M-1, JCH+JKL )
                         ILTEMP = JCH + JKL.LT.M
                         CTEMP = CZERO
-                        CALL ZLAROT( .FALSE., ILEXTR, ILTEMP, IROW+2-IR,
+                        CALL ZLAROT( .FALSE., ILEXTR, ILTEMP,
+     $                               IROW+2-IR,
      $                               C, S, A( IR-ISKEW*JCH+IOFFST,
      $                               JCH ), ILDA, EXTRA, CTEMP )
                         IF( ILTEMP ) THEN
@@ -940,13 +953,15 @@ SUBROUTINE ZLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            CT = DCONJG( C )
                            ST = DCONJG( S )
                         END IF
-                        CALL ZLAROT( .TRUE., .TRUE., .TRUE., K+2, C, S,
+                        CALL ZLAROT( .TRUE., .TRUE., .TRUE., K+2, C,
+     $                               S,
      $                               A( ( 1-ISKEW )*JCH+IOFFG, JCH ),
      $                               ILDA, CTEMP, EXTRA )
                         IROW = MAX( 1, JCH-K )
                         IL = MIN( JCH+1, K+2 )
                         EXTRA = CZERO
-                        CALL ZLAROT( .FALSE., JCH.GT.K, .TRUE., IL, CT,
+                        CALL ZLAROT( .FALSE., JCH.GT.K, .TRUE., IL,
+     $                               CT,
      $                               ST, A( IROW-ISKEW*JCH+IOFFG, JCH ),
      $                               ILDA, EXTRA, CTEMP )
                         ICOL = JCH
@@ -1016,7 +1031,8 @@ SUBROUTINE ZLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         CT = DCONJG( C )
                         ST = DCONJG( S )
                      END IF
-                     CALL ZLAROT( .FALSE., .TRUE., N-JC.GT.K, IL, C, S,
+                     CALL ZLAROT( .FALSE., .TRUE., N-JC.GT.K, IL, C,
+     $                            S,
      $                            A( ( 1-ISKEW )*JC+IOFFG, JC ), ILDA,
      $                            CTEMP, EXTRA )
                      ICOL = MAX( 1, JC-K+1 )
@@ -1042,7 +1058,8 @@ SUBROUTINE ZLATMS( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            CT = DCONJG( C )
                            ST = DCONJG( S )
                         END IF
-                        CALL ZLAROT( .TRUE., .TRUE., .TRUE., K+2, C, S,
+                        CALL ZLAROT( .TRUE., .TRUE., .TRUE., K+2, C,
+     $                               S,
      $                               A( JCH-ISKEW*ICOL+IOFFG, ICOL ),
      $                               ILDA, EXTRA, CTEMP )
                         IL = MIN( N+1-JCH, K+2 )
diff --git a/TESTING/MATGEN/zlatmt.f b/TESTING/MATGEN/zlatmt.f
index 25036483c0..4a0662b1fc 100644
--- a/TESTING/MATGEN/zlatmt.f
+++ b/TESTING/MATGEN/zlatmt.f
@@ -337,6 +337,7 @@
 *  =====================================================================
       SUBROUTINE ZLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
      $                   RANK, KL, KU, PACK, A, LDA, WORK, INFO )
+      IMPLICIT NONE
 *
 *  -- LAPACK computational routine --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -656,7 +657,8 @@ SUBROUTINE ZLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ICOL = MAX( 1, JR-JKL )
                      IF( JR.LT.M ) THEN
                         IL = MIN( N, JR+JKU ) + 1 - ICOL
-                        CALL ZLAROT( .TRUE., JR.GT.JKL, .FALSE., IL, C,
+                        CALL ZLAROT( .TRUE., JR.GT.JKL, .FALSE., IL,
+     $                               C,
      $                               S, A( JR-ISKEW*ICOL+IOFFST, ICOL ),
      $                               ILDA, EXTRA, DUMMY )
                      END IF
@@ -677,7 +679,8 @@ SUBROUTINE ZLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IL = IR + 2 - IROW
                         ZTEMP = CZERO
                         ILTEMP = JCH.GT.JKU
-                        CALL ZLAROT( .FALSE., ILTEMP, .TRUE., IL, C, S,
+                        CALL ZLAROT( .FALSE., ILTEMP, .TRUE., IL, C,
+     $                               S,
      $                               A( IROW-ISKEW*IC+IOFFST, IC ),
      $                               ILDA, ZTEMP, EXTRA )
                         IF( ILTEMP ) THEN
@@ -690,7 +693,8 @@ SUBROUTINE ZLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            ICOL = MAX( 1, JCH-JKU-JKL )
                            IL = IC + 2 - ICOL
                            EXTRA = CZERO
-                           CALL ZLAROT( .TRUE., JCH.GT.JKU+JKL, .TRUE.,
+                           CALL ZLAROT( .TRUE., JCH.GT.JKU+JKL,
+     $                                  .TRUE.,
      $                                  IL, C, S, A( IROW-ISKEW*ICOL+
      $                                  IOFFST, ICOL ), ILDA, EXTRA,
      $                                  ZTEMP )
@@ -714,7 +718,8 @@ SUBROUTINE ZLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      IROW = MAX( 1, JC-JKU )
                      IF( JC.LT.N ) THEN
                         IL = MIN( M, JC+JKL ) + 1 - IROW
-                        CALL ZLAROT( .FALSE., JC.GT.JKU, .FALSE., IL, C,
+                        CALL ZLAROT( .FALSE., JC.GT.JKU, .FALSE., IL,
+     $                               C,
      $                               S, A( IROW-ISKEW*JC+IOFFST, JC ),
      $                               ILDA, EXTRA, DUMMY )
                      END IF
@@ -735,7 +740,8 @@ SUBROUTINE ZLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IL = IC + 2 - ICOL
                         ZTEMP = CZERO
                         ILTEMP = JCH.GT.JKL
-                        CALL ZLAROT( .TRUE., ILTEMP, .TRUE., IL, C, S,
+                        CALL ZLAROT( .TRUE., ILTEMP, .TRUE., IL, C,
+     $                               S,
      $                               A( IR-ISKEW*ICOL+IOFFST, ICOL ),
      $                               ILDA, ZTEMP, EXTRA )
                         IF( ILTEMP ) THEN
@@ -748,7 +754,8 @@ SUBROUTINE ZLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            IROW = MAX( 1, JCH-JKL-JKU )
                            IL = IR + 2 - IROW
                            EXTRA = CZERO
-                           CALL ZLAROT( .FALSE., JCH.GT.JKL+JKU, .TRUE.,
+                           CALL ZLAROT( .FALSE., JCH.GT.JKL+JKU,
+     $                                  .TRUE.,
      $                                  IL, C, S, A( IROW-ISKEW*ICOL+
      $                                  IOFFST, ICOL ), ILDA, EXTRA,
      $                                  ZTEMP )
@@ -780,7 +787,8 @@ SUBROUTINE ZLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      IROW = MAX( 1, JC-JKU+1 )
                      IF( JC.GT.0 ) THEN
                         IL = MIN( M, JC+JKL+1 ) + 1 - IROW
-                        CALL ZLAROT( .FALSE., .FALSE., JC+JKL.LT.M, IL,
+                        CALL ZLAROT( .FALSE., .FALSE., JC+JKL.LT.M,
+     $                               IL,
      $                               C, S, A( IROW-ISKEW*JC+IOFFST,
      $                               JC ), ILDA, DUMMY, EXTRA )
                      END IF
@@ -801,7 +809,8 @@ SUBROUTINE ZLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         ICOL = MIN( N-1, JCH+JKU )
                         ILTEMP = JCH + JKU.LT.N
                         ZTEMP = CZERO
-                        CALL ZLAROT( .TRUE., ILEXTR, ILTEMP, ICOL+2-IC,
+                        CALL ZLAROT( .TRUE., ILEXTR, ILTEMP,
+     $                               ICOL+2-IC,
      $                               C, S, A( JCH-ISKEW*IC+IOFFST, IC ),
      $                               ILDA, EXTRA, ZTEMP )
                         IF( ILTEMP ) THEN
@@ -839,7 +848,8 @@ SUBROUTINE ZLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                      ICOL = MAX( 1, JR-JKL+1 )
                      IF( JR.GT.0 ) THEN
                         IL = MIN( N, JR+JKU+1 ) + 1 - ICOL
-                        CALL ZLAROT( .TRUE., .FALSE., JR+JKU.LT.N, IL,
+                        CALL ZLAROT( .TRUE., .FALSE., JR+JKU.LT.N,
+     $                               IL,
      $                               C, S, A( JR-ISKEW*ICOL+IOFFST,
      $                               ICOL ), ILDA, DUMMY, EXTRA )
                      END IF
@@ -860,7 +870,8 @@ SUBROUTINE ZLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         IROW = MIN( M-1, JCH+JKL )
                         ILTEMP = JCH + JKL.LT.M
                         ZTEMP = CZERO
-                        CALL ZLAROT( .FALSE., ILEXTR, ILTEMP, IROW+2-IR,
+                        CALL ZLAROT( .FALSE., ILEXTR, ILTEMP,
+     $                               IROW+2-IR,
      $                               C, S, A( IR-ISKEW*JCH+IOFFST,
      $                               JCH ), ILDA, EXTRA, ZTEMP )
                         IF( ILTEMP ) THEN
@@ -949,13 +960,15 @@ SUBROUTINE ZLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            CT = DCONJG( C )
                            ST = DCONJG( S )
                         END IF
-                        CALL ZLAROT( .TRUE., .TRUE., .TRUE., K+2, C, S,
+                        CALL ZLAROT( .TRUE., .TRUE., .TRUE., K+2, C,
+     $                               S,
      $                               A( ( 1-ISKEW )*JCH+IOFFG, JCH ),
      $                               ILDA, ZTEMP, EXTRA )
                         IROW = MAX( 1, JCH-K )
                         IL = MIN( JCH+1, K+2 )
                         EXTRA = CZERO
-                        CALL ZLAROT( .FALSE., JCH.GT.K, .TRUE., IL, CT,
+                        CALL ZLAROT( .FALSE., JCH.GT.K, .TRUE., IL,
+     $                               CT,
      $                               ST, A( IROW-ISKEW*JCH+IOFFG, JCH ),
      $                               ILDA, EXTRA, ZTEMP )
                         ICOL = JCH
@@ -1025,7 +1038,8 @@ SUBROUTINE ZLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                         CT = DCONJG( C )
                         ST = DCONJG( S )
                      END IF
-                     CALL ZLAROT( .FALSE., .TRUE., N-JC.GT.K, IL, C, S,
+                     CALL ZLAROT( .FALSE., .TRUE., N-JC.GT.K, IL, C,
+     $                            S,
      $                            A( ( 1-ISKEW )*JC+IOFFG, JC ), ILDA,
      $                            ZTEMP, EXTRA )
                      ICOL = MAX( 1, JC-K+1 )
@@ -1051,7 +1065,8 @@ SUBROUTINE ZLATMT( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
                            CT = DCONJG( C )
                            ST = DCONJG( S )
                         END IF
-                        CALL ZLAROT( .TRUE., .TRUE., .TRUE., K+2, C, S,
+                        CALL ZLAROT( .TRUE., .TRUE., .TRUE., K+2, C,
+     $                               S,
      $                               A( JCH-ISKEW*ICOL+IOFFG, ICOL ),
      $                               ILDA, EXTRA, ZTEMP )
                         IL = MIN( N+1-JCH, K+2 )
diff --git a/TESTING/Makefile b/TESTING/Makefile
index bdea2bfaa4..3963260ac0 100644
--- a/TESTING/Makefile
+++ b/TESTING/Makefile
@@ -61,6 +61,8 @@ SEIGTST= snep.out \
          scsd.out \
          slse.out
 
+SDMDEIGTST= sdmd.out
+
 CEIGTST= cnep.out \
          csep.out \
          cse2.out \
@@ -82,6 +84,8 @@ CEIGTST= cnep.out \
          ccsd.out \
          clse.out
 
+CDMDEIGTST= cdmd.out
+
 DEIGTST= dnep.out \
          dsep.out \
          dse2.out \
@@ -103,6 +107,8 @@ DEIGTST= dnep.out \
          dcsd.out \
          dlse.out
 
+DDMDEIGTST= ddmd.out
+
 ZEIGTST= znep.out \
          zsep.out \
          zse2.out \
@@ -124,6 +130,7 @@ ZEIGTST= znep.out \
          zcsd.out \
          zlse.out
 
+ZDMDEIGTST= zdmd.out
 
 SLINTST= stest.out
 
@@ -142,10 +149,10 @@ ZLINTST= ztest.out
 ZLINTSTPROTO= zctest.out ztest_rfp.out
 
 .PHONY: single complex double complex16
-single:         $(SLINTST) $(SEIGTST)
-complex:        $(CLINTST) $(CEIGTST)
-double:         $(DLINTST) $(DEIGTST)
-complex16:      $(ZLINTST) $(ZEIGTST)
+single:         $(SLINTST) $(SEIGTST) $(SDMDEIGTST)
+complex:        $(CLINTST) $(CEIGTST) $(CDMDEIGTST)
+double:         $(DLINTST) $(DEIGTST) $(DDMDEIGTST)
+complex16:      $(ZLINTST) $(ZEIGTST) $(ZDMDEIGTST)
 
 .PHONY: singleproto complexproto doubleproto complex16proto
 singleproto:    $(SLINTSTPROTO)
@@ -297,6 +304,10 @@ scsd.out: csd.in EIG/xeigtsts
 slse.out: lse.in EIG/xeigtsts
 	@echo LSE: Testing Constrained Linear Least Squares routines
 	./EIG/xeigtsts < lse.in > $@ 2>&1
+
+sdmd.out: sdmd.in EIG/xdmdeigtsts
+	@echo DMD: Testing Dynamic Mode Decomposition routines
+	./EIG/xdmdeigtsts < sdmd.in > $@ 2>&1
 #
 # ======== COMPLEX EIG TESTS ===========================
 
@@ -379,6 +390,10 @@ ccsd.out: csd.in EIG/xeigtstc
 clse.out: lse.in EIG/xeigtstc
 	@echo LSE: Testing Constrained Linear Least Squares routines
 	./EIG/xeigtstc < lse.in > $@ 2>&1
+
+cdmd.out: cdmd.in EIG/xdmdeigtstc
+	@echo DMD: Testing Dynamic Mode Decomposition routines
+	./EIG/xdmdeigtstc < cdmd.in > $@ 2>&1
 #
 # ======== DOUBLE EIG TESTS ===========================
 
@@ -461,6 +476,10 @@ dcsd.out: csd.in EIG/xeigtstd
 dlse.out: lse.in EIG/xeigtstd
 	@echo LSE: Testing Constrained Linear Least Squares routines
 	./EIG/xeigtstd < lse.in > $@ 2>&1
+
+ddmd.out: ddmd.in EIG/xdmdeigtstd
+	@echo DMD: Testing Dynamic Mode Decomposition routines
+	./EIG/xdmdeigtstd < ddmd.in > $@ 2>&1
 #
 # ======== COMPLEX16 EIG TESTS ===========================
 
@@ -543,6 +562,10 @@ zcsd.out: csd.in EIG/xeigtstz
 zlse.out: lse.in EIG/xeigtstz
 	@echo LSE: Testing Constrained Linear Least Squares routines
 	./EIG/xeigtstz < lse.in > $@ 2>&1
+
+zdmd.out: zdmd.in EIG/xdmdeigtstz
+	@echo DMD: Testing Dynamic Mode Decomposition routines
+	./EIG/xdmdeigtstz < zdmd.in > $@ 2>&1
 # ==============================================================================
 
 LIN/xlintsts: $(FRCLIN) $(FRC)
@@ -578,15 +601,27 @@ LIN/xlintstzc: $(FRCLIN) $(FRC)
 EIG/xeigtsts: $(FRCEIG) $(FRC)
 	$(MAKE) -C EIG xeigtsts
 
+EIG/xdmdeigtsts: $(FRCEIG) $(FRC)
+	$(MAKE) -C EIG xdmdeigtsts
+
 EIG/xeigtstc: $(FRCEIG) $(FRC)
 	$(MAKE) -C EIG xeigtstc
 
+EIG/xdmdeigtstc: $(FRCEIG) $(FRC)
+	$(MAKE) -C EIG xdmdeigtstc
+
 EIG/xeigtstd: $(FRCEIG) $(FRC)
 	$(MAKE) -C EIG xeigtstd
 
+EIG/xdmdeigtstd: $(FRCEIG) $(FRC)
+	$(MAKE) -C EIG xdmdeigtstd
+
 EIG/xeigtstz: $(FRCEIG) $(FRC)
 	$(MAKE) -C EIG xeigtstz
 
+EIG/xdmdeigtstz: $(FRCEIG) $(FRC)
+	$(MAKE) -C EIG xdmdeigtstz
+
 .PHONY: clean cleantest
 clean: cleantest
 cleantest:
diff --git a/TESTING/cdmd.in b/TESTING/cdmd.in
new file mode 100644
index 0000000000..42d046e01b
--- /dev/null
+++ b/TESTING/cdmd.in
@@ -0,0 +1,11 @@
+10
+5
+
+20
+10
+
+30
+11
+
+50
+20
diff --git a/TESTING/ctest.in b/TESTING/ctest.in
index a3588b4a12..74ff31ab8d 100644
--- a/TESTING/ctest.in
+++ b/TESTING/ctest.in
@@ -42,6 +42,7 @@ CRQ    8               List types on next line if 0 < NTYPES <  8
 CLQ    8               List types on next line if 0 < NTYPES <  8
 CQL    8               List types on next line if 0 < NTYPES <  8
 CQP    6               List types on next line if 0 < NTYPES <  6
+CQK   19               List types on next line if 0 < NTYPES < 19
 CTZ    3               List types on next line if 0 < NTYPES <  3
 CLS    6               List types on next line if 0 < NTYPES <  6
 CEQ
diff --git a/TESTING/ddmd.in b/TESTING/ddmd.in
new file mode 100644
index 0000000000..42d046e01b
--- /dev/null
+++ b/TESTING/ddmd.in
@@ -0,0 +1,11 @@
+10
+5
+
+20
+10
+
+30
+11
+
+50
+20
diff --git a/TESTING/dtest.in b/TESTING/dtest.in
index 29bb8b92eb..1b6c7bd4a8 100644
--- a/TESTING/dtest.in
+++ b/TESTING/dtest.in
@@ -36,6 +36,7 @@ DRQ    8               List types on next line if 0 < NTYPES <  8
 DLQ    8               List types on next line if 0 < NTYPES <  8
 DQL    8               List types on next line if 0 < NTYPES <  8
 DQP    6               List types on next line if 0 < NTYPES <  6
+DQK   19               LIst types on next line if 0 < NTYPES < 19
 DTZ    3               List types on next line if 0 < NTYPES <  3
 DLS    6               List types on next line if 0 < NTYPES <  6
 DEQ
diff --git a/TESTING/sdmd.in b/TESTING/sdmd.in
new file mode 100644
index 0000000000..42d046e01b
--- /dev/null
+++ b/TESTING/sdmd.in
@@ -0,0 +1,11 @@
+10
+5
+
+20
+10
+
+30
+11
+
+50
+20
diff --git a/TESTING/stest.in b/TESTING/stest.in
index 27ac30040f..7faa8b7a11 100644
--- a/TESTING/stest.in
+++ b/TESTING/stest.in
@@ -36,6 +36,7 @@ SRQ    8               List types on next line if 0 < NTYPES <  8
 SLQ    8               List types on next line if 0 < NTYPES <  8
 SQL    8               List types on next line if 0 < NTYPES <  8
 SQP    6               List types on next line if 0 < NTYPES <  6
+SQK   19               List types on next line if 0 < NTYPES < 19
 STZ    3               List types on next line if 0 < NTYPES <  3
 SLS    6               List types on next line if 0 < NTYPES <  6
 SEQ
diff --git a/TESTING/zdmd.in b/TESTING/zdmd.in
new file mode 100644
index 0000000000..42d046e01b
--- /dev/null
+++ b/TESTING/zdmd.in
@@ -0,0 +1,11 @@
+10
+5
+
+20
+10
+
+30
+11
+
+50
+20
diff --git a/TESTING/ztest.in b/TESTING/ztest.in
index 58da33d605..c83e82e456 100644
--- a/TESTING/ztest.in
+++ b/TESTING/ztest.in
@@ -42,6 +42,7 @@ ZRQ    8               List types on next line if 0 < NTYPES <  8
 ZLQ    8               List types on next line if 0 < NTYPES <  8
 ZQL    8               List types on next line if 0 < NTYPES <  8
 ZQP    6               List types on next line if 0 < NTYPES <  6
+ZQK   19               List types on next line if 0 < NTYPES < 19
 ZTZ    3               List types on next line if 0 < NTYPES <  3
 ZLS    6               List types on next line if 0 < NTYPES <  6
 ZEQ
diff --git a/lapack.pc.in b/lapack.pc.in
index 316c871011..27cd99f7c8 100644
--- a/lapack.pc.in
+++ b/lapack.pc.in
@@ -5,5 +5,5 @@ Name: LAPACK
 Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
 Version: @LAPACK_VERSION@
 URL: http://www.netlib.org/lapack/
-Libs: -L${libdir} -llapack
-Requires.private: blas
+Libs: -L${libdir} -l@LAPACKLIB@
+Requires.private: @BLASLIB@
diff --git a/lapack_build.cmake b/lapack_build.cmake
index 0c0b8733fc..1460acaa28 100644
--- a/lapack_build.cmake
+++ b/lapack_build.cmake
@@ -4,7 +4,7 @@
 ## HINTS: ctest -Ddashboard_model=Nightly      -S $(pwd)/lapack/lapack_build.cmake
 ##
 
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.13)
 ###################################################################
 # The values in this section must always be provided
 ###################################################################
@@ -249,5 +249,3 @@ ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
 message("  Submit")
 ctest_submit(RETURN_VALUE res)
 message("  All done")
-
-
diff --git a/lapack_testing.py b/lapack_testing.py
index abda368981..dc3c471b56 100755
--- a/lapack_testing.py
+++ b/lapack_testing.py
@@ -38,7 +38,7 @@
         print("     - e is to print only the error summary")
         print("     - s is to print a short summary")
         print("     - n is to print the numbers of failing tests (turn on summary mode)")
-        print(" SECLECTION OF TESTS:")
+        print(" SELECTION OF TESTS:")
         print("     - p [s/c/d/z/x] is to indicate the PRECISION to run:")
         print("            s=single")
         print("            d=double")
@@ -136,7 +136,7 @@ def run_summary_test( f, cmdline, short_summary):
         for line in pipe.readlines():
             f.write(str(line))
             words_in_line=line.split()
-            if (line.find("run")!=-1):
+            if (line.find("run)")!=-1):
 #                  print line
                 whereisrun=words_in_line.index("run)")
                 nb_test_run+=int(words_in_line[whereisrun-2])
@@ -199,6 +199,8 @@ def run_summary_test( f, cmdline, short_summary):
     range_prec=[1,3]
 elif test=='rfp':
     range_test=[18]
+elif test=='dmd':
+    range_test=[20]
 elif test=='eig':
     range_test=list(range(16))
 else:
@@ -227,19 +229,19 @@ def run_summary_test( f, cmdline, short_summary):
     letter+"gd",letter+"sb",letter+"sg",
     letter+"bb","glm","gqr",
     "gsv","csd","lse",
-    letter+"test", letter+dtypes[0][dtype-1]+"test",letter+"test_rfp"),
+    letter+"test", letter+dtypes[0][dtype-1]+"test",letter+"test_rfp",letter+"dmd"),
     ("Nonsymmetric-Eigenvalue-Problem", "Symmetric-Eigenvalue-Problem", "Symmetric-Eigenvalue-Problem-2-stage", "Singular-Value-Decomposition",
     "Eigen-Condition","Nonsymmetric-Eigenvalue","Nonsymmetric-Generalized-Eigenvalue-Problem",
     "Nonsymmetric-Generalized-Eigenvalue-Problem-driver", "Symmetric-Eigenvalue-Problem", "Symmetric-Eigenvalue-Generalized-Problem",
     "Banded-Singular-Value-Decomposition-routines", "Generalized-Linear-Regression-Model-routines", "Generalized-QR-and-RQ-factorization-routines",
     "Generalized-Singular-Value-Decomposition-routines", "CS-Decomposition-routines", "Constrained-Linear-Least-Squares-routines",
-    "Linear-Equation-routines", "Mixed-Precision-linear-equation-routines","RFP-linear-equation-routines"),
+    "Linear-Equation-routines", "Mixed-Precision-linear-equation-routines","RFP-linear-equation-routines","Dynamic-Mode-Decomposition"),
     (letter+"nep", letter+"sep", letter+"se2", letter+"svd",
     letter+"ec",letter+"ed",letter+"gg",
     letter+"gd",letter+"sb",letter+"sg",
     letter+"bb",letter+"glm",letter+"gqr",
     letter+"gsv",letter+"csd",letter+"lse",
-    letter+"test", letter+dtypes[0][dtype-1]+"test",letter+"test_rfp"),
+    letter+"test", letter+dtypes[0][dtype-1]+"test",letter+"test_rfp",letter+"dmd"),
     )
 
 
@@ -260,6 +262,9 @@ def run_summary_test( f, cmdline, short_summary):
             elif dtest==18:
                 # PROTO LIN TESTS
                 cmdbase="xlintstrf"+letter+" < "+dtests[0][dtest]+".in > "+dtests[2][dtest]+".out"
+            elif dtest==20:
+                # DMD EIG TESTS
+                cmdbase="xdmdeigtst"+letter+" < "+dtests[0][dtest]+".in > "+dtests[2][dtest]+".out"
             else:
                 # EIG TESTS
                 cmdbase="xeigtst"+letter+" < "+dtests[0][dtest]+".in > "+dtests[2][dtest]+".out"